gentoo resync : 10.02.2020

14701 files changed, 98794 insertions, 100212 deletions

diff --git a/Manifest b/Manifest
index a720f03ed876..b5e6e2560eee 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29453 BLAKE2B 5141ff090d6e8ba9336088a98ffe94f3240030bae6f5f25489fc9b32641f1714c72d077b0fbfdb27e0ddca6c376f45c8b4b526e2d80f25fb4b18aea55ec50791 SHA512 94b108ef970718e6d62ff319939b5da3ea12d8b29e9e70185724382d3645450bc243c176f4a37bb981481b86ca25b8d57d004f909ee7989c6fe6467036f97537
-TIMESTAMP 2020-02-05T17:38:59Z
+MANIFEST Manifest.files.gz 29431 BLAKE2B 6816f20316f587f9f892e241d6045a337a950484253cf6f5231a48b00bdda790d6aba66845bfc3e3aab3332595869c1585d73b80dbf745e952af9f8252175fa1 SHA512 55eb5fce3a42ceb8dc8ed939d5fae6e91f0083a41e90dd26ac80dec7e494e944ddf9bfeca5035d79fea0f872af6416c6a97b89475a83a20c1e068dd08dde120d
+TIMESTAMP 2020-02-10T20:08:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl46/bNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl5BuFlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCkHRAAqvnGIbMjjb/lIcT7R0Z2V5q7tT+xbxyEqbl4K0Mo5uppbpWDEFolGoBo
-UT7QMZRWobtnm0q2xeVeNNyuc9pDWZ296Rm9DqJMALMd6A3B4oUuOneSk/UEZJMn
-lIghjnllCJDSyHyW3eLYE40bUxIijJdtlXhKv0U902b0OC8GtjDem6BezJbl1Y0i
-HjftnCAFGwHdjINhAmXj8rLMaaAlNjgIXtD1j8F/no8Yr/pbFRH/fqJenSlJyZJq
-O1W69St/uY1wLChuC794nXFujHG6z7cXYWaI0r53o8utG1vtsx0jpcAKOvG95F8y
-0A9aRuA7baGnoH0sjVPgoBNtRLAkDeKUmXfkoGgFeY4KzBK02sUc2rgOW/T7PmCn
-1VIPPtwB9QQwRO8HzsbbwZx6raEGs6YzU4i9CpiMhTLKDieBHeMUIAJ8UjDxXS5d
-v/MnLvidilyQpRUfP73jNYVUabcoJOoaf1k5MSSuLyBEgtY6LbDJyF3cFPzbGpe5
-EINZV9lYvtmr/DykliHdHzLvwQxLhSP2FeBD76pxY1+dKQIexODeEAu3xhI2PJzS
-9qUADd+eMxWUlU5znoxmhL+1AtkkV46MtDO0RlEHIVA+4PiCEBk3ORXh8G4Y2FaA
-fQSnC2CzmaaPUedCKW7VMbjzwGXeoLlOpLBokhuhXev3nVdclLI=
-=yi3o
+klBxqxAAh8tJG28LWMxwUcajU+KuqiFaj8dso3BeT2/atBriMhKpn+gaCVHJMXM7
+8+zQvinOTK7k7fMa2LKrhbYazSdlrSf8fDOOPkqtx/8dlRxGaq3/QP1tTWdAQyB2
+sEbE1441j52G0D2ywps53X4aM3G4By4h0Yb6iUDMokqPOjJwWMDIxp4aIXhfzIiY
+0Lqfqh3z+kg6ipEXSrmwk2qB76chVSa5HV24jN2646GN67d8QP2aSEM8y4jpIeKl
+jrigAksCSG1nl2GPBLNEOZF35b9nX2pB4s3hmnfq9u6and+uWeDm/8FARFQWOsJ4
+bRpP0/8Fjf6h2T5/uw8Ufsq4uKiXAXPW8Z+lTBE/n7v1USYOJxXxhiH1iQYwNoio
+/6uujV4rOs+mbh7zHGoknCLvnNA3fbPTitzLdWHzyI/izWj8uK5ufqKPH8gk5qB7
+D6w2b3qXtLRGXWN59GU+oI2uGd5VQIaZolDSuLnu5mzfZaG6kD8uDAgDam42/38P
+0cukGA0B1VdGlnIa5LAXqLid85hWEWfajlppSeX5+IC+OTVzzOfZdBN3cjgpVnDI
+nEIi9MI1TJFxOnXdLo51MO/8sa8SDg+YFTC7KDpgiW2MKEcPk+o+xjH3vqO9WNSs
+RVKoVsvL+64tzX5or3qm6KiMXrYBELskQK+NjGOOGZhizpGMfbg=
+=+cOS
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 84ec78c566e1..f97bdce99c1b 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 7ef10d3eee80..7e87752dd45e 100644
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
diff --git a/acct-group/dhcpcd/Manifest b/acct-group/dhcpcd/Manifest
new file mode 100644
index 000000000000..0f9e0e6e707e
--- /dev/null
+++ b/acct-group/dhcpcd/Manifest
@@ -0,0 +1,2 @@
+EBUILD dhcpcd-0.ebuild 151 BLAKE2B 306e0904bd08b2cc315457a6cf928609b47db968b3e70069cd47369ba3712322d17cd3ba1fa553d720e1b78bba11ddad87afadb97032338898fbe60eba99bd90 SHA512 ba1b216da075681ec6658b023bf1654067a3b04eebb8f7e8aa40f033b9fef7c5824bb436d47296d7dce74af9ddd5e53c5bc3e12c1c559fb48f98372a879f8a57
+MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/acct-group/dhcpcd/dhcpcd-0.ebuild b/acct-group/dhcpcd/dhcpcd-0.ebuild
new file mode 100644
index 000000000000..47af5f206833
--- /dev/null
+++ b/acct-group/dhcpcd/dhcpcd-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=303
diff --git a/acct-group/dhcpcd/metadata.xml b/acct-group/dhcpcd/metadata.xml
new file mode 100644
index 000000000000..f540000d5aab
--- /dev/null
+++ b/acct-group/dhcpcd/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/lighttpd/Manifest b/acct-group/lighttpd/Manifest
new file mode 100644
index 000000000000..b9ecbe612b30
--- /dev/null
+++ b/acct-group/lighttpd/Manifest
@@ -0,0 +1,2 @@
+EBUILD lighttpd-0.ebuild 146 BLAKE2B 7cb39baec7dda61b97a160b5e09068801979e3230fb75622df45a88f60688aad86d8bf2461b12d14c4a19b21efac2d729c0ae85efe6256a6883e669d8434304d SHA512 2b1b803ec1b592e944c0a8a46d3119682c2c199d80cd8bbcf01aea2a6927b920d30711ae0e0c8ad1d79ccd6c403a1787650b5483c644f4c5d33890d3d7ff899d
+MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/acct-group/lighttpd/lighttpd-0.ebuild b/acct-group/lighttpd/lighttpd-0.ebuild
new file mode 100644
index 000000000000..16dac2e24281
--- /dev/null
+++ b/acct-group/lighttpd/lighttpd-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=302
diff --git a/acct-group/lighttpd/metadata.xml b/acct-group/lighttpd/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/acct-group/lighttpd/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>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/telegraf/Manifest b/acct-group/telegraf/Manifest
new file mode 100644
index 000000000000..2537fcd3dbe3
--- /dev/null
+++ b/acct-group/telegraf/Manifest
@@ -0,0 +1,2 @@
+EBUILD telegraf-0.ebuild 146 BLAKE2B de107f39862925fc34cf82300a80071679df72e4d016f5c864b951d4e15f49341d777a9395a16ba36e3ff3fe79c971cf4956ad1feef744492646785d9c10a680 SHA512 cba7b6141024a9026e59cfc2a3bc4fe768e8cb71026643aabf4c09556add5bd57288d67ff44bd79bc48d1be3cc5dca23b071dcc99830edb306b0c10d09683cf2
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/telegraf/metadata.xml b/acct-group/telegraf/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/telegraf/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-group/telegraf/telegraf-0.ebuild b/acct-group/telegraf/telegraf-0.ebuild
new file mode 100644
index 000000000000..c7a063da8332
--- /dev/null
+++ b/acct-group/telegraf/telegraf-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=428
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 53483c59125a..c8fbc9c20b01 100644
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
diff --git a/acct-user/dhcpcd/Manifest b/acct-user/dhcpcd/Manifest
new file mode 100644
index 000000000000..dea4dfdd17eb
--- /dev/null
+++ b/acct-user/dhcpcd/Manifest
@@ -0,0 +1,2 @@
+EBUILD dhcpcd-0.ebuild 270 BLAKE2B 12e28cb8ea4a65830b124f73add3ab07cad1a98e7551ab3657b24ecca2f750c973126b5d1671ac892daab20cfb4dfd8126a98f9d208949aac4a2fdb0376b108c SHA512 d8c2461213f1b8cecc48001b537384aa238bd3b3ee919e179f8c142db421b85a6f4b6587ce089dd2efd3392633011c57a726f02477a048b3c080409a48dc7163
+MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/acct-user/dhcpcd/dhcpcd-0.ebuild b/acct-user/dhcpcd/dhcpcd-0.ebuild
new file mode 100644
index 000000000000..6673dab0fffe
--- /dev/null
+++ b/acct-user/dhcpcd/dhcpcd-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for dhcpcd client"
+ACCT_USER_ID=303
+ACCT_USER_GROUPS=( dhcpcd )
+ACCT_USER_HOME="/var/chroot/dhcpcd"
+
+acct-user_add_deps
diff --git a/acct-user/dhcpcd/metadata.xml b/acct-user/dhcpcd/metadata.xml
new file mode 100644
index 000000000000..f540000d5aab
--- /dev/null
+++ b/acct-user/dhcpcd/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/lighttpd/Manifest b/acct-user/lighttpd/Manifest
new file mode 100644
index 000000000000..292578246fc1
--- /dev/null
+++ b/acct-user/lighttpd/Manifest
@@ -0,0 +1,2 @@
+EBUILD lighttpd-0.ebuild 233 BLAKE2B 5b1eb6e62b0912ec0ab14a2b71812b5563e9c4ee97a1bb495d52e99606ab4011e094cf7cb3c9eb6e96c99b1624979c66dd7f9b6e2d8b0cb4822def3c6e43e61e SHA512 84d72a4ee397c4a29a1d36930ae470eefd69e5c3ce742418265c8207c95834459b1f45bc664b54b12b43eba7082379a2c588d9d01fe60b61d57c5ca773eb326b
+MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/acct-user/lighttpd/lighttpd-0.ebuild b/acct-user/lighttpd/lighttpd-0.ebuild
new file mode 100644
index 000000000000..5534663d206b
--- /dev/null
+++ b/acct-user/lighttpd/lighttpd-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for lighttpd"
+ACCT_USER_ID=302
+ACCT_USER_GROUPS=( lighttpd )
+
+acct-user_add_deps
diff --git a/acct-user/lighttpd/metadata.xml b/acct-user/lighttpd/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/acct-user/lighttpd/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>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/telegraf/Manifest b/acct-user/telegraf/Manifest
new file mode 100644
index 000000000000..a7d2e1601080
--- /dev/null
+++ b/acct-user/telegraf/Manifest
@@ -0,0 +1,2 @@
+EBUILD telegraf-0.ebuild 226 BLAKE2B 55454828f2f9271f33eb5802b23b7df2179b5dece5c3f52ee22d1ed2463d1ad5c89e3ab693a2f660e2871c506fa7a06a64c8ef63bd28b5396dfc30b4a471250f SHA512 1774cc00c5684545480f4dbc4c262d5ba5a5ddc0f191e6b84c40fa32db88e7d0452ea35dc6a105c4e64b93f1f229ad9503013b68da1ea1345982ca97a04de9ae
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-user/telegraf/metadata.xml b/acct-user/telegraf/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/telegraf/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>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/acct-user/telegraf/telegraf-0.ebuild b/acct-user/telegraf/telegraf-0.ebuild
new file mode 100644
index 000000000000..7cfacc19c7c4
--- /dev/null
+++ b/acct-user/telegraf/telegraf-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for telegraf"
+ACCT_USER_ID=428
+ACCT_USER_GROUPS=( telegraf )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index bd26419d5e10..ad62f13771d1 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 3a2eff529dd9..c10d6c007052 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,7 +1,5 @@
-DIST at-spi2-atk-2.26.2.tar.xz 322800 BLAKE2B 108a01fd8c16816d9953ad42721080dd6dcb9f75c95c412387d7f54920998c66eb5855eb859e8e00096a47b387d05779691887a7717d31f4c70681d69a9c8266 SHA512 f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2
 DIST at-spi2-atk-2.32.0.tar.xz 94952 BLAKE2B 972bb32590a51549eb8b0b3c46a068e95cc43783f0f0e31ca3663ff1669196a88def63342c01d056d45d6f4fb4bcc2127b50a49be37fd45d33aa1daeadca5172 SHA512 095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393
 DIST at-spi2-atk-2.34.0.tar.xz 96116 BLAKE2B 242b29b988d97b06ca85495be77f9c4cf1c621d9ff977cd73ea37f97b42fc636474df34429e7397fb3f91d3d11b14ce1b3de5d68c0b30f85877f444c78389564 SHA512 515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04
-EBUILD at-spi2-atk-2.26.2.ebuild 1051 BLAKE2B 0207ef85f7c98b623c607a4000acc1446a443e5f23ced1971e1944f809a9f26ed5cfcbbd8cc87a56383856c3d884ba361f7b4884e2b78137d12d85657550e651 SHA512 5305f0f3fda8ae0aab4089a8e5d67df9103b7d51d9a109b47714433930184777abe2130a3c4462c66b4353e3117bdbbb1986983a658e6598c76353a3a8df80e3
 EBUILD at-spi2-atk-2.32.0.ebuild 993 BLAKE2B 74d5ca20ab2be38b6fd287125699f209759c3c3be671e3b7e0e8ed80862c6cbd7e44d416dac6b59746e72e16c8fdbbda707b86bfac918daaaeafc31fa899f8aa SHA512 e051670bcebb3a64dddec3c8ed98c0a4ab56b231d077c75d658ab6d501e68154a593aa8865706c6b935a9e8bde4f209b3e0c6795e1efd11df12bd4e028ac9443
 EBUILD at-spi2-atk-2.34.0.ebuild 1004 BLAKE2B cbf4a24cadcb494e391d73952ec8b3f19cbc0d14dd285f2625629579e209798b60033d2adbaa368c65f6d1657e221d35010a47ff5a71dbe499c66ae3e34c6a99 SHA512 874549badfc3ae3cb0f78696b36c3c11ee47a52c31d73f0dd1c577b9560dd4bc0a8365fe34655aa2e1f1c02891335ea0027179174bdc6b9fba69cfed56ce6acd
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild
deleted file mode 100644
index aea755f5d6d2..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.25.2[${MULTILIB_USEDEP}]
-	>=app-accessibility/at-spi2-core-2.25.3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure --enable-p2p $(use_with test tests)
-}
-
-multilib_src_test() {
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index dbc6baaca165..3bec385e4ac6 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,9 +1,6 @@
-AUX 2.26.2-fix-inverted-logic.patch 858 BLAKE2B 23461bae3252ce92c767f6d1f4375d5fa40f2b64a925d3be9f8593fa59524363ace55919c2aef8dc022aee6a6079b7afef7a438ab47b24f8a200387c873593f3 SHA512 a1fa03e003691ccc5c774dec73626efc09b0bd019a23596a7d8aa0c79982249490d7e39be1d1c312b324d49f7855e8920db66475e1886c28c82cc8e9a3cbe6bb
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
-DIST at-spi2-core-2.26.2.tar.xz 494484 BLAKE2B 0c67cea9c0107fb6503a933de134eb662f192ae2a98734bde1b0629da151476858720d2dcb1791a00a44b61ae2ead945178fba659f88303c552567d7f3f9817b SHA512 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
 DIST at-spi2-core-2.32.1.tar.xz 188952 BLAKE2B a12e234b19a38b0fcffbabb8430ef49dc538b38831cc22bbafc7f5d499082007909a82e785184d052f3a62853474cbc4838125540026a6d0e2ac2181e98a6a4c SHA512 cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca
 DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8
-EBUILD at-spi2-core-2.26.2.ebuild 1585 BLAKE2B 6346920392dd2d53753dca4e05e03f5e2f3fd4bac64ad1491ec32f8cd8362c7e40be8020f6d5d85cd9dafb50cf12105b318de8511ef8af91ff30df353b3c9a33 SHA512 f98bd4471b1ebaa0e37b92b0d9e62b6c05bf8e1f5edd45de86b852809ea48de0fde4f8e02a0db94e41f5895e7034cb2a2e3a432c49de40276005561edc5fa031
 EBUILD at-spi2-core-2.32.1.ebuild 1486 BLAKE2B 7d5f24a05cce4206650de3a40685fe23632eed18e262b042c7517ee1f3faa8581b76c28ea7a61bff1310b4fdae741b078e95ee3eda453840a47e216913dafee5 SHA512 07cdfe8ee52d2c1883a35a8ade5f9cf677525684d623c9f6cf8396b71efc16610111e49fa946caab0b7cee66205240b80887618f73284bc02a713194ab4398e5
 EBUILD at-spi2-core-2.34.0.ebuild 1522 BLAKE2B 984d61b0604193e018161d33f41130965d4740f83285a19ff054461ee2b8bec6952daf9d183fd6ff1327eaf0b59dd6fe3798a6e299a0e31054c20c1639cbccac SHA512 71c45e02d51f45c33ba2ef7f32465985affcf31d10a9dd7240595b308aeef59018319a723582431c96d37373c83b354719b3ac405edf2ac4cb6264f95f0343fc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
deleted file mode 100644
index 223688c4c8f3..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="X +introspection"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-RDEPEND="
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-	"${FILESDIR}/${PV}-fix-inverted-logic.patch"
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable X x11)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
-	fi
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch b/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
deleted file mode 100644
index 7aa10f8bfc2b..000000000000
--- a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2e87fe00b596dba20c9d57d406ab8faa744b15a Mon Sep 17 00:00:00 2001
-From: Maya Rashish <maya@NetBSD.org>
-Date: Sat, 2 Dec 2017 13:24:29 +0200
-Subject: [PATCH] Fix inverted logic.
-
-Don't write more into a buffer than it can hold.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=791124
----
- bus/at-spi-bus-launcher.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
-index 261353f..eb2b8e3 100644
---- a/bus/at-spi-bus-launcher.c
-+++ b/bus/at-spi-bus-launcher.c
-@@ -244,7 +244,7 @@ unix_read_all_fd_to_string (int      fd,
- {
-   ssize_t bytes_read;
- 
--  while (max_bytes > 1 && (bytes_read = read (fd, buf, MAX (4096, max_bytes - 1))))
-+  while (max_bytes > 1 && (bytes_read = read (fd, buf, MIN (4096, max_bytes - 1))))
-     {
-       if (bytes_read < 0)
-         return FALSE;
--- 
-2.18.0
-
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 6815e340fd32..21349b650891 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,3 +1,3 @@
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
-EBUILD caribou-0.4.21.ebuild 2396 BLAKE2B ad06b26860162c036219c1e66e818f06f605942ecc6c41269a3f970e559f0cbd5b7fc9e34e6fb9bd0382d99f654cf6d9d230caed4fad93d93cb7dc2e2c5f0070 SHA512 9f1500be9b4388f7692852d7dab12141ec115630248bc297b0e51dab14a19db3e01d122a1d2cd40bccef9f2ddcc654bdb3c160661dd37281718396cb67492079
+EBUILD caribou-0.4.21.ebuild 2390 BLAKE2B 8c45fca89ee00bd730bf14d06d3360e3cfeef63ba639ef559f741e7b0c981b16348e1c44832f83a525ddbbc5c00bb849a8828015a96f84e9ec6b749a950d9b50 SHA512 5a3a0d68a3323b2e96395f5a20b697e52eaf312469a30d66ff7e06e8226a314a68db344b387782e17d0dc2790d12ec3d889290620937996e3a5dd1103e9fa3ac
 MISC metadata.xml 682 BLAKE2B 4ff796697db62d8c6a21ff62794c5fef391691685cece76ee7b8c38178f775a145b9a457df9bf959ab6af03559ceb4d9ad97a2ab835d63b70e58b4894f71fa5d SHA512 bec00e1cbb64bfec610e3f4e724e8afb8539a4b676b1e443a17b7eaf2263bef1fbf5787d77de253d84ebb0a54b3ca4bd386ba421826c0bb903164bb7ecf5223d
diff --git a/app-accessibility/caribou/caribou-0.4.21.ebuild b/app-accessibility/caribou/caribou-0.4.21.ebuild
index 3daa5a67f33c..f0844ec4d4ac 100644
--- a/app-accessibility/caribou/caribou-0.4.21.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-r1
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 21a7ce445914..8d7a17319e8d 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,3 @@
 DIST orca-3.32.0.tar.xz 2512032 BLAKE2B eae6c726e5e7361b7d60f0907f8c62c476895d681cf424940586e6308bcde147094a9557243aae6ecffef142bd556cb3cb30839955403e0958f123672400bf0a SHA512 015aa26ddaffa53d646e5d708ffed9e771beebbe925c27b963cbd3c3a2b36f730c0668cac6b89a371cd81cf8a570eb591711ba923fa4d013e00e31667749cf20
-EBUILD orca-3.32.0.ebuild 1442 BLAKE2B 7403b193c3f47e664f10377ed19c615bfcc0816b758ad150d614e6f55eb2eb75cb7fcd4f4bb8d292265694636cc9b519bb572c5ee7d606f63627e3716fec88ad SHA512 6748e4b4e4ce66bfc734fa12b22dbc3facb0bd39e07a54e19507e094f64b4a5de300fcd2b4113fafb2f72c204553b077101e935c079d916efe4502fd70de9276
+EBUILD orca-3.32.0-r1.ebuild 1581 BLAKE2B bd8534d0c6911aea40b693d08fc631dc98b555e133c032f994ba58b42e54300ded38f6f2eda728737af7c112447304f91be7bdc11a9acb1db3a0197b2a7a1adf SHA512 40c66ce3bf75bd9172a8462c759f820331f8cc94a092e06da2daa788328c4089bf6180ccd4310d1410ec43762fe7744d8c62b03d155d864001ea9702bc815033
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-3.32.0-r1.ebuild b/app-accessibility/orca/orca-3.32.0-r1.ebuild
new file mode 100644
index 000000000000..052a2b319bd4
--- /dev/null
+++ b/app-accessibility/orca/orca-3.32.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-accessibility/at-spi2-atk-2.32:2
+	>=app-accessibility/at-spi2-core-2.32:2[introspection]
+	>=dev-libs/atk-2.32
+	>=dev-libs/glib-2.28:2
+	media-libs/gstreamer:1.0[introspection]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
+	')
+	braille? (
+		$(python_gen_cond_dep '
+			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
+			dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/atk[introspection]
+	$(python_gen_cond_dep '
+		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyatspi-2.32[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	dev-util/itstool
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with braille liblouis)
+}
diff --git a/app-accessibility/orca/orca-3.32.0.ebuild b/app-accessibility/orca/orca-3.32.0.ebuild
deleted file mode 100644
index f5dff9cf8b0d..000000000000
--- a/app-accessibility/orca/orca-3.32.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.32:2
-	>=app-accessibility/at-spi2-core-2.32:2[introspection]
-	>=dev-libs/atk-2.32
-	>=dev-libs/glib-2.28:2
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	braille? (
-		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-	dev-libs/atk[introspection]
-	>=dev-python/pyatspi-2.32[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with braille liblouis)
-}
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 82aa6320a1d5..f3baa451b756 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index bcf582a71aa2..f49e409d8a50 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,5 +1,5 @@
 AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f7182d4bf9e7bebf1f80f6178acbce4ffddff7ab292c773685148621d53528b96c3099d96dcd0f26b1280 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
 DIST abrt-2.12.0.tar.gz 6799338 BLAKE2B 57a9b3fac4a4a5f55630be0573b26d4ae2d921d4f09d6566339a77f314c413c1a9e242f882fe20befabf30a58e7df21395edcf1b0d560bfeadf8e854bff6a705 SHA512 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded
-EBUILD abrt-2.12.0-r1.ebuild 3070 BLAKE2B da548db2e279c5957ec308bc3284eed1e9ff02953db16f138a72523cd5af97e67bd2848d9d019ee22ad266766ed84207b5b252c3bfd5060dc581aa543302a6a6 SHA512 d63768d04fe64c7d54d6dc55cc81a6b9d845e328df57006ce2d3caa0e033602b97b5dfe89925a7dc53e84bd530fe5b2a2ade6ba654e24b4cb5381a734fef57b9
+EBUILD abrt-2.12.0-r2.ebuild 3156 BLAKE2B d8c356d44d0e384c7bab4b74e3c1aa3646b521157e3e68a20b391367f6c9323bd93cc7e2f69c9cfc87268cd51e1ca19c35c714f73eeb116df02b6f096dfb5d16 SHA512 da60bf5c5c78617311738965f06bb4842c31493e245c064de95ff433479c01c68e8c16ed74965458ca21f58017b98e399ef103b45f0520def678c219abee862d
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.12.0-r1.ebuild b/app-admin/abrt/abrt-2.12.0-r1.ebuild
deleted file mode 100644
index 2a2d73f27a6a..000000000000
--- a/app-admin/abrt/abrt-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools gnome2-utils python-single-r1 systemd user
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libreport-2.10.0[python]
-	dev-libs/libxml2:2
-	>=gnome-base/gsettings-desktop-schemas-3.15.1
-	net-libs/libsoup:2.4
-	sys-apps/dbus
-	sys-apps/systemd:0=
-	sys-auth/polkit
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	app-arch/rpm
-	dev-libs/elfutils
-	dev-libs/json-c:0=
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	sys-apps/util-linux
-	>=sys-devel/gdb-7
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	dev-libs/satyr[${PYTHON_USEDEP}]
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-"
-
-RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	default
-
-	# Install under proper directory
-	sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
-
-	# Ensure this works for systems with and without /usr merge
-	sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
-
-	# pyhook test is sensitive to the format of python's error messages, and
-	# fails with certain python versions
-	sed -e '/pyhook.at/ d' \
-		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-bodhi
-		# package breaks due to not finding libreport-web with bodhi plugin enabled
-		--without-rpm
-		$(usex selinux "" "--without-selinux")
-		--without-python2
-		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
-		--with-python3
-		--without-pythondoc
-		# package breaks due to no sphinx-build-3
-		--without-pythontests
-		# kill tests for now until they can be explored.
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize #661706
-
-	keepdir /var/run/abrt
-	# /var/spool/abrt is created by dev-libs/libreport
-
-	diropts -m 700 -o abrt -g abrt
-	keepdir /var/spool/abrt-upload
-
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-admin/abrt/abrt-2.12.0-r2.ebuild b/app-admin/abrt/abrt-2.12.0-r2.ebuild
new file mode 100644
index 000000000000..097383a5b464
--- /dev/null
+++ b/app-admin/abrt/abrt-2.12.0-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="debug selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libreport-2.10.0[python]
+	dev-libs/libxml2:2
+	>=gnome-base/gsettings-desktop-schemas-3.15.1
+	net-libs/libsoup:2.4
+	sys-apps/dbus
+	sys-apps/systemd:0=
+	sys-auth/polkit
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	app-arch/rpm
+	dev-libs/elfutils
+	dev-libs/json-c:0=
+	sys-apps/util-linux
+	>=sys-devel/gdb-7
+	$(python_gen_cond_dep '
+		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+		dev-python/argh[${PYTHON_MULTI_USEDEP}]
+		dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+	$(python_gen_cond_dep '
+		dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	default
+
+	# Install under proper directory
+	sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
+
+	# Ensure this works for systems with and without /usr merge
+	sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-bodhi
+		# package breaks due to not finding libreport-web with bodhi plugin enabled
+		--without-rpm
+		$(usex selinux "" "--without-selinux")
+		--without-python2
+		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+		--with-python3
+		--without-pythondoc
+		# package breaks due to no sphinx-build-3
+		--without-pythontests
+		# kill tests for now until they can be explored.
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize #661706
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-admin/amazon-ec2-init/Manifest b/app-admin/amazon-ec2-init/Manifest
index 158d06c1b336..6438e38a9c47 100644
--- a/app-admin/amazon-ec2-init/Manifest
+++ b/app-admin/amazon-ec2-init/Manifest
@@ -1,3 +1,3 @@
 AUX amazon-ec2.init 1073 BLAKE2B f9bfa80b9317965eb603bb414e02b77c8e4045045fd10c29bf1fbe4a216e0f71d71b411b77123ca66a282716b510768773cb47a6ccd717683354f5688a2c85b0 SHA512 6dcbca0fed4e3a4e8c0d0e9da4cb8ea380f6604605402350d8980bad1377376584b644157f88a2babcd605e690f3a52cf89e63e130d679b501327675c90d5836
-EBUILD amazon-ec2-init-20101127-r1.ebuild 766 BLAKE2B 190643bfd2d999dfc9f716e1b2fc49d1aecaeff87eee132a124051bcfb57badd4d28cca7e268d72b23b748e5fdc7bfdb2f31db2a930cba0fe5154a7042afe6f6 SHA512 a0c1986867363a9eb4616afdef8b20cd2a08372d05ea03853289cb6539f1152a9da876e5379b364d46b3f0e0f5f0e23eaaedde5b7c45c026cbbe84b479bc7259
+EBUILD amazon-ec2-init-20101127-r1.ebuild 783 BLAKE2B 54b0aebde0484a401b8f5c02a62659dba2b71c8c64be54de9b3abe79d67a28981d2f30d7e82ba1cd6cf21d9793ab296189324e6214ee9edcc0dd597fd17cb40e SHA512 81d7e18713fb7dbd4e1f0163f4746f00a4c4b3a1e3357782293ad42ce2fa69b1d6c4e8302e22e6aaac791d07acd3e58209876cd732e48f026e3d4debc39e94d3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
index 41cd0c9ccb81..761bce4eb366 100644
--- a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
+++ b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 
 DESCRIPTION="Init script to setup Amazon EC2 instance parameters"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 # Amazon only provides x86 and amd64 Linux Xen guests, possibly FreeBSD,
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 45c2f8395334..b2f45b93b0a2 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,3 +1,6 @@
+AUX ansible-lint-4.1.0-specifierset-split-setuptools.patch 6509 BLAKE2B a2d9fe19d160a13213d822a195969e12b5f18843b2784c3d06460511867ee7b0198282888c945b37649f487d5e08d10a4c26ae808da11cb269cdc980db09287c SHA512 d2e79ec9dfb330182fae18f26bf0461c49e7c80d86ce65cbada672d70d69176a8880f4eae4125b2343a48ae0b793722a44aeebb3f4a7da99dd2fa44c4b67af29
 DIST ansible-lint-4.0.1.tar.gz 2909257 BLAKE2B c030b6fc58eaeeec42e40dd5bc46e5181916433b905bfc4a82382bf6bba8536d2639172aab0e2928ce1dd5489f322e19ab1c0ea5abb637562616addb9733e81a SHA512 a2f3bd44287a2c72f79c5fbb4c02446484cf764d386d403694325bce172e2b195dd4812e0f89e5f4e1930db124e2b383e4f067bed5d4858c354c0ae0b3fb03e4
+DIST ansible-lint-4.1.0.tar.gz 2911091 BLAKE2B b6e414dbdeebcc1cae900736829abf2db0930e5e05ae7c2bbd6d30a89b6ac28485ddfb63528bdc3baae6ef97ae7536507632d43b16f9a16dd86887d781940aeb SHA512 c1d07093d68bf5f43c20c3a999adf26d23ba587d5008a35069dcbab514b208737f5d0ecaf032e43d313233ea06193db81b349d5fb62f3ac684af9e51d8bc6e08
 EBUILD ansible-lint-4.0.1.ebuild 986 BLAKE2B fe971f6268c3eb0052c1141d76d484956a5b609d33e497514a7930c35617b88b3c9daee9c33d46595eede2a8e3a2081864eaab96c523af57a50d2d9f4b990f11 SHA512 71915f40aaba50616ea001757093f5d1fbaed634512b0194bac4b1b7cd41214aaa9328584744968a1e053ba1470e3a0c88226c87f2856fa8148fe66114c82f64
+EBUILD ansible-lint-4.1.0.ebuild 1079 BLAKE2B f0bb03705adcc23eea2fb539e1ad5d6c6ae3f869eb978b0f1eeddabb1a285db99934e7890cd3925071fc11c3f4d8a0daf35b4afd75ef36e5d252d673f35f7c49 SHA512 96558436ac44b149299c407965b91097998853f46b6844570f51f1d161ce67ac9d94865bdb6bed5cfc92b018f4bb88d4b8041e1fcbb8e10d9010dbe47c696a91
 MISC metadata.xml 468 BLAKE2B 6c6ebea3538b994b0ed427d005d3d46fa5bf115f25ea4de3b00e9fba3eaf44831ef0b54af5ddc352ad292ac4b6bcbb859583fb34b5bb358bc03ff25d43997215 SHA512 4dd15de2b2d9caf6cfe4518e9e4fcb476838c78c20d4edbeab8d78a602969201d7bee7bce8af1406e5a7e171cb481e7a08c58db599618e66d1c681a1537dfcfc
diff --git a/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild b/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
new file mode 100644
index 000000000000..46715fcb9b42
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-4.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
+HOMEPAGE="https://github.com/ansible/ansible-lint"
+SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-specifierset-split-setuptools.patch"
+
+CDEPEND="app-admin/ansible[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/setuptools_scm[${PYTHON_USEDEP}]
+		dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+		test? (
+			dev-python/flake8[${PYTHON_USEDEP}]
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		)
+		${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	nosetests || die
+}
diff --git a/app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch b/app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch
new file mode 100644
index 000000000000..4e4ac16d2389
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-4.1.0-specifierset-split-setuptools.patch
@@ -0,0 +1,175 @@
+From c91d23b2f82b4efb540168132842b243eb2d8b0d Mon Sep 17 00:00:00 2001
+From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
+Date: Thu, 24 Oct 2019 01:38:35 +0200
+Subject: [PATCH] Drop support for setuptools older than 34.4.0
+
+Resolves #599
+---
+ setup.py | 141 +++++--------------------------------------------------
+ 1 file changed, 13 insertions(+), 128 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 25cc9e80d09e4657b56c4c4ed68d9411b7d7eae9..ff4c5bd65a7f5786c5af32750fb83dd3f6d92cec 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,138 +1,16 @@
+ #! /usr/bin/env python
+ """Ansible-lint distribution package setuptools installer."""
+ 
+-import setuptools
+-
+-
+-try:
+-    from setuptools.config import read_configuration, ConfigOptionsHandler
+-    import setuptools.config
+-    import setuptools.dist
+-
+-    # Set default value for 'use_scm_version'
+-    setattr(setuptools.dist.Distribution, 'use_scm_version', False)
+-
+-    # Attach bool parser to 'use_scm_version' option
+-    class ShimConfigOptionsHandler(ConfigOptionsHandler):
+-        """Extension class for ConfigOptionsHandler."""
+-
+-        @property
+-        def parsers(self):
+-            """Return an option mapping with default data type parsers."""
+-            _orig_parsers = super(ShimConfigOptionsHandler, self).parsers
+-            return dict(use_scm_version=self._parse_bool, **_orig_parsers)
+-
+-    setuptools.config.ConfigOptionsHandler = ShimConfigOptionsHandler
+-except ImportError:
+-    """This is a shim for setuptools<30.3."""
+-    import io
+-    import json
+-
+-    try:
+-        from configparser import ConfigParser, NoSectionError
+-    except ImportError:
+-        from ConfigParser import ConfigParser, NoSectionError
+-        ConfigParser.read_file = ConfigParser.readfp
+-
+-    def maybe_read_files(d):
+-        """Read files if the string starts with `file:` marker."""
+-        d = d.strip()
+-        if not d.startswith('file:'):
+-            return d
+-        descs = []
+-        for fname in map(str.strip, str(d[5:]).split(',')):
+-            with io.open(fname, encoding='utf-8') as f:
+-                descs.append(f.read())
+-        return ''.join(descs)
+-
+-    def cfg_val_to_list(v):
+-        """Turn config val to list and filter out empty lines."""
+-        return list(filter(bool, map(str.strip, str(v).strip().splitlines())))
+ 
+-    def cfg_val_to_dict(v):
+-        """Turn config val to dict and filter out empty lines."""
+-        return dict(
+-            map(lambda l: list(map(str.strip, l.split('=', 1))),
+-                filter(bool, map(str.strip, str(v).strip().splitlines())))
+-        )
++__requires__ = ('setuptools >= 34.4', )
+ 
+-    def cfg_val_to_primitive(v):
+-        """Parse primitive config val to appropriate data type."""
+-        return json.loads(v.strip().lower())
+ 
+-    def read_configuration(filepath):
+-        """Read metadata and options from setup.cfg located at filepath."""
+-        cfg = ConfigParser()
+-        with io.open(filepath, encoding='utf-8') as f:
+-            cfg.read_file(f)
+-
+-        md = dict(cfg.items('metadata'))
+-        for list_key in 'classifiers', 'keywords':
+-            try:
+-                md[list_key] = cfg_val_to_list(md[list_key])
+-            except KeyError:
+-                pass
+-        try:
+-            md['long_description'] = maybe_read_files(md['long_description'])
+-        except KeyError:
+-            pass
+-        opt = dict(cfg.items('options'))
+-        for list_key in 'use_scm_version', 'zip_safe':
+-            try:
+-                opt[list_key] = cfg_val_to_primitive(opt[list_key])
+-            except KeyError:
+-                pass
+-        for list_key in 'scripts', 'install_requires', 'setup_requires':
+-            try:
+-                opt[list_key] = cfg_val_to_list(opt[list_key])
+-            except KeyError:
+-                pass
+-        try:
+-            opt['package_dir'] = cfg_val_to_dict(opt['package_dir'])
+-        except KeyError:
+-            pass
+-        try:
+-            opt_package_data = dict(cfg.items('options.package_data'))
+-            if not opt_package_data.get('', '').strip():
+-                opt_package_data[''] = opt_package_data['*']
+-                del opt_package_data['*']
+-        except (KeyError, NoSectionError):
+-            opt_package_data = {}
+-        try:
+-            opt_extras_require = dict(cfg.items('options.extras_require'))
+-            opt['extras_require'] = {}
+-            for k, v in opt_extras_require.items():
+-                opt['extras_require'][k] = cfg_val_to_list(v)
+-        except NoSectionError:
+-            pass
+-        opt['package_data'] = {}
+-        for k, v in opt_package_data.items():
+-            opt['package_data'][k] = cfg_val_to_list(v)
+-        cur_pkgs = opt.get('packages', '').strip()
+-        if '\n' in cur_pkgs:
+-            opt['packages'] = cfg_val_to_list(opt['packages'])
+-        elif cur_pkgs.startswith('find:'):
+-            opt_packages_find = dict(cfg.items('options.packages.find'))
+-            opt['packages'] = setuptools.find_packages(**opt_packages_find)
+-        return {'metadata': md, 'options': opt}
+-
+-
+-setup_params = {}
+-declarative_setup_params = read_configuration('setup.cfg')
+-
+-# Patch incorrectly decoded package_dir option
+-# ``egg_info`` demands native strings failing with unicode under Python 2
+-# Ref https://github.com/pypa/setuptools/issues/1136
+-declarative_setup_params['options']['package_dir'] = {
+-    str(k): str(v)
+-    for k, v in declarative_setup_params['options']['package_dir'].items()
+-}
+-
+-setup_params = dict(setup_params, **declarative_setup_params['metadata'])
+-setup_params = dict(setup_params, **declarative_setup_params['options'])
++import setuptools
++from setuptools.config import read_configuration
+ 
+ 
+ def cut_local_version_on_upload(version):
++    """Generate a PEP440 local version if uploading to PyPI."""
+     import os
+     import setuptools_scm.version  # only present during setup time
+     IS_PYPI_UPLOAD = os.getenv('PYPI_UPLOAD') == 'true'
+@@ -142,8 +20,15 @@ def cut_local_version_on_upload(version):
+     )
+ 
+ 
+-setup_params['use_scm_version'] = {
+-    'local_scheme': cut_local_version_on_upload,
++# This is needed because even new
++# setuptools don't parse
++# `setup_requires` from `setup.cfg`:
++declarative_setup_params = read_configuration('setup.cfg')
++setup_params = {
++    'setup_requires': declarative_setup_params['options']['setup_requires'],
++    'use_scm_version': {
++        'local_scheme': cut_local_version_on_upload,
++    }
+ }
+ 
+ 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index c59d5eec9108..972824c1745f 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,12 +1,6 @@
-DIST ansible-2.7.15.tar.gz 10205890 BLAKE2B 30b0c83ad646cdcd918472be4512ee8cf00e966b9c7ed0431bcf915e858dae6aeb26cdff4eee5d480b751a4c33f30c2b213d8bc67d17bc8774c5ca2bcf897632 SHA512 7140fdb80456f5dd9f34226a9f38ce567ad13e4cd6b4058ae22012867554c9ed19e3cfa0ae7e745bf56d109fbe8dde8e264efce2f537b5bdae48cf606ee38f52
-DIST ansible-2.8.7.tar.gz 12697144 BLAKE2B f88225b358ff9fad352c04a053100c5aa612f54ba7ad8e3a700d61e030fd0b5850055b83861d3ad76e614d3e786a2ed719f63b7f452ce24d7e27d79d386b8eed SHA512 166009780c8bb5b35beb9604412d4e5e3874e13b04f3ce694d726dc5bfb064f73a17ec3c814c8a67e28d57e7c327276b6cb66a9a0dba7138d702427ec13b4de3
-DIST ansible-2.8.8.tar.gz 12703583 BLAKE2B 0352646b495514d5a7a88fcd8e8437ef323f6d754f4704923b357c0f11c47932a2671a342e24f2de88479436f6f36664dbb0b26ee46fa98bc2d53d4f681595d0 SHA512 fb7705f3d0b8c0ee87d2954cccb7d00e12851693bbe995c062316577f66488f48d8180f11c8d87e025f4082a48ec27f25cb877be4c0ce96ed39951360e8679bd
 DIST ansible-2.9.2.tar.gz 14157188 BLAKE2B 4c1207bd43f7797d8d9cb1d4612e866eebbf8c19ee060cf1eb7daa68415be5d7718c79d756454648e66a13434eacba6a07c8de31c4ec4b12e0474563d8844e46 SHA512 522dd84af9493ceafd95ff0fc806a671f3d1f10d0ca074ef41875eb966d39e64b834e0b98a35d81d9d9d96efef8069db604c8080ce8cbb1ce2e8b13bf5c30a6a
 DIST ansible-2.9.3.tar.gz 14170666 BLAKE2B bb27d249e2390888ee3c28fdb48c1ceff346d2903089c70b451f793742238498aed7c33be056cce9790f44f5cdb74b5020b6decf4f1242904bd9c8f7b5077ea0 SHA512 02cfa2c7c43506dc602e92aed66c920243222b82bc4852f1a4d786cd3ff26fe17eda18d35ac7301cd9bf26366df9b18776e2a27e8d54fc92c3128f52ec7f58e8
 DIST ansible-2.9.4.tar.gz 14170264 BLAKE2B e230837360d29df460906d118b3c2ebb9a9dc1ac2a4427809a16716e67a79db8e737ed1beca757bd8a75b631c8cb6c26e58b1caeaaeb613731d63031f1e4e34e SHA512 21020548100fc31b59d4ee1b461f2a14359f2f18752d431cd041eb987c8c8b308f1aa1687461a9b3f5a086485b77b3a38c8f006b942cc24cb2157b45e6582822
-EBUILD ansible-2.7.15.ebuild 1661 BLAKE2B dca747a460b7edc774fcaa16272cb31f5def79cea488c805572896ce325fe90bc6874e1dd4f160cee0e6bb327afc45be9fcfa329e8803ffe08d709122cb410dc SHA512 0dbda9cb839ef2a04af1b4c621803863494d57d3554d99da8c13abaa2c1c0616c0406a0f1ce1c588d1cab533279fe39d113caf6c394548b8ced40f02849611d7
-EBUILD ansible-2.8.7.ebuild 1742 BLAKE2B 235c12d8d1e6a1a83a17c166bd0ae3bc8367f818e7b6114fa9ef7d61a6866c8143a52b2ac0558e7b08e9cea7cfb9afff5f50a48a7008a33a994ea29e84ecab2e SHA512 19ad0a8b824aecee3cf4269a2efd6967fc1f4af57dfe2820c367f00e0c1fe094e9a7249c9a1e9da4327a2d5781bf460bf208fc4574ff11799f57b48eb31cf085
-EBUILD ansible-2.8.8.ebuild 1744 BLAKE2B 0d652fddb0ab8b7af7415dc644a8c2c802b30a25247b945d70d5a7d89089b2754668f7adcaa604bd25d248cbf4a01b720f7e30bcac559395518726e53fe7aff2 SHA512 5c8235deebe9eba8e7fbfaa791213a6de935848efb86745335d0b9ea2564f33e0469d6b295f3845f9b2521ffe0c0b77b0f37f7c09826b9b5d5d7a4033c77eb9b
 EBUILD ansible-2.9.2.ebuild 1704 BLAKE2B 5222fcb64c188bb54bfa1a645a45179f9f9e9ba98020e824c2b355a567e0790c0c6bd2c0c149121fadb7dc1ce110cf4837519cb5df8d48fa9cd4cc3366e33cea SHA512 ed56bca21b973e313e8e08d5cc71856becc53ecf6eacb7e6e921c280f89a0a49edb5f0bdfe0354bd0280800ce80a14bdf557acc78de7f39067f338b91e28f24a
 EBUILD ansible-2.9.3.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
 EBUILD ansible-2.9.4.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
diff --git a/app-admin/ansible/ansible-2.7.15.ebuild b/app-admin/ansible/ansible-2.7.15.ebuild
deleted file mode 100644
index 1d192f699c01..000000000000
--- a/app-admin/ansible/ansible-2.7.15.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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 ~arm ~arm64 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}]
-	dev-python/pexpect[${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.8.7.ebuild b/app-admin/ansible/ansible-2.8.7.ebuild
deleted file mode 100644
index b252901fb902..000000000000
--- a/app-admin/ansible/ansible-2.8.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="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}]
-	dev-python/pexpect[${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}]
-		dev-python/sphinx-notfound-page[${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
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-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
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.8.ebuild b/app-admin/ansible/ansible-2.8.8.ebuild
deleted file mode 100644
index b34d22be5ff3..000000000000
--- a/app-admin/ansible/ansible-2.8.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-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 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="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}]
-	dev-python/pexpect[${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}]
-		dev-python/sphinx-notfound-page[${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
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-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
-
-	dodoc -r examples
-}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index bd9d4e9812b0..0bf2a73a964c 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,6 +1,6 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857 SHA512 00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
 DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa SHA512 fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0
-EBUILD calamares-3.2.12.ebuild 2343 BLAKE2B 8cfc99f4b04d1414ccc432b97408d7de9b443c943e56dfe166121748fcc792c3964fb55ef39e66f3a1a908f8ff2590b080eb4e73175f545efc60e88ea012315f SHA512 308bda6ee935926b4d2094fd7f9e53cd8274eadbd9003c70a246bc957891272f98b7b27094f592acf0dcf778cfee521432294bc405dd912a66335f89dfe3e770
-EBUILD calamares-3.2.17.1.ebuild 2129 BLAKE2B 2d2d77e3c04d536c82d106cee838725e29abed70db0e0e81866bea059aae426fca8027c1b3bf18ae91038b796e3ee76eebdc087b2178a87329c72b29ebc0940c SHA512 b89900210c156ff1f8b89ca15cf44a828b46da8e31f1455c03bcb5fb5789c5d07f26236d0c020c6962ef888950075548a1f86d11815d3b7b703bc551e3c8b547
+EBUILD calamares-3.2.12.ebuild 2386 BLAKE2B 6923c31ce1f118fae3c0ce79fde43d17980f4a6acfb92147c3f61783f4166f3d176d3b4d332dc3d21b56ef5c3a77230210237f24f0ee334428e6a2d4ca59e070 SHA512 b03c45f4ea1d46c210b5ee1fde6d752c0d194591ed2192162d1abf17d953fa5858b9f36d4cc8d1affb555bdc6fed129eb4f78e81747bb75626ed0d9c4c2d7daa
+EBUILD calamares-3.2.17.1-r1.ebuild 2172 BLAKE2B a8d52845342e1ecc6651513eeab07aeb345d682e251cc1376a7e608a78046637d68f821ba0cfb817f3f759d6c2b610182531c3a0a24bd428b6257f934ad8c0d4 SHA512 fc2d315b0ce7071cfaba6002a9329fb0a8024be263436a303bfcb77ead3288ce09b8fb8fe8e665489c5857fc3a9c51f307eb0037acf2de3baca8669bd799afcb
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.2.12.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild
index 9fea01c24f62..8ce51a9bf5da 100644
--- a/app-admin/calamares/calamares-3.2.12.ebuild
+++ b/app-admin/calamares/calamares-3.2.12.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_TEST="true"
 PYTHON_COMPAT=( python3_6 )
-inherit kde5 python-r1
+inherit kde5 python-single-r1
 
 DESCRIPTION="Distribution-independent installer framework"
 HOMEPAGE="https://calamares.io"
@@ -41,13 +41,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
-	dev-libs/libpwquality[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+		dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-apps/dbus
 	sys-apps/dmidecode
 	sys-auth/polkit-qt[qt5(+)]
 	>=sys-libs/kpmcore-4.0.0:5=
-	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
 	test? ( $(add_qt_dep qttest) )
@@ -67,7 +69,6 @@ RDEPEND="${COMMON_DEPEND}
 
 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)"\
diff --git a/app-admin/calamares/calamares-3.2.17.1-r1.ebuild b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
new file mode 100644
index 000000000000..de32e110d2e0
--- /dev/null
+++ b/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_6 )
+inherit ecm python-single-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT=5
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/yaml-cpp:=
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
+		dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kpackage:5
+	kde-frameworks/kparts:5
+	kde-frameworks/kservice:5
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt
+	>=sys-libs/kpmcore-4.0.0:5=
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	|| ( 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() {
+	ecm_src_prepare
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+			PYTHON_LIBS="$(python_get_LIBS)"
+
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+		calamares.desktop || die
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+		calamares.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+		-DWITH_PYTHONQT=$(usex pythonqt)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
diff --git a/app-admin/calamares/calamares-3.2.17.1.ebuild b/app-admin/calamares/calamares-3.2.17.1.ebuild
deleted file mode 100644
index e94dcef7f308..000000000000
--- a/app-admin/calamares/calamares-3.2.17.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_6 )
-inherit ecm python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="~amd64"
-SLOT=5
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
-	dev-libs/libpwquality[${PYTHON_USEDEP}]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/kpackage:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt
-	>=sys-libs/kpmcore-4.0.0:5=
-	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	|| ( 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() {
-	ecm_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)"
-
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-		calamares.desktop || die
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-		calamares.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHONQT=$(usex pythonqt)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index f2eda2257887..e9644d84fb19 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -2,9 +2,5 @@ AUX diamond-4.0-psutil.patch 1842 BLAKE2B 21774c34c5557c84b5ae217acfe468b7d55a4e
 AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55
 AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a596037608bd794c3fd68a78a03659295ce2021b70809edc01340f5ee39348e35275cae0b00a5042 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3
 DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
-DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
-DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b
-EBUILD diamond-4.0-r1.ebuild 2034 BLAKE2B 4fe7f0b57cff859c7fb7a4a5bc33c0a136600baa192d580b46956552c2a53bf6b422a092a8ca0eb1fa88cfa7383e0f8fb8544e5997357d9b07168377dbd2de60 SHA512 d5475a2669aeaed077fdfc1c54195c7fc9640f0ec119c0fe02c13fa6dada9f46b4eacffb22102be1d52b3e493ef642ecbb16467953348d3014f1030edb7af462
-EBUILD diamond-4.0.515.20170311.ebuild 2932 BLAKE2B 728ed2e1d8f175c7369fbbe339d281f16ecf564322d06be916e81328637a1f3d96c51f2ba9f5df5931b6bddb4002c3d68c0d4df06bd8b58acca5aada92cab4bc SHA512 3b23a1e830f0f754713d791546746f11e92c463291182695a61ceb4242c59cce9aaefa2326008eb6c08793298e7fb39cbde56e67057c2b972577e7dc991d26e6
-EBUILD diamond-4.0.515.ebuild 2282 BLAKE2B 069e906711a12b0d98ce0ee05cceb8a860476e2ea8b9c63e79eb9c5051193352558c2ce962ee32e4ce1a6a67c719b330ec8374ac18fb3ab51873d4364d03275f SHA512 e0d101201e87a69dad691f1ce92777381ceb036dab594276f30c78e56348d91b9ae33aaa7d701d1b7506cf14b68392c73567f62e88ecf00f4711ed26b2871147
+EBUILD diamond-4.0.515.20170311.ebuild 2930 BLAKE2B 3a8275290d4e029ea67321ccbab6f2aa1473284d842cfe1502958eef2fbce828416140dc9ea00737ebf11b36c57e24af2732932c45484a29c382e3deccdf8ea9 SHA512 b7fa0bacb2951377905f84cc8cfa394e80e9a6ef6ca7b5f67d07c2d0d0f00274cce3b086d9328ec92334e84c06ebb0f114e05cac8d8dae63ee2ce7a549d59cab
 MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
deleted file mode 100644
index f45a47bf45ba..000000000000
--- a/app-admin/diamond/diamond-4.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=5
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
-	S=${WORKDIR}/diamond-${PV}
-else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils prefix
-
-DESCRIPTION="Python daemon that collects and publishes system metrics"
-HOMEPAGE="https://github.com/python-diamond/Diamond"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test mongo mysql snmp redis"
-RESTRICT="!test? ( test )"
-
-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 )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
-
-src_prepare() {
-	# adjust for Prefix
-	hprefixify bin/diamond*
-
-	# fix necessary to make handlers honour their config, simple sed
-	# doing the same as upstream
-	# https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch
-	sed -i \
-		-e '/cls_name =/s/\.__class__//' \
-		src/diamond/utils/classes.py \
-		|| die
-
-	epatch "${FILESDIR}"/${P}-psutil.patch
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
-}
-
-python_install() {
-	export VIRTUAL_ENV=1
-	distutils-r1_python_install
-	mv "${ED}"/usr/etc "${ED}"/ || die
-	rm "${ED}"/etc/diamond/*.windows  # won't need these
-	sed -i \
-		-e '/pid_file =/s:/var/run:/run:' \
-		"${ED}"/etc/diamond/diamond.conf.example || die
-	hprefixify "${ED}"/etc/diamond/diamond.conf.example
-}
-
-src_install() {
-	distutils-r1_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/diamond
-}
diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 347df5bcfc65..6cb19661490f 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 
diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
deleted file mode 100644
index e7f3668ea8d0..000000000000
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
-	S=${WORKDIR}/diamond-${PV}
-else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python daemon that collects and publishes system metrics"
-HOMEPAGE="https://github.com/python-diamond/Diamond"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test mongo mysql snmp redis"
-RESTRICT="!test? ( test )"
-
-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 )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock
-		dev-python/pysnmp
-	)"
-
-src_prepare() {
-	# adjust for Prefix
-	hprefixify bin/diamond*
-
-	# fix the version (not set in GitHub archive)
-	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
-	# fix psutil usage
-	sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \
-		src/collectors/network/network.py || die
-	# fix symlink out of place
-	rm README.md || die
-	cp docs/index.md README.md || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# don't want to depend on docker for just this
-	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
-	# fails on binding ports
-	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
-	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
-}
-
-python_install() {
-	export VIRTUAL_ENV=1
-	distutils-r1_python_install
-	mv "${ED}"/usr/etc "${ED}"/ || die
-	rm "${ED}"/etc/diamond/*.windows  # won't need these
-	sed -i \
-		-e '/pid_file =/s:/var/run:/run:' \
-		"${ED}"/etc/diamond/diamond.conf.example || die
-	hprefixify "${ED}"/etc/diamond/diamond.conf.example
-}
-
-src_install() {
-	distutils-r1_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/diamond
-}
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index f52d848bb06b..3e213fecef42 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,6 +1,6 @@
 DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
 DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
-EBUILD eclean-kernel-0.4.3.ebuild 479 BLAKE2B 9cb762afc88d2130111fc1ba073ff25650a05071a558bf04361709aabbd5b67910fd2556be99ee577c14beef0140d6d4f5a56490d039cf2327a5a6ab50033e25 SHA512 41928b24b5875d026524a439a935bed48b1d6d168997559733ea7940cb829491ed3bc49a9d3db50f59846635fd8560129965c419a965dd8c7a4dc622dd8d2e0d
+EBUILD eclean-kernel-0.4.3.ebuild 473 BLAKE2B 27471f26b03396e6dd1371ad6ee0db6177ad0f4c56ec87939facffc4dceef48e609a4a262d1ac2059072f34f0d76f4c113046ccdd36f023bf0063af1ba625ea8 SHA512 c2700ca92813b664d109735472cab65c4e9a93af29cb73d591589cfa2aa01ed053680c731f42653cd60ff4e457d0e659daeb393af15099d80d5408c423d669d5
 EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
 EBUILD eclean-kernel-9999.ebuild 401 BLAKE2B 075d11ebda0764b47d16b0bf36174af6554ea42b1a62450890b7051f33a9fcc2691a6da8a1e73161e38879af2eedefb6b5bd7aceb01c5ed92050f505e805c75c SHA512 efef86fdb8d6d8f65f6be0693967449d6fb36bb45e9346de2ea60ef9ca0178bb61303b2415a0a589482ff0dfdd020812206dc0fdefb6ac97a6c2e6de880a3843
 MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
index 9cfd87c20ad3..89a5c4d8fe0a 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest
index 0db3fd6f59ee..6132cd0cfeee 100644
--- a/app-admin/equo/Manifest
+++ b/app-admin/equo/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD equo-302.ebuild 887 BLAKE2B d4288f003fb43a498e5b35b9a6903858a5f33b3bbfd478ad41d52d2477ed34f476a6a4af4c8a447f0b9437dee11cd0fbd3d776f4b6d181663d7905323abb28b3 SHA512 ba110ca04e91add28ba7f7ab57d0e4f686c14ed89a8755c4c90e94488db9e4bf1a3abbde7e1203116e822c12ddb5e6f0cc84c96fa80aa47982596fd4b1841955
+EBUILD equo-302-r1.ebuild 891 BLAKE2B 3122d762beb7dddc56f8630ea4686f3b0c0d97cb8daa6f64334d08c9aca7cf13f8aa5f45b6ef61356da560ea072c5ce844d451062f4c64151a0b4b857a3137e4 SHA512 97cd62c1b99d4b5695dc127da3c24ecf2f8b126eecdd2e995d8f91dee00cb29e43e34ee2bb062ec446576f55977c33e91dd11135a266cffcbf6fc7d533207bfc
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/app-admin/equo/equo-302-r1.ebuild b/app-admin/equo/equo-302-r1.ebuild
new file mode 100644
index 000000000000..e962a0d782f6
--- /dev/null
+++ b/app-admin/equo/equo-302-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1
+
+DESCRIPTION="Entropy Package Manager text-based client"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/file[python]"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_compile() {
+	cd "${S}"/client || die
+	emake
+}
+
+src_install() {
+	cd "${S}"/client || die
+	emake DESTDIR="${D}" LIBDIR="usr/lib" install
+	newbashcomp "${S}/misc/equo-completion.bash" equo
+
+	python_optimize "${D}/usr/lib/entropy/client"
+}
diff --git a/app-admin/equo/equo-302.ebuild b/app-admin/equo/equo-302.ebuild
deleted file mode 100644
index cfe1a7c0ea3c..000000000000
--- a/app-admin/equo/equo-302.ebuild
+++ /dev/null
@@ -1,41 +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 eutils python-single-r1 bash-completion-r1
-
-DESCRIPTION="Entropy Package Manager text-based client"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-
-S="${WORKDIR}/entropy-${PV}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/file[python]"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_compile() {
-	cd "${S}"/client || die
-	emake
-}
-
-src_install() {
-	cd "${S}"/client || die
-	emake DESTDIR="${D}" LIBDIR="usr/lib" install
-	newbashcomp "${S}/misc/equo-completion.bash" equo
-
-	python_optimize "${D}/usr/lib/entropy/client"
-}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 873650ffd07d..81445551c65b 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.9.0.tar.gz 3805146 BLAKE2B d2626270b6caa31a3c6853a0676a70d05a8165da0d229d44a6245840c76b91dcee0f44361373ff9e36138963cae0bb29245287ed49d155073a957f74049e2d08 SHA512 4c0e909ad86b9c6920e6a7ccd165fe126402399ff751add52720a44def6b43498a3bbaf2c70efaf966dbeb5bf3c41f8b8f73e40b70d3b58b732ec7e701e76871
-EBUILD exo-1.9.0.ebuild 545 BLAKE2B 562b5fe10e3d43760a064802b16534ef5f5ff2805247540040c516ec9529d30732ef62097d786b802bf6f51c5b9a0684db4aabe3d3cb64424d8f8ac4f26fc846 SHA512 83ed8951a35bf081ebfe4f9536f29d341c11482d070a64c17b6899ea8d774c0ca11e3eed77af4f1e7016756b08f525de28544cfd8626154346bdb291d925c833
+DIST exo-1.10.0.tar.gz 3805637 BLAKE2B fb74d3dadc8be11134bf5929a4ccfa12ac5e0b04854a0d1d74a63ac0b6a25bb5a0c945dfaf7f60141e2fdc0fa0f797c36edccf5d256f0a041ab726644ca324c4 SHA512 ef2e76e2e3d4b41121c00fa6ca869fe62e79c6790c8d7b44733ab1d9fab582989222852ca87849aa760d32db69b105ee528db5bb3dd0b0514a570d982007eb22
+EBUILD exo-1.10.0.ebuild 545 BLAKE2B 562b5fe10e3d43760a064802b16534ef5f5ff2805247540040c516ec9529d30732ef62097d786b802bf6f51c5b9a0684db4aabe3d3cb64424d8f8ac4f26fc846 SHA512 83ed8951a35bf081ebfe4f9536f29d341c11482d070a64c17b6899ea8d774c0ca11e3eed77af4f1e7016756b08f525de28544cfd8626154346bdb291d925c833
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/exo/exo-1.9.0.ebuild b/app-admin/exo/exo-1.10.0.ebuild
index 0af1e7521f7a..0af1e7521f7a 100644
--- a/app-admin/exo/exo-1.9.0.ebuild
+++ b/app-admin/exo/exo-1.10.0.ebuild
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 4a3ebfec4de6..3344e1631017 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -7,7 +7,7 @@ AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.10-r2.ebuild 3267 BLAKE2B c5cc0fdaffb763c71136731acdfcc312a12e55111b390d15e3416a1e216de8cb28be166d103d53f252e2d7be88f60dd19f9b99aa99ad235cdc02808dca9dc261 SHA512 04cab63dee6078ef2be87336a94fd6fcfe84191a2491b637e1847655daf2e22dada1b78fd09ed86b8ad02d30ef37177dd952e38a0b976ebdb13fc09c9d8b8637
+EBUILD gkrellm-2.3.10-r2.ebuild 3268 BLAKE2B 34a8589862c834f4d07eca2c639fe2c3f27713dd85a28465c4a9da1fa1fced310b3a2698bee646a0b08134cef58b7404c26745cbbc3c825c22a949a75f2c88fe SHA512 595a9774896eeb8328c2cc9e08ad88275887dbcd1cbda440b062f816fb3c150927753974afb88a0e4c6c64703b05ea65f2c462b1efb92f5a07e56c98eca8a9dc
 EBUILD gkrellm-2.3.11-r1.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
 EBUILD gkrellm-2.3.11.ebuild 3380 BLAKE2B fcbdcea39dc5cd9d3064b88135cfb3e0157005df600c4e527b33401fef53d51b81d6aba724e732b63e71a38235e6955fddff697d1aa86afd9213b57901acb071 SHA512 1cf4e0fb31e9e323ed1859c847ebded405489376c3cbec6365d63a62aba7362c3b355a330574aaab40ce7338da1a12a0871e45960a787eebe83f9a37ae419290
 EBUILD gkrellm-9999.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
index 29601be94ff0..b65c0a185755 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 216b51dbab97..f04965f3926a 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-1.14.0.tar.xz 643088 BLAKE2B e360b06796e718df31b1640d78153a843a17a8d70a27a1771fc264b01b5649aa7b6344feba1d2856348070a74df6731d462f178cb23fdd1ada051c5695e237f2 SHA512 1fc9a776d89ee8c4f00ad71994a55151f1758ddff1083b0bdd24e569200ec996b4502ae7f8ba0fe9700a35c082385fafc817abe04aa0a7e9980b225b92ab8c6b
+DIST hcloud-1.15.0.tar.xz 647676 BLAKE2B 23a77fb74eabb1d8f21d84ac79768bedb7fc1f6bd24785eae041440b1de73de0e3815983ebb505b5b4e200238f02cf9bd443cea5f719bf441b14ea3c83c4792a SHA512 5683d5972fa6469833c86c58236e67002ba1a95c0b6e67051d7de9e8fb958cbdb37e0ffa20b2a9e6688fadcc2adbf59ea0258203e1e9156fa88fe8c7a0ad1636
 EBUILD hcloud-1.14.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
+EBUILD hcloud-1.15.0.ebuild 554 BLAKE2B d47c96e84796e3ae3380c07351af1f96137e1e5088d954f64271400afbb5bfb13c659d626a7f5810563182982e13e43fc6f18f2564ceb1d3b9c47c4a07943f3d SHA512 b67c7b9baeae237e4b0d68d3e31551387f4ae984bd31891d36528aa5700c75f673809eadd8cb0f97ddc1529032d8553a46290d3c89c73e2c3b55a89856369de0
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/hcloud/hcloud-1.15.0.ebuild b/app-admin/hcloud/hcloud-1.15.0.ebuild
new file mode 100644
index 000000000000..f5620e0f972f
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 3505759aaf4b..3dff435d107f 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,7 +1,7 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
-DIST KeePass-2.42.1-Source.zip 5163432 BLAKE2B c24a57da863c92d3f89663f33ed89c277e248c926067c14a6a7e3526e77c458e943e62c4b98a3d86595eea308d8744fd4a17da6d5456030a771e324a662abd9f SHA512 c87581afbaa516f637848db134a8d945db168bbbe97789a9a7424600d4188a21d2b1b3cf907a20577b2903ce8916b6b12355a3296ee1630a5b556c9170c4fa22
 DIST KeePass-2.43-Source.zip 5177684 BLAKE2B 72530afd37139d250fe7378ccfec9056e9f2210aa9dfc4cc082d977ccfc517697bc52dad3d487ebabc796977cdbb9679df32a79a6be807c21ceab5931d464df0 SHA512 c403ae5d7b2a997e1aadffd6a522c8292d01a5803371af8b30734414ca5d47871b53a15067251d4cb072215fd41396465b0b16351e76dad7a48044b7ed62a7e8
-EBUILD keepass-2.42.1.ebuild 3116 BLAKE2B d4b548f7e4143138f1eddbc3e69b3e532b63fb1970a539e7df647bb57dbb488f1c291df2bac8a1c6cbf2afec400d30a91b9f2eb32c92274993cd21db7239239c SHA512 4c7e2ab0fabafa2f715137131951fdeca008f67f695f43cac5cdf5bf407aeea5a175fc3e90c7267ba47d578aeab1243eb49b11135c4d045ecf2c9d26b1f2c534
+DIST KeePass-2.44-Source.zip 5182922 BLAKE2B 092d1b982d748ea1b13f26fe5423a491855cb491c80cae7632429d488f80fd730df5d2f1613bab528d55a3aadcf0cb4f4055a637d2b14b68a468e4baf9ab1837 SHA512 ef2ca69e40c0787b63fc30a2b222dd77fd9f0addf8593511dcd0a47580cc8de5e0900c7d4e6f77c0e5a49d1728286cf1b5856cdc65ef175e4acfdd1ffc54b55e
 EBUILD keepass-2.43.ebuild 3239 BLAKE2B c26c998217c13088bf41013c8dff2e229e4689f669fab58b6c7aebed4b8b08fa43c1acbc106020dbe3073f767933a5b47f224d45eab089337e2812f283d6cf04 SHA512 0f52d6ab803a98ed11040947bebec2c0d1795e880f82c2e0039cb877858c51d9f564283900d7172e5e191cfe54be0a0a9b8d9487b814b88ca6c29d79d9a01358
+EBUILD keepass-2.44.ebuild 3230 BLAKE2B 9e3c55cb5220c18d7044de21d21cd96a1ad5f145ecf627d1db444ed5a187bc97aad27332c1e7a841c8153ae86eec2dc50f48a00567e681714b3354fc81b1c965 SHA512 b1c53ec9a3f97156823bb6c9265f0fa89b7c000a943557dfe3ba5a19eeec36657d537340692eeaccbf61b3af8508785b78cc0615595775b1e9074a285d53605a
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.42.1.ebuild b/app-admin/keepass/keepass-2.42.1.ebuild
deleted file mode 100644
index c5d1b4af3595..000000000000
--- a/app-admin/keepass/keepass-2.42.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 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() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# 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/keepass/keepass-2.44.ebuild b/app-admin/keepass/keepass-2.44.ebuild
new file mode 100644
index 000000000000..db354f613661
--- /dev/null
+++ b/app-admin/keepass/keepass-2.44.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils 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" )
+
+# bug #687052
+# file generated by mono --aot where *FLAGS don't make sense
+QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
+
+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() {
+	export MONO_REGISTRY_PATH=/dev/null # bug 659808
+
+	# 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() {
+	xdg_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() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index ccb7af030325..0fc43f1943e3 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,3 +1,5 @@
 DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
+DIST lib_users-0.14.tar.gz 25746 BLAKE2B 4aa2dbbd7c53be13f79988a62c7997f0787ea9b773fc57681a021ff75ba9ff0988ac3032b21150c4e4958849a6195df09d388b6341e1ac139f34ce9555786233 SHA512 533c6e8f486e58d0fd22aea9a30adf91c3a8340a8a3719f6374ddfa8120d402c8202ab8ceb0e78aedd46e3e5875795392ed40497a66d51de5c2ca6a275a1a777
 EBUILD lib_users-0.13.ebuild 1138 BLAKE2B fe7f56159d8245231aee974c8397a34af18e3166b3a289d8563b3a3c6d3e871346380f7ce82fcbe6121a51e933a5316a15493136a457d947bdd4c9e628f4d4f1 SHA512 4cf7f342038017a8c6d303d4a8b3d582ff2703488ee8e1670f385b12ef040f80efc60c0094176b5f49fe734bbb92d854e34fd4582918e53354c60111cd6db1fa
+EBUILD lib_users-0.14.ebuild 1084 BLAKE2B 408749ee3456ec0d57dd52ed1467c81858e67cee0c85bc56570659e7375d2890608485cd7ddfd9b00b043ac45e4e39a2366c46a8447e84447e0646e6a32b54a9 SHA512 7957c4b6155fbc8f788dad4f51b45c3729e3be87a0a4d331c6a3456c2cfd2be568806ad21ab3eded95176b8e70b321333f25ec06719f9570857c17f581e11f0a
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.14.ebuild b/app-admin/lib_users/lib_users-0.14.ebuild
new file mode 100644
index 000000000000..d60d13898433
--- /dev/null
+++ b/app-admin/lib_users/lib_users-0.14.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit python-r1
+
+DESCRIPTION="Check for mapped libs and open files that are marked as deleted"
+HOMEPAGE="https://github.com/klausman/lib_users"
+SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${PYTHON_DEPS}"
+
+src_test() {
+	python_foreach_impl nosetests --verbosity=2
+}
+
+my_install() {
+	python_newscript lib_users.py lib_users
+	python_newscript fd_users.py fd_users
+	# lib_users_util/ contains a test script we don't want, so do things by hand
+	python_moduleinto lib_users_util
+	python_domodule lib_users_util/common.py
+	python_domodule lib_users_util/__init__.py
+}
+
+src_install() {
+	python_foreach_impl my_install
+	dodoc README.md TODO
+}
diff --git a/app-admin/matter/Manifest b/app-admin/matter/Manifest
index 702d4d942299..d68c4ce507c2 100644
--- a/app-admin/matter/Manifest
+++ b/app-admin/matter/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD matter-302.ebuild 806 BLAKE2B c7d98c99f3ebdd52a9a6ba88abbc4a5e428fc27c771b4235953a153ec97b36bfcc0f0997e4c55a3adbf38b384feeba7cd6f407e192c43f56ebcf3b1a3a1543cf SHA512 88b1eeea0bab06cacd22a3baa00c85ab0f5f01fcd9852c67bf34e86ec3453cfce0d8169db5603cd34e950840ccb65eb7cefd02d9beaac4df87534a9413cc6219
+EBUILD matter-302-r1.ebuild 810 BLAKE2B 5f0c919c86b3de008e9137a5ae7e420b8e011c10e80ca8376175d6d2ec8a10d6db960e10566d8f8922163aeb20ef7cdc6795aa8bc9869ff34d7ff7fa446e93e3 SHA512 88f59bc299fcdcdf2e3abda5f00ea71880b37cb5348062dc936fa7ccc9f28147663e18d08d77faa2bb8c291560b7eca9ef8286edeb7d92deabb09e03610f2004
 MISC metadata.xml 316 BLAKE2B a4b75b27426512d6fdcc5c82017121dbbd1e2a3438ade9329957bdce4c54b1d6f4c3404c577f50cbfcf8d03c41187b9efab14189a169c655bc2f98a6f9e82495 SHA512 f4ba14f543d1d69eb89eb098013f40a1cd7d872525e7ad683a6e4f6d6f4bb9a96ed81adb32aad5011c33dfebe694e10e429440343c16ed5497f03a4515ccffe4
diff --git a/app-admin/matter/matter-302-r1.ebuild b/app-admin/matter/matter-302-r1.ebuild
new file mode 100644
index 000000000000..9505601252b6
--- /dev/null
+++ b/app-admin/matter/matter-302-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1
+
+DESCRIPTION="Automated Packages Builder for Portage and Entropy"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+entropy"
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}/${PN}"
+
+DEPEND=""
+RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}] )
+	sys-apps/file[python]
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" base-install
+	if use entropy; then
+		emake DESTDIR="${D}" entropysrv-install
+	fi
+
+	python_optimize "${D}/usr/lib/matter"
+}
diff --git a/app-admin/matter/matter-302.ebuild b/app-admin/matter/matter-302.ebuild
deleted file mode 100644
index 23ff9aad401d..000000000000
--- a/app-admin/matter/matter-302.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 bash-completion-r1
-
-DESCRIPTION="Automated Packages Builder for Portage and Entropy"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+entropy"
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-
-S="${WORKDIR}/entropy-${PV}/${PN}"
-
-DEPEND=""
-RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}] )
-	sys-apps/file[python]
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" base-install
-	if use entropy; then
-		emake DESTDIR="${D}" entropysrv-install
-	fi
-
-	python_optimize "${D}/usr/lib/matter"
-}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 4e33c79462e9..8837bee7247c 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,17 +1,23 @@
 DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
 DIST mongo-tools-3.6.14.tar.gz 4990861 BLAKE2B 13394a7222e73c0912e7d9d04205b25e5d73d6c72b53521b0749e0998dc52bbe4c7733d460b189aff2401790f537d9aa369b969ed273ea0858520ecd75782b66 SHA512 3e7caaa1d568023d478c77d5e88127796b25d27c71e30af692983f4fd2160887662253ffc67e6e87aa3a7e1fd4ae231de9401b1628412a4561b9595b71df8834
 DIST mongo-tools-3.6.16.tar.gz 4990806 BLAKE2B 743c24fe55a0353e3ce31a82a53c94560408725f9fa35d93d5bc136d2b6e465e081c8ad4b00d63826ea45db4431124cdf2b66341eba9be24db890fd80941b728 SHA512 ebb356690c2aeb7d47435ea05f977e9319c915e1af48b89fc9941f72871baabb5faac238b59281330fb46e7340ee354f56f438ea3d0abd97b859e2321b719038
+DIST mongo-tools-3.6.17.tar.gz 4991196 BLAKE2B 53e86b3513aa74ad174801cea987d574c5248f438cb0a9419c2352c04333eae2f92214b11c59ee8688ad7235dc7a4586c39cc27450c654b1fc0e2eec2e4e22e2 SHA512 ea7a010097fdfe7807daf9352519b808b4a7b614b793ee2ac27495207bcf1cf8b4151fecd525946a0d6b8aa9332c205f437d5141b16efb613810963f502061be
 DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
 DIST mongo-tools-4.0.13.tar.gz 11134653 BLAKE2B b963f2a4ee598f6716c6c678df029040f57e2ad17b0e025139d3ac5049aacefbf5342a455ac58161c11df734da4fe4f62f021c1544eee3542af3aed77a65e6d2 SHA512 0694c7ac5743b04d927e27eb913df1b9b55c6c7a26d2a4dc52af8d2e0a6934416f416da91c57e1e61804ae855ec4bd8facabacf0754f9f924f21602737f29e3c
 DIST mongo-tools-4.0.14.tar.gz 11134659 BLAKE2B 9caf119901d528079bb9aefce78d702dc3196cb105ac623137f8ffceffef4f8f6e61c8134470abe11f0bd422df9a6bef0e15331ee71065450b97220431458fc1 SHA512 6a0c39cbca0d51cd42518bb68a36fb7f0ed1e7b1ecf4dcd41256c8ab5c23505ca189b81a88c2a783ad81788bcab81d7e3c69f4788366e10dea744a03a2f3cf1e
+DIST mongo-tools-4.0.16.tar.gz 11139827 BLAKE2B 550acfd7e4434b178170dfd94c65668cb7dd37d128235c63a10f72802e3119f33d5cd2138bfd5b957f6d3813f1d9aff49218c4e122c0cd454b4ea7a969c84d4e SHA512 a75831d9fd0b596bfb7354cbc05d1ecf6871d5a7230a858b09b94d5001d18069c9cbe89c9500e9c1a16fc5186fa7a1ac59c605156666a3f1a2d7c81115a47c16
 DIST mongo-tools-4.2.1.tar.gz 14435826 BLAKE2B 8d068cb39957f6773fb6ca186a1eb324e03c21b8472fede407daf7bce091f3d401f0debe6412d70bb8e338101d7ada870e7347782ffb582b58fcafc236ad4932 SHA512 bba754acd9e21f8f832fc2e434720347c2222897b2af08d66f9491110d5491f5475ae2118ff25b263606677da10b0c96b76cc507a01287180096c25c1eab5ced
 DIST mongo-tools-4.2.2.tar.gz 14433618 BLAKE2B 7610bd6b386684836e91b6bb7f73e24267fac56ce975263ac2aaeebe51d37123baa8eb2009cf4478af89e6dcc596c9c07126224ad4bd80aee47d03fde9413eca SHA512 661813c70bf891f0a834ac9970cbe390a8616f9e89e4f33918e479ba3f3ce3851edecd63c1e35e65a4dee47419e3ce0fa3186c7ee2326bef11fce3bac8bed0c7
+DIST mongo-tools-4.2.3.tar.gz 15020325 BLAKE2B 8501a3ec6e947112ec561ce62f2ea568984f8ac911a7aff3cb8c08c1f29d2cfc64cf7f4b6a24ba73ae0f9b2b5853480f4fbed51c98fdc8c83cd433ea65e21dba SHA512 772719b450f8b656c22ac0126fee1e0fa58b5320c94ac6414b1d9af13e6437393c2482f2e386f4a73c84a2d1bfe0ea88df117a6a7ae87f4884477505cf662585
 EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-3.6.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-3.6.16.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-3.6.17.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-4.0.13.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-4.0.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.0.16.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.2.1.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-4.2.2.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.2.3.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.17.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.17.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.17.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.16.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.16.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.16.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index ae90e301dec0..77ff58e6f368 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -3,5 +3,5 @@ AUX 1.1.12-cache-qafix.patch 1103 BLAKE2B ab5fe2d05729dbd449e14aae25332172073554
 AUX 1.1.12-elogind-support.patch 6656 BLAKE2B 0bc942015430479fc1ae7c5cac080a8e68c53e4f5c45cea994bd44232f7dfe22e6623d31f9ed9a46bf31a851e888eea462785bc728db16951cf21c657fe1b575 SHA512 2126d57f2c0221cbad9f9796df0bfd817aaf26818f1287bf99c38a2396a7a0a140ff96c6369a18bfa008a91768d531fc4c0c5acd897fab3bbb35d755f39e946f
 AUX 1.1.12-use-autotool-python.patch 1072 BLAKE2B 8f96a404b3a80d13cb10488bf21a5710d9abf40e1725e47480a7451f7adcb9c4a0d834ac65f35d2013425b3c867d0126c23e999ff6077dd9735571fb9916432d SHA512 33e5d4364e32147de550204809fd86407607f102964986402379c8904f44f64db6ef7ac3a1b967fe6e70c8654f8a271b3f2934a370ec9422e58aaf54352d0320
 DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
-EBUILD packagekit-base-1.1.12.ebuild 3958 BLAKE2B 5b4ffe7026a27988f2b721c45d75dcf8f20e4e1b30bac04c9a0787f026f05ae22b5775dff70ddf760c86d1167b99e4e2d82faf04608401a3341f3560a84896eb SHA512 0218990a84e43c49d8f6d5541f35da75a50a4cdb6c050890efaf2c7b79831f92b00c8ce5d1829bfef0af1cbb5f31b47a33de4c9078ace2073256a73b658a6f31
+EBUILD packagekit-base-1.1.12-r1.ebuild 4008 BLAKE2B a66b6c1065c26cfc81018de43294a267ee8cd88a4c64b5cacef6f168e79f56dc4ec6bf303b19422ba8db12497d864a4033e3f446f39c98b46d703d8275d18931 SHA512 bc79cff725162ac2104161bc3fc6c3bedf5c20f54b2d0c3cf29ed09a5875be5027033ca287fac7fcd75bba8ba604aad0a49625abad7b73e6c3e9a1d4ce3dc46e
 MISC metadata.xml 772 BLAKE2B 88885c4f2b4c7ea16857f8727affd074dfc13a0a407f23a53e1a7dd7801c98adb4dde13baed734cc9b0f2aff1cc560dc45cd17c4c591acc0d9fcb1a95ce7e72e SHA512 14bf2712da5db44c38ebfab0e994a0a874213ce7265fce7a9f40b6b9e61b93a9935dcff532ade1980465b98d07b305c4ebcc69a344b7624c21b57d1b03bdb69a
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.12-r1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12-r1.ebuild
new file mode 100644
index 000000000000..679f84cba2da
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 multilib python-single-r1 systemd vala xdg
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
+SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/18"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
+IUSE="command-not-found consolekit cron elogind entropy +introspection systemd test vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	^^ ( consolekit elogind systemd )
+	vala? ( introspection )
+	entropy? ( $(python_gen_useflags 'python2*' ) )
+"
+
+# While not strictly needed, consolekit is the alternative to systemd-login
+# or elogind to get current session's user.
+COMMON_DEPEND="
+	>=app-shells/bash-completion-2
+	dev-db/sqlite:3
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.54.0:2
+	>=sys-auth/polkit-0.114
+	>=sys-apps/dbus-1.3.0
+	${PYTHON_DEPS}
+	elogind? ( >=sys-auth/elogind-229.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
+	systemd? ( >=sys-apps/systemd-213 )
+"
+# vala-common needed for eautoreconf
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	>=dev-cpp/glibmm-2.4
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-libs/vala-common
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.35.0
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=app-portage/layman-2[${PYTHON_MULTI_USEDEP}]
+		>=sys-apps/portage-2.2[${PYTHON_MULTI_USEDEP}]
+	')
+	consolekit? ( sys-auth/consolekit )
+	entropy? ( >=sys-apps/entropy-234[${PYTHON_SINGLE_USEDEP}] )
+"
+
+PATCHES=(
+	# Fixes QA Notices:
+	# - https://github.com/gentoo/gentoo/pull/1760
+	# - https://github.com/hughsie/PackageKit/issues/143
+	"${FILESDIR}"/${PV}-cache-qafix.patch
+
+	# Adds elogind support:
+	# - https://bugs.gentoo.org/show_bug.cgi?id=620948
+	# - https://github.com/hughsie/PackageKit/pull/299
+	"${FILESDIR}"/${PV}-elogind-support.patch
+
+	# From master
+	"${FILESDIR}"/${PV}-use-autotool-python.patch
+	"${FILESDIR}"/${PV}-add-missing-config.h.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Disable unittests not working with portage backend
+	# console: requires terminal input
+	sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/client"\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/task\)://\1:' \
+		-e 's:^\(.*/packagekit-glib2/console\)://\1:' \
+		-i lib/packagekit-glib2/pk-test-daemon.c || die
+	sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
+		-e 's:^\(.*/packagekit/transaction-db\)://\1:' \
+		-e 's:^\(.*/packagekit/backend\)://\1:' \
+		-i src/pk-self-test.c || die
+
+	eapply_user
+	use vala && vala_src_prepare
+	xdg_src_prepare
+
+	# Needed by elogind patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-gstreamer-plugin \
+		--disable-gtk-doc \
+		--disable-gtk-module \
+		--disable-schemas-compile \
+		--disable-static \
+		--enable-bash-completion \
+		--enable-man-pages \
+		--enable-nls \
+		--enable-portage \
+		--localstatedir=/var \
+		$(use_enable command-not-found) \
+		$(use_enable cron) \
+		$(use_enable elogind) \
+		$(use_enable entropy) \
+		$(use_enable introspection) \
+		$(use_enable systemd) \
+		$(use_enable test daemon-tests) \
+		$(use_enable test local) \
+		$(use_enable vala) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	python_fix_shebang backends/portage/portageBackend.py
+
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -delete || die
+
+	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
+}
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
deleted file mode 100644
index 41466b8f3d98..000000000000
--- a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# PackageKit supports 3.2+, but entropy and portage backends are untested
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools bash-completion-r1 multilib python-single-r1 systemd vala xdg
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/18"
-KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
-IUSE="command-not-found consolekit cron elogind entropy +introspection systemd test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind systemd )
-	vala? ( introspection )
-	entropy? ( $(python_gen_useflags 'python2*' ) )
-"
-
-# While not strictly needed, consolekit is the alternative to systemd-login
-# or elogind to get current session's user.
-COMMON_DEPEND="
-	>=app-shells/bash-completion-2
-	dev-db/sqlite:3
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.54.0:2
-	>=sys-auth/polkit-0.114
-	>=sys-apps/dbus-1.3.0
-	${PYTHON_DEPS}
-	elogind? ( >=sys-auth/elogind-229.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
-	systemd? ( >=sys-apps/systemd-213 )
-"
-# vala-common needed for eautoreconf
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	>=dev-cpp/glibmm-2.4
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-libs/vala-common
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.11
-	>=dev-util/intltool-0.35.0
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-portage/layman-2[${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
-	consolekit? ( sys-auth/consolekit )
-	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	# Fixes QA Notices:
-	# - https://github.com/gentoo/gentoo/pull/1760
-	# - https://github.com/hughsie/PackageKit/issues/143
-	"${FILESDIR}"/${PV}-cache-qafix.patch
-
-	# Adds elogind support:
-	# - https://bugs.gentoo.org/show_bug.cgi?id=620948
-	# - https://github.com/hughsie/PackageKit/pull/299
-	"${FILESDIR}"/${PV}-elogind-support.patch
-
-	# From master
-	"${FILESDIR}"/${PV}-use-autotool-python.patch
-	"${FILESDIR}"/${PV}-add-missing-config.h.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Disable unittests not working with portage backend
-	# console: requires terminal input
-	sed -e 's:^\(.*/packagekit-glib2/control\)://\1:' \
-		-e 's:^\(.*/packagekit-glib2/transaction-list\)://\1:' \
-		-e 's:^\(.*/packagekit-glib2/client"\)://\1:' \
-		-e 's:^\(.*/packagekit-glib2/package-sack\)://\1:' \
-		-e 's:^\(.*/packagekit-glib2/task\)://\1:' \
-		-e 's:^\(.*/packagekit-glib2/console\)://\1:' \
-		-i lib/packagekit-glib2/pk-test-daemon.c || die
-	sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
-		-e 's:^\(.*/packagekit/transaction-db\)://\1:' \
-		-e 's:^\(.*/packagekit/backend\)://\1:' \
-		-i src/pk-self-test.c || die
-
-	eapply_user
-	use vala && vala_src_prepare
-	xdg_src_prepare
-
-	# Needed by elogind patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-gstreamer-plugin \
-		--disable-gtk-doc \
-		--disable-gtk-module \
-		--disable-schemas-compile \
-		--disable-static \
-		--enable-bash-completion \
-		--enable-man-pages \
-		--enable-nls \
-		--enable-portage \
-		--localstatedir=/var \
-		$(use_enable command-not-found) \
-		$(use_enable cron) \
-		$(use_enable elogind) \
-		$(use_enable entropy) \
-		$(use_enable introspection) \
-		$(use_enable systemd) \
-		$(use_enable test daemon-tests) \
-		$(use_enable test local) \
-		$(use_enable vala) \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	python_fix_shebang backends/portage/portageBackend.py
-
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -delete || die
-
-	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
-}
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index 3c4b66744594..40421dabde66 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,3 +1,3 @@
 DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
-EBUILD ps_mem-3.13.ebuild 726 BLAKE2B ddb0c1ebce89a2ae8a7bd243ba7f77885586e54c89ec2f87f31a9ea6925805ae66a9e792af59ff2a429603b4e96ed7e4629c4f10ed99996313917c56f28bd291 SHA512 9c1b556d6e0e616b1a16c3d4201e7fa20f1438b093c7a93329f7ecd86d4d536d25884b3a3b18b9eeb82e18e526e0bb79bde4d86ce81874c0aef412b38b31b0d2
+EBUILD ps_mem-3.13-r1.ebuild 676 BLAKE2B 2921f9ecbcec6bf8e3251362eefebdf0a3c9a36d150463a3104c1637adf876dd451e3aa742aa002955aeedc3536836fb963a78f0066d43362aae4cbbb62abd14 SHA512 95dbdfbd232d6a0415f8f825cb750ba6cf40facce0ead984de057063f045215746f3cc7f7d1f5ac0cfed1e01a0930d9d711c5f0639de7cc4244e1a2a98319ff4
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.13-r1.ebuild b/app-admin/ps_mem/ps_mem-3.13-r1.ebuild
new file mode 100644
index 000000000000..8a3aea889f12
--- /dev/null
+++ b/app-admin/ps_mem/ps_mem-3.13-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 vcs-snapshot
+
+COMMIT="9f54e1aa3a87ec176ce8b71f02673e0d8293b344"
+
+DESCRIPTION="A utility to report core memory usage per program"
+HOMEPAGE="https://github.com/pixelb/ps_mem"
+SRC_URI="https://github.com/pixelb/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE=""
+
+python_install() {
+	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman ${PN}.1
+}
diff --git a/app-admin/ps_mem/ps_mem-3.13.ebuild b/app-admin/ps_mem/ps_mem-3.13.ebuild
deleted file mode 100644
index 2152bc741c1b..000000000000
--- a/app-admin/ps_mem/ps_mem-3.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 vcs-snapshot
-
-COMMIT="9f54e1aa3a87ec176ce8b71f02673e0d8293b344"
-
-DESCRIPTION="A utility to report core memory usage per program"
-HOMEPAGE="https://github.com/pixelb/ps_mem"
-SRC_URI="https://github.com/pixelb/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install() {
-	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 4b8f05e1f36a..0be4660acc17 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -10,7 +10,7 @@ DIST rsyslog-8.2001.0.tar.gz 2999701 BLAKE2B 8b0b0af6a9f8ea53540cd4869ad9ccc6f1a
 DIST rsyslog-doc-8.1910.0.tar.gz 8158007 BLAKE2B 7a05cf7070ba350d0fb939350868ff0dd9d03be46ebd1b1261e54add70ab680afe0b356f563ea9e10148aed17667fc0b729e2fa8f7ff7cff3e4cec9d0da209a8 SHA512 e46f14e40ae690efbe3114a859c1c94c8f9573ca5ebdb533ad4b5ed76c3a930c887cc205e7279fcc546fda3ce624eae507ce08d5d10ee1eb167a957edd742bf2
 DIST rsyslog-doc-8.1911.0.tar.gz 8183360 BLAKE2B f5681945fb30ddf9c21a60ebafaf99698f10ef4790e76c9f6f329763215d5a1d47918008ade3e8ff8b7d4fb3ce1220cfc6f307ebc1dbf85697c3d92f7b855023 SHA512 2326550a0db108db407b701ff0b7b8545f94d06c1979bfbea3496a9a652de2a22bf49e9b95d4b2e6256bbf1f9db6a1c9822557c6ebd6a56bc00f096a642b19df
 DIST rsyslog-doc-8.2001.0.tar.gz 8200594 BLAKE2B ad0fda200749083a56fd4d731b03982e25ff32a7c6b4ff10f996ee42a46c6985f11fc8265e6992d1d5c86973541d0b0cf15c014460792a4658f45a1a310aee4f SHA512 6d58a67914f65d75eb77411e760b9e49be3723fb6e4ab8951ce28bf83372e3ec7805fac5aef49158fa47c6c4a9109e887bcc46ed3ca0cdc53de4e9b66472be14
-EBUILD rsyslog-8.1910.0-r1.ebuild 12532 BLAKE2B 35561dced23452e9bea4b1eb159f426577936c8562e442a41b33efd7255ef90fdc46f9878ada2f1a4df376c52f4792030140fa9f875efd0c18944e55b09a4189 SHA512 04107c14684d6910f61805bbaf945a60f818c513396f6743318d1f1fbbef4a0d5652947ae3e347ea598bc5b44a3df981dd9f63e228e72f187883bbc818588aec
-EBUILD rsyslog-8.1911.0-r1.ebuild 12533 BLAKE2B 31539687bed21bc288ffb0b41755a4357072c1fed79dbced5d0f14075a7b0c34735d864476d221eb387cdda58a20f7fc748321c10a043bb0dcfbdcf0e6152bc8 SHA512 39778620a7643ad2405c06021602ec5b4faa5b1f52779e960b885775d9533107f55303915528327b83ec046117f7662e0d7210ce20cb708afc42ef40ab74ce7d
-EBUILD rsyslog-8.2001.0.ebuild 12540 BLAKE2B bd59867a647762dfb689fdae9087dc4fcc82984e50de5df327a250962b0041b20867a4aab6c60b0e30cebe64ea612788e6d4ae275ee9f178a9ec07f5b1024b0c SHA512 4934f1dbca4d475df93968cd24b928525bf7282ac9663cc98a23e17c36c1c8479e748608ade12432f353003192dd6c6f25cfd92eaeda9ef67a1db8a49b089482
+EBUILD rsyslog-8.1910.0-r1.ebuild 12528 BLAKE2B 59284d0ef52aeffc8eca382f46fcbbca931fc679401b98b8cf3f8f5e7985abd9400be1a8926afbd9bfc5af6c635752f0b00b20f5952108dd8e700090fe78608b SHA512 1b9378bad84f1a010aa0e6442a1827d9bf7e906e3c578409fc52d86dcdda015224ce751d5bffea462c58b4bec53e276c3c8386147e9cc863b9a07bdd6e4f95f6
+EBUILD rsyslog-8.1911.0-r1.ebuild 12529 BLAKE2B 35e0e7d6b8852a7d1808461dab7928cfd657dddf8cb6b70e0c78e2ea357ae640a4e50b0a42a0def9879903867f616b1703b4cac517cfe4c21d88a6a7fe0f6434 SHA512 1720ea0d6098a8353bd3b4d6e38968f2ed92e551e2186c85d15abcb5c8b6a923262ab5f0c5084d716bc6b1d3ea46e7571d80c815b9e912fc6cd23ff74de3b663
+EBUILD rsyslog-8.2001.0.ebuild 12536 BLAKE2B 1deec19a6ee3bfb77c93e3385651e2a3b07430c5bcc9d1fb4977626c75ea2fe663d4644986cf4ae5e7ca4cb8a02fca0eb47fb0f092f6027a8e94c650423f90da SHA512 4429134057644a7aa31a9b3b4481eb09af659ace7023145b291faced19b602f5b18cf8d0f1f8c34c225e56206abaf90286b4f7c6aceaeaa7246a669ea554cc83
 MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
diff --git a/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
index bf05fbd00c99..bac61488e1e2 100644
--- a/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit autotools eutils linux-info python-any-r1 systemd
 
diff --git a/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
index 393420579d6c..922df12327fe 100644
--- a/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1911.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit autotools eutils linux-info python-any-r1 systemd
 
diff --git a/app-admin/rsyslog/rsyslog-8.2001.0.ebuild b/app-admin/rsyslog/rsyslog-8.2001.0.ebuild
index e86dc3219381..537a3206cc36 100644
--- a/app-admin/rsyslog/rsyslog-8.2001.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2001.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit autotools eutils linux-info python-any-r1 systemd
 
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 13e4bef6603d..f4b4355738d0 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -12,5 +12,5 @@ DIST supervisor-4.0.4.tar.gz 437708 BLAKE2B 211726da07ce31c00da0d6edba57942d78ee
 EBUILD supervisor-3.1.4.ebuild 1214 BLAKE2B 1587b1975317464ae5803c79200269478ed991ca9e1615285e542cd816f62688b1f1012cec61045dd7a08ae4bb08c8470cdbe45cb081a4683f122e6ab3cc2e78 SHA512 77b7311ee159ccac840736c4fefb0e1db357ad5a7a23f2afd8f23636d41e69ec9654a6ce1967ee1ca147938a6bcd6aca21cc660edbe7d94963c28ef9b2f866ec
 EBUILD supervisor-3.3.5.ebuild 1982 BLAKE2B 40204a17f5a3ca850d86ea555733b12a3945f716ae889a6d215eb8cee4eaef123a471bd8cb83927392a9eb66068b7e9dbdd0f1e938f50db31649520cb9b1380b SHA512 35bc9633f8470dcb17e414e7051d6a45eb59169136b3f05252e525fcffd75907e62a38bb9b77aab997ab86c14826d91909c3a9a58364a788164f21497886df7b
 EBUILD supervisor-4.0.3.ebuild 1819 BLAKE2B c37974d752014e711ffdb7211b86778c115bf3a3ae2eaa81cfb168e4488e5dd156e75b4f706e3f2725c9542a6fc22b22feaa046907fa30c3d1d7245fa144d48f SHA512 12c9e9f509a358cd93b881de5c05880884dcbd5cd13549d4bdb7403a96916cb1146ecefe03b512b1fd94d65ba78a4bd0fa14cf3ecce6183fc17085e7c9202fde
-EBUILD supervisor-4.0.4.ebuild 1891 BLAKE2B 90eca7262c7b9b976af13fb09830e3c8d2e179a08e28fcbc7f8b7b021343d534b01c11b8ae793279261f4855439abc31df86cf240d3e89d21f320cd06ac8963d SHA512 53ee966185043740f01e5f9180f228f228085b5054c2ee0c7593f63acda22c6c97bde21feecf28a6949232b07c531fffae2407f25d821a39793f743fb7afc741
+EBUILD supervisor-4.0.4.ebuild 1891 BLAKE2B 013235d4789022c01d84b14b11d9fb51e597cfe78ec8318b3c22146f2dc287e1aea5a1f8000659a766d011b588593a537dd38a97495b01a21c3aa1ab7a509748 SHA512 89653aaccba1ee1eb561e645e082892a2ecf7f4973ef5b2a64e143829b1a19b648643626cd880aee2ef5d7b85ab88ba7485ea76a1627d7bbc45ade67747ee73b
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-4.0.4.ebuild b/app-admin/supervisor/supervisor-4.0.4.ebuild
index a30ea0a05f89..a9475bf5083d 100644
--- a/app-admin/supervisor/supervisor-4.0.4.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 # xml.etree.ElementTree module required.
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 11a518534020..79167a5f8815 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -8,7 +8,7 @@ AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a0
 DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
 DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36 SHA512 b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5
 DIST syslog-ng-3.25.1.tar.gz 4938596 BLAKE2B bfcbd19b5a06c7ea15899bb919564661043bc7ab87bed147f77ab1aed153d70522aba9a42ab7dfa66d3b52a5f8432954b8a00594f428ddeb202979c5b9260da3 SHA512 79e09f1ba11080179c572016ce27328a28d479e68e663d39fb16624c03dc37d8439020ede922f78680e31e21629a6c13a4671464a31213c1dcf6acd2c5cd4b13
-EBUILD syslog-ng-3.22.1.ebuild 4949 BLAKE2B e7b4c517f6cf598663adf1f02f07022101250e3ac9999dfcea5e2d6dcbeb6906606c477fa54c6fcb3c8b7893f9827629a2c0a4b3b1f317f6078730d057f930d6 SHA512 8c9a82d2c3d61cf2d732f8f64a9dd5871c64e785119912c3dc645f4fe1e54963649c00473f5d22c10747cab9e78de23dc5ce4eb4da35acc5d6ee4878a6f5ef6e
-EBUILD syslog-ng-3.24.1.ebuild 4897 BLAKE2B 37093dafc1181f9d41d32f11bb2589452a1d9b5412a2ea94f9f7b963e69a3ceedc519566f8935a07d50ee2bd60155c77f750f628b8344d20bfc373797fb698e7 SHA512 e241c143214ff8b1f2d4de70b1767100fbc2cb574baea5e0ca1ac3fb687b2114e842ad180aa992bba935b5c0741ce9ad16a4f63f16d35af4f0b616e4341f3549
+EBUILD syslog-ng-3.22.1.ebuild 4939 BLAKE2B 54b5c8436d431e3ffa6cba23d663cc8f73f6cba61837023ac775695f6844bd9f783fc7ef4ef624544a563fc8c15846e4227fc83477ee0b2eeac027b3a24f58ba SHA512 5a0e30fb6e759052e5018d2315abfd55ea3e0fb8bc008ed17dfaab70de6d34a471f1981efcc16c0087f91dc11de0cb08e1da63156c1c1843b4cc42a16c16c26f
+EBUILD syslog-ng-3.24.1.ebuild 4887 BLAKE2B 7950fc8fed41219ea4f7ffb7493cd8366f57dab738595b2326efccc5261e1e84e926dff63644e719e7a43d6b305deef7b3a9ed871e97333631ffaee38230a39a SHA512 018ba2ad27069103f3afe8f662f2efc43904e0556da2df12c5b864535925e931247ac3c26be95e1969fb47ea137f42cc72dfe66c50a50afe0f814f61cef50eab
 EBUILD syslog-ng-3.25.1.ebuild 4855 BLAKE2B 25a40382fc792fabe62e33fd44ba08fb86ff733cd110d3df5295411a95d2fecb7f41e9d2362cc9cc8b96b377a363d90741e4b9ffbe2f5474e06ad6ac1954fdae SHA512 e388af0421d156fbcea5b6d9f3696e19a052b09c23246a56cae01ec972cf28d0701789ef5f7dfebf2b98fb5525145ed2404c1ab8a1604525be6f3d17d042ac26
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
index 274410880f26..6cc34d99367e 100644
--- a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
diff --git a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
index 52957788a78b..dad96a4c1529 100644
--- a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index c2b4cba0336b..1ca1db3e683a 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,12 +1,8 @@
 AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d88cf326e0e8109dc5996c22c812c64f2dfaaa6b0456b368d2b59aa30271b4de402bd83c2754c0224b4fd6598c604 SHA512 531340bb0770c07743caa6c760584c0f4cda5a5db7dd46bd2eee8ae1cccabecffee084571fb68a3510735b04430f2bb454068d9983da2856a0459ccb258eb89d
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
-DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
-DIST sysstat-12.2.0.tar.gz 1227684 BLAKE2B 1ca5cc3f0fd5dca6655d7b483fa853bf9f0256ae5e8dabf56f698d736faadd38f64af699158f4d637d7c8564f12b0992d866e503d01c647be274fc87ee04a9b4 SHA512 2398be1d5181616c337ead8f62b6bfb1144b89c747800140503c6a94793976f7909c81b656290577d51ebdee2f380418902846271b48ed79c6d7f02306f0a8a1
 DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d761c914188a4e7fb15eddaedbd25b8a3dffa9893b1b2bbcc31d87a37cbe11b2b50ab0ec94a28f84018685d1b35c8 SHA512 a19d0978eb11071c228462cda496a59721541e57a1d15cb2d0964f287ac2d50b5587fa5bc2b8fe6be2a1f00cbf2e7c3bc59db6494e3e8c1906aa81437b30d073
 DIST sysstat-12.3.1.tar.gz 1245248 BLAKE2B 69848c452642be992c7b4af33268c0d6b30f16e5ea44ec13b00ab57e6ec3b498d92b707a53757de9066138a9ee92b995765f44f75f692e1b3c68d829519d53ca SHA512 f67a2dac22748217687bd7f58521c0719754f13298fb5faed8a6d58c2bb1f8620428191d0415e816eea07bb3ca81453e057d03c7db0096430ad7d6ba6b7b611e
-EBUILD sysstat-12.0.5.ebuild 1694 BLAKE2B f7a837432133c4f4166a7193457d888cc8187d11054b259de2bf7d4d2dfdd408f498e7966462e41784724b308df6e6e70e50ed33edf0d613562a6dd273bde3c7 SHA512 1b01d9232f8c489a6bd41eb896ad9053852aa3253d766501766701f23f6ca0c8162ffb76f51541584427f14733b41e497befce8a4eefa50ec5537d57ed5f6e7e
-EBUILD sysstat-12.2.0-r1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
 EBUILD sysstat-12.2.1.ebuild 1700 BLAKE2B 007abf39bcb8411796c0f3e90f6091f00fd667d2002b9d7587beeabc9dd69d245511910f083d8de72e3f3a818398902e92355c78ae79977567e7015665519d68 SHA512 ef5c77bb929525a22949cada8310967cf8a465044c699f5154e284e4cfe54e00ba150b240412e9caa0f3f13e69a15be83c740287680dee175b135c8932722912
 EBUILD sysstat-12.3.1.ebuild 1707 BLAKE2B a859050b87eed7b87090b236656a307ae87e3df1a297891800fb161632605b370b05c177ad080e5504bb4f3eb4fcda1a0d82076fbf10779a61dd03e754b11449 SHA512 312f999a2cd27a09f06970a141da3b0c70f271526dd97c2c228f241ec37d233153ffc728cf070da20d5db8eaa93981648a593668f982af295a08088ee4061227
 EBUILD sysstat-999999.ebuild 1603 BLAKE2B 3346b2979dd44d34cfc9450dd4d81e6d0269464a0e59ccb6692d5a65a46e93ca58637a8500978e644ef5ca3262f60775b8771a38bb217dd498b37eded65c8280 SHA512 45f259cd23638e4c5621f782c61d933fb11d927ef7fa2da2e7ffc6e061fa1701499cba841aba2c77c182f653b24b2b86f37ce487c7b0905707daac0aa2a1be3e
diff --git a/app-admin/sysstat/sysstat-12.0.5.ebuild b/app-admin/sysstat/sysstat-12.0.5.ebuild
deleted file mode 100644
index 6cbdbfde3823..000000000000
--- a/app-admin/sysstat/sysstat-12.0.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/app-admin/sysstat/sysstat-12.2.0-r1.ebuild b/app-admin/sysstat/sysstat-12.2.0-r1.ebuild
deleted file mode 100644
index cbea517ec677..000000000000
--- a/app-admin/sysstat/sysstat-12.2.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 550bae4c2f7b..3da0dca09177 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -3,6 +3,6 @@ AUX system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch 2206 B
 DIST system-config-printer-1.5.11-patchset-01.tar.xz 6948 BLAKE2B effe29c51cbe74fc72566df65f10ab845c9dc1f40ca2966c40be87e19f98046f34311c24b7bc77f471b840e35b0c8eb7754a7c5464d50335c8ab2e2ed0e79afd SHA512 2501bda0e75ea51cc8e14df6b3746a0ea51618919ef35ace849efeded0cddc49e6e3793142d1cd128ce3ce62c21661d5fdb85b19718df07b87a20f5fc641885b
 DIST system-config-printer-1.5.11.tar.xz 949816 BLAKE2B 96b41d64e0aa3494b7fc7ed15ac926d833a046ba2880b36b6f5dd4e7508e2bc1fac4cb52c9940c13cec6e34cb8972fbc11fcd5a7df510296444ca08a23f4cb2b SHA512 cc0a6faec0022092e64de3d7ab28669039c93853c6931d26c264f0035486e09ad0af784833e88ee8e3dc1b6f5be9dcf84144a2a6464dfa9711172966fa6a22b4
 DIST system-config-printer-1.5.12.tar.xz 955756 BLAKE2B 766cc7307382a7b0ab65387650f1568fd5108dae2693dfc93684c6593e28837d513e4c823bf4e07c3ba2123eea8aba0649135020318f06f38633b9837683d7f7 SHA512 c8b0702dcdf99c4e8a19274dd4a3f82d9263bd5f51d0c19edf7d71fb13095f57a35e643ddbe161ffb5805e72bf7da0cb6a3de44a554854390ac05d8e56644c32
-EBUILD system-config-printer-1.5.11-r2.ebuild 2384 BLAKE2B 5cdec84c625a01dd2b25695a2fbfe6f6ea741869af2eab383736e2b2bb39c985decb8395ea6f4b953f8283eb5a2174584035d7633852be5b9ec3467e6ba9d78f SHA512 b45bca0208f2c26c7bda93cc575c354e19b410dd010f319d2d32923a11fdd7b8698fa7e335767dd52da80bff5436d01596a1662660b0992ab5d849139331296a
-EBUILD system-config-printer-1.5.12.ebuild 2113 BLAKE2B bbabece307e6d35ea1bb506b76252caa964cbb0626cc38b147d26456712bd6f360ffb087267b064f9b035b16a9a2de7f80d42f6d69825cfa38e299a2803120c1 SHA512 c62a08121d2792a70099425f4d53c6002937d11de760c88c30356e6358dcc2203617571376956fb381945a4a3d2717c45d0335e52da23759c46c6b64f765c89e
+EBUILD system-config-printer-1.5.11-r2.ebuild 2455 BLAKE2B 581e2e10955dcc70e337e7de496452b40db11999b4fb81e142458926ef6456131ed10011298bb9c3f1e5ec3ea7fb2a7ce7c8220cd0288c4b4d20b8492790709f SHA512 553f1f889f830b495df630cc4c632a3467f4e281cff3da3d49c018805217c7b06124049f761faed418ad69a12531e551d9b0c3bf31c051e79eea86ae8f9b9cb9
+EBUILD system-config-printer-1.5.12-r1.ebuild 2184 BLAKE2B 7f18432f105d4cfc915ed72fe17628ab6aef5928810845b1a4a3b496552c46c405ca0a3e09a3823bce63989dc6c42bc47dbd89334eecea0cd3fbf2f147425be4 SHA512 56fad76dfdd91301064bddd663cdf4e72b98e6c1bcea22f891b70d8529f6f9c79b62a083160a5e206d9455dbebddc829ecd9c3546d31aa3a5864cedfe270ec64
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
index c3ccfa108f05..d2f73378485c 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
@@ -45,12 +45,14 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( dev-python/epydoc )
 "
 RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycups[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+	')
 	gnome-keyring? ( app-crypt/libsecret[introspection] )
 	policykit? ( net-print/cups-pk-helper )
 "
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
new file mode 100644
index 000000000000..a62572dca403
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.5.12-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="xml"
+inherit gnome2 python-single-r1 systemd
+
+DESCRIPTION="Graphical user interface for CUPS administration"
+HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
+SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
+SLOT="0"
+IUSE="doc gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-perl/XML-Parser
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( dev-python/epydoc )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	policykit? ( net-print/cups-pk-helper )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-check-for-null.patch
+	"${FILESDIR}"/${P}-fix-abrt-in-udev-configure-printer.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-nls \
+		--with-desktop-vendor=Gentoo \
+		--with-udev-rules \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	gnome2_src_compile
+	use doc && emake html
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( html/. )
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
deleted file mode 100644
index ddfedb5f26de..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml"
-inherit gnome2 python-single-r1 systemd
-
-DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
-SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
-SLOT="0"
-IUSE="doc gnome-keyring policykit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# Additional unhandled dependencies
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-# python samba client: smbc
-# selinux: needed for troubleshooting
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	net-print/cups[dbus]
-	virtual/libusb:1
-	>=virtual/udev-172
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-perl/XML-Parser
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-python/epydoc )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycups[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	gnome-keyring? ( app-crypt/libsecret[introspection] )
-	policykit? ( net-print/cups-pk-helper )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-check-for-null.patch
-	"${FILESDIR}"/${P}-fix-abrt-in-udev-configure-printer.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-nls \
-		--with-desktop-vendor=Gentoo \
-		--with-udev-rules \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	gnome2_src_compile
-	use doc && emake html
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( html/. )
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/app-admin/usbview/Manifest b/app-admin/usbview/Manifest
index 24ca021c7b23..d91760ed9bd3 100644
--- a/app-admin/usbview/Manifest
+++ b/app-admin/usbview/Manifest
@@ -1,3 +1,3 @@
 DIST usbview-2.0.tar.gz 366337 BLAKE2B d3ce8f3b97ebb650f7cc8b47d7a4c4b985022811f55b43b41a65aaa120450aa187ce2dfc2671315575dfcbd108b68ca50420145a6c59ab85f7c4fcfc53a233f9 SHA512 87b3d0b0c734c94e5527f19575c0460f5c0b894dac29936a759d573058c9c007ad59c9be32a5c6d485cba258193efe4ca15bdd6f3ca31df321ed230778b5404f
-EBUILD usbview-2.0.ebuild 688 BLAKE2B eb9f9593f7ec1b52a5897d632abea201ecdcb511f0c4411fab5835d7a8355781eb98edf8dc5a30d079d076a04ba095227bbdfd1350b86798efd632297fe50faf SHA512 88a8096ee7f23ebe6e84e48c1ce8234dd182f5fc6261b1fd40212036e851390e9aef351930af9cd6de204513d5fa372f154b2fbe7b6b480fc8f91e7f74c4431d
+EBUILD usbview-2.0.ebuild 686 BLAKE2B 70ece8cbf300f8300cc70c621c9da4e8d117e02da3a3dfa83f5af7fa3abef43af9d99578104a9b3510f6b2401eb9d822be43faceca42c6207f630a7c4e9d9073 SHA512 cd8a78a4ac41cc15c80608a22576b05a4927c0171b91a555d067785ae7b56c1b8eb4c53ada052b9f510f409dc2bcf30c452646cc01c9b1ebe7d0ba09d5c03947
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-admin/usbview/usbview-2.0.ebuild b/app-admin/usbview/usbview-2.0.ebuild
index fbabff53c126..760fe40c131c 100644
--- a/app-admin/usbview/usbview-2.0.ebuild
+++ b/app-admin/usbview/usbview-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 01a871bb72ae..6e42184a79ba 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
diff --git a/app-antivirus/clamav-unofficial-sigs/Manifest b/app-antivirus/clamav-unofficial-sigs/Manifest
index dbf07196ca40..1a80823451f6 100644
--- a/app-antivirus/clamav-unofficial-sigs/Manifest
+++ b/app-antivirus/clamav-unofficial-sigs/Manifest
@@ -10,7 +10,7 @@ AUX clamav-unofficial-sigs.timer 336 BLAKE2B e7abc9f011becab462dd23147843bb7e3ab
 DIST clamav-unofficial-sigs-5.6.2.tar.gz 50931 BLAKE2B 6fea42f8f76ae5344c2b96c9203d2b09e755573d03f2b9d3d9ee2a488150fbb6f598e052b730daf12c551920a71fd8daad1dc10002fca12fa4a74554cf7d445e SHA512 79978db065a22d778490d0a2673f5a0bb7ab73e42de64563e7d26ac23459f7e5b2e73b0548e1ea6483e3c5f43eed65cdbc6814037cc0c46a339366a0150e5427
 DIST clamav-unofficial-sigs-6.0.1.tar.gz 52262 BLAKE2B 9523da749e88c5e93f0986d7d4a234c3b1eff7c207ceb266e63cd76d7cffdf4a85aedf90aa746f7e1c82be97018f40896bbaa2dfd8f749f3c167d3bff74293d7 SHA512 d4f619628c9b2804a6d5ad533adaad72e323bb0604334c045cf92fc550ffb114493653d097b68337b33f51dc1215dc073b4ec9dc42abea8707cb03aefa40b289
 DIST clamav-unofficial-sigs-7.0.1.tar.gz 59517 BLAKE2B 36da6d7748cd7fcf35dde4790a8fb6777a97a6c0a7b2c080e0f0ac939041b5fd2372f0d58fb00558a7f57db78866c3235205e2cb8a8083575efcf1a5e73c9a3b SHA512 2cba341bce50b03d17f46662b499a3378d4e5750f4abe837bbddee5c671636553660723243c4b90de96c84210926f6406f554b7936600c3ae618644af40bf802
-EBUILD clamav-unofficial-sigs-5.6.2.ebuild 1829 BLAKE2B dfdde92f921a0ab51e48d9167245b2f50d8b34678655712a68c92ac57f58ca3f4fb94b04259233662805c702721e47fb723e85ab4f2dedacf01c7131e89387e3 SHA512 b8d2e4ee32b4e5d265562ad591f885d22cb960dfda66a083d58f7cab702e345fc233b62cb74d3a1d21e3a9d1e67ddbdcc9e10026645403b7c4213593bbef4540
+EBUILD clamav-unofficial-sigs-5.6.2.ebuild 1846 BLAKE2B 5d69806a04e9df5bf989bf25358224f0df063936b48f54ad111d81d539afc4b9fbd783c93aedce6de45c4654c4854ab61a59ec838a9c7ed0734e1602bc3c0f41 SHA512 8a5d6cb3952e16345906d11aa42cef11e65dba27dfefe0176e90b8a30c1cd2ac5fae9c818915844e36e0b78cf74f239059ae6d554503ae041e998b31a5f37051
 EBUILD clamav-unofficial-sigs-6.0.1-r5.ebuild 2368 BLAKE2B 54218e3060b1156de9db3a32293c60e7d1860017f79ef1637e4131b97ccd96cc5e04833ebc27566b795f6d9d994a7164889841f015d8126bf0f716e922564e6d SHA512 8fc0c7f8b1567f4e26b3cba988a3f4ae41ee84f997b696e36596b813094ecd101f37be6960333a078b46122158c447963daa5d0b7009463526dfc8892a7f0d07
 EBUILD clamav-unofficial-sigs-7.0.1.ebuild 3362 BLAKE2B a587708cd9bba3edddc69cc014a0bfb313bfb0f4620fa91d2e19b2f1100c8968e3e9149542a118ab514ef266af35bf874da30cd712a6395b46a39b807915c837 SHA512 ffbb490e0c6c13065618b2ae381f24c2035dc8ccbc45a88f3709eaec907a63dca8627408ac068d9999ec36e9b6c0429e58f4c7d347532479d9ebcfec08b70e15
 MISC metadata.xml 699 BLAKE2B f053d76f76bc2c2f38308ba59f7cff4c991ab16a62ea63c255e543ff1ba4964cf24be6c3cf5b9f4dea82579d637c84d8c072bbc475f4d6b12665d35d00b0e7d1 SHA512 8a1a737b5012f5489cb24230f20d757f861da8ec125bd19e2aa22a5fb7f932e36d17ca771796e3eb167d3141487851e83d3a83d45e3c6a5a05ab0ce4b7738e0b
diff --git a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
index f9b2425875ad..c082402ee948 100644
--- a/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
+++ b/app-antivirus/clamav-unofficial-sigs/clamav-unofficial-sigs-5.6.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit user
 
 DESCRIPTION="Download and install third-party clamav signatures"
-HOMEPAGE="https://github.com/extremeshok/${PN}"
+HOMEPAGE="https://github.com/extremeshok/clamav-unofficial-sigs"
 SRC_URI="https://github.com/extremeshok/clamav-unofficial-sigs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 5b0b9f67b1e2..0e8c141f9f41 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -15,7 +15,9 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a
 DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e
 DIST clamav-0.101.4.tar.gz 21408145 BLAKE2B 5eba85dcf203f56cbd943e479e660469dcc1972819674f5624207f4123ec74207b664cba3c9b0318665d261176da338f3c3fba9c938eeb626ce75174d525a43f SHA512 fae914a95b674fa6bdea044abec702401146590ca0aaaea1245deb1c4770641a794f60ff7b448b24d8c1923150cb7ba230848974837257c3a8ab20ea1e2f86d3
 DIST clamav-0.102.1.tar.gz 13215586 BLAKE2B 653e5506ed0b19c154038e960184abf2773a8a12a775dda81ce4f69fe7e58c457c39d85e24ce43bda9f09f43766c81af69d5462e7459077b0e4886f73a2a5ba2 SHA512 2d0cd2dece771ab8228771f9a95eb0342e756083a0107b2bef31bd2f5f46c36aa692e15d7eb2ea321f535ea4e18c8df043c8663ae350d40fbe1bdb4d073dcb90
+DIST clamav-0.102.2.tar.gz 13227538 BLAKE2B 09d18f507a439f1dd63ebc038b129e0ead75bb344bfad2b5bd36e2c0c76af01f42fcacc60ff40b5676cb5fb7b38b90747452654a5d104b9b7b5e2d5a06b3dc2d SHA512 7db53e0e2b4d6b0e4cf5048d3c9dfbcabcffd680c3a2b718c763b9599b0c1c14e56bae70c54c251ee9e8fd1acd3134657196dbaad2d23a16bad76a088c6fc41f
 EBUILD clamav-0.101.2-r1.ebuild 5575 BLAKE2B 9b9c9cc85eafd5b34d5b027ed1f532eedaadbd363e49d26e516d0bea22290c43023dcfe52957843ba6a6361e6081cf100c4fdf8f03cd78ae6dbc2cbc7332407d SHA512 ebdb4e06350b524a844f42d8cb6f818135c2e541b088b4e49859440aebb4390438fb52198f9a65e0844c9e3d6fec2fe5c80b572289b965fb27b69cef06b02fd3
 EBUILD clamav-0.101.4.ebuild 5575 BLAKE2B 9b9c9cc85eafd5b34d5b027ed1f532eedaadbd363e49d26e516d0bea22290c43023dcfe52957843ba6a6361e6081cf100c4fdf8f03cd78ae6dbc2cbc7332407d SHA512 ebdb4e06350b524a844f42d8cb6f818135c2e541b088b4e49859440aebb4390438fb52198f9a65e0844c9e3d6fec2fe5c80b572289b965fb27b69cef06b02fd3
-EBUILD clamav-0.102.1-r3.ebuild 6503 BLAKE2B a0b563298157cae986523d03b153d360ffd4ce1ceecdfa1545d8799223501d3f397be7022e458cf3a2f3e2a28a16f898afce5d5fa3e50d41c619fcb8e8eecc52 SHA512 e58c815e746c6baefa262171ea4a966d89797c85447258bad5c066efb3541aff4c103efa24de6768f9ff088d619fe88b30df237f500e5b8179f08f5ab2886bc2
+EBUILD clamav-0.102.1-r3.ebuild 6502 BLAKE2B e5af18503deaa3fd9a055e7e7fd5ddadc0238a141e12f0485b43857a697a72f4e888bb89813295fbdd8a803f148cbe95d62ecf0eec375eec50c20db70c3df9ee SHA512 b467add5ccf67984deac0d498ab34e62290913fcc249b16fd43e4e8f69c74c30b94bc2e03c791dc3fd91db32af3f4515e9a01c3050fb69fe56a5091205657534
+EBUILD clamav-0.102.2.ebuild 6301 BLAKE2B 8887d74bff897518e5a60f788ce3120ad635618449a666146fee3e389fe6b3e0236aa1f15ad0ac9288f180315bd1e92f8fc184c1db72fabd462d0a12b6e69b11 SHA512 8929a76f727fb4209c9d8ff89c2d22386d421dc0bef11f9383e6ceb32c5ff72c267ac3c62e95357133f80c47cc37653f05c6a55f491387f3ec9ae1feff79b5c9
 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00
diff --git a/app-antivirus/clamav/clamav-0.102.1-r3.ebuild b/app-antivirus/clamav/clamav-0.102.1-r3.ebuild
index b067114b4b00..7341ff9485b9 100644
--- a/app-antivirus/clamav/clamav-0.102.1-r3.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
 RESTRICT="!test? ( test )"
 
diff --git a/app-antivirus/clamav/clamav-0.102.2.ebuild b/app-antivirus/clamav/clamav-0.102.2.ebuild
new file mode 100644
index 000000000000..f9f8087f72c9
--- /dev/null
+++ b/app-antivirus/clamav/clamav-0.102.2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic systemd
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+	acct-user/clamav
+	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= )
+	dev-libs/libltdl
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	dev-libs/libmspack
+	xml? ( dev-libs/libxml2 )
+	elibc_musl? ( sys-libs/fts-standalone )
+	!libclamav-only? ( net-misc/curl )
+	clamsubmit? ( net-misc/curl dev-libs/json-c:= )"
+REQUIRED_USE="
+	libclamav-only? ( !clamsubmit )
+	clamsubmit? ( !libclamav-only )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+HTML_DOCS=( docs/html/. )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
+	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
+)
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	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
+	JSONUSE="--without-libjson"
+
+	if use clamsubmit || use metadata-analysis-api; then
+		# either of those 2 requires libjson.
+		# clamsubmit will be built as soon as libjson and curl are found
+		# but we only install the binary if requested
+		JSONUSE="--with-libjson=${EPREFIX}/usr"
+	fi
+
+	local myeconfargs=(
+		$(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)
+		${JSONUSE}
+		$(use_enable libclamav-only)
+		$(use_with !libclamav-only libcurl)
+		--with-system-libmspack
+		--cache-file="${S}"/config.cache
+		--disable-experimental
+		--disable-zlib-vcheck
+		--enable-id-check
+		--with-dbdir="${EPREFIX}"/var/lib/clamav
+		# Don't call --with-zlib=/usr (see bug #699296)
+		--with-zlib
+		--disable-llvm
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav || die
+	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"
+
+	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:" \
+		-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
+		"${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:" \
+		-e "s:^\#\(DatabaseDirectory\).*:\1 /var/lib/clamav:" \
+		"${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
+		if [[ -f "${D}"/etc/"${i}".conf.sample ]]; then
+			mv "${D}"/etc/"${i}".conf{.sample,} || die
+		fi
+	done
+
+	prune_libtool_files --all
+
+	# These both need to be writable by the clamav user.
+	# TODO: use syslog by default; that's what it's for.
+	diropts -o clamav -g clamav
+	keepdir /var/lib/clamav
+	keepdir /var/log/clamav
+}
+
+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
+	local databases=( "${ROOT}"var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+	elog "For instructions on how to use clamonacc, see"
+	elog
+	elog "  https://www.clamav.net/documents/on-access-scanning"
+}
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index e6630acd2488..6c0ad8bbf7e7 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -4,5 +4,5 @@ DIST clamtk-gnome-0.03.tar.xz 15088 BLAKE2B cc1440de117eea036cf14a9ed36650916703
 DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
 DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
 DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
-EBUILD clamtk-6.02.ebuild 3882 BLAKE2B cb1440345212573b261607787e57fe3f15573e11bf10c1245f7da5e50d08466e0182f78cee7c89578c424ae8d574aaa32564872fef7f41c8993fe77b968348ad SHA512 70513406c36700ddabb413f94792e6e8605bb7a7fba972cbfbdc7044a70d1215a205f131807d9dfe09b6e9dd4972d9ba573ddcfd8243853fad1d21b9933c6cd6
+EBUILD clamtk-6.02-r1.ebuild 3889 BLAKE2B d3481bab34a0f27e0a5a6255e6f1744a5d38bfcfce57d0e493512f043fcc4ab44f446a67d33f5047612dbe6f9f6fba3000a63e5e0de810b5ab090efa2d3ebd96 SHA512 c4e6954978e84643c27457cc111df23ae3c1d2729a1caa9fc36406b4eaf2df70aa09ebe29d2dd1742047b2959e4f98940a984f4ec292dcea4a930e032867892f
 MISC metadata.xml 809 BLAKE2B 6c61c6d564fd120a1996f0620eb94af868a19a4a2178ebf694bda8f7a926b42848723911d2b45ed6a8199a969802d62e574422d22a76163fea2eb8d053553236 SHA512 984613fcdc7d6c2dd02475f3a9ca0f1e68e66c59961d9e43532722b5ac4c8022a4daff30742eec959da5317d4f3e10c2608538b50bad5b4d95af5ba7731f75b7
diff --git a/app-antivirus/clamtk/clamtk-6.02-r1.ebuild b/app-antivirus/clamtk/clamtk-6.02-r1.ebuild
new file mode 100644
index 000000000000..435b69a7e783
--- /dev/null
+++ b/app-antivirus/clamtk/clamtk-6.02-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop perl-functions python-single-r1 xdg-utils
+
+MY_PV_KDE="0.18"
+MY_PV_NAUTILUS="0.03"
+MY_PV_NEMO="0.04"
+MY_PV_THUNAR="0.06"
+
+DESCRIPTION="A graphical front-end for ClamAV"
+HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
+SRC_URI="
+	https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz
+	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
+	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
+	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
+	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
+"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="kde nautilus nemo +nls thunar"
+REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-antivirus/clamav
+	dev-perl/File-chdir
+	dev-perl/Gtk3
+	dev-perl/JSON
+	dev-perl/LWP-Protocol-https
+	dev-perl/LWP-UserAgent-Cached
+	dev-perl/Locale-gettext
+	dev-perl/Text-CSV
+	dev-perl/glib-perl
+	dev-perl/libwww-perl
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Encode
+	virtual/perl-MIME-Base64
+	virtual/perl-Time-Piece
+	x11-themes/faenza-icon-theme
+	nautilus? (
+		${PYTHON_DEPS}
+		dev-python/nautilus-python[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
+
+PATCHES=( "$FILESDIR"/"${PN}"-6.00-change_icon_path.patch )
+
+pkg_setup() {
+	use nautilus && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	unpack "${S}"/clamtk.1.gz
+
+	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
+	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
+	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
+	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
+}
+
+src_install() {
+	dobin clamtk
+
+	perl_set_version
+	insinto "${VENDOR_LIB}"/ClamTk
+	doins lib/*.pm
+
+	use nls && domo po/*.mo
+
+	doicon images/clamtk.png images/clamtk.xpm
+
+	domenu clamtk.desktop
+
+	doman ../clamtk.1
+
+	if use kde; then
+		insinto /usr/share/kservices5/ServiceMenus
+		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
+
+		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
+
+		doman ../clamtk-kde.1
+
+		docinto dolphin
+		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
+	fi
+
+	if use nautilus; then
+		insinto /usr/share/nautilus-python/extensions
+		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
+
+		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
+
+		doman ../clamtk-gnome.1
+
+		docinto nautilus
+		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
+	fi
+
+	if use nemo; then
+		insinto /usr/share/nemo/actions/
+		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
+
+		doman ../nemo-sendto-clamtk.1
+
+		docinto nemo
+		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
+	fi
+
+	if use thunar; then
+		insinto /usr/share/Thunar/sendto
+		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
+
+		doman ../thunar-sendto-clamtk.1
+
+		docinto thunar
+		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-antivirus/clamtk/clamtk-6.02.ebuild b/app-antivirus/clamtk/clamtk-6.02.ebuild
deleted file mode 100644
index df2e37a36698..000000000000
--- a/app-antivirus/clamtk/clamtk-6.02.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop perl-functions python-single-r1 xdg-utils
-
-MY_PV_KDE="0.18"
-MY_PV_NAUTILUS="0.03"
-MY_PV_NEMO="0.04"
-MY_PV_THUNAR="0.06"
-
-DESCRIPTION="A graphical front-end for ClamAV"
-HOMEPAGE="https://gitlab.com/dave_m/clamtk/wikis/Home"
-SRC_URI="
-	https://bitbucket.org/davem_/${PN}-gtk3/downloads/${P}.tar.xz
-	kde? ( https://bitbucket.org/davem_/${PN}-kde/downloads/${PN}-kde-${MY_PV_KDE}.tar.xz )
-	nautilus? ( https://bitbucket.org/davem_/${PN}-gnome/downloads/${PN}-gnome-${MY_PV_NAUTILUS}.tar.xz )
-	nemo? ( https://bitbucket.org/davem_/nemo-sendto-${PN}/downloads/nemo-sendto-${PN}-${MY_PV_NEMO}.tar.xz )
-	thunar? ( https://bitbucket.org/davem_/thunar-sendto-${PN}/downloads/thunar-sendto-${PN}-${MY_PV_THUNAR}.tar.xz )
-"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kde nautilus nemo +nls thunar"
-REQUIRED_USE="nautilus? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-antivirus/clamav
-	dev-perl/File-chdir
-	dev-perl/Gtk3
-	dev-perl/JSON
-	dev-perl/LWP-Protocol-https
-	dev-perl/LWP-UserAgent-Cached
-	dev-perl/Locale-gettext
-	dev-perl/Text-CSV
-	dev-perl/glib-perl
-	dev-perl/libwww-perl
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Encode
-	virtual/perl-MIME-Base64
-	virtual/perl-Time-Piece
-	x11-themes/faenza-icon-theme
-	nautilus? (
-		${PYTHON_DEPS}
-		dev-python/nautilus-python[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-DOCS=( "CHANGES" "credits.md" "DISCLAIMER" "README.md" )
-
-PATCHES=( "$FILESDIR"/"${PN}"-6.00-change_icon_path.patch )
-
-pkg_setup() {
-	use nautilus && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	unpack "${S}"/clamtk.1.gz
-
-	use kde && unpack "${S}"/../clamtk-kde-${MY_PV_KDE}/clamtk-kde.1.gz
-	use nautilus && unpack "${S}"/../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.1.gz
-	use nemo && unpack "${S}"/../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.1.gz
-	use thunar && unpack "${S}"/../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.1.gz
-}
-
-src_install() {
-	dobin clamtk
-
-	perl_set_version
-	insinto "${VENDOR_LIB}"/ClamTk
-	doins lib/*.pm
-
-	use nls && domo po/*.mo
-
-	doicon images/clamtk.png images/clamtk.xpm
-
-	domenu clamtk.desktop
-
-	doman ../clamtk.1
-
-	if use kde; then
-		insinto /usr/share/kservices5/ServiceMenus
-		doins ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.desktop
-
-		doicon ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.png ../clamtk-kde-${MY_PV_KDE}/clamtk-kde.xpm
-
-		doman ../clamtk-kde.1
-
-		docinto dolphin
-		dodoc ../clamtk-kde-${MY_PV_KDE}/CHANGES ../clamtk-kde-${MY_PV_KDE}/README.md
-	fi
-
-	if use nautilus; then
-		insinto /usr/share/nautilus-python/extensions
-		doins ../clamtk-gnome-${MY_PV_NAUTILUS}/clamtk-gnome.py
-
-		doicon ../clamtk-gnome-${MY_PV_NAUTILUS}/images/clamtk-gnome.png
-
-		doman ../clamtk-gnome.1
-
-		docinto nautilus
-		dodoc ../clamtk-gnome-${MY_PV_NAUTILUS}/CHANGES ../clamtk-gnome-${MY_PV_NAUTILUS}/DISCLAIMER ../clamtk-gnome-${MY_PV_NAUTILUS}/README.md
-	fi
-
-	if use nemo; then
-		insinto /usr/share/nemo/actions/
-		doins ../nemo-sendto-clamtk-${MY_PV_NEMO}/nemo-sendto-clamtk.nemo_action
-
-		doman ../nemo-sendto-clamtk.1
-
-		docinto nemo
-		dodoc ../nemo-sendto-clamtk-${MY_PV_NEMO}/CHANGES ../nemo-sendto-clamtk-${MY_PV_NEMO}/DISCLAIMER ../nemo-sendto-clamtk-${MY_PV_NEMO}/README.md
-	fi
-
-	if use thunar; then
-		insinto /usr/share/Thunar/sendto
-		doins ../thunar-sendto-clamtk-${MY_PV_THUNAR}/thunar-sendto-clamtk.desktop
-
-		doman ../thunar-sendto-clamtk.1
-
-		docinto thunar
-		dodoc ../thunar-sendto-clamtk-${MY_PV_THUNAR}/CHANGES ../thunar-sendto-clamtk-${MY_PV_THUNAR}/DISCLAIMER ../thunar-sendto-clamtk-${MY_PV_THUNAR}/README
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index db3880b0a197..23144c227556 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest
index a49520c261cd..84c5ac1245f0 100644
--- a/app-arch/cfv/Manifest
+++ b/app-arch/cfv/Manifest
@@ -1,3 +1,3 @@
 DIST cfv-1.18.3.tar.gz 68030 BLAKE2B 72372ebf7fa2d72a68b20cc0bf82823e973de5e8acacdcded85f50ad0e2f3e867c6924828b0a4ee42663e623d0d6d2e55b3f4b94addd83a703e4502edb1dda35 SHA512 dbca82df850703ab68a20db9314475025ac2e7012f34a12abbb358677e81cbb29a465adf4a1b002f6cf1c1dd84f1588fc1072791d6bbaad0c02cc563e5fe7d71
-EBUILD cfv-1.18.3-r1.ebuild 745 BLAKE2B e781ee1173842bc29fd4a8e9a7af77637dddd25dd2faefb85bf3d4250f05f2d8787d6e5cde39708e9db3deaf18af9a371e5fbe8df0df47d0a8bf051e4300b3d1 SHA512 4b84222ca5b887626f958709c8ca665451d7de46be75d14cd7c9dcac63f52db4a3b75275b2e969e675c4700a001eeba3217cca4a9ed176b02777ed16531c479d
+EBUILD cfv-1.18.3-r1.ebuild 785 BLAKE2B e94a77aabd9f6caaabc0d8bd8239c4fcf459b8a824af501368d19add43c4dc00a89cfa9abdd8e0074597c8ce7ce11e360a1e5a88cafa28d6943ae448fafeae8b SHA512 591f2700700c9bd4d08f7e075dbe2d8e18b8e4029df4ef07122bfb96d45bb7a6961b2b283af3856e015f8ba0df7dc36274b88b036b1f18b4cd12116335f627c3
 MISC metadata.xml 581 BLAKE2B bc30bbb35470c1ab89641e3da14813f964ff2e4d2aeb6f37abd4bba0e4b5e5288b21637927fb0a8c04066653a09a66d00d3fcbd67a65d4b18e59cd1c31eefa1d SHA512 ac57bc554978a1f62b0ecef157853b66a00aa7098be0f5e42e01e5cf9546a8aec259dca9037d6698defea3e2e265ef7827e9e9cc73db98d6584896a3755b9d56
diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild
index 05ba386240c5..3fdafa44a202 100644
--- a/app-arch/cfv/cfv-1.18.3-r1.ebuild
+++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,8 +18,10 @@ KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
-	dev-python/python-fchksum[${PYTHON_USEDEP}]
-	bittorrent? ( net-p2p/bittornado[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/python-fchksum[${PYTHON_MULTI_USEDEP}]
+		bittorrent? ( net-p2p/bittornado[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index 44e2fe9080db..9322be2550be 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,5 +1,4 @@
 AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
 DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
-EBUILD deb2targz-1-r2.ebuild 647 BLAKE2B 1a921c18c5cbb13b01cb70394b81ba5e69a148f0020e7e2cfe98820ee3c5ce0923b0e0e17d9753c9bf53630b2de348ed3a641d4aaed2b72dffbd9d3c4521c0ee SHA512 834e4b97d44c9dd3a8052e81f49178c91c3e12574d746ed8142613da44922605542df26873e3818fba3c10a9a24707d93912d11e4470e70ec1323826d6444735
 EBUILD deb2targz-1-r3.ebuild 620 BLAKE2B 1c133e08f12e80914d91deac2faf9e6944b50b992aef3bdcc781e9066d4f58b5add1a9e6607e4c41ca0058bdc399d8919ad779007124016397b123382e2de2a2 SHA512 d9e5da4e10599eca4159cd8c8804777b82bd95d4a343245281c203252431cd239ee716a58097046e049ffb1257e899f8b88a6d38b73a78a64996e0077986ce64
 MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/app-arch/deb2targz/deb2targz-1-r2.ebuild b/app-arch/deb2targz/deb2targz-1-r2.ebuild
deleted file mode 100644
index f2c8a15145e1..000000000000
--- a/app-arch/deb2targz/deb2targz-1-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit base
-
-DESCRIPTION="Convert a .deb file to a .tar.gz archive"
-HOMEPAGE="http://www.miketaylor.org.uk/tech/deb/"
-SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-S=${WORKDIR}
-PATCHES=( "${FILESDIR}/${PN}-any-data.patch" )
-
-src_unpack() {
-	cp "${DISTDIR}/${PN}" "${S}"
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
index 60834b34090b..46d556b4e404 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,3 +1,3 @@
 DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
-EBUILD lzma-9.20-r1.ebuild 884 BLAKE2B e74b87a6c1227401469972335506b128131aee6155da6893127616e43124f42b5ea58330dd15798d457542d7f69bfd16450b8875928968d431b9862f45b16494 SHA512 71bd5054fe67ad9678b59e4591ca29700a9a8fa83ca90e7e07d159dc396a97e5899a1b2fe52f753d301ad2343b4799cfa3e64ec5a6f7dfb9a5fe2ebec7c54085
+EBUILD lzma-9.20-r1.ebuild 889 BLAKE2B 5251a783ff4fe58c0087d9c969b37c91fda0e3e3ebf8743a74d0bb314d098ddaeaad66911d524a9d8415767a5a35123e58bcebdebab350768fce7b20356b5584 SHA512 4318d54b4e1dbac9b817e26d23606d56458e98d85ce3679db896fec1a915dc001ea934022d50ed2f571feef0b17e3ffa6f429d079dea78cf47cc5648c790a7fe
 MISC metadata.xml 250 BLAKE2B e05a373f0ea02a1a107bb27632d2f6b87bb754d82a7a7c6f56b7bb6041a92a0bea6ef1a6353cd535f5f9d992b10cb68e402c4efa3189d7f65d2c9fc904a4610a SHA512 7bd753e69082bd70f8afe68f12584dd5ee18b9972c27c523570075d4d0168f3e3d8eb638da7ca08ab3969904e39ec2c76f4891fd649a26553abd4115a41b70bb
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
index 7f1a8de904eb..3a61ba9f510f 100644
--- a/app-arch/lzma/lzma-9.20-r1.ebuild
+++ b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 S=${WORKDIR}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 9119a27678bc..d83bb494ba74 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -2,5 +2,5 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9
 DIST tar-1.32.90.tar.xz 2145976 BLAKE2B 95f1442da87bcbd58e0a6aad303b8c9da9179cc32a6e835d3fbe2e090ad4316e96265a54f573906b262034b92d8d3e56f3ff2609145249bd16dd4ea2a79bb601 SHA512 a42703b73ec3c1f462849469f00dd190a0164972fd2e97f128c3b559a6e9c79e87d5bbf47fca17ca9f8b6810221fbc727b6c15e38693256d9e43a2c2a2d7b593
 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
 EBUILD tar-1.32.90.ebuild 2241 BLAKE2B 7278283c24c652daf44dc8b4c9f3874f16d9dd1c951ccb3e3282f0152d2e8d15b8473838fec99214186d0b2f697c001139a1dcea7d2d07f8850e7a0cc43f5e0a SHA512 7ddff2e4d12bbff96553a3b546868fd724b120372c7f3c96393aeb82d26f65699080969896fe2347e0c6e502e11484cc0a216da318e837272dc4327f20ffb327
-EBUILD tar-1.32.ebuild 2185 BLAKE2B b5a2eb360f79c4a8dd43cbc7a93a174cb7723a50b440cfa6c026f7b166918b218536d46ae583df014bcb96737a758a4ec02df8a7d6dd89c5dbc054b1d097139a SHA512 e905cc2052399f180e6b6a57a398343db300ba343131f3b4a819dffc05a8c1cebdfbe357da97f30da38667d4141de856f0512bc3dad7d40487126afe032ecf99
+EBUILD tar-1.32.ebuild 2181 BLAKE2B a44af952b2ae85b122f38e20c74ba3e1bc550b2420fa1fd9897c7850d71034e9788fc3e52b77bb6e522c8ed98664be49900cec31afefc0299c1e47dc8f5b252f SHA512 df70570bbc0b6f85263b153a20ad1b51e3ce23aba232c746083c748fb3c1b4841cc78ff28b706f4b2e3517642431eddb2cdba00e5f93ca5e171b98e5b4fdc0de
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild
index 5cd710f63505..eedf274e20ed 100644
--- a/app-arch/tar/tar-1.32.ebuild
+++ b/app-arch/tar/tar-1.32.ebuild
@@ -38,9 +38,9 @@ src_prepare() {
 src_configure() {
 	use static && append-ldflags -static
 	local myeconfargs=(
-		--bindir="${EPREFIX%/}"/bin
+		--bindir="${EPREFIX}"/bin
 		--enable-backup-scripts
-		--libexecdir="${EPREFIX%/}"/usr/sbin
+		--libexecdir="${EPREFIX}"/usr/sbin
 		$(usex userland_GNU "" "--program-prefix=g")
 		$(use_with acl posix-acls)
 		$(use_enable nls)
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index ec6bee6fd9ee..ff344c93f6ef 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,5 +5,5 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
 EBUILD unzip-6.0_p21-r2.ebuild 2572 BLAKE2B 73d5d122d7235addf9d00b9ffb8f756ff624994d20fc49cddbc7cdf817a56878d0963aba9bfb551c5e0433821f9529c58ee0328f73bb02a6a21713b72d94fc28 SHA512 0655022342398ce2cf53308eb874929e1ba2aed0fc63a954ebd95a4f58f30babf3b15386e920f4c35998c6b869114cf1bf8201d40fc73c168a352a9129cc549b
-EBUILD unzip-6.0_p25.ebuild 2576 BLAKE2B 161eff2576eb01839462c07a7ae577908295f4cd98cfe789400edb4057acc2b9af93e0b5f16ca41b1a233fd7523f7536d4392019eb11fec710d25face033daa8 SHA512 71b86550aec62d2ac257d62283e280ae2521f06ab850f67610b55e1f81466086b2fd36781fc85a2b6f51aeefd9f5f5ac5b1e683ac67211624f8898e2e9b20fea
+EBUILD unzip-6.0_p25.ebuild 2575 BLAKE2B 2b3efa2f332208b07273e2806c3c00ce4e565ad6188a13a1420b86f40665ec6bea57f485da284aa42bbca423425df3313628cdf8eca8de2276143be929f9db5f SHA512 162e64fe61ba6343592733923183e741c0d77b0dbb832cdcc93a2a917cbf70ac48d25639ad0cf0040843df17d0e28b613446ee0b207d0964c65c8c4069d39276
 MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild
index 3268759cabd2..b0f5ed79c0d8 100644
--- a/app-arch/unzip/unzip-6.0_p25.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 9a3b287f61e0..fc3b3a4870e1 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/backintime/Manifest b/app-backup/backintime/Manifest
index 1151836d4b3a..f3c7fbbd5c8e 100644
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@@ -1,5 +1,5 @@
 AUX backintime-1.2.1-no-compress-docs-examples.patch 6018 BLAKE2B 9ef4f8c5b81677340707e98550ab8e0d4c574a9bfe36fbb9c178f2050ca726ce995927bf2a186363243cc64f4e8be3b99a12b7b2b37ad0d4f6892ae6f730e48d SHA512 6484fdcc4ede6f5c57bfef985a290b9d8a74aecaea43e239a3368cf79aa6797d7fa4842fa331b259afd25084d9c514e643916c39c34d4a8b33bc668c93d9b180
 DIST backintime-1.2.1.tar.gz 713853 BLAKE2B 0f05d6cdc04a41ec9737badb8693c1270bb1333b2986fce925625ba2d7be05de0630ff5f59a7b5854a38ba382d6992df1ffc4e1cb584cae0e2618b877db4f06b SHA512 91dbc76a7db81469c5a538be03196c8e307d13307486d8e1c6cad10ce0af399de495f0292fecffc2853ed78804b5899750f06f274b4701efe3af6a708ea1024e
-EBUILD backintime-1.2.1.ebuild 1570 BLAKE2B e4f9c91f68e1cb2f4555710f7fa4f13e92f1510925164b4f37f0ea68e59088d1ed9dad825cb2750c3afdfcd77d9265056eb048d35af91edb522e22c8f2850c77 SHA512 b435eaef2132819345aa0afe20284e68d0a55bfc37d76998fd815b203e8231df42a1c221b4d11e01b397abf81b352325324ec828e439ed1b6553f7db0d47b22d
-EBUILD backintime-9999.ebuild 1550 BLAKE2B edc146152d284404369cef150bde83d55b5946ac8656a6cdea483618f993001f1160c6b34b7525f17a45f181a7b700f1af6856e49f35dde16098f554c5f6b749 SHA512 00a52d19d2b307b0696a51955fab2c219d2b13d4e6ac2684d21a1dc5c8af0c75a11e49fcfee905dad33b865c8bdc88afbe5c4dbf94ee309f72858d5abb6b8e88
+EBUILD backintime-1.2.1.ebuild 1613 BLAKE2B ea0209ffe4eefb90830a5f0e8a155bc49b049faa18e19b64684bbe24d384b169f56180a77112fe35d182aa88eb8bcb80ae72cb0baf822612ebf24a7bf8fb3d4e SHA512 ccc1dd3abdb468c9755bcb13ad55a2922befe03aaf2f5adeb162cb9850e36d37558d65d9ae237fcc3070b539693f012ee7600b95992a4b0bf4fb1c06c09e1fb7
+EBUILD backintime-9999.ebuild 1593 BLAKE2B 9f9371164e1162a402fcff1bb876b857daf6facfdd7be0394f7358498639c5ad2cef5943c28b97988adec98bff4b54104d703ad4f535fa765caca79dc392672f SHA512 ea53c11d6786a677c0b7a0c790bc405a1306c183affc9fcb7c7d9ff15c90b28c8e18a21543e530ea889737d2076bda378546a11b28e5afbfee96b9ef839159f6
 MISC metadata.xml 640 BLAKE2B 1f3990bb871e2158d4b1213caffc46fc83766619a6ad3e6c24f014ab62318e5140d91eb56e4806d34a2daed1e1a066f08b1205deb5c2aba7d60e6f90a7d193ea SHA512 d38c67f79e8a2a61314283bbd4c23979657dfdd4208f3d09d0a714251dd49c5420b1bc50c1817837541034df6b0c43e3a20bea625d5e67f488c027855456bdb6
diff --git a/app-backup/backintime/backintime-1.2.1.ebuild b/app-backup/backintime/backintime-1.2.1.ebuild
index c7bc7578f634..754fca5ac5f6 100644
--- a/app-backup/backintime/backintime-1.2.1.ebuild
+++ b/app-backup/backintime/backintime-1.2.1.ebuild
@@ -19,8 +19,10 @@ IUSE="examples qt5"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+	')
 	net-misc/openssh
 	net-misc/rsync[xattr,acl]
 "
diff --git a/app-backup/backintime/backintime-9999.ebuild b/app-backup/backintime/backintime-9999.ebuild
index fc293b01096b..d243f64edfde 100644
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,10 @@ IUSE="examples qt5"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+	')
 	net-misc/openssh
 	net-misc/rsync[xattr,acl]
 "
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index d0c9adef720e..67f7bf468912 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -10,6 +10,7 @@ DIST btrbk-0.28.1.tar.xz 94740 BLAKE2B 75313aabab7208083e06a2d4bb607950c7d5d0e87
 DIST btrbk-0.28.2.tar.xz 94888 BLAKE2B 4501a8bbe1c88e2449c67d3c5e2322c8b3d3bd5b855cbc0451ff59a3e9aea66de4110587f786fee8f21acfb8a7e496f80a21a91a0e0756d37130bd49a76bb26f SHA512 43e9e0dfe48b0b0c8d1b64e2ce447b9dde9c494b2ad233d68e6ad0648d746d1e950751199f72affe77e06b0c94567912b399bd0b6aa8ebc31dd8fb87ef9ae0ae
 DIST btrbk-0.28.3.tar.xz 95000 BLAKE2B 95de0eae8621b313e9dce3a90ba416a0e4553b05e7e9e1432bd740941ea4b7bdc154a6dd34c9cf7b7ef9fb98f46fd4bc99a3b37933b4c9bd21ef493a7f51e2a5 SHA512 a2919527ab14486113c075fdb2646ee70fa20c813e5a69fc8a0cd16b75bc7aaccee338b272da938f6223a4be8c2d539839426b55ce72d338c7cf20680a41a849
 DIST btrbk-0.29.0.tar.xz 97632 BLAKE2B dc7b63804a2a4ff99ae33e2247363402cfa683bad852c1b70bbb8fc3571730a690589cff1184a3c6e63b66b385430027b55da959e7dca96b7eca6eff900be109 SHA512 e3b0fd45bcaafa4fe53e230bb66cc23ae950dd91251d5e4d19a576021f2dcc52b219cd348b1b747224c2da803b47554266f4fc91c092a62decedc74ac59b9b28
+DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e
 EBUILD btrbk-0.24.0-r1.ebuild 755 BLAKE2B 1ee8bedbe3dd869c4afb8103763269906d4a75c5dccfebefebb851bdb4a1243d14eac3a35d5e8ac5d29660b96e7856e0421d2804f83c982c47d58f888e3b498c SHA512 2924123eeabd0b1e7a325d9b413c6ff9ee750184b85ea1f460f236aa74e978df1e5537ab77fc49e8f82148caff743724355d31cf60aa5e760d1615b60d22f7e5
 EBUILD btrbk-0.25.1-r1.ebuild 743 BLAKE2B bb707beaa6dd1dae7648262190ee05f76f70197982d6994386e9ee8bc8e885a88ba0c9f9eb33d2846f9f7b023d6a0c97a95d9bf04fbb6de72d8ff489da09d8b2 SHA512 452cdc0bbcba6b08e00bbccdc0332dc06aa59d746a0e8a608ee5da5bb5ac2047705380df2e7865fdd3a2e3d44fce6a4b1fda8e890f150a8a3d543d63fa2610eb
 EBUILD btrbk-0.26.0.ebuild 1078 BLAKE2B 9c92380e34d5005cc0d738c68e7b404a4db77fccc1a233ada610d7518e253cfaafa91135da7d9ce6cf6546150a6805f524b3a9302b680b84e63616a1f910b029 SHA512 0d22df7d376f96de76a19be8a3ce7a9e7773c02c6da7545949ce0083a32ea6e5aaeabf026ce91655af34109532fa06fbd8b074e494e591d529dbb9d6f0bd4a58
@@ -23,5 +24,6 @@ EBUILD btrbk-0.28.1.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4
 EBUILD btrbk-0.28.2.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 EBUILD btrbk-0.28.3.ebuild 2304 BLAKE2B 27a92a35f09b88cbd4b3cf0f93bc1819a34849a4d2bba93ff536541f159f917d4a0bfabc44065978209e59f3f1a425566209614f389b1c2b40aa6adb1d396638 SHA512 6422fc1801469d7300c192a73664b7ca3f6f068e6b2c21cf56fbe8ebe508bfe5cab8e4c8d1d4356b1e82ce47506448ac65693f49d35215738e11577c4d3ad6b4
 EBUILD btrbk-0.29.0.ebuild 2331 BLAKE2B b86a85018684272d61b418d4d6fe4c048a25d9622c5b64f5279d2d7efeaac5f446f3ed697d133cb729393655a155124ad36f11cc0b8c1ea43984bfe83bbc0371 SHA512 26a88ea69c785cb390dc66f47886b3b79953afef98f89fbd2855a8ab5151b213c5e93ed18a985e29752ba55ef6638b8fd9f09ec0a723005fa18433c9b42b8467
+EBUILD btrbk-0.29.1.ebuild 2331 BLAKE2B bb63b25a014de179f0819dbb467558a986d1888d0b11f66d6bedf0a54c72850f013ea2f127419bc32644aa81adba139bd220a907b1f9429d1b47edfa6dcbf7f8 SHA512 c4efc36a09e9cd25a3c928a0a0cb213d7b3d449371107ef0903dc43bba6adebbe3d64f94093d43169331b2a3f6d08af2aab431dfdf00b06bb4a266b057afb389
 EBUILD btrbk-9999.ebuild 2331 BLAKE2B b86a85018684272d61b418d4d6fe4c048a25d9622c5b64f5279d2d7efeaac5f446f3ed697d133cb729393655a155124ad36f11cc0b8c1ea43984bfe83bbc0371 SHA512 26a88ea69c785cb390dc66f47886b3b79953afef98f89fbd2855a8ab5151b213c5e93ed18a985e29752ba55ef6638b8fd9f09ec0a723005fa18433c9b42b8467
 MISC metadata.xml 1194 BLAKE2B 9fd7bc80e3334d38cc30df17375b709fea9af5b31ff48c74d3ccb65bb8b58940a1c0c0640c977f476bb13dffa357db3d6f2672b11b9ab658b67c46ce1ca8c788 SHA512 1949a2a9b14669ab67a53b3aa86dd1838c0ad4ef924a2f6729bf7a0b17c67f1db9e6094e746b710988440905b713c8938af36caffe9b9f4440c65ba72e4779ec
diff --git a/app-backup/btrbk/btrbk-0.29.1.ebuild b/app-backup/btrbk/btrbk-0.29.1.ebuild
new file mode 100644
index 000000000000..ad1b3ac26548
--- /dev/null
+++ b/app-backup/btrbk/btrbk-0.29.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
+HOMEPAGE="https://digint.ch/btrbk/"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+mbuffer +doc"
+
+DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
+
+RDEPEND="dev-lang/perl
+	net-misc/openssh
+	mbuffer? ( >=sys-block/mbuffer-20180505 )
+	>=sys-fs/btrfs-progs-4.12"
+
+src_compile() {
+	emake clean
+	use doc && emake -C doc
+}
+src_install() {
+	local targets="install-bin install-etc install-share install-systemd"
+	use doc && targets="${targets} install-man install-doc"
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="/usr/share/doc/${PF}" \
+		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
+		${targets}
+}
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
+		upgrade_0_26_0_warning="1"
+	fi
+	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
+		upgrade_0_27_0_warning="1"
+	fi
+}
+pkg_postinst() {
+	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
+		ewarn "If you are using raw targets, make sure to run the"
+		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
+	fi
+	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
+		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
+		ewarn 'monthly/yearly backups could get deleted when upgrading to'
+		ewarn 'btrbk-0.27.0.'
+		ewarn ''
+		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
+		ewarn 'or systemd timers calling btrbk.'
+		ewarn ''
+		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
+		ewarn 'check if any snapshots/backups would get deleted. If you want to'
+		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
+		ewarn ''
+		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
+		ewarn ''
+		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
+		ewarn '(".keep_forever" suffix in the example above).'
+		ewarn ''
+		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
+		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
+	fi
+}
diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest
index c091fc640399..385a9c89b23b 100644
--- a/app-backup/bup/Manifest
+++ b/app-backup/bup/Manifest
@@ -1,4 +1,4 @@
 AUX bup-0.29.2-sitedir.patch 1186 BLAKE2B ae56baf75e32994afc6dfad386f19edfeed6d02918c572dfef2f4ecbe6c13c9e4e9a78819dbeae21c32fba1f7914b1ea43f41f52c2770c738e724ebe52031ff8 SHA512 1d1848bc24cc1216fde35ed3eabef52a0cef0a6c7c0be7d51d3829f413e0a26abd3441fc958e3461bbc5faad8b97e903e6f86f1de418b4d211996f213db5e37e
 DIST bup-0.29.2.tar.gz 389145 BLAKE2B 1a54cb68b2c68ecf4902a7f1ee940711b62e413c69d17ba1515f24e115484bac1b4919947f2214ffff784389839f633fbb13dea69c186246426e57c33a148c4c SHA512 10c433d6779b1fd7e1935c587676492d96a330dc3280556332bb55b6e5c62de8631fd755d07d2eaf80cb9fa209dc25b241d5ecf3a6fe2b8210a3d0e1ce4fa4bf
-EBUILD bup-0.29.2.ebuild 1243 BLAKE2B d291de78398bde7d4884a9d125d157db092f4ca5d21fdfedfc7a6278f20fc9ea39b6fcb04184214a735129b146257eb90db0d1065c87dddb983ce74971b51806 SHA512 cdee0ec7fbffc2a4bcccc6de0456a361eb6c9c189da936678b50cfbaa198638419fcf0d240494afc2ce29f04ed905e48cc953753fbd47e75015d70a0f2581af1
+EBUILD bup-0.29.2.ebuild 1300 BLAKE2B 06a9ea4ace51b506700235c01bffd0dd75f72dc0dc5d9ec303b3132954f1e862431096506e2ea785f038931cd023ff799fca77ddf412ccb0bc6d735322ecec69 SHA512 08ff21b76d1ccafd6c626ac1c166751c504522b355360f70e893ed5e504387e8ba5774412e476dda4c973c26a84392351129e5fe18d901c76fb43678fdb96791
 MISC metadata.xml 325 BLAKE2B 02b15157395396dd68b8020bfe90ee4c1a3f8dd6a093ee6a9873a34320bddb32a937d91bf509b363e4207fe361fee0115311656872d49523b55703d6ebf9704d SHA512 00eda495637d81b12b965a3890437a35030e3ea246d81615b6e4b598bcbe991343e5abf03cfae5072d0b0a58ec2ad9d4f1591a12907563b537c62c3f9119b177
diff --git a/app-backup/bup/bup-0.29.2.ebuild b/app-backup/bup/bup-0.29.2.ebuild
index e42e7328e08f..e4d3a98673fa 100644
--- a/app-backup/bup/bup-0.29.2.ebuild
+++ b/app-backup/bup/bup-0.29.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,12 +18,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	app-arch/par2cmdline
-	dev-python/fuse-python[${PYTHON_USEDEP}]
-	dev-python/pylibacl[${PYTHON_USEDEP}]
-	dev-python/pyxattr[${PYTHON_USEDEP}]
-	web? ( www-servers/tornado[${PYTHON_USEDEP}] )
 	sys-libs/readline:0
-	dev-vcs/git"
+	dev-vcs/git
+	$(python_gen_cond_dep '
+		dev-python/fuse-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pylibacl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxattr[${PYTHON_MULTI_USEDEP}]
+		web? ( www-servers/tornado[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}
 	test? (
 		dev-lang/perl
diff --git a/app-backup/mkstage4/Manifest b/app-backup/mkstage4/Manifest
index 36d4a27f6a8c..52eeccf38c42 100644
--- a/app-backup/mkstage4/Manifest
+++ b/app-backup/mkstage4/Manifest
@@ -1,4 +1,6 @@
 DIST mkstage4-0.1.tar.gz 15220 BLAKE2B 43f091615d4fbb19495c2103729556ec307501f93c60bd0df676f710868d932dc7bb7e0a1c2f6613d0cc2edc266f9b9f7b74e534e84a7d41a4bf4f66c09f98e4 SHA512 e42d23ffe214c9fef8dde94f8b8faa32490e9e553f182f042a2c4d713a72031c9560e291b6231a0ced812e43f80a58cb3fa5bfdc4ad7e132d7ea7c74525d64c5
+DIST mkstage4-0.2.tar.gz 15998 BLAKE2B 47ce4335ea5dd9cc0defb2897912ce3169e1ef23d03435ed7500a33f26e5646b1b97aebcac286a93e631f11c491cb076831d62c7b565493458c0882e6f359b94 SHA512 31b77782e6b79db1cb1db7baf30a2bd96e828861a9085b257d554d0991ea16299c3cc9a6e3fa2af5738aeb3ffbd040f6627af3510ccb8fd744b59658acc2dd55
 EBUILD mkstage4-0.1.ebuild 459 BLAKE2B 7bfa3edfb99837f99eec51dee1e70fc6754097c01e05afae9cae5721fecc285d3c8d503769062a60f28d631e3d709ef0b6495e70d0134da861507ba335a5ac97 SHA512 2568f56448c7a430a4df279550821c55ad50b5f46bd7b17d1188e411393949c557cab846975d09f1c4fbf09896408e0c34dad4df53ba0e2d6045575532b0b05d
+EBUILD mkstage4-0.2.ebuild 455 BLAKE2B 0e9e34ff5bfbead88fe060303276b55c6ad47544d702ab5c4517cedd7baaf9c6d1e08e1c28298b26dbe5664ea88dd10bba00bf8efc42b4cbf4837b26ba370ba8 SHA512 5de5cd34bbaa7070d4ac5d9d1cec1e2ba35c8def577f7b02f3250980dcdab9d29e0c72605ce7d058fac6c707517a32b489d8000f0fefb8821ef58562cd1f23d6
 EBUILD mkstage4-9999.ebuild 440 BLAKE2B 9663bbe0c3a0bbf346fb91345a647ec2d9597f4890f625424ba8efbbad4a2835233590cca543ef68763ed6b4e8d416ac0e36e8a736084902488b6191f1864b31 SHA512 ce683de171866c996a6d3ae269cd3e74adc11203bc42d03f15e79935ee3315dc8c4795fc36ebdabfe4329b1ffadc93ea9ba680bf890b2b43d5fa24d9357f079a
 MISC metadata.xml 707 BLAKE2B 03820bb993e66eae180233f519ace9f0eb69fa4dc9e6202967a54f87931d104d0d1c67f4c00256ebb969712347b4e49384fc7a12003772ea8f5e96bcefdda574 SHA512 a3271d39d05e3c63a703bfe268b1094545cd3900cf0e04fa196d1c611bbb2376fed3c7b61f7626810d794eb0cce8b2bf73c380b81b79e0ff91cfcfec3e34025e
diff --git a/app-backup/mkstage4/mkstage4-0.2.ebuild b/app-backup/mkstage4/mkstage4-0.2.ebuild
new file mode 100644
index 000000000000..76dbb21e5baf
--- /dev/null
+++ b/app-backup/mkstage4/mkstage4-0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Bash Utility for Creating Stage 4 Tarballs"
+HOMEPAGE="https://github.com/TheChymera/mkstage4"
+SRC_URI="https://github.com/TheChymera/mkstage4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	app-arch/tar
+	app-shells/bash
+"
+
+src_install() {
+	newbin mkstage4.sh mkstage4
+	einstalldocs
+}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 5bcfdbf19161..9d08ad736904 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdcover/Manifest b/app-cdr/cdcover/Manifest
index de46849d3b5a..fa04d0889c85 100644
--- a/app-cdr/cdcover/Manifest
+++ b/app-cdr/cdcover/Manifest
@@ -1,4 +1,4 @@
 AUX cdcover-0.7.4-Makefile.patch 480 BLAKE2B 42eda735fd5a49565dc30625ff4f25154e8060ef81996352dbc83975b3a5fb003e523162ccdb51baff0566249767a5f1754dffb97733fda89192df9a84bb8036 SHA512 eac8ee9fdd649c2f42a20ce8a695c0849d82a8cbfefb85646503d76f2d3f64f7cb17d63fc5924f0a83644d6b9aefa4e5d9d7c3d2c7e69e5572bb5d17ba05ebc3
 DIST cdcover-0.7.4.tar.gz 908267 BLAKE2B dc048bf756e8e9a55f477462a81975ace669c2ecd8d062b5880dce60b286f98d5a5b573704ef4323093e92d3802dc9087114b333462bd5d0979720b207b7d7fd SHA512 5da176559595608ac6565d23a390364b0fff332084206e819f91d22baee86a752677424fdf90e6a6ecf85fa30eab00edc89fb419f3ae82e0fcce0e714dbb1985
-EBUILD cdcover-0.7.4-r1.ebuild 931 BLAKE2B 518efd06ea45f6af387cac3db39c845ab8df6d62394157a00ee2599fe3e59bcaf10832b51cf8b827cdaa6f22b1332414805e6282d0a134a878d3dee15b2edf5d SHA512 16e9efa925639bb9f943024a815b379d93d8c0d2d08e83b0592a97be49fbc36335ab2d9f22031d017f62a7d2641ae92fc1406c4ad5984f3823166de5767d0e1e
+EBUILD cdcover-0.7.4-r1.ebuild 962 BLAKE2B cfa97b8851f795b145c6ad346aeec00b7353498c01eda4fcd7ca1e04443163af85cea519f61a50f934aee14729ef349c4cb6de50abb4d3a2cf4f115b18554fe1 SHA512 2792bd7c5cbd6cccc58c4637d8df645e3c7e98168923c6dddf4970a63e2513b4f9639933b7016a39e6a95e5ad1994cda1079ddb233b6c9177e35cece27154c18
 MISC metadata.xml 244 BLAKE2B 469a05b81bd052f22d5c6cc5aa3683afb144abcb85b7794f077bdb3ef1073dc8295f1a48893f4faa97e51d4763dad89aa7240858b317ff8fe8341f85a059c56d SHA512 a04597cdb8b76cb0476450e0ccab923b3e84d9bc6eed456ab0a80a535a45063318f5d38a3cf943ae3ab0f4d1e803f0eb80e12439ab06068cd771768b1a7e338f
diff --git a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
index e0a978a39c84..156c79a1be0a 100644
--- a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
+++ b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="cddb"
 
 RDEPEND="${PYTHON_DEPS}
-	cddb? ( dev-python/cddb-py[${PYTHON_USEDEP}] )
+	cddb? (
+		$(python_gen_cond_dep 'dev-python/cddb-py[${PYTHON_MULTI_USEDEP}]')
+	)
 	media-sound/cd-discid"
 DEPEND=""
 
diff --git a/app-cdr/gtkcdlabel/Manifest b/app-cdr/gtkcdlabel/Manifest
index 21115d43f80b..432a00200109 100644
--- a/app-cdr/gtkcdlabel/Manifest
+++ b/app-cdr/gtkcdlabel/Manifest
@@ -1,3 +1,3 @@
 DIST gtkcdlabel-1.15.tar.bz2 36468 BLAKE2B afddc7029fa509f792757f2f57f07002854b0387c7c417cd3b45297757e7dc3c019d0a9a0207b5025ecd91c8c3713503f0e7f43b2eb7e2abe7054b32ae271352 SHA512 3edcaa0b15a592d684a20c34282437f5f51201cd6dde915a1a02ac1ed388a2046f8e2ce7aecf4afac3e4af01191d747c34e50d689eb945072bc20f4458bf7356
-EBUILD gtkcdlabel-1.15.ebuild 764 BLAKE2B 015ad3b2fe149530f8d6a8dc66b1ffaf0db1475e6d73bdbbb338b93ecbed415a40633f006ee494ad55b1181ade1b0680c1278f096703490fa6191cd7b0ddcbf4 SHA512 50e46dc69a84857d51a718e48bad83d74e0cbaa30440d56d060497aac73910054241b1e26bb10e5300bbec2d11d71524b52d8c2ef54bc61a419cd25405ddb0e0
+EBUILD gtkcdlabel-1.15.ebuild 797 BLAKE2B 11dd4b13a2ebc8facf95bcf70b49d04ae50d0f40844979f797e408b30f7db1b7006e43ab0d041d0f7e4a19c29f83136105add399d868af7faea77d16ea68d94b SHA512 d6aea211740fb17fdfa2f813e437eca7667dfd4e2ae5190d7a919d74beb4a30c6940d8f2d8884b93e9b7b091827b2ee7f828bb9ef60d118731ddd52e44046766
 MISC metadata.xml 247 BLAKE2B d8d62acef0f0dc2775a84b74f6e185af3172c49a298011a8c9b54283b7fcb37a15edeeb4a411544d992883e7303d1a43a9cb553efbf5ed00c30ccfb9ee86bc25 SHA512 dc900409a542a32f73819f826b53be8e553d7890f136cfc4533c2931c605c45282bf87b89dbde2f7a630a5d8497ace4b8e1b1f8922ad45bc6eb68c347a1d92e5
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild
index f0e3b51cba89..c0c631081be7 100644
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild
+++ b/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,9 @@ IUSE=""
 
 DEPEND="${PYTHON_DEPS}
 	>=app-cdr/cdlabelgen-4
-	dev-python/pygtk[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+	')"
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 34fdf02da361..0c756cc4f328 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 0769b403a527..5979bfb5abd5 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,12 @@
+DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
+DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
+EBUILD acme-0.39.0.ebuild 1740 BLAKE2B 36f55fbd1d389ac9b009bbb46d0de42cde53ae1c01f7a05318c5ce6725094c7cf55a1850c01af01bb92bef1c0720026889cdc042dcdd04a1a7ba4d5343787a50 SHA512 12ef8bdefb9bedc3dae4c549a2af0a26b223ca1266660f1a06e8926e4bc53a7478b4fc55c7a952c10008f0e5c83934704d5eec3e6056fb4ae17fbc7e61e41876
+EBUILD acme-0.40.1.ebuild 1740 BLAKE2B 36f55fbd1d389ac9b009bbb46d0de42cde53ae1c01f7a05318c5ce6725094c7cf55a1850c01af01bb92bef1c0720026889cdc042dcdd04a1a7ba4d5343787a50 SHA512 12ef8bdefb9bedc3dae4c549a2af0a26b223ca1266660f1a06e8926e4bc53a7478b4fc55c7a952c10008f0e5c83934704d5eec3e6056fb4ae17fbc7e61e41876
 EBUILD acme-1.0.0.ebuild 1740 BLAKE2B 36f55fbd1d389ac9b009bbb46d0de42cde53ae1c01f7a05318c5ce6725094c7cf55a1850c01af01bb92bef1c0720026889cdc042dcdd04a1a7ba4d5343787a50 SHA512 12ef8bdefb9bedc3dae4c549a2af0a26b223ca1266660f1a06e8926e4bc53a7478b4fc55c7a952c10008f0e5c83934704d5eec3e6056fb4ae17fbc7e61e41876
 EBUILD acme-1.1.0.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
-EBUILD acme-1.2.0.ebuild 1750 BLAKE2B 93dd49e3c1329e7377544581c53aaf2a949a6d8f3f9d09a121e50c52fe618714b6173cb82b3a7179591bcff12051389e35705bac79bd1e6eacf45e3a67bcb59c SHA512 80cdd3fc105bd094a3c78066b4913112871a150e4797db5469450cbb709c17a63c1b39c0b2932d819c9f47242872801fba31b16b7b0072a1f15de8a42939a849
+EBUILD acme-1.2.0.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
 EBUILD acme-9999.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.39.0.ebuild b/app-crypt/acme/acme-0.39.0.ebuild
new file mode 100644
index 000000000000..0ce5fe5770d8
--- /dev/null
+++ b/app-crypt/acme/acme-0.39.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+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 ~arm64 ~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="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${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="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/acme/acme-0.40.1.ebuild b/app-crypt/acme/acme-0.40.1.ebuild
new file mode 100644
index 000000000000..0ce5fe5770d8
--- /dev/null
+++ b/app-crypt/acme/acme-0.40.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+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 ~arm64 ~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="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${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="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/app-crypt/acme/acme-1.2.0.ebuild b/app-crypt/acme/acme-1.2.0.ebuild
index da68660fa26a..4aaf884c944a 100644
--- a/app-crypt/acme/acme-1.2.0.ebuild
+++ b/app-crypt/acme/acme-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 23325d756aac..11da46ba93f9 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,12 @@
+DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
+DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
 DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
+EBUILD certbot-0.39.0.ebuild 1428 BLAKE2B 5c288ee7e10e92d44df09d28acf4632554aba6c3f78dd33ff50401f36edcb2d6beea5630ee1963ca5dd0d717518d5edfff0bae3a996cef6e2c9192cb8a89b9e8 SHA512 68398fc8f28b8881d112441d5d9e0456747c405e082286124ccd02f774c6ef1620303b68b523d5e15be1bb698941980e9a59089bc4e09ffe3ac61623225fc89b
+EBUILD certbot-0.40.1.ebuild 1428 BLAKE2B 22e72539d53f41247344d5d5be1bf5927af5729fdcb6d855baae72296a6b10647181c6d3fb84cd73df1a00c61353b29273abba33c2fc4d49ddd5543f6a10e7d3 SHA512 7b675c8bacc8c866db0129e1fe8234025458ad2c8e9874f008eda6cb6072942ff4d5447d9a7aeb4a6678c7d893683e5e63dfeda8d85df1d479065ee9f33c72f4
 EBUILD certbot-1.0.0-r1.ebuild 1455 BLAKE2B 91ae921207d96441d709b1115cf23339bb2bbc2d425af09d49f7ff355671b3ec828ff9149e00741090fcbc4437f61391a8fa0b2855e7597df746f2ea0829fd61 SHA512 fe422a4c25b7425f7060a6e11dad6accd665fcb749ed0212d6e77fe38bd99e54492aec2fe53c1e07b702a1eb7b94d0613fc925cf9bdd86ffe744179395230120
 EBUILD certbot-1.1.0.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
-EBUILD certbot-1.2.0.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
-EBUILD certbot-9999.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
+EBUILD certbot-1.2.0-r1.ebuild 1480 BLAKE2B ba986a8752ea1a113425338c76a6c2c2928af3f7b33cbc49cca872bb61b269e541dc01709c0f29b6994760a15eaadff2da97a5d5d128f086af105e1b6c44e93a SHA512 a8039218848544651e80e11215e6f5cfa75ed2f244a9db61108b573a082e499f70cd4f358573f7a4aa423635755338b627ea212d8ef0e9f16338bce5ddf43412
+EBUILD certbot-9999.ebuild 1480 BLAKE2B ba986a8752ea1a113425338c76a6c2c2928af3f7b33cbc49cca872bb61b269e541dc01709c0f29b6994760a15eaadff2da97a5d5d128f086af105e1b6c44e93a SHA512 a8039218848544651e80e11215e6f5cfa75ed2f244a9db61108b573a082e499f70cd4f358573f7a4aa423635755338b627ea212d8ef0e9f16338bce5ddf43412
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.39.0.ebuild b/app-crypt/certbot/certbot-0.39.0.ebuild
new file mode 100644
index 000000000000..00ca3acc612d
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.39.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+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 ~arm64 ~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"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${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/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-0.40.1.ebuild b/app-crypt/certbot/certbot-0.40.1.ebuild
new file mode 100644
index 000000000000..6ec4076e0c5b
--- /dev/null
+++ b/app-crypt/certbot/certbot-0.40.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+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 ~arm64 ~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"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${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/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	# acme is not installed, removing it here is fine, the dir just confuses tests
+	rm -R acme
+	pytest -vv ${PN} || die
+}
diff --git a/app-crypt/certbot/certbot-1.2.0-r1.ebuild b/app-crypt/certbot/certbot-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..c81039179f59
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.2.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+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 ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+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"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${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}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# required as deps of deps can trigger this too...
+	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
+	distutils-r1_python_prepare_all
+}
diff --git a/app-crypt/certbot/certbot-1.2.0.ebuild b/app-crypt/certbot/certbot-1.2.0.ebuild
deleted file mode 100644
index ec673774775d..000000000000
--- a/app-crypt/certbot/certbot-1.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
-
-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 ~arm64 ~ppc64 ~x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-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"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${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/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R ../acme
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index ec673774775d..c81039179f59 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -38,14 +38,12 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R ../acme
-	pytest -vv ${PN} || die
+DEPEND="${CDEPEND}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# required as deps of deps can trigger this too...
+	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
+	distutils-r1_python_prepare_all
 }
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index c46588da4fa8..37ff63ceadf2 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,8 +1,6 @@
 AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d563404c3dc428838ed5a1515fada5a1e4da92eee38f37918d80ffd3121603e4ce1e4dab82ebe433d838bf0949794a88fa2 SHA512 9967470ccaeea405ad55fc16f699ac5048bf803eb9043258c2f532ff36fbf252d683b45b6f0fd1a19d9f48f5f0ace60fff50881dd8ab1e13c5c1a9170d5eff6a
-DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4 SHA512 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093
-EBUILD gcr-3.20.0.ebuild 1830 BLAKE2B 38d18d2e2b4cf13d8ad5f9fbb7eb8ccd21c038eed114b2f5b22f7ebf51e37fc93d53403d07c0d8519db3f1c62a2e54cc4e472465cf1683f0bfb105c240cdcad6 SHA512 8fc50555fa762a3cd89e5d224361c7b58f2253db402928d59ad595707ee76e2ee15bc9a0547730f318347d4017974471c23e9fd28520e077069d2c2590cda00b
 EBUILD gcr-3.28.1.ebuild 1871 BLAKE2B fce62eb9dbbf5f51545d7506ec2f439ae3d2991c077b4fdb00ed6f0e47d1b8310437843c3e291d8661c487e75bed955404c23fff8c4bc46b014934c93b74f63d SHA512 8af0259414d7777538fab1dd68da4c39f9c68cbe37bc9ce5f01c833530673db4f2d4d92c259e9c3589918256a43175f0c59acabb747b29d9f567263a7fd2fe19
 EBUILD gcr-3.34.0-r1.ebuild 1897 BLAKE2B 547c94084e23f342d15c7fe24558bd63608734ebec1430800ad719591be1f91bcb8388f6d3ca2ed3d2b8307b0be6854e6daec1289a5601fa971f0852bb57f9f1 SHA512 e9df77eb782b097d0376a6129bb43915a1f76fd2f731dae57a688fb749a452ae0a9f1d07db0c613a0c34b38f306e9ed656af0c89646e68d77746a405a912a86e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.20.0.ebuild b/app-crypt/gcr/gcr-3.20.0.ebuild
deleted file mode 100644
index 822c8e5baacc..000000000000
--- a/app-crypt/gcr/gcr-3.20.0.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
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://git.gnome.org/browse/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-3
-
-IUSE="debug gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-COMMON_DEPEND="
-	>=app-crypt/p11-kit-0.19
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	dev-libs/vala-common
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-#	dev-libs/vala-common
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(usex debug --enable-debug=yes --enable-debug=default) \
-		--disable-update-icon-cache \
-		--disable-update-mime
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index fc40900aa872..721f9e0b4e72 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,7 +15,7 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.5.0.ebuild 4346 BLAKE2B 9a2a4af96f914167d224dc57a463ea4b5ddb6d2bb43f4fee5f8fe1734a947ed66382b919573538ae3c0c0773cec5e4ba15900427dd37c905cf9a3c3e6178b4ba SHA512 2d7caf14e6f7754c0aa2bbfd52d54b66c99dbcca8d6e5d870261d49ff6e8aeb2cc66472f12bd4370ad66e2fe752323ad95aaf35667d90a3c153c14873ff7f844
-EBUILD heimdal-7.6.0.ebuild 4553 BLAKE2B b48931abe23fc0127b920c73a26733ad9662b82acbe686995a396aa726f391e3c4bf286b8bcb4c98fb2e61dd228dd8e6b33665f8466614cc4c6bbe21b87777df SHA512 1f61122041a96810e9f6f5945a5ce116f3e44de6e47ff13c607b978edaa742aba32db7d756941d41e74d09ab5292510e8132bd014831517d6c0a71ce25d66266
+EBUILD heimdal-7.5.0.ebuild 4340 BLAKE2B e766908af9d3876478d02cf7d890962e94579115b1878a51aa21c00131aeb8d8859e7967d736092b21f32ee23e3a1830a7fe2bc44f62d0bd59712308c6d199ec SHA512 5fe057c1b4a498204386ee027bb7be25b458b00cc23798fec0aefd026143072c98c43785c0a42896f69760af85c35ea12736e20e5f1fc3d43fdb793d9ad18923
+EBUILD heimdal-7.6.0.ebuild 4547 BLAKE2B 498c0a8333d3adc915f4ee17cbec3a1bd572abccaa1b36d943cb1993995ceb27ae6b5c5bfcaa377e9f2b79833f78b70eb53b364be2a980b55ad39ea8d9a3f713 SHA512 4499d4ac0122f3142499699c0e72cf905ebdb41a61279e546c4740d3e9a04018048dedaf6c150da59709f4346680fa4f9bff3f4cd0f3335529efc96164773086
 EBUILD heimdal-7.7.0-r1.ebuild 4545 BLAKE2B 38277ef5002d659f4260eeacd3b39cf82eb1e6a3b13ba67f2d3015d211592270d938e91f1060dd05a0fcd78f8ce8707d1807fa0164ef1e415130efe8324ffe5c SHA512 78c263c9abf545732fe091798f662c423a02e2e30180502b70676f6a653d71b9f8984db0b719ddc524028aa67bf74ceef545225cd77d27b516d11bb15c0e3d8e
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index c3321f3eec67..d7c507879e26 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 4cf287ec2237..34b364981f11 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/libykneomgr/Manifest b/app-crypt/libykneomgr/Manifest
deleted file mode 100644
index 315743e89005..000000000000
--- a/app-crypt/libykneomgr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libykneomgr-0.1.8.tar.gz 626257 BLAKE2B 4819420f36261251261264dfe688297107fa857cc78081dbbdaa90e5c821ceaafa7d770e431fdfec4c199273c67ec684da1f4570883c300f9283e73aeea42d17 SHA512 536db3a81b74d24e727cc09c5bb898723b602e6c55e249745ced59d5f9416673fdbecd80bb7ebc7031be349092c8fb4f5623c8f6972ab870ec1f50ac1bc2f795
-EBUILD libykneomgr-0.1.8.ebuild 562 BLAKE2B 9093de1a3a9be78f616849b4b5200f4063299ae24522a5118579a2570c843d22fb616f092cf4c9e641d2aaaeb3b36f566c9c9edd461fdc5c76f899005cba8d21 SHA512 a2b23d24768dcfd8d1b52bb95a3dda25c8879c50dc33fd13f9f45e5b9d71c3dfb7fdbb40c734cc4606c0ee55b743c0c12f4388ba4aa0ad2b11c167f13c14874e
-MISC metadata.xml 325 BLAKE2B 081e2efabea13e3dde8cc81bdb0a84a344cef9f553bd97a621b7eaeef8ba2b83741624a1e804368904b2dc48fdc3802d66e699331f1468e2a65d5768a5e40b28 SHA512 cf1683292cefaf49a20764fe6f5ef848bb196273aef6d2fd0e1b2c4da848ab93ebf0bf0388587b7e0de0ae38af5346b3ce7cff55f27af9c914834af775e95a41
diff --git a/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild b/app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild
deleted file mode 100644
index 06befd824408..000000000000
--- a/app-crypt/libykneomgr/libykneomgr-0.1.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=7
-
-inherit udev
-
-DESCRIPTION="YubiKey NEO CCID Manager C Library"
-HOMEPAGE="https://developers.yubico.com/libykneomgr/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="kernel_linux"
-
-DEPEND="sys-apps/pcsc-lite
-	dev-libs/libzip"
-RDEPEND="${DEPEND}
-	>=app-crypt/ccid-1.4.18[usb]"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--with-backend=pcsc \
-		--disable-static
-}
diff --git a/app-crypt/libykneomgr/metadata.xml b/app-crypt/libykneomgr/metadata.xml
deleted file mode 100644
index e3e73c06a863..000000000000
--- a/app-crypt/libykneomgr/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">Yubico/libykneomgr</remote-id>
-    <bugs-to>https://github.com/Yubico/libykneomgr/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index b79d57eff2f7..0d2818ca7392 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -2,5 +2,5 @@ AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb926314240
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
 AUX rotix-0.83-locale.diff 256 BLAKE2B a7564979a38ff517bbe0592ba12e2aab92c44fc828180c2587ec4b5db3acf4ffbf71feba959625faf93b9fd997d39c9330e4255e8c875bbc1653b66fe140e1c9 SHA512 7b8c82bac78c48f5d43c0246c41e7a7910f0119cc7b56500789d722d87f00e9d2356150063e07ae281435d5af60f9e15956c5bc0b236ea5f225435886117c4b0
 DIST rotix-0.83.tar.bz2 14685 BLAKE2B 296e094dfef2b35db39041e92d350befc970f3594c7aa2962b4dba0215e99b50ea887d3d636dc2e38ee570b60462bcf8304a6f7ee005315fa115b821ee0f29ad SHA512 1f318e15bd51cc197d9d9fc36e37b29c18fe7a8e8c40654c69ccf97d32b896afa7cc517c562750f6c1262baddbb451bd8a29ada994176e442630d8ed56ccf572
-EBUILD rotix-0.83.ebuild 789 BLAKE2B b8c0b8bf50ac5a4d2aafba90a2ea896fe673767939445e76058cf26ac63092a52fe7cb6370e31b782003f9bd5499abdcf500e1502e31f99aa96c0da2b3f2f0aa SHA512 75654c96d396fe860076066c4b19423f89e830d15b3867f920dd600c26aa75f4634bdd6cfb49ad65006c82695615ad6515450e458f1400a396af4bb422480639
+EBUILD rotix-0.83.ebuild 811 BLAKE2B 3732fa4a6debfedc4d8200713ceee1bae1c702ee81b4550994a05b113980b65722d0fa9f7658f2d823e9f03871fc762c91225cbe0126eeea63020af15f236874 SHA512 b84fc54a2874589f14510b2819b6fa5935dad1497bb5fc5ec528ab4f4b880e99a0f14ccc60e4cc65797c645675fea524f4299b05a3a29a43134924efa612425c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
index 3e79123b9407..ba5cad60e9fc 100644
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils flag-o-matic
 
 DESCRIPTION="Rotix allows you to generate rotational obfuscations"
-HOMEPAGE="https://gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index c2913a1b3894..8810d933905e 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,3 @@
 DIST yubikey-manager-qt-1.1.3.tar.gz 13316325 BLAKE2B 765634b05fff9efdd5ec5e91e0a5de7f04144476b83f7b3ba8a0c8a1bc95ca7132f25e193afca2bec17fe377c683063a14657efc24fb047a64a8f4498c7abaed SHA512 84bcca3f74967ba8aa470b8dd6c8699ff6a93a85ce942934a1d0cd674a4c507ba297d9a5ebb40bae3476ea713965a7bb3816dad1110a045c338f070eb249f02b
-EBUILD yubikey-manager-qt-1.1.3.ebuild 1413 BLAKE2B 0427d39f708ad538f85f0953a131c09a993eaf36236a149a5d9cda0d8652f9ef03f95fdae1cc6451d0fbbb23dade6e0a826cdccebef944e4925ab3fc20b0960d SHA512 d7bf4f802ce38d95b7aeea150ca7d119ac663371664aac5605cc269f1b51f677dcf36e23588708f0daba7d5451877e702c714dc25d3eb53238803f99ba3a3aa7
+EBUILD yubikey-manager-qt-1.1.3-r1.ebuild 1470 BLAKE2B 4a6e9ba2ed294b1ff49808fa17d6b9e06cc3be46033365a611844369f1cc571b8de1a51ce0e6199038c4628cbabef2648713a189d087a423eab2ce9933a1deec SHA512 36b25fb8a6ccca5348b4cc8627066621bff2dab4ae8f508d8d9d43dbebf48a412ca38146c6e66b29658f7cff542813ad76cef1f9d2db7ba6aba1d2c0e7527014
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..6fb3d2e0e306
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_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://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=app-crypt/yubikey-manager-1.0.0[${PYTHON_MULTI_USEDEP}]
+		<app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || 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-qt/yubikey-manager-qt-1.1.3.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
deleted file mode 100644
index 99fb80953a8b..000000000000
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_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://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="${PYTHON_DEPS}
-	>=app-crypt/yubikey-manager-1.0.0[${PYTHON_USEDEP}]
-	<app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyotherside[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/ykman-cli//" ${PN}.pro || die
-	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
-		-i ykman-gui/ykman-gui.pro || 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-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 3c5086c1a3f2..b5d0b66f573a 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/opendict/Manifest b/app-dicts/opendict/Manifest
index 868033875a08..d5f52938c2f2 100644
--- a/app-dicts/opendict/Manifest
+++ b/app-dicts/opendict/Manifest
@@ -1,3 +1,3 @@
 DIST opendict-0.6.7.tar.gz 169580 BLAKE2B 665fe181bf16d8e923470568b6685149075b6c5a9afe2deffe6ee4ff792b4e6a2c166f3ce4297f59fc57cd11efe299a93518c4fb5e929b13270d04f172a62146 SHA512 ef97ec84591bda4d8d4746fa4532de109cf03d89dfd5aa20e1775224c687b503759c020b2286e5cedd395ebce5db3b2a10495adc31fcc31dbd4fddfca6fee1f8
-EBUILD opendict-0.6.7.ebuild 2049 BLAKE2B 3cc51451ed9b8cf49a21141695ee6c8e33ff673d2e651e162e01a240667af0bf840f983f0ed47f5b8c95fd4ca5209fc17fb55fe2f8a7fce03cecfaf42aa02276 SHA512 30cd657a497536afa6c95de547ea48c50d3dd2e8e6af77b35d018fbc9522f43c6b5474f7967c829c07e635b38d99dc5501ac2f15d464cc201d557ed67bcea1ea
+EBUILD opendict-0.6.7-r1.ebuild 2082 BLAKE2B 1e1f654ed9dc383c48ff7aa3cfb6af762d77886c5323c97fcfb7bed78045b5a463739e2b76afc7feb28516a70bf6481e190e2598f49dcf93b7b184c7725f8e1c SHA512 6e9170d45a282fe2687393d4d24b972da7262eee38821e1d13d2218469a50e1593fdb22a6f23dea9c5c9df8d2342ab03624191d087ddb70cbfee7f01a8becaac
 MISC metadata.xml 339 BLAKE2B 3233d939c71c80bd1d803ef77bafb2d50022497ef3f580171d9bd37aa260c0b5d7e7d306a5bd98ab8a2bdd6b052048032887579c5064d7684b9aa43aa4a53ffd SHA512 49affe3fdde01f9c9726abbf3088e9332fd2aad7c47cb7591eee9d23dd18caf4877c2858e457b236bfec2318baa5e3cbf8184ae431825d6d28a01557a58daf98
diff --git a/app-dicts/opendict/opendict-0.6.7-r1.ebuild b/app-dicts/opendict/opendict-0.6.7-r1.ebuild
new file mode 100644
index 000000000000..2adc18c71cf4
--- /dev/null
+++ b/app-dicts/opendict/opendict-0.6.7-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="OpenDict is a free cross-platform dictionary program"
+HOMEPAGE="http://opendict.sourceforge.net/"
+SRC_URI="mirror://sourceforge/opendict/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="If you want system-wide plugins, unzip them into
+${ROOT}usr/share/${PN}/dictionaries/plugins
+
+Some are available from http://opendict.sourceforge.net/?cid=3"
+
+src_prepare() {
+	sed -e "s:), '..')):), '../../../../..', 'share', 'opendict')):g" \
+		-i "${S}/lib/info.py"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# override gnome2_src_configure
+	default
+}
+
+src_compile() {
+	# evil makefile
+	:
+}
+
+src_install() {
+	# makefile is broken, do it manually
+
+	dodir /usr/share/${PN}/dictionaries/plugins # global dictionary plugins folder
+
+	# Needed by GUI
+	insinto /usr/share/${PN}
+	doins "${S}"/copying.html
+
+	insinto /usr/share/${PN}/pixmaps
+	doins "${S}"/pixmaps/*
+
+	DHOME="$(python_get_sitedir)/opendict"
+	insinto "${DHOME}/lib"
+	doins -r "${S}"/lib/*
+	exeinto "${DHOME}"
+	python_fix_shebang opendict.py
+	doexe opendict.py
+
+	dosym "${DHOME}/opendict.py" /usr/bin/opendict
+
+	domenu misc/${PN}.desktop
+
+	insinto /usr/share/icons/hicolor/24x24/apps/
+	newins "${S}/pixmaps/icon-24x24.png" opendict.png
+	insinto /usr/share/icons/hicolor/32x32/apps/
+	newins "${S}/pixmaps/icon-32x32.png" opendict.png
+	insinto /usr/share/icons/hicolor/48x48/apps/
+	newins "${S}/pixmaps/icon-48x48.png" opendict.png
+	insinto /usr/share/icons/hicolor/scalable/apps/
+	newins "${S}/pixmaps/SVG/icon-rune.svg" opendict.svg
+
+	doman opendict.1
+	dodoc README.txt TODO.txt doc/Plugin-HOWTO.html
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-dicts/opendict/opendict-0.6.7.ebuild b/app-dicts/opendict/opendict-0.6.7.ebuild
deleted file mode 100644
index 99c27f354f2b..000000000000
--- a/app-dicts/opendict/opendict-0.6.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="OpenDict is a free cross-platform dictionary program"
-HOMEPAGE="http://opendict.sourceforge.net/"
-SRC_URI="mirror://sourceforge/opendict/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="If you want system-wide plugins, unzip them into
-${ROOT}usr/share/${PN}/dictionaries/plugins
-
-Some are available from http://opendict.sourceforge.net/?cid=3"
-
-src_prepare() {
-	sed -e "s:), '..')):), '../../../../..', 'share', 'opendict')):g" \
-		-i "${S}/lib/info.py"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# override gnome2_src_configure
-	default
-}
-
-src_compile() {
-	# evil makefile
-	:
-}
-
-src_install() {
-	# makefile is broken, do it manually
-
-	dodir /usr/share/${PN}/dictionaries/plugins # global dictionary plugins folder
-
-	# Needed by GUI
-	insinto /usr/share/${PN}
-	doins "${S}"/copying.html
-
-	insinto /usr/share/${PN}/pixmaps
-	doins "${S}"/pixmaps/*
-
-	DHOME="$(python_get_sitedir)/opendict"
-	insinto "${DHOME}/lib"
-	doins -r "${S}"/lib/*
-	exeinto "${DHOME}"
-	python_fix_shebang opendict.py
-	doexe opendict.py
-
-	dosym "${DHOME}/opendict.py" /usr/bin/opendict
-
-	domenu misc/${PN}.desktop
-
-	insinto /usr/share/icons/hicolor/24x24/apps/
-	newins "${S}/pixmaps/icon-24x24.png" opendict.png
-	insinto /usr/share/icons/hicolor/32x32/apps/
-	newins "${S}/pixmaps/icon-32x32.png" opendict.png
-	insinto /usr/share/icons/hicolor/48x48/apps/
-	newins "${S}/pixmaps/icon-48x48.png" opendict.png
-	insinto /usr/share/icons/hicolor/scalable/apps/
-	newins "${S}/pixmaps/SVG/icon-rune.svg" opendict.svg
-
-	doman opendict.1
-	dodoc README.txt TODO.txt doc/Plugin-HOWTO.html
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 8b356e6d136c..6f78ac5e92d8 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/cppman/Manifest b/app-doc/cppman/Manifest
index f8127db6b72e..49a0070f0170 100644
--- a/app-doc/cppman/Manifest
+++ b/app-doc/cppman/Manifest
@@ -1,3 +1,3 @@
 DIST cppman-0.4.8.tar.gz 3185978 BLAKE2B 9f662874eb6b6540e02a2b371fa47e53e0893239fbfcc65421fa5c7c4bc5f88c4cfd2facf08deb13606f5cf7c895a1a07e119e1c15bbc98b95af5f8056c6a5e8 SHA512 f5b93774988dad592b31670d6c21718bd034e4e94858982e1756e8db89779d12001fd786ba629211b038b173b7b507382277a3db7fb35363dba28cd029e69a7d
-EBUILD cppman-0.4.8.ebuild 673 BLAKE2B ea55b94f9d23a1876b1983687900b291d9545daf9469b4e5e6959a88bd867efae32ffb20a79f5b089ca976d8c01db578e977670a8fcf5fdedc619514bb9e97a1 SHA512 5d5b73425ac186d34fcc0eeae2db9b4d8901246b1cdd314a4cdeb12c81cdf3a21090c5dbb172e3989b6f9429a2a6b287f9568dfeb4dd1cc15e5bdf0bcf0b0d85
+EBUILD cppman-0.4.8-r1.ebuild 716 BLAKE2B 75e8f02f0e7588859660263f5964db0631640381452afca349a597413fcd5fa7f9ac48540c56aec9325932b45bb20f782d8739d8a1d3e24caded76af511b2313 SHA512 2e5ff03f14a255ed0a77bb34fade6916e05add25fe494be9854b57e8c938d18dc5be4cab06b5250a5aafad1aa7d754532da35df3f960f326c1635e0a2704c519
 MISC metadata.xml 247 BLAKE2B 8da6363de18a0eb4c29efee8c35de35970668cf0107b011b7e885c8d151b7cbd90709f000548025593f2ed5b4bc2d512de53c0285805fec978b363536ccf1ec4 SHA512 a788f5e022a740fafc174856c3fcda9b4c43908303427ecb48deb2198b5c01f1103bcf4965d950e3f981be4036173f9e968e431c49d3df96061f24cdc202edbc
diff --git a/app-doc/cppman/cppman-0.4.8-r1.ebuild b/app-doc/cppman/cppman-0.4.8-r1.ebuild
new file mode 100644
index 000000000000..931aff72c2bd
--- /dev/null
+++ b/app-doc/cppman/cppman-0.4.8-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,threads"
+
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1
+
+DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
+HOMEPAGE="https://github.com/aitjcize/cppman"
+LICENSE="GPL-3"
+
+SLOT="0"
+SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+
+RDEPEND="
+	sys-apps/groff
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+# `./setup install` already installs docs
+DOCS=()
diff --git a/app-doc/cppman/cppman-0.4.8.ebuild b/app-doc/cppman/cppman-0.4.8.ebuild
deleted file mode 100644
index 283e6ca77af5..000000000000
--- a/app-doc/cppman/cppman-0.4.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,threads"
-
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1
-
-DESCRIPTION="C++ man pages for Linux, with source from cplusplus.com and cppreference.com"
-HOMEPAGE="https://github.com/aitjcize/cppman"
-LICENSE="GPL-3"
-
-SLOT="0"
-SRC_URI="https://github.com/aitjcize/cppman/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-RDEPEND="
-	sys-apps/groff
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-"
-
-# `./setup install` already installs docs
-DOCS=()
diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index 0f112262bfd3..af64c902f8ea 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1,7 +1,7 @@
 AUX devmanual-eclasses.patch 486 BLAKE2B 7e772ed7386c199c697808137ecf6f999e60ff32f05a89eb0ceeb41b34576d667996fe9b7f7279b87a40bd8c1efbef5415d69be1b0b9f9f0954e813ab890ffa5 SHA512 1f34bf4e0ed105122eb45ad498ddc737774103720cef9a3a30346a16e85173bc8fb38dc9cc1e9bb2d9b902feb167e5df0ff4cb39f62640f4314fe750533f7cf3
 DIST devmanual-0_pre20141116.tar.gz 169936 BLAKE2B 9b01004750b9fce226fa6a965292d3ffaff0923f877da611743e39ee19077ea7fe0d21ff138853d3f79e4d4941026c30fcabf63c8903572ed7ba5d50d32c8dd5 SHA512 6af3f9a262bdb2ceb61ab195691dff4a850b22e8d1226e20ae3257c566b6cc913f756c8b90a40e8aa78b1242e78d24c4209a1d9cdb0706ae9b64c653544a028f
-DIST devmanual-0_pre20200203.tar.xz 163740 BLAKE2B 39d8173bc524213e7a6e81def4f1631ea0d2503540551982d07ef58f414b8a052e8a3a0d2426b5864e06fb24f1745af4dea57e418fcc5e52c558dc1da9ff4530 SHA512 f3fce9ba557515b89c5a875dc1e4e968eb3097776842026403e41ebe972c2e4e764303c729c5835466faaa2675fa361fe7e0512d7a8222d7d8b1202a9049f98e
+DIST devmanual-0_pre20200207.tar.xz 163940 BLAKE2B c6cf856a8f6c80b500466e27cc4106c070cff2dcf8c89d58c9ca90d03cb34a1e6a2048cb99364993f224f3497309fc24207dc44f9c14ece37c49aa602480dac0 SHA512 f6a88312e2030bf4d9fcf64bf1f38397087cb151aa41cd0c254cfc6251e4d5b291e3b361094a7c1d5fdb16e40c1702c0f0b7460ba230bfb217ad733f400c9089
 EBUILD devmanual-0_pre20141116.ebuild 1762 BLAKE2B 83186e74a1172f7cef733e972bda7c3c88c91d094c9b260e004b16d4e60ca366dc257fc7e108388ef4d6c558e02d669ccdc424737fe03d7e4906c40488695522 SHA512 9420d56918fa471001ab39ffe0e99f8beee07d669e486d1691398c29266898cb5a2426c9d864680529d9a4cb9f13b3829c52827fc6f04f6e3dc4f1c0f26c08a6
-EBUILD devmanual-0_pre20200203.ebuild 1568 BLAKE2B 39ccd01eee00a829cb5ec9ed86f4b26ed64633c8f16ddb03deaf8adbb4ebf0e8734d3892031215f4acfc00e951bfef1e7b4ebb5e8e8467695a59e8d22caa00ac SHA512 aeb630dc70ff4593ca04e12353a8e813536891abb8a8b590e59a80972529de15bf36969c2ade7106a338cddb212dc04eab6a8b1f79352ff44e67e7606e917766
-EBUILD devmanual-9999.ebuild 1593 BLAKE2B b3e9af4451eae139bb0da29b651d07ac955f73497ed7c22fb6c9ba1528d2add506969b1188e484303a14421c53ddb5afcf4e7e2cc056faf82ea80d7ce5950ca8 SHA512 3205886614331a76e3d88f6e03f6afe849d966c0cc28cd3f19e42988b03a3f18d950f271d558e1678acddba1a9cba6ecaf83d86a763b2f056922504e7476b7af
+EBUILD devmanual-0_pre20200207.ebuild 1380 BLAKE2B bb6eb98bfc635611831b34e7a1ce4eeca02cbf375abf8257ac5142ff5cc4b23f738d71babafd7e4591c0f1c171abdf7d60a393a60cd26696a653d5488fdfb224 SHA512 e2547ca92058211f4f0107b42c3e3401b0866f8bc3ffcf1dc323fdcb6d083f1c192edb65b120d15703252c3eed9ce76bc6eff4b34650d16948e95714044f0dc6
+EBUILD devmanual-9999.ebuild 1387 BLAKE2B 99bf5d4a22ad52389f2f03f35a95adef61efe42b99056ebd8e0ab04007c2fb58801de4f05d5e795d0d19ba70cae4ba42fd947af35367456ca504c7f370bb9c7a SHA512 9d03a16a1c97a509ba6eb53917f6015324e795f67ed048c917fb840898563ab1c10d5b9cdce7da3d0831f963e701276e310a189642225bfdc8ca436908491963
 MISC metadata.xml 556 BLAKE2B 48629cbf7feab0623f0ffbe1c7f36163a5d72f591bd90cfb23ccef3058699639365d3184e4decac51a1b6b39ce0647350f6aaf2244e9044a17482f93f5181282 SHA512 e409f579c8c7c65a55cfd2c64e7ec307f58318af102b5717a8208c96775bbca488dde34d61b04963e9a3c86b793ba5b7b9b04edd763e46db391cc63d24bab102
diff --git a/app-doc/devmanual/devmanual-0_pre20200203.ebuild b/app-doc/devmanual/devmanual-0_pre20200203.ebuild
deleted file mode 100644
index 05f7076fc8ec..000000000000
--- a/app-doc/devmanual/devmanual-0_pre20200203.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="The Gentoo Development Guide"
-HOMEPAGE="https://devmanual.gentoo.org/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-	S="${WORKDIR}/${PN}"
-	KEYWORDS="~amd64 ~arm ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x64-macos"
-fi
-
-LICENSE="CC-BY-SA-4.0"
-SLOT="0"
-IUSE="+offline"
-
-BDEPEND="dev-libs/libxml2
-	dev-libs/libxslt
-	gnome-base/librsvg
-	media-fonts/open-sans"
-
-PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
-
-src_compile() {
-	emake build OFFLINE=$(usex offline 1 0)
-	use offline || emake documents.js
-}
-
-src_install() {
-	# clean out XML/XSL before installing
-	find . \( \
-		-iname '*.xml' -o \
-		-iname '*.dtd' -o \
-		-iname '*.xsl' -o \
-		-iname '*.svg' \) -delete || die
-	rm -r bin xsl .git* LICENSE Makefile README.md || die
-
-	local HTML_DOCS=( . )
-	einstalldocs
-
-	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
-		offline mode, point your browser to the following url:
-		file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if ! has_version app-doc/eclass-manpages; then
-		elog "The offline version of the devmanual does not include the"
-		elog "documentation for the eclasses. If you need it, then emerge"
-		elog "the following package:"
-		elog
-		elog "app-doc/eclass-manpages"
-	fi
-}
diff --git a/app-doc/devmanual/devmanual-0_pre20200207.ebuild b/app-doc/devmanual/devmanual-0_pre20200207.ebuild
new file mode 100644
index 000000000000..5146b9288cc5
--- /dev/null
+++ b/app-doc/devmanual/devmanual-0_pre20200207.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="The Gentoo Development Guide"
+HOMEPAGE="https://devmanual.gentoo.org/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
+else
+	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE="+offline"
+
+BDEPEND="dev-libs/libxml2
+	dev-libs/libxslt
+	gnome-base/librsvg
+	media-fonts/open-sans"
+
+PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
+
+src_compile() {
+	emake OFFLINE=$(usex offline 1 0)
+}
+
+src_install() {
+	emake OFFLINE=$(usex offline 1 0) \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
+		offline mode, point your browser to the following url:
+		file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
+	if ! has_version app-doc/eclass-manpages; then
+		DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does not
+			include the documentation for the eclasses. If you need it,
+			then emerge app-doc/eclass-manpages."
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 1957ff9c99ef..7bea70d1e20b 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -29,35 +29,26 @@ BDEPEND="dev-libs/libxml2
 PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
 
 src_compile() {
-	emake build OFFLINE=$(usex offline 1 0)
-	use offline || emake documents.js
+	emake OFFLINE=$(usex offline 1 0)
 }
 
 src_install() {
-	# clean out XML/XSL before installing
-	find . \( \
-		-iname '*.xml' -o \
-		-iname '*.dtd' -o \
-		-iname '*.xsl' -o \
-		-iname '*.svg' \) -delete || die
-	rm -r bin xsl .git* LICENSE Makefile README.md || die
-
-	local HTML_DOCS=( . )
-	einstalldocs
+	emake OFFLINE=$(usex offline 1 0) \
+		DESTDIR="${D}" \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
 
 	local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
 		offline mode, point your browser to the following url:
 		file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
+	if ! has_version app-doc/eclass-manpages; then
+		DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does not
+			include the documentation for the eclasses. If you need it,
+			then emerge app-doc/eclass-manpages."
+	fi
 	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	readme.gentoo_print_elog
-	if ! has_version app-doc/eclass-manpages; then
-		elog "The offline version of the devmanual does not include the"
-		elog "documentation for the eclasses. If you need it, then emerge"
-		elog "the following package:"
-		elog
-		elog "app-doc/eclass-manpages"
-	fi
 }
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index aaccfe6f4aba..a2fc64d2e3f3 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -8,7 +8,7 @@ AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39
 AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
 DIST doxygen-1.8.15.src.tar.gz 5097791 BLAKE2B 08903bf06666911df0810ea0a7b86066e7682833b03ae5660094112c5c6506f072c5818185ce8166d09328e62092461acdb4516b58fe9369119f5f6bdd64331a SHA512 a5512e78be66c1591d8ec7e284d5d25c92a97218c79e6fed3c538c723a8dfef4ff7085970bf271a6b639e907157cd4df9fb55d3c975f8d3302fb1012a4d92079
 DIST doxygen-1.8.16.src.tar.gz 5497317 BLAKE2B ec1ba4242bd3ef669f92101044049f10a6e5c2d69f5a7c8eb47915fdc0846ce4758eb8c1ab28ec61635bf36f83049f603f3b70033f7e22be18685cb1d9826462 SHA512 46a0189aa82d5a687bdd99a904f0c061fccca407d15867d14c8c4d13e8b21a8989e7ccd6af30840803b589ed20dd86084a4db880fba0d3bfa1fdcdd8d23e12de
-EBUILD doxygen-1.8.15.ebuild 3195 BLAKE2B ab3110cb62c5306fab34ecab3e6c45e31c240de4f56e73b24b7d054323c27f947bdbed77c5be89f2888c5f1472339fdf7e884092204be7d9f4459b5044f448ed SHA512 f5b5dfbae031e5a48e675b4a126d9d159b97201b68b4ad8f07f4311e47cfc0d8beb8939ea0bdf08596c02f88ec3bf5ad614f238141b373445c701dda2453a64b
-EBUILD doxygen-1.8.16-r1.ebuild 3368 BLAKE2B 6608427d721b82df2bf6a80308098fc2ad23161a3940d7f01172107f89a34b18bf9ea8bdbebf5aa95f477c8a80f73fc478cfef7ab12478bf5ec1a51df3e71e19 SHA512 4e8bbd230b726366a7f5ed22c552efd03578aa023c200b69df164a181a9c72cc3d0d77cb65e2b3cd092ba7ea512f12ca0d0c6229fdc6760d69f4d256afa35cff
-EBUILD doxygen-9999.ebuild 3069 BLAKE2B 79c8c8c679049f4bc02b8399fd2791df6e21b3346e306fb57589eb0122a56592849971cd60359c6aac61687d65090b706a9c4c94898b83aefcbb8fe59e22875b SHA512 9aa0a4f36ba09ed8518c34289395a5fc3844b418c46f613db708781260c1a936bd584351815ec25340d73a5a58db571ab2b1cc31b9414e6b038694c938fc4d51
+EBUILD doxygen-1.8.15.ebuild 3189 BLAKE2B e1cc31bd9a61ac2b13f33919519ee1411805dfe89de013831ce7194ca88bdf1329f00b9c5716e9f84c91c527b632d9d868f8fc4fb96cdd66eb862d97d8424003 SHA512 3653836afac52091fa525db6061713e5f0d3a1c8aef6785b93a120985f6e0e6db1b5818a9288b219d6ddb52b33321c2eddd3848581bfc9a2fc7f687132dadec8
+EBUILD doxygen-1.8.16-r1.ebuild 3362 BLAKE2B fc150f8a64e316f2748e0f8f273ce6ea123eea3d4e1f399dfb9258640449bbddae5f881f9f137e8c91591fa90b91ad4c8eac2f4b5bbfab2b85932db16d6d2f86 SHA512 3ba6b25e61f3013b246ed8ed47f3375899eb241907f4775869f40b8af78b2e671308569b9d6f1d700b999ec57dabbf51aa403339912f71a6e8a8fb2446e41849
+EBUILD doxygen-9999.ebuild 3063 BLAKE2B e01fc81674107aa6fe15df433a1bb43bf1de8530ba132731a6fe4bc8c57b3a062afbf9cbd9af4c0d143101a9072235058390db7da833c0343f175c0ae08894e2 SHA512 e2d761c8bbee9fe6d612dfe920e2573d0a4afc119345a441965b70dafcba18d624107eadca30bc144e9e59ed109dc15f5951e0a677836b275ff688580fa278a4
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.8.15.ebuild b/app-doc/doxygen/doxygen-1.8.15.ebuild
index c6a5a78ef9d9..494edad1726e 100644
--- a/app-doc/doxygen/doxygen-1.8.15.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
diff --git a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
index e7ec247cf121..e3fc34ade516 100644
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 3c75865cba0e..fbce5ffa6dd3 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index a7e963aa582f..ee3f4a6cd44e 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8fde92b26704..ea3da37955a6 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,12 +11,12 @@ DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.0.50_pre20191223.tar.xz 29160968 BLAKE2B b2fbed7bbd8c5e841231a027bbc04ad7d9b22c5e44ea302656bea63519ec2480e040c67d7ad3b785fd7566bb2c4772d9d0717dede2e740cb0988bfc20e8fa504 SHA512 e582ae29d62371f9afb6ef908976cf6cea6bd6ff7fde66f319f8e96698badcb99aa76df65cfaefb18009e3cf6586f19f64f1611a0d5e2f682bd0a6e4f46cf1d6
 EBUILD emacs-18.59-r12.ebuild 4418 BLAKE2B 232057c210d2ee4c20148d3dcd61ea9a9204a14d1e1f83c40c3c206750c4d594298eeb5cf112d9dbb697f33ca73b3e92d8f224c5dbad55f252a110effbc50b63 SHA512 2c502c95939a0bde3617f0341867d6156f2317fe4a84dff0e178d6c16edf41868df905e5711e090eea81c850cae77db6adb2d8a3d7935ec3d1db5b53006e44cd
-EBUILD emacs-23.4-r18.ebuild 10983 BLAKE2B 6ea7fba597d5d6e530870d380cc6be3ab63ec318078e1acfaab5c5ee1dcbc7fd0a67a9c7e5ad650b544f9120727531ccfd6e8d98b82d5517004e3dd8e60e3ea1 SHA512 c82a4ae52c227ac54c099cd8a4ade3eb609933e08f1033955cc64e37528c58acd7deaf0bc33b75f61408d69ec36df15ad293f7a99ce7ce52f27ca43a598473f2
-EBUILD emacs-24.5-r7.ebuild 10793 BLAKE2B 932c2dda8bdeb1d25cd8386cefe0f9b6f2629b10740b3eef9a6d275d217069b331e698379043a83ea6db5cabf10d255e81b0cb335f98add6392f4f0d66d40763 SHA512 391248ec564e56af1f1faaa47ec4b3959185ea6beff218018070086e4c23d465b0e2b9a2e5dc68693d21cb1c1bb3e303faf93c1f64084a137d37e1af3f555284
-EBUILD emacs-25.3-r6.ebuild 11144 BLAKE2B efed82d0494839b10972829cf790664daed5b1ee705bfaa6bd2539e0c5b7b37ecda54d6cefb61446b1c0ce2ee39ccf6a782fc185f7b62cfc7c3afbb426f8aacc SHA512 6ac3ce3567cd670082574b4ae52ed18d25131643a4706ec7b92926301de47410e1cdab0dd3ad8347c602401bcbab2914e0165ca613aa4d0c3e7d70a9938b41ee
-EBUILD emacs-26.2.ebuild 11648 BLAKE2B 8de319f53857df25789f50e02eb5d3dadb79466aca23cae4f2a03fe19987b2815d0cff3470f1fc5488f92dcf6c824159d9b03f1da50b29d7a96e487710393323 SHA512 33296631ea5df408ec71b6fff0c93858762d3ffc011cd9661240b6c4c650bb25066f9049410a8b4f6c37125f855c814ad02ea5de0f3c0d0b510dc5d43f7644e7
-EBUILD emacs-26.3-r1.ebuild 11932 BLAKE2B 1dc6f4b91a30a54b3898d29b5387aaf7bed43616f7c0139ad7d909c411dd22d4d0851dc46a346873dc869730765941f3630a022197a6af6e6c43401ef0cdb9a1 SHA512 4a77fe9f33e113bd0544ec46a0872efc87528f705f48eb392657278559289bd3c34b145933959e4fa1692b915e88fc20a421b4b1063e13a4d127d863c26043cd
-EBUILD emacs-27.0.50_pre20191223.ebuild 12944 BLAKE2B a91aa673242357b6906b6e33daac9cfdf52633eb9e5af2c574e8e084cdeacb82eeebacd460c5087573412b87be701a110d44030a4014939a2a1fb40966ca841b SHA512 f5594a35b2fdcdc498bfe087be6bcf97549a989e66224a355400017279e56b2086314a6ee73ca9815ec5ebe29da74daf41210dfdfe2a8c1651c51c9e695e4740
-EBUILD emacs-27.0.9999-r1.ebuild 12946 BLAKE2B 8eb50306106f7e86e3de771a8e12f777d016f12a470fea4ed350f0dde137505470ace0daae5fa2991fa2bc7c9fbb0824de58f778a8c46dfa7b8fa3393f5e5a9c SHA512 3f1923925785f637fcfe2257592a368d97d76fa6f9e4a24d1e077432b9f4cebf42081c611eeef0bcc4daaed317de7cd4aad669f0158880957ccd8721b6569251
-EBUILD emacs-28.0.9999.ebuild 12895 BLAKE2B 9cefc9a76c7361d3719c22b18fd781f22e39ee389b1312c18fa14118061d1e187cb9f08fc14cbb542727b1c4a5b983fa47b7c687605d05819bb8e2616cc13466 SHA512 689be5d0fa91f9ee6916201a3dbbeb6fc46189946597d6ebdee6830332a24027e9ff7fd20d022f2e73b51131d540ca6dd813f09cd0bd3385b5ea49d402d1bc6b
+EBUILD emacs-23.4-r18.ebuild 10989 BLAKE2B 3ad43e310856b38564b88300a859c7c672ae1c5a77061c3f756fb0ce5cd6773a9461a7f0c6bf007c0435de261bb7c0e824946e1ee386cbe7300a5c1cb7e9e045 SHA512 dba79e4fce417dfd88130f438892826603d001936d979bed496f00c006033f8c8e1c8199812b38d7855b206fc99701cf95529baad03ff42b9daf4cf559af3c70
+EBUILD emacs-24.5-r7.ebuild 10799 BLAKE2B f3c8b6b40fbccf717546e0c5db9e561f660c1034d34d789295d87629ba13a83341862a875735950dda76609061eb62faff8cd54614d0bae7bc0feceecc739e2a SHA512 518a888e373c8259057e8a49a69e1458646bc89d58a7566599b1b41b626e6ff55a565c77f51c61fc82a337902981441de2458770f0e1ed333312f180b1dc00e8
+EBUILD emacs-25.3-r6.ebuild 11150 BLAKE2B 2d60551e27c503a82224bb30ad1b57e745c2b482778f24db7709a0cfda67764900b211cd6ac0b6f24033aa75182c387582c608e9c69c5748a1d00937ae0a1f59 SHA512 dd6feec0b2616d6c5e9300fb64cd4f166e50c19e91224948f36bff042b7670251c90419d1e15fac00dd12f59b9c874da61ba40414e17de4b670f370e74ff7556
+EBUILD emacs-26.2.ebuild 11654 BLAKE2B 5b0db5155b52b28ccab7657a9aa050dd9577a826bc98c2666153be29053907cf819ca4e626811a04025be2236de108b6c1b351cddab164b6d83140aab23e0ea4 SHA512 5d7a535000ef5bdba15f06b4c2d6279a64f46d653d0897b53e4ca64960a5df8f0d2d59bfcbe3bd907b591a3bf98174dd411b65ce7544e534ec9f68207441f1fb
+EBUILD emacs-26.3-r1.ebuild 11938 BLAKE2B 4b2c7c2c56190a1f8c2fad59accbf0c6591359fd14848c2b45d18988cb65e8e53ecddb0ed3c747ac3f7292055169f323856bb1a74db5420119c129b7cb09d965 SHA512 fc61b50c30dc2079a21d98e26a1ece7d72454f2dfc5fbce27ea4f6dcf4e98913fe5a778ffb9165db89a90b847ca77111479110acc39b0b023ed5ff98f585071a
+EBUILD emacs-27.0.50_pre20191223.ebuild 12950 BLAKE2B ac2889155593fb3d756c2b89b254e322c61be2fff2b486f3717719f2f20b2a6803341fc98dd7d711894ce7b949fdb106c6ed23cb5cec68a54accef2d0feb033e SHA512 5b0f0a6d3d5afc0404b0f797512deb558cf83404b3818403656b7dea9e0aec9b28152d51f0caef6597d320224dbb949a75f62e5a48cd3418a91fc5015a846f26
+EBUILD emacs-27.0.9999-r1.ebuild 12952 BLAKE2B 1f4ccbb560c7d7443f1a81d97dfc737684c88ef949dd600bb4f2c2bbd6705e95b0817e960cbfd0e5bb4dbff40c9721c0016f37b7cdf2543565e85dcd85d2c3ce SHA512 43abb3d8d54e3bf6195812c23e93778d4a52004bd392c6a84121fb5e2a5dcb6d1be37869434798dd741dbe6a90748591dd7e0e758d871dc110b486c58602cd84
+EBUILD emacs-28.0.9999.ebuild 12901 BLAKE2B 9b22cbebc819fe3db86f567a9fc3f9644248309e48f3fe1864a3cfaea06fbd294b497c38a3223b5e836dcb8e24dadbf516e89ab4076000d86301c674b946c7d5 SHA512 12a6b32d06f027e0af7bd4b89e4968ca821089489069a27aa445e14405fce30b7e4b1fb95ad946333a6611d9449505bd10a68f73eec00815862030e07cdfcf03
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 417a43038b3f..a1147d8de5eb 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -304,10 +304,10 @@ src_install () {
 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from a previous major version of Emacs, then
 		it is strongly recommended that you use app-admin/emacs-updater
 		to rebuild all byte-compiled elisp files of the installed Emacs
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index dacb99036a69..476cf016627b 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -299,10 +299,10 @@ src_install () {
 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index cbac44b0930c..d04301ce44dd 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -310,10 +310,10 @@ src_install () {
 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
index 4c3979f2bbc2..bbc32851d689 100644
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -327,10 +327,10 @@ src_install () {
 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-26.3-r1.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index 7ec3305f06fb..6f44c2130188 100644
--- a/app-editors/emacs/emacs-26.3-r1.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -336,10 +336,10 @@ src_install () {
 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
index 4bf595df19f0..004a1f105455 100644
--- a/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
+++ b/app-editors/emacs/emacs-27.0.50_pre20191223.ebuild
@@ -366,10 +366,10 @@ src_install () {
 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-27.0.9999-r1.ebuild b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
index 888936ba8cec..773badc6936a 100644
--- a/app-editors/emacs/emacs-27.0.9999-r1.ebuild
+++ b/app-editors/emacs/emacs-27.0.9999-r1.ebuild
@@ -366,10 +366,10 @@ src_install () {
 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild
index c8fd88b4d30f..399e033ca046 100644
--- a/app-editors/emacs/emacs-28.0.9999.ebuild
+++ b/app-editors/emacs/emacs-28.0.9999.ebuild
@@ -363,10 +363,10 @@ src_install () {
 			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
 	fi
 
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
 		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
 		strongly recommended that you use app-admin/emacs-updater to rebuild
 		all byte-compiled elisp files of the installed Emacs packages."
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 46f247444fd4..65619419bc32 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -11,6 +11,6 @@ EBUILD gvim-8.1.1486.ebuild 10481 BLAKE2B bf3ea284ca7ec187e32c1cef705867fbbb9292
 EBUILD gvim-8.1.1846.ebuild 10556 BLAKE2B 7df798e79326c4bbf64be95fcae2f3ac4668dedc949211010cc6f82c69d2e85f6ae96089c063947bf424a33e2956bcbdaf044a43bbaa8375e5f5540c1daeb434 SHA512 acb4e88bd8fa52f8fc69eb038030f3d148ec916cbcdd812411b8bb58ed7a2801bdc32a04b7af057d925113c6353aade536cc1a5a8da138a1ffd0e54227bb4837
 EBUILD gvim-8.2.0055.ebuild 10556 BLAKE2B 66fd819bf91a53ef4535df4a63c0cc85b65c33d5d5db66219d5e895bddb5c7f2eea1fb2450456d549cfac2143d82fcd5bf1c2150cc39f4b91f60416fa367f2f4 SHA512 7e7693d91affa860adb941c25dad8583abbb5720d7fb2aa44919e9850cac8ef6b711dd138fb1799029f7f918164f4ebb175e4a9d461a5adcb234121f069dd62a
 EBUILD gvim-8.2.0114.ebuild 10337 BLAKE2B c00d99958dcbf5113bfe5166f230d300ce4bca7419beeea2f2f18386da89e93bc475cc37613c20ec1f7d42cca1afae4095a98a3a5c602664c8d2df3ce2f80dcb SHA512 8e8fa7b48e4bd196dcbf7d13ba921ba5bf4039e72c2ab1f62a810d82db6de00d2bc62030a45b7d78593f7d29df55ded4993d07a19f555896d145ed690143c14f
-EBUILD gvim-8.2.0210.ebuild 10341 BLAKE2B 773ebd921b36898918496d422d66f141ef1bd4eb4a4ee7ecfa3bac66d3a6ac00ee4bd00e00bf677384c51fbcb00b1a003d50666cd95b7ced62d3f440544cdd89 SHA512 23b54753dfb84c19b024de2b6f6c34bbed88285fd0e4d24754c20739208bdf03c50c14f7c309e31094916b6cfb56ac84d0053fa83c1fffbcdba23570ee168f1c
-EBUILD gvim-9999.ebuild 10341 BLAKE2B 773ebd921b36898918496d422d66f141ef1bd4eb4a4ee7ecfa3bac66d3a6ac00ee4bd00e00bf677384c51fbcb00b1a003d50666cd95b7ced62d3f440544cdd89 SHA512 23b54753dfb84c19b024de2b6f6c34bbed88285fd0e4d24754c20739208bdf03c50c14f7c309e31094916b6cfb56ac84d0053fa83c1fffbcdba23570ee168f1c
+EBUILD gvim-8.2.0210-r1.ebuild 10333 BLAKE2B 4c47354ccea9b318efa4db9ffe79a716c62b8e6fe37ede8965a7b7a1584aa47bb8e8a43574e4ddf250699eb9370f6d51dbab484e0cc62621c5848ebc3c305ff6 SHA512 fa569a6907927acc18545d9e0b9450b6f0da4f404a8c45554dae392052f0aece504cf64bb30d7cd084b83aea214c63b3cadaa57e7a6f4b07c558139105319e2e
+EBUILD gvim-9999.ebuild 10333 BLAKE2B 4c47354ccea9b318efa4db9ffe79a716c62b8e6fe37ede8965a7b7a1584aa47bb8e8a43574e4ddf250699eb9370f6d51dbab484e0cc62621c5848ebc3c305ff6 SHA512 fa569a6907927acc18545d9e0b9450b6f0da4f404a8c45554dae392052f0aece504cf64bb30d7cd084b83aea214c63b3cadaa57e7a6f4b07c558139105319e2e
 MISC metadata.xml 633 BLAKE2B 5ecbefdb3a4a116a9e56113621970dd581f27dd42f8b6ed4fd445cb675bec4729bbce076a0d20de3dd329e00723f51d64df9a7b62658fa8f1348982aa8b8628d SHA512 bca6784d9746a7d98aaec2e3469b8bb3057802b869181c79622d16cfd31b06ca8c9dd89cb147f11c1f709fda2312973e7e115efea257a781905fb3a789b0cfce
diff --git a/app-editors/gvim/gvim-8.2.0210-r1.ebuild b/app-editors/gvim/gvim-8.2.0210-r1.ebuild
new file mode 100644
index 000000000000..abe335c6f243
--- /dev/null
+++ b/app-editors/gvim/gvim-8.2.0210-r1.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VIM_VERSION="8.2"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=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? (
+		gtk? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk? (
+			gtk2? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk2? (
+				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_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	sound? ( media-libs/libcanberra )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+# various failures (bugs #630042 and #682320)
+RESTRICT="test"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--with-gnome=no
+		$(use_enable sound canberra)
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python python3interp)
+		$(use_with python python3-command $(type -P $(eselect python show --python3)))
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                         CARBON (not tested)
+	# -aqua gtk                    GTK3
+	# -aqua -gtk gtk2              GTK2
+	# -aqua -gtk -gtk motif        MOTIF
+	# -aqua -gtk -gtk -motif neXt  NEXTAW
+	# -aqua -gtk -gtk -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk2; then
+		myconf+=( --enable-gtk2-check )
+		einfo "Building gvim with the gtk+-2 GUI"
+		myconf+=( --enable-gui=gtk2 )
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	einfo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	einfo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	einfo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# update icon cache
+	xdg_icon_cache_update
+
+	# call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/gvim/gvim-8.2.0210.ebuild b/app-editors/gvim/gvim-8.2.0210.ebuild
deleted file mode 100644
index d67c65f8ee9b..000000000000
--- a/app-editors/gvim/gvim-8.2.0210.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIM_VERSION="8.2"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix python-single-r1 ruby-single
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/vim/vim.git"
-	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
-else
-	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-fi
-
-DESCRIPTION="GUI version of the Vim text editor"
-HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	~app-editors/vim-core-${PV}
-	>=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? (
-		gtk? (
-			x11-libs/gtk+:3
-			x11-libs/libXft
-		)
-		!gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.6:2
-				x11-libs/libXft
-			)
-			!gtk2? (
-				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_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( ${RUBY_DEPS} )
-	selinux? ( sys-libs/libselinux )
-	session? ( x11-libs/libSM )
-	sound? ( media-libs/libcanberra )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-# various failures (bugs #630042 and #682320)
-RESTRICT="test"
-
-S=${WORKDIR}/vim-${PV}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home || die
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]]; then
-		# Gentoo patches to fix runtime issues, cross-compile errors, etc
-		eapply "${WORKDIR}"/patches/
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i -e \
-		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
-		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
-	    >> "${S}"/src/feature.h || die "echo failed"
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i -e \
-		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.ac || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i -e \
-		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c; do
-	    echo >> "$c" || die "echo failed"
-	done
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]]; then
-		sed -i -e \
-			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile || die
-	fi
-
-	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	sed -i -e \
-		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
-		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.ac is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i -e \
-		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
-	rm -v src/auto/configure || die "rm failed"
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	local file
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
-		if [[ -e ${file} ]]; then
-			addwrite $file
-		fi
-	done
-
-	use debug && append-flags "-DDEBUG"
-
-	myconf=(
-		--with-features=huge
-		--disable-gpm
-		--with-gnome=no
-		$(use_enable sound canberra)
-		$(use_enable acl)
-		$(use_enable cscope)
-		$(use_enable lua luainterp)
-		$(use_with luajit)
-		$(use_enable netbeans)
-		$(use_enable nls)
-		$(use_enable perl perlinterp)
-		$(use_enable python python3interp dynamic)
-		$(use_with python python3-command $(type -P $(eselect python show --python3)))
-		$(use_enable racket mzschemeinterp)
-		$(use_enable ruby rubyinterp)
-		$(use_enable selinux)
-		$(use_enable session xsmp)
-		$(use_enable tcl tclinterp)
-	)
-
-	# --with-features=huge forces on cscope even if we --disable it. We need
-	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-	if ! use cscope; then
-		sed -i -e \
-			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
-	fi
-
-	# gvim's GUI preference order is as follows:
-	# aqua                         CARBON (not tested)
-	# -aqua gtk                    GTK3
-	# -aqua -gtk gtk2              GTK2
-	# -aqua -gtk -gtk motif        MOTIF
-	# -aqua -gtk -gtk -motif neXt  NEXTAW
-	# -aqua -gtk -gtk -motif -neXt ATHENA
-	echo ; echo
-	if use aqua; then
-		einfo "Building gvim with the Carbon GUI"
-		myconf+=(
-			--enable-darwin
-			--enable-gui=carbon
-		)
-	elif use gtk; then
-		myconf+=( --enable-gtk3-check )
-		einfo "Building gvim with the gtk+-3 GUI"
-		myconf+=( --enable-gui=gtk3 )
-	elif use gtk2; then
-		myconf+=( --enable-gtk2-check )
-		einfo "Building gvim with the gtk+-2 GUI"
-		myconf+=( --enable-gui=gtk2 )
-	elif use motif; then
-		einfo "Building gvim with the MOTIF GUI"
-		myconf+=( --enable-gui=motif )
-	elif use neXt; then
-		einfo "Building gvim with the neXtaw GUI"
-		myconf+=( --enable-gui=nextaw )
-	else
-		einfo "Building gvim with the Athena GUI"
-		myconf+=( --enable-gui=athena )
-	fi
-	echo ; echo
-
-	# let package manager strip binaries
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# keep prefix env contained within the EPREFIX
-	use prefix && myconf+=( --without-local-dir )
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		# avoid finding of this function, to avoid having to patch either
-		# configure or the source, which would be much more hackish.
-		# after all vim does it right, only interix is badly broken (again)
-		export ac_cv_func_sigaction=no
-	fi
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		--with-vim-name=gvim \
-		--with-x \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	einfo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	einfo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	einfo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
-	# this evil trickery works.
-	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
-
-	# Make sure our VIMPROG is used.
-	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
-
-	# Don't do additional GUI tests.
-	emake -j1 VIMPROG=../testvim -C src/testdir nongui
-}
-
-# Call eselect vi update with --if-unset
-# to respect user's choice (bug 187449)
-eselect_vi_update() {
-	einfo "Calling eselect vi update..."
-	eselect vi update --if-unset
-	eend $?
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	dobin src/gvim
-	dosym gvim /usr/bin/gvimdiff
-	dosym gvim /usr/bin/evim
-	dosym gvim /usr/bin/eview
-	dosym gvim /usr/bin/gview
-	dosym gvim /usr/bin/rgvim
-	dosym gvim /usr/bin/rgview
-
-	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
-
-	dodir /usr/share/man/man1
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
-	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
-	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
-		die "echo failed"
-
-	insinto /etc/vim
-	newins "${FILESDIR}"/gvimrc-r1 gvimrc
-	eprefixify "${ED}"/etc/vim/gvimrc
-
-	# bash completion script, bug #79018.
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-
-	# don't install vim desktop file
-	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
-}
-
-pkg_postinst() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
-
-pkg_postrm() {
-	# update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# update fdo mime stuff, bug #78394
-	xdg_desktop_database_update
-
-	# update icon cache
-	xdg_icon_cache_update
-
-	# call eselect vi update
-	eselect_vi_update
-}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index d67c65f8ee9b..abe335c6f243 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -199,7 +199,7 @@ src_configure() {
 		$(use_enable netbeans)
 		$(use_enable nls)
 		$(use_enable perl perlinterp)
-		$(use_enable python python3interp dynamic)
+		$(use_enable python python3interp)
 		$(use_with python python3-command $(type -P $(eselect python show --python3)))
 		$(use_enable racket mzschemeinterp)
 		$(use_enable ruby rubyinterp)
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index c93dde01e98d..d97e6e43945b 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,10 @@
 DIST nano-4.2.tar.gz 2928595 BLAKE2B 42bb0ccbf4961706c6c645eb2310a646a7decd3617117a079ffe9e3718c8054ab823a5aff3e543c06c4c398f83579a679267a9ad6f113ba451b76d67e14b07cc SHA512 a5dd9ce96cd09d12c65108ea6a18b2cf1c2b055929e58d3e84beb0725607b4b5a3f8ae3fda0ab658c853cc4cac70c089fee716e1bb5a700f2506a7a3e1bea1bd
 DIST nano-4.6.tar.gz 2970798 BLAKE2B d6dfc702d374d1cbcd61080c8e0082b7931dc8c593c97eb705d878d25487a78dc1ebcb8004f742f5ecc3af1b5a31abcf6577e87aba96fb95d16029ff55e7af58 SHA512 76fb43495ca1f88ee8864eee5d023b6cd86bc35fba00151b4c6af53ae06e6b3828379e7d52a16c7df0956e9e04602a86ff8e8a7c1997320507ca041195bf004b
 DIST nano-4.7.tar.gz 2977920 BLAKE2B 8373ebf3f4e98ba204ed00678ba1e8791c9ffc11226baa98b7dac9ff9389cc465dc6574833ce222570301232a97f87e1b8d505dcce617f6c8bd915f4a662df4d SHA512 2cbe2341bba46f57a692d6deb20003d992da0230fdec3a2dc485d3b03d2ec2a70e66d05299bbc719fca658c8a8060dd64d4b52e68aadfd73980b82445761615f
+DIST nano-4.8.tar.gz 2995765 BLAKE2B 80acb19758c4bedfa1fa52ef9ede7125bdd3844df6932912899ba2f5c4471859ac6d044b2c67d43afcfc416d0b6bf0b5d023e79645c5d6207c5ed4a0857305a4 SHA512 3e6f8f2a7ce55df0eb2d96459a22f0a40808b4ffc67eb5a35937437f5c1cb193046b02d123597981066b872ffacf345bf0f4c72f546323324ebb66aa751d11f9
 EBUILD nano-4.2.ebuild 2168 BLAKE2B d6daebcddb29f779588ded756966e14efc827c68cd3eb5c7a7fb9e7c98159b9d6c286ee7456aa6bc16b5d3bdc167c7fd987ba6ef65a85d16dfd8c1d5d5c014a5 SHA512 21c1507c0a2430595eaf3031b1fd587c766ec162648f7eeb0d427aa5308ec4c5a74638bacc61e982763c212e15db20cc40bf3f64caf3ff61650dc374dccf5d74
 EBUILD nano-4.6.ebuild 2170 BLAKE2B 0f57307e8cb772be9e724eb03605465c41cca60e941a99ae7add2a31cfa1066d25b629721a25c7a3166d33bacba13965543c6ddc7c819945642ae451df93b8d1 SHA512 212eff2f9f01da5e094a378f5a46c968e853423049a93b4183ecb973926cd9394edb12f0bc2012d2c207b028377a4957d5d49ba1be45e3f106894c8e8b88e5ac
 EBUILD nano-4.7.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
+EBUILD nano-4.8.ebuild 2180 BLAKE2B c4c21a1b68f1b444bd37a83eedec29c16b0d41fc0861ea985e5c6f91d79de49a69ca5c9aae0826c9b8f82743dcb0721fa32df94b4a61f322d4ad4770f5e247b4 SHA512 22ee6cdf0d25af8c165c9c2241f1fd8eab261b830b169412ec75b629ce6bbb22a8b3b9a98f9c66d7a6de54a251c09ef00105402ff185747705cdeca179919f84
 EBUILD nano-9999.ebuild 2180 BLAKE2B 3593e66247968bc380aa06be54ac0b62a202a29935b5cbc6cc7f9f66e8ab9e80fad8c5554d0c8baa45e295a18c74b85c38552fb0bfebfdd6e14e5617526a50ca SHA512 2a3f85c2f99e83024a984acbb480b673d8735319b657b4f51d5d48217a40062e6596b8beabc057b4e72584783b4cd94820f5b3eca23911a38cde7ed130178626
 MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-4.8.ebuild b/app-editors/nano/nano-4.8.ebuild
new file mode 100644
index 000000000000..399fdff323e8
--- /dev/null
+++ b/app-editors/nano/nano-4.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P="${PN}-${PV/_}"
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+	sys-libs/ncurses:0=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )
+	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir=/trash
+		$(use_enable !minimal color)
+		$(use_enable !minimal multibuffer)
+		$(use_enable !minimal nanorc)
+		$(use_enable magic libmagic)
+		$(use_enable spell speller)
+		$(use_enable justify)
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable unicode utf8)
+		$(use_enable minimal tiny)
+		$(usex ncurses --without-slang $(use_with slang))
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D}"/trash || die
+
+	dodoc doc/sample.nanorc
+	docinto html
+	dodoc doc/faq.html
+	insinto /etc
+	newins doc/sample.nanorc nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+	fi
+
+	use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index 0f595caf0554..aad82dec126b 100644
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -7,5 +7,5 @@ AUX nvi-1.81.6-printf-types.patch 437 BLAKE2B a7cf425c52882b693e928af13790df0959
 AUX nvi-1.81.6-strlen-macro-renaming.patch 18467 BLAKE2B 2c764c05ba9e8745369441062452e6bcdf6c065d2c9a040d4ef0f3d2041ec31c574be18bca3432b3ac252c693e2feec4f7df9851055305bad9760fc33d7220ec SHA512 af3470a3f56ede588439153ca84db331a418eecc08787ce89680e5614020418bfa0cb806530525d08ce65af189cb338162a5d77444c14f36036df3bb0327b196
 AUX nvi-1.81.6-use_pkgconfig_for_ncurses.patch 945 BLAKE2B ffdef923f5355ab4839955865cce148c8713517d19c5c6cb8fc4dcff227c1c833bc120d505f36d81240d64d4a0472628c61a28456db1675ecc2d47c3323a1507 SHA512 15d524acfc98bfef4d490a5bb985be6d620487b82b997ffc6fae3e0ad90e7c3a392dd67ebe9fb247c758976485937102dd14422d6218ccbb0491018af5c21906
 DIST nvi-1.81.6.tar.bz2 1758309 BLAKE2B 7aa9b1a7f5337bb246a4a8779180830efd2fb1cfeda2c0d5fc153393cd683237cdfc2a69ac22b228629561ae2222d4eb36746fae4dfb6b9ff44945265988929a SHA512 7e203f7ea6723427d18ff55361254991f50d395f89aab2ea52d0902c474acb24c289da7c35d9e907d652145f13483d8a8270f5c8ee72bd723a3b1eaeecc4f9fd
-EBUILD nvi-1.81.6-r7.ebuild 2088 BLAKE2B 290dc6358a735f11fec193136308cf9fa3361b264c155d7427854b15be51da590220434c82fa5ad1c804c54c663995834be7d362a78546a1a340689dc41142ae SHA512 901b2ba1386317deab1df817eb3cc0ee755c3cc64d86a61f583eb22b3221168c5a3255934347a42e4d00ea76298e804ebb4c595224449c3f86e697bc677d21ec
+EBUILD nvi-1.81.6-r7.ebuild 2086 BLAKE2B d075f79d6cac356d5a4f2066656fef6c304600c17cfb3ff666a6b1449240bf25cbed826a5a3a6aaf84773afd1f0a5841f9a12226abeb0985785798e25f52322e SHA512 10deb05aaaab2501240a6ac213433d1da662a0f051febba3dff97cc4b344274eeeade7cd04fdb98403da0f664c6cb70e4ca03878687d4c4ee4070d2f7c1bb65e
 MISC metadata.xml 365 BLAKE2B 9fe6afdbd6ccfb6b2bb5283a69ee95db93a6de6f487718be7b190a19204cb9e6426bbb8f2f1536fd6512c819955b5214c70c151344668ebf2c58827cbdcd24bb SHA512 f87d93b660215d0d7271ecb980798e1c5bef9ab24a4773ea2e60748cfa4dd57644567820d5862e33520b7a71f4ef07bac60265f0e656a26aad5360c74b7611fd
diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild
index dc52ca6e54cb..322ca70ae4fd 100644
--- a/app-editors/nvi/nvi-1.81.6-r7.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r7.ebuild
@@ -57,7 +57,7 @@ src_configure() {
 	use unicode && myconf="${myconf} --enable-widechar"
 	use tcl && myconf="${myconf} --enable-tclinterp"
 
-	append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX%/}/usr/share/vi/catalog/\\\"\""
+	append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX}/usr/share/vi/catalog/\\\"\""
 	append-cppflags -I"$(db_includedir)"
 
 	# Darwin doesn't have stropts.h, bug #619416
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index f3e32094f6f0..ce832c99a421 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,5 +1,5 @@
 DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
-EBUILD vis-0.5.ebuild 1615 BLAKE2B f127a9c44eb2b981fca0b9cbafbba7787b9c69b27f7a7a4524b129161bfe390d24365159a036663dfd7b97f4f9642cf6ed5a2f0bb5cb30b8e7e932c2aa86ecc4 SHA512 6d8424bbc0b30b4141d257f21ce1b40275145f152a3082a5920032f4a6869a883cc1e46f9c8dc0ab898b3971dbccebba728dfa01721a705a4402f48b5d7e922c
+EBUILD vis-0.5.ebuild 1613 BLAKE2B 2a8eb581451c657c5badc7c1342e7f61532172c9c49f9f9cf2a1d43a56721a601ea2db641cd8aebab3aac1fcfeb85e85763d39c0631886795836fb1a7518fa77 SHA512 c57717cfae7979952461f67dadac50e580e1ec5ad3fb3a16bf3630f562340b0c4e0b7d8978058cd4d7d213b692a22c3d3f01b401d3592c1f326626b3bb248b1e
 EBUILD vis-9999.ebuild 1324 BLAKE2B 54a426f45f1852ffd29162bdefb5645af5e825247c1a254dfdb9993cf317e6e705d88973495d4865a848d02fece7d852716e4088f0ab8592a3e5f7c544745bcc SHA512 14a2619ffec87b4cfdce6a2fbb6891bbb92f743989df343dc2edfd98a9813d7b7763b11187732e9523e65d55ebdd608a3d7a595a42b0aa3b0965a26e5986cdde
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild
index 8e569226bead..0fde7f463dd1 100644
--- a/app-editors/vis/vis-0.5.ebuild
+++ b/app-editors/vis/vis-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/vis-v${PV}.tar
 	test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz -> vis-test-${MY_PTV}.tar.gz )"
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ncurses selinux test tre"
 RESTRICT="!test? ( test )"
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 5d0accb9ea07..6488da0ea415 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 5b8ecfdea968..780fb53a12fc 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -4,5 +4,5 @@ DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd4576
 DIST ebuild-mode-1.49.tar.xz 34632 BLAKE2B 3e7814363aedbb5a05193faccc0815a7f4b0f56eacb03fb720fa270ac69faa163bd8164639390b1703bb0a82341975e9bfea143c651b5b0ba2825b2bbb3b3329 SHA512 440e23aa6f63307955a9c970f5cbcc175eb14cca4ff4035da4f10fa22d9c6766b29ca7842b800a43c46063f3045c2ff3b2d6b8e27026f47bd0ed0959a8f2d0e9
 EBUILD ebuild-mode-1.47.ebuild 727 BLAKE2B add88cfbe6e562e06f093e4c0032523bb4c9381e266b9009090cf9985cd17ac23bfe8991c39289616fd45757702add03b698aeb4465c60ed6c77a99513fc789e SHA512 377cdaad34f36316ca345b85663aab601b2b48f68c26a1c0b509db283c1d18ac361c1872c346ce563b0ad95e039fae583783ef760019a811a528090724f6ceb6
 EBUILD ebuild-mode-1.48.ebuild 736 BLAKE2B 1dd6bcc9f6ba1f972a0b2374863447e8e46a66c019e3fa654d38662564dd35633a19ade8333f77d6b9aa14da2b7915aeceecac9d1f93acbb28c7779f75ad5b65 SHA512 3c4ca27c2f9095c1dc9c3d9ee66b40995994e7f183376f0b9b6c59c6375bb4f8536da0d2f5eee8008b650c0eb3e4ba33c492c81fc0543c3e0d5bd8d83301ebfe
-EBUILD ebuild-mode-1.49.ebuild 729 BLAKE2B 78a89d70a37d7d279e949f4a1e9d4483f349e6308dc639cc582d6fe42d72ec6aa8cb6537c04b6645a2e68cb0f6015c93fe4579f45f3610f2d17b11d231c926d6 SHA512 3072fbb50c07fbb18511c422689b2c6c49104dfc648d3a97b648d14c3235e5cf669f256bf9f8bb8e2296580533fd0cc27009a9a56c3e7e791cd88c7d3f910b29
+EBUILD ebuild-mode-1.49.ebuild 728 BLAKE2B c37a3933d8652c4d45f7504f6cb419ae8529c85c77a71d4ba06c5667436886e20efe4cbe323b522260b9734c4765b2e819cca013c08446f03a08932a1f57e8dc SHA512 f22b65b248288dea270ca0793eee0a66dcbc116f86629482f609af4c0cf7577a69e092f6215ab23e842806d62376b1c7d6dcf07430b188663376e4f9f6f9296e
 MISC metadata.xml 426 BLAKE2B d0b4dc2bd01fc6fb2f0c58b01676b80d09a4677876adc9681c3c436ebc437b6b034187b19fea30cf980927fec1f6a9feee9a0b7d1a4dd15818d02e4c8ec77af6 SHA512 058df2768030185953c7ac3622819c430681eae3ca60b0d02ad48ed22ab6a0ac7c169d93f8f54a3dddcade3f84c9bf58f662a58bfd78217ea8fc27a580ab9077
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
index 92f9969ae580..002cda378759 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.49.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7755bef2f095..b99e890765f7 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 38564a1d701e..533cef5d53e0 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -2,9 +2,11 @@ DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e
 DIST buildah-1.11.6.tar.gz 10600477 BLAKE2B b70849ca0121e32cd66da3da282a443688c15a783a1be7d5d3650bf1122c865e9674d0790fb599f6da4c04072a19360aa224ccc76d516e8a8e71061c903dd0e1 SHA512 419d51d0b430dbc38862bad218cf0bb9a698472dd3932e69fa6bcfb2023b9cd10cf03916f2333892cdcc051ce799664619c62941965a59420d81ba4706e9d7be
 DIST buildah-1.12.0.tar.gz 10717080 BLAKE2B 67107684d625ef23166d666dba50244861e6903f46315d8bae4d313d3585da154b7ee5f87ae8ab69ca717fdf68b914dee0cbcf2e1e95c34ebfccee4739db1d62 SHA512 ed7d77dfe88f613ef4f756455d889d707707ad16f8f6a9b514a8fbaabb56fef58db54ceb2344954a9311bcc6f1f000b21ac461f9b612b8534ae6a4594ad7a16d
 DIST buildah-1.13.1.tar.gz 10928426 BLAKE2B 7f790e2e6499543f6ddae5582f03e4e8a2429783512bf53ffa48d010b1338c4e232117e8b175057205c75ee839981564358239d08d48dbdef8cae80bbacc6554 SHA512 89c02f3c485408f16d6334bb4621accbb7de5f8d3d4458eb4c925468da1f6c14a18132e8f643e965d3054f05a90ada3c4911e539541f9ca045ca606c9ce1bed9
+DIST buildah-1.14.0.tar.gz 10895764 BLAKE2B afc99c12737651997785ce96793afbff24e514a89e445ec5e176940940335b5966cf6e05e3d418d2aad2308d604e05879874eb5d5c07182dc0484e43411628e7 SHA512 c2fe27ccff81cc22dcb398f6d57f618015a1f534510888966483002d552c5f233b8899f639dac15d0f299c6c618e6f1d9889e65c745ce4709e7abd9498258a86
 DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
 EBUILD buildah-1.11.5-r1.ebuild 1584 BLAKE2B 2435e6136bbd7b261aa25cf1a1bd8cc83e417900c0bb2bdda0fa2de0ea39e67240770b0f0d25141a303892a931acf72a412c600f349342cf89528be227a1c9f9 SHA512 ae2f57cbdf97f30dc56d0eedecd7480cc7a3f5b88c1b1d3d25fe155249db8160466a2a606b32530e2607a3ecc952f3855d2ca16a98a117767d0494dda31e0477
 EBUILD buildah-1.11.6.ebuild 1584 BLAKE2B 7ffcafe3e88de41edb8d0b8b8433c451c40ec42ccc51789cf0b6f24b566bda4fd57c54559a44f8e305bf9f56b55d0c4695be2a38ce2063964f369e0edeb0b1a5 SHA512 c385003b323de4cd79aad24f7a12c57c61c55a9a2e0245ad1bf1cc21cfdd1e2745e464a79c835192f19356dabbdaaeddf0df8a709d2ce1de6ffb7c7c3401cce8
 EBUILD buildah-1.12.0.ebuild 1208 BLAKE2B e9195ea67dfddb0e592f7d0de2a4809e575b87a343d4cb6380950aca7031be06e87b83bab22ea33ccc5986f9764440b4311cff707aa206dff621c7f7b1b9a2bc SHA512 5cc5b01169134a55a930033bb0aa5ded2869d47a7e674afeffebd5b8d88e989c1f5b4f98d62ad4b0fd7ed46af100c380432b949ce5f219620b69b8224dd80d5b
 EBUILD buildah-1.13.1.ebuild 1208 BLAKE2B 4ad98c84dafee7a8def81f6065eefe3751b5c63c623a96fe2c61762fe477346b955bce15c58f4c0c70ecf1f9917a1c84b44643de7e46aae7650d7c73bcdad75b SHA512 60bf145750f0089e63133394fd44a2fb446a9cba41f6842d4cfcc86d1753e4b79950b7b8b0330ea991201c72602d25ababed8150183a45e04ba1e6578289f3d8
+EBUILD buildah-1.14.0.ebuild 1208 BLAKE2B 83e6645cbfcadeece94da5b0a5ef8ad8efadcacea0e14723946b94e727bc75b2bfbe88645c88525ba7f6bbfb3f19c4a5d9db80d45cafea4d4e26702126d12c3c SHA512 38400d4fbd7aa24ba9efcdc673d9673bc19cf804cdf9a78d8406d264b8b543b1df44f095e15811a13c01ac0b627190424028a9e82ddb65a23d87daf291011a74
 MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.14.0.ebuild b/app-emulation/buildah/buildah-1.14.0.ebuild
new file mode 100644
index 000000000000..eb7c61b39ef6
--- /dev/null
+++ b/app-emulation/buildah/buildah-1.14.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool that facilitates building OCI images"
+HOMEPAGE="https://github.com/containers/buildah"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="selinux"
+EGIT_COMMIT="v${PV}"
+GIT_COMMIT="5965d9a"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="app-crypt/gpgme:=
+	app-emulation/skopeo
+	dev-libs/libgpg-error:=
+	dev-libs/libassuan:=
+	sys-fs/lvm2:=
+	sys-libs/libseccomp:=
+	selinux? ( sys-libs/libselinux:= )"
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
+
+	[[ -f selinux_tag.sh ]] || die
+	use selinux || { echo -e "#!/bin/sh\ntrue" > \
+		selinux_tag.sh || die; }
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	emake all
+}
+
+src_install() {
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md install.md troubleshooting.md
+	doman docs/*.1
+	dodoc -r docs/tutorials
+	dobin ${PN} imgtype
+	dobashcomp contrib/completions/bash/buildah
+}
+
+src_test() {
+	emake test-unit
+}
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index d12ea32f8e42..b96de59bac28 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,11 +1,13 @@
 AUX containerd.initd 733 BLAKE2B dee4f7bad7250a1c8ca87b3b862d73f9150d73dd2b719bf8d7420dde704174f237a9023a9546cfcb2a122bb74ef583119c9668b453f11612eed26aca55044132 SHA512 d0193e784c62070004e43a7d8b8834bbcd2eba51faa7f8505cea04e06740f5e4950e5c036aa32edf3f592c02f3dd9e65214a6adba8579bdf9c79ae556af94462
 DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 6727fde9949ca96f351964df3c0c7481cb5274895aa3b31552258d57cc5958bd2d3006cfe4d87088d24ac53de1c391b6029b3f800363ee743f08e1937f0d0fec SHA512 14d4f1cad1a68414915c1e98b64dfb6f3f29a0e86e18570d6cc138f4db14b56499b978135954198fe9e2a1363383694eed530b301a9dc699d28c305d4dbf3cd8
+DIST containerd-1.2.12.tar.gz 4990623 BLAKE2B 640ff03f74e94dd3f919d3c26015cebae1f316c910442db881cd999c92991b7011131f05501648e9f08b6e34d38e2aa6ee1065ae31550de88ad79d9cafa5687e SHA512 bcb4f94aea984c804e34137cab6aad252c01dc75d5e33ade5d1e533e4266fd0af67d2bf8aa85f0e6eba4e43756e84f884f1dec4c9febd66f8a3e3bc8cd3ac775
 DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36 SHA512 287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
 DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 6cf98e370547d3ca5158f546e72e3ff5fdccc08c2e9f390988d080222195f95512dbf6f7dc042b7a966283a040000b7b8777b3fbeb4c5b861caae4f6209c59c5 SHA512 b96ca236d28933c1bf309fc7204af7d2c356e19af394d5c2274a178c8f15298faf6ca9bb8e7d04acb7c3c9c41035446643a8df0103017f7ed0320bfc37cb8ca9
 DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
 DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
 DIST containerd-1.3.2.tar.gz 5704320 BLAKE2B 32ea22ff445cc66f4c8db8abdbaaa7fa0c8c620b294bda54f2319045af1925398057ba1a5cb5c265cfc73bcff5b49943013b517ecb3bd05f4504920c4a8d6f29 SHA512 768a19eb0829e196a61ddedaa11b0d6691caf8f9cc590a3e47ac77c1acad62e64b7a55017a1a6cccfcb87785a083d5ce131048b0e39e48c65e6cd5922382fc3c
 EBUILD containerd-1.2.10.ebuild 1436 BLAKE2B 2ee522bab38cd81a9ac23bd8f7a2021abde9ba2dfa972a57c35f67700b44b2f946a312cee5512ae62bae4cc43aebdc469e366d4280c287018db88074b0c24553 SHA512 07fde13f2d1809fc7f5bcc57e39c425bc4f61d18f7cef4acca7ebec45c9c758742a27ec8343235fc23a887092aa782bb3662528faffdf23a93aac255f413c096
+EBUILD containerd-1.2.12.ebuild 1435 BLAKE2B 13a3717ffa8cc95ba8af26428925949d44223040b497ec30da9105d2c144b57ac8344ce265ef1bf07ce527b09fea10302cf1fdd9d88901fa2880bc5be6d3d648 SHA512 a81597467ad007308d96f36446dc838e4afcd37148c81ec40c955958d8a863d260a899474c3e373486c05254f7b7dbf8b94fca01f854279209af89fda2c64d08
 EBUILD containerd-1.2.6.ebuild 1436 BLAKE2B 15ec996c1e39e5907c80e161d64f0854e99bfd33d7ec0f91d53afcca3964fef23c52b89db1b42c99d976b0aca513c759038e2fa913b085f19c5ccad69e1c3e34 SHA512 1e43851c799501c712b5be468bb3469c89177e856dd4bea40c2b130cbcd3b2fb5acc1722285f1839562e837d7cd0243b0138fa418eda293843d4626e34b390a3
 EBUILD containerd-1.2.7.ebuild 1437 BLAKE2B 5483fceb26472d3b98e88d9d507b11b2ebb8cef7a8b254cfe106384cdb79975b3bd9804f63876e2b3f5b08d0ab96beeb50210ff850046bc98f13ee6781a38376 SHA512 e676267b0e4ca108735f16c1d3bee9d1edb3a4287a0b0e1ffd4a11005055162f76b11a0dad1e4d22ba57b48b2bbc7e862005d58c4861011c5d8f6047bddca47c
 EBUILD containerd-1.3.0.ebuild 1437 BLAKE2B 1d1303203e48395437fc53cc232571093de834e0b5b9dc7fa02c7864372adaa7340906cfac7c1c56e645a8d4d18a39d5a7e32e9f547c8a3905fee4fc019a681a SHA512 6689ab82a9b3d73764d7149e094781670148815e2b255ffbaa31887a3a0153ebe4930c49c2bcf73befb02410aea2ad023f33e26c4ab6a605e8097a84de76c36a
diff --git a/app-emulation/containerd/containerd-1.2.12.ebuild b/app-emulation/containerd/containerd-1.2.12.ebuild
new file mode 100644
index 000000000000..d2c5c94985c2
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.2.12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT=35bd7a5f69c13e1563af8a93431411cd9ecf5021
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor +btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+	seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc8
+	seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	keepdir /var/lib/containerd
+	dobin bin/*
+}
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index f0d245aa8ec6..b523992ed056 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -21,28 +21,28 @@ DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf2
 DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281
 DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8
 DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855
-EBUILD crossover-bin-12.5.0-r2.ebuild 3831 BLAKE2B 417c21afef0d423da3ac0081de40dd1f406b832ee9bbe9de78672c47d6ade15b3cae312a795ee66112cb6879419e65f8f092ba32a7f46e207430bfd0516c87c3 SHA512 1d4c46b5710a16e50203c215eb0e76162a870702fbe58452c76eb1de1c407f08f54f477f6e7894bb8831ff1b601bcea220ec7bea15c97cb0151f55ea4fc45f6a
-EBUILD crossover-bin-12.5.1-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.0.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.0.1-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.1.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.1.2-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.1.3-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-13.2.0-r2.ebuild 3832 BLAKE2B 57d13ec8fb3a7293e65c6c761e4c1aaa67be27888a1ba90ebd2882b1ea088da6eea5dc424d77062e05abb95869160cae0f42202acc0ba34799cc6d65b1c6d733 SHA512 a2f632af14cfb4fe14851ad48891767d0c7fec1c2c4303131f887c0ae0fbd7510238720648538c0db3f2ce6684a2feec8c167e839f1e713d1e5f110ef58de9ce
-EBUILD crossover-bin-14.0.3-r1.ebuild 4207 BLAKE2B 5b9a6b2e5a2507661ded1a422de8eec241c52c72c9572d797e17dd5b7a60d1f901d1953af6a2fa7a231a5d4438511c12337db27783a9098f2d29f420842ac5c2 SHA512 616dde819ae73718e13ece9623ff51127beba851b929b6ff4a03d3c31a3da33f355293e0c6ecd154afe40ab51efa0288946a7b486c184d0fa252ee1c4456beef
-EBUILD crossover-bin-14.1.4-r1.ebuild 4208 BLAKE2B d1c7cad342ade2a42770d614838118b55f91756f77aaa9bca1fa7dc4fdd401d027022dfa1bf255e103a1336c21639289e0d4173a5a56c90902ea2b6b6ad67797 SHA512 42b5169b27c8d882997386eb50d446d5b35ae949306c2d435fbada834ae44bad03491d80fc6c8459d03560ec963be24f4cfb271cb09fe5d46770fa61f8bf0fb5
-EBUILD crossover-bin-15.0.0.ebuild 4538 BLAKE2B 30ae6ff406a8d2e2d4622d04e21246fe7475589f9f5f89022d6b6f04c6950845dd5142e7cce2e7a3b11e0e8b81e7ac1d684c40495e00fca41889a36318e09b86 SHA512 4b2de97c09a0e5f10206a37e0432b93b9380b405f0015332c57328335c5838ecdeaf8c69a347f789afb8e8196016e20b5febac6e86dfa9b8933e8f4d6ba1f235
-EBUILD crossover-bin-15.0.1.ebuild 4710 BLAKE2B 8e15a2d9d70f1b5e571a3bd1486dd59289b87fb087826f6aba692b0ca71f31adac43d3cee37f68b31ee5bf6085c50a11619132b0ca504ef8be1bdedb35f4197a SHA512 e0b2776b1f91f6c42175db3350fd3426f1dbe056a6a2965358f039daedf0fff89598bbd675232b82333fd7e3b078befc259e267c41520b0e8cf79349d53e62ad
-EBUILD crossover-bin-15.1.0.ebuild 4710 BLAKE2B 8e15a2d9d70f1b5e571a3bd1486dd59289b87fb087826f6aba692b0ca71f31adac43d3cee37f68b31ee5bf6085c50a11619132b0ca504ef8be1bdedb35f4197a SHA512 e0b2776b1f91f6c42175db3350fd3426f1dbe056a6a2965358f039daedf0fff89598bbd675232b82333fd7e3b078befc259e267c41520b0e8cf79349d53e62ad
-EBUILD crossover-bin-15.2.0.ebuild 4885 BLAKE2B 8e26cb3add2ee735ee071bb75415167627db681f3937e4e8b934de912ca8252d3486915c0978a52ecf452aedccc104c263ab7bcc9ddb53516ee0f051824baa17 SHA512 98f6b32f0bb9701716104c9523424e6843b42363dc4f7dcbab34f8a460ba06a11ea1e7043c8b20d0b31f8efccf499a3a29f11d8b40339e947b8ebc7fdcce475a
-EBUILD crossover-bin-15.3.0.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
-EBUILD crossover-bin-15.3.1.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
-EBUILD crossover-bin-16.0.0.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
-EBUILD crossover-bin-16.2.5.ebuild 4882 BLAKE2B c09b3073970195dedc5692d2ea4272fd761ccfdd18885238da599cfa9172dee72839aa127988845c8f540b5149993930d4ddd2a0fc38c338e58000be7fbbe014 SHA512 aa206405ff57361b3bcdd4af3e3a0ae78a083a992c0aa9ed8443d45b288fa3f6b98c479f84b9c42578c3760c3689fc62c5325037e690ffba08319d408d8327e3
-EBUILD crossover-bin-17.5.0-r1.ebuild 4758 BLAKE2B 49d065f71467fb68b2815bfa6bd2fe5d94ae8393735eef7cd152252f370f281eccc48c288a05ddc56c83785327e8c7fee45e2b3c1fa87ae4aeb12b3c14e74397 SHA512 80413aa52bf1301547d3a43db2ded483808c4e64eb5a6bb4cfe397bc38bf964cbb1468b30d37f5017d0ad62129d75ea5d4f7a02e6f73237a868b1f3159d0e507
-EBUILD crossover-bin-17.5.0.ebuild 4724 BLAKE2B 62d1ff8c293a921f9bbf9d2cdd34b11a1916a22f660884ab29c5ce987082fabc2766368be7d4c3956767229a621350158fb1282128e393dcf9d90b16e7488b03 SHA512 d59a7752b81d24b118d1f1494ab4e08acfa68f1268c75a0bdd19d7377db9ab5f9121c263a96408f64968fb508bda8a1e03938ebb97deb68ddf2175e37b625b94
-EBUILD crossover-bin-17.5.1.ebuild 5272 BLAKE2B 8926ff071b5895551c91b594688c2ef26a542795271458cb75a3075a990a8164013d7e701e54552a6a1cbed1b68570716bb6677ddf48fb444791ad7e8ac0cbde SHA512 0bf118e7a94166c645d0c3441fc1030c6f43e9435604d2af9bc3ba0abd817aaeb84bac7e84dc294853928cbd8e01ef694a5dc749e277428e882a189f834f8711
-EBUILD crossover-bin-18.0.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
-EBUILD crossover-bin-18.1.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
-EBUILD crossover-bin-18.5.0.ebuild 5496 BLAKE2B 2b1bd7bdecbda88184060410a2f08e3fa0d870e12faf97fb0d7245afd9141434269c25ecf5f15a9271f6cd7ba0472d3292ba8e9b1b0f6ca68de4c5ba3fa3ee9b SHA512 308ac99409c0e13ba9a3356919870565ae2b4d97f68dbd838e4d884f335c066eb00a0de318efa10e7088f1ac017b31a9a3595a4b6807d3cc0e4844833f95be45
+EBUILD crossover-bin-12.5.0-r2.ebuild 3874 BLAKE2B e8617f6fc4da436e9dfc5c4429210c0fc49879d1b50ce22325ad86259c859f3a4ef8bfe71fae6a73d3cc37a6981809d1fd0a98790f74aa1dc039c6f44b681485 SHA512 0fd826845aef6878a00be0733b778b18aaa4813125d6d652e4e508e8399bc2554c7d3ba2420e47b72aec3df8f0821c64260aed65d26923fc568441c2bfbe10ad
+EBUILD crossover-bin-12.5.1-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.0.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.0.1-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.1.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.1.2-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.1.3-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-13.2.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
+EBUILD crossover-bin-14.0.3-r1.ebuild 4250 BLAKE2B 5ba671b023732d87d880744ec61735620553079c5e7c227ead81fd020b9826db8a8c65f4b702e2626845f9e2609e196a091fad0c6592539b7447feaa7f68a5c5 SHA512 3dd72bf59db3ba1ab8437c323c0a37c91250e7b728350961cce1e0c866120ecd7451b87e8d05c303946b2ee36e86a83ee99f4e4924d95ca671fe3e225a9178e1
+EBUILD crossover-bin-14.1.4-r1.ebuild 4251 BLAKE2B bc35e256c22a584b83bf7777c1638db8eb3dc80879a9ba02aee17241052f406ff89c81fe1c3e2b52a33ccc86d1c3ae205c3ae2a43fb88e11a1fd0afd143bd423 SHA512 26eaf71bacc1e102aa7fd6cac605dd1603c4479068d620394d1a9916f6a69b6b887d5e699a3e64316ed11565c46ceeab83af56079c6d560c285a3f99b046eeef
+EBUILD crossover-bin-15.0.0.ebuild 4581 BLAKE2B abd895ab70c16ce31aa0772937556439b368a159fd9d7c919a7286b7cc2215619a3efc433147b3472156974c014299386083ff8c6169f58b2c3bc97b78e64bad SHA512 2a3c45a4c9110b591156b16bcaaecff36fab44868b5155174ee93c0d17e9e816d08030bf3581c20c4d7bd9e23f5080e825d88fdb166737192140844436634ae6
+EBUILD crossover-bin-15.0.1.ebuild 4753 BLAKE2B 33444ddd659cb923903c33f2189598a47f8d16a709bfcc0a74d9a0694f2057deff60a62480d6fb6dae5614a724edbffeb17f99c0e970082576d9ab71c422279f SHA512 2c3bd78577d9783451de7a171557b3ca3bd9c080f8b748f700259ef9c27860ba836c0ef5f97c2d1245f21f8a61757b6292580a9c485d5e6b1bced0303b7a822f
+EBUILD crossover-bin-15.1.0.ebuild 4753 BLAKE2B 33444ddd659cb923903c33f2189598a47f8d16a709bfcc0a74d9a0694f2057deff60a62480d6fb6dae5614a724edbffeb17f99c0e970082576d9ab71c422279f SHA512 2c3bd78577d9783451de7a171557b3ca3bd9c080f8b748f700259ef9c27860ba836c0ef5f97c2d1245f21f8a61757b6292580a9c485d5e6b1bced0303b7a822f
+EBUILD crossover-bin-15.2.0.ebuild 4928 BLAKE2B 51fe78f65173665f9e18d8bf25b7022fc3934191101b2fe72bf9f9ec5d4c4c89582bd9dd3a1b0726b0ce36eaf655ba28d406a8f4b5fdd3bb73c82503d9443140 SHA512 45abaea9496c4c76e61b19d3469546e68b0ee430278b294bf682227649dd1ba3b1d56a7bddbc6f28021fee68cad28255a2d77f10801165c0e54a57f9a4dfeb25
+EBUILD crossover-bin-15.3.0.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
+EBUILD crossover-bin-15.3.1.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
+EBUILD crossover-bin-16.0.0.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
+EBUILD crossover-bin-16.2.5.ebuild 4925 BLAKE2B 2828ee2da88c8f709764048b45a8067a4a88ca8834f63c379c438364bfb20e28ea9550f9b49048a6794cd8e605f99b9078e498d385a85be8d57bdc97c895674f SHA512 6bbddd5d73717abd76ac6ecd9b53e39436e58f32041199ab1fe4de961c6b0ec8a5bee102bb912b033787b934403c3e1a8a8de016f8fc21e30dbcb16526c8c519
+EBUILD crossover-bin-17.5.0-r1.ebuild 4801 BLAKE2B 8269c5fea9dfaba93ab03a3da7470385afef34ac1a132da76b385365e3bdaa6f9bec56a97cc2ab4dcac9f0ada2061a397375064e45af7013e21ef7f7cee40150 SHA512 af3d6aec254edd49cd057a8e741e38856dc9af86681ef44d8100d4addf72337aab97169fe1d62167c41566830162706c1bce34fcdbb8301f65a7a026e1032e79
+EBUILD crossover-bin-17.5.0.ebuild 4767 BLAKE2B 371b22e6af826da7eb67f12949aa4fbce816033224eb0670c36bd0957ab9a265939ea37b1d047a6a84fb1290983068f54a8eb3cd4d4225b2e5aed180d6e36b19 SHA512 1a660015123602db39efc766189bcd502fad6d0ffe497032db27241c04a11d48a87c0d53939a87440f7c137827ad9ba779aabb68d0728c05aa61d38e4b9b60cd
+EBUILD crossover-bin-17.5.1.ebuild 5315 BLAKE2B 55b93a199734ddc6ef85069d1889ac92202e39a8293bc4f018dd3ffe8c2ee94b5deb207fe81206f619c1fdc34be5a7be5d43b1759d7b351ae248bf3c61bd6851 SHA512 47e7090c299d605bf52c8ef2614e6ac7e6c50c667455e84ba74a904d160354d5d4017350bb6be717a3850d65319841e258e5b9a3c86927001f3996aaf7223ca9
+EBUILD crossover-bin-18.0.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
+EBUILD crossover-bin-18.1.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
+EBUILD crossover-bin-18.5.0-r1.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
 MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
index 15750dd80789..78d5be269b3e 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
index c00511cf666c..f9d540708656 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
index ba03accfe227..c96c8632eb57 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
index cf4b4f10d80d..7b3f30280c50 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
index c8154f99883d..f5a9ee2ded65 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
index bdb0de9d05d2..71dba5bd4ed3 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
index bdb0de9d05d2..71dba5bd4ed3 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
index 79500b6a3914..35a162c94cac 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
index b3537aa9c934..b70ac3a77fd0 100644
--- a/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-16.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
index 00827f7ddb60..d3cb1e980327 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
index a160f02ad3ea..5096405e6199 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
index 006df8e97168..96a7c42364fe 100644
--- a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,8 +36,10 @@ DEPEND="dev-lang/perl
 
 RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
index f2e4d02eaa7d..170b56d9e884 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,8 +48,10 @@ BDEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
index f2e4d02eaa7d..170b56d9e884 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,8 +48,10 @@ BDEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
new file mode 100644
index 000000000000..170b56d9e884
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support."
+HOMEPAGE="https://www.codeweavers.com/products/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="bindist test"
+
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="
+	opt/cxoffice/lib/.*
+	opt/cxoffice/lib64/.*
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/bin/wineserver64
+	opt/cxoffice/bin/wine64-preloader
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxdiag64
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	opt/cxoffice/bin/wineloader64
+"
+
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	app-arch/unzip
+"
+
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	!prefix? ( sys-libs/glibc )
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-util/desktop-file-utils
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} into your DISTDIR directory"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+	python_fix_shebang .
+
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm"
+
+	# Remove unnecessary files
+	rm -r license.txt guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}/opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+		|| die "Could not remove uninstall menus"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}:/:" \
+		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+}
+
+pkg_postinst() {
+	einfo "${P} is open source software with the exception of the GUI."
+	einfo "Source code can be obtained from:"
+	einfo
+	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
+}
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
deleted file mode 100644
index f2e4d02eaa7d..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support."
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
-	opt/cxoffice/lib/.*
-	opt/cxoffice/lib64/.*
-	opt/cxoffice/bin/cxburner
-	opt/cxoffice/bin/cxntlm_auth
-	opt/cxoffice/bin/wineserver
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/bin/wineserver64
-	opt/cxoffice/bin/wine64-preloader
-	opt/cxoffice/bin/unrar
-	opt/cxoffice/bin/wine-preloader
-	opt/cxoffice/bin/cxdiag
-	opt/cxoffice/bin/cxdiag64
-	opt/cxoffice/bin/cxgettext
-	opt/cxoffice/bin/wineloader
-	opt/cxoffice/bin/wineloader64
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	app-arch/unzip
-"
-
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	!prefix? ( sys-libs/glibc )
-	>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	!app-emulation/crossover-office-pro-bin
-	!app-emulation/crossover-office-bin
-	capi? ( net-libs/libcapi[abi_x86_32(-)] )
-	cups? ( net-print/cups[abi_x86_32(-)] )
-	gsm? ( media-sound/gsm[abi_x86_32(-)] )
-	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
-	lcms? ( media-libs/lcms:2 )
-	ldap? ( net-nds/openldap[abi_x86_32(-)] )
-	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
-	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
-	nls? ( sys-devel/gettext[abi_x86_32(-)] )
-	openal? ( media-libs/openal[abi_x86_32(-)] )
-	opencl? ( virtual/opencl[abi_x86_32(-)] )
-	opengl? (
-		virtual/glu[abi_x86_32(-)]
-		virtual/opengl[abi_x86_32(-)]
-	)
-	png? ( media-libs/libpng:0[abi_x86_32(-)] )
-	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
-	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
-	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/freetype:2[abi_x86_32(-)]
-	media-libs/mesa[abi_x86_32(-)]
-	sys-auth/nss-mdns[abi_x86_32(-)]
-	sys-apps/util-linux[abi_x86_32(-)]
-	sys-libs/ncurses-compat:5[abi_x86_32(-)]
-	sys-libs/zlib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXi[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libxcb[abi_x86_32(-)]
-"
-
-pkg_nofetch() {
-	einfo "Please visit ${HOMEPAGE}"
-	einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
-	# self unpacking zip archive; unzip warns about the exe stuff
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	default
-	python_fix_shebang .
-
-	sed -i \
-		-e "s:xdg_install_icons(:&\"${ED}\".:" \
-		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
-		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
-		"${S}/lib/perl/CXMenuXDG.pm"
-
-	# Remove unnecessary files
-	rm -r license.txt guis/ || die "Could not remove files"
-	use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
-	# Install crossover symlink, bug #476314
-	dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
-	# Install documentation
-	dodoc README changelog.txt
-	rm README changelog.txt || die "Could not remove README and changelog.txt"
-
-	# Install files
-	dodir /opt/cxoffice
-	#cp -r ./* "${ED}/opt/cxoffice" \
-	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
-		|| die "Could not install into ${ED}/opt/cxoffice"
-
-	# Install configuration file
-	insinto /opt/cxoffice/etc
-	doins share/crossover/data/cxoffice.conf
-
-	# Konqueror in its infinite wisdom decides to try opening things for
-	# writing, which are sandbox violations. This breaks the install process if
-	# it is installed, so we ninja edit it to false so it so doesn't run.
-	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
-		|| die "Could not apply workaround for konqueror"
-
-	# Install menus
-	# XXX: locate_gui.sh automatically detects *-application-merged directories
-	# This means what we install will vary depending on the contents of
-	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
-	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
-		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
-		|| die "Could not install menus"
-
-	# Revert ninja edit
-	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
-		|| die "Could not apply workaround for konqueror"
-
-	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
-		|| die "Could not remove uninstall menus"
-	sed -i \
-		-e "s:\"${ED}\".::" \
-		-e "s:${ED}::" \
-		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
-		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
-	sed -i -e "s:${ED}:/:" \
-		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
-		|| die "Could not fix paths of *.desktop files"
-}
-
-pkg_postinst() {
-	einfo "${P} is open source software with the exception of the GUI."
-	einfo "Source code can be obtained from:"
-	einfo
-	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index deb1aec81cdf..8948aeff3056 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,7 +1,9 @@
 AUX faudio.pc 245 BLAKE2B 8231bb42f6d90dd814eabd12d4d582d74ea0f154d6913fa710814d1bd75168d667463fd430d827ac7854aaa76bc07d16e5ccb3f6455e990ae0e2bc21bc633291 SHA512 bbdce2d90fcf848b8ef6a7a47a5bdf535d261aa833d6821de21907be05cca8693fede48c0e4161ae8087522297a2ec5af8c5ff5ed42efb814bbbc195ff963059
 DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
 DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966
-EBUILD faudio-19.06.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
-EBUILD faudio-19.09.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
-EBUILD faudio-9999.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
-MISC metadata.xml 1341 BLAKE2B a5fe79fca0c7f184466254e5f251c6248c20415795933b8797a4bd899535735ed93b54754937ed1003103cbbe3d5d6c5ffc5848c255cfd759cb06fb973065003 SHA512 8ad14c2ae094ff4ffd013458db62263b97cc5e616885cb229ef57ff8a4ab0dd943c2ab3840d086a81a4a10962c0d7411741ac6a8daaefb5167fe988a1dd8122a
+DIST FAudio-20.02.tar.gz 908051 BLAKE2B 7f9323e7528949680b39469b3549adbef9acafe6f293c643676117648fd6871639fa8c7a47fdc0e1232c0533c0af9e89953415a0935fa4ad7b831aa8a8243f30 SHA512 69995fa1fb9ea41182e47f8143252db517adf4e9dc4a0556c9032af5c867259cc7edc81196b10ef043e6118a2e3687b34368f3ac8ffe9294398c5143b9928476
+EBUILD faudio-19.06.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
+EBUILD faudio-19.09.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
+EBUILD faudio-20.02.ebuild 2508 BLAKE2B 5eeaec2d55bdfb58f1e272b8d25561e55127c757e800c41eb39c1be65a00735838d09a66123ca56789c5462fbda0d1779a75716820f4b69836ef79844877c4a7 SHA512 a3e2698446f1402c2d58391801aa3e28bf0b569fa587b7a70e6c6391e8e2d5d355587b01d52f6fbfe326d4445d11e1222b22e9cc26ac365824402ca9a5aebbf3
+EBUILD faudio-9999.ebuild 2404 BLAKE2B daa675da55fbd28eec56780e6a7ff7a535b35a43b2f08ed8507178d6b23c316f8c4c31741cf0b0b87b8f5b65dc8a665c67b2095208e3b96e095a93f9cde2393c SHA512 5aa4b4cfef73d4f5e1c3308dd8773d39338f28b121f46fc47fa0bea55261f6a8aabd723fe6fe1946beacdde6321b4d0de973684909ebc94fd30b0450eb1298d8
+MISC metadata.xml 1485 BLAKE2B 2be9f299ab02a56e964c19978b78e201ff03e06bc870f8b7703ab6f7ff2f4ec8ce567433ecf3deb6736b96d1bc411ab147fc84c68a28b4c3f2afcd159e813a8b SHA512 b9df5b457ef4139f8be77d92c2f6992452ed1d69dd654743742e1421f4893997a190be6746ac850aae54510ddea398834e3de937a198e3aea54731b10668f178
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-19.09.ebuild
+++ b/app-emulation/faudio/faudio-19.09.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
diff --git a/app-emulation/faudio/faudio-20.02.ebuild b/app-emulation/faudio/faudio-20.02.ebuild
new file mode 100644
index 000000000000..3b8290fd8804
--- /dev/null
+++ b/app-emulation/faudio/faudio-20.02.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# shellcheck disable=SC2034
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake-multilib virtualx
+
+FAUDIO_PN="FAudio"
+FAUDIO_PV="${PV}"
+FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"
+else
+	SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz"
+	KEYWORDS="-* ~amd64 ~x86"
+	S="${WORKDIR}/${FAUDIO_P}"
+fi
+
+DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms"
+HOMEPAGE="https://fna-xna.github.io/"
+LICENSE="ZLIB"
+SLOT="0"
+
+IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices ffmpeg xnasong test utils"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+COMMON_DEPEND="
+	>=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}]
+	ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DCMAKE_INSTALL_BINDIR=bin"
+		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
+		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
+		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_UTILS=$(usex utils ON OFF)"
+		"-DDUMP_VOICES=$(usex dumpvoices ON OFF)"
+		"-DFFMPEG=$(usex ffmpeg ON OFF)"
+		"-DXNASONG=$(usex xnasong ON OFF)"
+	)
+	if use ffmpeg; then
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)"  )
+	fi
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	cmake-multilib_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_make
+	emake -C "${BUILD_DIR}" all
+}
+
+multilib_src_install() {
+	# FIXME: do we want to install the FAudio tools?
+	cmake-utils_src_install
+
+	sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \
+		"${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \
+		|| die "sed failed"
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins "${T}/faudio.pc"
+
+	if use test; then
+		mkdir -p "${T}/$(get_libdir)" || die
+		cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed"
+	fi
+}
+
+faudio_test() {
+	XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests"
+}
+
+pkg_postinst() {
+	use test || return
+
+	# FIXME: FAudio tests are broken and also don't appear to work
+	# in the Portage sandbox.
+	multilib_foreach_abi faudio_test
+}
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index b776945034dd..bc47b4154131 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -44,7 +44,6 @@ multilib_src_configure() {
 		"-DCMAKE_INSTALL_BINDIR=bin"
 		"-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}"
 		"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX%/}/usr"
 		"-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)"
 		"-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)"
 		"-DBUILD_TESTS=$(usex test ON OFF)"
@@ -53,7 +52,7 @@ multilib_src_configure() {
 		"-DXNASONG=$(usex xnasong ON OFF)"
 	)
 	if use ffmpeg; then
-		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX%/}/usr/$(get_libdir)"  )
+		mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)"  )
 	fi
 	cmake-utils_src_configure
 }
diff --git a/app-emulation/faudio/metadata.xml b/app-emulation/faudio/metadata.xml
index 5b153131eaad..02b4abecea6c 100644
--- a/app-emulation/faudio/metadata.xml
+++ b/app-emulation/faudio/metadata.xml
@@ -16,6 +16,7 @@ for the FNA project, including XAudio2, X3DAudio, XAPO, and XACT3.
 Project Website: http://fna-xna.github.io/
 	</longdescription>
 	<use>
+		<flag name="dumpvoices">FAudio dumps buffer data to individual files with RIFF/XWMA headers, usable with players like ffplay/testxwma.</flag>
 		<flag name="ffmpeg">FAudio has optional support for decoding xWMA resources using FFmpeg, requiring:
 			<pkg>media-video/ffmpeg</pkg> (note: this feature is not supported by <pkg>media-video/libav</pkg>).</flag>
 		<flag name="xnasong">Build support for optional XNG_SONG component (note: this not required by
diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index 30dbdd04f4e1..f9760a0d3174 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,5 +1,5 @@
 AUX fs-uae-launcher-2.8.3-QApplication.patch 457 BLAKE2B 814c7d04240bb3e90f18e0b4d1a8041b985fe6f3241e098b0d26f2d8b096ba79c33e04f0c938a3af2a12b55d080f831fbc9da404e8d62751b16021e3f229a530 SHA512 e1892b9a7f440ea373e7a7c8313d56328395fa054918cf402b9a8b5e96c15f48a3bee901aef4297774a79b5eb1d4f909ff4843da16a0f1a6f8a6343afe104162
 AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
 DIST fs-uae-launcher-3.0.2.tar.gz 9633002 BLAKE2B 81e5a9cbdb4f094735fdbffa291c86bea74e3306ea1bc8365ba215daf970665ab45515c82dd180bfc965f5a2ff83c29a9cd8b21b343e6e6c7ebb4d95dbafd8d0 SHA512 6e9d5588b4cee79b7d5468b7d5e3d6c82e54957fcb0b05d3e9d1da8710336f0af82821fea37ee4cf4e0dc12ead6096183fe488afe860ce11573fd828718ba3d3
-EBUILD fs-uae-launcher-3.0.2.ebuild 2092 BLAKE2B 3b13c4587659152279784229a3d4d9fe602901439e1711896b1d3e5b674f8134a0feae3dbe5f72f2f2eb89ddae04a4cd886a1624f777c7f66d282753175811b4 SHA512 8498556f86faf9f21e2854d680699d2b646fa53219ef03eeb081d2f9256189e1b876eaab979cc989cc41729f688accc717577f55205774d1321585919b6b0065
+EBUILD fs-uae-launcher-3.0.2-r1.ebuild 2149 BLAKE2B 0bd1c672d991dac0f221a3a72b1c2121310b7f02b3ab240cbac2dd2a41f7abe530189bb0ee37eafd262961ba3e2312f98c9d1e08954a2555620321ea83790513 SHA512 f85014e4bd3dbbe9e25ded2fc7013770a1fee22f4d4cc6e4b41297b673fb8a99753b63f9bb8d3caaeeddd107f0391cddcad3d5db64e881e5850af571a85bd337
 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2-r1.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..834209e132d5
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="PyQt5-based launcher for FS-UAE"
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/stable/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="lha"
+
+RDEPEND="
+	app-emulation/fs-uae
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,gui,network,opengl,widgets]
+		dev-python/pyopengl[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		lha? ( dev-python/python-lhafile[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+
+DEPEND="
+	sys-devel/gettext
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.0-ROMs.patch
+	"${FILESDIR}"/${PN}-2.8.3-QApplication.patch
+)
+
+src_prepare() {
+	default
+
+	# Unbundle OpenGL library. Keep oyoyo IRC library because upstream
+	# is long dead and it's not worth packaging separately.
+	rm -r OpenGL || die
+	sed -i -r "/OpenGL/d" setup.py || die
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	local dir=${EPREFIX}/usr/share/${PN}
+	distutils-r1_python_install --install-lib="${dir}" --install-scripts="${dir}"
+	dosym ../share/${PN}/${PN} /usr/bin/${PN}
+
+	emake install-data DESTDIR="${D}" prefix="${EPREFIX}"/usr
+	mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
+}
+
+pkg_postinst() {
+	elog "Some important information:"
+	elog
+	ewarn " - Do not use QtCurve, it will crash PyQt5!"
+	elog
+	elog " - By default, FS-UAE creates its directories under Documents/FS-UAE."
+	elog "   If your Documents directory is not configured according to the XDG"
+	elog "   user diretory spec, ~/FS-UAE will be used as a fallback."
+	elog
+	elog " - You can override this by putting the path to the desired base"
+	elog "   directory in a special config file. The config file will be read"
+	elog "   from ~/.config/fs-uae/base-dir by both FS-UAE and FS-UAE Launcher"
+	elog "   if it exists."
+	elog
+	elog "   Alternatively, you can start FS-UAE and/or FS-UAE Launcher with"
+	elog "   --base-dir=/path/to/desired/dir"
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild
deleted file mode 100644
index 627ca1b130d8..000000000000
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="PyQt5-based launcher for FS-UAE"
-HOMEPAGE="https://fs-uae.net/"
-SRC_URI="https://fs-uae.net/stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="lha"
-
-RDEPEND="
-	app-emulation/fs-uae
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,opengl,widgets]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	lha? ( dev-python/python-lhafile[${PYTHON_USEDEP}] )
-"
-
-DEPEND="
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0-ROMs.patch
-	"${FILESDIR}"/${PN}-2.8.3-QApplication.patch
-)
-
-src_prepare() {
-	default
-
-	# Unbundle OpenGL library. Keep oyoyo IRC library because upstream
-	# is long dead and it's not worth packaging separately.
-	rm -r OpenGL || die
-	sed -i -r "/OpenGL/d" setup.py || die
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	local dir=${EPREFIX}/usr/share/${PN}
-	distutils-r1_python_install --install-lib="${dir}" --install-scripts="${dir}"
-	dosym ../share/${PN}/${PN} /usr/bin/${PN}
-
-	emake install-data DESTDIR="${D}" prefix="${EPREFIX}"/usr
-	mv "${ED}"/usr/share/doc/{${PN},${PF}} || die
-}
-
-pkg_postinst() {
-	elog "Some important information:"
-	elog
-	ewarn " - Do not use QtCurve, it will crash PyQt5!"
-	elog
-	elog " - By default, FS-UAE creates its directories under Documents/FS-UAE."
-	elog "   If your Documents directory is not configured according to the XDG"
-	elog "   user diretory spec, ~/FS-UAE will be used as a fallback."
-	elog
-	elog " - You can override this by putting the path to the desired base"
-	elog "   directory in a special config file. The config file will be read"
-	elog "   from ~/.config/fs-uae/base-dir by both FS-UAE and FS-UAE Launcher"
-	elog "   if it exists."
-	elog
-	elog "   Alternatively, you can start FS-UAE and/or FS-UAE Launcher with"
-	elog "   --base-dir=/path/to/desired/dir"
-}
-
-pkg_postinst() { xdg_icon_cache_update; }
-pkg_postrm() { xdg_icon_cache_update; }
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 5800c89b9cfe..12495750e7c4 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -35,7 +35,7 @@ DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfd
 DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be
 DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e
 DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af
-EBUILD ganeti-2.15.2-r8.ebuild 12087 BLAKE2B cbb379c5f4c623d29abb52c8d1d6c886c2acc1737846f100e1832293bfd4043feaf7832baf3ff0e1de8d30e32f8b81de16146500f2b20c8ad9131d26a657f85e SHA512 cb6f2e13214938cb249d32545e81fe98c79db597523205950ba94da317863bd96981ff8acfec6afbf41f6bb80820221f9ff5a43ecabb9d7c66564179afb6738d
-EBUILD ganeti-2.16.0_rc1.ebuild 10488 BLAKE2B 73c9dd53f4b4c2450aabf3b89c54c90aadb81b325194b4adfee83b19c63f8a50eeddd61f492ec4e0a4ba88567b30b61f2cd6af51ff7ac5970581279ad51aa755 SHA512 24f0b88d8540f3c0b96e89540c60f80896a4891c29c0e6e2c786046f30a3b6220529b0c212fef89b3a7e9754e0db18ee08a8232696fb6159a3bb4c61cdff1f6b
-EBUILD ganeti-2.17.0_beta1.ebuild 10515 BLAKE2B d528f54fa7cd81c2831b6f20d3aa9a89b8f5398417fe930fbca0bd04e51bf1c57e40a04b65dc3e1d3f6deb8de83a5abbc87c6de0525bc8af8935548c30898e4a SHA512 ac17b3840f87b2e8261579a2075f705c1ceb0bf6ea39758e027d9d1725352ab5f81852db51532ffe9bb55b45c83db36a7f5589aead7adef965eb198d9d0a9490
+EBUILD ganeti-2.15.2-r9.ebuild 12222 BLAKE2B 05bf32512bc8261a86ef357a16493f38f25b463e2fc4751d07cd20e6d37fddef79adb0bebdd73665f78ac6878ee6ab43709e3aaacbfe3b41b034b945e276c843 SHA512 1b5174a41ecbd7f52026b5fab64ff5b338bab3691fea07b6f823575289f05f1a785f3f335bf904c2f1b522e1a493c647c7a6f236218dcb38479df5a7fefed00e
+EBUILD ganeti-2.16.0_rc1.ebuild 10623 BLAKE2B 141bc6d06afa93fc44de1c3f2fad3c538c983786193b2457852f5402dd887e70931f3260643b77309679c203cb45a4b9416b011d04e6508d5564ee4c88535d8c SHA512 da33566e49297207c19080a2486c3d076ed2e16618138e7661ed4523d476d55d0f49a74ced36a8e0650743d83843e65792e22c80648a579be4e182ff46324ae4
+EBUILD ganeti-2.17.0_beta1.ebuild 10650 BLAKE2B c87f05fbff7aa682244da70599678c0d807fe0ebe5947c9a752962cd6754bf721e9e4ccc8bfbbd3a33c9923a6a688927eb653431e34a9a629bf27d39cc353bfd SHA512 3fe4477b1c650670ceedbe0a8ce9df9c13f051541acc76eb692750a810e001932055eaa1e1367ec0f0fb9347b01d9353c8eb43ec1ef36671a6070e4e73f041e9
 MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
deleted file mode 100644
index 6e00659d3fde..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(ver_cut 1-2)"
-
-DEBIAN_PATCH=11
-SRC_URI="
-	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
-	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-"
-KEYWORDS="amd64 x86"
-PATCHES=(
-	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
-	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
-	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
-	"${WORKDIR}"/debian/patches/relax-deps
-	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
-	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
-	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-	"${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch
-	"${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
-	"${WORKDIR}"/debian/patches/0001-GHC-8-support.patch
-	"${WORKDIR}"/debian/patches/ghc8-fixes
-	"${WORKDIR}"/debian/patches/snap-server-1.0-compat
-	"${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch
-	"${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch
-	"${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch
-	"${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch
-	"${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch
-	"${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
-	"${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch
-	"${WORKDIR}"/debian/patches/fix-cpu-affinity.patch
-	"${WORKDIR}"/debian/patches/fix-fcntl-i386.patch
-	"${WORKDIR}"/debian/patches/fix-ovf-test-path.patch
-	"${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch
-	"${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch
-	#"${WORKDIR}"/debian/patches/THH-2.12.patch
-	"${WORKDIR}"/debian/patches/sphinx-1.7.patch
-	"${WORKDIR}"/debian/patches/ca-use-sha256-md.patch
-	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch
-	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch
-)
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="|| ( kvm xen lxc )
-	test? ( ipv6 )
-	kvm? ( || ( amd64 x86 ) )
-	${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
-	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
-	|| (
-		net-misc/iputils[arping]
-		net-analyzer/arping
-	)
-	net-analyzer/fping
-	net-misc/bridge-utils
-	net-misc/curl[ssl]
-	net-misc/openssh
-	net-misc/socat
-	sys-apps/iproute2
-	>=sys-fs/lvm2-2.02.181
-	>=sys-apps/baselayout-2.0
-	>=dev-lang/ghc-8.0:0=
-	<dev-lang/ghc-8.1:0=
-	dev-haskell/cabal:0=
-	dev-haskell/cabal-install:0=
-	!<app-emulation/ganeti-instance-image-0.6-r1
-	>=dev-haskell/mtl-2.1.1:0=
-	>=dev-haskell/old-time-1.1.0.0:0=
-	>=dev-haskell/random-1.0.1.1:0=
-	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
-	>=dev-haskell/transformers-0.3.0.0:0=
-
-	>=dev-haskell/attoparsec-0.10.1.1:0=
-	<dev-haskell/attoparsec-0.14:0
-	>=dev-haskell/base64-bytestring-1.0.0.1:0=
-	<dev-haskell/base64-bytestring-1.1:0=
-	>=dev-haskell/crypto-4.2.4:0=
-	<dev-haskell/crypto-4.3:0=
-	>=dev-haskell/curl-1.3.7:0=
-	<dev-haskell/curl-1.4:0=
-	>=dev-haskell/hinotify-0.3.2:0=
-	<dev-haskell/hinotify-0.4:0=
-	>=dev-haskell/hslogger-1.1.4:0=
-	<dev-haskell/hslogger-1.3:0=
-	>=dev-haskell/json-0.5:0=
-	>=dev-haskell/lens-3.10:0=
-	>=dev-haskell/lifted-base-0.2.0.3:0=
-	<dev-haskell/lifted-base-0.3:0=
-	>=dev-haskell/monad-control-1.0.1.0:0=
-	<dev-haskell/monad-control-1.0.2:0=
-	>=dev-haskell/network-2.3.0.13:0=
-	<dev-haskell/network-2.7:0=
-	>=dev-haskell/parallel-3.2.0.2:3=
-	<dev-haskell/parallel-3.3:3=
-	>=dev-haskell/temporary-1.1.2.3:0=
-	<dev-haskell/temporary-1.3:0=
-	>=dev-haskell/regex-pcre-0.94.2:0=
-	<dev-haskell/regex-pcre-0.95:0=
-	>=dev-haskell/transformers-base-0.4:0=
-	<dev-haskell/transformers-base-0.5:0=
-	>=dev-haskell/utf8-string-0.3.7:0=
-	>=dev-haskell/zlib-0.5.3.3:0=
-	<dev-haskell/zlib-0.7:0=
-
-	>=dev-haskell/psqueue-1.1:0=
-	<dev-haskell/psqueue-1.2:0=
-	>=dev-haskell/snap-core-1.0.1:0=
-	<dev-haskell/snap-core-1.1:0=
-	>=dev-haskell/snap-server-1.0.1:0=
-	<dev-haskell/snap-server-1.1:0=
-	>=dev-haskell/case-insensitive-0.4.0.1
-
-	dev-haskell/vector:0=
-	xen? ( >=app-emulation/xen-3.0 )
-	kvm? (
-		dev-python/psutil
-		app-emulation/qemu
-	)
-	lxc? ( app-emulation/lxc )
-	drbd? ( sys-cluster/drbd-utils )
-	rbd? ( sys-cluster/ceph )
-	ipv6? ( net-misc/ndisc6 )
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	!app-emulation/ganeti-htools"
-DEPEND+="
-	sys-devel/m4
-	app-text/pandoc
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	media-fonts/urw-fonts
-	media-gfx/graphviz
-	>=dev-haskell/test-framework-0.6:0=
-	<dev-haskell/test-framework-0.9:0=
-	>=dev-haskell/test-framework-hunit-0.2.7:0=
-	<dev-haskell/test-framework-hunit-0.4:0=
-	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
-	<dev-haskell/test-framework-quickcheck2-0.4:0=
-	test? (
-		dev-python/mock
-		dev-python/pyyaml
-		dev-haskell/haddock:0=
-		>=dev-haskell/hunit-1.2.4.2:0=
-		<dev-haskell/hunit-1.3:0=
-		>=dev-haskell/quickcheck-2.4.2:2=
-		<dev-haskell/quickcheck-2.8.3:2=
-		sys-apps/fakeroot
-		>=net-misc/socat-1.7
-		dev-util/shelltestrunner
-	)"
-
-PATCHES+=(
-	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
-	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
-	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
-	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
-	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
-	"${FILESDIR}/${PN}-2.10-rundir.patch"
-	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
-	"${FILESDIR}/${PN}-2.11-tests.patch"
-	"${FILESDIR}/${PN}-lockdir.patch"
-	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
-	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
-	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
-	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
-	"${FILESDIR}/${PN}-2.15-python-mock.patch"
-	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
-	"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
-	"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
-	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-	"${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
-	"${FILESDIR}/ganeti-2.15.2-bdev_py.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
-	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
-	usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-# haskell...
-QA_FLAGS_IGNORED="
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-metad
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-wconfd
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-confd
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-luxid
-	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-kvmd
-	/usr/lib64/ganeti/2.15/usr/bin/htools
-"
-
-pkg_setup () {
-	local user
-	python-single-r1_pkg_setup
-
-	if use multiple-users; then
-		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
-			enewgroup ${user}
-			enewuser ${user} -1 -1 -1 ${user}
-		done
-	fi
-}
-
-src_prepare() {
-	local testfile
-	if has_version '>=dev-lang/ghc-7.10'; then
-		# Breaks the build on 7.8
-		PATCHES+=(
-			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
-		)
-	fi
-	if use experimental; then
-		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
-		PATCHES+=(
-			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
-			# backport available for 2.15, but refused upstream due to RPC breakage.
-			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
-		)
-	fi
-	eapply "${PATCHES[@]}"
-	# Upstream commits:
-	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
-	# 24618882737fd7c189adf99f4acc767d48f572c3
-	sed -i \
-		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
-		cabal/ganeti.template.cabal
-	# Neuter -Werror
-	sed -i \
-		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
-		Makefile.am
-
-	# not sure why these tests are failing
-	# should remove this on next version bump if possible
-	for testfile in test/py/import-export_unittest.bash; do
-		printf '#!/bin/bash\ntrue\n' > "${testfile}"
-	done
-
-	# take the sledgehammer approach to bug #526270
-	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
-	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \
-		> "${T}/ganeti.initd"
-
-	eapply_user
-
-	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
-	rm autotools/missing
-	eautoreconf
-}
-
-src_configure () {
-	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
-	local kvm_arch
-
-	if use amd64; then
-		kvm_arch=x86_64
-	elif use x86; then
-		kvm_arch=i386
-	elif use kvm; then
-		die "Could not determine qemu system to use for kvm"
-	fi
-
-	econf --localstatedir=/var \
-		--sharedstatedir=/var \
-		--disable-symlinks \
-		--with-ssh-initscript=/etc/init.d/sshd \
-		--with-export-dir=/var/lib/ganeti-storage/export \
-		--with-os-search-path=/usr/share/${PN}/os \
-		$(use_enable restricted-commands) \
-		$(use_enable test haskell-tests) \
-		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
-		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
-		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
-		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
-		$(use_enable syslog) \
-		$(use_enable monitoring) \
-		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
-		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
-		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
-		--enable-socat-escape \
-		--enable-socat-compress
-}
-
-src_install () {
-	emake V=1 DESTDIR="${D}" install
-
-	newinitd "${T}"/ganeti.initd ${PN}
-	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
-	if use kvm; then
-		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
-		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
-	fi
-
-	# ganeti installs it's own docs in a generic location
-	rm -rf "${D}"/{usr/share/doc/${PN},run}
-
-	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
-	newbashcomp doc/examples/bash_completion gnt-instance
-	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
-		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
-		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
-	use monitoring && bashcomp_alias gnt-instance mon-collector
-
-	dodoc INSTALL UPGRADE NEWS README doc/*.rst
-
-	docinto html
-	dodoc -r doc/html/* doc/css/*.css
-
-	docinto examples
-	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
-	docinto examples/hooks
-	dodoc doc/examples/hooks/{ipsec,ethers}
-
-	insinto /etc/cron.d
-	newins doc/examples/ganeti.cron ${PN}
-
-	insinto /etc/logrotate.d
-	newins doc/examples/ganeti.logrotate ${PN}
-
-	# need to dodir rather than keepdir here (bug #552482)
-	dodir /var/lib/${PN}
-
-	keepdir /var/log/${PN}/
-	keepdir /usr/share/${PN}/${SERIES}/os/
-	keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
-	dosym ${SERIES} "/usr/share/${PN}/default"
-	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
-	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
-	if use multiple-users; then
-		elog "You have enable multiple user support, the users for this must"
-		elog "be created. You can use the provided tool for this, which is"
-		elog "located at:"
-		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
-	fi
-}
-
-src_test () {
-	PATH="${S}/scripts:${S}/src:${PATH}" \
-		TMPDIR="/tmp" \
-		GANETI_MASTER="$(hostname -f)" \
-		emake check
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
new file mode 100644
index 000000000000..2f365cb6ab41
--- /dev/null
+++ b/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python2_7)
+PYTHON_REQ_USE="ipv6(+)?"
+
+inherit user autotools bash-completion-r1 python-single-r1
+
+MY_PV="${PV/_rc/~rc}"
+MY_PV="${MY_PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+SERIES="$(ver_cut 1-2)"
+
+DEBIAN_PATCH=11
+SRC_URI="
+	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
+	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
+"
+KEYWORDS="amd64 x86"
+PATCHES=(
+	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
+	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
+	"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
+	"${WORKDIR}"/debian/patches/relax-deps
+	"${WORKDIR}"/debian/patches/zlib-0.6-compatibility
+	"${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
+	"${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
+	"${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch
+	"${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
+	"${WORKDIR}"/debian/patches/0001-GHC-8-support.patch
+	"${WORKDIR}"/debian/patches/ghc8-fixes
+	"${WORKDIR}"/debian/patches/snap-server-1.0-compat
+	"${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch
+	"${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch
+	"${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch
+	"${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch
+	"${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch
+	"${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
+	"${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch
+	"${WORKDIR}"/debian/patches/fix-cpu-affinity.patch
+	"${WORKDIR}"/debian/patches/fix-fcntl-i386.patch
+	"${WORKDIR}"/debian/patches/fix-ovf-test-path.patch
+	"${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch
+	"${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch
+	#"${WORKDIR}"/debian/patches/THH-2.12.patch
+	"${WORKDIR}"/debian/patches/sphinx-1.7.patch
+	"${WORKDIR}"/debian/patches/ca-use-sha256-md.patch
+	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch
+	"${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch
+)
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://www.ganeti.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="|| ( kvm xen lxc )
+	test? ( ipv6 )
+	kvm? ( || ( amd64 x86 ) )
+	${PYTHON_REQUIRED_USE}"
+
+USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
+GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
+
+DEPEND="
+	dev-libs/openssl:0
+	$(python_gen_cond_dep '
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+	')
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
+	net-analyzer/fping
+	net-misc/bridge-utils
+	net-misc/curl[ssl]
+	net-misc/openssh
+	net-misc/socat
+	sys-apps/iproute2
+	>=sys-fs/lvm2-2.02.181
+	>=sys-apps/baselayout-2.0
+	>=dev-lang/ghc-8.0:0=
+	<dev-lang/ghc-8.1:0=
+	dev-haskell/cabal:0=
+	dev-haskell/cabal-install:0=
+	!<app-emulation/ganeti-instance-image-0.6-r1
+	>=dev-haskell/mtl-2.1.1:0=
+	>=dev-haskell/old-time-1.1.0.0:0=
+	>=dev-haskell/random-1.0.1.1:0=
+	haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
+	>=dev-haskell/transformers-0.3.0.0:0=
+
+	>=dev-haskell/attoparsec-0.10.1.1:0=
+	<dev-haskell/attoparsec-0.14:0
+	>=dev-haskell/base64-bytestring-1.0.0.1:0=
+	<dev-haskell/base64-bytestring-1.1:0=
+	>=dev-haskell/crypto-4.2.4:0=
+	<dev-haskell/crypto-4.3:0=
+	>=dev-haskell/curl-1.3.7:0=
+	<dev-haskell/curl-1.4:0=
+	>=dev-haskell/hinotify-0.3.2:0=
+	<dev-haskell/hinotify-0.4:0=
+	>=dev-haskell/hslogger-1.1.4:0=
+	<dev-haskell/hslogger-1.3:0=
+	>=dev-haskell/json-0.5:0=
+	>=dev-haskell/lens-3.10:0=
+	>=dev-haskell/lifted-base-0.2.0.3:0=
+	<dev-haskell/lifted-base-0.3:0=
+	>=dev-haskell/monad-control-1.0.1.0:0=
+	<dev-haskell/monad-control-1.0.2:0=
+	>=dev-haskell/network-2.3.0.13:0=
+	<dev-haskell/network-2.7:0=
+	>=dev-haskell/parallel-3.2.0.2:3=
+	<dev-haskell/parallel-3.3:3=
+	>=dev-haskell/temporary-1.1.2.3:0=
+	<dev-haskell/temporary-1.3:0=
+	>=dev-haskell/regex-pcre-0.94.2:0=
+	<dev-haskell/regex-pcre-0.95:0=
+	>=dev-haskell/transformers-base-0.4:0=
+	<dev-haskell/transformers-base-0.5:0=
+	>=dev-haskell/utf8-string-0.3.7:0=
+	>=dev-haskell/zlib-0.5.3.3:0=
+	<dev-haskell/zlib-0.7:0=
+
+	>=dev-haskell/psqueue-1.1:0=
+	<dev-haskell/psqueue-1.2:0=
+	>=dev-haskell/snap-core-1.0.1:0=
+	<dev-haskell/snap-core-1.1:0=
+	>=dev-haskell/snap-server-1.0.1:0=
+	<dev-haskell/snap-server-1.1:0=
+	>=dev-haskell/case-insensitive-0.4.0.1
+
+	dev-haskell/vector:0=
+	xen? ( >=app-emulation/xen-3.0 )
+	kvm? (
+		dev-python/psutil
+		app-emulation/qemu
+	)
+	lxc? ( app-emulation/lxc )
+	drbd? ( sys-cluster/drbd-utils )
+	rbd? ( sys-cluster/ceph )
+	ipv6? ( net-misc/ndisc6 )
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!app-emulation/ganeti-htools"
+DEPEND+="
+	sys-devel/m4
+	app-text/pandoc
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')
+	media-fonts/urw-fonts
+	media-gfx/graphviz
+	>=dev-haskell/test-framework-0.6:0=
+	<dev-haskell/test-framework-0.9:0=
+	>=dev-haskell/test-framework-hunit-0.2.7:0=
+	<dev-haskell/test-framework-hunit-0.4:0=
+	>=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
+	<dev-haskell/test-framework-quickcheck2-0.4:0=
+	test? (
+		dev-python/mock
+		dev-python/pyyaml
+		dev-haskell/haddock:0=
+		>=dev-haskell/hunit-1.2.4.2:0=
+		<dev-haskell/hunit-1.3:0=
+		>=dev-haskell/quickcheck-2.4.2:2=
+		<dev-haskell/quickcheck-2.8.3:2=
+		sys-apps/fakeroot
+		>=net-misc/socat-1.7
+		dev-util/shelltestrunner
+	)"
+
+PATCHES+=(
+	"${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
+	"${FILESDIR}/${PN}-2.11-add-pgrep.patch"
+	"${FILESDIR}/${PN}-2.15-daemon-util.patch"
+	"${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
+	"${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
+	"${FILESDIR}/${PN}-2.10-rundir.patch"
+	"${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
+	"${FILESDIR}/${PN}-2.11-tests.patch"
+	"${FILESDIR}/${PN}-lockdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
+	"${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
+	"${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
+	"${FILESDIR}/${PN}-2.13-process_unittest.patch"
+	"${FILESDIR}/${PN}-2.15-python-mock.patch"
+	"${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
+	"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
+	"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
+	"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+	"${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
+	"${FILESDIR}/ganeti-2.15.2-bdev_py.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+QA_WX_LOAD="
+	usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
+	usr/lib*/${PN}/${SERIES}/usr/bin/htools
+"
+# haskell...
+QA_FLAGS_IGNORED="
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-metad
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-wconfd
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-confd
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-luxid
+	/usr/lib64/ganeti/2.15/usr/sbin/ganeti-kvmd
+	/usr/lib64/ganeti/2.15/usr/bin/htools
+"
+
+pkg_setup () {
+	local user
+	python-single-r1_pkg_setup
+
+	if use multiple-users; then
+		for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
+			enewgroup ${user}
+			enewuser ${user} -1 -1 -1 ${user}
+		done
+	fi
+}
+
+src_prepare() {
+	local testfile
+	if has_version '>=dev-lang/ghc-7.10'; then
+		# Breaks the build on 7.8
+		PATCHES+=(
+			"${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
+		)
+	fi
+	if use experimental; then
+		ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
+		PATCHES+=(
+			# QEMU Agent accepted upstream for 2.16, not yet in a tagged release
+			# backport available for 2.15, but refused upstream due to RPC breakage.
+			"${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
+		)
+	fi
+	eapply "${PATCHES[@]}"
+	# Upstream commits:
+	# 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
+	# 24618882737fd7c189adf99f4acc767d48f572c3
+	sed -i \
+		-e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
+		cabal/ganeti.template.cabal
+	# Neuter -Werror
+	sed -i \
+		-e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
+		Makefile.am
+
+	# not sure why these tests are failing
+	# should remove this on next version bump if possible
+	for testfile in test/py/import-export_unittest.bash; do
+		printf '#!/bin/bash\ntrue\n' > "${testfile}"
+	done
+
+	# take the sledgehammer approach to bug #526270
+	grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
+
+	sed "s:%LIBDIR%:$(get_libdir):g" "${FILESDIR}/ganeti.initd-r4" \
+		> "${T}/ganeti.initd"
+
+	eapply_user
+
+	[[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
+	rm autotools/missing
+	eautoreconf
+}
+
+src_configure () {
+	# this is kind of a hack to work around the removal of the qemu-kvm wrapper
+	local kvm_arch
+
+	if use amd64; then
+		kvm_arch=x86_64
+	elif use x86; then
+		kvm_arch=i386
+	elif use kvm; then
+		die "Could not determine qemu system to use for kvm"
+	fi
+
+	econf --localstatedir=/var \
+		--sharedstatedir=/var \
+		--disable-symlinks \
+		--with-ssh-initscript=/etc/init.d/sshd \
+		--with-export-dir=/var/lib/ganeti-storage/export \
+		--with-os-search-path=/usr/share/${PN}/os \
+		$(use_enable restricted-commands) \
+		$(use_enable test haskell-tests) \
+		$(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
+		$(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
+		$(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
+		$(use_enable syslog) \
+		$(use_enable monitoring) \
+		$(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
+		$(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
+		--with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
+		--enable-socat-escape \
+		--enable-socat-compress
+}
+
+src_install () {
+	emake V=1 DESTDIR="${D}" install
+
+	newinitd "${T}"/ganeti.initd ${PN}
+	newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
+
+	if use kvm; then
+		newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+		newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+	fi
+
+	# ganeti installs it's own docs in a generic location
+	rm -rf "${D}"/{usr/share/doc/${PN},run}
+
+	sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
+	newbashcomp doc/examples/bash_completion gnt-instance
+	bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
+		h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
+		gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
+
+	use monitoring && bashcomp_alias gnt-instance mon-collector
+
+	dodoc INSTALL UPGRADE NEWS README doc/*.rst
+
+	docinto html
+	dodoc -r doc/html/* doc/css/*.css
+
+	docinto examples
+	dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
+
+	docinto examples/hooks
+	dodoc doc/examples/hooks/{ipsec,ethers}
+
+	insinto /etc/cron.d
+	newins doc/examples/ganeti.cron ${PN}
+
+	insinto /etc/logrotate.d
+	newins doc/examples/ganeti.logrotate ${PN}
+
+	# need to dodir rather than keepdir here (bug #552482)
+	dodir /var/lib/${PN}
+
+	keepdir /var/log/${PN}/
+	keepdir /usr/share/${PN}/${SERIES}/os/
+	keepdir /var/lib/ganeti-storage/{export,file,shared}/
+
+	dosym ${SERIES} "/usr/share/${PN}/default"
+	dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
+
+	python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
+}
+
+pkg_postinst() {
+	if use multiple-users; then
+		elog "You have enable multiple user support, the users for this must"
+		elog "be created. You can use the provided tool for this, which is"
+		elog "located at:"
+		elog "    /usr/$(get_libdir)/${PN}/tools/users-setup"
+	fi
+}
+
+src_test () {
+	PATH="${S}/scripts:${S}/src:${PATH}" \
+		TMPDIR="/tmp" \
+		GANETI_MASTER="$(hostname -f)" \
+		emake check
+}
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index bd24dd3fff74..94c05841d25e 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,16 +53,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
 
 DEPEND="
 	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
 		net-misc/iputils[arping]
 		net-analyzer/arping
@@ -140,7 +142,9 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	dev-python/sphinx[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+	')
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index d4baca0d24bf..061cb74ba0f5 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,16 +53,18 @@ GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
 
 DEPEND="
 	dev-libs/openssl:0
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/bitarray[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/fdsend[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/bitarray[${PYTHON_MULTI_USEDEP}]
+		dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/fdsend[${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
 		net-misc/iputils[arping]
 		net-analyzer/arping
@@ -140,7 +142,9 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	sys-devel/m4
 	app-text/pandoc
-	<=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<=dev-python/sphinx-1.3.5[${PYTHON_MULTI_USEDEP}]
+	')
 	media-fonts/urw-fonts
 	media-gfx/graphviz
 	>=dev-haskell/test-framework-0.6:0=
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 327514b39584..36e6c3afecb1 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -13,7 +13,7 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2
 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
 DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13.ebuild 4175 BLAKE2B 0d02204f325a84b857ad151055f17e9e5b9f707fdad67d0d427125a2d0eb570128ebcc4b5739a4fe8bfc7928ed530c91e960a689ba3f7ad6a7c3e9b8e22443dd SHA512 f138aa4a70f62ad732377d8f183ce0780112f836785d9b77729df18b3f3d612b5a8303507fd57de4c3ded0e0a922b0a12f82d38b9776d7bb60626663b3c0ac7b
-EBUILD libguestfs-1.36.15.ebuild 4379 BLAKE2B 68a4d5096a0a0fe2c4ad0b9f3c7ae933a0fa32841aae4182c1f04171c173963e40019d149dff166fbef50570dd1d3ceb2ce14926b7c52ee58e5a4b30379b49b4 SHA512 593b67970f6a129362a861bfa3cba8a29e8d62b6b2a7428baa8c746d2b348a701ddec8b816461734457e9544d19e0ce409225d862b35ce0a1613852649a909e5
-EBUILD libguestfs-1.38.6.ebuild 4114 BLAKE2B 41ee6c4578ec6ccbaa83e33617299415e0ecf305868c6e0a195ab80062ed6e8efcc751dedc9fff1d1504e5d2adc52f322d8f07a197af08ce6b6d1a13b4fc179e SHA512 3ff985a95f25e32cd6ccb0c8364731c118f7990d095a73ed49f049f990b6eeb642f3b8153702e6068f87a369ba06672fd85361070f1f09c0bc9b83035fa3add1
+EBUILD libguestfs-1.36.13.ebuild 4169 BLAKE2B 0beace01217cbe610f4018cbd88ae7b55da9d0e67217f22e52695be080a730bdf1bdbe6af913f04fd2958acdca54c60c6eef2669b40bfe0d74d93517bbde78dd SHA512 7743da4e565b47b8fbfc317c6189cd3c368315213c3529e32808851d005112b1cc9e585925e85dc7971febe0dd88e3a58bfa7681a528603c41119390d2fdab76
+EBUILD libguestfs-1.36.15.ebuild 4373 BLAKE2B e149a05f78899eb86d9200668820b4c7dce20e5d56327bc3986c7daaf9dc1e498dffa5c950a0517a6ec35f8f49690bc182d0c129ac37da289492d2973a964b7c SHA512 ae00236a7f20d04f1ac9a010f18b793277017ce8ea672c52fc9fb3007d0abed0a9e6ee5250ced86e1c782805afed6e94eb84555648ca50e03b19d5d8b981907b
+EBUILD libguestfs-1.38.6.ebuild 4108 BLAKE2B cf8ae8d305eed812a8d094404960c7cdd52612855a237d75a31464f6b282f2a5a46310fd481d1ded957fb055835d7338ed768ef8372ecd88afb88a5c83a16821 SHA512 6a52cc778558e71575e157e32da0495e6fb5b20fd22b3dd0bfb6c3515419bf26bc10a954afdd1fe700993ec6174cf5ee62e1294dbcf7bcc2532d151208651b85
 MISC metadata.xml 979 BLAKE2B f21c4edfd2b5664034d663e74a201903519fe9602f7709011b3e2518656a3e15e2284533be3795d58aa5a17dbc515c46aa0cfd661dda03b42fe3f39e645384f4 SHA512 c4621ee60b018e690cfeee7342245f8345baaff9bc6c628cd7cb4f2d5ffc2fa34b5ccda51ea35c8620c8b30ec9ebacd054c996fe5dfc53168493bc96e21b5ca6
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
index 467048a112cf..e15a24c93533 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils autotools linux-info perl-functions python-single-r1 versionator
 
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
index 7962ae1e6b23..904393423c05 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
 
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
index 530cdc1130dd..dd447616b780 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
 
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 441840288151..fb25482a02de 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -3,6 +3,8 @@ AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690ca
 DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
 DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
 DIST libpod-1.7.0.tar.gz 8679022 BLAKE2B 8a8037b75deae9f94461ab697b2a7cf095254c68d8436655c37a40375e3dd1a2b621672643e430acc8a656fcd516fa5a542e7104d6cfdbee3d213aca6228d410 SHA512 986ec7123127d3ffb26cecc39a2ae3d8a6dd3d147327449fc4e9d17f6e6606bde278f13920d0aef59410262801251e7b4cfe099cb5caafe9773533e8476848fe
+DIST libpod-1.8.0.tar.gz 8992983 BLAKE2B a3b12dbfbdb0fe01ef8791de2c938cbf21c01ac0b36314d2a170c593d22eea08d912f8547861b239bb982db6acc9d2426adb97ffda4603739321cff0fb9ff1d8 SHA512 8e46633742e7dda1b9f6b641051009485331a3a95fcc8ff4c59c46a66f86ce1b79c832c5775d825aa54b885edaf533be2f864257137277a5265509026d0a8b87
 EBUILD libpod-1.6.4.ebuild 4073 BLAKE2B f0b50d64b5df8ecd7079d744fc26fab7c236d30b50a2ee855db64171ef112d95aa86a9defd71bf4d0ab348b59301e7814543d40ba5bf80a6ea012121a332697c SHA512 c4c99e465743ca0f97351e691edf91c535a734b4e9ac499724904341352dbffb9f5f5772df61bab87ac47bc45e9ff5a72d79eebf4de34c3046a9d458a75a146f
 EBUILD libpod-1.7.0.ebuild 3740 BLAKE2B 3de42be1182622ed7b050bd15b442b791f2b4ad53472276d46b5cf730d0d179f35c13b621ea210c3395480e7a4353ff93a9749ed13b957e14cbfb7ae20bd456c SHA512 3799b940413f1c02df27133dd93289dd8d9776c84838292dafbd424ffc8fa25ace3f440fb06e579f1d0d11f33d868af643a15cbf96f61e9ff726794f24e28bdc
+EBUILD libpod-1.8.0.ebuild 3740 BLAKE2B a14d6f736f790cdcc3d2235e447c10f62a072c958d77381a487aa26486830bf5e7dff558ebceff9697c5add3bbc383dfe905baf1e4f0dddd209f9331cae438ca SHA512 fd2396a399f7290a157abe6f39aff044fb69da5d0790b94af7c19614f308bc8c5a6fb795242794f7a530e84e77ea0399f025407ebc516a0a92492607c7a43c1d
 MISC metadata.xml 879 BLAKE2B 71e5ad7ed29e426919198aafd97805d704938cf938db4c6ce72e6e490753ed1c7a61e63209e855fddea0598f7c869dc1dde42cd5152f94377763d7163455ca53 SHA512 6a1a84612a4aa99a10d6f9b64168c748e2d19ea26e938938e1581e5f09bfac3d972382dfe7ea78e446d326743e8adf872a2010742d256cb04093c6d3fef36a31
diff --git a/app-emulation/libpod/libpod-1.8.0.ebuild b/app-emulation/libpod/libpod-1.8.0.ebuild
new file mode 100644
index 000000000000..502e3dde382a
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.8.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="2ced9094d4728dd09f60a177faa32339a8d0f721"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs +rootless selinux"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-crypt/gpgme:=
+	>=app-emulation/conmon-2.0.0
+	|| ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	sys-fs/lvm2
+	sys-libs/libseccomp:=
+
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( sys-fs/btrfs-progs )
+	rootless? ( app-emulation/slirp4netns )
+	selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+
+	# Disable installation of python modules here, since those are
+	# installed by separate ebuilds.
+	sed -e '/^GIT_.*/d' \
+		-e 's:GO111MODULE=off:GO111MODULE=on:' \
+		-e 's/$(GO) build/$(GO) build -v -work -x/' \
+		-e 's/^\(install:.*\) install\.python$/\1/' \
+		-i Makefile || die
+
+	sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+		-i hack/get_release_info.sh || die
+}
+
+src_compile() {
+	# Filter unsupported linker flags
+	filter-flags '-Wl,*'
+
+	[[ -f hack/apparmor_tag.sh ]] || die
+	if use apparmor; then
+		echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+	fi
+
+	[[ -f hack/btrfs_installed_tag.sh ]] || die
+	if use btrfs; then
+		echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+	else
+		echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+			hack/btrfs_installed_tag.sh || die
+	fi
+
+	[[ -f hack/selinux_tag.sh ]] || die
+	if use selinux; then
+		echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+	else
+		echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+	fi
+
+	export -n GOCACHE GOPATH XDG_CACHE_HOME
+	GOBIN="${S}/bin" \
+		emake all \
+			GIT_BRANCH=master \
+			GIT_BRANCH_CLEAN=master \
+			COMMIT_NO="${EGIT_COMMIT}" \
+			GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	insinto /etc/containers
+	newins test/registries.conf registries.conf.example
+	newins test/policy.json policy.json.example
+
+	insinto /usr/share/containers
+	doins seccomp.json
+
+	newinitd "${FILESDIR}"/podman.initd podman
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/podman.logrotated" podman
+
+	dobashcomp completions/bash/*
+
+	keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+	LIBPOD_ROOTLESS_UPGRADE=false
+	if use rootless; then
+		has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+	fi
+}
+
+pkg_postinst() {
+	local want_newline=false
+	if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+		elog "You need to create the following config files:"
+		elog "/etc/containers/registries.conf"
+		elog "/etc/containers/policy.json"
+		elog "To copy over default examples, use:"
+		elog "cp /etc/containers/registries.conf{.example,}"
+		elog "cp /etc/containers/policy.json{.example,}"
+		want_newline=true
+	fi
+	if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+		${want_newline} && elog ""
+		elog "For rootless operation, you need to configure subuid/subgid"
+		elog "for user running podman. In case subuid/subgid has only been"
+		elog "configured for root, run:"
+		elog "usermod --add-subuids 1065536-1131071 <user>"
+		elog "usermod --add-subgids 1065536-1131071 <user>"
+		want_newline=true
+	fi
+}
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 332f5ac47325..d79a3f24929a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -6,6 +6,7 @@ AUX libvirt-5.2.0-md-clear.patch 1268 BLAKE2B f2609a957025a59a1c5daf0faf408fdcc3
 AUX libvirt-5.6.0-do-not-use-sysconf.patch 6243 BLAKE2B 9cd8e5654f980369310e381cf6867776afadf4a8e4466b18f89b9698923c558de88ca05dfc007d52b621a35ef81fc0ffdf673a48246bd7d062d9f90fdd1e0ebd SHA512 7347e8aaacdcb01d9982b2d9e6579e89597ebbb497bd0f78d1169fd688e045789432151c1e60eb1ff9ed7eb85304c229d8193cf77e6cab525ca093814ad15493
 AUX libvirt-5.7.0-do-not-use-sysconf.patch 6015 BLAKE2B 6b8d7a4ee9c28d777ad3aa39b030ecd12af3585dc14676ff97bc2a6960408a173af02b8832ce3ebc347a43d030af712089afa17cd3907dec7a619358ca82aa6b SHA512 a3776b94a9a8ffdeac5f5cce98da15fb265baddf4c394ebb3a52c4fa1f7e893962755b3bf7343eb001f1d2ea9c630ddf968fee917b2d0b92d93270c080431af5
 AUX libvirt-6.0.0-do-not-use-sysconf.patch 5166 BLAKE2B d458e7b70320b7fb5d52f7a745b8dd4bc3e1906c57141935575ab586c5c8434634c3444ab5042d1796ef6ac6631553939ae110ed83b3f7b426724f8c2acfc23e SHA512 0d920a0b633dcf60fc41b7cff8c9903c40cdb157c5145da72a3d3090b6b174a344d4067b2436320726d5cfc5cf939ee0a2339196763069332db2733deab04577
+AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
 AUX libvirt-guests.init-r3 5530 BLAKE2B 5de3e8577ded1401f6dca551c6098418e596287d43b1b90e133859bb9b74dff20b8518bc09853ccff7141e6baa52fc12c9b8d3e8f60b868b72b1993254fac5d9 SHA512 7aa4eac8c293c3063d9435a4ad1ea855f9fdd84eb0ed8cbf0779935f152aab380e2ee7eb9129b2f07147bfa4dd1eae4b836ccae295c35b63dbc767208dd11b0c
 AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0
@@ -22,11 +23,11 @@ DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b1787253
 DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
 DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
 DIST libvirt-6.0.0.tar.xz 8686092 BLAKE2B 669054aa3bb3e4f2cf0be2e9ea796b820786661f65495597322e178d7c7e42355b0e3752c8a847cb2fc4405928a30a00544829647aa84cc2e71bc0cb8ce9af5f SHA512 64259c0cffa9fc01192c5474f69d88a61ed0bae0a100379fed6112723a37eff1865ccfc85a19d6b8cd39ed504f04998bb3f6390aaafff797bb41ef65b6ec413c
-EBUILD libvirt-5.10.0.ebuild 9494 BLAKE2B 61964b9784a9586ab22b4dc62dae067d1e5fde8b60ab30abb0a22df73bad7a902fb53c90eb61bd955fe0e20813e42a670ba13318f21e45caa8f77542acc5287a SHA512 b49136c96ddc024fb3e9a92cb74c7091449586035d1a37f181efd8379a011950cf0696ba528f89ec6dca65ba2b51a26d19e2f530988b5cc7deea70a00405f6a1
+EBUILD libvirt-5.10.0.ebuild 9496 BLAKE2B 96dbdd33a23d862b6f500684606226e4178fc83322d64cff145600397dc44cbacf70716dd78d85b160b6cd1d5259f8b8973e20eae942277b87d525ad71059ac8 SHA512 c39c3704812f1f9ecca30a078fadb6140ea6b4fc8554b299770df2f0b9768a3d33cbe2499a79a5ac2fe2529e023e854be03ac1951200574e7cff895c2da10182
 EBUILD libvirt-5.2.0-r2.ebuild 9682 BLAKE2B d68df5a0be03ddd508743fa28effcf52bcbd94bbda19600c00d48c1a6f65da45f159b8bb34f7d22b03d9a5c3a22f612b719abc50694e0cace00508dace70ffc9 SHA512 f39f90fdb888c427f742da2eaede0236809e7d5c885882b3dc40bfb5995759269d0c09e4ddfa50582c17e4fcb598aee74936711392b98484beafb78a0e34d92e
 EBUILD libvirt-5.5.0-r1.ebuild 9415 BLAKE2B ed2ad664a6d310f65f4b7d291e6eed20a340371164c97a2620d42b52b180336f2d7bd88e43444fd53cfb18f1a0b682f4b4243a003e752be83306c4c8d806a800 SHA512 4d3d90cf63042e79abe913b49dedaac56d8e66af3b310a2c409053a6c213e1637352ab41e1a01fac9ad8cf8557cc1c9f732d7aa0789a111da920680799e153ed
 EBUILD libvirt-5.6.0.ebuild 9408 BLAKE2B 5f2b2d8e838f389493dfa5a41f5d1ac897e35ec3b62012b491be844d6ec58dbfdddd25d252610bfb3ea37da3b88b6b66775540107dcd80358976b12f31b034ea SHA512 146f7932a4457960adf39339541e95f221903039a9b53b991a00d6136a07a4da52071df44f37c9d24a88df1bf474232160fd7073a7db22093846e6f0f72e2737
 EBUILD libvirt-5.8.0.ebuild 9563 BLAKE2B 6beeebfbd545d86df7ab7a9a545e4538b3e5b992fff426a542b5eb26935502e3472a7f0674785b00b481197c21c044094b251657086bba6bc6ddf6a606fdfcf1 SHA512 b52e1a56e158f8adf330637d6ab9df52a361e5e9f506fc9c920722242d820b6fd28a9c657b7eead1ccb1fdae96cb419f683232d2b3b1b64d4ec607e9e5a8be3a
-EBUILD libvirt-6.0.0.ebuild 9487 BLAKE2B a2f53b85757cd1223096333f77b3941d0d761053a21a8bbd2deda6b647da0ba75fe2378e16cd61f46d640bd63ad80bf8f65358f9ed9d59f22aa0372e2f58b906 SHA512 22137147b84371d21cd1f18c943467906ea50bae7f2b4acd97be407befb852f0852e1474bef853466f9e3c49d08f4b1b90a5921e93b062879666efafabf1ef87
-EBUILD libvirt-9999.ebuild 9487 BLAKE2B 60bb733b4e36351fadacaa4cf6d42998d575f238d2cf31a2dc319fd0b202679f3664e91b5334b98ef79d340e888806f75868a87d95179a6d25b7e0906b1f8b26 SHA512 bebfc9c1ea0bdfbc6ad38fad71fb965306389ea2f5bf2355e9085100a1cd9269394aa2c653efb6ba80e1dbbef78160f1bf7fcaa7eca12a6e83184a70b493670e
+EBUILD libvirt-6.0.0-r1.ebuild 8893 BLAKE2B ff084289960360eab21e70fd6e296d3342b96ec0c1984c704e8123be4b5e1ab793f012111c0903969326c95d9fac8260ecbaaea1ba13fa3cabeff18438102f15 SHA512 894ef2a41add1c44037b3f3fbfa2aacf147bbb3f47bf0382a876f27c173b2d81aa2076deefc3eaf53260ee15365cb0e5e6903cb6e5fdf2f719c1865770b68ce9
+EBUILD libvirt-9999.ebuild 8812 BLAKE2B 7b574cba50afc386431be7d1feeaf55afcefc17ff3a335aac7dff34a36a404555eda567bf2469b17e8add7c9aeb14b3bdb8d2d622158264a1ec70a04842a3ea2 SHA512 420d5e8b7192a125ca5dd39b00dfdaa126d31378d01e5a3c62b146100eec5deef78d30dadc2a4a1501021eef164e73e5e13c1e9a9bccb13a1da8d9709f1ace06
 MISC metadata.xml 3791 BLAKE2B 1371e5d5c24af397dbfc9df32bd9b11cd32e49a72e3aba48e586660570bfe98f0b8f9d71d2c8e624b0e4ac470c275fbf87a2e49635b85560009aaedb25780933 SHA512 2ed3df24aecc0c419b6d6c512025b80c5efb9743843664ebd54fae15113f6625333b00c9e9b1e0aab7a5f1918ae194b71e8d59be6fa3e26964a0c677b1fcafd2
diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
new file mode 100644
index 000000000000..bf7a328f7759
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch
@@ -0,0 +1,35 @@
+From e97700d867ffa949c97f8a635a76b9ce510e806f Mon Sep 17 00:00:00 2001
+Message-Id: <e97700d867ffa949c97f8a635a76b9ce510e806f.1580460243.git.mprivozn@redhat.com>
+In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com>
+References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com>
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 31 Jan 2020 09:42:14 +0100
+Subject: [PATCH 2/3] Fix paths in libvirt-guests.sh.in
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tools/libvirt-guests.sh.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index a881f6266e..79d38b3e9a 100644
+--- a/tools/libvirt-guests.sh.in
++++ b/tools/libvirt-guests.sh.in
+@@ -39,11 +39,11 @@ START_DELAY=0
+ BYPASS_CACHE=0
+ SYNC_TIME=0
+ 
+-test -f "$sysconfdir"/sysconfig/libvirt-guests &&
+-    . "$sysconfdir"/sysconfig/libvirt-guests
++test -f "$sysconfdir"/libvirt/libvirt-guests.conf &&
++    . "$sysconfdir"/libvirt/libvirt-guests.conf
+ 
+ LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests
+-VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests
++VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests
+ 
+ RETVAL=0
+ 
+-- 
+2.24.1
+
diff --git a/app-emulation/libvirt/libvirt-5.10.0.ebuild b/app-emulation/libvirt/libvirt-5.10.0.ebuild
index 48231c0552d2..6caad4d83cdc 100644
--- a/app-emulation/libvirt/libvirt-5.10.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.10.0.ebuild
@@ -309,7 +309,7 @@ my_src_configure() {
 	if [[ ${PV} = *9999* ]]; then
 		# Restore gnulib's config.sub and config.guess
 		# bug #377279
-		(cd ${S}/.gnulib && git reset --hard > /dev/null)
+		(cd "${S}"/.gnulib && git reset --hard > /dev/null)
 	fi
 }
 
diff --git a/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..477f8f977c06
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
+	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
+	parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
+	virtualbox virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	qemu? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
+	app-misc/scrub
+	>=dev-libs/glib-2.48.0
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=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 )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
+	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-1.5.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-4.6.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	dev-python/docutils
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+my_src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with dtrace)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen libxl)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--enable-dependency-tracking
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+my_src_test() {
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check
+}
+
+my_src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	newbashcomp "${S}/tools/bash-completion/vsh" virsh
+	bashcomp_alias virsh virt-admin
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-6.0.0.ebuild b/app-emulation/libvirt/libvirt-6.0.0.ebuild
deleted file mode 100644
index 49389592822d..000000000000
--- a/app-emulation/libvirt/libvirt-6.0.0.ebuild
+++ /dev/null
@@ -1,379 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
-	SRC_URI=""
-	KEYWORDS=""
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
-	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
-	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-	parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
-	virtualbox virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	policykit? ( dbus )
-	qemu? ( libvirtd )
-	vepa? ( macvtap )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	policykit? ( acct-group/libvirt )
-	app-misc/scrub
-	>=dev-libs/glib-2.48.0
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=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 )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( >=sys-fs/fuse-2.8.6:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
-	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-1.5.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-4.6.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/udev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use macvtap && CONFIG_CHECK+="
-		~MACVTAP"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	if kernel_is ge 3 6; then
-		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
-		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
-	fi
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-
-	default
-
-	if [[ ${PV} = *9999* ]]; then
-		# Reinitialize submodules as this is required for gnulib's bootstrap
-		git submodule init
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-		    git submodule status .gnulib | awk '{ print $1 }'
-		    git hash-object bootstrap.conf
-		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-		) >.git-module-status
-	fi
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-
-	eautoreconf
-}
-
-my_src_configure() {
-	local myeconfargs=(
-		$(use_with apparmor)
-		$(use_with apparmor apparmor-profiles)
-		$(use_with audit)
-		$(use_with caps capng)
-		$(use_with dbus)
-		$(use_with dtrace)
-		$(use_with firewalld)
-		$(use_with fuse)
-		$(use_with glusterfs)
-		$(use_with glusterfs storage-gluster)
-		$(use_with iscsi storage-iscsi)
-		$(use_with iscsi-direct storage-iscsi-direct)
-		$(use_with libvirtd)
-		$(use_with libssh)
-		$(use_with lvm storage-lvm)
-		$(use_with lvm storage-mpath)
-		$(use_with lxc)
-		$(use_with macvtap)
-		$(use_enable nls)
-		$(use_with numa numactl)
-		$(use_with numa numad)
-		$(use_with openvz)
-		$(use_with parted storage-disk)
-		$(use_with pcap libpcap)
-		$(use_with phyp)
-		$(use_with policykit polkit)
-		$(use_with qemu)
-		$(use_with qemu yajl)
-		$(use_with rbd storage-rbd)
-		$(use_with sasl)
-		$(use_with selinux)
-		$(use_with udev)
-		$(use_with vepa virtualport)
-		$(use_with virt-network network)
-		$(use_with wireshark-plugins wireshark-dissector)
-		$(use_with xen libxl)
-		$(use_with zfs storage-zfs)
-
-		--without-hal
-		--without-netcf
-		--without-sanlock
-
-		--with-esx
-		--with-init-script=systemd
-		--with-qemu-group=$(usex caps qemu root)
-		--with-qemu-user=$(usex caps qemu root)
-		--with-remote
-		--with-storage-fs
-		--with-vmware
-
-		--disable-static
-		--disable-werror
-
-		--localstatedir=/var
-		--enable-dependency-tracking
-	)
-
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
-	else
-		myeconfargs+=( $(use_with virtualbox vbox) )
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd ${S}/.gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-my_src_test() {
-	# remove problematic tests, bug #591416, bug #591418
-	sed -i -e 's#commandtest$(EXEEXT) # #' \
-		-e 's#virfirewalltest$(EXEEXT) # #' \
-		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
-		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
-		tests/Makefile
-
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" \
-		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	# Remove bogus, empty directories. They are either not used, or
-	# libvirtd is able to create them on demand
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-
-	newbashcomp "${S}/tools/bash-completion/vsh" virsh
-	bashcomp_alias virsh virt-admin
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	systemd_install_serviced \
-		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
-	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 817ad9999f62..c2205b44c10b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -25,7 +25,7 @@ LICENSE="LGPL-2.1"
 IUSE="
 	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
 	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
-	parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
+	parted pcap policykit +qemu rbd sasl selinux +udev +vepa
 	virtualbox virt-network wireshark-plugins xen zfs
 "
 
@@ -121,12 +121,12 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-libs/libxslt
 	dev-perl/XML-XPath
+	dev-python/docutils
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.0-do-not-use-sysconf.patch
-	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 )
 
 pkg_setup() {
@@ -217,20 +217,6 @@ src_prepare() {
 
 	default
 
-	if [[ ${PV} = *9999* ]]; then
-		# Reinitialize submodules as this is required for gnulib's bootstrap
-		git submodule init
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-		    git submodule status .gnulib | awk '{ print $1 }'
-		    git hash-object bootstrap.conf
-		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
-		) >.git-module-status
-	fi
-
 	# Tweak the init script:
 	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
 	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
@@ -265,7 +251,6 @@ my_src_configure() {
 		$(use_with openvz)
 		$(use_with parted storage-disk)
 		$(use_with pcap libpcap)
-		$(use_with phyp)
 		$(use_with policykit polkit)
 		$(use_with qemu)
 		$(use_with qemu yajl)
@@ -295,6 +280,7 @@ my_src_configure() {
 		--disable-werror
 
 		--localstatedir=/var
+		--with-runstatedir=/run
 		--enable-dependency-tracking
 	)
 
@@ -305,12 +291,6 @@ my_src_configure() {
 	fi
 
 	econf "${myeconfargs[@]}"
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd ${S}/.gnulib && git reset --hard > /dev/null)
-	fi
 }
 
 my_src_test() {
@@ -335,6 +315,7 @@ my_src_install() {
 	# libvirtd is able to create them on demand
 	rm -rf "${D}"/etc/sysconfig
 	rm -rf "${D}"/var
+	rm -rf "${D}"/run
 
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest
index 6fd94528a160..8e9824388fca 100644
--- a/app-emulation/playonlinux/Manifest
+++ b/app-emulation/playonlinux/Manifest
@@ -5,6 +5,6 @@ AUX playonlinux-pkg.1 643 BLAKE2B 80c5381aad102d81eebaa81d3ed83ed0fb16aa29b7f4a2
 AUX playonlinux.1 886 BLAKE2B 903f21600540798a765ae209832c4f111380340f4c6305ca333b29e6508579e13b3df8c3d44bc56284cdce290b319d40294eaee7476630190c9b7fd24ece2e76 SHA512 44ba1a04a7e8dbf3d85d81bbcf92917b6fe7bd68478bbcfecfe0c30619b834cc6c973fc6dd7d637d7debc7ede2a206248feaca1a017834ba95f076fd16679c2d
 DIST PlayOnLinux_4.2.12.tar.gz 3204230 BLAKE2B 80ef0e5763448da4a37263c64d408e8263771694666a7c704b5900dfe0e52cc18405c34d609d8c49a0d05a383fca2d035e956e3bbe9a9a0c92a4e43b319ed7ba SHA512 f4ededc8fe0117c66fd5672e136e19b9b48a41acdd3e1b1b3dd7fae2c354e77795f0a4f8286b09b7d1813363aee50fa0811c04c3194aaf745963a2e6115b3909
 DIST PlayOnLinux_4.3.4.tar.gz 3101890 BLAKE2B d724cbd90a0f1bbc94c6365fcf6511d39ea0e8e9de32f42716111324f69091874ab19d3fa88a6bd9f77ed6308bc03ca708406fdc24faa60bf662e6a4f5d15d86 SHA512 7f2089d37379adee01424777e9c3b7ec16dd56ba2f4b834b4f0447832c050b2df3218a7361e8e735d5cc359aec6a000fea88e11632c9434232e4f749bb21c173
-EBUILD playonlinux-4.2.12.ebuild 2803 BLAKE2B 9afb81dc55bf5055d974c474a35a20b810fd226144831f76e73f347ae6d2d9e953aab4e0678dfcc9a884bd9ecac3f33fd525666580eacf0d3110f50c20e02d01 SHA512 6f94a99949b5503a486edf1df40d8b85b6af5a6fd4fa90742a6c886ee943deb4bc72c3c166d92d94df5076c168574defc2cb8f9e2f5244e652695ea88a701d07
-EBUILD playonlinux-4.3.4.ebuild 2723 BLAKE2B 4ca0028850cc0ad5d219a8845276701daf7eb0897d60b32d03e504ca078bfd9238d8b4b0aa28e22ae7dd94b654913b5505a842859e1adbd5bd0c638b415505f2 SHA512 7c70363bf0fcd6a247e399814d0efa493799c91e31e2eeccb5e9a3965179928f770718fd9e21e58422c1f799ed1ed9454fa72990de69e9954160ae8bc835cf39
+EBUILD playonlinux-4.2.12.ebuild 2836 BLAKE2B 8149f52d8d711776adf59df9bcfc3f6b97c5c42d88113d99281cc0a02b0f4e8d2beb423ac354ca117958b4f4aa7faaf2a224e9c9e74ccafe636392ea6abeca3b SHA512 d324dd4a5517367d50320b098cf64355fcea026c6dc6e359f2d56c20c43677122c342f2994217506ab496e185b56990a327663f0c732ba4fb9fb38078fb95700
+EBUILD playonlinux-4.3.4-r1.ebuild 2759 BLAKE2B 11ad80f54bf368ff8b30319998b94f7840ec807c66c02642c0cc51ba6c6e0c4427ba56e1418c8b89ae1d4798b6ffa721e19fd22b78b840f3bbacda96fa0c5ca1 SHA512 d893b3f4dcedc86d71d0ecf3159641d4278043d75eb0148e2b77940f243114aadffb4c1d0615a86087f647a3519dd23142a0a41ca3fb9d67e44b9c7d4a1ddf18
 MISC metadata.xml 433 BLAKE2B 6ba322414d75d581231afedbb791ce71aff799da09be4e08aab6f4e7e2e88d19b6e8701e36599bd1760e7076558c733edfe19f603f7f9541d0197cf4f1d59e4a SHA512 1e1dbfa93723297b63288436eaa1ce87183de71847c0ce61767381f668f6ad0bf69119570f7c7e395866f15e176f7412378c09386f8ddb271f7b2ec39da2d295
diff --git a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
index d7c477f4bd80..fcb7847aa4e8 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -25,7 +25,9 @@ RDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-crypt/gnupg
 	virtual/wine
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+	')
 	net-misc/wget
 	x11-apps/mesa-progs
 	x11-terms/xterm
diff --git a/app-emulation/playonlinux/playonlinux-4.3.4-r1.ebuild b/app-emulation/playonlinux/playonlinux-4.3.4-r1.ebuild
new file mode 100644
index 000000000000..a1e610f9b4f0
--- /dev/null
+++ b/app-emulation/playonlinux/playonlinux-4.3.4-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop eutils python-single-r1 xdg
+
+MY_PN="PlayOnLinux"
+
+DESCRIPTION="Set of scripts to easily install and use Windows games and software"
+HOMEPAGE="https://playonlinux.com/"
+SRC_URI="https://www.playonlinux.com/script_files/${MY_PN}/${PV}/${MY_PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="winbind"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	app-arch/cabextract
+	app-arch/p7zip
+	app-arch/unzip
+	app-crypt/gnupg
+	app-misc/jq
+	$(python_gen_cond_dep '
+		dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+	')
+	media-gfx/icoutils
+	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+	net-misc/wget
+	virtual/imagemagick-tools
+	virtual/wine
+	winbind? ( net-fs/samba[winbind] )
+	x11-apps/mesa-progs
+	x11-terms/xterm
+"
+
+S="${WORKDIR}/${PN}"
+
+# TODO:
+# Having a real install script
+# It will let using LANGUAGES easily
+# How to deal with Microsoft Fonts installation asked every time ?
+# How to deal with wine version installed ? (have a better mgmt of system one)
+# Look at debian pkg: https://packages.debian.org/sid/playonlinux
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.4-pol-bash.patch"
+	"${FILESDIR}/${PN}-4.2.4-binary-plugin.patch"
+	"${FILESDIR}/${PN}-4.2.6-stop-update-warning.patch"
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# remove playonmac
+	rm etc/{playonmac.icns,terminal.applescript} || die
+
+	# remove desktop integration
+	rm etc/{PlayOnLinux.desktop,PlayOnLinux.directory,playonlinux-Programs.menu} || die
+}
+
+src_install() {
+	# all things without exec permissions
+	insinto "/usr/share/${PN}"
+	doins -r resources lang lib etc plugins
+
+	# bash/ install
+	exeinto "/usr/share/${PN}/bash"
+	find "${S}/bash" -type f -exec doexe '{}' +
+	exeinto "/usr/share/${PN}/bash/expert"
+	find "${S}/bash/expert" -type f -exec doexe '{}' +
+
+	# python/ install
+	python_moduleinto "/usr/share/${PN}"
+	python_domodule python
+
+	# main executable files
+	exeinto "/usr/share/${PN}"
+	doexe ${PN}{,-pkg,-bash,-shell,-url_handler}
+
+	# icons
+	doicon -s 128 etc/${PN}.png
+	for size in 16 22 32; do
+		newicon -s $size etc/${PN}$size.png ${PN}.png
+	done
+
+	doman "${FILESDIR}"/playonlinux{,-pkg}.1
+	dodoc CHANGELOG.md
+
+	make_wrapper ${PN} "./${PN}" "/usr/share/${PN}"
+	make_wrapper ${PN}-pkg "./${PN}-pkg" "/usr/share/${PN}"
+	make_desktop_entry ${PN} ${MY_PN} ${PN} Game
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Installed software and games with playonlinux have not been removed."
+		elog "To remove them, you can re-install playonlinux and remove them using it,"
+		elog "or do it manually by removing .PlayOnLinux/ in your home directory."
+	fi
+}
diff --git a/app-emulation/playonlinux/playonlinux-4.3.4.ebuild b/app-emulation/playonlinux/playonlinux-4.3.4.ebuild
deleted file mode 100644
index f2a319b7bbeb..000000000000
--- a/app-emulation/playonlinux/playonlinux-4.3.4.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop eutils python-single-r1 xdg
-
-MY_PN="PlayOnLinux"
-
-DESCRIPTION="Set of scripts to easily install and use Windows games and software"
-HOMEPAGE="https://playonlinux.com/"
-SRC_URI="https://www.playonlinux.com/script_files/${MY_PN}/${PV}/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="winbind"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	app-crypt/gnupg
-	app-misc/jq
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	media-gfx/icoutils
-	|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
-	net-misc/wget
-	virtual/imagemagick-tools
-	virtual/wine
-	winbind? ( net-fs/samba[winbind] )
-	x11-apps/mesa-progs
-	x11-terms/xterm
-"
-
-S="${WORKDIR}/${PN}"
-
-# TODO:
-# Having a real install script
-# It will let using LANGUAGES easily
-# How to deal with Microsoft Fonts installation asked every time ?
-# How to deal with wine version installed ? (have a better mgmt of system one)
-# Look at debian pkg: https://packages.debian.org/sid/playonlinux
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.4-pol-bash.patch"
-	"${FILESDIR}/${PN}-4.2.4-binary-plugin.patch"
-	"${FILESDIR}/${PN}-4.2.6-stop-update-warning.patch"
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# remove playonmac
-	rm etc/{playonmac.icns,terminal.applescript} || die
-
-	# remove desktop integration
-	rm etc/{PlayOnLinux.desktop,PlayOnLinux.directory,playonlinux-Programs.menu} || die
-}
-
-src_install() {
-	# all things without exec permissions
-	insinto "/usr/share/${PN}"
-	doins -r resources lang lib etc plugins
-
-	# bash/ install
-	exeinto "/usr/share/${PN}/bash"
-	find "${S}/bash" -type f -exec doexe '{}' +
-	exeinto "/usr/share/${PN}/bash/expert"
-	find "${S}/bash/expert" -type f -exec doexe '{}' +
-
-	# python/ install
-	python_moduleinto "/usr/share/${PN}"
-	python_domodule python
-
-	# main executable files
-	exeinto "/usr/share/${PN}"
-	doexe ${PN}{,-pkg,-bash,-shell,-url_handler}
-
-	# icons
-	doicon -s 128 etc/${PN}.png
-	for size in 16 22 32; do
-		newicon -s $size etc/${PN}$size.png ${PN}.png
-	done
-
-	doman "${FILESDIR}"/playonlinux{,-pkg}.1
-	dodoc CHANGELOG.md
-
-	make_wrapper ${PN} "./${PN}" "/usr/share/${PN}"
-	make_wrapper ${PN}-pkg "./${PN}-pkg" "/usr/share/${PN}"
-	make_desktop_entry ${PN} ${MY_PN} ${PN} Game
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Installed software and games with playonlinux have not been removed."
-		elog "To remove them, you can re-install playonlinux and remove them using it,"
-		elog "or do it manually by removing .PlayOnLinux/ in your home directory."
-	fi
-}
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index e4c6c77e96e3..263e40a928b0 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,3 +1,3 @@
 DIST protontricks-1.3.1.tar.gz 57784 BLAKE2B ed013367a2cc2384e4340379e2c23999a556ed26920ad59dfd7a8f773e490ee76e253a5fe3216e651cdcdb3e225a2e394255500c611d24f6bf9029582d55bb1f SHA512 4e33334e219db2e6679b430ee42408529478834c80c7da3b9bece4756eb27b9331d49a6a884de8a7ced5ec29d78ce831fee4cfbf6d5adcd750666b7e7a1e5607
-EBUILD protontricks-1.3.1.ebuild 1165 BLAKE2B b25d9cba69e98b330a32331cdc22931682da7de171c518967b007a9ad29fb316f6294aa1e6bb32e9869d5f0f69028e572a63be005ff1a210167ca9fddb663cd1 SHA512 a8f5a346f99154c5bea0c1d3493e17dc8d49dad0290c215ff678ee833db0bec47b1b3bee5663250660c6fde75b2a7da2b9fb77097c158706b28eeba78d9888b9
+EBUILD protontricks-1.3.1-r1.ebuild 1201 BLAKE2B 46996c07e30d7ecac4887ef23478f665e1e450497448cc4ee082ff88516260fcb4ec5a43bac5c8bfa3a2eb8600d90589837a44387f739bc29fd52bbc3e6ee758 SHA512 f7f6903a34e1ffdb6633fa156b1efadd7f18e7c50fdaf484a80f36d1b512804c797c11371e83213d0bd191764317ecc3fb463c39bc6d628b8a7a1e215c2562af
 MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
diff --git a/app-emulation/protontricks/protontricks-1.3.1-r1.ebuild b/app-emulation/protontricks/protontricks-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..69b87925ea07
--- /dev/null
+++ b/app-emulation/protontricks/protontricks-1.3.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1
+
+DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
+HOMEPAGE="https://github.com/Matoking/protontricks"
+SRC_URI="https://codeload.github.com/Matoking/${PN}/tar.gz/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gui"
+
+RDEPEND="${PYTHON_DEPS}
+	app-emulation/winetricks
+	$(python_gen_cond_dep '
+		dev-python/vdf[${PYTHON_MULTI_USEDEP}]
+	')
+	gui? ( gnome-extra/zenity
+		|| (
+			app-emulation/winetricks[gtk]
+			app-emulation/winetricks[kde]
+		)
+	)"
+
+DOCS=(CHANGELOG.md README.md)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	elog
+
+	if ! use gui; then
+		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+		ewarn
+	fi
+
+	elog "Protontricks can only find games for which a Proton prefix already exists."
+	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+	elog
+}
diff --git a/app-emulation/protontricks/protontricks-1.3.1.ebuild b/app-emulation/protontricks/protontricks-1.3.1.ebuild
deleted file mode 100644
index 0b0e576d39a3..000000000000
--- a/app-emulation/protontricks/protontricks-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-SRC_URI="https://codeload.github.com/Matoking/${PN}/tar.gz/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gui"
-
-RDEPEND="${PYTHON_DEPS}
-	app-emulation/winetricks
-	dev-python/vdf[${PYTHON_USEDEP}]
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-
-DOCS=(CHANGELOG.md README.md)
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 441afa2efc60..fbcc0c05b47e 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -6,6 +6,6 @@ AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
-EBUILD qemu-guest-agent-3.1.0.ebuild 1707 BLAKE2B 8e15dd890ed4b5ea809b65688b3ce2d604536c498137388ed15f06126a96e270fb46f040a5bc8d9ed87a38cec9c4d3763ff3850a46e314bfc5106d573f1f5a0a SHA512 aaf6b0df2f239b0f24c051885c5ad69cf503b370c1983c1998313d5985822b3e8ec80470ecb7cdd001454331ddc58605a24c9d3a0e037bb234fa5f26067da8ef
-EBUILD qemu-guest-agent-4.0.0.ebuild 1707 BLAKE2B 8e15dd890ed4b5ea809b65688b3ce2d604536c498137388ed15f06126a96e270fb46f040a5bc8d9ed87a38cec9c4d3763ff3850a46e314bfc5106d573f1f5a0a SHA512 aaf6b0df2f239b0f24c051885c5ad69cf503b370c1983c1998313d5985822b3e8ec80470ecb7cdd001454331ddc58605a24c9d3a0e037bb234fa5f26067da8ef
+EBUILD qemu-guest-agent-3.1.0.ebuild 1701 BLAKE2B 77ae7dbe1ac967db685260110c6a63d475ede00642cfdbf62e64207370c51d4aa8258063365d2b68593722ef8994b5ae2cc62d441b2b7e002fd0c3c065552ed4 SHA512 51070dbb65c2270f6c054d344e311156c710d502ddbb56622e6b386ed52ac9eae2857348504f61e774fd8d100cd8771394524dfd0a659630a6bebf8037ea6397
+EBUILD qemu-guest-agent-4.0.0.ebuild 1701 BLAKE2B 77ae7dbe1ac967db685260110c6a63d475ede00642cfdbf62e64207370c51d4aa8258063365d2b68593722ef8994b5ae2cc62d441b2b7e002fd0c3c065552ed4 SHA512 51070dbb65c2270f6c054d344e311156c710d502ddbb56622e6b386ed52ac9eae2857348504f61e774fd8d100cd8771394524dfd0a659630a6bebf8037ea6397
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
index a92c61c35a3b..a60e60f9d00e 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils systemd udev python-any-r1
 
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
index a92c61c35a3b..a60e60f9d00e 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils systemd udev python-any-r1
 
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3c557741c1c4..1df3baa4f374 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -10,6 +10,7 @@ AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a
 AUX qemu-4.0.0-pc-q35-4.0.patch 5020 BLAKE2B ec3ad8fbf9ee1ce54109a81e913b97daebf347b2fc2217585e68741c3f77cae1272d7b721b59d7595b51d99eadbe7e26c47bcd46c96361a7f0df345fe5d6bcfb SHA512 3621525724a587f9aa1899b7b5c2130c27fca1b9a0e907e3fe1927a79a5d59f7597491538d6079822c52dd7bed41dd3cf6233a1be8472f3ed487e43447a74c7d
 AUX qemu-4.0.0-sanitize-interp_info.patch 930 BLAKE2B d555dedc493cfa1cf888cfa7ce2a4a7811f3fd12615fa5177f82c421ddd82c2d7ffcf2e5c28ca383aac1fff35d03cae6b4b6c5129c694d9b3986819aa1e12962 SHA512 7783acf1172c4fd935c2b8f5bd76e97cea6bbb3ee33a21b23a17f23933f6053b3a933f378c6eae184c2362cb090b6b2c1966f79f1f130cf7344205ef3df0178d
 AUX qemu-4.0.0-xkbcommon.patch 1107 BLAKE2B 865f6578677199b7a78fb285548982c47b1ab624eed28a474d9eb66af3bb266748f045389fdacf945f40ce58352f5041bcaa3ec1966e3f39591d2138455c6435 SHA512 0048751b6883e206b5c486c418e0b2b71f09dfe8dd156b9ac7b331bce1ac5ef9cd7d2e605da144c3983b7a74a8b2f1bb2c9eef991197ee4bfea014af53f54427
+AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15b82bb4e340f3ddb8471f47e854276ff33adee7bd5682ecb797efdb048e9d028d954a064712d1e817e1eb6e26 SHA512 5bfb8f0e739d7bb260b5b5b0a2d28f30b97833b8037227c511f55c9bd9502241c891e7e3780e750598ccfd7fb01615254f1c7f6634787fec67539a61a217e18d
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
@@ -18,5 +19,5 @@ DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f
 EBUILD qemu-4.0.0-r50.ebuild 24060 BLAKE2B 262941105b0a6a0a64e58eb0e12cca4ee400a2d5a0f7ed2a1d0dc0c85ee3632fd4be3db947f243e3ae0360a334dfe71613c8612b14006260793a4e4ef62daf0f SHA512 87653c43f31b7ce092b67cb4f24dc9367e53280011fb87dcc82a00dc09884cc24ca4c7f251a59d2ea0163a76202e06ebb69a3f1052536420dac11d083837097f
 EBUILD qemu-4.1.0-r1.ebuild 24157 BLAKE2B 8ecf6d6b5a230de2b79f7464bf46b6cd27352f949156be3056e28bf02a508c8ef21603354e9f080491bce143ee73297eb631d0f33571a2b7a0819804f0590d5f SHA512 9fa83117ee2f5d7ba3d64d8e8b63afdf41c10f50ad2cb20031024a14741cb66226945230d36af218048023cb8fbbb845b3472812bf25bba4073f935ec1f900d7
 EBUILD qemu-4.2.0-r1.ebuild 24262 BLAKE2B f2e8128f876c71cc7c15eb032f8b383bdc49cc0e0ad816806b0cda43958415b349b8156c84b9018b7a50e22182374b97088b0fb1d722bfffa1cc2691265a0cb0 SHA512 f2aaee829c36c8ec4e06b94a56c795d18944deb449f020aa1b6ea7f8154f1c76c9859a3bee090631f5aafcd48532e9585c612989da12d922e25b7116bf2d4c30
-EBUILD qemu-9999.ebuild 24192 BLAKE2B 778901f0285515aac742e49f8b394400020bbe3e792c7ace6a4fffd9bd435debeec325a3b71b83eef3560499a1382eb551f01b76c0da9977fd92ec68ae90204c SHA512 b687a7738e93fe8fb39009c7bc1f982ef188822b583334fa61bee454532f8eacd861e350061ca4a98bf9f95556c13dca70af8c01bbece1901c833892579d8932
+EBUILD qemu-9999.ebuild 24149 BLAKE2B 476fe07ecc810c84f29d94efa7c7a2413347ef46c0987e3f0938f84da6ba46dd2970cb2cf8fb4bd6e53761053e1402cc11ea9e6387434608ba2b2222917e1834 SHA512 2d4de00304473b10ff37c06e81189c6d385876404a45b47733f46f12d8f08b4e7c29664540d7a5d0bec0a107dc7bea1177028889ada31b45049007f57b7873ab
 MISC metadata.xml 4319 BLAKE2B aea03446434b66be757704de0bac113c91fc7c66343103777091ee7038531990017b24e4fe48209cd168b8383df92e9421ec78c88b74e40bd8769f505b2892fa SHA512 bf80056f3dde8b3708859f7d0f7f12e83933ef81d00ba02a437de424b2d98a030aaceb886ccd44992357200d5eb9d0b704e36c7f51b4a6aa044ef04df4f1d76d
diff --git a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
new file mode 100644
index 000000000000..101926589a61
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
@@ -0,0 +1,16 @@
+diff --git i/configure w/configure
+index a72a5def57..546d757603 100755
+--- i/configure
++++ w/configure
+@@ -6093,10 +6093,6 @@ write_c_skeleton
+ if test "$gcov" = "yes" ; then
+   QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
+   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
+-elif test "$fortify_source" = "yes" ; then
+-  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
+-elif test "$debug" = "no"; then
+-  CFLAGS="-O2 $CFLAGS"
+ fi
+ 
+ if test "$have_asan" = "yes"; then
+
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 0d029214a5d6..f872a6e7422e 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -212,10 +212,9 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-cflags.patch
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
 	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+	"${FILESDIR}"/${PN}-4.2.0-cflags.patch
 )
 
 QA_PREBUILT="
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index a69618972fef..52fa06206d73 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,5 +1,7 @@
+DIST runc-1.0.0_rc10.tar.gz 1929802 BLAKE2B 8399c3d62726bbb6256efef7e15b7496a7172bf25170b12beb60be498967dec4fde2aebd073de4265e132ff864bafc4d2499ab677390a4f7c0a1605d83ae55e5 SHA512 598221071ef07d18bf34bf5d5c68b8ad78ee71716177fc3ce5b6909cd841d5aed93f17ebf1f3d134707d29eef1f54a4ddc21e79621a9bd957df28a8d2e028ab7
 DIST runc-1.0.0_rc8.tar.gz 1665924 BLAKE2B 542cbdefaaa1ef89d2abf8e31ca8116f26cddbfc3fb94dc8c7e94c51750b179ed557bee857ec80ede7280856c66c01c7961a26dc7e6202276baca46c691a3903 SHA512 f213b6a7fa96597d2ba1068f77752bccc0a1d62e0aac02ec8d2a2552dc3c1140fd4e52b2daeb0ac8fc09c48abe4521834450baae01ad4165308813eee7654a2b
 DIST runc-1.0.0_rc9.tar.gz 1885161 BLAKE2B 638f00b857f43204cdc2b4e65927d6280e48b075d8363570e9da166ec35febaa749c733478d5c190c0119e0d95418e3295adcc129b68afbc5fec20ca3d9e9b59 SHA512 56c46fbe4d637a83d67e0aabf2549ba687d8b1e357fdecfffca343c8b166edf4158830aa0a4419edd6994c589b874bb8504eb3969ed3430cda6e233940d34194
+EBUILD runc-1.0.0_rc10.ebuild 1531 BLAKE2B ce41c356f31fa8f0e4247dc1a8e3cf991f5d7a9a321a3ca151a6a8c711ce7b5b967a8be420ce3d294a92163710baf2556cef1ddd270f0c573001e78bf11807da SHA512 61389d46aa058aa6ef54dbc2850465e0e44a52bc6039870065ce5a15793af9e91f93f8886f0258e63c70d93c1549aecfcfd34dbf42b0f9f86006dce61f72ee58
 EBUILD runc-1.0.0_rc8.ebuild 1487 BLAKE2B 5a3ad59b6d6f8582f8f86d3f5887294bbacc9db973e0f3b0090a085dacb07b993a68a5f6da40824c99312534d033da03ec3e1e7230bf1d459f9025bbfd691d6d SHA512 41e23944c8bce42d7043d0fd4a6ea01096431c73d5636bd1f0b6a68452cb70aea7aa69d91588be7091d103a227375ca1dec3f4e10e96d8108f4591494cb6f816
 EBUILD runc-1.0.0_rc9.ebuild 1487 BLAKE2B 99a37b4281c595242104484419ff679963e590bb841f08ae84386e0fde31ae8e97c0ff95b879d8e8b0616e0b8a3ebb9ef9b4fb1dbaf2e93a09fc22cf411fa533 SHA512 af7591ad892b998ff8154b2d8329958fd82aed8897d673efb8e5ba131206e0ab9afb2e5ade0b51776fb8e0c2f6f110272f7718905d0ef2f63a54e4ab8d11deaa
 MISC metadata.xml 764 BLAKE2B a3132f8c72aaaac64caf15319068c94a3a849092ddf4d8ed83ef2b964ce714a12fc8f7c35ec85072fab02dbe5b650c23ba185372d7eb835d5a4bb30e1a88c784 SHA512 980f2d052132f8a72f218d6f0538fafac32e2af3b72e2aa4db0d3bd6ea120ec426ca16e5eeac721682a24200c5ea6f4d91f574926849d549fcff478872ff038b
diff --git a/app-emulation/runc/runc-1.0.0_rc10.ebuild b/app-emulation/runc/runc-1.0.0_rc10.ebuild
new file mode 100644
index 000000000000..a9c3e510c9e1
--- /dev/null
+++ b/app-emulation/runc/runc-1.0.0_rc10.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info
+
+CONFIG_CHECK="~USER_NS"
+EGO_PN="github.com/opencontainers/${PN}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-build golang-vcs
+else
+	MY_PV="${PV/_/-}"
+	# Change this when you update the ebuild
+	RUNC_COMMIT=dc9208a3303feef5b3839f4323d9beb36df0a9dd
+	SRC_URI="https://${EGO_PN}/archive/${RUNC_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	inherit golang-build golang-vcs-snapshot
+fi
+
+DESCRIPTION="runc container cli tools"
+HOMEPAGE="http://runc.io"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ambient apparmor hardened +kmem +seccomp"
+
+RDEPEND="
+	apparmor? ( sys-libs/libapparmor )
+	seccomp? ( sys-libs/libseccomp )
+	!app-emulation/docker-runc
+"
+
+src_prepare() {
+	pushd src/${EGO_PN}
+	default
+	sed -i -e "/^GIT_BRANCH/d"\
+		-e "/^GIT_BRANCH_CLEAN/d"\
+		-e "/^COMMIT_NO/d"\
+		-e "s/COMMIT :=.*/COMMIT := ${RUNC_COMMIT}/"\
+		Makefile || die
+	popd || die
+}
+
+src_compile() {
+	# Taken from app-emulation/docker-1.7.0-r1
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')
+		-L${ROOT}/usr/$(get_libdir)"
+
+	# build up optional flags
+	local options=(
+		$(usex ambient 'ambient' '')
+		$(usex apparmor 'apparmor' '')
+		$(usex seccomp 'seccomp' '')
+		$(usex kmem '' 'nokmem')
+	)
+
+	GOPATH="${S}" emake BUILDTAGS="${options[*]}" -C src/${EGO_PN}
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin runc
+	dodoc README.md PRINCIPLES.md
+	popd || die
+}
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index e33ac3519aef..252b44a9f510 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,6 +1,8 @@
 DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
 DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c
 DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3
+DIST skopeo-0.1.41.tar.gz 4692408 BLAKE2B d5e99be0cb478065f1478beda355abc11c8f13ad8446251048502da1b1af38d407ec46d284e59d2018af5d1ca6a953ad6156a306e9bc1acbdb22b447fe17a59f SHA512 924af178eb9621395cfffcf51aa072886dc8c20746bce1599a503df8c54794e34184a1fc6fd9582b889c7c8efecf8cf192797bc8e208b90c71cca31bb970d8e9
 EBUILD skopeo-0.1.39.ebuild 1451 BLAKE2B 9652f26926ef19838041dbb50d355aaaddb975e4a8896fc35b90cfb145b75411f8964222d10229d8df1c9f2b80821746573e4485e5df79493b7bfb07025e519e SHA512 3f91ec57eac22a82c9a5a7e9eb755d0933476554ccf9a223a40b01452c3d57c5996a6e1b204f58ca7189c3260cec5a31971775778ddbbe32f8c920068c8bbe9d
 EBUILD skopeo-0.1.40-r1.ebuild 1734 BLAKE2B 3ad25540278b444c94b7bbdda5684f74118afef56989e439efb8451217248b1a3062945c1b5a6d40844162b2ccb8e8981405df250a25e7c8475c020214adc816 SHA512 b4b45ae2bda0f877828edc0cdf6befd900d9d232f7416eff57724163401ca04f95ebec6a13d7c0d54810a5a7f994794d69be78a1528a7f36c5032ee2996e29ed
+EBUILD skopeo-0.1.41.ebuild 1330 BLAKE2B d17e46533d449b957b0829d2bd7790610fa3f1f314500b9a830d2710eeef33c6b0c8125bd803125245b361aae351e241bd8754683d0d28a6f63746d2cabd58a6 SHA512 c907e07d0587e652f425ac91be2dd5648820622864fea7845558db2f6df1f3c21ccd029f24b9be8edccf3e51679290fde22526590dcd55558227909ae520878f
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.41.ebuild b/app-emulation/skopeo/skopeo-0.1.41.ebuild
new file mode 100644
index 000000000000..cc09b12134e3
--- /dev/null
+++ b/app-emulation/skopeo/skopeo-0.1.41.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+COMMIT=7d080ca
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/containers/skopeo"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:=
+	>=dev-libs/libassuan-2.4.3:=
+	dev-libs/libgpg-error:=
+	>=sys-fs/btrfs-progs-4.0.1
+	>=sys-fs/lvm2-2.02.145:="
+DEPEND="${COMMON_DEPEND}
+	dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test"
+
+src_compile() {
+	local BUILDTAGS="containers_image_ostree_stub"
+	set -- env -u GOCACHE -u XDG_CACHE_HOME \
+		go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \
+		-gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \
+		-o skopeo ./cmd/skopeo
+	echo "$@"
+	"$@" || die
+	cd docs || die
+	for f in *.1.md; do
+		go-md2man -in ${f} -out ${f%%.md} || die
+	done
+}
+
+src_install() {
+	dobin skopeo
+	doman docs/*.1
+	dobashcomp completions/bash/skopeo
+	insinto /etc/containers
+	newins default-policy.json policy.json
+	insinto /etc/containers/registries.d
+	doins default.yaml
+	keepdir /var/lib/atomic/sigstore
+	einstalldocs
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index e4db03bf5d8c..bf6237c461fa 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,7 +1,9 @@
 DIST slirp4netns-0.3.3.tar.gz 162154 BLAKE2B b4a477ca94ee17e14ae0d255eb1f22713388d32cee1faff308e902a8134bc52e08cfa92537c19fbfc9869d936637c1196fee462d9699c1b5f97a0d0138dc4792 SHA512 9cccbfd30348d895c8c3f6a80ebe7991131c5a5f4907733ec65df5ce70b63427e5f666bf7c4dcb08e8dd50f1769aff0f6642c23c29eb6b9921a2d10f62d46f63
 DIST slirp4netns-0.4.1.tar.gz 168785 BLAKE2B 90e2510121177771fb77d5e48baa8a1acb95f9778e72add244b2df10d92c9cc6ef284bfbeef699bd8e58724b50254a4eb6fa485a58c7c8e6cca8469cf722e1f2 SHA512 bb2a0946f4e360eb08efb46e097d21ab1bf05d199d1e3d381e065617eb9ba15434bccb5d1e76ac27664f23c8da79349383095b4d28d2a1a8ddc0fb9675aebf34
 DIST slirp4netns-0.4.2.tar.gz 169120 BLAKE2B bbb809da871c885e910be771f3a6e90f7d18880d82ddeb0e569a1db33e38c80cbb1a7279341c0efcd514d88fa2874920ae89365f9fa97a38e3fb09f0eb8e5642 SHA512 87dd032afe6862fc8f7f5c3770a1d939832c29c2f55fa3579a4eac717979442e1b081aa886cc94c5638ec1339ccebe73ed1844af37a479fed2d5826bc761fc05
+DIST slirp4netns-0.4.3.tar.gz 169895 BLAKE2B a8919ced6d9d68823c79396bc8914d32d157c2da566735a495d68c995c5cfafafba7eb1f761cbe9f82c3291afeae4ac55d00de4c094d5f48e2268d540dfca9e6 SHA512 a3415529486f11cf12c799cabc889dca30fbf64d08818359a285ac67c15fc7926d61105291cd8f2652174747e641e159b5b805a8954fd82f7eb9e35058b23265
 EBUILD slirp4netns-0.3.3.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
 EBUILD slirp4netns-0.4.1-r1.ebuild 762 BLAKE2B bf04b7ace6f29e4d5f3172b49a5b38f1f438de246a1c53c2164f950885b92cb58d89a73da69e877f62f18ae686f5fd3078801537962da2d2e2b73491520b97a9 SHA512 f90e0500618de2cc8059fc33d8261f6050d43c95abd17806df46362b55730ecbc138f41c9895e8278f5daefa62de77e033df4db6ceccb311da361246abb466a4
 EBUILD slirp4netns-0.4.2.ebuild 762 BLAKE2B bf04b7ace6f29e4d5f3172b49a5b38f1f438de246a1c53c2164f950885b92cb58d89a73da69e877f62f18ae686f5fd3078801537962da2d2e2b73491520b97a9 SHA512 f90e0500618de2cc8059fc33d8261f6050d43c95abd17806df46362b55730ecbc138f41c9895e8278f5daefa62de77e033df4db6ceccb311da361246abb466a4
+EBUILD slirp4netns-0.4.3.ebuild 762 BLAKE2B 307a4916c666b3a368b4268ab556c044eb34d754f5b5a0f2b50b7057a4b2663b574c73c9a2c8f54925312f72e2ef66a281d4bfd26b80b4542aa288ed392b0891 SHA512 45fcd96f5f700044f84739b6ed0ef5ab61fd07a860fd8542c88e74a413b3d72e762280441ae3b65fdb6568b43e0d6b40354a8e816ff736cb1563ae5219f840e6
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild
new file mode 100644
index 000000000000..632654ce2a10
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2=
+	dev-libs/libpcre:=
+	sys-libs/libseccomp:=
+	sys-libs/libcap:="
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RESTRICT="test"
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index f402c727648e..baaa8274be8c 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -4,7 +4,7 @@ AUX spice-0.14.0-libressl_fix.patch 530 BLAKE2B 136e0b87931d487a018cdf0be4acfc0b
 AUX spice-0.14.0-openssl1.1_fix.patch 614 BLAKE2B fb7b39e73d37bc6ab27035c7d7a742fa648afb62777bcbd9dbdd7480b5b5461da6147b4f3368e04aaf04f8ef5780aeab1e7679f4fcf7aa1005df7d28a4fca7a1 SHA512 1b0b83b7222af0f60bdb5a3469881a4e84f8df824d2741710da04b8bdec95e691f97137f2ee67ad71065918b329285d215aa086d5f46dc83b18334eb17ef6dc8
 DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
 DIST spice-0.14.2.tar.bz2 1406009 BLAKE2B e6c57bedd8c8ec0444da194be7279b895bf348dfa9b427d20301cc223627bcd65b7037280bc2a3d0b531b0cdcd8cb62d34ee132c549ac3dc8f6e5a2959339ce2 SHA512 1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76
-EBUILD spice-0.14.0-r2.ebuild 2495 BLAKE2B 73564493c254b38ae370bcf96d76deaa841aba335a40c1e915bd6fe0fa79467700e67fd4c8be443841412b423e2c18efc053af63146a046af6de042501682004 SHA512 af271757fbdf79a0f8f24b561b2f4784c8bce485a004124718bc414d2327d1c3127bf4ad360920ee2c7a597ea1bd05b8efd2a21b0f810e15b554f2dd6ad63d0f
+EBUILD spice-0.14.0-r2.ebuild 2491 BLAKE2B 99a415733fa66136e796c4185d9369400e2bc27efbd04b60bc27f08a42adc8fe2ea0c33ad032c9a3280ccf10b2022b5ca00490e0f2ee417abc71d27dcf393f7f SHA512 62b6520e710622e2eb5e8ae4dbf9a712902319fcae6e1a65f3549fe2f826e6b2c8e4932ae5b1592e411eb6439ef0600dc19f6efd121de9d02dc7f013bc8db0bb
 EBUILD spice-0.14.2.ebuild 2448 BLAKE2B d502a0f890ab488c561ccf5555d84c4c2c101f78a87e3eae1e415ff37a97c5bb76bddd69950702800251fe152f563fb530380bdd40304a538cf6d6d37c20c93d SHA512 3fb6b35e2d6890bef4237716920b29ba07721f8588c342c890800981134ab9c4cfcba9e9eb0e356a14f2637f9817963b7784e25b93c82939dbc8607af4e7b7cd
 EBUILD spice-9999.ebuild 2512 BLAKE2B fbf507da71538f102eb3ae355e734c4aa98a0463ca7d4108dbd8f9c0676717381b432e9f9aad895f7b0d727b0e360d3e126f540773bd6a2911a0a4600144faa6 SHA512 e00318a2d27987baff045b2129f10fc2e43f74be0156c1b8360bd230a87d2f7d2266b4019e8cd92644d6ba61e109b4422987f42d695f493debe6d6c3fdd24494
 MISC metadata.xml 385 BLAKE2B 599bae33d9264b8b3b4474b0d2234d66e6c6f2cd3da1710bfea64f75570264da7f4de712cecb95408a059f70e3dba2de2a421c02f1f728e39c2bf913c2c570a0 SHA512 c75966298d69fb56b3e16c98b0cc7b3b2514d2ad2a6b790777c00493754e678388f0eb17fbabc6f58a667883e87d2a4f19c2a1c34f5c87f81fb13a8948ab85c8
diff --git a/app-emulation/spice/spice-0.14.0-r2.ebuild b/app-emulation/spice/spice-0.14.0-r2.ebuild
index ae61110bb94f..49bf1e178a9a 100644
--- a/app-emulation/spice/spice-0.14.0-r2.ebuild
+++ b/app-emulation/spice/spice-0.14.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils
 
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 0a84fb19dca0..b80bc476b6ce 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,8 +1,8 @@
 DIST virt-manager-2.0.0.tar.gz 2629465 BLAKE2B 8795985afb8805fdb4f1ee94c7344361a7d09d3e62e361f3126859c4d1b1077286b720de7629fd876e5bff10500cc6cea6f1d4afbba5c2c83fd61b137c40a3a7 SHA512 5d0eb65dceb5c913973edaa52414b1665d1ed9cd3f226e28a592decddec2acd8fdb589f60736edf9b7d95830893812f9aecca2cbdd715033ca7ea53a95472876
 DIST virt-manager-2.2.0.tar.gz 2628726 BLAKE2B d2f6bc7a7bcf8b220109702b7cd65dd9484c197252cf96e4748c27921a45749c476ed9d03eadac6ef3053df01ceb267c4756b0c602fad431ad9de0035d4ed5d5 SHA512 09975f7628ee302687eb6572b5f35797b4710aaae60c17542ee9edd72c65e80e93d7bbc7a2050667a9280effdbab28272886ae155b3ba73c104153ae3c048d99
 DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a
-EBUILD virt-manager-2.0.0.ebuild 2332 BLAKE2B 1d0df69a7f19fe3e5a9f0dafea295339b76b92628ca11052036d39691abc2cc142d59d12a02d1dc4821aedf1b103f334f20ec92e1ceedc459b9c5f6f9e301081 SHA512 42c2bc2af0483676b45600db794a97948c12a39ad9fd1b960974a1135cdb721c5a2301ee15dd2fbc1ae959331b0c19dd8782caafc14b0075cb70eb3b7d754ca5
-EBUILD virt-manager-2.2.0.ebuild 2418 BLAKE2B e31a0555870c0aadcb502c26b1f26ba957b450cf9d07f53f2667fbd46347b226a6243e0363c68942d2edbf1e96e3e6ac44233f774c5d3ae6ef1b64c6186951aa SHA512 4459364f3cc1bd2d5e27dba877c92157a978d635de074f75f7433cd1401a62a3a809e9f0e85ba96aa786c6b8685a1105ed23c4e68342c3e9d799add8dcbb6a45
-EBUILD virt-manager-2.2.1.ebuild 2390 BLAKE2B d81eb06a422be03cdff4f0c0b846544f8d2f60fdb0ec52e5eb6fbf3bfa6d9940388ad44b6d4c73e6f72958db241283471b93639004426a0a1bed2b5d3f1b4ac5 SHA512 2e14730052c372c8d55ed274cfe4b90659f16c8c27b874b0e847b249a5c7c3b086b37754c2e374459babda4fe75ae51b6a25b558f6ebb912f44bb1db92f40d7c
-EBUILD virt-manager-9999.ebuild 2425 BLAKE2B 448ad93253a67113e7a760cd8445d80e986b26c6b6e847ea317bdf89d058c17c636842d87810c4a3ddecf842365aad2cf772d6dd197a8dc20a0c03dd04e30f36 SHA512 16f197d5c4c1382da70fc43af701d8517ef69cb8d8541151d06408125b02c4e1f3383f86dbf2470b611d77da06f03bf1b7c2ad2f7c76413998b30cbc07311176
+EBUILD virt-manager-2.0.0.ebuild 2403 BLAKE2B 0ec4d6cd339af7fdbb8659cefd1d014bdef9ad67d46f763ec01cf7d9e99b3d58b3b852097f87cb00a7e37819ed3eda49b2f70d4056107edbd1b3578f10424cdb SHA512 c2c6718e256551ac887a55dad9b47dacc86629aed8ecee1f6b52aa55cd7c3073ef0bba8ceab9d8fd71abf6f27bc1f0f28af3d6f0e7d8afae46cb1c70ad4357a9
+EBUILD virt-manager-2.2.0.ebuild 2489 BLAKE2B 67bf08f5ccc7c0fe7cdbdc4f48fcd9284cfb153f054bc5a9d707ef312a17b7e6fcf052f56e1de4cc941008422bb7d42deeacf9ce4a548cb7ebeb48985403f8ce SHA512 9362827e4d8382f2f9009e8986349035dac21469dcbf934fad9d029a206c233f2131eebf3ddab1cbd333888a76e06e437e7d5b2c11e97aa27803271072c7c7f3
+EBUILD virt-manager-2.2.1-r1.ebuild 2454 BLAKE2B 9b1c32f4bf1bd19c552ebd0b0e01305afe7d6c599ec3f5b5abc6f839cf7b75b63d0e4ab45220a04b63c92b139d48957f80fdb41b3169eb3b6fd943fc709c1de5 SHA512 2c1ae9114d6bd034847ce9fc4a7403f2c19678449f64dae7c702a257703c11106a502ef477219708be95281db3bd3b9314e4cf2273c9a98f0e285c5f1c33d1b4
+EBUILD virt-manager-9999.ebuild 2496 BLAKE2B 3015e786fad6e15fec6c74918877bde64da89c49ec3fe8ca697afdb74b8669c645b3362ab4b72213d5e0eccb2ffd1fa542e17882067898a9e6a8af46db719c63 SHA512 4b38f99e45d565170c88045c366224abf127ab697c4e54f8bd55c9171f93e302fca4b13e5585b3b5d03cc5295ff148d6d0c4a8d6d13e9c4d7e5b081a48d8a53f
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
index 0dedfe355424..05fb004334b4 100644
--- a/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.0.0.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
diff --git a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
index b5b58cd52a7e..ef3ad18879d6 100644
--- a/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-2.2.0.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
diff --git a/app-emulation/virt-manager/virt-manager-2.2.1-r1.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..963b5ecd8dab
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-2.2.1-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="http://virt-manager.org"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS="amd64 x86"
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+else
+	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~ppc64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring gtk policykit sasl"
+
+RDEPEND="!app-emulation/virtinst
+	${PYTHON_DEPS}
+	app-cdr/cdrtools
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=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/gtksourceview:4[introspection]
+		x11-libs/vte:2.91[introspection]
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool
+"
+
+DOCS=( README.md NEWS.md )
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+distutils-r1_python_compile() {
+	local defgraphics=
+
+	esetup.py configure \
+		--default-graphics=spice
+}
+
+src_install() {
+	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+	distutils-r1_src_install
+
+	python_fix_shebang "${ED}"/usr/share/virt-manager
+}
+
+pkg_preinst() {
+	if use gtk; then
+		gnome2_pkg_preinst
+
+		cd "${ED}"
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	else
+		rm -rf "${ED}/usr/share/virt-manager/virtManager"
+		rm -f "${ED}/usr/share/virt-manager/virt-manager"
+		rm -rf "${ED}/usr/share/virt-manager/ui/"
+		rm -rf "${ED}/usr/share/virt-manager/icons/"
+		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+		rm -rf "${ED}/usr/share/icons/"
+		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+		rm -rf "${ED}/usr/bin/virt-manager"
+	fi
+}
+
+pkg_postinst() {
+	use gtk && gnome2_pkg_postinst
+}
diff --git a/app-emulation/virt-manager/virt-manager-2.2.1.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1.ebuild
deleted file mode 100644
index 9730435dcad8..000000000000
--- a/app-emulation/virt-manager/virt-manager-2.2.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical tool for administering virtual machines"
-HOMEPAGE="http://virt-manager.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gnome-keyring gtk policykit sasl"
-
-RDEPEND="!app-emulation/virtinst
-	${PYTHON_DEPS}
-	app-cdr/cdrtools
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=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/gtksourceview:4[introspection]
-		x11-libs/vte:2.91[introspection]
-		gnome-keyring? ( gnome-base/libgnome-keyring )
-		policykit? ( sys-auth/polkit[introspection] )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-"
-
-DOCS=( README.md NEWS.md )
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-distutils-r1_python_compile() {
-	local defgraphics=
-
-	esetup.py configure \
-		--default-graphics=spice
-}
-
-src_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-	distutils-r1_src_install
-
-	python_fix_shebang "${ED}"/usr/share/virt-manager
-}
-
-pkg_preinst() {
-	if use gtk; then
-		gnome2_pkg_preinst
-
-		cd "${ED}"
-		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
-	else
-		rm -rf "${ED}/usr/share/virt-manager/virtManager"
-		rm -f "${ED}/usr/share/virt-manager/virt-manager"
-		rm -rf "${ED}/usr/share/virt-manager/ui/"
-		rm -rf "${ED}/usr/share/virt-manager/icons/"
-		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
-		rm -rf "${ED}/usr/share/icons/"
-		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
-		rm -rf "${ED}/usr/bin/virt-manager"
-	fi
-}
-
-pkg_postinst() {
-	use gtk && gnome2_pkg_postinst
-}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index ca5fdb8b22af..91e2bbc0f7cc 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -29,12 +29,14 @@ RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index bc4c1f9ee2d7..85ca10735a45 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -30,7 +30,7 @@ DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282
 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225
 DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
 DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a
-EBUILD xen-tools-4.11.3.ebuild 13855 BLAKE2B 238160d48c54f0b87a3daac6da01a07c52cedd5baa1ab4f786015eecd15eb584bedfe48f7063f3d59af48919c719f3d7d1f59d790c7a0faa24f8e81449bd0344 SHA512 1a39d72ab79563e7097aa349d09376e15b64fc4f40a96639735cc734db2f48797d472c7b9ebb88709871c7d4145a5a9926cbc7d4f0875eaa59cce621b977977b
-EBUILD xen-tools-4.12.1-r1.ebuild 14581 BLAKE2B 2f1635d7037e9b099340c707231bfaca085dcd06b2d6da54683ecb4e8b5fd6580013cc748d650a1617f0af45e84bce7052992d46b6ecfc814acd6916dfd9ab89 SHA512 61a2a47a702d48508036c9e67815d366b4bd4eba897779d2e99fc6c3d474043566dc0156345dcc5cb85ba1330146b80e256553755c13529ff540b787423deabd
-EBUILD xen-tools-4.13.0.ebuild 15279 BLAKE2B c7d5925f3e0c382f6f857ae2057e8c052c2fdb0d9734f789549039cec4ec627c501b14941e6be73ca9f2cbdd3284ae16bba5addfa5a121859cedc2abe162dccb SHA512 fe96947c7d49ac216df25fd1bd419e64bd5a204c740e8ece769ee7cf1cb546beb9719d7c72e5dcd4c08a6b844e296df7018c338cd6246fe52bb44051df3fc503
+EBUILD xen-tools-4.11.3-r1.ebuild 13936 BLAKE2B d6a916f69d2cb3bf1c73361ddc89f8d241ee3e1411a48346b57a7a0b9d27799c01d57979d3a124e0101126c434c21ae5354af932f635a4e66c3b3dcc659fb989 SHA512 e1c04b9c7c01b5ef5c2b8c9a6967b4476930c424da101bab322bcb2188eec9c688c116e1398d422642e084dea2dea3c98cbdce051cdc9b59487f393bcaa08063
+EBUILD xen-tools-4.12.1-r2.ebuild 14662 BLAKE2B a3857abf9c1379eb2a402ea1c2cd4136ec5bb016f6bed34f514f87e94f17b01d5db3ddbb871ffcdb8dd57b390bc3a7e3240d92cfcdeb3a14674f9ee1221f412e SHA512 019819109ba8ddc1ceac050c4319e91122dacbfa4101b8dc0120b5e2a09eb33e00f9b10c47cdb0e92ec3172559d2021487c0aa56cb17c322d8cd23c8e2e065d8
+EBUILD xen-tools-4.13.0.ebuild 15360 BLAKE2B 967d3da94c2755ee8ec070777dddaedddfa5301f7941058562d226ad262edce8502b359c85f9627b07bac6fa26cad9aac844266c4c2aec138cf9babdf43ff6a6 SHA512 e3cbbe4e6a1e7164c423432442cdd5249a81c2b75dfb5e32e5bb810aec7cac5f01ce0d22aa7ce81be7fbfb7b09942862dbed47c2bac13f5bf4fc389cceae2810
 MISC metadata.xml 1707 BLAKE2B becd24142b3d885f0a26c1444e5191c3906c260ba57755257d04eee76be5a21aede5741ca0bea12a77e9c0c872cd5f8436fc5c11fec3f3f5f543f4fda75fb5be SHA512 137f36f883e4476f1820e630fa1f5feb52244cad235885bff09c838755feba1df8428f631e255de25b29ce7dac8aa62e0df37517875cce3a26e5114dee7a70f7
diff --git a/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
new file mode 100644
index 000000000000..72913356f070
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.11.3-r1.ebuild
@@ -0,0 +1,464 @@
+# Copyright 1999-2020 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=0
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=19
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER=1.11.1
+	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
+
+	[[ -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
+	https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		${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 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}
+	ovmf? ( hvm )
+	pygrub? ( python )
+	?? ( 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
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
+	x86? ( sys-devel/dev86
+		sys-firmware/ipxe[qemu]
+		sys-power/iasl )
+	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
+		sys-devel/dev86
+		sys-firmware/ipxe[qemu]
+		sys-power/iasl
+		system-seabios? ( sys-firmware/seabios ) )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_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-rel-${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}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || 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"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	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
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || 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 api xenapi) \
+		$(use_enable pam) \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		--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)"
+	tc-ld-disable-gold # Bug 669570
+	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
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	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
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+}
+
+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 system 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.3.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
deleted file mode 100644
index a089de2905e2..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
+++ /dev/null
@@ -1,460 +0,0 @@
-# Copyright 1999-2019 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=0
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=19
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER=1.11.1
-	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
-
-	[[ -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
-	https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-${SEABIOS_VER}.tar.gz
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		${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 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}
-	ovmf? ( hvm )
-	pygrub? ( python )
-	?? ( 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-firmware/ipxe[qemu]
-		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
-		sys-devel/dev86
-		sys-firmware/ipxe[qemu]
-		sys-power/iasl
-		system-seabios? ( sys-firmware/seabios ) )
-	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-rel-${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}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || 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"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	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
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || 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 api xenapi) \
-		$(use_enable pam) \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		--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)"
-	tc-ld-disable-gold # Bug 669570
-	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
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	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
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-}
-
-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 system 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.12.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild
deleted file mode 100644
index 83c7552e06e4..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.12.1-r1.ebuild
+++ /dev/null
@@ -1,477 +0,0 @@
-# Copyright 1999-2019 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=1
-	SECURITY_VER=
-	# xen-tools's gentoo patches tarball
-	GENTOO_VER=18
-	# xen-tools's gentoo patches version which apply to this specific ebuild
-	GENTOO_GPV=0
-	# xen-tools ovmf's patches
-	OVMF_VER=
-
-	SEABIOS_VER=1.12.0
-	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
-	IPXE_COMMIT=d2063b7693e0e35db97b2264aa987eb6341ae779
-
-	[[ -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
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		${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 )
-
-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 debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( 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
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		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-power/iasl
-		system-seabios? ( sys-firmware/seabios )
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	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/hppa-firmware.img
-	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}"/edk2-*/ > /dev/null
-			eapply "${WORKDIR}"/patches-ovmf
-			popd > /dev/null
-		fi
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
-		cp "${WORKDIR}/patches-gentoo/${PN}-4.12.0-ipxe-gcc9.patch" \
-			tools/firmware/etherboot/patches/ipxe-gcc9.patch || die
-		echo "ipxe-gcc9.patch" >> tools/firmware/etherboot/patches/series || 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"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	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
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || 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 api xenapi) \
-		$(use_enable ipxe) \
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
-		$(use_enable ocaml ocamltools) \
-		$(use_enable ovmf) \
-		$(use_enable pam) \
-		$(use_enable rombios) \
-		--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)"
-	tc-ld-disable-gold # Bug 669570
-	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
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	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
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-}
-
-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 system 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.12.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
new file mode 100644
index 000000000000..86248c171f5c
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.12.1-r2.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2020 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=1
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=18
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=
+
+	SEABIOS_VER=1.12.0
+	EDK2_COMMIT=ef529e6ab7c31290a33045bb1f1837447cc0eb56
+	IPXE_COMMIT=d2063b7693e0e35db97b2264aa987eb6341ae779
+
+	[[ -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
+	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
+	ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+		${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 )
+
+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 debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	ipxe? ( rombios )
+	ovmf? ( hvm )
+	pygrub? ( python )
+	rombios? ( hvm )
+	system-ipxe? ( rombios )
+	?? ( ipxe system-ipxe )
+	?? ( 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
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
+	x86? ( sys-devel/dev86
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		sys-power/iasl )
+	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-power/iasl
+		system-seabios? ( sys-firmware/seabios )
+		system-ipxe? ( sys-firmware/ipxe[qemu] )
+		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_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/hppa-firmware.img
+	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}"/edk2-*/ > /dev/null
+			eapply "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+	fi
+
+	# ipxe
+	if use ipxe; then
+		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+		cp "${WORKDIR}/patches-gentoo/${PN}-4.12.0-ipxe-gcc9.patch" \
+			tools/firmware/etherboot/patches/ipxe-gcc9.patch || die
+		echo "ipxe-gcc9.patch" >> tools/firmware/etherboot/patches/series || 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"
+
+	# drop flags
+	unset CFLAGS
+	unset LDFLAGS
+	unset ASFLAGS
+	unset CPPFLAGS
+
+	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
+
+	# disable capstone (Bug #673474)
+	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+		-i tools/Makefile || die
+
+	# disable glusterfs
+	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+		-i tools/Makefile || 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 api xenapi) \
+		$(use_enable ipxe) \
+		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+		$(use_enable ocaml ocamltools) \
+		$(use_enable ovmf) \
+		$(use_enable pam) \
+		$(use_enable rombios) \
+		--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)"
+	tc-ld-disable-gold # Bug 669570
+	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
+
+	if use doc; then
+		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+		dodoc -r docs/{pdf,txt}
+	else
+		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+	fi
+	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
+
+	keepdir /var/lib/xen/dump
+	keepdir /var/lib/xen/xenpaging
+	keepdir /var/lib/xenstored
+	keepdir /var/log/xen
+}
+
+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 system 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.13.0.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
index 0b4a116929ca..47d3fb3608e2 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -91,11 +91,13 @@ COMMON_DEPEND="
 
 DEPEND="${COMMON_DEPEND}
 	>=sys-kernel/linux-headers-4.11
-	dev-python/lxml[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+	')
 	x86? ( sys-devel/dev86
 		system-ipxe? ( sys-firmware/ipxe[qemu] )
 		sys-power/iasl )
-	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
 	api? ( dev-libs/libxml2
 		net-misc/curl )
 
@@ -113,7 +115,9 @@ DEPEND="${COMMON_DEPEND}
 	doc? (
 		app-text/ghostscript-gpl
 		app-text/pandoc
-		dev-python/markdown[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
 		dev-texlive/texlive-latexextra
 		media-gfx/transfig
 	)
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 9cd3a0d74210..d00d54eeeabd 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-audicle/Manifest b/app-eselect/eselect-audicle/Manifest
index a738968288ab..d5f3f60db8fc 100644
--- a/app-eselect/eselect-audicle/Manifest
+++ b/app-eselect/eselect-audicle/Manifest
@@ -1,3 +1,3 @@
 DIST audicle.eselect-1.0.1.bz2 1266 BLAKE2B 28a9199d1e1dcd781243c4f40409d2afa2f588140b7170185b6a2a97a8bc2800e7fdfd06d82faefd412937d1f5d859d4cccfa900363d02697902e27a6c625600 SHA512 bf60c4d1679ad4d8e5334fc3841c417b78cf836ed9ea313a8d4c4c0be092a6ae1cc85daf8eb545a420803e56f57c334c3f4b529df476f40de99ce365fb75e659
-EBUILD eselect-audicle-1.0.1-r1.ebuild 597 BLAKE2B c6cc05289077bcb4d9dd8b073c59855c5516bb969179d73599a8577a3652f19fde3f5d47a3135672c9a1f6354a132efc2a2ae0536d37fcb0d3fcf021ce09a973 SHA512 8e48ce04d96c2cb72ba3c6167ddb361f9f47cd17ba896331a2f7f24c420e106128aa9b33f12405c56f46a601fac9bbf3312e1cf4d5f290dad6765f4bf3ac8006
+EBUILD eselect-audicle-1.0.1-r1.ebuild 614 BLAKE2B d625394c251c0fa734705538fe1a1c6005e3de97b7c4c8f925a62ba5ff214eec1fbfade6a5bd7766ec4b7462d43f73c676bfaf908f41121b6b3241b26264015d SHA512 2cb8c032c5861fada8c4a71b6f6bc63fd6d9725701386d408f6e8cdb0d61cd9c32f023b755557375691de5914a47ba89f1dd66a9c46c124df1612d4a90456734
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild b/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
index 2e286d365ddf..0f880f9e30fe 100644
--- a/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
+++ b/app-eselect/eselect-audicle/eselect-audicle-1.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages the /usr/bin/audicle symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/audicle.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-awk/Manifest b/app-eselect/eselect-awk/Manifest
index 638d1a6fcfa8..f08ef2bcf986 100644
--- a/app-eselect/eselect-awk/Manifest
+++ b/app-eselect/eselect-awk/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-awk-0.2.tar.gz 1541 BLAKE2B 4ad07b02869672bef3c905a7417706344ccc11a9a46fcfe85cefa95881a4e727c11481bcefe17f96a77f1adc64d5ad3b1f2dfcc259bfcb8365d03ad68d88d365 SHA512 ef00ac8e8b962c17dc8094d64e5cbf44654a747cc648a5cf38346c3a90e0d685726693094ac265398b40d9d325600073ea2c4905b813f1e40fbfc7627930a5de
-EBUILD eselect-awk-0.2.ebuild 482 BLAKE2B 6f02b6a0292c2d91523df8c19e44679ba286bbcef598c4d8957fa201b905ce93623bb24085a11df33c7e019fda39e5b079363cafa8c7eec7259c99420d8f63c9 SHA512 8d62073cb864e497b73b81f77ab7e49bde79ec5bc7be0a825d4d4b4283398e273f2d494eea50140bf4bd17efa189f1308a514dca763842ea91a0ebaea4022af8
+EBUILD eselect-awk-0.2.ebuild 500 BLAKE2B 762600d4d68aa84ecfb6fd1a24edf0a9848c49d6ce8f32753878f216c8b773ae430740ce4c9c0da2d0565ef56414a305e467c8febbfb5aeda9a418bce209dff2 SHA512 7a83f3fedfdad715ba852aab9c53b24f50c257cf3818fc1ae0f31161b2861d99310eac7bdd8a1e3b93f1e8e46a87c1ba943a40da6cdef8c169b062f33937ff5f
 MISC metadata.xml 372 BLAKE2B 7d8462555c43bd348728c94113ea20312aca3d126874bfa2d2e8ffcff87df07ba9de74cc9d3c1f2d51b3779ed742a3c05d80549735406ef6f499e4343c468dd2 SHA512 dcd1c89d7c9e64f49ea4531c40482c7911e6b7f2873691d0dbb395ea179bf1a1be3bd4da9633e802e164ac837b5f3212844094c2a4773af7ab415e9005241b1e
diff --git a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
index 8c586b943228..7df2d673c595 100644
--- a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
+++ b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI="5"
 
 DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-blas/Manifest b/app-eselect/eselect-blas/Manifest
index 76045b935d8c..fe0fd6cf52e5 100644
--- a/app-eselect/eselect-blas/Manifest
+++ b/app-eselect/eselect-blas/Manifest
@@ -1,6 +1,6 @@
 AUX blas.eselect-0.1 350 BLAKE2B a21d38edf3188c2f26d384010d070048c0df19dcf87338ecfa1c08b9667ae97bb2875d6ae9958d797a416524de28540a4a95597c36d25df340bbe956ed95d342 SHA512 25f9250c3fae6d31871ca08260f1cd6597d9263fe51d3d696dd55c8648b604ea52b705dc5d128c7d9677cc1cd63f9aa1e31e124bdf52374eaf02f991db0045f2
 AUX blas.eselect-0.2 4952 BLAKE2B 14d60fdbae1dded65d6846f7e1fb6214994b7fce6d7d6340f9261e1e9081a46d21084c622ca2dcf2568dc07e0110b925ffc957e254d24850f741d943fa22f91c SHA512 a85f27c9808debaf9f47831c9d35194084bf0db818d3b8264532a7956b084633d9d462dfdda4a84f9a011721dbfc3abc419465e887a7ff9d17328f43a8f91790
 AUX blas.eselect.5 2368 BLAKE2B 8545c10ff73bafc4b9abdaab6410e0cba4d543ebcb7615f96357c72b63253c48158b08f85693005e8793982e86fa1e47c518d90a9302eb15cab6da84e584bf87 SHA512 46a423dc25d6f44769f92babcd8c98a8fa6f19bd64717fc894b9be1984e5f7ea4e00a458d9dd25724fd40377fa633b7f9c513878000a653b386f6be75532f531
-EBUILD eselect-blas-0.1.ebuild 680 BLAKE2B 472b60a5bcc80aef212cc971d25cd97c327c0246c53f68db8d86ee753aa3d0ac2e5bc633fbdd4afcfb4548a4fd2c37e062dc4fd3f8fe7511a1f504beb1ecb3b0 SHA512 fa26c3a8e80dbaed9f2dcbccd9ec988ea792e411311169222bf03a49d14705ad5195970e2f28cbd07b7935cb38501416c54b04ad4ead173d9197e2747e2157ee
-EBUILD eselect-blas-0.2.ebuild 654 BLAKE2B b175fbfc2bd4f1a3a6f8d8842925c2b1b032ae17dde91e7c496d8bbfd0c80065c4af3fafc4b85fea8d5f7a1607ad0f1295b2b737ff838d30966e29fc8ef0152a SHA512 9a280f75f5e55ac9f3701d2eda017d797594ae1c321a68b80f0dbe53d0c3089d69184d5fdbc429cedc88f9ea04c9846f5a1ff02c5a1ca8b3a0eb503f166e87ee
+EBUILD eselect-blas-0.1.ebuild 698 BLAKE2B d4cf629bddaa752ec411c92164e9c9e8cfaed07d4416e729720be62c3787d5894bb84349cb7c22e94afd2dcef8b7d4a444a4f3078147b44c8490a78274454a03 SHA512 8a29eaa6d2af7f3f79293ab177d9276bc92fe7a294c79f3b120af6ae2f371021530043f667e70e116c8ea5df0ce3773c995c95d095c38284fe0a0593e9490779
+EBUILD eselect-blas-0.2.ebuild 672 BLAKE2B 59564574ab783201f5cbb08a06eb86209de90bce82c5516dca51ed6cd0ff8ccbd50970f0eccf0f3bd798bfc076e88a161cf32f75e800d69e45726b76202ceac7 SHA512 32081adb20df05e62e2ff888b8278289dfae7293728fe686ef4fec770429e43a78d2e516173041c4e6e811f2cac6dfa76c22960b12196dcfc49cc8e2a89fa095
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
index e2a6d3014878..421bab2d63fb 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="BLAS module for eselect"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
index b8f325f48965..0d2658047d3a 100644
--- a/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
+++ b/app-eselect/eselect-blas/eselect-blas-0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="BLAS/CBLAS module for eselect"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-chuck/Manifest b/app-eselect/eselect-chuck/Manifest
index 565bdab2f494..9d83c013cff1 100644
--- a/app-eselect/eselect-chuck/Manifest
+++ b/app-eselect/eselect-chuck/Manifest
@@ -1,3 +1,3 @@
 DIST chuck.eselect-1.0.2.bz2 1261 BLAKE2B 9d8171538a8846a8b7ab1d932bd03234e4d2e2e99a5bf951e0cca95b5c5a20612e87f0b1eaa8997f9f7ef14aa5f4749264cd8ba52fc858681f29b060f6cadaf8 SHA512 a89f0ed00a44e81ff16b8668cfa23a0c794efc35bbcf5e2f06eb5fe9a56095948fa8ddf36a8a3371fc7ab255f539b563831b527717b58149d19dc0d3c32ca387
-EBUILD eselect-chuck-1.0.2.ebuild 508 BLAKE2B 4913e76f9c5cd37651ca7cc6c876f087587eae6ec4f129b0fa868764a82621e3e93ace7c73389fabeeb5ace1f54d1cb872ff488f7dbc71541b53a2818e18a52a SHA512 cf06fc9cb02fb0d11f0de08da3a4f001387ba13984e20e0659fa8ec0bf2d79f72196a4399b06edd128d05579d792af4ab287db2e17b8f5906d7c62a32ae7da88
+EBUILD eselect-chuck-1.0.2.ebuild 525 BLAKE2B dd546dfb1b23080876b5fa5f8b64462d5eaa87d03e8768a15c483c2f5d73a92ee40a3b744735e57d31668b4ec86b50d59c3ba408b756b7a61d0f20737b8749c5 SHA512 556a5a87f8bd8f43c22cd21829ded8b05f0a9e87aa5286a7a444aca825fef089f33a003623ca3569e146da54c436450f97045ed56e4e0adc633b9af798dbf475
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
index bdd29ed59d74..8eb63e4cd28d 100644
--- a/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
+++ b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages the /usr/bin/chuck symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/chuck.eselect-${PVR}.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-electron/Manifest b/app-eselect/eselect-electron/Manifest
index cc0eecb2810e..179225a02d8f 100644
--- a/app-eselect/eselect-electron/Manifest
+++ b/app-eselect/eselect-electron/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-electron-2.1.tar.gz 9658 BLAKE2B c5bcd58f5b82c3c9f4cb1e6cfb26665b7524b0d973a717437a18f5ee66fa5fe30bdd4e82673efc8199dc4a637a0b93ba537a62fc060d68b3bde7370138f815ce SHA512 6ba30b1e4d55e01cd9df3ab30038a45dba80c6191e676169e28b3f9881b4154db5edfe8569cafe77022b467e9383a291b1e6c49e296a8ed90582b2c6d1489c47
-EBUILD eselect-electron-2.1.ebuild 645 BLAKE2B 599b3807bc71a788436dc39773724453c229c186a411cdd043c9c9d3657cb125da1f1f5690aff3929004c3aca9ba8b55bdcb72b536cc5094abf86dc4e3ae08e5 SHA512 969b407f1be5d4c162d97a2c6d18f5de56cf34f5255e3d5b8d8a87a31dafcfc3b30e8935baedc87bcc2d77ab4dc639f7b5206dc95aeae1b4cf5f578b9d39d2f2
+EBUILD eselect-electron-2.1.ebuild 662 BLAKE2B 6895b5aa500ce12e163d5420ee7106d8bfccfc52464fbee80d6bbae13fac74503e70638bc4aa7874b44709f7bc6a65efd9a2b8aeb9b8a37995fb20b707bb46c5 SHA512 c3cdb745c17b0a2b75e1549ec784aebc352c5dea7da34fca56c827dde114e1b2878aa15180b589c2899aa2b89ad4debdced661c58137db764bc645a5aabd5c18
 MISC metadata.xml 254 BLAKE2B 628a9ae5d877a1cfc867e2a95d461fac653b17cf76bb83b22852821c68acc8ab8a0798019cc1508a0c314c746d3aca72ab0e565be5daa5f829fa0efa5e5d5116 SHA512 2b50869af59565463b4f65eefa16489d6073fcb19825004229cc9eadca26d7827644a23f2f031a34d68f18eaca988ea081f426ac3b70879f57878ddc87a8ffdd
diff --git a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
index ef176b52b9d4..7a1575a04a1f 100644
--- a/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
+++ b/app-eselect/eselect-electron/eselect-electron-2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Utility to select the default Electron slot"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://github.com/elprans/${PN}/archive/v${PV}.tar.gz -> eselect-electron-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-eselect/eselect-fontconfig/Manifest b/app-eselect/eselect-fontconfig/Manifest
index e81baab68973..9924a6e07912 100644
--- a/app-eselect/eselect-fontconfig/Manifest
+++ b/app-eselect/eselect-fontconfig/Manifest
@@ -1,3 +1,3 @@
 DIST fontconfig.eselect-1.1.bz2 1713 BLAKE2B 30af0471a52d7e2785e6e0e5847f51f3a11d0fb53eb800a5314e18dbb61694f1542d71c3e0f4ceccf82a396432113529b0fdb1b5fc6eba37550b27410565c61e SHA512 3b5978e20009754f09cd39e39771e8151cbb7bda60378cda718182b2df2c267a64af5ead220a079fbeeffb30586bc432bbc83b94e4f910205c4a29040cd2ccbd
-EBUILD eselect-fontconfig-1.1-r1.ebuild 731 BLAKE2B a25b1e21ad8dc169d5007c41ec2cb599862ab39d565151d32947405daa3dc734a75b2e20b707a71cf8dc76052ad6b8c2176032a2d1b2634e96b5f9ab4e8d77cf SHA512 35a9734dc7b07d223c83bfd27f6ea3098b1b66e07da3a82c011d3b3ccc3fb1b2d99d2b9d6579748ad01b0f89c11edf985879da543eb6a862cd22a9bee5ccbae0
+EBUILD eselect-fontconfig-1.1-r1.ebuild 749 BLAKE2B 2ed370b9ea03409b5c26bc549744708d4318acb1d34af3ccc4aaacf55a4c9a8fdd88b0f072aed9d3051839665861f1c4ddf92194da8aa3c487233ceae88e64c7 SHA512 e38e11c1d3ac43ecf44ebdbac8e7b14d7670c4e6f564fc4af3bb83d7ba9945a96c40488670b59152b3a633b0bbf61d0d4314baed2d89d47434a020370a40fa9e
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
index e86840a37b94..829afa99c50e 100644
--- a/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
+++ b/app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="An eselect module to manage /etc/fonts/conf.d symlinks"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/fontconfig.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-gnome-shell-extensions/Manifest b/app-eselect/eselect-gnome-shell-extensions/Manifest
index a2526ef9272f..850f5c9a3446 100644
--- a/app-eselect/eselect-gnome-shell-extensions/Manifest
+++ b/app-eselect/eselect-gnome-shell-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-gnome-shell-extensions-20180306.tar.xz 2676 BLAKE2B 846e282f99828ce795ba98557bb97301f576895c46e98ae0c079dfee8461146756c85573c1ce24e4ca3690d2ea8383dd988e40d3fe271a32b1987e027b47e3ae SHA512 2c0b9119219d8f3c54201f9865e1a9dd6889ccf26537802c591e89adb545f38aca13fa6b1119fe52d4183daf4adb6d2b1053b252d2756778b31626688092196d
-EBUILD eselect-gnome-shell-extensions-20180306.ebuild 1581 BLAKE2B 9355c0f010daa96bdf7d49702588fd2c9ef9375120434d64435b88deafe961329ec080f981a8b69ad081710c849140a1b24cce259495953e57f2edb4e5984d9f SHA512 242c02f1fb2d0f60d23b6336d4bce8e3750872cbfccf05b67eb9577f967c571ed0d2e5efabe1ae5aefdacc0ae8db84b4fa3779e6205d490c43802afb70b3bad2
+EBUILD eselect-gnome-shell-extensions-20180306.ebuild 1598 BLAKE2B f1e625d3bed6313570090c492f1f98fd628a748cc4cdc58ae7e7c4ae67db4017dbf33c9343ac54628db9f2e132171e2da63c5128a490466f7be21f28a7d6f38e SHA512 4f63433c1fef00bcded47cbe77e3f533297de4622fb69be8261cc3b7a7d631a2d57d67763d188b9ef3a510b948b1b151878ce5d4bdf99e587269ff437aa18e14
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
index ab57eba3daec..fddc8895b926 100644
--- a/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
+++ b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages system defaults for GNOME Shell extensions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~leio/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2+"
diff --git a/app-eselect/eselect-lapack/Manifest b/app-eselect/eselect-lapack/Manifest
index 1de7c5800c4d..cbebeee9ebde 100644
--- a/app-eselect/eselect-lapack/Manifest
+++ b/app-eselect/eselect-lapack/Manifest
@@ -1,4 +1,4 @@
 AUX lapack.eselect-0.2 4897 BLAKE2B 2f6dab00f59c0556dcff1d944b8042460521dbc099175552ec8a3aa272d0d16eae7b178747372b2c2e503c22c3cb0fbb2443967c964bf10daa667141d08ebeca SHA512 16c3fef58525de4a50a3daf14ff70b47c506246f22b71937c6aa2fb4131e9ef3bfe736844ce0f8b6b95275a89fbbbc1bd2f036496f3202693a52fcf2fb90cd13
 AUX lapack.eselect.5 2406 BLAKE2B 12da8dafd86ee178455de3476bfd6f4b2f24318244c4b387b46e45ea7a0b3ed4f33b05207f3f1201f17af4bea2a01798d6de0eb579db3503d27ed3d90f8edec7 SHA512 8659833ef7ff6e78d0592bb2ea34f04647fda68b388d60f7a39f0cd21dc2c5d198b369aae14f2d742d6c6a77cb3da9a46d1ea34a2ee8d403d5faab537dd7b940
-EBUILD eselect-lapack-0.2.ebuild 618 BLAKE2B 0ae4d75708e1f588dfdb1047fa1a81c06aa3658c9d2b0bae02d76fa2028f2150f86e00b1ccc21d53589dff66ffd819b31db66b81471dace563efd9370c47b1d8 SHA512 b8d607685b1434f5be82cf32e71cc6455d26706d3562d6b985289077f6c4c6a7da2ce9fdb9c4c8e96ca010c4c7b242cb24cd77395cc53be68615a914a4c86a3b
+EBUILD eselect-lapack-0.2.ebuild 636 BLAKE2B 323a49943cd4f8bcff18902f1601c3931d1e610e3b9e36109bf7f30ab0998a9a0f76886a1d139afc8e4e4be341ad32de525151830cbe5d958229005421645524 SHA512 0234223686ff82cbc53831656bb5844923f3d1a4bf6d42f0cda75296dbfd0826ae39c9de116c3e227feb15c9588cfbc0e00563aaaa42e40acb088cb9ec7f073c
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
index 3fb1a7a4cd88..0bfeacea131d 100644
--- a/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
+++ b/app-eselect/eselect-lapack/eselect-lapack-0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="LAPACK module for eselect"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-lua/Manifest b/app-eselect/eselect-lua/Manifest
index c7a20a3002ce..a5f6508a114a 100644
--- a/app-eselect/eselect-lua/Manifest
+++ b/app-eselect/eselect-lua/Manifest
@@ -1,3 +1,3 @@
 AUX lua.eselect-1 3217 BLAKE2B c3f2723afd8177878443bad6fbb51d16a0b90a9f439fe0f2dd150105488db540481136e2ff5f3d2a0b71bdcc88e95f6751a63c7c0a6bea4c32445f8871aa4163 SHA512 653aa84caf8a3706206099de78d8e1b2bbd41cda40dd7dac2b022c85a1988d864a80f490389db3fc2450555d301f965189df132a964a4425ee2bab6c2b7be220
-EBUILD eselect-lua-1.ebuild 594 BLAKE2B 4598f5d067e82378674f2ba993dd84f6a9588cb983452d15a771396c4dad0615cac9dfac8bde7eb2ff4ebf3ec82ab6522949d8d82b4bdb0e4a740ffdd06774b7 SHA512 d2b648459731eb49c9b7d125c411e64066b4c0fec11e236e2e827669cdd1452d6044f1531a492e92ccbdd2044050060f6ba6170d041e24428d568c5ee85129f1
+EBUILD eselect-lua-1.ebuild 612 BLAKE2B 58d5365a6f18f7acd20934317cc6cb069c1199ecb814d8c65daa8e71d2caee3259106760846b658842d929d9721d6154c9e4ef5f0739093b4f4a95ac3987b3ac SHA512 93e157cdda3b0dea9ff201800f108ff9e5e18b5837d3a38fd898d941ad165a2e8cea8e9ee3eb05205021239dc8ce8d2346a7cc338228e2f372bafc9b35a3003a
 MISC metadata.xml 318 BLAKE2B db169d8920d5070857d050647cf7d131f17039316e52b4032d573a7f9863af9ea6741bb31fc0a25c78d63863a27a4643131ea8aaae227bdc5bacbcbae6d41fd4 SHA512 48b3aa36f683baa2dca029f1d8ac46a951860f7d67c55d99c330acc09f1b407da2b640dfdf045ef497f254f83b493f0de36c5bca9309e39af4a8d4376af82f92
diff --git a/app-eselect/eselect-lua/eselect-lua-1.ebuild b/app-eselect/eselect-lua/eselect-lua-1.ebuild
index afd48782bd6f..fceb0c5efacd 100644
--- a/app-eselect/eselect-lua/eselect-lua-1.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Lua eselect module"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-eselect/eselect-miniaudicle/Manifest b/app-eselect/eselect-miniaudicle/Manifest
index 9b8e711e8d1e..e7e2f3ff8f00 100644
--- a/app-eselect/eselect-miniaudicle/Manifest
+++ b/app-eselect/eselect-miniaudicle/Manifest
@@ -1,4 +1,4 @@
 AUX miniaudicle-1.0.1_list.patch 609 BLAKE2B 62ddbbe8e038abc5f0052a92bd87b76d2360ce4cc66c7fb103fe70070ec88734d8ca3123eecba03c4e29e63057696bad8df4be6ad1748eeb27f5aeb20d43f375 SHA512 891564338f5e8abb27168cf73636c68b9ff2fcd2a4397c59386686d77196df7df5f51c48c09d1472ff1fa6805c75768ad304cba7180e1b9912ba8a262111e2d0
 DIST miniaudicle.eselect-1.0.1.bz2 1284 BLAKE2B a38ae814fd968a6c00d44fe2e178a33f06664ac7ac090a8ed57a8ddac67dcc07bb76360ddcd0dbcac8bda600c12c32e815065a9f7b2c96929edbdb517548c912 SHA512 259a9e566fcdaae04ed845c1fc797faba422dd562da3721d6d07c1b6ea6de856f7e9fe4dfe5c6895b464231c3e9dfa7fa8718a49085fc3e8f79b9e4c4c340085
-EBUILD eselect-miniaudicle-1.0.1-r2.ebuild 631 BLAKE2B 68af7bf03cbfc146c498059284303ff6c779827970e0281fd0564c3bde9a565284c0197650c76c3cdd7b2439f4d4ebdf767164a6d53e3caeef1d4e46569f390b SHA512 1b0c527cd639630c251026322bb6f15c06f98e02f0839d77e39516b07a2f0e7f102fdf69a66ee8bef14e0722a34e91b0fed2e4065bc774f30ad56a0dcd436973
+EBUILD eselect-miniaudicle-1.0.1-r2.ebuild 648 BLAKE2B cac11c851c10528a287cbbba1b52e3a1fd5b04f950037484972f0aec4c81f573aa81dd2918998d691ef7bcf9754019ecc13d3e7268c195f580df8159269ce04b SHA512 1137fe8dc3317c4f52adf4e16c0547a90d4bec217dc82c6e3df78d46d37c8628655fe20d9ccaf7f7941565d8c08302ef2d4de310c7749dc13ca80b9af558d288
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
index d97143730b2f..f4c055924a37 100644
--- a/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
+++ b/app-eselect/eselect-miniaudicle/eselect-miniaudicle-1.0.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages the /usr/bin/miniAudicle symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/miniaudicle.eselect-${PV}.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-oodict/Manifest b/app-eselect/eselect-oodict/Manifest
index 891436202337..ce1c7d864ce8 100644
--- a/app-eselect/eselect-oodict/Manifest
+++ b/app-eselect/eselect-oodict/Manifest
@@ -1,3 +1,3 @@
 DIST oodict.eselect-20100228.bz2 3802 BLAKE2B d545d42ae99a25a5d66d573a1434df84cdb56cdf61c155db5017a180ab8beef806c38cb4061cbde872455e029cdd9f65f131eaf7920c138dbbda168dd3344e0f SHA512 7aa1e3081b9629ea5932dc679bed7956887cc7f3dcb7e6399d42f8d3ed30b565a1487eef15293f4046b38b6bf8a7844e6d7050e01337550044977366a795f753
-EBUILD eselect-oodict-20100228.ebuild 548 BLAKE2B 3e700b732fd392221bea4f1ce025020d6e4715ace9ab50987195e33934c344c76f5e043c38901ea7859251e9efc9b3264b8257585d1ad54353a19aa0ac617966 SHA512 36bae4cdd5f7bb5f56313e9d0ca09b9ae7ef8f635662807f792967aee58e495004cc707129090527e019619f690ffe6f0ccbedbeb72f3199dae1f8862b37b6f3
+EBUILD eselect-oodict-20100228.ebuild 565 BLAKE2B 0b8ec4c05be1e46d4834afcb5be0841f2b65d7846bd3e644300164bb4fad3689e9b270adfd3818bea3ddcc799ce02975217122b583c233fefff4e28665361887 SHA512 81314bd25124a79e34beee8870689ccfb2e94aaa8fdad43c814efb23bc23148ce9e79b99b4b42a5a2b65f52c9963dfef0e39734ca20b499d0200e40aec068340
 MISC metadata.xml 354 BLAKE2B 1523bc23bf9b7f945abaa4b568fdddb1561af94ed0d70f5abe1bb4428b3d34287ffca5805f7a9e5487b7ead890bf9c377d2f71d04280baff0e894b88b3c8cc87 SHA512 0b5d112a649f59f7e9fd15e91d67e6b7f837bf34c9870d96e963508a56218c2498aac001f9d5ccc4af9328be9ea4de2a2dd6e042c347dc7c3d69697e2ea6fbb1
diff --git a/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild b/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
index 22f01dfeeacd..76b287ec4c68 100644
--- a/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
+++ b/app-eselect/eselect-oodict/eselect-oodict-20100228.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages configuration of dictionaries for OpenOffice.Org"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 SRC_URI="mirror://gentoo/oodict.eselect-${PVR}.bz2"
 
diff --git a/app-eselect/eselect-opencl/Manifest b/app-eselect/eselect-opencl/Manifest
index e2976307cdc6..e24646f901fd 100644
--- a/app-eselect/eselect-opencl/Manifest
+++ b/app-eselect/eselect-opencl/Manifest
@@ -5,5 +5,5 @@ DIST opencl11.zip 25496 BLAKE2B abd8aefddb31408e71e36b8610cde7b568debca99e99f310
 DIST opencl12.zip 33311 BLAKE2B 0f0c62856162ec1cfd42c1b53979079e0f8fd389fd2b3e05676e029705c29a65e3b84d6bc822aaedd9d15959bc07adfbd444aafb827f09f12b4dd625e868c902 SHA512 af7bb5865372a900a5b79086a54709abc99f6a3afe105adb6fdd276e30ef5c5be576421c206768e0b19e82f83e33727b6f246dfc71a0ee1d847e52d6db6130a8
 DIST opencl20.zip 34892 BLAKE2B a71a00a99825ebdde2ddba0c23de3af8880fb44ac235f399ed58936c9193ae79429219661daccac2d7d6daeb87c514308ec6b782db33899e60a2ae912d0876f7 SHA512 e4c6f68db91e0946de5a0f2aecd8fbc152f316350088a386cad9de37b377b6e8c362e93e3c2b09b3dce5f4659c753764ec8906b50a86a5107d2c29e6ffcfe71f
 DIST opencl21.zip 35514 BLAKE2B 21d23d9104712df47f7734b3c3b6f1669c88b5c75ca21fe6ad2ef21db83620c0585cc0b8d567d9fd7a755d579e7d291cf20577d025f857339ad191a1d65ee461 SHA512 2b6eafc26ff522407f06509197f5eefbb321806ac3f65bb881db4532da6c0e00b9c397468d55881578b116a1c8d05a0599f9f5727f62eb545394a2cecf5d95c0
-EBUILD eselect-opencl-1.1.0-r4.ebuild 2311 BLAKE2B dd9cc48f633496ea020337c24b8e641085e3c984621ba6b065bc95153f3c0f8453f46ce65da607d3608e2987004359f3c704d7913f8a922e2e137511628a8c8e SHA512 f2c8979fd53b1c2c11b9903ce32ed85d6ef9affd55d93f24e124939e9aa62f51bb65eb347ee7a3997297504b3fee73b0d5feeb6cdf88545b5c3547df1d96136b
+EBUILD eselect-opencl-1.1.0-r4.ebuild 2328 BLAKE2B 5d97e972bc995867acbaa05b4bbccaa5afaa1fd9900005e70f2bdb6b09d80796d0d058b93dbdf43930fa211dc369dbbadc6b22bc8418436ecfab1e12aaa2d623 SHA512 5599b5b3596fa24c23d885331da8dd44547da74dce37c087aafad978cdf8aeb2b999dac68984ebb35f93664bc149bea0ad6b7d8df63345b9c3a96c5171ca8697
 MISC metadata.xml 411 BLAKE2B 8e2f9f95305134a1b09c18ced983fa2449d0c79a7b3d16993e28aeb70c4712d3f1650e85f40abd50a78f833af3b4f81ba4beccd9ffe91c739fcf9717bd02495f SHA512 7a2cbbea3ab5fbc33c2a8196c50949f5e7a207525d371447c1b44847081cd8a849b7e25034c759e738e9b3d252f13f07d2f730f38e5ce168da604c5fc4907c09
diff --git a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
index 30461bcff9eb..4e7eb9947256 100644
--- a/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
+++ b/app-eselect/eselect-opencl/eselect-opencl-1.1.0-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit multilib
 
 DESCRIPTION="Utility to change the OpenCL implementation being used"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 # Source:
 # http://www.khronos.org/registry/cl/api/${CL_ABI}/opencl.h
diff --git a/app-eselect/eselect-postgresql/Manifest b/app-eselect/eselect-postgresql/Manifest
index d54a1d2d4fb8..2ed70c228418 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-postgresql-2.4.tbz2 4518 BLAKE2B 726c59f0511b2e27493cceb9b9a7b3c58e7d7bb0cba2fef705eef9190ef384c3116c42079566d8761192b9c288ef57c550f659a0398ba90fa069f6be335550ff SHA512 4eed12905e97a45420a299cc9232be62a1ac88257a047d9d16ef7d8c8a0e0ddbd4177415797defe352cc82cd87b7777907a51a8cadfdb28064faa78a28e0099d
-EBUILD eselect-postgresql-2.4.ebuild 987 BLAKE2B 1a2c47976287ad78e2216ece61bba06a8f2de2b9d0595c2234794880cea6f25aa1b3861053ad055896b8fabfb9cfba95a187726cafa0c3c215d5e5a3ed67577c SHA512 11ac5b4be0599a51cf68aff02ac9de803db34e02ebf8e50b831207df4400ad97ab43ba0485cd450a6f35e68240f5b1ee15b6757bab8139cd1647ed92cd2b00c4
+EBUILD eselect-postgresql-2.4.ebuild 1004 BLAKE2B 995785c7d609866abf81d7d8760e4545cefbc73af083eb20d0c070d0d9b5f3cccf59891a1fd171c877951bbe7f6290e8db30581905057fd406a09862d51981e2 SHA512 8aae0c4d720d5ee263b8444a4c15dc82eb8d2ad5e593a3a404a2acd62f292161798c79438b9eb6aa0bab5e0d0f266135d3a7cad9eee30da7f5941641d160c578
 MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
index a099d83226c4..9735228babca 100644
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Utility to select the default PostgreSQL slot"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-eselect/eselect-ruby/Manifest b/app-eselect/eselect-ruby/Manifest
index 773198bf00d0..f398c13daa99 100644
--- a/app-eselect/eselect-ruby/Manifest
+++ b/app-eselect/eselect-ruby/Manifest
@@ -1,7 +1,7 @@
 DIST ruby.eselect-20170723.xz 1972 BLAKE2B 338f9fbb81ebe3c0fdcab77ab12cabd6aa334ac3bf64352cd801c8088d7c3ac4c452e647addc98497d104df24f7934d8cdd8b0008e4f52fb27306a80411f793b SHA512 9c0614bc7e2ce9811466f257035d74622a96db8d44aa0908414fbac7d4142c34350257b08ace7371901e46cc0c9a38c3f2acae3caea4fb354ccc37b8c919b48f
 DIST ruby.eselect-20190121.xz 2000 BLAKE2B d04f9230e428526fb7ac7f6c274d7ac1b47af9f9bbb33cbfcec72cccdbe553db73a320e8a86190b88b4f9ee9c27fe0e5dabce1e1c5edfd4373d9a4bfcb457957 SHA512 aca2c46e39d3e0806a0ab942e8afe755992e5df98c50f4f2e012c93b8d6339e2a8400376e73187744a3d42a77725e03eed48b300f7d4d2da546a434184988f52
 DIST ruby.eselect-20191222.xz 2000 BLAKE2B ec89dca67730ff3c6acba8906f9436866b45c3b7fc4c29be6614eddf7e5fbc1f9f9ff0bfe3ddfdc7309d242a5da6f8913cae738895fd6abcc39dc336f609d066 SHA512 72c3e3fe8c82474de25dbde9f1f63739e57be3e4e61a1f86e57c9dcaf92d72fd8d17263f8a326af771f64395febc82f5eb29e86b4b2a44af029b6c1fc41e43d2
-EBUILD eselect-ruby-20170723.ebuild 666 BLAKE2B 4a19ade12c77ccdfac54ba786ce59b9a438ca4d9ed13d168f1074edaadae385c4520a1a57ddcbfd58d46f320bf3ab48f587bc229ab2e6c5581161b4da1311d26 SHA512 60df0a36aa7642715e81aceb01681278aeabdb6ff97c9267bc03d321dc23bbc96361a84466798761fddd35675ed0e3d7ad8fffeea7bc26a5bd518bda28bc3577
-EBUILD eselect-ruby-20190121.ebuild 668 BLAKE2B ca82b777b92ea5bcf6c234130c8c15803d802d41eb4875ec6b15d81aba8a4e66ff8dada4e535a5d39b7efc1c4db29063bc74001b3a01f15460196ab5a4b92084 SHA512 ce8909e9d44397d9eb4879a638015ec12d31bd9cfe2312fb4ea4cde29e5a4aded160c8b2a10fbd7b7f578f2382d7ade9fc946a92baef8620b748d78d01da515e
+EBUILD eselect-ruby-20170723.ebuild 684 BLAKE2B 59fc57989c1da83ac210f1550cf9cec29b16900088435c5abd242571bfbac783d45abe28896ed7edb3bb3cbaf01428fa28e864cfa0dc8bc1a23f05f85fd729ee SHA512 150197fe1e57903cff7b2de237f61eef69cdff98e038cb36c8995f1deea81ad39717261053af35ad2458fbf427092ea695ad49dd179e5ebb8467cec9184e6d56
+EBUILD eselect-ruby-20190121.ebuild 686 BLAKE2B f23e06b941feae6e7115d6ab48cd2f276baceca67231ad7c6ca1e0a33b78ca1aa1af51301c3e38517e255042390c9cc18f3510101a8c940b8204e7e09954749b SHA512 134df76d3e3a9efd16cdbd8c1a463f1465318789807f83672055001c59b83461c9a44efb78af803d3855c73edfd034dc4a746db859ae7737cb0d946c535756fd
 EBUILD eselect-ruby-20191222.ebuild 686 BLAKE2B 13a4815ca6b6fcfdbf16dfbf0b7e614ca5d1958e08c6d03f4a688f9adb2da8f41e47d50302b0dde3fe4e6b3b45e6c917badcbdd66e395508b9877a77f756396a SHA512 1bdc0cc341d1202f09f757976b86cba9a8e0aff9d1955e05e2d372f3a1b8cda1c403d959089595742913fd47f0d02962fa1a98b941e15821b6c4914465a3a9f9
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
index 93aea5463b32..221dda31124a 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages multiple Ruby versions"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
index a0f2a1ed1ee2..e3a2aca8f500 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages multiple Ruby versions"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-scala/Manifest b/app-eselect/eselect-scala/Manifest
index 9e67e8774684..8f8e381b242e 100644
--- a/app-eselect/eselect-scala/Manifest
+++ b/app-eselect/eselect-scala/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-scala-0.1.1.tar.gz 1781 BLAKE2B 42f4723c33c7f44345d545c3d2503fc32b433afa8add4488d4a48b7f7a9d0250040a8768c3d4c7a3572d8d386c4820779d0c9bca975ca5cd92a820bb579b8c79 SHA512 2de1b6067c385d1fb0fa0c708467ebd5d491c3ee532888ad497008fe7f78a8f4be9843af444d71107e05c111579ed83015094c3eca5d6f2c338855af4b722363
-EBUILD eselect-scala-0.1.1.ebuild 462 BLAKE2B c92727e5692a005a9a9784834a72baad7b3327c79e2bec574f8190345320e714702806f285fdf55a4d7ca48da969e6966e4a41b8d57ddf03024649c72657cc10 SHA512 978041c6cad13d16d569009cdb62084b46d79c3fcc16be15983ea70903b5227234e6417312e372fd89febca1176a061558a87872c5cf4dd3bfcf1dabac3f9346
+EBUILD eselect-scala-0.1.1.ebuild 480 BLAKE2B ee7760d74e51d369d3e1d4e163f2cdee7de4aa5a3d7bf041985a550ec65e1a2587fd2e1b78157950dbd0a6a2a1a4c911b28c65efcc9fb552681a09081fc822eb SHA512 945cd3e72a906c798f878f00ba4910e9cc1b888dce926dd12440c7ec51330f5c14a23d85ac101c7797639c41fef90db71f7b4477e89cc468a735d2a8341262b2
 MISC metadata.xml 310 BLAKE2B 0b539883678be15dc41458c5c63d3d3228e56fcd1264dd8eb8767efa4f8623fd8d6fe5f52f40c50d31e62805cb46622abe3acd599e0114bfe66ef21f8f4de453 SHA512 0fc994f744babc8dabfce3c5ca8c9fdcef3c164cf481c8e317468615e34089f605772b9216ed2ecf0dbd80c1309b7da9e48c617514137cbb9b8cec44a1fbba4c
diff --git a/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
index 28a48e34aca6..7a9e85ae5573 100644
--- a/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
+++ b/app-eselect/eselect-scala/eselect-scala-0.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Manages multiple Scala versions"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~gienah/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-sndpeek/Manifest b/app-eselect/eselect-sndpeek/Manifest
index d040bdba30eb..70e8573cfeb0 100644
--- a/app-eselect/eselect-sndpeek/Manifest
+++ b/app-eselect/eselect-sndpeek/Manifest
@@ -1,3 +1,3 @@
 DIST sndpeek.eselect-1.0.1.bz2 1263 BLAKE2B ab2ed4019fd3bd991803375dd6219e4ca8bcade739c435beaf034d701324db52d12b0967821716351455f39d181657d6153d889cc313c2a3761994afbd79194d SHA512 39cc065d4fbe408db9c406d84a0ebf4a69a9c50f440f26b714b5f154bf7b5de497df4226434d60c0b1e4e073bbe3a0ca96c3bd574148772a4912e2fc9c9c6b5b
-EBUILD eselect-sndpeek-1.0.1.ebuild 480 BLAKE2B 324369818e822d79413350bcb1fc7b4ce9257469969a067e87989cd545a3c47046a2eb9564e4f05cf20b326ddeff1f390943ecb989a8b6ca0223183d3ce00e40 SHA512 e0c7c4058f5162753da6a5e5826a373e5007243a0de46fe6948849e8b2ec2f64b9da986edd5f66f016c87819d6cc61128ead193870f060f6adb35b033747bea7
+EBUILD eselect-sndpeek-1.0.1.ebuild 497 BLAKE2B 31d07ebe006b2da4143c9f29fa7b5cb5a9f2c8068ea25c30d5822bdff1fbb15b898d3ad15f9fdac9b287ba2705454dd2503e804aa829d061eaca6ef5fb39424b SHA512 07bda285872a1813cdb7cb46a7453aaf3d4d1839865610cdd83dbe532329e5adea93c76f0adca2155128fe06011d7c20926654777ef9acdb7bdddbd2eee6fa23
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
index 7e8d5ff92fe3..0eaf9eca8588 100644
--- a/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
+++ b/app-eselect/eselect-sndpeek/eselect-sndpeek-1.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages the /usr/bin/sndpeek symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/sndpeek.eselect-${PVR}.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-timezone/Manifest b/app-eselect/eselect-timezone/Manifest
index 906272a54183..3db422deba31 100644
--- a/app-eselect/eselect-timezone/Manifest
+++ b/app-eselect/eselect-timezone/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-timezone-0.2.tar.xz 1400 BLAKE2B 22d19159629dda57f7372ae31283693d5993c17096c1f0057060ecbb731274bb856c292b0b1dd91751f17a0226502ddf942bafa0c2fdc544d1ed1480cc8193c9 SHA512 757dc88b94fde547af2026c0759c9109f803f7144e843be9d79e9eef0bcbe8f2273a5585448dc1d810d89f4f4be7f6d8974e7dc35f6dc8069f8090775bdf8b52
-EBUILD eselect-timezone-0.2.ebuild 398 BLAKE2B 72a260ede782cb0e6412394b54f0eb227b6921f8a25d0b40327c1526d465e3d35c2a663c44ddd2915fde1953859c38102b1fde2a32d87c029ce2481b03d39380 SHA512 a8ef0d6c4c34b595643504bae53adfcdde46ad2a7ffe308770e1054717e4c125f16d0612dfd0787c1a1e2334d0c62055562a6c71b62ab88ac59dbb4f8afa7273
+EBUILD eselect-timezone-0.2.ebuild 416 BLAKE2B 2fe5158e7b6707eff20a9e249426831797d969b26359a6d0124a21e7e4315d8684beb93ada1633f150e27528af15a8062519220b557a6e2d9bd3a3bb6809ecd0 SHA512 0491fd21edf3232e5e81d039f416ade8f8a65c6e48aaf89e44666152ff61404160967f83df061a8deccb704656fe9cc4a102ba378f786c84cb093d41f0d90684
 MISC metadata.xml 253 BLAKE2B 58dd329781b98af52e191fbc6b1de24c80612678e467d126dc77ff0559c12eb8fb48546ef7a240f64fadbe289039adfb87dd2b0c8ae01bd9210bac81b2b385bf SHA512 a931cf8d295191e246377a75882955524e9e3a86aeacf4a5067c0025b6a03d608cdfa6763cfc53ba4a00cd6ee4b7db42d1a042dda5e74e578047ad42ad92be50
diff --git a/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild b/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
index 5367c3d5ba48..5c3cc37253a8 100644
--- a/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
+++ b/app-eselect/eselect-timezone/eselect-timezone-0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages timezone selection"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest
index 834780694584..00a024a9f2c5 100644
--- a/app-eselect/eselect-timidity/Manifest
+++ b/app-eselect/eselect-timidity/Manifest
@@ -1,3 +1,3 @@
 DIST timidity.eselect-20110513.bz2 1689 BLAKE2B 80d99984f3407a8130969626e12212f4c62f1587ef3ed4a0b953d480286f87fa32c57cf84a5794d8effef4690bdfc1d8b7c9c0031919b61ba4e123544bd2df5f SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe
-EBUILD eselect-timidity-20110513.ebuild 520 BLAKE2B 4b1a66b19249adcefecc4f085c03b3eb474de23061b1f7da0a4216d6c3a963fa58f97f7dc23d375a472a894f9f03680e66bc40e500947615be1039ec6c5e1e35 SHA512 eb2308b232fced852ddd46e21d62e984a6b7d7931a9848294f56623baf3c6e5854ee6f7d4c37c5e4cf1dd0b203ce7b67a9462b22d316303b1967112f0bd96173
+EBUILD eselect-timidity-20110513.ebuild 537 BLAKE2B ea16803c448b082b3532bf0542db43b852ef358651d8302eda84d596c94c32c549622cc696cee90a998e76a392ec6276072db3c4feac415efba6756f7ff9891e SHA512 2cd56d7cce639a0eac16a14d6b0823de94e78d62d3a8c5e4c3a956c6f64a1225ee9dac2a46486b5a0576b0e13cc19ab1322768970cbd31fe6050520571bd45d9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
index 9a6f8043a50e..7008ad0b47f7 100644
--- a/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
+++ b/app-eselect/eselect-timidity/eselect-timidity-20110513.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Manages configuration of TiMidity++ patchsets"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest
index 3a8bcb0f444e..d90f3fe9279c 100644
--- a/app-eselect/eselect-vi/Manifest
+++ b/app-eselect/eselect-vi/Manifest
@@ -1,4 +1,4 @@
 DIST eselect-vi-1.1.9.tar.xz 6236 BLAKE2B 09853ac48d1f904de5602244306ab35cb0597d14ddfbb1865ee54adf53bf190df6574cb5d8c27e3e41b12768c79f10ed1482b7ffb66015375b0214d32d17dbe3 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f
-EBUILD eselect-vi-1.1.9-r1.ebuild 609 BLAKE2B 996d05ecd05bc5e1d2e7ffa504e311f918243c6007d8d9aa2875ae256af6195695620c6e59739fbced3e282e293ffb6c07304d6ba901478a31a666af29b6ddb9 SHA512 ea6eef27ca7e412637b51a735234ee405154bc8ccae9643abafbf7b42ca431e2a1dafe83e183a594b657d23d6efbbc98e1d801a844168073d3b3506535fc949e
-EBUILD eselect-vi-1.1.9.ebuild 611 BLAKE2B 282769274d84cee86e57514b68387d8c274084dd62c06df8aeb6ad4712f27a2e55e7e44522f387b12644ba8a52610234fcbc75e32d399d1f9ac575e3ef754737 SHA512 e429d3f4645b10753f48cb556e35e86db51e158a435055a9e8f70ce32969719b8a8cfed4c3ad951ecdb8ed18ef822a33c18c9a7028eaa363061520d184f4b6fc
+EBUILD eselect-vi-1.1.9-r1.ebuild 626 BLAKE2B 37e1e5ddeda01514b592995430502b0efe911e4eaf42e9db351f5161d9763276471db51a0565af5cb2580f8e14eafc05f864724690d25ff6bcef395242d83056 SHA512 f1f940f5ac24421487acd5de590aac29f4d0bba96720e111cc6315249b84e3bc9bdea1cea3830dc345eb7449c07d3e69662cfbbf820650a526a83b6eb3480f92
+EBUILD eselect-vi-1.1.9.ebuild 628 BLAKE2B 28efd74d44263b7a63acd76746a6b21af840363ef705f59ff716ea38b2b76ad791665c359d786ba818ffca601b1e34abaaa8e744d3d0d259e4365972038d1daa SHA512 da0b2f68cca2aae40df0ac62398144ee486b23696513e7986826273d65d6c34879561fba2c341ad73f4571b6538e0f5c0d49d5dccda732fcd238efa08a73a1c8
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
index d511fcd6b8f7..dbc480f8b908 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
index 12ceb7e34b39..afcfaaaf779a 100644
--- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
+++ b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Manages the /usr/bin/vi symlink"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-eselect/eselect-wine/Manifest b/app-eselect/eselect-wine/Manifest
index 384c27753889..7387c495a577 100644
--- a/app-eselect/eselect-wine/Manifest
+++ b/app-eselect/eselect-wine/Manifest
@@ -1,3 +1,3 @@
 DIST wine.eselect-1.2.2 19370 BLAKE2B 957eb84b7ccb24d12eba876a538f0420ab05506c87086b65c27326c80da9adcfbff032c7ecc7b5763012c6d72cc53f643f0d3ffe02687adb103517dedfad2f0e SHA512 6380e904ca824b1fe45cf651637f1cfe931f0c7519db49cb0794826ebbc8bdebc480fe7eb16601dc37123b44ea2d10aec49aa9fe622cad3e67ffb0f730292614
-EBUILD eselect-wine-1.2.2.ebuild 1276 BLAKE2B 53d2f59b9f1eb86f802a9ec83348cf2541403838f0b433197974905f2ee1480b783790e0d7767d74ed1053ca4880544093c3b2769d480b39035ed26054c4f424 SHA512 8d57e97c413f4c71302c7579a709861161115f45b7ed8c8169b31f4bc9adf50418f238fa1fa75112479997f0dd512c9bf2519fa1e7ccf02fbf8a10d4088a4929
+EBUILD eselect-wine-1.2.2.ebuild 1274 BLAKE2B 10d741bf72a2bf07230492671565048efbaac78e8e0f0c1dea2c21501660f7766fa6942f9b080e9eb08727adae753e7378225d26bdd8f729a19b7c36be917c14 SHA512 e7f19298ad4a7e089efebdadf04760594331ad2face6258b5df4a673a726903a579aebb0b3806cf113af19928d62867277cfc94b3bd1af55fbffb63ed4769a01
 MISC metadata.xml 435 BLAKE2B 7f91f4c92092f4d3dc799dda56a3b8ec46a40adabd3161624fedab9bc66b8b2f61ef376338cc0c467b1f7d9b580c463b83f9623d23360525b16f28d65f8c5ac4 SHA512 a0be824eab346069bdca0b7f1856798b3469cc72829cb0850bec061e7679f9c68a3adf3331c4e5aedb3ac9253436997b9b6e75c79966c32abbf9048e16086e17
diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
index b9ffbc92c0d4..2036ec1a6c56 100644
--- a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
@@ -30,7 +30,7 @@ pkg_postinst() {
 	# In /usr/include this breaks gcc build.
 	# https://bugs.gentoo.org/434180
 	if [[ $(readlink "${EROOT%/}"/usr/include/wine) == //* ]]; then
-		ewarn "Leading double slash in ${EPREFIX%/}/usr/include/wine symlink detected."
+		ewarn "Leading double slash in ${EPREFIX}/usr/include/wine symlink detected."
 		ewarn "Re-setting wine symlinks..."
 		eselect wine update --if-unset
 	fi
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
index f264ca98432c..861604e1115a 100644
--- a/app-eselect/eselect-wxwidgets/Manifest
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-wxwidgets-20140423.tar.xz 6792 BLAKE2B ee94e98b9f2473b8e8356ecab483224c027f26a170e02fa8b4e94f18227abb2f1a8f2acd6c5b33dcbf22d4cdadb0421ae487890f9501410559510f3b28ded6c0 SHA512 0d83e0b6979803c8a02c20ac33a42c91fd8d350c095e26704a80c1913309f0e7d741cc466ab22e0a6ce4773deab21ca80756299a12a83d441ded968531003d0e
 DIST eselect-wxwidgets-20180529.tar.xz 2380 BLAKE2B 2f5d5e79b9cd85442b0aa0d1453d84651308d4c33711b919802b383bb98865b615a9afd0493b4d34232c3d986e68246e35943d96a31e25a3fb2778b6483ec764 SHA512 d91e87f23c7feb807ed75fcfd363b61fadd8c305e3aa82c5e3dfa3d9fbc2c18a8b7e6404bcac9ebd6c34269406712d453e5bd877509f26f3648cb864df36e281
 DIST eselect-wxwidgets-files.tar.bz2 9126 BLAKE2B 47ec94aec721d325fc483ece28e84b48c35b103078415447b6e79e68ab44af9356955c960b9464713396f4cbbf663522e5a4493516414641aa5b99e7cdca0ac8 SHA512 c5aba3bf4bbb891534e0c7a444da6cb90a947dab407e436a1eccd13ddb33251816ce95b5fb6826aa9a64ec2b3d9be09c9852859597b0b8ce91cbaf0f6ed6da5e
-EBUILD eselect-wxwidgets-20140423.ebuild 1474 BLAKE2B 06104edc039e56759a31ef5d1b4dfe28855f1ba3990fca12d08a26b671a156c1363ddaa00ab7bcb39f46cfce70365872dec03a675a76e625150272c4c5aa5392 SHA512 9046df2831b1c84ac843a79a255c91ff7a91d159506e1d040b61c9485e69993ae77590670d4f9be6229893abff7f22670b9a6ec7312aaf93ea4d1818693e4d68
-EBUILD eselect-wxwidgets-20180529.ebuild 1475 BLAKE2B 6d64849029dc5ba35992ae5e7732a6cebab204d344c1a141e242ff06f234b6b0123b8f25783dce73175946a2f042afae102010d183bbf68e92a598688386544a SHA512 f6c5416b3230541275dd6198e715939b3be478a3f893f51ea4bbab95a812e8a7ebffcdce83085d57e387376205b30898d7463fbb3f394ed59dafc02f6226a9af
+EBUILD eselect-wxwidgets-20140423.ebuild 1492 BLAKE2B b5aa07b9c850430e3dc0d275b9e41908eb41529a5aad88180e84ef43acfee89185a4bbf016308e6cba41cd4821acd734f1c6a9593c4a7bdb8694c1e20c00f29f SHA512 f020e1c2fa0ce4b594336d7f9cd990bf58ce096a351657da125ac2f903e5a926f2194b90fc45c3d60ab8eadcb53a903dfef759b2a3049435ac8df6147f7a8f65
+EBUILD eselect-wxwidgets-20180529.ebuild 1493 BLAKE2B b58d0acf001ae357b48e4537c0505fb6c26b574e6e7587d9ae73021560fb8e49cdc6fb9500424dcd6b709c348927b9b1e54fdb7af54258f68514acaa969167f8 SHA512 d281a1dcb5f457d36e9e954e4f6eb613365f81c67f244b22006ab5948d2a12696fe606742bcba719d42464e3f93f133245895dfcc068db0cf3b726202bbeff1f
 MISC metadata.xml 261 BLAKE2B 6a1c213fc272c8d1e93e73a8aba2f3fffce3525a0b505f56a0ebc185d0000d2f472480842e2e588a59209047f3da0830cb0e59835ac738b548bd8a74dae3c176 SHA512 f7ad013dd5f01aaedd4528f98ba9a4b4b44d353502df3438a8b513dd2ee7af1e24328c34187e156370efb550c401b81175cccc7a7643ea6a5a83766d68a05221
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
index f873279cdf0f..ace62783c649 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
@@ -8,7 +8,7 @@ inherit multilib
 WXWRAP_VER=1.4
 
 DESCRIPTION="Eselect module and wrappers for wxWidgets"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~junghans/dist/${P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/${PN}-files.tar.bz2"
 
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
index a9e9289104fd..517a5845d4c1 100644
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
@@ -8,7 +8,7 @@ inherit multilib
 WXWRAP_VER=1.4
 
 DESCRIPTION="Eselect module and wrappers for wxWidgets"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
 	https://dev.gentoo.org/~mgorny/dist/${PN}-files.tar.bz2"
 
diff --git a/app-eselect/eselect-xvmc/Manifest b/app-eselect/eselect-xvmc/Manifest
index f9ab2fcfa529..789e680d22db 100644
--- a/app-eselect/eselect-xvmc/Manifest
+++ b/app-eselect/eselect-xvmc/Manifest
@@ -1,3 +1,3 @@
 AUX eselect-xvmc-0.4.eselect 4169 BLAKE2B 88d4d93097e51c5e2f6b98adbf2e09a643a3ef37176010907035486b4d98eb38c02e0243a8ec617c89bc0204948db83431174d1bb217f6e9fc6f3fcb649338dd SHA512 d86d80b931d2aa6c085accf9a647745cffd56b496728162b1084eba2fbde981ac17d3d3758cef993427b4236330fcc21bf2fc52d2b50249764a65fc508121135
-EBUILD eselect-xvmc-0.4.ebuild 530 BLAKE2B 3b30d8a24acf61e3daf2dacd3e7587778c476c122b529671329aa5744c124eba34112f03527e6559e98408bae7ea979b22b2c447810c4d4d84e1ba88b1e27bdc SHA512 b4656516ddd9cd4592b2460f7f985f180c60bec5505cedcdf2eea32cda65933e7967b44208a1d04c5c25b8e4d23472668521b51adc39d4383aa5d26b7b3f0222
+EBUILD eselect-xvmc-0.4.ebuild 547 BLAKE2B 1b79305ebc8d4bc7732ef137c0157339a082406b7d8daec16877a984cead0d9e69cde5b0d2bc2d6f750df1e21caa44679b703fd78b1811666c2dd69df8c8d7be SHA512 73d8e013e5deccf31078796f6ab6811d05e195728449447aefe2d1a00c9c6e32c766d239e7724bd63c2d77b670333575448a2ee035cce6d1f3588882504c8578
 MISC metadata.xml 254 BLAKE2B ee88ffa1e088e8468e68ced9c2f45c893ba1a63b35efb4bd4093dd6b65f976a30ca90d8fb6a23dd8153d800f08ae5253aba6590ce59a79e4db1562676a39f79c SHA512 835fb05d568b08bf648a64dc26c52cd2166f5197b82615d3218e8a69049c449cad544da478cb09c68c5578f75628a86fc4c361b54ff09d8f778839c186466a47
diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
index 81b05a1fe1da..ac778c24c544 100644
--- a/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
+++ b/app-eselect/eselect-xvmc/eselect-xvmc-0.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Manages XvMC implementations"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 2ff02b696439..c4bea6edd603 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index a5b6555f68e7..663caf919f41 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47
 DIST ibus-anthy-1.5.9.tar.gz 765672 BLAKE2B 88a2b935bfe1007bdcbd70af358509da77533a67df4b6d0be218b5f9d5e1c0ca093e62618765f1e2d7c06c2127458319bbf482ce8598398b9562ecec8a258301 SHA512 2f57db784ddbd4ea57afba245dc532fe4ee8c9fea5fc7df9b3ca26600816ef4c0626b4ebdbbd976826c391890216af587863707caa26c3926a6278cc6b720ef6
-EBUILD ibus-anthy-1.5.10.ebuild 1235 BLAKE2B 3c17b64497a76a0edb1303988ec782983a8332e38b4597ee1a4b739524d4564b90f590942b2719a86e0be522df9eb14d159f1ba82343c1ac386fe732c2705874 SHA512 a5fff16b8ec2f683e03dcfdb1973d925159aad766803029ab68aad1cbe68f0a48fd5386b4520190e6d4b8377326495459b2759b0d9a89d34c0f237a76b8249fb
-EBUILD ibus-anthy-1.5.9.ebuild 1214 BLAKE2B a600ee7dab05eda80dbc3c134eab8571e0989e6d500c5ed7c7e4d1adc4ca1ce8a02fbd009c0f449664b74e4150bd464eca998d2ffd2635861e95b2a0d084a053 SHA512 19dcc539f8ff8ed8a300bf09e04bba433056a84c397352c9173171cc7de4604edfb8d537836796cbd4b986317d8237519437c36cbffbdfd818797365e975e215
+EBUILD ibus-anthy-1.5.10-r1.ebuild 1272 BLAKE2B 9f709491dda1b80f4a74292f82e9b246099f8de7a324daccb368e7deae5673272af27ff8a3aed28303a70cc508056214b050ac5353b2bcc1d0f2c5b38b23ac8a SHA512 2c66358abc262635bc70375fd64b0a1131be1850830c89a9ee68a58169400b7f8d5bcd74f16cca2f1b6d2cd053c4b982d34fcfce0922fb237380f4a7a0a87db4
+EBUILD ibus-anthy-1.5.9-r1.ebuild 1251 BLAKE2B 6588a7d19dd0a55ec5505ab325c12976f8d883eed498fa2301fe5aa053ec8e7f6bfce2540f3b662ebca9e51291c06b38880eac8d447638ee516eb19fd64e613d SHA512 dec5af46c4fab1c0b740814893141a3921a78609c04b2def1385758f27969d6a2d085e8747d7cfc8fa06b7c0ce7698597a65ef228648185a21a3e0f92f06998a
 MISC metadata.xml 476 BLAKE2B 33f4115e9bafa5d3f491ea05b8395123c9cb6b844959df2ee8b2cc9609b8fd20d25cc870adc117c9e96e17f215c806d82ff138b01c2b02e2e63eb99d568ea626 SHA512 024c387b5eb01279f8803df81b1d7dc2b86969ffee5986bef75987c066cce48f7d1fe8ea35790be4fafbff2281850f2b03904f41e06bc37fc9d40537eca96c07
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
new file mode 100644
index 000000000000..49d72440083c
--- /dev/null
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_6 )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Japanese Anthy engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/anthy
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-private-png \
+		--with-layout=default \
+		--with-python=${EPYTHON}
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	python_optimize
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! has_version app-dicts/kasumi; then
+		elog "app-dicts/kasumi is not required but probably useful for you."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
deleted file mode 100644
index 10be5957f6b7..000000000000
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Japanese Anthy engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/anthy
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--enable-private-png \
-		--with-layout=default \
-		--with-python=${EPYTHON}
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	python_optimize
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! has_version app-dicts/kasumi; then
-		elog "app-dicts/kasumi is not required but probably useful for you."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild
new file mode 100644
index 000000000000..557c5b30b615
--- /dev/null
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_6 )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Japanese Anthy engine for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/anthy
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	gnome2_environment_reset
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--enable-private-png \
+		--with-layout=default \
+		--with-python=${EPYTHON}
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	python_optimize
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! has_version app-dicts/kasumi; then
+		elog "app-dicts/kasumi is not required but probably useful for you."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
deleted file mode 100644
index ba81764f9f0d..000000000000
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Japanese Anthy engine for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/anthy
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--enable-private-png \
-		--with-layout=default \
-		--with-python=${EPYTHON}
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	python_optimize
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! has_version app-dicts/kasumi; then
-		elog "app-dicts/kasumi is not required but probably useful for you."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 31a12333a992..222e04e0fed9 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
-EBUILD ibus-hangul-1.5.1.ebuild 884 BLAKE2B a6a2ab992c8366ba579a9c3bbe9771e415d0d6f25b527a1faed8a0da66f14c9b1355da3aad484b6ff28b41c134557d3cad1d601329150f5f416acd0b9c7a1912 SHA512 a32e4a5905d270eec0faabe72603070e5edc2748b227384fe961c9d8ee5d299c52947ee403fab5d4b6a71dba7cf7fb8666631fe49ada8f3c7c33e78f15a89574
+EBUILD ibus-hangul-1.5.1-r1.ebuild 921 BLAKE2B 0b9f3d9c07594dd3598c3a04eda66ecfbabbbb000ea801fc1d46ec964a18bd1d1160a71cc24f8a5cadd483ff26499dce9ca3528c99244262b2501d17828af02d SHA512 c88bbf13ee0a04602d805cf0115db5bc9e1c0ed7dc96f024b6608d9ba71b008d73ee99deb89d9dd70119b141b577c1409461025cf2589eec9e0af60232abe393
 MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..87d78aa62e74
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_6 )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Korean Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-python=${EPYTHON}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
deleted file mode 100644
index 5fae9262586e..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit gnome2-utils python-single-r1
-
-DESCRIPTION="Korean Hangul engine for IBus"
-HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
-SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=app-i18n/libhangul-0.1
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-python=${EPYTHON}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index fa395fe98d28..b21f679f8e7b 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,6 +1,6 @@
 DIST boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 55907 BLAKE2B 16ac81094457c80b418109104139c1604e38ec58d6065474cc512668601f12896c4d470fe15c9a366a5ec63d50135265df71f28f4202fa283231879fafb0efbc SHA512 382c7f8a94059ae9816783b12c2d27ee6ca69e23ef7085bf2ee5a31109e6ab0c3d0b0042a3dc290b89276b6315d767aedf073dca390fa688a9aae07e837f83c9
 DIST ibus-libpinyin-1.10.0.tar.gz 1693440 BLAKE2B 5e0d9debddfbb81fcb45ac86d1fe8fb1220a50c527222fb3c3431149231f41dcc59ae87da9ae9485e2585f0e3051ac4d1792407ba62d90e5e0323c482d52318f SHA512 c9fdc28562714bddc889805e1d439a7dd425f721a8236b8f8ec4727ce24e5053693b3e5bd9b06ced22ceb66bc7621715f7ee52e00af3b8b113503a5ce6963ca0
 DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e039c0a181981d20ed94662184e161e8639ad3d548de981d7bbae950ab8b5019bedaed9593e03282e2f9d207f831929d422bc SHA512 48691952a10f4ab545d8e233dc3cd75fc54270c03a687820048152636df26d233ee0fba89e4ec2ccd5a6e410b41e556872e3dd2468d59d44b3440e904b93528b
-EBUILD ibus-libpinyin-1.10.0.ebuild 1498 BLAKE2B d448d1f16bf63347a0aaccad094d0f6ad0b89a0e05318f86e2593711f3800f36d2c064ebf0e6c113fb1e3e3800f49b6f070e0140abbb32b5c9f3b591ca6d201a SHA512 fe81e55e6f6b2e7cdc7dc1615b0d0c2435458a9e4e3f44f44633853add01710b904138a2e967a16d94f8633d9623bc21f57477d3f871c2acadb85510b3bda686
-EBUILD ibus-libpinyin-1.11.1.ebuild 1196 BLAKE2B d9ee71c07c31dfcfc62ea876e9ecd885c96c73ae0321cbb3de2db15d7f2a6fa51f3a04dd2ec73936ad8a3656293b278fcecf229c21539ddfae9b10248f8ec9d2 SHA512 78cdc402fccc1a9f024a6cd015f9e5b768ebb2e440dc6e346b8c56170e3fd97e60d9b7a1b0feb62722936ebeb7450a19cfc3da83b08a137884279594c84c06fd
+EBUILD ibus-libpinyin-1.10.0-r1.ebuild 1535 BLAKE2B ba5b503f5c0724adc46ed8c63bed0486d880a881a968da41d613185b2182a077cc5ab98c7d82ba61ea4ff35cf928ae3bd045757f9fb8916aabdd9aab75723af2 SHA512 d490ea04593c0eba188b3fb4c0fdf7d93a962b91fa0a15e5bda13da12e1032ea97be1292ea4145d30ecbce6e2176e3a3358da3db5f6052d3698ed1fa76fc9c4a
+EBUILD ibus-libpinyin-1.11.1-r1.ebuild 1235 BLAKE2B 9503b44dc768975032afc2efb7a744f65a184bc7240448484a0bc758e357354c7bd8f0b3f3cd27a7a6f1f53fbb6db7d9d96da8507a765582cd6a646cf0826e0b SHA512 7a42024472def6263fe9668bfb172bbb74c667e7eea98a5aff49d33137e4618614eca7f41ba26e018b8cce6b67c50355661658b22d616a574ac029998ea4cb57
 MISC metadata.xml 807 BLAKE2B 864c61e2dac53fc0b95541bf79e8f27a183f879bab95574f7cf462bfe276c89c8a5d2b65c899f4734c487feff1113a20ee02debd48b4ff955a24ace70ed5006e SHA512 c92e0e2c47a1272285c3a36cfc18c739df2a69dc911a8849cdc9c517183309908fdae894e88ed7511645b1c90c3611670b046f1a2c7c48fd0ff7c79d2de0a5b0
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..3d7dd517debe
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools gnome2-utils python-single-r1
+
+BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-i18n/libpinyin-2.1.0:=
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use boost; then
+		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
+			|| die "copying newer version of boost.m4 file failed"
+	fi
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
deleted file mode 100644
index a686aaa32ec4..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit autotools gnome2-utils python-single-r1
-
-BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
-
-DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	>=app-i18n/libpinyin-2.1.0:=
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	boost? ( dev-libs/boost:= )
-	lua? ( dev-lang/lua:0 )
-	opencc? ( app-i18n/opencc:= )"
-
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	if use boost; then
-		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
-			|| die "copying newer version of boost.m4 file failed"
-	fi
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
new file mode 100644
index 000000000000..280d6386f779
--- /dev/null
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2015-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit autotools gnome2-utils python-single-r1
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="dev-db/sqlite:3
+	virtual/pkgconfig"
+
+DEPEND="${PYTHON_DEPS}
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	virtual/libintl
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
deleted file mode 100644
index 510770469de5..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2015-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit autotools gnome2-utils python-single-r1
-
-DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="dev-db/sqlite:3
-	virtual/pkgconfig"
-
-DEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	>=app-i18n/libpinyin-2.1.0:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	virtual/libintl
-	boost? ( dev-libs/boost:= )
-	lua? ( dev-lang/lua:0 )
-	opencc? ( app-i18n/opencc:= )"
-
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/app-i18n/ibus-pinyin/Manifest b/app-i18n/ibus-pinyin/Manifest
index d3714ae5126a..86cff88efbaa 100644
--- a/app-i18n/ibus-pinyin/Manifest
+++ b/app-i18n/ibus-pinyin/Manifest
@@ -1,5 +1,5 @@
 AUX ibus-pinyin-1.5.0-content-type-method.patch 5534 BLAKE2B 658a4d099b02b344f38a9ef2fc2df0d2274dcd3b8071fac0aef0accbf7c21f0d4e98b9587d665b13195d7efc04bbf58218de84069a2c63eaa79156363061dd86 SHA512 3399052f0d12eb55554d5cc98637125e6648a56f3dc87eb2fadc63af3fb82bba915e820c51596d9106637f6a063100f217ad001422a61f8925db5c5b2024c976
 AUX ibus-pinyin-boost.patch 409 BLAKE2B 5fececc7f4ed6941d374799ccdb1d9d7deeeb7078bedc8d0085e12f8310c42d752c14168a7d07a88e9412fa9cbff5c5bdf4274202d2ed6b6e7f337a96c65c3f0 SHA512 8e4efe9b5d12d35672dd8891a49599bef6611aeb723e8fbc08197896e417cca1d55cf31a0bb1f3ec572db489b01aa36349eaf9238d1a693483d6e21bc10eab2e
 DIST ibus-pinyin-1.5.0.tar.gz 692516 BLAKE2B ae53eb79ea4e5336347d689814d8ef033551a9b432268e643927b28911da3d03701acb3f337d7781168461c1c53537f2271fc8f253d1e99a269f61ae5eb83b05 SHA512 b0cd849ee3154543747dde8994eec9aed01d67e0d9be308a2f0230cf22f0281cd8fcabd9763b24238547a37e54400bcd8e541937767b93f005d04302f0c00241
-EBUILD ibus-pinyin-1.5.0-r2.ebuild 1140 BLAKE2B de842fee994ea765f6f52922f282319b87fb6f4de9901eee34ddb3c8232431a7f389201508c22a298069ccb11f793e00be2af086a37195479164965f53483f77 SHA512 c86e6e49c9c153edf82790c0a3a79b521c9e076db136a97ac2b501e4b5d4321dcd1b787b79540836e620a1a8bb0b28c4610280ebd07d505fe9fa8bd2677cf8ef
+EBUILD ibus-pinyin-1.5.0-r3.ebuild 1180 BLAKE2B 6aa0f69342db4a3227b65ab86338e627af2a29bbb9422f8a0b4460ffda63d6ed5ab99ed6887fb2f7e65ed2cf2dd665e2585232ebc224b0104e474ae25221864c SHA512 c648d2a7968822dfda6d2d3f1ea449029e21bbb0a806a7b986846428b0da2c715d4ebda3c01e4c821b1fa88206dc19bc47a72e6ac7f2d9007371c4e73408aca4
 MISC metadata.xml 675 BLAKE2B 53ddd9a158adba18b4bbb56af1f1e75013c61ea23c245703489b677ed3a5eefd1fb0bba28b4269c5bff4ca6453ea5bb4027b0904f21ee89ecc2ca0d5c7041b52 SHA512 87c1743bc802f22de1d2441403b00eaee1a834730ee1b9f3c3ae62728fdc7073bbe01faec464042243ac7dea1ce11aca709bd5d836fca3c09ccb77c64ea27aea
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
deleted file mode 100644
index 2f8dba36e3c9..000000000000
--- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	app-i18n/pyzy
-	dev-db/sqlite:3
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	boost? ( dev-libs/boost )
-	lua? ( =dev-lang/lua-5.1*:= )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-boost.patch
-	"${FILESDIR}"/${P}-content-type-method.patch
-)
-
-src_prepare() {
-	sed -i "s/python/${EPYTHON}/" setup/${PN/-/-setup-}.in
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable nls)
-}
diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild
new file mode 100644
index 000000000000..717341659675
--- /dev/null
+++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="boost lua nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/pyzy
+	dev-db/sqlite:3
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	boost? ( dev-libs/boost )
+	lua? ( =dev-lang/lua-5.1*:= )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-boost.patch
+	"${FILESDIR}"/${P}-content-type-method.patch
+)
+
+src_prepare() {
+	sed -i "s/python/${EPYTHON}/" setup/${PN/-/-setup-}.in
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable nls)
+}
diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest
index b715c09d01ed..c29f9b67957d 100644
--- a/app-i18n/ibus-sunpinyin/Manifest
+++ b/app-i18n/ibus-sunpinyin/Manifest
@@ -1,4 +1,4 @@
 AUX ibus-sunpinyin-python3.patch 388 BLAKE2B 35131840c58bc47980dbbe046723217afb8926f61de601d664524b961c80f718753e41a82b7cdcd8b137d71c97ad84b91a3b71677610b2f369f9be2da2582185 SHA512 90c7d08588e996e7df966f9ee4b3b044a038392a0f3f074f4803b45a6579ad774119a3c700167924f073a3109f8172f8fea12129c2eb36e914b89eb68cc5a7dc
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
-EBUILD ibus-sunpinyin-3.0.0_rc1.ebuild 1298 BLAKE2B 1fb15e1213fc17bafbf091c2eace49f2e72d0d85ee9a2ee71ce7a35e12dfdd21de4514b31f5e454107af011330168f2eb2eb583f089454ba52527b8d605cada2 SHA512 6c53b9ae41dfc8b2d916a473e0c5024e08e6591725eb410bf6ba7a423ae16c83a402b427cc1fe3817fe67dc26a2d9638a1a8b9ce3283659b16cc5ffba931562a
+EBUILD ibus-sunpinyin-3.0.0_rc1-r1.ebuild 1331 BLAKE2B afb4525f5edfee440423c10c0412fd9a7d5cb6dc283bbd4cae5413f16e3d892b0e4ee178529b881d9243e9bce0482a65fe4f2f1168b6a21b2e184a5cdba28feb SHA512 915b0c1d6704e5b18a4b931bcb84cfd480f02322c01e74a0246eb7e7dc58e2a4609513889a9a88af7072e5b9361c03975a65e7cae0449deee17bb41f178c843b
 MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..6037fa22fe86
--- /dev/null
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PLOCALES="zh_CN"
+PYTHON_COMPAT=( python2_7 )
+
+inherit l10n python-single-r1 scons-utils toolchain-funcs vcs-snapshot
+
+MY_P="${P#*-}"
+
+DESCRIPTION="Chinese SunPinyin engine for IBus"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+	')
+	~app-i18n/sunpinyin-${PV}:=
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
+
+src_prepare() {
+	sed -i "/^locales/s/'.*'/$(l10n_get_locales | sed "s/\([^[:space:]]\+\)/\'\1\',/g")/" wrapper/ibus/SConstruct
+	sed -i "s/python/${EPYTHON}/" wrapper/ibus/setup/${PN/-/-setup-}.in
+
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	escons -C wrapper/ibus \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libexecdir="${EPREFIX}"/usr/libexec
+}
+
+src_install() {
+	escons -C wrapper/ibus --install-sandbox="${D}" install
+	dodoc wrapper/ibus/README
+}
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
deleted file mode 100644
index 70ddc8a973c7..000000000000
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PLOCALES="zh_CN"
-PYTHON_COMPAT=( python2_7 )
-
-inherit l10n python-single-r1 scons-utils toolchain-funcs vcs-snapshot
-
-MY_P="${P#*-}"
-
-DESCRIPTION="Chinese SunPinyin engine for IBus"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	~app-i18n/sunpinyin-${PV}:=
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-python3.patch )
-
-src_prepare() {
-	sed -i "/^locales/s/'.*'/$(l10n_get_locales | sed "s/\([^[:space:]]\+\)/\'\1\',/g")/" wrapper/ibus/SConstruct
-	sed -i "s/python/${EPYTHON}/" wrapper/ibus/setup/${PN/-/-setup-}.in
-
-	default
-	tc-export CXX
-}
-
-src_compile() {
-	escons -C wrapper/ibus \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libexecdir="${EPREFIX}"/usr/libexec
-}
-
-src_install() {
-	escons -C wrapper/ibus --install-sandbox="${D}" install
-	dodoc wrapper/ibus/README
-}
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 4b8ce1eccc08..c3c35ffcd5fe 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-table-1.9.18.tar.gz 585309 BLAKE2B 42d7d130bd2695c1c1a7010c0bcf29c1ecaa3899c8ef8d24b11e10434771415bfd8b91723ef4c489721f0276d05dce08de3472c49632b9d30da5be1a53f82dc7 SHA512 3f28269be1987023402eb6075b8e68b3bbba3c572a94551d072281677fde5fa14f8f4186455f8f9156b252934580c7a3837555d0edb46c76f13c8b109e26aca2
 DIST ibus-table-1.9.21.tar.gz 615801 BLAKE2B f6b3fb4fe67e5f43cc7d21bd03cc530c03b3a161e099fbca0b116319f1590374ddcef2e97c2f4702c2cd8748e8009d703abfff51f93ffb933a1aecb028e03362 SHA512 354f7e8ece5c23b84251bd0d5ff06d7a368678ade25e340341ef9f85571b440c455d56660c743be97ff6776ff041c4da35079ce090955c5f87b8f3b587e35866
-EBUILD ibus-table-1.9.18.ebuild 779 BLAKE2B d18ec4ac954123ad2ef8fc55c9ffee37b63b3d9e9c91d1f220fa159ff43da746fe373225870e477373e335362266ceff02ff68d6d8f25a29db36b1cb19a401f7 SHA512 cdc2ef0a22b6b1fe35fbf4335ffa96f7a955b0448b876eb5eef143fccec2e48848be5068b80840673437bcda94fae4fde75938b0a799e5d81fbd84605e02f8a8
-EBUILD ibus-table-1.9.21.ebuild 797 BLAKE2B 635fc01b04621e32e73f5ef510f7c09369a1a398748836b8ecfd89b5550c65e43ecb869f7791e39756bcebd507eaa0bc48041fdbc6b07bce60bd9b974976e9da SHA512 b5e390a6997dfe71dd983a9d2a1cbc923966e3f1d58a88c7a3ddd8d318e151146429061185547b65aaa902552e1503e6c073fa3f995c8290e30fba0e893fc076
+EBUILD ibus-table-1.9.18-r1.ebuild 822 BLAKE2B 4999f07d0d0c293064e6dfa98dedcbdebbfa10187e96932581174b6d3ef08d6a877d31906b512695adff6ba6902e09217a35338184e72352537d310a28cb8471 SHA512 69f435dcafba74b0fb0df9ac34cc42cce7c41beb57491c9a9acc6bf65c330afe43acaa2967701cb9ecbf1a237279719c184637258ad3d31c9cbf7c609dedc062
+EBUILD ibus-table-1.9.21-r1.ebuild 840 BLAKE2B 5e8700aeb2d9c0c8a4ce76bdd32e956efa7c0cb250f892839c9077bd514459e8d1be2bc6c03eb655bf3b531336fecafcd7dbdcfef31e84451619363939ac5918 SHA512 0b0b18c252813421eefdd6588287a0de963318218f452c07c609e6eb308f2bc32b3d0cac5ca792f66343efe93ae29d08b9101bd47134f23df33d50c11fd42c14
 MISC metadata.xml 419 BLAKE2B 7d8e333e50af2c6d8032fbae3455032febd51e3e7209c55fbfb28b52bb80482d4b95f7ba3ce02465218a93741abd016366a5356d8febcbe50881c55c27a0d6d3 SHA512 b75c10c039ede5a9840b7ca4edf556a22d0072605b6e74d0e6f36e09ec32f66bc81f0db967a90716c5748dd3a5d2a4a64e6da704f7620e4ef2e4a041c9c9d389
diff --git a/app-i18n/ibus-table/ibus-table-1.9.18-r1.ebuild b/app-i18n/ibus-table/ibus-table-1.9.18-r1.ebuild
new file mode 100644
index 000000000000..dcd828dcbbea
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.9.18-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild b/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
deleted file mode 100644
index 025526aa8b12..000000000000
--- a/app-i18n/ibus-table/ibus-table-1.9.18.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit python-single-r1
-
-DESCRIPTION="Tables engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	virtual/libiconv
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	python_fix_shebang .
-
-	default
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild b/app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild
new file mode 100644
index 000000000000..9db9ac7acf04
--- /dev/null
+++ b/app-i18n/ibus-table/ibus-table-1.9.21-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Tables engines for IBus"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/libiconv
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	python_fix_shebang .
+
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-i18n/ibus-table/ibus-table-1.9.21.ebuild b/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
deleted file mode 100644
index 7da7fff419c8..000000000000
--- a/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit python-single-r1
-
-DESCRIPTION="Tables engines for IBus"
-HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	virtual/libiconv
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	python_fix_shebang .
-
-	default
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 849fee3529bc..e21e6d2fda53 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.6.0.tar.gz 6863400 BLAKE2B e399ebaa19a2949882de41cb3b11dfc161a0ddb300e23daf216857dea9bb4b3d31db6dcd02846214b8ac677df92672a342c7c9e992ab791f97bdf8abc514ba4a SHA512 7e916eaba5d3f14bde383acedd5ce9cd74e72328f25a84936055ee9183b4aeff79d5297fffdd27713491f23a949377cafc39bc52efa0f7d5995672176cb808c8
 DIST ibus-typing-booster-2.7.0.tar.gz 7364094 BLAKE2B 60a45121b398032b2581d1f3e5929e74e69ee22bf0807b069529afb30797daacece47e83b0696397e6b9c3f6adc28012c7f2b7102387e03eb360383946e836b2 SHA512 a11d2cad660dc813022eda89bb690e3fe7cd517ad6a3cbc7f31879afb60c5d1628f25beb423f922b26d7dd92c685471c767084cdd3a35aff1e2314a21cd757c1
-EBUILD ibus-typing-booster-2.6.0.ebuild 853 BLAKE2B 168f8674e9ea224bbd5cca5687573b3ae6a44517d86eac44e776b233f4431fc314f07028a4bc9cc9cf4b772afd7b523d69fbafcb20ac1ec42ab1c98f99bebc76 SHA512 a0fb1bee927ffea4daa028d63b0401ede40fbd37146f0cfbf51714b2ea85cc607b7bafee8b0595f024ca39f4276e25f9dec33a37b9aa0c1af2de93777b36f485
-EBUILD ibus-typing-booster-2.7.0.ebuild 853 BLAKE2B 168f8674e9ea224bbd5cca5687573b3ae6a44517d86eac44e776b233f4431fc314f07028a4bc9cc9cf4b772afd7b523d69fbafcb20ac1ec42ab1c98f99bebc76 SHA512 a0fb1bee927ffea4daa028d63b0401ede40fbd37146f0cfbf51714b2ea85cc607b7bafee8b0595f024ca39f4276e25f9dec33a37b9aa0c1af2de93777b36f485
+DIST ibus-typing-booster-2.8.0.tar.gz 8018809 BLAKE2B 9306b980623094a8b72d6824292d8d52a90df69b7f1f7df11c0df63c5d2c4f2aa1ca4e2765320096915b30cc807fbe24f64a219c3beb1bec4a1d81be4511779a SHA512 64c112275ec63ac3d3c13202256be8bfded152da7b08dde7e6eb01dd38fd48535d63daaa6c2fcc09e64dcd4927931380ccd0a0be739f04330fb15dc0d4fe1823
+EBUILD ibus-typing-booster-2.7.0-r1.ebuild 917 BLAKE2B e07904b632e185636e3c5dbbbfbb3d72723866022f04aa7abe7d00411779c57639d47c07b34e2b33eef0418b67515f94d53afaff2a4e9a55c0b1d4b4289fac41 SHA512 a2b0451ed29c1dc573b3f4158c9c19fc47f7ab46cfae0b614cd10ede3c3952380deb148039ef24674aa1e627631503ffc9876916bc25af12a618d2f416d8ff7b
+EBUILD ibus-typing-booster-2.8.0.ebuild 915 BLAKE2B 8505c9546d6f07fe6c7fe641ac3cc973eb27ed681dceeca9091659d984d8bcc7285568005b46726448447d50bcf3540acacdb330cbd20c7cf49d43cb361365f4 SHA512 23e841de462df06e7f41a96271b027af87b2024cefd0e82f15535a91ecb72639ba5d54802a0b7860f354d4e3ddbc27a8eac29194188cc173e7ccd38f9685d987
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
deleted file mode 100644
index 55d27fd99d77..000000000000
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit python-single-r1
-
-DESCRIPTION="Completion input method for IBus"
-HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
-SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-libs/m17n-lib
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..99d431fc2d5c
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/m17n-lib
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')"
+RDEPEND="${CDEPEND}
+	>=dev-db/m17n-db-1.7"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
deleted file mode 100644
index 55d27fd99d77..000000000000
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit python-single-r1
-
-DESCRIPTION="Completion input method for IBus"
-HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
-SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-libs/m17n-lib
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
new file mode 100644
index 000000000000..0091f717eeca
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	dev-libs/m17n-lib
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')"
+RDEPEND="${CDEPEND}
+	>=dev-db/m17n-db-1.7"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest
index 511e35b84f23..59d85a396cb0 100644
--- a/app-i18n/imhangul/Manifest
+++ b/app-i18n/imhangul/Manifest
@@ -10,7 +10,7 @@ AUX xinput-imhangulro 50 BLAKE2B 01b0a4e625348fc9221b2f52d10288befbbf71774e34060
 DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e
 DIST imhangul-2.1.1.tar.bz2 288452 BLAKE2B 14aba1fb582edd735d1469b2fc1c4b576c64f073f525b30a3c5dd681b82d07f7b2960a63c388dae47d93855f25abbfbb2a48b032e5509239325db1cd05ff6b5e SHA512 5db3843aec698bd6315e4c76f3d8ea374b5d985ff7ae8a3d05861afb1d564ffe274d56fa27e8f669884016c50d5fc1850984050d93fdee944c6f7c3c963c96f1
 DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89
-EBUILD imhangul-2.1.0-r1.ebuild 1296 BLAKE2B ff57c2c12fdaa9fe943461bef88d9c46987fb17a9cd18eef0c70358bb46d663cb58449f91ec99019fdc5f427aae289121e8564f11f87304eb3cc473d42ef4c64 SHA512 25baa051bbf72f71b85983c365b9de92c70095dee6d29881c659309270bcea748e2986ff0e8acbfbd74e3a61d8cda7e710440ed1800b00fdec062daa9c396fc6
-EBUILD imhangul-2.1.1.ebuild 1299 BLAKE2B ea15e9375f93a5b05e621dbf29eb814c473194810b85d923426c6565c563ed9b4427c4c371d5da547fb483d7582f10501485b31c5ec12ef67901aab63f5c3d52 SHA512 d73ba627cefe9fed778a8d2b77476d4ab758e2645a50b00620aedd71ae4101e6d379de9c338c2b884ce95708e895dda8bbdc1e7f0dab84343b1d127a8ac1efda
-EBUILD imhangul-3.1.1.ebuild 1299 BLAKE2B 16ea4b4bdcbe78772f7232f381e24b22c633bab010df0490af248e55fca041815922c05449d5fbb7be4a5b02e76855aff63a1f1d394860a0f6958d9de004ddd3 SHA512 566e71123e3eb1ecd97a330f5da28a0654c830b2dbc281403ebf6106a81fd32c74b1634c9b5446838f77cb6a5bcb38c54392bb3a7ba53f7080c76c81e88c8956
+EBUILD imhangul-2.1.0-r1.ebuild 1294 BLAKE2B 592a4374ceb96a743e429fc1578b2417d79914997a5b03bc8d3c3102db5c07d5baa57a1fc8fa08c653a70dfecfb2996deb0ce130ae5e5c24a538f8ecc970f733 SHA512 aae51f39dbd1fb9150e99f97fe998c0280b191c63b365abfd5b66289b85389836ec8f1cfde8011fbaf2418155dcb930a9de0249f7a07ac499ef7c9156e33bfc2
+EBUILD imhangul-2.1.1.ebuild 1297 BLAKE2B 6e88f3e21cb024a04419a7935bcdfd9993afd1f77b72eb78891450b19f954539aa222df1b8d788d1d27399429b529af9fe78ce681caf2e6e9eb85863964bbb6b SHA512 ede0d66b2eb2c14d277e4088ee0771ddc881ee6fe03fef4f1dfe52b5f36bde3cfa35cd506579e070fac593e6aed69e0c7ac483701400acfeb045536ed2f09522
+EBUILD imhangul-3.1.1.ebuild 1297 BLAKE2B a8c026746a1e59485c781049a26cfe3022633fecdc5bb7dcfad6bcebba7877d42c23fcd7faedb06654f30a1e895d14ab6580c29feb96e183aacc4c538fa0fa2d SHA512 ae70710c8d6264e333f495b178ce58a6c824db388d28b19684651415849bddea568de0d2ffbdae460f3d1095d27afba8fb58688853fc9519293c1a3d61fcb013
 MISC metadata.xml 370 BLAKE2B 3376831ba7380688735a4e50c6e60dc545d34867163bb9191ea4ccd4dcbdae9d2e6e8eb0429195fb7fcafc920f95ff653553f4661e4a08d8d6f823838e89b2a9 SHA512 abd3a62a28dc9405ffa19aad3a8b213a906eef144f10ecb5bc5632d5b892eda73d600c70e126975299fffeeb59ccf38c03b4abdb36fb5e5870130b4453a27b39
diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
index be31caf2f266..5fd39a7e384b 100644
--- a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild
index 296851718916..d55a5638bcfa 100644
--- a/app-i18n/imhangul/imhangul-2.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild
index 667c30d3e7f9..6be5482fcaf5 100644
--- a/app-i18n/imhangul/imhangul-3.1.1.ebuild
+++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
+	econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules
 }
 
 src_install() {
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 3e35ff0c3d04..96f1cf888566 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,6 +1,6 @@
 AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca
 AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
 DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-EBUILD opencc-1.0.5.ebuild 1026 BLAKE2B c4398786816d084d1dca59222df6ec6f0aa9cfb9a5f5110d7a82a70014a639908c5e4167fd2d98f499c1bf4844ab5c3a44dbede4262e310bf897462a75be7579 SHA512 976d0ff8b98dee4b8d42e298c69fe4527709059df619eb91a2c1151b1a4b314b05455c9e300c3cfa95bbddbfedadb39a387a9835bf7e327ab029600b4efbddfd
+EBUILD opencc-1.0.5.ebuild 1025 BLAKE2B b9c774d3cfed6c15a2e73d37a7dd2482c0ba5563a842485985cf5e1e8daa4c30d8567482de35c553d6834e1bfd969a2dc83da365cbe986f35d0b7c29beb8c9d7 SHA512 c2f1712eb26ddf53b56f9250dc318293e1389aa1ee7179212f61725344e92d88dae8afb1563e13adb4f563881874cc6a659c0b1fd55e81ca0cc9b750c120057e
 EBUILD opencc-9999.ebuild 989 BLAKE2B 56348d3d7b5365fa1143bd26c86d06f45870b347a3700c72200d6e6ae0bb3f9bf50e830d5456cf004edd249e8edc45663f49d858eab3a323aa752070f4bc921f SHA512 b15870c21c474a4af87e0a8a9cb96f2f6f92c398d93050f345c84e5acb0fed31c68cc9616dedcde57dd892c1839d5d8c9d73d7c04617160aca3902c8e644954c
 MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index 02e7cbbde3bf..63d6cf51df70 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/BYVoid/OpenCC"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-KEYWORDS="amd64 arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-i18n/pology/Manifest b/app-i18n/pology/Manifest
index bc6de0bca5e5..ec77c2e6f216 100644
--- a/app-i18n/pology/Manifest
+++ b/app-i18n/pology/Manifest
@@ -1,4 +1,4 @@
 DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
-EBUILD pology-0.12-r1.ebuild 1558 BLAKE2B 0a6385869bbf1c51977ff423d4c3a4e105be43ae11983b07f581937e49e166741d8067a469c2f5b443e000549a1d8928f6624df3c89cd07b696e8df208a92d97 SHA512 b077e75816d0e2267512a03cc74e606238123a100dcc279700554e64c64f7ca682b897482470d0e2e9e6bb15f49dc253e067b6b0b0043d9e3d59e77f5f87422a
-EBUILD pology-9999.ebuild 1560 BLAKE2B c05bef232859bd75de166c8b42506e04dfac28dad26d838ca07ede76f5087c0e04e83086471d1a5bd71428f59c392afe6adf1b3bfca16f2405e171953bac74a3 SHA512 1eaa0871dd39ded1e942de7db9296010a9e19e20e550280155a26d047ca1142d0eac20849b5122f9f9e9eead80fffe48be94261175c67134e61f44a8b3f7b715
+EBUILD pology-0.12-r2.ebuild 1594 BLAKE2B 398d3480c3f0a320ebf4b58f4907b637d9dc84b36e4263e5c33abdc253fbef997fab2bbc3f441c720022eea947ba2d9a21488f7b8fd211ad94364b258d0abd75 SHA512 dca123900889c3bc8544e1f0d83c31c4f46e9b5eff8127b87ca5f2e6e75eff743519f569cb04f0277e668d3da8c0b8456c8b935e5518e093560178fda9428dd9
+EBUILD pology-9999.ebuild 1596 BLAKE2B add34836b2524dfad4770657ff3491c5ce7c9c3ef10f20589265c8912a03af9ed8706f58e94c1ffb22c82050e46c7374d8928ae06d3be8373d51914bf1cc03be SHA512 a86d8261a2bd6b5589a62b4bff9ae2f1d32c8d3b1652abcf3eef34a95d51462d1b278f8643607620f82c78815d24fdeacef52ab3707195e121cc5ed696d072c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-i18n/pology/pology-0.12-r1.ebuild b/app-i18n/pology/pology-0.12-r1.ebuild
deleted file mode 100644
index da1015d3f26b..000000000000
--- a/app-i18n/pology/pology-0.12-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 cmake kde.org python-single-r1
-
-DESCRIPTION="A framework for custom processing of PO files"
-HOMEPAGE="http://pology.nedohodnik.net"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="http://pology.nedohodnik.net/release/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.5
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-DEPEND="${RDEPEND}"
-
-# Magic on python parsing makes it impossible to make it parallel safe
-MAKEOPTS+=" -j1"
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/DOC_INSTALL_DIR/s/^/#DONT/" -i CMakeLists.txt || die
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize
-
-	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
-
-	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
-	bashcomp_alias {posieve,poediff}{,.py}
-
-	elog "You should also consider following packages to install:"
-	elog "    app-text/aspell"
-	elog "    app-text/hunspell"
-	elog "    dev-vcs/git"
-	elog "    dev-vcs/subversion"
-	elog "    sci-misc/apertium"
-}
diff --git a/app-i18n/pology/pology-0.12-r2.ebuild b/app-i18n/pology/pology-0.12-r2.ebuild
new file mode 100644
index 000000000000..fcb45eb16276
--- /dev/null
+++ b/app-i18n/pology/pology-0.12-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit bash-completion-r1 cmake kde.org python-single-r1
+
+DESCRIPTION="A framework for custom processing of PO files"
+HOMEPAGE="http://pology.nedohodnik.net"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="http://pology.nedohodnik.net/release/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.5
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libxml2
+	dev-libs/libxslt
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+# Magic on python parsing makes it impossible to make it parallel safe
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/DOC_INSTALL_DIR/s/^/#DONT/" -i CMakeLists.txt || die
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize
+
+	dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml
+
+	newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve
+	bashcomp_alias {posieve,poediff}{,.py}
+
+	elog "You should also consider following packages to install:"
+	elog "    app-text/aspell"
+	elog "    app-text/hunspell"
+	elog "    dev-vcs/git"
+	elog "    dev-vcs/subversion"
+	elog "    sci-misc/apertium"
+}
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
index 1670d22e95ef..1347ffb8ba86 100644
--- a/app-i18n/pology/pology-9999.ebuild
+++ b/app-i18n/pology/pology-9999.ebuild
@@ -27,7 +27,9 @@ BDEPEND="
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/libxml2
 	dev-libs/libxslt
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-devel/gettext
 "
 DEPEND="${RDEPEND}"
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index eff3925e1ae5..e2c9f64ee7e6 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,6 +1,6 @@
 AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37e37522a54883d06c954f2804ad4c04dfd3b3518fc5401ad5185e85a85a68d80e38dbbd728eef SHA512 1cfe95fdbf840b9fa43c980bb3f2e16fc6008714f8807650582ca906cb91ddd28b3b7b3c9f1325035e2c614d587d172071b2b7e3c6b30ca3128902b335773893
 DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
-EBUILD scim-1.4.17.ebuild 2540 BLAKE2B a27310756920c80fb160f8ccb023626f25518f05f78fed4280b53edecc205d174d357d5453a434d9beeba809fbca99e9bf98ab8f63b4119dd69ded14203dcc47 SHA512 b4acf72cdd8657c6c90514bdf93b178767c04b4b1d8b7a25a7ee32f16b171e48c7d494267866bb4426034beb898b58c696f54c92fa74b64d1936f43675cfb0d9
-EBUILD scim-1.4.18.ebuild 2555 BLAKE2B fcc1e707f4a67cf1f233ed19daff69ce63bdec23c096e672ce5242d9bd81c673a3e9836a49cbd95075d1b2d4a8e03b00f13e345845e9b71576ed14d0bcd7f095 SHA512 11c883262287accbba37c4d6e7ee543a31a02871244d8178a88a12deff29762545941f7b6aefcd39ddb97cb18af6070751d408863ced804a6305d5bab6d5ef50
+EBUILD scim-1.4.17.ebuild 2538 BLAKE2B 3ca60959c635b3a69e751e15da5b37eaccc2c333b583e03cd74df4df6c77a3644da488e1cca0d94f6610c2100051555a285d2b04e395926e1aabe208a254c9b0 SHA512 64a44ba9cff1ba10d01c8bdaf72292f411d4aab33dff8c9125a21ff3995670d36b4bd091d7675d519deca1b4fb80e2c9e02aa11a8eee35148b1c21f6675c1486
+EBUILD scim-1.4.18.ebuild 2556 BLAKE2B e6314c763a236c56cb8dfd06d1dda577f64a4468b23e29230c76c9d47cb03fcc284daeebeb554c3455fbf6045138a0e366f13b665cbcecbbb6c2673b67ab4477 SHA512 8f2dd0f47e380e979dbe7d00db9965dbb271149635b86224a4458341910664455308b1d7b8d0b17984605430eaea32232ddbde026dc8e6ab8fc5c32a8d053147
 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
index b7d8a6de5ec8..1365db6b815e 100644
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ b/app-i18n/scim/scim-1.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
 IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index 027cccdb7177..0cc809f40762 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="doc gtk3"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index c91db125f03c..9d5f7feccc87 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,7 +1,5 @@
-DIST skk-jisyo-201605.tar.xz 6288104 BLAKE2B d68332a4fa0804b596fc42f3dc8231a6eebe8bddacc6e0babec6cc5992ddaadb46e8fa9af742daa30545a585428afe79eab28329ce1d37e0192b08b20d7c584e SHA512 1093d363fe571c3e3e05fa54046fc4b88cbed2fbd104838576c83694556585401c3affa0afb2ed078c6f1b06f62a7b14145b1305f6fef089f160b4073900c7a1
 DIST skk-jisyo-201805.tar.xz 6133180 BLAKE2B 52408eb2f1fa5e5146fd4db55c249f80b5ede7d2ce1e7a3c11fb69507f87f86d778e25b04ce4e39dd241ea2d8000d829b34c47df991cb91f886923e330b652eb SHA512 13675502332609857b66391bdb9dc252b9f7a48814f6db10c60106b9cc3ce823df7615d77e0579d13b9d3da93dae2006cedc145d8dd80af39b9d4ecfe94373d5
 DIST skk-jisyo-201905.tar.xz 6198572 BLAKE2B a26e0be0406699424b24a8d1b004317b5d274fc02ed50ef6c4c696de8e039a6cfd7b34b292b7b7ecbdc2fee1950f6cc2a122ef457ba12f96972584560d3ac355 SHA512 db32fab5d5bf232838a3d502d4f648dde556381df9f96acec13d011274dedf5443676ce36324430dbe8cacb6a037e7bf70e72ef46b94fc6b57b9448e76aab38b
-EBUILD skk-jisyo-201605.ebuild 1309 BLAKE2B 8cad5144891e505667dcba43458e50f02c07ac57b1d329a68c23ea8089c1f7e598cbbe92ebd2fff65b371df99483c2d5ba9b2d6e281023b2ae8641d254939232 SHA512 856f31033950f5d7cfabb6d6833592bc4c0a88978a23650357a4d80ebf8c6c4caf0941d3c9d6069a1f8c43ff9f0d9a113148107405bab65e83781c7d961c79e1
 EBUILD skk-jisyo-201805.ebuild 1346 BLAKE2B 754722d85b3b23412273542324d18f9896dbf44be1c1f16b0115ba3df8ae1c47e2435e6bfc0127571e06f9eae72e1bf3c24a776b878aba547967c063db82b1a3 SHA512 20ef913647bab0cc898f64564743545c982d235fd02288f8fad50e50af21510ab08bdc9742316c979b006d78df8ba1eca59ec7a1faf6d8cf67061396e172c238
 EBUILD skk-jisyo-201905.ebuild 1343 BLAKE2B 9cf7b1fad63f193a942afd31ff2306f52be7ac40835a410ddc94c8d57fdfcc9122741550f82493c313555becb47d0034d626389ee80cdc401a458b9983309489 SHA512 61f61b7c5779da49eca348439cccd50e3ab3cd0d015311712a53d8c4b007174271f22e728af50349743a1bddd757f20b807e75899c264a758b8c86e1de45535b
 EBUILD skk-jisyo-999999.ebuild 1648 BLAKE2B 93b07b219378be74e87817da306968951b22e92791246672e31b3817911b7a6b25a5e7da68e9cdd5317da6a9fcbee5cccdc2ea7a560da7aa6a5b3791eb1c453b SHA512 28648a723fab209828dc2fde0e664aa444fa4a2327e6308e9ac63a08d9e521008a905520ff68606a123901cb3a18e5d09b7ae24e97140daab8d072ccaff7b289
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201605.ebuild
deleted file mode 100644
index 098f596c803f..000000000000
--- a/app-i18n/skk-jisyo/skk-jisyo-201605.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"
-
-MY_PN=${PN^^}
-
-DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2 freedist public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="cdb"
-
-DEPEND="virtual/awk
-	cdb? (
-		|| (
-			dev-db/tinycdb
-			dev-db/cdb
-		)
-	)"
-RDEPEND=""
-
-DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
-
-src_prepare() {
-	rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
-
-	default
-}
-
-cdb_make() {
-	cdbmake "${1}" "${1}.tmp"
-}
-
-tinycdb_make() {
-	cdb -c "${1}"
-}
-
-src_compile() {
-	if use cdb; then
-		local cdbmake=cdb_make f
-		if has_version dev-db/tinycdb; then
-			cdbmake=tinycdb_make
-		fi
-		for f in {,zipcode/}${MY_PN}.*; do
-			LC_ALL=C awk '
-				/^[^;]/ {
-					s = substr($0, index($0, " ") + 1)
-					print "+" length($1) "," length(s) ":" $1 "->" s
-				}
-				END {
-					print ""
-				}
-			' ${f} | ${cdbmake} ${f}.cdb || die
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/skk
-	doins {,zipcode/}${MY_PN}.*
-}
diff --git a/app-i18n/tomoe-gtk/Manifest b/app-i18n/tomoe-gtk/Manifest
index 68fce0e8de02..1bc4a6f8e97a 100644
--- a/app-i18n/tomoe-gtk/Manifest
+++ b/app-i18n/tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST tomoe-gtk-0.6.0.tar.gz 448058 BLAKE2B 06db81c971bf06ae1b625afb90950e7a76ad2acfb6abf038ce0c6114c4f7bc42a76a7f07dc848cfa5e6aef3039e6bab32b0d7496fea1fb67bf936b5f9631a130 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43
-EBUILD tomoe-gtk-0.6.0-r4.ebuild 942 BLAKE2B 04382726db18df35e3091673a99bce5d52d7f08371d391c07658f2da5db1464e7c40d8d9eeb60ac4a6b8f14cdc63fbdf64d31e06b34e5e60940ef8886b330f28 SHA512 802399212e06935d495e62ab369d6e7972c7e110b319669942af9396932b94a6f4b39383ef00e44537d9a0146d0dee4b5dba3795c3d4541156845739da2bf5a5
+EBUILD tomoe-gtk-0.6.0-r5.ebuild 991 BLAKE2B 62f4ae57bf4142032e454826210511592c6ac838730190668b5a12436108d10515d576dc5b29115b89696f7bf446c4c7f53626fa6d96ae386248b6c29f5dc89e SHA512 6e0b1763d13cbcf01fda05dc0feb4a75b181ba1a63043fc66e6222982fe235b9c321afa360a0036e303e434881d87aa6a77431159693a6a716b3072efec5be47
 MISC metadata.xml 374 BLAKE2B 39965153f406f0dab239af88b4da0823befba31b026a262e1dd42373514fdd91b21cf582c3a00184459f62253f5fed7828bae911d82c3ba31331bb7f6d6abc6e SHA512 8b35eb486271612ca74076681fc7c84a27ec5bf49b8523996d14f7cb26d22952569497656378d07ca03ec7f9e05a30e851b9220f905fcc2265d4a4568badf15e
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
deleted file mode 100644
index 52bdcab8445f..000000000000
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ltprune python-single-r1
-
-DESCRIPTION="Tomoe GTK+ interface widget library"
-HOMEPAGE="http://tomoe.osdn.jp/"
-SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with python python "") \
-		--without-gucharmap
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
new file mode 100644
index 000000000000..f5a0c638be4f
--- /dev/null
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ltprune python-single-r1
+
+DESCRIPTION="Tomoe GTK+ interface widget library"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_SINGLE_USEDEP}]
+	x11-libs/gtk+:2
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with python python "") \
+		--without-gucharmap
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 396966c6de95..840d808f1126 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -3,5 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r4.ebuild 2154 BLAKE2B 1b984a191a6a5cc25fc07f7a3ecd15b2135beb0b9402d953d7ee107d7ecafc3f7a346b993f2bfc9b5e4159f5ce61546d5dc916c701042e324963397df2868c4b SHA512 a1846c1c877e0d2dd1ec1c8320b156242a94ccf78a62c33b01f80e7832bfc22cc757ac75a32959f15ba3ea5e9ffbab043d5ef9148df5877edae948215784adbf
+EBUILD tomoe-0.6.0-r5.ebuild 2199 BLAKE2B 240e9312cfd232c1afe7c2ee748a50cc3cf6e9d8b8fd52b67d3cb837285af8e134b7ff2af7e991dc4a6406de05bfb1bfab95184c058b244f0893a75e3d82ac6c SHA512 65df6d8a174907477efc18153b02cb35f32f82f606bd01b826a1f32482a134ce7121126bb4d37e18049f49413daec3573c4a75c93db292ae66f7dcd2b1a53cdf
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
deleted file mode 100644
index 89645ad03b59..000000000000
--- a/app-i18n/tomoe/tomoe-0.6.0-r4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24"
-
-inherit autotools python-single-r1 ruby-single
-
-DESCRIPTION="Japanese handwriting recognition engine"
-HOMEPAGE="http://tomoe.osdn.jp/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
-RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
-
-_ruby_set_globals() {
-	local ruby
-	for ruby in ${USE_RUBY}; do
-		RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?,"
-	done
-	RUBY_USEDEP="${RUBY_USEDEP%,}"
-}
-_ruby_set_globals
-unset -f _ruby_set_globals
-
-RDEPEND="dev-libs/glib:2
-	hyperestraier? ( app-text/hyperestraier )
-	mysql? ( dev-db/mysql-connector-c:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)
-	ruby? (
-		${RUBY_DEPS}
-		dev-ruby/ruby-glib2[${RUBY_USEDEP}]
-	)
-	subversion? ( dev-vcs/subversion )"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-export-symbols.patch
-	"${FILESDIR}"/${PN}-glib-2.32.patch
-	"${FILESDIR}"/${PN}-ruby19.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
-		-e "s/use_mysql=yes/use_mysql=$(usex mysql)/" \
-		configure.ac
-
-	sed -i "s/use_svn=yes/use_svn=$(usex subversion)/" macros/svn.m4
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ruby
-	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
-		if use ruby_targets_${ruby}; then
-			break
-		fi
-	done
-
-	econf \
-		$(use_enable ruby dict-ruby) \
-		$(use_enable static-libs static) \
-		$(use_with python python "") \
-		$(use_with ruby ruby "$(type -p ${ruby})") \
-		--with-svn-include="${EPREFIX}"/usr/include \
-		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
new file mode 100644
index 000000000000..059d1e78dd7d
--- /dev/null
+++ b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby24"
+
+inherit autotools python-single-r1 ruby-single
+
+DESCRIPTION="Japanese handwriting recognition engine"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
+RESTRICT="test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
+
+_ruby_set_globals() {
+	local ruby
+	for ruby in ${USE_RUBY}; do
+		RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?,"
+	done
+	RUBY_USEDEP="${RUBY_USEDEP%,}"
+}
+_ruby_set_globals
+unset -f _ruby_set_globals
+
+RDEPEND="dev-libs/glib:2
+	hyperestraier? ( app-text/hyperestraier )
+	mysql? ( dev-db/mysql-connector-c:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	ruby? (
+		${RUBY_DEPS}
+		dev-ruby/ruby-glib2[${RUBY_USEDEP}]
+	)
+	subversion? ( dev-vcs/subversion )"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-export-symbols.patch
+	"${FILESDIR}"/${PN}-glib-2.32.patch
+	"${FILESDIR}"/${PN}-ruby19.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
+		-e "s/use_mysql=yes/use_mysql=$(usex mysql)/" \
+		configure.ac
+
+	sed -i "s/use_svn=yes/use_svn=$(usex subversion)/" macros/svn.m4
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ruby
+	for ruby in ${RUBY_TARGETS_PREFERENCE}; do
+		if use ruby_targets_${ruby}; then
+			break
+		fi
+	done
+
+	econf \
+		$(use_enable ruby dict-ruby) \
+		$(use_enable static-libs static) \
+		$(use_with python python "") \
+		$(use_with ruby ruby "$(type -p ${ruby})") \
+		--with-svn-include="${EPREFIX}"/usr/include \
+		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 8e502ad3f697..587a6dd0f13c 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/hdaps-gl/Manifest b/app-laptop/hdaps-gl/Manifest
index 6822c6241a7a..0c024841cd1e 100644
--- a/app-laptop/hdaps-gl/Manifest
+++ b/app-laptop/hdaps-gl/Manifest
@@ -1,3 +1,3 @@
 DIST hdaps-gl-0.0.7.tar.xz 226516 BLAKE2B e7de2fa72021e0a98a3e4a9c4501aa8ff05252de29bdc378ae31e0ea741513e6f2205696cacb7169d03c4e3f818e5b24f661bf9119d9afe8daa5bea90a248367 SHA512 4a8eaa556488ae8b0941f51a76e97cbbdc1b7b66aef14ea55e36197a2ad92c7b6fee0617bc71e85ae9320b09b5c903ce053ad9cb78f931618a4c806d5298887b
-EBUILD hdaps-gl-0.0.7.ebuild 451 BLAKE2B 02bbe9b3a2268cd9b0fd510fdcd7ab5730f108d2d865932bae7047b1351b847f44ebb1d1bab35d3d9e76fb8c61144a60e409b0c55e894f0752d3dfe3c695838e SHA512 f16903ec2b30ce58056aa151d2c1abdbad99391aa5ffb038474969174566dc7a0af6e337311781a3eae83e946eb3212c99c3cc23b228b15dd93b93dac173323c
+EBUILD hdaps-gl-0.0.7.ebuild 454 BLAKE2B 29eebcf99f196a40a839aec7185ac69284c7708f5417f0b6b35dd71dbef97b415cbbbe449299a02dddaa4b22b5c7074d8780ff44d3cd14345fa2eb4c1bfe431f SHA512 24281209761114c1f7de9c8f6ead1bd68a51ab7dc53c226db8f73d7081f5dbcec626259592b5afcb5c1a9127c61cc7280824394e184c210ac3d829ebab799c2a
 MISC metadata.xml 346 BLAKE2B f76b65b1705cbb544d056b6556d7119a788b99b0b6da3b8b0276cc602d38a05780b0ca2eea45dd3234652011c0c2aecb6173710b855fc46dd9eca99635088167 SHA512 d268cceebe74bcc1a59438ea6a6330745f0bcb53d906950f3e3113f8671c559a6941a028a66233fe354bc4c4f71b68239a13d7f512c1c27ca772cce941d422eb
diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
index 9eb97d143ccf..a6736225131f 100644
--- a/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
+++ b/app-laptop/hdaps-gl/hdaps-gl-0.0.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="OpenGL visualization for HDAPS data"
-HOMEPAGE="https://github.com/linux-thinkpad/${PN}"
+HOMEPAGE="https://github.com/linux-thinkpad/hdaps-gl"
 SRC_URI="https://github.com/linux-thinkpad/hdaps-gl/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index 4968d5ad60a0..e2eb9923dd45 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -1,5 +1,5 @@
 AUX hdapsd.conf-20141024 739 BLAKE2B ebd52e9bc5d4849b842cb579ca4ea0892227c94c483d9ec0b9b1dbcf975bfdfb0079460a29dedb6e60236cf9a37814efdd900c6e8c8d4791deb2e81f37dfbbd6 SHA512 e03c7f02af2789a784284f10eed10e10edb82e2ad16d3794299cc9622c00a047f30df7f7d553ef572e265815684d1e783932e0f3b219cca44f0e1f74dc045944
 AUX hdapsd.init-20141024 2177 BLAKE2B c790b9899ca67ecee13a3af54dc821020f551ec35e94866328e28b00ea79eb2f8ba88e618d6b1d854add6024abb75f7fdc1393bfff853f16e2ab4bfb16e03799 SHA512 e45b7e6fafd047c6fe7b172ad552c23b0000b90099a9a12e5a09133258e90d5f121bfa5e8a638f1dcd35110e54fc1da2462cdd501ebb65878286f623c7baa6dc
 DIST hdapsd-20141203.tar.gz 128818 BLAKE2B 0219e30e032032dfd729e97f526eb7402fe4cb72245589ef03cca28f75a6e1f2cbfa55c5aa5599b24f496bbe662467077415fbec47caa1db17d6108e07292daa SHA512 19c1a8b362f15864b71f4fb221c0993b43b3b2d965d5826af06fb9f6b0e345e5da99181493e13e230c7fe77060ae5b373027e8ec90a511566a6ccaef43998178
-EBUILD hdapsd-20141203.ebuild 2154 BLAKE2B 3561753e8efbac87b7867c9234cf1e27c9ecc781b464ce44229c32c4d3017ff45686cc679fb3ba459eb63e25f9bf68bcb1134952ad314fc2a3c8013c72e1909c SHA512 0fbba830babe951438dac9c9f860fc492f232f362479634a8a9cf509ae2f7009af4a23c7791006462a0b14326d76e30bb7afb0ff5c17cc94ded05f14b8978546
+EBUILD hdapsd-20141203.ebuild 2155 BLAKE2B 99c02479bb079dd12bef59dd90e2a319feceacc2fb763f9383e6330b2d31e9299a7364e34512cf8411b6096544a6b091f643f4e531498fe9c79986af8c132261 SHA512 1dbae742626dbdfed5d1a8ffec94d4c9c6c6546d46cde21bd33966d06f322d0180b4823dbe878b99d1c9ae1071b94aa4c9a0b740262633c63c2ed1d658cbe234
 MISC metadata.xml 673 BLAKE2B d0dd1b8ff7d65cf628b0bd9841072a578953fec9d343a87ff91666de3f74079e911ce578a732b32cd6a3709c92ae6dcf13ac899d635f84e67c770af6212a315a SHA512 296b864ed6a816faa8dd2e65471cb74a0b8a99b29dcf315bc4d31cb81f77a1c7982cc1f1929b2331ae57d0bef3a73273793b0b8da04142d0df13d364c3ab6545
diff --git a/app-laptop/hdapsd/hdapsd-20141203.ebuild b/app-laptop/hdapsd/hdapsd-20141203.ebuild
index df52add2e9f8..a3bd8b6ccd89 100644
--- a/app-laptop/hdapsd/hdapsd-20141203.ebuild
+++ b/app-laptop/hdapsd/hdapsd-20141203.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit linux-info readme.gentoo systemd
 
 DESCRIPTION="IBM ThinkPad Hard Drive Active Protection System (HDAPS) daemon"
-HOMEPAGE="https://github.com/evgeni/${PN}/"
+HOMEPAGE="https://github.com/evgeni/hdapsd/"
 SRC_URI="https://github.com/evgeni/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 5febeec2f067..6ee0990aefe6 100644
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
diff --git a/app-metrics/collectd/Manifest b/app-metrics/collectd/Manifest
index 00f0117c6ab8..0ced1aacc628 100644
--- a/app-metrics/collectd/Manifest
+++ b/app-metrics/collectd/Manifest
@@ -8,8 +8,8 @@ DIST collectd-5.10.0.tar.bz2 1856377 BLAKE2B d4c011c5d2d9bfcf8400a35ca92f0b8c82f
 DIST collectd-5.8.1.tar.bz2 1789228 BLAKE2B 739f961172978db33bdf95c8f93bde0036a26b2ed2abd3396a734d4b97c4ae117bb26a62fcdbb3d77bd63d9f64a38f83d0c8a0665e8fa7bf5ed2efc6838b0e8e SHA512 8c75448c6e59ee1ea5c1cf486c07040d20fb36d5b7a1be2ab45facea330166e8c1d1fa38e3fa82ec905428d7b2c92c66aae35ee8e3546f67ce76f7f410739901
 DIST collectd-5.9.1.tar.gz 1501178 BLAKE2B ed0984637161427f3b354002850b7ea8c49a4aca64b637b864e5513c8057f52a4a479477b21e2a4cff436728c16d66c6d561df14308adcaeb7d597c290f543ce SHA512 424ef12a3ba6997a71e6eda1a62d73fec588c9c4d90542c2381c1f9f4e118b2c02e18c71507e8984e20fb255b69b7f42afe83085b3df5e225c576d1eee1655fb
 DIST collectd-5.9.2.tar.gz 1501275 BLAKE2B f878dc9ee0d1948643dcbfcf3a427558a1c17adedcc31f02f4f4bb689e841760dcf732866c0617b8b139b4aecb094f8ca4aa5e7c7c707adf5589fc8767a1d2f9 SHA512 cbbc8d6409242108550b974f388d15c6084753dd51c6056614db34bceb3b72abb0237892ea65086093b9a5c5569087666c0430eb16021d22c3dde8e6d1ae7922
-EBUILD collectd-5.10.0.ebuild 19531 BLAKE2B 0ed64c914062c6a4c894bb922e9c9bdb0c4c583c41c771082ea52becc588941b754e193198762c97fbc194a45e1c9e7daed4073b3374617ed9081fdf97c33184 SHA512 af2a1228ee6f79f829a5f6168d36cf3dfa0f91a23188a273f1572e19f7afd17658f0a8ad02f5d434b066e0cb251110556413b5af5052ba31838392812b17dda0
-EBUILD collectd-5.8.1-r1.ebuild 19435 BLAKE2B e7fb35e135984fd275a0404602f47ee9cda72637b1d488d281de1d9e5b326e481f5a976f50025b1db892f4b1ebc452b64ec85864d2ee76ce26c07ee5ebab7557 SHA512 7b26db67f303163ea1eaff8d065e05e214b5dc243bf6ace9cb7a354c9fadd2439f17ef7a9347def06fa18add4c58c8f91f463f1702e7a59dac792d2c22a92b00
-EBUILD collectd-5.9.1-r2.ebuild 19593 BLAKE2B 15522042239a71ffdaf91e78822a2acc3992c684b7255039c2433d2f8214c7705ddc758e3f964e8a8a8476b049024e4156d563bcd90242733b3600d07e4a9978 SHA512 96ef357f9110967c68c5ed897406c3d20e017db65206619b10ae0b525f91534035ba91cc6972a7d51b5c12a9ab57f1880444048538127d0e49a41efd57c7fd7f
-EBUILD collectd-5.9.2.ebuild 19549 BLAKE2B b3f7cf9159ad7c0869a7d7fe171f1a381e2569dca07532ee159afb8ad6135cef9972a137de7c152e75dd53a435224e136ceedab84b96f9582035f84b9ae71c1b SHA512 224e60339f6330cdc215951bb4525a1d75a738d26ab5437a0fb51dba9e976b22dc13e0c9e0715d88ae9e5fde6ddcdd1f7882300c360bd20463e41ee02be4d455
+EBUILD collectd-5.10.0.ebuild 19527 BLAKE2B 0f7d6e210aa2113b2526fbba6a259d2f658afad37db3eaba04a122467d5f4de48409e01a40584f6d4cce3dc0b4b182dd85d0229ac673871afdd0836641e35952 SHA512 cca038cee7ad04c2fcc1769f55d587b2c8a70e0e64bb8f4903272d4b714dca798a7d4474e15271c4144161169976e2f89570ed9e98509e086ef3e755be276366
+EBUILD collectd-5.8.1-r1.ebuild 19431 BLAKE2B 4ba662b99a92c6e559c206f3b6830c665613d1a13fae078017d4ab4b1097a7d1b9f89985c65172c1d1fcb2871f32d26435cfd4c4624d14a0975819f985b72d36 SHA512 5d278a9f7839be03cb7c791b304df6220834b75c8e370b2e7582cd93b7afbda954ed198e91e4609b401fc797866125146d7c405d15c1e8fe96870494013b65a9
+EBUILD collectd-5.9.1-r2.ebuild 19589 BLAKE2B cb36bb60043a70054fa62e096bac07132dab358ed4141534f5be932aeda1f1befb5092a79d93034e6b11daaad03f7ce8330dcdc049fea49c96474cb8d127b266 SHA512 ac5a622218ad872978824a60e856bea0432f7f75bb264c7b1b94a7ad6fc39c1c3ac16b872dfb6da3962a07bb9e64ed5f46a97a1db52673186e1f65718237d5de
+EBUILD collectd-5.9.2.ebuild 19545 BLAKE2B 37c739d10a0d8d1a165f6861e996b035456d1a8bcdb826d6fc83ccf931830dc6bbd7810722984bf406e073f88e0721dc07c9bc361c5ce27ccf623a1ec4f1ed81 SHA512 6d0bc28c6e767233b5be2aca4059269a589919b5e7f3d5c5319fc03664fb717db254cfc8aebf5716bd4067daabf38f55ef23c861d149cf1b98bb841267c91478
 MISC metadata.xml 1515 BLAKE2B 5525766b822463f94f7c2cddbdf78b4c4ea5a473880a473d0b51481d948569cfc7f51bd2e74eb67065ab2be1b23e4fb7ee99512d018c6e6b5ac1ee7331eae9eb SHA512 51c17c16d27b722d729d036d67c562ab76e212dac9bcd004a7e43c2c5e041b8c46e74f9a130f30c2e18cc95ca1b367034246eff02cfaf55f6f9375ff836749e5
diff --git a/app-metrics/collectd/collectd-5.10.0.ebuild b/app-metrics/collectd/collectd-5.10.0.ebuild
index ae50631c0bc1..530c351a2efd 100644
--- a/app-metrics/collectd/collectd-5.10.0.ebuild
+++ b/app-metrics/collectd/collectd-5.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
diff --git a/app-metrics/collectd/collectd-5.8.1-r1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
index 54d65f2b928b..8c6d11da7572 100644
--- a/app-metrics/collectd/collectd-5.8.1-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.8.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
diff --git a/app-metrics/collectd/collectd-5.9.1-r2.ebuild b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
index efb841270073..e35d63e83872 100644
--- a/app-metrics/collectd/collectd-5.9.1-r2.ebuild
+++ b/app-metrics/collectd/collectd-5.9.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
diff --git a/app-metrics/collectd/collectd-5.9.2.ebuild b/app-metrics/collectd/collectd-5.9.2.ebuild
index 5c75f25d1a37..689a52ab817d 100644
--- a/app-metrics/collectd/collectd-5.9.2.ebuild
+++ b/app-metrics/collectd/collectd-5.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 
 inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd tmpfiles user
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7990eeca4e3f..74bacfd3969e 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index f424a9d18d51..d1b3c5a8a952 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -2,7 +2,7 @@ AUX anki-2.1.0_beta25-web-folder.patch 498 BLAKE2B 5a89ac454e8b4c551c7593bc8d428
 DIST anki-2.1.0_beta25.tgz 4117303 BLAKE2B 0f7021c4da4efa918c285fa6bf85242e52999d0f340d4a882651cf1e2857ac015f6f99967d4a7fee6df92a2b3c4849eb838707b08abd04d534f4d21ce28eb749 SHA512 9ddf984c575df00fe9b7974f24166a0f18d63e904b3d9bd4370de506828a251efed0fb319f06dc23c6852aae46e552994c6633880603a6e746d4d242b9e627f8
 DIST anki-2.1.0_beta27.tgz 4127906 BLAKE2B b4f83cc30dc3e89f3ca17c03ba8dcfc9a487de43d8ac564d5dc83488e286c302816c8a8140aa764b596404194c5f3727218deec303ef201ccaef38b945d8b32d SHA512 50b4ece1361ecafdfe08dad04e9b622b1e8ba2224bfef7e4660c95f81cb8f525d892170548d741ff53bc19ff4c13863f488a71c31c8328511fea3203d2c345f1
 DIST anki-2.1.13.tgz 4248906 BLAKE2B 82a2a9a556cbf3596af22a73a2865815561cdd408b249443fc7e144734fdc2b62317120db71475afd7b0d4027f19e53c47437132028ef78b158ec3624f54a33f SHA512 921ef48b16c0c8c83b85523aa0a5b828210b210cd51fa471f57e9aa6777a1aced30c7e24084ef0c2f14c9d846a19091923d13faaff7ed9075860fc23f8ba1cd3
-EBUILD anki-2.1.0_beta25.ebuild 1905 BLAKE2B 829fae8c282bf4e1cd4fbce8f316b08f038da25f88563b07844c689d195483bc8639d7ed52901e7fae9414dad6d8ec97a1c07c235b22bc074a2bd6f987394265 SHA512 e32db8ebf71b6179a243a47c914be8ee0c2c5fbd3b7fc1f11edd0e59ab89b232160239bf51e5680028568e45337e786e73013ace994c82344dbe5ed6d599e7eb
-EBUILD anki-2.1.0_beta27.ebuild 2072 BLAKE2B e75ad518d27e1214490522445fa0e77aa446816a84c393fecfa3900b98b33ae46043daaa2bbc3f5d94df504307bd49dded57a97bbda1b7eb054d9eb67dffa015 SHA512 7601927a486cd07af40881c9f4763dde1b6752ee161705bf1adf3fab9ccb01423e69b975cae6e7f97f08fbb9ff00a3e22418c02f30d48ea9661b46778867a1b9
-EBUILD anki-2.1.13.ebuild 2180 BLAKE2B 66911e134bf317bf589c3a470d380a2dc1d9df543942a8e1c618658de59b22c10747deee8fa335cdf77d8f81d04d7431b364c80a5272373771762daa1c19c7db SHA512 dc2c6c7374c56c9961c44de9842e3a468e08f540cb06591de5cb77090bff6ad68a93bd7bda3c74e502518dae470b87b66d3641e7d31ee6310cb275ceec7c3968
+EBUILD anki-2.1.0_beta25.ebuild 2034 BLAKE2B 92f9982dae6bf17a571ffca9dbbe9562fc13747d9d21452744b5bddcef5b038507218f914b5932f93b69833f25344a1631c15cd3d1625a09ab7310bec89ffb2b SHA512 6b8fa96df089ec57332f1bd5acafacca6ea1d16c6b3efb56a62aa0f93389bf3923bd00b1eda5df95dedc41cec17bd9856c868288262120c68e30b3df0771a97d
+EBUILD anki-2.1.0_beta27.ebuild 2219 BLAKE2B 76dcaf2ceb91906c74149db1559499628b86ce8a3491109da81d02a8c3eff1ecc94a4eb5cf06ce01e10aca4a6b2cc53bf71c962e3d607d7062face38f1dec2c6 SHA512 4261913d808ec9dae0f26b799f0a96fc8d225202626d9ee590fe3634b2d10f74514ba1a00401cf055a153251b243698c8463a05204e8baf0d528aae07da637b5
+EBUILD anki-2.1.13-r1.ebuild 2317 BLAKE2B d14f2116c5f2358160e80dcdfcd109dc0dd3c968cac8e5e5ed5ccf0047b87ebae804f7e68e0368a1f0504e590631b37e9590c1bd92bf7d66493b2bc44ad23075 SHA512 22cc7c60afeb37590c74bb7710e418a8cccf7efee418788cc4de06483ff053c2b50ce461229e1577834d47ee4099647da1212ad3e31d8dd76c64986782c98150
 MISC metadata.xml 619 BLAKE2B a41d6e72dccb367627bfc34855a7f2dc657021907f1940c837ea99f134bf30cccb84157c6eea96944fee4e4d5275c329b5721abcabfb31b3a572b86789cd0ed2 SHA512 8b6656964a3c2cee9761b278839f31546a3fe2a4efd500cd015658af3502b548888e939bbeee45ead9c88632ade12c7f0ed33fcf8cdfc6d0ac91de63ac8bb351
diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild
index 7a709e1e39e3..7e5c0bc5b290 100644
--- a/app-misc/anki/anki-2.1.0_beta25.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,17 +23,19 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	recording? (
-		media-sound/lame
-		>=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,svg,webkit,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		recording? (
+			media-sound/lame
+			>=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	sound? ( media-video/mplayer )
 	latex? (
 		app-text/texlive
@@ -41,7 +43,11 @@ RDEPEND="${PYTHON_DEPS}
 	)
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 
 PATCHES=( "${FILESDIR}"/${P}-web-folder.patch )
diff --git a/app-misc/anki/anki-2.1.0_beta27.ebuild b/app-misc/anki/anki-2.1.0_beta27.ebuild
index 341c641fe86e..9b0a46164d62 100644
--- a/app-misc/anki/anki-2.1.0_beta27.ebuild
+++ b/app-misc/anki/anki-2.1.0_beta27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,23 +23,25 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	|| (
-		(
-			>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			(
+				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+			)
+			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
 		)
-		<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
-	)
-	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	recording? (
-		media-sound/lame
-		>=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
-	)
+		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		recording? (
+			media-sound/lame
+			>=dev-python/pyaudio-0.2.4[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	sound? ( media-video/mplayer )
 	latex? (
 		app-text/texlive
@@ -47,7 +49,11 @@ RDEPEND="${PYTHON_DEPS}
 	)
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
diff --git a/app-misc/anki/anki-2.1.13-r1.ebuild b/app-misc/anki/anki-2.1.13-r1.ebuild
new file mode 100644
index 000000000000..9c1a33eea458
--- /dev/null
+++ b/app-misc/anki/anki-2.1.13-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 xdg
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="https://apps.ankiweb.net"
+SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz"
+
+S="${WORKDIR}/${P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex +recording +sound test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		|| (
+			(
+				>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+				dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+			)
+			<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/httplib2-0.7.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
+	recording? ( media-sound/lame )
+	sound? ( media-video/mpv )
+	latex? (
+		app-text/texlive
+		app-text/dvipng
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/updates=True/updates=False/" \
+		aqt/profiles.py || die
+}
+
+src_compile() {
+	:;
+}
+
+src_test() {
+	sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests\":" \
+		-i tools/tests.sh || die
+	sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests3\":" \
+		-i tools/tests.sh || die
+	sed -e "s:which nosetests3:which ${EROOT}usr/bin/nosetests3:" \
+		-i tools/tests.sh || die
+	./tools/tests.sh || die
+}
+
+src_install() {
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+	doman ${PN}.1
+
+	dodoc README.md README.development
+	python_domodule aqt anki
+	python_newscript runanki anki
+
+	# Localization files go into the anki directory:
+	python_moduleinto anki
+	python_domodule locale
+
+	# not sure if this is correct, but
+	# site-packages/aqt/mediasrv.py wants the directory
+	insinto /usr/share/anki
+	doins -r web
+}
diff --git a/app-misc/anki/anki-2.1.13.ebuild b/app-misc/anki/anki-2.1.13.ebuild
deleted file mode 100644
index 15c2f2cdf075..000000000000
--- a/app-misc/anki/anki-2.1.13.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 xdg
-
-DESCRIPTION="A spaced-repetition memory training program (flash cards)"
-HOMEPAGE="https://apps.ankiweb.net"
-SRC_URI="https://apps.ankiweb.net/downloads/current/${P}-source.tgz -> ${P}.tgz"
-
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="latex +recording +sound test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		(
-			>=dev-python/PyQt5-5.12[gui,svg,widgets,${PYTHON_USEDEP}]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		<dev-python/PyQt5-5.12[gui,svg,webengine,widgets,${PYTHON_USEDEP}]
-	)
-	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	recording? ( media-sound/lame )
-	sound? ( media-video/mpv )
-	latex? (
-		app-text/texlive
-		app-text/dvipng
-	)
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0_beta25-web-folder.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/updates=True/updates=False/" \
-		aqt/profiles.py || die
-}
-
-src_compile() {
-	:;
-}
-
-src_test() {
-	sed -e "s:nose=nosetests$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests\":" \
-		-i tools/tests.sh || die
-	sed -e "s:nose=nosetests3$:nose=\"${EPYTHON} ${EROOT}usr/bin/nosetests3\":" \
-		-i tools/tests.sh || die
-	sed -e "s:which nosetests3:which ${EROOT}usr/bin/nosetests3:" \
-		-i tools/tests.sh || die
-	./tools/tests.sh || die
-}
-
-src_install() {
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-	doman ${PN}.1
-
-	dodoc README.md README.development
-	python_domodule aqt anki
-	python_newscript runanki anki
-
-	# Localization files go into the anki directory:
-	python_moduleinto anki
-	python_domodule locale
-
-	# not sure if this is correct, but
-	# site-packages/aqt/mediasrv.py wants the directory
-	insinto /usr/share/anki
-	doins -r web
-}
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 5c8c8c1cbfc1..777a0bc21ffc 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -3,9 +3,9 @@ DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e8968
 DIST byobu_5.125.orig.tar.gz 582407 BLAKE2B 7e74e121422bd9875697a96f39ab2e8e8f9d7f724ab8a597d2483bdbe89b3887e1894069dbe9b6ce75e610580b1bb002cfc632b6f2b8884db229382a719c86ea SHA512 cf5ef0e8902552fcfe839793b660454a6480154e0a315322311cecbc962ccf31aec5a6de035b7e83979d49058a64b222bade146163c31bd597feeed11c0a94b1
 DIST byobu_5.129.orig.tar.gz 758633 BLAKE2B 1ba446a5f1571bd36f7bf3e620d09022b93323e6f422067a4be0dfe28ee8332db481d99bb1000aa48d384efca33f76e5e42d7d1b795f527e95a17119936966cc SHA512 a555e2084863ac604c3a511e11339a65059058af454eeeeb24993c5e432b42527382d3b1d308996a732e190157dbc6f003d11bd5a611cd59799fdfbb3f9a5fe4
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
-EBUILD byobu-5.123.ebuild 944 BLAKE2B a35be83cc51db13385b74be9d9d1d78ab08900c4074eee26e53c98739ac494e78da2d05aa26d2503cc1b87fb37797f01debc17c5ad3762de0bb557abbdc04126 SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85
-EBUILD byobu-5.124.ebuild 946 BLAKE2B d688877e98d148332c753143ccaa5c6bae3d60b78338947c489ecd02664a348dc2902d6a151b7f1012b46e6b35a9866a220e2b550662c73e167cb58a7f81264b SHA512 468978f2398a70477a5b62df314507b44891b29fe4df4f8424f5be639238f9f997a39debeedfc3ddf30a60f447147fdb2d50707d2c98d6f7b73fb3836773e115
-EBUILD byobu-5.125.ebuild 946 BLAKE2B 42fba6e3128dd545ca139484b3749c8868e96ef0062d4b48b81b462073d1f1d673d2a57ab2efffd67e0c6a7cfa647955a1fe021615e2ee13cc82d2c2e95acd66 SHA512 3fe3808e439bfddb8b5b3c393b947ec22f9ec4d965ae30ac59259fb1032328e945d2b57f010a3c84ef3ac138bde07dfecf86b76e5e618ef360bff7626cbfc7e5
-EBUILD byobu-5.129.ebuild 953 BLAKE2B 3893b4509dc2bff9352a6b7020f8c8561b13d4943a6ab8a95547f039273cf3ce6cec1084a7a2eedae7ccd52840c926b528eea2cf46d6aa5c67953f91574d33fa SHA512 d68d1733611739bb6d76524619d7dbbc9d8935d1f53bcdd3e88a3d10b4755621bf78df6640659db9e6729edd7773c7809dce5fe451fd326c72ed68c547cfce9e
-EBUILD byobu-5.130.ebuild 949 BLAKE2B e1ea4e9574d0b5288326c75f4bf1c834c300f04440d28fc018a72d5bb4c997d6f11b9254f5d1b0b17c5140776224cf0cd5bc3441d897c6c1cf6718997f364a97 SHA512 abb25ef5a65f87abd90bdec6257e461e98f1ddc8a26fa0ea4b3d1f1213000d45e0c6a9b6a050094290c598a4de234187efab0f5e185bd5b21bde3c82a694daee
+EBUILD byobu-5.123-r1.ebuild 977 BLAKE2B a2f8b13b92d9bd618c46c6e2c9683a449fbfa68421e7713a602527a2f111192390d8f59a94308ee5a339585030586ec9f190e56ad04a33e8561afdc1f66ebcbd SHA512 2e3a4037f9608ea420bc321ada67ddd876f6439ef758f20f77ce079e61479de654d3ddce5d78f3d4d0cd40bd1e387c1b3e61179467564889d1ed3713fe47e0a4
+EBUILD byobu-5.124.ebuild 979 BLAKE2B 806914a9df9c9443e22840b2894ec6a7ab7607311ef497f94b98af5309411625133f0966a21c2ca902ae5c2f58be9e61d9e23704dcb66fd725a84e8f713111d9 SHA512 5a0be3feb1cd56710d8acc5723b98dd53a5aaca13b3e191b9e95ee1448450154eb8f981a8a3a864c6f9d01198c1b6d136ecc0e58b9fcf0a1dc856ef8facb8eed
+EBUILD byobu-5.125.ebuild 979 BLAKE2B 806914a9df9c9443e22840b2894ec6a7ab7607311ef497f94b98af5309411625133f0966a21c2ca902ae5c2f58be9e61d9e23704dcb66fd725a84e8f713111d9 SHA512 5a0be3feb1cd56710d8acc5723b98dd53a5aaca13b3e191b9e95ee1448450154eb8f981a8a3a864c6f9d01198c1b6d136ecc0e58b9fcf0a1dc856ef8facb8eed
+EBUILD byobu-5.129.ebuild 989 BLAKE2B d733be11979684db1df4dc8aa2ad17febf9db4a556fe78653a2cbea159e5ec0f57efea905ee77e025fa8f1b03dd5fcbb22ed94da762d717f76b7d38efb3ffe28 SHA512 9bf5f039c393f6ce7982673a6126d23eaecad86a42d2567dee54b124bf96cbd570e8bbf5a5f53ae2b6fe269c04d0093d3808eab1beb60faefe7561f1916b7485
+EBUILD byobu-5.130-r1.ebuild 985 BLAKE2B 371e7c2662f57d4504cb756b29c1240e74c7d1e55b16aa71720d157914109ac85f0b7241c92aafcd2bd86af9259fd3299eaf8b43b0658b0182215bf368c973c1 SHA512 cc6283a7165bb1ca3eca688c9dbd8e79b04269de7402ab2107069b72065b9a5b94dde68eb7bf36adda2707ac3e19122446fe78b86da33d513d5cad3f2e226068
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.123-r1.ebuild b/app-misc/byobu/byobu-5.123-r1.ebuild
new file mode 100644
index 000000000000..058f7590d893
--- /dev/null
+++ b/app-misc/byobu/byobu-5.123-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/byobu/byobu-5.123.ebuild b/app-misc/byobu/byobu-5.123.ebuild
deleted file mode 100644
index 33c36ce0cdc5..000000000000
--- a/app-misc/byobu/byobu-5.123.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="screen"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
-	screen? ( app-misc/screen )
-	!screen? ( app-misc/tmux )"
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Set default system backend to screen
-	if use screen ; then
-		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
-	fi
-}
-
-src_install() {
-	default
-
-	# Create symlinks for backends
-	dosym ${PN} /usr/bin/${PN}-screen
-	dosym ${PN} /usr/bin/${PN}-tmux
-
-	docompress -x /usr/share/doc/${PN}
-}
diff --git a/app-misc/byobu/byobu-5.124.ebuild b/app-misc/byobu/byobu-5.124.ebuild
index f67cbf99d559..b8e2216b67cf 100644
--- a/app-misc/byobu/byobu-5.124.ebuild
+++ b/app-misc/byobu/byobu-5.124.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,9 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/byobu/byobu-5.125.ebuild b/app-misc/byobu/byobu-5.125.ebuild
index d3b11ec6f89f..b8e2216b67cf 100644
--- a/app-misc/byobu/byobu-5.125.ebuild
+++ b/app-misc/byobu/byobu-5.125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,9 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/byobu/byobu-5.129.ebuild b/app-misc/byobu/byobu-5.129.ebuild
index ccb44bcb8188..2719fbfec1c4 100644
--- a/app-misc/byobu/byobu-5.129.ebuild
+++ b/app-misc/byobu/byobu-5.129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,9 @@ IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
 	screen? ( app-misc/screen )
 	!screen? ( app-misc/tmux )"
 
diff --git a/app-misc/byobu/byobu-5.130-r1.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
new file mode 100644
index 000000000000..59b72cc7ec64
--- /dev/null
+++ b/app-misc/byobu/byobu-5.130-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/newt[${PYTHON_MULTI_USEDEP}]
+	')
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/byobu/byobu-5.130.ebuild b/app-misc/byobu/byobu-5.130.ebuild
deleted file mode 100644
index 9a6ddebbb407..000000000000
--- a/app-misc/byobu/byobu-5.130.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-single-r1
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="screen"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
-	screen? ( app-misc/screen )
-	!screen? ( app-misc/tmux )"
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Set default system backend to screen
-	if use screen ; then
-		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
-	fi
-}
-
-src_install() {
-	default
-
-	# Create symlinks for backends
-	dosym ${PN} /usr/bin/${PN}-screen
-	dosym ${PN} /usr/bin/${PN}-tmux
-
-	docompress -x /usr/share/doc/${PN}
-}
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 8c70d8dc0b9e..be732362beed 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,5 +2,5 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d
 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20190110.3.43.ebuild 5778 BLAKE2B 9aec117e4d8c24df3440bd594a0781699daca17683fd07ff653a4c05cf8bfc9d416a934e0b27c15797774127bed1879793a1667dd962ea91161d880b7d3c2061 SHA512 35750546f115661f99d466cd76787412d669b21beda840a67ce7bbc942a16655054a31a6777fb837bb03a9b36003f4c78191db0eb644ce55b63108219638cdfc
+EBUILD ca-certificates-20190110.3.43.ebuild 5772 BLAKE2B 698479fee419513c09f452612600ba383595f77a478e1bf3299bd5f3c49b03bfe482afef23d4cd4226ee8d2933d85961d1273fa0b42133e63c0b4cc97657b94a SHA512 df794184f8d8baa57c730563ffdd65a6051ded9020229c4322317d72cab95968051a9e318c49d104aa882ca54093bd77944ef18f8389d09e827247272cfe51ed
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index ef88f80cf3ca..871207e9ae75 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils python-any-r1
 
diff --git a/app-misc/email2trac/Manifest b/app-misc/email2trac/Manifest
index 75251ff5718a..9bb9ac93c8f0 100644
--- a/app-misc/email2trac/Manifest
+++ b/app-misc/email2trac/Manifest
@@ -1,7 +1,7 @@
 DIST email2trac-2.6.2.tar.gz 104732 BLAKE2B 0121497f98aeb1c8374e03c5e68f6ccb669dbbff757379121bf34b3c670f2022e31c7bb91bf78f505f490025f028948db98727533f3cb434e5ab49a4548e1269 SHA512 69b596b4c60ccc40b53ddfce5c13d5d7f27ac1fc5674e1cb3fbf84b083c2abc77d36879d665924a62b826e7d3a52d0ead1e1d693a55aae5edfc092998e01a0df
 DIST email2trac-2.8.4.tar.gz 107791 BLAKE2B 69973aab1ff851917bd8db3fa1fc3495da65b9be274d3e433dfc46230a108494b2790441e0f801e4beeaf4126e6fe1ee37a7b2627108bb36e931cc6fe5186e81 SHA512 f0bfd00442d50090f9cc582849026b08bb091bc72223b4569597c2ffdb57759206500da65390dc1609a24e521e137aee072d1ee3412391bf0e4b778933ff2165
 DIST email2trac-2.8.8.tar.gz 108366 BLAKE2B cbe5acac3ca21f19ab630995173dd49b5edf30ebba1bbaf0c575c93d356f8337a1aa6e22c4dd526d6da80041fb8780ea41f773a56eeca5e986930243b34702ff SHA512 8b13d22b50367337e5ed939dc689e0fbde4a63e1932351cab6aac2da7878fd37c9a09ff6e9f9aa4a1f709f24f2808de5d25b494813e292f61ee9be973c601da5
-EBUILD email2trac-2.6.2-r1.ebuild 981 BLAKE2B 176d7107433347ff792ad41ae201bfea766e85609e3fce98fe2fc42b74e590b863fad540c70972ef03b9b022396890842f5556249f9d2342df6478e94e19b261 SHA512 6a8baee10560e563f1b09de0b042b8b06ff3254212e2f35a3ef07bce79327167a7d7ca85afe89acf0656bcdce5affb2ab999880227ebae7b35ba3d4cd238ad8c
-EBUILD email2trac-2.8.4.ebuild 981 BLAKE2B 4f2ccae782c9287e1440bdf2732efbaa4373371d2a9f6901907753431e47a5bdb90b29dc69015fd9a93ba99de923fd9a18deb4cabe078a5e699b2c38047eebce SHA512 56fc3b70aabae2ff8872b940a92d0c6144d0a96e2e1a5fba88b992dd4a703810fc7a55a2516af7911049e0d635f4d5ff3c62730150e0efc6e0632044df93596f
-EBUILD email2trac-2.8.8.ebuild 981 BLAKE2B 4f2ccae782c9287e1440bdf2732efbaa4373371d2a9f6901907753431e47a5bdb90b29dc69015fd9a93ba99de923fd9a18deb4cabe078a5e699b2c38047eebce SHA512 56fc3b70aabae2ff8872b940a92d0c6144d0a96e2e1a5fba88b992dd4a703810fc7a55a2516af7911049e0d635f4d5ff3c62730150e0efc6e0632044df93596f
+EBUILD email2trac-2.6.2-r1.ebuild 985 BLAKE2B 4fce5dcaab46ffbc3303dde2b00f29cfc48793cbc2f88e7161a76faf07e55b100904caf60cbfb932db0c697eef44dfc760c20e9cea58e57a6dac44c386bc353e SHA512 3bb3fd996dca7ea58d7a17f1efa0c84a5f459e619a02ec811571108e336a49f004ee73ec3f22b17259e44002731f54211ed7c37b97ab98ada51a3b092bbd5ba4
+EBUILD email2trac-2.8.4.ebuild 985 BLAKE2B c20f2da38621791216d7683217e6f1c9a8baaaefec5df5043a83d9d1882807425b6c4563f1c36359c9ffd4d2cc127257d3889611cfd099e21990999eb77e1ff5 SHA512 371b2901c7838d20007c1218fbce2737a2497d4d835fb1c080c41c1ffeb90eab50272bf8028846836489b9e0fa273e2ece70d5b26ed8fd286f1cc082982f3f4e
+EBUILD email2trac-2.8.8-r1.ebuild 985 BLAKE2B c20f2da38621791216d7683217e6f1c9a8baaaefec5df5043a83d9d1882807425b6c4563f1c36359c9ffd4d2cc127257d3889611cfd099e21990999eb77e1ff5 SHA512 371b2901c7838d20007c1218fbce2737a2497d4d835fb1c080c41c1ffeb90eab50272bf8028846836489b9e0fa273e2ece70d5b26ed8fd286f1cc082982f3f4e
 MISC metadata.xml 249 BLAKE2B 58e91668bbe25a94a9ee787048ee974f1cb6944ae51bdf9f872f7df04894f44b261855cee2124514219894d93c3b643f9a47bccdf63f9cb0f46adc75528664c9 SHA512 8a900abd5f574a3ada624556efcdc93f5702661e50e03ae696f24ddb8d20a64cbe3bf3f5c71a018c6ad285d580d58eadcf4efc583046532b98405c9629d8d61f
diff --git a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
index 8ab769b33c37..06cbb0e81cb7 100644
--- a/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
+++ b/app-misc/email2trac/email2trac-2.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.1[${PYTHON_USEDEP}]"
+		<www-apps/trac-1.1[${PYTHON_SINGLE_USEDEP}]"
 
 pkg_setup() {
 	einfo "You can set the following variables in make.conf:"
diff --git a/app-misc/email2trac/email2trac-2.8.4.ebuild b/app-misc/email2trac/email2trac-2.8.4.ebuild
index 7c7443a662c4..8ebdae6ac932 100644
--- a/app-misc/email2trac/email2trac-2.8.4.ebuild
+++ b/app-misc/email2trac/email2trac-2.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.2[${PYTHON_USEDEP}]"
+		<www-apps/trac-1.2[${PYTHON_SINGLE_USEDEP}]"
 
 pkg_setup() {
 	einfo "You can set the following variables in make.conf:"
diff --git a/app-misc/email2trac/email2trac-2.8.8-r1.ebuild b/app-misc/email2trac/email2trac-2.8.8-r1.ebuild
new file mode 100644
index 000000000000..8ebdae6ac932
--- /dev/null
+++ b/app-misc/email2trac/email2trac-2.8.8-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Utilities to convert emails to trac tickets"
+HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
+SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+		<www-apps/trac-1.2[${PYTHON_SINGLE_USEDEP}]"
+
+pkg_setup() {
+	einfo "You can set the following variables in make.conf:"
+	einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
+	einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
+		-e "s:\$(CC):& ${LDFLAGS} :" \
+		Makefile.in || die 'sed failed'
+}
+
+src_configure() {
+	econf --sysconfdir=/etc/${PN}/ \
+		--with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
+		--with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
+}
diff --git a/app-misc/email2trac/email2trac-2.8.8.ebuild b/app-misc/email2trac/email2trac-2.8.8.ebuild
deleted file mode 100644
index 7c7443a662c4..000000000000
--- a/app-misc/email2trac/email2trac-2.8.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Utilities to convert emails to trac tickets"
-HOMEPAGE="https://oss.trac.surfsara.nl/email2trac"
-SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-		<www-apps/trac-1.2[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	einfo "You can set the following variables in make.conf:"
-	einfo " - EMAIL2TRAC_TRAC_USER (default: apache)"
-	einfo " - EMAIL2TRAC_MTA_USER (default: nobody)"
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e "/^CFLAGS/s:=:&${CFLAGS} :" \
-		-e "s:\$(CC):& ${LDFLAGS} :" \
-		Makefile.in || die 'sed failed'
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/${PN}/ \
-		--with-trac_user=${EMAIL2TRAC_TRAC_USER:-apache} \
-		--with-mta_user=${EMAIL2TRAC_MTA_USER:-nobody}
-}
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index 67ba78ed94dd..e38e951aeb3c 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-0.20.7.tar.gz 1414198 BLAKE2B 18af2f136557d5d5674e05669839e1213c1c8234bfb2a14875057989040cae2955e7a569456a93fb181121afa796e711a8b26e26397d743dc6d3ac2eefd7088d SHA512 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
-EBUILD gentoo-0.20.7.ebuild 1289 BLAKE2B a43d3eb6af676e496126befe7d344df3a51d9a507ba05449f31f1e2e855323b292c9375399e09cb375f28c91a81bdc6aaa1c1c53ce96693093dddc8789004edd SHA512 817825036e24dfb3861cdbd91948fb6cf352c885b80142b682ade87b7086d7840c44bd60bcbc74118cacf61b1508def49faaae557d1ec644e71999db5a257970
+EBUILD gentoo-0.20.7.ebuild 1290 BLAKE2B d7a18ab5b6654dc0dd7dd64ac040f66956b1e05fdf0aa1c30950d5c95738c788454fc8caae68f584655b70c6681729dc2a7bf7cad86ac524f6f8d8e3aabe8199 SHA512 8d4226cee90afa68b7859c58f3de6596d679c8f168f6403b3d7443e5f2527c73eb3cab340e5338b3e37fdf538a4632b424aef8fc5591a6f298c1267d97b973ad
 MISC metadata.xml 352 BLAKE2B 72fa87ea40fa0242a63fb53b736533de198a19cbdbdd751ee68413ff914b064169cdf5df0b5abed6d3d757a8a044c40261abd25bbbfe90ee159264a703fa977b SHA512 ff05feda3a7284c70f12d7fe7f7beca8c49eeb120c6c7302c73f5c28f2f903ecb97cf91a8a374e7b0c86d9dfba1c80627274a30249a388a65390303dd09d194a
diff --git a/app-misc/gentoo/gentoo-0.20.7.ebuild b/app-misc/gentoo/gentoo-0.20.7.ebuild
index fc126a228ae8..97b5d95f31dd 100644
--- a/app-misc/gentoo/gentoo-0.20.7.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 293b98684dee..c3322e62e4ad 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,7 +1,7 @@
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
 DIST gramps-5.1.1.tar.gz 17281131 BLAKE2B e729183832799a66547bb3958b4892c69359ec8e506766f4c64450f8bec3bf253460850f54388fa73659243cd96679c787fbbb9d645214682df26041c43b2c56 SHA512 fee7df5d2df2ae202c5e8ff4b941df4db6675925f6fce185c0fae709dd35ecfd6a1b81c8266d3f417f4949bed4e39f984a56917e74f56a3f3e499a4353927c37
 DIST gramps-5.1.2.tar.gz 17304294 BLAKE2B 5d253f59e8312b5438922bcc00cce10368b75e45170d3b2f83be4b6226cb734dfd6e90bcde506aea9a572592f5f156aa0a1b977736df90b3eaff9bda3d592690 SHA512 12e88645d14717823457308cba55e1f6899e2a6aebcf281875261765f163529fd75512fca034db59816473c6542319166375bec6d5502e8e6a7c452bfc10c0ad
-EBUILD gramps-5.0.1.ebuild 1986 BLAKE2B 0c49f29b06afe4abf8610c01adbcb62ee44f42f36b0e96a81ce1c4e9fb5c14be19b5a87eedd75501a7d0ed2276b7886861806de2ea071ca86f6e604e7671c45c SHA512 41796aa75d8808e1f7b679230925a43e35adddf41331068128482e87bbbcfde599fb83a1dda4fb197e38e3f74c2b7813574fb6157c0bcb32dbce8e08bdbc0349
-EBUILD gramps-5.1.1.ebuild 1988 BLAKE2B 9c02efe72a2cf6f0388e8818240a5cff16371c185d1d60444544e9b946d9f133628878039e4530a98af970cdb9f0c7a401ee93b0245b8ffc19fe5abb063faee9 SHA512 da02bab29f0719ec42c73c198b50a44e16dcf0dd9ea17d4985dddcb8c8d3e7930e421ff3bf5d7630d6efccd615b261275d0a08448aab333899138da5f9f79517
-EBUILD gramps-5.1.2.ebuild 1992 BLAKE2B e29411b6361370100e81376b913b6abfcb47bf1969ef5bd6c4737b46ec00e7c49c68401d8c250e708b22ad5821803e3cd02471e40b98dbfd2b140afd67725eb9 SHA512 78dba9ac2b6dadc2fc03029eb20570074dd0465189c8d190c12b21052e9cd0829c9b2ad63ac6e45b5d3930055131c8dc3d754613f7571a696c879d90a1fb29cb
+EBUILD gramps-5.0.1-r1.ebuild 2050 BLAKE2B 74b0a5331425c3d66228d12bc7302acf3bfd072982321fee4d2e53c70ed1bb788d9e986f2716e696bac8d64e28149620215c278160b040d1aa031081025aeaad SHA512 14ce17792d6ecef68a42ad7b2b16f261bd045822c29ea404ff5f40f6be64cfdf231a694211067a01c79c369a95bae027fcf9072fe76ee1b6468b825df57e8fe3
+EBUILD gramps-5.1.1.ebuild 2052 BLAKE2B bd0885f5764b3bfe2287f6d22c6e09a88da0f194fa5159445c7d951b2119bb1fe5a040b24c0c458fbca24d3998e154e19439949304b3e5987e7821b43b7467ba SHA512 683e11aa8de69c81ac1529e2c160243390f8472597a07ab9851c28cc68d9a03fb39d45cf4f7c7d2fda546ac1150794b42f9c35a33eb9dd5c222e4d2ffec59c69
+EBUILD gramps-5.1.2-r1.ebuild 2056 BLAKE2B ba0b6cac1e1a66d0f946a352f2d9cbfc4c48ce04c082153e6fe06af38af9beb8f49fd68f470c26aae4f1f82bc74b81360ebfdb8d96e0091d44c7b6ec6565eba7 SHA512 cd2292377350beaaedcd9f94e5e6fd364b73c93072edfbc39018ff90eb8473f403e135f6a204460570e7955a2e25584243692f01ab3e6ab716b9ebd78dfc7a4a
 MISC metadata.xml 5598 BLAKE2B 4516bb11bb4fa57403d9b86409a073021dc9372b4d6d53af2c90cb31d5988b960ce4ab9f190b7e82948c1118f1fb0581bef1f8e1e4bbc9da8c294541eabbeda5 SHA512 74b37ffecc01f6c140f349d822ceedf20eb36af2c7a09faca53abaacede12d916cae4b514d066026600bd46d04943c4948dda7fe8c85e7e01714ebd24e428359
diff --git a/app-misc/gramps/gramps-5.0.1-r1.ebuild b/app-misc/gramps/gramps-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..e10ef31f3c22
--- /dev/null
+++ b/app-misc/gramps/gramps-5.0.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
+	')
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the $PF variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test_all() {
+	# GRAMPS builds just fine out of tree but it confuses its test suite.
+	# The following might be an ugly hack but at least it lets the tests
+	# run properly until either I or upstream have come up with something
+	# better.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/gramps/gramps-5.0.1.ebuild b/app-misc/gramps/gramps-5.0.1.ebuild
deleted file mode 100644
index 50a51f97b2cb..000000000000
--- a/app-misc/gramps/gramps-5.0.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+rcs +reports exif geo postscript spell"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-"
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-	)
-}
-
-python_test_all() {
-	# GRAMPS builds just fine out of tree but it confuses its test suite.
-	# The following might be an ugly hack but at least it lets the tests
-	# run properly until either I or upstream have come up with something
-	# better.
-	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
-		die "Failed to symlink build directory to source directory"
-
-	esetup.py test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-misc/gramps/gramps-5.1.1.ebuild b/app-misc/gramps/gramps-5.1.1.ebuild
index 70d6bfc83f93..b82dd8fcc4bf 100644
--- a/app-misc/gramps/gramps-5.1.1.ebuild
+++ b/app-misc/gramps/gramps-5.1.1.ebuild
@@ -19,16 +19,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+rcs +reports exif geo postscript spell"
 
 RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
+	')
 	gnome-base/librsvg:2
 	>x11-libs/gtk+-3.14.8:3[introspection]
 	x11-libs/pango[introspection]
 	x11-misc/xdg-utils
 	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
 	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	spell? ( app-text/gtkspell:3[introspection] )
 	rcs? ( dev-vcs/rcs )
diff --git a/app-misc/gramps/gramps-5.1.2-r1.ebuild b/app-misc/gramps/gramps-5.1.2-r1.ebuild
new file mode 100644
index 000000000000..6098483d6f9b
--- /dev/null
+++ b/app-misc/gramps/gramps-5.1.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+		dev-python/pyicu[${PYTHON_MULTI_USEDEP}]
+		exif? ( >=media-libs/gexiv2-0.5[${PYTHON_MULTI_USEDEP},introspection] )
+	')
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the $PF variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test_all() {
+	# Gramps builds just fine out of tree but it confuses its test suite.
+	# The following might be an ugly hack but at least it lets the tests
+	# run properly until either I or upstream have come up with something
+	# better.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/gramps/gramps-5.1.2.ebuild b/app-misc/gramps/gramps-5.1.2.ebuild
deleted file mode 100644
index 4d31c478eb8e..000000000000
--- a/app-misc/gramps/gramps-5.1.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite"
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+rcs +reports exif geo postscript spell"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-"
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-	)
-}
-
-python_test_all() {
-	# Gramps builds just fine out of tree but it confuses its test suite.
-	# The following might be an ugly hack but at least it lets the tests
-	# run properly until either I or upstream have come up with something
-	# better.
-	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
-		die "Failed to symlink build directory to source directory"
-
-	esetup.py test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index c06695315d9c..fe93c97ebc7a 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,3 +1,3 @@
 DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
-EBUILD hivex-1.3.14.ebuild 1859 BLAKE2B 0042949d8cf5c1bb481718ad45b57f7259d33d9726dd60e6f8a64c3e99f537b985371c26f285218f31efb00104fb2d9e2a0f373fc9bb62705dfb224a2595830f SHA512 f1d3c557ffca13131b6adbbe54e0fe9ce0c57513edaa7336268539400ab4b2f1940a2234c5cfd48e065388c9b39ee86c0049974fe4b3bd08a3afa19f62d80b60
+EBUILD hivex-1.3.14.ebuild 1849 BLAKE2B 0c138e91aba7d4bdd04680d34330123cba162564f1ccc70d8310d77de7ab87940bd3bc87f65a84a2585a194cafc821538a9674c2ec32eb45f001c7895c26d432 SHA512 0c25e80c4a57e7fdaec743ab7696149f68541468569d2f46353dc2c16e9441270108ebd5238b38cb96d25f1d74eda56b3afb0d9636200edd730b6df5f8a5d97a
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.14.ebuild b/app-misc/hivex/hivex-1.3.14.ebuild
index 2e226ec0f396..9f629900febb 100644
--- a/app-misc/hivex/hivex-1.3.14.ebuild
+++ b/app-misc/hivex/hivex-1.3.14.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25"
 RUBY_OPTIONAL=yes
 
-PYTHON_COMPAT=(python2_7 python3_6)
+PYTHON_COMPAT=(python3_6)
 
 inherit eutils perl-module ruby-ng python-single-r1
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index ae47c84b4e60..1a8533293f99 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -8,7 +8,7 @@ AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1-r1.ebuild 3738 BLAKE2B faecad30946682bae43b79958bf28a104c30ddd15ef16bfcddf2774e0071258152ff7bc8b63ddd4331aa2079f930f8474b2f59b7775501f57860db305f1160d2 SHA512 1c52edcbd2098e792b7b3d8c3e31d62b64548cf8b256ea63b5adf7781cfac79bb563b678a661f4cc5db898a172ba5330f26005267feb7ccfeeeea261b690995d
-EBUILD lirc-0.10.1-r2.ebuild 3785 BLAKE2B 64b727b5e693af133653912abd70ab6190857c5eced7f632ab4bbf1cf0516a1c8e717cb3175ecf2f4be41b1d07d5523218a397d44d21aaa9792f06cc4ef0a4e6 SHA512 263eef1f495adb0d98a315f6ea16b456b29d33d976ef5d5272a5afa2c56db736b3d9688426700ec414d8645d484609e8efc8883f86af10ad1fd8221256ef1900
-EBUILD lirc-0.10.1.ebuild 3724 BLAKE2B a6a2bfcc0ccc61b06dc0e9187c5b4d6f9e92d03e054e289b014997785d5de84c81cc926c41d6485eaace39e6693c9edb2e977470b2a6bd9e7669b1d6819c9f0f SHA512 f5f5d939a0554e95b4e8737522630913d047800754c5495313a2bed96487e7f70fb5467c84497ac63fb93e10011eea930fd0d931d41ec2d34a923f6e02366fee
+EBUILD lirc-0.10.1-r3.ebuild 3848 BLAKE2B 86b6a69cc1b3127806884dd52cba85aea21a7621aa21fe46daebdd250bf7f8e98da1347c0f7caaaddae06696724bc82b07ffecb21390878487d3329a95829a6e SHA512 75ba28d58e744557c82f7aa9de722ee703c0596cc769726a5480b469b32d295b956d65d02fe3a13fd59611f95c5eaadd53f5af8d6ad4c95965da1488f1be7937
+EBUILD lirc-0.10.1-r4.ebuild 3895 BLAKE2B 5b598a3a94abf8a80710f643b264fcbbdd18cfea180118db6fba9ebbe68fd23a0f4b17d9bb363226448da163c93c65b594b966eaa21d4598c9fe9e25c95208df SHA512 f276a6c04cbd28c54a140428dbb22c98cdd664e709c8432a35d0249006761712a46a8343a88a9596573ddda8c4bc0c444587ddae40d0dc7ea1544edda8f157b9
+EBUILD lirc-0.10.1.ebuild 3834 BLAKE2B 3f449d519f75120f7a558fb626562e2cd178e783993a980b6e04018b05249e46a51432ece7137a721cb87e679a3535e66fce54df17a075970d9fd97d2226e319 SHA512 514a8c5a44baaf0ad87f86a06050c90da3bba5f2b2038e6e7a5a36f85e2792bf6c7546a7144a1ef418afeeae608b0fc3ff4bf3e16d7a6e418abade771e15defd
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild
deleted file mode 100644
index af0e1339c581..000000000000
--- a/app-misc/lirc/lirc-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/-}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	ftdi? ( dev-embedded/libftdi:0 )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:0 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-unsafe-load.patch"
-)
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
-	python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(use_enable devinput) \
-		$(use_enable uinput) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	if use !gtk ; then
-		# lirc-setup requires gtk
-		rm "${ED}"/usr/bin/lirc-setup || die
-	fi
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${ED}"/var/run/lirc || die
-	rm -d "${ED}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT}/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.10.1-r2.ebuild b/app-misc/lirc/lirc-0.10.1-r2.ebuild
deleted file mode 100644
index 8454fbe9244e..000000000000
--- a/app-misc/lirc/lirc-0.10.1-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/-}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	ftdi? ( dev-embedded/libftdi:0 )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:0 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-unsafe-load.patch"
-	"${FILESDIR}/${P}-runtimedirectory.patch"
-)
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
-	python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(use_enable devinput) \
-		$(use_enable uinput) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	if use !gtk ; then
-		# lirc-setup requires gtk
-		rm "${ED}"/usr/bin/lirc-setup || die
-	fi
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${ED}"/var/run/lirc || die
-	rm -d "${ED}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
-		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT}/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.10.1-r3.ebuild b/app-misc/lirc/lirc-0.10.1-r3.ebuild
new file mode 100644
index 000000000000..368f73717811
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.1-r3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	audio? (
+		>media-libs/portaudio-18
+		media-libs/alsa-lib
+	)
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
+	ftdi? ( dev-embedded/libftdi:0 )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:0 )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxslt
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+	doc? ( app-doc/doxygen )
+	sys-apps/kmod
+	sys-kernel/linux-headers
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	gtk? (
+		x11-libs/vte[introspection]
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	inputlirc? ( app-misc/inputlircd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unsafe-load.patch"
+)
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
+	python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable static-libs static) \
+		$(use_enable devinput) \
+		$(use_enable uinput) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+
+	if use !gtk ; then
+		# lirc-setup requires gtk
+		rm "${ED}"/usr/bin/lirc-setup || die
+	fi
+
+	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+	newconfd "${FILESDIR}"/lircd.conf.4 lircd
+	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
+
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
+
+	keepdir /etc/lirc
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# Avoid QA notice
+	rm -d "${ED}"/var/run/lirc || die
+	rm -d "${ED}"/var/run || die
+}
+
+pkg_preinst() {
+	local dir="${EROOT}/etc/modprobe.d"
+	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+		elog "Renaming ${dir}/lirc to lirc.conf"
+		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+	fi
+
+	# copy the first file that can be found
+	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
+		MOVE_OLD_LIRCD_CONF=1
+	elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
+		cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	fi
+
+	# stop portage from touching the config file
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${ED}"/etc/lirc/lircd.conf || die
+	fi
+}
+
+pkg_postinst() {
+	# copy config file to new location
+	# without portage knowing about it
+	# so it will not delete it on unmerge or ever touch it again
+	if [[ -e "${T}"/lircd.conf ]]; then
+		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
+		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+			rm -f "${EROOT}"/etc/lircd.conf || die
+		fi
+	fi
+
+	einfo "The new default location for lircd.conf is inside of"
+	einfo "${EROOT}/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/lirc-0.10.1-r4.ebuild b/app-misc/lirc/lirc-0.10.1-r4.ebuild
new file mode 100644
index 000000000000..52fbdf73aa50
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.1-r4.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	audio? (
+		>media-libs/portaudio-18
+		media-libs/alsa-lib
+	)
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
+	ftdi? ( dev-embedded/libftdi:0 )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:0 )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxslt
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+	doc? ( app-doc/doxygen )
+	sys-apps/kmod
+	sys-kernel/linux-headers
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	gtk? (
+		x11-libs/vte[introspection]
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	inputlirc? ( app-misc/inputlircd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unsafe-load.patch"
+	"${FILESDIR}/${P}-runtimedirectory.patch"
+)
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
+	python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable static-libs static) \
+		$(use_enable devinput) \
+		$(use_enable uinput) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+
+	if use !gtk ; then
+		# lirc-setup requires gtk
+		rm "${ED}"/usr/bin/lirc-setup || die
+	fi
+
+	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+	newconfd "${FILESDIR}"/lircd.conf.4 lircd
+	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
+
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
+
+	keepdir /etc/lirc
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${ED}"/etc/lirc/lircd.conf lircd.conf.example
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# Avoid QA notice
+	rm -d "${ED}"/var/run/lirc || die
+	rm -d "${ED}"/var/run || die
+}
+
+pkg_preinst() {
+	local dir="${EROOT}/etc/modprobe.d"
+	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+		elog "Renaming ${dir}/lirc to lirc.conf"
+		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+	fi
+
+	# copy the first file that can be found
+	if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then
+		cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf || die
+		MOVE_OLD_LIRCD_CONF=1
+	elif [[ -f "${ED}"/etc/lirc/lircd.conf ]]; then
+		cp "${ED}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	fi
+
+	# stop portage from touching the config file
+	if [[ -e "${ED}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${ED}"/etc/lirc/lircd.conf || die
+	fi
+}
+
+pkg_postinst() {
+	# copy config file to new location
+	# without portage knowing about it
+	# so it will not delete it on unmerge or ever touch it again
+	if [[ -e "${T}"/lircd.conf ]]; then
+		cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf || die
+		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+			rm -f "${EROOT}"/etc/lircd.conf || die
+		fi
+	fi
+
+	einfo "The new default location for lircd.conf is inside of"
+	einfo "${EROOT}/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index ae37d7aea7ad..ff58dab0f42e 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -38,7 +38,9 @@ COMMON_DEPEND="
 		>media-libs/portaudio-18
 		media-libs/alsa-lib
 	)
-	<dev-python/pyyaml-5[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		<dev-python/pyyaml-5[${PYTHON_MULTI_USEDEP}]
+	')
 	ftdi? ( dev-embedded/libftdi:0 )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:0 )
@@ -52,7 +54,9 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	dev-libs/libxslt
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
 	doc? ( app-doc/doxygen )
 	sys-apps/kmod
 	sys-kernel/linux-headers
@@ -62,7 +66,9 @@ RDEPEND="
 	${COMMON_DEPEND}
 	gtk? (
 		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	inputlirc? ( app-misc/inputlircd )
 "
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index 632e8f183ac7..f5b87b0f1b72 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,6 +1,6 @@
 DIST livecd-tools-2.5.tar.bz2 11500 BLAKE2B ed33e82931eb36f6c2648e31cdb867e1427ae7af740204334dc851d710078b87ee52ca0c1b3b714eb05dea78e1e6ace8feec19e8e516a31f7b7623a7c96a58c0 SHA512 b358cfb4390eafa212f2f1b1e604f2b021844f03490e3f0590bd7b5aa12777b096b8db7e2109dba1be5b05f35b625547041cbc69b155c7d910aaa3ed1ddc6798
 DIST livecd-tools-2.6.tar.bz2 11555 BLAKE2B 732cb5f17c0684d778925268cf326b57c36ecde333f177b6cfd51219f1a89d2866df19b1d1a997219fa3e8358eea33c7f87fb53118d5ecfc75671f89a08ce8a6 SHA512 5bf8b293909abda87ae892b92c996a4d64830f2b2b00efed2529beb6d01d6b6aef4703db0ef26087cacc1e48f20cd0ade37f4eecfa6e2bfd90471722dc06f3b1
-EBUILD livecd-tools-2.5.ebuild 967 BLAKE2B 45753e82c26ec63610bd472a7b3a962c8657bd4b7823d6b1286c1bf2f1eff85d0835fa01751567c3d01d2f916a52089c5ef3d9a4199d8b4c6a089e8844189108 SHA512 e1e4348a1f995820978248aded77a105f566def0dd573bade7051d2f7119b04c44ceee1235dc9edc70258cac4bbbffa0688f5048183d0ac30e73acd12376393c
-EBUILD livecd-tools-2.6.ebuild 968 BLAKE2B 0a0047cbece559afd000da12a8d7acaf598442da8674ede2dd82037a242c804387595aa8ee445f32bf74bb447df7f525044137c931b6cf71bc5ccca3a821ab38 SHA512 d8e9ed170a9d948f17c8e36264bd5880876c41e29524c753080ec1bb9d16528889d72c5438247112f995daaa6b667af8f12fe13c25c4363fcaa3e0486fdaa4dd
-EBUILD livecd-tools-9999.ebuild 975 BLAKE2B 69f5eaf3530334e88e39b197a5843eae6d2eef7b0d77d7b06c47cf5e7dd1d7a81d3a08469586a309aacff0ff2a6cac2b4c64d1a2f6ede56bbb1337aaf1f3074f SHA512 d04bcc2070275017ea935e6a60e43c7345ff39980420c3087f359eaf1b6bba727ccfddd8a18a9c6766c616be078b7b2e3e42201a6e8ebed91f918c67acf5d80f
+EBUILD livecd-tools-2.5.ebuild 985 BLAKE2B 0bc4e890d5188048b734a7b997949727accd06e2d2e4eef813dcc525d39ac98ae06be54d6cf40684c64f3ff78fb7769bff05be277351d83b018c7b26e60a21e2 SHA512 931679c4ee19454a4fed1ef183a008f5545843e7aa254740e4020af3c0cd13435a22433f12fec00a158ce2125bb03ebe9c3d9834cd24f9f6e36483587e8da307
+EBUILD livecd-tools-2.6.ebuild 986 BLAKE2B 433830291e7b0bb306c4cf43cfad415bcca13a8657e9069e2567b8dc08137964383012c345b0fe464c4afbd2c83da3d32f9c7b3aeb0672e2800a449f4aa3ca17 SHA512 36d8242b2323a0942096662b9d8f99fd52847f9a39f6155497529592d5b14d86b42db2f9e0351d57210f2579bcda73a36ce0f52b984b406636e2b9b08d81fecb
+EBUILD livecd-tools-9999.ebuild 993 BLAKE2B 48476c8c1120d51f0837b055df0ba17b5e155a179d283e8041349d161b28c2d566db07e5f56830b9c35d28e968c21a5b73e9f5f3ed5b488bfd5603f92b8d9bae SHA512 40d997af3a7321c814cd2ebb1d176a9b28ccd6c2c381fa16e24e43b14b4dad6eda39fdd7d3bd32001a0487b64aed1d5688570589f50e1304bb62439a663dbe37
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/app-misc/livecd-tools/livecd-tools-2.5.ebuild b/app-misc/livecd-tools/livecd-tools-2.5.ebuild
index dd81387cc093..f6923628fe04 100644
--- a/app-misc/livecd-tools/livecd-tools-2.5.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.5.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-misc/livecd-tools/livecd-tools-2.6.ebuild b/app-misc/livecd-tools/livecd-tools-2.6.ebuild
index 9cc93d10039c..f4940e1eb1ab 100644
--- a/app-misc/livecd-tools/livecd-tools-2.6.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.6.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-misc/livecd-tools/livecd-tools-9999.ebuild b/app-misc/livecd-tools/livecd-tools-9999.ebuild
index 75042487d6fd..bd090c1eca8e 100644
--- a/app-misc/livecd-tools/livecd-tools-9999.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-9999.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b892a051fea0..c520422ce1c7 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -7,7 +7,7 @@ AUX mc-4.8.23-vfs-gc-SEGV.patch 1249 BLAKE2B 8620f1f9dda92ea431ed31d82e72b9e81e2
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
 DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
 EBUILD mc-4.8.23-r1.ebuild 3045 BLAKE2B ab1d575bb42bff712cd9b2bdb6e5308999005bd6dcb8ddb6bbd8d98cb03910755197cdea17a15246099e2127ec5e3382443b851cd7fcc6e8b890fcd40df5e805 SHA512 0f0e3d52d10ed69b27c73c51ea785d09b26c5124a552a48354cb9ff199ad719454148bdb5790fecebd0f558d0c0c416b495e7b9fc9e54d1450477348424a6d1d
-EBUILD mc-4.8.23-r2.ebuild 3141 BLAKE2B 0a1a19152c7212392c5a4301b681b9183a0f3af7b88e9aed547414b789e71fe1758c196aa94cd92a9be227e7912eacda978fc8656177434ab39bc9a94ef4ea5a SHA512 dd5514bcc062baf18be629cf9fe04b02aab308f0a5f9dbfc223ce742a86998c01411d6370d3202f2d6374adb9ba6915ab816f72624ae60dc21ab75744c1be6af
+EBUILD mc-4.8.23-r2.ebuild 3140 BLAKE2B c1ade4dc4009448607d9a47a8e363e25d708bba9061c5f96844ead596a007f118b0c53a21590f93c8d751c9e93296c9f4b622eae28ca2cabb4cb6d6763578249 SHA512 641d151b9bb695b91f55fa24e7e9cd06f9d7e3b5bdc79c28ad0577073819bad8fdd6f94a4a05e4e1b8eb43d8f050aaa304544fbb8b4ea0450e2ce62cd6f7a16c
 EBUILD mc-4.8.24.ebuild 2870 BLAKE2B ddc4ca916a85e9b2855a74859fe5dca45cc91c03a83db1aa71f9d48e4d0ec15c3583b9b72cac0f52a09eb9b96e487a697236b272a78d2a9ec175a3bc90470e76 SHA512 51dbeab090160c41f573c7d1d9950ebd7bf3f92f648e6eea8e5a208b33d9f13caab191a53f9395511ae7d616c56347990819b2d7f82ccc8bf736badd036d26cb
 EBUILD mc-9999.ebuild 3129 BLAKE2B 86eecca3b1675bfcfaaa8c36f2ca937541b9ab6bcc96d693cc686c5dcbd4e93bfd209e2b425c9d5edcb7b2db353d007a1b04ae94d04742fcf3cb3e789db4dbf0 SHA512 9815a1a8bec31b5d4e1ab03fa25aba3c8c75232c23fbeab0322a39317a46a355c5feb94fe37f4c5ff17661fcfec8fc786ada179559e4cd92153764f3166a3c40
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
index 64112aaf67bd..d9c7dafe3f3f 100644
--- a/app-misc/mc/mc-4.8.23-r2.ebuild
+++ b/app-misc/mc/mc-4.8.23-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/metromap/Manifest b/app-misc/metromap/Manifest
index 115c8e0d0e1d..2b7c0357d30d 100644
--- a/app-misc/metromap/Manifest
+++ b/app-misc/metromap/Manifest
@@ -1,3 +1,3 @@
 DIST metromap-0.1.4.tar.bz2 3419243 BLAKE2B d0072d4414657bc6314a972e635809ce239be4b081368ccef44c8549eea646cfbaa20ac30621e9dafc5ee1419a5916fa62274b77392d1d437b7af3561dfb18c9 SHA512 16407c9c8f2d3f608e9188e40b38d20530f552254dbe0c59d7c94ed913b8cb61deae23ffc6180d17fee0d98091c269f24eb04e624dedbb37cc6ece85b46e93ec
-EBUILD metromap-0.1.4-r1.ebuild 961 BLAKE2B 472e0393ada3c9999e9a9ace054e7ca65cdeb6f525acb8fdd2a403197fed82151386a576be1101fa2cdffbd53d51ea4b0f229d4e76bbb739262740cd02bf102e SHA512 ec656cad496e2078f39b7a661f41392ee85c54c1305de4af8dedcce93ed938159fa14c10d59a7e64f79b720a01222d4c8347478734351d1ca728eb6caee4ab88
+EBUILD metromap-0.1.4-r2.ebuild 1001 BLAKE2B a03a975a51b8a9d10d110bff3a1c0216ddcc3adf70ae968286b4414aa7b12fd58b5062f787e71202656db8916484907bf8aa1794136305c9992c4b331bb77326 SHA512 2857363da540559fdab46435bd54966f80e8a9690ed441c6aefcbf25b36695a45b70cf2408abed3ce628f90c76bb6479ab9c709bd9b1994e0e419c13fb5dd072
 MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
diff --git a/app-misc/metromap/metromap-0.1.4-r1.ebuild b/app-misc/metromap/metromap-0.1.4-r1.ebuild
deleted file mode 100644
index 6d0dba3d4e4d..000000000000
--- a/app-misc/metromap/metromap-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,51 +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 gnome2-utils
-
-DESCRIPTION="Metromap is simple pygtk+2 programm for finding paths in metro(subway) maps"
-HOMEPAGE="http://metromap.antex.ru/"
-SRC_URI="http://metromap.antex.ru/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_prepare() {
-	python_fix_shebang .
-	sed -e 's,Gtk;,GTK;,' -i metromap.desktop || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}"/usr install
-	python_optimize "${ED}"/usr/share/metromap/modules/
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/metromap/metromap-0.1.4-r2.ebuild b/app-misc/metromap/metromap-0.1.4-r2.ebuild
new file mode 100644
index 000000000000..25eca6fecc16
--- /dev/null
+++ b/app-misc/metromap/metromap-0.1.4-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 gnome2-utils
+
+DESCRIPTION="Metromap is simple pygtk+2 programm for finding paths in metro(subway) maps"
+HOMEPAGE="http://metromap.antex.ru/"
+SRC_URI="http://metromap.antex.ru/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygtk-2.8:2[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+src_prepare() {
+	python_fix_shebang .
+	sed -e 's,Gtk;,GTK;,' -i metromap.desktop || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake DESTDIR="${ED}"/usr install
+	python_optimize "${ED}"/usr/share/metromap/modules/
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 9b2a298d85a3..dc26df46c4e1 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
-EBUILD mime-types-9.ebuild 575 BLAKE2B a6e18056ba58ca999048c7b74597eaadad425887a2ec99ad1ce14c11b5f89412a3b2028aa453e29fac28e0cc7d702fa3b9e038c753b82e062f3bc63793e827f1 SHA512 cca6f05cc893f12ba2f8f8823a30b3d620a41d6af585b7dbc069c391aec84fbcaca507d2852fa23fc6baab24a481e9f7613dfa78a33d7f269615f474de2cbf85
+EBUILD mime-types-9.ebuild 592 BLAKE2B 2625257ed9c0958ced4abf86d0d0d997810182fdb59cf405f9237585d8a5e5e01e88033f8be78081ba8425ba73ba41c134f8074e00239cfed6ee986e53c9d122 SHA512 cc15786cc8c28a5fbc7773febe664f4b6fbfa2b7e4542abfd4e9238640db8225e9b856f1c0de2cede719fe834c38331258dbc7641985bfabb64ff903e1003041
 MISC metadata.xml 243 BLAKE2B 01e59967c1ef8c4287aa399e0b64a651d273858118726001d0cc8c9450f219696f7827ede0f3613b0947613186bd98b31629a5dad3a9e67b0517b37d9e08843f SHA512 563d66eeb96298c8537589586287f9c8c6819985c37609ce4a26e0ecab1ce19192f99a73f63a4577193f90a371ff00ed2a15254a25be6061516b73d0c1141278
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index 8a62679251b4..7e4e64763ad2 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Provides /etc/mime.types file"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 44171f57e488..cf0faa58c916 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,7 @@
 AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7e1acf91019d74dfe1c1c9c44c900d835fe550adfce89140b991b96ea4d63267f48da7596f89cf7daf1c93e43d4e7f6924 SHA512 dcbe424084b8b0cfe77c461b5897cb027e30778f9283bcaef358d70e1496473cbb5b7ed7c55347859c86571b77f9aad4c051d1b519823efed6c9e6314defc187
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
-EBUILD pax-utils-1.2.3-r3.ebuild 1784 BLAKE2B 5047eef121278a753c477cff9f93c40fd5559aaa667bfc12408744eb2926a723bee8db2bf4a52c2846e22251a9cf9747b96a194897973849728206eaffb94675 SHA512 994945da1dfdcbb3c5a330ef34ad363776a9d2e0b80bdce1554fe97fe9520678f16e3e279b587563132e065fb5ef3f5685f0624da590735a2b01fdb8e80a2d46
+EBUILD pax-utils-1.2.3-r3.ebuild 1811 BLAKE2B 10dbb7ce74ad2f410864d51da6a0aa2b9d8c0d26e2f58667693b5761f66e62513e73cdcff3eab59fbb3cac052c4365d74fad35aa00f5c896865d011f543d6513 SHA512 f61a084a9ddb5f5a971641f59fa0786e27ec3af227b2b64a74ad88c47ae82b188cf3690700bf35de8211ba2f0930a66aa9c56923bc22a124fa9ac1d9fab16ecc
 EBUILD pax-utils-1.2.3.ebuild 1456 BLAKE2B 102ef557c9ba2b21776da305f3773797906bc4b5a52417008b4675d1f03b30006f3df003766bc6a3d06358df2077d5392dc538ac408bd4a64b10df928d6442e7 SHA512 7819e495c975534ebafd3b7a260bfd9d5d26b022a6ce1d4c9097b0e2be9aae660ff47eb90058f069c8b51cdd6db0098a7e58bc3acb36a786c2163eaf9aa45ded
-EBUILD pax-utils-1.2.4.ebuild 1737 BLAKE2B ec003ef39f138afc07a6b02ec58cd44bd253c3131b03d32196580c848196aa4a318a3c817154d030845d27dbe9f371c8b38c0c353fd60097b8419645b70ee4ef SHA512 35904ea69012a08cd0d8dd28a0cfb56f181415f9883150c6378321eb719d956fff3972d7c037e9cbba12e529bc7c0f74f4fc83a41e1535158973fe27f9a1b555
+EBUILD pax-utils-1.2.4-r1.ebuild 1764 BLAKE2B e67d2008503858e90a8f77ac15b6c685eb30f19b715fcc7de55ac81053b6f04de046ef76cf91ce27eb326f3b80933d0fc8f1e3476ccaea1eee085f33a53ca7b5 SHA512 7e6a9cdf23494fbc179438f5fcb91012798f30c3284946b1f087e709ae6901ba39311ddf7d413cbd7838fb734e966cea0b2e19949432468b6aef44786a9e6bfe
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
index 2f1358a19ef7..2bd5a6a4fbff 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
@@ -20,8 +20,10 @@ IUSE="caps debug python seccomp"
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-		)
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	seccomp? ( sys-libs/libseccomp )"
 DEPEND="${RDEPEND}
 	caps? ( virtual/pkgconfig )
diff --git a/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild b/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..66b213c14c49
--- /dev/null
+++ b/app-misc/pax-utils/pax-utils-1.2.4-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils python-single-r1 toolchain-funcs unpacker
+
+DESCRIPTION="ELF utils that can check files for security relevant properties"
+HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug python seccomp"
+
+RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	seccomp? ( sys-libs/libseccomp )"
+DEPEND="${RDEPEND}
+	caps? ( virtual/pkgconfig )
+	seccomp? ( virtual/pkgconfig )
+	app-arch/xz-utils"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+_emake() {
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_DEBUG=$(usex debug) \
+		USE_PYTHON=$(usex python) \
+		USE_SECCOMP=$(usex seccomp) \
+		"$@"
+}
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
+	if use prefix || ! use kernel_linux ||
+		has_version '<sys-libs/glibc-2.10'
+	then
+		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
+	else
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
+
+	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
+}
diff --git a/app-misc/pax-utils/pax-utils-1.2.4.ebuild b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
deleted file mode 100644
index b4f02979653c..000000000000
--- a/app-misc/pax-utils/pax-utils-1.2.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-
-inherit eutils python-single-r1 toolchain-funcs unpacker
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-		)
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux ||
-		has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-
-	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
-}
diff --git a/app-misc/pystopwatch/Manifest b/app-misc/pystopwatch/Manifest
index 2c004144705c..7e4f7b734d8e 100644
--- a/app-misc/pystopwatch/Manifest
+++ b/app-misc/pystopwatch/Manifest
@@ -1,3 +1,3 @@
 DIST pystopwatch-2012.12.24.1.tar.xz 14580 BLAKE2B e9f6deabe932bb4adc658d5b5ebc0cc7f2de461a287773881c6d1f34e7f50a0b23b3b317344994a2717998fe6e611167ed0a5d380235f6b1a5e3f572964e7609 SHA512 4b3af373356eaafd14caeecb34150fef8e7099120855230dce7c0eabba68f75d497c3cc2eb733a086a02a96ae5feeca1898ba201a5f6f5597dcd32de9c80b3df
-EBUILD pystopwatch-2012.12.24.1-r1.ebuild 662 BLAKE2B 3fe88735f4eb936c4c6c8902e373f07da6430e69651fed927a2ff5c8994d4f566049f6935702b926f462833eee4c8a7f116e7ea802afca3f4d220e374c4c8bd3 SHA512 f77107c57ef88a9e6faaf8a26c024d5ad6e1405c67c3c54ce32cd085da1d7fa023a8d2f6e70277c408117c1c1c48749eabcadf93117666bbc9b3e207e18545e0
+EBUILD pystopwatch-2012.12.24.1-r1.ebuild 695 BLAKE2B bae1962a73f8ff7f97092d37444cd058eb77277c7989c8fe3878899845d23963cd61007b0590cda4c3bbf1134af0d37715a0ae123212680002e138dd798ec055 SHA512 c05e92a42dccd9712b2b8e5548a87137ab77a19cc36ca02879ebebbb95c857bcd0bbb07af5d5e5ef649b33aaca32afaaba426f2c9f4bfb0d04c827079ed1298f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
index 8ef9462053b8..971bd6d07a00 100644
--- a/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
+++ b/app-misc/pystopwatch/pystopwatch-2012.12.24.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,9 @@ IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')
 	gnome-base/librsvg
 	${PYTHON_DEPS}
 "
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index ab95010ce9b0..b54c6ede02d2 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -15,6 +15,6 @@ EBUILD screen-4.6.0.ebuild 4052 BLAKE2B 9f071833c6e5f3b853fd1314df4ef82002c64744
 EBUILD screen-4.6.1.ebuild 4159 BLAKE2B c3ddce68a667605da2db821e98460f920d3491dc2970ee2658d603710fff6a8b571f0d0f578a0c975ef66004d8d8e9da08dba783201d128063cc177f3613d8f3 SHA512 9e0b51c6f370ab5cc7df84c4098fe31d1ed2fd2d05bf8831845c4f756542f1aaae1147f36d9f0126bd108a322f3a4a206d6cbb504f4675c092d9319342e4b0ea
 EBUILD screen-4.6.2-r1.ebuild 4206 BLAKE2B 48bcdba4bca6a817e9c5d71b0c87005d416ee93f4602a1fa2e37d60a47d78ae6e67095cc4d864095912c78390dce5faa3f265814f2dd767d962f717895caafbe SHA512 af3ae5c220238dce3cc52692d48b2703b0b94fa9cb48716e1f0731f7c10ef3e30ed4087ecace455ea4475cd1f69fe886928a46e2befb9d80a6fbb914f2e81fbf
 EBUILD screen-4.6.2.ebuild 4207 BLAKE2B d24b2a2007144231ae9a24b9a25575fb17b10648de3b9b0d1e71ec1e453fec1a4fd7aacd1bfbb3802b70c43d42903ce6f6f3ae0c05831fcd1687e508f299457c SHA512 2f2f3929d96a7c95a5fbd5cfb3feda6efad52311b7cd5a69bac5a67735a85afc91cb1e1515aa3f3a3580babdf8e826a7ec2f37a79c811152aa914a2e6ed62164
-EBUILD screen-4.7.0.ebuild 4206 BLAKE2B e3572233ea5865e0f4765e0ba51e7edd63e2c9ab77c4f5c44e2268a8be049156edca873ff00fb8ea1deb97b2e8525e64768fdbcb8c8ddc088e654d4f32010a98 SHA512 24bf75dcc7c41dba4508ef758bbd2af57126ddd53f87b9e254b18ae4bebb795adc9fdfecc0f3b7502db7a6a49ba845df28badd0efbc25e0d27f14569bde1c0da
+EBUILD screen-4.7.0.ebuild 4204 BLAKE2B 4223a728e56b5fb350b08c21d05d2c306b91e4aedf95a0f7c27bb2783a26bd07762c807aaee2e3688fd5bad9c56d9315be2f014eebb81f0f6a8e47494064df74 SHA512 f80aa9acf911ac88826929e986da318986fffbe9a6cd92125417e49d72e56477cc57c1c392f98999348b427e2a5e3850df2a1a9e4ef3c1e00c1eebda9aaa72ac
 EBUILD screen-9999.ebuild 3984 BLAKE2B 6f68715e21470703626383ba4eee1871584b6dde2fa5dfa3e9cfae86ba8c7e3ce0496eecc2ecf4a091c53f19e1ea026547269a78b0e223805933d35ea7a692a4 SHA512 99f171c2963978b3a20a3c0637959a7fd0949163dcaf5a8693d8b9bd1a02a588d1d5c9ca16edf97724c2a2cbb6875caeaa8cd40c3988978dcf241f8c7a8ede87
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-4.7.0.ebuild b/app-misc/screen/screen-4.7.0.ebuild
index bdc40e9094d1..fd070e2ef570 100644
--- a/app-misc/screen/screen-4.7.0.ebuild
+++ b/app-misc/screen/screen-4.7.0.ebuild
@@ -145,7 +145,7 @@ pkg_postinst() {
 
 	# Add /tmp/screen in case it doesn't exist yet. This should solve
 	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
+	local rundir="${EROOT}/tmp/screen"
 	if [[ ! -d ${rundir} ]] ; then
 		if use multiuser || use prefix ; then
 			tmpfiles_group="root"
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index 67bafada3cc6..6b0eaa8e2208 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,6 +1,6 @@
 DIST solaar-0.9.2.tar.gz 864509 BLAKE2B 57c58d203d8d1ae390eaaa1cfc963cfcc9523de8d7edcb482f30c66bcaaceebc7c514cf0fcffb1b20ca5cc3bc869c94cb61bcddff44debba9307ec3b1c0e1def SHA512 13f469df753cc8fab55f5259ccc3e62b6e44471d277d240cd56ce0580144d2b1f95d731268176648663dd15e5607bfb512f477362f4f100aa0a653b001dfe04b
 DIST solaar-1.0.1.tar.gz 1195660 BLAKE2B e6cd89b5735e125dd438255a8961b1d5d38feb515c5097efec0403d99b9db6e29c439c13e279fcffe69cb314bf2650a7a11770830fdf1e971ade27ce8331aed2 SHA512 e0b2bbfd97d9650d94f1a4b47e4e70f09c75f684e7e1d3e67d2cf6dd197109084e941b98333e173fb205d5c9464dd07e17390d9c2d5b46393fee2efdb20429ac
-EBUILD solaar-0.9.2-r3.ebuild 1333 BLAKE2B a97c2ee886168dc4c46170e31d961bb2ce642b7d8831c4244652b04851d61e3e75f905701e1069354b9ca37924783f3fbdfa7f84b14553cd5a3a2f56498ea7e0 SHA512 f483ed000e628edbd1a9a4e25e1101f124bb9e9b2d34395caedf88730a15925d090aee57ae153f7fa9373ad409b9e42f41b4173930caf3e7fce5c0e230042a2f
-EBUILD solaar-1.0.1-r1.ebuild 1132 BLAKE2B 66b922175136ef89eb1a2cf0d0af1adae86f9587772659cc5b56cd3af4e172ecbf71001c84d44905616803b860ab65d8ab56724e546ffb4b69b926e57e72b51e SHA512 f1df0f35328ecbf3939ee02412bc7e4c5a97d49406f0d39abc08d8b806b9e684632600cc4e0f378afd2f3dff42dd9b5dd3d94181d8e6259084196516c4b0ed5a
-EBUILD solaar-1.0.1.ebuild 1101 BLAKE2B b242e82b57630c733d26c0db2c3dd7a1186614e094b99eec3118fcdae580206ca827cb1b7d92da2cbe3df140868ef403e72461ddb0e807e5a60624146976a7db SHA512 ccd896cf0b62bb3254428680170c03812eaf5abf0ca30d890ca1f58b2b3136136a5e8621b76f2e7bbf1af4e1118aa955f48fe345813bb64ef46cfb21ac7f6f91
+EBUILD solaar-0.9.2-r3.ebuild 1327 BLAKE2B 69eae627bf9da5d7433aed7067f7f861fc7a55a31deade07b46becf5d0e30a051760a6860d203f5e16656b1d5936aec28944d59bf16f9dcb5b75c3294879467f SHA512 dc4321bfa257831caaf1d07d07af93907a3157b40dfd404056f01ff3b3071b10ace13d8d14c958f864dec11d62d86670c1bb019d39a8503b2e64f1dd5340dfc3
+EBUILD solaar-1.0.1-r1.ebuild 1122 BLAKE2B 538593b24656bc75fe41f0611e5e7a636ad9c7b94881ee29614cd4466a43cb15dcbb1d07a79423f589f50fc2b6808dd37caa07d74666f87bb3e21287d484ab3f SHA512 6a1869bb08b7f22de92a48c7b5fa2239dcdafb24c3cf9fc20dd5968accd7758ca637a8c301221db8c6050563b92d06d1fe993d149610fd9820c49d75e451916f
+EBUILD solaar-1.0.1.ebuild 1091 BLAKE2B c289b723169ef89d28da5e7ba08fc0b3db95b85185e802ecede1a9ee8a31e0158b4599e470482c486e19edf896a077b1cee1b642e8d46c18038c649e3b982984 SHA512 33cf43aadc08e64b96eed3599ff81a4a67593421b90d98ab510514475c597bb08043c3b0fcd68a99e1c15bddba9cabbd5152080211ee7e29bea6769ccf99e58f
 MISC metadata.xml 247 BLAKE2B 28b1a6239555a2c8babc0c1ee34558209080f365bb6b8e2f29461758cce930f9ece751ebda2c364eccefb106aead7896b47c5bda1b8d275197c69d071edd2504 SHA512 5c9618d73d0e1e0b66294e959564df8703bc276f6e430d4692230429a377dbdaf38e7d569dd9b89b35f4acc4e2692ef6520e5cf118d0e76c8498d8ded0c98b14
diff --git a/app-misc/solaar/solaar-0.9.2-r3.ebuild b/app-misc/solaar/solaar-0.9.2-r3.ebuild
index f86d079462fc..5c823ed39c46 100644
--- a/app-misc/solaar/solaar-0.9.2-r3.ebuild
+++ b/app-misc/solaar/solaar-0.9.2-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 udev linux-info gnome2-utils
 
diff --git a/app-misc/solaar/solaar-1.0.1-r1.ebuild b/app-misc/solaar/solaar-1.0.1-r1.ebuild
index e81e7cc244bb..a93b069daee3 100644
--- a/app-misc/solaar/solaar-1.0.1-r1.ebuild
+++ b/app-misc/solaar/solaar-1.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info udev xdg distutils-r1
 
diff --git a/app-misc/solaar/solaar-1.0.1.ebuild b/app-misc/solaar/solaar-1.0.1.ebuild
index d8ff31e25bfa..c947969d7c4a 100644
--- a/app-misc/solaar/solaar-1.0.1.ebuild
+++ b/app-misc/solaar/solaar-1.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 linux-info udev xdg
 
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 7708578e338a..b1dccbe23643 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -10,9 +10,11 @@ AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4
 AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
 DIST spacenavd-0.5.tar.gz 41746 BLAKE2B bd97cb9ad1ce684cbe0f39e03db0fe0a9cead9aa4a8142546632397fa923fc1067e2d33ea0270625b5bb06bc784c75f0e9ae49cfba7194d23537a7427abe1e68 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
 DIST spacenavd-0.6.tar.gz 54730 BLAKE2B 5d158ebb190359c6e6c2a20093f824f176e028c0d375ab4aadc635f7b26884df2ae58585e82dc3978892d04d139cc6c4704fedc300508f9314478f19d4ee11b6 SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200
+DIST spacenavd-0.7.1.tar.gz 56703 BLAKE2B 99a918090cf8875e5b5cbb48ceffc383b415d9bbe297e49630c8e48ab78bd547244005b5a91e1bb7abc01382ae332758dfc01297bc8f6fb9a05247330cde8127 SHA512 6bfd76f9187ce77c09cb6ebb73bce45391e675cda51437b647510afef574aa6e3f947f467e03a464e245a5e44f699db1d197a58a06a64a2199686b1ab596517f
 DIST spacenavd-0.7.tar.gz 55634 BLAKE2B a4257bc48e4b7973413cfc74fb4157cc93d27dd8e4c45142bfa0d8b30b94e517cff1e003c9b7216b498539a529bcfe623a5dfec48644a34c1bd300eb07d297a7 SHA512 241ed0ecf78fe683ae1ccda1e69afcee82f6ad55439516a5e02d3ff7eea1a4c5903e778e41f3e0d8b6f5dcbb8fec572a52e0be108a081bccb5a279af2277b615
 EBUILD spacenavd-0.5-r5.ebuild 2319 BLAKE2B 7f555ec38a828848ff3686def93a853a3a3b1c8af40274c7f040b3143f1d0f44c71d9931f0587db9c48a23aa8085fe3297c6d53fff4b9ffea23c4a894e362f4f SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444
 EBUILD spacenavd-0.5-r6.ebuild 2303 BLAKE2B 2acc81a1da275309f5fa0d9dd6931f9242107a7622467c23b37b0b0ff401bc6c560bae31a614c281527183e2464dd9ec09f95584a07a79b8b9e556f74cf6ebe0 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b
-EBUILD spacenavd-0.6.ebuild 2306 BLAKE2B 01eec5ed89107490cdd2bfe2072e20e158ba05496a3f0bf16df8c796c08273cbe0b049aa22bf4f926aad70c60ff24f5569dbd9f519478c6dae826b7846a6df18 SHA512 f7aba939a76ee95ebc349c9ede93f733465c2d18f82e3736a314633d196c9e54a0824327172682ae9523822f0e397937a98696ee92847269970ee6f29c47a5d2
-EBUILD spacenavd-0.7.ebuild 2318 BLAKE2B 65b96c40800e50e3843c3b0124680ab242352fd71f1577d97d325cc330e4077c69e37e62ccbbbf504eac189422c6c9b85eba9464166b5a56217499c89bf50367 SHA512 0c86a6419e8db433d1bab2fd78f88b7bb5e2b81b0dc42d6c3dbc8455e632ea4fff7747764b5b42eeedeb55a932842e24161e7d5b55240767efe3b994b1dc3a7e
+EBUILD spacenavd-0.6.ebuild 2357 BLAKE2B 7a42f3a0eddefebbf75a7a47b0ac13406ccfaaa6844478406261c70711237aa6606851cc74945547e808de2a3aa365040a848e4108869f603592da4be4ca7e07 SHA512 bd51d709b6d94a760b934e67dba6561fca07981035e537b0395457e698b3fc4db5381ea337b7b2bb21c2dc9d5ed7e5a249a01cce45ceddb235e481ebb9da750f
+EBUILD spacenavd-0.7.1.ebuild 2235 BLAKE2B 7bcc607477018b73bdf2438619a59ff5ff34e165724b970415a4b3324d1b9ace2fde4139d3c5c8a7fdd00d4ced21ebd43739a1f894b19c2280be3993ab14eff6 SHA512 1e89683c67d8cb0f70419954efdb6b8a1f1b07cfb7de29e3f4302930db8cc5bbb21a8268e6a70ccf04de22a89e33a305ac83da9d1e3d281b6dd901c22ab2e4c8
+EBUILD spacenavd-0.7.ebuild 2369 BLAKE2B f31dab2abf32e04436ca549895d26b48acc88da8f9fd62ea16bf6643f3579ebc4bd2bbd323fb4b7a3e586a7e6538612d954fb78de69f3b8fb926085372645299 SHA512 c6bd1eaa8dab75618417a7026c11a5f6d2a4982488ac484a266f07a14ad0941a0133bd428c8324181fe1eeb5f1e05dba9443734bfa58808ff47c8641033eb9c2
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
index bbf5b9cf9e04..bc0c390694e8 100644
--- a/app-misc/spacenavd/spacenavd-0.6.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit epatch linux-info systemd toolchain-funcs udev
+inherit flag-o-matic epatch linux-info systemd toolchain-funcs udev
 
 MY_PN='spacenav'
 DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
@@ -37,6 +37,7 @@ src_configure() {
 }
 
 src_compile() {
+	append-cflags -fcommon  # bug 708648
 	emake CC="$(tc-getCC)" \
 		add_cflags="${CFLAGS}" \
 		add_ldflags="${LDFLAGS}"
diff --git a/app-misc/spacenavd/spacenavd-0.7.1.ebuild b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
new file mode 100644
index 000000000000..e4ff48d27d98
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.7.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	CONFIG_CHECK="~INPUT_EVDEV"
+	ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+	check_extra_config
+}
+
+src_configure() {
+	append-cflags -fcommon  # bug 708648
+	econf \
+		--disable-debug \
+		--enable-hotplug \
+		--disable-opt \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	# Config file
+	insinto /etc
+	newins "${S}/doc/example-spnavrc" spnavrc.sample
+
+	# Init script
+	newinitd "${FILESDIR}/spnavd" spacenavd
+	systemd_dounit "${FILESDIR}/spacenavd.service"
+
+	# Install udev rule but leave activiation to the user
+	# since Xorg may be configured to grab the device already
+	udev_newrules "${FILESDIR}"/99-space-navigator.rules-r2 99-space-navigator.rules.ignored
+
+	# Daemon
+	dobin "${S}/spacenavd"
+	use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+	elog "To start the Spacenav daemon system-wide by default"
+	elog "you should add it to the default runlevel :"
+	elog "\`rc-update add spacenavd default\` (for openRC)"
+	elog "\`systemctl enable spacenavd\` (for systemd)"
+	elog
+	if use X; then
+		elog "To start generating Spacenav X events by default"
+		elog "you should add this command in your user startup"
+		elog "scripts such as .gnomerc or .xinitrc :"
+		elog "\`spnavd_ctl x11 start\`"
+		elog
+	fi
+	elog
+	elog "If you want to auto-start the daemon when you plug in"
+	elog "a SpaceNavigator device, activate the related udev rule :"
+	elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+	ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+	ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+	ewarn "if using systemd."
+}
diff --git a/app-misc/spacenavd/spacenavd-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
index 4c5a57fdbfa3..e9fef0e60869 100644
--- a/app-misc/spacenavd/spacenavd-0.7.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info systemd toolchain-funcs udev
+inherit flag-o-matic linux-info systemd toolchain-funcs udev
 
 MY_PN='spacenav'
 DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
@@ -37,6 +37,7 @@ src_configure() {
 }
 
 src_compile() {
+	append-cflags -fcommon  # bug 708648
 	emake CC="$(tc-getCC)" \
 		add_cflags="${CFLAGS}" \
 		add_ldflags="${LDFLAGS}"
diff --git a/app-misc/tails-installer/Manifest b/app-misc/tails-installer/Manifest
index 814c1b2dc3e5..9840b8f9a38d 100644
--- a/app-misc/tails-installer/Manifest
+++ b/app-misc/tails-installer/Manifest
@@ -1,5 +1,5 @@
 AUX fix-desktop-file.patch 1046 BLAKE2B c27059fdd3baf37ecab603c1f96d70927c967909a360371c8da0cf0bc34c78c5425a9e64af4582ec0b3de5b2a5328cb3d4248f999ddc662ce8370bec6377c4bc SHA512 9c51d36b6b97e7fd52aaacc8bae9b6dc16785c249eddc01cfa1ba3bd76b5badfd1b60e53c8735d6d206753e19d7ac48e7405d2bf69300c08391b94a0ca173dc0
 AUX sgdisk.patch 1138 BLAKE2B 1dcbc23924f592a619336827fa5c4bd21fb37f52070bbd44b08ec41c3dae8c8d09a322f2aeae9e0e67a2dce435cb9ddee7729d9e83e31fe3f06513f35f1ba934 SHA512 971e9b89acd7d175e7b6e44d3c31f7541721936e5cb7c08ba196b257170e841fb95965bbdfaffb2a9cf49f43e3ab05cde29136376b497ff3ba9741735c1cbc35
 DIST tails-installer-4.4.11.tar.gz 346123 BLAKE2B c6e0888cce180d411ab60a8098581da0df64ea6b2201076e58d6ae4d489feb5e9967fd67a457e8d333fad9934350d5df13044e02e2d428980bee335fd5420dcd SHA512 06d7e21f01841250ada8eca3dcb14078331450b61be4a15923fd0543970b9fb4284aba6cf12729515b2adff9dfa3f8a011e48d97a114356fff1edfd1eb914684
-EBUILD tails-installer-4.4.11.ebuild 1158 BLAKE2B 50a17a692c89d7ef4281b4d5523143027265dc7691b751013ff64df045a5b73366dcc39fcc4f05f3fa50b2129afd3210637c21ba63a2e38629e72878a1c906d6 SHA512 bb52088ac9b0a26824b894e85f13258710b6e4643c8cf3e6945aaa26973a7a65b3684713e251c83bccd77dbd66f1f5a23c655ac7368e50e8a55229fc4991b262
+EBUILD tails-installer-4.4.11-r1.ebuild 1241 BLAKE2B 05eba22612e6a95b77f2730ccf12c486263dad7659ebdc82533a084e9bc8e90678f14a3e75c4e7fe9aaf410aa67c61d866abe65ba9c911253281362bdbd1d356 SHA512 48bf513dbb655d05bd873b3aad028323358e00dcf02a637793b3c7180b4cccefe090ae9c0c0b822e26572a0f772ff0bd3dc7771c93d240d4b9d2a0aebdab3972
 MISC metadata.xml 309 BLAKE2B af6f3c6aa04dd9f3f9b808ecc90fab80f06e47641fd56b78305edeb1feb5efc50c874007ddba4ba3d414cd9993719f844d22aac97f04c41020890d4b5e6b8e25 SHA512 6e72318e11edc847698cc3b37002b61b70b62e6f8aa644fa400c55801613ec30187b6073cc9b5218911ba4e6e08603dc77d9f3585d28acf683c732dbda2b816b
diff --git a/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild b/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild
new file mode 100644
index 000000000000..241bab952e7e
--- /dev/null
+++ b/app-misc/tails-installer/tails-installer-4.4.11-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
+HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
+SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+PATCHES=( ${FILESDIR}/fix-desktop-file.patch ${FILESDIR}/sgdisk.patch )
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/python-distutils-extra[${PYTHON_MULTI_USEDEP}]
+	')"
+RDEPEND="${PYTHON_DEPS}
+	app-arch/p7zip
+	dev-libs/glib:2
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		dev-python/urlgrabber[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-apps/gptfdisk
+	sys-auth/polkit
+	sys-boot/syslinux
+	sys-fs/dosfstools
+	sys-fs/mtools
+	sys-fs/udisks:2[introspection]
+	virtual/cdrtools
+	x11-libs/gtk+:3[introspection]"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/tails-installer/tails-installer-4.4.11.ebuild b/app-misc/tails-installer/tails-installer-4.4.11.ebuild
deleted file mode 100644
index e67daaeac16f..000000000000
--- a/app-misc/tails-installer/tails-installer-4.4.11.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=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A graphical tool to install or upgrade Tails on a USB stick from an ISO image"
-HOMEPAGE="https://tails.boum.org https://git.tails.boum.org/liveusb-creator"
-SRC_URI="https://deb.tails.boum.org/pool/main/t/${PN}/${PN}_${PV}+dfsg.orig.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-PATCHES=( ${FILESDIR}/fix-desktop-file.patch ${FILESDIR}/sgdisk.patch )
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
-RDEPEND="${PYTHON_DEPS}
-	app-arch/p7zip
-	dev-libs/glib:2
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	sys-apps/gptfdisk
-	sys-auth/polkit
-	sys-boot/syslinux
-	sys-fs/dosfstools
-	sys-fs/mtools
-	sys-fs/udisks:2[introspection]
-	virtual/cdrtools
-	x11-libs/gtk+:3[introspection]"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/towitoko/Manifest b/app-misc/towitoko/Manifest
index cf15a5629acd..747f841ab22f 100644
--- a/app-misc/towitoko/Manifest
+++ b/app-misc/towitoko/Manifest
@@ -1,3 +1,3 @@
 DIST towitoko-2.0.7.tar.gz 280177 BLAKE2B 0a58abc81a8106415d25d82a9eab4338d8a1cb8dc04b2d7b1d3790ae1c8429d0fdec2641dae68a9f38b3ce9aa9f14fa5ba1fb4fa9281e75e87a308024ba59873 SHA512 e2e21bda3b1dad55dee1cfb4063e114394a21973b4b2409b9dcff1479fc312fb93bf6e634d38e1f7a30e6f835d87af8268a478b534f65c916eeb13d5dbd07b86
-EBUILD towitoko-2.0.7-r3.ebuild 672 BLAKE2B 53dabd2475dd2c730df8dcdc88f42164c661b14f4a3c6bb70f6f82e8806fd9cb5630a0f39f5258ee2e2727f36a64b1eb89222bcb22864f2611e3a5051f6d48a1 SHA512 09ecf90205ce1a93e6b633607948bedcf3ec85959ec1a3137520105dd46e07709fba90673ac466264f88149a37fdec5632472a8e5051b1e5ee0599f945556b17
+EBUILD towitoko-2.0.7-r3.ebuild 689 BLAKE2B 78ba507fab5a0b44013bfe9481d81064928705a8a9f0a02f351d151427b4ed542c92e2c6dca68c4d0de626357a964d31e591f5f827d7eb7c82fcb84d35ff825e SHA512 80b9a13cfa7991d2981ce8d0212a3aa74e0d8d21d7b81e7242379b36a9637ca51cf20c9ee93f85aa3ccbc4272d382fda9c229061fa9ef0616ce78bfed61e477f
 MISC metadata.xml 278 BLAKE2B 6cb5d9c1e26e7c00636842a387c8b772f44a284cd24fb44e8133edd04d4d37a2fac01d0cf77768b88137ea7ab302554adf4a32e41df5246b2ab01ac21476f8a9 SHA512 4d69e222be58da2fefd590fa9cdfa2dd6e7108c3f663fb0f491d49609b0ebb8e10b4dccf22966d09f83b81074f0543723837b60015e7d4102b7a7085744c770a
diff --git a/app-misc/towitoko/towitoko-2.0.7-r3.ebuild b/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
index f545f018ad15..053d19504e51 100644
--- a/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
+++ b/app-misc/towitoko/towitoko-2.0.7-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Driver for Towitoko smartcard readers"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 3f551f0ff20f..b2a795216d61 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,3 +1,3 @@
 DIST tracker-miners-2.2.2.tar.xz 2893476 BLAKE2B 30bfd0454c5429a708ee10a299210e800e2d713859a20206b8c96cb41f4a1d14c438266b198788056b4d2f7fd5a9b8b465d9d7b460e3e57ddbd56d98f89c5ae2 SHA512 41dda92ddde2ba473ac0887ab5a0c0918c8a26a99cdcd1c0a7d49cdce0f7b02ff080fa868df7e855d08ce5cf61fa55b3ef0737bc58a83e80d2096435efa11cf3
-EBUILD tracker-miners-2.2.2.ebuild 4691 BLAKE2B d1ed0be0579c342940c2c648d1edfadbb1799ca02657ae601fd8450920cf709ce023a38dddba5e3275dbe9890498d1335469ec6a4d7a056def013fb470ecaaf8 SHA512 b2eaee0f31dbd69e5fa6c564bb70ead1e045380cb33253aceab83e4e98990552dd92dfff8bf7385f7d4fb29b7d3c2cd2f5f283390a608f8662244a35c458e3c4
+EBUILD tracker-miners-2.2.2.ebuild 4687 BLAKE2B 1c7ee9e246f29b54aa4744ef42dbb62ae50aac309306ab304472eaced129db8559c521eb35d6520bb25aeb7e5f43515264c64131ce8d9f5c2ad075973497a6f6 SHA512 493c0c9134ab39df3d3a7b91691a9198b8236af24f6f4130e58dabcf8e9694f06e9bae1ee4330bfc1c31cea9bcc7cdad0fca673c4ea9dc460c692d6b3c4011ac
 MISC metadata.xml 739 BLAKE2B 0ac1d8e892ef4b1caebea7f598b35694bc21956680ccfc16b2693528f913fde9354fb984fc09f20bbf9ad3671af2438818691d05fbfc05a06783cd2aa401ed8c SHA512 e685c1ed8e5029828251ed7a6e8124e8716b365172d976116a29aea67ec01744450892a30e53ce0a3ae4f1fa2b41d9af8fd4429667c31478e83aa3086cc0aa01
diff --git a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
index 9541f9757a22..22dec178b9e7 100644
--- a/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-2.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
 
diff --git a/app-misc/unfoo/Manifest b/app-misc/unfoo/Manifest
index f1eb46f33219..e6a94581d112 100644
--- a/app-misc/unfoo/Manifest
+++ b/app-misc/unfoo/Manifest
@@ -1,3 +1,3 @@
 DIST unfoo-1.0.8.tar.gz 31862 BLAKE2B adba517a24a1fde7e1733b10a0c69d1ee5b0827adfadf89a7073366f77bfa2439413c1ce682d9a6d24f8b7b0402f409c84754f75dd5ee31c03ab51ffe3918f81 SHA512 b4a2489ca4ae5a81feacc57aa7c9c6437e3fbb0cec997d1b5e182e9ea7e19c13998968f23094e78908e6d41e699d50a1353ae475ec32146c63298eff06182281
-EBUILD unfoo-1.0.8.ebuild 1281 BLAKE2B ee184bc3c7dbce1f36269fe5b1b9fb54b96c4588a68c10d228f3ca85835e6ab58749dac99d0b19c395555944474a0a130d2481274d3bfdb397e21121eeb9c42c SHA512 cf38734e031235164849090a7d5ef28faf804c067e9977d890ec2f9f42b0bf0e95b7d50da2d72d664772e68661cc46a4d5a74a715b2659745b928290cd88e78e
+EBUILD unfoo-1.0.8.ebuild 1180 BLAKE2B b6b76734ae0eb8ac537db0d7f0db06f7df741f4064ea2224d04d76b7ed74e0efa5631f63c8a4a8152022cd29f657d30215c151c0acd7205ca651ca6303fd8595 SHA512 139e423094d00fab0cd51eba701094dc115d6f10316bfc4489b9dc0065bb9fb63041dad313f16674d12c502ae38b2fef66bd9ef437255892b853f3129d05761a
 MISC metadata.xml 443 BLAKE2B df80de233a6c7d23093b4770b2f4064c389ae85837b7a405a1b3132c42bd050ea99b6ff922d75d118e616c011191f4d708a0080b094aa40e938fcefb556f6f14 SHA512 d51afbee4941d3a6d5239b983e2beec524d9991c67131f691cf0f424b4ab5e798405fe89f7d8019c912a4e54413bf38f611bbb1574c4cef809440d7a1a60ee3e
diff --git a/app-misc/unfoo/unfoo-1.0.8.ebuild b/app-misc/unfoo/unfoo-1.0.8.ebuild
index a6c641e8024b..1049dfaf93bd 100644
--- a/app-misc/unfoo/unfoo-1.0.8.ebuild
+++ b/app-misc/unfoo/unfoo-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,5 @@ pkg_postinst() {
 		elog "optional packages to do so. For a list, either consult the source"
 		elog "(less /usr/bin/unfoo), or see http://obsoleet.org/code/unfoo"
 		elog "To get full support please use USE=-minimal"
-	elif [[ ${REPLACING_VERSIONS} < 1.0.7 ]]; then
-		elog "To get full support please use USE=-minimal"
 	fi
 }
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index d72843c15729..9f6402378f3a 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/adb-sync/Manifest b/app-mobilephone/adb-sync/Manifest
index 5ef69f4a92b7..aafa39356252 100644
--- a/app-mobilephone/adb-sync/Manifest
+++ b/app-mobilephone/adb-sync/Manifest
@@ -1,3 +1,3 @@
 DIST adb-sync-0_p20181127.tar.gz 13952 BLAKE2B b9097f44eebd76e54cee41f097933f85151399e99275268274252b53f47ab241ecb888f3631dd9f657213160f02e9f3638d782fb24de8e38631d0e2a81b6b03e SHA512 007b9ec089170f3e679a26f23952043ad922a2f988532183200ddd15792858d4d38c6dbd617b32ff0e17d01b37b246c173e4a3f8c008f7cf4bca551e64cd0ca3
-EBUILD adb-sync-0_p20181127-r1.ebuild 728 BLAKE2B 889d428f9b454924fde656d78e8a71725b12268c818937ef47871c27e2fe3cf4ff26023597f4afed918b9ae583fbed983a75a27e762cbdd39464a7e9a3e5744e SHA512 81cada0339f7ab65a0dd1f35af9d069628b31a915838c3f504c5dcc57aabc746bf60945f5d7d5248450eb6e1656c5af55244fead9c67b5b502e1b1c4406d2b0b
+EBUILD adb-sync-0_p20181127-r1.ebuild 718 BLAKE2B 9efd5a0aed0e299d5e710fd29c286ab41f7ffc4c8665e2f6b02dc32a924696b745ac337d40a3c153228b28380f6358ec86400fe2023ea2dfe9f2ccbf7b8838df SHA512 0e87cb5d3ca8598c3b93a9874fef68ed7e53f236859679732883602cf3779b79e0c78f3bc3fd6ef9d74042ea5ea63363fef3a8598d1a78db55277fcc97760ba4
 MISC metadata.xml 483 BLAKE2B 0b7ef2215754e8d77ba39a0ae635d74ddefab07eafbb00c5a1a806eb533fdc8224edcb0d0100c70017c4af3115db22dad81e66b9c37a3c89bb9928a023e518e0 SHA512 f4be0d74af3c6fa0a982de8c3410c2c4fa0f19dd77d368ddce8169e9c3db4e2a89c01d8c651212851e2a30e30b5b5133f8c740ce120bf8cff5fb84ec68c11bd7
diff --git a/app-mobilephone/adb-sync/adb-sync-0_p20181127-r1.ebuild b/app-mobilephone/adb-sync/adb-sync-0_p20181127-r1.ebuild
index 07bd5c99bfb0..467c7292ba8d 100644
--- a/app-mobilephone/adb-sync/adb-sync-0_p20181127-r1.ebuild
+++ b/app-mobilephone/adb-sync/adb-sync-0_p20181127-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index a6f1094c4d16..9a2af0257e2d 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -5,5 +5,5 @@ AUX obexftp-0.24-norpath.patch 641 BLAKE2B ba8de051365bc6417a6421cde50399a92754a
 AUX obexftp-0.24-python_sitedir.patch 544 BLAKE2B d86883dca5cc9795a07a0a306692cfe63774054d7f6358a3c2a581e2a77f85fef2c3e9fbaff8d8d21d860ced636159532d2fede546ff28146c452e0a2ea33910 SHA512 519e77d8a3ff4b7a9779e350191b8389c27f7bf42abd44704508341d9fdabb0bf9b456fc4cccd93779fc4b54ddcf3cabb38e55f2ea3389b90a85e27de18e0b6a
 AUX obexftp-0.24.2-parallel-build.patch 1251 BLAKE2B 538d82b8e14ec874323d1578c6ccd10d3418cd0efda61bf3752aaea04b22ac357b2792783cf3a86d6c7ec2aa33bd0bbacdf9b99f2082b427fc56d241b2a57849 SHA512 0f7bf40bde282faa6e6c5fc9bab4d5f4d95c9c09581b2e5bfa2f7490714da09c41c3b02789c3ddd7bb2be5d5960aa59587796685a4a250b7f60095237ce77eba
 DIST obexftp-0.24.2-Source.tar.gz 110291 BLAKE2B 7de93f5f5a367481b22b49c7812357ab5f704830c83770378de13f9c4ffb5f114d48beafca193b52670563b397656ec185519a8d004eb1f9785787e8cc5caaff SHA512 91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2
-EBUILD obexftp-0.24.2.ebuild 1664 BLAKE2B bacf7f41656003ddb165816b5b0f8b8a47a9182758757ea1088cb316ec2fb1a6baecdff7cece287a991a6ffa0c9af355d36bacd376542ab432204d999ba9dad4 SHA512 833262c6cb1cb44aa06e7728fad540c46bd4fe317f54811af5c00288a979832e305156f64300582f112af186728e77c37f1cc2335cc8a7873dc1efb9bacce43d
+EBUILD obexftp-0.24.2.ebuild 1658 BLAKE2B b810869ae2afd4e6600115bcfe3601b2cc6d0d980a58dccd2eeacff0d97b39656eb0db6f8d832bcca56aeefbe05469c829c677499d09856fc81b10e29f9b1124 SHA512 70879d289e59bb2e96143e7f1103e258ccb71321fa7f6591bad0e1d9bd0d3b16b65937f4f7376f6e84978b40c258b7558b1cd31b58a4d70ce3f973f1f12afb60
 MISC metadata.xml 245 BLAKE2B e86e15e6196c5caa30c4dbbcc46d970e3d1fc51b5986c9c5855da2914e104cdc3abe7d23eae94b143047e21603bbd49c23684cca7eed166d90579ccc9dcc742e SHA512 f2f864248cda1ce42c75a7d993ea9d80592f4b5bf957ba7d10e3a26d55429720530c96974403e9d732e2ca67724645f7dfb8b880617a3cc6a3b9d36dd201f433
diff --git a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
index ba779f3b1004..d1c6caa1ca70 100644
--- a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit cmake-utils python-single-r1 ruby-single
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index b7ecb4357060..f6bf3648605e 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/dia/Manifest b/app-office/dia/Manifest
index 1b396cf40e46..d1d953c41ab5 100644
--- a/app-office/dia/Manifest
+++ b/app-office/dia/Manifest
@@ -2,5 +2,5 @@ AUX dia-0.97.0-gnome-doc.patch 1961 BLAKE2B 6b6835a487e4b1ada0a1e67cb3ce123b0b4b
 AUX dia-0.97.2-underlinking.patch 1024 BLAKE2B 32fa473b806e740fb7c2b0e04c170c746bf523088e85dce281d0c87ef10c1542f1d77414dd49e6ce48b1e54c2e3e48d09c1820a8739bce6bb64539ba87b2485e SHA512 d45eb49c39227e9f11ce999083de0a83c60bfac2a5db2403e4bf083c275efdef6bd1adca678712253ec53f7b3d22a5c23f6f886839c32e6cb07a93c001f45e2e
 AUX dia-0.97.3-freetype_pkgconfig.patch 2574 BLAKE2B 870617b939e4ab7ecdfbf5bba4e78cee9f34ee10b1de2bb85380cc96d31c319132861b8ddd0e89a5a03cae2578588c9483ba62f0bf4006096c4074beef77cc4f SHA512 0e937bb17cb69d3f266f68658b11b209a913300d2366adfa4bb608212cd82f00d85272be784f0442d0dcba8659d020e5e848d2e02ee7310ec8cfd6c7170aa8b7
 DIST dia-0.97.3.tar.xz 5548500 BLAKE2B ab476ce48e57c1def01095a8d6d92208c11817580cfca1cfcf38af12943153116b31149ca187c65e5121ef9fb281bacc4c3e7f1726ed23b46ba14902faaaa34f SHA512 34298980be930b87cb4a636344e4cb2a7e43eedc00b0969a5e446cee9b74b616fdc8c798efcb9a5832b98741f2e20632a44037b2bcb436f59591d531ef441efa
-EBUILD dia-0.97.3.ebuild 2887 BLAKE2B c7e29d4d54e614d886bc89279b044707e22e5eba790ed2adb878034b1cd83becb70fb774f36dfb3b9bd17f37a2abac5e257de45c6c0072341bbfc2fa48930e15 SHA512 fad74f29fb22b6b7c356606ffbdddb9ef4bd5d7961b97ddc11b312649b7620ec0e16128b977997777af1843395b40d30da4751eead1629e370bcb15be9a73ec9
+EBUILD dia-0.97.3.ebuild 2885 BLAKE2B ce2c5294ea1582a4fc3303338e90c05218227495c8e3ccea88b43a820a2acf4fc76fdaf43da0091ae00e53d367684a4f3328cea67fc7ffabf8032a1613a4b6a3 SHA512 ed840356e405e6d55fcb756e94deb5b50336adfd7e6475cabe9509b13af6374c90f1555552a4c272e887623443d3ed3b4ad0190052cea9e8f9ae0159ba82ec80
 MISC metadata.xml 668 BLAKE2B 8efd2b23ae5c96f9c65cae27602a4e8a969d279b2400c0e5940541d2d9066ce0f5dcbb39e9a5dabf6ce8391f57d1b527a89bb7a015153922b378d40c121342c6 SHA512 2296acdf1f56496eb699d6acfc85ec64e1c514dc01184df367c77b505f8765d45b51d7753e1d6bcb5cb80cb239f6a05b0fcda9ddc412f7d72ed4a4a4733ea6ed
diff --git a/app-office/dia/dia-0.97.3.ebuild b/app-office/dia/dia-0.97.3.ebuild
index 64574167263e..d39f9d30be27 100644
--- a/app-office/dia/dia-0.97.3.ebuild
+++ b/app-office/dia/dia-0.97.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dia"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 # the doc USE flag doesn't seem to do anything without docbook2html
 # cairo support is preferred as explained by upstream at:
 # https://bugzilla.gnome.org/show_bug.cgi?id=729668#c6
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 79f3780babf5..acf61c4cc9ef 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,7 +1,7 @@
 DIST gnumeric-1.12.39.tar.xz 20040688 BLAKE2B 5d99da20b567a939208881b962de3c79ab115a24953dc04d6c882e9a54946e5c5fbd32808a8006e396d70bc9a2a9783b20106536da1c19f7ed7dccd3b12c2fff SHA512 8ae09ea857989e65a8fe2070b30c2309d82daa4142816ef3a1b107035aea0d71498d84eaeeaa870a1587e3785146fad3304321a531c75f6e2f200def53a8e898
 DIST gnumeric-1.12.43.tar.xz 18033636 BLAKE2B 32cbbefc10c0537b02b56564ed37f03d69d0865e9bd16dc8cb77aacf682087fce60f01a2e70b5dbef4d73840b6ccbe198d3c5cc5f13b0f1b2a48d0af635e607f SHA512 d2702000e6c4f4c0c7ff442a2b81e10f4d55f0cffbf7b7f1e7c9fed98fb46172b0118ca05102aa53fb4f953799e2be3534f0518b025ece26647ce67b870a34a7
 DIST gnumeric-1.12.44.tar.xz 18010384 BLAKE2B 0348714a7dae119b36a6739ea499bc0411416637fe9cbd703024f4cdcdb894e2d4b0da3212ea6e2ad1dd81f893c96341722c83ef014db7f0a6f2a048696f41c6 SHA512 ea21dcdf5fdf4e02bb9d83671675f2409f12ee928611604d7589e0047ce5d75bf6ac51e6a5322c4af520428acdccf4c2b3b8e3fc6530030e162268aea94a503f
-EBUILD gnumeric-1.12.39.ebuild 1468 BLAKE2B 60bc73346431393160bf657c9d74565aa1846226ce2e544f991c2b3b514f515ab347223195a40cb461b8439c828857daf54c42d0e143e4d00597173757f779bf SHA512 4b45dc1152fa408bc2317745bf92287638394d67ff2e11a43198a6be1502fccf7b36d1b1bf7f105edf04d8cb2ed4a999a8abc9fa60ad1ac02e1da02aac930de3
+EBUILD gnumeric-1.12.39-r1.ebuild 1507 BLAKE2B 8c9bd1b5cf9ba4d80bcd9ae1fcb87529c53d4bfc7adb252d578e2c9f5acb4e23037298ffbff69c9a55b53cd92a166bc251656301c3904ab3b6177a09a915df7b SHA512 bd98e621dcbddaf7674936918ca428b7048fe2dd6f7c0371dd16daf8be2cc2c7aa0e27df52a269e7c0b1b7da6c94afa1eb58d46085636a1c3d36fa17108ff8ee
 EBUILD gnumeric-1.12.43.ebuild 1924 BLAKE2B 24ef60f8af182b7ce3e8d74b83c9f44120c881eebaa1e67fdfe41cc2b31df21c451ebc1cdc0793daf81762abb97a1c695d603fb6c5486a4e434749322f076395 SHA512 1eb63cf1751ee9b5e59ddc6cce1bd27e4159d5f09d21c2c9fc047c5eaaa6208647e00c80f690dc802e2f2839bb9eb432e7e1a397553cefb87985477f8ff10bfd
-EBUILD gnumeric-1.12.44.ebuild 1924 BLAKE2B 24ef60f8af182b7ce3e8d74b83c9f44120c881eebaa1e67fdfe41cc2b31df21c451ebc1cdc0793daf81762abb97a1c695d603fb6c5486a4e434749322f076395 SHA512 1eb63cf1751ee9b5e59ddc6cce1bd27e4159d5f09d21c2c9fc047c5eaaa6208647e00c80f690dc802e2f2839bb9eb432e7e1a397553cefb87985477f8ff10bfd
+EBUILD gnumeric-1.12.44-r1.ebuild 1924 BLAKE2B 24ef60f8af182b7ce3e8d74b83c9f44120c881eebaa1e67fdfe41cc2b31df21c451ebc1cdc0793daf81762abb97a1c695d603fb6c5486a4e434749322f076395 SHA512 1eb63cf1751ee9b5e59ddc6cce1bd27e4159d5f09d21c2c9fc047c5eaaa6208647e00c80f690dc802e2f2839bb9eb432e7e1a397553cefb87985477f8ff10bfd
 MISC metadata.xml 577 BLAKE2B cd1276d2088227ed5d048eb26f45da978d5450eff81290c27341f8708110924e4088ee85a4723cf1144a61dfdc522ea55d53c24839ad547229ceb876bc3ea6b3 SHA512 f240b871cf7d127a6efc2ea1053e44b4098f491b31a0615c6cf910e1b5044ed9d34b1d31ae61d6d7d4f2db0f3633809869a303c93e0d1a3e5127f15c9c17bda0
diff --git a/app-office/gnumeric/gnumeric-1.12.39-r1.ebuild b/app-office/gnumeric/gnumeric-1.12.39-r1.ebuild
new file mode 100644
index 000000000000..f12e005b4cec
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.39-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 flag-o-matic python-single-r1
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+IUSE="+introspection libgda perl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.38.0:2
+	>=gnome-extra/libgsf-1.14.33:=
+	>=x11-libs/goffice-0.10.38:0.10
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.8.7:3
+	x11-libs/cairo:=[svg]
+
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	libgda? ( gnome-extra/libgda:5[gtk] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	app-text/yelp-tools
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl) \
+		$(use_with python)
+}
diff --git a/app-office/gnumeric/gnumeric-1.12.39.ebuild b/app-office/gnumeric/gnumeric-1.12.39.ebuild
deleted file mode 100644
index 2ff8d6609df0..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.39.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 flag-o-matic python-single-r1
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://www.gnumeric.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+introspection libgda perl python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, also fails tests due to 80-bit long story
-# upstream bug #721556
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	>=dev-libs/glib-2.38.0:2
-	>=gnome-extra/libgsf-1.14.33:=
-	>=x11-libs/goffice-0.10.38:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.8.7:3
-	x11-libs/cairo:=[svg]
-
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
-	libgda? ( gnome-extra/libgda:5[gtk] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	app-text/yelp-tools
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl) \
-		$(use_with python)
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.44.ebuild b/app-office/gnumeric/gnumeric-1.12.44-r1.ebuild
index dc288a384e42..dc288a384e42 100644
--- a/app-office/gnumeric/gnumeric-1.12.44.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.44-r1.ebuild
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index e51871054cc1..68924eefcdea 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,5 +1,5 @@
 DIST kmymoney-5.0.7.tar.xz 11667088 BLAKE2B 4d523bb9ea5d41dc6aa6e52b0b982384c6e6ad3cf6981e961f137320a36fc395136b81dfd3b8c8085375c46dc9affaa5b746f9250cce72a6c8ad6af669e5109c SHA512 af0663bc7ac3fe59a8c7db09942bbb8a182ea5f7ee3bdc05e7ed449c7172040de2282997db95fcce823f7d3d8f6f2b43229b5e4ba3b349eb8ea3b2756636f6ed
 DIST kmymoney-5.0.8.tar.xz 11753276 BLAKE2B 0c4967b3f39ec675b9bd7e8e81e230c7f5efa574671138db57396984add802d9b6c28e383eaaddb4ee8d486e6dcc2b0ac54f5cf1129aa4dafb9bd1cf4235914f SHA512 f332327dd40cc5667cd0141bd8e0c9cd81a2d996a4d482b2976f6bbd258cc27c73b2190d4631b8e0b9ee9d435ef8934312da399234830eb51b3e4ec942350988
-EBUILD kmymoney-5.0.7.ebuild 3432 BLAKE2B 86415f5787cd87156a7bc3057a2f9c1d1be590fe424800ed9a8a544763e82d44932d405bd6102ebb0a28aee8719f7fa0ef5e729489c5f84e8d2bea386bbb85d3 SHA512 ba80fbbb879e11520348d40928067554535a1e400d960dc208ef87101db96b4937982dc569e7f27c7f9bac2018659d417d778d1753f06004e476200852f4762d
-EBUILD kmymoney-5.0.8.ebuild 3421 BLAKE2B e9dc2fc9be2b4fe64689c03b3098b43627c6d3184de8317a16109568e08823bd41ab4b74ed07fb444af97523a83a73f1eb4fdbd735e5cd96bbb2fb8d166f00ce SHA512 cd21e7db1dd8b1c70d381a76dfc60774a7a1374a7d3097ac00e419774674cfd34bb3bcca9a582f1045b8ef8af95d34cca5f9bd9076f9600dfbe7048009fe37dc
+EBUILD kmymoney-5.0.7-r1.ebuild 3470 BLAKE2B 3337a520a513cf6d57be180ac5b216e8a504c207586eb5d4ee10d26e678c18909c1656142d42aa275e1fd3d8ce323cf7b6fcac9823905b0891af9d0b6d113d08 SHA512 0e5fb8de4838ad11c9adee345996ce36415f01070060dc92f06e2623fff3e05000f354627372e49c4b0d01ba8cc194c0be5209f95e97c087dd206d4fcf439092
+EBUILD kmymoney-5.0.8-r1.ebuild 3458 BLAKE2B 8446d57927f8332e49dc6203d64de3714146177a275287cef0e74994112eb9b3b043e76d3763edb841d189d0fe19fc272cc9e0c305489151916c200c3efe42d7 SHA512 5960246084d09e12b8490c4cc934f9b330e8300abb18f9524564a856f1c3bddf5ee90653daf6e98a4bbb2d3056bb7552afa5397ebb4c9d2d5b9f5f96c25e0f5e
 MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.7-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.7-r1.ebuild
new file mode 100644
index 000000000000..611c550390a8
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.0.7-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Personal finance manager based on KDE Frameworks"
+HOMEPAGE="https://kmymoney.org"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
+
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.7.1-r1[cxx]
+	>=app-office/libalkimia-7.0.0:=
+	dev-libs/gmp:0=
+	dev-libs/kdiagram:5
+	dev-libs/libgpg-error
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	addressbook? (
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+		kde-apps/akonadi:5
+		kde-apps/kidentitymanagement:5
+	)
+	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=net-libs/aqbanking-5.99.40_beta
+		>=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5]
+	)
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	ofx? ( dev-libs/libofx )
+	webkit? (
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	)
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	weboob? (
+		${PYTHON_DEPS}
+		>=dev-qt/qtconcurrent-${QTMIN}:5
+		$(python_gen_cond_dep '
+			www-client/weboob[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/kmymoney:4
+	quotes? ( dev-perl/Finance-Quote )
+"
+
+pkg_setup() {
+	use weboob && python_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package addressbook KF5Akonadi)
+		$(cmake_use_find_package addressbook KF5Contacts)
+		$(cmake_use_find_package addressbook KF5IdentityManagement)
+		-DENABLE_LIBICAL=$(usex calendar)
+		-DENABLE_KBANKING=$(usex hbci)
+		$(cmake_use_find_package holidays KF5Holidays)
+		-DENABLE_OFXIMPORTER=$(usex ofx)
+		-DENABLE_WEBENGINE=$(usex !webkit)
+		-DENABLE_WEBOOB=$(usex weboob)
+		$(cmake_use_find_package weboob PythonLibs)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 652636; bug 673052: needs kmymoney installed to succeed
+	local myctestargs=(
+		-E "(reports-chart-test|qsqlcipher-test)"
+	)
+
+	ecm_src_test
+}
diff --git a/app-office/kmymoney/kmymoney-5.0.7.ebuild b/app-office/kmymoney/kmymoney-5.0.7.ebuild
deleted file mode 100644
index 75cc141e722b..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.7.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-libs/gmp:0=
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	addressbook? (
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-		kde-apps/akonadi:5
-		kde-apps/kidentitymanagement:5
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-5.99.40_beta
-		>=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx )
-	webkit? (
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	)
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-	weboob? (
-		${PYTHON_DEPS}
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		www-client/weboob[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-pkg_setup() {
-	use weboob && python_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package addressbook KF5Akonadi)
-		$(cmake_use_find_package addressbook KF5Contacts)
-		$(cmake_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake_use_find_package holidays KF5Holidays)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
-		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake_use_find_package weboob PythonLibs)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	ecm_src_test
-}
diff --git a/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
new file mode 100644
index 000000000000..b1446f406c74
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Personal finance manager based on KDE Frameworks"
+HOMEPAGE="https://kmymoney.org"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
+
+REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	>=app-crypt/gpgme-1.7.1-r1[cxx]
+	>=app-office/libalkimia-7.0.0:=
+	dev-libs/gmp:0=
+	dev-libs/kdiagram:5
+	dev-libs/libgpg-error
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	addressbook? (
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+		kde-apps/akonadi:5
+		kde-apps/kidentitymanagement:5
+	)
+	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=net-libs/aqbanking-6.0.1
+		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
+	)
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	ofx? ( dev-libs/libofx )
+	webkit? (
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+	)
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	weboob? (
+		${PYTHON_DEPS}
+		>=dev-qt/qtconcurrent-${QTMIN}:5
+		$(python_gen_cond_dep '
+			www-client/weboob[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/kmymoney:4
+	quotes? ( dev-perl/Finance-Quote )
+"
+
+pkg_setup() {
+	use weboob && python_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package addressbook KF5Akonadi)
+		$(cmake_use_find_package addressbook KF5Contacts)
+		$(cmake_use_find_package addressbook KF5IdentityManagement)
+		-DENABLE_LIBICAL=$(usex calendar)
+		-DENABLE_KBANKING=$(usex hbci)
+		$(cmake_use_find_package holidays KF5Holidays)
+		-DENABLE_OFXIMPORTER=$(usex ofx)
+		-DENABLE_WEBENGINE=$(usex !webkit)
+		-DENABLE_WEBOOB=$(usex weboob)
+		$(cmake_use_find_package weboob PythonLibs)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 652636; bug 673052: needs kmymoney installed to succeed
+	local myctestargs=(
+		-E "(reports-chart-test|qsqlcipher-test)"
+	)
+
+	ecm_src_test
+}
diff --git a/app-office/kmymoney/kmymoney-5.0.8.ebuild b/app-office/kmymoney/kmymoney-5.0.8.ebuild
deleted file mode 100644
index 62e386a04571..000000000000
--- a/app-office/kmymoney/kmymoney-5.0.8.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.7.1-r1[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-libs/gmp:0=
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	addressbook? (
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-		kde-apps/akonadi:5
-		kde-apps/kidentitymanagement:5
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=net-libs/aqbanking-6.0.1
-		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx )
-	webkit? (
-		>=kde-frameworks/kdewebkit-${KFMIN}:5
-		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	)
-	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-	weboob? (
-		${PYTHON_DEPS}
-		>=dev-qt/qtconcurrent-${QTMIN}:5
-		www-client/weboob[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/kmymoney:4
-	quotes? ( dev-perl/Finance-Quote )
-"
-
-pkg_setup() {
-	use weboob && python_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package addressbook KF5Akonadi)
-		$(cmake_use_find_package addressbook KF5Contacts)
-		$(cmake_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake_use_find_package holidays KF5Holidays)
-		-DENABLE_OFXIMPORTER=$(usex ofx)
-		-DENABLE_WEBENGINE=$(usex !webkit)
-		-DENABLE_WEBOOB=$(usex weboob)
-		$(cmake_use_find_package weboob PythonLibs)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	ecm_src_test
-}
diff --git a/app-office/ledger/Manifest b/app-office/ledger/Manifest
index c0a8f65bfe9a..e696a36aa0cf 100644
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@@ -1,3 +1,3 @@
 DIST ledger-3.1.2.tar.gz 801112 BLAKE2B 71b907a83fe10857d17de746c0d124572859c9eca237130ebbfa5b730406470a5d31025736e80516feaac7daf14a4edb8b644ed72a0827f9714ac9cb2b79c0fb SHA512 445d9a9c70aa3e59718f8fb75e4110c73f2f476436149fdd456b5fe7b9cee9333c09647080049989599dfac491e5bdd0d143717e58e15989db0fcaad4e5a958d
-EBUILD ledger-3.1.2.ebuild 2570 BLAKE2B 2c55c43f52b7ea80e37fbe6f9c50bc567d701b40254143df9828f6343b1b851108a5de040ecb9448f4d8c8f20b329ef9bb6391962fbc23fade4515d09a461f7e SHA512 272b5aa6e203d97355fa2ef982d0745aa9b0b0c68601e81332551a46d83873b873bbbd09d3ba5606b90c96f81b2d5d71874d58113faedf89be6a4ec8ef3eadd4
+EBUILD ledger-3.1.2-r1.ebuild 2608 BLAKE2B 74a23d6a6f61cc0237100038af83f4241098e1f34487da11538dddef5ef540fd4d7adc5bc8422906caeee999ab5558395ddeeaf8bc3fd4e62b353ef9211947c0 SHA512 91e7ee6e7ae984d166c725979128f5e5686b60fd8836fbeafddc4f769c8edf6a3370a7f292bf67ec1889ddb35c5c14eed3753c73ddac2267f180bdcfae1aa0f1
 MISC metadata.xml 306 BLAKE2B 58c3d0307a4358f50e8ede8ddf3f598a55ad03dd9af3351b4f15a46465a844c24f9d5966ee5fbbcb9a68d65eb509a18a87aa95400094539475f65493e34f1839 SHA512 c83b1be9474bbfa3296040c56bf14e22afd214835a44907bcb4db2a8047f05e1fe49b1d1ebe5bcd72fe5ed2f27c832d20169aa813f0d9bd619fc1f7a1c5e15cb
diff --git a/app-office/ledger/ledger-3.1.2-r1.ebuild b/app-office/ledger/ledger-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..df1fb4549849
--- /dev/null
+++ b/app-office/ledger/ledger-3.1.2-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit check-reqs cmake-utils python-single-r1
+
+DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
+HOMEPAGE="https://www.ledger-cli.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="debug doc emacs python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+CHECKREQS_MEMORY=8G
+
+RDEPEND="
+	dev-libs/boost:=[python?]
+	dev-libs/gmp:0=
+	dev-libs/mpfr:0=
+	python? (
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-python/cheetah
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/utfcpp
+	doc? (
+		sys-apps/texinfo
+		virtual/texi2dvi
+		dev-texlive/texlive-fontsrecommended
+	)
+"
+
+# Building with python integration seems to fail without 8G available
+# RAM(!)  Since the memory check in check-reqs doesn't count swap, it
+# may be unfair to fail the build entirely on the memory test alone.
+# Therefore check-reqs_pkg_pretend is deliberately omitted so that we
+# ewarn but not eerror.
+pkg_pretend() {
+	:
+}
+
+pkg_setup() {
+	if use python; then
+		check-reqs_pkg_setup
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! has_version ">=dev-libs/boost-1.70"; then
+		sed -r -i \
+			-e '/set.BOOST_PYTHON/s/python27/python-2.7/g' \
+			"${S}/CMakeLists.txt" \
+			|| die "Failed to update CMakeLists.txt for python2.7 boost"
+	fi
+
+	# Want to type "info ledger" not "info ledger3"
+	sed -i -e 's/ledger3/ledger/g' \
+		doc/ledger3.texi \
+		doc/CMakeLists.txt \
+		test/CheckTexinfo.py \
+		tools/cleanup.sh \
+		tools/gendocs.sh \
+		tools/prepare-commit-msg \
+		tools/spellcheck.sh \
+		|| die "Failed to update info file name in file contents"
+
+	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_DOCS="$(usex doc)"
+		-DBUILD_WEB_DOCS="$(usex doc)"
+		-DUSE_PYTHON="$(usex python)"
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
+		-DBUILD_DEBUG="$(usex debug)"
+		-DUSE_PYTHON27_COMPONENT=yes
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_make doc
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog
+	elog "Since version 3, vim support is released separately."
+	elog "See https://github.com/ledger/vim-ledger"
+	elog
+	elog "For Emacs mode, emerge app-emacs/ledger-mode"
+}
+
+# rainy day TODO:
+# - IUSE test
diff --git a/app-office/ledger/ledger-3.1.2.ebuild b/app-office/ledger/ledger-3.1.2.ebuild
deleted file mode 100644
index 38cba372bc38..000000000000
--- a/app-office/ledger/ledger-3.1.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit check-reqs cmake-utils python-single-r1
-
-DESCRIPTION="A double-entry accounting system with a command-line reporting interface"
-HOMEPAGE="https://www.ledger-cli.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="debug doc emacs python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-CHECKREQS_MEMORY=8G
-
-RDEPEND="
-	dev-libs/boost:=[python?]
-	dev-libs/gmp:0=
-	dev-libs/mpfr:0=
-	python? (
-		dev-libs/boost:=[${PYTHON_USEDEP}]
-		dev-python/cheetah
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/utfcpp
-	doc? (
-		sys-apps/texinfo
-		virtual/texi2dvi
-		dev-texlive/texlive-fontsrecommended
-	)
-"
-
-# Building with python integration seems to fail without 8G available
-# RAM(!)  Since the memory check in check-reqs doesn't count swap, it
-# may be unfair to fail the build entirely on the memory test alone.
-# Therefore check-reqs_pkg_pretend is deliberately omitted so that we
-# ewarn but not eerror.
-pkg_pretend() {
-	:
-}
-
-pkg_setup() {
-	if use python; then
-		check-reqs_pkg_setup
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! has_version ">=dev-libs/boost-1.70"; then
-		sed -r -i \
-			-e '/set.BOOST_PYTHON/s/python27/python-2.7/g' \
-			"${S}/CMakeLists.txt" \
-			|| die "Failed to update CMakeLists.txt for python2.7 boost"
-	fi
-
-	# Want to type "info ledger" not "info ledger3"
-	sed -i -e 's/ledger3/ledger/g' \
-		doc/ledger3.texi \
-		doc/CMakeLists.txt \
-		test/CheckTexinfo.py \
-		tools/cleanup.sh \
-		tools/gendocs.sh \
-		tools/prepare-commit-msg \
-		tools/spellcheck.sh \
-		|| die "Failed to update info file name in file contents"
-
-	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS="$(usex doc)"
-		-DBUILD_WEB_DOCS="$(usex doc)"
-		-DUSE_PYTHON="$(usex python)"
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-		-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-		-DBUILD_DEBUG="$(usex debug)"
-		-DUSE_PYTHON27_COMPONENT=yes
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	use doc && cmake-utils_src_make doc
-}
-
-src_install() {
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog
-	elog "Since version 3, vim support is released separately."
-	elog "See https://github.com/ledger/vim-ledger"
-	elog
-	elog "For Emacs mode, emerge app-emacs/ledger-mode"
-}
-
-# rainy day TODO:
-# - IUSE test
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1c463f33a3c2..3f38e0a4c56c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -11,7 +11,7 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058
 DIST libreoffice-6.3.4.2.tar.xz 225632492 BLAKE2B 587fe7e6298ded60fa08963f572733eb8e387c00b428201bb6f1de7eddcf9d9ee97438231ed3f961bd22628bde0fd9dfeacb63febdc566cde781bcebb9c9a71d SHA512 2ed687ae805da36635419729066a2924f1e38a6b0f8d2692c42b366450a261012adfcd8a5d7915d9cfd292d07519fc32c596cdb56d7be6b12a49618b18d6f3d2
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-6.3.4.2.tar.xz 13191636 BLAKE2B c1696efa0ec9fef9dbcc0c0388de8a384484af1453d200e08820ba910cdcb65638b189566a19868281fd1777213812fde06adb07c1a662302eea1d0a791ff5a0 SHA512 8c74c82c7d73adb1523300d1f7500769f5a623fdba60b440a63c122cbfeb631a6a34ecbcb115b0154a6957be1918306f7d0c1f465030f8e8cfd5c9a1acad17c9
-EBUILD libreoffice-6.3.4.2.ebuild 15997 BLAKE2B 7d4cfabdbb58d8b9fe4d116e453797aa04474bd0873e83e373ef5b10086fe2034dfe1ea3886247ebfd6cbf0945f83d1cebe35699f1f91fa5b20b5136937d4246 SHA512 ebbc44168a791c8f1125c8c007753d7eb035a8165b187cb6fe5d63fc5e1ec05a75a96e6c1cd9a017ed37102c64a2ccd5569d47c7d356fdc62979dc86ac0111c6
-EBUILD libreoffice-6.3.9999.ebuild 15960 BLAKE2B 9f06fee05c73e6109ec65809b856d883950bbf9e52606a6924d83f280a8dd15759d02375fcf78267f513dd1b4014b13144f3718a6d851be0de5362a569d9a42d SHA512 4425b3c05d7d043815a01cbebf4bb123c9d51996258fde08f34bf2f3ccce7f1633d7d0bead621557c54493178e379c3ec5fc74083c3674f6367cade83de4f8f9
-EBUILD libreoffice-9999.ebuild 15782 BLAKE2B 16a63cbf184700253bdf7c6ea9d98ef4db9a0626e6b1bacef86e814a1dbd76d402bf03bc9a6caf0aa2ca43c6b9da6aa5c4c4c686d8d1578d66eb5e551f1e2827 SHA512 28a995c51ffe8e1de1c372c9c224e5ba1c036473667d4e4f02e8cdc18b5457ba9f26b8bcf4381158456bbb8f1162b580276c933dc67a6e69ea38c22ff9603731
+EBUILD libreoffice-6.3.4.2-r1.ebuild 16038 BLAKE2B 8eac5213c23f7568c23dd88a113622d0c708a02c0b136806be202ddc3c07c4c9f8136aa86c2a0a7484608a559cd06c3a60681e12c576bff8551f36bd53991ec5 SHA512 b14676a687abc823afb6bd53b0bde96f751a32919889eaa593ce461f0b75264beea4f32dfa52d0e95d86fbc2512d138be63459dd0327376d1c6e8d2faf953c9e
+EBUILD libreoffice-6.3.9999.ebuild 16001 BLAKE2B 8aa44f144c408e1346640205fe040547a15ad249be56cde555730d7597d61af126521b9e306516cf756b5791a97d9f80b3eed2d6755e5f99c4c848185ca77a11 SHA512 6ee3cd1a2133187bc4d88e2cdbbc4174e48cefc876a25cc5b63aa274e11f8db96e66a57d2eef659eded395f6682137b6cf83d724566e8ef216838a847913348a
+EBUILD libreoffice-9999.ebuild 15823 BLAKE2B c7cc47b46aac181b18ed2501fc308faf1ff98ee01d5fd203fee37cb5d3e292104c144d61ddfc060ee992b51e8e69ac84dcee393e9c2bdf55c275bc652763051d SHA512 576146f3cb89ebe792ca326c5c6154c1e29ee55f95b3668b8edc8312f43d4e66e4e8e2d03f320d310ce3ae4ef2b82a3a5e437eb313e94032f49e8a450afc8be0
 MISC metadata.xml 1007 BLAKE2B 9cfefc8eb71dad67a632810e4b3b91e17534565b245bfd71f2b34819fb96edef9617be5a899778e4ca5f54c7963d43f0a23615c003bd175c41c6f59d245e449c SHA512 5d470c6d1099a5c932e5a7418a72df7999df949c3ca2911efe7a18a900cd7580b00c540eae91478894f86368d7c9840a5a22cd1b2971382d06274caa3c572223
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
new file mode 100644
index 000000000000..13de879df386
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-6.3.4.2-r1.ebuild
@@ -0,0 +1,560 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+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 ldap +mariadb odk pdfimport postgres test
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	bluetooth? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${MY_PV} == *9999* ]] || \
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+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.2
+	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.14.0
+	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.28[nss]
+	media-gfx/fontforge
+	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
+	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? (
+		$(python_gen_cond_dep '
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus )
+	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/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	ldap? ( net-nds/openldap )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3.1
+	>=dev-util/mdds-1.4.1:1=
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.6
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+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
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+
+	# master branch
+	"${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422
+	"${FILESDIR}/${P}-poppler-0.83.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() {
+	if ! use java && ! use firebird; then
+		ewarn "If you plan to use Base application you must enable either firebird or java."
+	fi
+
+	use java || ewarn "Without java, several wizards are not going to be available."
+
+	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"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		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
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	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-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-neon
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-dependency-tracking
+		--disable-epm
+		--disable-fetch-external
+		--disable-gstreamer-0-10
+		--disable-gtk3-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-report-builder
+		--disable-vlc
+		--with-build-version="${gentoo_buildid}"
+		--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
+		--with-help="html"
+		--without-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 kde5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(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 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 )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	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
+
+	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
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild b/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
deleted file mode 100644
index d4ce61a869a0..000000000000
--- a/app-office/libreoffice/libreoffice-6.3.4.2.ebuild
+++ /dev/null
@@ -1,556 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-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* ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
-
-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 ldap +mariadb odk pdfimport postgres test
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-RESTRICT="!test? ( test )"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${MY_PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	odk? ( >=app-doc/doxygen-1.8.4 )
-"
-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.2
-	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.14.0
-	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.28[nss]
-	media-gfx/fontforge
-	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
-	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? (
-		dev-libs/glib:2
-		net-wireless/bluez
-	)
-	coinmp? ( sci-libs/coinor-mp )
-	cups? ( net-print/cups )
-	dbus? ( sys-apps/dbus )
-	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/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kconfig:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kio:5
-		kde-frameworks/kwindowsystem:5
-	)
-	ldap? ( net-nds/openldap )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mariadb? ( dev-db/mariadb-connector-c )
-	!mariadb? ( dev-db/mysql-connector-c )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-#        tests apparently also need google-carlito-fonts (not packaged)
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/libatomic_ops-7.2d
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3.1
-	>=dev-util/mdds-1.4.1:1=
-	media-libs/glm
-	sys-devel/ucpp
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	test? (
-		app-crypt/gnupg
-		dev-util/cppunit
-		media-fonts/dejavu
-		media-fonts/liberation-fonts
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-"
-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
-
-PATCHES=(
-	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
-
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
-
-	# master branch
-	"${FILESDIR}/${PN}-6.3.3.2-mysql-connector-c-8.patch" # bug #692422
-	"${FILESDIR}/${P}-poppler-0.83.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() {
-	if ! use java && ! use firebird; then
-		ewarn "If you plan to use Base application you must enable either firebird or java."
-	fi
-
-	use java || ewarn "Without java, several wizards are not going to be available."
-
-	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"
-		LOCOREGIT_VERSION=${EGIT_VERSION}
-
-		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
-
-	local gentoo_buildid="Gentoo official package"
-	if [[ -n ${LOCOREGIT_VERSION} ]]; then
-		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
-	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-build-opensymbol
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-bundle-mariadb
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-gtk3-kde5
-		--disable-online-update
-		--disable-openssl
-		--disable-pdfium
-		--disable-report-builder
-		--disable-vlc
-		--with-build-version="${gentoo_buildid}"
-		--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
-		--with-help="html"
-		--without-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 kde5)
-		$(use_enable kde qt5)
-		$(use_enable ldap)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(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 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 )
-
-	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
-	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
-
-	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
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.3.9999.ebuild b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
index bc4dff890b8f..d552a76a932d 100644
--- a/app-office/libreoffice/libreoffice-6.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	accessibility? (
+		$(python_gen_cond_dep '
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	bluetooth? (
 		dev-libs/glib:2
 		net-wireless/bluez
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 3c04bc1de8e6..f38debf301b9 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	accessibility? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	accessibility? (
+		$(python_gen_cond_dep '
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	bluetooth? (
 		dev-libs/glib:2
 		net-wireless/bluez
diff --git a/app-office/moneyguru/Manifest b/app-office/moneyguru/Manifest
index 2cd38ead2ac5..3a6729ef9cf2 100644
--- a/app-office/moneyguru/Manifest
+++ b/app-office/moneyguru/Manifest
@@ -1,5 +1,5 @@
 DIST moneyguru-2.13.1.tar.gz 1665892 BLAKE2B 969286130c5336f4c41ccf0ee3cbfe55a13560f753e137ff5370184c5aff3e038995c79ad48620a5653552406ea6fb56d356a209cd36774751db4f8e3777354c SHA512 9544a2fe17d0c1d4a6f1ee6c52c79e66ca76da6a6ac35067f1961fe2b44a8efe20173ee5932a91adeeebcb0a522b544df11ad388cb4c453a0641060d75f2a17c
 DIST moneyguru-3.0.1.tar.gz 1052191 BLAKE2B 30ea5eaa7b6256a33e98dc590015f563a3d5f6a10ccf26911e397dced79dfffa3b55941900ecf2cf3915ad0055db0c4c95b2f10c0c55e34d972afe32d714a588 SHA512 fe0de1d01340d124f8f385a4713c6748d2d445c653b508ad08303a3fea5192a0d88be9feb4984d19d4608436eb47de830d1c3dc6680d23aeff81107d27dcaf10
-EBUILD moneyguru-2.13.1-r1.ebuild 996 BLAKE2B 07a479f5d1191c814e7aff913aa9678f6af1bfee5a3285d165c5a79def4836a62382e6f7588135932f7ce8b17d6cea7d9da5c5748ef55d89291582eb9a02563e SHA512 be45daca4e3f4a80e12b8c54521240ff787d9783360edf0cd28429047837a805637872a75d690a015735a8656ccb0a0a75b4e3f8cc3a787f108e4677690d394b
-EBUILD moneyguru-3.0.1-r1.ebuild 1008 BLAKE2B be871b6ffa1685c7481273324e85b7ef7137bfb0f0fce0fc89d2f61f3f3134905d8f619c6a5ccc94d7047670587eb4d227c448acd26d929d45993e2406d973b5 SHA512 6489eded969ed6eece4b3d3fb630b93d3430e110bc4d0da54c71ba0fa5cd1caf52fbfbc68cb73b64aa22a46329ed9ab371056710466f72185cd44342733ae39f
+EBUILD moneyguru-2.13.1-r2.ebuild 1070 BLAKE2B 33dfa6c0869bfb721d4e44704568feeb8d715f055932b6df122014a018b08c78f6051fa5cfb892817d9687d0f99872c50a903302301a5c8183c284dc570fe157 SHA512 4c16260f0402f8c858aaf659d50e95c318940c05f632bdb61346bb6eb16baadb364b8b2caa019c884ffd0819a24766e386b3fce3ea84a4700315256289154368
+EBUILD moneyguru-3.0.1-r2.ebuild 1082 BLAKE2B 45645423549773705377a683836ce7bd36e5b79426b42913df17600118547e2d40bde999f3c3c5025c9e86590b17837893e3fbcb4d63d328e4aa0c442d485c48 SHA512 262232c8f175f9d624d338c19a3a63c5a646b06a6e2edbf1a3017a4aed1e1db6c7ed8e4ef6f7d21d54a0b8c8b885145dd0c7fb198e3acb4c3d21209acc370bf0
 MISC metadata.xml 247 BLAKE2B bc448f928ac9504f3c98bda2a3a36cbd66b58dab1fe217479b20d0b8129e9197746542c0d173ada41d7bf197b27af1023bd04aeb78070672b9b465b0a09c5348 SHA512 00e14b701e986d81baeff9a09cf22bc350eac1f2db9e2bdfaa120013c83a3d316c2a0aeffb8828ad7c14a8521df23536e5ae458fea39834de5e9eb65e87b9bed
diff --git a/app-office/moneyguru/moneyguru-2.13.1-r1.ebuild b/app-office/moneyguru/moneyguru-2.13.1-r1.ebuild
deleted file mode 100644
index 5e3aaab58e12..000000000000
--- a/app-office/moneyguru/moneyguru-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Future-aware personal finances management"
-HOMEPAGE="https://hardcoded.net/moneyguru"
-SRC_URI="https://download.hardcoded.net/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,printsupport]
-	dev-qt/qttranslations"
-DEPEND="${RDEPEND}
-	test? (
-		<dev-python/pytest-4[${PYTHON_USEDEP}]
-		dev-util/cunit
-	)"
-
-_emake() {
-	emake CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" \
-		SHEBANG="${PYTHON}" \
-		DESTDIR="${ED}" \
-		PREFIX=/usr \
-		$@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake install
-}
-
-src_test() {
-	emake -C ccore CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" tests
-	pytest -vv core || die "Tests failed with ${EPYTHON}"
-}
diff --git a/app-office/moneyguru/moneyguru-2.13.1-r2.ebuild b/app-office/moneyguru/moneyguru-2.13.1-r2.ebuild
new file mode 100644
index 000000000000..31987d2240e4
--- /dev/null
+++ b/app-office/moneyguru/moneyguru-2.13.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1
+
+DESCRIPTION="Future-aware personal finances management"
+HOMEPAGE="https://hardcoded.net/moneyguru"
+SRC_URI="https://download.hardcoded.net/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,widgets,printsupport]
+	')
+	dev-qt/qttranslations"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			<dev-python/pytest-4[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-util/cunit
+	)"
+
+_emake() {
+	emake CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" \
+		SHEBANG="${PYTHON}" \
+		DESTDIR="${ED}" \
+		PREFIX=/usr \
+		$@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake install
+}
+
+src_test() {
+	emake -C ccore CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" tests
+	pytest -vv core || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-office/moneyguru/moneyguru-3.0.1-r1.ebuild b/app-office/moneyguru/moneyguru-3.0.1-r1.ebuild
deleted file mode 100644
index db78b348715e..000000000000
--- a/app-office/moneyguru/moneyguru-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Future-aware personal finances management"
-HOMEPAGE="https://hardcoded.net/moneyguru"
-SRC_URI="https://download.hardcoded.net/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,printsupport]
-	dev-qt/qttranslations"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-util/cunit
-	)"
-
-_emake() {
-	emake CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" \
-		SHEBANG="${PYTHON}" \
-		DESTDIR="${ED}" \
-		PREFIX="${EPREFIX}/usr" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake install
-}
-
-src_test() {
-	emake -C ccore CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" tests
-	pytest -vv core || die "Tests failed with ${EPYTHON}"
-}
diff --git a/app-office/moneyguru/moneyguru-3.0.1-r2.ebuild b/app-office/moneyguru/moneyguru-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..ba927b91e60b
--- /dev/null
+++ b/app-office/moneyguru/moneyguru-3.0.1-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1
+
+DESCRIPTION="Future-aware personal finances management"
+HOMEPAGE="https://hardcoded.net/moneyguru"
+SRC_URI="https://download.hardcoded.net/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,widgets,printsupport]
+	')
+	dev-qt/qttranslations"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-util/cunit
+	)"
+
+_emake() {
+	emake CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" \
+		SHEBANG="${PYTHON}" \
+		DESTDIR="${ED}" \
+		PREFIX="${EPREFIX}/usr" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake install
+}
+
+src_test() {
+	emake -C ccore CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" tests
+	pytest -vv core || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest
index ea7bb9cf556f..f3130a448846 100644
--- a/app-office/planner/Manifest
+++ b/app-office/planner/Manifest
@@ -1,3 +1,3 @@
 DIST planner-0.14.6_p20130520.tar.xz 4200624 BLAKE2B 4dd3965a3091fe69d9ac125745f7d3ac54cbe1d81f794c0dded02c0983867d2469848af7f74f1eb745a2e2c42c79be7955d6790f0b263faa5ee821bc28c6a339 SHA512 d658b68c96742340a06a9e96d7910f70fb296cb7a19cc335afdcbec01b36326b1574522155cf19fec012363e1e4d4120c35e1319c699613833be2eb0fa999024
-EBUILD planner-0.14.6_p20130520.ebuild 1884 BLAKE2B a0a414d51eca7d41c8a7d90bb9d62d99f7aac36874525248e76023231cd63b23d6edc0bc4a079f3707a3ee466bd4d668d7dc35f31cd0ea2bd1ef95bb3714b94a SHA512 0f962651d72faa8b4e3dea447cb5e7d3f997a91f93a0024872b0cf0d9137994b1ab2cc176d9db9c71ff86f97be9083a3a668b298376fbe35a25f868e052bd593
+EBUILD planner-0.14.6_p20130520-r1.ebuild 1922 BLAKE2B 7232a692c7f388113fdcc37ac824517aa8aef41b701f12251c9f7e87b0caf4cbcda0b79a09c5224ba9c793e76082df6e793218c9548bcfd5bc3d3104ff09722f SHA512 b325c51aa06c2b50b8ea976537ac7317f297bf7b34788f9ca9a3b7f512885dcebcf9d9524439e9e3749ebf498562693edb51971c29f6f27f54563ff22c1f5484
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-office/planner/planner-0.14.6_p20130520-r1.ebuild b/app-office/planner/planner-0.14.6_p20130520-r1.ebuild
new file mode 100644
index 000000000000..e9b4ff1e4fbd
--- /dev/null
+++ b/app-office/planner/planner-0.14.6_p20130520-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Project manager for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Planner"
+SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+
+IUSE="eds examples python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	>=x11-libs/gtk+-2.14:2
+	>=gnome-base/libgnomecanvas-2.10
+	>=gnome-base/libgnomeui-2.10
+	>=gnome-base/libglade-2.4:2.0
+	>=gnome-base/gconf-2.6:2
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.23
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygtk-2.6:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	eds? (
+		>=gnome-extra/evolution-data-server-3.6:=
+		>=mail-client/evolution-3.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.5
+	gnome-base/gnome-common
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-0.14.6"
+
+src_configure() {
+	# FIXME: disable eds backend for now, it fails, upstream bug #654005
+	# We need to set compile-warnings to a different value as it doesn't use
+	# standard macro: https://bugzilla.gnome.org/703067
+	gnome2_src_configure \
+		$(use_enable python) \
+		$(use_enable python python-plugin) \
+		$(use_enable eds) \
+		--disable-eds-backend \
+		--with-database=no \
+		--disable-update-mimedb \
+		--enable-compile-warnings=yes
+		#$(use_enable eds eds-backend)
+}
+
+src_install() {
+	# error: relink `libstorage-mrproject-1.la' with the above command before installing it
+	# Try to drop workaround on next snapshot or bump
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install \
+		sqldocdir="\$(datadir)/doc/${PF}" \
+		sampledir="\$(datadir)/doc/${PF}/examples"
+
+	if ! use examples; then
+		rm -rf "${D}/usr/share/doc/${PF}/examples"
+	fi
+}
diff --git a/app-office/planner/planner-0.14.6_p20130520.ebuild b/app-office/planner/planner-0.14.6_p20130520.ebuild
deleted file mode 100644
index e2a022f1b4f0..000000000000
--- a/app-office/planner/planner-0.14.6_p20130520.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Project manager for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Planner"
-SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
-
-IUSE="eds examples python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.14:2
-	>=gnome-base/libgnomecanvas-2.10
-	>=gnome-base/libgnomeui-2.10
-	>=gnome-base/libglade-2.4:2.0
-	>=gnome-base/gconf-2.6:2
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.23
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}] )
-	eds? (
-		>=gnome-extra/evolution-data-server-3.6:=
-		>=mail-client/evolution-3.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.5
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-0.14.6"
-
-src_configure() {
-	# FIXME: disable eds backend for now, it fails, upstream bug #654005
-	# We need to set compile-warnings to a different value as it doesn't use
-	# standard macro: https://bugzilla.gnome.org/703067
-	gnome2_src_configure \
-		$(use_enable python) \
-		$(use_enable python python-plugin) \
-		$(use_enable eds) \
-		--disable-eds-backend \
-		--with-database=no \
-		--disable-update-mimedb \
-		--enable-compile-warnings=yes
-		#$(use_enable eds eds-backend)
-}
-
-src_install() {
-	# error: relink `libstorage-mrproject-1.la' with the above command before installing it
-	# Try to drop workaround on next snapshot or bump
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install \
-		sqldocdir="\$(datadir)/doc/${PF}" \
-		sampledir="\$(datadir)/doc/${PF}/examples"
-
-	if ! use examples; then
-		rm -rf "${D}/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/app-office/pybliographer/Manifest b/app-office/pybliographer/Manifest
index b81ad92a9d45..5d8b1864dbd2 100644
--- a/app-office/pybliographer/Manifest
+++ b/app-office/pybliographer/Manifest
@@ -1,3 +1,3 @@
 DIST pybliographer-1.4.0.tar.xz 1834356 BLAKE2B ba4892f707c2da3f007cb916b158258a59a41cc631e49deacdd784213d506d8e4286c463afb4148c7cb30ed7084ae1a60eee0e62d1bfe13a26bd9fd70a9e60f8 SHA512 aef50e9815b9ff28618ca72c0b50033a24a1bcaa91c9fdbf3014371bb9b4bcaf8fcdffb0fa38e59d37ccfdb4c1383cd601c73aa2e34f4078c514ae9de7341f2a
-EBUILD pybliographer-1.4.0-r2.ebuild 1761 BLAKE2B f63d1c712b5e8d6ee7b23b9ef327b0051363cd78711d499329bfef6ae82da650235de21415cc7cdceadc3805f62d61b91916057d1c31211ba9b576eef6708ff9 SHA512 111dcc0ab79067fddef9af9d11ac4fee3a7f47a5ef5c02494233080e7558df9c92778c79f30ee1155a1255097a51494559a5714ea131467b5e823c1a8566638c
+EBUILD pybliographer-1.4.0-r3.ebuild 1818 BLAKE2B 2a8e2c22a61081f58c9894cadc583ebf317b33c8c6482dab591e4d86a19991f6d288d4b19e95be963b1663906bd02629942be6cdb29f7deb75ea9c98d03ca742 SHA512 50fa29b3ab95e0fa9c31c3f1b66268625f259b5653fe7f6e83ac4f63880276d706730de2cf2dff5aa15bf03cfc31af0b036bb8ff111f97b057a5476767ce5b73
 MISC metadata.xml 532 BLAKE2B ed73825501256ad3ed06ca73ac8c749314d8a36320fa4123233b277dacde5d7f042b609a4a9c6c92b5f93de0bc130027ba526db7fea1e642d1e223a79313c2b1 SHA512 2a130a3d8b8e9802d6e27169b02c64ceda7d59d5f3625793ca9507917e96625e2a2497aa241393fe9d329c6f9e0ddc87213e0d66a8d937d7662c96a93e04cec7
diff --git a/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild b/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild
deleted file mode 100644
index 4cf3e67ada7b..000000000000
--- a/app-office/pybliographer/pybliographer-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
-HOMEPAGE="https://pybliographer.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/recode-3.6-r1
-	app-text/rarian
-	dev-libs/glib:2
-	dev-python/gconf-python:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.24.0:2[${PYTHON_USEDEP}]
-	>=dev-python/python-bibtex-1.2.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8
-"
-
-# Tests broken for a long time, they rely on non-standard PATH for python
-# modules, bug #678444
-RESTRICT="test"
-
-src_prepare() {
-	# Workaround for bug 487204.
-	sed -i \
-		-e 's:\$(srcdir)/::g' \
-		tests/Makefile.am || die "sed failed"
-
-	# Install Python modules into site-packages directories.
-	find -name Makefile.am | xargs sed -i \
-		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
-	sed -i -e 's:prefix=:cd @datapyb@ \&\& prefix=:' scripts/pybscript.in || die
-	sed -i -e "s:\@datapyb@:$(python_get_sitedir)/${PN}:g" pybliographer.in scripts/pybscript.in || die
-	sed -i \
-		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
-		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-depchecks
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${D}"
-	dodir /usr/share/${PN}
-	mv "${D}/$(python_get_sitedir)/${PN}/pixmaps" "${ED}"/usr/share/${PN} || die
-}
diff --git a/app-office/pybliographer/pybliographer-1.4.0-r3.ebuild b/app-office/pybliographer/pybliographer-1.4.0-r3.ebuild
new file mode 100644
index 000000000000..2d0fce300191
--- /dev/null
+++ b/app-office/pybliographer/pybliographer-1.4.0-r3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Pybliographer is a tool for working with bibliographic databases"
+HOMEPAGE="https://pybliographer.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/recode-3.6-r1
+	app-text/rarian
+	dev-libs/glib:2
+	$(python_gen_cond_dep '
+		dev-python/gconf-python:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygtk-2.24.0:2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-bibtex-1.2.5[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+"
+
+# Tests broken for a long time, they rely on non-standard PATH for python
+# modules, bug #678444
+RESTRICT="test"
+
+src_prepare() {
+	# Workaround for bug 487204.
+	sed -i \
+		-e 's:\$(srcdir)/::g' \
+		tests/Makefile.am || die "sed failed"
+
+	# Install Python modules into site-packages directories.
+	find -name Makefile.am | xargs sed -i \
+		-e "/^pybdir[[:space:]]*=[[:space:]]*/s:\$(datadir):$(python_get_sitedir):" || die "sed failed"
+	sed -i -e 's:prefix=:cd @datapyb@ \&\& prefix=:' scripts/pybscript.in || die
+	sed -i -e "s:\@datapyb@:$(python_get_sitedir)/${PN}:g" pybliographer.in scripts/pybscript.in || die
+	sed -i \
+		-e "s:gladedir = \$(datadir):gladedir = $(python_get_sitedir):" \
+		Pyblio/GnomeUI/glade/Makefile.am || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-depchecks
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${D}"
+	dodir /usr/share/${PN}
+	mv "${D}/$(python_get_sitedir)/${PN}/pixmaps" "${ED}"/usr/share/${PN} || die
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 4c4f1e07f4bf..ee54df35d808 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -8,6 +8,6 @@ AUX scribus-1.5.5-poppler-0.84.patch 1359 BLAKE2B 7c0b3998fce5149a0b3d2e8d9f01ef
 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06
 AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e4b8760e9df6607e551dc02ba8975ebbde52519b8c3b2327d6b78f2c2cca1f9a929367666fec017ce1ec4c9f70b30740 SHA512 9ea5fefb6d714e14d4be592db2e146d43d7af02d8343b6724ca919952c4840d2760f0f988d3d778c56aa7d3b8b571ac8e005f9e4acf2708e3aafab46e8ca16c9
 DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50
-EBUILD scribus-1.5.5.ebuild 4311 BLAKE2B 2198a25f06dc30e0e1f3a51524eb8a4d5db7417d870f8d3cff1d4bc211d3c62615f736751343fd7f57d304a2feb6abe92d3661883f5f9b5bad112c3474360c72 SHA512 77378d6c146020533c1dd8162fccd217ab5d58f322b91413956399ed8fdebb9c6d5d1805b37a444bcf96b0c8c32527486f0925ebe878f87ca9b4fdb4f0b2dc24
-EBUILD scribus-9999.ebuild 4132 BLAKE2B 20760bb258704d05fc41ac62e7022e4b7ce529686889aa74ab720966679c78c01804f204cbea11bfa86cb92387832755b740d0d4880f6332291128fb595daa67 SHA512 d3752087c1b5bad1eb5f66ad3b031a56ac75b9721d710a550b8e1ca0189309073f60b3fd7c960e5cccf0adf229fe692d3167bc18c679e2ca0cd7bb88db0e33e4
+EBUILD scribus-1.5.5.ebuild 4352 BLAKE2B 39eb9370b8a1278ab148060af129a39efadb2fafeac6ce0ff6f89ad84d1191e0cfab95132e5a4543016e5e66ce38063b6f8e2c19c7ba00792a03d7cc852c7da2 SHA512 9d35f00c8db2fa2f57925e68fee5943de27410426bdca491d53366ce01747848b50fc518453087acd3bc51c9b7f88fa95ff38ce20a34a488be407c1e34b6ae2b
+EBUILD scribus-9999.ebuild 4173 BLAKE2B 5ba87679b20ed0581292caed110a0bc05a203fcab2f08cea1591c7ec26f800c603bdf3d6390ea7d14c5c778cee2577963a54fd53f28086c22b21b85d7e6a07a6 SHA512 e15af57a5ebddf40ac266ad2cd7634c294b8c669bd9495d3df543ca9fa383dde09b4bc2ee0b5370b6bb50729a71b6403af2830062508533bf1cbb881dc898e3a
 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild
index fa0caa4e2469..ca708fa897bc 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -60,7 +60,11 @@ DEPEND="${PYTHON_DEPS}
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
 	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 2fc0d1910082..97d62f8d370d 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -62,7 +62,11 @@ DEPEND="${PYTHON_DEPS}
 	graphicsmagick? ( media-gfx/graphicsmagick:= )
 	osg? ( dev-games/openscenegraph:= )
 	pdf? ( app-text/podofo:0= )
-	scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+	scripts? (
+		$(python_gen_cond_dep '
+			dev-python/pillow[tk?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 RDEPEND="${DEPEND}
 	app-text/ghostscript-gpl
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 0744061ed9b6..861e46dcfe85 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -2,5 +2,5 @@ AUX skrooge-2.20.0-missing-header.patch 870 BLAKE2B 8aafc1b0fbc8ddb4f94c1bbfdbf0
 DIST skrooge-2.20.0.tar.xz 21787404 BLAKE2B b289bbec8d6e369298a142360cc07c6d522d44969c55c68de70df4a9ad574e2a07e9b349091bb8b902408afc709552692557363ef9e7ca2a4375abc41236cd3f SHA512 5b4a9b5b17e24e222a99024bfed03d126df117d4b0af5b5828248ecb08df72dc595225290f811c9a5d45b552f465d361f19f95c4c1ef492bb39db38aa68fa96c
 DIST skrooge-2.21.1.tar.xz 21487048 BLAKE2B 64eeb2e14a18e57f8fd89985e28e3b2736e4ece2ffc5132478531ba19a6f7ad821a5198570f01fd6bb3ad79410ba69bc7b0cdf8c5a85243bff3a879ad2458a2d SHA512 7d87576b38bd0dea1718babd818115b56cdae9183ca6b7b7631bcf749f2ed2b6a49989275fa5603906e08457bcaaf66404b4a76e31c6b84653f40e5b249d31c5
 EBUILD skrooge-2.20.0.ebuild 2521 BLAKE2B 817d6e7d910b223e9d7770f48f14bcd64c16d2743f491e1eb50636655a6c402c0bbd60cc444181bcf427c34c0ff773f7ae15b903e15e760aaec218d22819f1c2 SHA512 128289c9d23c7c2c16d3fb9868f480ecaced88287bce423d5d80ed67d047e94cb238b141ddfa6a66e840c7199247160d34227414148bceeda3b3b901ccc5d43f
-EBUILD skrooge-2.21.1.ebuild 2758 BLAKE2B cde482f80e91d2a1bf3dc776e900c2139e9f18b4b6f5373608b2fb0c12b9443a6fa7ff4db9b5d24aec8e9affa6e874b5e9d30263b5f6b37aa87cfb52dd891760 SHA512 271b4c094ae7af313adfaee7a98cb0c90c36ff84a849d72c507a4efae768056fcdb842365c8235633e057e430f96ec8688ec8c9e823460feaa6c63d5367836db
+EBUILD skrooge-2.21.1.ebuild 2757 BLAKE2B 98d05402add21c9614078f6b5cdcc21c0fe98ceca79b8516a1497c01cc2731ebe4f64b4245ee2ffd9fc82663fa34a5f585a902cbf91f90f314456b58d7db0c86 SHA512 8df6891916d7bb8430e350a15be393cc2403413ce3493233d4175f08e30dac2714ac007c301b5e518373795995fce4f18004d8647a9c4fcc7207d0e9e9689506
 MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/skrooge-2.21.1.ebuild b/app-office/skrooge/skrooge-2.21.1.ebuild
index 913f2d0c35a5..e78009944068 100644
--- a/app-office/skrooge/skrooge-2.21.1.ebuild
+++ b/app-office/skrooge/skrooge-2.21.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://skrooge.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-office/unoconv/Manifest b/app-office/unoconv/Manifest
index 48dde3fbb9f3..388cb7a1bb20 100644
--- a/app-office/unoconv/Manifest
+++ b/app-office/unoconv/Manifest
@@ -2,7 +2,7 @@ AUX timeout.patch 460 BLAKE2B 66cb2918b2ad85cb987ecae492626a0ca06344cac4e9fab1f6
 DIST unoconv-0.8.2.tar.gz 104072 BLAKE2B 1ac16159f939a06cc75f3ff23f5aa7f1c4d49a41d4cce5e9c5866714ef1b3b969f94c074d36fff19d6af22375d5598033fb69761a09d3e60b81d794841c0e0d8 SHA512 cd6a4d06559895c0aebb5fda51ca86928474dd0ca0aa908e81762643186c29cf8436c889eedbb18bc74ed6016414d1aa831cd034614244d5aae677a6b4cdd4c9
 DIST unoconv-0.9.0.tar.gz 108493 BLAKE2B 36761f5cabd8cf0186ffa74202d8a9e0388ab9dc1a135b8e6b2275ed380de79da85d4955bca446810f4f71dff61bd38d7b131a91930729cbabfb10d656ba3891 SHA512 37d63ada32675fd0ebd089a74db453fdb7332a24e62cbf3e060d6d15cc503c76ede9ccc5e09467f4a38833a8358c09fde23cc8780a77c343268f20e0c37f2469
 DIST unoconv-0.9.tar.gz 108547 BLAKE2B 6620a7adb32c25182fbb5d0b141ec15d461ee7a73d8644e92337fd7748607d0d33a5978add4c72abf2b35f769f8bbfa35d411f77c4750606e22d6cbc7d7b3454 SHA512 1d6448154ec41776ed4d2ffd87b1caa15e231676a1161072676b1f5a466ea6dbae904de3eafb9ab2718fe4ed0ab7a2c9a91b1d19d79ea382c1e7576ea21e7f04
-EBUILD unoconv-0.8.2.ebuild 797 BLAKE2B b0fd7b2e196368a00260827264b21793eefa6ff37b77c5bb70d8f9ed9cad14132cfa7f7ef406a16fb5ff136499d770f78d5c80ba2ac3a0c20c50f9b459c1141a SHA512 180e24e8442424b0093719b4aa75c5fea4eb911165ef1b9817f04a070d121086491367a40c5fa870f18bdfcbf2d222180a621bb67ac622629630c80d4a3ffd37
+EBUILD unoconv-0.8.2.ebuild 787 BLAKE2B 40102c2cb89cc14887ca402a9dd09749ef943f5bb6564174fb7a539a44e37948effd276f1741d24718ab80befde3f7513c2f3f4a4e6d850352bcbb23ceffc214 SHA512 fc59e4b7a9cfb7d68b5a0916bd696c4c7c657eb86730bc0a51de49d48f904f2a76cf8d29c56e66387f46e71efac0b6696c38003e024edd45120bc5b7fa106160
 EBUILD unoconv-0.9.0.ebuild 764 BLAKE2B 9be7c977a94198731b2c4b87151b6651ea94233b44febc72e22bbc07c625c1589f23b2deda3b161e2f2b37f757f0f73e777680559525e7d96b7b8847bcf7fa41 SHA512 bd8c1004e8e0549d66432d17c2c82c67b23167f31ba0244960010713d14a04f26fbb1146707da80fe8db902e2f8986a5dfd23154c80c3c752ef456c6bac97bde
 EBUILD unoconv-0.9.ebuild 764 BLAKE2B 9be7c977a94198731b2c4b87151b6651ea94233b44febc72e22bbc07c625c1589f23b2deda3b161e2f2b37f757f0f73e777680559525e7d96b7b8847bcf7fa41 SHA512 bd8c1004e8e0549d66432d17c2c82c67b23167f31ba0244960010713d14a04f26fbb1146707da80fe8db902e2f8986a5dfd23154c80c3c752ef456c6bac97bde
 MISC metadata.xml 429 BLAKE2B c863daa05c0d7d265b60a04e0b1336067296b3854c83aa2c08891bbfe0d3fd45971312b6385b50c7ccb47676b65e97afee953a675176643c4bde348a6a3f0162 SHA512 3875bd4f015c8ffc902a3aedf042cd46cbe86f4ef6dfd1a493d3d7c171bf12248763e64d1f448800fa571157d3e5adac0aa191c9ad40667762ed17eadf3840ed
diff --git a/app-office/unoconv/unoconv-0.8.2.ebuild b/app-office/unoconv/unoconv-0.8.2.ebuild
index 6f1c17b6f631..ff651f50e1b8 100644
--- a/app-office/unoconv/unoconv-0.8.2.ebuild
+++ b/app-office/unoconv/unoconv-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils python-single-r1
 
diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index 0f63fe487190..bf116ad12503 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -1,5 +1,5 @@
 AUX upwork-desktop-r1.patch 480 BLAKE2B a296b0c5274adf65e3c1f1e65a30dea48d147632b1afc39e4688e4b0d23a4735c957ce4d451f040d34ae2996670350bf467bc87008e5814a3c5e9bfc5e717398 SHA512 dce08bf79e672c07fa8c11e00b68e5b4bd2176a606a1192fd6a0dbf9343e99c2aa70909506d71b35b04a3eaf6be0a61f62e65f6a3802a0e17967bfe4dbbd4aef
-DIST upwork-5.2.3.771_i386.rpm 53358346 BLAKE2B 0297075a639219dbf012d8b66e0dcdf57e0aaaf06a93c7f5c4a72efa7b386b2e0ae0eff5b228f6b3b9d80a6e6fe3e58c3351d71b735c2d6b7b8804c4f4b242f2 SHA512 88a45bfd05509d9c41fed01f52d4a71cc4a3ffdd5061c0b189eda714a45f97a326f7f9c9eac4aeee719ab5a253c62f8b7ec75724baab1e3b6f9e2bc047e00e78
-DIST upwork-5.2.3.771_x86_64.rpm 52236890 BLAKE2B 8e47381334e94f749bccd928d39ff5de03fc8b073f0c2ca9e4343675607ea758aa9d375be30f6c5196df6e290c0e316cd7d6b1e3afd587f1ff7f66c0ebe4af55 SHA512 315b3bbc2db7eaf01aac92f27ee284ef9197303e4df76603ab0e714f3796390d152500edf67acad82c01eb3b93d6d9888977ff52bd74d97b09c251b76180e69f
-EBUILD upwork-5.2.3.771.ebuild 1225 BLAKE2B 49f13d0637d7ebabf6cb7f995c279786bfeef985e6f2b4ce6fdc18c950945c3a9291f66643801f79343df57f2397b8ee6ddc8cfcdd0c78349b6cb123661a03a9 SHA512 9c3bbde39b8d7973a86460ee7929d2a3786a6038856f5282d04256c1440d387d087d6a04dd33b867976783d722f342fbd1ab8e12ce71755f634196c5a466f6c9
+DIST upwork-5.3.3.860_i386.rpm 74067471 BLAKE2B 6b2092a851e1f35dfa0dc180f225d26aeb5a04edd30eeaca3125480b94fb8504d2005c42a0b86c293c7367c538ef9103bce2a2bb45f5257cb003fd7cd25eb851 SHA512 7dbbbbf7a4254d1213942d836cf944c94b5b6dd7905435c75b1f0225dd362f4bdb3c7ea0716b2fd04fb926d965fd56d21c41f713cf26f2ad6cb240e5f2643394
+DIST upwork-5.3.3.860_x86_64.rpm 72487294 BLAKE2B 56dfedc12b5d0661f01d34238256a372b9e6d760c33ba13474996e4c24050cc9931e592cba91df0719c33c6785e6fe8d63add54986bc86cafad55379a35d9358 SHA512 a3d1c6b36a23743a1b953b7cb956107baacd39984bc9289eff349539235a7e95d0aa80880985522b985dd37de68e284a17b750561ce091166b4186d01c437aba
+EBUILD upwork-5.3.3.860.ebuild 1144 BLAKE2B 96badc2df6cce06bd2dfb0981763539c8c773bebd98c06e55598c4b37a0b9cde4f8662d2e8c187fc589ef9417fed0789541ed5332dc72e0b5b94150aa6c50a6f SHA512 e1e097c5a1249f05e71780b22394bd03ada3e5ffd59fd3e8755dbf47af6d85c67656583384ce3be5effafcfc1c953e6df6df22384b708b6b4007b2683df15666
 MISC metadata.xml 601 BLAKE2B d6bb0d933480847c8d5e0ea53b25b009260f8bbc02aafcb2d89525ffe3688c2f2a3d8e0147ace8e51dab5d37b6c25758ecaa9569ffae95d14b3075e57a4d3480 SHA512 4695a6e61e42e30295a1d5c4a676ddc164acf0b8c8642bf825b1376b501527b47039d7bc99b57697ee23364a11cd9c339fa47184c904904d5732d1b6aaf8f153
diff --git a/app-office/upwork/upwork-5.2.3.771.ebuild b/app-office/upwork/upwork-5.2.3.771.ebuild
deleted file mode 100644
index 521b774228e0..000000000000
--- a/app-office/upwork/upwork-5.2.3.771.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils rpm
-
-# Binary only distribution
-QA_PREBUILT="*"
-
-DESCRIPTION="Project collaboration and tracking software for upwork.com"
-HOMEPAGE="https://www.upwork.com/"
-SRC_URI="
-	amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_2_3_771_okk32anbjc976nah/upwork-5.2.3.771-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
-	x86? ( https://updates-desktopapp.upwork.com/binaries/v5_2_3_771_okk32anbjc976nah/upwork-5.2.3.771-1fc24.i386.rpm -> ${P}_i386.rpm )
-"
-LICENSE="ODESK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}
-PATCHES=( "${FILESDIR}/${PN}-desktop-r1.patch" )
-
-DEPEND="dev-util/patchelf"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf
-	media-libs/alsa-lib
-	media-libs/freetype
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/gtk+:2[cups]
-	x11-libs/gtkglext
-"
-
-src_install() {
-	pax-mark m usr/share/upwork/upwork
-
-	dobin usr/bin/upwork
-
-	patchelf --set-rpath /usr/share/upwork usr/share/upwork/upwork
-
-	insinto /usr/share
-	doins -r usr/share/upwork
-	fperms 0755 /usr/share/upwork/upwork
-
-	domenu usr/share/applications/upwork.desktop
-	doicon usr/share/pixmaps/upwork.png
-}
diff --git a/app-office/upwork/upwork-5.3.3.860.ebuild b/app-office/upwork/upwork-5.3.3.860.ebuild
new file mode 100644
index 000000000000..3425689d329c
--- /dev/null
+++ b/app-office/upwork/upwork-5.3.3.860.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils rpm
+
+DESCRIPTION="Project collaboration and tracking software for upwork.com"
+HOMEPAGE="https://www.upwork.com/"
+SRC_URI="
+	amd64? ( https://updates-desktopapp.upwork.com/binaries/v$(ver_rs 1- _)_wub7hae1mtgzk09u/upwork-${PV}-1fc24.x86_64.rpm -> ${P}_x86_64.rpm )
+	x86? ( https://updates-desktopapp.upwork.com/binaries/v$(ver_rs 1- _)_wub7hae1mtgzk09u/upwork-${PV}-1fc24.i386.rpm -> ${P}_i386.rpm )"
+
+LICENSE="ODESK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf
+	media-libs/alsa-lib
+	media-libs/freetype
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/gtk+:3[cups]"
+
+S="${WORKDIR}"
+
+PATCHES=( "${FILESDIR}"/${PN}-desktop-r1.patch )
+
+# Binary only distribution
+QA_PREBUILT="*"
+
+src_install() {
+	pax-mark m usr/share/upwork/upwork
+
+	dobin usr/bin/upwork
+
+	insinto /usr/share
+	doins -r usr/share/upwork
+	fperms 0755 /usr/share/upwork/upwork
+
+	domenu usr/share/applications/upwork.desktop
+	doicon usr/share/pixmaps/upwork.png
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index dd1fcfde7a57..83193296ae68 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index 602f528a2b74..d93cb47d5b08 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1,5 +1,5 @@
 DIST elogviewer-2.9.tar.gz 24157 BLAKE2B ff527c0198e86f7be15fce3f25f0e9677b6911cef72cfdc1f582c62f534fc15adac8c2cf612475f174561dd46b489dcaf819c8ccd1b5893adeb7a6c085ce11c2 SHA512 e5781eeaf663fafa680b0620c4a6aec63afffd05c1cb4cb5362e9eca3a35c85550ee295a6b753155b0392d69442068cf155c3ead872c457e5a3cdbcd59b1ab2e
 DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
-EBUILD elogviewer-2.9.ebuild 1683 BLAKE2B bb559758ecbe038a05746c243df9dc8cab5b64436aff962a9af0b2cb9ce70525a7c0de9d467938bd98ee7805fdc2fc8b6298afdba08db854b7c9b00efd465048 SHA512 6c0390a209bc42555cbed8afea61e339529d6e3c01ff11d38614f88b5c7a04bcac217c2cc5e3ddfcb5ba3ab9d41731f71660f9c30aea69413ed05f46495ffb6f
-EBUILD elogviewer-3.0.ebuild 1686 BLAKE2B ca25da9a3620ffcee16c8d725cabf4a1a073cea3c883a12a19dfe17a80cbc48f6fd3321e1466fd48088437086fb40e6433334ed1dfb21a05e39d2e9dc1e19162 SHA512 6f2e2eecc570895a0690fc470518aed811cf3056af85befc5431864aa4b4bfaef35222581b173b17d3db68583ecbe2cf7dfe1010ff16af885ac6a153555e53e2
+EBUILD elogviewer-2.9-r1.ebuild 1763 BLAKE2B 86d38970ae69a6c698e200364048ac7d54c7c459d47a53e3c192efa5e0ed10d169d5a77a388884873d1980dde59c7cc515db4cfa91bf010343499e098614e3da SHA512 33d3557e382233aac8add44b6b4b306cbc36d4e38e13b0370f71ee22055bcf1317b74bbf2d1ba6b3ed2ed0681a88a1e0160bce72fb3f5d1696551fd840976cc5
+EBUILD elogviewer-3.0-r1.ebuild 1772 BLAKE2B 01f4332f0f3c92d2641434dbbb352b568fc8e5fd885eb7eaac91cac7bb7fc232768cc0d5a26cf0aefde45367f4b12171a9d5e1e1e488074328aa61d6bf5455d9 SHA512 e489129cea55144f62bddd192842a9afbae0568e862dfde959b4ed6853e69bcde1dc1786c8200ccef52d0d70813dd7a566c5e9ae676040f9cacd33e85fa3e62d
 MISC metadata.xml 402 BLAKE2B 4cc6503c5c74f4f0883d2c167bb06515878ad1324931d38d9402b463c774b009d14ad2ec5b8d2611ea361e0793ffa3b4d463e88173f2f08dd0b1c0a988bed44a SHA512 77f982c8b1070592bcea3b91ae6e4c2fd815c5be0a63b7160793f7e7fbd1b1e60c3e3a993da1e7d2933b22ca621d6320955f7ac360b7ed09dc04a149ee32d567
diff --git a/app-portage/elogviewer/elogviewer-2.9-r1.ebuild b/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
new file mode 100644
index 000000000000..d4455cc879c6
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-2.9-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit python-single-r1 eutils readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+	')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_compile() {
+	rm -f Makefile
+}
+
+src_install() {
+	python_newscript elogviewer.py elogviewer
+
+	make_desktop_entry ${PN} ${PN} ${PN} System
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
+}
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9.ebuild
deleted file mode 100644
index 33df6b190e26..000000000000
--- a/app-portage/elogviewer/elogviewer-2.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit python-single-r1 eutils readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/elogviewer-3.0-r1.ebuild b/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
new file mode 100644
index 000000000000..aca7afc730bb
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit desktop python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://sourceforge.net/projects/elogviewer"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		>=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+	')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
+"
+DEPEND="${RDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features.  Required is
+	PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+src_compile() {
+	rm -f Makefile
+}
+
+src_install() {
+	python_newscript elogviewer.py elogviewer
+
+	make_desktop_entry ${PN} ${PN} ${PN} System
+
+	doman elogviewer.1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	ewarn "The elogviewer's configuration file is now saved in:"
+	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+	ewarn "Please migrate any user specific settings to the new config file."
+}
diff --git a/app-portage/elogviewer/elogviewer-3.0.ebuild b/app-portage/elogviewer/elogviewer-3.0.ebuild
deleted file mode 100644
index 40533d03c311..000000000000
--- a/app-portage/elogviewer/elogviewer-3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit desktop python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	>=sys-apps/portage-2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features.  Required is
-	PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
-	PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_compile() {
-	rm -f Makefile
-}
-
-src_install() {
-	python_newscript elogviewer.py elogviewer
-
-	make_desktop_entry ${PN} ${PN} ${PN} System
-
-	doman elogviewer.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	ewarn "The elogviewer's configuration file is now saved in:"
-	ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
-	ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 29ee00e9b2a4..0c7395706307 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -4,6 +4,6 @@ DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
 EBUILD elt-patches-20170317.ebuild 692 BLAKE2B c1b4c40736890b07d934d86fa36db875b8c35412d453985f5bc08b22b35966f110ba7765746b59eaedd2eebd0a812309b1f8a31572f8f0a9a8bd9beaed05fd0a SHA512 f282f6e223d70ed60106a3784b549517549d93787ce2746b971d1aabc65db9b0b9c5cbd5dfcfd3aa7b53bc339429697584e99fb4c2ba8f706fea91a0727718a9
 EBUILD elt-patches-20170422.ebuild 815 BLAKE2B 7d0b15643a486d844703349b8f01e1f7a248d6677777c0763b163cb6ef55ba7480e9d02ac09a039a26b68d8f80ee59952e958fe625d6f5b04de3ea1607077015 SHA512 ee9d939e63c3c5a0e544e6985082fecd7866cb027966579533eb4c64c04a551eb2c7d7edf2e9ce451b7e9f0411908929351a15f0e08168d5b0c748850fdbd795
-EBUILD elt-patches-20170815.ebuild 819 BLAKE2B 8b032449696046892d7d125031e2c40d9ef85593385c4f46c3d622d526505d948f03edc092158933e7017e099b47d48307c87727a63616ecef02130bddb83ca4 SHA512 5fffd1dfc88fb82afe2c13374e30aeb11cee8756ff2fa227d39763a094e22df5226e3f04ff3ac696327a3118afb7d98ff511c61897c8f614fa2583b14dacf095
-EBUILD elt-patches-20170826.1.ebuild 835 BLAKE2B d97df7d53db3f391e4b0c5edc6b819172430577a74b051d4e2a085d16d981ce85e0ce2b1b58a6e7066533e8c83d97b7e1a70c40a98e8bbb015f044ec43660d0d SHA512 86277957080d8f9f11a9b4c713da0832f5ddc146e007a6d3148b78eaf852933370e25831624c0664347164d18839a57ec2ef81663dd2bfbfc57885e33bdb04cd
+EBUILD elt-patches-20170815.ebuild 815 BLAKE2B 9dd857cb4b00f14c60b5855b62ce7ad5d78962982fc72cca0c839001a978ac6c0a95a6bc8352f8b450c77a4fa7efbed1fb124f096c477d1a7a180f649dddd1b4 SHA512 8c33fbcb2f8bbe1b10e7f190e8f4db6ae684847dcf28d51f53f8deafc0cde1c08ec4628b8387e109ee3f52468fcfa88d7943cce438db9c7c39f04acc5b763e5d
+EBUILD elt-patches-20170826.1.ebuild 831 BLAKE2B 180456dc41acfef88ca3b064ac7335150f670a8bda95246e111cd850cbc0db7f3a2aeb7189968e74309022fe89d5e5ebd21fdaab4f11d63de4d2b7c2064f15ba SHA512 82e2b0e3b8450944f880771c4bcfd1f50aa11543ec90672eeef8356a8d3538e826378663f3254925c253e5ccab184978e9a77fe66cf4491dc6b271fee500a96c
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index e3277fd1030d..dc6afb3eda28 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -16,9 +16,9 @@ RDEPEND="sys-apps/gentoo-functions"
 DEPEND="app-arch/xz-utils"
 
 src_compile() {
-	emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
+	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
+	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
 }
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 83c31abb0a3b..69f1f1e61fb5 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -16,9 +16,9 @@ RDEPEND="sys-apps/gentoo-functions"
 DEPEND="app-arch/xz-utils"
 
 src_compile() {
-	emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)"
+	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install
+	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
 }
diff --git a/app-portage/gs-elpa/Manifest b/app-portage/gs-elpa/Manifest
index 56dc979e93b7..92852f384274 100644
--- a/app-portage/gs-elpa/Manifest
+++ b/app-portage/gs-elpa/Manifest
@@ -1,5 +1,4 @@
 DIST gs-elpa-0.1.3.tar.gz 15486 BLAKE2B 6e34aa27aae9d7e27d41e122ed18890b5b63a18e5803f83aaa2fe5c82cf95fb010f7d428e576ce1c8493b27fbb587e37f74f8c9ed3ed9320722ec61eff1f535e SHA512 616c6cc33e89094e727c9ebe577d211cf9200a95b7ad6fd4b350b16d6982e3d509278b63a145880cdbc8f83481ba409b650e43260d463bf90a22e2a705997020
-EBUILD gs-elpa-0.1.3-r1.ebuild 607 BLAKE2B 7f7a184815838665c5ad3c933e8457cd1afe446e2012d4d0e1bcf5a8e262239fd16d14f28ccacec0ffb881c526ff6c7d628138a3136667b5954fd83ceeba22da SHA512 c14df45857886d3ffb1c0d575e6ace78c016e333f8cedf9eacf078a90877a36be9287e2f8c5e619b93e9e6bff6aace528a796701b74da8feb11f6f685f91aca8
-EBUILD gs-elpa-0.1.3.ebuild 601 BLAKE2B dea8a0b01179e9b9eb6e0d872d397fd9c25621dcc2b80180fad9bfb8a625e3b10eaf52c19c57c5f3da394da098dd769fe8daaa3c8a851cb973a29edde6fed7fe SHA512 ab8fa141fe05ee4aabdd80684978bbc8b802e623b49c090a3e76dc20e1e908c157cd5af34ce0c4f4dc62a00073b508c0d563e3ade4f004549df229dcd7f76c23
-EBUILD gs-elpa-9999.ebuild 599 BLAKE2B 7918fd5270ca458e5305826d0cc7dd34952645d530def78059b99c3ba62739b08ee9b8f16e3aadf19d166f97d8f1c77bb263f4a53f679c1f96f8e99dc7367d94 SHA512 0a95636e5b30d233de3220ac07149a42ca1b612de99e84ec444e95eee6c6db9b944d84272df71607708eb9a0b2da2c1eac33420881262a0affbd6c3c596c5910
+EBUILD gs-elpa-0.1.3-r1.ebuild 601 BLAKE2B 97a6e89212b673a7fb35ed5fa84e214ad1e01ef53cf608a8ee83b06b588f20ffc5451768c2e03f0393f84eb713e2ffa1c58ce1571508a81158ac75d77016b758 SHA512 40b1b0e553e3b01db388d6bfea79e3325db0047c8c9edc4575baf875a2269cc329f5b14cbb28dd4945e638a0c1f7a8fe4cc500cbdcf654d7e6beede64bb106e9
+EBUILD gs-elpa-9999.ebuild 593 BLAKE2B 23ef195780293ace28a7c6ca4c9729abdebaa11cfc661cb5316030ff4ef9cf98c4b6f600b817c491d9511c6df4a6cfe887eaab330e708582a7473fe326bcc6bc SHA512 f99650ffcc462906b7fd0f72a4c3b21ba6cd2a102a56feed7fdcd7a805bfd97ce6624d3105279005b1c72ed6acbc658f44f9281c3dea9c1f8d56bd79528f910c
 MISC metadata.xml 332 BLAKE2B fba6bf848c564260ffecdccc4a972f929bc0bec8b8df1a5842da68943d1877a27eebe514d3b6d963d398050f3411b8c6626be4cf743382559646099cd681d570 SHA512 cd0d491e5d3362c673b23769d802067f467d48038f0590d94a3a93fdcd6ebd3edc2162829854d0123576dc92a7b1bf49dd3fbad2a0e2a85c311701027d8d4fb9
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
index a8f738252568..9d3af3fb369e 100644
--- a/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1
 
diff --git a/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild b/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
deleted file mode 100644
index 5cbeae5ba87b..000000000000
--- a/app-portage/gs-elpa/gs-elpa-0.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1
-
-DESCRIPTION="g-sorcery backend for elisp packages"
-HOMEPAGE="https://github.com/jauhien/gs-elpa"
-SRC_URI="https://github.com/jauhien/gs-elpa/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-portage/g-sorcery[$(python_gen_usedep 'python*')]
-	dev-python/sexpdata[$(python_gen_usedep 'python*')]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman docs/*.8
-}
diff --git a/app-portage/gs-elpa/gs-elpa-9999.ebuild b/app-portage/gs-elpa/gs-elpa-9999.ebuild
index 46e8ea22a802..8f1844ab7fed 100644
--- a/app-portage/gs-elpa/gs-elpa-9999.ebuild
+++ b/app-portage/gs-elpa/gs-elpa-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/gverify/Manifest b/app-portage/gverify/Manifest
index 54c4772f308c..fb4092353894 100644
--- a/app-portage/gverify/Manifest
+++ b/app-portage/gverify/Manifest
@@ -1,3 +1,3 @@
 DIST gverify-2.tar.gz 4609 BLAKE2B 73f97ba232fe0269ec56649bc5682650d48c001e432f8076c820a58a94c3d1de079dc89873d589a76b91164153e5c5be78870ef34b3b69f3c39ca0c0e388b114 SHA512 1756671d22047edc6ed1121b65af8c163afba854364a50a9089cef733213ccd6c9dd1276e876b9118741bcfa92ad02cde572fe2b6cebb22339664552c67d2957
-EBUILD gverify-2.ebuild 692 BLAKE2B 5b9c74d8a2f86f153e5a8c4a0821153d119e032ca06f29bd715f7b1a8c77920a0de164586e131f10568c8a21debffa77993ef30e990426ce191484128547fe2d SHA512 3a450468e173dfd89f238159e90e00a96ea52d65d60636dc2108af7aa6306244ed3046aaf4a37299e172fa635307d96e345e1790ea628a0f4c6b2c3f9768ce8e
+EBUILD gverify-2.ebuild 686 BLAKE2B 294f69fb53fef8eb589a7c24732fd42402006dd67379a5fdf0158c8d4b17bd2708496d1b4acded09af9b94c718b0bb09a58f4d94c762f992171ea407c6d0bf56 SHA512 72dfaf73e05dfd593707d1e8141278ae4bcca782854ef7e7fcd74f0a9947c0755981f5570408b51ae7cd4a89b1ecfca6a716dff33f34aabdaea0a0f1a5f17f4d
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/gverify/gverify-2.ebuild b/app-portage/gverify/gverify-2.ebuild
index aaa8e33b8e8a..777fce25cd7b 100644
--- a/app-portage/gverify/gverify-2.ebuild
+++ b/app-portage/gverify/gverify-2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="gentoo.git signature verification tool"
diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index 356fb6fabe57..0be449d827fc 100644
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -1,3 +1,4 @@
 DIST portpeek-2.1.27.tar.gz 13000 BLAKE2B a134d7c9a99dc4bfd8cbd56343a6d049c215eadde745f1db6af234c5b561f916f2bf3393a8a01ae44ea4a74bd501b46abdd150cd1403d5254d70c12ad7d7545f SHA512 aeaf47cd5701531c0488709ac63cf38faacec73dafbc96502c34cf279051679242f63bb452fcf14c1b739d08821981e59af3734f4795905d7af31dcaa95f26d2
+EBUILD portpeek-2.1.27-r1.ebuild 689 BLAKE2B f42bf733273706cd29899adeac31b1d87f91e5d8795d09d1ffbadfad00d72ba7338597750dfe7a2aa575656cbf700fde24114d8c0705b390fe3932dc2ace4d23 SHA512 e28ba1901e384245fc12fdfdd1d46790b0b3fa6d3ca47ece1cdca10a82f359211dc45e524e512907f04915ca0923675c55edac3605e54b5f96000913191a6238
 EBUILD portpeek-2.1.27.ebuild 686 BLAKE2B cef2678482877d963c47af57a6000818859a942ddefd27d2e00a064f43781806d0632c02d780f5aa21818fceea512fbe8a46558fa0de242f1135a098d2630b9d SHA512 7b62e8d8a3c363d587367742738cd37a3f4133a464812b90b5be41aa2718d7d1b82d96b0531b8a8d0d3f7dd3ea42ba90b9beeab0bf6b2d81b1f96b7f93506f2a
 MISC metadata.xml 222 BLAKE2B 5192d31072923545c8f760f9c3b3274f610b7a94a53cf55bc85c5c20a953b227b7cdb64cb5f5921b8b2822ec6563479b5d4883ec2b569a066d8ab569713fa8be SHA512 3d793038a1abf5bb86eeb23fee623f27db1d8e529372adc51eb4ffd1d0c2deb6df1c4d637954cc68e07d590c25e3d74a8437d02c1864a21c96f63597192cfef9
diff --git a/app-portage/portpeek/portpeek-2.1.27-r1.ebuild b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
new file mode 100644
index 000000000000..a1b5331b43d8
--- /dev/null
+++ b/app-portage/portpeek/portpeek-2.1.27-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-r1
+
+DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
+HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
+SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	>=app-portage/gentoolkit-0.4.7
+	|| (
+		>=sys-apps/portage-2.3.85[${PYTHON_USEDEP}]
+	)"
+
+src_install() {
+	python_foreach_impl python_doscript ${PN}
+	doman *.[0-9]
+}
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index a646feb85494..cb43d72804ce 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,6 +1,6 @@
 DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c876a5155cb09bd1468908ded3f5c879fc38f2cb4211f8415dddd640dd20b6b123c926b02387d49dced1 SHA512 0e2fa0dc12339be2ee2408a9dfa06201857bd2ef570b1c5ab46f0c4f0dc07492fc16d74c8f05cdef9232361b77843703d5f7e6752bff17a1ca2c3aa3cb1c1f29
 DIST tatt-0.6.tar.gz 21689 BLAKE2B d11bfb616cd27f1a303d4c95dec875cad42d31d72654be4649dac2c7b3f086b7c5a1886d9c9fbd0a858d9e042c9db0a7b5e2f4167c46b6291509f9d97a654097 SHA512 c12ea273af8b5bb410493f297776d730b7c36748a5f1b735c94dfb0542f9f03d28482060858951ac9fa161fc299c21473f5bdeaa4d89fb88ef61187a809dcac2
-EBUILD tatt-0.5.ebuild 827 BLAKE2B 64a4a7b8317c3c255bd5f2fde1e0e4ab873aea9da490e6a4dde74cb86ef30c2ab1a04d972fd0015f12c6e3f6b1521c2128f9e6612564b1cebd45b655f94124ec SHA512 2eca825604ecbce791e31bfa486d937b500d042326c26f06ae610c98897205a7bc985a7ea98f8b1c4431b7d5781edb18f6153f0c3f3d00d6700d9520a786e10f
-EBUILD tatt-0.6.ebuild 829 BLAKE2B eb17f1334a2d1d2990514e5daee3ee7cbcb6023da8695027c1ea8bb69b33370a99a6a11bd4b764ade735ab919b8587528ee769dc1ca630082650553ca88b9160 SHA512 41722f1e64065725e0298125d40a91b0e4b33a8d994aab29c3dd43bdaf0911c03243b30d4b828be2083d936ee7ce3251c8ec94f9ff938580a9b4d63015d8f0d7
-EBUILD tatt-9999.ebuild 787 BLAKE2B 86e616fb77044aaaf2182f31440eccaf99ff661ebd1b0226670fbd1ca26d2ec48204b1196d8dbc40a57a9c5b59050a18ac754450bf502bd715d317916579448f SHA512 b290521d30ed1fa0bdbf5ba2d25e242922c53ceea720fd3823254ebe01e2d609c1789fe2cf2dab295c98cfc39655405113a6f0d21c7fd5a847e4e124faab9569
+EBUILD tatt-0.5.ebuild 817 BLAKE2B 2cfba9753e8489dfbe47588eb61a74aba5bdee846bf3d7dbf4a10c10e61a23dfa8271a807573511cfc5af465c760fda81bbf0973cbbffa02f27dbce6915e6a58 SHA512 783889f0ab7c3b2ca88a0861dce022639c5f389802e5e05bcc3d6a1b1d4a3798d599a5436e5506ffd0c741d8ce654f8d80aad1a1c7f28704da19d0df56625cbd
+EBUILD tatt-0.6.ebuild 819 BLAKE2B 9c92e7ffebbd06a132467fd3a097a5dc194c307922de06885da08b109c892ca1e597e82b175bbb916ce9df7ab14ef1528936272fea082494fd6fabc79157f284 SHA512 3d3fd320f0940b7c3198cafb42f4e6fc85ea893e0e52f2210cc8b49a939c8e81bcb8775f67b74b9abfefd963b6340da023464d181020b2e979b77d29fbb450e3
+EBUILD tatt-9999.ebuild 777 BLAKE2B 5e3f662008cf447ad3e7982f80228542ed89f2b5854821b6eb42514415a32dd76a37cf4b39bd94e5ad5c49a70dd5aad99e397c287c8b1814030409facecb6311 SHA512 a93dddaea45560a76023b06cdf57751433e2d28c0e2ceab2dd6c0e413a082f0f4c7b7892207cf9a11636322435570480c4b7f12eac008c80a40d307657957a74
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-0.5.ebuild b/app-portage/tatt/tatt-0.5.ebuild
index 34f4aa75b7f1..347603126f66 100644
--- a/app-portage/tatt/tatt-0.5.ebuild
+++ b/app-portage/tatt/tatt-0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-0.6.ebuild b/app-portage/tatt/tatt-0.6.ebuild
index 99e6ef2ee940..ead88748c274 100644
--- a/app-portage/tatt/tatt-0.6.ebuild
+++ b/app-portage/tatt/tatt-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index c0f9e775f5c7..8351da5ce080 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 5e512b7725a0..e63f5ad70ac0 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,4 +1,4 @@
 DIST unsymlink-lib-17.tar.gz 10550 BLAKE2B 036cf63e3619113763f01086fbd952fb2a6efda4d4f4989a5d8cadc0d47b439cba0fab84d53336d615ccbec4e0815519cd4709162f11bbf5fa42c770b928f6f2 SHA512 b981419e320da74f983c184f2b9739b0f1cdae7adf1b9d29c3221b7d010432f6844ff3bdf93793b2f701e2337acebc28a6bd2df0763a081cd8e53a8400aaea42
-EBUILD unsymlink-lib-17.ebuild 627 BLAKE2B 23527042b9398281e992af52465012fa0c0d4eeebfe6f8dc54f2acc221b0fa1de8bb2faed3307f847ac6fc531f4c3c516772498f6ac05cfabf13b3024e877f0a SHA512 ea2e14aec535206a853cf88177bc1a542f0b986e90cda1973287afc9a4e45a2897aa236f4e26f680d0547648b0ca10accd8c19166e539cf27a11be99ebbbae00
-EBUILD unsymlink-lib-9999.ebuild 564 BLAKE2B 409fcd8bd82f72c77359dcebb83f805ae45562fcc7462272e53b1bd3c4500b4ec48684fa88c20460b8cd1c20ba87492ee7df2fc72ed8bfa6e0c138022a6506b2 SHA512 44aa96bdeb404f203194cc02a1a37d0898e009e84805cf5a88d5fea5592ebbd95a3b954ff2d1943b6531dc0ded625583fac8e3347a4397dc1b9f7856d94807de
+EBUILD unsymlink-lib-17-r1.ebuild 657 BLAKE2B 2b9be8bd43f046c52b9cf8ac09da43170fd8c77c1c4815e3f8c06329ad6953a5266b3b2ad9858fe49c0bc710cc4807eb622f89d6f36f0c5db26869df22711b82 SHA512 33532a1fe671cc03cf6b848d2de1e4c7cdeb1cef8e1b43bef024f66d587a7911e6247b939ca3012191eef06a12221aed6eacb5171fefd6a85c2b27705440de20
+EBUILD unsymlink-lib-9999.ebuild 594 BLAKE2B 28667fafeb47bf7109b95c8de17805a375586ec4202387dfb1ad9b81835608dd7bb777c43057eda8a7a507a203eb22442d240077f95ae6f9d65b04ad981b88f3 SHA512 d3138e0bbd1c530d9ff8f046f9e2153153136afe96ba6edd3f89aa17f34f8cbdb84bfde09681dd03d8ea82e50b5be920a74d531bc1768caa53f732904be616d8
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
new file mode 100644
index 000000000000..e70e33b01d94
--- /dev/null
+++ b/app-portage/unsymlink-lib/unsymlink-lib-17-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit python-single-r1
+
+DESCRIPTION="Convert your system to SYMLINK_LIB=no"
+HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
+SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+	')"
+
+src_test() {
+	# tests are docker-based
+	:
+}
+
+src_install() {
+	python_doscript unsymlink-lib
+	dodoc README
+}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
deleted file mode 100644
index f8585615353b..000000000000
--- a/app-portage/unsymlink-lib/unsymlink-lib-17.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-inherit python-single-r1
-
-DESCRIPTION="Convert your system to SYMLINK_LIB=no"
-HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
-SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	sys-apps/portage[${PYTHON_USEDEP}]"
-
-src_test() {
-	# tests are docker-based
-	:
-}
-
-src_install() {
-	python_doscript unsymlink-lib
-	dodoc README
-}
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
index fbbc79d8b0ff..2e579b57e72e 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit git-r3 python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"
@@ -18,7 +18,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+	')"
 
 src_install() {
 	python_doscript unsymlink-lib
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 01fbc69ef3db..83268eeaaf7e 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index c8a4e94684c8..cc0fff6501bc 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -386,6 +386,11 @@ DIST bash50-008 2622 BLAKE2B 9919e24840f32a44a9040fd8fa9fb482da1859223e70e75d21d
 DIST bash50-009 1095 BLAKE2B 4a9b2035173dd23f9c8ac5474e573080112d9edcf918816b5dd41e880f212f66c2c80dd41793ec62449c487fec1ad2c57b353a00c0976a782098fa6be76d0f23 SHA512 6b770dbd4ca1175f9b958931b1e725d96626a24fb270bac5414d1679dde05276c87654815e9957d6932c515e8792caf8a5f0e9f2dc108bdd041d8024cf75a833
 DIST bash50-010 6407 BLAKE2B 94792141dedbb8d2c9f9355c94eec56b1fa84459291c61ac31e9ee9a67e80edb95234b67ab59c5f3f039d596275c9b154544439bc730256beaf303e6cbf99c4c SHA512 8ca2cea0264bc0401414207fd8752d4d6eda64be3bb10fdc22529fa2bcedb84e6ab257ba2badc7078ece7f2ae1e2964635926f227eea7aed58166e82871322c2
 DIST bash50-011 1870 BLAKE2B 7307aa709810ea3e9fbc0db6a558cb6a660736677edf56904721599be5c0a6e69b74cc01fb3988f1b06e7f8bcce512a3b5d773b7ebb3a7397a0e4815e84f48ce SHA512 05833d6c85f3795a9c100246335f39155c1b5d190e073bf382269c2bbceb13a2de3f85dbe1dd5d4c7824fcca481febe3bdbb4c555e1f2de86bec05fcf6f5871e
+DIST bash50-012 1571 BLAKE2B 3a107454439fa84b1416d0b17b81fd86cfd4cc046bb4c4ca820e09b4595f4bc95dd188f2957b2f2c83937a776eee3db19a7c070403014bfeb5d5778b26705aa1 SHA512 24d67358eec07cc4cd0457ec0c296567558f20bf713b917fc8a8e5095a83f1c5db880bb863d483ca0c9e003972ac5f56596a2eb10c26c82bf6326d0475784e7e
+DIST bash50-013 2328 BLAKE2B 8797fe0b8e01027222af9798ee8d57d161bfbedb617b257e91402ef60e7010dd32fc68e2477487813746842800387c5ea0cdd853e039cf7065a2786fd6d6a182 SHA512 38fff9856c2259fbba607aacee027dd61e8733c6e5f476b7491bc43755fb5a63e82372f9f18663ec81e7480f0738b296271c948e1932e851f68f53cf3a1935b5
+DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa56fd44916ead691e4d698de3ba118ff0f8fc8eadade7a980551134eb0daf18b0767ff9601a4b4 SHA512 e8f65be24b425ecaf66672eb4271e0efac2f495f882aeb559d60b52359a468b51852ed7aeeea0ab77cf648a48c9d37f2a00e263d06d29e9fa75b67a648399d91
+DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
+DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
 EBUILD bash-2.05b_p13.ebuild 4604 BLAKE2B 0813fddad287f8ad0424e39ccd0f3155bc312d833856e22123c8454c110022bd0a1c1daa33fd88f39ae936bf04a080e9a54b8cd49342c8f99a851b8ad3e17a0e SHA512 059d1e4464566c9c9785125a8a393184ea0a4445f43c7898fcaab5201b0988b65445812c57a97ce6b0b6a7c1cc65fddc06b001d80915d4c54af4dc6f9124bcfd
 EBUILD bash-3.0_p22.ebuild 4737 BLAKE2B 6ca8a22f0aace907dbf7eb57804c602ed39395198045a94fa31b34c98b3f4b80b7077247dabee7351639043a33f797ea861d7cbbc1f6327805b3bc289d27adf9 SHA512 53aad975e2703a6d0766b2a9399cefb3e031a151df5dc63fbdb648868e86bcab647d818efc0b7f473f4e57bfb83d8758f595dabc41cf8d1209432537bd8e843b
 EBUILD bash-3.1_p23.ebuild 4418 BLAKE2B af3f33a9cb2cdcb95956d2aa7c674411efc12777779ebee5b929f7e74c7deaa894ae799e20451f444d572e382ddd0c863841aa98751779d12329179a8874708f SHA512 e80b15131bcffa55092dfef44172d8514cd8740ae4f4a5814354bc000a318f563833c8c84bcbe88983d02360ed122ff904ad7a3374d70a01b1b9a40e0a14227d
@@ -396,5 +401,5 @@ EBUILD bash-4.2_p53.ebuild 4323 BLAKE2B c228182e505b67d7d598a1b3b707c785302615fa
 EBUILD bash-4.3_p48-r2.ebuild 5621 BLAKE2B 7197e814c59e552720f8c25e634c283c12eaaf18910e25b29deff79ce53031fef0599372f6f6a3380cd98c34a234cae02b9a136053af10f56ab57d67b789a017 SHA512 6959eecb84e85f77e415f16e0df5314f2fa2b0fbef90723de6878e7f5539732a340f119c12a92ff915e3fbce5f7eff20a039ca642fd5d5f963e0b97a0c9e6e83
 EBUILD bash-4.4_p23-r1.ebuild 7368 BLAKE2B 7f070e824465c6868d2c09cbb97b44570be88a52f0930984db2c4cf1b9715e7897e227dfc8ff556c3c995d00b63b9073b7f5c4974bd05ee270ae483c49457aa6 SHA512 a9c6a27d042f003344f05fee3b3c68441dca8fca5ef16df81e118f8905b2ef43aa68f1028e16def30ae32bfb9abb7b28ea495e176b00f7529c14dd058cb436cd
 EBUILD bash-5.0_p11.ebuild 7428 BLAKE2B a912551c6ab6cbcdd504baa74286935b7f83ef31c3db4fe144a93fb3ac24b2cfa057331710b9ab88aa1d9a4cb46b4ea48eaa427ca0c696a880f926ed346dc406 SHA512 36735b4668d3e65cc18db9bdacf7bd3030f7a5629f4876317ddd24f660194dc8ff661587fabdf4da0aa8f30b2bd3d0f355e915cea97aa51f7c67f7b5c698da82
-EBUILD bash-5.0_p9.ebuild 7488 BLAKE2B 1de7e377d32bb1b08699fe8b418f5fbbbf7cf92fa865f2bc14dddc3010fa78b0803aa4dfa489888a812698b5646bcceb4bfdb7951fe647454b6f5cc90cf48b0f SHA512 f63c093db4c160bfe41ff2605d42f4aa184bac33ff6b0d89fb025571c88907bea3a2a5b71486bfac238ca1d842abf93fe671147b68bead2c0f9b5d498a4428d0
+EBUILD bash-5.0_p16.ebuild 7428 BLAKE2B 2ec57c0463ecfcb9a663099f8af5516aab2e36a1236c0510d4b3a85467d7a25d9dd40774501f112538744c29061002dc4a8a37bdb9f2ee305568aa1150411bfd SHA512 3337e6e8927d017fa0a8c71b9e893b34d1e1191b2c7291d0d4314033a3426e729f1478769edb6ba144b174989341e5caec483978758fc49337934ad0b170b670
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
new file mode 100644
index 000000000000..dadb54e7e863
--- /dev/null
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+is_release() {
+	case ${PV} in
+	*_alpha*|*_beta*|*_rc*) return 1 ;;
+	*) return 0 ;;
+	esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+	[[ ${plevel} -eq 0 ]] && return 1
+	eval set -- {1..${plevel}}
+	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+			printf "${u}/${pn}-${pv}-patches/%s " "$@"
+		done
+	fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="8.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+"
+RDEPEND="
+	${DEPEND}
+	!<sys-apps/portage-2.1.6.7_p1
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Patches from Chet sent to bashbug ml
+	"${FILESDIR}"/${PN}-5.0-history-append.patch
+	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
+)
+
+pkg_setup() {
+	if is-flag -malign-double ; then #7332
+		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
+		eerror "as it breaks LFS (struct stat64) on x86."
+		die "remove -malign-double from your CFLAGS mr ricer"
+	fi
+	if use bashlogger ; then
+		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+		ewarn "This will log ALL output you enter into the shell, you have been warned."
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	# Include official patches
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+	# Clean out local libs so we know we use system ones w/releases.
+	if is_release ; then
+		rm -rf lib/{readline,termcap}/*
+		touch lib/{readline,termcap}/Makefile.in # for config.status
+		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+	fi
+
+	# Prefixify hardcoded path names. No-op for non-prefix.
+	hprefixify pathnames.h.in
+
+	# Avoid regenerating docs after patches #407985
+	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+	touch -r . doc/*
+
+	eapply -p0 "${PATCHES[@]}"
+	eapply_user
+}
+
+src_configure() {
+	local myconf=(
+		--disable-profiling
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-curses
+		$(use_enable mem-scramble)
+		$(use_enable net net-redirections)
+		$(use_enable readline)
+		$(use_enable readline bang-history)
+		$(use_enable readline history)
+		$(use_with afs)
+		$(use_with mem-scramble bash-malloc)
+	)
+
+	# For descriptions of these, see config-top.h
+	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+	append-cppflags \
+		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+		-DNON_INTERACTIVE_LOGIN_SHELLS \
+		-DSSH_SOURCE_BASHRC \
+		$(use bashlogger && echo -DSYSLOG_HISTORY)
+
+	# Don't even think about building this statically without
+	# reading Bug 7714 first.  If you still build it statically,
+	# don't come crying to us with bugs ;).
+	#use static && export LDFLAGS="${LDFLAGS} -static"
+	use nls || myconf+=( --disable-nls )
+
+	# Historically, we always used the builtin readline, but since
+	# our handling of SONAME upgrades has gotten much more stable
+	# in the PM (and the readline ebuild itself preserves the old
+	# libs during upgrades), linking against the system copy should
+	# be safe.
+	# Exact cached version here doesn't really matter as long as it
+	# is at least what's in the DEPEND up above.
+	export ac_cv_rl_version=${READLINE_VER%%_*}
+
+	# Force linking with system curses ... the bundled termcap lib
+	# sucks bad compared to ncurses.  For the most part, ncurses
+	# is here because readline needs it.  But bash itself calls
+	# ncurses in one or two small places :(.
+
+	if is_release ; then
+		# Use system readline only with released versions.
+		myconf+=( --with-installed-readline=. )
+	fi
+
+	if use plugins; then
+		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+	else
+		# Disable the plugins logic by hand since bash doesn't
+		# provide a way of doing it.
+		export ac_cv_func_dl{close,open,sym}=no \
+			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+		sed -i \
+			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+			configure || die
+	fi
+	tc-export AR #444070
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
+}
+
+src_install() {
+	local d f
+
+	default
+
+	dodir /bin
+	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
+	dosym bash /bin/rbash
+
+	insinto /etc/bash
+	doins "${FILESDIR}"/bash_logout
+	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+	keepdir /etc/bash/bashrc.d
+	insinto /etc/skel
+	for f in bash{_logout,_profile,rc} ; do
+		newins "${FILESDIR}"/dot-${f} .${f}
+	done
+
+	local sed_args=(
+		-e "s:#${USERLAND}#@::"
+		-e '/#@/d'
+	)
+	if ! use readline ; then
+		sed_args+=( #432338
+			-e '/^shopt -s histappend/s:^:#:'
+			-e 's:use_color=true:use_color=false:'
+		)
+	fi
+	sed -i \
+		"${sed_args[@]}" \
+		"${ED}"/etc/skel/.bashrc \
+		"${ED}"/etc/bash/bashrc || die
+
+	if use plugins ; then
+		exeinto /usr/$(get_libdir)/bash
+		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+		insinto /usr/include/bash-plugins
+		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+	fi
+
+	if use examples ; then
+		for d in examples/{functions,misc,scripts,startup-files} ; do
+			exeinto /usr/share/doc/${PF}/${d}
+			insinto /usr/share/doc/${PF}/${d}
+			for f in ${d}/* ; do
+				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+					doexe ${f}
+				else
+					doins ${f}
+				fi
+			done
+		done
+	fi
+
+	doman doc/*.1
+	newdoc CWRU/changelog ChangeLog
+	dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+		mkdir -p "${EROOT}"/etc/bash
+		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+	fi
+
+	if [[ -L ${EROOT}/bin/sh ]] ; then
+		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
+		# missing even temporarily causes a fatal error with paludis.
+		local target=$(readlink "${EROOT}"/bin/sh)
+		local tmp=$(emktemp "${EROOT}"/bin)
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
+	fi
+}
+
+pkg_postinst() {
+	# If /bin/sh does not exist, provide it
+	if [[ ! -e ${EROOT}/bin/sh ]] ; then
+		ln -sf bash "${EROOT}"/bin/sh
+	fi
+}
diff --git a/app-shells/bash/bash-5.0_p9.ebuild b/app-shells/bash/bash-5.0_p9.ebuild
deleted file mode 100644
index e112f72e3aa0..000000000000
--- a/app-shells/bash/bash-5.0_p9.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs multilib prefix
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-is_release() {
-	case ${PV} in
-	*_alpha*|*_beta*|*_rc*) return 1 ;;
-	*) return 0 ;;
-	esac
-}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="8.0"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-if is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-else
-	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:0=
-	nls? ( virtual/libintl )
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-"
-RDEPEND="
-	${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-"
-# we only need yacc when the .y files get patched (bash42-005)
-#DEPEND+=" virtual/yacc"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-history-append.patch
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-	"${FILESDIR}"/${PN}-5.0-assignment-preceding-builtin.patch
-)
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--disable-profiling
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
-		--with-curses
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER%%_*}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if is_release ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 5880bf59cc53..efd1e8f2513e 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -4,6 +4,6 @@ AUX fix-histfile-test-on-ppc.patch 1068 BLAKE2B fa407d7f5d02f061a3ca9d79bdf09ae6
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
 DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
 EBUILD fish-2.7.1.ebuild 2446 BLAKE2B e3ef925138c3db3412cd276dbaa374e3073beca1371c7f3b26be53b4ceb62fd603b0574c888aea9949c195c0f1c3ae540096aab951cc4dba30b03771161aa847 SHA512 179f0ae63b1ca6694bc579fa93a1bdc86f1e7aface1ea98e6fe1a6c08fe0ff460e6599cc0d0e496a9b02aea271bdc2f416c9fc0e2c2f6d3e805c7246141b804b
-EBUILD fish-3.0.2.ebuild 1636 BLAKE2B c6596d235523292dc48628cd49233cdeaa2e1a515dbee4670daa8c3113e079a106d8e57ec368fa5b080816232322dc622d188e328836aec6b7ab0f809ee95098 SHA512 4844329691943c21fcde1024b259dfb4316db8512f9537bcf0610bf6a34ddaa76dd9fe25773849f05db82c77dd9d623ec32fb399b7339f37ddeedd0f51fc92e0
+EBUILD fish-3.0.2.ebuild 1642 BLAKE2B eea0911019da09f2690aa0767c43cb463ef5ea18fe53f0e6b31e8e138e2b8335aca207a0ec2ed527e46c841824634533cc16360226a3cd8a17ad94db536386ef SHA512 6261192db56af260ab3c86f2ae650cc23c89a00267fa11dc9d1a6efe6811ba63c894fda64031efdc7a5b7e05bb88ad3915ffa12e0268724628483ea31e8bf468
 EBUILD fish-9999.ebuild 1545 BLAKE2B fd23d23d813a9f9ca5309a2cf60e3b275b746e76a13cc27fc9ba4c5fa0df7a6fd60fe1f25d44ee79d842cc850df74d6992a4aaf10c9dde8af95dc9e454d37563 SHA512 41e8f5fddf53c6cbb43097a4cff062474d89e575b8923f706ac98b32916c7856ebee2b220adaa5684a3992b2c55cc53c10de3f09869c49218289c6d91a4346ca
 MISC metadata.xml 739 BLAKE2B 4ab30ae3cb92888979e23f8e6d59e6d09596e945bd683d58d34017f87e080c486eeebda42bd7a346522e4db072b55ad2db5a68d13738cb4ac2aeddeae84c777a SHA512 1c9a1ed56437553376f32f030a2bd50259a3bebc27eb05b288c68769ebda80cbafc54b75d1d1345a4675c9a79bf4a0ed02d94f2e32bfcdc2aa7d171a42570d97
diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
index 3a16d56f7c07..4d88d4b1e94b 100644
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 33da7df03456..aae68493ba8b 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-bashcomp-20180302.tar.bz2 21485 BLAKE2B 887ac5cfa8c6ba431a6aa5f5918b8bdfbe6a1ae9a2e7ac21b3c06ec2062b448d924f928b1372e81749ece6d4aa673bbbaaa364ca744124c842e3819349917169 SHA512 6b4551b078505e6348cb10ca2d67faab4d323a0f0ddefc872145314303d6f95fe31f9706d43d9f20c0139610ce47e4cf70ba7516d911dc4927cfbf5d863bc063
 DIST gentoo-bashcomp-20190211.tar.bz2 21508 BLAKE2B 410994819f62b0bd105ca398c335d76993fd694b8e7f56c761b94fc1e2f6e90f2010f2f2a88febd71ac0c5643fc0e923c60151fbf9411e8a553b5917d6bcd8db SHA512 4b0a5e79f90ee8122fa8d0a7224fee6472b1762a0dda680ea1c0e8d4069760be9b6472e052b1b166a389c0e779816b98715386dbc62a3574e7ad851b2567a070
-EBUILD gentoo-bashcomp-20180302.ebuild 733 BLAKE2B 456fbabf34865e1abf3a9562c71c2c3d21183f58f0ea0e6a27cb099573ca88c573e58be9d8fe4a2daf19838ff7ea2e2c0701339b65d7e485c9722684c7991397 SHA512 d5fe6776fc097ab63162600e03d4b47aed37bc6b6d709c06b2747e90e1e67e718767c8606ad972745cbeb6636b26af9d56acf0a8c6beb64700c17a6b6b617480
-EBUILD gentoo-bashcomp-20190211.ebuild 731 BLAKE2B debd7174305a45a66434f640309ed73552b3c2de71a235a0395bfaa96faa9f18cb2226d5ab3b9fb39dae3ee3bc9d7297979c921058e4a05accafd799d0f80557 SHA512 088797a6a93da38333d2702e82c8e868793dd2d6b08ea17966b54d7eeb1504c6d3e6595433d9ba1c8ac790a278cb61afc6db429137cbdb47e1974eea9b755d38
+EBUILD gentoo-bashcomp-20180302.ebuild 750 BLAKE2B add404bd23f06ab6ba580f829d39d3f539a9539cd1448aa07e795b5b374e9a66e0b823c0aed31f07d98c485d324dc0be4bbc7917128c6bbc511fb8ef1e556348 SHA512 8275afdf9b16f34c3ba17c189546fb6022a897cfc5c05eda9ce867cfd29c287b93339de595f082480af5ba4f99513e0a140bc1efe38775c402d1275196d4a1c7
+EBUILD gentoo-bashcomp-20190211.ebuild 748 BLAKE2B c60b95f875ffbb2becd17afc634e9ab2cf32572d94bb2a4e9be047702f22a7f4de50ca8c2075d4f281ccc49d2f24796167b7a9d3d34b2929895add9288684968 SHA512 1ddbb88dff3ecdc1a318a6b3f2e74b2b11c4c3bf77d636c237b87172d95615f4d6cf08cea8a0b0f32ce678bd3ce32d76c94ea38427a612de9fddae621551d762
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
index 7dd04476f8d2..049875ede2c9 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit bash-completion-r1
 
 DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 7e03f0ec3362..eb66ceedc060 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit bash-completion-r1
 
 DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 8b775bc28c1d..69c06c4e0daf 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,6 +1,7 @@
+AUX CVE-2019-14868.patch 3746 BLAKE2B 0be6843120195f876631e92205430f8a389d23c6c9f85b72b4fd7b646551ede464eebaa28db1988a0b831642ab7d3c0e633cdfe28f5279ab29f69aa3bb6bb755 SHA512 ad21464b95ff69b0d8a54f54eee11d638738ba79a87fc5834d409af2d183e5a68e706b3f5df49223dd784e634de353335689981228c7ca57edf94794434d6ea9
 AUX ksh-2020.0.0-ensure-user-set.patch 1017 BLAKE2B 8a0d9fd9fd8940969741214f6ba9251ae1b404bae80385d79428ab7231a5809bafcaa5033084af0582872171666e89b590b7c2cfba1ded740da49c77b1751888 SHA512 bea76ef4350d2813395bbfaa682b97a34548292efe9986a1d63dde2476bbfbfd21dc9b10ccb7ac3bcf33e9aeb3c0eebdcffb22a3b6472302597473ac994b2493
 AUX ksh-2020.0.0-skip-api-test.patch 1394 BLAKE2B bcf521012bb197d234b119dc56ddc068f8ec3e46b6f4c6d82e1043629368bfcabd1a5d360bae702777e5b01914ac70c9edbdce5ee0bba7e9f69916a3c38b1820 SHA512 e4314599821b3f654b4c87900aa696930953a96b984f43ca00fd17aa91b968ed8f277944c6736ebddae4ee7086e9806f84e3432b24450565d1c679bdbb39e01a
 DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792
-EBUILD ksh-2020.0.0.ebuild 1087 BLAKE2B d4de3298e870b57abfd03b24e8bd7c40d166749452317ca52fde421634e6ba6ead52b3e736df297b04f8e6575735df0cbf0ff620e473a942abf6c61af51660a9 SHA512 69440a0266c563586fce52171e986b742ff40abcf9089b3a9f3b8307a221f5d0f9d0f5b944ada20216a404d99d86998b9d02045d78af4b61142f863e5ec63d2a
+EBUILD ksh-2020.0.0-r1.ebuild 1123 BLAKE2B a1ca7574835877a1354c39ccb6c65c4ae4aba7f7bfdd3c198b641f97174841a46bd6a3dc931808418ff0fa2a93e16d2a9fc11774f1b7d4c24b7f3899a2d6c4ff SHA512 1dc0af0d3469c8a9d106880d7b8e21c6bc48e6629965de6e53880bdca308e63f93bf610775592795c5d5caa844a9083fe8f4ba5fadb03ecb93bb3fb3095a6e0c
 EBUILD ksh-9999.ebuild 976 BLAKE2B 4807cd3805a2f7f05a726019c707c6fe0106b636f0d221f31dd08b62b249df4815cb4bf6c5b0309863e2916a919c53aabcbe4c8efe3e8218655f2078cbb03361 SHA512 09f6498596ea5cf1c9a49eec1d8572a30b27649b0aa3a1eda99eaff959279627db59fd3a694a5929e8075dc2e641bfa65442a1a4819b9f1af5ca174d91bb5fb5
 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810
diff --git a/app-shells/ksh/files/CVE-2019-14868.patch b/app-shells/ksh/files/CVE-2019-14868.patch
new file mode 100644
index 000000000000..d5c80566bafc
--- /dev/null
+++ b/app-shells/ksh/files/CVE-2019-14868.patch
@@ -0,0 +1,89 @@
+From c7de8b641266bac7c77942239ac659edfee9ecd2 Mon Sep 17 00:00:00 2001
+From: Kurtis Rader <krader@skepticism.us>
+Date: Thu, 12 Dec 2019 18:46:50 -0800
+Subject: [PATCH] Harden env var imports
+
+---
+ src/cmd/ksh93/sh/arith.c        | 37 ++++++++++++++++++++++-----------
+ src/cmd/ksh93/tests/subshell.sh | 23 ++++++++++++++++++++
+
+diff --git a/src/cmd/ksh93/sh/arith.c b/src/cmd/ksh93/sh/arith.c
+index 30b3067590a2..8e68cbdc868a 100644
+--- a/src/cmd/ksh93/sh/arith.c
++++ b/src/cmd/ksh93/sh/arith.c
+@@ -567,19 +567,32 @@ Sfdouble_t sh_strnum(Shell_t *shp, const char *str, char **ptr, int mode) {
+     char *last;
+ 
+     if (*str == 0) {
+-        if (ptr) *ptr = (char *)str;
+-        return 0;
+-    }
+-    errno = 0;
+-    d = number(str, &last, shp->inarith ? 0 : 10, NULL);
+-    if (*last) {
+-        if (*last != '.' || last[1] != '.') {
+-            d = strval(shp, str, &last, arith, mode);
+-            Varsubscript = true;
++        d = 0.0;
++        last = (char *)str;
++    } else {
++        d = number(str, &last, shp->inarith ? 0 : 10, NULL);
++        if (*last && !shp->inarith && sh_isstate(shp, SH_INIT)) {
++            // This call is to handle "base#value" literals if we're importing untrusted env vars.
++            d = number(str, &last, 0, NULL);
++        }
++        if (*last) {
++            if (sh_isstate(shp, SH_INIT)) {
++                // Initializing means importing untrusted env vars. Since the string does not appear
++                // to be a recognized numeric literal give up. We can't safely call strval() since
++                // that allows arbitrary expressions which would create a security vulnerability.
++                d = 0.0;
++            } else {
++                if (*last != '.' || last[1] != '.') {
++                    d = strval(shp, str, &last, arith, mode);
++                    Varsubscript = true;
++                }
++                if (!ptr && *last && mode > 0) {
++                    errormsg(SH_DICT, ERROR_exit(1), e_lexbadchar, *last, str);
++                }
++            }
++        } else if (d == 0.0 && *str == '-') {
++            d = -0.0;
+         }
+-        if (!ptr && *last && mode > 0) errormsg(SH_DICT, ERROR_exit(1), e_lexbadchar, *last, str);
+-    } else if (!d && *str == '-') {
+-        d = -0.0;
+     }
+     if (ptr) *ptr = last;
+     return d;
+diff --git a/src/cmd/ksh93/tests/subshell.sh b/src/cmd/ksh93/tests/subshell.sh
+index b63a8051ed5c..3faba475d6de 100644
+--- a/src/cmd/ksh93/tests/subshell.sh
++++ b/src/cmd/ksh93/tests/subshell.sh
+@@ -856,3 +856,26 @@ for exp in 65535 65536
+ do    got=$($SHELL -c 'x=$(printf "%.*c" '$exp' x); print ${#x}' 2>&1)
+     [[ $got == $exp ]] || log_error "large command substitution failed" "$exp" "$got"
+ done
++
++# ==========
++# Verify that importing untrusted env vars does not allow evaluating arbitrary expressions but does
++# recognize all integer literals recognized by ksh.
++expect=8
++actual=$(env SHLVL='7' $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "decimal int literal not recognized" "$expect" "$actual"
++
++expect=14
++actual=$(env SHLVL='013' $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "leading zeros int literal not recognized" "$expect" "$actual"
++
++expect=4
++actual=$(env SHLVL='2#11' $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "base#value int literal not recognized" "$expect" "$actual"
++
++expect=12
++actual=$(env SHLVL='16#B' $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "base#value int literal not recognized" "$expect" "$actual"
++
++expect=1
++actual=$(env SHLVL="2#11+x[\$($bin_echo DANGER WILL ROBINSON >&2)0]" $SHELL -c 'echo $SHLVL')
++[[ $actual == $expect ]] || log_error "expression allowed on env var import" "$expect" "$actual"
diff --git a/app-shells/ksh/ksh-2020.0.0-r1.ebuild b/app-shells/ksh/ksh-2020.0.0-r1.ebuild
new file mode 100644
index 000000000000..3c4891ea637e
--- /dev/null
+++ b/app-shells/ksh/ksh-2020.0.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/att/ast"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	MY_PV="${PV/_/-}"
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
+HOMEPAGE="https://github.com/att/ast"
+
+LICENSE="CPL-1.0 EPL-1.0"
+SLOT="0"
+
+RDEPEND="!app-shells/pdksh"
+
+PATCHES=(
+	"${FILESDIR}"/ksh-2020.0.0-ensure-user-set.patch
+	"${FILESDIR}"/ksh-2020.0.0-skip-api-test.patch
+	"${FILESDIR}"/CVE-2019-14868.patch
+)
+
+src_test() {
+	# https://bugs.gentoo.org/702570
+	addwrite /proc/self
+	local cmd=(
+		meson test
+		-C "${BUILD_DIR}"
+		--num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})"
+	)
+	echo "${cmd[@]}" >&2
+	# https://github.com/att/ast/issues/1392
+	env -u T "${cmd[@]}" || die
+}
+
+src_install() {
+	meson_src_install
+	dodir /bin
+	mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die
+}
diff --git a/app-shells/ksh/ksh-2020.0.0.ebuild b/app-shells/ksh/ksh-2020.0.0.ebuild
deleted file mode 100644
index 6b40cd312997..000000000000
--- a/app-shells/ksh/ksh-2020.0.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/att/ast"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-	MY_PV="${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
-HOMEPAGE="https://github.com/att/ast"
-
-LICENSE="CPL-1.0 EPL-1.0"
-SLOT="0"
-
-RDEPEND="!app-shells/pdksh"
-
-PATCHES=(
-	"${FILESDIR}"/ksh-2020.0.0-ensure-user-set.patch
-	"${FILESDIR}"/ksh-2020.0.0-skip-api-test.patch
-)
-
-src_test() {
-	# https://bugs.gentoo.org/702570
-	addwrite /proc/self
-	local cmd=(
-		meson test
-		-C "${BUILD_DIR}"
-		--num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})"
-	)
-	echo "${cmd[@]}" >&2
-	# https://github.com/att/ast/issues/1392
-	env -u T "${cmd[@]}" || die
-}
-
-src_install() {
-	meson_src_install
-	dodir /bin
-	mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die
-}
diff --git a/app-shells/zsh-syntax-highlighting/Manifest b/app-shells/zsh-syntax-highlighting/Manifest
new file mode 100644
index 000000000000..afd63a49bc94
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/Manifest
@@ -0,0 +1,3 @@
+DIST zsh-syntax-highlighting-0.7.0_beta1.tar.gz 130063 BLAKE2B cf0f6319af22b47cb8a280de682a69b0479dc59033be5ce84840507b77dd2df0441b8d260af55bccb303c87d7f5a7e4cc6db9f46860aee040b4b8115c76f5e07 SHA512 1692015aad58103c752e2dd4161ea87f26aaa09d34eb2faec1f651fea1d9bfad29226455468017160a5393a87c1f7ed0514b09b0802b1810377beef72bfa6c87
+EBUILD zsh-syntax-highlighting-0.7.0_beta1.ebuild 1001 BLAKE2B c57f7c1481dfddccf9757faf2956563382bd43b32faceb7edaa47feb228c331064a664c4177e9cfac0066cbecef42b5b43ffc7fd9bdd7bb9d0ad4a30e4c1462b SHA512 37a1966be8434416fbd1a3a992a0cc3b0dc1a49293763b63a9f009060372208275f44c70304ecf707f002248bb5a41541680089a782a92f86506111074a9aace
+MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-shells/zsh-syntax-highlighting/metadata.xml b/app-shells/zsh-syntax-highlighting/metadata.xml
new file mode 100644
index 000000000000..203fa55c746f
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/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>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
new file mode 100644
index 000000000000..8ca8ffb2e2b8
--- /dev/null
+++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.7.0_beta1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+if [[ -z ${PV%%*9999} ]]; then
+	EGIT_REPO_URI="https://github.com/zsh-users/${PN}.git"
+	inherit git-r3
+else
+	MY_PV=$(ver_rs 3 -)
+	SRC_URI="https://github.com/zsh-users/zsh-syntax-highlighting/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="Fish shell like syntax highlighting for zsh"
+HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="app-shells/zsh"
+
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="In order to use ${CATEGORY}/${PN} add
+. /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
+at the end of your ~/.zshrc"
+
+src_prepare() {
+	sed -i -e 's/COPYING.md//' Makefile || die
+	default
+}
+
+src_install() {
+	emake \
+		SHARE_DIR="${ED}/usr/share/zsh/site-functions" \
+		DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		install
+	readme.gentoo_create_doc
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a938f4d834a0..a66e8a248321 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 991c8401af0f..3f6e5ca8d195 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,5 @@
-DIST ansifilter-2.14.tar.bz2 441884 BLAKE2B 90b3b0330866da11c00b105aa79164178aebecf39131f5c8d8e373091f53d2d8bbced54472c975a61857d594a9fa92ce08d018523f471fde445d4548d48b949b SHA512 a0b7f12ea5b9ef9b5845a03484a2e238a9f60e0e49f8eddca8bf24b47faba48aa0b55f922678b3bf1b3f08857bbe9a8285b3f318f2adec84673bc502e21b6802
 DIST ansifilter-2.15.tar.bz2 441381 BLAKE2B db55f8a21aada3aa851a099e5a19a3f3bbf81b8ce5d75b31600cbc47f409306e74f57ff51c52266212fa3c59730fac0d416e99f1fefe8a7009bd357ea216b0cd SHA512 4c30ea11665ce0876664c77fbe69c377d5e692508a54b4629e9b6363c1f223b65ac91d20fd61d6d8cf719d1b391ca6d94d69dabbacde7c2dc460330d530a09af
-EBUILD ansifilter-2.14.ebuild 1004 BLAKE2B cc405c8153cb0b54751498169307b13302f25242c9e1e2a7164f69c982fbb048266f05a100a04dbcad97c825cfa992a149a0b664ace821f719cbb670b3463213 SHA512 caf0d3364e39d7a66cc4b6684d9f5277f60af0c44a13ca10462370f475e9c4e98baa393b491a1810bc3cdb824c6c67bbd5bfee4ad13c7c4ca4f4a8d10bf90dec
+DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
 EBUILD ansifilter-2.15.ebuild 1004 BLAKE2B f80c1c12d0e25bc8596b4432bc8c1c72129650a2377d11d57b022fe17d67a1bdf1a957121bc88b0402f94b87a23f2f12f32bdb0cbf10dfdb2fe3d98fe5955b35 SHA512 411f165414fea2f9832135a2b9702e1f9d41cf41f00968e801cff6864ca3b2a34944eec63362c6eec0815def4094b124ba79dc05538db1a53486019eb89b4d01
+EBUILD ansifilter-2.16.ebuild 1006 BLAKE2B f75045ae4f6e6e87ae7217910f8f8502f3d4a32746cc7dc93e2ae13a47d8c926d4835c77ade3b0bbceee213d2a281bbb7fec836b3eb80e0ff5806462441f4ad1 SHA512 151af390ea256d12d9c0fd3a5776ca7d1aabaaaaadd592cc6aa1c544a1fcfba619b6e382d8d78573f2210e2beb923188b75a519f99b25728124b7f24c4d45c02
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.14.ebuild b/app-text/ansifilter/ansifilter-2.14.ebuild
deleted file mode 100644
index 89eb5868d897..000000000000
--- a/app-text/ansifilter/ansifilter-2.14.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs qmake-utils
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="qt5"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# bug 431452
-	rm src/qt-gui/moc_mydialog.cpp || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		eqmake5
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
-
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	dobin src/${PN}
-	use qt5 && dobin src/qt-gui/${PN}-gui
-
-	gunzip man/${PN}.1.gz
-	doman man/${PN}.1
-	einstalldocs
-}
diff --git a/app-text/ansifilter/ansifilter-2.16.ebuild b/app-text/ansifilter/ansifilter-2.16.ebuild
new file mode 100644
index 000000000000..d4c9c6144d6b
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.16.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="qt5"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
+
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dobin src/${PN}
+	use qt5 && dobin src/qt-gui/${PN}-gui
+
+	gunzip man/${PN}.1.gz
+	doman man/${PN}.1
+	einstalldocs
+}
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 0a12099dee72..90b47eb07a80 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,3 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-EBUILD asciidoc-8.6.10_p20181016.ebuild 2580 BLAKE2B 05f5a6ca1c08d08837e0be753ec5f15d2e0e5632e4de5d62b359a8054b4c371e5ab0d0bca8755461cf1cc37f92034f0b848fa1fc7a975164aea6b896225137f4 SHA512 9005a49fcf9e12e89ef5de448f7f70e9d33b0c74abdd62b41bcd9929cafaf302bf78c2e06b301d7f2ad8c32841a199f9bc982f0bccd92cd1a8587bdee53b5dc0
+EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B 4ae19fa2b8362818e9b5a04226aa7c4b57dd027efab22b0c9881ee3c3ce0d6b4d5ed903f03e0a26962d93ccdb125d73b1ef9e0a22178fb54fe28ef186b42ae2e SHA512 b01efd0d8d1b03de83bd39b37fee70645812795dba6136ea0410258793f4775e41a7ec9392e4b572dfb2db6bd76582de0a605704bb0dc026025044f5e971fdf6
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
new file mode 100644
index 000000000000..efbd0590a066
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
+
+inherit autotools python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
+MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
+SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	dev-libs/libxml2
+	${PYTHON_DEPS}
+	graphviz? ( media-gfx/graphviz )
+	highlight? (
+		|| (
+			dev-util/source-highlight
+			$(python_gen_cond_dep '
+				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			')
+			app-text/highlight
+		)
+	)"
+DEPEND="
+	test? (
+		app-text/dvipng
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
+		${PYTHON_DEPS}
+	)"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+S="${WORKDIR}/${PN}-py3-${MY_COMMIT}"
+
+src_prepare() {
+	default
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${EPYTHON}" tests/test${PN}.py update || die
+	"${EPYTHON}" tests/test${PN}.py run || die
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+	dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
+		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are
+	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
+	if use examples; then
+		# examples/website is full of relative symlinks,
+		# deref them for copying, which dodoc doesn't do
+		cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
deleted file mode 100644
index 5f5423e5152c..000000000000
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit autotools python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples graphviz highlight test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75
-	dev-libs/libxslt
-	dev-libs/libxml2
-	${PYTHON_DEPS}
-	graphviz? ( media-gfx/graphviz )
-	highlight? (
-		|| (
-			dev-util/source-highlight
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/highlight
-		)
-	)"
-DEPEND="
-	test? (
-		app-text/dvipng
-		dev-texlive/texlive-latex
-		dev-util/source-highlight
-		media-gfx/graphviz
-		media-gfx/imagemagick
-		media-sound/lilypond
-		${PYTHON_DEPS}
-	)"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-S="${WORKDIR}/${PN}-py3-${MY_COMMIT}"
-
-src_prepare() {
-	default
-	# Only needed for prefix - harmless (does nothing) otherwise
-	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
-		"${S}/asciidoc.py" || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
-	local -x ASCIIDOC_PY=asciidoc.py
-	"${EPYTHON}" tests/test${PN}.py update || die
-	"${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED}"/usr/bin/*.py
-
-	readme.gentoo_create_doc
-	dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
-		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
-
-	# Below results in some files being installed twice in different locations, but they are
-	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
-	if use examples; then
-		# examples/website is full of relative symlinks,
-		# deref them for copying, which dodoc doesn't do
-		cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 76c53aa9c993..fc53985f3908 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,10 +1,12 @@
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
+AUX calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch 2717 BLAKE2B 208686717ad91d2b59b1772352a6ffbe5e564c2243e87e956038a6c019e091e5b9b8fe91a1c51895bec352f61eae96a45831e866da86909fa09c9a8a294b7439 SHA512 9741f59bce3aad80c09aab91fd669bd4da3b05f0db560f4c769556e25e0ff092b7d184f198904d1ed9d86aa6314c4277cdc5e26ad2aeb2eaf063c84cedf13c48
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
+DIST calibre-4.10.1.tar.xz 37012272 BLAKE2B e5d9421ed986da8ec7d814f364702fe04bcbb76b5e08dedfadd7164c81943cdfe6f012042e82a4715e3ccda284efdf44340af0bde9d03cbc7c22cbcf10136a55 SHA512 eb6f4fd458da3e3e1121ff72da0dfb2bdc38cec98bdaf538e6761563aa176aae2439e4949424795c239a8fa8ebde507564452495ef71f3f7f19b25435e10a41a
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
-EBUILD calibre-3.48.0-r1.ebuild 8007 BLAKE2B 882d263a21ace1a51754426534139d9cf43148e1346cfeb08eacb86fbcb584adb4588ee2c6c483caf0cd76deb6ac4b7cb8d659eef7d89adacada9770226101ed SHA512 337368328e48337f68b0e8f315bc8159ac198ca4f85e2d886fffc31c4c8d7ece07290a0036ee327dbbc1e36d96399e8104f8970e0fd394d251a06a2ca134656e
-EBUILD calibre-4.9.1-r1.ebuild 8287 BLAKE2B b101adb4af4b9afa4b65acb34c131a1cb41d5d6079e5457ba3402ead5d3e7c5fd0caac101ae75367e4b658702f534d1aa8672e632c97950cbcde8e504cc7c54c SHA512 fa945bf73f846dc8b72e0e76a818289502745bfac6dc7ce42e31e5f58a04b3ee2bfc6c6b4e39bdb1b773cc9a61d455eb652c317e73ee542e9bcfeae573030a96
-EBUILD calibre-4.9.1.ebuild 8179 BLAKE2B 402c3e4adb13c25d68e1f0e914919b46618c75b6f74b6b936155eaec7120f6312b2408f9473c5e1a974d60d1cc6a50b6cdbef08611e1e2fa44669b5b148b6e5e SHA512 c346d84a029f66bc55b6d681236858f4648b75ae84c409ed1f5e47df51f5e4e91f242f8a6bcb73bc6b424a3851908a1a092078399ba7dd6d15e859bc8345e14e
+EBUILD calibre-3.48.0-r2.ebuild 8219 BLAKE2B e600ca6c64bf1a3330558d68c95b3281e07e3c31b02ec22615469ccaea97ea5786d70e93df93bfd12e1f16cd99e149c161813b03652888b97617cdd0dd19897a SHA512 9eb1c4d66f024c101a4d400b39251d93af0bf57e06e64ac267c6a8a4b3041fde641a538b2490fa452c1a8a769f2c484eabe960bb4a29c9e3caf90bf064103042
+EBUILD calibre-4.10.1-r2.ebuild 8595 BLAKE2B e1d22201ff20f2f97de5506f1ec67fd24e5d0508aca8e7a4a3935a36e1112ae5bc0c1ef3f579ff21560766e07d1f2d46a241f84174980a2fddef437b0400960f SHA512 1580aa62d48e2a212ac571fd11b61ee821d6c5f94473828104ed0537fb84d2c1addc69700854015db7801bcc79fe281b012b3893a990bcfa8113ea5d8beafd2b
+EBUILD calibre-4.9.1-r2.ebuild 8594 BLAKE2B 0b1db0bbf9124ec3a1c8491d13d2d91ca4a6c30b78f945d9cb60c399220b7cbc3afa0c6614c14c1150e44b1193e7f799c6fc4cc9d74c437c275b14b0a8a5f3bd SHA512 e9c92d66fa0d6e28d264413da4d73b8a0e3f3d43922e3b507aecfcaa8509bbe86ede8b3aace9850e45d128626577b9336a58f72989133b2284789bcba9c6c7ba
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.48.0-r1.ebuild b/app-text/calibre/calibre-3.48.0-r1.ebuild
deleted file mode 100644
index 750bc132087d..000000000000
--- a/app-text/calibre/calibre-3.48.0-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="amd64 ~arm x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-3.48.0-r2.ebuild b/app-text/calibre/calibre-3.48.0-r2.ebuild
new file mode 100644
index 000000000000..4aac7817f183
--- /dev/null
+++ b/app-text/calibre/calibre-3.48.0-r2.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="amd64 ~arm x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-4.10.1-r2.ebuild b/app-text/calibre/calibre-4.10.1-r2.ebuild
new file mode 100644
index 000000000000..2004b89741dd
--- /dev/null
+++ b/app-text/calibre/calibre-4.10.1-r2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.9.1-r1.ebuild
deleted file mode 100644
index 96f088d77812..000000000000
--- a/app-text/calibre/calibre-4.9.1-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# calibre works with python 3, so remove the python 2 constraint
-	export CALIBRE_PY3_PORT=1
-
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.9.1-r2.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild
new file mode 100644
index 000000000000..3718b23741e9
--- /dev/null
+++ b/app-text/calibre/calibre-4.9.1-r2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	rm "${ED}/usr/share/applications/defaults.list" || die
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/calibre/calibre-4.9.1.ebuild b/app-text/calibre/calibre-4.9.1.ebuild
deleted file mode 100644
index 1b5faed75d37..000000000000
--- a/app-text/calibre/calibre-4.9.1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch b/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch
new file mode 100644
index 000000000000..fb55e0025b7d
--- /dev/null
+++ b/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch
@@ -0,0 +1,63 @@
+From 6f947d88d323bb08bb6e076d442662aa281fe197 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Sun, 9 Feb 2020 12:16:04 -0800
+Subject: [PATCH] py3: Ignore TypeError when sorting device collections for
+ kobo driver
+
+https://github.com/kovidgoyal/calibre/pull/1098
+
+Use the same approach as the usbms driver when cmp raises a
+TypeError (see a8deb4b1f8dfb768a32b95b1540be32d5d6e871e).
+
+This should suppress the following error which was reported for
+python3 and not python2:
+
+Traceback (most recent call last):
+  File "/usr/lib64/calibre/calibre/gui2/device.py", line 90, in run
+    self.result = self.func(*self.args, **self.kwargs)
+  File "/usr/lib64/calibre/calibre/gui2/device.py", line 543, in _sync_booklists
+    self.device.sync_booklists(booklists, end_session=False)
+  File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 970, in sync_booklists
+    self.update_device_database_collections(blist, collections, oncard)
+  File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 2398, in update_device_database_collections
+    collections = booklists.get_collections(collections_attributes) if bookshelf_attribute else None
+  File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 314, in get_collections
+    books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp))
+  File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 307, in none_cmp
+    c = cmp(x, y)
+  File "/usr/lib64/calibre/polyglot/builtins.py", line 106, in cmp
+    return (a > b) - (a < b)
+TypeError: '>' not supported between instances of 'float' and 'str'
+
+See: https://bugs.gentoo.org/708742
+---
+ src/calibre/devices/kobo/books.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py
+index f725751d00..fc1dee6b7e 100644
+--- a/src/calibre/devices/kobo/books.py
++++ b/src/calibre/devices/kobo/books.py
+@@ -304,11 +304,17 @@ class KTCollectionsBookList(CollectionsBookList):
+                 return -1
+             if isinstance(x, string_or_bytes) and isinstance(y, string_or_bytes):
+                 x, y = sort_key(force_unicode(x)), sort_key(force_unicode(y))
+-            c = cmp(x, y)
++            try:
++                c = cmp(x, y)
++            except TypeError:
++                c = 0
+             if c != 0:
+                 return c
+             # same as above -- no sort_key needed here
+-            return cmp(xx[2], yy[2])
++            try:
++                return cmp(xx[2], yy[2])
++            except TypeError:
++                return 0
+ 
+         for category, lpaths in iteritems(collections):
+             books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp))
+-- 
+2.24.1
+
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index bb59b5718566..ad5fd0d0c8d6 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,6 +1,6 @@
 AUX cherrytree-0.38.9_update_setup_py.patch 748 BLAKE2B de89314f017fed48e2433bfbffd47b117234e779e80c9c2a8eebe80371be95a2b8f8fa4941544c674695121396e34e8b65c558ff3e642f74eab83d693fc22a78 SHA512 26a2f7e92717cd2e0e2f60b6df2ed2a861ba77a94b957e1841cd57f3377044ee1b52e179d3566795c9501472a76530a25f4c752a9046ac341bb533ead86c7d41
 DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
 DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
-EBUILD cherrytree-0.37.0-r1.ebuild 1132 BLAKE2B e5ae77a4c323746f0a868ddb93ad875e1002096f584702a85953843a27ad87ceb15acde9526fc7bade6aa5c064d8aab667bbae4cc8fb372d1a950124925fd26a SHA512 387fd2dca8b5eaa9e633652ef969ddbb448ca3a50028afc26bba5a6020a5b150a5961dc9c7e3ed8f2d08fecf0694830898d1b6cc391ede10a57ddc80524f24ca
-EBUILD cherrytree-0.38.9.ebuild 1215 BLAKE2B 8c2ace0779ac24e801a5c70cca565bdd0022035dd8de2483fb2969662021e6ff838166c21738ba167c470bd495741362b8ac067bad7cc7f5138e8b58ef2867f0 SHA512 8271aad0b8dd6c8cac7d59ff0ea9e83b212f2513ca62971f31ba5abb87f7aebc5b3c3e2fce80ef1ce515ef7e051da58be17905769997196de033cf287ebf8d66
+EBUILD cherrytree-0.37.0-r1.ebuild 1189 BLAKE2B 3f56b8ab0077d13fc2bdabccdb44a07cedf5de5308aee8f0a4a7122856f2341762fca3d7e8f354c19ded1387458f22f90a87dca8ef39cf22bbf5d37cc152c787 SHA512 928f4b904c7047936caa78239615895a1365a76ee3b1260e5db1cce3688ce1627438f7c5cc87f3825210b3be736a155f9be847c91c07fbc1879f7e6f1699ec80
+EBUILD cherrytree-0.38.9-r1.ebuild 1279 BLAKE2B 4eabfb8f4c185c614cd17e7310199fc6b18acae898b3c286f2e458e6a7c34c663526c059df1ea4a227ace16be5d2ce463f936cfd4671472c9e365e4b30148481 SHA512 97b0318bb9270fe1c18cf85b7330437633375f72933dae02f9918a5848bf388bd409fd8d8c639a874280341c4a739a1897cab253c8d38530db5f6482af9b688d
 MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
diff --git a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
index b7c0b37e37f2..1e0aa58e0412 100644
--- a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,10 +19,12 @@ SLOT="0"
 IUSE="nls"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
new file mode 100644
index 000000000000..3451ffc2b7e6
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree"
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}_update_setup_py.patch )
+
+python_configure_all() {
+	use nls || mydistutilsargs+=( --without-gettext )
+}
+
+src_install() {
+	distutils-r1_src_install
+	python_optimize "${D}/usr/share/${PN}/modules"
+
+	dodoc README.md changelog.txt
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/cherrytree/cherrytree-0.38.9.ebuild b/app-text/cherrytree/cherrytree-0.38.9.ebuild
deleted file mode 100644
index 80af20d9208c..000000000000
--- a/app-text/cherrytree/cherrytree-0.38.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree"
-SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="nls"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}"/${P}_update_setup_py.patch )
-
-python_configure_all() {
-	use nls || mydistutilsargs+=( --without-gettext )
-}
-
-src_install() {
-	distutils-r1_src_install
-	python_optimize "${D}/usr/share/${PN}/modules"
-
-	dodoc README.md changelog.txt
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index ec746abfef6b..af20213aff4c 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,3 +1,3 @@
 DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
-EBUILD diff-pdf-0.3.ebuild 1283 BLAKE2B 66f12a1fe1ca1c927b153ddae62d646106aab6fe54cfbbb5fda35bda57da46b1b63b4a5b9fd751943f031cee79018a97f8ac04f445b0945492de03c3bd84a2bf SHA512 b32216c901892d7b3c754cf9fb033969d909e7c55f7b1af4bad1f76bcd021986cb3823c68b878c0c31d149b44a1e40408772a03eb6a681dee2205e454b4b9d8d
+EBUILD diff-pdf-0.3.ebuild 1289 BLAKE2B ca651af5901d2e2f9ace61c85e3cf1ff3b330d1add145b96e83941462226623c8584eba5b55b8cc7ef98e1a333da974b389d660c941164d8e0a8e97fccc9febd SHA512 bb540d538d0b071a0348a0dd4efa9d020c7f17e44050b633a4bc9707d82420ec79517b14cf27d81db1bc2c818fabc057f11bf56d2f5f94511b67455b97271cd5
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
index 5127655c04ef..e106b612cca9 100644
--- a/app-text/diff-pdf/diff-pdf-0.3.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit wxwidgets
 
 DESCRIPTION="A simple tool for visually comparing two PDF files"
-HOMEPAGE="http://vslavik.github.io/${PN}/ https://github.com/vslavik/${PN}/"
+HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
 SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 # The COPYING.icons file states that two icons were taken from
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 443447a7c4e4..df697782e34e 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,5 @@
 DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
 DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd194a6746dd08e4782cb4b7e60cf47c44f244884fc10372fc2b052fff7d70e6c263e6f4175829d1aedbc8c2ea15c6 SHA512 b67395afed0899563e28fdd2ddd5016d4f382b6b7e46612d12853d701ba191b90771d40e1223e24e3fbf497cad01fdd2e1c67a6b2bf4f6cf082f3fbe981bd002
 EBUILD discount-2.2.4.ebuild 1820 BLAKE2B a1466852395d684f5b71c79c2332750053c40f019626daf89fb8044745b007969a99aa671d125908a1ef4813c034991423ca35f88e8b40c46b82499740f2b749 SHA512 bd9a4e9386a1dccf7be3e6727d31ad231bbecab5b6e14f8858eaccf15b486f5baa275bb606adceadaf9c3928ac46f0d47526e2a9155c178ac4f4d707d5d83408
-EBUILD discount-2.2.6.ebuild 1643 BLAKE2B eea19be77f9800f55465a5faf27690a18c94469e90151e1905c3f5cfff972610cd16ea65ce517e7ae70850884707f43531ea678b82673d5d6935b25a475de549 SHA512 a526b82efa2f3a26ca5cbd5b70b2b651b85dac9fbb17c687b2c0ca3b0971a5f893da66d65818a1d315e08e8748c9df4052acbbe61b7b29df7b9621230b284aae
+EBUILD discount-2.2.6.ebuild 1627 BLAKE2B 68fc72328179a87d0bb4b69c97660c8604bd717b490115ded453846bb02041a2316d3b85c66adea7fe8b10aaf5132a18f90f6a5639e36c5c220bff2485c4acbe SHA512 373212d549f7dfd9197724d69895afeb5426248c8e0d06f7636e6eec74683e75328207b2bae12747afdfa2cdcad43200f4fa6a59a6d2b62228bc5b487c35a0ab
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.6.ebuild b/app-text/discount/discount-2.2.6.ebuild
index 9d8ffa589581..5188f84a09a9 100644
--- a/app-text/discount/discount-2.2.6.ebuild
+++ b/app-text/discount/discount-2.2.6.ebuild
@@ -47,14 +47,16 @@ src_configure() {
 	"${configure_call[@]}" || die
 }
 
+src_compile() {
+	emake libmarkdown
+	emake
+}
+
 src_install() {
 	emake \
 		DESTDIR="${D}" \
 		$(usex minimal install install.everything) \
 		SAMPLE_PFX="${PN}-"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins libmarkdown.pc
 }
 
 pkg_postinst() {
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 4933c55ed663..4bc3ead55c38 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -2,6 +2,5 @@ AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.2.7.tar.gz 951995 BLAKE2B 32232a0a8e5003dcc056b6916f95274f357ac2ab69a08fde806da12487f63eba273a57049250fc75699fb545e98e25b95dcaf00c67af2ceabe779b8798f24a5a SHA512 696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6
 EBUILD enchant-1.6.1-r1.ebuild 1632 BLAKE2B 82cda91d9057fe587552c05163822441f12dac10a09ebfd48672bfd3fb7f893b022da927cfdadd773b2d6313194dec4f3ebfc470d41080d125d1d7fd700ff2aa SHA512 01f3929470bb979bf376520c6c9d27c9b3cb03200d6b12d755c7d0495ed3dbaf46f4962ec9728b530ef8dcbfbd030e73fa257031c72fc302a2e6fc4b4e7d524d
-EBUILD enchant-1.6.1.ebuild 1500 BLAKE2B d779c9d6fdef22357426a9a2f492c4a1afbcd25be07a69db2a072ea8a11696973874e9108e546bf07b46e883b321a0076e06beb9862c27224e094fa252b131a8 SHA512 f310612ceb6e997b8f4de195b8b07f20ce4aadb972485e644cc687f89d4c696bca8cb6dd8808602004b8bc9465f6fb20a010dfce64855e6fcbfc8be47bcc49c7
 EBUILD enchant-2.2.7.ebuild 1126 BLAKE2B 74c99075bd8fce858a940032ab50edbf0bc31074546cf285c4886bdc8848ef976732e094da7aec7384c41965a6d60cc90a2166363b72e8ea01c3b2f1f730351e SHA512 e55212fde8c27c9c6227db789b27e02795ee6b2d7eaf7c0b1e98aabe612e3e1ad42e9da495dd75bb9b7cac797ad54a0397bfe0f8810b3870c334a6abf9c3afa1
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
deleted file mode 100644
index 3ee15e26d65c..000000000000
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV="$(replace_all_version_separators '-')"
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
-)
-
-src_prepare() {
-	default
-	sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable aspell) \
-		$(use_enable hunspell myspell) \
-		$(use_enable static-libs static) \
-		--disable-hspell \
-		--disable-ispell \
-		--disable-uspell \
-		--disable-voikko \
-		--with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index b314ac8e258e..bc06ccb2a376 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,5 +1,5 @@
 DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.2.0.ebuild 616 BLAKE2B 06faceb684942253e1d01859b2221854cfd425a5e97c5c380e384441e589b253499a2c4d1bd9c76ba696bdea46d4b711011a77f1a1522f7923629dc39ee5df52 SHA512 90c0e76c87b66880278db840f0b66e13be8248ba0f52167c8edfea0e9a5bdaf5c392343eb3b30bec5f68b165ea2e8b773c4e37aaff82d43322b64fef316984fe
+EBUILD grip-4.2.0.ebuild 606 BLAKE2B 09cea289c7779aaeeca02b13987d9939529119c1eee9a349ffb9fde1e6af4173e5b6197a13b244d71280db33d2ae9cd67a5f54f133691bf459cfae7fc10d7f05 SHA512 22d97f6c35814a9ac395a5214422f7a3b9e20b4ad82c65d549d042becf621bb4603feb2b37ce0cbe05ff96375131677f33b827f1b672a76800e0ad0d29f98a7d
 EBUILD grip-4.5.2.ebuild 640 BLAKE2B f7f32f0b1b72a158dbc5916278d224d8bb46a8806f23b1e4cfb706c0ec8b0d32d8035c27496ccbf58549a3aae33838e927de218f3171d89a9f0710719b2728b8 SHA512 4ea96de40e3926ad990d342d9f10a21b5a0e7267f69ed87af0d9f54c5b874efcfd9ace24ae66f0923df758226aeab313cb5088872a53c456b3120811a34ab637
 MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
index 1325c688908d..d5e458d1fbb6 100644
--- a/app-text/grip/grip-4.2.0.ebuild
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy3 python3_6 )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 225c9566c32b..683f145bcc6d 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,7 +1,8 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
-EBUILD gtkspell-2.0.16.ebuild 931 BLAKE2B 75d272bda8c12f37fb080473509f4316be54995406c7d3e83ddf3660f761667e7f27735a0fcdceccb51b06d2f410b696acc99f1ad37e2bfa15db56dff76f0b12 SHA512 3e121f5fee9f31b2c1e0b190e8d9120f8e45511a051bcc824b6f85ae444eb894946bf0a7b6be16d5db4166e0a297bf0e2239c93645eafcb510b11c8ea2894bb3
+EBUILD gtkspell-2.0.16-r1.ebuild 996 BLAKE2B 444da566b24e6f9beeb5f34aaefb57930f1bee3dfa422f72a6960fec96cb2e76954a1fc2ef968637bf74b5acd782db430a5c76c87f6b87a93ae6bf614321d060 SHA512 55fb0836f0cb5aee5ca34e0c56803d65bae913a4ac15c3677b3bfd2b55907b59bcd7dc77db411ddf89e5b93314b55a0a077e52c9808b8747227855c71d92e346
+EBUILD gtkspell-2.0.16.ebuild 932 BLAKE2B 26570a2d49f21240e74abd785e61f49d5973f91d5661a10afcd9b0bf2c1f94616f3e5d31284aa6536c0984c35888ca12e58ae0486d3cc9be276711c7abedb832 SHA512 cc83089f2a9fe7a8f323233eb3004c3aae3536c6ac8514474c10dbdd3ec663b87041521d9dce022736943057b45bdcfc54cb01cd0ae284d6809feaee23dac8d2
 EBUILD gtkspell-3.0.10.ebuild 1067 BLAKE2B a923dbea388402ba9d5ffa9a7b3546a3d981b415e5db1118d421f7a4e472c2bc3edbf8fb8ad314845376b4182c0511be19925783ecc4932326f7839d9109ee45 SHA512 df7fb08a67b8f02aa4f43fdb6b8edded00fe235ee26e0296240f032d0c595b531fe248d34ee3b064a733000b2bd8479012dc6b1230c5944b5ddaeca97fd021b7
-EBUILD gtkspell-3.0.9.ebuild 1068 BLAKE2B 7d93551061749ecd326399873069fb4018c7f780a81bf9dece3593b94ed1be9743402a459445d963362f13125504d45d00087cff2aea28474fad57a6a202c7a3 SHA512 ab4b025efbd51fb718b813db2a30ed367e898dc13db9953a388223e9a65f446613638a10f6989743d3a84d180c73a730db07671768aa4b40240ab7e314d5a73a
+EBUILD gtkspell-3.0.9.ebuild 1069 BLAKE2B c7583baaabc1e860028ab1dc41e888d9e591e2eaf9e388c6dc5ee596d8b852da1e3ae4e36daea86a4e6eecf6977b1564bc9b1636a58ff462eb9b2ea20b22b4a1 SHA512 cffae0d5c3dfeb1c4750b4f3a6296375145896a20a3dd2d9013cff34b9fa95f5af6ea4dd7b9a217a46de478f68283d5720b23f1b6a0ada1a95106798e382d997
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..167691bf5c7b
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+# gtkspell doesn't use sourceforge mirroring system it seems.
+SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=app-text/enchant-1.1.6:0"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README ) # NEWS file is empty
+
+src_prepare() {
+	default
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in || die
+}
+
+src_configure() {
+	econf --disable-static --disable-gtk-doc
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
index e2851ea43dee..b57d54a8d44f 100644
--- a/app-text/gtkspell/gtkspell-2.0.16.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
index db2f17b17ddc..a1f40688379d 100644
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 7221f2da578b..5f323b2ceb81 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,4 +1,4 @@
 DIST krop-0.5.1.tar.gz 42719 BLAKE2B e0baa3c14d9ce63815615eae004a08af720868d584262901eccbc569852177e07d5df659ea560d7e9cbdc4325daef8c35acd9c200440a8dfd73c19b274d8de37 SHA512 2bfd2a5d762454ab45538707c6f333d2b0947b6b203d6e7bd2d9d0d574d79de8ee6b30d87b17d6afea604456b915f323b855c9c9af5c169c192b0a01634075ca
-EBUILD krop-0.5.1.ebuild 763 BLAKE2B 2b55492cfd6b4ab24ea4c17d75efbec83845f1a772916a55c71cfa4f93ed3ea26a6cf01d7d65fbe9b00601a33570cc497fab060fbab7285670a210548c0e5e64 SHA512 640e37164c7bfe675554bf4dbcd1e5207d5bc3886c1be35019ecd41b484e2e2b00bb8d8deb6a01ecd570f2b639c019f8a088aa03a378017dc9b685675c3f487d
-EBUILD krop-9999.ebuild 879 BLAKE2B a92e6395bdb2baf2db60e06517f12fda051b2d822e3f8012cfce25593c8aa767cc7f648bc7066830b8cebb5336ad763dd1f342f8557c2e6c11de1cb30859b603 SHA512 a20617cc85fadc150ce15bcc1fce7a37f980ee6ec9361248ce6ef040d9a2c2a941cf46f7038fd5c4b7a5d582086235e29257f868b3385a7672f063596ddd17a6
+EBUILD krop-0.5.1.ebuild 757 BLAKE2B 43c6ef4fce3592305e59c1006f1d736a7777c0858c3baa2c0922a006988f92a65b20c2e4d73058f47a41e7bac3998140822b30a47a6c370373062a4999665674 SHA512 ee1865af35eda2f6971661aa32f0694d9cda57f857df380827085c5046370a321db38fd2b49d4afab0b46aed870ebd981400aa8665d4b19862e39c96104d6607
+EBUILD krop-9999.ebuild 873 BLAKE2B 8354d4d11794afdf167a4a584d48a3b4e7471dd0411bd636ba4323a67d1d7b5b7b7dad5e564445027bb5d231780d0e20a6fb140bc9df2ed725bf4140e10e879c SHA512 6fe66c73bc35914f113e8a66db53b514d42445df2df646580ac448f30ffeef8f078e2a081c7538e8fc6aaf14f1c78944c91a1cc22b29122c830159e3eed9d2dc
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.5.1.ebuild b/app-text/krop/krop-0.5.1.ebuild
index 986c8fe5c033..8dc3d8371c93 100644
--- a/app-text/krop/krop-0.5.1.ebuild
+++ b/app-text/krop/krop-0.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1 xdg-utils
 
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index 0888b2ff9ae3..b7f325ef3b86 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit desktop distutils-r1 xdg-utils
 
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index f98a39eb1f60..abbfe7b8735b 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -3,5 +3,5 @@ AUX libebook-0.1.2-tests.patch 784 BLAKE2B b7f2aa5b5abace8fb1276c534ef564d8e088b
 DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
 EBUILD libebook-0.1.2-r1.ebuild 1102 BLAKE2B 746d4d4dda955395419b8c316650e2048496da0ea0684732b668edbbf4e1fb3859c22ff7e08e3388d707cbc1f8bba6923a5d4e89ccb45e95ef8512615b9e0b30 SHA512 cefcdac481822765c7ff42d90183e3c90c3122b75b8380f694d3bba000205a184ff114772aff47fe1266528a6ea4a7c90845454af7f8c3e9db48065d9e9c968d
-EBUILD libebook-0.1.3.ebuild 1040 BLAKE2B 6a39230aef9afc7dac8dac76724eb3da409b794afe100294debc07f0aaac02fff35a38a67f9d5f6e3ca9c899fa452df83cad6efcf5cf4ef2b06828eb3db67bc1 SHA512 28950094cda3f60ecf7db4c5a5f83df2a39670f867f83269d7ae5775618d2e3080b987bf73047bef66cdcacd08716f8b68dcc8401548ea7152a4bdbbebad570f
+EBUILD libebook-0.1.3.ebuild 1039 BLAKE2B 78ed938aef8e76bd9470bfb0fb2de9d318c5c503efaf49d82f5ddcf973190d042715271a62204fc7b0b3d33be827a7e042dc85bd0b6cb44fe995e590a891892a SHA512 98eb112d3ff3c5b5b2572b38c42a933b47860622f21980b703f7d9154189915d93a4b54b33a759c0e16ddd9f36761e30944da12eac25b52014467141c861db0f
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
index f3f0116c21a5..ebf1a3373666 100644
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 15c2a5a995af..1e298b65d734 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,5 +1,5 @@
 DIST liblangtag-0.6.2.tar.bz2 766080 BLAKE2B e19599cb6445e40d21d4aec394ab3bcfe447badf096e8efd6e13caa48ce5cec832cb853f4924ce0204a747949506b49b05c175c2726fa3904424cc25b8dc9869 SHA512 812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f
 DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf
 EBUILD liblangtag-0.6.2.ebuild 1159 BLAKE2B d20d9c30e08a145d77f6c31f8a72e8f09b0d2bbb6ecb0c3f9ad237462d71bd0f3c83a9b76984f6141ac5fc7ef194fcf965aebb2dcd5d9ba5c3c00877d082e02f SHA512 5c81c0eece432edbf077563ead860f55652fdf8d274385606762c986ce9657eca9cdfb78b937606a9f26bec68c9b491810b9b78e3abac140be10ca4ad9d69998
-EBUILD liblangtag-0.6.3.ebuild 1230 BLAKE2B b484327d82498ce8693bd02eb0653c231ea8b7edb3d68ccb30cda194e98e06a740e41cb24608c62df946cde2492d6b7fe5f57354ab99e501ea62d089b5ab1a5b SHA512 1d8bbe1d94028ef59b86258636c8c33e9ea59473861f29b00387849cd1c0975b160a2daf3ea04708dc5c7e05aa58d92be6d0cb4173bb39401e7c6a6d7b024a17
+EBUILD liblangtag-0.6.3.ebuild 1229 BLAKE2B 63cef5c98f492b721bbab859090cabd3e99350e2788319dea9c5697aa774914365f0cad5290bb0d276633561f8445c55a1c5289c63ab68f9cda7afaee9259128 SHA512 55b99a2660b0550c34b48283c696a409c2f461d20bba68416e1ed63f51a8fa510a5539bd13dbe26fd02a0e838dc99fafee9e3ccccc84cf39ed7e12768aafe8bf
 MISC metadata.xml 349 BLAKE2B 3be7ff388f2fa95c460c034408fb159d9f7f2b17b4634027f73870018e672f330b3b0f9cc96fa372170bf2daa314cb087a9cd5794ab1e373449b4cc0762bda87 SHA512 dc4a715ede23108572522e1e6c7afd36b3c3359fe4145e5a02b45e7fc094f1633fbfcdf0d9c75955f75acb1487e438bb437a85766d7a06e628674447d5cf3d96
diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild b/app-text/liblangtag/liblangtag-0.6.3.ebuild
index 0ea1f591f0ef..a9c9bdde4c33 100644
--- a/app-text/liblangtag/liblangtag-0.6.3.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="|| ( LGPL-3 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc introspection static-libs test"
 
 BDEPEND="
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 88cb61605bfc..049df7d031b6 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.24.tar.gz 355272 BLAKE2B 28617744c7361a5d51bad3eda876b3a2c03e5aad0b381aeae037a7280c88dde7cf3c3a457e7aed2dbd86b116ae6ce2469f65edc0eedbb0c2df68451813a5a579 SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b
 EBUILD libpaper-1.1.24-r2.ebuild 1150 BLAKE2B 4d8442e26c0055624fc759419eaf9ff3b476bc8f7dce7a0c5e9519599ab6cf2e51c63ebe37553ee159e4bccdbaf1b8ad130486c1729418ceb13a00a94fb09725 SHA512 f3f3bcb01d9ac34a3bbfdbfa1d1586185a4e5a18aebca213c5855d3192f62764ee3fa64b63b3ee779182d81e14a098287322e5da00775b9c81658e8539af7356
-EBUILD libpaper-1.1.24_p5.ebuild 1221 BLAKE2B efcc5b15395b9f83576aa261570ca67e9c420dbb96c3a7819e27b8c28a37b1c522f0277f673257671335dd31d89da5093178c8fd3fea86d1ad6aa8ad5af42ea8 SHA512 9f78a9bc1ed0ea55f9dbd5579cc87e6d940a4abebc13515c21d50d08b363ff0082230b80ac2e60827ea6b6df43e243bf442c068fbfd3fa81b996b35a66a49396
+EBUILD libpaper-1.1.24_p5.ebuild 1220 BLAKE2B b53357f1f593706a9335e628d5c3b386d8911ffc1f2d4003fe096c63e9255dbe7b6fe3975743cbdb51b3898d82021ddbf62506c567e1770db0e9b44ccb2aac86 SHA512 d5a3aea610eee6fa920ab4fc4d6a0bf4975a1adee3a13d90b4b2599cc36d5ff7abf15440d39b3ee277f4d52559e0d272e539996bea433a736e27f5e3325d555d
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index eae4131557e2..b7478c96646f 100644
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 6dd455086215..040436f33948 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
-EBUILD libqxp-0.0.2.ebuild 818 BLAKE2B b606252d677a16b8f74d4001f83d83c18c9287c9dec6d37020ac276bbce2f6e1fac98d0f6a45e4d52816c9bc52308b5753af3ce02307150f04f753c299c0067a SHA512 43152bee7a26a2b89a8879f3e203d80f2bf3e926663faf9790470b6b44a5b7f61f860d3e9bf589ba087abccd76e766b322c011e08ba7a215a6c844b7cd02b724
+EBUILD libqxp-0.0.2.ebuild 819 BLAKE2B c30f8093d93601e84cba18cad095507e033c51667913e533d74fe51d5a3284927aebe17516fce47bf3665af84334bfeef1764e082f1af6e25e418be9b8ac5a1d SHA512 a0912e6c49968abe903da83e044901c7701287f67bb0b46d70949cd2fed15014bc498d599e22b4dbea85b8ac4613f396499e2ce926eeb453b2b21ce2eecd48dd
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index 45620397cd35..c50e69eaad26 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Library parsing QuarkXpress documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
 SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 213fad305f3b..9099b48d4478 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 640 BLAKE2B 214c55c5659d2073749ac35eab7437d9eb663f712822d2e14984494f9a000aba061ff789c50e681087b05b590e9cbe989719537c63cc505fbc9fe8476107f943 SHA512 89964f09ea99bf1bf97df1762780bf1680c1f70c4c0faaa359f6b9b6670ecfc0aa07718ac7a0cb6403e215dd8d2cac78df02428e4ed5af1a9117087f82a624fa
+EBUILD manpager-1.ebuild 657 BLAKE2B 362fc558a0036b7323303b61126dc54c640f72a51fb092c11dd340244bda2e2beb1c5f969558cef6725e02b6ded59d72370e02538b5efc1e353767e9ad2da19f SHA512 eaedaf8cddbfb5e8188e3f977c59f03d2d95884b0ce57257600e4642019afa88d4f162239a58112c051fc30093c0286f2784cb4343f45ce0fe929bbad54b41b7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index c925f2b1adb3..31e3767691ea 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit toolchain-funcs
 
 DESCRIPTION="Enable colorization of man pages"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
new file mode 100644
index 000000000000..856068c0104d
--- /dev/null
+++ b/app-text/nuspell/Manifest
@@ -0,0 +1,3 @@
+DIST nuspell-3.0.0.tar.gz 403043 BLAKE2B b437012e4fb327f13d9ff0944dadf7e865c670daf153be00dd48e9d2fc01c87d410ebd5aeaa094f6446d3035346738010cdba961cfaada3751bedce264beaa6a SHA512 d9cd7dd276e2bca43dec3abaf11c5206695949b9fda8c9b86f2772cc7e8fa95bf17c685a2ef9ca87fe3c4f0b55f2fcb435bc21c187355f5e3fa35dcafab2c8c2
+EBUILD nuspell-3.0.0.ebuild 1091 BLAKE2B 07c8fa7a2b9c03c18821ccd35bc1d9fa5f72490c4a9ec4d52cd4f4f90cb2d295771e2110b6ab50ab8c0bb34db075349735993e61f3d5ddca1380d5cec4e467f8 SHA512 eceed5f031c930296ed451dad77718cd07e4b052598026b4c59219467eb26c7eb050239d1869339791bd9e4bf437af9e54cefa1981ffe939394331a5dde8adff
+MISC metadata.xml 489 BLAKE2B 51835316b4f8b1b1a016324955d48f6f5126ef7b7caf11f4b46ea858469fc9ebe3154de4fbc99d528bfef3808fe7c95dd2f540038572ae640b00dad9fccbeacf SHA512 ea959020e4b2a90f475d296fd1a43c2ba8efc1c39f2dde70b930165bce165df1011e04af8f54b37740f28e009502a5c64ec0fdb2b7221003388cd47b1ccadeb5
diff --git a/app-text/nuspell/metadata.xml b/app-text/nuspell/metadata.xml
new file mode 100644
index 000000000000..6a10d096c251
--- /dev/null
+++ b/app-text/nuspell/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="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<longdescription>
+		Spell checker library and command-line program designed for
+		languages with rich morphology and complex word compounding.
+
+		Nuspell is a pure C++ re-implementation of <pkg>app-text/hunspell</pkg>.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/nuspell/nuspell-3.0.0.ebuild b/app-text/nuspell/nuspell-3.0.0.ebuild
new file mode 100644
index 000000000000..91e224ba8293
--- /dev/null
+++ b/app-text/nuspell/nuspell-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="test? ( || ( MPL-1.1 GPL-2+ LGPL-2.1+ ) ) LGPL-3+"
+SLOT="0/3"  # due to libnuspell.so.3
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/icu"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ronn )
+	test? ( >=dev-cpp/catch-2.3.0:0 )
+	>=dev-libs/boost-1.62[icu]"
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+	einfo
+	einfo 'Besides MySpell dictionaries, for other options please'
+	einfo 'see https://nuspell.github.io/#languages-and-users .  Good luck!'
+	einfo
+}
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index 5af3273d5b0f..37dc14c5e0c3 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,3 +1,3 @@
 DIST pastebinit-1.5.tar.bz2 42941 BLAKE2B 678df7f2e77cc832fc9e152fb451538284033d181d9165b1a1194b254ad08ca1ac3e4612dddf7db6c62c1c3c59265ad94a78cc6df9457565264864ab06bff00b SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099
-EBUILD pastebinit-1.5.ebuild 1329 BLAKE2B 68f28d927b02c7d9bd042e7ddae1d43cbb260810b8d036ee49c8b8d3cb982ce3e5b8b39cd596a72ce098c42a886cd69a25f0cd6014433ff57d3439332d530df1 SHA512 f034cc3abf06d801684a08a8d3daaf53f36aa5a203934f3eea92085597403cace1e9083509ae917e29944f644d68170d4fe5a681335158ce9ee42ee33df1e07b
+EBUILD pastebinit-1.5-r1.ebuild 1359 BLAKE2B e214069eb40284eb19aabb9ad019e9aab30fff119566c32d9842c0a53e4f1ca5a222a891b63b766c7d88d278c1dd2a6d3d9241dbfdac529cdafc63deeb178ca4 SHA512 3dbf85538256e9a15a0b9ebb10d2739508d2fb76e12ccb3b73a17597f171e92e8a574d062a53f2c4436d4759bb7b0968613310500cf46688d3276f667446bebd
 MISC metadata.xml 326 BLAKE2B d50cef7d0035889868a74b6a2794648129bf06b854208dc28eefe82251c2c2bb4562d19103a6abae51e3f40afccfd901a4c1e2ed8bfcf9910fa99d9543b069c3 SHA512 cd582b088098d0163e91ea17e6b4fa2fb5b816e44590ff8f159730215d9b8118b747b43fdcb9d7a6cad3dfbfbcd8d8b6e29cd509b7a9d6e3b860c77c4ac10c4c
diff --git a/app-text/pastebinit/pastebinit-1.5-r1.ebuild b/app-text/pastebinit/pastebinit-1.5-r1.ebuild
new file mode 100644
index 000000000000..f849d52e157a
--- /dev/null
+++ b/app-text/pastebinit/pastebinit-1.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="xml"
+
+inherit python-single-r1
+
+DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
+HOMEPAGE="https://launchpad.net/pastebinit"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="crypt"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+	')
+	crypt? ( app-crypt/gnupg )"
+DEPEND="app-text/docbook-xsl-stylesheets"
+
+src_prepare() {
+	local mo=""
+
+	for lang in ${LINGUAS}; do
+		if [ -f po/${lang}.po ]; then
+			mo="${mo} ${lang}.mo"
+		fi
+	done
+
+	sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile || die
+	sed -i -e "/#!/s/python3/python/" pastebinit || die
+}
+
+src_compile() {
+	emake -C po
+	xsltproc --nonet \
+		"${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
+		pastebinit.xml || die
+}
+
+src_install() {
+	dobin pastebinit utils/pbput
+	python_fix_shebang "${ED}usr/bin/${PN}"
+	dosym pbput /usr/bin/pbget
+	use crypt && dosym pbput /usr/bin/pbputs
+	dodoc README
+	doman pastebinit.1 utils/*.1
+	insinto /usr/share/locale
+	[[ -d po/mo ]] && doins -r po/mo/*
+	insinto /usr/share
+	doins -r pastebin.d
+}
diff --git a/app-text/pastebinit/pastebinit-1.5.ebuild b/app-text/pastebinit/pastebinit-1.5.ebuild
deleted file mode 100644
index c707cb302333..000000000000
--- a/app-text/pastebinit/pastebinit-1.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit python-single-r1
-
-DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
-HOMEPAGE="https://launchpad.net/pastebinit"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="crypt"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	crypt? ( app-crypt/gnupg )"
-DEPEND="app-text/docbook-xsl-stylesheets"
-
-src_prepare() {
-	local mo=""
-
-	for lang in ${LINGUAS}; do
-		if [ -f po/${lang}.po ]; then
-			mo="${mo} ${lang}.mo"
-		fi
-	done
-
-	sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile || die
-	sed -i -e "/#!/s/python3/python/" pastebinit || die
-}
-
-src_compile() {
-	emake -C po
-	xsltproc --nonet \
-		"${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
-		pastebinit.xml || die
-}
-
-src_install() {
-	dobin pastebinit utils/pbput
-	python_fix_shebang "${ED}usr/bin/${PN}"
-	dosym pbput /usr/bin/pbget
-	use crypt && dosym pbput /usr/bin/pbputs
-	dodoc README
-	doman pastebinit.1 utils/*.1
-	insinto /usr/share/locale
-	[[ -d po/mo ]] && doins -r po/mo/*
-	insinto /usr/share
-	doins -r pastebin.d
-}
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
index 0077320a7ab6..06b700fec95c 100644
--- a/app-text/pylize/Manifest
+++ b/app-text/pylize/Manifest
@@ -1,4 +1,4 @@
 AUX pylize-pillow.patch 375 BLAKE2B 9aaf388fc67d03d9af957a1aee350891ded225b0f0def122120d23e7cb1981fe70a8ba7169806a94de913ddea4d8019687ac3088b2e0b318451dc423e6eb75e6 SHA512 5e6beeb1a0192328039d581eeaf568e606a1fa002f8d91ddb397e27d873e23834fda67cd88a5afb24563a515cb37c234ed2d8c913472ce9fccd431249be852dc
 DIST pylize-1.3b.tar.bz2 70979 BLAKE2B 3b90d60ef7c314e6f7683ebdfa4d518b64ebbfe3bbe39148409d50c41577c7850304eb11e588f99e9c22d550548cf81f5f93265624200395e7abe7557d738a0e SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454
-EBUILD pylize-1.3b-r1.ebuild 1022 BLAKE2B aaf0d9b9d31c62fddce0383cb4dd525b7ae1c080b09cdd2fa2a97f4d6461e9d092e414cc2d61ece6845fd8371b741793da0e786d20a453c636f662e3e188f3db SHA512 eecad9d01435070c7652ca2357bec6c9cbcf289e478fe34af2fb2ca17ef217609d792b6d6b14f79d71c2eba1b0769682daba5b2381b0a6798ff81513c39a2961
+EBUILD pylize-1.3b-r2.ebuild 1064 BLAKE2B b18a5af5e8e69673b445be5d0771c54ce3e3e3f58d11937343123e26e759b127d9b39290b6bcff17ff32a0599c183c4e0dccc11640386a49bc42543ae1238502 SHA512 bac5e62884904d7a7c3ade9333db0ab0dc8c47b64de3ce027d8bf6e835c53620e8012e0bc023e2e37e9ddb6b2f2e70a59a54841b47273a635b4fc92fc585a40d
 MISC metadata.xml 547 BLAKE2B d6d76c0357be91f51c01a0d0031c2a221e27dcdb65b300bd63bd614bd5fd29ea000903ed7206167ef3055b1da85297319a4d5517a0f80077ae2a0d072124afd1 SHA512 bf43543c0b0c4f90940d0a5b40c342d9151673418994e074421e723ed8242fa742cc06b93cf846bf8b860b997faa68b4f0f978d274434bb33b77c3e9cddec435
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
deleted file mode 100644
index 799e97bf41da..000000000000
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python HTML Slideshow Generator using HTML and CSS"
-HOMEPAGE="http://www.chrisarndt.de/en/software/pylize/"
-SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
-
-IUSE="doc"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-python/empy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
-
-python_configure() {
-	set -- "${PYTHON}" configure.py
-	echo "$@"
-	"$@" || die
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize "${ED%/}/usr/share/pylize"
-}
-
-python_install_all() {
-	local DOCS=( Changelog README README.empy TODO )
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-text/pylize/pylize-1.3b-r2.ebuild b/app-text/pylize/pylize-1.3b-r2.ebuild
new file mode 100644
index 000000000000..1dc2b94a9c30
--- /dev/null
+++ b/app-text/pylize/pylize-1.3b-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python HTML Slideshow Generator using HTML and CSS"
+HOMEPAGE="http://www.chrisarndt.de/en/software/pylize/"
+SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
+
+IUSE="doc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/empy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+	')"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
+
+python_configure() {
+	set -- "${PYTHON}" configure.py
+	echo "$@"
+	"$@" || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize"
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize "${ED%/}/usr/share/pylize"
+}
+
+python_install_all() {
+	local DOCS=( Changelog README README.empy TODO )
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 1819488c5a40..b4fd7189a278 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,5 +1,7 @@
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 DIST qpdf-9.1.0.tar.gz 18285597 BLAKE2B ef86cd4192805761e121bcd112e071dacb4bc108335da0ba237476d9f1698e4ba630010e3266fb63d9aa5b97e0e778f76fe226613e91d351b93a53b9fc9abee7 SHA512 7561ffc366dbce9df58cc85ff18480b28b0d46de04733ba463139188bee95690f92cf0960a328619f0c9f34ce865598db490fa1c6aaa76ee87d2c034a5f7f57e
+DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
 EBUILD qpdf-9.0.2.ebuild 1274 BLAKE2B 070a9c72aa5cff4a6fa5e8e65d56c87ba04882527b242938087d9f876732c2e49b47cbb9baf37e373469d40d70ed3ecb6ec657126fdcbad63fd82a5299cb6c2f SHA512 e65ad97cff9fdb5ee261d139c9b391e1cdc8c4c13f861a988bdeba891ff02900e4ff06cc37801b170e3af442f6bbb9aaef8123b1a956fc0806f900babc5671cd
 EBUILD qpdf-9.1.0.ebuild 1421 BLAKE2B fcf852c0c05df1b7699d7dbabe2d01861d41eff1cf3b14bac03fb07fd67a28923cc063dfc8e7111cb1ba20a2485a48c863f86669cf9bfd25849f13b0b66d2663 SHA512 6bd4a49cbfc8972b0bd5781ddc7cd175191156064ae512466556a26eaae36cd7f7a830442744cfe1110810216ac5a98fb20e34f7b8c202c7ebc8880c65357a63
+EBUILD qpdf-9.1.1-r1.ebuild 1209 BLAKE2B a41341bc00ad325e8fc52b7bb72cc93d9fa615a82452c436518cc26310678f3fa1148a72f1ea26c50da5a2b366d69d53327c3138eff72370d06ab6be9ccfa673 SHA512 e94d36930a5c3ed832630ada53181acd18d487ed81e387dcbb0ea1fc9b46d99ec1e336dc9e352888f10e3661c9e0a01469e6d2fef2fc83b5896f8b276305d747
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-9.1.1-r1.ebuild b/app-text/qpdf/qpdf-9.1.1-r1.ebuild
new file mode 100644
index 000000000000..34cb46051867
--- /dev/null
+++ b/app-text/qpdf/qpdf-9.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/26"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/gnutls:0=
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-implicit-crypto
+		--enable-crypto-gnutls
+		--enable-crypto-native
+		--with-default-crypto=gnutls
+		$(use_enable static-libs static)
+		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 133423a31232..20aef4dd1c07 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,7 +1,7 @@
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
 DIST sigil-0.9.18.tar.gz 21396185 BLAKE2B a20a1465032371f9d7e567fff03c859adf4bd2264e9d803efeb3bdeb3b097eca826daa36824370848aea50fffb2b2b74b28568f7dca926565dfd0948d7ade030 SHA512 a8f669ffb76554268aae8aa0f85c6861f80def71e429b44b20ac9b231f3f7584839a82e7b6991f57ca1f2d1f023e24d1f37897bd048379e30565e9bdd7ee188a
 DIST sigil-1.0.0.tar.gz 21623303 BLAKE2B 5772316d3ffc78387f7fb9db1e88397756bf82c25513246033fe71f288d619844e9316f43b7f08b914e4f59912e42eea061079cd4b468de77087bf7a8ea46be0 SHA512 7fc440131fcdd9af60b10f703dcdaf946ac6c667cabbfc842addd68c6c9af35fc8808630a6cfee6db465e7faeec6a6b4f2c6bbe185426a0f845e47c16b02d7d1
-EBUILD sigil-0.9.16.ebuild 2849 BLAKE2B 0e6d0486dc550b77acbc2006757f24c2f29e4d3861998a9225a6f82e21cf3e87c165291647d7a084492bc26db1e0ffbfb70a3faa212aa2c061f314bedc8f4908 SHA512 d742c9f1c2be8cb979f4976008365e6f48b48511d4551efb1a39f00f5111ecfc97ebaba77385fdf42dc7094b679f02d032a9c9ca75aff10554d1416462994b99
-EBUILD sigil-0.9.18.ebuild 2673 BLAKE2B e8cd96014fac4e15113560c9efff8da7ddfa79a2ec9c645556d41b9c4ae5df0e0cef25115c97563e63a1ae1c1e51f0d5252175a6f16bac355c3c81a5c7580e21 SHA512 4976c672d974cc48c6626ff9b6a5e12e1947a4fc7bceb55bd2c9f62b6c718761e9264099feb5c887bbac3324d512501c7bb820aba6078086759debfb5f7f36b7
+EBUILD sigil-0.9.16-r1.ebuild 2960 BLAKE2B f3198426ecfe3f9e01a04a4741049a3e42e54c574a5e8df1500deb5cf632f41c32925b8fee9681da4287b1aaf63eb5c18be4c2372592fb5a7d07796c0fb099a6 SHA512 ce4c4428a22ca2ee06bd38a4cb05c45475a0a2b6ad766128bbfa9d4361ea5bcb756d9167a582e358ba1a80da53e1c1110e51b662a21a708f11b15102d4da35f3
+EBUILD sigil-0.9.18.ebuild 2784 BLAKE2B 33c8b03b32e4a20954f34e26c6e9f41dcc5d9f6f20cde6fb781d1fb3143dea6b58a87d87975df6b618745d5f2ddc22c9b8bb37fe9ef3721292e56cdde380b3d0 SHA512 4f0aabf83ea7cac03a43dee977f763b9631163a6e11003f9facfcef9ba946743b8c8d966fe6c0b996bfea5bb04dcdf010ae4f2b86b5c174239d08c8f95adefb1
 EBUILD sigil-1.0.0.ebuild 2102 BLAKE2B 62b2e071fcd1a6c817f37117864e1cc22b1b29e042de7e3141cc74de32d3dd592629eebc84588a966dd18f600faabe925f058be72b8d1e4e202eae1b5fa7a1c1 SHA512 1f9ca94bf37afa8c5196c1124f18a46777225e923de7cef0a1c5672914e4ff0c9fd08f6054fc2f36fc748b92f5aba08291623e0d0983e5068959be3f1e06a85e
 MISC metadata.xml 1073 BLAKE2B 5428bda0e56ccfc8a4f5c7df773698fa62e0309daa5cb970df9fe3381a7a45c920a854e793b92a2d7e91c66698ddd40f2cf89001e85d0bdfbf521af9fe8ea4a8 SHA512 cdfca84a4cd89a3d4d8d6d79b7eb6432d51019b3ac2c8f59f09262c7cf52c990886e299557bcf10f698ec84e8c3c4f46da19bd9dc298d7011aaf4e52b9e0b35b
diff --git a/app-text/sigil/sigil-0.9.16-r1.ebuild b/app-text/sigil/sigil-0.9.16-r1.ebuild
new file mode 100644
index 000000000000..a9492f58a94c
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.16-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="tk"
+
+inherit cmake python-single-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+plugins system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/boost:=[threads]
+	dev-libs/libpcre:3=[pcre16]
+	dev-libs/xerces-c[icu]
+	$(python_gen_cond_dep \
+		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]')
+	>=dev-qt/qtconcurrent-5.12:5
+	>=dev-qt/qtcore-5.12:5
+	>=dev-qt/qtgui-5.12:5
+	>=dev-qt/qtprintsupport-5.12:5
+	>=dev-qt/qtwebengine-5.12:5[widgets]
+	>=dev-qt/qtwidgets-5.12:5
+	>=dev-qt/qtxmlpatterns-5.12:5
+	sys-libs/zlib[minizip]
+	plugins? ( $(python_gen_cond_dep \
+		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
+	system-mathjax? ( dev-libs/mathjax )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/Sigil-${PV}"
+
+DOCS=( ChangeLog.txt README.md )
+
+DOC_CONTENTS="From Sigil's release notes:
+When you fire up Sigil for the very first time:
+navigate to the new General Preferences and select the default
+epub version you plan to work with (epub 2 or epub3) so that new
+empty ebooks start with the correct code.
+if you plan to work with epub3 epubs, you should change your
+PreserveEntities setting to use ONLY NUMERIC entities.
+
+For example use & # 1 6 0 ; for non-breaking spaces and etc.
+
+We strongly recommend enabling Mend On Open in your settings
+for best performance with Sigil."
+
+src_prepare() {
+	# bundled is a exact copy of the package, and upstream plan to switch soon
+	rm -r src/Resource_Files/plugin_launchers/python/css_parser/ || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
+	local mycmakeargs=(
+		-DINSTALL_BUNDLED_DICTS=0
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16.ebuild
deleted file mode 100644
index a712ce00178e..000000000000
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="tk"
-
-inherit cmake python-single-r1 readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugins system-mathjax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/boost:=[threads]
-	dev-libs/libpcre:3=[pcre16]
-	dev-libs/xerces-c[icu]
-	dev-python/css-parser[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.12:5
-	>=dev-qt/qtcore-5.12:5
-	>=dev-qt/qtgui-5.12:5
-	>=dev-qt/qtprintsupport-5.12:5
-	>=dev-qt/qtwebengine-5.12:5[widgets]
-	>=dev-qt/qtwidgets-5.12:5
-	>=dev-qt/qtxmlpatterns-5.12:5
-	sys-libs/zlib[minizip]
-	plugins? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/cssutils[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-	system-mathjax? ( dev-libs/mathjax )
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/Sigil-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-DOC_CONTENTS="From Sigil's release notes:
-When you fire up Sigil for the very first time:
-navigate to the new General Preferences and select the default
-epub version you plan to work with (epub 2 or epub3) so that new
-empty ebooks start with the correct code.
-if you plan to work with epub3 epubs, you should change your
-PreserveEntities setting to use ONLY NUMERIC entities.
-
-For example use & # 1 6 0 ; for non-breaking spaces and etc.
-
-We strongly recommend enabling Mend On Open in your settings
-for best performance with Sigil."
-
-src_prepare() {
-	# bundled is a exact copy of the package, and upstream plan to switch soon
-	rm -r src/Resource_Files/plugin_launchers/python/css_parser/ || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
-	)
-	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-0.9.18.ebuild b/app-text/sigil/sigil-0.9.18.ebuild
index ee2155ae5c35..697fccf8b9f1 100644
--- a/app-text/sigil/sigil-0.9.18.ebuild
+++ b/app-text/sigil/sigil-0.9.18.ebuild
@@ -24,9 +24,10 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 	dev-libs/libpcre:3=[pcre16]
 	dev-libs/xerces-c[icu]
-	dev-python/css-parser[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]')
 	>=dev-qt/qtconcurrent-5.12:5
 	>=dev-qt/qtcore-5.12:5
 	>=dev-qt/qtgui-5.12:5
@@ -34,14 +35,13 @@ RDEPEND="
 	>=dev-qt/qtwebengine-5.12:5[widgets]
 	>=dev-qt/qtwidgets-5.12:5
 	sys-libs/zlib[minizip]
-	plugins? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/cssutils[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
+	plugins? ( $(python_gen_cond_dep \
+		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
 	system-mathjax? ( dev-libs/mathjax )
 "
 DEPEND="${RDEPEND}"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index d2acad6c2bab..19364cbad761 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,6 +1,6 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-core-patches-2019-4.tar.xz 11932 BLAKE2B 5e73e2bd3afeb904f2b8898081ffd770c9ab152368ae5a8699d5f63507e3c0584901d7d6f8fece7724b8e744d7816fe31db4b96962c0550491a57a6d51adb296 SHA512 fce31563f8c7e8f1f0bdcba9c5108d9f5d14529c22c110e33f32a6367560f7f255e51a1e86f1d5c8fb275085ff3ba6d0f5f474acd79ff61d67be795dfb330708
-DIST texlive-core-patches-2019-7.tar.xz 12784 BLAKE2B 8bb9248a7065ab3922ed5d893c32a4ea623dc0726bc6c25de471b247ad3bdce62284b29d80ad905f70d7b1c17c244b892cea2922620136fa5fb7364a60239c08 SHA512 37976f26909cf25f33d6ce5277c56af4273c3381534f14c53f11426c7d1bcec4cdce1e6aa4f70cc872c964f67212eadd9b953444d54e6bd916bdb45faa463337
+DIST texlive-core-patches-2019-8.tar.xz 15172 BLAKE2B 97ac7855200fcf86463e09df1bdd30f9ebf50e8d207a136ed9dd380776f15d0a883b5eaec22ede4ae9e5201dc47cc40854e1ac77d197fe2bc8c0f5a1c287c1eb SHA512 1a9af52496a7cb4f8e0223811ac84e7adf6ff8d63ad1c29d5c738716e4a45db1375e3f67324104e6a40a93f68de46d7326b3e851a4e33ab66ae562667e4a883e
 DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6 SHA512 983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c
 DIST texlive-module-a2ping.doc-2019.tar.xz 39740 BLAKE2B 1a9cf6e4cf4dd4dd7677efddafc9da191ab3c34eea3b7bd0f51937f6946e1696b858aa9d53e7599c220933b06bc0332869a0bd596ca66b9801b48adb5ab1aa2b SHA512 daeefb01a0197e3b7751614cb84e2926f670d36b7e8a389bfbbe39cbd941c4d10ef5112593bfb88e11fa15f7f7bb07f2538c7d0a68cefe1482bbdaf02d475512
 DIST texlive-module-adhocfilelist-2019.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
@@ -158,5 +158,5 @@ DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25
 DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0
 EBUILD texlive-core-2019-r4.ebuild 11204 BLAKE2B 58efddb7c26a18e262318e66ffee43b7c46bb89edef83eef0b571beb641549f07b5325142be7457196292dce4614af2bc81baafc3c6a814392d66e30a92f25ae SHA512 5844c2e39045b34361d8ecded8bfa1e8d570bf37aca89f1d7bc1526a85e04210316e6bc7ad8ba7bb059f72e14fb860d5fc20a5f98691fd67da19c46c9902f3e8
-EBUILD texlive-core-2019-r7.ebuild 11516 BLAKE2B 8d6bcc8f80382e2480b5dfaf9b5a9a26dec57708938f2e95f9ae392e0cabe7cd5b7c150ffc763eeacf2840c6c6e4fe90a2ffc5b70fff4cfae95879bdcfbd5591 SHA512 dd9638046c5b66227bc67562b49dad2469c33ad98990fbaed9ec95f7e3bdcb786610b64faf40a405dddd1a0498bd16ddb9099a3702a1e3a3ae977409aaa9a3e2
+EBUILD texlive-core-2019-r8.ebuild 11567 BLAKE2B 2efa686d908010c3e0dd8d858e4993f573970f61da72f231dcad1fc15b5737692ba30d9ab46f9c841491682134853c59b0c08bdf204262054c9c1391cae01228 SHA512 f77c7da05c36a6615cbd13324fcddfa7946ae1fd2b2e98b702aa9fb0e4004382deb7a3ec3e69d36f684c023f4e3b990e7372e53a55e9620120c8749002f0093e
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2019-r7.ebuild b/app-text/texlive-core/texlive-core-2019-r7.ebuild
deleted file mode 100644
index 1a7c04c4f1bc..000000000000
--- a/app-text/texlive-core/texlive-core-2019-r7.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-TL_SOURCE_VERSION=20190410
-
-inherit flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-PATCHLEVEL=7
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="https://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.xz
-	mirror://gentoo/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz
-	mirror://gentoo/texlive-tlpdb-${PV}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
-	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
-	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
-	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
-	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
-	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
-	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
-	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
-	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
-	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
-	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
-	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
-	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
-	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
-	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
-	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
-	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
-"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source arara.source checklistings.source hyphenex.source
-	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
-	texdef.source texosquery.source
-"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk +luajittex xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libX11
-				x11-libs/libXmu
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	media-libs/gd[png]
-	>=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]
-		>=app-text/teckit-2.5.3
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/icu-50:=
-	>=dev-libs/kpathsea-6.2.3
-	cjk? ( >=dev-libs/ptexenc-1.3.7 )
-	>=app-text/poppler-0.76.1:="
-
-BDEPEND="sys-apps/ed
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}
-	>=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 )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-
-	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
-
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}" || die
-
-	default
-
-	# These we need unconditionally
-	eapply "${WORKDIR}"/patches/{0001..0006}*.patch
-
-	# Conditional poppler patching
-	if has_version ">=app-text/poppler-0.83.0"; then
-		eapply "${WORKDIR}"/patches/${P}-poppler083.patch
-		eapply "${WORKDIR}"/patches/${P}-poppler084.patch
-	else
-		eapply "${WORKDIR}"/patches/${P}-poppler076.patch
-	fi
-
-	sed -i \
-		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
-		texk/web2c/configure || die
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	# Disable freetype-config as this is considered obsolete.
-	# Also only pkg-config works for prefix as described in bug #690094
-	export ac_cv_prog_ac_ct_FT2_CONFIG=no
-
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--with-system-gmp \
-		--with-system-gd \
-		--with-system-mpfr \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pk \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		--disable-build-in-source-tree \
-		--with-banner-add=" Gentoo Linux" \
-		$(use_enable luajittex) \
-		$(use_enable luajittex mfluajit) \
-		$(use_enable xetex) \
-		$(use_enable cjk dviout-util) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable cjk pmp) \
-		$(use_enable cjk upmp) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk" || die
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk" || die
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk" || die
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c" || die
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}" || die
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}" || die
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	einfo "Regenerating TeX formats"
-	fmtutil-sys --all &> /dev/null
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-}
diff --git a/app-text/texlive-core/texlive-core-2019-r8.ebuild b/app-text/texlive-core/texlive-core-2019-r8.ebuild
new file mode 100644
index 000000000000..093c3748dbda
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2019-r8.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20190410
+
+inherit flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+PATCHLEVEL=8
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.xz
+	mirror://gentoo/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz
+	mirror://gentoo/texlive-tlpdb-${PV}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source
+"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libX11
+				x11-libs/libXmu
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	media-libs/gd[png]
+	>=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]
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/icu-50:=
+	>=dev-libs/kpathsea-6.2.3
+	cjk? ( >=dev-libs/ptexenc-1.3.7 )
+	>=app-text/poppler-0.76.1:="
+
+BDEPEND="sys-apps/ed
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	>=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 )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+
+	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
+
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}" || die
+
+	default
+
+	# These we need unconditionally
+	eapply "${WORKDIR}"/patches/{0001..0006}*.patch
+	eapply "${WORKDIR}"/patches/${P}-no-fcommon.patch
+
+	# Conditional poppler patching
+	if has_version ">=app-text/poppler-0.83.0"; then
+		eapply "${WORKDIR}"/patches/${P}-poppler083.patch
+		eapply "${WORKDIR}"/patches/${P}-poppler084.patch
+	else
+		eapply "${WORKDIR}"/patches/${P}-poppler076.patch
+	fi
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable freetype-config as this is considered obsolete.
+	# Also only pkg-config works for prefix as described in bug #690094
+	export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-gd \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		--disable-build-in-source-tree \
+		--with-banner-add=" Gentoo Linux" \
+		$(use_enable luajittex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk dviout-util) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk" || die
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk" || die
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk" || die
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c" || die
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}" || die
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}" || die
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+}
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index b9d4be5e1d8f..57cd812d1b46 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,3 +1,4 @@
+AUX ttf2pk2-2.0_p20190410-fno-common-gcc10.patch 266 BLAKE2B 98f39f54a57008124d456d831fa02585de3563029acf520b47253510f1c59c1761b450c0b116f372142c9c197aac10b50edfdace60bd66ea9d3791f95556778b SHA512 c65aa9af68ed6073427f7c5713cf4157a1fa7782578612a26040ea50eff89c41251e1b36a395b2cdf639d46cb865abfe46f5662e932d29e6e10bce08dd48b5a7
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ttf2pk2-2.0_p20190410.ebuild 1089 BLAKE2B 5b5029b5b30a1fffee513985ea7748a1e573e2297816e595bbaeea220ddb1163b05a5bb5d3ea20bca053f253db29184a2909ae04995c42e843328373c6e0bfd7 SHA512 3dbd27d7134a8b8e087a53de69ede547fde5445d626ced22b87b9a52ce75b8502907b14dce8e8a8779cb740dfa137a966eaeda27c1471c2a8ed722b35c1a889a
+EBUILD ttf2pk2-2.0_p20190410.ebuild 1159 BLAKE2B 519047a229ac9071f1f32d8137e347a49dce542a72ce0814b08a4ebde254663541ae5ee4e82c2639c858a3f2f9be7422717c47141cfa1c05436a882855e70eac SHA512 2828785adb3c8f522578716abf3f6fa280384e7f1a2c5ab2b88b1d4f5f06d695b9970a789a32cfaf46497874bdc7f1d2ff25303442c46d6d31ec625a574288bd
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch
new file mode 100644
index 000000000000..74678208a240
--- /dev/null
+++ b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch
@@ -0,0 +1,21 @@
+--- a/pklib.c
++++ b/pklib.c
+@@ -64,8 +64,6 @@
+ #define PK_POST (char)245
+ #define PK_NOP  (char)246
+ 
+-int dpi;
+-
+ FILE *pk_file;
+ 
+ 
+--- a/pklib.h
++++ b/pklib.h
+@@ -13,6 +13,7 @@
+ 
+ typedef unsigned char byte;
+ 
++extern int dpi;
+ 
+ void TFMopen(char **filename);
+ 
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
index 6499ac50b3ec..6528f2d15c05 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,8 @@ BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 
+PATCHES=( "${FILESDIR}"/${PN}-2.0_p20190410-fno-common-gcc10.patch )
+
 src_configure() {
 	econf --with-system-kpathsea \
 		--with-system-freetype2 \
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index d2b23abdc0e0..423ea078613c 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -2,6 +2,12 @@ AUX vilistextum-2.6.9-blockquote.patch 4541 BLAKE2B 231ea3348a4519c5f24160bd1755
 AUX vilistextum-2.6.9-darwin11.patch 615 BLAKE2B 0bfefb47961cf1752c8251a484d04b20c55196d2c64c2e98bc50caf6842b02960257ff22d7d6f7b04c4a7e97e5c66a6a2f122db24faaae4c7fe326833e57c7c6 SHA512 35aeec20cb7e6ba1668d97f041bbd5b98712589eaaf0ab70a59d3a7df74e0d2e67abbab3a27c7c5ee5f6fe9d61f11610686df3459f0cb401cca03f3f671309ac
 AUX vilistextum-2.6.9-gentoo.diff 763 BLAKE2B bb145aa629084c370281fdb2bd31e763d0c0106bb8aa5c7fc1ee030e837cc0062b9f46ad9d626b88a199c12e6163acc2ab28978eb5cb236c3a212b341a7ad9b9 SHA512 b4c49ff27598cedeb06058d3237ea8ebc59a4df9031818f98b5fb22225733d94b820b892541dbddc38c28c08a62ff6f52ef8278c016522b1db95352653178b21
 AUX vilistextum-2.6.9-prefix.patch 837 BLAKE2B 65aec718915942919f371453af12cbfa74437f999d7c25a49186ed5c02e975c4c10ebf629bc54a8a6fb69b9acc9723a32d4d82b0ee09c039afdc5f0fa8d9370c SHA512 6f913d283542bfea02d062f872dc2471e7ea2bc4c29ddb8893aecb9abeb36e6cc821c393217a92421e6888f7c25aa072bfc16c56a69a40593ed504245d8cd187
+AUX vilistextum-2.8.0-blockquote.patch 4479 BLAKE2B 45b63c30064bceb80cd37fa6fc8cf86685ee2017ed53a40ac76508e830b85c5b14d449ef0b5088245fbe87f056a28b83fba95f3795f5b8a05c35d2221696ff14 SHA512 88d5c696f4e20825e032258c85a154c65b9404bb2fc31854f88d8a6b2939cddaf6e6c99b9fa74bffb19a4fb4a75d200afd15a362fbcbcdcee075754866c9fa06
+AUX vilistextum-2.8.0-gentoo.patch 278 BLAKE2B 6fc580c02c38bd65855ff5866555360c6f0d13e1d558f19298418556b5b4124aad280bf0a46505db242ec25f869e8abfbd47dcd6eb030641eadb30878887c6d6 SHA512 3a1d701067ea291756e29d0a23dc6c21ae83a80239d2cfbf576513a667e0ef1222746aff7d1d1ec7bf0af0ceaa48ad44ea37b7b56b499eb214b103d682880d1f
+AUX vilistextum-2.8.0-prefix.patch 784 BLAKE2B 4aeab8e91012cc1302aa7a94337069973c9cea8b179658f30346f3d95bb9d0a351e1430666d6465888432fb74e3454d2eaadedbd8af64e2b57cfe00e9633c65e SHA512 95a92905c68e357c40f64696cf20c9639bed5da3c651c75df803eef4c991bb56424893a40a2a9ca80a9e66a16e1e986d0589dd43d751130146697348c5b0205f
+AUX vilistextum-2.8.0-towlower.patch 274 BLAKE2B b6c043049bf6d928ecb147465aeff6ac959c3320b76ff92c6ebfffb9dda0d8719fe1c1d5dded60e00e6a10a3fab9f177ccbfc053c9daee81b7a95d6ba29044e1 SHA512 3283ebd7694be279f9956df31f6b1e62de3f674f3af0a6d4d5cc139f2cc04c3be322d103faaf1bf0f9845dbcc2f9a12e89d49178df48c90020267fec73f2ecd5
 DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
+DIST vilistextum-2.8.0.20191023.tar.gz 219266 BLAKE2B b94f3179f9181711fd6fe2a8240c7654917f7f93f161495b3380c840bff687714862116d15dfd3f1817a521f0c2d2730221084b6fbe7d1242d4285b2fe21b18b SHA512 a68410993e1b9d3d9dbdfb5677941bf2e95805573d210c510f65be5ebad00cb09f50ef5e592f25a34e535b32a44fc23265e839195316d0ac3c8c8c3b626bfe98
 EBUILD vilistextum-2.6.9-r1.ebuild 1834 BLAKE2B 393ebec6b3a0dca18b66ce9782232e2d0a83fa15107040096e58d1e54b58c9fcdd6c18f28e5cdb4699e869361c6725ec6e36ff7be0834d0a70b2ea913af7b12a SHA512 7ff7b37ef26ea0cb2d421e8e26091431cedec2808e5bd75844930c5714b00d370fb17e5eab30ab312644b8aed9c0003dacdd5cd1b6f7ac17c5921df94f69f8f7
+EBUILD vilistextum-2.8.0.20191023.ebuild 2001 BLAKE2B b210f25ac626818ee22c432ef72b24bec152b0b06235313a91bf5316fb6895343720f5026a4398d35aa700c80136a2a6800de803c0fe152cc1a89c0a9a4349cf SHA512 2d15b2be165252e030ce9559423ae9c1fd2da0b63a1eb8b19bb753126a2c489c7e0bd5ac2ec44c61849ea72898ad372164c9cbad875200aa8c9e821358d4b21e
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
new file mode 100644
index 000000000000..74d44309669b
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
@@ -0,0 +1,120 @@
+Many clients seem to use blockquote tags to flag quotes these days, so
+write them out as quotes, so they remain readable.
+
+--- a/src/html_tags.c	2019-10-23 16:25:27.000000000 +0200
++++ b/src/html_tags.c	2020-02-05 20:11:57.308596941 +0100
+@@ -261,6 +261,7 @@
+ 		line_break();
+ 	} else {
+ 		start_p();
++		quote++;
+ 	}
+ } /* html_pre */
+ 
+@@ -271,6 +272,7 @@
+ 		line_break();
+ 	} else {
+ 		paragraphen_ende();
++		quote -= quote != 0;
+ 	}
+ } /* html_pre_end */
+ 
+--- a/src/multibyte.h	2020-02-05 20:08:43.863715764 +0100
++++ b/src/multibyte.h	2020-02-05 20:12:34.401382354 +0100
+@@ -18,6 +18,7 @@
+  #define ATOI(n) wcstoi(n)
+ 
+  #define ONESPACE L" "
++ #define QUOTE L">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
+ 
+  #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
+@@ -43,6 +44,7 @@
+  #define ATOI(n) atoi(n)
+ 
+  #define ONESPACE " "
++ #define QUOTE ">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(str)
+ 
+  #define STRSTR(haystack, needle) strstr(haystack, needle)
+--- a/src/text.c	2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.c	2020-02-05 20:16:04.852164539 +0100
+@@ -28,6 +28,7 @@
+ int breite=76,
+ 	hr_breite=76,
+ 	paragraph=0,
++	quote=0,
+ 
+ 	tab=4,         /* tabulator */
+ 	spaces=0,      /* spaces at beginning of line */
+@@ -378,6 +379,12 @@
+ 			printf(" z0: zeilen_pos: %d\n",zeilen_pos);
+ #endif
+ 			print_zeile();
++			if (quote > 0)
++			{
++				i=0;
++				while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++				zeile_plus_wort(ONESPACE,1,1);
++			}
+ 			i=0;
+ 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+@@ -398,6 +405,12 @@
+ 			printf(" z2: zeilen_len: %d\n",zeilen_len);
+ 			printf(" z2: zeilen_pos: %d\n",zeilen_pos);
+ #endif
++			if (quote > 0)
++			{
++				i=0;
++				while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++				zeile_plus_wort(ONESPACE,1,1);
++			}
+ 			i=0;
+ 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+--- a/src/text.h	2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.h	2020-02-05 20:18:40.792261818 +0100
+@@ -26,6 +26,7 @@
+ 
+ int tab;
+ int spaces;
++int quote;
+ 
+ void print_zeile();
+ int is_zeile_empty();
+--- a/tests/test_functions
++++ b/tests/test_functions
+@@ -12,6 +12,9 @@
+   rm -f testcases/$prefix.output.test
+   ../src/vilistextum 2>/dev/null $args testcases/$prefix.html testcases/$output_prefix.output.test
+ 
++  # remove (block)quotes
++  sed -i -e 's/^>\+ //' testcases/$output_prefix.output.test
++
+   diff >/dev/null testcases/$output_prefix.output testcases/$output_prefix.output.test
+   retval=$?
+   if [ $retval -ne 0 ]; then
+--- a/tests/testcases/utf-8-sampler.output
++++ b/tests/testcases/utf-8-sampler.output.test
+@@ -100,8 +100,8 @@
+ ვეპხის ტყაოსანი შოთა რუსთაველი
+ 
+ ღმერთსი შემვედრე, ნუთუ კვლა დამხსნას სოფლისა შრომასა, ცეცხლს, წყალსა და
+-მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას ჩემსა
+-ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
++მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას
++ჩემსა ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
+ 
+ Tamil poetry of Cupiramaniya Paarathiyar: சுப்ரமணிய பாரதியார் (1882-1921)
+ 
+@@ -446,7 +446,8 @@
+ д, п, and/or т:
+ 
+  Bulgarian:    [ бгдпт ]    [ бгдпт ]     Мога да ям стъкло и не ме боли.
+- Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не вредит.
++ Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не
++вредит.
+  Serbian:  [ бгдпт ]    [ бгдпт ]     Могу јести стакло а да ми не шкоди.
+ 
+   ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
new file mode 100644
index 000000000000..a26ae7178184
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,7 @@
+ 											main.c main.h util.c util.h \
+ 											multibyte.h unicode_entities.c unicode_entities.h
+ 
+-AM_CFLAGS = -Wall -O2 -ansi
++AM_CFLAGS = -Wall -ansi
+ AM_LDFLAGS = $(STATIC)
+ 
+ EXTRA_DIST = kilistextum.kaptn
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
new file mode 100644
index 000000000000..e5cb3ba2a18a
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
@@ -0,0 +1,27 @@
+* don't look in /usr/local
+* try to hack around not being able to use AM_ICONV
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,10 +21,6 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(getopt.h) 	
+ 
+-dnl add /usr/local
+-CFLAGS="$CFLAGS -I/usr/local/include"
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+@@ -41,7 +37,9 @@
+ AC_CHECK_HEADERS(iconv.h,,
+ 			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
+ 
+-AC_CHECK_LIB(iconv, iconv,,
++dnl iconv_open_into is implemented only in GNU libiconv and not in other
++dnl iconv implementations
++AC_CHECK_LIB(iconv, libiconv_open_into,,
+ 			AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
+ 
+ dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
new file mode 100644
index 000000000000..a9c8a96a7522
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
@@ -0,0 +1,12 @@
+towlower is defined by wctype.h
+
+--- a/src/multibyte.h
++++ b/src/multibyte.h
+@@ -2,6 +2,7 @@
+ 
+ #ifdef MULTIBYTE
+ #include <wchar.h>
++#include <wctype.h>
+  #define CHAR wchar_t
+  #define STRLEN(s) wcslen(s)
+  #define CPYSS(dest, src) wcscpy(dest, src) /* copy str to str */
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild
new file mode 100644
index 000000000000..d77ae962a94b
--- /dev/null
+++ b/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+GITID="f299bb5e5f661c345c4b85a3e8de9ad8615ad17a"
+DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
+HOMEPAGE="https://bhaak.net/vilistextum/"
+SRC_URI="https://github.com/bhaak/vilistextum/tarball/${GITID} -> ${P}.tar.gz"
+S="${WORKDIR}/bhaak-${PN}-${GITID:0:7}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="unicode"
+
+DEPEND="virtual/libiconv"
+RDEPEND=""
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.8.0-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0-prefix.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0-blockquote.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0-towlower.patch"
+
+	eapply_user
+	eautoreconf
+
+	# wcscasecmp needs extensions, which aren't enabled
+	export ac_cv_func_wcscasecmp=no
+}
+
+get_locale() {
+	locale -a | grep -i "$1\.utf.*8\$"
+}
+
+find_locale() {
+	local l t
+
+	# we basically prefer to find en_US.UTF-8, but it may not always be
+	# available, in which case it is better not to hardcode to use it
+	l=$(get_locale en_US)
+	if [[ -z ${l} ]] ; then
+		for t in "en_GB" "en_.*" ".*" ; do
+			l=$(get_locale ${t})
+			if [[ -n ${l} ]] ; then
+				l=${l%%$'\n'*}
+				break;
+			fi
+		done
+	fi
+	[[ -z ${l} ]] && die "Failed to find a unicode locale"
+	echo "${l}"
+}
+
+src_configure() {
+	# need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
+	# isn't always returning the most sensical (and working) locale
+	econf \
+		$(use_enable unicode multibyte) \
+		$(use_with unicode unicode-locale $(find_locale))
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		emake -j1 check
+	else
+		ewarn "If you like to run the test,"
+		ewarn "please make sure en_US.UTF-8 is installed."
+		die "en_US.UTF-8 locale is missing"
+	fi
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	dodoc doc/changes.xhtml doc/htmlmail.xhtml
+}
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index 1dc92bc042a4..ce3af968dccb 100644
--- a/app-text/wiki2beamer/Manifest
+++ b/app-text/wiki2beamer/Manifest
@@ -2,6 +2,6 @@ AUX wiki2beamer-0.10.0-doc-examples-makefile.patch 641 BLAKE2B cbac271fbfcb8a41e
 AUX wiki2beamer-0.10.0-doc-man-makefile.patch 1441 BLAKE2B bfbf6c71f037d67359d1460a4e3c75b7b0a260252881efc2429ddc0b5aa90005c2c4bd36b18873106f9010803f765217f19a1575ee7ba5324ad53e52908a23d6 SHA512 b6ad3ce2b1435d79cce8a517e1a784399b349c4390c245d888b50acb2f5b89aaa49241d3687e4b5432fde7d433bf5ab5fb4bd1d4d96dfaa44358a6c0961bc76b
 DIST wiki2beamer-0.9.5.zip 443288 BLAKE2B a0263ba7044966ff45c892e9f0f78f6916346c051bf57cc8445f4127019cc4cd031719b1b5b61fc7d41a85b42439fa20cdf8fc35fbed43feb28d6d9797c781c7 SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7
 DIST wiki2beamer-v0.10.0.tar.gz 164911 BLAKE2B 0a532669915f0db5f1bb8755297bcd36e4175bc57d3b5f14df01566ac74e425c999447ff3f2bd20f2bcd50671bd65accfcf8049476a1656439fc46bab2becafd SHA512 712c719bcdd97f48c65aff1919f2e6a838a0beba1d2e5569063fd1f84bf68eda3137ac20e5dc463dff64c8b4656ce0bf02a0acea090b9a30262374cbee5db433
-EBUILD wiki2beamer-0.10.0.ebuild 952 BLAKE2B 998f98156e928746ce70b48523f145e92d6c06f5c5eda9abc0173802afc6d7cb23388994f5024edabaee4ef0b5404760cdfb7bdd0678b7435aaf135022bdc4da SHA512 6b50cc131a4ecc967c0bc0e806a4f5a9c4212d8e3efa5bf157cdf17b6cd2f919c738897c852939b7634f8500949514524a9f8b179ff26a724488cd131c8e52d1
-EBUILD wiki2beamer-0.9.5-r1.ebuild 790 BLAKE2B 3bb7fc5a147bc6233ce35fcc4e491a163a9644deb1728f851f3883f74e5085703faec6d5c95eb4015ea0d8472e171309d4ce83fb93f785891076dcf6f0f74457 SHA512 a14b02ab28c543ffc4805256a0a47c42d29072018dddc26b50e6d59f82131bba1816f479c2c917c6e6ae9744e9e4e7b1094255c6e09d744a67c122829e964d10
+EBUILD wiki2beamer-0.10.0.ebuild 946 BLAKE2B 21783eff4aa4eb1a981ed36a64c1ca0d10ebbf011d0e4d9c8e973117523cf112ee798a6dd2d476c87fb789df3d6073a4a5043fd674273deaae4094b302fe8b85 SHA512 1754372e1c4cc0c14988b515fa5f7cb8d42740af6e988d4af808c74ed1798232b83010aa68eb18240e3dfbeee1989d2a27516ece5ea5255564add3ed7662f9be
+EBUILD wiki2beamer-0.9.5-r1.ebuild 784 BLAKE2B 2d30ac44221d37aff5cf627805bafb0a07d106bd526ec9be8842789c1d89662e6059bd9a796a6af07b1e6cf5b08590fff4466f77da5609d28648c4a8a155e545 SHA512 2ce36544aa7ad33dc468ce4c6867e20867231e9c4066a7726c7f2e33fec43c3ddb82f77178ec1d414b55e1a6b2918c88e54cdb164e8618348ae7f05eaddfa985
 MISC metadata.xml 330 BLAKE2B 27059ed0cbe2bf10ad3b028d1f0e12b0617c0e2146432e375ccae5d570d8b1c1860bb9b9f36021a588ce859b7b30dfc04fb1f841890c549093687f3b6ad8addb SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1
diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
index e297abad055d..3d7c75757a2a 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
index 906911db6967..c87c19f7d575 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1
 
diff --git a/app-text/wscr/Manifest b/app-text/wscr/Manifest
index 7ea951bb2b0d..de6e6d2be52b 100644
--- a/app-text/wscr/Manifest
+++ b/app-text/wscr/Manifest
@@ -1,4 +1,4 @@
 DIST wscr-1.2.tar.gz 3502 BLAKE2B 4a6684dd6d9eb9c23caa92f9ddf62332f59b20eb4aba0f475015ddc7e66c592177b0d15ec25249fed86e2302a53463f59d608bd727d97bc33a42d903ecd04281 SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3
-EBUILD wscr-1.2-r1.ebuild 600 BLAKE2B d2dcd3d6d7a2d575c06560c70b48ab81e43bb2c2b74e467d8aab63cb486a2e21b14d412e0aa2b63277be18e1caa9d13e556afae25d0a188db75bb8e1c3c7117a SHA512 40793d93f075829e9533a6f534fe3118c5b3849439ccc7a238d43fefbd450f170fb6ab729db63c713dbc7cb061e97fce157f558ce062d80cab9bd04311c779ae
-EBUILD wscr-1.2-r2.ebuild 601 BLAKE2B 2eaceafa9ef3906dfa96411f372f6168bc0d88d8f044f7c2867b9f3d13d246b8baea2d5fece1fc20511e9585f92dfc1459aaba08a7992c63023e4dfb60496cb3 SHA512 c96e4b3d1718cd23b9b32c21a8063118b86531b62313e08d58c1667ac79496032025fe4720b98a5e9321cd7226d90c38df207426b028c01b0d761b96b70d1796
+EBUILD wscr-1.2-r1.ebuild 617 BLAKE2B 28ac56f2f2be79beb510b17485ba04b3b23851f7d8c69123472e4be7abb46be29457d0664f6dc4dc241fae42b8583ec320ee6f5358caf0f2f17e566c130fcf85 SHA512 a6cc22951901b485236ca86a637d87cd5aac52ec5b75c602ad04785fd418ca86b4af15d851e2a8c68ea9d52e65d6f6c7f136e55ed7914c8973b4b832646d5ad1
+EBUILD wscr-1.2-r2.ebuild 618 BLAKE2B 1f31256e75563d9dc010ff3c53163c83cd0fd6e914a6ed40cf22cddbca38b0979e3c58047aaf6877ee4d294e8ee359828810b8f13454a821148244e2cb0bd7f9 SHA512 a269f6a1f89461263d44d8f3b37744d9055d451ed05cb7028054215b0c21b3e74c5dbea7c0fc9a38f3c380907f1e59c282b649ec8f669e4bacb38777c41e5f68
 MISC metadata.xml 421 BLAKE2B dd48a7b914e790db0db06781519466d05de32f96ff8399e9fcb24ff040119dcec5380677910d9155c611c28203ac1ee7bf5d9602faeed69d4bff35a8cb1d6b3d SHA512 70722daa9c12a7e783b5fb3651f207c057648287e104739043f96c726820268ceb8e4ec211af9a3e2f8fcf7a5e03c9346cea7a25a70478dfdb60f333112b70e7
diff --git a/app-text/wscr/wscr-1.2-r1.ebuild b/app-text/wscr/wscr-1.2-r1.ebuild
index 70eae73fb6be..b68efd0dc49a 100644
--- a/app-text/wscr/wscr-1.2-r1.ebuild
+++ b/app-text/wscr/wscr-1.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
index 3a34f41b57d3..1760d0f73dd2 100644
--- a/app-text/wscr/wscr-1.2-r2.ebuild
+++ b/app-text/wscr/wscr-1.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 605c034a2e20..ff77f288f234 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,5 +1,5 @@
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
 DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
-EBUILD xiphos-4.0.6a-r1.ebuild 2045 BLAKE2B e5320b212660809ea9ea19cc7e0286ec13f6c7e4ef01cecb3e6800f9928568315a8336f6ae43d8107f4d94d028b60015072d27ffb6ae71405a18efb3fb1ed55b SHA512 f7385bb06286a2e1e8788a57aee2482f862f80db80d161835b9a8adb9b264bd12061ca555cd25318a5b1dfb27905a4e348270a44784e67669de591601c5d52ab
-EBUILD xiphos-4.1.0-r1.ebuild 1998 BLAKE2B 93bdf30b0e63b752047f170040b08fc3af5a1736ca3d18e62c4afb1c21b7705d92064c500a10c1c13b1282f372e4fd96f722e5d65c86fbc68234ce886c6e19c7 SHA512 c35fdfdf4911a571c9a4e9ee9ebc139ac3b509bf0bb8c8f5530852f4799355e97c9f730ba281b70965279a315de801681a6d25f22d40fe84f2697bea094d6d80
+EBUILD xiphos-4.0.6a-r2.ebuild 2131 BLAKE2B bcdc3613b78e9a3470304850a2f08b0009023d5eb9a908d0da5ab67d7e5becadd1d36ae0a464156b5df90b03db8416819c03c6680c8c5b6a612d618c6ba65e38 SHA512 de1c4be35149ff30ed202b7eef9297ad3354a0ef25022956ceb1a15f42fc5ab82408496780fb85e590aea5d9ede765067a8860b875f5bfa066ac07c86d6c03aa
+EBUILD xiphos-4.1.0-r2.ebuild 2084 BLAKE2B 47aab3f5421ef3d4c9b4e62aabadb7bc62d35427f16f2e1b2f2744947672c2ec890c27f998628c57f911e41a5e62d932e581a16b9576a2d3e138fab50310acd3 SHA512 cd2655a7d8c0fc95813ca737d7dfbf26730327a23f4d04f24c719fe5b8b220b3d397f3dc201ec60c2b2dfd07ae2777626139644df455938a7a460df096207a86
 MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
deleted file mode 100644
index c131ac2b16a7..000000000000
--- a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20170820"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	dev-libs/glib:2
-	dev-libs/libxml2:2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-util/intltool
-	dev-util/glib-utils
-	>=net-libs/biblesync-1.1.2-r1[-static]
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
-		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
-		wscript || die
-	default
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--debug-level=$(use debug && echo debug || echo release) \
-			$(use dbus || echo --disable-dbus) \
-			configure || die
-}
-
-src_compile() {
-	./waf -v build || die
-}
-
-src_install() {
-	./waf -v --destdir="${D}" install || die
-
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
-
-	dodoc Xiphos.ogg
-	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
new file mode 100644
index 000000000000..4ca64d0c5aae
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20170820"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.4
+	dev-libs/glib:2
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
+		gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
+	')
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/rarian
+	dev-util/intltool
+	dev-util/glib-utils
+	>=net-libs/biblesync-1.1.2-r1[-static]
+	virtual/pkgconfig
+	sys-devel/gettext
+	$(python_gen_cond_dep '
+		app-text/gnome-doc-utils[${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxslt[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
+		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
+		wscript || die
+	default
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--enable-webkit2 \
+			--debug-level=$(use debug && echo debug || echo release) \
+			$(use dbus || echo --disable-dbus) \
+			configure || die
+}
+
+src_compile() {
+	./waf -v build || die
+}
+
+src_install() {
+	./waf -v --destdir="${D}" install || die
+
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
+
+	dodoc Xiphos.ogg
+	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
+
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.1.0-r1.ebuild b/app-text/xiphos/xiphos-4.1.0-r1.ebuild
deleted file mode 100644
index 355ed3f118cb..000000000000
--- a/app-text/xiphos/xiphos-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.8.0
-	dev-libs/glib:2
-	dev-libs/libxml2:2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
-	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
-	dev-util/glib-utils
-	dev-util/intltool
-	>=net-libs/biblesync-1.1.2-r1[-static]
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
-		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
-		wscript || die
-	default
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--debug-level=$(use debug && echo debug || echo release) \
-			$(use dbus || echo --disable-dbus) \
-			configure || die
-}
-
-src_compile() {
-	./waf -v build || die
-}
-
-src_install() {
-	./waf -v --destdir="${D}" install || die
-
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
-
-	dodoc Xiphos.ogg
-	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
new file mode 100644
index 000000000000..159e9351269a
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.8.0
+	dev-libs/glib:2
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
+		gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
+	')
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/rarian
+	dev-util/glib-utils
+	dev-util/intltool
+	>=net-libs/biblesync-1.1.2-r1[-static]
+	virtual/pkgconfig
+	sys-devel/gettext
+	$(python_gen_cond_dep '
+		app-text/gnome-doc-utils[${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxslt[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
+		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
+		wscript || die
+	default
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--enable-webkit2 \
+			--debug-level=$(use debug && echo debug || echo release) \
+			$(use dbus || echo --disable-dbus) \
+			configure || die
+}
+
+src_compile() {
+	./waf -v build || die
+}
+
+src_install() {
+	./waf -v --destdir="${D}" install || die
+
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
+
+	dodoc Xiphos.ogg
+	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
+
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 8633386d8e19..1d02eba32a17 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/automatictexplugin/Manifest b/app-vim/automatictexplugin/Manifest
index d9e8ade29fa8..6220d2d1d02f 100644
--- a/app-vim/automatictexplugin/Manifest
+++ b/app-vim/automatictexplugin/Manifest
@@ -1,3 +1,3 @@
 DIST AutomaticTexPlugin_12.5.tar.gz 442431 BLAKE2B 8e6c199df24336f318d37248d96f1f1c953c9f0d0e6cd05f1891403b896aa3ea870dcd9ac72c530aa3779e65804f318bfec6ca769592091dc29cba25b2371316 SHA512 93e48b3d7eb9bdc0319bf03d0ddc59f49c2aab63170030b4234fa83aa3aeb739f1384c4a94e09e630b82d328d9cbfbbdfbf493e6decff915ad9cd4d5b2fc3a5b
-EBUILD automatictexplugin-12.5-r1.ebuild 825 BLAKE2B 5c0a06bd07f68d396b66552c5159e945e3137dc70adad006396bb3adb50aaf359a7a181f009a380830caba6a343b0951afde277f12e267a8d95c7c23e2f48156 SHA512 129af107a67db846ed10fb3b82b2e08e141d836b5d1ad673266457c5d3d05a658c6c48ccfb7efe722f229fe9baa376733efaad28bf72787b74a6ad36d3cfb442
+EBUILD automatictexplugin-12.5-r2.ebuild 879 BLAKE2B e3f98b2d5f419ba755e2d6a773d8f633daeff6091c13335228068ed41de520cf0ecd0e2e919498853e6274d4f2f7b2d041d92a1dd2a516b197f9a668349afbfb SHA512 0f3c9ec25b8214a95a064d5c0bbdbc2ba4a8caeb56aa0a85b1dc575cd5a6200467d3699e9f161625eaaec77828716b4121e800900269fcbd367236c78d3dc411
 MISC metadata.xml 326 BLAKE2B 06ff44159678364bab7d0bbc453b9ce39504c5b70b23438919f8fe449a60aa8e1755624bd7474073dc9f2f1135a403d207765171fde940d3c5e56d7fb1019f0f SHA512 8ed4ff2cf60c6e0c39bb3c60c4f9ad4f1a5b6888192bb43fa9f0fb45efd89a549de839c60678bfbe6ed2353f594ea6b28b53f63ae2530650c0ea563325a0f5ff
diff --git a/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild b/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
deleted file mode 100644
index d3a67dadea3a..000000000000
--- a/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 vim-plugin
-
-MY_P="AutomaticTexPlugin_${PV}"
-DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files"
-HOMEPAGE="http://atp-vim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/atp-vim/releases/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-
-S=${WORKDIR}
-
-VIM_PLUGIN_HELPFILES="automatic-tex-plugin.txt"
-
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
-	!app-vim/vim-latex
-	app-vim/align
-	app-text/wdiff
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-tex/latexmk
-	dev-tex/detex
-	virtual/tex-base
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
-	python_fix_shebang .
-}
diff --git a/app-vim/automatictexplugin/automatictexplugin-12.5-r2.ebuild b/app-vim/automatictexplugin/automatictexplugin-12.5-r2.ebuild
new file mode 100644
index 000000000000..d32b783b6b13
--- /dev/null
+++ b/app-vim/automatictexplugin/automatictexplugin-12.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 vim-plugin
+
+MY_P="AutomaticTexPlugin_${PV}"
+DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files"
+HOMEPAGE="http://atp-vim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/atp-vim/releases/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}
+
+VIM_PLUGIN_HELPFILES="automatic-tex-plugin.txt"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	!app-vim/vim-latex
+	app-vim/align
+	app-text/wdiff
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-tex/latexmk
+	dev-tex/detex
+	virtual/tex-base
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+	python_fix_shebang .
+}
diff --git a/app-vim/colorv/Manifest b/app-vim/colorv/Manifest
index b90b9d88cd3f..e068069847dc 100644
--- a/app-vim/colorv/Manifest
+++ b/app-vim/colorv/Manifest
@@ -1,3 +1,3 @@
 DIST colorv-3.0.2.tar.bz2 47059 BLAKE2B 2a84b264085d61f02d3ec881bd1f097d11f23286f53f52e46db468f3bb49df94dcbb9a3514bbbe143167fc597f871064dc998665a25796c43d000c051a62debb SHA512 cb4a893d65bbada5cec27c0810bf3e78db3c64e64f4179529d5da30402ab65b141f53dd7f2a9e8bbccf3d5f7dc5843afc7cab0d908e66a86fc41a5c38c9a848e
-EBUILD colorv-3.0.2-r1.ebuild 950 BLAKE2B cdfcdc7dc3194f2df142652c5c0aff747aae19c03b2706584b80fa4cf070e42b10ba2fe6ac6aeb6fd1d1e798360d8b26761c803c40100a7dc797904a8680ff67 SHA512 703c0521578c74c3b4a533faadb28419ba8e442d2cfcf97c85b5026d483ca09a82587ae3f925dfbfa2fc21c5c43dc82062fbc84b967e71d52e1a25c0e9c36fe0
+EBUILD colorv-3.0.2-r2.ebuild 1011 BLAKE2B 7ba5342cb4601b9124767fea12dc004c1ccf9f77ea96093133977eeb7a538bc68cea62f6dc259ec52cf512b8fbe7ac38335ed4689171418ad7379edf763720ae SHA512 09ddef248e432ecab47afdfe9031e13350d11bf91f0aeb002cb159ddaeaf919a59673c5e18f1c44bd1d903a1b455e415314cf5ccde72894b2a1488ba1d9ac45f
 MISC metadata.xml 332 BLAKE2B aadba68bd1f0ea3b25ff5b0e807175ec9438e0b10479b539ad60199e9ea3c4442ab45dba549b6507b98b5416d4a65cf981d750cb8698b219e56bb792da616543 SHA512 f7665a682723f68af0fb47584b8442216937a348a9bee52959209cdb44de6d79453ef4029c0ae536371e5a2292624d1cad8c2058d569c703d4f2fa17c0eef0d9
diff --git a/app-vim/colorv/colorv-3.0.2-r1.ebuild b/app-vim/colorv/colorv-3.0.2-r1.ebuild
deleted file mode 100644
index 7f371d403d8d..000000000000
--- a/app-vim/colorv/colorv-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# TODO: supposedly supports python3... but that conflicts with pygtk
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: a color tool for vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		( app-editors/gvim[python,${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	)"
-
-src_prepare() {
-	eapply_user
-
-	# fix shebangs in Python files (note: one of them is python3...)
-	sed -i -e "1s:python[23]:${EPYTHON}:" autoload/colorv/*.py || die
-	# use python colorpicker instead of C-based picker
-	rm autoload/colorv/{colorpicker.c,Makefile} || die
-}
diff --git a/app-vim/colorv/colorv-3.0.2-r2.ebuild b/app-vim/colorv/colorv-3.0.2-r2.ebuild
new file mode 100644
index 000000000000..2f7155bb1008
--- /dev/null
+++ b/app-vim/colorv/colorv-3.0.2-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# TODO: supposedly supports python3... but that conflicts with pygtk
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: a color tool for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		|| (
+			app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+			(
+				app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+				dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')"
+
+src_prepare() {
+	eapply_user
+
+	# fix shebangs in Python files (note: one of them is python3...)
+	sed -i -e "1s:python[23]:${EPYTHON}:" autoload/colorv/*.py || die
+	# use python colorpicker instead of C-based picker
+	rm autoload/colorv/{colorpicker.c,Makefile} || die
+}
diff --git a/app-vim/conque/Manifest b/app-vim/conque/Manifest
index df987dba3e70..c74aa4f6a4a7 100644
--- a/app-vim/conque/Manifest
+++ b/app-vim/conque/Manifest
@@ -1,3 +1,3 @@
 DIST conque_2.3.tar.gz 52195 BLAKE2B 31546d8e0797525cd05a4663f3598a11cbb5dd7dcc6fabf181d277e2cab88593e1458f5e646688e9e46a8d01952eb1383f358454200d59634c40920b93b7db9e SHA512 b69c0564ccaf897ee2f18d0769877986e67006cf33dbefe2bbc85261726372f09669d19aa118de58ccfb847cc8b7e670e25c030128eec665e1cecf0a96cb4b89
-EBUILD conque-2.3-r1.ebuild 666 BLAKE2B bb212862c205a66a1c106bdb99e5e027c1b4f727a45c16004edfd3c6bd5c3df485f4ba192c3f526be1d0ff9faf4f1091e44e072be95f38a0e86e6da00407466f SHA512 f5a3d6dceadab4cb80debfe16363f4830eb1aea4520a34c2efd7c2e9540cf482278608f7be706586308dde7c5095662138743254411ee0cdc217c092fa5c3719
+EBUILD conque-2.3-r1.ebuild 687 BLAKE2B 04ba99fca5c2aaf5ec798819988c4574398030689d7424b37bcc93ad785cf1c8cd8b982bdd21edce609c6b73c615960799dc1c4199be0013b6f2227411225ab6 SHA512 a18795efde16110c82cd88ad5cdb9fdba62e0b3f8a5af8245db20b4e53834751ebb6b0428ef6473206ed9495154762b582eac367a12204ad2c61d9e9d00be322
 MISC metadata.xml 325 BLAKE2B d9e43a221c8ce8ec5a6cdfbed4c1d76cbebc9922587a1414a9bd09a14dbe1462ce2bad738ca2fa74e21686e20dc1c05a6dac2faf91abe29beb4ccc046e2014c1 SHA512 6bbcbd15af2e070d8b377cb9ce8d267b4321c895375a874d77cc85f6d9ec5aee8787415f3799b93801aa748d10a15e64968dab7ace10d9f19d48c252d2b2e4a3
diff --git a/app-vim/conque/conque-2.3-r1.ebuild b/app-vim/conque/conque-2.3-r1.ebuild
index 970df3e6eb86..ff3d95216cca 100644
--- a/app-vim/conque/conque-2.3-r1.ebuild
+++ b/app-vim/conque/conque-2.3-r1.ebuild
@@ -15,7 +15,11 @@ LICENSE="MIT"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
 	${PYTHON_DEPS}"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
index e005d4b0e112..c48f5a7347c2 100644
--- a/app-vim/editorconfig-vim/Manifest
+++ b/app-vim/editorconfig-vim/Manifest
@@ -4,6 +4,6 @@ AUX editorconfig-vim-0.3.3-python3.patch 5601 BLAKE2B 4a9bee66b7b3b2b016d13a557a
 AUX editorconfig-vim-1.0.0_beta-wildcard-slash.patch 808 BLAKE2B bc35a580b10a9fcad5916197fb891fa4b9bb8abf7842fbd292b2a91dca60f95282b1bddb365d2286bc2eda4b4a8d922e8aea89312aafbce3a039288adb112e71 SHA512 004f27b01d0f8bd2a71687ce2c09bc70895377034775ee7b2705874d2458cacf36b5d1300d6ed9e1a6925b33428c7a208e223e4f65824cd3bedf56b938c7bd92
 DIST editorconfig-vim-0.3.3.tar.gz 35395 BLAKE2B a7b65c1472024017dd408e5c4ac5048004d0bd55f44c7cfba49b5973cb445125ed89cc3d4363fb902a4c5fbb507f3ee5ed0ca48aece3fb6915e643bae0dbf70c SHA512 2dd968cf6bb162db8e6242ffb60cc61fb05a8042804b6b46b9f9cd35be968f83b473f04797e47c5cff11d7c052ff523bf8ba1d568992d44b72b97b54a81425a1
 DIST editorconfig-vim-1.0.0-beta.tar.gz 31519 BLAKE2B 2d5e8e55e8dccc0b45453b8da9ecad80867a84d1ea20146581886f793c093c201521a7d1d4451122ae441d30f58acec28d29aa20da9de737b5beb7f44d55c0ed SHA512 159e3ca32a7ffe71853ba62a14d0469310b81345b0e704dd6a9f42c56f6f6b9a3f63502ccabcf43a15443acf4acefdaf078063ae747f49315b89f5518d7f9816
-EBUILD editorconfig-vim-0.3.3-r2.ebuild 934 BLAKE2B 155150d1a69046983912213b39845e903db3b8fc300b2b730026eb980f24e88f37cc9865f3426826a90ccbacf83d293ad92854de8036b0166ecd3ad147d54d0d SHA512 6b3c96e74dfa6e15b1c733a590e3b04b3b9372804fb12dcc194ab0cc61608dc69019191ded4e0cfa5970e7a4aa3c98560f4522a536107e26e45ccfcbce67c08b
+EBUILD editorconfig-vim-0.3.3-r2.ebuild 984 BLAKE2B 4d5151da95882cc23e8d05553e52ec6c926e9d3b8167d6509846bc76f9ebc87b6797c0fe928ec48bae0b711d46fdc416e2de835b0f9ba7a5887b866325899fba SHA512 5b989484463ab68fc9a07d90174a79b7a8cd0d18bf817b2403ff6505d04cdb710f668cec5cbfacdcab8c1a9df10ac3214aa3a651dab5aed0c27520a4c26a84ff
 EBUILD editorconfig-vim-1.0.0_beta.ebuild 781 BLAKE2B 2580c0c64c53203e5e09fe72459239b8992f5f644c6d0af485525fc445417fef88fdd62adb22019066dc6860ae84be82f01a1febbc2742808e6b84e529f4a14f SHA512 eda756f5ae0697fba4cee959571ef3314f575b6d11c1aa1023f71cd3bbed9c147f8d210235ef306af74e6988849cb242d8baf45ceefb19421ccaa0b3eb3ea13d
 MISC metadata.xml 419 BLAKE2B b73a8d7814d585826406516eff8e391fbeec6b1da25bb5b583ad65709260819753bba45f88cafd3c7337854843ce7aa02a8f00f9ab49973c0bfa422e4ef801d6 SHA512 57167b4b86b6bb89094b28341476c03f8415c1dff97fd90f91c882991afe5e33fbd14edd38a18e07d06f3498f070ced5ca9e598b66e7e615c37146b598b6282d
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
index a3f80d6cb8c4..006508da113a 100644
--- a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
+++ b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
@@ -17,10 +17,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	${PYTHON_DEPS}
-	dev-python/editorconfig-core-py[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/editorconfig-core-py[${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
 
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
index 44e83b1df93e..0a772b82198e 100644
--- a/app-vim/eselect-syntax/Manifest
+++ b/app-vim/eselect-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
-EBUILD eselect-syntax-20070506-r1.ebuild 573 BLAKE2B de496253ba0762399e52d3642e2b7c04dfbf676eff946985bf929313030e3a80d4cad91ca143bd76f8d792f9baf8cd45be088abbd404d3cfbe45dee06c8f27fa SHA512 e7b7e117b9a92bc88ba56438c76364cbee6d0ca7f4deeda5acb58152e4f262b7783ed67f2fddafd31a1980669783549a1d829e53ee38294bdc4657ab030f1350
+EBUILD eselect-syntax-20070506-r1.ebuild 590 BLAKE2B 21f9a68ba3b03b35861cd9585c2ea3d76bb0fa71e9f5ce8ad912eb5b1d83b1192b968e78a815bb62b0aadbea5b088b9bb5a327d480746b81dcd496c2c272c767 SHA512 519e6dc3dee4651f81ad1b53f7bf97259ce3204fc02ad0f38a3fadc444a47a467c198df81c20f3502e17110201958d18ad1b625d6e4cec66df1d5fe840a15310
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
index ea10ddd21780..f6378382284d 100644
--- a/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils vim-plugin
 
 DESCRIPTION="vim plugin: eselect syntax highlighting, filetype and indent settings"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="vim"
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
index f6e8a3a04fdb..5ba30bec618e 100644
--- a/app-vim/gundo/Manifest
+++ b/app-vim/gundo/Manifest
@@ -1,5 +1,5 @@
 AUX gundo-2.6.2-python3.patch 395 BLAKE2B b39d17b6046f59d9a89fc89f4f6b941fb78777a98525993a046241f780087cf3450833cd966a42354a3d1f26a0171c5ed0d57aa11606ab42c9f04d44aaeafbfc SHA512 0fc80a6ade3a2b53843444a4ec9404d4d1ae54d5add0c5807a49c7a6818282f73c5635df69167a7f5b02da8b198bf83466f7b4da17f5d16f225a72081bd61df5
 DIST gundo-2.6.2.tar.bz2 144107 BLAKE2B 7915a60a77e07e49cc1a214c6e250028e61ff33e6f085960836a3e49c1562f4ff713ff4c57125f677d352ae3477bb514fd94d636ee5ba9afac5d23c4ecd70029 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4
-EBUILD gundo-2.6.2-r1.ebuild 763 BLAKE2B 475944514327afa9c6ded866d535b4087e068ae8bd6f47f61501912f2101628fb011e8ec919da9946524fb10216a29845c228f77af1d783b83e4121b02a8171d SHA512 0d512e790e4cb81ea73e1015c40d86084a485cd084003b71a2fa98465134a6937dbfff649b88eb4300a78cab5b6da63684368504f0a41f545a145e1980c6b3a2
-EBUILD gundo-2.6.2.ebuild 715 BLAKE2B d17f051fd9c56d9e20b91b63ecfc1c14231fe74c22d9847ee01151cf3662810324437d1c44aa7fdbaf57727b5013de447719cff542de3bbc632b4e9a10567d27 SHA512 cc9056ab97e1e31a34176960c782f0f86f242affdc7863c9562f1eee4c623082eda7c91c922dd655808d30985e348bdb923c133bf565c875fa978df8783b11b3
+EBUILD gundo-2.6.2-r2.ebuild 729 BLAKE2B 7258e63f666c6a2a9470830d1066f72109cf4a5a2275a33989fe2e732a0b31818bc1e55b60dfb112c31d6d0e5979e206443d3c672693d85b676ce84244c45fa3 SHA512 8645215b5d72cb5cde46318cd1c7b542a99191b2611a41a162eabb76c35aff2c9f1887e311fb833f92c9e736ffdd313e8d0da0bfa5410a7c0cfabd4531ef2435
+EBUILD gundo-2.6.2-r3.ebuild 777 BLAKE2B b683fb073a2957142b9f0aec041edfaaea4594427c503db286878e6e0e47509eea8fbd101132ccbd3b3010eb5e2c55716b88698de4d3af9c48a1589858cb6034 SHA512 4191fee5a4c5bc1ff16a45fd443f5566750baa9125ba57bf4372cb1ea2aad314be0933cc17a954c0e33a16ac3a57cc0fdfba9beab6a871f5cc95f5af9cf7dc83
 MISC metadata.xml 337 BLAKE2B 08b3c90ab9c289b83c58c3c67fa09f3306082e9d660b8ac81e75f14a44d434fec2657ca4f21ef6660ae46923abe92053a22b404ee9fd443b34775191a999a7e8 SHA512 14459476fa97a611646909941de602646af184e1de555dfff407e71b8fa935c23b5f863b58432be84c31378badabecf8893eafd454d06f8c57759a3bb8035854
diff --git a/app-vim/gundo/gundo-2.6.2-r1.ebuild b/app-vim/gundo/gundo-2.6.2-r1.ebuild
deleted file mode 100644
index 3140f0d8ba4b..000000000000
--- a/app-vim/gundo/gundo-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit vim-plugin python-single-r1 vcs-snapshot
-
-DESCRIPTION="vim plugin: visualize your vim undo tree"
-HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
-SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)
-	${PYTHON_DEPS}"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-PATCHES=( "${FILESDIR}"/${P}-python3.patch )
-
-src_prepare() {
-	rm -r .gitignore .hg* package.sh README* site tests || die
-	default
-}
diff --git a/app-vim/gundo/gundo-2.6.2-r2.ebuild b/app-vim/gundo/gundo-2.6.2-r2.ebuild
new file mode 100644
index 000000000000..4dfdca739ac5
--- /dev/null
+++ b/app-vim/gundo/gundo-2.6.2-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: visualize your vim undo tree"
+HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
+SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+KEYWORDS="amd64 x86 ~x64-macos"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	${PYTHON_DEPS}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	rm -r .gitignore .hg* package.sh README* site tests || die
+	default
+}
diff --git a/app-vim/gundo/gundo-2.6.2-r3.ebuild b/app-vim/gundo/gundo-2.6.2-r3.ebuild
new file mode 100644
index 000000000000..fa78d2605c20
--- /dev/null
+++ b/app-vim/gundo/gundo-2.6.2-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: visualize your vim undo tree"
+HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
+SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	${PYTHON_DEPS}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+PATCHES=( "${FILESDIR}"/${P}-python3.patch )
+
+src_prepare() {
+	rm -r .gitignore .hg* package.sh README* site tests || die
+	default
+}
diff --git a/app-vim/gundo/gundo-2.6.2.ebuild b/app-vim/gundo/gundo-2.6.2.ebuild
deleted file mode 100644
index 0c3b69a6049a..000000000000
--- a/app-vim/gundo/gundo-2.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit vim-plugin python-single-r1 vcs-snapshot
-
-DESCRIPTION="vim plugin: visualize your vim undo tree"
-HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
-SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86 ~x64-macos"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)
-	${PYTHON_DEPS}"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	rm -r .gitignore .hg* package.sh README* site tests || die
-	default
-}
diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest
index 167cdda2da2c..9c322bc4a3f7 100644
--- a/app-vim/pyclewn/Manifest
+++ b/app-vim/pyclewn/Manifest
@@ -1,5 +1,3 @@
-DIST pyclewn-2.0.1.tar.gz 124914 BLAKE2B e1dc12174d2ac640476a36714a8ef221f64db4b19c9509a179bc0cf573200de0f1f888bcc3bb69f433064e2de2d881845099f609468e12ed72e5c547623d44e5 SHA512 996acbedbb7922109925f188efba4c71e83f1823c029f92dc00bb21449f024232ef55df0c74a9fd4bfa7229523ed9ad4301aa9dbb8a3c20424082fc6939f63db
 DIST pyclewn-2.1.tar.gz 129697 BLAKE2B 0dfef92cb36ea9fa89c7f0d85ed45e21c634732fc2d3d888dd792de22529bea86719f8ac8ed870dd5ab00efbfdb08011013a36880781abf9e0c64a62b2aa301a SHA512 346b98a9e37957a5bf97b8901247f56fa8e38bddac38727867773cf4e78e555d6a85848c4c400d1faf1159ba61122cfd4931c95a67e3b2abdfaae7996beb4f1b
-EBUILD pyclewn-2.0.1.ebuild 1048 BLAKE2B 6c2cf7d1cbda3ecfc26a217b6cabc4823ab722cbff6c07849d669d2f6153851ca1c6acb98c52314e0c4a40175283104f02de5156d4e09a96615371c85da08293 SHA512 35af5d02607e69b5a287607aca6561a51822d929b4a7549bd6e591777a33751748ad5f46ecf4c9d4bef1cdb36492c8e8e6643e8fb3052eb66778716c62e1eecb
-EBUILD pyclewn-2.1-r1.ebuild 1109 BLAKE2B 5dc0509349899c2551e33fb6188112f07b16321fbf6d7a822062d7e02d0bdfc1ef29edefcb97fca570940e918e6f82fd157655f169c32d910a142e2b37693ee8 SHA512 b7dae7a31a43986b65ee42eda290b3f4ba7ab0ff02872a738b9cae7e37cbc239ca4be96db68927cdddcf8e839cc2e87a11c315094de11bbf02bea466ec456308
+EBUILD pyclewn-2.1-r1.ebuild 1103 BLAKE2B a28594428383a1005b95f9244c590511cebd508e7f63a635e243fe3436e8bfd9a2a7d312c47321a2be433877978192c8014b821191dedc8ce1b34b5673bc48e9 SHA512 5ee737d51fa4249f7349c16a7dcf508d699abb0a26156ad35e490790eb9c8439752414e7b99220b251e6156cfa58cb4bf79a1cbcd5459b691cd577e837040da1
 MISC metadata.xml 499 BLAKE2B 4955bd7a080dc2ae909143477040d191cb48ab4badfd47b6b7c11fd4686139bbbe77475f005e10c3b2bba50d0615b94600a55cda57a7d02ecaaffe1e504219dd SHA512 30b127677f0d5a9afce208e5cbb00c9b98f6d7e771ef273155f9acad764da789e71249289104e8006420cf5ff62075bb7572527150f9b339e0e51cb219c76a81
diff --git a/app-vim/pyclewn/pyclewn-2.0.1.ebuild b/app-vim/pyclewn/pyclewn-2.0.1.ebuild
deleted file mode 100644
index fb63112b6704..000000000000
--- a/app-vim/pyclewn/pyclewn-2.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils vim-plugin distutils-r1
-
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-DESCRIPTION="Pyclewn allows using vim as a front end to a debugger (pdb or gdb)"
-HOMEPAGE="http://pyclewn.sourceforge.net/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="|| (
-	>=app-editors/vim-7.3[${PYTHON_USEDEP}]
-	>=app-editors/gvim-7.3[netbeans,${PYTHON_USEDEP}]
-)"
-DEPEND="${CDEPEND}
-	app-arch/vimball
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep \
-		'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
-"
-
-SLOT="0"
-
-#Completely broken (runs vim), disable for now
-#python_test() {
-#	esetup.py test
-#}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	vimball -x -C "${ED}"/usr/share/vim/vimfiles lib/clewn/runtime/${P}.vmb || die "Extracting vimball failed"
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	optfeature "C/C++ debugging" sys-devel/gdb
-	optfeature "Python debugging" dev-python/pdb-clone
-}
diff --git a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
index d8c0d5884df9..82746ceb4849 100644
--- a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
+++ b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils vim-plugin distutils-r1
 
diff --git a/app-vim/slimv/Manifest b/app-vim/slimv/Manifest
index 3f37ab7e0cfb..efd208d67be6 100644
--- a/app-vim/slimv/Manifest
+++ b/app-vim/slimv/Manifest
@@ -1,3 +1,3 @@
 DIST slimv-0.9.13_p20170910.tar.gz 634493 BLAKE2B af7963e1d1b60b20294c935ecd076220777eec333b4e91bac82a111b727ce71c312c347b865f9e0c9072c0f94b40dc920b15feaf10f8683e1bba7590a177e62e SHA512 562e08866d62a6af5c20064a4533da7f0577ceb43391fac59acc0bb9c76319e3520c951c325277edbb2d0461fa227b91456c54ec5d9d1e3bca18d344f3e9a5e2
-EBUILD slimv-0.9.13_p20170910.ebuild 996 BLAKE2B 412643972587fd97dfdcd2e61fb30ab5642be1f3fb964b955b95d656948907d13916f52a35b79c366d8231321c8191b6b1826ab3f7dd9b0b51241b5a8849d932 SHA512 5d3d6ade3c3565c34db01f21e6649fad364f323bdaff36df8e2f4b0396592a5378c043562168716ae23a2717f89e7594eccfdf7b3203df03311aed9bc865d216
+EBUILD slimv-0.9.13_p20170910-r1.ebuild 1010 BLAKE2B 1f7791f1d7d17a9b38df7242dbd38749ed46dc7c081ec912cd7274f9e693f63c74425d460024d66cb9f5b36db60484db559b7a7fc8806df1120ad546d14cf81f SHA512 df500baad06d612685981a2c474d9985409676962e246fe703174071279c7659c0f31db617070749923d3f9d6cc2e615324beb811e8dda878dc2963c0d24a381
 MISC metadata.xml 1220 BLAKE2B 7d60a456299acdd198b51276a1016fec37007bdb6220efaa786889b0d046de73d14724e2a8bd5efaec84e0c850ff69bdaf344bbedcafa132a0a8c0c45fad051e SHA512 11c6fb3a83ea65ea97e57e70b24d9e011d48fb456bff15ea8b501e0dab767f73c78ae1c63e662423599252dee9969c1983b17fd1505533b3ee26f3afde2a3b29
diff --git a/app-vim/slimv/slimv-0.9.13_p20170910-r1.ebuild b/app-vim/slimv/slimv-0.9.13_p20170910-r1.ebuild
new file mode 100644
index 000000000000..82a26de9ea02
--- /dev/null
+++ b/app-vim/slimv/slimv-0.9.13_p20170910-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin vcs-snapshot
+
+# Commit Date: July 10th 2017
+COMMIT="acf9b30be71c54db4f4875d257b905941ca69ed8"
+
+DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv"
+SRC_URI="https://github.com/kovisoft/slimv/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	${PYTHON_DEPS}
+	|| (
+		dev-lisp/abcl
+		dev-lisp/ecls
+		dev-lisp/sbcl
+		dev-lisp/clisp
+		dev-lang/clojure
+		dev-lisp/clozurecl
+	)"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	# remove emacs related files
+	rm -r slime swank-clojure || die
+}
diff --git a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild b/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
deleted file mode 100644
index ab6f8f4b3d30..000000000000
--- a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vim-plugin vcs-snapshot
-
-# Commit Date: July 10th 2017
-COMMIT="acf9b30be71c54db4f4875d257b905941ca69ed8"
-
-DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv"
-SRC_URI="https://github.com/kovisoft/slimv/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)
-	${PYTHON_DEPS}
-	|| (
-		dev-lisp/abcl
-		dev-lisp/ecls
-		dev-lisp/sbcl
-		dev-lisp/clisp
-		dev-lang/clojure
-		dev-lisp/clozurecl
-	)"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	default
-	# remove emacs related files
-	rm -r slime swank-clojure || die
-}
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
index a134bc35a846..7cd59f91ad8a 100644
--- a/app-vim/splice/Manifest
+++ b/app-vim/splice/Manifest
@@ -1,4 +1,4 @@
 DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
-EBUILD splice-1.1.0-r1.ebuild 895 BLAKE2B d0063aa7c5d4788216974c034c426837954c162b3f192b13a48c64ba2912216628a3514e8201d40dc1ef70805ba9f49cdb91303ff37bedfb137b749de3bed3ca SHA512 270cbbb682bdcc9dfb1a25a883085807611e090405d6351d4ed9dc3eeace4107a736b85c9ca28bf1019aead61d6058389b4f6b373e9accf3a8c0a39ef03b8dfb
-EBUILD splice-1.1.0.ebuild 886 BLAKE2B 1465580ca5ac656b5f400911dffd513c09795a9f7aaeb96bb5de7316bcb1f9a86a0904a69f416ccf7a6bf5c93604ee2c543761a9cd2ca5b030ef1f0b9d6724b6 SHA512 3bd938952eb3155f5430d0b98afbe8fa3e41e27b6f9efa47504fa9158ca8afdc80c95d10d8df011d99190e8ac9b4c91266a4347e4f01b9cd048642d0b1d39fde
+EBUILD splice-1.1.0-r2.ebuild 900 BLAKE2B 23ae844f6156b6adcfd95a3738b1bdca8fefacc37b2203b761f06381c3ae0cb9008bd86c4a1a9cfa5a3b23d622a98bea1d8feae1d64176af56ca9bad9a6bd4da SHA512 0f45f997070b8e1ac83300f342efa99b14f249685e6bc4ca120fc2e64c3111581945fe345802fd3f1ebfcf8458cceaa623b6331df96f48ecd29088311c456997
+EBUILD splice-1.1.0-r3.ebuild 909 BLAKE2B ae3fcdcaad1d736a2e928e8f7d96ab4eb203599e0afd7eb6de4fc422f18a1c7967744e865e59c33bc38af6e95bf77d2ae1f2e1946593f49f1ba5b4cf5859d85b SHA512 08a4d525508fd884b8f5a65e5f7d749fe86eef541fcf055213ce564bcaf3bbcbf4e6e79c5a0e0d3c5a8a7f4c70a32c3c1e5e941247248d61999026570ef06f84
 MISC metadata.xml 379 BLAKE2B ae1816407de2de76d021e1577e8dacf863585fe190af44b9af8b0247cfbd61fc834601b87412d1d048655924bac586fef79d869bf553213f566a81372cc545d6 SHA512 76d8d1f9dbdd2aa7fa54e8d4dde8a34fa62e69e5e20154545572f3c083df1fddf7e3ed286d1077f63cd4a46bdb7bcf3617700fedd2c77800e1dc4d15ac67e9b0
diff --git a/app-vim/splice/splice-1.1.0-r1.ebuild b/app-vim/splice/splice-1.1.0-r1.ebuild
deleted file mode 100644
index e23492a64dc3..000000000000
--- a/app-vim/splice/splice-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit vim-plugin python-single-r1 vcs-snapshot
-
-DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
-HOMEPAGE="https://docs.stevelosh.com/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026"
-SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	default
-	rm .[a-z]* Makefile LICENSE.markdown package.sh || die
-	rm -r site || die
-}
-
-src_install() {
-	vim-plugin_src_install
-	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
-}
diff --git a/app-vim/splice/splice-1.1.0-r2.ebuild b/app-vim/splice/splice-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..84be23b68c94
--- /dev/null
+++ b/app-vim/splice/splice-1.1.0-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
+HOMEPAGE="https://bitbucket.org/sjl/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026"
+SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm .[a-z]* Makefile LICENSE.markdown package.sh || die
+	rm -r site || die
+}
+
+src_install() {
+	vim-plugin_src_install
+	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
+}
diff --git a/app-vim/splice/splice-1.1.0-r3.ebuild b/app-vim/splice/splice-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..3593b4bec5ff
--- /dev/null
+++ b/app-vim/splice/splice-1.1.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
+HOMEPAGE="https://docs.stevelosh.com/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026"
+SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	rm .[a-z]* Makefile LICENSE.markdown package.sh || die
+	rm -r site || die
+}
+
+src_install() {
+	vim-plugin_src_install
+	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
+}
diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild
deleted file mode 100644
index cdcb146ca4aa..000000000000
--- a/app-vim/splice/splice-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit vim-plugin python-single-r1 vcs-snapshot
-
-DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
-HOMEPAGE="https://bitbucket.org/sjl/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026"
-SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_prepare() {
-	default
-	rm .[a-z]* Makefile LICENSE.markdown package.sh || die
-	rm -r site || die
-}
-
-src_install() {
-	vim-plugin_src_install
-	python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
-}
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
index 56b6f7f09b0d..fa12b07b4fcd 100644
--- a/app-vim/vim-latex/Manifest
+++ b/app-vim/vim-latex/Manifest
@@ -1,3 +1,3 @@
 DIST vim-latex-1.10.0.tar.gz 260820 BLAKE2B 2314ad5ded3bea51def3172e8f2b7a7483839b58804f9d8c1cc1c8f1139c1da731f91525691d47dba57d07a7db85c371e87c5ce0d3d22a004a9402df7e7cad3a SHA512 1d22b675c124e402a280dcc3a675b49a92fb9f4d42efdda0ea97be26379cd6c023589a35e165f4231524d853380e22411901bfbcc98f171c938ba800821a1213
-EBUILD vim-latex-1.10.0.ebuild 1564 BLAKE2B 08054adb116e161a8d0943b94aae1754c3ba0d24677aeb8a8deb2043a9d8b70365b57d6a5ca5a2ef2a1563a437868a4b497bedbd98a4e26c61927feab81413da SHA512 3946e141d0f138416b6786d374b58033929a72dad232c743a2f160826a76245d1e53bafe4de095dec655dd5f3b14ff2ae32e63544671c4096d624b29efa1cb37
+EBUILD vim-latex-1.10.0-r1.ebuild 1578 BLAKE2B d07b352d0d5c3af5989008b8a9ecacf6950fa21cfcbdf51cdf089a369b2ef929f3fcaa3e080f85cf0859d6ca0bfb23ed92a875c13edd47788618f28d47d16307 SHA512 53554507ccf73f681a82eeb581fe0b9688b3ef82638c40d0f8d403ed451004a648d07bf6fde1e0eae1792c01621092c3f92f0a769115299999e0628bf5de807a
 MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
diff --git a/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild b/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..3543ff2aafe0
--- /dev/null
+++ b/app-vim/vim-latex/vim-latex-1.10.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="A comprehensive set of tools to view, edit and compile LaTeX documents"
+HOMEPAGE="http://vim-latex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	virtual/latex-base
+	!app-vim/vimtex"
+
+VIM_PLUGIN_HELPFILES="latex-suite.txt latex-suite-quickstart.txt latexhelp.txt imaps.txt"
+
+src_compile() { :; }
+
+src_install() {
+	# remove unused metadata
+	rm vim-latex.metainfo.xml || die
+
+	# don't mess up vim's doc dir with random files
+	mv doc mydoc || die
+	mkdir doc || die
+	mv mydoc/*.txt doc/ || die
+	rm -rf mydoc || die
+
+	# don't install buggy tags scripts, use ctags instead
+	rm latextags ltags || die
+
+	vim-plugin_src_install
+
+	# use executable permissions (bug #352403)
+	fperms a+x /usr/share/vim/vimfiles/ftplugin/latex-suite/outline.py
+
+	python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "To use the vim-latex plugin add:"
+		elog "   filetype plugin on"
+		elog '   set grepprg=grep\ -nH\ $*'
+		elog "   let g:tex_flavor='latex'"
+		elog "to your ~/.vimrc-file"
+		echo
+	fi
+}
diff --git a/app-vim/vim-latex/vim-latex-1.10.0.ebuild b/app-vim/vim-latex/vim-latex-1.10.0.ebuild
deleted file mode 100644
index 58de37ae2552..000000000000
--- a/app-vim/vim-latex/vim-latex-1.10.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="A comprehensive set of tools to view, edit and compile LaTeX documents"
-HOMEPAGE="http://vim-latex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="vim"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)
-	virtual/latex-base
-	!app-vim/vimtex"
-
-VIM_PLUGIN_HELPFILES="latex-suite.txt latex-suite-quickstart.txt latexhelp.txt imaps.txt"
-
-src_compile() { :; }
-
-src_install() {
-	# remove unused metadata
-	rm vim-latex.metainfo.xml || die
-
-	# don't mess up vim's doc dir with random files
-	mv doc mydoc || die
-	mkdir doc || die
-	mv mydoc/*.txt doc/ || die
-	rm -rf mydoc || die
-
-	# don't install buggy tags scripts, use ctags instead
-	rm latextags ltags || die
-
-	vim-plugin_src_install
-
-	# use executable permissions (bug #352403)
-	fperms a+x /usr/share/vim/vimfiles/ftplugin/latex-suite/outline.py
-
-	python_fix_shebang "${ED}"
-}
-
-pkg_postinst() {
-	vim-plugin_pkg_postinst
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "To use the vim-latex plugin add:"
-		elog "   filetype plugin on"
-		elog '   set grepprg=grep\ -nH\ $*'
-		elog "   let g:tex_flavor='latex'"
-		elog "to your ~/.vimrc-file"
-		echo
-	fi
-}
diff --git a/app-vim/vimcalc/Manifest b/app-vim/vimcalc/Manifest
index 2f85d5e40c09..e130eca9edbb 100644
--- a/app-vim/vimcalc/Manifest
+++ b/app-vim/vimcalc/Manifest
@@ -1,3 +1,3 @@
 DIST vimcalc-1.3.zip 24993 BLAKE2B 8cfd0a399b4888fa4e9244f7f6a315f97a3e74c78879c281d596a1a5c109711933b66b44493a2ee3c136e1159d937c95707b06c54a5342457494a3c945dcf66f SHA512 1b377f284a7b68d200b08bdacee2080a60412e6ba1fd530eb0075dbc84fba30b37cec45e60d916aa80d057809b79f4d816f3a85f903d0e2fc7d06240dcdbb600
-EBUILD vimcalc-1.3-r2.ebuild 963 BLAKE2B 53db13c995c4e07119bd6da43967f657f24c86e487aa2b1b897656bf5cdea224db211ea501e375e98d1f2b28e8f80318b4e2a0930ea02eabe93ba084f573f2e2 SHA512 0df90e193f0fb553ce840ae499821fdd83d135787e64124d4bc767e4fdeee5dbb29ea180bd0507ce80a38ba50aaab156349f8fac49542ef9eb631d4f39fe4ba9
+EBUILD vimcalc-1.3-r3.ebuild 979 BLAKE2B 19a38980f1dda9203486e3e865446c4e027a8beb1502a90742a6def1b5750bb9066bc9cccd08ee98dce3425d70cecd4c1c3b85a22508f41277d8e0af3ba3a7f3 SHA512 ce993e26464d3f7ca3cdd0ae01a0cbfd3130d76d3901c59eed6ad2a0025a9f293ef53e00ab5ba08c5fadba989fa6165d82bdde27fb14ec6182cb812d750e260e
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild b/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
deleted file mode 100644
index 151fa8451f7a..000000000000
--- a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
+++ /dev/null
@@ -1,43 +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 python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: provides an interactive calculator inside vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3329"
-SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=15317 -> ${P}.zip"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-
-VIM_PLUGIN_HELPFILES="vimcalc"
-
-DEPEND="
-	app-arch/unzip
-	${PYTHON_DEPS}"
-
-RDEPEND="
-	|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_prepare() {
-	# Remove .DS_Store files that should not be installed
-	find -type f -name '.DS*' -delete || die
-}
-
-src_test() {
-	cd plugin || die
-	"${PYTHON}" tests.py || die "Tests failed"
-}
-
-src_install() {
-	rm plugin/tests.py || die
-	vim-plugin_src_install
-}
diff --git a/app-vim/vimcalc/vimcalc-1.3-r3.ebuild b/app-vim/vimcalc/vimcalc-1.3-r3.ebuild
new file mode 100644
index 000000000000..dcf1201a0108
--- /dev/null
+++ b/app-vim/vimcalc/vimcalc-1.3-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: provides an interactive calculator inside vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3329"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=15317 -> ${P}.zip"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="vimcalc"
+
+DEPEND="
+	app-arch/unzip
+	${PYTHON_DEPS}"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+	# Remove .DS_Store files that should not be installed
+	find -type f -name '.DS*' -delete || die
+}
+
+src_test() {
+	cd plugin || die
+	"${PYTHON}" tests.py || die "Tests failed"
+}
+
+src_install() {
+	rm plugin/tests.py || die
+	vim-plugin_src_install
+}
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
index ac5e35bb8a25..ac3d25f299d1 100644
--- a/app-vim/vimoutliner/Manifest
+++ b/app-vim/vimoutliner/Manifest
@@ -2,6 +2,6 @@ AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963
 DIST vimoutliner-0.3.6.tar.gz 210251 BLAKE2B d50b3d1c752fba80e26d7430801baf30a7945d84d30866556821319fb052252a37e2dd7f989c47c376b4986b616c7f99e0753ef3f6b54b9f4f02aa166e998b65 SHA512 62c860067d394dbae639aa9d51627637769c22c4c651f2f9328ca88e8afd85396e1f371bb0cfee432e7a1faabee570a1e29ec086c6532681a309b909225fb90b
 DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
 EBUILD vimoutliner-0.3.6-r1.ebuild 698 BLAKE2B 33fe3fb434089f26f8f0b1c4e95917297bea59d45b0238166df71e244289ed0daf438a78447223fb0d42e2d3d4c645c684791810e67b96489046a45e97738065 SHA512 25c71e241bfd205ac87418c61377591dbb0119b188c6b2ee52cef9f05ee25fbaca52deebae40139da903ae3a20805e3f9307f3ccf89cbc656115533a042322e0
-EBUILD vimoutliner-0.3.6-r2.ebuild 1300 BLAKE2B f2359427b0553a0e05caeb370a21c2433b3b1c9d1918166d77e27cf83462cc6d216ecbcc972dc9f3a1bb0e466708ec32fd57027ee602d12a51ac22f78427a47e SHA512 dcc2f89e998ff2bb70eb5200dff6a17b8d38ca2c8d68492aa47dce216d313af8db81c0d79d1a2cf1aefa04aaf2fcd96f904705cff4d5676c8234e50f8daac934
-EBUILD vimoutliner-0.4.0_p20180301-r1.ebuild 1094 BLAKE2B 06f2432288653826cb839fb0043701444355c2dd1161a5baa0d7f99eae6d4a987ca99c09858c810af284472dcf9a80971d6681cbdc940137d19410ef022515b7 SHA512 56413d64eda82ed2cc01813b6dab78769e28498f9013e483948461c5e7da111fba1e3b10374f188db8712d5009cb5861942b0db3450d9f553c0d9006df713520
+EBUILD vimoutliner-0.3.6-r3.ebuild 1336 BLAKE2B b8153db24bafb8b713ed2b033ea742d17e66749b2ce58da68a5c4c87164bb8bb72e4031458c646a7dfba194f71883fec276fc6836bbf275c6478576435b00c9b SHA512 148bcbca2c7f91cd62047e6b3beb75b9789d011b574a8024e3a53e04f8138c9099553a0f73d294eeba50f05883c0979cc9984c47016822268a0187cb66074ec9
+EBUILD vimoutliner-0.4.0_p20180301-r2.ebuild 1130 BLAKE2B a212d7a6d0881aeb1f138ce93d7897d3ffb71916f515756d32f829d564def93bf03f7c421e4345aabcd67bdb579d31b71aa9b72d5497d322b057b4ae63abbe98 SHA512 5a7a85bd26c6391cce4b514af9643bbc20a2f78e1655accf5b3fc3d704cb4673ed5e4699ef503188ae3bb9856bc1ed7ca49169f039c36396d671e8ad9b2dbb4c
 MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
deleted file mode 100644
index 4168f3a1c1b7..000000000000
--- a/app-vim/vimoutliner/vimoutliner-0.3.6-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="vim plugin: easy and fast outlining"
-HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-VIM_PLUGIN_HELPFILES="vimoutliner"
-VIM_PLUGIN_MESSAGES="filetype"
-
-PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/autopep8[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
-	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
-	rm -v install.sh || die
-	find "${S}" -type f -exec chmod a+r {} \; || die
-}
-
-src_compile() {
-	local pyscript _pyscript
-	for pyscript in $(find "${S}" -type f -name \*.py); do
-		_pyscript=$(basename "${pyscript}")
-		einfo "Processing ${_pyscript}"
-		sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
-		2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
-		autopep8 -i "${pyscript}" || die
-		python_fix_shebang -q "${pyscript}" || die
-		eend $?
-	done
-}
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
new file mode 100644
index 000000000000..517d6a36c565
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/autopep8[${PYTHON_MULTI_USEDEP}]
+	')"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
+	sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
+	rm -v install.sh || die
+	find "${S}" -type f -exec chmod a+r {} \; || die
+}
+
+src_compile() {
+	local pyscript _pyscript
+	for pyscript in $(find "${S}" -type f -name \*.py); do
+		_pyscript=$(basename "${pyscript}")
+		einfo "Processing ${_pyscript}"
+		sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
+		2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
+		autopep8 -i "${pyscript}" || die
+		python_fix_shebang -q "${pyscript}" || die
+		eend $?
+	done
+}
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
deleted file mode 100644
index 91f8bce967ca..000000000000
--- a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vim-plugin vcs-snapshot
-
-# Commit Date: 1 Mar 2018
-COMMIT="4f12628247940d98eedd594961695dc504261058"
-
-DESCRIPTION="Vim plugin for easy and fast outlining"
-HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
-SRC_URI="https://github.com/vimoutliner/vimoutliner/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-VIM_PLUGIN_HELPFILES="vimoutliner"
-VIM_PLUGIN_MESSAGES="filetype"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/autopep8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py || die
-	find "${S}" -type f -exec chmod a+r {} \; || die
-}
-
-src_compile() {
-	local pyscript _pyscript
-	for pyscript in $(find "${S}" -type f -name \*.py); do
-		_pyscript=$(basename "${pyscript}")
-		[ ${_pyscript} == "otl.py" ] && continue
-		python_fix_shebang -q "${pyscript}"
-	done
-}
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
new file mode 100644
index 000000000000..c6da5e2e298a
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin vcs-snapshot
+
+# Commit Date: 1 Mar 2018
+COMMIT="4f12628247940d98eedd594961695dc504261058"
+
+DESCRIPTION="Vim plugin for easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/vimoutliner/vimoutliner/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/autopep8[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py || die
+	find "${S}" -type f -exec chmod a+r {} \; || die
+}
+
+src_compile() {
+	local pyscript _pyscript
+	for pyscript in $(find "${S}" -type f -name \*.py); do
+		_pyscript=$(basename "${pyscript}")
+		[ ${_pyscript} == "otl.py" ] && continue
+		python_fix_shebang -q "${pyscript}"
+	done
+}
diff --git a/app-vim/vimpress/Manifest b/app-vim/vimpress/Manifest
index db15622c3806..c3abfcf60d71 100644
--- a/app-vim/vimpress/Manifest
+++ b/app-vim/vimpress/Manifest
@@ -1,3 +1,3 @@
 DIST vimpress-3.2.0.tar.bz2 11456 BLAKE2B 39be21c2a65418f8e9e370997db5c64fc79f6ae608a85ba8c19ea2e0010823002caa35e1f7fb887fd20176eb987c23a7719b14c4a7a8acb9818dc3802d35557a SHA512 793f013ccc42180e095c2e8cc847719479418cc0b184688924520f0782ee27e99a7fc64e44bf5c25f2a720b19dd813a4756fc90b87c18e13766ef0ce7772334a
-EBUILD vimpress-3.2.0.ebuild 573 BLAKE2B 8f9d3ab01e72512eeee14e5d6f28545df4f74dfb5e8b481a2c4c8f22799a37fd669cddf47c4f8e9de7ed05adeb970c3b71046e1099e34ae05144dc1a5956f1a0 SHA512 8d3f43cdb27cf936b7ab7d9247b974b956bd3876dbbbcaec5fe02b0e5bc5766bdc19b802454c67ba9ee7c01fc65cc20b674b1b6c1279c6becd777dc344149b2b
+EBUILD vimpress-3.2.0-r1.ebuild 627 BLAKE2B b442e46b05c65fead041c49dbd1bec7403961cfc5f7069847c9d7b5f1ac3e565b110d775304c68408d72b13fbdd89a66ff5000900977352a8929b721da7d0be0 SHA512 1fac4eaa8d75d238a5ea3e64f317849c54f7938bbc0b124b60318f88441f82e7d3e08b7c012640199e747e32ff6f098b9dac517f1bd09bede6d7790c94609999
 MISC metadata.xml 336 BLAKE2B 5154fbe13f738bf9020da237e4e8bafc26c160f0bcee4f042263e17d34f9bfdc9fc673e5a7ee15f8221dc6b1530131c1567049822c5540c34c2362b6b37316b5 SHA512 f2f18b31a5a60c51d7d563d8a53814625a6310ad2925ef297275a75ed5b40f475a25aa7089a0f641335e2c73d889d39e6473f224644c572ffe3118cf03fe4c90
diff --git a/app-vim/vimpress/vimpress-3.2.0-r1.ebuild b/app-vim/vimpress/vimpress-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..e7e8ba8673dd
--- /dev/null
+++ b/app-vim/vimpress/vimpress-3.2.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: manage wordpress blogs from vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3510"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+	')"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vimpress/vimpress-3.2.0.ebuild b/app-vim/vimpress/vimpress-3.2.0.ebuild
deleted file mode 100644
index 863178d710d4..000000000000
--- a/app-vim/vimpress/vimpress-3.2.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=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: manage wordpress blogs from vim"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3510"
-LICENSE="vim"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}
-	dev-python/markdown[${PYTHON_USEDEP}]"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/voom/Manifest b/app-vim/voom/Manifest
index 9322ee2386af..576175099157 100644
--- a/app-vim/voom/Manifest
+++ b/app-vim/voom/Manifest
@@ -1,6 +1,6 @@
 DIST voom-5.1.tar.bz2 102211 BLAKE2B 3835fb8f41638ca2ff91c106d94ee04aca3b6b3efcb44c7f023faba164512a96ff5b310b6fba3604ba2abe10e1371102997a3a9c67df28772fd68910836d2eb1 SHA512 3798c6d5079ebdf4f447f62613340e46a6b593e0a97226b0aecc90889c6cd2f6f2ce36eb88395a12a0e27ff3803c7693f1c56443928914bfea134d8a75df8c91
 DIST voom-5.3.tar.gz 115841 BLAKE2B 6e88c4121b796a75ee623537483ff579acb4de73ff353408381ee64ce708cff1d7f8c45bdbe1e0c9761b5a17dd3aa54b3a0a2cf83873628bd1490e1524962ea2 SHA512 f51f30641d8b3d0ff5cd0d6b31cd1d8a15cb14f20f973ac83b9b5d046b94452e6e4e4ff0b28ce7842aa7f9b656a9dd631297aeae16ea75eea4411d911057873e
-EBUILD voom-5.1-r1.ebuild 571 BLAKE2B 24492913fe6eee9eecd498e3f887f829e29dccf1742034866b4d5fb42b76d1b9e0379ed0b5bd785f1e902b5d66978cb2a733fd6e5c3d2ced7b5e2749626d3e6d SHA512 7c6df11bc6670fc264fe9d022a7510fa7fcb1297ab02f6877718f389eb2807ec62dccf9fbb357030bfa1553f0f0a308e032c71371acf8553f6312b231100571a
+EBUILD voom-5.1-r2.ebuild 582 BLAKE2B e87655f0e6aef5fabb0e16a11ace437b5a1c375b6cb9f9d8d0c0b8698782e7d8941b6aa4e4e9f8c16c352195d56b4c758aad6bb1bf9a4dad6534e6bd9f40490e SHA512 c4d378792e6ae7a44ce0b4cae2f9be06ed18a441f05befe7510515337b54a1a67be6bbffb236712f81f770d4c30b1d5c17818b000e711bc6923426887b854772
 EBUILD voom-5.1.ebuild 430 BLAKE2B 2ea7160d3a98943bd45094e74d453313a55a399ec379aa1adfd62578a4d605c070c5c20c2175363f5d1a8525e0e7ae27d7fe2beaf1b20695b48f4de0976bb753 SHA512 2084dcade6865875468e6822a9096950aed77d51674b4ba712cfecdc1c28961a0a72cca14d60703472fef7f249926b2b1ca5ce1551e1481310fc80b794da010f
-EBUILD voom-5.3.ebuild 679 BLAKE2B 6d5ed84caa190fb72f9babdd46404db9b35cce69f34c442504bfba635b04a476fe29a902a1b02dffba187289a6ebd18645b17eb79f9454e18b63c7eb8f1886e4 SHA512 318362a6bcc71d970e408c82c451d079fa136ffb89e5ee23f5b0bf11816b19a62ab4a421c0084a77c1f516abf78f9aa21ab890adeb5256b33ed4c0a44ec0ab8d
+EBUILD voom-5.3-r1.ebuild 693 BLAKE2B 5ef41ce995a2daccf34fff53a61bc04455c103cdda1b8014ba0b004f1fed36ae1803c1874fea335bff4159c213c687478a309781421921cb991fbcbec022db73 SHA512 e2cf7d088cd57e34f126976149fffe0de5c47bd0ee47d4a1262973c3607b9491c737816a95c48233ef733d8065574196d70d0bd611532915734966e11a15cfa4
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/voom/voom-5.1-r1.ebuild b/app-vim/voom/voom-5.1-r1.ebuild
deleted file mode 100644
index 661ae4f5bd8b..000000000000
--- a/app-vim/voom/voom-5.1-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: emulates a two-pane text outliner"
-HOMEPAGE="https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657"
-
-LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)"
diff --git a/app-vim/voom/voom-5.1-r2.ebuild b/app-vim/voom/voom-5.1-r2.ebuild
new file mode 100644
index 000000000000..53ff9daabbe1
--- /dev/null
+++ b/app-vim/voom/voom-5.1-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: emulates a two-pane text outliner"
+HOMEPAGE="https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)"
diff --git a/app-vim/voom/voom-5.3-r1.ebuild b/app-vim/voom/voom-5.3-r1.ebuild
new file mode 100644
index 000000000000..af13fa790883
--- /dev/null
+++ b/app-vim/voom/voom-5.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: emulates a two-pane text outliner"
+HOMEPAGE="https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657"
+SRC_URI="https://github.com/vim-voom/VOoM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="${PYTHON_DEPS}
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)"
+
+S=${WORKDIR}/VOoM-${PV}
diff --git a/app-vim/voom/voom-5.3.ebuild b/app-vim/voom/voom-5.3.ebuild
deleted file mode 100644
index 78f809834f6f..000000000000
--- a/app-vim/voom/voom-5.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: emulates a two-pane text outliner"
-HOMEPAGE="https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657"
-SRC_URI="https://github.com/vim-voom/VOoM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/VOoM-${PV}
diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
index 5d701c54e7af..58f2c096da18 100644
--- a/app-vim/youcompleteme/Manifest
+++ b/app-vim/youcompleteme/Manifest
@@ -1,4 +1,4 @@
 DIST youcompleteme-20130910.tar.xz 2340104 BLAKE2B 1d50eae1e53d1acc3e9599ade6c5686602cf28997574dcf128b1ed1f812548c51e0c5ad45547ec12fc44d7391ce539c7cd8785ae823978ce18b870dd794f07a2 SHA512 c1022a27ced00e8ba8e9aa25029a0032805331cf0f80342aaaf9d7d4ec7780a098ffbd315068f19f6c98b00c4b4b43e59c7fa40070057e097ca40f6398b53b6b
-EBUILD youcompleteme-20130910.ebuild 1897 BLAKE2B b59b6e8a2a86493ad5941630d29d83215b646fd2bd2953fa740a4b20ce061ee558d6dda180709227045cf4dfc7e9a47218fc7e44c42bcc083d92c1808cd228fd SHA512 0257ae1f18dfcba799f4493e4b9acfa60a360124527e2da703dff8262f50217341935f873ca036ca1ede2a845d9d1ae1c25ba6cd94f26c2d7790a405eef6ee5d
-EBUILD youcompleteme-99999999.ebuild 2895 BLAKE2B 208ed961f7a7079b0c1668cbeb28471fd19f23ff7f4086c393a349671b1b348371fb48d6aa4e8997028b7054d0297cf5b822be35c1abbe83c815bc92ec65a518 SHA512 0c49cd018a82b239c90cda3f6978cf6b2d3b3fa78671d9ebf085f32382e65e1011fca1c8a4c682afaa90c2bc6c74a3f76b51974445772bd8e6c9d3f7f42fa708
+EBUILD youcompleteme-20130910.ebuild 1956 BLAKE2B a34dbf6f15544c10ad23c2809aa827c2b43a272a01739c189700e749bb9ebe513dd81bfb4c03974996184067409853f5a2bb1202f5316bd615abc8f29cdaf393 SHA512 c731d0679cf373157f2950a1d938d40ed6f5a3ba99d59274435fdc5a202f2201f7f4fdb789dacd6167b613a2ef38c959c4c20912d48776bef0aa1dbf53556f9c
+EBUILD youcompleteme-99999999.ebuild 3061 BLAKE2B e7fc5d4996047c1a8d3f49e34cafd3dad50ed21fce60e7af5958a8fc800576dad2f2a5405e85731c27462fd1f5e974832e633d998498a08022583a9b4e8a8327 SHA512 3d2e577ff0c0bacfdd0cf2addf8d9857f4021d32c161ad319f64024ef3604984570e531ef5529735b4b75edd258f10e2096f88ff4e8f1e7f3663d5daab579612
 MISC metadata.xml 372 BLAKE2B b057ef7819a6a3018c88a692b3f94befe2b3055d3d014790bfdf4de690cdd9e589e12b1d802e5487af104b5cb7d87395e7c0a4130dde622a3a48d7c2f3c507a2 SHA512 3afacd989d495928012e5a1b1c2bb6d14209cbcb1e347a24c1c0881c758642cc8457ee7b6202b8d129e3f08dc21492792715fc5452f8ffc33f719da9a447fdac
diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
index 90bc485b4174..29e5f6c94260 100644
--- a/app-vim/youcompleteme/youcompleteme-20130910.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,13 +26,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	clang? ( >=sys-devel/clang-3.3 )
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
 	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}]
+		')
 	)"
 
 CMAKE_IN_SOURCE_BUILD=1
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
index 987fec6263bf..c5e133ef7435 100644
--- a/app-vim/youcompleteme/youcompleteme-99999999.ebuild
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,26 +26,32 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="
 	${PYTHON_DEPS}
 	clang? ( >=sys-devel/clang-3.3 )
-	dev-libs/boost[python,threads,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost[python,threads,${PYTHON_MULTI_USEDEP}]
+	')
 	|| (
-		app-editors/vim[python,${PYTHON_USEDEP}]
-		app-editors/gvim[python,${PYTHON_USEDEP}]
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
 	)
 "
 RDEPEND="
 	${COMMON_DEPEND}
-	dev-python/bottle[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sh[${PYTHON_USEDEP}]
-	dev-python/waitress[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/bottle[${PYTHON_MULTI_USEDEP}]
+		virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+		dev-python/jedi[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/sh[${PYTHON_MULTI_USEDEP}]
+		dev-python/waitress[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="
 	${COMMON_DEPEND}
 	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/mock-1.0.1[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/nose-1.3.0[${PYTHON_MULTI_USEDEP}]
+		')
 		>=dev-cpp/gtest-1.8.0
 	)
 "
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 2325957243e8..0c7ee8505e63 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 870a4eda9428..f59a1ca3ca30 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -3,5 +3,5 @@ DIST ebuild-mode-1.48.tar.xz 34764 BLAKE2B cd54e8a1b65232538924aafd10f6dcadd4576
 DIST ebuild-mode-1.49.tar.xz 34632 BLAKE2B 3e7814363aedbb5a05193faccc0815a7f4b0f56eacb03fb720fa270ac69faa163bd8164639390b1703bb0a82341975e9bfea143c651b5b0ba2825b2bbb3b3329 SHA512 440e23aa6f63307955a9c970f5cbcc175eb14cca4ff4035da4f10fa22d9c6766b29ca7842b800a43c46063f3045c2ff3b2d6b8e27026f47bd0ed0959a8f2d0e9
 EBUILD ebuild-mode-1.47.ebuild 1000 BLAKE2B 4ab2d003b3bb30b4e6317812b91e0c6731e42051616d2ec4c7693845c8d8882281f6cbaecb132bb331977e0b10f7d518929c0702185313785ef1c09d6b064508 SHA512 7fcccdb1d9375a23e983d97cee0c3ada87c2b2647aa568bce93d373848976754c9d33b68f9e36fea2c463a9d450d691fa03ce0c5ff6b770f4f7ec8267c5d13f8
 EBUILD ebuild-mode-1.48.ebuild 1003 BLAKE2B 17e3b6dfbfeed21163f2be29784897ef4516bed6dfbcd63779ad276a680a4ce6ade481c6811434cb5775d390c07bb15b8b7d7ea915c0b73a0982f412350c5de9 SHA512 806103c34dc0a3f541f0dbf86bc8d3867ee63c4962467cbdb7e8805cb160a8058fda55c9b58c25a0e9cbda45cc5a0f1f8367d33f7cde84fc31d9a256de15ceec
-EBUILD ebuild-mode-1.49.ebuild 1001 BLAKE2B 5cfd46db07183e4a042b09072272acadba4c698baddb1022583d4f80b76a07f176bec9d58f348dd888c7b805ceb380a5bd99bc810b6e259d0b0924d95e1ef2d3 SHA512 5770a49c1af09516ee92468db7c7151fd817581836c84a289a936e4f63eeff2b002bd369ba9790d831807c759eabffaa5ce4fb74cda9cf7778ea507a86345fc5
+EBUILD ebuild-mode-1.49.ebuild 1000 BLAKE2B 4770f20d42aa1e6187538f09bae769ac27d31255c3fc4ba5189e990ec9efbfc30d004650b536e67cd3856e9926c4e52503ed9e9f39ea3abd0a2e5c2282dfb8f9 SHA512 ae8630f6141e38c906c0c211d2fd384416449ae3b4bb263bc11da6cc64ea54b89b0fcf336af046fce298645dbedcca802abeea0d689d50531915d7b8dc1a17cd
 MISC metadata.xml 417 BLAKE2B d442b7726c175c95922475904d9dbb6260ecf53140bf041121fed80c3183142bdf7bcc88f7f87eeeab0dd91a81eacf507e2c4ea8cc8f86dbf6b60c52fcec868d SHA512 459969f9a78209b1058fb5fed220192bddd532c9dabc8e5d340c040bef0e454f08fe3896b33bcddaa011fd4639351f6f6a33ba6669895e99e001810324c101ad
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.49.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.49.ebuild
index 6b86e560e824..6a77d0da05da 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.49.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.49.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index ec17447ff02e..d6df534f0f42 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnat-suite-bin/Manifest b/dev-ada/gnat-suite-bin/Manifest
index 3a10ee4da1a8..95fdb1957782 100644
--- a/dev-ada/gnat-suite-bin/Manifest
+++ b/dev-ada/gnat-suite-bin/Manifest
@@ -3,8 +3,10 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688
 DIST gnat-gpl-2016-x86_64-linux-bin.tar.gz 372813330 BLAKE2B a0374ad730ae275aaedcf5663c30f8e0221af32f14391fe87a3ce0630d4498a1e90671c02830d62f78857571a5a521af91f6db409a7b3c367c7b0f059571eefd SHA512 5115ac3be0badc5125ee048a98230f18363d72107da3325ce602c0e618cee2e3646a0decc00a2388f14bc61bfed51dd0622f365f5f7ee8b0cec2187ebcf8e075
 DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f
 DIST gnat-suite-bin-2018.txz 337235688 BLAKE2B cf1b8f0253907b8fc97b9c7218b23dcda8f1557be5e12293eab59e09427418a8814c1bafbcb3f89c1e5dd755a161c5dfa8a852631d137f17acb3167bf51dadbb SHA512 9b57709c05a121b0a0adabe3232128e3f27659d1928857fbd6883b73a7487c3d457317e8f236df3d16ced635514af8afbafc584cc74d865e11288820ac9c4f77
+DIST gnat-suite-bin-2019.txz 518461388 BLAKE2B 31ca194d15cafd66abe1d0896f1444e746c1484149db26545855561512c251b84eea5b4d0932860dfed23cac7f0b3c94a9884c586f509ceb6da8b9becd29e913 SHA512 a640e451a1badc2a9c64abb80f1ae1b49b5389e265d14dfe9b22891d23b3d13a9770841a43cc50ceba81c2728777ed9da854654afe6198c79dd4e0fed536907c
 EBUILD gnat-suite-bin-2014.ebuild 3215 BLAKE2B f4ac450a4a1125f5fc6c6c202dc70728f36a2f670717f97d97eb033b23854b861f346c302828d3722a7c0b05c2850f75392b0d7b17c9d1727b16e6cc54f6f490 SHA512 1f20d97cf2d7533f1a27f12847c7d5054ca95283e36e50e5395992b03e898dd6df20fcc4bd0f3999912241030ce900f5c33d3a14b930ef41160a28105e009d28
 EBUILD gnat-suite-bin-2016.ebuild 3007 BLAKE2B fb8eda10c0253697f2862949d7166eeb84766a003e4c7f15c770377264b23414af7ce6a9d62b258ef81cba0fa99b873d1a5172a2184018a438a9c779d979824e SHA512 a577b78b1b929809d10e4855c1276ba6f82d4e587bcad75794ab59b511d02672c20cff30dab520d321eb88b50319b5a59352e2543fb09031cbb80ee3e659cc61
 EBUILD gnat-suite-bin-2017.ebuild 3016 BLAKE2B 29e2c3941f50f7bd82b7d466c207443b14ec22f57e3d523d138a5c83ccf60f6aec9a85bc7fabfd308c2d114036aff935708bfc27db0bce188ab4881eb52c56a4 SHA512 f17e87641587151ddf12b72d1081b6e77084a1b66d2c14710834b55e119b1c134c155d2c9e872106a692c0e2703e18f3cf9d97c5e99c4e0549c40cdfb93307df
 EBUILD gnat-suite-bin-2018.ebuild 2595 BLAKE2B 0f9d2a6ca596749a39f0ebfce5e27b791fae39882b5d6f89a7f32d19770c1a08ebe737e96020bd48d5c44279abc3fc63dacf143efb28205427f37d83da9f52ba SHA512 4095191d12d2ca771a64b55b1447c9c7004b274008c52434edb896318e91e792a6922e7882f23af6591cc51f2ceb6019c54ff3b4abf1cf4589fda1a8773f3058
+EBUILD gnat-suite-bin-2019.ebuild 2582 BLAKE2B ccc377abde8a5b0a34ed0a1890bedcbee1a8fba3e8c3b634fe20c94b32f3c6895e55760fbbebb9d837c0f8774313f7494a36e64d87b545719fefd057311636b4 SHA512 0bcf09ebbfbfe169c9ed71eedac58c269ebaf3a42dcff354145b58a3ef03605dcc6bb89cef1e65c3ffaea50b40ea2cf7ae6be72b2caa8a95458394844799607e
 MISC metadata.xml 215 BLAKE2B 98b1646db0c7bae55bde9ba8a125710b47045fa5937d90218279c551cfff2a12bc45f46b99f0586adc9d3be222abf0dd7b5b5d8ca8e005a6fc55a0b13dd5cea7 SHA512 ec803d562bbbb43b0b41dd837b0f3691a652aebecb8419cdb9c50f96e4c17f90ef10a99df773cb88fbe4670692171b5afd0be68c7f630091de18090301302f8d
diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild
new file mode 100644
index 000000000000..587a7e9955f3
--- /dev/null
+++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2019.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MYP=gnat-gpl-${PV}
+DESCRIPTION="GNAT Ada suite"
+HOMEPAGE="http://libre.adacore.com/"
+# Extracted and repacked from gnat-community-2019-20190517-x86_64-linux-bin
+SRC_URI="https://dev.gentoo.org/~tupone/distfiles/${P}.txz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	sys-devel/binutils
+	sys-devel/gdb"
+
+PREFIX=/opt/${P}
+
+src_prepare() {
+	default
+	rm Makefile
+	cd share/examples/gnat
+	cat header.xml \
+		full_project/full.xml \
+		options/options.xml \
+		other_languages/cpp_main/cpp_main.xml \
+		other_languages/cpp_pragmas/cpp_pragmas.xml \
+		other_languages/import_from_c/import_from_c.xml \
+		plugins/plugins.xml \
+		stream_io/stream_io.xml \
+		simple_project/simple_project.xml \
+		starter/starter.xml \
+		xml_stream/xml_stream.xml \
+		containers/anagram/anagram.xml \
+		containers/genealogy/genealogy.xml \
+		containers/hash/hash.xml \
+		containers/library/library.xml \
+		containers/shapes/shapes.xml \
+		containers/spellcheck/spellcheck.xml \
+		containers/wordcount/wordcount.xml \
+		containers/wordfreq/wordfreq.xml \
+		oo_interfaces/oo_interfaces.xml \
+		oo_airline/oo_airline.xml \
+		altivec/altivec.xml \
+		footer.xml \
+		> gnat-examples.xml \
+		|| die
+	sed -i \
+		-e "s:PREFIX:${PREFIX}:" \
+		gnat-examples.xml || die
+}
+
+src_install() {
+	into ${PREFIX}
+	dobin bin/*
+	insinto ${PREFIX}
+	doins -r etc include lib* share
+	insinto ${PREFIX}/share/gps/plug-ins
+	doins share/examples/gnat/gnat-examples.xml
+	basever=8.3.1
+	machine=x86_64-pc-linux-gnu
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1
+	fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprbind
+	fperms 755 ${PREFIX}/libexec/gprbuild/gprlib
+}
+
+pkg_postinst () {
+	einfo "GNAT GPL is now installed. To launch it, you must put"
+	einfo "      ${PREFIX}/bin"
+	einfo "in front of your PATH environment variable. The following"
+	einfo "commands enable you to do this:"
+	einfo "      PATH=${PREFIX}/bin:\$PATH; export PATH  (Bourne shell)"
+	einfo "      setenv PATH ${PREFIX}/bin:\$PATH        (C shell)"
+	einfo "   Thank you for installing GNAT GPL Edition"
+}
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest
index 52ae7580bfe0..9dcef4363dfb 100644
--- a/dev-ada/gps/Manifest
+++ b/dev-ada/gps/Manifest
@@ -6,6 +6,6 @@ DIST gps-gpl-2019-src.tar.gz 13758956 BLAKE2B 71158537d9d970b97db06c1a5ed40cfec2
 DIST gtk+-3.14.15-src.tar.gz 32009863 BLAKE2B 93c6897c431fa8e1c19ea758378bc7e365d486d1decccefbba64876d8c51a488e6bcf932481daa11e7e43a960a328c3db746e41a845e574c6b6070ab71e23188 SHA512 add4607a1758319a938d2be0bbd0dd140c4099accffa9301e3049bc460bf94f395c5a092368214e8b28d53bc25335d1b8329b50c7eb80a1e9a65b2e154135b84
 DIST libadalang-tools-2019-20190517-195C4-src.tar.gz 625775 BLAKE2B 2ec69e307576c505d20a43d229b13404966f4442778e5390da327ae71cc065873de4fff03a720949fa6bfb5ce66f405e7d45f7f0c21032a639efcff208323aed SHA512 b7368606847244cbb08ff2111fabfbfc8a9aa7f58e953febc70838006d94711dba1fd75bfb69ed2081a37a2dfaaad46097127870696c882d7cc54de5d7b051a1
 DIST libadalang-tools-gpl-2018-src.tar.gz 19938182 BLAKE2B 34104f3bc43c165a9b74ba8c0c03ee2f34686bcd06b5ced730f70f654d8b808e129a85566e081830b4f20304c793eefe0af81b56984cf06190302ad2f6a419be SHA512 a1176575944cd88b9da5f4e9f03caa1a4d09358df71e6a91300d0b35c2a843d0ea1a77fbd93e7b7f16cef1b978022ee20991f5c2ff74f7d05878c3de1220f2b5
-EBUILD gps-2018-r2.ebuild 2797 BLAKE2B d7dc72cb2af43e6027a37a52816f1660dec8a68be252b5ef34bad3872e3ca1c5a9675a64353d9888c2dfef681104d7fc04c78ad1c2c7cdf9ff77dabb11283a60 SHA512 a16bbddb19e95abffa98e26e25917023581147606348989a89e51a31c3487903e956a7ee12ba528a538f9201cf92de919abe0a3c729dcde2e61651390d670b35
-EBUILD gps-2019.ebuild 3124 BLAKE2B cecb5bf8ce8545b0a320fc1ba3160bd8cbb6e2eb159a58f1649bd1a37b54d71ff1e174bc46d06eaecfe46c32def2fe01d60e43b7c508d4404fe8f8661fc03548 SHA512 7f7d5ea632743d2cbeac0442365f3812d2924abb03ad8901f69e42963a8f01d90a40c0a92c0ec0f3f276fc68ae35b828271e75e4f567ff31acdf4c2aa07a8cff
+EBUILD gps-2018-r3.ebuild 2840 BLAKE2B 7fc1ac79ada9aa38b00dd3a35522b2831633162b8af47cb8496038b7197aafc816eee2cd376cea1b3e3591a2ab2bdb353b5fd0127744c9605400a87ad4be8e6a SHA512 3ead8a7005ac456771da699fdb13c55ca135f44e9ba0202aef551de0784b918ed1904bf66c8fd6544d5ab4845f9bbedf4e511a2e8c93bf1a1400474d21007890
+EBUILD gps-2019-r1.ebuild 3167 BLAKE2B 84798d6f06772a5571e3e7e2cb892fa07af56690f7a36833c85f4b57033e86c9cb89d88cf9b586b58c16ecedf880ae58d2f296659c75852daea00819a5dd8108 SHA512 b9a173d7a620c26eb044f4191b75c9670788dc6604d43f020802ca1493d5b4a3b128f37dc27038dbb14d3e0f82f659709c2d6309df815f3bf1c2ff8efe80d53b
 MISC metadata.xml 406 BLAKE2B 663412f7328e2ed9ca4df57304073e48b2c18d43c84c6a5a4b8331f57f731bd63c38d7eb23b9edb4939e0644238a7883581e3ae50afb708cd263a9c39f936671 SHA512 7e13f81414da0346f385d66d88eca699dab64aeaf7d22a38ff05bec1ddc3fab5f98f7d2049902a75f63bfe10f918c599f15a1497cdb09799fec8330152251b46
diff --git a/dev-ada/gps/gps-2018-r2.ebuild b/dev-ada/gps/gps-2018-r2.ebuild
deleted file mode 100644
index 1551312c0378..000000000000
--- a/dev-ada/gps/gps-2018-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_2018 )
-inherit ada python-single-r1 autotools desktop llvm multilib
-
-MYP=${PN}-gpl-${PV}-src
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
-	-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
-		libadalang-tools-gpl-2018-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 ->
-		gtk+-3.14.15-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll-db[${ADA_USEDEP},db2ada,gnatinspect,xref]
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},python]
-	~dev-ada/gtkada-2018[${ADA_USEDEP}]
-	~dev-ada/libadalang-2018[${ADA_USEDEP}]
-	dev-libs/gobject-introspection
-	dev-libs/libffi
-	sys-devel/llvm:7
-	sys-devel/clang:=
-	x11-themes/adwaita-icon-theme
-	x11-themes/hicolor-icon-theme
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
-	LLVM_MAX_SLOT=7
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATMAKE@:${GNATMAKE}:g" \
-		-e "s:@GNAT@:${GNAT}:g" \
-		-e "s:@GNATLS@:${GNATLS}:g" \
-		share/support/core/toolchains.py \
-		share/support/core/projects.py \
-		|| die
-	mv "${WORKDIR}"/libadalang-tools-src laltools
-	echo "#!/bin/bash" > gps.sh
-	echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh
-	echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
-	cd ../gtk+-3.14.15-src
-	sed -i \
-		-e "/^libadd/s:=.*$:= \\\:" \
-		-e "/^deps/s:=.*$:= \\\:" \
-		../gtk+-3.14.15-src/gtk/Makefile.in
-}
-
-src_configure() {
-	econf \
-		--with-clang=$(llvm-config --libdir)
-	cd ../gtk+-3.14.15-src
-	econf --disable-cups
-}
-
-src_compile() {
-	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
-		-XGPR_BUILD=relocatable" \
-		Build=Production
-	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
-		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
-	cd ../gtk+-3.14.15-src
-	emake -C gtk/inspector
-	emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h
-	emake -C gtk libgtk-3.la
-}
-
-src_install() {
-	default
-	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
-	mv "${D}"/usr/bin/gps{,_exe}
-	newbin gps.sh gps
-	cd ../gtk+-3.14.15-src
-	emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
-	rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
-	dosym ../libgtk-3.so.0.1400.15 /usr/$(get_libdir)/gps/libgtk-3.so.0
-}
diff --git a/dev-ada/gps/gps-2018-r3.ebuild b/dev-ada/gps/gps-2018-r3.ebuild
new file mode 100644
index 000000000000..49dd272c9a9d
--- /dev/null
+++ b/dev-ada/gps/gps-2018-r3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+ADA_COMPAT=( gnat_2018 )
+inherit ada python-single-r1 autotools desktop llvm multilib
+
+MYP=${PN}-gpl-${PV}-src
+
+DESCRIPTION="The GNAT Programming Studio"
+HOMEPAGE="http://libre.adacore.com/tools/gps/"
+SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb
+	-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 ->
+		libadalang-tools-gpl-2018-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 ->
+		gtk+-3.14.15-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-ada/gnatcoll-db[${ADA_USEDEP},db2ada,gnatinspect,xref]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},python]
+	~dev-ada/gtkada-2018[${ADA_USEDEP}]
+	~dev-ada/libadalang-2018[${ADA_USEDEP}]
+	dev-libs/gobject-introspection
+	dev-libs/libffi
+	sys-devel/llvm:7
+	sys-devel/clang:=
+	x11-themes/adwaita-icon-theme
+	x11-themes/hicolor-icon-theme
+	$(python_gen_cond_dep '
+		dev-python/pep8[${PYTHON_MULTI_USEDEP}]
+		dev-python/jedi[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+	LLVM_MAX_SLOT=7
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATMAKE@:${GNATMAKE}:g" \
+		-e "s:@GNAT@:${GNAT}:g" \
+		-e "s:@GNATLS@:${GNATLS}:g" \
+		share/support/core/toolchains.py \
+		share/support/core/projects.py \
+		|| die
+	mv "${WORKDIR}"/libadalang-tools-src laltools
+	echo "#!/bin/bash" > gps.sh
+	echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh
+	echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
+	cd ../gtk+-3.14.15-src
+	sed -i \
+		-e "/^libadd/s:=.*$:= \\\:" \
+		-e "/^deps/s:=.*$:= \\\:" \
+		../gtk+-3.14.15-src/gtk/Makefile.in
+}
+
+src_configure() {
+	econf \
+		--with-clang=$(llvm-config --libdir)
+	cd ../gtk+-3.14.15-src
+	econf --disable-cups
+}
+
+src_compile() {
+	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
+		-XGPR_BUILD=relocatable" \
+		Build=Production
+	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
+		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
+	cd ../gtk+-3.14.15-src
+	emake -C gtk/inspector
+	emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h
+	emake -C gtk libgtk-3.la
+}
+
+src_install() {
+	default
+	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
+	mv "${D}"/usr/bin/gps{,_exe}
+	newbin gps.sh gps
+	cd ../gtk+-3.14.15-src
+	emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
+	rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
+	dosym ../libgtk-3.so.0.1400.15 /usr/$(get_libdir)/gps/libgtk-3.so.0
+}
diff --git a/dev-ada/gps/gps-2019-r1.ebuild b/dev-ada/gps/gps-2019-r1.ebuild
new file mode 100644
index 000000000000..1985f108d722
--- /dev/null
+++ b/dev-ada/gps/gps-2019-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+ADA_COMPAT=( gnat_201{8,9} )
+inherit ada python-single-r1 autotools desktop llvm multilib
+
+MYP=${PN}-gpl-${PV}-src
+
+commitId="8606676b6b4fb245faad5e91127b15c2e61174e9"
+alsId="286f2d6bb14ccd4583034b26fd923e1b80cf522c"
+
+DESCRIPTION="The GNAT Programming Studio"
+HOMEPAGE="http://libre.adacore.com/tools/gps/"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
+	-> ${MYP}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f
+	-> libadalang-tools-2019-20190517-195C4-src.tar.gz
+	https://github.com/AdaCore/ada_language_server/archive/${alsId}.tar.gz
+	-> ada_language_server-2019-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 ->
+		gtk+-3.14.15-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-ada/gnatcoll-db[${ADA_USEDEP},db2ada,gnatinspect,xref]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},python]
+	~dev-ada/gtkada-2019[${ADA_USEDEP}]
+	~dev-ada/libadalang-2019[${ADA_USEDEP}]
+	dev-libs/gobject-introspection
+	dev-libs/libffi
+	sys-devel/llvm:7
+	sys-devel/clang:=
+	x11-themes/adwaita-icon-theme
+	x11-themes/hicolor-icon-theme
+	$(python_gen_cond_dep '
+		dev-python/pep8[${PYTHON_MULTI_USEDEP}]
+		dev-python/jedi[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}"
+
+RESTRICT="test"
+
+S="${WORKDIR}"/${PN}-${commitId}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+	LLVM_MAX_SLOT=7
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+	ada_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATMAKE@:${GNATMAKE}:g" \
+		-e "s:@GNAT@:${GNAT}:g" \
+		-e "s:@GNATLS@:${GNATLS}:g" \
+		share/support/core/toolchains.py \
+		share/support/core/projects.py \
+		|| die
+	mv "${WORKDIR}"/libadalang-tools-2019-20190517-195C4-src laltools
+	mv "${WORKDIR}"/ada_language_server-${alsId} ada_language_server
+	echo "#!/bin/bash" > gps.sh
+	echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh
+	echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
+	cd ../gtk+-3.14.15-src
+	sed -i \
+		-e "/^libadd/s:=.*$:= \\\:" \
+		-e "/^deps/s:=.*$:= \\\:" \
+		../gtk+-3.14.15-src/gtk/Makefile.in
+}
+
+src_configure() {
+	econf \
+		--with-clang=$(llvm-config --libdir)
+	cd ../gtk+-3.14.15-src
+	econf --disable-cups
+}
+
+src_compile() {
+	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
+		-XGPR_BUILD=relocatable" \
+		Build=Production
+	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
+		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
+	cd ../gtk+-3.14.15-src
+	emake -C gtk/inspector
+	emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h
+	emake -C gtk libgtk-3.la
+}
+
+src_install() {
+	default
+	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
+	mv "${D}"/usr/bin/gps{,_exe}
+	newbin gps.sh gps
+	cd ../gtk+-3.14.15-src
+	emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
+	rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
+	dosym ../libgtk-3.so.0.1400.15 /usr/$(get_libdir)/gps/libgtk-3.so.0
+}
diff --git a/dev-ada/gps/gps-2019.ebuild b/dev-ada/gps/gps-2019.ebuild
deleted file mode 100644
index 2f20596db004..000000000000
--- a/dev-ada/gps/gps-2019.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-ADA_COMPAT=( gnat_201{8,9} )
-inherit ada python-single-r1 autotools desktop llvm multilib
-
-MYP=${PN}-gpl-${PV}-src
-
-commitId="8606676b6b4fb245faad5e91127b15c2e61174e9"
-alsId="286f2d6bb14ccd4583034b26fd923e1b80cf522c"
-
-DESCRIPTION="The GNAT Programming Studio"
-HOMEPAGE="http://libre.adacore.com/tools/gps/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
-	-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f
-	-> libadalang-tools-2019-20190517-195C4-src.tar.gz
-	https://github.com/AdaCore/ada_language_server/archive/${alsId}.tar.gz
-	-> ada_language_server-2019-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 ->
-		gtk+-3.14.15-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll-db[${ADA_USEDEP},db2ada,gnatinspect,xref]
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},python]
-	~dev-ada/gtkada-2019[${ADA_USEDEP}]
-	~dev-ada/libadalang-2019[${ADA_USEDEP}]
-	dev-libs/gobject-introspection
-	dev-libs/libffi
-	sys-devel/llvm:7
-	sys-devel/clang:=
-	x11-themes/adwaita-icon-theme
-	x11-themes/hicolor-icon-theme
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${PN}-${commitId}
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
-	LLVM_MAX_SLOT=7
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATMAKE@:${GNATMAKE}:g" \
-		-e "s:@GNAT@:${GNAT}:g" \
-		-e "s:@GNATLS@:${GNATLS}:g" \
-		share/support/core/toolchains.py \
-		share/support/core/projects.py \
-		|| die
-	mv "${WORKDIR}"/libadalang-tools-2019-20190517-195C4-src laltools
-	mv "${WORKDIR}"/ada_language_server-${alsId} ada_language_server
-	echo "#!/bin/bash" > gps.sh
-	echo "export LD_LIBRARY_PATH=/usr/$(get_libdir)/gps" >> gps.sh
-	echo 'exec /usr/bin/gps_exe "$@"' >> gps.sh
-	cd ../gtk+-3.14.15-src
-	sed -i \
-		-e "/^libadd/s:=.*$:= \\\:" \
-		-e "/^deps/s:=.*$:= \\\:" \
-		../gtk+-3.14.15-src/gtk/Makefile.in
-}
-
-src_configure() {
-	econf \
-		--with-clang=$(llvm-config --libdir)
-	cd ../gtk+-3.14.15-src
-	econf --disable-cups
-}
-
-src_compile() {
-	emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \
-		-XGPR_BUILD=relocatable" \
-		Build=Production
-	gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \
-		-XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die
-	cd ../gtk+-3.14.15-src
-	emake -C gtk/inspector
-	emake -C gtk gtk.gresource.xml gtkdbusgenerated.c gtkdbusgenerated.h
-	emake -C gtk libgtk-3.la
-}
-
-src_install() {
-	default
-	make_desktop_entry "${PN}" "GPS" "${EPREFIX}/usr/share/gps/icons/hicolor/32x32/apps/gps_32.png" "Development;IDE;"
-	mv "${D}"/usr/bin/gps{,_exe}
-	newbin gps.sh gps
-	cd ../gtk+-3.14.15-src
-	emake -C gtk DESTDIR="${D}" install-libLTLIBRARIES
-	rm "${D}"/usr/$(get_libdir)/libgtk-3.{la,so,so.0} || die
-	dosym ../libgtk-3.so.0.1400.15 /usr/$(get_libdir)/gps/libgtk-3.so.0
-}
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index dbf1ed2e3aaa..7d5d5cf3bd6f 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -4,5 +4,5 @@ AUX libadalang-2019-gentoo.patch 2826 BLAKE2B 11269fd6165c6138cfc67f28d460768376
 DIST libadalang-2019-20190510-19916-src.tar.gz 2345942 BLAKE2B 807fd6ea0183b5535e96b258998a0540aa77dec0669db81bae10b56894e12bbb381b356bd55d6684156101d2ea0e5439c2551a4213a81e79e4697a7ff6ba5df2 SHA512 9ebf8d0c01d12f5a8081fced9504b78a45cbde6ecc0e6abeed99aff03abd0b241c1ecba85b256911e474cb77e10e5e387f64d51a2d9b18596baf40313f44f089
 DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
 EBUILD libadalang-2018-r2.ebuild 1437 BLAKE2B 3fb9d77c0c7fe88a75746277163632a3567cb59c0dc7b4db3575a1c8dfa85d41beb71ad627e205dce21f0aecf5d22efb0d6114adf272431e93612481e32fa75e SHA512 132639d28b8f4ab2df3c6a4622056d6b8b93daf6fe9403d964eff5e1d864d75bbec215ab9a0b38270555c21c025c5db2bcf780621efd0c46f1fc7ed8e18100af
-EBUILD libadalang-2019-r1.ebuild 1539 BLAKE2B b46601e5a64a2775f0932b2ea4354cc632f523d0b145b7c09cd0931b37eec286f4babd3c92105ae82fbb417926982e7663cd4c3ace47c0d54f25ddc64f0e5243 SHA512 1ec89c7eaf08d8c1cf1760c50b5cc4adc7ba16d59710548a909920c7fbb6a2cf59ee5854e30b5277416d8a0f94ac512328a8a75d1e63813e64032216ec203e01
+EBUILD libadalang-2019-r1.ebuild 1543 BLAKE2B 91958b07b6171dc8804c31e4b825169724d73cd5b06bc4aedebd96836ee702f6874f0ec91d8d2f1adddcdab893cdc852a36314c4298d1796675fdec8c1f79daa SHA512 c06b8b79e53f5668ce312ed26a3b73343831f78db514be3b94755c8a2d5a7109b91f7616690ad421b1e1c2d2e0d56ca70168c09c824049579a34dc9777a46cf0
 MISC metadata.xml 574 BLAKE2B d8d9f0fb7ec754f8da6d372845758ef8738e6642eee742532ea1b0389029c4cbcf6cc502886ca11add1ca4dffa6cdc7b708efe397fda10921fe2b67afa1de03f SHA512 62f862b759c82a402015b3dbf6d6979240c642724df3c9591f31ef00a85e65fb3187138672b93f71cbd122083666731be61447acf4e46e24b81d8568778cdad9
diff --git a/dev-ada/libadalang/libadalang-2019-r1.ebuild b/dev-ada/libadalang/libadalang-2019-r1.ebuild
index a19f499cfc2f..02d37bc01231 100644
--- a/dev-ada/libadalang/libadalang-2019-r1.ebuild
+++ b/dev-ada/libadalang/libadalang-2019-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ KEYWORDS="amd64 x86"
 IUSE="+shared static-libs"
 
 RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,shared=,static-libs=]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared=,static-libs=]
 	${ADA_DEPS}
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 5afd2d08b57f..a754c483eec7 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/atkmm/Manifest b/dev-cpp/atkmm/Manifest
index b4e67f67b907..dc582917fa84 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,3 +1,3 @@
 DIST atkmm-2.28.0.tar.xz 891904 BLAKE2B 8172effa5f4dc542020b58d7e3d3bea66b0affa98db977e94249dfd8fa6c4fdea88cabb385dcfdb2d79874017c4e648a737413bae021121d1423d62e335d2737 SHA512 8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc
-EBUILD atkmm-2.28.0.ebuild 822 BLAKE2B baa8ba61e974819e369461c82203d64c31650dcd1ddbf4799d5b9dc483eb08d71aedbf897d3d6427f996df9644b56aa02cdd20328299f52546750adede0a2826 SHA512 b239735db3ff303755d85c0297786d43ccc663fd54e5c1071aee18d1158fc378ec38cb46f743860afa81881be1d3373b2ac61f5ce97b14a65b055e16b495ccf2
+EBUILD atkmm-2.28.0.ebuild 823 BLAKE2B 937e519ab6f1f2facea07f378ba9ccc7a5c9a6b2f917afa18eb5c4f1153654bf10a87c1f6c9b102baf8593bc7dddd13978034cc0997c7eb72a8433493239775d SHA512 ffd582b818b4dc2f27e7c6017ebc1f0d4453e13e8a5d09f0c23c441b58489cd05fe173ca2b6590746993de75fefd10a0cc1d12cfaa52bad1341ba6f6dec3499c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/atkmm/atkmm-2.28.0.ebuild b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
index 508260ba6e47..7aa82f9f4e76 100644
--- a/dev-cpp/atkmm/atkmm-2.28.0.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.28.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"
 
 COMMON_DEPEND="
diff --git a/dev-cpp/catch/Manifest b/dev-cpp/catch/Manifest
index 86c8ffbfcb99..06d374e04237 100644
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@@ -2,10 +2,10 @@ DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee
 DIST Catch2-2.5.0.tar.gz 549328 BLAKE2B a32941a043a654228cc541dc675ad789f5b938ebc2d3177d1657f66f68fb175bec8c88a60ecba00e84eca74a7506dc83aed74ac89f7dde83213284eb4a497225 SHA512 420f1d1a5ea7b69be9fb316a8abe1fb7c7e78d44a982e883748f1e0c8d2a435c1518b6022742716019558a740f8b31977ed6a786b0293e0504206b016801cfe8
 DIST Catch2-2.7.0.tar.gz 569753 BLAKE2B cec11d79c85ac8a5577467ceb4722a2441a1dbd2fbe42fb06324113d2a6f9fadc12de351735900817274520bf8533ec245ba0a3686c8c1b4813cf3136d6d552f SHA512 ab6c816642a92418c76c8ddabf17eb0c19bef1dc6ac2405c820280d670ef1d78c9ae89909f5a36bf063f0939d253b7c6b5e845c1ac4e63b338927e125dee950d
 DIST Catch2-2.9.1.tar.gz 626539 BLAKE2B b68f17dba65cc8d1a842b105e5aa6a32e713df8d34c32b918e0588e6b87b8e3ae56f9130d1590795489afe2e29035c262a05795d0ee44c9e9ace2e814801821d SHA512 ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6
-EBUILD catch-1.12.2.ebuild 803 BLAKE2B acbd83bf8eb3f430fe160db5d944677ab624aa9bd14e363ff41dfddbdd1c03dcbdcd8c7dcee78c6a1f541a55229ad680dbc347dacd846c03c6c7b96f1e0ce322 SHA512 1ad95762728b22ab9f6d73742b82b17697089cbaed9d53e18b17c82cf6759a50dd29113d35808a38892a21613050e057d0c2effcbdc134590046b3bd80a7c915
-EBUILD catch-1.9999.ebuild 805 BLAKE2B 77b0fa114ad31a26e3dcbb150f12f14f72487b3f6615d81bc31f22605be87bdd48a5b4e7a9922d890cce9486624abde7595a4dd50ff36ea65775c5640614143b SHA512 4e6b9291038587546d4345a252e5933146e4ca70f42048fd8cdad5f019f1f5e5a2543ce99bd044940c813511e7e6dab3c67f7e8848821cb749d5f19451f98089
-EBUILD catch-2.5.0.ebuild 914 BLAKE2B 8d7d84cfdf672fa0b9d34dd485ad254232dd953cbfa737700483d0cc1f14e563c34a1933f6109aa9e02f43708cdf76362dbb5320c3940269723f140414bcfb34 SHA512 cf13093f304b747c2fcb98dba03b47183d5a8926250c40098746ad0114eaf65f320a4c5da9baebe88b1ca65d724d8ba2fce468768fb86c9623e86d4eef24eaec
-EBUILD catch-2.7.0.ebuild 916 BLAKE2B c4f1aec2962c2130fb7bdfa98604499ca3944de72beab1931669566c29e391c5a7caae830922d8fb76755c1692ec51c53f0fb84378f94d7e2d162b3539672c57 SHA512 293dcd57b58004378c8e1bb9c0cf9a924ff7e698bd564408039cea32d2188cc2d11c39c2a849f65fe614adb895ccd3df674c5884b6eda34b9b16a6f3aaefa40d
-EBUILD catch-2.9.1.ebuild 923 BLAKE2B 66b33e2f955846ec1fcfcebd1267a33aa8d4502008f0c9cf41dc21fa8d45ed1b82bd9aa092a9dd236ed6d5b942723245f760b5bf688af856578201aef23964e2 SHA512 7bc16b5e9567ea42367adfd973ac40b49d0a40007ac0d022f611244eeaede6f4d28a8cc4e398fbb15ffcf47e3f5097709545f87eb895d3a1d2e1251657bcd1dc
-EBUILD catch-9999.ebuild 923 BLAKE2B 66b33e2f955846ec1fcfcebd1267a33aa8d4502008f0c9cf41dc21fa8d45ed1b82bd9aa092a9dd236ed6d5b942723245f760b5bf688af856578201aef23964e2 SHA512 7bc16b5e9567ea42367adfd973ac40b49d0a40007ac0d022f611244eeaede6f4d28a8cc4e398fbb15ffcf47e3f5097709545f87eb895d3a1d2e1251657bcd1dc
+EBUILD catch-1.12.2.ebuild 810 BLAKE2B 4dc1b7c249d29055bbcfc7129fd087a94b96778910cdf029fdab8f2fe98980be83fb4584b76bbcadfaaeec71e36a6fe8f417698c44face10d96ec0fb059e2688 SHA512 8a6a263f3c3f1c8c9c434902ce1c906b7a9954e6cc757ce74d6d658c1131aa5e40f246a62ae7cf78b33048a16902d7223a8d135f6dc8316e970727007df9ac8e
+EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832
+EBUILD catch-2.5.0.ebuild 904 BLAKE2B 46a8193ac8712652a0ebbb951af317baa92c451498fb7bbadd86e642505bcdd950e42b813cc2ef449e6fe4d7781c2e5e5e08c2df6f85128c29ac3d3c7cd6950c SHA512 524bb5a1ab8eeca5e4cb626590f5b4a5512bf0f27b6e9c2a64e782e02c206fc22ab830481d5a962e739ea6b373d1951f5239b4b2e6ec8e02b686fa698af6032c
+EBUILD catch-2.7.0.ebuild 906 BLAKE2B 544bd24f9701e4e941a7a9436f581006e1dff9d5b279df4b4bbe15aa7cd3d36a59828f2fc6cba2cb8e670b78dc039b6acf7bf955745550f3eb33b5292e1dbae0 SHA512 4e9f3ec76f17269619f6d95902cc289ad441b94d52bf25e2a95ef80ddacd95498afe0fac2897d62d339c2e60f2605814592ada03eac1bde9c028e9afe69913e0
+EBUILD catch-2.9.1.ebuild 913 BLAKE2B d2ab757a399604fd1e2223b9baf194abac778b7a68f31c6013f5ce279db42c814cbfc573393e63fbaf670de9428cc9c51c35a487c59d8584ccbc4d6bcc028f97 SHA512 1a7bfbb8e6ac17bff9e05a2ca22df357f38dffcb2dbb4529afe7da741f6461476e25bfd67381a62147665a6cd8ab9941f235898efd42e13d209ddaee655cdc44
+EBUILD catch-9999.ebuild 913 BLAKE2B d2ab757a399604fd1e2223b9baf194abac778b7a68f31c6013f5ce279db42c814cbfc573393e63fbaf670de9428cc9c51c35a487c59d8584ccbc4d6bcc028f97 SHA512 1a7bfbb8e6ac17bff9e05a2ca22df357f38dffcb2dbb4529afe7da741f6461476e25bfd67381a62147665a6cd8ab9941f235898efd42e13d209ddaee655cdc44
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2.ebuild
index 8f80ebe3e71c..f0d846f42bdc 100644
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 
 	S="${WORKDIR}/${PN^}2-${PV}"
 fi
diff --git a/dev-cpp/catch/catch-1.9999.ebuild b/dev-cpp/catch/catch-1.9999.ebuild
index f8b78e009959..3514580992a3 100644
--- a/dev-cpp/catch/catch-1.9999.ebuild
+++ b/dev-cpp/catch/catch-1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	MY_P=${PN^}-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 
 	S="${WORKDIR}/${PN^}2-${PV}"
 fi
diff --git a/dev-cpp/catch/catch-2.5.0.ebuild b/dev-cpp/catch/catch-2.5.0.ebuild
index 5af50e08abb7..e551fe4b0d20 100644
--- a/dev-cpp/catch/catch-2.5.0.ebuild
+++ b/dev-cpp/catch/catch-2.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/dev-cpp/catch/catch-2.7.0.ebuild b/dev-cpp/catch/catch-2.7.0.ebuild
index 483403fa60f5..2467542c7d9b 100644
--- a/dev-cpp/catch/catch-2.7.0.ebuild
+++ b/dev-cpp/catch/catch-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.9.1.ebuild
index fd90fc1a780f..07de51f32521 100644
--- a/dev-cpp/catch/catch-2.9.1.ebuild
+++ b/dev-cpp/catch/catch-2.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/dev-cpp/catch/catch-9999.ebuild b/dev-cpp/catch/catch-9999.ebuild
index fd90fc1a780f..07de51f32521 100644
--- a/dev-cpp/catch/catch-9999.ebuild
+++ b/dev-cpp/catch/catch-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 5d3695d6a6d0..b2ad12ffaa2c 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -10,8 +10,8 @@ DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
 EBUILD gtest-1.10.0.ebuild 1741 BLAKE2B 0c7aa86a1f1c7383083e7b9984ac42637271a82de50d2885c4da1bc70d960e155dd9396414ec0a59f46cba21db7e9d87ad2d44f57ad0352e60bb4df36191b4a6 SHA512 37b781ec3ab381d4fc2d4de0317044c82306fdec8b5bb9bd31f16ab277a3ecbd288ce95c79723d906a3df54fc34115ea528003c2effe430048c6217e3a44ed01
-EBUILD gtest-1.8.0-r1.ebuild 1667 BLAKE2B a38315ec739c2a1ec613b0617c1e521c71ef04d92c08e475ff6e090c6ca9414262289e6511ff7a2b804388b28c1b548fff45de4c886ddf5c98e8eaf3b0a82b16 SHA512 0fbab7dd1e3fc07eedcedacc9764a73dc582eee79347207071b2d9687d73d5ba57b76d59b2072d15c9674a150fedf07b05b9a5406e8949b5343a977a1208d7c1
-EBUILD gtest-1.8.0.ebuild 1629 BLAKE2B 9b4b16533fb26e2b4a847dbc23bb9f60f37b0d52e19e613734bfacb32014fa936d6b978e69b8bdd8d0625c394b6b61c5b9c29dc3e663e2fc31ab38a286856539 SHA512 35427ebb7c3f3675441c61640379b677cfc735ed9a0029af53757645b3c54d661aa6488c3c539fb71873ef42877db63d434c6f4351cf2c9e5f3aabf3ca056c80
+EBUILD gtest-1.8.0-r1.ebuild 1657 BLAKE2B 047a1a6f5f268097a07d9247bcb21ef4376b8a57a33f5124d0c352bc4d8b69cabf602b1a1d7b4df0820794da0506ea695f13719578ee586af1a5da91531fd965 SHA512 53e5796ed9e5fd83eb613ee7502270a309ee3e29f7d0b56f1ca505b2ad53a36b5dc3b7736f4638e754b81093d4ea0117480606873131890ab5e09f54bb06f3ba
+EBUILD gtest-1.8.0.ebuild 1619 BLAKE2B af6333caaf4ceb69c2da395de298c1b4143590f93c4772e08babf818d8355caaf479e7e6049a728c45d6f4900486b49b5d830dd817c9ffbaf6d6545091b61ad0 SHA512 9d4a437b4f44889bee07c188322801428384e17850ed59fa8c0249fe608a74291f80707c89b69969667a3e00b2998dc3181f1f8319adce8f25dbff144ecfb593
 EBUILD gtest-1.8.1-r1.ebuild 1668 BLAKE2B a63eea44c8d7757ffd095878f9e0231721348b7a393ec22460d5a16fbcc13b547ff64c763afa23c5f149ea403d7d7cda1c8c289252c4bb55b2bdad506cde1490 SHA512 2b8b2052cdf95a0bb3cc34f994241fab2aaa2025047e7bd28abc3935909678f04f6bebbd0fc8bc53fa0d49e26d2d61c2de2728c1e3bdb3e9215dcd1341afe0d0
 EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 725aeb5f466117fcff146ce21a8b24c217e3b93a0d29ec818ce33e8be86d5cde49e496e2f89ff8d5be9727493c784d05c1fe62676eb109cbb47c7e8923e5bd88 SHA512 de9df7378257daf7230b3ca2dde490f12558182c8b11f338ddfd3686a11532f5e5f1a5a37c607ac39bc08c33642e5e355d115aa0d771342f3ce0f8adc88fbafd
 EBUILD gtest-1.9.0_pre20190607.ebuild 1761 BLAKE2B 166da65b61beed61e4b0e0a9f75a140a51d8efb615ed5a9e600116ada3aeeec0490ea157f1d351cf20e78f188145b68e8c8351bbbd07c497bfef10bd4b5c0c04 SHA512 e491a1ba99580ded0fb029085bae44515a1012848608b29a1c74996c7ea91d76e04ba97cbe07f9b9e2c238c5ffbdf65cb06219bdefe27ff578de880be8e11fd8
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index d0bb702c3d7c..9944f7eff03f 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-any-r1 cmake-multilib
 
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
index a2a23c63fefa..1c2aa8c95760 100644
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-any-r1 cmake-multilib
 
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index 5ee5c9857971..f4358d306ccc 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,7 +1,5 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
-DIST gtkmm-3.24.1.tar.xz 12482756 BLAKE2B 238b9224a57b929cf75617de326f47ff15da07a4a68e6ae10903b29f5e1e29f4fbbaab82f7b483fcdb4c27aa25908bf9e80c4362ba3df298073c73530b79bcb0 SHA512 be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
 DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
-EBUILD gtkmm-2.24.5.ebuild 1554 BLAKE2B c395fa1cad348276e8f8a91ab69442d940e8a3d69f51aeb42be574fd6933dbd3937b4436fb997e80b310a7131d7157181d8d924b15d8fc2d915e186228e6ff22 SHA512 8cbf63a4159bfe42f4ed6f8abeac9f843e3b774892725742960c0fc993415233e6a98fdc6e1cd5eb624393bbe0e956fb2c275bc760c50bc7f5e7a4faeef12146
-EBUILD gtkmm-3.24.1.ebuild 1846 BLAKE2B 9c5bc4bc488836226fbba384b054a495548e1a4eb7971ae94746626cde394b9dd75736db469a7aac0b43fd2b0498d23de9f4e127c82ab398c54d28b230adf5f9 SHA512 c922ab781853f00363056ee13b0db9add6478054e07c004cc6ce5d22263744d2c61e0bd64b356a3641a81002802d36bf5a729b98960713ead371441072d0eb48
+EBUILD gtkmm-2.24.5.ebuild 1555 BLAKE2B 17ad219b34da1a9188765f58cb8152f7f3136f01d45a2ee26f98ce66bcb2394a9512c85f692b78f44ba302ae56d80ce16b4ca94258cb227ce5cb73ac5618dfe0 SHA512 4de8d15de0fcd94fa3e8b9c98e641b215f28de3281013999c0694437240fa961036ba5320a21fc563b9c2b87695b627892785bf4881bec3631f1b9b167c90dbe
 EBUILD gtkmm-3.24.2.ebuild 1874 BLAKE2B be05332c336138b7834bfad9ab96db7c19851bbd1b480ff3d3c3450de13ac536861d68f793ea351fa1070186b26d069e99efc5ca852c222d1436eb90d7151282 SHA512 919abc6ef78a577830ac50f4fb929ab489c9fd52e3f3b080be40ba557f75a65ccb4ca941d5d4264054da17f78efa4f49e855d4a4a92d7e128482321e95660cec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
index 40b8fe7867d4..719b4a6451a2 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
deleted file mode 100644
index ddafc05c9c0e..000000000000
--- a/dev-cpp/gtkmm/gtkmm-3.24.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="C++ interface for GTK+"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="aqua doc test wayland X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( aqua wayland X )"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.54.0:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
-	>=dev-cpp/atkmm-2.24.2[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		media-gfx/graphviz
-		dev-libs/libxslt
-		app-doc/doxygen )
-"
-# eautoreconf needs mm-common
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed 1 failed"
-	fi
-
-	# don't waste time building examples
-	sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "sed 2 failed"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		--enable-api-atkmm \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable aqua quartz-backend) \
-		$(use_enable wayland wayland-backend) \
-		$(use_enable X x11-backend)
-}
-
-multilib_src_test() {
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find demos -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
-	find demos -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
-	dodoc -r demos
-}
diff --git a/dev-cpp/libglademm/Manifest b/dev-cpp/libglademm/Manifest
index cda042746f55..056090f19b0c 100644
--- a/dev-cpp/libglademm/Manifest
+++ b/dev-cpp/libglademm/Manifest
@@ -1,3 +1,3 @@
 DIST libglademm-2.6.7.tar.bz2 326385 BLAKE2B b79bd099f7eba02585921cd88331cd3c2f0a362396efded2996b149689f1869146a81ef174e9f983f348fe231866e4dcc719eeef62f5f3a2b0ba5dbaf1375504 SHA512 d7042d0549df9322d3202d5c0733d65b153a8ff451bb9e401b9d93a915ec4c2c086428e4febcbae2ecec5936955b7afbc59beff93d492f23b7b8e2b19fe806b0
-EBUILD libglademm-2.6.7-r2.ebuild 1581 BLAKE2B 294c2a5567a45200a6a33d91f09eecfb75ed56fa6b4ed2209afc1dd83692753832e288fb693b235f4285b2d65e3cf9abb292ac7516f0146db9220826f6efd4a3 SHA512 49dcf68678ebac54f536d77fb9644e340c06f005bc9dd3281274888a7b25c463218c7f7a511301bae6c9bf6946047f9546905cb787650e46c1d332058ffc970d
+EBUILD libglademm-2.6.7-r2.ebuild 1579 BLAKE2B 63c100c7e81d34abc5b05edefe180d98ec305352c095fa44848cc85dbb14fd85e3e2335d5eca9ee36721a056abd5d71bab8cdf63429a9376afe24c4c32f8970b SHA512 8e33fbfdbf176dffd9964a454f7544dcde657197197bd6b77b728d12234500db2388a8a0d95148977fb1c40d6d6924acf5317990f2249635dfdf8713aeeeab95
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
index 3568cb9aae51..5bbe4bfaf43f 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.4"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
index 72745d6f9b79..bcef60ae04d1 100644
--- a/dev-cpp/ms-gsl/Manifest
+++ b/dev-cpp/ms-gsl/Manifest
@@ -1,6 +1,8 @@
 AUX ms-gsl-1.0.0-disable_Werror-644042.patch 1110 BLAKE2B fd126ec96d9a378eb8489919c130a64da9548b712a6a01fea5256294dca39afce813013f78c1b43a251b5b7fbe8846493dd9860aea2b7578c39c2cf766247202 SHA512 eec47c7f4d28d7b14a3403d046dc111bb3ef9e02e9e797f74636f3f7d11bc865c94e246bd4f98d9f39540c66b751de0ca81d523be3d523017e94886ec474799b
 AUX ms-gsl-1.0.0-use_system_catch-636828.patch 559 BLAKE2B 899f98f0b3e9b0f04cf0db9e74931113ee1d5ef77d5e016df9969abc5ea02d6a90736fa3cb37b5f3cc6ec5b4092a2660f610f636386d5de3c6e6e9b61fce0501 SHA512 4bfd90b1567fa708d9c51c78edb51974aae9158f456077a305de5d7d279686d85e593bba5c2bae477eb50880f731626192765b6122db6afcd383596d1a1e00dc
 DIST ms-gsl-2.0.0.tar.gz 64726 BLAKE2B ab40725aa38af7c5651e22ebf32d4bd9c27a10be2e206fd4c3c0173ad21da262beddef022b7b158653b185cfc3269f2b6e80d99fe65f601ffc3e770b143b03f8 SHA512 7339527222c8a97a94c0bb4038b3d142045ec5d80995e628574ac96f4d9d13c41ad70fbe0d8390586dc0db8d9ea55107dbc95de80f7335eb78ef9d2e7047d726
-EBUILD ms-gsl-2.0.0.ebuild 782 BLAKE2B 077dc90a24e08b4adbeec5d491fc43eda8bae1e3014bcf2b847e714179a988dc9d98a06255b6959427a6ca1c044340c4a6d3be6ebe783f90af08264d6f96903f SHA512 af16c7e0851ff7ed233181b94f826fa385229b02a78a612f389fe89470775ad7888e4e3beb3704493cc5feffcc48375e51e0fa54d94ff978061044afc0194939
+DIST ms-gsl-2.1.0.tar.gz 67289 BLAKE2B 5a247028b71521d7851a6aa5f24936dfb1c7f283854724d8d4bf2d9d9ac3a928c0e5b42a280d8a0a0254d9f6fa958bf1283dab674c649bdaaa7b38ef38f3b1ba SHA512 4382b8feadf4608b06b66a78ca51b0f60a6e8b41b183aec6ac8f8e2e9f0b39705dea513fd708012ed8390c1a4f88d7df454f05166b76bee24ae843835cd4a2ca
+EBUILD ms-gsl-2.0.0.ebuild 789 BLAKE2B fac20f1d690ebc855a4e499968241ddd3a718389956488a4ac8ebdd9af9e06bd1ed7b88a203ab9290ab919c663ce4600fadc93af6ef48e6e5b259ed7567bd913 SHA512 56a1f4f52cb439a109e7c41a59266b6c0282ed1345265de6368a4e2caa57b31c1e9eb8091ebcbd1df4cfe8fa8b480479ecac59f31ff6f98e966f0775f7446b03
+EBUILD ms-gsl-2.1.0.ebuild 791 BLAKE2B cd4792632a1985501141c0b7efbe5fa0bcaac46799842439088aa9b97101cbc9717eda6b7b937c0ca86cd5e360fd06e66d2ed28b175995b911b30cd39e85f1b3 SHA512 1aed7dd88f86cef16317369d77f4303c1539167b3660e9279edcedea4d2af871383429289743d7fb32f7a77eaf60eaf1d0d4a9a8e009a9a728a4c8cf0e275c89
 EBUILD ms-gsl-9999.ebuild 738 BLAKE2B 6370f30e2e84fb7620399ea761ac22392bdb6d283a856e5f5c53b892ae9d4a2279eb6d59e388703a2b70878c987d4a26c5c073cb345dfb914b68f1b9f7849e1e SHA512 acd80384e09fe1cdb6b2c2c2e2b550df8c2a1d66b6ee5f1e92b6d76f9524f4ea36ef2af9b09f0ce277905c6fd425664f13b9df3c9a1c968e9895d98aa732290a
 MISC metadata.xml 533 BLAKE2B 997b40261c13283f190b7fe70b87e9d42b2b05c267afdbfc1de3a7b56bfb968736fd1a1163abc723985919fd201048fc69905cdaa6d6e4a8f938bac42495d13e SHA512 01522dee3ebdbe7e5f533a64859c8f215f8653ab6d7775f1488efa9aa813840ae7c2112cd4865b007feb1a296f74aeac123389881608e169f5d0f417dacd7719
diff --git a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
index a9ddc632488d..c25d5f9efe51 100644
--- a/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ S="${WORKDIR}/GSL-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild b/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild
new file mode 100644
index 000000000000..75b11654651b
--- /dev/null
+++ b/dev-cpp/ms-gsl/ms-gsl-2.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Guideline Support Library implementation by Microsoft"
+HOMEPAGE="https://github.com/Microsoft/GSL"
+SRC_URI="https://github.com/Microsoft/GSL/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/GSL-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# header only library
+RDEPEND=""
+DEPEND="test? ( dev-cpp/catch:1 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-use_system_catch-636828.patch"
+	"${FILESDIR}/${PN}-1.0.0-disable_Werror-644042.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSL_TEST=$(usex test)
+	)
+	use test && mycmakeargs+=( -DFORCE_SYSTEM_CATCH=ON )
+	cmake-utils_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 859adee9b898..553dfae518cb 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index c88922184712..b2a49c711671 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,5 +1,5 @@
 AUX libdbi-drivers-0.9.0-doc-build-fix.patch 694 BLAKE2B 95207e6fbd947c01a1c3a99806f09e3f932b6d7b6fe1b55ffeb98ce73a54b7f984ffe9811c834e53e961500ae688b0548599b3f9b47a5d1e083eedf5c7ed650d SHA512 0ff58a08909327db91ebd0dfad7ac88ebb17156bbb7afc8bfc8a3711fee37708a7ad715ed50b5085cdd15d3cdb5c06de3a0779694104fb6332a1e9c2f51f5b0e
 DIST libdbi-drivers-0.9.0.tar.gz 1829864 BLAKE2B 2071c0cc21b1b4eeda926d5ce36f6dde03ede206dac91780aabafcb7c5b399f4b9580910e5ede08c9f0bf026f4af2088d1d0e8c1835b86273a7739b2946ed3c3 SHA512 f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1
-EBUILD libdbi-drivers-0.9.0-r1.ebuild 2182 BLAKE2B 47d5e10c412a8006b23c3b27ad50b4ac13f4e80862a2561c0bb104dbb7fccd9cecc84e53fb8132406eab4b9b7e6a5a08f1ce21e56efef940e1b6dbb1ce0b51af SHA512 4d6351dd711c3a0348e379bfd49e2e9baf55b73051c1475c1650629ed23054e0c02af0c19275d96afe1c19ae23e94744be12f6e4c77f00994f43154a3b8b0ccd
+EBUILD libdbi-drivers-0.9.0-r1.ebuild 2181 BLAKE2B e0a30c4b23001570b9ff6f294d889297bce9956b2646ba55f169e449e182eb35801f90132f6e1cb57230424caf793a0f26d84a1815759d893cf7c44af0d5f6ee SHA512 8a8fbc0d80555532a8e29fb442ce051848cc87a144dab95852faf3149a6b608c30fca0ae88228ea44b5f68c9686cb8018a0aaaf29ca515df7f3a484862331dec
 EBUILD libdbi-drivers-0.9.0.ebuild 2121 BLAKE2B 38856712429751608302a225183962938b6c40b759df3fe0f893abf3ca13e35f1a9b07ce829d6b6977304e23b4f1d5181b53bfdf545b2def79f9dec8d937b182 SHA512 fce5743329a2f046933f875e54074c97b849d10ef230fa273bd1f948670bf5731dc970983464fa959014044066f621b4a232275119f96c9e8a65f877efd60328
 MISC metadata.xml 302 BLAKE2B 50e613a8be312f9b8e234ef4a810a318f51f70e71f37a01f1932f2e70fecc543956e84690de88a14dac252101865ac0ef454966bc1bf54e5f574d2d6fddecf3e SHA512 d0d6c905c747105c3b5c2bde24ea7f8c63225779fe41f106b3de3d3082cbc01b0749546c3477db1e9f14db44e1b2921316f4cddb256ef8dddec3b4176a051c70
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
index 1f95474051ca..52b9ba3a8c8e 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
 LICENSE="LGPL-2.1"
 
 IUSE="doc firebird mysql oci8 postgres +sqlite static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 SLOT=0
 REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )"
 RESTRICT="firebird? ( bindist )"
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index b26cf0fc4cf8..0c7e0b634624 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -4,7 +4,7 @@ AUX mariadb-connector-c-3.0.8-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334
 AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3d0095a823917704d52a5f16c349ce7017b93b1bebfec01287929470a89a2e4aec2f9f7cd5135368e43f2a2e89257c0d7042b878e1806ede8aa SHA512 fe621abedaf81d1fa367c52f69ccce1765757db8d9f412aa40b440d7e51d4de3785a90150e76893f7066b1ba656eb1bad020465e58adae13f08245b839bde4de
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60 SHA512 44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8
-EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2842 BLAKE2B 207d08aff8494af4fd67c5fc9b8292348bc3c198655e3ae66c8e2f3fa7d27af3d177e177279ceb333d800fb9a8c5b8343edb9722282e892be42b73d79660e80a SHA512 83bcb560d6f10ecc2b24004b7dd71c6a5b5c9385b3787b44362d7cf0c3194bb4bcb0c25eacce5f400aa22091a3fd31acf7695d663c0446ed07e16f9e0f7480a2
+EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2840 BLAKE2B a27ab2663f80bf02010600084e7a25f00fcedf648712ed9e5dc3f179711d59b39ed7b6901e50ddd29742ade84d9885f14fbd7fe4dc48190b8cd558f0d44f26a8 SHA512 50bfcd66419154803d4c8ab75c90ff2cfc9bfb1fac11d9c79d9e2a2e8caf5c6b95c1280319a01017904e37671fd4cbb46d3bc344ce3d2708dae55f6f05144dc1
 EBUILD mariadb-connector-c-3.1.6.ebuild 2344 BLAKE2B da4880e8fee8dede76cce177181f1290874f3a72078b9d7a3cd9ce3ad6d3abf7d72b418e81f57bdeb321e0e39d5a052b0195be70c92d066a53d8c4f0768842d0 SHA512 0b747b13ba14a5b1943ada402afbed3b19c490fb1b07fcd2a9c1791b1c97566186d9a46c9ac35113685b1a32b287e9373339f932c0e794ad86a19aa497de879a
 EBUILD mariadb-connector-c-9999.ebuild 2344 BLAKE2B 503e29dbd45777f693139c7febc843733c68b1c3c6151e7f69afd5b09fbe1767be464f912c2d7a8a082320a951952dca213ec1241b9fb7b2a2a3b2818bffbed9 SHA512 47a5d77dfb14bf5ffdad3bf849a3bb0df995a4c7db5b94704231ad70ff6e7529c5713e830e8c11c76d1cec0303496815d449390b84d91ca9687e312939883166
 MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index c4997d7b9543..11f78ab3576b 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -71,7 +71,7 @@ multilib_src_configure() {
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
 		-DWITH_CURL=$(usex curl ON OFF)
 		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
-		-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DINSTALL_LIBDIR="$(get_libdir)"
 		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index bb041611f590..bc5f8668a5a3 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -19,16 +19,16 @@ DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae9
 DIST mysql-extras-20190305-2052Z.tar.bz2 331304 BLAKE2B 1d2c35a961159fa5ce9ee6699fce943f5a5b5cf60b11c9bb4bcccee4943f4508a9eb6d01050c642353ac592ce1a6b421abf2a1bebc706c44c4c8a36aa698ec43 SHA512 ae63403320e010acbb92f8aec6da8ed4f267cef0bad37147d594076fd94571de7f98bfc2afbe94af5d716f58d57696fd958b1e13e20e87052f252ed4a188cd3c
 DIST mysql-extras-20190731-2258Z.tar.bz2 332111 BLAKE2B cc144c9af852bfdd4149b96bdc22f8afb2d0aa92f95ebd272a244f0fb7743dc03f9244871d5c195260bac5d9ed20583093257ee2c95a5a4d0a4dae488d781adf SHA512 d4428a1128cd5aef62c463b659992b110090b1602cdcb6b8d922d570c6b946fde325bfcf5a9a955a8dcc61f3ccd3d612d8517ebf63e316f98ca9ff2cd8a807aa
 DIST mysql-extras-20200203-1749Z.tar.bz2 344999 BLAKE2B 46441f3c210c87b8ce1df89e9480d0bd5be216b0a1380c3ca330294e787bf2fb2b7078438f032dd0381363e756312d7634350a0b02c00b3145d4787a9ad65cad SHA512 210d240efef4d7bb64d356cae240039d9bd65e2bd4af47e01131ab5bf48779f4c0519e50d212d50db998e6b9bf9d73f1a03b0bbf4f7d6dc6f978660c8ac8a21f
-EBUILD mariadb-10.1.38-r1.ebuild 29479 BLAKE2B 7f89c988240a3450ab95234155b18430b271e6af0656711bb0514cf21635d3fc541a05189455345a55bcc071f30ea1a401826d945d177eab043db0ad7db5d5b4 SHA512 4bee8f11cde366979a57898986540ff8736f2e81770e2c1b33af91414c51a13b19af297c2831c6680c3f36f33eb0b2276d637ef5858d8803fee09d520b46094d
-EBUILD mariadb-10.1.43.ebuild 29882 BLAKE2B e67075c31a1585036ff4d82ddc7ce00119ee9a46170144acd59e1106c0c1cd05cb1e38b9e7eee77dcfaf320ccf3615845e1751cca242d7376d1c535a587d7c72 SHA512 8072069e496ea9300352264d71c998bcd926bfabca50607afd1b3bc47be265e31fd137737b6e85b7d2d4c2dc8d41d1f054ca846d94fe548eb1dda5a06f3b5b82
-EBUILD mariadb-10.1.44.ebuild 30055 BLAKE2B 78c0c30940f69b4d38b9975c68a80c856a3e4a03169276ce53457c2aa7ccc76872718d6b09e31302ec22b0e3107da51d7b69b828709fd38af92ca5b1e19c2bf5 SHA512 7d3697d4708496c673f289986470487074e26c4776199af68cc818bedfe1e327bc25b6db5e197a27d6dc16573d58de5a69db6bdf2b4ba142b12f3fad7d4c8a25
-EBUILD mariadb-10.2.22-r1.ebuild 32530 BLAKE2B 2a6a9aa24f06052d8dda82a1c1dfdc836122e5e9e248c621bc69b80732beaaee86aff666e2bcdf1eb7cf7f15628f11c785d84d99980c4d0459c792d0e8d9e2c4 SHA512 62cac25905993280f8b8d24e80751261513bb129401d01ebd51cda9fe196109473bbbe760a126d0949d7466279b1eff3892ab394c031cd7ab4a8ccc3ae3a3667
-EBUILD mariadb-10.2.29.ebuild 33103 BLAKE2B fdf29163bd6297d9627a3d767e33ab8c43e9df5a88a3bc6d9ecf1e45523ed55014f6febb304cee3dfb17d0ed195f6f9f457dc1eaf5da91779220569c6a95b246 SHA512 ab764d0c158718ceb3081b8c21bc9b370171bf6382fae8f5286ee9ed1df738163a96f8ae746a3eeab52ab52bf6e3e4477f27ae3c9f32b5c618377292dc9ac913
-EBUILD mariadb-10.2.31.ebuild 33168 BLAKE2B b14bc65948b416c35ea83c46098438a035103ff9543d7a3a57b93515b24277a2c98968c963c85ed4915fdcb067100b428ddaeee8a8ca8e675810050b13fd8b50 SHA512 a16e16e16b5a81f328babfc2e388e536bbbef84e9a951422cb7ce6d686ba6a60c8593bd1bbe314259f271dc4e6a0463a91fb5334b3a8faa97f5ed95369e567a3
-EBUILD mariadb-10.3.20.ebuild 32731 BLAKE2B 2e8437c3af728e5a3dc02a825f025231bc4a6f3ae5b72066afdcf033fdaa807847b86167ecdf9719213061e2937c97300f72989e45f9adbcb74ef597939c25c0 SHA512 0e84837c35c84eaef8d0afb6630c8caff7d036671ab9871ccc2b30aa3ffe2a24f8a363f5f9364755bb69c1290f2995366164a249fb4c61f902d2e41aa2571612
-EBUILD mariadb-10.3.22.ebuild 32792 BLAKE2B cb2943720dded3ae11d6f78788773de117bea20bb6c4e7ee3419be87d49b294938458955f5164a371cd4968c38775f08af9d2db6b756b36920ccdceb5af5ebed SHA512 90f229b5d6144582dadf3f86d797833dd7c543e8b0e044e79f791a26ddd40889124f1803066683b92b0359b9b9cf17b761e663519853abd849f0ecf238894628
-EBUILD mariadb-10.4.10.ebuild 33383 BLAKE2B 43b890bcb0b23b7d40faecd424a968248524453ccc486dcba474a1b5959503a51252ff3dab70c5dfb6238f20b9cdcb281dbea9d728d1cd31d7a3cb3c5c419ea3 SHA512 acfdec61923f7cd5e837e52c6854ee7104278ea2157df5993de38811dda81f3db0644dd7002995367981ca4142e35fe9fed0e58d83ffb71f4528477976d93a63
-EBUILD mariadb-10.4.12.ebuild 33408 BLAKE2B 4d20837d26495e50d278d5f614b186dbf4746e50b2485cfa8d60768040fcc2df03cdd95f10cb8b1790ae8b0e10e3f721c10bae68f490807a293d13380a4e83ee SHA512 bfb4bcd43bece2a18b5535efe2e5d459cebe9d7785c277e1ffeafe7130a2767cc76f3e1071f3bc09f76c046adb19836f0c769be3eb85a8948071e7c3b30e4698
-EBUILD mariadb-5.5.66.ebuild 27262 BLAKE2B 323891d4180b27a079bf96952c36880d8531eb273ce4a8ba2d16d2b3f85a85514a29381d849b89dfe97a534b3eb600ec5a85e006dfaccb3cd76a51c9a35c2f92 SHA512 e52d96c624a69a98b362f9c5d498eb62cd6b635660871deb62b2426638513319714a2e7992f60b3535872cc342f7307b053d79901df16e5573d33786100e9d3d
-EBUILD mariadb-5.5.67.ebuild 27262 BLAKE2B 6f15df960825f8f6c79abcea0e93a2b0e9162bacf086d4e3fd49b550ab092963059205075483f58de97f15a7004e54c2fc81324abde14e869a23df0c22dafc6d SHA512 145c8f2a90134e397f6ee7ac74ccf4bebd84d7d25f65407f8b45428e8f770c00aad8a392997d58c0e8291168884b03b40d7a6ad03114182eb140d03d5a3712e4
+EBUILD mariadb-10.1.38-r1.ebuild 29425 BLAKE2B adca2a4ddace1c70d950dc10a8ddf1e4ab8e51aaad24f0e2ac6886801f0748472d8964301be8a0046a7debdbab9d689ab9d2717e179c651bf3f68ca6c85018b4 SHA512 cb66388307e9385515bc64cd8150a94ddf9fbdf0156a06bac5a16d8eb4b1aaa99595f356443fde8aa31925bbd5f70fad07e26b0da4d73a063d9e9a92e1673557
+EBUILD mariadb-10.1.43.ebuild 29828 BLAKE2B 4af76e5d7bd95e0dde67a8dd5350f3555a7f0d1d33d2cdf673f0e02be40783410828ccf747ec8f941e844b9b564eca7fbe1052a82b625898cf7428af0b6dcde4 SHA512 d74ae31259d7abeed6fd6ee46d6909bc4f4a27aec747d1d1c0dd984bba1be26b3d8e9b2124b98b0870f077102810571bb7b678c40bcec24d7e8e001c919f24df
+EBUILD mariadb-10.1.44.ebuild 30001 BLAKE2B b38e6e8b73e9ea82bafb8b330a2dc037cf133f09aea91cc81cd0ff6e734e9fe0a1e3a29fdba46857e3fc672ce84dd0da650894fa0f3d466f534e148053381328 SHA512 4b1643a02f04d15f59a8d01a296e4ab2258b3c48e8664e13b84fcf83eb4c53d0395122f1a17debeded783211c000af9b9f5ea63f07ffd7520a151213c7e212de
+EBUILD mariadb-10.2.22-r1.ebuild 32488 BLAKE2B 700e423468afc5d55f448f02b87cf85331a8cf7aecb816a780a03ad5f4ffef5f7124495c44dfcb753c566a8eb0c62828e44b838a2a8ec7ad5f90e5572b9d04b4 SHA512 9103b4bbcae28a9810b71f99263584b3924ebfc9e6b734b0e549f739839123e9808b629addd25357bb8422639f7797d228ff50440b152fc57275ef1f066ee022
+EBUILD mariadb-10.2.29.ebuild 33061 BLAKE2B 86efbf55d679547e49266dbcf8970204ea61d2ccda4fd8b7f6a43ee2200b0a2726ece5d5447aff2a512374ba673e928e77a0aac6f02a12085df34f7e65e2674e SHA512 b783d1588016be85f07e05c53c8e3df53e272dc623f4413a38eade664d2e866607835861bd7ce4fc68e8e2af528e9bd296b14125a526dc04b314fa29d6509170
+EBUILD mariadb-10.2.31.ebuild 33126 BLAKE2B 94dd1581fd1056f183163ee71303ca0efb575923d4cd70fa22e27de462884b189fd5b07218af1512a4158279d93eca68042fcf5bd5e478fee6a52cb695c56f49 SHA512 aa3aaa76a1d7ae8b9d0f6c8b28b825945fc316972c7f7f20f8e76b1ca7b3f5404fb9a08409b19a847377f41e0d568935bd1b7484c9a59dd9ac6bc77b26ecc843
+EBUILD mariadb-10.3.20.ebuild 32689 BLAKE2B cf0e23e1523fc695950a24b357af396a06e9895ddd28a18137b91ea7ff8adf9bc4569d9b485d5c664e100a08e5336b98d254eb5c322430d1caf3e6fb1133d6ee SHA512 c8093db3250d10b53326499d4a86f5117b5250210d3582d82bc815485ddf730ad58a511e6f31c5245478951a0919738ed15a4afabbdbe219169a6fc537d6089e
+EBUILD mariadb-10.3.22.ebuild 32750 BLAKE2B f1b37c53cd989850da3054e391b19d4db3b9620b0be4e05757fba7904536d6e4b7c084a096d3e36ad97d152a4f6368eb2658a4eca15a00a9b53512b2e2f8e8cd SHA512 81bcf52fe9dc2261ca7345b26c5b271bc6a142954027dca90d30d226965e1f2bc511e051208c379f5364145f61dd88a8ba5d83b285c5e73db3dbee9aa8174fc4
+EBUILD mariadb-10.4.10.ebuild 33341 BLAKE2B d9466512cd2e2a93b458f32e4d1eb23723f1b21a124df13da9d4c4230248502bfb01fdd0f80a5d72a99491ddbc6471e39192b5a86e9ac4259e15d99ad47b97d3 SHA512 811ae5618a55a0c05ac27c9994df49369638f86983c4e2a9aa37a23a921183fa2d9560ef4380272bb716b82aca67113eb2055776d72ec07ea1ca51d65aac25e1
+EBUILD mariadb-10.4.12.ebuild 33366 BLAKE2B 4159e530ac2dcf92030cc6b287e9d7a486a60d4a572e47577ca0a41ca5eee2fbb550c7951c0622a4e67e60dd1f8885f0e60de7d5194b43fa2f3173e1fb5b5d76 SHA512 d30e7c00fd7aaca444bf61beec449082a172f68970d17bb76a853c188975ac9b060dfa835607deede2e3c0bc93cba63c6f8c9902d4032b95a915c6d3792d70ca
+EBUILD mariadb-5.5.66.ebuild 27208 BLAKE2B 9cc3e203340f55ec1c0208b9be44431f8b4da6849bdb888e17839d83813476666a4886332f4ce0aae278428ac3671908534a1d585abf5afe6869429f4fbcc7a5 SHA512 96e8b41aa12da84c78c92aa724b92833749e80b678e5a56b6f32d6e5534643daacf6bf40085a8dd8cc338b4b2dc11842e5eeb5868394af47f5cfb7d2ac6b67a3
+EBUILD mariadb-5.5.67.ebuild 27208 BLAKE2B 1af7c586d794029c64b9bfc8ab94f9510f2ced4b43f02dbc16a0903d5f81a4d9804243012fc2e17d05ad506c7e2fd60013d2600d9363d4f779ab3812555d970f SHA512 4beaf095836c4812f5c6e36dfcd943d93a19a9aed9a3b553ecc180fa3c3f54867c69fc02a8ce4ce57b199da76fe40ef604d20558afd85fa85a62be5bf9197296
 MISC metadata.xml 2611 BLAKE2B d1b6b11359e92a3d9cb2c58ed35a15e3cf42ab616ed907fa36a5f777168a805ffd03d01bd13fcd30352ef6c5e8b1d80f4e882ffaf8f6445ed3fce2bcc2a92923 SHA512 80395b35839acebbb18ac8d01e8c806bd89f18d32f85fcba41f41ecfc4f1f869dc8c51c90bb21ebd3c9ac30d51d47869a4dcf3b8ce73967e337e6e396b267c97
diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
index bd01fadd2b56..07de6ddfdd2c 100644
--- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
@@ -288,8 +288,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -301,15 +300,15 @@ src_configure(){
 		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild b/dev-db/mariadb/mariadb-10.1.43.ebuild
index efd07a576537..d131c0c4cb07 100644
--- a/dev-db/mariadb/mariadb-10.1.43.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.43.ebuild
@@ -293,8 +293,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -306,15 +305,15 @@ src_configure(){
 		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.1.44.ebuild b/dev-db/mariadb/mariadb-10.1.44.ebuild
index 4e0e9491bb2a..b68568b59247 100644
--- a/dev-db/mariadb/mariadb-10.1.44.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.44.ebuild
@@ -297,8 +297,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -310,15 +309,15 @@ src_configure(){
 		-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '')
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		-DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)"
diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
index ce87ebab1b39..79d8b88b16d4 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
@@ -326,7 +326,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.2.29.ebuild b/dev-db/mariadb/mariadb-10.2.29.ebuild
index 7b99a2969bbd..fc259fc3c054 100644
--- a/dev-db/mariadb/mariadb-10.2.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.29.ebuild
@@ -335,7 +335,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.2.31.ebuild b/dev-db/mariadb/mariadb-10.2.31.ebuild
index b95e1279e5c7..8e713f24f7cd 100644
--- a/dev-db/mariadb/mariadb-10.2.31.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.31.ebuild
@@ -336,7 +336,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild b/dev-db/mariadb/mariadb-10.3.20.ebuild
index 7fb13269e69d..cc2498f533dd 100644
--- a/dev-db/mariadb/mariadb-10.3.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.20.ebuild
@@ -325,7 +325,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.3.22.ebuild b/dev-db/mariadb/mariadb-10.3.22.ebuild
index cf26f76d0451..f65deda16f81 100644
--- a/dev-db/mariadb/mariadb-10.3.22.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.22.ebuild
@@ -326,7 +326,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild b/dev-db/mariadb/mariadb-10.4.10.ebuild
index c479a1ae70d5..c5d00cd5a4e2 100644
--- a/dev-db/mariadb/mariadb-10.4.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.10.ebuild
@@ -335,7 +335,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-10.4.12.ebuild b/dev-db/mariadb/mariadb-10.4.12.ebuild
index 13396dc69603..10c241797c7d 100644
--- a/dev-db/mariadb/mariadb-10.4.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.12.ebuild
@@ -336,7 +336,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/mariadb/mariadb-5.5.66.ebuild b/dev-db/mariadb/mariadb-5.5.66.ebuild
index 2cd8c6360ff0..17ef7180271b 100644
--- a/dev-db/mariadb/mariadb-5.5.66.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.66.ebuild
@@ -254,8 +254,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -266,15 +265,15 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mariadb
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mariadb/mariadb-5.5.67.ebuild b/dev-db/mariadb/mariadb-5.5.67.ebuild
index 414400eba524..fbd7f924edf8 100644
--- a/dev-db/mariadb/mariadb-5.5.67.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.67.ebuild
@@ -254,8 +254,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -266,15 +265,15 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mariadb
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin
 		-DINSTALL_SCRIPTDIR=share/mariadb/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-		-DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 58bc1af5dd09..d683128cfc07 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -14,17 +14,23 @@ AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba93
 DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82 SHA512 eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd
 DIST mongodb-src-r3.6.14.tar.gz 40895581 BLAKE2B 3cfe2aedd11a67a01ddee9eba36d99bad5fe8c7891e953cbdae9200427638e1acc1555c8d39df0217a48a95428838d573c90381698361f954d9aab860449cfcd SHA512 2bdc0ee86625724f64b7af2962b19b13cefb21d58d45c7b22fe2e01bd021f2427236c279c89785ede7c6986742127160b032294fbb652c55ce42f8d941a18cfe
 DIST mongodb-src-r3.6.16.tar.gz 40927975 BLAKE2B bcd129d43eea24da3afe69c887bcd22116e0eb7e1f3f274fb8f51260625d17607b0d1eb31fb23a4f97c88e2c86b3d7a880cb05b0e77385d115cf9486d66f1249 SHA512 eb00f3a612942ad5f947583e92fca5b877b40d75132fa5a97989d81dd55925f5a112400eec8a43b2043bb0236b3228a670a888c41a374b0a60e8a3c26076b1e8
+DIST mongodb-src-r3.6.17.tar.gz 40932592 BLAKE2B 94bbb943fd929318a2b32344cb4574243ad234d1cd14ffef864d7fd2d60841866fd5a1966eae8f14266a9648deb62b7b55386d41338b515d5e6849e980143d42 SHA512 b4d9e9bfc7ff886532641058c99da29420d1aa472cb4cf2b254e0fd0af5ecc72ac8bf28dcd55ab738b799b00132ffacddd154dea37ccfbf459c7cc603c2582e0
 DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
 DIST mongodb-src-r4.0.13.tar.gz 50006727 BLAKE2B bf47bd32cf50c24084091a1baa811690c50586352307deb80876bb1bad539e90de77f85fc591960d6ae871e0a6f22d5d2f05bb340218784b642e3529d0c64bb6 SHA512 2a74ac8648cde6d9b5aa33da195b22eca926ef5ff85d4140e0a1ba978e3d13d410f4d7d7e102e35f994ef3b848333a4ef4bacfec9e2ac1b1288cbee885875ef7
 DIST mongodb-src-r4.0.14.tar.gz 50088053 BLAKE2B af7dc930dd7a469c06cf26201e3329967a664585b9964732c57ed283f323d4dc7fde3ea62ad4f1e8ca763360aeb614c2f77f98867031083d83808acd19e97539 SHA512 3d5d73a816a00887a8851e2e79919b2646f6cc34fd9b8acb255a52e2e71407a4728a80a81112bdbe0a92ba9f71e856ac7a2229741273e8485806cda2cb018d8d
+DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46bc3bee66be45e94a846b1a7ce859826273812d4ce11aa96d1766071bf5fb422771bf2176350145deae99e64e59c164e38 SHA512 90458dea29a4c9a3078e1f13ffd2163911bf5a5f42884553ad9b3c2a2fafea2f73e506640c78f55f27bc16551582ad22244437356b89786fef383ce4b24bb617
 DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106
 DIST mongodb-src-r4.2.2.tar.gz 60991680 BLAKE2B afd31a60929ebfe9c02abee92fd4814c178b03e4e88e10069003fd3e1813481e9cc967e8b4d15b87b0fe703df7fa42a70f60db33cf84ecbf1decfd6657e28ba1 SHA512 30f1e20fbe45ca136869f3fd7e54f1cd65d1544c0693b9945a0036a50257cfc12915a17bf79267500496b5acf3cfa24f406114ea7180b7abee89cd62de5eec80
+DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
 EBUILD mongodb-3.6.13.ebuild 4257 BLAKE2B 0643b2cca9c231b3b8093e1cc4d0e4b7ff2bd6504251f8c7dd706bd15f59548bb4f8462e5547b3e97da5aed385f0179807cef36060211bcf069feec4b251425e SHA512 edbc5d01e606bd324ea505e02d8216b68250bab78dc26b932203df625621d9f27847b8fefc5e0bf7256be67ccde8fe0a56d28ed59b5e0d79e3b68d454b454cf4
 EBUILD mongodb-3.6.14.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
 EBUILD mongodb-3.6.16.ebuild 4243 BLAKE2B 8cb508eb72021f1c96104f55df266505b9b77087ca130645c991e1594427f41d2b20b9843fe8c8de7f9469b5d31a46556b546723bc6d653ed897b43255543fb8 SHA512 72997ea27f0cfae8761150a6416465868b27544bd341e01adf76f53f1d3f79139196581c0034740aef49aa9172bcb582f4b390fb1413e2f5a42b9c91aea07f2d
+EBUILD mongodb-3.6.17.ebuild 4243 BLAKE2B ab016ce9ee393d09e0e8067cd32c013745318342a9963cde20e7bb7dfcf171c120b06a2364446dd0e696bb5e73c268c3f1e1b97c31da0274173ef38049aef39a SHA512 29349128d64b2809c14b8cfc187a23828be4889096fc724f265284134ca124e43a2a05186396b1388168f721441706890722386b5d8464d7216d6535cbbd7966
 EBUILD mongodb-4.0.12.ebuild 4318 BLAKE2B be6dcb75ecb3654b980db1b893746ab6a33e537a9dac06b42e8f2defbd75aaab3b7d32b63f67cb97b886f79c74363199651377580c7b76160e2ecba993ab78fa SHA512 bf45a240826725c47dbd8475c01d24da966c44027cadb73b28b2fa536f45d9dfb714a50393b09040dc928f0c676b42a89d3ebace2d63e0a78443d434eb43b235
 EBUILD mongodb-4.0.13.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
 EBUILD mongodb-4.0.14.ebuild 4244 BLAKE2B e045a5c70486076096254161c8633d9a144bee7088991b85d3b26d5264fd553f70b0b14df841b618159ec3074a845866756de4a9bd69acbe829e8889b83d5d36 SHA512 820958bad65597051874f2519b52a15f4fe52f3921074137d1642cc9f310e6508588c7b6c2e34eb1e56cf463a93fd4c36d2c3bf9dbdf68dddb7399029a8db1ca
+EBUILD mongodb-4.0.16.ebuild 4244 BLAKE2B b85189caf3152d8ebe79f7e9dfa54f653c1e77b07345e3d55834578e8365d5092bb99cb2391c8681498afa4f68ea2f32e6e70bcb72a9a9339144e46e5265daee SHA512 bb312c91bb4e8931d97f3af5096850812de183c9997e8fa5e9f3d0e6f7c926b4c9eaf49edac686fbb7ee8e6d321cc46cdf015efd85861504b1f099d2725b2eb0
 EBUILD mongodb-4.2.1.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
 EBUILD mongodb-4.2.2.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
+EBUILD mongodb-4.2.3.ebuild 4296 BLAKE2B fa701c16589de132c1cc81be3e81306cbea049a8523aba4f0bb1da0a84ecc00160e69e00682bb76647a0c295482a3943eb98d3b6cf640d40c003ebbe1e38562d SHA512 7e809ea122ed95f7bfa02dba005ee28aced39238affe936061797575a62f96cc46d3d5b2ef54429978d96e2d29914776beddde0d59f937dca9484c33a3334cf2
 MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
diff --git a/dev-db/mongodb/mongodb-3.6.17.ebuild b/dev-db/mongodb/mongodb-3.6.17.ebuild
new file mode 100644
index 000000000000..8b60f64d9f55
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.6.17.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.6.1-no-compass.patch"
+	"${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.4; then
+			ewarn "To upgrade from a version earlier than the 3.4-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.4-series. Then upgrade to 3.6 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.0.16.ebuild b/dev-db/mongodb/mongodb-4.0.16.ebuild
new file mode 100644
index 000000000000..7542115d20f4
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.16.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3:=
+	>=dev-libs/boost-1.60:=[threads(+)]
+	>=dev-libs/libpcre-8.41[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/cheetah[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+	"${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+			ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 3.6-series. Then upgrade to 4.0 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.3.ebuild b/dev-db/mongodb/mongodb-4.2.3.ebuild
new file mode 100644
index 000000000000..d566c1d609b2
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=dev-libs/boost-1.70:=[threads(+)]
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	')
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )
+	test? (
+		$(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.0-series. Then upgrade to 4.2 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index b514b1dc57ba..925b57230c8b 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -11,6 +11,6 @@ DIST mysql++-3.2.4.tar.gz 4594696 BLAKE2B 7e0553b0e22bb3607a914fc7756ec192465af5
 DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B ffceddb360cf6f0f38b7647f68e52ad9b659642c598c2aab7736813bf61d07316900d843749c2f9f4c753bd2087711ca712cc430f12b3a475c63ae3e5b11aff7 SHA512 5fa042a350322fa74afa28dc5e53f15cad32517001ab817493bf0d13a64e6559712f5e61184ef38a97bc8fe69f8732aaf436bc5d1663e4873f8baebee2e00892
 EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
 EBUILD mysql++-3.2.3-r1.ebuild 1559 BLAKE2B cfab2b4e0b80cac21ab3d3ab6db56e44cd1f13469595bcbc10f49386ccf1f5c816cb03514ee361a929201e0ffd8f1926469c1547a59e617327570fa380aa3e74 SHA512 7d0463c7ff3d0a0e9ec7d827c3f4d111269e782a55f1a28336b2b1f2a11f599f3b39bc01b03b54ebbb7a812176edf0cd0e4dc964f55112bb1852b8d1f11a4427
-EBUILD mysql++-3.2.4.ebuild 1704 BLAKE2B c67e5a1e752602037503871f061f6a0430af178beab1c8fe293b19f903afbc78a62f602e8fa1af1c2812c0c938b540a99f0c25dd37ea782b9815237cfe8b4036 SHA512 7358abde75d8f9b57487955a75c7718d383b2ef0aea9094a9bce3affd8151ed94c509e884dea6b10b9d8d709fa893fcb0153e26520375410661045ed198013b2
+EBUILD mysql++-3.2.4.ebuild 1702 BLAKE2B 994cdea880947ffc1295e68a43ca96c028b2d0749493aa528f9459421db18535dd57a8edad11b404d0ace8dc80bec0593f58e1c71eb85f6186da1027caeffa1b SHA512 2093a0835d95f934ff7f27725e3a292c6affef51173b7db36c8239c71f2e3b06cef2ed3990761777f79668f5200762acd504215ae8b93c0ef0a06d9398e6f434
 EBUILD mysql++-3.2.5.ebuild 1704 BLAKE2B dc150bed9777bbc18f38799121ed83f1cbf5c4c5be814a3e2b85664d5079adefafe2f3d502c4f9349a823db20723d95d039ef4b2e431e41299112be2ec06e1fe SHA512 2f784310eb4a015c67dd0c0566847c27f95dddd25e160edffcb28253a9cc545ed35e44fecac7242359c78ab05d0237242e8b548db0064fb0d63780e561304d48
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/mysql++-3.2.4.ebuild b/dev-db/mysql++/mysql++-3.2.4.ebuild
index 24978aa9f91f..ba9a947c7f13 100644
--- a/dev-db/mysql++/mysql++-3.2.4.ebuild
+++ b/dev-db/mysql++/mysql++-3.2.4.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--enable-thread-check
-		--with-mysql="${EPREFIX%/}/usr"
+		--with-mysql="${EPREFIX}/usr"
 		--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
 		--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
 	)
diff --git a/dev-db/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 92b607f16c9a..7459a8119f6e 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -5,7 +5,7 @@ DIST mysql-cluster-gpl-7.2.34.tar.gz 25114728 BLAKE2B b9337cf8ae6742c58f92ae64b8
 DIST mysql-cluster-gpl-7.3.22.tar.gz 41356026 BLAKE2B 055a3f8590f0e2e53f8620244bd2ca7d619ab5549de7b33c4d41d2fabd260d98eaabdc0169488a6d018bcafc4458433e21b65025827998a31e9abc1deb5101ae SHA512 ccb9f3429e6ccb2dbb53d98f54abeae3c3128e65dc69c41918324630fef665f48d3c3af2d60bf1cce4e28c492e525c6bbc32cc8a39a9ea47988184adeafd5bd3
 DIST mysql-cluster-gpl-7.4.21.tar.gz 41718490 BLAKE2B 4578e477b345c85ccf12e4ea79893dda9b33bf35722ff8c6d706f150d8506d07b5e49a8e69e37cb3c8ff449832c80f72430924559b4a6d209d11d31cc2a67ca4 SHA512 48f475806608c0f6e0c45cc9c3b3851678153e17cf5c74114b2ca7a75eee455798c8decb857738eecb3fe664930e378e1d399509a954a7073802285eb87801b5
 DIST mysql-extras-20190121-0015Z.tar.bz2 330807 BLAKE2B d5beae3d5a493e01d57130f835cd0d7dcbf53af389f9b933446ab43b86f96c85b5858a7a56ffe882ee63371ab96f0226e04f710dfb119ddd91b5c5685d0999bc SHA512 2f092b8e1e2f836d19e4663d383be876d498bca0ee005a690f48ba1797e9e5b648c4a15c36885faa286ce12a49386bf2898940e19eb1d288e7ee084968821a05
-EBUILD mysql-cluster-7.2.34.ebuild 25616 BLAKE2B 732a89a04e9593931a5fd06afcb7ebea0df0e12f141a6d362ef8fb80e4f3b48e97ee9ed78cf016641a6f157e19cafd38e06df8d743f03a7135156dc46e612ddb SHA512 4a4361affe734122a4fcd03d6da77b522d35b86e8e13d089d9da8b45afbd68e6bdcd059d635ab9faa8294373e50d3f6a83324604824cd1474735fbd627ec9e7f
-EBUILD mysql-cluster-7.3.22.ebuild 26072 BLAKE2B 0f0c2fa6f640ec7ca2a634995c9bb3caab7dd3e7407f92fbb6b5b7bb6e772dc7c898a514c76674341d5d8a3d3c6e26e5f324438c4088973e01b742d65f1bb05c SHA512 3f5ade7b0ac957e8757326048c3bf037214cc761820a541a522a01ad3221c4b9b7cd13ae1457d7f8b75a20a7a1a3a018856bce1c773d7a5dbf0841573cdcad64
-EBUILD mysql-cluster-7.4.21.ebuild 26072 BLAKE2B 8b336a01500b5d6351824501581a25f69e6804938d3c4579b10801020ffe08f5253abdb57c27dc44fd983cb694516aa84876c88e9a639e04657efdb7b3f529a3 SHA512 49fb7e1e1f6eed702a17a02291ec5ff145a77ff569f2d39e0cc2bc2487d2910f1bc011488bf95cf28c5083937751d785a9c28da0ec7fd80167a6549f2424da3a
+EBUILD mysql-cluster-7.2.34.ebuild 25564 BLAKE2B 0e11e3ab3f2bda40b55445079ac8b430d8f5f48dc5e84880ab1097dca820fbb28cc5cf20fc75726e4253eedaa1d9935397f52059cce40bf912201ca06d7200ca SHA512 f26eb24e569bbe3d46b5a2d9ad344bc207bbba172b2d8ce1e37be7c49686bd0e0fb63f5a8a3a9af4ed4375bf92fb66638c2480e30369d7de8c586d6d318c0512
+EBUILD mysql-cluster-7.3.22.ebuild 26020 BLAKE2B d0686fcc55147a4ff04e5aa2149b18345860418e3996eb14d18703cc85017ee8fa1e5fc25e5b9d7d2ceaf28494b885d09b23c1ea234517e344d17094fb785b0a SHA512 c7c2a43abc71e0a1e21a9b98fe05a1c6ccafc1da2d94416bc1a72fb48508537d858e8729b41714478aaad40b65fee57a3cc75bb12a18b918531a1b17aa514923
+EBUILD mysql-cluster-7.4.21.ebuild 26020 BLAKE2B ccae39190741e28ba5695459b21583ccc5db5962800198e3ceb55324b411f0c8505c27b4920dbd4456d98f29dfa4a2ab641da34497795d341a5017ac4db2b910 SHA512 2fc854ae7ac5e0066c0a9fb297c94664ff89722a641f901f3bfa0558c237f9f22c7963dc4c84ec34c0e916663f1fe7eb9b8c5ce1e8a5e29a4c0995b9fdc396c7
 MISC metadata.xml 1248 BLAKE2B 02eec2cf13c1d1ec71d92a3a6e15a65966e3a6de1595f5027159e8eb6c6c67a38994fe7c051746ff9f820138c51f21afd46214c0a686e9e107668b3eaba9950d SHA512 ce4c1b021cf1d5381c4523b9c047ce3a580ea807cfa81557d398ef5bf92bb0d30d1145d0fde299f1dbab8837b09731eea1767a864964ec9d66393096e61661f5
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
index 8ecb148dc58a..048d9b67f192 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild
@@ -238,8 +238,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -250,14 +249,14 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_ZLIB=system
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
index 8a33824b92a4..9456b1c4a778 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild
@@ -239,8 +239,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -251,16 +250,16 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_EDITLINE=bundled
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=OFF
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
index 8d0360acf3a8..a4c51a22cc00 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild
@@ -239,8 +239,7 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -251,16 +250,16 @@ src_configure(){
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		-DWITH_EDITLINE=bundled
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=OFF
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		# The build forces this to be defined when cross-compiling.  We pass it
 		# all the time for simplicity and to make sure it is actually correct.
 		-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 982b1c37c488..09336b742cc1 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -4,6 +4,6 @@ AUX mysql-connector-c++-8.0.19-fix-build.patch 9695 BLAKE2B c3334f74160a9b1148a5
 AUX mysql-connector-c++-8.0.19-fix-libressl-support.patch 3358 BLAKE2B 795c9f313d2495c3fee01066c7116fa3272a162b7401359657256d1adfb24d236049bbad6016e763de2a62ec9b6ccc93546eccffc457ae0bafca29b2c7e21b5d SHA512 d7b4b1424a6fd237ad0e7bd5648b156f770e352ec8fb3edfa6dfb767ebbe73e8ebc186b327e8543aa7bc12b7bc6081fae225a6ff0e153e25bb76900142adaa31
 DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B 386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9 SHA512 d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
 DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B 82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0 SHA512 5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1edecccc75da15d7bb0bd
-EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1642 BLAKE2B 6e6fa755a9c7f51fc9ddd4310664b7f1a9dfa1e348ea033006195ae9ef7d1f6cbbfa82c13394ea3355fb15bca3d05baa5bee43a287b7c63d9fcbe5240d0a59ab SHA512 0a0d2ec5bd5231f708baa1d605c8d24118d2bf3ca8583d5f22e3b9cbdcbd55c6a2fc3f5aa53bc3e4858884d5f7ad4d70221dbe57d2dc60df68cc3c27fceb16d4
+EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1636 BLAKE2B 31a82b0cd687e0559da57986af4ae883fb0c8ce9baa1d8fc8476b3a38db7b7008f9308ea522be00ee1c62fcab2a6fd22a7ce45e3b0e15557e2f735bc15f57bf0 SHA512 f17187b56153ab5d7385ddc2f7670ad17fd5f9eb09b6b6872c7505f207d6adba1abb8f10c0401b458841f3d44375809e6745f31774067796088f5d3103c9c650
 EBUILD mysql-connector-c++-8.0.19.ebuild 1070 BLAKE2B 1a42cb615fb70dccb3be62cbb4430770220534fe8bad1a69d828ec1342e0fb5c003034130320d0e7838416b1a1fb12063b3f0953a8af45c95698a968bbf5a45a SHA512 81ed1cc863ee4f5a8b30fffbceb2821f9fd59379c7ac6b382392526670649f3fe858fa54191fb7304db6a4611632752c09fecb5f4c5b5f58df3145836a5a4cbc
 MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
index 6a139eae88f6..121c4bdf49dc 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -49,10 +49,10 @@ src_install() {
 
 	# static lib has wrong name so we need to rename it
 	if use static-libs; then
-		mv "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
-			"${ED%/}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
 	else
-		rm -f "${ED%/}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
 	fi
 
 	# examples
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 420817ae15e0..145f5f4f830a 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -9,5 +9,5 @@ AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8
 AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
 AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42bb330367c14df6932a887f7740ca6c28ecd15aba8bf2f89c33854345d773134630a5e8cd5ce8b99a8b6667 SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
-EBUILD mysql-init-scripts-2.3-r3.ebuild 2019 BLAKE2B 60ff505f08c1e4d879d2be6bbbdd0a39e40f95abe31dfb62003f257e67e13f64353bd9dfe035be9b36acf25fc3ed38aba110a6b48bbdf7fd01dd2fcc6892665a SHA512 1ad68422926669d21e49837d3f5fc672b556d557b21b54195e51ba08d85d7aa0ff29178bf4553f92187e7bbc6c0b4c3322d38cfe805e4ec6ee6513be10c268ee
+EBUILD mysql-init-scripts-2.3-r3.ebuild 2036 BLAKE2B a8742ff8cd9e1fe24f8153975780113263ba4724ee0b74b2d5d7827353e3e96982fbb606bf268d6146c5271f3f6b1f636623c4bcaac74873c274dccb08c657ac SHA512 8a11c944767a9cf38b3797fc0bf35afc402e31ed31001447cfca3bebf6b7d03d81b0ea3bd6304e51e6b0c2b006597881d897d703d6ae549e2c95b280a5a449c4
 MISC metadata.xml 243 BLAKE2B f247f748a23e4cda2f518ad7e4e53b9027ff08ec62289010e6dfc8cd2ad49412430c4095e80f2156c8e6f1226bcda0163b4faae83759550f79e9998928398713 SHA512 7c227a1fadd8d61aae9baabeb5d964c93fe0c4d82fb838c83fe0360cf38b24bebf51037726f13188ecd8f52c335368a693b81e74d79ba949576a6dbcb54887a9
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
index 8b7d7538783f..921ba7471c28 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit systemd s6 tmpfiles
 
 DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 8842bea9da86..fbf7aeef3819 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -13,10 +13,10 @@ DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e528
 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
 DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
-EBUILD mysql-5.6.44-r1.ebuild 27147 BLAKE2B 1958b4796fb68f0bdc248d03e41a7f4320c7229657a725edeeba91b93dbb65a74ec3dd8f8ac3218c1b9566fd6c293cf0ef2f321722c4bafdaafd053da9c89594 SHA512 6939dca83cac2fa84c3208e025e2b5e750d3fc0d210781d60d62bce34d7648af59488aae0e996188fa13577fc65c85f7a7cbb408ced14dd23c0686a2784a08ef
-EBUILD mysql-5.6.45-r2.ebuild 27096 BLAKE2B 4185eba92b1d3455b2c9d718249a55e0a95b45f02f25ae5d65a9c3e01ad5de9bfe66793e63a2f577e3e7a9e295f40d7576070b356f6e2efcf493599f8569817e SHA512 faed98d09a85757cf2cede77fc21d83e059fcee33cfffd739f2dabe34ec905101840244f45c4bdf97f945abd79202c78b40f3b1dcc2f9edf10173741a3ea5b13
-EBUILD mysql-5.7.26-r1.ebuild 31734 BLAKE2B 1d81acf0b23e8dbffa2e5b5cfc9479f675480e775f4570df5c0fea294379138da799878dbcf3bf398badd727e6c33bd7a3387cb7d38bc643b25097194097beb0 SHA512 3189ed15cf77754993dba1065b4733584058952fdfa13da156563f7ff83ddb3146b121d4c51e30e099d50ca1715abc1ba3796e8a161f2804a284a72a3144b3af
-EBUILD mysql-5.7.27-r1.ebuild 31759 BLAKE2B 865bf492634cb00a3a373497501beeda472b477219960f012dcd74d5951e218904390039c17e5ff999a562cc12cb6bd58f0e2b0aa6efdb2e29f203171f04cecc SHA512 c0c7393a70d3be0129cba16694437f3017e97aa5f6cf8db63eb460d62ba06f5d3af8edbcb472d009f560e29ab837038dce4306bf2c2eb94f9ce026cae2204678
-EBUILD mysql-5.7.29.ebuild 31633 BLAKE2B b60edf3458739179f3358eaefac56bfebbcf3d0bdd67e08d3000cb02c7ddaf9cbfab37999a847cd0573ee263672455bed7375e621a0172de5c0892932940ff76 SHA512 418244b50c115ce9c79a97cb0f24a4c5f6c6747567cb3dce56b962b788aeea2a84e6cd762882b3031577396b9a417f791a1a8df9eef93ce10d5ec816679707d1
-EBUILD mysql-8.0.19-r1.ebuild 36980 BLAKE2B ad9bc499272c92b1bf0b5f536d383dc7d7b6d5fa5c247787f3d9940bec6957912147fc7d75361eb296d116590b295d81b8bfd8fb37ff248586ecb48c0e9bff84 SHA512 0c73b7dff7ef5897c9dfb047963c098aca70291ef21761de431f4a04aa9dcdae9f3996e476f84ec5824965d8c6e9b0d56da24b82930fff813f246e1e684299bb
+EBUILD mysql-5.6.44-r1.ebuild 27091 BLAKE2B 8e41f627e2860164e5c96f2b0dca2d2e21300cf4a5464f3701a464e97fa6b9535190ecb5d35450a3adf28c940b797fc5cc6515af1eb86cb90d67146eedf57e21 SHA512 196a798c4647766f359172ea88cdd0718ae4b115a454582d6cf4ed6be7b7bf67c041b0f86eae464385b1a569b7303146dd7fea87793c2dfbe67f18d1d4458cca
+EBUILD mysql-5.6.45-r2.ebuild 27040 BLAKE2B 602a12fdfcf8ae230f6781fd5a20c4f8bda9933c832680d95bbe77a4d96c337182e61f1fe963f56a2570b07dcea0998ab247563de14797865684d74a4b8ddd8c SHA512 b80fadd487a534e0879f27bd9fbc6651353fec68336821cd8422e0414d65a70daf30b1abe34e6d35d2fef779be0450280ff792b28c126a9d428bba43c436170b
+EBUILD mysql-5.7.26-r1.ebuild 31666 BLAKE2B 2bffe4ac85238c098429596553ef116b969f3b8934770c20ccd1638c9f428caf440fd2fd88c8b82c25c69ee6242307e508a26a26b6d074f518aef979044f896a SHA512 fdde5c1fa36c847958f419d3783422430f3e36adebcedfbc5ec8b9f46b60bc2094b91c811b50eb3abf738dcd2a3ec346d32179855b34641094966eea8ead7e9b
+EBUILD mysql-5.7.27-r1.ebuild 31691 BLAKE2B 5d91ac350a3135e4f340842c2990fc39e4394b8acecf93f1eb8809149dec50762cb16ed5e78a1aa994d96c4665ebd1b8e1009afd2febd7e7fc073ec38b10c7db SHA512 2af8a8ff0c29ad3d35146c4173b5a6ac1e1795f2b9e1e94a80798ae1e45d893747f15a5168d1bf50bb1b6a73e6a05e544c9d426e5f916c5eafb9259442484804
+EBUILD mysql-5.7.29.ebuild 31565 BLAKE2B 424e1b3d5d47195bbc21afad81a9b25436287394ab0ea5faa8e86f418d2cecceba3743e5c2833f0611337d354d2b91be1045051a6bafb0574e59a4aab2b6e539 SHA512 deb4319a396d26f85e4d113c95d5f9271ac7dd5a9782f29c04041a737d75a7d02537931a0a34787d81a35829d25190fb18972a09fc9e09b19d4e3fb50fcce46a
+EBUILD mysql-8.0.19-r1.ebuild 36938 BLAKE2B a91fb3a911767ee4bb0b13f8ec02449ac6f12225ced0709b53e87aca4a1e7ab3414bdbaa8d45e5705e83a3fcee78ec08e23d677412e0693ad40047cc9a253235 SHA512 cfee404ec3c4f6153eb923f81d8e9fe031d7982aacf5d0450b30cd075a0237dc4c8782c61f42bce095e8d10951a3d678c8459c91646ae110231b0172a7717cfa
 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7
diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index 65e334429702..0238c0f2d4b7 100644
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -245,7 +245,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
@@ -536,10 +535,10 @@ src_test() {
 }
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -602,7 +601,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -763,13 +762,13 @@ pkg_config() {
 	if [[ -r "${help_tables}" ]] ; then
 		cat "${help_tables}" >> "${sqltmp}"
 	fi
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [ $? -ne 0 ]; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index 1ea042478213..6f1c6b5e8485 100644
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -254,7 +254,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
@@ -545,10 +544,10 @@ src_test() {
 }
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -611,7 +610,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -772,13 +771,13 @@ pkg_config() {
 	if [[ -r "${help_tables}" ]] ; then
 		cat "${help_tables}" >> "${sqltmp}"
 	fi
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [ $? -ne 0 ]; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild
index 7cf6286849df..8825edb4d07a 100644
--- a/dev-db/mysql/mysql-5.7.26-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild
@@ -125,10 +125,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -333,9 +333,8 @@ multilib_src_configure() {
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -346,9 +345,9 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
@@ -356,7 +355,7 @@ multilib_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
@@ -774,7 +773,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -930,13 +929,13 @@ pkg_config() {
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
 	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [[ $? -ne 0 ]] ; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
index 5a103007c82a..0bfc4b1cbcf7 100644
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -133,10 +133,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -344,9 +344,8 @@ multilib_src_configure() {
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -357,9 +356,9 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
@@ -367,7 +366,7 @@ multilib_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
@@ -785,7 +784,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -941,13 +940,13 @@ pkg_config() {
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
 	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [[ $? -ne 0 ]] ; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-5.7.29.ebuild b/dev-db/mysql/mysql-5.7.29.ebuild
index d87e28c839bd..79346f5415bb 100644
--- a/dev-db/mysql/mysql-5.7.29.ebuild
+++ b/dev-db/mysql/mysql-5.7.29.ebuild
@@ -131,10 +131,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -342,9 +342,8 @@ multilib_src_configure() {
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -355,9 +354,9 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
@@ -365,7 +364,7 @@ multilib_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
@@ -783,7 +782,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -939,13 +938,13 @@ pkg_config() {
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
 	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [[ $? -ne 0 ]] ; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/mysql/mysql-8.0.19-r1.ebuild b/dev-db/mysql/mysql-8.0.19-r1.ebuild
index 5fced0177f01..a4a825347945 100644
--- a/dev-db/mysql/mysql-8.0.19-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.19-r1.ebuild
@@ -222,7 +222,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 79d83988df97..b33ac0479f33 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -9,6 +9,6 @@ DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d898281
 DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
 DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871abaaaa0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b
 DIST percona-server-8.0.18-9.tar.gz 256867152 BLAKE2B 34c7b7b320f973313ecd95e658999a17748fc70ff46b1dc58144df02c17b7870cf33d68a555ee8aaaecb66c5b1003e6023154f7100a6f413514e89d495330dd2 SHA512 ce537a160b48e7c3dc35b15a293c39142a5b633111b5c9c5f9c1150476f0faa5e9cf81b34c9ca85286463455e3ae3fce7a200d253d880e3b67b3c71eefdbdcd4
-EBUILD percona-server-5.7.27.30.ebuild 37290 BLAKE2B 539507ea5fbdd1e1f3a43128bce1c4a565344ba238de6e68e89cce2750c159eb65e9d1d82f6198ebe891a685fa4345ff03be38647a54d3582ae6ff95d6ad65ff SHA512 340ec101d272cfe788c2fa19579f889923c2ab34997e4482b5ba827ebe7ab824655c3c14ce90ebe40385a55f74cba46414a76eeda09a9aac53759ebe8a48c820
-EBUILD percona-server-8.0.18.9.ebuild 37762 BLAKE2B 4baf5d6a80191612e022fd212c1f68e372fe6f0c999ebadcfae409c4c7701464b6085272f66c80e164b8a2b6fbd6204aeec58212d3d4244303f70f230d2f89e1 SHA512 540219318da07c64ee7a0c5161e440b0551a88db237d1f303c12fd15482222f804cb3e9db4bffdadeadbdf5c362f8bead222c69fca69ad30177f8b6627e29162
+EBUILD percona-server-5.7.27.30.ebuild 37222 BLAKE2B ad6aacc9103e672a83866e8c6e887dd58b78764b35e6ef5fa88b260ffb78c222fa2472ea0358dc8e00887961b48240509417886162c25cfa70937f6a3fbe7128 SHA512 ff57bf4b3e7e51cddfa81aded9470aafb1b03db93316c8267674786e54eb66e2d582d8b9f1f2ca3bb3a57d6b8c10fe5d62b33b08507a341e1221e5e48769ac50
+EBUILD percona-server-8.0.18.9.ebuild 37720 BLAKE2B 91c64bcfcbba4867d97a040fa9a5246122ab1efe82955e51fa2e8f9d560441496810346dc7f7f82370a71e98d2d57df28f735ec5a915dc21ab50c2af0637e87a SHA512 f1536a2efa8b484d2bba0955dd32dacfe99aceae981b1f846a63abed1218703812240bdc848174b69b93953482f8e70bbcfb98d4517dfb3669ec55084adc571a
 MISC metadata.xml 1476 BLAKE2B 45302733bbb03e6e999d60db72bed7382f664d9b46772904a35a1a8bfceccc89008e739fcead55bfb6a056523f0ff84fd22c638de859236f47a01eb8ac6c45eb SHA512 e53b29f9d78e895a26f228b7719a023dbd5957d1e10f384376b75b539a211425be143c229378af2ade5314f6b414d891bafc7e1fffde9bb88b59ff24de31a2c2
diff --git a/dev-db/percona-server/percona-server-5.7.27.30.ebuild b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
index 5c4af55fc2eb..e936725d18de 100644
--- a/dev-db/percona-server/percona-server-5.7.27.30.ebuild
+++ b/dev-db/percona-server/percona-server-5.7.27.30.ebuild
@@ -161,10 +161,10 @@ python_check_deps() {
 }
 
 mysql_init_vars() {
-	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-	MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
 	if [[ -z "${MY_DATADIR}" ]] ; then
 		MY_DATADIR=""
@@ -395,9 +395,8 @@ multilib_src_configure() {
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-		-DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-		-DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
 		-DINSTALL_DOCDIR=share/doc/${PF}
 		-DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -408,9 +407,9 @@ multilib_src_configure() {
 		-DINSTALL_MYSQLSHAREDIR=share/mysql
 		-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
 		-DINSTALL_SCRIPTDIR=share/mysql/scripts
-		-DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+		-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
 		-DINSTALL_SBINDIR=sbin
-		-DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+		-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
 		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
 		-DWITH_UNIT_TESTS=$(usex test ON OFF)
 		### TODO: make this system but issues with UTF-8 prevent it
@@ -418,7 +417,7 @@ multilib_src_configure() {
 		-DWITH_ZLIB=system
 		-DWITH_LIBWRAP=0
 		-DENABLED_LOCAL_INFILE=1
-		-DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+		-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
 		-DWITH_DEFAULT_COMPILER_OPTIONS=0
 		-DWITH_DEFAULT_FEATURE_SET=0
 		# The build forces this to be defined when cross-compiling. We pass it
@@ -917,7 +916,7 @@ pkg_config() {
 	local old_MY_DATADIR="${MY_DATADIR}"
 	local old_HOME="${HOME}"
 	# my_print_defaults needs to read stuff in $HOME/.my.cnf
-	export HOME=${EPREFIX%/}/root
+	export HOME=${EPREFIX}/root
 
 	# Make sure the vars are correctly initialized
 	mysql_init_vars
@@ -1073,13 +1072,13 @@ pkg_config() {
 	# --initialize-insecure will not set root password
 	# --initialize would set a random one in the log which we don't need as we set it ourselves
 	local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-	cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
 	einfo "Command: ${cmd[*]}"
 	su -s /bin/sh -c "${cmd[*]}" mysql \
 		>"${TMPDIR%/}"/mysql_install_db.log 2>&1
 	if [[ $? -ne 0 ]] ; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-		die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+		die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
 	fi
 	popd &>/dev/null || die
 	[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
diff --git a/dev-db/percona-server/percona-server-8.0.18.9.ebuild b/dev-db/percona-server/percona-server-8.0.18.9.ebuild
index a3c7cca82238..93fbfaacf7f7 100644
--- a/dev-db/percona-server/percona-server-8.0.18.9.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.18.9.ebuild
@@ -233,7 +233,6 @@ src_configure(){
 	mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
 		-DSYSCONFDIR="${EPREFIX}/etc/mysql"
 		-DINSTALL_BINDIR=bin
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index e9898d7b5904..276d7233190c 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,3 +1,7 @@
+AUX pgadmin4-4.17-python-3.8.patch 595 BLAKE2B 695b133a61d2a54939a3bd8fa3c8fe3ea52ca0b00de141e936602dd06e64db736a182dd015bc31aef17dca0f3ad5746833270b551285fde416ebac30c1705577 SHA512 c5500b8f2d071663073d727c7c69ac72e3566c789de999f198cd43c71c155eb273bc2ad7eab8d69f1911dfbd5cf741989c70ad179b61c67c9a93bdb6591c8972
+AUX pgadmin4.desktop 298 BLAKE2B 9048ee03c9f8e05807f2907fd7dcfda9d76bb3cd3b2567676cf6bc9acebdf8d2b4de1626f9fe57c4940422766fa7e6fa9111a5bc9c252e34f72af2850813b158 SHA512 a083c525cf49543751dcf4f98a9e2607ce06c35a573c5a97d4088b21b41dc260ea0fcbb139ce153f0e1deb6bd8e6e75e69a6fe08ff2f4aa563d7398bd52553b2
 DIST pgadmin4-4.13.tar.gz 25077107 BLAKE2B afbf0b6fba2f4cbbc1f47ac6c7867b7f131e5698de265a9dda53b79968f237ac591c5ff4da94dde0b74479cac1158ec825f42b14fc01aee13982043822c04443 SHA512 7eca41047e41f7bdce2dfe992260e8c2ab40f985dd232eb240ea9c0024f551f011653717aa0d5e4ccdccd4ef4936102cde1f97a32852d8382dcc222fadce7707
-EBUILD pgadmin4-4.13.ebuild 2820 BLAKE2B 12812b1f5dd2b1d4677cf67d4664093f1f3088ab435ef5b5d38c63bbdd00709862fb3784f1261e8195b8148e3adaeb6935d29d745cbf5f320ad2691128a3696d SHA512 6970e94afc1d98c3993810084db448e1b21627f90b55f291454c635f37b6aee0c82cd992cd681f19770ef4cb9134d57bc81425c3f784e06936f3a7ca53327cf7
+DIST pgadmin4-4.17.tar.gz 28007097 BLAKE2B d296f2b9372c23067db899fa82e1b8e732837b01a6172dd2d70520f815aafde161715eea9d9d53e7507a6a715dbfdaabf001a10d143c1aa0505237b2b138e334 SHA512 f9e292ba7ff1e5edaa8738188eb01744d69d0eb134700feb0623806425c998e7f298f74cd498a09f2d9a073a9a349c82f7a3f617e1da3c8dd757cc982d941c9f
+EBUILD pgadmin4-4.13-r1.ebuild 3065 BLAKE2B 8d4cb29606b3f434f825eb0a72414d3fddc4cc0b8e0f0a8b99b895ac871176a062ecae0cd483f12baa2257f61493f4df26ebdc55a6e36daee758c8ad19524fa8 SHA512 289a99a97bdfd6209c9e73c4a59121a3803f3756844ce97b41d777373a43cc2ff805ae6db299869c2373cf57d8d558522ec1504b6132d946610e9a0d65dfdfff
+EBUILD pgadmin4-4.17-r1.ebuild 3316 BLAKE2B 1866620faf43c9e668f3aec4fb126e923f8bebdd55bb5f82cbcaac6021ddd7d37302bc61bdde27e93ccbafbaab0cfd8338bcb0b5a35045d08086a43ce3d3132c SHA512 96385cc09e2b4567c36ac4f41b1465e8e9664609a78728d73d1d1b3aae3026f6cd48ecc268ee90258f4ee397f8f35c701fb48d0d21e36367cedbdd7384095407
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch b/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch
new file mode 100644
index 000000000000..fbf2f7be4a9b
--- /dev/null
+++ b/dev-db/pgadmin4/files/pgadmin4-4.17-python-3.8.patch
@@ -0,0 +1,12 @@
+diff -uprb pgadmin4-4.13.orig/runtime/pgAdmin4.pro pgadmin4-4.13/runtime/pgAdmin4.pro
+--- a/runtime/pgAdmin4.pro	2019-10-16 10:07:59.000000000 +0300
++++ b/runtime/pgAdmin4.pro	2019-11-05 18:33:18.524516120 +0200
+@@ -75,7 +75,7 @@ else {
+ 
+     QMAKE_CXXFLAGS += $$system($$PYTHON_CONFIG --includes)
+     QMAKE_LFLAGS += $$system($$PYTHON_CONFIG --ldflags)
+-    LIBS += $$system($$PYTHON_CONFIG --libs)
++    LIBS += $$system(PYTHON_LIBS=`$$PYTHON_CONFIG --libs --embed` || PYTHON_LIBS=`$$PYTHON_CONFIG --libs`; echo $PYTHON_LIBS)
+ 
+     contains( LIBS, -lpython2.* ) {
+        DEFINES += PYTHON2
diff --git a/dev-db/pgadmin4/files/pgadmin4.desktop b/dev-db/pgadmin4/files/pgadmin4.desktop
new file mode 100644
index 000000000000..e1697a620d5f
--- /dev/null
+++ b/dev-db/pgadmin4/files/pgadmin4.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=pgAdmin 4
+Exec=/usr/bin/pgAdmin4
+Icon=pgadmin4
+Type=Application
+Categories=Development;Database;
+MimeType=text/html
+DocPath=/usr/share/pgadmin4/docs/en_US/_build/html/index.html
+Comment=PostgreSQL Tools
+Keywords=database;db;sql;query;administration;development;
diff --git a/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
new file mode 100644
index 000000000000..f044276c737a
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.13-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+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="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE="doc"
+
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libsodium[-minimal]
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+	if use doc; then
+		cd "${WORKDIR}"/${P} || die
+		emake docs
+	fi
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/*
+	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	local CONFIG_DIR="/etc/xdg/pgadmin"
+	dodir "${CONFIG_DIR}"
+	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
+		[General]
+		ApplicationPath=${APP_DIR}
+		PythonPath=$(python_get_sitedir)
+	EOF
+
+	if use doc; then
+		rm -r docs/en_US/_build/html/_sources || die
+		insinto /usr/share/${PN}/docs/en_US/_build
+		doins -r docs/en_US/_build/html
+	fi
+}
diff --git a/dev-db/pgadmin4/pgadmin4-4.13.ebuild b/dev-db/pgadmin4/pgadmin4-4.13.ebuild
deleted file mode 100644
index 18587bb501f0..000000000000
--- a/dev-db/pgadmin4/pgadmin4-4.13.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-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="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
-
-LICENSE="POSTGRESQL"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="doc"
-
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# libsodium dep added because of 689678
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/libsodium[-minimal]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtwidgets:5
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}]
-	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
-	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-htmlmin-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/flask-migrate-2.4.0[${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/passlib-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2018.9[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/speaklater-1.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}]
-	>=dev-python/sshtunnel-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}"/${P}/runtime
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	default
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_compile() {
-	default
-	if use doc; then
-		cd "${WORKDIR}"/${P} || die
-		emake docs
-	fi
-}
-
-src_install() {
-	dobin pgAdmin4
-
-	cd "${WORKDIR}"/${P} || die
-
-	local APP_DIR=/usr/share/${PN}/web
-	insinto "${APP_DIR}"
-	doins -r web/*
-	cat > "${D}${APP_DIR}"/config_local.py <<-EOF
-		SERVER_MODE = False
-		UPGRADE_CHECK_ENABLED = False
-	EOF
-	python_optimize "${D}${APP_DIR}"
-
-	local CONFIG_DIR="/etc/xdg/pgadmin"
-	dodir "${CONFIG_DIR}"
-	cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF
-		[General]
-		ApplicationPath=${APP_DIR}
-		PythonPath=$(python_get_sitedir)
-	EOF
-
-	if use doc; then
-		rm -r docs/en_US/_build/html/_sources || die
-		insinto /usr/share/${PN}/docs/en_US/_build
-		doins -r docs/en_US/_build/html
-	fi
-}
diff --git a/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
new file mode 100644
index 000000000000..1a5bd03bedb6
--- /dev/null
+++ b/dev-db/pgadmin4/pgadmin4-4.17-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="GUI administration and development platform for PostgreSQL"
+HOMEPAGE="https://www.pgadmin.org/"
+SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+# libsodium dep added because of 689678
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/libsodium[-minimal]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtwidgets:5
+"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/imagemagick-tools[png]
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=app-text/htmlmin-0.1.12[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/blinker-1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-1.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-gravatar-0.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-htmlmin-1.5.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-login-0.4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-mail-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-migrate-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-paranoid-0.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-principal-0.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-security-3.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/flask-wtf-0.14.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/passlib-1.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-5.5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-sqlparse-0.2.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pytz-2018.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/simplejson-3.16.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/six-1.12.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/speaklater-1.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.18[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sshtunnel-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wtforms-2.2.1[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}"/${P}-python-3.8.patch )
+
+S="${WORKDIR}"/${P}/runtime
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_compile() {
+	default
+	use doc && emake -C "${WORKDIR}"/${P} docs
+}
+
+src_install() {
+	dobin pgAdmin4
+
+	cd "${WORKDIR}"/${P} || die
+
+	local APP_DIR=/usr/share/${PN}/web
+	insinto "${APP_DIR}"
+	doins -r web/.
+	newins - config_local.py <<-EOF
+		SERVER_MODE = False
+		UPGRADE_CHECK_ENABLED = False
+	EOF
+	python_optimize "${D}${APP_DIR}"
+
+	insinto /etc/xdg/pgadmin
+	newins - 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
+
+	local s
+	for s in 16 32 48 64 72 96 128 192 256; do
+		convert runtime/pgAdmin4.png -resize ${s}x${s} ${PN}_${s}.png || die
+		newicon -s ${s} ${PN}_${s}.png ${PN}.png
+	done
+	domenu "${FILESDIR}"/${PN}.desktop
+}
diff --git a/dev-db/pgmodeler/Manifest b/dev-db/pgmodeler/Manifest
index c494c3b3c976..8ac70416f0f9 100644
--- a/dev-db/pgmodeler/Manifest
+++ b/dev-db/pgmodeler/Manifest
@@ -1,3 +1,3 @@
 DIST pgmodeler-0.9.1.tar.gz 3569027 BLAKE2B 4d91d430554f739b585ed155aa2d87dc648ea5d2d6a1c22ddd9ae829afb63654fe052091de5dea51b0fee20ef2ccaf5b77587f036c4072bbc623bffba9a67b27 SHA512 bb6f093e00f0e41a9dd2a9b7e3723459af759e79835b73ab67b01c23ae6b29f1453b5cf61e987c6f1a2a3908e700d048f0a7dcbed3ac1636493d6b6e657917ba
-EBUILD pgmodeler-0.9.1.ebuild 1249 BLAKE2B 0db1aabfc00714d7285c8a7cad01a5366bd6773c24a24b3e86b2ca51499ed3a04431c0ee12a7c59f74479927bf6017ddf2a89f23d66971ed6f3cc2c458b5777d SHA512 d2f5d6125b44a148f6f73472063d8745c51a19c3aec05e90c8514cf9178e938122fe277e33b0772e4627490162d34fc4beaa3f96df2dab33e893064f941dbd04
+EBUILD pgmodeler-0.9.1.ebuild 1241 BLAKE2B 007b3b60600706d4468e893b690832e30719794d16235d54fd6962259905e73847b9abfb013ea49b94eddf84a77a6c96957ad98d60b44f54bb69a0cf0a8f9e3a SHA512 615a3590933d1796848b9b362800df011bce689c2d00ddff1047ed5101dd57978bd4be61bca7765780a079a0d0a5913097a86e062ddad94e5872f541f49b9762
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
index 0c8fc05f6763..7db68b875d7d 100644
--- a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
+++ b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild
@@ -34,10 +34,10 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_configure() {
 	eqmake5 \
-		PREFIX="${EPREFIX%/}/usr" \
-		PLUGINSDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/plugins" \
-		PRIVATEBINDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/bin" \
-		PRIVATELIBDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
+		PREFIX="${EPREFIX}/usr" \
+		PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" \
+		PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin" \
+		PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
 		NO_UPDATE_CHECK=1 \
 		-r ${PN}.pro
 }
diff --git a/dev-db/pgxnclient/Manifest b/dev-db/pgxnclient/Manifest
index 7ce06c1a1107..00acb9dde1d3 100644
--- a/dev-db/pgxnclient/Manifest
+++ b/dev-db/pgxnclient/Manifest
@@ -1,5 +1,5 @@
 DIST pgxnclient-1.2.1.tar.gz 87275 BLAKE2B 794ee6201988ba523cdcb4ee5a6287625cb3dd8a30ad750266d7adb739792b7f8e852d5d01f746fb6b05b54c98d677854dceacc57e41b05efba094efabc6a129 SHA512 3fa864b1ebb5dedaf75515b5efe4c453f02acff558f7b82d2648da62e58c93e050049a7688171a69593784d9963bb62f4ad3674d526284554dbeb4f4a4ea1dbf
 DIST pgxnclient-1.2.tar.gz 86436 BLAKE2B 796191d31000ff75360e0990bb20ca88af0fb1b908aac9ca7a6b7309b5420c56d045a67c775e8d5dda166f37ad956314f65bd2032c114cac7414bef9ad1a0d8e SHA512 d677f8d5346caf4de5d7e0d4e4031b8bdd932e343af7fc33e8895ebe51b1e9e6a11d7300d9e98ddc10242854f7d39c0a4196f41938e42f0b0e5158454e386deb
-EBUILD pgxnclient-1.2-r1.ebuild 787 BLAKE2B 2eb540090cf46a1c14d41fb178b8da3bc58dec943521a90238d777db1bb3d1bf1a0c6a7031540c50f34e55571c82565c39b2161f55bdb4d2d1133b10c3582acd SHA512 203fb6df4c23c8e940118a1ac45a596b940a2f095dd396bd178ae0c9fde1d7d97e83194cb40cb92fddb971b118bb87981ebcb5074cfa3ef41652e61444857fc7
-EBUILD pgxnclient-1.2.1.ebuild 793 BLAKE2B 0f2fde64d8e72e57cc4c5aa5659aa00ce342354ff506e85112c447e72c55f83b50763ee4546fa4c9289e377fa47595acc406f36846bb8796dec79f54cf2237a9 SHA512 fd2705a2fdd435d04cf233775a2dc282e99edf5b7030e6ebf4166d7e6d5542c5a540fabac363bc910d644cafb9cb996f9f8b2ebf9fc320cef9f84e30e636e6d5
+EBUILD pgxnclient-1.2-r1.ebuild 792 BLAKE2B bd151a94340ff5908d582dc59de25e55771af3ede241546a5747b2ebdddcaf1ba16b20208381fd5d2626e86124f902b107f396d75a3c5ed1fe3f69c24ea641f7 SHA512 7946c8e1a0c28a94d469b912349addb2af2a760784eacaa068c78d01976a1bb2ecf1afea8d25cb9bd106c358ddbd76ed8a5643020799261bd42d4b111c00a913
+EBUILD pgxnclient-1.2.1.ebuild 798 BLAKE2B 553c3c2267e268b33b28eb8af4a7d033546526d935423f556aafd5e382752c45e61bcc6215474b6201d9ad127e2088e66fb5dbca5dbdf3c5f83c98895cef329f SHA512 6a006b13765ce47bbd3430cbf8eba507a3fd093d2b29fc49ac6f31bd51d240ab89e4dc614b7e4e242a6d6aa45f26c0ad5d7e887725f5750e6d6332f7f2a8bb66
 MISC metadata.xml 477 BLAKE2B 69bcece85da5b9490a5aec5f94264a420d5babb983d602188b4bcad58f35da663216bb52e694009562e518b716a12b05734a2ee81a1219d93641268630a68e3b SHA512 63a1019650d2bfec1f0dab904cabd0de847f5d7cb5ad62dd04ca93a6cf7c25ef2a727a8dc0700a00958b841f7ffaa2c99f608b4cb1872a31a1dc920d0834d22d
diff --git a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
index 679315dda916..c41008704bf5 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/${PN}"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
index e15a725fbf91..91d190c091db 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="PostgreSQL Extension Network Client"
-HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/${PN}"
+HOMEPAGE="http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 77836224d25a..86449ce23f48 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -30,28 +30,28 @@ DIST postgresql-9.6.13.tar.bz2 18767279 BLAKE2B c1ec780a7f938f878425cbd6556145e6
 DIST postgresql-9.6.14.tar.bz2 18787744 BLAKE2B be5a0d90fe1cd5ea682d8446e512271175f705bc49514215535d7aa4b631669846c0bd6167f985028c07dc5d6d394a1ea809028c5a5e15a5f010e85c2bede8cf SHA512 dccc183a6992ef4ece4ef5c638339708ab484e571ecd66ed993c9071cd55f250b4277fd3367f9a5ee545aa83e29dc5f7a239200e200e3314d5acc847f35e790c
 DIST postgresql-9.6.15.tar.bz2 18799121 BLAKE2B 5dee0fac7592cecf4412deaef54cedbd86eb6081fc268b6ef8a5f01c31af930747749fb54a77d766e1d6ef705bab5d550a7bace25c86d201f25ed69163d920fc SHA512 cc35a059bf59ea3487c17a8432b791ca2a19afaa24b07403a8d33904b3a97ebe601e3036ca8ec766c54cb87a7def7d4618a425a4446e6832391185d7c71117db
 DIST postgresql-9.6.16.tar.bz2 18806372 BLAKE2B f5d7287264b05ab6bd157adf05d78597c7e7281ef40d4616ad66f2434a686c68845ad21883bcc97f6ea299a785109e1541d6c75e40ba383d80e9703331d9c624 SHA512 7083d670883b203946f68bcf1216dd1cbd904220b4c95e25855f9a8904334fd7e87509c905f589398ad7b165869b75288c2e4f49b14263ce4891347ecd4485b4
-EBUILD postgresql-10.10.ebuild 13924 BLAKE2B c05398c0bcee12d28254fd57f91f974b8389b6739bcd4fd994ad35e18455936df9a2eec6cd9860c5bf4d9e3bb3251f4662bbf460675ca360c03a7193a96fc336 SHA512 74f6f8303318b25bfaf09cafbae0af3049cdac6eb939ec4df71b4a4892ed6df032a6afb8e0c84d4630cc2321b1d1db2c5873ad41833d6eabb5b77ea96e48dc49
-EBUILD postgresql-10.11.ebuild 13915 BLAKE2B 9704037528284f71a781c738b44450cb43c029bb221fde59d40f8af12de292af8b1b1f4f892441c72cc79d70431936f621881181a7cbe6a5ae22bdf665b73f11 SHA512 5a55e48c83ef25ba6ec28c49ddd84e832a0b6b13aa87d9e8e6f1c58c340dbc83996849d3212dc7c0fb2f2a9329ecd7665010468a23d4c31d7da82c9aed2d418b
-EBUILD postgresql-10.9.ebuild 13917 BLAKE2B e2f8eb187f60c615ced48b6dae373039038d295ab103b0e5b4c4a0ddea5e96dcd33e1cefce1cff8d56ce22aead49023acc638e2183d7944aac134c41bd7f1723 SHA512 f268ae2a323b057cb6ad6c452e6dccd29f0e0db12227f1c693086c9e997c53b797cbd19b3545c1311c69d1c7ca5e6a8d76e19a684de3080866bac69281b9c8de
-EBUILD postgresql-11.4.ebuild 14043 BLAKE2B 040e7698304d9631e5c145eda79fb0da214135f80e5772763eff3bb1788f52cf1fdebf6ad8ab159348f444ef04c103834d424b2a0e184afd0af8fec93856eb1a SHA512 48e8050627b2254d6b15d8b821f7d65d970a40cc3077dac5401ce84ff1a6a58e98e434dd089464a0eba4b9b092f8833b981bcfd2fb2edc286bcc826b4fbff859
-EBUILD postgresql-11.5.ebuild 14051 BLAKE2B b3d6ec9b2a2df2a476f8da9459858692fff30073f9446ddfaf1eb042e5f1232dbb80d9269979710befc14bf7fbd8875a7d3d18df97961c29b71c1ae06757aa4e SHA512 329c41cf4eea20098dabcf87766a4236b5f8c3ef79791ad57904260fd319ce2418b3570dbfa704225260787ea13947008fb19debd2794358c8ae0acb72f906ae
-EBUILD postgresql-11.6.ebuild 14042 BLAKE2B 0de4003f360a51abe9cb7a45556b175ed789d4c197b550db679af6e9b94d3594434ad3eb52d2a91aff246a65503cbd1aed8dbc0cad1572afe5c707a3b3eba647 SHA512 fcaf02917b631e4c57a6308aef4d69376084d0d0da9f47af00e1090803a293979f47332b98b6e80fdc45a5f5f3b044e0c3db2e70555b8476d412ed390a86e84c
-EBUILD postgresql-12.0.ebuild 14027 BLAKE2B 215f30d3678b0db757958f2b1e910e3e22adb014f87a4cd80a547eef64286b9f4fece889eb498a62ab5eb77e2eb7154433c2d829ba486a30e3bc3212c6a6b8a1 SHA512 745399c3520dac4f7fa6c5573eb49491a2ece6c3c35fe811dd505f295184777553a6c26d87de09cb5bd28b67872e771ad3dbb8f3f00ab9fb11368fc90262db3e
-EBUILD postgresql-12.1.ebuild 14014 BLAKE2B 73cb7067a786e67b2e6a2614558c69f793af7404812008ba62c2861d504c96de9d259dec322a8596e68384c2abd5216e47e94643178d94ce57667d32dc60e7f7 SHA512 458cb55ad2d41f63cbe42b21d80c42487e6bf38e2eb520b903789a91c9b07dad069e69213bcd8d057a7f7a991760ddff97832ee4c59faf37d256af9271701889
-EBUILD postgresql-9.4.22-r1.ebuild 14520 BLAKE2B 3ef01b265009894618634f67a3e0946fb4f14eaab29949e79dc40929f0ed90a7c66230371891f908f2ffd37dd0e670f65d0b3244583f53a33e4782127e9b7b56 SHA512 cff90abead1a9e4a56d781817890ee5e2f1cace64315378b30e619147f4aa08b3f436b8a9c7efb1b9fbf75664f3932f49c5456a5196af6e8ce30f584cd8590e0
-EBUILD postgresql-9.4.22.ebuild 14355 BLAKE2B 71f3f741b70b80ae3b19eb946b9c36c49423905c8051d40db1099fcda879c7db533be8dc8870b6f42c0ca0cbce347ad9f76d12cd07464e519b7d7a99efb93518 SHA512 9a75a3f4469e645b132d0b4127dbc5943e614b3e7e7d8777884951f3771ace77e1d252e0c381fa82df3fe9ac0a276563cb1f52c1dd9919ab2f0bd4e0b31822a8
-EBUILD postgresql-9.4.23.ebuild 14512 BLAKE2B 44eefc4ba623cda5b8a909b9a070190d5eecca848887496bc25c265c8cc3e33b6e0f57d2c03d75b5e0fc8c14f4618bb5ddcc964c8c7ce4843c1f261240d960f6 SHA512 0ede36acd4be218d282d90bded383d210034663bcdd1add15aa4f096156cf3b709a9e1b4969114272e733ecb86a981581dde801f73cb343e673a70e0c79da48e
-EBUILD postgresql-9.4.24.ebuild 14520 BLAKE2B 3ef01b265009894618634f67a3e0946fb4f14eaab29949e79dc40929f0ed90a7c66230371891f908f2ffd37dd0e670f65d0b3244583f53a33e4782127e9b7b56 SHA512 cff90abead1a9e4a56d781817890ee5e2f1cace64315378b30e619147f4aa08b3f436b8a9c7efb1b9fbf75664f3932f49c5456a5196af6e8ce30f584cd8590e0
-EBUILD postgresql-9.4.25.ebuild 14518 BLAKE2B 6e2850eee89718200d36d979784edf407c8b5559352d151f19d6203d4ff9e0ffc15abb9dd26d52d7df9ab9caed0e1319f82acaac3db91551b8d61412a7e47e1c SHA512 5021bc9aba3c31e3c65d77451fb63b32985820c31480d3c766ebb0c655fefb19f2f606f044465255a4b3d93ebd72049f42ecb3672c5dc1c58aa266a2986dea64
-EBUILD postgresql-9.5.17-r1.ebuild 14748 BLAKE2B 25d75bfb24afb94979f096d74d51df3654d3ece778a96491fe6f4ea12616931785fb18e062a607a1ce00ff4c4b04b011c91c2981461480e14520ad234d6aeba7 SHA512 362ead5a78680dcba685e95210384d74b665c2ecf0a748247795871f70ba6c0803a4f45122d969f2e84cc1195c5718da13edb45e136b89d029061d9bdc1d683e
-EBUILD postgresql-9.5.17.ebuild 14583 BLAKE2B 12ccc584c5ebcf5d3400207b11d515d56723c81add3ec64988d071be9a5b566e45e88636910b02596b72d9e70cd619ecb3917b69e7edb0f78d923b0cd99ba86d SHA512 c060e2081932ca08a8bd4604e56a9cb19900e43875d9ac206ef1ce128d957bc359c87cc353d06553a7ff15c3091d4205b2dc9315ebe976bb4303568f551a8cc9
-EBUILD postgresql-9.5.18.ebuild 14740 BLAKE2B 82894c37d569774b34a33cf1a5167efa5374e5f1d8da429fd722b14073efb6ea62ece568352575cdd8fe46b67ef50263a22560b0190775a79f796ff9939e6b96 SHA512 4412773f738c7f40b169396fe18628c642fa1276e3984f8c6e7aab599ba8648da5ec51658dd299e4fa4705db0735d92d3d180e4f42d13865ceca2683059ee688
-EBUILD postgresql-9.5.19.ebuild 14748 BLAKE2B 25d75bfb24afb94979f096d74d51df3654d3ece778a96491fe6f4ea12616931785fb18e062a607a1ce00ff4c4b04b011c91c2981461480e14520ad234d6aeba7 SHA512 362ead5a78680dcba685e95210384d74b665c2ecf0a748247795871f70ba6c0803a4f45122d969f2e84cc1195c5718da13edb45e136b89d029061d9bdc1d683e
-EBUILD postgresql-9.5.20.ebuild 14739 BLAKE2B 4d3887db7564037f2ed6b16b673c56295974ca0bd77b310e860f716a93507eeba0211139ef4a61922c8fb53ec16ee485540c9f654fa1ac08df75c5bc49e08f43 SHA512 e30d2c4edc1188fe8d0f7e79be99e93be9263acc481dc87055de08130a7a2a636dcb0d36d2e59f7cecf6ac5404dd7b98e8c6608ce74729cc97e6c6c41471c44a
-EBUILD postgresql-9.6.13-r1.ebuild 14981 BLAKE2B 2b879aec0d072a99c35f736e842fc3a6f20cbbc0fa26b61bbae55ec708e941067994f94a014998a3b6e93487fc62b8a48e8859f39447222b381b394cc0a3fd5c SHA512 339ab99b3d1c127ae07ca424c8831328930c37a0d230a7013fe0c0a7cca3ed8921ee57ccf836a41e78c23882ce5b2197d476e1a9d80e90652973f1a7e5c12083
-EBUILD postgresql-9.6.13.ebuild 14816 BLAKE2B 9e24011b34bb3e28eb714c3811f5b5e9560394355d0bd10d35eb9bd6a49bc17d654cd6aa00034ea8c456e4b7103309f5bf52e28afac7c530e18a24b6de96039a SHA512 251553a1222ee2b54a92124a971f9ea299a9add28bc50fb5859295500112a75cb02e03e3efd91c89a38faa8f771271e041411811c51e4879e2f90a6e5604e4a3
-EBUILD postgresql-9.6.14.ebuild 14973 BLAKE2B 050dd9a09b489eb3b67c09da4689a0259c273eb05f03b6f0e20bcc6cad476f5688316fd6b386ef0acf210f8c9a80e574fdeefb50571a4d6822b8ca17d7f905c1 SHA512 02d17343df57c275bc494d02249ef3a76d3f615ceeb669c5c29f4253babf4db4cd4137ca0cb028af0ac55d0179d9fadacd72c36634a1f8f2b90e21b9ce6d840b
-EBUILD postgresql-9.6.15.ebuild 14981 BLAKE2B 2b879aec0d072a99c35f736e842fc3a6f20cbbc0fa26b61bbae55ec708e941067994f94a014998a3b6e93487fc62b8a48e8859f39447222b381b394cc0a3fd5c SHA512 339ab99b3d1c127ae07ca424c8831328930c37a0d230a7013fe0c0a7cca3ed8921ee57ccf836a41e78c23882ce5b2197d476e1a9d80e90652973f1a7e5c12083
-EBUILD postgresql-9.6.16.ebuild 14972 BLAKE2B 17ff2cab4da79f331eb256327b99dd02e50401b41ebbafafd3b2dd752ba46094b3882f64e4536b2f0f0a3283795c145354d09dfc473e09c3d0083baddc25a59e SHA512 ef7d4bdb645807a720238cea456cf728fa64938c9e3f9acb576c3d466b0f097dcd9c30a207042799615a78cbd0c2c3371d476e50e7b6bd01db0fc8fb0a15f443
-EBUILD postgresql-9999.ebuild 14484 BLAKE2B 42ab96a78dc30d063a9b36550dd0de6b1fbf0aaf8864ef75701697def08e83d80432b22a014928a81667a210064bffc969d3c31285e69536ed8de543ac50ac9e SHA512 c0efac8ba0e11011710ca62ae45f8fe3fba0e736d9539977db32b2c0b536802b5dd38c4f6f857ec6564973fc52c837f5b3489ef1c7d21e89d1d70988bbd75f0d
+EBUILD postgresql-10.10.ebuild 13886 BLAKE2B 96a235ac92e99df82d36b6031eb6df93db33695294c78fe6d1b4335ca4d6b10447eeeef3abf448fc64841747174204002d16e6de455e43a44d5005da2e8cbad3 SHA512 5f53c4a1022d7599282468cbd840d5ceb24eb1d7ec8694df66d591e391ac6410648543ef3993dd698d146542d6feee5b5f8b320750fea96b864195c2843e0c80
+EBUILD postgresql-10.11.ebuild 13877 BLAKE2B 65eb77560e018ed2dc5bdb9c1e02aadddca62fb526d0ba9daa189373b3fcaf331cf0d69a708016e23841f12f5f93682cabb905d79fb3ad7def4d552697751e88 SHA512 b77f6d04d460f3150a139d12dc786abb4da239de9513bda7fdcae14d0bf2f4d073d585895d73042a5692f7db469d0d5fdf910db27c7b3a14083cb8a599ebdc0f
+EBUILD postgresql-10.9.ebuild 13879 BLAKE2B 85e4ba2a1988e6f0038b5e3ce6a82be239cf5dd6dcbf90ed2e57e2364351a4300d1841c5ed0d43a028bffdb3d5ded951f51048b0fad5b8141cca38231bfa9800 SHA512 737d4e8dd17735a02ce6e9058906ceb4732c51d8746cb1ad826dd8240326c2b476d1f5302a4a787780f8280a60d80441bdac3f7b27d9b0044617d75278a01d50
+EBUILD postgresql-11.4.ebuild 14005 BLAKE2B 63cb3dbeec16bb6d7ce5310f6d39189d16dd1e1cfa9d07df5c4939636d3e0076b3144bdeb63eb631e87ec5cb8e82398a3e0fcb57c0820a3fed6ac9b843e65ebd SHA512 73f4221348bd9506857ccef2f7d38a908a844b3526fea792011b41dc9fca020c996d2372307ed134ddbf38999888e67485c212980b55a68137681670b8f99973
+EBUILD postgresql-11.5.ebuild 14013 BLAKE2B 40b9f6386b51881733e3babb60622caa7c21c51dcfbc85aa2b68d969c6f61cfffbeda2aa41bf0e8935a60147a4c8f21a1ef22c4a69751ea18638f360c52f5c9a SHA512 d7796d9d2a68f6a1c54022b75b2b44b70548647c29ca053742c65dac492741a1f8a4fb6658050d06fee0ed978950bfd4d71f50328e5448fd5c7ea798b6500fd7
+EBUILD postgresql-11.6.ebuild 14004 BLAKE2B 7d4006cdbcb0272d1ce5b148b3e7108bde5af8b788707706cb8579d018876bf02bf26f609c7dde1a063aa30d16ecfd1707eea173ac23015f0c00e57743fce6c6 SHA512 ab6a44c4ae29e7b8da2bb308f7db773ed167d95ce7580f778871baf6ac89a73d725c966140f8ba19b46b0b9e41c29ce19a1a4c1570d59f8252b554d066f82945
+EBUILD postgresql-12.0.ebuild 13989 BLAKE2B d26ba41c7c7f187969c8ccab7bc7c001d691996d56f742f11eb72cdf81aecbc37b4d1101013fd119327729e8a088c34082b3add556ef6544ce647c8daad3a95e SHA512 e77c7eadb5e8e7404c3126b0d7e92bb151d6bf67614ed38963e0a3113385d91c7af63729c6607d79619804e0979862815caffc638a6eb1b71bac63f84cfccd4a
+EBUILD postgresql-12.1.ebuild 13976 BLAKE2B bc029f68191eaab60263151fea4b18f1b981537f0eea1efe47e6a3726b6c0e9cc2e8fa8961332c568ce323063f0c28e78fcb24299aaea018e64f5009a7e577fd SHA512 26b272b194b17f9bb250d1c8730d79ba4a22401cd757656551e53cda28119e92cf447807f69567194a4945b707a0560026f86c0101f06540efec6af9792582b2
+EBUILD postgresql-9.4.22-r1.ebuild 14480 BLAKE2B 13ecb76a720c9e308965569ba04130d3f73229fdc310d0b3e57f8206b656c930ae2e0b837bdc9edc406fa20047bbd4aab75499f3ac03645ecedf279ac8f03667 SHA512 8c60ed090170ba6eb5cfeec7f8c1455fb810ed1473823c66541de724d5e5ab3d84cf5cf8232775687976fa4156a26c2e5c0c237148053cf1bf578b13a713932b
+EBUILD postgresql-9.4.22.ebuild 14343 BLAKE2B 19ccdfa7d9b90fa1539230395c4c2444b5c257f0276445f3c99919f2241c00c104a9ca87b3422ce67fe0647d02a7823804dcb1e4287ade349f47dbe7d4ddea3e SHA512 e25748ce695ec639ed6fe338ae7d76904552ced432da7595b02f6e9f271d5d5f8ea94fe7dd065b8f1ab112f66897fd9925a95bc8168f5c5e6acc3c811482eb98
+EBUILD postgresql-9.4.23.ebuild 14472 BLAKE2B 93f358222aebdfa452bab90609effcebbc43efbcd3f57fa245a42c284c628cac8a521e887aaf2fccd2c8b1e3773e6ad27e3285505e8063f383557b4c8af04e48 SHA512 e92206357b74844137b38bb2cb2b1b506f8f2cd82c32a8704bcde515cee0724af1c57c4637769b96cc883d78ab5ab926ddc1254a00a76e7066c890442ce7dce4
+EBUILD postgresql-9.4.24.ebuild 14480 BLAKE2B 13ecb76a720c9e308965569ba04130d3f73229fdc310d0b3e57f8206b656c930ae2e0b837bdc9edc406fa20047bbd4aab75499f3ac03645ecedf279ac8f03667 SHA512 8c60ed090170ba6eb5cfeec7f8c1455fb810ed1473823c66541de724d5e5ab3d84cf5cf8232775687976fa4156a26c2e5c0c237148053cf1bf578b13a713932b
+EBUILD postgresql-9.4.25.ebuild 14478 BLAKE2B 24a2993d8dc59203dd3fa342bcc32c806ca80b4363e8d49ac3238a8764e001d7e9eaadea87391d62c769d31af97e4935b002de4bcdc1ab4e5cd9a0264af28baa SHA512 ea444b6f10c07d8e912d7609dd009212986a23bd3e88afa04c08930d4be8612469d223e416203200f3f5666972807111296fcee287cf6cbdcb4fa8505e1ab78f
+EBUILD postgresql-9.5.17-r1.ebuild 14708 BLAKE2B acb148d0c65db0b133938c2dd14ddb67967078c51d43b5ca14895ce2a60e1fd77e8188322881f3a2f22e3c1e08fc6cc3931edcde68a7adcbe81ddd57077518c1 SHA512 7a24816e4d0e27a635183467c7a5e2df14123ae3eeb4fee6b4c1d6cc8163ce6da5df94bf8edf36d1cfc5048c7afb941e4bd823e9eee3ca60075fcaa4ef7ee005
+EBUILD postgresql-9.5.17.ebuild 14571 BLAKE2B ed5edff9cf26f4f33749485ad84d338b5b344a2506d796bbe24fead1b4723daf08d11dee3eedbd2fc59022906cf04fe9ed511fe63a108c2a9cff49653ec12dac SHA512 563acc59b608623142c7aa209dd128df3e8d7bf8e0a335e240643a169371f480732749ae1d87c8e8497103aa62911a9b7995c53023c6174d915d5b1e94c8ebb4
+EBUILD postgresql-9.5.18.ebuild 14700 BLAKE2B 6ab036cb83d33d5194a557cd90006572be1ec063d7a89c4bbb22e49614817311971aea04676c9fde062a0973e4cd470cae7d7927b49775e471a358268403457c SHA512 0980840c4f8d006bc73613fbeb230480b5d459ab443a7ec30c2beee415a3a36d79563e5408ac64b3bd504cb0bbbdccf515312b4d2cd064f0fb05f3f230c0fa33
+EBUILD postgresql-9.5.19.ebuild 14708 BLAKE2B acb148d0c65db0b133938c2dd14ddb67967078c51d43b5ca14895ce2a60e1fd77e8188322881f3a2f22e3c1e08fc6cc3931edcde68a7adcbe81ddd57077518c1 SHA512 7a24816e4d0e27a635183467c7a5e2df14123ae3eeb4fee6b4c1d6cc8163ce6da5df94bf8edf36d1cfc5048c7afb941e4bd823e9eee3ca60075fcaa4ef7ee005
+EBUILD postgresql-9.5.20.ebuild 14699 BLAKE2B 7ee57d817ff9345bc2ab147d728b761adc3806c76528f0f0c7db8f483873b399fc2d23c650cd9e5671d09199db5861d4485bb10c1ef858357f29096fc28ab8d8 SHA512 56eaa1ca58df256308674140eff53a3fa458ec70c9c150d9197e6543e5573b595ef85af0a1d955954d9dac3cc02428ec4fed75080433931ba15144e0ccef2977
+EBUILD postgresql-9.6.13-r1.ebuild 14941 BLAKE2B 7734f87c1f10d5ae200f6bef11f4d85342b48536440519ff198401abdb7b54cec857dfd11c742c9c5ddebc5af075afa53155bfddf21b873a620cfb092173c1ca SHA512 9f82442daae369b466679c28ba25a1ce3cd9888292f4cf3a290e454d2d84884b9adbc15c0d35a8b43807eb0aef90b5cf6f6d833f1f24c48259068913a8d191f7
+EBUILD postgresql-9.6.13.ebuild 14804 BLAKE2B 2ff7ee303d930a80ea232bc79d84a60fd275b0324b81dbc47836b59ff7fd8ee57140ddc51cdfa0ee81b5190aee5df3893244c24bccab7ca73a45738797c225f6 SHA512 5907ca2b1051b4622f0e3a3752282e09f22bb0470bda5f932ed5fa82350c6eb2fd251cfc9257674f97856d87f376c27eec6fadcb57ccb2c60e099fd68c224d8b
+EBUILD postgresql-9.6.14.ebuild 14933 BLAKE2B 7076f0bc1c51a8192afbadf202f699f339619b45bbfd4250a2ab0b7d0dbaa39c3daec3d573835ecd608aa8e0bc85c9e4498d243ed24463622cc3ce61147feed6 SHA512 70678562dc7bd7e113e6ffb567a2a687fdf96625cd37789ceffa9e6ec7c6650fb251aa0fab4e32f35b3acc20add3c8d70e23f3aa2d2a9cd4b42dd077eabbbc3f
+EBUILD postgresql-9.6.15.ebuild 14941 BLAKE2B 7734f87c1f10d5ae200f6bef11f4d85342b48536440519ff198401abdb7b54cec857dfd11c742c9c5ddebc5af075afa53155bfddf21b873a620cfb092173c1ca SHA512 9f82442daae369b466679c28ba25a1ce3cd9888292f4cf3a290e454d2d84884b9adbc15c0d35a8b43807eb0aef90b5cf6f6d833f1f24c48259068913a8d191f7
+EBUILD postgresql-9.6.16.ebuild 14932 BLAKE2B 9cdb7894bf2b59dd9c189d6be3af44c5b6da3a313252cbe1473baa261511f057793ef13858584ed2cb44b6394cfd70a3a6fb23de56eea867746b6484cb56b4c0 SHA512 ef44663d2e62aeedc386f31310ed31968ad4dccb9ab46018642355037c97c8164a65ec5c84b7b89c80f53d9ea81f3106bfffefc56a6099d3dae4a67b859c094b
+EBUILD postgresql-9999.ebuild 14442 BLAKE2B cea26ebf8ef18077b03b2f076c89ef2e6fca8f9334ba56c0b26448a4372f4cae12dbf7fe7715062160ac221c386379763d19502eb5771267559e567340ce8727 SHA512 81f7c20234a89b142b498c906f2dd6bb59686a67d9537e5ce3c658d3c83c8f82f8122a9389942e3f3cb28b24fb24f0a647a805cc8e5c063a2a31776b4a46c27b
 MISC metadata.xml 715 BLAKE2B 59ad51ae06a697fe649054d9fe13040423f425b95abdcf3797e1d0d5abba8c62d54cc8c1afb0be0d0a29d1a39d379912bd931925b5df480fb0bb9b238c36e598 SHA512 03027757eaf95313a6825710b1054a9671aa8396381789397006dfe2f66cd41e85cde418e792bf7d71d7db2413905816ff39685774219c1ea5e8b8d35c5cffd0
diff --git a/dev-db/postgresql/postgresql-10.10.ebuild b/dev-db/postgresql/postgresql-10.10.ebuild
index 4c21bf2c2fd8..e52794e837d7 100644
--- a/dev-db/postgresql/postgresql-10.10.ebuild
+++ b/dev-db/postgresql/postgresql-10.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -132,7 +132,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -292,11 +292,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-10.11.ebuild b/dev-db/postgresql/postgresql-10.11.ebuild
index 4db1706faa4c..bd7fac0fb3bb 100644
--- a/dev-db/postgresql/postgresql-10.11.ebuild
+++ b/dev-db/postgresql/postgresql-10.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -132,7 +132,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -292,11 +292,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild
index dfd737bb1a58..bfeb46d7c2bb 100644
--- a/dev-db/postgresql/postgresql-10.9.ebuild
+++ b/dev-db/postgresql/postgresql-10.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -132,7 +132,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -281,7 +281,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -292,11 +292,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -330,15 +330,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -347,7 +347,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -359,7 +359,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -399,9 +399,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -444,7 +444,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild
index 2a0a71668e6f..f0f63a2d6779 100644
--- a/dev-db/postgresql/postgresql-11.4.ebuild
+++ b/dev-db/postgresql/postgresql-11.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-11.5.ebuild b/dev-db/postgresql/postgresql-11.5.ebuild
index 665416e9dcbc..6b5733b5761c 100644
--- a/dev-db/postgresql/postgresql-11.5.ebuild
+++ b/dev-db/postgresql/postgresql-11.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild
index bd2130f6d42f..7a06aa0c09d8 100644
--- a/dev-db/postgresql/postgresql-11.6.ebuild
+++ b/dev-db/postgresql/postgresql-11.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-12.0.ebuild b/dev-db/postgresql/postgresql-12.0.ebuild
index 5bc6cd4acf10..126840b3d529 100644
--- a/dev-db/postgresql/postgresql-12.0.ebuild
+++ b/dev-db/postgresql/postgresql-12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild
index 1202ea084698..cd199332c1e3 100644
--- a/dev-db/postgresql/postgresql-12.1.ebuild
+++ b/dev-db/postgresql/postgresql-12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -133,7 +133,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -283,7 +283,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -294,11 +294,11 @@ pkg_postinst() {
 		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -332,15 +332,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -349,7 +349,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -361,7 +361,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -401,9 +401,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -446,7 +446,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
index 43043da26219..0108773c8234 100644
--- a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -308,7 +308,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -319,11 +319,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index 3ca85697fc72..2de7ac9d8898 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.4.23.ebuild b/dev-db/postgresql/postgresql-9.4.23.ebuild
index 5d6471258c66..af2e5cbfc5e3 100644
--- a/dev-db/postgresql/postgresql-9.4.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -308,7 +308,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -319,11 +319,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.4.24.ebuild b/dev-db/postgresql/postgresql-9.4.24.ebuild
index 43043da26219..0108773c8234 100644
--- a/dev-db/postgresql/postgresql-9.4.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -308,7 +308,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -319,11 +319,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.4.25.ebuild b/dev-db/postgresql/postgresql-9.4.25.ebuild
index dccd9372c733..c243a5ff1140 100644
--- a/dev-db/postgresql/postgresql-9.4.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -290,7 +290,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -308,7 +308,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -319,11 +319,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -349,15 +349,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -366,7 +366,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -378,7 +378,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -418,9 +418,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -458,7 +458,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
index 1b7912c6d02b..19566040ab28 100644
--- a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	fi
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index b8663e8bbf3e..04b8485b94c7 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.5.18.ebuild b/dev-db/postgresql/postgresql-9.5.18.ebuild
index f6e7247b9104..0a8e5066a378 100644
--- a/dev-db/postgresql/postgresql-9.5.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.18.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	fi
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.5.19.ebuild b/dev-db/postgresql/postgresql-9.5.19.ebuild
index 1b7912c6d02b..19566040ab28 100644
--- a/dev-db/postgresql/postgresql-9.5.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	fi
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.5.20.ebuild b/dev-db/postgresql/postgresql-9.5.20.ebuild
index 0631e478db3b..c3374ebe511f 100644
--- a/dev-db/postgresql/postgresql-9.5.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -127,7 +127,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -291,7 +291,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	fi
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -464,7 +464,7 @@ pkg_config() {
 		einfo "Or move the configuration files back:"
 		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
index 1a2981407228..0aac8dd1aa22 100644
--- a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index bbb43aee8a94..2ca03de3a2c5 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
diff --git a/dev-db/postgresql/postgresql-9.6.14.ebuild b/dev-db/postgresql/postgresql-9.6.14.ebuild
index 2334b0f00b3e..3a608b2ef11d 100644
--- a/dev-db/postgresql/postgresql-9.6.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.6.15.ebuild b/dev-db/postgresql/postgresql-9.6.15.ebuild
index 1a2981407228..0aac8dd1aa22 100644
--- a/dev-db/postgresql/postgresql-9.6.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9.6.16.ebuild b/dev-db/postgresql/postgresql-9.6.16.ebuild
index f4a28fd7b81c..33bb16a1957c 100644
--- a/dev-db/postgresql/postgresql-9.6.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		  zh_TW"
@@ -131,7 +131,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -296,7 +296,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then
 			rm "${l}" || ewarn "Couldn't remove ${l}"
 		fi
@@ -314,7 +314,7 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	if use server ; then
 		elog
@@ -325,11 +325,11 @@ pkg_postinst() {
 		elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
 		elog
 		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
+		elog "    ${EROOT}/run/postgresql/"
 		elog
 		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+		elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 		elog
 		elog "Then, execute the following command to setup the initial database"
 		elog "environment:"
@@ -355,15 +355,15 @@ pkg_postrm() {
 pkg_config() {
 	use server || die "USE flag 'server' not enabled. Nothing to configure."
 
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -372,7 +372,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -384,7 +384,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -424,9 +424,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -469,7 +469,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index 7d2460caf77f..afbfa7686f9a 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
 		 zh_TW"
@@ -158,7 +158,7 @@ src_configure() {
 	export LDFLAGS_SL="${LDFLAGS}"
 	export LDFLAGS_EX="${LDFLAGS}"
 
-	local PO="${EPREFIX%/}"
+	local PO="${EPREFIX}"
 
 	local i uuid_config=""
 	if use uuid; then
@@ -300,7 +300,7 @@ pkg_preinst() {
 	local l
 	# First remove any symlinks in /usr/bin that may have been created
 	# by the old eselect
-	for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
+	for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do
 		[[ $(${canonicalise} "${l}") == *postgresql-9.7* ]] && rm "${l}"
 	done
 
@@ -316,21 +316,21 @@ pkg_postinst() {
 	postgresql-config update
 
 	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
+	elog "    ${EROOT}/etc/postgresql-${SLOT}/"
 
 	elog
 	elog "Gentoo specific documentation:"
 	elog "https://wiki.gentoo.org/wiki/PostgreSQL"
 	elog
 	elog "Official documentation:"
-	elog "${EROOT%/}/usr/share/doc/${PF}/html"
+	elog "${EROOT}/usr/share/doc/${PF}/html"
 	elog
 	elog "The default location of the Unix-domain socket is:"
-	elog "    ${EROOT%/}/run/postgresql/"
+	elog "    ${EROOT}/run/postgresql/"
 	elog
 	elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
 	elog "so that it contains your preferred locale, and other options, in:"
-	elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	elog "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	elog
 	elog "Then, execute the following command to setup the initial database"
 	elog "environment:"
@@ -353,15 +353,15 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
+	[[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \
+		&& source "${EROOT}/etc/conf.d/postgresql-${SLOT}"
+	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/"
 	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
+		&& DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data"
 
 	# environment.bz2 may not contain the same locale as the current system
 	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
+	if [ -f "${EROOT}/etc/env.d/02locale" ]; then
 		unset LANG
 		unset LC_CTYPE
 		unset LC_NUMERIC
@@ -370,7 +370,7 @@ pkg_config() {
 		unset LC_MONETARY
 		unset LC_MESSAGES
 		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
+		source "${EROOT}/etc/env.d/02locale"
 		[ -n "${LANG}" ] && export LANG
 		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
 		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
@@ -382,7 +382,7 @@ pkg_config() {
 	fi
 
 	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
+	einfo "    ${EROOT}/etc/conf.d/postgresql-${SLOT}"
 	einfo
 	einfo "Information on options that can be passed to initdb are found at:"
 	einfo "    https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
@@ -422,9 +422,9 @@ pkg_config() {
 	einfo "Initializing the database ..."
 
 	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
+		su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
 	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
+		"${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
 	fi
 
 	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
@@ -467,7 +467,7 @@ pkg_config() {
 		einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
+		einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
 		einfo "instead of 'pg_ctl'."
 	fi
 }
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index 2d29a22896e9..742183bab247 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -2,8 +2,8 @@ DIST pspg-1.6.5.tar.gz 1005525 BLAKE2B 2befb8a7081e1fcf5df60eca48f34b819d9de3d07
 DIST pspg-1.6.8.tar.gz 1017316 BLAKE2B 0150b4577365000b2fdd9de93307acbb5133915917c92affd1a598b3f16769ff0afa6e0b9c0d4639b771dcd62f1f7364a028a3b9d96cc6c40e3ac41c550a8d48 SHA512 337ae1eb9e92dc97ca32127322aaa3d0c5edb8766e5cab16e778148b3256119c7c5b1b2e4b6ab0b520113ede07c464d1c1c5e460c8efb7714f5a29acfa845e9d
 DIST pspg-2.5.4.tar.gz 1346559 BLAKE2B 01c0a35a6372ccb7ad007595d01eb0c8380428722418a4f4b6040a549757d2eab601371ded51a762d81677adc259abf5f8af4311fca6427fb24244e0c33035d2 SHA512 2a9c677bbff4eb032403b90f44dbe9f62a46775c1cf180e90fc3df2853973c4b584b674fa11e2b3be844402f5c00777388ff05782fdecee3b27d92280fc288ff
 DIST pspg-2.5.5.tar.gz 1346896 BLAKE2B 7b5b64affcc6ec52ae9712fab06089db3a8ae208d94190fa6695d2285d29a13ac2c5ca3854a1a13ec6907eed04dd6bb188b31cc6440963a069a2715ecf109eba SHA512 74e8c8c5a156d9115a2bc6c9957d302b5e48182181c9560100c09dea765f9a382d78b5fe74ca11fdccd40bdd2f8a165218edf89ffd7713e479f0443a49766c4d
-EBUILD pspg-1.6.5.ebuild 376 BLAKE2B 13fe8b4b7bbab57ea001be0d3473a62e40ed31cc6c0b3f37e8e924aefb71b50b445bd4ddc351ed85d9aff00454dc4858ce3cc452042edd925981c2d2a1fb3f8a SHA512 dbc7ea9e5187802bb5b810cdaaf35d544cd910a52f196b1e96d6ba3d63ea93eaa651b67a9457894aae5f2f3eb8f22470b6cf635859c464dd3f87d164c77102ff
-EBUILD pspg-1.6.8.ebuild 378 BLAKE2B 9bd9920de54fd7e3122025d78659d21c13335a0b9d65abfabd948776f3c074ed8bafae6679754cf6ce8b72fc0d7cb93d2d7689bdc2f666b1f23cb17bbd6595a9 SHA512 11791d983aff85e9a535c81f432270d7a4ba26bb8d4fc36dbff90dcb96573d7afd31e21ec37017cc0f0721fbc57be685c542c715cb6f1427ba62c5c74e70d819
-EBUILD pspg-2.5.4.ebuild 418 BLAKE2B 3659dc797a48d1ae1d30902b911bcee32660c6e35db9dc99f0df1222cd4ed1fb9f57c688e63cfef11f883f950b5abd7c292a954af22779fde0b5ee0df88a04a2 SHA512 4708f3a456ceb61b09cc6169cf15f50567b53f5a546d0f49236f634c2034122e1fd95bed3e9ea223311bd186358f860a8eaad86b86574afe0dc4375e5bd7ab5b
-EBUILD pspg-2.5.5.ebuild 418 BLAKE2B 3659dc797a48d1ae1d30902b911bcee32660c6e35db9dc99f0df1222cd4ed1fb9f57c688e63cfef11f883f950b5abd7c292a954af22779fde0b5ee0df88a04a2 SHA512 4708f3a456ceb61b09cc6169cf15f50567b53f5a546d0f49236f634c2034122e1fd95bed3e9ea223311bd186358f860a8eaad86b86574afe0dc4375e5bd7ab5b
+EBUILD pspg-1.6.5.ebuild 375 BLAKE2B bb7549458b1be4523cc653e1e7eeee86f4ce800e295667c934082091e8bd08a66070226ffc68a74653ff18cef3ae6298ea8287dae49d6ac35aaeaddbb31c849b SHA512 74e613beddf09251af9d2ca53ad791757c0c77178c18f135078671a3715f1086e18df6e124b66761d6f5df7bf9049f37f2381c28934b837dab6725aea8bdd0e2
+EBUILD pspg-1.6.8.ebuild 377 BLAKE2B b04b738ce992e16353c46cf20ac3e470e6e09433737d4f379994f052f5a0206d46eb64c4385cc9f2e665d9a97655cf7ac4ad087a824b4a8191bee1f35cea13a7 SHA512 58e07f2f682b77ad05a0be58bc3528a7e4a937b53c312bec5b43de77e0be74639ca2717ade092e2f4002a9d9d30222755c15cfd17e10ab0ad5cd2aff42db3a8f
+EBUILD pspg-2.5.4.ebuild 417 BLAKE2B 9d27ddd0d078b261afd67fbecf705c76671d5b3476aee3b4418aefcc199681fc8af5284e2ff468e4ab7516a91d934b8e7a1137f4bbf81725dd32adef79018dd5 SHA512 0408d58b2546ac4a9e15f7610b90517bed80bb3a6a7adf2a934805e9973f7d59658f675cd522614945f2900e9a119173731b9de413e877bae5769884b500c9c8
+EBUILD pspg-2.5.5.ebuild 417 BLAKE2B 9d27ddd0d078b261afd67fbecf705c76671d5b3476aee3b4418aefcc199681fc8af5284e2ff468e4ab7516a91d934b8e7a1137f4bbf81725dd32adef79018dd5 SHA512 0408d58b2546ac4a9e15f7610b90517bed80bb3a6a7adf2a934805e9973f7d59658f675cd522614945f2900e9a119173731b9de413e877bae5769884b500c9c8
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-1.6.5.ebuild b/dev-db/pspg/pspg-1.6.5.ebuild
index 9f4383f0e53f..612f2529e008 100644
--- a/dev-db/pspg/pspg-1.6.5.ebuild
+++ b/dev-db/pspg/pspg-1.6.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
 SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-1.6.8.ebuild b/dev-db/pspg/pspg-1.6.8.ebuild
index a537b5d8c3a9..2413a413b870 100644
--- a/dev-db/pspg/pspg-1.6.8.ebuild
+++ b/dev-db/pspg/pspg-1.6.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
 SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-2.5.4.ebuild b/dev-db/pspg/pspg-2.5.4.ebuild
index 60a6aaa3b834..a3116171325a 100644
--- a/dev-db/pspg/pspg-2.5.4.ebuild
+++ b/dev-db/pspg/pspg-2.5.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
 SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-db/pspg/pspg-2.5.5.ebuild b/dev-db/pspg/pspg-2.5.5.ebuild
index 60a6aaa3b834..a3116171325a 100644
--- a/dev-db/pspg/pspg-2.5.5.ebuild
+++ b/dev-db/pspg/pspg-2.5.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A better pager for psql and mysql"
-HOMEPAGE="https://github.com/okbob/${PN}"
+HOMEPAGE="https://github.com/okbob/pspg"
 SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 9e531814a0e1..a04643400c44 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -2,5 +2,5 @@ AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0
 DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 DIST unixODBC-2.3.7.tar.gz 1669501 BLAKE2B 0e6b2130b72ccfed3a26877ff1c8af9adc7cc514002d3198d5249a12da5de03322178bf0847b92336b5a373893751bf3cb5aec4c251163a3c9f0ef98c90e5db8 SHA512 a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70
 EBUILD unixODBC-2.3.5-r1.ebuild 1800 BLAKE2B 3d5b8c14075f26947a34c47c780004073003de604f62e682018aee401438d1b8c73f6a3ca6b2a2aded327fbe018e57bfcf82a912ed276487e09526e217eec363 SHA512 22382ed1161cd8b79eb23285d79b9791edd8b2576982af459e56a3c91eaea29e0f50ab9d6f47578ac2c6cc6bac416e05249abab32c9a2cb8491793f1beb43feb
-EBUILD unixODBC-2.3.7.ebuild 1758 BLAKE2B 37e000e8087c3cfe1124c3fb21d6444db3f91de33f9d436b3c25b45457b32423b4b19432e9ea5294c13fa0059a500a1283362e0f80baa6ae32c17f5ac38350e5 SHA512 fcadf160cf3f6ff6635fab76da0c86f5d54b32260cb87ba1da2ea0ed06bca735ab33958e9c2416be5f556e501a51641fb3df4c9fe9371309f269df98902cc7d1
+EBUILD unixODBC-2.3.7.ebuild 1757 BLAKE2B 4bea201307bb075caa1d4b75e0c7d3c3600aaad21a78b17e2c4255312f1b17e6fd9d08463024272e7f2f18f14e448f8fd575ac8d8111fc95f6676837e23b6fdc SHA512 6a207aa5205a97fd1629bc8151ecd873a54afd7ef0b9e921e75b41bd5ce804a6f1752fed6c98d83e226c7fc890886fc62e03082cd8a5261f4e115d195311b2ca
 MISC metadata.xml 393 BLAKE2B aae8c823c6e3d1a3b21910c6aece373e66e62c6686b152f1f6c8fb980a4c58b19dce1144afb76219d4d4e451ee097afe0f031130e82cbf933e6ac1ba3d4f1cc5 SHA512 76f899e62d86b476cc9f97daffe5c67fba8fe217fb0d6c0b1b39f2de8e6a92350e6d0433f37f54f57875d3cbb3be7908eaa9a3b1717fc1da687a1789062c0f86
diff --git a/dev-db/unixODBC/unixODBC-2.3.7.ebuild b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
index 0577917ac657..7947fb4b671a 100644
--- a/dev-db/unixODBC/unixODBC-2.3.7.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index c48e40374d08..1064f87cd7bd 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index d6426d9da172..1f99a8a164d3 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,7 +1,7 @@
 DIST esptool-2.1.tar.gz 68974 BLAKE2B 4aaddc9bf22a624de18e7d58b35a42f6fa27cf8bdfff119a270b9531f1e19ecb3f4d7eebad319a799068a19941bf0c843fc464fd5ae891d8e03e1a2bad54dd68 SHA512 be657df04a345d2c91bbe3a9cbb93cd7bb0bc68e61388ff4d134c88d514c74fe3f2c5e7c64f4100264bc5973b1d3e66251cdb16a77894fb9e116d9c6a54a8dc3
 DIST esptool-2.6.tar.gz 4336261 BLAKE2B 1da9ea1ed24d1bf91e2bbac079016c4813012946977ca6da7f6b4eac52ea77f501f4185efca39a636cab438720f0a14ca2faf49920228656fcb4786690824208 SHA512 dd2e1815df07a491d5b41b709aafecb642f5b642c83b11e309986ba0ad827257e6b7bb93f4decd7ee37fd10a1ee7b36c836598c0c2e1e60118bf96397c187dfd
 DIST esptool-2.8.tar.gz 5399875 BLAKE2B c2c27dc44cec1921f2d800347682bb198be76f7a122fd6a0c9964fb189350980557aa85bd6cb8fb2d63c8c7ccdd18e1860b65ca85c8777145ec1da07da886be1 SHA512 14528197e760779f3bf50e2a44d477979675dd42451fa405e2ae87502158b21f999fb94561980c9eb0634d2d1fd3729779b78266403de858ed1d32e8d29604cc
-EBUILD esptool-2.1.ebuild 732 BLAKE2B 04df2fc2da3ef9572cf581354507372d930bd778606b7ef96da6fbbd6e5e2c4d4002adc8d2d0485dcd4329222d32672eb511d97963e67d5ac8a20c24a23a7d41 SHA512 872f084883d44acf7a99e839c5c371a5efe4e348ab2c918c76d4aa66cca6eb1b0089570967481cf6040ea566243e98e71de89d9b8e5a95c31ba8ff25a54ed1c5
-EBUILD esptool-2.6.ebuild 925 BLAKE2B 9a885cb298948e480fb41eeb91ce8178c983696f627bf54e584c03909d993e63f37ac3961d05ddeaf113773d18f16e1ee40d7d1ca0677cf39490f510b0d98ba9 SHA512 5775f4a36f8fed9a2553acb91bd84c2086f6df18db6d9ccfaae3f50835624eb66e927447746fedbba466338fb7176d5e3e272843196fbaeb5b78036a0e7fe7fe
-EBUILD esptool-2.8.ebuild 929 BLAKE2B 13883df098e3321293573687134e83d2906f5210783ed386419a626bdb7dd5956cae38f1018d1b39963e8a8c8d6a6ae99d085224539fc2b6a7675a91a1e0456e SHA512 ec93029a67e0babb480112d0fb7685779776b6c6b432ff6bd3b590fbb3445f225282d509727a92175ed801b16a9e8619faa6f4ff99450f83516625e67e2a0ff7
+EBUILD esptool-2.1.ebuild 726 BLAKE2B b7b4277749d402af493e2204f38430910c9ea21fe7cc7f1e469ad8722cba854ce1804ff375669a67e2483cf44240c0fdd485a2a81884e2abc19ecc9c0b744c03 SHA512 d7a9c0c5b89bf140fa2743f0749cb79e698301eb5f6329e895e78d224835c99969632006dfd7ac26bcecfa1b38f9066f4442d9967c3a21df8377fed0a0c8f30d
+EBUILD esptool-2.6.ebuild 919 BLAKE2B 2898f288e98b8c3ec8f3cfa8eed5f87e9007f31ab53443e0fd957e761f91ba16ba7b5e588401e84130285bae656d1945c8c9a17bdfc464292ccc6c4ce45e8da5 SHA512 64a5084d82498953cf46a85a53945c9c905615b70fb5033a0ee782f03e8988063169090fe558d6eb0be00a20dba91461d25a7921af593d9478685e75348ee812
+EBUILD esptool-2.8.ebuild 925 BLAKE2B 6c5c746babf4a2758bd96ce4df0609802cff4d6b6945dd440ee4cfec3d25df18e217b488eed77881ec7f4ee1d281225b90acc25a3b5e9405c1c566aff57d94c3 SHA512 744d8a01b7f5e7b1c970a42dff6c3a490ea57f419a7a3c0aebda564f814f2f452b08d2a69ef598e6ddeccfe2dc6316f3779d071cf91a4f38fb5c98e253049c37
 MISC metadata.xml 247 BLAKE2B de14ccb6beade685c72b668396bd67f8e1be50bc4d143a5aff8d27c077a5bd91664c90c1273573966b7dccaea71b16d6d7e6dd8b2c5ed6f4afbd1a9ba3353475 SHA512 cce6a10f270c88b3639c39f5caaa891598409a573eaab14f0362781950746afb36cbea3a0384542a89e4fe8e287ca74cc62c2ca4f47de9fc39fffcfa4513e693
diff --git a/dev-embedded/esptool/esptool-2.1.ebuild b/dev-embedded/esptool/esptool-2.1.ebuild
index 646ecb1e6786..3b19277c6feb 100644
--- a/dev-embedded/esptool/esptool-2.1.ebuild
+++ b/dev-embedded/esptool/esptool-2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-embedded/esptool/esptool-2.6.ebuild b/dev-embedded/esptool/esptool-2.6.ebuild
index 5dd1745e5497..3b0512e262a6 100644
--- a/dev-embedded/esptool/esptool-2.6.ebuild
+++ b/dev-embedded/esptool/esptool-2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-embedded/esptool/esptool-2.8.ebuild b/dev-embedded/esptool/esptool-2.8.ebuild
index cff9b24cc7e2..9be8b1833f42 100644
--- a/dev-embedded/esptool/esptool-2.8.ebuild
+++ b/dev-embedded/esptool/esptool-2.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index c49de59f7ec9..3885cdd13972 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -3,9 +3,9 @@ AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.2.tar.bz2 100672 BLAKE2B 314ee2695324bc3f6adad56d7ff8fddabfb86714a689ee309afc6aa8498a19fc55d2ea8f4edf0c378d944494505def3faabf1d9c3bb98e6c228526c392d26f09 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05
 DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd942cdd3afb1ac59519f1cd48db7f04421ecdb5aa6e53993666a903de00ce447fd81d00839806f8cc0d34c6e52 SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc
-EBUILD libftdi-0.20-r1.ebuild 1805 BLAKE2B 1a52efd164a48406603c749c1ac83e86f77f57cc592296d2d7cfab9f2f4d568e36cedf491f1a820a7c2b3a6b4fc258bfec66f7b62b2f808e2e028923f5241bf7 SHA512 4d53950d2d25ce339ee4748ae13f232790887b99a5161a3f2d1b22aa4b6cf61e9405c2e0429815bd8cb1e915fd24b44a85ca3693fd4681b9563ac0055313da57
-EBUILD libftdi-1.2-r1.ebuild 1721 BLAKE2B cfb1ad8a0b3c8c263f28e7ae757d5cdb0602545d75f436e48aca6556c76ea50ed754bc365b74c0f0817fb66f5205acb157fd450b70441c8bfaf56adbfa8d1564 SHA512 6b2c9e2ae951e4ef98f8b56a4ee81f693d2eade02bd664be9fa606fd2a8078c4bb2c783c81141188904798ae2465aa49766c977977923e5514c75aeb30d2caa4
-EBUILD libftdi-1.2-r2.ebuild 1730 BLAKE2B f243c1c27b8434d43cf1946551ff9d30b1a59b4cddce643f3aa8183b70c58cfeb9d2eb19ed51a744f18cf08569f9db72180a0f1e0d38817df8579c7524a42efb SHA512 4dc3397ba700064c5c3d276833d24f1952930fcf184cc87ae55e6d099df48220f5b2ae10131830c5508677a2a0d2378cecae648b9e814f6333de547f3d6426dc
-EBUILD libftdi-1.4.ebuild 1730 BLAKE2B f243c1c27b8434d43cf1946551ff9d30b1a59b4cddce643f3aa8183b70c58cfeb9d2eb19ed51a744f18cf08569f9db72180a0f1e0d38817df8579c7524a42efb SHA512 4dc3397ba700064c5c3d276833d24f1952930fcf184cc87ae55e6d099df48220f5b2ae10131830c5508677a2a0d2378cecae648b9e814f6333de547f3d6426dc
-EBUILD libftdi-9999.ebuild 1730 BLAKE2B f243c1c27b8434d43cf1946551ff9d30b1a59b4cddce643f3aa8183b70c58cfeb9d2eb19ed51a744f18cf08569f9db72180a0f1e0d38817df8579c7524a42efb SHA512 4dc3397ba700064c5c3d276833d24f1952930fcf184cc87ae55e6d099df48220f5b2ae10131830c5508677a2a0d2378cecae648b9e814f6333de547f3d6426dc
+EBUILD libftdi-0.20-r1.ebuild 1795 BLAKE2B 5a486a810985370bebc5c10264087d03fcc5b11aa5d809f3d78ceeda5370a22ba8497b89dcfd1abcfde0f43b1afb03f6561afb59f4bd663d9f9fee69d8808622 SHA512 d261ab5301f244290cf853fa49c2a4d3fabf2cf2dd77f601ba2188121f6e272a4c9b627f9ef8c478ec6a6d6ecd97a3f9b3802708781a5b90e6bce6d41fe026a6
+EBUILD libftdi-1.2-r1.ebuild 1711 BLAKE2B b2fcc51cd8f1311b778bbf53bd48b7cd86b87df436aa6a5c9d70b5026289cd2dd671990ac9000ffce66c5f49e8f20fe93cd079fc9ce18df1b3e6776d0b6969ff SHA512 d24ff5b2f12fe262fb6e8dff8266a494f482fa9c665ba820333304f064b1897cb85f263792da2a79aab7ff1beacbdccac607d18341d8815e578f99c102f73e80
+EBUILD libftdi-1.2-r2.ebuild 1720 BLAKE2B 75b2f1235bf0b448e5de5c6a661338967fa0633000dc6fd12f9d058cb0e4575e58da1d2f81d646141b421eb7a4f15ead2b6e54e55dbee7e89b9d74c01396d44a SHA512 b75da5e161886b855561dae1a6a2a8671dd480c6844cb7dcd70df74397bb1958fbd895db747832b46fbe405f9bd3460c8e51804eed7bd3517d0aee37e58b18eb
+EBUILD libftdi-1.4.ebuild 1720 BLAKE2B 75b2f1235bf0b448e5de5c6a661338967fa0633000dc6fd12f9d058cb0e4575e58da1d2f81d646141b421eb7a4f15ead2b6e54e55dbee7e89b9d74c01396d44a SHA512 b75da5e161886b855561dae1a6a2a8671dd480c6844cb7dcd70df74397bb1958fbd895db747832b46fbe405f9bd3460c8e51804eed7bd3517d0aee37e58b18eb
+EBUILD libftdi-9999.ebuild 1720 BLAKE2B 75b2f1235bf0b448e5de5c6a661338967fa0633000dc6fd12f9d058cb0e4575e58da1d2f81d646141b421eb7a4f15ead2b6e54e55dbee7e89b9d74c01396d44a SHA512 b75da5e161886b855561dae1a6a2a8671dd480c6844cb7dcd70df74397bb1958fbd895db747832b46fbe405f9bd3460c8e51804eed7bd3517d0aee37e58b18eb
 MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index 4cbaa0f3a3bb..641d896e1147 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
diff --git a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
index b6ff7fa88ab7..b2fd8566d7f3 100644
--- a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 MY_P="${PN}1-${PV}"
diff --git a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
index d3062740cb4b..7660b8764197 100644
--- a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 MY_P="${PN}1-${PV}"
diff --git a/dev-embedded/libftdi/libftdi-1.4.ebuild b/dev-embedded/libftdi/libftdi-1.4.ebuild
index d3062740cb4b..7660b8764197 100644
--- a/dev-embedded/libftdi/libftdi-1.4.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 MY_P="${PN}1-${PV}"
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index d3062740cb4b..7660b8764197 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 
 MY_P="${PN}1-${PV}"
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 83d4e1ebbe9a..3bd07e1d9359 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,3 @@
 DIST platformio-4.1.0.tar.gz 157907 BLAKE2B e90d2b155121cd2be0b0d77a7a196e7fe03580083444056d06a86a343166c920cd1ac6252a0003acee4de5d3933fead939b8be8d67233e93c05537511344e27b SHA512 e4d6c29ebb8fb1b2b556affbc1a50ec84d12e878bb7e6cfb253861eb5429236d8226d1a29f1a3812c0aa2c5b4895f0354184a9cb28c300db2e2e5a2ededb82fe
-EBUILD platformio-4.1.0.ebuild 1180 BLAKE2B cd22a0a6810f93bd713b8e2297eacf5b8aaef91d05f40b5abac79c8750023c28a51e48f9dd9001bd651bdc204122156d01e9e5be04660e3c11af0812d550d27f SHA512 7d39f20df7bd1c512d0f737e88651d721896af77f72c3ccff3c8731f96202c18199d0f96cd5d350590ab8be4529e5253fb57d8a2b3901fcc959b7aa80e70f3b0
+EBUILD platformio-4.1.0-r1.ebuild 1357 BLAKE2B 7276de22e430c12a051ed6f32de4780cd39a53bf694b66fee451aac629f9bdaafb0580cb7ae28b3dbe5169f2e665900c66af75f560e1b6e26a3d87cfaeb6f602 SHA512 80a4906938d243661d747f547116ecd0f674b28830fc727c30d28289f1cea8768b13c76d7bc488e75733508167336647a37972d87c7275fd5efe0851ca4aeab2
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/platformio-4.1.0-r1.ebuild b/dev-embedded/platformio/platformio-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..0c28bb271d22
--- /dev/null
+++ b/dev-embedded/platformio/platformio-4.1.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="An open source ecosystem for IoT development"
+HOMEPAGE="https://platformio.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		<dev-python/bottle-0.13[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/click-5[${PYTHON_MULTI_USEDEP}]
+		<dev-python/click-8[${PYTHON_MULTI_USEDEP}]
+		dev-python/colorama[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyserial-3[${PYTHON_MULTI_USEDEP}]
+		<dev-python/pyserial-4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.4[${PYTHON_MULTI_USEDEP}]
+		<dev-python/requests-3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/semantic_version-2.8.1[${PYTHON_MULTI_USEDEP}]
+		<dev-python/semantic_version-3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/tabulate-0.8.3[${PYTHON_MULTI_USEDEP}]
+		<dev-python/tabulate-1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyelftools-0.25[${PYTHON_MULTI_USEDEP}]
+		<dev-python/pyelftools-1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/marshmallow-2.20.5[${PYTHON_MULTI_USEDEP}]
+		<dev-python/marshmallow-3[${PYTHON_MULTI_USEDEP}]
+	')"
diff --git a/dev-embedded/platformio/platformio-4.1.0.ebuild b/dev-embedded/platformio/platformio-4.1.0.ebuild
deleted file mode 100644
index 29d4e2ad7b49..000000000000
--- a/dev-embedded/platformio/platformio-4.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="An open source ecosystem for IoT development"
-HOMEPAGE="https://platformio.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-	>=dev-python/click-5[${PYTHON_USEDEP}]
-	<dev-python/click-8[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-3[${PYTHON_USEDEP}]
-	<dev-python/pyserial-4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.8.1[${PYTHON_USEDEP}]
-	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-	>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
-	<dev-python/tabulate-1[${PYTHON_USEDEP}]
-	>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
-	<dev-python/pyelftools-1[${PYTHON_USEDEP}]
-	>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
-	<dev-python/marshmallow-3[${PYTHON_USEDEP}]"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 588fdae5d8c9..e0bb8d4122e9 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index dcec0d57e0b7..d4220476e22d 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -1,4 +1,4 @@
 AUX cegui-0.8.7-icu-59.patch 444 BLAKE2B 7ba31c1a856638be317c0d3166159bea14be9f3ccc79e8b361907e9ba1bf7c07a77ba5cf76a49f33d7ceca8d6aedf659f7bdd2826cc1eec3b72352a8a0ed6d7e SHA512 6a8838e8a6ddfb5b73bb765470185530a81ffeaec9d090e1038d317aca800a987b08d3a82744c0b77266d2f351ae2668bada741b26ac303be052071f9daf3408
 DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b SHA512 271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56
-EBUILD cegui-0.8.7.ebuild 3222 BLAKE2B 8313bb7d2c46f774fb4106f0c3fe52e73bce957d7168a772d9621f82e3cbb83335e061a53e65a1704076e07a28685ab62417d9c41a8533dcfb93ccf851082e22 SHA512 6ee93d44cfe059b5db49a34669daf1741e7e847ad01def67c9afcb5162a079cc4fe0d8907e5e0d3815f3ac16cc3c6719bb5224085aad58beef55f71f2d07e496
+EBUILD cegui-0.8.7-r1.ebuild 3257 BLAKE2B 08680f7b90847ad17a4fbdf3d326e219bcb0f5b35ba102e86e6420657d7bacdc1ce793793dcf94ecbf8f9f672aa5d346fb497ff8a391ff565c5f49ab1e8b89f9 SHA512 8a1ad48c6c02d9055c425e325fae1b26a8dc358e8a29ab97e95a362ec8cc13901e0d592d15ad378511f50df4c7c90ca7e9c89db0c4ec558e2a8d1a1a7f60e205
 MISC metadata.xml 803 BLAKE2B da9534a051925be6cd6d285ce3335c65ba799481840f95aadedb2f81f7a06e05253e8949bf77e7626635437bc5ad5b91af11d6aa452f3524669efdd6216b3bd6 SHA512 47d0eeed54ab5b192051b976a5e1a9790c9e0321753cdc8da73fda4131ac30e40fb57f418418ea7b2bbb30041f76def1a79803d699962488ea4dc1dad50c4996
diff --git a/dev-games/cegui/cegui-0.8.7-r1.ebuild b/dev-games/cegui/cegui-0.8.7-r1.ebuild
new file mode 100644
index 000000000000..d89518d63680
--- /dev/null
+++ b/dev-games/cegui/cegui-0.8.7-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# TODO: multiple ABI?
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic cmake-utils python-single-r1
+
+DESCRIPTION="Crazy Eddie's GUI System"
+HOMEPAGE="http://www.cegui.org.uk/"
+SRC_URI="mirror://sourceforge/crayzedsgui/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip"
+REQUIRED_USE="|| ( expat tinyxml xerces-c xml )
+	${PYTHON_REQUIRED_USE}" # bug 362223
+
+# gles broken
+#	gles? ( media-libs/mesa[gles1] )
+# directfb broken
+#	directfb? ( dev-libs/DirectFB )
+RDEPEND="
+	dev-libs/boost:=
+	virtual/libiconv
+	bidi? ( dev-libs/fribidi )
+	devil? ( media-libs/devil )
+	expat? ( dev-libs/expat )
+	freeimage? ( media-libs/freeimage )
+	irrlicht? ( dev-games/irrlicht )
+	lua? (
+		dev-lang/lua:0
+		dev-lua/toluapp
+	)
+	ogre? ( >=dev-games/ogre-1.7:= )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		media-libs/glew:=
+	)
+	pcre? ( dev-libs/libpcre )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	tinyxml? ( dev-libs/tinyxml )
+	truetype? ( media-libs/freetype:2 )
+	xerces-c? ( dev-libs/xerces-c )
+	xml? ( dev-libs/libxml2 )
+	zip? ( sys-libs/zlib[minizip] )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	opengl? ( media-libs/glm )"
+
+PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
+
+src_configure() {
+	# http://www.cegui.org.uk/mantis/view.php?id=991
+	append-ldflags $(no-as-needed)
+
+	local mycmakeargs=(
+		-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF
+		$(cmake-utils_use devil CEGUI_BUILD_IMAGECODEC_DEVIL)
+		$(cmake-utils_use freeimage CEGUI_BUILD_IMAGECODEC_FREEIMAGE)
+		-DCEGUI_BUILD_IMAGECODEC_PVR=OFF
+		-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF
+		-DCEGUI_BUILD_IMAGECODEC_STB=ON
+		-DCEGUI_BUILD_IMAGECODEC_TGA=ON
+		$(cmake-utils_use lua CEGUI_BUILD_LUA_GENERATOR)
+		$(cmake-utils_use lua CEGUI_BUILD_LUA_MODULE)
+		$(cmake-utils_use python CEGUI_BUILD_PYTHON_MODULES)
+		-DCEGUI_BUILD_RENDERER_DIRECTFB=OFF
+		$(cmake-utils_use irrlicht CEGUI_BUILD_RENDERER_IRRLICHT)
+		-DCEGUI_BUILD_RENDERER_NULL=ON
+		$(cmake-utils_use ogre CEGUI_BUILD_RENDERER_OGRE)
+		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL)
+		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL3)
+		-DCEGUI_BUILD_RENDERER_OPENGLES=OFF
+		$(cmake-utils_use static-libs CEGUI_BUILD_STATIC_CONFIGURATION)
+		-DCEGUI_BUILD_TESTS=OFF
+		$(cmake-utils_use expat CEGUI_BUILD_XMLPARSER_EXPAT)
+		$(cmake-utils_use xml CEGUI_BUILD_XMLPARSER_LIBXML2)
+		-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
+		$(cmake-utils_use tinyxml CEGUI_BUILD_XMLPARSER_TINYXML)
+		$(cmake-utils_use xerces-c CEGUI_BUILD_XMLPARSER_XERCES)
+		$(cmake-utils_use truetype CEGUI_HAS_FREETYPE)
+		$(cmake-utils_use zip CEGUI_HAS_MINIZIP_RESOURCE_PROVIDER)
+		$(cmake-utils_use pcre CEGUI_HAS_PCRE_REGEX)
+		-DCEGUI_SAMPLES_ENABLED=OFF
+		$(cmake-utils_use bidi CEGUI_USE_FRIBIDI)
+		-DCEGUI_USE_MINIBIDI=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && emake -C "${BUILD_DIR}" html
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dohtml "${BUILD_DIR}"/doc/doxygen/html/*
+}
diff --git a/dev-games/cegui/cegui-0.8.7.ebuild b/dev-games/cegui/cegui-0.8.7.ebuild
deleted file mode 100644
index 179c88599c41..000000000000
--- a/dev-games/cegui/cegui-0.8.7.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# TODO: multiple ABI?
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic cmake-utils python-single-r1
-
-DESCRIPTION="Crazy Eddie's GUI System"
-HOMEPAGE="http://www.cegui.org.uk/"
-SRC_URI="mirror://sourceforge/crayzedsgui/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip"
-REQUIRED_USE="|| ( expat tinyxml xerces-c xml )
-	${PYTHON_REQUIRED_USE}" # bug 362223
-
-# gles broken
-#	gles? ( media-libs/mesa[gles1] )
-# directfb broken
-#	directfb? ( dev-libs/DirectFB )
-RDEPEND="
-	dev-libs/boost:=
-	virtual/libiconv
-	bidi? ( dev-libs/fribidi )
-	devil? ( media-libs/devil )
-	expat? ( dev-libs/expat )
-	freeimage? ( media-libs/freeimage )
-	irrlicht? ( dev-games/irrlicht )
-	lua? (
-		dev-lang/lua:0
-		dev-lua/toluapp
-	)
-	ogre? ( >=dev-games/ogre-1.7:= )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		media-libs/glew:=
-	)
-	pcre? ( dev-libs/libpcre )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	tinyxml? ( dev-libs/tinyxml )
-	truetype? ( media-libs/freetype:2 )
-	xerces-c? ( dev-libs/xerces-c )
-	xml? ( dev-libs/libxml2 )
-	zip? ( sys-libs/zlib[minizip] )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	opengl? ( media-libs/glm )"
-
-PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
-
-src_configure() {
-	# http://www.cegui.org.uk/mantis/view.php?id=991
-	append-ldflags $(no-as-needed)
-
-	local mycmakeargs=(
-		-DCEGUI_BUILD_IMAGECODEC_CORONA=OFF
-		$(cmake-utils_use devil CEGUI_BUILD_IMAGECODEC_DEVIL)
-		$(cmake-utils_use freeimage CEGUI_BUILD_IMAGECODEC_FREEIMAGE)
-		-DCEGUI_BUILD_IMAGECODEC_PVR=OFF
-		-DCEGUI_BUILD_IMAGECODEC_SILLY=OFF
-		-DCEGUI_BUILD_IMAGECODEC_STB=ON
-		-DCEGUI_BUILD_IMAGECODEC_TGA=ON
-		$(cmake-utils_use lua CEGUI_BUILD_LUA_GENERATOR)
-		$(cmake-utils_use lua CEGUI_BUILD_LUA_MODULE)
-		$(cmake-utils_use python CEGUI_BUILD_PYTHON_MODULES)
-		-DCEGUI_BUILD_RENDERER_DIRECTFB=OFF
-		$(cmake-utils_use irrlicht CEGUI_BUILD_RENDERER_IRRLICHT)
-		-DCEGUI_BUILD_RENDERER_NULL=ON
-		$(cmake-utils_use ogre CEGUI_BUILD_RENDERER_OGRE)
-		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL)
-		$(cmake-utils_use opengl CEGUI_BUILD_RENDERER_OPENGL3)
-		-DCEGUI_BUILD_RENDERER_OPENGLES=OFF
-		$(cmake-utils_use static-libs CEGUI_BUILD_STATIC_CONFIGURATION)
-		-DCEGUI_BUILD_TESTS=OFF
-		$(cmake-utils_use expat CEGUI_BUILD_XMLPARSER_EXPAT)
-		$(cmake-utils_use xml CEGUI_BUILD_XMLPARSER_LIBXML2)
-		-DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
-		$(cmake-utils_use tinyxml CEGUI_BUILD_XMLPARSER_TINYXML)
-		$(cmake-utils_use xerces-c CEGUI_BUILD_XMLPARSER_XERCES)
-		$(cmake-utils_use truetype CEGUI_HAS_FREETYPE)
-		$(cmake-utils_use zip CEGUI_HAS_MINIZIP_RESOURCE_PROVIDER)
-		$(cmake-utils_use pcre CEGUI_HAS_PCRE_REGEX)
-		-DCEGUI_SAMPLES_ENABLED=OFF
-		$(cmake-utils_use bidi CEGUI_USE_FRIBIDI)
-		-DCEGUI_USE_MINIBIDI=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && emake -C "${BUILD_DIR}" html
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dohtml "${BUILD_DIR}"/doc/doxygen/html/*
-}
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index adfc6ed31252..590eebb02854 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,4 +1,4 @@
 AUX freecell-solver-5.14.0-cmake.patch 463 BLAKE2B 12d0f5bd556a2ab70f8795b567d5e11346945828977ec0291b5010c3e6d872a66bb68816d712c444a8aac3c9010fa4052eea3241e0f2d581205b484351b453cc SHA512 61dfa3c7ceed310bf4056a5bb1cfe7775efe170f2ff8b171ef58db76040cc4c490e6bf6d36db5cc31f6aa6e82bc703193f2cbf3a9735f912cb1cd4fb8a6739d9
 DIST freecell-solver-5.14.0.tar.xz 407912 BLAKE2B c9da3557d9d073e017215cb0e0c64bfabeeb001c6e8373cc7e35aac40b2722f18966bb7ebf041e869c9e5c1fdbf0fc24e652fef688707c3ee69b300d8fdc246c SHA512 21c8898673e402514c6d40ae0045d6e9077b1606430465bfb146507fbe098be6ca4f88d976e2dafadbc8e84b5aeb9325b58ce8a384ea4ed6de4f5fec485d51ea
-EBUILD freecell-solver-5.14.0.ebuild 1181 BLAKE2B c7db101d095c478ef4e1fdbb22119633e4119c54bd80276b854e907387dc2f3a391126f73400268aa0bc89058d3bd6ecf754a2712f666420e385fe2ccd02370e SHA512 32e19ba6db20fc73ef10a156c12d69b16d7d703c8e9af0fcee575f8204c2efd56eba530c11bc45c0283c5c34040d1d607b695efff5d6c76abc6832e408844be3
+EBUILD freecell-solver-5.14.0-r1.ebuild 1233 BLAKE2B 438cef0cda4e7965ca1cc97d8e2f3680aae85d2378d27073a18b329dc773329bd54866d3b3e237d584e030998cc2ec79fe81bffc3ae723e8b46bd423d088f250 SHA512 cdc14824041218a932ad4c8326f171af15aa083694dc102caa01ed417831664e4c761b09cb8efc983af9e6e8842fe72c9a0fe646b9e3e2931dc5c7fb0d145d74
 MISC metadata.xml 330 BLAKE2B 2d2fad43c972b00253e7740bb472027d4edc54537d6d2564f2804b13c7b02b43a34598bf698255d0f42962b14e207da31cf69f021793d0ae16e198d0a1765e8a SHA512 8e5d4cfa7283a489ea757e3dede6b82334b2ceee2a28a98a8dd3b269a2f8bba02e2f0e6a169712e5ff890dcb7bec2feeedef496143bde90ad587771c87a12726
diff --git a/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild b/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild
new file mode 100644
index 000000000000..996f3aa184b5
--- /dev/null
+++ b/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake python-single-r1
+
+DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
+HOMEPAGE="https://fc-solve.shlomifish.org/"
+SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+IUSE="tcmalloc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}]
+		dev-python/random2[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+	')
+	tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+	dev-perl/Path-Tiny
+	dev-perl/Template-Toolkit
+"
+
+DOCS=( README.html )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_prepare() {
+	sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
+
+	python_fix_shebang board_gen
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBRARY=OFF
+		-DFCS_BUILD_DOCS=OFF
+		-DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
+		-DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
deleted file mode 100644
index f3f63a5b4170..000000000000
--- a/dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake python-single-r1
-
-DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
-HOMEPAGE="https://fc-solve.shlomifish.org/"
-SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="tcmalloc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pysol_cards[${PYTHON_USEDEP}]
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	dev-perl/Path-Tiny
-	dev-perl/Template-Toolkit
-"
-
-DOCS=( README.html )
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_prepare() {
-	sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
-
-	python_fix_shebang board_gen
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBRARY=OFF
-		-DFCS_BUILD_DOCS=OFF
-		-DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
-		-DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-games/newton/Manifest b/dev-games/newton/Manifest
index 5e662cb9667e..02da03b61843 100644
--- a/dev-games/newton/Manifest
+++ b/dev-games/newton/Manifest
@@ -1,3 +1,3 @@
 DIST newton-3.14.tar.gz 31417588 BLAKE2B 40704d614928ea2927f21201d924641766cbb32393e3d1cc36ea8fca2158625847e20ec2f0b3fa9e70f30bb1d6f4d8c4795e19873392b8211b0efb015ccc10c7 SHA512 c86775329921faafc061516db8473ef3b17ee407ffe3d6aaca604f1b733f837bef18d394b2251dfa9cd1296e0f3c3ba61803e0e9b43a4ecb6abe42640b4773eb
-EBUILD newton-3.14.ebuild 758 BLAKE2B 551e39699ffbd01908649e133e6ef40e24b33603e33b0df5bc29ff955d6830e42e30258c14fcce95b972a35f63decc08bb602d41d2746d7143416c92ef000176 SHA512 ff48112440b309f5f03011cec89a9bdfaf101854a7df737125fa2faccb8e6ce975b30342e2d59dd29594a52bf4d396b7570fa4296c33dd4e56b8d9c32dceb9f1
+EBUILD newton-3.14.ebuild 727 BLAKE2B bed6b75c81e19f94f8b91ac2f7d9491da060d1c73b38a5b6a5c72b2b5490ce430e20d3a68e86ab7b5ce0fc8a061b3be856bc286b2f0151f20edbbe5c883f784d SHA512 a81901a00213b0ff327b9f5ef7aadc941c36b6a9a4c0ff58dcdab500e6b730abf249ac46d46098efd6798dfb5a8ba73fec03ea3dcc3a972731ed167ce0297975
 MISC metadata.xml 342 BLAKE2B 284d0480027f479c09aee367aaa561797d76f63e1dcc9c693f9cbcfc28a5249a14561f0377c775286dd332c052f5ba66b8a903d7f4ab1e9ecfa62fc6687bb9f6 SHA512 c7cbedbb073be0d661d134a4e09270aa82232273736a9ad94bf107f551d5511bc6e9849155d01f30342515928b7b1209a4e286437d21bf94151721146340d579
diff --git a/dev-games/newton/newton-3.14.ebuild b/dev-games/newton/newton-3.14.ebuild
index 8cefdb483437..d77ff4cd90c8 100644
--- a/dev-games/newton/newton-3.14.ebuild
+++ b/dev-games/newton/newton-3.14.ebuild
@@ -27,7 +27,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr/
 		-DNEWTON_DEMOS_SANDBOX=OFF
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 	)
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest
index a0f7844e46e3..f783c3318626 100644
--- a/dev-games/simgear/Manifest
+++ b/dev-games/simgear/Manifest
@@ -1,4 +1,5 @@
+AUX simgear-2019.1.1-gdal3.patch 388 BLAKE2B 364d5f6692809c67d73a3191f387cbd9735e7183a25696e612827c1a796c872ee5d4a09085fa8a24a0fd524725fdeca9303c5c5ee71981de054ab5a8833d5285 SHA512 44d59cf379c8c7d82b87a31a4d29dd02aaa865c37f12c7e565c641bf3fb14497f4d63b69bbc973551b53d74919ddce5495e3f29b598ed87a6a4565e22ec81667
 DIST simgear-2019.1.1.tar.bz2 1370523 BLAKE2B 2f61b2b4b7716b7f15852ff68bee6b749b7daa04caa27927a53eb6d6e4346c46c835938c95436250da767efd2e8043aacc0cb444b37dacde78acada98ffdb4e8 SHA512 83fe4330cf27b9298719f53f2fccde2af77bacdc6f430cc22c8bdfb475fe9b6e01578c1225af21e4e1433c7d2f2b00427454064f942359ba4c1e9896e7fe05d2
-EBUILD simgear-2019.1.1.ebuild 1507 BLAKE2B 6a94f26bf11de1a7d8160adf11e440f0339ee298d26d85b1beaacffb50d34c27074a60f548c71361e266459e078aef90b705287b78cf3f5bd17ef81d6d196709 SHA512 22e009d885f399c9d7ef8c7b5045704fe41beb167ab1b855209838db6221fc0ddb69a050dca67ccd1c3a18ffd5ff38a362413efa21b3dcf68815efa24adae82f
-EBUILD simgear-9999.ebuild 1569 BLAKE2B 78dde565fdae2256180db5a43b0d0bccd4f6df31bf3662a1214967e814c8e2411df0408f0dff9060b294837ae2f741000fad0f1f59f4226d6441ecccfcf206e7 SHA512 dc1c40f9f239b4bb17360bca606d9093a0a780424559123ba5c19ffc58894584f6c3bed08da225f5db95872876ca66e44dad6d0f31dc0d9693cab70ce0ab5482
+EBUILD simgear-2019.1.1.ebuild 1547 BLAKE2B 0e9ff2e39a692dbdaf30958a52e0488eff8237742e6514993ac0fcd067df2d9bbac5d88a39b921df33a3efbb9c522d7428873ad07147d3e0092e5730982a54ad SHA512 d9071c9f6d3ff0f0fa2cf02a83006c8eb42bca041c5f0f8b14d309d47d11f6381ac8e484a2007cd8dafc1b77ce5edba397a6a8244035adbe6abaa378e0322218
+EBUILD simgear-9999.ebuild 1609 BLAKE2B 82961c4dae78e88dfedf40332e6604a21066b0989e0165b05e8bd8d5db495ab27ecbb0984dc55e3cb68d8a781e4b73a5bbb9e0fab6f2172fccbe28be5fe3e509 SHA512 da4467feaa241c6f39eb1bb507001fd1a66e094b001a00ebac51e60af84bdf1ec332d528ae80b5970d3d87e1169dcf53ffd4c13923ea84c8e0e0ba04ec7c05d5
 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8
diff --git a/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch
new file mode 100644
index 000000000000..6d48994224c8
--- /dev/null
+++ b/dev-games/simgear/files/simgear-2019.1.1-gdal3.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a2f59f..5916c4c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -308,6 +308,7 @@ endif(ENABLE_RTI)
+ if(ENABLE_GDAL)
+     find_package(GDAL 2.0.0 REQUIRED)
+     if (GDAL_FOUND)
++        add_compile_definitions(USE_DEPRECATED_SRS_WKT_WGS84)
+         include_directories(${GDAL_INCLUDE_DIR})
+     endif(GDAL_FOUND)
+ endif(ENABLE_GDAL)
diff --git a/dev-games/simgear/simgear-2019.1.1.ebuild b/dev-games/simgear/simgear-2019.1.1.ebuild
index e4f8accb9c67..be0ff6416267 100644
--- a/dev-games/simgear/simgear-2019.1.1.ebuild
+++ b/dev-games/simgear/simgear-2019.1.1.ebuild
@@ -33,6 +33,10 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -49,7 +53,7 @@ src_configure() {
 		-DENABLE_PKGUTIL=ON
 		-DENABLE_RTI=OFF
 		-DENABLE_SIMD=OFF # see CPU_FLAGS
-		-DENABLE_SIMD_CODE=OFF
+		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
 		-DENABLE_SOUND=ON
 		-DENABLE_TESTS=$(usex test)
 		-DSIMGEAR_HEADLESS=OFF
@@ -61,7 +65,7 @@ src_configure() {
 	)
 
 	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+		append-flags -msse2 -mfpmath=sse
 	fi
 
 	cmake-utils_src_configure
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index 14feded1bd5a..d5d560554829 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -35,6 +35,10 @@ RDEPEND="${COMMON_DEPEND}
 	subversion? ( dev-vcs/subversion )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2019.1.1-gdal3.patch"
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -51,7 +55,7 @@ src_configure() {
 		-DENABLE_PKGUTIL=ON
 		-DENABLE_RTI=OFF
 		-DENABLE_SIMD=OFF # see CPU_FLAGS
-		-DENABLE_SIMD_CODE=OFF
+		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
 		-DENABLE_SOUND=ON
 		-DENABLE_TESTS=$(usex test)
 		-DSIMGEAR_HEADLESS=OFF
@@ -63,7 +67,7 @@ src_configure() {
 	)
 
 	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+		append-flags -msse2 -mfpmath=sse
 	fi
 
 	cmake-utils_src_configure
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 8f6e7779e015..089d715310ec 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,7 +1,9 @@
 DIST tiled-1.2.4.tar.gz 16875074 BLAKE2B 19d9e000949a889af90f48c31862aab8d00cbd968d518bc48e58775763ff2b293d5e82f10b8ec45dda936bf81b177f88aa4962900c7b70b01ce514fabf717c46 SHA512 a16fcb3fcceb11397cc981f10a558215264cf2c340639fbc001d384cfd9bc138c05ed40894a03d103af8a7d629c0be9fa6d5a4058fd9c563806920efef8e2cb7
 DIST tiled-1.2.5.tar.gz 16878267 BLAKE2B 75d7ba6f715963cc5209181664052aa276dead8311e8fb99561c8375c4fce3400b60f71f4bce3213e1198e3217812e8debdedc72c87dff3f553e391ed1e9438d SHA512 2b0009a8aa785d4289d6759369ff579e62e4fb969090ee6ba2b3fae4dd42d4e9562bd6d2a74ae372c07d9bbfd108390c79a48b49e05f0881e87497f6a727cb3a
 DIST tiled-1.3.1.tar.gz 15728903 BLAKE2B f9b6aa89b450bbb6fe101610f81f3f8a2c385149eb07d79c3b2ddf33bb654c7d1f48b8938975be5037824a1fd14840a7ee8b4a0cc8b009808bdfdc4aec99525e SHA512 b2ed5c0ff043990177809873417e31e8ee2894473b3084d0302e5557c19043c1763cf55d8ade16335ba3d64e7b4b903dd5fb88fd4bcf878c7c4d873bc9c7ed73
+DIST tiled-1.3.2.tar.gz 15826960 BLAKE2B 3e9669eaee3c1cd5a891cdb7516b620d183d955a0f988bed20403edfdcb629dfeff13baab91fad973f9fe5311e7a1aac9e422dfffb29a550ad7ca5658152279f SHA512 25dedfde6f48b0bd34a500481662c3da8c6f78b023b4d5c63559c4240db22fb664ec057d3d801714cb682a6bd2e870bf072ab688b1d00c017f0ea5af980d5ead
 EBUILD tiled-1.2.4.ebuild 1281 BLAKE2B 317a129e11a98236de269a835fbbb19f07f89910a434bc9563b31bd4709bb3904389b1e734b7f1c636adbdabcd05f15902c68b9ce28277f3b1546e21b9be2608 SHA512 468eae31ce23e157dda0434e17c1b3a06b1a3351c9d552f99605b78c5a9ac39e412b6f36a3850fd2f1de5081c1e3be266601c65162f10c09cd76c4f076be4ced
 EBUILD tiled-1.2.5.ebuild 1282 BLAKE2B bf8237182f14bb63c4108d9b17d28ffa1976b25984839df9989d788f11475a5fe18b446833693ace31f41107617323e575f932b6563e28ad1a83bdf9e189529b SHA512 a609f4f85a6bc015e16d79abae91d5731ba4c8fb8b3ac572bce7fceb6fff3910f4c34ad2329ed42cc74b5be4692bee63049ede4b0fbe0681aeccd1e90f63a10a
 EBUILD tiled-1.3.1.ebuild 1317 BLAKE2B 051637e95b94479d6ba0d7bf41388173646ace161c1018ac2f80e6d189afdb81b9744dc7749a286ce5b4f590046a02d8ee0c3679809ce2e4e21fc5bc5526fcfa SHA512 50398aeffaa325c156b90c62127209c7ec884701062920e7230b048f0d18bb485618495711306eb4c2f1bc4eec44dfab1cae9b0696e9874b054e2d04917aa68b
+EBUILD tiled-1.3.2.ebuild 1317 BLAKE2B ad74165665a04dcb996b58f816920a7daaf3964a4685af723c8c285ebb3eaae5de11bc817e23e6da7bc2f3960873139f6a3745e0df824418cfb006e9cd3945f3 SHA512 cb89e213f5ba851654039467aa392ecef2da9309e652a7681182c77192c41ef9cde15a181692649edfa834595203f85949b5707e65a94bc34ff45c92f5185d3f
 MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.3.2.ebuild b/dev-games/tiled/tiled-1.3.2.ebuild
new file mode 100644
index 000000000000..b510b361b4ab
--- /dev/null
+++ b/dev-games/tiled/tiled-1.3.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="https://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.10:5
+	>=dev-qt/qtdeclarative-5.10:5
+	>=dev-qt/qtgui-5.10:5
+	>=dev-qt/qtnetwork-5.10:5
+	>=dev-qt/qtwidgets-5.10:5
+	sys-libs/zlib
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 146eb99061ba..a80f9fd02bf3 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/regex-tdfa-rc/Manifest b/dev-haskell/regex-tdfa-rc/Manifest
index f9e279a08dd6..c75f43b93f6d 100644
--- a/dev-haskell/regex-tdfa-rc/Manifest
+++ b/dev-haskell/regex-tdfa-rc/Manifest
@@ -1,3 +1,3 @@
 DIST regex-tdfa-rc-1.1.8.3.tar.gz 65728 BLAKE2B 19d0147fbea30d2ffe595fb0e2108662b87f30d4d8321d362f5e043bc5b194efcc4a7ed6732b2f84b218fe945be1b841e363ae43c5f3d4e84301e4f9416a980a SHA512 2664e70029548704a2086759a3f05fa34cca1034493451175ee2264d91e9fcd10605c115c51d0bbab77143eb43a62ea6677fda1716d6f500e2ae881d5e9afc02
-EBUILD regex-tdfa-rc-1.1.8.3.ebuild 664 BLAKE2B ab9eea57f16833ec4de142d2580364b4905d0ae74f9c4a5d8ead34738cab3a9df13f9797b78c4a5ba0352d9334ed51c739f76e0d4bc060698f1a044ef984459c SHA512 d83bcd3e32ea9c022eccb87e0f83db14cf6a5829db9bd256181ed54714a1f04affe5e54f2608f8f2194138d4b91a9f8aecbda2e5e7b5ea95d893d1b3d1a46b54
+EBUILD regex-tdfa-rc-1.1.8.3.ebuild 672 BLAKE2B ff7fe3d1226484e60b38d6d976eaac779ce1fcab0754becce6650db2e3dc8d891f9726496bb20d13f175ef2d358ebe29ff3467c58acd656926ef8227889c4d81 SHA512 44d692dd1dcc1820de46d526b56abd6058bf2c1566a593926ad93302a70de89a5e620d3b8bbcc4481a19f1932af5d29c0796951e8433ddbc5c400a3e81c8c593
 MISC metadata.xml 350 BLAKE2B d4b0b920ed1542d23b2f0a645d610554db98572253d202e3784518f0e1a94f7a2a8f6e0d567ebf5b287071ad0ebfcc63805096979352b191bdf1de9dee986bed SHA512 274d4faa8009a3cc0f409e275ade851a71dc87d2a8f18a8361bb61444b0b40677d9469e3cc1d2276d13763949a9f5d5e02cce0a9d719d2a837fbe7e943bbe874
diff --git a/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild b/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
index 977f7394e5b7..e2678eb7e91a 100644
--- a/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
+++ b/dev-haskell/regex-tdfa-rc/regex-tdfa-rc-1.1.8.3.ebuild
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Replaces/Enhances Text.Regex (fork by Roman Cheplyaka)"
-HOMEPAGE="http://hackage.haskell.org/package/${PN}"
+HOMEPAGE="http://hackage.haskell.org/package/regex-tdfa-rc"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7381e167e524..14e58321e481 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index 7a11cc8a90f9..43fa672ccb77 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,5 +1,5 @@
 AUX backport-util-concurrent-3.0-notest.patch 491 BLAKE2B ea587be0736cd1aa4fcbc4095c31dd321816cbefa0cec4d6f0c8969e24e9e96038b30db4baec0d386ba18828cafad0c2d084b48d69c7db77414dd5282f1197f0 SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080
 AUX backport-util-concurrent-3.0-test.patch 380 BLAKE2B 5e1e437564035e652d6c41f8ab75b0589257e955aa06f2b83d8fb488ec7f2d7c4879fdc1556a47599231bf2ab1497243cdacfb7f64f5142bb4728265c296790a SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe
 DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 BLAKE2B 49dd1065fb80d697dc917aeff1bf653a1c82bc24e3edf6d1eb272f3cee17130a6db20f562f40e7911a6382f8c545bdf37e1ce34b69a6a7ddf5a569e114a78e87 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54
-EBUILD backport-util-concurrent-3.1-r1.ebuild 1156 BLAKE2B 8a0af98574df5e47c6574f1e8e5b8bfcaa2f23753a5985196738aa556b2fb8d9d418678621b5bafe5f9b1036c70b90fb443f73cc3b5fa3182f8d7ff905534ea0 SHA512 1627fb351bb9a81bd4a6f5ee54a0eee5bef59aae9f78e908fdbee949e4a32443af3c2da0526e43864169510e1b7b49f50f8464bd7b6ce5d63bfaee3679370f1d
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1163 BLAKE2B 67d32eca739657d15b106c711797a043ed48c6fcf7eafd7396c1f09ae04385c8af4c8a8a5b4d2d9ce1c743354c58f871cb6de669ffe4da38dc6cf95a8a9ef894 SHA512 949ea051af9ea24a954c6e9efe910332628521450b63e62df7c8733c1105f67588b118a302c286dafa30fd5183687ef920f1e3a022cdb61d422ac0ca363c105a
 MISC metadata.xml 490 BLAKE2B 8c30e55ff1a4b70180d42e365d9eba3405a1591438e0fc801383b8a1ee65daf759b2544c1edb3b2a03cfe8f7932b5c4de8d12980c630fd5b625ad2f6a674c291 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 6748f4a38eb7..2035fc35da3e 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -10,7 +10,7 @@ SF_PN="backport-jsr166"
 MY_P="${PN}-Java60-${PV}"
 
 DESCRIPTION="A portability wrapper for java.util.concurrent API (jsr166) 6.0"
-HOMEPAGE="http://${SF_PN}.sourceforge.net/"
+HOMEPAGE="http://backport-jsr166.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${SF_PN}/${PV}/${MY_P}-src.tar.bz2"
 
 LICENSE="public-domain"
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index c88809112acf..b5cb90e70273 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -1,3 +1,3 @@
 AUX javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
-EBUILD gcj-jdk-5.4.0-r1.ebuild 3712 BLAKE2B 1bb67b0f28281f8d213111ff6e3e362199ccf05ae56587b20dcd8975479f284bc0c0aa6850a85a4418b04d9fb7be491ab3c12e174c7680e997e7e3bdda130278 SHA512 1f26adc24f66091ed51890a6fb748f48340670b359be609bb34c55038add83aedf6c060503e232cb5e0749d60685e4b5ef71fba7d0863ef942f9cbab429660ee
+EBUILD gcj-jdk-5.4.0-r1.ebuild 3729 BLAKE2B 22321261590d701d4fe7ea32fc6dddbdb8ab6034bd46e6e567bdd21beed4c0c1150a4f3cff993929945c2796750b5526184c2f1d311417f12099130dc7de1e0a SHA512 6604821206d07f2bc5e0c872bf908bea580773099b445224357f8e7fc373de47fabaaf826655f6d1990fcb6535352a1d7d4ded86d85c577fb75abb5548074dff
 MISC metadata.xml 716 BLAKE2B 1467e6d569030367c7983485d8a2159105c2d69e067878e0fce02e33e6604739cf54f84da3a77852f6722d71d060b2d56745b22f0818d5ba958851e1a5dcff0c SHA512 ccd737b1118329a85ecd3f5b19548bec4a2e425b20955b578287d4f82dce165c31aa016019407e8a5b138a48718b61089ca7f9678c549d29d0bb27cdd9c48e68
diff --git a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
index c56dd496f7c1..48daa045a0e0 100644
--- a/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit java-vm-2
 
 DESCRIPTION="Java wrappers around GCJ"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index d912933dcc13..58ef6b9ababa 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -2,6 +2,6 @@ DIST jdk-11.0.5_doc-all.zip 51476228 BLAKE2B 4515b7aaba27446971047b4c95a8684951b
 DIST jdk-8u202-docs-all.zip 93792495 BLAKE2B c1e3f6f5a713d55a62dc6ef0fd2bba5d30b094030e8438b73bd6bf9f27a7ec3bdb924d8251f99182eb62b470f177fdf84db23f57550bc9467a4a7c305190ad50 SHA512 ad8b51bbc705d46d47164918ce2d620cbadaf92a3fe56d72528f9cbc05da900309ecfef7ebf711e9474f292f744e2e33877cb7377e2e21a5a58e1922198be907
 DIST jdk-9.0.4_doc-all.zip 70500089 BLAKE2B 549da2c6baf1b39082f05d42d0fd02f7682a765c1d43a605063b155b3b3e2e20053b4044a238afb41c758700efa5de9ec53c29e2e8be1d682c2e9e7b221c0875 SHA512 7d8b40499a0ea91ac922c6916b19a061b39e73e54e123a943fcaa75fcfe66672ad445dbd789c2c9448c8cee0e7f72974ca6ad53bcaa5667547feca5791dab92b
 EBUILD java-sdk-docs-1.8.0.202.ebuild 1463 BLAKE2B 90333af0e93385f7c17ebcdba8a08022d4e16db20cd13e1081a8e44f7c2fed01de147767f0a52debe08559937a54e40d3636c371bbd1369ccc8fd3ca1c1857d1 SHA512 690b5443f1dbf3cb51c9b6f5201375d225bda54bf4ab83e388546c12b5f3c60a5bbe44b1abb7ebf48d85caaf550339798f5b6d9141cfa8b7bc2867653a5baea6
-EBUILD java-sdk-docs-11.0.5.ebuild 1276 BLAKE2B c20cd90cfb65752da1d5f5f2e0ff62e5d0c316c94356d6093593b0d55bf11535edc9600d88cd6143f6e415870ad62d138658a791a9bdede5659a4d33281113b3 SHA512 2f2eaff0d799c8565bac3489f00034898c90d84dd4bae4daecf0dcd166f28dfdbf0f74b17ee2b8a2824718a4cd5cd3e4826482dfe0f3436d8412b6fec003f111
-EBUILD java-sdk-docs-9.0.4.ebuild 1277 BLAKE2B 0e2610b8541e0470b9ca4d093ffdf46dd244694b13f23aa5ad7e139a9b5085795efba9553bf1cbfe68b64ff1bed3b8eec51b27c1f106da69b964aaa17fb8d84e SHA512 7772dd3232e6ed790570c82cf23a67006944cdd7676d4e4d6ce69e19ee9f8f3c4cf4fc18cff85bb68c0f50173bc92bb5442ac0050b73aebe662b819e7866d532
+EBUILD java-sdk-docs-11.0.5.ebuild 1271 BLAKE2B aaea3979d6428d5868272d8e2caee269765a9a11e39c8a057272a2010ec71a5972e13d555db1998ea278e14f41a3ad2cda1cedc97a19f573dd4fd99c7ee8ff58 SHA512 8a1eefe9742b9a080661500379f412ab1f8a82511d8fccb8d1345c04499838411fe9c6f3be5d4f145708879b6dc120acb14059b04bdb136be79f753121263223
+EBUILD java-sdk-docs-9.0.4.ebuild 1271 BLAKE2B dcf1970875b54852d6ac66fab6b0464c50723ea669e47dad8184b443d36bb49b45d7a4df2df29396909eff8a2625a902e9b81a8fa4bb74b2aa7b279a8f1f8342 SHA512 11335c99f7ef5f44ed6a8b4defb2607036fedc8c826d79e39cb01cc8a912317317512accf60f4a0faaca85175eea6cd69cfe2c6893fead160f4ba4690b5d638d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild
index 7dfaec9ffefc..6009e54b6396 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-11.0.5.ebuild
@@ -7,7 +7,7 @@ DOWNLOAD_URL="https://www.oracle.com/technetwork/java/javase/documentation/jdk11
 
 SLOT="${PV%%.*}"
 DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="https://docs.oracle.com/javase/${SLOT}"
+HOMEPAGE="https://docs.oracle.com/javase/11"
 SRC_URI="jdk-${PV}_doc-all.zip"
 LICENSE="oracle-java-documentation-${SLOT}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
index 35edb42957fb..a155428af70b 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-9.0.4.ebuild
@@ -7,7 +7,7 @@ DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk9-d
 
 SLOT="${PV%%.*}"
 DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="https://docs.oracle.com/javase/${SLOT}"
+HOMEPAGE="https://docs.oracle.com/javase/9"
 SRC_URI="jdk-${PV}_doc-all.zip"
 LICENSE="oracle-java-documentation-${SLOT}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/dev-java/objenesis/Manifest b/dev-java/objenesis/Manifest
index 9b2b333ffebe..514dd056b0c4 100644
--- a/dev-java/objenesis/Manifest
+++ b/dev-java/objenesis/Manifest
@@ -1,3 +1,3 @@
 DIST objenesis-1.3-bin.zip 287452 BLAKE2B d3f6cce9ad46d8578e24077df8a19fcdf2f9456ef732f73fe234ae688c9ceca7277e5376657efcdaba1a7b5a80ddf106aff52f291a6b2f698a010a288e961e33 SHA512 48f838e00cfe0d12c6c73fb3d1d8482ccd8de71742a86c3afbba832c6b73e1f7b1604f8c209386e00f7751cd568e9ef4d61b543db66c927f3d61f9e6ee0a4193
-EBUILD objenesis-1.3.ebuild 639 BLAKE2B 29eed60a55dc4809ea5177a07c6c90fbc20ac162a1c4713084ffbcf1203e4cf6147a7d524e0b6104d697a29b7a20b5531155fea3a63e00eecec7eac94c833313 SHA512 877de6af0b05a03fac261968c07b766ef4b1ffe8bcef8b8e467a5c03d0c523d066c54cc3b8a20f39484a9e79145d5ce0ab4421bd18e1371885dc1775b0701c78
+EBUILD objenesis-1.3.ebuild 643 BLAKE2B 799808fd95f71995eb2aec6f39c422018ce436593eb5aad45ba9d740f5d78788eee223e6848c0784bf4261d98afe75a19c2a773635913bfa5c2379a57abc897a SHA512 2c40d6bea042b962616d320622644f0a607e942f70a1067e539f9fa8209ec584dbad1683d770a7deb92f5b1f5a047d7b04eca96c87f61145e7d85f0f8e976e68
 MISC metadata.xml 315 BLAKE2B 2190fc553786144aad4a8887b7d040a8597cb48aacb4f9ad04261bab6b7752d2d43779edd3f4bfb8fc700c7decbb0e82f80216dd8f1722f6bae6f2522aeb8a50 SHA512 21adb506d9c4eb3d989497eccc9ae6d052753e880afa8b7800dc86d54128173b288c1788579f1d8e1be4acf7b03a1fee2e15ade6551241062e8a908ae9a6c7ed
diff --git a/dev-java/objenesis/objenesis-1.3.ebuild b/dev-java/objenesis/objenesis-1.3.ebuild
index 0622138a4c35..497a66930e04 100644
--- a/dev-java/objenesis/objenesis-1.3.ebuild
+++ b/dev-java/objenesis/objenesis-1.3.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="source doc"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A small Java library with one purpose: To instantiate a new object of a class"
-HOMEPAGE="https://${PN}.googlecode.com/"
+HOMEPAGE="https://objenesis.googlecode.com/"
 SRC_URI="https://${PN}.googlecode.com/files/${P}-bin.zip"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 3e87e88bca70..88af4547e7fc 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,18 +8,22 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
+DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
 DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d
+DIST apache-tomcat-8.5.50-src.tar.gz 5646813 BLAKE2B cb9ebc0fca2827f1686c28a462b3d646b84af9b6eabee55d7d6c418c270142f9626d9797137a18dce037a6290904911edc6f3609feec96cdf48f37e9431c98da SHA512 e96343179ccb21525ad2bae31aadbdc0ee4b9e94a59186eb1f5d7928b72312c8a6e631b335ff07d4e36d6c9512ce2d8daefcc0a108356f45f8ad987a392ab7b6
 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
 DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd
-DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
+DIST apache-tomcat-9.0.30-src.tar.gz 5798307 BLAKE2B 27e3f238e25f62860852977140e9ab53e4121d200600e842e7b73cf8baa03dd80b678504531ce252c0fefbcc107999983846d6dcf96866f7616f7ebdcf8bc118 SHA512 5a693c26bc78c504ca9c30cab6356927dbeded199798b558f2efe428a98fd68a88e0c113cc7b710fe3b2109e5ae3a970ff3989f909b95eb782d47d12a2a3a20d
 EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efcb02eb64a7a98b1276c847bdd42528f0331bfd9d3e8d8f4d6320667cc0fbb52552ca52fdee6735cf0ce97d6d975377061af91 SHA512 c3cca19f2a4206dd68328f6d6c902b15f6fb4a8b740dab698b8d668354f98c6fc272b19ec1df4bb7c4c65e729460b41a512d4d13ca765ee4be8879108b14766c
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.96.ebuild 903 BLAKE2B 96a68aedd7a8659c8e28026ba7bafb0f6ac8b468a95daf136eb44ef793b36e3d7adf16f1bf3f01bda4f198cbdd9f792051c492e47e5adf2b45f35d9e2b2d2702 SHA512 0867575b7ce8681f4a15edcdf70ed1ed3bb82bbed97128e238d650726e29e66f48dd2bbea4153e1426c24eb30b49b5eb783407533612336d1f5230d05a882eda
+EBUILD tomcat-servlet-api-7.0.99.ebuild 905 BLAKE2B bf918997ee9c96063bd7cf0593209da710caf03d42aaf2381ec2a500c0db45c86cf36e33c07b3ded5facff6dc9ec022f42731bb21c35fbfec6fd71bf2b58e6f7 SHA512 f2f5d74d1e11361da8f46895dd34f2ce0e936fd3ce146776f400b9bf00d329810cbcb1e1ef3e60a44729f673dc7fe39bc7ff218ffddb75324ebac9a967550a15
 EBUILD tomcat-servlet-api-8.5.47.ebuild 1005 BLAKE2B 029fadc44ace7749ca1c4db4178f2c15cff949455e76510f31be9693266d9ddf08cd674922703045e462925ba413450b5bb61c3168796b0f21cfc498c3954cb4 SHA512 6e4e625564a15b37795c7f13277e0f3750a8ebd94d9b733867b28806f9dfa066baa88803840f6b26c1ec0a12b00c5b5440ef43a9bd77177161f7134aded2b5b6
 EBUILD tomcat-servlet-api-8.5.49.ebuild 1008 BLAKE2B b0a72cde70dc747a59e3132f9e7137b9357e96246e3aff202fa2915f2bb8b605984861abfb2d6cbab144d829469b26644e8a996dca682d41d9beddcf6bbbf55b SHA512 4555d6f5edade7813fc1f36b7929221878447ef4224c96f978f5d36db262364bbe65b37c8bd0b844e10858055dddd7eb7d5840de00c32ef2b1fa219a741da1ba
+EBUILD tomcat-servlet-api-8.5.50.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
 EBUILD tomcat-servlet-api-9.0.27.ebuild 1000 BLAKE2B b410d7f4731df2e4bf4a6662e0af2499abb8025cd151f7945c36d5866ab9582794a1fec9ba83efc2ffeadbdf1be947a6827e2a022922dcd44912cc16eb0162a6 SHA512 d70c5000a9122e187b45d755f08a4bb8b76f994c5dfdc12146f6c4cef0d7e70607636dac9a43e221d8f7b6e50f85b34f435d221a8c837014cb309a2c9a993ed4
 EBUILD tomcat-servlet-api-9.0.29.ebuild 1001 BLAKE2B d3ed95575adb0ac164f17e721146bb7f8c2e23bbe424cba29a1d2bf4bb97185371a635c5d5d06f78f395f0a8fda33bd00a707e545c706b4c43c288fbce976a94 SHA512 24d54ded5e701697509b6044be4b6f24591ad8349ff36ac331e7628c26eed22f7ec29f0ee82587b5005acf566f01e23e6e219670dc5e1269a80ff5536bc33765
-EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
+EBUILD tomcat-servlet-api-9.0.30.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild
new file mode 100644
index 000000000000..88c4f9f8e140
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.50.ebuild
new file mode 100644
index 000000000000..b6216e53c6b0
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.50.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.30.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.30.ebuild
new file mode 100644
index 000000000000..9ddac4eebd99
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.30.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild
deleted file mode 100644
index a0340d723de1..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${PN}-${PV}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm -fR */*/build.xml
-	einfo "Removing bundled jars and classes"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
-
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3fbbee5b49e0..f9582817e1f6 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 221695d4edd6..a67f2c4b8389 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -8,7 +8,7 @@ DIST R-3.6.0.tar.gz 30449618 BLAKE2B 2fb2f1252f5ead97ab42eb1f71fa0be1e8aec2f6cce
 DIST R-3.6.2.tar.gz 33311930 BLAKE2B 53f344e80e017064a275c271d98be714e210193931a120e7ebc79ee6cf0ebc0c24c090acc25560998f26600c05305147816ab782632d99beaea83b3a9b5e2a21 SHA512 17513e9f4dd27c61c11f7aa45227aeeeefb375bf5d4e193b471724f379a1b2da33e127cbe91aa175cbbbb048b892047e2f610280585c8159242a6c94790b07f9
 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06
 EBUILD R-3.4.1.ebuild 6283 BLAKE2B 87469504881749122a9db87b227ec4be47439fef0080d872ce9c395e4168e06bbf92725f79c4cc36c81c0a0ae9dc7a99eeab2e92eb779575f394924bcc94cffc SHA512 dc3833f5e0312728c7b9c55e07c83533da0f97d76a0769d78d1146b9576b92b1a130571f6b2b02f841474e1110d1624458855e354e6e1b14688cebc458ee9f7a
-EBUILD R-3.5.3.ebuild 6289 BLAKE2B a298e4c489687a7f085ae912d8c3cd2f828507a75cf1de6e6ccc96070e266bac44410241058be1d89b8cf7554e546fd85bd7b9df615c4d1080fcd7dafd17ec0e SHA512 53b5a749a55e8fb82ff1aa160d79ec50bac06fb7978aee3376bddf7a57f6826a964b938ec53775b8744dbeea3990ffa77f7a33e91c4dfa44304e71683ac41d71
-EBUILD R-3.6.0.ebuild 6289 BLAKE2B a298e4c489687a7f085ae912d8c3cd2f828507a75cf1de6e6ccc96070e266bac44410241058be1d89b8cf7554e546fd85bd7b9df615c4d1080fcd7dafd17ec0e SHA512 53b5a749a55e8fb82ff1aa160d79ec50bac06fb7978aee3376bddf7a57f6826a964b938ec53775b8744dbeea3990ffa77f7a33e91c4dfa44304e71683ac41d71
-EBUILD R-3.6.2.ebuild 6370 BLAKE2B 0a703870c07c856a130f04a6d6b4c34e7d45d8104b7b78a95a176c327d7a6cef5d8fc36972c693f65f5a2f08cfe8f41c1b333bd21bfe48ef87686935d40a1438 SHA512 43654976d259bbdcb67d9b5356899ffd27e54b7e5ea240804b2a51a33df98abc8f29e00758dc929d8e9bd742d61f545cbfcb2fe65c887d21f579bcec1b3557d6
+EBUILD R-3.5.3.ebuild 6279 BLAKE2B 4674b9336e123bc78652603d203dee6a9a09c2a59648216874c8c0a7e214a85709900eacb92e28bece20ea8c9d890e6126150b458b697495c54ab321b714272f SHA512 c9ab6e44de46d6fd9f4b5f043b2a38ca4aeda997eb56715c14159c3d58c3d579755689ce102025a300389db46ac95f74f5ead9b50156085d16ff1ed9547a2b6c
+EBUILD R-3.6.0.ebuild 6279 BLAKE2B 4674b9336e123bc78652603d203dee6a9a09c2a59648216874c8c0a7e214a85709900eacb92e28bece20ea8c9d890e6126150b458b697495c54ab321b714272f SHA512 c9ab6e44de46d6fd9f4b5f043b2a38ca4aeda997eb56715c14159c3d58c3d579755689ce102025a300389db46ac95f74f5ead9b50156085d16ff1ed9547a2b6c
+EBUILD R-3.6.2.ebuild 6360 BLAKE2B aea82d4f0d13a3e7f6bfab0ae3e701713cb0e98ce1fed38c5a079280d2d7197e8502363ac5988439babea3b0a6a6f0bf3de158b94b3e78a4e3de8cca8de2f8cb SHA512 367d56e7f151b99adaef004616caf13e3ce12be0faa61e9fa1795b2ebe184d56e8657b9015cca187ed9aecf13b0fa582595e492195b85e411eb5c8ad5956bbda
 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1
diff --git a/dev-lang/R/R-3.5.3.ebuild b/dev-lang/R/R-3.5.3.ebuild
index df86d7063895..35f7ce8af6b0 100644
--- a/dev-lang/R/R-3.5.3.ebuild
+++ b/dev-lang/R/R-3.5.3.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 		-i src/library/tools/R/Rd.R || die
 
 	# fix Rscript path when installed (gentoo bug #221061)
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
 		-i src/unix/Makefile.in || die "sed unix Makefile failed"
 
 	# fix HTML links to manual (gentoo bug #273957)
@@ -116,10 +116,10 @@ src_prepare() {
 				-e "/SHLIB_EXT/s/\.so/.dylib/" \
 				-i configure.ac || die
 			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
 				-i src/nmath/standalone/Makefile.in || die
 		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
 		fi
 	fi
 	AT_M4DIR=m4
@@ -175,8 +175,8 @@ src_install() {
 	fi
 
 	cat > 99R <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-		R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
 	EOF
 	doenvd 99R
 	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/R/R-3.6.0.ebuild b/dev-lang/R/R-3.6.0.ebuild
index df86d7063895..35f7ce8af6b0 100644
--- a/dev-lang/R/R-3.6.0.ebuild
+++ b/dev-lang/R/R-3.6.0.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 		-i src/library/tools/R/Rd.R || die
 
 	# fix Rscript path when installed (gentoo bug #221061)
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
 		-i src/unix/Makefile.in || die "sed unix Makefile failed"
 
 	# fix HTML links to manual (gentoo bug #273957)
@@ -116,10 +116,10 @@ src_prepare() {
 				-e "/SHLIB_EXT/s/\.so/.dylib/" \
 				-i configure.ac || die
 			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
 				-i src/nmath/standalone/Makefile.in || die
 		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
 		fi
 	fi
 	AT_M4DIR=m4
@@ -175,8 +175,8 @@ src_install() {
 	fi
 
 	cat > 99R <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-		R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
 	EOF
 	doenvd 99R
 	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/R/R-3.6.2.ebuild b/dev-lang/R/R-3.6.2.ebuild
index b428a1112711..f3312585e0cc 100644
--- a/dev-lang/R/R-3.6.2.ebuild
+++ b/dev-lang/R/R-3.6.2.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
 		-i src/library/tools/R/Rd.R || die
 
 	# fix Rscript path when installed (gentoo bug #221061)
-	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \
+	sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \
 		-i src/unix/Makefile.in || die "sed unix Makefile failed"
 
 	# fix HTML links to manual (gentoo bug #273957)
@@ -118,10 +118,10 @@ src_prepare() {
 				-e "/SHLIB_EXT/s/\.so/.dylib/" \
 				-i configure.ac || die
 			# sort of "undo" 2.14.1-rmath-shared.patch
-			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \
+			sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \
 				-i src/nmath/standalone/Makefile.in || die
 		else
-			append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib"
+			append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib"
 		fi
 	fi
 	AT_M4DIR=m4
@@ -177,8 +177,8 @@ src_install() {
 	fi
 
 	cat > 99R <<-EOF
-		LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib
-		R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN}
+		LDPATH=${EROOT}/usr/$(get_libdir)/${PN}/lib
+		R_HOME=${EROOT}/usr/$(get_libdir)/${PN}
 	EOF
 	doenvd 99R
 	newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index b853b8c57382..6e7737edbcd8 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -19,6 +19,8 @@ DIST erlang-22.2.1.tar.gz 55742915 BLAKE2B cfb49a07289f66ee8bcdc37452c88ec60c90b
 DIST erlang-22.2.2.tar.gz 55743605 BLAKE2B f316b78f33d81f05d22eb4eab52756a46c39df31ce93bf57ddbc6d663d0165f6cdcb4de2e4a70308024e7648a54267364ec19c94c425d643d03dc741112acaff SHA512 c38ecfcbc7ca66d45b5a2dad9a03d9c2a3a504d9ac85635de93975b03056a3d59edf462c296349f657534d935bcc1ea4321b771fb216f54f723d9db438437e42
 DIST erlang-22.2.3.tar.gz 55742102 BLAKE2B 85c1f9a2f6ae05e8e3c0f4c71c0dc4f1dd14f5a91e35070f20631b9349fd5d884a9c5390a0159bafcfda8464253bb3636a735f05f4d286ce2bf0518bdb3f3b50 SHA512 4ec29abfba875ddff700ed19095bf5709e75083530216ac8f3b24147e06d098675d1b4e5c0674aef44bc7391fe8e3fbcfc2e17d8083cd006e5ddb5c910010e44
 DIST erlang-22.2.4.tar.gz 55746886 BLAKE2B 2132ab12789c98259f284cd0188109eb1bdbac63c3f6c5bb7a79572dd99586bdf9b741b3b2c87965f5794c3d41df1f0b713e9b89ebff0707ab9fa079dd20a9d2 SHA512 b73bb94c0172635cc4843958a62959c42085e63916423cebbb094cef9684ffd0491874a12338c7066cc94b660ac8b6f6aae73cc0eedcf5517ba1c85cf1b80258
+DIST erlang-22.2.5.tar.gz 55745622 BLAKE2B 3bc0ef57dfedd46f3ab870622c5daa5424a0b1bc9669cb46e7d59a15d485cac9228896cb75883eb6c92b509e193ae484dee6ad2792a959c78cb74c6e18507083 SHA512 56252d7da1e42c27378ae3a1d587446554443207e9bbe2381f74626bf0fbb1c37d3117ed81a01b5c5e01eb76bfa4fb04159813f4df52ae5b8f5dfd261f555b02
+DIST erlang-22.2.6.tar.gz 55746963 BLAKE2B ebd1e11dc817285307add4147fc4f3c1bba4e9b8a19fa3dd61ec321aa4dfdb056406d76216185a39316787efc9bd766a1e7441b8c261bcb98c4b642c87a27357 SHA512 6da4b25340a37daa30d3a27081b782f24a53edfca0070f6c02ca0332bc8db9b3bad917c43d63470a15a86a44a439072f3ee1472b23ff8163730443e4a811c66b
 DIST erlang-22.2.tar.gz 55736930 BLAKE2B bcd67ea4ef5c358d4f0bcbec977e2c60a3b0f1ccccb2d38c35ba1908ed9d96727c83ab6cb6dc69ce90ffc6772e34de68014cc66ec8c3bfcda852844a4f6b1548 SHA512 a192da8ee02588c44e5c04bf2933c95672f596ca10f485c2c41d0c97563c90b5ea24fa02da61e007595f25a80557e6513372db3059bb7e394647a4c11f4cd41e
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
 DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202
@@ -33,5 +35,7 @@ EBUILD erlang-22.2.1-r1.ebuild 4409 BLAKE2B ad23a960bf847324e20a0aed506839848335
 EBUILD erlang-22.2.2.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
 EBUILD erlang-22.2.3.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
 EBUILD erlang-22.2.4.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
+EBUILD erlang-22.2.5.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
+EBUILD erlang-22.2.6.ebuild 4450 BLAKE2B d077fa20d38850d1fd9c8f29a0f4b22e82129af1f21a635f45437e6b841e250e15493f943203756e9746739041dff2476fc36ee92f559c6b1a2eb661bc10f119 SHA512 c7d811297276e91fa327d34023474a28e5fcf056af9da63486f0f589c7582d2f47ae62d255dfac79cfbd8ab8c5a8661beb2a595597f88558fc405e77d8563a2e
 EBUILD erlang-22.2.ebuild 4409 BLAKE2B ad23a960bf847324e20a0aed506839848335257a9317af46decfb4c4ab7a811f954a0eb2ad16897df323d80d33febc4b371208d466322ac880763300332f4060 SHA512 8ecec73e1cf697ed7e5a7970526466e21e746d64e0c97844c167680a33b44896448125758e2311bcbd53de4c80ae3a697b1a691de59c4df75cc7db4123a02f7d
 MISC metadata.xml 905 BLAKE2B c1277904d14789138212ad1c83291d30301558aba707d1eb43765573c32617bfcb0eea43acc80225870cf2fbab011920b64bbecbdd28d414d73eb3c86a00937c SHA512 f79228f075fc6ac58785bc8a6c574546674b7ddd6c4f7420cb616414cf5178c2fa08284668b0d863ae3638891567184d1e8a490e31c4e093724ebff5c177a461
diff --git a/dev-lang/erlang/erlang-22.2.5.ebuild b/dev-lang/erlang/erlang-22.2.5.ebuild
new file mode 100644
index 000000000000..c52ed00f231a
--- /dev/null
+++ b/dev-lang/erlang/erlang-22.2.5.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0"
+
+inherit 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"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	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}-22.0-dont-ignore-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-22.2.2-gcc-10.patch"
+	"${FILESDIR}/${PN}-22.1.4-asn1-dep.patch"
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	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="${D}" 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-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/erlang/erlang-22.2.6.ebuild b/dev-lang/erlang/erlang-22.2.6.ebuild
new file mode 100644
index 000000000000..c52ed00f231a
--- /dev/null
+++ b/dev-lang/erlang/erlang-22.2.6.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0"
+
+inherit 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"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	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}-22.0-dont-ignore-LDFLAGS.patch"
+	"${FILESDIR}/${PN}-22.2.2-gcc-10.patch"
+	"${FILESDIR}/${PN}-22.1.4-asn1-dep.patch"
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	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="${D}" 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-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 03d0bfe879ac..65ab36b2776c 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -1,6 +1,5 @@
 AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61707b10361cfb96a01f492d234b3318554628dfc51a49728022db2f6573cf78d66a38cae0f59e2054e985e189268254563c0bf9e6854b3c129 SHA512 287a17a6b3aaf8c9a971874ff2a507c8d301caf84d243bd1d063d58e21e93bbecc2b417767e0d56d87f300cef9811f7aec0caa8616292950b11eb3103f7bebbb
 AUX jsonnet-0.14.0-makefile.patch 752 BLAKE2B 5acf8e07cd0f1b9af658015e6ee560f31a25b4b17402e0516bc8a861db4f31d9cb23e86943389d36f0885f4afc179b433764a331aea7a0164368e3561490da61 SHA512 18230b761ec3d3d106e06d02680b54229eb20c681b7591209dbb7d5ee138edc3a5015d1e53d3238dd9c86753bcc3f5ef3352a733e9a950fca4b37af8d83c9888
-DIST jsonnet-0.14.0.tar.gz 21857157 BLAKE2B 93de74fa07efa300097ccb9503b41543beb749d5aff130ad9a6139a3ceb0a07b404aa50877d4cbacd9eb26b2194d8cd9bf578521f17f84a3480655b179525663 SHA512 e09fb27202a34e88134d98d59fdccd4f1ee777e7c8090c3687cb5c11b9ada3bfe7b878322e0274743694ff77457215484470ccf90d03d9d36159288e5a18ab0b
-EBUILD jsonnet-0.14.0-r1.ebuild 1362 BLAKE2B 9ee289a3802cac0f51b3b4e8e57a0a2f02a65d693ae15b9f58eca243948f96d4c40af416b3e9d27872f69a9d3893a259172bb23444cb5425358ca66c66336512 SHA512 066de4f82c9a415291f7bf3f2f9721ea49a5a00aecc51ac8ab2afc1751546bb665d19235d76759fe923dbc4b919e6c50127ced0505b005b37b4705f152748208
-EBUILD jsonnet-0.14.0.ebuild 1367 BLAKE2B 488583ee08348f1bb75fe187574db7d3f5c3fa6142252dfa730ddd0936115ea5550cb93cb95e31d1a6de55b538374aa68034ed2dd91d2eb938a612347cb15b92 SHA512 3ac0c8e6ef1a75382a21fb15e00ee93c03886d37214f8dd102c59e61f1d81a46032f7ce4ec1330ca165e2b4957665e27e4c9f6d4381c1a7b1e42f5500b24f17f
+DIST jsonnet-0.15.0.tar.gz 21826038 BLAKE2B 722a844c00ec31b662d932a4481a71197adad680181c6a56a49dfa3e9b63696d29320c5278024d44c0ab3d7d80569514792f815ac7fa3a3cc08c7756fb6f08ad SHA512 b63c1bf82e4fc9ba3f1009ed4e4ba1010e3e7f81bd816a234e48d35607eae3cba95cab57813d35daa9f024e316bae5256340a6f8d6d884f9136cdbf062a2b351
+EBUILD jsonnet-0.15.0.ebuild 1362 BLAKE2B c964f25e046778eebe7b12a3a9f72e057849c33a61b2bdfbc8e188000b4ecd81529000cc88abe04a69b440ced1ab9453bb1db462e5ae4ed7a72426e4d4f0ad3b SHA512 a4a3610b032b23d3a1344813233f174d90096a26d2fc13742b9509899267038bef5833b7c8f74ac4da7756e40378ca2def4fccde72144971b4edb63dea2f9f55
 MISC metadata.xml 621 BLAKE2B cf9e06f9981b454578c1769425dc15a7a271063b2a95c296db1326c4b4ce0f93ff96a2df42143d9d6fb8e1e196039a26119c35a4881c7d6b2241b58b01cdc948 SHA512 ea583ea6df7d0994e13bf01fff4b99b65ac288e734d41f52bffa4ae8a83d27196622074a6a29bfbbf190125a9cf29e6602f5b4a55ccec76c6324f3ac0b1f50ef
diff --git a/dev-lang/jsonnet/jsonnet-0.14.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.14.0-r1.ebuild
deleted file mode 100644
index ea949946fb6a..000000000000
--- a/dev-lang/jsonnet/jsonnet-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 python3_{7,8} )
-
-inherit toolchain-funcs flag-o-matic distutils-r1
-
-DESCRIPTION="A data templating language for app and tool developers "
-HOMEPAGE="https://jsonnet.org/"
-SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization python"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-BDEPEND="python? ( ${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
-	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use custom-optimization || replace-flags '-O*' -O3
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		jsonnet \
-		libjsonnet.so \
-		libjsonnet++.so
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test
-	use python && distutils-r1_src_test
-}
-
-src_install() {
-	dolib.so libjsonnet*.so
-	dobin jsonnet
-
-	use python && distutils-r1_src_install
-}
diff --git a/dev-lang/jsonnet/jsonnet-0.14.0.ebuild b/dev-lang/jsonnet/jsonnet-0.14.0.ebuild
deleted file mode 100644
index 6c941fab0926..000000000000
--- a/dev-lang/jsonnet/jsonnet-0.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit toolchain-funcs flag-o-matic distutils-r1
-
-DESCRIPTION="A data templating language for app and tool developers "
-HOMEPAGE="https://jsonnet.org/"
-SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-IUSE="custom-optimization python"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-BDEPEND="python? ( ${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
-	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
-)
-
-src_prepare() {
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use custom-optimization || replace-flags '-O*' -O3
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
-		jsonnet \
-		libjsonnet.so \
-		libjsonnet++.so
-
-	use python && distutils-r1_src_compile
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test
-	use python && distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test || die
-}
-
-src_install() {
-	dolib.so libjsonnet*.so
-	dobin jsonnet
-
-	use python && distutils-r1_src_install
-}
diff --git a/dev-lang/jsonnet/jsonnet-0.15.0.ebuild b/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
new file mode 100644
index 000000000000..376e4e886d5c
--- /dev/null
+++ b/dev-lang/jsonnet/jsonnet-0.15.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_6 python3_{7,8} )
+
+inherit toolchain-funcs flag-o-matic distutils-r1
+
+DESCRIPTION="A data templating language for app and tool developers "
+HOMEPAGE="https://jsonnet.org/"
+SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="custom-optimization python"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+BDEPEND="python? ( ${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
+	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
+)
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	default
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	use custom-optimization || replace-flags '-O*' -O3
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		jsonnet \
+		libjsonnet.so \
+		libjsonnet++.so
+
+	use python && distutils-r1_src_compile
+}
+
+src_test() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	dolib.so libjsonnet*.so
+	dobin jsonnet
+
+	use python && distutils-r1_src_install
+}
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index d504fffe0858..da07149c9e7e 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -10,7 +10,7 @@ DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B
 DIST julia-utf8proc-454f60150c7f023526d353e1e6b386f93ee0b116.tar.gz 154318 BLAKE2B 6173490aa458f300f29d6fc0f22b80ccff436f4c52df2ac54786a3f518a140ab6624cef0a7221c8e3800307c9b8490a604215fcb028001b1b95e7630b62ed85d SHA512 50a19aa56edc5c023611c40e75862f4c9c08e1bfad0bac9ec64413406cff8f409ff106a37f8c66202e563cbe3ae1d5a40036b14fd309651b50c30d3f205f08f5
 DIST julia-utf8proc-5c632c57426f2e4246e3b64dd2fd088d3920f9e5.tar.gz 154973 BLAKE2B 9696fae33c408abbddd2c5741a0c98b11474c7615d6610e53be919a3cce4a58f129de4ae36bb02636e94d1e57504103e8dd3a3faad3ce7c38e1dba0f513d2d47 SHA512 dec5d7e976bd808bc8edc39dda62b85ecb462b98b6059ace4acee27ec75f6839e0a2899a9baa225379ae5ffb5b568c63a666f52c9958075e5af0376f8a284534
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
-EBUILD julia-1.2.0.ebuild 5340 BLAKE2B 232ad7e980b3c402b8cde90d704b21e0a8814c28f188b99d0b5457551d79dea4c2036678e00cf75872b33772c80b2c221cb696e207040113bc8ca44e6a59675f SHA512 8418b1c0b368f464d7a22ee0314d68b7af5c65d47e918960d879a857fccb20f77752ac5f289b292ec129f70e40b8a6ba6e3a7c6c4ddaf7799aeedaa832157ddd
-EBUILD julia-1.3.0.ebuild 5336 BLAKE2B f7f5c462ebc0a7430aa62b8660110b28a45af088496353e2a2f321f355cbf627fa88cc72a584d6ad2774edb30e6ffe626ff1c14207227ac40740cc2c1aa74a6a SHA512 35e024b18e4aeb95079de6015c84bbab4f1cba4662cf1a41cb47f1564d60a8ce4ca290235deb5830991b42658e80a1c0c181c9c61248194d85681b72f1192308
-EBUILD julia-9999.ebuild 4084 BLAKE2B 35f568105c97830c95c5f90bb7a513ef50d26eef7dd7592b3a64d1f0374aa8463b7f3cd903764b6bf0e9aae37424806d90bb8fd22a6a223c2bd4f8e1deb701eb SHA512 22d8991bf50a73d7d63f79badaa676809d221694c5a2728f3296a52bd8b4c8fda34e7b63e15abb664fed8759c0e3da4d61d5bf64d17053b8f27ed4a4f04ebba7
+EBUILD julia-1.2.0.ebuild 5338 BLAKE2B 5ad03968e4c82858711ac77e8716ee8239be0762c38422b421f9003bc9226ecb4b10aecf2454519a4d250ea66cdbb1fc1a2d7c0af0119b0409ed09e2a79b8bb0 SHA512 9e2194250cf4f1b12446d499f37e43711b9b9ebb239ae315bae50c5e1d28eecf121c4ae5bd4370ee745815c14cfbb31f9ead31283b570c0e07bff0bd6af40298
+EBUILD julia-1.3.0.ebuild 5334 BLAKE2B 7c6ba0ddc56992e25651da2d2714753b5462b59e4bed87c6e277f84d32dee2c92dbe6366dbcf76316ead85889b70c8d85ec51303ab12f6ba63f9d468c21253ed SHA512 e1de17587ecc01734dacaa941145ce10414aa5043d43cc3c4937f2e0cd6266dbe778f56ac0a4766c9f59cfc1633b56d4a1538e6dffbff29204acf4acf15e9e4b
+EBUILD julia-9999.ebuild 4082 BLAKE2B f92bf0f8ac5d56ca1f8c3f23a9460387560632e5099ae671ee2f52745cd77a3ae7747c0377ce694153bb4fab78c14ce0d2cc7ca076d4cc3ed983aad4036d1dcb SHA512 22c5387edabcc0b24e5c78fc44869855d037adad591a6529d4e2dcbef5b45c27df392aab3f0766aec92a9f5e30d9ee935cb0cd460ca98ee10f941e4c7411149e
 MISC metadata.xml 1291 BLAKE2B 98782d71b9f74e628e4e6dc5264b7bcddfb61f4ce42c4e3baa0a2ec0cc6e2ef6368d1c2b1d755972b214823533c3935b4558c79bd920072649d9072b985efcd4 SHA512 0bbe350eef4d0daaa4a971b843b4359d2513dea5e2dc9e8a3b6241ff403c043f605634615c39a3fdb2a4d090851a19d6b20ebd5c7b3886f009ade3b5c16dfaaf
diff --git a/dev-lang/julia/julia-1.2.0.ebuild b/dev-lang/julia/julia-1.2.0.ebuild
index f38f2aa63633..088ce53300e4 100644
--- a/dev-lang/julia/julia-1.2.0.ebuild
+++ b/dev-lang/julia/julia-1.2.0.ebuild
@@ -89,7 +89,7 @@ src_prepare() {
 	sed -i \
 		-e 's|git submodule|${EPREFIX}/bin/true|g' \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 
 	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/julia/julia-1.3.0.ebuild b/dev-lang/julia/julia-1.3.0.ebuild
index 07d84380fe7c..c3e62fe9d541 100644
--- a/dev-lang/julia/julia-1.3.0.ebuild
+++ b/dev-lang/julia/julia-1.3.0.ebuild
@@ -90,7 +90,7 @@ src_prepare() {
 	sed -i \
 		-e 's|git submodule|${EPREFIX}/bin/true|g' \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 
 	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index 7105dfb500b4..ec42a1aa9c9d 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
 
 	sed -i \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
-		-e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 
 	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index 2b9d875b2154..5e8462e497ba 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -6,5 +6,5 @@ DIST lazarus-2.0.2-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a
 DIST lazarus-2.0.2.tar.gz 67092332 BLAKE2B 12fdca5b0d7c8bcad4f1c6a70c2ebb1d0974b0884cf89135be069744f01527fcd5b2a4b4c898cb500519ec3518025da453087954722cab43a60c1cdb164371d4 SHA512 0d2bf26afa3128104181fbe57b1adeaba3bb589b0a3b72598507825a3f08201d4480c6cff510a6f866dca4d49417fac3a2f68ca7e58fabe4f4e3bad97323c071
 EBUILD lazarus-1.0.12.ebuild 2353 BLAKE2B 92b70e8ac8a040c9128547c343fdd0f751b5cb72c6cd59c87724151bec4c8b593ea1a04587784f368d8d16e71f13ea13d7ce2256bbd4a9a6018c6869a04a0524 SHA512 93e90953cd2d4390bb1317c3e15094f8fb11f9e000f37f46a58362a71995c6b37643056c254a05baba3294cd6067b18d2016219ae0dba6bcea4be809dc6090ac
 EBUILD lazarus-1.8.4-r2.ebuild 3530 BLAKE2B 98ad3bf609155c9171b0911812c2cbf9bb7286ab3eee9c1d6c010dec5f0fd694409eb35f0a4d67d5e27f1abe8959129c87ef13f01e9491480d44a339c976db32 SHA512 767e7a9961425daefb834eb4cec25ce9ea537eb1ed50a44fefa11be4fd703fe3747c18158b81799f7cedad25d27e26b2bef3513a9f8f7fa6eba5b21f1bb01dc4
-EBUILD lazarus-2.0.2.ebuild 3532 BLAKE2B 58c6638d6b56ae1cbe073ca05d39e480da7526818a1d1623abbc560a41e793d4d348a1009852ee87889be11d098359c31464310d5a6ab5ae039b33c31fd0bc8a SHA512 6ef47f780e9fe5aa4b49c02c9a1e3048ee5488c14ddb4bcbdc9873d1be1bd53258d414402d9ba0466a0c975f3013ff70e166e05e857f1f1ec46eb35e9a945009
+EBUILD lazarus-2.0.2.ebuild 3526 BLAKE2B 3934b5669b97b47e4dff6b5fa7ad7fa62f8793d3f5f2baac95febac1fc4be4f9e543c58aafc7ec6406748e6bfb41883d8e191e90d0dd845e6d93417675502218 SHA512 a1fdb9b116bad9aca2ae7de73ec1b27df96a7386df6fa66653a14e716f9a61e4b388fe64c1e93ad51976bac2e9481a576ae8f825258c6d1727d78aabf164c589
 MISC metadata.xml 516 BLAKE2B b4023336c3271703bc3912f9ab02eed6b57178d1f468194bdac5ac9b01027c5f7c847e776e9b1048a9ce29a4939055e3c00e289868a740c76bb2b7c0e6ff9085 SHA512 991dd36587eaa2412af0fccac7664c72a1d9153d12b313ae151943d7c66ac095b3d2cbe61fe4d84c4566e196ff11e1c16c6ffe2ab6e00fa40fc2fdfe23cee524
diff --git a/dev-lang/lazarus/lazarus-2.0.2.ebuild b/dev-lang/lazarus/lazarus-2.0.2.ebuild
index 8724ffdb8bac..0a38db636893 100644
--- a/dev-lang/lazarus/lazarus-2.0.2.ebuild
+++ b/dev-lang/lazarus/lazarus-2.0.2.ebuild
@@ -84,7 +84,7 @@ src_install() {
 		--exclude="killme*" --exclude=".gdb_hist*" \
 		--exclude="debian"  --exclude="COPYING*" \
 		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
+		"${S}" "${ED}"/usr/share \
 		|| die "Unable to copy files!"
 
 	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
@@ -97,9 +97,9 @@ src_install() {
 		diropts -m0755
 		dodir /etc/lazarus
 		cp -rf ../lazarus-package-config/* \
-			"${ED%/}"/etc/lazarus || die
+			"${ED}"/etc/lazarus || die
 		cp -rf ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus \
-			"${ED%/}"/etc/lazarus || die
+			"${ED}"/etc/lazarus || die
 	fi
 
 	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
diff --git a/dev-lang/mlton/Manifest b/dev-lang/mlton/Manifest
index e139bf56b893..dd9dd8eb305a 100644
--- a/dev-lang/mlton/Manifest
+++ b/dev-lang/mlton/Manifest
@@ -9,5 +9,5 @@ DIST mlton-20130715.src.tgz 25606142 BLAKE2B 3fa3e8cf4991faef98e23ae4cbe9e0db5ca
 DIST mlton-20180207-1.amd64-linux.tgz 18772644 BLAKE2B 7fe2d9db7edfb2d3e301be88e90b7dffe1441ff315ddac1464ef42fb436be1a9dc4e2c03fdb93880779360aed04cb7662a1a5a733f2d4158082d228f718d8b93 SHA512 74ab847ff567cde365a113f8819bae69cc18df20c441a6c6666b600980d2687faf143311f42be21a261b2493dc5c45fbecb4737c599cf767c3680afec06c2e0c
 DIST mlton-20180207.src.tgz 25003695 BLAKE2B 8cddfe83c76e05fda446917ddc85035b3d74534fe4bc597a839cd13cb59a15538f40a3f68bb8f7136f9cf8cb27a582e88ca0d14b8f7a4582a202b3bd075f3c9a SHA512 3599159950e857d257abce92abf5c548dd9c0b0cdc4ba0d7cdf9badb5d997f73386cd1ff79f563221b394dd831cb344e287927f90683b0715678edb3ca0ae15a
 EBUILD mlton-20130715.ebuild 3920 BLAKE2B 327347ad498c3b70d8d108c9ee2decf54fa3812bbec0bbc8d7eb0802edcb52b0881e8e538763334a853296e63fdc6b70c3adb23616f6b6a1a7bd95bfe789dfb3 SHA512 f5d40634f59e41015970599b3c6bf8812acb92aa21411a0a692cdef9bb6eb0de01c0bd079060c7b86a5922d9fbb4335f4ff132741b13eeba5c3aa71a9f7475c4
-EBUILD mlton-20180207.ebuild 7024 BLAKE2B 2d0c9379e5c62c4037cf1e5af55ca9da9d4948418567fbf24d15f52804143e310a31d6f80c8a75e4a06f839b9dbef40df16cb602f2cc1ad2d84d709b8261e88e SHA512 cfa3415c31a527b9274376c6cd0bcb6317a93007b0766a98ccc574696badbe2dbf2a9da31113310a532777dafba69fca232a52a9c9bd297c03befb09ebb90491
+EBUILD mlton-20180207.ebuild 7020 BLAKE2B 0ff3248b3b6b189ea02829b93aca5e3d14137a9379326d9d11501edcf91041657348717910acfb0879404f7e77e38d91bf006a15fad102e770f534e91497e377 SHA512 ebe7bbdb64af6c353df689dd00a876370ef53ea196c30be5538efa95f820d7fdcd75fc12e61524e7cd67934ffeacee1f1e4cd3462d4e936e55a0b702f55747a7
 MISC metadata.xml 672 BLAKE2B 1fd22f7212a973039a94dc14bc3f2853a7b56968d3b4a106605018ec53b45926b11cd8ee6b9ea187ea863ad5a43f8a094dc9baced81cdc57927d213ee587af6e SHA512 fa72f182a62140658bdbcc67268fd42ffe979d8370473af755fd691a156b3027002e3a80f341a4d9c2a8840d99e5140b8d4f6efb604c99bed2d6042ac811cfcf
diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild
index b8df540a09ff..c4ff66ee2e6f 100644
--- a/dev-lang/mlton/mlton-20180207.ebuild
+++ b/dev-lang/mlton/mlton-20180207.ebuild
@@ -46,7 +46,7 @@ mlton_subdir() {
 }
 
 mlton_dir() {
-	echo "${EPREFIX%/}"/usr/$(mlton_subdir)
+	echo "${EPREFIX}"/usr/$(mlton_subdir)
 }
 
 mlton_memory_requirement() {
@@ -137,7 +137,7 @@ mlton_create_bin_stubs() {
 	for i in ${BIN_STUBS[*]}; do
 		cat <<- EOF >> ${i}
 			#!/bin/bash
-			exec ${EPREFIX%/}/usr/${SUBDIR}/bin/${i} \$*
+			exec ${EPREFIX}/usr/${SUBDIR}/bin/${i} \$*
 		EOF
 		chmod a+x ${i} || die
 	done
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index ba6732ba65db..3a47961d8356 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -3,9 +3,9 @@ DIST MoarVM-2019.03.tar.gz 5136086 BLAKE2B 695e5528934002b17f547a281482dc0015b39
 DIST MoarVM-2019.07.1.tar.gz 5189731 BLAKE2B 3dde716f6911fb8392346b34763439c37866da34361875e7bf1d9d15a4e2b1d9c1dbb668c42611172dcfd6c9060f9c95ec4bac0e5ac614af3038cc4752d9b6d9 SHA512 c8ffaf962191a60f643e6e1b765ec700664988ffc629765c273baf32d2748763480f9fd7a2d978b7f99d3ba4bf962775f4dca40053ace2ddd8cd0bffbd977d84
 DIST MoarVM-2019.07.tar.gz 5187102 BLAKE2B a9c56453edf5b5834d33187aea6eabacac9a721e7a27471a02b82585560ffbb5bb8807ae8c738f3138c5b0453217ad101aab23bef2c8b727cd2f8a56574abfd5 SHA512 ff5370cb2c7dc4357825f02387757e36a5e03b711021c896043ba5f68e573308146a0d94c7855ec9b4860906a3b0720d316d119ca5bbda908f17d3f4f14f4999
 DIST MoarVM-2019.11.tar.gz 5709053 BLAKE2B 5214a041d02fa9feebf50996460b4a73634bf69dc24edbda72d29fe3045504dde809143ba6edf57602a5207e45a02e9a69cfecd2dca0bb5922e5560dca4e5861 SHA512 d7d7d21ff0e3896b7cb869ea1298f9ff1b041b68062ac509d4571246f96985de0ad48d881f7c988e1ed470c4c5f859f36916bfd764cbc0e988c249682b0b8b41
-EBUILD moarvm-2019.03-r1.ebuild 1500 BLAKE2B df181c41d8056d8de35d81b6e51f75733fb2c66ae90e1a4a134f45021a5a244162be11691df40988b755d4fd17ef9d2b35416fa394836493100ac4c5ad422afc SHA512 a6680f07bd2f048fcf3ad99d4ab4980a6259924ae271674d31b4b8296687a174870f1b839307cffdaa8329d8219aba4a8cec5d3f8cf1c0f407026ac0bb90b0f9
-EBUILD moarvm-2019.07-r1.ebuild 1515 BLAKE2B 55b2ffc73338a82251bc4b51b4399bf210c72eb1b26aa953e548111db85d0215b24c223d02bc316d8dea2cc422d07e62f70d8a3ff7e9c5245e8e42c0e987fd16 SHA512 e2da2b2e6fc0ddf405e2692facb8e544fa54d94d98c25216406c74d9dcf1990c70b363b4b6fa1a32b8b5d2b34e1e3060028fdf179825b6ab90abe288fb86d9df
+EBUILD moarvm-2019.03-r1.ebuild 1496 BLAKE2B dd7acb8efa824ca516d7d7bf3fd425bab95bb358d818e9d028be5dfbad2afd4b20741b11373c421836e1a25c56e6a4019424b30132ffe7794aa0b56a3a0ba309 SHA512 b84932ff260a2d2ab42233bd94059a8b79c6e1ffef741ae10a6caec06dd1fdeef9d53099b34560e93752afd4dcc35c2000e530412c1f66917c2c25134e77d239
+EBUILD moarvm-2019.07-r1.ebuild 1511 BLAKE2B 2468e19fbb973990426f22b4f2535e183e6c5746f060e0df25111dd154e9c63380b4f4c6ab1f9449983e58d21e69f422b235f0860c997a55779b221b4539b2e9 SHA512 47b1270295acc936b3abba458c170df4965ef50d3f3b7f05ad64465ab9f68b17889a3a93a865b6392302c23fd26efea908d0f591b48b2f49b8536109ef664531
 EBUILD moarvm-2019.07.1-r1.ebuild 1765 BLAKE2B c961aadfb1fc6bc4cf4c73821a86f65e7f3ec82025701541bc55dcbe9449c4e7e15eed7be28992b75fad058b65d936e1248a9668e1b0619e9dc53f9306db419b SHA512 3845ff95d15475502a5c9541463d767e1e00875d53589209bb02ae24e494d6ebdfed393080935d592275a8c73e73cd2f889381298b85c93abe08089e67a41b4b
-EBUILD moarvm-2019.11.ebuild 1452 BLAKE2B 332ec11c368b9859dfa0761d7efa6cce35e06c089c032f0938122c254423c52796ccf03a89663abe39529331b50c0d16439c096879a27a4c34d8ceb07d618976 SHA512 70a8cdcad28b08c530f686e33272393913250ed670b7e9980dd03ad5299578f0d0cd564ebccf8b4d465dfd28c939a8d7a93f663dcbcfe5adf7fcc4bf274bc6d4
+EBUILD moarvm-2019.11.ebuild 1448 BLAKE2B 9f59bb9a393d456f200b6919ff432c9ef205e21a5107ea61dbec92f793bab135dc6e8095caaf37ff67ee0805f3f934158ef41d482b714af49e048896297c13f2 SHA512 4c58ef20dc0c86a5ca6823adfe5d97f01d81db1dcab6914ad591540bf350a62e6340d64091d39ba810d2bbd0b62a8bbadd1c09e2ef527519a9261a21c335ab1e
 EBUILD moarvm-9999.ebuild 1765 BLAKE2B c961aadfb1fc6bc4cf4c73821a86f65e7f3ec82025701541bc55dcbe9449c4e7e15eed7be28992b75fad058b65d936e1248a9668e1b0619e9dc53f9306db419b SHA512 3845ff95d15475502a5c9541463d767e1e00875d53589209bb02ae24e494d6ebdfed393080935d592275a8c73e73cd2f889381298b85c93abe08089e67a41b4b
 MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
diff --git a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
index 70a0082df833..2357769a5f1b 100644
--- a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild
@@ -39,8 +39,8 @@ RESTRICT=test
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX%/}/usr"
-	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
 	einfo "--prefix '${prefix}'"
 	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
index fd84dc9ac68c..6b94964a1fd4 100644
--- a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild
@@ -44,8 +44,8 @@ PATCHES="${FILESDIR}/fix-quoting.patch"
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX%/}/usr"
-	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
 	einfo "--prefix '${prefix}'"
 	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
diff --git a/dev-lang/moarvm/moarvm-2019.11.ebuild b/dev-lang/moarvm/moarvm-2019.11.ebuild
index 7ca933ccf7b4..732ff5144878 100644
--- a/dev-lang/moarvm/moarvm-2019.11.ebuild
+++ b/dev-lang/moarvm/moarvm-2019.11.ebuild
@@ -41,8 +41,8 @@ RESTRICT=test
 src_configure() {
 	MAKEOPTS+=" NOISY=1"
 	use doc && DOCS+=( docs/* )
-	local prefix="${EPREFIX%/}/usr"
-	local libdir="${EPREFIX%/}/usr/$(get_libdir)"
+	local prefix="${EPREFIX}/usr"
+	local libdir="${EPREFIX}/usr/$(get_libdir)"
 	einfo "--prefix '${prefix}'"
 	einfo "--libdir '${libdir}'"
 	local myconfigargs=(
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index f17010dcc340..8dd4a2e5ffd1 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -1,8 +1,8 @@
 DIST nqp-2019.03.official.tar.gz 3951058 BLAKE2B 237b8cc0105396fc96349a0dd34502ab45fb7d02089dd2ef5aad2554610b4090adf11679271869e5ae06abfa509210959ae8762fbee30dfe6190d6a74ce32591 SHA512 248768c1b1c0f5e5bd19183404e2a1aa28ab488b05db0b1ed0f0bcceca8b9830885762e763ea38cdd2b54d975d2663e1defe236907096aabc5b668818d293533
 DIST nqp-2019.07.1.tar.gz 3937612 BLAKE2B 71f5ddadaa70d7eeadc122ef50f90c13bf7e3a1a4262069ee8564f739e99dfb780359e1155a28f61f90dd1cc419379e366d7274c9567a4319bd841005c3a51a9 SHA512 90c9cfbc3de165ba8c0b4653a849a6faafef9e3862743c3675277c25bc4578522a97a663a4ed7529831fa0b617c7412fcfe67b3e3ff1fc5994f6c42cdf7a4bc5
 DIST nqp-2019.11.tar.gz 3942494 BLAKE2B 241c4131fc94d7055b51a44b7be824fb53a00fc51370f59dcba1d92655de66e2db536c622084bf9466d9d753d5ad804411b4af07b2767ad1a4f09e065c6693f8 SHA512 3b9fea9d9c4d2ae2ca065536bcca5b483067f9e723c3a89c7e238199c0f52ea6ba23ae4429dacbd42bea69dccbbc836efe5046d1691185d5452f30912f4e6a40
-EBUILD nqp-2019.03-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb
-EBUILD nqp-2019.07.1.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
-EBUILD nqp-2019.11.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
-EBUILD nqp-9999.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6
+EBUILD nqp-2019.03-r1.ebuild 3650 BLAKE2B be60bab3e971b9b09353137f5b33499e581dfee0226af432b457bec3b0577c841b931f7bdb2dbec19f0a3c45a80ae34afb12a89c7861f9ed9df104b1b1958a08 SHA512 d2d1f4e2aeed46bce88b8921a5dc4aa5a2e5a1edfe92bf9ea9860beec0ad99b1a1e415d000ed800143907e37cf46c4ef62f7bd626e64dc2df5b3c6cfabf97875
+EBUILD nqp-2019.07.1.ebuild 3647 BLAKE2B 4fc52fad82ab690c4aa2b875db7b39ade3b7008a457b16e4af7a32a6fd4d8fb471e025e3c7e4901a0b5347d8dd6abd08f4bfa3907164229707333d17b44d24c5 SHA512 06301416e81ab6963bd4e3fdca4fd925f83f0e090f6ba7357eb463ac05e7f02c3b1c1a985adb6e004cb0cb85b9c3dc8d07191ddd6d7a279e73ea85f6c3e371c5
+EBUILD nqp-2019.11.ebuild 3647 BLAKE2B 4fc52fad82ab690c4aa2b875db7b39ade3b7008a457b16e4af7a32a6fd4d8fb471e025e3c7e4901a0b5347d8dd6abd08f4bfa3907164229707333d17b44d24c5 SHA512 06301416e81ab6963bd4e3fdca4fd925f83f0e090f6ba7357eb463ac05e7f02c3b1c1a985adb6e004cb0cb85b9c3dc8d07191ddd6d7a279e73ea85f6c3e371c5
+EBUILD nqp-9999.ebuild 3647 BLAKE2B 4fc52fad82ab690c4aa2b875db7b39ade3b7008a457b16e4af7a32a6fd4d8fb471e025e3c7e4901a0b5347d8dd6abd08f4bfa3907164229707333d17b44d24c5 SHA512 06301416e81ab6963bd4e3fdca4fd925f83f0e090f6ba7357eb463ac05e7f02c3b1c1a985adb6e004cb0cb85b9c3dc8d07191ddd6d7a279e73ea85f6c3e371c5
 MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0
diff --git a/dev-lang/nqp/nqp-2019.03-r1.ebuild b/dev-lang/nqp/nqp-2019.03-r1.ebuild
index 663242f61de6..9e1f45775e4c 100644
--- a/dev-lang/nqp/nqp-2019.03-r1.ebuild
+++ b/dev-lang/nqp/nqp-2019.03-r1.ebuild
@@ -70,7 +70,7 @@ nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
+		"--prefix=${EPREFIX}/usr" )
 
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
diff --git a/dev-lang/nqp/nqp-2019.07.1.ebuild b/dev-lang/nqp/nqp-2019.07.1.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-2019.07.1.ebuild
+++ b/dev-lang/nqp/nqp-2019.07.1.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
+		"--prefix=${EPREFIX}/usr" )
 
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
diff --git a/dev-lang/nqp/nqp-2019.11.ebuild b/dev-lang/nqp/nqp-2019.11.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-2019.11.ebuild
+++ b/dev-lang/nqp/nqp-2019.11.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
+		"--prefix=${EPREFIX}/usr" )
 
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild
index c6689cf62d83..4ff2af45cef6 100644
--- a/dev-lang/nqp/nqp-9999.ebuild
+++ b/dev-lang/nqp/nqp-9999.ebuild
@@ -71,7 +71,7 @@ nqp_configure() {
 	pushd "${BUILD_DIR}" > /dev/null || die
 	local myconfargs=(
 		"--backend=${MULTIBUILD_VARIANT}"
-		"--prefix=${EPREFIX%/}/usr" )
+		"--prefix=${EPREFIX}/usr" )
 
 	perl Configure.pl "${myconfargs[@]}" || die
 	popd || die
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 05ea977653db..853dc435c8b9 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -9,5 +9,5 @@ DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B 5e76a198c2f5ca9f231d4e80499d784cf061ec
 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
 EBUILD ocaml-4.04.2-r1.ebuild 3534 BLAKE2B 7b1c23d8a4476a5ddd836119182e94f0407a6e66e3b38fc7e1474cf1b6c94142b0d0f1cd460d02bd6e990d9ecd7c91d8daf85e6594d884e2f0716d328fa781eb SHA512 4226e995d65e48c2d0ceb5836273e777dbabc072042f5771ae8acc4f3520326d88dd3c6706a6940fc65cac571e80c24973c780226c58a499bff921967cce595d
 EBUILD ocaml-4.05.0-r1.ebuild 3692 BLAKE2B f8f81b2c8127e5e3b8fc4b37ce9e0e01bf63e4b09c0727d20dfe36dd038ff4261f3383d7f63710eb73405d5eb6b6ab348bd88bc62665b8be7aee34b9a89c1802 SHA512 ab7bc8419507ff59eed35628183a0ea79319648adee66ec42313ad74df8b5a0c1e87db273cbe87d9e67b19a900eba0c473d3e167afc9c97490cb496b4c529cb4
-EBUILD ocaml-4.09.0.ebuild 2193 BLAKE2B b2073368e0c56d8c863ead457d79027cf17cc9bf74c59d9abff80486792991851f16a6cff0d2f4c887718aa67b58d2baf7c3063b36bb05bf2b675715186378de SHA512 4ad10bb3e1a07475eaef4664dd59cf4b377ef7c9942a3222f2405d7e4e4acd582b463a3468501076cf0ec00d382b38f7934be1b0e9e17999b54a1f8911deb9a4
+EBUILD ocaml-4.09.0.ebuild 2190 BLAKE2B 6875ad0d7d302913d414ac00499a3cdf9f63553445bdb9cefeb80c78ac0196368efa034014f6e4a2fb6770d9bda13baeb3eed447d98d71db4b305a978a1f825a SHA512 f397d49371d05cd66fa5693a37ffddc67f40012dd1c27fca79946838b8caa7953f478eacbffd1e2fc7d08a9c7e1e83725020a2a4871806a6ea21f03d43dd96d5
 MISC metadata.xml 605 BLAKE2B 30bf74c9300280f432ca8ae675b756e9b95a8e683c56eebae7fab890071c616bcc2a2fae516e31c593c0e626061aba603909b073ff6c3fea4d09e7fce40f3f83 SHA512 298d96d5685b1e79e1baab1e393ef083fa270d147a24ae2a35fa424b311dbf45931673dbf44974a946cd3423d62ce66df6d36017dcf6cb3275770c1cf6215c10
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 5fb59fc6617a..04659b733643 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
 
 RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ccdc4b17dc52..8f56c7739f9f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -24,7 +24,7 @@ EBUILD python-2.7.17-r1.ebuild 10497 BLAKE2B c4007d0d091dc763664cac39d4f47dad659
 EBUILD python-2.7.17.ebuild 10793 BLAKE2B 8e177e52f5c0e00f1f0706b7546de6ca45ad0620567c3bdf510d0116490690c5b478a13af5fd99c236ca853e50084ef8b5903f83120319ddd6a7d8fca4cf3a4b SHA512 83836dd7dfc8cd96bd197baf26c328ac19a13bda8c18936820f47199f334b07c083c72a2144994733b1f481d9da158070fe3d09e669bd48d8dfae0228bb5e793
 EBUILD python-3.6.10.ebuild 10252 BLAKE2B 04910bc0dbf490aec1d21c7038264d2c2691cf9cffc5cb5534c14d6c5e4c04580acc19af99d19b25c81f184052a6945618110afa50123d8e81518d3f485d34ae SHA512 0cfc0d7d36d431cd8c127e59cf04679268b579d45607ab41e6383c8074e4c4741ca626ae453d6774f13dcec137128072182c8c1132be791ff65f368a7bee51e7
 EBUILD python-3.6.9.ebuild 10161 BLAKE2B 9c93e878bfeec83b33b0234882310bf6097ac6102c120ea71f2a9b31e7c6c1960d5a2223db22eb559f2d47e614b5c2b8355c79d35cce64b20ae30fd024997bfc SHA512 ec747b255d4a7ca6165301314294c8dd5f811849b99e1157aa99402a308ed3447342951229f4393a6ef8e7db0831dc4604d1c7bb8084f48689f0c813b27fb57a
-EBUILD python-3.7.5-r1.ebuild 9781 BLAKE2B c1da8b6b8ad94904c04a46d041ede5fa5ea01118d25372e688ddc796507ef1346956ab1b8f5e8181f1687f877f779c9c250229b36ce8612c1207e277df0ed1c9 SHA512 585096c63e3748d024afb1d5ed6367890d49ef3801286f568ad31bd9b4d5914884be11728e6d0a15449c410a4656250a692eb0ac0ade6dfb167b1f627d862d77
+EBUILD python-3.7.5-r1.ebuild 9739 BLAKE2B c1af21f063ff4565358d3fdf91192d10e4248d782376e08913dea711840c83d1a39becf1fc446da2c81ac4f118fb68fdecad32d6e6580efb369475eb22f07348 SHA512 11c197ce4609bf5c98bb7938cb30d3a9e9da2d4bb183f113cc6b356e90b58e9eca472912dcc92271ea9e0839dafe8c94c4c53c34543c7eae83dbe32afaba9864
 EBUILD python-3.7.6.ebuild 9799 BLAKE2B bfa59f2a845fcf21fdb0c5e14267a681630525ceb15ba0f327043f428849f986e1dbd97a94d37180b643d38da9210d37b0bbe6788ed2571869da2dd8852e5ebf SHA512 e1fe9798ed68542bf5a704560ed871446b4b8b06ef0d92542fe7a18f85f081047a072650de554139fbbe5ce4fcb4ffa93458aade81f99a1e9d685adf1c29dd9a
 EBUILD python-3.8.1.ebuild 9839 BLAKE2B 2b411d16fa95019629fd91851c19375c2c8a729e24a77020c2c26f4f6d5e09bf88f8f1577c7e82f29d363e17214979fa393b1af94f6c8a6f98674b56b904237e SHA512 3121a9fad103e086e76d8885ac0094a0667a2f586b5715214b6b2c02b1f8bc247378d1397c7e8b7daf14b7004a7ebbbb7cc43405e523c99c34e1f6bbf413e27a
 EBUILD python-3.9.0_alpha2.ebuild 9333 BLAKE2B 95107bf9aefccf8156a7ada79d1dadc2834d4a162b5fbbff8d01e479172816a719556f52f3c1dbaeb579d075447c80013a5a63915b1ca9ce264117ef2978f28b SHA512 aa9b91ca9285c47cb65bc55c3067c2a77ed176cd74a0e41b23348ca7ffc9dc8367b6e8a8fd8e816369a215a16186c6f3d135ef8279a70fbc4beae6a94bfc9893
diff --git a/dev-lang/python/python-3.7.5-r1.ebuild b/dev-lang/python/python-3.7.5-r1.ebuild
index aca8d41b662c..b28c4a75d3f9 100644
--- a/dev-lang/python/python-3.7.5-r1.ebuild
+++ b/dev-lang/python/python-3.7.5-r1.ebuild
@@ -201,7 +201,7 @@ src_test() {
 }
 
 src_install() {
-	local libdir=${ED%/}/usr/lib/python${PYVER}
+	local libdir=${ED}/usr/lib/python${PYVER}
 
 	emake DESTDIR="${D}" altinstall
 
@@ -211,13 +211,13 @@ src_install() {
 		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
 
 	# Fix collisions between different slots of Python.
-	rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so"
+	rm -f "${ED}/usr/$(get_libdir)/libpython3.so"
 
 	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED%/}/usr/include"; echo python*)
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
 	if [[ ${abiver} != python${PYVER} ]]; then
 		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED%/}/usr/bin/python${PYVER}" || die
+		rm "${ED}/usr/bin/python${PYVER}" || die
 		dosym "${abiver}" "/usr/bin/python${PYVER}"
 		# Create python3.X-config symlink
 		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
@@ -228,13 +228,13 @@ src_install() {
 	# python seems to get rebuilt in src_install (bug 569908)
 	# Work around it for now.
 	if has_version dev-libs/libffi[pax_kernel]; then
-		pax-mark E "${ED%/}/usr/bin/${abiver}"
+		pax-mark E "${ED}/usr/bin/${abiver}"
 	else
-		pax-mark m "${ED%/}/usr/bin/${abiver}"
+		pax-mark m "${ED}/usr/bin/${abiver}"
 	fi
 
 	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	use tk || rm -r "${ED%/}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
 
 	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
 
@@ -255,7 +255,7 @@ src_install() {
 	sed \
 		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
 		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
 
 	# for python-exec
 	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
@@ -274,26 +274,26 @@ src_install() {
 
 	# python-exec wrapping support
 	local pymajor=${PYVER%.*}
-	mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die
+	mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
 	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die
+	ln -s "../../../bin/${abiver}" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
 	# python-config and pythonX-config
 	# note: we need to create a wrapper rather than symlinking it due
 	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+	cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
 		#!/bin/sh
 		exec "${abiver}-config" "\${@}"
 	EOF
-	chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die
+	chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${D}${PYTHON_SCRIPTDIR}/python-config" || die
 	# 2to3, pydoc, pyvenv
-	ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die
-	ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die
+	ln -s "../../../bin/2to3-${PYVER}" "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
 	# idle
 	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die
+		ln -s "../../../bin/idle${PYVER}" "${D}${PYTHON_SCRIPTDIR}/idle" || die
 	fi
 }
 
@@ -304,11 +304,11 @@ pkg_preinst() {
 }
 
 eselect_python_update() {
-	if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
 		eselect python update
 	fi
 
-	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
 		eselect python update --python${PV%%.*}
 	fi
 }
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index d9c3e78d0d14..0c5186ca2464 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -81,10 +81,9 @@ DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec2
 DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929740c32893171dd9b8620992439e45730ef6f9489a6fc411ff5884c661ac4c07b7b93f5a4174207ed53351d2dea09bf SHA512 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0
 DIST rustc-1.40.0-src.tar.xz 92306352 BLAKE2B 762b9592414e5c816540f6fd37d07b3b0ffe97a151968cc8ae77be2fda03a6d66905192985edc65055cc7811dbd90faa2b2c056481f72161c6f7ccbcce13671a SHA512 b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
 DIST rustc-1.41.0-src.tar.xz 93763052 BLAKE2B a68524fb6e3abb43d52ae6676a1e9de1c5d33606eaea6e93bb518f10b196d620f2f370c631c32e39a624af71a3bf6911662a9df7eecb8dde78a20c8054a349fc SHA512 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd
-EBUILD rust-1.37.0.ebuild 9491 BLAKE2B cb0b7ce4ca176553f2c95e8a6882c094859cbafdd0ceae500881439b009509c8ab53937a9d0046a9e917b84b723d1c88ff1a5fefe67415bbf4e8e539a7458e24 SHA512 aed6a69c6aa64477454ebb4117ceb71d6459464bbbdacd3848a894b1d3e529a8b2f0ac905aa1273eade42363cb2f4896cf49ad6951716b4be1926229c3bb8ce3
-EBUILD rust-1.38.0.ebuild 9449 BLAKE2B ad10ea725f4f9c1f778abe1109a15cf2e7b78a3086be542aa62a392243def613524de76689a2a3e12e5ff1b7a72443d4233821c749dc6572d08f95b4be3646b8 SHA512 6fc125a09a5ff3c550f6ca8346324fa6ff9b4a5b5e9afa50ce2922cb2fb8372e7465c668f51d9ed52bfcfd122212da67e3af2e133fa66cbebb9d617eeb6f1926
-EBUILD rust-1.39.0.ebuild 9597 BLAKE2B 4c7569cebc1f93cd694e98a2e9e94fec83198053097f5c08d0cf70009afcd1a1eb2c22ae8b81b731ea0ab726f02350d6959f817bd82027c72595fa1f0e176d42 SHA512 2dffa0a453283248a6c898312fd3be84d541db7ff4783f4328fcb8ac6eef9b6417df194a64fad15327c7bd373e8639230fc6b2335d52611fde69fb6e12e032a3
-EBUILD rust-1.40.0-r1.ebuild 9872 BLAKE2B 8769ee796ec010b377e08c8e31035ab8da964821424b9bb9b6c4b897a045cf7c8fa5162e3d27368bafc2f27403ce31d47c5d0beb363d04df4cfe7c3d19f29d10 SHA512 b1f8282f9d72471e6619065e3da400e4959853a491688b6aba653d388cdaa2211f62876cd201b48eceff07f7d6d62422c9ca131d7a85c711c3beb73e581e7772
-EBUILD rust-1.40.0.ebuild 9583 BLAKE2B a1bd9b055aba6a304c31bca24218e1618ff21649fd15f098de0891b18efe580b34edaac4f03ec7f0cb32c3928bfa15ae5d99b25b1f603178dbe1e5fae789c6a3 SHA512 bc9d7cd58a2ef161517061a1790c0cc4dd40ff54a206e62d9481cc449997ef8d96ea36dc496a0ea0efed0cc51463ca086ee1bbfdc94066f2b13ed5a757bb5249
-EBUILD rust-1.41.0.ebuild 10133 BLAKE2B 5f25e84d4723a17da328684bf4642653812d21eabf8e81ecf263c2c658c422f568a26027269779e9dafe54432f9b26c20b2e4ce47efd1b9abe8110520d2952b2 SHA512 3afce1b354e918a00529b6ec90f70acd043f0595fa7b8a1332ec22fc88fab9c6a0fbaec2849ba582b918907f0485791391d0cfd13b8e30d024407f33ab76a5df
+EBUILD rust-1.37.0.ebuild 9481 BLAKE2B a5348fff749d7ec0e36fdb49aac73af9ab0b838bd72c57e76c475705afedebf515f553dcf7fd36680266a8a8601abdc04ccd93b1881c4d39a2bf86b8e7077f1b SHA512 38ac15f899841ef3e59293bf8a26242825c0a73cbba255a86f3d83ecd609497538ad86ed1fa8533975db183a9d6e38408f7c960a7c9c20882ddec60a42668d1c
+EBUILD rust-1.38.0.ebuild 9439 BLAKE2B 6e9f86c2dbd9a31df3f8203b239da85ab2dcf702609c4c189ed9ac1a319dc8630691e21e64873cb99ac1bd8521cf20b4731938492dbbce5121f613e8b7f64cd9 SHA512 d7f3d0bc258d0acb66cc6552c1da21a441399ff3249a380d6e835e1423763daa3e6c7e29c886f3f51d9017b44c9abf4c96912d8472ced46c748d57be4a6afbf8
+EBUILD rust-1.39.0.ebuild 9587 BLAKE2B 14aaadef0d43324ce8f530a93ac651a7e98e3e5014ac62bda1a860ae2f71f65a8a6f3cdb0ccc7662f7f63d9bb7f5afd5a8d388a16022b8114ab7ccce15ba119a SHA512 d83a106687255aaa099d352e389f6dc788f0aaec424b7558058222bd608949e890c6e6885968e01f65376b3633f4e48e7327369ebbbfb49f71bcd46afce585be
+EBUILD rust-1.40.0-r1.ebuild 9862 BLAKE2B 9db4fcdee5d3d87b6ab651575d7c5039c41eda95c32cc12623ff70cb02b16c228a727767048252ff9daed49ee611101044fba00ec3df5e99a26643397bfc9f3b SHA512 8ad7759e2786169836bb4f96416ea7bf1faf0fa24feae0772823ef75198b7463396b30460a47025200d91d5ebb1562c550965cff0a06410ac8a8aaf17ba9384a
+EBUILD rust-1.41.0.ebuild 10123 BLAKE2B bd79623ea59f8437b905cd6ef55d65d2d69a2513d11ee6dbc8798e795872c40da850074b7437818e96ef0e32d75df6f9ab3de097257160894e1758a2ebb1785a SHA512 55d74141bddab804764e7a77e0464255777025aad5fd3c98c5ae5d262935fb39c45f4f224493ef178eb11e5a6fbc39fefffedc4054b0e2204854f5d24eeace40
 MISC metadata.xml 885 BLAKE2B 0c22dd218172717e47fba5c3294746470a9adcba729a3585937748ef8e4b8ea118e036753c332eace3dbc6ce82406c15f35948d1857485abe7761c7e4f299c1b SHA512 56f1535f91d2d0126ee70d42ef0ac3ac0e491ce1c539a159db6c429104881227676f6e29412f090631e728093b0902d330c00a8d4d8027c1a07e3632c8e36435
diff --git a/dev-lang/rust/rust-1.37.0.ebuild b/dev-lang/rust/rust-1.37.0.ebuild
index 542c7dc00d17..f7294f8494a0 100644
--- a/dev-lang/rust/rust-1.37.0.ebuild
+++ b/dev-lang/rust/rust-1.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.38.0.ebuild b/dev-lang/rust/rust-1.38.0.ebuild
index 23b7ca132b18..c4e9d3cf9ee9 100644
--- a/dev-lang/rust/rust-1.38.0.ebuild
+++ b/dev-lang/rust/rust-1.38.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.39.0.ebuild b/dev-lang/rust/rust-1.39.0.ebuild
index d369e43890ff..caf6bb4b5809 100644
--- a/dev-lang/rust/rust-1.39.0.ebuild
+++ b/dev-lang/rust/rust-1.39.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.40.0-r1.ebuild b/dev-lang/rust/rust-1.40.0-r1.ebuild
index 8be040d0227c..8ac9b0156ead 100644
--- a/dev-lang/rust/rust-1.40.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.40.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.40.0.ebuild b/dev-lang/rust/rust-1.40.0.ebuild
deleted file mode 100644
index c4338e1d3c5e..000000000000
--- a/dev-lang/rust/rust-1.40.0.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-else
-	ABI_VER="$(ver_cut 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-fi
-
-RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="https://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
-	$(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly 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="clippy cpu_flags_x86_sse2 debug doc libressl nightly rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling more than one 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. < 9.
-# 3. Specify LLVM_MAX_SLOT, e.g. 8.
-LLVM_DEPEND="
-	|| (
-		sys-devel/llvm:9[llvm_targets_WebAssembly?]
-		wasm? ( =sys-devel/lld-9* )
-	)
-	<sys-devel/llvm-10:=
-"
-LLVM_MAX_SLOT=9
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-libs/libssh2
-	net-libs/http-parser:=
-	net-misc/curl[ssl]
-	elibc_musl? ( sys-libs/libunwind )
-	system-llvm? (
-		${LLVM_DEPEND}
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	dev-util/cmake
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-eselect/eselect-rust-20190311
-	!dev-util/cargo
-	rustfmt? ( !dev-util/rustfmt )
-"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
-	wasm? ( llvm_targets_WebAssembly )
-	x86? ( cpu_flags_x86_sse2 )
-"
-QA_FLAGS_IGNORED="usr/bin/* usr/lib*/${P}"
-
-PATCHES=(
-	"${FILESDIR}"/1.36.0-libressl.patch
-)
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-pre_build_checks() {
-	CHECKREQS_DISK_BUILD="9G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="14G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-	python-any-r1_pkg_setup
-	use system-llvm && llvm_pkg_setup
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
-	done
-	if use wasm; then
-		rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
-	fi
-	rust_targets="${rust_targets#,}"
-
-	local extended="true" tools="\"cargo\","
-	if use clippy; then
-		tools="\"clippy\",$tools"
-	fi
-	if use rls; then
-		tools="\"rls\",\"analysis\",\"src\",$tools"
-	fi
-	if use rustfmt; then
-		tools="\"rustfmt\",$tools"
-	fi
-
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	rust_target="$(rust_abi)"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		experimental-targets = ""
-		link-shared = $(toml_usex system-llvm)
-		[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}]
-		verbose = 2
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)/${P}"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debug = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		default-linker = "$(tc-getCC)"
-		channel = "$(usex nightly nightly stable)"
-		rpath = false
-		lld = $(usex system-llvm false $(toml_usex wasm))
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(rust_abi $(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
-		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
-		if use elibc_musl; then
-			cat <<- EOF >> "${S}"/config.toml
-				crt-static = false
-			EOF
-		fi
-		if use system-llvm; then
-			cat <<- EOF >> "${S}"/config.toml
-				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-			EOF
-		fi
-	done
-
-	if use wasm; then
-		cat <<- EOF >> "${S}"/config.toml
-			[target.wasm32-unknown-unknown]
-			linker = "$(usex system-llvm lld rust-lld)"
-		EOF
-	fi
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		"${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \
-		--exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
-}
-
-src_install() {
-	local rust_target abi_libdir
-
-	env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \
-	--exclude src/tools/miri || die
-
-	# bug #689562, #689160
-	rm "${D}/etc/bash_completion.d/cargo" || die
-	rmdir "${D}"/etc{/bash_completion.d,} || die
-	dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
-
-	mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
-	mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
-	mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
-	mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
-	mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
-	if use clippy; then
-		mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
-		mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
-	fi
-	if use rls; then
-		mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
-	fi
-	if use rustfmt; then
-		mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
-		mv "${ED}/usr/bin/cargo-fmt" "${ED}/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=$(rust_abi $(get_abi_CHOST ${v##*.}))
-		mkdir -p "${ED}/usr/${abi_libdir}/${P}"
-		cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
-		   "${ED}/usr/${abi_libdir}/${P}" || die
-	done
-
-	dodoc COPYRIGHT
-
-	# FIXME:
-	# Really not sure if that env is needed, specailly LDPATH
-	cat <<-EOF > "${T}"/50${P}
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}"
-		MANPATH="${EPREFIX}/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	# note: eselect-rust adds EROOT to all paths below
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-gdbgui
-		/usr/bin/rust-lldb
-	EOF
-	echo /usr/bin/cargo >> "${T}/provider-${P}"
-	if use clippy; then
-		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
-	fi
-	if use rls; then
-		echo /usr/bin/rls >> "${T}/provider-${P}"
-	fi
-	if use rustfmt; then
-		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
-		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
-	fi
-
-	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}."
-
-	ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
-	ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
-	ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
-
-	if has_version app-editors/emacs; 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 use elibc_musl; then
-		ewarn "${PN} on *-musl targets is configured with crt-static"
-		ewarn ""
-		ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
-		ewarn "to use it with portage, otherwise you may see failures like"
-		ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target "
-		ewarn "x86_64-unknown-linux-musl does not support these crate types"
-	fi
-}
-
-pkg_postrm() {
-	eselect rust cleanup
-}
diff --git a/dev-lang/rust/rust-1.41.0.ebuild b/dev-lang/rust/rust-1.41.0.ebuild
index 0139d999763d..064abcea32b3 100644
--- a/dev-lang/rust/rust-1.41.0.ebuild
+++ b/dev-lang/rust/rust-1.41.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest
index 30064862181e..5880aff4522f 100644
--- a/dev-lang/smlnj/Manifest
+++ b/dev-lang/smlnj/Manifest
@@ -25,5 +25,5 @@ DIST smlnj-110.82-smlnj-c.tgz 10544 BLAKE2B 6c096fbb8a8f135ac0fac1b4be6c4e4521dd
 DIST smlnj-110.82-smlnj-lib.tgz 449307 BLAKE2B aa6d21c608d89fc8696075ad13fa5179ee9a80a54f8dd8a446fa148065807a4094048b6da3537c222ff59cf0a6f837706cb6797d0873ac126ca0a3d743b5c7c7 SHA512 9e85b09e8bb4b253da7f0bea44bed55792a022967aa550e3ab0203566b84c6b8e126d91d4a0365c9bdb618d8e5bc1643ecd74ae30d750ff002d81dfea1c809ed
 DIST smlnj-110.82-system.tgz 240758 BLAKE2B 0903bd45a042c4cc5d327a88680f33f44128c1c9c929699813e3c7ba9b88975407b0b7b37b9048090c043485e8f144207529b7575904aa197122851d877b42b9 SHA512 b39fd42fd7418dee86accba9759dc3bb61234ff66ff695a2487c0e98b5640d5256e14edb7e23c8541e17ae35f7c9b27c7c1551d448c1383f61c33b20585a7662
 DIST smlnj-110.82-trace-debug-profile.tgz 3911 BLAKE2B c025b55430519123f4fe7907d45184cd31d0d72d89e1c5f0b8793fa4c59089b7e10f73c740b0eba3bfb39d2ec0e709a9f43482a6143d93b5128239833ca18619 SHA512 47af805b930d0c540139062c3ce3d1ba504e918c2f7817cad52bbae9e16ddc1dfea96f3058ae74afd247113101d59617d2098bfab8e38c701616c12f4610855e
-EBUILD smlnj-110.82.ebuild 4204 BLAKE2B 44b04a0b1836c33d7f7a039e807834b7299e0b25daa3616dada6e3619ba8ba5f597d10582f5aa80dc6c20010ae32df820b493729739332e13361f63ed8ead3d5 SHA512 25d8c7a2cd75c559cf2c10b0b8d9f58563f0d572e70d3d93c3bf2548bb847a0e1c6a3268960eae35d367ab04af8ba2ccc9bdd706d85a14bdf06ea28aed2cdc26
+EBUILD smlnj-110.82.ebuild 4200 BLAKE2B 4f5da1f765c700bf31e3584e47a483afbaf41d6a85209618152eb374e829c959dc7a11c3e3d2810c52d954741efa26f1724e8d76625cbae66cd79cfbd99b089f SHA512 d1f060601805bd94facd7aef8a29878bf75f34fef99b2c529f5765bdaec6d5d426c1e72393f0700fcf4f16548ff527621ef5c813fb6cee34b92357e9c7154c1a
 MISC metadata.xml 296 BLAKE2B b960974c19f1a7f63d9755b65e9a319ad98e63fa23856d1f7b09ce80e9208cd629b639c9151c66d93c3199fb27036aa66bb996bd6e5a1d64e04c8e70dab958e5 SHA512 58fd1a4bf8d782d051b535d080c218594953d6c8231d3424e32fd051939f3febbb4678d69109950eff746b5012b941189858aa00b5181fcfb31876bc3f9d09b5
diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild
index 1df1108e8973..1f7c23a57126 100644
--- a/dev-lang/smlnj/smlnj-110.82.ebuild
+++ b/dev-lang/smlnj/smlnj-110.82.ebuild
@@ -137,8 +137,8 @@ src_install() {
 	SUBDIR=$(smlnj_get_libdir)/${PN}
 	DIR=/usr/${SUBDIR}
 	for file in bin/{*,.*}; do
-		[[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX%/}/${DIR}" \
-								-e "s:${WORKDIR}:${EPREFIX%/}/${DIR}:" -i ${file}
+		[[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \
+								-e "s:${WORKDIR}:${EPREFIX}/${DIR}:" -i ${file}
 	done
 	dodir ${DIR}/bin
 	exeinto ${DIR}/bin
diff --git a/dev-lang/snobol/Manifest b/dev-lang/snobol/Manifest
index c692aedb0075..1147a5204043 100644
--- a/dev-lang/snobol/Manifest
+++ b/dev-lang/snobol/Manifest
@@ -1,5 +1,5 @@
 DIST snobol4-1.1.tar.gz 677333 BLAKE2B a6ccecaa66657438b2c05dfca9f7db95270b4d1a3502ad06c8d217d50d54ac33b0195eb8b2e045ac0b6c49c19a5bf3ee46e4a35b45555d67fc669317c7a5db2b SHA512 ae8482bc64f3d9020dc4d7e390296114e7498ef2764ebb69b6c4960d0c1b01daf4d77dff1aa583231a7f50d4c54f7f72cedc3e4744b03f4b2370fa6de837a3cc
 DIST snobol4-1.4.1.tar.gz 736837 BLAKE2B bb86d2cd3788ad66b7246d86ebd9f289189f5bd059238d2df3fb621aa4a1e910a8ad029f482077eb78916a84c3a28d868e8ac6eef83b48d7f09a8964c57a855d SHA512 5413af10018141e93f05c9ea637711bb3981f2b67557691d05dde8911178d90900f0fdef6c1d2416ebdda6afeeabd21b9e371b6711b2d093df629cc865fc61f9
 EBUILD snobol-1.1.ebuild 1434 BLAKE2B 77b38c81c661e550885fdb8cb7fb9f07e84cb30be582f8032733e7de30baf384f665334ed5006a4ed5b940c8c4431555523def324c931d36a14f083d62a1c431 SHA512 151cc5ab28dbe1ebbfe2fd48ac6e69ff6bcfbc51a90ea311a2031eb86ac91dd9f0367a728ae33d719b830116fbf776a65d5c74157fa56dceebfe7af7324871c2
-EBUILD snobol-1.4.1.ebuild 1302 BLAKE2B eb28b53e6a4071bbec2f66f850413175095d045b9e17b8366ac29b322b5a87563a678797f718ca83369a7cb8e9e76c8e23aef7f4a658d905f037fa517fff0a55 SHA512 bcb949cba285031b7c4198b84c8db713305aba2c02640c13b802e4a624a837999da0c21d29f79afe50e406ddb6543ffcfd698bc74dda05f1ba79b3c3eb30d14a
+EBUILD snobol-1.4.1.ebuild 1296 BLAKE2B 5f572a43fe4650c78939c1b60688b8946ef0032586d8126703528b4960b43d565b916241c68bbe6dd86fd5e43bf8a84691870e88ead10bcd712dd80f80ea0da2 SHA512 770c5ee6ba5b5a215b193173f13682bfe815cb52165356ac78a17fd8fc25bdfe48dfdce11900db89dfc1f3ba679e4d000561d2c5187d001672188ccc31562804
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-lang/snobol/snobol-1.4.1.ebuild b/dev-lang/snobol/snobol-1.4.1.ebuild
index 3e9ecb949052..0a29b17c94d9 100644
--- a/dev-lang/snobol/snobol-1.4.1.ebuild
+++ b/dev-lang/snobol/snobol-1.4.1.ebuild
@@ -35,9 +35,9 @@ src_prepare() {
 }
 
 src_configure() {
-	./configure --prefix="${EPREFIX%/}/usr" \
-		--snolibdir="${EPREFIX%/}/usr/lib/snobol4" \
-		--mandir="${EPREFIX%/}/usr/share/man" \
+	./configure --prefix="${EPREFIX}/usr" \
+		--snolibdir="${EPREFIX}/usr/lib/snobol4" \
+		--mandir="${EPREFIX}/usr/share/man" \
 		--add-cflags="${CFLAGS}"
 }
 
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 49e995614022..58330257f7c9 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -23,8 +23,8 @@ EBUILD spidermonkey-1.8.5-r6.ebuild 4449 BLAKE2B 3d50207c4360110927f6c733e2fa71a
 EBUILD spidermonkey-1.8.5-r7.ebuild 3809 BLAKE2B df2d3780b076fd188b9d55a8c702fa436097c1c01aa03321c2c33e57f2dfb0dfafcaf1926f3823c885e2d4b0cc03c68244a6baf2b0f843fb49ea7c2f40222a04 SHA512 2ee2e5f9e94e55354cb75a976e1dd7a737c7bc676202ebbac353afd616d5ac1cf221aab0897bb6135ebbdfaaddfdd9d8ca63c7e35cec8e6d478640a9d92e509f
 EBUILD spidermonkey-1.8.5-r9.ebuild 4013 BLAKE2B 5cc1b137f41e08eafda73b3006b617b0b99fbdce2052aa6949a84e3b09b4fcea995a50a3782c1cb8aa3e01588ecc74796e582b2d44fa16cf38a2ba30ae1b3d74 SHA512 853e2429bb08f91f13e60371eee227e89e629f28de7c269779c543534801a31ddedc410fb0b48b52b17668cf1d3d0f9b5e178c53a58415988ea41ca10a99fe81
 EBUILD spidermonkey-17.0.0-r5.ebuild 3567 BLAKE2B 0a7ba31cb4a586e001a723bad03f4da059bc51576cd3f14a63391e0d66ce9a41d4c44cb4ebc540544ea4d73d7dbff8ea591d16673c39d9560b33f7d4c970f42e SHA512 adcdb926324e4feac59a4d01cbd29937fdf16d9c1b2e2e045a44105903d7e7d757b7f69f80fd67ac00504f5d99705ce3394d0c2965d72f544c751c16e7e74be7
-EBUILD spidermonkey-38.3.0.ebuild 3876 BLAKE2B 68310401f93a81b7e6e9df9aabbf526577fcbb0fcde132663ea35b5344e3d946d3aff19d5dd0bca8618baaa8661d59d38a1e836a8398296ec595a0af3507f79c SHA512 fb5c0f45a208d12bf51eb9c1b8a1e0a508a422588c61e5c37d5068169032f08d5cf707438d3564ffbb3ed839412d099ab2af84745c09e0b579391d362eef0cd0
-EBUILD spidermonkey-45.0.2.ebuild 3983 BLAKE2B ed9eb590c9d7102a54b9955e5bda766e18faace2d99d3aa64b4179322ddc68cf6b3d7a485d2617ef16a115f7c5c4a690fa4bbf371ee1d0ca41453ff849302dd9 SHA512 315b6b541a4751b053181f9b7d8a8b27d4275edf06c66aea124d3c357d14ee62b4523195f9f8529222afc62c30bcbb42d0c5abe49f24896514259420abe1a0a4
+EBUILD spidermonkey-38.3.0.ebuild 3874 BLAKE2B 71132d1e37e0f1403fa9ec36214cce59c0fb0c095defe8cbf85c9597d955a4125ca473e40bc8da105ba4256b6ed41d6dabb6aa2c30064706ed2408385c41287e SHA512 dbb24289a11e25cb0d2e64e4234f714288930a65ff0e00dcdb3a7292f03848fe91782a30519077f512286b69ba8bdc4dbc542403b999d8ab36c1e4479a399232
+EBUILD spidermonkey-45.0.2.ebuild 3981 BLAKE2B 5d29c793046bc88a91168c3f8b62bb6bc737e9fb0282e956bbb3c7fcc5257313364f679335f20603ee9879f36a024cd0103b01a6ea8e1d7a976158bc89389a1c SHA512 02dfb222c10edff54232dc9b03751fe755e8d9a22579b6b4f89458a816103e89376e2acffb3ca5d3eb2b6ef67e07884e92b55399c48a41986e43889f45fc367e
 EBUILD spidermonkey-52.9.1_pre1-r1.ebuild 4467 BLAKE2B 4b3ed44e84091307c8bb4808fa189ccdfe354a7dbdef211d36f57ccd38cf565cd28a70035f3e5aaec1fe56fd9bceeaf5ec304aa4f588aa8ee111387f1a655ba7 SHA512 f52ec253b80d31d04549f4ce977fe208030e0c3c1de9ab0a88c6425a36a810bf2a5d35f6137734175dbc7927f827a58cb4e9a511ab2a80cc8c3fde4cb27864a2
 EBUILD spidermonkey-52.9.1_pre1.ebuild 4294 BLAKE2B c275e8067867c292f74a0e72131fc276d3cbc232610eeff094f2ef92ccc3ae8b820d6c4ee8a4ca6f6db69709376b45ea51965e526b05940165dea8cdc3bdb5d2 SHA512 698cb5849d258ecbd53d53e4179fedb0e56c894c7530417395166247c88657e0ae50c9237f366e176bf14dd31ad6575810c05c1815e40f03ec043766a29ae84f
 EBUILD spidermonkey-60.5.2_p0-r2.ebuild 3867 BLAKE2B 3469155f45a404d1af26b66382a7bf1bd02a814aa3397ffa5765a8c2a2e5ad858dd6f55f57e81991aa3e67d53880b0aa67e411172d9257813b8e1c28ba7d95bd SHA512 82af9d80474bd3c1eb7c73ed54f9791c877e35b36833bb83861965c3074ab13c2b987e6319554743ead6c2bc4207c3a31b39a4fd25659254851174874f190b90
diff --git a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
index a0c8d08062f1..30082712a0d8 100644
--- a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild
@@ -57,7 +57,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export SHELL="${SHELL:-${EPREFIX%/}/bin/bash}"
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
 
 	cd "${BUILDDIR}" || die
 
diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
index 1c936015960e..ced690db1ef3 100644
--- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-	export SHELL="${SHELL:-${EPREFIX%/}/bin/bash}"
+	export SHELL="${SHELL:-${EPREFIX}/bin/bash}"
 	cd "${BUILDDIR}" || die
 
 	econf \
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e59f3e9734f3..6fcb9373fa57 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest
index 1367bcceb3e5..7d42055dbf03 100644
--- a/dev-libs/angelscript/Manifest
+++ b/dev-libs/angelscript/Manifest
@@ -1,3 +1,3 @@
 DIST angelscript_2.34.0.zip 2020026 BLAKE2B f002c67d812cc6453d1e93ffba4aaa4c300926996b74f8d596642625e251ccd14b97473f8f0ff595e3233a3ebc7654c94420ae761eaa0b67439e18472f8df977 SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4
-EBUILD angelscript-2.34.0.ebuild 988 BLAKE2B 92d955c60d04d0485fd4951059715511366249a8ce320bd9f28d05cd1f2e836ac5d585d06a2bc9c51e51ba38851bc3df991f079c5c0b94342fc6cdbe0f7b2e9c SHA512 128b82aededbc1948d7d5f462d545bda6112e7daf9062d858fdc64684431365986546074ac769ec94b482df1f135d514ce16e5cad653f3a21da8b5312c34c99d
+EBUILD angelscript-2.34.0.ebuild 986 BLAKE2B bfde272cb9aa10ffbc709b24a81fe3bb60ffa71d3bc5bf2b47bea9a112e1e16b7c02ec097efc2658323506e41d18f9dceeea5971ef23436fb97460d780b7df66 SHA512 823aaef33e68b2cdb77a37510f5106245bd4a5d8af0f7d8a8a4e3331be62c64c17ac10c2940f77baabfa4f2e9cc0082d10ff960e26c9f0052cba9d9918dd63e2
 MISC metadata.xml 406 BLAKE2B 0c09c377443b9bd89ac3d6b59c77bb306835e1640cfc58715a71cbe0dfbff13ed08c9e4b429a5a968c2738638dfdb87bba93293b6a09a92b7ab04c38a9786f06 SHA512 a9d0b8fdf4cc34c08dfc521920e54c42cd23e6ce65981a9ab895cae55be6e51bcdfce6fe5889c1daf812094cddfc44bb20c5439ba5d668b6a45d74fd9db3e891
diff --git a/dev-libs/angelscript/angelscript-2.34.0.ebuild b/dev-libs/angelscript/angelscript-2.34.0.ebuild
index d2bea73121f6..d1eedac8af5f 100644
--- a/dev-libs/angelscript/angelscript-2.34.0.ebuild
+++ b/dev-libs/angelscript/angelscript-2.34.0.ebuild
@@ -33,7 +33,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake -C ${PN}/projects/gnuc \
-		  DESTDIR="${D%/}" \
+		  DESTDIR="${D}" \
 		  PREFIX="${EPREFIX}"/usr \
 		  LIBDIR_DEST='$(PREFIX)'/$(get_libdir) \
 		  install_header install_shared \
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index b12cf21e8759..2e471e6e6444 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,5 +1,5 @@
 AUX apr-util-1.5.3-sysroot.patch 1234 BLAKE2B 58e66e338ae936b7c206eda88a97f99785a88d79c32245c4c028f00b98a33d3f29764f66646e486d828d8cc655cbe59813236b7c5ca7060643771e4ab9b915c6 SHA512 44ee2a9cf61587f05d43976d40023f6313b310c3eeb37299840445e3faec7f0352367875f515b21d3b1fcdc8c082d8584a21cf8187deb1f6f69187c14f84f0b7
 AUX apr-util-1.6.1-fix-gdbm-error-handling.patch 2272 BLAKE2B ca68b87d6f19614cfb18e1df4fe0122fbf08167de7781fb58ae0219f766c1795109ee050b2900daf63e597a455c647f5da274e90aa0e4a436e8c87c19f962c45 SHA512 9f246ff853407fe59d135481c9afff6b3ef26c753c41b52134dde44df269e25c1f3249980994a000b24417f30692bf62a044d450a47af259cdfb76fbb6b70b8d
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
-EBUILD apr-util-1.6.1-r3.ebuild 3728 BLAKE2B a13823bef14bfe8cd4b742a92a5f09e80c542cfcc3eb1812a7961f7737c56480826822f5dfcef1a95ae403e80fee84215511bdbfea85dba5a8cb492d1fa940d5 SHA512 963849842b33c972188ddcbfe1b68a24d3e94dc68855f82cc0ed5ca86a55bbac9f9c104a3412c7bb32ff6604fd6a538755dcc5b6718ebb559820fd2846085c82
+EBUILD apr-util-1.6.1-r3.ebuild 3722 BLAKE2B c9bd62f2b868a55cc198534fc7584dbc333360cb1b1c79a9f03cf302f1095458e64ba61bea2ceabd3b8766db2a1ac0d4ae1499b5fa6e782fa73c3a9345b1f055 SHA512 69676a13b2d8fbcb3c743da213bcd456f0729c977dbfedac106eb60f6402795592cf33b6097f5f290059e3ebda7f05f8ef418debf354b1fbaf67cb4af26c525f
 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 69df78180409..98432bf891bd 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
@@ -126,8 +126,8 @@ src_install() {
 	default
 
 	find "${ED}" -name "*.la" -delete || die
-	if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
-		find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
+	if [[ -d "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
+		find "${ED}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
 	fi
 	if ! use static-libs ; then
 		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
@@ -140,5 +140,5 @@ src_install() {
 
 	# This file is only used on AIX systems, which Gentoo is not,
 	# and causes collisions between the SLOTs, so remove it.
-	rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die
+	rm "${ED}/usr/$(get_libdir)/aprutil.exp" || die
 }
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 0c23be3f5364..3d9a16b1312e 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.32.0.tar.xz 292088 BLAKE2B 15f093db60cc54d1a5a18dc78cb9d64fa73e18dadb724fe5143956199f4ff1aa4ea9daf0796b14f228a1d91f1d44e88749c67fe5a6a84bd001916d78be4680f9 SHA512 8cd2a3ee006f21835f3e564f2e1de4ae61bd9529b4c0b4f2e3ece88e905e2dd36b67affb089f41582806a1397576602a526a4b8698303708894f20af97ecac22
 DIST atk-2.34.1.tar.xz 293140 BLAKE2B 8ae280583867460734ca001eb01963eefcc519eb09658e2e793cd1a07831e8e5ade20a4d38bb5925a1103da206d9d6283a2b1892c671f12090b3eefac04b34e1 SHA512 a7c8ec7c2166bb8734b065402bf7700cdc69f56c0958663e88596b155a20063e4cfbf1754d8b8ed94a4e509db2e97e2603b0a8037e61028acc85930e631a633e
-EBUILD atk-2.32.0.ebuild 1165 BLAKE2B 8d362252a919c1ee58b1ef4de8ea221748423c8d906edca309e2220d1e6dea3ace016567d4c2813beb19c22899b9705f02cdccf0bae5bd2037b55d2dc808f3a5 SHA512 604e5f0807b1685c57cd1a8b88a411a3d9a1ea18bc6d3cc96c3a7e9cb88727e7a08d672ddd32983d1be518e71f2e0dec649dae539da0915c2404484964c802c4
+EBUILD atk-2.32.0.ebuild 1166 BLAKE2B 30f34739e560dc220942e28d3ee68e08c6b94f59568c7db2681ccc709bd6a67340b2969ae6dd268c5c0946a7f24fbc7530e6d3e6b9108f12283aa743d820834a SHA512 ea294a119069f4ea358e0868733f81d6280e77281ba6257655a8a5eb598412650fad0b08ad31df1d8358f1e492a3bfddc866236ae0f132af1db1c0a3193a2c9d
 EBUILD atk-2.34.1.ebuild 1175 BLAKE2B 212f9032adf2df7804cde272f7d512a8668907b0086d0dae909c6c1026abc10099100536548dca08ac029b2395a64714ed08bb6c046aa38e5b0a3f0e23fcf019 SHA512 ed002c44722328bb6a36883177dd24d0c47acc568173c16884ecb9ff5e6ee7883d81d8701aaaefe667d359354abc0928decfcada3b2d268de68249bb2d5f9ae7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.32.0.ebuild b/dev-libs/atk/atk-2.32.0.ebuild
index 26dcc8d80083..969ff91be7ea 100644
--- a/dev-libs/atk/atk-2.32.0.ebuild
+++ b/dev-libs/atk/atk-2.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index fcaa8ef461e6..ff14ae255c0b 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -7,5 +7,5 @@ AUX beignet-1.3.2_llvm7.patch 4805 BLAKE2B df959c8e482e1810b2257419088a4cd283bfe
 AUX llvm-terminfo.patch 788 BLAKE2B cb652c28aac1cca566cb801b9e7f2b6ea8a9ff9457896a50b3323b41a009e039085d2d4aeff14d9d8cf35fca3e4a23bacb3078451c4981b6f806cec4146aec83 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312
 AUX no-debian-multiarch.patch 1652 BLAKE2B 4d112429412a7ada957228aa8e6beb145fbaf04065d6f816b0f13513631211894c57e9999157db5f22d7044f231be65396040efe450d090e3774bd24c9c93482 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a
-EBUILD beignet-1.3.2-r3.ebuild 2868 BLAKE2B b32d8bd2015fe45936f7cc2cbcdd204ce9d5aad0d1b9b4b445ded59d371d5ab89957faa67a6153a77626dd4b99320b6eb8808045f47587fd32fe2d17a783150d SHA512 c58ebd5b0f2df3a59d4ac695d5b98ab4722c0029cc47a87e58149d81676ad5bbac1e7d6f79ab68a630bf67cb883fa6ad2c654164c1888543b67b0dc6dadcdbe6
+EBUILD beignet-1.3.2-r3.ebuild 2862 BLAKE2B e7928e36ed35fe344b7f7965dc82165dabed40d0a7dce24c98f82586bfa209e1e679923eed44a94e67871a6bc12c3b57823b41728de71f34faf7482a10291718 SHA512 2742396e33f4b494ef89d967be8f580d157ca16ef516382e7a6f5442c33f4cc4e6ceb93a07582c7ee1fbded6be3e033f3bdf7df364d63695db10ed221830d901
 MISC metadata.xml 473 BLAKE2B e805dfe8af6753bfd30bc46d81637c28106320d8a149a41adb893b3fbe6deb54ef16589f78223153ae9446110b9b905267724034664896f9970bd6fd200c52fc SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186
diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index 439ab63df2ed..874dd1cc3193 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic llvm
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 6b8e196812ba..d02e30476119 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -4,8 +4,6 @@ AUX boost-1.71.0-disable_icu_rpath.patch 1077 BLAKE2B c4549b7a706cd934392bdafb44
 AUX boost-1.72.0-boost-mpi-python.patch 1703 BLAKE2B b797f66c07bcec021e0a9a169cfddf8572828cd94114ff0dc40e9f08f9e5041f5cef3a8d0400cf5cc447bb75cf9e1c1c4d500930d154f34920b3501eb991eccb SHA512 61e9ef28b40f4226f09f235d59bd2d1ad571530b78c3fb50fd1f2bc47c185cc7cbd72b469fddcd6795a8578f3ba0b6abf12d8f175806e7b0d29cdd6223c145aa
 AUX boost-1.72.0-missing-serialization-split_member-include.patch 992 BLAKE2B 103b669670ff1365837c4590bbba6ec112ef8f185115a60cd853cead370c514517950e6105a4f39c030d8c0931352c44eb7d03c6790ab88c6978acfa02e3a142 SHA512 b2d9e870545c8509abda1110e8de3807cec72373fd5539edabf83825b9fd893562835e7557ea74c309a02e245e9cf80e567b39bf08a5e98c9d3124cd8b10e064
 AUX boost-1.72.0-revert-cease-dependence-on-range.patch 1687 BLAKE2B 9419cf7b50359c17f6226e0706e64a4637d835172a742807349536fb87731912929148810e5abb33c6005583bf6077283c2e6c453a911ea7922266f616b60ea4 SHA512 9b53d2fe2dddd592e43db03c26fadd6c07d4c45a980ae4c775b7a914346a3914f6e0c3ef42dad5e2ea4568afb86c9967e09444ff609cfba1e1d39f4980b22ad6
-DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-EBUILD boost-1.71.0.ebuild 10427 BLAKE2B 92b7f3998fe938569464c358281e5d837132aa194e12a435bde2f0f46252f2b2b8aa2f0e625c549aa5d1df6bceae25ed242a5f1635729ccf1d9bc6c621e8310b SHA512 9c6158a116ccc12901dd05660877ca58b5c751227288e66d62991737d9efca220c7849bf8b98a1b8315a59825625ae5656593aca7c0f103f3bb81f74f86b73e4
-EBUILD boost-1.72.0-r1.ebuild 11305 BLAKE2B 34b28199a59a1cee1e9ec7c254e4c67e1a687de7be41df6e7cf34abce03ca49cdbf241fe2e84c9687e98b34a265cfc92c4eb586423f2510a8778d8c173365f11 SHA512 408834724f5ce4ab9ae1a10f14665345436fc525662162cfdb352aeefa2e56e79ea47532a7649a8f04be323d505025a902eb0ae1fee8e2f834def5ee7e03f36f
+EBUILD boost-1.72.0-r1.ebuild 11303 BLAKE2B 4e1e166d3fd4439b6520b29689cd3232327d59f4daf6211f239807e9701b3b9c55b92ebc82b145f8a61adc8d03529a3e5eadb4a4849d69dd07440697d7e10e88 SHA512 e814ea69e3507d074cd6608f0c71e1e69c830c2e45b094a94d1ea2e92e78fb2a2c59ad9cbc71a84bb86eea785049df8dd1e02496e9ea78038a826d092debe947
 MISC metadata.xml 1398 BLAKE2B ddaab460cad149df5f91c1a37eb7ffaa6a2b90e1062f268925fd3e0db1403d3447963c27fcd72847319e8510723a1a245be398d50a1e317662f59f593991ff0a SHA512 ed8530328af7bef694be2af7d3ba0c83198f769223b35ee5c1a2463cf50c97e964f7a4d8361f5091e9994fe0bff000534b6c5d5e5b517d38d101061026bd01bd
diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild
deleted file mode 100644
index d4c6da3453b3..000000000000
--- a/dev-libs/boost/boost-1.71.0.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-MAJOR_V="$(ver_cut 1-2)"
-
-DESCRIPTION="Boost Libraries for C++"
-HOMEPAGE="https://www.boost.org/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
-IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
-REQUIRED_USE="
-	mpi? ( threads )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# the tests will never fail because these are not intended as sanity
-# tests at all. They are more a way for upstream to check their own code
-# on new compilers. Since they would either be completely unreliable
-# (failing for no good reason) or completely useless (never failing)
-# there is no point in having them in the ebuild to begin with.
-RESTRICT="test"
-
-RDEPEND="
-	!app-admin/eselect-boost
-	!dev-libs/boost-numpy
-	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
-	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
-	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
-	python? (
-		${PYTHON_DEPS}
-		numpy? ( >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}] )
-	)
-	zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="=dev-util/boost-build-${MAJOR_V}*"
-
-S="${WORKDIR}/${PN}_${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-context-x32.patch
-	"${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch
-)
-
-python_bindings_needed() {
-	multilib_is_native_abi && use python
-}
-
-tools_needed() {
-	multilib_is_native_abi && use tools
-}
-
-create_user-config.jam() {
-	local user_config_jam="${BUILD_DIR}"/user-config.jam
-	if [[ -s ${user_config_jam} ]]; then
-		einfo "${user_config_jam} already exists, skipping configuration"
-		return
-	else
-		einfo "Creating configuration in ${user_config_jam}"
-	fi
-
-	local compiler compiler_version compiler_executable="$(tc-getCXX)"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		compiler="darwin"
-		compiler_version="$(gcc-fullversion)"
-	else
-		compiler="gcc"
-		compiler_version="$(gcc-version)"
-	fi
-
-	if use mpi; then
-		local mpi_configuration="using mpi ;"
-	fi
-
-	cat > "${user_config_jam}" <<- __EOF__ || die
-		using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-		${mpi_configuration}
-	__EOF__
-
-	if python_bindings_needed; then
-		append_to_user_config() {
-			local py_config
-			if tc-is-cross-compiler; then
-				py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
-			else
-				py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
-			fi
-			echo "${py_config}" >> "${user_config_jam}" || die
-		}
-		python_foreach_impl append_to_user_config
-	fi
-
-	if python_bindings_needed && use numpy; then
-		einfo "Enabling support for NumPy extensions in Boost.Python"
-	else
-		einfo "Disabling support for NumPy extensions in Boost.Python"
-
-		# Boost.Build does not allow for disabling of numpy
-		# extensions, thereby leading to automagic numpy
-		# https://github.com/boostorg/python/issues/111#issuecomment-280447482
-		sed \
-			-e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \
-			-i "${BUILD_DIR}"/libs/python/build/Jamfile || die
-	fi
-}
-
-pkg_setup() {
-	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}"/etc/site-config.jam ]]; then
-		if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then
-			eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
-			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
-			die "Unsupported target in ${EROOT}/etc/site-config.jam"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-ejam() {
-	create_user-config.jam
-
-	local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
-	if python_bindings_needed; then
-		append_to_b2_opts() {
-			b2_opts+=( python="${EPYTHON#python}" )
-		}
-		python_foreach_impl append_to_b2_opts
-	else
-		b2_opts+=( --without-python )
-	fi
-	b2_opts+=( "$@" )
-
-	echo b2 "${b2_opts[@]}" >&2
-	b2 "${b2_opts[@]}"
-}
-
-src_configure() {
-	# Workaround for too many parallel processes requested, bug #506064
-	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
-
-	OPTIONS=(
-		$(usex debug gentoodebug gentoorelease)
-		"-j$(makeopts_jobs)"
-		-q
-		-d+2
-		pch=off
-		$(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off')
-		$(usex mpi '' '--without-mpi')
-		$(usex nls '' '--without-locale')
-		$(usex context '' '--without-context --without-coroutine --without-fiber')
-		$(usex threads '' '--without-thread')
-		--without-stacktrace
-		--boost-build="${BROOT}"/usr/share/boost-build
-		--prefix="${ED}/usr"
-		--layout=system
-		# CMake has issues working with multiple python impls,
-		# disable cmake config generation for the time being
-		# https://github.com/boostorg/python/issues/262#issuecomment-483069294
-		--no-cmake-config
-		# building with threading=single is currently not possible
-		# https://svn.boost.org/trac/boost/ticket/7105
-		threading=multi
-		link=$(usex static-libs shared,static shared)
-		# this seems to be the only way to disable compression algorithms
-		# https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
-		-sNO_BZIP2=$(usex bzip2 0 1)
-		-sNO_LZMA=$(usex lzma 0 1)
-		-sNO_ZLIB=$(usex zlib 0 1)
-		-sNO_ZSTD=$(usex zstd 0 1)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		# We need to add the prefix, and in two cases this exceeds, so prepare
-		# for the largest possible space allocation.
-		append-ldflags -Wl,-headerpad_max_install_names
-	fi
-
-	# Use C++14 globally as of 1.62
-	append-cxxflags -std=c++14
-}
-
-multilib_src_compile() {
-	ejam "${OPTIONS[@]}" || die
-
-	if tools_needed; then
-		pushd tools >/dev/null || die
-		ejam \
-			"${OPTIONS[@]}" \
-			|| die "Building of Boost tools failed"
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_install_all() {
-	if ! use numpy; then
-		rm -r "${ED}"/usr/include/boost/python/numpy* || die
-	fi
-
-	if ! use python; then
-		rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
-	fi
-
-	if ! use nls; then
-		rm -r "${ED}"/usr/include/boost/locale || die
-	fi
-
-	if ! use context; then
-		rm -r "${ED}"/usr/include/boost/context || die
-		rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
-		rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
-	fi
-
-	if use doc; then
-		# find extraneous files that shouldn't be installed
-		# as part of the documentation and remove them.
-		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
-		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
-		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
-
-		docinto html
-		dodoc *.{htm,html,png,css}
-		dodoc -r doc libs more tools
-
-		# To avoid broken links
-		dodoc LICENSE_1_0.txt
-
-		dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
-	fi
-}
-
-multilib_src_install() {
-	ejam \
-		"${OPTIONS[@]}" \
-		--includedir="${ED}/usr/include" \
-		--libdir="${ED}/usr/$(get_libdir)" \
-		install || die "Installation of Boost libraries failed"
-
-	pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
-
-	local ext=$(get_libname)
-	if use threads; then
-		local f
-		for f in *${ext}; do
-			dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
-		done
-	fi
-
-	popd >/dev/null || die
-
-	if tools_needed; then
-		dobin dist/bin/*
-
-		insinto /usr/share
-		doins -r dist/share/boostbook
-	fi
-
-	# boost's build system truely sucks for not having a destdir.  Because for
-	# this reason we are forced to build with a prefix that includes the
-	# DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-	# DESTROOT instread of the actual EPREFIX.  There is no way out of here
-	# but to do it the dirty way of manually setting the right install_names.
-	if [[ ${CHOST} == *-darwin* ]]; then
-		einfo "Working around completely broken build-system(tm)"
-		local d
-		for d in "${ED}"/usr/lib/*.dylib; do
-			if [[ -f ${d} ]]; then
-				# fix the "soname"
-				ebegin "  correcting install_name of ${d#${ED}}"
-				install_name_tool -id "/${d#${D}}" "${d}"
-				eend $?
-				# fix references to other libs
-				refs=$(otool -XL "${d}" | \
-					sed -e '1d' -e 's/^\t//' | \
-					grep "^libboost_" | \
-					cut -f1 -d' ')
-				local r
-				for r in ${refs}; do
-					ebegin "    correcting reference to ${r}"
-					install_name_tool -change \
-						"${r}" \
-						"${EPREFIX}/usr/lib/${r}" \
-						"${d}"
-					eend $?
-				done
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# Yai for having symlinks that are nigh-impossible to remove without
-	# resorting to dirty hacks like these. Removes lingering symlinks
-	# from the slotted versions.
-	local symlink
-	for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do
-		if [[ -L ${symlink} ]]; then
-			rm -f "${symlink}" || die
-		fi
-	done
-
-	# some ancient installs still have boost cruft lying around
-	# for unknown reasons, causing havoc for reverse dependencies
-	# Bug: 607734
-	rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
-}
-
-pkg_postinst() {
-	elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as"
-	elog
-	elog "  undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation"
-	elog "    <char>::transform_primary[abi:cxx11](char const*, char const*) const'"
-	elog
-	elog "Then you need to recompile Boost and all its reverse dependencies"
-	elog "using the same toolchain. In general, *every* change of the C++ toolchain"
-	elog "requires a complete rebuild of the boost-dependent ecosystem."
-	elog
-	elog "See for instance https://bugs.gentoo.org/638138"
-}
diff --git a/dev-libs/boost/boost-1.72.0-r1.ebuild b/dev-libs/boost/boost-1.72.0-r1.ebuild
index ef8bfc574f38..024bfbd5114f 100644
--- a/dev-libs/boost/boost-1.72.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.72.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
 IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
 REQUIRED_USE="
 	mpi? ( threads )
diff --git a/dev-libs/clhpp/Manifest b/dev-libs/clhpp/Manifest
index 02a22661925a..0e1d0e3655ee 100644
--- a/dev-libs/clhpp/Manifest
+++ b/dev-libs/clhpp/Manifest
@@ -1,3 +1,3 @@
 DIST clhpp-2.0.10.tar.gz 129954 BLAKE2B 1beb9b41ce1ad8ec88d0ccfa5f1d7a7af931841fa64d79b9eb9db90538f1b43f3cee5c74dc015ba835ee4ded2e926967bc3aa00dcc6ec0f5b65a04f9618ea1a9 SHA512 4a4898540c55422ca0cc6ba7f0c5495b915fc34df50f8add90e7f06dd5ef1d01a767234ecdee3757292980aa2f938e773177bcc73f28ac9c1b42d386863dea58
-EBUILD clhpp-2.0.10.ebuild 952 BLAKE2B c9e73b82210db05466e0c5eede4d6594fd42f3dc405b767fed7bcfd47db1b4242d9960c0350128f69036d622f88827fe80034cdd4d317f2074db556d9bb5260e SHA512 c9e447c75d2a407bea0731b740da007fcc74c4733dad2f3e80e3f901385670539bcc62e087c324e426ff2e575a4bf402eb6d589bb04bae171a9d0deda77295be
+EBUILD clhpp-2.0.10.ebuild 942 BLAKE2B 65c993533fb5861855529ee574286411ce6f2d8af3e14b80f16507b7c6493d44f5f9e6890e9273cf00afb4ad6f598b73096e23d6147df6da9658df9ca5303892 SHA512 fece5a2d1439eaa87035614311938a60277cfade13f874126594b27a6040efeaafae7e2aa7138290baabcac97cf70d4fa4ded7c45d91db8770accf59c63c7c1d
 MISC metadata.xml 336 BLAKE2B cf9637d462e3606aa1a49639f60217f003e2271fa064d6bb36e9d1744c3b84815c0b75c2d42a3e761876879ea7eb92c32986f8e54926ed7e544690035985a86a SHA512 77d25c077302f6e92b83c869c45c9f91131160fa250f5a5087067e3291a1a0954e883ae110d20d9420cd9c01720803977ccf1d5ff6250bee91d6e5192798e55d
diff --git a/dev-libs/clhpp/clhpp-2.0.10.ebuild b/dev-libs/clhpp/clhpp-2.0.10.ebuild
index 00c6a559dd9e..db06bf085688 100644
--- a/dev-libs/clhpp/clhpp-2.0.10.ebuild
+++ b/dev-libs/clhpp/clhpp-2.0.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 DESCRIPTION="Khronos OpenCL C++ bindings"
 HOMEPAGE="https://github.com/KhronosGroup/OpenCL-CLHPP/"
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index fc9cb782c490..922bf845d042 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -6,5 +6,5 @@ AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6f
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
 EBUILD dmalloc-5.5.2-r4.ebuild 1751 BLAKE2B 20ab1cbcf7ef36a0b9f39d0833c1276eef87c245dc368f57cc6fccd1d822fef98d118fc3f193c9bba6d0fb996bdc74b93aed54486ea5d2daae951725de0cd098 SHA512 5f928b8f2f09820053461ec831b46958f630ef989c53deb91988a1bfde68816f73149f89b675966ba5738fc13c75f2fdd1bb702f780c497f9f034941937a704c
 EBUILD dmalloc-5.5.2-r6.ebuild 1917 BLAKE2B d980f68e26716599b285f5cb34fcda0f52060146b3c671723b7c43dfc88ffe43032e9634edaeafbee5b2777ecd5882cef8dc14c659d821571f6d0a36ece56b5a SHA512 529084695792373fc5f6c5e862751a90694314c4cd5c6fd1a6fdbf982a304414420d9c015df8af92c013b269ba1e2ee8cf51741b52fc59a5c46c9fbcb758ec37
-EBUILD dmalloc-5.5.2-r7.ebuild 1858 BLAKE2B 011aa02de5b353827fc61b62cfe4e3793ec85314d3380082957575d7254fa49056539bd7c440f7056af4db21aa66bb7b77dfbaf1873a0cc232dfecaef4fe0a82 SHA512 4030a84dee4c1a58a406fd35bad418ed00514be2fa921837bcb421cd842a3677a84cd2e7f8865f8d32d5cea4914c63948454ea1ceee0a9dd5e2b89ba6bf0f433
+EBUILD dmalloc-5.5.2-r7.ebuild 1857 BLAKE2B dceabac7feac1a370db5ac445857b8631bd33e3887f5020392cf86e22632a60aaf283cf57dc8fe8a463423606b67f57fb55f28fe35f74ae3ed4275c90a32e870 SHA512 03698f59a9e72ba87bf6bfacdf182c24485a2fc1afa3ea51ebe79d2500241da161ab1c8fb311b83b3305981617439590491219667a580fd755f8ac9624de9d12
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index bda4a27d0c9e..16b4911b2230 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 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="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 9ce401e54be3..69c3ebcc006f 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -2,5 +2,5 @@ AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526b
 DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
 DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
 EBUILD double-conversion-3.1.4-r1.ebuild 1413 BLAKE2B 84e0a0d86df46566dfdfd37c1d43fa4667c47ad62f8cb1e274c0ed5f0aa9ffeb9ab019c12be0abc959d152ef37c1d1d8a3f6fcc7bc4d9059f12ae9d0e4ad0006 SHA512 dd10edb94846e496187fbcd4d877e87075426d78616162c0823c934e984da4d82232d996918a78b62dfd43003f2e715b2994c15b22d8be53be9ac073cf00261f
-EBUILD double-conversion-3.1.5.ebuild 457 BLAKE2B d07c81ac6dbbdb3389d674ebd864bfe2d5949b455b62dc4a5c90566dbd52811ca86c8a54584cf121e55b4a63231827d6dded5b5461b1eb625a67e0fd9917e2c9 SHA512 c4998bae35b178ffe22b889df1061e68f66d84f8ee8b3228d08ef7c44dbf59270af381f366161a1cbb43a9a37aa4f12d80f02cb689ad839fcc5d560f7b0b4aa5
+EBUILD double-conversion-3.1.5.ebuild 456 BLAKE2B cf4218e87915914583c82ccffde6bf92bac0bbaa546394a227e002b713cf746950e815f3327bde1461c5e25c5135b27f4886c239a18f0c34a8e43fa099cdcfc2 SHA512 94f9e80922ae6b45b4e679009729dfd3849ee60f5aeddc177311afe165792e443537b882eccf1dc02cc9f0fad6bbcbeb84cf084569de6cda1f306562e4cc4fe8
 MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
index c55eb82b6ae2..0bc709db3550 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
@@ -11,4 +11,4 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 5ea6631e0440..82a94559666f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,3 @@
-DIST efl-1.22.6.tar.xz 70641848 BLAKE2B a6644f25934d3c9776b06edd7a9ffc321da42ee039b703c1af317d14e757b489c6d42add281febde5e81b48e38fbfa31f5b201ade4d27cd50cc70d16b9028fdd SHA512 adf2b9275c295b61928134ce1af53d8830b46815d8ba09d221c7659b8a2aed6e4593b35919a98f0e33ec9b7930c5b09de8e6680536cccb21c551908b25158f56
 DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
-EBUILD efl-1.22.6.ebuild 6910 BLAKE2B 52d27a0baa59508ebb3e522338aaa6fe8cb15f5be8f265bf264b8a56209a6e9a5ed801eca19fb32d815282cafa3a2eadf1b781dd2c22935eba6af34d331cfbad SHA512 67aa26a52d2e234d7bd64f6f2c508762805aa45433c7733638e0564f8de32d8b7374618b59660827ea90749976deeb17e415ef7bac69e542d3da7cec02b63334
-EBUILD efl-1.23.3.ebuild 7498 BLAKE2B afbb8beeadae25c6fcac0f11367e81ad937dcbddc60317e3746bf405822dae7cc57599caeeae63c0614fe7a86f2a31139353b0bfc2712e9c1a867310fdef5f46 SHA512 ea2993c2d5c819dc3ff4fa960df70b03f58f9560c374cf4e7e2dbc092a160dbc2de69274eafce3638dff1efdecf75f61da99b418ba7e97a87c58b192cb3ca663
-MISC metadata.xml 2199 BLAKE2B 56690b1757b3903b9c7008e64a287ed84420d1da4b3bbd4260617c66da0eded0bd5bb29d1880dd9484b428beb9a02f4b36f7f9b146c090e1c1f55272b5b77066 SHA512 45a075877b05d2dcca13c376b8af5fa269855e9419dbbaa60234a7529a737697ac8eb56ffb7c14b6216ec537b367de47b2558716dd7dedbfed737d07e307595a
+EBUILD efl-1.23.3.ebuild 7505 BLAKE2B 6e240ebe30b78abce26867a88778d9a81cbea680c326f72405d713a4c0cd59ab9d2dab33eb056801c5388b8fbcfb83d36f28c69b9f0f0d82a2453f7bce1fd0d4 SHA512 92517227d2e7006d227ea74d45fe54915284722e2fcaedf511cf1689294a39968f7135b760aaee5380fa64e3e3e4b15376c9e94637bfd990bec7caa4d69f4db1
+MISC metadata.xml 1987 BLAKE2B 86cb4cbb5deb978955e4008c3d7ae92430daa8739d75c9515c3c33339b05b545b5af8b8bdce0dc4ca2dffe17097ca8a04104e1ed3fe99a548c625416d467d2f2 SHA512 b543190ca4b753101085f3964608b06ee489f6e0d268e84866162370b029cc8433e2925ef92104a38a57a3c0fb491150f6376cdf996a45cdb0848287b8aaf58f
diff --git a/dev-libs/efl/efl-1.22.6.ebuild b/dev-libs/efl/efl-1.22.6.ebuild
deleted file mode 100644
index 946104590533..000000000000
--- a/dev-libs/efl/efl-1.22.6.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pax-utils xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( gles2 opengl )
-	fbcon? ( !tslib )
-	gles2? (
-		|| ( wayland X )
-		!sdl
-	)
-	ibus? ( glib )
-	opengl? ( X )
-	pulseaudio? ( sound )
-	sdl? ( opengl )
-	vnc? ( fbcon X )
-	wayland? ( gles2 !opengl )
-	xim? ( X )
-	xpresent? ( X )
-"
-
-RDEPEND="
-	net-misc/curl
-	media-libs/libpng:0=
-	sys-apps/dbus
-	sys-apps/util-linux
-	virtual/jpeg:0=
-	connman? ( net-misc/connman )
-	drm? (
-		dev-libs/libinput
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-		x11-libs/libxkbcommon
-	)
-	elogind? ( sys-auth/elogind )
-	fontconfig? ( media-libs/fontconfig )
-	fribidi? ( dev-libs/fribidi )
-	gif? ( media-libs/giflib:= )
-	gles2? ( media-libs/mesa[egl,gles2] )
-	glib? ( dev-libs/glib:2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	harfbuzz? ( media-libs/harfbuzz )
-	hyphen? ( dev-libs/hyphen )
-	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:= )
-	libuv? ( dev-libs/libuv )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( dev-lang/lua:* )
-	pdf? ( app-text/poppler:=[cxx] )
-	physics? ( sci-physics/bullet:= )
-	postscript? ( app-text/libspectre )
-	pulseaudio? ( media-sound/pulseaudio )
-	raw? ( media-libs/libraw:= )
-	scim? ( app-i18n/scim )
-	sdl? (
-		media-libs/libsdl2
-		virtual/opengl
-	)
-	sound? ( media-libs/libsndfile )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo
-	)
-	system-lz4? ( app-arch/lz4 )
-	systemd? ( sys-apps/systemd:= )
-	tiff? ( media-libs/tiff:0= )
-	tslib? ( x11-libs/tslib:= )
-	unwind? ( sys-libs/libunwind )
-	valgrind? ( dev-util/valgrind )
-	vlc? ( media-video/vlc )
-	vnc? ( net-libs/libvncserver )
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[gles2,wayland]
-		x11-libs/libxkbcommon
-	)
-	webp? ( media-libs/libwebp:= )
-	X? (
-		media-libs/freetype
-		x11-libs/libXcursor
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXtst
-		x11-libs/libXScrnSaver
-		gles2? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-		)
-		wayland? ( x11-libs/libxkbcommon[X] )
-	)
-	xine? ( media-libs/xine-lib )
-	xpm? ( x11-libs/libXpm )
-	xpresent? ( x11-libs/libXpresent )
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# Upstream still doesnt offer a configure flag. #611108
-	if ! use unwind ; then
-		sed -i -e 's:libunwind libunwind-generic:xxxxxxxxxxxxxxxx:' \
-		configure || die "Sedding configure file with unwind fix failed."
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--enable-cxx-bindings
-		--enable-image-loader-generic
-		--enable-image-loader-jpeg
-		--enable-image-loader-png
-		--enable-libeeze
-		--enable-libmount
-		--enable-quick-launch
-		--enable-threads
-		--enable-xinput22
-
-		--disable-cancel-ok
-		--disable-cocoa
-		--disable-csharp-beta
-		--disable-csharp-bindings
-		--disable-doc
-		--disable-ecore-buffer
-		--disable-ecore-drm
-		--disable-ecore-wayland
-		--disable-eglfs
-		--disable-g-main-loop
-		--disable-gesture
-		--disable-gstreamer
-		--disable-pixman
-		--disable-tizen
-		--disable-wayland-ivi-shell
-
-		$(use_enable bmp image-loader-bmp)
-		$(use_enable bmp image-loader-wbmp)
-		$(use_enable dds image-loader-dds)
-		$(use_enable drm)
-		$(use_enable drm elput)
-		$(use_enable eet image-loader-eet)
-		$(use_enable elogind)
-		$(use_enable examples always-build-examples)
-		$(use_enable fbcon fb)
-		$(use_enable fontconfig)
-		$(use_enable fribidi)
-		$(use_enable gif image-loader-gif)
-		$(use_enable gles2 egl)
-		$(use_enable gstreamer gstreamer1)
-		$(use_enable harfbuzz)
-		$(use_enable hyphen)
-		$(use_enable ico image-loader-ico)
-		$(use_enable ibus)
-		$(use_enable jpeg2k image-loader-jp2k)
-		$(use_enable libuv)
-		$(use_enable !luajit lua-old)
-		$(use_enable neon)
-		$(use_enable nls)
-		$(use_enable pdf poppler)
-		$(use_enable physics)
-		$(use_enable postscript spectre)
-		$(use_enable ppm image-loader-pmaps)
-		$(use_enable psd image-loader-psd)
-		$(use_enable pulseaudio)
-		$(use_enable raw libraw)
-		$(use_enable scim)
-		$(use_enable sdl)
-		$(use_enable sound audio)
-		$(use_enable static-libs static)
-		$(use_enable svg librsvg)
-		$(use_enable system-lz4 liblz4)
-		$(use_enable systemd)
-		$(use_enable tga image-loader-tga)
-		$(use_enable tiff image-loader-tiff)
-		$(use_enable tslib)
-		$(use_enable v4l v4l2)
-		$(use_enable valgrind)
-		$(use_enable vlc libvlc)
-		$(use_enable vnc vnc-server)
-		$(use_enable wayland)
-		$(use_enable webp image-loader-webp)
-		$(use_enable xcf)
-		$(use_enable xim)
-		$(use_enable xine)
-		$(use_enable xpm image-loader-xpm)
-		$(use_enable xpresent)
-		$(use_enable zeroconf avahi)
-
-		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
-		--with-glib=$(usex glib)
-		--with-js=none
-		--with-net-control=$(usex connman connman none)
-		--with-profile=$(usex debug debug release)
-		--with-x11=$(usex X xlib none)
-
-		$(use_with X x)
-	)
-
-	use drm && use wayland && myconf+=( --enable-gl-drm )
-
-	if use opengl ; then
-		myconf+=( --with-opengl=full )
-	elif use gles2 ; then
-		myconf+=( --with-opengl=es )
-	elif use drm && use wayland ; then
-		myconf+=( --with-opengl=es )
-	else
-		myconf+=( --with-opengl=none )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if host-is-pax && use luajit ; then
-		# We need to build the lua code first so we can pax-mark it. #547076
-		local target='_e_built_sources_target_gogogo_'
-		printf '%s: $(BUILT_SOURCES)\n' "${target}" >> src/Makefile || die
-		emake -C src "${target}"
-		emake -C src bin/elua/elua
-		pax-mark m src/bin/elua/.libs/elua
-	fi
-
-	V=1 emake
-}
-
-src_install() {
-	V=1 emake install DESTDIR="${D}"
-	einstalldocs
-
-	if ! use static-libs ; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/efl-1.23.3.ebuild b/dev-libs/efl/efl-1.23.3.ebuild
index 982a3b498ff0..3a1dc1e3db54 100644
--- a/dev-libs/efl/efl-1.23.3.ebuild
+++ b/dev-libs/efl/efl-1.23.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="+X bmp connman dds debug doc drm +eet elogind examples fbcon fontconfig
 	fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
 	lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 02343d8644fd..4d01748725e9 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -18,12 +18,10 @@
     <flag name="ibus">Enable Intelligent Input Bus</flag>
     <flag name="ico">Enable Ico image loader</flag>
     <flag name="json">Enable lottie animation support</flag>
-    <flag name="libuv">Enable <pkg>dev-libs/libuv</pkg> support</flag>
     <flag name="luajit">USE <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="mono">Enable mono bindings</flag>
     <flag name="physics">Enable Bullet physics effects and support</flag>
     <flag name="pmaps">Enable PMAPS image loader</flag>
-    <flag name="ppm">Enable PMAPS image loader</flag>
     <flag name="psd">Enable PSD image loader</flag>
     <flag name="scim">Enable Smart Common Input Method</flag>
     <flag name="system-lz4">Use system liblz4 instead of bundled one</flag>
@@ -31,7 +29,6 @@
     <flag name="tgv">Enable Tgv image loader</flag>
     <flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
     <flag name="unwind">Enable debug support via <pkg>sys-libs/libunwind</pkg></flag>
-    <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
     <flag name="vlc">Enable <pkg>media-video/vlc</pkg> support</flag>
     <flag name="xcf">Enable XCF image loader</flag>
     <flag name="xim">Enable X Input Method</flag>
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 49ecda8d3646..a1d008121e2b 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -6,6 +6,7 @@ DIST ell-0.24.tar.xz 473332 BLAKE2B 97b5f5de1a4680f5b8da5db8d151df56d2eadb511c54
 DIST ell-0.25.tar.xz 473392 BLAKE2B cefb71c0bd1c30a1c2e85baf19097f9028b3d2d1e8df14beb231f3c52f39e2ec98fbafdfbba4c05e94328c0c5747eb49111e1c76b3cb02fe22c09b51a5016f17 SHA512 7f12e2dfae16a38750166787ede7e3bf6def1e15a8bcb33bdba80ff84c2930d1857437f4ab871c408a52b18fec2212856ae9190ddf5eb542e90ebc76edd1f693
 DIST ell-0.26.tar.xz 473512 BLAKE2B bad1545b65caad7263e03156740ef5dfc401536fc063f34bdac5346a9edca8b7b16fd175abb264a6163e9dca87d1469f388984a95962dcc695e3e98549ff2a0a SHA512 b7a841f6e3c50077b60c210549744344ee70b5116bc9ee0f44dfea896f68fe6ab89a6fa38fcfe04e259648de978162aa5592f2e07accf13825584b40d57ef6cb
 DIST ell-0.27.tar.xz 474412 BLAKE2B 3b7d7ccfff8a92bbe930032b6a54bdc91b6541d1e6d8e514f1e49fcd08f3f5bc47beb3722dc864a63dcbbd72f793fbc2bc590b168f1623ff6e7088fbc960acb1 SHA512 ecda285155ef5ac1b8bdeabfba2e972149a5027c85236af74366c735aec7304b2dee8ff6aa931000b4299e8bb7654e7d4a63c1738de6e6e740f5ba16467f2823
+DIST ell-0.28.tar.xz 474880 BLAKE2B 2c571f952056c9f4e3e8c245b2b57645c4baa2935fdbe758170dcfe689f4db2162322f25a80cc5a7d4d5bded6159d1fa0d583be979a2708d32e61e91d1ced585 SHA512 6c3aef4d403878c0c9b8a1e5e8861656f2abbab19dd275b1aecca899ca615c00aee30e18f194435ec6be859adcffbe3703a79b13508e1e76c2192ec51f7c0cd7
 DIST ell-0.9.tar.xz 396968 BLAKE2B 566735cedd3525c4fd3fec9cec0e9b089dd60c6b79416a9c254c771729b6db9137af050f4c7f9c4c6dfa1ce33b8c7d41b877c9e3caa582c6ab9be716bd986a8b SHA512 e1208066012b9ff927baae271f94116376ccd2577d7f6510cc1444eee912988aa1c25e8e8c9195cccfa39ed48fc8c2f07bd7a414719e6ce76ee1e5bd2a64b8c3
 EBUILD ell-0.20.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.21.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
@@ -15,6 +16,7 @@ EBUILD ell-0.24.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96a
 EBUILD ell-0.25.ebuild 1054 BLAKE2B 609206decdfad3a5929fbb2b9f41c7ac9cc0b947b96ae9d309e7dc0b4c95aec83e53aa5ede969117f04c4c299a341f2d3c1c81810e0aee3479292fc1b2d5131a SHA512 98bc0759c7ccf989e440d7664143bda49416130d19d066e4bc4ff9adce702ba075da43aed9c09ae2d596a0ccdd3915afe115d0a6680c198a37598a55e81b1074
 EBUILD ell-0.26.ebuild 1053 BLAKE2B c0cd7bb5e24325b1c318ec0796b05d8e8b74b95a94bb4940d25e7f608bc71dd45ce870809f402fc2886d5b4e31863256029a4b296149245a9b0dbc5cd90c867e SHA512 696af928f58f982b99f7b74351b15d231e7a367a0622bc078d512e0b22347c65ef6f049b57e157e9630f638265fdbd5b62e3dc7c06c26a4e1b3a6f1617eda146
 EBUILD ell-0.27.ebuild 1055 BLAKE2B 82bc62ee0f9f22caf0d0aaf85a98ddcc3f543d5150220c514c9eda74ec30dec8ee7bf9490030dfc4d92994b155ddfb40d21aa2b0889b78463d65804b53c2bcee SHA512 6ac6af0784d2c94afb47c6910403c05d21d06d3e76ec95b088c80515f2f1c0fd11eb4616c18e9e4c1fda38650632460e216706c5922933add4708bdc316566bb
+EBUILD ell-0.28.ebuild 1060 BLAKE2B 66bafb93ce83f0a394e53b6d8293ac32bdb32c42345d4b9078b230ca50b7e287e63266ac924bc96a532bc3edec2f9fb0f9ba0f1fdc7821a7bcebb026a4e1fda9 SHA512 975ddf76ae6fb0dbb8b09907570383c950f0c8956b2ec67e0cdf0aad0c80b70b6ebb780a97be39e7ba6e5e1444b1ac241c25be650430835ad022552a0e2d204b
 EBUILD ell-0.9.ebuild 821 BLAKE2B 000640e99b5e0c1e1a328014a8edfe47cc197201757fc6b4e71ce3c9efe27d7ea3f89c7171c2366605374624b4282fbf2859b1832d3f5136e4c713ccf0530391 SHA512 9d497dbe091631b7863b8f403e2ae138cf30c38a1b1eb7e98b775275649fce9c67717599f1ca38ab705dd7bb33e8bc406035c2102c368fa83a15c13069c0b79e
 EBUILD ell-9999.ebuild 1060 BLAKE2B 66bafb93ce83f0a394e53b6d8293ac32bdb32c42345d4b9078b230ca50b7e287e63266ac924bc96a532bc3edec2f9fb0f9ba0f1fdc7821a7bcebb026a4e1fda9 SHA512 975ddf76ae6fb0dbb8b09907570383c950f0c8956b2ec67e0cdf0aad0c80b70b6ebb780a97be39e7ba6e5e1444b1ac241c25be650430835ad022552a0e2d204b
 MISC metadata.xml 454 BLAKE2B a0768369a4193ad0aa995290515a1c2e2a99e363d345d33a52933ac274e0c10364801ed20727a78f0d22088bfea0eb833d54f08d4de47790e6e0213a0318ecbe SHA512 583e77bec8ec2bed4e72ae117a7afba7cbe3abd0c3d139227aaebd0f06081faf827356e871494c9fbd16bc16a146f23099729afd80e2583e2bacbda9226bfabf
diff --git a/dev-libs/ell/ell-0.28.ebuild b/dev-libs/ell/ell-0.28.ebuild
new file mode 100644
index 000000000000..615074c27a1b
--- /dev/null
+++ b/dev-libs/ell/ell-0.28.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
+HOMEPAGE="https://01.org/ell"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="glib pie"
+
+RDEPEND="
+	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
+
+multilib_src_configure() {
+	append-cflags "-fsigned-char" #662694
+	local myeconfargs=(
+		$(use_enable glib)
+		$(use_enable pie)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	local DOCS=( ChangeLog README )
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/gdl/Manifest b/dev-libs/gdl/Manifest
index c597aec6e404..a7f0d11c57a6 100644
--- a/dev-libs/gdl/Manifest
+++ b/dev-libs/gdl/Manifest
@@ -1,3 +1,3 @@
 DIST gdl-3.28.0.tar.xz 541252 BLAKE2B 7254a9e15e9e79229c85b12c02ff5307bf99569428b13629ac8b3a5e79383f14a248d6e74f139e44145cd1a2825a2d10859c922a07a22fe1243edfafdb01514b SHA512 d6a697b8cd098abfcb560d8b6c8a326b05f6f22211a3bc92ea458d643170abc514acd4105e372fb61777d2a5dd09709d7e3d6d3ad75215fffdf2809b3df3c471
-EBUILD gdl-3.28.0.ebuild 717 BLAKE2B 5420ef2fa53f6675cdf177e3023f27639d99ee74349f06b7c93238ed11d46a342661e2536703f598e045bf962f7df7c1136100166b5b0faa2146a8a113cb443f SHA512 80ce35b4557c73bf7efa803c4c495145d016735328d792ddeb542fd8118ed03e3187e5651239c3843e4b4be1b789260e095ea02ee9b7df06b1fcef0f294bcc9a
+EBUILD gdl-3.28.0.ebuild 718 BLAKE2B ba3464870bc5dd164669573444abb5c76ab39dbfbee74d33e87ec0d8b40dda7b73cd515041aec636eafab174420918dc586ad9198de4b002c37ace0781eb2b43 SHA512 30f3c1f39244997cf01f4d456c8b7b551770938b1a584cafea94da8a5c87cbfae70cb7714c3b00fcd99751198633f53478b03d74de3eaeb116ea085ae10d273b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gdl/gdl-3.28.0.ebuild b/dev-libs/gdl/gdl-3.28.0.ebuild
index 81ce966a715c..2b38e3b527f0 100644
--- a/dev-libs/gdl/gdl-3.28.0.ebuild
+++ b/dev-libs/gdl/gdl-3.28.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
 LICENSE="LGPL-2.1+"
 SLOT="3/5" # subslot = libgdl-3 soname version
 IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/dev-libs/go-fuse/Manifest b/dev-libs/go-fuse/Manifest
index 1f655bb164bb..783f0bc6dc2e 100644
--- a/dev-libs/go-fuse/Manifest
+++ b/dev-libs/go-fuse/Manifest
@@ -1,6 +1,6 @@
 DIST go-fuse-0_p20140812.tar.gz 111389 BLAKE2B 13cc74fb8844b0486e593ab62e5564111d0a01361edfb3be4c8b0ae3bc298d0043ad80a33318a407236e74f0d9bcea2f87ba4681db4d34ad8818a32b8fa0e459 SHA512 d951094e290bc914b418c165106368d6b73634ffb177b770ce53baaca4cd6026967f11d602b3e687e59a49323c7af1af74913ec1a911093e4e32503025842cb3
 DIST go-fuse-0_p20150422.tar.gz 110741 BLAKE2B 4c01af2a86a97ea9d0309066bc032aa41847b74edc18bc91483fbc789e143f297c90c7fe89f7c376ec0f12859d337a271122884bab79b4e9a94f95bacb63e426 SHA512 a0c9fa666ab39632db258baa5bf6ba1546aa847beb0d4a4b812a96e66d8573e3c0a0600ad24e16e314fbd8082b36027a3e1bc2092667766f611b1321aaea70c5
-EBUILD go-fuse-0_p20140812-r1.ebuild 1379 BLAKE2B ba788c52241655fc72a0bf5646d656410cb10936a3f9e6873a78e98c01107f275d4d3338cc4dc89d8544ecdbca3a04674e462310b579a919610a9c8fe2b8e7f5 SHA512 5605e07f718424b11adbd14907cb371b6c203565542731aedcaa647cc82fb6b706aed51c09766ae98cbf9a289f074d10b63392efb76783a0accc295b48afb72c
-EBUILD go-fuse-0_p20150422.ebuild 1175 BLAKE2B 36c74448cdb232be840afc69bf07ab909468ea1229c01e09e79da749b4722604be7209c0fc284f4733826896b818098f245ea2e6c8b8ab4d0a71a3ae475a4d0a SHA512 501d9403f7505622b1c6671db51d7c7ad2e417d30d3de68adfe9c6c2d04ddb67b6f3457fab94f4180f6b8d1794fbbc5ddd0d1e2b535ba73272ba9e9e53510a90
+EBUILD go-fuse-0_p20140812-r1.ebuild 1396 BLAKE2B 6cf1a95d60bbba45dd0854b5407eb7f882617eab012623396ecca511ed469e84c625393835c4a0a6e90950aad15ce88e09b906ec020e25e20a59ac986f4352ba SHA512 5ee5ac97c30ccb8968c6f7136fab3ee89a38ad8eee50fab1aac2a0ee1e7714f3c19ffdf6c969c064704b5c908913b97ac06d0820d1dd52823df522c5dda41d9f
+EBUILD go-fuse-0_p20150422.ebuild 1192 BLAKE2B b6486de417a5dce2400f774f3c4cd81bc31597e139b767a9f8dad7d6bddee3c3479ecaa69f7d227ca16f552a60beab9e09324de811b658d7bcdf916b2a25ba18 SHA512 0efea3292243977eecf6319cb99542b6f752d91162a6d5df86bc1b62c235c210a09be7da22fe82debf27698c96c64b5e0a95777f662cf29e2270110bbe9f623c
 EBUILD go-fuse-9999.ebuild 1266 BLAKE2B 863b8fcbdee31d71dc5ad97be41f62df5142cc63f6fc60f068679e9eadf82ba381a5fd5a869243402fe5933f2883228391450a12479776b4dcc3bd1b008c88fc SHA512 34ad9860ee72c0a8555be7c232eb3526923326ac1328536cbe1040ac42825a107a82dad06b32eec93dcfda15cc4db1868f5dee8964eca10a3d00fae9d8c9734e
 MISC metadata.xml 336 BLAKE2B de18fba9c2787705a6a3589ee62ac0147e67b24717499e2b2072a876e44b7529c7ddbd8ac238b6f13d0e1170b608d5de19bb9715825b333f771fc3b29aea21a9 SHA512 d8919ea0b18f378d1dfcae8879976485da1fe27d700fbad0006a9e835a4e87ddae1e91703be9d6ec6d8232737049805f57adf93d9cebbe64c7ad82bf1fed7373
diff --git a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
index b697e9c46d3b..b73da8e807fb 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20140812-r1.ebuild
@@ -8,7 +8,7 @@ inherit eutils
 GO_PN=github.com/hanwen/${PN}
 EGIT_COMMIT="8c85ded140ac1889372a0e22d8d21e3d10a303bd"
 
-HOMEPAGE="https://${GO_PN}"
+HOMEPAGE="https://github.com/hanwen/go-fuse"
 DESCRIPTION="FUSE bindings for Go"
 SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
index 894c8c631d8b..f2386f6a8c31 100644
--- a/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
+++ b/dev-libs/go-fuse/go-fuse-0_p20150422.ebuild
@@ -8,7 +8,7 @@ inherit eutils
 GO_PN=github.com/hanwen/${PN}
 EGIT_COMMIT="ffed29ec8b88f61c1b8954134cc48ef03bb26ce1"
 
-HOMEPAGE="https://${GO_PN}"
+HOMEPAGE="https://github.com/hanwen/go-fuse"
 DESCRIPTION="FUSE bindings for Go"
 SRC_URI="https://${GO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index d645008e22f9..3375247b1081 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,3 +1,3 @@
 DIST gobject-introspection-1.60.2.tar.xz 1285000 BLAKE2B 43d96bbac8dd6600726876277f945e7eb01dba2063907c21960cbf5f49d766ac156ed116641b69dfe28f3025c4b482ffd39e8e107aba9ee48010a500111a58e4 SHA512 8e8c1c3a025cb6c18933302ada8cce7c4826f22eef791c80a97abb28379239f8d99312e1237bcea1060f4d5cf65441909b9da434561982209bb4976b1f22529e
-EBUILD gobject-introspection-1.60.2.ebuild 2159 BLAKE2B ed9fcec2fc965bca3fc726f819bc09de7dd6259648dbb9303607b81e66fc305196fa6ade2dba675b8c4b990da58c0a36f4166a3a9f79fd7e7f77f8d7a8e79e46 SHA512 159fb5e70b7f4639a563a083f664816c2b3b93894309382b1ccc457a19a3124f35fae4ecf43cb03b4b0cb4eb47582df7d1119d9f5bc4413a9660156001f3c565
+EBUILD gobject-introspection-1.60.2-r1.ebuild 2246 BLAKE2B dcf18d94a0416c1555dee6bf95b04fba01e87a37289ded333b74382dc51e05043a2e2a009f25da75acfba996983fcff22cba118cc7b01b423083d56d64471d3d SHA512 1565cfdc1944e9189d5306a0c575c310bbbba66fd6166ecfde06e24b3cc55e7185d8348eaf3f1b91a4682ad7d6aecdbf0d7c6370b68caf3837265fa1993c04cb
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
new file mode 100644
index 000000000000..8a63af2a15f4
--- /dev/null
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.60.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="Introspection system for GObject-based libraries"
+HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+IUSE="cairo doctool test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	test? ( cairo )
+"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# virtual/pkgconfig needed at runtime, bug #505408
+RDEPEND="
+	>=dev-libs/gobject-introspection-common-${PV}
+	>=dev-libs/glib-2.58.0:2
+	doctool? (
+		$(python_gen_cond_dep '
+			dev-python/mako[${PYTHON_MULTI_USEDEP}]
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	virtual/libffi:=
+	virtual/pkgconfig
+	!<dev-lang/vala-0.20.0
+	${PYTHON_DEPS}
+"
+# Wants real bison, not virtual/yacc
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.19
+	sys-devel/bison
+	sys-devel/flex
+	test? (
+		x11-libs/cairo[glib]
+		$(python_gen_cond_dep '
+			dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+" # autoreconf needs autoconf-archive
+# PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
+PDEPEND="cairo? ( x11-libs/cairo[glib] )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if ! has_version "x11-libs/cairo[glib]"; then
+		# Bug #391213: enable cairo-gobject support even if it's not installed
+		# We only PDEPEND on cairo to avoid circular dependencies
+		export CAIRO_LIBS="-lcairo -lcairo-gobject"
+		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
+	fi
+
+	# To prevent crosscompiling problems, bug #414105
+	gnome2_src_configure \
+		--disable-static \
+		CC="$(tc-getCC)" \
+		YACC="$(type -p yacc)" \
+		$(use_with cairo) \
+		$(use_enable doctool)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Prevent collision with gobject-introspection-common
+	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
+		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
+	rmdir "${ED}"usr/share/aclocal || die
+}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
deleted file mode 100644
index 4b780a3b6c9b..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.60.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="Introspection system for GObject-based libraries"
-HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-IUSE="cairo doctool test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( cairo )
-"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# virtual/pkgconfig needed at runtime, bug #505408
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.58.0:2
-	doctool? ( dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}] )
-	virtual/libffi:=
-	virtual/pkgconfig
-	!<dev-lang/vala-0.20.0
-	${PYTHON_DEPS}
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.19
-	sys-devel/bison
-	sys-devel/flex
-	test? (
-		x11-libs/cairo[glib]
-		dev-python/markdown[${PYTHON_USEDEP}] )
-" # autoreconf needs autoconf-archive
-# PDEPEND to avoid circular dependencies, bug #391213; but needed for tests, thus test DEPEND as well
-PDEPEND="cairo? ( x11-libs/cairo[glib] )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if ! has_version "x11-libs/cairo[glib]"; then
-		# Bug #391213: enable cairo-gobject support even if it's not installed
-		# We only PDEPEND on cairo to avoid circular dependencies
-		export CAIRO_LIBS="-lcairo -lcairo-gobject"
-		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-	fi
-
-	# To prevent crosscompiling problems, bug #414105
-	gnome2_src_configure \
-		--disable-static \
-		CC="$(tc-getCC)" \
-		YACC="$(type -p yacc)" \
-		$(use_with cairo) \
-		$(use_enable doctool)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
-		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"usr/share/aclocal || die
-}
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index e4bfdad206d2..0106e96bfcd8 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -1,6 +1,6 @@
 AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc
 DIST hiredis-0.13.3.tar.gz 58291 BLAKE2B 2af5853475a48b1f05c17100197633af61663a23a1259c702545938367b6a5b9fc09b886e12f57d27f23db3f5c636bb42d7e58887cc1481b7016cea405345ddb SHA512 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
 DIST hiredis-0.14.0.tar.gz 63061 BLAKE2B 1923a63317f5f4a5bcbc9f8fd35e11fda15c30bb766d377f3be1eaf961cf34339e16b9b7c468b5bf07e513db4913c564e49eb29a2684b945db6c914b07d01905 SHA512 57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0
-EBUILD hiredis-0.13.3.ebuild 1872 BLAKE2B fda15070c741dcda0a4696bdafe06d06dfae5552e9ce6da4c75a7a8a1ebd78bfc13cbe95d3167552b38d1e3ccc83c43dcc3061dffa44779192f9efe3f3597e42 SHA512 3e4ce6fb3f440d4e13ab71da8b13c3a1b838790e81dde82e811cc29ad8ebcd0ec8c829c4c173259d15812d3a5c237920f842b9c162ef3cfa7bfd8ae5b5476bdb
-EBUILD hiredis-0.14.0.ebuild 1884 BLAKE2B f4a58ee03ee045213dc4a1fe66511082857c79d2c9bc0e468d5cb31e1696cb5290121149e19f4fc30d9ac9bd58fcaa73cb3acc90a322d61c759bfa7b127db724 SHA512 f41ab5694ae37de96945666f48d86afeaeb1ff161db3a480589abaaabab8779b9405c50fb51be46e55782600783a69bcb484c5d0935839739d4e446810825252
+EBUILD hiredis-0.13.3.ebuild 1870 BLAKE2B facbe66e462079e237a670b2cbe699b020075648f0ed0e178f8581c4ed0ff567482890c7fc0ba321d96161ab42294fc3e65c384c9836fe765bd14878ffe67860 SHA512 61bfca9c72ffe51105048909d7f66526b2051cdb68c52abc0f35f1e01a9b9a4d44531fb93b99d1d9e2f1badab98ee2ff2f09acc8b0deda23f650f57faac8ef61
+EBUILD hiredis-0.14.0.ebuild 1878 BLAKE2B d735004be7f0afc70dbf6cdb4a230685c1026ced55cf61e48927a96ad268fc8fdb393ccbb41f35de9c6bc6f9592991807902048d25d4229d26dd115d9e04f565 SHA512 14560267c5f3c8d634a1d33bedd2aea6a7559ba1ce89840cf8e8e2b83e7dafe7dafd0912fb45b4e7d0bf4c5f112baf5c78b72946efbf53095c71da9c3470fa67
 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c
diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild
index 77e4dc9e8c53..33c0e2fabc38 100644
--- a/dev-libs/hiredis/hiredis-0.13.3.ebuild
+++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild
@@ -29,7 +29,7 @@ _build() {
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX%/}/usr" \
+		PREFIX="${EPREFIX}/usr" \
 		LIBRARY_PATH="$(get_libdir)" \
 		ARCH= \
 		DEBUG= \
diff --git a/dev-libs/hiredis/hiredis-0.14.0.ebuild b/dev-libs/hiredis/hiredis-0.14.0.ebuild
index e9e551acd1a5..c87b5ddc5a1f 100644
--- a/dev-libs/hiredis/hiredis-0.14.0.ebuild
+++ b/dev-libs/hiredis/hiredis-0.14.0.ebuild
@@ -29,7 +29,7 @@ _build() {
 	emake \
 		AR="$(tc-getAR)" \
 		CC="$(tc-getCC)" \
-		PREFIX="${EPREFIX%/}/usr" \
+		PREFIX="${EPREFIX}/usr" \
 		LIBRARY_PATH="$(get_libdir)" \
 		ARCH= \
 		DEBUG= \
@@ -65,9 +65,9 @@ src_test() {
 }
 
 src_install() {
-	_build PREFIX="${ED%/}/usr" install
+	_build PREFIX="${ED}/usr" install
 	if ! use static-libs; then
-		rm "${ED%/}/usr/$(get_libdir)/libhiredis.a" || die
+		rm "${ED}/usr/$(get_libdir)/libhiredis.a" || die
 	fi
 
 	insinto /usr/$(get_libdir)/pkgconfig
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index 9197904b91e7..0ba39be6833c 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,7 +1,9 @@
 DIST hyperscan-5.1.0.tar.gz 1810559 BLAKE2B 0946b3afe00cdce51b82852515ffe674729854d762854c252ba90fc73cbdc23205fe75f8e6c4e976efb31bf10950076b5790bd9692768dabcbd642d53e739c32 SHA512 5e6d11429e61dc061dd31e6b311a8c1dbfcd03af6e24d97b95eb2cef24dcd33d593064e5faa7c22807d785a8921bc410a69a43c4e5b3d7b4774f37c4a12a025d
 DIST hyperscan-5.1.1.tar.gz 1811275 BLAKE2B 524f1fbdfd470cd12ebb0ab4e122a97f6a90a1027adfa0850921a8f80c09f87792fed3da6b10367336b1e84987414bda93b98aa30aa9ff6dd899bf29fdd4294a SHA512 2812174890f775bc0c99019afe49cfde9ecc1107626cb4f1c9e1518228d090cba43bc15a19beaa00bae2a8a3dad85e7f27d4b237973360a294db78098fcb8508
 DIST hyperscan-5.2.0.tar.gz 1818751 BLAKE2B 4d74a4d022a59ee37c7df274ff1a37153898aa403bdfa3ec39df7304f7f65bcae1bbc074a2801223ef00903a5b8a01845e985c2ad196496d40899bab79df3844 SHA512 4d56e2d02dfbedf3caa8b212dae2ac3575b343b1ed2a75e91f6074ef265bbc28cfb78ad7f08dc47d7cc2e3e3e02e488c4cb75efacc41755f993236d97ddcb4cc
-EBUILD hyperscan-5.1.0.ebuild 778 BLAKE2B 284cbe1b20de0502a6f0b37dcab5993a4dac89d35d7806f56c90bfed11bf533187a8b5e2efd60f82bdb6e697674feed6a308a869f77f9c197c819fb43f4ed09b SHA512 0dc0f886dbe41fd7a2ac437586e664cc8fb7a65480698ad28e743342fd23303291df88450686836f0affe5e7bd5f15fae4319298db915112a12556bd8f9da9fd
-EBUILD hyperscan-5.1.1.ebuild 875 BLAKE2B c75b0928f76f19df13f2af28c804b84f1243eb95c8fd65ca5ee103c34150e0082efe63eb365f7891484cbddf28014afcae556bb275db017504c59d0656a4a517 SHA512 ddea5e7a39ce0586f3e715b885d2c8e01953bc401f7755a2c278c50ae3147a4be96fa45fc9fff956fdb47c303354df0d45f9f386da5b1b77008070ceaf0a8110
-EBUILD hyperscan-5.2.0.ebuild 875 BLAKE2B c75b0928f76f19df13f2af28c804b84f1243eb95c8fd65ca5ee103c34150e0082efe63eb365f7891484cbddf28014afcae556bb275db017504c59d0656a4a517 SHA512 ddea5e7a39ce0586f3e715b885d2c8e01953bc401f7755a2c278c50ae3147a4be96fa45fc9fff956fdb47c303354df0d45f9f386da5b1b77008070ceaf0a8110
+DIST hyperscan-5.2.1.tar.gz 1818935 BLAKE2B 8b073c946b970867221043b88f36203a0bfa3f2b94002ce2e46f0aa5c616d3e09f19a750510bd88ed30d0aa4324c0d0f04d6a816775b4bed2c246bbc1548b2f0 SHA512 e6ac2aef1f3efa1535c00d73fa590ea62fff4686c4ad3ee023d2e72c51896ca4616ec1b85d7c6f88ac7b42d92c3557b9c4bb3b51cfb796e20a79d53b28e53b6c
+EBUILD hyperscan-5.1.0.ebuild 813 BLAKE2B c9b2941dd08d11cf53c5180d5f45a4091185f94198c57a9f72ceb595015c84f355dcce7fac7e72dbd02ccf8fe4e21b14fcb50d270df2ba213f76c4c74adc3318 SHA512 60473762453443d896b96ff005ae58495e136f1bea3fa31380eba2747012ea73f886c2126ac5410a052b537f61ba345a52a6bac784dea6559739e3379db02317
+EBUILD hyperscan-5.1.1.ebuild 911 BLAKE2B 041491b397dd7f4ed9af4649d85c01f8e439d2f083e5a55274c6007e3d58191e5c792357333694b689eae39149a43e1f1cbe8dbc95f8beda235857cb57872e16 SHA512 d90ce5d7baeff45e00cf3d34cf94c336e7c62d3a41b837739206dc96c883acff091e3a6c483cfb6185a4f723cdefd13b20ce7ab42491dac1e59700ea1637e6f1
+EBUILD hyperscan-5.2.0.ebuild 911 BLAKE2B 041491b397dd7f4ed9af4649d85c01f8e439d2f083e5a55274c6007e3d58191e5c792357333694b689eae39149a43e1f1cbe8dbc95f8beda235857cb57872e16 SHA512 d90ce5d7baeff45e00cf3d34cf94c336e7c62d3a41b837739206dc96c883acff091e3a6c483cfb6185a4f723cdefd13b20ce7ab42491dac1e59700ea1637e6f1
+EBUILD hyperscan-5.2.1.ebuild 960 BLAKE2B 405bb4bd788e4471e6ba89a8d26df888d84e975240123be0eb598c4f5bee34d7c45920488ab14be4efba2bfcedd32d639041f4dd6bd7a45a4ebf9d5927fcd5e1 SHA512 3bf42a53408fe604a456109e6ce0671c57708d4c929af095d8c07d3e66e35e25c2db9f44c4af43054d2fc2fd85e6ddbae501911c1b8a1b75de2d9fa0d2091bfa
 MISC metadata.xml 444 BLAKE2B 135788c6bce69014c87cd2e80660f5ab8563afb0e2bddf281245d64e9787318b8b4cfa743d0d2648b40f40ce909dfe5a8677fe00114311c4d8ea88b037ff9afd SHA512 8b3dd40cc7b43125b2a7297c991143d74a5d3cbb70e0d5608ede859987cd27cae0a27b92c46419746d56a0f88252e6cb75ad6111ac25e920ba4e46acc8caa423
diff --git a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
index ec3fa0a718e4..52d8497da64c 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake python-r1
 
 DESCRIPTION="High-performance regular expression matching library"
-HOMEPAGE="https://01.org/hyperscan"
-
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
index f21c9535c2df..42551e93ced8 100644
--- a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://01.org/hyperscan"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
index f21c9535c2df..42551e93ced8 100644
--- a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
+++ b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit cmake python-r1 flag-o-matic
 
 DESCRIPTION="High-performance regular expression matching library"
-SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://01.org/hyperscan"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/hyperscan/hyperscan-5.2.1.ebuild b/dev-libs/hyperscan/hyperscan-5.2.1.ebuild
new file mode 100644
index 000000000000..8789fd913c71
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake python-r1 flag-o-matic
+
+DESCRIPTION="High-performance regular expression matching library"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cpu_flags_x86_ssse3 static-libs"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/ragel"
+
+REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	# upstream workaround
+	append-cxxflags -Wno-redundant-move
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+		-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/bin/unit-hyperscan || die
+}
diff --git a/dev-libs/hyphen/Manifest b/dev-libs/hyphen/Manifest
index 05e15b5089a1..c58255ae6ed7 100644
--- a/dev-libs/hyphen/Manifest
+++ b/dev-libs/hyphen/Manifest
@@ -1,4 +1,3 @@
 DIST hyphen-2.8.8.tar.gz 638369 BLAKE2B b20bf9476d573c344eeaa5088da5dad17ef025d37717391965880b60b78908bfa00347b4840267a8bab77bbf0c3d653313e342b892581f1864381c476804c3c1 SHA512 ee514952be56869840b70fb74f60eba14dc4de246733ff8705492367e8cf00c485f8778a9d5a7ba374c988d4ac9fedbe75826dc559e1b62465dbfba21f6ce7de
-EBUILD hyphen-2.8.8-r1.ebuild 751 BLAKE2B 99e901ddbd3aeb7ab344dd9f4cff9f172f7ce62213079f6576cdf33e6759e56f0c38d8a82bb65e891c7be05d169be5c5dd1ceeb804e39e013ded45a37c941927 SHA512 e12a7f2aeba6afac085fabf4edaadb354bc258b3dfc3db3974a7ed7ab51c7667578ebba1ff25124364eecac19523511a0e35e2c6c402d0fb9e19f36b432d5c5c
-EBUILD hyphen-2.8.8.ebuild 721 BLAKE2B 973906a5054ac995bd0a4c0604050cdd41b4397004bcd224f5b536246fcd902b685aecddd014f97f98c2adf6d131fff66797dcc2a090ab7cd2b59527c02d6612 SHA512 02691d1c40723bb7d559402008cbdf689dc0ba2247ab463e5e628c9edc4651e82c832b9054d3dc7fb428feff92d942653310250e3aeacb032cbc48a89696cc7c
+EBUILD hyphen-2.8.8-r1.ebuild 750 BLAKE2B 30a28efe2fc28684d96cb1e59281627bd5162264668e0e182c22a4b269e5abb03f5bbe7da9e3cf0a90b71529c55b1beb54255d8f4cb14a35c81282dd282fc79f SHA512 2b1d0988e846d99bd0c53457a7f9b12e054521a149c87e91e07a7d7a15c6d0a1cb740710454e8f2c332ff546c1aab2e8acc94fcc2c91820e4df1665692b677a4
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index 22bb0667ff6a..3c23fbe56f58 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/dev-libs/hyphen/hyphen-2.8.8.ebuild b/dev-libs/hyphen/hyphen-2.8.8.ebuild
deleted file mode 100644
index 315fe7fa9324..000000000000
--- a/dev-libs/hyphen/hyphen-2.8.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="ALTLinux hyphenation library"
-HOMEPAGE="http://hunspell.github.io/"
-SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="app-text/hunspell"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README{,_hyph_en_US.txt,.nonstandard,.hyphen,.compound} THANKS TODO )
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	rm -f "${ED}"usr/lib*/libhyphen.la
-}
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 06f2233fcb23..cb39607a3801 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,6 +1,6 @@
 DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec819f333f00033ef90acfd5b926fdcc743badf403af797a6f58fe58d195ec0cdf4a1514629f8a1e75c20a6e2f6 SHA512 4a8352e1d32c0ba8a0aea4df1663279cb2256b334643c5b62be37dfb5951e06900ba38c010d1201511fcf7de09137d6a4b886edbb2b99160d2f62b5f4679f766
 DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
 EBUILD jsoncpp-1.9.1.ebuild 1367 BLAKE2B d99f9444620096bd27c6618010c2e2953e362927e447286443a354bca85aeaf68de4223b1cb65be2fe11ba72638f61c7e8271a7f16ecfbcb4ecc9aa2caf9ab56 SHA512 c9ab1d7b1c2029b3f9fbca574f4c7b35bab866877745166fd2502ad6581b184535ff0348aa595d64d4dbdcf03481ca3228e6a1a1b49d3fa7c442a8f9af82cb77
-EBUILD jsoncpp-1.9.2-r1.ebuild 1382 BLAKE2B 6023bb2bc76bede8e7e0e4adef0dbfd349019acdac5981f04ffd1cfebd1e00a396696282ca83734a2b799cefa4a01890c6ebfb9730c3bdc4be3dd54ed866a740 SHA512 c2507dbe67f923f0201d4ebf291c0161d22e5b830b028000027e3bcdf92c949ee8577e0ec783a6d50b6220857efb62018a2d10942b0dbeda031c069619ea16a9
-EBUILD jsoncpp-1.9.2-r2.ebuild 1001 BLAKE2B 6107c074591edc1800dea6e6dfc0d8374e665bbc6e04d9d5c24e85be3934ee45834c3adf5920447d25ee5036ee918c8e5e028eee1e18cba7f64d88831c206ad0 SHA512 96b69f89c2d7c56cad2174029c97de0eef42ef4e48f2032367596c1e3735b928b4e876d7f161a26f3f6bce1564d96ae93895d045e827ebcc2ca97017db49ce1d
+EBUILD jsoncpp-1.9.2-r1.ebuild 1372 BLAKE2B e33bda4af994ea0ec1a2c7e8d5012f93e20dbe0583253ea8cd026d1e2bcc25a769500a47a58014471fe348f425c3301b3c3502522d0edcf09a1727d22d46c659 SHA512 eaddfaa3ddb9516b144472db2e584700f3862a9cf7fa4195b5d0b63a6f3e3a36ae2039a01e378981991b7adbd6cad140cb636741bf8b25d461e821faee73a8c1
+EBUILD jsoncpp-1.9.2-r2.ebuild 991 BLAKE2B e2f317f69acf14707bc1861e96689c89f7fceddd20a5639dc9431cd5824b078cc5794c566097ca0eaa054025668e1dbac3444daacd2f843801efa5964d486ddd SHA512 5ad3d87053f8af8b437cd5cd1fb5dfe23d38b476845da81e0d4b3bccc7d99e8f74057bd227e6699bd028ec10949a83cabd11f1e5deaa662732615340a9a9ac7b
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
index e9a33fb38a9f..822b5d285097 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
index adf6eea6b377..3e8ebb177b77 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit meson python-any-r1
 
diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest
index 18d88b35f17b..199a10110f43 100644
--- a/dev-libs/kuserfeedback/Manifest
+++ b/dev-libs/kuserfeedback/Manifest
@@ -1,3 +1,3 @@
-DIST kuserfeedback-0.9.90.tar.xz 182600 BLAKE2B 8f2d5face65e002ac805013fc897f55099bdbf19e7a4a5f6b26e1c728a2181ae3d11fcdad05417d3c5d3c81ab46958ae8ab237cd849df44f407ff823a066e94d SHA512 a4f5ee35d54479d0ed8c8e142c6d600a95f6a5e0179398953ef9e9b439b5f286ca90306577797478d53b07da258070710a442b227d6f70e4f2f372dd13b60aae
-EBUILD kuserfeedback-0.9.90.ebuild 1259 BLAKE2B e81fbad7a6cba8390efcdd42f389296002bb94c908c30ecff0730adca24a6aec6241c705f09dddd6d0b8cc6ad163d226726eff4bb974bbc026745836c24698f4 SHA512 0ac178c605fc106f6eafb66214b0ef810671bfba603f7894a43c13883c12950e7995617e8c0ab8a8abfb5289f4ac5a51d7a2a566283edd934211d1f84aa4c0ca
+DIST kuserfeedback-1.0.0.tar.xz 187784 BLAKE2B 24acb6c1f143a0811a84c7d4f5ffe923df2fe94b0d13e361870d308b65ee8be747cef1a2ab719c6023b4f5885fb9970620a2a5da0d073e70b1e4912c6f64c5d1 SHA512 d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7
+EBUILD kuserfeedback-1.0.0.ebuild 1257 BLAKE2B 9acae65acdf587e6aae6c03dfb144ac2cc06507de8118f020eea8f7644cc9bc92d57d570d58df7a6e289ee811958e42e326524188040fd6929adf46385d914b9 SHA512 7fc3ebf56053484dc164cca0745570c3f9a1c4c267ece38d57b7db5e1c421bb627bfbb2b9d5a01b4dfa9bbc1073bd98246104a8409401e8816ab8b25065757ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kuserfeedback/kuserfeedback-0.9.90.ebuild b/dev-libs/kuserfeedback/kuserfeedback-0.9.90.ebuild
deleted file mode 100644
index 32461ef3c280..000000000000
--- a/dev-libs/kuserfeedback/kuserfeedback-0.9.90.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64"
-fi
-
-LICENSE="MIT"
-SLOT="5"
-IUSE="doc"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		>=dev-qt/qdoc-${QTMIN}:5
-		>=dev-qt/qthelp-${QTMIN}:5
-	)
-"
-DEPEND="
-	>=dev-qt/qtcharts-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		# disable server application
-		-DENABLE_PHP=NO
-		-DENABLE_PHP_UNIT=NO
-		-DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
-		-DENABLE_DOCS=$(usex doc)
-	)
-
-	ecm_src_configure
-}
diff --git a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
new file mode 100644
index 000000000000..d254a943a562
--- /dev/null
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="MIT"
+SLOT="5"
+IUSE="doc"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		>=dev-qt/qdoc-${QTMIN}:5
+		>=dev-qt/qthelp-${QTMIN}:5
+	)
+"
+DEPEND="
+	>=dev-qt/qtcharts-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# disable server application
+		-DENABLE_PHP=NO
+		-DENABLE_PHP_UNIT=NO
+		-DENABLE_SURVEY_TARGET_EXPRESSIONS=YES
+		-DENABLE_DOCS=$(usex doc)
+	)
+
+	ecm_src_configure
+}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index c99b75e90abf..620ddad55716 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -4,9 +4,9 @@ DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba
 DIST leatherman-1.8.0.tar.gz 815287 BLAKE2B a8377cedac49e0845e689e4e8ff58fb59e6e59c77e8cd363774d22650b4b286d85e0b5e52b926c3e4169ba2eadf9fc50f16f5161001a16f63c49f3ca66c996cc SHA512 fb308025f0807b12527fe6fc287fee861eb27b6987df38c03e1da73c477aec5a2a6c92860c983c4cc10282388ee34f2cf657a38831db007519c471f815f492f6
 DIST leatherman-1.9.0.tar.gz 815504 BLAKE2B 62b4b9aeca3279b7f89fba1c3a7655e59c5d490cb44ba92e4c2dfe5ffa78eeb02a448bd6c6e6b08c324531b799ab5d1800a3b57c4e490794f76bf9737db16963 SHA512 d8e0fe7f165845056a0308241ef0e656077269cd6cbc656b1a72295ff475e813d3f523c8d45b14d7e10a8deebe786ac7fc836c46d4230142812a9c0362cd8967
 DIST leatherman-1.9.1.tar.gz 815756 BLAKE2B a0c8777531b066e247d8abfefc1b22fec825f7db22ef67cad6a703a7cd168f19349b13b923841e8064eec1e7bc7b755181b58370c7501b37710ac376687c5b43 SHA512 51dc356ec7196c7538fac154a094d3693de5ef89d50a07651753c400daff3ecdfbfe46516ffecfa592484aa1ec8afb891f2f2b6be62c94a8f0ab08a3bba65786
-EBUILD leatherman-1.10.0.ebuild 1179 BLAKE2B 13726a13fe2107141de86745224909019b492fbccf5e83b4e08156b498d80c83d959265dec427bb0c03808759a35e595d633880d6b829b4735393bf13958f786 SHA512 a8d3e0a56969c52486e1255b1245bbb75989c9c509b59c6fe01be8a2d8f4dd777f66cf7294cf28b9ce7c411c7662a8c4397312e1a444200b09cc1f0b773e09c3
-EBUILD leatherman-1.3.0.ebuild 1091 BLAKE2B 53d75a2e93e6eb2bc30446327f70d929b5550e298e1e6d8f9c6396d6bdaa8c5f08cf50b2bfa717f6c7e9a61b72575eb03ce83b8c0846595d25f536685779d8cc SHA512 c51284fd5eb7481623e606e4843595ff52875de13909c2d0e052f563953448444dce71a4a5d2f6aaf481970d3b89fd063e44311edb5be66de2a0522d6a429ff4
-EBUILD leatherman-1.8.0.ebuild 1177 BLAKE2B 3151809adaa90822e9ff2ea0ab19b1a25787e098b67ae26c47f53e5d5f0ba7698c0b452d990b54d53aad2fa11cee4e7c7a5f3cca4d615ca81d2cdbd9e7121c06 SHA512 157ce4dda5741fc00f0aa8ba3cc38650b0f7a5c72a890deaa32a8caf869359c3ccc4476e70750869e1d3762d9b0ac3701ef4b895d3aa9dfca7c83628cd50f7f9
-EBUILD leatherman-1.9.0.ebuild 1177 BLAKE2B 3151809adaa90822e9ff2ea0ab19b1a25787e098b67ae26c47f53e5d5f0ba7698c0b452d990b54d53aad2fa11cee4e7c7a5f3cca4d615ca81d2cdbd9e7121c06 SHA512 157ce4dda5741fc00f0aa8ba3cc38650b0f7a5c72a890deaa32a8caf869359c3ccc4476e70750869e1d3762d9b0ac3701ef4b895d3aa9dfca7c83628cd50f7f9
-EBUILD leatherman-1.9.1.ebuild 1179 BLAKE2B c7e13c301c4d161afca945a196e62af93d03a3b13eab021613710423c3d6c5ff0e6caa464284abf24be953465708a5236411b8b1878c68c4d61449d4a0907cc1 SHA512 9bc9e413fc5e30aa9bcd5ee8c02781a0545e3057462317e0e0d5affef1334cac07782c39ddf52b8647b65df1f751d33cccc231d33f31c426e67fdfe1bc8c3a86
+EBUILD leatherman-1.10.0.ebuild 1149 BLAKE2B fda0e19074801348d21878b2384d3e798fc5052ec95f504fd25345d73df8b3c9d07a4c68757429468218d73c9014a66ba6dc849f86c28c7778ee2a69cc5eea22 SHA512 79d9503051af852eadc7b97957d13ebe6c585480664951a09f0b18635025e3f796c99e54c7fb2bc7cac932b68d36ff4e6f1dc8ab062e278728855046d6eb4e7b
+EBUILD leatherman-1.3.0.ebuild 1061 BLAKE2B 6746bfad248fff04b92bf83e90b68441a9626ce74ff3ac10bbdd0fde45f527940ed87fa7008f6bce5d441cb8b826192a58d36a9b34fc5b4088b2e6b294435cf3 SHA512 88ad0b28642f62b6e828dec3945dd616224e2080a2aca3215e7d24e59a3a532da66da363631848685b7d034a6d3fa28f6fd7000848e2b4a7843df6704450c478
+EBUILD leatherman-1.8.0.ebuild 1147 BLAKE2B 95571a3deb6cce15aa187d8fbf4307ac183537f4906200b645639cc8da60375215e753be25436295fa9913f794ab19bc7072b43aa09eb8ad30e210cac05f618a SHA512 ed666a70945b7fe6c12b8cfc49b3d00a280b4e12b0fc6d4ad6238e37a9d6f48a106f2e60279d5c7b7394224cf127b8ec8e90eb9f169536c64468639003afbdcb
+EBUILD leatherman-1.9.0.ebuild 1147 BLAKE2B 95571a3deb6cce15aa187d8fbf4307ac183537f4906200b645639cc8da60375215e753be25436295fa9913f794ab19bc7072b43aa09eb8ad30e210cac05f618a SHA512 ed666a70945b7fe6c12b8cfc49b3d00a280b4e12b0fc6d4ad6238e37a9d6f48a106f2e60279d5c7b7394224cf127b8ec8e90eb9f169536c64468639003afbdcb
+EBUILD leatherman-1.9.1.ebuild 1149 BLAKE2B f4e5c9d54e2e718c39f18567b54aa074faf2e7dd133eee41a6cb8b20b51e9d2cd60e6d47bc528c1c1d4aa4a2a51a62b55b8041dd84fb8623d1d4b98c42ec7592 SHA512 2cb9442fd75f52223eb5fa7a6a018f65dbe13f41854ea962ffc0e7d88e95cb20126db8ddbe52ee7c0d522382e9d3647d5e3068b6ebd357153ddc6b73f6e94628
 MISC metadata.xml 415 BLAKE2B 9ab19e50b48bd911313c662cdae1221ba5c1222f6a80ec4836b63d1b07625011cfb1da7727fdd5f8156d24595df96a37376cf064f19eefc2d566fd6723afef06 SHA512 9450c72aff399df62f4479bee9e2e564bd7c451ee69fef1cf5c59b37331b312c982418de6d8dc1a5dcaec37050165413e13f83de5102e88e1c5fffa67d9b0023
diff --git a/dev-libs/leatherman/leatherman-1.10.0.ebuild b/dev-libs/leatherman/leatherman-1.10.0.ebuild
index ac093ea96d57..aef4cd923095 100644
--- a/dev-libs/leatherman/leatherman-1.10.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.10.0.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/leatherman/leatherman-1.3.0.ebuild b/dev-libs/leatherman/leatherman-1.3.0.ebuild
index 276c9fbb29ff..34c6c1180ae0 100644
--- a/dev-libs/leatherman/leatherman-1.3.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.3.0.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
 	)
diff --git a/dev-libs/leatherman/leatherman-1.8.0.ebuild b/dev-libs/leatherman/leatherman-1.8.0.ebuild
index 978d0a696adf..c4941f2415ce 100644
--- a/dev-libs/leatherman/leatherman-1.8.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.8.0.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/leatherman/leatherman-1.9.0.ebuild b/dev-libs/leatherman/leatherman-1.9.0.ebuild
index 978d0a696adf..c4941f2415ce 100644
--- a/dev-libs/leatherman/leatherman-1.9.0.ebuild
+++ b/dev-libs/leatherman/leatherman-1.9.0.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/leatherman/leatherman-1.9.1.ebuild b/dev-libs/leatherman/leatherman-1.9.1.ebuild
index 5767dcd6355c..af63706df334 100644
--- a/dev-libs/leatherman/leatherman-1.9.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.9.1.ebuild
@@ -31,7 +31,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 0e1bd58b651f..09d5e44810a8 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -1,6 +1,6 @@
 AUX libappindicator-12.10.0-conditional-py-bindings.patch 2019 BLAKE2B a57b1b2e3ac115ebc7395967f36b2f648abfba2abc32fb77505a77ddb63d3f7e99c0f5ceeeeabdbe541edc6db1f76fc23e28c0df81c0c4bea600d4a0f72b5f26 SHA512 69d86a3d1e930a0f0c79091dba9691610ecb0fcf13c672fc0ff511bb764b7f74f6c42cab558b6412863a8353fe9a8d72c40419db873fdc4716a93ba3bbbd0aea
 AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326b79a65f9ac7110c9d82a61efb993051d691d5cc728075bdd5ac904e9986cb0e41780d3e36e1637e5bd58532781934587b8c1bdf458e SHA512 b021bc0ec7fc1b311add7d6f8a9018fa6f5e807168055c95440e5f5d3d6d5b48375e11542b906058a0786194b1911c8bdcab9632573c1f128772ff6d54aa9173
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
-EBUILD libappindicator-12.10.0-r201.ebuild 2230 BLAKE2B c4d8027aca60142ed183ec9248b4ef6f5d4346727c36f69559bd19e77c77fe1a6c4a0045134ee190c2ca31c974fe1ed5a6e4b7161a9afda2c095031d3c66eec2 SHA512 34710e0c796dfc2091eaa98d2e72f6a27bbb5d45a00ed13981e83f892ca9ee3ca867a47faf65cc3a5318c654ae2fe8f13bc40c837862473d0a9e56f9c1998c4c
+EBUILD libappindicator-12.10.0-r202.ebuild 2268 BLAKE2B d00efd597c2fbe4a3c00da16bce78b581fedc2407677f18525265dfa3ac91dbcbc9f17c3cfc220104e411f3957724b0dc8219a039301148109628da5171aedf5 SHA512 508f637eeb1b4e6304aa7b8735a488f5b3edd822c792ee235018a35538d2e835585cd260ba5d0c77c665f99058a0cd6ed0ff2f019b62fa58be48e3a4059c70c3
 EBUILD libappindicator-12.10.0-r301.ebuild 1933 BLAKE2B 76a50a3d5790eb65d68d4d804e08be25c8fed69342ce5eceb83c7ea2e3f22dd762f96e79884a70fc917f452b5c85f3140527953140f7ccbfc8d33f542fefd56b SHA512 474781520757a59bb6ffb69dd9ea1a25f4da1964c5996cd6aa6a72e6a6f15272cb5090e52afd514b7f7a62b6c79567a614b97d8db57f128f2299d81cdca96c63
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
deleted file mode 100644
index 40fe8964c862..000000000000
--- a/dev-libs/libappindicator/libappindicator-12.10.0-r201.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib-minimal python-single-r1 vala xdg-utils
-
-DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
-HOMEPAGE="https://launchpad.net/libappindicator"
-SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="2"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libdbusmenu-0.6.2[gtk,${MULTILIB_USEDEP}]
-	>=dev-libs/libindicator-12.10.0:0[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP},introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygtk[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	introspection? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-conditional-py-bindings.patch
-	# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.12.10/revision/244
-	"${FILESDIR}"/${P}-vala-inherit.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	export MAKEOPTS+=" -j1" #638782
-}
-
-src_prepare() {
-	default
-
-	xdg_environment_reset
-
-	# Don't use -Werror
-	sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die
-
-	eautoreconf
-
-	# Disable MONO for now because of https://bugs.gentoo.org/382491
-	sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		local -x VALAC VALA_API_GEN VAPIGEN_VAPIDIR PKG_CONFIG_PATH
-		use introspection && vala_src_prepare && export VALA_API_GEN="${VAPIGEN}"
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--with-gtk=2 \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable python)
-}
-
-multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --modules
-
-	# installed by slot 3 as well
-	rm -r "${D}"usr/share/gtk-doc || die
-}
diff --git a/dev-libs/libappindicator/libappindicator-12.10.0-r202.ebuild b/dev-libs/libappindicator/libappindicator-12.10.0-r202.ebuild
new file mode 100644
index 000000000000..2803f1e0e278
--- /dev/null
+++ b/dev-libs/libappindicator/libappindicator-12.10.0-r202.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib-minimal python-single-r1 vala xdg-utils
+
+DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
+HOMEPAGE="https://launchpad.net/libappindicator"
+SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 LGPL-3"
+SLOT="2"
+KEYWORDS="amd64 ~arm x86"
+
+IUSE="+introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.98[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libdbusmenu-0.6.2[gtk,${MULTILIB_USEDEP}]
+	>=dev-libs/libindicator-12.10.0:0[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP},introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-conditional-py-bindings.patch
+	# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.12.10/revision/244
+	"${FILESDIR}"/${P}-vala-inherit.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	export MAKEOPTS+=" -j1" #638782
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# Don't use -Werror
+	sed -i -e 's/ -Werror//' {src,tests}/Makefile.{am,in} || die
+
+	eautoreconf
+
+	# Disable MONO for now because of https://bugs.gentoo.org/382491
+	sed -i -e '/^MONO_REQUIRED_VERSION/s:=.*:=9999:' configure || die
+}
+
+multilib_src_configure() {
+	if multilib_is_native_abi; then
+		local -x VALAC VALA_API_GEN VAPIGEN_VAPIDIR PKG_CONFIG_PATH
+		use introspection && vala_src_prepare && export VALA_API_GEN="${VAPIGEN}"
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--with-gtk=2 \
+		$(multilib_native_use_enable introspection) \
+		$(multilib_native_use_enable python)
+}
+
+multilib_src_install() {
+	emake -j1 DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --modules
+
+	# installed by slot 3 as well
+	rm -r "${D}"usr/share/gtk-doc || die
+}
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 58586e4347f8..af2ec6d4d460 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -2,8 +2,8 @@ DIST libarcus-3.4.1.tar.gz 29699 BLAKE2B 73f132ff9d908468f1d67c54b7430ac84c0aebb
 DIST libarcus-3.6.0.tar.gz 29469 BLAKE2B c032dd51631b10c04e69dac4425c8a5d180cf8c983b896330b2dcd5d479467d6a2e94827ef8accad25399167457e5ae9e96f1a363c986be33de8255c3e80b1fb SHA512 1bc50a08cbec61edefd78f3c347cca08f6bc40a308472bf6788c2c8962b03ea81b32357be18a3c34847c121eb52ee6836da22cea65b1a8f64b7c924bda290430
 DIST libarcus-4.2.0.tar.gz 30582 BLAKE2B cb2390d7fc8942cbdd880385313f4bd8886a1ea4eaa5246c76b0b3243e8a099953ecf51d09486e005c8c14783ec67435b33068efae2ea6075edf91b90b9fa9b2 SHA512 f9a38d095a2ba2ab29a382466ce16d1c0f5cdb34b60a2b930529edac94de177d7bed37ee26bf615833c94ccd0e3b7c71d502f5f815d92eeffdf3bc1f15b49ba5
 DIST libarcus-4.3.0.tar.gz 30540 BLAKE2B 58937764d9eec4a235bcc26aa85ab1f1418ae2c576c24759fee5155c7690a3a5feee1946cbae8e7836fd4eccdb0f673167aeda46c3dae124101cfb03510697e8 SHA512 b3893e3c422de85a6968443a6f26149e9dee9f15038c11c219693b9aa8d5174d908421e33c8e3ce4e4ecab8c5077da217b44a9ec6bb4b351ff67b7f2d42cc890
-EBUILD libarcus-3.4.1.ebuild 1078 BLAKE2B aeab9c7377add43ff6cf2826049d15d3e2637d3b71e644906ca60331327eb12f9653f42e78183c01fd9dc5f35bf54a15f9c4b713d9924808999356f3d2cafcf2 SHA512 6fea171aab92edfbed650c06de1b82e773e2d58effb03eaa8fe9769e4d1ed539d7271a7ff3ec86cebcdcc1d99d1479baa4887434ae1d66c2091196cf0b0fc884
-EBUILD libarcus-3.6.0.ebuild 1078 BLAKE2B aeab9c7377add43ff6cf2826049d15d3e2637d3b71e644906ca60331327eb12f9653f42e78183c01fd9dc5f35bf54a15f9c4b713d9924808999356f3d2cafcf2 SHA512 6fea171aab92edfbed650c06de1b82e773e2d58effb03eaa8fe9769e4d1ed539d7271a7ff3ec86cebcdcc1d99d1479baa4887434ae1d66c2091196cf0b0fc884
-EBUILD libarcus-4.2.0.ebuild 984 BLAKE2B e594a58069aa855442fa53ec8f78831e3c22e6d6c10e07221396bba14891e5f453f16768dee72b4753c8f919d35ec50e426a5c97041fd2035ceff9f3cd30376e SHA512 ec724940dff0d8ebd9ffaca81fb48db75570f81066c695954e1571089fc3fe84e28af9fc2ec60092f5c25c226c85c98a31e959a3b2263559a4074a3ae4733a23
-EBUILD libarcus-4.3.0.ebuild 1353 BLAKE2B 957389a5982d129a7e415082ca871cce23fb7a1fc8264bd1dbdf5287d2a1eac2bac6ea809953e4194658497a644b81a44fd25b13670d51df4978bbeb1e27f245 SHA512 d4b63dce7de402181406c798cf959233614d55e524f08c3afb6860ecf828ff0b8eb572f8f75f02bc34d233a7811a98a0e84445a10c6271d00e8987fddb4e72c7
+EBUILD libarcus-3.4.1.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
+EBUILD libarcus-3.6.0.ebuild 1121 BLAKE2B 060bf6c289603efb42deec75419d01ca4e566fe73f81d022ba36b225108fb54d4cc9b3bb504dda665840ef3486b98d59abaee4d4b58935bcd5f5128d257f7c0e SHA512 b7c94cfa331d8f36c00fdb9e1085742efc6bfe1e2013e01def0f6cb142488e7633af9952cde05d1f9f15c30d09cdd4855871bbd7f51c7d95555fde1870bceab5
+EBUILD libarcus-4.2.0.ebuild 1027 BLAKE2B 029645fa5e8c62b062f4ddbd2dbc0ecabcfc7d2833481024de1a0bd308a126c7529850049fc45f1e051f94a3b82d87869fa8e002b99a2df4794f1092ad9d3e09 SHA512 e3c7c30e082c55851acb1bd08d81f5c20261e09fdf5d88395e393b47ef0bbcc020e64b5183b79d12e62f7e519a19b3a1eb8a89c1ee7d986f94564240fdfcf60a
+EBUILD libarcus-4.3.0-r1.ebuild 1396 BLAKE2B ace6fed8c7a8b8db4829737c3b1b8d99a0d8ccb53688de4e029b39b7391b8a8771388f818eac032164c2efd74110a6bc987bc3d05dc81758eaabcbf24b5cff7b SHA512 9ec58979bafc8a7d4e5d0e334d0e12d3716fbffd4d2d9060cb52b9f061a06c676a95c0cafa8a344b22b8dcd855e3a41794d7669f4f037290d951acc6bcd0763a
 MISC metadata.xml 860 BLAKE2B 9375bca572d46d985fbbf11b222728cdaba22c2fde64e1b4a057d2920b9845bf442bb35ce0b2b1e78fc949cd687604f9f89d5b5665e3cee7afe5b69f09f5ed2b SHA512 9dbfeff3c641642edfd27fbbd27d2ef5810833e4cb3ae5b949c1a20c27377ac70364010fc9fbc759f456e93f294af62f3c08c59bb0585a3ca01f5cd157b3b33e
diff --git a/dev-libs/libarcus/libarcus-3.4.1.ebuild b/dev-libs/libarcus/libarcus-3.4.1.ebuild
index ced7f6897f9f..120cd3820013 100644
--- a/dev-libs/libarcus/libarcus-3.4.1.ebuild
+++ b/dev-libs/libarcus/libarcus-3.4.1.ebuild
@@ -20,9 +20,11 @@ IUSE="examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
 	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libarcus/libarcus-3.6.0.ebuild b/dev-libs/libarcus/libarcus-3.6.0.ebuild
index ced7f6897f9f..120cd3820013 100644
--- a/dev-libs/libarcus/libarcus-3.6.0.ebuild
+++ b/dev-libs/libarcus/libarcus-3.6.0.ebuild
@@ -20,9 +20,11 @@ IUSE="examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
 	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libarcus/libarcus-4.2.0.ebuild b/dev-libs/libarcus/libarcus-4.2.0.ebuild
index deb2605d5649..0dbed3da3dd0 100644
--- a/dev-libs/libarcus/libarcus-4.2.0.ebuild
+++ b/dev-libs/libarcus/libarcus-4.2.0.ebuild
@@ -20,9 +20,11 @@ IUSE="examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
 	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild b/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..f949a913e19b
--- /dev/null
+++ b/dev-libs/libarcus/libarcus-4.3.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake python-single-r1
+
+MY_PN="libArcus"
+
+DESCRIPTION="This library facilitates communication between Cura and its backend"
+HOMEPAGE="https://github.com/Ultimaker/libArcus"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/protobuf
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+		python? ( dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}] )
+	')"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples ON OFF)
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libarcus/libarcus-4.3.0.ebuild b/dev-libs/libarcus/libarcus-4.3.0.ebuild
deleted file mode 100644
index 0869769e8f5b..000000000000
--- a/dev-libs/libarcus/libarcus-4.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake python-single-r1
-
-MY_PN="libArcus"
-
-DESCRIPTION="This library facilitates communication between Cura and its backend"
-HOMEPAGE="https://github.com/Ultimaker/libArcus"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/sip[${PYTHON_USEDEP}]
-	dev-libs/protobuf
-	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Find SIP for current python version, not the latest installed
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index f3aae2ed6226..87a4e5746dcb 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,7 +1,5 @@
 DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2
 DIST libburn-1.5.2.pl01.tar.gz 989073 BLAKE2B 4c62b236560d79ef528d9b0f419bb18a874a3feb6359d72f716ceda75cff9c5369417e85622f4016c352f255b0b4e46a6336be61e26b78a3ddc3adac5ac836e3 SHA512 40da5d4033b5f3b8e4fce8798d34c6608030f09bc1d98286b2b2e58f2fd1d348b115013b1a381eb9f1a3cf0c259c453507ee840e3aa24194521fe34fc3423a3e
-DIST libburn-1.5.2.tar.gz 988375 BLAKE2B 838a19e1e99786633e13f7265eb90922a82d5b3b2094e1397ad6eb3ec4b853ad9d18e3377e2308724a94bf99b903b856ffa3a0b98b6404f874845933ac3da18e SHA512 a8887907bbfcd9b743dfc2e8924cc9290d7af5a71651aeabfdc5874f2df076278ccdbc94f81efd6a720972f380512d330576739837ba685055ee717dd74797d3
 EBUILD libburn-1.5.0.ebuild 838 BLAKE2B 70b7534f6d4447cb74844a2cb55559aff2bb2282bf879de316afa41e5d2bf8b38c632052304ce92c6cd8be992a492b766ae3f83bccabfe20aed1a16fe9b6db82 SHA512 647754047a02f6fe370dcba700edc6e6f4a60515e872dab1c0a1c48be1930c5b315cf7df78e3da7f95a99f0318049348078d84689a03f93bd43e106adebe6045
-EBUILD libburn-1.5.2.ebuild 847 BLAKE2B e53346b68d0581aa21e9baf0481789337029f81b470690b49c91ecec725b98136ca97ae5cca990e000cee1031d3afa52ee37eb53ba1a03d941b82636c8bd83b8 SHA512 e6ff684fa8582d58cd3e0753c2fd6bee3939b75dd6ef413039d6af103f6fa9f93f49c6ef9782db7a3e3a97b8d65067d76d3c0fb830b4a75aa48a09362fd7a639
 EBUILD libburn-1.5.2_p1.ebuild 896 BLAKE2B 0c1200d24e2aba3185f53c548970f24c401079e7220b4f5ac6539acaff9c31330359ab82ce452ee20f27f1fd750066d2f8ee375f96d33fd8918017cb5e6073d1 SHA512 e37fbef828e574b6f4518007b4e21c55359e9a7353ab39abb64fe039ef1afc3c40284004d798ade1aa6580080b195d6b5e4bda94c65a9bb9218529f69d6dc5f0
 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860
diff --git a/dev-libs/libburn/libburn-1.5.2.ebuild b/dev-libs/libburn/libburn-1.5.2.ebuild
deleted file mode 100644
index 3be51babba79..000000000000
--- a/dev-libs/libburn/libburn-1.5.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
-HOMEPAGE="https://dev.lovelyhq.com/libburnia/web/wikis/home"
-SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	econf \
-	$(use_enable static-libs static) \
-	--disable-ldconfig-at-install \
-	$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	dodoc CONTRIBUTORS doc/{comments,*.txt}
-
-	docinto cdrskin
-	dodoc cdrskin/{*.txt,README}
-	docinto cdrskin/html
-	dodoc cdrskin/cdrskin_eng.html
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/libbytesize/Manifest b/dev-libs/libbytesize/Manifest
index b360bac1f8ec..689a3b23f84c 100644
--- a/dev-libs/libbytesize/Manifest
+++ b/dev-libs/libbytesize/Manifest
@@ -1,5 +1,7 @@
 DIST libbytesize-1.4.tar.gz 80943 BLAKE2B d4c6c34d81be01bf7db2c37b0660886d99eff3c0a87024f5fbc12cc3606dc01e772b81dfbcacbf76c62213120253a9e7bda90adbc749b6d4c3e31e1ed3ae7702 SHA512 5dd13cf52a1674be776220ee1863f42261a47dc53af1ce4a31460d6d02ce87e19c5a52260f700928af98f1d9d7a96de7c11d8f384907b3187ef2effc10cbb593
 DIST libbytesize-2.1.tar.gz 440209 BLAKE2B 7c689f269eae7b408b7f85fb9c877c9eb519d2a2eb143ef0ddb1657fbb4d79fab7cdaa56b35b4bbbb964e47361e37d7c70a0a135bacb8f817bd6cf8d2e22b68e SHA512 6b93d877e921820c19ed6874a36d9f8b6958112f6230f24980e8e6e30570b39ce74594f0ef126f70dc81b5434899c1f0f3ad0925f3ff7b6a596a9329c8f106c8
-EBUILD libbytesize-1.4.ebuild 1216 BLAKE2B dfede52acdcc463ddf1f7e5d4a0b6164439d0cd7b9ce9aa9ad88c2636c12e87dd68ebf54e1ab16673d7ca80f4b477ac40c9a64bab00616dc263a5b7f8ebfab7b SHA512 ee59f2fcef3379e2097fdacd583a822839ee0e2c730134b00b3d53f5808b48dffc967d4fb3595414da6fc0cd5df7de4d638ae790e85e7e4826e600e78cfe0a4b
+DIST libbytesize-2.2.tar.gz 443040 BLAKE2B 04035f99f1da4d2d426106e1f292d71089dae89923d41425fa815a72e375639a7d8b6fc5552a3f08462597ce9c19797c7fce5b79fdad504b9062168093a70a4f SHA512 4538ac3499a24023c21fe07f527e400f99509921e377248970ac2da0eaf1655ddb261f432eed46a59ef69a1275ba7d1e5b0cc488d64eeea936b6cfa54c552ac1
+EBUILD libbytesize-1.4.ebuild 1210 BLAKE2B 1a9c7143221924ea84b8ca543a18b3f471cc9dff10e83d1879c980381e38a89c32f479bb8451c90687d8195d9c554383029f2f7a8218b5082a0e52c44bdef7cb SHA512 4a59c6e654e6ec3c98f74845a466f5856339494ba70475120a2e78170fca215ff1ba709f3455f880d0c4fbebdb4e6d639876a2fe7c30aa708f44d2903d191eb2
 EBUILD libbytesize-2.1.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
+EBUILD libbytesize-2.2.ebuild 1471 BLAKE2B c0842eec1dda3bb554f49f372f6063bf632a0c49ef25e75d347ba84b652ee8f7ff8d583ed5e9b8f5e44a207c7f2e19cfd858fecea832f3206136a15f2d8adfff SHA512 34f5bb741c18768a015b9c2eeb33d534ff62b88ba6cc60dc70fc6924e6693a181f02bfd6c11a2a60e4aff407fc1d4f395a83b34ab417600bf4570ef3d907710e
 MISC metadata.xml 425 BLAKE2B 445bf1e0d46e04c766c4c81c90f9acb8e8f3c1c3eeb567c3101400139a7b2ab830efcf737e30332af5dd0e50d46bdf9f583cccbfb2e50186cbb6d3f5a396f0df SHA512 24b8980240c3513229ea2e181c64b7f89597be9cd121459ad62bce935fd52a7bbc0ee4871e15899b69b477fdbaf0850d55821a6fbcf3afc30d0cb81a3eb83b65
diff --git a/dev-libs/libbytesize/libbytesize-1.4.ebuild b/dev-libs/libbytesize/libbytesize-1.4.ebuild
index 326218a5913f..35486a532930 100644
--- a/dev-libs/libbytesize/libbytesize-1.4.ebuild
+++ b/dev-libs/libbytesize/libbytesize-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-r1
 
diff --git a/dev-libs/libbytesize/libbytesize-2.2.ebuild b/dev-libs/libbytesize/libbytesize-2.2.ebuild
new file mode 100644
index 000000000000..0d91bc5f9998
--- /dev/null
+++ b/dev-libs/libbytesize/libbytesize-2.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-r1
+
+DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big sizes in bytes"
+HOMEPAGE="https://github.com/storaged-project/libbytesize"
+SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz"
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc python test tools"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tools? ( python )
+"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	dev-libs/mpfr:=
+	dev-libs/libpcre2
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	test? (
+		dev-python/pocketlint[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.md )
+
+RESTRICT="test"
+
+python_do() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with doc gtk-doc)
+		$(use_with python python3)
+		$(use_with tools)
+	)
+	local ECONF_SOURCE="${S}"
+	python_do econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_do emake
+}
+
+src_test() {
+	python_do emake check
+}
+
+install_helper() {
+	emake DESTDIR="${D}" install
+	use python && python_optimize
+}
+
+src_install() {
+	python_do install_helper
+	einstalldocs
+	find "${ED}" -name "*.la" -type f -delete || die
+}
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index a145c3c673c7..4f257f22e5bd 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,6 +1,6 @@
 AUX libcec-4.0.2-no-tinfo.patch 829 BLAKE2B 2051bef2e92fa61f4afa90728c99f7943d1d382bb2e91633fd07f8cff73055eecabcd68f3c95928e83ca1e676f3f07c9a5118b51d7cba42029a3826530c3784f SHA512 7ea5c0334535e8f731c12e1f257ff9a08b303ecf449afc0fdff36b1f06107e47356dff42bbf38c9e838adcd511e059e71179fefecc892c631a453160576b0e8b
 DIST libcec-4.0.2.tar.gz 334995 BLAKE2B bdbebeb339ce39f2f740805c4c627cc5190cc0dd57d0d87e3d3aa4ba8feeba103336d035fb8b282358f2e08fa470111be43df4df48870be0e9aa93f35434d0ef SHA512 7bb80965cd1bef713f59bff136dc4a7f1172c4a9bdb8e2f59c6bcc5b74110848c0b2912263280ea68177908a688127e8d7208fc43ce6e65d589343b85395a0bb
 DIST libcec-4.0.4.tar.gz 344976 BLAKE2B ce88730ee6e9f57a3f874dd47343e8bb12bd9d3644b58703f0b797bfe656fa25461e6847db4023fec92d9e9740f0e58b59a203258d39d8883b8ae9cde147f455 SHA512 8991ba96fe9a87e5e1f63ff87f77fc0fc3b735c537e2ee6cb004fdc264d75cecd043e39b49cf9e64aeadd24bb1fb57911d9c4bd6c494d9ba4035d7320c268116
-EBUILD libcec-4.0.2-r2.ebuild 2152 BLAKE2B d41ee10b9cf58e9b82005df317341473572aa538c55582aec15405b3d73069d12f24612155eef0e5408418f494c86ba40b24958d7ab98b1777606341caabb002 SHA512 a6b6bda653f261d5a15b466c05bf0ea5c895697f9a26debdc288d21c5dc3be1927970435521da5f4674ccb162e1b3e426416272b74f6e7e45285afe764caddef
-EBUILD libcec-4.0.4-r1.ebuild 2035 BLAKE2B ef266ab2d7b28c543818a9c6762f6c1eaed14725eb2702867e59d5d1750256d2e801d893528a0a220918c2b59470e76f58332027bda3e488a6355fd3ffc8c5f5 SHA512 ddb2ae941bc7339a26771f48e889d73e56cdd6c8ddd26385002aa4729938917ad50fed6bb86597ea87f040e99fa597473f33edf75f3498910345f52ea46b4ab6
+EBUILD libcec-4.0.2-r2.ebuild 2146 BLAKE2B df530ef55089bb3f35de91a3dcd0166688c437526d6e6129d730326b8bf20ac1ea0a226417d4ac893fcaba43103fb1106186c74b72de2bc23f4d6cdd83d6a883 SHA512 28e88a43c8dc584161f256b174f6151dbcb5d97b326a1b9da784083e16616dcbb971a11c4894dc65b2c762fef1c870f284da0133ec1e81f631c6b931358f6296
+EBUILD libcec-4.0.4-r1.ebuild 2031 BLAKE2B f9401cb848c3107c0e6799c903054705e87172422dabed7d80d22caaa5e548066edc91a6930aedffeded9dd25474284f939966e65040a990f10e6346dabb2b04 SHA512 be107c0fcba6de25e9ca697e1b1c98438d6678d495aa055f30d360ec4c6e2f61246e4ad255496dcd8f1d83b554279b62c9f6b769a2838b62e358fcbf1f19f19a
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/libcec-4.0.2-r2.ebuild b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
index 581e64dcf5f8..7a242dcd5187 100644
--- a/dev-libs/libcec/libcec-4.0.2-r2.ebuild
+++ b/dev-libs/libcec/libcec-4.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcec/libcec-4.0.4-r1.ebuild b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
index 06c3c9d49603..c07d3a0f291f 100644
--- a/dev-libs/libcec/libcec-4.0.4-r1.ebuild
+++ b/dev-libs/libcec/libcec-4.0.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index d5c672127b32..ea2a5fd7e00f 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,3 +1,3 @@
 DIST libclc-0.2.0_pre20191024.tar.xz 128628 BLAKE2B dc750725ee48456e3678cb4f730cc889045ff7401c4b40ac3ae9b656da9fe429aa2094c2042a18eda4f7e87c786ff8ae121fbf726a18de03884f30dad48b3fa1 SHA512 b4c2ca980fb28b5662055bea951de844284fcf122695234d7618439234f0203baf82b5cc5cf8acddfe387f19d32be3a958e53511bb1e33e9469f6be5951dbcdb
-EBUILD libclc-0.2.0_pre20191024.ebuild 1579 BLAKE2B 13afe2571643cd69a0a98d9eba3df38a0f00056faa7e822129e5f47dbd77d1d6343e9bc5ff4e094f9a35e31c9edc0262872d422d4c055611bfa76b91a71d77cd SHA512 1c28111a6dffd3d73dbc61fb39e25c7da17265bbda8a58fe050fca40ebc6477d196ccc51a4796748d1837bf8e16a4ae86fdde41059da9de7b4c618cdd8cb702d
+EBUILD libclc-0.2.0_pre20191024.ebuild 1573 BLAKE2B d92057298cab9b9603503f564c85870c409609d71490c2f70f74f71d793cd1e8842854659bcd2b1d7a4c1c420b48c55f2291f9923dd24c1d12b2ad7d93599fcd SHA512 256594cafa7fc68551ecef4c3a8ef40b2972e77a412eb14ea29675c3636a2bb2d33192079c592747396aa71519db052b917c274e2c8bede027ed7a374665dc71
 MISC metadata.xml 394 BLAKE2B 13254b650b3c915b7eccc5e646d7ed6065c514d8f5619f276be3526be68bde4ad2310491f18a6a92ae621022a009ab7248eb788e500c96012f3d27236da16cba SHA512 ed84a49ef1e6da5f133895d82632d81c5333ae0fa21eb222e993c2e3136c802350193555fd8f98ee23d7b4d55695ca186a8e4d5dc04c3d7aa072dc229905011d
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
index 569f65967e0e..291fe729330a 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit llvm prefix python-any-r1 toolchain-funcs
 
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 24b8329b8048..6e8043029d70 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -5,6 +5,6 @@ DIST libedit-20170329-3.1.tar.gz 508504 BLAKE2B 83857f2e56c1f3857e981556c4d5bb90
 DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d961e568a0464a34f9e679f51e1e991a14c9d04a05f0de3815c4a38a9f17789a18e89ebd026450fa1053ef6420c045141 SHA512 240098989e3c5c8c5e28a61036655ad5a57f1c484e1cce2eaf3da157ff238dfb9cd81c766f82efbefa0935b7b5c07328087788cbac007b11dfb558cfaccaedf3
 DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
 EBUILD libedit-20170329.3.1.ebuild 1263 BLAKE2B f3733fcab6145b5a624f153a2dfdc662a8caf53372b647ffa1fe0104953fdc11474354192b644ac9d61f643eaff9eca46b227d4ee7ecea8f7fbb7810977daeed SHA512 f561066e5aa531cc36160fa52338cb6950a09565318a8538f325ab8cf3634dfeb850789cc1fc2d64821f179004c022648d5a075fe6fd2b1645a433dffb796306
-EBUILD libedit-20190324.3.1.ebuild 1194 BLAKE2B 14bc529388ed15caea9491f59ac539c0ef2b13c7af57fd0c62ff58ceb625554a384d10a6ed1947202d688e5e0c566430ea2e32af45d16303216c51e23b160f7b SHA512 60fd95883b5e5c423640f3b071101a1428df35671024da18689abb72de19fc72298e718f15a15d0a92f958963c0b35966b86d1e9222c59bfb29285d6151950d9
+EBUILD libedit-20190324.3.1.ebuild 1192 BLAKE2B 5023ddf7b5ac9c2f9d0774d2b91609d44c60aaa95d6e0f5278ea119cc6fabb78d58c3ec1950ca5191c324deb7b3d0edfdd04bab7006ac942b5c8b2d7f1eed074 SHA512 74db523c633d8a9b0028acedaa6d4f8d650969874a09eab2b51c60dcd648ee88aed5fbfdbd03200dec54795696557c65214ea39a16c230ca46b129cd1b087173
 EBUILD libedit-20191211.3.1.ebuild 1162 BLAKE2B 571be8db01b101a3110e650c5d1357c2705fb82753ade3c4ff8cedbdd6861aef380aab19240e8c747149b5af505e1c5aab137c9900b4270a4d013bbd262c3311 SHA512 1444594a3cc5157c08ec9e63c4b379bdc289dfbc5df4f86461e421e890213f838b3a9c369fdb5672ff81ce2e4beb379b75d714bdd775e9ddebc375a3423041a1
 MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/libedit-20190324.3.1.ebuild b/dev-libs/libedit/libedit-20190324.3.1.ebuild
index 155e3b58af49..3efaf7c17f3b 100644
--- a/dev-libs/libedit/libedit-20190324.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20190324.3.1.ebuild
@@ -48,5 +48,5 @@ multilib_src_install_all() {
 	einstalldocs
 	find "${D}" -name '*.la' -delete || die
 	# file collission with sys-libs/readline
-	rm "${ED%/}/usr/share/man/man3/history.3" || die
+	rm "${ED}/usr/share/man/man3/history.3" || die
 }
diff --git a/dev-libs/libestr/Manifest b/dev-libs/libestr/Manifest
index 4081780a421f..dc5618c0bfe9 100644
--- a/dev-libs/libestr/Manifest
+++ b/dev-libs/libestr/Manifest
@@ -1,3 +1,3 @@
 DIST libestr-0.1.11.tar.gz 355544 BLAKE2B c165212c4a56ee577a76dbb95dfe9d08d84087d490422d4fb7c29cadc5b5d0eed97234369331286433e2d860d3cfa8af3117d3ff94e8833df91f6586905ad2c8 SHA512 0ab98c2fa4b58cf6fee89c88602725b8b5e8e5a171a6976cdd8cff4dfc1cd3e5b747868da74fccd1bca66b9fa524ceae1c4f1ad5ee653a44ff81df6916ab5328
-EBUILD libestr-0.1.11.ebuild 726 BLAKE2B e708d7594479d2207467a5cfbdfdbae8cc83bf650c240bf7637e8e57db3c09417bc9207e623cf401f05abcc3bfeb25b61b34d4ff9afbe0c67a1d8f41aebd84e6 SHA512 6f84bdc6d5806f8fc2e32f92c3fbb993b844987fab03dad493657f3c12bc3c93d220e4a4bbea80b3a14a1b3bb13a89e59ae24277df00a37cce89b40c8eb41a03
+EBUILD libestr-0.1.11.ebuild 724 BLAKE2B f516c34ebeb29f3b88669be1e1f3eb46a727b5716aad5034163b58d6d2806f3eb4deec97c4e803c8e2ccac8d290e82399320e78fb776a0289b6a5bbae6ab5599 SHA512 8213af23fbfa8299337e9d72f92d9ce4b8421a82e7eccef9320a24ed9c8c1c970bafd7a72bf2eeb2eed5cb52f251f878e77511d082011cc3836a10eda3a01a13
 MISC metadata.xml 563 BLAKE2B fb15f2cda9e02291c5a88dc7ac002a69d4504ca2e0d496962986846ff089628064e5334688d9806bb9e3478073e8b6fecdad7ca227723c8e4b8f4c7c83ac0aa3 SHA512 4ebbbbddedbb2ee70c52c73b23ef83c0920756ead3e14d8a75afd5bc994bdeaa63a6e9255083b74bdd80da8367650544c92763e299f3f6d49c930b2f92e7c478
diff --git a/dev-libs/libestr/libestr-0.1.11.ebuild b/dev-libs/libestr/libestr-0.1.11.ebuild
index 885dcf112cf2..5e480cbe20fb 100644
--- a/dev-libs/libestr/libestr-0.1.11.ebuild
+++ b/dev-libs/libestr/libestr-0.1.11.ebuild
@@ -37,5 +37,5 @@ src_configure() {
 src_install() {
 	default
 
-	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
 }
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 9691bcead432..5e85c64a4c76 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,4 +1,4 @@
 DIST libevdev-1.8.0.tar.xz 439000 BLAKE2B 408c60669557419c945901da5f146302cf0cdc43ed74cf4dc8ff4a9c272319c49f644bf95acf3d8656173bfc2f3763a6cc172ee4707a7f0129d15449701e9449 SHA512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4
-EBUILD libevdev-1.8.0.ebuild 1105 BLAKE2B 9aea6a20ed27760e6c225c81aa6bfecd8b3cc5b16d0c7a178d312e7615490678103bb6c4fbdb5787007486d312caebd4541ca04fd1d0a4dcdcc64ea11ad08f92 SHA512 e4d274623c81502de977ce7c015550ca1fe32412b46eeac86111a1720f4e4f56763395571a899496a4ac96c380b0428d6877a914f6eb59ce534e6dd7e5c5f5cd
-EBUILD libevdev-9999.ebuild 1115 BLAKE2B 834182fa133843b04d4035a81194397dcb9e6c105c6f4f76abe95cd028d2675d98e5e162a2261d8f284a61f258886d2340fd32a02e6c1b3343f38ef42fa88b54 SHA512 9991ad20557ce739693f16f28bafc0c8e727ead20eebbb01ac225d5e8405bfe626512334e818842e075b69a57cbece0ff9e29497eb891166eedfbf4c59bd7e84
+EBUILD libevdev-1.8.0.ebuild 1101 BLAKE2B b59518fd0e42768821b5d28326430de969e51cd27aa093353fd1a985c888ef68f5ec27c6b2f0b0c8cedf6ac1b9907ffce0005e3efe83c796b1a349c900e87ff5 SHA512 862ad52029ab5f00883ce0fd5c35d11f517d641bbc6506584f8f935639b6800adfcd7c07f84a25ecf53bd8effda727859b9573dbc2fa4da0ff1de4ff4b38a104
+EBUILD libevdev-9999.ebuild 1111 BLAKE2B b6c4e0879dbf3c835ef3875217d5bf916b3cfee67c736276ba1b8bffd92c55d5457d50641665dae25b1a4609ef29346107d9691e1e0fadb3661a0de230f72d86 SHA512 710c8ba52f27cb93d19ad95c7d8999da9ca20bbd604ea4e06b68791ec5459e3ec9aac579c92842f6eddbdd4230af8708e5d469e91adcb0862afbc136105aaad6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libevdev/libevdev-1.8.0.ebuild b/dev-libs/libevdev/libevdev-1.8.0.ebuild
index 82af5e42bc7a..c3b2cd42dbad 100644
--- a/dev-libs/libevdev/libevdev-1.8.0.ebuild
+++ b/dev-libs/libevdev/libevdev-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 0921bb7c5582..ffddd6b0bd13 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 139bd633a8b6..3526c4e037f7 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,7 +1,7 @@
 DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
 DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
-EBUILD libevent-2.1.11.ebuild 1685 BLAKE2B ec8083997c5c5c21306306b00efdf5077d66f7895ef366c19abd00a4f83b1b1150e036e0c3fab2117a0ae8d6f9ea80a95e5fbc621a862a544d665451572878b4 SHA512 377dcc47b403d47144dea3a94950ec40ff626b072b36ad028802453a6095ee19b87f7362e3517de8caa9211d0377e13360487d844ee529d04cf6b52b301b6bcf
-EBUILD libevent-2.1.8.ebuild 1658 BLAKE2B 4cae138bc7f814cbdbfbd0db9f2daf4e9bc7a6396174657ebd64c80b15006c541910e3aee9a6f0fcecce27f8820bd8feb02bbb412c4a757d37b4620800a0a849 SHA512 041a18c711f5a1c566c0a14364641c53cc133274e39947e8bf448c93932d052f63ca37c411bbefc237fc028546e77ea0172549a30aaf69b20aa87b3a08aefd6c
-EBUILD libevent-2.1.9999.ebuild 1305 BLAKE2B 700706493970712ee849965e9a43aa4698694793e43316cb041f24dd1a5918f0f9be95f8f831938bc5ce22c8658781b1c8adc9822f1b3048c8317304576716ec SHA512 6833ac30705f79f88d348c4b0fb5a71ae9749be51036a6890a7d3260a92dcc32970aad657eff6400c89e5e786cdd8825bfebf9cb943f2abaef38c0e411c15f0d
-EBUILD libevent-9999.ebuild 1242 BLAKE2B 64d887151fa3290389d91f64142e85b8302c0150ea943197ad0e4b64ff41f07426b573dc7e98d715f9a7c523f12d8b68aa477d4a2ec898189b5f73b0a73ca263 SHA512 54669027b1982f5f538df5f68aa32b91b468c9be132419e532fb7effc97d488417037ed480efd7e008f913724d347f5d037b6c8a2378e7b65489034c55628e57
+EBUILD libevent-2.1.11.ebuild 1689 BLAKE2B 0a81daa8592c1c919c1d6c7c9b28babe3c317243c4d8f7fa5768ff6a0e26644d30775ffdc2f5b8a03c03535ce8cd4b72d6f3a7ba1f10f1f3440c1d0aeee3f641 SHA512 a98a8e1d68e8e9b7ba962e34061282056bae99a8e5cb568d658cf3301fe68dd4c34d5174f9babb3b77c075ed85bb350b6addf48a18d8dfdfe4813551c0c348bb
+EBUILD libevent-2.1.8.ebuild 1662 BLAKE2B b973460bdc6341d018ce6051ec400460b1c402dd7a204992bd7d38acce553871ebf5fe3ff3103ae8c53f4f6f9aac1ed28653e4d48df7c64f8eca6536f6984f23 SHA512 96e79e5bd9cff0acf2b196f1f3b1f21a4e72ea993df230a2795f7108f12e49a8d832c273dc771ec5972d63e58f1053e866eae7c568b992df5aff3fc9abbad527
+EBUILD libevent-2.1.9999.ebuild 1325 BLAKE2B d13ce04a316e5077545ec3381e50b2682bb35cfcca22d722be6742034b95adebf84d7572a4161aab1f912aec36d5634fdeec764803ff45e170ab05a556fc53bc SHA512 80a3570a6c941db984fc4aeab1f4160ddc305345660e606fa712c0480f1ab27bff7fbc4f057e44e631e4e9c8027b3e5f75689538c8c856150c9e8df0fa6c56a3
+EBUILD libevent-9999.ebuild 1262 BLAKE2B b6911f7b2bc9a3c1557c52fff44d083486444629490d0d15b5ca3056d2baf7f1abee38cb396d324a021443ad2f3837fbdf7eb17ad6070e663ac7246da4a884ba SHA512 b441e20f56a1c2b44a4ce39d1df4ff3289332af9adee21270c0848ea9d3c3de59b71ff7a1ae1f1e90eaa64a672e761dcd1a6948953266bc9d8e9f0d6071b0383
 MISC metadata.xml 547 BLAKE2B feca63a3b25db4aa0a078b6135188aa7e4250fa9afb207e14c9b02cad83709abe5dace68f5a34cccc0a2a745424c4c044696d0e6021c4c83bcc2666700a8528d SHA512 556eebbb7d05a8234e9705126549520a8b8d553cf6331f353bf7a5bad343b0ad56292dbdda5bccec827772faf07bf17f0163e4b479530eea0832e31d9f17f73a
diff --git a/dev-libs/libevent/libevent-2.1.11.ebuild b/dev-libs/libevent/libevent-2.1.11.ebuild
index e446b3d11f89..61d3a118faba 100644
--- a/dev-libs/libevent/libevent-2.1.11.ebuild
+++ b/dev-libs/libevent/libevent-2.1.11.ebuild
@@ -5,7 +5,10 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="https://libevent.org/ https://github.com/libevent/libevent/"
+HOMEPAGE="
+	https://libevent.org/
+	https://github.com/libevent/libevent/
+"
 SRC_URI="
 	https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz
 "
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.8.ebuild
index efa8eba27bdd..24602b3e46f8 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.8.ebuild
@@ -5,7 +5,10 @@ EAPI=6
 inherit eutils multilib-minimal
 
 DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="https://libevent.org/ https://github.com/libevent/libevent/"
+HOMEPAGE="
+	https://libevent.org/
+	https://github.com/libevent/libevent/
+"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-libs/libevent/libevent-2.1.9999.ebuild b/dev-libs/libevent/libevent-2.1.9999.ebuild
index cf4e7dfeb381..ee3fb1e23814 100644
--- a/dev-libs/libevent/libevent-2.1.9999.ebuild
+++ b/dev-libs/libevent/libevent-2.1.9999.ebuild
@@ -9,7 +9,7 @@ EGIT_BRANCH="patches-$(ver_cut 1-2)"
 EGIT_REPO_URI="https://github.com/libevent/libevent"
 HOMEPAGE="
 	https://libevent.org/
-	${EGIT_REPO_URI}
+	https://github.com/libevent/libevent
 "
 
 LICENSE="BSD"
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index b18a797059eb..85e2c2bd254d 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Library to execute a function when a specific event occurs on a fil
 EGIT_REPO_URI="https://github.com/libevent/libevent"
 HOMEPAGE="
 	https://libevent.org/
-	${EGIT_REPO_URI}
+	https://github.com/libevent/libevent
 "
 
 LICENSE="BSD"
diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest
index eb75f4bb028f..ae86c28eab2c 100644
--- a/dev-libs/libg15render/Manifest
+++ b/dev-libs/libg15render/Manifest
@@ -1,6 +1,5 @@
-AUX libg15render-1.2-freetype_pkgconfig.patch 1091 BLAKE2B 2913ad950880964b82d2b4dfa59a8351ab37abe65616da8069adebd1315a9ee893566b29af50315111d8bb28705c6e64520fe3404a13ad01b43b297841dfbb25 SHA512 3e5313232eb5fc84e039d8d0ea524d3c6e3d238fea7f29f52754ed1b4bb886ec0b7ada57570018da99ae238bd28c7e1fc36c8f6b88227af2df7991afdabacae5
+AUX libg15render-1.2-freetype_pkgconfig.patch 1660 BLAKE2B ac8e1a850a796592a248e9a5231376d906aee234a57c075af76a9c812f27f401e9e6eba79eec5dc6abeaf72968c99a39b0213bfbaf8d72e48037e0b69af35961 SHA512 f06d0d85924c543dfc8a9593e9c99ee6394f3032f57d1059d7c47698aab99b263d2d17ecfc0089375f3c59531a4f990edd11974dfd5962939b301c7975c24c10
 AUX libg15render-1.2-pixel-c.patch 686 BLAKE2B a6273daa806090247eab17e2f03f3baa3fbcd7ffe4ee502611a4ecb39134dea809a46d77243c61e949f732b9f7fabd7a7002cc0434dad7e7986da1f25dc2962d SHA512 f1d40893c1f2f17d42c9ca6941d802e0c22a5eb85d9f8167612f7bf21045c096744634ea38928ecfc30c39a6085e6b8652168e711534edf82e3d8f5243c072a4
 DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac
-EBUILD libg15render-1.2-r2.ebuild 968 BLAKE2B ce22275e91cf2cc19e5b43d8f040e324dd2b83179919379a49cc7bad0a53c9200c0b07c1b2fc6e17450b76f8d9097b17f64036ed365b5fcfdd92cf82c1564269 SHA512 7c712b31f4de39af50ddd02ec4cf3975016e167053e3df521aabd6c175c1ee67be02d21e3153adc0c4f0162366816e5a86952d61fba4c6c04e8e6972859e3dea
-EBUILD libg15render-9999.ebuild 1168 BLAKE2B d194698228a89c3e8117cb87da0cdef47a3e68ad0da1a9938b213d06ad24b0845c8b3b6e0f21fe6dccbf3edbf6039c815b1d8f3a145a85498bf0ff354b0ec74d SHA512 bab94ac83adfbd395a9fc5ceadaa3f961377987ca5e2685abf8c2582cc43a63810ac774538ff6e8a4cc221d561bca015a571e0efdde53435f66ded723154a782
+EBUILD libg15render-1.2-r2.ebuild 859 BLAKE2B 4ab2dd1dfcf5641df4ceeb0ed19b099db43a909442961ef6d53956f72a064757f0e8ae63ed28553a1b4e7d8344f4aece477860fd1383248323d2e913c967f5b5 SHA512 f5abaef308901205053b5a007f9d71cbec6d069aa0c4631df1b5716a1d846b5e8ee77d7aa6d13721414eb15cf70b1f44b9efdafa06035030155474348dbaa9b5
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
index 83df9fa4f0fa..313d2ef5b6e2 100644
--- a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
+++ b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
@@ -1,5 +1,5 @@
---- libg15render-1.2/configure.in
-+++ libg15render-1.2/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -13,19 +13,20 @@
  AC_PROG_LIBTOOL
  
@@ -33,3 +33,21 @@
  
  # Checks for libraries.
  AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"]))
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,3 @@
+-LLIBDIR=@LIBDIR@ 
+-AM_CFLAGS=@CFLAGS@ 
+ lib_LTLIBRARIES = libg15render.la
+ libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c font_6x4.c font_7x5.c font_8x8.c
+ libg15render_la_LIBADD = @FTLIB@
+@@ -7,8 +5,7 @@
+ include_HEADERS= libg15render.h
+ EXTRA_DIST = debian Doxyfile libg15render.3
+ man3_MANS = $(top_srcdir)/libg15render.3
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+-doc_DATA = AUTHORS ChangeLog COPYING NEWS README
++doc_DATA = AUTHORS ChangeLog NEWS README
+ 
+ dist-hook:
+ 	rm -rf `find $(distdir)/debian -name .svn`
diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
index 816da20255ea..1082ceb99bf4 100644
--- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild
+++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -12,19 +12,18 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-
 IUSE="truetype"
 
 RDEPEND="
 	dev-libs/libg15
-	truetype? ( media-libs/freetype )
-"
-DEPEND="${RDEPEND}
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	truetype? ( virtual/pkgconfig )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-pixel-c.patch"
-	"${FILESDIR}/${P}-freetype_pkgconfig.patch"
+	"${FILESDIR}"/${P}-pixel-c.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
 )
 
 src_prepare() {
@@ -34,17 +33,14 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--disable-static
-		$(use_enable truetype ttf )
-	)
-	econf "${myeconfargs[@]}"
+	econf \
+		--disable-static \
+		$(use_enable truetype ttf)
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} install
-	rm "${ED%/}/usr/share/doc/${PF}/COPYING"
+	default
 
-	find "${ED}" -name '*.la' -delete || die
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libg15render/libg15render-9999.ebuild b/dev-libs/libg15render/libg15render-9999.ebuild
deleted file mode 100644
index 58ded405385e..000000000000
--- a/dev-libs/libg15render/libg15render-9999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-ESVN_PROJECT=g15tools/trunk
-ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
-
-inherit subversion base eutils autotools
-
-DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
-HOMEPAGE="https://sourceforge.net/projects/g15tools/"
-[[ $PV = *9999* ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="truetype"
-
-RDEPEND="
-	dev-libs/libg15
-	truetype? ( media-libs/freetype )
-"
-DEPEND=${RDEPEND}
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Merged upstream
-	#epatch "${FILESDIR}/${PN}-1.2-pixel-c.patch"
-
-	if [[ ${PV} = *9999* ]]; then
-		subversion_wc_info
-	fi
-	base_src_prepare
-	if [[ ${PV} = *9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable truetype ttf )
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} install || die "make install failed"
-	rm "${ED}/usr/share/doc/${PF}/COPYING"
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index 1df17a1bb51b..10a582319b30 100644
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -1,5 +1,5 @@
 AUX libgaminggear-0.10.0-doc.patch 484 BLAKE2B 9a63685991e322157ba941ae167ce6dea78a20bffb85662c5a7c2cb6879950dd9e085be83a53d4d13294f73e23cf7e1661c357e1140e5c0903942531a5676f7f SHA512 c5fbfb231f075f34eb4237edf3de6e335ff735513b72a41fd602422dc9f0fd511f66b4c087bfd0dfc68ebda8d1bc0b70a6eb35e5e3158c50b7a5d641e78ada01
 AUX libgaminggear-0.15.1-cmake-3.13.patch 613 BLAKE2B 4f2690aff5f33555a5fd446cc3ae8d9f7a417fc8753f2b8f77451394b1ed57d3be277e8d0bb02cb573a0efce3b15fe00f1e9f37139b0de24a78c3aadd70c67ed SHA512 e9a9173f9d5749803b88be2fdc4f5d2fd2207131622d558316428c791983f76ba477c645b2a410a7536b5614c141fc91dc9b51e84e3ff3d8167589e7bfb95a4a
 DIST libgaminggear-0.15.1.tar.bz2 111959 BLAKE2B 6a8d5cd01adcee1d870aada9f20b229e95975a013bfb8076c8135a7b4cbd5f2043b68ad481d0df1b369f560c2ea2172ff2a542ca61ce30317deeeb66a5aa2588 SHA512 a6635a74557f276ab65eda4610ba8a053fedf10f9d898a1dc875082a36b2822544f61fc7a274691673670b12d4de968aa4921d102a588f3d0777397730082990
-EBUILD libgaminggear-0.15.1.ebuild 1114 BLAKE2B 762c86812ca10a55c4ce0169e4a19120d2fb6162e759e746c8d5d90eefd30544447c47465a5a4e991619d99b27574d05998fce3cfc00f8c130868708b93a5883 SHA512 3f9d5e33bbcebf744be6662996f8d3bfb906df6d6358da1cb1f6bed8c9e07f05d2c758c7623764d8a06c9a5cc21a384db122df87b78a8593727e45869d5a6aa3
+EBUILD libgaminggear-0.15.1.ebuild 1072 BLAKE2B 2e31f7945767136014bfd18bce2b6d01235a3e3ffc8667b2c6cd230f53dbbff2367f1c63cb20810e85f22a2edd9e0d84ce6247ce17fcb1feb5d067245ed07586 SHA512 0810051610fc567432058747d3ad603762c4f7df24ee0784093b676c53984a774827970e8dab060da74bec8fc90f68c4ae5fcaba68753006d19a35cd5aa19f2d
 MISC metadata.xml 334 BLAKE2B 245d055909acec999e4e5e299ed9832df4ea83e59c8b02b464f8bd6da255ad713666d6db088f89014b5d006ca5171723fbef98d5daf19ac34088f2b58f44aa5c SHA512 f820f9ab3cd47f39e43ee66b01244397d9cf8f3da675208e1b26d97e908a037a9ee61a7c25d05b4e071a9a666b04aa46a641e49dbf93b55fe02f7ffe08b033b4
diff --git a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
index 40164dbc61bf..ce042cf9a600 100644
--- a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
+++ b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
@@ -46,7 +46,6 @@ src_prepare() {
 
 src_configure() {
 	mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DWITH_DOC="$(usex doc)"
 	)
 	cmake_src_configure
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 86a3fab707e9..d12ca61f0e45 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,7 +1,3 @@
-AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b75bc17a2149cefaa2fe1005ed695b1d0c4bd66cf4a89a4ea4e11e598d044b1b8bf469f3ddf96f3365a5542ae138d4262752d57 SHA512 4df919d8b09ef0b1af0b47c3262e08faa158b99e444a5d7d4d1b19a2987883fbb9e3f1a6dc2f858b8d343fbd5c2d266c3e02a47ad310aee92d1a5b14983d8f55
-AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727be214de5b1746280881f3017e066dfbda6eabd3a83908964c17e6932fafccf0021cc3eb775d2523c1f5bf828d97371527702 SHA512 35eacb0e1af5ae35e458a44563f830a4f19798bc3423e5bbe5fef9df048a20fabfead94a597343b7b342b510fc9e21cdf8bc2a69d7b930cbcb6ffc8ab7cbc66f
 DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
-DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
 EBUILD libgdata-0.17.11.ebuild 1771 BLAKE2B b349a241ea4bea39ca54817be50fb6c42d458dda0a65659d785bf1c02cde0278f3cc09715a788a2f6e76ce349dcdece372b741e1e718190c73d81bb0da5f3478 SHA512 3a386c1052b2cafcb559b008f58bf8a7b5e86766f2dde5ab292618dbfde0d507a1b42bf8c9471de93449b4e089a4a149e5d6ad8a648cbf32ac987c974211e750
-EBUILD libgdata-0.17.9-r1.ebuild 1783 BLAKE2B 770295ef5ffd64f457d43e473243628bb69a6688e8a323bd1078d42e731baa84219059d91565e5fe3d09c8eb99fad1b4ec27665ef9a587d2fb699505547ff9bf SHA512 65529ed7f972655a787d8a8b2d623df26f837b105ba0b3a3683d87c1bac235fdc8161526778464270b3fc70c4013dda513fd20d3811468aed9f6eade91429ec4
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch b/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
deleted file mode 100644
index fe06cee34281..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 12fb11f46a7eb4054b74679a6f5ad12dcc41132d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 23 Jul 2017 20:46:19 +0200
-Subject: [PATCH] Control build of demos
-
-Building demos is not necessary for distributions. Allow disabling it
-but keep it enabled by default.
----
- Makefile.am  | 2 ++
- configure.ac | 7 +++++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0e4cf631..8c0c7143 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -635,6 +635,7 @@ endif
- CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
- CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
- 
-+if ENABLE_BUILD_DEMOS
- # Demo programs
- noinst_PROGRAMS = \
- 	demos/youtube/youtube-cli \
-@@ -650,6 +651,7 @@ if HAVE_GTK
- noinst_PROGRAMS += 			\
- 	demos/scrapbook/scrapbook
- endif
-+endif
- 
- demos_docs_list_docs_list_SOURCES = \
- 	demos/docs-list/docs-list.c \
-diff --git a/configure.ac b/configure.ac
-index 3b0530c3..1e09f277 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -152,6 +152,10 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE])
- AC_SUBST([GNOME_PACKAGES])
- AC_SUBST([GOA_ENABLED])
- 
-+AC_ARG_ENABLE([build_demos],
-+              AS_HELP_STRING([--enable-build-demos],
-+                             [Enable building demos (default: yes)]),,
-+              [enable_build_demos=yes])
- AC_ARG_ENABLE([always_build_tests],
-               AS_HELP_STRING([--enable-always-build-tests],
-                              [Enable always building tests (default: yes)]),,
-@@ -161,6 +165,9 @@ AC_ARG_ENABLE([installed_tests],
-                              [Install test programs (default: no)]),,
-               [enable_installed_tests=no])
- 
-+AM_CONDITIONAL([ENABLE_BUILD_DEMOS],
-+               [test "$enable_build_demos" = "yes"])
-+
- AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS],
-                [test "$enable_always_build_tests" = "yes"])
- AC_SUBST([ENABLE_ALWAYS_BUILD_TESTS],[$enable_always_build_tests])
--- 
-2.13.2
-
diff --git a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch b/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
deleted file mode 100644
index c73e3f9eaee2..000000000000
--- a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-autoconf-archive-2019.01.06 breaks AX_CODE_COVERAGE usage by requiring
-a different integration inside Makefile.am. This would be fine if the
-local m4/ax_code_coverage.m4 would get used, but eaclocal parses out
-the install from ACLOCAL_AMFLAGS, and calls aclocal with that, which
-overwrites ax_code_coverage.m4 with the newer version, obviously
-breaking the usage of all that in Makefile.am.
-Workaround it by patching out the --install argument, thus using the
-tarball copy of it (older version), which works with Makefile.am
-without further patching.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- SUBDIRS = . po docs gdata/tests
- 
--ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
-+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
- DISTCHECK_CONFIGURE_FLAGS =
- MAINTAINERCLEANFILES =
diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
deleted file mode 100644
index c00287ed11ab..000000000000
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/22" # subslot = libgdata soname version
-
-IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	gnome-online-accounts? ( crypt )
-	vala? ( introspection )
-"
-
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/json-glib-0.15[introspection?]
-	>=dev-libs/libxml2-2:2
-	>=net-libs/liboauth-0.9.4
-	>=net-libs/libsoup-2.55.90:2.4[introspection?]
-	>=x11-libs/gdk-pixbuf-2.14:2
-	crypt? ( app-crypt/gcr:= )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	test? ( >=net-libs/uhttpmock-0.5 )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.8-disable-demos.patch
-	# don't overwrite m4/ax_* with newer breaking versions
-	"${FILESDIR}"/${P}-ax2019-compat.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-build-demos \
-		$(use_enable crypt gnome) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable static-libs static) \
-		$(use_enable test always-build-tests)
-}
-
-src_test() {
-	unset ORBIT_SOCKETDIR
-	dbus-run-session emake check
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 4a8a06c93f9e..3e4d6ecf3765 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,4 +1,4 @@
 DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
-EBUILD libgit2-0.28.4.ebuild 1657 BLAKE2B 59e4dc8b77221684bd08cee0123117fc56dc00b25fcf2879e8eebfd49cab36b8b38d56b7045bb0712304b9c518d89fd65af614611f30079386823d56601bc1cf SHA512 184d553f4a849ef06e19e9366a92ea2ccfc5a2322d788202b324abfc62dd5d1101c9305743379b4ace46aa1073339bf35d1c61d6a425fd42b5c7317b117e3f68
-EBUILD libgit2-9999.ebuild 1661 BLAKE2B 58810e5332148cd646da00a829eb7c9668cc7659e28c2927d23e114cafb1c9dd840411f3cfd8e4ec629a185635cac1271890baa46e1a5e0a5ec8a8918c0dd656 SHA512 80813e0018838d4bb581413e7b6b054fb69976474e641c289955ec69dc8a974af01e701e53a9aeede5dd1e4d58af4d03a55813a5f84e101000ba2a500e1b01c6
+EBUILD libgit2-0.28.4.ebuild 1651 BLAKE2B 74131b4ca7dbebcd1a15ee10ba20d0d8326447b9ace6069f10bc81d1cc31eac4450cf03f2412be57a4a1651ceb2e6f40bdd13434e4efb26ca9edc0db7c221651 SHA512 da910710957b1f30208f77d5edc1573509629dd8bab12921962b1e9316a59d76d9749acbcf8a104798e96f137d3ac1c25fbe8fcef6ec23aea31cddb3829cca3a
+EBUILD libgit2-9999.ebuild 1655 BLAKE2B 2fb83e4ef74143c9bed984ebc03842fd32f820c3249f5bfc77a114c97c01eb7ac62d10528bdfc54c5f389b702af61438e5458eec59a21e30e06890df48befa0a SHA512 41d11a84eeedccd2ad2c15ca547d3ca43519b34a2e826bee3ecf3116a591653b1ed280df5a8b166823a00e83d01246c206738f8c8d82f94264354ad3af2bc2a0
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-0.28.4.ebuild b/dev-libs/libgit2/libgit2-0.28.4.ebuild
index fe94903c855e..7f89d8572ada 100644
--- a/dev-libs/libgit2/libgit2-0.28.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.28.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-9999.ebuild
index 0519a2c0e43f..41394dc15ba1 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils python-any-r1
 
 if [[ ${PV} == "9999" ]] ; then
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index f34d4b9a9e38..7512f1357dcd 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,4 +1,7 @@
 AUX libgpg-error-1.36-gawk5-support.patch 4306 BLAKE2B 60bca612d1ce3b69facd0d27daac6275ad1f33ea1a514c762fdd4ff28c55a5e9725c2cd83429e1c2368b42fa6e9850400ffa668a6ce160cdbbc289e421d53c02 SHA512 69cd5219f47193a4b350661fde2d3dcf639ac38dacb6e076ae1d49bd1989562e034f5a238db3fa8af6fb1b80c22d5a6a7fa3f20a2fed95fe756e1a7840a1d886
+AUX libgpg-error-1.37-remove_broken_check.patch 786 BLAKE2B 38c3b7039d17de117ba876c11377fe765e39a4630d2dbda21d07aa6a0e027b5ee0e4f2da225d7d6847b5086c7f4aebe378c82a259ec9d82e7ecaac1f77413959 SHA512 6b9087cfa21d844f2306aca0e5575a03b9409ae8e5ea55158734560abd135af265512bec3de8c943210ade60b6334ea1798aa517ba5738cb9fe6720b3cb3c68f
 DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
+DIST libgpg-error-1.37.tar.bz2 937282 BLAKE2B 70666749aa0156652405ee15e4307f29bdf748f06728da5c672c0208053e0d3a041aaef882b263dd828e2aa7dd8a2f77334447af2c499f81f7602150d84f593f SHA512 fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179
 EBUILD libgpg-error-1.36.ebuild 1685 BLAKE2B c4ca02517b51a00898bd3aebf08688b6f1a5543086ad9167cb312bc55985d63aa06cee42b39fa92daeb48341a0754e374bd838c6448004ea505b8057e4d7360c SHA512 c21def95376b920b2c2b2cf1c1a59aa9076076932749ed6ac3444b446bee49170fe4eb5b363d3491155c68dbd64e0c9dae3e24fe5bafe272bd1c7ab483c77bbe
+EBUILD libgpg-error-1.37.ebuild 1701 BLAKE2B e92db632fa62016f6de848f018c409b767a1ec979588bbfbd0db320bdb5642e68e9acb211f635237092a5a39c38da3ba2ab26bc3ad26ce500db6ccebc5356c54 SHA512 d9f298c42512e343abb840900169403f6eb50d0c3737bd8744a12689ce08da497732089901ff7246840bc87fcee546fa2e7a642f132dfc18246240089c92eddd
 MISC metadata.xml 438 BLAKE2B c080438b3f22dbb803acca5a47dd880271b97c2def132cb0fefbc3d3e30c663d02be6bc7553393ab1d33932313026ade3f3f0c576fb572938f0b5fdc6f07210f SHA512 5a5c496db2115e5bc4ccb81aa69995c85a6b967c3acaab1423f94d22c55965f8e9377711e8c3a4e359ae661ef9d6137959058500a6cb036656a5d14fb88d0bac
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
new file mode 100644
index 000000000000..2919a9d73be0
--- /dev/null
+++ b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
@@ -0,0 +1,22 @@
+This breaks our multilib builds:
+
+  Confirm gpg-error-config works... no
+  ***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log
+
+--- libgpg-error-1.37/src/Makefile.am
++++ libgpg-error-1.37/src/Makefile.am
+@@ -338,14 +338,6 @@
+ 	cp gpg-error.h gpgrt.h
+ 
+ gpg-error-config: gpgrt-config gpg-error-config-old
+-	@echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
+-	@if ./gpg-error-config-test.sh --old-new; then \
+-	  echo "good";                                         \
+-	else                                                   \
+-	  echo "no";                                           \
+-	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
+-	  exit 1; \
+-	fi
+ 	cp gpg-error-config-old $@
+ 
+ install-data-local:
diff --git a/dev-libs/libgpg-error/libgpg-error-1.37.ebuild b/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
new file mode 100644
index 000000000000..382f00f81ae9
--- /dev/null
+++ b/dev-libs/libgpg-error/libgpg-error-1.37.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal toolchain-funcs prefix
+
+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 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="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
+)
+
+PATCHES=( "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" )
+
+src_prepare() {
+	default
+	# only necessary for as long as we run eautoreconf, configure.ac
+	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
+	# not a pure /bin/sh script, so it fails on some hosts
+	hprefixify -w 1 autogen.sh
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(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 -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index 1f599ab653e7..cf4678d995ec 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,7 +1,9 @@
 DIST libgusb-0.2.11.tar.xz 291992 BLAKE2B f43065fac0fcfbc3e392b90dc05537746ce1325d623161e93e1a306b87b07012ef4e11242514cd3da0b83a7df6adc052e20fd3336b53d2543ed9e23886a776f5 SHA512 f9c3c204b5f0feaf706b23dd9a174feb36a9f3c8db8ffb5dcdefa66b18ba0ac963c6041d2d91a6a2f6e23036fc6486d142210bd5348e10c026a6defeb0bee096
 DIST libgusb-0.3.1.tar.xz 38568 BLAKE2B d09afae9d210fde1411de5a0b9b8852eef49f88558ff4c434ef5f2ed9c1c6c29600b96dad73f6873027c5ce0987a3fd99691ffd97d90cfba9f63fbb2cc73f8cd SHA512 5c864e35ec64d1e52ec15ab971c75e0ee3e4664223a6b365815a54819f23342889e5f9739b998799a3af3d37ee75f0ae38ee0d8bca4ed1e2d6ff712f65a53b9a
 DIST libgusb-0.3.2.tar.xz 38852 BLAKE2B 72f98e54e9c4716380430103395ad6da830148c7ef4fb3e7e1445fa28c40b6cb1dfc954403896dedcd584d154383c38233abd422e20801a7e2f9165a6b69e4e5 SHA512 db4274b67d775ac0a46df11037dbd4cab84e1128be6d5b579ee5e1f493f3cc9d0950958610207ad5f207423570a86e664a9817885e25f86a858a95f96cfe19c2
+DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c735f3eaf80bb75f1ac55ededecb4038125428c1297942d014dfd3ea995f7cee8355150f1e90e0fec4aa92cfa9 SHA512 8be37283f2c1719976bbd9bc33eacf5afd4cef107a6629e8f9523b49e66ab2782d9937e4d9fa18760b9083c991c91d6126cfcfa22921b3436a9ebc3a858d855a
 EBUILD libgusb-0.2.11.ebuild 1274 BLAKE2B 2c1c8b748b1bff04c5d0976ac125ba508428237eda965ed898d4db331b2250116bb4e8bde8030e6d3a49a7abb92629b7efc058cc21a3b3f515400d7b94312584 SHA512 0458fd41a58329590c700f181c41c5737daa636a213ea285d5c3930ecafe2db29db7b427b575f6103e807fc5492f792fdf9f8d44f45d8beff3129f6e3e52ddcc
 EBUILD libgusb-0.3.1.ebuild 1497 BLAKE2B 53a724d97fb95eb4ebba955663c744288fdd8ff643794e664286c1aa26a35ea2d0409bb0facae0c5d7c367c71b197aa55c67c33eb50cd7494ddc9f8cd195d39a SHA512 77da2fd2c758dd43c4217b225856fb1c00b3f893d7c629bec305474b72a79e61a1e62aed6e140e52b6e434a0a1c7a665f17b100d5a3b582afc37c078d609d1d1
 EBUILD libgusb-0.3.2.ebuild 1497 BLAKE2B bdeb19cfcc0b05b846e546b6a1eac91f7cca3acdbf898922f6f8ec7dac36d0ed02d3184e85cbb94eb4c5af2cb55a88fe7ed42191f887cf64f8feb9c682bc764a SHA512 2d5f829dfb61c0a88284676a6e6eb4ef468c9faf17dac39a6da81c27c6ecabf2d8f79e9a2189437b2609a7c83455e9d0dbaf7ef6ee7fe8c50abacce2602a0335
+EBUILD libgusb-0.3.3.ebuild 1499 BLAKE2B 2e7e4dbd2d6ed3616f2c4c7fa4fc603bd78294caece4cfa0daa31985f50c5f59de387acaf150bf42303f3dbbf0f5ebab0c59bd3e3542154b5a596ef612b541d9 SHA512 47fd9ba8968f866a828298334d066054d7ce54544408030d899771f59928ee0b355a9202e6be60368cc16b7add69f020f38eedc954f45f20c422488c1083c53c
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild
new file mode 100644
index 000000000000..87219dfe567e
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson multilib-minimal vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection static-libs test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwids
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4
+		dev-util/gtk-doc
+	)
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_use test tests)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dusb_ids="${EPREFIX}"/usr/share/misc/usb.ids
+		-Ddocs=$(multilib_native_usex gtk-doc true false)
+		-Dintrospection=$(multilib_native_usex introspection 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/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 09abcc7c9855..bda55670f9e2 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,4 +1,7 @@
 AUX 3.32.1-meson-tweaks.patch 3169 BLAKE2B 4bfc87153b5f63626ca21a17706e1c510915929fccb691ba9ccc4b3d2f5869927a49cd82a638e7a9b265ebf31f4320c226090a9bcc94f8d438583dd709272695 SHA512 570beb2093ee4f39920cddc95f464aa0cac09ebe299418c8924713e1db060906ddcb8aef7db617079a50dba4ab2b3923aed99f3adf3377e52c7562719072b885
+AUX 3.34.0-tests-Add-another-duplicate.patch 981 BLAKE2B c1f3a196fac3da61a03b081eb82c6726cde11af9d18fb193794339f639953653f937442bb78a9561cde9a0860d0d4841ec50943d218f87ea4507bf05a7b45337 SHA512 529fe41ded3a199795d39490804f6ab8bfb108e0c9b8ca4cafd7b4a27d695d0a32aaa0954b0a89650d160cba3b7ddb2efad4170f2fbdad806e611aaf918b83cb
 DIST libgweather-3.32.2.tar.xz 2716144 BLAKE2B 56bf66edde8293758f49c1ca14b47fb725f72a0202e95e6e1d1832c179fd9414d527827be5cb7daa17627abfbd1ac16d8d09dbdbbdcb24d62cc62c25a220c156 SHA512 61543e5eaf8c04605a91a6f47811b3a0ed2b04c2f50eae9b8d08a4e24904db4731748fa27a0863d2cdab5fde776ec55abe9fd9fb2a72c7bd546665d59957cb4d
+DIST libgweather-3.34.0.tar.xz 2725096 BLAKE2B af1034b905354aed433e3a5249305718b850f84dabcf3e96b9f9bcdda7dd78258ede0a9e82cab9b9d7f1b63d8e1a61bc3c83c1c18ec38790bc43c29fe98bb89d SHA512 44451837039965251d86f6f538c943a771ab1944d9190ddb2c6bdb34b3ed0e33756c537e84f24487fd5f28b107e8d3af05a6c20a68f83734ac26ff69a8bd0aba
 EBUILD libgweather-3.32.2-r1.ebuild 1665 BLAKE2B 26223bd855a2e91e1a2f89074bcab4d45929cc72ca8dc31b9c6ebd6d44642612d2aa3893a83726712a61b3800ae9e973de51369de1dbea4a3612ea660ff7cd9d SHA512 2a52ab224d0994413117042f8ca00721343ef5a99f10031336dd90736a1c8efa3b5bee5d55f6c01ecea35cdf9c4b52a587e3442e729c8da246b4f54a3e1d9862
+EBUILD libgweather-3.34.0.ebuild 1722 BLAKE2B 8c6913ae9887bc98d9d7c430b5ef37253380c89a9930125f1a4baadb5d9a7725205727a2ce8af5b28a95400b80765ace1ae3432c70cef04b320213f3304c3c1d SHA512 1bb16e597289809c136fd1185ece24198cdd9e09dee4261676a63ad8b1dbfbbd9d4e1ff6c566891ca0024fd783cf877271047f79252d23fec988d7f5ec9ac106
 MISC metadata.xml 349 BLAKE2B 5467cd4402c0ec93c36f4cde26afe4ff2cf88d31227d8fbd22cabf50b4521c4634dba856a531da5f0054ad208daa8b178c9fad63b72dea6bbdeac13fa2f67bff SHA512 56d547e8cc66f19d606374f64c25546a687f3d199b083e406b871231a53362c0fdbcdf0a1c4f41810a2eb719e1bbab1c1589d7abeeb5630e1e04c20748b0df5f
diff --git a/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch b/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch
new file mode 100644
index 000000000000..29956e3f498f
--- /dev/null
+++ b/dev-libs/libgweather/files/3.34.0-tests-Add-another-duplicate.patch
@@ -0,0 +1,27 @@
+From ee246dc058098dee1709d76635e72db35efcef4e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 20 Nov 2019 10:55:02 +0100
+Subject: [PATCH] tests: Add another duplicate
+
+$ wget -O- -q https://www.aviationweather.gov/docs/metar/stations.txt | grep KX26
+FL SEBASTIAN        KX26  X26          27 49N  080 30W    6   X           W    8 US
+FL VALKARIA AFS     KX26  X26          27 49N  080 30W    6   X                8 US
+---
+ libgweather/test_libgweather.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
+index 1bfa3d4..8a21911 100644
+--- a/libgweather/test_libgweather.c
++++ b/libgweather/test_libgweather.c
+@@ -336,6 +336,7 @@ parse_metar_stations (const char *contents)
+                 "KHQG",
+                 "KOEL",
+                 "KTQK",
++                "KX26",
+                 NULL
+             };
+             if (g_strv_contains (known_duplicates, station)) {
+-- 
+2.24.1
+
diff --git a/dev-libs/libgweather/libgweather-3.34.0.ebuild b/dev-libs/libgweather/libgweather-3.34.0.ebuild
new file mode 100644
index 000000000000..c92f920bd9ec
--- /dev/null
+++ b/dev-libs/libgweather/libgweather-3.34.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Location and timezone database and weather-lookup library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
+
+LICENSE="GPL-2+"
+SLOT="2/3-16-2" # subslot = 3-(libgweather-3 soname suffix) w/ temporary -2 suffix for silent ABI break after 3.28 without soname bump as per distro-list
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=x11-libs/gtk+-3.13.5:3[introspection?]
+	>=net-libs/libsoup-2.44:2.4
+	>=dev-libs/libxml2-2.6.0:2
+	sci-geosciences/geocode-glib
+	>=sys-libs/timezone-data-2010k
+
+	glade? ( >=dev-util/glade-3.16:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.32.1-meson-tweaks.patch # Provide introspection optionality and don't build tests that aren't ran automatically
+	"${FILESDIR}"/${PV}-tests-Add-another-duplicate.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use glade glade_catalog)
+		$(meson_use vala enable_vala)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 6a6305af97a7..169ca062d49d 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,7 @@
 DIST libinput-1.14.3.tar.xz 567560 BLAKE2B 76d38b795a5e721a73062e9c37b23bf6739291549cadc66401ef47b1a9afd5766f1d0ed855fc66912e4257fae4b1b813946c67246adb8d8566d5ad9478079636 SHA512 f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d
 DIST libinput-1.15.0.tar.xz 573364 BLAKE2B 521e5775fb98b1b3a281d1002bd41fb0cd3e7dd3d7c1f11bd32773fb8651cddfa7db1fa2ca686a213ecd726f2f0fb475cd3f40a7a7290101286a334fa7b0086d SHA512 5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6
-EBUILD libinput-1.14.3.ebuild 2068 BLAKE2B 9c8389061e1dc228e7a871110ee821ba79a012692738ad556000a15b5476ff27a8df18570059c76a113db186cd64ffc1e94aa28756e82c425e99a5cc8e8d56d6 SHA512 d23d2a0fce2e1fbce84e8c98c0646e62af3b1a8c859a657d78654cc1ea5c5105bad060b5c1ef78f4a040296f7ad5a6e305a4755c017bd878b2d49cbfea424861
-EBUILD libinput-1.15.0.ebuild 2111 BLAKE2B 8ae2dcf29df2fb409f8cd1609e9fd82ba9fbba8d7fab64512ef99ca22d6a2d814819426e3cacef11d493c00f9b14667d689969e6205f1906fa583ffd2de60939 SHA512 9f59464f1569e7d7634d042cf60ac8b927a38d14b330491c0119bf5f2162c282ff479381c8732baccec3ab7a84b189be0ff8ed168692ad9d9d942e9067698992
+DIST libinput-1.15.1.tar.xz 579236 BLAKE2B 0b0b8cd6643ef33c1fc52461caea332d98cee38b79eee3947fc3d853e6a9402ffc9ba2ac5588430c28c73b6444fa06f6743b0c932077ef29e97d0b1384e20fca SHA512 634810359bc4d86f2c4c75f472bee5eaed04ed93af3c91c4bc46a596402323941f9cc90173e278bfa7e5cbda6b7a20adc59bd09520dd4152fc961302b7e57904
+EBUILD libinput-1.14.3.ebuild 2062 BLAKE2B 2f69359a6fbf4ff51d52b31d98a1219577414f7462ead908fe9cceb9b46c1825f50bb422a666a3f69b5fb3086bdc6747908826cbb2a7d093e0a8a6bce9adb25a SHA512 d10de59e53d94998d274502d0e9f9c384e4ad267783b87bf3509d1e3e40132b25832926fabdf24a40a8fa2426d81c64622635d35b198dd12d39fac5a4f0af39c
+EBUILD libinput-1.15.0.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
+EBUILD libinput-1.15.1.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.14.3.ebuild b/dev-libs/libinput/libinput-1.14.3.ebuild
index 23c60db47803..7a369d3cd2dd 100644
--- a/dev-libs/libinput/libinput-1.14.3.ebuild
+++ b/dev-libs/libinput/libinput-1.14.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit meson python-any-r1 udev
 
diff --git a/dev-libs/libinput/libinput-1.15.0.ebuild b/dev-libs/libinput/libinput-1.15.0.ebuild
index d0cb85f869aa..313a4e3d067c 100644
--- a/dev-libs/libinput/libinput-1.15.0.ebuild
+++ b/dev-libs/libinput/libinput-1.15.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit meson python-any-r1 udev
 
diff --git a/dev-libs/libinput/libinput-1.15.1.ebuild b/dev-libs/libinput/libinput-1.15.1.ebuild
new file mode 100644
index 000000000000..313a4e3d067c
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.15.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+[[ "$(ver_cut 3)" -gt 900 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+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}"
+#	test? ( >=dev-libs/check-0.9.10 )
+
+python_check_deps() {
+	has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		-Dtests=false # tests are restricted
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	udevadm hwdb --update --root="${ROOT}"
+}
diff --git a/dev-libs/liblist/Manifest b/dev-libs/liblist/Manifest
index 7b694029c392..699a2a636b0a 100644
--- a/dev-libs/liblist/Manifest
+++ b/dev-libs/liblist/Manifest
@@ -1,3 +1,3 @@
 DIST liblist-2.4.tar.bz2 275234 BLAKE2B 2f18d8b85476bd9369ef597553a546450fd33b3f3b4486ca371e6efd810a51b23ca3880300e0ecf826e9a9e8591f2b90a6a0006d224b34552f77416a83f7175e SHA512 814a02e4e47de8d234e592b87156533c30563c64c3a7515712fb9b75119bcee21796232b2a5abf7e4ab892932fa256890ad175aecb75aad8fb4614c6f4fbe3dd
-EBUILD liblist-2.4.ebuild 1313 BLAKE2B be3464f685e9699c9ec98c67bf6874597700a73193eaad4f31c893c554a92d04b13943d6f911500899f72091d3a1f5508a60520d29727ceb108fe4bfb30c35a0 SHA512 9a6dc3507516c4f138544a702328ac2b7360cfdf86295751f913299670b00e8f13e1cd15a8baf0e235ce45050415cc8a2c64d79eb7b33ff42b6be06c03c42bbc
+EBUILD liblist-2.4.ebuild 1207 BLAKE2B 712b61bce5ed43e2388aa24b2b900d80008400d517ade4e77a578305a5c50c46a2725ad86e472ce93017b67e02576f0cd9c5546f87daed633d1bc01a66373533 SHA512 a229a31f5696516eae6054b322749477beaef1b8cd664e46c9c11c2b53d2dcebe56a36159ee8478f3eb715ae88ea9a3e8ccdd4b0a281a1372d41f398a252b5a6
 MISC metadata.xml 356 BLAKE2B 2e6c2a54ee9fd3a59c8e211ac442b72d4015961357c5ec18d277f4a6b322c2ba3cfc4fb107732037149d290c308ced9c357198fddf62649a6fea40d6da0fa055 SHA512 8f96ffa65c0fdb773f41835d285cf5d2aa59d84ab3c096ec6b6224d057c32b657f0d3de7a531fbb602ce2d84d2fdbcbf4a96a9947a2cd244dd90fcf7b8972f11
diff --git a/dev-libs/liblist/liblist-2.4.ebuild b/dev-libs/liblist/liblist-2.4.ebuild
index 0133d56da438..928ed1b2bfa5 100644
--- a/dev-libs/liblist/liblist-2.4.ebuild
+++ b/dev-libs/liblist/liblist-2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools-utils multilib
+inherit autotools
 
 DESCRIPTION="Generic linked-list manipulation routines, plus queues and stacks"
 HOMEPAGE="http://ohnopub.net/liblist"
@@ -12,36 +12,37 @@ SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
-RDEPEND="doc? ( media-gfx/transfig
+RDEPEND="
+	doc? (
 		dev-texlive/texlive-metapost
-		virtual/latex-base )"
+		media-gfx/transfig
+		virtual/latex-base
+	)"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable doc docs)
+	econf \
+		--disable-static \
+		$(use_enable doc docs) \
 		$(use_enable examples)
-	)
-
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
-
-	dodoc README
+	default
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/{*.c,Makefile,README}
-		insinto /usr/share/doc/${PF}/examples/cache
-		doins examples/cache/{*.c,README}
+		docinto examples
+		dodoc examples/{*.c,Makefile,README}
+		docinto examples/cache
+		dodoc examples/cache/{*.c,README}
 	fi
 
 	docompress -x /usr/share/doc/${PF}/{list.0,paper.dvi,examples}
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 8f734ffd5cee..63f8c22b76eb 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,5 +1,5 @@
 AUX libmspack-0.9.1_alpha-fix-bigendian.patch 444 BLAKE2B bc62193205d7d96b8e2b535236463d0695dfb1a3cc4b2290d172873c11f9d3184550426e10bd1457282531f27a22585365e5b1537f1b9f85eeed4fd31afa5748 SHA512 c2e138e19c7e8b8f90e1dcc35d32f655ccd7a1930eab7a0b49686e9d2be26cefba48bc895ef1ebcb1959c0422e824779f7e31940bbde0c8bfd8a2828c2ad6c3c
 DIST libmspack-0.9.1alpha.tar.gz 494651 BLAKE2B 4543215efbcac9cd2703cd56f2297645463831cc2dfa6b38d87c5f48f39676347bb20739e0e389e021983d910b9be99bfd369fb30d36090f3f72f09532d6bd1d SHA512 4e39c2be8768c5c0b0d0798c9322ff022173f5e05af1636c18541bbc9f58c1ae1af59252d5631340fca601495c5b1e5abed0ad83481387421d2df5efb75cd49a
-EBUILD libmspack-0.9.1_alpha-r1.ebuild 1681 BLAKE2B a4cfaa14f0905fb300c4e0ebf6df92b4cd410e35f9e75c09e5f0e7a5a03b6aa0ca47d1fde348d31e8e6b96e0f64c14a31977c15f86f40349ee0db027ab6a220e SHA512 2191619f66d31f445250d40631d7888ea0e8807da3a04cf6c6217d2cc562db9592409bce1a4d2f451f2c021a0433f1bb51046fbfe3250ec6ee0360ac509e55cc
-EBUILD libmspack-9999.ebuild 1606 BLAKE2B 54a39c3d22d8cfd335eab023702e83e0a3f05c1ec9c96890e4c0f622aab2a88bfd9216678127126ab0ee33965fe51a821d4c32636a5050b68830bda83a2ea828 SHA512 71ad3f2118af448b402b2d674015fa2f92ed7005bf11bd8d951416f7d92d6dfdab285f68a29a23f9fa6fa1d75e8d07109f27e7707b91d067b96ee8870a926ec9
+EBUILD libmspack-0.9.1_alpha-r1.ebuild 1679 BLAKE2B 2d37393c2dff02706e23a043bd184c3419730c2a2a324c3cdba130829cf197b65d485e63435aa7e0da907933540d767fc0efd910f73349ed40fca5da35ea225b SHA512 3fbb6254454fe8ac83370cb7093ec6920f317dec0b25680365d7b1df38b97100bcad7aba81d3aeb84209c5a160701ccabbc481138936227a4454fb627d169c40
+EBUILD libmspack-9999.ebuild 1604 BLAKE2B 065b1f6ea752283a4fa67976537753974b68bf42433860e61459c39a318b1acf8b43545566fd5d28cb4625199978cbc08897e03982736f65c5c7b26770724b76 SHA512 81e07e9d7b67ee674897cc783787c822aceb258a9fe2282fef375c1ccae2a73d2003a38f39368310fe7a42b61219b5962b64a9632704d650a17ef20cdcf64efa
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index fdf5ee9550e4..05d375d16b1f 100644
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 	use doc && HTML_DOCS=(doc/*)
 	default_src_install
 	if use doc; then
-		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/dev-libs/libmspack/libmspack-9999.ebuild b/dev-libs/libmspack/libmspack-9999.ebuild
index 4c72d6fbe69a..31e174d47f43 100644
--- a/dev-libs/libmspack/libmspack-9999.ebuild
+++ b/dev-libs/libmspack/libmspack-9999.ebuild
@@ -63,7 +63,7 @@ multilib_src_install_all() {
 	use doc && HTML_DOCS=(doc/*)
 	default_src_install
 	if use doc; then
-		rm "${ED%/}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
+		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index c66cd2b6e6a0..1bb9c244038f 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,5 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 EBUILD libowfat-0.31-r1.ebuild 994 BLAKE2B e93ab5d7746de5c071b55a8dee7d2415f64f623aa98c543cdebc0a6007dff1b6eb362197f5143e7ec2f0ff97ff07e46d6298afe255af0a9ad2d2e5db1d626ab0 SHA512 070b2af23d5f88a2295c34674f86af39c68ca88480ca5882f79bc4c9a4b75f3a6f7a99ddc4deb85e4d3d20f8ae7dd04c336aced617eee63417f128378b1d05fc
-EBUILD libowfat-0.32-r1.ebuild 1055 BLAKE2B 9cb834bb413232dc3a96ba6c03d75193b06b50bdafc6d1407819722ab694ed4a31fdb64686ab514c1b4cf9dfe7aaeaf71f4e55dae8901ee900f8f96cd8b3da22 SHA512 1282bf87ebd5cd46c15e435a4d4482b7e3b374b815786402d8e07b0dfb59ede787e6af01040006a1612297431ef3bcbf73e4bc1734cbc7003665252f8fef5af2
+EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B a942d8bb1b68df60e25d245b644b39a9157bf298c9f6afa4184ed876b1ce9d7795be39ec329e7f28e5de8d92e280afc8b3f274e1c988bcbda94fb7e8e74264a8 SHA512 4d715c44e78e1e76bb9af21e29490cb3e1ac7e51693d0aa63295a0c2dfed723847af63427bbacb03f04e2da6e33a05cbde20150f69dd08b3794c1e7957da73f1
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.32-r1.ebuild b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
index 622656e3a5f3..8fcd920a4772 100644
--- a/dev-libs/libowfat/libowfat-0.32-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.32-r1.ebuild
@@ -27,19 +27,19 @@ src_compile() {
 	emake \
 		CC=$(tc-getCC) \
 		CFLAGS="-I. ${CFLAGS}" \
-		DIET="${EPREFIX%/}/usr/bin/diet -Os" \
-		prefix="${EPREFIX%/}/usr" \
-		INCLUDEDIR="${EPREFIX%/}/usr/include" \
+		DIET="${EPREFIX}/usr/bin/diet -Os" \
+		prefix="${EPREFIX}/usr" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
 		$( use diet || echo 'DIET=' )
 }
 
 src_install() {
 	emake \
-		DESTDIR="${D%/}" \
-		LIBDIR="${EPREFIX%/}/usr/$(get_libdir)" \
-		MAN3DIR="${EPREFIX%/}/usr/share/man/man3" \
-		INCLUDEDIR="${EPREFIX%/}/usr/include" \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		MAN3DIR="${EPREFIX}/usr/share/man/man3" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
 		install
 
-	mv "${ED%/}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
+	mv "${ED}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
 }
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index ad5342564372..08f8b711bc11 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,4 +1,4 @@
 AUX libpeas-1.14.0-lua.pc.patch 553 BLAKE2B a86596d6c76e22e3e947709db226a47110f0964ae493d4fd16e506f4666de5fd5214d431a5109ffb0b68a6743bf2aa89aba84b63fabe4e402ac491be01479743 SHA512 ead06352498ff82a4520d4a7ed7b5d03e2d0adcdf2025413851b8385bfdd691c938b456b555d2214ec2dc7b95708f306149d6f1cfa7c5b03ad28a1c90c873349
 DIST libpeas-1.22.0.tar.xz 561332 BLAKE2B 219918f8663cd60c9353f477ef905ce0d1e21bf5b7c09661c4cb3c8adbba3af9f5e93b9de8a1b098dab09b1f4071854a871c8ea1db878bda8fe9e51aa45e5f87 SHA512 9c1da1d4b5688c0f4d0647f3519dbfbed94c8921091057aaef0e41bf5ed3f8faf04a49ce9e4eea3fd7bf4ac4dfa1727d76a5f6dae2a4f52228d4c8c74b420c91
-EBUILD libpeas-1.22.0.ebuild 2196 BLAKE2B 05cffe6a03650ba0fb57f52721d2edf1a6a7f8fdf8197c729a11f7894ae7c357cc80f6b26786a5c07a1ec33e8618634bb09d227af4367f4bb13a4e2378f68bca SHA512 9681bcade2c2148f21364184ff36eb5592726cffc4ecb9464a83cb3ab52dcfee13320fa2837f6bcd8c5aa9749acda4e40b93dc4e89ee716f31d06771c07d891a
+EBUILD libpeas-1.22.0-r1.ebuild 2235 BLAKE2B 0a127c7459e00373fe163207b56e14bece19db601f9970f37c4a7e51f86e0cd88c17e9891b8cbe2964789a77c8b7e8ffe8fee84a10c5b339f732960ce2639d95 SHA512 125bd2134814f61805fcafa2547662c9d92cc1aadc360ff49d78b720d6634b70f203b28b88df19bd7ed858ec3b21d52948567c672b61ac0a296f7b8e706c87ff
 MISC metadata.xml 415 BLAKE2B c3e3dc9746663cd67cfb3a1b2e765bf5da73f9db2669ff7003b5e77ccbbe686780dd181727c3dd3d3f4c5f6e312daa1f36901896ff843cb81c687853340ef680 SHA512 4bf99a5c542cab95dadcf6db8aecbefa0be453f8851c2222ee698eec38c221f3b45b2ead6f87dd1d1ec5a233ba73054cf3b3d7b92d12ff4d88ee04a2057c50ea
diff --git a/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild b/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..d2eec7dc5313
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.22.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit autotools eutils gnome2 multilib python-single-r1 virtualx
+
+DESCRIPTION="A GObject plugins library"
+HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE="+gtk glade lua luajit +python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=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_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.2:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}
+	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
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
+	eapply "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
+	# What do we do about gdb, valgrind, gcov, etc?
+	local myconf=(
+		$(use_enable glade glade-catalog)
+		$(use_enable gtk)
+		--disable-static
+
+		# py2 not supported anymore
+		--disable-python2
+		$(use_enable python python3)
+
+		# lua
+		$(use_enable lua lua5.1)
+		$(use_enable $(usex luajit lua luajit) luajit)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_test() {
+	# This looks fixed since 1.18.0:
+	#
+	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
+	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
+	# To reproduce:
+	# >>> from gi.repository import Gtk
+	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
+	# This should return True, it returns False for Xvfb
+	virtx emake check
+}
diff --git a/dev-libs/libpeas/libpeas-1.22.0.ebuild b/dev-libs/libpeas/libpeas-1.22.0.ebuild
deleted file mode 100644
index c4cdb1939630..000000000000
--- a/dev-libs/libpeas/libpeas-1.22.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit autotools eutils gnome2 multilib python-single-r1 virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="+gtk glade lua luajit +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=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_DEPS}
-		>=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
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf needs gobject-introspection-common, gnome-common
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Gentoo uses unversioned lua - lua.pc instad of lua5.1.pc, /usr/bin/lua instead of /usr/bin/lua5.1
-	eapply "${FILESDIR}"/${PN}-1.14.0-lua.pc.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-	# What do we do about gdb, valgrind, gcov, etc?
-	local myconf=(
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		--disable-static
-
-		# py2 not supported anymore
-		--disable-python2
-		$(use_enable python python3)
-
-		# lua
-		$(use_enable lua lua5.1)
-		$(use_enable $(usex luajit lua luajit) luajit)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_test() {
-	# This looks fixed since 1.18.0:
-	#
-	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
-	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
-	# To reproduce:
-	# >>> from gi.repository import Gtk
-	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
-	# This should return True, it returns False for Xvfb
-	virtx emake check
-}
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 4d54806490cd..c694f7d94727 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,3 +1,3 @@
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
-EBUILD libpqxx-6.4.5.ebuild 2166 BLAKE2B f7053fe86073075eeae79d9c9e71975641049476a858e086e0321e61d38d95239d4e54d85ea4d35d154e0e3707e7900403786cf1b642366ba4f755f05d616af7 SHA512 5e9138f44bc74c5025b84d67020fffaeac27e4882b962bb02abce643fad7b10df338652ceadced91909b3a1814781d405565cac3632304201ee8ec0affc6c58d
+EBUILD libpqxx-6.4.5.ebuild 2160 BLAKE2B f1de8130b63c0f06f97288684678436487e1b0b45d21864c8e6c14213a8cbd8182770df85b5f67643df999c2949f7f29ddba450b5408e01f54cf3026b5e8997b SHA512 7aa95d7c2af3745a29d8673824b22ee09a7ce78b92ecc5c71a55379e73c44748dc519fca23574e2b2ac9d0420af8d459d0edc175a7e6b3937d15ef97b85ab13d
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
index 45ec518c2990..41b9508b37d1 100644
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
@@ -45,11 +45,11 @@ src_test() {
 	einfo "The tests need a running PostgreSQL server and an existing database."
 	einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
 	einfo "set PGPORT and PGHOST. Define them at the command line or in:"
-	einfo "    ${EROOT%/}/etc/libpqxx_test_env"
+	einfo "    ${EROOT}/etc/libpqxx_test_env"
 
 	if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
-		if [[ -f ${EROOT%/}/etc/libpqxx_test_env ]] ; then
-			source "${EROOT%/}/etc/libpqxx_test_env"
+		if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
+			source "${EROOT}/etc/libpqxx_test_env"
 			[[ -n $PGDATABASE ]] && export PGDATABASE
 			[[ -n $PGHOST ]] && export PGHOST
 			[[ -n $PGPORT ]] && export PGPORT
diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index a425d5a73967..bea0a095f9f8 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,5 +1,5 @@
 DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033cac59f93394c30ba99ed772d71b2882bdbb9bed696e57ed99805d47e57fd5e331cc3bc3850c5f15041a0d70d0 SHA512 92d01a51b4ee3c66d1f65d2e26f214646d72b41a8411ab700fe5f9f30f805ef98dec962526ef95c8d8428bf7398d38f656c919f95a3e49382adc745ef9eb4239
 DIST librelp-1.5.0.tar.gz 521793 BLAKE2B f3fa42ab1df5bc7fea340bf87f241666535f61a5726df55f47f6f324347a1dbbede2a66d252fe654d21e79ee44684aa51e83cace32491778d6cc42698f578195 SHA512 b7fb35e4ddb5c3c14ef733699405f8aa62911adef305cd4f494170e111bc61a9208b84dab472a708582cd76ad9976894dae0e7574e60acdae2b56491aa7daf36
-EBUILD librelp-1.4.0.ebuild 1409 BLAKE2B 56e8e417025698416c1c04d3a1bb99d3a588483d7256b66ffee11d999dbe90e7d6a86d14afab952877e8ff2135a11ce68db4bcf30180df75b902df903ebca327 SHA512 9b69b3b1a806a6e407ef2bc92a725617aa02b4ef8914418ac7b730c732fbf0fbddaa6c95fa22ee82447e8a587924a3542b0859e9891692cc0183b72e2c2e6d86
-EBUILD librelp-1.5.0.ebuild 1426 BLAKE2B e66afcaa5300bbcccffae0b396ca1fd837ae7c1d00231d9e4e71470553ec64a00af1932727a54d5d3a9a45ad4a1c6572f07bc7a519718f829c3f56cf005c48b2 SHA512 380f1cd27b8f8ed98a74088012a343cbce81c3dbdf5f6c705cf133db6d9fa766ac2000a4e5cb2a71b861718795c667ea40729d1fabe5c66104d34b82d9d76876
+EBUILD librelp-1.4.0.ebuild 1399 BLAKE2B 330788604ea143718e59ab3c88d5248cd93c914c70a8c91d6d5cfbf3cea0a286355cefec2f6b8aa9604b932283b618f7e5615a58ca50dc14089e94eff09311b7 SHA512 9b2a4086e5a56bd13b7741f285753fa834e2f2b8cc7c376e539e5b8507e8d61dce8264ea0e1ebfbdf1ed26dd34b44b490f125d13bf97a106384f81a51ff83847
+EBUILD librelp-1.5.0.ebuild 1416 BLAKE2B c1d1c05cd987f44ba5d965d63ef92d554c3c802e1c8376a8b4213da06448d87dbd5b95088592a530bc24722f7ab6f35c2112cc4c6e8211b56828856b731e834e SHA512 23ba67da9b64b8c0ada1ec3659a0010f5556353ba7e4a2a346bd84cad9cde718a418fae8959e37001995122a131a8dd62c8ddab453a16a09d4cd6df7d050162a
 MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild
index 3bfd7307720d..529fe6d6459c 100644
--- a/dev-libs/librelp/librelp-1.4.0.ebuild
+++ b/dev-libs/librelp/librelp-1.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-any-r1
 
diff --git a/dev-libs/librelp/librelp-1.5.0.ebuild b/dev-libs/librelp/librelp-1.5.0.ebuild
index c5a14c6f2f49..edacd29ee8ed 100644
--- a/dev-libs/librelp/librelp-1.5.0.ebuild
+++ b/dev-libs/librelp/librelp-1.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools python-any-r1
 
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 303fe1d76fb8..dd42a2cf27aa 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -14,5 +14,5 @@ EBUILD libressl-2.9.1.ebuild 1706 BLAKE2B d5cee2b2dc1e31e7c2efc76ee9b735fac74bea
 EBUILD libressl-2.9.2.ebuild 1741 BLAKE2B 3ff5a7daf910176ae42a6ca9ed12f385d71045531bc8fd06dbe48b33d4578d8152f2f9eca2b89f8c072bb834fe68e8eabbe9e315609a7beb38bf6671032c1427 SHA512 bf8c33252b6a914c5c6ba488803fe5640c29351166747e78fa7b062f26a42916d7a3d4ee95f708804c8c5c4940f073b5d271be27e00777ca7f86c1d2c057ebdb
 EBUILD libressl-3.0.0.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
 EBUILD libressl-3.0.1.ebuild 1706 BLAKE2B 4e52ea77d949b992fb391ac7f5ba0bca0abac46a93cb352dd942aaa82d2b1088273a61e1c5fbfbbcec29b9a03cb3f0d5111253953fc1be5f40568e236d301674 SHA512 7688885e27c01946f0013e3336691973b2d56250d624ef55521493526e753c5229c57ccf62be8d9f39d1d8bc030b34c7cdb5031de3c32a1cdd7682ffdcfdc8b2
-EBUILD libressl-3.0.2.ebuild 1702 BLAKE2B 5d0393573ef69a6dd5cb814a95ff8025f431fdb0a0332c52cd6f6672ca71f9b0a89649ca790760e865e80f5d6f8172c24fcb2125e048b82996fcf56e6d4d9acd SHA512 594900dfe0fee806a35842f0976fffc833bb9c6788a569c7d7d0cbe74e987ebbdb7f2ee39afe38925d861c5cc81a0435da153bb0bedba365ff270e3eea88ef70
+EBUILD libressl-3.0.2.ebuild 1701 BLAKE2B 6a176fa77177cd2a629d2433ce01d2fbd7ef5157c55ce825d3a823325952f670a3fa5dbdb44fc1acee3e9b94a985e525111d36992df440d648fc6278ae385491 SHA512 e33f2e7d05e1b74f63f04865f799ec475cffabb1ea6b814d4528800726708766e37b3094114d873d2ef2e470d3096c80b1ee608e71f3bac27636408ebbcaf651
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-3.0.2.ebuild b/dev-libs/libressl/libressl-3.0.2.ebuild
index 58ef921f2581..dc819f980b67 100644
--- a/dev-libs/libressl/libressl-3.0.2.ebuild
+++ b/dev-libs/libressl/libressl-3.0.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="ISC openssl"
 # we'll try to use the max of either.  However, if either change between
 # versions, we have to change the subslot to trigger rebuild of consumers.
 SLOT="0/47"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 78eea66321da..9bf7c16d6e94 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -4,8 +4,8 @@ DIST libsavitar-3.4.1.tar.gz 92457 BLAKE2B ef5b7bb87d7b3293c0634d510f860b64f3235
 DIST libsavitar-3.6.0.tar.gz 92456 BLAKE2B badd2e416015c2d3331cfe77840466f11f2b671821474b78fff084c4f1c3bebab7b2ae16f75918d4eb40996e293165be46f98efea20edc57b1e1255c2ea9fed0 SHA512 6d7c416218a69b1327ed211a9b198cdfb6ebdf1fc9c8c76b898882a63d0905521d5e41380b21f0b8100ab3e3474bbbf142adea29c6643f03bc3f8c3e6ec3c72f
 DIST libsavitar-4.2.0.tar.gz 96223 BLAKE2B bfb41111e8c7cd90acec28bcb11874fc39d6fa2d0785959fd020fb36949300a0e1517a4ed78a153b1f1576b6603a466a2f5baa7e8370b05311729e17b7e83566 SHA512 9d1ee73b8e29e1b8b5688c309471cb6053addce351df8deb4e0cb46d15ffc8fe764216c9abd603440b6a60f42379fa03d88e8023ed01502c4e905ebc6a4f393d
 DIST libsavitar-4.3.0.tar.gz 96154 BLAKE2B 866edadad2ea27002b79e018dc073f53409e5fc3af86941ca3e196ab0c8e7299f945997801126b79776538abe81af3abec5c116dac9eb977c1fac02fa45767b4 SHA512 4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6
-EBUILD libsavitar-3.4.1.ebuild 1032 BLAKE2B 69c336990a66ce8e5d2b6d1c70befceb5a80a84ebe0b38926e7e642025e494504dc9c8e7903725e200c75e6c250371e0b5c7720ffab1d1e39bdfd4bf66e397e7 SHA512 2b8048bc003af91fe6dc1068ec053c12130b142fc74383016428c11eb77533157923b962dc3c1e6f54599100c840a0bbe333c930f8c3ed4858d10fdad31b7a30
-EBUILD libsavitar-3.6.0.ebuild 1032 BLAKE2B 69c336990a66ce8e5d2b6d1c70befceb5a80a84ebe0b38926e7e642025e494504dc9c8e7903725e200c75e6c250371e0b5c7720ffab1d1e39bdfd4bf66e397e7 SHA512 2b8048bc003af91fe6dc1068ec053c12130b142fc74383016428c11eb77533157923b962dc3c1e6f54599100c840a0bbe333c930f8c3ed4858d10fdad31b7a30
-EBUILD libsavitar-4.2.0.ebuild 938 BLAKE2B 6e0b3cee2d6a4a3cfdad5081446dc6294c6ebb6b675cd9e70ea19b811a39d941398f386ac44aa3b1be26c11e7d80ee2ae77d6de70d3717a33bfbc109eb99cc1b SHA512 8348a643cce7914d325004e40d94654b64abd1cb2d3b04c13cd48b9b05469e6a93b738b7694e28222adf5107d7f8042bb90ee3928882a5936b176362e1624b97
-EBUILD libsavitar-4.3.0.ebuild 1297 BLAKE2B 88b6c910fa8363f373c11aac2cab5b0a44589cd6d737c346f22c0a030a471294e717747cf6b38861da72b5b8a559575d470fa513992bc70acbc7ee7f66039e89 SHA512 e384f0e18573609feb3fe494c93f662a81ae00edaf2bdbbbf21fa8fd844161815ac0527bdf635d68e8a6f049dcc6e24c58f054880c00093f580058048b92b798
+EBUILD libsavitar-3.4.1.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
+EBUILD libsavitar-3.6.0.ebuild 1068 BLAKE2B f68d50b167fe7c07c7cea56efd8638d8fddbc7ab135103e79656de88fee9ac329bca1769a0aaaf71865da29cb9a28ba90f47199eb2708e3857934f24a1eb8bd5 SHA512 47efb7b0ae80817a113e4ad9e6a8e583d63f0a7125a2d9ee082fd9cf33bc534ee011de3af7da6bb57c548034f11b65e4b000723c4cbd0c03a81463b6b00bcae9
+EBUILD libsavitar-4.2.0.ebuild 974 BLAKE2B f3b391057a360f16ee8c8752e2ad22b123fdbf251fc350d978227f3a9e974eb8c542f87ef3779eb88f446424c9c3de88644b55d37e6e3e715109765891db9b07 SHA512 f12bab72f5b81ff3ba3fc78083e2606d0e2107ee52961c0e26079e4628862f4a6aed905ee736c37eb5e7bb40b7f00131e20c2ee47b9d9887fcab096ce754c1a6
+EBUILD libsavitar-4.3.0-r1.ebuild 1333 BLAKE2B 05501ca347209f318581ce3fe680a3b4ba3a5f5830f2b7c0b06f02f178b572de60231e19584d074c96cb878de5329797097a3926a9baf858b7db4cd5781f407d SHA512 3e3ef5511fed7b8e6ce2b4737d7710e9b5b11365a3237ed7cc7d254b20a69b97e17fee02ce64c393df0bfb047f56cf5b2bded3f449fc45e98f124ab51522ce78
 MISC metadata.xml 862 BLAKE2B 2bca0c0a62d0d51c6c83e7bfbf5ff5511545620f2280e60d52b91f9570a52f49f410701b053a4ce6a3fd5ca55bb5becdddc8197b8dd24c284bca410d952db58d SHA512 b31615e952a8ef30f5d72b2dbefe9f6b4330b483781eb57179f7d0d1d9e91159e26eff8f90e494b1747354c059d05ad57b16c08511f9e775e13d8b0165502304
diff --git a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
index d9ecc72540b0..1ee1e2a50841 100644
--- a/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.4.1.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
index d9ecc72540b0..1ee1e2a50841 100644
--- a/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-3.6.0.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
index 26c10c69fca2..55f2b677a7ef 100644
--- a/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.2.0.ebuild
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..599349de9add
--- /dev/null
+++ b/dev-libs/libsavitar/libsavitar-4.3.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit cmake python-single-r1
+
+MY_PN="libSavitar"
+
+DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
+HOMEPAGE="https://github.com/Ultimaker/libSavitar"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="+python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/pugixml
+	$(python_gen_cond_dep '
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Find SIP for current python version, not the latest installed
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
+	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_STATIC=$(usex static-libs ON OFF)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild b/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
deleted file mode 100644
index 1b2ed0ae3c2b..000000000000
--- a/dev-libs/libsavitar/libsavitar-4.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake python-single-r1
-
-MY_PN="libSavitar"
-
-DESCRIPTION="C++ implementation of 3mf loading with SIP python bindings"
-HOMEPAGE="https://github.com/Ultimaker/libSavitar"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/pugixml
-	dev-python/sip[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.0-remove-packaged-pugixml.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Find SIP for current python version, not the latest installed
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" CMakeLists.txt || die
-	sed -i "s/find_package(Python3 3.4 REQUIRED/find_package(Python3 ${EPYTHON##python} EXACT REQUIRED/g" cmake/FindSIP.cmake || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_STATIC=$(usex static-libs ON OFF)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest
index de5c6a1be1a9..96f1ed9742aa 100644
--- a/dev-libs/libsecp256k1/Manifest
+++ b/dev-libs/libsecp256k1/Manifest
@@ -1,7 +1,7 @@
 DIST libsecp256k1-v0.0.0_pre20161213.tgz 147557 BLAKE2B 078cb90c078722e2eb3b5645f9692d737c99ebfe04db5a96dcfb57bb750b31c009cd3ae46f793bb1789239be9689f6e695a5b03477eecea84f2c657d0cc7442c SHA512 f4d16fae972364fd04bfcfbaca1edde4410a7367a936f76c1e93b85ac3c9c45da58785f604a4fc14cdfb4d7a23395d2d274957ad83118e15a236dfff0d0f57dd
 DIST libsecp256k1-v0.1_pre20170928.tgz 150935 BLAKE2B f8b3408a33f36186c07cf931a8183a7a241e6418a846f4c3b248cf87e7a8b33a5a92368aa30310efadb066792eebead7fb48b4f4d902e7c8e9b4209717d7b8c0 SHA512 f480c76ba04b3d731c65227e156eb726b27da92f5dcfbd9b0a34c62e97f9b6dfd5c3fae3180b59244d0c9845fdf624b05f29e097f3ac0032ab15cebc4bf00660
 DIST secp256k1-v0.0.0_pre20151118.tgz 125884 BLAKE2B 7a4fc950006138d04d8d3da35db24be0c568e25202c16f34f94555fde1297fba839fd114a003b5510693de3386de22166c6f1294726fe381ae5b565cb9866a75 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19
-EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1380 BLAKE2B 8cadeb5057f75775c0f2322dcea8f1bd92d9a82e83ba62c5f24f24746044d8a36dd73bea8c26cbf0b8bcead7dd2e09b8246027147bf3eabb15f343c4df45221c SHA512 5a2dcb53dde35df5c45d44d69b093f85dd3288b0e85ce6ae76c6d1c4ed8b66206d8bc9a28d6e78796cb0c59595722d9aae2bb745b15a3aa0b1cd6633227362a0
-EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1544 BLAKE2B bb172053e180ecf05098953d39ba8b7c168fc78f215d3f1fbd8c7f20502a64a86a425dcfccf401d744699083d5d47a681243c8e78ebb0f834ddeb2e8a0cb6344 SHA512 4bb8091298f568a4e661e3075d839f5b104b714e67c9632f8f713bd095cb95d96c50994f3e67774b71db4ddbc4f1653a3ecb469349eb90b4d7cf9903bfa11612
-EBUILD libsecp256k1-0.1_pre20170928.ebuild 1587 BLAKE2B bc6ab78e259982f38b30d41c6d548ece072f4afa9a6147505c0ab6d7ef151be72397b29ae82085e5fc6d673729c2e8e6faed4b2685c0507e9c1fd5024483fb8b SHA512 e5ddf94c45d693b21ab6f4d97d0aa2ea15291c1db42b1df29b8ebab4dc4d6e6d0bc1186d276df2de6f69939c30f31a253efbc12b6b309b80c76ae9f2961eed9d
+EBUILD libsecp256k1-0.0.0_pre20151118.ebuild 1382 BLAKE2B 4f3ff495b3a6d1238c8ebe50c341aed0637bebb2bb1fe5c637fa3f2a94588c5addfbe0bbd7e9af56efd0e598d0c1757254d77f2636157e06e72069d29fdd8568 SHA512 1cc8cca3d30578fb81a5cc6a7883db4588fcecfa5946e43b648f73b7c8b6c86b5f3506132511574d911b21676d35eda706287f7d8bca7c54689042e683d759e4
+EBUILD libsecp256k1-0.0.0_pre20161213.ebuild 1546 BLAKE2B 270a70a3f6b6caf1ff105bb06d889ae106378976832bbe4c42a658a9182556c203c7cba40e471a174174a0e82e3dcb518112fc3bfcf5232549b032a6fc7a7af0 SHA512 9d57cb0261f61a4bccf735735dc8208f9c56e7c7d8ea928e87098ec7ba1700d8c75cb56225ca5c44c4cd7a50654bd4622222cb19e50d65ac83b34d75e98e019a
+EBUILD libsecp256k1-0.1_pre20170928.ebuild 1589 BLAKE2B 7f180be997a92ae35daa86b708e60a83518b118a93094e10ecb7a17bb1c4da61693a6c2764582f7bbbf9bd50dc52f09bd032c8b60445c55cd180a59d068a2282 SHA512 e2572b08bfac62c605d033baa21e2b24034fea5a9a0d774e5b91b110f1378d1ab98757c4329a6584538e301e8f72deacb4fa0e5e14b8a2c952d60812d5dfa1c7
 MISC metadata.xml 945 BLAKE2B 7a69755c3d1c70ed97958a6597821b2d35175bdb8a396bccef731a9da250a4b8b4a14fb9f28df076b265db72f96cf5d75c3892449bc7bc3f320c69d5d8e79c19 SHA512 f90780064a7b48ef4d9ad70fb20f61ee2ff62508c396bd79f157d2790becacd833d035cc9bd7719aec29acd0b4a30b37426106196f1e229f86bb6eb5c2abb8df
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
index 71d047416824..a4f3ba2ec144 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
 
 MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin/secp256k1"
 COMMITHASH="6c527eceee7f5105c33c98dfae24ffeffd71f7cf"
 SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tgz"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
index 7716244ab405..5d593b8155f6 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20161213.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
 
 MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin/secp256k1"
 COMMITHASH="8225239f490f79842a5a3b82ad6cc8aa11d5208e"
 SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
 
diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
index bd971f602e6d..86225fa50e57 100644
--- a/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
+++ b/dev-libs/libsecp256k1/libsecp256k1-0.1_pre20170928.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
 
 MyPN=secp256k1
 DESCRIPTION="Optimized C library for EC operations on curve secp256k1"
-HOMEPAGE="https://github.com/bitcoin-core/${MyPN}"
+HOMEPAGE="https://github.com/bitcoin-core/secp256k1"
 COMMITHASH="7a78f60598a6aeb635ef227ead50fb44a209c363"
 SRC_URI="https://github.com/bitcoin-core/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${PN}-v${PV}.tgz"
 
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index d43d8561d93d..e0de67d276db 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,8 +1,8 @@
 AUX libtasn1-4.15.0-noinst_fuzzer_tool.patch 918 BLAKE2B 4b0aeaa49d3c1460f0e333932a5f17e6fa289bac4f014d71a8acdc89748a30018ed8fadfc7e9410e30dbed70889ea2227ecb8e6e30b2b044f435cd44d3d6199d SHA512 be805ec8b11ad97a3bacdcbdcb80bc22a3be8fd1de9d512b7dd44ab207d1cf3f7db1d60af2e4c4634dcda37031a754d678ea8dab76cb23dcaf7d7bbd9683ce86
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
-DIST libtasn1-4.14.tar.gz 1771184 BLAKE2B fab592db4c62d1ed1201637fdbfbf7b753ff90994245b28bad4fbbb6f28616f0abc65fb5cf4fe9b9cd6cc7c4ffb442686b275a97dcfdbdb6a08b0d8e781576f5 SHA512 efdcf3729e9e057cafbfdc9929f08531de03cf3b64e7db62cb53c26bf34c8db4d73786fd853620ab1a10dbafe55e119ad17bfeb40e191071945c7b4db9c9e223
 DIST libtasn1-4.15.0.tar.gz 1800713 BLAKE2B 005a36bfdd89a167d469ef834c00d8b89e0fba42c0c973709be93c1d703b8042d5170df855085bac9945b6512dc3abef9405461988d634cb32ec0fe99f49367d SHA512 a8095aebf57a0b482027d06e0ee6978946f267b57bf2db3c891c4656ca35250cc1f72e2e90f4cc0ddbdf6cd2b1783881a62d495a57ad4a98684f8d037307552d
+DIST libtasn1-4.16.0.tar.gz 1812442 BLAKE2B 1a79494da959808d1b05099409cab70a08bf8be039f32c2e487ec8cee240d92aca9a3ec137721bac3bfe1ecd59334f4f31e0e0c25c6f06ee850af69842c0fefc SHA512 b356249535d5d592f9b59de39d21e26dd0f3f00ea47c9cef292cdd878042ea41ecbb7c8d2f02ac5839f5210092fe92a25acd343260ddf644887b031b167c2e71
 EBUILD libtasn1-4.13.ebuild 1176 BLAKE2B 1a652e984ba4178bcc24291f56b87ae03a71c823e9233302d90c45a4955aff0f2ba519ae22ed48c4d5bc5c625ee3f661df7808ad323c195660c9351d0cdb6e87 SHA512 a7964013c6856734947d51573aa17c4d50cca48f70ae38ad551b5dcc1590dd879fe5385ff7d99b73e27f74db0b8ffdc0bf86fcfbca81e18dfb90101ecc0e63ee
-EBUILD libtasn1-4.14.ebuild 1198 BLAKE2B 79f5f4e71758e7e019a8342e0a2e78ae8862d17b2cfaac1b508e09ba00c2379ff611bc6738293fad2c2194a08b42be1ac0a464f44671f705ed535c9938c4ada8 SHA512 a1b4f3a55a866fe4fb5f87b4567d4be7c5779c560ca7a925b4b44ea17e3ee964d2108a41c909f603a46971d025bc4b5fc2fe354adbe818aad30348f73f236de8
 EBUILD libtasn1-4.15.0-r1.ebuild 1296 BLAKE2B de75957eec71b3b4955c1b7109372f4b59c57a000923ca57327891f3573edaa037765e19dd43de13b927010b9eb6ffa4a843fe8f7e279838bd7d9eca97799868 SHA512 a2d407306a86b1562c89c489bc72690c0c2d1514591f725e64a67d0c919738bf78eccf6bceab0d6cb964ffe3166b2a3a41d5e2f4a62df949c77c77fd772cadd6
+EBUILD libtasn1-4.16.0.ebuild 1238 BLAKE2B b81eee3faa0cfbf77821450e42bb691772cce1be249f825b5299c2a054ab867a19a8112b3dfae0a832ccf37a3159f1b00d3b29af0d6bcb8ce58da77e53d81ee1 SHA512 fe1cbb04b69e09051369a07695c399deb2438193c93023d7333a021faf27c97191a6a5860eeccf4584d2a920fa11c41ce8f23b13a04d4c64176afee8ca944fe3
 MISC metadata.xml 445 BLAKE2B 9b3976fd78a81ceda730e46f0c5f74ac3f24744bf5503ffdcc8ad617133b643fd535dc7decd0f5060bbf77e0e3307f501d6355daa4e07d32f98532a0407c5aba SHA512 9eed39ede450d1598c75c1ebc487e5520f6cd8e1819a14b4d448502b380ccd0a7dc1510be8887cedd4b94add0e24700b84a588544bfcc29dea5d55b12c7aa556
diff --git a/dev-libs/libtasn1/libtasn1-4.14.ebuild b/dev-libs/libtasn1/libtasn1-4.14.ebuild
deleted file mode 100644
index ce8e7f67a174..000000000000
--- a/dev-libs/libtasn1/libtasn1-4.14.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal libtool
-
-DESCRIPTION="ASN.1 library"
-HOMEPAGE="https://www.gnu.org/software/libtasn1/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test valgrind"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="sys-apps/help2man
-	virtual/yacc
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-DOCS=(
-	AUTHORS
-	ChangeLog
-	NEWS
-	README.md
-	THANKS
-)
-
-pkg_setup() {
-	if use doc; then
-		DOCS+=( doc/libtasn1.pdf )
-		HTML_DOCS=( doc/reference/html/. )
-	fi
-}
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		$(multilib_native_use_enable valgrind valgrind-tests)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libtasn1/libtasn1-4.16.0.ebuild b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
new file mode 100644
index 000000000000..a2542fee79b1
--- /dev/null
+++ b/dev-libs/libtasn1/libtasn1-4.16.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="ASN.1 library"
+HOMEPAGE="https://www.gnu.org/software/libtasn1/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/6" # subslot = libtasn1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test valgrind"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="sys-apps/help2man
+	virtual/yacc
+	test? ( valgrind? ( dev-util/valgrind ) )"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	NEWS
+	README.md
+	THANKS
+)
+
+pkg_setup() {
+	if use doc; then
+		DOCS+=( doc/libtasn1.pdf )
+		HTML_DOCS=( doc/reference/html/. )
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize  # for Solaris shared library
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index 846bab950efa..25a6de0766ca 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,5 +1,5 @@
 DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
 EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
-EBUILD libtermkey-0.22.ebuild 969 BLAKE2B 078e9ce4fab1b490f7d9537448609b7761a1abb93a4ee802e71085a903b5bb9f185fd83d75e374a004cff3510b70475d4123726d4e81ff7bc3d3496f6079435c SHA512 7cc7b3f2da87558b313b52f9d9aca6ec960be077dfa6ccf96f1ce722a1e29f456919df27725c5541bbafc8669cf8e3ce01abfad4d9d3a3f810317cc32cd21957
+EBUILD libtermkey-0.22.ebuild 967 BLAKE2B a515cff5b3329b6fb7b22a8a056f8bcf4937224f5a16cf1ce294e6afeae94b76e267941f699c1d400ee0bf7698d444d29ba5e5898bfdc0762c2b5fa5f103b6f6 SHA512 cf6347921c7809afcb0bac8362f4037107851be2d22097096f7dc1ef595f2f6f46eadb631551279b57b2294ea340787d867cdb36fe08a9577b2661c369c0267d
 MISC metadata.xml 357 BLAKE2B b658c2de2a5bcbf02faff436d83266b842ab4217adb954f71f0543e5be5f791e48c97f4299e6c97e1338b0a2ee3937136062d0b80c1c8cb09deb3cec8d7add13 SHA512 0b48ba4931f32eda8d9c162693389fc65a0e0eac83b8f2f0dda2e58cabcd93a2bbf301c86c12cc0b2d89ed2c19afd82bbc3a54da9ab3e3f8c615aca24290dfbd
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild
index 4177883c0d2a..77170f6e2c9c 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index b75ab8bfa3cf..f676ad891b1c 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,8 +1,3 @@
-AUX libtommath-0.42.0-makefile.patch 1694 BLAKE2B 37c2e368bb4f2d6f7738e3f110bb55686983fb701c4eb3513fd1779572a8d8449a305e34c2194fa07fe7b74a63572addb764f3ba8c7cd3285a25c5502c25f842 SHA512 3ba5253df119d57e598167d4ea0c3cbc000c50395598a953462d24e21832d41bdb16631688a99266f533e133fa39a58cc271e32d05e61b3756697ddb06898999
-DIST libtommath-0.42.0.tar.gz 1732144 BLAKE2B 624697bfa0bab0244783c3d2c92df2a1c0418611dc7f25989d038a5689beae325a426d8de38967ec856bd1e6f2d9413615333eebbf9316add838deda5b122de3 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23
-DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f8acd0e4016fdd63b8ef10d939a8acbd4d49d70a69adf0e492ea5127200798f02af6af1c30e2e1f57870e3a SHA512 f98f7b0f91268e898803478fd52f578f476d378d096a25e48fa2e291159dc89bd1a6dc7d8c5c2254df840c731e5d009ec9728b72190318b6d1ba2916f5c66fb6
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
-EBUILD libtommath-0.42.0-r1.ebuild 1415 BLAKE2B 8a60c97932394540e696c4690510f5ea7b61649c04bee0e1df526ec460344ad693539dfe4fa8fb1a48095eb76faddd7a7a0d64908a0416ecf11f61dc84ecb8d4 SHA512 9df0399d9a9aaf4206ef2074efa02e84eae6c957fc3342203de199b74548f554f930eeee2d759df36baeb32d2de5564f5f0c533b024e4fd4418d7dcb74db898b
-EBUILD libtommath-1.0.1.ebuild 1485 BLAKE2B 0b5c4ba53bfe781804588a997a4cff542c269fdb6c0044fa2666b0eb523f7b6ab2de82e8ff8600f9331d2bf3c869eb1163cacf5eb843a5af4a694af6123df0e0 SHA512 be54807025371e26e1040e50b6b29a31ec1de08e4b0c4da0c85507ee8ea6410237633b4cd735ad9c6e7e830081fdc93a147ec4a43a4b2d1c7c58abfa1e76bda7
 EBUILD libtommath-1.1.0.ebuild 1515 BLAKE2B 394980d8ee01eccd82a3f9b49ce61570cea348ac4508662489a0918c2950c4d55b749e32b24b17c52434d9b249abeb112e2c35898e8041abb4c4d2f59375dd5c SHA512 be507edafbc2b683a80474aba78516a7e3475381d9dbc74a62c2e3b54f5275d64572b639c32e53d17a2d1c4ddd3f54300decc424f01fd203d09472c9352414f4
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch b/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
deleted file mode 100644
index b3f1ed6252c8..000000000000
--- a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- makefile.shared
-+++ makefile.shared
-@@ -3,7 +3,8 @@
- #Tom St Denis
- VERSION=0:41
- 
--CC = libtool --mode=compile --tag=CC gcc
-+LT	?= libtool
-+LTCOMPILE = $(LT) --mode=compile --tag=CC $(CC)
- 
- CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
- 
-@@ -82,21 +83,24 @@
- 
- objs: $(OBJECTS)
- 
-+%.lo: %.c
-+	$(LTCOMPILE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-+
--$(LIBNAME):  $(OBJECTS)
--	libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
-+$(LIBNAME):  $(OBJECTS:.o=.lo)
-+	$(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
- 
- install: $(LIBNAME)
--	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
--	libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
--	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
--	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
-+	install -d $(DESTDIR)$(LIBPATH)
-+	$(LT) --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
-+	install -d $(DESTDIR)$(INCPATH)
-+	install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH)
- 
- test: $(LIBNAME) demo/demo.o
--	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
--	libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c demo/demo.c -o demo/demo.o
-+	$(LT) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
- 	
- mtest: test	
--	cd mtest ; gcc $(CFLAGS) mtest.c -o mtest
-+	cd mtest ; $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) mtest.c -o mtest
-         
- timing: $(LIBNAME)
--	gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
-+	$(LT) --mode=link $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
diff --git a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
deleted file mode 100644
index a1596d889e30..000000000000
--- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="https://github.com/libtom/libtommath"
-SRC_URI="https://github.com/libtom/libtommath/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	# need libtool for cross compilation. Bug #376643
-	cat <<-EOF > configure.ac
-	AC_INIT(libtommath, 0)
-	AM_INIT_AUTOMAKE
-	LT_INIT
-	AC_CONFIG_FILES(Makefile)
-	AC_OUTPUT
-	EOF
-	touch NEWS README AUTHORS ChangeLog Makefile.am
-	eautoreconf
-	export LT="${S}"/libtool
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-_emake() {
-	emake CC="$(tc-getCC)" -f makefile.shared \
-		IGNORE_SPEED=1 \
-		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		INCPATH="${EPREFIX}/usr/include" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete
-
-	dodoc changes.txt
-
-	use doc && dodoc *.pdf
-
-	if use examples ; then
-		docinto demo
-		dodoc demo/*.c
-	fi
-}
diff --git a/dev-libs/libtommath/libtommath-1.0.1.ebuild b/dev-libs/libtommath/libtommath-1.0.1.ebuild
deleted file mode 100644
index 8f04224dc876..000000000000
--- a/dev-libs/libtommath/libtommath-1.0.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Optimized and portable routines for integer theoretic applications"
-HOMEPAGE="http://www.libtom.net/"
-SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples static-libs"
-
-DEPEND="sys-devel/libtool"
-
-src_prepare() {
-	default
-	# need libtool for cross compilation. Bug #376643
-	cat <<-EOF > configure.ac
-	AC_INIT(libtommath, 0)
-	AM_INIT_AUTOMAKE
-	LT_INIT
-	AC_CONFIG_FILES(Makefile)
-	AC_OUTPUT
-	EOF
-	touch NEWS README AUTHORS ChangeLog Makefile.am
-	eautoreconf
-	export LT="${S}"/libtool
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-_emake() {
-	emake \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		-f makefile.shared \
-		IGNORE_SPEED=1 \
-		LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		INCPATH="${EPREFIX}/usr/include" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test_standalone
-	./test || die
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	# We only link against -lc, so drop the .la file.
-	find "${ED}" -name '*.la' -delete
-
-	dodoc changes.txt
-
-	use doc && dodoc *.pdf
-
-	if use examples ; then
-		docinto demo
-		dodoc demo/*.c
-	fi
-}
diff --git a/dev-libs/libunique/Manifest b/dev-libs/libunique/Manifest
index 9144eb35e13e..4e4c9468192d 100644
--- a/dev-libs/libunique/Manifest
+++ b/dev-libs/libunique/Manifest
@@ -5,6 +5,6 @@ AUX libunique-1.1.6-include-terminator.patch 1150 BLAKE2B 19bb13cc29b4aadd12c52c
 AUX run-tests 500 BLAKE2B ff93701e0eb4c78416581d5758e83654d1c3ce197a1c6834ce1170f6da63bcdedf7502549ad0dadacda7e36cf62695acd897be60d6cb4320438a5496adb0081d SHA512 2ff3662e87cb00f33e68a342740c56ae8294e3cae069f1191156fb58077e7a7c1a1aad75018673b494b0be71f9c7cb15c9e2c5b826fd733a72baa761b4994547
 DIST libunique-1.1.6.tar.bz2 335534 BLAKE2B 79f04c514620c5247609660bf58fa207589e9d1a011837f31d782864bdb5f6dd2ee8a44dddbce746cdb5e62df28d1ab20ee0e069cf21ab3d36e8edb2db06a5fc SHA512 82893e1d51a553b3c1413498e48a3a132e2c05779b4442c3732b5429d698e133741615657432a3d05c82a05c79bb59acc13df500bb08010212155db5e4ee6bde
 DIST libunique-3.0.2.tar.xz 294712 BLAKE2B 6045abb17862188940c81389883eeea88b75166b0dc64aba93dbd59c94cc117dc4d410dcb855fd6f3bc7eaf6d918aafb1a0683ca03315f5df0f2f2cde3790aca SHA512 b053b9f265c751bd581d15bf73246fb087075eaf75760565671c09a4ab80db342b4d2185050a877c4e25276d24f7895f4325ca60b918a7c4acd9d1591e97a8b4
-EBUILD libunique-1.1.6-r2.ebuild 1562 BLAKE2B 61cbbafddd7ba0d2eecf06062162d00275a34451316ba29feb9123ff42352640c7361274cb8a9a9c0c8241afee75ba6f6ea82857ac62919f5a2a324fe494654c SHA512 bd9976f31cbfe67733ec0fa68e5d47a23b2f16707818b38956471407aa211dd50472c066bb2cdcf1365dc1335aa6d332d301ebad10e0ab772ceb023c0830d8b7
-EBUILD libunique-3.0.2-r1.ebuild 1121 BLAKE2B 285ae340dc04a072dcdba9381cf0d0f45e5a5535543ff15d8d0e75e041d4f99d9099ca91df01357b1164c6dbe7c379df737b393258df845a808f01670d9a1076 SHA512 8b6da2120fc6a42f33e4bc1406388cdcddfdc3d52db783a64f3f2e3735fb6b671a0b4361cf75275400d55dda7960aac21ae66d7992c72b70ba27b494d0c64bac
+EBUILD libunique-1.1.6-r2.ebuild 1563 BLAKE2B c9087e52806f0bcb513308e6998f59e625f30fedaa3d4daf5c792244939781d386b21d37f494b233c346cc97ef68d36e1bf77ba4959faec645638b5dd865e92f SHA512 4befd5c11eea5bc6908d651c1962d3bb17942645ff1dc10a9b3d4adaacb7f3ffdf893f649dd1c4487e00b78bc5686612d207287c57d672a64ea28243675659bb
+EBUILD libunique-3.0.2-r1.ebuild 1122 BLAKE2B abf5274137154c0a3d9bf7e9605c2a1040c968b8269d5dca8a25765ee9a344970219934b354bbd428e3b9282024ec63aa0a98f2206a276c46083be6ebd3d7a53 SHA512 aee268ab6a1fadbccabcc262ffa0aae9ae3042134e9b27b885668d2b9a4c873557fd5143c09ba7303cc7cf6be801b723a66f63445f9a9e7a08f277a885dbc4be
 MISC metadata.xml 500 BLAKE2B 3416f2d8574c38adee051c11070f680ec248b554f3945872561aec335a42b712634416b9d1087b7cb6ca8504ae1ecf246f0dc9f4e0ded538c24a1ff0b09bc9fa SHA512 bcdaa87134abaef8a3490e11fb9716a20594a0dc862f5b07b446c266f39d4954e0fe3f7f89d6412687bc7a126387d469454d7d1b7ba46684e8cf174a8f78c169
diff --git a/dev-libs/libunique/libunique-1.1.6-r2.ebuild b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
index ae2f2abfab91..57808ea31a87 100644
--- a/dev-libs/libunique/libunique-1.1.6-r2.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug dbus +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libunique/libunique-3.0.2-r1.ebuild b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
index 0538409e7f89..c20d503efe82 100644
--- a/dev-libs/libunique/libunique-3.0.2-r1.ebuild
+++ b/dev-libs/libunique/libunique-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Attic/LibUnique"
 
 LICENSE="LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug +introspection"
 
 RDEPEND="
diff --git a/dev-libs/libx86emu/Manifest b/dev-libs/libx86emu/Manifest
index 006724f9468c..e1b38c84dc8b 100644
--- a/dev-libs/libx86emu/Manifest
+++ b/dev-libs/libx86emu/Manifest
@@ -1,3 +1,5 @@
+AUX libx86emu-1.1-fix-makefile.patch 1885 BLAKE2B dd89e7cc3a9b0ce336607a62f3e83be02fab3db01755144a322ccab44cfe3a93ca69298290c0d377e3792f9ba63d2fd8054afbf641f3e2f26cbd40b791c8fb49 SHA512 c62ceb8eaec38cb401016ed72332cf54125faf10dcb123714afc700bfec304fe1cb3e96f798c28218475f50f3941ad33277b0dc4f5874a0a9be67005b4db14df
+AUX libx86emu-1.1-gcc10-fno-common.patch 339 BLAKE2B f74fac4b1e8ad0251a3e0dbd2be7e9301e914a0acfa341a044d88cc6d251d9da7b8fd0b9e44a49f44a0a2e895cbd84351e7dcfaa0c2efb50c4de910ab71d6332 SHA512 c8ccccc91780dd2d467588576947891b25b9e02ae23b20ce48de9246cd37c2ec6d2fc4b5472bdfd8f569f6f1efeb85a826a2b848b609f7fff980c0477c1b82a2
 DIST libx86emu-1.1-9.8.src.rpm 59517 BLAKE2B 6ae5b7792b9b67b93d12e9908e9941417e4149ed6289e0d02b23710ae4295d74aae806d85b0a0aa719eee6d63725b161dd8870d92b5352383a0beee5ce7827c9 SHA512 cb44306bb76feb47d46f1f3dd92cc6bf694dcc2c42d191fd9ff9f0b68744aeb25e99b29336e5ffe67e9a3d02c51d56690429b892d7fd26438dcc1d6603e18bcb
-EBUILD libx86emu-1.1.ebuild 886 BLAKE2B 56f0048eda88ca0438ecce4de862c92ed0443385eb9918edcd522e4b538b52e66aee51ec4a4c995476d1cac0f3cf4d0c2319788d87a57e6a0612c0e22d6fadac SHA512 d8923437491b4e5711029cf7b6dcfa732cfe280894337c05116400ba0b14a3cb8077858c49035487389ddac9d37c33430339dee8d4d7af070379ad6d96fae739
+EBUILD libx86emu-1.1.ebuild 623 BLAKE2B 00684cacf83c68f69685ee76d37f04f5fb627b42e8bdd9d09b22e7c65009d6a1cf0647e7b9d8d4c41735b3ea5a5edadf8affc1cccf5cbcd8812912ce9c70ac41 SHA512 7930ab8a012526a85ac04ecaa4d168a9ca907277eb51665cffd0de0ead1638c3dd2a08b895f2a8ed10a7cabaa9f70e816f6b840ce2d3388deb27bb8682e64c59
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch b/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch
new file mode 100644
index 000000000000..6e565340e67b
--- /dev/null
+++ b/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch
@@ -0,0 +1,82 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,15 +1,4 @@
+-ARCH	:= $(shell uname -m)
+-ifneq ($(filter i386 i486 i586 i686, $(ARCH)),)
+-ARCH	:= i386
+-endif
+-
+-CC	= gcc
+-CFLAGS	= -g -O2 -fPIC -fomit-frame-pointer -Wall
+-ifneq ($(filter x86_64, $(ARCH)),)
+-LIBDIR	= /usr/lib64
+-else
+-LIBDIR	= /usr/lib
+-endif
++CFLAGS	+= -fPIC -Wall
+ LIBX86	= libx86emu
+ 
+ VERSION		:= $(shell cat VERSION)
+@@ -24,9 +13,6 @@
+ 
+ .PHONY: all shared install test clean
+ 
+-%.o: %.c
+-	$(CC) -c $(CFLAGS) $<
+-
+ all: shared
+ 
+ shared: $(LIB_NAME)
+@@ -38,13 +24,15 @@
+ 	install -m 644 -D include/x86emu.h $(DESTDIR)/usr/include/x86emu.h
+ 
+ $(LIB_NAME): .depend $(OBJS)
+-	$(CC) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME)
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME)
++	ln -snf $(LIB_NAME) $(LIB_SONAME)
++	ln -snf $(LIB_SONAME) $(LIBX86).so
+ 
+-test:
+-	make -C test
++check:
++	$(MAKE) -C test
+ 
+ clean:
+-	make -C test clean
++	$(MAKE) -C test clean
+ 	rm -f *.o *~ include/*~ *.so.* .depend
+ 
+ ifneq "$(MAKECMDGOALS)" "clean"
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -1,9 +1,10 @@
+-CC         = gcc
+-CFLAGS     = -g -Wall -fomit-frame-pointer -O2
++CFLAGS	 += -fPIC -Wall
++CPPFLAGS += -I../include
+ TST_FILES  = $(wildcard *.tst)
+ INIT_FILES = $(addsuffix .init,$(basename $(wildcard *.tst)))
+ RES_FILES  = $(addsuffix .result,$(basename $(wildcard *.tst)))
+ TEST_OPTS  = --verbose --show code,regs,data,acc,io,ints,attr,time
++LDLIBS = -L.. -lx86emu
+ 
+ .PHONY: all test clean
+ .SECONDARY: $(INIT_FILES)
+@@ -12,13 +13,12 @@
+ 
+ all: x86test
+ 	@./prepare_test *.tst
+-	@./x86test $(TEST_OPTS) *.init
++	@LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) *.init
+ 
+-x86test: x86test.c
+-	$(CC) $(CFLAGS) $< -lx86emu -o $@
++x86test: x86test.o
+ 
+-%.result: %.init
+-	@./x86test $(TEST_OPTS) $<
++%.result: %.init x86test
++	@LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) $<
+ 
+ %.init: %.tst
+ 	@./prepare_test $<
diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch b/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch
new file mode 100644
index 000000000000..8d69e874523d
--- /dev/null
+++ b/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/include/ops.h
++++ b/include/ops.h
+@@ -39,8 +39,8 @@
+ #ifndef __X86EMU_OPS_H
+ #define __X86EMU_OPS_H
+ 
+-void (*x86emu_optab[0x100])(u8 op1) L_SYM;
+-void (*x86emu_optab2[0x100])(u8 op2) L_SYM;
++extern void (*x86emu_optab[0x100])(u8 op1) L_SYM;
++extern void (*x86emu_optab2[0x100])(u8 op2) L_SYM;
+ 
+ void decode_cond(int type) L_SYM;
+ 
diff --git a/dev-libs/libx86emu/libx86emu-1.1.ebuild b/dev-libs/libx86emu/libx86emu-1.1.ebuild
index b8392b9291f2..21c131149a92 100644
--- a/dev-libs/libx86emu/libx86emu-1.1.ebuild
+++ b/dev-libs/libx86emu/libx86emu-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit multilib rpm toolchain-funcs
+inherit rpm toolchain-funcs
 
 DESCRIPTION="A library for emulating x86"
 HOMEPAGE="https://www.opensuse.org/"
@@ -12,24 +12,14 @@ SRC_URI="https://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-9.8
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-src_prepare() {
-	sed -i \
-		-e 's:$(CC) -shared:& $(LDFLAGS):' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -fPIC -Wall"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-fix-makefile.patch
+	"${FILESDIR}"/${PN}-1.1-gcc10-fno-common.patch
+)
 
-src_test() {
-	ln -sf libx86emu.so.1.1 libx86emu.so || die
-	ln -sf libx86emu.so.1.1 libx86emu.so.1 || die
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${LDFLAGS} -Wl,-rpath,${S} -fPIC -Wall -I../include/ -L../" test
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 59fa3431987e..ca84397488b0 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,6 +1,6 @@
 AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc910522e38dd05546c995d90d5377cd0419666e4b724448cf6d38110faa640191d98b06bbe08610ae947340658f0a SHA512 e8af90b4559df0a6b2c8d0d1b7797833d0f59c4827082cd5dd8459d57ac1557249030510dcdad5f31a84a99cd79e30bb7b9293b1f19303be750faa40be2892cc
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
-DIST libzip-1.6.0.tar.xz 732812 BLAKE2B 9023994e3f0a6e893ab42e2f2951b4b32ee8c1f6ea265a9481e32293c0ea229e364f00d9340cdc22404aa7ab7a294ff297ea9e821c2d1ad8486eb8b5301b637b SHA512 a173bebc0a199d65d9e2d5e5adf65eb10e9d3a1c409006b3f78e3453aa6166d825fea20e818e725f5d3c6b63137023a2cccb7fb2a1da50a88c4f5f057cf879f8
+DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
 EBUILD libzip-1.5.2-r2.ebuild 2280 BLAKE2B f102a555784cab5a21fa0e49d5d2d965b1af8739551a02ce7a8c901ca6ad9dc5d40430fe263f561482d3f528d7ea94d52a3d23e3e346523b0842c20c38299b6d SHA512 f6d34b19bc4ae80a8b57dc7ee5f23f86b659dccfb8a1c0891fd8d94e88d99466759b2d62b416d79cca10fc572a478900d3ce98e185f95c20ba6c6e7d6bb5a817
-EBUILD libzip-1.6.0.ebuild 2269 BLAKE2B 69fea9eddb814fe679679ab4ca3aca249c61a883a72c9a61d5586d55ec4ad956271cc8cca3fb090c9c3f00833aa2029bdb20e68af6689f6f06789c2370dd133d SHA512 338e80c3e39f1cb15f93c770271d27eb5bb6aebe3a394cf9290097b68c10030b28d4a53431e5b144dac1683d5f40adf55e71a5d3cb1fc993b906101f924c3d03
+EBUILD libzip-1.6.1.ebuild 2274 BLAKE2B 16dfa0ed548741d805440cef657b7d07eaf8d0eb8f74796a7a83592214a9c3c1fe6e332a3fcae91da3f83bb432b8055e6ef1d6a9472752fc8390cdfe2beff0dd SHA512 2941d0fbb7cfc15493fdec538c846e696d1d55e92d6d24e2483dcda6adf86aff0b8d9d62c3e57e75fdef2064554ff8f279453aa2179809c27563d389d01ea6a6
 MISC metadata.xml 411 BLAKE2B 9b9ed5a214bd0ada5651c71831f103af8729535fb0ddc43cbab1ccb14cbfcd4103052b2549b739ded6caca6dc9f65bac346a00ed55806e37c77de367980b1bef SHA512 16b33f8e04a089007c9744141f12d04df43f1a733aed098fc6759d68616849b884180cdbafaf6694c8553de86dddb95864beeb76447f3dc241b83846ef651e3d
diff --git a/dev-libs/libzip/libzip-1.6.0.ebuild b/dev-libs/libzip/libzip-1.6.0.ebuild
deleted file mode 100644
index 71e055e5470a..000000000000
--- a/dev-libs/libzip/libzip-1.6.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multibuild
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2:= )
-	lzma? ( app-arch/lzma:= )
-	ssl? (
-		gnutls? (
-			dev-libs/nettle:0=
-			>=net-libs/gnutls-3.6.5:=
-		)
-		!gnutls? (
-			mbedtls? ( net-libs/mbedtls:= )
-			!mbedtls? (
-				!libressl? ( dev-libs/openssl:0= )
-				libressl? ( dev-libs/libressl:0= )
-			)
-		)
-	)
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Upstream doesn't support building dynamic & static
-	# simultaneously: https://github.com/nih-at/libzip/issues/76
-	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_EXAMPLES=OFF # nothing is installed
-			-DENABLE_COMMONCRYPTO=OFF # not in tree
-			-DENABLE_BZIP2=$(usex bzip2)
-			-DENABLE_LZMA=$(usex lzma)
-		)
-		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
-			mycmakeargs+=(
-				-DBUILD_DOC=OFF
-				-DBUILD_EXAMPLES=OFF
-				-DBUILD_SHARED_LIBS=OFF
-				-DBUILD_TOOLS=OFF
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_DOC=$(usex doc)
-				-DBUILD_REGRESS=$(usex test)
-			)
-		fi
-
-		if use ssl; then
-			if use gnutls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=$(usex gnutls)
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=OFF
-				)
-			elif use mbedtls; then
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=$(usex mbedtls)
-					-DENABLE_OPENSSL=OFF
-				)
-			else
-				mycmakeargs+=(
-					-DENABLE_GNUTLS=OFF
-					-DENABLE_MBEDTLS=OFF
-					-DENABLE_OPENSSL=ON
-				)
-			fi
-		else
-			mycmakeargs+=(
-				-DENABLE_GNUTLS=OFF
-				-DENABLE_MBEDTLS=OFF
-				-DENABLE_OPENSSL=OFF
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake_src_compile
-}
-
-src_test() {
-	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake_src_install
-}
diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild
new file mode 100644
index 000000000000..0e5d64337ebf
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.6.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multibuild
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2:= )
+	lzma? ( app-arch/lzma:= )
+	ssl? (
+		gnutls? (
+			dev-libs/nettle:0=
+			>=net-libs/gnutls-3.6.5:=
+		)
+		!gnutls? (
+			mbedtls? ( net-libs/mbedtls:= )
+			!mbedtls? (
+				!libressl? ( dev-libs/openssl:0= )
+				libressl? ( dev-libs/libressl:0= )
+			)
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	# Upstream doesn't support building dynamic & static
+	# simultaneously: https://github.com/nih-at/libzip/issues/76
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DBUILD_EXAMPLES=OFF # nothing is installed
+			-DENABLE_COMMONCRYPTO=OFF # not in tree
+			-DENABLE_BZIP2=$(usex bzip2)
+			-DENABLE_LZMA=$(usex lzma)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=(
+				-DBUILD_DOC=OFF
+				-DBUILD_EXAMPLES=OFF
+				-DBUILD_SHARED_LIBS=OFF
+				-DBUILD_TOOLS=OFF
+			)
+		else
+			mycmakeargs+=(
+				-DBUILD_DOC=$(usex doc)
+				-DBUILD_REGRESS=$(usex test)
+			)
+		fi
+
+		if use ssl; then
+			if use gnutls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=$(usex gnutls)
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=OFF
+				)
+			elif use mbedtls; then
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=$(usex mbedtls)
+					-DENABLE_OPENSSL=OFF
+				)
+			else
+				mycmakeargs+=(
+					-DENABLE_GNUTLS=OFF
+					-DENABLE_MBEDTLS=OFF
+					-DENABLE_OPENSSL=ON
+				)
+			fi
+		else
+			mycmakeargs+=(
+				-DENABLE_GNUTLS=OFF
+				-DENABLE_MBEDTLS=OFF
+				-DENABLE_OPENSSL=OFF
+			)
+		fi
+		cmake_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant cmake_src_install
+}
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index f0804870a160..3c2e91bafaf2 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,5 +1,5 @@
 AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
-EBUILD marisa-0.2.5.ebuild 2229 BLAKE2B 892624c70436db9f826a843def566b081a5062ceee70f59d59fd5f2c63944c1fe05d8cef3c0da48cbd259f6c42e07815042d06eace22cd81820a8ec192887db6 SHA512 07e5e79b72d0d8b0a6b77c39741fcfb58dc9b03b5bf6493005a060ff0e28e26f4ecfdf3e490fdfd0d67dbed90fa86d5afdf4f70bafb3bf13970b19221875c337
+EBUILD marisa-0.2.5.ebuild 2228 BLAKE2B 9016cc0ae3419ac26b864ad5dd07edfc0d13a2bbb34ba1c6c76b6ba1c40a4616a6c4f417252390c515253f62059677223f26187be02a0f12b9e429b5133ba20a SHA512 8db639b8a07201e062395540eb84dd108865a4ee18e090b06dea15ab93468758a3aa354f20d3b14800393ef7542e55babcfff18079e97c02092ae0b58f4ba548
 EBUILD marisa-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285
 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 3379c58070f1..4289f375ea65 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -23,7 +23,7 @@ fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 87457b4c532c..783aa6d48165 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -7,6 +7,7 @@ DIST nss-3.48.tar.gz 76481237 BLAKE2B aded12d9f917d87e6fe32bc6c57b19e478507919c7
 DIST nss-3.49.1.tar.gz 76489134 BLAKE2B 4b1ceb6e1a366f506d13ceaa88663fba400318bff872305993369c2caa1e1aef654fa02308957bc2a2774b7e0b4bafd097ad16831d38d7da53753991419839b7 SHA512 e463c9d71537ac30dbd2998cbdbc0cadc734768a6f3a316c57b6a6d01ad6d26ca732dff65e9c88555a834ae7d71fc857e4cbc1799438069f544a1e27f75985e8
 DIST nss-3.49.2.tar.gz 76489641 BLAKE2B 844a88984fde45142093ee6df2934d89cb4911d3e716019c0d1620254064af51b56249bc4348816e546c5dcab66d7fc9d4def32021661f4f3d868e09c342abec SHA512 fe0fe032db15853384a50b145dd6f3187a855109f0b81f1846312d33f8c628aededcbca4d199f974ae52530aec3f2312f80afbca3e5b97ed1ff96fcffafd2881
 DIST nss-3.49.tar.gz 76488781 BLAKE2B 12ce6477b95bc0b0623cfe297c771832818798e39d1ab5cbc7f30e21336644498f5201abeb2ea1cbfd7cf75d64e4423152b9fe4e5c6b1761c5c049ec3da0e9fc SHA512 7d8df73a2e585585a7cb3f887af3f933854984479531b3dd30316873bdd92c130e2fadb54e7b3b1f0b10675b1bce09112ef39860d74ef6f0df7b57bf430bd072
+DIST nss-3.50.tar.gz 78041630 BLAKE2B 4d21a1cac475936e153b22829f8b4b2f6f6a57c41e14d091b287aba633a8d4c80c045882ce6f1cb7a2f9ce760d616b13389f90e59f60250c41080ed1f5a4900a SHA512 d6bcaf8ad65b5a97c42cd6cbbc68add5c4b49db74b2debcedb2a007f72511ac0e9bd21fd2dec041bc1975cfc8af26a48450aa0d1b962f755931ab2ac45c795b1
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
 EBUILD nss-3.47.1-r1.ebuild 9422 BLAKE2B 890a152a86404e751dd3f7655d980f5071ba98b2afe7491dda5ca353f32311cdaf830f8d7762df5054cdfde4e61cd2881142e1c52cd0c74e0cae53ab5d45c664 SHA512 eca35b5d30baa1ad7694ce7d1a57f9befe3e5e0ef4c72b43af49a2d7ad843d12f2d17395e02eeeff9254859a4867d7968bb1954474a62d37e71263420691d494
@@ -14,4 +15,5 @@ EBUILD nss-3.48-r1.ebuild 9432 BLAKE2B 1fce14bbf780d6c44a7cb2a0b6e9a144096a76f41
 EBUILD nss-3.49.1.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
 EBUILD nss-3.49.2.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
 EBUILD nss-3.49.ebuild 9432 BLAKE2B e6959a9647c675b695b8266af822821ff79e37f5fc9a6881cf00ed6b0d1298a8a13c12f5cacc12507a6012d9dcea71cf846c2640bcb136326551379af3475314 SHA512 e7d6dd9c4924e12119f9097fa87f8488aeea25fb4060a87530452a8079efd93d6460534f224d3eb86515f425231ad046edec98612265115a32e0cd26e3855bc6
+EBUILD nss-3.50.ebuild 9432 BLAKE2B 32161e5154134ef351722519915e76cd0bab88f028a9ee929d8f9c0c760732149ead0d0858b33864ee33ff89c7972d68f7aa67b0d2eba4f80b1b918db663c26d SHA512 283de19e80817b39ea66bfd2b66fb2e83b1f428aa9b44e8a421570dcbdfc2847d29a5ad1458584e076fc1051ceac83a76f38e8473cc0a41ee633143e1b1ef152
 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0
diff --git a/dev-libs/nss/nss-3.50.ebuild b/dev-libs/nss/nss-3.50.ebuild
new file mode 100644
index 000000000000..c3b9fde93445
--- /dev/null
+++ b/dev-libs/nss/nss-3.50.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.25"
+RTM_NAME="NSS_${PV//./_}_RTM"
+# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
+PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
+PEM_P="${PN}-pem-20160329"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
+	nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cacert +nss-pem utils"
+BDEPEND="
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.47-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	if use nss-pem ; then
+		mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
+	fi
+}
+
+src_prepare() {
+	if use nss-pem ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.47-enable-pem.patch"
+		)
+	fi
+	if use cacert ; then #521462
+		PATCHES+=(
+			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
+		)
+	fi
+
+	default
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		aarch64*)echo "aarch64";;
+		hppa*)   echo "parisc";;
+		i?86*)   echo "i686";;
+		x86_64*) echo "x86_64";;
+		*)       tc-arch ${t};;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	# Do not let `uname` be used.
+	if use kernel_linux ; then
+		makeargs+=(
+			OS_TARGET=Linux
+			OS_RELEASE=2.6
+			OS_TEST="$(nssarch)"
+		)
+	fi
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export ASFLAGS=""
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits:-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d}
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index 75578f5acd6c..4e0885327799 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -4,6 +4,8 @@ AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd
 AUX pigpiod.systemd 121 BLAKE2B acb298046861f0dc0ee65505e2fa4c62cdfee3e628044d07881891f630e70507d27f253e1735457d56b6f7d9e8602c5a1597765c808f8cacaff96ce0efb52df9 SHA512 bb67874841fc629f5987dc41115ac6cfdd477264d5022bac06bcb3762394818a27f4f6357d537408c2cbcb81959e60ab894fd7e5c45f9a138a45f6da7208ef61
 DIST pigpio-72.tar.gz 384220 BLAKE2B ff3466df80adb6ee9bb2f6bc8aa9589bb6789746eedfab410d2a23dcd4986c29297f71469c8330c55603d8aabba7a4b2171390a63c21a12464b45cc4e24645d8 SHA512 c090962cb11204774e4a97a3dec37146882d66abef4d3e4de62e116b64650d6c66f95646f6350e3a45d8b2ba261a8d16c74f7648869cd0e94f42a80d88bb6d6e
 DIST pigpio-73.tar.gz 385233 BLAKE2B 5b58b399ffccab456d64decea4190e326c70cfe36b5513d0c69aa68c5ebfe2667ec5b4a028d19ec987d948c7b94dd23d67903bbae901d61f751dd606540324ea SHA512 bc6d2bbc2f2067c851a74a6137913b9abf2a7424bc2f78cf4086a1210f5c1116f71dcfa94a1268c137f4181e2db39af0bd2025caa1a7f98374b2043a166af746
+DIST pigpio-74.tar.gz 385851 BLAKE2B 7487808407972815a5c2123c8cf97f12aa241f4f7c8bc1610d8a31e11d5946aba52a9c452c6c552c27599a4f9f57ec1e03a17a6a5a4157bec7d3d302e9abf680 SHA512 8bd2c3a1c9b8e3287120f6c45d281e2e93020fe50080b3ba8d454a255a5b378b4d08f372bcc3ce407bf0579103916ff20b7741e1ed6c05e09b08a948827a7a60
 EBUILD pigpio-72.ebuild 1097 BLAKE2B 5c6270ccecbe72419ea7a457f01a2cff597eca6e5e49955b1edd69eb0a2381a35c4b861c8e83c978d1dcc6bba8e014d77ef392424a5cf90f05a74b1e7d0bfcca SHA512 9fccd5891ad79f89fb8f25267e9c43439adf67f7343ffbd0aa799c85efc89fbb3cda639bf1e5fbe9f616e72a668f68e478efd8c9af6e254af14ab86a6ab41583
 EBUILD pigpio-73.ebuild 1093 BLAKE2B 37fa60cb0c9194f07feafaa953d3d21629ed48c91fe5fce67e447f5ee6e12eef3c7d1d9ecefb648aece77081ed40a567c542eef584abc2872c350811a4143d72 SHA512 4ecf45c2d6a9f798b23ea7c24cd07e011028b1c3c090e49bd0ab0fe82257423ba478492d458c580e8571e3d01fa379979e5d5fee40b3ab87d43e7dca75ca10ed
+EBUILD pigpio-74.ebuild 1099 BLAKE2B e16aa6e02499ac1cb9207f4dd0bdf42fa58af0a60f8c03ef38dece5dc4bdf84317afb8468c4b524d55ebbc6089d2362b3ee79b9584804a900b9476c19c0efefb SHA512 828bb572843c59322a062cb4c1e470b4ba6b89c4cc6a449438a582cd645fea66448ab1d554c1c36197914eb238d3823fe03574dfa832e06732de5ab09c49fd9e
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/dev-libs/pigpio/pigpio-74.ebuild b/dev-libs/pigpio/pigpio-74.ebuild
new file mode 100644
index 000000000000..738bf586aaa1
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-74.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html https://github.com/joan2937/pigpio"
+SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+		libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man" install
+	einstalldocs
+	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+	systemd_newunit "${S}"/util/pigpiod.service pigpiod.service
+	use python && distutils-r1_src_install
+}
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 016a3a1ddc81..2015846b7878 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -3,5 +3,5 @@ AUX protobuf-c-1.3.1-protobuf-3.7.patch 562 BLAKE2B 4319e91d94a0f3f47bba3dfca74e
 DIST protobuf-c-1.3.1.tar.gz 498779 BLAKE2B f9ecb2cccd8e01a2ab5bd797883f245db418a76ac73ba3e756e997e944637732d45b3fca2a45d3caf4cd89f35259180fa05e64b8b02b63537005420f2233ba37 SHA512 b32920130b4be5e8a8373c2ca37ffe7eb263accf163d93e25a9eb4b6336ec40b05dda2458fe8f0c3cbcf6e0e08e9541fdff004d696f30a5d135b7a3bdca8b2c3
 DIST protobuf-c-1.3.2.tar.gz 500100 BLAKE2B b8bcd4ad6f9ddc05f28526f7cc58778b21a34fc18c7c7aa2a5bb45ae7fdc7c5d8957f989fe1bbfe353214ca87b02afed8cf0ad43c0f0e39f7e13059a5dfd6b7d SHA512 d94d2c6f11b3e482fd3d1b8cef5b2d896ad37a679068f393d29916311deadc5b6b86f946b046d7ee49260b0223e3128e052dc76324b4a8cd6ea184d566ad9aa6
 EBUILD protobuf-c-1.3.1.ebuild 1045 BLAKE2B 9ad619c70aade683ec26c85427302087f8c607a601dc9a98691936e3b7c59f6249c69b67b2f4cdf1b03a17cc7f0f6ce5b7040f1d89aff893d571f5efe3a005bc SHA512 ad8bf49f7dd92516c97665ba60b95341bc9f03760f8f4fbf15427feac9f0f2f71aced5a776ed314e6c4fa5fb035afac76be7b0e9882d201bf6c93299ffc959bb
-EBUILD protobuf-c-1.3.2.ebuild 989 BLAKE2B 9a1ac99450d314014beb8d416535ee4c7c05e10b590a24b01d22e70172ed0ce23f2516b32f7c964e2f956ca09775640e3ab0755120f5f02a2d588bd99b130dc6 SHA512 68a35e10250bd76ac1525d8c0f8b06aa9b13a4f18987f5063151fcdedb26edd1c3183bf6d1b00bd527334b793ae253dddd3c391c8c9fa5d430c47fb109823fd2
+EBUILD protobuf-c-1.3.2.ebuild 988 BLAKE2B 1b14a19bf7256b370c2b8c0934f2ff590be13684d284f21221d0559253b15fbdb71764b5776a290004c358d63895b61f82816703b15de285e04c1916b6845b68 SHA512 3e36427bdb7cb5acbf8f61c817053cdad85c97b2ff076fd62f23fe8188f6049b86e8390e6080839e256c95ee082ff97309fb9f56878288073c5405bec840b1d1
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
index 41fe7fd76f2a..baa5c3a190dc 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 4a50bbfe326b..e2671ea8db07 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -14,5 +14,5 @@ EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff81593
 EBUILD re2-0.2018.10.01.ebuild 1345 BLAKE2B efa3dbca54f7d8916ef63e41091daecd85d829a0641877fb82e0ad9251d179a247c5fc69127945a7aad4537d83da7cb93abc1576e223f1bb83527187cffa2795 SHA512 d3c6e9cff14639ab4e8ac01e90e896cdc671898f718444009e32750fb392b35836e87e3a2394b55313d58b652cd6b1822a49211dd3159f7fc867c3dcce6815a1
 EBUILD re2-0.2019.08.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
 EBUILD re2-0.2019.09.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
-EBUILD re2-0.2019.12.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
+EBUILD re2-0.2019.12.01.ebuild 1346 BLAKE2B 4f33270da11833d2a60e0bc24989ee71c1778b32944967364fac738dbb4008b5d13c1db01225d048f057a4ab6be99cdfd1a8cfc59abc7ad758ec5c784562a77d SHA512 0c250c68ea4381bd6f82a562c694aa23c91665a3e161419ce313fa220f294e4df71d974a289f1e6120826bb6c8cf266f19095d9cd59e21b17bf9c2b1ef1a1999
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/re2-0.2019.12.01.ebuild b/dev-libs/re2/re2-0.2019.12.01.ebuild
index 697b91bfc42a..e160a28429ed 100644
--- a/dev-libs/re2/re2-0.2019.12.01.ebuild
+++ b/dev-libs/re2/re2-0.2019.12.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="gentoo-2019-01-01"
 SLOT="0/${SONAME}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 53ff88f5f11f..f9a0cff9096d 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,5 +1,5 @@
 DIST serd-0.28.0.tar.bz2 371592 BLAKE2B 143e858b5947cd52d01341ec7ff5fb36f98aefceda4e748b2a999c2e6d2c972b2f5d30053d8538f04f236597da93a595d0fabbfa4c667397e27d4c897458d1ee SHA512 b25cc70af17ff821812ab2a70c2812c1713ff811a0f18fb5d5c54f3b67e0c68293aabedfacd687afe6b7acdfd81602ef81764d7e11bc0d933de738bc6d4fce3e
 DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
-EBUILD serd-0.28.0-r1.ebuild 1147 BLAKE2B 8482d16dc393f5b38e612622d0e77c3d27597d19d4c0a28625a4af23a99d0ed754f7b1de2438733ad2f97662104c3f611faca35e14dff1e5a00d2d188ec1185c SHA512 9f442c744d41f252ed67c8d606d13774ecad6f6492ed0ff0b6ea21cf01e91aacdafd71b8fdcb8ffd70be99ab6fbb759db2b11867b20d710bbde449ed83bcf08f
+EBUILD serd-0.28.0-r1.ebuild 1141 BLAKE2B d01a86c5664a3c9a4387effa85ac48be466b50a3598118d04504f0a0c09c3cab4d8db444b3c56244e0f6d22b61594631de4fabef45d8c70bb16ab7dbb870de64 SHA512 5c6a6d56ca08e5739584df2a6e9d923c90ac80f16bbb93deaf9890fa8e0bdaea794307e41f06faa39ba9cbf1fb726086553d7875ec25ad2c5e1422902283bb1e
 EBUILD serd-0.30.2.ebuild 1149 BLAKE2B 083af72a17803897ab655fc4b42d6601ccde1d3383c1540d0dbe30dbb1898f7090c34f34684ea0bea5d06771dda1394a0b054e19390f7b5c8b72df6363082cb2 SHA512 d3bec2207e55c829e0172c7dfd9143e9b789986f88ab94ac23623f3727183c36eb5d73b878ece936af4af66628c404b6f92a568a20f4397d0441de7b4939ada8
 MISC metadata.xml 658 BLAKE2B 5495f0e6022b9cb312b6079c970bbfe0caa8cd865c5109a8dfba32b6937a1e19c928a3c424fd257140e38d19717e686b59d649f07354b7d8e88d3d431472803c SHA512 e0718eccdfc18ca985b902aa0592c733205a74f5c0c0d8d295a12343d0ef61b96cda9955b2a45832273becae62d74b251ce59b8123aa95f6196b1e75897395c1
diff --git a/dev-libs/serd/serd-0.28.0-r1.ebuild b/dev-libs/serd/serd-0.28.0-r1.ebuild
index 2674299b05c9..6c70a4cc334d 100644
--- a/dev-libs/serd/serd-0.28.0-r1.ebuild
+++ b/dev-libs/serd/serd-0.28.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 2add49422dcd..18787775c941 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,5 @@
 DIST sord-0.16.0.tar.bz2 316331 BLAKE2B 27702600e48e14c75be18cc2b83705cdea1eed7158223ee685821ae80b18b61f5db82f804ee6a32236143cf8287ee875c3b3354edc6ccd1d4f25eaa3a04c785b SHA512 e18c6de62f2cbffedd4c200f6452f4fd37f719aed764ccc1b77c8da04a0f3394d47e8b57e19eefd6d600770926f505fdfa5da91564bbff5f4ead49f1adaba249
 DIST sord-0.16.4.tar.bz2 510920 BLAKE2B e52b659e8070dc63188225741d1bfa31480214e47b53b4834dd0bccc5dcd688b93fc65c894b25540d89dbb20b04d8fd1952dcc65999c2ae7b650065c80b387dc SHA512 98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576
-EBUILD sord-0.16.0-r1.ebuild 1149 BLAKE2B a441f86affefe2eb7402f28e8f63b4c01f2f002db6fcc81aaea7bf0e4dc89ab868d2829107f063dcd0ca846694f9e27891687f023e39e50b799aad2d5dab2a7b SHA512 1c2a3988d047b2e2e8ffab2b7fa5cf28a55963c16a74dbd222b178dc178a9a9e99132409221143b17aa5e29e6ea143a8c2fc3e7f8b815f5eeff9ca6bc1a94812
+EBUILD sord-0.16.0-r1.ebuild 1143 BLAKE2B 320eaaa4874a0308b9190a7402dd86d0429f11a72517a64e9a0d6fd138474047e1ac36f90d9c9d0034c34782a57d0f75adff8eff22fa8a5dc8e0cacd0f95a52b SHA512 e16fc70f671e9fe4bc0cb72e499916210b504cfb513afd2c76efa36ad3f5f3e596e7580a57460159f8a2bd09fc8e966bf78920aa7239fc6f38e2b68634ec4269
 EBUILD sord-0.16.4.ebuild 1172 BLAKE2B 4e93146d8552fa99ce7b6d2e388987175851ae16ac33cb555ccaa3b98c28e4fa1c31573e26c39c16fd75e93b8bb4e6f99c638fca52389e97922f3b22c804d5bb SHA512 fbf328befc121bba84c79b24fbe7f83bcb38608e190cca0150bbf8978578309c6f32e33869a792887c3cf55fd812216465031cc8766e4dd4f78c44629a25c6ac
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.0-r1.ebuild b/dev-libs/sord/sord-0.16.0-r1.ebuild
index 09d51dc13f1c..b66124773d89 100644
--- a/dev-libs/sord/sord-0.16.0-r1.ebuild
+++ b/dev-libs/sord/sord-0.16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/dev-libs/utfcpp/Manifest b/dev-libs/utfcpp/Manifest
index 948ce32cb82d..01434fe100d6 100644
--- a/dev-libs/utfcpp/Manifest
+++ b/dev-libs/utfcpp/Manifest
@@ -1,4 +1,4 @@
 DIST utfcpp-3.1.tar.gz 25871 BLAKE2B 6bafb933b777e842375b3dc6b1b5bc41efb0e9f40bbd33ccbbaf07b57a28c4e485d596725297fc2de83c23fa3c66872519883727714d236f4a37e07ed4825fc9 SHA512 826ac7aa61215ac2144fa3f5edc7f291c3dd25dc69b0c82526840f4651f822515ec262915e1117d975e5c5dd729f6166806a5d397262f59a2b323eb7009671f5
-EBUILD utfcpp-3.1.ebuild 948 BLAKE2B 387a70b0dbdf706c8b41620ff54938d2b0f21ed45061173e29910ec352207d0b5c933ed99048a3fa04fff13fd615ef6abfdeaac104ec9596230d18b18a7650ba SHA512 a97cbda1e503c591504368101a3b150aed6d5b215fb2f115d45ba781c2fea849672876bf9369ba5d9c8ccad52f58d0283a870ae6e0df43ec1e2d7be8b87359ad
+EBUILD utfcpp-3.1.ebuild 947 BLAKE2B bbb927d26dc9cd404a3aaa41e3b6619f57b579b8845d7ddd75459d23596e5f4dc44634b7c0eef809aa2d38b9c62e5730ca04b4ddd7825f9fe32453836147139d SHA512 5f51e3bd6cebb0cf9846a59fe2ac348dd3f37815efb1901d3b2370685b7502b74f48ba1cfba3fd8472e51fba3fc1a0a1733cac038504c7c9daf1058d7e6a7203
 EBUILD utfcpp-9999.ebuild 916 BLAKE2B 8a7a1e05ae84fbb8d875e0b7fb0558cfc0c9835090b0253343648d6d9c1833724f99de9b64702d1976a89f93bfdb38f36cf7c41979e73cae9a39bdf66338f5d0 SHA512 e7d512b80328c68fd6037d08796ea88ffabaf903d18e33ebed26253f03c5cdd02c050450a38980e23d83356c3bb30f90ecdba1c8125fb86f877c846c4bb33b01
 MISC metadata.xml 494 BLAKE2B 9e52a09505cc2bdae2fd434169a21ca63d48d62dd917bf2fcf15a54378b1894191cacc0c676705c731cbc05720723604b18c1bc982da036168d6b9bc184d1b71 SHA512 af81373c64b07a3650d3a613d0b260a55740ce140546db9f7b839c5b5b7f7b02abd85307e033a980da8a1182fcbc5182c0415a3bb8a89d3fdfaaee8eeb648612
diff --git a/dev-libs/utfcpp/utfcpp-3.1.ebuild b/dev-libs/utfcpp/utfcpp-3.1.ebuild
index ef987e96e653..5afa6b050632 100644
--- a/dev-libs/utfcpp/utfcpp-3.1.ebuild
+++ b/dev-libs/utfcpp/utfcpp-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2015-2019 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,7 +22,7 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 5c2a1e62ea51..d6256059a01f 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1,9 +1,8 @@
 AUX zziplib-0.13.69-SDL-test.patch 453 BLAKE2B 645e55b034ec72abbab26fad4062cf9f7137aeeac2cc33aad89d9b86f4b616b5bdd256d383bfaa3252459caa2150f1b6426d3ca31ce8c055d0cae92d81547cd1 SHA512 2a524efc04721459cfb744ce7d0e3b6a4412e791250442632093116e181642184ba3cfa4a93fff8bdb792a03c293ab317696a78aed422ec75c26448552bc5721
-AUX zziplib-0.13.69-disable-docs.patch 1700 BLAKE2B f0e4ef353a9c0d86d8eb345bf03bd1f1008e81a019cc60ab480e66327fe0db06b6efb35c5ac556c1539426b56a88a9bc4ff8974f9600414d5d1fa7a4cdc577d6 SHA512 3c0b95209e215d955b1710d08dc4976caaedb512aec926b376adb7393c1cff4c269ee5741feddd8a1c4ca5e5ebfa987d40ffe5d966d799e659bc5606acd2b6dd
 DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc1614222cb9607e832618e7534cb55a022f2ba3d2c6f8c6337f4bf9e80a350e43eb05a4c1708b63efa5e0ed10297a5f19ec7adb SHA512 211a83594d4043a29472f9c556d72ad486e40f28d55426b970b8b0617aca76f9dcbd4a3ca5991df943dfac1a1cab623b19aa04fb6ef7807a7740730e01926205
 DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e
 DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
-EBUILD zziplib-0.13.69-r1.ebuild 2365 BLAKE2B 391f285ed2defd290ef3bb2a399d0ecadf353c4fc95e6eb9087c6c802b5b75a5cac17d588e2dc5f5734423019b4f51e78656534527e89a9e9394b0ed762f513b SHA512 b9d8552ff972a391050f2c6ec02be81010c2fa3773eaf255756af742344d7afc77a08c1cbd653b89f3e04c1ac63c063559e6b10fdce9196e70735dab89890f61
+EBUILD zziplib-0.13.69-r1.ebuild 2364 BLAKE2B 5735aa94ff5fd4c6d20ce8340a94f80351662d74a29456738193b719880eb0ae2a8f829eaa8ebcd37867fb6af1cb9fbd0a98f6a3278b80ff8f703a0e0be5d210 SHA512 860c611315be3fe8fb8e5d07c3e76889e45afa390b39fb16110d731ca695506ecea9d648f704c1a0eb88853425ee393cb08a2432d05d955b53cf0a6d73ceb7b1
 EBUILD zziplib-0.13.69.ebuild 2321 BLAKE2B 70b2339cb6a663bab224a73258c433fb2bff1f20d2bb380a5f34ca54d40b43bcaf1d479bb61cfd5f02527c332cebda6ccc1bd87a68aecc0d6fbb6d250879fbe3 SHA512 5fdecae3196a733820c06bf9107edf51825d0401e7b95521793d0000d50a3f3b099e56cd611b7f9ddb5d252b7c5a1c184a50b0443f069c85410c032a048426cd
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch b/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
deleted file mode 100644
index 8b492d10f56e..000000000000
--- a/dev-libs/zziplib/files/zziplib-0.13.69-disable-docs.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From b34cf087aaa0b02c4a9c9ab6959a3567ad31acea Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 17 Jan 2020 02:01:01 +0100
-Subject: [PATCH] Disable building docs (requires python2)
-
----
- Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index c54b2cc..560c9e6 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,8 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
- WANT_AUTOMAKE = 1.7
- WANT_AUTOCONF = 2.57
- 
--DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
--SUBDIRS =      zzip zzipwrap bins test docs @SDL@
-+DIST_SUBDIRS = zzip zzipwrap bins test  SDL
-+SUBDIRS =      zzip zzipwrap bins test @SDL@
- 
- rpm: dist-bzip2 $(PACKAGE).spec
- 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.bz2
-@@ -62,9 +62,9 @@ osc-distclean:
- indent-check:
- 	(cd zzip && $(MAKE) `basename $@`)
- 
--doc docs docu clean-doc clean-docs clean-docu   zzip.html zzip.xml zzip.pdf \
-+doc docu clean-doc clean-clean-docu   zzip.html zzip.xml zzip.pdf \
- man mans manpages htmpages unpack clean-unpack  changes.htm pdfs \
--omf install-omf install-doc install-docs install-man3 install-mans \
-+omf install-omf install-doc install-install-man3 install-mans \
- upload-sourceforge www:
- 	(cd docs && $(MAKE) `basename $@`)
- 
-@@ -104,7 +104,7 @@ msvc6/zziptest.dsp     msvc6/zzip.dsp
- EXTRA_DIST =   zziplib.spec zzipback.sed Makefile.mk \
-                $(MSVC8) $(MSVC7) $(MSVC6) $(am__aclocal_m4_deps)
- 
--PHONY = auto boottrap rpm doc docs man manpages htmpages sdl testsdl \
-+PHONY = auto boottrap rpm doc man manpages htmpages sdl testsdl \
- 	comp compats msvc6 msvc7
- # ------------------------------------------------------------------------
- 
--- 
-2.25.0
-
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
index 9ea820e6eed9..9adb168f5ea5 100644
--- a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index d8ff1d035179..ebf4bb51671e 100644
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index cd41b1170dfa..043b10ae3fc6 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -3,7 +3,7 @@ AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fed
 DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776
 DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
 DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
-EBUILD camlp4-4.04_p1.ebuild 1000 BLAKE2B 8bb79168e90765e864d1d61706edf0193eb4ea26c17fc382376f3e70810a0ac88711a763f912dcf62c884dc85d4e0b6017fddeee3b9ce5a675b20ff78bea3e07 SHA512 be8dd7edf71cd3cd584a27055272bd3a8d7e34173061c6d3ee40712be810c8aa2fd49c1e04519358d6926f02c3a2f38986a6df86b812fedddae29eff4863b069
-EBUILD camlp4-4.05_p1.ebuild 1008 BLAKE2B 530cdc2283fdce7c532e5fc3a9580ab3e30087cfc32d7cf93b8712dc5589fa3ff7c6c3f68544298b1f51ccab5967470212eb1b0ea406d0f3c3730b9bc011a5fa SHA512 da1caacafe852a6fd93a0c351acb961e525af1f02b77e16b6ff66ffe5dc6310116d8251eb358d7a08ed22eab7c1826eee10a78e853cea34b3d341e06cbf78ce6
+EBUILD camlp4-4.04_p1.ebuild 992 BLAKE2B a7566cfe06d27538c32404860930e75fe100ac056d9e23bea97b823a2920fbe62cbc3bc9d5921ddfcbc2c049a6fc925b88334975a2148cc923c94b6a4e2ce2bd SHA512 bf281703d13af3bb9e2bfc526921c43999f1908631f6933d5469604ba9e10f56330baf840ba2d43fc60105db3815f9e81dac4a1994990afcbe9f9dd01b1a3991
+EBUILD camlp4-4.05_p1.ebuild 1000 BLAKE2B e126792fbc0ef5143229a32a18abf2f466b0798dad8512b22e3b7e574db59954e298395381015fa1db719d88bae2baa4c58976584f1c01ff28ee2936f726635f SHA512 3f4fea0691f5a9ec920cb2ba98d9533705c8166dfa3b08a45698b6712198db20d84c5e0a5fb9a13d98baedef4cb0f0c78fff546c6fba734f351bed16f8c8db26
 EBUILD camlp4-4.08_p1.ebuild 1067 BLAKE2B 56e9c5db487fd3f5b8595ad47bcf5430858598aa63b4941ca51483a338070cf23cb730791cab2a5c314276635fe7b0e9509c90634945d9643742f4bd6550d8b4 SHA512 39b6c74489265a611e8a4ca743b6e4405c10bde4480e0c34ad1129a85010778260a5f9a688c41b5faf603c69a032469d20d6bffe7e2e978b4008025e64a98429
 MISC metadata.xml 249 BLAKE2B 45b57687d81fa0ecbd307726eb7c570094d29952c8467b0ffe429870019fd852caa725924d6f2ee457b04a194d61c902f6abf948776fbb812a786e1058a031a2 SHA512 46286ee2dd275a5b7c8f941214c71f89396fd0d012564a368a205381ae2ffd28857245ffcae06b2416d73d071857005f3c7756fbcf546ebe0fadfc90a85db1e6
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index 20df6f9f34f5..c19c5780ccad 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.04_beta:=[ocamlopt?]"
+DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-lang/ocaml-4.02
 	!<dev-ml/findlib-1.5.5-r1"
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
index 80a764a62593..fe6e0dc150a5 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]"
+DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-lang/ocaml-4.02
 	!<dev-ml/findlib-1.5.5-r1"
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index d7b86b274965..75dcd1060d4c 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -3,9 +3,11 @@ DIST camlp5-7.00.tar.gz 755750 BLAKE2B b047422ff34c4d15c21b65bd7473ccdad8bfc1f48
 DIST camlp5-7.01.tar.gz 757118 BLAKE2B 5d7c6f39f24bfee545552aae5c126305d2c767d06762aa516c21bcc5b327b312b7c38d742717eb507b92ae1e27de9c0fcde4d616754a7ce616b5f56689c8dc5a SHA512 9930957f707d9d2c8903f87f5f3444f71bad3d84c944436c7abc6de19209595c974098cd60a6a391f8ae87c4fb53b5122cba8e42e34fcf46d798dbdc28840008
 DIST camlp5-7.03.tar.gz 758136 BLAKE2B 4e1169adf7e119f1f659fe684a8b06c4730db3bcd7807169552de0e3fc115f8d45bc11961f3aee0a9c2d86e1130ec776a1bb7753d7d4e95f661d65d1f841406c SHA512 0c76d469c5f8c727088f3136107b6690349b50791ef8baefffdaa90141230907f977a7a886a9e8d88d39d8fa315637d882d0205c57d752e16575c888a8a1f54d
 DIST camlp5-7.10.tar.gz 849559 BLAKE2B b05624156e914c2657d76afbf3dfacd295fe5985ae3809959a40029a8052669be6ae8a6ff889fbf2c602d3f19c9995f013b388c140738f4bb4f4da9970911ed5 SHA512 faa9e88f56477162038fc80429d5839c93b3e38aec90366730babe737e2e6bb260dc39975947a6601212cc0c68f465bdbccb6337da23c07181909dfb11cf8640
+DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159
 EBUILD camlp5-6.17.ebuild 1667 BLAKE2B b069ffd12b596cfd8f3b8cb329e96067d3ff54ad8a21917aeb9eaded7cab6d876698262ffe44d20b06cd9b22c6c43666236482e9803e4b8f5056ffaab8b2d8ff SHA512 d49d8cb457301a3334df1b94a1f435c7fb85ff24de08cbdbe6aa53caa541f0a1d1f6583184d45e1b423b59cae58d539b09387f2d0cfaabfe19030afb51995e6e
 EBUILD camlp5-7.00.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
 EBUILD camlp5-7.01.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
 EBUILD camlp5-7.03.ebuild 1473 BLAKE2B 903f983282688ac736fb814e32d39b8a7dc4dccf103ebaaad573528a5f93f4fa77dc25189b7aa2d95c53529f7055012772f27217d77fa523c49666036f74ea0a SHA512 4b8e2cc30fcec4941ad38ddd5555bdc81610e8267ff7551178b68110b4fd1ddbac1333bac01ebcbaab168412f84c1579203ee1476f9e4caf9861e3cf25303c4b
-EBUILD camlp5-7.10.ebuild 943 BLAKE2B 402d36749069983687d813ccdfeffc13b6ad90813db363d85024d8d68b2606cafdcb74ced4ddd526ae8cb0fc3f266572efe01d33f071a402e15ec57f050169d1 SHA512 5ee48affda4c799567189842f8278864a29b90f0b6187e4e4233f36bd76e5376181cd149674bd3e19ff532a4b13ce198dfef86cec78175d9dd994e84015f96c9
+EBUILD camlp5-7.10.ebuild 949 BLAKE2B 810503c75e88dc9f3977b9a0abc792550da30c35c75f4e12e8db6e9a90a1d3e3633de5d5b5ad0a44f94ec6483b40ee3306bdf5ffcfb699d82f5bb2d9d0f1a3fe SHA512 79e382b13c34f552875ae9bc5e6c8ccdcc5724c37702b95b5e9af7b900e6766188946861031f95a7183e4d758e45b3dcd5ec9db5fcd3e06440d4c48b59be9d26
+EBUILD camlp5-7.11.ebuild 943 BLAKE2B 402d36749069983687d813ccdfeffc13b6ad90813db363d85024d8d68b2606cafdcb74ced4ddd526ae8cb0fc3f266572efe01d33f071a402e15ec57f050169d1 SHA512 5ee48affda4c799567189842f8278864a29b90f0b6187e4e4233f36bd76e5376181cd149674bd3e19ff532a4b13ce198dfef86cec78175d9dd994e84015f96c9
 MISC metadata.xml 325 BLAKE2B e1e22f9260b70f58e523e16ba3f5a9fd8b58050ed7ba2107af06db261129f190620aee89c824557af3f5724b4f78ee5b4899addeee6fc9572315a2640f9d666d SHA512 52021194baa57054aaaad66864a51fd2bdf9c161e32fe78dcb1541480cfa03780645e3c1bb64271ce21015af26f2362fcb620c44c80253db82e06e1d38ed95b9
diff --git a/dev-ml/camlp5/camlp5-7.10.ebuild b/dev-ml/camlp5/camlp5-7.10.ebuild
index 542b744b42f5..5d5237a3aebf 100644
--- a/dev-ml/camlp5/camlp5-7.10.ebuild
+++ b/dev-ml/camlp5/camlp5-7.10.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE="doc +ocamlopt"
 
-DEPEND="dev-lang/ocaml"
+DEPEND="<dev-lang/ocaml-4.09"
 RDEPEND="${DEPEND}"
 
 DOCS="CHANGES DEVEL ICHANGES README.md UPGRADING MODE"
diff --git a/dev-ml/camlp5/camlp5-7.11.ebuild b/dev-ml/camlp5/camlp5-7.11.ebuild
new file mode 100644
index 000000000000..542b744b42f5
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="dev-lang/ocaml"
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES DEVEL ICHANGES README.md UPGRADING MODE"
+
+src_configure() {
+	./configure \
+		--strict \
+		-prefix /usr \
+		-bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+	emake out
+	if use ocamlopt; then
+		emake  opt
+		emake  opt.opt
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS="doc/*"
+
+	default
+
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META
+}
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 2decc43f11c6..d3d88b68c127 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -5,8 +5,8 @@ DIST findlib-1.7.1.tar.gz 256883 BLAKE2B 7459082dee3cd04045e8dbf59bc82075eb1c24b
 DIST findlib-1.7.2.tar.gz 257747 BLAKE2B 826993e9d3e5a9dab9084b006347a0324c848aa50a42ba1daa0d76010a0cdbf6e1ae9f0754dd3bef84f043ee43c3bd9775284a73ee5b130b678834d14d4ddb1c SHA512 f2aadaf8630482785ebfe6788bfea6716defdd6ba94e7f4e3b743c3415fa5b169e31301d605857823e9c74f7bd2f774399ee32a8acb35e64ce0cba5e98e4dd2c
 DIST findlib-1.7.3.tar.gz 257703 BLAKE2B d69687ee4b75bd7ba514c5507bd474764cfb76f0502ef613c3dd8d8e9e92b5f12704c101b9228d71f2d9f151ab5e63b4352b759a2c7a2694f23b10b6c4e724d2 SHA512 5fc8250c123e2f019406be487134523f964668d615b51b216551d74f6ec1999de43aa7babc9c2c75ebb87293b4b8c640548d562a98a6e5a6d7f663432869c886
 DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.7.1.ebuild 1625 BLAKE2B d9b27475d4ecd7657261ec0780f8b85976ca349fe5ff6ae0a1bafe9843932435b142d59cc9412ce0daf3339d8e3a5b4149f8b832eb33f726ae3edf1fd33ba519 SHA512 3b4056ba56f86afc1cf942d7c2ea2652b7b7b05b8a4ab96805bc8cf97b97cbc15f2a30147c8c173917f420c576e1a006493509ac26b448b04814d9cbfe9601bc
-EBUILD findlib-1.7.2.ebuild 1633 BLAKE2B 53a3707037ac924c4fb6028af71c1197e27eb5a935ae49d4da4c4753d42dfdb4f004b32a22b9888a3612453536e06eb2624048af58a8d6c32886389ef7078cb0 SHA512 3bd5ffc13a77e485728633c6a3505cf34bf818be2f979a19a5225edd93939d825a8b14f62626e339f3b4776dbbeddb7d908a28c9086e381a087ecb852d7d7f01
-EBUILD findlib-1.7.3.ebuild 1646 BLAKE2B f03a39014effdfc32f0ed37f0218d988db2582bcc300d2af924b510cbf6d54dd90921ce06e095ded6dd368a50e46845afa616c13abb50f2fb74a5cbeaa79b63a SHA512 0d3146cf06181812b02010e6d32201f5c888f5186fd2a748352a157b3d7a96e016d56ffde7bb7c8af9729abb024aa0f88e4905c129278ab002ba32397ae8d77a
-EBUILD findlib-1.8.1.ebuild 1694 BLAKE2B a18e8bcfb91e765708053d00264866b1414604eb54a6a20a02a7f49672af621033e702bae837ebb1d880aaee4c52dbd120c0ea21e5cee61de5be125662bf2517 SHA512 8500c3dff3026ba1c5d94ae698b6eba34cee1a6f8c8349546b028d1f1e4e8fd4099c1e64ddf64fb1ae08021959e363c7f1e572fc6201b614efa8cbf23ced5279
+EBUILD findlib-1.7.1.ebuild 1668 BLAKE2B 60d7a6dbe8afa310b009c83484fff3764214d936462006c0ee173440dc9ed55af26caa161dfa56dfa0d2f92d79d5b7f6d64276102a84609905a03479b0c35723 SHA512 5ebe6823f278c34ede6bf7aedd842c74a8eebe51c34d730d54cc08546a4345e14a799487d45456ec75749d4415ecf6673db6a473ef8c81149efe2845df3f320c
+EBUILD findlib-1.7.2.ebuild 1676 BLAKE2B 1f26f700fa8f120eb504d441f6abe0a3e42d70c09df8325f78b68721e2115140d834b1fbc51d105f39d372dc4d23a6164b735f6fb504e7ad438e4cbe57db1d64 SHA512 188b4b931a3ba8e6eb456bcf97ea5f521466f9650ae2567ad4e9104e1270ec62ec4e8b727d4dba5eb0cf19572cf04aba4740aabcbedd81d5afa29f80caa78692
+EBUILD findlib-1.7.3.ebuild 1689 BLAKE2B a78e7e68a97122107362c376017c106462c30dd6c8754702c0b24f22478dcb7ad75cc9da78b2832922402182d1037c085d37b1d401b8126735438faa5e3cdcd3 SHA512 0d107354f562ef62313afdda4f8eda424dcaaff565ae17b9e2b0b1dcee2a8a44761830c021160deb6f688fbb2d28aa8adeb287744eb89f34f3639d0a2d8ab548
+EBUILD findlib-1.8.1.ebuild 1693 BLAKE2B 2430f1c69b891352735c739932f681149aa46af23ac22626e2d7085f11050d0a965508a84f0b7b9ff05c480b2954659a269d072e39b1ed92f66163d135ea728c SHA512 5e05a353475eade1dbaa4f2e9aae0473e19ef79f355369608af6d219193a6067903b6a00dd80b76ccf21213511e688e6a8d0b37b5cbb49a8bce2f77155dce2c8
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild
index 2db445777513..52d717f9e354 100644
--- a/dev-ml/findlib/findlib-1.7.1.ebuild
+++ b/dev-ml/findlib/findlib-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+# it does not compile with ocaml-4.09 (bug #708696)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/findlib/findlib-1.7.2.ebuild b/dev-ml/findlib/findlib-1.7.2.ebuild
index afff28f8195e..895452b724a4 100644
--- a/dev-ml/findlib/findlib-1.7.2.ebuild
+++ b/dev-ml/findlib/findlib-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+# it does not compile with ocaml-4.09 (bug #708696)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/findlib/findlib-1.7.3.ebuild b/dev-ml/findlib/findlib-1.7.3.ebuild
index 170528bfb1ff..691a2c9519aa 100644
--- a/dev-ml/findlib/findlib-1.7.3.ebuild
+++ b/dev-ml/findlib/findlib-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+# it does not compile with ocaml-4.09 (bug #708696)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/findlib/findlib-1.8.1.ebuild b/dev-ml/findlib/findlib-1.8.1.ebuild
index 235cc886cff2..9ab65f642ccf 100644
--- a/dev-ml/findlib/findlib-1.8.1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
 	tk? ( dev-ml/labltk:= )"
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 14f4a28cddd9..409f8d5c22f1 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,10 +2,10 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-ocaml-10.0.0.9999.ebuild 3229 BLAKE2B 7f5da96b8e83214245955909fe9155d67a5141eb83dc509b0dbd7235df219cd6f081e92e509b27d6ec6ff6fa1a035fd0ac19c1bbd0264dc25edca4ff13de6e4c SHA512 90e2c67c2d9a49783dbf51d03a34c576e9025ebba4e348cf3ee2068a986c28616464b3108c7ea4add7bc4b1b13f44782a7d13cb1dd775930549eef438127c9e9
-EBUILD llvm-ocaml-10.0.0_rc1.ebuild 3229 BLAKE2B 7f5da96b8e83214245955909fe9155d67a5141eb83dc509b0dbd7235df219cd6f081e92e509b27d6ec6ff6fa1a035fd0ac19c1bbd0264dc25edca4ff13de6e4c SHA512 90e2c67c2d9a49783dbf51d03a34c576e9025ebba4e348cf3ee2068a986c28616464b3108c7ea4add7bc4b1b13f44782a7d13cb1dd775930549eef438127c9e9
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 3229 BLAKE2B 7f5da96b8e83214245955909fe9155d67a5141eb83dc509b0dbd7235df219cd6f081e92e509b27d6ec6ff6fa1a035fd0ac19c1bbd0264dc25edca4ff13de6e4c SHA512 90e2c67c2d9a49783dbf51d03a34c576e9025ebba4e348cf3ee2068a986c28616464b3108c7ea4add7bc4b1b13f44782a7d13cb1dd775930549eef438127c9e9
+EBUILD llvm-ocaml-10.0.0.9999.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
+EBUILD llvm-ocaml-10.0.0_rc1.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 3223 BLAKE2B 493402ac8d79b1e7532aae120957aec11276f0c652532af4e6f84642e734c42ab5214b13a43af788b57d7fcbfa3494bff28ff9862129a419cafe8a042dd21d14 SHA512 ce647a88d2f8fb034c6ef1fae428d5d288e92fb893d5515cb9eb0f3f1c231978b15ded5da5181ea5e313ee1059c82f9b7f1ad6f4a5f170749b37056f2eaafa72
 EBUILD llvm-ocaml-7.1.0.ebuild 3019 BLAKE2B 3bb0282cbc65f6a10d75c82d329265a4b9420eb13219bcc446fba957bd96bc94d0ffc8821f81b094f814758891a63c011233742edfddac6b4bed166ff42f95ea SHA512 b5d0686406132877d2e34f6eaf9476511e398d495d4f0753374c6665fcf1c986f0099be24bb434c11f9265320f34b36a0aa807569e5379a9a6c44e133ea1051c
 EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3
-EBUILD llvm-ocaml-9.0.1.ebuild 2928 BLAKE2B 5b0d8dafee22b55ae1fd5d9344ce10d96c3495237ffa6db6f0b429b10c99a85fcd0518942b41fc236b9654f9ae0d8ba7cad36a621c954e1900a5aede54ad8f64 SHA512 cc433c0d765e92cbf13a18b9c07f21e2369711ca98dcc71ae928e8ad49a089866b26a1426855bf555aa50f80d2de4eb4d150700f4851e157dce443c766acad86
+EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
index 4a532d74722c..0f9b2f61d747 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
index 4a532d74722c..0f9b2f61d747 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
index 4a532d74722c..0f9b2f61d747 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
index a70188ba1f0c..2d7234b60384 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index fbf1026aaca0..5a8b10122fe9 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,7 +1,7 @@
 DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b
 DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
-EBUILD ocamlbuild-0.10.1.ebuild 982 BLAKE2B 353cf032c8a495f7243c55d6610f16e95edb50e530f1626ab0d6408c19f35a35a9692bb586b9a620e9cf3e5e09e4ca6d4f743cee2b646594e0e5a3ee593ebc7d SHA512 b4fa82e6ba935792609879b1fc9ce89b5b878426d9dcbc9db79c41cb9d357cbb1cedb392c66be17e01b3b496a37ccc33f6a4934eac64d50a47b03e872fc87a75
-EBUILD ocamlbuild-0.11.0.ebuild 1071 BLAKE2B 077f7e85fd47b8a5f96ef32b1bcd1f0360b096f0e8ecea4c3b35a7a542770dfd1870f5c5a9f1a746b6f8824401fe01a4d6149b6630ddaae5faac82f9bf9b48e8 SHA512 0f502336167fedc7ad50523de39291be2d9275c53a7926fcf0f35f026d1fda814b3cda2524674a8fa24f350cda15675cf28707ba34cc3254ee2b8595580fb1fc
+EBUILD ocamlbuild-0.10.1.ebuild 1035 BLAKE2B a373ab35a5ac7bd12342ae6f06334d0340592e017f1ec6878b98bcb15cdf6c49e25c3e29f27b43ae1075e77de11495ea8be398dea53adc89ac05a56301a798c1 SHA512 23aaf967458a40ead7cb485ecfc10c75a785ffc290c16eb768cfcd8ca0bf4340d62e8f34d5a4e8295046182eece2fae93b7ae070c5c9ccf92394e5a6c7d8f567
+EBUILD ocamlbuild-0.11.0.ebuild 1127 BLAKE2B d95b57e29d00d3411b20b57499cca09f3f06929b1e715935e598e457dc9d9557f465a5024fe5ba5d7a1ac8e998a9997c81592832df9aa784f5e037f2a32a3e15 SHA512 e94a9ff4a40e32518392106fa92dd904cb702b414af75bdac79c718bc7542392b709371c61770f67609d005a127a9d05d562a25c9ecd1d52bda8cfe3bc05a3e1
 EBUILD ocamlbuild-0.14.0.ebuild 1071 BLAKE2B 077f7e85fd47b8a5f96ef32b1bcd1f0360b096f0e8ecea4c3b35a7a542770dfd1870f5c5a9f1a746b6f8824401fe01a4d6149b6630ddaae5faac82f9bf9b48e8 SHA512 0f502336167fedc7ad50523de39291be2d9275c53a7926fcf0f35f026d1fda814b3cda2524674a8fa24f350cda15675cf28707ba34cc3254ee2b8595580fb1fc
 MISC metadata.xml 248 BLAKE2B 0baa26cc2d6bf97034a28a0eaf70c71c088f133beb6d0c23414d2cc0c6f6b80cafc427e4e3336dde77669340cd71555fe7564011250045ef038abc19508bbd3d SHA512 dee41e91c23031fba453a79a56e048558d85197d7661b773b2c966c49a381d4539c7639bd1c94726de936b16a233b92424548da67859c9fcf9884348bb48d326
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
index 62366767e29c..10847fc11e60 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,8 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+# does not compile with ocaml-4.09 (bug # 708696 and #708872)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-ml/findlib-1.6.1-r1
 "
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index 4556ac43c4db..96f238627e93 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+# does not compile with ocaml-4.09 (bug # 708696 and #708872)
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
 RDEPEND="${DEPEND}
 	!<dev-ml/findlib-1.6.1-r1
 "
diff --git a/dev-ml/patience_diff/Manifest b/dev-ml/patience_diff/Manifest
index ac422b646b03..859993a98ae2 100644
--- a/dev-ml/patience_diff/Manifest
+++ b/dev-ml/patience_diff/Manifest
@@ -1,3 +1,3 @@
 DIST patience_diff-0.9.0.tar.gz 16520 BLAKE2B af7f93906c1f4ab70649bc41726aff21f9f099fe49b0d3a3e8bea01d85e9f01cac4bd103179e9877d79dbc997d37318382321dacd67be57a9e031fd95e0263e5 SHA512 62cc0950edd8d46d5a11cd612dbdb8dc531a9a2c71403f30e6022e20d9ee21cb2e7a531362fa8b350075003eec929f1f70481b8e160b253831966d80a8becd83
-EBUILD patience_diff-0.9.0.ebuild 526 BLAKE2B 45391487404730a2f788a48d978bc3aab43bef59305fc363eae6ed608cf3d032abdb7e07cdd4b35ff3c495a0808b6e1fe37569a783bffd08b59aa497a7b4e532 SHA512 407651f14c1ba623a4210a8550a957776f12c9612b434452587e075b29327978cfb349da7df71c4d79e42bd186ec5c846e0191a9a2dc13241839d0cdb116aa13
+EBUILD patience_diff-0.9.0.ebuild 534 BLAKE2B 4b0e16608fa40c71c896a814fac9fb68ed2cfa9fb10f24bee2221ad6187bf0fd89c967102fbe5c352b4ed947bb6963fda620cc74ca4472a7ed2b37fb1e29602e SHA512 8cca726e81552de98a1771fe9115836bafbb4b16d2dfc5bd34fa5565654c6a32450eb9662e5232f6c3c0e5e21ecc5286e835c19926c17b54e997a4dda2f2b121
 MISC metadata.xml 256 BLAKE2B b85b78e50bb089fb6f5ec8f062457473d8a64b4b1b9442df43b08df04a0d4bbca6d0b6b1368025fc5eef79ada7f1e835189883d38fd364328e264454cc5d3ddd SHA512 ed2cac543371b73c9a0a9b0e0cec36fdf53cd35f79644243466f7dddd8225b9351126d93ad87cddfc2fa567b8905fa0c4c6b6ed8ffec87bf4707662dcf3ed9ca
diff --git a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
index cba06ddf9e13..1a27643bcde4 100644
--- a/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
+++ b/dev-ml/patience_diff/patience_diff-0.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit opam
 
 DESCRIPTION="Tool and library implementing patience diff"
-HOMEPAGE="https://github.com/janestreet/${PN}"
+HOMEPAGE="https://github.com/janestreet/patience_diff"
 SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 43d4c0a3dc73..0c00e499c54a 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,6 +1,8 @@
 AUX ocaml404.patch 2031 BLAKE2B 02341fa3b292d713995f95d76f1b47970b9ff34d8b177212074c0a3c027aff1d0f27a0e3e7f03b8131904a28d285f9cc4b7b795e62327ad2da7c29f1b74240da SHA512 507bda106d25a92718aae1b0e95103d481cbe18624f80a59af6b3e884594c1d18b0c15b51f014b1af39b09a5264272f92ee8d18dcca37e7595964f85241c141a
 DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4
 DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64
-EBUILD ppx_tools-5.0.4.03.0.ebuild 813 BLAKE2B 1f5897d4905c89e741e5fca93d922e81113a5ce26e376c9eb95fc298ae77c15308af7133645e895d473ba75259760f1f509ec205a2e074fa17c710b336de703d SHA512 8cce9af5162c38603b538a91c35b82163ea96c4fa49f01eb6d71d970f80d62cee549d7abc38a367f2e7ac40b7c961f3e58d5759c318f4157580f781f49fc30b0
-EBUILD ppx_tools-5.0.4.05.0.ebuild 716 BLAKE2B dcd835e06c7349df3bb49c16c14378e5b90de9ece37c478b66b5bd35f116c66d65981aa12322505e48c60dc07ef393c5181e3609db26302850bfa5fb53cb33fa SHA512 991090e274d2897d872bb706e2295d9964a1f8182947617683d7d054ac80501586dc4e2239add6c18effce80c6f78f0022ab28f46d942b51ec975cf5188ad1df
+DIST ppx_tools-5.3.4.08.0.tar.gz 18590 BLAKE2B fac872d113ab1bf9135357dea47d468924e16a1a038b64152d5ebb27daa69a8c2d906750146157954f4d95769535f4a93c1ecc9582ca0313d601a06606196c00 SHA512 817e2688d60f013fa42ffa263cfcc15cfae820240d2e54dfedf1f4a4191f9b9fc365a190cc7eeb9082ed72fbf3c94d6ba72c38c7db3e2bcac49a17ba590d71b5
+EBUILD ppx_tools-5.0.4.03.0.ebuild 807 BLAKE2B b71640ed43baaf8afaa8d841d78461f3f66cdade8f22a93aaaac04093dda070d2b0512a8b6ebfc7eabd400b70c852155db5101bdd5c3ab6b46561f0a9db3ae99 SHA512 f231b7ad6f417b2635b7cd1dc765717398074aea040011e25caf81bc25a46e214f9e653dcb33759bcefaa8b359b08f1e37cf2b42d78c5575f3a2563e7810f287
+EBUILD ppx_tools-5.0.4.05.0.ebuild 708 BLAKE2B 58acde9589203a439a9148eb7373d32f8852efb9aa3cddc2d5b74f73e357614767893adc7ebae38b913e698181e295ca7cb8dc0b6b33f85a84422bb202ea1c01 SHA512 457523621d33361f16fe821025b90c7c29ef2b007f85c9ae7156a036d67d50b894e05c3284434e4d1495df2c0c1a4cd7f5c00434b3204644a758486ae5e3d1a4
+EBUILD ppx_tools-5.3.4.08.0.ebuild 651 BLAKE2B ea64e3cb4c471e62f145ee3e79a3554579d07eaf7b6159c37c36f9688de786076b0a056eb5c301265bf561e4e17023ee5730414b68ebd60e279b7bb687fd0e1e SHA512 1cf8e5cb010eaf775e88fc0a39648bdfffacfd3b4e21538a2d5800fb3724576b2dd31d94319f43e3302bb4c8bfdcf871418a609375732469f87bb3ae6905a278
 MISC metadata.xml 258 BLAKE2B f63381850c8356a44f5eaf677dec2b8420303db8a602b1efb7225d2c6d32efd345e3ac9cde4edee359c4e8bbdaf6c228336ee2ecb48d03335e66cf33ba9a22d0 SHA512 c873e3353f031c0cf5427e0a05c2ebf9112b50cd682193dbc73f7489d5c4996fed07c5540a3301d3c1dfb508ed27c776a2953bab2ce94c843b75d2eb8d0c68bb
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
index 3b440d54aeb0..d0acc2b9fac0 100644
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.03.0:=[ocamlopt?]"
+DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
 
diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
index 28e7b0d5bb50..c2a93387105c 100644
--- a/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.05_beta:=[ocamlopt?]"
+DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
 
diff --git a/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
new file mode 100644
index 000000000000..7e9d0206f344
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib eutils
+
+MY_PV=$(ver_rs 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="dev-lang/ocaml:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+
+src_compile() {
+	emake -j1 $(usex ocamlopt "" "ARCH=none")
+}
+
+src_install() {
+	findlib_src_install
+	dodoc README.md
+}
diff --git a/dev-perl/CDDB_get/CDDB_get-2.280.0-r1.ebuild b/dev-perl/CDDB_get/CDDB_get-2.280.0-r1.ebuild
index f0c62c2ca0c2..6cc34ef803f1 100644
--- a/dev-perl/CDDB_get/CDDB_get-2.280.0-r1.ebuild
+++ b/dev-perl/CDDB_get/CDDB_get-2.280.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Read the CDDB entry for an audio CD in your drive"
 SRC_URI+=" http://armin.emx.at/cddb/${PN}-${MODULE_VERSION}.tar.gz"
-HOMEPAGE="http://armin.emx.at/cddb/ ${HOMEPAGE}"
+HOMEPAGE="http://armin.emx.at/cddb/ https://metacpan.org/release/CDDB_get"
 
 LICENSE="|| ( Artistic GPL-2 )" # "as perl, either GPL-2 or Artistic"
 SLOT="2"
diff --git a/dev-perl/CDDB_get/Manifest b/dev-perl/CDDB_get/Manifest
index b1054849ec48..b1138373ea8b 100644
--- a/dev-perl/CDDB_get/Manifest
+++ b/dev-perl/CDDB_get/Manifest
@@ -1,3 +1,3 @@
 DIST CDDB_get-2.28.tar.gz 22052 BLAKE2B eb4479c9312b5661d6ad1fb3a49242e3b530b9e00011625b495f334870a484a389b0ec9d07316f13b144fe96aba84f10ab75cd992fb76b8371c517e89689f228 SHA512 436156971a9c52c364ef86b670b212973566b9b77a4411edada144eff370d166ed105a13488650c7092ea90bc2754bb203684396fce648b132e379945ca5f1f9
-EBUILD CDDB_get-2.280.0-r1.ebuild 509 BLAKE2B 0953dca4bc89ffa4a5fcd9fcf0d78d219f5fb0ff7d7c7da14d53bf492cd60f4adb3b57ed250e71355e6631775d95e5ea481213b737ef94d4474b3bfd9905570d SHA512 8470e6d936b72885242e4fcf699aede7e33900a3f7fc3fd7872940b012bdb4714a4ca135d01f214e995aa06fbb62a908631f81f3e5411d8c092f9c4de97013c4
+EBUILD CDDB_get-2.280.0-r1.ebuild 535 BLAKE2B bfb023cd0d645dd30eb6000c8becc4bd8d29976afb14b21dfbc779125ed18c3693a975b90df7a9228ce951faf1de1fc3ec248077c8fb2620351b96de99376433 SHA512 93ea4b1307f77415bc83a8b4fbcc960372f5ef5f17e951fb5442e0c48ef8fe473de9f997739446a37e5598b148e2acf7f30299d3730e2e90c2cdd6d3ae214238
 MISC metadata.xml 444 BLAKE2B ca700a05a059dd6aade0c2f3c62e95f59ab4496d7bf35e80bb6f90054b0f519e71c9c7c2164f5d9aa1414035ab40f6dbfa6564b9b678754c6808b4cd8b5ca39a SHA512 e211fb1909d6b8e7f303c2ad68365cd5a6b72b039f903ee879e2beca2e56a0d7deb337c2622c1bc14718cc8acc13d3c5a60c7a22fb26b3f8fd66802f48aabe8f
diff --git a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
index be9328a33caf..b5d1b93affea 100644
--- a/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
+++ b/dev-perl/CGI-FormBuilder/CGI-FormBuilder-3.100.0.ebuild
@@ -8,7 +8,7 @@ DIST_VERSION=3.10
 inherit perl-module
 
 DESCRIPTION="Extremely fast, reliable form generation and processing module"
-HOMEPAGE="http://www.formbuilder.org/ ${HOMEPAGE}"
+HOMEPAGE="http://www.formbuilder.org/ https://metacpan.org/release/CGI-FormBuilder"
 
 SLOT="0"
 KEYWORDS="amd64 ~x86"
diff --git a/dev-perl/CGI-FormBuilder/Manifest b/dev-perl/CGI-FormBuilder/Manifest
index 0e964bf92de7..bdcc9d447f02 100644
--- a/dev-perl/CGI-FormBuilder/Manifest
+++ b/dev-perl/CGI-FormBuilder/Manifest
@@ -1,4 +1,4 @@
 AUX CGI-FormBuilder-3.90.0-rt81650.patch 5659 BLAKE2B b1481c41d4dfcd5fec774e1cae5c445730595e5b7d63843477d7adf9fac5f8da8c8703a0eb882c2b6a335f2f24aaa45f97498b842efae37fd5a3128fd179d708 SHA512 fd5957adf995c2d269bfdc69d54a5244f1190f0786c57a614ec438c6386733b2587d1b8b9720c6e8c89f24e9b9bc33745a62b16e355f9b5e7ddedde639eee8d1
 DIST CGI-FormBuilder-3.10.tar.gz 162346 BLAKE2B 96850d80b10e1c96cefd4fa83316b470898388047cc34ce7dc8b6f29086e6622e743ec548370faecee8b88a4f5ee87e7ec4c98cb5df04cac5a4a8d63e45c5ae3 SHA512 38d8e6eb729e188074d872b979ad46133152877bb30b95329a2c7275154646a4afb62dc3539cb34781149f424b1d384d05230efe8b174967742625a81765bad5
-EBUILD CGI-FormBuilder-3.100.0.ebuild 2105 BLAKE2B c4d8fe7ca6af888be0e5cfc86512e0ca5eb6055f2b9f7cd2af9f58ed81c1fc9227f17a675379ef7b6da05071b3eb90c3af036ebe0d205a407bbf023e620b773f SHA512 14c8260c44951adf3d0a28a0ca03047451011e45e8c45617e7410556300d2179e457c09324fee06d638612dbdb2273819b18a71d59ab136b380ce3d00c41523a
+EBUILD CGI-FormBuilder-3.100.0.ebuild 2138 BLAKE2B d145314b4676cac5d3c4d0cfe82b082c290c2831703b3239054ffbfc29b842ec40ce6f251fa5dd6b41453295994a073ecfe09a78aae8e16b5f62f6a959bf0553 SHA512 697577042df8df45ae24cca299727146209d287c6a4e5e6681d675771c6cd523bb4b8ab9a1e92c54e2ff491f27de2e092962766e3bbb20368ae11a37e646f98c
 MISC metadata.xml 3257 BLAKE2B 0c635a557374087cd578c64560c82b5e6be2b3ea1c65de78f40a7e1084a482813e3b0087773e78b1454097c327e668b1c446614ac7887c0b4df1aa0b4f7c837a SHA512 56a828674dafff65d7338211d07dc4f6c3655d9423cdf1ffc2d8961f87850dff6860701e1a1c452962fdcac7800d8fb6546618de4e9e521987b1a1ad4af1b902
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
index 9291b32be8e9..8fc6ed047063 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
@@ -8,7 +8,7 @@ MODULE_VERSION=1.30
 inherit perl-module
 
 DESCRIPTION="Perl API for memcached"
-HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"
+HOMEPAGE="http://www.danga.com/memcached/ https://metacpan.org/release/Cache-Memcached"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
diff --git a/dev-perl/Cache-Memcached/Manifest b/dev-perl/Cache-Memcached/Manifest
index 2365863c16c0..6841a3e433f3 100644
--- a/dev-perl/Cache-Memcached/Manifest
+++ b/dev-perl/Cache-Memcached/Manifest
@@ -1,3 +1,3 @@
 DIST Cache-Memcached-1.30.tar.gz 20643 BLAKE2B a9395edd2fe803183af74810a2fbbc4c366d915b012d73269ff7edf21c584e5a04f082eb8bad5738b72b24dfd3960839b605b78351aa605c0255ab762d0dd614 SHA512 050cb8a764e4709fc8b195ca8bdf3012435656e285f45f569a4daaf687734f37d89043b12cf300b0b33d39179df5ccab8246e8ea613b1a41f10705d858c41ff8
-EBUILD Cache-Memcached-1.300.0-r1.ebuild 479 BLAKE2B 2b7377f44e987a82fb5ead87520e0245d47212a0663736e9d522949412bac460aec8c6114549017ca14b069e14bcd6802d1ae1b69873b2b1473c7ea2f21dd17b SHA512 56a365919a3429ec4599b0a1abdf1e028455386bdf63a16195e52b9f8b2b54ed31e031c8b8f4e021e66cf262a889cd8f3efadaa0533d0d826904e4e6e06fce36
+EBUILD Cache-Memcached-1.300.0-r1.ebuild 512 BLAKE2B dd6a72458db47e9ad1436a0a9f44a42fa6331ab287f500f947bdaf6761ae9ad1b1f22c30fea1556ffca610a707460583229f8519b0ec6c7326664c0199172d86 SHA512 0f146ab48d4e81052b3c8d73501a87a46189c04b38a36036f068d705d8fbcf6b1d449d5f247769345a825cc4250be3a8d9316d0fdf13718938c984f50e3c7e41
 MISC metadata.xml 476 BLAKE2B 17e960c1b6a4759827c58b04aa81d5ee3e04ff561c4481d955e5de553f862199049624c22cc60c15921c3c554cc09517335ccd02bd655358290b3d5bf1bb8cbd SHA512 59c2b067be38588303650ea92c6a8c457f8dc1c472ca69ee80e39103c98d16317de1788ef0f43c724d7bcf18dfc41532becc9109a13d0c34aaec0c9dbe41c215
diff --git a/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild b/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
index c9f3e0f81b81..87a9471452e5 100644
--- a/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
+++ b/dev-perl/CursesWidgets/CursesWidgets-1.997.0-r2.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=("test.pl")
 inherit perl-module
 
 DESCRIPTION="Provide high level APIs for rapid user interface design on the console in Perl"
-HOMEPAGE="http://www.digitalmages.com/perl/CursesWidgets/index.html ${HOMEPAGE}"
+HOMEPAGE="http://www.digitalmages.com/perl/CursesWidgets/index.html https://metacpan.org/release/CursesWidgets"
 SRC_URI+=" http://www.digitalmages.com/perl/CursesWidgets/downloads/${PN}-${DIST_VERSION}.tar.gz"
 
 SLOT="0"
diff --git a/dev-perl/CursesWidgets/Manifest b/dev-perl/CursesWidgets/Manifest
index 5228ff33fa23..45a8ecd88b5e 100644
--- a/dev-perl/CursesWidgets/Manifest
+++ b/dev-perl/CursesWidgets/Manifest
@@ -1,3 +1,3 @@
 DIST CursesWidgets-1.997.tar.gz 40526 BLAKE2B cd0ab66eb2669b70051eda13ace5e1426c603bc014887d721c5a3fa2b1f2ace5e63eebd13b393358823987e1b36f59e552d8221789084318de0ceba50168e8b3 SHA512 18b2e59508cf7e4411cbe7988890fd50aa51365bc5365c81cd0464a0d31f05e146c963ef852e53c7ba82562b459a18d216b114218f7caeb9832fb3c36a425f55
-EBUILD CursesWidgets-1.997.0-r2.ebuild 1601 BLAKE2B b4e844252f87c12051410e58cbceef0d953d582a336652d6c1606c58cbd667f2da11221a04dd6245437ea28deb913739fbf7de092b13a85c9de7e632cdf17727 SHA512 7de98557e28a5fe687390262c83543838808c6ad970c013c12261097a14a063832b3b3c219f1da83e13c47a26c6e24c2a2f786e33d4cd806cbb706589c93fe0d
+EBUILD CursesWidgets-1.997.0-r2.ebuild 1632 BLAKE2B b77f744f032b42d36c1dfabbddd75f4a4256aa784bc45b10fb406e9c4ab6bae22d3e9d5cfd507b8211fb4804de98f05b0ce289178b4f8d5d8c43b4fcd48ef32c SHA512 29d66c32082eadd7c56e685b721e2f4684e9c714efa0c1a9ce24c64bbb3557c1bae3ed3cb4a79bbb8e40736b9a7d88675476d76f1bad03e85f3b480331de40ac
 MISC metadata.xml 1128 BLAKE2B 01ef8b6d5af79e2e78f3b467b18672b309196c3224430323c56d9cfdd3987577f0f09b36457f6a7743986c9fa9d68dd8b6480c8ab63fdd2698eecc4cda152761 SHA512 87224a521c8eb6887857f3b6aea904ab490e6fb36d37d6f4a389b2b849600a3d852b6a664ebd87333d7d0885ece6024f4c0ca93c597cef4b25a107a565a6c394
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
index 7990f37b2599..fdd2457611a2 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild
@@ -43,7 +43,7 @@ src_configure() {
 			--testuser=test \
 			--testpassword=test"
 	fi
-	myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX%/}/usr/bin/${impl}_config"
+	myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX}/usr/bin/${impl}_config"
 	perl-module_src_configure
 }
 
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
index 79609e1cbaa5..e2eb88d676fb 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild
@@ -45,7 +45,7 @@ src_configure() {
 			--testuser=test \
 			--testpassword=test"
 	fi
-	myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX%/}/usr/bin/${impl}_config"
+	myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX}/usr/bin/${impl}_config"
 	perl-module_src_configure
 }
 
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index f812d9038283..5ca106d70aae 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -7,6 +7,6 @@ AUX DBD-mysql-4.050-no-dot-inc.patch 5470 BLAKE2B 09a9b2a3fe033c6ae68b949dfacf08
 DIST DBD-mysql-4.044.tar.gz 155006 BLAKE2B 2934224010bb09aaff9a334b25038a4c7d1eb5552f6ad2b73f44aa7e2d8cb3684644773a89f35363c156cf40867a28943320e1b8b7ef4b9d4b8ac0f6b2417b38 SHA512 e3dd9482e8f78c19dc91baba07e39e266f113ce5a014cfe6c5989c96ed0f85723a17ba6a6e00b65a1ed3c62362400bd3779eb63ed282f73587b4757da249af02
 DIST DBD-mysql-4.050.tar.gz 161579 BLAKE2B fb17e151db730fd6955d3e4424dd495a9fcf5f3f4e2b6b79d9fdc86bc42c3314b68771f1d3c393fd80ea14aeda626a5c5d21f5b921d487350ffd79802edab1f6 SHA512 910f5b4ba7a7890d50a79f37d04ec8971a4f62acd0fe30bf3ab634f66e3128f0cd6513e5c9da8c807a0f4477d0cc766682ea8dd0d8072d02821b78df51f37879
 EBUILD DBD-mysql-4.44.0-r1.ebuild 1836 BLAKE2B 33061bf3c622bd36ea034b5a5ac57bfc17d7f99cff8d3806685a86bb4bc87c8a34b33d85326c8cf05ebd0ab4931e5f613634f154e20bbd23f9b25ee34dd5270e SHA512 9590bf2a9e6f4d2de8cfcbed402cb8777e61dfba56a4e773112e57268bf1217ee0362211787d8e650107c6ec4bff8b7b86f7bc74fd9e60da88def76183a54a2b
-EBUILD DBD-mysql-4.44.0-r2.ebuild 1938 BLAKE2B b896c9d7c9479ae60c8ca5cacc5ccdea861b7936d55a64cefa22df3488fc0b66226e882a8bee181f326ea49fdb9858eac113c7550381b9465a267a70b1007496 SHA512 da9abf4ce5ca7bbfd8ce139d9cf6d7cafe7ca116f22bea89950b645ed0cfd1d51d6aae5a482d767b0dbe0886fc7aae9c1e584ee9579640eae1fbe44b2a02f661
-EBUILD DBD-mysql-4.50.0.ebuild 2016 BLAKE2B aeb01698301862bfc4cab51f40a30b30920c012b912977f772b8aef4dfe4af7c452f1d7d3b670e26c168e521756928737b15160b9e51b43d4921e6894b9b4541 SHA512 293f8fe2bf7dc2a0ceb939ba3bab7521595955eb855efa34bdbd41001ec09e4ae6050004414638c279eb54b841a76289e3b0c2ce74df1d4b09e701907720fdf0
+EBUILD DBD-mysql-4.44.0-r2.ebuild 1936 BLAKE2B cf86322af2097fd05877817f6cc50a906358e015886ad3105017e39dfd415db2ecdcaf58d932a17c8859b3ae3e8ef2d2a7420ac2cab4e21c7e15e4768ed3241a SHA512 b3a4e9509343861b238b1a2b31c96158bd559c49de93f333d907a57e36e744d3c248e76dedbcd3a9cce20a9dc185a5c6b48d9fd7f76971818b27d088f8654d0b
+EBUILD DBD-mysql-4.50.0.ebuild 2014 BLAKE2B 51ef3baaea6dae2b6486eb6e78792fdd5fdee0cc58aa4cfa280b5c4f6483d424b0999b081dee25ac4261b43ac75815f31b02924120c895a75a48bdb999bb8a00 SHA512 ee583da6a5c53b890623b8462bb9b4395eb60eb853223ce2d1641d3d999729a6a203facfe7cc8851b21219576eb4756b9aa04e89e5108f9d1ee87fc0a1d557cb
 MISC metadata.xml 995 BLAKE2B 6aa64b675959e1e02b7480a08f1ba8f875cb2f6ecca588512c46b2bc265ab61d996ad30eba6b487d0b9af14e77ca225a25b53be77dc7a9e7647746f656aa39bc SHA512 916a209009bf9d19b2844ca0aa01dc24cfb3d66a556905b5208e94d9137199e25dac0e56280ab6e012746e79d6808aba7ca9af2987ed78f875dfdf48b642aaf2
diff --git a/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild b/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
index c63421eab2da..f74082313566 100644
--- a/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
+++ b/dev-perl/Data-Stag/Data-Stag-0.140.0-r1.ebuild
@@ -8,7 +8,7 @@ MODULE_VERSION=0.14
 inherit perl-module
 
 DESCRIPTION="Structured Tags datastructures"
-HOMEPAGE="http://stag.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://stag.sourceforge.net/ https://metacpan.org/release/Data-Stag"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
diff --git a/dev-perl/Data-Stag/Manifest b/dev-perl/Data-Stag/Manifest
index 66147ab6a644..0c9c618040ef 100644
--- a/dev-perl/Data-Stag/Manifest
+++ b/dev-perl/Data-Stag/Manifest
@@ -1,3 +1,3 @@
 DIST Data-Stag-0.14.tar.gz 428107 BLAKE2B 21eb86abc3bbc099da6cc0a379274c665f6e4dacc9647fca1bc70e1ced6f2f047f7a7090aa58f10971ca82827517ad3bdeec0fd951e26559d4b72657a52a8396 SHA512 72b0b5995795d593a844356e1955bd15e5c1cfc31934e55b748badcc21a29b7862475e7304bd56bd22086fcd31657a37f83acd8aee9343767c31dbfe8aba8e99
-EBUILD Data-Stag-0.140.0-r1.ebuild 381 BLAKE2B 0e1e9f149236694fc4269ba2a56cebb289ce008ce40bdce7452d6be229f8b6a5c504eed2864269a068306c560b1d60365410a3ff1cad09c420ba782f37ba7a69 SHA512 ae905064c342e376e523a0af94656bc389c6fd23b0fa2e1dc0b00fefe2af0733b9e8cd48739450135974bb5027b97e1d5ee632d3d5a0483a664c671b9caaf0c6
+EBUILD Data-Stag-0.140.0-r1.ebuild 408 BLAKE2B b6f4cf63e70aa0e26124af3acea2e64446f7a993c6fa5c3b8f116eedb0881fbfb16a7ea313049ce46288c410de37ce6877d3206dc1285deae22b43536bda7d39 SHA512 7175364694a052089949af48e61bf5e7fb390088ca80597b583495cee6f9bd24b9a7cc81742ccff3c332ef2a0eb83c67049235032e35d60c835c96b722a6cebe
 MISC metadata.xml 2459 BLAKE2B e1066d8aaea6108db5af2cc97b72e672fd17708e368576cbdfc6a55453ff44867059d3ad5a7c241d9368db780f08fe9b9392a2727a2b3471953492c2202e3f10 SHA512 da50951bf35aaed2ef5a61dfd3eba14d1eb040395afea70dd58694abe4dd580cdd5a6f6008051252d70b442050ca752b1176cf6f87c6dcf53d729c54b75903f1
diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
index 228838985eca..adb6e567b290 100644
--- a/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
+++ b/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild
@@ -8,7 +8,7 @@ MODULE_VERSION=0.74
 inherit perl-module
 
 DESCRIPTION="An rsync perl module"
-HOMEPAGE="http://perlrsync.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://perlrsync.sourceforge.net/ https://metacpan.org/release/File-RsyncP"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-perl/File-RsyncP/Manifest b/dev-perl/File-RsyncP/Manifest
index c178883a3ef9..84c7ceb2b8a6 100644
--- a/dev-perl/File-RsyncP/Manifest
+++ b/dev-perl/File-RsyncP/Manifest
@@ -1,4 +1,4 @@
 AUX File-RsyncP-0.700.0-make.patch 980 BLAKE2B 997e84bdd3183c324e76df69279fa00ec09663d73906607b3a0d2518d73f8391aab2214221bb797dadd4031b6f1e195f465cc5153e004c1e415a5ce4da9c8eaa SHA512 dccabb516cb4036efd8372c36343b02916ec1576c64f5c449eff1e7f0aac450f732ac4b190578426c52cbfedd3e5df28b4851cf350621a381b605065f473df14
 DIST File-RsyncP-0.74.tar.gz 167122 BLAKE2B a5a5d3fee8301710ce36ba493e8b20c5ac5835f669cd35462bbe2390432b59e4ee38a8b5585cc8616fe11d646bfd4c4a2477b328584c526b4ed354e7b4ee7abf SHA512 0585c2f0b145875e9a13523d829b2ed9907e1e38c526f630a79a5b5dab36b6a9012375620ae92292e5977735c106bfab905bb121f56df5ca4494e1efcbd02cb6
-EBUILD File-RsyncP-0.740.0.ebuild 515 BLAKE2B 52fe8bd6881acd4ce75aa04b83db2db1fb114d2d11e797ff7ae0ff7c51ea5f3fd50201bb3ece643875613804db45eb70ca4319ccb3eaacfe7d558c3432fede51 SHA512 7efc3652e3df87bc6ee725d4e01ec79c0eae4377d375f6e96962eb3f48570280b683a2a07d4ed359ef5b6b5da1974dd3abe56c8527fb6cadd4d15ca173de37f3
+EBUILD File-RsyncP-0.740.0.ebuild 544 BLAKE2B 1e95ca8d621add7acbdd284ececbc58cc5b5c5d3f9fbfcf2b5f23f233c23ad29eafa301b2e81fc503efe418b56b1be0af76acfb5b3d16d55f88ad35cbde170d9 SHA512 c876e6eb005336122f372ea31e602843103a17e346fed139aca406f315d7a068fd03aac17f0e20a2e6a916633010650a5c72859ff12c39d9259a9abeb7afec20
 MISC metadata.xml 653 BLAKE2B 642c61b5ad211e758076a4d1bbdc4d58d2a22cf86cc785b338411596a388ba1cea7fb495ef637d42ec954ed4189c3d02afe389cd6bb46d18b5cc98fff111f8df SHA512 86a6bbac2ff781bd326a976880fc1f4abe06d2f96c89ed1c1018363034a836481aa16ea94dba68fac659d18ec69e5d5fdf545a4173e904382190f2b5fb7c0f92
diff --git a/dev-perl/Gtk2/Gtk2-1.249.920.ebuild b/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
index 7a32dd581060..09907f1804e0 100644
--- a/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
+++ b/dev-perl/Gtk2/Gtk2-1.249.920.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Perl bindings for GTK2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Gtk2/Manifest b/dev-perl/Gtk2/Manifest
index 5d9eea8d5c86..df2987c96819 100644
--- a/dev-perl/Gtk2/Manifest
+++ b/dev-perl/Gtk2/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk2-1.24992.tar.gz 768646 BLAKE2B b2b63c55d9e1f7e19911bd4a6b268bf27d79339aeef9f8db32fe2fa24666a30e298158a81647ee54d8ce9f04e48d14d21a57971e81383c12d92447af877ae714 SHA512 a3d0ac22ce0f356f1a73c6b7d27161f76573b64cfde54e76d751ce8318eda9410e57d905e03b2562b8d31b80d3dba2bd4a8a7980a331bd5ca0c6f75e61e4e6f7
-EBUILD Gtk2-1.249.920.ebuild 704 BLAKE2B cde5b64d4453e56f24b5996d6fd2f2e1074f60d5b26e58b4258581b537868c118f1cea21bb7e046bda185f5650aa195e160ea942dac36f183b246b0e958e653c SHA512 b4e8cb404c7343eaed814e73859cd1a1f820d7211142c1ce370d201a578d92b3a6ec0be0206e81600f7f9eb9a0a5b7be579fed1ce16164ded21e765c76520d6a
+EBUILD Gtk2-1.249.920.ebuild 705 BLAKE2B 20a0e9dc82d929dbe327cd08038e917da44f7c6eb94cc85ec62f8afec495fc4250bd6d39ba41c29f38d9c234b869729eb500d1b29437ea16cb08c60f598b1476 SHA512 c46a45ee817d86eb08641f1751332a68775f919f000fb84dfa6a69c6c49cc8bbe1b5f400bcac14c4ac8e337a5fc5774bda27c2f9e9e17ae930fbaeed2121b4ce
 MISC metadata.xml 1289 BLAKE2B caeb953c97aa87c06496de24cac26534978d476dfd0f6ce20a24a78010342c576a9f4dedb5827dba8d791d1e691bcd9431b5fa47c0fee6cc7cc9471e74605441 SHA512 eff99cdc1dd2c95f13e038a0795d5817eb5352bad745610968f075c139115ffcc9d3784d60550d47602a6095a2d27ae4e22e3d19ede7712d6b08f94af186fcc9
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
index 86f0eb3f7ed9..586e51f57e17 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
@@ -8,7 +8,7 @@ MODULE_VERSION=1.56
 inherit depend.apache perl-module
 
 DESCRIPTION="A HTML development and delivery Perl Module"
-HOMEPAGE="http://www.masonhq.com/ ${HOMEPAGE}"
+HOMEPAGE="http://www.masonhq.com/ https://metacpan.org/release/HTML-Mason"
 
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
diff --git a/dev-perl/HTML-Mason/Manifest b/dev-perl/HTML-Mason/Manifest
index 5af4809636c2..3fd8eb2f0687 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -1,4 +1,4 @@
 AUX HTML-Mason-1.560.0-no-dot-inc.patch 802 BLAKE2B 49194d66a45804bf60e459cb12b9f0b793420854706b1c04601ef9e992d1e7ca80056b252687fcaab37b3030b238678412df4c2e1a67d5582b69ec8a3f073be8 SHA512 c3de6da1cf6f5a777833c9ea4b68e1dd3c920c766b8661eba4d0ef430604d102abc68bef0d2cfbf11bfaef776c101c1bf19de80f4a05091d9105620601b1b245
 DIST HTML-Mason-1.56.tar.gz 314167 BLAKE2B 7e449bc566f406f2f6c93459f573327be933bbf50eeb1c712e9d109133448cdf568cfbefbdd28fa403d9ed340334afb5c9d1dd5a1800c624b23634cd54949520 SHA512 3492a37b8289209a2215b42be71db242ca150f4364d8422e46ca4762f2cdbddf96a56f44a3462d1f1eb23ef3bbe1cb36b8322106f4050404b988c6d90a05911c
-EBUILD HTML-Mason-1.560.0.ebuild 1490 BLAKE2B a19d29b5650b9fe81193c8cdee3af4ffb43f8d9791c1a1593c8ef0e26869c649df6a50715763d30bdcb656e58feb2e092a573a282f35337bd183e44c04dcc133 SHA512 a2d064188c141cc66e3f50b43172eb0e531d2833e3cd5ab99f9315a77ed0e166fa719af264aa0103e5e9d8a3ac596a14559416a20e6c0943d1b8a282d60bcb8d
+EBUILD HTML-Mason-1.560.0.ebuild 1518 BLAKE2B 74707a37b3c283b3d5e62cc9d4a2bf6ba037cc1ca7e9bc3f8dd3dd1f350f2c2b832d10b934031a121520e4012ac6fdf7734440cbf948cfc0f84359aa49b6caf8 SHA512 4a203e8e27fb7fa167757320f1ca26a780c2c93c56214bdd79b3e69a0a74ac7704c6127082a4d2550ed8cdbb8d53b372529ee485ae4f27f801c0d4a03cbc967f
 MISC metadata.xml 3212 BLAKE2B 87a54f90f83a9b5ecea1153e148dad7c497fd20b7c2385a34af5ab5ee418510153bac3e415ea2e172028cc156f7bb46545477638ca3ba34bee04b41e4f0262d7 SHA512 a24c5efe8884f82d4a925fdba27dbe710709c6a3347bde64313f9ce8e88e8439a96e2703050a2ca24e8cfab20e7fae36a1dda3b82f9cc3596d888ec85920f77f
diff --git a/dev-perl/Inline-Python/Inline-Python-0.560.0.ebuild b/dev-perl/Inline-Python/Inline-Python-0.560.0.ebuild
index 06c75359171a..9dad8f2464f2 100644
--- a/dev-perl/Inline-Python/Inline-Python-0.560.0.ebuild
+++ b/dev-perl/Inline-Python/Inline-Python-0.560.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 # Feel free to add more targets after testing.
 
 DIST_AUTHOR=NINE
diff --git a/dev-perl/Inline-Python/Manifest b/dev-perl/Inline-Python/Manifest
index 537e02f4ad18..4822d4cc9fc3 100644
--- a/dev-perl/Inline-Python/Manifest
+++ b/dev-perl/Inline-Python/Manifest
@@ -1,4 +1,4 @@
 AUX Inline-Python-0.460.0-insanepython.patch 652 BLAKE2B 86734b5c86d7cb5affabb76f950ae6086581a0c5d1eda278cdd27047a49a57b3f2ce1a520e745b040179c945ba2f2cd7dc896e9a321702a05c7d935782196dd2 SHA512 f9fc8e8a287801f331ac92bdbd80f665648f9fee8dc43383fe563c6ca8e0aa4d01e06b09a25408b7908e5394cb4bf496e76441c6ee5dbf0fdb7c65dc4222bac1
 DIST Inline-Python-0.56.tar.gz 58224 BLAKE2B e422c46cfaaaf77a0a683ccf2818db62e5f2c726b9ede71f446bd2bb4fe66ba8ab8d99b30ce26168bf47cc23f06afc5b9839a403cd6b52781aa288a29cbedea3 SHA512 d5fffec8a377ec10c8b21ed9324e2de5a77d10304fc2a89196df89984e55869e3e4e0ef970f1aa4651068b8a6d834fa8eb18d70a052c646ddd98ef338f772e7d
-EBUILD Inline-Python-0.560.0.ebuild 820 BLAKE2B 0cda23f21178b07c1600a39b4e55ca44411d53ca226a545d9dd0490fe058cc91048f6115f3d41855b1c2eeb692e04b2e1fac5c9bc464aebadff362026dfaf2a5 SHA512 fc2964d382d8603eddb14fd169ee7ba343df68f95c8f2f0349dd1db0fcfa76376d4a0acd06a269924e0aa0873899397bc75b62b0f782d046c331772f97169d99
+EBUILD Inline-Python-0.560.0.ebuild 814 BLAKE2B 1422d0ffadf691515c33161d4d0d7b1f8a7bcfcebb2fd52c541bd6413cca377548805a89b607d77aa1d1711e6d7d9e5d3f8109967396b2ae7596c27a0bc1d9d7 SHA512 4ce189ef762f419d08a71574640d0d88ddf67914cc3542d3dc9165557687bccf141ad7e52d0ebf03155604a16c5bfaf0a6326538e1bcdb2f853e06082ca3b8ef
 MISC metadata.xml 683 BLAKE2B 07299e0bfb8310004e589f3255875189c1ac2d8caebee63fb5229aa8acb83968215c8d80bf8ed89ecbb01d7672d6100795133b580536fc8490c00e89240d0812 SHA512 03b3a3f8697b678e054251de5bea03f3344c063b1ae93e6f674e30375062ac9d125af3c428d4f0869d333ded2831617af14b7908ba55c01638534970329ea17d
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index f737e1a0e9c1..0f99b4e7525f 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/MogileFS-Server/Manifest b/dev-perl/MogileFS-Server/Manifest
index bbb15099ee57..52e8862cfe73 100644
--- a/dev-perl/MogileFS-Server/Manifest
+++ b/dev-perl/MogileFS-Server/Manifest
@@ -1,6 +1,6 @@
 AUX MogileFS-Server-2.720.0-gentoo-init-conf.patch 3945 BLAKE2B 590164b44c6f166950a7625b669a5ad94891b70d078b9c3780ed4385536cd124c6aefdca3aa29c2127cda61987f8b19e1ba5c59f48ee01d50d46060a1b2fd5f9 SHA512 e8a294dcea44a25f2128d199b3e202a799ed4fc8716ae1e99606ccee900a8d1ecb4a5dff7a5369038bf936bc40fcb2e0dae104a1a0d4415eb49dfbd47aa69a09
 DIST MogileFS-Server-2.72.tar.gz 200057 BLAKE2B 835a7799389e536b42ed000b8ce07225609501ee6a4c002253a0018d0b17c815e8825a56f78ee0c0604d57cafea45ac044fda4e6e6bc33e0b60b8ed5b51a7e10 SHA512 4076ba33123c984f9d7c56db7d308b4d857e852caa8d811d86ed551b9ab74a6dfc93b034d034ec2802376035799860c613aef2bdd3898c1225e37727fda34ade
 DIST MogileFS-Server-2.73.tar.gz 202285 BLAKE2B bd7032a507df8eba7e8c48205a8d76e66a85e28a2223bce47a1753c38d700a5e8b3ab72e5bffd592d1aec4918374e57d3bf882b911f3d5fb6d1f403a4d32275f SHA512 9d5f67334d1877e9a6e63abb728a9d00b93f35579057102b9601a9c65bd3ff8438090e560ddefaec04ce24d4d2c9a7554d7ea2595b5e4ba6f4f2c4554ccac268
-EBUILD MogileFS-Server-2.720.0-r1.ebuild 2432 BLAKE2B 222e0b5258434290740b1d3c25cf40dbad15a632094f638f1e5f765742faa525ae01f564dd7d974b9a4b1be38ad3669e5068ac0f674407d52f8547c836632b03 SHA512 355e78ed91e1148e9f668c4e64e60d0fc52dbad1c2a882a3d3995a64b95a15bdb0e2ef1192a320c903685cace7a15d055a776ee8f3a63b150d8917b2c612843e
-EBUILD MogileFS-Server-2.730.0.ebuild 2432 BLAKE2B 222e0b5258434290740b1d3c25cf40dbad15a632094f638f1e5f765742faa525ae01f564dd7d974b9a4b1be38ad3669e5068ac0f674407d52f8547c836632b03 SHA512 355e78ed91e1148e9f668c4e64e60d0fc52dbad1c2a882a3d3995a64b95a15bdb0e2ef1192a320c903685cace7a15d055a776ee8f3a63b150d8917b2c612843e
+EBUILD MogileFS-Server-2.720.0-r1.ebuild 2465 BLAKE2B 7c4e4b3d4014130b79f65a908984a4830d0b3e9e26ff091adc575580857facd9d952a3c2a50d1b511e5ed2286ff4d0443859f03e63349f816e0d5dbb7195b944 SHA512 6314d4f8a23d61d250f3def2577874503754c5d19f1b11580e95b8d597b77bd7a6ab505f607327ec1f61486dbeed4128240984c4e78e35c3334b80d30e1087c5
+EBUILD MogileFS-Server-2.730.0.ebuild 2465 BLAKE2B 7c4e4b3d4014130b79f65a908984a4830d0b3e9e26ff091adc575580857facd9d952a3c2a50d1b511e5ed2286ff4d0443859f03e63349f816e0d5dbb7195b944 SHA512 6314d4f8a23d61d250f3def2577874503754c5d19f1b11580e95b8d597b77bd7a6ab505f607327ec1f61486dbeed4128240984c4e78e35c3334b80d30e1087c5
 MISC metadata.xml 4549 BLAKE2B eb81910b09295bbf72b0afc491e873184f7d6c247cc439c3df52dcdbab00af94b336491c218ef31e232fecdc5f3b89f44a233f6911c818b1c96e651c817f6336 SHA512 406e5860c1e43a71c2e101891b83986bdb9b604d5a92e021abdb1b28900b05bc51a81551ee8d535e31fc78b29e0de34fd956f4ccd3743ccf5d749600e0594bce
diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
index 8d2a778a8ff5..e16151bcaa80 100644
--- a/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
+++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
@@ -8,7 +8,7 @@ DIST_VERSION=${PV%0.0}
 inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
+HOMEPAGE="http://www.danga.com/mogilefs/ https://metacpan.org/release/MogileFS-Server"
 
 IUSE="mysql +sqlite test postgres"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild
index 8d2a778a8ff5..e16151bcaa80 100644
--- a/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild
+++ b/dev-perl/MogileFS-Server/MogileFS-Server-2.730.0.ebuild
@@ -8,7 +8,7 @@ DIST_VERSION=${PV%0.0}
 inherit user perl-module
 
 DESCRIPTION="Server for the MogileFS distributed file system"
-HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
+HOMEPAGE="http://www.danga.com/mogilefs/ https://metacpan.org/release/MogileFS-Server"
 
 IUSE="mysql +sqlite test postgres"
 RESTRICT="!test? ( test )"
diff --git a/dev-perl/Nmap-Parser/Manifest b/dev-perl/Nmap-Parser/Manifest
index f983a9930e7f..21226b3961da 100644
--- a/dev-perl/Nmap-Parser/Manifest
+++ b/dev-perl/Nmap-Parser/Manifest
@@ -1,5 +1,5 @@
 DIST Nmap-Parser-1.36.tar.gz 41802 BLAKE2B 4c71a1d5a585d3500d151f7192868b7553c0cd862b30f4044e320a16937f3714ec38af5c7b245845087a3090983be9afdd15aab70cc73d1cc7ec06819d509733 SHA512 f5f15b520a6fc3b6b001f61e8c4632ae0cb4c3998b278a0a8d96ec4677d74627cd19ae0ca29f6007e5c3bfeb6aea5d56f6270c84b736dcc7964a6fbff957713a
 DIST Nmap-Parser-1.37.tar.gz 43495 BLAKE2B 6ea01e65de82db2119c94d985dcaac52f4f17db81c09fcdd49748ab6365e7827f014f6c3b6dd961004b0b764860d2934d2fae2b81ebe20a3965d1826e82b85a3 SHA512 9820c556989ebfd6e29c50f093cbc4dcd6e6e039751c2e92e35521a233495092b71f176448efd240decf1ccd223befb25f136452d2136226a00cf9ccd3fe45e1
-EBUILD Nmap-Parser-1.360.0.ebuild 485 BLAKE2B e356e464d347a2495ce6b200a2582eda15ad3c5939153d598741447ccdb495d116559a59dea37a3cf5a510ca77c064d11208122f28875a65a0a8b1b34a0669a2 SHA512 e014aaed66aa9aa57181102a37e55e25415cb2a06e4c2df6b640e9fb44fddbca8efec670341e385ef0a47c25ea9a193872260bed02be0d6d0a42608c59653100
+EBUILD Nmap-Parser-1.360.0.ebuild 514 BLAKE2B 1a797563ae8dcb291feb0d7da721fa2c509fdbaffa1ad5393b8957ae265faa219dbfb54543d9319dcf5894d4e1da7bcf82f33817691302324d9d3b9bf0e83d71 SHA512 a85d4b747261c3795c66d1813ad85a7c2fd9cac7415ed0480204459254bf77ff06e565aaf4af86873790b885c1785beb0ffcdf1163b48f056a673b8325b46d1f
 EBUILD Nmap-Parser-1.370.0.ebuild 419 BLAKE2B ef979bb1c7454054dfaf07bef179fad128b00cd7b14eb7751035173bdf1a7eba6025cfefc75cdf40e205233d22fc26aa1e172e7e16a0b87af6c491f1a89a1566 SHA512 b7a0b7815ce55eeaac440a9fabfecf2c88ba0387f2a6c58b79563600ec802a9de27b2be456b3da18a7a972ab91a0d4ac6ddc63275904b7e99784479d0192b511
 MISC metadata.xml 828 BLAKE2B 00c0bf24dc27423474a8550aac6c71daa69d45852697646a756f534039bbfee7f75a20448f1d1d919cd31460d1e37fa1c27f77a67383bc762b69d85adc95d610 SHA512 72011b4ba9508a5c12f32e572fa01bdf83c08e57a5e9236d836f94e1d59585ceb6c997c6106d482565ee2d8a0a3e7ca0bd30f8fdfb220ede3c94f950817ca6de
diff --git a/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild b/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild
index 1ea3d1f9419f..e99a4883524e 100644
--- a/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild
+++ b/dev-perl/Nmap-Parser/Nmap-Parser-1.360.0.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=( "tools/*" )
 inherit perl-module
 
 DESCRIPTION="Parse nmap scan data with perl"
-HOMEPAGE="https://nmapparser.wordpress.com/ ${HOMEPAGE}"
+HOMEPAGE="https://nmapparser.wordpress.com/ https://metacpan.org/release/Nmap-Parser"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-perl/Pango/Manifest b/dev-perl/Pango/Manifest
index 05e5fe52a7ff..ee08ca459f1c 100644
--- a/dev-perl/Pango/Manifest
+++ b/dev-perl/Pango/Manifest
@@ -1,4 +1,4 @@
 DIST Pango-1.227.tar.gz 46457 BLAKE2B 642dca9e7d0eade0ca5e255963601e674c9941ede1eef3fe592d05f069650c4c4832b15bad7286f186e39a387c5abfd52c304ea7e1cfbe83c4d8356bdbd2e0f8 SHA512 df44d126d6a9aaa7b7dc2d993ca00fe9eb6abdeb6c7f75ddebc71728b0cfd2d7404c2d27e2dbcbb7acdd73f30888d4abc5c33da9ecbbc7d155f67d083960f29c
 EBUILD Pango-1.227.0-r1.ebuild 1703 BLAKE2B ba5adf981b9e328f118cefdff7d6b2bb65fb8f93c5fa7b10c1e74ab52df84f36216ab1ece59efe1f20da26366bc464efc72b0aba62ed5e281a3433a9892366c2 SHA512 61f917b5700448f7ab0d5a616351461ea42d3d2dc60af9f935f927755a28dde36146fe519996cfaa3d809bfe74f587a4056c59bb08ffd8c2ebc0d09e8bc5184f
-EBUILD Pango-1.227.0.ebuild 1209 BLAKE2B 73541bbe1b557eb6687462fe1eeb39616557565cbae524dde571f196c4a3e49440c27dee2c680bc2f83c34b8b1211a495546f1f94c7548b5161f279914ceef2d SHA512 127b1ba09d646bbded48fe06ac0c16c3ac0a5a8fe67aad92b5871eb8cb76a5d9305a2417a5643e94f7cb2e258ce2d16a066263a5204e0ba06d6522946c415657
+EBUILD Pango-1.227.0.ebuild 1210 BLAKE2B 6c8b6124b72098ff2c6c9d878941724d40b8831d53cdb78655b14dfdd96db105f03cacf247458979d92b68556e3f871dfe73e6cc6cc5ba4862a9e3c653e859de SHA512 465b5824d8b69cebf026e562b8cc7d684643a773d97c94336fb9a628d9e628aa10f0f8dade1cc81db9140ad23e1300b528b0be181a5050f1c5e198e536bb31b2
 MISC metadata.xml 381 BLAKE2B f9a3a096049ec9be0868f10dacb6b2fe799a7529a1752c5e67553995cd7fb4c3975084a77b1160f8491901ee290b5115d3eab9f8157c839c6c141af796e77f71 SHA512 643b40dd10aadd07eb3ad07e5391040129c49c69fca5f924a635cf5d5a6af1a08f1ce3b1c306e87aa72a503b0f4ba592aca91c01196a70d847725c02ed66700e
diff --git a/dev-perl/Pango/Pango-1.227.0.ebuild b/dev-perl/Pango/Pango-1.227.0.ebuild
index 70865338759a..ee8f6d906915 100644
--- a/dev-perl/Pango/Pango-1.227.0.ebuild
+++ b/dev-perl/Pango/Pango-1.227.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ DESCRIPTION="Layout and render international text"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples test minimal"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Perl-Tidy/Manifest b/dev-perl/Perl-Tidy/Manifest
index 0f8fc2011bb5..23f9feb74943 100644
--- a/dev-perl/Perl-Tidy/Manifest
+++ b/dev-perl/Perl-Tidy/Manifest
@@ -1,5 +1,5 @@
 DIST Perl-Tidy-20171214.tar.gz 435256 BLAKE2B 03e7ec8e7d76e6de68a54cd474f192b24ec4eaea563dae185b1723f80ac86df7c03bafbfcdcdffc0e3a18d2b57acf3f40321637fc66a64f1d0f72988e19a7e81 SHA512 bc561146f184dd0023de44741cafdcf6882ef553ed2e0c0ec8cd9a234f45b76638b4dc7edde0abfc36e4cc1f84ef908c35dc63f776de65e2abd938d35563cc65
 DIST Perl-Tidy-20190915.tar.gz 599290 BLAKE2B b9a0b1f15e01ed6f6624c804d7833da672fd11a2779baaeb4c4d5f3d7830b2065d01d969fd23514163139bf53831fb3494d2820fe15786244e46cb0efcf722a5 SHA512 553d84bcba8cbe10c0a1e77ef9e31dfdc5957c758efa2bd556ff47a0a354f16eec922842a36c4ccdaed691ffecb6a5dad63dfee2b038f4d2c5882a7e07bad51f
-EBUILD Perl-Tidy-20171214.0.0.ebuild 998 BLAKE2B e59808c57f06c2edfab61ec2c15b5eae5f159d252d9033a74cc4f5349ed4a10f00e770fee577662c91e0eecbae04e2244e4595ed27bb30e45db42d5caf5ad25e SHA512 25566d512476de1e559d362e07e93a11d9307533aba58fd0a1da3879112f2f99cc3a12bea05f017cd3c610f919dec15f7c9548314925ad850207f9c1ae56a9c2
-EBUILD Perl-Tidy-20190915.0.0.ebuild 953 BLAKE2B dcbbb0b08e9f0f3ef3a1466de9c0f29176a994adcfb8e29ca8cafdd0c10453b2a56fdf5385790def96d94fb691729ef54e5f29bc147e0501a3ad96ddf9d05dbe SHA512 754836cab0b58e19188efcf6476c7db4237e0e324185d4b50f4c7df430b4f5aa82f1e91737e9f44a3cb0f6116bccba38994c27c158c4c3977e32442f5c6c9552
+EBUILD Perl-Tidy-20171214.0.0.ebuild 1025 BLAKE2B c7a8ee44a8e27605463233260407c35862735bece8d39b99794d001ad6ab0b8c15168bef75b5de1d50170034fecb3ace8f0b106ea813b8eeb9df575137d70649 SHA512 bf7ffd815c45be2a2c629d0b7c4fd69a6fb5e23045af681f73b6eb9d363c07a048f4c226b6c84e7a12e1fc6d5d885bed3d9398a2bb78b3404ce649604a99f012
+EBUILD Perl-Tidy-20190915.0.0.ebuild 980 BLAKE2B b10fee7cb7b22e7f2a9899b7cc001671374e5e1de81494d18303b97c99467c64a2bb3f4ad226c37a15d8a5201110967358a8efc59511eef81b66b51bc2e5327f SHA512 ba1e223c7caccc386854d342fae3da1694b5fae2d1c6f8e7325ae7d77bd8f1f4e0bd46e97d20466bc86b948c9c0d86f93cc9c9cbda45ccd3714c2b2107a5bde0
 MISC metadata.xml 1644 BLAKE2B 0c6fd7d907aa2865cae8f00b485322bd63ce2b950deef2c12db8b85fe6b064f91351a0687053c3800ed4c5332d99478aef04e527615ad4b83e50b0c23c572cf8 SHA512 a423f7ee82d755f703d5367b988153e08b181d62dd9121d4ac407333ddf8211e6e5b4467c9333f5141fbdc1b13e4a0d1ede40abd1136f5aaae70804352b09fc4
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
index 8209ba071c5c..ac109653d41b 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20171214.0.0.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=( "examples/*" )
 inherit perl-module
 
 DESCRIPTION="Perl script indenter and beautifier"
-HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
index 56aeb9a1df10..86ce647ae214 100644
--- a/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
+++ b/dev-perl/Perl-Tidy/Perl-Tidy-20190915.0.0.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=( "examples/*" )
 inherit perl-module
 
 DESCRIPTION="Perl script indenter and beautifier"
-HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://perltidy.sourceforge.net/ https://metacpan.org/release/Perl-Tidy"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/dev-perl/Test-Inter/Manifest b/dev-perl/Test-Inter/Manifest
index a0345dbef300..31dd7e58812d 100644
--- a/dev-perl/Test-Inter/Manifest
+++ b/dev-perl/Test-Inter/Manifest
@@ -1,5 +1,5 @@
 DIST Test-Inter-1.06.tar.gz 40627 BLAKE2B e3e97d16c46a5703b65cdf1e28baddf70f466b2586a33014661db618b33b59b9eef0850e8c92de4aad6fb6ee88879e02c8a62d3229c529003081bb4271c56217 SHA512 2cbfc901bce010560b64ce18e7d6ade935fb822e2142c897f4f993dff224e5171c0a835a87696fc1bbe31403c46b3ef78789f8653495234cd5d3798e6c19486e
 DIST Test-Inter-1.09.tar.gz 44460 BLAKE2B 6d199d7b00487fae30eb7e0ccb2b9e2a40f686cb15834d6733dcd1c852836c861ad5c2ecad4e85981c19994afc7fcc820689eaaa08458f45824f726273fa0c17 SHA512 b1f556393a445ae2c04fcc958fc3c9ee9091d17aaa9997dfde13098622162ebc27ac0282401abc27131a3b072be3aafeb5cc74af4b3e1ff4149f6c77536ef6c4
 EBUILD Test-Inter-1.60.0.ebuild 736 BLAKE2B 6146626b54e9a0050a12d5249105bf33402b2ff428b1fb590ff742c3d23967e7da08dab1d1788f15f471017ab0e1e811bcf55b4a430e69318a0e1e2a5f8a55f6 SHA512 47ecc0cce88510de8ed63ad00a652423c657142bb5687261e855395fd2049e53a5ba76062f25944db1105c996acf285cc37eba1f1bf8ba2620e8982028ce4985
-EBUILD Test-Inter-1.90.0.ebuild 795 BLAKE2B 1b44d77de3d80a12f230a0c9a005b5fb3253d8df6d1e7b2e13eb43bbe629431e2df5d6acbde60707bea598f8b4aa5977668ef964ba061bccc8780a9f570c4936 SHA512 47b6f7269cc8cdd38629c5be83de32cc2ec6bdb7a935b0b0c2d01bff0c88e6cd11209209b48028d4528e14e004369f4e45a5a119d44911b7dcf0d55bbeafe570
+EBUILD Test-Inter-1.90.0.ebuild 822 BLAKE2B 9664a7e3335dd68e20b9e5503cf5da9174cf38241e32b8eac5549b2cb06c2af244b5105e825b04256847bab5a1be33a755258d06954fe5a3fb3cd7f028b04178 SHA512 fef0e9ce440930c68d46b60243b914d38334d331aebf3d4dbcac61134ba79e58443d36da0474c3b6e8e26b27d4c74c470c501c3e86a6a6eac92063b44a9904d5
 MISC metadata.xml 392 BLAKE2B 543e5bd66a132f286e1d9392fc541f5e2c488cbe824e7ce7b899cf44b5bd01de5e9dd43b97e4c3a16d8666d0901084aa2b88aa1a4872e3dc37aa2520bafe9822 SHA512 ae1d3513daae65715252243e57dd1ae3cde76f20fad6631f5e8ca7df03d35ea6eb71b71d39a5911c511f2e93506e58588dcc59f9f52a76e31bbcce3d0643696a
diff --git a/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild b/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
index 44c7656e24fa..272a6161562a 100644
--- a/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
+++ b/dev-perl/Test-Inter/Test-Inter-1.90.0.ebuild
@@ -25,6 +25,6 @@ DEPEND="${RDEPEND}
 "
 
 src_test() {
-	perl_rm_files t/pod_coverage.t t/pod.t
+	perl_rm_files t/pod_coverage.t t/pod.t t/_pod_coverage.t t/_pod.t
 	perl-module_src_test
 }
diff --git a/dev-perl/Wx/Manifest b/dev-perl/Wx/Manifest
index 70fe83e01750..ef098b66984f 100644
--- a/dev-perl/Wx/Manifest
+++ b/dev-perl/Wx/Manifest
@@ -1,3 +1,3 @@
 DIST Wx-0.9932.tar.gz 486326 BLAKE2B 54509a108b131973aa3c14fc895893248ddfe2807c0117a7fd56b710e79fbac257dadacb6aa39a0463447b16aa909bb2faed1a437024389afeb2b00c63562a8c SHA512 49f9a32bcd65ad4f2017f322e45ddaad741cdc0f0245489425771dda917553c354945fa949521c18730d27e78444a79d0d56374d462bcd92a96c0e76a4471c0e
-EBUILD Wx-0.993.200-r1.ebuild 1113 BLAKE2B 7adc7a43dd22b98219bf5b34c3621cae2604b12187ea2f1270b41a784c2cd0556bebd0257ca268a3e06af35574a3eb1d3c936b55ea74b7ae82d9ea0177372064 SHA512 6314c068e9870886ac74ed8d8b640ab5088ae3ff90693b595e057c3ef824a07987c0f2d6857cb6981807ab53bf69fafef9665d8b4ad248a402410e3100ebe9c2
+EBUILD Wx-0.993.200-r1.ebuild 1133 BLAKE2B 966dcc270e0cfa9882c02653b3a591033066b144a8001bd0c8c84aac0151c85d0a948da0eacf4f72c3694907f13bc3a4547f42f69540803f36b7936be98afda1 SHA512 eb5bd19c35aa1a5bc9ff2e4c0e8dac77ab52e32f330758b9c012fdd2b07b64ff62effe3f6546556f58cdaec846f25efc90a86b70e1ba816a4c0c5e9d6501c250
 MISC metadata.xml 20246 BLAKE2B fd148abe46ee2d3e8c2ac838400797bc80cc75637a4f60249744fb628232f5499c035d219414fd8e7683c19844b05884ec5ac29109143f7d42d9571897ff6c98 SHA512 618e3cb991b6d5d3d72daea34be068fade6b211fedeecf43167a891cb30f4aaf10e9514b8a2d2bf8c85f6e4d1b0b0be84e8185607c332413a4e8775c5d8d003a
diff --git a/dev-perl/Wx/Wx-0.993.200-r1.ebuild b/dev-perl/Wx/Wx-0.993.200-r1.ebuild
index c2a53f89397e..c9b2d48decde 100644
--- a/dev-perl/Wx/Wx-0.993.200-r1.ebuild
+++ b/dev-perl/Wx/Wx-0.993.200-r1.ebuild
@@ -10,7 +10,7 @@ DIST_EXAMPLES=("samples/*")
 inherit wxwidgets virtualx perl-module
 
 DESCRIPTION="Perl bindings for wxGTK"
-HOMEPAGE="http://wxperl.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://wxperl.sourceforge.net/ https://metacpan.org/release/Wx"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
diff --git a/dev-perl/XML-Grove/Manifest b/dev-perl/XML-Grove/Manifest
index aae111b0129e..afb1a827c1e3 100644
--- a/dev-perl/XML-Grove/Manifest
+++ b/dev-perl/XML-Grove/Manifest
@@ -2,5 +2,5 @@ AUX XML-Grove-0.46-badversion.patch 581 BLAKE2B 402c1d4898fbb00cca01550fd1c849e0
 AUX XML-Grove-0.46-utf8tests.patch 597 BLAKE2B 8bb716d3e278b6fd94a8c08eb60f393b806e9a2f40f4a9889708f993c8c0534f0ec5235f56ae33b74e1cfe27fe685762fac63bf5308fa65dfb9b7113f7503534 SHA512 45fd26ea75472b96f10d5c7972c929bd5fe39676aa7620bfa5ce5543c88a95ae9e33e5baa4cb609981942ec2595809cf1a62ded23953e3c281c3aa29ba4f6657
 DIST XML-Grove-0.46alpha.tar.gz 27336 BLAKE2B 414c9517a8f95b4a9ad94457eb1a674372ec11327e3f2aed950ba1ad9ef28d298fd6bbfb02754e27727286edd891b8588d0849d84703e038a2684b0d9ddd4876 SHA512 c49f9714721a2291d417849a2f9c6b994f856dc333393954b64f0bd0015c6a9bef8ebfa6bc360f001f496c57f60b793d286e42da3b50c494561d4d4066005d75
 EBUILD XML-Grove-0.460.0_rc-r1.ebuild 501 BLAKE2B e14ed830cbdf5e81776b73b39da8396a2dae8d006e0dbe9caf03fbe4ffd460e043163b04437d2eba3e5e0cc1ad4c6ea5618c998254830c7b0abdc42221eaef4b SHA512 7cfffe9bded9e3c92d55287ed9030dbc8aded6fbbeb996a0af2bd431243a61427d14cf9813e1f621c3a807884301035299891cdfe1a9b065248177b0b46e7f40
-EBUILD XML-Grove-0.46_alpha-r2.ebuild 518 BLAKE2B 5c40d78861dba03062601368fccb196991c9dc4bc1a5e4f4806499158c5e17edbc7354ab87f1c9e0d815a265c05cc7932aa484e864bdef601ed9844e8d2379cf SHA512 1187d1ed4e937242b5f02348fa0172a01d23b1d1777c1a6b24c16b5514c69957c6aa1716cec709ed6c464e87ab81743bdcb960d7010cd165d6f3ca5cc197187b
+EBUILD XML-Grove-0.46_alpha-r2.ebuild 530 BLAKE2B 3c765a3eaf26dd401b9784c971f69bd7393d1ab0805876951d69b2067fd9a6ac17ca7a8681e81e8c8e896886b1600af70f40aa463fd9b15291cac254dc15781e SHA512 ff0258dad17ec3db1433ce56e292a2b99e2df1f0f0acd8e619f24420706fa98853652ccf4c2cd1d38f2f87a8294680c457ed82011a976acd908f8b53c9805c8f
 MISC metadata.xml 2058 BLAKE2B 8371a28e77498a8be526776ce17237632c961f00ac140cadba869ca15273a29173ecaa3db4e00383d91411bfba0576a1124249b09824a12fa8690982e05ce1f2 SHA512 82199c043a0444573fcf83f8ad2dbc037bedc6f177c3067b6a27f20aa73df516ff341a8a15735214cf2a34530b6f0f1ac5fcf087fce1eb868c439c20b51c4b39
diff --git a/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r2.ebuild b/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r2.ebuild
index e97859a3ab1b..c5ca1ed03445 100644
--- a/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r2.ebuild
+++ b/dev-perl/XML-Grove/XML-Grove-0.46_alpha-r2.ebuild
@@ -9,7 +9,7 @@ MY_P="${P/_/}"
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A Perl module providing a simple API to parsed XML instances"
-HOMEPAGE="http://cpan.org/modules/by-module/XML/${MY_P}.readme"
+HOMEPAGE="http://cpan.org/modules/by-module/XML/XML-Grove-0.46alpha.readme"
 SRC_URI="mirror://cpan/authors/id/K/KM/KMACLEOD/${MY_P}.tar.gz"
 
 LICENSE="Artistic"
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index 8fad60e476c6..21cadbf32f1e 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,5 +1,5 @@
 DIST Glib-1.326.tar.gz 297125 BLAKE2B ea49571a5c1c1d0a48a72914f52d3d2bcf9bc4e0d59c2759497f7a069e091d20365f443cdc6de72ec349a82723f938a9cea4a06f5f7c8d531394220401dd8df1 SHA512 28f4f6d544389b7bedd5ccfce17659759e0996cdfea4f73e140de336b6395f5688bbb4707e3cf3e29b39f840eb8db9fc52dcbdaeb51154ae8fded2975ce9308d
 DIST Glib-1.3291.tar.gz 301944 BLAKE2B 75ecded774ec2654a464594693315003c9805efcb444c4b3cd1f495afffc011a294217c3f8e91c0870707a56b6a8fa1f04a694088b0ada939703fe7e73f8c312 SHA512 5c596e29c3e2ef72908668ddf1f260cf217b64d73732e90ef0fdef007f98b29efcd0620f01e0a39b5f2a0b368d4a05926543c9db0593bfa5a027e86af95fddba
-EBUILD glib-perl-1.326.0.ebuild 856 BLAKE2B 0539c7283284fd4c2f53aa7d6be67acbf872995ab5654ff25c06b962daadf78c48f8558f65d477a115bd1d753bb52ce67016d2c6c092954b6ff48cb60bd101d3 SHA512 1c36e7c586d53340116bad8af69d933c237d3a81f20ae29cb54a3153dbe0a342db4734176546894ac6ef88902a547a6dd3a796447a7fc0fe7f59b01362c9c0c9
-EBUILD glib-perl-1.329.100.ebuild 857 BLAKE2B 816eb32c4cff1a697ff5c1935090c36a28dafcc98bc8f9cbe98687514c59b51f9f8fe961e58714104c93b57bf4de561a294c39ddf99e727ace4ae433b89ea139 SHA512 96e203e95bb2d4194429d3ef10f2a1e688cda4d92c22820b1747e29bb7949fde1ae86026bb8f183870abcfa33e6042250985e745c3b928fdad91932a246952f4
+EBUILD glib-perl-1.326.0.ebuild 878 BLAKE2B e51f67373ddcf3adaa3f87fb7810bc673bbed39e7422a7e00ecd4b2767afcea5dc51cec7828b043a121800bb70dc2794d025780ea11268f12b282632a9cd9ac4 SHA512 0f940ed3a65ff992d633fc11de2433a8a57cdc7c0da904769e17981c3469c1aca0443d8119b4b072b725941a03e9b0f46d135403ad9c09dba2aa9f60ae95d7b5
+EBUILD glib-perl-1.329.100.ebuild 879 BLAKE2B bc50be1851b266a1649ce3e1eabc594d0787258e8f27fc889caaa8a1b356d71b51b4d21bf3a4bfd847e8d91a2b3cf3641cc1c33a0a26da21700fac2ba0c5e020 SHA512 8bafdeba400cb8d4a3ec24708b5a8ab933181f9735a6b45ff948cf76611a0ab4ada3162d13981cff8bcd586cc4e782a276127b661510c7ec84677a8c4663f19b
 MISC metadata.xml 1365 BLAKE2B 4d2fd978585574009f27a294d7b5129203884d61d4da4b7283a5ecdae0f16c625223f2db26b6ac210a38e6d1307dd64e912d9acb4d3b2038a4ac7611ae0be095 SHA512 0432b79471db1629a75a8d8cbdec17adf89388466e213f1525cb571504d97bb844edc5191c8695d8616d659e8f99619dd0357d86d00206ae345045feff3cad5e
diff --git a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
index 9868f61f2457..ec9048826388 100644
--- a/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.326.0.ebuild
@@ -9,7 +9,7 @@ DIST_VERSION=1.326
 inherit perl-module
 
 DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-perl/glib-perl/glib-perl-1.329.100.ebuild b/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
index c3fc6d537e34..900fa8f694f2 100644
--- a/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.329.100.ebuild
@@ -9,7 +9,7 @@ DIST_VERSION=1.3291
 inherit perl-module
 
 DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Glib"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-perl/gnome2-perl/Manifest b/dev-perl/gnome2-perl/Manifest
index 4dd3be55aa82..1cc18e94a9f5 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 699 BLAKE2B 6245afe3134da3b2b02d602cc899375424ea287b41a1f130423bf34bd8474e39beb457b0d35cf77dcd973c265b25b83059d1dcce4f3037427303b7628247e7d9 SHA512 f216d72057796855364077c741097d31820ddf67a3ce4337db9253d3e4cf6adfa160787f20f68eec9543aeaec38064b4059b988a69d0d6adeead5219d6f2983c
+EBUILD gnome2-perl-1.46.0.ebuild 723 BLAKE2B 733c2a2e3c295a6883c28ff851cc7dee2b94381f34c198e302d70f81e96ea999f12980c8a7dc22852c1380cf0340709a1fd01ec869fce4378fc55ad4cff18d9a SHA512 521adfc7ac495e7cd46a61f238e3214681db1abb03540647534ad9fc8b39c1d08ce87c5f0c3c806f1fdeaa2a4b8baefeaf6f6fbbfbec830ce790bf27f720ee45
 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 5e38cd37b7f3..27d7658a085c 100644
--- a/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
+++ b/dev-perl/gnome2-perl/gnome2-perl-1.46.0.ebuild
@@ -9,7 +9,7 @@ DIST_VERSION=1.046
 inherit perl-module
 
 DESCRIPTION="Perl interface to the 2.x series of the Gnome libraries"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-perl/gnome2-wnck/Manifest b/dev-perl/gnome2-wnck/Manifest
index 2fd83ca6d8bc..7ea18ec42209 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 560 BLAKE2B 36e0a16bab0026b66f4739bd08153e1b9b9ea9e0e9c754433ca819838b1009c059570adc4edad7adc26459cc8a6e19b77385805b244024fd9d64c10b10cedb5c SHA512 565d94c5d67c875fe4dbcd04700ab39f77f5cda89bd1abd547c02c95666c27205e50f9ec05756944e62a86673c9e769cc05725c3d8d9c2cee5ea3f56d0bb1ac1
-EBUILD gnome2-wnck-0.160.0-r2.ebuild 646 BLAKE2B 373cbc8f72acfbd3b1825f733b10f58d6b9d3ae44549e8edfbc58e95d1185c0e6ceb68fe5b9c5331ef99e2342e43d32fa3f20d42ab6fc4d6a3d37bce4ea0e6ce SHA512 c80bdd8f723f7c513fef6c770bc7d05e5262cdae615121c377cd5c81fa616cc0cebc0a4e4030128e30bebac274af2477af7dddb8f6ec123d7e3a747de281286f
+EBUILD gnome2-wnck-0.160.0-r1.ebuild 589 BLAKE2B 677845a2998bf2a2c3187572a58c6a6cd954d4dab05a690ce3c127b6c42ad157d90807427b5954703bfe7cbae09a9996a2f221f7425738f221fdf95afa961a84 SHA512 140cbd3dcfc4b33e5721f22ec57073a645c9b8a06bf06a3121e273ba22d615bf6f0ffb19182dbfad5898be444e0a69347a3a28b6f678c276f1605041ba3da130
+EBUILD gnome2-wnck-0.160.0-r2.ebuild 675 BLAKE2B 530c9e6ef9622875d4500a23a668fc377e246b4ddfac4e90781b2cc4e4aeeb85f0f65f9005ccf0e7aa672063aac19345ab2f2fa9918c3e8dbff63352cb5d4dd8 SHA512 87086474cdb8eef87b0ec63946cde6f7e659e8cb2626cd2a8bef9c4e43f0ff9cf8616de15180e513fde62f1cd1a1ad11693343e9f807025c6dce3c3ffab7007e
 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 7b100ffbf40c..a5691e46bd67 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
@@ -10,7 +10,7 @@ MODULE_VERSION=0.16
 inherit perl-module
 
 DESCRIPTION="Perl interface to the Window Navigator Construction Kit"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2-Wnck"
 
 LICENSE="LGPL-2.1"
 SLOT="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 1bad8aea6f51..cf939c1464fa 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
@@ -10,7 +10,7 @@ DIST_VERSION=0.16
 inherit perl-module virtualx
 
 DESCRIPTION="Perl interface to the Window Navigator Construction Kit"
-HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sourceforge.net/ https://metacpan.org/release/Gnome2-Wnck"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-perl/gtk2-ex-formfactory/Manifest b/dev-perl/gtk2-ex-formfactory/Manifest
index 36848ed7376b..b0c0a0a137fc 100644
--- a/dev-perl/gtk2-ex-formfactory/Manifest
+++ b/dev-perl/gtk2-ex-formfactory/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk2-Ex-FormFactory-0.67.tar.gz 104401 BLAKE2B 98082c17db7fc5c93cb1d39c4170cd0cedfadacc43b838fd7ae735632d4384ef3d661e42d16daa0fd84f28154678caa2c5f8c71fd7f0f3a03752cbab13a9985d SHA512 ad3a0da15b2d4c5dbaa2e810342e03a0d9d10d4a71769b65dfbd9150705dadd1e2887cb0dd40940c946f3cc2da83cc1d394adc8c76c9337783145e1aa381716b
-EBUILD gtk2-ex-formfactory-0.670.0-r1.ebuild 452 BLAKE2B 8c08148dbb8e8b597ebf738431904dd5a16caf508016826380f5b2b6a3f6d26b817dca10e596d25de7e39276c17eac1e1153203858e53c8e17b014a70d7860d0 SHA512 99e18a8dd65428f2cc7f6cb0fd0d1dddc7327945ebd5b047039bcd0022da369d629563182e1b1e5083d37b29520a838dd9b26c15f1d6914224efe11eb0c57c96
+EBUILD gtk2-ex-formfactory-0.670.0-r1.ebuild 489 BLAKE2B 09cc0337d63e827f9c9bfa2bdc6b468f36b1948d60822a46de5e4c2843761d569a4dea6a18d16617494d5af97199799ee3aa72384db4a917a430e7ccbe1d0bdd SHA512 8fcf3a416869183c5cc2d8becb10a9bdb737c7ec04cdc91a81b519196b390083ce1154bcd320658b5a8496f3616e785985e0a6b767bd50da719006fb0d897caf
 MISC metadata.xml 3782 BLAKE2B 10ef6917ac48dc23675467ed8bb8d3e87b5ba02ff988c4c6bdf9fc0f1fe380067937e2c52994649ecba3736954a00bf6e0e162618f3ed6043121ec3442b6f605 SHA512 9a4527f4c40b3c9e2721c921a189fd78cb29382cc91ccca8bdeedf0d8c8352efdb225f8e997838e3ee1d81b7c652e611b76bbefd0913d9aee4500a3047bed59c
diff --git a/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r1.ebuild b/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r1.ebuild
index 90e0d404d4ea..c05437de9917 100644
--- a/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r1.ebuild
+++ b/dev-perl/gtk2-ex-formfactory/gtk2-ex-formfactory-0.670.0-r1.ebuild
@@ -9,7 +9,7 @@ MY_PN=Gtk2-Ex-FormFactory
 inherit perl-module
 
 DESCRIPTION="Gtk2 FormFactory"
-HOMEPAGE="https://www.exit1.org/Gtk2-Ex-FormFactory/ ${HOMEPAGE}"
+HOMEPAGE="https://www.exit1.org/Gtk2-Ex-FormFactory/ https://metacpan.org/release/Gtk2-Ex-FormFactory"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )" #LGPL-2.1+
 SLOT="0"
diff --git a/dev-perl/gtk2-gladexml/Manifest b/dev-perl/gtk2-gladexml/Manifest
index 7969d01f2793..db37c4cbfdcc 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 568 BLAKE2B d52ee5aab1608716bc50b95a8d8c7f202594a1c7636172256ae7110ff8af5775df30b141b381941c4e5a8ef2ddd87671fe67f5ffdc341025db31e935cd148e3f SHA512 684fe59e454e6a971b182b2286ee4f3390519ac5bd812da66ac76b046e7facda0089d890968fb160ad3baf0b112fffc2fadf51b7d12d2c09f1c09c1fb800e8bd
-EBUILD gtk2-gladexml-1.7.0-r2.ebuild 650 BLAKE2B c642d0b4f31e82cd790b555cc400e1dde9aa4cafc0971fd66d7cddb991ca5c2c9ff45d7bbbd4627b1977c1f0b715e289be1b73d555761f7fbc9f27c2768673bb SHA512 509425239868c0ef7b9f55212438c49959d57b8597588c81b5ce86239e8ba9c8006693f8159e0c325362677bdb7fac2105e0a69d97522e088698fed1bb81b678
+EBUILD gtk2-gladexml-1.7.0-r1.ebuild 599 BLAKE2B 714c11ff436228cd37c26762dd6d0a40ebd578bdf87926497dfb8610ac4a74a38769edac15aa2d8cf94acdb545e6c2b54b3463a90330c8217d8c932442c826c6 SHA512 fe1b09a857565b04f98241f401e170e425708d0114d0eae154a9654eee739d744e0e1545c94f82865246a40da6f1007241312e9ac6533aca5714a8f95771e97b
+EBUILD gtk2-gladexml-1.7.0-r2.ebuild 681 BLAKE2B a00e626914e4e6937fc1b2f1c9ca694f37737e9d5fae01b8b04c4d9e06d336f72804d1f856d94b8d4c8923c0b3ec31449e7164f98b504343487cfc8c5ef94457 SHA512 c647428cb22630b539412995d98de46c8842a85e829098cacf61106a5cb7d68c048c95d2c63a280ecbddb0567ee35cc8da78dfc9d98606d0e052047757f16005
 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 16b4717590dd..de46a8338460 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
@@ -9,7 +9,7 @@ MODULE_VERSION=1.007
 inherit perl-module
 
 DESCRIPTION="Create user interfaces directly from Glade XML files"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-GladeXML"
 
 SLOT="0"
 LICENSE="LGPL-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 38d0097fbf6d..66525ac72a4a 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
@@ -10,7 +10,7 @@ DIST_EXAMPLES=("examples/*")
 inherit perl-module virtualx
 
 DESCRIPTION="Create user interfaces directly from Glade XML files"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-GladeXML"
 
 SLOT="0"
 LICENSE="LGPL-2"
diff --git a/dev-perl/gtk2-spell/Manifest b/dev-perl/gtk2-spell/Manifest
index a32a0caa7192..44b60ac221d1 100644
--- a/dev-perl/gtk2-spell/Manifest
+++ b/dev-perl/gtk2-spell/Manifest
@@ -1,4 +1,4 @@
 DIST Gtk2-Spell-1.04.tar.gz 17512 BLAKE2B bcbebd399609c289f04b76d466a1414ba0cf3d654dced50799b4300853a73556e4a0c2d7cb769bcd3084ba00e850c494b0ba8f345ad558e443a1808023b93008 SHA512 b0f71158e56efe561e9999066e896c92b90e9b046e6193fe0b96b4b8fbd4d10d9fc906b9313b4c5c5fbc93cdd33b710eea3170a9677bcdea46fa22032d19b960
-EBUILD gtk2-spell-1.40.0-r1.ebuild 598 BLAKE2B eeb4e1193ce7156ad95832af711ea18168c2b0b4a087c147a57f6eae34c2ea82eb7c0d84d1f5c555bce59f0f4defa24f6d68d29e1535bca99019d36bc4dba440 SHA512 3b8d23c6fa2e470f1c72b8b0c5981e9d27d79273bede31a66bd3b99a5d71f0f839a880d9af9ff198fe889e47b63bd6825e0b822e876b0c8534e19c1a4cfa6c3a
-EBUILD gtk2-spell-1.40.0-r2.ebuild 647 BLAKE2B 48a3c0441f94b85aa2c5f8e1857511a025028669f4a19aff52f592a90ef3c386e7b5bc322b70ebb2ba6043a6c98219ad3fe29dc0d367f6773bc2adeacfebf5fb SHA512 ac1a2dcafa9eeff650a1ebd6d01f516de18388a5f597e15fb35520b72d108d9af19e794b9aaaaa5842e7ab958e9905de85e57d9b173eab781e45e6e9c5ebd6d1
+EBUILD gtk2-spell-1.40.0-r1.ebuild 624 BLAKE2B b68a92b3b6619a4d85949e8e6fe8dae749888595a8ad88d25e91c64f419044149ccee52bfd4372dc6a86fcef8d44f86ce6719c70db40da182d63be00a6e917ca SHA512 29ab42ed16ca3690769a734590d0a91a2cdcede4478003cd70d227daf18cf4681587781c6a9cff8d24e7e561992c38762b229f05ca44fd76fc4168dbb1ee0fb9
+EBUILD gtk2-spell-1.40.0-r2.ebuild 676 BLAKE2B 36c911ed9f0ebab6623764cd48994320507401db4740fcea4477da91e38c9653aabb75ac549ab48da56634302945f647a438560c2a12c3730228a821b41da558 SHA512 2c932f717ba99050d654dbfe476a2a5dec0bf1db1b44e881e0e11f2f050d0a619592e27e7d9359c8d5f5158fb41824a016da9ef22822e60dae3cc8842fcff5ea
 MISC metadata.xml 392 BLAKE2B 34246fcc86a79ef40a96f50dba81e6a56883237b89ca80b2399eb726b80abe5fbcb045a4099955424e49adaa78708c14750e3f1527689e83f5b351b3fab4a40a SHA512 7998a8bc4adf67707626dcd9a388c12da013c787b2856c69a3178bd0472778b4cccb4d5df1d23d85413931feddc43b21febc6746d1e59abf84a8e19aed5d22b5
diff --git a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r1.ebuild b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r1.ebuild
index 404dd8f31d7f..221029075545 100644
--- a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r1.ebuild
+++ b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,11 +9,11 @@ MODULE_VERSION=1.04
 inherit perl-module
 
 DESCRIPTION="Bindings for GtkSpell with Gtk2.x"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-Spell"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
index 6c89f664b3b7..f22825e510af 100644
--- a/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
+++ b/dev-perl/gtk2-spell/gtk2-spell-1.40.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,11 +9,11 @@ DIST_VERSION=1.04
 inherit perl-module virtualx
 
 DESCRIPTION="Bindings for GtkSpell with Gtk2.x"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-Spell"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/gtk2-trayicon/Manifest b/dev-perl/gtk2-trayicon/Manifest
index 549fd48ed7b8..2cc237d70bf4 100644
--- a/dev-perl/gtk2-trayicon/Manifest
+++ b/dev-perl/gtk2-trayicon/Manifest
@@ -1,3 +1,3 @@
 DIST Gtk2-TrayIcon-0.06.tar.gz 9576 BLAKE2B 77f4af73593747b22e53f6052ca55f75bcbd88e470c11d9f489db3e6c9fc2f7553d54aea8f66d0e7ce1b0217c9fab9cbe100f75e48b189b68380a0866169e136 SHA512 a74e6e3fa974d11e1bd9b07cb3ce4547d9239cfee6b46e1fb07a2b57c673154802a1f784f5f5f5b0c50baa357320483f6afadec222683e7e08d49ab0f11557e5
-EBUILD gtk2-trayicon-0.60.0-r2.ebuild 669 BLAKE2B a6fafe06643238863b50899ba084f670507893fcce4635c62dd07e14883774cfe6c5afbc65514b1fdb7d07ee43fb62c2369e374c2e059c391bfa4bb24c1a3af6 SHA512 150e9e3a7cdc3f0d088a873712c16c502afab41555c9ba7313e01f4cb25f84561699eaaba3b81d08b34799092e1de2ac44321f3ab7c1865c426d604c3919126e
+EBUILD gtk2-trayicon-0.60.0-r2.ebuild 700 BLAKE2B 8e4cbaa6783c9c7f8965c0ae511a7397f6ce2d4715056d63bf545aedce61e2cd81c775d4f3426cedeeb436eeea20fddd7e40fca742bc88e98fbf010f7eb3bda1 SHA512 5408195dc766c816406b72dec13ea5ef5515477e05f8dad3cee956cfe4f4839123a1e4503705b8ddb12edb634e49af20dd46fcc87259db6aac83c9b3c5b65b8c
 MISC metadata.xml 398 BLAKE2B bff448a817b5333055752c0b7b3fdc6c23355cdfd720246c12b6f274a8c10aefc921ff4ce53a44997ed30322b9fb086a420a8d583593fa8518796597c749ec4f SHA512 77ac08a1c26b6613467486fced5e3486687d7a65573ce15704cc5bbc04bdf102f3b2d15804c9e543aee5d753289093b1a05bf388a71919377f966562694f85f5
diff --git a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild
index 74b44e27157d..3090203ed644 100644
--- a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild
+++ b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r2.ebuild
@@ -10,7 +10,7 @@ DIST_EXAMPLES=("examples/*")
 inherit perl-module virtualx
 
 DESCRIPTION="Perl wrappers for the egg cup Gtk2::TrayIcon utilities"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayIcon"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-perl/gtk2-traymanager/Manifest b/dev-perl/gtk2-traymanager/Manifest
index 18599763c2d9..5732d8c97a2d 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 529 BLAKE2B 5c5b19391d7125a7933007755a6709c55e561d01b9a207df8ccfffa27759a6c483de2656025f87e3be5b57b98e6351896ed7661120d04f8afbfc0039f27f35ff SHA512 b0da1f33f12f004388cf228ed2d20455ca088c65db0687645e76bf38f83c8177a1bed93ebd4096b8f5c704a29d99fffdc3ae0651901e93283aa542ffb2de01a2
-EBUILD gtk2-traymanager-0.50.0-r2.ebuild 629 BLAKE2B dfcb755d48bce409c02cc36bb9ad057d43eaa22e65cc2d76d91a34b9f1fc093a6c73d4d19a59cbc377833c506672efc7612d014f91368a81153f696e0a19c9c8 SHA512 9240cdaedbc732fd7da143f8c2618100fab4415a72e2f3f576d921417d04e8b93f80c0ec5b34525a30a81be680d4d5b503d2d7f14564da06da834f997d485f77
+EBUILD gtk2-traymanager-0.50.0-r1.ebuild 563 BLAKE2B 008f177198189e2743d792cc3d445113fee6928edb09fcfce8fa69a0d2130163985da5a8488801e7fdeeead2cc92e00ee4f51920556e91941863eda1f2c84b8e SHA512 17fb92b6d8b7b78d0a80113002e8a1dacf26b5005dabaa27acc03fe45c21295e8469194a6619cf7f3181afafae626fa618b1a7e940f58d4c4c21b9cb9c34753f
+EBUILD gtk2-traymanager-0.50.0-r2.ebuild 663 BLAKE2B b3cf65fe271ee1575a27fe667473ed4b080997c8ffb7476663bb9c105b8b4614335c5100262150bb62c23fc69d3276a18fcd40041aff7355dc1d40b6fc82cfc6 SHA512 9113e4126dc9f8ca0a7c68fac538db97b42ac73cd76d44402751c76b0990d70249f4f79a8be72ed00413d810d3e5f29bf0d0417b986c770ce974dcbe8a2da7c6
 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 808eca3636be..a816563655a7 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
@@ -9,7 +9,7 @@ MODULE_VERSION=0.05
 inherit perl-module
 
 DESCRIPTION="Perl bindings for EggTrayManager"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayManager"
 
 SLOT="0"
 LICENSE="LGPL-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 7d8dc38456d6..564ceeaae09a 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
@@ -10,7 +10,7 @@ DIST_EXAMPLES=("examples/*")
 inherit perl-module virtualx
 
 DESCRIPTION="Perl bindings for EggTrayManager"
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
+HOMEPAGE="http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-TrayManager"
 
 SLOT="0"
 LICENSE="LGPL-2"
diff --git a/dev-perl/libintl-perl/Manifest b/dev-perl/libintl-perl/Manifest
index cb9b4e5a7e90..c8d06b326594 100644
--- a/dev-perl/libintl-perl/Manifest
+++ b/dev-perl/libintl-perl/Manifest
@@ -1,6 +1,6 @@
 AUX libintl-perl-1.280.0-sanity-2.patch 2085 BLAKE2B a36355f8cec583a6daac07ad9cb00f2eb7f319ead42b16337c67af9e03a6aa743f8f045529884db2c0604522823df2eaa415f0ee7460172266aa01a9074cee42 SHA512 ff855ac15c05f0410d544ddd422d684be3e77b3ddc75ebc74c83b32fdfb8ae290a0b62c60716185b5b8d595d8c2cb49cb3a22fa2f14bb1e7629323875a296896
 DIST libintl-perl-1.28.tar.gz 470898 BLAKE2B 6217a37f2176869dc945bd64a87a82710645153e3777fb5e4ddc674f179040d2268f326411a578314efafaa0edbd0e67aed99c4da86e20e811e1116d5cf2a86a SHA512 50f0836c1a84a22fcc8fca0fff2faeaae66774ec67b96c09a911c4969e8a610bbf20ba38167c13339b9ad9617e1fca07cb0cb1f12732f973b1cf618d502f59aa
 DIST libintl-perl-1.31.tar.gz 598187 BLAKE2B 6ce30e51cb001993d6ee3727c69010a3d8d9014334df8749704760734486e50296cdf019e185b463d4ccb3aac660526b440d4217aa5b304f749c5ecf43d18ca3 SHA512 9e22af95ecb8ae1c115114ce5d4f80bb8b1a83e4072d274a55f5946267ac29b98e9da4c01e05d0aa0051fef34a41b6297dbb44f51b8d602f3ef3786a59a6a04a
-EBUILD libintl-perl-1.280.0.ebuild 687 BLAKE2B 9c0cdff4c16a1272973d146c333ed0ce2f477fdcc8eaca5b52afa18576bd217b3d8f7c2598ea12c75118bfb6d7043e109ddc4b3ffa5f4348966bd1a2f8c103bd SHA512 0807f9d6981ee18c8af87ad16ce00f06cf0d8d702d7b710a8756b254859f008226cc92975178b4e3abc770aa05bd641c938afcadc2b5538c3070e3b74a76a348
-EBUILD libintl-perl-1.310.0.ebuild 820 BLAKE2B de4dec4c8d16044517290fcf8b82abafae26623aa6ddedef85860bb11de9e90ce284d8a0d3bda0ebabfe428962c4d47dd2148eed4807ce550f3b5f5bb5e376f3 SHA512 43d8546e113f17cdd91448b331f2695756fddade8bafe93539c052f28ee43e3553e1ab61710605e9fa32327da63d5ac7ff4bc84cb79c715ed8c962654303ecc8
+EBUILD libintl-perl-1.280.0.ebuild 717 BLAKE2B 578b4c6b0c230a55fb3e724fb9b858aac65e3f1340520cc6d053c8b631eab1ee0f81159485d4255a3ab21932d051fdf28a76c491bcd943db8de8bb8ffa1c814e SHA512 9ef2bc5e326e280f551b1cfe9392461d588666dc8f4d437625cc64d36a49da7e6a760924885ef124e032fe4b968d75ef331eacb98c71fb6708bc6296cf5b4b02
+EBUILD libintl-perl-1.310.0.ebuild 850 BLAKE2B 8e638d02ef0f91044529af77c8b89c7feb7190b6bf07614657d1f4bd2cae8377dee4a279f98c6200aabb7cbb1a8e66c26485e849826e8de59e265ed6f19aeca8 SHA512 bd97e47eb1f81725a7495c1779c67ae939ea98c48c30d6c974a69583442f93289d003208579c392c3de557f4bd23cb4c256b44728016c1c0bd1522d8201554c3
 MISC metadata.xml 11484 BLAKE2B 6d4b9ed8ddbab8219bf47d61bf1985895f7c78753943039e4ba178b01bb907a5216f0704f77e1c501d76e50401e5b3f4e7fd29e8a193bd65a3fc54c6e0e4029a SHA512 264a3f0d04a6eef4b8c730634af0de431798057d6a8fe9b802a999ff446ffbba53cc9fe2746f128002808a8e72f575387107784aff2c8707999c1c068bbc3b4d
diff --git a/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
index f9c207a85240..641a509b85e7 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.280.0.ebuild
@@ -8,7 +8,7 @@ DIST_VERSION=1.28
 inherit perl-module
 
 DESCRIPTION="High-Level Interface to Uniforum Message Translation"
-HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
+HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/release/libintl-perl"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
index 9406131c0a0c..e3fc31f49573 100644
--- a/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
+++ b/dev-perl/libintl-perl/libintl-perl-1.310.0.ebuild
@@ -9,7 +9,7 @@ DIST_EXAMPLES=("sample/*")
 inherit perl-module
 
 DESCRIPTION="High-Level Interface to Uniforum Message Translation"
-HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}"
+HOMEPAGE="http://guido-flohr.net/projects/libintl-perl https://metacpan.org/release/libintl-perl"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-perl/perl-headers/Manifest b/dev-perl/perl-headers/Manifest
index 9905cc54a8cc..830bc0e306b3 100644
--- a/dev-perl/perl-headers/Manifest
+++ b/dev-perl/perl-headers/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 1175 BLAKE2B e498f2e1d6412f8c0454081395fcdaf995b9f79e373ab3dae7ed3183622b2db8bc18ea46e29f07a55cae92b0a0c468a24065c66f350292cab1d7b7747a079e35 SHA512 572e519c4f8ff15865c9e42f1df6941ea5c20b86d75e9a5baf9ac5fe42e1e769c3a440c310170c9cdafcdd113d4eeb079e605c22be2bc46bae98d84b5c9caf0f
 DIST perl-headers-0.0.1.tar.gz 2141 BLAKE2B 48f32c486427c30d7eba06d103a9e72d19f817dfb2a55db6aca1e28670cf03d4180dbe6e5b3031133bd517045b827bb76d085dfd786a1263dc1773fdcabb210c SHA512 a9a44a957d863c6d99c0facb324a32e3fee55ec50e34481dbe37c09f6afe103b0cae234ca83d4d591a01d1e620d262b0e9beae53001db1fdde885f9a57234c7f
-EBUILD perl-headers-0.0.1.ebuild 904 BLAKE2B 8d373fd8edbc0b77f512f92084fe919ab38d1d7365eafc8cfa82149076a8e652d8276377d75ebc6c4d284e881862c4d8138ce57fad4ed954f945200a49443a98 SHA512 6859367a391a978500bd072f147d95791179e6ba11c37514d495cb25c5bb72dbf91479a6ea49e576ac5c58d76148bbfb2571bfb851e4c539a4f974e458b67064
+EBUILD perl-headers-0.0.1.ebuild 911 BLAKE2B d72b63ba73c5a8f7a038322da3e87bf3eb1e3394b0c821ea8fabe43f5729b9b187c32c351d8a03e1d7edbc9c14830a24ef827af9551b174fb8d8bd99eac16418 SHA512 917584229a9d7ed09d4630f3c0bb858860b29ef46cc67a29ee1be339842d83f15a7a389b1be9470b2a5f75534f976da8ed93de26fb620744142c1da00e215f96
 MISC metadata.xml 601 BLAKE2B 0eb5d014e3970d6ae5cee77db58ad7fbc924a034ffa71ba15b18507c2bc29122b3c54074494aff0cb6005506b339659d0bd851ecb7ba020d65af5442f43faef8 SHA512 377c7dcab7f0aea413af089c8a2da457c514122564c1b24ec41103f16bb9ec9b86600019bd839efd54ac20ca1785f898d6141f1dce3570b74af90bd2237dc33f
diff --git a/dev-perl/perl-headers/perl-headers-0.0.1.ebuild b/dev-perl/perl-headers/perl-headers-0.0.1.ebuild
index 0269d8e9421f..66c338729fbb 100644
--- a/dev-perl/perl-headers/perl-headers-0.0.1.ebuild
+++ b/dev-perl/perl-headers/perl-headers-0.0.1.ebuild
@@ -8,7 +8,7 @@ inherit perl-functions flag-o-matic readme.gentoo-r1
 MY_GITV="${PV}"
 
 DESCRIPTION="Generated .ph equivalents of system headers"
-HOMEPAGE="https://github.com/gentoo-perl/${PN}"
+HOMEPAGE="https://github.com/gentoo-perl/perl-headers"
 SRC_URI="https://github.com/gentoo-perl/${PN}/archive/${MY_GITV}.tar.gz -> ${PN}-${MY_GITV}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-1+ )"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index e28484f1e614..7662b5aba8ee 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Console_CommandLine/Manifest b/dev-php/PEAR-Console_CommandLine/Manifest
index 8b5de120d472..f7a5a8c48e7f 100644
--- a/dev-php/PEAR-Console_CommandLine/Manifest
+++ b/dev-php/PEAR-Console_CommandLine/Manifest
@@ -1,3 +1,3 @@
 DIST Console_CommandLine-1.2.2.tgz 40705 BLAKE2B 1cf2fd7ffdafe1b6e683d40e24c07bc12c9e41469e42595f40778f0bfef30457b32f80b966835a690724e29216348be0fb3f98a83947459d48f728896a5a056a SHA512 05dbde123d0d4fdbba2a959f4bea3b115e3629060a268d25a3007c2ee5a3530b8ebbd8c7d124a6c9d012cafa19f41690a888943a6c1e2e5ec1b9d83fa821d603
-EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1402 BLAKE2B 965117d89da7ed78a504e6ff3389fa5d91d2f676aa22858257092e02de2dcfbeda72f05e1da025cfc3a8426d07433daed2d8c4bd7c40ef9c4a9fda8b3781b7e8 SHA512 7e161c7bff80e92a97bb9f53fef821d3fc108243e15a2586ddef5aa5c0e39e366cab0a543c6b890b3dcee949bc65fd8c66abc6d7845cf53523bf52dfdd38cf95
+EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1413 BLAKE2B e16fa19f3a404a0d9f1e42dffebedf4ac216041e44958f55d250264d506e1c59dc148c7e178e593a2c0092707cd88fdaf722028bcafef0a4a45457770485eae1 SHA512 d61a8b30927e90accb9cd5ea990fb9ef3dc3671764ae8810319ac31584da0a9fbe02cb855a9f2681905f13b78ef8df2de400283d3485bb113247cbc1efd79e9e
 MISC metadata.xml 397 BLAKE2B ed50944409b7944c1da567241dab1e2e287b15e7a03c662c0642540b4fa1c50b6d048f6c7033b7fd1c598e5e2edc07bed8a758ec8f71e56e0c4a459f7efd9175 SHA512 ffb1a260b10acfd50fd5b3ee01d80b082f56e31c18c99232a28947a7b29d1ef1e529052b109573aebac05138982322f3a46cf6652f0e519222fb87ef730f5e84
diff --git a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
index 606b86b09a81..a0ecf007427a 100644
--- a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
+++ b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A full-featured command-line options and arguments parser"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Console_CommandLine"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/PEAR-Console_Getopt/Manifest b/dev-php/PEAR-Console_Getopt/Manifest
index 400f9e04c9f8..c5aaa4916bd7 100644
--- a/dev-php/PEAR-Console_Getopt/Manifest
+++ b/dev-php/PEAR-Console_Getopt/Manifest
@@ -1,5 +1,5 @@
 DIST Console_Getopt-1.4.1.tgz 5580 BLAKE2B 514d44cfd2bb7c8bcda49df2b6ba4dafc77184557f58f52c02c6a136e335639e65b7c10f5659dad9d7a87e946d60947121cb5f35a72b6d29fbb3efa3e535283b SHA512 cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd
 DIST Console_Getopt-1.4.3.tgz 5789 BLAKE2B 641432105696e93160fd6a3ade4ee8c1bd7780cc502668266485d8c747fc8ceb97ce70ebdab8f61a739a4bf8267bfc936f0c9fd51b408add680a2288d49e0412 SHA512 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8036ae530271e4e824fedb94e54d63266be8929f90f8df745b3ada7185dc98319b331f8dc5e9cac5445a0
-EBUILD PEAR-Console_Getopt-1.4.1-r1.ebuild 544 BLAKE2B 8fe5145e445cfd106dcb2398c7b1e75424ed11457eec58c770af1ac8390682df040c8ff4600afb4b0ad72c5c658cadb9357db4ec5f6295b9f2251e011571629e SHA512 b6e84a0ec014f99b93a0f63b3732b94f3e21f4808ed0738ca73236bfa329bdaee8ea90b3b15b198a023000dc3f5234d807033832f3e4794af54ae54a20d7196a
+EBUILD PEAR-Console_Getopt-1.4.1-r1.ebuild 550 BLAKE2B 712ded553ec864e5a9d7f00215a2b7d2a7737f7da8642fbade59f77660bfa64b08afc04ac62c82007aff2dfe08a8c517b39e7ffaea0985b194ff177e4f9e1f34 SHA512 8a1cbfae66684d9e430b846c19e2fa1418250bff3450d227f2d083b623eb338ea4b924887bec419a370b21bb53bd197d0594b5d6820f7e5619e9a09ae5f35b88
 EBUILD PEAR-Console_Getopt-1.4.3.ebuild 558 BLAKE2B 931a37c24860e88a9daad7b1040e6b7d484dab31822f82ca796de866567674242ea124a108f75b22859cb5f05b25e5b3227b7e1c7b609fccab49aa9bfb66dd0a SHA512 bd53d83da8f663a1842bca9fb762163437077052a36d0b89973f674d0c82aaf4154c170b951910650e81f9ae8f8e4aebd231942a11bae91ac49fad23dbba9541
 MISC metadata.xml 316 BLAKE2B 680f79e848a7196c2ab95b0be749c99b71dffeb3cfe501c57d8e6d84f0108e09e8e4e3d307e2db82ab7f65aeb4b3824bc801c29d7d0d8be14bb899c3557ccd65 SHA512 8103a2aac5f04ccca0accc1b5dcfc11ee2c59992ea7364e87cf1208fda18f58ac48c833413db682993464912087df6bae19419b153fdf335ea56a1ae406c5994
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
index 28d8f87ef159..3d8124cc3d8a 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Command-line option parser"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Console_Getopt"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 11d53f5f441c..da6ebf417b8b 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,6 +1,6 @@
 AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
 DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
-EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1168 BLAKE2B 9ca312b694631f32c9f86ebd6fb0236e7705e2cadaff7e3f289e722d9896e294c14651b7e1351dc3ebc87baeddbf7d1c222db7d010c9e93cd969afee6b341a6c SHA512 34dbb4558fdfe62be822bf85f66bc9e5db61dd7eaa61163a3653a89a17e67944e36c427274cf675727cde9063b0bf42d0eed752092311520217bb18228b1e04e
-EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1116 BLAKE2B 86de30ae2835a51e25e2c5e7cf29571aaa9a6805c39ac649b15fce531786e119ee7a0e81f035f470a2fdfb79f8eaf293187e4985d61392e41e7b53859c1d9388 SHA512 45f620f05bdf26f604834f723472ef724b7a029ad4366917ceba5fe5f749fa3adb6850e523885aa3e4553844c20c018f7bd896bcc3736d546c6b27ce819303db
+EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1169 BLAKE2B 2b22bfea5b56201eadba2e4f2892a3a8765bd512b59e411b4ffbdd232fd6c4ee62db28b83b5d7a0c51b11efd1e49e3f2c986324765a874c3dee3c66ee8b7e5c5 SHA512 4698698fdde0d00764144513f5333b1ac758d72a0a1a7ebc2910dabdf426e1d578a740da27169be21fb999b85531343443153da1837ded8d96e4366d529beeef
+EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1117 BLAKE2B 03e4e9d666677778bfff1689260aa083104759c9396c527aee68b0a7204587ee809657082100bd2babcbbdfd919a0bfc1c41af0a49b1cb935ffc4a7cdc4feb47 SHA512 e69ad6191ac8a37768cc8bb49cd4ede85af0d2d0606d38aa848f7b28d5678768ba4b9656ec8afe92e0660e00783819e87d5f7011c9200cafee5e379a0dcffb60
 MISC metadata.xml 490 BLAKE2B ae0122e23babc3353357016c47707d7a9ec6cf92d2a981c25eaebcc13713c676cd6c283b2810d6f337071651546085db6a4de56e6decd22275de90da88181f08 SHA512 21423e113024e94c04f245071ecc0a0308672387b92f42c7f57b0d716b0d681d2008fab84cec1bf0b0d37981d5548515e5f3997e76e288d9aafee678b5411ab9
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
index 0e3691e00519..f4b17aa20914 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
@@ -8,7 +8,7 @@ MY_PV="${PV/_/}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
index a3270a7d8bd5..be0e730b392b 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
@@ -8,7 +8,7 @@ MY_PV="${PV/_/}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
index c2ccdab70b5f..5487f732c83e 100644
--- a/dev-php/PEAR-Exception/Manifest
+++ b/dev-php/PEAR-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58
-EBUILD PEAR-Exception-1.0.0.ebuild 680 BLAKE2B e75e8891ec940c4f9db09a9df64b78f7692ec3610d885d4b4daf7ca5f3de878fd38a752973cc35e545bf638bd917be4a0a07975ef36e4e1e04e0c478a120ba98 SHA512 d54948cf80f39d109cc72cb3102bfd043ceec53d344cfe9f235fbf3851ee1ed751272a04a1c37a25a3d6c2e49e98a99d545c8cc9079dedfdd3811c7101c5b440
+EBUILD PEAR-Exception-1.0.0.ebuild 686 BLAKE2B ccb634f3d9e36b5e7ddae07650a16a5f2ef86a23111c6194999fdaa1948b9b3b241a100a38d2f3ffeeca5955fbfc5143eed7dbbddf2232c656c6ec06f83c0dd1 SHA512 2c97d448312d0710dd1026935969dcbc5f05bb38c5b1d3e8e29f79b2bfd33f0e8c69deba43b96d0a778930183d8b6150929c4e6328fdeaaac050b0b67d0c121a
 MISC metadata.xml 387 BLAKE2B 889a6e870f53bbaf7ea5d86dbddd30c85bbab181886d5eed8b8d05d4b744ed5b1152773a158f7ace3b3bf037d0dc6d5631d5e951a12f4c7a16d05a66156513ba SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index 17309af49608..5354988b5d97 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/-/_}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="The PEAR Exception base class"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PEAR_Exception"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-php/PEAR-File_Archive/Manifest b/dev-php/PEAR-File_Archive/Manifest
index 713a69ce7bf2..9c2b4961b341 100644
--- a/dev-php/PEAR-File_Archive/Manifest
+++ b/dev-php/PEAR-File_Archive/Manifest
@@ -1,3 +1,3 @@
 DIST File_Archive-1.5.5.tgz 62598 BLAKE2B 8aa82e244f01c2ae6b5761fd4db9eca0ef32dbdfcbf3ab107936eac5ff4d48f875312c691232ca2bf259f6701863c16c3b137488bf0f33960ae9fde80ce0b3b8 SHA512 528449e59e0853bbd73e2d7cb14cd11748e68abe889781f0476c6206e0d15e1c4b0b457172d88e73f7bb31cde3b6612ab3e86d8862322e0921e00db331f1d1e1
-EBUILD PEAR-File_Archive-1.5.5-r1.ebuild 680 BLAKE2B 330f4b921f258a38dd30ab20179df4961eda6783597060ce7f44c1a16302253853e12a72fecf958788a484af5aa478c0c06740c3399e4d5ecf8b049d1e04fedc SHA512 710e2f74cc69010182ddb82ff0332d5b7dd49f5db99da4eb2ccee02c32288177cff69c01d35dd29ebc8226e520a3b05c76cf96063bebbe75379f5e02c9549557
+EBUILD PEAR-File_Archive-1.5.5-r1.ebuild 684 BLAKE2B 72ea3b923eeaa2646ae7c301047c7dcb1936ba2cbc0170a46428bd5c2800547ea36943f046f617f66f1bc4a413ab32d4259970a78084a3a02f50674f352676a8 SHA512 5241cd9d69e5513f1c99970aaa0dcd8dcbcf18c30ea26985c56d416ed9514d7d16e85c909f32c8dea3750273a80e99b2300ea13ae67d3cecccd296d818e3aa94
 MISC metadata.xml 314 BLAKE2B f15134512e7946608f8fd7cad48ea26d03e1096163da6cf211b93cfb50b31f8ba83e2dbe3ff4e02a745466c808ad0cb74f6bc476843e6e549884cf2a7d6be00d SHA512 bf5f29569f76006e3ee0a8a0dd2fdd7ba95fc9152d74206dcc22af239a177066bcee480e2529b63ab1e7caf3cb755a2c0d33a7e8790127baad4597e55eec077f
diff --git a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild
index efd696159702..4a105a116a8e 100644
--- a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild
+++ b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Easily manipulate archives in PHP"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/File_Archive"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-File_Find/Manifest b/dev-php/PEAR-File_Find/Manifest
index 042001dc9b5d..9bcbb849d4f9 100644
--- a/dev-php/PEAR-File_Find/Manifest
+++ b/dev-php/PEAR-File_Find/Manifest
@@ -1,3 +1,3 @@
 DIST File_Find-1.3.3.tgz 8212 BLAKE2B be45210efcf1aad52df123dd141f1a8ea62321a25cb460da4384456baeff13b51f8850f44e08cb75baa350e7b2a1419b27d89dd5a81f58a7302ab93c95c274a3 SHA512 f912e1f680c5869380791979bd33dabce0e95e40a84ee188052b2be8280de806fd117c11d66b98b7072724ecd9d57203ee5a32fe35705c337e73393fec075bb0
-EBUILD PEAR-File_Find-1.3.3.ebuild 1178 BLAKE2B be731801f62bdb1aed824f0e253ec278c7b9b860dbe46ae07ab999565980f1a042a09a0e4e99eea42c27ac2e3733168a4d78a8cf5b4c5e14ccf189f55b985683 SHA512 9f7b403ae341a0b4fae7d8e46419f0fb103eae8897de5c890aeac7da06f836b7736163579708b34c1b47ac1b91fbceede420f54fca93e4867ac91c12e7d20f85
+EBUILD PEAR-File_Find-1.3.3.ebuild 1179 BLAKE2B 6e1c5e64915d386fc5e324895dbe05d161ba96bb99f6abcc4e850dd03c5849f86da906291bad015fbe905539837c31bb1c4d86dab27e26dcd9f83c25e831b7ff SHA512 91d231b8673769e1f6a0949bf0a7831b432bb539154bc3c2f53f4d81714fadfe46cd708adbc37c1d19fac91c394058b7f966bfb431301151e070265d75d617b8
 MISC metadata.xml 377 BLAKE2B d299154cdb99a5ff1562f245e5a24face117c08cb2bd9f457ee83d40bde667ed659c84e94465c1cbaeb6b2220c48738d261ed690aca9bc43fc83d127adcff872 SHA512 1d640be46e06957c8f3c127a9acac3f4f6b197efdcb96b13a5fff00aa638b3cb7febb5cba261ce45bb68c2356894006e3e57343fdf8bfbdb5d60e6a89f173a73
diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
index 72c3e1fd1f34..72bb7d8266f0 100644
--- a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
+++ b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A class that facillitates the search of filesystems"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/File_Find"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-HTML_AJAX/Manifest b/dev-php/PEAR-HTML_AJAX/Manifest
index a88d7e8a2498..e320ec80e9f1 100644
--- a/dev-php/PEAR-HTML_AJAX/Manifest
+++ b/dev-php/PEAR-HTML_AJAX/Manifest
@@ -1,3 +1,3 @@
 DIST HTML_AJAX-0.5.8.tgz 140357 BLAKE2B f1cab1cd49ff711267c76437eca6cb7f482118de186722003bb66354cae5b7df9a5ceae8e335ac3a018fd626c74637503d7f9f32a91dde58639b51cd7da6d869 SHA512 3a10f516c6fe16d98d31290bd29a80a10fa830429a529b0cf6d03009f56d56d906e786b3f304b1c94b98e96290057cc74f3373acdd352fcf74f9616962ff9ce8
-EBUILD PEAR-HTML_AJAX-0.5.8.ebuild 498 BLAKE2B e680c7b4890472301abe6f741201ac0c78ea9a5462166f7dcdaacb573a8486db02873b33bfaa76a00d2d664fe5e36d12e552a07759ac31191e593d2cf359cdbf SHA512 7c3e5bd7d1ed0c86c0292dfafe49712895efb80f27b53abd0fdb051ef9ca66588c2b942038458e494819678f88127a6a2b39288d6beeb049dacd674272faedf0
+EBUILD PEAR-HTML_AJAX-0.5.8.ebuild 499 BLAKE2B bcc84d150d6cb5e09aee99b918f0fa855c90921353e474fb82da3a31d81dd252772c449121789e97eae500e68974c6f771e6fcbaec188567fac7158b79ec1fad SHA512 7bf3f71cc13dd420ec35eebdf06a239a65ae81df95bdeabd3be3f1c085ec4bba731584b160241c780d4bd3a5eca504a59d70d79e7adf46a2952d15dacc8d2d5b
 MISC metadata.xml 311 BLAKE2B 17bfddef528b52802263c6e296322fb75c1ac2cd12b78c39f7282e5f51f19a97f81c926ef63f610f0b61cfbce14b9d8abbcc7bb80645a2ffbb8a5d9eaf08fa31 SHA512 a69d94c266770a2c34f27c1be4e91d67e61f0889923989b0364204004cb612b27e74fb5d4dec938052a451f11e9daafeb2a2f1c734dc527746fb36e3011158e8
diff --git a/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild b/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
index 73706122eb1e..f2f9dd38c320 100644
--- a/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
+++ b/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
@@ -9,7 +9,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-HOMEPAGE="https://pear.php.net/package/${MY_PN}/"
+HOMEPAGE="https://pear.php.net/package/HTML_AJAX/"
 SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-php/PEAR-Log/Manifest b/dev-php/PEAR-Log/Manifest
index efd01598eccd..a3f301884294 100644
--- a/dev-php/PEAR-Log/Manifest
+++ b/dev-php/PEAR-Log/Manifest
@@ -1,3 +1,3 @@
 DIST Log-1.13.1.tgz 46764 BLAKE2B dc0f4605ed801818ddf070ec3beb6818af1630d99bec721cd3f487e709f87bd4a1628a05854c48fe9775aab546bdce4618061ef37674aa9921f536deccc6a080 SHA512 246510b7dbff4dc9f9cdd951d76baf2dd377e30ffde6d38cadac10091dcb92f8095406edb6d8a87ebe2330d514ce99f355f84ebfe57cd8a3f3babc316995148a
-EBUILD PEAR-Log-1.13.1.ebuild 1356 BLAKE2B 439bc3f7ca684187bf964ee78ddb2dbe727758301aee48b8b05375399a1b592742ac4cd8563c588481c03c144836569486959a5a68c778c93eeafaedb11345c2 SHA512 08833ee26e03b0979eb30602bb7ed91cbee93707d6f35ab407fdb48f5ed5cfadb6f1d936866abe67a4c337805da3f93404547fa8fcd3bd226abf8befd49287f2
+EBUILD PEAR-Log-1.13.1.ebuild 1351 BLAKE2B 7bc89844ef5233dbad83f3f5cd2b4423b555192a35919d89452fef4b00a83573bf4dc47560721d052bde7e8d1ed80aa0056c58a941aca956079602c36f1a1808 SHA512 9f343bed916bf8f04022791adac92450891f6963db33144875446d0d5d68fca905dffee519d35948a1c9b29c219ef908a06389d05fe54c8d3ca513a0c5271369
 MISC metadata.xml 305 BLAKE2B 9ae588d4fa3e555b0362d0f9ba19dd3bfd459f1788fb047852f22cde3d2688e3807d4ad87247b9dd8759450af1c1ce55192b2e551a8337abd08fbc771f32cd36 SHA512 8540d045359dc2f4ed04bde79616f2ebe923a0d3a6e401788a37e3bfd973a9db33662f5c01326e0fe0198246dad290d8d3ec3d841394071c215f70a8ad4abf71
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
index 911e6d7b7879..e0c2693cc69a 100644
--- a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="The Log framework provides an abstracted logging system"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Log"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/PEAR-Math_BigInteger/Manifest b/dev-php/PEAR-Math_BigInteger/Manifest
index 375132ca4a90..69db82359a4f 100644
--- a/dev-php/PEAR-Math_BigInteger/Manifest
+++ b/dev-php/PEAR-Math_BigInteger/Manifest
@@ -1,3 +1,3 @@
 DIST Math_BigInteger-1.0.3.tgz 28009 BLAKE2B 21bce67edff73b791322e364d15a1da2c57e9559aa4684b435fe6a8f17a14ce30b81d8ade0fc46d995a1c8f61843ec239ba1c09394adfa9cf77ccf448ecf3d72 SHA512 c8d6d638a6093b39e0f95e55d4d7488ddda1ad512504a97ce62a78ffae969b0d90925d6252b26230e5664f84b0a6b70fb456a678fbb291ca1a068cc7c539f415
-EBUILD PEAR-Math_BigInteger-1.0.3-r1.ebuild 629 BLAKE2B da7fa37bbe4a33b088ade9254c217be490374e5fb3211f3a2f9522586f3bde90398fc8d69ad58d3a41557bb7b349c9d478779ad8b3b298c82d43a32999ba6fbd SHA512 e1201866ea68f083f60ced7eaaaf202ce77066989117cc29727c32b6c29730c0d7356271fea081f8533f70ed346125253515421790210f3198d685a748882e0d
+EBUILD PEAR-Math_BigInteger-1.0.3-r1.ebuild 638 BLAKE2B 752c6f4295d78ea67f4c6395f831b8ad2a0d6a7d2ff22494ff953c8226bc22a216f4585fa0c378f7ff81cb8f012f20b5cd551c1e13833e54322ec61d4ec54093 SHA512 3767f9a8b3fcaba46b362cd2dd5e98b0a41feb3e33f53e3b4d9b1c4a4c9656683a35058a2d7f4bb4da9211ba71a6a36d104814cbddc398e19eb17411509b0497
 MISC metadata.xml 383 BLAKE2B fe5d5ba08fd329fb70f87a71af8c7e496a439c956de7222679c06a910c9bcf853cf454d65f5b560f378b7236e2e9e4365006e03256fcd7af69e39040e9155ee4 SHA512 b6c4d19556a70c765b60a6c9c8ef2389fab9ae7a07f9d6d4ad032e1c87b87396de7428a6e4b4f4980c8423ec12db9febfc487a32b5239a3ac948569e2aca451d
diff --git a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
index 5d2996f4a41a..dca5bd5d1768 100644
--- a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
@@ -7,7 +7,8 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Pure-PHP arbitrary precision integer arithmetic library"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}
+HOMEPAGE="
+	https://pear.php.net/package/Math_BigInteger
 	http://phpseclib.sourceforge.net/documentation/math.html"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
diff --git a/dev-php/PEAR-Net_DNSBL/Manifest b/dev-php/PEAR-Net_DNSBL/Manifest
index 81567b0dbdef..8d0fccc832cd 100644
--- a/dev-php/PEAR-Net_DNSBL/Manifest
+++ b/dev-php/PEAR-Net_DNSBL/Manifest
@@ -1,3 +1,3 @@
 DIST Net_DNSBL-1.3.7.tgz 8125 BLAKE2B 635258a5062ff0a7346b289f9cf429103690d71485417c948d7007e4b344dbadb25097d9f0c8731cb7eb5e72b3d7be561c7d872490d859a2328bb97f9a75350d SHA512 6591b81e5e4b98092daea3e27993099028581052a7907b79b4231d549b4d9aaa6fddbd53fd8bfe9734ae41fc85c46f2fc17e5ce50e8303fa5c166dd4b3062ea0
-EBUILD PEAR-Net_DNSBL-1.3.7-r1.ebuild 702 BLAKE2B 5eb321659d3211d1da8a337e9bd3476582480d3fec6ab932d6a61df59fa66c124d8e7cde1af02b9dfa47e3be4badc419cc39050f6c9802f11d5f22ae8f390fa8 SHA512 caced57ac9dc6007a089e55194d3b2b8ae97f93f6ad3197fbb2699d88d6d6169e5d720d426bd561f2d08cfc850c6e65efc0f6d4cd8008bc6dd508626b6cfd595
+EBUILD PEAR-Net_DNSBL-1.3.7-r1.ebuild 703 BLAKE2B 40b64215338763d925e173740467883779c51665e1f35cdf9d04a97bbc160942e516e5242bb103f30832b6766e3b5f4d7f9ec338edadbb0978e5787bae7a74b9 SHA512 58eb37fe86b6709b9329ece6a9c09567265d651ba9c68a0852eba7385a6ecce362ade38f0d4853f8ab65a2fa5170db92a1f57d5d291370ad0f3d8c124227c00d
 MISC metadata.xml 377 BLAKE2B 27b6b2942faca1e2e82de44f5ad600bc3adf30660a0426187bcb9f5b626b19d4695cf847004f20f064461e59ac0e8272020c6c7a9a965a0873cb53c3a5976ec2 SHA512 6aa25d965c699af2196695de28f817426190fa58e7f19285e5130b538e1f650f526179c75f9a6b9b478a2099e400d42fcbe04e90ac987e9fa9bf5670dac0dafe
diff --git a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
index 0e7b237afb3e..684da6b3d19f 100644
--- a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
+++ b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PHP library to query DNS blacklists"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_DNSBL"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-Net_LDAP2/Manifest b/dev-php/PEAR-Net_LDAP2/Manifest
index dee0f155e9d3..520f0156c5f2 100644
--- a/dev-php/PEAR-Net_LDAP2/Manifest
+++ b/dev-php/PEAR-Net_LDAP2/Manifest
@@ -1,3 +1,3 @@
 DIST Net_LDAP2-2.2.0.tgz 97180 BLAKE2B d2af13f0723f0fe998ef6a1fdd83e664ff5dd16c04d793c4a0b9f233449f82cd16c3156b0f2fb47f26d693d423c9bf0f6fead695b898e89a9e16cae932cd5718 SHA512 9f2f80c31f8b05c032c3bf088e66de942a01eb8ad94037ac5a65d6c526e22ffd4efac053e07f85dcd2b729727cd0755339f8ed76aa5e77997488f27ce59637ca
-EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 747 BLAKE2B 8ba9a49d48d2c432324bac69b5f1f86432dff9056fdc173e261ea1777aa2f6118c68f3e12c4860bc19692f1fdedf87e283d1faf88113d0006d0c689fbdddcdc7 SHA512 ea88f7e17fa742ce7770c960eeb3c1d277ab257ae65bc837d124b4ac03d6613411cea82606ae5481db2c394bcd1f860e007ab02753aeda476cd08503d70158a9
+EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 748 BLAKE2B 8113cb7d687c71b49d9bcbc2eba9b155333d0586c5166cf528064acd9614172984ed290ac11ea7add83b095cf398c882f3eeb5cf89729e2358baed93a18c0226 SHA512 de0adf17f01ad280e87a9ba5841a3a703598879a11f5e0196a80fc2b5a60fd1afd934443b15b6e36b168cb781412a5ca02b1f9d289c993b9437677c70959e9d1
 MISC metadata.xml 311 BLAKE2B 62823d5e3195d3f703c214d2250a37832c982904772148388dc89751b3b7d6776e2253819738eeec24a550aaa00092ff91d78e6e1f5ee1475104aabf8028a4c2 SHA512 a885b79978595cef0b7f647b110fa2f5687b72202cf87abd3bf1068b38be8a8cc5e2866c54809a0cee7dc1058f7e9990d102e4b4312a9de96a9f961fdffe831b
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
index 99f3e01fd091..0d3253852184 100644
--- a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/PEAR-/}"
 KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_LDAP2"
 SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-Net_Ping/Manifest b/dev-php/PEAR-Net_Ping/Manifest
index c9ffb33e4c20..00534523e4fa 100644
--- a/dev-php/PEAR-Net_Ping/Manifest
+++ b/dev-php/PEAR-Net_Ping/Manifest
@@ -1,3 +1,3 @@
 DIST Net_Ping-2.4.5.tgz 9600 BLAKE2B 5fcfe6cf9e96406734e5d728f5e714932bc7c9622a944e3aba81a11cd0da2d8ff5e7026f59fa1224baee70ca295b1d9236503d423c25f1570b28b7332405a03a SHA512 92faf073cae8b98f3dad52602f1030948549df313cf0e317928183ccd9127add521c35b657586e13d7826138b0358cd7ef99419fadfaa5cc34160df379c246d2
-EBUILD PEAR-Net_Ping-2.4.5-r2.ebuild 614 BLAKE2B 0425fd0f1fcb9dc6181db727b441d2872c19e50dd234123a90b42c56937e133366a885e86a62d57b4c1fb1eb067a405478394b77fb4a6d25bb1d3fb07216fa87 SHA512 fe8c576d4212facb0fd814bc1a05e0b0420806c7b1cbb11eefe2077b652ea23a4026b74302062c30d292988096b8a178befb26e9d26f884198adcf6ea2ebe088
+EBUILD PEAR-Net_Ping-2.4.5-r2.ebuild 614 BLAKE2B a76a11ca8ec3375db462ef8aa945b7cfbd47475ecd47044350b7ee1eac1a48e1f59e3d699dcdb8f9d7adfd78706d81e0677865c05fe8eb349591e29e5060fcea SHA512 7f9b91a81db6de036304f5d8b66968b720314b761314362ff52a2728b6a9942cac11f8436607de01815f1435e7e0b6b36caa27a2fcc86e59211e791b341a431b
 MISC metadata.xml 375 BLAKE2B ea74bb046763cf2db484a0c9ae02682614543552081af3b63a414730fb1dab47f0bf1e4215a9cc1bbdc74c562ecac66c92c9ec64b50317d6ebeffd4bd7cbcff6 SHA512 89f2a2093394ee1aaea0b6f2cae286624cd76606a6c9fe77936e0e776ff13b40b2c8f0b9b54488db9c3a5f2e201f9ebecc32632d942846580ba4ab54dd438026
diff --git a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
index 969c79b32834..f6232ecee83b 100644
--- a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
+++ b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="OS independent wrapper class for executing ping calls"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_Ping"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index 173bfd4c6a06..dea8d15ff4b9 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -2,8 +2,8 @@ DIST Net_SMTP-1.7.2.tgz 14795 BLAKE2B e7be5c595e5eb9cd98c0cb82899545b02399ce3aed
 DIST Net_SMTP-1.7.3.tgz 14855 BLAKE2B b6891196a6871adc3936c89507e3aef1f7d9af045acab09aba5f145a9d1e1da5cee2608873f7a42ebc1d00f99ec733823afe94e15c283245ed1bc035858d94a7 SHA512 b1c2be95c50151e91c2dcc7b9d98233504cc2389c01e4e42e752cba606355da616e570ca86042b68498aad63aaad14ea048b0a0e4e2baa802dc58c440eb60f15
 DIST Net_SMTP-1.8.1.tgz 14931 BLAKE2B 9194e46d1987e48f58c3b851bf6921b4308d39d17b7ca028a4a58a6583171dbe31020477cd7f808ac72ffae81f315e3b416cd5f52e898e0d12cc802af5dbcaa7 SHA512 ba3b68e35d95cc41ef33105402348a322e54c6335d819d1a6e1264f25bc30def4485d0da34901ca203ccd591aeddffbe75b5acb11fb7415a1a13668198aa9942
 DIST Net_SMTP-1.9.0.tgz 15135 BLAKE2B 9413daf3741a0dd50e19cff89f501c57f442fda38b69c8dad860ba257ff7333fa4f50e2530d86599d4f38c6e3dbc67d7a401fe8be3bf85266c76701038f63247 SHA512 fb28bbf07e54d71d1a82d59b137e4905c77b5600c10cf7760890ec708fc9e6df9d47715cf6808569f88603fac80c1cfdd7c4f3893efe7ac7aecaac47ba849ec2
-EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 690 BLAKE2B 45d05a57e10c7b581e8ab942a0d772f40e63f928a3c73bf44aca3cb4741ad318221ad387ce060e9e6f96e1aded31f0b045c9dfb0768fba382797c4e66a5ce282 SHA512 99c554f6217adc8764ac4438f3ac4c438ad6fb9179389d6c3e5a9efc46ffb066e2aa33ff837e40e453df0ba2ae5c44718678cc2bb2f9cb7119b988e9dde1ca02
-EBUILD PEAR-Net_SMTP-1.7.3.ebuild 698 BLAKE2B 6a13e703e725a6b416867570c87d157575068d8af96c7be12dbc05cc23ef1694622f61d9774bbda38d7415a6ce458c35b93440d2ac0930dd682d35176a44144a SHA512 705b787e8416b122b482e93cf0d0376f32805b0e45a7d33dd4dd771d65076de7a94e73ad8992921dbf7146d0c00460463b60f0b617d4c806c3173c5695833044
+EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 690 BLAKE2B c3ff0e083a8d67dab384bc847116cbaedc373513059078ff6605516ea0ee2188f2b04e8f3927bb8bec89cb0401c725cc8b3d2b78b9a2c54a40373efc7b310fcb SHA512 39427d1c22325a52ed1cc6d337679d31bf179ee27ea81af45a98cd705f501248dde264aa512146ae5aaa87b2dc2325c9f3a2b32f53a7a00d5a1657b9fc7b597b
+EBUILD PEAR-Net_SMTP-1.7.3.ebuild 698 BLAKE2B 078ca0842b9c11c42a934349a855ec59b62fca8d06fd7eee91d9bded61058267538b3af946eef4aeac40d0e9fbc232d173ea665077e5626a585cd4c9f4c88750 SHA512 95763b116ac20c924d0f220018329c6f4e48e3f7a66ba9482f6b7e76f3c0ad28ec94c00cd257dfdd955cb8d0aa4e588d4f4b4f289443f8bef24561036049a5cb
 EBUILD PEAR-Net_SMTP-1.8.1.ebuild 651 BLAKE2B 4e8b2711832596a23d04afce309194e5566def419c2a1448f55ab4b5f712269b29fc56ad02137bd9533b11b3beba963d98b5ab6fdf4740a98e36bc40a7e482a0 SHA512 95c25e4a90c9e1caee3582379ef2d50be17369589699739b843e9f0643eeddf3143fdba03bf7bc99be98e21fea1c7d326aaa64a35ba4dcb410c977979f6ef6e6
 EBUILD PEAR-Net_SMTP-1.9.0.ebuild 651 BLAKE2B 4e8b2711832596a23d04afce309194e5566def419c2a1448f55ab4b5f712269b29fc56ad02137bd9533b11b3beba963d98b5ab6fdf4740a98e36bc40a7e482a0 SHA512 95c25e4a90c9e1caee3582379ef2d50be17369589699739b843e9f0643eeddf3143fdba03bf7bc99be98e21fea1c7d326aaa64a35ba4dcb410c977979f6ef6e6
 MISC metadata.xml 488 BLAKE2B 599d14f0128115db0ec6ff80d664e286e1b28dc8b0dcd5d0a94c1f3229b3290af47beee88825567ec1aea4eddd799a21f178a05849658e2d0f6bf0a45ceec94c SHA512 4833cacc6321078ce7696ac7f456e1ed368300879b71a133eb81a804e985207f5baa10b8305dbfa716f08057b74bb374347f9211924ecd3fb7a1c44562eb8aac
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
index 03ce6050db04..090e3163215d 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A PHP implementation of the SMTP protocol"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_SMTP"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
index 65b32a4c7a3c..6985ebb6e8ea 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A PHP implementation of the SMTP protocol"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_SMTP"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest
index b04646f25a35..52de44d42729 100644
--- a/dev-php/PEAR-Net_Sieve/Manifest
+++ b/dev-php/PEAR-Net_Sieve/Manifest
@@ -1,5 +1,5 @@
 DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 BLAKE2B 24d385225fbf3c4bf5612927826ced468ccb5addeac9cd49c6fb617304fa77f4a44a11e3adf09173f65315d8a0755e44e93d0a7ae1c60f1a954849bee2380053 SHA512 672d2f6f4c3241f748fbdebd804f2186dd2a5f8b7be6a75cb9187ed16e61502e4a338bfaa1815190b74ab534cb7277b534b0542309098797fcb63582dc81bdbe
 DIST PEAR-Net_Sieve-1.5.4.tar.gz 16306 BLAKE2B 6ecd4ef669211b01089f29c48735b7259c392510f09df9aa0f1126fef8e3ebbf83803ab47bdd37c9b798a2add4c3d19e1a04960290a202070e17ee1f8041d02d SHA512 c981ba421946cc1eb1f2101cf25cbfbbcf56b74f92a8a257b19a8b43fb04ad2d8c9d93a2f44903589bb6014c53cc6ae96c44b1c31c389510439f1f2da57b3353
-EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 724 BLAKE2B 1d1752974dab13d24f024b21b0851da3135ea3381d245ab178fb1417ae9cca3658db389c4fe679b79bd0db92c905fcdad92f27a9460a40832b094318fc27dbe0 SHA512 efe747543e5a852a3e71d1921333a45a48f06617af7b8cfad5e5b40d048cd4e2b218cc1ce2c7b91621e04368585245f561b9ae48ca04fdddbc957b4d675fe4fb
-EBUILD PEAR-Net_Sieve-1.5.4.ebuild 732 BLAKE2B 7822cb1cf48cc664224999a6a23ea309f3c360c819a0e16a41902bed471b509ad32b058019ef503d5f356e87c2f733d4ab20cd92331c48738ba21b610b792bc8 SHA512 3853d1f1b0ed3d931af3c9e08cea48dcc9ca117be7c3a5644e4fe9fb1850a913043656d12ee3ce0022be948a16aa70f7f2505f795632cbe89e87bc4a10751d79
+EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 725 BLAKE2B 95a162e128603ecf68ddf248c5bafd3d2068996cadcc40e3017f3d7189dfa6c91e5074fc08b89975d0ce9e194788c88c363909123e25bfb8a3b7b0073db0cb85 SHA512 f0333dfa4d0b81ad22e8ae1a217b94275b6fcbb682579d2288dc525bbc2e1d966868404c8d4168eb6785408f60a6a71f9c8fb9f6b36b6126b62bb135eef8349b
+EBUILD PEAR-Net_Sieve-1.5.4.ebuild 733 BLAKE2B e777a38c6fcf4fa9ff17930fea56eff7a30e070ce74ebdee93a4c666ecfc7fd7ca163f85e4501d730c227d6698490ccd79d35dc950a298f97c8dc616c2d5f509 SHA512 91109772c6c5f1e7e5503b2b4241bb225b73ec93ae6ba9d3b95a9b955170bbc862dbf6392df1bf37d9227e940fb2c8832837d327eb3ad5e5638d881795d14001
 MISC metadata.xml 446 BLAKE2B e5028538816946cd2671d0130a50567e96988911a0b840675d09d2a831943a315b366c6d4271f7c6c67f2dda01b256cdf53f76b322fdaae8a79bdb29f3e63b61 SHA512 0b111b55018dbc43da39aa4a87691573f540b3866da616836aa04cc9ae19419b80ad5837cd8756386f153ebc8ee1d0886f12c81a3e56440654d91dc92fbd248d
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
index 55f2af80388d..b6c53ee23e68 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/PEAR-/}"
 
 DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
-HOMEPAGE="https://github.com/roundcube/${MY_PN}"
+HOMEPAGE="https://github.com/roundcube/Net_Sieve"
 SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
index f2967f670229..22a2d6512771 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/PEAR-/}"
 
 DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
-HOMEPAGE="https://github.com/roundcube/${MY_PN}"
+HOMEPAGE="https://github.com/roundcube/Net_Sieve"
 SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
index c614246dfd80..ec406413682d 100644
--- a/dev-php/PEAR-Net_SmartIRC/Manifest
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -2,7 +2,7 @@ DIST Net_SmartIRC-1.1.10.tar.gz 927009 BLAKE2B b410a0b4a02e60e27860f9c6b0ab8fecf
 DIST Net_SmartIRC-1.1.12.tgz 166039 BLAKE2B 43aec437de08d6e0dd651b810b21b5fed5587e2e7e154fe4f078cc618ee501c3d962b824931558458895541ddc9dc46ec3b1f0356aac5b052dd63b498018bb47 SHA512 2da5f0f9ea9167dfd1490fb6ba1e97416c78389924f390030ba71ea28dc5b667451223daa7e3878cbae607159054d656534ff646636f8f5294eb0bda1b17074c
 DIST Net_SmartIRC-1.1.13.tgz 166028 BLAKE2B 7e2b91dc01febe561c3ce55901f999f84f87fdbe20b5a1560a060125de4ae7d9869141cc0b2bcd9dfd0479a3a0a2d3c9d0f2719f70edc122df70f181d788f73b SHA512 d8f5a4f38b0aa830a84c9433deaf16b936f79e30bd9588cb0225ec20698af3d334fd1fdb320c64d1a72b0d206ae794b9e4135f1053855f586155694f6342cb0b
 DIST Net_SmartIRC-1.1.14.tgz 166115 BLAKE2B bacd23296dea25bc898ce3ba67d89949a3ad34675000bde9fe78371a7d97596272708f114b7980c3754cb862be68b84dcb0e8df10374cb560180d50c3bf61f49 SHA512 35cf0714a695e1b40e0db1f4d20c0ea4d431940e1e5894899db0bd13137e90c790067d266dc43f1ccc2921ad1f48cc70aa448225acac4358c8eb839f755717a0
-EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 773 BLAKE2B 3cb29104b9c3dce11c0edb32a9c7add2df62a9030dccb781e3de3d725e19b84e7dab423fa32312f1b0f44f9124af90f14b0085ba332c59bad554e9dc400c5d86 SHA512 26de4ff623c5cff5342f0b869d65c1b524f2d183ec18e0e263ba4b1209f01bb249756beb429030f1e8cd349db52786bcd44dcc77ae25a4617996288b4bfb9eb4
+EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 777 BLAKE2B 33e189106e3576cd67dcbbb3a82120209082e94688022e75896d851ed3649e853d27023fa75c4475e391541738958c514edfc45a282263db006794fe718ead0d SHA512 608a44c38f5a2bf0ae12a5479d13695dc8e7bd1a90d63af7a0b28b84c6713eaed7f6f3c5d8d5e87b65799fb906ca3c4dea7ad197a9a37085ad91867c802dcf3c
 EBUILD PEAR-Net_SmartIRC-1.1.12.ebuild 545 BLAKE2B 80991f66ddd016eacdbf1c1d1b9232bf15a507e04e4ca530f0a78d135187c1a944cb7cf57e88a4266e45a0c20c76b74b720ee733daf6562e5fc303c978e75c64 SHA512 aea02f3d6ac0e4fd6b8fa92730162e6fe07e1e6299d084f8260cead0b2e8b6d982644ed4d37cb8c8ceeb296bf118b88f8913005d81b8e972e060885aeb56d4fe
 EBUILD PEAR-Net_SmartIRC-1.1.13.ebuild 542 BLAKE2B 8ea1b954d63b2b9b79c19b5188933c28a64978bcf64e48427ff5d2d5c54b27d7ef134f30c0d04a87c3d002fa9aef40b8fce72310827c9e96600089d5707abbd5 SHA512 9e8bd3b6c852f93458b9704a28f5b0ee11d7d8eb5f08dc1ed708d1b943026f379cac37679e2446b8db06544f34c48589bc2a0b1a4f3c892b66cead0caab563b8
 EBUILD PEAR-Net_SmartIRC-1.1.14.ebuild 542 BLAKE2B b83893302467febf4d294444c9bdfe1c902aff437b199cb519228fbd74ec15f5c350f0e09c16390a7626129cf22fd384ab875b61129b6980b082556268bc6e0e SHA512 f9f78d8fd37608299b72cd9efa58e27a7095e5e6d57c81c272a641fbe040fc20a1ed40d4b63899ec4d51f10c90d38a9f6258b313e759e1a6d8d4e4ab665246f6
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
index 92adafc19fd1..b8fc04992e4c 100644
--- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Net_SmartIRC"
 # The PEAR tarball is missing some docs as of v1.10.0.
 SRC_URI="https://github.com/pear/${MY_PN}/archive/v${PV}.tar.gz
 	-> ${MY_P}.tar.gz"
diff --git a/dev-php/PEAR-Numbers_Words/Manifest b/dev-php/PEAR-Numbers_Words/Manifest
index 9f5cb711adb5..927373cfd45c 100644
--- a/dev-php/PEAR-Numbers_Words/Manifest
+++ b/dev-php/PEAR-Numbers_Words/Manifest
@@ -1,5 +1,5 @@
 DIST Numbers_Words-0.18.1.tgz 72925 BLAKE2B 2dd624fe4ede72c00f68f259c0271ca405e76bab6b43d85024cfa70b74e50e9ac5fbccd7e770c90ac4bcc5eabbdc33ccc9bc6b691e0da2b9a05ee5a141a0d8ac SHA512 b6063db873d65bc872ea64e6ae4282da9b36aa15ac336a5b443e4bc3cc7ad49538327bb56d0b70a482c82dfa1d732426f9cc45453d4d13a25a840871e1f6fb2c
 DIST Numbers_Words-0.18.2.tgz 73113 BLAKE2B e64fd1fcd8017b1768bc0e8918a79a91b83711433d0a29d36b145fdc07cee8cc3149a31d8e3739bd59ee57a821aafd8532fd8a54684da7e2395463662b733335 SHA512 cc719ea47e7da365959a02106d80aabe2ed079064128af1a61c0c53ed44726e7169de5c9d8dd28cbf917e025841e9aa07b4b8c9313a788b0a92eab32a4edb37c
-EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 719 BLAKE2B eb0a0ac8f4917da6a29e059dd98b7acc6a614a1e29eb1ceb349d3102db7f36661072faf4a4b311607f57f7b0ee782bced42092cff37e24744ee0b0e7ea2d3b68 SHA512 043c394f9c442935bbe3bd73f05028a4416ef1cc979e2cf3888178c542b267f8a262d6b995a5dc0bf90ab79039ae5ad8ba3f2213e10a2b62d49c73e6a95b57bf
+EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 724 BLAKE2B a78b6a7a1424bb4d936e3173fa9e683719ca3acc26fb7f0d97ffb71048f3046a8af26c8c3d9f5f32024ea32e1764e031241e12e0d8d5d4278be1eb578122524c SHA512 10f6ef9256dc8d46458c185f425a74a70d8facd3cd299172f76294b67151060e7e375bbe955af4a8a7f4310c3a2e6d504c4fc8f850524e495f4c2afc17ecdc62
 EBUILD PEAR-Numbers_Words-0.18.2.ebuild 549 BLAKE2B a0616c4038cb2ad5ddff43e904659e584667fdde486b1e8b278562a24f3bce80bd6eea7c064f210bedba129f9ece3c5850316b9dc73cdbc969ef51dbb1308653 SHA512 5376a071214ae52c4dc5575cf5dd917b37d7b117e802617370ba4b83258a93ce332938ae7abf3f61714d3edb996d3d557a40c1b0e5bdc9b7955b03aebaff434d
 MISC metadata.xml 385 BLAKE2B 96fd8d4dffa8bcda044ca563466bd32986e2ddfc984494a13eabcd71377c0a850ad4458f2c0c96870105e215d38295ddd32d640c0f8cba8a6566e78a2bfcc197 SHA512 05fafb5b7437fcffa392b1898b60bc7811dbc0ac3b8da7f0b7205c16a9292cbaad3e62ca59e999ebf9cba1e3d0fe0076203dceb68dcf1a2dc2af496403cf812e
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
index 845170dccb02..67a23271e0d9 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Provides methods for spelling numerals in words"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Numbers_Words"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 92b82e33950a..13ee9bab43bd 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -3,7 +3,7 @@ AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a7
 DIST PEAR-1.10.6.tgz 291529 BLAKE2B 7a75c89df2b34b368564e745a727292e5c5ee3a145995c15d338901b235664d0a783ca0efc9cd1d321cc2c496e88395db376ce7bbd6ccbf55d484d7f1021cd2b SHA512 ccd436a2cb9d30b434a78483432c51a8fa5b3e96e79ca3b28131b8dcd37bbae0b782efd762eb92dc40db24d3f61025c64ec5d29aed10fd80a6b28c224c4f1e2a
 DIST PEAR-1.10.7.tgz 291786 BLAKE2B 7e760c2782832fab2a35f86e2f9072058d622918cdc2b61b7066d2f17787488d228186948e96e602bb412b76b806004642e7ba83db00950a822996869dae9cd4 SHA512 ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f
 DIST PEAR-1.10.9.tgz 291931 BLAKE2B b9120d9b643be926e80aac33aafd0f22cacca11c10b857d99b6d51a7315467ad18d79246ab2752b962de92957fe14fc65e1d01570eb73b562b0e6e030dfb7162 SHA512 072d2eda510c05649f8d1481665bdd42efa060e6098b4b0d0353c95cf79d342ec601dd36dab3e6583b612582d2f03672a7b5de1518e3a0e8fd190ea698a17e60
-EBUILD PEAR-PEAR-1.10.6.ebuild 5891 BLAKE2B 5f8ca85d9bca855f1446d701cc0cf89b8eef1ab78ee68dcddcbeddcc4721e183a900625d3a3d3bb682f301783512a3fe0e61a06c7e96979eb1539aeb1b3ddc5b SHA512 22bfdcdb36a13e10cb9017ae268a7bb7da8de3880fe9027cc0ce8d6e767da92d35473968982e6544fa6687806231dfb05c85e4fccb0fbf269a967b8b348a5cca
-EBUILD PEAR-PEAR-1.10.7.ebuild 5902 BLAKE2B c45cc95e60e238792f35a7e2f386a8db263c2b7f0fd7308c6b797a43d35c9dec1eef0cba20910ec9b478af63f3d7c3a3a0d39af5f068caac1479120a345f1100 SHA512 ad0725538ffc010be17355a531b1880262e73f3236b91664fdc924338a011aa8a1382f5f82712921e89deb9365adaf4cac5a8b01f98119da092b938ebb5664af
-EBUILD PEAR-PEAR-1.10.9.ebuild 5902 BLAKE2B c45cc95e60e238792f35a7e2f386a8db263c2b7f0fd7308c6b797a43d35c9dec1eef0cba20910ec9b478af63f3d7c3a3a0d39af5f068caac1479120a345f1100 SHA512 ad0725538ffc010be17355a531b1880262e73f3236b91664fdc924338a011aa8a1382f5f82712921e89deb9365adaf4cac5a8b01f98119da092b938ebb5664af
+EBUILD PEAR-PEAR-1.10.6.ebuild 5887 BLAKE2B 33ff26e63f210ab28cb74b0d4b6bbdcf7121a9af0465a7485a98878b413f1aa4f388987ede7dac61d9ac167c043622af018bc50690df31773c80f80aaa9406c2 SHA512 9d530cc55675bd1af6896ae07614d49deff9fee654e3405a2e32b1830832edb3432e2eb3a5f1b96f8e8706ddc6d9c6dcaa2e56094330f57a71347b1ba1fb4425
+EBUILD PEAR-PEAR-1.10.7.ebuild 5898 BLAKE2B 203ec7fda2ffd59f0546fb402ad2b13a483b9f8234fecb02887e53394432edcaa1afd5c1a46a8b2ad6ddaf88c0cc826e1da9bcbc0785ba35a957a9892b39019e SHA512 6050b923df47c26c4fe4ee301caf0145a14563138e721f831ccfc35d33fe180467cb4253f23a081fd0ab5e7cb830c2a229fe5c6d6f5bf159fedfee8340964b6d
+EBUILD PEAR-PEAR-1.10.9.ebuild 5898 BLAKE2B 203ec7fda2ffd59f0546fb402ad2b13a483b9f8234fecb02887e53394432edcaa1afd5c1a46a8b2ad6ddaf88c0cc826e1da9bcbc0785ba35a957a9892b39019e SHA512 6050b923df47c26c4fe4ee301caf0145a14563138e721f831ccfc35d33fe180467cb4253f23a081fd0ab5e7cb830c2a229fe5c6d6f5bf159fedfee8340964b6d
 MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
index ac85f59deb70..79577a7da91b 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PEAR"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
 KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
index 8472eb060991..00e1ccd448bd 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PEAR"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
index 8472eb060991..00e1ccd448bd 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PEAR Base System"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PEAR"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
diff --git a/dev-php/PEAR-PHP_Beautifier/Manifest b/dev-php/PEAR-PHP_Beautifier/Manifest
index 6004d1abdab2..2c17780a6ed5 100644
--- a/dev-php/PEAR-PHP_Beautifier/Manifest
+++ b/dev-php/PEAR-PHP_Beautifier/Manifest
@@ -1,4 +1,4 @@
 AUX use_default_error_reporting.patch 1576 BLAKE2B 0e1deba63910c3466cae3751bba060f58033772eb8a8ee9d09aee2c8a073a2b40f089ed6cd75ca82d1005d27fcc30f5b7c0585fa73bad28be5eb172be45444e2 SHA512 f1e6c53c9dda6d15ea5609e07986d3ed8206152b554cdb2ad20c702128d8b3a9e757f3fcc2ef2c6e9ef7501ca169786301261bd6fb4bc57d946322853d20c2c8
 DIST PHP_Beautifier-0.1.15.tgz 74408 BLAKE2B 9d9a59175b404592d43b2539f47bb33807c23268408e88d570974633f17c3bbd2a05909c80ec966df73e7571a23462a93ec789da14fad80d0361b4a2dea43bf6 SHA512 1e2c7060295c6a13424339e7d45a5dfa9b02749baeb96f8efe55b4951243a3285ddffc815ad0432aec7a710646bdae33bd40abe723faf4ff35a50dad2258efd6
-EBUILD PEAR-PHP_Beautifier-0.1.15-r2.ebuild 1085 BLAKE2B d1fd81eeb7f9b29332e6b9d01060fcac9917a90ce90e05f49f801c2859faedb3fde938026c865743c196533530e29aa5089115800240e08feedd0ded98cc58f4 SHA512 fc4d5bab75b23ad206af562de4aa252f601d9f501cd31a82b1ec4a2cd06a2c7b26478c0f50986655b46172f249a96edb34762185a2e1cc694b8f87b99d5f5a43
+EBUILD PEAR-PHP_Beautifier-0.1.15-r2.ebuild 1091 BLAKE2B fc0199bd64ef9b744176f5ecf7943f3772b03a2c981481ab8326eb15cfc5cc08df203659c69162c6d35273b0428b52dc88c1ab397f41cac56050d76cae9fd770 SHA512 ab530966732210abe6f699ef4abe4e90acc5b7888daff91f7075c36b43a628611b353f4835e98723d344a448f3abbc8a55fc4f2f8d7f0b9560ecf66ec66456be
 MISC metadata.xml 557 BLAKE2B 46eae5572188b52c50c0336f27a6ac551db7f603a68f7747fb82ad77808017a2faf19f8f55d3a52622f76a5563042b69db9af99b2378746aac945176b02a50bd SHA512 da17e6471c97a0ed98107a29a6569ecc69c54c1bf984eab09a3402858a18a69d7471ae55571bea4c9b84fae96ef8bde166c94a4b587327d7d20249cd06653e8f
diff --git a/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
index a4dcf2208c5f..6e8a99713eab 100644
--- a/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
+++ b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Code Beautifier for PHP"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/PHP_Beautifier"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/Manifest b/dev-php/PEAR-Services_W3C_CSSValidator/Manifest
index b835bb0b2a6e..7e26403d8bfc 100644
--- a/dev-php/PEAR-Services_W3C_CSSValidator/Manifest
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/Manifest
@@ -1,3 +1,3 @@
 DIST Services_W3C_CSSValidator-0.2.3.tgz 10721 BLAKE2B 87f1bbce3337d678d8292976f8877ac98fa83487a15ae27ff693ac544754ae144b2a00bddc852d03092456e1b37080a56e09fe47bb48830b79fb4328dbbaa01c SHA512 4f9fb73ec57e374018b389f50918eaf87a63885f75b0ae2ead067e949a451ddbe40da8020672834e891106b5d470fbe451b3117233678b5f6f6a85f01d2a8aef
-EBUILD PEAR-Services_W3C_CSSValidator-0.2.3.ebuild 585 BLAKE2B 69e939cd866cd424cc0aee151a7898c5483b6aaebcb58e4c355c2741afa5374be05652c61bd4a388b237ea550c5f6b94f4ea59d12522d5c2fc4e3eb94d07b5a7 SHA512 3b68a25950c16bf05299fed3758990941eb8786e8c523bf5cfbe1b2e556aa2e6235b8cc392ada7d19409ee26a4e41beb007c1ed3e6b6805caecf8f09a0c07ce2
+EBUILD PEAR-Services_W3C_CSSValidator-0.2.3.ebuild 602 BLAKE2B 16a9ffc7a3ac34c0aacb890b4c7791cae1dc8ff264f8c30ea298d411bd6e7da89b7f34a02b15433a42ff007d1c63ce06b6505d1b5b298f0ae8a7d76f55834706 SHA512 56563142a858b2956ffcb62223cc5b92af0522a4de2f84878747873c31e014fa42259bdb59cb25a7c8f39e99466ffca50c32fb93d0e03839089295bf2d5a5d8c
 MISC metadata.xml 409 BLAKE2B 34baa9b9145f9fd1bfb5e09c92d72b3f59d4d5bfbd95207cb74a474e799f22504ff683ff95fde8aaa30253bffe6987b5cd744ef083a4caecef4abd67ca45759b SHA512 526ec73aa8b62aaa2bbccb161d4ab73915728fa482bf4bff05b0d31ec4c2c213527582e4e285a3511350d7a96fe8d7c229f425a6892d5340b4260fa239ff836a
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild b/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
index d50b612502eb..2a7d8020837c 100644
--- a/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Provides an object oriented interface for the W3 CSS Validator"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Services_W3C_CSSValidator"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-php/PEAR-Structures_Graph/Manifest b/dev-php/PEAR-Structures_Graph/Manifest
index a326a655f49a..eb2448851c9d 100644
--- a/dev-php/PEAR-Structures_Graph/Manifest
+++ b/dev-php/PEAR-Structures_Graph/Manifest
@@ -1,3 +1,3 @@
 DIST Structures_Graph-1.1.1.tgz 12402 BLAKE2B 049fc9a15b1ea46a8cb63576174b4b1cc491dd31794b8a1f9526958f6d54902069d16a7158615fc9708ba88bf46e0b021baa01596e443f8c6d9a7f551dac8b23 SHA512 cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284
-EBUILD PEAR-Structures_Graph-1.1.1-r1.ebuild 564 BLAKE2B 38108f2b6befb4568220db691e4c681760bbeae2d30da7868fe6c2ebb6135a9932d5df8308e9bd2e36de8a266e179edd7177acedfcf00b8ea659f4278ef047ac SHA512 7423b1987a2931c500f71c8510fff4e80a459c70a70c899d9bef1e03e6543753c072c3f5fd67767b253993553229ad8812ad8531eae914a358746e05a0ee9dd8
+EBUILD PEAR-Structures_Graph-1.1.1-r1.ebuild 572 BLAKE2B 92d3f1696bc882deb187979e3713b914614c6a65ec34d1d5bbe1ea132163408b7357b088c9b99893db418a46ee454a319d0a97db63aec6c8e3630b890aa06a4e SHA512 33872f3708a1d353b6c90b1b9ca9e16db83ac722f21030c34047b116e8280aa521af804d73ea6aa1035fdd32e11ec93cf6471b0be13cd371243e4f9822bcea64
 MISC metadata.xml 318 BLAKE2B 66ea3ce84886e04f579c77ced4528ce6a57e433031b6bf1254d5e56e950172fee80e90f164b34c9efeb9c3b5245be70241a8da2ecf3a1860be68b8cac963de52 SHA512 4681aaf5d12c2bd322389f2948669706bbc7c9e1221f0a4a5f06bb53565782fc8408856e986f73a2b41067eb1d8f1903c0b74a6ccc863fdc7f638b563071e927
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
index a9aac2347bc6..0f9b4ed8f276 100644
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Graph datastructure manipulation library"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Structures_Graph"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-System_Command/Manifest b/dev-php/PEAR-System_Command/Manifest
index 6bc8cafda188..c6ce4e78e1f1 100644
--- a/dev-php/PEAR-System_Command/Manifest
+++ b/dev-php/PEAR-System_Command/Manifest
@@ -1,3 +1,3 @@
 DIST System_Command-1.0.8.tgz 6528 BLAKE2B b1aaf2a55f65cd020d7d619dae7c758480241f2be77eea0777cab12ad904522b8e4d8021168e1455fa8c89fabfc87c7e89a581af267dbfbab174898b0d6b8e97 SHA512 37aa9624fe566cdd8613ffd021ba32c2a3f0818b8881933dc1c2e12e2e03773b98b4295b46ef54baca26fb07015c0db2b87e44136f46c09f820994905241acee
-EBUILD PEAR-System_Command-1.0.8-r1.ebuild 584 BLAKE2B 290957291047fd81f289cf093cbd44b9fbac1e5c3c50c59385a6a9c984f29f7e5a9fe859713f2f4063ab45f978f8fdaced78f464e89fb7bf92c25c3058f760ba SHA512 5e5cdbf567b8b16a85d510266b4994b5c9d4211368690c5085d18c240dcc96328b2897fefb082188cd2cae148a94eeebaf0eb5ef327beaa0556bd94e8f6eb1f8
+EBUILD PEAR-System_Command-1.0.8-r1.ebuild 590 BLAKE2B 6ef895cac16690159d22df1af54970309b7796263489fefa6f651dd2119f313785a1d7157599787fb8aeb3b6ea475d51a638b4c41a875dea4e4f322ca7b18714 SHA512 f56afbb7a20a945657040050bb219ceea4369ad6b90061c1add178649796596f93a047d704161bef33021d18dd2f77b9525527eab75b55c1e3c66e3f93a2500f
 MISC metadata.xml 387 BLAKE2B fde6b0c7f1677ebc0e0e40377031d806dae236925943478e278552d9b54c6db74dc9096f975731293f0edb2493faf453d3c830e29c2678257ffa08b72c02e9f6 SHA512 c0b80ef4a3417735c450179e72e2aa67528225c307d64b4ee214e6c1c765529fe0d031c378c4f7570681843a7c5fa6eec9b224d903befc55b2e362cb10128dd0
diff --git a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
index ef408662b86b..57359214cc4d 100644
--- a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
+++ b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="PHP command-line execution interface"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/System_Command"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-Text_Figlet/Manifest b/dev-php/PEAR-Text_Figlet/Manifest
index a75ce3fbc837..490647835189 100644
--- a/dev-php/PEAR-Text_Figlet/Manifest
+++ b/dev-php/PEAR-Text_Figlet/Manifest
@@ -1,3 +1,3 @@
 DIST Text_Figlet-1.0.2.tgz 8775 BLAKE2B 7c397479c00e193409f47d5419aa35fdaf7440f6991882a9a517a319e3240523075f7fa9bdfbffdef9efd1b6ad98bb7e2679c3fdde6cf87365bfe93290571b02 SHA512 e17578a2f4ebd67adedc57cbeceb8191a7ddc712efe0a631cb696d79392bc025ecdd0b389078dc65f6e0fd676d3e435178ae280cae9b9c11d8c4964152d9db06
-EBUILD PEAR-Text_Figlet-1.0.2-r1.ebuild 1196 BLAKE2B 5c28274747c7ee5c69f965743228c536f22e0ea66ef344d37e315cbe3145494e83e018a4404e8cc3ef20a31ee5651b10a8b908f3e4d2d2602dcc5e0471f1668a SHA512 438a213923f39dbbcc5971fe03e01a1859366ed9720420035e006f6b607557f457de7d642b0bf7d1c475baa3ce873fe720adeda6e5c030de49f46f4af72b7ad1
+EBUILD PEAR-Text_Figlet-1.0.2-r1.ebuild 1199 BLAKE2B f24d4dd210cff043ded46b755fe2c331ab9e172961fa0eb219ace8e8d6cc641208eeed1e5ad98a0680ce072b12532bbee9cb4a0323e51bf486aa425abc746b62 SHA512 99b6b7f8471954922f9f09a1df261df3af77af871b35f7b40e7540f9e5cca3a8e9fe207d8f49edbeb757e870fd63fbc398ee5b463e8c7110ae4dc8a6e55f474b
 MISC metadata.xml 381 BLAKE2B dbf08ca44df263501b3fc88f396d919e1666a75ce7aca83ced579a655adc1177c9a703fe1535a1c6cb398b5599ff3dca6e42454a9e66ce8a9314baa473c62a1f SHA512 9a9014f230f3fc8d925d93b281404523b8d11cdca0b06d18420fd0483c18593ef9d00dc8bde90e463c8419ff0063cbc39e56d8de220866148f6a9a779e275d97
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
index 2e7a9c7fc7e1..3fe22d40db35 100644
--- a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
+++ b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Render text using FIGlet fonts"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Text_Figlet"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01
 	examples? ( GPL-2+ OFL-1.1 )"
diff --git a/dev-php/PEAR-Text_Highlighter/Manifest b/dev-php/PEAR-Text_Highlighter/Manifest
index 926c8054ba90..bfdd1ee8ca06 100644
--- a/dev-php/PEAR-Text_Highlighter/Manifest
+++ b/dev-php/PEAR-Text_Highlighter/Manifest
@@ -1,5 +1,5 @@
 DIST Text_Highlighter-0.7.3.tgz 138384 BLAKE2B 9cffd6dbe3eadf0a6e0465a6845bdc63f3b4b30af3bb09a7ac90cbb42575d0a98a3d8adf9e4f6e2f9e67d978a035a27e83bccd799f88513af72c492ad6241037 SHA512 59924cffbec8e4b652525f718012aa9a4f17d348401e191e292643df1e75a2a1b8687b7df701363816fcead1c55efe281a68b126f87df14806acd69ae6f44209
 DIST Text_Highlighter-0.8.0.tgz 138657 BLAKE2B d2d1c9374f5b2ac88c1bca7e91723e0a67ee8205f92b3d840669eda2f37cae9601f31eaf7373e4b32f5d4c36569115ed6777cfa562a1cd465a289f8f5f626a66 SHA512 9774fa613f95064629b749f2514e173275a4a15f46b649b208ca668ffc85118b5f26197ce3c9311fe8c1b200a76d30ed2e745929b0d4f1b54056732f4a5cfe05
-EBUILD PEAR-Text_Highlighter-0.7.3-r1.ebuild 862 BLAKE2B 407c02942c26d7a8e2ad559c26426560ab591873091d18e1827b711fabfb7bdc0306fe47467834783dc350c09fdb1398fd68e1ee8a0b6a37ef2bfa4af74b92b5 SHA512 9abebffa80a8e0a3e300518f450df6d5a4ca4038774228c8c25267fb0ed94c72232c5d92cbdaf3e2b64899cd4e7359107e6980c1ce125e419a318b7aa8a43777
+EBUILD PEAR-Text_Highlighter-0.7.3-r1.ebuild 870 BLAKE2B 479ae5e737f5869935c7148add82bc0558a86f24a32a865829aee8108629c93594435d001053daec334a428767885e673cf02e0f5a0a96c4178cc97273c6e0bf SHA512 29e9c5ab413851a9646df9754b4ea4ae7605a4816f7ea4ad66954a4367e6154832639731fe986ec45e975116c0e8bcb3a1333b49d213547cb5d09f66e4b107b6
 EBUILD PEAR-Text_Highlighter-0.8.0.ebuild 627 BLAKE2B 9ddf12412dc6d14d0b479d0042f043c3567876070f4e46148ca65a0da9d22488fcd646e2d2daff899ec8d01c4ffe736aadd6a16770dc1af38ea28f9329b4c531 SHA512 eca9ce847a3aa5ccd2d40d12886e7e0762b0e272a5c21dc3610b731fdf09bae9ef75e9570e83898a6c2933fee5cc91d8f0a8ac3bfe20a258eb96c9f8b2c8e393
 MISC metadata.xml 318 BLAKE2B 5253e98310510ca989d8e961869367b1dc99ab14c71fe435439377991dc9a9e774319ae082bbceea306b51ba822867c17fe4483ae37df94e0dbf37b7a87c001a SHA512 685d80a2af63fb76899a86132a149a086a3d38b14b4ee98b10d30b591492cf503fffe75e4065d99d81843579dc836cc4401f8cb461a2e4a85f658ec35cb657c9
diff --git a/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild b/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild
index 3e798dfb76fe..091c8b3ea319 100644
--- a/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild
+++ b/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A package for syntax highlighting"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Text_Highlighter"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/PEAR-Text_Password/Manifest b/dev-php/PEAR-Text_Password/Manifest
index 9a63eac6ac97..3394e8ffead3 100644
--- a/dev-php/PEAR-Text_Password/Manifest
+++ b/dev-php/PEAR-Text_Password/Manifest
@@ -1,3 +1,3 @@
 DIST Text_Password-1.2.1.tgz 5631 BLAKE2B d765606e7082076f92d76d3a2e7a0721950b9fc81b267a51aa3ef56ed92706105486d3a62a6ec81e06dbdb41a15d0a7e9add8ef99c87b76af6445fb7bcbdbaaa SHA512 9f7a357b92b8013f41cd964245fd764c5f1347b41612aacb5fca66e4963e007d7470ea3a046e6186cfebed4960c5b6e6e23e4f2ab9e08c7aee10cba5ea347fc9
-EBUILD PEAR-Text_Password-1.2.1.ebuild 637 BLAKE2B 8f1f3ab22bc9dfcf8023eb621aa09b8a2218fe26ac89c17223d623d20e9d36274e0d6a5f07cbd0217556add2e741dbe193d66a993a58aae09d3d40fc4ec57e98 SHA512 541c5918b05bb7ee56e0444c5de48a4619497ec1718a4f0c44e5bf480100ffc584fa278f41d6d5ea3f2650e5f3bffdb76f4e3032534514281cb4ec761815d7bf
+EBUILD PEAR-Text_Password-1.2.1.ebuild 642 BLAKE2B 63852f568bc7de3eb8f2947a5529433c09433f298f01d1241c1752316e89dc61bfe1881996f097e1a1aacc63bd3f64c134e8729cc7bdbf2763d736e66d4a779d SHA512 b607343c7a5b2c6eaa43051c70ceece7c55e8b263cf3b5417088c2e34523aa092557577098502247b20769a92fff2298b49b6a25c60c71aee79fe0381d36570e
 MISC metadata.xml 385 BLAKE2B ae61061345cae297a5e8b33dda7940d439f7e59b44cd6b7f298664737a821fdd4abd60cd52655261a999fd850620e4ffe51767931c7edcba6354582c6bdfebf3 SHA512 3898231004b87b780853676c8779ff5162d1111ea9a85ec795ed7dbe1563c6ed70e1dcfc3a8f9fb76b1893db606d9b84e83963537d53f0e3b302893c1b87a4e7
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
index 3da1e00f46ef..b9a1067c147c 100644
--- a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
+++ b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN/PEAR-/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Creating passwords with PHP"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/Text_Password"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/PEAR-XML_RSS/Manifest b/dev-php/PEAR-XML_RSS/Manifest
index f597e269cb5a..dfc95d3bd3d1 100644
--- a/dev-php/PEAR-XML_RSS/Manifest
+++ b/dev-php/PEAR-XML_RSS/Manifest
@@ -1,5 +1,5 @@
 DIST XML_RSS-1.1.0.tgz 8178 BLAKE2B da290ea2e656372478435451b5043f3254e1a06423495c62c753b636208ece31e5b9aebe59a9b84254aac70d2088b4c35f78b763b6045d29c467ff0989bbc6fa SHA512 947b040ec71728328bad0130da874132c12e8c14a37f57b0ebc4e9db26aed49d0f9702e20ae401bd92782e1895de71dbd5daf09adebec0eaf268c77dfe183c24
 DIST XML_RSS-1.1.0a1.tgz 6717 BLAKE2B f38aaa6981d94668031272cd48f5648ce9fec499fde4627b6291d1a9c0dea4db72779e3ce7a089be9ee5d23ad56d05c6bd3ffce031b9ef3f4fac5360c3da4420 SHA512 e88c7618cad60a775c07ac26aedf05b7ce7ab3c9f012f3e638031b3567227db237ee2e1238fa051f9f415388a5d7c131af02b8200e08c01a9078654ea5877ce8
 EBUILD PEAR-XML_RSS-1.1.0.ebuild 494 BLAKE2B 81e459768c0ab8d048f6765c65ce5427e9f32aa5a9a9a55df0f6b46796b68e194d7d2bbf20d81f2ef5ac746e3cdd311968b62fe7796a9f6c7648fe4e938848b0 SHA512 5c3d036faf76e1c9efe9bb61c0b8604f953d4b9db00d2cd169694fd26b7ef87a847abcf547c91db7939b494883216c29ca8beb2b8ff54cda771311fb7cecb9d3
-EBUILD PEAR-XML_RSS-1.1.0_alpha1.ebuild 747 BLAKE2B b1f5dee7e0e9e1988a00e6f2430e675b72ca5b1257a1c9334c09d37efa890ce39c21bbe78b110594111a6746b331875b2ae91324fd1668bbe7a03f7795fb5194 SHA512 92a55164948ca090a5664fd03763da56a23a33e5492129d4f7791b417d5b00bf47c9fa2047f2f722dc98e6b2f3368000dbb28be37395608f8fa805738d42df86
+EBUILD PEAR-XML_RSS-1.1.0_alpha1.ebuild 746 BLAKE2B 89bf012ba0ee6c69c4fbd7b01b220bb1935432f243e8b3b49af33655a3867e62430b7a546195f01557384de0c2c5f3dd13cedcfffbd5356a70b20f3541b145b6 SHA512 909576a200274af55b07c7821db18cf00c379c6acf2e1cc48cad4d2cb82ac5e075b7138a8c25101facc6ed886f8e5fb7fef38379aa7e561bad7ae51191611254
 MISC metadata.xml 373 BLAKE2B 23ac6ae6766ff928da3558d2c05d6ff025f56b76045044634d1706b046bfd1fe741dafc1ed10489113521f23e2ccd95f8d529d8be240948ee90f09ba236d9dae SHA512 e5be199ccfe81e85816b693f8b624ad2346e8948717dd26496e8e9f4b048c9189515fb11cabbe55a26f81e448937db5f1f16f37cb59bf3d24c3e3a68725e4e30
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
index 3ad733e0de0a..50fd9ed67bd4 100644
--- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
@@ -9,7 +9,7 @@ MY_PV="${MY_PV/alpha/a}"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="PHP parser for RDF and RSS documents"
-HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+HOMEPAGE="https://pear.php.net/package/XML_RSS"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
diff --git a/dev-php/doctrine-instantiator/Manifest b/dev-php/doctrine-instantiator/Manifest
index 17768cd5d952..72b307b4eadc 100644
--- a/dev-php/doctrine-instantiator/Manifest
+++ b/dev-php/doctrine-instantiator/Manifest
@@ -2,7 +2,7 @@ AUX autoload.php 258 BLAKE2B 3ed7c897b02b90914e7ba7fa06e79805586b0b5bf2b614e8b81
 DIST doctrine-instantiator-1.0.5.tar.gz 10202 BLAKE2B 77ab3fba96672f6aa2826002510c99c21beccdc09e92dbc2c09426f8fc47590554ef5d32b6bec92ea2dc2ab1c61a178c280ab01090b3aafc14a10a4b4fec3628 SHA512 78b00b2550b47772b5825fbde59729e0613a90c1d9dacf1b7b7d13ccb5bbd8534af7e732dcc1b5b6f9bbafa2f9c3e7418e184851ab0f3a37c0c945b5eed1e229
 DIST doctrine-instantiator-1.1.0.tar.gz 5343 BLAKE2B 73f737f19c8ae7a3fa9a7dcaa760246da6d688e28f15be0c40e031be8147887885bba2ec0a7770ead7de7b718247108b41b4c1d08712137c9c06911bde263176 SHA512 7f59dd7f80df02fd1e46f4b0ecd8488022b34933effddfc40d3424b279a35928adfc0fb7567172149338a8d4273b24305eaa46fc51aa0af45a7b230646354f09
 DIST doctrine-instantiator-1.3.0.tar.gz 6299 BLAKE2B 6eb41562f52965381a780243475bda73a921d44784a66cf23816dd228efe4299d225f0cd52a4625a3516d8ae22b7f691a2724b477b944211e8d1ffd2c4c90540 SHA512 989b14bb28f75d091243dd5833a0a7c91889b45a1fcafb425b38de223485aae4470e1f1877b024ca58c5cf3539f8b39ef337166dbbd664bede7a5f3adde623a9
-EBUILD doctrine-instantiator-1.0.5.ebuild 692 BLAKE2B 7b791f0f28c0a80068873855dea07443179f4d233f6e7de520a41ef288c7f97af4b49dcb42d76a05d0429e4e72445366be7bd766fe4ec5a6a7628d43b9200c60 SHA512 a9de63b78e6966ea6065698e8e8a93ebfbb7ba4e967fc6cea76a0bfb89773510a058056e31ed2c699ce9d65921f10f44b1b9c34bad489c5f06de679334fe7f9c
-EBUILD doctrine-instantiator-1.1.0.ebuild 697 BLAKE2B 26b290a9204392862a18f54c6af9a0d7ad35790c4648ea6cb542bc908e10927b56ee20c5cd661f05ec9a62a73bff343a08730f273f5b1878c049a08e6c0090aa SHA512 88d26edeed1c29549ad35a9cf56355ae5ef73e0484f8300a791f279daeb65cc7246dafb4a9b0ee345932bf9e0d666ccd34c16c2259ae69190972101953cb7598
+EBUILD doctrine-instantiator-1.0.5.ebuild 696 BLAKE2B 8cc9d35cb17c070ff18c144399c643727e3c73bb413e0d071d8425a13cae40813e6b7cdc222cd848155911a96e45e49c1fb6bd8f54f567767982b74292329d57 SHA512 eaf5f1b4541b801809d0c8c16a8f790c4c178fd441021612fc447507f69e0b8089bb4f40070c246df6718ac498fba0bd1592804103a3625ec3474ff916509e22
+EBUILD doctrine-instantiator-1.1.0.ebuild 701 BLAKE2B 80c16529ee953a027b6a0b365d1f44213c7d8584f7289a35eda432192d47f4963310516d70eaa208c2e72eee68bc24aaf3117d3548f65fe5cbaf09f7619c2d0a SHA512 83463a2dce392c8edb646d30f5c29d667e080014aa5781d1d0b82c3b84de3edd219f97dea832325bd6a12e03ef1ff92e8aad2b66780255ba4cb70bf3bf574e0a
 EBUILD doctrine-instantiator-1.3.0.ebuild 701 BLAKE2B 70f882195b24306adc61350c6c5cca0f84d4b9d8868cd0fe609184d8403686a5f654494047af254ab00e8683b422953b25137d2705c564c7a90d5d8f800575e1 SHA512 8d82b0ced7121653b086ee923d4956db390887f654e3d6611d8de3bd5ebeefafa97dea9ea490d11359b8e0409f954ed92ec6a1681ba90b2a31dacd4805e63d02
 MISC metadata.xml 313 BLAKE2B 76bc8cb4562afb0810ab8a4a79265bc44ba328370c3ab64d3599c6971ee1005f75cca364a00bfca316584c00c28d1c9ad5b0eb3c86889426852af9a6bca31986 SHA512 6a34d1c5966ec568eb1cdc499ef9ea9c799e104a4c47aa061b3197ecafce3a49a372e5f4d92b834b3b725c7697ed1e5e85be4654b3159a2427f5d649b11bf93d
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
index ab467bafa688..80e864530458 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/doctrine-//}"
 
 DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors"
-HOMEPAGE="https://github.com/doctrine/${MY_PN}"
+HOMEPAGE="https://github.com/doctrine/instantiator"
 SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
index 9ca2b9c37c06..6ace5f9593c2 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="${PN/doctrine-//}"
 
 DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors"
-HOMEPAGE="https://github.com/doctrine/${MY_PN}"
+HOMEPAGE="https://github.com/doctrine/instantiator"
 SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index 66d6bed89b25..2ac151f604dc 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1,3 @@
 DIST MaxMind-DB-Reader-php-1.4.1.tar.gz 19667 BLAKE2B b397eb1bb7fa00c3382c7ee7c019c401d390c88d9bccd7742873445e95cb87d780ac17affe5cd1ec98e6f60d16660784dc5fdb188f8e4d2956df816397a9c251 SHA512 2407f3d1af10830078c9f5ba93ee74761084b06e630242eff0f707b98bdb78e6e87dabc999c36b29780ba9c8c38aec0225700005b66d95b3707bdc06875c6dd5
-EBUILD maxmind-db-reader-1.4.1.ebuild 2210 BLAKE2B 6784fa6b01c81d2b5a7b2dd6d7104fc78d662982ac80518241790b958850c6b086763e8422ec5d0c0d83a4b8f8390844d09840b190b1cede3e2d691b9af38c41 SHA512 972ff928e787addbbdfdcd39fe140b2ef808502633a48ce9937eca091e05123b5139b3fb9a95f9c4d6c3d1f48f5eeb099dffb36e169f2c4ee36deacb886d2a2d
+EBUILD maxmind-db-reader-1.4.1.ebuild 2223 BLAKE2B 387de47f7a7ca8d7cb662afe0e31b9b78eefd9caba6c87f50b0eb254d1e348325da0e584f5d8723631ff0d6fb94728e48159fa2faa590372a23848ab5699757f SHA512 74233e54ec7731b956e68615f89a42c7bdb2d91ea37c332ceaa3d846fe21032867462cddd5a8e68af865b599a69c34f84ca7bf7b46330f434664e09226551560
 MISC metadata.xml 585 BLAKE2B 0b6a50c15e2fe822a2a3cb52b7fec01677d4fd8601f9b3d0fbdaffedb951edda038d721bf4fb10ed49c3e87823115069be53495630ed2472c982084256c9d1eb SHA512 ec754283b76dde98c10ae1bbd0c11e24e53162d4829e3d32ca9c32b9dbfdef4df0494ba2fccdc0ba1c05c9aa58086c5064124daff69db00372915c530089b2e9
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
index 5663a274a2d6..bb320327c3ea 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
@@ -15,7 +15,7 @@ USE_PHP="php5-6 php7-1 php7-2 php7-3"
 inherit php-ext-source-r3
 
 DESCRIPTION="PHP reader for the MaxMind database format"
-HOMEPAGE="https://github.com/maxmind/${MY_PN}"
+HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php"
 SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-php/myclabs-deepcopy/Manifest b/dev-php/myclabs-deepcopy/Manifest
index 92302c3c436d..7ccc18244fb0 100644
--- a/dev-php/myclabs-deepcopy/Manifest
+++ b/dev-php/myclabs-deepcopy/Manifest
@@ -2,7 +2,7 @@ AUX autoload.php 239 BLAKE2B c67e02841a85ce3cb1cb27286eaf799a8060644d35dad28c9a3
 DIST myclabs-deepcopy-1.6.0.tar.gz 43612 BLAKE2B 18e3f532043cfbf700230a82772938082611922b9a04c7a99d63f79210e6c6f144521a29356977f4c44843cae6628e0a13fa0a46e0d34cb2e251f138ed60ab44 SHA512 a1d0ce8386172b963bca1e34e0e6d69268177f6aaf5309498780e4f9e43b9126916937e0b422644199b96f46212d0267af9b56993b9ffe295adb5f872c24584c
 DIST myclabs-deepcopy-1.6.1.tar.gz 43589 BLAKE2B e62ed5384bf9d4ad0286189772de8eeb9fed9962cf1d109b9e282c37ceadc885c6850fbed1695de35935b85fcc789a796485f44e97269a556d3498be8b691af4 SHA512 6cf13127401304ff92277c7c433353ecc20764fd5b8db0f8ae8d6767d8d9bc9c2f6b6ed3d68eeca5960357517038062c6f6b82831f433596d0a05cd0cea916d4
 DIST myclabs-deepcopy-1.9.4.tar.gz 44812 BLAKE2B bdc273f55b082ccd728ce786bb573dec5e96427f1692e3f502e2ee7eddd804e9a1589efe1323e3961d2c4e2b210f597c1ba80bbd8fcedeca77a7440df8925fb1 SHA512 879ecc6409ecb21a90e87b8368f64fce57e692f0e2916fc341d55744c2663163d6bac70562c0d8a1a1a51a409121f5e5905979dbb9fd2842cda7f21cda33e50a
-EBUILD myclabs-deepcopy-1.6.0.ebuild 653 BLAKE2B 18c00374521640c1ff001801090910700963c4245b98bec0f4c1ce21a9e59c506ed78dcb9024a4c4c2ce05b9f2bb3683889ed1b48aaa60f9ec42921b0e47f740 SHA512 4aea497f9cf4c00b2fcd543c50d94b55241f61e72a972ff84015caa2cd8c60941846deb2898b1f4e12b28967cdb4178d821e3329b21bff3aed3bd91729af5e50
-EBUILD myclabs-deepcopy-1.6.1.ebuild 661 BLAKE2B 393c1d2c0f219b24bceeee802e7ec0f09a59eff1854efaf270873378b4dc345a1db340a97620dcaa67b6baf1aefd0c889e81e8f5828559e87233333571fa1320 SHA512 191e347deb345a42903bc4c61bbbc18304e0ee2c6bcb13f4149fedf84c49bd560299aabaef5499e29c0e9ada049a26b37ad1f3f54220b6597b836df42f1aa5e9
+EBUILD myclabs-deepcopy-1.6.0.ebuild 653 BLAKE2B 51d30402ba39faf16b701c56ec6995fedc0928355bf0fa04e1cb3245ab50fe72c1e0119b1b34d5ae32bd947d483fcb1e3074c84bf38b50d01d956682bbdcd2a2 SHA512 1184a25182f8c549713f8553fff565860f9b3e7ca29d50f9ab1b4e6782ae7f2e36660e3631f22b232fdf84cfe3b04fb25fc09a5051de685cb497058e8990f38e
+EBUILD myclabs-deepcopy-1.6.1.ebuild 661 BLAKE2B 9ef4ff75f1fce9dddf7a7b325d3e38d0f9f7bbc0d32a34707ae4a129545b20145d2df73ce314f4dd035eade79a5d72895130a59a6aa28d88703ad86095c1262b SHA512 fae3069dc41f95fc1e2dbbd59afd7baffca04b42676b6e29918400de4af0014bf843075b8775ae65fe46161fba99523eef03c376dbee84cb5e8868eb6b3b9945
 EBUILD myclabs-deepcopy-1.9.4.ebuild 658 BLAKE2B 5100633dae669cd61922ce62565b7bd445577e93aee647ea7d1f5bfeea392f145488886ac9f5efed3f9d16dd69f4dabb69719e4d21663c264521f7b7dcec72af SHA512 8e9d0904b9344558f7e1dda7a732ebabc7800028c9590c69bf177d3bd1b58794e57766f7c3af221833148c42a414c27292bf40612cf6833618091d3a6c567a2a
 MISC metadata.xml 320 BLAKE2B 7a39e30db8d713926fe221be630c6ff660222d62b47d5b7e561127bc63f522fa813d2ce6ba83276600cc2e3e942e27758e8268d784dd1f3bb36f182c5da3026f SHA512 a4610b9b7fc96287c53bc0501afdded0b917d842e2a263308fe20aab65678c569d6ace0576596e7d4cb75dc3af3b3af2896ac7aeb867237206b7ca3c6c8b30e8
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
index a1e214ab0692..7c49fd221d17 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="DeepCopy"
 
 DESCRIPTION="Create deep copies (clones) of your objects"
-HOMEPAGE="https://github.com/myclabs/${MY_PN}"
+HOMEPAGE="https://github.com/myclabs/DeepCopy"
 SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
index 6966ccfabd29..6e9c25144e28 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="DeepCopy"
 
 DESCRIPTION="Create deep copies (clones) of your objects"
-HOMEPAGE="https://github.com/myclabs/${MY_PN}"
+HOMEPAGE="https://github.com/myclabs/DeepCopy"
 SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/php-redmine-api/Manifest b/dev-php/php-redmine-api/Manifest
index d936e949e3ad..faf2b4b5e698 100644
--- a/dev-php/php-redmine-api/Manifest
+++ b/dev-php/php-redmine-api/Manifest
@@ -1,5 +1,5 @@
 DIST php-redmine-api-1.5.16.tar.gz 34323 BLAKE2B 5879c9a67959ec8104344d1d5c57ead036fc60d3bea2ae94684617a711eae0cf9c7d6d2eae6d94c273fdc06bed82f48e281c2895e37ddef2144be8f0881c5341 SHA512 e25dbcababcde4e0b3160f7060a837aa4e52a2f3b1b91bfb131c04c250c543fc41a3667d87c8a668057d5acbfac84f395dd3180b815921fc05edb6325d34dee5
 DIST php-redmine-api-1.5.9.tar.gz 36297 BLAKE2B 32c8cd500b0134afcb20e792f21585315f9635e038bca118d6ea289e2c0f91632aa5e2db2c023969cb228d592a242902a47bbef119e58560b39ba4b418854f8b SHA512 dd23dcadb27965568c3066f417edbff633eee5e804430568e60abf6b69f0fdfe36b73497984f80b055fae07cd3bb6f94264875f076b98f05327c474eb3f2ae5e
-EBUILD php-redmine-api-1.5.16.ebuild 922 BLAKE2B c1380f5b7f36ff4d5cf129775c2b88e173b3af116cd11fc23d9a9c5df59550ceeecaceb4e33af35680b7519f30a5e1a49716eb3550fb3f50876e9df101fb3cf5 SHA512 ccd9e7f41d185f94f765b406e659fb5b9d07a42c22bcb36c0910942ddab4727551196c06d56d0f7818c8e307d2995500eeaec774386e54df91901d3c0e5d4620
-EBUILD php-redmine-api-1.5.9.ebuild 919 BLAKE2B cd45404af80c195da44b9d90c2d50a7e77321ee839aced9b2f2f60ff994b2c3af3757e312252a61f845e9933c7c079e7b3a5fdb317df1152f6df09339f11ad1c SHA512 7b56ebad300a3f0aced1ccc99ca375260f4ad85f0b9c9eaf9e2d9591ea718ad291fa76dc93fe86cc6af43dd387221cca665f334d49f7215b58dc8326266680b0
+EBUILD php-redmine-api-1.5.16.ebuild 932 BLAKE2B ef32be38983a9518c40549733e30417bf063a2639c004982508ff1a3f6bcbbffe9ea170511849c939a1deedc430d0094fe46fcb226ad0caca5c2a08ca4d1127d SHA512 936b06dd1cc0f483739bb9931439f8c87af59934790d6f81f0518a6b2fd56e2fc98d515fbc604fdf3c1f104ae8915a5553f79085bfa9b07d5ec5a1a62f52bcf5
+EBUILD php-redmine-api-1.5.9.ebuild 929 BLAKE2B e8fb6484dc42d35e00e8a3dd04c0c5d5811733fd5ad22479da3390d91539ef5f94206dff482242bdc7ac421415d466bd6b434f81000a875de4f9724f2ccf5995 SHA512 0b6fb976ff60f82dd48daae5a3df9333ddeb4bf039cf574677a8e081de10d1750152a74c1d1231d9a2061f7c944b21062c7e6f6b19b041178f2cd3d3e34b4b70
 MISC metadata.xml 449 BLAKE2B 21f0010b9e04eae8ffbfd97b1f011e6eefc3a31e994e87d83133dcc71ac255eadcec04b57ff00c2a3ca9078173a08961bd46f3c6bd3cb4922f35564f25aa5c6c SHA512 6f2086e4973ea34367123c33eb9b54de38f77619ed548a2db6803634e4dba6ebb4fce03825affd26d58b204b184b0e1207316c7aba277bae7c96c7ea319c216f
diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
index 78a322edae68..70cafd890093 100644
--- a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
+++ b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A simple, object-oriented, PHP Redmine API client"
-HOMEPAGE="https://github.com/kbsali/${PN}"
+HOMEPAGE="https://github.com/kbsali/php-redmine-api"
 SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
index feca4c001439..e15edc95d6c6 100644
--- a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
+++ b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="A simple, object-oriented, PHP Redmine API client"
-HOMEPAGE="https://github.com/kbsali/${PN}"
+HOMEPAGE="https://github.com/kbsali/php-redmine-api"
 SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-php/realpath_turbo/Manifest b/dev-php/realpath_turbo/Manifest
index e866cf62719b..c708f048dd18 100644
--- a/dev-php/realpath_turbo/Manifest
+++ b/dev-php/realpath_turbo/Manifest
@@ -1,3 +1,3 @@
 DIST realpath_turbo-2.0.0.tar.bz2 9106 BLAKE2B 3275397ab72def1b120d2df1bfe6c233283754539b2ea7dfd558a0773d2f094f9f6b31850a516b883af470cd04d4ebb9d5a7d8492608169a797d1562c7236d11 SHA512 03a03d4a3a067ffac61222c4d71031ab9e289b745fd3b158b5b723f3abf1ad7bb1f691904e3f7b53a98c970f1b0f7c4fe558a4de696aac77d0f9a0f99159fb30
-EBUILD realpath_turbo-2.0.0.ebuild 620 BLAKE2B c837665ca1c5cd1c1cea567092ffe00f416a6039bd3e342e9865a6c711251e132ade0965d5e7ca5b8256388349960dde55acdcd331b7f4af6ae506f9a981f7e5 SHA512 221f2142723449a20e216e24c73a91e43fbaa5152057066bdb5be04e40923abc1ce2cbf884fb037a4b8523355d5ea4614eb632bb1403d89bde0461949ddd80ea
+EBUILD realpath_turbo-2.0.0.ebuild 629 BLAKE2B 84360819320fa6e673e1d192611615b61f754243175a46f979c6225f4a3b6d0475db3b56ae3a8602f5801c81cabd58af458e5312e066f09902a9f41d4ab12151 SHA512 0d69d76b9d9b7f02477d766fdab14f396fb1b74ccb15094cb86d55c04e17485910380548b109154b570b6d719b4f26fbec78e434bb6f40397d6a96665d1ca47f
 MISC metadata.xml 453 BLAKE2B 053276e8d453110d9342cad1e6dcbbd51bba0e80b1c5c9c21be7f95b1ae5a64362f9f88f087d5eec7029fca8ca1537040b31cbf9d4c9d3574746abd5148a4de0 SHA512 e0e099f03622b5d90026ca07ca6cfc2277b19c01e414a6fac9994c3f2fcd9db386abe5f9d29c827fe4a75953ad2dcac1f64dd851a6d7d1a0deb60c420bf49008
diff --git a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
index 629ec768de12..19558aae6009 100644
--- a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
+++ b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild
@@ -14,7 +14,7 @@ inherit php-ext-source-r3
 MY_PV="${PV/_/}"
 
 DESCRIPTION="PHP extension to re-enable realpath cache when using open_basedir restriction"
-HOMEPAGE="https://github.com/Whissi/${PN}/"
+HOMEPAGE="https://github.com/Whissi/realpath_turbo/"
 SRC_URI="https://github.com/Whissi/${PN}/releases/download/v${MY_PV}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 2e30b25e3daf..589b93d6e31a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyECLib/Manifest b/dev-python/PyECLib/Manifest
index 25de510d8ebd..e91b609c63af 100644
--- a/dev-python/PyECLib/Manifest
+++ b/dev-python/PyECLib/Manifest
@@ -1,5 +1,3 @@
-DIST pyeclib-1.5.0.tar.gz 6682493 BLAKE2B 3f3a595b67a8e216b90c61f8119be6f40de0863a0d77c4e65c41e699aad0d9a5f1d621e8bb9510d78b9eb495acc5fc5af7178afe127780151b9be60ca246fbff SHA512 89831fc8b04a1488504b632f75da8f2f29bc6b4e33b35d0d4305b4d5ec4bc25c0e16d149580badb15be7dbf8aeb2bdebef81f78f7b7871233afaaf96823e3a3e
 DIST pyeclib-1.6.0.tar.gz 6685306 BLAKE2B 0b758bd500afc7f9d8e38513cc41f1916413d8ad6f3b1bd34d9ff46d6d33321391eaf90164e412154a14d63d4ba61502457bb943e124dd7054a5d5ec20732294 SHA512 507f78388e941e4600f4b77f636ce27b7f63e635f108dd5a452b3f98f779e87d94d8f82239d9d5733846faa5cc574c0474e366d99e44b8f03b70707d352f56c8
-EBUILD PyECLib-1.5.0.ebuild 625 BLAKE2B 45c2d734626a171461a370828db22fd2bf1475ffce361f8c2c9f1f0bd0bae238107c56994348475a660a1eb6d82e5f2096acf36366407638cb4e75836382857c SHA512 8f2e8b37578fb752d44f59252e843bf677649e6016ea173b7917e6c2b37c54087d017c9ede3a9eefb066e00b620e90db9d3f45f03b995cd93a513a7f733650ef
-EBUILD PyECLib-1.6.0.ebuild 645 BLAKE2B ccc59903a215ce5e39b533ffd10cb5144942438b3e13135cc08c73953c3b9807b7c82c1a2d7c5e4ce0417868c6674e5adde9f84217a92f0c206d222c525c116e SHA512 4f1a71eb7a0965a84d4a32d123d02906d05627fc35acc5ad87151eebc045e841dd9efdbdcb211976214f3a89d8a4fdd9360c9b621066415378e051aab9ab5e0e
+EBUILD PyECLib-1.6.0.ebuild 635 BLAKE2B f96a4bcc4b4704627c8a268f71c941af0d7d3519512c2969d376df60f56663b88c2d9726f4321fc80c7964742f26a3fc05342fd24a010aa35425d615e9fe6ee4 SHA512 abfa2a64cf76ae661fbe4027607d0d1bcf887e28102b7041d32533c2de03c7ce61f3a58b3560bdb728aee7993e1872ffbfbe2f7c8a4ab020070ff0e58fe8b9ae
 MISC metadata.xml 674 BLAKE2B 82076810eced6e375c341ec804b814d8d9bbad8e02c22a233f1c7891d75e6af7afcb23e835dd49c366e50c56f715b1e8d45675504bb6080347cf826ee66eeb44 SHA512 864d9c85e024752e0060644f9feca3b0d81c6f64610ca60be06c3218e1efc82be66b24bb61b966de238ab6e9278618013f613693fa1fca082287d4f53b4f98e5
diff --git a/dev-python/PyECLib/PyECLib-1.5.0.ebuild b/dev-python/PyECLib/PyECLib-1.5.0.ebuild
deleted file mode 100644
index 139dcba355e3..000000000000
--- a/dev-python/PyECLib/PyECLib-1.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/PyECLib/"
-SRC_URI="mirror://pypi/p/pyeclib/pyeclib-${PV}.tar.gz"
-S="${WORKDIR}/pyeclib-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/jerasure"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="dev-libs/liberasurecode
-	${CDEPEND}"
diff --git a/dev-python/PyECLib/PyECLib-1.6.0.ebuild b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
index e3086b2e92a6..2b80054d39e4 100644
--- a/dev-python/PyECLib/PyECLib-1.6.0.ebuild
+++ b/dev-python/PyECLib/PyECLib-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1 eutils multilib
 
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 8cb56788ea89..fb8c203608dd 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,4 +1,4 @@
 AUX PyPDF2-1.26.0-py3-tests.patch 1452 BLAKE2B bdeb36156cf9b6eec975f0b92f85cb6794259081ec8766b316e94efdf90ddf4bd2401fe1954d87e841628aa90b0978e9899f7562c5c15d71c2c271c6e8537894 SHA512 434d1cb0fb934149054d16521ca414291cbb83618de1468a2a9e630e75fddad4c33c3ba254ae00315b2075faad333b9b027625adda3a0cf064df3366989ea399
 DIST PyPDF2-1.26.0.tar.gz 77556 BLAKE2B 8ce9b95165a3841154b6e38e24ca5a4db434ceef9c55fbf2d146b379586160cb985948e0feb7aed135f601535d034ef79ddc1af58a670b07ff7d3621907022ec SHA512 7b427f1d099dcd687a718fb8d86e6f677ad45257414c6367e4dfacd8dfef7e3dbe3816027359868764981f36a30721f1731b4c23cbe2f35cfab1c64fb290b034
-EBUILD PyPDF2-1.26.0.ebuild 744 BLAKE2B 6c756e686cbf0e94b211d7b80884c3732422e7465368c37e625fc83b7a016a6d37cf8c2dd17de08be6320c5302e67b988abececbd5d26cdb61cf1c9cd6c1d2dc SHA512 ad3842325ee9a461f9d2d6f85d91a73f757d90e8a0d369ba500ac9a641ababdcc2ad8c575ddcee12ea3193ec6094d7dadb29dff4b674659c8679d97a98dbf83f
+EBUILD PyPDF2-1.26.0.ebuild 734 BLAKE2B e9d152a162d9799c3cdfa53c0a859392e8863a9a7af5c9a3d0cd4fee0d2c0f89b1ce3826ab59d8fe89c071e525f77cc139512d8f908770b660aa440fb4871f5b SHA512 c59f3a740eb1354bb6af4dffdee125e738afbcab619d80ffc484e01b8a69d3d36e0256adb267fb9af06c38e77eef3043734900e60d1e8ec11070801f364f9c75
 MISC metadata.xml 375 BLAKE2B 70bd4053cc8b7a65a31c3480f4205ff4945af86675b5f58a22efd3d27947b40cf49591746ae90d314e24d69d44dce606ef32b2c6fd7fac8aa1d431c6256c6c59 SHA512 9da6355a60e212e6e5ee3ac1c5cd1c357b243ab3131b2f6d261a4039c6cbc67c1e375be8685c900c533a0273b017b6d4428c7521539b917a2c380f9435b3cefa
diff --git a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
index ef87208335d7..0ad1f2171fdc 100644
--- a/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
+++ b/dev-python/PyPDF2/PyPDF2-1.26.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
index eb06e2b0e622..8b85450f4575 100644
--- a/dev-python/PyRSS2Gen/Manifest
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -1,3 +1,3 @@
 DIST PyRSS2Gen-1.1.tar.gz 9149 BLAKE2B 1f388e8616c79d8b5436f69191d479c529e1348308d69782a833bec714da6289fc459ea2b554a1e660027a25d0581c441a0e75a623add3c42c8c33c5cc8518e1 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02
-EBUILD PyRSS2Gen-1.1.ebuild 433 BLAKE2B 1a66e27f112ef17986f4491bcd61d66ea3d4e1b9a1d4ef3ca054ebad6008d22bd1c89626dc7cd3df1e6b8c154eefa4f57ef7f5a51a49a24bf6e70127d2758d56 SHA512 46a43980c4b5e22d5ccae24d81509529e5283ec3e3768c2b4957d4de8aba591c239663834e178143596909162bc6fda86cd08e7c657d4f02fbc069786ba25dbb
+EBUILD PyRSS2Gen-1.1.ebuild 427 BLAKE2B 07e62eaa6a8d8ad8b412b9d07cfcb0b17af49bdc1a83cb1fb29b57d901c275b9e090f8414000e1da1c8e7adf6c20da7edcfdab63cbc54c7c171a070d92cd5382 SHA512 c0ba3c0bf5e8f237b1e0bd4de2a9b9b45adb84f7d202fa142da7c84966af2e2215b645cfb56a29ed701e4f31ec535cc59c74887ec6a3d9594e6bb3f7d5b4ee5a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
index d736f664a604..2c5e40a8cba8 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/PyUtilib/Manifest b/dev-python/PyUtilib/Manifest
index 08f27bbe4784..a99549459ded 100644
--- a/dev-python/PyUtilib/Manifest
+++ b/dev-python/PyUtilib/Manifest
@@ -2,5 +2,5 @@ AUX pyutilib-5.6.5-tests.patch 1413 BLAKE2B 8cfb6abadbd0c83adccd69cd18dd85aa2c58
 DIST PyUtilib-5.6.5.tar.gz 1504220 BLAKE2B 2d00b8b9a0a787413dce5dd4380382efa4c8788e9a8f5188eb0decf9e55bc07ce5ceb8e6f32ed2fa7cf58c331fe936ea07d9b599ff8e7e9593327d3c0f05d4e9 SHA512 5e7f86c29ff81cfffea5862d09ec8d026739f09b172606acd4d08dc4a9bde28c8b63b8e51634d17c3161b46e7e8c8881050044baa22bc07b0926efe46ed7331d
 DIST PyUtilib-5.7.2.tar.gz 1566034 BLAKE2B 913c6576b39f14c19e2e633c36ade33fe812c77a37374c7c14d2fb4384ca38f68efd55209d70e96d9a78fea2fcf1cf83423680d0787da2d03cab88e59a208b96 SHA512 d9d7d890cdb524bb055885354784f2af01967164ce88cf3b144ccffb0a855ef34243fd518c58193517ecfc50f3c2e3ca333f026951c1ab0b38ce181ecf9e7750
 EBUILD PyUtilib-5.6.5.ebuild 1099 BLAKE2B 8b0062104c305d53fbb1ddb34d1a46d4280cdae5f57ec234f9abaab33d98b8dc54ff1ee4d7cd96ad6481e784c0a11ac6070c81de3e51816f72d66eb55a9d6723 SHA512 6beeff0cb50028755c9e9dc9280a0f430a6f78a337f6928870240e2c58d7fef961b252dffb640c81eefc06763a66feece061681a4c8af491d72ef318fa2f19aa
-EBUILD PyUtilib-5.7.2.ebuild 1336 BLAKE2B 645b98744021b0b582f9b3f75cb33cbff9478aa2dae303177e7ad92d0c8c28892209393bae9d860a7c30a2d522fddeb6b04f8f164a2a92cc4bddfef4ca451bbd SHA512 b4d782527d68ca1fcd9aa9939794079630a6729772be759b154d243a7039229bad44c90c34d2a5a30a9fbd74c515420d8ac00d169dbdc79cff54706d338c10a1
+EBUILD PyUtilib-5.7.2.ebuild 1326 BLAKE2B 844a689d2d787dd33960ad75d32076437ce0d9700ab34e57a4358b01c214804321fb56626d19763a7d00d56ac1db73f62c476d64488a58acbc4ad081c63ba9a6 SHA512 37c6ed3574864de1fff6dac55dcd080bcb68d09f5b7c6d9ced2aed05c8a0a6e5a07cb1a57f445f06feadbea3fe5601dd696c03b7b6d4ae2d622fc9dc6dee7788
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
index 1c83d3e94854..38d68ddf6073 100644
--- a/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
+++ b/dev-python/PyUtilib/PyUtilib-5.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-python/PythonQt/Manifest b/dev-python/PythonQt/Manifest
index 0678fb6e4a44..6b842b2cd81e 100644
--- a/dev-python/PythonQt/Manifest
+++ b/dev-python/PythonQt/Manifest
@@ -1,4 +1,4 @@
 DIST PythonQt3.2.zip 4539058 BLAKE2B c50b8333b71b6cbce6f372a0292a0ccfe791dc7eae5c660d4e6d1f5f2b3355644e3fd8cce9a514f0500e935f96c46976d0046ddd716465adb35d225e3c4cfeca SHA512 1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0
-EBUILD PythonQt-3.2.ebuild 1836 BLAKE2B 3ece364a090a055d370b306160a33d2b2e2aed972dca94e21957ec0b9d1f53f9ee26e6621dddf86c83f636b4cf59cce484f6b9de155fec162d6c4fd9499fc0a7 SHA512 de135516fae6a3dc98c9eca513a15a59e8d4b5afcf020020f7d55e259708fd4c2d8ff053a00a2580d76cc7a8bb21fae4431fd152df4601c817465a42bdd71578
-EBUILD PythonQt-9999.ebuild 1857 BLAKE2B 6c9a911e7a16c4c46213d60d156257a9e3387aec213fb0fd734ba30d04318e06d0be1046c8dc0d6e41bd1f3d2d1626e82c7ef585148dc48607b192b241a768f2 SHA512 951f44aaa0731c0c81571c5c11001110fe019fb054e826928d843d7fa7761d422ef2e153890bf9ced540b765512cd2c239cff0a46cbdb2a14ca6bbaf87804ff1
+EBUILD PythonQt-3.2.ebuild 1830 BLAKE2B 60fddae8406ff05b2133d6b7828ac1159203af906f4f10adf0ae7541ef21271be9874384e3b400f3d8973e8597833eeffd6d6f64f1067ccc51f1b4591f9150fc SHA512 6081de0ba1fc3f5584406133138e079644f741b3f43faa5ee61a2ac056ad6ef72936a1580bae0f4294659cb853a376d650d647c02b870da306615278086b34c7
+EBUILD PythonQt-9999.ebuild 1851 BLAKE2B ca5b5040a0948ebd8709eac0b520eed10458c35e9d40b8e7cbf376eb099dba42d6a94a710d0308ce5a74540700e6ef7b5c5a027132e3ce3092c216aa2cd3c9f8 SHA512 5a27f443daa1e773aac1a2805c35369b9fe8a27b956a31da449daa67a2ed876b22bf8fe458ba0e79f85e063f0fef98bf050e21667fb85d97d4351d1e9c090f2c
 MISC metadata.xml 971 BLAKE2B 4a9f0fd3832f83eb46ef65a18774c998daeb9544b1ac6a23a189b909c7e4168031a68d56952d9ed2b7b76fb8fc3a912e77d162cb94e73405f285bd834644fb98 SHA512 565d8517faba162fa855acef4dc659af22954796a25da9479d7ec530afee16606904b6bfba9a568e6caa8c47f3195401eefc3a9048077e73582cf7357cafce5e
diff --git a/dev-python/PythonQt/PythonQt-3.2.ebuild b/dev-python/PythonQt/PythonQt-3.2.ebuild
index e6f1e98cc5aa..9421d91aa5a1 100644
--- a/dev-python/PythonQt/PythonQt-3.2.ebuild
+++ b/dev-python/PythonQt/PythonQt-3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 MY_P=${PN}${PV}
 
diff --git a/dev-python/PythonQt/PythonQt-9999.ebuild b/dev-python/PythonQt/PythonQt-9999.ebuild
index 121aa21e910e..e142455bfc08 100644
--- a/dev-python/PythonQt/PythonQt-9999.ebuild
+++ b/dev-python/PythonQt/PythonQt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 MY_P=${PN}${PV}
 
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index fc4abc5a4d57..4a242c457878 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,5 @@
 DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
-EBUILD QtPy-1.4.2.ebuild 1061 BLAKE2B e9c98cee21e6afd616934d7bb62855fc0770171a231ab874b80a5cc3384cf2b3bed8f5ea61018aeff7d96b8dba81e9f12ef015f74f66a963396da10a5971c37e SHA512 2be59409b66b18cf15d02a3f6ac5db9d5c709d0924d234bb11183a9f5dcc83f2e10c22edd88c9f504b7986a20a0acd7965c4ee6479bfd15d0f9439bbd4869607
+EBUILD QtPy-1.4.2.ebuild 1051 BLAKE2B b5f4cc6c05fc89e9a66202a00d0f75637e3baf86604d0a176534f41d277469e403a92723f091c4f9ae42016e70be9c74db72e379e0a36cb005de55951629ffd4 SHA512 28a5622fb126357ffdd7dde0fe8d2815fd93f1e10bd980148ae6f6c4253bc0209abb75401abd803ec126f4d50266e45d92943771647f3af249c36dfb30ef4043
 EBUILD QtPy-1.9.0.ebuild 939 BLAKE2B 8004d11a8cb8cb73d6f0e1da6e5918437feb12365c38624f1653c58a49fd357dfb2eb78ab83123e576159ccb78abbf4551aec1410ae96a3c0717c619b593140a SHA512 686a66ffa14d2f26b63c421249b29ff1ecac6338a69db702ce43251bfe652eb615ee01e400abf9d2373e419bb6f3409a04f5cf16a6889dc919e95da8c507fe23
 MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
index fcb713ba467d..6eb7616e6d79 100644
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ b/dev-python/QtPy/QtPy-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Abstraction layer for PyQt5/PySide"
diff --git a/dev-python/Rx/Manifest b/dev-python/Rx/Manifest
index e6d648c1f979..26c5f45787d6 100644
--- a/dev-python/Rx/Manifest
+++ b/dev-python/Rx/Manifest
@@ -1,3 +1,3 @@
 DIST Rx-1.6.1.tar.gz 89543 BLAKE2B ee0b6c30c794febdd045231ff61a330a512c86a9dd3c56a6afa900c31ca774725d7bf5b589d46b60f79cd1f0bc967b5ab5bc87a58f6d3dbebbdb1b6618db875d SHA512 8602b5175c058e855ac4b67d8feed435f93632da2f4033fe0db54fcbb012a702786b29f97fe3fd641f054c3a61478dccac21c614b5708f7bfb0b986c9951e6a9
-EBUILD Rx-1.6.1.ebuild 357 BLAKE2B d182d29fdc6601ba47d66695d3948923831341fe71ea4707b7520fe34c3e29a3cf6b2319c1897647c08861201bf589dfed416fab2b34f927c319541b6a90fba2 SHA512 a8d5917a12c4312e878bf4b56e115bfb1085b3e09904814e74dd87d3357aa4e495bdd7b3cc193d4904863392afb741ed447062322aed50b3fef8d7da6eaf65eb
+EBUILD Rx-1.6.1.ebuild 347 BLAKE2B 8e84f4c7daa13436e5c9ecb3deb22f41e37ba448f1c830836f931d08c0e7852c8a70e19ea56ae0baefe9188d0541eb3f69f072843e8956310c1639fac6d1cbbf SHA512 9355868035c59f3c253f3c580a357dcb08fab50778b17defa0aff712879be908eac6d2c2d50f801586aa2429ba23ee7cfbba95fbf920b89c491e1522b019f368
 MISC metadata.xml 327 BLAKE2B c9349fc7bf783920d0f8469ea19b8cf475c4705d3499364ab79a6960e19c3458b7d2a18aa90a470b033003fe461f06d34d25206b702c835e5a311d698d4c2e95 SHA512 382a7e9dd6cf734155229b3acc48060b4d11f2e68b2fe906ad8508ea5de95b1adcd5d23d58b6ff4881f7d5c9f103e64b60787eaebbeff2db8f9b24188dab6395
diff --git a/dev-python/Rx/Rx-1.6.1.ebuild b/dev-python/Rx/Rx-1.6.1.ebuild
index 56b5e2456853..82172fce71f3 100644
--- a/dev-python/Rx/Rx-1.6.1.ebuild
+++ b/dev-python/Rx/Rx-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/SaltTesting/Manifest b/dev-python/SaltTesting/Manifest
index 98074fc8130b..66c5eefda4b1 100644
--- a/dev-python/SaltTesting/Manifest
+++ b/dev-python/SaltTesting/Manifest
@@ -1,5 +1,3 @@
-DIST SaltTesting-2017.6.1.tar.gz 90438 BLAKE2B 2d24dc88e8e352d027cf7bdf58a05afe7ec189c20312d821401fcb93fa1d2098078e6b3eb6e9bc86a7bca732b767553f1130cfedd93b91b8bc516fe72243cc1d SHA512 1d1a33385e9313450a17912440671567c957b74bfe6fea2e11921c8fde30ad5fc54b147b2c9d12763b946eac89e37346e1e5547fe310ee6a8bdb17ca601a09fb
 DIST SaltTesting-2018.1.16.tar.gz 88951 BLAKE2B 41061e691f97e95ac672b463cb7dc02af4ea70553577ac80d63800198aba8de8565c021381718a32fe76fd958446c3057dec25312a1f961b7696e19570dcee93 SHA512 1ea200ebd7688de35049a45816d87fb3b24f0a862384419a3796f191efb268cdad8a69187261db91de1151f7df8147251910170fd56a50335612bf2f29f09c0a
-EBUILD SaltTesting-2017.6.1.ebuild 677 BLAKE2B a4e59770720bf339da197db5906b7f227d203e3bb7ca3d606f85a12db7f9374b9e8776cd0f6f0fb407f579415f763cfc20ae64bc49b3f3386b076984507061ea SHA512 ce99f35e2e85bb022f439c46a48eb8dc99880f812607a104bdf3e0ce5c222cf1a3add4f55a37ec1985aa8033bcef7b778b436199848d1ed266e8ff8a9e4a98af
-EBUILD SaltTesting-2018.1.16.ebuild 687 BLAKE2B 076d7419be22cbdcda059c2655447444bee4ac2c24e4e89378ce89a4c5330957d635378a3c532225af6a2afe0c949ea95b10bf6d9432ff63b28234badb9a8ab3 SHA512 4e0466dc6c66231d26f26af18d769db2f9ae0ee4d70267d3defc8be9b477523feb6976198d25634e0385cc1f277b844d7d1d6aacf688ba3c0d60c20d829ad892
+EBUILD SaltTesting-2018.1.16.ebuild 674 BLAKE2B e4f7beadfc662c96f5cc156b96b5f3233a5c4c9b49da52dadbb0c33ca306c7f8a55f340d9f1c0cc217ffb234607449be59bc500ea253bf7f88c21440f418fdbc SHA512 bfa57ef9c1c2a1df1f4c448fd186f1aa16ba9e8c58deb39147769ebcdbbc88fb94e8df963abfb7667585aa4589be56f5139ab21600a922655a2c77de57c8e072
 MISC metadata.xml 440 BLAKE2B c1e25f228c59fc89508e0a67def40ad27d42f679a8ef63e2a64db91e2c087208ae37d929c28cecff704be813fab5e9365a274e7c33065cf652b9986555a450eb SHA512 66e2e15e61bff62daa00dd1462249b7631b213fb1abd1da2deca72114cd16d296cb7add9eaacad0851a31a9cab01311bb83a8ae09e9741e3b3401b22c054264c
diff --git a/dev-python/SaltTesting/SaltTesting-2017.6.1.ebuild b/dev-python/SaltTesting/SaltTesting-2017.6.1.ebuild
deleted file mode 100644
index d549c7afc061..000000000000
--- a/dev-python/SaltTesting/SaltTesting-2017.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="Required testing tools needed in the several Salt Stack projects"
-HOMEPAGE="https://saltstack.com/community/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/saltstack/salt-testing.git"
-	EGIT_BRANCH="develop"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4.2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/SaltTesting/SaltTesting-2018.1.16.ebuild b/dev-python/SaltTesting/SaltTesting-2018.1.16.ebuild
index 644e5b6771e0..17983e6fffc8 100644
--- a/dev-python/SaltTesting/SaltTesting-2018.1.16.ebuild
+++ b/dev-python/SaltTesting/SaltTesting-2018.1.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/URLObject/Manifest b/dev-python/URLObject/Manifest
index 506b502816c2..71ae685cb572 100644
--- a/dev-python/URLObject/Manifest
+++ b/dev-python/URLObject/Manifest
@@ -1,7 +1,3 @@
-DIST URLObject-2.4.0.tar.gz 12533 BLAKE2B e5fcd97267ef66124074ddc830c547df5bad026c17139301b0917bdc43d4f5382ec06d8c752cb38f8c53cdb77513a78efeb14241d419476fd291f38bd22de912 SHA512 1334c8d8dbb93f50fb6672ae5c2e1dbb8c880af65c18c96c7bc65bb46ae894ab0696d36236036c1e4434a6e75b692ecd0b37055ef9b55fb50ffbaf13197b1701
-DIST urlobject-2.4.2.tar.gz 25457 BLAKE2B c5d3ed0f38b3fd58ac52638059497cc53347bb378d737f87f2fadf43368ced9450cea0147c49a7cee5b29b4805bebbd22817910d922813882aee5b7f467dd653 SHA512 970c5900171fa64624cd2ed2ba7f3a761057eda5c1fc07f881e8b7c74bde0cbbb7fc6c7c8694d8b8be0e991322da148528d99ff6fb2d4b75e1ddd1c2f474b4f3
 DIST urlobject-2.4.3.tar.gz 26325 BLAKE2B 6c73bab1768d8676ccd7411175877a17a8b64e2498345443bfd8e28873c1ba9aacf158cfcac739d8ae1abf7d7845bc5fa5f478441d6d99530a9395b236b118f0 SHA512 2bd08ba5695c8277eeed154d7f414939e8b471e83f1fc6b9db93931f8e49dea4583036b0b7fb8d820e0b214bdc4bf2fe78987eb6a5c63ba70611aea6365c2972
-EBUILD URLObject-2.4.0.ebuild 430 BLAKE2B 9574c5710b9b8c53c094bb76cf16763b5e0c9bd4508e63401507595199c9bcdcfb6efb318783febf91971453b0257261f80508fce401bca9e8f1c8a8b038134b SHA512 5ee0615f1e67eb0d1eca12a97ae67a3dc16b134886316b32f701f2cf408d7ac5105c8ccf30bfeb34aff69a3f759da97259a4e0c0a0e112694c55b638e4d5a2c5
-EBUILD URLObject-2.4.2-r1.ebuild 770 BLAKE2B 2b24de04d09edeb80ef52eb962ce7994e6295e3072538904f0567f042e2c8200f5614cbea929fdc07c39bebc869cffd060fd38762b15a3d3381d7f858636d13d SHA512 b198e2d0b484b12690d7a7bf01decf4047eb093f292bde3220fb8595b0cb761861a1176e645652a589ab887e77bdf75a13e9aac7bd9fa706b15e0c8365ac3ba1
-EBUILD URLObject-2.4.3.ebuild 1016 BLAKE2B c452e88211c5a2902fad7745b55bc05af58d181180e52e3a78e779409b0641e2c6d69ba2a5c53cb05cbaf26caeccc9e5a5d591193a9586f192d5112ceb3315c1 SHA512 75582d6304a1617af7d7b92e99f60401d0db0c9756758659ee36507235375d950cdc0b0fc2867b67f7ea618e112810f82d51e4e24c828b5ed26f055b64c7cfb9
+EBUILD URLObject-2.4.3.ebuild 1010 BLAKE2B 8f5d8f1fa7044ba5e94921b96360e0c701d0a6d46e2691f6fb4b44df5c033df45cd2e0cd1152817cdb4ba931fdcdfec18b3a29d0f6cc34ecd0e4cb8ea66adfb0 SHA512 08b24a8e40eac6ab0798751b9763dbfe3b21411f48ef42f511d14985c317e27e25ba3bb01e02fedbbfd86e33b1068efef2c6b450dc8d26e0e2c65ac5509ce2b0
 MISC metadata.xml 308 BLAKE2B baba8517a0e2446ad07003fdc6126fa4da38b1fa4427180af4539369442d7defe4e11cb0b8c417a1397d144716a1c6d33505d7e5bcd881531a22b8a28308ec92 SHA512 b72e2bb992898597ff98e8bf7c47ebd49f21672e102df17eb27f50e0065ba230d4967114fbdcff26d21f27bf35eb3aec5c28aedccd1200f9e67f28d4f7ee1692
diff --git a/dev-python/URLObject/URLObject-2.4.0.ebuild b/dev-python/URLObject/URLObject-2.4.0.ebuild
deleted file mode 100644
index 21f80b3f0e30..000000000000
--- a/dev-python/URLObject/URLObject-2.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility class for manipulating URLs"
-HOMEPAGE="https://pypi.org/project/URLObject/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools
-"
diff --git a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild b/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
deleted file mode 100644
index 871f97ef9c6e..000000000000
--- a/dev-python/URLObject/URLObject-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1
-
-GITHUB_P=${P,,}
-DESCRIPTION="A utility class for manipulating URLs"
-HOMEPAGE="https://pypi.org/project/URLObject/"
-# note: pypi tarball lacks tests
-# https://github.com/zacharyvoase/urlobject/issues/39
-SRC_URI="https://github.com/zacharyvoase/urlobject/archive/v${PV}.tar.gz -> ${GITHUB_P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-S=${WORKDIR}/${GITHUB_P}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/URLObject/URLObject-2.4.3.ebuild b/dev-python/URLObject/URLObject-2.4.3.ebuild
index 2c73710f1b39..5796b3cf392f 100644
--- a/dev-python/URLObject/URLObject-2.4.3.ebuild
+++ b/dev-python/URLObject/URLObject-2.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index d516431501ad..b1277a2613c3 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -5,5 +5,5 @@ DIST alembic-1.0.8.tar.gz 1030713 BLAKE2B 67cb80ed064e99f27e41a7ae2e42231794c177
 EBUILD alembic-0.9.3.ebuild 1412 BLAKE2B a4494d17a825ada0aa2815c205d4f683e4a3aa21978fc5608ba185f4904a24ce21cbc39528b904f0b9eb0abceeff05b8588870eb5407ed454fe9b7a78ad295e3 SHA512 684c92495ca630f2c94c9fce75c107afde213ba41392388382089e0249ab43b1a54cdf8b0ce8ff7964f53c8635794f485f456d4cc5b5371f2b4b3f1c6ce11ad9
 EBUILD alembic-0.9.5.ebuild 1414 BLAKE2B a58cc7c02951a9e5d8b65d929b7516c170741a73627ef4a84e4ab76c0f2798609953bad0588c2bacb78abbbe652b9b8a4b312b4822fc91b1bf193b27d08d4880 SHA512 41a6222f7d582dab1d6cd3971fc3def548ea1bdd8af057f6e22017a4029bb61299461aa80e435ef8aa162d3e529e5a6e385e9e6bc8367fd93eb3139a462104fb
 EBUILD alembic-0.9.7.ebuild 1412 BLAKE2B a4494d17a825ada0aa2815c205d4f683e4a3aa21978fc5608ba185f4904a24ce21cbc39528b904f0b9eb0abceeff05b8588870eb5407ed454fe9b7a78ad295e3 SHA512 684c92495ca630f2c94c9fce75c107afde213ba41392388382089e0249ab43b1a54cdf8b0ce8ff7964f53c8635794f485f456d4cc5b5371f2b4b3f1c6ce11ad9
-EBUILD alembic-1.0.8.ebuild 1416 BLAKE2B 5e2e4399105ea098ee6ac225254ae746a59476fac625b5de04138123ca9823725585b8d6a8de63f5dc683a2e9017fe6a73aaad7597fa86e0d6115de65caed6f9 SHA512 60c7a8d1b696a78bf0c3ccd2e980874fa1f1ab5964b09e2d18829708cd227f6d9f39c5bae85788ce30b1409ed332ba0329fba579f3a35857cc574f2244307eeb
+EBUILD alembic-1.0.8.ebuild 1422 BLAKE2B 767c85f1190e86fbfe614cc7d777828f43ede8a1ce446f9270ec8cc043c50c8b1533e6ee63a31fbd2fe4c71b3bf16997cc1667a0985bfa325d47c3f5d3e6f4bf SHA512 a49903d184049354922f9fc216a91f8bc2bbfa43e13ee8a313d2f3681e97ebcc5d13a486c8214ab7a2d9a49e1857d19c1b4658f8411932ff445b6cbe0b04d6da
 MISC metadata.xml 379 BLAKE2B 8fcdef99cd9d57757692cf72b6f43bf874b7657899197d754ad81866f77d0a48d0fdaf168eeb37ad29ec975ddd7533be90f1e9926de9faf1bb56c3ad4e1d7513 SHA512 809c3f1585e85726feefc7f8493ec83ee31a9f7aa99aacf82026742f278726ad960a63b40c701a1a2453d46fd64d8245b83f2bd7511b5cc077c44bc62dda3e83
diff --git a/dev-python/alembic/alembic-1.0.8.ebuild b/dev-python/alembic/alembic-1.0.8.ebuild
index b165007b945e..48fae2095336 100644
--- a/dev-python/alembic/alembic-1.0.8.ebuild
+++ b/dev-python/alembic/alembic-1.0.8.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index fae8ac3c78db..cf39db142c46 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -4,6 +4,6 @@ DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9a
 DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
 EBUILD argcomplete-1.10.3.ebuild 719 BLAKE2B 88502b7ea66e18c8cecdac8be8be6d85fcdd75b45a26e3106dc70d9fe4126c99142e2b5f589dc9ddd92bd9bbaef7140dba8315cd55601a38ce164d11a8f4a299 SHA512 91d22b2effb286d86b2bfb11ebba9e6e2ea9a54dd4b4183ce7cce3b1161d51d2019598025b62acb06cf0c456c4512d44cd89db538218d3437f54cc08afd7cb3d
 EBUILD argcomplete-1.11.0.ebuild 839 BLAKE2B 3b61280b21199538fbe1ef5f0192a169ae994c4b1b07dd309dd5347c86e5de2eed03e143b627ee2771196da644aed266ab8b9a4112ae68e59eb53ca0b193422b SHA512 c64429febb5b3ac5b9f13ec66835274135952a9d2de517baf4bc3b074256678738f1101c6477d9b3d69195217791baa23e12b710022789b3f44f858543984ec7
-EBUILD argcomplete-1.11.1.ebuild 839 BLAKE2B 3b61280b21199538fbe1ef5f0192a169ae994c4b1b07dd309dd5347c86e5de2eed03e143b627ee2771196da644aed266ab8b9a4112ae68e59eb53ca0b193422b SHA512 c64429febb5b3ac5b9f13ec66835274135952a9d2de517baf4bc3b074256678738f1101c6477d9b3d69195217791baa23e12b710022789b3f44f858543984ec7
+EBUILD argcomplete-1.11.1.ebuild 845 BLAKE2B aa71ad3f6f9946e26e08d9c3e76c93d898bbf0d73a8a8e7ad28e4d58c379d00347488325d01cc3b500cd48af6a31bc3bd58f77d92756c9e113fccd3d11895516 SHA512 13cb558fcbe6fc28e6a59649a9e990dfb93c1f5fceef18530271709471eef047a908d4fc8d8191711c5f27192a3c5e852693de282e54682efe8667b11220e7fb
 EBUILD argcomplete-1.9.4.ebuild 795 BLAKE2B 0873ba077e327793f7c6007e562db7fcfe7d7e575816d51a9ee7407a853808973d393e04ef0cbddc2c6bbdc980c4f878c4be5237cbecce18ac600f1ae22d5f0d SHA512 0fefe66d44fd35db81611e0458fa32aa8c250939bc0ed217690a4ef74afaa417b295a70dbbdd66635465220391ccdadbc6695078a249e88d32cffad09c75e1cf
 MISC metadata.xml 385 BLAKE2B d552f29df1805f58bef2bbaf91166ef43daebf78d36a079c9b93bee54a8165d33576e1f9c238e7070f64253e0ff71c9b6a18c63b3321b5a400f8d287b10e4a82 SHA512 125cccb9f83bacb68944c893b76905ca6db26c41f0e843bc3b2ed4fd8b18df4247696c0fb34acff77c41bd57fce517669878e071db6dcdcedde42f85cc012e5d
diff --git a/dev-python/argcomplete/argcomplete-1.11.1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1.ebuild
index 4fadb22776fc..11c743e87334 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 086b082c742e..b8e3b4988e2f 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1,4 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
 EBUILD argh-0.26.2-r1.ebuild 623 BLAKE2B 938355f3b432161bf044531634d40f64f7a25cf2187de6451cfdaec098093fe56cced0f36f12c65e8a853f0a1eb7c0856cb35b74fd8bb960b94bb1d88e15df1a SHA512 ec2d6d0d60b12d91ffa95cae251f9dd0e8cc54fbda488a9f52e3f5ab0ab0178c1c7346118bdd8eacedd0cc9eeb079b6315a7a3d989c774b2fc5c1bb671815c17
-EBUILD argh-0.26.2-r2.ebuild 670 BLAKE2B e1a04d8c698c70600ce59c8aac1c294581981dbba0ea278deb5a6248b50e28e2bff2e5b1f33d5254a079fed0ea86e62ac0529d98a8e3635f8a7cd9bf2c7344d3 SHA512 5da1793c5eaf1486e0c01cf4eb933b7ed00c4462da8f26e1cd05f6f2e89f41f26bc71f87b7f4abb231be7e74d9fb05b1e0990da19cd520559e52ccab40afc247
+EBUILD argh-0.26.2-r2.ebuild 680 BLAKE2B c7de2fedeaf0a8e135179bafc5fa45c187ea469905e527aec7aa6aa139e1791e5533c744ca05b1de698f28c99cc791d02b6f5f1e826fa5760a6daebacebf95a6 SHA512 4728e4930750fb30787a67d4c45ef95a324b5e3dcc298a4e2576eb38a84c0561da0b7bf76f3aaf7b0164fcf1f893d96af2e4bc9b80a4749ab526f223192f156d
 MISC metadata.xml 307 BLAKE2B 172ad4318c81373d000c3138ea3efd86183f1b17fbbdbb793a99aa43732c85ebbaa90235096835ca07a70db115fad09debf1f9ca3c5a46f6f01b6273b4e04d5a SHA512 6236f4f54de93e831341d268725741e3a46e4a4cd815ead1d5751ab551ec06fd58acb410d2cff973c992d564b69f21e6e56168ad567fe3e7c810eca5c2a83712
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index 3db3968fa089..d2745e83d700 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index 132b57eca9b6..3317b6d15d4e 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,4 +1,4 @@
 DIST basemap-1.0.7.tar.gz 129694711 BLAKE2B ec2159b01711584384d472205f8d3cadd06cfca07202421be534d7778f94000ccc9ae4b8e07a9fd595b7c06c335ec7af7ac2e9d84f7418bb0db1aeab67125559 SHA512 dc8ef8f02127813c9460c6a9c22c593616bbe8ff39f6507abb786d344c710b296bf4f21759b5c1e6fc8ccf3f478d8fb6f546429528575d13f732c4233aaf9c20
-EBUILD basemap-1.0.7-r1.ebuild 2176 BLAKE2B 2cb1c2e71db6b8c4e0f4e606c39a34cbc3dd988b8732965110f8043b1ffa49b1e95203a9a86bff5d6b3b4f32d543c71182e24ade79d1b6111d74af975f809170 SHA512 c2c86d652f8452a53bc09bb28fffaa9b7f554dbeb9819316178d5e0cc2eecf1ec8044dadd84a1e991faafab5253984a8e988ef35fc1d18c91aa5bb22aa20c02b
-EBUILD basemap-1.0.7-r3.ebuild 2215 BLAKE2B db19c5d88b2a4f56a9c35dc29e17b6b0147540aaca63581c37601ba0b9d52922dc60c4d6ef88eda75c2199622238725f66d0a9a6c502a04aaebb1eb70bc0e8ff SHA512 8735d3f4152915c8c6847b5c73d0acaf663efe989e66578cdc4ed517dc0d242b3b280120e98c0869cef6d9fae5b1e28d55d2f68bc79e0a686c2f794d59295dea
+EBUILD basemap-1.0.7-r2.ebuild 2238 BLAKE2B d0dcd4e6bd14377ff0f99297597859cdeb01d288fe3c9c54c53003f7af5af868092dc9a71e81da1fffa2106e7ca6f21ebc4d8243efa76c50ad089f9229306ddc SHA512 e4116a8bf9bb88ebdef68be187b7339fadec9ebda3f130a834b147083ce64ce2f4a03184d7d9ad8a3d2e94548749f95a60a328e72e831733aed76e41289c39c5
+EBUILD basemap-1.0.7-r4.ebuild 2277 BLAKE2B 2e9217616ab07867a4e533bc01d58c3ae45f1a408c10f1433a76cba8c69d3bdc7e992ff04bcc55449d647a34e9ec52e4e469b2ad926a7336bb9162ef7a0431bd SHA512 254d75e375e006f061ff646efcadf015b35651597ebf0fd326f118563325cb7cbefef0d6a7c9819a7ae519e437f1b9258f4e1ba7672f7d9ee4b41d6744ec9c80
 MISC metadata.xml 613 BLAKE2B 899d7032acf24b4d5a03efe56d537172d6b10105a71636afbaa63762f4669afb7116cceec9e1be1ef7c8ed23f03d9066b2ace57876770bc49450020e57121cae SHA512 f00ec05a0bf306703627b8a4846a20dcc4503646df4c38ae75f360c452e4e824db537cde0f93d037840583f3c245453387a665ca9ebf5356be45be84588893ee
diff --git a/dev-python/basemap/basemap-1.0.7-r1.ebuild b/dev-python/basemap/basemap-1.0.7-r1.ebuild
deleted file mode 100644
index 21c1f248697e..000000000000
--- a/dev-python/basemap/basemap-1.0.7-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap/"
-SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
-
-IUSE="examples test"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT GPL-2"
-
-CDEPEND="sci-libs/shapelib
-	|| (
-		>=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
-	)
-	>=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
-	>=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/dap[${PYTHON_USEDEP}]"
-
-DOCS="FAQ API_CHANGES"
-#REQUIRED_USE="test? ( examples )"
-# The test phase ought never have been onvoked according to the above.
-# The test phase appears to require the package to fist be emerged, which ...
-# Until the distutils_install_for_testing func refrains from failing with
-# mkdir: cannot create directory ‘/test’: Permission denied
-# reluctantly this phase is assigned
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		setup.py || die
-	# use /usr/share/data
-	sed -i \
-		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
-		"${S}"/lib/mpl_toolkits/basemap/*.py || die
-	distutils-r1_src_prepare
-	append-flags -fno-strict-aliasing
-}
-
-#src_test() {
-#	distutils_install_for_testing
-#}
-
-python_install() {
-	distutils-r1_python_install
-	#  --install-data="${EPREFIX}/usr/share/${PN}" on testing is found not to work;
-	# setup.py is a mess. Someone care to patch setup.py please proceed; substitute with
-	insinto usr/share/basemap/
-	doins  lib/mpl_toolkits/basemap/data/*
-
-	# clean up collision with matplotlib
-	rm -f "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py"
-	# respect FHS
-	rm -fr "${D}$(python_get_sitedir)/mpl_toolkits/basemap/data"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..f6f476179223
--- /dev/null
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="matplotlib toolkit to plot map projections"
+HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap/"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
+
+IUSE="examples test"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+LICENSE="MIT GPL-2"
+
+DEPEND="sci-libs/shapelib
+	$(python_gen_cond_dep '
+		|| (
+			>=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	>=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]"
+
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dap[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DOCS="FAQ API_CHANGES"
+#REQUIRED_USE="test? ( examples )"
+# The test phase ought never have been onvoked according to the above.
+# The test phase appears to require the package to fist be emerged, which ...
+# Until the distutils_install_for_testing func refrains from failing with
+# mkdir: cannot create directory ‘/test’: Permission denied
+# reluctantly this phase is assigned
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		setup.py || die
+	# use /usr/share/data
+	sed -i \
+		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
+		"${S}"/lib/mpl_toolkits/basemap/*.py || die
+	distutils-r1_src_prepare
+	append-flags -fno-strict-aliasing
+}
+
+#src_test() {
+#	distutils_install_for_testing
+#}
+
+python_install() {
+	distutils-r1_python_install
+	#  --install-data="${EPREFIX}/usr/share/${PN}" on testing is found not to work;
+	# setup.py is a mess. Someone care to patch setup.py please proceed; substitute with
+	insinto usr/share/basemap/
+	doins  lib/mpl_toolkits/basemap/data/*
+
+	# clean up collision with matplotlib
+	rm -f "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py"
+	# respect FHS
+	rm -fr "${D}$(python_get_sitedir)/mpl_toolkits/basemap/data"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/basemap/basemap-1.0.7-r3.ebuild b/dev-python/basemap/basemap-1.0.7-r3.ebuild
deleted file mode 100644
index 97bcfc3f839b..000000000000
--- a/dev-python/basemap/basemap-1.0.7-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="matplotlib toolkit to plot map projections"
-HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap/"
-SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
-
-IUSE="examples test"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="MIT GPL-2"
-
-CDEPEND="sci-libs/shapelib
-	|| (
-		>=dev-python/matplotlib-python2-0.98[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
-	)
-	>=sci-libs/geos-3.3.1[python(-),${PYTHON_USEDEP}]"
-
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
-	>=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/dap[${PYTHON_USEDEP}]"
-
-DOCS="FAQ API_CHANGES"
-#REQUIRED_USE="test? ( examples )"
-# The test phase ought never have been onvoked according to the above.
-# The test phase appears to require the package to fist be emerged, which ...
-# Until the distutils_install_for_testing func refrains from failing with
-# mkdir: cannot create directory ‘/test’: Permission denied
-# reluctantly this phase is assigned
-RESTRICT="test"
-
-src_prepare() {
-	sed -i \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		setup.py || die
-	# use /usr/share/data
-	sed -i \
-		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
-		"${S}"/lib/mpl_toolkits/basemap/*.py || die
-	distutils-r1_src_prepare
-	append-flags -fno-strict-aliasing
-}
-
-#src_test() {
-#	distutils_install_for_testing
-#}
-
-python_install() {
-	# mpl_toolkits namespace provided by dev-python/matplotlib
-	rm "${BUILD_DIR}/lib/mpl_toolkits/__init__.py" || die
-	distutils-r1_python_install --skip-build
-	#  --install-data="${EPREFIX}/usr/share/${PN}" on testing is found not to work;
-	# setup.py is a mess. Someone care to patch setup.py please proceed; substitute with
-	insinto /usr/share/basemap/
-	doins  lib/mpl_toolkits/basemap/data/*
-
-	# respect FHS
-	rm -r "${D}$(python_get_sitedir)/mpl_toolkits/basemap/data" || die
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/basemap/basemap-1.0.7-r4.ebuild b/dev-python/basemap/basemap-1.0.7-r4.ebuild
new file mode 100644
index 000000000000..38c0bfb4645e
--- /dev/null
+++ b/dev-python/basemap/basemap-1.0.7-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="matplotlib toolkit to plot map projections"
+HOMEPAGE="https://matplotlib.org/basemap/ https://pypi.org/project/basemap/"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
+
+IUSE="examples test"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="MIT GPL-2"
+
+DEPEND="sci-libs/shapelib
+	$(python_gen_cond_dep '
+		|| (
+			>=dev-python/matplotlib-python2-0.98[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/matplotlib-0.98[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	>=sci-libs/geos-3.3.1[python(-),${PYTHON_SINGLE_USEDEP}]"
+
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/pupynere-1.0.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dap[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DOCS="FAQ API_CHANGES"
+#REQUIRED_USE="test? ( examples )"
+# The test phase ought never have been onvoked according to the above.
+# The test phase appears to require the package to fist be emerged, which ...
+# Until the distutils_install_for_testing func refrains from failing with
+# mkdir: cannot create directory ‘/test’: Permission denied
+# reluctantly this phase is assigned
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		setup.py || die
+	# use /usr/share/data
+	sed -i \
+		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
+		"${S}"/lib/mpl_toolkits/basemap/*.py || die
+	distutils-r1_src_prepare
+	append-flags -fno-strict-aliasing
+}
+
+#src_test() {
+#	distutils_install_for_testing
+#}
+
+python_install() {
+	# mpl_toolkits namespace provided by dev-python/matplotlib
+	rm "${BUILD_DIR}/lib/mpl_toolkits/__init__.py" || die
+	distutils-r1_python_install --skip-build
+	#  --install-data="${EPREFIX}/usr/share/${PN}" on testing is found not to work;
+	# setup.py is a mess. Someone care to patch setup.py please proceed; substitute with
+	insinto /usr/share/basemap/
+	doins  lib/mpl_toolkits/basemap/data/*
+
+	# respect FHS
+	rm -r "${D}$(python_get_sitedir)/mpl_toolkits/basemap/data" || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index ebc1a6b31c8c..a6b3d14820e2 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -2,5 +2,5 @@ AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca9
 DIST bottle-0.12.16.tar.gz 72248 BLAKE2B 21b5bc376648baec74577ac5b57fcacc58899babe07a034a436d5e2bde75a9e2e48b2569c5caf1478e77790c5fa327114ab9b084f014cc1ba97637d9ddfec659 SHA512 3c167f95902522c8f264e8478403da8e9b8cd84594318c4a773d38b7548b5ba95c99ef922033f6885cdc044b31f9c2e2f7ed263886637ce2a048e99c0c6e1403
 DIST bottle-0.12.18.tar.gz 71557 BLAKE2B a34cc1ab9a2a8505b7fda8bbddbae30b4e6c4829cae53f0f886237a21fdfa7f2b2463b216d7a16464539f41bdce4c1dabb5cc66027b8fdd19b10e9a78a3cdbb5 SHA512 db8a341cd80d755205518bb9eac5b79dca9e541ab3ad9d9d57f891d895f7df75a8facd16b068cbdf7c4f884f35e384449f4cbd565a43e9c5d000d3a9f5b7dcb0
 EBUILD bottle-0.12.16.ebuild 1477 BLAKE2B 298e895147ca927d982c649109d3f40c515f11e81fa3367b38dfabb4b8263d884e4b83103999fc204da51b060aebad10a744350def2639db8103db95dadc2c90 SHA512 7c6cecc35d259c77fa1037094300119c0845dfd62307c7e0290d908eae6173f45a5daf4c85d78089102b2fffeae6c5af3c1b2a158657d897d749b4b77636fb38
-EBUILD bottle-0.12.18.ebuild 1395 BLAKE2B 9cf0ec3cc42de061691ff79cc27f22ece1a4126e9ea8063f3c3a262650b0f4db38eaff5d839e460d64e2edd7e4f9e9e4844359c44e6ee737a1c413217a2c70ed SHA512 773dafb7ff8cf1d63b2d30ac55ececa78513234ec03512ef7bf0fbd88fb4abcff1f9bf9d36603d94771fa3afc6cf2dbd32569fa6f427267140c1b64ea718768b
+EBUILD bottle-0.12.18.ebuild 1394 BLAKE2B cfc813b8464288e250b5d424d660c8b4fdb64d49068a9b7b294a6c099959bd99ee6867822caa9fe5b6a0d7809f7576048babb2abad1ccb7148138ed9e6b1bffa SHA512 85aed82838651e5d381829f92662e2428dae1f11d3fefbbc9b1a28f8dd0c054058fea133bdf33156034e51253f6260c517113148b7ac9588ebc5a34516b42257
 MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
diff --git a/dev-python/bottle/bottle-0.12.18.ebuild b/dev-python/bottle/bottle-0.12.18.ebuild
index a192f79e796b..c613baf70eb6 100644
--- a/dev-python/bottle/bottle-0.12.18.ebuild
+++ b/dev-python/bottle/bottle-0.12.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 1b518524846a..2151d3d56fa0 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,9 +1,3 @@
-AUX 6.5.4-fix-requirements.patch 272 BLAKE2B 9694f577198f94ee1634468750f4ca8a1d66014fd8f3a65719d53bd27d99855a76478a5946e4a5c9f3515ad39be28bd12829f7672e83c7b887740ae0dd2e6418 SHA512 de0d3be2d062cb6a3088eb4e75f0ea97f57c81ee2d207acfb28780a757adddcd4e1e718ff6afe27cf98981db5d8347186ba74bd89a940f8b7ac406429a4759ad
-DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
-DIST cheroot-6.5.4.tar.gz 81067 BLAKE2B 5304373bb8c7cefa341260d4fdb8a99b9e22041260342a716a6b95ba324b4f31d20fb44d8dc10840fb35d3b04de1283deb9aca11bc78772655bf7ad81cf16f3c SHA512 62a48ced225bf9167259b82f5e88a953bdc422982a6c0b0121b28e895cc8347cc033f573b57a048c59167586e0b21e94ad233ce2b65a1b72feb01db82b5ed411
 DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929b398a8143bc157bfe71129b11a1f4bc841f586f98167ac4c6c9680d476bd167323e5828163b4bff9bf24c360 SHA512 3f6b55c6b2403569eedb1fe7b473d3a65ad5d06cb99a38370316db38b6138b1a6921c6b7d8ba64424c5b8c20c9c58ada33da7cb8ebb6f313610f63c1f364f862
-EBUILD cheroot-6.0.0-r1.ebuild 943 BLAKE2B 1e84889e62f4efb283ef2c4abe3a2f0a9d3e7464c30e5cc72c57db284a342475bfcd8cefe550dd2d95c3cd1ea71caab9798c291ded24d32c9357b4cfc4b5d35a SHA512 23b327c91237de42cbbedec267e92daa21db8859c3ada6b2b43ce1b6d3250e05f84a363b67b5b9c26ab1150c451659042433dc8cf6bad258ea3dbaea8f9f2d38
-EBUILD cheroot-6.0.0.ebuild 939 BLAKE2B 203f682d77983b1ec4e35ea8b0fe338e477857251e0d41a4ec527f807aaff4688febf7204e277661bb5905392b7d7494c2e8e8311c1a32b538eeb818e8557de0 SHA512 5f27f8e812d13e3e4f53a2f46631d2a3925a9377f5998e4583b9d60074b4a4e6513083274fae2c11313bbaf6da5e2ba9e361a293be7925a147ee1b1573f0a783
-EBUILD cheroot-6.5.4.ebuild 1745 BLAKE2B 1ca8732f9e3c79bae1190cf9c04a777e9881608558b4a040ea0f58c12165dc32d1c86138aa2b83eeb2b8fa496460284c4aaebcad8d459169f9eb85d9304e4f75 SHA512 f5dfd7fd14360e6d1ad5ac5058c3aa4003a803cdfc19370617e14090255797ee646300bf2121a32bb7f1f981b08368842e13b7c48d3755915938d2f43d62699d
-EBUILD cheroot-8.2.1.ebuild 1676 BLAKE2B 755512ff087835b6b6439fd0e928b3c8adf9d20a9a11e32c95d6d72af595e426417d5707fb26edf0388e72205461d54f3031e249de1b7ad72a746b8b43b3ff1d SHA512 65b07359f0e3d9724669b9898f5016c3602922b68b4b258854f4d2c9d0ce01b20968edaf49c9730a0478993a54aa96737a22c0a029342398069b10e13ab2fd55
+EBUILD cheroot-8.2.1.ebuild 1757 BLAKE2B 9e25ffeca160774f857f393cc8d31f44fb043044513dd3ad12087110446fe52e89544fdb13a70988219e0d7defd6726da05702fb668979a432b8e9c955162b7b SHA512 4f85326044aa875dabf690395d86013718441b1fae9274c6799ea5208b34c4c25f2b785ac71f691382d3eae52f632478e0f5758b83dbecb0daaeccd6192a342f
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild b/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
deleted file mode 100644
index 1022ae4c9243..000000000000
--- a/dev-python/cheroot/cheroot-6.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	<dev-python/setuptools-41.4.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPTYHON}"
-}
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
deleted file mode 100644
index 586c3328f4d9..000000000000
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	<dev-python/setuptools-41.4.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed under ${EPTYHON}"
-}
diff --git a/dev-python/cheroot/cheroot-6.5.4.ebuild b/dev-python/cheroot/cheroot-6.5.4.ebuild
deleted file mode 100644
index 6a80492c572d..000000000000
--- a/dev-python/cheroot/cheroot-6.5.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-# Unit tests are temporarily disabled for this version, see below for
-# what needs to be done.
-# IUSE="test"
-RESTRICT="test"
-
-RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	<dev-python/setuptools-41.4.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]"
-
-	# Add the following for unit tests, some packages listed will need
-	# to be added and keyworded appropriately.
-#	test? (
-#	dev-python/ddt[${PYTHON_USEDEP}]
-#		dev-python/pytest[${PYTHON_USEDEP}]
-#		dev-python/pytest-mock[${PYTHON_USEDEP}]
-#		dev-python/pytest-sugar[${PYTHON_USEDEP}]
-#		dev-python/pytest-testmon[${PYTHON_USEDEP}]
-#		dev-python/pytest-watch[${PYTHON_USEDEP}]
-#		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-#		dev-python/coverage[${PYTHON_USEDEP}]
-#		dev-python/codecov[${PYTHON_USEDEP}]
-#		dev-python/pytest-cov[${PYTHON_USEDEP}]
-#		dev-python/trustme[${PYTHON_USEDEP}]
-#		dev-python/pyopenssl[${PYTHON_USEDEP}]
-#		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-#	)"
-
-PATCHES=(
-	# https://github.com/CherryPy/cheroot/issues/181
-	"${FILESDIR}"/6.5.4-fix-requirements.patch
-)
-
-# python_test() {
-#	py.test -v || die "tests failed under ${EPYTHON}"
-# }
diff --git a/dev-python/cheroot/cheroot-8.2.1.ebuild b/dev-python/cheroot/cheroot-8.2.1.ebuild
index decfdd37481d..2254cb7b0145 100644
--- a/dev-python/cheroot/cheroot-8.2.1.ebuild
+++ b/dev-python/cheroot/cheroot-8.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 # Unit tests are temporarily disabled for this version, see below for
 # what needs to be done.
 #IUSE="test"
@@ -21,9 +21,7 @@ RESTRICT="test"
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 	# Add the following for unit tests, some packages listed will need
 	# to be added and keyworded appropriately.
@@ -45,3 +43,10 @@ DEPEND="${RDEPEND}
 #python_test() {
 #	py.test -v || die "tests failed under ${EPYTHON}"
 #}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
+	sed -e '/setuptools_scm/d' -i setup.cfg || die
+}
diff --git a/dev-python/cheroot/files/6.5.4-fix-requirements.patch b/dev-python/cheroot/files/6.5.4-fix-requirements.patch
deleted file mode 100644
index a5a493704cfa..000000000000
--- a/dev-python/cheroot/files/6.5.4-fix-requirements.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.cfg	2019-03-09 17:14:40.127863655 -0600
-+++ b/setup.cfg	2019-03-09 17:15:22.135345396 -0600
-@@ -57,7 +57,6 @@
- 	setuptools_scm>=1.15.0
- 	setuptools_scm_git_archive>=1.0
- install_requires = 
--	backports.functools_lru_cache
- 	six>=1.11.0
- 	more_itertools>=2.6
- 
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 647a69b9ebf1..d10db83ae536 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,7 +1,9 @@
 DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
 DIST cloudpickle-1.2.1.tar.gz 42138 BLAKE2B 37579a1dbe6c38697236273f67221d2cc497c1bb92a268e39339a9c55a348645cd6e0872ef720e19d0e891359ad6e0af3b6cba8416c431c79979c68c53f9aa7d SHA512 5ec7ddceff7c43e46011370ba00f693dc669a1b3e1cfc42b42483850879d6246073ed20d4ca92698984b4935f5b69e5ae0dd96dad82de3f296e38ce7b644a6d2
 DIST cloudpickle-1.2.2.tar.gz 43576 BLAKE2B 9b99d106196ff88bde8c8add2eca7dd0c6118c89b3d68892b17b11ad73435b83387490e4c5c52306b4355033595f9783e3a313a6bd58f9eebf4517ff77d486b1 SHA512 44f41433bdb12e6495c14b7a470ee671fde3fcddf1a57d8f6d1203925a63944a1458af3ae7fc0353602f9900bd92581699b1f7ab199668f0425447ed8337bfb8
+DIST cloudpickle-1.3.0.tar.gz 46220 BLAKE2B a7ff773a38aae3b4a404ba7e931de06756ce95d5e45e4c204ac7ed93a3d2e7171667aa1995434f249971b2774658d1766935a7d7d3675cd4c727180221adb299 SHA512 b128a9088b36460bf3cf4edf4876ea768291de3c10c9cb6919507c4493a808136edcb819a98eb69de610e7162a96f859bae2f5c5616b558d9fea102835df611f
 EBUILD cloudpickle-0.3.1.ebuild 636 BLAKE2B e22251c43b8083e5b1575f505f8b5126d1afd275a82437318ce2b3d0b24623719838b0c065adf55d95dcffe4b72efd649157344e9f0e97d92c7bf466634d34aa SHA512 acb3a830e77ccd6659c49a57ccde19dc191ae61fa62a6f76967971799f93d82ca8ba361c3c499d114868def7cc7d072a3b1e571dc17323c7f23b1351f56d7439
 EBUILD cloudpickle-1.2.1.ebuild 745 BLAKE2B 9631d4066278bd4f8e3013dacc50a15b906895ef8445c7a4adce80bfa8f0347652163f23d8778ca49dc9964c8c8d3735fbe99568f0ec2a0aeecfaa4adfc24b9d SHA512 bb4a12aac5cb563b6224b5d18fc01575de5c8042cc44e74a2bcbcaf0ae4b113ee518667dbb4ab7602a47ede91f06457827a3ad6466cd042789a5aaf934d7957e
 EBUILD cloudpickle-1.2.2.ebuild 746 BLAKE2B d76b4eb9ebd1f0ec0ac71ca310633634fa5f91bfecb734afaf704f8feaa1fb86b8274f9a4b1fe935aa63ad3b7ee6441e495a725b3adda833ff5735cd1092d0d2 SHA512 2c50d862b22cbc2e924ccec83c0d9257f008f2836179617a6017f5c768a2d8194712316da3b110e78376ae7ad4d0efaf87f3814cfb3f293cd4ffd4c226663635
+EBUILD cloudpickle-1.3.0.ebuild 749 BLAKE2B 3e39574d1059c0ea5f29a01cf711aa343832aa89f36ac314d9535b8b7d2c05ed68437a310a793a6a1e131f257793a167e1edbb38cf36568be3bda4c3a914183d SHA512 873151f63b58283397037962f1c753ff2acd13445de73032a87ecb69c1e59e5f75e2c5c50e73f12ad4342270b429149c91439bc73425dac81b3031fd52973d7b
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
new file mode 100644
index 000000000000..53afa50fb9ae
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-1.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="https://pypi.org/project/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	pytest -svv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index ba964c58a48b..8acd609050d6 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -2,12 +2,10 @@ DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b565
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
 DIST cmd2-0.9.22.tar.gz 565214 BLAKE2B e0f950c1bc994bbc3d1ddf2a526a97d61c1aa59c6089574518d2222c385ecf91f53fcc0e6dcaa84460cc4a6647bc5baf37f12c6c9bf16fdb3db14cf15a05bd18 SHA512 1ff5cbea130ef3729c021144ca27a31c0e9cb8b2977eca454a0f528c468180e822fa8d23e7b07846a5109ad38bf12565b613b8295751f94852d9251c4e8d6edf
 DIST cmd2-0.9.23.tar.gz 568514 BLAKE2B 02070a72ec42cd04f3f647eb6344b48a5149e21a8a87be713dec837d48295c6b919f55229fb09d013f1722ee111f8a75958e884c18b2eaa339097ff81554d8c3 SHA512 ea00a17b206d6312b0c2ae6b982f3fe4634f7717286a475438972780a1510b37120f007907f632338eafd093d03cb0e928c705e54a3aa8295f7aced73630a2f2
-DIST cmd2-0.9.24.tar.gz 580456 BLAKE2B 0f4e32c52589d7493db13aafcff1dcc37b45d27120f546baed0e3541398f7ffde1a381b44fb4ba2f822ffaeff0ae52b7ad5cda509370685c480a76e1d677f7ed SHA512 0d9cf8d203914f9a62ff15fb538440a2a506b1751c381cef75054839f04fedaa3c6a43b7da8ed99dd0c3b17b55641e2a1cf90826cc7948d2798dbb45e53b6639
 DIST cmd2-0.9.25.tar.gz 576329 BLAKE2B e3608df62ed47d04b039a71bf876556ac7c6f9dc0355d1593c63ca365fd7baf207a2b4169525911e85c98ffd38c1a603023a9851a2ffc556a99970d57fd393fb SHA512 7361c81ca0dc0276ade2e0de471d86865801b193db8c1fc4064cc8d7311083f95d6e20c67c5540b9e162d37976976d82bc609a0be6524be113fe4b7d3b6d627e
 EBUILD cmd2-0.7.9.ebuild 890 BLAKE2B 487bcb215e12de6e29fcffce6b7d3d6284fb762e5a8f16722c7ab16696415d0ce615f9ce03d34f2e8dfef5b7abf8d5c1d2572055acff8d38be1b69707baaa912 SHA512 7864c9455ee3b068026832e29371d8cb844b7a43e0e826dbe88fc42ff9b12a6a23259705c3e321ce8637e4d0dade5226f678de4564329d8dae416203801900dd
 EBUILD cmd2-0.8.9.ebuild 977 BLAKE2B bbf9af55c9193292961166d278515b5ea0977ca77101e80f7a4d121f0678b512f3e2b67dcde76081b26d736294581a239f5033878c8d6b800d2027659ee53f04 SHA512 b2c39ffe37743f0cead927ca0b120a1ac6cf842fe7235168be60a8fbff030905c02bad38db316ac92a5d30eae018677473a4acae2b2a48fe07dcf10755b898b5
 EBUILD cmd2-0.9.22.ebuild 984 BLAKE2B 0972dd77534ff95c19354c2befd9b278422a5316b937c65faa1f12d268ff209034dce75f655a77975c8c166c9fc049640083cd4e92b543b0ed73904e980506da SHA512 54b39773b49af3479f43932affa8257c9313387309d735223718e2ebaaa3c66acfb30e418d35d042aac0f839e3557f4f497dec2b25b18df4c5a305740cac8165
-EBUILD cmd2-0.9.23.ebuild 875 BLAKE2B 07901fcb94d8517f5b0e865203f7a447dec469f0014724da7f6714f9523eeec5460bd841829bae7558cbeb3450484809dc6591cba0562d334e864b6a8829a58c SHA512 37f24d5b354b5dbde620c55c4b3430dd26ac380918481ac083c586e0cc5d5a5fc1d632da0e7e27152d54fd28dbcf66dfabae743d736e43f0cb37bdb6bd87d215
-EBUILD cmd2-0.9.24.ebuild 882 BLAKE2B 46429886785033d06affa3036a9c0875dcc97d02e003fa059e3f15e0370d3e08483dac9f43c491dde48b014d68c015af2160346f7599974e877b1f0eb5c89bb1 SHA512 cc0a636ee115f1677c987504411434ff2047aa1db5bc0392fbe308e78f2295743bbdde4f394258b45da5ebda3179f2299f2186148a8699d7f7adabfbe20110b6
-EBUILD cmd2-0.9.25.ebuild 841 BLAKE2B 0b8ff83c19092accd68d8b3bf58ae5c8c2fe3c416e5c4e937efeae72d3e8815d5b22b431fe6e7f0ff71e900987b8ab1695425aea36a19171420e6c1f636524e2 SHA512 cf45b822dada703a4939416bae1cc6de55edbbf96f5372811fddcee13be527c5b858985775be9d6ee395bb55aa3a0c5f20b303095d78611267a0406ff0ca1383
+EBUILD cmd2-0.9.23.ebuild 878 BLAKE2B e812aefe4e7f2fe7f8d125b251a1c5e1e4d0ffdfbf464a2dbcbb55f2a22660b5870d7253c174a244fbf930cbbc4ccf788938d26ad1e1169a194ce399a2ebc9a8 SHA512 17b80dda09d7dfc89c5e824b0f3c9749493f8eef45e7fc2f80337944b7c66771b24b0794e0cfa489d5074287988486c2ad828cf4376eeda7a5e6bea7da6ad95b
+EBUILD cmd2-0.9.25.ebuild 846 BLAKE2B 4970c9d5f97d1fe7606968e2b56a72e5ab136d96d95fefadde8c1196ada644292d711a933ee08a3209e8fc51e8c27168db2ef60bd47c5703cef3fa3f5fe036d5 SHA512 a33251d3adc79d3b584aa08de493684f2c05775b4bec00101e25416eb196aa0982d4156b927c05a775fa0849e8a6363fd1ce87ad802b91f69539073ecd718369
 MISC metadata.xml 496 BLAKE2B eb23ffbf044908e43bf041331d04a6d9f70f608845398e9ab5a49150a2231877bb5daeecc14f3201344575c6ce6c254f60c506b9959d82e6464b124532ad7ec6 SHA512 21d529f12aa96fd0a2b444daa1fc44a93a09c06c190c984f357d9c1cc167379e9f42997aa8ac284b603515bdf38742185646eb9f457ea5898e87834fcf09bdd0
diff --git a/dev-python/cmd2/cmd2-0.9.23.ebuild b/dev-python/cmd2/cmd2-0.9.23.ebuild
index 502253d32c93..0290ae63bfa9 100644
--- a/dev-python/cmd2/cmd2-0.9.23.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.23.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/cmd2-0.9.24.ebuild b/dev-python/cmd2/cmd2-0.9.24.ebuild
deleted file mode 100644
index 78b85c913b6f..000000000000
--- a/dev-python/cmd2/cmd2-0.9.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
diff --git a/dev-python/cmd2/cmd2-0.9.25.ebuild b/dev-python/cmd2/cmd2-0.9.25.ebuild
index 0a6f24240007..dd0714d43c10 100644
--- a/dev-python/cmd2/cmd2-0.9.25.ebuild
+++ b/dev-python/cmd2/cmd2-0.9.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 4aaa07aa4f26..c5378f45ab47 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -4,5 +4,5 @@ DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 EBUILD coverage-4.2.ebuild 1239 BLAKE2B 26b4914acabd505051a51800cc21603fe5cbeb6246302535a6b962d6bc09fa281acbcfd6369ab754b8fc431d5049c6614b6dbbfe871e927d9be558a26bf5f222 SHA512 b3e6a1587e6faa4d8f31263737cb2bc3c6b9c5d4ce4eb7cab127919b955b49cf2c027ad72d16491cb3abd7d00aae5062eb193a47540899c018cfe40ab6348cad
 EBUILD coverage-4.5.2.ebuild 1238 BLAKE2B 9d939b333e89f4142ddca84df803fbe626035f732b51924c5257a5ffdd5a3647e5ea44f4d9c2161ae1c3a9cb4daaaabdf7d6ce69a25cd23a10b210feaa72f21d SHA512 727d33c349e6af343aa76ea8e325dcdfc5e5b353505beb85ece08230f2adfa3c77fc06814432e5eed29ad4076aae06aa5cfd83706d2f8c9088ca2a6c297627ef
-EBUILD coverage-4.5.4.ebuild 1733 BLAKE2B 3c82cafb1eaf929a0e7ab17db615e796bbbbf204432167b88260d3bfbf73a1c888058e9aba16963de00b6f170179e7011d18f24908c6e735c8fc66dd9f43c76b SHA512 6184ae7b6b1926b88f35417bdaed9358fae0af316a48b126e233cb166ac7eed4e035c5ae5e20d08a68b09701cb7224ba69be32620738adc873c265be813a26b8
+EBUILD coverage-4.5.4.ebuild 1738 BLAKE2B bf55718148e320add79397487ec3f6bde422d613d77732c7ada9425716b80c87e6a08f1f1cf1a11b362d0ad88c9ed824636f1cb3f49d4ec4a0021ea75d05790d SHA512 035b106a2721cb9fc5f014048e69c992eaef5e9fa6ba5608152c25413fc802ab0fb914f249d0d908b6d36f31d4f331ebebf7eb1dc269e8dd844f206e7459942f
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index f6013f4246fc..8e75dcda6ff6 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 7866c6e03748..1188086da75a 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,12 +1,9 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
-DIST Cython-0.29.12.tar.gz 2050537 BLAKE2B 86c5ffd07e97d549f2d98ae0aa66a03dc2f8e86b3fca304f3fba69f63c1e6d176c57d19f4877cdfd500ca2ebed2eaaebe1ed7cea0099fa23bc7a08c23f1b4f26 SHA512 502756331d8c3618a75a881fc1a20b7e871cd3412904070f3080d5bd0918440230fdae96f096c255fec6b32b81ffcf838f22953b8da23b8845527810f457be60
 DIST Cython-0.29.4.tar.gz 2044382 BLAKE2B b36d27706a3270805f66190a4cf2735eaf20b1b932365b324a433c0e58e63e860ce1500333233c3539ae697886ac0adc361a2c158d5d064a3ea05843debc3f26 SHA512 8f115e36975aaf64eda4df8b0a85378d0c80b3292dbd162be826b939def03bdc9f3eb937676e2367003c2944b570d97f50d7880becfdb2fdc5144077b4a722dc
-DIST cython-0.29.13.gh.tar.gz 2072564 BLAKE2B 55a8c5c932262972cfa55ee2771e17ab5a57beab03d0dac5668f654a0bf68850ef62b7e59b322c527115af48b7243b9c919e739eaf440338a50b89c4645c0fbf SHA512 79efebfddabf31a046ae86a2c2170e0956098f4b1c7b8bbd338d30be7c96c31ee2d648332fc16ad9cf1e5d0ea4ca1a070b2d31ccbeae0c0f86a2f7700b92f656
 DIST cython-0.29.14.gh.tar.gz 2075030 BLAKE2B 12bbc2979c34fee9b498f5425d2cea5cedebda474e3f4ee6c9eb3185a4e33fc84df6c16454830316548e36cd9fb7c47f0925b0d6e16b325cbd81f8747c7e492a SHA512 fa1575fc5ec7ee19de34f91a15bdd45d889f54217dbe2a9654604ada90d8d86fe7bceb86449c41b68d6b65459769916a0d7d5f5da21c5597aedc876cde4e37df
-EBUILD cython-0.29.12.ebuild 2205 BLAKE2B 562168a2bcff3f94a596a778937559a7e1c59fe9725455ac418b928a857e8004b18bfa28b5f35ac1cea25f76ab118615c30b5cb47604bb01b59ddfdfc6cce612 SHA512 929ff6c6dd6ff3b79e8961814a1986cd0b7e921435d512a991c811e64dc5540ec63a4a5e97c7c31c43c19414688b13134af2dd4eeceaa5231e1e462a646a6ccc
-EBUILD cython-0.29.13.ebuild 2000 BLAKE2B 03140f3fe420923488c9099439cc71d406620cf5f86c6576cc9841299138918b87c368920ad750b6a9d9c6d98fa82177e6bea37cb612b0e46574a24b41c86a33 SHA512 fd41fdaf8bb98d9210d0b8bc2cd74339a821acf4585a281b7b5c7db59a25fc5a3e4d219268bef5712d9e1a4b70867410af7fb5cd6ecc34dead62d7f44a19d909
+DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
 EBUILD cython-0.29.14-r1.ebuild 1965 BLAKE2B 24f822ffc042de44f22cc32306f70471bdef6357d215bf8b4cd6b850f86da11de1822aecb078b569e2a934cbfe791069d16d78e5d4fe85ba8f6619c08608f659 SHA512 2d81f01b57dcb5734a2ba067b872f2fbace9768d928c757e68084938c65498afc2adf56905f5679250d436a4db8b73ae35865f0134145c5955956aa5be7d3634
-EBUILD cython-0.29.14.ebuild 2000 BLAKE2B 03140f3fe420923488c9099439cc71d406620cf5f86c6576cc9841299138918b87c368920ad750b6a9d9c6d98fa82177e6bea37cb612b0e46574a24b41c86a33 SHA512 fd41fdaf8bb98d9210d0b8bc2cd74339a821acf4585a281b7b5c7db59a25fc5a3e4d219268bef5712d9e1a4b70867410af7fb5cd6ecc34dead62d7f44a19d909
+EBUILD cython-0.29.15.ebuild 1965 BLAKE2B 24f822ffc042de44f22cc32306f70471bdef6357d215bf8b4cd6b850f86da11de1822aecb078b569e2a934cbfe791069d16d78e5d4fe85ba8f6619c08608f659 SHA512 2d81f01b57dcb5734a2ba067b872f2fbace9768d928c757e68084938c65498afc2adf56905f5679250d436a4db8b73ae35865f0134145c5955956aa5be7d3634
 EBUILD cython-0.29.4.ebuild 2177 BLAKE2B 8861209ff6f7180426a211af4f2c4e4599453f5f7ebc88f4c5b2aa97ebb62212f92f53f74f32f59c5d0f9fdb68e4853e0527d80e24dea4228bd8d5f8fd479571 SHA512 7ed078aab823d630698cce99e0c466a3c7d3a089874ae643745c0f3be91c124fca412228707a2f8a94d602b50b40ac6bc301247f9a10fac04f20a48518fa3a3d
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.12.ebuild b/dev-python/cython/cython-0.29.12.ebuild
deleted file mode 100644
index 3409b161938e..000000000000
--- a/dev-python/cython/cython-0.29.12.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
-
-SITEFILE=50cython-gentoo.el
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-python_prepare_all() {
-	# tests behavior that is illegal in Python 3.7+
-	# https://github.com/cython/cython/issues/2454
-	sed -i -e '/with_outer_raising/,/return/d' tests/run/generators_py.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.13.ebuild b/dev-python/cython/cython-0.29.13.ebuild
deleted file mode 100644
index dcbdd3965218..000000000000
--- a/dev-python/cython/cython-0.29.13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python*')
-	)"
-
-SITEFILE=50cython-gentoo.el
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.14.ebuild b/dev-python/cython/cython-0.29.14.ebuild
deleted file mode 100644
index dcbdd3965218..000000000000
--- a/dev-python/cython/cython-0.29.14.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python*')
-	)"
-
-SITEFILE=50cython-gentoo.el
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-
-	use doc && emake -C docs html
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.15.ebuild b/dev-python/cython/cython-0.29.15.ebuild
new file mode 100644
index 000000000000..460ca46f183f
--- /dev/null
+++ b/dev-python/cython/cython-0.29.15.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 221834eb4ae6..a1f403eadf9c 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,4 +1,6 @@
 AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
 DIST dbusmock-0.18.2.tar.gz 72031 BLAKE2B 44b46f05e48f1178fe95e44c83899bbef5bc64dcee856be1b332890893a5b901a03c236ad9a8cc6cf2ece83efbf5ec798551320a098736ff95c13951333ffaa3 SHA512 2421cea872e1d84db639cae0d6cc10c4b80ccf64903b7b3f437cb58ad8e3d957c30c871f9666a7a7774808b4b56d6116959ea03fdc8b575ed98023b77b61c8a0
+DIST dbusmock-0.18.3.tar.gz 72049 BLAKE2B b5ed8ebcae51fedec75fc810e07dc9a38223bcde541cbfddd5d3fbf1ad45d1458e6ad39c1fc69ee77165d751f978cb4483929e823eacbc99a7ae414aebf4d0f0 SHA512 6f7b42eae578ce03024b3b5cc85e82f04a467803f4c8b4cb5193454dcd849038f11e6ce5028ca9dd57ea5a9380c1b754d8fc644b4a24b51deee9e87b409115c3
 EBUILD dbusmock-0.18.2.ebuild 1064 BLAKE2B 282628d0121ef32532f38bc4e98e42bc1636025f5aa8d776a3d9c448ce951285996708a39b05ff6c6ebd2cfe9e1d8aec49eb0981151da22970868e6f5714ef3d SHA512 b3ed90e0af1c5baaf6cf2df15674d9db6766fe8a0e834bbf98fc0f2817dcc5a34e7233272c75a091436683ddb0ebb8e7a1b86239c94d403803c5c60f69d2a53e
+EBUILD dbusmock-0.18.3.ebuild 1070 BLAKE2B af889080fe68ef1dc482f3b757d34e2f268cb624c62b03c15ab447d05d7d41614e049c44ae316303d1290e7e8d90de5ebe456eeca4904deed8eed66e985856a2 SHA512 329732c23ff30e72d30db38b412a8f547cdb26b150036c32922776a79adb1d484a79b7fee6a0b06e26409c38fb9ae7ce5747d38b7330ccf5f53eef4993d5acd7
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.18.3.ebuild b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
new file mode 100644
index 000000000000..b5aafa09a899
--- /dev/null
+++ b/dev-python/dbusmock/dbusmock-0.18.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Easily create mock objects on D-Bus for software testing"
+HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
+SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/0.18.2-disable-polkitd-tests.patch
+)
+
+python_test() {
+	nosetests --verbose || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( NEWS README.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index c3c487d573bb..10bc3bba940a 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -3,6 +3,6 @@ AUX entrypoints-0.2.3-setup.py.patch 614 BLAKE2B cd5248f366546bbba8c068d8a27f585
 DIST entrypoints-0.2.3.tar.gz 11219 BLAKE2B ae7745a075d564b3cc25a0580ae9f30f6e1a0b4bca7315c4fc3700408e4ab3762831212a451eb937ab94096d1db5c1478980b216dea7cfb95a8577d6337534a0 SHA512 dbf8085652e50cbdbe137ae655ef765cff58bdaa6beefebf1383dcd96dfcbf9c92580c09e9a58de7893aebdd7b2a701ef8d13a56ef0fa9a3d9ef7a5bd1d9b11b
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
 EBUILD entrypoints-0.2.3.ebuild 1357 BLAKE2B 11258860058a99be69c2416ab04959b0ea2a8d45427eb2d499bf1f746c0d381ea8426f33e1cd96093d401c9ff2b0a85ec9465c1d6cfbe80666761a3a3664d519 SHA512 bbeeca80307a6e13fccf9310581713bd9cec9e1652ea3056778234663f38d72911b5c54321c52d7ce8855f198c5142b3f1d559bb949c598336463c99aaad7622
-EBUILD entrypoints-0.3-r1.ebuild 951 BLAKE2B bac82ab1415336e7c3ffc793595cb10001b0d5bd0097d5f4eb6cef00eeb0d022f9dce26f41acae9b5fb316c3fe1735937a104a80429ce67d30648206760f43ce SHA512 2cd1db15ff22bd03b87698dffa32efb324d03c73068fd4809defae4133bbb4fcaccc8665437aef0bc28283781a9c65ef8ce68c1d8bd38954d52458f4c7cacc62
+EBUILD entrypoints-0.3-r1.ebuild 950 BLAKE2B 41afd23201394f3532f4c7bc78acfe7d4cf0540fd4d737dbc1ce90bfb9995ff6fdf6efdbd736d2a7de199031dece933991ecc7886fd426e45e07523e010a3a13 SHA512 dcf0d26775e1f42c23c323845afa42e3cd87f716b43f229fdee16c84d89d5ad072579939e855263bdd51e460b839652d933880c6de8a68ccb2a819b201e2a7d0
 EBUILD entrypoints-0.3.ebuild 1224 BLAKE2B 489a8b96463ff0ca2893c7c3b37b98f28f237326107fa20aa27b630fc66776c719c65473160c9b64899af22dc28f794dd474e50cf46b39cdc154c54874688571 SHA512 40dc544c73a96e5ec8499afea3dae5dc0b7dd21c80765189442110e9a50c57bfe24b93b03bf8857f87c5d131b1ec5dc012078a09c0da8e57b5a44009feb7df3e
 MISC metadata.xml 623 BLAKE2B 997ce85b64d32c5c365c929f73349582978e299e71b2e304c54e37b0886b19d468270a63d2d766ed7ee52de4a9fc45eb02d11e3289154b03769dab99306d0940 SHA512 0cba95670dc165b6d6d173947a0a6bd567db198cdc6f10617ed68eeb55f3ee4392e5f95fdd136a6a1886a2f9b1e33b0ba8e098ff8c07f7e11b2374ae544ad506
diff --git a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
index e2a018ec0ba1..256109284585 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index ed630df03946..ca409cfd29f8 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,5 +1,5 @@
 DIST eyeD3-0.7.5.tgz 221685 BLAKE2B c296f61036cd0e43f1820c830e9fa9630d8bb56770c36c922ec0bbbd2ed9566c4a0330677dc1c7fd6cc6fa30f9b415abef2867d93a55ba337b520ed52e330c39 SHA512 9f57e05e4db78618e73ec15ca6ac7b983e13c24ae926bfb9194ee4fc1d735f80308dfc5bdac6016f5491bdb06d46b645d7ac54247d581467a8a22129fae85ba5
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
 EBUILD eyeD3-0.7.5.ebuild 990 BLAKE2B 7312f73088b386252088fae68d1e3e5fd95d03f6c3d8db5d084a2527e35474e4d387ecc06f8f40c6284e15d6d40de20669b3e651af4995e13689b017023c82d3 SHA512 40495711222ac7aafdd17be35e4f6688380d850d42e014f197211dcbb9ffb75ce522fbe06270acdc4b29c53feca7a12231e280d95aa6b1a8bf6b3ca8bf5942d6
-EBUILD eyeD3-0.8.11.ebuild 580 BLAKE2B f7f0901275d74fd4a3dac25a08362439d20328e1978fdc1dbc7a0181e85d80e4019e837424ad38406f1c3ae9dd96347ff6bc2a52980151d73ffede7e359f69a6 SHA512 7625da139d5886c9d98a9f722301f761e42ab0b21a0d2100a01486a7ea7300a0195292f5164091ad51e5665bd4e4b256a5c021864145600dce070f19313db877
+EBUILD eyeD3-0.8.11.ebuild 577 BLAKE2B 4ef984c93abb64835ad8b09d50baf66422d0f88ac805125265cdee665d0ae8a7c5450b8515f22c93ff802b886e7f1d4ad6cb5330d2ab9b4f808bf04df557734e SHA512 281b22dbb666f09b60514e4222893b7faabe56653d22d29b5e251018bee245f8f301aeb09f740a423fcfb1637b3666218bf72cabb6b8074569053d89afa2e5f5
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
index f307c5fbd427..48251ab53f64 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/paver[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index eae4e5d48b7d..82358bf2cb13 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,4 +1,4 @@
 DIST Flask-Babel-0.11.2.tar.gz 41105 BLAKE2B 88cd5f2f72c7533f173a3fef7acdcd9ee882b06111f112da18075ce007f94cb342acd16f35da138ca0548b5bd0fd8070d4b3b7941a136e5490c3b45d1351d239 SHA512 d95947983ff5bc33a28384f000512e85ed64c16555aa03e110a32b7c0c9e91eebc02259bfc69a0dbc84adb6ecf8155cffaecde5726658d64d36435060de3f22b
 EBUILD flask-babel-0.11.2-r1.ebuild 1127 BLAKE2B a66bae094b465aa59dd14399573d12c6ca309f470643c3bf670d87e1d5004f0591de227bac0c18b859187dfa08e08234c815e693dfdccb2f71ab792939f27c90 SHA512 72fecf64261e761ca5470ce4c7be3a1d345ef69d29d018511fa91b064cc4c1cb33c2ad181aaa1386cac6650bf4a415ba336989151a649faefcf80968a3adc31d
-EBUILD flask-babel-0.11.2-r2.ebuild 1219 BLAKE2B e3062d5fb0d24825a31f632337afa97ff789f833f199600ca71ed3e138bba51a38cc3a0ede41fcf8bd888c536eba906d1d18dd578116282f1f171a76cc180ab3 SHA512 66632af47eeb000450567fb33d44ac487931a92c72402d285d662266e6ae8d7b03e29f8dee15afd934fc9f4820bf79f82c59bbea8b9b7ecd534aa57e918e9bcc
+EBUILD flask-babel-0.11.2-r2.ebuild 1225 BLAKE2B 969bc95b261ece81576026671037a737cc790fb0927e8f8bc811470805bd8c8260aee5f35eb202429b21c138847b12ccd709e9bfde69d8cc0db81dc91e9395f7 SHA512 7321269b467aa5e927825f801671a7126ed8a89cc012297ff58ba886b0b0faa449b80ce8becff967ee747458ff09b5008a29942863c2df5527728627b0082cac
 MISC metadata.xml 450 BLAKE2B db38ca56f4b683429248baf7411355305672c23126c4b6c7486971fb1e099bb3117b9246870a24f6ecd66e7f27647e80285461d046c02e9227970a111c58dd98 SHA512 d6fb2f7cdf0a8d4b54dce372bbb3d9728a5ebb0e6d714da9c58e5215d6711e3f4211e2a6ef5390cdfa663d375d7e2942a210bfa2822489dd04a911d9e9c24985
diff --git a/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
index b6da743c39cb..3d13c204587b 100644
--- a/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
+++ b/dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-Babel"
diff --git a/dev-python/flask-babelex/Manifest b/dev-python/flask-babelex/Manifest
index 5e42ef4edcfa..88ce2dfe2c4d 100644
--- a/dev-python/flask-babelex/Manifest
+++ b/dev-python/flask-babelex/Manifest
@@ -1,4 +1,4 @@
 AUX flask-babelex-0.9.3-tests-fix.patch 1508 BLAKE2B 828c0932722c4a052e8360338a21f31e45e26d6aeb2e7ef18678dd159ac9b4ec4f2566e46bc088dcf556dfeefb25567227d28a885a00617c1551bef40328d728 SHA512 60761e4117919619562701c24ea2e7f7f55554da251b8144526063cdde35413ced741bcfb35c8666104b7f0850e665450a27e8f134d768b0c5d49d1ee6775ace
 DIST Flask-BabelEx-0.9.3.tar.gz 41040 BLAKE2B 010f8a7be2d59db143010456673a34e2a42f8978cf000d844f11d27969f120c0768038271b8c62b4f6965a3a60f9c845c4027daf26459fce1489482cad0f8856 SHA512 c759f990c4c96dab7cf2fbe83c1ac6dde4606adfd2f5d03ed293578bec621170be319b71fc3e38c1910d2edaba3e4394f32ede3754940e315abd917beaf3982c
-EBUILD flask-babelex-0.9.3.ebuild 1152 BLAKE2B 67e2371adf0f04d65722e3fdcdf7946ad0ccdb87ed740a888889d4841f68c47a66cd2dff5647c15f4420476246502c82cb6a802ffd44202a3846f743c7895ba1 SHA512 328ed17c4638d95ff021ac02b98ccdc471e143690e464719faa3da329e9da7c86037746aa5fc09d1e4ec259e015099573912e4fda31d7d99410a9747b119ced5
+EBUILD flask-babelex-0.9.3.ebuild 1153 BLAKE2B fe7bbcecc3230f07262c3b04b5e73db6081723d47f8ab9a9c21762afdbe0e31a080878e812bf2f9805362047f97b7445412e2bffa72fd3608cb02214684265d7 SHA512 1f50e8322e1e8bb680e7ae8f7825b7a29ca239575e4b9b5e9d1ae6ceef1af61a16b9062ddb1d326c3d27a4c288cecdbb3fa243fe9fe476b49ca28c8f2b0b5251
 MISC metadata.xml 388 BLAKE2B c961ae85719f00427bb3c616873c4cfbb3d928d1acfdbdedc2abcc3fcff8d0ef4d406dccedcb18748c99b094735ca9dd8f42df755ba6fc3155f229202e13ab36 SHA512 844d8f6784fdeb00484620a822f16256cbb7f07b9c0da936a3cc1b158219839612439e8158b30c4b4c713a88b70edf64068e1091ed102f7b5ecac17b1ef53ed0
diff --git a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
index 384e134b7556..d456090df048 100644
--- a/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
+++ b/dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-BabelEx"
diff --git a/dev-python/flask-gravatar/Manifest b/dev-python/flask-gravatar/Manifest
index 1e053b3457af..c1a797b754e2 100644
--- a/dev-python/flask-gravatar/Manifest
+++ b/dev-python/flask-gravatar/Manifest
@@ -1,5 +1,5 @@
 DIST Flask-Gravatar-0.4.2.tar.gz 14216 BLAKE2B 3dd270e620c047990a099315b8273e60ffeac01cc2dcf152a30203027623a209bc4f895ad3c8a2320a0f0eddeb8c84765e46a601c99dbace8f6983914175bd16 SHA512 9f18faff3dc0b3a5fae4abd538b690c8000fe17e3ed0a9417d6b28e5a40f34143530916bc35c1bb302ed8a72e15bb8e0f98116e5bf7270f9671f8cbbf7671ba1
 DIST Flask-Gravatar-0.5.0.tar.gz 17299 BLAKE2B 7dc16c609cdfbf690a39fbb3bd2810398030bd5c7a54394468902dd131116509da8de448a55907e4738fc984ef422f3c7970b8453b27971eadb106cbb8648562 SHA512 bb4ff064489a030fd763a46fc045109104535474d115aaabdf5c4d1a82a1e3303ee34f590a3f1203a9d009307fc8c45c37af7c30e76a4fb10bc46dd684d37751
 EBUILD flask-gravatar-0.4.2.ebuild 620 BLAKE2B 06fbae609c589166e990d549964f35276d2fbe918a399c990eec0706f8b925732397bdce162c623b819d94b60ebd94d0a775741af5aff9cafd918f8e2fab731b SHA512 b384985ba4d1119c77e393a5e65db4924b2950ac419ef2e9191166440485b0921c80a1e454fa51e6b55fc18daa2eac0026309a67d5f6b33193fcc75e47947c95
-EBUILD flask-gravatar-0.5.0.ebuild 616 BLAKE2B 08e91bef1100e4c3165874c95e94ac6e59b15e9af9d8e9590f028c398fbf196f12fd105156708501c69b88f980a2a442362008b88e7ab98f7c0bd0845e8734b8 SHA512 33dfc178ef431cf137fa4b4ab2d1d922c737539d08fcbc7df37f8ac9ed7a2c89d3f3212eb8322551a395bf8a76e149b06515759a39ba838d1658804fc477fa33
+EBUILD flask-gravatar-0.5.0.ebuild 618 BLAKE2B 7eec95369ec2b2ea8962e5b0630124c5f926e7cf70d31f678d9fda711ad036433e7e9486f44803df8fe82f06c7548f52c9b38e759bf89cc6410fe6cf2805e78e SHA512 377fe83334951b2788226da4fefb9826a7ee75c8203ee7523729c0756694725b82a60409f3f134754aabcf95d9a4a2ca25b9e57e700d5b926dac4035f5b4c879
 MISC metadata.xml 431 BLAKE2B f3d71b4c8b86528458a7dbbefd527c9b32252338950f799ec315351454219dafed0b84e74e1e2443b48114a50c8bade0953648cd5ec441b2722fee4e63e5beb6 SHA512 d6cc23df1b882978c77421c21b2a00ea7bdc6781ebd283b00cefdff1efd79e6822025e63f2fc64d2268237f114a6e0f6b451487060d66bfa30295312518f6bbb
diff --git a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
index 8c4f7fe1bace..42f669f664ff 100644
--- a/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
+++ b/dev-python/flask-gravatar/flask-gravatar-0.5.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 MY_PN="Flask-Gravatar"
 MY_P=${MY_PN}-${PV}
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Small extension for Flask to make usage of Gravatar service easy"
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index db0cc1558186..f9e2ffc03b18 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -5,5 +5,5 @@ DIST Flask-HTMLmin-1.5.2.tar.gz 3807 BLAKE2B 226d0ba30ce3c0f0d8077f67d3a56aabf66
 EBUILD flask-htmlmin-1.2.1.ebuild 558 BLAKE2B ad9c0478d8a891b242f7147959cdf85920a6659ca29220e4c43cb237212ff638c6a547dfd09501203615105319f9b6f9968f093951053efdc095a5a077d1dbb5 SHA512 0421f3bedc7c15b9a348e27fd05693c6f7f9667d7d58af2566f4b2bea9f8f8405e67dcedf43263c3e3c7393b26415ba20e61e267493b99d2425a598ce035a252
 EBUILD flask-htmlmin-1.3.2.ebuild 558 BLAKE2B ad9c0478d8a891b242f7147959cdf85920a6659ca29220e4c43cb237212ff638c6a547dfd09501203615105319f9b6f9968f093951053efdc095a5a077d1dbb5 SHA512 0421f3bedc7c15b9a348e27fd05693c6f7f9667d7d58af2566f4b2bea9f8f8405e67dcedf43263c3e3c7393b26415ba20e61e267493b99d2425a598ce035a252
 EBUILD flask-htmlmin-1.5.0.ebuild 669 BLAKE2B aa5abebcd1e58c692991a659a39c3f40746ed6df6960a3643769c0c561e145bc3dfd37c1bef894353a1e1b121416e58b45bf3a9eac6659933a6eb34dbd606e90 SHA512 52f2c917e36cd7881a7692eb7d7a4c6c5d41c4eaa0cf34d2003da9a093a55bb9626583b54536afe0cdf0121c123b8292db17b559320aec6130cf0f1107f4cdce
-EBUILD flask-htmlmin-1.5.2.ebuild 671 BLAKE2B d8f7196373066b9faa340689ce651348768d47d1384676a7ef6d8484dc784f4e0b38b3527628e8f0f53e37bf752f9230dda0285e3100f8738018e01f38ceafa6 SHA512 f6ae67c040789999a75e4ed4e180203fb9cfde1afaebacbb80c489d568a0fe8bc0cf86e32613c8e579cdc3cb133dbae91f29e869517c521c633b650a231a1567
+EBUILD flask-htmlmin-1.5.2.ebuild 672 BLAKE2B aaf55c92768f53ad88065cd8a8451572da64a96f0179080845f2b5fdf5e269610e2662f96fd5f05afc024760734f13ed6a02885d1b21878f954a0175bfe336ee SHA512 0864e7c89eb3252941423ead68e7c3b9542daea6606c3725810220a604aa0829c89f25e1c12d9689b7fbb9a31e5dc071af0dc06c6104faae884d237d4d424c46
 MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
index 580d4b4e7100..f6006f5a921a 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.5.2.ebuild
@@ -3,11 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-
 MY_PN="Flask-HTMLmin"
 MY_P=${MY_PN}-${PV}
 
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Minimize your flask rendered html"
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 535f7f2f855e..03cedff65091 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -2,5 +2,5 @@ AUX flask-login-0.3.2-fix-tests-python2.patch 1115 BLAKE2B 138cab48cbf144a3d4d47
 DIST flask-login-0.3.2.tar.gz 38626 BLAKE2B fbcac55e4a8dc5fe78b4b5b3cb8acbe7293bfcc30ce5323ebe992c92407238198d34724179ac12e688875356e54f85f21a2870249ccafb48499df3880a6c2062 SHA512 c42af6ed7902145cc4778815f247ed88de6df7c929abe0a1f22aca0515495a54d298b2af2b74ba7d5e0ce9b453eee4c4ce03802a3e9ab531137e117e9dcdfc1b
 DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
 EBUILD flask-login-0.3.2-r1.ebuild 903 BLAKE2B bd299a49488d3617ec9b5b3fac545e5b2cc38ef15a6d1bed37183449abb6075da1f2a5680b2f6f5317c3433029bc1e5144cfc5d77d3a4590ced8e4b08fd04c3f SHA512 9af0dcf13b0f5148185e49155cd99480cf186afbbbd0c0af99a8fbf5d732b024de848e4961724048ebb534b24172a118c6647991e0cd12e6c2bf68c5ec59ef86
-EBUILD flask-login-0.4.1.ebuild 1205 BLAKE2B 596161a6700310d710287ee787bdc5354e6bfb074109215588c29188b093db73f7fbf1f21a5b9b0bc91995bc9ca24c79213ddbbf70e5e81eace2f01fec3875ed SHA512 46e0a834f43108e3990b4cfdb1b6d4ed1e30bfad494b371d889922228fdab9ac91cde02a9cee0b65878f02cb7626cf7e35b6cb306645a5bcca5944ec67323ab2
+EBUILD flask-login-0.4.1-r1.ebuild 1341 BLAKE2B 6697a7136c5259a1d12875813c48103b49ae6d332d72b928ab2c87563ee2bf12a51ca55f13cd044d459a6db3dfe06d65295ae1521d178f1c63675bbe611fc675 SHA512 0c96c13422097fc5173c2b57960701f9bd458330272aa57f6c093a2c56e39c53fd09d8c3ca5fbac32e4c52868f579af84e828603d6100607c0fe29081279f13e
 MISC metadata.xml 379 BLAKE2B 0dd211944ab3c15c51198cfbd6a6bebfacbe3cc84c3f5bacb9d942c68ab1567399c5dac987bc8ba2e6c9a96eba063168689edd67563dec49946df346c38bc4cf SHA512 fdce43f3694a2e027fd12ca87bd0c964e243dac37a2d31a93c034cf7881097985402f9dc6ac45f02a157914705ddeb77965486506e94f67e0f868cb77a81f6fe
diff --git a/dev-python/flask-login/flask-login-0.4.1-r1.ebuild b/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..716ad8877a69
--- /dev/null
+++ b/dev-python/flask-login/flask-login-0.4.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Login session support for Flask"
+HOMEPAGE="https://pypi.org/project/Flask-Login/"
+# Should be replaced with the PyPi URI for the next release, if possible
+# See https://github.com/maxcountryman/flask-login/pull/393
+SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i "s/'sphinx.ext.intersphinx', //" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# test is broken upstream with >=dev-python/werkzeug-0.15, bug 701546
+	nosetests -v -e test_unauthorized_uses_host_from_x_forwarded_for_header \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flask-login/flask-login-0.4.1.ebuild b/dev-python/flask-login/flask-login-0.4.1.ebuild
deleted file mode 100644
index 33f04a0329f3..000000000000
--- a/dev-python/flask-login/flask-login-0.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Login session support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-Login/"
-# Should be replaced with the PyPi URI for the next release, if possible
-# See https://github.com/maxcountryman/flask-login/pull/393
-SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/flask-0.10[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/blinker[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/semantic_version[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	sed -i "s/'sphinx.ext.intersphinx', //" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/flask-mail/Manifest b/dev-python/flask-mail/Manifest
index dff951f13603..d9144e2910e5 100644
--- a/dev-python/flask-mail/Manifest
+++ b/dev-python/flask-mail/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Mail-0.9.1.tar.gz 45654 BLAKE2B 4b7e352698bd9434c507d3a27b8e5b4976cc82484e86e64245423392b25000d904d19bafa07ea97a32c2a80ed6bbbbc59aed7386a8d5a2ad6b9b61b23fe4c5f8 SHA512 1d19f0bade77c66e73624d8af0919165f8b6f208a00c1e4025049b50ad56912557b8446cb80f8567adf697e92b126954a5f130bd9fa7a2345d4e98e35b29ac47
-EBUILD flask-mail-0.9.1-r1.ebuild 1058 BLAKE2B b17ea459bed40703d7cf1fe53ccb120c8ac6c0c573d77970ebafa7935cd8956213ffd7586ed2c5d2f8c0013300e4cf69553e4fb45dc938e2b565972a92d127ed SHA512 979fcdbad92bc9f898d1b393ec3dd9dc3b7aa25b8cf9626d3131584c3d4fa258e3a1749d2a2a57eb5098300c5d8aef0fb0dcfafdc25581512fb0091952823b02
+EBUILD flask-mail-0.9.1-r1.ebuild 1059 BLAKE2B 8ba19346c9dc4808c1aadc4dd2e8f46654e5f2ca282bd6f3a4dcb3433e0cca9abcbef625d22a886fd63cf13ac957e71f2eb38563057f181cbad23af7bad2527c SHA512 f1af5d3bd15da2d4bd68966dc973231487fd362e644e4ae599e1a9b805de5974830ec23abeeff253f3e9f5e4d8a0f859d62d09ea54709a347a99dd4d60e4fa60
 MISC metadata.xml 313 BLAKE2B 750a760388ab833bed8c5bea79a563798f3f47790fcacd72779bcce17678a2df4214e22e3c5c636d9f0a1eb6892c235f9a573e991a518e68319d45ee5dc9f076 SHA512 b898617b8854d5d1abe05a263ff182c9734539aca8a7ed6721db1de0a9c76c5c90aca7867fc5a213b0e938d2b610ca48a79c3b71b01ff5291aadf6f46de93532
diff --git a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
index 31281eefc272..d6c7b0b79d76 100644
--- a/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
+++ b/dev-python/flask-mail/flask-mail-0.9.1-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-Mail"
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index 12241f247b1f..d9405b33c95c 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Migrate-2.5.2.tar.gz 12127 BLAKE2B 4c30cd5a3e59c890b0b3e397845cfd1424cdbdec1340793f406fb2e77cc3dc1c7eda777498d75e2250d09a310f28aea1b6ff5248df1ea151ff62bd7c7acabe72 SHA512 9c20fef77c1e0cd2a3ff14bdac48117e3d1610fe9417c928e111fa9c5761a63e67154dedbe83247bbea0f62796203bac61f4193478431607e26bdb253ee0892b
-EBUILD flask-migrate-2.5.2.ebuild 862 BLAKE2B dda99bc1aad79d33e38844fd47da2adecd06310e8a1bb97ae44e56f5bc6278eba02cbda1a5416969fb13879d56cb15aad5dd114962585f424709cf01224ac50e SHA512 c4a09e6479535a94acc24d7edd87e6b1aa615780f84129edc74d4b9a7acba389b89012f94d0855309f324fd096ecf12f3be500dadccf8ab611498905dfe9a8c7
+EBUILD flask-migrate-2.5.2.ebuild 863 BLAKE2B afd2fe8abdb0e70060cc96e31baef32d33728a4e269852236c220f74125d8981a25e66ee06fecbdb1d79efc2b0ee83e7c6871d26bda5a084cd0858cf260555f7 SHA512 b2db87e4688a209daedac646258fd8d4839a9b09f3e6d80e17b7646bc3fb9048b0aeb0c33820d9c639525130d2b1c3b2b3f80d521bc419e75f2100b7ffe899c2
 MISC metadata.xml 316 BLAKE2B d01833219129a9ba04f2198bd569d605319bc4c4d604e69cb6a50a5d855e0dddb6491f78a6674b939476b7128d15c11aa35d0f9eb44db149d3053c004ead4bf8 SHA512 1dfa03b638a9c39be69148ea8aabb4554326dc65bc3a004a2eb93b05fe4be8d667efc7470ea35a138bbe1bae17511a42d530448a98da5c5eaa3eb1c2d3126ede
diff --git a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
index ef77539ea5c0..0bfa964f260b 100644
--- a/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-2.5.2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-Migrate"
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index 8d33c6cd47f7..b250ff6595cf 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1,3 +1,3 @@
 DIST flask-mongoengine-0.9.3.tar.gz 111690 BLAKE2B f94f057bb416715d877154bb2816308324d3f0bb41dfe2002b80ed2f078ab2bffeb62fc7bd53344b7d995111122d0b59a09dfe7700975e151e61fe60f2bdad45 SHA512 15b8031e4f8a9275fa6a602aed8466533fc9e6eb408d8f3316fc8814cc785feeee59dae25f40c1c30371e7e33bcc8727bb866bd99dbee0dc75cf15049576fb3d
-EBUILD flask-mongoengine-0.9.3-r1.ebuild 1153 BLAKE2B 0a85e37e870833ea02757f3ee89f73191503fe85d2db69d83684eee431f3eae0acea6d614999f45be7245f1e188a70e64d2fcbf07688a1f35954fc5d2fb61eda SHA512 69ce15907eca5b48bb8b4ce19ebaa01571a4f630533ba721260af7193d29840f6bf3a4725f676d6f3c1338fbd3b85c43469642f91781c8ea7380372cd162ac7f
+EBUILD flask-mongoengine-0.9.3-r1.ebuild 1154 BLAKE2B 9e7bd0576d65e60b10d085708193c5d75cdcebc11acc1aa9f25659e33a5ea8e9bc8f713259eb9ecd126fddbdb2b475ef32102f2cc48d97d70b0adb82152e07fd SHA512 80f0a291e4945628b5dd7085c32a32df5aa31a136bfbb887f8ce30c0b54669f42e6ee78cb4551d08e5fdfd24f8cc56a148053692913ce2991f035963ad68f8bb
 MISC metadata.xml 330 BLAKE2B 590f7ce9feffc4646a100469830bd4db174302fe419eb50ebc227fa9e7ae543b4d2a2da0d74b333ee4ea9db3c54a2ec9858f9f3cad7e6e063a4609ba11d18f00 SHA512 02da72329c4df28bb5298edb25f2a79117214feda68a264f7885406e8b8a5287ebad89c31f110ef2a409e1d3ecca525155ff2b6a7b2d2ed798342f02224b8b66
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
index f8eb13822f67..05409dd02b52 100644
--- a/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.9.3-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 RESTRICT="test" # requires running MongoDB server
diff --git a/dev-python/flask-paranoid/Manifest b/dev-python/flask-paranoid/Manifest
index 616a2e07fb1e..4eea000d85e6 100644
--- a/dev-python/flask-paranoid/Manifest
+++ b/dev-python/flask-paranoid/Manifest
@@ -1,3 +1,3 @@
 DIST flask-paranoid-0.2.0.tar.gz 101084 BLAKE2B 5f1f92679da5f374699c8acc97300085840d47e57f48d935cba60e78782109f70651bb7f804410dbb241b48c96ec08498b8b2cc8c18573f14d0bc7972b746d19 SHA512 0d642999fa4d5b795c3dcecc586fc1600cdfceec4adb38bb87ca8be9825d9ddafabb07d98df573a89e61a44a0abd27cbbd21524237b0e23b337a7d5e32ddfdae
-EBUILD flask-paranoid-0.2.0-r1.ebuild 661 BLAKE2B 2443322271d86a8d5526714e742a6c7823639b3a50c1028ffe3d2180668aa488aeff599ca88164f3fe53a581070c963d3278f796e47e34691dc7c75b79412440 SHA512 9d40b0f591b45a29464fd995101f0b0342e1228e4bdac439e83363df6bd9f6e18f213f32b444db2d5c4de6db11eeb7ea09575c680f84b7c27242bb38fd00431b
+EBUILD flask-paranoid-0.2.0-r1.ebuild 663 BLAKE2B c951d817d987ed52dce3ecff23f5cd3e79028a253d7b4577c3d559e7c074a0aaab9a44f84457b64e724a55ad21cb4883febf75e172b89b9332cc05497ba688c4 SHA512 0bb178f66d7a3a99e407018d92bb7e11590a1639e14336c73ab0c6fa6830094bb653f8c686be7ee45c35257e200cea9e98cb5083d6cd1db59c83c536aef41ac2
 MISC metadata.xml 431 BLAKE2B a011627716653140fc147c2bc05f1c949b71225fd5d83b389371bdbf51e1fea614dbec9269b95dffca914c6e952e712d400f3d63ad38a8c4debd994194080cd4 SHA512 52469023be87cd14845fffb7290a1c0fbf087bd60759fe87ae2ead185664f7006d899494f1c0d6c29dce49900cffa27526241fa9ac715efe27d23e0bd5dbf415
diff --git a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
index 054f64cede2a..611a24cad065 100644
--- a/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
+++ b/dev-python/flask-paranoid/flask-paranoid-0.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 eapi7-ver
 
 MY_PV=$(ver_cut 1-2)
diff --git a/dev-python/flask-principal/Manifest b/dev-python/flask-principal/Manifest
index 6e9473fc8571..ff87d2bf50ff 100644
--- a/dev-python/flask-principal/Manifest
+++ b/dev-python/flask-principal/Manifest
@@ -1,3 +1,3 @@
 DIST flask-principal-0.4.0.tar.gz 17287 BLAKE2B f5c44e21b4e8242122fc10c7c17bd0e6a4759eda555d4355bc340228eff18f1fc3f519f2ef822448b651c0aa3a00a16c562001d17d8915ce417eb56cd39d2adc SHA512 ed8cb28c4e8d936de96db0bf9f7cb45b253dc204c4b8f8dd8022ef1552592ff6324b4a33d3ee862794a6e20eb8c32a0365e7b9397d427da5022c5ded3dfa308a
-EBUILD flask-principal-0.4.0-r1.ebuild 781 BLAKE2B e243c5f5cc5666a5078b48bb84e22f902ef8b2ece9207f9335ec2b252d3e1992d14e89225f81d78d78ddf545898e2fa179bf7c702a73e086f68b1bb9360f62d1 SHA512 f70003adcbc9294432ee99e1ea43ede9c114f3052b14cc670a6a6b8f538ce187aa0f3d9f9c4c7e81ebcde5ba85d6a1f031ed2e973a9dacd5c948e94b791a0f16
+EBUILD flask-principal-0.4.0-r1.ebuild 782 BLAKE2B 5ebb48f71aaaa71e086082349af8961951ca6f377a7ed2dc22ea0189caeddbe397baae6ec0df13eafb15f6fb97cf5944c72d2c6ab52e7c20bfbe766d2f429dc4 SHA512 27b9bbcd5098315b0f8cc838449fa2195b7caec554bcd7e1a354e02fc658ac0f9f2caf4e2ae6467f9527c09265f40ecfc3cfd571778f856d148dfe811c2b4847
 MISC metadata.xml 385 BLAKE2B bd3864394906ea719cecc764a75db12eb0dc3e7e59c96859665e59fafaf206860f0a9be2a49cba98de5a3566b9fa7e8bae848de71bd06ec41797364f0c58b463 SHA512 453ca2da57ca6cca5d2b4d55f048827f0a62e5d629af12120a314117a2b11fa405402580ba5da933bd5eccb924816dd6471a64cbe409d13c22f3a923ba815f0b
diff --git a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
index cd78c47f24b7..ac5c8e80ea8f 100644
--- a/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
+++ b/dev-python/flask-principal/flask-principal-0.4.0-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Identity management for flask"
diff --git a/dev-python/flask-script/Manifest b/dev-python/flask-script/Manifest
index 133293c251fb..cb5eab8dbae7 100644
--- a/dev-python/flask-script/Manifest
+++ b/dev-python/flask-script/Manifest
@@ -1,4 +1,4 @@
 AUX flask-script-2.0.6-flask_script-everywhere.patch 1792 BLAKE2B d3d674ad325f04b9338fd50850850173a3bb8c89de64702a8c6f5e78b6ad3945dadff4ffeb24bfce20b8d7e032338ae58695f9ce6eaa56f130286197915c3110 SHA512 83acf9eca3b2ee87222e6d307367f1aa789c8c89d6d4cba8dc93ff69a6149bf05e958baa4f9d7e71d3878e90ddce54a2d89b258024bf3bafc39de86814e4ad4a
 DIST Flask-Script-2.0.6.tar.gz 43146 BLAKE2B 146a65fce432063e67e5b6221a0c2437f2a8df1e2b72a5e14fb382dc51ef3f0755e4d8a0a67831c6c2c61d07acc332e8c87b7c9df3443a9f22aa2eeb580c4086 SHA512 03c51213be8e2b86f1f4450565cf4d7e3d9d7257ac017bd53830be57620d581f43bcfe959ef7b621af722c688c56495229aad3dd9654c8a8a5905db0105275fc
-EBUILD flask-script-2.0.6.ebuild 1115 BLAKE2B 087b924b89fc60fd6c5e9a50b6a8b8fd19a81d58e4f1ad875c22502ff0a20c21b1ce90ca7b2fcb98b4ed7374a31ef3cd0e0f3677985aa4327d24192797cd9132 SHA512 a0faf47a00e69ac45733b63ef3a1d46677f5369decf9fb317b1a297ffb059e96d9525ca335a75ffd37ce37ac1a0141e3be6a4e0d99a83704df757a533a3ca72b
+EBUILD flask-script-2.0.6.ebuild 1116 BLAKE2B 22e54798648643be98cc77060f7988a64060397157420baed138780d12a99fccb144c1376ca755314f5d9f06e6245baaf6c22a84cdfe90252bc5fde36c179121 SHA512 597dda6cc4f102a002497707d5484954b6be6b5441bf53fd53c7adf5da3f5288324970357a612046b3598a0cae0d456cef88c9564fe415451dbc62ab7a92e75e
 MISC metadata.xml 315 BLAKE2B 5baaa0a40d2641eecd8e326c8a585457f539a890c47fbc0bb63d041cccecefe5c3f0b9691cb837eabf7718a05a5ec95c1806684d6d4950d7793361bae804bf74 SHA512 95cc9ed58105d822599495d5a093550da1665276efdf4e13a885d730265d229fa01d72322a33598363a87bec9cb1e112b9bae7b7874d1f03c6465089779483f7
diff --git a/dev-python/flask-script/flask-script-2.0.6.ebuild b/dev-python/flask-script/flask-script-2.0.6.ebuild
index 7cfd156114f4..654ba6eaacc4 100644
--- a/dev-python/flask-script/flask-script-2.0.6.ebuild
+++ b/dev-python/flask-script/flask-script-2.0.6.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-Script"
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index 746951435010..2062ed02d2a2 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Security-3.0.0.tar.gz 160367 BLAKE2B c2e1449dc2807c2c40519fa3afb894157e17ecc9ff3f6dcf5ef0d02839a5988f827afd26c1d31af86d5e240e0ea8bfb8ed86354bb6a83535436b08721cac8f26 SHA512 09b94f0850372513add5c054c07aa465ecb95e8d1c414647e3ebee571ec08c94a29f0c138d092c02a55e242c422bc53f929ca066d671c082dcb29834ac753984
-EBUILD flask-security-3.0.0.ebuild 1414 BLAKE2B 61889a483da2034e409045db55cc2e219f3a12d0ce7111982be9b4c0ec2c6f4513c2946a041d4cf46e3c798c88f491a492767a18902269be52420c5d8d6d79b8 SHA512 02fa53c260b0ffef632c3041255ab219e1bdc0e584292da867b3e2a5a1930c57e640f0e8790c643eeb32c4b0b1a6ac2a59124403eaad5740925d27e33933d101
+EBUILD flask-security-3.0.0.ebuild 1415 BLAKE2B 1eefaa0e5b98a0b29eb6d4e4746ab297f869ec17405165e5fa500fe45219f4c58d5248ac29ea86493d224a6e4993c2dc918ed0b9ed9ef7ade85f60ca01c3c26c SHA512 6826bc12f57ce05e21783af9626a72e63ddc95b765057a1b4f827efe9918ddc409e36b12253ef3e21d3ddc2f7e0dc03974114b9fa8feb09f84012b971035be28
 MISC metadata.xml 317 BLAKE2B 4889668ab37b857d0e46000d1663eb953b8f54b20e9ea16979d9db73b6d96b3fa8317bbb5cb10d9e4b4cf0268b966531e33b1bc4a9ab9758768120466999e9cd SHA512 4e5d572e3b4c865bd75763af3bf90a1aeae9a74865ed3da3aa8d00956158cf842a7fb8f2ec837bd53fda5e2a3266777c41bc109d64f31fe75a5d219f1dba1ed2
diff --git a/dev-python/flask-security/flask-security-3.0.0.ebuild b/dev-python/flask-security/flask-security-3.0.0.ebuild
index edb006fc5544..4bf092c5b8c3 100644
--- a/dev-python/flask-security/flask-security-3.0.0.ebuild
+++ b/dev-python/flask-security/flask-security-3.0.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-Security"
diff --git a/dev-python/flask-sphinx-themes/Manifest b/dev-python/flask-sphinx-themes/Manifest
index 411efddafbf3..68b90461d929 100644
--- a/dev-python/flask-sphinx-themes/Manifest
+++ b/dev-python/flask-sphinx-themes/Manifest
@@ -2,5 +2,5 @@ AUX flask-sphinx-themes-1.0.1-python2-encoding-kw.patch 256 BLAKE2B 2ed9a849832d
 DIST Flask-Sphinx-Themes-1.0.1.tar.gz 8150 BLAKE2B d228666424318552f3c865f64b0ad478a3794162c533ce7c4cb50414964c04d3a8ec84d64fdcd05f26bdfdb6e3ceeb9d96b9ee7dc7d632f07f99454f92e1231c SHA512 65ab8dcc75697fc61e6f6f78ec497ece99eba19c48e778f79e3883079cd0d5e42a2e0f1cf3d656dedf92423d1758caf6fd2279907dd87b50f3a79700f66c5e65
 DIST Flask-Sphinx-Themes-1.0.2.tar.gz 9066 BLAKE2B f4c67bf6c8e064a9d278779613182fa2139c83255b6e5c28adfd7d5e8df90c2203a6758dc22702b2d708d9876de029ff4e4d05daeb462dc8127bbb28a1392ac0 SHA512 55893b19f1c3da026e1e6d98143ccb4d2939da0d76e6530dd00f72ace6095d0fd038213a4ad02151a82670543634c6efe61a546df3ef90d71b1864914d36e2ac
 EBUILD flask-sphinx-themes-1.0.1.ebuild 704 BLAKE2B fe9bdbc4438c83cd077678c7949fabbb401a0bdb6d074f6911826d33d48a4582401a06a7fbcf8cbaaf7558e54e3fa8606b18bff36f6b2ff3016ef2e398a32db5 SHA512 1c221824a442a515188cffff9b299f2549368f968a0d7cc9ce8891e10cfcc8a6f15fa5054aca802fe8fcf82415af3dbec40f65f5530bf3dd167e7fa91c37bb08
-EBUILD flask-sphinx-themes-1.0.2.ebuild 594 BLAKE2B fd2546a27c70fd674c733cd0e9a9363919defdfba2f6d446b039905b542dc454f9d41b7082537eeab2e9f52f0b4b17231065c7758033adfc1f78ef63cb690373 SHA512 c38b334718d5752be1aec2491086ca247be9169f08bc652153fbb1a8282a3e07fc1c67a4f04ef597d7d26f9a6b8f6fb4d571a295c354110251c74ee362a949b7
+EBUILD flask-sphinx-themes-1.0.2.ebuild 549 BLAKE2B 8487e7807faa201f20365eb0242a269ae6f6e2f39e8cdb4a51b5d7b8bef6b59a36797a7a900830579787eaf5b7a9ca109adda1d9be1e633115ff86b07fc08f18 SHA512 56d0dc23ae7f1eb656262452966e235c4cacb36ef7b26bdc37bd7bd18c936b25535df56d2f87f0623c7e1b63f0e06f970ea273878e629b12c13ce5596df861c7
 MISC metadata.xml 478 BLAKE2B 0842416a53a98283c3cbcdb25aa3e0ce1fb41e5227b326c2a5d60e669d270f0dd73950d79d737179a0209d59a82c1c0d1e680718dbd572fc0b4dffef84074c0a SHA512 6a8b152272da403e849cba183f6bd7b97caefe6be58a06b72c3d5e9900c56375ad4c384112803b1985e1740ddf3bb0ee2d6e650cf23443e4917a5a38ad59d0f8
diff --git a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
index 7169f3bd926a..089792f263c0 100644
--- a/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
+++ b/dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
 
 MY_PN="Flask-Sphinx-Themes"
 MY_P="${MY_PN}-${PV}"
 
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
+inherit distutils-r1
+
 DESCRIPTION="Sphinx Themes for Flask related projects and Flask itself"
 HOMEPAGE="https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
@@ -17,6 +17,4 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~x86"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/flask-wtf/Manifest b/dev-python/flask-wtf/Manifest
index 2d8e4ce19fc8..c64a99595727 100644
--- a/dev-python/flask-wtf/Manifest
+++ b/dev-python/flask-wtf/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-WTF-0.14.2.tar.gz 254903 BLAKE2B dd6b650d97622dbb56cc0bdd3c036f14e562181720ede0c48652b8fcbc88d2d684f013f0468e723b8b0746f2c6f44ca18ffe0ea353594680b47bc1212664ce52 SHA512 9d4b4b24eb24827aeb524699e6720eab384c42901a102daddd9fdc6b8dbc8eebec8c9d31a1e9052c9af4d61bd08eef8ef9dc4cdc8d9b950ff5bdd0201db1dfde
-EBUILD flask-wtf-0.14.2-r1.ebuild 1374 BLAKE2B ed81894868a9386a640928e2b21ea91aa6375139717c9fd5ab76815e2c1351f5bf1bfff3d79fec5a6955643e697c7649bcdfd5da6f496c0d8fe24e0cf48a4004 SHA512 0698501556c4d01f609506da2f7ab07e21c5ddde3df302ebb4564f8f54696c99a9fe98c4f8328d5da3e5890a9d13e4543ff0cb1df6fcb5eca722f6f8d7895f80
+EBUILD flask-wtf-0.14.2-r1.ebuild 1375 BLAKE2B 413fd63e30135c2febc89379f662c314c7ffcce9cc3a1013ad07fd90a4088626bcc8b5717296e1b81bff0e14104ace4a6ebfb36be5c59d825b8df7230e8540d0 SHA512 ae65bf4d5f17491a29edc19f8688b26b489d2d239d4a808ce0c545f069c47294469b78ef9c8a1cab5fe5676c8c9f49df19f8190707aa50567ee1318b5f1f214d
 MISC metadata.xml 635 BLAKE2B 1914db37789f92c3a41a30564fc58298b32a6babd32c812f3c5be7dbd22e5ebbea6ff4c7139772bbbfefb502f8325ee9fda9854ce9b167305541e8f56596cb90 SHA512 67b6dd0104a4f949aa2df5f9de39c7d77c18ee1a20104e92b68ece9c9ce04b7d7d27721b4170b562855862c99f4080df0949935d23c8f82cd27d15d8e93972e9
diff --git a/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
index 1d0bca5eb449..959ec5c33977 100644
--- a/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
+++ b/dev-python/flask-wtf/flask-wtf-0.14.2-r1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="Flask-WTF"
diff --git a/dev-python/flufl-bounce/Manifest b/dev-python/flufl-bounce/Manifest
index f825b585ac8a..40516dd21bc3 100644
--- a/dev-python/flufl-bounce/Manifest
+++ b/dev-python/flufl-bounce/Manifest
@@ -1,3 +1,5 @@
+DIST flufl-bounce-3.0.1.tar.gz 100217 BLAKE2B d5620d73513a7e5bbfffb212f13bba34ce199a129a217873a8237d8456a7a1854d78cb9b06e4ee763d4dcfdcfdc185e0d67eb3be82ad829c054baced8acfc25c SHA512 9a8d0dec98f8699fd3dff62f5dd831ab5754f11d246b750cfed8ae7ebb771c3c7c1abd4fcceb0f8aa052653802c6e6e5a7bd4711e63b9095ede238817a3cd146
 DIST flufl-bounce-3.0.tar.gz 89156 BLAKE2B 02ff80f4ebe42e15c9e6a7ed192d9a032e800b2b1da874837da5e6d5c156f50455795469c1c782bc7070cba3ab66d11ee576b8e95881a78bd1a479c825939dbd SHA512 f6effe38c80e1e5e1119d7951a1a32bb9b91fc52db0887eee4ebb74e005ad5cf48351311985a3169649301efe9273d3fe480b3dded7eff3b77b73312d0416f45
+EBUILD flufl-bounce-3.0.1.ebuild 593 BLAKE2B 49dcee23ed0912577eb0cfb066cccdfd59c986ee9445576cff7a0da5452b1f30007476577e58e26e541a81a04216a32d3645244b9924edd1c257f85ce1c7eac4 SHA512 f8949a4d57dabbe59c932a931baed97442ac5c8533d831cdb344c9ff28393afb7873e71e1bcbaacc19a9382077a6e6f21a18db239880ed6b3642b66993656d76
 EBUILD flufl-bounce-3.0.ebuild 589 BLAKE2B 679b4b612c2b1923ea880e15c3be53fe692689019b893429d32c32b56f4a000f718d042c445623671ffaa98210b0d4263ed29d81b942ea16f88981048328d12f SHA512 002483ecd081a3dfd5f09b0e2687ef235dc56683e1231bff6bbe7870cb1492a5b57a8090dd62e903d30e61c139f1f78d535b40ffc9e754b813f1c67670fe51e6
 MISC metadata.xml 408 BLAKE2B 20a2b1a31939b4725e08b910cacf65699183c76febfad4e940769dcc61c0e5da44729b70f5087267dc4db302120f8a20066a97fb4999de647a398e4c0283a6de SHA512 02d72e8e77cf28c4ee9bfca5dfc1d53e26b87024122046000437f63ced756a6ceaca988d0eca49a153a1e628674e1b7495e4131b149f298378268ffed2c8bd10
diff --git a/dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild b/dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild
new file mode 100644
index 000000000000..7e4fe6857b52
--- /dev/null
+++ b/dev-python/flufl-bounce/flufl-bounce-3.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Email bounce detectors."
+HOMEPAGE="https://gitlab.com/warsaw/flufl.bounce"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index a8e9cf5df51b..df70666dc8d2 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1,3 +1,5 @@
 DIST flufl-i18n-2.0.1.tar.gz 18572 BLAKE2B 372240eb6cf3778844fc0d5b59a60e2fd50498969165a6ea1096e1e333a536b177cbd9afbad14bfafc2cf7150923c8bdf0c84944d1426f0ae284028b406559e1 SHA512 372a27c81c0c58994b7b4b9ddb177f6acd3106536391c82c61cf1ba1b8b2e920be559720d98046ee9aa977a9119f231f7bbe71535cfb538d8563fff1da737ee1
+DIST flufl-i18n-2.0.2.tar.gz 19106 BLAKE2B 407f69708234e4c24403733c752ed79dfc0ff7d269a325c2d599ac00a0de077dfe63078fd050556f683008296885f397a59ea42b6d0692549856535166e63805 SHA512 05d9283bed456ee8d48704dc595f514e13b0c74096df177ed49bf178987baeee014ddc4331cc7d36edffbee1dcb58fcae152c2cb317b7ce73d9630864b98f1cd
 EBUILD flufl-i18n-2.0.1.ebuild 565 BLAKE2B d34298d5805c08da60dda30f5acdae1c7bdfb55e1a6ec06eb235bbd0dfdb1ec36ac4a10cae59fd2e08baef0f4d3514dd7486e96ceb14ea2ff728a1bbb7760682 SHA512 17352318a73c76db98d90114e3762136247f3b2f7475c8bf5b7f608286001c1a81881292765b5382df9dabe6352d79d8ccf77585a9ef11d21fbaaa1ceb998667
+EBUILD flufl-i18n-2.0.2.ebuild 569 BLAKE2B 22ed66f16c850c662ab4d87edb1c232139de211e2a2c75f5b453d2bc8760376b1988803fb702390b79f88af4bb15474750ef4b038e75b94f01ed05e436d4163c SHA512 6ef8a36be88f934c4abad6c8d660e9738f3e5f6d84530ce4af9f0d22632b078ac659545d3a0c4d9e5c4b7fadf605b926f61ee008817f54e0564f9e73f1dec92a
 MISC metadata.xml 434 BLAKE2B a3e675acd9060351b3e36563803043a4b0de06edcf37d06a3c296bfe2e503c0e0e273aea08136f7ebe892cdf710f13fd9af53600ec151c604f4b8c69ee28ff03 SHA512 631ba7e31bd357d6118ebd6872b76162cb579bc162f2c0a26437eff21ed11b69bfb513839b81c1a937bf981bc5c1569aaaf205cae76b4ed2707eacd5f9eb8f2e
diff --git a/dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild b/dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild
new file mode 100644
index 000000000000..e583ee1e34b4
--- /dev/null
+++ b/dev-python/flufl-i18n/flufl-i18n-2.0.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="A high level API for Python internationalization."
+HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]"
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index bb2bf0928353..5697a85ee3d9 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,3 +1,3 @@
 DIST flufl-lock-3.2.tar.gz 19250 BLAKE2B 230d7122fb6db1b4002e5732a878d597837f1c8cb10b85f4c131f793f820dc0b76a494504aef89845be4f7bdfab94b17573f83002712c245206c9ce25fac893a SHA512 496195e1c52f628bc6c0e8fc3dcd5373ed01cfee35b6165cae37ab4b90d70265c6a0aea565f1e0663277c2b9e9bafde8af1420133a15e6254275fad2f28a56d0
-EBUILD flufl-lock-3.2.ebuild 570 BLAKE2B 6fce0a7d6a69babf340f1857595a53a4f931127a4a2da97e527b28dc457df358720b387d66b9d680d050446b1ee9d1402fdfa96b0dbbbcdf469e0305edfea65b SHA512 772d4f06d6ff37e6e69a5a29db104edaecb835f037e2a0a84e83e95caf420cd93b6542d9f96e39cc05dbb84e40a95a378b59f4247b5e03ccec7b08a3ff7512d7
+EBUILD flufl-lock-3.2.ebuild 574 BLAKE2B 2ff8d9470afef5e042e561a721c6e77c3750fc25aa7f918e88e3c0917b773aab69de40c422d4c8fce37f8b121d976ebb1fbebdd6522b6fc98a8b487a445d732f SHA512 087e144a6c232a0467c50f0bd848ca6632c955abf9741c51e59f88004d8b2066d3a8edf76346d87ff320ea8918ba1c88deaaea95fcd4acb429183070c42d5bcd
 MISC metadata.xml 439 BLAKE2B ac364f01f2831f0bf328429ccf9254134ed961d04e6a2a7cd09d399c6d59be0085dd23dcc379d390de5e81ef99d6e0d19138dec486cd3764e34e9c2299fc09db SHA512 0021f035c2b525bc71ed0054caf093bb840a8e360b7aebfc0e7b0feaa111453b26c590d16a383fc0bfd97c0d2bd435308895d98fb43ec58360d8091bff88d0ab
diff --git a/dev-python/flufl-lock/flufl-lock-3.2.ebuild b/dev-python/flufl-lock/flufl-lock-3.2.ebuild
index a8f7e86130cd..657c2872fc49 100644
--- a/dev-python/flufl-lock/flufl-lock-3.2.ebuild
+++ b/dev-python/flufl-lock/flufl-lock-3.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/flup/Manifest b/dev-python/flup/Manifest
index e1e52a565f69..1503dc025ea0 100644
--- a/dev-python/flup/Manifest
+++ b/dev-python/flup/Manifest
@@ -1,3 +1,3 @@
 DIST flup-1.0.2.tar.gz 49051 BLAKE2B e3acb1c1a4028ed8eea5381c55d25f2cebb050a5ce9e18f74612d50453238338aa52b268059581a56438a1a0e42ecaaa0d747bc3bc2779ec0646daf1df3ce02c SHA512 65c610f9ddc3df6ed6deb6753b2b15ce4f4579efd9dfd25166d3b6803e5d7058fee6617388c9c67c39f7db54da5c918181dcbddfbb7be4a78cf8b65501af4c4a
-EBUILD flup-1.0.2-r1.ebuild 519 BLAKE2B 19ab6d2b94f50e56e1d664ca83bf9f7d9374753ad6aa71d0990c20c162fa2db10848141fcb4120254f0b771295eeae96a5e9cae25a3db05ea0d5e2d3f1b432f5 SHA512 d82c849baff570fed4500fa8ae5125b26bb2fcfa8323e33f1d4abbde0d66d654c7fbb92ed3badd383644ecde83c47096acc2f68cea859e19b6c9f99e05bfd51a
+EBUILD flup-1.0.2-r1.ebuild 525 BLAKE2B 7ec75892283dd2aafe6b7ae13738fecfb3640e59a11f831077c41e9c962e9b05e2b66f8c08d69209fc38343e5dbed9c14533633f840973917eceed49d8f15379 SHA512 ae246b5239de5537c33bc162e9f2c4641725fa67cf25b76ba27e46cd282ed563869b9ee51a9307d63e2b76527f5da0b2449177eb1506ed9ccba496a0729e4ffc
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/flup/flup-1.0.2-r1.ebuild b/dev-python/flup/flup-1.0.2-r1.ebuild
index 60c309aa5724..5efac562a79c 100644
--- a/dev-python/flup/flup-1.0.2-r1.ebuild
+++ b/dev-python/flup/flup-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.saddi.com/software/${PN}/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/gnome-python-extras-base/Manifest b/dev-python/gnome-python-extras-base/Manifest
index 7a841e53c3c2..0b8fa71bd4e9 100644
--- a/dev-python/gnome-python-extras-base/Manifest
+++ b/dev-python/gnome-python-extras-base/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-python-extras-base-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
 DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1313 BLAKE2B 6621ed0ecd358b6dbcc03ecf435e5919aaff09fee00af0c794e88db34f15c492d9bf044f9cb238a350e5f30e093a4c27976b0351e1d9e61e6a8d2175743a9f7a SHA512 3acb72251135893db8870139e8b99632f9d67877816fae21a860dde196c056ae8a4951ae7b87f31f1abf4e3a7d7a6fdde5337f9ce2ff7af404c196c445101f21
+EBUILD gnome-python-extras-base-2.25.3-r1.ebuild 1314 BLAKE2B 2ee9faabba3d5059bf162f87538628d7d3ab2a610d4b960f6b15c2632c52739dd235c0e7710b1690b1d99c7622bf3d72fb3989acbaccddf47c57077c36c2eacc SHA512 9ee587865f382eac9c8d28766d72359430fd26233382c21cf7774bb352e63ea36f37d88989c911be9bc72794dfc2638e7c9542275f7b27738aad2a3f854f7788
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
index 542c711646f2..6decf4fca5b1 100644
--- a/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
+++ b/dev-python/gnome-python-extras-base/gnome-python-extras-base-2.25.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	gnome-base/gnome-common"
 # eautoreconf needs gnome-base/gnome-common
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index 7caf764a7c6a..f902318d7507 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,19 +1,7 @@
-DIST grpcio-testing-1.16.1.tar.gz 12262 BLAKE2B 06790ef800a256fcd3073e32df455f97ff2528a6a10b661527b3a306adad3828e835c903c0fb4abf4e829ccfb4481b5334c87d021fb83d12a0f308dfc09d39da SHA512 2e1026569b694e555cc84bcbf0389e50d35955bade2ca5614289de0994cbf9d128b649ecd1813e45f8ab79ee4efd77382ed669cba5bcfe8317aa9f774e0e54b2
-DIST grpcio-testing-1.17.1.tar.gz 12422 BLAKE2B 015a756c04db0d6a67b954c36c7d725a58d1fcbb7529f5ed50dab7c291abd7f0ce0d18e617f496af161356167fb4b448a5cf431a5a0f6346f12a8dee83a4615a SHA512 3b2ef6c2f43fc8aba270bae72de217f063d987940c965ece6bcce1025c0ec9c181e90bb905a0a6ba675ca7f06b8795250c910945173c189486414770bb02b25f
-DIST grpcio-testing-1.18.0.tar.gz 16603 BLAKE2B 6f6170211701b56d5937947ef227cf9199ec1fc7c5fdfd140a222dbdee7db7d352e95fbe2d50be8e01895c19986b858c9dc2ee2ca4a6582e484cf05b148e0a6a SHA512 1f855129b7b939a1b70105e68c1ad78b3dc32efac66657a985d1f21a3945a2077d80c70fbe5bb0304fd8f85d69c1a75478b13b7a824c9e66a0563c1730c13f83
-DIST grpcio-testing-1.19.0.tar.gz 16355 BLAKE2B c4b88f4fdb358ca121593b1628faacf269e02ce1de8693401197883aed94005ae1903da9b92f77b77afa92f05a74ec6f65fbea22e6f16b7acaeba90283890b88 SHA512 82522447620ab0155cc3e4a159897942da15726ea7e29a0dccd76fa39e718539c8f05353b718729c87f77864873ae51f2b28487676ba6f26ccd9851a17f1973e
-DIST grpcio-testing-1.20.1.tar.gz 16553 BLAKE2B 5ea6a92238cc086a030c23666340f32bb00941518f0507a2db306feccc568263813be6819d4bcd593f7e52575f79b1ef29d3024e591227b530815a95211a2c73 SHA512 5cce728015466ae6f14c28258abc71e73ef0b195ba2a874999d3a18f9f8e45450b50a3b4d3ee72f07d8c306a324de60383bfb0e12e5331968fe28519e0f2cb08
-DIST grpcio-testing-1.21.1.tar.gz 16879 BLAKE2B 4595b99b174db549a2637c9e203e7de0a799086c0119751927b7d57b3837958e296671cbc7b6dd5598d8ea10fedbb23380de200604367308186c03ed77e607ea SHA512 3556c21f0d51a5b4cbfcf8eeec2b383b1aca5056337d3ee8f46a5dcc7c7fc4507b858d2309232e982650495a83d1d80f6fa251f25f77a6b180817fab8d4c4527
 DIST grpcio-testing-1.22.1.tar.gz 16718 BLAKE2B c90717c5910be42a161fd08746b898a691cdc80f631991f718c061bf56e3e8851b49ab2219a59ebe80f4d878c713230ef6355095e78aa1d0c164aad570dd27d9 SHA512 90f366bbf352e7f7165f91ac4605ed74a7f7b08f1981838f0d218396c54983cc0752121fa890abbfcdba719461093ab3e5ce47e95d3e68047fcba1b7f5820d73
 DIST grpcio-testing-1.23.0.tar.gz 17042 BLAKE2B 42eeaf657355c569dd62e0acdad99449b2d70d725f493a727168314ca8f4a8016b3a39521b8796cc6160472e455385004079857ed88e796c964304d99b5361e4 SHA512 3eb370f5a6568a22a87c72c8bad1c4ae537d36b19fa45039620dc3ae645561bd4836cd430fdf6f64a7687178412c4a2e51fb6474d470039e310f639f86c351f3
 DIST grpcio-testing-1.24.3.tar.gz 17066 BLAKE2B 9f968ce096b70d7b3a01d9991d2dbd70aa73cb39dce4ea1aeb36e65f6e33180b0e7d126c18029da6cb1c91bb4371206cd3481ddaf0014c24e463014d6e990a08 SHA512 265369f696ecc5e3fff35027d951c405e62e7c8ac61145813d7eca66db6e91d0ebfc39ef151cedd9c67437688898bde02656fdbd547718443f2701ab18e68a1b
 DIST grpcio-testing-1.26.0.tar.gz 17018 BLAKE2B 5747cef7d45ebd5deb0f86537fde2994ec7d4b0eb94cfbbfd3f9ad869e43a549d7a289477f76fc87d0c72a3a232bb643aa64c97e2ce3cc80ccb18368b276befb SHA512 7fae8c2e5dce79562005ae0c5e779e8ff157e245d849b573376aa36cc98fc6efa126f2aeed9431d2c41535ffbbac017ce69d83b5fffaf7f75b5493e778e8caf9
-EBUILD grpcio-testing-1.16.1.ebuild 506 BLAKE2B 247ca8c34bd56603c7f419ee73a2f238121bd8225186dffab7c6d33999927c3be2d9082ddbd5f0ea6797c3d25697dfd1f31084d5630436a460c1b06f03c42dd6 SHA512 9f3164aef3fbcefd822adfe33e5d011536636ff35b3dc7a0056c9c5b2632d17139d1558f6bbe2899e0d9e20bbd486bb9cc93518437f1ffcaf99d5e7df8d8e40e
-EBUILD grpcio-testing-1.17.1.ebuild 506 BLAKE2B 247ca8c34bd56603c7f419ee73a2f238121bd8225186dffab7c6d33999927c3be2d9082ddbd5f0ea6797c3d25697dfd1f31084d5630436a460c1b06f03c42dd6 SHA512 9f3164aef3fbcefd822adfe33e5d011536636ff35b3dc7a0056c9c5b2632d17139d1558f6bbe2899e0d9e20bbd486bb9cc93518437f1ffcaf99d5e7df8d8e40e
-EBUILD grpcio-testing-1.18.0.ebuild 506 BLAKE2B 247ca8c34bd56603c7f419ee73a2f238121bd8225186dffab7c6d33999927c3be2d9082ddbd5f0ea6797c3d25697dfd1f31084d5630436a460c1b06f03c42dd6 SHA512 9f3164aef3fbcefd822adfe33e5d011536636ff35b3dc7a0056c9c5b2632d17139d1558f6bbe2899e0d9e20bbd486bb9cc93518437f1ffcaf99d5e7df8d8e40e
-EBUILD grpcio-testing-1.19.0.ebuild 510 BLAKE2B a8970da62adb33be2d09be71148a76478fd0763d01bd1fa26a4c8623aa5f57c0dd40b89e22f3387db8feb466cc01551281bb79f27db77aae7d0ef264cc5d1d7d SHA512 025bcfda6e6421ddb1bbff2fc84ac29447a30cd0e9e098c06f384cb00ff5443afa3f63beb58de96a8e13c766e1bcfeb261d46e8854eb32b8dcb0e62c31265222
-EBUILD grpcio-testing-1.20.1.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
-EBUILD grpcio-testing-1.21.1.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
 EBUILD grpcio-testing-1.22.1.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
 EBUILD grpcio-testing-1.23.0.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
 EBUILD grpcio-testing-1.24.3.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild
deleted file mode 100644
index bdd4e0587a9e..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.16.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild
deleted file mode 100644
index bdd4e0587a9e..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.17.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.18.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.18.0.ebuild
deleted file mode 100644
index bdd4e0587a9e..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.18.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild
deleted file mode 100644
index 8da00c9cda1d..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.19.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
deleted file mode 100644
index b50c6a08499a..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.20.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
deleted file mode 100644
index b50c6a08499a..000000000000
--- a/dev-python/grpcio-testing/grpcio-testing-1.21.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Testing utilities for gRPC Python"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index dd6c69968836..c41fbbc81c88 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,19 +1,7 @@
-DIST grpcio-tools-1.16.1.tar.gz 1887741 BLAKE2B 721746ff5febd743ca56f6e5265fa7066ca1c940ec7b73f2978b2360bc3f4076a72b4bea44fd808e59713d06879beeb43ae38e176ceeee204e0159ef2540324f SHA512 73652b3b317f216a1b3e6d94499888ba9410dcf44ed11771b359fc363eef6878f466385800cfb856fdf956b275a5356f4984e68a16a7ce8b29ea5c278f17d9fc
-DIST grpcio-tools-1.17.1.tar.gz 1900052 BLAKE2B f84f9b7f52eab6758321d50aeafc25cb31c100ff63176cedac16514d223192d1e38a8903c809f3e89c18485c1ce129ee50e2cd8ec751b98ad4b7ed3f19cb3080 SHA512 50412305314ae5ef284b01b1afa19778233cb97df755a9896c881730da45455c7dd1e82798ba88c63ffe8f478f93f326d06c7a8575d3ea4c4ac3d10467087ef7
-DIST grpcio-tools-1.18.0.tar.gz 1925482 BLAKE2B a8a97e3a6204593bcc0e96d392652d31d1b1d545c91922222b124dc250d020327ed81fcc1c5feb02115517da34141651a4b24a13df825fe352dfed7715724768 SHA512 5c581a41804eb5dbad34829c9dd32253849484dc6e92d0bbd43b816ec3b45b741b23bffeb9969bf2dc3b7183cb05135f6dcc20f5b260c07f7173b9688c9852c0
-DIST grpcio-tools-1.19.0.tar.gz 1920614 BLAKE2B 00d3a702071d33a51fe47aea6ef47d58e2901df6b55cee8fba1c382e45695fce32e2fc20e438d48b5024b7a80373bea76466f2981f58b106192016078f2df214 SHA512 f9832237a0ec3e1dc8550dce5c0b06bfe43d1bd164b251c1bf9b8075ee647f23c8da31f90c84cd7f047682832876616ec5c73b495cb4a1fa2d83982cf368eee2
-DIST grpcio-tools-1.20.1.tar.gz 2018570 BLAKE2B 9c2ba04b06df9883ac79726aafec6eb129c338be93c61d49cafea29d4849bd497bd45da106431b7e17ece281037cfb0a53ed33ca7078306b727812fbce9df9b4 SHA512 2888e5c3ec92733b43b6bd115bbbfc2bace99ffeeff513a8c1c98fb670853a4407de41a5449613f88d8586fc21809d5a0c6de953dc211f3108b32198964db2ee
-DIST grpcio-tools-1.21.1.tar.gz 2032788 BLAKE2B f26e94c92ebe076496a8738dcbdf9b67dedd5fd60426632589ba88bffd3943cd094881d61b4c67e25660902ec10887a0ed154dc9e6e33d97460313514f4d5eb6 SHA512 624f23bf9d7d6787d4b65e60d948feb88548ed6963443cf8cb1a3eaeaf03dd2ca9a8fd9e8a6882137b781b737b23934b84e3a922df95da95885bbd5f3de873b5
 DIST grpcio-tools-1.22.1.tar.gz 2022553 BLAKE2B bd94ece55c5e9e41c923c1beb5a2deb2b49d6ac479401b9de622d8a3fb0deb7e852d7da3a0239442d7560135565af1fda80ab43f7def870488dd17cf52c1dce5 SHA512 92d65c40ccda268154dbc21a9b7607f4ccee8feb0c5eeb0d88ae0d34ca80b3e1e7a6a2f8b7059aa904a7cb3654b0e23ceeebe44f58c08b713bf78ab7e4faed4d
 DIST grpcio-tools-1.23.0.tar.gz 2025916 BLAKE2B 7dc3854e29731f7736ef08526142e31e9b14df2b08367cddc9dd69a0b5ebb53938a9a24284e5228fd603402960507d7903eb7a6c90a1243ed311cd595eda0f26 SHA512 306e1de073bffd036643dee6fdaf8c2f48cf810fc4403b02a5b2aa44ba77d8c985181b23ec20d787261786b1c6e4930f8e5a253752da95beeb257ff0555175cb
 DIST grpcio-tools-1.24.3.tar.gz 1984292 BLAKE2B f9ec935f0ea8af31ac5f60909551efc403241917879fb456ea88ac3fc58cd068f0263726819f0e6500d6ca11ae38cd1799db6af4d4f822002d92fe7a16d01060 SHA512 89d12beadead3c68532a769795446a9edca96be495ea2af42bf1934e86cc06d06fc345f7847b17a088d66a2c4390461533be075a93e3d5c255c625da097812ab
 DIST grpcio-tools-1.26.0.tar.gz 1990162 BLAKE2B 3f07f5d5be14851a3df276865b9a4d93222f0d4bb95610600ac56efa268e46225c2095d7112612296649bb48afb53a35b73febb3b379f05ea061e269c3546f03 SHA512 d1780a0103b531cc4416b4524c77bd96ab6aac3c081a8ba8c402c10909eb3945d9a3caf4ecc8f9f9c8ae216958405bb98fe1b1874af46407084ed3a65128e105
-EBUILD grpcio-tools-1.16.1.ebuild 664 BLAKE2B f5b4aaaadbdb4552eb3d7187da8e974d7a15c8b3cc7f8b280430195127f0214c504ff3f184ed8f6a5fdabf7d547346b5bf466cb487e0df6a50789437896ac17c SHA512 bed8aba68be13507ecd865a779b6955545ff4a52a5bba402f946a3da190a10de7b85452a5063679854117f021f9b6dd399591baaef55513947e6dd4835fb758c
-EBUILD grpcio-tools-1.17.1.ebuild 743 BLAKE2B 5f9b48b71bb427fcdc1660fffdc16247464283f13791d5928170cf515bdf4c46b44f8ed9d53fc511426f59c54ea5c0c522d04d1cc79a2d1864f0136e82eb14bd SHA512 8f7499dc819b17a2b6e7644e7310278e656a754bfd02a8ffaec5ef0d79b9741a36d5c9bea711835289169515e16ba6e58ee2a012e7913a6f3996a697efaa9984
-EBUILD grpcio-tools-1.18.0.ebuild 743 BLAKE2B 5f9b48b71bb427fcdc1660fffdc16247464283f13791d5928170cf515bdf4c46b44f8ed9d53fc511426f59c54ea5c0c522d04d1cc79a2d1864f0136e82eb14bd SHA512 8f7499dc819b17a2b6e7644e7310278e656a754bfd02a8ffaec5ef0d79b9741a36d5c9bea711835289169515e16ba6e58ee2a012e7913a6f3996a697efaa9984
-EBUILD grpcio-tools-1.19.0.ebuild 747 BLAKE2B bd7c47afb93a48ebc9d0a3d5ea0ccb0f4ad14311381a508b4a8d4fa7f9d60627d6629a29cb4db7ecd5111369f5bfa3b26f2cfe02656a4c9bfd11a7a00a0f3565 SHA512 e01c423da976fb56f0bbf8ac116c9ae17f4b7c63db3c7aa1ce2b3bc64da741311483811c568d4a47f1beb20c45089f05e6aad874332ac2e78c6285263dcc6c03
-EBUILD grpcio-tools-1.20.1.ebuild 731 BLAKE2B 6d9ad4280e1007ddbfb6e9e7ba2d8e7701b5ce2d512b93fb91c7255b9ca051e0190e7cede223e0b9a1d83b9a93c53fbf5424a527b2dbb9b28be1beba456e25a9 SHA512 0ec399710f37dd74ff786c92c6733aee50b9af78572ffa0465c7b417f4d410565f83aeaff3eb2a0295915f0c4f4015e94d40853874c715195c0922e8c3a496a0
-EBUILD grpcio-tools-1.21.1.ebuild 731 BLAKE2B 6d9ad4280e1007ddbfb6e9e7ba2d8e7701b5ce2d512b93fb91c7255b9ca051e0190e7cede223e0b9a1d83b9a93c53fbf5424a527b2dbb9b28be1beba456e25a9 SHA512 0ec399710f37dd74ff786c92c6733aee50b9af78572ffa0465c7b417f4d410565f83aeaff3eb2a0295915f0c4f4015e94d40853874c715195c0922e8c3a496a0
 EBUILD grpcio-tools-1.22.1.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
 EBUILD grpcio-tools-1.23.0.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
 EBUILD grpcio-tools-1.24.3.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
deleted file mode 100644
index e91e65eac30e..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.16.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
deleted file mode 100644
index 045bea887550..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.17.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
deleted file mode 100644
index 045bea887550..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.18.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
deleted file mode 100644
index 3627353b6a86..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.19.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
deleted file mode 100644
index 83f7c06e49e6..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.20.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
deleted file mode 100644
index 83f7c06e49e6..000000000000
--- a/dev-python/grpcio-tools/grpcio-tools-1.21.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Protobuf code generator for gRPC"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	!<net-libs/grpc-1.16.0[tools]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 75db13f86d6e..bf83f661583c 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,21 +1,9 @@
 AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
 AUX grpc-1.26-fix-odr-violation.patch 20139 BLAKE2B 0a7e8043a40c2d6edb6ea4620b3cf908f3d7a24f88aa864581ad6b77ebdcb12dc77930510523aa4a3ed21d86ef931749afd723c08f472489546c6cb6d47dcad8 SHA512 de5be7bb5d4923c9d4b14e93c7652b79efbe58c9059e91bbc52367d04eb69113724c659ab1cfab5dc1f437c790242d17008fd7d6eaf38325370d33f01fb2db1f
-DIST grpcio-1.16.1.tar.gz 14514047 BLAKE2B e4fc7f196f3e377afb0a103aca60337dd63b3b0f84846e7e2a4622a0102d4300782f08367e1429e1fd021dd90b151f17dd927a25a749f35724c7d2a41a6943a6 SHA512 efd7fb36a61e2ee872c0807a8198cabe8f1f9003bd5bce7cd46c75541752c0f745db02bbfe3f37f572531e15df60913f2b08b678545f176fe683f3e64e22124f
-DIST grpcio-1.17.1.tar.gz 14563233 BLAKE2B 61ccfaa967ee348f02f5a201e4f36f25d4fa09a1af11c6b5a0f345d13bf86f0fb12c3aea125c5bc27925698e0a23a9592806fe5db92fa37360cdcaf88e596189 SHA512 bf8dc6b7ce2f4a0765377fbae085395caef9f0cd0a2b4a779b3bf1667c6aba5fff034168bff9539f96dea76b2c97d7586305715c850d10e54918337458a4ee95
-DIST grpcio-1.18.0.tar.gz 14601124 BLAKE2B 4dc57243759c573b960e841def6af335f490fc6aa285f88979b4c66365b104a84269688c589ed7ae797527b04124a9997937f5bf33b179978077b2b680e515f5 SHA512 da791a418e0f6f3a7be921e107586837edcd2020dc8dab1107712372ebd4896b6b94e00d7501ed957e4ab0d5f7d6a3f2b57477ff33c55eb5e4ad7828b2f21624
-DIST grpcio-1.19.0.tar.gz 14621509 BLAKE2B b756ba60d317baa089b8ee57c458bc68fb72e61a87150f1ef3366fea23456ca8d5bd443ba1579d1bef5d0049f249fc8c2c6e7c7cc0967eb58c102fb03d783103 SHA512 620459dd1a22cf60cb6bccb1b7dd64175f1efdfc098152cfa1889ad0a727b7a92b72f9de28b57e9a45cc8d2c22e2fc36307af8ab52ced454a91aedeaf7158273
-DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255d055f32f5947191fcb5fd45cca9c97aa3f8c4966e7195add5289ba3747a77b2f0c01a35762ffbeba6938c76046d SHA512 0ac126d8b2c25204bb03daccfc9b17016bc18dd31f89f6e208f2ae39d7e6fd17ae04a8178367a5334421d959b14fd3d31ac71a692b48a060d98f983553fcc3e2
-DIST grpcio-1.21.1.tar.gz 13919484 BLAKE2B dcad98da8db4aa588facc30d1b010ec1e4d5f8085751422277631329f1c4949ba3e2c3882829354025a845992ba9972df1c48a277df93caef9015969f9423aef SHA512 0ea20490ce5e776a6253d4b89dd9d9091afb7462d6bd6bd9d2d3329979d61360a3e31abbd043b90d0908512cf7ff2668bb21cb472fbf0ad5a3b5963073850dd7
 DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4bf6fae42b163f2ae04e01c4b323c4d7c2a5380ccdbab14f9a6986c86fae4948bc827a97c189f915bc24738fc426 SHA512 5392041a021b0523fc7a615070ea0f907fc960cb69ffba1e7fcdf0aa8e498cb33f567d9eec795dc06662f558884dcabcc17a1ae4a26fcaa479b0a43c08e8b913
 DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
 DIST grpcio-1.24.3.tar.gz 14030592 BLAKE2B aa9e61c692937d7fc06d0fb601f7632a6ac5fb165aabec9e7993cf1fa41254b004fff89f650f390544e5fb1972dca542169ce0fdae79a71d775fe3cbb44a2d95 SHA512 0dc90de5a06b9af7fa91d3e96117f69813e5fee31499e8e48daac7d164856594f164a434d3dd28d6e0220e417926aadceabb9b7597e86a6bb87d8943e6661dce
 DIST grpcio-1.26.0.tar.gz 15406206 BLAKE2B 4a9031e1d9e9285d1c1ee90396ae339a47715fa2c279f5bce517e3ea02bdc755e3044e3e402f73b3d797a6b1415f58396097a55ba16200c7f9d4569b0b159fe3 SHA512 df3b6787449c202f3e70640907c76231dbbeb6b411167300ba8a53c17f7d45ffa513a81046a4a66a368f2c17c2d57a48a07cb236f44a005e4073bd5d8aa3865c
-EBUILD grpcio-1.16.1.ebuild 907 BLAKE2B 469e074179caf62c01ced7a3a5b87cfdfe8fa45278b570da7b44076c0f1a8bb8b703d42887969c5490945d9df53305cd87932bc93e4dc58176a594e6d02baefa SHA512 befadb3b0cc48b7274a11fb541a692f1242c07f144d91f886785a47ef0c825285f5d122ff7f22b3c571ac0ea8ff1e333100b79a0646f7bd1c1633149a2521849
-EBUILD grpcio-1.17.1.ebuild 1035 BLAKE2B 2ffc3de9b252c02d6e2aed183e7142852036ee6757717f2219806f782cb5d2e9125aced970d67e1897b7b091c2a455f545fd2f0b2f124ff36825d56bd1a7c699 SHA512 acf1554c4d3779fffb40f618a188ce3827a64b4e000bccd60a983f969995036e59781ce154d7e85c97a5f078f670f9c172edd6216e5abe2fd0aef301f9012d73
-EBUILD grpcio-1.18.0.ebuild 1035 BLAKE2B 2ffc3de9b252c02d6e2aed183e7142852036ee6757717f2219806f782cb5d2e9125aced970d67e1897b7b091c2a455f545fd2f0b2f124ff36825d56bd1a7c699 SHA512 acf1554c4d3779fffb40f618a188ce3827a64b4e000bccd60a983f969995036e59781ce154d7e85c97a5f078f670f9c172edd6216e5abe2fd0aef301f9012d73
-EBUILD grpcio-1.19.0.ebuild 1085 BLAKE2B e9dbfd3977972d2b30ba249088a0305ecf7efb56b54bc039ec0c9867d94fcd5ab688ad20773399c7b294d2496ce380f3bbed83c06db4a42942b617a6843b2f18 SHA512 e7e332432c315312837681d16543742e53852ceb0b1bf3924b4993749e60afe71f5b733be944bcbba2cc14d4170820f34daa3a151bdbad1dcc34a7e7a4b3046d
-EBUILD grpcio-1.20.1.ebuild 1078 BLAKE2B 9e362d2e54f3c0d36cbade04242018e8166f0caa30f9344836d8e7254e01aa4f9c640183d6a76f6fc2674edcb9e31236b83a1896b812d2885ba9bb2321d52db3 SHA512 cb15f4d4e0fc66c1486cb1a005e8edac6a1a63402100d7e8dda11fedf3ea4e40d295bccf820711a618f4097283c202fc66fcff86a3849133a2433ef1a136c252
-EBUILD grpcio-1.21.1.ebuild 1078 BLAKE2B 9e362d2e54f3c0d36cbade04242018e8166f0caa30f9344836d8e7254e01aa4f9c640183d6a76f6fc2674edcb9e31236b83a1896b812d2885ba9bb2321d52db3 SHA512 cb15f4d4e0fc66c1486cb1a005e8edac6a1a63402100d7e8dda11fedf3ea4e40d295bccf820711a618f4097283c202fc66fcff86a3849133a2433ef1a136c252
 EBUILD grpcio-1.22.1.ebuild 1148 BLAKE2B a3e7fb7051f1661cb603f8ae4ebc8c0f349892a7082ca6d8511542de380074679b5adf0e200232a0b6e005336a18a8802f5c90949fe66123904b22ee2a5a3f87 SHA512 a4ef36ebe6774323c7aefe6cfd47efaf7df407be2d42fc6a3b19ca7a69463a4a2e0f3ffab539e509aec102680dfdf66edbd14304688a90966df66318ecac9ffd
 EBUILD grpcio-1.23.0.ebuild 1148 BLAKE2B a3e7fb7051f1661cb603f8ae4ebc8c0f349892a7082ca6d8511542de380074679b5adf0e200232a0b6e005336a18a8802f5c90949fe66123904b22ee2a5a3f87 SHA512 a4ef36ebe6774323c7aefe6cfd47efaf7df407be2d42fc6a3b19ca7a69463a4a2e0f3ffab539e509aec102680dfdf66edbd14304688a90966df66318ecac9ffd
 EBUILD grpcio-1.24.3.ebuild 1085 BLAKE2B 317e3df67c4d6472991aa3dc1521f0ed93b57f086debd2b60cee6f5a26c32e83fab89cc296cfeb5de186b0f0773d3b79da2d5e27a16c31f73efc202ad727bb2f SHA512 eb6e8f515098f8c8164fb1ac92ab8072d8e7c2bdfe58c25bfc999839c9ae3255aabac5b994f03d794303289be1a6b1f677702af38049841cf326ca0d37e5c906
diff --git a/dev-python/grpcio/grpcio-1.16.1.ebuild b/dev-python/grpcio/grpcio-1.16.1.ebuild
deleted file mode 100644
index c35a7691c6aa..000000000000
--- a/dev-python/grpcio/grpcio-1.16.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/grpcio/grpcio-1.17.1.ebuild b/dev-python/grpcio/grpcio-1.17.1.ebuild
deleted file mode 100644
index 7f13d32d88eb..000000000000
--- a/dev-python/grpcio/grpcio-1.17.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/grpcio/grpcio-1.18.0.ebuild b/dev-python/grpcio/grpcio-1.18.0.ebuild
deleted file mode 100644
index 7f13d32d88eb..000000000000
--- a/dev-python/grpcio/grpcio-1.18.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/grpcio/grpcio-1.19.0.ebuild b/dev-python/grpcio/grpcio-1.19.0.ebuild
deleted file mode 100644
index 637a144e4f44..000000000000
--- a/dev-python/grpcio/grpcio-1.19.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_compile() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/grpcio/grpcio-1.20.1.ebuild b/dev-python/grpcio/grpcio-1.20.1.ebuild
deleted file mode 100644
index 157964b30b6b..000000000000
--- a/dev-python/grpcio/grpcio-1.20.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.21.1.ebuild b/dev-python/grpcio/grpcio-1.21.1.ebuild
deleted file mode 100644
index 157964b30b6b..000000000000
--- a/dev-python/grpcio/grpcio-1.21.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	net-dns/c-ares:=
-	!<net-libs/grpc-1.16.0[python]
-	sys-libs/zlib:=
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
-	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
-	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
-	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
-	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
-	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
-	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/gtkspell-python/Manifest b/dev-python/gtkspell-python/Manifest
index ba7ecd75a023..03da94739ca8 100644
--- a/dev-python/gtkspell-python/Manifest
+++ b/dev-python/gtkspell-python/Manifest
@@ -1,4 +1,4 @@
 AUX gtkspell-python-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
 DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD gtkspell-python-2.25.3-r1.ebuild 889 BLAKE2B acd642a9d93f6102b5cfbcd4102cda595d43ae469e4d1fbe48cb657b880ef41f4d28e47e469e762571e0144f85ea2a93dd3e663ff962f3989fe0cb75e2e826a1 SHA512 0075b7005ef03820d090ccbf3fa389d5a1fb886c6785bb9590c5426bc40ecb27e0f406c567e0fd0d94a95c397bcc3a4c6dc99d0c00f8dbe9ece2d89cbbab55da
+EBUILD gtkspell-python-2.25.3-r1.ebuild 887 BLAKE2B b84d5ad0bb784c984853de385a337179856caa243ff90bdf108dd685442863ae34a6bc51b9d1707caab016bd0949fd55228372e827cdf2db08379c5080c68f84 SHA512 f6218bc6c53d9a23e415ea94400e2ea083f23eccae13c70a34d48dc2e7172687ae1eb62769830e85fa220fa97df5b432e2a63a6efe6507dfe9469ee9df1b834f
 MISC metadata.xml 346 BLAKE2B 48d899b0b769e7edf07feeb6349bd66595360a1fd09a3c9bc5385485729eba9f1eb462e508e6691fe47dd571be396a29fa266fc998cc8d2ff772b353713fcda9 SHA512 e7e631f5ebe3a81d0431366152d6f7a2d21958a031746d6b2fd6ac9ef3f145d78fb30d1014b0912e9d720b3be7c6d2fdc544bb840a9f12fddf37ffdcf65933bd
diff --git a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
index 1ca4939cde75..232c41696c51 100644
--- a/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
+++ b/dev-python/gtkspell-python/gtkspell-python-2.25.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ DESCRIPTION="GtkSpell bindings for Python"
 # an ebuild, currently. Punt till we actually have to face the issue.
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc examples"
 
 RDEPEND="app-text/gtkspell:2"
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 358fa4311afb..0c7cff02dfa7 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -3,7 +3,7 @@ DIST html2text-2019.8.11.tar.gz 48721 BLAKE2B 6a63a9608c29374a510d7026717de4b94e
 DIST html2text-2019.9.26.tar.gz 48634 BLAKE2B efece48c7b05171f9bae833663292d7804838b5a791f1f734b3a258843a71616ada2ebee7cee406e0bfa1a3dce67040d41621bd87be100a2c0d4ca6d75829aa9 SHA512 4c6a52e96d3997a6ebe41c2955e2f6bd5189f49aadd7d7afbe67b85a2f61a0aafd0fc09fef184cb9407b9ab26f120ef235294e4e9d8f41e3b6b8f6fc29aa386d
 DIST html2text-2020.1.16.tar.gz 49464 BLAKE2B f0331daa63b9e5d7508e0446e19b4dd4d05e5f7af0279efd71dc43b633f8273666189899a27cb598e8afdd5bd8ffb3d566b97327d82870ef44a81310d8e7e7c9 SHA512 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855
 EBUILD html2text-2018.1.9.ebuild 924 BLAKE2B b7a75f3a201c2d92932a7eb9645c2d28873198abeea9bd6f9dac6b0a42fe0220ca5aa541fec5a41d4024f35f188a8462abcda409aaec1d74df2f81cc7e04ea69 SHA512 824e0a4e2a8661d8c95af2e4bde31b32f0f511767898b69db31ab7beb5d105677a58363c86e6078ea3dd7b01f37a7a3a3297dff739ac41856275c0bd53c3016a
-EBUILD html2text-2019.8.11.ebuild 970 BLAKE2B cfde04cc5cf11f82ed7fa73c45e2044f12f2aeac9ad565d6cb12d987e2ad4ac99a2bc7855ac7690c6fd348fb556e487412e9fcc8af2fd3578dc7d57b4ef158e9 SHA512 d908126f00654c5f086fd66e0fe472e1af88451da328b3a975661792e994081e1c142566af20f4e7987fd64e9a2d0cf541645c538723fbfac257b63c3309c910
+EBUILD html2text-2019.8.11.ebuild 969 BLAKE2B 0420be716a652e7b5ae3aa22f704120000ea027d51c365858022c104f2c3d3746db0a3d9732f65ee29178cb11a7be6e2002bde1a9ce834f4c536734241aef2cf SHA512 285b74e4365973a509429d4211abed37c3af04a001600e3938844eaf661edfea0323808b10ba54d97246be688b37fd5ccd6cd0e68f394d7cd885fc82c1d61478
 EBUILD html2text-2019.9.26.ebuild 964 BLAKE2B db29ccb09dd222b28a386238cf72560e938cf4f70617c928fe7ebd5bec9a80bd8a6bfb3c0a670ffb737ce73efc07a32f69d54f56984088fc68fa2bf1c160a8ee SHA512 9c81869b0157a53819585ae3ff85da615e2984e703ceee2f34d2bef1d1641ee08301347a28b26d8f361a8a4ce73b7e5cf7fd9ad7a08d41adb4207a4e22263689
 EBUILD html2text-2020.1.16.ebuild 732 BLAKE2B 70b55bf9951face5355eb2e6e0bdb04fcee206c5901154c5f7bb08713028ae44d7e1cf5c16033eb7366652c892411e2028a7928978ff25221fa067e66dcad7cf SHA512 208d41d878cf7941425c041c87c712be6d99a9c5fa44bf921140426e1624487f9f6c8cd4f072cae9e1e8404f47f0d0e0865cbe5ab89facd4ce43e802e014c838
 MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2019.8.11.ebuild b/dev-python/html2text/html2text-2019.8.11.ebuild
index 484d4f543a38..14acb3b2a1eb 100644
--- a/dev-python/html2text/html2text-2019.8.11.ebuild
+++ b/dev-python/html2text/html2text-2019.8.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index a1bd1fe48e60..6340b77a2de1 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,7 +1,7 @@
 DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
-DIST hyper-h2-3.0.1.tar.gz 2198911 BLAKE2B 453ce1bf8e6216e2852f49c5a22ec5cfa487a744a818e82929dd0c4f03280953c1f742890d74f771080987e2f70d9430e4d66481501357f0d4c5ec490fc5fbf7 SHA512 5d98b4fb654c20f6b9e6918bb71b88a42a3027bae795f31c32c2b5cc4428774457c44a194f9c819f99b9cfd01753a6e6d8edb6c162020ff463602452d8e9057c
 DIST hyper-h2-3.1.1.tar.gz 2202601 BLAKE2B 62a7a9ff4e1295d279fbe7c02da6d60d97984caf8f4eee6fa69de3974913caf57d7933a991825296e96b54b4646139793529e839e492d440874aa134cdb7e96e SHA512 153c450ef918cc7cdb5d8efe61692a646925e76e6255ef46f679091590681be7d1f9319b37f6521c56207cf35e7d9e56951e4e3b55a24fe89d9e6aa28591957b
+DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
 EBUILD hyper-h2-2.5.1.ebuild 956 BLAKE2B 8e610db8171bb7e44a747b8edf4496b9b1e12dac689e5b57ca35941c99948a0670812b6f111e7023e406b292d59549680295e90114436ca6b6f664373a73d687 SHA512 97fd55d847419e45e41e87883c10a293ee8aef5fff953eeca524524cf6fb9b2711f96defa5a27aaad45c22808d4d9d09a7b69f19e646bcc71746951b6c6cac43
-EBUILD hyper-h2-3.0.1.ebuild 1098 BLAKE2B e73f26475184a898076092aaf35f76f28ff7986900939b520267981aac8119fccf3d919177be4a61744432db746e0234135657d035e4e2a56278e60bc1e41fb1 SHA512 ae9a01f0f89040b2037683c7b147b98a3fbec42a824a222729f100e530ccb3e0e03260d7735a8fed36419335819db2872921359009c0e2085cedd7ef899d595c
 EBUILD hyper-h2-3.1.1.ebuild 1128 BLAKE2B cf7fddf40986d8b08a392afd8d74e4fe44dd5a8778b21a9d35f821fd650805fc223411e3711348323d0aa20733d8d4337ff5833a70da3416e0043fd60727ab99 SHA512 f6a4a5deb00a24c4ff52ada9177282bb8e893cd2a1fecd39b9f1d2178a0954f7a1f820cf8510cb35a6e061ece75c95c8f24b87842e1b36df6699a3d0f037c066
+EBUILD hyper-h2-3.2.0.ebuild 1093 BLAKE2B e006dc8e6eba5a6f2097c55b89fa3f072bea63f137899561fd296dc0e3fe15f21e9e8ab04d77c5c8a4fe5c347ede2a88fd45d4c9e282a9c3922251adcb1f13f4 SHA512 8ee1d6bc5f9852cecebb310571dc4736c80d975f4d85dfbcbc1c18e61dc24050bdd1d465ad28aa9ce35e4c789bbad8f7113ef3de25c035007abd58bb7fcd1c67
 MISC metadata.xml 669 BLAKE2B fb8b8c6d1e8ae5cd8a0e6473c84a3d0e161f17ca671b24cdad86029af14936aab6cfaa9c119536980a69d96ce82fd296e407d8bc0d7eb2c5f1cebf37dd7a8f99 SHA512 ecf3d13974ec803b298d9be9898e5dd70c9bb2d9eb5f89ed37fd46e05f313ff3f8a4c6f01453dd92d7b5f74271516a2cb8d152cb9c1b2f26848b909525a038a2
diff --git a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
deleted file mode 100644
index 455744ef8e0a..000000000000
--- a/dev-python/hyper-h2/hyper-h2-3.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7})
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
-HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
-SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
-	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/hpack-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv test || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
new file mode 100644
index 000000000000..8487ab0c7c61
--- /dev/null
+++ b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/hyperframe-5.2.0[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]
+		<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' -2)
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest -vv --hypothesis-profile=travis test ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7b657c7cd391..8384c94f11db 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,15 +1,13 @@
 DIST hypothesis-python-4.47.5.tar.gz 6805022 BLAKE2B 737a558c794f3ac428bef4b38858d47fddba613ce37eb9a9554afa3c189776e9172965dd31f8497747ac13b2ab1d34ee6de8671646972e71b82c5260db489b9a SHA512 9b6920181dca75b9e551ae5e598101f35cfc26e9e3a1b20cab652c151bc6355413d0c9602d3242fb23f808ab00335793009df938d55ee19a6af1ce2a8b085e3c
 DIST hypothesis-python-4.50.8.tar.gz 6814518 BLAKE2B f2c39cae3708fe88d1854cda97633ba420c32fda38093bb852ef45929762cade0f7f0d1ef696ff96f7ebe7460e8bf53f63de9c959bbbd9e8ec162196d307aac0 SHA512 8c77439fd029e2380afbc059d2edf977414997ba81ecdfde14dfe9dbe9515a92e701751d13879c6b879271f817e01926c2dc66945ae76eb141818da1775bc545
-DIST hypothesis-python-4.55.4.tar.gz 9004357 BLAKE2B 93fe51581f044cf5f416d9b74b82ce2f9b42e7391beae8f67debdf50494e662f07bf109274d4e29fcf3a1c1c944597cde2a4ff9e7ca65a48f1244c3205f365af SHA512 91d7d2cda32fd40d5368fdd1e60b990b8307573782d822113b6817a5c0b670610693a2f2b013f828913549946fa3dc15f45303bf7d3226bdc1e4527bc18981fb
 DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
-DIST hypothesis-python-5.3.0.tar.gz 8991842 BLAKE2B 9bd5124a6a0b07c910aebd5caa3a27d6ee19d307f88438ef097b09108a6c41d4b548c224861b1aed766a84696fe494c3b50f55b0b35bf81563ee62c366a03956 SHA512 d622c6754e6162120e7bdc17f482d64e917042499179668744b26e09ba355d94681b2e1029d786c38af19c4193c41eb5fe3e4a7ecc322acd1895b8f90d2b1f95
-DIST hypothesis-python-5.4.0.tar.gz 8992011 BLAKE2B 0d748429e34360437799d043f75282153687b84c1f0c27f18846c75bf6a801797c460f3e1d22a04d52f1b046cb33d6ac34fcae93c40180e0273957ea81e3fb40 SHA512 9b168f11f9d7e720691ce3fdbff8f97d3fdfff86bdc9ab2683e58ff31dece36d57b468693fcf3b1b7e6cfc16022dd733eacabbf5bd08042ac8cca6c45050c129
 DIST hypothesis-python-5.4.1.tar.gz 8993002 BLAKE2B b96f9080f7a5b307698ee1119495cb5356ccd2836f1d3ae66077bc0be2793d5d62beba09b2a38e5486f6d0d09e95ac85e81511c5ab7434c7285608a0ae62caa7 SHA512 bf01c50ea998aee2a547132806845aa9330a3830ce2b864f0ab9e2d9b9dd7dbdc9ec4db2ef77bfb9a76467b00f3ca1c00acbba7bdea569dab3038914a598d0c0
+DIST hypothesis-python-5.5.0.tar.gz 8996266 BLAKE2B c9eebe4bf1df5cbf7a40dabeecc9991e71ceda4c2084a1b045f77a2455d5581d055e55b22dde48d627eb3cd3b111bdb06b14ada2f31dccd201390430a4a38c15 SHA512 302211f91be253e15bb84c81e80e72c6de41c3a640569363aeac27b2650e569275f9614a678beb9e03f1e97090de4eab7954bc39b55a4324be0ef0b45daf5228
+DIST hypothesis-python-5.5.1.tar.gz 8996186 BLAKE2B 0e1e013b0339e504603b583882f6d05efa96e5b97b02967c49001c329923df7b2b2666a5351f223ab991cc86f6b0b7ae91c3f6e34c1e089a9f06a271dc7b887f SHA512 4129d85a0e4d2614cd2d8d018043b6346d59f973cce79cdbab2d8688d1c18e9dd0b9044515d715c80e03812020f134a8897931a9942eaad181567750a7cee049
 EBUILD hypothesis-4.47.5.ebuild 1715 BLAKE2B e11813476869c123bce76c05955412b1f6697df88060b5e9bdb205b4bca60c9042194210106b6ecb80e5465cd098821189f1dbe2c1f31d4336e7d0b2bb58abfd SHA512 54049e33fb298392b89c992bf3c73cb928716076060f4fa7b65ab8680e52dbae16ead0affdd5ccdd03550259faf5629d43b30d57a944cabeebd9751e8be41b16
 EBUILD hypothesis-4.50.8.ebuild 1717 BLAKE2B 97201f02ff2fa9b0618fe299f0859ff63065a179d145c101240f72c5b2b46ceab075b7cb20d3e5e5acfdaedb62b5c1ddc117a69e9f43ffe29aec65e57a62f0bc SHA512 60ec681c4eff1ed0d84c13353ad790ce45751eda94a55434b10d67d10ab4e7af381a9157f214bb6bd79e40f8def2ef8d098ae1dcae7f85c7fb27563afe728363
-EBUILD hypothesis-4.55.4.ebuild 1719 BLAKE2B e3021ac093126b60814311860311efc7d60a992b7b08031586e5e7c39d1ec20617fd756088d5d66a1f18ce16f96348c46589992d60d25776be6b7266014b1a5b SHA512 c83975840094233883fcdf731fccdf3d5201cb23b3c7268dde4395e8e8ac8089c0085ef3e01b47dd1e51946277892da358a847d71bb7ad243190778fabecb366
-EBUILD hypothesis-4.57.1.ebuild 1718 BLAKE2B c107b1720cdc67576b50e214afaab6274e8670f472c797ebca7c67c546ddcf6e3308ef4ca8d0a537ebc0dad605375f1875496e1be0ca29ce5c90295a43fac036 SHA512 a678071157752f4c408c6976d503c9cc68d7507beb98c29868407d9ca1ae6fd4d3d857ebf8b9a7e26de73b71520bb5f5028622138943d519518e8e76c72c38bf
-EBUILD hypothesis-5.3.0.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
-EBUILD hypothesis-5.4.0.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
+EBUILD hypothesis-4.57.1.ebuild 1715 BLAKE2B 614bdbfe337cde8a097bcd96b71b3513407f40107778ec7dfbbc7162e2c0fa5bf6aad522bebd2b985c11b79be63c9af9ed1c51bdfc92fafc17de38dae4f71567 SHA512 2d191a6cae2b4df603f262c3fe010ca31577b0f8eadc2937209ce937e2dd8529f850a9c2bd0752179df5c5fb5b435ed25b9b9cbf6aeb16f492f5b5ddfd0f8b0c
 EBUILD hypothesis-5.4.1.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
+EBUILD hypothesis-5.5.0.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
+EBUILD hypothesis-5.5.1.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-4.55.4.ebuild b/dev-python/hypothesis/hypothesis-4.55.4.ebuild
deleted file mode 100644
index 996a19c65c46..000000000000
--- a/dev-python/hypothesis/hypothesis-4.55.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' pypy)
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-4.3[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-src_prepare() {
-	# avoid pytest-xdist dep for one test
-	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
-		tests/pytest/test_statistics.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local pyver=$(python_is_python3 && echo 3 || echo 2)
-	pytest -vv tests/cover tests/pytest tests/py${pyver} ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index 3723e3d3c8ee..0f9269e5ab40 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.3.0.ebuild b/dev-python/hypothesis/hypothesis-5.5.0.ebuild
index d1f7fce2bf73..d1f7fce2bf73 100644
--- a/dev-python/hypothesis/hypothesis-5.3.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.5.0.ebuild
diff --git a/dev-python/hypothesis/hypothesis-5.4.0.ebuild b/dev-python/hypothesis/hypothesis-5.5.1.ebuild
index d1f7fce2bf73..d1f7fce2bf73 100644
--- a/dev-python/hypothesis/hypothesis-5.4.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.5.1.ebuild
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 7b461e0c1db1..c3687dc12d92 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -4,5 +4,5 @@ DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af
 DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0
 EBUILD importlib_metadata-0.23-r1.ebuild 1407 BLAKE2B 2e4d29c2677331817023b7258a4a741019ad14c2fd2b81f2b4ea93ddf25d99a5e0f543c65663ed5929b84200897a64b58e0fad46c625984d4fdac0f561127323 SHA512 c24af8a052681a6c454db5dd6678945d2985966b45297de7b012f733ed79b5c29c8b209f767c3dbe8232021b34a6669222d741072fc9440e0ff71f10823db5dd
 EBUILD importlib_metadata-1.4.0.ebuild 1073 BLAKE2B f0be263465f6b9e271536e813dcf5b600e7e2f1f39a74f902e097bfa18d512e65e8b4ba2990377a23f61e4ba4dc5f84176f504d9ead0182a317ff4fe8ac17ae3 SHA512 afc41aead2f3d992a1ab4907d61ab329421297ee6e931aac7a3e641fe43d0281cfc449eef92cb4c797325180102260261eed5811f11f9597fb352a4c7011f470
-EBUILD importlib_metadata-1.5.0.ebuild 1070 BLAKE2B f6000f6bb662322a197661ed469e14d62936a63174375259f01ec6db73d526adc6a2c99e5e1efddfd03d4f07ee0145f7101ff464b8caf7a03e5fdc9ad454b298 SHA512 afa347d2336b583defa81393b0977cb2de853a72df4d6e046debb1f9f190877c775c182322bf26baf13b2389f2a93e0312f4f384c7624bfde5528563d23fc1a8
+EBUILD importlib_metadata-1.5.0.ebuild 1075 BLAKE2B d017de3a23e4de0914087de4236b802b2663f3491a85089149c66060c06c001f09fb8f895b059087764668115f3aa6a3f67bda840ef0b363262ebe5e2c2f8afc SHA512 f591365f6f2a2653e9c5c0f983108446a0c15e31a278d16703c168227a928d6cac04eeb8747c16548c727ea6983ffe86f030a223133bdb8fe1488ebc33b158c8
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
index 4ff78c4a4b2a..98c15a5ee877 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index f74f2c548eb3..76581d4a7b38 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -3,5 +3,5 @@ DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a73
 DIST inflect-4.0.0.tar.gz 71091 BLAKE2B 597db3d84cce1660ea92b84af5d07d77f537b2d738caedbe132ed9cb074a3c80c2f9e1cab321f0e231b2a29803f3b25206f27b78672c4917873007f3a56f1a8a SHA512 7d9ef9389b9301e596165fcb1774467ddeb421636094a0f0cebbcaa11558b4529ccb90644e1097f91cff3316911c98f4bb1df92180193a5313ca7da91a282e5c
 EBUILD inflect-0.2.5.ebuild 575 BLAKE2B 3b08519374ff99105001452bb98e23afee63434803d8f789913ab3a9099911c5d10ddf0981ccd926d084ccf686a6fc11db14544855c0ba13c55a624d4c196d6b SHA512 c45ec21562859554af7aca682f34e6f09b2a5b2fd8fdd22bb1dbfa2266f9ee8dacbb182b368f0395fe584d7d2cce2868a0f9a76b6e765ec8618692a077add8cc
 EBUILD inflect-3.0.2.ebuild 1222 BLAKE2B 075da95d632a0e250a9bc9654851417ea25237e8debd4d92e8e271aa456696a637e43f41920ac32d0e569d873b2ec9570272e260401e53cdd2ae32a3cd016426 SHA512 cc7f57360900e5079734dd1cda1ba4e97e2ab8fe0f3997253d81f4aad7ccb30098c22ade0826ae8b4c3f14a28396a43cb523acf906ca726b116afdc6afad1e33
-EBUILD inflect-4.0.0.ebuild 1119 BLAKE2B eaf9e27cb9e4243fe003bf514795e3a3a2d9ddd5bebb75ec6aca39370896bac86d006746af2bb0c8f006529088b0ef26134902cda648843203e4eb71761fc11c SHA512 93a848083e049760add722cfdd81a97ca22dc8eb11ea367d4562f38fdcca71738c8421e47276ba216bbd8d076d00d4748f318ea90bd2a8fe15528adbce11d3e4
+EBUILD inflect-4.0.0.ebuild 1137 BLAKE2B 8aa2cb050f5cd5092a92ba8fc8a12509e9b8484967556957dbe1f56508f3b0d45f30b0a36f728f94d754a6633c032aabbe34d4df7866fd565daa2049fb399aa8 SHA512 97f03bc2b401ccae8b24402da88f13ec662d53feb4ef0f67b30523e0986950e1362991f70b3a7ecc4c17cc4399c5969297f831c55502827defc73d0a787fe0e4
 MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
diff --git a/dev-python/inflect/inflect-4.0.0.ebuild b/dev-python/inflect/inflect-4.0.0.ebuild
index d7180e8c2c94..259a01510e67 100644
--- a/dev-python/inflect/inflect-4.0.0.ebuild
+++ b/dev-python/inflect/inflect-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index 8c0b947b2b22..d855f5a29a0b 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,4 +1,4 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
 EBUILD iocapture-0.1.2-r1.ebuild 701 BLAKE2B f30487c77532e1b8043b4b6bd13016c9940cd7e7376b395eb4d491f902eb209131aa7d2ca1a4007d06e1385c021655f2182a8b5ecaae0ee3ca4a11adf41e5157 SHA512 de63d2689515173304f5f88fcd5c0d25ee5817eb36ddd2a1c12e440902ad7567de63430f20904df35f97f2b0a8e34083b8e1ed33ba515b17ce062e21b377d256
-EBUILD iocapture-0.1.2-r2.ebuild 672 BLAKE2B a7fc3277657b521cdc2458757afc870d39ea08f2e67f84d30cbba48b668b261f53ee6cdc6dededc0220cca394a66d7aa7b2d02aab9a9c7f8919ff9796989537f SHA512 77f4feaa8b630b8426ada77b7bd99601434962dcfb93bfe765707261559a42b5bf773258fe0379df93c015907a06f33635b40d5a35a52fb662c19b8b85ab269f
+EBUILD iocapture-0.1.2-r2.ebuild 682 BLAKE2B 55139ee5be4e67fb1494e7d963aec2fdb3626d83b16f7f0e46ddbc94f2cfb1171493921c02d7250c4e5267716d706f33a9d203743d7e45c40446f4da7388248a SHA512 3ba19e3e310d56cff293504a193291bfb64329c330fc728d71912da812f991cb2f744c0210a8aee1a3dad2cf1b83d26dd4c0b2b1097bb612b446d5320900003c
 MISC metadata.xml 368 BLAKE2B 69295da6af2e74122fdf5f62eff141417283e7e51729f0c35ff593387fcf3640bdfbeffe079427b368e175f3aa80b97637d6cbefd68e2a3a9a79155735570560 SHA512 463826d4afeb4be68800318809427cb4762f9fb7e14f6f4ed2fe84a7765dfb5acaf9d5fe2f1e339e06a092d8a4dec5d21b3a9f15fc10c9112b69e85f4903b932
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index 08544c952fb8..cf28d1eab699 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index d6fd55872799..8783031bc797 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
 DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
-EBUILD jaraco-classes-2.0-r1.ebuild 1642 BLAKE2B a87dbe02596455066b9c3b5693af53107a8b3109e95e743dbbe82b59fd3a10c01d951ccf83853e4871cdd670119e88d83b9cb8a5f9e27ff3bae38969acd558a2 SHA512 4f333d58699a384668472e3a00ec6b0175622141c13eaa7123e5f3f16193804bb1f87323f53fc7d6784e23e41044e4f7e99773ad27f1e04ad24b5957c2bafc95
+EBUILD jaraco-classes-2.0-r1.ebuild 1647 BLAKE2B 45bc21fadd3ee81fcc85a91a22458b02a808d824830d2a3bb9cf8c5cfb993a4c76c20ace5be7617edf435ebafa391b3a8fef034e75244d6ad419ff207297d7c5 SHA512 3e1cc22a4e8aa8272ea3315261fed3d7368857a891a674feb1eb9dee2fb51dfb1fbfe82d1294641134076f90951967ab4534a1660f009cd690fd6b740d850972
 EBUILD jaraco-classes-3.1.0.ebuild 1644 BLAKE2B b9553c119981b5479e8d0675e905de540a62808ca0603fa59ff73e18e2332d450bb7651b2fec4d14a3453c5373ed8a53d9fb0a139ec2dd4984a27f72c5f6ad7d SHA512 357867a1bdbcfc549865a71199554419309581c6ad6cc351bc223fb41cbfb2323e54aab6fc1763694e7c5964d8b151616dbba121a60ade3de6765b1118a91523
 MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
index 2bc0ef26fc64..cd1a2a581174 100644
--- a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index f94e5f246c80..da08d90996fb 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -3,6 +3,6 @@ DIST jaraco.functools-1.19.tar.gz 10588 BLAKE2B c71eb4e0c611f6a0bd82e04cacb79339
 DIST jaraco.functools-2.0.tar.gz 14340 BLAKE2B 560490b1150c2385f9c4d468fe7ab4fa84475ad43e1ebed784343a71742976ed0c18df3f6240b1d5b69106a6835c0248838331a654f9d3fdc863622c3dda33be SHA512 dce30c08f0e9f3c7b682c78fc3a46a26d9972706f4c8449a12ba11aa5ed130c6d9ca405213fd93b6b4110ef9cea549e5fa925c96bfaf18681cd6957d8ba0889f
 DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5
 EBUILD jaraco-functools-1.19-r1.ebuild 1580 BLAKE2B 4aa6db85e981dfadbf90253251ad85d205f4bc3050f928ab918036d6248a931f3e7a7381160f3d5fdf81a925d24b4a32c73fdcf2cfb4deed1134ea28d79d9f62 SHA512 6450ee7269e094caecd7a3b5350a370abe5f4be638074e8dc20679b06e25294a0d8ea88ba828cee1568312a3e00d3bb72be69852ef2ec9d6799cf5ee8e8de87f
-EBUILD jaraco-functools-2.0-r1.ebuild 1912 BLAKE2B 377b9f78b93a865f8c32b045a33506e4aee354cce779e156b2d823d0177625b8353207b2609e64df45076cd9200ce35268b9815e26c8cdd87129d88b881b5858 SHA512 faaa510ad73e3a83ce62417f7c29d959105076a9065e0245863f6f5fab21856540f239253f44314bb49916c1d17461b3cae288ae257cf08f5ebc6df0747f2955
+EBUILD jaraco-functools-2.0-r1.ebuild 1917 BLAKE2B 44ee01d39f60c8a0cf96673d685e154bada6fc69167a78b33f27bf4400333dfc477883b5722e365771c506da564b79159a589264868d6b3690948e8f0b2bd474 SHA512 293294acb1c36c47c67985f550e32bf125d7ca349ef3827a02669bf8eca014d89f19548149455f42ad29ac3f83787bc91a8b71c0c57d97882ef3b539570f7f74
 EBUILD jaraco-functools-3.0.0.ebuild 1744 BLAKE2B 006802b1d2ae65f738d67e371bda4424b7b6e4a38a26d0a6608b472058c57655303fa0ec90335268684113c97a2e77b23fc5c0a027b7721e51a807345792fc29 SHA512 391deb43e1f6ded933a91ced2ae0b31ec96a564b5a57ba659efb174cccdf6dd9abafff1c24a65b48c08b122e551cadb6287f8b5bc1440a7109924147d5b8b0c2
 MISC metadata.xml 550 BLAKE2B d8c0bdc0a3d2c0c3d37638bbc8534233acb659d38e0ed9e9e757ff35b261f241e213b73a5c55aee059aa7e73e71e574e4e4e52c12f3bfd9e6c3ac0059f2ec0ee SHA512 2fccec87fe5c57aa922ea30710d802c438f86fa3a72492dd4d2fc8917cc1a1a92ecb12fa5e9160c6245cbd6ab557791ac6f575de8a7a001842618f8d00343476
diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
index 7b3620197655..d40b39eb77b0 100644
--- a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 1efdf75cbac1..339d67de876f 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -3,5 +3,5 @@ DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7
 DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
 EBUILD jaraco-itertools-2.3-r1.ebuild 1400 BLAKE2B 42d68930b42184ff5c3ee7521c91db62acce6881469a2fc6095beb8129b59b427d649d01730e82f4c3d8c35d88462742626b0d32a6a8fe8630f22bc9ce6216af SHA512 fac80eb3ab79ea825660d2de8cb5d5361f84ed7d811a178bb37b7799e7b0bf289888692f9ffd11af39b2aae9792f4eb6278b7b669bf974b4f5d1410324477225
 EBUILD jaraco-itertools-4.4.2.ebuild 1656 BLAKE2B 4c21458f3b12ebbabcf65aa3b2ae1c1120c6f7181fdd09d08157f1be773cc2baa76e9fc53aad929f488bb3170380163d2d0d3d46e7c9096522bb44b106b0d070 SHA512 e86386d409c8cf6fc56a9663e2dff7a85d599b061cf2b43a6c3a5f3e358ac6e50137555e907b55d4dd5ea4fe4ddc95cbb876d0f3945cb42fdea9e42e3bac4b93
-EBUILD jaraco-itertools-5.0.0.ebuild 1822 BLAKE2B d6d6b79ee798fe16e3d5496c7988948fa96cfe1dda34d764064f1899d3fccb5d4383956f7ea602eed8f39b57904e7b28d165b5989186a22c1c51c37129c15c07 SHA512 05a6cc4beb266e5163231fa72bf6bb09d6784c7e8368339ec29bc2001f9b7672e232fe19aa6869fc22105da7f21d07fd696ee7fa39175b3d89aaba3e2f2740b9
+EBUILD jaraco-itertools-5.0.0.ebuild 1840 BLAKE2B c3ad16ccca14947e8403d430d02700677ba0468729ec35b5777fccb65a85d8346f1536e4d35dd358b58cba0ea5ed9a0445d7bf55323d322cec34f8c0f6150f07 SHA512 5717d764881925a146332f3ac8a14f4d0f39a732820104e7716122c6a234436448c67241f40b5d0107ee3fa00eda37a6d4558d5e077918b5865c1387cda1fcc3
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
index f36262075b5d..83fd2db141c1 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 64eb8c5dd57b..e5e0719dd058 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,5 @@
 DIST jeepney-0.3.1.tar.gz 22271 BLAKE2B a8de58e4ef4c4d1874c8995e3726a4bfa26a8db4a63040658c4edfd1742fa1c22de52d8cbee4913b1973279938544481fe2c2aef3138dc0ef724f7a99a39c617 SHA512 ad1a2d220a7626a3bdadf6fba6a591d1b498a9f6bb34607860213efddf49bbe67a4dc2d504decd906c560c519302f1fa45b85ba348156e8bec288f525d502e82
 DIST jeepney-0.4.1.tar.gz 27706 BLAKE2B 152bf872621a0e023b9f44bb165113b2c3ef0037f66cb1c2aa15423d68ae5c295ad100aba855f061840054a25c3ed30a2d1faed09cf2130235df72c70738c791 SHA512 46aed19fd29df724af0e78ec0acabeb196324444e682817c330f3fd290a52cf6a6cb639f8c76f4ef5311817c4e051d7231b4f26af3cb6768bdd8c4bec7589210
 EBUILD jeepney-0.3.1.ebuild 1105 BLAKE2B ab3b335bb4b89b62fed78561bb36ccfc0238b8c32eedaf783ae3c7bdd878ed1dca596372ac8debc07f78efe1fa34d9ddfb687515e5a2d920926f49743517890d SHA512 3cbb2666b9444bd23bd6860554d8755f8db345920785e74b2cd8c2635a5f1d2775dd71e7bc375398ea6b4af7c127489a070137975afed19001f01f8e0836e140
-EBUILD jeepney-0.4.1.ebuild 823 BLAKE2B dd93bc1e3d6222e1152e0f3c74adf41baf85c00a357d60aa543b0d1f43e313600e255259975913d9290413df52e0286e636a31c0599378aaeaf60f9b5e6ced5b SHA512 6144daf542c0674a717759e1ceee403ece569d02daecc3cfe9749720ac3b1615b142630bc4f40259b9fbe38c60ea09cb18ccbc0ca39e8f038105156961375e40
+EBUILD jeepney-0.4.1.ebuild 836 BLAKE2B 84f61d8b13fdd0156668fd4071904f6cace318579cc9566e6324597147148b5b304a4aeeae6aca72a31d2347c54b74dbbc65dba40b933165e56901c53bbbd74c SHA512 a1220ecd80ce9aac67c4e6e17835343a22da3fbf0108ffa9b5eed736f27dd80fe560e6608446dcd0dd4c1e119669ff260dbcefaf3347bba7974b6975d7e560bb
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.4.1.ebuild b/dev-python/jeepney/jeepney-0.4.1.ebuild
index 9cc48a55bc89..f17586db8045 100644
--- a/dev-python/jeepney/jeepney-0.4.1.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/lazr-config/Manifest b/dev-python/lazr-config/Manifest
index c2f333ff4e1f..04487feeb6d5 100644
--- a/dev-python/lazr-config/Manifest
+++ b/dev-python/lazr-config/Manifest
@@ -1,3 +1,3 @@
-DIST lazr-config-2.2.1.tar.gz 31761 BLAKE2B 3980e75677a5260dbecdaa59dba0a01fbaececbe217b4147199ee5e11396ca74f55df9cd23554b54eebe844b287dd6fd90e5c0755c405930f225b6ef61bb54fd SHA512 c8708bcbe371c731026489aad0fa2857ddc4ee0d13a468c33c3551d928318ee6b00f23eb20c44ac4ad9ea77a4edc8ffc2fec1bee9f018d27902940718825c4fb
-EBUILD lazr-config-2.2.1.ebuild 660 BLAKE2B 65554e8c73d2f7398c29becca4508ef86346213583df1312ac0c454507f17ee52dca45ce5ae4b62bfa1b750723865de19668ee2a6d1ff801e2bfcaf2415bc9c2 SHA512 1432e5fac3ab7242bdfdbf08e3e105d0cfe773414136adad2b1d5f47b922c0c595c0422bf3877df663634002de7dde8586d2e3d3c31296e1f91204d227ac4d0a
+DIST lazr-config-2.2.2.tar.gz 31957 BLAKE2B 5bfee9ae556e6b4109fa43ca36cc2676fb805dc6b9d9f788224ccd29e7836313affa55dd031496c2a252c5e64b150fd8f21c2934da3699ba95e0968ee8022879 SHA512 3427d2be4b4763238bd8378ec5936d38d0b944074d56f6ada55d0e3f232fe0846630a0ef3900c169b58092d029297d7c937ea4ad349aaa2745ed25b71df9c7a0
+EBUILD lazr-config-2.2.2.ebuild 656 BLAKE2B c836de2b5365b1225f73ed0555fd96c34b72ea36fb47e6eede44e29b0b656fd7388a6cb1911ed54226b5d5f4de4616fafde43b3108cf18508059fec055a21cfd SHA512 b852a4ce88ba1b8eb34ef9fca7bbee6d35e22c1528d0c15e7b0d5490f47156e02ec1a4ea5a4470dcd3dad78ee4f7ba99fc39ec0af42fc9a13034ff259b973f2d
 MISC metadata.xml 455 BLAKE2B f897ae39a752d337a92e2ce15baa3cc30217d8741d9da23345b8a4a62122ac87c0d38fe1780a89ff6ade706b59634d56c8cf4a6bd77a362f4319f83d8776ef43 SHA512 85f0af921cd7c83999cd0b302842276fb463c2881f3af7700676711a162804c2db3ecb06d89c0ccd3e33527ab7147723d5e9d7292cc0f26ba8f12438484a7301
diff --git a/dev-python/lazr-config/lazr-config-2.2.1.ebuild b/dev-python/lazr-config/lazr-config-2.2.1.ebuild
deleted file mode 100644
index b2ea284f5a80..000000000000
--- a/dev-python/lazr-config/lazr-config-2.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Create configuration schemas, and process and validate configurations."
-HOMEPAGE="https://code.launchpad.net/lazr.config"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/lazr-delegates[${PYTHON_USEDEP}]"
diff --git a/dev-python/lazr-config/lazr-config-2.2.2.ebuild b/dev-python/lazr-config/lazr-config-2.2.2.ebuild
new file mode 100644
index 000000000000..1b3afe149d60
--- /dev/null
+++ b/dev-python/lazr-config/lazr-config-2.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Create configuration schemas, and process and validate configurations."
+HOMEPAGE="https://code.launchpad.net/lazr.config"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	dev-python/lazr-delegates[${PYTHON_USEDEP}]"
diff --git a/dev-python/lazr-delegates/Manifest b/dev-python/lazr-delegates/Manifest
index 7eba255fc2d9..e1c689b6cae5 100644
--- a/dev-python/lazr-delegates/Manifest
+++ b/dev-python/lazr-delegates/Manifest
@@ -1,3 +1,3 @@
 DIST lazr-delegates-2.0.4.tar.gz 14168 BLAKE2B b9388a869e7f83e0bc30dc5a0cfb184a935db2b6272c2a9a93bb12d3db375114453a224703ef05b3f34232860a16fc087b7d398e94d164fbf77af61ba8abf102 SHA512 0c0b32a4fa4c132646d601870be0f0c1f1856aceb91bf979faa9a675fcbf94f76c7c6f548978a402842633cf4e53275c052cff7dfd776a4246691c067eabe501
-EBUILD lazr-delegates-2.0.4.ebuild 626 BLAKE2B fdb69dad83c6f9fc1ea97b326829505bdd60e3b1dcaa5b70f06f1e43493555e6ac868304945822bfe12993d0d8da0dccd171d0b84b6a95c2457ce43d9265b420 SHA512 25fc34900a6cff0631f6b085a03fd7da993f0fe3931a7bd99c8ac112991392cafcc4fe4489890a4a654a8ba6af142d4e4acffbf870ed8fbace705f55a1503729
+EBUILD lazr-delegates-2.0.4.ebuild 622 BLAKE2B 4757f6e2b151b266be640ef59ac7ad627d459e34ca0d696bdce2ce9a07c23651e03c978d88fa0f10ec8367cac60b14c3dfdc051b51de24bb77ce5677a849be44 SHA512 3cdd8d85a7766db79f7376ca87efa002a6319dd049de9ab4c8abb3dd25d4ac9bf9799cc3b08f670d0f4814e28e285dbede0485df99c6cf93986934333d254d10
 MISC metadata.xml 428 BLAKE2B 9156e02f1e687a320435ae677b8b357a0d101e670ff1e57647aa54012dacbab33ef9145f38b01b3c72d33377ab79cef1f388d00a758d4424f8c5ac38f3f4226f SHA512 e37d21627228729b1f9434288e81d0950505606f0394cf7793d49e217503244ccfcf8aca0ec3354d8dd0c9d7a511680800f6da5a0de423c187c1884e40b0bbce
diff --git a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
index c5a0941c7b85..f326aa3dae97 100644
--- a/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
+++ b/dev-python/lazr-delegates/lazr-delegates-2.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN=${PN/-/.}
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index b83c1f541010..83db5138c6af 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,3 +1,5 @@
+DIST apache-libcloud-1.5.0.tar.bz2 1258553 BLAKE2B 9cad0f61ab8505deea99c15022da92caf24295480d16bedf9c735c1117a055c94162cdcb331734c572f375de3ba10b499d5ed46a5a11f1e634d272e69748ef79 SHA512 91c10d164f56c9f75c6e5633802c3cf31046ab7a3ae554b73310b1da2d882ac1f8e90aaf3462db57ac0949dfd66cb840ec8fc6e6b79c46128668f13183d47b30
 DIST apache-libcloud-2.3.0.tar.bz2 1370556 BLAKE2B 14c6604d190d63f9049de2034b487cd7bb314add399339cac7a46dcbfea339497ede0d8058fd29dab43d53a45637fc5e60c71a5079fff6f45ed5023721eb68f2 SHA512 673c5b7b12f4510f2b43ea8199fab1e3f7ded62423d7d67301f5e3448c78750bc898c494a33d033844acf94bc292582371e9ac02ce1db6f4443a3966ef9fd0e8
+EBUILD libcloud-1.5.0.ebuild 1181 BLAKE2B 14dc4041bb03c683f9abc6464d0d6d93cead56ae56f45f90865b2d6416ec282843f2438aa147eaeef61f080f18ca486efd969505d3b78d86ac20a898f34d7fb1 SHA512 c3a4e4d36d9c34ea552a093109701ad1b41e0ecaa9f20c0192aabe4fd260c554505c98da1c65a3d3856da89266f2418107610098cdde8ac310ce1b7c6fd938d0
 EBUILD libcloud-2.3.0.ebuild 1115 BLAKE2B 69582e0f8a0804734ac4e1e8c4e5ab09340ba0bf2bcab70ceedc4f6e8abac082af5a6a62241c3024020c54d6fe5ee7d1b4c7defd3dc8b2d04bedf763fb420900 SHA512 efe6a44bb7fc595afc980abf9607684136a2187be0a554ab844016a53be3fc70fce52ebea10133a3b588bc2b7f648328c2a1a69799c6bb2ae093f6232caae33b
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/libcloud/libcloud-1.5.0.ebuild b/dev-python/libcloud/libcloud-1.5.0.ebuild
new file mode 100644
index 000000000000..e44f1f4a4793
--- /dev/null
+++ b/dev-python/libcloud/libcloud-1.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# py3 dropped due to failing tests once lockfile installed
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unified Interface to the Cloud - python support libs"
+HOMEPAGE="https://libcloud.apache.org/"
+SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/lockfile[${PYTHON_USEDEP}]
+		 $(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+# Known test failures
+RESTRICT="test"
+
+S="${WORKDIR}/apache-${P}"
+
+python_prepare_all() {
+	if use examples; then
+		mkdir examples
+		mv example_*.py examples || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	cp libcloud/test/secrets.py-dist libcloud/test/secrets.py || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 6c0a665b43d2..6ec22b5e398e 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,6 +1,7 @@
 DIST line_profiler-2.0.tar.gz 68478 BLAKE2B fb814b251e8f18a51e65297e57523b85c55b4060444c42d99801aa88c8ee0279abf14def6ecd5a9b09550e46e2d27b3ec809b1333725b00de64b58f117c76ed7 SHA512 c0335fc69fb47c150fa5555af4f7fdf4b172ca12ee6512e04ba854c4a81f3e6ee5594e484d11c8ea7e9e8048e3f3b8661db52332d4ac645195a0e050acea4ecb
 DIST line_profiler-2.1.2.tar.gz 83131 BLAKE2B 0f61d7dbab24988a50c1c0a9dce528cf792ca53b5f4c60f00fd9dabfd3d3e109f2d245867bc1ebb8294fb84343907e3593c416341ea1b0d7ae626cda8a3218d3 SHA512 625a585915d338fe8ef2f37c5b5bc024f769a623380b85725bcf33686e4cc62a211c2e91552e093dee940367b0d2ad306c5cbe7f1e8f1574eb731d128b8e22bd
+DIST line_profiler-3.0.2.tar.gz 44005 BLAKE2B 2237eb5fc26d673eb0b7c1970b7f04ba7df1c5ebe5f1605a818dba218f9b134ddc3647ae91b10b42ad551cc8e4638d39723ac9d62f75ea705bc7ca1ddc41c99b SHA512 db6cd96c7dbab9b0d4844a3283c65dc56724d50ebe1ce439f6a2b3410e96209d812c2baf2795e2c8d78af23e3cd01c67a92aa0aca4533e8e4b661bf2e63f63c1
 EBUILD line_profiler-2.0.ebuild 679 BLAKE2B 9f3f89b2319ea042f72276ac23aa3ffa74aa63dff206d1f547e532f848365b13aa90ea5c74fe289b28779fb5184b88b99240536649fb981562403d90c578fa0d SHA512 6271631e46c6b7dd48a1b7e4350f99a8e811a69b7920f8ec9b103c44aeda8789124d67e6500f809999b9b394ddc733fb9d9e32b3ed826c8e5eadf048d963499c
 EBUILD line_profiler-2.1.2.ebuild 673 BLAKE2B 29d21f1a75b4bcc4280ede8bb8ea3e9de25d4469a2e094e8577022f721debf92c28c68ac3db656de2041c780c061e00e9e23e8f82ddcfce742975151e925c9ed SHA512 af85551279951c2f6ee59049e8612f617cce742b080814e6d8c550c97740086593188a81ee591b0562919ec7c84c8982a804f3d6eecfe7a0c4ff0c84256625ef
-EBUILD line_profiler-9999.ebuild 592 BLAKE2B d9decdbff91f23ae7200329f846d4569fd8093722dcdd4697c02551cd5015f71170434c99ed57f0ad1437d865fca5cf6f274dc82f90ac3a5e740e785d8d7461c SHA512 ba840fc4e42877c4467a1c0cc5623152283c27a771f1c43c08585882eba25e8a2a7dab07a8add316ab57fd94ae6315d89aad1cd0f1434d60483e884a4194c105
-MISC metadata.xml 689 BLAKE2B 115e811feb48f966543319af1851acd8f7392dc0065d3216b469abeb470b45828481e2969346fa29e5486ca86b29e7efa0fbdc173358ca59824ef787bfa1bbf4 SHA512 28daebac470f3dbcb3eaa2de42c159d001184dc87696394f7ed78b984addf886432278f78b601cc8673c6a6583bc8dd479aa696354260443a6959c3b96f72fc4
+EBUILD line_profiler-3.0.2.ebuild 652 BLAKE2B 0f43ae96cc87894ecd1343ef36919edfba9854511ccd34775d07a09073cc54779ad0f892bb2aa3c32395fb13c7fc4018bbb626fc00302397c1542885813452a3 SHA512 7db74c7e34bc0b95b49920330f2c8bf615c84f24e2a10056e1ad9fa7046d1939cb438f45a826faea05e6aedf472560e8d30d15cdd9485073ac81a65c4ae4553b
+MISC metadata.xml 691 BLAKE2B 7cf7f3e2a82470d3d3423e203fe1db3ab849502af636e6e36664937738cfb179960c8dbaa2628550e0490f71dd3baec74b083e4341122144cd1b8a6a6c503bdf SHA512 9430cfef2807664446522f0401645522714eac92f990d9c9b4568d3362a26250a3059a386c35e875e2e186206a6401d87b09ad6d66b3d5accc11bc40f73901b7
diff --git a/dev-python/line_profiler/line_profiler-3.0.2.ebuild b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
new file mode 100644
index 000000000000..e7db155b3e30
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-3.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="https://github.com/pyutils/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/scikit-build[${PYTHON_USEDEP}]"
+
+RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/ubelt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/line_profiler/line_profiler-9999.ebuild b/dev-python/line_profiler/line_profiler-9999.ebuild
deleted file mode 100644
index d39393b59017..000000000000
--- a/dev-python/line_profiler/line_profiler-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/rkern/line_profiler"
-EGIT_REPO_URI="https://github.com/rkern/${PN}.git"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
index 9039f4a31310..35be66749f84 100644
--- a/dev-python/line_profiler/metadata.xml
+++ b/dev-python/line_profiler/metadata.xml
@@ -13,6 +13,6 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">line_profiler</remote-id>
-    <remote-id type="github">rkern/line_profiler</remote-id>
+    <remote-id type="github">pyutils/line_profiler</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index a2e53771d659..dd2a02a83f74 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -6,7 +6,7 @@ DIST lxml-4.4.2.tar.gz 940286 BLAKE2B 28366d1673b356f980cedc64839f070e8166906705
 DIST lxml-4.4.3.tar.gz 940482 BLAKE2B 9ece0314d7b8ef82d70e83f6b77e4abef99d486a0168497f1f97e6a93d81d58e522e259d3569373d2429ac3190a642e8d1107dbae29ca20ec56636f7576545b6 SHA512 7b07450a243595bd412a43e73a55fafda0e6a6e41ed47c5488ee8e6cbd04d48a93db1b06f8b646bdc6377cad063aa53781cf41e3048f9dd7a62ccecc20900298
 DIST lxml-4.5.0.tar.gz 942013 BLAKE2B 24535fb74c58baff26c47c4bfe4ade0155044b30d099f1990c11406eca34e6bb8255631e5b30172adcf95fc61d1ab9d0384dbf9910c7694beed11cbb99595008 SHA512 b4b4692cffb7b8d074e72033711e17df2529d0747c4d086926855bb5a39478e7aea2bc195d201ca3c252822b231dbe47aaedc647e50bbd6b24754668beaa60ca
 EBUILD lxml-4.3.3.ebuild 2437 BLAKE2B 73fb2f05738a79448b324a20e9a79ec981889511cbc33bde9ec00797eb7e67db85fca94be070cb752203749a5796a60d8bc6a1aba9ae76156c6aae96f9bc9d50 SHA512 33c12f61dd02d7608c21923e9a96a56a9b60f286fc3d97de30780e69cf804dd60b8a0eea9f8cc3a107eb2f6cb119807b7c174cb9b7f8708ed54e5d77cf16851f
-EBUILD lxml-4.4.2.ebuild 2294 BLAKE2B a891ce490d942f2ffcff7b3b28ee31577c27db3df3aca4549bada59c8539189adaa3d97404e4a7d9ce4bbfa644e5b3fca94d602e28cde4c85bffe65ed34e529a SHA512 4411ee25b2399c241a4c6010d10353c646b95f9dcc8e6348fd57b8ef34bbb59bf394925abd53c8439d992162c44701436d5e530a54e76b9aa3118b71170891de
+EBUILD lxml-4.4.2.ebuild 2293 BLAKE2B 3deac4716cbe210a6a029d26e7bdd7e2ea309bfa3e2981656b5ac7b89bbcc37ca428e6f5d0c8eeb8316ee70c6620935b29d6c0666fa623d9a95b49ea5c5f6edd SHA512 c9863be2405bead706cfedb12b7aa171e0151e56e168fe817252fd83ff3ffdf980a7d5c309d251ee532f7a883237dbc000bc97ac697bb61da759ae825b597eab
 EBUILD lxml-4.4.3.ebuild 2301 BLAKE2B 7cb17345b72b32f3b21b5b6299b8b1f7359557c5daf11ccf868448f03cba781ea7ea4f9c19e600a28753ae863f6fe988b6fd7c2336be53f8862427501c70c120 SHA512 cd99aa11d270e67bed34ac21aa71770ad3a0c143a97d12d2c4d35532d6c51aa92fa6bda2ed2f684e4087db8d247f108ee72cbe7f7cddc80d71430e834ada011c
 EBUILD lxml-4.5.0.ebuild 2301 BLAKE2B d96936664a021c04a3192c699c6671c3394d8a8827866bdac813c098956a9e193a60c985d332a56efe214fdbbee2c25c357ae738a8fa8565f5fa3329e17418fd SHA512 b158f2bc2b8b0344248395f8b264da9e818435e2c2ba8e0b9c901b9a75ef0f67780d1f5143c8b1d01657ecb599e674a2c753745bb6fac95a34e39b6a1b8bd7e6
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.4.2.ebuild b/dev-python/lxml/lxml-4.4.2.ebuild
index 0210cdc96699..ce35d91270f6 100644
--- a/dev-python/lxml/lxml-4.4.2.ebuild
+++ b/dev-python/lxml/lxml-4.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index e6fce4858af8..ae41c0245f45 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -3,9 +3,11 @@ DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee
 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 DIST Markdown-3.0.1.tar.gz 284084 BLAKE2B 6a9250295057ed32b389e1aeecf9aa3acac37ef48e6ca93a4821eb56a2323d65c1aed99799bf05811f27f45ba61f7bb704f69c6d2be706d8d2764c026e937905 SHA512 c648c1b8ecb3c907ff2bd636ec6c08b4b629967fb916913f77db641f6d61b83d16929af2f15f5695c8cdb9614031606110e02a7e0bbb3aab0be38a8e285f12f1
 DIST Markdown-3.1.1.tar.gz 294136 BLAKE2B 9fd024f64f7aaa774a49f60e312e47bbc2ff0f368f083e4dfd0c38d1f12839dfcf3455f1d0c8cb0b9c851fe0d3a779c70784859f1682703bd6022d57b6548235 SHA512 78f089f2eef5c73d683ac96fd20c87145e243d12b0f230b9b0228b995035fbb084dde40be788679c63637f05956487ad520cc9dd61d133926bf13521aa600090
+DIST Markdown-3.2.tar.gz 296747 BLAKE2B b2c5289330f8aca9d379878b522513adeeb9cc921cff39fe887beb40b8c7b96608fd56d7f95f201b41bbbc4cef759e40e164025f7f750183186bcf45553c609a SHA512 7f7c9a5a4846414aa8d4e9a9662ca49b08f393f7952bf2cffac493eb3e88406d3254466192b773ada0400013d669a9cea1b06e814af46f9667fdc8e20c079d65
 EBUILD markdown-2.6.11.ebuild 1335 BLAKE2B 2783aa9dc9bd53655383087ac8c52be1758253bee4fc36303bd289fb7ac28193ce93b8276f8f7f986eed2178a8024d6f01625eef5f29057dedc226452e8e1bf5 SHA512 bd75988f49caa502d1a47bf622a2ee7d8447619c596ce1e354589867f1228ea392e1a26cad28586d56f8a53a948891767fb11d7f7aba747be277f6e16e08dd99
 EBUILD markdown-2.6.8.ebuild 1420 BLAKE2B 376cf24f824a200aa8233c1efc1d1f129a308a1c7fc14a2c30f8949703f4af9f3163e2b1f646c33a52e5840ff45bfb7df5d79f32b292098c0bc169fd21b7db3a SHA512 2fa22e5608a0d41463b4b499f7d5399712f81c00d9e35c7775a634e2578af7baa28490ef2d1d5669f5112995e86b13016aac8159a7fc0dbac26397d9c768b755
 EBUILD markdown-3.0.1.ebuild 1255 BLAKE2B eed1c97845e9f0e7ec2cbac1b3f4fae6a9bf6b251b89d8a3719f1f21e6d8b95111e0f794be9b3a6e4281c96717777e5c3da5017aacbf9afd0100ea444ef5dc12 SHA512 b3f214ed031041f107501568559f9f7346699d84ec19333aae5414c3da22d8cd344b880c60aa5c0004558ce69cde2865229eb5d3fb1e5708c81d5c09a4e4d640
-EBUILD markdown-3.1.1-r1.ebuild 901 BLAKE2B 411a145d862aac15f9de649406ab8c3b79183535a4d59bf48d1f38ba359828676f410d91cb66e65890d11ecb2d304f498fbd12389754d9421acfcbb192617b5d SHA512 7fed93159f021916b68a6c72ae86fc5575cd21e6b7299f125c407bfd0944bb634feadcf399a4a5b184b01840f3d050829b435afc6e4191f348dd04f43196348f
+EBUILD markdown-3.1.1-r1.ebuild 898 BLAKE2B a648f16a56c15819541481c0610d251b322ae6b582dd502f9fb5914fc451fc9cb55aee58d983b3279e9c16005f7ba3e68cb11a4ef2578024e38ff167f2410f12 SHA512 412f7e99208e76f2137b0858a9fb52c3323ad8c5dd9fe5be87737a80d60dd8f14c8f0b0915ec4164cc4800f0037c8f9c4a9880ad7ff0f4e956fbb2b90637fb7f
 EBUILD markdown-3.1.1.ebuild 1119 BLAKE2B 8cfab1504352f5b1a76d36ca2bdb224d3706fab8f22dc2bd792bacbbc9e768e747cf4f7e9b2995a6aadfe429d471be62eb3764d6f7c5264fef818cd9c94a4cc9 SHA512 5e8282772bc67de2bfb5c27dfb8dc1c317b479e3aaf58cd72227fbe3ac59278e326aa8ed091d2f714ffa67c49e56d5cbafd8c29b7cff368abfe25486618b1728
+EBUILD markdown-3.2.ebuild 905 BLAKE2B c1c9fe4895aba4b19ab064185496fe707411620db39e2642ca114d4487854f4e17d7c02678f71bcdb40fc2383ac5af059f0adef36c63827a793dff3fddb1c346 SHA512 cea6a27e23d52477ae619ef0c176be5d0e430a6231f2ef5a61cd3f9726cb838ac859bfe508ded6afbe87f721485d5be49a03c870dce5e00b4a91517be2caf181
 MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
diff --git a/dev-python/markdown/markdown-3.1.1-r1.ebuild b/dev-python/markdown/markdown-3.1.1-r1.ebuild
index 2f068d7276ed..b00061134ded 100644
--- a/dev-python/markdown/markdown-3.1.1-r1.ebuild
+++ b/dev-python/markdown/markdown-3.1.1-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="doc"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="test? (
 	dev-python/pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/markdown/markdown-3.2.ebuild b/dev-python/markdown/markdown-3.2.ebuild
new file mode 100644
index 000000000000..77c56c8c71c0
--- /dev/null
+++ b/dev-python/markdown/markdown-3.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+	https://python-markdown.github.io/
+	https://pypi.org/project/Markdown/
+	https://github.com/Python-Markdown/markdown"
+SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+BDEPEND="
+	test? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/pytidylib[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && dodoc -r docs/
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index d5b16a009b26..9ceafd9b330c 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,6 +1,6 @@
 DIST mccabe-0.2.1.tar.gz 5031 BLAKE2B 6f52106337ed534933de0c98fc103cfe209bddb30623a3b710681f4f0615a964c4d0472d4dc56f1ea4e60dda695eee540f9f9b441111808684f09fc8207b69d0 SHA512 7155e52063e786c140c541f1410d0c319387b4b5f24ec3c60ba3d5a963a92d0ee545254559941ac0dbe961f46750c0e61271fbe82653c6b1465c0a13b31ec325
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
 EBUILD mccabe-0.2.1.ebuild 554 BLAKE2B 4942fe0213628484c4a64472eea68011b852b2d5bc28d538944027b79b2ef6f6f5151c8582460d3dfef26b76409634490cbe9c045052f76763b28c3563695d0a SHA512 a3facdfb706808c816d6779d4025cb4d5f2b716dc77f1be9ee76f2f447c32c569debf46c440760b95476f0ad6b778900f44da114ccb67a7bb6640475f404843e
-EBUILD mccabe-0.6.1-r1.ebuild 775 BLAKE2B d33e1be8ab3be4a6914d57ec3b54925ea554f02f691eeac5cf85c1c485ed04e957f120b4eb3317c92ce1ef137f01bff942a999c5f4eb8d6c67365aa14cb108ef SHA512 ce5b281ec0cbe7b1315e08f5595badc19ef9f8e9ac97e3bd7845f0a29b635775cadfdd0b238cedf4be733c84d6ca27ae9c1c088b5bd704faf25ac51d0f681d29
+EBUILD mccabe-0.6.1-r1.ebuild 774 BLAKE2B d4c40da15361f3f6fae5ea6e4cefe1af272e50e044a6d113f3af3843123b64af9b4fbe7907761287f517139760305de22058ea09226608ea92969dd19b256210 SHA512 4a7877de4bfd51e741f9eb32d5c96b2bd1c2ff6b13ff732c50db4e140b8a3a66b45f5b425906b9d9d755244b8f99608ea5931446acb4db91ea4056515caddb62
 EBUILD mccabe-0.6.1.ebuild 896 BLAKE2B b367b3def7da4536ac8729b49a8dfa4eed1ac75b4724032fa0e6f865aaf8f4f6fb7fead7bdbb38bd08752a95f139c82c431dd62a40194a8743ed0250e80babbe SHA512 0d827467c6362413ff845d62a7023447f16f6107374d639394340137e71f30df30fbb67bc6664916d5c08ec079156422251fef97fd703e89c512bbc57560baaa
 MISC metadata.xml 373 BLAKE2B 0a0d03ce9752401f11326bd24a760ee9f18b792e6d6cb6f229513eff68f35acc943dde6b9b842a508e7bd7344c13e1b8d74b38ef1ef1401823ee106573502412 SHA512 9672aa38d9c5e31835bd0b7b1d3463f2e625ff71b4ee79d39b939cbae4df67241ba64f17cfa928aeb6fbcd0bc787c076dc078b56c92bcc1a46ea26f873472fc1
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index 6edfca15b539..5a82861a62de 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mechanize/Manifest b/dev-python/mechanize/Manifest
index 6c1ae31818a2..8248b3c38f21 100644
--- a/dev-python/mechanize/Manifest
+++ b/dev-python/mechanize/Manifest
@@ -3,5 +3,5 @@ DIST mechanize-0.3.6.tar.gz 201845 BLAKE2B be2abf0e573ca41c0b9a8f0632be4d630a4c1
 DIST mechanize-0.4.5.tar.gz 216908 BLAKE2B 67951ad8295a32799768b3719525d45d502bc773c6f2a5e762e3dae97f309c8c265a2cb3efde95c9e8cb65e89dee6ad6ad8585685baa4e9ff1acfd146f115f6f SHA512 51706d5c073501d02fb7395eda30625ed9191324f948073c7d1589df0e507d8b7641ca514ceff55e7d82e899ba6e10c55507c79668976c7654ff0004671d09d2
 EBUILD mechanize-0.2.5-r1.ebuild 963 BLAKE2B 4ad873d77808f0232ed9022b392ccfed72db011cee01d83cebc8dc333dbeb99f91ddad318beffbd09d36126cce101125433c7efb787a5790bbfa45cf09825cb8 SHA512 ef12df29934d67ba964b0aca913ba60e2daed4330d7c9c012cd0e98eda025c56fd74859b260587c2d488f5c533a87b7ec9180931bad5c3849e08c6cfa817dad1
 EBUILD mechanize-0.3.6.ebuild 604 BLAKE2B 6444a86331b410eff5e8dd4c0b9d6b3068820bd9fd1f8fa103ff0195fa9654f5ad6860042d893b632998776093394b68693df241b7137bcbcc50dc5623637b90 SHA512 0a6c1de6830e9bf3c58948b5437af6f3152cb0a056814f323b81eb8c1076642c9814a508d5168655b54dc139afe7e6a5f43076b9d5b5683a87e255c1be5103cb
-EBUILD mechanize-0.4.5.ebuild 630 BLAKE2B 76432d9931b460ea26b5d18545eb605f640d09ee1f31c43ac2ba5c36f5d6662b8f5a31ceabecda09f6a00d9fe54f0da5b662180b3a7aa1665cf82e714b8d9e5d SHA512 b7c48eba852b214af43bafefc5cec4609ca193db0a26b4bb4411bf741fd64efaa8b60c1d5b2e6f472850e34543b19743517a0075ab5af5b8fa666bb892301152
+EBUILD mechanize-0.4.5.ebuild 629 BLAKE2B 5d50ac9a1de43a415ae1fe20ad4ac74c7349dc059d8b04dad4c5c0dc3b0884b60fae377bf0ca56c3b477f31dceeed0905363beef32baeaf1b1299fba29467743 SHA512 1d91a8f30c24ec7ba7daba9311d7baabe32a6b4c5c30a9e17893f6ac4b99e0239b18564eae30b86cb1cd19d45953c0e7bce465e488ab86e3d2fe0fc131ed8398
 MISC metadata.xml 959 BLAKE2B 7e3bc231d201f4b49561f1594301f1d2663744d4a5da0e9f277f2434f80eef016e98e5317016f3e330b1f8daa6a4559db6207720888b99dbb9634c605bcc0472 SHA512 37015b73d1166a75a206306eea97957f23cee6f558bafe54b18c99b7b70b966569a87e9d70466ed50393c1968aa1f7dd884cdf98bd401f274d1e6510d927afa8
diff --git a/dev-python/mechanize/mechanize-0.4.5.ebuild b/dev-python/mechanize/mechanize-0.4.5.ebuild
index f3b42df6b85d..61ce5f94303f 100644
--- a/dev-python/mechanize/mechanize-0.4.5.ebuild
+++ b/dev-python/mechanize/mechanize-0.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD ZPL )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND=">=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}]"
diff --git a/dev-python/meld3/Manifest b/dev-python/meld3/Manifest
index 341ec310d9dd..0a01f3e40a84 100644
--- a/dev-python/meld3/Manifest
+++ b/dev-python/meld3/Manifest
@@ -1,3 +1,5 @@
 DIST meld3-1.0.2.tar.gz 36478 BLAKE2B 2a11e4a8f3cde98246301438e52061899cdb7471abac0237f5228acee9d6f90bb322178241f6f649d26711265b0a26488fd4387f618f211bd1e896228ae88f62 SHA512 54fe6def7169fb4e3469cad8be58e56984026f27b3b8b2bfd6d53e2296e0c2a5bfb3e67d032ef75edd93306f4115a091930a7aae3573acecd3fed4acd6eeb544
+DIST meld3-2.0.0.tar.gz 36464 BLAKE2B f67bce5464dd516443414e5d40c8d7605ef891fb3a7ff3d47e0a065559148494c71174d5a537c9f00a0e6def2302b95938a5912956674aa171ed5ec2a8804a3e SHA512 97f1a892835b8f01dd82de681e684547f1e0b54b74ce63b92eb77fbd2fe436217b84a3c03400256ffca97add3d41e50ca563ec6f15f4f4b0fcda4e849a2d0bbf
 EBUILD meld3-1.0.2-r2.ebuild 520 BLAKE2B 57ed5ff0fe041fa9e245693de29672f155dcf3fbc3953f60c72231caa4a6d0b97220c51587482ae5c0a03215f7fdf06b95859fd8067aae4e07fa9428b46ecabd SHA512 244348e2b48f6f6010c4045ab61adb2d572461d75dfa293e8a6e2e34305f59c9414d6e35fe015e62a9ea427b5fba42d72bf72dea0a7831d2d6916b17c1964f8f
+EBUILD meld3-2.0.0.ebuild 466 BLAKE2B efad5b9c7602859ee3c07bb8f06699341749ae22885e1a6bd21e2d781c7420238c0bf7090aa4d26483a93b185486dd3ffb1fa1fa37c7db4f1561b2ed749a7d71 SHA512 2a2f978227a2b4add857a4f8990eed9cac53d73f8a3a9e606071ace29fc95e4677d23ffc48cc5eba6f99291728c5e4c1fca51fec359872f2e74e673ac00eb833
 MISC metadata.xml 442 BLAKE2B 159523838dd86efbd84294c713d07959bfb2c8a40c7cce15948f1ffbe574497631e101e7100dab89597d518e99712636cd85da94b8ea24ab04c5834c050e4846 SHA512 9bef65de31cec735e1bb463f4ed8de286563cb428cbfb277fb34d99241558892d91b719d7719117b1bf882cd83044bf5a6ed234dda10bca43e0549fc14841dba
diff --git a/dev-python/meld3/meld3-2.0.0.ebuild b/dev-python/meld3/meld3-2.0.0.ebuild
new file mode 100644
index 000000000000..ea462a1e77e9
--- /dev/null
+++ b/dev-python/meld3/meld3-2.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="meld3 is an HTML/XML templating engine"
+HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.org/project/meld3/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/memory_profiler/Manifest b/dev-python/memory_profiler/Manifest
index b7419d34d30c..7564ef136809 100644
--- a/dev-python/memory_profiler/Manifest
+++ b/dev-python/memory_profiler/Manifest
@@ -1,7 +1,9 @@
 DIST memory_profiler-0.47.tar.gz 33725 BLAKE2B 66fc0e5c579febeea9dcd5132caa6fdbccdb5cb0a2c9083f5abf8aa03baaaafe1f77f72cdbe4d5384c6ce27fd4760511f9a947fda46eee1d81e7125c1dcd2970 SHA512 110e16ecad33068d31cf53b2f0b775d65230d51345f24a4d7d3cafafb706b10a0c7e2d98a799256b0366f1bafa9b69c060222595bb4eb9e1689301428a36fc3d
 DIST memory_profiler-0.54.0.tar.gz 31376 BLAKE2B 4c89a046bdce36a139448dde45c8cf952aaa8fe8e2089bf9574a8fb2ed1abb89991e54f59742b0ea1ae5315378c0799ef140752549f9a8d13a91bf0ceb021984 SHA512 ec5735b7e41e706ea35ce9fe0dd3963c51e50e5bdf7f1871c51bbbb2a0ae75abcdba23abd3a14979c26ce19e7ce7d2cf6782aefc77e0c17cfe4da573a6e249ae
 DIST memory_profiler-0.55.0.tar.gz 40951 BLAKE2B ed6eefa0a522eaddfd0ebf3b118a57b7bcf6c7455057d1a9e891e826ba2b32a671fd86357d073f45c36ae5db418987a55e90a908cbb4aba3b3f972ba4580f9f6 SHA512 9f280af163b124809d0276b2a473f66d9f11071f38afbabf7247d4e49f120c137f69dde2cc3fb27fcc88cfc6dc71355ba01efeb102098c401c7e953462ed4a1b
+DIST memory_profiler-0.57.tar.gz 84096 BLAKE2B d2c5fe810b9ac2f1e52fb8630056ee825d3d56799c15a377bff914be3a04e11c872e557847ef2a107421d082515eb59906f931ad1873ae7fec58fef16caabb4c SHA512 c6e2f755656dc820dfc2cf7a659dc319b3d1aa0df144ac6a08db35f4b38a90a9b994cf9c8320b8370f51c97e0d0bf2f9c4a3ab070b4934879f8e579b732e426a
 EBUILD memory_profiler-0.47.ebuild 1243 BLAKE2B c0e0ad9c522262b5d49e8421771a3be14a8877ee61f8bdc2fd82bd5931899aeb670934b3f1eac5faf83b178fb0f9da5bec1e6ac898c999db722ef6bd5cb4d101 SHA512 e8ab85291b40734145b9081f1d394783fec2956044228dbdb44be50c0b5c275c9f13f41a9da9bfabf19184f8bcb62e4d5cc15cfd1c9d863e59659ea7f4c948e1
 EBUILD memory_profiler-0.54.0.ebuild 1302 BLAKE2B 21e7df661c397cd32bd7861326eb85a1766e5febb4943ea3a449cedfee8190a15872b97f3b241215c4d007875c654fcd63a7db7f00fa90317cc94ef9b6945af2 SHA512 1ec8aa512aa94cc5bb6c8025e05a0232a63c91cc8a6c137ac850f7b09c518e5477c5567c21b75a05bcb6ac3d1abf241a5b5596319088a192aba95cf28bc6f20a
 EBUILD memory_profiler-0.55.0.ebuild 1302 BLAKE2B d940f47311af059eec481dd6cc8755443ea7b2f457d9e0cb3dbcb46b3dc537fc1f7d9aba9cfba33a61f1ba073b4f6fdabee6632f9818b425b622c1dcc3d33174 SHA512 c2b81ee9ecb2dffa4dd490a147b4ac4206df218a8e1feede7c12cf8a39a3a0e99f1e4dc4fa016d7e3efac1a17cb6721e1bf32b82998727b1cb8e6d5c20eedc66
+EBUILD memory_profiler-0.57.ebuild 1756 BLAKE2B 819d6c6fee376fd738156516a28ea877bec68cace31950f20cb57ade4ab101b30faa9ab3881176b99b0dfa1c43f4af9fab0819809ccf6b2562e6ec9cead7bca1 SHA512 e34bc023dbd765b813f78edf5366f3c606a673fcf76f51bbfa114dc74fee5b625576b694db6dbd922105e086020fa72cdf09b420e2360eb99abbc658019e2949
 MISC metadata.xml 514 BLAKE2B 9721c8c8ab0f05e50b0d3d9fe16e0392aaa513177abdd4318aa2b10c70a656627e054b0a162eb7324e9b20e8f74dd1c3f3fbf4aa456fe98a34899525e3d9ad5a SHA512 cedc4d8914ad8cf10c8981935089220967957ff50eecfd867376974055d4922df91357a2f2135ce3cf5f56a27c5111005ae53429e685f0ee080e031bb2a3e943
diff --git a/dev-python/memory_profiler/memory_profiler-0.57.ebuild b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
new file mode 100644
index 000000000000..9b0b4220a754
--- /dev/null
+++ b/dev-python/memory_profiler/memory_profiler-0.57.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A module for monitoring memory usage of a python program"
+HOMEPAGE="https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler"
+SRC_URI="https://github.com/pythonprofilers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="examples"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# dev-lang/mercury: collision on 'mprof'
+# https://bugs.gentoo.org/571176
+RDEPEND="dev-python/psutil[${PYTHON_USEDEP}]
+	!dev-lang/mercury"
+
+distutils_enable_tests pytest
+
+python_test() {
+	${EPYTHON} -m memory_profiler test/test_as.py || die
+	${EPYTHON} -m memory_profiler test/test_func.py || die
+	${EPYTHON} -m memory_profiler test/test_gen.py || die
+	${EPYTHON} -m memory_profiler test/test_loop.py || die
+	${EPYTHON} -m memory_profiler test/test_loop_decorated.py || die
+	${EPYTHON} -m memory_profiler test/test_mprofile.py || die
+	${EPYTHON} -m memory_profiler test/test_nested.py || die
+	${EPYTHON} -m memory_profiler test/test_precision_command_line.py || die
+	${EPYTHON} -m memory_profiler test/test_unicode.py || die
+
+	${EPYTHON} test/test_exception.py || die
+	${EPYTHON} test/test_exit_code.py || die
+	${EPYTHON} test/test_global.py || die
+	${EPYTHON} test/test_import.py || die
+	${EPYTHON} test/test_memory_usage.py || die
+	${EPYTHON} test/test_mprof.py || die
+	${EPYTHON} test/test_precision_import.py || die
+	${EPYTHON} test/test_stream_unicode.py || die
+	${EPYTHON} test/test_tracemalloc.py || die
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index d117f6276985..6a128620ba74 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,3 +1,3 @@
 DIST mongoengine-0.10.6.tar.gz 469469 BLAKE2B 3930126d64e1b43d579412069da33a96e6c525d459905d05f677a406a262a15e16d8f6460637c253ace4addbe07655d194fede19fe050f4628aa17dbb6115038 SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7
-EBUILD mongoengine-0.10.6.ebuild 806 BLAKE2B 022d0b039cd0851e35826d81fa101feebc0ccb39b329479ff30226c722463b686097a922f2d9d8fa9754a67c6c1cf018741b00c0eb40ad07aad2538cfb1fc7ea SHA512 56a5a9c81d02f628a1b50f1c789531e8c1b4cdbd97ff4bf4a3ae29de3f74025cffbe24cdeaf18d6813f13c2d8f93dfcdbceb7dea6464a6650d07c5c1e180175e
+EBUILD mongoengine-0.10.6.ebuild 805 BLAKE2B 2b0f1ed8ce17db744a0a329256234cf5074379da5d4808600c104f666e30c419befda185e473911adfd79173d842729e9a5e312e6b771498f6270754e1a84112 SHA512 396446adfd0e772b325bff46158ea49921b1adf48c434c9cec1cd231c7dba2c7634a6651a0be8c78fc9f13faf9276c84dda67cb426936cfe3e54b6dbf4449e6a
 MISC metadata.xml 338 BLAKE2B 5ecb99b784399bb9e25c094b38e6585d5dd6dad6bade4eebd9b986e5022ef89417e11151de2528439754717c76c9601aedf24dd3295eca09bf0c59f9bc1130cf SHA512 b25628f5af0a4c32d9ec8d7bc4e39ccf6bf2c9d9bdaa60bec2a3da846a9a290944822a1d8233cda735a4cf3a801acbfa47826f6bb537ce5c7efedc669282e523
diff --git a/dev-python/mongoengine/mongoengine-0.10.6.ebuild b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
index 88ea7449889c..6d7423247ac1 100644
--- a/dev-python/mongoengine/mongoengine-0.10.6.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.10.6.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_6,3_7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 RESTRICT="test" # connects to local DB and other nonsense
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 390d602866ea..ec7328a6bc5b 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -6,5 +6,5 @@ DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb8
 EBUILD munch-2.1.1.ebuild 463 BLAKE2B 27c492191cdc81efbc511378f0230c93a84f6987a2fd4ba5f4bf04af6215d5f4054cc39de7b7810e87996959052625e599597c0215e30764eec9351662ca3d65 SHA512 d08cbdaab4619350cdf71f865c2693884e1b2117b1a533d9c0ceb14a2fd31d1f42def047222d8f80149e53c584be7efc25e0490780aac4ab15c4c8975cb25104
 EBUILD munch-2.2.0.ebuild 468 BLAKE2B c0674aca72191b13efcd0445f4c3105fd0e2bdfc0ff2356e5e072cd0985308e6775dacad395b431d6f5b1f1246d835ca482a14d0844a62063d491af08bcd80ae SHA512 1bc9b3b4736418e1f832e63634f36ff695af49d4e6b6d0a40a87fbfa312db09e8541f475ef501a7e4559f52802f9af16ce7a85bb1bea6e78838f7ee9d941613f
 EBUILD munch-2.3.2.ebuild 503 BLAKE2B bc9c75e8e823ff370cd75d59c326653ac1ff16f0f923d43b600314e42ac2ab9c6672ddd07b2999cf566efaf19a78d7802eaea1f918f6c86bb20930dd5e1a6ce5 SHA512 f4246ccdab778286cac951a7895d98a36916468231902f5c83a9a075ebe025efa475c9105d195d98f431ceff8d4eba564db6763ab646d790e71f2472636f8280
-EBUILD munch-2.5.0.ebuild 680 BLAKE2B b6799da2b458bf30a0f779066921a8fbaf09988d69c6e4d69bf1bc81993b0631584a3fbf9ed55268259737fc370c18471950893130966aa94f60bcc073298186 SHA512 fd7d9e245941b512b910c30f2bd589aa99ad7b669d67a6318ff4590914138836bd69cf007df6a0be686e5b964840b5f5f99224f4326ff9a6f38c25034d5934b8
+EBUILD munch-2.5.0.ebuild 686 BLAKE2B f8a10b76ac8c4da3efc203611253785b7968f59881b247bdb72bb2d7eea81ff5f31ca09a2d92b5d7f2796d0e371b8a44f0920c07cd193686c7d80d7f98f5ee7d SHA512 1a922464a3a1d4bdb3bfc5e5faa023be06b420a6c4490bb47305943ddadfd3d0f007f23a74950a669b60e8703c4bb44db191fcd6a9f75370b2d8f0a34f9a93fd
 MISC metadata.xml 297 BLAKE2B f25a8e5e6202cf3368d7d979e07e1c0dab3dbdb9fbf6341b51d28910a246d217ac4da6c217550e0618b5df92ca309b68f23844834e9a03082ca841d2d58f428a SHA512 4cb74cf412c11219c7d9cdaa3b7ecac661c890dd225de89640893bca6a77615735138ef8fed3887ac85e6bb06acb8f4aebf344060427b0839aa708da7820938e
diff --git a/dev-python/munch/munch-2.5.0.ebuild b/dev-python/munch/munch-2.5.0.ebuild
index ce4b3ed6928d..2a713725115d 100644
--- a/dev-python/munch/munch-2.5.0.ebuild
+++ b/dev-python/munch/munch-2.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index f2f5b37a5ab2..5c81216b796b 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,5 +1,5 @@
 DIST mysql-connector-python-2.1.7.tar.gz 11781659 BLAKE2B 332092059a32249e449f99540beb9eebf80e9381cef4560208412a19385894eb2193f02d5a20aceafe9644b8a225926a02d57c3acc89ba7d321b6d0f9c7c4d76 SHA512 f88c3a6dd3c3c1cd5c16165daef801dbcc7ea9163406273dd751e25687a57dcdf4ffbcdb65bb107e8cd9d7c91029823f625dc19ab34116398263fa074598880a
 DIST mysql-connector-python-8.0.18.tar.gz 12037201 BLAKE2B 54dc45c9ecc09bad755bafec2b3b73e35368f742f30c8644764c8c892c6f79c3b6b438cf38dd9ebc878cd76d5d74d71be6668a903b57b3d0feaba9ff6f5b58cc SHA512 cb441a6388de8609b56e4d9885ae2491d207c7b1e3bb387341d55853d383eff6e268e34feb32b42797c7b210d35f9d6dbc302ea4c9ed2441a76b91ea66d504b2
-EBUILD mysql-connector-python-2.1.7-r1.ebuild 985 BLAKE2B d7ffce473579417dc81a10044dd768399ec11aaa1095e975eec2440a270475e073e483099784a1fd1af9b615310743eeafe1711e34e4c044bb3c2a3e5873ebe9 SHA512 f026c4d6243b125226ad2cdfd01172c39aab6dd0e8c93654532452a310c1394551033799ce685e2c5e1ead8012108259e1c97445278fa40d87e47f6633bb80e7
+EBUILD mysql-connector-python-2.1.7-r1.ebuild 983 BLAKE2B 011b881be64cbc535c28cbd49b599fddd9fad3c46cc1cdab71fc18b4a676bafe6a63c48abdae52ad7f35d1704642f93f8a875ec63b5577b23f13a60fd75af1bb SHA512 da530859a71e8b5838b76a688db1a3aba2a0aa248e3c5e66ac4e059650abe94edfc999d21ec0278ebf0bb26fe67d05495e50e3cd09c5b0cb037272976cfa695f
 EBUILD mysql-connector-python-8.0.18.ebuild 1483 BLAKE2B edc92a5a406b6b71abaa1ca4cde3c7f79901054cf2c413c06b44aa39f737fd10f56fe6ed32d45f2fe44ceb7ecdd4c116729630f08cec2a3404e66b03e8d997d4 SHA512 955a5d5bca969940acc080188ad58a7e0675d72e3465685ea66926a2587cccf2fd0cd317798fe9db06a8349adcdd3b0747521be19ff6ec4cd64d5eb2c408dbf3
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
index d3b0348b4c0b..17033a7a7b03 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
@@ -26,7 +26,7 @@ RESTRICT="test"
 DOCS=( README.txt CHANGES.txt docs/README_DOCS.txt )
 
 python_test() {
-	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX%/}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
+	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
 }
 
 python_install_all(){
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index 33afd6dbf9b5..c5034581c30e 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 732 BLAKE2B 858ac9ced014355131e5a412390a38ef850dc44a5d6b38ee80aab195e1c66b04c2610ea7ee3c454954e72784b26725d9381bd0f916026782cac91aa18a9fa3b9 SHA512 5e6f73932c0fa5fcdfe1daff8d2b2841aa634b7ab57782af7c24fbc1bdd1db4e6c3a0a9a178da69f9f128dac7efa37855eb44adfc7d7848a9e8ecf1fc0975037
+EBUILD namespace-repoze-1.ebuild 726 BLAKE2B b852a2836ea307ed5bd27860e38f6787dcec5c615e59d4688fcc9ae72e62f7d1535dcc67a087002175bc4830280d66e4c6e52856521179c5e6ed01e0242067fa SHA512 b54c234700c8e87e5ef3998afe5fd81a33228da203d9abcf16789bbea41366575e663f552f4295554b745350b0bf42ede32e9c437fadd3c6fa3244b91e448b9d
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
index daf3f038a283..ac9e525877a5 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for repoze"
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 2023a5ad8d18..80eed316f9bf 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,3 +1,3 @@
 DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc
-EBUILD nautilus-python-1.2.2.ebuild 910 BLAKE2B b17ea06c06d56c343da53d021940f2cb60f792a8eda93c942a3435085fb8e65c059e5973d4da1a8da7c25e5c785dace4a433ced3c2b5f16ef5d602a04f1f39a9 SHA512 5deb162c8a04a6f114e6e1e20669e2e4caaca7e0df82f8ff9b3ccf4c291c922113c1ad2f346ae8dedcb3d9b7fd94712b2d6c8e1b5ad8c1f88ad4c3b102e118e9
+EBUILD nautilus-python-1.2.2-r1.ebuild 946 BLAKE2B 52f4f4077034a671568e4de1337a7464e62718ea2ce9db39aaaeb7ed53af42acd6c3c4870596ed14c648b8c2ed39c5c145d85599d184df6d3e049a8f09e504cc SHA512 6ea8233389a35c5114a9c73b29586d37c64974b3ab8589378a6d94466375eecea712f3dbe87cfa251f1eae6531ff43302de23b609984a1e5442b56756a68e059
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..1938ff3e5975
--- /dev/null
+++ b/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Python bindings for the Nautilus file manager"
+HOMEPAGE="https://projects.gnome.org/nautilus-python/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Require pygobject:3 and USE=introspection on nautilus for sanity,
+# because no (user) plugins could work without them; configure itself
+# requires pygobject:3 or :2 and >=nautilus-2.32
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=gnome-base/nautilus-3[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+
+src_install() {
+	gnome2_src_install
+	# Directory for systemwide extensions
+	keepdir /usr/share/nautilus-python/extensions
+}
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
deleted file mode 100644
index 7d376a7f527e..000000000000
--- a/dev-python/nautilus-python/nautilus-python-1.2.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Python bindings for the Nautilus file manager"
-HOMEPAGE="https://projects.gnome.org/nautilus-python/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Require pygobject:3 and USE=introspection on nautilus for sanity,
-# because no (user) plugins could work without them; configure itself
-# requires pygobject:3 or :2 and >=nautilus-2.32
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=gnome-base/nautilus-3[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-
-src_install() {
-	gnome2_src_install
-	# Directory for systemwide extensions
-	keepdir /usr/share/nautilus-python/extensions
-}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 1b154859c529..b6e2a1ce2785 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -9,5 +9,5 @@ DIST notebook-5.7.8.tar.gz 13371684 BLAKE2B 077a94ec7085ae7325a972efb58f8d7eee5a
 EBUILD notebook-5.0.0.ebuild 2283 BLAKE2B ffaba584d2b2254335021557e8e96bc73729166436119838844b40e8554fd912b6c0dd49a89bc2d5554f682456deaa3cd7af81aa8a519bb9940e0a608416bf99 SHA512 923de51823b58be1a7243007a222e0015db68f60076eb6166bd85787c634d8229406bda88f469a8d705664b62e8d4d04d37612c83827763863a73a3c878aa0f8
 EBUILD notebook-5.2.1.ebuild 2660 BLAKE2B 32473274c98cf271610c56850404495d5f54e60a2d7697178e9b649e0fbca8f2612a108fcb21004c0b38b6dff7be5c210519ad5f9f85bb5d1a552097fb115ed8 SHA512 f3367605591943f5870cd3b68db1493961def5c0be30fc9b4cb2c95c5d4a43d73435815082425f9c3d86395aa66e9c17c169349a506369d6308f0575c5e85b84
 EBUILD notebook-5.7.0.ebuild 2772 BLAKE2B bf8616f01dfa3942ac5b1986fd8c7988e6b3a810c2756fd7524376ab7bdeaae9176fd4a975a0337cf365eb6ebc352c2217d8654eb91b47830b43226de0e7c8bb SHA512 e8a61b3f0644113ffd4b30f61a29a4f7d95064350d717ce1ec96f01d2a9e4d715c8d21afe808c94285a106cba283d9c53fa93bbe4afcd38fa43755948a038faf
-EBUILD notebook-5.7.8.ebuild 3002 BLAKE2B 017355f088b7894772366e2b79b528dcca6b26a5e257ab567af97562d74728fa690fc068603ef2bbd1148f8648b7325181c88ba15fd1e8dfdc82d4525bd35bee SHA512 af6077e66808cb85b21b556b74a7c7f5d0765a571642782ab700c589ee744bcbb10f7e010abe02968e8b8b05ed2c93297aab5179f80a9196f683e6927ff6eadb
+EBUILD notebook-5.7.8.ebuild 3000 BLAKE2B 05a81e32db189363b7d3e4ef35c61abb90a9ce8c0515987777503076e9528c78f5f32dc6cef5fc27b55a331ae6e72d577453c9f484742bcdf498d6da57c8e05a SHA512 b40b4be6710f29b82dd8968040f5d2932494e426af903e8418500e8e3bb844601c32727a750ad518ea7f52cc2fd211900fb58b7a5d42378c585002381f839b52
 MISC metadata.xml 472 BLAKE2B c68faaf3f609c2fc884c61f1fd1e0296460316ddd6da67aae1492a850a9128654d6f903f9337d92f9f0bfb78b00b94191c99a26dffec92279e79ddfc9ab39fd1 SHA512 23588835d3a40661f3a59b92a9ccfb9e40777f14ff03b6f9c403eb9eee5560e0a805c6a76cd8ae2fb11eeba39b264fa0fedf44cc4fd2231318fe1cefe2c27846
diff --git a/dev-python/notebook/notebook-5.7.8.ebuild b/dev-python/notebook/notebook-5.7.8.ebuild
index ce1b0e299a3b..ed340b66e0a0 100644
--- a/dev-python/notebook/notebook-5.7.8.ebuild
+++ b/dev-python/notebook/notebook-5.7.8.ebuild
@@ -112,5 +112,5 @@ python_install() {
 
 pkg_preinst() {
 	# remove old mathjax folder if present
-	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
 }
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index 09096719e96b..7cc4a74265cf 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,3 +1,5 @@
+DIST nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz 9703187 BLAKE2B 9767b79514b8d7da8cac879c71fa76054993d17bee41f978ccca1648bed525567cfec48bfe06ae2b1de2146d2c2898afd4e53b746d5b03c0e48e6c93632407e6 SHA512 6888b00a11fb7d54947c438ba9e654f97e4ccd1ba292ad6219c7a2f4cc56fc75d249b89eb688b2f99ea3f321472eeb5103b33f4641d17e9983c70e9ad3cf6cb3
 DIST nototools-9c4375f07c9adc00c700c5d252df6a25d7425870.tar.gz 9693250 BLAKE2B 636832b538714d48aa78946b9af9985c55a5543828c3033b849fe3ad75c15472ea7515ca2a4a30c990457acdce2fcbad27d8e61fcd42a4bd7f009638f1bb4381 SHA512 dd2ffe072716c61c9eab9307308f6f72ca3a6631ec2402d03adc4e4483030d770035bf9b9ae66b5b580f1dd7e1cb546f03eff61c00c73069c804953587199e9e
 EBUILD nototools-0_pre20200113.ebuild 1006 BLAKE2B acbc72533e1e1bd56c60616462944fae91e4e578a8ed0dbb927237d0910736b36ffb85e636a3b0d817129c421f85916dc16547238763720c91aabb8968ebaee3 SHA512 e1033f170424e91ff54571f4511eb3e2d1b421ea1552770a314c812db4b8cc8442a2e250c8978b1ace68c9a81cb819cacafe7cfcd5e3ea55b9d8d48932a2d269
+EBUILD nototools-0_pre20200207.ebuild 921 BLAKE2B a145af57fd2805d013493f438bf030a95382d2d5e0777aecc065163c9c476c32483d5a8c5db5e73b768a03beb153644f2be46276a9b561474a72102147109ea3 SHA512 b3f4977641729274838fa64c4d91fb74748ed0e8b046cc3908d4c814876f965eca1f5306b8a16ddb3ed90db6d6bc9f8fba8c9c0171346b49249c642d40055ec6
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/nototools/nototools-0_pre20200207.ebuild b/dev-python/nototools/nototools-0_pre20200207.ebuild
new file mode 100644
index 000000000000..d0fbe08354c2
--- /dev/null
+++ b/dev-python/nototools/nototools-0_pre20200207.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
+HOMEPAGE="https://github.com/googlei18n/nototools"
+
+COMMIT="9731cb825a5c7c7c88c043009f15d4d1e5708df1"
+SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/nototools-${COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-gfx/scour
+	>=dev-python/booleanOperations-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/defcon-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyclipper-1.0.6[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index cf1aff24e546..6253a0f0537b 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -23,6 +23,6 @@ DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58ef
 EBUILD numpy-1.14.5.ebuild 4104 BLAKE2B 66a822debd2636ebae9f3c6a14d4917f69ee69f08ab28ff3448d8f206b30a25791a302b9a5e847b7d8836738d46f75a990bd4dde2c06278c9acec2944cd479cf SHA512 6abf839ffa1ab6003f88129909bb01cb7f968f10b861fd7978d7baf213b02ba3a791109d5b4a570af01f78c3f538d9dc969dc6c35c025b583256e1e0ebacb189
 EBUILD numpy-1.15.4.ebuild 3914 BLAKE2B b1e4541facef34dc973bd1de3d7c9fc556116fa936c7c4ea6f4aa4cac2d727f56743743f5e04f7f0355d8c085457d44c2f2f478bf5bf52310be23d2ec1451b80 SHA512 23ecdb6df8cd632f661aa8518f90e90d1d0fd5fb566e4d97149f92cf19995f067ce5e405b3b0035e740de53383d358eca00f503b63a4227b4d7592909d26b90b
 EBUILD numpy-1.16.1.ebuild 3934 BLAKE2B 35063ed7529f4cb757b7dc3aaf8c0009bc4e72aafb6723267ac582ccccffa2e2f079d3cd067a88c32f935de3622abb1875d7bdcf8417d125ad1750f2568b5b2a SHA512 db1c4337360dddbcba2a34eb1f282dabeb652f36a3f216332b2e6d6ea8058e16dea642ea5e6f583871436e7ffa75eae59cb1daec797a41a3097678b8554ca5be
-EBUILD numpy-1.16.5.ebuild 4216 BLAKE2B d1c83265184bb1cb7cef4788338f84939e8cfbde256bb487fa1fe8c892bdecc6517abf1d715fce0a36fa4e3bc5bb0aa76e2e1b450c42bc2bf28b634356bd28c0 SHA512 4831a3dd6fc1bde2fe0b07900b6b64d5967e5c57c463ff3fc4b1b9433682d525bcfd99e73d6f8788c0ad6ea18e557f5d0f408949a12574b61d8d3863ddc473af
+EBUILD numpy-1.16.5.ebuild 4215 BLAKE2B ce266b22ba4bca396ed14c31614995d627663492cd9011bb4bd73548c2f0648373636e244eac00e03a3aaf8656c9656e8456438aabee2a654fd0ca94a9f87e04 SHA512 f1886b85bb055c75158c35301a690c12d00ec2b92d373911bd7dfe3d2a48e8594d5e95e3ea9157c1e6fd3ad1d27b652b7aa96860f9908256ffcb5c1649be2feb
 EBUILD numpy-1.17.4-r2.ebuild 3624 BLAKE2B 903d92b51a841916dd84edf5be6d13d5229c953bbe55067dd265a3ceb40dae50d8bdb3b0b26fc49863296c23a106a1e36687ce80650c0bee26006156bd470f98 SHA512 3d72c6a20b64892cdbe7e918825eaf2bfb2ee952d102e9f6dacfd2904e14188b1b3870fe4bfee63aa038c23c5222532f2e96dff1d2686b3e7d156294057616e9
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild
index 5a795c637b56..e326fddc947a 100644
--- a/dev-python/numpy/numpy-1.16.5.ebuild
+++ b/dev-python/numpy/numpy-1.16.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
new file mode 100644
index 000000000000..ac6990ed5a5d
--- /dev/null
+++ b/dev-python/ordered-set/Manifest
@@ -0,0 +1,3 @@
+DIST ordered-set-3.1.1.tar.gz 10520 BLAKE2B 885c24d5cb1db95d0056c9216bde16bc41b27e6489d8169ec2c60f93bf9fdf5e112b6183c4adc0d3a34209442db725d0afab3e53ac21420b223c9f4ddf2a9e49 SHA512 9a0d6c2fe1e678ebc5e4bb8229f2a97cfd0b579624f1f5e7153a9fe41937069a845271e431d626dff799136c3c90d8ecd7a7094de8b6f638c581ebe9c4e71ec6
+EBUILD ordered-set-3.1.1.ebuild 501 BLAKE2B 0a9dc7ec7f4846ff2d3c25be9c2453dc07ab177ba452de7116114f44fd5df70f76ca21dd2f9eba9a143065a6155b853c29330c580a1fbdcc819b6e36bdb139de SHA512 89007830d01382ddf3cb6acb07ee8bc504eb3c58ff94d35ece991b4e79554bf8ed7de2a891dd4d0a31fe7ad777fe6d86d0a13904d2aaf11b36ddede107a1b9eb
+MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/ordered-set/metadata.xml b/dev-python/ordered-set/metadata.xml
new file mode 100644
index 000000000000..ca93985fb0db
--- /dev/null
+++ b/dev-python/ordered-set/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-python/ordered-set/ordered-set-3.1.1.ebuild b/dev-python/ordered-set/ordered-set-3.1.1.ebuild
new file mode 100644
index 000000000000..a92064a27062
--- /dev/null
+++ b/dev-python/ordered-set/ordered-set-3.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A mutable set that remembers the order of its entries"
+HOMEPAGE="https://github.com/LuminosoInsight/ordered-set"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index 2620c4cb866b..458d786c4c8a 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,7 +1,3 @@
 DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
-DIST oslo-config-6.4.1.tar.gz 144762 BLAKE2B 467e139767b6afd82e1c0d39841765c93e4c23b208e676bfd4c64512a71f6c432a1431d5bf902d268152fa3011e864173f6a766bca560efaadce7a713fa919b7 SHA512 97a47931fe98c6a19ecfe38fa8aae50e91e955db879b96988560db16c0ec775ce294cf0c9b45e62aa7dea67ec43cbfebf4a77e168f0c348bb03066c832dc40a3
-DIST oslo-config-6.8.1.tar.gz 149525 BLAKE2B 0676ac364410c5d2eb6c4d75b85c18d0cbb50cff33954a2afc96f4f779606912d46c0627b0d77fd63795f43e26baab113cfba409eb86e5a8c8353253542bdecb SHA512 d861120e35332411e7caba1ce1b37a2ad16d986ff2063d731edfa0cd6603000fd7f1abf6ebb611c7efbb6d3c4296c0ffb9ccea2c2cd6ba6bf7b18c53daa09f15
-EBUILD oslo-config-6.11.2.ebuild 1349 BLAKE2B 1e06ad8d84daad7c5e59ed4eae61a228a5b93eae4908fa70c67c0a62734704a97ce23d53e6a08ca4cd2b545588203287e7ac5c81b82b120397e0f03b8d12c149 SHA512 9f5faef79acb8eee7e8f5d84171ae083a46114650bd5bdf0984917ec695f792c1e642cce8d98c913bcf440a1d425199db72cb5aa94cd765e5edba5558caff1d5
-EBUILD oslo-config-6.4.1.ebuild 2294 BLAKE2B 1d066f6755a5ab2611032f6839b0c98919f0338cafbcfb0012a220a9ea7ebb26fa699810f719eda46f781e64658cdbca0d764819f44d245f4568a950be01c688 SHA512 b6dec6488c397a7fc92de597f21e88e5542e1208e4a43f2d8af1a9928e1b72eae5d115eebec438fdbfd6dde82bd3f580edf8a76092aaf204011b4fc3783edfd4
-EBUILD oslo-config-6.8.1.ebuild 1960 BLAKE2B a8c3ef2ab3572d964ec7b6fb258d3029968e7e1ff8d9dd5661c4ed0e95a0aafb835758e63fdbe790045e121bdac9804fa68f74d6297cbc849747b20e82ed26f0 SHA512 589c48a02bc603eaa583965c475500e90b8cbce018e80c4ba521dbf70bcf4d995a605d2f9d4c059745b8c787a119d144bdca5eef4783aedfb86256c6815bca15
+EBUILD oslo-config-6.11.2.ebuild 1347 BLAKE2B 3397328acbb6da8677a24f06c6bf8e82fd36fb888d623f15e2ffb70a2178a62d7f1dfe90f822a59970a57b41735dbd68ba322646654b0a8a6b9857a340cbc2a6 SHA512 688b5f5b750e9521a181719458f81baf69c89018c87a6d3847d79467643d66c3f7f4a97e19854d3ab5cbdb335f876c228162d7b8eeb27fad3ccd5a9185931177
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-6.11.2.ebuild b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
index fa19ee9fc042..87e62020fdd2 100644
--- a/dev-python/oslo-config/oslo-config-6.11.2.ebuild
+++ b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-config/oslo-config-6.4.1.ebuild b/dev-python/oslo-config/oslo-config-6.4.1.ebuild
deleted file mode 100644
index 24a4aa5b23fb..000000000000
--- a/dev-python/oslo-config/oslo-config-6.4.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-config/oslo-config-6.8.1.ebuild b/dev-python/oslo-config/oslo-config-6.8.1.ebuild
deleted file mode 100644
index d4c9654fc283..000000000000
--- a/dev-python/oslo-config/oslo-config-6.8.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index 48b0cac90329..eda043ede38f 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,9 +1,3 @@
 DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
-DIST oslo.messaging-8.1.2.tar.gz 296052 BLAKE2B c24d8bc22f1e7bb8fd4f58bf15c349a5fa5e41b98031611a0820b66ab7cabb2742d49995e5c730d1bba2c04a36ef4a055de0aced5f1100a7930052a4f4efd5fb SHA512 f7bebc525019f19f6d25178f4b2ef811c3073dc2b10600a9a01aa23dfadad4b428baeb929963df31ee7c775bb94c47493699e8031d5dd9cea5d865c28432d3ba
-DIST oslo.messaging-9.5.0.tar.gz 251799 BLAKE2B 72edeea222af199ace54ef6ea672177713c15c8556b7b1d1691c5d217bd57e377f871879c3429d46ef1339f4a4b5c610bae82c2aa6ddc74dc069d08b86c15537 SHA512 2479a51c2be7be5752d11fa2d09eb6ffd6cd82ce3531f0a9275eb5bf5fa4451ac16240873a41e2550db5fd7b51003bc9af293704e50d2f3033bd51b502728380
-DIST oslo.messaging-9.5.1.tar.gz 251389 BLAKE2B 2f6ceddcb476e4a65ad1c5359f0e771010d8a8683b8e2d4961c4aeef5c78e4b9fa5c440fa4716d0e0adce4acb4a79437e44968983715f72f0b8d983ac624ac80 SHA512 4b6c90a391597d96d887a54eed4ea29f8b803f3e48609644d865a5708eb6202c07c1bc7fecd1327bd0f55611224ede63166fd10452a97edc203cef2256f49f35
 EBUILD oslo-messaging-10.2.0.ebuild 1659 BLAKE2B 2c7381dfc84b54ae7260f68699baba2f017233738829259c3623fd57b87ff988fa299be89f4c37bfeb10419f8876fe2e323a3ad94fcaabeb955354107042f60a SHA512 b08d716fc977fd966c27d0fe873f229fc6a8bdda96895e975436785c9e9d6f435e31176a914f0be6ffcd4f122a354d57b0452dbbf4e6c20a89dc8065f9ac039a
-EBUILD oslo-messaging-8.1.2.ebuild 1929 BLAKE2B cd00f4da9362b89bb76b0f8cde68a88bf315fbdc759c0f1db871ab92854d2e6970f8c7cd717221e8031742baf0eb8a83a49842abdf840df0f8eb36b4125da3ce SHA512 015981d3919fd44ed212ea81e7d5c8afd7c2a72ccddbaf44bc4cf59cfa1f28792ca6bdfeb94595a90e3a3053e894676f8d089b37e7c1df92430e1b3c7d2fb110
-EBUILD oslo-messaging-9.5.0.ebuild 1752 BLAKE2B c04a7a77209b0aac82de5293b360570c6ec410d98e18ac6ad08d56c12bf7e7df94fea08f184ccda1306ca2aef6c0828310735ba8c92d530d7461efcc1118af28 SHA512 c21864a77b12a2d7b19cca4ec7fa17b8a5284db3f2f803c1065c5cf2447313642455ef3014ada2ee9fdfb530296432964644acea879c030174f1bcb20c7f2d44
-EBUILD oslo-messaging-9.5.1.ebuild 1754 BLAKE2B 5844b2ff45edc935e73729048a2c12572282f6541ae68bc604a2007fea9a191fa9b6a0a0824cf2b2092b357b897ac5cb0e72bfda8a81c25244c1a5cd02cd3a42 SHA512 2488d5251ec93069621b14dda4cf14695c47467e75c2ccf27d076817b76955cbce96b9e666087d9926c37c4742eade614995eb3ce62b7df78514a25cfd3a2790
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild
deleted file mode 100644
index ec30a5571710..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-8.1.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	>=dev-python/tenacity-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
deleted file mode 100644
index 91134cc529af..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-9.5.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild
deleted file mode 100644
index c71f43ca6ca8..000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-9.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
-HOMEPAGE="https://pypi.org/project/oslo.messaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-2.4.1[${PYTHON_USEDEP}]
-	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index b11a9d6af52d..d7eaab553624 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,9 +1,3 @@
-DIST oslo.policy-1.38.1.tar.gz 82871 BLAKE2B e47e96230874d1c287a1d4e930c9a5dd4ab35ccfee62b1c93c9d046adaf877c7e0cb65f9c34ef378c2a212d6986b0c1abf86af0ca6671c17f7dc8e85e1f1e706 SHA512 6b80a45ef550f5562d0c5cd3a0a466163d741bba7f9fb430c4e9d5273e0811d468d9c0c19c1e6168b38b4436279b81a1aec379d6513cf12d59f1a50fd7a4eb91
-DIST oslo.policy-2.1.1.tar.gz 90438 BLAKE2B fa99f36c688705fbaacefbb01bbc74bb5efd6f6c6ab0e1c0a8e21a299f9a45e162988e26a8da98d0edc2318b8f0b16d2e3c75962043da8aeb365b1a35307dcb4 SHA512 e5925156a42978eada310ef1fd695ff7759e22a4124aaf0bbf5803071484ea83dfbce335c45bdfa73564050b853661d848a1b92e457de8fa3f4c1f27abcbc089
-DIST oslo.policy-2.3.2.tar.gz 90884 BLAKE2B 6eb100e5baf56083bb846adbcfcd0ed1636da3e21fc1cd7b164c89f774b34fd10604776c3751eb48233a8d0822b6a2aca5f57fc2c03babd543cb49d8b6d1a151 SHA512 44300e8aaf894f99fdf6bf4c7b3890013b7f9e9974667a423605f106baff2ca05fa0b8ebc82081511ac211b9c7bc57356a9aea8dbe78ee1ac01d364e337936fe
 DIST oslo.policy-2.3.3.tar.gz 93581 BLAKE2B 50d1b45b596242b901a5b583b412c90d55b2ea9501dab29fa24be7b1c64eacf89f0f7df742f897503ab3c09399bfca25b93ed9cc3aa2377a72986f73bb96f1e4 SHA512 b4a2febe240582dbad8306e2208bfb7bd83c2783002544428b5888a8930d959919f10044eb2c30579e2fe61a6958ebefce4300f1778798b201714232a2edb88f
-EBUILD oslo-policy-1.38.1.ebuild 1209 BLAKE2B 1cdb54ddc6f303c0417fd410489eae887e09ef26eebcf0a8229011a5265dad691a0bfec036b9400ff40f7cf744f6e8c5a04747d36f7e736d93debb2ed5654c5d SHA512 3799b3f1894a0f9924f7bc596334c25b49d42577ab14642c5b58ed6b444908d812412e0f2914d839daba378819e90f675c6902688bace1183ccdb609213fb03d
-EBUILD oslo-policy-2.1.1.ebuild 1212 BLAKE2B 1a0922f292a6dffc518b431f24e662edf6c006f95709c1e5a4d44b6134d97b4d897183400728d923c0b412a90fe69b8de58c47cd9e696dd00901d4dfc18ffdfd SHA512 69a0934bf19dfc1af089b18f19ea326a47326a88441e210205685bbacf2b353f1a8c79a9a543b01d785591f06de9ce22fa3e9c005e516ca06babef00d1bfaef6
-EBUILD oslo-policy-2.3.2.ebuild 1212 BLAKE2B 1a0922f292a6dffc518b431f24e662edf6c006f95709c1e5a4d44b6134d97b4d897183400728d923c0b412a90fe69b8de58c47cd9e696dd00901d4dfc18ffdfd SHA512 69a0934bf19dfc1af089b18f19ea326a47326a88441e210205685bbacf2b353f1a8c79a9a543b01d785591f06de9ce22fa3e9c005e516ca06babef00d1bfaef6
-EBUILD oslo-policy-2.3.3.ebuild 1214 BLAKE2B 39cc784835e3b166f77fe1a26912c470cfa45c0f8b0ca480b2dc947818adb15c9b024bbad066efa1078604e8802bea28afd52995ffa6dc0a04b5d397446fb695 SHA512 967fcfa49fbd3f1e2b49fa18af0c736404d488b2188a9d6f327426d787e0237ddc8a7be2ee3f0654dbdeac2846dee3a3146b1724cde964c6ffbc673e5c3c9ce4
+EBUILD oslo-policy-2.3.3.ebuild 1212 BLAKE2B 1a0922f292a6dffc518b431f24e662edf6c006f95709c1e5a4d44b6134d97b4d897183400728d923c0b412a90fe69b8de58c47cd9e696dd00901d4dfc18ffdfd SHA512 69a0934bf19dfc1af089b18f19ea326a47326a88441e210205685bbacf2b353f1a8c79a9a543b01d785591f06de9ce22fa3e9c005e516ca06babef00d1bfaef6
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild b/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild
deleted file mode 100644
index 85007c3f1dfa..000000000000
--- a/dev-python/oslo-policy/oslo-policy-1.38.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild b/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
deleted file mode 100644
index c3144b2fa23a..000000000000
--- a/dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild b/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild
deleted file mode 100644
index c3144b2fa23a..000000000000
--- a/dev-python/oslo-policy/oslo-policy-2.3.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.policy/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.policy-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild b/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
index 099d09f598fe..c3144b2fa23a 100644
--- a/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-2.3.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index e2a40a0297df..9c9d11e21750 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-utils-3.41.3.tar.gz 91174 BLAKE2B 9783360e5328083b5cfb2813f388ea29ca8876ce01cbcba5a25e0706766aab87d28f7683c4a9ef43ad9a0a4756403d2f35dc61ad170ada33e0dab67e5d5a6af4 SHA512 b8efc1ee5e22a0f224a48406208424d75ae1b9eb2b740bd2ac57e172f23f2d7e3f2ae712a006f89b4a64e0b6a619858908540b729705285d0aa99a8d5081495f
 DIST oslo-utils-3.41.4.tar.gz 91178 BLAKE2B fe3292b2f60021f6c7cff0a2f6444a8d906586278b4560422e7296e996ac2322973f98902b11b72e6d543a18693c5f10a02629c2fa741e36a8338ff3f53de8f5 SHA512 ea12199b583a83b408fdbe4874162689038936a08d2a362e4adc9074da623c38a1642861ad83833c63988298e2efd11c2242bf69090da03d6358856e6e287acd
-EBUILD oslo-utils-3.41.3.ebuild 3130 BLAKE2B a612f10cca203ab9da819cda28a80f3140bc44d422893dfa9b34547d50e4222f117e41fe1bebc04ac65b25945777357a1e4ba7c5e6e15a15a62271bc7eb1cf4a SHA512 97edf9bcb1baba5dfe63f3d6318fced2aba3c8b242e93fbf195e440e5547f7f69430bae71a47ce70305faa843525cb770dad7e82703afbf9771c2f46481e2770
-EBUILD oslo-utils-3.41.4.ebuild 3132 BLAKE2B 6cc5585a5ae665ca105156ce5cc04873ab21691528663ca3431b51e214062ee0798c0e97a65e14df3cf1d16616e7aa089c03b2aa1a4ccdeed75f9ae7a1b65f25 SHA512 0eee022263230c646f37c6448f4139ffd0fc8b915d5d5a083bc2c22161021d7167a584b0f880f42b9ab06699263a4e6295d03e77e4e76608a348922dec2de554
+EBUILD oslo-utils-3.41.4.ebuild 3130 BLAKE2B a612f10cca203ab9da819cda28a80f3140bc44d422893dfa9b34547d50e4222f117e41fe1bebc04ac65b25945777357a1e4ba7c5e6e15a15a62271bc7eb1cf4a SHA512 97edf9bcb1baba5dfe63f3d6318fced2aba3c8b242e93fbf195e440e5547f7f69430bae71a47ce70305faa843525cb770dad7e82703afbf9771c2f46481e2770
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
deleted file mode 100644
index b3a3b972d712..000000000000
--- a/dev-python/oslo-utils/oslo-utils-3.41.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.0.0[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]' python2_7)
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	virtual/python-funcsigs[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild b/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
index 8fb0bddeb33c..b3a3b972d712 100644
--- a/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-3.41.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pandocfilters/Manifest b/dev-python/pandocfilters/Manifest
index 28b65e7ac512..afab258e3fb0 100644
--- a/dev-python/pandocfilters/Manifest
+++ b/dev-python/pandocfilters/Manifest
@@ -1,3 +1,3 @@
 DIST pandocfilters-1.4.2.tar.gz 14229 BLAKE2B 8d061435fc4368fe34f30d7ba7aa06a2b8f3bf94a94661aa120d3b0e9a3042e64bfb8f81a8731470417e436f52342b3a63ab4bb3144349ec9aa983cea9c5d4a4 SHA512 5e5c0fb18f163430e87750b88d38a5f0fa618b90c84bf08e6f295df3ddd46c1bbf35ec51514af8d6699c7dfc9f0b3ee9edd0484deeb05e5efb3b26e650b5ee1b
-EBUILD pandocfilters-1.4.2-r1.ebuild 423 BLAKE2B fcd3e52a499ec097d6c70a8eda3620298ba06c3996c37d75037c3936d182e632fdb15b6910a0a98047b6a5d610436bc85658e42ddcf76ce4fa0c32cc0123165c SHA512 3e8575f16aa4ce113bef25d3ba60361e27b683b6985e7e7c4964043b40bf13a8ac1f7ade9880d9727dabd031c2aea1875bf5d07b94d6858ce0e0724eb0c82d11
+EBUILD pandocfilters-1.4.2-r1.ebuild 413 BLAKE2B 01f3da985164860a54e1ae618978abf04c57aef3373dd9820791124a551c9b033e69aee086856991c0f67c944b7a9ef74f83a351a6214c488b42ced41ebcebe1 SHA512 4df88b12f39b9ee0862a244c22189cc71e4ac142683980311151c09444fc1bde0e95c1f2d8d772591850009df68a51ac9d600842b024f109cc6eb5a6b8d09f32
 MISC metadata.xml 398 BLAKE2B 2c08c9bb2d07f4566c9ced1a87888d4482988acb2e4579d243aa776272050a0c8a95de5efd209163dbeb95b33327de59478c978343ce69472c2812cadd6adc41 SHA512 fa20fb0f6270246612d2f7a7cbde6052d3f27c5ad4e111deaf7a80ac7438fba8c4e48150be615053063197f7902243b12ad149b1d050fc281b71196d4b70daf4
diff --git a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
index a2ff84331817..a549b6eac542 100644
--- a/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
+++ b/dev-python/pandocfilters/pandocfilters-1.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/paramunittest/Manifest b/dev-python/paramunittest/Manifest
index f3acbd0e09e5..286931b09d25 100644
--- a/dev-python/paramunittest/Manifest
+++ b/dev-python/paramunittest/Manifest
@@ -1,3 +1,3 @@
 DIST ParamUnittest-0.2.tar.gz 2482 BLAKE2B 13d7de57fe0f3747fa5a8bdf2654a16b18c56d74545d05cfd8288fd902f43fec3c7c73d7528c1b3ada7e280e95b72855c14ac6e6d7419280197258eed2592a52 SHA512 ad39def15e5983ebe6b018b10f966b7f83085facccc50e71010f88b8bcfdb704e889ce021535b2e4dd84bc1ae413088e7c028990d934d4fe28d3186b4b01a3b7
-EBUILD paramunittest-0.2.ebuild 522 BLAKE2B 870496e6339b2c08013ed7b5b033331d1fa7600ba7223758cf81a646a0522579e69bbdcf441f637b7dbf3c0be39646143b635c65e784e8f99dbc17acb88024d6 SHA512 4165c95ec42cada035d94afeb3de4da8cdf3fa082ab2dd68a44138aa37bb36745cc94b29bc4a899fce7fd05c81caea336159d61f3def47ad0baeb85ec6421e79
+EBUILD paramunittest-0.2.ebuild 512 BLAKE2B cf8ccb64929037db72e86ab917a6b09b0268a08dbe2bd1452bb9f8eb43bdc7d5034b1f7e863ee1561f359a95a0f66f5b8a6c10d3ce1c64faae39d20cb9e78b4e SHA512 2e7e43c0e40cd119b77fbf74006e1ee9ef89d9a0fd2418c76c8500928addac323b65b1591a13aaabbff824f52a078649dbf0581b43719a3a4aac4e318c43300f
 MISC metadata.xml 299 BLAKE2B 63557ffe11e7306ee858e78150e1e9581505cbe9498b0bc4cf0e2113757c8d22518f4afdda9da0af358565c6a5aade3487bb3f443bc354906c621ecbc3327919 SHA512 b7bf38d24afab09b5d2da40d7ea77601ba094ad322f505cb5dab4991955e2799c2cdb33d0a5a387de6f2df6f0772020e1fb9cc7bbe74b3198077defbfb6f0b92
diff --git a/dev-python/paramunittest/paramunittest-0.2.ebuild b/dev-python/paramunittest/paramunittest-0.2.ebuild
index 1c3b77a0be5d..c02fce856a0d 100644
--- a/dev-python/paramunittest/paramunittest-0.2.ebuild
+++ b/dev-python/paramunittest/paramunittest-0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/parsedatetime/Manifest b/dev-python/parsedatetime/Manifest
index b641b23f7eb6..b50f75f97e39 100644
--- a/dev-python/parsedatetime/Manifest
+++ b/dev-python/parsedatetime/Manifest
@@ -1,3 +1,3 @@
 DIST parsedatetime-2.4.tar.gz 63598 BLAKE2B 864e40311b56d28f5b1eed5ea069d40f7bd06b99a365530466ec0d16e99ce61d64d2c0bf78f1653aafa936a4fa91b2145e76f4da288dd3d1ff69ec8ccdc00174 SHA512 0fd8bfa3411476a20d8874b44036bc162735fb7865d39ca98b0a608daec39daac47100314279dbf66229ec333821492744f7505315d955f58216fdaa75cbf046
-EBUILD parsedatetime-2.4-r1.ebuild 684 BLAKE2B f8d5a2864c7f8ac26f3b709a65b9a57822c09ce9d7cf88e7544389d36499793363c2131d423d40e6c6f752f93664d4bfcce0f612f90799c26ea0db14caea4a33 SHA512 f87f9182166c7fe86fa94777d15102e9c3e82689f3daa97bc6897f0482f7aded426c10c96386352f2a6f5c77ae11dd4f193ed993a7ac55c4fc102e84707ad0ca
+EBUILD parsedatetime-2.4-r1.ebuild 678 BLAKE2B fc551cc1636ce0c6b98eb21d5b0873bec10f00ce5000bf90a90d9511b9cc7175b700b5f784bfe58021b016e3c60ee2f6c85211650e5d92af5a579006ed50a779 SHA512 2a1dd4b11bb01df378225788e587397969843e2ab9a196e8181225b7823ba2280f8aa8caf4f7ae0ad728b08107cdde271086a2397b84db8c83f43a5bf469bf66
 MISC metadata.xml 323 BLAKE2B 9aa027d44b3a16191a66b19dee59d74607de0260f4490af322e0f3daf7a5eaad521afa616287314f942537988e0a6e6f84b706bc8f2cbec7229c4e400624cd8e SHA512 496f1ae871e09c9a218454f32dc7fb1953c484d8b813324bf3a2a2f11226f5788d0a84f78641499b111571ee4487e1849b1401c611b1302e87d581c3e869fff6
diff --git a/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild b/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
index 5e114832a014..fd2850beb013 100644
--- a/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
+++ b/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{6..7}} )
+PYTHON_COMPAT=( python3_{6..7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/passlib/Manifest b/dev-python/passlib/Manifest
index 86eb582c8303..a23b4a03aa5a 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -4,5 +4,5 @@ DIST passlib-1.7.1.tar.gz 645724 BLAKE2B f34e3bbc5a61ff71cc989fa26edb9f992909bfd
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
 EBUILD passlib-1.7.1-r1.ebuild 942 BLAKE2B 9ce2a5d002f6c5f6d592d618ddfaccac39b7ee7dc3ca7566fd73ded9588e55fd0f484314ce98cc7deb798f24e2357e6c166712d2f0201fc962645d12e47896fd SHA512 8e13da6ae54b8c1703bbc02f33bcb5bf59d2b2c0feb52b98024b75dd462351296d3e78cb8524b14e08dbf7018b646764e35b14553f1478c284348b2edeb3cc72
 EBUILD passlib-1.7.1-r2.ebuild 1017 BLAKE2B 3951702642b043ce19ad9b8b277484646f753e5c081d91dc38e5c4740d942ec041d9a07191d29767aae853423d06aada6713ed20fdc8513d9dbfff928371c526 SHA512 e9f5fb5eddb7b92f4184deb6c0764e5b7e5ce7aa58322b92ba4f9aa7641f2d10b1863f8bb6c3d8cbe91b18fabd9357623623e368cd5fc95064b89087cb775572
-EBUILD passlib-1.7.2.ebuild 870 BLAKE2B 96bd4ed4d51b9649456c4efcb2e867b8fd16454f58d778c725839a9ceee440e89ed6281cb5dd3dfec7c7f8df5486dc604a4e06a6005b9ff166365b09db77362e SHA512 e801dbf6ee3a06c66c8ed5863cc95ade660ac9ad54e807d5105eaad034b9ff77ba2f1af3acaa19e7dc711cf77d47987b276826ffa5fc51c4c93c8e6a86bd2a2e
+EBUILD passlib-1.7.2.ebuild 883 BLAKE2B b3594af509e40f5c76db4a7099906eba74066626a28e3a2b554d46e40a39ed73d210d327d3e3df4c4427bddbb427c5d5f0709b1cfc497f7298f76bbcc96330ac SHA512 7589008340b071ce6cc3bbcbf1a0112545f13caf57e76fb9a94de7ba5433149cffacee844a456b478939b277c7b996e3433e81d9ca353eb80fe1f195d3ccc526
 MISC metadata.xml 913 BLAKE2B e5e596a7d8039ea24c92c7cc33702c8adbfec59171a6dfb6ddf83beb213d5a29ca0c2c12b3f7d59f7dd5e5234984bdcdeae0f9dc859faa2bb23f2c3ac072b322 SHA512 942c129b6e9213511959c07967ca77c8888571b8e8ddda7e57da964f4dbb58f55ff10f90d1322d3a95752f00f1439bfb29604600e7a3b926660513d52a6c8b1c
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index ce11522be05f..1c6a58cc73c7 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://bitbucket.org/ecollins/passlib/wiki/Home/"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/patch/Manifest b/dev-python/patch/Manifest
index 7a08f8fc6f4d..9187575b1c2e 100644
--- a/dev-python/patch/Manifest
+++ b/dev-python/patch/Manifest
@@ -1,3 +1,3 @@
 DIST patch-1.16.zip 12809 BLAKE2B 43e751edd4a51a530968b6b7accf64e35f2886c55b9f0b7206d8f568b51937fcfb266a7b41df22bb9f05b4d2549782f6f5a64037dc8b3c4a075cd521b7ac3eca SHA512 563be07f0376e6ddcf7fa500006d57def4faa2d9fdbd5232afac625d17d9621787de60dc67f0895e1f54f1d5cf0920594ade0985f1dfb7796f131acc92cd7f0b
-EBUILD patch-1.16.ebuild 485 BLAKE2B c51c8e8dc5a8968b9e7850ff8c5858806accb894cafe9f66f332752c3794df8731ef4f92e472fb67255eeb6214438e6143598e0b49ceb40e69f93710811e99aa SHA512 00d4194f83a06a157301d55b4f249aeecc03cc1782ce077355dc7cbe0136ab97973b3a76ca678d73fd5b2412498cbcf791eb2c2dd8baffcea59447ab8b965717
+EBUILD patch-1.16.ebuild 475 BLAKE2B 08f27cc9301786f0557250062d7aee388911224746890d50f5ad44a4be989a00134a68f8a0805f4a29f142888953a484c933b9d09f9f56c8d625076799d66bd8 SHA512 3211aa57f780c1f9256587fe772a157411e7dfeee5adedc9322dbd573f05ed124d05ff7c3b2ed13333554f3a9743be0b4a6dd5daff99edb099a0c58820ea232e
 MISC metadata.xml 382 BLAKE2B 1a7923939c7b122ec6c8ea4836c33f24cb7141e9e6d08d9ace99b917057b414e3d43e14b47a0ffee828c853a1442e498db5a81e636a979ceec3d6717c8bfc1c5 SHA512 997aea675440c86e710e01e3202e4e7d228860166ed568a5289f379461f3c4c9f088e1b31988ca052376acf3442a66908564692eb958455dd1c12ed59920acdc
diff --git a/dev-python/patch/patch-1.16.ebuild b/dev-python/patch/patch-1.16.ebuild
index 738cc211f027..39bc477ae5c8 100644
--- a/dev-python/patch/patch-1.16.ebuild
+++ b/dev-python/patch/patch-1.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index 754ba529d97d..493ebd57449f 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1,5 +1,5 @@
 DIST path-and-address-1.1.0.zip 7652 BLAKE2B fcf80494a2969d4b59a96ca6cd6f9dbc03a56b11e4374e64ea59fba18859b50eb8621d506b28472713bce8aaec6e8d9f26ba763b82b726df439967aa3c8a75be SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062
 DIST path-and-address-2.0.1.zip 6503 BLAKE2B 146e73b5b54ea536f8b94da8ebbb923441564cf2137a55f3938552493b6fffe28c4e90c908a3fef2acb55e76f320519c7f59c0b2c99f144ebb29ca90d32e590a SHA512 11b2352389662412451e1e9f3e2997e81d36acbef7ad18c50328b9e9bb395f2f5fc8bca988ef14a7d9b76f5213cbfa17bb82df0e00f6989671181b104e4f1406
-EBUILD path-and-address-1.1.0.ebuild 445 BLAKE2B b6a40f9f05061af6a22f506d4c3fb8fc7e5fba3e0a3662a7cdcfffd1f858a43d78a0611a503193945941fa38f2abb77826312088ccc9604594e4fee6e7ccaafc SHA512 00b59180a18da708fa25c4cb0b01b677309ba3a04d91a890b818e36779574293a8c4d939a151d77dfc916425b4c5238f1d602238c9373ef6ae532b3154144462
+EBUILD path-and-address-1.1.0.ebuild 435 BLAKE2B 1801f06bca2cb3d5331f5576c197b042ba16349678b77fb35686c2f997008990a648c6bec16df6f1c2376d8c929931efcc13cae2931657189e4391a6f19b5f39 SHA512 991d570fd7ea2a26284b005933077da02a7ab31d6d1378581317db087cd95ce44621b982c48f8d5b01f2f16d9f846df4eda089fc28dcc111ad7425eb90cd2265
 EBUILD path-and-address-2.0.1.ebuild 466 BLAKE2B 04fc642e3400840d5f32302675dd6abf74c6c5b880bd2c870dafd35ab5ac362010ddf8133fed4f98987ef999e68cd4eba6f66ef607832fb9174ef79c5e13f960 SHA512 63bef9200816aff8deeab7e17f8a6e5a0ee27044ceac6a546ad92837d0526e078de2bc0788ef6372b1613792ea2d75a736dd20f541648049f49c476168714bc9
 MISC metadata.xml 483 BLAKE2B 8c9f07db6e59b3644ee6cd6002d117e0d1539b3a886840825fef835019b70d7d94d093303268046a8726f7c20d2ded1d32ba6c39db5bc4e26f4832efcb16b3d0 SHA512 3114dd2f6e876d73596501c46df4458ea5142675bec42244619ac6438f10ff05c454aa7c1f060e950cfeecd106c1fe230b8fa329521ec4f383a071afee49a1f9
diff --git a/dev-python/path-and-address/path-and-address-1.1.0.ebuild b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
index e9ec9c8f1fbd..0d35cd581353 100644
--- a/dev-python/path-and-address/path-and-address-1.1.0.ebuild
+++ b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy3 python3_6 )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathlib/Manifest b/dev-python/pathlib/Manifest
index daefb5b972ae..5334bf2dd9d7 100644
--- a/dev-python/pathlib/Manifest
+++ b/dev-python/pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST pathlib-1.0.1.tar.gz 49298 BLAKE2B 918b363ebd4101fce50927dd83200cf94b44d820e9f422489be8b06cb5dfe732aa9373b936606a07efbfe0c624b685d1c9efe8851ba74aa60df9f45c08cd33be SHA512 d85e45dfcc85ce75a7e7b609163dc8c75c688f279c1833510185f280af5501e473376dc09bddc6a804d1fcc3177a939db85af37b7b8d5b183b9bc2b85b3b0f8b
-EBUILD pathlib-1.0.1-r1.ebuild 516 BLAKE2B e78fd7b0988f1af2bed905b90acc5ee3bed8af000b69a415a94de280737dfc8bf003c3b60a9ea9158697aa07f9ac367b3535f9a36c83d43dc49e232b6927d954 SHA512 e14ecfdaabee95950791bd22d0ad9dd958ffda882c4dc25c3c1a6bd7f2b0ea94da5feffb0022d6c90c2f80fb1fdf412d3827ff2a84adc696799a958dbc865840
+EBUILD pathlib-1.0.1-r1.ebuild 515 BLAKE2B 5360614b39c75f61d77a522a8c83acdaad86138cc230aced5ca9a7d60ea1ba8997e7e38033d5a658208669c59a8580b7f68f40d1b3fce2f3ebffa5728dfb70fb SHA512 1cd4c29b5ef98815eb621c1329a5deaba70c058cf89edc5e7857994b996e2c07535735f7acc47ab1b806e988873de1623a33304cd0041747f6a2d958b006c454
 MISC metadata.xml 310 BLAKE2B dfac529133f0a3fe4c0fc865d7f7cc9d70a7b37dd2d8fcd4f1c87a44ec6f9ade254454e01cfd4dbd57a04f9643f079bdbc358d84cfcb0c09cb416d3ecad2db99 SHA512 462b029410c6c013f274599ee749a79541f9a40a1819b168963421d0b8bfbeedae5590a460c7295f0e9a249fa9298e7526b0cace165a29f82383d8943bd9842f
diff --git a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
index bd534ea59c20..1527b6bb7c8b 100644
--- a/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
+++ b/dev-python/pathlib/pathlib-1.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/p/pathlib/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 03e5cfa9ba49..3d7293ec0b4a 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,5 +1,5 @@
 DIST pathspec-0.6.0.tar.gz 24159 BLAKE2B ac3f75d7f4b3f6d092d216176823f061fe91f3bead10947b01315267655133a0f99a29288283cbeeff7c2c9305c499b4ade1efcdccc554d756ecaaae2f84896c SHA512 e08baa05a3fe58ec6ecd651577834115cdeef26b75eef274d843c3c6444cf771e86f99a2a2b2980a6d1ece946997f1ebe714f79ddd5c296071c2e18b73955a84
 DIST pathspec-0.7.0.tar.gz 24306 BLAKE2B 4256a658de2160d3487281dcb5a488c804320ec5b0bd8e20fdaf51bef8fc90f4e7fb48c404ce43508633c23d866b41e7e13cfa3897929459b244e75401b84ca1 SHA512 3171d39405eb586945261b11781b966e0771649dd7caa8f8a5bbd26223a37931c17bd50a4706d603a637a10460e9b3730c21f0eff7dc92d7e73ae570641a900c
-EBUILD pathspec-0.6.0.ebuild 592 BLAKE2B cc4885d49570cd86bbe17990bb259789c6a92c82e23749a2e1727b9142424fa8e894acafc5bfe62894cb383cecf5ecaa2fbd698b4db0df9f3fadb7b974baa679 SHA512 ba397d75c69c47c117960ad32b404fca6a61213ffed0f97efa2c9db1b3a66280fc9b054e0d9023b6140446f0e81b8496e71fc1617512f06e410f218989b7bce2
+EBUILD pathspec-0.6.0.ebuild 582 BLAKE2B 40dad7afb3035b2ff88db649346390561b3c598a252d7fc1749cf07bf022756122c727faf18d7b8cb28649be50ef22b1d40b046de7fff82a8cb51183d0ac4ef7 SHA512 706e99682737dce808dd467e361d54e94286e74682149f081d41ace41fb72f75e35e58a2897e468ea06f8909dc5ab2ba71c0ed8c94a103721a06a015df61cfe2
 EBUILD pathspec-0.7.0.ebuild 584 BLAKE2B 6d150954a5514d4a25012e70115729f52bc695f59cffe1e3ddeb41c5a6866cefb9a51ffe376093190bcb8bb83a8a08bb0a5da9b090c9f9eccb11130424ac46c4 SHA512 75ab02c5a6c6d7e258f71867502cb11693a0743707eea38602d5d16ea8405104a191bc9dd3b7d61d5c9578f71459698d056a83ea13d60d8e90c9576b0aff7bd7
 MISC metadata.xml 396 BLAKE2B e76022dc2c60ab84694cf449d56709db941649742c430370395c8389ab302c64eb5074db3d16c48195e9e36ff40d1f873919582cead9c39ee584667fbcff1b3f SHA512 db15dc438facff639ab3c1b32cebaced718c3a0eb7edcee5477e0688589d56f48d55347a9679b043d551acd9638b601738c947c2072043d0aaaea34a3f4d2eed
diff --git a/dev-python/pathspec/pathspec-0.6.0.ebuild b/dev-python/pathspec/pathspec-0.6.0.ebuild
index fdea12e2fe41..b6a9654ca7a6 100644
--- a/dev-python/pathspec/pathspec-0.6.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pathtools/Manifest b/dev-python/pathtools/Manifest
index 71b7eee2d2e7..40b41d4634c3 100644
--- a/dev-python/pathtools/Manifest
+++ b/dev-python/pathtools/Manifest
@@ -1,4 +1,4 @@
 DIST pathtools-0.1.2.tar.gz 11006 BLAKE2B ad257edd9a62477a07343ecd6786c24ad2472da8844e3358980973c9daee9c52f3317976b2971f9afe33bfcd0dba1c1497230b105fd364a45c0d138abec41894 SHA512 e014cb17f3d61ce7979e36663f94a44d4f1116c35e3d2ec8c4ac207a81935dde246495ed06597e6edade1509f384b9e5729a97ffd3eec31b1d1c4a8372d1dfd7
-EBUILD pathtools-0.1.2-r2.ebuild 459 BLAKE2B f912b13bbf4ede40cdaf485fc4cdcaf7e953825fc5030a3547a83d5bbd67c87efee3552b1335b092b34769c01a8c703fa2c265dc6acbd9472f3a8a2c2ae1a84b SHA512 2b9bf2a2aa08a49c37f8edf50b09d38d43b575b6b652a966bb0c7f606e041dbacf6601cd4cf089f80d0fe4040385f519c1169f687207bb626ed257d56dec02b5
-EBUILD pathtools-0.1.2-r3.ebuild 410 BLAKE2B a164dc3b373fbe8d796b7f1564f5253f02c54e6231696789b9c8052e807262e20fdf0ce5b30759dbf2d146f10251f4b5bae3b080358afc3093a2105bb91eea96 SHA512 1ddc768766a03961b3aa324964f0235e04197beb22bafeeff1818855c5c3c0c4f9c9b0238313dbc540119ee4b0a502b83bb0a4b5136a5c481b9fe946fefccb67
+EBUILD pathtools-0.1.2-r2.ebuild 453 BLAKE2B ca8985b8203f58f03e040e6a7c073b34def6232e6a50b94b92e6bd5262d9652c284f9baa73e7327204571799ae5bb0800f71872b0e7285c08725683c39e0e3fa SHA512 d90d095dcbebc43fc019750b8a5379450312014cc3f8d395d34f43eb7177e8aa31e162d86a2721952485e10b74129f29e81d9744a787c569e95607f83fb1ad53
+EBUILD pathtools-0.1.2-r3.ebuild 400 BLAKE2B f9a2827c2e2589a118ce65eec9c27cfc514a7df7c7ae25f7600a210a856130ab94e61cc6eb56b537ef0756a4fbb87a4fc76c4d89ceb321f5c5c943531adea4a9 SHA512 38f3b0d7f8b9f3a733c3a93aedbcebe7a3e1515a9132d9fcfd692ed8e903c164ada1b3713f460675bf02b4a45201131a1f9bdc2e56023db71e1ce631daa1919f
 MISC metadata.xml 312 BLAKE2B 655db0f4e05f6f22057f5b40c38a0790aa4878190ba1f2eddd703c2a13a1d8010282517cc827bdf2f48597024c9069ddff7be23a4f914899d5c432115d150c57 SHA512 f1187bfa80d1a0e64b04e3d474d8d805fa73f7c23ad412fdde4a51f347268c764d1f808d9c9b1f191c661e777dcfe6aaf0966bf13ce7ea9e8c02f6a8e5249851
diff --git a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
index 898a06919cac..aff7a5434356 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6})
+PYTHON_COMPAT=( python3_6)
 inherit distutils-r1
 
 DESCRIPTION="Pattern matching and various utilities for file systems paths"
diff --git a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
index 33ed06945c63..5089dda99835 100644
--- a/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
+++ b/dev-python/pathtools/pathtools-0.1.2-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python3_{6,7,8})
 
 inherit distutils-r1
 
diff --git a/dev-python/pbkdf2/Manifest b/dev-python/pbkdf2/Manifest
index 5e4573a77b74..d044fdea4e2f 100644
--- a/dev-python/pbkdf2/Manifest
+++ b/dev-python/pbkdf2/Manifest
@@ -1,4 +1,4 @@
 DIST pbkdf2-1.3.tar.gz 6360 BLAKE2B 0a449b593fb1dddd604db687dab1fcdbeae37819dc17d7a875d8f592b1a45ac16903a77de46b72d87fbc2d41217f044046c4b4cf3a10b579e4f21e151d8512d0 SHA512 1297950d045f9b56f5eb9f771fe65091802c1f12f090a8a80fb5e36bfa10f1c1ac3b9dc8088f4a640b840fb7073aadd3fdf39f3979118046ba5cde477d071244
-EBUILD pbkdf2-1.3-r1.ebuild 520 BLAKE2B c343dcf0065cd37005ddaaee6db3d5774f3a00d722f08ed91a1f5565c6bb0db81f3c9fb71291a8400b5ebe329c3282074458ce9030e8c7560406812cea60ef91 SHA512 03cd2dba51fda1ac0fe40261500df473b8d8d8ebe49236021ccc7776dbe561c684219cb5aed87d3d539b9f8f20e55685cd0bc5f6217dc9fec2630eeeb9a5236c
-EBUILD pbkdf2-1.3.ebuild 558 BLAKE2B 347d64738c42bf6b14d0549c4d24f48662ad60fd3c31d58641c57f1a5355139f0050100942811206f8700fdc412046bbf5f61edfc2dffa8f776f796d151b4594 SHA512 ff0ac555a2293ebe7546bda38bdf89f534ad16591e5c84e1a2dd8c7781ed39841bb5cca5308705b29e248d01e67a9bc64fc6ac84cdd86d52110e3ddeb4da1729
+EBUILD pbkdf2-1.3-r1.ebuild 516 BLAKE2B f92a81aa2c15d54221bfbf7de7f3160d8303e6c57f46ef1bbdae3b859cdd5753d3ec76a89e0d2b883ebb4ba3d25061da9d988cb192ee29a333052e662cc61ea0 SHA512 7509f0b500a94f72b6a03030db54b1c1a7f486ebb9235b1a8002fb248790046d312a57a290fa999aac53e57bdb06623ff5a3f331497c77046cd09166de80f3cf
+EBUILD pbkdf2-1.3.ebuild 554 BLAKE2B fb57fca27f52f8083b0de8360858a5ab61aee0c02d0f7350e7e4a111f0d6664570e84371cae1b18eb0365927b1ae284ee0ef4a4020808c3b2272aced7d116916 SHA512 01bc93d2e57b5ac6277a504e36b2104c3f0e9b851f5c43480bf5948f3b16a0ee200306aebc3308c72296f33998b3f3265bf41554071d04602bdae506a2a4a64d
 MISC metadata.xml 459 BLAKE2B 965991be60210f9e930734bce65864e787ce89679cd3022cc4bf8b0fae52673d38a27c6e44b4f809df88eecf7408adb248cb232399e3377974e8af91184c206f SHA512 698082fce3b94481fefb400b8328018726c7c0151f088ead749fc0e25224852cdce344947b9f084011e216918237aed988f39f6ceefe60dc86ab6e1859583136
diff --git a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
index 52263f9a9c33..619eb7f07504 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbkdf2/pbkdf2-1.3.ebuild b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
index 64130c588c56..340f42749de4 100644
--- a/dev-python/pbkdf2/pbkdf2-1.3.ebuild
+++ b/dev-python/pbkdf2/pbkdf2-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pdb-clone/Manifest b/dev-python/pdb-clone/Manifest
index 74d7050741eb..f82aace6d371 100644
--- a/dev-python/pdb-clone/Manifest
+++ b/dev-python/pdb-clone/Manifest
@@ -1,3 +1,3 @@
 DIST pdb-clone-1.10.1.zip 110435 BLAKE2B 99ab07e09399ce236ea3cb4e0b7590182475cb982978ad986d448f7a55caff9adebac16959dbef71c5b5a2100f30a8ab0f63a8a2d4d117f17aa75287ff48664f SHA512 70470d8fb33deb46c49fd2e072c1b6aa24c0397d21417f0ab1f63c1e05d8ff9797ba10a6c4ff350c29dd3b94ff6175110cb80971b4f0d16e922f948490773070
-EBUILD pdb-clone-1.10.1.ebuild 404 BLAKE2B 7576ec19f69ab8211cfed76f9716df2941d9d0a89c92f191502cb07cbd53658a8ce1bb8646359526083cda321c038a792ddd1fadc26a0ed3e25d1652fa79c811 SHA512 67f5900c8cb53bbb3a904747ae9b9d4a2bac4a3ec54bca8d8292c396882bed43f275a5ca141118e395a799f36a0143006870b0863ae72b0f1162d82037419c4b
+EBUILD pdb-clone-1.10.1.ebuild 394 BLAKE2B e0e7d048ad9996fa9571e043b5c418c69fd9aecba85d0c84b9000b2ba089c001f82e651176b21488b5bf33d4103e6b6bcbd9fcfb11ff95289b4bada7ea7597e6 SHA512 15d9425ad733c321d754c4f31d42403c3afae7031767aa961d611512615299f8f2910ef5ae5aea1612a228001cffb8aced30698d583b6612d66539724e471160
 MISC metadata.xml 371 BLAKE2B 4ddd36edf799f79bdbf8217a5ed630997162f6fba1ba11347ead64cb5e7fbee8b7c136359c2592bda55170818e7b9951668bc9db6baef67341ef583ff763ed71 SHA512 01042ed02fb971d8404159d92149b4e3624b716744ca8828e3d15e3bc3b268ed4ffa359a7d35a009a249b396ae4ea8c2430b3f44c3de05caa5240dd3cfc854f8
diff --git a/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild b/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild
index e06d7d83c25e..5d0e4629d2f8 100644
--- a/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild
+++ b/dev-python/pdb-clone/pdb-clone-1.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A faster clone of pdb"
diff --git a/dev-python/pep257/Manifest b/dev-python/pep257/Manifest
index 2a26a09eb972..cc5eec7ddbac 100644
--- a/dev-python/pep257/Manifest
+++ b/dev-python/pep257/Manifest
@@ -1,3 +1,3 @@
 DIST pep257-2.1.1.tar.gz 55760 BLAKE2B e470b006b5db04c4bed5c3145b14b949980c71d1dd91dbe34d49599063aaf1cb1d0842dfb992e5d471436446455bde2d309ee573826c039540fa99adba3f828b SHA512 f23939e0350094c67565613bab4ddf285dda5a7379e6ac2493953d6e60ab75588143fd374715765d2aa0728e7117d02e91312dbbe5a9cad28aa8e8e7f68e3bc4
-EBUILD pep257-2.1.1.ebuild 739 BLAKE2B 0306c0d40d52da704d85511f03fe288578b5b23f0f1d523cd77192b83ccfd1f12cfc93cd492e55e0c3c64eba5eb9deb385538db216e0f63fa4447b1463105b17 SHA512 a7c7e1a27de677a7b39db661142fb2ae8c6749ed0cf10c457e4edd2f2be9eb0d24dedf47ddd9a079bf961b99be8f6d68014850cb4a2380dc4aa024f187665d9c
+EBUILD pep257-2.1.1.ebuild 735 BLAKE2B 86f6f04bf3ab346b581bc2dec0c6a642764f3b8bc4e920e353691a0c607b2c45e32616c5a8ee02decd7cf3483df8a118ca45f48e49c1378cabe61d282421a753 SHA512 ff8439ebc4a9735c62ee87e79249a30b1a64ecdcf5d5cad3ff44a491cc20c96c917b3a9a1c38432e7807c60165f30cd489c08fb8054f2a795e1ec3168a74e210
 MISC metadata.xml 464 BLAKE2B b427cfba180d91335b6cb1b632d0f5cf2f2d468ffc31917cd1cf03248ccb8baf4359357b2a8f6018a663ee973e8c4c125a5cc19a973b5f017420c1a929a980c3 SHA512 07dfa48f689377623d1a3f0fc969b7b6377d6623937449ad4bd67003583a218a309b229a5815d93adb57bb97edb8a02a90321e29520ae291663e7fb75b9bc2fa
diff --git a/dev-python/pep257/pep257-2.1.1.ebuild b/dev-python/pep257/pep257-2.1.1.ebuild
index 81273ae6b6e3..adc2b04b642a 100644
--- a/dev-python/pep257/pep257-2.1.1.ebuild
+++ b/dev-python/pep257/pep257-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/peppercorn/Manifest b/dev-python/peppercorn/Manifest
index 3a03903e7e8e..08d806b9bf30 100644
--- a/dev-python/peppercorn/Manifest
+++ b/dev-python/peppercorn/Manifest
@@ -1,5 +1,5 @@
 DIST peppercorn-0.5.tar.gz 19637 BLAKE2B 13a94c3bc09b5cdf75cf44b40111b1d5cfbc79b8cfe97bceb9f1cbcbac2983a912dd25676d1e68366e471cc86ec8832cb55c105d3fd3332cafb80e5f086a8e9c SHA512 37f9df282872b0c664780f5e27caf81cc379b05009756cf6c79290b09893d88427f3619916688412dabf20e99f264da8832d959563943e2910b1fcac696edc31
 DIST peppercorn-0.6.tar.gz 16386 BLAKE2B fe72e6585f8fc6e0dc23d9bae321482ec1b2c50e7d13faff11c8a3beedb645a99b1e90852896ac6807938d7e23e1cbb5bc80cb10fd11d657d6574172e61a71d4 SHA512 6363c22cec2c6bdca7a4520d8bd81aae02a74ca473733b22d2557ee7299dbc1bafc77c04808c6e9520f23ac6e1c6bd8acbb8e8dba0deebdac55a170ed0396a60
-EBUILD peppercorn-0.5.ebuild 1071 BLAKE2B 5afac813365ea5a99d3a7aab0bd6668835b65e1437afe35fdbc749a7ed4e607d01cf81d2c404519b48789cda04e03cfeb4539d080043517a0049acf9e6d9cbb5 SHA512 79082c4a42d0d1e2bebf24a9d132d69164b98a14b83ba02f5f54ad9ad55c9ac38c103fe5d29734ee2cef7b347efa5e75e1860794a33aebc09a53aaa5d5013cb5
-EBUILD peppercorn-0.6.ebuild 1043 BLAKE2B f23f946b6c93dc140ee319dab88403a60b3a96a194e6d2ffd64e2e69fd75f8323bbf611ab0c33e80f82b5559514f22e4336ca5f6f6bb7f9137334598b6823472 SHA512 8261edf9a9ac2388909a6684406ae3214589a70176f55741f3d354f7ba777b1cce19aef35d47af232f3571dab21293edb98709cbecb78363ef992f22497829d3
+EBUILD peppercorn-0.5.ebuild 1065 BLAKE2B 8a9f4524cbe3df744b6f0b8a7c55e431403cacca570a63a756e373437af65ea26596d3b3692e839f76261a273cffc76c8e94c572775e2329e032e26c6c4da7ba SHA512 02c4611e1c04cdf0a55a657f8b69a17a89d4dd082c28ba43b25213e709f687cb0bcfc01c34a069a776c7d9b2886fe386aeb002b6fb83c9dc4de70306cecc0637
+EBUILD peppercorn-0.6.ebuild 1037 BLAKE2B af921159dc9bd05687b3f3e764e1fa2744cf52b1c0ceaa8d582fa0413e84879e5d2001226d80c5faba7b968b5755a08789cefd62cfed54096933fce7e1e439b3 SHA512 54e17e04f1aebe519537b4a0acdbcbfca4260ef99350abda8c6b1e4a12648888d63cbc0e0bb88132abca559357e8bf5b46e13cfdebd3afd14a1d6ab0df58f8da
 MISC metadata.xml 382 BLAKE2B 78a004976812587b5ea7062e0beb40fca449529ffa21182f24c8f7a93eb332fe65e14b9c8248bc9e1525303476513051ea45b32e02f9c0abd17ad54cfcd4b0bf SHA512 87d4af71c685754259be695e02aa5a99e49f9f6c72a57c15ed7e5e6777255cc49f8400d349fd0e1308e25ce36b0a880696c9f8cbc2e6ea991d34901cf38c8235
diff --git a/dev-python/peppercorn/peppercorn-0.5.ebuild b/dev-python/peppercorn/peppercorn-0.5.ebuild
index 916c3cf03623..831be9dbecfe 100644
--- a/dev-python/peppercorn/peppercorn-0.5.ebuild
+++ b/dev-python/peppercorn/peppercorn-0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/peppercorn/peppercorn-0.6.ebuild b/dev-python/peppercorn/peppercorn-0.6.ebuild
index c67990245fd5..05234a2fb08b 100644
--- a/dev-python/peppercorn/peppercorn-0.6.ebuild
+++ b/dev-python/peppercorn/peppercorn-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pew/Manifest b/dev-python/pew/Manifest
index 9bf944b642fe..5eb5876d1fe9 100644
--- a/dev-python/pew/Manifest
+++ b/dev-python/pew/Manifest
@@ -1,3 +1,3 @@
 DIST pew-1.1.1.tar.gz 19629 BLAKE2B 9db83eeee873c1a9a542372562cbadda37d6d5d52ed220c7018390291a96ae1adf7e168c4213cbcadad04a6cadb7115aed53eb7a8561a0ee0e58dc9137ac5257 SHA512 9b59ab51d4685b6203a944338d8fc5ab0ac65b442adb7861fb3f2ed7437ef8a02f1f87e234fc70124245625ac7992500c11e51902a98511015e90f1ac5e56b46
-EBUILD pew-1.1.1.ebuild 738 BLAKE2B fa0b7cca85c2ba4d4600084e21bdf0ede28864552d53804979510a9275903dfca0aaee697be84478d1f07ca788d4d97613cf57214ff05908d75ba4bb26974e52 SHA512 5880e9a85cfefa5613d9d36245313a6c13f801279410336cde98eeca1e07b68a03757571aca0d84f2ce0339a04b7fed57c0f64cfb20ef469e9ec5e36883dbc73
+EBUILD pew-1.1.1.ebuild 732 BLAKE2B ce81a49decb9c7bdf0ff4cd50b37a72ec8f16aa49ab67018398f3115f22dc73f7ba3a6cfdb2fcbdb002db29ca5a3e3faf665ee0c5edcc46171fcc46ffc5c4647 SHA512 db5cd313b2db2af7e40e93f39935f2eefbe63e1799a03a0583e1430b1620ac9366cb23287021136089b2165a4696b699f1641417270f7a5bb606a703fc102644
 MISC metadata.xml 446 BLAKE2B d4be59a9c95d607bc67b12d4fe5a5310dfcfa5a251e022fb9fb0ffb0a57aaf51c47331d735b76eb651718adfd627d72ae9afa315c9703fe639dbf67ddfe411b7 SHA512 81ea90c5b887670e5a5d1f6933c503fdbcbfe1b59034bc8656a5ecdd5aa954a35edf3aa46b3c5d591194d2f964d4fdf30ede9270d9dc06ca7676b0f864bae20b
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
index 9425c31e4b42..820b45fbbb7e 100644
--- a/dev-python/pew/pew-1.1.1.ebuild
+++ b/dev-python/pew/pew-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 1df9a923d8a9..0f8ab77c9b75 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,7 +1,7 @@
 DIST pgspecial-1.11.5.tar.gz 43649 BLAKE2B f9b8956cfcd81bba946e0323d584668c82e6fc18a0aa08012c3236636d0ad801f10f786b71707daadafc1274d5733adecf9233871b13bded8fe8e8f41fad0fc9 SHA512 984a09a10a705d91d9b97142eb2502b44b2a79d95cc1ed8596dd2f7f31515028f4c34cc54383d762a73fdefd6e59418f677b020181740b82cebb5d8e77bbc234
 DIST pgspecial-1.11.7.tar.gz 44874 BLAKE2B 2d3afd7983a31347a4b0f59fd095684c2fb83e85def027f633734a672c3df1ed21584e2620932efacbdc27a579ea35e810e727456191e02811c81e906373ac5b SHA512 dbcfe996cb67af292c90bec431d918c3e78aa4fb90fcbfc9d5ef36ed0c5c7de58505704df277b586990efcc7110e1395af1476003aafaf359257f0665e4d9a19
 DIST pgspecial-1.11.9.tar.gz 45009 BLAKE2B 3ae53d4225d448c3291d6701caf7388023d140678461a5811673c7cc7ed242fb0c18ea38427210366f58f1886894def348051469c23aff20be7abc5e5c96622f SHA512 b07083ed715a6ac3d1b32ac954b83852fcb154f4b2757fae91ce7c35524576fa8caef5cb7201d313eac783bc956ea89c9d68f099a11c332486d677dfb185caca
-EBUILD pgspecial-1.11.5.ebuild 837 BLAKE2B be57f72edcc4861acaa643541e4c8cfa80b10fd2b0e40d2a8470af0301bbf6d687bc7697727f57f540adf9fb15e5bb608ab7174ee98732d2c72ae98e161491cc SHA512 f46f004a2448ced67d7e6edf76d14f731f0168a0570292560e6bf8a1ec45bed5f7b284a9b9a771ef84c211c0beef36a95f7d1e0084719760a00248cb37a7b036
-EBUILD pgspecial-1.11.7.ebuild 796 BLAKE2B 3d4be6e838d425112f64148e94969a8494ecc49ea38b75dde550193962049ea67ab148d685ae3feff7bd5efaaebd4d9c6e30173fd0547d933b63593a45e2740c SHA512 0c6339a14f9c6f292f43e4493a3ed6026c235671e1187ec56fc05a25a1bb3952306e83edc548d456e2ab38228a9533535d1a290a4bf7af19c3ba7f51e2f0dca8
+EBUILD pgspecial-1.11.5.ebuild 833 BLAKE2B 004bd1efee81e30ca1bdc93ab1860c9d9704fc366b7f7d200ff68dda46bb68d217b93045964c1341c53b562dcaef5b3df7eaa3305bbcce74d44a7d56e3ac7348 SHA512 fca2f10ce90b55325341ba050d105439f48f88e8d6dda4e33a6cc911e2901628a209afd1d0784200afd1c886342d7dad21f9c2efb30e464ae9e1bf10d304c253
+EBUILD pgspecial-1.11.7.ebuild 792 BLAKE2B a84abd0ba8483f2879fbaa941766064cf310bc12444cf01e5b14fa418b3ccbd0174b13b22ae1f2bc6b490c282e8a325ac8f6bc47db2745451003cd765dc495a4 SHA512 27cf3534b3278febc66aec63463c03ad803f6e6a563f86605ecb340b0d5d2e299619afcdd7185a35f76505abc8c17551e8d71d70a7ad000f7715f7a799128cf6
 EBUILD pgspecial-1.11.9.ebuild 599 BLAKE2B 75166395caba6bdb3899bbf9efa43001c9535a88a0120a9a740789d396b303ff7dbfc88cdd8d3749b6c86cce1f68fc941dc587648afbe4d223c1f268fb933529 SHA512 df32f02875911348e4141e4f82275236100130e3dc8282c757ebb28061747b4fefa03483d17ed669eaf67ab2418faa3708e8df622a8253987893029ca4af8e14
 MISC metadata.xml 467 BLAKE2B 4a1fe580d03eee97746d0b3f25ae0f33a693c5095fffbc30e41edb78b5cf48d4e8d39e1bdd6764956ba675c282548993878455177bb766d9f5bb333630925c25 SHA512 fa46dbfa82bd12f191d99d189a2286da31cbc42346df1072b3f445bcc1a79575a8adf17ad79cafd0a5a4a17fc7094a7f3d2e5fac642b2ad61ce84a2299a13f60
diff --git a/dev-python/pgspecial/pgspecial-1.11.5.ebuild b/dev-python/pgspecial/pgspecial-1.11.5.ebuild
index 932fc9faffd2..d41fd7f97d66 100644
--- a/dev-python/pgspecial/pgspecial-1.11.5.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of postgres meta commands"
diff --git a/dev-python/pgspecial/pgspecial-1.11.7.ebuild b/dev-python/pgspecial/pgspecial-1.11.7.ebuild
index 323ce5614df5..a0377b70a4bd 100644
--- a/dev-python/pgspecial/pgspecial-1.11.7.ebuild
+++ b/dev-python/pgspecial/pgspecial-1.11.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of postgres meta commands"
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index 7aee710a76f4..79554e673752 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -2,8 +2,8 @@ DIST piexif-1.0.12.zip 1005725 BLAKE2B ff370dfea7b2e3b0013c484c586a294ed3b1590f9
 DIST piexif-1.0.13.zip 1008345 BLAKE2B f2f1ba520d661bf3f50de41b81ceebdaff8db2d83f76d4202771438d78c30beabf118f5732a5e76a6484fbf2bd850b461a9d1a0b675f12995dd7f3c8bb32e6cf SHA512 4234783a639e777b58eb0b4591a272d7d5e8c116a7a242cf36287e64d15089478c88327a16b4fa75786fc3621a6bf647f6a075fab0708e2d0aed6395f95b92cb
 DIST piexif-1.1.0b0.zip 1010925 BLAKE2B dd0eb4cd98cd77b639d88181f7f50201928d683285c661d6fce98c2cef92adfa0a809f45c3dbd38d25745fb1c88f21d31d45871b328052043abe4a247940db62 SHA512 6549f2b1f4a36b3455d561109fc9bdfc130f668ffa78af45ddd1c9ab9264af26617f8d9c7072b2e097d3951a931fae3d8b495589d665d972097411299e24d6e4
 DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
-EBUILD piexif-1.0.12.ebuild 579 BLAKE2B 25863bcd655eeb41bf805f013b8384d6bb3d6fd0b80ffec9b779cbb16e156773b1c84f88d3845d0d93c28dde692b246aac28d8b76259692afee9c686ee515c3c SHA512 539079671d7df8dd76cc0eedc67c2de894a3b6c58b18a58eba472d61b958f6115ab6c857b4ac0b530eff1ca9865c7f2fc4487b25dfb10fd7718f116a4eb23ed5
-EBUILD piexif-1.0.13.ebuild 580 BLAKE2B d8c4a1235e0e17668dacc4a95f3d0c7a1d23ce01a03569be6c597b5c50728ee727f3a336b6c27d0e8357d8133ff5068bf160a1893e7d4e5bfc2b7f820e0eae4c SHA512 d578232d95044fb0fb9f4cb72d341f61e29dfaa9a895fac9451198e67627abf47d607198fcbc9ad1e77bcb1f550a46c042c1170b5d3c5b162fca1036a8d6bfdc
-EBUILD piexif-1.1.0_beta0.ebuild 632 BLAKE2B 0405c7cfc598e0b896ed5e9d641bd1ae1c3071f7608b292722d39d83ae7de7b04772b71bd60d6c55c1c4326d2d8e28b4873f2a9d0761fd35ed7346eecee6ccc3 SHA512 67c6e502b14c36a77291eea58aef98570d75bf022900afbd444e55825c5eb8f163e3cad0f531ff0ea2367b3b703a5f9e5df42f5cdb1835a83994397294943b80
-EBUILD piexif-1.1.3.ebuild 595 BLAKE2B e77a949679ddb5e81177b45a645a41c818bbff445e1513ba86018c8281c0b13044018dea5c3c06c58c019c2a6ee067c3112f8fe8e51bcbd3d3f16c9f67baa259 SHA512 7777ddb341968e13f1cdf5ee0f9cb23466c8ff856c74f805f01601c9b46413a101ed2af54d57b06cde452c0f9200be038e4ad2a448b26da26d1629ffd47c3097
+EBUILD piexif-1.0.12.ebuild 573 BLAKE2B ba8fda528941c64cabec801489250afeb065b1a11feef57d24fdf5e261c1c0a08f8f3c638bc6a96ed2115d2d8b6921b0effcf2a84f306f864a2cde3a66cc4ade SHA512 18228e404fc965f798fba36ea910d580c8796f3d9725d4fc2844f30e63fbc5472f06f830b57dd7570763e796718bbad6894125a50c973a3f2b213b3592cef6a7
+EBUILD piexif-1.0.13.ebuild 574 BLAKE2B c8b2dfd661056f1855623ca59c2e29b720b335eb240831ed5c33d47e5bd1e610a3c84550c722593308b912b38f4efc08474d0edb46e693014bbaf1612df2a02c SHA512 324ede2797f67772614249f303b1bbc3c5697ac10549d85548d0c852e7e2660a9e8cd138cdf381233b854a9138b8269fd6ac450f68bc976a8ff6ecc5eaf7e673
+EBUILD piexif-1.1.0_beta0.ebuild 626 BLAKE2B 1bd8397659ae0b545ff33f371d5ec38485a4de891875add20cf08141d1dfc4647c7dd6f9ef18e4d46b15b2e42686d8a2d19ee3c05224398319e55d98e3395c99 SHA512 e00ef2b96394dd64178f99e4e7ea67fe83211906cce6f277f8bc7db6e0406fecb74b16648e7874c7765164da9d23760135d728caea805e876d77e740e7c9cc1a
+EBUILD piexif-1.1.3.ebuild 589 BLAKE2B 1761c575664085741584038226626b6ab38a137705a9fa7d10a2e9ea9fa287f5be539e3ebe3bd9cb80c1ed8e4c7ab9d5b29d6eacefaba3653eebcf16445950bf SHA512 ded6df1a667d790b0263e591c13eb4352362b7542b821d3c7c91ceebe07907e002633a3089c06dc8f63b966857c9effdd271a2cbe99da9b4e39d363bc89e5602
 MISC metadata.xml 216 BLAKE2B a7f17874d9514cafd0bbab739d143a00ac66ad8446bce8e05932d122c1631d29ad8077c2bcda021bc92b7e89b77c03d55e8997cf250f3bb55f8a1aca046bb2a7 SHA512 1de1c9f4b223876125a0321126f2d7b1b564a113d24ae86b380c4d67bdf58ed4f2ae1a1f5d686211ccf4851eea8e970c20109977abbc79d0cd855164b6474e23
diff --git a/dev-python/piexif/piexif-1.0.12.ebuild b/dev-python/piexif/piexif-1.0.12.ebuild
index f144607fd470..7eb0debff4f2 100644
--- a/dev-python/piexif/piexif-1.0.12.ebuild
+++ b/dev-python/piexif/piexif-1.0.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/piexif/piexif-1.0.13.ebuild b/dev-python/piexif/piexif-1.0.13.ebuild
index b9cc417d5f3f..0125ba5459a8 100644
--- a/dev-python/piexif/piexif-1.0.13.ebuild
+++ b/dev-python/piexif/piexif-1.0.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/piexif/piexif-1.1.0_beta0.ebuild b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
index 12cbfe6f6227..0262eb978e15 100644
--- a/dev-python/piexif/piexif-1.1.0_beta0.ebuild
+++ b/dev-python/piexif/piexif-1.1.0_beta0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/piexif/piexif-1.1.3.ebuild b/dev-python/piexif/piexif-1.1.3.ebuild
index e7d890c4780d..cce3fb7562b3 100644
--- a/dev-python/piexif/piexif-1.1.3.ebuild
+++ b/dev-python/piexif/piexif-1.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pika-pool/Manifest b/dev-python/pika-pool/Manifest
index c17d01ea5491..1696f063b630 100644
--- a/dev-python/pika-pool/Manifest
+++ b/dev-python/pika-pool/Manifest
@@ -1,3 +1,3 @@
 DIST pika-pool-0.1.3.tar.gz 4722 BLAKE2B e34dcb022cd915e00054860b04fa84e29fc0595bb31387da3d3270e520dfc7b1f5db7ea99e0a7808b093bb1eca1881199575b89c5b1846509072886cd3968071 SHA512 2065e4068310cbf0ac27e3fd242a025a1a174d7faa940cc1eb07b5eb7b7313da2b11456b056fe90520c7a39cec679ee06e38fa3327a6a50548200254d376a62e
-EBUILD pika-pool-0.1.3.ebuild 515 BLAKE2B 2ba8fee5dfebf4e4ae4aee9f8f7606e6c1b8e3e07e7527292055e62b688c128ca084991638b1cd63a19d553ea4589a584b42649f3f191e4fc3204b988f218cc6 SHA512 633344d2e6ac3e5544f43096ec43301d42d0fcfa1ae7f0c23f9dbf67c63a29f6b9c60c591a6458baf1c3f12f6f2e9699e80514002039f9bc4adde2123abb135f
+EBUILD pika-pool-0.1.3.ebuild 505 BLAKE2B 9b2cb49223f80da2d3edc4303f66183d5e2debc844b39682b537a1705fe9336db234aeb3e347fde3d6f33ce81c19d9bcfc6239f8f43c8b598a1834c44085975f SHA512 ffbc7c45348ab3c4d26eafd8a74abf4a8e9d79f1b782ceaa148330a8aa1a43df7e18a9f80e4ad678b4dfa56d351868c91d43136812a41b2edf4a81a659d147f2
 MISC metadata.xml 461 BLAKE2B 35b685abb5c06fc53639d95158c0722f76ac41d1cfd35a10284d303a4e79a7a343d3811304f4f5a7509681376ce9e13377fc2558da352a0afbf6a41ff706b385 SHA512 6b55d28c9a908dd3fdfb61145086ea970ac733b97472faed403f3118c7586437c2635095b53378f30b5e3739ac1c317f891dc716cf336be70bc221971e180b8d
diff --git a/dev-python/pika-pool/pika-pool-0.1.3.ebuild b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
index f00bda7df835..dc0acf258ecc 100644
--- a/dev-python/pika-pool/pika-pool-0.1.3.ebuild
+++ b/dev-python/pika-pool/pika-pool-0.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pika/Manifest b/dev-python/pika/Manifest
index fbf409206a89..b19a6e04eef0 100644
--- a/dev-python/pika/Manifest
+++ b/dev-python/pika/Manifest
@@ -1,5 +1,5 @@
 DIST pika-0.10.0.tar.gz 82642 BLAKE2B cc0cafd6d58c1b6511bb244731f4c18698370e77baaa0b876061d80c9748fb81b92dfdac0250c4db7a6ca816791ab8eb8f4f785d9223b45082918a304545a4bd SHA512 8a6e8b870aa36f141a24d4886cd8e4d4fb5cb735d87857a16ad963d7a14e0c40e81a3c7e193d879046a7e76fa87ab0b16bfd4a000e169e2452815fcd04db93eb
 DIST pika-0.13.0.tar.gz 103730 BLAKE2B c78139ac7a60bd324619792b177c96793c8c645d58bd6962f7061d5dfca2f621b6199ebb4b2d3fbc7367324f18d3e766266b43db9afafdd8e64c2eec6069f175 SHA512 f555142c8f466ebdbc46a24278794754186176832841723cb0d5d6ff69ee9a946dca8a7ae3280a96b5da8cb2d3066e11a58771583edecf7990749c8857a7ed42
-EBUILD pika-0.10.0.ebuild 473 BLAKE2B e2ddf2ebaea1d93fe2e278fe571805970b527384d7044785b96fec4e2a0d100b9bc4aaf70c1f47579bc3f5f06a1d329872295905bbc76f6473622cbf720ea268 SHA512 1d6f416cc232550c34e240a2fb123046c7f3cd75ffeebde0bc1ca42beef7e03b99a200b4a69b848ad30019ff4b6ec30620579b858db3ac1e598de9ffbe18fa0d
-EBUILD pika-0.13.0.ebuild 477 BLAKE2B 695709e90ecad72e700379bc8a759c4133c29f85831e4d1901f90e07908fc316f77037b66bc79497064aa1a5c6181b20351b8fe7bef6df8bfafbb08dfdfc15db SHA512 1d089072a6d79cd9aad1bedc62d34b3ccff54e0238fe42bcfc218dc9177e8862ddfe1b9cca8723ac4a9c22c1b1f8e1f339da336da1d1a32c6b3c05171b006b7e
+EBUILD pika-0.10.0.ebuild 463 BLAKE2B 69c721c853bb36abbf0c7adca4f34ac88959aa0fec2aedcff1965e50ea70b3495f80b9c599e904bd67f2eb3739769b4a43443aafc3c2b250563c91136c16d0f6 SHA512 aab8791c33781dc60c5760c5adac17f85fc1e50dcc7380f885ecdad1dc1974b844c53bf7074f4eb24ed5bdc1745e1c28640f5647c508b6ed8f05ba45d1a27936
+EBUILD pika-0.13.0.ebuild 467 BLAKE2B 7f8e04ac0dbb0d3a07445be4b3801e8d2282e61759e8862ce67463a40a7c0b32a638ad83d81784d73ec127e07c3251db3841b8b594608302a270d4dc0f1a81cc SHA512 aa438f06908bed056b718f5f9055d7a482d927032a2014c67a6024bc12832f6fe6460d8720e5dcbbda1e01f0474f4ab75cd894fc1d7a6f9a7a77b19900cd8ab7
 MISC metadata.xml 654 BLAKE2B d2ca07b7ddae1316c11f0fc7efe6a075f3b6118ddf6063e72de5cfaf90eb46cbb6f1c94292e82df12b2c7282f7518f79ed7fb5bac446841d388d797242bfac98 SHA512 dfaf85260ba3acb2c471870c6674d5ac647111168a77f09bde9419831f2a18acb297ef1590b7c944a242bce3deb29aa5dc149e691424d85eafd6f4b678aa2289
diff --git a/dev-python/pika/pika-0.10.0.ebuild b/dev-python/pika/pika-0.10.0.ebuild
index 0ff76879c705..4acbcfe223a4 100644
--- a/dev-python/pika/pika-0.10.0.ebuild
+++ b/dev-python/pika/pika-0.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pika/pika-0.13.0.ebuild b/dev-python/pika/pika-0.13.0.ebuild
index cc7b2c08c825..7f780be83ea0 100644
--- a/dev-python/pika/pika-0.13.0.ebuild
+++ b/dev-python/pika/pika-0.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pilkit/Manifest b/dev-python/pilkit/Manifest
index 001355143970..97a7a853a61c 100644
--- a/dev-python/pilkit/Manifest
+++ b/dev-python/pilkit/Manifest
@@ -1,3 +1,3 @@
 DIST pilkit-2.0.tar.gz 160077 BLAKE2B def84c3444c5ffe7e1b9c016c2fe15de222d6765e7ce4652ef2f6864af59fdc89b9bde5c7a63097838ab3fc054c81529dcb4a13cd3fb3ee8a0f141f6b0030c10 SHA512 7732c67bc00db53c6849c907233381cca7f9055d55d479958a7b97db277524ac280753fd40c0023fe2b34f98b7261134f993585e658275ccd4c67f357c13de51
-EBUILD pilkit-2.0.ebuild 697 BLAKE2B a928ca8fad79a26ab1af5a640b7889590ef8f61b1f62d981b6581208182136395b7bd4d351ccd0bc650d951c79988ed2194a3644e3b156e77ad17be07bd89731 SHA512 4200798ad1e9a6f9489b965454509b69e8eb22bc779e908e51e6366e96fbe12ff6dc7ffd4f05c99e2d20ba625fc443cb3ff67528b19261ed0bb4ced88ef98630
+EBUILD pilkit-2.0.ebuild 691 BLAKE2B e1c7768003ea617ac9e0df8396d92517945c00a5aac38a570f1db50e01f44dd7f43c0a4dfff72f1a5010501df531d4761d554f979a853f2790c9f14a9d12a6b2 SHA512 b090327cb051dd039708d0160513046745e045373a2c32c9880b02d35d10651be5f2339f077ff990528c2550df1a4684c2a20547931c5919ca720dc4c79e0e1f
 MISC metadata.xml 707 BLAKE2B 4499ba1535c6f7572d0e336ccb8b69eebc7d52c0a26fe3a113d79f22bdf93b33062cab1d8f5735d795d6c11c0164bf7304b8327c1e4724e2f9d8c572079ff508 SHA512 32ae881094153b9179401cc55abc4a03469d9004b121afad62bdcbe80725c687f5779fcb3e2286c051f6038e98f7838d89308f12fba4c0fb15e5abe6e27df556
diff --git a/dev-python/pilkit/pilkit-2.0.ebuild b/dev-python/pilkit/pilkit-2.0.ebuild
index 8c12db1a8bbc..27910404428e 100644
--- a/dev-python/pilkit/pilkit-2.0.ebuild
+++ b/dev-python/pilkit/pilkit-2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index fad03d8653b8..4c9f531811bd 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,5 +1,5 @@
 DIST pkgconfig-1.2.2.tar.gz 5305 BLAKE2B 39fe5e05489e4eb8fefce66f23820d96039f5dfb82148e8ac2d691644aa2d4f1205bfa483f9fdc69837b7956834d1525d85281ba6aa0a0c079748336d47708c7 SHA512 88cfb27755297871c500f37c422da5d4ae30a14e0b9974afbe63f22c59746be0d175b65d9e3d2ed315b4d942046e7c18be062aef914199c99070a2767699848b
 DIST pkgconfig-1.4.0.tar.gz 5915 BLAKE2B 17ae11783b6642f6c8e726b42b725b7904ea282829b4527f92daa1e6ea43c3c126e6ef7e29fe5eefc89b40f3b69799087a46df6ac5695a593903dab9dc247c04 SHA512 8a270449b7b8b850aab9cc5774d1d6c6b68254f00157b66530c15697eda214948d3a71a75725067d63b906a9c3b1d789a775ac15a1094ff5ba3f227bcd666528
-EBUILD pkgconfig-1.2.2.ebuild 715 BLAKE2B 133f73d4e7494cff98cf95065090fd4b18b8c0d5e6a8ea0f402e42443a3e1e9cf991a63773c49cdea6f1b55ca0d2236f3b4636730a86e53c6c96621ee68f118e SHA512 e682337f8ececc22e261283a72dcd306c0ac8ed52ba5ca77a6ae5f4531ffe29d582b60a00dee473c987d8ce794ffa42aaec7e1ff10f5cbfbd2b8a836387d20d1
-EBUILD pkgconfig-1.4.0.ebuild 756 BLAKE2B b094210b669e4c94bd96fec52f229b6c291bb58e31ed9ede4c12277d42e122ec4c57b02f46df63deb31775595874b77a36d0fd1190ff5c6bc0947f70e6f27efd SHA512 ea95483100e4f64d0ccfaec5020ca5e4fe7ccca1ad94b7d4781cde9a8dd71c0a5cb7687c2bb63df8c5b6a5793e3c2066f562e87839a7ae38e47f957998f9d31b
+EBUILD pkgconfig-1.2.2.ebuild 705 BLAKE2B 4acd0027aa2cd3f3a597b3f0f490520a063c22c202f83e5a9970ad68f91701e9c2fffbc2473b4d589bb1037be9ddb4a54350844cbd8c9dc4745db587585805d3 SHA512 a619e02a08ba309a2d4979c67813776a41a54c3366f2ba79b7c73f22b3ff9e22587c3fb9fa1c614ea8a016499ba178a0a87febb1dfdc3bd9e63f0c8ccb92c0b8
+EBUILD pkgconfig-1.4.0.ebuild 746 BLAKE2B a70d3d536ffe1d0508f38d57d29a44e7d8d352a0ff2d04fa469c8612943b0d59b3cfae1e823a2511e47a06dec5eddf352ecef8bd41feb536da29d363c23ba68e SHA512 b7b2e514c1277e857f9a824fe1bc2e8e42961c1583a91cf77116fce4c8b470c0914cc01fce5d0a9268048a7074b9653ec6c4b7705be43cb9eba8a1ddabff7bb6
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
index 5799dae24cb8..0b92380a0b9b 100644
--- a/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
index ce3dcb6f80c0..7efac550a2f6 100644
--- a/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
+++ b/dev-python/pkgconfig/pkgconfig-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 4f58f0bb4a54..59b67306005f 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -3,5 +3,5 @@ DIST pkginfo-1.4.2.tar.gz 33539 BLAKE2B d3cfc6bf7a9e748902b1f63434c745d8abf4e144
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
 EBUILD pkginfo-1.2.1.ebuild 1390 BLAKE2B 51c58d39105d699358a23b48a0d6f7cd54b5ef8ad04a8e4c3997ed29aa95849fde781e271ca27dbf48d0fcfd342af5a6e80fd2c9759d504b68b8353a451856af SHA512 add429cbfc58fa8c76e240aba93b75216e922542d5def681afe09eaf71e308a8cebd58be4d84eac0d625c2186db2b1ae8ab4a1033a52c67d1e32f211b3056c12
 EBUILD pkginfo-1.4.2.ebuild 1343 BLAKE2B e3cd6deed1c90e0f958bb80f2a3c7f92b6c8fae552bd69cd6d8d9e874f9f3c0890f68a889c81a0fd558a2327135fc1ddfccc031e948554a121c639435ddf5a65 SHA512 493cea3662910927f3d24b33e3214d9a46ba99986a34ad5c656cc3b708c6ab8a2a08021f4cd3d3af70c41d4e71df15f1ac2d3aefeb7264d59424eac1736bdfde
-EBUILD pkginfo-1.5.0.1.ebuild 754 BLAKE2B 8e49ef9fd66b2389313031c5fbe67d8de14f167455bdd9bee174bdbec4bccb2fea333362ccf91ad66d17c13dd76509b21104f848f8b0290618fe7df2e8a5ea9a SHA512 5180b149353ddd279b7887d82d972049c4f5e8a1c54bf18228511d17b024108a9042356b42002fc7c754dbde89741f93f7accfff0e27c66ee7bc50a9c1fd2f7a
+EBUILD pkginfo-1.5.0.1.ebuild 767 BLAKE2B 994e542a1194bac616a3a37b3cc5e3033acbcbe4ac1216b2243437525f7a967d3d2771ed24ff10f97a1ca15fe94badb3ba185985e3376e88ba7b0f5756bdbc0a SHA512 b418abe9bec915c087e55c33234699037ca5a00e4bff3a0a6b3f3a9d9ae075d38088b8f3984d7abd2df9f0a047f665b7a6f550cc399060f1cfe4ee5a93eb9c28
 MISC metadata.xml 320 BLAKE2B 70ca2a2666e83f11a892b1c3e155512ebb6992f2b02911aa86609ba66ac72ce4c5af72acf513c92b6a9d542d510379ed6963a94a4a1e16d0909c2461e8b6d5ee SHA512 8f2cf51568e86fb0ebbaf5eb2476f6c7f7121abecec606626aafe5395b2e9530009e77be890d389daa563b6ee47af311cbdeb121518351b0e99da0c591c0502c
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index 185725f25774..d7bd3378bd48 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/placefinder/Manifest b/dev-python/placefinder/Manifest
index 44f5c0f4be94..4fb769bcf60b 100644
--- a/dev-python/placefinder/Manifest
+++ b/dev-python/placefinder/Manifest
@@ -1,3 +1,3 @@
 DIST placefinder-0.3.tar.gz 2632 BLAKE2B 26aaa5ad6ae0090d909841be4793df2cb632c83531873f3e98ee30d62543c27bb8bc61abc86077146c904cac4782bd05c715ee8f191c8d307a70e38fccf68f3d SHA512 dcff0ec0e6a1ca361a726bd5996095855d289f0780238aa0371835821294799f13c49919e0966495a9f77b5ea18b3be9deb5d2b5efd6ce0cf8803f13e22f6249
-EBUILD placefinder-0.3.ebuild 461 BLAKE2B 58dab5d064fb3962acda6d3988eec580b2f5643c929381315ed667dbf32637d336cf1953302547a7a99c5ad33d64e9bc73be10d997dd5360f361cd07421cadb0 SHA512 96305ce0c2093ddd76944542e63458551b16abe16f4f7cd61217eb057dbc8319d6ea44ade216b4dd0d7a5b32b1b38fc3ca76f028f7eb2626fc67d6c2df44dd0a
+EBUILD placefinder-0.3.ebuild 455 BLAKE2B d8e741992ccdf1f4992166f5c10e6c0a864458323463067fdb5c16cb310d9f5b8de7e0c37a30372a964a6b1554f53113f253ca0ede6577e8f38d8834dac9d4f6 SHA512 8fc113d94693d1487bfe8853f90af5de617151f2c1cf08162092ecdbb12b825e4189fdf0b341ecd27d99d83972b4f311e7fdb145e9138815fd0ba65f42d25cf8
 MISC metadata.xml 395 BLAKE2B 7b747923612d66d63dcc424fb5797e14e54cc098e0a032353aca6fc6357b14a849a53feb57b8df8fd8a49778ec5452114810b0a01b960ad36c5b6bc045c97deb SHA512 90d623c763dd2b3948ee444bb88221ca64b38b5af8379dafcaa0f267c4a89cc6620f8efebadbd414be8258a5d21cf437b3b4aef263d9e059b155b7001b7878cf
diff --git a/dev-python/placefinder/placefinder-0.3.ebuild b/dev-python/placefinder/placefinder-0.3.ebuild
index c90637b8c12f..97a3ca1e6fc8 100644
--- a/dev-python/placefinder/placefinder-0.3.ebuild
+++ b/dev-python/placefinder/placefinder-0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index aed95da0b2f4..b39b1b200105 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -9,7 +9,7 @@ DIST pluggy-0.7.1.tar.gz 47784 BLAKE2B 49eb28779717ead8963e14101cdfb830feeecff75
 EBUILD pluggy-0.11.0.ebuild 848 BLAKE2B 80958b043b2d88b8809316134b1f36cc3f7398127e835c74dc35e7663f9b6321aa32aa9229afe7e6ae94f1b58d8c3cea23d3b3b611542e325f5ccbfdfa5a722e SHA512 37da9447f756ad570f6d564aa4ffef38836e0cf350ce5559eb809a137129c5fa95b774b98618b5e7520f9cfda027f2455a5cf71af57592ca32cb837d430833f8
 EBUILD pluggy-0.12.0.ebuild 783 BLAKE2B 301fb765ffb292678892339680740150f60e7f91f94513be75c230065f7ae315dadbfb87db89356979e53c9099e951cfda2508ecb6877495d23d4ac5a67f93dd SHA512 958411a70cd0f5f7a0d0832fa5cf03e6615d0446f34727f757af4934cac58a7e1e46322988467712738044cb9ddb56683c86c4a43f14f1c09e646325148750e8
 EBUILD pluggy-0.13.0.ebuild 682 BLAKE2B 9bea1507d74098933cc7b5c965d6dbb288f6f469ec63a5016c327588c2cd954bfb43fb5424c9ed69b9cd2faba27d8383cfd8298d1d9173272fba9824c9af9ce6 SHA512 57390c7578d981a2c51a0d34734b82154c0f521d0ebdc8408688b0e112fd09430f4bdaa021664acbe352f844abbaac4b05762e0165ebc665246011eb6e3316ba
-EBUILD pluggy-0.13.1.ebuild 686 BLAKE2B da805d0d68fcd46ec835f3c88a8df99a28595babccd4e25e217bde2582559011153ee5abc45a9a4cfa5e25933f04eb4908c30573bd803a2c2a814a2415afcaa7 SHA512 9ea9b9d8d3c4b6502b5fe7bb1acad3ef3bbf880c8c3efa746e3515b4e7805c2684a9dde6fda47d28dc556ed020aed797ef0bd7480bb28af44a28d5880c4e2a91
+EBUILD pluggy-0.13.1.ebuild 699 BLAKE2B b1898b603284e76c819f5043060626183e60f83f25b7cf2ff2194c22216d5674697740c0753e22c7cadf6339d8786540af2751d5aa6a3f1ba49d858800ef12e7 SHA512 0365ea7c34615f45db6d78cfe2010d0e781320e3bca3939b59a1c7ae6183cfd055517f026f6a37c3edea268d25fe1a137ef8f33f252c37792b19b1fc726298dc
 EBUILD pluggy-0.5.2.ebuild 747 BLAKE2B a43222708244672057b0f23181efbe8e6c346bca2fef9c3743fc62958fc988cfec44d5d6ecfc62aa77c88c42a8f3b5191e555ac672833c1c9d6fbedffe4353cd SHA512 3fd3be31eeb2603766c4c4f023350271ac89cc663ab4308decdc326f7376069fd2227d31ae2e6d0f530e64b4c29f05dc13dbd6b90e7d37e7b05c88d9b3801cf6
 EBUILD pluggy-0.7.1.ebuild 915 BLAKE2B 665e09be07910cd939fd0ceaed043c78a29a0458eb0b180d2ba283544b912241ab8d6e0b308cfb7bf225285926aa83bb3045a289a1e4fa799b19c1f6a98760be SHA512 4e5414f177bcbe529d0e122f8d57ea08c860f356d91e99cd8a787826163ceb97bf36b21e6e9fd045b5cac6182bb545119be56b426a989ebe571e8a98526f13a0
 MISC metadata.xml 444 BLAKE2B 9b0b62a0670449bdfade395d9766e192088182f724deebd2a2ace8800ac5c0ff6f37da7174186434f727aa3bee08b9416e6dafae443cd01e01baaae741c899cb SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50
diff --git a/dev-python/pluggy/pluggy-0.13.1.ebuild b/dev-python/pluggy/pluggy-0.13.1.ebuild
index ff8971cb77e3..13a1e3e1d4a9 100644
--- a/dev-python/pluggy/pluggy-0.13.1.ebuild
+++ b/dev-python/pluggy/pluggy-0.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc64 sparc x86"
 
 RDEPEND="$(python_gen_cond_dep \
 	'dev-python/importlib_metadata[${PYTHON_USEDEP}]' -2 python3_{5,6,7} pypy3)"
diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index b28a05fce72c..920e0613f893 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,3 +1,3 @@
 DIST pluginbase-0.5.tar.gz 41964 BLAKE2B 84fc187b60182f100a9016ac663856b29587e60b5ef5ac9c51fb4ed99666908a77c9817c2dc5fb64e82b807e635bd10beb5ce7644e31e63262736cc667a7b8c2 SHA512 921ddc7dacb6ad63abc90beb1d1d993e7b15c9cfe21e850a5852eb40735436e08b39fd2a6d83e23f641014ee81e718aca147ef1e21b55f94ce04a64ba7780455
-EBUILD pluginbase-0.5.ebuild 945 BLAKE2B d67d8a3db8f98f087b173dd1d969d1a8829643016211038a62161d216b2f435c848f1d4cf204ab0470c91144203de117e6b4731ccfa81ab3ca510c09b1648c9f SHA512 4f99ed51d75fcd3cef15e0da3f64316c02d88fa98a16188c45e6226e2dcc0786595b02def9e5f59b5eb8581bc447b9f5a7550048984f8fef0478c6c5523a9bf9
+EBUILD pluginbase-0.5.ebuild 935 BLAKE2B 27bf1cfdd73c8264d07f7a4934ca521699192b8908335201a87eb56a12d3b9230f5eb4df407bb69621b24ee21fe02d6ecb72c63c7c9a4c631fb6801ca6d4b3e3 SHA512 1150ca5bcc39e7ff05ab78687417663ae1ba13fcba7f701479605da0162ba84508205e2c89bc50a9298c0c06c0adab1578cbee914532ae2d62555b1a0875699c
 MISC metadata.xml 385 BLAKE2B 0b58f71f7f6e816ba3b2c41212f371d37b0b09b38fc69a1adcdbab7a4537f9e9e7c5c0d9505e5dc72d219f30aeb5a3739c7f58bf4927f75323bd2b34e25733dd SHA512 166cec1bf4ad16e00b937dca860dedef5f8f766c1e3edae03dd29753ad9590843601723243e702344d1d4853b4d1a87c9c0960f9b70ac3dd4ad40995333516b2
diff --git a/dev-python/pluginbase/pluginbase-0.5.ebuild b/dev-python/pluginbase/pluginbase-0.5.ebuild
index d01c4571f584..1269425a52e6 100644
--- a/dev-python/pluginbase/pluginbase-0.5.ebuild
+++ b/dev-python/pluginbase/pluginbase-0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/plumbum/Manifest b/dev-python/plumbum/Manifest
index 7324b338c25c..c90a66db3334 100644
--- a/dev-python/plumbum/Manifest
+++ b/dev-python/plumbum/Manifest
@@ -2,7 +2,7 @@ AUX plumbum-1.6.4.patch 1521 BLAKE2B f65f963fbba8f8e585b8bcaa99f3cc377f485867994
 DIST plumbum-1.6.4.tar.gz 88041 BLAKE2B aadd929fc6878bd49ac3169b1b4235140d08ff452eb5eb61e43f9ad869ea867916d76ee7f2befb68e67cdd9d9b19c364d6e02810866f6ba5022cf7064d240786 SHA512 26110741251d75ae9b47f522aba38e8af7a658d22900b1487b3f6e4e6971e4682283003e674f40345e14dd4103f6d485fc569348cc1245ac0440cd04688abe99
 DIST plumbum-1.6.7.tar.gz 90911 BLAKE2B fbd7399962288826c9b1aa9eda60e93d2257b02c8d14adda02cd1c6a895941b0adda8cb844b2137e3235dbf5ca7ebfe7e272d3cfafe7e3df8ab3668be75a4fc3 SHA512 70a80a77eb64e483cf0444745a4c05c8599711ea578a61fe3969edceba4a9f68ca226c6d8cb65995ad36f3d6423326af887816c5ffd337f20279dfff47cb59b4
 DIST plumbum-1.6.8.tar.gz 309449 BLAKE2B 4112cb99852ebc7e4465ec54bf35a1352ff41a7ac084d3561d23f6da62fb1b25fa65a1f6f118564a677e6b6fde57b52f964a07fb71cae40b7d831ceb1505738e SHA512 2e834b6024ed1892eb91ede95f70641288a76911d58fcb24edaed59d3e54afa72e0533b4510896ecdd5077f70d4d60d9ceb06510c3e6d469afb1befae1961af1
-EBUILD plumbum-1.6.4.ebuild 491 BLAKE2B adad559078aceb34d72a23426fce44fb93126c211abbdff3d6016a5cf7210b8820290d100309ab74718d63fc59ba71570f847edc851160fcfa4d86e8ed4e73a3 SHA512 63d8eb1a3803e78bb9289fc617a9b9a3cc5bee8d599227404261e6849816b32a6bdfef3a6a0bed1fddc4de3e93b5ef43ba2574b01405554fb666cba96429c276
-EBUILD plumbum-1.6.7.ebuild 460 BLAKE2B 73ea42329dd29b727a8029df84f06f7c62283f267bb9b79065c7cf049c7756a4dfdf71255bc5d3fe69c677c3540bcd75f531dab9af14bc3bcdc7c94a332a213c SHA512 be94a1adde03124dc575fcbbc2ac2468d58a8ba05c05c7e7f858db7995fb20fc9e197b24c37d61b5b42fc7155cbd781576c9a25dd619b09eb67e6337d81353f9
-EBUILD plumbum-1.6.8.ebuild 533 BLAKE2B e9dd14cfef1018a2be7a3d1571f61032d3b92e02802c768fe13b6a04792d6c02dd2a8422e7a1e58a8ee3620cc9104f3ac0027512e44acfcf937d877c7ae1abde SHA512 411247e3f83b1a0858ffdb0f6fde72568fd6f712a0cbedd614cc1f010ba251441ed271c6d5f11ea0ba5568199875cd8c99d65604fd891754a917815397505f2f
+EBUILD plumbum-1.6.4.ebuild 481 BLAKE2B 89b712f2c90dde44674014302cd04a6a3e87c9b2d38a0d37639413b7acb3c56924edc0c4affc8697884c3c36b1cfbb4b5e6b66e1c0cce1204560843f84622f09 SHA512 413e6e804c0d43c96ce713a00369e5ab9cc08999fc55e3fa8a8b0b9e390d6ee4eb5f91843f78736147abf78a4e3faf5f558f3fa5f4974e8dbdc3ff320cf48f6b
+EBUILD plumbum-1.6.7.ebuild 450 BLAKE2B 76d83c632498e1c49624cd1ce18cf8bd3ba1f90e0813b82177751cc73a38bcdacf325753b479e631ff44b95474bfc9f139ec8e9d7115c756bc22f477b5f299b8 SHA512 1aed96a6de27c8fb65111d47706badab891cb84e7f091c9eb054bd6e2b250c6bcf6565acc7dcaa6aaf5b52f08957abd56354ba0c5ea69db3ba5aa8497afb264b
+EBUILD plumbum-1.6.8.ebuild 523 BLAKE2B 7ea3db4596e93a8bd221425fe0587ecc518fa805729acd118ce05cd87b310ade9e86c71aabd7065df4fe2c42b9ee606c9dc19b9457592db7f0514f5fa56f7c11 SHA512 f02f6d9321594ec7efa31b8b75753110c24e3119cf4db7ea95b28d5b98b2a3ec6a4274237ad9b85cf73912a105c386cd2d5c8276466686a2e37f1836ef995dea
 MISC metadata.xml 728 BLAKE2B c0f017b6d1dd00480dfbf37aca4f0326fab5f1bcb2c822709b1151521723450528c87873ca098af4f1e7909bb8434451da0d7cbd1ca1494aebffe932f3f8f498 SHA512 1dcf9374ca209dc5ae11fdcc58c9c7493b77be98d0d3d80953e2d0886cc1ba053fa5ebc05bcd4d5b14dc15a070b3df2bdb8c7056cd482bb21cb9901b372cd402
diff --git a/dev-python/plumbum/plumbum-1.6.4.ebuild b/dev-python/plumbum/plumbum-1.6.4.ebuild
index cb4315b1ba22..5c555acbc6a2 100644
--- a/dev-python/plumbum/plumbum-1.6.4.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A library for shell script-like programs in python"
diff --git a/dev-python/plumbum/plumbum-1.6.7.ebuild b/dev-python/plumbum/plumbum-1.6.7.ebuild
index 8315e0d456a8..8c9190c667c7 100644
--- a/dev-python/plumbum/plumbum-1.6.7.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="A library for shell script-like programs in python"
diff --git a/dev-python/plumbum/plumbum-1.6.8.ebuild b/dev-python/plumbum/plumbum-1.6.8.ebuild
index b4e2f4a61f2d..24627182d1dd 100644
--- a/dev-python/plumbum/plumbum-1.6.8.ebuild
+++ b/dev-python/plumbum/plumbum-1.6.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A library for shell script-like programs in python"
diff --git a/dev-python/plyr/Manifest b/dev-python/plyr/Manifest
index 4fcdc1b1207d..49e9b433b9f1 100644
--- a/dev-python/plyr/Manifest
+++ b/dev-python/plyr/Manifest
@@ -1,3 +1,3 @@
 DIST python-glyr-1.0.6.tar.gz 42952 BLAKE2B fd95ef9fd01788c6f6526eabb77cc2c93bd28324066cfb1a4be70a5990bb1599e57e40d607f926a7216c582389e9763bdc92fbd411cdeef52aa86e1ba6138c83 SHA512 c4b04b1379116048f78c3ce5f9d30c92fd0d7198bfda456891d3012d115b86a5970595d9b4bc1d43028e87c9d467c35a7d02c7f3a9f4670dae8a17c22d1ab58a
-EBUILD plyr-1.0.6.ebuild 1284 BLAKE2B 53ce277b9b995748764f321acdbd095922bc72c09a79a98c02ffbfae96c6c9583b4edc7ffc04884778972bfc8ce29323f379b4929a21f6cdba767b09b910f033 SHA512 45040b941d24848562161f9c84870302cdac2d32775ee3d808833ea5e42f9af148adcff1843649ca36a4abe91626c5562c308a9ce17f1d00d0820e50223bb19f
+EBUILD plyr-1.0.6.ebuild 1278 BLAKE2B 042c958dc4d11eec97d455c826be4a3a6e17d0da533472af6959529766ad3621614e0e7fb6e43c66e27c74da6fadf5844818e9ffb27f0b2ef7aceabf2f6286b7 SHA512 c5505a64f16c0ab026a0457e05cdce9cf94921f54f55bf7a9c0c04065b0eb9a83d957569b1bec233726a1faa0b159e23dbe04b29e9ff64260850828c62391545
 MISC metadata.xml 323 BLAKE2B 6697ca93abe56cb6d2a14920f307f123527cbf570ccae070632877253ffb1dc5dfbfa013f4618b8cc5f22a3c76f5e70654808825ec31d991e704303fa5014f6b SHA512 11f94ab00c03b6a45166db720c0fa897e03fa0f5ecc85a3b824ce51309b672212053b9d7ea703e7f3400501289324b9c4ff6680668c1b6dafe0d009d6265d451
diff --git a/dev-python/plyr/plyr-1.0.6.ebuild b/dev-python/plyr/plyr-1.0.6.ebuild
index cb7d843384f7..06c9e7ac8b33 100644
--- a/dev-python/plyr/plyr-1.0.6.ebuild
+++ b/dev-python/plyr/plyr-1.0.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index 745ad69cc7fc..7bdf22ec2c09 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,3 +1,3 @@
 DIST pockets-0.5.1.tar.gz 18437 BLAKE2B eb2414b05f7843f8ce253cd137aac087daa4839ca4b16ce9d6f1745535d3687a5bc832abfd6597a6761c12f7251b32a1007e5d34434e0f54ef2c7a5873756f99 SHA512 f0ae52e2260d83ea76acf8996e901a8f1868b578788b9e98233d92850703ef98e3ba18beb4e7adc5883c8d339ea63a8c4b95203ff40c2521b2179fd87cab1391
-EBUILD pockets-0.5.1.ebuild 596 BLAKE2B 0c3a99b058d1312d716f07cbd5ea852c1af22403737820491e58b9926cdfafdb0caae189b90201898cc4558d08180bab823c3b314ff8ca110ee86294ab66720d SHA512 067982c3bc34df162706c46e7012347296ae7fc7e9a1efee31e3e02ec82d74d56d8e4fc3e09ab3d1fb9ed624dae2ed4f8d78dc3a4900ca2a761f10f3190019d1
+EBUILD pockets-0.5.1.ebuild 586 BLAKE2B 45d03fb4c8b688f425a44595050fd4398040725a120bdb6b7c97c55a3fac59bb8fbbf5a7cb5c9908896b08752462d50d187feb5c94bcfd96cf0fd531a749fadc SHA512 848d91cdc5339be2a254d0da6b9000e590d59ebe2a816a81986f2282cc0544ca01fb7c5c6dbf9b663b395af8ec3b8212e6371732d29fbf3edd3287b98cf9eb2b
 MISC metadata.xml 331 BLAKE2B cb17ecc8fb5618d45d09af9211028e4876b6523792f70d20df4104b9dc72f132a592ba961d2571632e34a72f213eff0c06e02d1700c82d4f46ca48ea9d9fc844 SHA512 70933bb4063959e5fa091a416ba3aeb6e8540e03263fd8cfb5680165200e2716a90a19e03afbd9f746cd7ca7673bf309d47307c7e2f49b7f2609d77de65ed4fb
diff --git a/dev-python/pockets/pockets-0.5.1.ebuild b/dev-python/pockets/pockets-0.5.1.ebuild
index e55b2b784964..abb3d627bb98 100644
--- a/dev-python/pockets/pockets-0.5.1.ebuild
+++ b/dev-python/pockets/pockets-0.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 1c39fc999b89..741065be55eb 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,6 +1,6 @@
 DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
 DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
-EBUILD portend-2.2-r1.ebuild 746 BLAKE2B d5fea8d4aa7c17b6d8a0ce182481d53d439a77b037b4f1fee29bcba0d3b9929b942ec3a63e2939d40475cb056ffb49c8390b76e1f9b49e1fe679bcf778c2c25f SHA512 038b9c2712a7c09b491a88ccf37357583ad56941a883278477218294e88b2303b3b295c78a8f7f17ede15adbcac7a958c32b140c19307f156117c01b4515bba1
-EBUILD portend-2.2.ebuild 734 BLAKE2B 05b051d555a641392812f387afdb28a37a1a319360cad1b7ae5035a04734f4ecafcf6c672a9b8c8f025307694464677373867914996d45f1f26003888f575470 SHA512 4660eb9aa963c51bc24139058b016f6fb66faa27f4bbe54f54ef4c2024fc348da0e0f51b11d26d028f365ff8d944e6f2bd4c6a061ff0cfe4dd56be9eaed953f2
-EBUILD portend-2.6.ebuild 980 BLAKE2B 9175026b8e611741ef219791f9f32b17e23f7e0968435411c3c7bd734d0df5b05d3c39ce27ceafd7492a2486bfcb0f6e4d19b2c9677eb6c6710e45e8b65692a9 SHA512 593f310f6e45e8be0944af11268ee28e9d416ef7661025222f7b19ea477120be3f372c42141c686ad5ca9c984aeb9c4028c7f897cbaff3995b43a085614807bc
+EBUILD portend-2.2-r1.ebuild 736 BLAKE2B 00a63fabdc3cf92c50156032a80229973ea672e6af7e2f19eadaf98c59191f83ef9bff36713fc2b0ebdd2e7d4284ff36b092970d25f7d1fc1fd3589044bdd3c7 SHA512 5b9f3aa26a2c1a4dde04c66667e533b90c838f2891bc735b1c4e71815d23eda53f0a7894f4c7934dd5d51e82290689df51afdc4fe0e1c89a08f7e8bf939a3315
+EBUILD portend-2.2.ebuild 724 BLAKE2B 7bc9a61eff96b7022f2955b1ceb2e0cf97a2c06d6fc98c705466b78d0cb98386450494b32edc69aeca5c0e4acac983bd16e1947d5d4288d872feadcd0300d6b5 SHA512 b3467251dca33ecb4bea2ee14b0f5a4d54191dfda91558463ea514922368c303704549c80fac20ff2a249884e4817da4981612aa29d10cb12afa3fde8f64d96c
+EBUILD portend-2.6.ebuild 979 BLAKE2B e6604714617189e18464005d0548e322c6cece5a6f60af5475540d85417c5876156834c79d9bac2e4d9d1a4d4ff05d1dcbcad01e4ecd9bf2a914506fb153e147 SHA512 91e1beb8d49e11e06370acc9b6c697e651cc660e325d10955e285113c743655f55d251e5c0d1242ba175e2bd32078bf9c7325079626089b939d953c667fc7cf3
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2-r1.ebuild b/dev-python/portend/portend-2.2-r1.ebuild
index 3ebf5796b8cf..6de23cc51244 100644
--- a/dev-python/portend/portend-2.2-r1.ebuild
+++ b/dev-python/portend/portend-2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index c789204db463..7df3273e2ae2 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
index aa8f2d39e0f4..535300f24a2c 100644
--- a/dev-python/portend/portend-2.6.ebuild
+++ b/dev-python/portend/portend-2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/positional/Manifest b/dev-python/positional/Manifest
index 1a15e816ee48..9993720df5f5 100644
--- a/dev-python/positional/Manifest
+++ b/dev-python/positional/Manifest
@@ -1,3 +1,3 @@
 DIST positional-1.1.2.tar.gz 16434 BLAKE2B e54e7e7ae0543780578272705ac6cc27d6df0bd29220f3ad2cf6f850972b6d5ccf7c29e81f889e06d3f718664557ce06a0fdab1300f4d423bd8c9289f4dbf374 SHA512 864f6c505edea1a0639a97aeae554cbb9cf0141c3c175b836489b6f258d53f6d306e915bd75d6cb7c61f6eda9d36afaef1fdf0cd2f8afa61a6e797b1c81c8cb5
-EBUILD positional-1.1.2.ebuild 607 BLAKE2B 8472422488e707d2feeebab6c06e3dddb16f8663543fcebcf8f0a59eade244537f44e7233a48dd9f4840b00b781a94fab751fdfc6984abf6793fb8451c8bff74 SHA512 f8757b6aecef9776868edf0773435622a7bb3cbfa629c84b63e58bb75050f5631f125eb76f4de27b5c54939d15920496f05898e509ffee43c1fecb617eabec17
+EBUILD positional-1.1.2.ebuild 597 BLAKE2B f405f4d1defb3f944eeee7f6ab4fd2057c506a32cec4ab936a54e9f0657d5c7ec94709ee351089afb81444687e70b202360d500051eb0f95029b598964aa94c1 SHA512 75ec922a235aa7f0ee507cd9b6959d1e5c5b0146a20b267981583e2f0bfad0c805ce1523e74d800b4f2374ba852f7edc2a3815c35387dea7bba0f757abf4c64e
 MISC metadata.xml 513 BLAKE2B 938c5bd1c134e441a40adf90891709ff5b33172d402e221a70855635d6759c5b9f31d92266e5898d1f30736d8b6b1ea3f0d435f1a745412f51da4e754c826d08 SHA512 3279a282ce690d0025b82a1ba42298304fd375388afea2b7cfc0981da82a78002077df6c8b3cdf8d6b857872b97e25a1f37312cae5a473fe12f1cd6a50ccdeb9
diff --git a/dev-python/positional/positional-1.1.2.ebuild b/dev-python/positional/positional-1.1.2.ebuild
index 4a97388ea26f..d8e538d5d00a 100644
--- a/dev-python/positional/positional-1.1.2.ebuild
+++ b/dev-python/positional/positional-1.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/potr/Manifest b/dev-python/potr/Manifest
index d7c7f300bf0a..65dceef0bad1 100644
--- a/dev-python/potr/Manifest
+++ b/dev-python/potr/Manifest
@@ -1,3 +1,3 @@
 DIST python-potr-1.0.1.zip 30200 BLAKE2B 9dddad5cc902bcbdc5c674487e9f75d50dc711d9e2dcb24bc96abf6638628f22cd50ea2674efc2079e904668eef5cc92accce707811f922beb1453c1aa636a0c SHA512 d38f2fc68ce9f72ccee18923183f8640ee51f079da1e79e1f2f22e37383c99da7a6336a8538e28bd90b483fe8e227956ebc052e9c03aa6d7b49e9fc4e8df5281
-EBUILD potr-1.0.1.ebuild 591 BLAKE2B 278181ba7bcd2b7d8156a471dff2feb11499ced4c125e71591d616555fe471bb73e878c225a9d1679ae80df2ceaaa5714abfc8cdac2117a0d383cbb66b02ef13 SHA512 32a44d0966a355334ad8fde07642a251f93cb3bdfd6ab62c510339aa0d5810f10841eaf4a3a8814cf9f428ff34bdf71cc6b634c61b38a80e7a27f564a8cab336
+EBUILD potr-1.0.1.ebuild 585 BLAKE2B dbf9cba388362374dadf5e1414c12d5db53d414d4405c79a7b2872dee46154b47b293cfb7f870dec4ed0593ddddcb86af671780ff21b14040d5c3e97bc66cdf1 SHA512 3349ad0f3a4d9663fe2f4c15b021c326653f610c8b88b8d23503dea9de525390332bb7f5568417e486bbe8b18abd8a71d4aeb77b624f3a1dae3a1b7682cba2af
 MISC metadata.xml 515 BLAKE2B 4d576b7dca605ae1433a370cc03c569ebc3d27991e59ed75395100f75f787c3d5a69bb6d47f4b4fef68aa4f4b1a5a8b3fda4cbde678c1de5b5504df2f51c620a SHA512 3cbc182032fa1e1d868fc1348271840feab79629611316eb3433f11500552c57e1a04cee0b333f9cb6edfb93f9091c3aba25750b64a18ec62f59c5d4fc07da38
diff --git a/dev-python/potr/potr-1.0.1.ebuild b/dev-python/potr/potr-1.0.1.ebuild
index 119fea031ee7..af7c1eef0477 100644
--- a/dev-python/potr/potr-1.0.1.ebuild
+++ b/dev-python/potr/potr-1.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 MY_PN="python-${PN}"
 MY_P="${MY_PN}-${PV}"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/poyo/Manifest b/dev-python/poyo/Manifest
index 291e2892d355..41fc4d1976a5 100644
--- a/dev-python/poyo/Manifest
+++ b/dev-python/poyo/Manifest
@@ -1,3 +1,3 @@
 DIST poyo-0.4.1.tar.gz 10960 BLAKE2B 0020e10e3d29978398930a861352138bc11c491f70cae864618734a1382470a7df6d865de89bac144535db391022748559db874f6325e64430abbc3ff52420f7 SHA512 e2dfc504ec9cea8e43363556b875f9b01fbda506ee8e70916d4a018941e4e347a4e8a78a245f980b9c41b20731948fc9e5e131b415856b31593e44b805acc768
-EBUILD poyo-0.4.1.ebuild 534 BLAKE2B 165ab04920da4bd4472aedf04fe14dc17c7b7e93b10f2731be464edc4f6641fabd28dac0cc6a591e9677fb2e2821ec37aa91549a22ba2b67293f29ed7c710ed4 SHA512 2f8015128feb33c67fc48ef69b557d71210cfcbb54e8c414a97a16809b006b13df49e449d52e4383c3be9270500ccc1d41cffdc76efcf5234aeeb4362a7e5d47
+EBUILD poyo-0.4.1.ebuild 528 BLAKE2B a299ea0f8c57ad6127e14fdbe342113d60d24544d25478f6651167d5f6d8d2b30667b25983c883a63584018c5ea86b4e10ee630475e17259128b3849d27d9b31 SHA512 b03ec17b521e41d175b2d1e7cfcb7fe4236d2cb77141cba188af42d4509ab039918433b590b02ea4a73017a9a7b0863ca5f4b5dbc4ee38820de99f405f6cdf23
 MISC metadata.xml 361 BLAKE2B e2dcab94df2b6bc836d19fa5a7789279ef28dfa42ba1ca36f7c88fcfa461cefb2de49245fd9d94789b06f5560ec8d6b0b0d6a737cacdc4e1034cc211a468c3e5 SHA512 b40df5a8d22697185ef353c30f046ebab34896e43ec3e6aac1eb3c31396b051c026a6e76b00799855953a0f4393103bc2ab95e24fb358b0eff8897293d6762d4
diff --git a/dev-python/poyo/poyo-0.4.1.ebuild b/dev-python/poyo/poyo-0.4.1.ebuild
index eb0dd7710e92..243b2cf344dd 100644
--- a/dev-python/poyo/poyo-0.4.1.ebuild
+++ b/dev-python/poyo/poyo-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A lightweight YAML Parser for Python"
diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index b726988c8820..ed1c5fdfd457 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,3 +1,3 @@
 DIST pyaml-15.8.2.tar.gz 16544 BLAKE2B 1e9820c172bb0c2e05c78f5dee3299c6bb0d83e2c658f3cd45322abac3404af1c9dd1f3b00e2c7b285cbd00c17d382c82cbb16b96bbac10021a0ca1a008d0287 SHA512 74f1fdacdd601f0b6f710457627e4dcbc42e7301fe5faa061d3e8d593842d6e5dd85041625aba576bba9cda2a713ee07ca3067221a720cbddc6dcd417fccee64
-EBUILD pretty-yaml-15.8.2.ebuild 776 BLAKE2B 1f8c20a0bfb9defed9f5a7b19ea52baff22fed87ec262d2fbed7cdc377e262b8a8ff2cb826189ed75718768715e35193b878f46bbb213e11ac34941987b3e565 SHA512 c204290537c5cc99334f7cd61ffa21581e8e864647cc6a0fb585a119a87f728758fa3db225b1717c703b1a9b2e9b44c8b142d47b4d1ee064a4231343441dc891
+EBUILD pretty-yaml-15.8.2.ebuild 766 BLAKE2B c35fca83c14cffd4d7bb46142312a1d28686ba13ca6bc078f96d273ca38ea78d399baa06b96b65029d49d5553b8870050487ca62dd4e20a6986b35323180938f SHA512 debcbafb6a52c553ea9c048ab0acfc6c0e578c332b97df3d3b05776bcef89fe084ea0b4217d51a146537c2850fb28a269fc76d68fa2c64133439942c6e7155e9
 MISC metadata.xml 444 BLAKE2B 522c0c3698f3c35b698b255504afbcda02c321e542ba7013fb0e3de4f57334b31ee014dbfdc8914dd2760a621ab1724a9142029d506d8fa44831726ae7c2b6a9 SHA512 70aee75c33eaa54fc003d6879ada0d4fc772d00619273c7b0e7c5829dcffb8ba23171c563e6e922504d9256f53ee207b36b98240bec3d084a8e6de15e0013732
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
index cc507c308569..bdc96b79b405 100644
--- a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index fdd72870f0d9..96a074c00b09 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,5 +1,5 @@
 DIST progress-1.2.tar.gz 4951 BLAKE2B dcbb6df423949292c865142b40a654f5ac78472a1d5abfca4716d7449a3140cf8c71cadc6691609bfb81a941c5db27719dcf2eba9f743507c7023f710782eb1c SHA512 bd09e63a1cc1b24260b66e6f963deaeb6da87b08c376a4e2da179badc23eeb3e9ca213872d1da8caa5e2475cc1b7bb2022389bb8d7f1c9e1ca8f755406648116
 DIST progress-1.3.tar.gz 5300 BLAKE2B db7683550ac19e2e11832c8be19971fe07fd58d6077e5fbf585178e1353aca1bf873affdcb528182e7856cdb2f9c342c7caed74e7914fbebde2d803479258ac8 SHA512 e94ac3b86ab5391a348130fe97a1bed9c42ed3625b4436b84080f677351a2d64b56e9ebafc65ac6c598ffed825413d30bb0d57210a7835c5e5fec82278b37076
-EBUILD progress-1.2.ebuild 677 BLAKE2B c6053fa7e7e6e78c47de8c17a030dbc29237c1e035b8a542937031f58b24fd7e009a71fb2a750545761c8c289d3d267d98e114549805dd6a5739fe4250971d80 SHA512 c3a6aa866afb437ec61d5dd4276e50012b3e00c22019ae7360c63ef7a5fd5b93b2c91f8832f7fd1851c82df2dfd7729ed5f7300de4ca6f9695d9b9bed08183de
-EBUILD progress-1.3.ebuild 660 BLAKE2B f9002c627ccd7a23ed72b22cb0e41f424f5a5f6bd2335356f842ac90a0241d23177a4fef62698b8c9573141422be7d44e6bd97d59539ce24c0975a1cef588b11 SHA512 433e2750ae9ad774e9684d1a6b413c56d10326faa94a5506a3d1b80682f8ed157811644b1b4ab4585c0adca32beed7e4acc3d9504c689de1c01c1204aea32b7f
+EBUILD progress-1.2.ebuild 667 BLAKE2B 2e8aee6f9e082f1d0d41497c4b72e8fcffa934fcc1d2f947b227248927414c8af53d4016e767431ba83e4593edcd4c725c66e5845826f1007cfe974bb42f426d SHA512 568256ddf60889970c3758f6574c5b94cac042a238e75e8027ed1408e538d39dc8b280ef92f9262bf68bb5fd5346115294f243881355d0151d8adae057fa4318
+EBUILD progress-1.3.ebuild 650 BLAKE2B a0e6656d5f049907ac4f09620b98eff5c40f9edef504b60ef12ef53c8cc9d958f9256efcb3589bfe4844d6317ecc67228e9c82638b5e7919ae7d9fccebffb7df SHA512 0d66ae4c3357bbb438b2424a6d402bc7a0ecb66d91acf02c4a74299b83016282db3209ccedb09512e4f981351b6b9dea9838a1c485bc9b05180df37ca860abf3
 MISC metadata.xml 367 BLAKE2B 211ac3b5e167e316dfc7b36076e1dcaa32eefb4933f1cd4690119fe0de679a9fed0660e55d31ba12f7ec174b80d2b41513c9d604e2bfc832402794a74907ee96 SHA512 cb620893fc0f46e9de21d8adebe9cd8b4946152d770fc88a1417204dfbc2bf9ec24bcd43d0132977e1ffe47da72297d04d0bda8ceafefabf36021a7f796c65ae
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 15260cd42483..1f0d0c065a61 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/progress/progress-1.3.ebuild b/dev-python/progress/progress-1.3.ebuild
index 54d02e314e0b..98e739806e70 100644
--- a/dev-python/progress/progress-1.3.ebuild
+++ b/dev-python/progress/progress-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/dev-python/progressbar/Manifest b/dev-python/progressbar/Manifest
index a0e05d8abd9a..989e98b68c1e 100644
--- a/dev-python/progressbar/Manifest
+++ b/dev-python/progressbar/Manifest
@@ -1,6 +1,6 @@
 AUX progressbar-2.3-python3.3.patch 2646 BLAKE2B f381950997463c466fd65b9bf9b3155e67172488cbc436c13e6a64744e92aa41d5c7b592ce9a3028ef066c9cdce886f1736a573ca4f4d8bb5176f6327d79eae2 SHA512 8f6816119c01809f3116ade0d52188cffa86e59fec516343937e6a624fc077dd75906325a88f514568b0e61d262435bf9c743807df2a4099991e8e3bec804b50
 DIST progressbar-2.3.tar.gz 9420 BLAKE2B 025f2d42fb0ef11a2e4b974ba6a8cd44c48a7f828ec40a08347492d393acac46fa9c29962d39fe296af655e94ab2075885c73ed6953e2d739aeb6f5f0c0aa13f SHA512 06fdc8b6664642bd864be8023355316fba23bcc4deb0c5877c5dfa91da5d233301a8f39342f133cbb63f37a20de7b8b24910ac8073127fcbdf43b5200d60ed5f
 DIST progressbar-2.5.tar.gz 10046 BLAKE2B fdbef570f48a0c61659bf02b3cc4e0f64d9e4e2edda970edb79fd4aac5fe2cc1bd0a7421458100cab7cbfd3d9d8cf905774113e336ff2d687d5e06b04a4e113a SHA512 86a56a573b903b947baac98b26f88e40072603007fdf5cda3e4a7e797fe4c4c42fd1a4b1ddb1c9ca9a062659d3647c428e33949e2df9e20b0f56a9a4099de51b
-EBUILD progressbar-2.3-r3.ebuild 551 BLAKE2B 5a5c8d5e33d737a1391295c332f95b720a2d764aeb1cfdec34da3d0c9129f536b757861a03483c5ff72570734dee1129fa866ee648a6c0cf773997614af40572 SHA512 54d4afc4ec878c6f4e25d174b9e88c583774f81a51b7a7c719deedf0af10e7ae5339843a6e346ce556d796ac3b894c96c4ee3f7d45989382180ea4f79945880b
-EBUILD progressbar-2.5.ebuild 511 BLAKE2B 91ae4e0ed0cb6a422eeb46fd1731a29d320dfee15149f45a473c176297b44c94d2145b66a0bd7e977838befba04283c63fc0daa44e4299fed1b0ef84ef65f3ba SHA512 c1cbad2de119d243eafe9d276675673859a332cabffa82580e14bc5c29c8ce0c882551108119a07a0298812002415bf5d67cb7da6351f111084ddb033adf9612
+EBUILD progressbar-2.3-r3.ebuild 541 BLAKE2B 998ce3220649d842686ad2ad3fad8eea68de945d9724364b4cc569304d0874d7c8b536775440a19820ca3eb46eed76d80759732762c822877dc15584fbd39db4 SHA512 bb3b0a52f89a2e8711282ec3ce8c4f966dcc688ed59fb9ff90212b08662fc8eed364ac9f9f3f710f4bcf8ad46cd94c075b01a05cbff077545d09502c13ebefdc
+EBUILD progressbar-2.5.ebuild 501 BLAKE2B f0eadef7befc8a59e27392c059fd6eed8606b3d3624b3866ee454840e48de7b601009fc6d002f36a8781747eb14285963ff8052596eeb0bcb7f7d566951ba298 SHA512 70ccd4d89f76761b856ad715cdbe31533ea9f06609c9ddb1f6f9dc291f43b3b628ec6f8fef7968de89d38f816ae8df13c0cf39eaf19f0643dfd17672ae64365b
 MISC metadata.xml 324 BLAKE2B 28c39259d7567dc383b5f8e80cb81deb5c235fe9431a0a8dc90c7e35a80ff058c541c5f27236db96d5ecbd905071d8ad60a4a6232e31ef99786a0d847f674a39 SHA512 96cd08f27e9f075bacf7c3aa012b69642d245dbf7b99ced6a6cab24c2183c6304cef7bc25a44392319638d20233f9bb6256990f08c6eff60846815de35ed100b
diff --git a/dev-python/progressbar/progressbar-2.3-r3.ebuild b/dev-python/progressbar/progressbar-2.3-r3.ebuild
index 47f3f0e8e573..dc3af12b78ce 100644
--- a/dev-python/progressbar/progressbar-2.3-r3.ebuild
+++ b/dev-python/progressbar/progressbar-2.3-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 pypy3)
+PYTHON_COMPAT=( python3_6 pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/progressbar/progressbar-2.5.ebuild b/dev-python/progressbar/progressbar-2.5.ebuild
index b1d6c2d4302d..82abc2a78db5 100644
--- a/dev-python/progressbar/progressbar-2.5.ebuild
+++ b/dev-python/progressbar/progressbar-2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 61282704090a..18989af9739e 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,5 +1,5 @@
 DIST prometheus_client-0.6.0.tar.gz 60790 BLAKE2B fa8eaddfedb9598394fec0c6464499ed5bcace9969e843126422414e397d31985a44a626be0257a235f6d5f685fd8d6bb55fc0d92928f0b9729ab9f097f1958b SHA512 a2b92683f939961c567c266a54699de6f37088cd4e61c9d9a5f4451228b4c3bfa4c517e4a5187867f5463d726a8dc6e7fdae30973c1e9aa9aa1a03247b2e99cd
 DIST prometheus_client-0.7.1.tar.gz 62880 BLAKE2B 8878a6e6a20f96443f1f14ffbb74eda7dc6f1f48151901da047ade6342ddd7858b4dcd808d80af64a3eff449c1c7425f9eb9f3d1283b65e8e6067c6b5fe2f9c4 SHA512 84b145ed191c9903d390b152c72de4f2afcb4c500b8debba59ded081f00cc76109b336ed2d7783d59e9922ea2927632f7ef730f336974294b20048c51e9d58a4
-EBUILD prometheus_client-0.6.0.ebuild 747 BLAKE2B 15962b4ffcb24207ff0090f0a59537ee6ded0d23867d56e720a5648b11402545e3ed9a589c70a4598f6ebbc668392afb3eb7133386681c8cc1fc4b57aa84a271 SHA512 ce43e56a4dd40d582f32c0bfbace4a060d0e1b3e24fd33e3040ffc0e26044d1777430322cfeb2473cf8b505aa50ed17442ae45aaec90600b9f2e62859089e418
-EBUILD prometheus_client-0.7.1.ebuild 748 BLAKE2B 8762e5190e0987e2088545da00c30a8ec43269ebf4fff512235a0c2c8f47649771ce60ccf2a9ff4c939178e2483183c5939175157de1e1b47cf179d41cd14b36 SHA512 326fb660f5bca371faa2a43c3b17d64ee1374a21331b35acb8444083f984b5493904c3cffdba319a1465b054d37138a63248b703c2c61e9685fa2042715b7294
+EBUILD prometheus_client-0.6.0.ebuild 743 BLAKE2B 2abb84ac0a30254e93e976408a5d71740c6ba9f15abf06cb205bb896922495074e1ecea313fde3559202b1dd80eb9856be12f0dd0bed457a550da6fc5dcefd67 SHA512 55d1292a40621fd9c38d5f716c21934c77c54b8816a7ed9771c8a940b349c55619bfd3741502e79c668a97551ab6dc822f4b5389b66106eb9cc5ee1422b22cfb
+EBUILD prometheus_client-0.7.1.ebuild 744 BLAKE2B b4464b50901846ef178824b18bcbca396a5b0865431ebb26e98de6a481f80f156e908cefc09252e001ed46121bf6c40930dc2dfdb864f0bc0303a758df3da435 SHA512 8bd4dbf868a56e115ca086985e2ad1d3475ecf31d3a900659b066aceb15eb8d535cc002ef38b05e185177c0848ff189bafe1c65b87d0c985a504bac23d2400da
 MISC metadata.xml 339 BLAKE2B 19175465b43ef0c7b56a6241f5e857392bbffcdd12de70833ca0c7c0fb2815dfdf529553721cab2afda053a63caad1621c06508dd1f776511adf5be84cfd010a SHA512 887ce6ef1c7181d5c87e69085c6d58c324260aa7dede8259115131b367b2d60219537fe8b3366ce10ec8904c15fb36626e34e28e6dde2db120c8e20f80fc9d74
diff --git a/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
index dc6591f642fe..011f982f00f3 100644
--- a/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
diff --git a/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
index 6e9469df6023..3feae7277a55 100644
--- a/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for the Prometheus monitoring system"
diff --git a/dev-python/promises/Manifest b/dev-python/promises/Manifest
index 53e3847ffabe..4ec5fdc9419d 100644
--- a/dev-python/promises/Manifest
+++ b/dev-python/promises/Manifest
@@ -1,5 +1,5 @@
 DIST promise-2.0.1.tar.gz 26274 BLAKE2B 528d938ab93790dc57545eb0064a014ea293d782ff6a7e6eeb2287f23c79c9cf9b2427ad57df524a888193c5aa9d62b21bd1e533d49ca4c8f2615d5719be58f9 SHA512 2bd9ad83a3b21dd4e3ae3052dfe6705790fb6ec925e9607960d43d9329fea606c82f6806599f09e6255ff5639c936369f88601668cf4ec8944747b1b6676693c
 DIST promise-2.1.tar.gz 17974 BLAKE2B 5e1fc9bbed3af51812c43b1c13006037ada44404564a3064cb2e39657f6bb5dc0fec6d052ae9038439c60339fd4f4b5fa97330571398bf84243805b25ead94e8 SHA512 d4d5628c9b75f81fdb5d654a76e788df5296472cd73bcb8fd9a27979b8aadeb1d40a4d52cfed173341a5a97920132b00cee44d915ef640167127a249b5c0cac0
-EBUILD promises-2.0.1-r1.ebuild 953 BLAKE2B 85002ecc040fb6eb51d7bdb8c32004f72ae604f122dde5b14e3ee3ff0b18235d5f9d11fcac506836aab1961edff74a2a321380cc6a6c5cf7b53fccc560b42f42 SHA512 536c7c90806c04cb380958d2af99bf8e9e79c1e5d329ca912320df17c17120fadb71c5839cf04e63203ace47d448cc51b68eaeebe05216153078ff17d083dfb8
-EBUILD promises-2.1-r1.ebuild 940 BLAKE2B 8b6d3d9a53ace1b64269b459871908add48cc1358631ecdeadd0a26c7a299822edde2d8b535c22557d4b0d22c0fb33f7e97684e5ee1a13a35708eae81a077881 SHA512 31a7365f21fea5f27d75824eaef34e5109d211469c82d4b8e04711aaae77f6111a381805ae859936336c3bcee63999c49b02d1a70ee8c7dbb65bb996cfd84809
+EBUILD promises-2.0.1-r1.ebuild 943 BLAKE2B b03f47e80538f0cdc9e13038408bb56a755e366564fed8e6470d80268db731664d153a4f44a5e200a222b35b93eda3755d18b7a4ccdd1e526dba120c6badd05c SHA512 668c511cc1f615315427badd9a622c75e801ef5c66d9c884679c28fa68b724da254c3daa1e914744d195d98c5061dcd5efdf4749fe52c63f93f75436c4661b97
+EBUILD promises-2.1-r1.ebuild 930 BLAKE2B 47a389ef27fc02a36861d9d1100f977caf5b88f7a55952c51731fb48e7bd653b5173faf3b751afeefa3206fa7b49775d18cea560302e3016d672f4bfef068c55 SHA512 29b980e1a13368c8d5fb0c194c3d7bae6c8766b85753d9d6bf98d17597ef7ecb5011f81b0461c78f3d61732e3e31a7dc096d85a411e8a508ca2ed7bbfadcf34e
 MISC metadata.xml 393 BLAKE2B 68978c2f902a87b58c0a51587bf1ef734d6133e17ee3ce0b4239bb0ff26a1ee4a04ea18259ed2cf4efed561acbb8ce5a57ca4b35e60d85e93a5e4a5928a1c3e8 SHA512 e080ac2038f5e274a4cb2e395d1811755f1441091859a7c9c231f126ade1daea3725ced4253a32164ef5483e92756f9b1ddef05f2b866e9ccc6298ca27b2c019
diff --git a/dev-python/promises/promises-2.0.1-r1.ebuild b/dev-python/promises/promises-2.0.1-r1.ebuild
index 751d1b976e4e..a895cb49fe01 100644
--- a/dev-python/promises/promises-2.0.1-r1.ebuild
+++ b/dev-python/promises/promises-2.0.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/promises/promises-2.1-r1.ebuild b/dev-python/promises/promises-2.1-r1.ebuild
index a34cf6968700..1996a4d54eb8 100644
--- a/dev-python/promises/promises-2.1-r1.ebuild
+++ b/dev-python/promises/promises-2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index d4cbbf2b9593..2b6f95a6ae50 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -2,8 +2,8 @@ DIST prompt_toolkit-1.0.15.tar.gz 243734 BLAKE2B b27e61bb444360abe95714e2014fcac
 DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
 DIST prompt_toolkit-2.0.6.tar.gz 339714 BLAKE2B f969edef98d25930e4d61c1500bb9c8d731dea29e8d154e6baa2ab4045ceaf9d577d46024734a255cc15a4c13685582309e9d2fe7ae3320257f6fd1f9981ada6 SHA512 37082011ee5b8d6fd9febef95c92494ed6108b9ad8c64ac580b69c3464781a2f0dcef5b1c4d06fe309a3036932f7c622042e6b2293acf2ab6f9f2aa3c48d9322
 DIST prompt_toolkit-2.0.7.tar.gz 343267 BLAKE2B eed36fb951bcf8b0663a87eb4e77267246bbc7a6b773ed76d730c04b4dd012434fd0e71e5f558c231fd5ba1e8b3403878106bf3c60f44b7aa3e492a99a622b65 SHA512 4ea8102a50290878248ccc2119eb2b5ae50ad58f466510f8328bc172942f5417abde24393958c910ae0ab2ea4a8caff049b6e7acd8d94e9dbeb97b36c6e2191e
-EBUILD prompt_toolkit-1.0.15.ebuild 775 BLAKE2B 8e37f60d2d3b17d71a06f2869cf81732f8b968335b0cece0e38ca32a06101047ca1af2824f53897765e2c3422d2e193733b8dc4f1c018e36527a055a88320676 SHA512 d3505fd91d8b3afaaced68b48b6dcb65e7898c9a1a5d0481bf33955f9f241c511ee4df51154ca2331567cffa44293d266679112ba57f155716bb9fda3c4bdc40
+EBUILD prompt_toolkit-1.0.15.ebuild 765 BLAKE2B 0e1d92af5f2f269beda643620b99bc4fb3d4d587eab0159ce0ed1504fc3aad1fd603da1c39bde662ea32b64e5dfb610e8e91da253d41524adc8fd678c7401a95 SHA512 66327033dbd763d63952bf5c974b67fbc1fcfdc5510222363cf03405e910b1aa297b7e35f962ebc014864f80aa76b91695a108c44e4fd7ab60d65a50a33c3462
 EBUILD prompt_toolkit-2.0.10.ebuild 598 BLAKE2B 504ec8c4ce0b262c2cfa95059f36ea93d11528d284e420ec55471805ece4277c153e2bf17937f8fdc213ee42e641e7cf1fdf4faeeb500a83bca0f4679dada994 SHA512 825d38fdfa1f41d5362a55a7924199292d4c328ae9b98c1c9ac01f4ee204037526c286a9029cfa66e7d67ecb480858868e31fb57a0cb5457e48ebb397cbbdab2
-EBUILD prompt_toolkit-2.0.6.ebuild 776 BLAKE2B 1a15e07c84393bbde4c36f7fdb4786d6365db11b89372f830ab0088fdc7d153ec849519f571b82e051df0c3c606b85dfda375d33892b40af65da25941baae98d SHA512 d440f93c2be5a449e559e178e5ab3b9e252eae756d2efea47434e9735bc764cd51d33d2f5a953c532d0eb55cad2f24c908fb568a9071634b6ec97a434bed503c
-EBUILD prompt_toolkit-2.0.7.ebuild 780 BLAKE2B 88da542d6f18c25dc67b44d253ff3c136b2ef044127e6271dc034ba3980b7f08676caa6c487d35092eb96271a8d3270543f68ac9f332b972d564f7017cfcf846 SHA512 cb834abc68f0e518e8ab1ae7b9e223dcc8dec36c3f25ac68188baadf7580a853394a6e645310aa296ec3327c3448a7fd29ec1fcc6443c9a5cfbedb5da4dc905f
+EBUILD prompt_toolkit-2.0.6.ebuild 766 BLAKE2B ecf61119520c0671816086603cf30862fa70b3ae133d4f8f1a45803eadfdbee6184361a2e1fb8db1dc59b565322d8ad833cb2f8c863c179dfd49fcb7989e1d78 SHA512 15d0a524e95daca100c8a26069347c73d598e0fc1d9186cccd21b6ddcbb0a38955201f8054f56cffd56d3c1d05c064047bb9d2809517b86c4cbac2cfef8f6db6
+EBUILD prompt_toolkit-2.0.7.ebuild 770 BLAKE2B 065ce43d648dbd40e3108a5756b0831f7b3fcfdfa7f72bd0fb7705d08f73905f8d8153c6708ea217652c41974e712c71617158ee25fd9530e86729ff4955fc2f SHA512 979ab336af594383db36c7c7cf4df053bd896e22aaece6994256c4ad4d8a29e81e54d7ab67fd68ef6a0a2dfd2c0268d9026fe0bfc0ffec9c6bedb20deb449110
 MISC metadata.xml 405 BLAKE2B df7ed8f078fe07004e09438bdc172fe1b24c4d8c06a82828a59aefc1466675de75bf7e96aa9a2012e912d3568ac87ccd4f7580cb4e56b6652d1228eccb6bec47 SHA512 31fd338e542e320ea3e089f13ce179af94777688d86f49ae68be12b6cb2463e6a5b5ff5270c5bd81d2b6fb76e834f0213a06e5daa3327d0b032a68de5f9da4d1
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
index 2e6b179b1832..bfbd6ba63e76 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-1.0.15.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild
index a8972906a464..f3ac62355920 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
index d9bd30bd76a2..616c0d45b233 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-2.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-gfm/Manifest b/dev-python/py-gfm/Manifest
index 31f28808fdeb..abbee197a462 100644
--- a/dev-python/py-gfm/Manifest
+++ b/dev-python/py-gfm/Manifest
@@ -1,5 +1,5 @@
 DIST py-gfm-0.1.1.tar.gz 7326 BLAKE2B 9439a3bbfea66c43e9d4a8a1bbf51aec1029009510a39ad187d98555ae3b7ea9a9ebdb467d7ba220ff189350bb72fa91bc72b5baf19da5aaba64131d74ef744a SHA512 af10b15bb2b565904a8383f8e87d9f83cfbf55a5d20ac258759e74d1fa227a2224381ea9bf3f49c4ecb8718d195fabdae372fe572611428ae82b925a92bba7b5
 DIST py-gfm-0.1.4.tar.gz 21015 BLAKE2B a3060453ce9b2c0a4c3112f003439527c03b7b0be439b63620575e95265d8a65c1053546f9cacf19b6006ef2cbcfe5d8dae762740ce6e6aa035706a94bc611d1 SHA512 4730035b8a6168b6d2987a4a5f9a0ca70564e6797b7c88ec43f04152fa77c5a396f204b6143fc0bb3a53ab364b6d11b2274663b8b64d4640afba2a21cd1e3c6a
-EBUILD py-gfm-0.1.1.ebuild 524 BLAKE2B 8838c756128dc5fd9fa6cbcfd459fe1ad7a5928f9502aea7170cda0ec332b71ee728836908f9690a05ff123c9d34d8b07dc8c17d7ceb3d042df973384b574881 SHA512 15482ed0184861fbddb7a875c6b47bf32ba64798a1895dd275945301e6507b429d410922eccf7adb6ccd49ba942d303fba877548971ffb534dfe92b6aac9c7f6
-EBUILD py-gfm-0.1.4.ebuild 528 BLAKE2B c6ab6a99a688b50deee6394a55bfe0d2fe1f4ea5e677bc3ff7cba4b659b672c67fbb0918cff3a095982b2eaf61be25fbaf2402154edeb22e3f1fdf65ffd71d87 SHA512 548f1b3ecef4c48dad8347bc283aca635f20aaf41087066f438967f555597fc86b2bf6e62d926ab7f209d88f2c9b4d0f38b18b3840d75e8afe25960c8fc299c2
+EBUILD py-gfm-0.1.1.ebuild 518 BLAKE2B 570577843a9b13727fd6b252b94f4704224ccbc1f8115a3912ed00a491d25ccfcbb4cd3eea09f794ae37c689c6d73f1cfdaf256123771d0940eb3ff35590d4f5 SHA512 fdffc30d4794cb844a5eecc5124cff10a8abf77f82503a9a463782cac3e39c0fa3e9cab6e98d590e91a9592c934b874adc32488d0195b88dff04162c85d0d8a1
+EBUILD py-gfm-0.1.4.ebuild 524 BLAKE2B 51e9411f17d3a8a93f879fc894acb808cb8090393d1e5b4f11d8010d70b3ecc25555b90336d9da953e06b1687098489c46b2218dfcd73fa7a5275947147d44b8 SHA512 97ec3adcfe562e49f56319a65b788e35860be85c9aee2cd3bbda285b13ac206c3c92bf0463996caca890a5461784f782e4fffac772b0728090f236c86afe68af
 MISC metadata.xml 311 BLAKE2B 97f71814ab60ebe250eb61ee7697be94ba6effd3dec0328481aa5d5487b805e6945515bc605cbabed215f982d618f991ee07355c0b6d05e57276a1f949e178f3 SHA512 e8b4170b6b16a408b606625e6ab7dd17d0090310e84d1909c0b81d70c9c073cf40d61d56e434a370489cabec0803a22cb70e830ef7649f031fdf0214312627cc
diff --git a/dev-python/py-gfm/py-gfm-0.1.1.ebuild b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
index 968047be4d14..712eaacb1ebb 100644
--- a/dev-python/py-gfm/py-gfm-0.1.1.ebuild
+++ b/dev-python/py-gfm/py-gfm-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-gfm/py-gfm-0.1.4.ebuild b/dev-python/py-gfm/py-gfm-0.1.4.ebuild
index 3a051b33bebe..728ec3a9e496 100644
--- a/dev-python/py-gfm/py-gfm-0.1.4.ebuild
+++ b/dev-python/py-gfm/py-gfm-0.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/py-ubjson/Manifest b/dev-python/py-ubjson/Manifest
index bd2f5eeffd74..7b3e148d996d 100644
--- a/dev-python/py-ubjson/Manifest
+++ b/dev-python/py-ubjson/Manifest
@@ -1,7 +1,7 @@
 DIST py-ubjson-0.10.0.tar.gz 44653 BLAKE2B 91c40aab4cc66200d863fb13e4f0b64f4b1903422732f83af1f32d05a7e002723bb101b085c3d34bd33c0f2c161e24877b8fe8e8d7c09a54bac043104a58ceb1 SHA512 f4fd5dedf0212d91d8fc65b4379ccdd2576d6a3e4f5200f0f6caebd4671d582516916fc89af5d942c35624a98ac76db8fe0825a269206de4ab1ca63b54608cc2
 DIST py-ubjson-0.11.0.tar.gz 45473 BLAKE2B b74bfc20b30a2a45fb4511aa730d51245e6810fb8b00980dd61ae5bfa7cda1f60397de8c9d914195dffc48e4ec9582f839b9e133b98dd897b0a47a03abfbb67d SHA512 2c5dd111ea91fff1cebd722c62b312422e198bb8cc614e1254a3913067f72124efd1cd9879bd83ff88c2fc12ff2ef17fcf350ef7a3d6587c96a58c8b9e8ca547
 DIST py-ubjson-0.9.0.tar.gz 43338 BLAKE2B 8bcf61d1329931a2bfb7399cc27e72b14f9641fe902f0275ae190b1b256c67d78fe9b436aacf6b33912ef0e29a008e4e7b05a12b10488714ecb5b31451c1e69e SHA512 d9f061e548405d16a22d235f487740b3d4abeab8b555f9684b632cdb5e2f655ba8413a207230f90e7f3f352fa3289b16bb9a56b623c0cc5fe02f61778a8f78a2
-EBUILD py-ubjson-0.10.0.ebuild 429 BLAKE2B 231ee1423911752cbf93bf04e1c05a2eb560eb6f4d667a32f29c7dcde63a2c31275e49fadf2dd2a5d0a7386e47499cc1e851c2d52f7e1609d857798d5e4fff90 SHA512 4ee20cdb90f8fa362a12f5a695c78664e014f9b52605b5e2040f2af2da3b4d982b3f78c0d1998a3efa03adad92821fd322b199a7551457a08840a80e75e34297
-EBUILD py-ubjson-0.11.0.ebuild 530 BLAKE2B 2caa48892143704eba7bb03f3ccc61ebdb5cee6eaa2157a5a81679f35b63a5cf051306b6b8a3964b3f40ddb8e4a75f116f7ee39ffdd1485c7101565d1e928c07 SHA512 0c670c08885f33e67121fed072f966faea9dbecdc5341a6875691509e6483379b25a6ad96177005f43baf7534876fdfe5a451414178f1e4bba0b669bb23b7b91
-EBUILD py-ubjson-0.9.0.ebuild 457 BLAKE2B cdc6159578b7075d4b6461f80c9632a8e2571895e7b58c1820641324b3a5aa30fd5c21843a1ee59e668d57e05d1573244953dd557e7dc4988cadcc0d3665e26c SHA512 0bba258b25dc898aa915e913c9c62f4dc47beadaec2782efc4c3c448d6fc2949ff5741fbacd93783ae51fd318590a3b84dcb9f261ede540fc8eccc17fe10f5a1
+EBUILD py-ubjson-0.10.0.ebuild 419 BLAKE2B 05b790fbcf2f2eb728dea8c5c5ec48795a981fcffe25c5c1c1de40bb69603adc6d28e529c55ad8b9ace5c4c11b5e0a31b949c0dca57e5c9f46b0ad8dfd4a92b3 SHA512 d94cacc754fc6d13b6d63a936a6a68888b930812f7da61e7d8e5a890ed878bf612d902d8a2049d37539ed83163090103b5bacc1c45ee439630b0394dd7efbd2b
+EBUILD py-ubjson-0.11.0.ebuild 520 BLAKE2B 7f62a6d435265e6c6774f8e29c91f90c92d2762ea6fcd444d51f1cce3408b3aa2757d8383c08b55eb40b685a0f0d21aed3bdcd613f834578aa306456946e1243 SHA512 de94d5227c0960b337905e5f0a4780e1616e265ede79583d6a71b6934bf2822e6c4bc8bcbbbf4cba0b8d55f295955f12f62381b151268ba0108c53974b037513
+EBUILD py-ubjson-0.9.0.ebuild 447 BLAKE2B 041bca9476e87daa92dccf4279207f296fe822b85b7cfbe6b2b925ba7402a9af9b61722118a944d2c0f653c022fd43d604d72033210f55958536bc156a80fc47 SHA512 505699b5fc831ce3167321b8b036881156fc1dfa74b40d0df2a8659a65d86b799e5d886e7d6056c7593518f44939d464ab3064fa86824f25aa3d23342d63264b
 MISC metadata.xml 634 BLAKE2B f799cc627077029b5b5b1009539b5d55a15e581348a3f8a6a93f2661c2e40b15772920d0937d56e620625bfe61902135c228efd18ea93d4538d8cc2f0ee73375 SHA512 900769da6ff1965cd50824ca97dd27baaa5d816f0fdd99851b4063c8dfdf3d469b6a17d4372bc6d16d34245609e76a5e2223b5bf61cb467f8cfabdf775b6da7f
diff --git a/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
index 09e03c9e87a7..166babd1ec0a 100644
--- a/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.10.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
index 4d3aa9e4e279..5e5fe71b8261 100644
--- a/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild b/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
index 87df06633dd5..a109f2f332e8 100644
--- a/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
+++ b/dev-python/py-ubjson/py-ubjson-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index c47c4131fac1..9ae75bfb57af 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,5 +1,5 @@
 DIST pyaes-1.6.0.tar.gz 28237 BLAKE2B ccce23a58d88582fde56dfe26b774effc00c999c6dd0625e17c5ee7cea7ad1c16c9ab83f452cc4eb47fe88bb7367a37425c1975005249591656bf29ea3af4064 SHA512 32f6bf998b7e200fc73b4852873f60067ac056d646ae87cd8ab55f3ec99c9e26fa2b418b67ba0264a8016311a5f0eb2d40c8e7f917c0715e19f5c3dbf6a8238e
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
-EBUILD pyaes-1.6.0.ebuild 544 BLAKE2B f66779e2e67f0e3c9db04c80552f56ec252b2704878291b24d0a83d7967882948351323e6de1259715bfba0fc02e8cf4381d0a73b090ba96e3673235d1959281 SHA512 1e5245c019416358e51cd0f041ce9a1ef77ecede8a1ea804b8a3c642842388b2b0acef8b847e95e33851e5e6f767ddb4dda17f52cc417624ef2d26703aadd3e8
-EBUILD pyaes-1.6.1-r1.ebuild 594 BLAKE2B 2dcfd8fb4a7781335db7fc37a46250b59dd317f78ce6b574f6aa59643426b491954b3d8f4d302251c3d481f3bb2e8fe8c742d5add9a3edc7bb25eb8c87406305 SHA512 cb80ae8d1352f07138cb72721b95a53d6dd922901d3a05c634a649d0e6f387e07f5c9afbec052c5f6f4f6754bd8f13af19e30bbbd09b92e15285df9fafe95e3c
+EBUILD pyaes-1.6.0.ebuild 534 BLAKE2B aee9815d8efc3da51919e8430950a8ecd13c82546ff25fbc6074bcf0cb695dcd9a53957833638e5960c44d44d35fa1252f15c6fb70a70862b4394818115d4d71 SHA512 1db5fb0e0c0c6c7c2419a702244a9ae235c5d9fb7918267cbdfec74ed86fc4915a8786af6b5b06eb2bf1d0d906e77704c6e0b46886c81effe73dd2dfd3a5a9fb
+EBUILD pyaes-1.6.1-r1.ebuild 584 BLAKE2B 0ed1af4f30bf3b5b54dc6a454d44c73d6725b33c30d3e104857dc24c16419f6c54ffb597f2b046e8b64acafa55df0c5289d92365aa04b730e82eb4e58bc1cbf4 SHA512 456ab0c8fa8429ed8b34c9be21551fe2348fc37af4555537d38c5656ffb6b33bcaf1aed3a5a6fd13498d7b2ed11d15367dc5b43167775442e33541106e4f72bf
 MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
diff --git a/dev-python/pyaes/pyaes-1.6.0.ebuild b/dev-python/pyaes/pyaes-1.6.0.ebuild
index 9d6d55e33405..aa569abf1dfe 100644
--- a/dev-python/pyaes/pyaes-1.6.0.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
index 11179bd2874f..f6806c7c8c2d 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyaudio/Manifest b/dev-python/pyaudio/Manifest
index 28eec1799d3e..9a89bd8972cc 100644
--- a/dev-python/pyaudio/Manifest
+++ b/dev-python/pyaudio/Manifest
@@ -1,3 +1,3 @@
 DIST PyAudio-0.2.11.tar.gz 37428 BLAKE2B 18db51a651876135a6afc6c8c60e2221017a311fe1aec10497905bc35b81a73b5e9f27201431566bac3d13bcf582ec12a3b818c51f0e5e70aeb4ad177608461a SHA512 64db5542ee60837c9b07677e146fc7b060ff47c8b1c04cbb575bce79dd3ed4776c201e169ff2860f27dbe9e00a77046ba0cb925b55f7c546f8de46c6df68954e
-EBUILD pyaudio-0.2.11.ebuild 714 BLAKE2B 82d7592bd87e910748e246203ea6485d88ceab58113919d59812296c0bf2866f961aa0bdd2f7fcbe78a638cf56744f68e817130eb74ddde7a75791d773bbda14 SHA512 374e0868637580728ef7ad424d5cc33dc0c066acf9a8f2965185236b3717d41cb7e061e5f9b68b0df644de4da22c288c882dd1237c22dc2d86dc55762d77c98d
+EBUILD pyaudio-0.2.11.ebuild 708 BLAKE2B 1e9003e6e489876bb9d8a8d8fb4b51faf76c222b409cc2e71f9157b2ab3d05c8c61c9c25fb9d5f24a6fd9937a31392f6bd27bc7de670ef76fa907e6949804531 SHA512 6ef7e4a331626f805fc7798163fab6a1d1f593cefd4f8935774f0e5d1b9371b66db6377d50f4f5bbfc3fad70affad8ac22085926e3422a75c4639268723e231f
 MISC metadata.xml 472 BLAKE2B cf257d8a4fc3a96c8fb9e8a1d808fb946a04db4c6f26118ffd37550758b1d660450666edcdca81c1ed0238f0999dd3972d96c6f6e2d2a64b63d70b3205b88c83 SHA512 ac14049f5d6ef3c9607bc6457cdd5a1b469187fb01490ec6e6611f5a36d2437c44a1ee65372ab038bf5f3aa4ef572f8a4be284c8c941a89dbddc80c01e9a8c52
diff --git a/dev-python/pyaudio/pyaudio-0.2.11.ebuild b/dev-python/pyaudio/pyaudio-0.2.11.ebuild
index ad1db440f22a..daf451c05354 100644
--- a/dev-python/pyaudio/pyaudio-0.2.11.ebuild
+++ b/dev-python/pyaudio/pyaudio-0.2.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index 2af65262e722..7e8202d0e606 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,4 +1,4 @@
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
-EBUILD pycups-1.9.73-r1.ebuild 1410 BLAKE2B fbda30b81cedc43000e4170795cd6ebe7a42184e5c5cf377ed487fbfc84d393af9d567bcd52cf2e20e6fe525d0c31d6e954c2c015d54a3c1c784b20837fb1a60 SHA512 e6f973c53d2171c72e27c85acc7b5cda71e21c591974cf388c432f324116236cc32c547ca8d5bad132bfa5b58644fca1bc37d147ad810aba00354e7d4a4181d0
-EBUILD pycups-1.9.73-r2.ebuild 1414 BLAKE2B 68060b212b39f8cbec8fad18b6094f800e0464b9922c99ef1ef5dde54a26b15cf2bba513b5f5ce1241c1e0d4ed50f1beb0776be550dff96c0c7af2b858051cdc SHA512 d75f20cd92ff2df5c5d0d8472d58d6fb5512708000810757c2784ae2f390b8b8c751c155012256dcc95c6f828311c2ff7e32ffd49db148147ee6176a0f96eeab
+EBUILD pycups-1.9.73-r1.ebuild 666 BLAKE2B b9fad8d66624f027226cce6720b44e742cd7337aee753b19928c1e9a4eb933fabaf24b869c55942dc88122d01931ced3ab217f264ee3ae353d91623c8ef87692 SHA512 c16267b3e45c3d27cfe8620197a92c308ffc723e3ee06ed2b39470210de5786e4bbeb9a030a6dcc6b112b285f91a24aa7d8b07b102367f90ba86e72f5bf84c90
+EBUILD pycups-1.9.73-r2.ebuild 672 BLAKE2B 09926fe4e69e0142bedcd54bb6e0688b6722d8ef5f7625ef86c59d1cd1bc3a6232f62599221958efec4f32bc6952d4258c6b4cc9a563234b1566b4bfa00b87f0 SHA512 5b394c208a504968b6ff3efe2f13cc82118f5ea44d6fb0d69733b6321d30054107bc768898113c77e26e98569fd9e17bd7815d6cc13054ca43cf93171eeb1fba
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
index 739e5b77d606..2fc406f3ca50 100644
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the CUPS API"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 SLOT="0"
-IUSE="doc examples"
+IUSE="examples"
 
 RDEPEND="
 	net-print/cups
@@ -23,33 +23,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-# epydoc kinda sucks and supports python2 only (it's dead too),
-# and since we're dealing with a binary module we need exact version
-# match. therefore, docbuilding *requires* any python2 being enabled.
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
-"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	if use doc; then
-		# we can't use Makefile since it relies on hardcoded paths
-		epydoc -o html --html cups || die "doc build failed"
-		HTML_DOCS=( html/. )
-	fi
-}
-
 python_install_all() {
 	if use examples; then
 		dodoc -r examples
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index 5cc54abd0a77..f1ce8a33d076 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for the CUPS API"
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
 SLOT="0"
-IUSE="doc examples"
+IUSE="examples"
 
 RDEPEND="
 	net-print/cups
@@ -23,33 +23,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-# epydoc kinda sucks and supports python2 only (it's dead too),
-# and since we're dealing with a binary module we need exact version
-# match. therefore, docbuilding *requires* any python2 being enabled.
-
-DEPEND="${RDEPEND}
-	doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )
-"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	if use doc; then
-		# we can't use Makefile since it relies on hardcoded paths
-		epydoc -o html --html cups || die "doc build failed"
-		HTML_DOCS=( html/. )
-	fi
-}
-
 python_install_all() {
 	if use examples; then
 		dodoc -r examples
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 0b1751886460..4e0a67ec892c 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,9 +1,3 @@
-AUX pydot-1.0.23-setup.patch 623 BLAKE2B e0403d397baed897de27782fc6bf5223f0c0c0148e36f214614bcc4ce0bd9d5bbdbf4979272e4395dd8632321605c83ec7d8e0552960895e7890983adfe5925d SHA512 74202787584f9ed4f9aac5038d200fe7c64d0da906226f11e29897a30f371a200787a585d1d151a8ac2191f160d3cd3029ea6f4f4e388e04e7e80d443227dd61
-AUX pydot-1.0.28-pyparsing2fix.patch 836 BLAKE2B f6b629e47032087241e239d3a7515711739a4a4566fb0291b2e612f9ef498ecf6e64da0f2ae8effea647d24f726c8f265548e5aca6f2f3d7483e7a7e77a4e91e SHA512 c50f6a21609acd177cdc954d5adc967d4cb99177467df4c76cad379050968f86375f61d1a17d0377c9dfe4f23ec1b1647cf85d9c3fd1d6c409387d15de81eeb0
-DIST pydot-1.0.28.tar.gz 19711 BLAKE2B 73fa2a614de998d4b53065a350768dbf1c0a4aef60edd9d0515ebfc9c685aba09dc42f89849c1eb609e469a4036062d3f0b83b364d89557f73414143c2c78d59 SHA512 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055
-DIST pydot-1.2.3.tar.gz 262660 BLAKE2B b5acfc365f7864c2b1fb419e5d4624ebeabef2e969dcf545668062ad46b33de5b5ee65271ac6b0fe0abb48df83f6c24bf3598798eb8879a998c06d91b6a5ac00 SHA512 0527279174bd9d5703131ab6c16365d66e392e27597b5d2d536d43f783a59139913a6dbfa1cc022993f842843f5d79e4e0b2a1435ce3427ebc534ef7b1ef2e9b
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
-EBUILD pydot-1.0.28-r2.ebuild 716 BLAKE2B e654066c1f59f20dc3a4b0a66892be351b34f6edea70263b354fcc63868327aa59458ea0cd58f63bdfae8822794bf68155e58dbac6829ac6eb4c03c8588be632 SHA512 e4093a13f9984a429aa4d6fd8963fac7077af1c124ca144a729b25ad2f7e2f16d1781a3535158f93f7e02b8ee6dd4ffc1d1a8d706408ebde9df3cc777e76e53c
-EBUILD pydot-1.2.3.ebuild 918 BLAKE2B b37148fd8260d27cdf24e59f9de48385cfdf9728a8c179bd2e02b26ba602462c0e2d093d5999e7bb41ac988e2f18653dd2125bd56c6929f597df9a82698d7230 SHA512 ca6ad4dd25e4b1289dfc04fd97b91430494aa7bd5eab12cc85efca1c6aec75402098c333d475414b470d9503ca4d53c239d26ee10f06901a81e61dc126e54639
-EBUILD pydot-1.4.1.ebuild 930 BLAKE2B c9c762a746cfe4d7382e283304731b03dab7f55811911a5e9ee766cbb9b522b8028564787c800168cb7c5dd5b1799449f4cf6ec650c4602f6adb3402ccd83f49 SHA512 afa93d2c6368999a2f8657fd3c73c28543818f519ef6ca69eaeaf8a332840da7d45f77acde7dd95ab9a40b126c4475ab296de1a029802615b7f2f1991e3ea7a9
+EBUILD pydot-1.4.1.ebuild 920 BLAKE2B 562239f017f696452c78c34577789927c8699727d54aa00ae5fbad91f364c6bf3ec512a4e86d23d5e2f0d5247f0d789560b0b6c8ad14adc9a219c05e25269098 SHA512 e4968469e606b094a3d36cff0bd23f82116a5a084c2ae125cd7fd4663d1b3212e570174e6101293009ce688e3736b4f9fbe96e0513e8662c39528ff46267eb52
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/files/pydot-1.0.23-setup.patch b/dev-python/pydot/files/pydot-1.0.23-setup.patch
deleted file mode 100644
index c87cc32b30d1..000000000000
--- a/dev-python/pydot/files/pydot-1.0.23-setup.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -1,9 +1,9 @@
- #!/usr/bin/env python
- 
- try:
--    from distutils.core import setup
--except ImportError, excp:
-     from setuptools import setup
-+except ImportError, excp:
-+    from distutils.core import setup
-     
- import pydot
- import os
-@@ -31,5 +31,4 @@
-         'Topic :: Software Development :: Libraries :: Python Modules'],
-     long_description = "\n".join(pydot.__doc__.split('\n')),
-     py_modules = ['pydot', 'dot_parser'],
--    install_requires = ['pyparsing', 'setuptools'],
--    data_files = [('.', ['LICENSE', 'README'])] )
-+    install_requires = ['pyparsing', 'setuptools'] )
diff --git a/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch b/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
deleted file mode 100644
index 12a01091223c..000000000000
--- a/dev-python/pydot/files/pydot-1.0.28-pyparsing2fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up pydot-1.0.28/dot_parser.py.pyparsing2fix pydot-1.0.28/dot_parser.py
---- pydot-1.0.28/dot_parser.py.pyparsing2fix	2013-12-09 08:59:24.660145534 -0500
-+++ pydot-1.0.28/dot_parser.py	2013-12-09 09:00:10.021222397 -0500
-@@ -25,8 +25,9 @@ from pyparsing import __version__ as pyp
- from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
-     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
-     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
--    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
-+    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
- 
-+_noncomma = "".join( [ c for c in printables if c != "," ] )
- 
- class P_AttrList:
- 
diff --git a/dev-python/pydot/pydot-1.0.28-r2.ebuild b/dev-python/pydot/pydot-1.0.28-r2.ebuild
deleted file mode 100644
index 5c92facbb112..000000000000
--- a/dev-python/pydot/pydot-1.0.28-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://pypi.org/project/pydot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.23-setup.patch
-	"${FILESDIR}"/${P}-pyparsing2fix.patch )
diff --git a/dev-python/pydot/pydot-1.2.3.ebuild b/dev-python/pydot/pydot-1.2.3.ebuild
deleted file mode 100644
index 1fd6811bffa6..000000000000
--- a/dev-python/pydot/pydot-1.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to Graphviz's Dot language"
-HOMEPAGE="https://github.com/erocarrera/pydot https://pypi.org/project/pydot/"
-# pypi releases don't include tests
-SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
-
-python_test() {
-	cd test || die
-	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
-}
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index d87d9d0fdf74..fb2062cdb6de 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index e56d88d8817c..ba7269b072b9 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,3 +1,3 @@
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
-EBUILD pydotplus-2.0.2.ebuild 939 BLAKE2B 445b030e307a6db59774375cd4aefd04fff496a4221dcceca38a9762d9c6fd12e2b84a5b2fb2811a61dd2e43b23a248b1988e3bd2dab9ecdb4bb53ea3b6f7dd3 SHA512 0c555b0f441d4453dd29169291150df9d86dd714d88e27a7529aa75a7d7f8e5064d03c41bc8676b1c7e473e125ac9f50efc21b9c3d4ec67d1784365cd7681c8b
+EBUILD pydotplus-2.0.2.ebuild 933 BLAKE2B 2ace3cd5e39fd96752e866e4c24e1f2df8ba3dba134777630fa98580ea1bc39f26ebbc7d3a6f2133ca975e4b08da2895d847776cd8ec9e6cde0f7b1c56141c81 SHA512 9934ca01585aab07eac01c02b22d133dc29d9fbb2c888396f168f41b439e82d8a15e401594d2383d53985adeceb657f5f432c385745951d223547e7b9ae65280
 MISC metadata.xml 616 BLAKE2B b3b59bc1482de96d68d0fa8c4d63e9683ad39f7201eca9008bebdcc703978c1313d973d8ee8839625962d2c4b8fb965df88e27ff89b57c0330990fd6ffd1de11 SHA512 684ead6a0a6f5ff7a9afa13e819e0c444e1d87b50f1cc97567de0c9d5b2e22b6b21a44e28887f430c37358eede53521377f89773687ef5d08cd9e626427fd081
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
index 99ad37f7883d..f2a0a8effac2 100644
--- a/dev-python/pydotplus/pydotplus-2.0.2.ebuild
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyee/Manifest b/dev-python/pyee/Manifest
index b07c948b5d86..4387f10eda56 100644
--- a/dev-python/pyee/Manifest
+++ b/dev-python/pyee/Manifest
@@ -1,3 +1,3 @@
 DIST pyee-1.0.2.tar.gz 4263 BLAKE2B 5e29f47987f56ddb07186ac19218c448b5052b999c3a5ae4101ab6d48a27d82f18ad67886e45df166e69af27575e8d9ed611ae2eb32875e12c3611180f21baeb SHA512 73cbb3cc7b06be9d4c92f6bc901fa55e1ca51271177672e8a1636eedc6f82fc940d7dd844d0f4a959e52185c0ef934e9fbe4760b70d62f39b94f5d1c3660ce2c
-EBUILD pyee-1.0.2.ebuild 552 BLAKE2B 41a02273a671dfd3905b41ea0b1f3f85acc9e0e65c12004571fe2202f7aa39aac66dc023087cc2fc73498f13ad3f8617399e403f5f9b7eabc44cce13e99dcec7 SHA512 73aaf338730c7c8865824bd95f2e3ed7de4cbc3913c4067dadd529c07c268da80db8019a4d747fac6e4b62581dba4db4b4ca28f2f9df0bcbef42796a53913441
+EBUILD pyee-1.0.2.ebuild 546 BLAKE2B 41506315a2ee313ff081d4cbfabb659a51faebde3087e16ad8d0a89660bda742b988052218b48d210d0311c6b76b9bad7d0fc1ee83947d8809d9eec067fb58d7 SHA512 0fc4ff98c14a9d32c1a6f65e602ff02018f0acc69301cf522018805b7a5d6d325aaba6b0df3f32c3fa6426797172f3cf375332b08c15c9393b166af466add5b9
 MISC metadata.xml 566 BLAKE2B 42dc964ce3f4c59572f63a26a4f726497c8a469ca3a574736fe552f47e37346f371e85b6db54dda613c4beb709500d077c3de6bf6684d28d575710f20fb54d92 SHA512 75bd4c0b9b8120f7240e06c6674976fbe4ca213c8e8652dc0a6f783c2750ea3bbf269cc079ca1ceafdb2af2760e77792c189f2d2c2753a6c2966b8d9c4c0cc47
diff --git a/dev-python/pyee/pyee-1.0.2.ebuild b/dev-python/pyee/pyee-1.0.2.ebuild
index 4ef8ecc59bbd..935d58e0b4dc 100644
--- a/dev-python/pyee/pyee-1.0.2.ebuild
+++ b/dev-python/pyee/pyee-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index f811d2198c64..1a882472856b 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,6 +1,6 @@
 DIST pyelftools-0.24.tar.gz 411874 BLAKE2B 304721cc440599d6436366c14a17d7e3132464686cdd870257a0180dd5f292a23c50a4e654966552d643875ac2683fda8584684cfeb611a3f22f02f73852a288 SHA512 5169617f9a8446ffc21dfc44ee185a388c8945a0296bdc6752483b0756888dccb10e3ee88e529d101cf31a4595de924b5c95f5459d5ee4448f57c0c4f2c56887
 DIST pyelftools-0.25.tar.gz 499493 BLAKE2B 941b21526d1225a4effa25d8f0245b326d5ec652cea6741240613c19af61e03a537fe363dd4c10a90760a7ddc6201e20dd83b6825ad185ae21696be6f4d1e52f SHA512 06ead53ada32676161193d7e5cdb3b9e4c1910dcb34f77a544f53445651f8118b582716bf8c5cc54efb21b1ddbbcdb4b41c533350af3c41553d103c7fc74702f
-EBUILD pyelftools-0.24-r1.ebuild 887 BLAKE2B 737cf15c794e829e057f0a4a8b4761d79c4e871e5c16e7c3c90412c6880764e7af874d8085700c795c85f3ce4d03cedfdae816878bc4a4eb7466a3397bfab120 SHA512 2aa3ece5d5c454a899acf6a0bb136028d77e6ee762a0e53885bbd8e88d4c2404c74b9dcc90efccc97abc6c0ddda7228973dcb26dbc7d37f4bd7157b1b723e8f9
-EBUILD pyelftools-0.24.ebuild 871 BLAKE2B 309206bfca7c1adc71580bd6ce99a1055d7aa7d1ac0105fa93381d4940b79d8ac8c3231aecbedb364fcb3d2c127fda7a59d8d097f3b67d24bfdbeb17e4005091 SHA512 56b5df5eb263ecb5227a32c798d5fc8c81b60be7c51cd0219071caba028047e800c413aacc6e50a776af02c662368dab5106af739ba46297d20cb232bf6b3485
-EBUILD pyelftools-0.25.ebuild 889 BLAKE2B e40f6d9226597cd0b9c07eedce8c0d9b94815017b3a929af87c7589cc8a3af755d6281c3898a429c43e6a8c5ac535743591889f8188ef0e950985b882804b62c SHA512 9dae901bf85378568ca6a09e432f4b6e6e6daa4652fe5be69340724c8eaf1a1d7637f25f44d3693ccd0b27066f23d22db82c3e99c2439bcb9d2d12614fb560cb
+EBUILD pyelftools-0.24-r1.ebuild 877 BLAKE2B 0275a304e987d99d3a00ac0d91800a1a760fb095acc0ec425778f84073e361bc0c490bb016c2e6440fbf3e8879c080df10c14bf2f767b3f1e0a30533142c1dda SHA512 8af9b301c0105fd01130985dc59a5751ca2497346d75baf1fa51a8cdd10edb7b5b658acb4333deb0cdcd802b494b4affdc343d3fbee471516a7daec69d5023b2
+EBUILD pyelftools-0.24.ebuild 861 BLAKE2B fff7e8f89f86c684ab905deeab34408927605f7830d2472bdf155a56ffa8c2ffbcf3a466bc359398e96b2a00eead8f976389b0b22c8dc9d25c5857bcf5da0139 SHA512 1a30428467f6b30838ce6fe20055e394dccbf11135e609108b4c913624e6964f2d966b94a4f39927df4400fc411f3294b21117a33ed411cf78ad2ef51d8bcdf3
+EBUILD pyelftools-0.25.ebuild 879 BLAKE2B 64c935275ad8c0360da13a902f2cd86335a87587c2755827b1f21edfdf0b54e90cfc9dea07156429ed430b8968c128d93d53a84b203b1b47466fb96910fea886 SHA512 258b798b4c3ebf99e124593fc2fd2b6259b9b1dc8fa6762d19933d637aed3e511465cd0e1a49d6ec44322a88c460cb34e5c0facfd653847a07a30c58b4aa904a
 MISC metadata.xml 370 BLAKE2B 8dcbbb8d9add514bc0daf421c6739f8ee8426af39a0cf36758c594ee859a1aead4bddcfab3466cb50761ae289f7d58426dacb5a51b745a290530abeb511204eb SHA512 0f00113fb42e48e7b232b8a500ac77958f3ead50ff51d547e015a2c1aa7b87ff7a25495094ba10480176f3653742f18473378fe336f544ec93d645db9057ec20
diff --git a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
index 5c6ca6ce5a21..c8179c784bab 100644
--- a/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyelftools/pyelftools-0.24.ebuild b/dev-python/pyelftools/pyelftools-0.24.ebuild
index 1ffab9c40321..f43efb8363a9 100644
--- a/dev-python/pyelftools/pyelftools-0.24.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyelftools/pyelftools-0.25.ebuild b/dev-python/pyelftools/pyelftools-0.25.ebuild
index 076bc03a3ed0..3246f249e439 100644
--- a/dev-python/pyelftools/pyelftools-0.25.ebuild
+++ b/dev-python/pyelftools/pyelftools-0.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 609fbe4f5821..2e07f0dc4c9f 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,7 +1,7 @@
 DIST pyenchant-1.6.6.tar.gz 64010 BLAKE2B cdd0878ca58e05d955bf7d5518de71c02f663a8b00b1437bed8171fcdd08768691a9f9bc2bea0de0e942c2197bc9cbef66a88a114c47df3265c8d8034c95225a SHA512 af6aa1ac77b5718ec4b4aad3d0b88d26e697b472ec8261b23b37fdbf6b399a120ccc3e4ee6579b884c44b0eeb3f95bcdbceea189105c05088a48400a0c8cdb90
 DIST pyenchant-1.6.8.tar.gz 63693 BLAKE2B 5a8f867f3f40e81ec7d2431b678f324619b81942c8ca05a0cddc5acd2a3c645227fe6584b2236cfd440104f552d23786fff064d39762eb62e9e6a9d62ef1c670 SHA512 1a297cd279a0fbea2657bb42f2018a693b7f1d2da420f8cba436f680fb803282432f86e244a098eb7b9ef801059a3ee3c3bbaa748d30ea6357edf9f778e2f0a0
 DIST pyenchant-2.0.0.tar.gz 64022 BLAKE2B ee1200ded8e2a8f9145fece64cee1c8ea3129d540e10708d51acf6491c200a0f39927b47fce51d2e2f932e465d7acd5bb4afd31712183530f6da5e8ea899c0c7 SHA512 c985714bc8ad69b6580fa1dd546243da5f3f92e8681d846ed265b086c486ae7ed33754fba303b450be4c0cb20e975a9a10efbeb700ea5213a11ed00612a93af0
-EBUILD pyenchant-1.6.6.ebuild 772 BLAKE2B d41f07dcc460be3a1c064fa458688992e996a09f490f8b764dfbe897fc09b44a08c9ba09a1d4e433792a030872e71df27218634be447b502abb2becd26034781 SHA512 392947e1241988fed602d8270e54066cc8317e8e347c35c388d6510cd1ba0cc66db3df38c89de04e3d7c232225b56e8a1d4dd1aedb7d36b5379751fb09a1ca6d
+EBUILD pyenchant-1.6.6.ebuild 773 BLAKE2B 7fe3fdfbfc8cf5a0c7d3c876176669be3a8b7dbea04ac40213828514de27a1779fdff496a6bbe3acec13f910ec4624c6e07b7955eeb5de301dc7188ef8eaf4d6 SHA512 4201f819f44e53b28aef32892a41beca2eb90e8dc309b918fe89f4477800a697ed083251a7e056c359c75b03b667fe1df77026f8bb08f9aca6eabe0f2f63223e
 EBUILD pyenchant-1.6.8.ebuild 773 BLAKE2B 8d9ec7afec4cecf52f9d9256be3b9e7b3d5bdb6da429923bf4e756efe770721e52529a5ad8dbe9bdb823e862ae9be80ef257088ed68da9f25d68c455549b8cc9 SHA512 607a8b9ac521804a9f4889599e7fc042d9f5b5ba1a6acb7672a45651f722206531aa14b0128a68d2ad3bf37db92036146510377c57be1042964dd42296a88ea0
 EBUILD pyenchant-2.0.0.ebuild 933 BLAKE2B 46fbf644373d70c48290c868ecd01a4f95c1cac45cf71752c03ff7ae09a9e4fd80fcb8136d7a405f46e8393466eb7ce6fcfddbd6df4e031d7ff9cf53315a1b03 SHA512 a75a72cd333e7122bdb37538b09edfb49234afaf98c81a203315314c03c0539bbb1ada9db5d48a2ebe959acac1a53ab6037c005dfbd22687973f198a4d090a68
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-1.6.6.ebuild b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
index a4f971093a10..e0396f710909 100644
--- a/dev-python/pyenchant/pyenchant-1.6.6.ebuild
+++ b/dev-python/pyenchant/pyenchant-1.6.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index c565df3e7a00..48524268aeaf 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -4,5 +4,5 @@ DIST pyfakefs-3.5.8.tar.gz 171519 BLAKE2B 18eb784cf62108c3363b3b5fa137ec4ce83058
 DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba68d4ed76d7bc138e4b2d53dbd4bf7dc6fd75a8e5277eccb9740c67d5fdf5b640fbc577f22690ee32db434c3676 SHA512 910cef89443546c9a5f600cbe06cbdc396ac82d15d852768c06c2f97e764b05ee9fe9bea7687404a9a962924bd33c45d9de2a04b448fe6350d8cc31c4e163dfc
 EBUILD pyfakefs-3.4.3.ebuild 713 BLAKE2B c1aae975305b1d3555cccea2aee091b75f158c638a50f39e84a8f0b4aebed0be4638548c70b940a8f45ff521ed9826b54488130c39762911de8f6733f5693d7c SHA512 4272510a33b3b29aba9d2882fe3938193a7c323bdb81c014b429ea10cd59bb7558b3394898a8794cad8e60c22989347872cf30dd037b799976482f0fd0677811
 EBUILD pyfakefs-3.5.8.ebuild 856 BLAKE2B 2592aa52f4db10fdad9b81beefd941cd3efa18b8234da2fafe8c28e26fef759d7158208fba8014b1d90269e14c7078066cbe4da4b7a34ac2c636728adf07e973 SHA512 cfd6413cfd3b53e4340b422b8b8fb91a31ec93717e2e226f2a2e9892550f3716f8550cf57ee0718981897604dac8aa90a91f8eb8bc87105f24f30535b73160a5
-EBUILD pyfakefs-3.7.1.ebuild 854 BLAKE2B e05fabf45881167b7e0cd089886ce68db5070f8fa94226f660d365171017043c54ed7263104ea3fb294f1a66de756189641479e9674639066443412912a69a75 SHA512 bf55d3ad92243f8d9143664e30b72ca455fd66c15c0e8bb5cb914f8a385a0eab21b0e23aeeea5593dfda727fc908ea83c177aa3deadb8dc6c74d83fc8c9edd56
+EBUILD pyfakefs-3.7.1.ebuild 859 BLAKE2B 9f19f9a75b8c64e95e710e5f48208aee203fc8a159c98edf5c3efcc6bd9c25d8d5db9c7d20492529c6ddc22dd0c7e150bb583dab5bbc668dfcc85a2801d09866 SHA512 0de4468b8f338eeb91af6bb787e4575f83457f722184427ec9e64746ce10b351a06f8f34409b50b8147c375e5e0c802ef98bdfdb382ceed08110fe53dacea590
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
index b611cb0e0d0c..e5ac13203eb6 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyfiglet/Manifest b/dev-python/pyfiglet/Manifest
index fba1c4f39c94..32949026325c 100644
--- a/dev-python/pyfiglet/Manifest
+++ b/dev-python/pyfiglet/Manifest
@@ -1,3 +1,3 @@
 DIST pyfiglet-0.7.5.tar.gz 767904 BLAKE2B 761b933d60d074d3966fd0c8a10a5e0da056ef351c3ab31cbb43cd545ea75baf8b4daf1c2b61f8023b88d9c485acd402b12c1ccde103e545882588d87c8302f2 SHA512 835a2710c576e3695388bcad60c93bd58394bdd263cce9b51bfd8d1d82582765924215bf1e7560b7be01d4551923b29f56c2e063e646ef5cffc970521e2cbfb2
-EBUILD pyfiglet-0.7.5.ebuild 430 BLAKE2B bae7f14b5216a59937eaf4af12fa1b958bdd36ba45731002d297cfcbe90d92c8c5596089b87859c420e26d0184a1ba809f5031e1e2dda378c02f2fba9d020217 SHA512 253ecd966878723dbe5009ec35c8abf0e3155854ceffefa174566c7e32cdde33453cc837863b453d7be75dacb74f4fa171831cb93ef2c2b30d3ae2e3fdfcb777
+EBUILD pyfiglet-0.7.5.ebuild 420 BLAKE2B c6a79df9838b9a13b3923bd8ca2e49b71ca9b681d17c4bf7c4a4ddf72c1d482960e8f495fe3e9c82823c9bc151028aab937b6e73305da3b794d47134272afb92 SHA512 86df21872ca27d4e69d62ac1e909d9c06d9478416256f80d7c23481be188acd195d12bdc84137a9db91133313c3e9a59545314aaca8d5d00234306fd90f1f26d
 MISC metadata.xml 464 BLAKE2B 1b46b5afe539a60af185b8b5fe10a6e7459508749263efb0ea88adce9655f103ab4ae6bfe666362df894bde1b642a2bb041ef53cf80cc0386d369a3d91b093b4 SHA512 a82637fbb0d524910ca2456bcc19028418d815bac7f52058eac1b677fd6ebcc62f965f002ff3072ffeed78fa54c4a6c427e672a21a8f3d1bc10bd0e42c3b3d9a
diff --git a/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild b/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
index bed9fb7e7cb0..d8493cfcb49d 100644
--- a/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
+++ b/dev-python/pyfiglet/pyfiglet-0.7.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index 78fcead155d0..da892033e311 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,3 +1,3 @@
 DIST pygal-2.4.0.tar.gz 4554802 BLAKE2B 9627558e734420bfb3137989d0cc1978a0a06a597d3d5d071e13653876a4bb3266f12f1a8a358076619d997998754c29ee75058356ba66da64b112a24c2cbe2a SHA512 d69fbcff3792cb0b952addc3bfbaea76628d5546482c291ef217c592a820a73a65b1eb522c5d7877e7a794d19b74636126d99a4ff280e8467ab07a95000ba823
-EBUILD pygal-2.4.0.ebuild 1570 BLAKE2B 2d46c42c81769ea1e7dd0f479762113477e68926007a7b3315491e08c12469187d77381c6a4499ae92c2935c12b63237d21786d36bb6ee2afb20c11e5a357177 SHA512 709e81f706876a0d6f8378e36762ef827cf43434e16ae72b4fa1afa8cec23914156a25014ec18fb6cb8aad90c706b02e4f5429d76c03ebd7c3571ba6ac077496
+EBUILD pygal-2.4.0.ebuild 1564 BLAKE2B 86c89ef57c07bc87c9e8e98a1552633e2495a74532a0784ce71be5b94b675560076076ce0af104bec7ba157667cd34f1b26962801242f11f0d03fc43388bae89 SHA512 e3cf57e2dbe082e8be4621fd71b366a67d1aba37828eb92d867f5b1fced45aeca836a7ff4b9858b14da67630bb6fabf90371fbcd04acdb9ace7a3a84433e5f92
 MISC metadata.xml 432 BLAKE2B 935ce59a5a29aecbe4015fc52312fb03be02821a20863d20171378a68ced0aadfb43f7d1898fe52b8159cc0cd5a78ae0daedb97b730fd864de39abf3a617cd92 SHA512 1d2e68e4622a235b6df15390271b1f331b366a2ad1432740de81de20b494ccfc9e5f0e94f8b63acee67679e10267c0f21c66b58514e72f32d0fa3b5b262640d3
diff --git a/dev-python/pygal/pygal-2.4.0.ebuild b/dev-python/pygal/pygal-2.4.0.ebuild
index bca21e1cba6d..6bb4f8c95ed3 100644
--- a/dev-python/pygal/pygal-2.4.0.ebuild
+++ b/dev-python/pygal/pygal-2.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 320670974b6e..375e00841ee7 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,7 +1,4 @@
 AUX pygame_sdl2-6.99.12.4-mixer.patch 1513 BLAKE2B fa0134e7e4c458caf720169bdb655793e2caebe746e04c5204c210b3535830afa56e8cacf2972fb27953500c4e82dbcc5554fbcbbc20a098d7a325b4b30e08d3 SHA512 4c7fb5b9f55e8f4bfde5ac911bda4f83be535a101eeec80595f70a290228cbdddf2686595901aca25c429beac34ed4ee906c92ddb0522b4c73ce48c1e1556b31
 DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
-DIST pygame_sdl2-for-renpy-6.99.6.tar.bz2 133501 BLAKE2B 6d23b9bad3fad1b508525bdc7b18dbf0801d7c7e36e15b843104e763b5946c79e22663bf705e071b35c8b4742e3f8e59bfaa0345dc95b18f91b9dd186e6d4df6 SHA512 de1a40f7e8acdb46a7e0b13250c7fffdf848bd44c07408928aab6214afbc741aa77e1e8314d9049324328d9ffc645cafe077a468457a721f36e49f98e5217d53
-EBUILD pygame_sdl2-6.99.12.4-r1.ebuild 913 BLAKE2B bf737d3b287daf2f9ff36fbb1d5c90998b7a99dd44d8980dd7846508d7b16486984fea8aa8505b8fd58aa8cb74f297bbfdbbbee0967f4cb3e59680913ca9de20 SHA512 a6c85db2bb9b28869467d5a0fee36d8243159ab51887fd4835570d4414978c09e9c8d68f9eecc111c3c7b5d447a70e34fe2c6ddbefa7801b58de17c8dec354b6
 EBUILD pygame_sdl2-6.99.12.4-r2.ebuild 992 BLAKE2B 3db7b7f60e3dceb0aeda3b74c8dd9a06bc9d9a75b8fd7be83425c3be43e9d162ea5dc4eca80425c83eef1e90cc4674e7c6f7bcf6d75591d2c1e0bbcadcae3867 SHA512 3d142c9e99ba744c550b8a598eb539087af08d0a18c5a34975bf034f646f955cdc66e8101288144f0b2be27c0053fd4d7b9677c1fdc4ae978916f5ac8adab74c
-EBUILD pygame_sdl2-6.99.6-r2.ebuild 727 BLAKE2B 9ad1b1a062af198e3569f351cbcf9a368435650b327201f232f7632dbdd8cf90903c27477ca7ef78c2ef3d41bf52b1f0c628b32ec0c26a4cc4c29c723575a485 SHA512 7524babe800e84ff4e10102ec344c561cc6bcf17b99d3928a3fa26d47a73a39270e4ccfe8f0e4f883bfc4ef73bdad41a1233f634264284b52e565d4d498cc9bb
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
deleted file mode 100644
index d66b4262bd04..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-PYSDL="${PN}-2.1.0"
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="http://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0=
-	media-libs/libsdl2:=[video]
-	media-libs/sdl2-image:=[png,jpeg]
-	media-libs/sdl2-mixer:=
-	media-libs/sdl2-ttf:=
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
-
-# PyGame distribution for this version has some pregenerated files;
-# we need to remove them
-python_prepare_all()
-{
-	rm -r gen{,3} || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
deleted file mode 100644
index bd63debab611..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.6-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="http://www.renpy.org/dl/${PV}/pygame_sdl2-for-renpy-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	media-libs/libpng:0=
-	media-libs/libsdl2:=[video]
-	media-libs/sdl2-image:=[png,jpeg]
-	media-libs/sdl2-mixer:=
-	media-libs/sdl2-ttf:=
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/pygame-sdl2-for-renpy-${PV}
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index e1efcfce9a44..f2af7eeafb68 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -5,5 +5,5 @@ AUX pygtk-2.24.0-quartz-objc.patch 1023 BLAKE2B 2fca6b1b92f424e853a6724857372f70
 AUX pygtk-2.24.0-test-fail.patch 248 BLAKE2B b71575b455e5e5ba740f412d199572d7be2f2290f84d047bab45c7ed464a029bb23ab9696a96b42b69575d2a977ecbd2fa63ced9b325b456a341f756ce00314d SHA512 e306324fa5542c492942c3a3f0be4d6a53f5641fff4362507195afa89bd73722aa2f65563ce7a8000d04b7824f69d840d3a8a53b8ec39bc31b97d2d215ebfde3
 AUX pygtk-2.24.0-test_dialog.patch 961 BLAKE2B 035021b5a4a94e487f8e4fdd69b83e54d2baea1891ce1bf8378e7375749de4a45477acdfe2a07e259d907bb182c2951bb512e7ded0ffdeed138ab4fce81f81b7 SHA512 13254063895412641b51cb536892f2c4b9bb76ac1ffa92f8d82fa20b80f5c7748392a968315af3731def20392de917a0ae2b4ac0607cee9e2f38911283d33ca9
 DIST pygtk-2.24.0.tar.bz2 2361097 BLAKE2B 35b8ad94f242dcfb5d0593762eaa5480928e63bfbf8d030dd199200daa1dd6fd1769c878517cbb56e3beeaeecedb554b06b04cc35f9b2eefd2d8ec4381daf707 SHA512 64f4344fcf7636e0b2016ffd5310250b5c02a1bf87e44aef39b5d4cf4a5fc50d27cb4f030d4c6802cff61fffb88dee7752821e3d8a4cd1c34dc3745d9ff2f0da
-EBUILD pygtk-2.24.0-r4.ebuild 2779 BLAKE2B c0d313813e1c985dd41b65421df46036a0f1eeef5b6eebd1a62c5dc2700eb0df485e4a8ce884575b8b88e10b995d89030ad862656f65f89febe595601f381cf6 SHA512 67a9f837b673548ca266f7699b1ab84a1ff039371fa3806ab481ae4973b6e16349cef140d1c1c0f409cd7cb27ce936d691f3c934cc2fc20a23bac6fe62758f52
+EBUILD pygtk-2.24.0-r4.ebuild 2780 BLAKE2B 96bdb246b8d49b935bc335bf5611467360fff2209ad9542f5438e193242e448e79076adef3a0c61848af2348ea0dff3fad2759b896445078eaf7a37c43c6e6a8 SHA512 e86c048e1f954307b6fc04ea8d61f4dc8eddca4a36246f20e8a2107867db7e633980b639dedea4ff479294689fb6d0938e5ed77f85cef543245a2c34eea7fa80
 MISC metadata.xml 1105 BLAKE2B 271b1e6baf35487a0746bdb5eebe9a9f7c8f5dc2b14806e717a3fc3b468c063609c0693b3ee881e4538ca789926b5a9987f9fcac1746709f1ba19c36949af72c SHA512 037cab51c9a9cab4649559886753432a9e204dfd3fb2f145946a805fda17c3b544014d10b8b59a5b4b3d8e97d15a0048cd6f295bbca36515e963d52e9ad6181c
diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
index 88e91b3bc842..00e8020bdcda 100644
--- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
+++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyhcl/Manifest b/dev-python/pyhcl/Manifest
index c421831d6672..22eb93e1afc9 100644
--- a/dev-python/pyhcl/Manifest
+++ b/dev-python/pyhcl/Manifest
@@ -1,5 +1,5 @@
 DIST pyhcl-0.2.3.tar.gz 21796 BLAKE2B f9e76ca40d49d8ce3cbb7ebcb18f731599d061986a44641488af46bcb7e1ebbac0e775502958efef2d4af1efc996497a834aaf89272d8d6bc8bb167a6be5febc SHA512 09cc9dd53048170ad49794d0944acaacba2c08bc5a05bb8d699bb47dc0a03eb32881ddf4dc0771e8b6ee008f7a47b5e95beed4bd77b173c88c6cc322eff4678f
 DIST pyhcl-0.3.6.tar.gz 23682 BLAKE2B 0c6cd819a14c5488e303fc5931bffa885e7d7de352570fc2ea9cba22ec4758dad3f69b5e62ba9186c57bfc7cc6add8cc9e0fec52e6dc870dfa1c7b26fca6e0d2 SHA512 27cb190947162e62766f7f4e33b1fbda8ac6a9750418b17cb8d9fa2b9fd0de28fc3e2c9d27f59af7c4740239794e9c81148b7ef20ad8f5d4fb59348c0cf9c5e8
-EBUILD pyhcl-0.2.3.ebuild 663 BLAKE2B 921c6946a3fba46f521be6614ed488014ab18b0bd59ad59af3e0f0e13ece2ed38c2e0c0c6d3298bebf53cb62d47a26eb3cbc43116850614916cacf0f1d4c709c SHA512 f817926281668c387bfa2d02525f14ae010344dd1eaace7376013b1d436c8b9b9ecbe43d50447c235310ce102e554cbadad36aca50e490f68b1673076e6f7ed8
-EBUILD pyhcl-0.3.6.ebuild 663 BLAKE2B 921c6946a3fba46f521be6614ed488014ab18b0bd59ad59af3e0f0e13ece2ed38c2e0c0c6d3298bebf53cb62d47a26eb3cbc43116850614916cacf0f1d4c709c SHA512 f817926281668c387bfa2d02525f14ae010344dd1eaace7376013b1d436c8b9b9ecbe43d50447c235310ce102e554cbadad36aca50e490f68b1673076e6f7ed8
+EBUILD pyhcl-0.2.3.ebuild 657 BLAKE2B 24f0761696bc12240f971eb2c595ba6632813f7f6d2f7f9e8f7e64f0833101d6a10bd8efa17229bf76788bb426f40a71780939aad197608c7111849ad77686e3 SHA512 6de9f4f5055d39f09255c610655b43e15c4611a769d12863c80cac2ab5cc197f6d1dcd9ad3faf07e8bca3d017996d7d3a5ee31797d3de609bfcce47d2da9ab46
+EBUILD pyhcl-0.3.6.ebuild 657 BLAKE2B 24f0761696bc12240f971eb2c595ba6632813f7f6d2f7f9e8f7e64f0833101d6a10bd8efa17229bf76788bb426f40a71780939aad197608c7111849ad77686e3 SHA512 6de9f4f5055d39f09255c610655b43e15c4611a769d12863c80cac2ab5cc197f6d1dcd9ad3faf07e8bca3d017996d7d3a5ee31797d3de609bfcce47d2da9ab46
 MISC metadata.xml 319 BLAKE2B 031effabad2704b3a367b95ea2065bc003e5df6575cba63b83a786450e45d3969d4eccac42fa4a413e8484ba60fd25e9028efa05cd3d697cfad1f15c60295279 SHA512 dffa813a0f0b7c76a978c1321d13723b440392647bd2cdbf26366d9fb2d7c572d4b726797cc61c249f25dac38ce9df9d71ef5de517b513b6ac3000ef72e06640
diff --git a/dev-python/pyhcl/pyhcl-0.2.3.ebuild b/dev-python/pyhcl/pyhcl-0.2.3.ebuild
index dfa1b6a6e7db..9ed0dde3c5bd 100644
--- a/dev-python/pyhcl/pyhcl-0.2.3.ebuild
+++ b/dev-python/pyhcl/pyhcl-0.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyhcl/pyhcl-0.3.6.ebuild b/dev-python/pyhcl/pyhcl-0.3.6.ebuild
index dfa1b6a6e7db..9ed0dde3c5bd 100644
--- a/dev-python/pyhcl/pyhcl-0.3.6.ebuild
+++ b/dev-python/pyhcl/pyhcl-0.3.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 0e1507f55b9e..14376da7653f 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -3,7 +3,7 @@ AUX pyicu-2.4.2-testLocaleMatcher_pytest_old_icu.patch 489 BLAKE2B c88ffa0b90c82
 DIST PyICU-2.3.1.tar.gz 214761 BLAKE2B 6571f1c10b6fa15b0b6fde76c16b2e1a1fa99af83db615aa7f7a172844183ca2a818747749b38e36162ff297c3e99311cd3328333880374c1c151955fe983f78 SHA512 edb60320ffe649f257d4d691ad9cc8287a7611de6a970d33a25a6e12a14c1faa591023d99d0b10619b0860bba70d1b67af2eff5cf146381afcaa872f0af1be29
 DIST PyICU-2.3.tar.gz 214710 BLAKE2B ef676cce089962d16a88193e7aa2ffec739086e5bbef201c8779a372a5876bbb1e63e5e92a7c89c879b91f063e90d4fdb16a1967dff5f2ef658cde95f9fdca6c SHA512 2bdbc7fb7c83e58c9d0d53dadf8fef92d8dec02e9eefebc75bac43c19f008ef2a3219d41b62c426c41a055bb4530b2f7ef567162660d6021b8d2bf9e99090f94
 DIST PyICU-2.4.2.tar.gz 219356 BLAKE2B dc6ad1e8944e43560314e9dbfcd37e58b52b50874656f7ca66497a317b03bb9bf988515417660be87bb2e73e0484e5870cd3db2c5eab47fda1223e7514935fb0 SHA512 3cd1f632c2551dce3d721c54190a19c2a46e2554ef54915c9e07b133fa4a499b1a8c49f406abe9777721903799eb23a2d55d3b1aadd758870f8bd591f143a05b
-EBUILD pyicu-2.3.1.ebuild 785 BLAKE2B 04bf55c6ae86a69e7a28ccb7f84a85c17c4db2dcbb80cd89f2dbf60dea13c49ae51494b011b5f50a8ce51bf7bebf20903c8934c4d13fcf4ef925e45ba645b79d SHA512 bb29584503c784ba7a88bcf8c7499a2a9a23c5888943107cd64c71343662e046ca7058f9d24afe191c98fd9a3b5a59f695650452a342ca897c161b029d8a7f4f
-EBUILD pyicu-2.3.ebuild 845 BLAKE2B d9da30f3d1a1b140fa57dc4141bf00c0dac63220cde34189192e997453d51865a33c460526fe6e8fe894c8daa1174738fad304ea093a2549508f82e90c76c9ee SHA512 356fc3125222240ea87ccb50c35daf695e33ce931592fc80077a0acb5c97c08fae00108373f6f81c77cf0c35c0fb42a84633176bf0c1079273480cbe65a05bd1
+EBUILD pyicu-2.3.1.ebuild 775 BLAKE2B 2f178c3ee4067460bd5a49d29ae9cc47bf6e78b614d17deb19caa6b652979d140cbf78a0bf7faae06ff2ae850116c6525feb8606ee4bc5620b8a6c8d2256524c SHA512 f7540a0c72afa119f7b212349239cd607f2ba95dc99d8c29aedb27a022406f52eb7d15ede90c0cab6bc8aa63164eb37584cf03e360263129f21a1ef3e6bfea12
+EBUILD pyicu-2.3.ebuild 835 BLAKE2B 52e39c7d72a82109a49f0d62eb0abf93deffff2ced36eea6de727100bf317e7db9e33c9ae8d9702ee2ad7c4f3f4cf12246ca6b09ff11827b38d7f5c901deff83 SHA512 15b1ca8d15cba3519fd489c006acfc1f40a01fcf8d53b6afb39607fb670a80dcc8c2758b30fca93fbd5de729eaf33c0f6c71edadf33a53ed659b94506698779e
 EBUILD pyicu-2.4.2.ebuild 687 BLAKE2B df7b23c0cde6640b834213ff3bafa424e781a50d13ef6b3481239fb9e6153301d932ea68c512a96bf11444ee3d57e6cb75e22acd9b821a6d8c32bce7ed8dbaba SHA512 a9ab9c9bf93e6c99b91041c2b53f8d1eb872e4fe610a36f4541c767cc1d107b0fbef4184d3861dc116f4f120c481c9fc4dbc9a726fa958d26f349104057dede0
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.3.1.ebuild b/dev-python/pyicu/pyicu-2.3.1.ebuild
index 900deaced5b1..de37a355455e 100644
--- a/dev-python/pyicu/pyicu-2.3.1.ebuild
+++ b/dev-python/pyicu/pyicu-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyicu/pyicu-2.3.ebuild b/dev-python/pyicu/pyicu-2.3.ebuild
index d8979e1a150c..0be3b18deef7 100644
--- a/dev-python/pyicu/pyicu-2.3.ebuild
+++ b/dev-python/pyicu/pyicu-2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index a21cbbab837a..2af84a496c1d 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,5 +1,5 @@
 AUX pyilmbase-2.3.0-fix-build-system.patch 1169 BLAKE2B 6afa0faf264ffb4c863a148684d162ef3154fa2802cffb2802315933e5df4781fc24d9fca23a985627a29d123a53cd4d6815beaa3b56487cace67896a22ae57c SHA512 691cdeec3361954fd41c085b38f8ec3a2a6a024ac174aeecb2b32df83844c3e25dbffcb3905b91e0b516eea6ac4597a067bb9ac794a25f5d1ac8502094b4095a
 AUX pyilmbase-2.3.0-link-pyimath.patch 454 BLAKE2B 5e2bc6d09bb7012f8d0087aa0d76b8a89280349fa978cbf926cd9cbce1b2b611a6862d73da35642e037ba84161e658915831e63ed9aeafac9db5669e38e5c4f4 SHA512 760a217d5af2e8de48f52351bab18370f3a74453135a401d8f5d964d3c445519ddc41a853c989c4f29d492764e42dfbcf4a8bcf839e43164b4bbe3e125e9d1fc
 DIST pyilmbase-2.3.0.tar.gz 524975 BLAKE2B 7c3114921392ad29198025c672c366e6c98d2da968ed213ccfb446533b81fae4b78c687aba2108e476e16c4e97f11924799d0b0474ff3f82f17632f886bb6a39 SHA512 c20c26155315f2ae38efc183e5f33e2c18610365f5f1bca7a50363a005ff91c8782177293290ea037cf5f164f9b404f5710ce3cccba862e5e7f830727753589f
-EBUILD pyilmbase-2.3.0-r1.ebuild 1509 BLAKE2B 50317fb153056ef663b190fa06be7b782c2b2a8f20907ef9c19d71136129e4f58504c6963298f39673a46d782d955a03e5625aee004d25c676c75a53540804ea SHA512 3d614e898140b5bd9536e34cb19fad89ddcd73916820df2c5acb2548bfd009ea337e078de9bf1d441a5156482487c6362eb0853dc18654ceb3c97028591765b6
+EBUILD pyilmbase-2.3.0-r2.ebuild 1563 BLAKE2B e13ceefe8eaf32d75d8ea61372cebc26f057dad652f76660300d149016aa7c6820a51e64a3b01d688d973f41631d1e18641e82edf045b1573320546e2dfa8aee SHA512 2c2e81c0530ceef420aa1aa7f0ca8cd3a0ffff251a47b12d9b141111339fa8a4894478b0650acc056bc016220e14392e59309b18155361a38b533e0ec9b1d3ec
 MISC metadata.xml 537 BLAKE2B 88a1d7d89fac2094eefd766ad23b01c12cc49bff080e83f6ad63318294c97b18ecd83c6d908979ae8345a6601898b7a01295d9db886f0de500e460129d9c4a6a SHA512 c685de970979ac4ad5c3392a4b41b23bb523da5d003e3f6757a8d61fbdf0be1ea2bddc1a756176a9887101cc5bd6e19f5ac7e038e9dc9e5976c676a8817b9a87
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0-r1.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0-r1.ebuild
deleted file mode 100644
index ea1f2d49fe50..000000000000
--- a/dev-python/pyilmbase/pyilmbase-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="IlmBase Python bindings"
-HOMEPAGE="https://www.openexr.com"
-SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+numpy"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_USEDEP}]
-	~media-libs/ilmbase-${PV}:=
-	numpy? (
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			>=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
-		)
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=virtual/pkgconfig-0-r1"
-
-PATCHES=(
-	"${FILESDIR}/${P}-link-pyimath.patch"
-	"${FILESDIR}/${P}-fix-build-system.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local boostpython_ver="${EPYTHON:6}"
-	if has_version ">=dev-libs/boost-1.70.0"; then
-		boostpython_ver="${boostpython_ver/./}"
-	else
-		boostpython_ver="-${boostpython_ver}"
-	fi
-
-	local myeconfargs=(
-		--with-boost-include-dir="${EPREFIX}/usr/include/boost"
-		--with-boost-lib-dir="${EPREFIX}/usr/$(get_libdir)"
-		--with-boost-python-libname="boost_python${boostpython_ver}"
-		$(use_with numpy)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	# Fails to install with multiple jobs
-	emake DESTDIR="${D}" -j1 install
-
-	einstalldocs
-
-	# package provides pkg-config files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild b/dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..c3f5e7b949a1
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.3.0-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+numpy"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	~media-libs/ilmbase-${PV}:=
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1[python(+),${PYTHON_MULTI_USEDEP}]
+		numpy? (
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=virtual/pkgconfig-0-r1"
+
+PATCHES=(
+	"${FILESDIR}/${P}-link-pyimath.patch"
+	"${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local boostpython_ver="${EPYTHON:6}"
+	if has_version ">=dev-libs/boost-1.70.0"; then
+		boostpython_ver="${boostpython_ver/./}"
+	else
+		boostpython_ver="-${boostpython_ver}"
+	fi
+
+	local myeconfargs=(
+		--with-boost-include-dir="${EPREFIX}/usr/include/boost"
+		--with-boost-lib-dir="${EPREFIX}/usr/$(get_libdir)"
+		--with-boost-python-libname="boost_python${boostpython_ver}"
+		$(use_with numpy)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	# Fails to install with multiple jobs
+	emake DESTDIR="${D}" -j1 install
+
+	einstalldocs
+
+	# package provides pkg-config files
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index c5f8a1718294..d22686e36ea3 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1,7 +1,7 @@
 DIST pyinsane-2.0.10.tar.gz 327159 BLAKE2B ae63e08fc557513ccac0633fac47bb29b3c8a023c481289ec60724f5fcdae0827e02d5f37d3f104d454ebcb1d1a7681248866461bce6201f056c988f858aa0d3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1
 DIST pyinsane2-2.0.12.tar.gz 56107 BLAKE2B 81085e414f162c4fe3623e05b904c35864b95c8ceb5aa25cb92aa87086d4ee44f9f1bea58239373217e93793bfba0d8bb894ab75d69d6c213741cf6e53721284 SHA512 72fc87d5c7eab078f4a9694569c5759046587a8439820fadfe1b8899b7445e063f9fc2f3e93a86b1f9329f729466a5e19b86e46c128caf9ac8b143cfd9e17817
 DIST pyinsane2-2.0.13.tar.gz 57172 BLAKE2B 26081f7df1d4077f2580f8968c20a88092446136f441fab16a8bc1e34ffc9d5e11221c6a3f74a111f66f839d3cea5ed7518ebe4321b563cba1f3cb3a6053bf74 SHA512 613ea6aae00df550089a691ef6cdd00ea00324ad3a02e35bcb1cd1b0723e34afe9692828100115432e5df9c7bef09f861ce3e1d06915c02c007f92bc8030a91b
-EBUILD pyinsane-2.0.10.ebuild 840 BLAKE2B 8613c08aeff2ea0852e82e016b133ddd26851a4124b4d8eb636eebb9df2b262963ed424c0d514a14f30b82cc1a47e38f09bf695fdf9f034261db6da268958c0a SHA512 45c6ae194e5d6a7dd2bdf9c483151968e12a8fe6f73209e6f3d4e78561012a353d335c33ecb63345100cb818d1998b7476714ec543f9ca78fb146884e67ab86c
-EBUILD pyinsane-2.0.12-r1.ebuild 793 BLAKE2B 83df4a07b3e5f85d9a4e8235b7ac24301f80bcf6f3cfe0f5487ce7378d066d979514611de0f14214bae8d3e3df5a29f7853ca21defda04638c113407fd260765 SHA512 a87fbd7e86ecf705aae08116b26041e062966d04fb066813a6f687105585055b1328c9197f438a4e4f7722b06b61aa1866b9db90b759a94bd2c1972d96533c94
-EBUILD pyinsane-2.0.13.ebuild 801 BLAKE2B 30b35b95a5be24c11257bf94ad1be5ccb900c49302bf7bf571072c0a6e6ff67df668dd994408eefd6fedcc189e9bf1b7d372a2cfac08291c9f8c020ea16b0246 SHA512 221c6f63f7e28df61a47ab0bf1fc0f2de286deb19d9f8c034d8a22433e5da4faa691a45835dc194cfafb81fdc7e0dc1bbe811d6bdc8c0f53e41c5f9e52afe786
+EBUILD pyinsane-2.0.10.ebuild 834 BLAKE2B 99ac7e84c8ecefbf29d517a64e8f15a6208ff16114714ad2852d7a882793bad15c9577f3e8609196ec3b00d4ea9f5bc54509e8b45634ebe494bcd4f533ea1c06 SHA512 75614171a10ff589b35e67652b3c4781f96660c4f98d0d3b7fba545b06a30621dfbb28ae5cf20186f440d74c2aa0fd7be565b7165d3d6e782bfb7675fb77300e
+EBUILD pyinsane-2.0.12-r1.ebuild 787 BLAKE2B b072df83113c52b04788823eebfd49c8afd5f05181bd6304cc6ce3a2437d9b23807f948dcee01dee8188385abc97b63efc392d7b472096d44e3c2f979cab7211 SHA512 5f62685d218d2915616324ca576c95aecb5635e272ccb05b0118f67e41025a443a6adc6104c329b4d8bfe50cba90e72a97829e6e3506996e5ff8594d022fdf1e
+EBUILD pyinsane-2.0.13.ebuild 791 BLAKE2B 032594d9eaa0c79ebcb9b9e30689aab83b22715425402840f512ab6e0d8deb6182473669dcecb0dcbea451c30d9c847b11052de30f4815e114c61e49b7c3aa5b SHA512 730a723c9bb3e09459320c8c455337a8932ae5861a1e33ab5bf8cab167c13a50c6350c0680c6470819e09402bc945ff1ecdf66371509a1deb87d353260159782
 MISC metadata.xml 970 BLAKE2B 66f9e22270e1f6bb94091085d49b6ee20aae2cc8c32e8e89b8325190b21932ce2431545b7bc72384ea2f82d9c71577d5ce08434dd2c9b237de9c7056307fc99a SHA512 1b5b839ca3e96ea99a6239cf6d5989710484b595405a3ce06192587984a0a5552bfbf0df770a3b986e078f4bbd27338d378f775cc0afdfa5bc4dc17190bf1e87
diff --git a/dev-python/pyinsane/pyinsane-2.0.10.ebuild b/dev-python/pyinsane/pyinsane-2.0.10.ebuild
index c1bb4b1380a1..601103ec150e 100644
--- a/dev-python/pyinsane/pyinsane-2.0.10.ebuild
+++ b/dev-python/pyinsane/pyinsane-2.0.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild b/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
index 715fc0d6213c..5dba14178755 100644
--- a/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
+++ b/dev-python/pyinsane/pyinsane-2.0.12-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyinsane/pyinsane-2.0.13.ebuild b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
index ea0d6273576c..2f964f566218 100644
--- a/dev-python/pyinsane/pyinsane-2.0.13.ebuild
+++ b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyjade/Manifest b/dev-python/pyjade/Manifest
index 3616936901d0..4e9e957503ca 100644
--- a/dev-python/pyjade/Manifest
+++ b/dev-python/pyjade/Manifest
@@ -1,3 +1,3 @@
 DIST pyjade-4.0.0.tar.gz 29251 BLAKE2B 0a2ffb949022e9bb9bb12d9a1fa7680650a14634158429b2256320b2a75acc06e6c2ee0cbcd7ffba1263f6bfbbd40b097d7bb99f7e3a8fef95951c413f6e515f SHA512 0a384b843d2eb5884f2690ed5bb9b9b253474568ff1e9faca356a5c50749bb53fb759a099c7719bef495dc7af0073f143afad1c0d6d68f0f61d63624506f12b6
-EBUILD pyjade-4.0.0.ebuild 834 BLAKE2B 0e2ad3093021f1def540283ae0b2cb757411cf8457734f8f53335d0d6d628d657527e1a3ac384be7311284cce7b24bf7ecade8ae650203f0ee36250fa4725e6b SHA512 c6924b75a85cf4f4b2db33600ab80247d035114f1c1a18140f232dd9e0bfff3da61da8d6b008ffb0387bf25b80b5da08ac8cccf1f1ccb48c8f4095ff39d50637
+EBUILD pyjade-4.0.0.ebuild 824 BLAKE2B ac09e353a2deecf05af987f341d02f527f2ea8f85a416e0412144da4d8a785c71b3ac850a8d79e3f24389d7d023373bc2a4c3c72cd7655818268bb6d0e872f98 SHA512 bb1f4900fd09b14ca779f8d9630475b66054570ebaab6f5b1e0a5f16fb99223b27dd8d56615d64d6052336bf69c245dabc6b55bf80e67de20ca6f072519c45bb
 MISC metadata.xml 584 BLAKE2B 22bf5698fe68eb9258403988d1ffc4f1fd6532bbd598ec0c2252198af5ff39e6eb458bf26e5fb62fc12ed6877456268b26918f2fa195f63a6b01e999063fba45 SHA512 6a70d07be11b26ed7a5eb217df8dd8085df84b82fdc48c35889db2080b5923be1108feae6c44ec1dc99e87f0244870b20469b866f359e8b74d682c884394c620
diff --git a/dev-python/pyjade/pyjade-4.0.0.ebuild b/dev-python/pyjade/pyjade-4.0.0.ebuild
index 52ad28eff417..17d9fb8b211b 100644
--- a/dev-python/pyjade/pyjade-4.0.0.ebuild
+++ b/dev-python/pyjade/pyjade-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 308f11c7d85e..d70a55196dda 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,3 +1,3 @@
 DIST pykerberos-1.2.1.tar.gz 24535 BLAKE2B 5c6253d99857a5061f708e213e24e0ac34a6fa2a39332d5a0f27f30f1ac9eec45654966113c3036cf9bbe27ee9642748afe4cef845d2ceda26286ced1e2277e0 SHA512 048ed0238911b3e9970a5567ddc2b5e3b551e24bd8d08f06e5807f238c566ead9998e0efb0e3207f178ef2a8c9116f4ed4b7c728b9279f7a88f0945a7c4b081f
-EBUILD pykerberos-1.2.1.ebuild 536 BLAKE2B 0bd99d2ef3818ea896c4f84c312279bca0036b389b2308bce49535d031eca939c94ecafa63fdb0e9fe41e7934b166852876be1529af51550d200c7405571b782 SHA512 106a50e31cfd77b4138f7721df42fc3cc7bf8094727c3704d3cd3a3f17eaeea99a85493eb86ee371cca5c74b66853b53d0e609392045c6048e359169093a9f88
+EBUILD pykerberos-1.2.1.ebuild 538 BLAKE2B b91efdf6339c059e478a0933d84d2ea2e2bf185e6ef6e251c7bffa988464c5e7cc5b59cc4a05d178e6090de3650dc9bd8c45d2d08afa9e1d9bee17b01f5b06cd SHA512 3dd103eefc57a1a8f1c9d01f996639ca17300b2020627d6291589ad30e37837a1a237b74ba556360ad983b48b85d419f8c5f27b49ba9c689256f181ef4f216a2
 MISC metadata.xml 332 BLAKE2B c6badaa93a0f9f3000d4865e58d38f56d57ebf51fd4ee4f8d6d6bbf3926dd4b0b7c97e46df5206622579a788c86e12de778f2207da80ba97814ff16dc8d04d38 SHA512 a3246676e0c2f0430c285ae4f58b5ca754376936860c9d04d9ef46ce111bafbfebcd25e8dc28f1abfeca92dcbc6a329f711272ad7dd501bc9a1c7b34876cbbca
diff --git a/dev-python/pykerberos/pykerberos-1.2.1.ebuild b/dev-python/pykerberos/pykerberos-1.2.1.ebuild
index 25739a108cb1..ce8ce457faae 100644
--- a/dev-python/pykerberos/pykerberos-1.2.1.ebuild
+++ b/dev-python/pykerberos/pykerberos-1.2.1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 85c8425f395d..fe837fd9c794 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,6 +1,6 @@
 AUX pylibmc-1.6.1-fix-test-failures-r1.patch 516 BLAKE2B b471ca80b11beff5ac0119f5eafaf437a74022c977a884b8bdf4ef2afdb3d535ad6602db9b1206fb6649bf57ffe5bbd17509d3dda3b6604fcfa428b592dbeae3 SHA512 802337b66cbd188cc81208420448da24cecde3c01d435d6814437f0ee31850b6ef8a53f61647740da340a69971e5fe570cc2a8c1b31226e425ce7ff88bca101c
 DIST pylibmc-1.5.1.tar.gz 69525 BLAKE2B 5039ad7d99a5ca57bd6cf7f00c77cc8bba122fe5852de164df34a71b4f5d1e4fcb428e749a66d384691b74f30b99e000f5cb9cd6479af2fc324d885b0fa59aa7 SHA512 efc40fae9721a6be589f87b66109132d4656725f718e1d63d7d25b9b27790b7c00fc3c7e4e47235895b7127cebc64229ddb284d23d0d903d3a510da7e1ce4549
 DIST pylibmc-1.6.1.tar.gz 72061 BLAKE2B ebaa6f9dfc341d862a8b46bbbf0db1420ff400cb40390f7bee6bf198ff941ad7967b578040ffe1209721ea84a163a39649108a2a23f3dadc2d579db740b2ccf3 SHA512 a3874435389486b29bab5f1d29e5c179d67655d90995bb27fcb7cd46ce7eb3b60117b94f901602f8a65dc0e587d5f8edfcf15e259effd439411adb58ddb7065e
-EBUILD pylibmc-1.5.1-r1.ebuild 1382 BLAKE2B 21583c85b025654e1a73ba9f4570e6a0c410ca9f71efa2bada619f92bfac3a4bfef60f5909fdc28c7993047170c1fc5f20ed775d3a4465b5bd55762bc2640e9b SHA512 44bb73a2c7b520879ecc492ac8f7da83482b9888fdf280055c60cf8e0a86054de5d702799440b3cf1f4714838579a0cc5010737e9f81a7340795f982f72b20db
-EBUILD pylibmc-1.6.1-r1.ebuild 1976 BLAKE2B 79301413bd22a709220b73cc8a2f67b4651d7e59f2c7c3ed0d2a3f2df1923c6e871cd8d202a6a35f9f7b0fe3b6d770832abce86df43f96d764a6910ce20737e4 SHA512 04d1bad43c50996bfd87ad22c4d921ecc6353c039aaf9337d36ec30938e6909c1481d4a2ad23544df243736a3c4850244e28c711eb0822569f0a476f1f21b94f
+EBUILD pylibmc-1.5.1-r1.ebuild 1376 BLAKE2B d26e9ad64e2e0abf63107b806bdc1941bd9a9ccb4aae0e2f6b73a97a7c6b806a69278025b75d297c4e274c14e5b0a2f2ecc2d2254cc622b046f41c2d9f517c40 SHA512 d32d76d77dea1bf978eacee8f017831727862536aa8719d6f6e046269a862397384a96f6649e66abae110bb700c635c71598ee1dae3c301148af12c184313e05
+EBUILD pylibmc-1.6.1-r1.ebuild 1970 BLAKE2B a450ca3db4bd02d848d7662f54140dca8ce8eaf6aa61343d05b7bb14c0921c1f3eafa2bd0a15bd00d3d872703064da34f4a96fe8df95e11d453e063e329c2dcf SHA512 9249dd876acf2c48c33e962cf063d8f7f7fa34b8ba7588a675ca4e84d52c5e7d869badcbf411015d338817f065ff2655acef83c0a4a5f09cc958d496baa40eee
 MISC metadata.xml 366 BLAKE2B 5dcc369c40a052fcc6ff72c6f8fc46ffc8334c1a91e3f2e8ba8f9bf0bea7414d91833e5627f3d53b10e9d3d9f230b0af333929820a616433ff9d439cae888d2d SHA512 974f19bd4dd8043c07fa0001072e25b553aa82f4b9e9c00e579cb88e8819a4411a04b2e59cace18e0a8e2ce7395057e520b0bc78435865c4536b3de2e402265d
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
index c5c3088a455f..a8c201bb4de2 100644
--- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
index 0e0fadaef8a7..64bdc8f3b6ca 100644
--- a/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.6.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymdstat/Manifest b/dev-python/pymdstat/Manifest
index 0b2045c38e65..fc91c8cea6e9 100644
--- a/dev-python/pymdstat/Manifest
+++ b/dev-python/pymdstat/Manifest
@@ -1,3 +1,3 @@
-DIST pymdstat-0.4.2.tar.gz 5010 BLAKE2B 4fe196916809513b063144ca4097676e2c826f38bccfdcb387aabd95d6b5d471eceec1a29fc5ffb41e7019e1570e2d805bbfa10f22ec7ececcb30afd7fc1a4ed SHA512 2e3c07d59151069962e1ba601b3751b331e233fdc6bbdeb0cada69ce36a731c12bcc6447218cc0c1ae4dd63d39d2be2bc3677aba739797cc534c5e38d1c72458
-EBUILD pymdstat-0.4.2.ebuild 597 BLAKE2B 1194d4d0af109a3b6ea64039ef3fc3f18261d9205150d77d6717a5936c94c3ba0368cccccf631b99ae914e65765d8fb2b58327e5afbbefa78d7860b53cb24c6a SHA512 0bf67e168fbbed21bf8fec932a2778c606442f44ad67089c560969c1008d57ef1d393cdb1fc36f51da8ab9621d1cf66b9af81355da128cd480dc6e9720d561ac
+DIST pymdstat-0.4.2-r1.tar.gz 14798 BLAKE2B 179c88a8999b4908586a3bc1698de9df25e94203b723b2981f9ac6e1b2ef47845c9e625c1daa40990dff7e90aece34fc471c3c5a0278a85c4c526d37574e5fed SHA512 7c9815b365fdb37ffe37c65d280a3bc4370f09fb8dad18ff9c68f61b8cc906e6b8d8e0fe0dd1570e68349f535f23cfb8afd52ba805d78e795d5c6f9730f7f2d0
+EBUILD pymdstat-0.4.2-r1.ebuild 765 BLAKE2B 633359c082777877708393f2f6e7fa7da6d2d952476fddebc4737e2e8c77415f4d5c0a0cc82bfbb5bcecf19640a87c6dc78dce5d4de230c5a1850ae4c32f6abd SHA512 0b7fa466f7786775ff781119910df1b6a8871cc4fa26c3deaaaddd29950baefe19660dbad5fcfa1c8d6f4b14570c81c77e796163e7f44767611afe3d3af5f97f
 MISC metadata.xml 511 BLAKE2B 764b07013ad9a90442a60051d2cd17184b5058b24d1dfe08f0eac50102822e13cb38941e52b1f2a330682ab62d3b0f2983120b8985f0efc86e7dbc051d569f85 SHA512 54862557fb9d9ec32f94086ba8df5dfb5f4e4e804f1ea280157418b46ff9ecdedee8b3e333ec2643b8a09d54c769d010514789c3bc75fa28c75623b732a088ac
diff --git a/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild b/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..1ba2d042f2be
--- /dev/null
+++ b/dev-python/pymdstat/pymdstat-0.4.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python library to parse Linux /proc/mdstat"
+HOMEPAGE="https://github.com/nicolargo/pymdstat
+	https://pypi.org/project/pymdstat/"
+
+# drop the ${PVR} if there is a version bump
+SRC_URI="https://github.com/nicolargo/${PN}/archive/v${PV}.tar.gz -> ${PN}-${PVR}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( 'AUTHORS' 'NEWS' 'README.rst' )
+
+python_prepare_all() {
+	sed -e '/data_files/ d' -i setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" unitest.py -v || die "testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/pymdstat/pymdstat-0.4.2.ebuild b/dev-python/pymdstat/pymdstat-0.4.2.ebuild
deleted file mode 100644
index aea52cd31c37..000000000000
--- a/dev-python/pymdstat/pymdstat-0.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to parse Linux /proc/mdstat"
-HOMEPAGE="https://github.com/nicolargo/pymdstat
-	https://pypi.org/project/pymdstat/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Not included
-RESTRICT=test
-
-python_test() {
-	${PYTHON} unitest.py || die
-}
diff --git a/dev-python/pyminuit/Manifest b/dev-python/pyminuit/Manifest
index 80a1ab6d640a..4362a5867040 100644
--- a/dev-python/pyminuit/Manifest
+++ b/dev-python/pyminuit/Manifest
@@ -1,4 +1,4 @@
 DIST Minuit-1_7_9-patch1.tar.gz 430753 BLAKE2B 19c19177a19aa4af27e3feac9df7c526e6536a7e4fad45c94b83b5080e2286e26949bdd5055da298156c3468aced288b5e38d989d00cf93a07d7ad15f111da65 SHA512 741ded2e6e999e8edf1e067ce9c2583784f6c1a7e34709430074d1f312de3a5815249466fe0a1c5be0a2f77932f34cbdb4bd1eb9de1b3528223711f26cbc65b9
 DIST pyminuit-1.2.1.tgz 17099 BLAKE2B 9cefc9e59896d82cb7efd39085ab117a57b874bdae9ecc43fa2011b3148538fc3eeca0f086fae0d7b00cc654ff14edd9d63649ea71be35a795236bbe96c0e2a1 SHA512 b5bd954288d57a6c043e336ddb62a42cd4e6cc340847fbd700573db288c4404ef80a86a76b3c4e458913cd73b08ea97b20a4e411043a6ce826d9d88ee54fbe1f
-EBUILD pyminuit-1.2.1-r1.ebuild 821 BLAKE2B f786645a16195e77819824f762187f9a9eac06193d312ab02c6bbd4fbabf967d26fddfb06422aff77d9986131e94898b8183252cc9d95cfe32f9d3032ab57b0d SHA512 84f77dd75479cceec474a654d72b20e57340f97b306e512be1bf9a92f39e13195b42ad37a75f5deef95779fb7a3ef7865b5d455f711aa914ebb50a21e11fe4e3
+EBUILD pyminuit-1.2.1-r1.ebuild 811 BLAKE2B c6ac15622849e39129de07d8f553f24d5a7478bc7971eabc1f01c015ddee14b0346bec307ce6a4f98ce7434cafbf973649f6113d3cdb8c3520f718c325a87d0e SHA512 c1eeeb1304ef0f6157e9f9d1ed453cd35b826d664bc726bd888aa158c5147ffb7db8c924f1638fb26d59c2d95b4643b71117c98583f695fd39a40ec1c0c3c3ad
 MISC metadata.xml 333 BLAKE2B fc246f42c3d2c2579bf2f1680c6189e76073224392758419b47399bcf44a12770203750edfebc77ee6ed45f3b76b6842a65aa59df0f2e610d9f8380db7c1206d SHA512 46169e56ebe63dbd8f7234dd06f9bd7b36f2325ca5c145207b638fde9805bb2d9361f070599aaabe69ed127df3ac419fefd6b10a98e9efe03afcd72aba2eab2d
diff --git a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
index 53450d42c7c4..7a244d8663ef 100644
--- a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
+++ b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index cd33ac231784..69ad94602096 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,8 +1,10 @@
+DIST pymongo-3.10.1.tar.gz 715892 BLAKE2B df1f8ae34366ea9de633be7e1ca103a2bc704a18a9b23cb1fbdbc8d116e939d4d5462e18a076149d93dcb8ada9f4737ed2d61b08803b546dce89dca4b2416689 SHA512 5a73ac17ef6f6783a573facd90879dbefa0c95d69123bc67c1a6af0987cb5786f637b8fa81a6810387acc34829a4cde33b848ac0f7b08f7d07faa90a8e13b595
 DIST pymongo-3.4.0.tar.gz 583303 BLAKE2B 2031b52731db8c5def167b2aceb4e1d064f0ff2391f71d2507cfc03ab932b4e1150d61a7b039b6183f5aa305e5e562110709a858174f37f0523d44d50d7c642c SHA512 c59dcc08803f23134aa4a86605fab0f5c59b829325b632fc1e0149f20018a544b3d65f3c1fda6066248cd258715339b1771ca8d40c38be02c301f5b6421abd1b
 DIST pymongo-3.5.1.tar.gz 1332463 BLAKE2B d581409a4b6cdede3e126e31747d34ed0e238919163ed442477ae51765ebdd1ebfb53fc94f7f1f53161c2019bf9db46640730aa54f19af6af25a37c95372308d SHA512 67526bcc27233b85226d7ef6aacce6dfb848efc88730fb8207c3b610f3943ac813f6c2842b7e514d733a65a2b7ea4f255574732e42372551b1b333e3437fd82f
 DIST pymongo-3.7.1.tar.gz 723014 BLAKE2B fd0be64f01006405f30e8d96e5edc0d565a8b67ec057a27b6143b4dd0592e2302efea65b6e3d4898d12e196b1efe01787aa608d8564573a83bfd193c703ba0c4 SHA512 34f7448c90a0741d1c80e5924d53e70d5c4bf74d140ea50cef1a519e11b7429dc8551ddb868ec4c02351da6619924ae0d4f7bfc12ef4fa9635c81e2f69aea30f
 DIST pymongo-3.7.2.tar.gz 628611 BLAKE2B 4eac5f11c8cd9a1bf8e0553a1fc3ec8f0a4bec0fd6b04dd75fe85da7315baa0e81a3c2b2aa4eba351aa4206aae974bce263f0630ac8828d8a982c4902cf7f518 SHA512 4d1dfe03d94f381f27cfb5c8dd4f75ecbab90567fdc4dd594b880031e68825eda6285c8b261a4c9d76fb7ccc92c91e27ae2f696525f7732b1f0084794042a33d
 DIST pymongo-3.9.0.tar.gz 701117 BLAKE2B c13b53f06fa1788f65de46b6a05474355e312a1cdd7798610b300c1a7bb9964d32243da52a4dad61d5b50e736c717f5549f61b28c06e1024505bdd3ec04ab99a SHA512 3ac8831ffd82c27bfbf8429a38fe26aed177ba68b89d0ddf043adfde326b8c01eea9be449bb985421f42677fab4dd5ab44e1c1c9eeb3aff41d792c660fe23e0b
+EBUILD pymongo-3.10.1.ebuild 2754 BLAKE2B fd3cc5553f7b344b553c859a71586c151f9ad0dddf4ae4f3bcdebd1f5f2099aad5a075cd32ff22c754b9d1a5cefab615a82fffbb94c8c44a02d2294cc0fa9077 SHA512 9ced5b57b90a01efc2200419e1432fbc74e30200cba32b9404d538a69a8d0b9e45b6b327642bd56dc0c73bcde2c2712f59444ad32fdc3a887482c7356db5999d
 EBUILD pymongo-3.4.0.ebuild 2795 BLAKE2B 43856dfce31ef4cf7d50f2e6d3bc2fd09597679f71eab8c6b04edd3812a020cbb04c5395765162403df2e95b3ef4d97db2d4da0be194b24d9e6f923461c37b56 SHA512 c14ad372bf065907d3733dc79adf708fcf67dbcbcfbcb368f12fbec26b8986d323f8e0b48983653a8a83469faafa601aa5ebf13dd409bafd77ada3eaf5504a2e
 EBUILD pymongo-3.5.1.ebuild 2802 BLAKE2B 019b1b0629975ae5ec2a7db5602390eb27d88c95d94e9c063728a79713d77014c1bf6f78878bffd3eba0a6b09b8bddada4d67d5532577fe98c94e7673b97a305 SHA512 a8e98e1f12ae28d0a1d7e5f9fc1fa04aea17b55a0de7d8d4e878564ecba12f61aeec4103e7d4006fa18c9b548df14ec3fe589edbbfef00258ab0b4b64d85db49
 EBUILD pymongo-3.7.1.ebuild 2804 BLAKE2B f30723d00d37aa15e2c090315d81a6d20b547728e6ea5fffc747dfc1e839d478c6686dc17a5688d0e394255f485e110e9d9e6bcb95575efde450afd87a0dfd8e SHA512 44560233da8d029a10003de7fdbdc23e7d556ec8db1fe93b384710be5613a9d7197c2cc072214d30f27d47d1b801ea2cf9106be778c8dfb2072c9fbd75bd43f5
diff --git a/dev-python/pymongo/pymongo-3.10.1.ebuild b/dev-python/pymongo/pymongo-3.10.1.ebuild
new file mode 100644
index 000000000000..e81c0c548473
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.10.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
+IUSE="doc kerberos test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		>=dev-db/mongodb-2.6.0
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir html || die
+		sphinx-build doc html || die
+	fi
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	#https://jira.mongodb.org/browse/PYTHON-521, py2.[6-7] has intermittent failure with gevent
+	pushd "${BUILD_DIR}"/../ > /dev/null
+	if [[ "${EPYTHON}" == python3* ]]; then
+		2to3 --no-diffs -w test
+	fi
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index 866392bb3fe9..4a95530fe2c1 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,4 +1,4 @@
 DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
-EBUILD pymountboot-0.2.2.ebuild 606 BLAKE2B 54dad3dfa05af53df9a2d5c6c70810ed7af085afc69199105cba8fd58f7a7ecb68454e25228031d4e7e812e68247b427a40df612e740c93d69b563fb9246f6bb SHA512 84adb0f10115caa9aa690e0a9dcbb9068c4ccc33a55395c9624eec9abdef957b1640e827dadaddca9fa2bef2804f45549803cab7408891b04c6093b798fd6bb1
-EBUILD pymountboot-9999.ebuild 563 BLAKE2B f648052d9d7cee9a1598d6697de4411073df868800d94df3918977167bcdc9f71dbed182eb51caa84e07394bbd8d6fd3c2e14542ee988a8cd5bf2129c46428ec SHA512 73a99f2a5d2388e8a3a7a2749a69a842ef1bb56e814dc45ca1850bfb9d6a654306caa839760bc78a405e5a3faead904d6e19050a08b6ba33ea6d6fa680b4835d
+EBUILD pymountboot-0.2.2.ebuild 602 BLAKE2B 4b510d4960a7acf20f8f325306b69f8c23519cd68b44f89a6d91c33cd7fabafa0eb840d2055c03d4a727494e28f8728bad1cd80c2a3e31bde1652e1960993c80 SHA512 b7b787087724b1035a612ae4af232fbe25ca60af2ced7d9d71060c194d9607ffe90427fe87da43ee04a749adb8037dcfe1d8de5858d1d19aef1a78bdc3af8cd7
+EBUILD pymountboot-9999.ebuild 559 BLAKE2B d9c8544043eb21f27db3505bc64812fddfb61d9bbae7cae66f4a5f55b19ded78e63e9a073ebd631a55c03bf6dcc21ef2d4760323132b3457ba3167a6cb6d4eb8 SHA512 a1f02b414f93299d13703cb031018c22ba6a5112f2f6c3988fe62c1aad5e74b8248e95b534a2c021faa8b6ec3a8f7f8e94ae75303eac639a141b5a0a330f4548
 MISC metadata.xml 533 BLAKE2B 682a500aa018e96494eebe8a43af1bdd269fc0a0e049b2b022d014bd8e977fe8160202263d5d6ed5fb5022551ceee3b77ca92f58cdd272faa00141995afccfb4 SHA512 b0708a5c130422d6d5150f1a1d07386ea3494fa667acc4e05f41550d6c33e7334b559fd0b3e71bdce67b53e109ccdcba4e845ad10a0fd39b6505b8ce8b27d17c
diff --git a/dev-python/pymountboot/pymountboot-0.2.2.ebuild b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
index f1eb6e1e10ee..bd534a02f4e3 100644
--- a/dev-python/pymountboot/pymountboot-0.2.2.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
index a2d798cbd2f2..d631744311ed 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 20b689056d6b..d4512a2d7f54 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,3 @@
 DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
-EBUILD pymysql-0.9.3.ebuild 681 BLAKE2B 905d164e9bd84eddfa30df3f306c934dbae643ff244214806b0158ee9f5d169750a6c666b156ec7aa22ebd3f1f9730e658b13a21b3568d152af61616cfb6fbf1 SHA512 a0c7797311552d6f313e5fbf74e5436781fe2e7eb67c46d7831f0755886b4fcbb5335acda0a973c289d41282cbd866a5ab69f599e3d0f01191f1af4d8423b50c
+EBUILD pymysql-0.9.3.ebuild 671 BLAKE2B cb829eda377f33d56a4f92edb7879538e1078409f80d2a840983e42b626b113a740cd7d2034a5f8b0b51bdc9974cd751d8f59f731d5a763c849687f40c73f9b6 SHA512 d37e0b5edb24a3037b18a71a123201a7f307a81be7c3aeb68fcbc4f27b34c77ab65ef216c186d9fdbc28755f6184b314d65303ddfb36cce9cd3f9d6cc0a04f0e
 MISC metadata.xml 553 BLAKE2B a3f93a6e059fcb457326fe8ca880b1a268be1d5d847a0bd8648156036428a5e2f6cbe47adda3e3cb220c236b4307bb0dba8ea616842437e2408407fae01c16bb SHA512 3799a369db7d62654ead99e579ea2b7f19e33c35654fb4f721e37a46f4a449d67f1173f45abf8e34b330e87a872c0182d7a47dcda97a6d2c40e78ebfab6841bd
diff --git a/dev-python/pymysql/pymysql-0.9.3.ebuild b/dev-python/pymysql/pymysql-0.9.3.ebuild
index 8a6ccbb8e501..1357da57d3c2 100644
--- a/dev-python/pymysql/pymysql-0.9.3.ebuild
+++ b/dev-python/pymysql/pymysql-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 13adf7fcf332..7f67e13bf1eb 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,5 +1,5 @@
 DIST pynvim-0.4.0.tar.gz 53443 BLAKE2B de37fde43e90e8277f3c69cedde9226e929f122cc2ff3030766fa716069114bffb27ea9489f2de87c69d3e7a8e0ecc22397a94168cee542d37dc827dc3ed3d13 SHA512 4b3b0e295181cf8886850477d01daba1cba8ac456aedadc5b3881b0b4910724450c4e7774282f6edf3e322792b697ae8e925f40b2a0b181a95eee48aef42a97a
 DIST pynvim-0.4.1.tar.gz 52340 BLAKE2B 4efddfbb8d1eb10aeb53b77f665d6ee186f697cc9cb6b3be2001468755a80b0a3bd4e105fda498e1310be9f65da3a0a8b12209c46a7122bb70f860c0a91c12a0 SHA512 78cb343ad02603a0d1c8f56079b46a9d341d8808a19112e758e5299994fe12a433cd61a4dbbaf0d5ffe00c676bcff844a53e910093efb862ad48cc4b4326f7de
-EBUILD pynvim-0.4.0.ebuild 810 BLAKE2B 7f76e6dd3930b5753b9e2dc2ba5dbec74f8c8fac4f2b28bcd428950b6e455d702cf6be51a8add2b9038549391572be66e54c0d849c284cd65cdfc845a9d60439 SHA512 35f2da8c0b61d6cd1746f7e7ec434e38b3027e16a192ef0b42c903b71c42c101a63703fa25f7d2d7413dafa931aaf4226d93b7120ffb3a5b53fc7e955976ddcf
-EBUILD pynvim-0.4.1.ebuild 761 BLAKE2B aec1d6e96770f5947f21ea6766037dc13d0441aaf1197110c2469f7f8996309a4f6217c22a0d86f01e7188b7bcac8598eed5f2dede80ee98e33bf798a44928ad SHA512 83166637eaa445739d0c3f8e5553d7c079154c607c9d0ba44804d92427150b77aa7402a7bbb0cf3958aa17547a7420bba92f82d50246c94080d05d52dbe14ac3
+EBUILD pynvim-0.4.0.ebuild 804 BLAKE2B 79d4a780c572c34b335d97aab281cab2d27858ed91af929388f7e5141e08071346fc46c6010974c3feb634751de9c29f8c60d6b4acc92c140c84eb6cf32b1077 SHA512 9147d8cbfa96505c91994f812ad2f4350cab83dd904b7415754ce56fcbb34cc50504afa0241b1a5af930d9d1e85601c070300613ccaf3ce065a2c5b84ce002e4
+EBUILD pynvim-0.4.1.ebuild 755 BLAKE2B bf263317ab270c84d4c6fe87b36d59a5f29755abe51348d5e4c8303b58828256fed7a17c81a08422244df8f170c58307fecc1c0d6d6da212989281c841d06229 SHA512 ba1d51bb107398e7528fc4cc4ff71d2d1ecd090f70a275c218777c2ea6a0f6c797880222be2a77defdc7ee95488f2a61d13f75c5ad072413dda7b57fc33a109a
 MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
diff --git a/dev-python/pynvim/pynvim-0.4.0.ebuild b/dev-python/pynvim/pynvim-0.4.0.ebuild
index 08c2fb448411..d7a2b5d9365e 100644
--- a/dev-python/pynvim/pynvim-0.4.0.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/pynvim/pynvim-0.4.1.ebuild b/dev-python/pynvim/pynvim-0.4.1.ebuild
index cf1c0d3a5dc2..5b304badb7d6 100644
--- a/dev-python/pynvim/pynvim-0.4.1.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index aa9b2cd27a53..1ce957cfcd8f 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -2,8 +2,8 @@ DIST pyocr-0.5.3.tar.gz 18067 BLAKE2B f7e668630f0227d1e3df90de673f7c7b437f0c7ac0
 DIST pyocr-0.6.tar.gz 17826 BLAKE2B bc7239a5a9d07f55650247d0586bc0856c8f0be6aa549d2816a3703559fffc8b53aee5e23b9e5a24a2e1c655d5c605c73dbaff9fd3129fe08ffbd6f24709b07b SHA512 f517f5c9180cd1cbf0faa56f733a8b6015abb4af25647f513f95022dd72ee0ba07350475b238dff810a35677278f457dfbf9448a50b9c275fa4f1aa08f4a4c2f
 DIST pyocr-0.7.2.tar.gz 65376 BLAKE2B 065084c19c7722e590c5f20abe5248b2be0c76dab864b4a4e2c457770ff61dec84df7254f19e4926753f39a5d1ed0618ed87827b85773ab96a51e3f7798c656f SHA512 002c3302ed20e19e06dc6fd995ce30150fb95650824df9e0a3d6b2bdcb4c0ae3f2295342c2df44e0d5a9c9bbf5432f47a9d7562e4866b87738ac3436a8c0dec9
 DIST pyocr-0.7.tar.gz 67838 BLAKE2B a5bb88ca981cf2bc68344d739ce35eaa7db26cae28c581cd72a7855e67ac668ea064ff2a71845ededa640a8e9a54fc0aaba464527cc43acea5eb4edf3812bd9a SHA512 054f3190eaaafea0e2b591af2220af519d8a2fe3c623417e4b84c52faf9d98339570e896983713e9fbb54087f5eb4afe0b1d6f56e43ea894f7206a7c17203438
-EBUILD pyocr-0.5.3.ebuild 674 BLAKE2B 2a067307f564a198d2dfaac2c0de794152ae4e15119a898ea4f300391f0b6f84beff62c58a1f3211039e8c3572f7729089f3a443c5d0691f21b487ab6ac1a0cc SHA512 5b67af6a11c882dcc3dc752b91823a7012559b041b5b1c16c3b75c09876c9ec19efaf18b90bf97fdb15643bb6cde9e778c4db079120c2aceecd6ec419a4aaec1
-EBUILD pyocr-0.6.ebuild 611 BLAKE2B fcabc4767d0b06699103395fb93ffb31a47a9e132625e8e2646d3752e1504efcdbbe6dd4255518fd0fdce0f771cc455b0a1530818bc6b7a19f9d4273034a6e5a SHA512 ecc2c4020c0c9a10b82f214723ffec8200d0358c4eb469b5e13b21e8a83592f2a7a9b0403faf70cb84fb059953dc476877901c0f3434c7de4b1672ab27c43d16
+EBUILD pyocr-0.5.3.ebuild 664 BLAKE2B 12c233029442c95576313b327f580eb96e02a4700224be23f727d362e7c3bc699605336761b6f566bd396cfceeb740b6a1ca9504bd90e008c9671ac1ae09a7e6 SHA512 3a2a64bc7950fa09c66e229702cff757391b709c8f57b3cf4934bf4296b2f08dd82b48ee841ea0368c94f8392533edf0426d1fa779a3c7bbc11cffdfa2bcce97
+EBUILD pyocr-0.6.ebuild 601 BLAKE2B 48b4e0d62fd78c8518d880a9cc724f7885aaccd4964c93d9d0f282af47138f686ee794d8391a65f570e77f8776e214a97cb0ef40cf43d87899d743d467d8e1eb SHA512 89ecf9289ce80588fd8df7a97e0b947e46de4d395220a33c63536c42319e5860d54d8dd5a0756120dbb09b70e5c849704adb57dd183a87c5db4b47308ef38c0d
 EBUILD pyocr-0.7.2.ebuild 703 BLAKE2B b4bcbe43db888f8dbe7466ac4e88d98346d847be5535fb2fdc6da1d05966aaeea33afdc825f81e57970e9b2ab447fd2c247c657b8005f6a1ffaeb2707c5ab683 SHA512 2673f3cc01e424d8cdc6d501bb8dfd2ed9db58679a9f0063ba8663cab7ba7c8151cd46cefb07dafa68e1e31e5fa5eba6d868d88fe44c97b3fe97430f36160c98
 EBUILD pyocr-0.7.ebuild 703 BLAKE2B b4bcbe43db888f8dbe7466ac4e88d98346d847be5535fb2fdc6da1d05966aaeea33afdc825f81e57970e9b2ab447fd2c247c657b8005f6a1ffaeb2707c5ab683 SHA512 2673f3cc01e424d8cdc6d501bb8dfd2ed9db58679a9f0063ba8663cab7ba7c8151cd46cefb07dafa68e1e31e5fa5eba6d868d88fe44c97b3fe97430f36160c98
 MISC metadata.xml 1111 BLAKE2B 600c0dd7b6bd10906b03db7aa0963b440eb5cd8f2f06a4a8672e0f63960838881d735fb2268f652dcc1a4bf865fb71eef6bba888c0ee72c88d472c0184c80889 SHA512 ff3ac9646095f8434423a5fe098563c7662dc447be9ba395879d5b66dc76236898e94964cfc2f5034b2bbd08caecc3635adec65369dbb5c21ce1ae2e23fb7cbf
diff --git a/dev-python/pyocr/pyocr-0.5.3.ebuild b/dev-python/pyocr/pyocr-0.5.3.ebuild
index 04c7d4119fb0..3d3deb7c592c 100644
--- a/dev-python/pyocr/pyocr-0.5.3.ebuild
+++ b/dev-python/pyocr/pyocr-0.5.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyocr/pyocr-0.6.ebuild b/dev-python/pyocr/pyocr-0.6.ebuild
index e04aa833ed0a..3ba44f6491c6 100644
--- a/dev-python/pyocr/pyocr-0.6.ebuild
+++ b/dev-python/pyocr/pyocr-0.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
index 8d313791b9d5..f88eec3a65e7 100644
--- a/dev-python/pyodbc/Manifest
+++ b/dev-python/pyodbc/Manifest
@@ -1,5 +1,5 @@
 DIST pyodbc-4.0.16.tar.gz 204168 BLAKE2B 6e3ee7bad91f26992264edbac9db946d0c290a7a0ea7843ad4a13cc03aaec19272f91ec611e812bf9ccf86267d04ed3e69e07ede1482f5892a29343d39f543d0 SHA512 53f80ee7333210a1e20e89aa17ca7c2b57363826ac09069213454951ae35f8de689535c05b2278783e8b4a71d178860c3e1efebf51980343a59a9b190e41dda5
 DIST pyodbc-4.0.23.tar.gz 215152 BLAKE2B 856c7222394b2a8efa4bae173189bf4753c800f1fc98c8054766243400574b3ddb4e45841892b6baf87c5f872de5c78c7a1a3d6b48c3aef9d38a68653ba14fab SHA512 1788fd1118e40449af730a99427c3188a01ec85592bc2dcc7a49fdf0d4332e27add62cfc5e6c20d635064d8ff28eb8b800621d8127e309ffcac4aba144b49049
-EBUILD pyodbc-4.0.16.ebuild 615 BLAKE2B d85d03054c83297050ff8e52da3d8f42f2aca7c705bec19bcc5ea4ee60e216995ec8eb16167bae56a926e4a91ae6133be0d4693c9d2675dcb2001a186af3d33e SHA512 f315a108c45c01199df0d0bf58ca64d8521323173d032d68bd2480f4d1a562d132ea675ca1bf497144adb66d7c9f799f1f0a3c80cd94069d96dba7fdd15b35ad
-EBUILD pyodbc-4.0.23.ebuild 607 BLAKE2B 97502ccdc7a246b97182e01c93f96c48fc6284693534a958f4014285e7fecc5aaa796c874b1fa483141445b712b865f47f4667badeb050927931f10e3716aed7 SHA512 c6a0fb3d5ff93a095fbb19d521a9f81474a4861b4b9c9850289742bc7bd2335697974ac0a260bd57fbafc5be53ca489cac39421c3329153d4bc4ff923fc607e7
+EBUILD pyodbc-4.0.16.ebuild 605 BLAKE2B e033df9f847c3055910ed73bb2d1a9128df796e21f5197760cff87dc067a4ab59191e09af32bfc68cad7d3a9209dcfd29ad1a5962e8f4daaebcf8f970a8ae795 SHA512 d986b0a6c94897c8a2d3aa3372a840f107e80223f1af04c66ccad0a4983d74820d54c416969d2cc362b98c48a3223e8e1c79c0d11a21aa15dd24e2d3502fa356
+EBUILD pyodbc-4.0.23.ebuild 597 BLAKE2B 3d213715ecba570a87ea5532a439cdbfa781efdea11db31b57c17c9adb044d22891d2efac3a7716148415d8c9accc8b3ed9167fa635f685319a896a161b2f650 SHA512 923157efad63046380b855c7992d649e457e116a8513c181569e1a94ea0fea25b5e4bd5161df50c097cfbf06e22bf8224e0bf7feecd2d0f96f49f81b1894b8c2
 MISC metadata.xml 367 BLAKE2B 530fc01148229a40c7c1e062f3c277b8812a5c434b1a96112425906c6976aac3b4396c42faff69b2cd03a1ed1e5990453cee9d8f1eb8e355f9dde2d0b4f4d42a SHA512 4e776353a7d6e61d0572fe852830214d0ee0eafbd9bad6ba19851e093f413e7d5fcd7f8d33c7c75be107b98a3003ddf8432390694c7372b5bf7eae05379ea38f
diff --git a/dev-python/pyodbc/pyodbc-4.0.16.ebuild b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
index 44bcdedf1ee9..a7c00a8be7c1 100644
--- a/dev-python/pyodbc/pyodbc-4.0.16.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyodbc/pyodbc-4.0.23.ebuild b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
index 870b29529f3d..6e7514666a33 100644
--- a/dev-python/pyodbc/pyodbc-4.0.23.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 flag-o-matic
 
diff --git a/dev-python/pyopengl_accelerate/Manifest b/dev-python/pyopengl_accelerate/Manifest
index 3ad816caa4d2..e649582e76c0 100644
--- a/dev-python/pyopengl_accelerate/Manifest
+++ b/dev-python/pyopengl_accelerate/Manifest
@@ -1,4 +1,4 @@
 DIST PyOpenGL-accelerate-3.1.0.tar.gz 323541 BLAKE2B 01a13b0ce6d35896c05f3e5c7b485f20bf9867ebd2c81f1ece50dbfbc1ecfad1c10b35276fa830d932bc7ecbac059fe8376e3789e5c10b678963219a577a993e SHA512 2ba2f56b02a83225e42b80962b5ae6d4077387f88a4261e21c96b0bf66814922eaed8b6065e0127e819bde9d5d2f6b609100e32c589a1c17bdb4fa8b670dca61
-EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 737 BLAKE2B 2bb986142e1de34b023b3688d28673be4b8362b04cb18db812c770b5ec655299679fe248aabf3379a154acf7a006dba4d89eb0d6be9fd8364a11ab4116d88943 SHA512 ed37460a3ac75a52ed0ed4590bb6e4bba9aa49e613aad10b2a2d4acde4da4acde3d5f12ba9d293006fd1136a9d54602627a05d255d19eb89b71fc7455174313b
-EBUILD pyopengl_accelerate-3.1.0.ebuild 624 BLAKE2B 32e7bfd954f64df6eaeda6047587b0427e9fadb4bf3d93bf12e1aa87dcb070661a948fc83d98369fe0afbdddbfe92a22421f4b94689b4860fa85ffe053b4b3cc SHA512 c4552701391c8d533205f54ef597bba17827af9ce8f13e48fc8003dc6462e1cae2922b5949ee03232871038500f02f19fa67c8ebf9ed1fbbd10701095ca7b5af
+EBUILD pyopengl_accelerate-3.1.0-r1.ebuild 727 BLAKE2B 50041c17ecc496e1813ca3a1fe7f1d6fa8d4bb911a2f80ac37bff4970d429c6c56f931c58ddaa179d5daf0650bfbda2db83ed9896b13882995d9f69d4a3aa9f9 SHA512 6acac99c5453ad1d4d43d3901eea053ebbfef267c848b3eddde0d461af02d5c537074fd34a34a6c78051b4931b3ca39d69b41e9400988dcbce28a00e54659f73
+EBUILD pyopengl_accelerate-3.1.0.ebuild 618 BLAKE2B d5a58f68c01973ee9dd371f5f34ae310d410cdf7c8c7f94128e050ae9497ea2b1a730c97463bee779f565ce634999016537c4086ea929b20f4b6fb91ad8a0128 SHA512 be949d04da698811cb7c9008e257846ac9462ea23ce4b15e2d2e0b0247af05818f0139f5be4bd7231cf22f805ee13b03072c579d934a967b79944cd7742a46f5
 MISC metadata.xml 302 BLAKE2B 6554bf56c24bed0cacaf261dc5323e9c84c14e86973aee7cf510973a7e07999f5f0c1c5f595c224dcbb9bcab9d182ab1779afa5b304e116faf240bd9073baa1b SHA512 73ee5965c95e1bf6f45c78ad638b946d36d5a34115aa3307d84e475f5ca86e81a60283d5b50ccad3f32771e94220a06f9b8c85413047560dd99185f2b5ce95ae
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
index 469d1d51f864..96b8f543fd48 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
index dd7855c19551..7ca6bce20653 100644
--- a/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
+++ b/dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index 8c060b46368f..860a84941dfe 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,4 +1,4 @@
 DIST pyotp-2.2.6.tar.gz 10602 BLAKE2B 801f48646ff15a039b9295948ed292c3c432f8b0b629d249554259802335b7430a2c82f8c3bee1f54df71b0972ec293d69a2005c35cac120a51cec1a3548b2c1 SHA512 4f962704411ceebff967cf13af5ec5b815da0f82af665a086c4e5d53acc735453d638c65aa2afa40fe546e92d04a9250f6964cb22270a67c9609f8486eb5ba90
-EBUILD pyotp-2.2.6-r1.ebuild 587 BLAKE2B 9731c76b22a3b739f3c5dc029bff77c675ae4d1c95e602febcb8afc34b8b1165f78f88e84b7ef35cfe1991cdb03d87ddfd64b63d0537ea05e56a8b54fb7567f7 SHA512 d68ae838c229dd2a58ccfc6069a66761b7482c753678cd16ac56bf403e7b951e59db06d0a28fb20310639436deb14e335b518cf93eef66d24d8308c2cab3dd0e
-EBUILD pyotp-2.2.6.ebuild 583 BLAKE2B 95300638eaefc3cef89585a3800607e0d6668b7f3339280746e34dee125701fa6915eb255dba9b8cff29dd0ebe766d89ff32236ffca9329f53d20d519a34b0c5 SHA512 608f97ae8d9fef85ba32db25131af71971a5e632cdd9a480c79cd8182e33db97989ab7ced6ba368c4323eb1f1ebbcbc74423a99ea98e4c93b84e2fa0b9919935
+EBUILD pyotp-2.2.6-r1.ebuild 577 BLAKE2B 03c2d04bc29ba0cdbf2da8d53089018d0e4b5cede2d00832d69f2b254fc740744ab059ad1b91a36636b1d979f24e9588d2413ba8a94583b7c06261475b41b18d SHA512 26aad16ff2f93558824203e5d0374ad9817ed49256144ccdfa71987d134b1cddc3afd9f9505a3a191861018b291f3887b114468380aad26b44d605f940bd81f6
+EBUILD pyotp-2.2.6.ebuild 573 BLAKE2B 9011341ce11798c13277e92172b9ac5e9dd03b3a919ceeba6b9ce3f73bad963f2fb13b924d490346c48406328ba19382df9ab1772250b592c583f745cd6f1fb5 SHA512 14f0e91b57a969598cfb75d57b725b8d743d6432167754e5094232757067af84bf430d69867b12fa1078130deb2a5ed4f5ddb3eacda88fa51100c5042b3f65fe
 MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/dev-python/pyotp/pyotp-2.2.6-r1.ebuild b/dev-python/pyotp/pyotp-2.2.6-r1.ebuild
index 12994f968fe7..1ced362170ea 100644
--- a/dev-python/pyotp/pyotp-2.2.6-r1.ebuild
+++ b/dev-python/pyotp/pyotp-2.2.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyotp/pyotp-2.2.6.ebuild b/dev-python/pyotp/pyotp-2.2.6.ebuild
index 86e42aab00dc..cf29b9d0c728 100644
--- a/dev-python/pyotp/pyotp-2.2.6.ebuild
+++ b/dev-python/pyotp/pyotp-2.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index f83a9fe8be35..d888227e9f4e 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -2,8 +2,8 @@ AUX pyparted-3.10.3-greater.patch 342 BLAKE2B 857734d2466e5d1e9a9b7575dd41977836
 DIST pyparted-3.10.7.tar.gz 99879 BLAKE2B f2d03415ec7623fbe25aeab70e53646aa5e576e9f20ac41ffe6c859be9572874579f5720b8d05191107f4143e2c6dd14d83a05798a345fa0ed8a81ce2634f599 SHA512 c57fed2a8d04511b12891fd59b6dd6840439aada7e5ebeab14a56e6e4f201c249046ee87d9d25af1b3f02960994efb0a2973f25928a9df85d48bbd1bc196ab07
 DIST pyparted-3.11.2.tar.gz 101318 BLAKE2B 0c79535d6f3a269d5dfdd6c31ec80569d8c7432cd058f90999ebfd61ef727762a395d902539c49744108e92ba1a351c1ec939c02188869bed6c808551a843f92 SHA512 de6e7387e3eb9c9cb11e01f475d2749d2ce22ec2f11386df20cafcf83f7e431828f2db936f29c717e42694ff390a592598893633156a21aa7c8d5700a3c9ece9
 DIST pyparted-3.11.3.tar.gz 105305 BLAKE2B 271d0ed91c187c66219f06e91def5e868d81494241a2e9137676162ffa388523f5cccb3ec6dfed655cb59da1ca56e7fde3bb9fafa227b86d8f7b279759fe237b SHA512 b10a89d076a27a074d606101dccb62176299dd8f9da75a5a4bf9c8a6683d2873b649d948736e991e4cfa21d43a54e7d2934da8e539ce8626ae5fd47e892ae286
-EBUILD pyparted-3.10.7.ebuild 737 BLAKE2B 32748dabb689622b54945eabdbff9a3712d4e545eb71783c2bfc82f47d896700e0d8c77a3f233041ccd172fbbc4a71b4bc08c28c0d573e2490e17731e2fd54ee SHA512 c3f9cda8c8ea1786a77d2a9a9a58d8f97f4e30a2ba7a231715888a60cb5b6103ba58a699c94beabbd20d0e9dce076bf917e350d93cc24f2f7e19013c7b556741
-EBUILD pyparted-3.11.2.ebuild 743 BLAKE2B 4356386c47ef0ef69d335a1c9cfa2b845e42f2cd45044fac6efdb5b4c99f378e022db500807173eadd3beb17dbe450e13c7b173ae6b9b8932c8ebf270a7f1c2f SHA512 349fcca0abade57c3d2c5320957539bfafb8bbb037e3ad81bf79df6c81c8cb675bde5aa71a1cc4ff4554ed4ed6315e41ca140c3af7475f992fe4746bae035876
-EBUILD pyparted-3.11.3.ebuild 648 BLAKE2B 0146e0947fc1bc103a709f5dbdafd84fb3c1118e294e8600d8b00b0bc99e23fa610451929c153f17d6a3ac9a71ffce06a005775e95d73d2b71399c26d97bf420 SHA512 3153401638ed7aa514b14fe3dbc4e4a846fa75589d91c84c416a4d5c4ac1ce390d64bb8d5896740f230ee4ececd4c18fb4c53091a15cdb24842a80b0cc01732e
-EBUILD pyparted-999999.ebuild 576 BLAKE2B 5850b2e8739c42ac40dd5fc7b63795b6e4a68c9297dcc85142e901b18754e2cafdcfafdd589f7f845228558dad029a1f004be5cd5bb137e4f0f08fd7da2fc561 SHA512 9d5d05541cec6a61069e6ecab557a2daadc924b7db6a796ad8de2eb0b16b6d1c1d4e26109677bdbfa0fae068b4136e3cb736ef037a64eaa35703202da7a3b4d4
+EBUILD pyparted-3.10.7.ebuild 667 BLAKE2B 336c24225438cbfc6ddb4004558e4748eede5faf9d52151196bdbb4cdc000a09511f726b7efbdd45cc4c5b1e7142b7676e2e2a545d334b381d1639377772b523 SHA512 7f8d6cc677c9248df43279980cc0b5f8ce15cf2388d424b36ed5c68e2d5ecca64ec0c769e0dc0c8837cd3a49ee99e8bc0daed94792d55808d6598f6c681d0ff9
+EBUILD pyparted-3.11.2.ebuild 673 BLAKE2B dffead87e8b0ce41dbbba57a5fe3e2ad5f8e5d8e44f8b37c32fd0930b77ebcd43f77189c57af2f540977a1e5d0b038696591febf3be9899de085b65623b692ba SHA512 06bacff3ac2dbc4128d9dcd963b3d25c6c7cd502b8d67f5a5d7e75c370ed4c00b7dea412518fd992b068e8c59151dab1f5ebbb2a44c83409ac78729b1d0fd604
+EBUILD pyparted-3.11.3.ebuild 663 BLAKE2B 03a160c4c86cf707b9056c87a28b5678faea8f7b0db17859ce3ee97909a14d9da8c3a04ea1beaa7729b9eeac6bd393d4a2cfb2d053381a6926a6c919dabdc55c SHA512 0d746b9f11436c77a5d16a992913b4649b2a2d48881f03019ea412cb78ac9dd9deaa77743784f307cb7b55659170296dde41c2a3da955b083dcce10a35e16473
+EBUILD pyparted-999999.ebuild 591 BLAKE2B b723b15e1d8f84ce455925fbb289d7a1d46577f0797d21c146319a9704adaedce7dd3683ec0685df23c2205286010e651ce137ff565843553e8724e8aaec1f4e SHA512 def1ed802ca8daa42a40b232d0d61fbfa33dc6f98200cc365c087485ee942422f8b061f27032c733edcaa377b7a13e6cc06c350b05259ea03f0aba1d5b72a1f5
 MISC metadata.xml 340 BLAKE2B 580176d023e57197a2b4ce868c4ad2403748932547b9a6337fe63dcbabc43db523ce8ae7a5691abf3811995dddc047b64a7e00aca2f09c65e1544d0a172a9d54 SHA512 dc34de6235dd150a24b2cea6fd14028328a44fbfff6a75819c51fdd623f54b2f4bfa55f13cd827ddacbf11b0f9206c56025234948ec116e9df47ead634d8766e
diff --git a/dev-python/pyparted/pyparted-3.10.7.ebuild b/dev-python/pyparted/pyparted-3.10.7.ebuild
index 307aca112dce..9d7910371fc0 100644
--- a/dev-python/pyparted/pyparted-3.10.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.10.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for sys-block/parted"
@@ -14,10 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	test? ( python_targets_python2_7 )
-"
+RESTRICT="test"
 
 RDEPEND="
 	>=sys-block/parted-3.1
diff --git a/dev-python/pyparted/pyparted-3.11.2.ebuild b/dev-python/pyparted/pyparted-3.11.2.ebuild
index 5a9a66752a3f..d3ac7bb90e10 100644
--- a/dev-python/pyparted/pyparted-3.11.2.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for sys-block/parted"
@@ -13,10 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	test? ( python_targets_python2_7 )
-"
+RESTRICT="test"
 
 RDEPEND="
 	>=sys-block/parted-3.1
diff --git a/dev-python/pyparted/pyparted-3.11.3.ebuild b/dev-python/pyparted/pyparted-3.11.3.ebuild
index a058461368ad..5dcdba1e16b1 100644
--- a/dev-python/pyparted/pyparted-3.11.3.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_{6,8} )
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python bindings for sys-block/parted"
@@ -21,7 +21,8 @@ DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 "
-RESTRICT="test"
+
+distutils_enable_tests unittest
 
 src_configure() {
 	append-cflags -fcommon
diff --git a/dev-python/pyparted/pyparted-999999.ebuild b/dev-python/pyparted/pyparted-999999.ebuild
index b34350ec1632..edc745ca9d65 100644
--- a/dev-python/pyparted/pyparted-999999.ebuild
+++ b/dev-python/pyparted/pyparted-999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_{6,8} )
 inherit distutils-r1 flag-o-matic git-r3
 
 DESCRIPTION="Python bindings for sys-block/parted"
@@ -21,7 +21,8 @@ DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 "
-RESTRICT="test"
+
+distutils_enable_tests unittest
 
 src_configure() {
 	append-cflags -fcommon
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index b722293fc33e..fba0a982a660 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD pypax-0.9.5.ebuild 1088 BLAKE2B 891207cc729de2ca794e24a401ecf44eda535cb3e43a3044b738f74309888bbe8bc7d84d6b0b8ae89afe275163846afb92165fe0b35d071df242ba7e092eb44f SHA512 5d1c6285fefa89a5a1a9da68006b0f11cdbd26cb70544b16b92ce2ed8d31859591a107f19cfee16ef1ee06a6a14d7bd4ab8a2a2918ce1c0898bddb16cb89e476
-EBUILD pypax-9999.ebuild 1097 BLAKE2B e817420fdb25b820aa19a58cb07f8ea6100e2d48495acef16a48fc990342b6200c6079e1dbbb419aa902883f8ac11f2f0bb90ab6315351ca2c98f99dd69b5f21 SHA512 70bd0d9244dbb2a3ce8944f8fcb3e5ea7562c25979d600ab3b7c3baef76937ec11b7c9f5fae225165353f961df42d41ad694942886ab9fa970de0d208dd762e2
+EBUILD pypax-0.9.5.ebuild 1084 BLAKE2B 22f5d5dcd12da3b52b141b1ac0a52bdfbe3fbcf029cf1b50db485cde4a38aaf4ca8c19bb79cddf900e28d6116487c2078b188efeb0f3a9bd3010e76a087871f9 SHA512 d2469c37fb74c197d8e98da4e573c985813855e51a1e8009736b63323b4b1ab45bc7bc1d88ebe6ad35b76375145381bd3ee3ecdf9e25d6c20209778bd7267f9e
+EBUILD pypax-9999.ebuild 1093 BLAKE2B 8d9f6d3d872d560c0ca923e2084d6d85f3850c10ed8e4575302c4720085d317d5fd5100400a0d387158d3948a137d4127532493e85d0fc6507ec57ab1f1a76dd SHA512 57cc2b464980f581e9beeb74fea8309f60fed4d74540b36edbdfe96740317d58f8ac70372519120824dddb4b06255f6c18ca802058dd8edfb3da529294c4a0d4
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index 8db6154f6e6f..de8e8a439b15 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
index ffeaf17ce2e1..59f54d7dee4a 100644
--- a/dev-python/pypax/pypax-9999.ebuild
+++ b/dev-python/pypax/pypax-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
index 2a2d560415a5..2bd4bf486b5d 100644
--- a/dev-python/pypeg2/Manifest
+++ b/dev-python/pypeg2/Manifest
@@ -1,4 +1,4 @@
 AUX pypeg2-2.15.1-test.patch 399 BLAKE2B 64afae813084e2bcceb3354d6a9819425f5454d7febbb3df12d7b7f73329bfeed1a93fd7bbd046c69899f26757d984fd70964e13809ba9bb30305b80d35cdbc8 SHA512 20428aa41858da3b73a262ec2f36aed0df8626999eae27438a6bad1908b1dc79056ab33069c273aae56eabc02dfd0c080daaf42fee7e7c92ec32b95244ba41c4
 DIST pyPEG2-2.15.2.tar.gz 40334 BLAKE2B 7a171824da4c0ccc3bfaef4e429efb16f5c8c4e03dd47c5cd59656a51fe37c9d0b3940e58e2f321a4d9976f66935fd5b9d526d24bd1e0342ef15a3a1341e77a3 SHA512 f78e3b1294169167809c5fe05f2a69af2bd6c7c4c1bcbebafb4aa6b8ae6ead181a46b051e41193bc31f49c4b4fa7b1ef231d172217c11d301d0ee21d8e411b6f
-EBUILD pypeg2-2.15.2.ebuild 708 BLAKE2B 964414a6f56f64ea1bec82252b2d671aabb155267e941f2433231bb7878d64dc7e73f31ad60afaca254d55e5967348b210710fa57d12f37bf0669784f6acfa82 SHA512 1eed31b19cd939b9b15b5432d0cac062b14117f1062fa386c731f8a9d8b8b49f2f079db8232d1f76414e5ef8ea732f703c9e3b1d68f5a8d73df0191c84c9620e
+EBUILD pypeg2-2.15.2.ebuild 704 BLAKE2B 68cff1a7d878efe63c5b54caeee65fbb9bd6b5710ef75c77d691fd9fe874554bed08f028b9cb3595bd49046b9c6f5d08158bc76132d51739c3dbe5628755428d SHA512 6908501ffd1f74d8764d014fa9c7164dd90ae8ea59064dac0eb04c1afc39c9cb86aa73ff65d730f661c027babeeedb9a594d1070dd8a034004e5149073717597
 MISC metadata.xml 362 BLAKE2B c34e5f667750e99f16f44361c62c79d138767c94e664be039f81f7b7fb6f295e6610aeca962ece7097dfbc1372e92e697ad99572c036910352362379eb3ab4cc SHA512 7eb0a3fbe48ee8f34bb9f697aa951faece1ce5da90319a5bd8f9958d569eebd2c91539d0d1bd46c51cdc77ddb5c858bb6d158be7268666af668a935e1c4998e7
diff --git a/dev-python/pypeg2/pypeg2-2.15.2.ebuild b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
index 512d830bc1d4..38c58e7481c7 100644
--- a/dev-python/pypeg2/pypeg2-2.15.2.ebuild
+++ b/dev-python/pypeg2/pypeg2-2.15.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 071621e9b301..b743d66f9d26 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +1,3 @@
 DIST Pyphen-0.9.4.tar.gz 1092404 BLAKE2B 9bd96c0d0dc7a7ccb9bebaf7e864ec0212956ac910830d9a3286fc9569d9b044f7aedbc3d807260e5b5e1ccbe84ffa22c686680ebf7352cd23d6ed2755f7d92e SHA512 b48dcf02c5cdf5d7ee6d6968644958af9f31fba046612016d9ae1b8cfe44d438fe769592961f93f3342cc3f3af2dfc6cd40bbfe1be67e59de9a352c33f102917
-EBUILD pyphen-0.9.4.ebuild 540 BLAKE2B 932b7f14fd48ea4f2d7f91ade0f3f543fe7404ebe3ce418e0387b164e077a7d4dc4ada67242c39930a25a19f6395099582a18aaabde8faa7f3a343645c8dbca8 SHA512 ccbd92c6670da4811175267db4820249c1435533739620a10df42640cc13fb77ac1bfa714483080377a5ded9960ae1bce194963510a5aeafe73fa189fbb3184a
+EBUILD pyphen-0.9.4.ebuild 534 BLAKE2B 8ee57dff0c6045646cc5b9ea9ba3e1002a58223dd77f36389ba120ad10c5976bae17d22c08d3e1a9a430087621cb5d0d34cac9b49cc552271ced8d2df839e968 SHA512 9bcc66f087913660ac5bcabaa0dd593ad12f732395dfe28608ae75875234d6ae490f07fad0098bbea9a248b5bcc460f7061a6fc9c23197bb6fcc3735dd08bbff
 MISC metadata.xml 373 BLAKE2B 08556f94edec361c59c9f274d110522b632863008a9a8782a502fb4fc39320f5865a4cb0377ab704452e19137b542c3bc0ff8d4fb435fc70a1d16d9e8f154dab SHA512 9c08d8ea794dab32dcaf659cae7eec1b19d1977fddad2e54bf321e498c85fe2355f4c73bb71c78acfa094c39f20a7775bb84bb8bf163c0e3d0dcccc93d9e998a
diff --git a/dev-python/pyphen/pyphen-0.9.4.ebuild b/dev-python/pyphen/pyphen-0.9.4.ebuild
index 673ae5a289ae..117bacd40662 100644
--- a/dev-python/pyphen/pyphen-0.9.4.ebuild
+++ b/dev-python/pyphen/pyphen-0.9.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pypng/Manifest b/dev-python/pypng/Manifest
index f4905742957b..b214f916353c 100644
--- a/dev-python/pypng/Manifest
+++ b/dev-python/pypng/Manifest
@@ -1,3 +1,3 @@
 DIST pypng-0.0.18.tar.gz 377942 BLAKE2B e27540cabc4b872af5779a128b3213745ff173fd4c0c94ef7b7e9868b84a58beaca40e0ec6c5886a6a6f8652118bd792a0b61275920e1991cafb1568af8a5312 SHA512 3e44b0c86c3ff042c7e4bf03e82281c6807c4eae432c45b9bf4bf9fc844e24031a17245410e9060e6912ef77a30b9ea956422a3d9aac4331e7e81323da632e47
-EBUILD pypng-0.0.18.ebuild 444 BLAKE2B c4ce92689b1a95c1eee7426efb83609ac49d38757ac1c0bbc173155371673f6b05b7420963f7552b751e38d888519e99ebadd4f7536d92522c9a34299786aa90 SHA512 5df4032a1f481c5505f49e509412b983d657dfd59fc77448dabd50208e58b125d0405b4867a41e7c84a652fe19493d23e2ef2c6857314dda78f570c0c6d8a45d
+EBUILD pypng-0.0.18.ebuild 434 BLAKE2B a42708125a652c7c6e4eb6f3476a958e2291bee802784a9eca42332b610df0082ac4e47440a4d0eff84ee08a017b45f138b34ec83261186ba4efb8ad5827611e SHA512 09f5c54ceb1834da6bf2d1f009e66355335154f355af7dd3fb6d05db0c6a21a81c17b47493bf7eb2561e3a5ae7e39033f2b206059028fdc69a9448c3954473ff
 MISC metadata.xml 562 BLAKE2B 08122fff5bdc9330b443f957f695e2141417f8e484721bd8a478f164cfec45f3b67bbc54b18073b24495798d21d00f658d94708afc07f5f7cc1a47811bb3442e SHA512 4c8e61b10ebdfc5385f762fa6465fe26a559c6c2e220c6714ac316cd2458717a789d79483b2efc9383a719c8bd8c277b4f38abec245af95eb8b8dc0c7e0038d7
diff --git a/dev-python/pypng/pypng-0.0.18.ebuild b/dev-python/pypng/pypng-0.0.18.ebuild
index 3bbfa383ef9b..e1ca6f68372a 100644
--- a/dev-python/pypng/pypng-0.0.18.ebuild
+++ b/dev-python/pypng/pypng-0.0.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/pypowervm/Manifest b/dev-python/pypowervm/Manifest
index 2f3cc1948c1e..ee69e4a7ff4a 100644
--- a/dev-python/pypowervm/Manifest
+++ b/dev-python/pypowervm/Manifest
@@ -1,3 +1,3 @@
 DIST pypowervm-1.1.20.tar.gz 906153 BLAKE2B 868571636f3c21b5d179ba587f7693dcf8e55661324d3ba5578be34813a67a5b2881441c3aa3744a9fc1c6ea34626085d62c5829368c43b329edb98804d9fb9c SHA512 1ceaf00f830caef918c27b342f1bf59a41e88593eb36f6c5f01c7a0ef786a69b15d271c87d161f069e12c1224ebb4f6cdf349e31a551bd26fac5206860ba9019
-EBUILD pypowervm-1.1.20.ebuild 1238 BLAKE2B defcf7d650537d91f8ad2b2368cd3a2a8fdb1f2ba40d6b5dc57cabf9b32ce71d93859764844879306b5561a9339ba27b53b7fb8f9ac5a78b2dcbc1f21483fecd SHA512 441aba8bce12e7e3b05a86393990b8e3e3f38302cfa689a2c07e8955bef2a9839359e96fcc9971aac09464902b22f7867bb5b29941046f9e340f6466650e1112
+EBUILD pypowervm-1.1.20.ebuild 1122 BLAKE2B f9cba9b243c5e261d6d97c7714a7210a83f4416bcab46cce1224d53ed5031bdc2ce378e16d9ba0daf990f87e905c4e0ca850409029a906e99af4a9077b806320 SHA512 84846f65aa8cf5125dfbafd190f4c8b2aac3145dddae9b026a187ddc729940e0c27c87e6d3bccef7cbb403e866ffce404588a9e87532d85f33ad1480d5e0cdf4
 MISC metadata.xml 383 BLAKE2B be09e21c8e64a738f362727e96417344afd5a4af5e99314274cb2e77f2c7b32c8c5d68f7e8d44b053297aa597ceeb6a1e4b41d1a30954691920b976694416d8f SHA512 e06a03085a277a53d5a04e076d240d59cd81e83d40241856a2878776792366d50bdf3e9fba2dacf2931de17234f87583b3114f3f696db1254d8a185a9da06d17
diff --git a/dev-python/pypowervm/pypowervm-1.1.20.ebuild b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
index c2d855a03839..45c0824f5b89 100644
--- a/dev-python/pypowervm/pypowervm-1.1.20.ebuild
+++ b/dev-python/pypowervm/pypowervm-1.1.20.ebuild
@@ -15,17 +15,14 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}"
 RDEPEND="${DEPEND}
 	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 1f2293e2744e..4551e9ad7afd 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,4 @@
 DIST pypy-exe-7.3.0-1.amd64.xpak 13515366 BLAKE2B 52a3640b7a905a5ca7097a752d747e048a21e55b354d60bd3b9ba146d995ec1682bb510e97b94d3525cc46c6b80ba9be0eff8497f1c4c0aa0b60374c89077b99 SHA512 2514d0eef17eb41a6ed4081662ae1fa57fe1e74b0b29d35ab7c46ccec5729a76603d97fc98a3d3213e5bdaca4f29a4a3a42f6368bd610161e897f74f9a14680c
 DIST pypy-exe-7.3.0-1.x86.xpak 10261761 BLAKE2B 60726089208c925baf233072de2d7f580289a5ba5d920cf3bc2a47fd146425dd38f08e0033ff16243914e95a18f79990b071bf93fe221f85a0296fe081ca94f6 SHA512 1afd0d3ab20ffb627159ef483260a446c6defc761ed69eea81e2b4edd36fcc29a0f43b91cce5f97f8fbe2f1f830fd395181faad281234cf60d1baf7ab1a48876
-EBUILD pypy-exe-bin-7.3.0_p1.ebuild 1086 BLAKE2B 72ff9ae93632b70aa0b6ce510b8fa2dcae3f86614b80b62439630fad4c2067212aee3ffd1437eef3eb73a559605668b9ab526861006bcdbbfda9cca0d2efb461 SHA512 6b1a3c2ed5c3ee66eacabff479006054525422e75f6161def8d078564fcb5551a80798d029479567e52799baf93fbe009ab2895c54ec3a768512ff30931dc8bc
+EBUILD pypy-exe-bin-7.3.0_p1.ebuild 1085 BLAKE2B 619f6c6276cb6e7d1c4b4eaba4cf193db9ebafb87d7e77bdb034171bef2b2c48290e02aad4979cf664bf87c8467ced7270a317afe6cab9954e1af204e8c7a6a5 SHA512 baa04d9a99d7fd65d8db2dc5511788cc2c7376e50e7af2b2998e256737f8c1411396b242daf525cd286b9860091137b2ed2ee8a461063eb0a1f97a655c0a859f
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
index b61b72991892..84076638f559 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.0_p1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	virtual/libffi:0/7
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index fa6f59597c6b..ef34b9443b4c 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,3 +1,3 @@
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
-EBUILD pypy-exe-7.3.0.ebuild 3899 BLAKE2B 93374c4410bf6e8c8f47ba2e943c1852fb128b9035cdf9c050c43356706297aa94031cc06ff4db530e106480f46bd478d39c51580f1c1a9f28c96c8d3baab518 SHA512 cea2a39e25b4e8aa6339f43f1fa5a76bd804225af25c87b3fc5ff89ab7a2e1a4edfd84aa2f5f04cc1c11bbf5e879b25c92b69a9d8b12c3d87061cfee7ae0b6a6
+EBUILD pypy-exe-7.3.0.ebuild 3898 BLAKE2B 24b6d7ef7863731f7fb07cbc63ee90bf4401d424afb2f49537b11a8f204cafecb6b69eb4e20f13f70b78a0319c73dd29b4b68fdfc3091aeb8aff05d39dd85294 SHA512 9b177776ffe4bd7c085b43a01f8b1eed7c06d79f296c86598424c23df21b80b93357ebd84382abcca8e5cf641eecbb861e4c93c7925cec06cf21b85b24550575
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
index 3ab056f52c89..065d3026f4d0 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 0597883344c1..e6e9d4603de9 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -3,5 +3,5 @@ AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c5
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
-EBUILD pypy-7.3.0.ebuild 6052 BLAKE2B c4f82c7d2ee11416997d8c8ad8bfd4b70add86a0f4fde2475b96b9c0fa5417fdd5581a6666956b639a4cb5f576648ebdb5394d46d3db262164ce542e607104e8 SHA512 2420d27b076382f9a81dfa91a73d9c39436e421d346d37e8b229a66616608e12c00c2156a6bf49918cb5472a394852db8268ad9c0a3d91a2de2e588b21038f84
+EBUILD pypy-7.3.0.ebuild 6051 BLAKE2B 4cc01b13e8008284a0a904ec402b85d0732befb67afcab7ffcac2835a49b100720a63334f41b8391a8508bbf551709ef6945b6b4f538538d108856c8f457fff3 SHA512 7650be4508806b61af046c068f98dfcc6d6be12772a66e3bab182a37771be9ac6e1a1ede2ddd669e507702c647e60a2ef8ef13c2342970d1e70d39e661d15f26
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy/pypy-7.3.0.ebuild b/dev-python/pypy/pypy-7.3.0.ebuild
index f1d3f53402e6..fef3e9c742c7 100644
--- a/dev-python/pypy/pypy-7.3.0.ebuild
+++ b/dev-python/pypy/pypy-7.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 30d50206ee28..79d4cfa01b42 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,4 +1,4 @@
 DIST pypy3-exe-7.3.0-1.amd64.xpak 11650308 BLAKE2B 49f8fff0675acb75ca8fa525f4554807ef90307a5236ece6d4ca242ab016629f926559d1b82641fd9b15d77eaf9736f9c9a2c82fc280a492d90f4e99218cc8c3 SHA512 b22d90e14f88ce5ea9488f9796931fe9afb68dad926835a3311cd284e681e2c680df576d8859c00ece41508d56682dae21ef0e34dc77e47010141a6e58322efb
 DIST pypy3-exe-7.3.0-1.x86.xpak 8953475 BLAKE2B e271c61341d2d92cd05c0e521d3ea1a752639d5111687b625329679f295abe1c6f5d5221e024352fd2310d20156100b107d520021f2060812f2a2cd6ce12a4d2 SHA512 969a38fc6f64e994b13bb7b0e62eba1b0f86949d63bd72116f67012ab039b696212d412d9d8d851ed33099f0bdc7be739a082e080893546f080da60789d273f0
-EBUILD pypy3-exe-bin-7.3.0_p1.ebuild 1093 BLAKE2B 03aa557384b5f3f4b617116d317235b303a1576c9399f7adfa24f4b880f5c7fc4eb3030c59221411635def2bf7b8036d40e4e2a979a0f80f512046712a31d24e SHA512 ee1f459385318159bebbc43ddd39cb40457b617ec9b69b7ef0f3e20aac19ed772bbb5f99e79c8c76bfb257f9ff5a781e715561768a38a1c27a5e89e2eec730a2
+EBUILD pypy3-exe-bin-7.3.0_p1.ebuild 1092 BLAKE2B cec158e605b8cb1c6e79bd46f0692f502c4229b66733e964bcf3c1fdcdfc0416e3b6dc32b68e6ebb5c09bdf8bf4673941c76df17cfdfcb14f1bd08795a0337d6 SHA512 65ed2126e5acfc019488f82168eb5a8b0050c7dd9302b80498c6a16bf967a964a0cb37437ac030466a68392f1ff7412d454b6ab3c40bb2f64816cdbc1bfee868
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
index fe7c279a1cc4..a9dbed050aee 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.0_p1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	virtual/libffi:0/7
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 3c55a078803b..c0507c760159 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,3 +1,3 @@
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
-EBUILD pypy3-exe-7.3.0.ebuild 3466 BLAKE2B 0e6c833d6855ef9cbb460b6de8b4556be3ec664e210b7ebe6b9b0f6e0edc3c121e1af0fa3fe98feb931ebc6da1c015df3d7f4b3d2cc35706d239b7035d0a6811 SHA512 7ed34914c72650fe31b98bc9ea96a9d254378dc52022832292b9b9a668d4adff07fc0f8e87c171d1669b1271cec566cdadfe997b7da2fc0d918a688efcf015cf
+EBUILD pypy3-exe-7.3.0.ebuild 3465 BLAKE2B 8b54a96879f9e63db7eaa74cb4e22f1c098c78e19ab5be764fd42cb38e02b7ccf9b50c526df121b61a8ef7b11d3364a0578d9d6f48d9b4501f6a9015c30f5c2b SHA512 4424d4f9a9abc2d5ae765183482420206be9ddf982cdf5fd3e31764fefd78f200e387e2f0c39f32fb8d6713a435cbd27c638b7879db14284b3e8c69bc55a90ef
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
index 5a123c3a605c..3555bbb629dc 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index ef07aeacb34d..1a6c6d5effe0 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -3,5 +3,5 @@ AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efea
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
-EBUILD pypy3-7.3.0.ebuild 7516 BLAKE2B 455823f84451139179ec8ae2694259dc5c8bd1e69da3ea43bb5533c0633a0b20025e82e458e2a252a5553968de881a81f90e23e5e4515a0803f7c7d0c5fb1a79 SHA512 8f5f02a9b6ed6db51bb7ae7eee159878e358e5d4397b777ea3cf3dad3c7cebf4ccd2b133c65aaca51ba9f1e64c1fdcb5dc521c636b725706b0902786f0d0b6e3
+EBUILD pypy3-7.3.0.ebuild 7515 BLAKE2B 189f0e427b6d16a40ee37d0671c0c8a0a78f96499d961400ce6182ae977177f98758497123410ade0e675965e8fbc582bfdd3efe4af6d380b4c7795b86925e40 SHA512 d82dd3c61a93ae77d79ecb973bf5bc79b24dd18384ef9c94042aff38279e2848ee4bd7c4709b5fed228a41120264c29454a366e98f286a4d251ba479a0131ce0
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/pypy3-7.3.0.ebuild b/dev-python/pypy3/pypy3-7.3.0.ebuild
index 946314063a1c..9ec506dc1868 100644
--- a/dev-python/pypy3/pypy3-7.3.0.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyqrcode/Manifest b/dev-python/pyqrcode/Manifest
index ddd55c99223e..4167f754a584 100644
--- a/dev-python/pyqrcode/Manifest
+++ b/dev-python/pyqrcode/Manifest
@@ -1,3 +1,3 @@
 DIST pyqrcode-1.2.1.tar.gz 36989 BLAKE2B 88d5274a503abd78d0b8cab462d12be0af925a5eee2a6ad2b47a276559710eac40643a8aec99f26a9579f94e9084182894163e7e71f0abd486c5c2913e510080 SHA512 784262cb15c10f3581b0caeac6bba046686b35b8c0709ee78684b805b6cba49f4250a004dc5f7d393cc25929cbf815c6c3a94e284a77d20ff7224a8dde3a036a
-EBUILD pyqrcode-1.2.1.ebuild 690 BLAKE2B a021f57ac46fb426d41e7ca691e13622474a834cd87b39ec5c09d605a19177707ce2e470c5c954b4d79db293a9217427b9756f10aa59fcbf9221c6c1860fabfa SHA512 1480b0fdcf34cc8dd45c17718f752eb3f5af1f0ea3f2c01d909cdab702187f54adc720ad2cbdff6b5d844c446f33961d11cc9028fdeb16a8ff9ae5a1f1d2ec22
+EBUILD pyqrcode-1.2.1.ebuild 680 BLAKE2B 24b25c55a3c824b99139d12a0bd7d47eb1b24bc438700062bf5ade3add5081c39004b1dc5314f3dce1e79cd62d57e9e37575e254b0b341433ddc2885e18be335 SHA512 61ca18099f32dcc4cdbd900ed15404fb2168dd8dc06eb812b9b504ac02f4b055c9480a51f563afcb3947658584866fd9622de459fe5756248b3abf61456b71a4
 MISC metadata.xml 685 BLAKE2B da3a57e855942a58edb70ca2c55794f3e15684e5903f4348c5128e665ad6e76c1261053e05227d400f31c86292736dabcc581428feb20cfdfae4723ee01cfe18 SHA512 b037af38847498f60da288ba8776a9eb85662cfb72f5f0ecdcf677ee36474b989cf4dccd3f7ea034c8be92f90fa055f2db6ecfe4015d011bbd8a3304fee0aff2
diff --git a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
index db05f21c496b..1a10c8f1558f 100644
--- a/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
+++ b/dev-python/pyqrcode/pyqrcode-1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index e7cbb27de30f..6da4231bb25e 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,5 +1,5 @@
 DIST pyRFC3339-1.0.tar.gz 9325 BLAKE2B 4a02f2b128c34315def13500c2864d3198ba327fe3a39f04e14085d5dd945ffb31487c12d07e63e18c5946a14d8e380be8d85e7bea6b4df39f50550e6121379c SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3
 DIST pyRFC3339-1.1.tar.gz 5290 BLAKE2B d3094a22b6903937ae5cfee1210f04b65eb05dd606fe1d3245dca8ec0719ca1a079b720568d8c8e87fea691cebe1944098f99913b97a04570f06354a883e5694 SHA512 958b7761fab590aa42bb57a955c5d834441f717796a452b60df21663099dcf2fc046afe60f8157fd0f1edfd95c5e9c9c5349ab10ca4078d210fc63d848496a2f
-EBUILD pyrfc3339-1.0.ebuild 689 BLAKE2B 316dab17e317c07cd0e41940a30b961ed35e0fa8e4ec4e405cb4e2a0297e17ecf5f2f680b0dc65db2f722df4d3ffc863e35908166f2b1433e7e80fab85110fc0 SHA512 a1ad1d51dee185609ee3fe129a703443a92746851e881f947c2122d0bb243f1c6fab028c6624ed92d35eb9a61cea2bb13ab32845ab06792a4a4c3d3f511fd667
-EBUILD pyrfc3339-1.1.ebuild 693 BLAKE2B 1e260088c61d405a79e62b26a4bde0739217990e20847e9c782505ecad1fa0e6ec63b0b9e4de9d864aa6dd37799446a2c0e121a513391ea0295fb2a15249835a SHA512 95c2f1a6286269cad3440383ec14e960c807aae6e0903f3ebd320b8b32187e6186954df62c0737e8023a418f102f444dd29bdcc71bb957db759d57440abbbc66
+EBUILD pyrfc3339-1.0.ebuild 685 BLAKE2B 8aa02597110707b08bc42bbf6323055f0b60fcabfd7d95d8710c575f107658ad3cfe8fac401203d9456ae8e3213958b962f4fa23fea0bff8c85f8fe04857a4e5 SHA512 1bef47d93d5e7c1675da2f76dd4bb984d3bd934d81637f0b673e213e40524efff508009085725cd44d387ffeda65a21450b7c7f709d7db2e98935eceb17eca5d
+EBUILD pyrfc3339-1.1.ebuild 689 BLAKE2B c270ad73d3d4c7432f99b7894f32bb337d2cbf538769aeb9f3f1289125f4db0acef9d86950e3e9cb88d58d8f7e91a9bdabec77a1aeda12327ec127db65d1efc8 SHA512 8d6884cfbeb25344e2ae797e411d92596637a96ec305dc7e052e498d1853b4e3591a987c04beea971b23794c31a1816661795a3d51d27149b43bed7d2d382247
 MISC metadata.xml 373 BLAKE2B c047241275de0ee6411fa663ffe331d1fa4cbccb622680120d5c1b96b4fe07ffdde9b36a67bd2708dfc086e893c14f071b51b3f1b292e63c9a7a054ea841a6b4 SHA512 0f0ef1e95f7cf557a90cbf2493f0f1ba51c29cbe10769dc40b1dd56eb24e91c7ca6579feaa3afc65c9d90724c726f6d1bb4f978d6485018e19f39ecf81782a87
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
index 07c3abd95de9..2895f47e8cc5 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 inherit distutils-r1
 MY_PN=pyRFC3339
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
index b5754383574c..1fe1a474587b 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 inherit distutils-r1
 MY_PN=pyRFC3339
diff --git a/dev-python/pyrqlite/Manifest b/dev-python/pyrqlite/Manifest
index 2ff52a1b9fd9..dab808365819 100644
--- a/dev-python/pyrqlite/Manifest
+++ b/dev-python/pyrqlite/Manifest
@@ -1,4 +1,4 @@
 DIST pyrqlite-2.0.tar.gz 7224 BLAKE2B f3de4d4d6f0598c6dc21e323db4c717f7f8dc85f6e592ea9dfb209ba778d1f16049d40e39b8d98c94dec61c02949ba1fabeae29e25ec8afbe4810df52b6210df SHA512 9d284161e492683955000dd3e3f0593b79e69ba5eb087bee4d3ffc1e4be9de1c362212936b10e1781538eacd838e6ed22adfc82e8cc0dd00e1d3318a4dc14720
-EBUILD pyrqlite-2.0.ebuild 933 BLAKE2B 8f146db1342d66fbfaf29833fe26089902df1fc30f8568aee06faea4a50f91b94822d06ee26229d1e4dae75b1eb077bc9fbe4134f81eeebd3152a5b6ef3bc398 SHA512 2bd8113aa5841aa7e4e9fef4a7f41f2396c14e3fde250ca987f812480a083e151f9c1f9bfe131f551d01cf4dc90db67473a3c46eaa1bdb11de8884a46f77a166
-EBUILD pyrqlite-9999.ebuild 853 BLAKE2B 078009f629cac0b4070dee7383c502423bb8ffd1666b2d32ee0bd7dcf70e672a7120958beb0fdfa07155972ae7912184543d758a8701784b8fdc48cf047f06de SHA512 21382156f6be4af7b218a97f0e2e80e137e8aed7dc89337fe9aaedfe0d9f6eb67737c0ea3f4c6e14606de4b807b4137ab825b87a3754c3e3e7ca17de6191d62d
+EBUILD pyrqlite-2.0.ebuild 927 BLAKE2B 7b67bdef9546cb8865242d229b9f3007eb8c3b155eeb17f60f29e5acb2a3be26b34e78013d346a8a73872a761822af3ed9077c7970bd9ec4967a1d96e2cf3cb4 SHA512 3986bbecf056182684eb7b2c653631d9d2fb2c0abcff08e5468ed4fe353f8bf54513210458adf0061793e2e2397666b1e6dee1bf450d862ae3cc653d05184ed2
+EBUILD pyrqlite-9999.ebuild 847 BLAKE2B e1c4deac129e7c9f4f06da5a2b79a6b36955acb06202015a12fa08a4e8751175cf33b7c4899458f11bbf79441aa1c6a0079f2e955ebfbfe67a04389e4ce27790 SHA512 af5368705c7ec582f058e7d8566140ca76d8ccbcb52b50779d7c365f381816ea14f92e2a221a976ffc8f823511887c1ed88fadd3facf75612a66a7ccbccb1bc3
 MISC metadata.xml 306 BLAKE2B 6848a797588465344547135639af1cdae67a9db23851e940a5f5aed347ad4c6e8114c2fc88159370356bb4360c926d4b44e1f4474c98a7577e3dd64403100d72 SHA512 f26c1056eb200c8b60e2d0f7ff54447465115afecd34949ba8358f812d95dea6d877928010ac81c8d36261479ff6a61982350a403546dd09e7f4bf9a082a9d7f
diff --git a/dev-python/pyrqlite/pyrqlite-2.0.ebuild b/dev-python/pyrqlite/pyrqlite-2.0.ebuild
index 590b45ff9686..8b7ef41d1320 100644
--- a/dev-python/pyrqlite/pyrqlite-2.0.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyrqlite/pyrqlite-9999.ebuild b/dev-python/pyrqlite/pyrqlite-9999.ebuild
index 823c3daab1af..342b0c8e9e27 100644
--- a/dev-python/pyrqlite/pyrqlite-9999.ebuild
+++ b/dev-python/pyrqlite/pyrqlite-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 08367776ac7c..7ea6a237e902 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-1.9.7.tar.gz 144692 BLAKE2B 5a842b790e01ff5461c462d6fe2d7763a79725cd1bcb841c1aaa49f2b17decb251446adb908fa8b525b91f418a6df6a76ddf779a67b7e8547211993837aed2bd SHA512 339d6efd5fcaa361e30029e736d4e2e98e05acd701c39574b40960b4bcec4782ca9c1d6927cea0b3641c5e6a137d0b9fbd961b58422a4151cfbdfa067dcd4b4a
-EBUILD pyscard-1.9.7.ebuild 759 BLAKE2B bd78d1240b24225032a0b0844e8fb031b2516a32a1c1b2eedc3a77da74123f40010f95eb280db195b3729b10802c47f5374e370c1e5f6a426b6fba46c788f15e SHA512 145ffb36a8d5442f261cef4061014994318e6214e09905df3e7ac5911354ef39a9b2c75d64de108b1d80d7a49b75b6f5756b063021b77008199acddc7b94800c
+EBUILD pyscard-1.9.7.ebuild 753 BLAKE2B ba853b738687844abac8dfed836ba27b49b3d186a8f62c9c242c8add0b7d73ff5f9144e831b70a1337e93739cf2d96ddfb935b8843ccc9ac8cefa967904c80e3 SHA512 61d3dc6fd3d0b69c5e57414c920cd238c2587fc0266f6d92ee3c4bef30c40b787ad0794854b0edd09e54a27bcece594040f7143f15929624a8c21328d1c21217
 MISC metadata.xml 317 BLAKE2B f87dee8af30517c70bf141fe7da6a953f61f894e7f97897f3c2a594fae16212a518e80eb2141e2ae18da562a91a85ca74209e0c77f4b9bc54e91fe9bd02f650c SHA512 f0ee67c282ef764df07b1f49ea3fa4714ecc6094046aa6fb986274968e58801eb3f7a32463bf4282dfb607202b2b4e5e1b50a0d54f79e85f64a6abb2d68e309e
diff --git a/dev-python/pyscard/pyscard-1.9.7.ebuild b/dev-python/pyscard/pyscard-1.9.7.ebuild
index b59ab8d1be3b..37623d99e50c 100644
--- a/dev-python/pyscard/pyscard-1.9.7.ebuild
+++ b/dev-python/pyscard/pyscard-1.9.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/pysnmp-mibs/Manifest b/dev-python/pysnmp-mibs/Manifest
index 4cccce9011e6..0d9933602cea 100644
--- a/dev-python/pysnmp-mibs/Manifest
+++ b/dev-python/pysnmp-mibs/Manifest
@@ -1,3 +1,3 @@
 DIST pysnmp-mibs-0.1.6.tar.gz 2113334 BLAKE2B a685dac05f11284c28c6ec9ebfdb4e99145d4cb48b982cda771694ee3ecf522af07d174a8b97430728dffa243de7889f8a831575113d8a9b35a494d1d9277b2c SHA512 6956d437f7815e31af13ac54ade7526e07fefb63a4c4bec95fb5d5c8f198f0d7bc8bee2cd9d0072c46d089f579d6cd6227152646a763e3342c626cce367e89b2
-EBUILD pysnmp-mibs-0.1.6.ebuild 500 BLAKE2B 2dfff790e338d8d3a881bbb7b388548d976cc2233ee48a5d92cd8ba1d99af6f13727e22bd3b1589bb99335f97a9609a5ac011f0ef3151bce8cac2201032fe9b5 SHA512 5d453e31b5f81ddb07ec1af1bf295c4cf9912e7bf22d801582c2ec3d58c63a81cf05be953470457d57ce51c1bbe984d1101e8923c54c94faa330e60fd0b8cb53
+EBUILD pysnmp-mibs-0.1.6.ebuild 494 BLAKE2B 3c859592b3cc919e1b2fe92fc14d8b1b7a76cd2b7023297caf0e63100c94febff9386ff4ce4a1bd55b8ed10ff10c5bf5b82a0ad9b31c6e0ee882e6136f9e013d SHA512 4347fe1b211ade790daf0bb8a7e10eb15b4e0a2300ccab25afbc4ee37be796ef2634d22831ed9d3b4ba3f536475272684d03077bab46f5aa254d59b1dd8af6e2
 MISC metadata.xml 1515 BLAKE2B 58cb9f0f443bd9923b3ec824cb54d0e5635ad5ffb9da178d98a9b920f14cf75640295106a8fa9928447d4410708ed15fc0850b3a2986a2228d92e7cddd431739 SHA512 99adddec026ae863568b6239dba0aaafbdcbc5b020c0c337c1466900a134de902cea3a304c8d2c8aad12ade54750379a1fde88120e13f879e7f75ced2bfd1be4
diff --git a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
index 4df3e04ae69d..28c60b26cb58 100644
--- a/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
+++ b/dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 43999ea892d3..6ca12f365622 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,8 +1,8 @@
 DIST pysnmp-4.4.10.tar.gz 438845 BLAKE2B 2ad444212d202a3e788b1cd2e4e95931ef59e758923ede9b99fe511fac9cd31b8ad02ebbd61fd2df4dec0b9f95eded2753465929aba3b070ca614353eae466d4 SHA512 ed7d705dda376bbf31366653566f1f85ffd71a8253e573ad197a8a073a60ec4fac356b28daf97ff1310121ea3a6b2fee17c843c6ca90d664916fd9095a462207
 DIST pysnmp-4.4.12.tar.gz 442270 BLAKE2B 0e4e1c44d7fe1def24d8bd12bf88012eb54d432888745becacdc9c072ab5a653eb947ee418f6b7b3f84bed39d6656dac25ea00a2accfa546d7310be17b04c8ee SHA512 f22a346443cb07beea594b67b09ce587f5602a439c68148b8a655a0d2c769893848bfcfdd47b5f0002f48c650bf3a39186edddf977fb3ad2cc0d124e66f2ce94
 DIST pysnmp-4.4.4.tar.gz 436318 BLAKE2B 6e6616a79fc15d457b8da2e2260c65d9d8ef29888c033d80f2f47c8de035d0cff73dc4be1eeced8ef36dac1301b7da0d845837b780815792f545b6ad18d5496e SHA512 960ac73b7356bb236d3853432c094d3aa86a343f5e211065689e6c784293748ec6f2c1c17bf9d96b4cbe2d9d476ebbacbaff4bed7d86370e5ef61e6f03ba8c0e
-EBUILD pysnmp-4.4.10-r1.ebuild 1243 BLAKE2B 7924cd8c9b5ddf82394e03349bbb15719237d16a640ec596ae62ba9357c3445a9c161050e1f32e3d32128cbcc4f9ba431ffc01cbc8c32efabb409fdb2470021f SHA512 78b9b5ce2137a16bbe1611e22776c2a7e41d5a324f9b6e88e9c10253419aca07efc1ea83545930f64773236644edebd3b3364ea9aad03dcf4c2a6626b9bbda58
-EBUILD pysnmp-4.4.12.ebuild 1243 BLAKE2B 7924cd8c9b5ddf82394e03349bbb15719237d16a640ec596ae62ba9357c3445a9c161050e1f32e3d32128cbcc4f9ba431ffc01cbc8c32efabb409fdb2470021f SHA512 78b9b5ce2137a16bbe1611e22776c2a7e41d5a324f9b6e88e9c10253419aca07efc1ea83545930f64773236644edebd3b3364ea9aad03dcf4c2a6626b9bbda58
-EBUILD pysnmp-4.4.4.ebuild 1236 BLAKE2B fb8c639e06476cd0b940f95b6b286440be9d87ab519e74598a4db8fa379a1058b6c4c9d095d3bcbc5f2eff8a5f90e9a69f60dbaec8e6efbe418f426065c9b6ab SHA512 c1521bb442f39f04e62171d77a85e37a6656c52d0dee3695d1fd39e47b21a4b20441239f307708cca8666b1ec8b2a81347562ae00ab2b942033b8cba947dc561
-EBUILD pysnmp-999999.ebuild 1248 BLAKE2B 25be2db5be8dea102996d80249902d43d1e8d36f08b3d0ac582b6ddbb0b0b2f7a49cb5d52e74880b8cee9928d7edbf44bf574e97f3377df4254b1bcd937b72f0 SHA512 065b4ea494d2a7128a1c7ef7bba5d1ddbb302d953a4a1726f065ee9e3a5cb15e56af50d32ba753aefcef3c7a4e976dc353bfbd654f8c3ca7e7fae238f63f6416
+EBUILD pysnmp-4.4.10-r1.ebuild 1237 BLAKE2B 9a50b3919f940e9717f740e898af18612bbf78fef9303b642bcb775065b362707d8865f31b66f8b3fae5605db79d40a0497959f94bdef04ba503e1be2bbc4653 SHA512 374e13f42cadd5e8d2302986607f898cd7c662308ad356b82a4017f210611470159c4916532e2f41b41f53568343c8e2a7f0bedeef2a2c9fb9ca11d403300113
+EBUILD pysnmp-4.4.12.ebuild 1237 BLAKE2B 9a50b3919f940e9717f740e898af18612bbf78fef9303b642bcb775065b362707d8865f31b66f8b3fae5605db79d40a0497959f94bdef04ba503e1be2bbc4653 SHA512 374e13f42cadd5e8d2302986607f898cd7c662308ad356b82a4017f210611470159c4916532e2f41b41f53568343c8e2a7f0bedeef2a2c9fb9ca11d403300113
+EBUILD pysnmp-4.4.4.ebuild 1230 BLAKE2B 53c740466b0f24bb98c9d908d798688e86a7d6a5cd40865729f08b83222d7a68972ba72b4c0609e556fbaaaf6bc259af2c35bca03d9daaececf9f500e9cedaf8 SHA512 d19c0dce933dbabf84be4b323fa70af43ea35d073df51ca21e61db77bd4aed5dc7ea03e00031f306dc1b010384610e4f1a120b4091409351ce3a44a247fad00a
+EBUILD pysnmp-999999.ebuild 1242 BLAKE2B e2652064a3c9d7b65a777cc42a2a676258cde63c8ef12d4871454f74a495f9121e377b7295b79da288b2e6a98a65fcbd285076bdc7e1864fe63870b3618a711d SHA512 9aaf82ee479d899e8d6e2119c0075e38a098989e2e5e30da76693c4d414467a6fc610d91cc401f17b1b55e55603b7b38b3dffa8e5c3837f7200aeae3777588e7
 MISC metadata.xml 1567 BLAKE2B bb80fc30033d338354e1b5539aa5afbb23df2ef574a55709f62ef399a67fa7d659fbbad4d3a10120d0a7cf2247e6637127c115deb3741421a73f3222b769d632 SHA512 3ec28aa833cf162493be384e095a4aa440dc9fb19941b5c503d81d1bff83428d5aa8af80dfa24c88055c573c09529c12e3fd4962dba3d171ea8d2e87a7bb7822
diff --git a/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild b/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
index cd7424ee5a99..5ab4e8304fc1 100644
--- a/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysnmp/pysnmp-4.4.12.ebuild b/dev-python/pysnmp/pysnmp-4.4.12.ebuild
index cd7424ee5a99..5ab4e8304fc1 100644
--- a/dev-python/pysnmp/pysnmp-4.4.12.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysnmp/pysnmp-4.4.4.ebuild b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
index e04e7c866010..f845099284d2 100644
--- a/dev-python/pysnmp/pysnmp-4.4.4.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pysnmp/pysnmp-999999.ebuild b/dev-python/pysnmp/pysnmp-999999.ebuild
index 3191e1376d52..92fe79461644 100644
--- a/dev-python/pysnmp/pysnmp-999999.ebuild
+++ b/dev-python/pysnmp/pysnmp-999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Python SNMP library"
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index 2f9244965c11..2e1c4f2a8d60 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,3 +1,3 @@
 DIST pyspf-2.0.12t.tar.gz 67189 BLAKE2B 40ddecf6e9717da9e496c5852866259f28af11c5e9ef581ef1188b07896bce7abc3ba901063bfea2ec9f89d70e17275b0e2619f23f9dc334628ebb0af084b79c SHA512 1ad23b5dea4aa8edd03b3fd9fc675685bcb0e216474534563c55988df040abd4e2bbc8488bba80d26466877e8b2ec88cbadc2f67eb8c4bf6f26f975d8af81d8d
-EBUILD pyspf-2.0.12.ebuild 988 BLAKE2B b6496faa19a4934342fe7ff67d98b8d5987999c0027dd0b4226aacbb7d8e6457bae8d8edde3e3824d884612840bab9c3f363a32d47fc337645914d96996dc702 SHA512 08388b12f5a9e2df10ec52f87ef876165f082598d7844cd36e9f003bd2c1f315686bc68ffccc3eee44dba74e5bf02dc6bddb5baa39da757bf77f09c8532a569e
+EBUILD pyspf-2.0.12.ebuild 982 BLAKE2B f4afaaeabcb425736fe3d397ed729256c9ec851cccf9f0b89f1975240c52f888276140b8ead83e24021c36d486a3677d7aa852d258d56cba9b78492550f3be00 SHA512 d46af04db2e1c9d2230c15b86b2f55a7220f1f912fcdb36798c6da9f8c5c255d74262b4cd5071c5eaffa6b2f6735d36cc609e9cbe2685987f219612a02a89a98
 MISC metadata.xml 318 BLAKE2B 428f1f97b1e20927edbd26d3cb405e242e2bdc4c2cd301b9dd7999570b0ffb5af1c786a6cf596917d6d2694e29cf47c3809d3af97adb078064dc3562fe2690e1 SHA512 561cbdd0b14a8fb091ba9943987d93c8c1323a4b5f8f2b32f094284d683eec5562153a5a8ec77412a0806bac56c5667ec6e9e8d99e77bc2e45a5b7d517c8c483
diff --git a/dev-python/pyspf/pyspf-2.0.12.ebuild b/dev-python/pyspf/pyspf-2.0.12.ebuild
index 2448c7a64e52..7907c9840d82 100644
--- a/dev-python/pyspf/pyspf-2.0.12.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ipv6?"
 inherit distutils-r1
 
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 33bbf63a0799..ec90eb7cbf9a 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,7 +1,7 @@
 DIST pysrt-1.1.1.tar.gz 104027 BLAKE2B a035234d687a6d7e69123a012087b8d065cad3904ce422b3a4390b0f6a0ad8471e35d7f5d9cd7e835ff2238566dd0b7a40a039b88d5b6d3a4be464e390847d79 SHA512 607f80c1f66702d36b6fa54b293f59c6a28415d812bf54d7210075d1c84a7547ce2776c0809910ed3d79c08a3c595ce74719976d8f2818820a3f4a306ffc1825
 DIST pysrt-1.1.2.tar.gz 104371 BLAKE2B b6f8e1e6d0cc0ae7ac4a5eb1ac9c5444318fd579fd2cbd926bed932326c986743d3efc1b604353df92a3dc67ea0d47f9a77eeba28d561b3f69b4b63eff8b78ad SHA512 a3a0988068d3cc13e6d44aec548a94e79d9ed29cfcd1e8e35ff56b50f0feb32a1baac2220c5331281c98a19ad9a3e9f960832a661699921cde0d185ea21e9753
-EBUILD pysrt-1.1.1-r1.ebuild 804 BLAKE2B 887147b7a0bbbe8c2dcceca3ce08e73f061017c723bd15fd9589ca052812ca89549b4cfd204b12013c91ef8453c7bf29c8ea9fffdfdb24bf9bf59ce37a78468d SHA512 fd9751aef8aa9f91b92a3d9c9b864d2c6027154279bb74906fabc01ac4dd7d35afb9ad605ffbcd68592f46324759969ef7afe1d204788455e2894ba75f8b1dc7
-EBUILD pysrt-1.1.1.ebuild 801 BLAKE2B 4812210faa5043ebd795556be29f7c248c53c1e68f83f02219178d68935d3563c01c40eee4796bac6c383d5efe8e1d022f27ea17bf6920cc24d7036ce809bb6f SHA512 b346f18fe6938271a1171dece6e4ba95ce5cc2870e34b5fcfeaf8e930a655bee1d54d62d3ba3f3166fc10063a2631e01e00a0251fa8b5907356f98619d07a509
-EBUILD pysrt-1.1.2.ebuild 798 BLAKE2B 7aa254d637277ef4d4e8ce1b43fa72035181ceaef85b19e02dba2c9b6db1df2588526190b0f8150639132265af4070f3b2766c13bf0d85853ed6b804c7b84271 SHA512 3aad4a15d4c217a7989161ae7f4327ecec8396cc5dbc0dab381c0cf10f9508b5b07f0d2ea65dc6e744a3ede4b247afb2ecf6a5ddf2a5bd49bda1966622890230
-EBUILD pysrt-9999.ebuild 798 BLAKE2B 7aa254d637277ef4d4e8ce1b43fa72035181ceaef85b19e02dba2c9b6db1df2588526190b0f8150639132265af4070f3b2766c13bf0d85853ed6b804c7b84271 SHA512 3aad4a15d4c217a7989161ae7f4327ecec8396cc5dbc0dab381c0cf10f9508b5b07f0d2ea65dc6e744a3ede4b247afb2ecf6a5ddf2a5bd49bda1966622890230
+EBUILD pysrt-1.1.1-r1.ebuild 798 BLAKE2B 8dc143c8fa5d00c101d29812b1335e28fd601d6a2349f4541c69338f6c15dfad1273332fff76faeae5556d3da1e5e71d2b6d4b0e16c1d2758dd274a6f649c3fb SHA512 3d6c4274244a4f5991cb38423a3a33276a0b7ed01184c8e865096f66612e79cab000ed186e5a038b96db60cc505b54fb29d16890a140355c22e4fffbee470a3b
+EBUILD pysrt-1.1.1.ebuild 795 BLAKE2B ef984c345d9605038a9cd3e598d3b11a4202d87e2b4d7138d80ed33827cbd5c1ab32d41e6c25e44d1aab852bc6f309361a46dcbda4d83610114dfda0e1bc3e8f SHA512 97e10eaf59149d57817ebbf9bafee70048b94d146a458bf42f129f005ca5c6526b1cbfa567a5680b92f2495afbbdd4a2d1a03857fa5c390412a16d45db7c60ad
+EBUILD pysrt-1.1.2.ebuild 792 BLAKE2B b7d6c2c306c4def9450e85d6e789c9b4c9b312ae19b22b0f26b4a672906bba1701ca15fe06b522bbd58dd6146c47e9f5905f1073f5d1fe95be93b1c2bcfc43e7 SHA512 678fd6278c0a5ea62f580852666d818024ee0524c1c9dbb68fa1c6080c326dc6b68cd04f8b54ceb6cb352850cbedbfa661aebc2a74d19eef8c12afbc6c6ccf8f
+EBUILD pysrt-9999.ebuild 792 BLAKE2B b7d6c2c306c4def9450e85d6e789c9b4c9b312ae19b22b0f26b4a672906bba1701ca15fe06b522bbd58dd6146c47e9f5905f1073f5d1fe95be93b1c2bcfc43e7 SHA512 678fd6278c0a5ea62f580852666d818024ee0524c1c9dbb68fa1c6080c326dc6b68cd04f8b54ceb6cb352850cbedbfa661aebc2a74d19eef8c12afbc6c6ccf8f
 MISC metadata.xml 425 BLAKE2B 1a1b0e96edd162f5349513bb5bd1a2b740a0764e4983c31ad71186227815c9767b0295d3c1b78fb019eca9fca59c6b119d5f4f571dc127b5f3589709837b8424 SHA512 a483c297944a2ec9b417a4703fd64dfbd34b8a7288f12a00e082dcf9c907c52d8c6f05eab5bbbf444eded62a42db6a9aa5799c35ae7d41d1b9e4e9b5417c2419
diff --git a/dev-python/pysrt/pysrt-1.1.1-r1.ebuild b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
index dfea1772bb7a..955fccde2c85 100644
--- a/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysrt/pysrt-1.1.1.ebuild b/dev-python/pysrt/pysrt-1.1.1.ebuild
index 315ab0b380ac..d5c1c4e88569 100644
--- a/dev-python/pysrt/pysrt-1.1.1.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pysrt/pysrt-1.1.2.ebuild b/dev-python/pysrt/pysrt-1.1.2.ebuild
index 766998ae2d3e..98e0450016cf 100644
--- a/dev-python/pysrt/pysrt-1.1.2.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index 766998ae2d3e..98e0450016cf 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index bcd4dca78ee2..cec71e8b307a 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-describe-0.11.1.tar.gz 7226 BLAKE2B 5cbe722d1187fa67424e5c932eee7fc90335e6811d7493372515b44d4210d0de4b4d8f33f1583ac1ae400d91d9fb9795b2952a56fc6c2865ab450af279e45c09 SHA512 0634f17ca36f8fa346a6001338827d70dda410376660f370ba04b8857d37e009c5e33f06baee51d1c23a13094c88850668028f5d44a09c31b40baff0bfdaf1ef
-EBUILD pytest-describe-0.11.1.ebuild 862 BLAKE2B 6f96dc928c2cf2a126d317a47a966d5ab8aaac978049fecae924b82f30fdc9ff9bd587d0282e400f5bf1d39075f96c1c91dcb8753dfae201e10b721e51463563 SHA512 41b5b52eba8385f34680465290090fe45b3f0d622133528efb2d329cdb6c6bfe22b2e1dce01c9a6795b23dca4518255b30ade64180605795e7e665cdd8c32b6c
+EBUILD pytest-describe-0.11.1.ebuild 852 BLAKE2B b22e87b256cc8bc2afec229e303f8c76b7c2f3c5b386048fb1aa6893f97bbf1e70ecaad823a4085b38077387e9a524b871c85c6ad3f23f3d533efe3d72c45625 SHA512 e47998b902b325efcd3cbeee6a7118f0382c1b46370df96287dad1f0efba63a755834100540f069f196dd4d2123b7ee63754c6d648f347528ee4e7a0299222f8
 MISC metadata.xml 379 BLAKE2B 5e73cfba60df9af4e4452172c35e7ba311b0f4adf05e4ea64ad936d33eaa540084593eeae26190607ac6d1e66878d54a79663bfd1a8e67a46fa99ab86f7c8a4e SHA512 3bd074c7380538441d32f94f960f99db2c7a6b3815d22d560d8a973e11eac75064ff687442a92afbfa1282e70ff10570546497e1f4e10996fe836e9858b97460
diff --git a/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild b/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
index a86ba66ca203..714f8ef6e32e 100644
--- a/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-0.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index b4d291e56e84..d4854e138368 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-django-3.4.4.tar.gz 66962 BLAKE2B a989009eccab4bbd96e32ed1b6b5d03ca8105026c6d9219ea09f6b33fe2087a30d9042e2cd5a313196ed67cc1c5dc940d04fe981dda0da4f25cf16a43e88471a SHA512 a851b27e9abc4829a47abb5da40cbd69fea5c48b05c81f88910d4345696c6d01f78e07ac489cec7cfb5724dd8432891ff9260dc585e720d758491906812661df
-EBUILD pytest-django-3.4.4.ebuild 700 BLAKE2B 1c7aa674233cf94001c08ed5506dab9031909a055edc4f507912830597c47fb5b0a0421249d042466b275a9b4c4e5c9710e6c7a018eb439623c90a98a769478b SHA512 859778208bb0f0d007034394a356424f57adca9b03367eb63cae917f9a75a9032bb4cfe9e45f7a108e59ac41ee685491a662c2bd659de84276038309a29a0f3c
+EBUILD pytest-django-3.4.4.ebuild 696 BLAKE2B a7f0b53c08c6dc0bbdb15b546a8df7f8e4cbbc0b97354ef8ec7b8baa3c093382494834090a8e4ee565cf6501ca50be2affd7689f85c31e4e2609a5c40933d02e SHA512 e0e7a2f617a06295262a390444c359f5afec8f7c152f14ce5a25f88a1af633ca3acafc541a6e0ebb249063d06f4fe222570f8cf998f43d7e2614f2aa928b73d5
 MISC metadata.xml 380 BLAKE2B 6d349594a1198f6cbf2c6e0e80276f3d27454346cdbd24654506221647304fc3d3a0c9b8deadb920c4881b62c779951df2cda6a773f4f251c7c31d166fdf7b2c SHA512 65163d6f99c4d2be86bbedad07b756eda2aa639cd612e0ffaf95dc0707e72de8b406ad51d2a482925790c837bc7c3d4ccd5dc3fd070da6599e13278db03ab006
diff --git a/dev-python/pytest-django/pytest-django-3.4.4.ebuild b/dev-python/pytest-django/pytest-django-3.4.4.ebuild
index c9e5b83c92c1..004f497cb80c 100644
--- a/dev-python/pytest-django/pytest-django-3.4.4.ebuild
+++ b/dev-python/pytest-django/pytest-django-3.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-flake8/Manifest b/dev-python/pytest-flake8/Manifest
index 81957c55e4de..0e409a8eb53d 100644
--- a/dev-python/pytest-flake8/Manifest
+++ b/dev-python/pytest-flake8/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-flake8-0.8.1.tar.gz 7359 BLAKE2B fd45d50fa68e329569a5964407fae301075907aabf0ec2c85c7ad9b9c28aa7a92acfaf9b7b4e06036c940ca6c7a35388cefb0d9b9151471fe98c968a43cf5a95 SHA512 b49b4d42712040492161f144cce807b661f2d8fe5b484b29ad1a519fd5b0b0cfb6abd42c3ae8999f21263c4776fb773f91bf0776971b6b6727607d33fb49ca89
 DIST pytest-flake8-0.9.1.tar.gz 7959 BLAKE2B d0ef55385dbbf47968abdfc14e69a0420cd52bdf65c0f74ec72abeb1ab28ad27806593dd592f448f3c01dcdf29af4042c1e1c8affde46a1405ba7b4155c174a4 SHA512 eeb4f66022e367d92dee94544ae8fa99b79c1de0579a80e91c22e6f050752010cb7ad6c24094736d23ae753615b186a957b8b0f94c09754005183a971a1e4aa1
-EBUILD pytest-flake8-0.8.1.ebuild 600 BLAKE2B 7c848c88509086bc2e4db9e32df2ac264dcc3217826e38d003c374f460dff91636f649dd4bc139470adb1fd3b499c795a21447e1b7438babc9e5abe91cc9221d SHA512 bfabf09827d7f2401e26be1690e05a4db0bc1c82709abd1fecc546fa3a337a2e349f68d0fa40694308c8902c2aaaf2c9f8bcdfa475ddb479e8118d7766959446
-EBUILD pytest-flake8-0.9.1.ebuild 685 BLAKE2B e88808c77d3dcdad1424865807f48dc791b363f4d7f32ae21ad99c6f9c3f476d4eaa633936c36c5ec0a2c7166c64efaf10e0724ab145cc80b4b224562cdb05d1 SHA512 c4d08e58cd64c6ca845b9882eb2fc6065304389219e6744ec4f387e2b0898836cf4544a33a255b429afbe235e81bc99d9a1a62ce94e0755663a33f027c28ef35
+EBUILD pytest-flake8-0.8.1.ebuild 606 BLAKE2B 92983b5a175841089464bd2c478933e9e23d7b280ebe7dd410586b8fd98b4cf16a3b0d950111cc9ee03fdc9fb42eb3a7fed19b30338d534207333ea7dc1037c0 SHA512 0cf3ccecfd02c2dc4b1f826338f71a3ecceb98afbcf49e30c07a3c6751f4cca8edd45c04a3fb0ab0fab0f2ad3ed6cbb83fd0a3950a085a2f73e0bc6017cbac09
+EBUILD pytest-flake8-0.9.1.ebuild 675 BLAKE2B 1e65ddcc621645dffadd8a2b902be886d9104dbfa6fa46bf0f2c7d8908cff5859b2ca558adffb77578959178be2121f26452fdaecf66f91e4fb939d0d054b774 SHA512 77f38d2935304c0e05620458fc7ec548bfa2ab5768336557883026c5f712f95319f15def98a4db484d8d879bec2efda7b0667bb0abb4ad0f71773c156a4b2070
 MISC metadata.xml 507 BLAKE2B 75290d0db230e858a4b5b706a2636963a998c882631cd2599bfca3a1961a2f6304dd67b1fa2dbf5a278a86dda00a4c50247f400ff8573845552d3f11b2704595 SHA512 0f022aea078d7eb1b41db5326bf4c1b950344102f4b614ef095e20555a81032687a3312ead75ff33ee8f6dcc81984651dfc110b95113b8c4f2b3e57f52e97baa
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
index 7ade828412c8..d391b017378f 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.8.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for flake8"
-HOMEPAGE="https://github.com/tholo/${PN} https://pypi.org/project/${PN}"
+HOMEPAGE="https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-flake8"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
index 1667ba9e06d0..9a28f875f218 100644
--- a/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
+++ b/dev-python/pytest-flake8/pytest-flake8-0.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-flakes/Manifest b/dev-python/pytest-flakes/Manifest
index 72cb245b0790..395700eefb9e 100644
--- a/dev-python/pytest-flakes/Manifest
+++ b/dev-python/pytest-flakes/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-flakes-4.0.0.tar.gz 7138 BLAKE2B e3c43df60484c664672f8b9ea92f8d4e25ae33e0dffc9cee200867220a3c8840f7325be28a4bec44918a9b44c1d73d3b89517db8dfa9bb982ed92a34c3b09674 SHA512 e74fe78e713040e3e85f206e8d26f5b8d8ef27dd94c2afccf3cd0f1f982c5e6c30c5966f2cdb774c7a2a8052d1a5cb324626b1997a9e75f5a7bb7d4a5e99376a
-EBUILD pytest-flakes-4.0.0.ebuild 627 BLAKE2B 67b943e1b169588e61b335ec6253887f03e4f835f2612ded1ea4cac1d5e6b1e9af517fd2cf208f6da2253f247b9cbf6521ebcf9aad306a8b3b476b9cd22b50a8 SHA512 a552019f17f2af03b706358cff30c7dc955a61533e8950ebcaf0b604fc71526dc8d70d290b24cca0a1423ab31132d8318cc7857a7864164ef80e3f6953809904
+EBUILD pytest-flakes-4.0.0.ebuild 617 BLAKE2B 62c4b5a843b3106887c476f6d84cd1f12383ef01019cacac43ec882c69513f33eecc78811f244a73a87cfb17467c736cfd1cdff5cdfbd4b22bc91dadf78d17de SHA512 0ee691b88aec6666859e5790741d8fc8ce23f451f38c1e2e26b7f138ba072294ab85a0658879e5cccff2f9cfbc3bec8f44ff382e8a84dd0bb984b8a26f80b028
 MISC metadata.xml 322 BLAKE2B 4f4573205a169edb1b0883546480cf852d1eb0a9b5f99c7326a55e4f6002345c06961d8394e7de26d13616ec78f8744cfbb122964b40ce5215920749f92bdcc5 SHA512 129a0bb37ba1cd528848d3c537a7a776b7526eded473f97e986307a9a185b4337d60f6f5f0ed1beac1d0f18fee6d9023753b9cb89d77e3b3a06576104701273a
diff --git a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
index 404ad119b816..9acf63c308af 100644
--- a/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
+++ b/dev-python/pytest-flakes/pytest-flakes-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
+PYTHON_COMPAT=( python3_{6,7} pypy3)
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index 132877d57857..22854625f6fe 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-helpers-namespace-2019.1.8.tar.gz 5487 BLAKE2B 201e2e34f60baf95ce33f8cb5d3d8ce5465b4140e68c16f4802ba5225e28c4506c608dfc6ff4a36fddde30c7972a8c175ead976a11a731e2bfbc33e4b06cc04e SHA512 47b7f7c6638f4f3f0248722d4134b73357acb091f02cc1302d32894223d5ec06fd5382db207ae524f62749f2ebc53cf32d27eb8890d12baf250cd29dc6378a55
-EBUILD pytest-helpers-namespace-2019.1.8.ebuild 469 BLAKE2B d62bec0cc25f763116e726357d4d468f32d2ba3fb9da15ba403ae3eeaaef734d422ccc8175994bfdc12ebed1133485363e6484b6ec9d745d5200a4b7c8ae28a1 SHA512 73c41250cefa43afc0cf83163cf8b87832a3a0bd0be625b2ae7cf8a10d735cc7be30922092d3d964d68281f140c556690a85eb505e376410cfe5adec81b9d738
+EBUILD pytest-helpers-namespace-2019.1.8.ebuild 459 BLAKE2B 7134e603fcfd9f2476b66730dc666a99f0bf3d39db764f6168716f8d96395d1aab21d10f29788e24fbcb7d007aae03eb96a12935fba18c0efa88988eec016a66 SHA512 54cf5df849e46cda1ced740c018b778d783f546eae05c6f3a9c256f14914548a0807a685a3e04d217974210dfe9d18928c59eb96f9d997a4dd74e03e1682faad
 MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild
index f923818c09f6..5df845c7031a 100644
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild
+++ b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-isort/Manifest b/dev-python/pytest-isort/Manifest
index 7887537adb7a..b5113cc6ffb7 100644
--- a/dev-python/pytest-isort/Manifest
+++ b/dev-python/pytest-isort/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-isort-0.1.0.tar.gz 5502 BLAKE2B 9fb03759871d0dc35d53806ce460fe637b1580ed928e1e86485f1a0603b92042fea4972008aeadc890c79cfe42151e77a6628fc7856e4b230dc4e39293a8bb57 SHA512 86c964b6a998a32c9c474dde0a9400c45da8b26f3e8dd6f4092baa4bf1978a7f67a384bd910ec824f85a8ab49b4ea30967e1e7f908a31619ee88391d3505440b
 DIST pytest-isort-0.3.1.tar.gz 6429 BLAKE2B cf68cfe061be097c576c9cb7ad0a808729aa03f031128d2d1064bc960c7aa27e0d94fc18c238d95ac2074f056ecb8fb33064f6f0311756c73ce8379d1b8317f9 SHA512 2fd39108a6acacf18ce68bb537d2adeb4ff7cd8ea4c9611e5312edea5a0bc4841111ffb544318aa7b3bebe38e9f4744f07a45b2ebcbf872f79003b249ee115ca
-EBUILD pytest-isort-0.1.0.ebuild 650 BLAKE2B adc0609a3f6a144d2e0bc7cf078656f912eca32ce58dc396b43cf5a4bb3cd099f7be2c2dd0a3d7e3f65e7b248fa8b9ddec254032d73716405f2a22b5cf6ef451 SHA512 f7aa160d4ea19cea4c846500673e8d7ae5c2e9ec401abaa031cbcba26e235158e38c158090eefbbb28aa25612988db5f3447a6ffd5902668704978ee6bff7451
-EBUILD pytest-isort-0.3.1.ebuild 690 BLAKE2B 60c5652537e3fff590727e6ee96874b371492fa987e6b1ab3e182738aa761b9b46d0b944447c26a1b110b9564f26e4cc5d801c2fb467322734fafd5a5d83895d SHA512 0b6e8aad7fd4ea9ca450347a233bbf7e96e03d27858bb13136c38ae00711bbc26d8fe703001f39a23598c88b84ff0d0071b99fb434a03d2dbeee53fd52390fd7
+EBUILD pytest-isort-0.1.0.ebuild 654 BLAKE2B 74efe4e984b92ee56c92efbd95ea2bedeeafaf5833d0bad2e6afbb5b86fbadee93efecf9a31392d0a3277dd75266adb91b24b289edc64b978f3b7e373e3dc93e SHA512 a217cd29cf21251293a1c3c483f0df9dfe7b3f86526d9b4cb2f0f74afb153ac4c85eb7d950ab1bf07bf4b6bda0f998a355b661d9ab4da411559e2d82562dcfed
+EBUILD pytest-isort-0.3.1.ebuild 694 BLAKE2B e766b79b81d85a1ae704f55814dd66ce04ce41740b68466204d384de7c3aabd5a4ba56081724cc4b1f9a4b5f820346d1a5271b9f9f1b1332dee9620e914c3b75 SHA512 78249a5e2d754180488f8be8449bc2ea035fc2183ff918f260240371a48345a290ad6c54e5d3bf30401332fae770838c9bf7caef0029a2b1d115329ff684f33e
 MISC metadata.xml 505 BLAKE2B 25a6f8c03a7bf69bfbfd8fd8e45d9ebf90930063ded11da4e7bce31732d3328f17975327b79c66ab3af85112f8e4fc1d91aa7784d297f10a3c5f4770176941fb SHA512 3d77c078c21bbc18af28a19cb1d69c9277bcb1fcdcab004b21d18e715242d0d8e97aa05ebb2d232dcc2411cf068ab40ed36728d56f21ec4ba200319012e94fa2
diff --git a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
index ce98c8967112..944b8265316e 100644
--- a/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-0.1.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for isort"
-HOMEPAGE="https://github.com/moccu/${PN} https://pypi.org/project/${PN}"
+HOMEPAGE="https://github.com/moccu/pytest-isort https://pypi.org/project/pytest-isort"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
index 65bef8ecd039..b84f9ceea363 100644
--- a/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
+++ b/dev-python/pytest-isort/pytest-isort-0.3.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin for isort"
-HOMEPAGE="https://github.com/moccu/${PN} https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://github.com/moccu/pytest-isort https://pypi.python.org/pypi/pytest-isort"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 2c0e03cae80d..6d72f60b2582 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-localserver-0.3.7.tar.gz 19772 BLAKE2B 388bb7c2cfd4867bc028c23dea775ee463d947bc9bcd0a3e671b3c240c025ceed8eac75a2d05011564ff4c8c1e1153759033272cde0ffa9c3b2128156ad1b38f SHA512 48d7e6a27965dafa1d5e5af1efb6118cc1c1c28ac4a46ae2d61b6b804292a126f481295bf13976f66f505789238f3365ff16e6f1207c8bc7fb4b258759fd4d99
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
 EBUILD pytest-localserver-0.3.7.ebuild 676 BLAKE2B e0cbe8194efb6be37d1c6ea1fc78d3665bda060eeac9b5cbf8fdcf075b030797fc62ec2918b00196613c9a9c58f2fbf8b5c5d579f32ba41fa99eda85b66beac2 SHA512 f6698b893979a766497e6a5d45ca2fef7d9ab892fba98632880920571403c3a6bd6a4de1895015d0cbe4fb82ad03680dec54f0980f9996be2f9bc00577c487c6
-EBUILD pytest-localserver-0.5.0.ebuild 698 BLAKE2B 4badb74915a4bc7253bc305c800bece7d01efddf67d07ee98f33ec2c1f9c3cd4155a458389c94256e5df3583b89b7885696df810f4d2f8fb91806f51d5b1634f SHA512 22a256f0f7e1ea33674ca4b70460b567e766c60c7e73ff3a9da1556e6931257e60a703b8c4d816b727648e9a2174ae3e409fa9c5a8f170bbe2a83703c7d4a4dd
+EBUILD pytest-localserver-0.5.0.ebuild 711 BLAKE2B eac5aee118606f0645088f51800a6ae4a54191a418e5611bcc8c87c689bc10f53e9f0a10682d4e06a3624a8577e7c303104f63438e0a2dae86c18a431e4fd012 SHA512 45a5e862592384abbc036ed3b68b7b1fb3412b1e03d62182527c93be949575fe647dfc88095c93d48e67683d447a1cf041823a79c4c97d7ec53c67d5ea74346e
 MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index fdeb8a085482..703c4b619ced 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-metadata/Manifest b/dev-python/pytest-metadata/Manifest
index 6050f267ccd6..1cfcd9779343 100644
--- a/dev-python/pytest-metadata/Manifest
+++ b/dev-python/pytest-metadata/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-metadata-1.3.0.tar.gz 4604 BLAKE2B 78987d2c28438b4942caae33d6c56b789d7859085074ae39549d0666cb725e0dc70c889ebce7bd7ff0b3846ba0c06e82cb85641c29bd0ee46b675813f1885492 SHA512 94af4defb1115d87fc456db80dbe16da01662d0b87325e433d4d1b30f35f210b7750bbaba091ac73d158296070c87054ce9f4c0687dfe5dfec3f02df56261d98
 DIST pytest-metadata-1.7.0.tar.gz 8254 BLAKE2B a7c5d7237ac6cf44122ff4af6f44aff8d3227a54dd340b3a5574161123319be1380410599a29920aaab41868ef89030a731a389232685e9e3885617d7dd9586f SHA512 85f86f1eb7486f19904bb513f1ba3212667e0ca2d74080621ffd2ef1cddb0ab9d6c01cc1c8eb69058d86ccad0974830bf1d6ad3b291fe0dbeb6196c06331e66f
 DIST pytest-metadata-1.8.0.tar.gz 9227 BLAKE2B ccc8d1ffa1f10540bb312bdc3a2e0342829935a108adaafd562efd75497768653a5eb452393b56eb97c624f4622a0b6ef5cbf860057d28ae340c28aeb5d7de2d SHA512 04871fe0c4c30bc23eba80a58919841cf45045b91d501e67630426cbac88a16005657eaccb1d2587263d4fcd940d37382f3a5649f142b1aab327f1f1c5d61963
-EBUILD pytest-metadata-1.3.0.ebuild 621 BLAKE2B bfb2a4152e7b084ddef7ca2ad040ab94d08d0a431a01c8996518a8c092db7abb1d2831ccfaf350451bb50b2d17bf8ae20a5d58df6e08a90fac31287d95c96ca8 SHA512 fd418b6bab3f9f9f345e8d4c77287aee2eaed92ac0ec9f8f292ff8b7e229467210dd545872609c0a66df9c8591201f4b26b87c88705479b539edad16bc01af0c
-EBUILD pytest-metadata-1.7.0.ebuild 621 BLAKE2B bfb2a4152e7b084ddef7ca2ad040ab94d08d0a431a01c8996518a8c092db7abb1d2831ccfaf350451bb50b2d17bf8ae20a5d58df6e08a90fac31287d95c96ca8 SHA512 fd418b6bab3f9f9f345e8d4c77287aee2eaed92ac0ec9f8f292ff8b7e229467210dd545872609c0a66df9c8591201f4b26b87c88705479b539edad16bc01af0c
-EBUILD pytest-metadata-1.8.0.ebuild 627 BLAKE2B 351bde06937e30177ed509448fae7f5da35f0701e0839d6d28e23d6a20df292fd7ab7d09b26ed0b1d1a479b139b1eac619311adcea24aed174c24c96f1399538 SHA512 2927f35a69cbac92f6066c977b1e0ee7341541f4bb7b32c53d692358960783e8d123a4f16c8f778e6333a545a6431b1907b4bad30f58d942b3cba0a1dbbfc5eb
+EBUILD pytest-metadata-1.3.0.ebuild 611 BLAKE2B 324c090fa214eeb49f4c713fbfa18db03024dee692fab73c4ea04ef5daedf99fd6233ff855b7c5a7edef6c7ce176c5aba32fe1ca12c25b97ba6540aa9ed90320 SHA512 16c3532c10f0be7260d3a6c39218663dfaa30ed1d653010d55ef812d308329c121e39eeb20950a83304d6414ebd4717237229fd1d344fb382209f371456532c5
+EBUILD pytest-metadata-1.7.0.ebuild 611 BLAKE2B 324c090fa214eeb49f4c713fbfa18db03024dee692fab73c4ea04ef5daedf99fd6233ff855b7c5a7edef6c7ce176c5aba32fe1ca12c25b97ba6540aa9ed90320 SHA512 16c3532c10f0be7260d3a6c39218663dfaa30ed1d653010d55ef812d308329c121e39eeb20950a83304d6414ebd4717237229fd1d344fb382209f371456532c5
+EBUILD pytest-metadata-1.8.0.ebuild 617 BLAKE2B b4ce4dbc0d352dc54e05657129312bd28c3f086d0b6b1529eb0854ceaa4030122849758fd2820c3aae8cf8812b11912caecdc8ccb399edce43aa64e11886421d SHA512 00055e521d2f55c9a278c6b1b4abddaad04c457b74dfb883b9685258ae04ea9d868581560e4516f67c04e71e1f99b672bb1492c7c599043ce1f5040ee1bff8d6
 MISC metadata.xml 384 BLAKE2B 8024f5d5853f139e54a68c100aa021a51df69091041fac8ced7d30d773b5b0fc3360e8c6b13ba988828e87580b320e8cf5dd650ab630572f209225db932ffde2 SHA512 e932dd150d0b12c6055a7842eab3b31f8c08e28392eb668e6641b1a30008e713a982eae530c1fc9d99f86ddbaa1c6f19d4044280d23908069b41ae1ccb22b790
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
index 12f0b73f77d5..3ce6c44a57f9 100644
--- a/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
index 12f0b73f77d5..3ce6c44a57f9 100644
--- a/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-1.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
index e6a4966ba715..d7943df1d767 100644
--- a/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
+++ b/dev-python/pytest-metadata/pytest-metadata-1.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
index 6335492d1aa0..2bc152c76c8c 100644
--- a/dev-python/pytest-pep8/Manifest
+++ b/dev-python/pytest-pep8/Manifest
@@ -1,5 +1,5 @@
 AUX 1.0.6-MANIFEST.patch 178 BLAKE2B 498bebd63c6be42e3a73063709dc2f315a2c8ec2234d43436ff3f076f768acf566d81a21ed76412fcf9da929290d355cef02200d91938a9c76df08a296d1baa4 SHA512 f63f80ea3ed7bf9241a029e4cfaae2e41ff9553effee7a85cd492cb3b57d9b54a17e684896be443ba5df08be1d07625c4e6769d9cab9dff952f10eedb92ca1cb
 DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758
-EBUILD pytest-pep8-1.0.6-r1.ebuild 705 BLAKE2B ed24810821c5bcd3b1f9677a7e044a74eb29f4570fd373dd2374664d91fd6917b1489637b5a15ca30ab534db28445c333209ba1623d13c6bb0ad565e41031004 SHA512 95f5a966a7a1039c3789f649c506b4867906e27cd6a5477321ccaf77c453a310da71474176f3501711bc379b0d893d036f80035de24d0a6e50eb0a27d2ca0244
-EBUILD pytest-pep8-1.0.6.ebuild 705 BLAKE2B 78e21d44681c73bbdab382689b246285e75f8ad7cd257eccdf0e4816dcf8742e06885f8d00aa01c9050003c6542d18cc296c6492818943cfa0cb52ccdd8f9e6e SHA512 1b0d616cf611160bdf915aacc5811ffb22621cd9b969561455a6f9f94b6cbc8dfe582df3efcea9c67671ad93c7fd344e34b020c50e4a78b19e6a9ae6715223af
+EBUILD pytest-pep8-1.0.6-r1.ebuild 695 BLAKE2B 2cb6d2e2055c0927a32e8434f175d85b0cad80be659b333773bd29e62522bc61e72d212f0da8d28e45be7080457c15c17fba0f0d29536c6f26017aa9ab37a378 SHA512 1a600702ad83e43a752df7e1890ba4ab4185d7ec585a19e3aefa87e881d9f42f780877b258e4e3e422f57164684fff783a905391072a9d46d4267dc481817f1a
+EBUILD pytest-pep8-1.0.6.ebuild 695 BLAKE2B 3db47487d823e74e449c2622dd0c5fb27a4d08299c996b2ad4d3c0d680165428d85ef8274409e504509eb4d2ffa29b53b75d207b4abd49bc6837ce9986f170ee SHA512 6b40217285046cbb85ac45d5b66e3bb0c2cd9cf7b6edf782fdc9deae2ca17eed53b8fde2f57f1f306e69d275ef7820e86e47efd0a4d612038c83ccfd46e6902a
 MISC metadata.xml 324 BLAKE2B 3e0d5894a9d05fcf94a05abcdaba2da483d9b6db134df730bd436b85295a60504b2b30004eaf63396c31783d62ea042db28e0a28e24ff27255c40c4e4704b09d SHA512 3622d9663e7966ff8a566971b51f886be021d2e58254836d3c5dfa62e5001289d8d9beabb3f980af243a91cbfd527a076db628a1b29fb6562041a88cbc617b59
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
index 39a230e6dffe..de2a0974adf4 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
index dcf708678dad..6dd813f124ca 100644
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-pylint/Manifest b/dev-python/pytest-pylint/Manifest
index 007924b87c68..abc516115ef5 100644
--- a/dev-python/pytest-pylint/Manifest
+++ b/dev-python/pytest-pylint/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-pylint-0.14.1.tar.gz 8144 BLAKE2B d78892e3e606ec588b48a252db447e1cc76e27e45606670da3a3acddf040485004a7af84474732b044fdbf80ad760c07fda5e35030b9b2c9e5ce89f4809529c2 SHA512 697cd40e8e4c3722e382c7fd2dbebcb1728675e35b60396628576ec09735595af56431a2c080f29a2f35f304d912c80e4afdf0f8bd21a3adeae3156b9e58c751
 DIST pytest-pylint-0.7.1.tar.gz 5648 BLAKE2B 0baf011d9bbcfc5e66b8ea2c4fd95c8a3f8bbeedca15e2ec35d36b372b410d87ba619b0938acb26c667750c2f81d4bb09ca688731f9e184877fd999be04b6f26 SHA512 e2a7802f90ea25a909094e8bc67570eb631d6ab6dc130bb5cca1738ae09d069b4fa6c3c1349d9d62188a924138e832a3a37c8c5c8964290c95d69eecbadbd09f
-EBUILD pytest-pylint-0.14.1.ebuild 1076 BLAKE2B 9f6f072bb863e99bad026725034a9b032061160b865df66cd02c0bd79968f8e48b9c4d38924eaf8a16b83510d0c6c56e2e0aef791bf756003bcbd431c631c722 SHA512 cfd47c381cec231e9325f93f8654e1c4b440ef126a791d96e47e96a232546aa3c54d8d1771bf6751ca18a633137e298b8803094a0fb309d3478c3d565375da82
-EBUILD pytest-pylint-0.7.1.ebuild 1040 BLAKE2B ff13a2225beb608cd6583e1af59633e3655f7e31a90316dd6dd8ec7dc9ba9c735675df0585532673de462b5cca76df35718f4cd984ff3d77cb9307b0008c9514 SHA512 1bfcac79da5092fbbbaa2635dac72188384ae3fc6f72ac5d5d65e14f0caf381c1b3755d6a7454cf84d0f8887873422cd33036d509d4ae65c7ee1bbafb16ccdb5
+EBUILD pytest-pylint-0.14.1.ebuild 1066 BLAKE2B 198a3d9651fb4f5d38aeaed5c4944244dc682882b89261cb23c97e64b68160ea1614f368586263e043fd424a3aee979034a8eee6b07e6f93a86ae7cc91838ead SHA512 08eaddb1c87546439de9bb85a9d747874b2b865914810089593cd07434f957d58f8174d5c5ce782834ce6e2434d7227ca7fd4ea6b143e21ceaf84e85c1f5a3f8
+EBUILD pytest-pylint-0.7.1.ebuild 1030 BLAKE2B 270a19b0efb74caf3ed9c8db1ded165283dfb9a1e046df675de7b0089167ee76a0de263f27fccc0a95f5347fd9ad353da55c2849fa25106b00890b964f5ea464 SHA512 4b5e961d443753aa123fd2e9ae6bfdf9e2125d42a46f32e3daace46d2ab37cc66c4e071088a7ba81a0705b0b0ad8c28fd54287dcac849f126550049f1274b991
 MISC metadata.xml 306 BLAKE2B ef6d4e4bd779cdbec5e76617003defe8581c1c2b04b6098efce973a9b2eb154da51bdc27e8c202df1dc6c4a6393471b917dd47f2e95e75487dcba7a8fa725ae4 SHA512 726037520d25c038ab6a35c14edce11561e281fcfbb6a505bf3ead4d474cb10606b715f95c6df95e22e97f20f840c1694bde08984f9211bc46b5d0afb46f1c4e
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
index d794df777f73..85605fa7eb8b 100644
--- a/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
+++ b/dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to check source code with pylint"
diff --git a/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild b/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
index 7dd4b1919ece..b9736d3679cf 100644
--- a/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
+++ b/dev-python/pytest-pylint/pytest-pylint-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="pytest plugin to check source code with pylint"
diff --git a/dev-python/pytest-runner/Manifest b/dev-python/pytest-runner/Manifest
index 604959fcee41..283ab8db717a 100644
--- a/dev-python/pytest-runner/Manifest
+++ b/dev-python/pytest-runner/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-runner-4.2.tar.gz 11947 BLAKE2B 97495bead800a81d879659f1ee522822f76fe8ac80579537d43e21e663323d7c10be8d2da7d05ffdb0931145149d8c10ef7c72b3ab4da2ce856d44d3f00a724e SHA512 278da7add27f77134e63470747ffd9fe663d93ab8e7cebfbae98902bb1d5ffba45277574107f958255251cb9e499b85a0db3e8173f9f10fb31d1561ca709a379
 DIST pytest-runner-5.2.tar.gz 15534 BLAKE2B 0bcbd5991808aaa4b85b9071ce142e03287683e919687fa76f5b7929ad07dca6ae6edaf7ad30a1bc1ba0163f43505ec18ab2cd5e0462399b8252c8ca761d7b29 SHA512 5fc62a4e681cfa0ef25dc815ccbbfe1a7ca0e9e7783c2ba2db0da7d2539f11c08d6c3fad2ab3dfe7f0d50fe7bfb41127b11ec9af67ef8e32361655bc910c8245
 EBUILD pytest-runner-4.2.ebuild 1054 BLAKE2B 01912a0f4df623576a18032cf1d5bcbf4ebff6d5e6860ec17d858e6b15dab777cb172c23c7cb4a64b1018c06da869543619be3af3dd5955858b0a8a85c2feac3 SHA512 d172e79895e7af732c1e71185f9010d2d9a68835b4c6d333cc2e7fac9b0c71b133098873e63aca2ccd67af7dd7a938572b0b6cb383ee152cd67e6e8b8c0a1d17
-EBUILD pytest-runner-5.2.ebuild 944 BLAKE2B fbcd3ba08ad7f40ae8d18fa87db9515cd3795bcb27a55003e366a153818bebfd0e787dc091aa464b7cc7a1e523f5271ae44b9886e22c31ef01e5eef10c43c4f4 SHA512 a98e2630011c40a94538795810f136b467758e1792b401dab0cc0f8a5b1131e8adc8c9c8879ee80e273dc49536701f6f5b83b7d4ba9372bf2208c75c2424f9be
+EBUILD pytest-runner-5.2.ebuild 936 BLAKE2B 89ce48a541d06e13d64be242a23292d880a74d66b123e03766a0354a2765373f7e6ba80692f464c832fa8b3622ed8bc3ce858397ed8ad998238cda4081f751c7 SHA512 012f8499bb44b14ca917386ea7900314c0521a46c33a26782f5031782dcedf5badc1ade9347d1ea61b26f935c5667d448b1eb94b994914f635d183e8d204604c
 MISC metadata.xml 611 BLAKE2B 51a4f30d72bd0b3cf396da6272eb95a2d99fb46387619110afe35eb4a3dbfb9871bbe1ec3c657a8265e77d24aadd34db780099000e4e5bde92a9d2bfac554b8b SHA512 b434e0768011ddd2e6d94bc439a4b487ccbca4c50956b81d8c45cc6aca574d46dfb1c6f9c92dab24160104513ff1e16dcf9c78366bb39465196b7ec8b75f0855
diff --git a/dev-python/pytest-runner/pytest-runner-5.2.ebuild b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
index 26b4b629950a..4a3ab2f29c89 100644
--- a/dev-python/pytest-runner/pytest-runner-5.2.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-5.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 5bf192c6fb32..c8f7ae727e7a 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-salt-2019.2.1.post1.tar.gz 63824 BLAKE2B 684e1dee6df8f7459bfa1747ea017973d72bc69b87d22c65509ecada47469a94ce410034004a5df1396d5ed05557ddec90e34cb18792235babb5e0cf6d72d776 SHA512 7b9939c3bd1cbcb6d6d0b086c39e02deadd8b3c6fcc359924af7fa5afc2e443b927269b82aa5575413e4e6bbc052f4035fb17ab68dac59ea309320c0a647d36d
-EBUILD pytest-salt-2019.2.1_p1.ebuild 588 BLAKE2B dd4d02cf8feb003fe379263f2bf27e26dc7b72cbdd3de10a05dcbcde706ded3ef92c30f1a758ef66f890f88c3f83c9143e55655dd611a9fb5cad044c32414551 SHA512 42279b7c410f65b68cf489b8cdc4476bb9dba559cc41ff2a94f0f70fdb721cba2625784eca9450f3891ee813bbcb7c5148197ab31a36a5e7b041b730763f0a16
+EBUILD pytest-salt-2019.2.1_p1.ebuild 578 BLAKE2B a1535a842ab15429175c931ed36342041b9061cd42730df43639928b0b0122fe209ed2b34b397f5f11e8b98f15233cf51ea6d13dd959b20fa839e25a3ff62af9 SHA512 a984989a933648f8183257b0d69438171691beeacef2158e8b876ad76ae3239308dd1061e5a4143e09714825e36eedc883dca3e179fde5599baa586af1749026
 MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
diff --git a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild b/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
index 476bd492befe..baf5647849f0 100644
--- a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 MY_PV="${PV/_p/.post}"
 inherit distutils-r1
 
diff --git a/dev-python/pytest-subtesthack/Manifest b/dev-python/pytest-subtesthack/Manifest
index 5d1c501510d2..696a9bffeb29 100644
--- a/dev-python/pytest-subtesthack/Manifest
+++ b/dev-python/pytest-subtesthack/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-subtesthack-0.1.1.tar.gz 2410 BLAKE2B 3d41950ad46bb07da145db7f88eba7eb34a2bbb99273f47d2443cae5ab0e11737f1c2fe81bf473180178b2ad9e55b252c7717846f1b010cc58fb1bf61380d003 SHA512 0bf6425b535e65dc7f06f74493d10fbb6451e78a817174638661d7525f39f092f67db8da010228cbd54b400485e71e443118f91ebef660b9c00d2b354062a55f
-EBUILD pytest-subtesthack-0.1.1.ebuild 834 BLAKE2B 6dcd85c40ed1de2d0c3292f3ec9fd521ca56800a2f99d38494664355df3485a31e4e65614eae3758c39c7eaea7b5c6f19c0c361eef6349d5e52fd6ffe25a632a SHA512 f6d1a4cfbb550e3f271ffa7270ceff08389c8c90d3fd6389f0cfedf9ebc090916c469e915a3477f7887a25ced06a0c6a1ba6ea1852c731ebf7682a07d8e378c9
+EBUILD pytest-subtesthack-0.1.1.ebuild 828 BLAKE2B 3f9b63d2145879ba324159a2770d0a713c82aa3b341ef9b3c940202a8d03a7b15d5c5d61f7ae0d90a3ca28ca607c61a52c8fe2a67172d8b5945fb0cd91be604c SHA512 dc251f49cd7294a2b3577520b7e710c8f2341b655f1ac559170ec74eefc973ca006077b53c5db7083c16ec252fb90c10a8d7d94fed5a6cf99ef6a38567b48f8a
 MISC metadata.xml 321 BLAKE2B c9b07273af601a4874a8e2790c84350cbd5ca4218c4604de564b8a714a946106ef74ee744bafff29f160a4ab3bb6abd35c49a66cff74c83698a0a6f57b843bd7 SHA512 f1c6901c39e0eaaf79917b0699ae5d7dc9a94b15ed2db4ff08f0e3f2bfdaa567e3848474934bb4d8aafe56198536a4ff8f5a6b4379c2238ee20e4a718bfd9a58
diff --git a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
index da9c8709b4a0..8de886930db2 100644
--- a/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
+++ b/dev-python/pytest-subtesthack/pytest-subtesthack-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A hack for test fixtures, needed for hypothesis inside py.test"
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 2e04ab5c8f22..d662a93043c5 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -4,5 +4,5 @@ DIST pytest-timeout-1.2.1.tar.gz 11498 BLAKE2B 65b50ed52409ed0031c7c9b07ef5b96c0
 DIST pytest-timeout-1.3.3.tar.gz 11627 BLAKE2B e20348cc461ad03e95c22a16e753b72441ee70da9769214f4d07db15818a8997339ced47244b15de62a61107eb749dff8d6f41ddb4720c925ef1e6eb9962db27 SHA512 633f5aee550d568e403b958f4490ecb828eb322811c9f18cfefb26613be4fc36da14232ecbef8666fcf2dc693a93674c00a853ab546ea8328a07ea34da79fb84
 EBUILD pytest-timeout-1.2.0.ebuild 540 BLAKE2B c9271d3855ee6b87dffdc6acfdfd3ba5113b4e951149457b0626eda6538ffbf9068f9bd568442ddfa2b8651db7715ad8c14e9092538faee071c38220467cc665 SHA512 f8fd110f226e3beec669c3f7369e7cbb1029c7e77484ba33229187f0a60ecc566941d1a6a878b7d590be9996367db17c1770fbc6618bf5d67b09bf15a93e77d4
 EBUILD pytest-timeout-1.2.1.ebuild 555 BLAKE2B 39309d15a78bf9941db052ca743e5d7c722ffe3a5f2c71942d7f4214a094906eb091c14d69c2c0bce71db9365ca381bbe22b7933405c9e94717735b3bce6a4be SHA512 37594de2fbb33e6e9d0c87bbb75d3d7945df57c2ba4bfa0b248abd55620b12cbcf77b00a3fbb301f67b4a3d777bfdf25b914e9556202f900d23497582fe63ccd
-EBUILD pytest-timeout-1.3.3.ebuild 687 BLAKE2B 4c4474f3a0064d1a3f9416d80ada790e2f3e426e6d1e091797096af583f3d9e183b9c7db6378a55ef7f94343ef088d9c6e3db5d5b7bc7f9e8a543db79ec905a5 SHA512 f1a83fbc47a68cdea78f8be5f5c97a2a2376a9181bffdfb66b50dae445a935b72a84aefb53228c87e6530078fcd40e39767347091221ff4f260f5000077342e8
+EBUILD pytest-timeout-1.3.3.ebuild 694 BLAKE2B e471e48b4638ee0fe26ae47d359bc4e5850bc3f150742111f315973a6c52e2d646e15e9e60f7c89d3181ad3bd134d7ea12fc6b5efc5b5ee5bdf4cdef542eb1b3 SHA512 e550b0425ba6db1ef531d33dd30ba4a1b8e57abe89fc5a3c1e2ccf333ca28e0cf8a847fa542ffbdc76e6e4ed6d6f3e89d7e49713d102be6fb946d3699420a54d
 MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
index dce3187117db..ceee801bbcec 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index a8a61f8f4ac4..2435cb83b370 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -1,5 +1,5 @@
 DIST python-augeas-0.5.0.tar.gz 90667 BLAKE2B 5d563350c3f80db45aad87326c445e93e3563ca6eb8de17889cdc91735c61dfcf0fda4e93f15c0d450ee156d57cb71598f32cdce6f6716b0fd610b793f103641 SHA512 d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51
 DIST python-augeas-1.0.3.tar.gz 92747 BLAKE2B 0dda6ae6bbac1689c633301b91877cca4cf20773a3bf83bfd8a809dfc973da011cbeb39ed12f34b67f8f1be50ce5b9fc89e9cc7abbc992117853c11851b18fab SHA512 737b41e7bb438d80da75b55714c3f0b1706a4b2cacddd20fadf855bc3044e532f4079319b3775032e6f6009cf7f282af33fdf583332772b443a6c2d4925639fa
-EBUILD python-augeas-0.5.0.ebuild 506 BLAKE2B 3e6232c643f5761dbbff2e5fabb91c6aad57a9190cf3901348d31d5fe8bae23f941b3bea83859a218df0430001454ff809abe3ce90f78f8d6692f49cde94f3f1 SHA512 fa1afe2cfbf60d414b6bb87e9e9996ff3edbcb834e926fbdcbc818c785ff0c5f47d1e20d632da1d2f11877590fa52cd9e62c471eebc3cbe05f8aea96e8f243bf
-EBUILD python-augeas-1.0.3.ebuild 553 BLAKE2B b811899bb3a95f66aa867fc389d551ef882bd460c44b8f2badb6ba35b9babd53562739f6c4d71fde1b7757749d6605d0d4b765e537ca0ee20e05c5377e2d3393 SHA512 cf9216f63af63bab351e52e907664d7a28fb4036b5e7c15f1aec36c67c5000f2e9be4d149b32c03c3696e42ee957a670a077a0a80e8679872adec42513d26d6d
+EBUILD python-augeas-0.5.0.ebuild 502 BLAKE2B 2e83dc4cab811049499fba53ec94ebf26c360caf91f38465f804fb6cd27a34f71ccc60f2b1e21e6749adf25532e65c3291147d80f4ef61be28c859aee71c58df SHA512 7651b65a3a002900d785127d4b500f4f42e0b88d06949734ecc4e0c59fb7542e3b5c2f85d4ceaf790c0d9030dad08230ec62aad0a569e5f201aff5b6fcdff3df
+EBUILD python-augeas-1.0.3.ebuild 549 BLAKE2B 5b6189382e0195e634eecce3e53fec7eb60e0b94b5be1e9cae057be9b193bcd7d232d2aeea9ee960500baecc1ff96460938d696f9fbd03b0bb73080e9ebdc636 SHA512 5aa0c2d9ac17cd6a76f0651e067926418121d1b0cd26cc5047a99a02fd567c972c3b52920be765f8c0c3c7bbdfca35a75676b93bc69a0044fa2b6a594c2bba56
 MISC metadata.xml 486 BLAKE2B 8d3580820dd340e0021d4d016032e50741f1e975abeaea318433540848a62f67b24c00cb510da00f5c4e4890a153c899fc479c56b8a0fd535fecd059e9327d29 SHA512 8b95d59d81d418b1cd7ee5d95e445be02db004a3443d8aa6d610e03400d15ff0718a4295e8cb477f1da28b70e32fefd2e26ebe4c2eb75601c907440cfec91102
diff --git a/dev-python/python-augeas/python-augeas-0.5.0.ebuild b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
index 91a7f39177ec..01717f456dbf 100644
--- a/dev-python/python-augeas/python-augeas-0.5.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-augeas/python-augeas-1.0.3.ebuild b/dev-python/python-augeas/python-augeas-1.0.3.ebuild
index 2ea047133647..2e5aaf2f767e 100644
--- a/dev-python/python-augeas/python-augeas-1.0.3.ebuild
+++ b/dev-python/python-augeas/python-augeas-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index 85f3a820406b..f6b3f8ca4717 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-barbicanclient-4.8.1.tar.gz 118919 BLAKE2B 0c29eb4fb3b77d6ef69051a956db1aae8cb151d07156e4c888259888f1a9a6eac0be9e5339ac9a3dee9dabcb1c06c6e835312b47bec4338b34842e71546e3e75 SHA512 836b54156e72faf7ec590d6f11ccc2ca61258da38368410fb65f448b8a0e0ea272d224f46f5c6f08afc7477197a090be77720e07e3a4cb60ef71982367dbfcdb
-EBUILD python-barbicanclient-4.8.1.ebuild 991 BLAKE2B cfe86dd9b644fed9273b31a458ab5d190bf7cc131b3063ac3744707a745f72dd91d1f926c4810319ad0c08dad69a183ec937779a380f5b925ac355c6c4dd4050 SHA512 c5b7a8aec6b35747636abdb546ad1caa493581a44f6a2c29848381dd6927f6df9874d7cfa20a058035d39b607b6e46766ab3c65f798b0aff25e8e4384d5bb53b
+EBUILD python-barbicanclient-4.8.1.ebuild 855 BLAKE2B bbb4b95739df3d82c465a747c79c4c4a76e4c7e9b132eb009ff935b8ed95090a3cc2959e237bcfca63091af1cfe60084476b448b90c782abe7229cb267f155b5 SHA512 64282dfc6743d0074594e5285801a1bbc84b965eb265380bc6b11169f7a51d05e3aecc3fe961b1d2060aabde704be06e666bea400ac5fb7bff6e5b45b3e43d15
 MISC metadata.xml 586 BLAKE2B be3884c7ffa487cd45252e4737bbbc3cd460a0e6075b2ed38439d74c66518832c2739e1826cad8184bc794ac0af6441cd900c7e3f88fe8d41361f21796f6f87d SHA512 7e03d93945bf23a92dce98fdcc0fe7f65d4b709ac5105155cffe338e979802c55c9e6e59b876e9f77cc9719c863b0ee18b2dc94e04be1230d1841e525a019cbc
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
index 5b5b6f35f96f..14baebe6eab0 100644
--- a/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.8.1.ebuild
@@ -13,23 +13,17 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
 
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
+	${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-"
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-ctags/Manifest b/dev-python/python-ctags/Manifest
index cbc0d49736c4..658280a6fcb2 100644
--- a/dev-python/python-ctags/Manifest
+++ b/dev-python/python-ctags/Manifest
@@ -1,5 +1,5 @@
 DIST python-ctags3-1.2.4.tar.gz 47774 BLAKE2B 4b1844a6a0d6d89e014206b728e1f1d8b964db2b85afe599cfc254b68f663052d7d1169c257378243e22929297bd254e23ce4c21e1ea1c9a60d7007727c322bf SHA512 db6be08164da71b17de1a7fa46aaa60a5b83784f18ca4e2314e3b9954abe8996d5e07ed98aa024f70899fe87cf53d37671c9f42e567766b4a8af0f728df2bcfb
 DIST python-ctags3-1.3.0.tar.gz 54615 BLAKE2B b334b834cefb01bdbf2c061d44ef6e38070c2b3e5da6de25beb09d24bc9d5891a6892a4b0c9e8fa8f8168bf344c10880ac987e263844cb3dd21303f8c2d105e6 SHA512 3ad4433d69bd159879ff4eface5150acc8c0f609cc7597885824056ce4ec148e55ad234dffa53f07977aa3ace24846e180adce5316a2950ac8d4ff58ad128b68
-EBUILD python-ctags-1.2.4.ebuild 559 BLAKE2B ff984d4978b11a2c5e6845c8f3fad677720ce02e6de6a1171e7b83bb43661d58b1b1557a1b460c28044bd082d7789e774721a07842385fe4816ce7a8ca574aad SHA512 7232a9e691fd8bddfb3419ea61c7c1d174b092919a3672b4b71c5a0e84d8449f4adfa7df26262ccfc08e488ad32296c13dd4414d0f8ea5f9d6c7fe1600768393
-EBUILD python-ctags-1.3.0.ebuild 564 BLAKE2B 455f7a72a6ae3fb545e15887bb4232b5cb9aa76f45d562b09d93d6d6c7c44aadcc2c409de5be269daeb4e01568a909368b5fb149e0df7b8752747863d9a324d8 SHA512 c325791b264828a14125a74603cd081fe9b8930c264b52f46fe35dbc8b054d88865ee84f512888b7ab5fab821adce489e424c2ac37e19656ed7a0a86b4e6a8db
+EBUILD python-ctags-1.2.4.ebuild 553 BLAKE2B dd6d63c3216151b71dab7663f05b911fa884289f005e12ae686745a673e120106317247a7cac8243b5ed38235dc80d567f085ae8440b684d0308995ec22da5e9 SHA512 32746b3eef62c4184189b6dc80c0f42f34990ce89067011ccd4f2958baeb17813a8c33619f7115e4deca961bb77a7c861400832018d4730f403f99262f0e3df7
+EBUILD python-ctags-1.3.0.ebuild 558 BLAKE2B d74e005df3385c2211ecc45ac40090e25258fafbcebb01cee02cf8cd77335f3ff123dc5aa54318bc33b19b1b59d2ea4c439ea2440b775e1dfe7d25f7ca2159aa SHA512 addaf3b7f9cec4ffecb6bf231653aa57c2d66149ae883014a5ced89ea398ddf87b734eede02b3517f53399fb09da6a8a18ef7aaac12522212637c7f7b2302c96
 MISC metadata.xml 455 BLAKE2B af37b4a79a49f4128c7ed43a10ba5a384d5d6d4a33912cf74fb59ddbddd155184f1e47161519649ddac98556ad17cee495913321632f30a629704eabf7fc5d11 SHA512 480ef8e0ccfb6e278348ed31be811e51ec6a845c984c92d9d215d0375305278639dda7e409b66f18860ea980de149656b0dfd8111d26aaf79787e3c7a34ce848
diff --git a/dev-python/python-ctags/python-ctags-1.2.4.ebuild b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
index c1c2cd0d065e..c9fc195cd9fe 100644
--- a/dev-python/python-ctags/python-ctags-1.2.4.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ctags/python-ctags-1.3.0.ebuild b/dev-python/python-ctags/python-ctags-1.3.0.ebuild
index c906ddf7d4d3..b7aa5a9ff131 100644
--- a/dev-python/python-ctags/python-ctags-1.3.0.ebuild
+++ b/dev-python/python-ctags/python-ctags-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index 47ec2833e941..dba38c89876f 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,3 +1,5 @@
 DIST python-editor-1.0.3.tar.gz 6975 BLAKE2B 23a4b0990f8715eb0b0ce538f1fbf47d61cf7209588c8be31ae3fb047c706eaf2628c04b29dff517a221676566241f066053680749ab864d067334f875796eba SHA512 258d1ea17ea1c09d8ef52d3b624cc17710559f4a8db3c64696f72aecfcc0830d3509dcdcc9d1ac272155b2aaab432edb7142b0a37f2c3263a2505bff940a3cab
+DIST python-editor-1.0.4.tar.gz 7132 BLAKE2B c955a2e3d2f607133781ef17146b20c13a409def6397e9698a8bc19c5a9f40af002a0f772455fb96e60088a732013ea6c471c198be0ac4c6c881724e762844c2 SHA512 c8ce2403bfe6c93935c7f4c384a8618a39cdaefe1ff5b1ff2cf4562866d8b3caa616e428c0a1634a56db934caeb474e7f84f8d5e009b9ed664189fdece8146f6
 EBUILD python-editor-1.0.3.ebuild 506 BLAKE2B c8d352b89f78b138d8da6929af94250e7a40350c0416b592eefeed3cf76bd21aae0bc9c3e01a525a37fbd568cf1f710c2f8cca27d87f6b80e7094b096a76c661 SHA512 77d555dc2c676c343deb92ec40038371de3135ec8387467659a9c6f0510b50b6c1917a6b40e06e218ac87228867fa7fdc0e6b9f0e1dd2bb1867f8f42c220830d
+EBUILD python-editor-1.0.4.ebuild 514 BLAKE2B 7d8083916c61ac037a61aa6eddbd815b221e35390489b2d922cbc4a55620924faa977fe130913c0ab586dd76d15f1c7d5543182128d907ddd9272b4d02c39786 SHA512 81edaa78798cb124c2dcb6dd8e3f5d05b19a9ac6b66595126b6b64012c5e5e97100701348db337ada4c66a2027a3e7d75a24496b7d014b70d636211628aa77d6
 MISC metadata.xml 454 BLAKE2B a005031053af09882cc6f9e0a928d371d118cb44207567094e570b65a7cbc69c210ae2cdf6487473ab7d12793126953ef9fdf1d2954d9c31b58a2e783b563378 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432
diff --git a/dev-python/python-editor/python-editor-1.0.4.ebuild b/dev-python/python-editor/python-editor-1.0.4.ebuild
new file mode 100644
index 000000000000..63553b089a2a
--- /dev/null
+++ b/dev-python/python-editor/python-editor-1.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Programmatically open an editor, capture the result."
+HOMEPAGE="https://github.com/fmoo/python-editor"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 50bc69c62cc6..6f18c4e5d089 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,5 +1,5 @@
 DIST python-engineio-1.7.0.tar.gz 22804 BLAKE2B bc807943cc24eddbc9cb25ceb55223ecf610ed37b281e5b0a59935705dc2d2c34ad5795e0bd96f1256cf91365756e43ed9c94b1082334d6f6c34f6b6e9472710 SHA512 1d184ccb9d1328d9f4e2fa22006f1d21bd17200bc893ee2588b4342da24775f98648e0e993893eb56a9159f95a114f128dfdacef9fa8ea296c7ace6c7741aea0
 DIST python-engineio-2.2.0.tar.gz 22137 BLAKE2B 5e864a4cb2bc5048f459f98e24894bf263caedaf58ce3225dbb216fc5f4722efbaf7f346c39869daf485debff1479db254add66f6f256066ed26a11a8be196b3 SHA512 8e601c583bea21b37fc673bf92e3b40d6f3ded7068e7b103111b60d6677195e67338398934a270dacc8621b040e52d32eb9652e15607c7be69b6c50a8d19eaf2
-EBUILD python-engineio-1.7.0.ebuild 747 BLAKE2B 069139113de608f77c17f4e162f2a315f28dfe807db72cdadc88d36961dd584a19330990d4fb5c141dd00f40587b9458c6941c48e50b5d34180656e4616f0136 SHA512 e25ed2d8ea8743a85c3327ca1eacbb6253b95e3b45f7be16f5c89295340047138c0078452540514e6bb432bee90b81249bcb7c7ed53e393044fce52c15460367
-EBUILD python-engineio-2.2.0.ebuild 747 BLAKE2B 069139113de608f77c17f4e162f2a315f28dfe807db72cdadc88d36961dd584a19330990d4fb5c141dd00f40587b9458c6941c48e50b5d34180656e4616f0136 SHA512 e25ed2d8ea8743a85c3327ca1eacbb6253b95e3b45f7be16f5c89295340047138c0078452540514e6bb432bee90b81249bcb7c7ed53e393044fce52c15460367
+EBUILD python-engineio-1.7.0.ebuild 737 BLAKE2B 40718ef68c236cd702a81c852b3298d6f54e09be118c8436603b210d9768111430b104191f4408477d5323c2521203750cdcb8a76b0a0ed08bff399f2a16aa8a SHA512 f9d7559d7ef978462d49dfd025d8ac01056e18fbdcaa066f2611ba1305796eafed8c26ffc0d76f8dfc9df07f0777c7ed62349e968b7dff1f21249a94aebce1e1
+EBUILD python-engineio-2.2.0.ebuild 737 BLAKE2B 40718ef68c236cd702a81c852b3298d6f54e09be118c8436603b210d9768111430b104191f4408477d5323c2521203750cdcb8a76b0a0ed08bff399f2a16aa8a SHA512 f9d7559d7ef978462d49dfd025d8ac01056e18fbdcaa066f2611ba1305796eafed8c26ffc0d76f8dfc9df07f0777c7ed62349e968b7dff1f21249a94aebce1e1
 MISC metadata.xml 466 BLAKE2B 6ed10a68ef43c4462dcc0fd1ff545828cb6a38d63323da41ea1403d62c7465c08b2668319a0924b31d07719ccc0bd8587461d63362acddd9e329f9800b26bda7 SHA512 4b945547b692e81069a2ae0d70af112945aa2200b935efbddbbcfff4fea60268a9933dcf7ba2936e6c7a6655ef805f93252f157e63771e068a7ac6fb82c4de1a
diff --git a/dev-python/python-engineio/python-engineio-1.7.0.ebuild b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
index 8e005c9fcd68..379ec3f2b7e2 100644
--- a/dev-python/python-engineio/python-engineio-1.7.0.ebuild
+++ b/dev-python/python-engineio/python-engineio-1.7.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-engineio/python-engineio-2.2.0.ebuild b/dev-python/python-engineio/python-engineio-2.2.0.ebuild
index 8e005c9fcd68..379ec3f2b7e2 100644
--- a/dev-python/python-engineio/python-engineio-2.2.0.ebuild
+++ b/dev-python/python-engineio/python-engineio-2.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-evdev/Manifest b/dev-python/python-evdev/Manifest
index 7a3db9a5af38..809e2aea5828 100644
--- a/dev-python/python-evdev/Manifest
+++ b/dev-python/python-evdev/Manifest
@@ -1,3 +1,3 @@
 DIST python-evdev-1.1.2.tar.gz 83067 BLAKE2B 6434d5c62e4a072928d555bfc92e94e7f63ef98ebbf9cd95795a92d6ccdf7b5d4b0f3133a4b3f2524083b842f78ccc305a5da13af59052be3724d83ea4039328 SHA512 054b2e5af532079dc52919d90791d12d7caf75cade07d18b94ea519869659413ea059570b16ebb236a715c541b17016db380bea4e3c1cd21f96824c6303b45d6
-EBUILD python-evdev-1.1.2-r1.ebuild 638 BLAKE2B d1b7c02667dd4a3d7a556bb0048dec5030ab9ed521ae4d218ae36847a5b8b2f8b9852a7f47d78139a5a81b26d124704f7be7b3d755e99587171b7ac3ec5eeb6f SHA512 ee8df66286433dce3fd49764fc18d8b567e396d39b53b42515a46cd803d2b1b60ff3d4a8a10531f1829a141f7182ec15b28f3f407855bf1f2185fa9f9cb1f90b
+EBUILD python-evdev-1.1.2-r1.ebuild 632 BLAKE2B 150d2cac7ccc3c594698507ad288ea248f19ec1430cd3972fcc90edd16cb626060fbe50dbc150ac2fbd7a841617a732efd55c6f1d2a74e7ac5a39114cae3bd5a SHA512 30c1e5d43ab38523d349b91807943e8e91fe3197beecb3809ad7162fe2ac2ee26f5775a1662d2c2bcc13f477bde226868ce2c78a5f00796a0cd30916296f787b
 MISC metadata.xml 257 BLAKE2B 5c2ca1a3b14d55f8b7d0dd09b0811de8e397c4f748a58c4133f02e86e9084da2b2afabee2c7fb38f38d97d1a301c6de2dc6c4cf8ad4f91fe55c35b8580e6ff0f SHA512 2214f84571910c807983e21889732fb6b9619cd62bafc51a3743786f42b2c6248f1717ec5936685e767a70a052ec725a7a62c602b9c95fbb8e45838472146304
diff --git a/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild b/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild
index 99399b759422..c15afccd9b58 100644
--- a/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild
+++ b/dev-python/python-evdev/python-evdev-1.1.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-jose/Manifest b/dev-python/python-jose/Manifest
index b407d32b6495..2064812b6100 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1,3 +1,3 @@
 DIST python-jose-3.0.1.tar.gz 86726 BLAKE2B 82ad3cd1139b367d179e965aaf0e33f3592883da6b21ecb3a91e9fe98ff05dbe358e56156a3d34366ffc0d7bfa9efbcdef67c41307d803ac16144a0c0ac3570b SHA512 a39c3aa9acc6bcc0030e4435e499581043a820c54aa1a4b67ae478cf95f96f28755b03fa4453e484932a64865a61613a1ff4afe30249216e8f392638485693d7
-EBUILD python-jose-3.0.1.ebuild 1216 BLAKE2B ece3cf7f90be50b312e9953d676be80f107a9973dd8026f3d888b5146acfc877aabb41062960080e61daadfb4f5de5d737d452cc412b719747e9713fbacc3f22 SHA512 3071a0e58ad1a1c7afa68df9992b869a3dca278d7263c84a7e2e1c3c7b31ac3f59775d5d8cbcab6c6a6654f53e3789c2de7b50bc57895fc0bdee83df38cbba98
+EBUILD python-jose-3.0.1.ebuild 1206 BLAKE2B 7cfc76e7db8806d54842b6684f20dfd1045136a7074efc9ff465d7912bf9fdd356e71ce001ac9f78b58613f6d0c51d55112163b1dd821a3aafd141f00ca3dcbc SHA512 036266408eb97ba7d6fb3510a4dc0830e8520b21226ffba49f2493574dd9f92b1975c68d24055617b312c5891d622f4a2420161b5b75d06a04479a0bddafc961
 MISC metadata.xml 444 BLAKE2B f253d760dc81a5acb23c11eace88f17410135ebe2f336077e598b01f897e1a4304191feffdab06bdd5a04fb46430bbd090597a40e1ec96256865190a59a486fb SHA512 74ba057d1ffcb3d1995e1efe6436143260d8a973fe5cc9c1ffab0694932b2b3dd8eeccaf457a1d79fbb31f825b120fbc98fc3c0ad7b0796233e07df82357d160
diff --git a/dev-python/python-jose/python-jose-3.0.1.ebuild b/dev-python/python-jose/python-jose-3.0.1.ebuild
index ec78e50cd6d4..9795ad420650 100644
--- a/dev-python/python-jose/python-jose-3.0.1.ebuild
+++ b/dev-python/python-jose/python-jose-3.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 3e86092e7139..ed0b433d1f46 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,8 +1,10 @@
 DIST python-ldap-2.4.19.tar.gz 138503 BLAKE2B 54e088743ccd3fff00f66d8208122b9ebcc154b788d3511f170a3deaf9cfdc5ba813ef05e4a40f42079d2bc60cf871ffae8618cc2e41b3632e79243bbd43cc74 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85
 DIST python-ldap-2.4.32.tar.gz 126025 BLAKE2B 2e16942680cc037c1251f500855c10de8d63194d400059f20449d541854c2ddc8863cfff5f84716818d0b37f331336a53e4b158e9ba55edc4becb6612d999ed3 SHA512 35a526330852ee87acd240cd285881afe498612fcedbffe93c6e41fb082300cd8b351d9100dc2b3049c658ed062d69cea90f28f9db51a80d94816ce249bbd028
 DIST python-ldap-3.1.0.tar.gz 366019 BLAKE2B 19e95ee096f40cc195257f82ccb5f882cc521561b14e77469be91e013d6b566102c6b426463e68353a3140fc96ebc622deed94929a3aa81cc14cb072440efe44 SHA512 71948cbae1c9a47f9e68fb8c6d65d91a2992261dd9aa535a0453f5733be1c2a25be1dda3c84abc6bdebab92150c89cc8caa757454331a0303de4fa46788b414a
+DIST python-ldap-3.2.0.tar.gz 367645 BLAKE2B 5109f4a13644d53fff7506ad2417da6dbfd5d1c5d31cc63932338ee0bc7327b00878804764366523fc0610191126c1a1367e15fddbad481880f73d29d96d3322 SHA512 ef2833739fd57ad26d97ae5dba3bca8a47e770ff3f113d06a5bed0841f8fcbbe6cd102e75c753dfff48f5f6041f46a91c6166f3bb9ca44ef9bd643c0666c6b23
 EBUILD python-ldap-2.4.19-r1.ebuild 2432 BLAKE2B 3744a25dcfee201440c4022b099e0c0b8dacd1b013eeba0cf01ce7d2eac6315d85c6d1d47c7f8edf2cd0ca21f080b7ebc4f71d8167e7803a2aaaca55fe469676 SHA512 0f8c032c5348516c29b53c0a1d7a1a717eafc498f19247c871c358632e16c6c8ae1cb809f902ee85f9ea4fbf8138df33cfa7a9cbe1929618ecd85295d33874af
 EBUILD python-ldap-2.4.32.ebuild 2219 BLAKE2B 61e0715dcd6f88f78a6b06830e815ec57184e94ec9a19f5417c56f417b1ca8dd07e8e6fcab6640ca69e038aa7ad7e24164275c1869f0d026c6e03564bf0639f0 SHA512 245ac35b5d94121d5c5a8559f8a013882497dc4352b02182c4b1e5578c42a8d24a93f41e790bdcb3988f61458e034ff696197a8a799fc61fcb187654bd89ed14
 EBUILD python-ldap-3.1.0-r1.ebuild 2279 BLAKE2B 042c7b6894037233ad82551e6977412bd37f68cef2cd73633bfe1b2d28ee8c5ae797be00ab032bc7ab7390738d9ae8a17ef1152ec034b8c02b6e65655dde17cb SHA512 d0228010b5cbcf12b7b63b95f9b1f943b8de1253ff19a96219914f09ccac1c107268edeeb1c5496c5978e085b3b7d4513a2b912145c068ffa49aa8a17dce6845
-EBUILD python-ldap-9999.ebuild 2283 BLAKE2B 3e4ee2edfc36a79c051624b8c1582cb03be6d9d4732b52fca0ae99fb4f412c172c6c8ae969deb5bad2580bc8a43e97513cf7c262fd8ed9631ce292be0e75225f SHA512 d4a0b50d09e825189a14d8a08672f034433dbca72ae703847371ffa36f1332fca1f906a439d23dff21bf6102ded65b31bd496ac78369e09fc23a008cc150ab3a
+EBUILD python-ldap-3.2.0.ebuild 2192 BLAKE2B 88662b67f7b2a3031297e9ffa3f5594c039df242fcc48fa0fb3e4e98d42077b93d1fac3d0fd7a7537fad9bbd4e300e4fb2f32a685233abe342cb36d4fb8d4e85 SHA512 08f173a9d465f206f052137d9f47e60e6e7e0022728ff8666489ccead27f232bc7d306c7765156fa161ac94ad8a1ad7d12cefe0b714099bf257a991f728ce2d7
+EBUILD python-ldap-9999.ebuild 2192 BLAKE2B 88662b67f7b2a3031297e9ffa3f5594c039df242fcc48fa0fb3e4e98d42077b93d1fac3d0fd7a7537fad9bbd4e300e4fb2f32a685233abe342cb36d4fb8d4e85 SHA512 08f173a9d465f206f052137d9f47e60e6e7e0022728ff8666489ccead27f232bc7d306c7765156fa161ac94ad8a1ad7d12cefe0b714099bf257a991f728ce2d7
 MISC metadata.xml 448 BLAKE2B 4d845f5269cc16dc38e4516d15b3bd66e8eb793fa8d43cca45ef4e04784231757cab47386d43f9361de45889abe21557696d28936b1fd76cead93775393a60e6 SHA512 806ea3543e12f0b571212695f4d9e9e008493550b29b480fc022b55ce2ee1fe561e9eb3a81e887457b7c1cb98fb2c6d46f38890513cee9f4808351821b4f01c6
diff --git a/dev-python/python-ldap/python-ldap-3.2.0.ebuild b/dev-python/python-ldap/python-ldap-3.2.0.ebuild
new file mode 100644
index 000000000000..108ef92cab3a
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-3.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="https://www.python-ldap.org/en/latest/
+	https://pypi.org/project/python-ldap/
+	https://github.com/python-ldap/python-ldap"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+fi
+
+LICENSE="PSF-2"
+SLOT="0"
+IUSE="examples sasl ssl"
+
+# We do not need OpenSSL, it is never directly used:
+# https://github.com/python-ldap/python-ldap/issues/224
+RDEPEND="
+	!dev-python/pyldap
+	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
+	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+"
+# We do not link against cyrus-sasl but we use some
+# of its headers during the build.
+BDEPEND="
+	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx Doc
+
+python_prepare_all() {
+	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
+	# https://github.com/pypa/setuptools_scm/issues/228
+	if [[ ${PV} == *9999* ]]; then
+		rm -r .git || die
+	fi
+
+	if ! use sasl; then
+		sed -i 's/HAVE_SASL//g' setup.cfg || die
+	fi
+	if ! use ssl; then
+		sed -i 's/HAVE_TLS//g' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Run all tests which don't require slapd
+	local ignored_tests=(
+		t_bind.py
+		t_cext.py
+		t_edit.py
+		t_ldapobject.py
+		t_ldap_options.py
+		t_ldap_sasl.py
+		t_ldap_schema_subentry.py
+		t_ldap_syncrepl.py
+		t_slapdobject.py
+	)
+	pushd Tests >/dev/null || die
+	pytest -vv ${ignored_tests[@]/#/--ignore } \
+		|| die "tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r Demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/python-ldap-9999.ebuild b/dev-python/python-ldap/python-ldap-9999.ebuild
index 2e9dd826183f..108ef92cab3a 100644
--- a/dev-python/python-ldap/python-ldap-9999.ebuild
+++ b/dev-python/python-ldap/python-ldap-9999.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 
 DESCRIPTION="Various LDAP-related Python modules"
 HOMEPAGE="https://www.python-ldap.org/en/latest/
-	https://pypi.org/project/python-ldap/"
+	https://pypi.org/project/python-ldap/
+	https://github.com/python-ldap/python-ldap"
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/python-ldap/python-ldap.git"
 	inherit git-r3
@@ -20,8 +20,7 @@ fi
 
 LICENSE="PSF-2"
 SLOT="0"
-IUSE="doc examples sasl ssl test"
-RESTRICT="!test? ( test )"
+IUSE="examples sasl ssl"
 
 # We do not need OpenSSL, it is never directly used:
 # https://github.com/python-ldap/python-ldap/issues/224
@@ -33,17 +32,14 @@ RDEPEND="
 "
 # We do not link against cyrus-sasl but we use some
 # of its headers during the build.
-DEPEND="
+BDEPEND="
 	>net-nds/openldap-2.4.11:=[sasl?,ssl?]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
 "
 
+distutils_enable_tests pytest
+distutils_enable_sphinx Doc
+
 python_prepare_all() {
 	# The live ebuild won't compile if setuptools_scm < 1.16.2 is installed
 	# https://github.com/pypa/setuptools_scm/issues/228
@@ -61,13 +57,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if use doc; then
-		sphinx-build Doc Doc/_build/html || die
-		HTML_DOCS=( Doc/_build/html/. )
-	fi
-}
-
 python_test() {
 	# Run all tests which don't require slapd
 	local ignored_tests=(
@@ -81,9 +70,15 @@ python_test() {
 		t_ldap_syncrepl.py
 		t_slapdobject.py
 	)
-	cd Tests || die
-	py.test	${ignored_tests[@]/#/--ignore } \
+	pushd Tests >/dev/null || die
+	pytest -vv ${ignored_tests[@]/#/--ignore } \
 		|| die "tests failed with ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
 }
 
 python_install_all() {
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index 31a190993378..0f6c34a03b38 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,4 +1,4 @@
 AUX genextdoc.py 7029 BLAKE2B 0d4b2c1110838696e1bbe7ef07b30d4bed04955da3451717558ed5a290ed5d1270a0fbea188f21098109f429979995e9548baedc3b9282e33e6703f03390861c SHA512 f03a6628e982da094d40e14d63cc2d233677d78ca1ad0dd0817bc69176d8d4374c2a0caa94a4d0891ba3b7ab14cbbad1b530319984df990176e151d79331b906
 DIST python-Levenshtein-0.12.0.tar.gz 48617 BLAKE2B 67a720f2a76152b008bce86405b4f15f14f203e55c09931f83624c85199626582dcbc255ace914e103e7cd459c8570b0ea0c0d69abfd2c314aa488cb235583a4 SHA512 95df064490970618b003bccbef9071b1a2a3ee4645ac8e851f4205bd4e8123d21ee0ee733adfeec79085faa01ba39902e2a4a26bfb21b70678377579157df4a5
-EBUILD python-levenshtein-0.12.0.ebuild 1083 BLAKE2B 86bb9c8ce5dc0ebec17474217d55e9355399ada4300643efe8d05fb3cf9c70afc44f10c5a981695aa90f26654bb464a105a80998e9d47dbd02ca9f96585f0685 SHA512 6b1caadf3528df2964127b8d295da56618c9b0665d17a63bfc7786367490a73205c7d2409d737b324edac613e6d4429a85302d742ad16e02d4a8a9ae0a9a270f
+EBUILD python-levenshtein-0.12.0.ebuild 638 BLAKE2B addf8094eab80585fe6344147e9d05d5d51ec72f26571ea14bde2cc18e959c2ebcaa324a0e12acad8ca3c5cbb4798d9852800c844160b4935e634f9e465035ea SHA512 cc31b5370111262c61ce6692fcd708d9a62f6a919cbaed0f97021a55d8fc41c06479789b93885e3db5f55455c769961d7b38d80751307024b119ed10e58b2b14
 MISC metadata.xml 400 BLAKE2B 6cb97d53cfebfe6960f5adb6b1b10fef856a0944456e89d1f6ade86d8cf8183aa4acc33cbd4829c35a46158b6955a1454ce7143b5cd5538375ad4ab08ebf3097 SHA512 bdda13940bb23190d6d7c43f69d77a231413dbdfd81de5e35568da70e4ab2bc9906cab76890e78da7b1789a376c44658e476ba7c0a4822e7a97b0f37ce36f0f4
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
index be307a80aca9..1fc1b7dce524 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -19,28 +20,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm64 ~ia64 x86"
-IUSE="doc"
-
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*' pypy) ) )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' pypy )
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		"${EPYTHON}" "${FILESDIR}/genextdoc.py" Levenshtein \
-			|| die "Generation of documentation failed"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( Levenshtein.html )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index 3d682484a37f..ac59d718785e 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1,6 +1,3 @@
-DIST python-linux-procfs-0.4.6.tar.xz 52640 BLAKE2B 99da58f6b4e127b24acce2cb37b86c7e8aba4d85c8911be96dc54bf18499b6783af5434e93e85a82ccabe7903ae8884e41b7f74a4bad5ab472556bea78c0db25 SHA512 81dc936c76c2b3272dde85148bfa929e13531c43f7aa61da3def7546fd8c2a257b130f8ae100f1d53936d3dfaebb1ef5b52c022d146f3ed7ef00359a24d05b89
 DIST python-linux-procfs-0.6.1.tar.xz 18540 BLAKE2B efda66e0264db15b0c1904b9dca631683d089207abe57d165a25e71f68194c249a22394c997a13a71b0333aa27dbe7ac1b47488f715e22655d0f9217346d7ce7 SHA512 14f7510828d5a3eea1a8267041b604046392dbb8d7980b03b4d10bdefa88a89a5f69acdfea77255ba664c2ef33ce52273490214b3f76d2865e7b1dcc83e8e265
-EBUILD python-linux-procfs-0.4.6.ebuild 501 BLAKE2B 30ad361f2a4e591ccdcaf720d6910abe5d15396632dbfe2bb18f70713d459d233a20a535475f27aa4848b8a15566f9f96285bc59ca938e66052e08636ce01a41 SHA512 76def4b37e30fec7489f643b25f0ac3e1562c698d768406f40377cee0bfcf3bd4298d1225fd920c979612006008b66b9614d0ec57a765504af7344b0d9924c7d
-EBUILD python-linux-procfs-0.6.1.ebuild 597 BLAKE2B 7032d7d437cd0c0342fb41fbc828ce6d239e9f71e5ac393e0e7fb5289f5f202664974065e41c1a0dc3d7b88f9a869204aa5222953047e508947777240972671e SHA512 5b572183a5114bd84ff463eb75e7c1979329c531de7f547b9022d0c06ce29d6183a75b89b41ebf0684ca12d620dc1da3590360bc89c1f9541961d198ca6b0aa4
-EBUILD python-linux-procfs-9999.ebuild 527 BLAKE2B 97617ae00262f5ea3114947f493d8739f74c774ee16ce9872de537abaa3463fdc38c3e5aeed503e37da41151e9c4b52b118aa76d44d2164ab86421e86f693142 SHA512 20b4b00a0a95b76b658c7529a5fe42e2368f42761cd75235efed56f7a10efbbf91768b38a885067661fd77acfd1ab6b780359da8b2c6fe711913c6c3b2b329a2
+EBUILD python-linux-procfs-0.6.1.ebuild 587 BLAKE2B e88e5723d96a669636c4663e17d889a9adfaf9dcd5f1e11523effbedc0ac76f445e6696976861bd3ebcd078c58e2e4b8ac0c33440e1460383eb11812dcf07ea3 SHA512 215defbefe665b4f94792afc164b11df0627df6bfacd4fbdb3308ec4fdd3bc560f76d4235adc75a9ecf804fcf301466da469e423effa0b813ab600773528cfe6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild
deleted file mode 100644
index cb57ea51104f..000000000000
--- a/dev-python/python-linux-procfs/python-linux-procfs-0.4.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python classes to extract information from the Linux kernel /proc files"
-HOMEPAGE="https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/
-	https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
index d26695838457..c0a906f2109d 100644
--- a/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
+++ b/dev-python/python-linux-procfs/python-linux-procfs-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild
deleted file mode 100644
index 64316e8b6b30..000000000000
--- a/dev-python/python-linux-procfs/python-linux-procfs-9999.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="Python classes to extract information from the Linux kernel /proc files"
-HOMEPAGE="https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/
-	https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/"
-EGIT_REPO_URI="https://www.kernel.org/pub/scm/libs/python/${PN}/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index 149ecf16e225..f34b0116a4ed 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,3 +1,3 @@
 DIST python-ly-0.9.5.tar.gz 174780 BLAKE2B 9cac626f5f363a3239e0c60772db864ae5764a9c3556a484182f18a407b3171d796ddb3549debbb4ce91129b9956a224870ba4b63d8e98228905de3ae4abc3d9 SHA512 f43aa4fce0af970dd64b0cfb75caef57749048d4eb088de6e08e820935c359203de9e99134a0248f7dc26067d0e4eaf2b373a5a2b746e09dea7997437f99812b
-EBUILD python-ly-0.9.5.ebuild 415 BLAKE2B e1f5e9c9b1208637f52d01d1ee46d4e805ac0396b330f688cc85b50379ffe9bc039c0927420272e34c816dfbeda4ebf5620d11e68353c0037319f501db1bbd68 SHA512 bf946258d30e3fb96fde9cb09aa1f539117a91f5b34f60e23a05a05627c42e9a2f6b682b5badeb2e71733df5d9050a86da6706f6862f2524ed4793b5b7feb2a9
+EBUILD python-ly-0.9.5.ebuild 409 BLAKE2B 4758633e182220c60f9ddc8472186530d25ccaf16ad9a0f6b4784cc818f6dd48ec81ae50f9074e747450c0f81ee89d2b7f2e8e4be1728ee1dbd15551193e7ce5 SHA512 00a97aa586354ca9dd321df1194689549076c3aeece04bdcd47cc38c6da0cd259a7cc9cb71cb5f675f030f91ab27fa83abae413102746f0589d24ebf8363bc80
 MISC metadata.xml 302 BLAKE2B c1c2d9a7ad2000bd1273245b6137e762adcf45f8fd97dbd4c0ea53becc6f55fa9b603ae5fd6c0f7b4184bf2eb054228721559b5e8cd60495a78804fa3b350d7b SHA512 9e87419e39c35b0303c414eb36fa860847d1aefa9a601786a34bdf2c8e9b19ca7d775eb72f2588e538afcdd52d5ce13e153a9643b31287be9a807bd836dec6be
diff --git a/dev-python/python-ly/python-ly-0.9.5.ebuild b/dev-python/python-ly/python-ly-0.9.5.ebuild
index ea5992f6b48d..968320f02364 100644
--- a/dev-python/python-ly/python-ly-0.9.5.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-lzo/Manifest b/dev-python/python-lzo/Manifest
index d1fbb52849b6..84c536ca56ef 100644
--- a/dev-python/python-lzo/Manifest
+++ b/dev-python/python-lzo/Manifest
@@ -1,9 +1,3 @@
-AUX lzo2compat.patch 417 BLAKE2B 56aeec39b58a59a66fac3f99ca5e8299723f73897916b45d8891b623cea6cf30dff5ecc87e98fef5f0c7b645f5cac2202343cbdc5cd9de4f5b1e7f8d83ec0d00 SHA512 eb433f90ac40fc85de8872f2bf94805712ff4b085bbcac168aec230a55b325ab5474746b2aa0a81b0e58b04e9da50e10877bbee66768106a03f7d83c97c7ffb3
-DIST python-lzo-1.08.tar.gz 13046 BLAKE2B ce4e2d2b1497ed93cdc15d157228bd7b3b6395b19808ac9c91ebfc3da6506a0af4d4e770f6e13a23e6ffd6f38cb2fd6e91f949d44680a6ea236e4c3704fb43aa SHA512 94b33e3b0e62b9c8a97147507f4516706d25d62c63ea938f0748e520a3e27760f0e3be142cb3e68aea132ae06759c91b3a4dac8e5010cdfab633e6c8d5904d8c
-DIST python-lzo-1.11.tar.gz 13823 BLAKE2B 4be60c85aae64e8837f7f8ec332c16f8c86d2e8b2e965e783cb9b0c6c942aa13750dc194679b71a6a0d733bee66313b8ca376853cee7063a46567222f80daa7e SHA512 580c68d2a5fdc43f6cb904507795c25b686c42074f217d067f51b336afa75d3eea10fcb7925c84aea352ce4383c591ff70583bef6c2fbc74116487ae87e1f87f
 DIST python-lzo-1.12.tar.gz 14042 BLAKE2B 7375e9b200a17cc1ad2c4dfdbe6491082af8d120b2b659b1e9bbff00eaae568e04dc12e5c13de3a028267a1e8e02bd1522a9335db73fa6a5a4ebc7ca4b341fff SHA512 811bdb282cfaf33427ad641d0342900c5af1f17b7033d76593288c3846b0feefe6ef93253152add97b2d6420f937de2745c8e7508dadf33e72b11545cac3be4d
-EBUILD python-lzo-1.08-r1.ebuild 622 BLAKE2B 58ad08becc27f5f6bab25a9e4beb590b049ffe0a0a0c35315ba665bbb415a9333e22e315cb6a64b9f0c8daa77e6d73acc225d9f028e14cf72deba7b65dbc7bc4 SHA512 908c281da215817826e0b9b2dbbc3b5b24179c504d0ddf2aa5b7b58a766a023a52f713a84f61a387518323658850b061c29a48babcee461624711b8d17c05fc7
-EBUILD python-lzo-1.11.ebuild 742 BLAKE2B 1b175d164c58ac9cfd3612c673b7ae9058a8b65575561e64f377857fde69181200e4a83cc2d26043441ba372cbb771aca8b0e01a535471000c136241f5da2274 SHA512 e4c9dbf5ec6fc39d5d9c54a74313abdd86706b91ebf569ab74c2824ba1c0fe047dd1341b0475790a60f37fd30175ff25d68c1585824d78531c54d0974a6b376b
-EBUILD python-lzo-1.12-r1.ebuild 752 BLAKE2B 3c1144aef629d45a267e583a00ca2dfa1a7529878026f59dc60a5592e4488cc38812c81ade93dcadfc974da3098ae4cfa5b594bc24daa5ff4624584230cb51c1 SHA512 bc10a73a5451440b294dd44960985ed68af8a15c13c45a098c78cca85b68af1df4cd3be008ea15752a5148c944ae53ccd0401d34dabe20964cf56f4a9098fe06
-EBUILD python-lzo-1.12.ebuild 746 BLAKE2B 8474c4bd1d1a0bc6034cd7f983a48db6b74b729ac23e0d23f4a9dc37d8834c6c13216bbc5ccf08b4dc93edc9a1bb31f7c1fa0cbc2aca01de86e923a5d6de3765 SHA512 a4798158a09428b77359f8a3a8298b1183a10750ae00fcd81904614d7100940b9e8b79c442671915d0bb5056670168bdc4a3a0f9feb67882c1f188cdd7fe06b1
+EBUILD python-lzo-1.12-r1.ebuild 742 BLAKE2B 3481c38740136f1f0713dd304ca59ee052b7b9a92d2c67aaf2e0eeb9a4c5e8f259f2454c59ae10eced4791a58506d39fcdc05004141980fe46bc9a729944003f SHA512 a030edc91129a28c10c2e9ec6f982a7b621e71dab8d1e039b9b6c843e39c8c5611a4742b004748e21ed1044624c498611e29ead5c18c7bac07894147b85d0831
 MISC metadata.xml 385 BLAKE2B 4a726b1896f55aa03b8b9a1a1f39107751f372b7bb7b0b9759447a7d42fcc97c142ea6ea3a2de8358d0bc00cb0e73b12c78c0b03e8c52c93092220761b6eecef SHA512 634d30e62ce3a8c09b3de241642e9ce8b059d9d3ff02e6530642dea4b0b4bcc8f108566bdc5ba52f6e63214546e11f734bdc094ef60ad13197b9f74cab71d03c
diff --git a/dev-python/python-lzo/files/lzo2compat.patch b/dev-python/python-lzo/files/lzo2compat.patch
deleted file mode 100644
index 6ce728753df6..000000000000
--- a/dev-python/python-lzo/files/lzo2compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -24,8 +24,8 @@
-     include_dirs.append(os.path.join(CURL_DIR, "include"))
-     extra_objects.append(os.path.join(CURL_DIR, "lzo.lib"))
- else:
--    libraries = ["lzo"]
--    ##include_dirs.append("/usr/local/include")
-+    libraries = ["lzo2"]
-+    include_dirs.append("/usr/include/lzo")
-     ##library_dirs.append("/usr/local/lib")
-     ##runtime_library_dirs.append("/usr/local/lib")
- 
diff --git a/dev-python/python-lzo/python-lzo-1.08-r1.ebuild b/dev-python/python-lzo/python-lzo-1.08-r1.ebuild
deleted file mode 100644
index 2c2c9210601d..000000000000
--- a/dev-python/python-lzo/python-lzo-1.08-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils prefix
-
-DESCRIPTION="Python interface to lzo"
-HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
-SRC_URI="http://www.oberhumer.com/opensource/lzo/download/LZO-v1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/lzo:2"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${PYTHON}" tests/test.py || die "tests failed"
-}
-
-src_prepare() {
-	epatch "$(PREFIX_LINE_MATCH='/##/!' \
-		prefixify_ro "${FILESDIR}"/lzo2compat.patch)"
-}
diff --git a/dev-python/python-lzo/python-lzo-1.11.ebuild b/dev-python/python-lzo/python-lzo-1.11.ebuild
deleted file mode 100644
index a335c433c109..000000000000
--- a/dev-python/python-lzo/python-lzo-1.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python interface to lzo"
-HOMEPAGE="https://github.com/jd-boyd/python-lzo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/lzo:2"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	hprefixify setup.py
-}
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
-}
diff --git a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
index ef22bd911221..4a7a1b29084b 100644
--- a/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
+++ b/dev-python/python-lzo/python-lzo-1.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 prefix
 
diff --git a/dev-python/python-lzo/python-lzo-1.12.ebuild b/dev-python/python-lzo/python-lzo-1.12.ebuild
deleted file mode 100644
index de8b68f68bb8..000000000000
--- a/dev-python/python-lzo/python-lzo-1.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python interface to lzo"
-HOMEPAGE="https://github.com/jd-boyd/python-lzo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/lzo:2"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	distutils-r1_src_prepare
-	hprefixify setup.py
-}
-
-python_test() {
-	distutils_install_for_testing
-	PYTHONPATH="${TEST_DIR}"/lib nosetests -v || die "tests failed"
-}
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 34fe482a162a..449036a98195 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -2,6 +2,6 @@ AUX python-magic-0.4.15-fix-buffer-test.patch 2817 BLAKE2B d8eb024f3e2e3d5e5fa22
 AUX python-magic-0.4.15-fix-gzip-test.patch 768 BLAKE2B f97629ea04b4b9ba191087fd1eb3dbb0ed10deb81428754a6edfbd48ac48e0b8ae208b7e9c16e31876d050c9935eaf48165cd97ed58eb5cb72949d0fa221a32c SHA512 790c87209c131c4e394f605669297262b91ca6034309d910902dc19e28691102df0b66cb2392fc8c21727bb16c8af9baf6a316c0b6ca29c9ba542fdb49580e2b
 AUX python-magic-0.4.15-fix-jpeg-test.patch 1768 BLAKE2B 64899d227643a8a09d27e0f7cc5c80ac366cd8e0d70d4ccc076df51794cf0fac14dd1f6e4f5426fe84600bbfdf35fc8e1ea571bab7839f753720fceb575d4658 SHA512 5e31ae71c01334af8e781b2aaeb98da38a68a7772d39e5eb7b231623cb4ac66652a66888a3eae5d35b07cac3024944176a52c4ebf1336b976d68f9c558cbdef5
 DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
-EBUILD python-magic-0.4.15-r1.ebuild 1066 BLAKE2B b86b78ccc5d3c5239a4b9008ea203eceacfc8d0ce7f1209634ac036f8f113c06fd7de23d26287bb778168e103ea53c0e74839f37496aa26aaaa9b34df52ad625 SHA512 43102ccac2ddf39faca6cca218efc3d586ef8df84f0ac71575833d8498d3798b20a58cb09cc4c9879ee414fc7297f537bd1aa47262a6e0fda32d8adfddfae31c
+EBUILD python-magic-0.4.15-r1.ebuild 1070 BLAKE2B f0e9e392d76a44c16d900dd116e4b9b10047fb6d1afa66826343929faa75699b42d30f6501e01c994ea7a2064f93ff8ea555c9ef18528d921678e06b6759337f SHA512 e500843be3471c7c92bb387f65effc3c1b66728acc07edebb67828fc80b1a156fdc657c5914661101c44eac5b1bd89f1d6796e8d61cc438818b99fc179e25ec1
 EBUILD python-magic-0.4.15.ebuild 620 BLAKE2B 14c8efa6b1daabd27660bfffe24ca5e6dd4b9c8e74e2ea7c4c07c85551510714912a369cdda75aea25b6208d5302fbf11d1ad578fdcb110beadd98bc344f6da1 SHA512 ab297382df0432ef7f4be3166e361211883c294ad8ff75d0bf2f49ec3aa03a0baf2904dded9e0f8b1078d4b46077ca2404640dca65c208a2b9a018cfeefaa3b2
 MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
diff --git a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
index 56dcadd63704..da618afe4729 100644
--- a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-markdown-math/Manifest b/dev-python/python-markdown-math/Manifest
index b3fd59dc9472..59644191e9ed 100644
--- a/dev-python/python-markdown-math/Manifest
+++ b/dev-python/python-markdown-math/Manifest
@@ -1,3 +1,3 @@
 DIST python-markdown-math-0.6.tar.gz 6406 BLAKE2B 43172ba4b36b697f196bd569c93d56d1a3a05aaa306b1f149f3b70372e624e35fc0d3f3ea3c58c6b86e00c68408a5ebfe9fcc6562fe5065c7f8a7aa8683ee084 SHA512 af5773dc5b6d8968d811487a86fd027042d381b8b5b37683b519f03f21097bafd3d174881d8201cb6524e0975cd6868781e116cec6406fa20ffd3c6b9f9d4e87
-EBUILD python-markdown-math-0.6-r1.ebuild 889 BLAKE2B 6fb111d461cb2d2203eb4464a93b64fcfd2b2757431f1185780c7cee5d5240f55d7cd5d79547a0a6c068bc4a2b57d2617b118aa3fd6f018e05bb8a44e277564a SHA512 4400e53df26fc0a0013c53d9c79cb53f9485c91f2b716efc4dc922cb1e3eddb3cdfe838ed2a791511ebdfdd8fd9dfd723ed08616cb449544669e91e3f4568fe6
+EBUILD python-markdown-math-0.6-r1.ebuild 879 BLAKE2B 74445c26886e48cffe0d857336480cfe770f78694798b0e4491a431cc92229f2fedd792b78c499b126abf6d118557a3d33151f39becab2c0a297a24ea5e7a46e SHA512 04fb803415ec616e1ecc57b0a7682e6e20b8dcb6dbe0687e340102f6746659b021d054d103573b0d84f8a2675d65367f712026394f764e4ce0801389108b52cd
 MISC metadata.xml 618 BLAKE2B 38507a41b254385cc67fc807c7bc9597c22f65bf7ccad19a128d619d1b1ee86aeef3244fa01c90ab652179a9999146f02ac5bed4f57fec308f82c03356bf88a1 SHA512 cfdc0f283f5351aa12165bf85cd9e428f8d1d4c80eda12bacacbcf11d2b195d6306bc406b64ddd7dbdc3b086c7d2fbde70a424e0169751a9b92ae48e02544802
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
index c866cd66e56d..d24a7ff6c08e 100644
--- a/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
+++ b/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 inherit distutils-r1
 
 MY_PN="python-${PN}"
diff --git a/dev-python/python-musicbrainz-ngs/Manifest b/dev-python/python-musicbrainz-ngs/Manifest
index a4cab89c947c..8fce1bef131b 100644
--- a/dev-python/python-musicbrainz-ngs/Manifest
+++ b/dev-python/python-musicbrainz-ngs/Manifest
@@ -1,4 +1,4 @@
 AUX 0.6-fix-test-submit.patch 993 BLAKE2B 3347bd841f0f1b23477f387275ad8e6d40fcffc434150e93c0d57c9291c239639018c28e519032ee2cb251371343d0f3ce6c070b960d4ca8bd1dc5b5b480511f SHA512 ed5b6b674edddcc1d6047bfd97ffdbc1bd4ae3b83e61100b0389cabad84014dce894857faf5555824f245eacaea7541ee18424f630881698b8f2bebceabf8b78
 DIST python-musicbrainzngs0.6.tar.gz 110948 BLAKE2B 9528d966565f7c927a98d311dcbb6db73a84614efa3eb071fe944b29b655526f9dd6e8a4a217428883d30b93c18e45c3d752d321d3c0689e5af00423b5fd7faa SHA512 901729f736b207f2f086e3d44a3515d405f6621706ad9c7ca07dd304349e048c5790bb16b054393651808bac4905ceb9493dd66d9fb17a1612692427c0bd3bd4
-EBUILD python-musicbrainz-ngs-0.6.ebuild 1157 BLAKE2B d634110b8940104ba4224f919a28f4f176e191a4a1359948fd676da68af33975eb8cf573a135e1c8b180ad5654a82f28f9fed58d4571337f5410e35d36715695 SHA512 3d08e5b39c324eba417abe7554569a78581b1833fc4171df2a9a1378948324ec1d9416191142aaea350ed2b5ed024edb75daa1c23f3844db738e4c95351139c7
+EBUILD python-musicbrainz-ngs-0.6.ebuild 1147 BLAKE2B 3496ac8d8843a55ee92289d76bdc653d2c227d015621cf65e5ceae1baae54bd4d21a08ed6f9e9b83bffd76d461a3d954214d4bbb3d48f3332c2b33552b91567a SHA512 0c3091c252cfb6b85d9c7efefe6e5cdcebdf808178c372856c9a98cff866c397b2e15a7fd0e33dd2e31b6cc548c255af015ebda035120dd3b584af83dbfdeb65
 MISC metadata.xml 608 BLAKE2B 2fb7e36555a1ce07fc8da2d81e412e2b1194cbacb6657779e37a40831878dc6b462e0cddfbe983d301bb84736e4bdbb6d12002f94a4038f0afde45fe35c82069 SHA512 811ffe495005e46570b10c03f4de36d8fd096123108300f21afc12f7c6af46f2ac66a9c69d1df89f1266df4b83afc5281aedd1e978d7eabd7cdd9acda7a338b0
diff --git a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
index 775cb23c11e3..ed08f37e12ea 100644
--- a/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
+++ b/dev-python/python-musicbrainz-ngs/python-musicbrainz-ngs-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 70247899d027..ec84f6d089a0 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -2,9 +2,9 @@ DIST python-nbxmpp-0.5.6.tar.gz 1330311 BLAKE2B 8db09bf02c3bb6a82092a419066b2af9
 DIST python-nbxmpp-0.6.1.tar.gz 1331188 BLAKE2B d8ddad6897c6b98f20a3abfad66f3968b6fa318e2516ecba0b888c199a293770eb26222117821f145fddf4ee0ffd95968b767c0d0445fef2f0513a43aefac752 SHA512 399608b7be39e802d3302004b97f67120ba80aa870331553399f3d35d161ea01f04f690b65b9d6e82e30472701d981a539c89e608b741ae96d54ce6be11f03f2
 DIST python-nbxmpp-0.6.10.tar.bz2 1063786 BLAKE2B 6d7295a5e6f926cbca709e0774ae8c141e20293c723f3a431a52bacc64639e7cee5820b4e070fae35397a5e5d8c76089d5d1966bf53cef8f0da462134321df6e SHA512 0982a6035ee30edfe9f7d5cc11dcc870ad1dddca851fffc2c26088cd28083f56f5c57df49dcd28b5e6967f02aef03e0ad2f7b2036a908748c66e5e7510e6c7ed
 DIST python-nbxmpp-0.6.6.tar.gz 1332465 BLAKE2B b6e28842c8cd42b3e259c62cedc917c8e142d916bc4d2f711e0e804c69b08a0d362cd3951b40373d1be18e3bdfa29f7c7f56ee10e0bf543214cb4d73db508e24 SHA512 729ec2c5d170cb5784e0a7a0097276e0cfcf98671af6c1304bc8c890cbd81349d91ccbe68af88e9f3b95803e33371cf2bf7fbc3891d7d6106ccc06bb9036e2fe
-EBUILD python-nbxmpp-0.5.6.ebuild 528 BLAKE2B fb8f388d5358369462edf702bbc59071274a92678f3bf9a6bc7eb6e4ae147879476cd1c7f9c4e13313030fbfc106067309967862eb5426c8816880f5662d7a3e SHA512 a127840408bb07e9781fe7cab98969763da63ecbbb99f0777a0977bd3b99aede9c62cc2709b07a1474bf5925efb0bcf3bdd00d4a385e1f06e0493b57bfd153db
-EBUILD python-nbxmpp-0.6.1.ebuild 533 BLAKE2B c10e8b62b2aed5b12ca2300f03da68082105320e36aac750b3129422c2b1f0d72d89d252960278da2635a92e6d07b1b6c3d31eb9b68964f04b6e5181e8d93556 SHA512 b855364ab5fb1e1bb0f6c62bacbcb90e3bceecb7e5e102ca804d74385690dad82cea1e06bac2877c4a1decc80d0fe13ea7c01c9f90c162c151cb3d6daa55baad
+EBUILD python-nbxmpp-0.5.6.ebuild 518 BLAKE2B ef89a8a933d7df2c4fcd6919060f7fa722511362f0692f28892cc0a11bc673c8aa7c0be6ca7adf64674312a397948cac6fcd66650be73f17eb9c39a4be368e87 SHA512 8e9628387ba5cb44d0e3e92151f99bfc2a266fd5a4a60e1b727640579e25fc9cbc982c4f73e3b6ea384617ce6f981d11ea955bf7cabd4c2fc0e72b61ecf93aa4
+EBUILD python-nbxmpp-0.6.1.ebuild 523 BLAKE2B c7c8b28a32b8e77088625870e9bc47a76ad1fe8bcca3e2b6b867877301d78ba8c7b01c5a3af7eb9a894c3b325e5669616e12c38dfc2acc50608e82a3c525ced7 SHA512 4594a1cd378628e4a32a7864771cb4f6c3a12a594adb524179254057065b05150add6ac70737e6917544f58f8288617ee95c91ce66a09cfb25f8edf6ba0af724
 EBUILD python-nbxmpp-0.6.10-r1.ebuild 545 BLAKE2B dbc9233c90a038ac033ad3a6f4ffe96645186d17acf3c8132fa3cb7a090ff3e1362e2eae61b92e66bc0211b2086fdd62a34bac184b8407deea30a20c7fb0abac SHA512 6c38247e04dbec071254046c77bbbb022f1f3a8bfb8be644ee4030bbea1909dfe48f3f6980fa4c1356429c4a29fe4c8952504e79ae29372bc3d6ad0a691bfa35
-EBUILD python-nbxmpp-0.6.10.ebuild 553 BLAKE2B 66f6edbd2cab12704ae40028e5a095234c0ffdbb8189342bbc16644bcebeba3feb073cd78d745b7c1ea408f1b0d06cb0634ae2ab377a7408fc35792b7c036a30 SHA512 c78056b852216b317155c1920438b5e29b03e43e8be383897eba32098538da2af5fc427828508bbc2387841d08e7dd773a0ec42670ac3fe728ed617bc98bbaed
-EBUILD python-nbxmpp-0.6.6.ebuild 531 BLAKE2B 1709b2bcbaa0716a95c9104e5f321f1dfe427ce570de961fee31a966e35ab3403d114796d88151217cdf351043aece84ca5461c1bae1a04851f15596dfccff7f SHA512 6139e985b41bc51e9626d40337d73fccfa05defe40a0a7f96f02d1128068bf56258998e613538a52180a44176e161a5d335f9fdd6cd97aae1c5e369184854b73
+EBUILD python-nbxmpp-0.6.10.ebuild 543 BLAKE2B 73f7249b7f6d8cf3f8aa80af20bddbaaab3d04c6d7a5d2ef08e74bdf5aebce69121c3b90052a24e2c75ed599f9ce8befd01351cdcf4932d46087f44eae23ae7f SHA512 436b589ca81e585fb3420c2db9a312ffc99a166558c8d95a40c7981c7201f4b6bfff9b6f22f38e6482426cc3042d2b91a4887c45e48c837e31de5fe1e22ced3f
+EBUILD python-nbxmpp-0.6.6.ebuild 521 BLAKE2B d535609940fce0e22f182ab8b1e18d71955279e8857e1e4632e5395e62e9671bde3496a4f146c44fa3109875ce03eb8a079274b7b12fd7b349fc593827a08706 SHA512 b381c2dde17920336757b5628d86b0a7743686ecfb87f11b4119f2978d580200d425be4464f4a31394581d557695a74c9fc4678a1f69e823916ec42f0b900a3f
 MISC metadata.xml 400 BLAKE2B d91b7691b7e19817b6441875611ead242b77cf55dcf1668ee543d7e2fd705cae7a30cd64aceb08a05f79b02e0c7975418f398cdfb96e2dacf250e3ba43ec020d SHA512 e017ebcf7a834286a653ce9ffbe662cf5d1e021bd51fcae75ad09d8541654d8142044e6961de60ca96e45e5b9bf66e06d8671cb1c3bcf2ad3f41843028e52f97
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
index c9b6bf30918f..9e807c1d6674 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
index 72d8de8fbafa..4df9ece9a839 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
index d39a836d8a2c..b9c717223186 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild
index cc32e3a14ce3..d6ef66fc0f80 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.6.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 0a2c0b85c0ce..b0b751d36039 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-neutronclient-6.12.0.tar.gz 290025 BLAKE2B f863826a531708fda1b9ddb43f8bfd8f66fbba99ce3fe4afc1135d20fe4718dc7f11789c3e75cf52089690ce0286bf5339c9253d1e7e35916befb52ed905448a SHA512 c7e69e263b37aa14b59b08ecc12f13210e1bd6f10cde10d8b4d5b8b9f912d604e23ff41eed684baf09bb6dc278393a55ca87d6e41e0986235cd3366d321dd85f
 DIST python-neutronclient-6.9.0.tar.gz 284879 BLAKE2B 720d26489dae7e50617ec83c266ac1197dc1934a3b8f5e8a0e285227421cf8814d96d57ab30710b63eb92406663aafb29fe8d8d7efa1e1d2e74c116eaac5902c SHA512 89f5a2004c7888f11a1a17f4287ddf6942e083fc3871be4a8590a5bb86ec557584165a75cb6470ea3f19526eea882b0174746b20800211d11d10fea1210df74f
-EBUILD python-neutronclient-6.12.0.ebuild 3082 BLAKE2B 8bf4c70239268e0e1b6aef23d50c61c86e1d0a70dde14cbcb9ef82a8aaf4f79ee17287967e5e2bc41594a26c3f50cbaa34fd87d0ee54fc991a9055528bc0fac2 SHA512 66e3c88fa109d59de4070555fd1c205cae79891227ef6106f401a6036acbcf4f3e7695475acd6bb7e9524f49ee090887c0340c9e80771ba467e1613db2cfe088
+EBUILD python-neutronclient-6.12.0.ebuild 3080 BLAKE2B cdf730cf18c27953d8e12bf491b5c852b6d8b39ae1d0456e987964f64966bb9044f8fd1229070809041587341d805f744a9f0405de4bce467b2b0105a2776674 SHA512 5ccc371f54a932706b5218a9fa3b8e9872f36c5567cf553827d7217f3f52d7ac0ab502987951be7ab9c2bf2406a14905e7843e2261e6c389741aa16b7b60a52f
 EBUILD python-neutronclient-6.9.0.ebuild 3416 BLAKE2B fb3a8658c8d3010e698e0850abafed1cf2747ea732fbdb07370bed8dfaabb563b3b70b1080d0af391491ad9a2deca75db629cdd945b7728b740ece4dc79e3470 SHA512 89d49435fbe77227bc32856de3fa215251d246b249f146a9898b2dfedbfd3de0ed2a9deaaef24ae778b8053e878ffa24cca6e0976b2c3d4a8d3e8f30dd06d742
 MISC metadata.xml 619 BLAKE2B 441c1d5a2f0b4d0cd6469cf8626e6895fd4dc36dae8db594a2f2364abcd1ea77c9f51f0c85b2deec8ae51a8464eddb00f71c57d2d11558523720caa8fb317dd3 SHA512 d99562185b29417c559143d8fe8102a062dfda0cd7c07f9f01d1c5f11a75eac521e98c9048a23ce74ed34e198ed06bbe2a40990651caf7f9ecfa98975a8fb91f
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
index d48e3fc3cc6c..735bdaeb4a7b 100644
--- a/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-6.12.0.ebuild
@@ -77,7 +77,7 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 	#stupid stupid
-	local SITEDIR="${D%/}$(python_get_sitedir)" || die
+	local SITEDIR="${D}$(python_get_sitedir)" || die
 	cd "${SITEDIR}" || die
 	local egg=( python_neutronclient*.egg-info )
 	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
diff --git a/dev-python/python-openid/Manifest b/dev-python/python-openid/Manifest
index 36eaa527f884..f0dee4147cc0 100644
--- a/dev-python/python-openid/Manifest
+++ b/dev-python/python-openid/Manifest
@@ -1,5 +1,5 @@
 AUX python-openid-2.0.0-gentoo-test_fetchers.diff 566 BLAKE2B 01b37542799405072abd96a87f5ac52853c894ca658f6202e2dd8ba528a5e865fa527fcba463338a6685996ad68be51c4993c38accbc961c972de0b70cbcac70 SHA512 60cb8b12312b3727263808647dd592e295ead7cebb384f92a33afe71292267e0ab95196dfdb7a01ac8847c0565c5dc9ad81f3cb95c00d6e4c9d816941b71fa44
 AUX python-openid-2.2.5-tests.patch 321 BLAKE2B fd3d0daf69dc6287191bb1a7dc61523dc13f5ce95adf8e07e7bd17f37a5f27a5984e9c85c15eb5a9f394523f2be97db67583c250a5d276b05530e95eb4dee7b1 SHA512 2d0e65763ee5fa4325e03e524ce179c367a1ba3119ce55bec458ed37bee05bb655c6a4dbc0d57ad4c20ebe22246b87da458cc688eed7d10f2cd1003f0da3f70a
 DIST python-openid-2.2.5.tar.gz 300524 BLAKE2B 9431ba3947dd2d2f7717e3f64ae91e4c014b85d67e6ce9daff5541d107c35869863de79273e6f9ad433193324d44821ccf9aaf885a6541ff7a3636a31c6ee8f5 SHA512 46ffeb07dc0e94c6e1160c824dfafd4a125746a05af1541e112bc2691bf655f75d0431ea273877899abc2956bb1f82369dea75d9b54282f33875f333f5166e7a
-EBUILD python-openid-2.2.5-r1.ebuild 1575 BLAKE2B 9c913d86de7c2c69e1d08dcbf59fee5c6dcd440bfbfcb1459013a4e99ed9156ea152b0a7fd39fa3f87ecfaa0d1040215b0173a2d310f1178c2672540bac11c3f SHA512 57777e14de0b4ce64136e7dfd67a27cd56aea3eb76761b3012e59ea50c58127b382975a7f585d5cd73a4850fdd20a230572a537343b5f526a61eae39f843b019
+EBUILD python-openid-2.2.5-r1.ebuild 1588 BLAKE2B da952caa28e876291949b5ef562549df075972b6a06ae05b48693d9941bbfd1413736135b5d668538d6c317b1e134c0ca402c48267d7552b6250d9f3fc033ab6 SHA512 53825d5b072d4cd600cd157eeadf9e86ee3c1fee048091bb0ecdc7699b1d695cb7869b6d6aa9769f6c59fac9370face607f1900197035b22b54ae6339fb58cc9
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index 1a2f1ccb8692..901aa4439a80 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples mysql postgres sqlite test"
 
 RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 961db561ecb0..551aadc0e672 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,3 +1,3 @@
 DIST python-poppler-qt5-0.24.2_p20170214.tar.gz 20676 BLAKE2B 450f1f40618686f393a21bb2f9ae25b71ab31b4270420a278c65dfdad722a7505cab50d17968400304df936f8694a7d2d5aafeac355675756ca70271f3ff666c SHA512 28fbc4584d32ae18a0545beaf2954f89da6aaa5c2d4bbb25dc36996dd5799c38c491254330c5ac12f3a97df33656f1b49bcb672207602031ff37086a08cbb1fc
-EBUILD python-poppler-qt5-0.24.2_p20170214.ebuild 759 BLAKE2B e2602c774f89b616695b4acc06ec31d5f8613340e837eb63c20658af799a7c81f7646ae38eda22868c78889a589876e61d9402c761c0150898d471e20d60d94c SHA512 2b4dde9ee305bcadfd18f684b6893744a61bba23021479da7eb20195740783a7cd7b013bcd5e15fa4560050d14689240beef1646800fde8ca99ce502533028a4
+EBUILD python-poppler-qt5-0.24.2_p20170214.ebuild 753 BLAKE2B 8887b16452fba594c7d64c6362483af973478a34da638f22534615d0d3a086f2fb5c158ac2802091b4daeddea01d4bab12258437a36ed81e51213353d53fcfa8 SHA512 44a9bebdcc8d4ca8eccc7a38e94462a8e6a3a030bdade04ff53ce6168b5d957d23fce2c261a3108bbcff74926afab43e4c349f31871dfc779623d6cb21cb60c8
 MISC metadata.xml 330 BLAKE2B 8ec299c2f0c45f1e6f1c0da00c43ea51ae4b93117b5c1fa29d31692e8b7b553c9f977f54bc379fd01addcd682a2a357670696972e953410972d1cafa670cc1cf SHA512 5ceefef72bdb03860d693c39df292964f2a81f477a872541ec2430062cadd5ec945c9e60ae7b157bdfea804016d3d5aae1ccd19c6fa75a3a86bd9ce3e4f30f14
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
index 750788a373f8..a1519f2de0e8 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 COMMIT=50fb2eb9ea34cf94e3756b7ddfc601af023267d5
 inherit distutils-r1 flag-o-matic qmake-utils vcs-snapshot
 
diff --git a/dev-python/python-socketio/Manifest b/dev-python/python-socketio/Manifest
index 8f7a899802b3..081792439f18 100644
--- a/dev-python/python-socketio/Manifest
+++ b/dev-python/python-socketio/Manifest
@@ -1,7 +1,7 @@
 DIST python-socketio-1.7.4.tar.gz 23298 BLAKE2B a5337e6f124018172902fbc51935e193267a8e209e9d677fa52e72ff6b71ea27e2aa5284369082fe38013c5b4b21c8561952b9046acbfd3f02c824c0837b367c SHA512 fb31072420eca42fa0349f0a9350fe9ab6bbbac7dc32cd7ae76cffa026fdeeb4197b8c441d76bfc46af55a550c5b7e81e387b67d538c500075bc5b4e8f68d5ab
 DIST python-socketio-1.8.0.tar.gz 23557 BLAKE2B 085035d6621f2ec351b28095086c6cc5787c4466f904568d5ece0cf37261a75fb6793be1fedd9f54f7cbeccbb668eaee8463850698aa6f2a901b3454cf63f128 SHA512 2514cbad3e429c101f5e247bdf2e4a2b5a0957c19fa97e56ebe8cd78b36e81cfb9dc4500bee367e57460be3a08bbd1e70967a5c87109034ade847ff7f559711d
 DIST python-socketio-2.0.0.tar.gz 24180 BLAKE2B 33d0c2007acfe067264c670c98e2f8f6764a979b7c67d8d03217a3b2dc45dbccb699beeff151381f8ccd787610ad39bff3396d4737594ed467f29994b4b8f0a7 SHA512 285d6235aaa5914f21a883976ecf31e15947d28e396c859080cf418094e21b5f3a9c4de01361a2c3219edf43c3c587bca24c9f10ebb97be23bc12c59af79ee2b
-EBUILD python-socketio-1.7.4.ebuild 904 BLAKE2B 74b323f17e7d0b4f7a439a11acbd43ecbd5b81b79cc30a211c8e8121d6128a4be8481e7d1caee5875411d4f90e2aea758fe39bb3f3384da53e9e67ccb818b926 SHA512 c9fe0fee1eb32d06dfdc4956a6f8447d871a88da3e8e26ae4ef7bfd3eb54c255e70d8976016dc546c02c30585ecaca5ea3016820d6d94cd8aa3debdd2b01c69d
-EBUILD python-socketio-1.8.0.ebuild 873 BLAKE2B 451c9db293398a73c08fa3d5490096eff5e4954d8c03a52e933f1d6e07526ac2c02aa1b82a17dd66c7a066de953d4c75852fcdd0b7c02666b3a1fa75fb78d3c7 SHA512 a2a08635322febfbe0b30b437c7b18d8cbc40e481cf4057a1dafce489405a049ee2d2d497c9b07431a87eefe62b1e254c5f2d24a7e8efc14f062110df3e15047
-EBUILD python-socketio-2.0.0.ebuild 873 BLAKE2B 73dc586d8f707c0471e25bd456ce82910950268bda8e525c9c38e68babdf4581214ed7594cfab0c3f4184869b5860c664f8dcec699dd7a4ac8e19fedeb362fe7 SHA512 f7dbb0b7a764eff23adad57751cf60bd6b3a685851cd4eff7ea5a2e7f304f6d759a73ef8c5e37d3b381aa0874f892fde63bad1fead80d181eedd1b176f2b66f8
+EBUILD python-socketio-1.7.4.ebuild 898 BLAKE2B d0ec2337cd26fc603b86511a6a3f295e479ebfd7280b05984d7f6ea1aa9a685a6ca862b11a8bf9bd1cae4c4b50febe56ebdfe0a64f03840eb2389bfde473427c SHA512 1f5d8e87c9cecd44611d03a93a99adc2993ea16d621b031f465fc2c4e6db768c42bb505630fb5da076632c76094d3b09c7a28a4b69a83ac0bea659d58581b2e8
+EBUILD python-socketio-1.8.0.ebuild 897 BLAKE2B 3fdee9fdfc753c909622c197db9d561d9a062d7be33e1606d2577a6ebf5ca55ed2d90e21a66514364a2f9f5d96ea79e885e5890602802cf02477967d17e2c9f7 SHA512 7bdfff1ec0790a55658770ac387f4be4eef50763fa59560cc17dfcc8a804a8250ea822f565e00ce9c976444c9f0e468853639686b64d9ebe5076a779bd55d6ed
+EBUILD python-socketio-2.0.0.ebuild 897 BLAKE2B f6bf0eeb610367f4d026d4a933ea7736b857c80d1d334dfc44a2d0a8f9942b7fd43bf4f89e3d4afdeccb4c417d3b4b32175bbd97702784c29cec7ca192178ae6 SHA512 4fdf30e259407cbb1c2e889507427691875afa419d4f74437595ee21eeea9db21777ac1bbb57516cdae1c87d6574308a8163bb9c58d8f083f3457a14faca0392
 MISC metadata.xml 466 BLAKE2B c1aee63cf2625278f18fa3f65ea008fbfb4aeaa6c4770fa944c853636c44b2c12defebd46ba8483d08be818e28731b3850920931a40c386c11b17416c281ee5f SHA512 8e46ce0f84adfe7f52c9a99df6338b78755d097702881515605adbfbe2c68af0afdf6e07b05d2ec915e089bd97b01ad38bc0fce43523eb542a0271788b38e79f
diff --git a/dev-python/python-socketio/python-socketio-1.7.4.ebuild b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
index 82ac6111006b..acff4ee83706 100644
--- a/dev-python/python-socketio/python-socketio-1.7.4.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.7.4.ebuild
@@ -2,12 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.org/project/python-socketio/"
+HOMEPAGE="
+	https://python-socketio.readthedocs.org/
+	https://github.com/miguelgrinberg/python-socketio/
+	https://pypi.org/project/python-socketio/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-socketio/python-socketio-1.8.0.ebuild b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
index f07efcf9fa5b..23df095e3eaa 100644
--- a/dev-python/python-socketio/python-socketio-1.8.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-1.8.0.ebuild
@@ -2,12 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.org/project/${PN}"
+HOMEPAGE="
+	https://python-socketio.readthedocs.org/
+	https://github.com/miguelgrinberg/python-socketio/
+	https://pypi.org/project/python-socketio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-socketio/python-socketio-2.0.0.ebuild b/dev-python/python-socketio/python-socketio-2.0.0.ebuild
index a9c1c3e9d3ef..9f66dde45a09 100644
--- a/dev-python/python-socketio/python-socketio-2.0.0.ebuild
+++ b/dev-python/python-socketio/python-socketio-2.0.0.ebuild
@@ -2,12 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of the Socket.IO realtime server."
-HOMEPAGE="https://${PN}.readthedocs.org/ https://github.com/miguelgrinberg/${PN}/ https://pypi.org/project/${PN}"
+HOMEPAGE="
+	https://python-socketio.readthedocs.org/
+	https://github.com/miguelgrinberg/python-socketio/
+	https://pypi.org/project/python-socketio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/python-sqlparse/Manifest b/dev-python/python-sqlparse/Manifest
index 5e66e2aab610..c65dd75fd957 100644
--- a/dev-python/python-sqlparse/Manifest
+++ b/dev-python/python-sqlparse/Manifest
@@ -3,5 +3,5 @@ DIST sqlparse-0.2.4.tar.gz 61614 BLAKE2B 2462fa5d77ca2c3028aa3539bedc3cb2d7abd35
 DIST sqlparse-0.3.0.tar.gz 64072 BLAKE2B fbee74c7222fa50c5d627959d5c8652dcd85ab5b5b771e3c8375cadc6e009c2fb1adc3c2428e27d769c210e7976c350bfab367cb7aa44dd7b4183ad9722a4ca6 SHA512 596d25f5fa2c797fe5652e36e9633397e7867586ff0959f52d1ff861c16d0e7c73644daf03d74169dd20255e802b7369d4dace0a44a3d94c15bd67faa41df551
 EBUILD python-sqlparse-0.2.3.ebuild 1350 BLAKE2B a212c2f3dcc1e4961a621595db02422c003d1034ceeb85282d9550ac6eca37a66f52e7e4c00989bf6dccda44359da5770f949151967ce873e8fdc1c233175671 SHA512 954078c88348c4bcbb1fd21b2ae64798f4e2b246f029e3ad42cee3269f271594e8c1c85903aa5b7b17b7816a3340168386db1fb06ed644bb055eae6dca89166f
 EBUILD python-sqlparse-0.2.4.ebuild 1354 BLAKE2B eabc79b1388c2482e759794bb87cd93e70b5ebce7daede25aa5626a429b40754d2dc7a5a0e0b1bcc64bb4814b9c93788a998e121106bfafa50b35a841bcb4d88 SHA512 7a039ec09e7c6443d0e1517103b6a491dca8465bea4efbdaa9f0fb1ea92eb1f22c7646a6bb2eb938d3d593f6d01e28b08570e0f27ebd57c1d2446bb3480929f1
-EBUILD python-sqlparse-0.3.0.ebuild 985 BLAKE2B c395b48396b7f57f3a728e22468d5361b35f4dca3771b191704086f1b20149944b80b4eb0f85b7c2e19007f2e7efb436bf17d7e0ba0e94bb54f10a3d16c97ee9 SHA512 bee0b03141050ef30e67a3291b735623eb73eb5703117aa0c16414fceb09a9c3c98bf656d8b7bb055feb5c03ee1b7236272b438709194bc4e2b7350e3773f77e
+EBUILD python-sqlparse-0.3.0.ebuild 986 BLAKE2B 11610aeb81455d7e5fbf6e6908c2b292f88300570163e3a57510a900b52f8f47d045836277bfa5fd907cfdeda487750d119a23c45a301ade6edf1142dadd50ef SHA512 1db4b842c78f1ba79e3c3cfc9e0032da10ccbb309ded9d3dbf64a945b0f873edc614add85853cfa338c4a2e8cb8b23e66eb5fed3da3ffb336346a13589cc10aa
 MISC metadata.xml 453 BLAKE2B 2b04f47b565bbce71b1ddf27bedcd903f123751e7524ca62ea280b96788dbd14ae18513fda8eaf563d927c09dff7094b6a5c0d651c0530f2d3e07ee1d092c946 SHA512 5bb3c69c2dd5bc8ad2bc8c4a174be8627ed54ba0055bc153d36733f964ee289d71d0b392ec63127482a87f5f56fee9cf2900a2830a0ffbb733b1119be4abc0d3
diff --git a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
index 83cabf9bcaa8..a0839ec0c23b 100644
--- a/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
+++ b/dev-python/python-sqlparse/python-sqlparse-0.3.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="${PN##python-}"
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest
index 9e3433d0cc0c..d1b859186e97 100644
--- a/dev-python/python-systemd/Manifest
+++ b/dev-python/python-systemd/Manifest
@@ -1,6 +1,6 @@
 AUX 233-xfail-bind.patch 1077 BLAKE2B f2fa3f197887d3a14cd7bd2a8bdd33100eb18f4b348bf4ccd1877c843864a71bd52b19d53ed3c98f0de0b690c2158b6ceffe10682ed79c64c829103a2e34fe14 SHA512 63a5325812bb3530a8681b006fc66630a33cc6740ed63171025d4406a68783a3fba0b55141fd9620f049f2225191ce9cffd3d91a9d1c5cef7af94ec82b2ebd6a
 DIST python-systemd-233.tar.gz 49680 BLAKE2B 7d612022738d3114a39f7ad7f4d7799ac3d027980592a5205247d4c866ac3d9520d63ee02f143e26865f0d83338f30422dd0c2299f575e8b03f3112900e9af73 SHA512 92a6cc7123db586e5ae5fbb56e5065b17be9da47ced9dbc5920d80b7db7f56d15b127e72d30889c5b24b119724a33f68be1ef322529620ed95b0f95707e4c2ab
 DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2
-EBUILD python-systemd-233.ebuild 845 BLAKE2B 7dff827fec6a5878c180a014205ea2a517ce3746c5ac27f6b0d0e95a4783ac73082c40c1cf6abdf3481fee2d19aea841aaf8eb04d64a5379acf5b4b0bc19a8fb SHA512 6ffc6ba2fb7599f1b3565f0109c5f860de1d6c0741dd1c387969b95635e939a3b527161671ba98ae136b66ca3181670ab0b08dbcec56a8feffd5b4ba17d257a9
-EBUILD python-systemd-234.ebuild 981 BLAKE2B 790698d3ed8184fa0c9f576b649970e0b4d1f7e22fd03d68b65b6edcbaf5d1279e1fcbe5f3e7eafcd4dae9624c1be74fe4173fe571660cca4899f5f28f1a9f26 SHA512 eb06ed054d30f061dbc0612c1fd61b9b326a47afd27ff283014337e1f91bb242417b757b9b4f5f5786d6d90b03cc938ee2a40840587133737e91f37230d7a00e
+EBUILD python-systemd-233.ebuild 839 BLAKE2B 0d82ae54e9e74435df4d25e58bc2d7945fb244965ee1e8f2e9cf1b9ddb97569240a5847b0b47ec0297d9b7eb81a261ed8cf940c13b3fef12be25897ddbc8fe6a SHA512 f5e7223794247c0b95e3068afaa88e8a08917599e7a1e7321499522a1f29062e8d786fe95979c535cf2f14094108aaaff68af8c937c68e65bbb789be7d6553de
+EBUILD python-systemd-234.ebuild 887 BLAKE2B a2e3cd926df3502a3f0ee39e398a540c4feb5395c5889c29082e6f7412bdfe28a21a5bf9959c1c5b40fedda7d9c39a03b52af20290ddc28dd91f100a784b28bb SHA512 e2943e541e48b1cb26ad8816f4182bb4815951f4dcd730f643624e56cc69e88eefd34138ea6006ced3a82268ffc593929d7f3f048f0748e56a42b2f1a02866fa
 MISC metadata.xml 306 BLAKE2B 2e77cf6814775cb575c96548a69609034e4d9db62eba44684df463c98fe1b105ae5caffea7e1d05880ad2d8236405b2848fa24bd245e3a8627578d2cb128b055 SHA512 ca004982cde4fe1bcbd821109ec70f464a2014a2c0aa77f9976eedaec78ad68dc8d39e2e2f7023192bf807307e08259548f1ebb298ea7f3654c0b8658fba97f9
diff --git a/dev-python/python-systemd/python-systemd-233.ebuild b/dev-python/python-systemd/python-systemd-233.ebuild
index 40dde473138e..f5819d3df03e 100644
--- a/dev-python/python-systemd/python-systemd-233.ebuild
+++ b/dev-python/python-systemd/python-systemd-233.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-systemd/python-systemd-234.ebuild b/dev-python/python-systemd/python-systemd-234.ebuild
index 8ec1ecdd6af6..d28e4d5108c1 100644
--- a/dev-python/python-systemd/python-systemd-234.ebuild
+++ b/dev-python/python-systemd/python-systemd-234.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2015-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit distutils-r1
 
@@ -12,30 +13,19 @@ SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND="
-	sys-apps/systemd:0=
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
+BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+DEPEND="sys-apps/systemd:0="
+RDEPEND="${DEPEND}
 	!sys-apps/systemd[python(-)]
 "
 
-PATCHES=(
-)
-
 python_compile() {
-	if python_is_python3; then
-		# https://bugs.gentoo.org/690316
-		distutils-r1_python_compile -j1
-	else
-		distutils-r1_python_compile
-	fi
+	# https://bugs.gentoo.org/690316
+	distutils-r1_python_compile -j1
 }
 
 python_test() {
diff --git a/dev-python/python-termstyle/Manifest b/dev-python/python-termstyle/Manifest
index c421e832f819..1ff9f5c0dd10 100644
--- a/dev-python/python-termstyle/Manifest
+++ b/dev-python/python-termstyle/Manifest
@@ -1,4 +1,4 @@
 AUX tests-unicode.patch 212 BLAKE2B 0c4d38d0fbdf3871cc81741f0f4533fd989b9636f5d9f435230a154b33d9fabdc5c3ec135f8168a4be1d9f990767871cea8ad19b3f8c6af7e5ab7ca9f9c07500 SHA512 cdb60f341dd186febe72e09586a7b1d65087c0773b1192d9725188cfa4b9bae902026ec7bb723359863695e08992b2b5bae2a25d7aed0c2018dd22dadb8b850b
 DIST python-termstyle-0.1.10.tar.gz 5025 BLAKE2B af652f560f3c6657ca01080cdaece77af7a1ecdf0758cf777035427197142b04a7d39a249da6eee90dc06cc2d15ca484c8b1d086c8e32e761acb8adc0eeccf3f SHA512 a0ed484da8da10c7fe1b8422a26861fb115dc29c49ce79c113053f913d3371edf6222de1ccf40e6aa34c3cfa9da5805eb3928fb07bfae18a13683621d7547743
-EBUILD python-termstyle-0.1.10.ebuild 843 BLAKE2B 30a64e54353516fc874cc4ec02e17609f4cea0217b1616b4148face0db56ba242b391e29aae42eb219ed7b14672aa3f99813662da304e9e055202010f639f796 SHA512 a5cb5d281a67ead91ef75395a2c8891e899aed41e1afcc078097a40c7764943a491555e77a98b4a57bc0be91c37162de220bbca58b0e347f2c5c086b2d9d5a19
+EBUILD python-termstyle-0.1.10.ebuild 833 BLAKE2B f569e7125b9a77efe3888af95e17252059cad161af9189548c87dc958b5d2a0c8dfe0da8aca4144effc3ed7924b0c2a8af6ef6b38f67e48e9f769ef784762eba SHA512 f3513c67c7c3fce45b84c001681da27da50b251c437ee7a6c428bd16544bbd22a20a2f788d67a0b7b3655e1aac38698f7eeb394b58ab4011924e6c1779d922fc
 MISC metadata.xml 247 BLAKE2B 431d545f18d9c8ff5e50fdfdd55d89303f283a6bb008c5eac55d8762b8c9cb62dfcf40db999b66b1bf9ec286b9552033eabe7ca0376b415e5f6c7037a0eb8927 SHA512 6b6b38e681e7ca67b2f09aaef6db3340993b2f78c5be2f25234d46f8688ab3ab85289de8738f9199589817d3e2697de0788a45457cc6dfcef5e33ac5adbb558c
diff --git a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
index 661b13a6ef42..ff2ecebc98ea 100644
--- a/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
+++ b/dev-python/python-termstyle/python-termstyle-0.1.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index c4b273f33eb2..5884f7d74c9b 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,4 +1,4 @@
 AUX python-utils-2.3.0-pytest-runner.patch 461 BLAKE2B 245e0a6a4c76a4286616e0ad1115a718b482de4945d0321eb9b008699df1ff518b0ad7e6e2f9c5ee743fcdb283bac3dba73423b889a8b62951e004433f343894 SHA512 6ec873a2492166ba7d592ceea96e3ccf5851ae88c7577fded1803ad2ef49bead549cbbcdaedc5a8565228c7cf885736ed402b85ee0890f61e91891debbd14c2e
 DIST python-utils-2.3.0.tar.gz 19384 BLAKE2B 1746deadc8dbaf49a6499fe9c79d25c2b5cfea68e2d1b7ab6f88aa72807eedcdb338058e24a7822c6360dea36f1a044145572443c57f43f4cfed765a76e48f0b SHA512 482ccf9c635a0cbe603b69488a364d9033f8b7fada279d901725b5bf91ac13b1cd4a6b7e8d5834a9355d97d8b0803397d5e13da2b7ba72f8d8e2f7f39fee027a
-EBUILD python-utils-2.3.0.ebuild 846 BLAKE2B 317bfefd767ad98d4c5505d759e175e773f4a982debcc7ecb895cb42f11fd8c0acd07fd121ea048f622203c054190745b6fa413e289c5ad6258a1b8ff91d1b82 SHA512 c1d52ecc3dbe35ede39bc47324868e31efaab2704af7bf419494a2b71d960b5a3225b5984bf19cd022a5dd7e33fc146aa7d603134f802564c9387adcf39df48b
+EBUILD python-utils-2.3.0.ebuild 836 BLAKE2B d5d94cddf4d669e725f75e2c9fb0694ddf2c244bdac205d1f41c05e9f7c99297be1cbcc7b2ae0a03f94c15543e0f6e056e84998ffd45d22549b4f739a2f42523 SHA512 3d968420ca4bf39dc0a74bd04c58be6af355deb7df8ea5f483436742da4f4f3391f97f1d99e1a3c8f26e0be0dcd3369e65eb50f2a5f6be5f1ce86e07841d5b31
 MISC metadata.xml 321 BLAKE2B 7baf4b7d0dbc6064c0588cae9708d10df7d571cf178f6156124938d4786a6560263e9862d23d53bfd17f6e098f58dc24188a9b02642765dbe4aa9d1628a78c66 SHA512 3073d2409eeb35e53d4f55a774ff737496ee360204832c17e178a2d8d0288416cf09fef68ae66bcf5f66a30f6644b364721b402e9bcedf7bb4f1663f302641cf
diff --git a/dev-python/python-utils/python-utils-2.3.0.ebuild b/dev-python/python-utils/python-utils-2.3.0.ebuild
index 39ce863e72a6..24e371d90eb6 100644
--- a/dev-python/python-utils/python-utils-2.3.0.ebuild
+++ b/dev-python/python-utils/python-utils-2.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3)
+PYTHON_COMPAT=( python3_{6,7} pypy3)
 PATCHES=( "${FILESDIR}"/${P}-pytest-runner.patch )
 
 inherit distutils-r1
diff --git a/dev-python/python-varlink/Manifest b/dev-python/python-varlink/Manifest
index 9661de090e15..51f1c3f987a0 100644
--- a/dev-python/python-varlink/Manifest
+++ b/dev-python/python-varlink/Manifest
@@ -1,5 +1,5 @@
 DIST python-varlink-29.0.2.tar.gz 34254 BLAKE2B f0970c3395872ba10bdc3a1f26942a17a75944a5139f731bb1f481016ff73473aec7d7b6103f127d63dc93394fc53b56d036293d6c8b5d2bc708effb6efdd1c9 SHA512 c6e77b3179c6dac2a90becf92ba651b007ada2bd79caab63521a5732cf524118f927ef85aab9df3a27d2c0f66b1ba2c31cd76399266d31ab28f39c3392481108
 DIST python-varlink-30.3.0.tar.gz 40124 BLAKE2B a93fe2fad156dfd8f74841846dbe9da127d01e837ad0ae750658b0391da006c913eef663e4777ad2fc6c9c2d19746e52d7e66c49cdd43f0417db9d558d4b5dee SHA512 1aac105d62452144525d8b4c59dbd7a70a9cf82589cce0b98ac56e457d985d2c370f8ce99d209294b4a4cfe1683ae2bc1a280ea5a8878ecd4bcf2951ff0b802d
-EBUILD python-varlink-29.0.2.ebuild 636 BLAKE2B ef15e247c9ba1774159bf3c837eb0323aa2c6fd2a3b40d93610f3c77bb4fbe1882aac808ef9eca0abd612ce9d9a35717855118a6486cd5a46689209bbd167d48 SHA512 6f755b3b42e354075b94df718457849dca09303f3c6825bc6197178fe74d1d593708c6e37882be7891427a60025ac2cb2b83e6c0772510fc5126eb62921cd393
-EBUILD python-varlink-30.3.0.ebuild 765 BLAKE2B 54e648d31c9cfed4f19b32957cca671eee6e25c48c1f1cd83fcd31dc779f464faa624c277922f892e8e02dd5ad9dce9ef50d290cf2caa1bdba541264a139f654 SHA512 4e8849ced6d24b2c7f9b92b3212525ac4bd082af64e25b9dda066006ce1754089611af1b9eefd2c8f31a492551128173c2d5a1aa2e536763408978de27ce38f8
+EBUILD python-varlink-29.0.2.ebuild 626 BLAKE2B 0fcdc55b564c99800acdf30e7e70d2fd1798074aa4dcd3ffe35cbd5ca6a13e6b3e048585086602e618185c6413049712bb8bc4beb5c95d2de51508a9a3c2ce93 SHA512 a58a2c3089917a784a541480736d5c4df0ee904482d6dc1ae15457c8c75b9494c1da998d3cccf4cd44cf8bfae51694e0944d400987e4b65658c5e1d03dba59e3
+EBUILD python-varlink-30.3.0.ebuild 755 BLAKE2B d275f3be25b5898f96dc7b52455fba320665beb3a50a8fb6219601e2af50a6d4677a7598ccbac897a72a78bf8fe95a92008fe2115ffc5fa54f9d5ef7ff0fec6d SHA512 372431d3d4653f720f862ef56bd03a6922081f7946dceb3be460af2d9bbe27e7116caeceecd2e68e6ca15a8887224e515b0c0b464b88955ee9154ec318a646bb
 MISC metadata.xml 368 BLAKE2B 4af59ab1c33a904380f1c2cebd76618b9286ac076024008bf60961eda1a4895fab7c577fe8ae342238ad65d26cb21ba8e76ad9752e76313ca9e0460fd7b04a95 SHA512 3aa1f68a1ec8a06b0506e3b9500095c18b892225906ee57318182a1590e494c404d5ccde60af935e742683374fdf7a1a1db1c5746debd5be5af94bc940038388
diff --git a/dev-python/python-varlink/python-varlink-29.0.2.ebuild b/dev-python/python-varlink/python-varlink-29.0.2.ebuild
index 54f9a2f223e5..1095f818c82a 100644
--- a/dev-python/python-varlink/python-varlink-29.0.2.ebuild
+++ b/dev-python/python-varlink/python-varlink-29.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-varlink/python-varlink-30.3.0.ebuild b/dev-python/python-varlink/python-varlink-30.3.0.ebuild
index 4839a2529d53..6ab7ccafea83 100644
--- a/dev-python/python-varlink/python-varlink-30.3.0.ebuild
+++ b/dev-python/python-varlink/python-varlink-30.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-zipstream/Manifest b/dev-python/python-zipstream/Manifest
index e4bd084ee569..efda4475acd1 100644
--- a/dev-python/python-zipstream/Manifest
+++ b/dev-python/python-zipstream/Manifest
@@ -1,3 +1,3 @@
 DIST python-zipstream-1.1.4.tar.gz 21376 BLAKE2B 84b022f93dedfb46da911c3ed800c3a6eb3685bf9c6180b9aac5d4d085748216f53759f83a085fa57f245033281aa4be1578b4051e8a855bcd2300aed7820460 SHA512 722c1d7db91dc47064fc51f1182417f46923b8f42a56e854f1fa125eaccfc7f86d3deab71709226a798a1caf5a84a8a7fa7d3564065ab91afbad434ed787ce32
-EBUILD python-zipstream-1.1.4.ebuild 606 BLAKE2B de16f0092ea6f946c7d4d4583b899394636f2a6ebb8a19fdd1ebbee6fd0532c0ebc9287f5c6ff9d0d19ec20c19a00eefd9fee1223388bc5d572f47d6006ce63e SHA512 8781b7540b40326a27ed337e354f5f3dd15711e0bfabadef458ee20b95cfdc11cad128d152f682e374120a83fa64823661c84b969364d3a0f544c5bb43442843
+EBUILD python-zipstream-1.1.4.ebuild 600 BLAKE2B 9bf94baa38554be720db06f766e38073e055282e48cf13579ef50abb969c6686935a6ba6b9a65f1dba1f93e1d58b408484e2642b7874ec4dcab280242be443ff SHA512 0e6cb8c82a65484febc074f594ff92872d12e0d709c56a7f6b4ea00ada77654cefd04cec9d58a6be72b1521e99f67ab0f14b2324b4ce44ec0d25ec28532cf7ca
 MISC metadata.xml 381 BLAKE2B 04230c4955e69e38535767e64a3bddd5e9732f248e79eb4ca0f12752a8a1e717786866512727f407cb1b7b07d9b954ddedb3c01d5704c99496f4e006cc986c23 SHA512 e08bcfff6419f5fb2ca82c62f3d3280dfebc5dee392b4c63b82ca0ab15c2767e3ac35779b73ec3512c8d822abe94956ca435454f8191a65d52ae8c49d13e6745
diff --git a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
index ac85e75a8aac..9b8bd5a3c362 100644
--- a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
+++ b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index 02bc1515dfb7..d58c17f3889b 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,4 +1,4 @@
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1345 BLAKE2B bea342eb7ee7ff8bdf394e7a4c5b3edf7350d77fe485047068e5b1c0b34dc20d9f0ccfb006757f4327894e937942639dc789d14063ad897b7e8546a76a80ab55 SHA512 1b6148906ca6bfd0601bf11dbb91255fee4548c4bbcef408a6f7dc1a11620bf8c877fb1060a13eda973cc84f194b39ef66ee75b36aee9763522da20ced1d590d
-EBUILD python_orocos_kdl-9999.ebuild 1345 BLAKE2B bea342eb7ee7ff8bdf394e7a4c5b3edf7350d77fe485047068e5b1c0b34dc20d9f0ccfb006757f4327894e937942639dc789d14063ad897b7e8546a76a80ab55 SHA512 1b6148906ca6bfd0601bf11dbb91255fee4548c4bbcef408a6f7dc1a11620bf8c877fb1060a13eda973cc84f194b39ef66ee75b36aee9763522da20ced1d590d
+EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1339 BLAKE2B 013879fbb3ea5f152158078ff7d25b7b8abe5274e0a6ff8d7d3dd77c7ce00a26e9e6677e4cf7ab15c04c5107cf480fe074f99b28800b846b503c2d1466226cd9 SHA512 677a25b9fc65633178ebe0324c1f1416a7740e86ab93a6999205a458de286d15138219720e70b55215b8cc125e8de15e685d2e7f9775676a35429dd71d31cedb
+EBUILD python_orocos_kdl-9999.ebuild 1339 BLAKE2B 013879fbb3ea5f152158078ff7d25b7b8abe5274e0a6ff8d7d3dd77c7ce00a26e9e6677e4cf7ab15c04c5107cf480fe074f99b28800b846b503c2d1466226cd9 SHA512 677a25b9fc65633178ebe0324c1f1416a7740e86ab93a6999205a458de286d15138219720e70b55215b8cc125e8de15e685d2e7f9775676a35429dd71d31cedb
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index 25bb636d7d74..a25144796229 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 25bb636d7d74..a25144796229 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/pythong/Manifest b/dev-python/pythong/Manifest
index 70dd54e01dea..5a98660cc315 100644
--- a/dev-python/pythong/Manifest
+++ b/dev-python/pythong/Manifest
@@ -1,4 +1,4 @@
 DIST python.pdf 2547987 BLAKE2B 2f8d6baf3d94fd4072d2c482e934bbe168269d48e5ff7ea35c61c29b826269388e75669fb8f3fff0cbf1d113f84cf0c547ec21bad032ddba6ead06a4b473a3ed SHA512 9d16eb39ff5996be70aa41cb758e73adf1fa72a7e83613626cf6f519def99fd30169a87b1e918902e1aecfb75d925cb7e49d9ad5733dd5274b9a351adaaf201e
 DIST pythonG-2_1_5.tgz 397754 BLAKE2B 88480558274384cf8cac8c9423949b80ac5c022b3e404af4cc732efb8393c27b2f6957fcb630ba7d5455bb15d508117516e02ed4fc1c6c20326abf19768ebbcb SHA512 8a8c3ada425a1d7a0565e495494a8edfcf8b4224cb93ea843669e4d0b2ca9e122d038c728ff8242885e0b320caa6db8ef8f721f99c423b7a8f87a83a4e6f51c6
-EBUILD pythong-2.1.5-r2.ebuild 1305 BLAKE2B 08e423b37391790e46fe3561d91f7cc9a8dec55d806594e5da9bbd913dc40352eb67c844e1561df284437b1aaac54b0dedbc4b288bbc1c27c95bdb77aa1506b5 SHA512 dfe379d318daf457be52690852cc94a9181c47a49e1fb2b752cddece568ac507a345ea65f3e7b2029cd3bcd4857bd4b3e05bace33df1845f1434f4d53601afe6
+EBUILD pythong-2.1.5-r3.ebuild 1280 BLAKE2B 7f6f0d2b73bd76ce9af0c4a13c726bf084f79f152bb4e0a951896a6414f2e81398a344d1cfdb1615a487e5eec3cca081a693ff38241e59df991794df728f0233 SHA512 5a651577b178525f4ca3a87c51ae52a58e9b2af5f8d21ce9edc33062fb4976c735ed28211b7d3728d5cb1e9a500dca3e81baf649c8b5ea8b919ff1991987d67d
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pythong/pythong-2.1.5-r2.ebuild b/dev-python/pythong/pythong-2.1.5-r2.ebuild
deleted file mode 100644
index 7c1059971d29..000000000000
--- a/dev-python/pythong/pythong-2.1.5-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1
-
-MY_PN="pythonG"
-MY_PV=${PV/_/-}
-MY_PV=${MY_PV//\./_}
-
-DESCRIPTION="Nice and powerful spanish development environment for Python"
-HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html"
-SRC_URI="
-	http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz
-	doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 x86"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/tk-8.3.4:0=
-	dev-python/pmw:py2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_prepare() {
-	sed \
-		-e "s:^\(fullpath = \).*:\1'$(python_get_sitedir)':" \
-		-e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \
-		-i pythong.py || die "sed in pythong.py failed"
-}
-
-src_install() {
-	python_domodule modulepythong.py libpythong
-	python_doscript pythong.py
-
-	dodoc leeme.txt
-	insinto /usr/share/doc/${PF}
-	doins -r {LICENCIA,MANUAL,demos}
-	rm -fr "${ED}/usr/share/doc/${PF}/demos/modulepythong.py" || die
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/python.pdf
-	fi
-	python_optimize
-}
diff --git a/dev-python/pythong/pythong-2.1.5-r3.ebuild b/dev-python/pythong/pythong-2.1.5-r3.ebuild
new file mode 100644
index 000000000000..3e649b8f4557
--- /dev/null
+++ b/dev-python/pythong/pythong-2.1.5-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1
+
+MY_PN="pythonG"
+MY_PV=${PV/_/-}
+MY_PV=${MY_PV//\./_}
+
+DESCRIPTION="Nice and powerful spanish development environment for Python"
+HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html"
+SRC_URI="
+	http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz
+	doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ia64 x86"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-lang/tk-8.3.4:0=
+	$(python_gen_cond_dep '
+		dev-python/pmw:py2[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+src_prepare() {
+	sed \
+		-e "s:^\(fullpath = \).*:\1'$(python_get_sitedir)':" \
+		-e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \
+		-i pythong.py || die "sed in pythong.py failed"
+}
+
+src_install() {
+	python_domodule modulepythong.py libpythong
+	python_doscript pythong.py
+
+	dodoc leeme.txt
+	dodoc -r {LICENCIA,MANUAL,demos}
+	rm -fr "${ED}/usr/share/doc/${PF}/demos/modulepythong.py" || die
+
+	if use doc; then
+		dodoc "${DISTDIR}"/python.pdf
+	fi
+	python_optimize
+}
diff --git a/dev-python/pythonz-bd/Manifest b/dev-python/pythonz-bd/Manifest
index 7aec7b9c6c11..93bfc4d2e6f5 100644
--- a/dev-python/pythonz-bd/Manifest
+++ b/dev-python/pythonz-bd/Manifest
@@ -1,3 +1,3 @@
 DIST pythonz-bd-1.11.4.tar.gz 86065 BLAKE2B 1b7710129a6c764693cf3092725e78a7f6321ecf1bd0323644f421ee4f1c3c1a1b6defb805fbb137e58001c9869d9fe9d124978d60127a6672bb54903fd2027b SHA512 de945a1a49094eb6f4f1d0a2dbab4d5e73b60eb4a5d5461c4368fd46e05bf97df7177f7bcecfe963600016f9641e4233ace15a2c231f658ed8eeb771ddb51ab7
-EBUILD pythonz-bd-1.11.4.ebuild 648 BLAKE2B 76b80cde92661b05c0d64d7d5f485cffecce9d5c7c642145885e7013b22971e1409d3e0b41f1f7b8e0a61df22063d818685002c7c28a6f5df0be5d605b824f8f SHA512 be46764acf95544e9cc49d2935af42ffc9f9600a33e6e5e9c0fc86b8fa4022eb0f7d21e94178464ff804c3eb2834699a7b55decad11506e70348e401b99cf97b
+EBUILD pythonz-bd-1.11.4.ebuild 642 BLAKE2B f16afb2a7f38bbaa3672caf4dca096c5ef435a2bb8ca76c56c6b693a11b1d92589c8d4188a00aa010edd494e1edc74f76c422b10ea45b93a1e8c85d6825ae9f8 SHA512 eb649ecbe98f1f3269ed2c06f2baeaf92ee9c90b4d433477520405cd1582908a938908872671328b8155ef45b7021a1d5efffbe87c122998f76b5f955da4c49e
 MISC metadata.xml 439 BLAKE2B e9935c2cf2df4194b736a7d1a8ebaf53780289ccc7ebe2d02c0128e0b298c78f920602f25cddf052af016dba1c9218acd98576fe87874c2fc73241ed5f3c036f SHA512 e3d98902122dd0d5f99e139d58ed62f1291a606eb399c0531936d69e72b855a51bc1475998b7910b5773621ff7fd366253ed7e911ffa40ad61fc18c945f006d9
diff --git a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
index ed5db348fd53..cf6ac40e7029 100644
--- a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
+++ b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytrie/Manifest b/dev-python/pytrie/Manifest
index 9ea5f5e02097..b58cf1d7bcac 100644
--- a/dev-python/pytrie/Manifest
+++ b/dev-python/pytrie/Manifest
@@ -1,5 +1,5 @@
 DIST pytrie-0.3.1.tar.gz 94678 BLAKE2B 12631652ea33d2f1575f86bc8c42982543f8fa146debc9cb86e1139ff089f0657e04e50bad97b9bc344f4a270d102ee98e03fd389eb2c56ba3baac32b2288670 SHA512 72cb4ffff53d01545658b27b6c0b798736404f95013bfe34586c51c8823cc923ac4b3a8e874a938b26e3045784ce98ce2d8e51ab70dc435ff50075ffaf9d6c51
 DIST pytrie-0.3.tar.gz 228709 BLAKE2B 84c415722a724ac668624b3da29bfe29998c2ec8662ad21ab0035bb2a694e94759e9d09de980842887972b5c1690d699e43de41bf9f62e84ef3fbee86477d0a2 SHA512 f1dc6f810e51385fa4dcf2cbec76cf7fe5c184208f8d6dccf6212d43260591580126095e68d28ab6c8b01a631e6e16b275fa088643ae81568493ca231dcc6161
-EBUILD pytrie-0.3.1.ebuild 618 BLAKE2B 1d5d7b3fadc674063335a9a88babbe4655fb7ff9462b5a1757e0c98e9224b145d29ab8845cef0f3db862f185e3a541cec111f1fe4b331c7f8a1a3480e0c9ddbf SHA512 e961c18f34c2c2ec2ef45b34bcb48325eae75bdb50985bc64370d6b05ade1ecd3b751428c9dacacf1eba122fc27997953c373dcc5c6174adf4136e812bdb9774
-EBUILD pytrie-0.3.ebuild 591 BLAKE2B e24f325af010f6c4a1df6fdac317bf2f7dbd7d6ffd39951a6baf07e78069a2c441619d9ff10e788bb818978f8b6c1f186fe75141faabbd77284e4f6c0ec18716 SHA512 e59388b2b6a6f229d39e319d21c038cf93e11956087b94ea8202b4a95a6f18db45d61a11c625cd4f442b8ecc1d577e3f73e1c74ef3d592651021e8b3848fe501
+EBUILD pytrie-0.3.1.ebuild 608 BLAKE2B aa814120be7c973bb37c1d58ed5efbbc93d8a9a59835808534f9061c26ca571ab752e3e087b8306d14ff4f91ed6067844a52ed5bfc95a014d32e07cd23c50add SHA512 cdc688eff43fd3896aaf7b47fad1fb785efe617745ee2157d51f270b8c295f0964c8947e904601953c25fd7e15e153e9d5745539658cbc4ac31bd8ecb0d3554e
+EBUILD pytrie-0.3.ebuild 581 BLAKE2B fb9b07f85240bbaab70aaaa1c16a77aec4846271403ae185a9a4e25ae10248ad29d74268ed273d565ef0bdb112415647989f32837c85781c7f9bdc18cbe7a180 SHA512 dfdd7e7ee67cb0595e937e0dcb03de62353fb73c411ccbfa370f52af514fef067fb21a3382b3b6fbcfcd08cd7deb69ce087d1e645f4a348ace69fd6e7d1416bd
 MISC metadata.xml 886 BLAKE2B 240f560df7f7c6c99a7898f22b6a7445c1b590cb57bdbbb1353d2447cef377f7a7e562ca5d206592514fdcfb7315a207acd73e77c3b9fc1306df86176aa45feb SHA512 0fe09489e422888f9f98615a3981b679f76ea3c9ad07c523926a28bb45a305420f0f7485176863e7db560266b963b742bca05defc5c5b29fdda195915483b60c
diff --git a/dev-python/pytrie/pytrie-0.3.1.ebuild b/dev-python/pytrie/pytrie-0.3.1.ebuild
index 6e691bcdaff0..565ed0863459 100644
--- a/dev-python/pytrie/pytrie-0.3.1.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytrie/pytrie-0.3.ebuild b/dev-python/pytrie/pytrie-0.3.ebuild
index 89b2e162a304..458bf5c0f666 100644
--- a/dev-python/pytrie/pytrie-0.3.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index ab0f2e3838b3..893374f36bc8 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,3 @@
 DIST pyu2f-0.1.4.tar.gz 38797 BLAKE2B 4240083b03bd596d1f87e42047980ab7c75d0064eec0ed2050d77bb92d26fac651af515c2c9b10d338e27ecd778e80ff47b5c33a68cd86328dc913c0e70cb1da SHA512 16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035
-EBUILD pyu2f-0.1.4.ebuild 1132 BLAKE2B f07026730e1f21c18f9733180c7d67a8895708c7631f1fe57aa893219608d117be0c2945781f61a13722d40527076fd991fcee2963ffd633ee9fb7f5462a549d SHA512 e99fa11534ba4e8711699a6ec6cd9cd1a2545e098cae9af7f93053ddacf83629477d5dff55399d6c713ad72aaf5089d86d6e75dfc23417f4076e0506f689dba5
+EBUILD pyu2f-0.1.4.ebuild 1122 BLAKE2B 78e680f8a73d57f2b963343dad6f5f68ffd68fa8536a3d3ff9d6b44f58683c85f821e6d54014de618fd2eb56e7fe790214fb3742f3adeebc87235ee81d742544 SHA512 de956d02327e0343adda3e30116b0fedbc6a8d07272c8621db888888be270be35f5c327af7e703a552ea2bdc9f44701f00926c00f093c64439b019457ad5ae6a
 MISC metadata.xml 364 BLAKE2B f739254d4208658fd33151170987b9214670cf97ec8babc6c97ea4acdd19f3cd29f35e9d719b8462d90fbf0ff71e3bdbf30cadc2fd91ee54f2868018cddeb220 SHA512 d1f71740b09b54385ca269bedf3ce44ac424272e69881245a77796eb6c9e618e63c8837009d097b43dee477c765adf31b9e4bab7fa26606e57c3894c7bed429e
diff --git a/dev-python/pyu2f/pyu2f-0.1.4.ebuild b/dev-python/pyu2f/pyu2f-0.1.4.ebuild
index ac6ee246d1ab..ac8c32eb58a1 100644
--- a/dev-python/pyu2f/pyu2f-0.1.4.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index f9d38fc0718f..b2a3d5a60579 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,4 +1,6 @@
 AUX pyudev-0.19.0-skip-non-deterministic-test.patch 3497 BLAKE2B bfbbd7bcb401d807531321cb15c71a52b7b039a3c7ad5cd06e9c919e6b6ef232fb16419f0480ce89e316770db523bcd3e02edc7c4f259803f4a3c93e2b0edbbe SHA512 23c305242e4df0bd0d4cde458ca1ee129bef36f98f5b7c3b341c4866b7f21a51ffaf07aa56901aeb67ccb59a4ed6548d4799ae2c519e359b627b29e722119a4d
 DIST pyudev-0.21.0.tar.gz 89469 BLAKE2B 3bf9ac46442c5948d131932c7b62a59ef979755f2d55bcd0165fc1b69b865268051fdeab7605c8a1cb0694ce0f4b88f31a1e6a1893900a7300ddf6439734712e SHA512 ba5b6156768b65b9655d809b14378b01173643781b9c4017271e880cdfed442c44ac49eb26c970e4275b820e01678e3001870591fccf88dc713ec941e2b85d11
-EBUILD pyudev-0.21.0.ebuild 1508 BLAKE2B 03586c193e81768325992d0b975ffcfc37a028b24f8a7b17ef8ee3dbc9f50689b1dafc3bca8b15f533345369d5be4eaf67959c951d9a6f66817317c04d5282a9 SHA512 1583ea23beeffd698ffc6e921358c3f25a7c217ca529a8e39d5cca5c5eb4b2a37300ba60c0665c7357d8881a0a9c36da09eb78d3d25d0ff662621c5e674da950
-MISC metadata.xml 652 BLAKE2B 15c561bbbbf2c96a44e6d0ff39e7d1cbef709b52800051d09add19b88318e7d4c9ceb09c0942e7b01ed3b836df1348ce7c84b0deb8db4dc6e5bcebe200ebc95e SHA512 bf46b85c588d646d7cc6179a059d9fb8143eebce038e64af50f3129056a71b65a63a3cd214924ca538e6793f48912dd0f824a7826b49abbfbb8b27a72214c89b
+DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670
+EBUILD pyudev-0.21.0.ebuild 1351 BLAKE2B eeb674f652db9561eb5f695aeedcb95f05fabb191a68e34e1baa5569020efef0d32fa3455bf8d8b0079ec4e71473d4c85270e0802e130250808a3fa07510defe SHA512 e533e4aa0e2fa91acf7bf3511cce433cf1f9af6b23ac9328d8ff51e76b75d4c1f433f498432f374a2c370cfb8dfe7d77fdbd863d04f196cadbe93f6bfd61c496
+EBUILD pyudev-0.22.0.ebuild 1245 BLAKE2B 161caabb31e58774aba17df1d6f1f914f147c182856077b5ca9ce9af985935202bc55d51db144decd18398711c5df0b4e12149199a3af2ca3efc2c89f9847296 SHA512 81da5fdc4e5fb229c0d728a0b0451ffe670435c072395d97106eb30d1309735b5428c2d56945fe6122d39eae4ca632e937c13769f9b8ee7a88270e574b5650dd
+MISC metadata.xml 593 BLAKE2B bb5efdb90e8b189f55f12df33d7bc69233a448d010c62b512cdbea78c58a625d0e876b48cdac3342e3588e3bb1f3998d9400e927fecf7bb86ad01da113c97758 SHA512 dd6e479a44e54d4e3b2a4b7a3ceedf04fd45152d9667227b4f7bf0c585052e1adedda44084c6251749714ba91bfb8ae2969c158bb3412edf1230f5b8d1d1c768
diff --git a/dev-python/pyudev/metadata.xml b/dev-python/pyudev/metadata.xml
index 9c052c908df4..dbaac4f67640 100644
--- a/dev-python/pyudev/metadata.xml
+++ b/dev-python/pyudev/metadata.xml
@@ -10,7 +10,6 @@
 		and service found in modern linux systems.
 	</longdescription>
 	<use>
-		<flag name="pygobject">Install PyGobject bindings</flag>
 		<flag name="qt5">Install PyQt5 bindings</flag>
 	</use>
 	<upstream>
diff --git a/dev-python/pyudev/pyudev-0.21.0.ebuild b/dev-python/pyudev/pyudev-0.21.0.ebuild
index 88016e8f0f94..684711ee05ca 100644
--- a/dev-python/pyudev/pyudev-0.21.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.21.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
@@ -13,14 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~mips x86"
-IUSE="pygobject qt5 test"
+IUSE="qt5 test"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) )"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	virtual/udev
-	pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] )
 	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
 "
 DEPEND="${RDEPEND}
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
new file mode 100644
index 000000000000..2fba5997b60f
--- /dev/null
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python binding to libudev"
+HOMEPAGE="https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="qt5"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	virtual/udev
+	qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGES.rst README.rst )
+
+#PATCHES=(
+#	"${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch"
+#)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	if use test; then
+		ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/',"
+		ewarn "change it to /var/tmp to ensure tests will pass."
+	fi
+
+	# tests are known to pass then fail on alternate runs
+	# tests: fix run_path
+	sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \
+		tests/test_core.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyutil/Manifest b/dev-python/pyutil/Manifest
index 2b339ca71337..869d7183db3d 100644
--- a/dev-python/pyutil/Manifest
+++ b/dev-python/pyutil/Manifest
@@ -1,3 +1,3 @@
 DIST pyutil-2.0.0.tar.gz 125079 BLAKE2B cac7ce94671dbb2b4070aac76da2d9f8b3a48640a2422e8f9fd0dbd6a61eee43636b9b8a003ee3c528ffa7e866baf0254c4a2369ba8038c63aa072e2df9556ac SHA512 3704c028fdc3894ae635dabd2bace1af1e805f4158dc6d67eac0c38fa8e7959cd093ad39cb2f539e59dd74e957947464cc8c7aed727835e127311062ed27e60b
-EBUILD pyutil-2.0.0-r1.ebuild 687 BLAKE2B 954c9d7c146c1eda29e78c0bcceb84d24aee454ef085b74dd15bc44f528e2434b4b8caa45193f8c52603b25f4eff46b921082675a417b2ea31ce5a5c13853678 SHA512 a49da09b13d9e2bf41b02d8aaba92ec8da0c3c26a9ceedcc6d534ef6dfb66d90fd18b8fe9ddb9f229d1d4a162a086d718894da37a2b580b64ca6cdfa0e3270ce
+EBUILD pyutil-2.0.0-r1.ebuild 685 BLAKE2B d960f40841a00c4371f07b2e4207d06304de8e6de3d5109ae3f78d1dc1d499aac50161d84507884b33bbc00ce4da987f685e422067f7dd49786b83d4ff2f326a SHA512 49add374821c123cd0a9579c643fc34c8590a103fa4dccae3e1f0c733812a1e0db47d331d928d32cd76bf2608a0e3f58344a529102a4a790d5973bfb84262d55
 MISC metadata.xml 744 BLAKE2B 92a7150e6ded208271a22f52fcee0d6402006ee4a71e97236652485aace07d35eaeb4094e6ab9ed6ae197fa91d4f5f6236f4e591ffb1ee3270e22bbbfce1e641 SHA512 a23c7e3e981737b2a5952cf4ae5fb5017e68c68ded1d2e2dc534cfe630aa95dbe8b32c6fc784cb2a5744d66e91131f97a5c201029df04122cb1ac230a0bd0746
diff --git a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
index 333b418acf79..241f619eea61 100644
--- a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
+++ b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
@@ -23,5 +23,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 src_install() {
 	distutils-r1_src_install
-	rm -rf "${ED%/}"/usr/share/doc/${PN}
+	rm -rf "${ED}"/usr/share/doc/${PN}
 }
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index 2e66d88cf812..bf69ba73a66a 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,6 +1,6 @@
 AUX qrcode-5.1-unicode.patch 961 BLAKE2B f0fffaab08a6e20bf2897b4130f25b1639992a4184114f5ede1833cbbf7e8d9f7aa0fa9ae631d0af8d84ac4c372d96e4f0809fcba6168c2bd6d23a7c39e8baa2 SHA512 f75feb86c8796e73d7089fba8e0c464929452c4be24b2829fd231bd210d2152710529aa3e3266bb88453ee4f69fed2a1f6cdf337a8ff44a345f3f7d56c969af0
 DIST qrcode-5.1.tar.gz 22259 BLAKE2B 1aad710fbfdaa1c1be505038ceedbf02de8bcb2a37ead59265ff03af63b96d6cd740672cb2bd3a8f3b67eb981ed791cf2d53050c02d1499e6efcf1fcce2903c1 SHA512 67a7bb51fe2386f3b1ac0b799d3850d3ca4f61286fdc809654df3f5a1071b503707a9a3e82e595b7611dd9d7b7e74b36e19b86942fb5ad94c256cd7ca9aa02f3
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
-EBUILD qrcode-5.1-r1.ebuild 964 BLAKE2B 81d948b09b658702e2c3f9f4fe9126fff38b64c3fe39181c26a7a2faefdc2c508a66ba091cb1c35d76bd3fa702c35e3dbc1d001d79282814b4305d34281fae1f SHA512 782e82b0c830491bc91c53752b9675ed93a57730b028281c27aef6872fef319eacfe75bcaf26edcf56c7f4d79ddde74501e863cc73063e8942ee6488022a22c9
-EBUILD qrcode-6.1.ebuild 786 BLAKE2B b4181336f95a2a1ff0453c2e7f508bfaaaf1e35fecfee5b6b00b6f5d2bc956ce853fc4ecef1b1c23db441ebc32212f9102040326a4f1499499770239f2165f98 SHA512 2a0b4466a6874e7c38e24b210510d62ab732e2a4fe4cec002360799b8e94706c33fbba2db0075e6b303c446cc21424cc09f41bbce6d747d129a2d6d439cc79cc
+EBUILD qrcode-5.1-r1.ebuild 883 BLAKE2B d3cd3b7b5d3b17b5d924eed58efdc02b3e0e5fc95528227320c9cebbb56dd47501d481f0bca7baeb9edf609907eceaed070646d13b8680f0acd01121aa7a458d SHA512 33cec22fc791244054ad20237ada4831b83f772c09ae9312f616fe22e8eb1b1f9d68d0ece799e53ed7b50c59a5b068d8ee37eeb9d1c4db7fbf941e4d89f52ae5
+EBUILD qrcode-6.1.ebuild 703 BLAKE2B 9d824805372d92a02655cebeb2235576a921b21bebb3171737dc0ca086c254e60851b5d9a8a1784d5aaabbbf9944dad955bd4a0cab83b68af31fd36354872dbb SHA512 69d47ffc2517d23d8cfed8ef30fae7cb4c47c601f9adf8926f990846937b3039584091ba58c76029270fc8cbca041aa53c28d6572a38ec037a9c4b82de3e890c
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-5.1-r1.ebuild b/dev-python/qrcode/qrcode-5.1-r1.ebuild
index b31e50dc1957..2a2e7529533f 100644
--- a/dev-python/qrcode/qrcode-5.1-r1.ebuild
+++ b/dev-python/qrcode/qrcode-5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
@@ -25,8 +25,7 @@ RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+	test? ( ${RDEPEND} )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-unicode.patch
diff --git a/dev-python/qrcode/qrcode-6.1.ebuild b/dev-python/qrcode/qrcode-6.1.ebuild
index a59ffe76e88b..6478dfae767c 100644
--- a/dev-python/qrcode/qrcode-6.1.ebuild
+++ b/dev-python/qrcode/qrcode-6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -22,8 +22,7 @@ RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]"
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2) )"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index ceee86d364b8..12eddb4a6060 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,7 +1,7 @@
 DIST QtAwesome-0.4.4.tar.gz 159621 BLAKE2B 468f927b537eeada0926fc989498e6b1e2a5fc05a67f9f2286063c1feb0479798e95f07a05d8afaf51b07fb25b9717116cf4819b7830c0daa6e5807afdd6e756 SHA512 9dc8659993b8d61757865a1ec76f76e76db1232c6801f8216688c0578f612897fe189313c27107be264ac61c6ee2a866056acae51241be73a4fc5e9e5825008c
 DIST QtAwesome-0.5.2.tar.gz 610721 BLAKE2B 791e7fb6570c53f4c86cf51e1774218d09d7767e02fc70449fe61544a1dd71ae0acc6c95dcb5688d4137a220a15ea348cdd08163367d600944af0022c17ad46c SHA512 23b1fab5cbc36e2d99edd63a1f0b150b1ae3638297a3145028edbdd57de75a7d68328e70ecd7709f0f0faa75001b791505f031cff939660b0bd5737feeb8d669
 DIST QtAwesome-0.6.1.tar.gz 805816 BLAKE2B e459a30bfb645942b7531050a747d40922687c7409451609f14ea99ea5b777d8c7b284e7be3f6957227ad0f205016ce31019c6baf550f2227c89e18ceeab9acb SHA512 17cd56380b5ef2bfd4063e23e80081ab654661ddf2d62bde0e934742828c54cb9ea51cc0ac7fc21dec213d25602f71b97c99990efdb8fe438000f052322049a7
-EBUILD qtawesome-0.4.4.ebuild 591 BLAKE2B 3e50f5d6721fd84c710d8cbd1cdbd190aa0494f670f700d0494f5306a33cbdd1a7cba70938766e035abfe43e90f965126fbe1e10f61a4654e62be50cdfda8933 SHA512 804a5ebceb01eaaf0e6a6d8f8a577671772e1e13c779bdb0f38671795785c7bf10b2e615e5df25fa6da11d86858ca8549fb04cdb6344a88079a0911761d177ee
-EBUILD qtawesome-0.5.2.ebuild 595 BLAKE2B 9181a9ae881f231a7a78a9101f8c78cdc9c028b3e63cff6e569c2936e8a80a71c87daab48755c60521b425749938638c5bcfbdcec48456bfa7f8571c5c459923 SHA512 2b3f8ebc6ea8666c367df0409cc78f14d1a8a809ab5420eecfca3a54b94499f6ebf94e8a33b9ddfc175fef3c466c2f42b932c379f75938a3deea216c152ea098
+EBUILD qtawesome-0.4.4.ebuild 585 BLAKE2B bd90bf505c7430f094e5b4a1e9d1513e47b36ec9a0f47b4f87a873ab72e45f31d1389616a2d896e86702a289a89ea5ca4f2bcf872e4d93b4baaf5b24edc72d93 SHA512 3822ec1609678720b45ef0ebd6af0c6bfba4062a7f91191f8774730fc7e95aac5849dd1140d6b9a7a61a65e86232ccba6be1bf70631b7ac8143f02f804cefceb
+EBUILD qtawesome-0.5.2.ebuild 591 BLAKE2B 1e6225d26ee12aff1617f5b4c8ebbc521f0c359c9047767da0c0e5ae6f2b3ffa8daad43018d81814e6bc20790c84152d3c38e4691d3a40f5c6c344168ac1441c SHA512 81192f068fa4c6889aecbc5da63e0cbcb476bf4e3ca71b7c7dc2fb271c5eea13e4c6372c4b7ef9d2829f1bc634351c73c1eef35e7c999bf8a1f1c3de846ae997
 EBUILD qtawesome-0.6.1.ebuild 769 BLAKE2B a7e176e0c90d7844cf67b031663586a64a95b3ffdfc0880dfde191c548eff55570320489ab8629fd4384107a67d5443c4c411b4ae652e3707c238f10a9a42d13 SHA512 83393e46cdc82dbfc9a8c3329da986068510b58eda72cd7ba40a4aa89f3c44e30ddc1148db4b5a1d97d958abaf5524d5623e8306306366f9ff7510413cbd1967
 MISC metadata.xml 907 BLAKE2B 0668d113e8863279de6bbd5a1c7af7cc101a826647574ec971704a31745767d22ab6683d3cdb82d5394490cab23a6d0d1b86d11a6ec93f711dfe596a34afa86a SHA512 d0148746d4d9b429e350593b7e9f5bc4c88030a99a84200e8b6351e3846749e1e667832671d671db5705c3d4c8af0b121aabe9a3bcbc25a2a0b03de192f02278
diff --git a/dev-python/qtawesome/qtawesome-0.4.4.ebuild b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
index fbb7d0c1308d..a107a3386fa9 100644
--- a/dev-python/qtawesome/qtawesome-0.4.4.ebuild
+++ b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit eutils distutils-r1
 
 DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
diff --git a/dev-python/qtawesome/qtawesome-0.5.2.ebuild b/dev-python/qtawesome/qtawesome-0.5.2.ebuild
index abb7ca60df7a..3793c1af265f 100644
--- a/dev-python/qtawesome/qtawesome-0.5.2.ebuild
+++ b/dev-python/qtawesome/qtawesome-0.5.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit eutils distutils-r1
 
 DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
diff --git a/dev-python/rackspace-auth-openstack/Manifest b/dev-python/rackspace-auth-openstack/Manifest
index e7ce20e587e9..8a43e7df3f4c 100644
--- a/dev-python/rackspace-auth-openstack/Manifest
+++ b/dev-python/rackspace-auth-openstack/Manifest
@@ -1,4 +1,4 @@
 DIST rackspace-auth-openstack-1.3.tar.gz 6799 BLAKE2B 33754daf35b7260af030da4a83f61224c6bf11ec9fe554282b45c5839aabc5687e2fe288b9af6252e4731de5bea381eb8e8a98a401371afddcf996652f892f23 SHA512 813fe85d38bc80bae65a3f160f50c17fe8bc7279dc3ad4689012b3fa9c0fdd1577c0491de0c87d3b8fe4e6ba5c1166cf30cc1d0533fa15c516a826ef6c36934c
-EBUILD rackspace-auth-openstack-1.3.ebuild 460 BLAKE2B c9882d933bb005dd2231db1eb196322fc7766afa86f3a8d76e25cc50f97529b80daeb802c5338d99e1ec034837632e5f2ddcb529ec6daf7c56d7680b08ccd2ad SHA512 63b90b18f270b7390c249cecacb0ef2efa1ddcd797582787f72c045c813edf54c9c77e6926a6080fcadc355da5a7d4446f13a602650b82e5fdb06503ea3ff3aa
-EBUILD rackspace-auth-openstack-9999.ebuild 457 BLAKE2B b497939bdb705c7af05c27a8dce3cd02cd82f2c3794a2ebd89c35ec3c59de825bbd878ed7b98a692578515aafeca7be7baefd8ca0604e1c870b20b1ac489bc66 SHA512 91289b960d067a3a059d1322d154b3a32a080a4783b96309ca0576fe9553c01190b7dfd956baff2ec557045717cc8b06a4ed67f02ab58fecae8a99205860b373
+EBUILD rackspace-auth-openstack-1.3.ebuild 450 BLAKE2B 4b2bd79ffe55d7ed89011bde28285cb489560a9102b9921c9ea372c91b617efb081aa36d487f3902175707f4669e669ca83a47e1c6d71afe4c019a11d7e240f0 SHA512 41008e052314571558ded5fb36aa79594a44638f5f49b41a0dfce1bf182f6b04c2fd3de0c8bafab283a23d6cc98dbc56ebd2ae1680aa9c08af040cb550b86f24
+EBUILD rackspace-auth-openstack-9999.ebuild 447 BLAKE2B eeaa52f3589957ec18d05f0376db627ff491b14073b0a107fa7795a5063c48cf30e8682be3ac87b0445cde5825439129265b0cf65e77b8d070d92f4db1ecff02 SHA512 1786ae5a28dfbbc46eaca1867b00065b8d6cd9e057e2ff754a7d4604d22f679eb2303b389422c2ac659b290953424916b8d4ef3473f994d12007b6e3d9029edb
 MISC metadata.xml 588 BLAKE2B b868993dca0c3a017ae5e12e57983676c97e8d84dde1b803f0c0ae2fcab8b1b19f581a288ecbaa7d547457a762ce30e9551e88d58d61bddf19bb126dd87cad21 SHA512 c59d7bcf7d96b1eca6a82cdef09e717b97df65ca1ddaa9696a0a931ccb3af0a330ef285c23a0ed90324c5f49a8fd007989faa6a718c3fc79c631b7e548272221
diff --git a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
index ca24a9461d24..e88e44535083 100644
--- a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
index 7e7ca5608e79..3c7edd134441 100644
--- a/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
+++ b/dev-python/rackspace-auth-openstack/rackspace-auth-openstack-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/rarfile/Manifest b/dev-python/rarfile/Manifest
index 2fff3685f994..61bec6fe396d 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,3 +1,3 @@
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
-EBUILD rarfile-3.0.ebuild 490 BLAKE2B 56bbf416d4d8077d1182d515f2da3f7171392483d109b226b01c40ad90acf1ec99339f0501c9550dbbf3960496de680a09e7ba693ec7c5110d0e1ba98be900d8 SHA512 c9bfc2aabe6d5ff69d01723dc2f8ea8bf77fb9f5702fb8c802319f0685e198cd317a1d1bd2494a99fb4d0a6dbcfaf40a97b2da734a58611f176f66acfe0bba13
+EBUILD rarfile-3.0.ebuild 484 BLAKE2B ef54ff43da9b5c2cfc29f56d1efd1c98cde8394166bea02be00152a19772ef6fda05effc569c7efa6726ee95f0ad0927f25d813e24688d083b1b0dfe571b18f1 SHA512 0eacb1c5d1a69a61e0ea644d3236764100c58d9aae8da97f700970f0af101af482b83dc895fdfe3f13f1aca44b3bfbc524b60964b11749208f4aac60ed9fd15f
 MISC metadata.xml 665 BLAKE2B 1e99ad6ff0a0a07251d392632d0f2443dd46b622ce8af2e7312e310c1d419459bd98d712c7d33660484b6357c7eedbb32bedbc7a714b2f8a42c9684b5e0db855 SHA512 265d14703bce5b7955872c2f415e537ebe1a6228a6b5b4eec112103679c8412073ffc9506a5dd4af648c20acac78da4c196e139d7f93bf280c77d28d9f024045
diff --git a/dev-python/rarfile/rarfile-3.0.ebuild b/dev-python/rarfile/rarfile-3.0.ebuild
index 39d4f36b37b1..bc30afd966be 100644
--- a/dev-python/rarfile/rarfile-3.0.ebuild
+++ b/dev-python/rarfile/rarfile-3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Module for RAR archive reading"
diff --git a/dev-python/raven/Manifest b/dev-python/raven/Manifest
index e93dc30167ec..b7b8cbc24c9a 100644
--- a/dev-python/raven/Manifest
+++ b/dev-python/raven/Manifest
@@ -1,3 +1,3 @@
 DIST raven-5.33.0.tar.gz 284367 BLAKE2B a66471ed09bb2afca4afe78f662fdc21464e89bb1317fdc5481f87bdca626ad2a0064e9b9681d63e6439ebecd3f25d38a0000666a0c55ace90ca51efb2ccd1c8 SHA512 b6924c36f1cf4e957e8399e757dd1f3fc8152c14af06b700d139cc93bc3dbde4186690fc6934afeda03c13a3b59e739ab3627759580b3adb890f0c1f1ddbe8fd
-EBUILD raven-5.33.0.ebuild 575 BLAKE2B 675d44ab92fb7e642ca7cd58dc861a3f1c38b63574e9f205ff47eeec0375b09fb03e82cb1835c1744250e73f1efc6f7f158fad9c4579af53148a08cf2551aaf2 SHA512 783048346ae4c2ddb9e41164f1bfff9503d32a18c5cf85c0acd9ec582c80433864f6016c102aa8522b91c9bd3e8f624a0e692ee7af0d2b44de08b392f570d87a
+EBUILD raven-5.33.0.ebuild 569 BLAKE2B a714401fc18e05771d42140cf91e90a939609e2b3dbe22ffe0c516e2047ebfca96a86169fdb2e69999f86072717df008e53dccf956570dc953498cc7d2980a2a SHA512 79d0718a3ee68337a3f3518763f49f3965516f3e52193f35c60c4cb2c934302af7957a5d4dd89bdfc9faeac8c3a9ecd9728f4eb7b373278481b055544362637b
 MISC metadata.xml 302 BLAKE2B 2948facec48fbb66ddb7c0acc7ddc49e671c9fc8d0dd82114971e1382aec4615aff364a954f9e3b2ed23285405a0e047ad0a6aaf33f4166c0253c0aac1d34a79 SHA512 d6de354f658e8eab89efec183c341052a34471cf58d339d29e511c0cfaac76771105e7b1b4f72ddc00bf95ee36a4621a7716c479b5c358fb2dbfc60d75083fe8
diff --git a/dev-python/raven/raven-5.33.0.ebuild b/dev-python/raven/raven-5.33.0.ebuild
index b670000e009e..20fe41df46ae 100644
--- a/dev-python/raven/raven-5.33.0.ebuild
+++ b/dev-python/raven/raven-5.33.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rebulk/Manifest b/dev-python/rebulk/Manifest
index 1b81e8f18f73..ab50f5e33cb1 100644
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@@ -1,4 +1,4 @@
 DIST rebulk-0.9.0.tar.gz 257342 BLAKE2B a08b2d74685eea35597331bb2ef3c48e8a9cddc39ad3821cb7f33b80a47184a21f813b339e9d64548b3003913178191075455a6f787ab80ffa2cb3bf7f0db35d SHA512 25a22b3a5f5519f6f8c10abf6a477f212c0500264cfdcc5a9be09d3818462a051b1a7cd78f94991c44ac6bcdc7435b9909e65de48d1bd8138989e0da98d10262
-EBUILD rebulk-0.9.0.ebuild 951 BLAKE2B 89513c3b138d1c90ee23df8c1f0836d6ab49753450fc17a366629c6329903dae4c2ae60d5d40bd04db8967726d18db693b21c822449832e4fa4bd5fee086d075 SHA512 624c3738b28a4ca58678f4ed740abb4f5de91baa2219605cbb76e23120017bcd45b3ad8bb98f07b9d39c04267e745c0e54aeba53a3a048bf57e61a9bcd229214
-EBUILD rebulk-9999.ebuild 949 BLAKE2B be1fcf982ce0ee4ef819ec965933ff5c4f41e0deb596cdab7ade4bcd7bd537224b9d30f30992bcaaa959a306ff719abc0d4da4112dc1e751ff81f0c7e5e5650e SHA512 e8eecef74f361bc5d196071552b152bb5a485b4e997ea10dbb1ed366f6a7d96bbdd1fc8ed1c673893c440df0b64bb7d9abf37e944c25287b70d7ea6e6cb17ff0
+EBUILD rebulk-0.9.0.ebuild 945 BLAKE2B 0775cfb865b34acabf7d49cd6498ae4e6eafb6c5adc697088f17599587497a7c84e6c666ba6024cd03fbcda00ecc218a7f99eb09f1bc9d543f476326b9f27ada SHA512 5728e64c71d91dc189b2d470bae985616a2cad48b09570ff01156d72fe15fa1b00da5b15635f71242a6db9fc319f1e86c48f1ab9f5e945de353ed7a647274ebd
+EBUILD rebulk-9999.ebuild 943 BLAKE2B 05663aaa933d5f33758022945588acd20d6213dc892e2475d5ee6f8d1a0cc63513ff0cfd790087d078245bd83a23daf7a2b30fb28ae4ecd1d4544e1df4c0248c SHA512 3db608daab224b823d8c5c1a692aeb8326aa656e22595d45ca137d3769ed4d90f035ea4f89aae56eda734891836b1595b0cf3e6f3a55526cbf0787d03e604f46
 MISC metadata.xml 289 BLAKE2B 0b4705d4e9400951a5a9bbfd79a5f311cf4918e6665f697b8b94fc7daa4bb777457fd919d09f79627ab5cff49fdf473a4535146b0fb7decf33f1afe15b42d32f SHA512 d3d12fbd490d3b76d211a0a47691e7ed085b6bc6235e36ba5ddb6c976793cad1f206d61444d451da66ff16cc4e0bbc2208ce6fcee07fd8b52fe6a01e39417257
diff --git a/dev-python/rebulk/rebulk-0.9.0.ebuild b/dev-python/rebulk/rebulk-0.9.0.ebuild
index 20f7e36ec368..4828cd9ec638 100644
--- a/dev-python/rebulk/rebulk-0.9.0.ebuild
+++ b/dev-python/rebulk/rebulk-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rebulk/rebulk-9999.ebuild b/dev-python/rebulk/rebulk-9999.ebuild
index b9f3215d179a..88825450c608 100644
--- a/dev-python/rebulk/rebulk-9999.ebuild
+++ b/dev-python/rebulk/rebulk-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 32d8726991f3..85248ff91331 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,5 +1,5 @@
 DIST redis-py-3.2.1.tar.gz 124692 BLAKE2B fc7a773ab0a7e13f034b9efa174806b024733f9263b962599ce72e9a0c88b11964c26081375b6ae2de49939b59a561c145ae1b69c262b801f9b887befe9dcc0a SHA512 be51642a8895325c3c61993dd83c3299a9e2cefc1010e04f182833f720ff161bea43d3a57d28afba991949fcf6e967c4f778002967641bffe651d5db384f2e08
 DIST redis-py-3.3.11.tar.gz 131072 BLAKE2B 6becafba3da22bae796a4a9ba55d11a61d9ed1a8b693a734d4ef3f0e463c0c39a05c01546225f69eb36a788779d6e45d0136e1a6d6856ec63c3dd07994b5db9a SHA512 a32327fcebc6242367c0eda6c6dcd1a15d5d575527af2e9de0d76e05bc4afc7402566d9254e467663b81907a310731af3041236b6b135f3b8ff1429a502c1000
-EBUILD redis-py-3.2.1.ebuild 1468 BLAKE2B 2fe39db26b098d9a6fefde774ccebaeac8c720301e28bc90ada6e7e729c1069a6361910471bf1d15a1e0bdde3c307e82d054eb477a6a6823ff6145c734f9343a SHA512 6fb92bb8158c5e8c8b4044803462f997821163e36f817addf5e3891914896740b21ffbb6522356dda3d055385f3084ed26eb9aab5b3928e99fb904110b5b1cdb
-EBUILD redis-py-3.3.11.ebuild 1407 BLAKE2B 49bcc15c60ea4565bc3e4141a9a0baf7e2ec8807aa5041f9e3f730f4edb9cc9ec088597f3d07fa615a52c1383c027fcb6ceddb5f6bd163310acdba8e5d93e399 SHA512 ee542ed444bf53052660207b3dc352de8dca161153389bf166b172644631dbfe4f9ae877ec4efc612e724ba7c51921b6a24a2cc28e6cfdc5fd0e9d2e1ae28e6b
+EBUILD redis-py-3.2.1.ebuild 1458 BLAKE2B 540704ee179b84e83d55e77a1f71b0c0ce4b03e52102d018d60e6b34b7a651074e4b8c5976c0224480918dd3913e27dc7298a929652798a0fe5f78eb616aec51 SHA512 2d58d3549dce2ebe8a8f42e2c9e23d77b1241620081afd46e38982325dd4a6d7efbd32f3273aec79dc93e7142cfe9fd44bd7da733861c2dad5afcddec3175c3c
+EBUILD redis-py-3.3.11.ebuild 1397 BLAKE2B 3953ef1556dd53cf66829b8a038ce674f62f1460dff3a9f5f3eabf556805348d68d22b84cf0fb0ed6f7b16c589c56ac6f0ad5b6538682adde36e81c5dcd500d4 SHA512 226bc9808aac9949bab5c8e316645ce83fc706369dddde4ce7f066b7dac073cef938df757010d0fc918318e8d544f6ff022596348cf9c041eb19ac2e0bb3505c
 MISC metadata.xml 380 BLAKE2B 993e671ed9c6a9649a8dc0d95207b4dc1f90cb38eb8af6e470fc9e18b496768b541c033ee961957d56ee93b335c54447b741fad38f71498188480822350b508b SHA512 5e03d25770ee53beb71d1efa039401a5598572bbf6cd441c904fb5c074d212c0c05934c6f86abb566e913ac65bd84db3cdaca8b83c182dad57d0fcffdeb9aa4b
diff --git a/dev-python/redis-py/redis-py-3.2.1.ebuild b/dev-python/redis-py/redis-py-3.2.1.ebuild
index ef7ba5ab5ca7..77bcb3a7cb90 100644
--- a/dev-python/redis-py/redis-py-3.2.1.ebuild
+++ b/dev-python/redis-py/redis-py-3.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/redis-py/redis-py-3.3.11.ebuild b/dev-python/redis-py/redis-py-3.3.11.ebuild
index 42add4480b6e..8ff3bd59260e 100644
--- a/dev-python/redis-py/redis-py-3.3.11.ebuild
+++ b/dev-python/redis-py/redis-py-3.3.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index d06d40c989b2..07ecb63549df 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,4 +1,4 @@
 DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
-EBUILD rencode-1.0.5-r1.ebuild 512 BLAKE2B e7a18311327fc216b9c1cc22e9eafac07a41d2863f3dc790cd0b53cd4c397f1fa8faae685f2804ef7a4dbe58971ad7e8eb2f9e6e94d9c87fe4758abc599a0b4c SHA512 30f4a86a2d230b7b85c87a0255f3ecea4e796d9ae1133667e6532d377edd04ef444bbd3bab3752dcf111c133eb86bcf0f5120ec6b6cc2ac6400ba6a7ea860d4b
-EBUILD rencode-1.0.5.ebuild 506 BLAKE2B 54676aaf35605eb5dbb61c99e052218b6e196a18d7badf022e2741ecc69d11e971b2953e4e377e2328f2ed423f313fd57297eb9cd1f1d84f57f403c30682c571 SHA512 60a924ca50683e48cc0b09299c00f9eb8c1b5319042a8c1ca9ac72ee4c06b75378a4b984513d9eb52cc9001ffb9442cd74bb55b64091b81df27f9250efb05da7
+EBUILD rencode-1.0.5-r1.ebuild 502 BLAKE2B 4044098050c39c1e3ee0864277d8f9bc1c6b736e89e89cb4d1fd91f978eea4fc38db9fe8cbd67d6e050db4c200caaf0e9ee7cf58ac5f2123f10ed70050ebf4f2 SHA512 970ff1b527306f3e7af28d815449053eddecefedf46fdda40c28360da0fc82127404fad6349e2517bf4ddc5d2117d978e130e3656e31ad6ca1df383f0edf4407
+EBUILD rencode-1.0.5.ebuild 496 BLAKE2B 7abba3cfc5d364b95c1ca5b3a1569358d24009a552edbd6ba7e0177b62c5ab8d36c866f8d6fcca78c3033e8c1f4fb9bdc12e9d836b1ed1b2fd538ec72439f57e SHA512 9fc45d9f2e67a2c2351729342b31575360f7e53fab03740e729c568f9df640212c8d340ac2b10ab1b158f9fb74e132f08f017cf8d722116ea029671e1c5e1135
 MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/rencode-1.0.5-r1.ebuild b/dev-python/rencode/rencode-1.0.5-r1.ebuild
index c5ffc4b4aa5b..e587997a9ee9 100644
--- a/dev-python/rencode/rencode-1.0.5-r1.ebuild
+++ b/dev-python/rencode/rencode-1.0.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="similar to bencode from the BitTorrent project"
diff --git a/dev-python/rencode/rencode-1.0.5.ebuild b/dev-python/rencode/rencode-1.0.5.ebuild
index 10cc1d2f509c..49f14f940bfc 100644
--- a/dev-python/rencode/rencode-1.0.5.ebuild
+++ b/dev-python/rencode/rencode-1.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="similar to bencode from the BitTorrent project"
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index 1e0858af9dc7..b095477b6c94 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -1,6 +1,6 @@
 DIST repoze.lru-0.6.tar.gz 19814 BLAKE2B af86797daf286daa709556194d9aac5d72151b1879adfb5d0f209f7f5a1198fe0772117ad8d13b7cf8caafc0d74c2b03b920814770c6a9db3ee44707b6d8ea8e SHA512 32732286f41ac6ad55e65fa15907e44558e7fbf089d1565c9c413be7c4af158b7a8ef9fc6be68998f8a9b4cd836028b8e706ba508a328a7fa338e95364e968db
 DIST repoze.lru-0.7.tar.gz 19591 BLAKE2B 839cd757ab51943b46cab22190c4e3bb829f7a94ad66647aa99072d535b7366778b57aedc556c8c91f012534154e6e2ef7608b2d4db2b64e7ba54486404a183e SHA512 c4d8b015931c4265fa8559f99c9d5016835574b368ebe0d49fe503afe908020b2bf29836606134e00c6c0aa436d52a00bb73d6ab80e98d0802f54bd2e4686476
-EBUILD repoze-lru-0.6-r2.ebuild 527 BLAKE2B aa3534f725bb95ac54122567f596a61853d4bb9a8e2055fe8ea628df095e84666d58d07e4e52e6784202f5d033d8d1cb91bb9c33c67cca41c76d280d1b7975b9 SHA512 0b58981e034f7e914f60e78cde3601706d3cb50fbbdb2132696d82669920e4060e3979ea3588e78479f52216f287b16390793be99e2af8f6030d1d93d3300779
-EBUILD repoze-lru-0.6-r3.ebuild 687 BLAKE2B 3a0cb6d44fe86b8a4697323d6752d6b86f3e046c6aa41a78b99851e441df60583204a8dcc17141ff2148e9471997f3f010fd5a88a9c7c22a1cc8645a8bc87483 SHA512 21567ec5f8ac2939ff38082a928226d9e11b1fabcab32ae7cbf1f482b1624a29be0673188b4407cf5c5c9f79aed107df81a8492868d0cae4dd786f3b1fd5c9e0
-EBUILD repoze-lru-0.7.ebuild 688 BLAKE2B f52e65da9a282dc44721d96da16ea675520df33d8c69def5112be217a7b13970aeb726d00d8a14fd5cf70a4462826b9401867087f5523bc304c31bf4c042bffe SHA512 2157903215e5fbfb4fd8c3835c89809fe7e0b3e519258be3e8e102145b7a553442abed9819569f1e9453f5ce7bb06f322e938632a5d23caa1e18ee8be6aea63c
+EBUILD repoze-lru-0.6-r2.ebuild 521 BLAKE2B 6135845f1f4172765bc469097c12d531c3ed44a2ca15364c3eea4975ee93cef7e1c3c85be3be5c192f183f691c4edc720abbb96ce8a89609c30c6e28db872d6c SHA512 534c10f49ed387ec4bca1a76186e00b32d35cd08ef40632d8cc64f2234ce0f5d5496c4c2e61cf93c7f0fa94f13ff14a9fc78c760595beb8dece884f7c122a435
+EBUILD repoze-lru-0.6-r3.ebuild 681 BLAKE2B eb25f2d2202d1889a4624e022177ab884fb43dccc0a7666b27bdc05d3f1274152bb04bc58e272aff73b15b8b80817eb0c51c9d12f3e68f39d5ca910f3a41ab77 SHA512 0dd2a29e4417f8cb3be44668267341d19b93100697035286a66a50902afedc20400c86401dce6bfe4ccd0445df060e5a9a32b799dd24b845c3f559c05e0e9056
+EBUILD repoze-lru-0.7.ebuild 684 BLAKE2B 3f037a9c32a065415350cd0b716f73634cca02f95b36103ca83a461f7d4864211a311a369ac9ed48a531ab0be6e7352c31d41618b0d807c57af4bbecfc5f467c SHA512 b88886b3f5b3789d6d03fc38b4e52952061c998624a90fba4187fdf96bad43379b63d7142e8f52058c59fdd6784473f5515ff07fa00fe5371f0043d5bd112b45
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
index d02c1b6e98a0..2616206005f1 100644
--- a/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild b/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
index 51e89b36cd76..e09a6b53a364 100644
--- a/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/repoze-lru/repoze-lru-0.7.ebuild b/dev-python/repoze-lru/repoze-lru-0.7.ebuild
index 64187abab66a..4746ba1b286c 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/repoze-sphinx-autointerface/Manifest b/dev-python/repoze-sphinx-autointerface/Manifest
index 1ee49c66c6bf..ce5cffea66ce 100644
--- a/dev-python/repoze-sphinx-autointerface/Manifest
+++ b/dev-python/repoze-sphinx-autointerface/Manifest
@@ -1,3 +1,3 @@
 DIST repoze.sphinx.autointerface-0.7.1.tar.gz 7892 BLAKE2B 8c7ca3faed9ede599c4d1a7c36cfb6fc2666d2a88ba75d6d903bbad2306bd6d5f2ff9c39a149a2a9e9171a4bba23a7211a3e8d4c9620f6777928e032e030881b SHA512 e2b2a41647a6e349bd33df8fcc08d2560f2a58b94a054bfcc9176cdcd97513ce78cc31945c7c12fd14f7906d21b23ba9c3fac0a06ed0c92ad7b89f73b5bf7ff4
-EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 974 BLAKE2B b505950514f4cb6cfa5181cfcd55bb1ecb7ee536108a4fb2ef23d67a9a13b2b21291d7d673fa59aa897b08b94a094270a1965566d9a33ee3259fd3d07d5d4f30 SHA512 6ac6203208d1b09809bff3c9650c176d182b6142dd70004930818b21e5249e1470e7bb7341a4e8f2264dbaf73d33714409f7d43c6dc41ae97712c2beed1fe0e0
+EBUILD repoze-sphinx-autointerface-0.7.1-r1.ebuild 968 BLAKE2B 0705850f0e8c10401747fc291bbf96a94a5676d2e57cbb49da90d6378894086a9da4d9e8d3da4dbe3cfdc25f4d522a131ae4c72788e731e55653aa6b7536b19c SHA512 0013e81b94fb866a61bccf8b97b5985aad625ec028a1db7f0c0d65cb2d8f34c34843d3f1447e176555bfca87f96116212a8c6eee0cec34ef3ebbbaa85ddee7b7
 MISC metadata.xml 330 BLAKE2B 62f755b2a31b7e0aa7889cdee9c2ae10fbc4f3b8f054a9f6658f4993e82e4ab55e139eafd1fa5314a071fc5ccfe50af0d26012c044facd4227a73566a812d7c6 SHA512 bab37e80962b4bbb37100966f20a648ecc5761dae56d01d09a140b39ee2662a91ea93a8c3e8406c285e94df572645a104baa810c941cf4913e73afe34ca185a5
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
index a4116587e668..2994cc995d42 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.7.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index bb9e753cb67c..cd14dc837750 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,5 +1,5 @@
 DIST requests-kerberos-0.11.0.tar.gz 10742 BLAKE2B eaf764ae8f5c897db43cbb931952062d4aaf33c04dfa0bbae2cfd3b44326240f80435d0b69c7f8bfa3567d0d16532796d009f0436f3ff5956a87998b825f98a3 SHA512 8700a7a305e0e42823bbc87c95ecfd404a76807459ab8a87f3105e817ebd9954fd41d7a2bab421bb5e21c0ec1b62a589c93cccb1f926a3ba66d6adbffe5db265
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
 EBUILD requests-kerberos-0.11.0.ebuild 601 BLAKE2B f6d0a19d15ce6c2afa6c309eb586a4b12780e19259b52dacefe768281ef09993b7cb376c442b53b6c76924d66f65aa529c6ced188dd6916279a1e13097ce8a32 SHA512 f1e6685d1c5ed62742bba0ccf439a8a55f4560fd86fb21b3b13487bc4788d3081acb2522e165dded8420a934191aeadd548236a50936a31b830d2a6f0b7c5ff6
-EBUILD requests-kerberos-0.12.0.ebuild 790 BLAKE2B c6bce8702c736a2205c27ab04e09eecbe8304b44c090405921f09de53ada65b87d6a5d31a9962b5d6ba5cd81f6f9f975847f49a90169cc223ad54ddac7167653 SHA512 025b7c4f57da9771b8dc5824fab3f392b56772a52026f7e33f1435c7a600a88907b53549056eaa21554109081b33a9bb3a908b1a0b1381f628991f3c8addb530
+EBUILD requests-kerberos-0.12.0.ebuild 780 BLAKE2B 7d41791e172263b32d101811be6398a8f463cf4a1870214b5a31a2677c337d9fba4c9cc2631281ba21d6680636554b27fa04421f271f8223e1b1182fbb68ccc1 SHA512 2fa2b97ce5e27c94c4e96f99be2523d9a2f993785e1b728e4807130ef721dfb8d9d643a087b7837be424cb0d55d7af082f7705884db29e93c10137718806b794
 MISC metadata.xml 320 BLAKE2B c58268e9df73385438694b43f3784a58d11f003adcebc306d70ddeea26789cfa22f709484a99902326074d16072563011c07f09eb071a9c141e4ee6ded7dbd56 SHA512 a33854d5f3c9a4d077d51a4254d18045a4fb0a50c223e809ea0a7415c869152e30122c3d7e005b25c7e07bd660678db5613449688c086582c172a77d19a9e540
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
index 0d00e7a81c66..e3fd9d04eae6 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index 5ad1b2b11778..e101ca8b3c8b 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,7 +1,7 @@
 DIST requests-mock-1.2.0.tar.gz 40219 BLAKE2B b5ded6c97d920bab0c610c1be1c80f299e56cccd393c824b5c9ab3e0c298491b8be0b285c440bc8ba32eb1eec2eca14ec363d0f188c5b095192a56d01383c322 SHA512 ed24d1809aef597219ae2b0b376156a0760040795ccd660ee38f84cd1ceed58cbc5009764d7a365d31f941ee16e2b537b92ddcff92bcd8d47b7e95c67dc8d82c
 DIST requests-mock-1.5.0.tar.gz 47824 BLAKE2B 90d540e2372430c70b0ada0bc48a3a8085452e062e9ab57a232d080df8312c2a722c01d61fb399fe2a6bc31a2d6d61914d8d0e2c912a2e439062b27bb31914cf SHA512 21838017ac4d3066e2240b40b27bbe16f3bd989f37eba90f0a0d0cdb997e7e65c6d9dc63b31f64daaa6146cc3c6bccbba86382eda3f2ca72eb7cc8381969af36
 DIST requests-mock-1.5.2.tar.gz 47581 BLAKE2B 46beefc45e01355939a76b85e43a5b57cb1a870666eab7f610cad3e8a04a17da6a0864f9776a0f09028c847e8a4f7d0d2389a36f9a0431ed733a364d0f712c0b SHA512 206c91e892df84e38dcdf1264559128cfece76be2ce43b9c98238dfd438795d8c4ce3fcd43feb30246fbfca2d78832a23430ce1c9d3a7dc6e4417df5d65a8d3c
-EBUILD requests-mock-1.2.0.ebuild 1021 BLAKE2B 8229bcb2a7ca999de2c8bc5cf466a2ffd9af2178fefc3ff6222af4421b247248c12c5aa6d045cc142e43b597fd0bc35874cb960106268021df95a78d9c27acac SHA512 5655a072f773314f3bb1ee50a7d7b811be1c13efcf5fc8f1858025260caa7bb292f747e3a72c93ccc225f643af6b3a2361604b124b76f9852adbef5f95d2b1bd
-EBUILD requests-mock-1.5.0.ebuild 1676 BLAKE2B bf43265a4c51d74b89a94c2456c8283c98990d6b598f60ebf96c57f01a7591c9d085524c86abafb5888f233070e62d37cf57fd28cdadb13ec58487007aab122a SHA512 b777247f2cf64bf306498d373b6fcb55afa26145b859fddc08a27aaf7f8ca483390dc3936efac5de8f68faa1f077fb4c38a3ba2e1ef4c1979667e71c926edd07
-EBUILD requests-mock-1.5.2.ebuild 1678 BLAKE2B 12918f2f207ead0e2f76590310093f286d727e2ce660d26f68bf9c8643db4a632ac3ab050ae6b987a92a08e41ec8c0586b9ddebdb3fbca0b2307d4599d929322 SHA512 a7394b51e8aeebdc391a54fe31f60bebc0f08ee2e4330d6fdab39a981a793dc8d2a5dd5089fcf6c2b71e1be712f5e309235b2fbcce0cdc3c3d773bc8bf80f002
+EBUILD requests-mock-1.2.0.ebuild 1011 BLAKE2B d91a71608fa41fc0349486cd010fe7668c637f9e63b2bb83e6be592e5fe6d62c847ede85cc8764cacba970ef2a38168f19be8a7f2b8a275b2c3bbd2f67f0ad52 SHA512 9b3650afa9e8b6ca36e8a07d6d8da39ac9d8b788ff0f6cacdf34989109e34cbe4d03c39d60c3d4e36b973675b632ee2ed4799d72416d43268871108adae8d086
+EBUILD requests-mock-1.5.0.ebuild 1670 BLAKE2B bed4d761f1c37209818483fd670b512e1f128d571bc74f06fa013daf3c87733497b0c8d250b7d131d7e0436a9ea4b9ffed88cb622e9a753c83f3d6fa8657c6b0 SHA512 7d10c71598a1603a0d7bc910429f4c64c0acec8ed98a983d3943f59ff33d1811dd7c67193d1a03525d6a33b4162520d498622c830f641324d857f4546c37a86d
+EBUILD requests-mock-1.5.2.ebuild 1672 BLAKE2B 5dd50358a45d9af532454f3e8668fd2ee9187d7a352a9e8f8fb843626047f535459a5c3d3eec4b1ca73edaf14539c782f988c6eba5d221e491155f4a9cffc694 SHA512 3c9acc866bcec797347ef9c01373eaeafb1028f43da5c4d90125df56fa346d6d1dc4e5ba6e89c41f1f039cb7976afa6fe0154dc1e75a96e6b7d3fe30d488dfea
 MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/requests-mock-1.2.0.ebuild b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
index 1721eada7426..cd6180ff47cd 100644
--- a/dev-python/requests-mock/requests-mock-1.2.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-mock/requests-mock-1.5.0.ebuild b/dev-python/requests-mock/requests-mock-1.5.0.ebuild
index fc6b65d6b006..b198ce304c84 100644
--- a/dev-python/requests-mock/requests-mock-1.5.0.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests-mock/requests-mock-1.5.2.ebuild b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
index bd8946a4909c..668faaec8646 100644
--- a/dev-python/requests-mock/requests-mock-1.5.2.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests_download/Manifest b/dev-python/requests_download/Manifest
index 995811ea12ce..855efec675c6 100644
--- a/dev-python/requests_download/Manifest
+++ b/dev-python/requests_download/Manifest
@@ -1,3 +1,3 @@
 DIST requests_download-0.1.2.tar.gz 2584 BLAKE2B c6f2eb7a182e0f42ccb7b603dec47a077b1b946bfa93968972dce5267c7c51fa8c4158e15cd35621cbe229e12f6644db9734e52439796d8d8411be16a38e1e9a SHA512 99d4b275200c88befd2730d17a3329c8cbb155fa5cf9600a7466e8ab109f999a9fc9b8c668aa3b389bc2a3deb33b8a3fd390270d71f04bb0a8f998da67cfde82
-EBUILD requests_download-0.1.2.ebuild 823 BLAKE2B 2b22e8707e2db55ac181114a90d081ac741e108a0ccc6473c746a36badccc428c5c30bfe129bc086d7e75418ff76f142105f2dd98a0a4bee4e9ccd20018cfc51 SHA512 1ad1437f2fce2bc1f958fff5db38f35bd7fc0ca94ec0f95562f8d36e615450a4c2cd03be37e4d3878b627f93b055914d02d8836043e4adc19d31ed2538850d33
+EBUILD requests_download-0.1.2.ebuild 813 BLAKE2B eace37551ed157964a725b512f8ee629599910242a72f89bd0162d0d6e69b6b7d46a72d16602036b273b5cdd98f1e91e7117a6d53c612ce2107e78f90833148f SHA512 2aeaddca5fba53404c5cf2f31ae5cb6561879ed77ae39b5de98f0cc149ce87126de7f396ee55b679a6fe66033aec3f9506d0c7100ee6ebf671db1a194cf4d4c3
 MISC metadata.xml 408 BLAKE2B 2fa0562549efb76db2df8bf0485bf3fcd123de81dd29b89ea9d2a0b87dc72db068e577e4cebfc36c2569b2a4057d14ad26490b368770ec0e566cdb549b2fb308 SHA512 2fdfa8da4f76fd449807c41fd535356f388f71dbc8793a59b7bf2b04c9be3096900decdb014389097a43565642906114169163ab8d19dcd69901457dad3d9f6c
diff --git a/dev-python/requests_download/requests_download-0.1.2.ebuild b/dev-python/requests_download/requests_download-0.1.2.ebuild
index 5fbed4968872..a4eaf50913d5 100644
--- a/dev-python/requests_download/requests_download-0.1.2.ebuild
+++ b/dev-python/requests_download/requests_download-0.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requests_pkcs12/Manifest b/dev-python/requests_pkcs12/Manifest
index 10c0a8847c41..528322abc52a 100644
--- a/dev-python/requests_pkcs12/Manifest
+++ b/dev-python/requests_pkcs12/Manifest
@@ -1,3 +1,3 @@
 DIST requests_pkcs12-1.4.tar.gz 3884 BLAKE2B ebeb89349163d4f9995c00dfe3d725036a76660870d36203f47029f225698fe7a15993a9dd756e0b6b33011726ad26323962609bb94f223f4478096658f20a3c SHA512 f77703b7b0ba1f13aa095fcf4955f119c34a20e0601e0d6888a29932d8d4289548cf2b7b0e065abfea2ebcda542d48a4d9a3ded32974c1d24bdae223893f0241
-EBUILD requests_pkcs12-1.4.ebuild 573 BLAKE2B 77045cd12524ecc9605007ffde2ddd11ec417060acedd4059b84b704360f54d3e9eceae05aa806184c785879d892fc9d68522fe4c799883671e1671e165ad4f4 SHA512 6fe781d5e866d3d48c8dd5e4eb6a198d864074d543cc3a4befecaabaffde271b94df0823b2b190d9836c08c63869ea23eaf011441ea27d40fe3c99e7f772a8d8
+EBUILD requests_pkcs12-1.4.ebuild 563 BLAKE2B c1a003b7ecdb6a56e01d051e979183c6cf609383ffce06cf079e3bc6198be23a4e6dcd3647a8b8a6b97300c05c4b8964ea0093b944e9eb3b92e3afb5164d65aa SHA512 c4f0789660a93185f63ea59d746197f0f86fba1b29d9fc16b79d6081dd4f58802299d383a15d8ca05057ad7d48934b387558b68251036c88e9584d20563352bb
 MISC metadata.xml 555 BLAKE2B d70dda6dc42c1a4da489771576e149a106fd0dae72477045e98a57c2fcd04552057d526b52da2c1b1ced97a118a6c0d914100ebe0e2996a12cfc55c9f66da128 SHA512 3ae1a29b15280f429202f4b031ffde905a26056964ba53610ae29f961d3f7c2562b8a5d27d701b3c1a72204464cf5c4ede628339ce3e6874aed62f127523f32b
diff --git a/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild b/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
index 8f426e92ba3a..4e6a9dab7e5e 100644
--- a/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
+++ b/dev-python/requests_pkcs12/requests_pkcs12-1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Adds PKCS#12 support to the Python requests library in a clean way"
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 8ea5c939866b..b320206b8aae 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,5 +1,5 @@
 DIST requestsexceptions-1.1.3.tar.gz 6606 BLAKE2B 7dbbdc095ba1ec20b41a3c7a0dcef5f10fbcd8d9f6bfc9082bde09a23a9d75f1be96f79b74551691d038b758a7d7bd1568842be9fd139a4c4d3279e63376db9d SHA512 33a848b04db500b3481b7df2553e244e1967e5124de1606f73fb38f0b2681253ca2bd921386ce50f1144a8dc8d6f8e07be058a3d9f13c7831f77cade0a42fd38
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.1.3.ebuild 562 BLAKE2B 026a9895496439dbecee1feec168cf970e148ad30f451c7573840464f2f229cb1f1232fe7288a332dbe8b28e2a531516bb39864bf43ef98cbea8a5f4fbc4d811 SHA512 bd805ebca7bb797ed279fdd945b242559fa7967106dbfb1be8018115d3a81be6f01236eb6b3fcae34996c93fa84c7b3d1bc2ec1ad19300347e898c3b47c6bb96
-EBUILD requestsexceptions-1.4.0.ebuild 567 BLAKE2B d7d469177d4b79c3d9aae28dbc1c3e927c6b7981ab898c78842084606f4316edfb8ddea78db843090597a3788042d44851c110e2b3fc1dc1c8cfb5b53d83ac5f SHA512 0ffc6e76adacc3f2cd28f7c3c21c0b5402c6c0d30a194340ca27ecd2ab31a802724150805046ca2bf89927ff146856fa70aa5c6ac1031589cf57736d1016a73c
+EBUILD requestsexceptions-1.1.3.ebuild 556 BLAKE2B 8549637ea8141c2402779ba42b662c274a9b13ea7fdd53f436a87d8be1144188e3a3c11d286f685feae1d88eff05222d90440868b61733737441886ff832c768 SHA512 d7b6ad0338c19dda40515044955cfaac7ab49c8b0bbd142eefadc5af2ce28a732d655bb0106addaa4e9e8d0d8628c5437992997dcd6f95298cb57cbf009abf06
+EBUILD requestsexceptions-1.4.0.ebuild 561 BLAKE2B a6cd06a2c27db2a4892d6b175046a80c74095a559633f3bfc1131d259315dd0b67b8d0bc020fcbeb5ded2e8a824a12464fc6d818359c9b7704175135b9b4ddfd SHA512 c7fc3548f635db56f3e8e63864a14d48acefa7f3fb7b3a1567ed5940fa3bc4c4f5cc2403ac64d38c32447643f294c74091366dc553ac4453d393b68fdedf1602
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
index dc9d810bd514..cec3c0fa401a 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 375b7eaf772a..80335091eb41 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index 27e9094dda7b..7d45849b2530 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,5 +1,5 @@
 DIST restructuredtext_lint-0.12.2.tar.gz 19141 BLAKE2B 69e0cf57540d5ccce8572a8c619506e3b76fd08e88019bb66c7a18a3ca2c2b91e72797c70428156e570143d6352d529088c324b18e2a08b67a8acddda7378352 SHA512 2634d740d30cafd446e3b5d3ad22e6942ec8e15d20440abe9c31ecfebebc7d1f50cc41492863ff1e6b01a8a3ad7139aa10e94022094dc7c314709e6f72176870
 DIST restructuredtext_lint-1.1.2.tar.gz 25061 BLAKE2B 5be51fb40ac3eb0ba58c053d5b54d79e0d1c0687786a877cc37d2e617dec788782e3d4aade62828a267c139b7e311405552cb61eefdbaed458c2c1206245a422 SHA512 f44eff61df3581ba345fb953a09d9bf6977003e05078bacbeea27287b0b14a6f16298db0bde5be4ebfd0843eac33de623db1e47ce6475b30dce47cdd3e9ea5d7
-EBUILD restructuredtext-lint-0.12.2.ebuild 626 BLAKE2B 55cf97b18539b1759504ac70c8eb79b2f9af06ee7f1d38c12839940799383b52721c60549d1b90dcf5fae1c28e615ddbcb6d3738e77742a251e5de5b8222b325 SHA512 fb6669e3b13ad66fe7cb4947b8a4d427dabf9210819ca41c6af4b29e68f7bee59a9c5197882eb1e33bd075c9d7a04c67559d4e9e9a4f16ea68c550eee22de233
-EBUILD restructuredtext-lint-1.1.2.ebuild 789 BLAKE2B 1e1ccc2b5b05cf1c45d41c9d0742b3daff40a6701ad9ebedd4b0527cdfaf9eaa4190c56d17adeb54a77bc14752dc13fd4cd47ff6527e5056bea9267495f9f71f SHA512 8327ab791b01bc3e14adc97cce78896a3fa0b639d12d5063c0bcac4c54b8740c8432a5ff0a95b1473746d2f261735d428c77debaf6cacc0c61a4485ee07141f7
+EBUILD restructuredtext-lint-0.12.2.ebuild 620 BLAKE2B 002dbf00cd66b1c9bf808c2d703f5d9a8ed661c6951ed255bf898760a812698d7c76442fedafe840b20bbfe3a6035c1239186257a4f2114fb8e37cf5a69f7100 SHA512 99921e193fe519121d28fd1cd8c6f13a0b62d585ab95467804a7209f58155209b80a826dcde7f03948d224ad97cd777a64457f7a7c0524dd3b195e049e364184
+EBUILD restructuredtext-lint-1.1.2.ebuild 783 BLAKE2B e989b21092500a41a17c41b9e0f5e389fcfe94fe1946277166c195cfc20e469bd2e93c99418206beb1e3b02bfeab99c747a025af990cef1588bdce0cda5d29c5 SHA512 643762dfe5d82538321e0756690d201023ca35ed94210d4e11b2092caf68b8bffa5a1c07ddde0ef67a3db4cebd531427b4efba217eb50c810aa057f696c8443a
 MISC metadata.xml 338 BLAKE2B c30f38fd31f802cfdb9dfd57839acc4269c793aedde4a2c17e937f62da0f04e94ccf2cd309b528f9c5753fdc747951ace9fd27a403d32907751ca1640955a3e9 SHA512 50f218c3b3fbdc1b639de1fbeb5adbcd6b6864027331f4521c4d52ba5a66d7ff98b75f746ce29dc8fc454ac8d3e12012cb53e8d8b0b157813a4b359d27760265
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
index f6138f0f3dc2..a6b14f3668e5 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-0.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
index 8dd05897ee67..7821756a7efc 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index 87cbfa0380d2..2f6eb304d7eb 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,4 +1,4 @@
 DIST retry-decorator-1.0.0.tar.gz 2835 BLAKE2B b04d127ba3d357a61fb5e35a63867b297834acd82d0d7cdf736a69efe95fa33a263309799dcd4d8ae42e72ad5adb12b6c52557a81413ee8ebc49f5e0e728fa8b SHA512 f650740dd6d05010b7418b4d5ae7351058eb4418dabf7329390eaacceb72db60363bae8ff0bb15284301f0b5bfd9bfb731e71fdffb7231065a4db7ed6ce86da2
-EBUILD retry-decorator-1.0.0-r1.ebuild 542 BLAKE2B 98b42367d7a19a6ac3c766797efb4c5db526c6252abc91d68b334fc7ba328c8b2258cf5f1d8fae9ac279c5a2ca3b524905e55f633f739409eb50045a30565bc0 SHA512 4eaa7e78717d19db5d4b225f6448018455ba927e0df23f54cc94c0cf44723cffced5da507d95c78019ba604b5c18be1b3f55779d0b559a17b8b413e60262e31c
-EBUILD retry-decorator-1.0.0.ebuild 550 BLAKE2B d69fde6c37b5a2d4e74701798e07e2aec0e5f086ff95d827c3d61028f689e7e72ac1317e55ccd95c55f8487c3bd668b09a4957ed6f01b988e34fe4050dfefb13 SHA512 b0ffd6cdf2288d1c63c426bc7ae26f5724decc6374e2eb7efe8b8a9fcb31b3ab0494e6db6bffb035be69ef630f31c00e35cb6ee9c34b08364a0fe2a9c53fbbd7
+EBUILD retry-decorator-1.0.0-r1.ebuild 538 BLAKE2B ee98b296f708febbfcc805ad4e89f4693aff12ad2488af98edc27228cc3de9a2e2b53ecb3d6f403f2d8ba0ff4bd829fc3651376e9b2e747fc234d4514556672e SHA512 171d5be65459be71b4a1ac42d2140d8537e006454032b65ca6cb9013d609c9df55118b53f5ecda2d54dea08c47048485074431228b1a45370ebb3737b4a0c4a5
+EBUILD retry-decorator-1.0.0.ebuild 544 BLAKE2B cf96b34ce2e019a51f61432837a96bf4bc381fc13e810c198554087233af50ed72a09e1b23619e29c646e4aa957dce06b4c7508c8c68eae9cd20b66fc98876df SHA512 f46c70395fa0e653be65e362088237e0073ac0a6760f34fee6fbebc77607b547dd3457b6da0c2f83f35c0a4b55c29cc19d6488eacd0c39743ea6453bb3d9a958
 MISC metadata.xml 337 BLAKE2B 29715a3b27a3e28df0232103e6f826dc37f91a4ca981b25b3c4a786beab1c242db13fb942c1fdf0d646567439f7221862ff50c77ed87d376aa6ed6b04686434f SHA512 b94863fbe276838245ce8de2206145c0a0953cf8ec520ccab8dd4c01d6a58d191740c7ea1af0c1692567f41660ff009a5f5cc3147126e21299864d5957c979b7
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
index 8883a7f3f76d..9a0a1e26b202 100644
--- a/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
index 6811aad6e89f..45b870f72158 100644
--- a/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/rnc2rng/Manifest b/dev-python/rnc2rng/Manifest
index d87b6338beb0..bbdc342bf3f2 100644
--- a/dev-python/rnc2rng/Manifest
+++ b/dev-python/rnc2rng/Manifest
@@ -1,3 +1,3 @@
 DIST rnc2rng-2.6.1.tar.gz 14330 BLAKE2B 04d316f03da1e936603ca69cf5c8e087dd3a45f457d2b245452544e2a74a730d4c20a655a3eea5856f7f91e9154a7196bee89e8cc052cae887c6188da89b0574 SHA512 ab18b713d8756153fe03c76901dac7b090c7eab12042a251f2e97d7ae4e1ebfdf969a826305704f073c9df5a0980a6d8cd5d4e7a12a8caed018cab46a9196159
-EBUILD rnc2rng-2.6.1.ebuild 540 BLAKE2B 120e8c650dec7da9a8a8a6f5a06a236e1bc2659ca05fa622c7d35f3fbe9aca05ba8bab4f11411715f501001ec54b6b7923671d79a3db7b2e4fcacde519e73987 SHA512 1b1387981102a80390e313a02ca52c53ff72ff2936603f054eb7a6bf5a7bce50075cdae06d99328bed7a9833ead1009a3979ffadbe189ca0591ea1da0a53b6cd
+EBUILD rnc2rng-2.6.1.ebuild 530 BLAKE2B 0d7182953a75186e6819182d7b52c4970f0ebc29b8e5ac1b42a7fc06f338e72e55f7a5c262b6ff532b2507c71bd6ab6fe712afddebe8f91cffb6eea29130a0d3 SHA512 dcc21fc62363aa6aa99adbf82b39e61bc3dbf58fd9d636ecf89143a6e1a4c61f5bca1af8bc363c74bcb2a58a0f33ffbe0b3e618e148737a4af3dca822f081546
 MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
diff --git a/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild b/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
index bc7ae740e20a..30df505f088a 100644
--- a/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
+++ b/dev-python/rnc2rng/rnc2rng-2.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/robotframework/Manifest b/dev-python/robotframework/Manifest
index df2174515841..d03154fa6108 100644
--- a/dev-python/robotframework/Manifest
+++ b/dev-python/robotframework/Manifest
@@ -1,5 +1,5 @@
 DIST robotframework-3.0.2.tar.gz 440465 BLAKE2B 912aef05655fc02b0ecc41fb435f97f473638301eb5c8b84e20833a5d33ffc7928c02d07cda0cc7d0854545d6b22025e5eb2ab7d550ce9a86d3ed18cbb468847 SHA512 b03fb3db627fd6b598615989c09e213cf79cbc7dbe7a08087c483dcc688f45782d54b9f1fa45206fc5adc43db9f2d862ac8f96c0b5f209ada1e09e5506171b4a
 DIST robotframework-3.0.4.tar.gz 443354 BLAKE2B 1b9b048cc0e5ce9d13a7bbe54e659f5010236a84771f391ad4ff7f9c98d5ffa9d6e6f4974572b901a1804d8c12f5c2b135f03b2d1ae3a4e840103ee2f39e411e SHA512 be975099e54e265131b94431347d093a5b844bcbd24ecde7d4af4ccc97b51184e4b60572d8a1187691eacd73e8e566fda56a200ad30c7438a557752414524bbc
-EBUILD robotframework-3.0.2.ebuild 448 BLAKE2B dd8f23de11c5c55b9f4a16f7f4110adbb6a3547b1795263bdfbd8f043771e1d30fbd28503feafec1a065b3b25212483b34df4397352aa99d10aeaf7551c6eed8 SHA512 cf112734b9b7f161ca3273d978f0efc5184c7d2a0e9fa4e535da10dedfe1af3344b70c00632c51e46a875e6a9865c45d5f19c071ea2a8fbb89156c77c70d57b9
-EBUILD robotframework-3.0.4.ebuild 448 BLAKE2B dd8f23de11c5c55b9f4a16f7f4110adbb6a3547b1795263bdfbd8f043771e1d30fbd28503feafec1a065b3b25212483b34df4397352aa99d10aeaf7551c6eed8 SHA512 cf112734b9b7f161ca3273d978f0efc5184c7d2a0e9fa4e535da10dedfe1af3344b70c00632c51e46a875e6a9865c45d5f19c071ea2a8fbb89156c77c70d57b9
+EBUILD robotframework-3.0.2.ebuild 438 BLAKE2B 36616e95c163227410f981439e0cccd81ea7777ccd9170231f5db67eae43901796e3427b240b0587823bbad79cb0484d20f399236547975f3f5d55d280cef62f SHA512 d80326e96a8fed1b563bcbc0ba34653ef6ae8c41261d25fd1815174d9b0b4bbfe30ce5f78eef0546bde8e24797bdab0cce3f3125a2e14043e4b8c4efeb5b67e0
+EBUILD robotframework-3.0.4.ebuild 438 BLAKE2B 36616e95c163227410f981439e0cccd81ea7777ccd9170231f5db67eae43901796e3427b240b0587823bbad79cb0484d20f399236547975f3f5d55d280cef62f SHA512 d80326e96a8fed1b563bcbc0ba34653ef6ae8c41261d25fd1815174d9b0b4bbfe30ce5f78eef0546bde8e24797bdab0cce3f3125a2e14043e4b8c4efeb5b67e0
 MISC metadata.xml 398 BLAKE2B a5783e7341b4070040d6e6861126c20af2e3ddfc0a3dfddb537fad607ac469341cd30376e3ac7a236ea85987c36fd375566643fb65c9f59d2d19e486f1abd8a4 SHA512 dda41087fdeca9037dc39e9ad88a5b7e4ac8472d029a295fa5bab73a189a05ce70b0334d56fd1b45d45d1120fee2af16114c1bf5721b891df53d2a13d470d9d0
diff --git a/dev-python/robotframework/robotframework-3.0.2.ebuild b/dev-python/robotframework/robotframework-3.0.2.ebuild
index e07519e4dfe5..e6f3fc08865e 100644
--- a/dev-python/robotframework/robotframework-3.0.2.ebuild
+++ b/dev-python/robotframework/robotframework-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/robotframework/robotframework-3.0.4.ebuild b/dev-python/robotframework/robotframework-3.0.4.ebuild
index e07519e4dfe5..e6f3fc08865e 100644
--- a/dev-python/robotframework/robotframework-3.0.4.ebuild
+++ b/dev-python/robotframework/robotframework-3.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 70ef9d4e01a3..53986942c1f0 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,5 +1,5 @@
 DIST roman-2.0.0.zip 7590 BLAKE2B c733a4e905ebf4ef526afb5088744bde8558314b059a4d8e9f86e914af2657f99b5c4364e9e8f9a11d9a1e4470ba9b1919b19951aab7dc06b55539d27b89ab30 SHA512 d62a95e835232821dbf7a81d0c6b7df63f18c4116cfc7eee0c691a0b31d3d7b69d2dc2e4ea26e0a169a8e24bf080e8bb1e195b853be4adf1491335a5b4d5702c
 DIST roman-3.0.tar.gz 5184 BLAKE2B 0951e15a1fbf0feecc98c4318fa631a535d24d9559d21e800f065923c71d094c387b18c5926ad55322ad8417a2db97626ada1e110549938d73243ca410e3ab87 SHA512 468a4ac7188cdf3155698f260de5ecc5bb2072c120c79d046618ac07b6de6f777cfc69661f2e0df4ca66359bb20169d22599b3f342edaa48f8575bdc17b40c08
-EBUILD roman-2.0.0.ebuild 628 BLAKE2B b3636719c13a5ca264fc23ea7a893a5bf62b5a9ceb704751377b67432060f81129d9fe1f6ada4fd721ccdea6c4c02a878e9a789f94619473f4f76f3ac6707b2d SHA512 189e800b4bb6c077f2844bf5a3281e8a9b53475fd9c9b33604b44ffca3e30eaefb920489e6ee8ac31e1f31ac0d1a23c60d7459685989216b4354c1ba6d0a9f64
-EBUILD roman-3.0.ebuild 622 BLAKE2B 869875e3845e34f85162f5231f072b74571304911a34f805075bb2f34fc6bf9b75b2cc400369df522d9e6bf42aaf9dbd8ee147548df35df0ae0bd242b99eca49 SHA512 5bd9c2ef2ed559bd4bfeb725c898c4d9a68f91ae3f9a13608941f398c1183396b4aa8b7926b4c0952b6ff604d23aa5115e07e025e91c8412cc6441873690ca40
+EBUILD roman-2.0.0.ebuild 622 BLAKE2B dff7699b54a19dbc81f7af565317a58ed0473c2f2b6e7c857636c2d980f279aa2463862fe6b9638c7164e5ff63f84a7d8474f54bbbee07a67284a72fff6822ab SHA512 af220d54cc5150f0175c6acf43eb2cc375e92e4cc3c3e5ff38545a52512553fe2d417e901a978ffdb7b18c7d6de65212aace301d32f12d26e2ab075506d0d88e
+EBUILD roman-3.0.ebuild 616 BLAKE2B 81b44aef4191c4c93e2cdeb823d3a5c990475683d2628d4061b32433d1bc59e7f192a8f8e67a05294e11c281893b1154167fea0b556d723147f68dcc5b23f27e SHA512 08d8e06a697ddd356414158502c5d03006e6d53da33f70e539f85b9281cec646745f3a8274724f88b817967cbdd06a26b94edf6e072cabf805a547120dcb5689
 MISC metadata.xml 318 BLAKE2B 3a028680f19314e15a2eab93b8bfe5338ef3b351e82f28ba7eb1d0988ffc0f9eeb9174f30c18c0f7e10b865958a5992043525baf6e25732ce85d819c65c9fbb3 SHA512 a2e3ce30465809bbac2a6684207eb0290787a1e2eafebb457a6754e474340f75208dd269f7d89f2fdf25a3529340310acc9c220feaa1be40fe688a177b2741f0
diff --git a/dev-python/roman/roman-2.0.0.ebuild b/dev-python/roman/roman-2.0.0.ebuild
index fe5f70808435..42f9d3647899 100644
--- a/dev-python/roman/roman-2.0.0.ebuild
+++ b/dev-python/roman/roman-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/roman/roman-3.0.ebuild b/dev-python/roman/roman-3.0.ebuild
index 1b2c9fd3542a..6fbcfa0b7a91 100644
--- a/dev-python/roman/roman-3.0.ebuild
+++ b/dev-python/roman/roman-3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/root_numpy/Manifest b/dev-python/root_numpy/Manifest
index dc66e717eba8..10b08cdfce83 100644
--- a/dev-python/root_numpy/Manifest
+++ b/dev-python/root_numpy/Manifest
@@ -1,3 +1,3 @@
 DIST root_numpy-4.7.3.tar.gz 522432 BLAKE2B 9aab3090c894d8917218a68d83269c0f426ee4e7f81628081e9e710c4239bba5e8f88dcb1d91156cf02c7c36b1ee5d03cdd0c3931ca6e2f3eee6c78201386705 SHA512 7c2684ac0e4e68676304e2a72c7169e0299cfea5b4b63f2525a422974ca83f9c9b4f9f11d992acef7d8565cda7f7a85bd13621513cd7c47f1887aaa0cc46d6e7
-EBUILD root_numpy-4.7.3.ebuild 818 BLAKE2B 3a40e32386bf2d835cc900394ef89fb94ef9ee7f94412700d8af624a2b8cf424d8bf14f114b895135efcb4c6d693757f579ce2163ee813c6634d50a4a5057387 SHA512 8314d1c7963135d1c7b76d46452f089e9087b9937061644ec13e0717285d43decbd0c3a125e6bcb61ba97a22ef06bb66f569c12b2447f21981e8f2f79e27a613
+EBUILD root_numpy-4.7.3-r1.ebuild 901 BLAKE2B a5197332128ffe48cf61699269b2c2fb533bc3b4eba9f81897d3dd9519cf46c0c781da28d61d053c7fb6564f26272795aa8cdd0f6f5497c5e508930b85cb2d5e SHA512 cef3ac81066b2f98a05f76ce65a8b82b13eaa9ab8c55333769f33e38b3ee27acead5422a4b491661079d371b6baf3c60daed92ba0e5222c6bd4f8b7e3fd14f70
 MISC metadata.xml 898 BLAKE2B f9b4c5ea3d9d901488196239d8076a31acce527480fe3775d1c83545b3436c3c78c21032b7e25d4f8ebe8634dd6c906fa959abe9e68a2b92705aa9864a5afcf3 SHA512 f013cc8dfb3cb8887bb87195d69c765c39262b4d71fbf92bb46a39915b609469a351efc31e130b313bd8379b2a3c41b5927bcd86be5cad8933acf282fad20cb7
diff --git a/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild b/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
new file mode 100644
index 000000000000..c5305f468915
--- /dev/null
+++ b/dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Interface between ROOT and numpy"
+HOMEPAGE="https://github.com/rootpy/root_numpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
+	sci-physics/root:=[python,${PYTHON_SINGLE_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}] )
+		')"
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( tutorial/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/root_numpy/root_numpy-4.7.3.ebuild b/dev-python/root_numpy/root_numpy-4.7.3.ebuild
deleted file mode 100644
index d76b31455628..000000000000
--- a/dev-python/root_numpy/root_numpy-4.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Interface between ROOT and numpy"
-HOMEPAGE="https://github.com/rootpy/root_numpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-physics/root:=[python,${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( tutorial/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rootpy/Manifest b/dev-python/rootpy/Manifest
index ea6f41d2c56d..13ca8bde87a5 100644
--- a/dev-python/rootpy/Manifest
+++ b/dev-python/rootpy/Manifest
@@ -1,3 +1,3 @@
 DIST rootpy-1.0.1.tar.gz 418618 BLAKE2B ce321e69d7e202877697d133ad2ba90df71cd261b206211718cb6a9ec8ee3ec085cac49526b9bb75166fafeb43f83b3f53bf231d9353f3d63fa7e4be381ce454 SHA512 db1c7edc02d1cd5a4a1940237c1e1c63d892bb92e612bdad028d14f9723a4bdc5f9b6711a135b0e099ce1895b2564b29aeb21ef0d2c3681354bf4edc9c6a325f
-EBUILD rootpy-1.0.1.ebuild 1061 BLAKE2B 5efc02ddedfccd590f2482764b138f0bbc46d472dc8567c218e9249e7505b0fe9228359492b176fa578ecfdba613cfeb6c8b5590db75c22f5bb178c14a199f8d SHA512 62edc05a31f5dd14c88aa65356d37b04021f111bbaf128268b0bc31c2c1d66bc0e2d1718dc7ee97d342bd3be8247532cf02b988cca63ea46fd21c01f490af3af
+EBUILD rootpy-1.0.1-r1.ebuild 1142 BLAKE2B fbc07222f4504d812ca4848665ddea4b149f92b437113d0e7c0179b49b55ac296b3f74f200c19715945c6d6f93970664ab1ee067e7ad0bf112fd29bb160d185c SHA512 9798d67ccd79888d8d82483a051511da29ef4a49390258126f992ad8d4184dd7bbb2332e9baa03509a17ffd3e42e079e8321f901298aa6dcfb525f2f5f4375c3
 MISC metadata.xml 525 BLAKE2B add8ec7423df97b01b5b9cad45c04339bd8aa2fcd62be3bbae15b66d9520603d7ad9c31232a7215fe68cf706f28348be54b38ca8bd05923a677b6c26ecafa7fa SHA512 6987f42215b8a3160a7e292499f63e26c05c8ffef69f7ade03fb4b539fb0116f14d7204602264e237d5c4e75436794770061c4d0d508072c06e24c1eec500094
diff --git a/dev-python/rootpy/rootpy-1.0.1-r1.ebuild b/dev-python/rootpy/rootpy-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..6b13cc9333d3
--- /dev/null
+++ b/dev-python/rootpy/rootpy-1.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="readline"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
+HOMEPAGE="http://rootpy.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+	sci-physics/root:=[${PYTHON_SINGLE_USEDEP}]
+	dev-python/root_numpy[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytables[${PYTHON_MULTI_USEDEP}]
+		dev-python/termcolor[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DEPEND="
+	sci-physics/root[${PYTHON_SINGLE_USEDEP}]
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+# TOFIX: tests go in an infinite loop error
+RESTRICT=test
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/dev-python/rootpy/rootpy-1.0.1.ebuild b/dev-python/rootpy/rootpy-1.0.1.ebuild
deleted file mode 100644
index 6146c30b7abf..000000000000
--- a/dev-python/rootpy/rootpy-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="readline"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
-HOMEPAGE="http://rootpy.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
-	sci-physics/root:=[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pytables[${PYTHON_USEDEP}]
-	dev-python/root_numpy[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]"
-
-DEPEND="
-	sci-physics/root[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-# TOFIX: tests go in an infinite loop error
-RESTRICT=test
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 920dde457465..252ccd46262a 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,6 +1,4 @@
 AUX rope-0.10.3-doc-syntax-errors.patch 1207 BLAKE2B 2eb81ffc507c532feff64a09b04e9c098e0d52f702048b2e69abf53b0099454edcb82d866b8b7e83a77e493495a15e3e944f376aa2d1a0e3ddeffebb2435745e SHA512 6bf617e20ef8810496b92cb5e55240622ea7285c435b090254cd9211a29f0c8d103322ed772424cdaeb528dabe1a606adea95647480fed9609e71c29584faaf3
-DIST rope-0.10.3.tar.gz 226123 BLAKE2B e7f29545280a8615486547a8c29f44894d3c84659af9cb87ac596238a829f3a21a778e92ffe7e260cf27b52639983be1b3d62b38a727ce31a9c7ec225abc76ad SHA512 1d868aeebd086c3fc199316a71e61a8c46c76d85176557842051bb8f51d090f316df6bb84f766db5a46dc164d3e471eb90465805a102e46acb34e39b2b0ce8b4
 DIST rope-0.10.7.tar.gz 244089 BLAKE2B aebc1eaa3715aa4f2423490790f53040ad256fca35b3ad7b516e6b1f0af051b79f812f7b701ff5ac2414dbf2d1cba319da0f4cf241041329c0c750ae63e0ec33 SHA512 80343b8b7af883afbd04734b0fe4dbdab114301234654cbd95b3ae8be8dff40878105b7647209f5e899b981ab6a7ecb987d9bdf942b32ed083c745128c22ef95
-EBUILD rope-0.10.3.ebuild 1033 BLAKE2B a545fd4b68149939f9d6e07a207d16f4a9ed7934a0a4e4d8a08d3bd70cdae4a5fcedc8430dd6db22f7d474c7c233df837af22f771b2931c8f2b70d1010b22be4 SHA512 78312c709aa2298027ff4a8340b5fc010d742233db9acb1715eede323c85448e96b4f65f7d506bff6374b9437fdd8fae3c8dd85264f78c4922c5ce313fcf911f
-EBUILD rope-0.10.7.ebuild 1123 BLAKE2B 83aef06bf60fea03210bfa9a3f8e2ebfb6413997eca9e54362ef681c7fe0ae51cb53b87122fd093128281b3a9b509d62a2bfa467194463005d3d5fc97bc8a492 SHA512 453745e03dd6b3024caa4ed62867b486335247eaf4f30014e87f09f3fa09f1b728e9b0d3969c53ead6356720b66b2aea04c3a84bfd65c20c79028b03912a2eae
+EBUILD rope-0.10.7.ebuild 1113 BLAKE2B b2604b27be6546a38eaff0afedc8ba2cc02fbfc25037374be85bd5c0660b02e2d594c9f7eeaeaa35b3045c7b1bbadedfba9f8a2e7c2ac0a552c8037155a420b8 SHA512 9cb3ab0f5d1695bd1c7dbf4bb85c7b14c25f587693e9e75f19f6c54333704185f982e43155446fa472cb5b51dbaa649f28ecca201b110869fc0ee4ab99eb0e44
 MISC metadata.xml 517 BLAKE2B 165eea4dc0b2ee1244b9b94f3763c90692c6483d4c09b6535197b34ace789d364c2b63de1dc9d50645ec01cc2975c6f20a95d7756c2bac78a40733e343b7968c SHA512 6289b55677d1e26372017042042229865bad64a396952c21a7d5a1f25322c2ccfed11c0a9ea0c0896573dd1f04dc3263dc3eb28ff7b0b804c2bddf231e924630
diff --git a/dev-python/rope/rope-0.10.3.ebuild b/dev-python/rope/rope-0.10.3.ebuild
deleted file mode 100644
index 520fe2fecc00..000000000000
--- a/dev-python/rope/rope-0.10.3.ebuild
+++ /dev/null
@@ -1,44 +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="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-# Dependency for docbuild documentation which is not noted in
-# setup.py, using standard docutils builds docs successfully.
-DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-doc-syntax-errors.patch" )
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib:." ${EPYTHON} ropetest/__init__.py
-}
-
-python_compile_all() {
-	if use doc; then
-		pushd docs > /dev/null || die
-		mkdir build || die
-		local i
-		for i in ./*.rst; do
-			rst2html.py $i > ./build/${i/rst/html} || die
-		done
-	   	popd > /dev/null || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-0.10.7.ebuild b/dev-python/rope/rope-0.10.7.ebuild
index 8d64d89e6545..9e15a0c71b81 100644
--- a/dev-python/rope/rope-0.10.7.ebuild
+++ b/dev-python/rope/rope-0.10.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index db859f7c22e2..3dbb2ab15805 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -2,8 +2,8 @@ AUX yaml.patch 10168 BLAKE2B bd9bbcc2d5cb1fbc99ccc6f61e72057efa75882eb18d5bd676c
 DIST rosdistro-0.7.2.tar.gz 60091 BLAKE2B 40f2a47fcf5a13d0b8b9eb29fcee9bfbd811a7541dac74e6be76e2c67ba34adf0b7c2df8804300e35262bbb36efa890128e06217c93ecfc834015010e344e42d SHA512 ca6c0d19c2218efe8bf27c1cc22c4c9b683dccb5f8029208e0b581cb358fbe32733895896b1afece45b6576f254f4535032cea962587aa47d93235767c6baf60
 DIST rosdistro-0.7.4.tar.gz 60365 BLAKE2B a2b9af6b584abc057d0b5e7d1087438834801eea33555fb094bc938e1ec642a5d41057f61ee3d3f80ca3ea083e8cb6989f6907cfbc9973067a32d0ee505101d8 SHA512 9e2cbc88290b3a132fa5aeec446ca25a89365367a57a97f49cc26533139f91b2a50a1f2f6176f4333900bf7fa21d49c9836d65e74dc8322fe8c5811c49794291
 DIST rosdistro-0.8.0.tar.gz 60527 BLAKE2B 9404452dc62c9f7d1482de3c13df0093ac26a60554c97fa097cb14548cdb814fbdc96a26db2d24aa1f2eb99de86f27807ecdc50e0e00a8fa727af8803ab5d644 SHA512 1f4620454f78bd03f75a8b1b8535588a8d6e50aeef17dbf346e8d0443a6fbc5ec83646767bf86521fb65508e205fc3edb8f0c97a81aec8d6b72088d9d78a14f0
-EBUILD rosdistro-0.7.2.ebuild 1054 BLAKE2B c01d056b6569c4afb956b8818a2e15135b8fe2af86bc97e40dc8e050f403716967bc406ce5aaa114d054ba911dc886b3697adfc948891d4cd5dcc578be2f80d1 SHA512 d3befaf3723994c7a39b0ef913fff5d16f4e269ee2debb19a81dc15502ba85878325b2bfcd501714a302006e423dc4c028d0a4ffb05d9c26652597e906669471
-EBUILD rosdistro-0.7.4.ebuild 1054 BLAKE2B c01d056b6569c4afb956b8818a2e15135b8fe2af86bc97e40dc8e050f403716967bc406ce5aaa114d054ba911dc886b3697adfc948891d4cd5dcc578be2f80d1 SHA512 d3befaf3723994c7a39b0ef913fff5d16f4e269ee2debb19a81dc15502ba85878325b2bfcd501714a302006e423dc4c028d0a4ffb05d9c26652597e906669471
-EBUILD rosdistro-0.8.0.ebuild 1189 BLAKE2B 9e730fc6b33b4295ec2210bca04880872327888190c3d15a196153eb03478290b24c010f5be6268ef804261dda074d40ecdfd7bb9faf890454fb9743f25d3105 SHA512 e5d2780976287d8e317a832e15171717a2e12d20f8c24d3494d5446980c99b31955055fa905e3968a49039c7f4068819a5b818b3cde59984e7d08ca9928e6f60
-EBUILD rosdistro-9999.ebuild 1189 BLAKE2B 9e730fc6b33b4295ec2210bca04880872327888190c3d15a196153eb03478290b24c010f5be6268ef804261dda074d40ecdfd7bb9faf890454fb9743f25d3105 SHA512 e5d2780976287d8e317a832e15171717a2e12d20f8c24d3494d5446980c99b31955055fa905e3968a49039c7f4068819a5b818b3cde59984e7d08ca9928e6f60
+EBUILD rosdistro-0.7.2.ebuild 1048 BLAKE2B 144230dbc9b5c9b58081c34d527e30c943eb6469b5126b71bb678483534df898a761bc441975a977b3235b6655a755ad0d7242e34c9831a6750bedd62d3c1bfc SHA512 29acfdc48cfbad893e19b1e855734cb24bfc94271e199a667400cbf5d6582293b73dff689565f29cebac2dd3e58b6ff92093408f5c6f15f0cd6310228a73d4b9
+EBUILD rosdistro-0.7.4.ebuild 1048 BLAKE2B 144230dbc9b5c9b58081c34d527e30c943eb6469b5126b71bb678483534df898a761bc441975a977b3235b6655a755ad0d7242e34c9831a6750bedd62d3c1bfc SHA512 29acfdc48cfbad893e19b1e855734cb24bfc94271e199a667400cbf5d6582293b73dff689565f29cebac2dd3e58b6ff92093408f5c6f15f0cd6310228a73d4b9
+EBUILD rosdistro-0.8.0.ebuild 1185 BLAKE2B 194195d066fa2ada7e8b10f1da51c9778f0e783474247a36f404465bd83e7cedf9742f260aca0fdffca5be85d7bb38c76cdb4903068ebac8fab608b81b8d233a SHA512 8ef09a80aac008452994b2405ff7306a4b1afc3494901d01ad18d8ee2324598b2fe5646b204b8b727c18703d693501073f69399def3c87ff020ba6e34e302642
+EBUILD rosdistro-9999.ebuild 1185 BLAKE2B 194195d066fa2ada7e8b10f1da51c9778f0e783474247a36f404465bd83e7cedf9742f260aca0fdffca5be85d7bb38c76cdb4903068ebac8fab608b81b8d233a SHA512 8ef09a80aac008452994b2405ff7306a4b1afc3494901d01ad18d8ee2324598b2fe5646b204b8b727c18703d693501073f69399def3c87ff020ba6e34e302642
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.7.2.ebuild b/dev-python/rosdistro/rosdistro-0.7.2.ebuild
index 1366af7507e5..8f24456c5e1c 100644
--- a/dev-python/rosdistro/rosdistro-0.7.2.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.7.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-0.7.4.ebuild b/dev-python/rosdistro/rosdistro-0.7.4.ebuild
index 1366af7507e5..8f24456c5e1c 100644
--- a/dev-python/rosdistro/rosdistro-0.7.4.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.7.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-0.8.0.ebuild b/dev-python/rosdistro/rosdistro-0.8.0.ebuild
index c4a885cba031..7455f6d0af0c 100644
--- a/dev-python/rosdistro/rosdistro-0.8.0.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index c4a885cba031..7455f6d0af0c 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 0294fdc01c2f..27b8eb249720 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -3,8 +3,8 @@ AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868
 DIST rospkg-1.1.10.tar.gz 90434 BLAKE2B 1eb128d7e3f6d07e8309ecf5ea6c4340afcbb6f0618fd4628543c046003782750c5013c13ff2ed17018abc6efc6ce2042ccf2c6dccea8933be7045ddfe3f4522 SHA512 54b1b0ca4683b9388989501781239cf35873f2bf2028d176718f624999835b21e44f0cc5988624b37f7172d21f0c01aa336d35a884753c842098e558c37ac6c8
 DIST rospkg-1.1.9.tar.gz 90412 BLAKE2B 4cca7d1ebfcba495aafd766f0d720a6bc6e5aade0bff098d4a1cbab3b55c7a720de7d1f97edf806a93cc21eeda4cac86e844b5e3b23f85cbcb7b328fd07da222 SHA512 d33005e29313ba06959189f8f563361fd9523c2368855f260347b4c509d8b4053f74db3e2cf5986031653d647ded097f272f65d617da93e13cf77a906cb56ca6
 DIST rospkg-1.2.0.tar.gz 90516 BLAKE2B 0c1d993c70f0ad383ab457c846416a22b9adf9611704a918c3765659231846749228073ea04950ddfdbe13f7e51f87ce5d17c1488f995e846a6590a0f9549efd SHA512 f059259a38b8b2281496a69f8a55fdd31a11e91583babb82e574363c40c90221a4abb7c1d7a5ed6be3b2389ee6aaf08b4e016260c73dd779f8c7993e6eba78db
-EBUILD rospkg-1.1.10.ebuild 1130 BLAKE2B c21afc2be0e8cfd6d96bb4aa2f090e728282e8c26fcf5c002d05e5b1c16dbd0ed0cb396731ad0c95ba8f93886d9474545f5c42f730061258e33bc996dfc4d845 SHA512 fc73aff4ef1b12a464000c6e406f43d25d0002465004799e7585a7dbd2cabcd402e230d2a181963b717bd321183a487658c74a04e53f88dc5ae28604a7b938d6
-EBUILD rospkg-1.1.9.ebuild 1130 BLAKE2B c21afc2be0e8cfd6d96bb4aa2f090e728282e8c26fcf5c002d05e5b1c16dbd0ed0cb396731ad0c95ba8f93886d9474545f5c42f730061258e33bc996dfc4d845 SHA512 fc73aff4ef1b12a464000c6e406f43d25d0002465004799e7585a7dbd2cabcd402e230d2a181963b717bd321183a487658c74a04e53f88dc5ae28604a7b938d6
-EBUILD rospkg-1.2.0.ebuild 1205 BLAKE2B f33225623c87e439bccf02c9b8a8c5d27fadced5be4fe375ac7f6eb00e941117abf955b9bd0f497027cc2e131498d0a5a52050038ac93f68fb71e6e3a471b91c SHA512 8b1fa2c5f49f4a127a53e781f0055664eb8d38eb35c200acd83e510dfe1ed3bf890893bb2db142c31656154827764275ad13b7cec102ee929396b6263049acce
-EBUILD rospkg-9999.ebuild 1205 BLAKE2B f33225623c87e439bccf02c9b8a8c5d27fadced5be4fe375ac7f6eb00e941117abf955b9bd0f497027cc2e131498d0a5a52050038ac93f68fb71e6e3a471b91c SHA512 8b1fa2c5f49f4a127a53e781f0055664eb8d38eb35c200acd83e510dfe1ed3bf890893bb2db142c31656154827764275ad13b7cec102ee929396b6263049acce
+EBUILD rospkg-1.1.10.ebuild 1124 BLAKE2B 1faff51469fd29c068bd25243caaf416d3a2ac2daa9fae80d2cd6d48f7d4be198667aaac4302e766844c4b288284a59c3d622231b5a2580fc68795a869b8d499 SHA512 6fef704fad8ef743ae39f2d6299570df7b6d4d725b093c63c48b23fb064cef4bf35a5cabcf29350f6602d4900f584e45aaaa762724d4d373e9bfba32a3cf7a4d
+EBUILD rospkg-1.1.9.ebuild 1124 BLAKE2B 1faff51469fd29c068bd25243caaf416d3a2ac2daa9fae80d2cd6d48f7d4be198667aaac4302e766844c4b288284a59c3d622231b5a2580fc68795a869b8d499 SHA512 6fef704fad8ef743ae39f2d6299570df7b6d4d725b093c63c48b23fb064cef4bf35a5cabcf29350f6602d4900f584e45aaaa762724d4d373e9bfba32a3cf7a4d
+EBUILD rospkg-1.2.0.ebuild 1201 BLAKE2B 84ecaab7754b2edf95e2214339d454357f8320a33d41b67bcb145c767e0dd74ac6a135d8cd855f4bf6578f1657778229128e8fd91f8dbf6d4066616fb444807b SHA512 a75413c1ab7ca7fe7b3dd00dc372480719da705cd561a5c205efd7d217cccd7a312278b08a96cfc8fde70626f11ea9f0f033812c6ac931d16f13e4c1893cb1ef
+EBUILD rospkg-9999.ebuild 1201 BLAKE2B 84ecaab7754b2edf95e2214339d454357f8320a33d41b67bcb145c767e0dd74ac6a135d8cd855f4bf6578f1657778229128e8fd91f8dbf6d4066616fb444807b SHA512 a75413c1ab7ca7fe7b3dd00dc372480719da705cd561a5c205efd7d217cccd7a312278b08a96cfc8fde70626f11ea9f0f033812c6ac931d16f13e4c1893cb1ef
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.1.10.ebuild b/dev-python/rospkg/rospkg-1.1.10.ebuild
index eb111ee128dd..f8ef1bca9374 100644
--- a/dev-python/rospkg/rospkg-1.1.10.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-1.1.9.ebuild b/dev-python/rospkg/rospkg-1.1.9.ebuild
index eb111ee128dd..f8ef1bca9374 100644
--- a/dev-python/rospkg/rospkg-1.1.9.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-1.2.0.ebuild b/dev-python/rospkg/rospkg-1.2.0.ebuild
index d47115913724..d3245f8cb2a1 100644
--- a/dev-python/rospkg/rospkg-1.2.0.ebuild
+++ b/dev-python/rospkg/rospkg-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index d47115913724..d3245f8cb2a1 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 32ab8fc6ae58..527750ef53b4 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,3 +1,3 @@
 DIST Routes-2.4.1.tar.gz 182403 BLAKE2B 21a079616e1533af8fae44b0ad428b3309e5e8d1e27dddddbf3632cb3e1f5286225aec73246012a8c7c22d59d755be27f10fa09ab6ee6b34f71c6c540dfd36e4 SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04
-EBUILD routes-2.4.1.ebuild 1551 BLAKE2B 58d0f84ef695c927bacb44ad8b7b8d68633532bfdff5b76ae36d275d2ab3583b6ef56dc3ff2e99620036204100f6ed6fd4a92bf0ae662f0370f5d5fd8ee8c5f0 SHA512 cc7a933586c963da210ed7f00e7e5815f021c654a18ce3572e080f211ad0091295748ead78418c5e25414f358e25bdcf36edc2454d784035a096824823b5eb13
+EBUILD routes-2.4.1.ebuild 1547 BLAKE2B b2a31ea7e24c2f71f36a45652d6702e52f6a4664d39c1655456237816455ab223f3c42f3966d25e678a7234708b900c21fb97c5e376b81f7d56a297210e7d2a7 SHA512 746fcb675c94e1822defa4e5c0c1dbbb98e3d4abc8d00139aeeca8251dda9e14f53fd102d12313c84b3d58e880c1e48cba62d2881f5b782a25a6f36a80c1bc55
 MISC metadata.xml 309 BLAKE2B 58e1b02098e87fe7303e9a6ce962897750493b957d3b30f78feb58b9cbec84b5fcf80acde66da35caa71989b628a75d232ea567e679f891fb4b81d1c49f61d06 SHA512 6daa7dcc2ae185c198c2630961d68c19498e98bce96ea3b1390a4c159fb591a89af796f2ac90e00994bda52c36138792797a38975c772d6fabce09cf0536722a
diff --git a/dev-python/routes/routes-2.4.1.ebuild b/dev-python/routes/routes-2.4.1.ebuild
index 55aa114e8efb..4b17f617e2ba 100644
--- a/dev-python/routes/routes-2.4.1.ebuild
+++ b/dev-python/routes/routes-2.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 3cefcf4e9e88..3d93cfe7d05e 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,5 +1,5 @@
 DIST rply-0.7.5.tar.gz 27462 BLAKE2B 0f438e6fd786e7436f135da50fe90208970a0950422bb0d8e26b06cc2def964c0ebd7c3e5e3e282a1d56dbb9e804ac267095dc4da16eb57899f455d66fed2d71 SHA512 ccecc451d9e2e0fdf9df7eaaeabface782d9159cc1caf1feae6e46210f6384aa1a78c15ea3c0e9dcc0bd0d2b28e3b1328c8d37e94a8968b07ef7938e5f5ce201
 DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
-EBUILD rply-0.7.5.ebuild 924 BLAKE2B ac4442e2a6ec3698ee0496143043c8e3a42cdd8fc65a807fa9b43dbb4e090ae3dc99a6c09698a7afc09ace8fdc223153a495afc7b66f733bbc4834567d1dd2aa SHA512 4440c7b70c2d8df1ccd412a769c9ba94530f884b0bec31a12a2d15156e7169bdec237c42c947c0c750581bee91be2b2a87389bc8116bd70ca2fe784ba986c4db
-EBUILD rply-0.7.7.ebuild 689 BLAKE2B 1ad62b45dad29a874e9059293155019dedacde3f4f1d9b0610f7f43316503da8b7e74adec3161393fef42c88f629f58ac2265da2bf111151c1e2a3f32df80a56 SHA512 82f0d58453a2ee7885bccded2a0874e38ce042a540e3c6d6a0221c7d48e63c8eed16801b897742d46142666f5d58075bf3178c6ded6eb9731a097ad2a41e6d5e
+EBUILD rply-0.7.5.ebuild 918 BLAKE2B 390c859cf6ce2cf20a8939a783ea1b81ca77ce92a21233880511826aa27a148fdcf51b0b77d6170abdc6be9445ce417fc8ada4ebbc4177fbcf17b0b64b991376 SHA512 df2c6151dd1842756ba53e4f26bdc7b461b3c96ff6bd5836f658e312d7bed0aa318fe9efac12bff78f8b5136b31e2b3789507107d9a47e81fcfa388c8ce87ea7
+EBUILD rply-0.7.7.ebuild 685 BLAKE2B ee14044192cfc83a5cb4b5905d8dcf9e046f3ff49bc48a19e800742344377c167da6caabf24c578e4ce8640fd3245015752be1fa3e84b1213f006f69fa4f6150 SHA512 cd60029dfc334ad3b392c7f6e023c507b3827fb26d94fc4a9441eaf3e3d502b2e657875e0c6ff0c60094702b77b5d9f6a5ec27a867410d741b2e3f3335c5500c
 MISC metadata.xml 324 BLAKE2B d6027998ac0d5aee72ca31a60c53bdf7bbc628b16eacb329041fadb5ac5c9015f152e3e9f59495505eb73a2f8fe76ccff182026b6d5c80999274268056e63e14 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8
diff --git a/dev-python/rply/rply-0.7.5.ebuild b/dev-python/rply/rply-0.7.5.ebuild
index 53efea90dd6d..22475ba280d3 100644
--- a/dev-python/rply/rply-0.7.5.ebuild
+++ b/dev-python/rply/rply-0.7.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/rply/rply-0.7.7.ebuild b/dev-python/rply/rply-0.7.7.ebuild
index a3de9374a2aa..3ff19404ce43 100644
--- a/dev-python/rply/rply-0.7.7.ebuild
+++ b/dev-python/rply/rply-0.7.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index f77c01cdcc07..2735d4ec5f79 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,5 @@
 DIST rq-0.13.0.tar.gz 45487 BLAKE2B 1985a097d419b50b19771a5f1c1526c8b8b3e9b960f7ecb2817cd731a9af0c37dd38e215a556d35ae8107cc93c3da9c023d4e73eda90e776d62a994d74f5bbda SHA512 f8cf5c3cf7360e0640a2ca97a42c85e67e59835317d04dc752008463224e073053c70ede17e179e1e8d287b3e4ed832971a0398636c49e2680f1183f0ebd2302
 DIST rq-1.0.tar.gz 45516 BLAKE2B 10af545640c757671d2da4691d06b03fe0b61c82351824a51f8f382bb0e7380312d6902ceff86bb5fbfe06ac3bedca3275394063e6576db33e78d20610083527 SHA512 eb3040c5c312123ff99158d504f5fea8377c382a1067d923db29a9087e7e0f7d5214ca1ab1df190d3e9872d6d00917c2435730c121dee1a4c410e65d2875d918
-EBUILD rq-0.13.0.ebuild 507 BLAKE2B 72c9ac1a0aa35a4b3666a7e827ce0ebc684925549f77cfe3d0922337e370d66276288d059bdfd3e1d26620f1a15cbf8d71ecb77eb1a18455d116241dbf4a292e SHA512 d94ba297ca69c382e8ceea15dbbe627734afecad31d16400056ff7e17cd1e8df32b0f78e12e4e4a0fee9713f9efbbbac9b4aeede0a7382823a86fef8effcec67
-EBUILD rq-1.0.ebuild 518 BLAKE2B 32abaca03e65304cb4cba5ea1c369908a5ad30c22ee2358812867e9092d467d955aec53dae86cda947d553b3322538763d607e2a14569cdec33c63cebf249603 SHA512 4330b11fa2c4699d3c16b8a76b92c268cb0e577df59df285d443af41db853da37e63e467c9b93dd0bd05e0ae9fa027196bbc0ac49b283cf7ecb9d465a9d3c53d
+EBUILD rq-0.13.0.ebuild 497 BLAKE2B 7ed7175308b59a5475a938b84217eb078eb13c17a7e16c857e3f55918f0912950acd9d0c75d3c150dbc20729d54ea4b30f24ad7e2a0bc8cd8d04e391f892cfd9 SHA512 f4e5b08fdbe1e00177b91d1e3a180385b1712fb2638dc5a8d3c6e00450e33ff66be3d89a00cdf47b008e1d6f09febfffc802ac648af6032f8c4531984f948bb2
+EBUILD rq-1.0.ebuild 508 BLAKE2B de1a062875be664905085bab9e3674bfb07e4c3fda9186d320216d7e822836aec14e155fc24ccaaec0ddbd0dbeb66c8c23eae82a2b20cacf50fa316a95449d92 SHA512 22e8a7d5f3550c867499cea2419e0a57e479f63675f75c517cb629353cbb9c1117b6e177473848cc6ff54c58f47e853bb2903ca17dad9070203a887f37639372
 MISC metadata.xml 327 BLAKE2B d4518f6d7090440fec7e9518fbce9813be8c9e7bce9583bdf0c47b1ca456a078d23fea12f20febd4f4bad6d2e57109e5acf301bdf724c6cdb5346749a3e42989 SHA512 88bc51ba0079d132b0bf9b053e33262f5cae9c4a66f561d6c7303066f117e2196fbbfbce5b4cfe35c7f1cc5020b3818c365dab4dde696d5543dc70ca32d40ff1
diff --git a/dev-python/rq/rq-0.13.0.ebuild b/dev-python/rq/rq-0.13.0.ebuild
index a3a8698d29fd..960c5fa04b3e 100644
--- a/dev-python/rq/rq-0.13.0.ebuild
+++ b/dev-python/rq/rq-0.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="simple, lightweight library for creating and processing background jobs"
diff --git a/dev-python/rq/rq-1.0.ebuild b/dev-python/rq/rq-1.0.ebuild
index d58d830b9b07..8fe00a9e7b89 100644
--- a/dev-python/rq/rq-1.0.ebuild
+++ b/dev-python/rq/rq-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="simple, lightweight library for creating and processing background jobs"
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index a4c8fcd9ab9e..5c53dce248ef 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,6 +1,6 @@
 AUX rsa-3.2.3-CVE-2016-1494.patch 3843 BLAKE2B 94721282f4079aa0a77813dd8ad1c0aefd0924272d4e2b3e8a6ad745375bafb6b6fe5e50af621232df632a1f2261be097fde92b5ad3f57b74ff7976c22daa9bc SHA512 9150b25bc1a9dacc8eee0fb93d46b9d024c868d540097b9166be9a7879fe116d8fd47cacaaf5614b86cd44e7cd10602a0ad290eb2ef116539683101d4057a231
 DIST rsa-3.2.3.tar.gz 35628 BLAKE2B fa30e8212d0102b7763a5e8eb408d0778520d85d9428e12b603fdfa5982c559682c04fec2eac4723a8c9e06c9ed77365021a832c8ad96b07fa07eb93c5a626e2 SHA512 52b33e0278e6e1fed64b1cdebed29f7caa31fae733c2d5875e6cba5a045aaa829616799d8de84fdb63c546780dbdafcabf1f85f25930b8e663861151479ef7e2
 DIST rsa-3.4.2.tar.gz 40956 BLAKE2B 9a6353c84329303c655e7a25fcfa2ca42ea846c913fac0c26fee4a27bb85f9380de876b2ec07ae2212eb37efe5d2e401b2672f187f74bbeee1e9ef1099629e36 SHA512 62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267
-EBUILD rsa-3.2.3-r1.ebuild 794 BLAKE2B 9076129ea18e833d5691ca19c1f262ebaf16c9c4263d10ccb7d104b7ffa5a6409c1790723dada3e4b1464ff27131b5f0ad4e9e16210a98e7a205899723e3c9b2 SHA512 ac63bfded4def96083974596977c746b8ca6e0850c1a75f31aa33f847800d5050f0341a345da9637bded982cfe9108f5ced8196bc5e160748ef64f3dfac1026e
-EBUILD rsa-3.4.2-r1.ebuild 736 BLAKE2B 71ed850193420f15795a69966558aed68c0808ebcbad967680f01941a86bd5b4a802bdc8e280b689a2eda9a2f79a83f8dae3ad4cf2de956ac402702da6e6fdea SHA512 7abd4f739768fe2ef8fa4b4ae0cbb502006fc3d3ba8ce29d34145b5520be41524f9a064cd97b5ed6158236a803ce96902415191ca097fb480a55af42077ad05e
+EBUILD rsa-3.2.3-r1.ebuild 784 BLAKE2B 804597420f8014479c34797796034a3a9aa8493c0a54b3ac12a55d96b77eefabd802e2c16533dadf38a1add960181a234df44c0dcabf124818b261e691427eef SHA512 fdb49c958df2a4acd20afc6ab564d99c32d5874643a7f87c0fac820f4a245105fa4f9a209d2d29b7be4dfeb00a3f3ea6a55f193bf1b15d060ff325dc9e34eed8
+EBUILD rsa-3.4.2-r1.ebuild 726 BLAKE2B 1148a8eac8fff822edad880881c00287cb6b524f8de887803c2dd9e74170474d84c26294115d2ae5eb59ba6ba1c4a78eef00ed320ab4a0afe102344f1db1eeab SHA512 1cdb51bc1b094f54e9af7a2e598ac7d2a2865fd81352d6b614aa1a7864eafd52a2e7b5bdb747d6bb4d6d6e67ac27097eb61548563583db1e6eb6c7b1ac432fae
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/rsa-3.2.3-r1.ebuild b/dev-python/rsa/rsa-3.2.3-r1.ebuild
index 7527eb77a561..0abc603ef08d 100644
--- a/dev-python/rsa/rsa-3.2.3-r1.ebuild
+++ b/dev-python/rsa/rsa-3.2.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/rsa/rsa-3.4.2-r1.ebuild b/dev-python/rsa/rsa-3.4.2-r1.ebuild
index 54427c1aaa8d..bc2b7755ef5e 100644
--- a/dev-python/rsa/rsa-3.4.2-r1.ebuild
+++ b/dev-python/rsa/rsa-3.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 6ed49514682a..45daa34a61fa 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,7 +1,7 @@
 DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
 DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
 DIST rst.linker-2.0.0.tar.gz 12861 BLAKE2B f52ddab3c8119f0bac64e294e4a5a3cc50916f19f49ca1ca4983d8b5d2bb5401c6accb5873df38609386e12fcd1cb02b867f3633edd4d10606a98936e96e62eb SHA512 ea9fa95de66c95dc384c888446512be66b180d0d76e99fe7a6b8f8348436d4be959d3d567fa521d9fc925b537467a4fdf05f9e9d17f7a6df4aafd6dfd323e4fc
-EBUILD rst-linker-1.11.ebuild 1512 BLAKE2B 735a9a154ce666a764bb4bc64be003d350b541b76142e75d42719c1a79a167bf5a03d315f62c667de18f279ffb8c8f9af5beca025cf78b3c7445a6dcc703426e SHA512 8b562b332ea5408a8e72c4605a8e884b373bfa86675d63ca48d279f50c945042daf23e28fc8a51efb987bfb825f966742d7124996081bff77317c0e151703948
+EBUILD rst-linker-1.11.ebuild 1505 BLAKE2B b7710703f772aeb067f42b0d76cae280e974c45b2e1a90446fdd0700ae350cc0f6d5ab724730508d487c5ab6e3871e4acf7940afb423900d3d105636e9e8dde3 SHA512 5d80b2a88c03a9dcad06c18482104b060269488139a764e8d335519551e474e954e85005df7d003662a4819784176d1434f1df07f9e428ab1af6eaa4c990d1f7
 EBUILD rst-linker-1.9-r1.ebuild 1393 BLAKE2B 589e22666f63f41d7990a5e62ed1a9fe7ae1fa3ae3aea24549131cc964dba041c7b0ca1c3a51ccf67e996316046b5cf723ffbc56db6de23c2b9f533ada3389ff SHA512 d77b083e47a9966f7578a07ac69b76d1b850b56ee323cdc824a343b987dfa822e902cf65f1a586009aaea3180a678475caae72b490069d4c97b3a5a1bdb28ab9
 EBUILD rst-linker-2.0.0.ebuild 1349 BLAKE2B 3b99c6d0150b92e2dcf07fa334c9c0366254004734ccac2f4fe362b12a4bff57e4f4975770f4d5a7ec3300d307f8fa7d11023badcbe2769c0aaed09b7e06cef5 SHA512 558fe27f0b6ac95bab6fb10d3824761aa40f3a3f276f594a3482c742b87e28c292ca91a0e7e772f50cfd8be09b394b6be229f0a56432439bc64f377eddbc060f
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index 0a17f3b351d4..b1ccdb8c26cf 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 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"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index d3f20c312337..eb66f39ce15f 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r1.ebuild 548 BLAKE2B bb0c3489791b749989031c2768525366aba21d451e7d17e43d78c036bab79ce2ff2457e16d18a2ef7ad3779bf24d60a328c6bc03f72178d8dc92f249434c6a04 SHA512 71f33e276f05214783d7ca2e8f3b575c1d2dfe0a07130ca0075dd2bbc5f8c0b20bae76f89afec085ac290adbe7225bc3293156fe5d94550e239b812c4cb24fa3
+EBUILD rtimulib-7.2.1-r1.ebuild 538 BLAKE2B 14d38ae66375714a967e1a702fe09657b4d1b6655e2248c9b053cb4fdff7a0c7a8e6f56b899a16fcaeee50bb6fa9176b78b92f108c2ef39056156b7600534228 SHA512 85447ebdd80b81161fde5813cb3c4d22b4fb3dd0b9d18ea73b3b921ba27e3ffd85fa6235b786c6746a333febcbe334edf91cee4a183b1d598ae2118a66425b8f
 MISC metadata.xml 729 BLAKE2B ae7173f56cfccb78e8fdd6e193e1e49c67ceff9b0c09d2acef7b39a72c0301a9606769519001d5f5d54c931333644af9933f23af16b7dc274db4e17aa2ef706d SHA512 c4463d749d453f4ca85bac17309b9948912dc5fd67824e71cfba6ba1b1a6519e39c8bcd8d1c8a86fca6348b18d60d8431497a906caf187f16564e657cb57833c
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
index a123feeb7cf2..da28deedecf2 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS="no"
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
index 5aae982d372e..376ea90a2b73 100644
--- a/dev-python/ryu/Manifest
+++ b/dev-python/ryu/Manifest
@@ -1,4 +1,4 @@
 DIST ryu-4.26.tar.gz 1518130 BLAKE2B bc6c03ad746b5b20f53c1b5ab8d9637efcdf92dec83eb2ea105898125b4887fdf03c478122b3d33ad099da4be8d51368c24875cfe0aa1aca58ca5b3f26255adc SHA512 a88c98904945270b8465b8daaa96c57e067e0091f7b300086f2ab8b07a7c024963382fc73c018fd15eac6c25a565125107e3ef4e79c2a5b49cf297c74511a260
-EBUILD ryu-4.26-r1.ebuild 588 BLAKE2B 200cb00a68dc10e25b521b80272f3804eeecec9f0a0178c9774686c8bcec2e786370d32c13d2e0c4514483958be21f3bb29e4eb4c0d22880dc018a7174e8df2e SHA512 64c0f0a3bd6d0e12d6cfd4106040f937211d7e9cbde0a50e9a286abfc49461c51d9e332f321978e1c91f3dec326abd49413a34cf34c4837b6e19d95aa6b311fa
-EBUILD ryu-4.26.ebuild 493 BLAKE2B 996660087cfe643dd656274b6d954e9b32c627ceeda7d3bc569c598f7e6c6bd0b3a64b8537c66ddacb62007f38c15e06ab327f01615372292eb306a99350ceb1 SHA512 0f5a04e0bad69ad136cf90f9bfbe373f532623aac767291d6ef5fec40b8fbd550b5e933a6770c100e5cc9a5552308f5b6dfdb90f0985073bf66625dd82a87314
+EBUILD ryu-4.26-r1.ebuild 578 BLAKE2B 788aa23ae57fe5387da8649513e0b500666b7094256c9cf0b0a5a9b170dcae13c8c673d9231a449f3d05a2d6c3def873c9a242fb8af158a16803aa0413cd05db SHA512 a35b23c569246822bf4a931ae241a2b79e921adf1c12ae7ca7942cbdaf5622ac6ab11c498598212a4644e733858d2230f77550b1ad48186f08baf3dad00c6fe1
+EBUILD ryu-4.26.ebuild 483 BLAKE2B 6961ef9efd27e41c646b13480976f85073ea99777e81856fbeb670626b974ba7c3e490ffb7a26c378843b7b18de8a79bcf9bc7b4e853d8ace1abc2e8281babf8 SHA512 c99c3e274f2afff175d9966ca07cf35289c5491340e13dd22dbbace90837bd55931634a8339bdfdb445c9cb04dfc38a08f48a5bd1b2dea00d32ddff613b8d416
 MISC metadata.xml 320 BLAKE2B 53cf3eb4dc8485edcfb30a28d51e9191a4c24a3770fe376e3df73534e0ebf7481b5eac783a3bf8d8ffcb6f963c5ec22ca49a568f66c983a6d619b8505d2289c2 SHA512 44ad18c381ba7c542ed25119d53ebc3ef8e6a2cc46cdd4bfdec51fa07d6250e9a59212e8ce3176f0f6b219726fd869b706f487ac86f5d3b8645ecb485ff68028
diff --git a/dev-python/ryu/ryu-4.26-r1.ebuild b/dev-python/ryu/ryu-4.26-r1.ebuild
index 06d5157312e8..c30bfe165d70 100644
--- a/dev-python/ryu/ryu-4.26-r1.ebuild
+++ b/dev-python/ryu/ryu-4.26-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ryu/ryu-4.26.ebuild b/dev-python/ryu/ryu-4.26.ebuild
index 4c1a9d06b507..add2b410d1de 100644
--- a/dev-python/ryu/ryu-4.26.ebuild
+++ b/dev-python/ryu/ryu-4.26.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
new file mode 100644
index 000000000000..db90f830221c
--- /dev/null
+++ b/dev-python/scikit-build/Manifest
@@ -0,0 +1,5 @@
+AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
+AUX scikit-build-0.10.0-skip-sandbox-violation-tests.patch 4606 BLAKE2B 4e563ca215d54ca0da6da812b0431c2f8e71fdb654ffbf0163a5063386a23b47b6ef6719aa95e0c59cc5a9014811d509b26edb716b4b96acf50c8180effd64af SHA512 e16339bb0f25938869f953ec06557c3c78158e0bb99a47cb2c72e6bcbb4aa638a923c4088f7596012b80769f398c0d6f14960793eef754cd2c404c5bfc289ad7
+DIST scikit-build-0.10.0.tar.gz 132443 BLAKE2B 7e817b1b6d8ea5e663cec59c5ed51b3f58318eedf6587380eb2a1458bac772a5a02a936015027f1200f740884ba33512babb1aadc4cdbb59ea38f46bc36cbb5f SHA512 cbdc59a41c60c162be84b38d207838d5e38898871f2ef02dcb672796f01f7a31645892770172e9891a4dd7aa02a85dd489b6dede4c5f717ab013dd8947d5d314
+EBUILD scikit-build-0.10.0.ebuild 1209 BLAKE2B 591d412e5eda46e58735d46eab14d1f24adcc1166356c50e2d54980ac6bce5e5e9f9588f075e90af73e7a6b2815064f21d7511c22fc1dd0ac948196db8c09d6c SHA512 46189ed92c773ffa179f0f275f7cb5314b87620c5182799d73aacb0030240bd3c79f9403aa2f2777cf04720d6b38837bd9565c423aeec78d66fa48592296b128
+MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
new file mode 100644
index 000000000000..f48ad9340754
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.10.0-docs.patch
@@ -0,0 +1,19 @@
+diff --git a/docs/conf.py b/docs/conf.py
+index 094ed23..a58cb85 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -41,7 +41,6 @@ import skbuild
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = [
+-    'cmake',
+     'sphinx.ext.autodoc',
+     'sphinx.ext.viewcode',
+     'sphinx_issues'
+@@ -291,4 +290,4 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+ if not on_rtd:  # only import and set the theme if we're building docs locally
+     import sphinx_rtd_theme
+     html_theme = 'sphinx_rtd_theme'
+-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+\ No newline at end of file
++    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch b/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch
new file mode 100644
index 000000000000..9148db88660e
--- /dev/null
+++ b/dev-python/scikit-build/files/scikit-build-0.10.0-skip-sandbox-violation-tests.patch
@@ -0,0 +1,132 @@
+This patch removes coverage tests (dep on pytest-cov which is deprecated)
+It also removes the tests that test the setup.py file
+These tests give 'permission denied' exceptions because it calls commands like 'setup.py install'
+diff --git a/tests/test_hello_cpp.py b/tests/test_hello_cpp.py
+index d39c8ef..0419b88 100644
+--- a/tests/test_hello_cpp.py
++++ b/tests/test_hello_cpp.py
+@@ -182,24 +182,3 @@ def test_hello_cleans(capfd):
+     assert "removing '{}'".format(SKBUILD_DIR()) == clean1_out.splitlines()[3]
+ 
+     assert "running clean" == clean2_out
+-
+-
+-@project_setup_py_test("hello-cpp", ["develop"])
+-def test_hello_develop():
+-    for expected_file in [
+-        # These files are the "regular" source files
+-        'setup.py',
+-        'CMakeLists.txt',
+-        'bonjour/__init__.py',
+-        'bonjourModule.py',
+-        'hello/__init__.py',
+-        'hello/__main__.py',
+-        'hello/_hello.cxx',
+-        'hello/CMakeLists.txt',
+-        # These files are "generated" by CMake and
+-        # are copied from CMAKE_INSTALL_DIR
+-        'hello/_hello%s' % (sysconfig.get_config_var('SO')),
+-        'hello/world.py',
+-        'helloModule.py'
+-    ]:
+-        assert os.path.exists(expected_file)
+diff --git a/tests/test_issue274_support_default_package_dir.py b/tests/test_issue274_support_default_package_dir.py
+deleted file mode 100644
+index 536f7b2..0000000
+--- a/tests/test_issue274_support_default_package_dir.py
++++ /dev/null
+@@ -1,27 +0,0 @@
+-
+-from . import (
+-    _tmpdir, execute_setup_py, initialize_git_repo_and_commit,
+-    prepare_project, project_setup_py_test, push_dir
+-)
+-
+-
+-@project_setup_py_test("issue-274-support-default-package-dir", ["install"], disable_languages_test=True)
+-def test_install_command():
+-    pass
+-
+-
+-def test_test_command():
+-    with push_dir():
+-
+-        tmp_dir = _tmpdir('test_test_command')
+-        project = "issue-274-support-default-package-dir"
+-        prepare_project(project, tmp_dir)
+-        initialize_git_repo_and_commit(tmp_dir, verbose=True)
+-
+-        try:
+-            with execute_setup_py(tmp_dir, ["test"], disable_languages_test=True):
+-                pass
+-        except SystemExit as exc:
+-            assert exc.code == 0
+-
+-        assert tmp_dir.join("test_hello.completed.txt").exists()
+diff --git a/tests/test_issue274_support_one_package_without_package_dir.py b/tests/test_issue274_support_one_package_without_package_dir.py
+deleted file mode 100644
+index 6612087..0000000
+--- a/tests/test_issue274_support_one_package_without_package_dir.py
++++ /dev/null
+@@ -1,27 +0,0 @@
+-
+-from . import (
+-    _tmpdir, execute_setup_py, initialize_git_repo_and_commit,
+-    prepare_project, project_setup_py_test, push_dir
+-)
+-
+-
+-@project_setup_py_test("issue-274-support-one-package-without-package-dir", ["install"], disable_languages_test=True)
+-def test_install_command():
+-    pass
+-
+-
+-def test_test_command():
+-    with push_dir():
+-
+-        tmp_dir = _tmpdir('test_test_command')
+-        project = "issue-274-support-one-package-without-package-dir"
+-        prepare_project(project, tmp_dir)
+-        initialize_git_repo_and_commit(tmp_dir, verbose=True)
+-
+-        try:
+-            with execute_setup_py(tmp_dir, ["test"], disable_languages_test=True):
+-                pass
+-        except SystemExit as exc:
+-            assert exc.code == 0
+-
+-        assert tmp_dir.join("test_hello.completed.txt").exists()
+diff --git a/tests/test_issue284_build_ext_inplace.py b/tests/test_issue284_build_ext_inplace.py
+deleted file mode 100644
+index 78dd3dd..0000000
+--- a/tests/test_issue284_build_ext_inplace.py
++++ /dev/null
+@@ -1,15 +0,0 @@
+-
+-import os
+-import sysconfig
+-
+-from distutils import sysconfig as du_sysconfig
+-
+-from . import project_setup_py_test
+-
+-
+-@project_setup_py_test("issue-284-build-ext-inplace", ["build_ext", "--inplace"], disable_languages_test=True)
+-def test_build_ext_inplace_command():
+-    assert os.path.exists('hello/_hello_sk%s' % sysconfig.get_config_var('SO'))
+-
+-    # See issue scikit-build #383
+-    assert os.path.exists('hello/_hello_ext%s' % du_sysconfig.get_config_var('SO'))
+diff --git a/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py b/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
+deleted file mode 100644
+index 2285bfb..0000000
+--- a/tests/test_issue334_configure_cmakelists_non_cp1252_encoding.py
++++ /dev/null
+@@ -1,7 +0,0 @@
+-
+-from . import project_setup_py_test
+-
+-
+-@project_setup_py_test("issue-334-configure-cmakelist-non-cp1252-encoding", ["install"], disable_languages_test=True)
+-def test_install_command():
+-    pass
diff --git a/dev-python/scikit-build/metadata.xml b/dev-python/scikit-build/metadata.xml
new file mode 100644
index 000000000000..ca93985fb0db
--- /dev/null
+++ b/dev-python/scikit-build/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-python/scikit-build/scikit-build-0.10.0.ebuild b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
new file mode 100644
index 000000000000..f4eb8f1ef3ec
--- /dev/null
+++ b/dev-python/scikit-build/scikit-build-0.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
+HOMEPAGE="https://github.com/scikit-build/scikit-build"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flake8[${PYTHON_USEDEP}]
+	dev-python/path-py[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+	dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}/${P}-skip-sandbox-violation-tests.patch" )
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinx-issues
+distutils_enable_tests pytest
diff --git a/dev-python/scp/Manifest b/dev-python/scp/Manifest
index af5f8fe85ba3..41e88e4c3e9d 100644
--- a/dev-python/scp/Manifest
+++ b/dev-python/scp/Manifest
@@ -1,3 +1,3 @@
 DIST scp-0.10.2.tar.gz 6230 BLAKE2B dea7f16d037243788ab53994547c70ebcea0d40ad07e9067a6b339f00d98ed9c46c3e87d8c069d35764f1e57c3024e2d10db7d558047bfd4d08818188b004ced SHA512 165a0aef1207a2603bb0e15bd6d3171244ebb83b698b7e7d354e7c4d08175a711b168d31e60174c16f1597dcd35b2e070b544c1027d0b52c93be8ed024bac680
-EBUILD scp-0.10.2.ebuild 487 BLAKE2B e30465c6c2f47b0b4a9213ce69ce5816781f071f836ecb29be190e0e90265ea93f810df846e155748181e2b85d1c4753eaf483cad522d474ffe44c15db1f00d5 SHA512 71519ae52eb01417ab9680abcd62dcc8cad8af84e278d9ad714aa7c39000b4f99d14a10add8c466dafb8c554cf21d9612946e7d373532eba75ffd79174277821
+EBUILD scp-0.10.2.ebuild 481 BLAKE2B 0411bcd5a81d6991074a91ab00588c144349e38ab4d765ae61aac52b3fd1a3d101632372aba5a38cea0a85745cc03d45f11ae70768470d32df7038621520ed87 SHA512 574116be088eb7f3e91f524076c9d9062ce4b7a9b1439de80f9eea966c3760fa6479268db9a450ba72878b4fc31b92941e3fbcb902f9ec71e7e1482e40cfde55
 MISC metadata.xml 484 BLAKE2B 23418117ace875133f1e90a7840da898bd3919f32e51083d517888dc8fa8433768a9aed3a2b79875b44477ea3defae6edc1d011345962b9715ee2a0964201165 SHA512 f95b1cf4ec6a3a30183e63cce28f754220a1a9c82511118ac6eb1f3a211734f62f5394a646a1d07fdde7afe2f78120812f0a2e18d43104287f29a17b9d67c08a
diff --git a/dev-python/scp/scp-0.10.2.ebuild b/dev-python/scp/scp-0.10.2.ebuild
index 4954af1570a1..caad28d33f7b 100644
--- a/dev-python/scp/scp-0.10.2.ebuild
+++ b/dev-python/scp/scp-0.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="scp module for paramiko"
diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest
index 18b81098edf0..5e6918d710ea 100644
--- a/dev-python/sdnotify/Manifest
+++ b/dev-python/sdnotify/Manifest
@@ -1,5 +1,5 @@
 DIST sdnotify-0.3.1.tar.gz 2513 BLAKE2B cbce1d3c2bae3b3a02102cfea9ac104e7c2839b784a78309cfad0a66fc8b13bba66ae4bdb8dcf1d2171378e04f2c18e3697b22545a3e3f0593edff8adcc19dc3 SHA512 765e75e727ad5128269bfffd4d3f64666df654adc50965a54f3cd622933aca583faee5453f7fec3a23b6f754f4475522dd96a86ba643984cd72a575ec082709c
 DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3
-EBUILD sdnotify-0.3.1.ebuild 521 BLAKE2B d0e3b614b545e9edcd54bbed69e82c8fe19d718fbed11c25fe4bede3109026143e0d2d1f82356e78ed44a67c25a116db102c28c1f68af25e284c40cce1c79f6d SHA512 9d4f6aef7f17d73441331da0dcfccd820a8daa9ac88fab22446337d868facdc287540d1632d65203091402c4b57573d3994365538db19ce269c22ce78fa90c82
-EBUILD sdnotify-0.3.2.ebuild 526 BLAKE2B 5cefcdfc034e143013c65877b8a7247ccd32d17a941a375d6dab5d8524a012c087148b698dfaa5a2ee5980df9fbc6ba204054f72ea08b1ecbb1597d6d43715dd SHA512 2f8e08dba830ff11d5c9a410b7a7d24093de33d18b9dcc03c9cb085f991364031fc03b796e32a2ab1754eb2f7286e9212cc88e888f34c385722d4964c675eaad
+EBUILD sdnotify-0.3.1.ebuild 511 BLAKE2B 708ec36868420ecc8b1ad6f616364fb8d826306901c1ff6f48987421ca285ccabd6b692650c01bb65a66bf53b5b9e7f57460c833d7dd7eccb5415caf5cf4e376 SHA512 92c10f6cb1ad031c5d8df5a2ea5f65a1a5d1e5dd87b8a688de874d6fb0e52e02ec53dddbebba8ae27e1a08eabb2d7cf9838ef6bd563d0268af6178d95db201bb
+EBUILD sdnotify-0.3.2.ebuild 516 BLAKE2B 76d4fc08e8c39f292cae48a2cfe3b40a5500074d2f8f9ce6008b148af18b7ae118f7ba3d6b1ddf8dd8d47fbdceb0b5a8bc7a255c581a9bc401919abf65d1722b SHA512 43cdb15b2251042995a99aaec8b5e03f99b36b6d74ea50500fcc4ca7beb2c24b7ed983ff63a79564d0a6b1699a0db4b05a4cfe2b36e37489c493bbd2658945c6
 MISC metadata.xml 800 BLAKE2B 3841a502690a98b0fd6ab419349f359dd167899f5c7b8f53e610a7677d060fba149338196a1108ef66bdf62fc42acaea6aee03169e6020d2eea1db83b54b6cff SHA512 2ad4766fb8ef7abcd0a5444aab298d97f66fd84d5dc6e24e6e597f075fc82273d7991e5186b08a2f1ff0040675a8066b3046f1761c4a8200a4894f66990c8a3e
diff --git a/dev-python/sdnotify/sdnotify-0.3.1.ebuild b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
index 3ffa5081818e..c4f63855c609 100644
--- a/dev-python/sdnotify/sdnotify-0.3.1.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
index d278fda3980e..87c06d0f9ffd 100644
--- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild
+++ b/dev-python/sdnotify/sdnotify-0.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 57f8b6a41e61..a9af8ee67e47 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,7 +1,7 @@
 DIST SecretStorage-2.3.1.tar.gz 16073 BLAKE2B e4769e748ee39596c51012a6ac626dba2b019238a8237678c47d713c2af4b0e88b50d0068b5dbf3a405b9f7b14a7df64aabf751009dd21ab25de65ead2a79c38 SHA512 69a2c86a1abd904b7d71bbb59cead3b2588cf88d7f35cbaf64d18ff9aa9ed62ba9f79d0bebd10136aa8a0edb1ff8a1d1aff70cf8e519dc74303993ef0d564047
 DIST SecretStorage-3.1.0.tar.gz 17767 BLAKE2B e234a7f34b5ca2debfd04d4f3b4b4e2a1625aa346133e464bbc1f094381445e3d0c5460457c687f55f6682c6b6085a757edb23a6029fe5c2abf139278203f326 SHA512 a044009480b359aecb0c8782f04e4d02c3c1c0e682f72733896c98f386562c43766318963452d60028d0a92d02903130278cf26a5c206f5f0909e106bdb2d133
 DIST SecretStorage-3.1.1.tar.gz 17036 BLAKE2B 1dda10a5f74727ec29392ff2a3ec65b841aff86db21223ebdbf291afcc9ac7ee68de8c62e5929aa45aafabc791ac02ed80b6785e69f2d4b51d827fce8bbb3443 SHA512 295e0f75c772edf153480730dc20051f06e60e040a18f169620cb4aaa37b8c1a254a496464d3794a38cf49fa884a7b561fe364816f0d12a5b2622c77259f03cf
-EBUILD secretstorage-2.3.1.ebuild 681 BLAKE2B 1b2b7d0af3d47df38022c63287709709a5e95d1a99632d8b7eeb4a3275e96818225e60f82949046265a422b9b75adbfb547ca209de45d378532609ba9811a511 SHA512 060cd69d75eaba65724d66c7537a274ab4fdaf460bdd32af9a5249d494a2d94728c7adfe286b590c3beab60f7578496911e804e91259685af24b28c5440f26e7
+EBUILD secretstorage-2.3.1.ebuild 677 BLAKE2B dcd81885884770ef711c9b3443cae8b1e7de35c5ab2eeab0ce632462e6edf5dfa14a4659473b5d776ed068d9a7e358350e064e1c8a3641cf642ec921e32e555c SHA512 480ecb4ffd54aa3c4622151a0c5836689dd9d1b4a24304057b51a21b25bb2993450c6fa7ed5f6a9a8916f2721f4f985009164523027e236322a32a1ee43fff93
 EBUILD secretstorage-3.1.0.ebuild 1094 BLAKE2B 50b0c4c55fa9482e3cd9396f0fec287417adceaac0fd2c8cdd802af57665a0da09990a08fea4a023790c3ce0b29ce9ab6ba0b218daaab16053c6be5d0ffe1535 SHA512 c79c893024941b8da1ff34a72096f4cd1512ffc827a4348fb417ba6d556fee2b7f9bb49ac11a8c14b6ffbc84a4ce32098b29d8f665cae62141b651e59c6d6064
 EBUILD secretstorage-3.1.1-r1.ebuild 897 BLAKE2B 20823f9a861665047c9e4320a96f745aed3147ebf25480676005d0df83bc09ccd72cd6e7838810f0cb3686444bdf3f06161dd30c77bbdf0d3bd93eccb6b3cbc1 SHA512 89a29e0a0385a0e2741536fac657c6dc241ee724d79c9db8c26ce3908453c3afdebdf1f1a3b42f3bd38a0a01d5267ca19229019955d97968e1351c075c0702f2
 EBUILD secretstorage-3.1.1.ebuild 1094 BLAKE2B 50b0c4c55fa9482e3cd9396f0fec287417adceaac0fd2c8cdd802af57665a0da09990a08fea4a023790c3ce0b29ce9ab6ba0b218daaab16053c6be5d0ffe1535 SHA512 c79c893024941b8da1ff34a72096f4cd1512ffc827a4348fb417ba6d556fee2b7f9bb49ac11a8c14b6ffbc84a4ce32098b29d8f665cae62141b651e59c6d6064
diff --git a/dev-python/secretstorage/secretstorage-2.3.1.ebuild b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
index ea8c22ddccdc..43765fcd2f3f 100644
--- a/dev-python/secretstorage/secretstorage-2.3.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-2.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 9bd5ecd1e476..1fa430e80db3 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,7 +1,7 @@
 DIST selenium-3.0.2.tar.gz 830314 BLAKE2B d6d2e5775fb1fe9d043a54ecc1757e5290326e048e16e1647d30ff4445e2a24d0b7acad7cba7d122f265d00704b665a4ae302d8804a97a7bd8d9066f6c926f8a SHA512 6ddbe68e65d8999dfa362fbafceee008967b73808d51efabbfa5a7e79325597ee6fa226a45347e1c5b7e479cc607af4f0233c31cc7296067566a4dcdf1f86496
 DIST selenium-3.13.0.tar.gz 852146 BLAKE2B ef70397669f2c6c23942437ca1513882830bc952be5c20f37808d45d474b2ae85843662f186b9e68bab29184645b278fc6532d47635e4dfd3a851ddfd0c58111 SHA512 cc089032f9c1adac0cd629246d2ee3f986a0e448907408a40714381f42c0ea11be479b9714443f86460a65fdf86e107f9a840d3fde7a6401ef99f5ec491453b5
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.0.2.ebuild 587 BLAKE2B ada701e1ede406c5204e740a32aba2a67a4565d5fba37a3788052b2e014d4cefb0386084bf1f0343794e8ce1cb8ec5cc0d68bbf27d6b917f0608c1bd5601210f SHA512 19ee59fc71588a3d03aaba94d154fa26c014577f0e549ff3e5f5c815ad1105769ab271993ccc8d97d0c824e75f8da54cafd4cc7b21844f3cdc0f2720e39c434d
-EBUILD selenium-3.13.0.ebuild 589 BLAKE2B 79fae43397afbaa880f1b7197f17da3ac3c3c11c40218007e21cec4161a9a5a267ca656ea6f840f2bab40f7684905c5588910b0015fed658498b618858abab0d SHA512 769d65a954b01de06cf11248338b25190fe7b1311384755110297df502fdcad57f1a3ed0936561db24457a975281ef9f4e1a2b1cf3d437fba4a590065591a0d6
-EBUILD selenium-3.141.0.ebuild 589 BLAKE2B 620880f1663bce10cd5d68e1e2fc7f107ae6591b42fd978034f97ac9c1639b734883d7d9060e54c6a1e56e367d56271953f76d2e4aaa87c4b507a78d0996f17b SHA512 1ebd2c59fc14ea37d80a800fe818494d892beb43cea99133046a009104572dd6f91907443291a9c6f82730f1d6b46f307138f1fc9132d370a6c671d2743d7049
+EBUILD selenium-3.0.2.ebuild 577 BLAKE2B c69791a90c812b1909867442f38eb69e7ffd89856c00f01d6218f4b7357dea48a249219c893f9d82fe679f7da31ee4b1dcd2ec8339fc4173d2749a650dae3245 SHA512 67113000e7b3a02ec83551d20ed3333425756f1a5d0d5d58256043d15034f6da69e3ba4e25701939998bf470374cd2855d12da57bfe738e17a3a6fbf6f7d944e
+EBUILD selenium-3.13.0.ebuild 579 BLAKE2B 983790582f497e49832d70209c9e886b199accc5162504bedf7ef9480ae139fb292aa3b5dea464de712308a833c9c7022f62f6fbcbcbd31988ba4bb70d7f8fa9 SHA512 bcc891d83fa5f47e924356523304c7458a206a7288f867fd7ce7b1e84df7213d10a8efe6ee17509d715ed624a58677df6db0cb4cf310e5eaef1cdc13b5a4f875
+EBUILD selenium-3.141.0.ebuild 579 BLAKE2B 3baeea02a7231bebb21d65b7a964ac6df853b7ebe913ba6d6f4d6008e6e92c796aa3c70b0e27616e728de0c92ce7cb33dd97055c5c6dcf38dbda021347cf8657 SHA512 9ae069d03396ceafac53477d511a6e795e03e89b502de2327be2e761f6e460e16ae78088977657721fa9c20999dae7dc6f8adfa9d8d6ed9347324bc1dd4c3d01
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.0.2.ebuild b/dev-python/selenium/selenium-3.0.2.ebuild
index 7612c95e7ece..f26b038c272c 100644
--- a/dev-python/selenium/selenium-3.0.2.ebuild
+++ b/dev-python/selenium/selenium-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/selenium/selenium-3.13.0.ebuild b/dev-python/selenium/selenium-3.13.0.ebuild
index dea5ab9657ef..855d36d7f0b3 100644
--- a/dev-python/selenium/selenium-3.13.0.ebuild
+++ b/dev-python/selenium/selenium-3.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/selenium/selenium-3.141.0.ebuild b/dev-python/selenium/selenium-3.141.0.ebuild
index 44a541d79ec5..f5f8260d1b67 100644
--- a/dev-python/selenium/selenium-3.141.0.ebuild
+++ b/dev-python/selenium/selenium-3.141.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index 2d447a3b7585..6c77d9f82481 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,3 +1,5 @@
 DIST semantic_version-2.8.2.tar.gz 49243 BLAKE2B 73c66696b2fd6e30dc74bba6f1d4d84d71bf470f8ecd2ab93b4225f573bb0575f797b573d8fa6605ff35636de713a8f69522a2719949cf0bfebd0791ab5bae99 SHA512 f54ad2bb2e8392e154718c3dff8e7a7fa7663d7df0ab4b196444e0ad22440fe9d9a3abe9043824c0e0121f9051121b8c9d67f76a615aa5348c321e217b3a5dcd
-EBUILD semantic_version-2.8.2.ebuild 955 BLAKE2B 709e321caf6ee789c0f7c6dff06dc6a7f78c13daf18839a24451b827e3ea5c8e5f031e8fccba8556805cd81f8290eb427be21b8d276fdc1f61951c8afcc4edf7 SHA512 6122d887010a092968213abce8b838ee9d1e6397434c18758387571a5a1386cb56dad4cee88fae0786525a159b1e32d119683f2719c316e60b5b0e221228bc7f
+DIST semantic_version-2.8.4.tar.gz 49774 BLAKE2B 30dc1bbca9e24db993e2c9eae2ba05e7a102ba8baae10bc49640d74a3fe9ff943b7606b7c7cbad3d7b25d65a10df7ab587179b5a9bfe73822eb62b945074db23 SHA512 2ed9a8ae03384731865c0b160a9bc92f9c877b610a4ecf15c30969886f15e7cdf77cf384997f96126a8a77534e032c70f587c835fe288fe4ab3e9e2061cb6f47
+EBUILD semantic_version-2.8.2.ebuild 949 BLAKE2B b43defc99c71972cc8f04c35a3c448e6243f3e8d3b88f1e94b74e288b52f27de6d3fb8a65ac67b20e2404182952a8de84d6174cfb2e1b8fc4eea612cd8bb3e7d SHA512 a3c72724fa8ba41f6ebd3ee398c58a79f65dc205c8a292d1ce5f20fc5997f62b020ca7086f2182ce1b1d3cfbd87eaf47440c1255305802cbb93b1f13e7cd4a65
+EBUILD semantic_version-2.8.4.ebuild 912 BLAKE2B 36032774cfe4ced2ce5a6ebfd091dcf9257af04f75634b417f0fc016b6b3c97619cd786daa1c03efa83f1e7d3b77cc73c1c464266c2bb3866d817529600d612c SHA512 eeb16f412901755f9503a3dc2abaa2e28a6769527e1bcd5c2c989bf8f5afa50f62947d7bed116056dfdff56896176918de6a836fa60493a9a71e64394bdcd3f4
 MISC metadata.xml 794 BLAKE2B a5db43eb58726664155e05adc00491fd2f87b1eb15a1ac67f0f856ad5388488ce3329207863a294ed899aebad0bf3c99ceab93816f36e2ef8149eb24e0dcbb58 SHA512 2374a074dc02721044ed995e7f3502b4a7c25f751efc19243a21ea845b814e20a375e45865bcb4fec36906016384de49f4e137c03a64aa84f4188140151bcb38
diff --git a/dev-python/semantic_version/semantic_version-2.8.2.ebuild b/dev-python/semantic_version/semantic_version-2.8.2.ebuild
index 760fc93c5e61..3f78ef9ec089 100644
--- a/dev-python/semantic_version/semantic_version-2.8.2.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/semantic_version/semantic_version-2.8.4.ebuild b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
new file mode 100644
index 000000000000..a390c08f6552
--- /dev/null
+++ b/dev-python/semantic_version/semantic_version-2.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python library providing a few tools handling SemVer in Python"
+HOMEPAGE="https://pypi.org/project/semantic_version/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+#SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+RESTRICT="!test? ( test )"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	# The django test hangs
+	pytest -vv --ignore tests/test_django.py\
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index 5805d072d0f1..d923ed6a7693 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,5 +1,5 @@
 DIST semver-2.8.1.tar.gz 15000 BLAKE2B 71fee2372713cefd11778fb223d58cc1e41909cc8adb8b5b3330770eb1ebcaf45c3250c553c40b85c54a59b1427308e7c143e1cfadf6276d7652df339263c65d SHA512 a457b1a170b309ee563955e4c506de56a061acd4e7e92a58fd8bd78801e33207fbc5e0e026fc0ea243301bf9ecfe0b219c0d95681aa10066480cbd3974e17d3a
 DIST semver-2.9.0.tar.gz 24767 BLAKE2B 5fb9eda8c5ccc6b02997292eb6f7be0080480b21bc38bb629fa48af674ec7a356f2b9952459680281a187243acbde17968060c48e4c1af70d10f3bbdf984fbe2 SHA512 5ae9a4a66474fc82cf7e4612796a6c0e0280ad9969ff8c509e99cb266154f39a2c03c68f6167f8e17fda1ac16ce17a838e63d81bc2e78debfd07adbb7cbc098d
-EBUILD semver-2.8.1.ebuild 676 BLAKE2B 66a1ef41d05d93c62ec38e74e6b33e57bbbe0fcf254e886eb1db4ba7e1f27ceb70ebd4918ba26cb72cc8ad7914e045ccff9cf42c5988467431fd82e285c35b68 SHA512 5d62292de9d38346a19ed18ee14d35467247cc635c3b4463145c9951aec3e1d8ba228a3111c58561e1ed6c3889a75899957062ad4a74891d8863bfdb88ac894b
-EBUILD semver-2.9.0.ebuild 734 BLAKE2B 0d5d7ca793b247d4b0d3790cfab24fe0e1a66064d535dcceb45ee84b7b88036c67f599cb3f7116b64ac1e39c8434207cfb1db54cebea2e4936411af8c310659b SHA512 8b015998917f763c0127d2ad10a49bcbd4a8a76834a1fb7b234a0fd3cf336a1ba8e8b6f0f4d72f6c5c56911a127842345e4f25049c8f731a0bf694b0ad8c0f8a
+EBUILD semver-2.8.1.ebuild 670 BLAKE2B 6ed66e3ec1da6db0bacb23acefb6b7f5be7c88ae40214fd022c4695d555cbda5f4713330785e2a699c6ea03a45cea5571521c386d61cd35352b7d6ca5c01e440 SHA512 c147d0c9cc363a6a2dbd3d089286a4779453999699749657b637ef42f1ed5e1b719c2026b6703fe71a96feae1a70787c04383be899e6eba99883cb060a2b6c19
+EBUILD semver-2.9.0.ebuild 728 BLAKE2B 279d3a6383dbac3100c5497ef3eadfda49909841d06c567b21a5e537f55e493003e8e339232f6d0d8c26044717769d6fd12c8ef67d52029da7d9c94c8b6a1ce3 SHA512 7fb89a6223eef6be3b5c5217537b7117cb68d6d0bd35c58dae54e68599775a535a292a19f05ca527b39f7f43a5e5d3d97a4330deee12a38cd8437f2db74748c4
 MISC metadata.xml 501 BLAKE2B 09ad734b4d8f01e46f57b531eb47f27ce9ff18843e1796b96dcb664a23ca1a675fbfdcaf687452fb702811daaef61e1f3314d88d239cda37db75dda9764bbc21 SHA512 24204b5aece1f9f750ab0d6b0ffccd0d46aa33bfe87020866c4e82f5e3939028fef305b39a1b5536efb521e838a300972b755295b772348569f0b6cd8f30a763
diff --git a/dev-python/semver/semver-2.8.1.ebuild b/dev-python/semver/semver-2.8.1.ebuild
index 96c5f29a8abd..6e1047be334c 100644
--- a/dev-python/semver/semver-2.8.1.ebuild
+++ b/dev-python/semver/semver-2.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/semver/semver-2.9.0.ebuild b/dev-python/semver/semver-2.9.0.ebuild
index d7908deebc85..70195029b280 100644
--- a/dev-python/semver/semver-2.9.0.ebuild
+++ b/dev-python/semver/semver-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/send2trash/Manifest b/dev-python/send2trash/Manifest
index d684f3343a3f..5b173f8597f3 100644
--- a/dev-python/send2trash/Manifest
+++ b/dev-python/send2trash/Manifest
@@ -1,6 +1,6 @@
 AUX send2trash-1.5.0-fix-broken-tests-on-py2.patch 862 BLAKE2B 1d0e43f642c47f5b9f56c5e82361c7376501c0b1f5f34573b6a954bf849f26fe9d2bac456ec474c1cef0a24d62a0481a5a62d04b92c943556b97d45e574e410a SHA512 2b63d6fd6c684c950fb3e60df5412931e95dbab18c360a0d3c21a3a99ed011a2c494cd74b1fae933de1e2edc81e7bb9b6f7d46f84c1b04f9c6b3c1b6b6876fa8
 DIST Send2Trash-1.3.0.tar.gz 5563 BLAKE2B 54fe34a5f984ded219a3c17f0e06b74a2e5624a8bda8d5723087a918217041bbf6a2b20976b0b4ba71d4a1e08d9ce645b8d5d7fb022ec8e5ed72786496e1ee90 SHA512 d308dd06ef7a11ad7bcb5d9195fb52aa0c0b8e76590ef11b1576d14815501c32c48b96167eb0a325e4f27d0dbf77f41c012a128d30c8f05d9d5ebec9967e21f3
 DIST Send2Trash-1.5.0.tar.gz 10892 BLAKE2B 36b51f1859a3b40aa5d9b619491a13da8453ff6615e71423724131a2a88207665d3fbaeef49ecc0ff02b77738d02023c08543d8a759cc0807d74740a8af9b9de SHA512 3c08ef513e5707cd4ac82290b326bb19161222c7a84b8ffd494789ba9858929241f55ea55482947af464c14e32fea27bd92cd762a32a1d55e2daf2e21fd63172
-EBUILD send2trash-1.3.0.ebuild 609 BLAKE2B 2c6de96430ec0f74eef7c0c24c927121eed689319220680998fad0d9fe1a11296056eddce162f3fce8520e162d0e9d88f264302672bbacc4a3f6355812a5731e SHA512 a925426e385b18290bd30282e9f1f0b88db16b563b5857f9091ed600f6a30e106baf7312fa688352f1ccf164010e3b018884fa2f7a9da9576d434d2ff8e891c5
-EBUILD send2trash-1.5.0.ebuild 678 BLAKE2B 5fdb6ea7c361c598b8e07d682d25a1577d1074f3d5a6c75ca5f065ab70790d7f7d8fa19b7088b4ae016207b602b071e96aedcfdf7c5637c48efe40259c67a4c8 SHA512 20681e659f7bdffb1b3149e41d628cec2a732a87be4c3fa61603fc650350a40889cd4e974f2145a818306c02d3d6988a0ab86138b08f287c14d36251da6c8f27
+EBUILD send2trash-1.3.0.ebuild 603 BLAKE2B 8df479ad95ed8c22f71f5038d25b2a4ac32956167a594c0fa3fa9ddc3f7acb97387e3d1b19ce1125aa1810836de110fe7247b4c74286343b664bef45c15b2c52 SHA512 60c016714a2ee5ff5f31c11a549500d7c54076ff1790487592134ace00f6e072ba0ee92c3acfd7b0d0e08a1fb4a4daead1720ccd2962c9467235914949ea3901
+EBUILD send2trash-1.5.0.ebuild 672 BLAKE2B e9057784ca96c0a14a4dab5b745c9ce6596350b77d107abed1fc3138a119e3d5b0493b21e309a93e8a54afeecf9bfcb6b43e34f98dad5499dbe23d6db3f30810 SHA512 93d5eec8f34d78aabadc5aeac7220266be4235bcebcb68c9ae13e2b67182a9e4f0dc5d110857be07eb49be2e16bcea2dcc55d5e084920dc54136d8a16cf8d6b5
 MISC metadata.xml 381 BLAKE2B 5afbd1afb5fab636015e710ae55c2e7b6c9eb24d1ffe0418f4ae4c6d02befdf4d50922d25ae6dcd134e2f17de1cc5a7bcee0467cdfc03ac86cbf5b31d33153dd SHA512 309a92e88f854e9384519bb8a959025c97a8c75a7ee317a17d2c51c0a444b0fa008fd46fbbe07be3dd95ab2fc1930cfdf2a0c6df7ce68fc190610176f841067c
diff --git a/dev-python/send2trash/send2trash-1.3.0.ebuild b/dev-python/send2trash/send2trash-1.3.0.ebuild
index 3420408e9afa..ff1bbf61d817 100644
--- a/dev-python/send2trash/send2trash-1.3.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/send2trash/send2trash-1.5.0.ebuild b/dev-python/send2trash/send2trash-1.5.0.ebuild
index 121fde52dd1a..8c20471c469f 100644
--- a/dev-python/send2trash/send2trash-1.5.0.ebuild
+++ b/dev-python/send2trash/send2trash-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 417006b8a2ec..757db5353289 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,7 +1,7 @@
 DIST serpent-1.19.tar.gz 12055 BLAKE2B 1adf86abf58b4afb82a9d2ee3b8fff4107f3e1cd383a33359687b80b2b917ec1af8f15cb5b849c0979035daecf2aaaf1230553a478e59480f160d8df456b5fd2 SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd
 DIST serpent-1.28.tar.gz 26912 BLAKE2B 7608e1a25b4157b8e304fe6e2265f0204a3056c752a58ac0c7eaafe41b4fed9246792147a8af87dcadf5c6e94d3d494f7b561a073e1bf91e412b60a286b00a10 SHA512 776bc497c7cd815c4ef44107bdf53b62bb92229beba0be7efceb9fba57dc7c677bf09832db335485df3e466acdffe6ebf4b3636ae9b49e60075379a7419a29ad
 DIST serpent-1.30.tar.gz 24046 BLAKE2B 8a803c9a47ffc9432eb6a48f78d5eb295ad477eef0c24a21c886aaca2cf4e63decf6b1f00d5f71528d867ecbe5789de0c2d19777d651d612f7378f3587a34ab8 SHA512 7ed44f21c9c3079f3423636bb833c49e3eebc89fa4cb6947b01f7cb6cf0161f7a0bf7e8508cef61d9a5475900e3c49d1e72e38cc24614ee99cac449e8b28b975
-EBUILD serpent-1.19.ebuild 598 BLAKE2B 267348b0f05ce61cb443a0bd0aa423f308cf729c8346bf0091759989c7e4d2a62add603b766fed82aeabab6e1a78b11f327cdbd550877821d945f2d88230269c SHA512 84206ec8d1da6cc7811bdb013efa6a8cdad442e26e9fffa4c4b0f42a270eb5469398ac1616a4c9297801cfd855c9824510b4eac09950353ba05933740910e705
-EBUILD serpent-1.28.ebuild 533 BLAKE2B 288b02f08ffae3a805f92f3f3dcaed3f3c6318d614753241061f2b6f7269b86ad3f889816be84b03846c568dd6a9862569b4c240969a49a12a5fe1ccbf8974cb SHA512 75ff7b48cfd69f42acf62b8ca2665e167c000507cc6c412ac0718bae60a407a50dc0bb951afcf0b81770bbfa715cb85e7b93adca240c9b178efad6d331bdfddc
+EBUILD serpent-1.19.ebuild 588 BLAKE2B db8496f494856660b30e0e8f413185b7f5f516df20c2ff55e07307bc7efd8e4b84511ee6f9831311ae0aba26dc0be6289bc799dc7d61104a41a975a0f7fad3b1 SHA512 07a38c8331e333a4a997dc8f1076ce9ee5f450c1fa0513712b76ac7ea04c7344a75db9a270b5d13fb4f8846479b1732ffd582a1bf882f4c61393b746ef55f091
+EBUILD serpent-1.28.ebuild 523 BLAKE2B 1d3405c1d15a9bc14ffdb7571ef037864be3f54b0f072f890b2a1d266d0908390bf91cdddd03d16bc805b77595a8e0f7b7f1cfd7d4c1880e63eecb93bf297857 SHA512 c609e2973a82893b23398ad3275a851732590c11fccab2988cfc658dbce72936c58f20c744e41d5f59cdad2323e718e42bea09da3e6e7603780a7011b18bd9b1
 EBUILD serpent-1.30.ebuild 477 BLAKE2B ee0d7b6da6f77dd87dd44ca84fc1d1175875dd5a0c5e5c73301cd92f670b7d01c1373aa70aed9a80f4bcaebdeccd01798f0c474a9a051e59acf1f7da36b139e9 SHA512 5368687c28731dea3e5c5782d972bbb309577a22383450d1ecd41ca0879819b44f1997eff29f51912304f5ec9f7df6a4b72ce7ebefab8494351ead960e1ae8be
 MISC metadata.xml 363 BLAKE2B f40df45db2fe2c0b0a35e6a9554ea3d39f25575e6e83dce3fb235a72bd1cfc3bd07bb106661470fe3f01f79bcae06d0e70ac8213cffbc9119bdbf4a3c4475eda SHA512 c0ecbe2e072730e43679dd09334c4fa300c1660a740cdb7071d6d87f112c25493b169f0ca7c5a99fe4a978a8d81f87a409519170cbb69430994f16a8bb193500
diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild
index 2befc32339f2..4dc1318e0740 100644
--- a/dev-python/serpent/serpent-1.19.ebuild
+++ b/dev-python/serpent/serpent-1.19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/serpent/serpent-1.28.ebuild b/dev-python/serpent/serpent-1.28.ebuild
index 405c52911bb4..ae84b9337456 100644
--- a/dev-python/serpent/serpent-1.28.ebuild
+++ b/dev-python/serpent/serpent-1.28.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index cc1973381bf3..193ccd576baa 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,12 +1,10 @@
 AUX setuptools-42.0.0-imp-fix.patch 1839 BLAKE2B a11f8fe053a4b0ad8d326be339ba9cc95e3b90441b8fdeb4ad589d8e8248abf63a11f97ff1917aea73d3f3daf054d9fa831e805ad6823f31d474e25d67e15eb9 SHA512 c93a5b24f0169ab64ba3c80aa9c64a70609d89c776ee491de3088dc6dc7149d709836f79affde03aa58e2065e014318182a2359bae753fbb47c98d05fa9bcab3
-DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31d670bddb9e4ea058b8ee7dffbe6fcb0e5fd24baf3fb38f5e824fde36aa8dc1e09d7ac37f9375ee351406389cd6 SHA512 6c628b8fc67645bca96ddcd016ec9a685e91690bf98dff077e842cfbd0d8d24de76ac51b3ff238d31551a48819d8f694fee6e9bb422ca954e54c22b4bda0038c
 DIST setuptools-42.0.2.zip 858444 BLAKE2B 2b77dbeeb9a3b4138810a96fe7ac0a7800717b4b68d6e9db2d146ca176127d5bfd5e4ef07adfa98758f8c4d05396152ca08e1707caf3d91703c7b268bd291f28 SHA512 ab623fd69b92111d3ab19a3ad9de9c07b4316f4130f3db4068a436d3c13c971d97506f7307c9f64d9cc9ca24a5f3800b68748455e70418d0c0cd240c93ebae35
 DIST setuptools-44.0.0.zip 858893 BLAKE2B 02ba2a838487ba9e80d9ca3b8598cecbec4d286f2734be439d2b73f3f7f0ca80e80ea71a0c2322093deb548503c82d6eb32b1585992979b053f14f49baa00baa SHA512 bb48e7763d258e654472bc416d16ec8708eefa95d1eb03cb6e81b623fd636cefc51a0bd67887084ab0214e256e2030a8f655184c3b59ad6937abab6a6178f3a1
-DIST setuptools-45.0.0.zip 859461 BLAKE2B 060cd64efb4ce67b931f5a5672222d2cb6e2bacb68edd50af5b14b8de95b5b9b7727b76b970084257ec9f3afdf4a7bf4acbc6223b6e355d033af3660dfe4f1aa SHA512 d912d093866dfcf7b0e22ba2df51ab0d366c52bd5796f0aedfa0b1848abc80a2e30035897b83bed08b67d9d7d0fce4b0c4981c2a80196b8637c19f34ec269645
 DIST setuptools-45.1.0.zip 859771 BLAKE2B 585ff16f57709c4e8c74fe51442a21e052be9de20e2d8c619ebb7435764297bde9223f1a1660b4101b33241d0d6c308f3ccf7cd2404caa3652334a6d314eb53f SHA512 0f08a9b3fad131a99c44d3cdced21b533a30b5f8fd25d4ce21263f14ca6ed6a6789969b67757ea67c62b9cc189155b08c886c3706ce9f2fd30bd5537e1a4a7e1
-EBUILD setuptools-40.6.3.ebuild 2086 BLAKE2B de81a3ee0ec3ab13d9ea2a6dad956d8d425b26079d2a3d191eecf92be7bd7da3c5aad393eda7d9e217a63744c5f020de661c77794336b59ae4c4ef7851bc187d SHA512 312f8a26d4d82363903515ea1366ef8b2484c4a3c11d6bde8c0ac01c407bc3414d92d7d664ff676819b190128a5ae3162b1eea5a1d576a9473cc4ac38b2b26ba
+DIST setuptools-45.2.0.zip 859896 BLAKE2B adc9ae0ebd6ec5c59b7541fa7cf2898f0b9082cdd9cb7ddb614d749deebda260da489890fae5da77c622d47dccdee14ac9d5bf3ddf4393ca43ff679bc726cea7 SHA512 0d1e1e5b4074bdf9b35515dc6d9b03476ebe48287f30ff81ebc23a4b6e12a9faabd6ced40642ca6c5f27030be0252f48f18e73eac3876a447b1c6d4320a50147
 EBUILD setuptools-42.0.2.ebuild 2214 BLAKE2B 68e0af2f4b69c7b353fb788f00266c839ef74841b2b4770f386ba1d71359e959e93b5dc84221290ad869a4ee79080772ce3cc02799ad122a715538a0c9ac91cd SHA512 5575e21c05fb85c9ab95e1f3f2e8827ae7f0d7074a49abe981adfca1873aeb5bf2fc95fc30019ce553c0805409263707c5cc7ae43d4397aeb7d49e97ed489451
 EBUILD setuptools-44.0.0.ebuild 2223 BLAKE2B cc143e093bfc793aceff351f68b58fd3edb4597a28379f9347d43cd96eb7c55c3b0cf841c56391c3cd92968ab344552cd5806626ca4378d89d55b0588bec59a1 SHA512 8a3ef21926e9ecf6f78f4e56ff4c5b436121dce97046bbc66cef9c244403f5373b8f97e0c686959cc715edb2e2a72c5e7dc0bf0a4ddaa275e27e9248315dd9b9
-EBUILD setuptools-45.0.0.ebuild 2014 BLAKE2B 8a697c77ff7fac9c56ce3c6fc5c817c078bec067a65ba828dad2312da3f4a035aae543e66435f99de778b29c42c16583299da7c763994be2f938d3612b258ac2 SHA512 6e551124454d72c1f5b31db6b1d5fef86ebc4aae4dc4174fde7f559712e647be091643584e8d29639dda4b8c3e694b209e585f392d8c4bc798380d79155ce7eb
 EBUILD setuptools-45.1.0.ebuild 2014 BLAKE2B 8a697c77ff7fac9c56ce3c6fc5c817c078bec067a65ba828dad2312da3f4a035aae543e66435f99de778b29c42c16583299da7c763994be2f938d3612b258ac2 SHA512 6e551124454d72c1f5b31db6b1d5fef86ebc4aae4dc4174fde7f559712e647be091643584e8d29639dda4b8c3e694b209e585f392d8c4bc798380d79155ce7eb
+EBUILD setuptools-45.2.0.ebuild 1923 BLAKE2B 79ebcfa3de76d7a25cd3369e139c600505b515574ef989db9016aee202c745f07a8176d308c7ef760e3f3a333a32ff3d48b6c21e41581a971ddeed22bcbc697d SHA512 09affee00c5a51dd949e7113eff7327f21cc00be5721f717e0200293695fe94c02bf867725c29c5136bb5664a23d1a42658150ed39cf43a47415ef669e71bc42
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
deleted file mode 100644
index cda3f2830f26..000000000000
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/pypa/setuptools.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? (
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.1.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-python_prepare_all() {
-	if [[ ${PV} == "9999" ]]; then
-		python_setup
-		${EPYTHON} bootstrap.py || die
-	fi
-
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-45.0.0.ebuild b/dev-python/setuptools/setuptools-45.0.0.ebuild
deleted file mode 100644
index b3c6db3ab76f..000000000000
--- a/dev-python/setuptools/setuptools-45.0.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	app-arch/unzip
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
-
-PATCHES=(
-	# fix regression introduced by reinventing deprecated 'imp'
-	# https://github.com/pypa/setuptools/pull/1905
-	"${FILESDIR}"/setuptools-42.0.0-imp-fix.patch
-)
-
-python_prepare_all() {
-	# disable tests requiring a network connection
-	rm setuptools/tests/test_packageindex.py || die
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-45.2.0.ebuild b/dev-python/setuptools/setuptools-45.2.0.ebuild
new file mode 100644
index 000000000000..e9378e5d2c31
--- /dev/null
+++ b/dev-python/setuptools/setuptools-45.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_trial/Manifest b/dev-python/setuptools_trial/Manifest
index abdd9b7b438c..511f8f420315 100644
--- a/dev-python/setuptools_trial/Manifest
+++ b/dev-python/setuptools_trial/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_trial-0.6.0.tar.gz 6227 BLAKE2B 2df7276197a5630b8140dce17528b75045ea86e15495146aceafc4428f6ab6493fbe8e2edfded30ae644523455df02f3cb85e8bf8879bd4fafc9a332d9f6bc40 SHA512 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827
-EBUILD setuptools_trial-0.6.0.ebuild 666 BLAKE2B fbecaa16ee40ddf597b167610f5407d1fb70d632d48d4c72a901b9c0fc4fb47584c7b4cfb2c68c1a52b1b120b61164cf336ea7e44720b6cd592d271657b979d4 SHA512 c538635f1064d3b741f7c689646697759a42064ce8f87b4022e328b150d7d4baf4a0c6d831d9891890fb9a8909e23c4e8f29568422fc82c6dd5ab956ed2f844a
+EBUILD setuptools_trial-0.6.0.ebuild 656 BLAKE2B 240b9c49e124896d2e4d95b66f06319d2b113a5ad1276925aec6cdb8b65928cf2468310a99a3671377f1d3a27b60bf6ab70bc7e5dc6155f4b325a8efb68915b4 SHA512 6df84f13b821321a6efe19054d0d0be86acbd9b21771c4193cbc9ab76decc9e76f49010f6407d57b30b58169b68f4953bff3633d2556eb9d54c274bfa0de9f02
 MISC metadata.xml 766 BLAKE2B 18d950cdcab937287b9b7c719b629cb361aa63619cc32356d08f0a22a278edafb0215872cb1f88652e4da8dc7fd5a736e28e84e9bf5059b8c4fc8723adc60a7b SHA512 2b7461cf40ca95d42649a7aee7ab1ab262c7ea8cd23f16dff3b6adb2f3450be2f559b273a1c96c151ff654d0c593e5bcc357cfb1506bbba1236d84997a3dd704
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
index 031cd9a3a5e6..40e5bf7921ad 100644
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sexpdata/Manifest b/dev-python/sexpdata/Manifest
index 8fa4dbd50cc0..112e84341097 100644
--- a/dev-python/sexpdata/Manifest
+++ b/dev-python/sexpdata/Manifest
@@ -1,3 +1,3 @@
 DIST sexpdata-0.0.3.tar.gz 13105 BLAKE2B 36c4082a63f6748759d71fc38a056ecb7467eafebf0a1a0b006fbef1302488f23a859462c9526dc365f7c88b8b6c331dc6e4892e1d96358abb44ca60a909d283 SHA512 03d4d1557bcc950124e408d6870894c8ee9e72a2ee83c881adf48f8e53bdf3744b4f3e3e133a74a195d236424b434cc690583a68d8395324ca4e84947e548501
-EBUILD sexpdata-0.0.3-r1.ebuild 523 BLAKE2B 97681eadac4b3584880cc8cb1131b9d40138e333957107021c5ae24573994ce888af3054f024afc9ed9d5c2c61adfaf83b3cd151a09dc9574acc0d7bca24a850 SHA512 bdb4f90bc4003b16a130d1442f67851e1bc5f1b27ec01f768e8ef610d13e2fc7ac72b8eeddd2279207fa4910e26fd66f15c09ee0d6f223f7efa67e3bf0d812d4
+EBUILD sexpdata-0.0.3-r1.ebuild 517 BLAKE2B 091b720ee0adee43d65aa96cd37fe2841f0258e6eca75d56dab0e9594576affbe06613dc36f0e3cc8fd1f26ff61e3882f1462e2bcbb3d614290628acb5b5fd26 SHA512 7199134f0ccfe258e6220f27252620c3d7e941398adb1dd441ddaab5d3c20e0cc43e13915d30fb1c2325c004a14a8cc6a7c827cbe779637a2c3f3f18a5c88464
 MISC metadata.xml 247 BLAKE2B e205358ad766c8aab0a8a989527dddeefc2f823cbcf03bab4b79f6a8fa1094286715eaaa0abd97c10f9d3a1c58c2a486ef9846e851788daade0e567c31848067 SHA512 9e0ba28b7310e552922e103b228d991b97d2e670bdf48f384f496099b676234ac5449e4ff2cccada5affa0510272bb33c125226f1f54733fa83038e8dccb8e6b
diff --git a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
index 1f1fbd53322d..b0baea02ce4f 100644
--- a/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
+++ b/dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index de5f8e75d59d..014064481227 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.12.14-tests.patch 1261 BLAKE2B 57c41b50078596998758410f79f0c54458b7884015382f28c82c893223620b42191d19f7fcb4a7065c38e6f2c35ee3e5e3c238667154aa0a2ad3ed6c6e342664 SHA512 e31ef40766e793e1717d15a537a30bf184cdee767d97b06b073074e0545c7d7fbb6a215e21d86ac70e0991a2a4d1bc35165442414ffdea4ece9a7c6a0c73952d
 DIST sh-1.12.14.tar.gz 56861 BLAKE2B dcab86c518fdfdf763053f05a6701fbd0faa76e05d710d6ef709dca89b7527157385ecde355f5f358ba08f7da8e551712732ef43f3074f5568fc7092ed12f014 SHA512 5f2daa2666cf8efe90ba550c8ea5875f2a8812d787597c9d9b933f58feccd192e1ec0ab5695b756bdbfbf9748d106c2045be20838e680b31dac3f778970b5786
-EBUILD sh-1.12.14.ebuild 667 BLAKE2B bcaf7fa8b7160f5126103efb90745449fad781392ba4aae7ab10e6a6d1a02291f6fd402cfe3e42102327f13790c42803d40e10a89c2bbea24c11ae0dd3d21a9f SHA512 5ee9a0bd52d1579ccf77498a7b97e697caa10818e514b58603750ae91e2178e5208340deee7313a2256930e6122277f1a71295d7d731f2b285e17d6ee34fa74e
+EBUILD sh-1.12.14.ebuild 657 BLAKE2B 608e5bdfb1ff2a4c31931160d2861249b684688cd384dcee1daeb3538a87206acf8a56274318e6f83b5985f9244a989d91d1ae30379da70e9d9754be8b6dd423 SHA512 05c1479352fd063121156970f6acd10ca11769d078843062f7dea928baf359149a934ee200f6cea70f5bfd1da6d584e6a5a05fd3a337473b9cb20159cfdc03d5
 MISC metadata.xml 676 BLAKE2B 217e170b6b5cbfba2e5029c250dba3927f3cd2b3bbc5111cb5ea459fdcc1bcff0448a8dd2e4e2d8afe42f459e7a485fe4fe04202e9c253bd51f785eec216eb5a SHA512 4d4633de70608259eb2bb288af89992c90fe192258ac157d07f2d568922a88b497cf6a3e2961b266603089e55ce7cfcd7ae2831879ed9afce4c3c740479c2756
diff --git a/dev-python/sh/sh-1.12.14.ebuild b/dev-python/sh/sh-1.12.14.ebuild
index 3e665fc94200..6278d6e98ad6 100644
--- a/dev-python/sh/sh-1.12.14.ebuild
+++ b/dev-python/sh/sh-1.12.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index 1392b60f2fc6..7cdbba9dad5c 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1,3 +1,3 @@
 DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
-EBUILD shutilwhich-1.1.0.ebuild 515 BLAKE2B 9d12ea18a8b0f8071b880714426ef663702ceaf47a044a1e1a90043ab1e54928b2dedd4edb502af71e2776e7aad96efa687e62e23738477d9a65cc5710b08ee7 SHA512 36e67d5a293e9eab987dd48ee972d1da0e5f5143b498ab62330cc5445cc45cd0a54ced473d66c11685e6a8b937ab759f1a8a6262e942cac52ef5c403cf6d970a
+EBUILD shutilwhich-1.1.0.ebuild 505 BLAKE2B e08275538fcf1abf4f365ccb7163571a2ba2ccd28aeedeedc95996f6b324bf38daf5bcdcd434f240ef5806bea0da533837361a4f9ef43fce1957543ecd146744 SHA512 b75ee205f46eebfb69461eb84ea575a7bcf6bf52bcf4cdad950da3b6e3948121c6bb57b7fa195be6f1203053ec7059434f78f383d319604b82ef66cf14baaa9b
 MISC metadata.xml 661 BLAKE2B 939bf0c624afa004f9db51b5dcbed8b9425dc18ab380ff1a17dea7970541a27583a69c137b90ce19396a5b83da7aa6668f9258f6c388b5a4205bdae2d4057a38 SHA512 962875eb4e6647865b9f16c66b5e40c3ff84406e1be3429010ae1914eef102ec8f7353f31f9e8697511830224112ee23796adc69cbed17fe1341892c58fd3a3e
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index 633740548c5b..1ea9faf25c62 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index 6b09c323feba..24d4f73ad5b0 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1,3 +1,3 @@
 DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
-EBUILD simplebayes-1.5.7.ebuild 700 BLAKE2B a24687bb6d5d41cc05a6442740efa0982a2818597cd09a8b1e64e24a334c88f7f45793ab853a8bd03ccdb492561b4e50d90956ec11fea31b97efe454f9c31fd0 SHA512 51f2fcd841cf7474178a5e83a1c24b12c1561bd4e52f9526eaeb93d193b3b4eb15b25ef1518228a3dd33a0b7f544ec1ee12f432e74f92196c8f1d7e0df088cf9
+EBUILD simplebayes-1.5.7.ebuild 694 BLAKE2B e55a36d9644bd5d5eaad4f2fdf6d7dc276ca0fd4aacd833870e396e124c399d2a269057c84ed9fd09bc0006e7db7f9b4d1ea4451232378ec8b8dca484926fef1 SHA512 c62f24a2e115b67cae85b363d6d1a6de305d00bc0c606dc293cc22c4b373b910a754e30fef4de1955183318a2059afd97f11dab65d0772a6986646bfdff47721
 MISC metadata.xml 613 BLAKE2B d2456e6bcf0c65893658fe5f64edd2a407b394ef468f4afc9c7f7386042dca32602acc7ed9822dfa7445f6853d3ecba4579b397630d73a9dbe62389495386bad SHA512 ca6a18f6ef26a213a83f4dbd6fba4542c868365fc713f386a0ab92e4cb60a9faf0fa96f82bdabf81ec301745a63d35e821203ae67dc0e1b6ef3b18cadf50a97b
diff --git a/dev-python/simplebayes/simplebayes-1.5.7.ebuild b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
index 0e213daf1600..d9cebdbdb328 100644
--- a/dev-python/simplebayes/simplebayes-1.5.7.ebuild
+++ b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index c57a99bf5096..f69596acaf41 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,3 +1,3 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r1.ebuild 609 BLAKE2B 1075ca48f0e8bdfaed44801dd9a3f69a48a18550a04f0e7b96fd5ddfd7e6e3b6ef0cb770b013dc6837f26321515bd930e737cf6fec3ad189615f7fd96c0a645f SHA512 008ee58ef522b793ee37dee9df812aaef82840e51ff12769a78e1855ab29336c825d6586a0c621126700693235baf1d52e2b0f8b18a621a5a40d5ea0f2bdfd63
+EBUILD simplegeneric-0.8.1-r1.ebuild 599 BLAKE2B e8cd2678c09d47f355a43e46708239a76026e8ff29b57d1a33b517d9c78bdee0af21742a2f666b899219b4fc5d05193434b83417ccde2f746a755c6b6e35fa8b SHA512 d2954aee47a248ca6bbc2b6d111f6e4c645bdbde74e4e885a56844925d7d8d47f92dd4315f1591f44658dfb9e409b053cbc313476ecad4cd012e9268d7509c4a
 MISC metadata.xml 732 BLAKE2B 0547a9360068981db23bed7749d4043fdb9e1d42da49043a1b986e67598a613e2af2b7261b06bdd2070ff8e1b6c37522a023520f71e18c7d1e44170e49ecf09e SHA512 3d138aa823f1fa2f8384dc4a29039c8f143c3ee77d8f2b410be55b01dafb402d6b678272e0766fae588c12a6816a6df57f84823d8196dd4e748b9ab01742e50a
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index ab988d24e1f2..c26a6a0777a4 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 791eb069f630..cb0b16278c81 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,5 @@
 DIST simplejson-3.16.0.tar.gz 81203 BLAKE2B 84b465cad6d78814b13ecf5e75b09cc63a9aaaa12b1412567feabdfa02f9c0e83bbcf8191425c517cea38f6bfccbd691442fae4322957dc6ead6565d23393d6b SHA512 c90da313b21ab862b6132e7bbe4883830c8a26fd36224f307859042852cdb900e36e41cc7c6773a1d4cf89476cdb68e1136642f38864ad6ed398716390122968
 DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
 EBUILD simplejson-3.16.0.ebuild 845 BLAKE2B 73ac5530b7e9364a49d4cb9f67917ebce4da28450918af73bfd772073b712250fe3035ae9e77253fb0e9b1b9eef3d8f7287a1c0a99a256740713cb737466fa07 SHA512 97f8fc7a91f89aefb7f26ad90f83d91b0e82441464477f0d714f4d1f123f48974c289d5a8809a7353ecafc72f7fc3a1d7db587238ddd78c6760e8f08e3e3995e
-EBUILD simplejson-3.17.0.ebuild 825 BLAKE2B f28477727224efd0d0ceb74150df8e56266ad90d2790db3ba1575922cf950516b1c2de67cfbb6a538d2bdc0d61aa4157ae041c084d4b09e231df397ac23dcd92 SHA512 f4a6a81afea5808f4153afbb4e4669d0e69973ea07b71493c23fce224994e06d1d4e56b818f9ceeef2130fd18be911eae005d2220fd7f8435117e8b2ced4bc40
+EBUILD simplejson-3.17.0.ebuild 824 BLAKE2B b3b4bbdc5e11353d9becd0fb12d24ccedfd2c6029c2c5944bf89ce0008ee6eaeae8924d5933a46a7144d5f2945bf336ef542824661f72b0c31935d339deae775 SHA512 9752abc99d594dcbc7428db494313517231aca81ce7df002d153670b1b7b7b939426c87f7f0342383ba88b94cf6df0302d698ab23c539dcd29e4928e167e3204
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.17.0.ebuild b/dev-python/simplejson/simplejson-3.17.0.ebuild
index 81d43f54c62c..dda17d0ac1e9 100644
--- a/dev-python/simplejson/simplejson-3.17.0.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/simplekml/Manifest b/dev-python/simplekml/Manifest
index cabb18615ada..987889cc63d8 100644
--- a/dev-python/simplekml/Manifest
+++ b/dev-python/simplekml/Manifest
@@ -1,3 +1,3 @@
 DIST simplekml-1.3.1.tar.gz 37070 BLAKE2B 33d4c9bb7d77f80dd65901dc1f1f0d1f1586b6a800ac63a011b398d8bc13591b50e21d3e0ba36ff6f3b728ccf355fb021225a63846f4784b2b52d59526045154 SHA512 a72d378b44ccbe5f597f100784f3e802255c9a47216132f6ad13e594a2fb70058224428df5b7450ad7e498b9cfbfd846191d30dae225169957ea35659dd0968a
-EBUILD simplekml-1.3.1.ebuild 584 BLAKE2B 95a3b5765af1770cecdf5ea566d21ade19492cf1d0e37e09bf66a1baecf62936aebf24b79465cde0e9d74ad8039d8f905659896979f83b9371b371c376095250 SHA512 b81f1b788e67228c560875dc4e3d71ce6cb4539a61a4194be0f5784d99004118574668b01b809877ccad672f5f3b479cd4474bc35502ef132348f2be301b9135
+EBUILD simplekml-1.3.1.ebuild 579 BLAKE2B eb3c75c572d0d20c9c15888d069b40215c2e930468f4db187e41d0dcf1d8b6af2b5ed472f2f52e248bbe5eba89ad31cd05bdc96acd75c1ad9e1800bb7309d827 SHA512 bb164f1b40ab6138b640462f27f8e747423641e754a1ff5fd83da44d7e06af220259e1e3289ad3d60f770470eadc2bc872bc3523569da78b4e1d364baa6233e0
 MISC metadata.xml 514 BLAKE2B 2c938b0ef59d68d0225ededc4f03ace484e51b7006db859e1cfdf9c122947bb25e1524a2ac17a7a0be0fd9a9bb6e88c13413bd65e96a571be3aae500c18d65db SHA512 a7cc7f1d59a2a9804ebbf423b8c237530913c5d63114ae890df8710826f3c2654bac1bb0dc5c4d82585d9bb8b704e192c6d3214b8a3bac5479b548780eea8743
diff --git a/dev-python/simplekml/simplekml-1.3.1.ebuild b/dev-python/simplekml/simplekml-1.3.1.ebuild
index ac624e96a057..e4c0b7a057bf 100644
--- a/dev-python/simplekml/simplekml-1.3.1.ebuild
+++ b/dev-python/simplekml/simplekml-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="enables you to generate KML with as little effort as possible"
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
index f8599a7dac89..292c204e380a 100644
--- a/dev-python/smmap2/Manifest
+++ b/dev-python/smmap2/Manifest
@@ -1,3 +1,3 @@
 DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
-EBUILD smmap2-2.0.3.ebuild 716 BLAKE2B 45fbeda9e3e543606dd1cae9968d5129fc2a7e7c52bfbf1b7d714443a19cb840a5c0b372cca7e6cfc0ca5648a624b9dc3e448b95264ff2b3808563c1ef22df21 SHA512 cb80aabb89ebcfa8fdce16c9f6d7da3f0bba08a0f8b0a052488b65298e1b32d69d587e446655eecb8ede8ee71ef4f91de8e378bf5b68804ed54477127393d31c
+EBUILD smmap2-2.0.3.ebuild 706 BLAKE2B 3e10945fcd453c6a1c8c8607a943f6fbb87bdacb27d5e3a59713e3225204cdbd5dea161c65f60c78ccd4b5c6a31fadc855d110bd4037cc36935b4baaeef35c60 SHA512 232d25d3667a051ff15ffebb8a0a9099e6bf2d46fc4d8e1cebeb84bb30d280fcb9b4fcc77ff526d92b445285f9a67d49a770ca21592a1c844396554faed3e953
 MISC metadata.xml 387 BLAKE2B 70154d8612cf6e5634d429efaa1bb8eeaa9c09be7dbe7b8279ae1fb5bedd1ec0cb008eb84fba44f78b488d9cb2faaf39751faf39a62399c13a9709e62644fd8f SHA512 88990d23bd28d820c1c6ff4827ed74dcd381ddaaace31efcde02cc66905f4a96ebfa05dc5de080273dc60f88c50fd3111649a34cd1bb8f68e65574f92b55793d
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
index f1bdf999cb60..4a29653bfc62 100644
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ b/dev-python/smmap2/smmap2-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index c6ffee7f4367..42e62dfba3a2 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,8 @@
 DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5
-DIST snakeoil-0.8.5.tar.gz 296311 BLAKE2B d88b3f5fe299511343676ffad5a1f1efd10078f50d029b74feea66f6b6f65897e2d4dac2e96f65e0cbaae0942c5b9867fce868adf12be746c9c4ebf6f6a7f52f SHA512 d25cbc105d5c881d8e99d5c2970d524914838917a4a716d8f7269a85af0d9a067b9bb9c26a37b9eb49239f97360938bece1a1ebe87aba04340b0fe528f44dc4b
 DIST snakeoil-0.8.7.tar.gz 296593 BLAKE2B ecc745d63e50c5393ee2cf2bea62a0f356b5aa5432f4b6ca2578c7324139592ad38aaf71336715342298da9a2b8bc8c90efab3f9512835b17b4af56632997bfe SHA512 010bbaa08f84ce59f20324ae86af4ad71c167442557934e31fc2040e3ced8d2ce0f1657272057d06e9fd1c22fd8ec89ad3233f24443ace4861121319f2772679
+DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd5743679280f1f59737567cd5d79deb945be847fd3cd47ff0ed67cc836d2a3e53c4aefbe8080da767f380295538 SHA512 ea1ff6ea45c9f5fc3bc539cc65031050093cc1fbdda869b7160b286dcf3233577ca297ab55ee3d7ee4253c5485f9e956e14ee2a97bfb88680811d1b8af6cd62d
 EBUILD snakeoil-0.7.5.ebuild 985 BLAKE2B 40934f0dfb896cae019ed94c98a6ae9f2a321284969d4bdfea200514fbaaf0337cfc9e1240317e6cc95229f04937290777ba0572c11350944bb6acf23b3bf4dd SHA512 8f9e466d849edce6bab3f574cfdcadd8d56a6f68391d5c348d253ab87bd36d5a3225fce449e03e870991eb5dca833ffade08fc323a9811151afcc2bb71bf514e
-EBUILD snakeoil-0.8.5.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
 EBUILD snakeoil-0.8.7.ebuild 853 BLAKE2B ac8414fddb702660e14cd68a4b1c776edb1d48edbc8f98d2f3f6f60742780f2b8b26e904ad2905322e2435b3958a28712bef6a5ad2158e427f395aaa6ed28925 SHA512 b4e1b23a79469baccd8afc954e4958cb9b10e8d8818afc29f60db91e3a318b8a3cd62da49b995ed4f4c5bd1aee68a868e287fb95b410efbb689664ff92b18d11
+EBUILD snakeoil-0.8.8.ebuild 853 BLAKE2B ac8414fddb702660e14cd68a4b1c776edb1d48edbc8f98d2f3f6f60742780f2b8b26e904ad2905322e2435b3958a28712bef6a5ad2158e427f395aaa6ed28925 SHA512 b4e1b23a79469baccd8afc954e4958cb9b10e8d8818afc29f60db91e3a318b8a3cd62da49b995ed4f4c5bd1aee68a868e287fb95b410efbb689664ff92b18d11
 EBUILD snakeoil-9999.ebuild 853 BLAKE2B 9035eca1303cdae4f01a2e03e0da75eceef89499c9e93f9252eaead74a21f4252f14d6482aef81cc6c945a0bf4e0394b41453eca8d471a752a325d80bff473bb SHA512 6c6e4100121bf66814454b37b6e51870cd99533e7e563505d6c38f6c0505e79fd9520b07d1115a23d36f97aff20393f60bdb4471ce2a51696771995f423d66b1
 MISC metadata.xml 499 BLAKE2B 57da127293cb2cfacc6370aabd140a115946f20a8e4c69e84d0b2158941fe3096eb42c12793445ee126e9123928db3156c589146aaedb9480f5538d9a40b90f6 SHA512 09070bdbb1b135b9daf96c0e342d036522e993a4b400169ad69005004ef093b6209a3c26d056e01cef435c7896f402fa6039ed0301fad4745e0ac3874a1340ac
diff --git a/dev-python/snakeoil/snakeoil-0.8.5.ebuild b/dev-python/snakeoil/snakeoil-0.8.5.ebuild
deleted file mode 100644
index e073443aa4a6..000000000000
--- a/dev-python/snakeoil/snakeoil-0.8.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="misc common functionality and useful optimizations"
-HOMEPAGE="https://github.com/pkgcore/snakeoil"
-
-LICENSE="BSD BSD-2 MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/snakeoil/snakeoil-0.8.8.ebuild b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
new file mode 100644
index 000000000000..424cd085a42c
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.8.8.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+[[ ${PV} == 9999 ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/socketio-client/Manifest b/dev-python/socketio-client/Manifest
index 872d3a5e004f..f635aa9522ab 100644
--- a/dev-python/socketio-client/Manifest
+++ b/dev-python/socketio-client/Manifest
@@ -1,3 +1,3 @@
 DIST socketio-client-0.6.6.tar.gz 21829 BLAKE2B 72e47f9aa4bae06767aa1860fc7d57f7f2ae78dd037e46aa50a8672f4e168982d6e602ed8f80f203081e5747cacb0f6fa2959311271bc578c1b8b5bf70ec506a SHA512 aa21d31bf9e9062578fc6892a7624ea41ef3437eff132ff3ef2829a589c0fd19953fc514ab05161a32d06578708fb7f41b2f636d3d60a2700094e676d72cee47
-EBUILD socketio-client-0.6.6.ebuild 1466 BLAKE2B 16f410d456bb1bd430dfe7d3bb6987dc8163dd1b680b728a9818ea2bcd1d4f0b96a4fbc7fae5c3309e4376745f4fe52bcc84f0d3869179c6455f1626d6502bd3 SHA512 9e62cacd4269182c29c5563305a691216584130cbaf4097043adb3719e7cfb46902aedd5949fc3d5265e202d023713cc2556e2086e0dae91ec31427df9573b7e
+EBUILD socketio-client-0.6.6.ebuild 1456 BLAKE2B 54f225fd0cce72b7653fb96169a1b7b4ff0371c9aaa53bf148ad82a6d6964e27b235f46be347dd2080ca5a86581c15b44aecdabf5ee13cef1ec971088fbabf82 SHA512 5fa5ceaff2b3b80b1cd134bf90c2fd3c05f4cbcb4cdaa327fab724fb65ba20d9dade94a76189bb8fa844eaad26fe4759229f56718cc198f337e9de98f8ef8add
 MISC metadata.xml 466 BLAKE2B aeae4a6f57347d31b7eed388cc7beeb819174f5f07b438a418f99532eb01ae092e6fa9a5758512de10f96f9e8aecef0e234d6e893ba39a353ddb1e42f1574b41 SHA512 a5d48ac121de3b0334d12ff4e472aa04be849f87f8ef39222a5a112674d36390d1ca69936d675cb7a42d11e73cdc5019540091ac64b727842d515b2c96b68c09
diff --git a/dev-python/socketio-client/socketio-client-0.6.6.ebuild b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
index d225f8da3c97..c96272130c69 100644
--- a/dev-python/socketio-client/socketio-client-0.6.6.ebuild
+++ b/dev-python/socketio-client/socketio-client-0.6.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
index 626d17c00bf1..6d18ae05bd2f 100644
--- a/dev-python/sortedcollections/Manifest
+++ b/dev-python/sortedcollections/Manifest
@@ -1,3 +1,3 @@
 DIST sortedcollections-0.5.3.tar.gz 7021 BLAKE2B fdef18b938502f0fc7ce1683977b0982c23aa915d79b6bac30cf9cd74aa19af695f2aacb658a8411304497f28d270e9ba95bbdbcc47220f0302cd376edf312d9 SHA512 e0076017d1a97d7dc18b02bc4e3739c535ab001260be739fab2784cb58deac4323957fe21b4c679f55a790d864ca696695a603298709225b04eae740d859ab28
-EBUILD sortedcollections-0.5.3.ebuild 592 BLAKE2B fa62d3864a6a9569a46c1a5c018015a938f7bb5c19a81a6cd3c379ee9e3a246797b8ab7ee96fd309dca69e207182bab77d5d9392719d14b4eb80396468e400c0 SHA512 d10de17ed9603e59511d5390e1f5b1d519b09800089b5a4981473923266efc31bed390d3780416c14ef1cdce27bf0ad36c0f0d15d9afedd2a4cefd318c085f84
+EBUILD sortedcollections-0.5.3.ebuild 582 BLAKE2B b7e8677827247b44d65105dd8e2bb6de461f5743e60a8b9e46344942748e4fafba11f97924a825f37c6388fbef160517cd413bc3616028662ef94a29820c135e SHA512 ef29f878f32fcdf15b6c32807e9c9befab30dbe5736279ed79f57142ed0650dd1fe4a8625b91cfc98e3fa7ac15008fe87ab6514d5a1ba5d9588d912f9c3f7d18
 MISC metadata.xml 498 BLAKE2B 5638984052d38b48773ba3efad23de34d7d22e5de6ab570a0f1c8494918b0f331b2a3f7cd72d976de9d1d24ae623af07370bf9daf6833792019472a1a23c2fc0 SHA512 d332e588cdf6194708c1e3f00e9e8159669eb36cb21b4c6eed8e5af44f09f7e71f12fe437ce889b96599994f7a9c9d7c4fa6642c2ab74cedb0490d21a3165d21
diff --git a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
index cf93ff3ae9ce..d21830553a57 100644
--- a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index edd04c359752..177724ed7590 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,5 +1,5 @@
 DIST python-sortedcontainers-2.1.0.gh.tar.gz 9220860 BLAKE2B a667fa817f0b240b8af9758d5d3942710cfe6a39109c41e6e66d0dd464b300d2201a679335e418442aaa6e1953e38a43b46c2bd6ce631b7c168d6173ca36998e SHA512 1c56daea5d491dbeea9c677677a79ef5c4805325ea3d5da97005cd3b269003a99459550a793dfe65820f152c774371472ba471a7daf61c9d97b36744bafb013b
 DIST sortedcontainers-1.5.7.tar.gz 11970881 BLAKE2B 0ffdc19a9be82481e71a7ef59391166e19c44d7fc4eac7696d153cac707fdc4beb84a36039e3f1e194c43dc9e956eaae5dfd909f24ef12db4ea99c8548475cab SHA512 a9f2ba152c47eddfda6ad8ef7ecfbfa5d51b17afb4042b0b1e6d8b3dbc6caf6f8281af415dfcf1e356aaf80aa3212865ba926fe0d6e08961c8fbbc68adb34108
 EBUILD sortedcontainers-1.5.7.ebuild 596 BLAKE2B a4fc973ee9b1b4adbb2147b9654a54500a229b06196038c657c8452bc2a91b67caebaee9c60bcc9fc94029de98c64831b85deb1cf2078204331626a87ec2bd25 SHA512 50660da8b57a9cee9bfb4eb8e33fbfb284432a881ca7b1545dc2727a9af247cd0310fcfa3a9fd2d18a863cc9707d9a77deeb46a8078b3a790dc368e3cdb5bbd6
-EBUILD sortedcontainers-2.1.0.ebuild 804 BLAKE2B 0a4e958e46170a6d176d90a465a57eafcdbe3458af6818b6d4929fb265f04bf6dff38c8f684a822fde0899215f51dfe9b25590a00133e8036198cc47ede8782b SHA512 4bee19359bc5330b98335a323e60d731423be7e87f39ea1b64d65e517a8bc1d23d815f5609dba82297cc25721616d63e2ac378e9c5dadef3feda393da75fef00
+EBUILD sortedcontainers-2.1.0.ebuild 800 BLAKE2B e01f27eba8a34e00391fa1651e8caaa6b221d081d06ea140ddc65955634d4daa76b5f134c0753ddb80dbef7d224d8284386cd17d333d0bbfd6b93974e4369603 SHA512 30e4e6a699c75af8f0a351573549fe522c42dab64c0a9ad17108140f16584f6f76ee12055cb96e176b24588e34b1301a3190b5740ecff069834fe30e4c47cae8
 MISC metadata.xml 528 BLAKE2B 24ac135145b3465465b8ad8eb90b92a2265bf1209451f042ef5e6822088efb05278932ea2e94e5817bf5889bd6653726b5435ed88c633f609184c9e4fb43ef04 SHA512 a5783cd12e4f0e372da9b4256ab4d7cbf42727e773342d110126f5509611a335d95b949aff706658508d6bd37e633635af0f32b72f514661eae68a79072e5531
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
index 3c8aafa7a999..b3cf15ddc19f 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/spark-parser/Manifest b/dev-python/spark-parser/Manifest
index 6d84926327b8..ff3939cb7684 100644
--- a/dev-python/spark-parser/Manifest
+++ b/dev-python/spark-parser/Manifest
@@ -1,5 +1,5 @@
 DIST spark_parser-1.6.1.tar.gz 134114 BLAKE2B ec59af20c84e488a3211cc2d8ece8e89a70bacf52c0b3a28c78cd535fe33d5bcae45e86ee6da7e7b68c95782d1b79577a186a140f76b2255720f7bd7337dc161 SHA512 290069ebe37aa4d5dddacefe3a4d48607076990fe1f27f914d154fa48a5249cddd0c9d238b7e4c7a9a52ddfc054a3cd5639e52b618b5f4bc5b833c4e38b21c2b
 DIST spark_parser-1.8.5.tar.gz 123974 BLAKE2B 29efbeb35592bdd95108b5289448a6530f3211b31afa32dbb66721d1d473c1a30abc8f4700a6dee6f9dfc47cdfb1de036fa9fdb4c783d7bed7274d29b69a2038 SHA512 12ca0ae14c39edb825067574931b005f85eb46ac2cfc8e2573169da1fb54b4247181b9d2cc8449ab9a0dbd45742d68e415fd766764ce708df620bd7288b18130
-EBUILD spark-parser-1.6.1.ebuild 711 BLAKE2B 404230f0825b773b9a6bf097c6f2d91de6f9837aa87446f3b7bddf5d445f92bdc61567680cf7c98f7a01e48935c8b4588124906d481552742d9f05f408f4998a SHA512 000b22ace73a6aab4bdfb4ec231e0efe1b3308b0476b1fa7dce9c4177ca754ff6e0c7aaab8aac648b5fd650a47501226fec53744232befd27591287c330bcf77
-EBUILD spark-parser-1.8.5.ebuild 711 BLAKE2B 404230f0825b773b9a6bf097c6f2d91de6f9837aa87446f3b7bddf5d445f92bdc61567680cf7c98f7a01e48935c8b4588124906d481552742d9f05f408f4998a SHA512 000b22ace73a6aab4bdfb4ec231e0efe1b3308b0476b1fa7dce9c4177ca754ff6e0c7aaab8aac648b5fd650a47501226fec53744232befd27591287c330bcf77
+EBUILD spark-parser-1.6.1.ebuild 701 BLAKE2B e52ed78e599eff551f90b53d830d5001f09e9dfe840c3229d2b78a6d5af421d087fdf4c165f775c805560926aa9a762fcf9e5234af0a4ff4c296673c8392f7d2 SHA512 61d62f9d2c6180a14603503d7533dfb50cabcace562b95366538381bebb89fc413392fd35126b658e56e9847dfd0028e532ea23045f296b1cc1a29c2045dc8df
+EBUILD spark-parser-1.8.5.ebuild 701 BLAKE2B e52ed78e599eff551f90b53d830d5001f09e9dfe840c3229d2b78a6d5af421d087fdf4c165f775c805560926aa9a762fcf9e5234af0a4ff4c296673c8392f7d2 SHA512 61d62f9d2c6180a14603503d7533dfb50cabcace562b95366538381bebb89fc413392fd35126b658e56e9847dfd0028e532ea23045f296b1cc1a29c2045dc8df
 MISC metadata.xml 792 BLAKE2B f23bb836d480fa5f0d6723343c86bf2f6d3f535a977013d023aee828e88dd88cac3df0cf5effb9f33aef01a5ac484638f1bab7074a9a3926e7e4f7a3ca2c7909 SHA512 ba7cbf1cf29885a44864347b4469511e0a97f8144a297ce17c88c518a473200277f7ba2a88ce9ff7fd79c48000f5620ad723c0f41adc6b5f9dbe47dc60c7c517
diff --git a/dev-python/spark-parser/spark-parser-1.6.1.ebuild b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
index af0989704ad6..fab90de6a8b0 100644
--- a/dev-python/spark-parser/spark-parser-1.6.1.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/spark-parser/spark-parser-1.8.5.ebuild b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
index af0989704ad6..fab90de6a8b0 100644
--- a/dev-python/spark-parser/spark-parser-1.8.5.ebuild
+++ b/dev-python/spark-parser/spark-parser-1.8.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/speaklater/Manifest b/dev-python/speaklater/Manifest
index c253de1c33ae..d4b0d7f1b74c 100644
--- a/dev-python/speaklater/Manifest
+++ b/dev-python/speaklater/Manifest
@@ -1,3 +1,3 @@
 DIST speaklater-1.3.tar.gz 3582 BLAKE2B cddf87583670ae185336b73631b28da3dc26b74b75df82224da23df6c528ee074ca31c95d5fbe2971eb87c50480be022493164de62f02f1987a5768d7ae69092 SHA512 ae137d94c497cd4214e230c8906f3ba40e092f248206d37b61de2571567e39e27b7f58bcf2145bd0c81c195c3c5ed03fc0428e0a50c657c5c909ec82719454ef
-EBUILD speaklater-1.3-r1.ebuild 815 BLAKE2B b141f3a48b28c4940965edeadff1d316991489586fa431d9ab3d2c710c06fdbc28690a8194ccafbbd0df1d8d42f8add7111f9d17754aec480302cf82bc425ef8 SHA512 80d1dc8a4aa24e9c8caf1e4bc8b237d05b4260dde1009a9e3e0d49224fd22efb28f2ee8cc9a53b0fe5788bcc035b0d8b70f9830a0c30459a7fc6182ef3bc27cc
+EBUILD speaklater-1.3-r1.ebuild 821 BLAKE2B b1d043a19c77fa2a83ca852a06341a984cb5a7d3a837390694f67de90fa63cb04bdf9f680d88f888d8285fe12a00f5c9c4f17cfe9cfa26f76f51220a6d399faa SHA512 17709526c612947e0167a0d219cc2cf5def90e791f6db501507c9df8b16e78d17d0c3a1e33ff743cecb93c01da6209c97c464b65bc8279d8a37b308fdef29bb9
 MISC metadata.xml 455 BLAKE2B 6270f4ecfb1f4a889daa446a01a3c135190af3d595231e410ec5040e4b869b52c210fdc33df13174566ed720130ad27523b0734baf578527412e25420eae8140 SHA512 8108151c4b3dec1c435e76c7caea98d68913812d32ae75cc72d000fbe90d20ad726dbbaa1186ea1443d1c4323785bab06006a4bb3176684fea6e534ab3d21e91
diff --git a/dev-python/speaklater/speaklater-1.3-r1.ebuild b/dev-python/speaklater/speaklater-1.3-r1.ebuild
index 46da280e4265..2be303dcc63a 100644
--- a/dev-python/speaklater/speaklater-1.3-r1.ebuild
+++ b/dev-python/speaklater/speaklater-1.3-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Lazy strings for Python"
diff --git a/dev-python/sphinx-better-theme/Manifest b/dev-python/sphinx-better-theme/Manifest
index e98b8220e1c0..f827875a59e2 100644
--- a/dev-python/sphinx-better-theme/Manifest
+++ b/dev-python/sphinx-better-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-better-theme-0.1.5.tar.gz 7276 BLAKE2B 3fa32181bc567b7db614990be56ff382368564ef5698a306f07cc42d7b5d56f085ab40fec5143e85935dda63766b005e89d0310744f2e4d36de3f274a214db39 SHA512 06e50079967e166d5daf58a44c18e477cfc71d326ecf2e0a5932200c911e73ee188f720fd5bd15c2e298e14f7e3358e02e94381470bb7958edb0b0aed334ef9c
-EBUILD sphinx-better-theme-0.1.5.ebuild 561 BLAKE2B 845bc2c3d971d56b3a11bd81db182a0448558c4f6488045eeae193c72386e8c7038f69106e16fb625747ca2a1706acf2a513b5e755e0700a29438a6ba22b8603 SHA512 0511aa0ecbc26e1fa4c985f51d12c2859797990321a3752946a5ec18cac96466fc32d53c819052af94559122c54f00849bd1f69695bab8e83af56537d109a1dc
+EBUILD sphinx-better-theme-0.1.5.ebuild 551 BLAKE2B eea2280fd7fa1f79f8cbc08645c7eb59c02defc8fc29dcd969a28105926e04cefddad8a96b951aa4f9ba5e867de9c2ec40b2384e2cb6bfc78d41c9cd10195c58 SHA512 5117974059e78b6f63305c294e9ffac1cdcb4e4d891a655fc78f09a9d3dccb45fefe03cffbf92cd9c5567ec28a3e29e8f779f68d1fcac14c9169052b025cc95a
 MISC metadata.xml 400 BLAKE2B 4adbe1723956764f4f2a24de5c5a3ea0329ae619821cdd4c9e2e85712eb67510ec1aa3513a6bf0cfe3d1b8251835f0ae795a6a87648314358045efcf7a075ee0 SHA512 7f8d3408daa82c2cb5576757172ed26d05c3bbdcd0dc6d1c474a60683d13f3ad4839fcb71521c30d2ccb0dc126c9fd2f676ee758830cbaf39c13c88bd7a6484f
diff --git a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
index b481f9d4f435..145af221c38b 100644
--- a/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
+++ b/dev-python/sphinx-better-theme/sphinx-better-theme-0.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-jinja/Manifest b/dev-python/sphinx-jinja/Manifest
index 56cc4c6c6d19..84850af27b05 100644
--- a/dev-python/sphinx-jinja/Manifest
+++ b/dev-python/sphinx-jinja/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx-jinja-0.2.1.tar.gz 6676 BLAKE2B e009731381dff9aebbfd9ddddc3ce128a6dd172b64ef2610847296b30d2cc4ad5fc71f71d2e1ff5fcf2d0e717b92822bffedc25fbcb6215e072bfe285038a9df SHA512 4b5239c76493f8eabc2a079d82d52b8bb34e884e308aa7e1205cfa40690854ddd1e4c1aee9f7ff0624eee2588a3af9196a83a79f0f49359df315cb0886f09c94
 DIST sphinx-jinja-0.3.0.tar.gz 7035 BLAKE2B a43c2ab6c1f0178987ccf9f69acbf0b50974573b83d0503e7888a56bf024e519ad69e3ac6ec9b8d27d7e01e9482008b6579c6892ce114124c0ef12ef456c887c SHA512 b39211a0013db020112c865335811317699e7ade734bfd9bb24f51934df4652f0560b81f5e253fc663fbd8a269fd962ef2bfd6dc96eab12a397a538e758cddfd
-EBUILD sphinx-jinja-0.2.1.ebuild 864 BLAKE2B f2bbb339ad6b906fee6acc6f809af4919ef00b9420a8b1eb9ec2aa3db5d843937dec67e55e81d7228e604f0792f6ce0beb3d1324f4ee6aff690424daedde1d1e SHA512 0cb639c941f3139b2a3f11b78a823074170a7e46e1e3a63d0987067e7f2ec12b03652d51c46ea20fba7e32c0ae6b744a31dde26b5fff1a5cce758c2f5635b6fc
-EBUILD sphinx-jinja-0.3.0.ebuild 864 BLAKE2B f2bbb339ad6b906fee6acc6f809af4919ef00b9420a8b1eb9ec2aa3db5d843937dec67e55e81d7228e604f0792f6ce0beb3d1324f4ee6aff690424daedde1d1e SHA512 0cb639c941f3139b2a3f11b78a823074170a7e46e1e3a63d0987067e7f2ec12b03652d51c46ea20fba7e32c0ae6b744a31dde26b5fff1a5cce758c2f5635b6fc
+EBUILD sphinx-jinja-0.2.1.ebuild 854 BLAKE2B 99362cf967f2668ffe41198edcdaef71b206065246a528a1dd7817cc53dc817f1e3219fd9606c93116134dae07630ffa6eb832fd25abe6874f0e8f15f522205d SHA512 eb712a2b3ba6488a9e377920e28e336a6c04a47b1352a58febe9e7f2cc63f63451927d5d540112f4cef148eaca24b09da2ed2a779f9f34280254e537fc89e075
+EBUILD sphinx-jinja-0.3.0.ebuild 854 BLAKE2B 99362cf967f2668ffe41198edcdaef71b206065246a528a1dd7817cc53dc817f1e3219fd9606c93116134dae07630ffa6eb832fd25abe6874f0e8f15f522205d SHA512 eb712a2b3ba6488a9e377920e28e336a6c04a47b1352a58febe9e7f2cc63f63451927d5d540112f4cef148eaca24b09da2ed2a779f9f34280254e537fc89e075
 MISC metadata.xml 525 BLAKE2B 2a1e29ccf9ea29d66f54bbe9c0ca6382a80088e5631a2cb3634e02344a783a7045ffb4ab30e9363587cecf6213e1a4064490df3bbbdf3e410da23498267161d2 SHA512 2f42d584f3c61ed3b024073d1ab105b9486bc68962a44b6642cfc249c20ebd38dd6d9ac246891ea09cf88df8872bdfe611b709b484a9b753de37b0fe0055777b
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
index 3c50d1cb4723..c5132f939caf 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
index 3c50d1cb4723..c5132f939caf 100644
--- a/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
+++ b/dev-python/sphinx-jinja/sphinx-jinja-0.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index 02f9f2c69338..ef46e6a21cfd 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-notfound-page-0.4.tar.gz 5685 BLAKE2B 0bfc6cf98e0731a5cc95f1802dad1e7297ed764a626831b970d75d82ec0f7d6edb45c404851ea13bf38decc39aabf0e3dd6b136714a591e8ab595f11e23e67cd SHA512 56e867e6954f26da498b77e8fa43e8d62961ab33ee9c16d2084745dd54a998df51c7d882a47560196135d2fb4d473f7305ef19b31373bc205f8eaf0d3d4946f0
-EBUILD sphinx-notfound-page-0.4.ebuild 517 BLAKE2B fc67c427ca37bc0c962098a74bae0247fb9eacb2d02af203d45b2dbe1cbf86d6f67c7a91df2a66295fa6d3f42545f43c635695dd16eff2e17f021dd29b315392 SHA512 7f0e7ea344e90573d1593e8c8598529bc749382c34c4f1805b2105199775368355ee4039c0049f1494f5d940673999267a5c9ef721932161a578f74ab849c2e5
+EBUILD sphinx-notfound-page-0.4.ebuild 507 BLAKE2B 817d5b3acf2c4995a99fb73c234915d195e2f418578124aea9878515aab92d59d927398cc1d6efc5f3406ca61ae03f9ce58307af73f27fb9b56623e6887f45bf SHA512 cdb6516f94aa84c2bbe016f29a199b49186ddcce9bac833adf5c6d0b744af8ab5d9becfcd86a1d3b1c4eddbbc7c5fc8c2e66673db2ba76acbb50c19225081cfb
 MISC metadata.xml 440 BLAKE2B 0a08957b47eac83866fdbfd2fc137fa09413c2f6e4cbe961a0c587cb1604951d76061d41acae0a925a9f1775c785e8dc0808255685c14d88b5543e729052aeca SHA512 84b278d6a84dccb896c1e5c10ff1018ec801ea1a36083896f08629db28e82f8b20be2cad95a13b2ad53ba3751c9f6ba0c8a6367ad9baeb2881d22211793c2671
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
index 17f901e5a1d1..8cf4036c3918 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 inherit distutils-r1
 
 DESCRIPTION="Create a custom 404 page with absolute URLs hardcoded."
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index d7da52b4d976..719705a77268 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,6 +1,6 @@
 DIST sphinx-testing-0.7.2.tar.gz 11040 BLAKE2B 503e38eabfe8dbe28942f9165a83db2dec0f9ac52e1e55f7298848b7a6b55244e1b5623bfda7f4e1380eab16ef81cf51c6bc11e919a8b45506f17759ae0ee181 SHA512 d267c74d97443db2df69914a825da969021e37fc61b8a664ef382504fa826387a95230bf9259b58c6f26721f33985fa2168d2714342a2166b59740cf1b3ad724
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-0.7.2.ebuild 705 BLAKE2B 483934dd7b69b2c7ae770ae63bf387035ab97fc4ea550c7bf69bb8664e83053a98b72104064787f121ccbfaa9e69f24a39c34e398ae02263c4876779628a4971 SHA512 79c852bd8af7ea317f8ab95d924d18c9812514679f14d50bba88704ce2990e52784f5b9caa2f046a90cf3c5dd4bfb9d5b593b3d328430c4467f6e524a4ae855a
+EBUILD sphinx-testing-0.7.2.ebuild 695 BLAKE2B 216df9cd05e5b1fe3ec0c93161c5eab04085646d6d9fd9f70abf50928f38282f2ce6cd1e40e157f6947ab4b1864684b5da1c55bc81858e338d82d09ef2b4d80d SHA512 f3671c0297c154761834ac0059ab0b70e2cb39ffe05606470bc516ce93251ad471da3472bdb8393c630859fa8a93805bb16dd29cd502399d4ec20d726b43691c
 EBUILD sphinx-testing-1.0.1-r1.ebuild 858 BLAKE2B bf6d1c4cbf492622e740012c96c01b46979b236aa5761b6608f179b90a67596787a13def3d7fa6cee9d382801e31c98fa82a78122f36ccac6dfd697980c11abe SHA512 cc3730ab23c5b55ae75af8779b451a0a8bf938c7c54b5c80235935792ada4973b2f2eb8d10c736f9bbc615d1af8820e4c55b8bb773f47daf63f3b521e24c7333
-EBUILD sphinx-testing-1.0.1.ebuild 863 BLAKE2B 65826fffa47b5b2a0a249384f210510aa910aa673970362d62290eeacb7f009281fb594275be05adb0714d95896ec10fe326655221a673d22b51200240cda87f SHA512 84d595a0c724268c82376e23c6976263ff24434a847872963c32d5a8937311ac078f34dc900c92c9e1c01a5b50ab53550285ad3b19d8408a548a26753c3782bf
+EBUILD sphinx-testing-1.0.1.ebuild 853 BLAKE2B 8af5fdec2b50d822bdb62248d2a0526568beb9faf9540fc1626e3640543c48fd804528257ceba385dbaa26c39d03f1056fdfbfa939ced49ef423e095aa230a56 SHA512 72c09662fb0cace1cc47c98a4d4d235e1380e0f852168c1176fde811e1cf773127fd326a29fef432162f7065818c3892e35a64c758d3bd625ac7f56bdcb09cb4
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
diff --git a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
index 55f4c8fdd4e4..b6913ffde4a5 100644
--- a/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-0.7.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
index 73d0dd77b454..a9376463d9e7 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinx_celery/Manifest b/dev-python/sphinx_celery/Manifest
index e1f6c7a1f1fc..4f38ac3fe057 100644
--- a/dev-python/sphinx_celery/Manifest
+++ b/dev-python/sphinx_celery/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_celery-1.3.1.tar.gz 15334 BLAKE2B 1e6d34e35327fee921c884c47b948b624f900eb3b98cb86b1e45d4054bee596d5525c2be2ddb4605d03d27167183844221e3789e27ae1f5834983e9fcaa5e66b SHA512 b3d11204fd02f85426e1f4bcb81e61557f04440656be946a18e142087180a50f864ca4bbb53d3fff4eabd7623bf5c3682d3c1e00b9adf9184de99a27de98b2f6
 DIST sphinx_celery-2.0.0.tar.gz 16203 BLAKE2B 439a9cd20e09071491338016ba83514e37c7cdfa34966e93e3c6062ed94cdaa0750351a0de9fc7b27be1b7e557b5625be73f01f1de59d15f36335e9d46d35cae SHA512 1beca69fe9b56d04cd3c42aa9244d50a364a860e9cf53f94897c0f690b8465f4e2a7b10ed6d310d3fa706d86f5882a338cd982a3ac7cec36586269756e9128a5
-EBUILD sphinx_celery-1.3.1.ebuild 573 BLAKE2B 511ca2bef7d93e27262a187e628ba645de5a9f144d1fb06eab73dc372372f2d6a86b5ad72107d281aa3219878af2466e34d79574767f79563093b99ca3234601 SHA512 191649b6c367af7c1b058774c342a9cf9eaab68b97fe9d6de43446abc0d25d980ac57a39ccf0c71bc11fd389bc0354a410cc08d8401f4295d37205371d5ff80c
+EBUILD sphinx_celery-1.3.1.ebuild 563 BLAKE2B 5b2bce47b673d4e40c14a193c89f0569beb6d8a86038370be099d26dae64ebc9681591d382514e829b8d33b7d0f12ec3aaad0f3a65249b86cd711a5d4ffcc333 SHA512 54f530580cc0fe0afd0f4fe71e5f04fcc89dd6f329d776ff993d11ca2f82c0b6d9ec9aa72103cda7eab28f2c829aae96c3b33e44bfdfdaec82dd7bdbda225da1
 EBUILD sphinx_celery-2.0.0-r1.ebuild 528 BLAKE2B 3fe4330e5d59b73c25730ae661be73a39bf5da52eee839ce472efd57166b30d20433853e5a059c42da3772c293377325076c56ad961ccdebe6e35efe847cbb9a SHA512 de86e7c3f884b3a003af48b9c7494048d58442b96bd3bdff3dbe63ba0b0fc7fa624181cba39fdc54f64dda4ae15138c23d9712e63539c6f9a1a5cea8ce89ba00
 MISC metadata.xml 354 BLAKE2B af4b7d8c61b6eb65c84f867501d50d06730f6e651e3284d7200065a72a120e50705fcf96370b26aff14f5663ee6a2caf6af5ddcd8207e2081be3d4d954705ad6 SHA512 4cf6fdfa14fca7fe26e253a25bc81221e25220f34b13e08c88496d44a3f779dd2607fe4698682b27fc66158128d5a2e5f9d61a0ee58ca59f7b744ae37f909dc7
diff --git a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
index 259c31c5d01a..d704a2f0c62c 100644
--- a/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
+++ b/dev-python/sphinx_celery/sphinx_celery-1.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index b08497206c00..d074c149b83c 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1017 BLAKE2B f21430f14c5124db3cf174d6c5e737c40556cb87efae2c05129f813594d9595f344bcafc2fe751bd9d3e95fde02870bae4cdfe1261259a6c33112afe6c2e9893 SHA512 eb1cdb4a66338c5894f8caaf6ad4b3a2cf8a30c9c7ae24deff47ee6cd8ec66de62f442c2ac6f29904204297096cb5e07ea81d163f29786c96c303708702ac715
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1007 BLAKE2B 10a22106d5609461412b6cd0fe5a60ed59f9848d2a0dcd5b07941f019c5f58714fc1151d0c34dfe559d065e3c4233eca3d57ea01aadc7e4cf8e3f7eeca30da82 SHA512 3b8558f4d3565485ba3cabaf5b9bf194e45ea053c2c362dfb1727a92717fe2e071e64fd0cd3d539f92ce1d6c2bbebe365ced4d9f0f082ca847bff9d13bb923f2
 MISC metadata.xml 372 BLAKE2B fc779af5274229957de772908e2a2fb9bc0cd75673af9ab88e4b6869164c75b7cca2fff4895beab62bbce984e93255b6578a6360621c5d0eefadcf49ae3f787f SHA512 63aeaf1b521f6c789128dc03be198ddcbfb6dc7e63fa6b24eef1cd23e9557d5de5f7c990514b95dd2b74634f47f3f5db89f233dfbbfb711527e51806bcd5a367
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index 524e0b9d2a41..58ce0d6ada8b 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="sphinx extension to support coroutines in markup"
diff --git a/dev-python/sphinxcontrib-doxylink/Manifest b/dev-python/sphinxcontrib-doxylink/Manifest
index 837c3f56a532..bc4193942d93 100644
--- a/dev-python/sphinxcontrib-doxylink/Manifest
+++ b/dev-python/sphinxcontrib-doxylink/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-doxylink-1.3.tar.gz 12401 BLAKE2B 921e05ea89111b2ead396b9352e46806654d494c0e90708d7c47e2b447707ce010131c5032b8bb88e46cc63f9a92c16bdcf51d13434e52427a348fdb084ac99c SHA512 5a53061cddda22b682b4b640725d4cd763b54d9dfa3599b666dd55d72660f07fc89318abeab07d114d01313b215e69e421a3b5251125d28c3dd326426830f9ee
 DIST sphinxcontrib-doxylink-1.5.tar.gz 11391 BLAKE2B 569eaba41a2cb802d05b0e7da28a00f41399175e2103979eeae35750e2935f66670c20bb0a560980d553a8a751ab57c0e200d0110983eb474eba60b3a2bfcc10 SHA512 caac418ed2b11f1b72bc3cb2e5c6bd22a680f9e6debecf6c0028bc1e92fc41e017996be05a7ac7c2dc96c907e59ebfda32bf8b7715c92c33c39404ef356c2a13
-EBUILD sphinxcontrib-doxylink-1.3-r1.ebuild 919 BLAKE2B 3dda8d1f0d91b975dd56f4d5c823d51cbf9561894472233047f862a1a60bdfb69302afa3cf7a9ef3415c5f5276fecba6dd05ad66df2aab1c8241a347d044c9dd SHA512 5bf701b900a22b136b00748b69194ccf9118e27761ce1c73c882ff54a35b4cff1ed674974da18f140ef87f8e17110ff33134bf36e2300d208137e31c71defa97
+EBUILD sphinxcontrib-doxylink-1.3-r1.ebuild 913 BLAKE2B 2efb3423f280e3b6a683769ba4a4a31e18fc62ad2c55b28a41b323d9bd410c92f2b104f780656cd94f7b9c7130db98aca56a6547c992a266f361cea7302fc838 SHA512 80faab90e597452c573ad2d1e1059d411ca310b29f1f1f8ce6fa6a2d466e0cf9fd3d6315e728a4a86670652c038b47c98fc1c2c32d6bd7ac48f09222131de55b
 EBUILD sphinxcontrib-doxylink-1.5.ebuild 918 BLAKE2B 3928cc2102a76a26660edea37fb33a821fb7c9801abf7f6d5b38d33a457f0f0df932d237924950e25f05541c5f921d6dfca9c9df0fe0eeb4d0f92ddf8e276d0c SHA512 145ff0353683cb41bc81778716941759ea84c24fd6e6aa258b07c93528b1656461c103ab46770ef4c70dee4b3f56bfbf959b46207cbc6ac7a7a3092918dac4f1
 MISC metadata.xml 599 BLAKE2B 2734ab4f50acffa42b0eb381e6236b1b675480b54152f653430d560113718da2533bdf256c8a49817fe7cca950b36a764dc7615b8e0ffb0d73eca3118ae243fd SHA512 5f025fc40b2f4a0d36600d98dc205637abab07dc40bef0dde88babb5bb676734882145e087b7f6c4d11374d94340b226b5c37271044a70c9cb1ceedad3864fee
diff --git a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
index 8d05e6a162a1..83330e5c20d8 100644
--- a/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
+++ b/dev-python/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 91533f0c1780..9fc81a8e43a6 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -3,6 +3,6 @@ AUX sphinxcontrib-github-alt-1.0-setup.py.patch 598 BLAKE2B 7a4e2a1692368334ce0d
 AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88943f60c81160d4c6616280a961d6afdc2d9dca59cd04b32b9e62b6b243a16cf4c133d5c5dfcebfc4bc79a915d4699385b1af2d270690 SHA512 763d38a7c01f916382f558635b68c2eacc7013b2e6a5f22aa5299bcd6303223994b9166ba8a4b8c51a6f57c8f592924d9f389b0547dbd5baa45d5e26e0229b4d
 DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 BLAKE2B b2449c0b635769735a23187f422f05c21c52098bd25057f4dfec5412040992417451ba21bd85dcdd71c75fe2d0ac935f745b6595bf5c77bb3facf91d48a39cef SHA512 57f5ab3a5d679634ce0c2ea8c78069f37ed5a5d3c32fe6cf61851ed4a9e8b6b9b6c882f486eb84914153b4121dacc25fd4b11edee111630001ae9bc324f2250e
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
-EBUILD sphinxcontrib-github-alt-1.0.ebuild 914 BLAKE2B 46f37d7868ac1a72308b788928b64edf47f72ec834d39f4876631082981b602c7f4b3aaebd7bee351e2745b9be449076d656a28f8ea133bccc7789df30d1aec3 SHA512 7ef605734fd9ff7d1fff181071d4ef5ded27b11b4a96d285807ab1f87ca26de74b4a49a34233dde67d636dc374146eb347f1f5d0b7d8befd23e8f01037e444b4
+EBUILD sphinxcontrib-github-alt-1.0.ebuild 904 BLAKE2B 2d7a4552fd0428367ac575851b5e6539641cf8d9c1f5f78b296018b962357dbb4a6c4d22337ab988f3b3f5f090e34059bbb7bc826633051d5c0987d9ec6295cc SHA512 fc9cf996014d2bc6367b84eccc7d2fbeb9cf3644e3efd1232186ddad961d53d52e9181b9992c99ba802e0a9d16a21c9f5b9249eab9be17e58a4ae6eaa826152c
 EBUILD sphinxcontrib-github-alt-1.1.ebuild 874 BLAKE2B 2cf478b03ceaaa5e01f65566d4501f0d838aa6d76c8ce457bfbb1869e86c7bbf066a39472cbef3873b08edd4bb3034f7925c711ea6127a42c16fed126654da7c SHA512 fdbe1db6ddaeb565be9c216ca12d9be5dc7a5cfe34c72959e015687cc4de88db9ef21191227a718ed280daa7fcf2ec113f996c8e42e0a3518eb42a3216ca58c7
 MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
index 6498da59cc6b..b1a9271990b0 100644
--- a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7}  )
+PYTHON_COMPAT=( python3_{6,7}  )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-httpdomain/Manifest b/dev-python/sphinxcontrib-httpdomain/Manifest
index 2fcbd4f32dcc..af2d656e35d3 100644
--- a/dev-python/sphinxcontrib-httpdomain/Manifest
+++ b/dev-python/sphinxcontrib-httpdomain/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-httpdomain-1.4.0.tar.gz 12192 BLAKE2B e4250a3814448d87255a6cef4fafb9be86bec1d7670fd30d2988cdc0c8d6db67fd18a1e9e02588754bd03ae7261806ce1d79d7bb8d94f47f2e2086a6897a67cb SHA512 85d4d0898a1703a1742755814200253b875795b5f267b08adb00c7d8d7c15c434718ce0f93656e7b698df89c958a9f6f3f3403bdc6d08f6df322fd80371f1d70
 DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
-EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 619 BLAKE2B 220d896457ea4cf629ecbcf9d5149a0eb5b8db6b520fcba9bd9099892c75901bead3eaee79d6c4ca1da8c1701ae083249189cb0a0ca707c206140d86b7bbfa22 SHA512 981cd83ce2fb98a6290de30d0adcb5fab13038daf033c7dbc7952e732b97da38cc1061c0da7130d3066acf7dd070e89ba8f9032a098d21622bf8d0a92de99cdc
-EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 804 BLAKE2B 47378833ec38fe832f218c0ee8ab5df5720329729b2a1c43060cd0673bb17f20abe0449904f8d65660f71ca790a1a4bf8dfcb375f3e24e68470b19dc2ebf7621 SHA512 df660bf8cd75780af18e605f32707500c29d523f8b4fb66b1f966e0e95988990c41754a67a6a4e1dd02167c1cca184912ab67baed4b8188a013be9074aac2cf0
+EBUILD sphinxcontrib-httpdomain-1.4.0.ebuild 613 BLAKE2B f62b33ff5e477301169747e2daac52fca6787f01256039c5d9edd4dfb71d505ab1c8b25bcb1038721b9205a2dabcc5d4ca2f4fa085c8741158f7ce9f2f87f0ed SHA512 61c2b49f6cfee5cdf505a5e4e55554a3fb757c9e527b20db6281676b94cf77796c2c9b974263c842026780e7554c3fceea8d0434e44ccb1b1facb1e25612894e
+EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 800 BLAKE2B eef5af929417398dad90c696df9bdfe95dbbf1daa9e751db894af5310a27f6b5b4de7eaa54aa5a41256da940ec37149b9e705e1c9060556e2eb71d8d5b8171a2 SHA512 732195d97558f0a8b2ad135f051214c99a46d675bb74a6262cee3ad011743f5658e7a2915f3f187459a98cf069979ba8572ef99edfefa8e00287d17e4e24ed75
 MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
index 0381f1e2d77e..944f91311311 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
index dcdf36543b1b..df99960518b9 100644
--- a/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
+++ b/dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 9b363578675f..463120860405 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 825 BLAKE2B db7badbd1df59f4c532ef6702bd65f22a8909f6cd9cf631de9fc54c73b81d0385064e2bcfd1a74523b037b815a8d8cc94eb2f31eef50a71245c221bbeec7d207 SHA512 19e59290f9aba440106972d11f7c5f32c9c1df981ddb691805c0b2e1c3b5aabbeaea1833befd3fc3dd4dd212847ab5abee8492fbb2c63c295cab48be5ee68b59
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 815 BLAKE2B a0674498660106f63d69ac39ab3a0df4141fa24be1b0c6b0317e83250938dea90457b99e943fb47bdd4c8b8a6161ea08bb38b2f7984d12b3189c4d0680b12d9c SHA512 38d87300c20f50b1cb5af18e28eb9bbb00273055e6ae6de89f8e5a0fc8e8edc1bf2fde110c709ea8d19c642074c50a08f2099668f115754c4f4b6f8702725d0d
 MISC metadata.xml 326 BLAKE2B ee27050dba4cec236f08ae168f2cae643f35f0e20e20d0803f7783694f4f6c3289faea1df4ae326dba6125eb6b7f8d275f449769b76220eca973bc5fcab11e45 SHA512 e47c6ab16713c27cbd5353250642751d73d39bded06b14a6571c2221f9ced2f73c6f33156acd1622789a1aaab6779a49bb85192c130e77aeb3d05d9a1513c69f
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index d85863b21da9..7c66e8d5cfdf 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index 73aeb7bc8817..40372f9e8ce9 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,7 +1,7 @@
 DIST sphinxcontrib-spelling-2.1.2.tar.gz 35411 BLAKE2B 9738e18664fb68f6f8f7aafb626b6712f7c30947681f6c5ed288dd76c2b24245cb4083887330fc05ef4fdc64756245d997797ae36899c2c762489fff13219a21 SHA512 993f371e064e8748eb61faae649fb293b154a35955ff84d86fd041f4e2cc4c6e22c686007a67c3b63b0c50fc01ed226708f27db347e58847a46ca733c997d51f
 DIST sphinxcontrib-spelling-2.3.0.tar.gz 35687 BLAKE2B 9b48f1953616875bd5f0106ab0a01ac22d176b93eca88da7e36804eaf744aaf6e941d3dcb9f905f9bfe54ea51eb5c0d14d954b3def809994e7ba661e09cdb18e SHA512 194023d2c5ba594a264740a2a45ebd90d37fc17fbd3bc8c53fa303581a652c58332f998a159c9c6c58718dd9898c9b4639e98ee114a2ee1e5f2097e545134a1a
 DIST sphinxcontrib-spelling-4.3.0.tar.gz 38316 BLAKE2B 4bfcbfb22c10b5bd181ef5ba7b64815ccaeaa50f01ccff96adab914cfbe6674ce28088e5eb5717b44531565f961b1f159014d235275065070e22d96d08cd4af2 SHA512 0d1575079be7994df905de02d31ad2c9c3af9634a487fbc9c565067fcbef6c36fd4fbd326ccbee4b40b3ff14696ad85a97c68018a956ff3e2f7e1be46bb3a074
-EBUILD sphinxcontrib-spelling-2.1.2.ebuild 1026 BLAKE2B ed5c6bf5f9ab282fdd9daec124fa409e580d9ba3560454ad46907ab70da5e4b024c739a7f8ef050ab7dd8c7306f663bd6d008edd3aec3d126d586a024a7fcd21 SHA512 f3087c09c2a5f50a9d2939f8493bc481cafb5eca8159c53ba4b17373c05c25edadd2082cb5a7319d7ae10bdd25717fa72ba7c49864b3e632d6acf9cf6f7d22bf
-EBUILD sphinxcontrib-spelling-2.3.0.ebuild 969 BLAKE2B 8757945ada857ff4e85e10cce018a4035c2be51e77aad0db69d057a57e9a3bd950d64ea9bd84346ee8ad99d5823e5b5a58abb2281c32614f095606396bff2093 SHA512 b40bb02553175c73a0753baf971de369030326de87e4bccbeff1cae53d170a20dde71085af1b29731ab6180c7cc70a0dd1a71abbaaad3d3003e252c39eaa460c
-EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1217 BLAKE2B e3a688cf9aaee855106e921e02634eacfd0c8962a0ce00076dc1c4fd5d43c28143bc98bd20e815c5e012135c4f307353c491d50f886c2909ca861fd3c36d1b1d SHA512 2be456b5924a9c8e0ac1d7d215d2551dd655a145f97043213d49fb1c54bbf8b1d71917afafaa7e0850a19889b3cdbcad7778785180e41403a935175733c1a7c7
+EBUILD sphinxcontrib-spelling-2.1.2.ebuild 1016 BLAKE2B d8eee76e4c4b6eb68670b4187b3cc6cf6be4ad00df561fb4ddb1d2eda532189e122281cf6f7bc5e97043df993480f852187cf9bb2a47cf9f6fc21764c42fbcff SHA512 b3ab1b3d0ef7dd361012a56b6981845307ede585595ec18336050ba8645375e745feedd05314161a3d13cf1cf8e0d8288860088760cd442dd6be28f92726f7cf
+EBUILD sphinxcontrib-spelling-2.3.0.ebuild 959 BLAKE2B b56a0709ea73ca912a614a3e125f5122402a66484d3bc56312736aa69db793afb9d7fb553ce3c96ec20f78fa5e025f42ca4d0ed26d026734fdd86ff69fabc901 SHA512 d0a7ba2b2c7e60411f799e948e3400afbb058f13fb73af751347e1b587b8611eaae184316723750b77b16347363f2ff75112446caf2f1128065b63bde2000996
+EBUILD sphinxcontrib-spelling-4.3.0.ebuild 1207 BLAKE2B 7270ddfee5920572cb0ccbd53f84e67f2786e39962c9efabdb98c6d2c6308bb88f385d63f5292813956d59175198a90cef4204fa9b4e96fe4a0df8c1644a960c SHA512 ca4a3a1f641d250bcf4546e0fe83e7bdf8b8f476487459d1356e35493e3f0022023fa9920c4828125eff5e3fbafedfa25434bf7bf49529ca28c7f8e18c1513a7
 MISC metadata.xml 378 BLAKE2B 238ea1508c65e2b5c05360aafab23da6f6f25693c677232862302d372dcfbab0530ad8964d6e393935193b5f9341f697de28dc2a3634c7b726a7f10762df8d73 SHA512 b5b909cfff41351a21e2fcfda9a9c022d600943038676ba63cfb525cef2d7b85c78b61bc58e33965f14a0d559f74cfef1f943058a4bc7c70cac2be34cda8dceb
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
index fa48462ee01e..9bbc74035563 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
index 004e5b1cafea..4c610d2704c0 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
index 91a2e0dbb8d5..83bbaae4a721 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index 8eedd95c79e2..8914bf881280 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -1,3 +1,3 @@
 DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
-EBUILD sshtunnel-0.1.4-r2.ebuild 526 BLAKE2B 4f024ba1b6f07c68ab699ff4713c7e6389b0796f878a0115519f883977dffe94c5a6638f98f50524567504f86e95067fbea07fceff7d82d9685f12424a683ebe SHA512 0e47cb858ed247fcac84d0a0ab4ef19edc9c9ae55d5b9dcb15087f82d6d255ba08a8114f423b37932507561b7a0727ce1ebd22029e42c5be6429eea029a08434
+EBUILD sshtunnel-0.1.4-r2.ebuild 517 BLAKE2B 3d24f8164a062e965819996c9468a17a7952850d9bafc47413a785ffa6e24e1564df8df41b71c135080293cd1bee46fc9f2e30caac06030644a495f6798eaccf SHA512 0a5c5fe99ef5f29534ec7bab70403db6aa26811dd6caabe8894b954d6b3b732294004a6e70703e160a3300f13795158acf479d53580584153205f2613f06e05a
 MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
index e4679f91e4bd..dafebc1d8116 100644
--- a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
+++ b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Pure python SSH tunnels"
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index 0c9c354ca5dc..ee17a776e631 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,5 +1,5 @@
 DIST statsd-3.2.1.tar.gz 166047 BLAKE2B b0bf102823cefb8a698b759881ebb395c7408b8b5fff7cf304aaa0ecbad2fa8381fe05efa3cdd9c36c44c7188e46173235f9fe2cbed9fb940d8d5231f455d6bc SHA512 c5166fabcef2158aeb29b07b9bd1d241bc30847eb0e2c7694ee097b3a262e2590189ee10daecb368807002bd96fed16e749ca744b51b5e946d48fe2931a0d8e8
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
-EBUILD statsd-3.2.1.ebuild 627 BLAKE2B d9df869905a66fbd67dfe97479e33d6a75c0ea3ece7c93cad37dd198d715ca4f622a0a169bf18c7a5faf99a57789e55fe5ee3166d4629cf2856a659bb6d559e4 SHA512 06dd4eb5bc829f2191df47cc009bfd0c5b99b9365d207af0127c286132d9c00267c7e189b629a876dfcc3f887ee87736ca5d21bf15a69e3088b6876fae399604
-EBUILD statsd-3.3.0.ebuild 629 BLAKE2B b6aa791de57654063339397c1431e75314c951b0e23c78aa7b6f6dd94576ff6365a06264d652c8a4146fa3ae2bef4a73cbcad3fba76abc4964f5cb469edbeea1 SHA512 8e613fb38636f888ff37740899c35df4549ef9fb118b4efc91046069a9d36ad5e287f9dcc8ab8588d3a813d456b979b755f05e9f7f7f49ae3f0a0bc29b342734
+EBUILD statsd-3.2.1.ebuild 621 BLAKE2B 74da4786cd2e9e5e91896be99cec39d7c4c60b4b413858c204225fff04c36da19346d33794d95d253f9fbc654017c6ce65eccec8c3935763721cd7560fcad937 SHA512 a045369de82d8bb198fc914aea0a34b489b22742df29f861ef4ce94369bd75d16275f6004eb29ef028cb3e828fc3d7a5234b41de80d4ce9278417b849179cf7e
+EBUILD statsd-3.3.0.ebuild 623 BLAKE2B 56f19f57f95108829a970bd3849f3289693bbb9085fcdf3d2c87b3076641ddb12ebf98f5240fe542d73f53d534de061b53b59eedebde2672b2540ea7e67b8aa5 SHA512 4b8209c1c2003bcb0e0adf306fcaef7a103459bed474773232cf4c95871264cbc1a60e4d5fd24c9e20da92e834b9b37a7735746134b353a3f2a3703945686843
 MISC metadata.xml 498 BLAKE2B a8ee652db5a3283200bccbd950e8a927442db0d995fbd9181ec3b638c1875614792024b11486450ec60b9554374195c97623b7e2a6bda6e11fee5a77f18386a9 SHA512 02243a16aaec81a9d06a08f0ff1c741d5bcf6f9d8fbf3c2037b03c1752112257c9c357720957871e25f963e84c93121fe4a5ddb69208bcfb2c29937ec7743ebd
diff --git a/dev-python/statsd/statsd-3.2.1.ebuild b/dev-python/statsd/statsd-3.2.1.ebuild
index ffee144d7ee5..f0e90c86cb02 100644
--- a/dev-python/statsd/statsd-3.2.1.ebuild
+++ b/dev-python/statsd/statsd-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index cdd7f1b7039b..f92fe942f384 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/storm/Manifest b/dev-python/storm/Manifest
index 9a65e0a33e2f..d634f4c00ace 100644
--- a/dev-python/storm/Manifest
+++ b/dev-python/storm/Manifest
@@ -1,3 +1,3 @@
 DIST storm-0.20.tar.bz2 213069 BLAKE2B 746fe55e720fe52369778390e2b748b297911be7631b2a29c6372d384907cc195d0e3b3627a736baa81e6852a762a80d9a4a66de318de3d3c0375939e686ad08 SHA512 7a22c6a6fa45f7bbeeb5c6f934d6f889a6d90d78a6d3e3b9c6a6825485ec35301f573d08c619693a2587e795582db633254631c0be7cd8f1fee6b03a88378a8d
-EBUILD storm-0.20-r1.ebuild 1973 BLAKE2B 8f930e995b4196ccedbdafb76fbdbda4c868b8109c416d6236cda01333c22f0dd1e5141d3dded7f57d48260f962ee143fb6ea5bbc80c08da402909c558f9cdbd SHA512 939e058926097a17396d2068e0ec5ef7db24989620cb2fa4cadc8a2161bacaf538322e2b08a468991ed95b24bf5ce7509111e148b64dc16dc8b26db45b1d6faa
+EBUILD storm-0.20-r2.ebuild 2063 BLAKE2B 7c89cda6a2e9885bda9356b6b40ac9363563e5943d099e60821714f61b472c07cb8b7d233647ddaaec02b566548e0f5c30977c0e5d6f16af8df6d85a5e6636c8 SHA512 952ade9e04ff3e6b83586ae17c522f870107003a07565dc2496c37cdf38a2c12ff91bb74301aa9343853830d2f8195274e81d793c45e9405608eecdf3a930a27
 MISC metadata.xml 313 BLAKE2B 9d6de35e080e5aeaf397932fe30e7d7221f3ea06ba1be383e0b3661fdb955af6beb64492d7bc709479c05a2cf689024ec47f781b2dd0b9e3e9e438d678c476d6 SHA512 ea41959e22a82110ac4c87551d1f41b02b6f190da6ca140335c085137db32af3a56abcfb517f5086af12990a289223fd920f1ddd4a60b59d81cc3dcdee630965
diff --git a/dev-python/storm/storm-0.20-r1.ebuild b/dev-python/storm/storm-0.20-r1.ebuild
deleted file mode 100644
index a08b6d56c609..000000000000
--- a/dev-python/storm/storm-0.20-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="An object-relational mapper for Python developed at Canonical"
-HOMEPAGE="https://storm.canonical.com/ https://pypi.org/project/storm/"
-SRC_URI="https://launchpad.net/storm/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( =dev-python/psycopg-2*[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/fixtures[${PYTHON_USEDEP}] )"
-
-DOCS="tests/tutorial.txt"
-
-pkg_setup() {
-	append-cflags -fno-strict-aliasing
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
-		-i setup.py || die
-
-	# delete rogue errors in setting exceptions
-	sed -e '/module_exception is not None:/d' \
-		-e '/module_exception.__bases__ += (exception,)/d' \
-		-i storm/exceptions.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if use mysql; then
-		elog "To run the MySQL-tests, you need:"
-		elog "  - a running mysql-server"
-		elog "  - an already existing database 'db'"
-		elog "  - a user 'user' with full permissions on that database"
-		elog "  - and an environment variable STORM_MYSQL_URI=\"mysql://user:password@host:1234/db\""
-	fi
-	if use postgres; then
-		elog "To run the PostgreSQL-tests, you need:"
-		elog "  - a running postgresql-server"
-		elog "  - an already existing database 'db'"
-		elog "  - a user 'user' with full permissions on that database"
-		elog "  - and an environment variable STORM_POSTGRES_URI=\"postgres://user:password@host:1234/db\""
-	fi
-
-	# Some tests require a server instance which is absent
-	"${PYTHON}" test --verbose || die
-}
diff --git a/dev-python/storm/storm-0.20-r2.ebuild b/dev-python/storm/storm-0.20-r2.ebuild
new file mode 100644
index 000000000000..5bfc5d440906
--- /dev/null
+++ b/dev-python/storm/storm-0.20-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="An object-relational mapper for Python developed at Canonical"
+HOMEPAGE="https://storm.canonical.com/ https://pypi.org/project/storm/"
+SRC_URI="https://launchpad.net/storm/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
+		postgres? ( =dev-python/psycopg-2*[${PYTHON_MULTI_USEDEP}] )
+	')"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		test? ( dev-python/fixtures[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+DOCS="tests/tutorial.txt"
+
+pkg_setup() {
+	append-cflags -fno-strict-aliasing
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
+		-i setup.py || die
+
+	# delete rogue errors in setting exceptions
+	sed -e '/module_exception is not None:/d' \
+		-e '/module_exception.__bases__ += (exception,)/d' \
+		-i storm/exceptions.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	if use mysql; then
+		elog "To run the MySQL-tests, you need:"
+		elog "  - a running mysql-server"
+		elog "  - an already existing database 'db'"
+		elog "  - a user 'user' with full permissions on that database"
+		elog "  - and an environment variable STORM_MYSQL_URI=\"mysql://user:password@host:1234/db\""
+	fi
+	if use postgres; then
+		elog "To run the PostgreSQL-tests, you need:"
+		elog "  - a running postgresql-server"
+		elog "  - an already existing database 'db'"
+		elog "  - a user 'user' with full permissions on that database"
+		elog "  - and an environment variable STORM_POSTGRES_URI=\"postgres://user:password@host:1234/db\""
+	fi
+
+	# Some tests require a server instance which is absent
+	"${PYTHON}" test --verbose || die
+}
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index 7e04f1f39647..b322a08e7c54 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,3 +1,3 @@
 DIST swagger-spec-validator-2.4.3.tar.gz 19636 BLAKE2B 3805aa8663d141898e5106ad98d9aa0c697e87a474c0446151b0a6210684c8a0afbfa7a54b44e9aa7c4257c5e9f8713139943774bcacb38105b21c4cfe46492f SHA512 d785f1d9f2664fcf4f62e2e2c2adf9e17d7844e6febda69bcb718efa5f951ddc0496c7e2804e4269750a15f5b5c7f6cc11fac0f99363f7eadab8cf1209d152db
-EBUILD swagger-spec-validator-2.4.3.ebuild 716 BLAKE2B aaa9c9bbd9b66f26fb58fc45854670cc25415f5000f02a5f7d1e0bc4c777009da558055ed4d6f18c062191bf6bc26ec408b694ffee70efcd19b62826e8a0190e SHA512 468a37b587ccf83066319d7e559c09b1eaa2e133eb24c16b0ed6bda027b8489975f174dad6d8b718b838efb9140e26179eff621bd8ff8e5f29d6aec6331deb42
+EBUILD swagger-spec-validator-2.4.3.ebuild 706 BLAKE2B 31a8381a8d87f721cbc3a0c8b538ea17524d0eb26735153754bf7ae65ea1848cb3f22bc0acb44ab402f354b851284646de5db18f69283f01a91533e79e7a1a51 SHA512 8c9c01629dfacc8f6c3487894db2b6a826c5705245b45804c5fdb557f21116370a92595f3efe1c62650ceb2cdbe3673d2e8fd02cb39bbeb6de627713f5021757
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
index fd1346c2068f..21ee6c92751e 100644
--- a/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
+++ b/dev-python/swagger-spec-validator/swagger-spec-validator-2.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="validate Swagger specs  against Swagger 1.1 or 2.0 specification"
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 5f41761a0d13..b35b22f084b6 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,3 +1,3 @@
 DIST sybil-1.2.0.tar.gz 28720 BLAKE2B fc2fda9763a33cf89f47b5edf3aacf1d3c9ba712cc6e292dce0549393f2177afb6ff058e6c4ac96b0ffcc44149dab4c8da5da50ef6850555e374ca25906b1e14 SHA512 9355bfe2873eb9cec866a1c267deb876f3e6b1e452e0b7c951e5ffb642e79cb6602bc81384ff4e5bfff1adc0be2c95bcfa291d34b7690feae9b280a92b6b5c85
-EBUILD sybil-1.2.0.ebuild 463 BLAKE2B 9d7cdab6de72469fa6360d5188162056b05911320f7fb1cfce7d40676832fbbabddae17d4823bfe5300ca3de7b0a9f08f011f2f3c70c27f4474f7f3f29de787f SHA512 109e072e72781f1d31637da0f818831e09c69dccd1178ecf321e411a3bb15b99eb63ac77a78ca66577819d288585ad2286d57432ebc26d5bcd07db4f8a13e5e2
+EBUILD sybil-1.2.0.ebuild 453 BLAKE2B bff7613bc1ff660fd94680211661aa05e42ad17beab8d7e5706ddab045201c4b66630b9e9bbd1fd1aaec65ca1b340b999bf7a27ab24c725236da122b5436dae1 SHA512 9e6695396cb4c9626e20daef8b46bbeeb54ca9f0d3d822f0498c1120042e9d549264ebf8d4d9aa2e2dbf134b1937b9ebf41ee7123de3f40bcab1a1e360d49703
 MISC metadata.xml 372 BLAKE2B ee52c5344be6eac7a7a79165e71cf7d198d8ee21591c4bbe5b8ebfb830019aa9bd32cb4912e6aaa59ca9e2147262278f2bafa3b24a89fcb67e930ed2a033c281 SHA512 c586f579a99f202fc403523fa870bc7aa31a437527091c413abf4c47795671ebbb783c74afe32790e25c75c9aeb19dbd0e6dd7367cdcb69ebf128367502b86de
diff --git a/dev-python/sybil/sybil-1.2.0.ebuild b/dev-python/sybil/sybil-1.2.0.ebuild
index cb7660b067f8..a7c5878a24d6 100644
--- a/dev-python/sybil/sybil-1.2.0.ebuild
+++ b/dev-python/sybil/sybil-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Automated testing for the examples in your documentation"
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 587be8d23a52..4f364d601a6f 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -3,9 +3,9 @@ DIST tempora-1.14.1.tar.gz 19383 BLAKE2B f65896391e839c3da43bb42715459b9ab870a72
 DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f1fe94fffd59982431190e2807c2dc577ff83eb90ffc5fd2b2f8415965de1d77e4dca0dd02291733bfbb97c SHA512 2420e32a9b8c990609d8f09225004e0b1c445cad1fe3c3c74625cb8317b552469acf2d3b28aa56633a87260a93c77d73b02178cb662016c514bc740aa01399e5
 DIST tempora-2.0.0.tar.gz 19828 BLAKE2B af06f7cfd6742c41fa08333da30bd2b6173affe4d368024122d0464856fa3e2264c85d34505cae023167b4266ed0e927a5a8d620101c02c352cf08b269c8c6b4 SHA512 9f488ecca0673a0071503475378bc8f5ddcfabb32fcc548392434df45767fbeb8b914117622ec6f9dc6a8de90e5bfe6e5571a9a18ddecf7c25e94fc1f7fff102
 DIST tempora-2.1.0.tar.gz 21329 BLAKE2B a157a6b9bcb21aac08693ec72e60d011c29d4e6320706186b8a656f096ce19140731e41ca0b7b8b98110a2eed8cee2bfce5ca303b3a7526bbfaec8aafaffff3d SHA512 f66ebf03d5c6d71f1316e3ac9b2c16a96eb622e553917f7e52fe8881cbd5f4651174130e70d2212cad78811859dfb4fe248e6f81a5bb6c928a0c43e9363d2c4e
-EBUILD tempora-1.12.ebuild 1310 BLAKE2B 5668694ef124fbb3506335fa8f2c7f79b6fd92e65e7f2ad2d2d8e2d63e8dbc0695fd6cbf9e9cf433b49843551363749906dc846e86bbd99dd82e62e3cc42a977 SHA512 1d913cfe9d53b921b5e967637c7da4e3fbdb1e04e8ecd9bf31198b94335f2623e0cf946270b462b9bf382b0298878a1b8f42311235bf7d6a79c72ba59510d023
-EBUILD tempora-1.14.1-r1.ebuild 1440 BLAKE2B 703f20c95adbb0652cd54a8de482486bf173fd104010889cf5533ff7a44e3765a03d0ce3c2dd7013458a8282e0f16f5b3b5a7ffc823e88731d154fcb1c6e5482 SHA512 015646517fadd62dcf220e2049d623291d4e8c936ee05d80590acfcef15b67a1a3b40c63e7cf1a8f48ce32f3dbbc8a02a3ee6faa55a8d04fb7b82ce9283845a2
-EBUILD tempora-1.7.ebuild 1196 BLAKE2B 770c3e5b37b05350852fc12550def60214690fbfae1aa449b340d7fe892505e2d37db2def79beb18f63dbc995da97048c7576b1bd2f79bd5302a1d1ddaec3e85 SHA512 c624a8e51ef58b9cd3ceacc9178cd2922181aa2c98004fe76ca4d77047b36293556da60e46a62972d4d0aea617d65da063389bed4f34e9c8abb46468632e1f9f
+EBUILD tempora-1.12.ebuild 1304 BLAKE2B 5f8f8f2b39871169f1cb415c6583c25adf0a6f77f19acadd587fa1b898d120de189b6f354041ac54c8afbb67b2307a34ff766c59f820077145cec9c215392978 SHA512 2d0cc7bc9f1a01eea9d1be62b77ce06c530d49dd77e368a2d3a083c38d20f3e45556723516d825f2191e136373c9d8d858db3e92850fd14cf33e9ef2e092c486
+EBUILD tempora-1.14.1-r1.ebuild 1439 BLAKE2B 5a0b87dc89542a3d455dfb5639e7b62fe4611ecc792cf85eaf3352569ab677e0e757297f45d2750cc6665c0de9586c97d3b3748d353e938612e09b1a9c24feff SHA512 adcbdc1751589a92b9879a7cdae5cbc714913fa0386cff1b67635f82d89ef542bf62bebdfadac60a5063d3ae6a12811a531f8d9362fb3330c35b284cdf28a9c3
+EBUILD tempora-1.7.ebuild 1190 BLAKE2B 13c84f2ecaa36882578cf8eb775a449a1f6343ee499f3b476014a8493b53f9f522503b702495dbb99ef3bc2184aaa070b0ab47d6885f5d822178b9631626384d SHA512 c278f2bac2c3abe13fbf3a7d8790c5bede6d6fd8862da78093387be263ebe278e8ff785e77a1fce814fd2dc1c8f44464a28ee7bb7a73608e71d0b7bf547eadd5
 EBUILD tempora-2.0.0.ebuild 1532 BLAKE2B 725169e55525474f254ff9417654fb189da46eb011ac8c8af34e1e502af13ebbac6e321323236790c82504b950cfecdf74c331a91c5c98c5616f224b3bb8c5af SHA512 87f0f034dec5affddde9e398395c5aabd0a754c11bae4269dc89af5e7ee1b97b8cb1dd7392d9630c46d8cfdf70d44fdd440b7bea96b190335ab7f33798606b90
 EBUILD tempora-2.1.0.ebuild 1532 BLAKE2B 725169e55525474f254ff9417654fb189da46eb011ac8c8af34e1e502af13ebbac6e321323236790c82504b950cfecdf74c331a91c5c98c5616f224b3bb8c5af SHA512 87f0f034dec5affddde9e398395c5aabd0a754c11bae4269dc89af5e7ee1b97b8cb1dd7392d9630c46d8cfdf70d44fdd440b7bea96b190335ab7f33798606b90
 MISC metadata.xml 514 BLAKE2B a504d20d519ee139ccda1418b4a6f4d9c1b47a17dae26a57e2bc9e55d31b44f6f74b4a3835a6e9f376431b2428b5885b6931bdd6f11d57549c9ac29593b8e0ef SHA512 aed0cf45d8b0d1f3aa942dad7d74c572d6cb501c0c61438ca6bf97cbdfa51091cf9c32753cd92440ff69c7faae67daff0ccae28d9223b182ea89426bd4bf4fb1
diff --git a/dev-python/tempora/tempora-1.12.ebuild b/dev-python/tempora/tempora-1.12.ebuild
index cc23b21d6a60..9718791ac174 100644
--- a/dev-python/tempora/tempora-1.12.ebuild
+++ b/dev-python/tempora/tempora-1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tempora/tempora-1.14.1-r1.ebuild b/dev-python/tempora/tempora-1.14.1-r1.ebuild
index bf3ea9a1612a..c63ee752b81c 100644
--- a/dev-python/tempora/tempora-1.14.1-r1.ebuild
+++ b/dev-python/tempora/tempora-1.14.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/tempora-1.7.ebuild b/dev-python/tempora/tempora-1.7.ebuild
index b3164fe52561..0bd03e54f10c 100644
--- a/dev-python/tempora/tempora-1.7.ebuild
+++ b/dev-python/tempora/tempora-1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index de5d822a0f9a..58add074a1fb 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,7 +1,7 @@
 DIST terminado-0.5.tar.gz 10491 BLAKE2B 8beb4784c13ceeea47966efbf56e62b259adac533d2ff72f287984aa100837d8123be3109761c9c282fc081e26d0d26224a8d1bab6263d3abed00839cc576c9b SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421
 DIST terminado-0.6.tar.gz 10334 BLAKE2B 02ae2135da982cfe12ea0b3219a67a6b327bd3f4f45539f79629cb33ec0882586094b7084e4ca64567f55fbe6f0194a10934c558fd836f825ef81319920caf5f SHA512 9b9521917d4000aa45e61a1b88705e715f11686890671607cca81d4518f1e17feefdc2ad3de64dd0e053a6849956efbbd838c7b98d570dcc98a936c0a4cfce9c
 DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
-EBUILD terminado-0.5.ebuild 715 BLAKE2B c52bddeedc2d2fb54ca82a3a0209b44ccd9840d97c7c036226d40ec26cb296a7d3c1df7e64c0a872023a5d931fcf37ba85f5ab61aca0bcc681853f56a56f3a04 SHA512 befa396df824b1110b570974101021ba3461b691000d2e3bc77a95dc889e223adfb9e5a74b2c48f4003ed125adbe3a4de8d27c4cf7063cea993710fd532b8898
-EBUILD terminado-0.6.ebuild 727 BLAKE2B c2c5576bc13caef5e81f0aec74dd832e4aefa207e1e99e2d1d46f9afbc3959df4c89f613f39d3219b0590ed593c23caff6b71931169eb61847e1170df6a65757 SHA512 fec0e91857bfee46aa8b24fdab4b7c08aa8e99662765254ce0563fda32b7b1b63b0dc6fe0fb7377b48a1ac64454a8bcdf17bff182b3b6d5c63a161f1e9890f6e
-EBUILD terminado-0.8.1.ebuild 719 BLAKE2B 1b3d7524fa44bc75676f8ca9f1dd7e3d7c665731a34c3910cacdfd67fad2e27ec3963f0e42eb2fca3b615fbffbf68543251687efe479c971cb6437414a0e98db SHA512 ed4b87ec2f7fd720c7dcd5eaba2be6f76b934cb5cb8c5ca1612ab07345169241b678a234e395f6ed63461559dfad8c46cbe6554dee838032851a631133141e8a
+EBUILD terminado-0.5.ebuild 705 BLAKE2B b85d361ac98a1a4235ad618d6b5ec601661dac9eb83dc7cbd20c0adf8103a1e057f42bfc45026b3d3bba1befb47411f9f562730a057fcc98549dac50270e784e SHA512 b7a83e837d0491690b54415736274e1183ffd97a4168806bd8527d81bedd9d662c04f92b5f3bad599ff9676a3bd1dcd69f9c637c850f9925ef5b6b0ba3e1c17a
+EBUILD terminado-0.6.ebuild 717 BLAKE2B 232061f5c3e68173a726ad2357c0c3c4acb2d9d403ebe7ab882ddae42823ecc98b3cb735b86c1dcb74cd5487c0d50329e1983f28045bf405aeef4e981c86420a SHA512 723a1970504d9ee5fdf060a3298589a41159b5ce544649378f2aabb6af26547783775f2a426db25394405987222c2610637d877bf5b652bd41f0d6ef5d82a82c
+EBUILD terminado-0.8.1.ebuild 709 BLAKE2B 17eb0cfb7aba16d4a01badc33d452b3f862007e7c33c741d887e5ce630c301c1a3dc9b5ba5c2c69d44497f48dc4c03f41baf3caed31d57dd600816626b76d1b0 SHA512 412891cca935313c61e17bbb8d3288b600cc70e6c7f91adcc92caa6bf1493840e8fced7e3a7959644c0a0fa79ec5be0d38f6250770c0adf5e5bfd80dd2ae16b6
 MISC metadata.xml 381 BLAKE2B 4daeebe708d2d0a70a215899420ee4e218258279629c0a5d2f11cd00c961900e7fc81706eb443899c4e9f6d25aa204b24718c09f5c0929f5dbb2273c04bc3f99 SHA512 22d6d48e2bed0de91f468bed90ad2f41c164f84cd89eb99e87cb1b0f528a0c79f632cdd4dc5cad919de9fbc166edf539fbeddad06ab9a864b8a46efc023b5fae
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
index 02689ee07d6b..5977bf86dd4d 100644
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ b/dev-python/terminado/terminado-0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.6.ebuild
index 20948e3957e8..a6a4549f1a3b 100644
--- a/dev-python/terminado/terminado-0.6.ebuild
+++ b/dev-python/terminado/terminado-0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
index 84e215698f6b..92889d03629d 100644
--- a/dev-python/terminado/terminado-0.8.1.ebuild
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/testify/Manifest b/dev-python/testify/Manifest
index cb26444b1f7e..583e8ea456a1 100644
--- a/dev-python/testify/Manifest
+++ b/dev-python/testify/Manifest
@@ -1,3 +1,3 @@
 DIST testify-0.11.0.tar.gz 67914 BLAKE2B 8518f7f95ed83c7c8d779b58962f9b111639b4d5b9bbe80907a6e25ca70781945aa320a0cdcfefebe6c96b0a7f471f8334af332dad32beab5848e7601ed277e0 SHA512 ed19a9b5cfa509b65bfa366aa8c5fb311f00a2996dca9b5028a7dfe8d7ad06ab88964dd7e7ea7aa31e183537d769bbd81eb6dbd7d57d7576b6ec8fca9b684dd0
-EBUILD testify-0.11.0.ebuild 1326 BLAKE2B 874412239c7748ad32bae903fef2e178c5ec6d68a482ba638bd0470748116bc8ed9aaa5ff44815e79ab3e50862a4016eb01e88e2a4c7d2b11ab0d75810cf80d7 SHA512 8fc6ff76b6677e71f28f5fc13821b7f34dd4e338bc10264d7868d8a89f8bb7a76eba07f5acc2089c1273cf3cab5e438f759d1fe2a0412f80256fee3c4010818e
+EBUILD testify-0.11.0.ebuild 1320 BLAKE2B abdf008abed221266913de6af30d5bf7107cfcec7bdee779fe33e806111bc838a53214e38528849ae4e64e865445853a47f9b66f122670459e641739c52cff8c SHA512 5184a12ceb506ed342318e069e443182f47212a6ce554515b580126da00231ee48c81524da1b8ae357ca9a6334ebc0570c30873903a3051ac26d16d7c7d5611b
 MISC metadata.xml 374 BLAKE2B 28e2fec88ebfc9fa2560301c0f566f72e6d4fd86ae01f61c6fc2161176b2855156d37a21383190c62d13c587c3cdef70f41c756013d7142226883fb45ae81fba SHA512 668324c1ff0e2977568abc0ff574acf07d445bb47e17781b7e6d4f409118496c5ab4668ea500e94a615ffcd93c4c5dd59960cb00b886b9c57174ae62ce24c8b0
diff --git a/dev-python/testify/testify-0.11.0.ebuild b/dev-python/testify/testify-0.11.0.ebuild
index 58e313e75e0c..f3bdc14470bc 100644
--- a/dev-python/testify/testify-0.11.0.ebuild
+++ b/dev-python/testify/testify-0.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index d38f207a0987..f30cff93b148 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,6 +1,6 @@
 AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a26b1b8fa795472622efea1afa6d5df717c10fbfbf106180d1f6d5f8822350d9605de41fc7db9e37a7b4c7b887df9 SHA512 c27c2dda320d2c16239eb498b2f59f85746745ce1875879a17f41235081983fd1015f0dfd182c6823b998f85aaf460486a3ac6d955be969487692ed50c5648aa
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
-EBUILD testpath-0.3.1.ebuild 1116 BLAKE2B 4b63d38565eb24d7a4049afefe995d3920776330bc3ae94c16b3335461d4875304c15c7017aba859031c6bd95a85db7b00049c518d149069edcc1fb39d0af194 SHA512 330978027ab09b4e49dc9fdf34c0f4b8702882d14c13c71c3460fa02a589562431d50ce6c7484b0066fadc1c4b1e400e1d5009ee452acf9c957fc1cffb7e1e56
-EBUILD testpath-0.4.4.ebuild 887 BLAKE2B c9330d77fd3b9faa8348f5899201ddffdca43b68c7f7a0173f7ae549393ac350d4f3c406646af52fcc45e84aa2daa97104e68a80acb10ddac19ac7f8993858f5 SHA512 72b2f12d74d00d1610a9d17521968373b8354b4d6465ee89eb5e106e53fa1d9d564962681fa92dce90dbd7be6da6bd81e936efe9ae6c07e954937d1016c16b4c
+EBUILD testpath-0.3.1.ebuild 1110 BLAKE2B cf610a2cc0a3b6f03e04fa6d5f36333b7253f8ac23ef4b3956fcb5d47dfcd18a62c9fc0e9ca863b64b66b4eb91ce8f7e23c8ac8daa00756c5cb741285d5c0c34 SHA512 adc56e47ba88f4e4275540ca2aca4c674a6ad6e61a491b8e2e523f52cf6fb45e5a7d56a9a661255490dfc5ff95e5ac44969748f27327688b057f550f759ec515
+EBUILD testpath-0.4.4.ebuild 894 BLAKE2B 859bded92743726b496c0a1ad6080a57ee3195aa4f0cdfb2f83d175e586b4b62f1e7f15e5030164a298b6cf95667aa7a0c9bc6ca1d70193861b04c5bd2fe871f SHA512 4380fccaf0aabd2da030ae83876fb9336647e0ba94dd80214a54592fa522056b7a8773608b2680a06de096a87bc492e31aead737e075e6001b805a6602695abf
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.3.1.ebuild b/dev-python/testpath/testpath-0.3.1.ebuild
index da39fc5e486b..d7c94e75a1f1 100644
--- a/dev-python/testpath/testpath-0.3.1.ebuild
+++ b/dev-python/testpath/testpath-0.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/testpath/testpath-0.4.4.ebuild b/dev-python/testpath/testpath-0.4.4.ebuild
index fd9d7bfa7f92..5f419197bfb8 100644
--- a/dev-python/testpath/testpath-0.4.4.ebuild
+++ b/dev-python/testpath/testpath-0.4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/thrift/Manifest b/dev-python/thrift/Manifest
index 733c3978b153..9634d014bf81 100644
--- a/dev-python/thrift/Manifest
+++ b/dev-python/thrift/Manifest
@@ -1,3 +1,3 @@
 DIST thrift-0.11.0.tar.gz 52467 BLAKE2B 72dca118476dc5d618f6434614e5d72c6f496088731de9b62fcf47e76dcf707a171721df2aa4c87fdcf90670b8fd11c3a1cdb2b090b78683a3f4a204ef8121cb SHA512 cba59eef2841fa008a19cd36b322491b67d711698205d6671c76e38a3de2b330db8aa54516de8cdd4020dc795e67ed55913df53466f5dbf07d38fed2d10f9349
-EBUILD thrift-0.11.0.ebuild 478 BLAKE2B b0b118ac230bea690adb9f90adbb7c381c57ceefb05d9216224bc2e8f3b16ed26c74630131a302699fb25431582b03938beb3c8aaef30f44c3255b5422b42ded SHA512 bdba8bfdc4c818d1978201d5e785e8bfe67de6133a20c8e009b8434d6b446241dd31b68fe9ec3730c9fcafc9b8b085ca831a78d48fd125476d320d7d1874021d
+EBUILD thrift-0.11.0.ebuild 472 BLAKE2B 690e235d39d42d3923c6d0f825d95f3e85a66eaffb747665694f3933141f89ebdcc0d59926422a48fc9f22e94b630d5c5173b6d02c341c93aa68fa5cc55b2a29 SHA512 b906965af1a468544b646fe27c889d692cae4626d5f10c63c2278e92a1b7ba57f75a95bb27fcad70a5748bbe714faf8f3ad58f8a8056193a078408f81ba2e2ca
 MISC metadata.xml 327 BLAKE2B 68fffa25c9e88a87a56110743553819ef0591f40567594c2ec966e86228bd3a0b0ef0d84f9f002c427b90d1f139d51f1af9786a4451457a7edb43adbcba10ecd SHA512 5f1f04b5bf6a52319bf4810089b26ba4ea4e4ecb0fb44b70322cca98bac1ed2851535fa8d8e6eea38e45c0a411261c5ca966b13a68cd9f3f51c4f7ff003b7291
diff --git a/dev-python/thrift/thrift-0.11.0.ebuild b/dev-python/thrift/thrift-0.11.0.ebuild
index d0470e479508..8d1092062ecd 100644
--- a/dev-python/thrift/thrift-0.11.0.ebuild
+++ b/dev-python/thrift/thrift-0.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/thriftpy/Manifest b/dev-python/thriftpy/Manifest
index a200ab2129df..1aa472811234 100644
--- a/dev-python/thriftpy/Manifest
+++ b/dev-python/thriftpy/Manifest
@@ -1,3 +1,3 @@
 DIST thriftpy-0.3.9.tar.gz 208164 BLAKE2B 5ceb0479468cf7ee88f244163a247c878decdcf54844992b839259fd5be3fc8f0453bc861336ab4f21f4dc6c218eb2dc0a0fb2efa956675885bf710b8c32a86e SHA512 ad2b7f568db47f7f26235fc5fb6180c974eb6738f154461860c7329d263252ee627b979098c3e9ffe8ed42a0fb08a9110a6842a923ac800166d80a23d4e6a3cb
-EBUILD thriftpy-0.3.9.ebuild 658 BLAKE2B cdbd9fc234bc1bcee35eb9a666c6c19b71f4f24832408c282114089888c86383998bf40f8fa01e57ee7f4ddf999f53b94dadb0b48817212d6bb7842d8044b1ea SHA512 8954e7ca9e70bf1314012ae729326f5c555af72e2e94836dd93dd52722c08294735af58ff1daaacfc2b798a951b610ac89780766fa35243da48de6bed4c116fa
+EBUILD thriftpy-0.3.9.ebuild 652 BLAKE2B 4cd2bc9436569f3217e7e8ed6dd7a903589492ff0a543ea3be1f775fb116271bc1d3b8f798377703ba5409d6367c460bca086d97ac46cfac5b9ae3284b4beeb7 SHA512 0092e09111ecb6dc0fe4b2590a40429187bfe12e0d9632439120b792906c43884d9e8a2d955669d3b32336c4820656c65f36a067d4b4ab5cf243fb13e6226560
 MISC metadata.xml 778 BLAKE2B 6f83e8ead49cbabc5532cf915cc184af1070305ed153c97cfd1df5526e5d0db5c653c29fd746ba73b27d7cecc457cc24c2e37e733ee61a42f60fe8a2fd451ced SHA512 0bf7df25d46542f335eb9473e552b4fbaef70c43ccbffe2c982aad81c3d86b80f4c78c418848d51943849f18dd57bfeb9bb71ec92a2222565608457aa96b4749
diff --git a/dev-python/thriftpy/thriftpy-0.3.9.ebuild b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
index ac202573d505..da8d82fd4c48 100644
--- a/dev-python/thriftpy/thriftpy-0.3.9.ebuild
+++ b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 0a2ba549f7d2..0519af92cc32 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,3 +1,3 @@
 DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
-EBUILD thunarx-python-0.5.1.ebuild 719 BLAKE2B 66ff0289280b1e954113fb8fb47e19bac9b5dd0338bf58a27922228e356e62f9d22469c7e44f947122338b0c33537131900d914f7a314683fc05a0d716fe70fa SHA512 4511e98989d04d371b2652a17052d131ec1696d6b724a51f25f9a8f89129990da135fe0e541e836218ebb1455a6a91c03e5574dec75fb4bae90b2dd00e543509
+EBUILD thunarx-python-0.5.1-r1.ebuild 755 BLAKE2B a4da43181cc6ce167d3550c7c1b0e07142b4c909921e7c01eb5d9b8086781bd83d41f81ec5314761d9b5631e59bbe87f92de804130212e29a5240f2799f34845 SHA512 55082f1ee32d29181bbf870036d762e057e76b8eea93c804ba0ff82dea13e3bf563039efe273aa33cef9d3136dcd8c24e4dd4b6ceff2107aced30fb512f499d5
 MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..0a243f4cf713
--- /dev/null
+++ b/dev-python/thunarx-python/thunarx-python-0.5.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+
+inherit python-single-r1
+
+DESCRIPTION="Python bindings for the Thunar file manager"
+HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
+SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3
+	>=dev-libs/glib-2.30:2
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.20:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=xfce-base/thunar-1.7.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
deleted file mode 100644
index 2d802fa3d307..000000000000
--- a/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1
-
-DESCRIPTION="Python bindings for the Thunar file manager"
-HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
-SRC_URI="https://archive.xfce.org/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.20:3
-	>=dev-libs/glib-2.30:2
-	>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
-	>=xfce-base/thunar-1.7.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 19b2daf1941f..3d4ea803ff11 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,7 +1,7 @@
 DIST tinycss2-0.5.tar.gz 61802 BLAKE2B 2bb6093063e6a1b2bd9f78484db73d34c2336bbb00e9aad14a9c4c589e315ca377a5ec7f1b50b8c28f91d496bb668a65032a422ae9c9fda62218bfb7560e0a46 SHA512 321af21a80dbdf8d1ad218e33c87edbe7c0b4c1bffeeb38a9b14bed9064749f71636bf70775186e8785587d5fa96e3488465a76b59f643658f84b6bdc1c5c4bd
 DIST tinycss2-0.6.1.tar.gz 59548 BLAKE2B 9c80ea593ce4831bb4846eadca44595a5b30247a9a4ce9608bb4c505cebe47d151936361e0d9d4af124ce9097dc664b6a4eb7f926ce28c4336aebd08450b71cf SHA512 fa064bbb06d641a497a3c1eb35118bbf8ca8c4d32fbd3d8c64bb10d6cdab24387e77cd4c3277a957f23de2bd527a407836245f4387d7f880958858bd9cc7ab89
 DIST tinycss2-1.0.2.tar.gz 57728 BLAKE2B 966af74a499b9eb696beb3aca2c832d4e07641ed61415aa85a1798e30c568932875ff69f1ccf71cde8823194ea8dfbd54226fa93e718291f09645ea60620b43d SHA512 69bdf52898f9e704c01fe5fd11170e0efc9a6aca14646f5331fc06ebbdf941f9b6c798ded7d93636c7b810b35c659750c3ece3917c5c9cef4092e3e17b382dd1
-EBUILD tinycss2-0.5.ebuild 658 BLAKE2B ea66aaf6325b708e37bc288d23ca341bd0bac56bf4f8fb990673a9137dd15b812932cb271210ee98f27a3235ce731f5194b1c350faa5ec3ac81532a20b792fe9 SHA512 664ed9c117ccafb3bcc5ea3bfab427d9b85691a439cdaeef2bcf89bf7ef0e36a12dd89e2cfc28a994d1c9513c1e9748e6a8a81932d923f8893f851498703fe93
-EBUILD tinycss2-0.6.1.ebuild 656 BLAKE2B 6fba0c9363678f0bc1f01a96a2da2cea0f6e405d483245aab7c8b64ea784b794865df736eaeb5aecbfd10da346d339edacc8ecc435c03e200a66b53949fb5045 SHA512 b517bb7ae7d1982dadcb57084937c3d23251d6ac057b283e908cfa4b46863a19abb5fb8ca0b45e688c61aec9d21ca3a4b029ec50647e3b1566118fa6660c7184
+EBUILD tinycss2-0.5.ebuild 652 BLAKE2B b911eed7b6cf082bde0747d9988636caf0b9821940fa94231c608d36358221592a2666172e4a35bfff8015dfcc34c6d9f67eca5d17fd8e8de45b1e5d2e459297 SHA512 ce27b4fd3efe0bbddcdc71817194a515503fda03b17395b616f7b6d8ec91ba043a4ad258a02e13d27d0955c8539e6fb4da8228fddea9bf5c284b58a83005b70e
+EBUILD tinycss2-0.6.1.ebuild 650 BLAKE2B 68e511675e3d3ab8ba2c9bcd60a0c13c65c793e5051ba49a351f94e2f611a92c2d6841768ac31ad895ea1af62c8079ce896c768c6c97273f2e8ad9fff4eb8045 SHA512 8f935a0c5496928894e0617e9024f18e75f89f58c9bad39b780c999a926bf1941b15104962a93ba80bc579f0c4205a7c7a89114ddb573bda2bef7f0bdb0bd404
 EBUILD tinycss2-1.0.2.ebuild 893 BLAKE2B 6b596622bff5ada3df982f8f51bb5ec66545250eb4435384181bacedf0c9bba790b54c35a133af9f2c0a4532533b518107b84a1836bfcec2f6f3983a96b6307a SHA512 2a29074c67adede5efaa240a71276f442af8d0fe00a1c36805ef2ab9a05596ec12bbcf3329510dc553eef7af9807aeaef05adefbb937e16f4a55d371aed83f7f
 MISC metadata.xml 497 BLAKE2B 99c42dc1977fae24cf0af136eab84efc6cd86bdfce5d92f96afbe941daf9a62656232c9da866ead72f82e35a709c4850d58a793a4261d511bf2c84fac32b5eed SHA512 8004da866ba4038adacebe1eb03c7304ee7937e643babc75ecdaff33d22a13ddd9583344e239f3be50ea3eaf0026ac626813f8aa10d1b192196f524eb5cf5027
diff --git a/dev-python/tinycss2/tinycss2-0.5.ebuild b/dev-python/tinycss2/tinycss2-0.5.ebuild
index d6d566173665..1ab4107d4949 100644
--- a/dev-python/tinycss2/tinycss2-0.5.ebuild
+++ b/dev-python/tinycss2/tinycss2-0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tinycss2/tinycss2-0.6.1.ebuild b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
index 289ce81f4ef8..614f0a40cb07 100644
--- a/dev-python/tinycss2/tinycss2-0.6.1.ebuild
+++ b/dev-python/tinycss2/tinycss2-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tld/Manifest b/dev-python/tld/Manifest
index 1e6c5980afe3..0a2eea9e612b 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,7 +1,7 @@
 DIST tld-0.10.tar.gz 1072577 BLAKE2B b4fbd245e16e905a4dd40980c376cb52a3ec21581e25b09ae07d66799c922eb31964bfbbdffbb7e28437ba094500d32d9f34e6f7214ed530222e598bbefd28f1 SHA512 8fc993d9a8457e0130d576eeb9bccef0bac8246f428ade466f46cee6dca509985157d28ba260dfd027f9f7f6abcb6b7ff3157b2846f05fe94e9c415021ca5488
 DIST tld-0.11.8.tar.gz 1344244 BLAKE2B 37c485cbb4067db78e68c07b5c68ad8ef67026b30dcc683dd2af9e468ef9bef3b2d7684c7d1a311c1867336e615af4d817ea204511701a0aae28b9bfc3c0d5fb SHA512 d36f5a13ef871f54b654df3a136416e4fde8552ccbec8a398f51ae391672f9ce3e5e9d5a7b7e3b5714e800116dd9db9c1080dcbed5f8d801d20930a70e4e64e4
 DIST tld-0.9.7.tar.gz 912360 BLAKE2B be5373040a689fc4d8831c85fb9da29070978c6ea6a7c279caf9dace80c3171ad414861f2558bcdd3ae0f15cba33e577f40869c536611a14eeafc4c1265fdcc4 SHA512 45a42f0c9ffe18912c33c26f30eda33117efd37688cfadbdb05514e22249d0c371629cb29a1d2eb4bce49efdb5d45bab3438f1b6e0dddef905b7ec6ad4fd99e5
-EBUILD tld-0.10.ebuild 503 BLAKE2B d290711c8f5eadff04f870c026edc2293926e92b6ea147113fe84eaa2a04c50adbdaf5a46178f0edc01a37eecf892214b54a8e8a9efca9d414979fec978fc8fb SHA512 0d32fc2aa166475f4934361ce81fe73c8474cfdb74128b85f3b867219ed1af54af4cbc8d256cc458b287d4effc663481fc7166a7efcf50074141ffb9fd0f32f4
-EBUILD tld-0.11.8.ebuild 503 BLAKE2B d290711c8f5eadff04f870c026edc2293926e92b6ea147113fe84eaa2a04c50adbdaf5a46178f0edc01a37eecf892214b54a8e8a9efca9d414979fec978fc8fb SHA512 0d32fc2aa166475f4934361ce81fe73c8474cfdb74128b85f3b867219ed1af54af4cbc8d256cc458b287d4effc663481fc7166a7efcf50074141ffb9fd0f32f4
-EBUILD tld-0.9.7.ebuild 501 BLAKE2B f1d1e91950238bfd6cf05a087c63ea311604a75849e790222896358d35bdbc18d24059f5ff66058406dc6ce4c3a8a82d67a9907eea6aa97813fd518f071bc6ba SHA512 0d2f6af7185742021aa0e37e0b26591a8b333b511aa107cc42ed6062930f184f9c8ceca9ddd1831a62af80854eb1245b22d22255348954726ff358cab140e670
+EBUILD tld-0.10.ebuild 493 BLAKE2B 4a131f799eaa18bf3a1bd0df921a0069cab46c5190d61ab1325c18a796823729692922e7b9435bbeaa1fa81259f451e81f9fa9d6650ca87063995d5f4071cac4 SHA512 61acca40233f335dbcb824ce02add158df662a64fb9cb78da4588b8fb214ea5df31f150f2a55cecf0d160f2a990dda6f1ce876a0e889bff03c715554feab660a
+EBUILD tld-0.11.8.ebuild 493 BLAKE2B 4a131f799eaa18bf3a1bd0df921a0069cab46c5190d61ab1325c18a796823729692922e7b9435bbeaa1fa81259f451e81f9fa9d6650ca87063995d5f4071cac4 SHA512 61acca40233f335dbcb824ce02add158df662a64fb9cb78da4588b8fb214ea5df31f150f2a55cecf0d160f2a990dda6f1ce876a0e889bff03c715554feab660a
+EBUILD tld-0.9.7.ebuild 491 BLAKE2B 55f7a53bb84f45c22d6eaa4c22384a45a952167b8e87baa69c7dc3f5063b6c59f5f14c8bd75dd0f92fae493efb943293f1130e37fed7e4e88f1e3e45f8477c6c SHA512 69279ea54bac8b93cad893b35550a24b9da4fe71b34540477c4f4c5c2f5cdc39d545773deeb4c4ea6d5bce0465014fd8530375d7fb458e80444ecb9b7f5c563b
 MISC metadata.xml 419 BLAKE2B 48f0e2b96669406551c66e56225022f649ede7feb5e435e73b229f2fba514fd90cc1c542b34c0f31ce5f3bf7197c16188d83cd63542b7017caf114b2a1f0feaa SHA512 fd4fa0a5a30087e046f21cd68d7f5772b20a12f24ebc16641c45e28c1e033a4cf8ac99419f4a70f8d6e7997e6c612681c34e9e576632691ec443360effc75d40
diff --git a/dev-python/tld/tld-0.10.ebuild b/dev-python/tld/tld-0.10.ebuild
index f5618b217951..e1017bfa9ac7 100644
--- a/dev-python/tld/tld-0.10.ebuild
+++ b/dev-python/tld/tld-0.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tld/tld-0.11.8.ebuild b/dev-python/tld/tld-0.11.8.ebuild
index f5618b217951..e1017bfa9ac7 100644
--- a/dev-python/tld/tld-0.11.8.ebuild
+++ b/dev-python/tld/tld-0.11.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tld/tld-0.9.7.ebuild b/dev-python/tld/tld-0.9.7.ebuild
index b20939596455..c8c33a28242a 100644
--- a/dev-python/tld/tld-0.9.7.ebuild
+++ b/dev-python/tld/tld-0.9.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/tldextract/Manifest b/dev-python/tldextract/Manifest
index f6f4b641c402..6fd384324b3e 100644
--- a/dev-python/tldextract/Manifest
+++ b/dev-python/tldextract/Manifest
@@ -1,3 +1,3 @@
 DIST tldextract-2.2.1.tar.gz 54538 BLAKE2B 0abfb1982d0b9e9cd767bc64db289da8bf2f58b599eaea7e703adf36934dae0d052170fa9a8205b8ac0b441d8f1ac75648ccc108515586b0bcacf2ecb43fef52 SHA512 db4f14e514c0e68f85f28226343d7ec91ceea2843ee01c9a2950f0972f365bf343640e07cfb118aff52bab975719be71d179fc6b3bd4da7eb62a47b62747cc0b
-EBUILD tldextract-2.2.1.ebuild 646 BLAKE2B f64e2c3e9ab97ccaa42b2c89beec5ceea767a29c44926d952015eedb69038e6fdbd01bbbee71f4c0544fba71713b1b75c9ed0bbf344b931b646a9a4963612e14 SHA512 25c68b1f4c05b6c611e9152b3fed41fe28fa28be71dc596f7951098eda4ea68fe6ca92888574ae077d3ebcdde8b5998d59b42a6b581e75b91b31d257309b9cf3
+EBUILD tldextract-2.2.1.ebuild 642 BLAKE2B beae6ccbe289e32c6fe8ecf52ef7d37c4228f1256254140d0284b8c6a546d1dd97d218fdd66d9a1e1586d4eb1ac90ca8c07698cbb22d4f2f74ac6c1a2b5e3bbf SHA512 6ece98cd41135fef99b48585c58ede32591937eb1788a970352f6e2d2d373466f9ba5e4906bc25c951ad42e7c630b6d39edfa8f1a1bd505fd9f94d7754de28e9
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/dev-python/tldextract/tldextract-2.2.1.ebuild b/dev-python/tldextract/tldextract-2.2.1.ebuild
index 0d1d65fbbb2f..e47d3e81ce18 100644
--- a/dev-python/tldextract/tldextract-2.2.1.ebuild
+++ b/dev-python/tldextract/tldextract-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="Accurately separate the TLD from the registered domain and subdomains of a URL."
diff --git a/dev-python/tlslite/Manifest b/dev-python/tlslite/Manifest
index 05e4ca7c9aa6..cf5ac48b6201 100644
--- a/dev-python/tlslite/Manifest
+++ b/dev-python/tlslite/Manifest
@@ -1,3 +1,3 @@
 DIST tlslite-0.4.9.tar.gz 105402 BLAKE2B a26d0938dc713b701d6079263e46f44b23814708d04fef8698bd0b736e10d58ceb5e99dcb1ecdd66a225fc0a697aafdbb97ed46522229d3af7f760daf23f4d86 SHA512 5473139b5730ef946efa139fbb9adb3333dc67f33f03305f4a6d3b6eaaefce950ba93bc1053362fc31b9d68ff9f6deceb9449987e29ff44035b818d7310edbea
-EBUILD tlslite-0.4.9-r2.ebuild 868 BLAKE2B 149eacac94bbcc9dd4ce3683ab72ef9ad125c8b5f1de7e4c8cacb6a826630d241aac4785160d32f666134fbce429b005b842ec57e80c5725085e1c287b3a290f SHA512 309fcd2b996a33eb8320e6aa36b254331bb3ca4c68fe5e9bf72ebdac7d584ac907d607c7f0f033fba43ad930e8c70388740c9fa140cfcde4760d8faba7a336cc
+EBUILD tlslite-0.4.9-r2.ebuild 862 BLAKE2B 3f0eb7c9895ecf75f1a1feea34445fe62cdd9e8d30407b1e9a77299a10952113fe2ef462d0a60aa29efcfe6153e7b5bdf3ee0ad33be1323b7503a7eb771e2c4d SHA512 dc503c4242c82e250f02c6cd827ba97bec6cfb95a0c6bb5e78993417aba059e9701a6be01c7d3a7038d59563a4b9e63132ff74e11263a8441c0c82401b8f1fc0
 MISC metadata.xml 862 BLAKE2B efac680351c088ebb5c54afec47d1ff6539eba67860a891dedcf142ea2bcd56ec53a9ea7b5f5f16f90c70807bdf563344efb14a3308463413962e57bb22a475e SHA512 1374c0176a6a8386e8123bf1be106431d616de1b70d4b4948327b3e8f20a5d346bb622a2b83389aca1a0eda3f33591e9327929f2a7c062f04af80618ed3b0b8f
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
index d600d6e6a788..33f6b717d373 100644
--- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 7444e80b5bb0..3298f10d0a82 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,7 +1,7 @@
 DIST toolz-0.8.0.tar.gz 40768 BLAKE2B 5526dca9841b4d0eaee2f5691dc4dca17a231432eac795eae694c609d011ee85f3a6e818b206820168665b03338ab038326b485635022bdad2eb9289237b5de5 SHA512 678ec3120d1306fe0e79824caaa03060ba780c464e783d7e20c4149483babe63646b3facaec63ee4017b32be07cd052f4ebcdf73ba8f7734e80873df7127d469
 DIST toolz-0.8.2.tar.gz 45486 BLAKE2B fdc949807efc44c335e542c0a0f8262976747c5fb20a43c8de412d69289394b6ffb7200dfe9ce484b4f71a9c33ee1f8876e1fc14e9e18552f3ea923191bbbb46 SHA512 b03968b5f31474b2b5fd944d282b620861184cd26b256f6f92a141aa0f25c20baf2be6b1424bc945778fa05781730b477b16551c9f302c284d54c8be64f2699f
 DIST toolz-0.9.0.tar.gz 45544 BLAKE2B 8de1702a38423f71ae6da24396c7a00428b13cef262efb0fceee454bf67a09a1ab4f4093c84c38234713b38ae4058c4039f2bfcb3c7286daba112e4eda23186c SHA512 f55a773d322b4ece104724c58d89bb41a35ec43f45b14fe367865934162ef06cf7da783b53498405552df75d83fba15bb61ce5ee0661b6122c5984352e80de3d
-EBUILD toolz-0.8.0.ebuild 439 BLAKE2B c791d4506b82f4a8a85ce938bcfc25313720f69692b054116b5ef28a5d1a36bd1ff96aad74915729ba566b177bf6f7c1e857730eb67142467be955345f78af24 SHA512 4914bc7e34da6d1472568424865c5acf16c4af64f032eb8c47909dcd4537a8348dc82a46e2305e96d4f5cb82af50de535bdc64179c4e39521eee269df2bddfd9
-EBUILD toolz-0.8.2.ebuild 447 BLAKE2B 9359a265f8891112df0d6a425cf788b129f2e69591949c1ad6f112a72f6f78417705692eaa99343ffcb3fcb2a31caef07bf1a93e35bf0798070f427d3da3d6bd SHA512 3535a6d92a56853aed25226e143c7adee77596bc0a5f7a24d8473d06a1146a1ca4a81b0f23b8c01c5cb1df90feacb704e9a7d69625e8a0090681d619b081cbb3
-EBUILD toolz-0.9.0.ebuild 448 BLAKE2B 0003cf4dfc3d4d0280a73e0597edaa7fb5ce01bc6afb8ce664abb28271f3eadd0cb85e7691a6b688abaccf0d9692022fa23d91640e4214aa77bfa2111e78ace6 SHA512 b569045627b1687f8c03a4bf052dba196d7c679c62e81bb04db5cd21080e83a10c83ab76ef87bfb9e0ba389aa8dca16bbee85474ffaa53127a68f792ee94b178
+EBUILD toolz-0.8.0.ebuild 433 BLAKE2B 6b1324e4721ddc2a615c2046a8266351cde3f44dc2b220654cfdfcfcd8f4a00ea7a4137cafc9567ae2f50c28cdd1b06647fa6f0fb9b0248412b82ccb71b83dc9 SHA512 bd78fbe4cf4ff633ee267442f9276928543136380ff152c9337e181bfcef8d8c88176102ca6d0666f132c4e1a569e56fb3814a406da4560b8dba27426dc9035c
+EBUILD toolz-0.8.2.ebuild 441 BLAKE2B 4f23b96b3bb57dd783674f8d47c56551baec4af3256f07510f6976b65fed73281c94a8153874901baa7231de6e3c78f4c68f889187950cb2fb84b59bf7f55551 SHA512 73b29abb5e6125695d57627f24dfca96643e6b4f82415c542d90d59abc955bc64fdfaa95a1d7233c69b598bdef987430eda98c53d6471f3cebae142fb948a90b
+EBUILD toolz-0.9.0.ebuild 444 BLAKE2B 1926e3799101001908a720f2cf663e932667f38e2b629be2916f433d61367b2cbb2d2afd8586d62642383983c90143a8c998b004cca02e8b4edc156c2f6c2a46 SHA512 e4a60bbffece1987efab8c7194ea1c3ce4db261ae27fb39d58eed5c0f778dcd8fcd8c4b22e236b70e4e7c5a4e3512c91e355986af558a1b319dd891cbb67580d
 MISC metadata.xml 308 BLAKE2B 2f9bcec9b5e7f76a32f38ecfe3aaf74e6ee231151af12cd6c98671bd4fd40a31110c739e0dcc4d60a7413abf7d8dd268f244553e8b549a58bfb9cdf920b8fcf4 SHA512 06df1cb87c23af8446b55a5c3da9617686a03547ab9c1d4cbaeb53759f789961963ce947ccf559db057c01d0cebf8da1a37fe46da9133932717aabfb40a7e177
diff --git a/dev-python/toolz/toolz-0.8.0.ebuild b/dev-python/toolz/toolz-0.8.0.ebuild
index cf0e788c22db..b26289aab422 100644
--- a/dev-python/toolz/toolz-0.8.0.ebuild
+++ b/dev-python/toolz/toolz-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/toolz/toolz-0.8.2.ebuild b/dev-python/toolz/toolz-0.8.2.ebuild
index 194bea99e184..0a342536e08d 100644
--- a/dev-python/toolz/toolz-0.8.2.ebuild
+++ b/dev-python/toolz/toolz-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/toolz/toolz-0.9.0.ebuild b/dev-python/toolz/toolz-0.9.0.ebuild
index 5c7ce0a8da31..67bb2da757d9 100644
--- a/dev-python/toolz/toolz-0.9.0.ebuild
+++ b/dev-python/toolz/toolz-0.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/toro/Manifest b/dev-python/toro/Manifest
index 4abb278e35db..3e0d3f05f1f7 100644
--- a/dev-python/toro/Manifest
+++ b/dev-python/toro/Manifest
@@ -1,4 +1,4 @@
 AUX toro-1.0.1-no-test-install.patch 278 BLAKE2B 87ac93c1b5a70eee2995e1466b771a8d6667c209deac9c872888b970792b3de0eda32a4f62b25eeb714c6600906779e949bb3b07a52c7faa240e4846ca12751b SHA512 e1a7eb6ba8898a112603ac1bdb3eea692c3bc52931a617bc12343e7c60980a4bedab93584347777cd4869085872ca7b7f7c0c8a083d175e0e2597214680a5f00
 DIST toro-1.0.1.tar.gz 57343 BLAKE2B 2269aa9d99eda60013c695c9acbf4f808562c0d7f4a79ee7d7402255af2ff600ad292949ac789b7a7c9429009cec41587052440e64f99edb7f88646dabd3b814 SHA512 a8a498868ff32dbd8ba9a0adf62b1fa2e9dea4f34be4e2701c08c7b58ef28b8daf4eab93916855a711a557049e587e886d6ba362487c151c5db34f6135f4f3e5
-EBUILD toro-1.0.1.ebuild 836 BLAKE2B 47b3525c0a43d929de3c1c9c8d4f27fbbd770d8db4303e8a6cb47adb06efeac8c7779089b91d4a3223ac96ecd33b3d046f62b060f9e376646fcf0ac79a2587d1 SHA512 53c48b4bf92abf1860a5ac48bb17bfc33be2815715604738d83b1be8d115feab09eb0095ee0fd6c3adf379cd867ba1dcd29fcdb90818322c2cbf9bb0695c228b
+EBUILD toro-1.0.1.ebuild 826 BLAKE2B dcf029209dc19ed88ce67298617d1b1c7ad8ea2ba22fd77c3bdfd61ab4ebd3971e306e47ec964fafccf928e456bb48812710397935667c79a533fb44703c9dc9 SHA512 8307506e81169cf6775d5d394c8634b0c687f5b0dba4eea172d22e0ef576f26573141a098ca86d479163ff9af139b4b9a4e5e228b74e8c1440f013c67a37b9a4
 MISC metadata.xml 524 BLAKE2B 45ccb3fe7a751bcda58eb5948921c4c6e75080488ae7e40e1c924911c9ef2121dd9182dc638a411bb5892e80738afbe33cb909eb8b44f80ba4e4e4edc76796e8 SHA512 f95ad860f9ec86f41e8909c242e83262fc0ae48082d96891c7d00e937c8b87a1cf9585fc6c0fabe61ff5e94369c027c77a89de86415872dba47a0cb69fcb7164
diff --git a/dev-python/toro/toro-1.0.1.ebuild b/dev-python/toro/toro-1.0.1.ebuild
index f80a4d566ed4..b064dc27d379 100644
--- a/dev-python/toro/toro-1.0.1.ebuild
+++ b/dev-python/toro/toro-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 41c4b94aab68..c3a77270bd95 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -6,6 +6,6 @@ DIST tox-3.14.3.tar.gz 288938 BLAKE2B 1a7d6cb8446b83648b67814fb3413da1a9da93e76a
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1283 BLAKE2B 2b406622044831eaf4ede7d01feae7a19ad781f7afdf53caa79f758ad26a374363934bf241b183c499792d0bb251e9179bd796cb6809cc1a018947ef94780bcf SHA512 40ad403cc7e5a7e5fb43d31aeb070dd38015f63d355f19cabce481eb555f8ff3375578d23b471f7e698045ff9475163c2240e610ba98ed38db264297ea90e008
 EBUILD tox-3.12.1.ebuild 1464 BLAKE2B dc081935636ae04e3d4c9ea74341441c6eb6c127d07eafe852aad8484d74af0d4780e4956f91da9b946fe83469716c3c8c3e45261d15ecaf831ea968fad4e1ce SHA512 3705a537cbf6f97edbeaf8b91fd5e9a5e5ba78c6120d0c5b8fceb854addf23cbd1088ca768c2b9cce1936cb9f26c2dd05d748469c4189f2500854932332113db
-EBUILD tox-3.14.3-r1.ebuild 2236 BLAKE2B fde46522a9c4eba0437673a3ae3d8d5b54cb0836980ae5c1d63449b6664ec256bef84cf412850e23fb07eedcd026b75eda24b5dfe18853f867a720804a04635f SHA512 a9695b63c0d79d8d2cc045970d0a4fce948d1cfef5c2aa44ce67bf63015db9cca4bbb93fb5fd8eefdb3eee7442c4dcc44e896c9b0abd12af86292af5d8aeff48
+EBUILD tox-3.14.3-r1.ebuild 2243 BLAKE2B de600ab3a842f754231322072b3ebb22a2ac3f585b155473cc1f92f12fd80eabff8a0ec8cfc9603631dd058760aa0ed95f2c8ba68d4b7c6af67967c69ef51cc1 SHA512 e39b5ae961bab697d14d09d2606db23f70059b3c3c49e491dc3f8c7f11bef482b773fc2d9f8b2ac448426f45653cd907434bcca2b4697c99438997b17ba335c0
 EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-3.14.3-r1.ebuild b/dev-python/tox/tox-3.14.3-r1.ebuild
index 9394dff0d0a3..a86f2b56c80d 100644
--- a/dev-python/tox/tox-3.14.3-r1.ebuild
+++ b/dev-python/tox/tox-3.14.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="amd64 ~ppc64 sparc x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index e70a6bb3ad7a..14c45513d901 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -3,6 +3,6 @@ DIST tqdm-4.33.0.tar.gz 121571 BLAKE2B f4ee73cfa710462e148f6034ac69144d845d216bd
 DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577fb18986e3153badd73a28352f807782759aa52ed082d7ee0c13dc5f850c1da563ee5892f6bf5e8f49c48c7ee SHA512 1c326d98130c79f614cea502723e4202baa57b7b4639e208133cb464785e4a8d4eaa9d262ea484246d45e5eb8f21994e7ecf3fd6ef0f4966f9049fc8013d7442
 EBUILD tqdm-4.23.3.ebuild 673 BLAKE2B b49a8fdad4ee136a4b5149ab39a852d748c0a9f357587490fd272d37743ce530ed2b69fa8cd87a8ed657d26c0669c2e038d484afb7279ec3460562d281b0063c SHA512 2eb6fa8f796289073d92c07b6e7af8e7441d83bd32a01ac2a0d3dc8b530d1c796777ead4502cc6734b81adae01d8c0a496bff147cde268fe2d5223c4a8ad448a
 EBUILD tqdm-4.33.0.ebuild 1233 BLAKE2B 06c019bae07709c13627ec3b47c00c2745041b604d15a1f84445ab82cd82990506a61ce6c2d44cf9d84c4b1b2c5772ee6b03a4252af7035ac33fc4e6816d5ca1 SHA512 007d81a3e948d9b02e57a501d96ee8bfe8763bdbe5fa89d21332880873dc459cf184f3ffc3a9edf6b2b8b46933ae45d1e07b32b649c8d5ba15cfadf374bf2814
-EBUILD tqdm-4.40.0.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
+EBUILD tqdm-4.40.0.ebuild 1338 BLAKE2B 96431afd4a940332f92a22055af6ca68c860a18b5c1cc006af2be8316087589aa4960884c0f68def7a1a7af35a7f0f62b7030076654ffa52fc44e0f753f9dde0 SHA512 66a3ad10ba41de2267c0aff715067d86b35a6d0613863e4b245a23972b2b3bad2a3daee7d4b304b527ea54243f958e5eacfd685e330634ca693c36d3e347c03f
 EBUILD tqdm-9999.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
 MISC metadata.xml 710 BLAKE2B 9495d9ce29f39e1594574e1ec2986becc8601f2ef1a30b9b13019d5711d0b75e84285e7cc04e2a47b96deee20b6bce8b15cb562e47edfaa77216afbac248e493 SHA512 bd4dd0763d6c332200c07e4c43830839e99b84ed7d2cebf4a2315a2a152ea7a0b2944a2976e8cd6a29d54adc185161380d13e26cfa689ab2bd48ef2f90395c7a
diff --git a/dev-python/tqdm/tqdm-4.40.0.ebuild b/dev-python/tqdm/tqdm-4.40.0.ebuild
index c55f5112880f..95183483170f 100644
--- a/dev-python/tqdm/tqdm-4.40.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.40.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/translationstring/Manifest b/dev-python/translationstring/Manifest
index 9e1d8b3a05c9..cd8b9116ef87 100644
--- a/dev-python/translationstring/Manifest
+++ b/dev-python/translationstring/Manifest
@@ -1,3 +1,3 @@
 DIST translationstring-1.3.tar.gz 29259 BLAKE2B 650c4e294796e1409246cf2f4effdd58bffecc2912e57ea4268d77d38997d2997b329936749af10c8c7625729a6503288cb8aa54baf1a3c07b3671cda0561833 SHA512 deba5b460d9ea640087cff8b5d7b9256708abd4340a54556f1f0542e2e4f9f0ae0a3482b66a176712fcd6925c470da621adbc5e4c4173c0ef29b9cca5fba1102
-EBUILD translationstring-1.3.ebuild 1091 BLAKE2B 270faf31b141fe400b2d629f0facad0c652baab2884ab57a212838dd784121dd3a70be1b0a3cd8d7654128724972804784a2eb9588f246a7c232aac4e466b049 SHA512 fed14dedc86e380e7f537107e5e165fe8cd6fd1bd3bebf13f1806aa4c247f038c1f51c9f2a836c1aa3ca60cf395090b286792aa24753bcb6bad6e1815036cdfa
+EBUILD translationstring-1.3.ebuild 1085 BLAKE2B 3ce008bd99b0e63ef8df140c90052db4926f8d454dd55df7e3ae7acb4c07772de214cb97d1ea8bdd139550a30ff718f5fc09d3d2508932b00d2cc4ee4e7f5543 SHA512 16073dd10eacef9dd86d342db5c3d7b9fe9e2457d54e42f1f3ebb11509e2a014b1b6acec28e24ca533dfbca51ab5bf3365d2f9e9e166603535bfe27a2bacc211
 MISC metadata.xml 396 BLAKE2B dd74b39a6a434cd88f9cdc36dfa838457d0a7e6677f68e4b687844c1861b25407cbe756af94995ceab82b55b0a607118060579c1c3bf40d78d8299f1a62a4066 SHA512 6cfbb09e766bb9c10523808ea4da01f0998e03c239f633347523f57177816bb4c6efca2567ba53b2bf5b41274a3845d8a379294172c94067bb02f901175cc9e8
diff --git a/dev-python/translationstring/translationstring-1.3.ebuild b/dev-python/translationstring/translationstring-1.3.ebuild
index 905f76add406..760d5a9ec99a 100644
--- a/dev-python/translationstring/translationstring-1.3.ebuild
+++ b/dev-python/translationstring/translationstring-1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/treq/Manifest b/dev-python/treq/Manifest
index e8aa1d61e961..e27a290161cc 100644
--- a/dev-python/treq/Manifest
+++ b/dev-python/treq/Manifest
@@ -1,3 +1,3 @@
 DIST treq-17.8.0.tar.gz 56439 BLAKE2B 3e39c84453793baf3107c38b656c8968e593845fc0d41035b558326ff947a9e17903ce33dee3157d2cb2f79ab3aa884ddebcd52e743cd6e1ad08a0de324cd6bc SHA512 62933a512fcc8b0e77333eb9268846ad17f4b44cf6ea317ada2565054100be3caf03bda0a1becd775ec85528fc2f5ddec33d23d3579cf484a3c6ba7c71c50a7f
-EBUILD treq-17.8.0.ebuild 1671 BLAKE2B 67c32e079da35c4c2955872270ebbd088301fc27149e1fa50cf007cea294f2e65171cca5a2161e116edaf01eeeb89505e36c69dafe9c378693d6dc0b1032ef75 SHA512 501d494a38355abe9b9c43715030bdb778553cea368f219a36ace326e6797aa08b56bdc1faf8b6449aa08f3354d0ba7ad3d362cacc593751027ae07408bbbdd1
+EBUILD treq-17.8.0.ebuild 1661 BLAKE2B 8cc789d510c16a337b9e1e7e9c9ebbdf69745b76f73bb17ecca01c483a305541ebbb5b7f4121565d44315bf983c43b962c9547a2ce6743257976509939ff74de SHA512 069b10cc1207c9fb94985a14e43002496825e869545e2d2ca77d676225105c91be41edcc02d8106ea792ebc9f2887b69a65ef2da9fe212d53c549c360d2f19ad
 MISC metadata.xml 601 BLAKE2B 1abd105a142f5eba9c335cc1ed8fb97aacd796ad9e42e8c8c04438a9b6830ef3e9675b3bfddb6677f6e9b51c61038954ab1ac29cfdb81f8c05259d95bbdc7ba7 SHA512 e4092ac535738c5c82e5dab29a0a3faa017853011013bc4f35b9d9425c2c92c1f092fdcf7236644ac955b5b9509fafd1adfaf04fb64439bef2b3d155f3b770c8
diff --git a/dev-python/treq/treq-17.8.0.ebuild b/dev-python/treq/treq-17.8.0.ebuild
index a9ad848cb792..9e13678efb1d 100644
--- a/dev-python/treq/treq-17.8.0.ebuild
+++ b/dev-python/treq/treq-17.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A requests-like API built on top of twisted.web's Agent"
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index 6fe0f46ebd4d..5eec60c005c9 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1,7 +1,5 @@
 DIST tvdb_api-1.10_pre20150406.tar.gz 33758 BLAKE2B 929b9e1326b5665eab29b9361fb25a107c91cb34b8226f071f5ed07490f1f2a305644a00ba5fcfda68e1357f50b7ed52cd842c806d8da3fb00e5094db55a09f8 SHA512 a62680a8e18fa5cb246c0916232aecd06dd5f7381e589690f8fedf5b85a9eac01331a858880f888c14ece53c888ab8d18e7dd65a6665639f5f6f6d335138469d
-DIST tvdb_api-1.9.tar.gz 32429 BLAKE2B 41ffff7c76131db3ff37e35dec8356aec85ca1180927ea468e4f3ae0980df4fce317b0366dd39dd7a219d5078c3a77f0caa94ab359b71f6750ea8d1067bc1112 SHA512 6ce13f47275eb3f37897da1b9bfb2d101184e3797abeec965c170d9b007661c3e0745396bc93bf365d6a1552fb461a2fd7b33777b4a67e58281c8ac3efb788df
 DIST tvdb_api-2.0.tar.gz 32751 BLAKE2B 6228ea0d8e9e679b7a70d6357917537cf8a6e362010ff6d1a212d51919689c656f8dc5cf67c694ddf7b4e2fd5b2fc0674393036c5ac38d8254878559921fe39c SHA512 74b1e036c2c71bff9f3d04bbf670da4069f68152545b09882aeddb5d1ebc873956ed00e8e28f2bd77a72ff97ae5fda23f1cfedd91f87187c31917ee31df17f3b
-EBUILD tvdb_api-1.10_pre20150406-r1.ebuild 522 BLAKE2B 22449fb610c2fc94d0b8f8c123b0a05c8ee55fa766c211c038b5f4b452d799c7e17977f56ef610213ae00ae8aa42ddfa4716b42ad3bf5b2c53384e7880b38ad8 SHA512 7d6a3337a8d99a0e98ce575eba8236c6f5009337e9529f7e7cf71a676903b734ae6e886b8c10fde05ccdc5fd9dc11ffe3b36ea60b612a3f885ac755a4f3bdecd
-EBUILD tvdb_api-1.9.ebuild 446 BLAKE2B 0c0ccf22ed8d50565585005ec136ad1c7c1338388dafba9f0504453a300190c03cb0192eddc3b74918e1cc23050626d714384f61e57df4d6ebb68c02d44b757c SHA512 3c5fa40f31e2b05652f363fe684ec9267d52c65113ee3f77e7e7963a543f1f1e68e986c5734b0b5f9d4d28ff3a86657ebe89431b93f864f78912e3d2b555b14c
-EBUILD tvdb_api-2.0.ebuild 477 BLAKE2B 7c814bd34162dc8f3c8ebb938b0ac1770b42c43dff8077068704eaefb50924fcd05ff59adea01a4231ef5dc124062fc81cb6f05f2fb438d958564532f0d94025 SHA512 f392e69f59254aee9eae32d14a0b849803bb069c3a4bcdbed0fe2dd7aa0bd977fddf5da98d0c44751583aa4b270087a784ff067e5f745e41c733d862262186c0
+EBUILD tvdb_api-1.10_pre20150406-r1.ebuild 516 BLAKE2B d8270738bcc75344e22a9257cd507ea0bd09e4cbf8eec75fba161ee49f0db6d8fc02e214749dcd53a9391ecbbeb15a81933f3d0d287459b8f25b05c30c6c424c SHA512 2914c792fb06c2ea0d495637fc8e6bf9b8e61af673c45bd02250045f5596c999e314cce05c94dc252ad244bfcffc266e33107fa7d5b0cd771355cdca50a69a3a
+EBUILD tvdb_api-2.0.ebuild 471 BLAKE2B 2210c9a78f7039700d0a75d1d38f4f7019dd8a03c1a928660864219b91feb07f25108efbf51fb95df87047b1adbde95ef5234404505ce46d67a3d075cc0f7e94 SHA512 bcd878e50586aada650ec18cddc5c7564459b0c66c391956c908730c6d11eca6c708a94fb0ba7892154539ff56fa6fec5746f0b1a9f52a87a08da7784d282ccc
 MISC metadata.xml 333 BLAKE2B 37ef6dce06fb7536eb18133f5dbe87b03a4cfcc54669dc7795dbfa9009920c020dc0fbca7d3ff82460e2e05bf3896fcaef8784078a4ab56899e9b7caff9dcb7d SHA512 5cdb8638da8db277b9228fd2ac53bb0fa4dd181da86b9aa3d9180e55c2d13ae494ab78af1168271158ce10469204028197bffac2e9b11afb48e0c71a15d583f4
diff --git a/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild b/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
index 004cf95b6b19..c2a50cff92e1 100644
--- a/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
+++ b/dev-python/tvdb_api/tvdb_api-1.10_pre20150406-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python interface to thetvdb.com API"
diff --git a/dev-python/tvdb_api/tvdb_api-1.9.ebuild b/dev-python/tvdb_api/tvdb_api-1.9.ebuild
deleted file mode 100644
index c2a19782d01f..000000000000
--- a/dev-python/tvdb_api/tvdb_api-1.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python interface to thetvdb.com API"
-HOMEPAGE="https://github.com/dbr/tvdb_api"
-SRC_URI="https://github.com/dbr/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=""
diff --git a/dev-python/tvdb_api/tvdb_api-2.0.ebuild b/dev-python/tvdb_api/tvdb_api-2.0.ebuild
index 73fcebaaec37..c8cfd75e065d 100644
--- a/dev-python/tvdb_api/tvdb_api-2.0.ebuild
+++ b/dev-python/tvdb_api/tvdb_api-2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Python interface to thetvdb.com API"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 14d8d3eae00b..dc5173c22e52 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -18,7 +18,7 @@ DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66e
 EBUILD twisted-16.6.0-r3.ebuild 5781 BLAKE2B 903214191b0fe8095060db2c972f6a64f50d3610da00f50f627811405342e878cafd726964433187e3d66fd000443b81db55348a62e8a30fb984634366959089 SHA512 e8cce4249cb0c9f4afd788bae0dfa7d88bd4faacf59f93f5267d317332d4d578107e7bb3aa686a64b896426b2117499c1110153d27bab54a22ae83c2e057b443
 EBUILD twisted-17.1.0-r2.ebuild 5806 BLAKE2B 4f226dc0edf4c316d641fbcf9d0686ea5e432c7c9dd1ed9798e121d5194c7ca3479a793286d08e3b6f6f4d16152ddb82bb6e3d1a9184841c34fef0cda964da50 SHA512 d486b29ff87b1c3fb839bc1d9b1e52b6ca73a5070fd7a7ad2562575d402b18f5e565888e35d772db7b276c7db9d15e169ea3d535af8fbb26033e5e257513090d
 EBUILD twisted-17.9.0.ebuild 6083 BLAKE2B 4ed1d5d980a8bc92ef97d74ad26454bd00bf9107c8743e73984e5d76906c20aae55236089ca74e73758e137e820965c8500c951b835a4503d88b816d66c25dae SHA512 784f4db11850b14bc44e3411bef33a9822a2e9a4a99f354c31842f71734723148a0707be4bb04cf3a7a908aaccd0a3de5e6d0f6a8d5cf3829a1f4c4b785a5414
-EBUILD twisted-18.4.0.ebuild 5951 BLAKE2B c964dfc21f41e6222227e8ce5e5901d1b2fffbdcedbb92eb3cc0365de7e032f8b07e823dbf2af0287f4e6cb09f745fee061eb309d019c9605edb87c4d1d612df SHA512 c7e25e4d8c59c4f8f7264074ea23e58214cd797476b424b51eebe15b94f742d27600783e5bc4d56d43aea385b55df8b07f9e27f7020e0d3667585365eacb5260
-EBUILD twisted-18.7.0.ebuild 6041 BLAKE2B f94f570668f9534e31748aca1b247ee457db073909d770e6b9e17e2a67c4fc90ba1ea8220d7345cf6153db97a44821f671d80c7275cfcc4886292ac54042cc9f SHA512 278163dd1115c11f45b02979242e8d6d8844c3d15e933ff2c6be1d8f80e7745a44d37be477f32a928d551e106e298209324526b010f09e0805ab436f11b5c437
+EBUILD twisted-18.4.0.ebuild 5947 BLAKE2B 73f6fe468ff8e9013d1377ac717619d92896c316fe3f97ee22cf277f64d2b61ee8b3273439bc51ab336250ddd0b33a0d7b82f0e85374b220a4f053fa0791070f SHA512 584091121d2158f864609a7f9756f29712aa888c87e485a3b9c5f20a29c7fbca9b9430197f0774dba6255f8f190d77f54e5045da0aad320e88264dac04c863dd
+EBUILD twisted-18.7.0.ebuild 6037 BLAKE2B 2ef5b50717467ce159b864d53d5c5158a31a46199e97b4612ca95c806c8699050ce4b8f934d74531ae1430b43dade1686a1833c2bb1254a6abbca8e40cf441d8 SHA512 f460f276071bc0dcc3cfe36f518f9ea3a20bcb92495685bee0b2daace09d0c7f2a5a78527a2ca0b17671f22462246eade0ec74331e88eaef1681c37de15d1f31
 EBUILD twisted-19.10.0.ebuild 5207 BLAKE2B 03b757d023b1c71327a9e1c8e6fcc08cc79a6602d6ec4d8947e240651b3a2cb4c89e75e2e351255505565e4073a19b381230676369a4844e83bcbb8da8ea9e80 SHA512 644a4913b5e740847b13aa25c11a6e6662c533c07a96916055b05b598b92b0e2e35904a812286fc4a6863cc0ccadd74ab2e8928bb5863439a77dc0974479f607
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-18.4.0.ebuild b/dev-python/twisted/twisted-18.4.0.ebuild
index cd49b1a30231..91d876f3ed1c 100644
--- a/dev-python/twisted/twisted-18.4.0.ebuild
+++ b/dev-python/twisted/twisted-18.4.0.ebuild
@@ -144,7 +144,7 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 
-	cd "${D%/}$(python_get_sitedir)" || die
+	cd "${D}$(python_get_sitedir)" || die
 
 	# own the dropin.cache so we don't leave orphans
 	touch twisted/plugins/dropin.cache || die
@@ -179,7 +179,7 @@ pkg_postinst() {
 }
 
 python_postrm() {
-	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
 }
 
 pkg_postrm(){
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
index 0e4b0a4607d4..b8e44fd29607 100644
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ b/dev-python/twisted/twisted-18.7.0.ebuild
@@ -146,7 +146,7 @@ python_test() {
 python_install() {
 	distutils-r1_python_install
 
-	cd "${D%/}$(python_get_sitedir)" || die
+	cd "${D}$(python_get_sitedir)" || die
 
 	# own the dropin.cache so we don't leave orphans
 	touch twisted/plugins/dropin.cache || die
@@ -181,7 +181,7 @@ pkg_postinst() {
 }
 
 python_postrm() {
-	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
+	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
 }
 
 pkg_postrm(){
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
index a45d0e6b0e3d..cd8d1b031233 100644
--- a/dev-python/twitter/Manifest
+++ b/dev-python/twitter/Manifest
@@ -1,3 +1,3 @@
 DIST twitter-1.18.0.tar.gz 47695 BLAKE2B 2604370a303c479d371dd0c5b6c1855b990c38cf0d9ef710c740ae69740d0cfddb2a18d465deaca2146e43debea0175f9e444c0a7bb5931a95f9124d80237ae6 SHA512 dda752b194efe88df88a2c9e2279cd3045a36c466f05493727a73aaaa74ca99873c1dc1742491f2f4092eff5afb9ad7680a779f16041d9c3dae7c6eea013ea48
-EBUILD twitter-1.18.0.ebuild 432 BLAKE2B f45381e979495eef260ef72f2f88723999e9514afeadf4af0c35f04d9d48e58415b1de19412fa026b7ce1d85094253e95a83817ae2c798b37784ac3b7287c3c8 SHA512 7e3296ba263ae124e635c786453e34fa4f649bb52a229068b9c94f1c600853f97b9c37123c60d01612e0f13f4abd004f7700b2e296c816a5c35305c2cd705463
+EBUILD twitter-1.18.0.ebuild 426 BLAKE2B 89656b7a5a8c28697f67a79d761435b3a67c588b0afc1ce0a77007aa7fae008f49f43074de7c003c4948cdb6e13927dca8f7cba4cac27caa37045afc30308105 SHA512 8ecd7965e1a912a47cbfc530a23f8bebe7db22b6e011b9e46d223ad306be6e0f1db26ae38935bd54a3fbcf5f7b4092d20b6ca3c6b29c3af20cdc246cc6f94581
 MISC metadata.xml 430 BLAKE2B 2e81a109681748c54ff8adabf59b7505651b87fd1e7bb41c0582eef0633dac9276961d833b8bdb3117683eab4483c17e06b61b82e82a44770c9ce408e8241850 SHA512 a09ea3d4855ee4999f5cd2b182066044cc578abf5a68bf6dc5c0c6fb2e3913aae825d2a5a174501957dbcd1fc92d047f4997ae067fbea6d2f674ed1f785f820a
diff --git a/dev-python/twitter/twitter-1.18.0.ebuild b/dev-python/twitter/twitter-1.18.0.ebuild
index a6c5526e47a4..56aebd114bb4 100644
--- a/dev-python/twitter/twitter-1.18.0.ebuild
+++ b/dev-python/twitter/twitter-1.18.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/txAMQP/Manifest b/dev-python/txAMQP/Manifest
index 971023cce583..8fa160cfe303 100644
--- a/dev-python/txAMQP/Manifest
+++ b/dev-python/txAMQP/Manifest
@@ -1,3 +1,3 @@
 DIST txamqp-0.8.2.tar.gz 118560 BLAKE2B 6e60cc0785462b92d046a620cc09eda8b7783bd09186a60299eba11c8f6f5780fc38b094ea974e4f1e443d3d30ee1428f30ad25fdb43554d25db17f36d323527 SHA512 4a5e468482433e684dc690abddeba3e0a6c77630055afe44487de72feecad9c750d179c43dee4e781d09c9c21259cecd615dc9f6eaa7d9ff7ca0796248ad5a02
-EBUILD txAMQP-0.8.2.ebuild 1428 BLAKE2B 0609764434c8945435ae872aa514f4744eabe79b0b8ab23823e2f82174dab20dfbbab2eb5a14f6fee9f8ea38942adf0cc5c4004a069b23fe9ba03aa761365516 SHA512 4658da0af7902366f43a8b56e682a384cd4eb83ae2ec2c112acf3332fdcd95b2f375112115c99d48405b159d7b16abf4a64bbe41f30ddca9231c7ed647fa7858
+EBUILD txAMQP-0.8.2.ebuild 1422 BLAKE2B 53736fe522dbae408d613d45575b5004693a33767836049b21b3bec8023800b43f4759425c5947792e144289dc2fdd2f7c00a4b2ac9709a90855e2cadb1310f5 SHA512 4b6badc4714d855f7c1e30b54ec3aee1084940a6f0e2047ed789d8c91b386b7ebb46954a85566d43e77ae31d8d1fe479057f6606e024baac225313f153b2b451
 MISC metadata.xml 423 BLAKE2B 507dec1a447659fd4b519d029b63840460fcf93e9c5cc1d97e7eb0ae1278488c7f4dfaeabe53510da3c07cd079ca9e083a39586ba8e0b99a4e54e44efc27d3e5 SHA512 e80129432dd18c5d4e08d25d560a7144b6589feffe3c0bb6dae249868932fbd8290426531140bd4b0d124b1b06d198527d1a225cf454454f195a20699482a09d
diff --git a/dev-python/txAMQP/txAMQP-0.8.2.ebuild b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
index 45c57a24d486..5a6f2913d4df 100644
--- a/dev-python/txAMQP/txAMQP-0.8.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 868c3d5a52c9..ec1bc74019c6 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -3,6 +3,6 @@ AUX txaio-2.7.1.f._result.patch 1140 BLAKE2B 675ffec2a0d4d9bb312492603765e79ddab
 AUX util.py 977 BLAKE2B ced53147ac1b8153d0b891b07514cee5692372bb630797d172c5b7daa3cb5f20b88935a2c9dcd0784968edda8586a00ea69552e72ffd04647ce4ef96928059da SHA512 a82754ff4b81cdacd7010cb30065ae1a3408b2ed6e8a47021a2c7066adb614a87cc3d70b7980f10b9a6b063f4087ee44c5df2adab0d23ce90c1beb1368b4a498
 DIST txaio-2.7.1.tar.gz 43591 BLAKE2B 4efdcfb8ce3e8860af1efe56ae4c23efc9887a8f3a53c322444a95651f4dbb502443bdcc1d0da0ba5db8f9a832ad90b3c6dea06ca688d7120857854d3eb7c17e SHA512 d77a8b5e8fc21be0bef43f2a6795229456a351abc1a5eb6d2b7de0da0a58e67a228cb06d1a7962efcc760099ef5df94e9421875ea5628985260911efc7deb85e
 DIST txaio-2.9.0.tar.gz 44195 BLAKE2B 6c62fc6f17ee860aead90cf5f5d02c7c0d9709adf7bcecbb6a7c1723abf0d8672dbc0b869dfe4683bc26c9608e94c41364add18c22e8e98678de8e10018d991c SHA512 ee07d776fa5894b716fdced36aaa6436336a1f1db97dedb0fd0575d61a7b48b12dfc90ed6078602d7a2c2a00bfa7f815ca76cd75e472a27ff7bfdb56291efa46
-EBUILD txaio-2.7.1.ebuild 1833 BLAKE2B 4320d109cb8b011df69eb5e90211dbb9a4dbc1d19378edc18bd5bd0fed2994001df0097a4b518bfbc69b3f375118565cf020100b8dafd398d723895e1c2912db SHA512 c266bb5a8f95f2c9348bf93438d3cd9fb17958fdcab780fcc08f9530bdc3df290b937da1ab747cca5968d4af6daae1ff9dc9812e5a0e9fdbbc364043b31eb8be
-EBUILD txaio-2.9.0.ebuild 1460 BLAKE2B f338860b5151589b7571a1f340f366959600aa857d4ee2e4d91e2da2680c2050d7b0294cd9c710aeb2fe1951c188e59e5446dd10dc85d43aeac2621bc465a93b SHA512 883cad1cf0919f53cddb5b6cb2b6b47d7afef47370a013638f786d81b1b6a864d903e8ab1c8e0fea9b2d383052354ebb11ceb578cc6e0414d65b28fbbcce3754
+EBUILD txaio-2.7.1.ebuild 1823 BLAKE2B 5557230a52e08bcc513c459babf44be1e0199b5fdd97aca8c1a87903e21a819556fbde4846f602264e85c3861caa1bf1534a137fdb3bbdb848e1a1cc50e8a5db SHA512 142491502064c90d8ccba2cd93d6bd6d052584b9dc7a051bb1a8721fbaf8e2db59aaf94c194b821d3e6f298154e6cee6e9279272e04339ce76eebe700829cf8e
+EBUILD txaio-2.9.0.ebuild 1450 BLAKE2B 55440e977ed9b65347261a4e83c44ba31e7c902fee3ab1a7c2096f1f46b7204e4e0fea22faf46a8dd39a52baa60bbd091231617926c97fc7dcbd50f66f2e3191 SHA512 4a9fe4cb3df5aaa853a71b5aa952f4831b93a23c5d9d50a91b2a29eebea143a740cf7abcf55c863fd21f5b12d844291188426f71dc026d1839fccebf2ee40008
 MISC metadata.xml 487 BLAKE2B e04a40627282564f381f0070344ba6e2a08e572121e150b5775239dacf22212fb273253dae6ad19ba2cea7f15e84c7f92c6d0671353b2d159b9e7f40d3415914 SHA512 d7eb59861e36e29555d46c3a65814428e64473abff01b6d5489b7f4419f535c991a443345058a8f618574019d5581d3df94fc0339c3a53d4c3147f5e11ca3a11
diff --git a/dev-python/txaio/txaio-2.7.1.ebuild b/dev-python/txaio/txaio-2.7.1.ebuild
index 2557f0bbb7a9..237f82b5fc44 100644
--- a/dev-python/txaio/txaio-2.7.1.ebuild
+++ b/dev-python/txaio/txaio-2.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/txaio/txaio-2.9.0.ebuild b/dev-python/txaio/txaio-2.9.0.ebuild
index 6955208096ca..62b4cbab2dc1 100644
--- a/dev-python/txaio/txaio-2.9.0.ebuild
+++ b/dev-python/txaio/txaio-2.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/txgithub/Manifest b/dev-python/txgithub/Manifest
index bb1ca969f09e..2c60adda2f68 100644
--- a/dev-python/txgithub/Manifest
+++ b/dev-python/txgithub/Manifest
@@ -1,3 +1,3 @@
 DIST txgithub-15.0.0.tar.gz 9871 BLAKE2B a5105132274cb878a0723cabebc17b4b6694d86e02325f6f29285b8bf939eb94ffa713283732634fbc0ea002490b05e7686adc6f98016e0c52300953b25d7f9d SHA512 40449089c7c82e901f738935e915a2a6e250600f46ceea7011ef48357851513dccd0fe0f45539cff6de8a45acfe3e34082156e2b70e54dec695633be01d03510
-EBUILD txgithub-15.0.0-r1.ebuild 830 BLAKE2B 124a07f43ed9f9fa83bb5d5670a2e9521c973ee65504729866732a8761ebed417bf325702076499c66cf8a889cdeb042646ab20427f5dc0f8e4a9421f542d0fb SHA512 0819ca9a4b148669eb64a0b507fd8a0b8f61df738bc3e69adc65784d9790632d8515d2856a9f4b940561780aa734c6c08443857076fe71b8a9e0650ac8fefdbe
+EBUILD txgithub-15.0.0-r1.ebuild 820 BLAKE2B 0594c85da2840a0dcf815347e31c0280f9b084d2b3bc4f98db7457208583eede867d6dcf9ca5ca98b71b16474463bc36a3859a47017c472aad73d597f64b7add SHA512 0a56fa4a3e3e3f0a075cb9ce03e1070fecf7a65fb90603002648364cd48cb6c67ac0f69addd9d4ad5656b9e54c828fab81490a9feefb5b0e6463491de9e41418
 MISC metadata.xml 581 BLAKE2B 83b9dc351444c0d4507ec265bf1cd98e84078aa14d4eae96874ed66893959a9a7959e1f20ba9f30da1f1ec91022786ff4e3f64c323809bf76be53513923f8675 SHA512 b6b326af1ed6eeb7a87fb3ef5865649045a1c69c353a836388b4fa4822d9a28f4bf8406f70667d1e4aa65f17898ff06e07374591e3772a12d46a5867be8f4e94
diff --git a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
index b35c7eb58d1d..4cd49b57a030 100644
--- a/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
+++ b/dev-python/txgithub/txgithub-15.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit eutils distutils-r1
 
diff --git a/dev-python/txrequests/Manifest b/dev-python/txrequests/Manifest
index 6508b62e788f..28c9ff3915eb 100644
--- a/dev-python/txrequests/Manifest
+++ b/dev-python/txrequests/Manifest
@@ -1,3 +1,3 @@
 DIST txrequests-0.9.5.tar.gz 5265 BLAKE2B e5e3cf66abc394ae5c457b0d5144fdd1d09af5fce651f888bd44f0e48d6d1386fdfd2ca1d350ba1abc856102d051270867a2da96b781fbacf53de01f80158f3d SHA512 e9f527eb2fed0038d7e68b5bd74d0a0e58a1d7cc3e181068423dce871ff10b2d5f1ae92e44248e75b4ad8d44b32366ee9eb6cf8fdd114a562baa6b35fab6eb7b
-EBUILD txrequests-0.9.5-r1.ebuild 543 BLAKE2B 9714b0386dadadcc798431b99d3d44549d9b33cc8af10ed0796cf9bc43e4e36efe686b56817de368bf28df6869eeae8f0c67d097501885e36f43d4f0181494c9 SHA512 61680d98af8715deb59791aa1ecbb90b9aaaded0c76aae01ddd1d7dba692472ab100eb7955cd0b18f5090edd16bf20c1050dc92f084edcc70e6cb1a369a88641
+EBUILD txrequests-0.9.5-r1.ebuild 533 BLAKE2B a7fb8a29be268440a373ee41decf110f025cf6f9de1a5f3df372e982008d295b47e105e401eea4e628de1a71aa269034391e3b8ff22e62fefab67b3f9a5f2cc8 SHA512 a0b43267e48b7215b250dab423d9e6f16752fb79437effc1c90bf6d0694b1d09896f3aa4d65f2c66e22fbd90804278875b87ad27db4e6f5f8de8a7ecc15aca17
 MISC metadata.xml 711 BLAKE2B 9f4ed9f02c903a57b4eed3d7f97d13b85d7e76f8027fcf7aedb389b319703d88ca98faa6c1c8625a42fa40f9adacfe6583e53c953603345b5c0075409de440d3 SHA512 154b6d2fbd2aad94d890a6e86509cfe5d12a2a68e2ea7a10bdf63469193400c398a0b3b1f65fd7ca122375cbfc491555a7e2f705df2345d93331e3549c032fed
diff --git a/dev-python/txrequests/txrequests-0.9.5-r1.ebuild b/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
index 110f786d4735..123a0eddff0e 100644
--- a/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
+++ b/dev-python/txrequests/txrequests-0.9.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index be68492df6f8..5ac542aed457 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,3 +1,3 @@
 DIST tzlocal-1.2.tar.gz 16149 BLAKE2B 3852fdf9672bdb3f5b5340eaa14682f0f64bf3bad3e920680ce8ae7e12e3a2fb475237f6b645075e5058a30eff07c8ceec3ba4fa2bf90d4ea65663788cbcd772 SHA512 eb4d1f73983579e109249884d2a343c441942fb0d4dc76aed693c4a05100b10a2337d72794fdb9c0cd28c3b73e11dbd030bdf6dc2f75e57c958655219973c814
-EBUILD tzlocal-1.2.ebuild 576 BLAKE2B 98c8727b5ed93efd2fc9540a4eea1dfb44a51c3d97b61f2368122549d23e60b974fccdf741c7789385476503a8bd45133ed13b06de30a0c480992712c178a6ab SHA512 6e6cbe6d7e9053e8ab581a20e199e982b7c04048c6f6d9549b39ee03e81f981a4ad04cf7321b291aa77a3ace4f0f9f2d56b72754d227a8d159a1a11a7196be8d
+EBUILD tzlocal-1.2.ebuild 570 BLAKE2B d23abda35f1eb7a229b5b0f53345c3bf7373037c989a8fd5fa3ee430b40a1d2fe655fa5ab97a306ebecdb35f5747c4b041b548f3b850067acecfe23c1d1b3edd SHA512 412b06db50fd8e314d9377b8d0dc1a898c7a675b679cd2f6a3348f34374731e674d4c20ac82a366f97abf36380b2dc4d9a35f660b3c12693b048faf30658c3ed
 MISC metadata.xml 377 BLAKE2B c85be3067a235a5d7546bcf7c3eb05857986a371bca6743e222e9016ab6d6d5a212f3f65d7e9db523ef9ddb8091b62c1cfbd2d5c5d6d8560fcf881aaa3ffad80 SHA512 3ada56c5037a2a59fb53408483f03bc3ae72c9d7f676dd046125b035b34d4195e653662b67529453d63556dedda4471a9c77daaa1137af1245e49174fef1fd87
diff --git a/dev-python/tzlocal/tzlocal-1.2.ebuild b/dev-python/tzlocal/tzlocal-1.2.ebuild
index 4c02eea3f47b..8b39fde36e7b 100644
--- a/dev-python/tzlocal/tzlocal-1.2.ebuild
+++ b/dev-python/tzlocal/tzlocal-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ubelt/Manifest b/dev-python/ubelt/Manifest
new file mode 100644
index 000000000000..b214319d538f
--- /dev/null
+++ b/dev-python/ubelt/Manifest
@@ -0,0 +1,3 @@
+DIST ubelt-0.8.8.tar.gz 172347 BLAKE2B 94435bf8b5a5f67011540c43dd767393cda6bccf95b963ca74cf3ee72444de43828b87bd2e6aa93001fc2c7cd49e245c459b0bc8f2617f12da906ae4e3f194aa SHA512 f63b3a9de51176d00a12999d540080e381266bb43b15942580f7f60b230b2e52021937b0cb4b31e084e0b77c141ae5cb3b8ae000d7af196e0c2f293a960e7438
+EBUILD ubelt-0.8.8.ebuild 797 BLAKE2B ed0aefd68e06ad1b6845ec3b9c85c26bc5a5b6a4126b6f9bd8997152d702dfae92a2cb05edaadb48067398af48940b0dc27163da7ffa9726344122c3f6e8d2fe SHA512 a6d46bbcd6c8d532749fa91300a0415a17895b20d9e88ae97109164db334659ebcde1a6801c1a07c2761dae1589d87f54a3e068bba96055d4edaa5558e38ce4f
+MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/ubelt/metadata.xml b/dev-python/ubelt/metadata.xml
new file mode 100644
index 000000000000..ca93985fb0db
--- /dev/null
+++ b/dev-python/ubelt/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-python/ubelt/ubelt-0.8.8.ebuild b/dev-python/ubelt/ubelt-0.8.8.ebuild
new file mode 100644
index 000000000000..b38c32e6365a
--- /dev/null
+++ b/dev-python/ubelt/ubelt-0.8.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="https://github.com/Erotemic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="doc"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/ordered-set[${PYTHON_USEDEP}]"
+
+DEPEND="test? ( dev-python/xdoctest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-napoleon
+
+python_test() {
+	pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index e6570823b1bd..e249037c35cf 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -5,6 +5,6 @@ AUX ujson-1.35-standard-handling-of-none.patch 2563 BLAKE2B 55a2ad075f7ed348ec4f
 AUX ujson-1.35-test-depricationwarning.patch 369 BLAKE2B 9fbc92d557049d8790b664ef60a908b99f6cd657c5ade674979f1b05e4c61dbb514eba09d3727c6c61eddc5b08fde5043cdd2af0477c996d9fe9bb43a4838380 SHA512 71fc8012f1701a35def3d7533d8d8d4133550dd57bd22b11e1dcd2806d25e185678f047cc1fe61a35132ed1d546d1411d452bb0e7af66aefe9b53a99b5ef3c66
 AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f6be23b9dc5c3a7ff2d9a66c836dc75954f7625f7aef4d55e06e90f3c030f8bc2f4db80b34cb540e09183939880bbf32225bc23c58f3fa SHA512 fe96f88cde477bfdc63ad5cf360ab6c63e2cf00c192a8d70d80340b7e39820ca53554a775c8f32b7ca43259e9f299fe38ebaf4aa64ef12c035bf23085f5b5789
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
-EBUILD ujson-1.35-r1.ebuild 995 BLAKE2B d984cc2382af805268e88f03a66406aad027071feec32d81cab14603e600d20ad78027f3c50b2921aa0ee53399cce8385cd45eb2f01521833dca3200fccac986 SHA512 9b8e7b97a26e867d9b66b129d5641d4330cc6f32924b23ce2bdc333485e971618c3c3d7f8149505921ee00a1b3f50f2894b8856f9ac7089c064bf01fd0e2af53
-EBUILD ujson-1.35.ebuild 984 BLAKE2B 771a4ee1cd391ea4032168207006c2204ed1beff5e92b85afaf9a729e331bf0d6554950dce6bd1e016e8b95f76cca9c357c5d7843b9859137ffcbac199dd2fd2 SHA512 89b7764fc440b65cabdc30a14aaf913452fab3408c40e2833b759c041f2931cd40dec552400019101269d46adbeb106fe76caed4fc5e9badcb0e4e6b5ceda115
+EBUILD ujson-1.35-r1.ebuild 985 BLAKE2B 6457694d81c703322b4d090d362ecf54ba93487cfeb286d459626238b842a52ad0cd8807bf65bb95c49831262b8802117500d15541f7f90a8bd62e8658dc0185 SHA512 906890056f76287a2f93afb3ec6b983f174f68e489da6b0953d2fbd6a9304049647efaeb471b588a0e71cbb054c1f099c3dfaa733e4ae0a2a6dcf3677b2db152
+EBUILD ujson-1.35.ebuild 974 BLAKE2B 3032a949d748b763e0e2547d3f488a9b138318448430a99995809564d9e3a01e458633f8a12590414d7e971e1bfa78af22ab80ddff618062d085d09144597671 SHA512 9f50d696d32a055249a3e998f12f138c7b7846efb5f86a790f3cae8d27de040d69989c247223b506c6f8eabdeb6df1244144ac8d05640ab4b6286428b34a5f84
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
index 3629c11f8079..2f537dac5c1e 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
index 73d5ba00ca53..a81cc9cd9ad2 100644
--- a/dev-python/ujson/ujson-1.35.ebuild
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 4b2baae5c314..2a34e696aff3 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,5 +1,5 @@
 DIST unittest-mixins-1.3.tar.gz 12942 BLAKE2B 24183d35b6d269c45947f9fdfb89f668e7dddfd25a2e634e92b0318b7a90e535c4ca33ed497cd4af54416c2d4909b4fd4d6d13bf94d830ac8b13939411d36ea6 SHA512 8cdc7adf387d3576d1690c2ab62eff93c085a36b82b756d237cc177aa52718e7ce6c5ec103841f1581cd28576bb17fbbe034c21d1c1347da643dfde3b8033d3a
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
 EBUILD unittest-mixins-1.3.ebuild 686 BLAKE2B f0517dcadcf84d98fab0cfe5f4834633ebdd952d0c9ea2e6fe1f3d588ed0d1a9bd114c32cb1e06b3fca50d606e040fbd64884fe9f2817046ddfed65252cedc76 SHA512 891c20ab407491aca37c08cdde00b203842c90e1ae2b873ba01424cdda1c38b4b33a240ae5735144257397f5680805b83fba2cb05c60df19bc9e65d8b2348400
-EBUILD unittest-mixins-1.6.ebuild 633 BLAKE2B c4df2cbc524433586361e99c4e10a81d3f81463cb58431f5ad0a1a46b10d5ad4052e6df3dbb9cc058c0a1a3fd7888aa76045ab9df53080e3f90aa9b456aae662 SHA512 40d91271cfb0d2d3ab00d3d506037a964005231bb949df5f39c3f918e8e05a338fb8481d5ce1122d9264befdc21742cd38b85aa956aa56b757470cd4975fbc70
+EBUILD unittest-mixins-1.6.ebuild 638 BLAKE2B 1ccd4345c53cedb67237ffac2ff81db95e5e45287598b6a575ad1552ad88606f8080f85744bc7f5b85be597f4cd7f139c46a404bbec707a9f8a6f00cc09eac12 SHA512 6de1dc1e1876d1dbc03c8a6a92d5da906f2b8187e63d8dee2aafe9ad66e9ab0b4630686915ce1229648e045a92732b7535fe4abecb2a5326426d069c7f6a3afb
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
index fb7ecae2f079..f7c8752831fd 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/uranium/Manifest b/dev-python/uranium/Manifest
index c2372cdb583f..c76ca2d7b7eb 100644
--- a/dev-python/uranium/Manifest
+++ b/dev-python/uranium/Manifest
@@ -2,7 +2,7 @@ AUX uranium-3.3.0-fix-install-paths.patch 1716 BLAKE2B 13ea6150f1cfb1a07ac1886be
 DIST uranium-3.6.0.tar.gz 668552 BLAKE2B 84ab1eed5474bf14aec5b7782b332e9846d14f589c0dfa7366c74ad682fdc0a8e5ef94a0b9576f0e80cf792b49132d3abb3f17341a2e8570d08bf898231deca6 SHA512 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d
 DIST uranium-4.2.0.tar.gz 711868 BLAKE2B 8098372704db0494519ab0a24046b72f2527695716286463e7ecffb776db351bfb4ffcd7b53276d59403b39e40ef605fb016e9ec57e18cd06e8f22f22d8ef732 SHA512 fab04efbb6337e366501ffc0336f208ddc0f9e568a2822363b84b6512268f2560a22bc71e745d30e66026d7a0bf9e150eda605ef8b511b59264407cab491eee1
 DIST uranium-4.3.0.tar.gz 899153 BLAKE2B 314dbeed1cce49d33439b2fa744d37e4b360edb041964d2c3336730295b88bb2af86df8eac8382a6696fbc9c1ba07fa0774089ec3aa7fd0f8fbb92c61ce2825b SHA512 eac28907ccd66e5a43012a6f5af2a97daea21f0e2832613562e848cca967e036fea117811d8a4cc519c1417a113449e7065233fc541347202c6a8ff85a9d60b7
-EBUILD uranium-3.6.0-r1.ebuild 1439 BLAKE2B de2da5441b945609c3abebff8e8e9299ac055afcd2397cab4767aa4cfc03ceac1a2853f3f18c108e648bae03e48808145fec79fb492290ad062914d522176b2b SHA512 57aaeeefe99a0af1aac710d3998f4d8b9f6804b9c45106e2aae449852d076180d275297a6bb3f9624f4e1d6164968c198c5388c4908f85ff0cdbd4bfbf20cdd2
-EBUILD uranium-4.2.0.ebuild 1594 BLAKE2B ba8d95279e4d97c56c180361d68134c62d608c4d0bfa55a9f8dfa920e96d0d64662342d60b0f9aab0b0d9368b516e81f57d3366f6d6b22ce68dd9fc97a067c9f SHA512 8d954206a0883ce24eb6937f238fdad437e9041c36e595a1254400bf98a3149861afbcf07f91348812fe7d5937fdbaf43152718ee0ce3d79139d0333cad30f6b
-EBUILD uranium-4.3.0.ebuild 1633 BLAKE2B 37084f7888d560a95461836fb333432ef607081f1adcbe45cb3bb84fbfd71937b02040f9b7e40a00a18fdd6071518cb52b91f0db3d69237db02b13e671cd9992 SHA512 11a980b42d45fbb724acb04e81b97b92b5d9e9e680ad9402bc567004a2f0b4abeda807e827853fe5c1dd75fff2c45c0903c5f841eead491227803a4c4cb6d83d
+EBUILD uranium-3.6.0-r1.ebuild 1544 BLAKE2B bb11c1fdcee3adb22e953c0f1ec396665eed24af268498c88c495502f87dc1a84cc21eff18000924e98aea292fbf6e4bc45aaaf0c9a2cf49127f5494a77c15a6 SHA512 8f8fc90afce524be8990b0b9ae8b26ac1baff412fb8b09d15c20e12dc893178bd602c9803ea0b4bd95fe1b88e25392e859b75990efd79f765a32f61fb289ab68
+EBUILD uranium-4.2.0.ebuild 1699 BLAKE2B 9326152910a48ff7c9ef812f11b9026c64e6be2e59277e221ebedd0e112d4a3d50be5da17f2952094a8dd8f3ae2e2ea462750b5c6ec8aac1b566e273544583e8 SHA512 013358cecb8482b340e9a5df339ab385b605fac79e266f26a820edccf10fb4ec1c0ae35be999375b237d8d1386d0ed35f2d9d9cf1303fe337b064ae0f7e891ab
+EBUILD uranium-4.3.0-r1.ebuild 1742 BLAKE2B 3165ae0a2295a570aea9bdd1985e935cf7a7dc2579e90e4ca7f9f65062949ffdefe1f15d52f3682cc76ae5087aefe0c5cfae0a41a44acb21661eade504f795a9 SHA512 fc01a7524769d5f70b21790a67e8b3beb61bbb9a34a4dc79f370c03f7d380b19ec9b23631fcddb37c5e34d8d3984aa5c2e0711b3a75612bf4ee811607c2004fe
 MISC metadata.xml 975 BLAKE2B 42ea7df7c2ee42408ada0328335319d95edc41c92d8ae74d77fb178629e48c7ab7886e4ea07f058b9be9b67f04d29b795eb353e47de60370b7949158cb7798ca SHA512 6074599c0b62f2f527041621550ec183bfa26400eee212c3e9cd0ab9742917ddf762ef668a6bba4628cee8063a0f40104f21d25e260de1d164b61389c9544824
diff --git a/dev-python/uranium/uranium-3.6.0-r1.ebuild b/dev-python/uranium/uranium-3.6.0-r1.ebuild
index fdbfe670aa9a..e2e7e3c9f1d2 100644
--- a/dev-python/uranium/uranium-3.6.0-r1.ebuild
+++ b/dev-python/uranium/uranium-3.6.0-r1.ebuild
@@ -21,18 +21,24 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-	sci-libs/Shapely[${PYTHON_USEDEP}]
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+		sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtquickcontrols2:5"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 
 DOCS=( README.md )
 
diff --git a/dev-python/uranium/uranium-4.2.0.ebuild b/dev-python/uranium/uranium-4.2.0.ebuild
index 8b3f307a109c..3154436aac0b 100644
--- a/dev-python/uranium/uranium-4.2.0.ebuild
+++ b/dev-python/uranium/uranium-4.2.0.ebuild
@@ -24,14 +24,20 @@ RESTRICT="!test? ( test )"
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
 	doc? ( app-doc/doxygen )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 
 RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-	sci-libs/Shapely[${PYTHON_USEDEP}]
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+		sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtquickcontrols2:5"
 
diff --git a/dev-python/uranium/uranium-4.3.0-r1.ebuild b/dev-python/uranium/uranium-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..b5516dcefb70
--- /dev/null
+++ b/dev-python/uranium/uranium-4.3.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake python-single-r1
+
+MY_PN="Uranium"
+
+DESCRIPTION="A Python framework for building 3D printing related applications"
+HOMEPAGE="https://github.com/Ultimaker/Uranium"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+			dev-python/mypy[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+RDEPEND="${PYTHON_DEPS}
+	~dev-libs/libarcus-${PV}:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+		sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtquickcontrols2:5"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
+
+	if ! use debug; then
+		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
+		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/FileLogger/FileLogger.py || die
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile doc
+		DOCS+=( html )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize "${D}/usr/$(get_libdir)"
+}
diff --git a/dev-python/uranium/uranium-4.3.0.ebuild b/dev-python/uranium/uranium-4.3.0.ebuild
deleted file mode 100644
index 4ca593a01581..000000000000
--- a/dev-python/uranium/uranium-4.3.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake python-single-r1
-
-MY_PN="Uranium"
-
-DESCRIPTION="A Python framework for building 3D printing related applications"
-HOMEPAGE="https://github.com/Ultimaker/Uranium"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mypy[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="${PYTHON_DEPS}
-	~dev-libs/libarcus-${PV}:=[python,${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
-	sci-libs/Shapely[${PYTHON_USEDEP}]
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtquickcontrols2:5"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}/${PN}-3.3.0-fix-install-paths.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-
-	if ! use debug; then
-		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/ConsoleLogger/ConsoleLogger.py || die
-		sed -i 's/logging.DEBUG/logging.ERROR/' plugins/FileLogger/FileLogger.py || die
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile doc
-		DOCS+=( html )
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	python_optimize "${D}/usr/$(get_libdir)"
-}
diff --git a/dev-python/urdf_parser_py/Manifest b/dev-python/urdf_parser_py/Manifest
index 4da1b2826399..dc001e7dc6de 100644
--- a/dev-python/urdf_parser_py/Manifest
+++ b/dev-python/urdf_parser_py/Manifest
@@ -1,3 +1,3 @@
 DIST urdf_parser_py-0.4.1.tar.gz 20017 BLAKE2B 805ad1f86b7d79963cc03070efccae3a44602bb309949bd5f3ac613e48e9f6cbae01ba8973e128d654e88c51f59647828a2360966664b5bb0b045116dcb61092 SHA512 08466a76e64cd46b1e9188aec039b8a0c20499c43be7c859d98c55f2d8d36305a76f780789a019dbd2e6badad90e9bd421dcd1bc82d3b8529fd08a9f9d5885f3
-EBUILD urdf_parser_py-0.4.1.ebuild 685 BLAKE2B d3583ebb23610bce3a3c0466a25169f91f887b858c163386f2a90e3815e40c2f8676e1fcdac8635719cf9290771bdefb834b4007b0278327208cbe4b89c1b4ac SHA512 e844ff8e793f53a1eea37953313c1bfa0a9054a5050b1664329aba6ddb757b0107caaa5d142f7e355c007002f836c8b977319fa88d51708d724e922a0151a7fe
+EBUILD urdf_parser_py-0.4.1.ebuild 681 BLAKE2B 2a88cff75bf8c4c7c092c46010ef3fdaa12ab568324ee168755f83465f1d22d67560b014b2a09b2737984bac05dbff7b577a67d3d74c785335f5af1d549d41cb SHA512 017125eb15df075253dc4bb5ffd948bf913de5c6437091fa92e65da5b6549ef66fdd11899b8f6587719d9c711ed22624727f40e5797692a8da4200eeede15aae
 MISC metadata.xml 332 BLAKE2B e32fdf158e352a3e43c6465c4ad378e44b9e01112f06e245d717d9ab6404be91a7529dbfd7b85d68fcf0168b296d7a6e55465f9a7a291112195968e3d3863361 SHA512 6efdc6c159b3764bf93d401fe111e3b102ea30b80c6a653d87f2be031f49f0e34919d4257e1a052be2ed4b88f5451c7bc11332a0ca7dfb284df31e31f5d821f3
diff --git a/dev-python/urdf_parser_py/urdf_parser_py-0.4.1.ebuild b/dev-python/urdf_parser_py/urdf_parser_py-0.4.1.ebuild
index c3b90c01fcd5..10abe3e4e18f 100644
--- a/dev-python/urdf_parser_py/urdf_parser_py-0.4.1.ebuild
+++ b/dev-python/urdf_parser_py/urdf_parser_py-0.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 inherit distutils-r1
 
 DESCRIPTION="URDF parser for Python"
diff --git a/dev-python/urwidtrees/Manifest b/dev-python/urwidtrees/Manifest
index c96521b16379..41b25b1b3003 100644
--- a/dev-python/urwidtrees/Manifest
+++ b/dev-python/urwidtrees/Manifest
@@ -1,4 +1,4 @@
 DIST urwidtrees-1.0.2.tar.gz 36082 BLAKE2B fd9dad1c1b0425fae95930b00149932a2fb5bf537c510ef4dd788408c315d6657553b92f6d1cc21769ed2a7af1a4c15c8c476d5d5b244f57032a5537ba92b27e SHA512 535b99d91154c308260a0ee6490868724ce8dfa89acf3b623c08409ec6e15194d9e94085411dd7796cad98865ed57692a88cbc11540e6523fc371eaf0204ac17
-EBUILD urwidtrees-1.0.2-r1.ebuild 873 BLAKE2B cf796330c2f119dbd1474872370f1e505346ab6ffae11e9c11a7bac72e30f8afada1185444bdd2a0eb8cfd781bc6c1834cebab61b50de6418f6272424f658670 SHA512 0cd1feaae04b91fd6fc2ead6a23db80f9f112050c655b3128e8ab1e6cdb3f83c79786437093d31f94a4b17b77c8a213221f9270c697813223badf54979616045
-EBUILD urwidtrees-1.0.2.ebuild 976 BLAKE2B 522c4dc9bff8729e2a6bab395a08253085a1d38e6551b92fb94c1a33df355aa07595bce5b821c8f9deb9adc8f260a1a7a13b1cecca9368796ade32c3636c3e63 SHA512 e966a540100eab3318a8280da0166913ae2681e962ab54ab00125a117266b80298c3cde4cf86c29e4a494cc590720d2829aab05b6d7fbfe9105361ecdba61b89
+EBUILD urwidtrees-1.0.2-r1.ebuild 869 BLAKE2B 55764fecc32a9719ebddf3775f96468de4ba8cb4d87164b9de6f9c51f7e202ddbf24f14f4fc27e2fdeea18de20b7d2635affcf3945daa1eaab93facecdeed6b9 SHA512 d57397089a006eb65f5b2957e9448abafc97f55a3784e71ef9c49d76abb77dd1a607761c7a12d244e20c74664bd0986f7af4c00d440e58adaef393823ebd2ed9
+EBUILD urwidtrees-1.0.2.ebuild 966 BLAKE2B fceee0919f238c88cdb44a9a2be0bbb63d6a475064d8d7923c13f294fd70cb873e78e0aa4f41ce4e6e3e910a769c6201f1acbd0ff3fc5689627e4a98dd855b00 SHA512 b2e9f9a214a3c1aa79b9b8ab296cfbb4107d54c342c16d008104440d2ca2ce16818fe2ec296a4f8faa43377c04ba7905ff38f37f9f10d7fa4a4f266e47bc14d0
 MISC metadata.xml 550 BLAKE2B d6355209f6388d488c91217a36158964d3a1db24f88990f9736a12bd29339f9ef60fb261c75df94a4233e2a6e8ec38b52116975c7734424b316998fb5cf49f44 SHA512 f76048059f997bb98de85f445bcd77a5fd1f0523a3c1a77859e0bf1dcdd1ef6f4a99312e7a0261b36753a9b2152231cb84b41f6270c028983033fcce6ec12298
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
index a8dfefc6b359..68baa31a9881 100644
--- a/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
+++ b/dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild b/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
index c9ce81489262..628ea5e2392a 100644
--- a/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
+++ b/dev-python/urwidtrees/urwidtrees-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 800ca5e9bc25..1e045d17d3b1 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,6 +1,6 @@
 AUX vcrpy-skip-network-tests.patch 772 BLAKE2B d98c50fde4e3df3d4e62285e9136061b877e632153c6a6ed35fc84734c3f2d744ee030930253655954bd25d334f87c1e9518fa1fd86a56b7c7b606b7ef7aa11c SHA512 90cd2cc3a89a7019b88687a54016deea9dd60cd1d80f0511f58d25efa7ad24ecaedf8e1187e3455bd7cdd88a4506787867fb04027e638ab66672cfd809ba6787
 DIST vcrpy-1.11.1.tar.gz 63122 BLAKE2B da0fabb1eb342eb268923bcf433ac108d06fc111714834e99d9364358064ad0814bff1463f49bea60c59fe901c46fc8b78c4129e9bb4ab6736266f18b3bdf272 SHA512 d883b87d5b3017843dfc2e33241953ada27d50ffda4936ba4326a392acb9c7667474abd054d6e44b0208096cd96b68e87ec9780c0d6fab77369cc4e517617395
 DIST vcrpy-1.12.0.tar.gz 326731 BLAKE2B a0fd5aa3fea1bef336f0864a6d89e7025d2394f89af23ac9a3ed61430c85b9a46584c528398a03debcce646767bd85328360513476bc89ca067e705767fe85fd SHA512 c47d50cd399fa11eb6fd1d210b056ef9768e501799a9774f7338370177754e35b9a9ee43ff5cb7f1f43073624f9011cc1ca230dbdf317c1bccd0ec6b506c61e0
-EBUILD vcrpy-1.11.1.ebuild 1274 BLAKE2B 140a9ff05f90da5fc6e27e8a0691e2e6f6eab078046c9124d22f0b26937d843d7dd069a5d835fb77984beda0c28f041b88db55be822de67040ada08b576dcee0 SHA512 eb52502b42b1a73d5d91f7f6f3f41ef9b57db1b4678a10a7e7b82c4c80bf0e532d3fd62b5a5db608ae2de951ff66cddc642ef9a100afb865bfb8b545f560b5ad
-EBUILD vcrpy-1.12.0.ebuild 1278 BLAKE2B bcb4c5ed349eecae45c7bba67d0115cc1b53662289bf2d9cdf288313292fe2322ac238cd128b3d87ab70c540711f1cd069ca3689ace673f0af13fb335d53f5fb SHA512 30ebe63e05312a30ff6ac8d3809d71ec404f77f377f77d0efd311f1ae81b0a6181be0c001268ba2c3f98bce6da1ded18ee97ccf48bf01de85ca052a9175fe831
+EBUILD vcrpy-1.11.1.ebuild 1264 BLAKE2B 532418fddc8df8eed6b405cb6a67a4ccdcb7a86d9c463b06607e05bddfe90ad71c5312b2a7090531ba4efd2597c811cc5007aa6ea4b3e1c6f54d46131a396563 SHA512 cdb7670a116db3f925551958b4edf6f1b06b489df1d61cdd6b52297346f84bb198b144f88fa5d839c2c2a8ff4b7bd047573342ae7e098ecda503f97344c6e6f9
+EBUILD vcrpy-1.12.0.ebuild 1268 BLAKE2B 64c78ce41b75151ff4ca9ece01f7be8595fa33227a36350691b39e2efcba2bd6f81ef235c5e2ad4f43e4fb20e4e4f36fbf5c3dc5c17999cb8c294c5a1c3795f4 SHA512 e5d8cde610aea9e079afe5593c38502ad838f3ea627c30dc4350a995dc450a1b049e063252be21046006b47a0fbc1d0900d918020d805ce8f4bac345f851745b
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/vcrpy-1.11.1.ebuild b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
index 5a8a6c820808..f182ecabe7bc 100644
--- a/dev-python/vcrpy/vcrpy-1.11.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vcrpy/vcrpy-1.12.0.ebuild b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
index 46c4ba6d5865..bcb7fd86c25a 100644
--- a/dev-python/vcrpy/vcrpy-1.12.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index eee0f70539c2..c5ce71308988 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,4 +1,4 @@
 AUX yaml.patch 1063 BLAKE2B 33d954db0dfb7caf5db07bdc287ff8f7fdb74edad7f92ea5ae3ec1076fd02077e3c87f2d12907a6eb9e419b506bafab7ca84dd0c2ca282aa08d24eccd3054ff8 SHA512 c2fa16dd567792cf7b31e1bc3a22d647ac40f4e3302c74e61202b8cc1bdb099031029ed8090ad27d54aed7d93052cc099a6bdc2e8849194ade2db44bea44eb5d
 DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
-EBUILD vcstools-0.1.42.ebuild 1469 BLAKE2B 6aa211ba1456ab6b80a44761c98ba3a7195702522eb1f14839dc793e46e56b57cde1f3cba6c6d9cc96af6b6b9e5031bb87ae5a7a417a5109b41888882c7dc82e SHA512 a7fec4940064e188c24f384d02e8629f1b475c6afe59a0548cd1ae687801ba148cc4ae79e1a70dcd2e867c39ec9eea9a65f526582f901ddda789fc17be4eb22a
+EBUILD vcstools-0.1.42.ebuild 1465 BLAKE2B 75562e8b1a609685bf1a6ba20f50b5516a7513b35bfeddf902e6ea5fc4372566eb02d6cddf663f5f4992be588a1f48e855f9759d129fd3a2d20b6e2d14977a31 SHA512 4e7006c77dbe03235e0d0e13a22220cfa7c24e6b799a7166d1ce308f3205c9d0ae49cf20f396b87dbf973b81444aba29e4887c329bed058a4506e17537e92d12
 MISC metadata.xml 331 BLAKE2B 11f0b79892ca57b4abcbd3e0538168569338972295dc250516dabf12f650416d013be219d17401ae24129ba40bea056e4831940982ae6b0368046e1efbb76974 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918
diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
index 7ff43c36b5cd..733f8a2e48e5 100644
--- a/dev-python/vcstools/vcstools-0.1.42.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index a9f65e531500..6b2207e46bee 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,6 +1,6 @@
 AUX verboselogs-1.7-skip-sandbox-violation-test.patch 756 BLAKE2B 3766d28085f4eeb9167fe37f1f1b78dc9c2d1b5e8c401a402b7231bc33e9eaa31dd1a6ae8b0e4052712a173cbb8339361c18b5c4b0d794fcc902650ce6fa19ca SHA512 19f4bd82b49f2b97c7d99154b80e0d63c70211040d73e6cf7ad5d4523f3b15c6cd3df865a8584fd0ee0a255c2463b0057da15ea66f1b28682eeb568120e5d172
 DIST verboselogs-1.6.tar.gz 8837 BLAKE2B e2bfa398e595c7229fae5b8087ecff8575441c0acde172ff81402cc64d27ee866557b0f7028b7c8a7b8a51cfa6f5601b94d600d48503f684d054b25536d4f600 SHA512 618556820c8585edea5ecf86d4b19800f216764c86eaf796dbdeaa5e2b6ace7940c01e9cf94a499a4619bda8b4b8761def8c6e4200a995da511bb23109dcc7e0
 DIST verboselogs-1.7.tar.gz 10338 BLAKE2B a0058a4697d642cc984e68983d499745b644380fd82a45d2aa424cb92b053da2ba5ae225f960427663c49ab78c47ed65c755b43d61c9c978dd881b52ce371ff3 SHA512 13e96ac21e1cb5c68428b348bab63fc4d4ad34eaffe8e1554c05380f9115d2a3ccc6fa2e0a5ca8941e73bfb06537a3e46f29880e7ba3f47da0284279a9740211
-EBUILD verboselogs-1.6.ebuild 485 BLAKE2B d1eb2f2bf3b986d3a1b3ec11fe1c53ab2b6b2418057c367a91690e4681f6a41a2184d31ce28283c5c405e6df317e80556decd35f1fefa1b1f5eb13b2600088f5 SHA512 0385fb81e871b94a8c04799ead4f77cf8ed5f42575deaaf7d57ffc7bb404368a407ed31faa3b553336aabab303119b3e2c69793817d74caa4763f1ca58832411
+EBUILD verboselogs-1.6.ebuild 475 BLAKE2B d4da290b84fa3128c3795561e2322c18ba8ed3cf7531947816e2947d92ceeaaafb7f15f813bea36868a9173ff1b44730b3bc762acfc821622e6b73ca38eda119 SHA512 697e7ece2be2b36b4414ba31b71970794ded58af007ea997be7df6748b6e756c48ac31de1fa733fa3ece2212bcd51dd8d6cece63aad0d6fad4eae7bfc3ee45cd
 EBUILD verboselogs-1.7.ebuild 702 BLAKE2B 88f5ea916f8a5dc24723de2efc24e70903b710eb8cb9a71878e77b65d8742a99468b5a85b32037db331524da6a9e4d8ecff3b573d00d5d7184da1fac3a231d77 SHA512 77a77f6aff4e0f5cbee25cd7dc3d9f8e798376bacf26deecb16a005a86aeb64539052dca2561ce73e0246cb7ca5ed09d665f79a5d52bdf6abf3d826c6a0945aa
 MISC metadata.xml 324 BLAKE2B 6c8d909bd018e46f81fef3a30b87b7dcec5d48a31e919c6c60b000982d31486cb6fd8639afe42351579099454757922d7b05be5e196a3902b6ee199ff5817955 SHA512 4e0057695d4ab3557dc29f6ae0031d780cceabbcf6c0b07cdf80f11052e64cd90994c93a4d09213f875d54a1bce1cee88287ab223bc4d7c0cf4a70095614c039
diff --git a/dev-python/verboselogs/verboselogs-1.6.ebuild b/dev-python/verboselogs/verboselogs-1.6.ebuild
index 39afaddffa20..37bdab680d6c 100644
--- a/dev-python/verboselogs/verboselogs-1.6.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index f16ab02d01b6..4b33dfabcd54 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,5 +1,5 @@
 DIST virtualenv-clone-0.2.6.tar.gz 5691 BLAKE2B e049f7661939d0cc9b5b85d4bb49c34d62c1f7dc388b974b55e0ef5899c4f44006ad1d2b0df2c50aee3047b54d8645666684df8ddac4f1f006c7e7fdc98e6f40 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256
 DIST virtualenv-clone-0.5.3.tar.gz 6226 BLAKE2B 8d86b9c44fc2db49d609045342352c2d06a6b3008c44a891b9d1e1a7225d77c69708999ab1b1097df1f76bd858ca5cefec8693e4a9ccf74589bd159de37c442f SHA512 1ba34830d21e8d4ea2f448defbf769afb3a63049c31fab46cfd184f4e5a8745d58984392add327fd5139e5e05a61c172266e2102439577c0b3702152f87fef0d
-EBUILD virtualenv-clone-0.2.6.ebuild 473 BLAKE2B ab58834c55ce35967dc6ce0e4a30f9124c37d6a721598351dc20115b82de0c0fc4de152a96f37d0fdc6c3be038270cf436def4e77b6493382b83249b86a92021 SHA512 8e040418d48d3024d008f0a67f955d3077dd3256edd0f5effe37e7d418817fcad5ced906b6d87aabd22680d45a6d1a215a0dec728c32a7d2bde8d1ad28ca39db
-EBUILD virtualenv-clone-0.5.3.ebuild 513 BLAKE2B b9ef55b8ea90a03ebbeb4af85435a08a1fdefba99a595e490b16f12b87d6c54da43ebcc3b6ce6b6c705e81b5a2aed3d8681bd4f08f5580f07c575a13ab772b65 SHA512 41d477f9ca509df225752e974015302fef933b4c332102aafdade45d75f176c0e5c85647f1b85fa780fbb90fd47e1bbc8d9671f6799f38a601bd262bd4fb1b0a
+EBUILD virtualenv-clone-0.2.6.ebuild 469 BLAKE2B 9b3679e66b5b0e9ca2258887484a1e29a2157ad9ab7f2a1ec108d24ef6b72d7540584a23b7c8537f09d01290065200362c1565367b832bd9c27579d20a1acc41 SHA512 03e52ac545cf9b658cf386c3ff9a551e989ae548aebd295b12c04656e8e4b6bf11c6c7777bfbe825386dba7ef69138638154c32c133b5278c1cdae1ef5446460
+EBUILD virtualenv-clone-0.5.3.ebuild 507 BLAKE2B c4704a1a34dc399922c596ee946cb2a0672f8670fce22a3483d12bd99217ff4e7342783b2c4663e58c643d81f1901b9742eb76d44eeaa6e4cdbc2ddf48dfd3c9 SHA512 9ccfe70cb68eb93d3c8e56c27c0da1231b56b930cc36f8de0697d14176e84f01a44ecc3c06e2322680fe80596ec6577a93915212dbbf36514bf3f83fbbb8ceab
 MISC metadata.xml 400 BLAKE2B c54a71099c147d9ec3dd825265a76a5434b385ceea45cee95501f27bf409678680d64e8ccb537344cfa4a0e302262d4ebe6b825f80196506e3231997f0d8f320 SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
index 73f4bcf275ce..11a857e4a923 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
index 58aa0a783d08..8c0b8ccfa4bf 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 # rdepend is correct despite warning, see https://bugs.gentoo.org/705362
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
index 5fa4a2714ab8..6c6ee097f8ec 100644
--- a/dev-python/visitor/Manifest
+++ b/dev-python/visitor/Manifest
@@ -1,3 +1,3 @@
 DIST visitor-0.1.3.tar.gz 2985 BLAKE2B d645e3524ee5d072320e6feca39faef72b880ec7341053d078778765d9b279bd2ee3f892c0fcd5f21633e7851acd49ac23aef769eaf190147803ce711b717da6 SHA512 414c77df8efcc22df5ee8073e02b8c5c28563954ef9b9a869c4ea3f7f1268a97929c1fe29142ba41e3a5acafea52599f6bf073aacd654643d7d8380cd4f41fbc
-EBUILD visitor-0.1.3.ebuild 677 BLAKE2B bc55a74d8e0fcbde12b8b30d267aa0d1c57492c8d03794307095ee7b35b7f7682d8ed4c406b5578eba2c8e1c51c1e4672adff6f42e2c3c38686ffb40fbe9f3f6 SHA512 64a599ec13edb11a882512ad14b37c52ee3bf848973c4576374b0e13fb7dcf28cd82037a5f2e43623bec36ea934e8959a6758c888b68823c6b197c074d565119
+EBUILD visitor-0.1.3.ebuild 671 BLAKE2B 6d2b03f918ed400886130425b1884b5d6dffa8d1575f7e152f288bb1e18a3f45dbdae7e50044a4ca42e2951f47e813f59914c43396af8d7a8a5b3e5cfe9a9f9b SHA512 565af55df320308610d8689ed34730329d20ebf0fec5c0448608988456e60e2fd57e52a68a213224b83fbf22846311f31c8fcdc5a46aa50e730215cc43f02195
 MISC metadata.xml 425 BLAKE2B cc0a5e61430649338d19a17059161dceb4e843aad01757da22faf77c327750b901abc8bbcfe0879909febb0f94d764c77494aed2ab9eb4b7b241412a9a993a79 SHA512 21c655b1feebe9dd77a24e8af3fed6c8f40a79c6696940b455da05ad61c0cada17dc99f8c34f3b05309fcaaa1f96261d6546dfa3e8ca21d26323985f713d6bfa
diff --git a/dev-python/visitor/visitor-0.1.3.ebuild b/dev-python/visitor/visitor-0.1.3.ebuild
index ad4dee9b9b25..3ece48c4d529 100644
--- a/dev-python/visitor/visitor-0.1.3.ebuild
+++ b/dev-python/visitor/visitor-0.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index d61aea88bfe1..eb26f60247a3 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,7 +1,7 @@
 DIST vobject-0.9.3.tar.gz 57744 BLAKE2B 01a9083faa7f2a84e2f6f09d9f9f14afb5558d86aefb1a9d5c7e3c8f0e664d6a292f79a340c1a32e510637784cdfb0f02d713e0bcdbb99d1531c50e742192063 SHA512 d77dac2e885ea752e900a2f6e3d9cf24fdd3365d1e9e2ba51c5c38b2889a62aaa61e5562799eb8063b5d4ded0bcd43108cd7e5d028cf7dbe72008b208b8e2e76
 DIST vobject-0.9.5.tar.gz 215577 BLAKE2B 0312a0c1377ce8141e32422fbf9b4dab253398ccf83bb530929ac052537213b065d7550cd0d926a52a00e27271faa942797b65899fcbe3b8b955ca15c6a114a8 SHA512 087b394ad6c48c359ee1cabb90cbc85cb305ed9e65199f33c19f386c7075b70273e5fddcf7fde5356b140ead7a581efd917594e4d493e720c4e1a632f797acc7
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
-EBUILD vobject-0.9.3.ebuild 767 BLAKE2B cdcb7f11382d5b57de265ff6d70bc15518cdcfe75b8ca29b337d29b5cf715997d3da870791118aab86fa3a00a911b69a5db19c426d51a7bae6edc0636d2ffb34 SHA512 9ee9ac42c75919ea59eb43d52a1ff190e53d99ed02f0e6aed6396fc56e41eae7fbedb1e6c349b71609efe8095f830b394aa84583e1933ea0072a7768dba9e566
-EBUILD vobject-0.9.5.ebuild 779 BLAKE2B 86765a826a883728aba4303170dc7af8e5a91cd70b93d6bc5321b5292d3367e331f6cb8151881c6d3f835a3bc1e7064e6c736c49703f90747c6d3dbacead7ae6 SHA512 35518d5336299a9cf75b019423a97453ba5f9b0871e59cbc737f1adaa27fb0f086c4af5e986b608da1d4a3e5907275640ea39ace4b77e7ea36758f217000ea35
-EBUILD vobject-0.9.6.1-r1.ebuild 763 BLAKE2B 68a568e8b3bf2b4c68d1484bc06453bd191450266ddb7767ae72ed974f6f506e41f80b3b1a5f515f9366718f43fcf9d7e9f3efff95c49091c31d294711f9a6de SHA512 18d5aaaf49202630c7d6eab07a4000ea293295af2d971b96c93c1d353c3c8ae46ac1384564f65370ffbcd73b8ec648c2823ed371939a492c45dad59c2bdbdb54
+EBUILD vobject-0.9.3.ebuild 757 BLAKE2B d938ffd8518c23906105e79c574fd1e0765064d78c356224c62963df05a8e61e848aa68f58841b4f5e72f8c178117c505b141d34e2f446118e38eccece2cb3e8 SHA512 1f42dfc8a98d3a6b840c03ff342100fd5399f986abd1b7a2fdcf331df6e2429c16cee58a08cc5388d34541bb2d68ec3e548c974ea9a2f6132949cb2a02a77b7c
+EBUILD vobject-0.9.5.ebuild 769 BLAKE2B 4a672a199d1a5e87b9ed43a47ee3e1b2f1ba359ed8f90c2a3b04569124cd835322fc60c3c0bbfe447e7b7b5c24e23b767d252be5da5b77efd3c690764ba1c0f0 SHA512 6f3f1a38e7b0cc65d83206ee3d9abd5753d09556d2aaef2e654a7f370923918f7fb5ec7b931650458f1e99eb4a4abc7d6c9c7a334b1432f6f5e9b5835ea419f1
+EBUILD vobject-0.9.6.1-r1.ebuild 753 BLAKE2B 5e93a983ffa494a90c4312796e508c38e988ccbf0713b756f772795f30bbc9a7991f3a11c371effa3a6b605099bf855f5e2bbed5a84f8bbf630487961528fade SHA512 92bbd48ae92e7032264dda17ab7a9d2148dac409251302d2ed3a90f559d2cc29cdbb6ddd28c6683dc813073cef0a5c997e0575921f42f68857aaeedc7ed27e2c
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.3.ebuild b/dev-python/vobject/vobject-0.9.3.ebuild
index 7af19ae8e97d..f3e4f04c98d2 100644
--- a/dev-python/vobject/vobject-0.9.3.ebuild
+++ b/dev-python/vobject/vobject-0.9.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vobject/vobject-0.9.5.ebuild b/dev-python/vobject/vobject-0.9.5.ebuild
index 28a51a761a8e..5bb781693371 100644
--- a/dev-python/vobject/vobject-0.9.5.ebuild
+++ b/dev-python/vobject/vobject-0.9.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
index 56fc20ec7141..1f5d43e37d48 100644
--- a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
+++ b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/webassets/Manifest b/dev-python/webassets/Manifest
index 414d34c8f9bd..7d9cb92adfbf 100644
--- a/dev-python/webassets/Manifest
+++ b/dev-python/webassets/Manifest
@@ -1,3 +1,3 @@
 DIST webassets-0.12.1.tar.gz 181402 BLAKE2B 907a4184e0274a9543bda2b7c2fdfeabef346b0920d98e04abbfb3b9858ecae3c0da32b65efe8e4b52d82ab938e182e2e37f005ba25afb1d62235dcc5bc9bee7 SHA512 1e65956afc63dd4bbf43b3b7e220ec6edb8d69d817c6361de67bf8fc7a90b34d3f7e4d0bae4cc45cb3fc043802d2e5d5c8a7cc87421186000212a36605fbc26e
-EBUILD webassets-0.12.1.ebuild 1009 BLAKE2B 74d98489308505b9fd084875cc6fd26f642442707298f39a999a8b93689ae8be3c84a20b2eaf37934c77ed082439ad045663c793fb44cecebc7e20441e53c532 SHA512 5a23d2b181043c52252bdab2f85b80b1958587d0571da6d321de8b5ce5d860c1c2195b8cdebd30a68179b6e5522039e4b6ee6d47f43358db96664be239723834
+EBUILD webassets-0.12.1.ebuild 999 BLAKE2B 677bcc2e88a425a1ab785b79522eed0864c7b2721bbd69c72088d0182d61f53451eaebea5e14afd5401e40574fe42d705a3f90ef6307af15cc4db88ba2527d06 SHA512 64caee4552cc09f037de0f8baa9b16759dcd432f7cb4211877217c6918fece68a2a84208a286e00f1b6f705ad576bae8b6b708e92914f0a7540389a94d57910d
 MISC metadata.xml 334 BLAKE2B 070bcff10f1f0b3fdf01e30021d06ecfdc49952aedfde4a18c254eb9f160c8bf990d5816bdb510995818a73a2da25a77073a672d375cd07684214a325283e390 SHA512 5bcc0fe8286771e758641d97206f14e447f6e0ff49d6c6e91285e0cb6eb5a4116760851996679c79dcf5fdfb4c0252f299676847612fc345fca020e44fd4d2d8
diff --git a/dev-python/webassets/webassets-0.12.1.ebuild b/dev-python/webassets/webassets-0.12.1.ebuild
index df50fbcfa7c8..89d0a354b5d4 100644
--- a/dev-python/webassets/webassets-0.12.1.ebuild
+++ b/dev-python/webassets/webassets-0.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 0170168bd7bd..6d25b487ba1b 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -2,8 +2,8 @@ DIST websocket-client-0.37.0.tar.gz 194246 BLAKE2B 805482524b603fbfeb1039bcd99d7
 DIST websocket-client-0.40.0.tar.gz 196203 BLAKE2B 303aeed5bfc84139adfbef3f3198512172220d2670e38683d660def19dcd82015bf85edd26a5aa029ba021c1f9496dca33e5ee8afc790b87eb1fa7b7b17c9aed SHA512 b57593e14087ff36ab2133fb8077aa207bcdcc04fa82d00eb8fa3b86bdf7fa949c8ca25317a7fe035ef0f36d2c996e036d2b715399813604d5593584d409a5eb
 DIST websocket-client-0.47.0.tar.gz 202611 BLAKE2B 8258ac3186eedcf7e3a791768ddadbe32aa506f27889214a6a275d6710bb7adf8d0ba8354165a0d07b7a084fe5937fc65ee85e6d84fc8ad21a7d2ece4ae8d91d SHA512 0d384e96be66877ba0c24e7194e2f3d554f818c2e2f107b054e07034fa7678946738c2b08c68cd71ebe0237fa507fade319273c492871fbd0ad7085b87cf0a54
 DIST websocket-client-0.48.0.tar.gz 44492 BLAKE2B 39191416d0f80778edc261e96554d3955fcb71542c891fbc506e30c768d2d684942cf690647b65c2245da45c993e3e60d65bd7ab9d28bfa6eb304a95a3ccf619 SHA512 6c678a2671ce6cfb86a61effa836bbe4bb1702f22827934b1fcd7f0f8439be76037d9b6d4d6b416249361a9a74a92701d7b90bc6276b2433388644ed66f56333
-EBUILD websocket-client-0.37.0.ebuild 815 BLAKE2B d28c6b5b6dc6b043f58a448c1a58a9b256075ad08ed7c7b19e4a6ebb7520877169aca5bff786cdf5fdbd82c4ad371a6b667decdf3a9f302cd552878b033d47a8 SHA512 784dca3b5bfbb1075fbff1291721b3ac3e8b3c5d72ddc3a7090fc232aad8c229a05d8071528a74841a179a7be72922ca86b0768dca67ed9025e660edfaafe521
-EBUILD websocket-client-0.40.0.ebuild 804 BLAKE2B e634ab5628c27e1972fb0369ae259a090430894b1c03ceb588956b3f40296b08f663bc8d7d13adc19af6d8b489450ccee086bcb78ff092fa0a80806def70006e SHA512 00a541bf29206ac8ee3a2cba5e9d9a4362ae327263a900d02b860281b91d066afd6ad5cf2ccecbbe6eb1640fece69216d9027bd45c34f7cc2064c6c493e96e98
-EBUILD websocket-client-0.47.0.ebuild 828 BLAKE2B b1511b3c0163a075f1ecd3a95d8c65c416b4b3063b77cc810df27906b8c9cbfb3b57b7c62588cf06664c6a291c09247721626136d81c1a16fd5364d53580571c SHA512 e3ea5db78691e129d85ad6eae5f28297f94e77085646357dd286cda73e896e70b9a093cfbd72493c696457173bf95ae97577c3bd377405ef28435aadf477cd3b
-EBUILD websocket-client-0.48.0.ebuild 958 BLAKE2B 809157ae54f741fe1a73f4d4f7867f246dab05c6c351d8761bbfc1762d15c700a5abe4e249306696475bda178951a716ae81e63b7ef410862bcd888bac01aaa2 SHA512 1edd70efd4a8b12c131ee27b47b0bc1cf2b1774b3793eeb9b7cb92d3522ffc299d3fa1cf4d63687a968e6058acd476bbb6cf608e0a7cb54b0cca4aa703b0d027
+EBUILD websocket-client-0.37.0.ebuild 805 BLAKE2B 01c66a3d2964060d284cf59b46e87f00b1d8d6c18a7831275082c1fe791d958ff4686e4a2f4925cba5a2c783d510b83e899a307312440d618443096c8d8ea567 SHA512 18da22436d880c0615bd4b916c97cf8c42e6f006bdd51a6b86be149ef80373e696f44f4decd9bab7defecd5b2729d0f2b8c1741bfe1e50ac83e6c7201475e1e7
+EBUILD websocket-client-0.40.0.ebuild 794 BLAKE2B c15c237365f3b668f0a2a451dda8800b7ecf315037c279117aefa502a02d72ee5c94e0ae09afd261b8f6e1b5748144d0c21bade4bbad44febdec2ced68536a75 SHA512 89975759f20f532198d4f0c391504c0f6938ec0c7386248e657dd5f2c7b37a9362c853987af354509e9c39c79ef6890d0893a147c4942c73db3eaac9ca6e2694
+EBUILD websocket-client-0.47.0.ebuild 818 BLAKE2B 5fc9172c79f8146758e0372251beb8037fff70213ddf52f4b604ea0cd0b83d73c95589e7a4e5fc5d74688f550be6ec56c0548223a476e3489f6b4ea33bd68dbe SHA512 0afe2f0a9ea496d627e35050bdef8135d9331f5ca0bfa94e34c1867fecd66ff1decc08dd7e99d74980dadd8b768c90f9bc3f6699f910d947a4cb136ee56af59d
+EBUILD websocket-client-0.48.0.ebuild 952 BLAKE2B 7be7dc86c1910f0e2325f1c77dd6e98d8533b853bf52da26df2a3f690d518846ae23f0fb0849401ce99b0a9ac1cc73fad4a1e9d27a478e516ce18a9a74e51f49 SHA512 fe85eec9d3f584fe7d09296d49ab42617f6cd68c1a2f674fbd4ca267a4f23ad70dad0471f9cbb541bd8558b152819925faf5c8a98e6b796141f49f39dc787118
 MISC metadata.xml 473 BLAKE2B 22faac31bc833792ca0ed170d4a785a85275c81403da85cf04003672ce00c1b28fcbcb0834f03cc872dabef36af53a30e53949c154586f3346c3b731a1fbe56b SHA512 1ed56113c593335003b4ccaadac76f39bf05ca4f403c25bf7f2de655b0047bec86088d56aab803a20540193748b2063846f0c6ea552514907b4ec9da6b6aa106
diff --git a/dev-python/websocket-client/websocket-client-0.37.0.ebuild b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
index b0dcf3913af4..889f4ce28421 100644
--- a/dev-python/websocket-client/websocket-client-0.37.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/websocket-client/websocket-client-0.40.0.ebuild b/dev-python/websocket-client/websocket-client-0.40.0.ebuild
index 0bb02c9ef2fd..29e8e7ae2067 100644
--- a/dev-python/websocket-client/websocket-client-0.40.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.40.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/websocket-client/websocket-client-0.47.0.ebuild b/dev-python/websocket-client/websocket-client-0.47.0.ebuild
index e3c1a864e645..2d5f427ae989 100644
--- a/dev-python/websocket-client/websocket-client-0.47.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.47.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/websocket-client/websocket-client-0.48.0.ebuild b/dev-python/websocket-client/websocket-client-0.48.0.ebuild
index 75cdcb3f9c87..e8f296182411 100644
--- a/dev-python/websocket-client/websocket-client-0.48.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.48.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 00ab799b7f7d..87a7c3a3ab49 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -4,10 +4,12 @@ DIST Werkzeug-0.15.4.tar.gz 925334 BLAKE2B ffb132026e5a43bdbbb6decf19c47b07bb38a
 DIST Werkzeug-0.15.5.tar.gz 926570 BLAKE2B 39d68f7ea2f99ffa60f5a2af7ebf8a01e68a83e32106abd8fcbba3a5402bf6c6c02f7bb9b84cd483aa061bb065a0f2f6d809db55a2f6950996d70cf62a620520 SHA512 e2980b649db0c246fa87b94972f1a1e00b19f20a90e34733267cb50b0d1c8e83701f4bde3e466f9f12243c47b3cc40c6977e63164f18ee5e518b75e952988edd
 DIST werkzeug-0.16.0.gh.tar.gz 939220 BLAKE2B 08f77bfbb8703b25be00dba018e9aea16cb4a6977ff3906f636fe24b4e16662f7777584839c8e153532f32a0551281a6fb28bf618da5d5e6c42cdc6e8b391162 SHA512 78e7d2ccceb8764f92a3252b2ff670065a42fe2ad1d2b4631e05c107d2128f8f6f4090e32bd975526e4b5985dbbdbac22e9ad1514d14e88ecfb064483107d0ed
 DIST werkzeug-0.16.1.gh.tar.gz 937876 BLAKE2B e5f962e9cab4a06a6f2d63ac35df896ed764377b458ccdc744800ffa5d2d456a836f0a7c4aef08b750b95904e955ce3b0241102d48bd28080e91fe29823e789e SHA512 52611b2e22b8af6b643471ca1df6e6f262067ef8882363768f21d9b0ee837aedd192c358a3a41788b2036d6c6cc0156043f1f5b8f6a04b2a701790b66837a62e
+DIST werkzeug-1.0.0.gh.tar.gz 907492 BLAKE2B b81a3645d1228a7a2321f14d9093f77ac2cb620403008efb09b5f22b5b27297972d86adc307249828eda6dd2ca38a17ba1590cfc6ff47e7c8faddb34ffa0ba7a SHA512 bc6d61b078aebd92d79a68d2b040dc9cf0cb5a61fe9732861109324bd7f7be6e5fb9e2101f145429909d0e06a6435bd3b8d707022525c5236ba52776a315af2e
 EBUILD werkzeug-0.12.2.ebuild 926 BLAKE2B ff0f1765c1871f08092604cb2d7c4b07343d5a825b80e33f8828206c8267cc5b197898156091af42a1eb01564404bdef79f1b6b1ac12937974cc86812855ce14 SHA512 9c2249f31babb97f4756b68f537009eafbc9fe0349d1c3245e32b3fc71e483b022f4b471817010bc678b060295371fe1dfc2e8365d01308eb6d4bd2c84bd9726
 EBUILD werkzeug-0.14.1.ebuild 970 BLAKE2B 179350973b45720053ac84edad202c5a4698ac135c94ea5ce22586bc15ce1ea27b2fb34d7d7c115572eda6d568d18dc6571003fd01ee827e9312ec8799359268 SHA512 a573936d9ab957b9add39c78169349e24b5be0031391f13ab5b3421858789b2908f51ee298e886082868b541b50d075bc205c61f53469061d6b13a588be1dcd7
 EBUILD werkzeug-0.15.4.ebuild 1029 BLAKE2B 17e20df54b38f869a322c64c8383cec1c6e0db02fb3d54fe814b269adea3c7b17b7790a21b860877e33385df004ed6c95d0213f820353d627d73fe49cff6f062 SHA512 0d76fb0ea2514acfa9c132a2fd878e8250dcfba690d2a64a281d27afbe8d5fd970d2d36c753f0f5c637c31474f5a13e3634245a62e7879ccc4db3c85ee078639
-EBUILD werkzeug-0.15.5.ebuild 1035 BLAKE2B 713b92996a5c6e8f48b7996043fcddf6d8a4b156ae330a51d5049c3d733ef470d0970a5b85064febf22445a287524c26bda5074ed8297b159b4b78ad1a923fb7 SHA512 d73518c3f51af3ff2ca12f8526f26565ece1a3a3ec4d918198b6cae292a7a54e76aedeea09031c96acb7ab7d2797533a987635414a42604b10c45735fdc8ee5e
-EBUILD werkzeug-0.16.0.ebuild 1155 BLAKE2B 7e020995b71d56b38c8a9f6b11a99544c020c08d7e145787d45a84ea0086e1400e558fe9e89da211b2b5acf211e4cb4f632de4b2491fcb2026d8a05c7f042ac3 SHA512 5499a13a9b4f877f4295ee2646d7509e1557bdb854e8ae5b556a3b22a9c68de55399f0bb3dab5a90dc889dea41134f85174f5c550e0f09b58973f09069f42a30
+EBUILD werkzeug-0.15.5.ebuild 1042 BLAKE2B 95b67b66c47eaea78bde6b0f2e0201bde9b2997ef99d8f94e421db9c64de4fb05935e08bf65fb7bfa0cd4de28bd5d1dc01ba303339f4155f4f8ca0a6c71b880d SHA512 ac6327aa090f435a419228479c1dea8b0e21c20401e3684d3bdd9b2b1c61b8dbba4b124863ed534ccadb6fb793d9004d1448f73f54f27802506e5aa7f8526a00
+EBUILD werkzeug-0.16.0.ebuild 1168 BLAKE2B 07c261c84b80cdb13567981ca76dc9863c6d9f2758f247cd722f8157e140e3b6a68100ba1b913ebfda30912392cca6f571e84415dbdc5e80fbdc8b54daf6706a SHA512 f2ef2caa084f213736b58ec862ca5c038b337fa5f7fc2b02db1d4d2886df86aea26ccaa7cf599ffcd817ca71afd4e198aae8df3db91e6957e869d3e3bd7e5458
 EBUILD werkzeug-0.16.1.ebuild 989 BLAKE2B 08b60421b7198237c7dee5c47f31ee326e440247c29d4400bd95d3e2ea42156090224aa45b12ad47e5ca3756098d906568dbc2ea5dc87185110fb390620bef6f SHA512 a479d9640b203dece5e28af8ce9d9157f5181a27da152832fc414a8de9e72de31df7acf874b760653c20fb455798d3972cdcc711d5c558cea3928a01fc1124ad
-MISC metadata.xml 450 BLAKE2B 553ae7b037307259ba7c22b90f001cc7fcdd1c2a2437ad4a038eceec9e9787b3c2287b0f4ba40c9cc435ccc80dc60a96ceadd2ca3e892ae5e5083e4dd037525c SHA512 5bdd21ede3cc864b573ccd668ec99585baa7bf922f80137fd7880f73285510d0bd357707d44f9609b13f01245d011ff209e6c8d837c0f247fce08887bffc3cef
+EBUILD werkzeug-1.0.0.ebuild 1070 BLAKE2B 2b59a48eb8bef01d082509b91ffc78e668c941defd39c00060e9fbee3eca29f366191eb7157eda6baf8e35b2edf988b66b42a0b15d6de6ae7071e41645135375 SHA512 d3dfdc68b0340eec54bef8fb8cede094b60fce25378d6d5dc68d9d1137a33cb7fc70dd375a25f0bfc3cc55c2503d36e947af75cb4bd116045698224114ad051c
+MISC metadata.xml 321 BLAKE2B f2d43f339f0bc82cbc2b0081d1c571cba47744e59bceb960e0a9708d3401445e5d416fc3fd956f6bafc6d8e1d9309eaf5bdfc28e938f5450a9acc1b80cc88b9c SHA512 8c4768582ab693e8a95ad3cfb28b7ed6d7b926700393739c05b50a0297a31a37bad4b2b3ee388a963820258410dc8e2af2a40436821009c746916d0969b1d97a
diff --git a/dev-python/werkzeug/metadata.xml b/dev-python/werkzeug/metadata.xml
index cc1d62c68b62..c576c012fd48 100644
--- a/dev-python/werkzeug/metadata.xml
+++ b/dev-python/werkzeug/metadata.xml
@@ -5,10 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription>
-  Werkzeug is a WSGI utility library. It can serve as the basis for a
-  custom framework.
-</longdescription>
   <upstream>
     <remote-id type="pypi">Werkzeug</remote-id>
   </upstream>
diff --git a/dev-python/werkzeug/werkzeug-0.15.5.ebuild b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
index d84c0facc841..e4e4505fb826 100644
--- a/dev-python/werkzeug/werkzeug-0.15.5.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.15.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/werkzeug/werkzeug-0.16.0.ebuild b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
index 372552584b61..ddc4b7bee23c 100644
--- a/dev-python/werkzeug/werkzeug-0.16.0.ebuild
+++ b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/werkzeug/werkzeug-1.0.0.ebuild b/dev-python/werkzeug/werkzeug-1.0.0.ebuild
new file mode 100644
index 000000000000..10841a9736e4
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-1.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Werkzeug"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
+#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -p no:httpbin || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/whelk/Manifest b/dev-python/whelk/Manifest
index fae477a5af7a..f194708f9fd5 100644
--- a/dev-python/whelk/Manifest
+++ b/dev-python/whelk/Manifest
@@ -1,3 +1,3 @@
 DIST whelk-2.7.1.tar.gz 69983 BLAKE2B 4f9e46a91d5a8723b9d3de2a7c8b906e8d693733b6df74427f992d7318910eb74c58b7dd5e6aa08e56bd6c9cd344274d7b240f434d5804ffeb3b0af34b698e60 SHA512 39b73ed09a0d2442cdde5b8bae72805571a172c6acfa3f652c8cb125d3a400f2538fe6534179f95383d321e8975b6127115616372c60c736e8cd8ceba00ef093
-EBUILD whelk-2.7.1.ebuild 452 BLAKE2B 7fb2f02389ccdb25c7ddd5317b4089c44f947e8f5c61fac66cc56455088e713c8f7c086e5d11ba7c175e7cb0bc7b7a81fee1adec4cbdfee5e11681ec5630a9d5 SHA512 16d052cf244417e5838e26e36c404a8fb4e6f7b445158aa705425f16cf5744eb5971a1da224ecc9a9727c974834360838ef379f12f6b85800b0999a3a09bada1
+EBUILD whelk-2.7.1.ebuild 442 BLAKE2B 2f0d3767d902750001d3a3d718a5d094fa0ee8b8c1efd1e470442ed220967a2376acbda39c4289430de128f4a5d1f3b48cdc6bc1f15ef863b0bc4289a48cf052 SHA512 b15876094c0c5e9340186c355eeb5fb872f2c740ac3f48844f44e4a9d8d8658143af35b819fd0bd3b7064b26b24ba271a5c327199486966340cd555dc2932c48
 MISC metadata.xml 666 BLAKE2B cf11d18c507fb776bd45fa71f5d53903244a7f4151698f724e54b0dcecc8ddaaf1c4c202fbdd5789f4b0a23cadb327e9e0808881cf90d1c9163a32685b5d5dd1 SHA512 92f0a2758700c57debe1c5190c970c1b8279262af9809490368fe2e3c1c6d4a5960ac17633fef4aa5c3786bd4ff2dc42564b7d55102e81096f3f9e602cff4822
diff --git a/dev-python/whelk/whelk-2.7.1.ebuild b/dev-python/whelk/whelk-2.7.1.ebuild
index 4ccd784d6927..e71c81a2b823 100644
--- a/dev-python/whelk/whelk-2.7.1.ebuild
+++ b/dev-python/whelk/whelk-2.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whichcraft/Manifest b/dev-python/whichcraft/Manifest
index c6c69390ba0e..2725c4e18587 100644
--- a/dev-python/whichcraft/Manifest
+++ b/dev-python/whichcraft/Manifest
@@ -1,3 +1,3 @@
 DIST whichcraft-0.4.1.tar.gz 8095 BLAKE2B 666e4919698226e1f252f96323dd1fb56350e7b63424a0022fcf67f7afb83e3ec944b3689f1e58fbc29f1decbf8ce3d87aee9a9cb3a69621b2f65f235682068b SHA512 92633be99badd0ce06cf28b23366f89f2104ef2364ec8f637230fe46b378d1398a64f4d8b367358c833a2038159debc70b0498e94d2729918b95847defd59cae
-EBUILD whichcraft-0.4.1.ebuild 631 BLAKE2B 1b1e15a54b40b457a226025f9a62279d2f772fa76879c46dfa2e6724c45a929b9befa2e5606f51d0f1f770944f9359d00b5a08f48cbf6e10a5dd5094cf141d3f SHA512 3f4294ba9b0abb25918bd8a3bfdeb40a976081c967c5c513d4be3c9ffe26f83b961c75e6ca7317836ea4771961481b43c6b8de6ad1311d947de2ceeec4fc32ed
+EBUILD whichcraft-0.4.1.ebuild 625 BLAKE2B 00856b1ab113393b9acb4de86971d18c91f01fc374395c620d5d6e785610639c45dc282f982d790329f41f13c3aae8ea5db525ec4991a6a50bf86f4a548d74ec SHA512 7e12efb4cac9f0253918b8d84aa78789c9d198e2efabbe48c3f185bf26d2ff27f781b0720cc1ec16b4942d01aa919eb190db15e25e4983def8dec9865e6a41c1
 MISC metadata.xml 323 BLAKE2B c6cb200fc209a939570c4fc3df111f28a718c77d246ba4b5b12467913b137773ac13eb983a7b2aae04dae83764832fdea8a7b4d8cba35a6c745df41b3049fdbe SHA512 92c7755e3ce8289f8cb93c8fc453f8093c678c41f3fe04e0ea6d6fc3df93e1cc4754fb8b214b96a2bc35e0f6a51587c054cdad45c1061f7462db075558c38090
diff --git a/dev-python/whichcraft/whichcraft-0.4.1.ebuild b/dev-python/whichcraft/whichcraft-0.4.1.ebuild
index a62e773c723a..2c9619db6085 100644
--- a/dev-python/whichcraft/whichcraft-0.4.1.ebuild
+++ b/dev-python/whichcraft/whichcraft-0.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whisper/Manifest b/dev-python/whisper/Manifest
index 1a294716f1be..b0411126074f 100644
--- a/dev-python/whisper/Manifest
+++ b/dev-python/whisper/Manifest
@@ -1,9 +1,5 @@
-DIST whisper-0.9.13.tar.gz 14028 BLAKE2B 38c1d006c3b6334df8c18c7e5f695359912db225b72047c0549ba6ca786a1f8f2820a18957d8f0a9bdd07ffa723b9c12b3ddd501d88a65c55d3df6db241aa94e SHA512 b4b46bb7f31ecb766495f5f592fb2f9a754f5f38f83f071b533d4302b95808b9b4046bf7769bfa0d7713633344c7c693b57dd550b52acec4617257eba68634c1
-DIST whisper-0.9.15.tar.gz 15655 BLAKE2B d2f8a1333312038fdec2ed990c4657255242da74d68fb07aa1099fce345d95c15ea98a28a2a3a582b7972c6b67df9f0e2ea2280b9ba9168d65638548d53b8555 SHA512 bdc9d299ed713a3fc6104938c347682562d5f17a7f3650d823f9814410dc934899b81bb2f42f52e9cc25313d8ed33f7b4def6d8945561d63f6237492bda2a5e6
 DIST whisper-1.1.3.tar.gz 37716 BLAKE2B e0cad5c7ef8ca885cae2060838669d80e8b2e28d1039dce45fec601257c866d202a73279d923aff39781f71d7c9bfdc19300c991e7a5956af337d5ff18a37ede SHA512 cd2a1bece58ea4cb3f5df6adbe1966e1408c92a55b21bf7298d4b30fdd51780e236707cae1414d6c363a046a36870a6ac230ec30abe565fde9fbf17efc9e7cab
 DIST whisper-1.1.5.tar.gz 38104 BLAKE2B ab36c91c00dd8e8e26b24c0c2967c661f0bd69f3dcb0e52763f6527a233f656a984c738be720c0b5f2d27fff08daa164db87f0ab693d360bd0c087cf6a408340 SHA512 dee42adf1824c876cf15e9e55101d90d08889fd6e267a89c18fdb4a7d4c5a3a0d4f6f24bb0fdeb974fd194046c17e00f71033ddb72c74c4d4ded0a937e82c8a9
-EBUILD whisper-0.9.13.ebuild 383 BLAKE2B f68359bc3cc00600f8d97d71531c09071d5ae016d9276169bd05956fbb329a5163dcde05d847aeae1f291c332e394152bc17f0b5079bbe76cc789f3e57cc1ba3 SHA512 fc358377c1f079730607f19170d6d04e7a38d2bf83a66168e9ead76cfcb8829fc9bc76415696848411389276a0e7e17e8e715699b0da2e64630fcf6ec03b47a3
-EBUILD whisper-0.9.15.ebuild 398 BLAKE2B af6b6b1bba63d4d21a34b7f92a1137d7487eb2de5d6e64b3fe6a5a446f4d612f8c737e1e2cddba2fd5e8c1d65375ab70d0539266c4c6f88cb819bca004b7e3fe SHA512 38b40883d09fb9c289eb9b277dc912f7ad267f41ee9457dc1c38400b00b13d3942a04809151c16249373bfccb61f466faeb4fa5e9e7c56657c05ac8c376d2980
-EBUILD whisper-1.1.3.ebuild 801 BLAKE2B 6ff1876d5ea9a73a9ed7bc07fa8af14e56b2610a5f01ba9c05fabb7e5f67096fe082398d766ad1c0a7b42ab81d0d193b76c6de93c6ef86b3fa48c624ee12d7b2 SHA512 486f29baf3303b4c5558c0257b669a7a3761df8e746221a9d5b0f1ddef5a2b0c34091bb2a3939369ef3c28fe04e833b4651558534976cc4042bafce19ed7e8f7
-EBUILD whisper-1.1.5.ebuild 805 BLAKE2B 91c28a8ac2b6862d2ab84120dd77a0516e851bc126ea140303cb2c5601c6128c8d59035256804f1b501ff013b4f2c46fff802d5c1cd6f50701f3cf59e867abc9 SHA512 a521ed0056de5d313a716c6935cdb19cecb4e56b89092642dc132b1c1be273c8dabcf5797497d4153007685939be261247e0f413714d2d872cecd8fc6a5ffb47
+EBUILD whisper-1.1.3.ebuild 795 BLAKE2B 32b685e926c7a8730bcd63b7382e539d39ad406637a5a8eb3b0af3af8810a673b1dc60df9ea19bf48ab0674c4731c81b747ac02dc4c439b3ce2456ac225a6b64 SHA512 e011bc2c4c3e07dd3893ee8bb96cc2f70b57d7542fb8f7be4ba0871fe2640cdeef5cbb9b484d16ecb30779fa8b8afcaea60064254c41938cd0a0613637819648
+EBUILD whisper-1.1.5.ebuild 799 BLAKE2B ad1a127e5c8a68382a9b05c93386334ccf6b0bbb9eacbded3e22ef12c39d94b3bf8378812fafffbb74ef0cc4d5a65b8d0b2228e0776d62792499c481d299144a SHA512 5b10552f3998f2dd7f3386fb426cafd99b00417a8ad3d23d420d51bf78d09f5403247951fc474535a9d86ab2df1edf0804af93fc6f2e1d0bb287bb74afbaa18c
 MISC metadata.xml 556 BLAKE2B afcecd89f7f06cef8d991edd5476a6ec0db7753d2d58174ec5a1a955f6023a06d56f0ae933e438bc720b9cf777852df4d223a21557454ee7d6aeef7741f451ee SHA512 7f72e3305aa749df979f180e0d46efd3ce1edfd81e76f5cb8a808d433ee2b19741b756f0e2c7706fce8bf2b4ae9adc336e309d3ed902e3d122fd1617dcd26af0
diff --git a/dev-python/whisper/whisper-0.9.13.ebuild b/dev-python/whisper/whisper-0.9.13.ebuild
deleted file mode 100644
index e28808b7c7cc..000000000000
--- a/dev-python/whisper/whisper-0.9.13.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fixed size round-robin style database"
-HOMEPAGE="https://github.com/graphite-project/whisper"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
diff --git a/dev-python/whisper/whisper-0.9.15.ebuild b/dev-python/whisper/whisper-0.9.15.ebuild
deleted file mode 100644
index 0011e84462d1..000000000000
--- a/dev-python/whisper/whisper-0.9.15.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Fixed size round-robin style database"
-HOMEPAGE="https://github.com/graphite-project/whisper"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
-SLOT="0"
-IUSE=""
diff --git a/dev-python/whisper/whisper-1.1.3.ebuild b/dev-python/whisper/whisper-1.1.3.ebuild
index 593f5228b98b..acf2b09922a5 100644
--- a/dev-python/whisper/whisper-1.1.3.ebuild
+++ b/dev-python/whisper/whisper-1.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/whisper/whisper-1.1.5.ebuild b/dev-python/whisper/whisper-1.1.5.ebuild
index ce6d7d32da43..690cb17abe1e 100644
--- a/dev-python/whisper/whisper-1.1.5.ebuild
+++ b/dev-python/whisper/whisper-1.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/wsaccel/Manifest b/dev-python/wsaccel/Manifest
index 3001b76457ff..7b7040a2907e 100644
--- a/dev-python/wsaccel/Manifest
+++ b/dev-python/wsaccel/Manifest
@@ -1,3 +1,3 @@
 DIST wsaccel-0.6.2_p20170108.zip 21344 BLAKE2B ecb8ef7888fb2ca8e6566d2b3fcbd3911a0df5a8c9f4be86a3cffb95afc31603c2477bd983f9d24ee7cf48c33cbcfb10068c38640ee2a888f46402756313cf29 SHA512 d0cf13360bd6cc0b51b8bee1d36a8ee544816c318e828bf6129ff85827636642cfebae4ef0e99d841cdf64f6c67006a649994804aa42d3d76e977a861aafb3b9
-EBUILD wsaccel-0.6.2_p20170108.ebuild 744 BLAKE2B f3eca23b57bc7568d259b6449f881b0a5189849839128a5753c0923a4933e3386f7289ab9d50b5fb59b7853a37a24f274b00c234654550b5a7e857bdeb711b2d SHA512 f20198c28597f8e34faad58940d847e2d94d0294c1a4a1f20504b429eaef7c088e3a0a47249f8d0a8096487c10505d9939f67b39c9665b1e4a0430159a38c2fb
+EBUILD wsaccel-0.6.2_p20170108.ebuild 734 BLAKE2B 677f53b83943fdf5a07a82ffae4bb2a221be065af73f34d2e94a59d141d7c0233b6df01e7a9bc2f1ae0d579c1de928fe01b69af290b408c9d1eb1f6c2792d7f8 SHA512 e4688f25629d163ac94663e5776358c58965c9b26314284b51814ace37f83b3d352c31da30f9fe1327d0ae577774a979b0222c8fcc6cf7c4bef4ebfbf84231e1
 MISC metadata.xml 377 BLAKE2B 9e994c8b6d0e89336fd1f2998f8544201ccccf3d647f3600e57ffddf21fb75e05bc3f8ffc2634dda9be9ba78709ac634d8d642cf110edd382d24ae055d860fc0 SHA512 cd6ff7d5e94219b550161b57a1c6f3736a8c78906a81a5e293046b9b3b454f97c1fb41dd7eb7034f45ab784c22189e3788f2e8d9c17a725743936796af3a4d6d
diff --git a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
index fe657bd61348..c436d65ad6d2 100644
--- a/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
+++ b/dev-python/wsaccel/wsaccel-0.6.2_p20170108.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 COMMIT="0fbd074c257c51b73de05b25ccb6488801320a32"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/wtforms/Manifest b/dev-python/wtforms/Manifest
index f5f05b8cab70..e34707576a05 100644
--- a/dev-python/wtforms/Manifest
+++ b/dev-python/wtforms/Manifest
@@ -1,5 +1,5 @@
 DIST WTForms-2.1.zip 553644 BLAKE2B 0db0c1d9b3249ad43ad5aa4da597fab3bca38f87eb636768b867365495a30d5f4d4a1def16c9965bfd4bce8ed28ffc7601b3b352af74208086feb7b54ab3de07 SHA512 2bdac0a35eca465021df9fb37dc0acd87bf487c6158b782d48870e9d5aab6ed3eb635af89bb38b9e8419688185f7c7b7875e68f7435d94bca8b074b2dddb12a0
 DIST WTForms-2.2.1.tar.gz 156904 BLAKE2B bec7c526f72b264888f7be45ba15d2bc4d194b09adc8ca5806cfc04cd1671663c851b7f1c99c602bb3e13d14a38733be61613058e46481bcea59901ac1f5b6b2 SHA512 06478790a8a4bf728e5436edaa63c7c0e596f71d63b273e1f296f9255d9fa3e31a7bfa95971c214a8cea684034ac3c77b05371f4b4e14da9d9ef2c5afadabde0
 EBUILD wtforms-2.1.ebuild 1221 BLAKE2B 418b84a50ba9e6f74b0ebf580999a7feb5254f52f289589abb84076b8f64186db8569c369fe0e52e38f2106c9230f3261b243ba1f5c5256c6c211adf9fa56839 SHA512 e63639d87a91adf91dccb78c63a1acf97750b5f35b958f3a78963dc8556c8c461d62e9e03b9dca05f10453dd72855b392a4bad56af8e29203b29555b5b1f1df0
-EBUILD wtforms-2.2.1.ebuild 1332 BLAKE2B fc28f72f4e837e4acfb038fabcbbb34bb5df4f9026daef35e9b6dde2373b5c92d1787c6b7e376fbd5959bd8abefa0a3bc376d6b7e8df63a8f5e47da6afae8b42 SHA512 3e80b837cfb9e49f7e3093920db0fb5990c00a12abb562d57ffa2c5e35e146b997190aeb34d119e669536559a35cdf3f948337ee1c7927f73bd380deaf4b7230
+EBUILD wtforms-2.2.1.ebuild 1337 BLAKE2B 478161ea4248270a709036aa87cd0fab8a46ac4727e68a5496c531a05cb671c4416349262a43deb84824541be4bd1f46ca2cb952c3eef6131bc6c5aafe13f7a0 SHA512 30c3afa4bfcc5acf11416d7f259a74ea48e772f9e8e07b9b1e23e1ccfbe7f40b91c077e9eeae5d27853ab9cdf68b4bbbef6360a91c2119a60fcdf520cf8376f7
 MISC metadata.xml 428 BLAKE2B 56881cd6ce12c4829ba29d6571369d4fe5f0d62810934c5f89b04c61cb00ec592773f7a6b79dc9034ee74240db95d9af690271027c87bc4e2997902a21614940 SHA512 2399e15e7dfc3dfeea12c49f3f4df7bab32e03a38860d268ce1de64ca7978dcf197c7658250778b4d4006eb7d2626f2d17632cb3dd2ca507c0d918e5996918a0
diff --git a/dev-python/wtforms/wtforms-2.2.1.ebuild b/dev-python/wtforms/wtforms-2.2.1.ebuild
index 74ab98861301..aeb0c540d6e9 100644
--- a/dev-python/wtforms/wtforms-2.2.1.ebuild
+++ b/dev-python/wtforms/wtforms-2.2.1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
+PYTHON_COMPAT=( pypy3 python2_7 python3_{6,7,8} )
 inherit distutils-r1
 
 MY_PN="WTForms"
diff --git a/dev-python/www-authenticate/Manifest b/dev-python/www-authenticate/Manifest
index a235e96052d2..d12ce0ddc651 100644
--- a/dev-python/www-authenticate/Manifest
+++ b/dev-python/www-authenticate/Manifest
@@ -1,3 +1,3 @@
 DIST www-authenticate-0.9.2.tar.gz 2480 BLAKE2B 642640f29582983457134034d9d93ca20fb3d8992cbe3f5b3f9b35e3d95c154fb744dc8fbe35081d4af6b1b04ea37e27b35501bd783130d9e1bcf8aa6a0eeaba SHA512 5ee3ee733013d922bfef96981fd33b22947874c0a2a56c6d2dbfe11b0bc447a3ff6b6f294efaea2beaf2ff570cd3bf519a21bc71ce62fc0a8ce5edc5d68308f4
-EBUILD www-authenticate-0.9.2.ebuild 616 BLAKE2B 5e5689baec47d171875a1f9891aae816a7be4b97e1e971a9e8d8a7485f37e3a86f8c2f9dcd156bfed1b8b7948ea89d99deb920fab3c2cc9ecf90d31d69bf6e08 SHA512 6085b95bc6e4b29a635b2b0ee403fe16ea4f51040733a74871f27de4f90b4d40ece081b12d89496a826407deaa018845fd0ccaf3d2a7ef052b496961fab35b88
+EBUILD www-authenticate-0.9.2.ebuild 606 BLAKE2B 7cb3e79adfa29b213290c2a75a8c55edca611b94b3fdb63abb026e3d4636e5a8bf23c9d5535016ed7940fe3c36f87f09e2e8f1106cd2ea83d8f5b245e837698a SHA512 c94e795e54bd59c9e53fcb56eba81f072d7845a83e53f30d41db18df04c2c773d89d07297074dec4898076049bed3f72ec27368c20de771edebf94390230683e
 MISC metadata.xml 387 BLAKE2B 48442f1e88e03bf55104ba3f54f61a4f09cbd0fc3761b8e4b79497e7dc746f90b90359cb783faa1813cdc19318dbe66303379357006bdcfe30d42bfadff244bc SHA512 c6a7433f233618ec283e6ba0c0ed2730fb01d5f85a795e340bddc29435cea3c6399095d9fee2b1795cbe5b7949e8a79ecef5c979b502bed2162643426410273c
diff --git a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
index bea1084fbed8..d56aaf333fe8 100644
--- a/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
+++ b/dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="WWW-Authenticate header parser"
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 1251a0c5a55a..dbdf74b68223 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -8,6 +8,6 @@ AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ff
 DIST wxPython-4.0.6.tar.gz 68815031 BLAKE2B 49367f5d0867c28893c43d54c4ad6001807bdc95d81327082e3c88fd796e5e2daafcf6b70252828bdcfaaec8b42ba64e881575d209eb4f61a85f58ebd79e8ae4 SHA512 bfe799e1a0987cb57f2e31199cdb522471aaa08bb3b642fdf4130f4219b81487d4b6252f7a8afd3af7cdaeef2e992cecfc581e97d8b42307a4e0a8c9009db301
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
-EBUILD wxpython-3.0.2.0.ebuild 4589 BLAKE2B efaa6c86ade47de0353a318d3067b3aa57778649aa3167696c200d6f74f97a06f1feb6481ca0284f56bf05e5a5bbce6fc7f1f14a93bbb1727821d0f0c7a93c7c SHA512 5e834683fb837aadf238ef6ad93602b16a1548fccfb25ee99e4fa75dabc67adc82ad8e33cceba2bb02f0871784867c4c7d66792c8506590097c5269b875c19a1
+EBUILD wxpython-3.0.2.0.ebuild 4590 BLAKE2B 14f0f055727c590d4dd2787678899050330923f8eb5f3e3ea3c37052cd6bbb9dede1538698452538beaa4caf61b483ba7343a0328613168664d3a83e0b5cf55b SHA512 bade7cd16261fd2562e3d559af75f80ffa5ec77b1db1b55b13b859746548e2a6d58b7812685694b332f6f0a7d59fbe951925b2e16ca0cc6daef2a01949fd8a48
 EBUILD wxpython-4.0.6.ebuild 2384 BLAKE2B 216752a5fbc867c15d57e806a05f782ca765ca4c65a1540cf9c4ed4d44f7553cee0f89bd72fb73ced7f5ad9ae9c167009c29f639e8435f335620c46b0abd54c5 SHA512 6e633ae4fb2c0ca5a7fa81e62b3cb71068eebdc47f6afde1415db226d8fecae12ca93d25b66a36f2208613c4eeb069659b2da4fc427dfebd6794a536c13e226c
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
index 85f99bd181c5..bc451a8634cc 100644
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="wxWinLL-3"
 SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86"
 IUSE="cairo examples libnotify opengl"
 
 RDEPEND="
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest
index 3f3e6062f285..a7cf84211d44 100644
--- a/dev-python/xdis/Manifest
+++ b/dev-python/xdis/Manifest
@@ -1,6 +1,6 @@
 AUX xdis-3.3.0-remove-pytest-runner-dep.patch 1093 BLAKE2B 98e3ed5a7b688b1ee2e12cff5a6214a79b184cdfd16a0725983b26d09ab330ab789fc97260a159830de548e36220339a69daaa70bbb7787250aa5fd6c0256eb8 SHA512 4eb02e8fed567903b1d4a51ab65f374008b0e939c0e192311974bb07b4fbfb877f8004580d67d7d1f3dd0bb27319bf17ecd289ede7e4420486c9998fbbef3464
 DIST xdis-3.3.1.tar.gz 154152 BLAKE2B e0997fb8bbc66cc3f019ee6855cbf9ae9f594698c989a0a1b9d0b08f03bb3fbf0ad44ca0292202674c8a8a8d92ce5d6e669dd01194567766262ce44bb154d631 SHA512 93b1a092ae7790e84dfd8dc4128659d48be85c4e00d9914bbd748fad5ec4246bbfc6c19a5c5de366f4bd6d91847dad4ce3c1c3affe8f7608652f2f6e343650e1
 DIST xdis-3.6.0.tar.gz 144766 BLAKE2B e9a33443d42ff71194180f0bb20423783107d4b1e3d6c364b824011d916041500048345cac4853d1ebb6363edf8df542b0363650bba42e187986f50c9696051f SHA512 8b45ccd6976204004f27ee5b1a9da9b29ec0e28f4b462d862be5a1238d3ebd4a5d6f3df5607f3e2f037d80b2d3ae77ec4246ab1aa0671466c1e07e3a65453f3b
-EBUILD xdis-3.3.1.ebuild 1140 BLAKE2B e6f652907d46a3ccab1062ca065b78aea6ffc6f28f6a78db7844bc90174559968ba785f5c20926357d6c69f2dcc3a1cd8497d293bd4584bbd10831e69937de56 SHA512 a9089626414f813640a785ac9b0ca630a45f7b91c1f4218fe681accc458d78f8ad5f61a8cd301bef69ead7f5354231e9de992e62a31f2cba4c425b771535f491
-EBUILD xdis-3.6.0.ebuild 1204 BLAKE2B f73234351a37977e01c372bb9de7ad0d1a0f35e15ddaf96748cfe8c66ab96e5268425fffabed5ef94145d10f998266f201aca0c6b61c2adb17a93b5508d4a0ec SHA512 335b048b5c30e6347c6021b83257acd77317205f2b329fb0cfeec3d970cbb797dc510b0f21b73c59229e10a788d6a7d589de409e53a9980a73480c23d7d68f89
+EBUILD xdis-3.3.1.ebuild 1130 BLAKE2B 524a527eca477124fd609d38e8e6f56a59860c6d823d122fda301835798035e070c001204bd63cc5ad2606af610cac65753fced11011d7118d05ac27378daaa4 SHA512 d88a647e95cf82661b0249221e44fc805a0f9928992c87e65fb5ab1b017f0ae2c04b798a22b8538c21aecb515ff8fc6c3defc63d0d1898c5a5f459c8a2d25f2c
+EBUILD xdis-3.6.0.ebuild 1194 BLAKE2B 4952d755bd3713f8d230e159f78c915041925afd871db38f59902113427425c3c6f2fe9281cd3964bb5eda414127ffa26220666d6fd3416fc99c32d63e7466d1 SHA512 95e34018f9364ea3edf475d6308e53342b45c059b7e2565b002a8ca433a47075e25574c3b9440c1c87eb9b340ffd7a8d7ce45f498f25acf8cfcda9c3b3a789bf
 MISC metadata.xml 797 BLAKE2B b9b241f31c0a58195f0697c593da5e0cd68bbc753359fa2dca7b9d4171a9e5a3d6ac0dc6fab00ac585f282512d7c1b441b76f60b21a04dc7fad49a4f9490b405 SHA512 79ab1e93e4dd6c417a86f33dab9839a9f7bffbe94c1f1bb463f60b24daf7463f122e3f255a640cc73834bd33aa003176fe839e0498069033601c0b7e5d1c1cdd
diff --git a/dev-python/xdis/xdis-3.3.1.ebuild b/dev-python/xdis/xdis-3.3.1.ebuild
index 580eeb1baf96..bd3f3c0554f2 100644
--- a/dev-python/xdis/xdis-3.3.1.ebuild
+++ b/dev-python/xdis/xdis-3.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/xdis/xdis-3.6.0.ebuild b/dev-python/xdis/xdis-3.6.0.ebuild
index 52d5f330a6c5..2e7b6918205f 100644
--- a/dev-python/xdis/xdis-3.6.0.ebuild
+++ b/dev-python/xdis/xdis-3.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
+PYTHON_COMPAT=( python3_6)
 
 inherit distutils-r1
 
diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
new file mode 100644
index 000000000000..812009e6bdf3
--- /dev/null
+++ b/dev-python/xdoctest/Manifest
@@ -0,0 +1,3 @@
+DIST xdoctest-0.11.0.tar.gz 123871 BLAKE2B ef766ae79b1566a243abbb31671a6e57184196079cda146081c73cf4aa2583b612b438ea8ff031a1c3d4da612034bccb1990a954ad4d2af55546edd7f7085238 SHA512 63629435e976d2ece770b13432f1857127e7d9c9c954e11e904c1f25b1a9e82d5cf99ff912656260f6c4ed8b08e27ab0fb2d39e621d94ccac9c797fc294bcc62
+EBUILD xdoctest-0.11.0.ebuild 1045 BLAKE2B e822baea803013b02d2b501ae6a6a2a8b297500e8d1737cfbc348b56156efafa04f364f83717c0ae95a0a334de83f889e313f0189fba62d2c2051a006b54a76a SHA512 3baa2a5d3b66e1984737c8b46b9e9edc1beef5fab85a312fcf987034dadc2d2b4220ddb5c3223ebc840b6c4fdfdc505cf1cbf4d755aeddf86400a09c9eaa05ee
+MISC metadata.xml 254 BLAKE2B 975bbf0379cab76237f5c98a5722b00f260e44a5c216bb096be1d9c4dff854c39b5ade4b1b0e82130b40b7a77172d5cb8a57e62cd7c0d2046a06cdd2483f4c6a SHA512 4ddb51fe1406eb74843b84f306330d4fba63c96c52fd5c9c806418a93dc8d4f2be6310f39a841fa6abf856e277a8f48e32bc5f6cd4d73ee9d608367bf2e8f96e
diff --git a/dev-python/xdoctest/metadata.xml b/dev-python/xdoctest/metadata.xml
new file mode 100644
index 000000000000..ca93985fb0db
--- /dev/null
+++ b/dev-python/xdoctest/metadata.xml
@@ -0,0 +1,9 @@
+<?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>
+</pkgmetadata>
diff --git a/dev-python/xdoctest/xdoctest-0.11.0.ebuild b/dev-python/xdoctest/xdoctest-0.11.0.ebuild
new file mode 100644
index 000000000000..ddcfe852c5c4
--- /dev/null
+++ b/dev-python/xdoctest/xdoctest-0.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A rewrite of Python's builtin doctest module but without all the weirdness"
+HOMEPAGE="https://github.com/Erotemic/ubelt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# fails because the ebuild environment location is not the expected location
+	sed -i -e 's:test_xdoc_console_script_location:_&:' \
+		testing/test_entry_point.py || die
+
+	# xdoctest has to be in PATH for this to work
+	sed -i -e 's:test_xdoc_console_script_exec:_&:' \
+		testing/test_entry_point.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${WORKDIR}/${P}"
+	pytest -vv || die "Test fail with ${EPYTHON}"
+}
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index ae4cc6c4bb7f..576726971f74 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,6 +1,6 @@
 AUX xlrd-0.9.3-column.patch 2424 BLAKE2B 91f0870dd89b2a81519d35ac0e0615c04d969f2f2d586fd9077e273fc61ff5341679304ac931585193cc426c5f8c7535b99a168d6d3cfd6c8368e3e638d1970c SHA512 1d28f32101499dc9e22912aa92a0450e638c9d708bf42a93f10f7f07a7535532b61eb1028fc335a1c84e92608cbaefa6c1e042f70a005cdb0dc73392315d52f8
 DIST xlrd-0.9.4.tar.gz 322945 BLAKE2B cdeac4ab7c68e14d564fdd6f1da35e09a6c3a070af1111bb33e7533bdc534e05ddcb59384a72cdcbad452b26e35529431f50c2511e68422aa53f7133cfcf6141 SHA512 61d21a6b0bf5a72f75b98f6a62245fd2d0d8b091b56f31cd39e83ff0d68edba5370f81b50020f6ac52d08b0b49c0920bf44661d8501ecbde5baee7d991037a6d
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
-EBUILD xlrd-0.9.4.ebuild 834 BLAKE2B bc451fc011a23779ff987cc1c3902c3b6c6f72ede55e8f79b42d573744ab148af2965d482769192e06546d9e2ea6279c0e4207b57fe76e1254d99796b26eccf2 SHA512 51c90f2c8307924589532a4b8729f8977668b845ce3c0eaff5377d41a73f85f7a0021f1297c8c776cf8703343cb7276330d10f8cc585722f72f123e11e91754b
-EBUILD xlrd-1.2.0.ebuild 770 BLAKE2B 2a3091672137ad77d0a01c5f1cdbfa64dc6646287c10b31c209f1f23345ac01c12e57f743a9b2fff27e235074f3c8a02f918f321803525c0d9f180c7911831d8 SHA512 2b024941a9f90f7eae8309086cc88aa8548676c91f89d7c2fdd761ddba2c92ffce95a1f810b32f88bf8f8fbb86a79f4ffe81b5bc21440df57bff24bf3160bb14
+EBUILD xlrd-0.9.4.ebuild 824 BLAKE2B 9fa74c353b367129df8ad1ff5cf28555c70ad8125994bd1be8b16c5abad43c9f7342bde71587c80ed8c20864c105993046b202813af29565c3adee6637f0eadd SHA512 862240440bada5753c9594ddfe0b34ef7e2ab48ed792669773852c6ad3f1c49db3733b25f055c49ec77d0adbc5de40c215e9b0a1c1eb6ace715c9b7e79caadee
+EBUILD xlrd-1.2.0.ebuild 760 BLAKE2B f1529fcc7503edafc1c876f3d3d35960c934d137469ad887318da172cea196eb73437930cfb96e778fb9db23401cd5cea2f1f797eb8c65258a27e3ea82a99f18 SHA512 757e1ff226d7528698774a0fb46040853ff20656458c40d3a4dc7aca433927a2815e7dcbbbd61aec5c6b710da0b7a70bef6208676e0c1eb835307e260c983c9f
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-0.9.4.ebuild b/dev-python/xlrd/xlrd-0.9.4.ebuild
index 0bea912a045d..ec0657e68011 100644
--- a/dev-python/xlrd/xlrd-0.9.4.ebuild
+++ b/dev-python/xlrd/xlrd-0.9.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index d019d67ec691..b3782f1a8139 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index b073a8e8735e..4ecec0401d19 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,6 +1,6 @@
 DIST XlsxWriter-0.7.8.tar.gz 233091 BLAKE2B fb5c3f50d56bf20633ceeade3be070028b11b689f2de4e816c188759793cd15e07f5915cb70a67859b459385ba03ec85d87b34840f462d266e2e2715ba9f6eec SHA512 2343155c765533bbc146e928dfc82924f089c7abee2f3607be2e5f9b1da9166090164f134256cbd36f319a97c9aa651fb346cc7502a3f1721f9687a9cddb9364
 DIST XlsxWriter-0.9.8.tar.gz 236187 BLAKE2B ff6f7392a72fe00107d2dfdc17a4d17f6505f9961e518115bf88412194ee8f32364709ee3da0756a7de038f1a699e32c000831b58aabe608564aa7171c20f702 SHA512 05c372c25142dc6726fa5475cdda433f5ecae1d0f92f87c50ca7bc26fb99f8ae369a1a8cb6ec5e909280c81f32c92ac23892fbd6326b8e1cf032abcf42c0d894
 DIST xlsxwriter-0.9.8-tests.zip 28345992 BLAKE2B 0cda3578f69ecb152d6f30da6f2ab9c6eae33f4f303f2c9b7fc1bcd661e07722031b8eb35e7e57ffb04c84f6121f3f304c40379f891a0f9c50667503391f8e6d SHA512 a30cf917642100d3ffb9616809e4860593ccfa271beed0baa757ccf6f0822af05daf602d67773ce1b5af020ead108bf7a844dafb426c020c9adaed19cc7aad29
-EBUILD xlsxwriter-0.7.8.ebuild 795 BLAKE2B 791305316b0ab9a9530818651ca45ee30cc645d593e6e7a6d48a703dc7722cc1efa04f9e7e591e72659ac88fc0e8d956c2eb49ea51fe3764acea5e1bb75807c0 SHA512 5f4e323cab685e890e7b01e793714101fd8e49db8eb63ff81c4095ee8a9bf30c95621d998a42a1d0245209c0d56bee12fcc16a08b0ef8a506b4bdd3c0c3355f0
-EBUILD xlsxwriter-0.9.8.ebuild 964 BLAKE2B 00580beb24e2b3b43c9727b4e2a8123e68deedcaad49447c0ceca4fd8de416e9aa9ac14e1b39458af164a4a24748a30ebaacbc99fb5d28bd0f8e2956a86226c2 SHA512 7d5ee57c752f36d864ae061e79d5d49fb0359fb9f5db8031a7d3e1fff348bca18258edab5eb5eff2cda9ade513ecebeefcfd3eb7c3bd52192d12cd09df2858af
+EBUILD xlsxwriter-0.7.8.ebuild 785 BLAKE2B 1f5cc00d0c6943cf1cbd7ca937d0280ea551e98cc9069e1351470556b28f16c25ae6b57fb522c7327e99506a393e41383ce2000d73e57f8d740a1375f8e03461 SHA512 85c6c382e07a57b35bf7d6508d8b5b0b2177c95f323d1edeb2cd8411b9f7997e51032d14449fb7d1566d94c3a0effe000fe54b52e9e201cfdc46ca77d51a54e1
+EBUILD xlsxwriter-0.9.8.ebuild 954 BLAKE2B a61b9c6ba24843c62f7a5b05dd58e05d1a91c1b226773e7d2630165313462758f60b04ba4a2bab914a8c6b796193724d687d60abce092b7a32ef7026fb9a426f SHA512 4a946fe79cb3fef341e6c7e7bb256bc144c9d60e79b805cc6ed17ff74b21cb2a6bb0a68b1eda5b306799c1733b24fcfb9a9899e85ecffef9cfb3b3a8a4ac14f7
 MISC metadata.xml 385 BLAKE2B 29615c2fcc24b4ee0ab796762a67d1e1a09b4208b18cc13a000b3e7380d5e56c74020436801a41e33a74b0122c3c2872e22a643c1a2fc724ebb6064170ab5c5e SHA512 62eca3ef002307f383a6c074c3dd956d9035488e1eeaaa4b0e20a6c4d7c328568a2178478e0a97d6b3bfef0c9673a1ae2b58ea39e4e5a2c111b0a34c44398545
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
index 004b24dc3bf0..2ec63e8170f3 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.7.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
index 12c8bc9ea18e..356953230f09 100644
--- a/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-0.9.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xmltodict/Manifest b/dev-python/xmltodict/Manifest
index 205fd74a73ec..2fd31e190be1 100644
--- a/dev-python/xmltodict/Manifest
+++ b/dev-python/xmltodict/Manifest
@@ -1,6 +1,6 @@
 DIST xmltodict-0.11.0.tar.gz 26589 BLAKE2B 29498ac9c2f80828aa24d6cc4866aa6846fe10eb411a3e3617d85989c88628cc7c87ab80adb9ded492545fa2b4796a14b540479da75bfe464d1dfd811bbe1dc9 SHA512 d42ef146a40f386a5389958f890605c560ce9db2da4447099b8725edc1998339b77ea732576fc7e77fbe5a755a2dc3239dfae4a82fc6593c5f977145ab445295
 DIST xmltodict-0.12.0.tar.gz 18481 BLAKE2B f7b7b71a6eaacc833a54369be38aa988b5c27845b19001c1d13e955df1f3a26c04dd2a1b45f0c0e704c4df6f4d380abdda7189944cc45b001eeef55405c43299 SHA512 1ec3de3ebd05adbe032ca569a71048e72097c0f5fc864b63f168d661f72d13d0981e6e62bb9ca2ffe925a3b2f7c2fb90a44177427d4bdf68137842342a9cd2c8
-EBUILD xmltodict-0.11.0.ebuild 649 BLAKE2B 542b6ae1e867abc8472e63b7a8590e005cb5e9a81b63679ecb97f2b481b814f5beee4b34fe4dc4ef01f61321485566324bcb90b8d262929d179635bd65da8fbd SHA512 25baa1cafc2c46b9827b8fda10450d9120e3ca61d5775a8aaef04b037b4f454fdb61bd5f3816f00c0dbafd86d3446850583d7e04e6c69d5942a651beaa9e4066
-EBUILD xmltodict-0.12.0-r1.ebuild 535 BLAKE2B 3a70cbaf035d005b60abab5ae831670d873f907afe5b32eecacca6a02348c38d447990c8847c140f754cb17502854d129b3fe1ff7ea45cbc38dac25875b7e3ef SHA512 027ac5945a1b74e06ccdc6f949a6e256c41c00950e63daa7d91f4b1618c3b66ef9acfb19f02ea8e07d92f58ba0850a5cc57895167e671b251ff9d9adf24a3f7a
-EBUILD xmltodict-0.12.0.ebuild 654 BLAKE2B bb75a1f7bc35a7200922f307950aa67a0fbcc0ba83c7211d181df88966b0d5974634a73d3927f71d1833d3a5df014f5cf7912a615fda8963fc8343bd5e14bcf7 SHA512 b00381a24880ca3125a33eebbec7cbe64053768f22d215c52204aa473d31e99a6a928dd8ad1946aaafd7bb49a6486b6c9d6114e8860bdfe29b4391e8287a38ae
+EBUILD xmltodict-0.11.0.ebuild 645 BLAKE2B 3f18c44821e6ec59aaddb5591db656cd11affff5869ed6c67a593f8e197a559cb9806978feec7c66b1078acd010731b42b229506f6528632767e1a4e605a2976 SHA512 7f81f601b8b9c92d8dd9ffa9f5cc8ab160c9801dd16286b8ac2b36076520fad597140098bf32efaf9cb82c9b501e5b371579e81fd6aab12a5034446e917bfeed
+EBUILD xmltodict-0.12.0-r1.ebuild 529 BLAKE2B e54641c614d32d6934871db5851a910fc239258d0eb1cbd20457484a4394da5ef7e36916fc92a31645f11623044ad983428909fb007e4c574df7d1d91a448cc7 SHA512 097ba2ee78566697edb65ed4abb9211083a58709e6609d7480982d469c928ee367c93ed57f04759b114cf7f3b8ad98d095bcb94657ff662d5ea1f23b03ea49b3
+EBUILD xmltodict-0.12.0.ebuild 650 BLAKE2B d09a4fa2765a3ff120ee7246f0c2e3e250c170e0afed78d502a11e492a576ecefa22bbc397356d0ee3c0f79fd314220d9d8c6134596978ce32bc390d84a4b6dd SHA512 dc51f0c23bb866b128c5dd457b99828354097be126271bace07645a17375922b13b856e5df9e2c4539c0fd71dee28ba0362386c1eda6c7084e186efa231d6f92
 MISC metadata.xml 385 BLAKE2B 6df98f89bbc4f9ce1e05dc86970c81d31f70559d4b87fd4d3908ceb1183906c1195544b2e99e96931ee26985f5e02b7fb4b036d8e6cd03c389cbe5764b964111 SHA512 ad748afd533651881c58295101e82097a0c4f4c15b205f4836315832ea3c08ee7cbbe18f652d09048c08532a3fe03b5fdd1f9da48d3378fac8624984c74df794
diff --git a/dev-python/xmltodict/xmltodict-0.11.0.ebuild b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
index b73a4dfc4efd..ac46c50b0b32 100644
--- a/dev-python/xmltodict/xmltodict-0.11.0.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.11.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Makes working with XML feel like you are working with JSON"
diff --git a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
index c0151ef824c5..1807b9ad43cd 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3  )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3  )
 
 inherit distutils-r1
 
diff --git a/dev-python/xmltodict/xmltodict-0.12.0.ebuild b/dev-python/xmltodict/xmltodict-0.12.0.ebuild
index 300aef62099f..65ce209c0944 100644
--- a/dev-python/xmltodict/xmltodict-0.12.0.ebuild
+++ b/dev-python/xmltodict/xmltodict-0.12.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Makes working with XML feel like you are working with JSON"
diff --git a/dev-python/xstatic-bootstrap-scss/Manifest b/dev-python/xstatic-bootstrap-scss/Manifest
index d2bcaaef95d0..cadb17028e74 100644
--- a/dev-python/xstatic-bootstrap-scss/Manifest
+++ b/dev-python/xstatic-bootstrap-scss/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-bootstrap-scss-3.3.7.1.tar.gz 205503 BLAKE2B 29a2047ffd37ef2cf061d84396f421656f1d29c23a5995aca5eda6f30aa67552063d01a81e5f5c0223d0c9bb2e761774b12a0e567e12b9b854a6fba330e931d9 SHA512 523f0f5c4b3d95f2751731964a046c2ec5d7b2f52fd74947f240f51539615989a26bae19b2f689b7993bd0148cddcfbd9f44c6775ad240a6d6bc9421edd74b07
-EBUILD xstatic-bootstrap-scss-3.3.7.1.ebuild 724 BLAKE2B 4c0966729984786b6b8cb3ae6adef87e5ba7f54dbd03c49928fcb89a5ee69ed5b43ac78927cd1a60dc99c7cffb4d1e6bb553a4496f4502d777ef805ad904762c SHA512 bb00f472b436843c6434619895189235c1cbc4177a1e3c57195b69301305fb49f0f799b097290d75c4c3bb7f597e07f6ca8c722504cde271cebe0271b959a5df
+EBUILD xstatic-bootstrap-scss-3.3.7.1.ebuild 714 BLAKE2B 4410f451d653b25f53ab59bd2e03b16c2a539711f630207917fbf6143f37b01ff48fad396341c9c433d6f9041cf65fd1b8b1010fef73a961a448f09fba2e4238 SHA512 b9258c8f3c2dc00952079ea10510fc1929a936448ba368b7693de1be546b752cec12551c3eaa8a5507341d11af3d99ac1a49739982c464dbf65344f1fa746ee6
 MISC metadata.xml 343 BLAKE2B dbc8357d35e47c91214bee8dcd23c5d88e093d88a0c797bda88c25f41a6d2388e5c5cc6d9d6bb100e79dd9631029b8b4c1277d4189a9db76591499fda6ca8b4a SHA512 08754400557065ef1ab62bec132de871320cebc9d704bc4458aefec2bbbdb576e1ecddec6936175bf1d5bb66e156f29c95dbb969f5402921ec423fd863158b49
diff --git a/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild b/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild
index fbadb9293d29..789433bba7aa 100644
--- a/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild
+++ b/dev-python/xstatic-bootstrap-scss/xstatic-bootstrap-scss-3.3.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic-datatables/Manifest b/dev-python/xstatic-datatables/Manifest
index 2daef7cfb16d..e781809c302c 100644
--- a/dev-python/xstatic-datatables/Manifest
+++ b/dev-python/xstatic-datatables/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-datatables-1.10.15.1.tar.gz 209907 BLAKE2B 3e50c41bd5ec94386beb03de4d1fcd28cfa0594158232c2765a4f33512e1e1c822ecf1664f102f1cdf0204b81ab58eab38f6abdbb8cc196a29c16487d43029ce SHA512 33bbb9821b2acea56f2e85aca3a41433354df82455d47989c322fa572c5bb880ff7a9cbe9d9b556268159a3e9a8140a5d7215a4ecb8704db3f6d1e44860b015c
-EBUILD xstatic-datatables-1.10.15.1.ebuild 712 BLAKE2B 20398e2806c67c7af18a4f588677e76b4c9907675174bcb7511b0c35b2a9cbd74a81d081bd34102502c09661dc11893f02bcaa9579011133c2f4c8f9008d812d SHA512 6d0910d1402f55116e86012e3ad6605cbf6bfd2de8e49ff312dcfdb164d7acd1e9bd9e0f06e2fe2c7e616af875da76d47cd27f5832e1b45b694b9858e6f5ce2d
+EBUILD xstatic-datatables-1.10.15.1.ebuild 702 BLAKE2B 4048a4301acfd007c8cf721fe0f9888a3a67474c9acd8b3638917d36bb998e62574d817f1dd8dae8a2a50f4c521d825acc25c13da6eed5524388ef457414a525 SHA512 3f70bf681e9e83637d481867b281ccc3f8c6299e68bc1ca04a4d9ea5a3eb7aad25f73cbcf603e072b0d22dfee405b1b10a31e769f8bf8848a4cb7d0fc6bc1e6f
 MISC metadata.xml 339 BLAKE2B 6ca3b9bbad74fe5cafbc6dc701361f131c6140328fe031d8368277e5874a05426099e5b472a7fd45ff5614d031160fd0a626910a12cd71d3ee05630f57e107ce SHA512 ff3e268d4ff1d113b64ae85dd14791539017bd0b0c9924e10517d3faff1ac8df7f9ecea3deea122eb9a750f63beb077505d16d0a71a84a7b285a97ec3cfe66ff
diff --git a/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild b/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
index 00d8da465448..6c4a8012688d 100644
--- a/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
+++ b/dev-python/xstatic-datatables/xstatic-datatables-1.10.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic-jquery/Manifest b/dev-python/xstatic-jquery/Manifest
index 937bbc82ad6a..da187f9a005f 100644
--- a/dev-python/xstatic-jquery/Manifest
+++ b/dev-python/xstatic-jquery/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-jquery-1.10.2.1.tar.gz 116458 BLAKE2B cc02edfbbab45bbf397923188f163df8c6567789d9c0704947804047f0067bbee9ddf0b1b96d477d25d79bc65bc4bf5891e2a88beeac1ae92279c0eecc842304 SHA512 1f77c82d0025ba0fe56934d76fb5dfc0929bd91b18e6141023246e5ed1358600cb10a9b69be806bdfac29df83e42572ab8c8aa8da40b688d02711aadff393270
-EBUILD xstatic-jquery-1.10.2.1.ebuild 700 BLAKE2B 74982196862a5bfd77254c86b14aee33f3cf7597519c6ac298f6d50263aaf793aa1ffc3057590b1da73b5ff728ac621f01154e1d450d17432edbcd080843c5c2 SHA512 85124618a856c96ceafd28d434c5e81bd579c7ca6500fb6f168fa1903814b113fcee9f7d23e6860b015d4a31c38b748a70062cdc84ddc51bde6642d0a6be0ad1
+EBUILD xstatic-jquery-1.10.2.1.ebuild 690 BLAKE2B c849fa1c92f1da418d6d251c87126c7e513952c5731943cda6c84d1b940861d83ed59c4ad5c44504e455ed5cb893bb6e07c21545dd8b19978b6bd34fb8840606 SHA512 b89eb7c34f6f94eebe10de6aae1d6323ec9fb97986f356951731e8b469a02c50c28b3b25353dc24edf6f34b7dd931a88cc69db5cb27e4cd3aca3e6b2b19d3f72
 MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild b/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild
index 93c4e97957e1..931ec2ce5463 100644
--- a/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild
+++ b/dev-python/xstatic-jquery/xstatic-jquery-1.10.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest b/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest
index 414a07fe54d6..7fb4de1493f6 100644
--- a/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest
+++ b/dev-python/xstatic-patternfly-bootstrap-treeview/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-patternfly-bootstrap-treeview-2.1.3.2.tar.gz 19720 BLAKE2B 930f6aded2b42bb49b7b7865d64ff21923f720d15b375b018621fc1647cc0588226308e7c362d436f22074782a0e55ce7851fffbd47db1ea9c17f197e39c7e15 SHA512 51c3c60a56390b2c9662bf54a72a485ab0fa17872cd4163785c20b72fe4cc70b7a019214c1474d720e13e91eff807f0497d50bfaf5f3ce4f52a1bd488090b041
-EBUILD xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild 769 BLAKE2B 5e0fba52bf74265adf59660897ba3371c9213d04c89c896134f8f79e8e405b12d6e3b5b7ed5b8e396b8e4b629ce868629d164e787a3bc52d02977d233313827b SHA512 3f5522ebd7dafa098bb0a7febce6c6998788706ef981b757090ce58aa56af7929480762c15a94e24bd4a32b96e8bddc57f3611985d83340cfb17317711d1a897
+EBUILD xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild 759 BLAKE2B 7a8a7c0960aa5fac0c3dd893f47f052baa3349c8f70e0df6e785151460ba23f14ba2c3543a1e65ed62c250aea81760494fe540cc087eac310a2d4ed5682491f0 SHA512 5b4f69a66bc8b4f7c6d5f3a6de60e77a89c16774bcb7e868805fe083682963996ae0c633b8977fcb9dc0ff5ce8681ef2efb3c7be9bed9faa59d3a8a16ce9f1ad
 MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild b/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild
index 1b3ab7f747c3..8c3f538f55e7 100644
--- a/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild
+++ b/dev-python/xstatic-patternfly-bootstrap-treeview/xstatic-patternfly-bootstrap-treeview-2.1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic-patternfly/Manifest b/dev-python/xstatic-patternfly/Manifest
index bb9d32967820..19ac040a6e55 100644
--- a/dev-python/xstatic-patternfly/Manifest
+++ b/dev-python/xstatic-patternfly/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-patternfly-3.21.0.1.tar.gz 5674553 BLAKE2B 23d14689bfd43195b26f818a0a766aa7ee3f70145baf776790dc642b09a38285370065538ca38aa85ed13924feadff2c97beb1c88026fb98a5d38b502c86ff76 SHA512 14ffebfefe00107cae16d6f2a6cfa11bc7be5b4cfec54f6fe0c0adb0d22b4730870ddd382b202d3489032680d9d4a43aca8ded4b654c44b083ee36c18ca70168
-EBUILD xstatic-patternfly-3.21.0.1.ebuild 712 BLAKE2B 8f4890befce83e70c5048c33ab6b296700d3d7e3898a148572d3f1ecac6ca8330225a5ad5ba737e6695cd6e1098d68b64dc0416d8b667212e0bb8747e9cc0942 SHA512 ab9132cb7ae492ac6120baa1c4c7b9524c02e22f2c43ce2b2bb96f1575427d71bc79ccde41241da319fb3588693819c96b2c234d37e41b98b58d165215c3f151
+EBUILD xstatic-patternfly-3.21.0.1.ebuild 702 BLAKE2B 87409ca84679dc1aee9eb5a393e01100ca8a362801f9aac69ad94f7b503a140b3418cbc1b06f3f60e144050fabbbd570e4ac0bfa38087da9904bc3de648b7812 SHA512 eddc698ddb387f9afbcc93eae60d3c8a26811cd933ac1f4a8394be9e939510143e307fd825608a651442c092caaab8b1848fd0d7283058bb5a15e6961c251c53
 MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild b/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild
index 01fce94f3186..5025bef7a32c 100644
--- a/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild
+++ b/dev-python/xstatic-patternfly/xstatic-patternfly-3.21.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xstatic/Manifest b/dev-python/xstatic/Manifest
index 555841391cb0..637ea8236adf 100644
--- a/dev-python/xstatic/Manifest
+++ b/dev-python/xstatic/Manifest
@@ -1,3 +1,3 @@
 DIST xstatic-1.0.1.tar.gz 2588 BLAKE2B 55e937e62cb845a9095d41b42b484d740557681f4b811522093c6486d97b9e5daa3d12af953bc24a37ed39df58d3adad1cb578ca434b8c0cf0ab4f4b23fff0ff SHA512 03b227a5971959c79c6b389d3bd1f6db724a439101599b8ae65b7d010712184308e30377125bbf24ce84994aa6e9add3d462fba9bee0008154d3753d3199040f
-EBUILD xstatic-1.0.1.ebuild 648 BLAKE2B 41afd370835156df648a07070a7cbd921cad89f02a9ab5a1dd59eee6a35d15999e905fc1668e311547270baea051e5c69e95bcbe61856951da281d1912d29f1d SHA512 9554c0bccf10b5aa0b24ace5342f0d50071111f1584ac12968306385d40aa8fd9dda3c96fbc3e6fb468633a411273f60f78ad9c83a509b0936b21a75ea63c116
+EBUILD xstatic-1.0.1.ebuild 638 BLAKE2B d067f23ae9ac7784b16dc1152554bfad0fe99d26ca7e43107ee0f9ead4a07471bcf60bd763d9768368a7c40030ab5f67fe563c6f00d67bb23c473a6ab2cb6362 SHA512 fdd94dbb13e3797beb7876054c1ce87f656a71d1994679b69be22e708fbca2c648df1366d9f3cd7b0114604d5b258b3bac9b8dd3866a9eb0b1fe2d674f1d3e41
 MISC metadata.xml 328 BLAKE2B cd1db5ebb236344ab7336b3db5f4523fc3730a99a294392907ee5289a17feffd31390be088c02aa6c87a84bbbebd84bb48482cd739a5f55303333083d4bdc0c0 SHA512 883210945f38216a48fa5166057e95aafa03c9aec5a7de0d16303fb6a4e6d98c22695b55dd5fc1d26ba78b7c3def32ac7bfce1f036db32116a9b4e5e0b31a8c8
diff --git a/dev-python/xstatic/xstatic-1.0.1.ebuild b/dev-python/xstatic/xstatic-1.0.1.ebuild
index 3a15e0978d4a..ebf39fd817e1 100644
--- a/dev-python/xstatic/xstatic-1.0.1.ebuild
+++ b/dev-python/xstatic/xstatic-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index 234f2e8e6724..f0e0e7801fad 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,3 +1,3 @@
 DIST xvfbwrapper-0.2.9.tar.gz 5575 BLAKE2B a973e6ca6dd85713e7b350397113d63c15fd284c07d3a0d5c0b8b8dceed65c3a17a3e8222b79ec88fb124175259d51fcd31d09a95183f1cbd091ba11d9bbec3b SHA512 800f3489b2e1bbc884d7651e344ed73783d6c00856f3ab7ccfa6b9058dd6d3bb98d38f11172ba89dff5773d6c5b773bc000786c1f6c6aae5a27179b37017851e
-EBUILD xvfbwrapper-0.2.9.ebuild 701 BLAKE2B f6fd8777f4e7870e0d8f7decd3ed5dd220d5ccb7c6df338bd27d8b173179485192664de8131ce36ee9ec301cde666d7ff3c5817244f094190a06e5b4a361b378 SHA512 309ef6ae753d66c3c7e8e54979869fb7e7b7178be49c28cbd4ec5c99e71b2a867ac8681790ad65d30c294ba45ed5965f1268fb580cc3b9878dea2ea8523b6d05
+EBUILD xvfbwrapper-0.2.9.ebuild 569 BLAKE2B 909ec3236491e6c8ae6ed1e03dbd1a2b6855ea466bd89bd1bed3acfaf166af130fef3d535b003157203363b812cb7ad68100df7ab9e23cb45d55ba44dab8ab55 SHA512 739b7b101c74800bd28313e92b32404978791e592d9c2483976c1fce5d7803a6b471dca365ad3d08237670d0eb235beb41cb1efdbe0d5ac586924c5373e76c7c
 MISC metadata.xml 387 BLAKE2B 1371ad91acdddb84e00b9d88497327d9f969686caeb599467b702da40bc0bb59f324d143cbc285e2739c2afb49bf7984eca78ad9e02a89b8c5697ed21d33b3fb SHA512 d9e8ace17387367e585434a5b178a7a1715973828d6cf762ad82f2c4020413239e87b26dbcb9a8db1122ac57e2b09fe01f0f7fec1b48723cde989c0205b84885
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
index 49aebade00d5..d097e1b308e8 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -13,11 +13,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="x11-base/xorg-server[xvfb]"
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
 
 python_test() {
 	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index 2b6d79b97fb4..1e7a1de870df 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -1,5 +1,5 @@
 DIST yappi-0.98.tar.gz 37074 BLAKE2B 3a2c60f7c5987681f242230fc4fa0b87f924c0d1dbaedd3c240d30e6c440e2604e7add789cfd37052301a1f0ab99c81e2de30249fd6c83d5ba00624e131d266a SHA512 699e1845aac8e3c701c495913862597240b264c396b0b6ad0e9d6d533138caaeb883baeb036dc7b57bddf02ba411475401b2db77527d2ee63409d73b80f32098
 DIST yappi-1.0.tar.gz 38939 BLAKE2B b07b38bc07ffb6ba7aea3728ba6977680ca7f2dcc499778110aa31e733c512e5704cd580d01faf3344849df6772f110472a01328447228e9c45180beefc36f3e SHA512 d743c471ee3797b9f3b24c831fcb4ddf2cec7c13c56e567c0618eeada9a534ca0b114929da623a2c67142c61f3c38b024b25ba5e32883113148f4377f7574905
-EBUILD yappi-0.98.ebuild 544 BLAKE2B 833ab7362d947d2941fec12652cdc5781437f92039bea3412ca51fc749574500922c9769653b252c17fa4e8ff9d7e9727f35df2c84cd9a7274194b1d0aec1b24 SHA512 0cb031ce66a6c04f4299807ceefbfd964f7254c0704a7e0b46d9bcb6318a574ab6a802121a32e6bbaa3b24ec1c4bb5383a2d76141d30801ff99b866602f8eafc
-EBUILD yappi-1.0.ebuild 553 BLAKE2B e053053ac813cca1e6f0c78ed71e52d2e29c3615415bcfa5603c050ab1fe19103a96dcc463d86dad4cc6df63e8b07e6b8f4324215b33db4703ed070040178442 SHA512 f2ec75410970993e066d03598e1fa273d8dcf65ca6a3db570b5854db98664cb8126f5b0e3972b52581bcabf3fac60671dae2706bbd69ba1a315d075f3d60eb8d
+EBUILD yappi-0.98.ebuild 538 BLAKE2B bbaa84da49c32d77667ca1361273453ca7dbed033a61df07ddc736c0ab5562cf418812c55c0e16efd0f0dcf01bd180c89d32d2c357821e8ad560c5ba5e548afb SHA512 735d4336a35c268e1e7e9449bb1e43d3651d6db217698232726e6058396ed5fd54823fb56db244a6a5d4a435cb7cd2e9b8524fb671742e2dc7607c448ab4ce1a
+EBUILD yappi-1.0.ebuild 547 BLAKE2B 7fa3320e99330cc4ff7066bae77435359576e14a428fedc22915904fcb14c82e72a445223456c8502c46fa140b9f32f51d8869d1128c94886b543f4993913cc0 SHA512 6c12e42115de68d28c74c09901983f59196cdd3b8267dbac446ea186d995630806bb37d38115d84df6325ef6d567858798b119d5dc038e17af965829f90465af
 MISC metadata.xml 491 BLAKE2B bd3b3283c39af67f7a1f55891d3168bf6bc054052007bec6303016d3f6b513cd20f94c83f427cd849b951102085b390e69dd4ac2d2d44a6b31bb5f1ff3f10af1 SHA512 d058a5d7d593e801967cbd8764ce0e55480580995a68cd3d35802932249fa015267052895d360fc13cda379333d1cf8222e02f486e68477afe1e2af1168731fc
diff --git a/dev-python/yappi/yappi-0.98.ebuild b/dev-python/yappi/yappi-0.98.ebuild
index 272a40e1703e..9d567d63673e 100644
--- a/dev-python/yappi/yappi-0.98.ebuild
+++ b/dev-python/yappi/yappi-0.98.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 inherit distutils-r1
 
 DESCRIPTION="Yet Another Python Profiler"
diff --git a/dev-python/yappi/yappi-1.0.ebuild b/dev-python/yappi/yappi-1.0.ebuild
index 9da154dabb7e..05de5b9581f0 100644
--- a/dev-python/yappi/yappi-1.0.ebuild
+++ b/dev-python/yappi/yappi-1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7}})
+PYTHON_COMPAT=(python3_{6,7})
 inherit distutils-r1
 
 DESCRIPTION="Yet Another Python Profiler"
diff --git a/dev-python/yapsy/Manifest b/dev-python/yapsy/Manifest
index 75874d7ec873..b4aeab4e3841 100644
--- a/dev-python/yapsy/Manifest
+++ b/dev-python/yapsy/Manifest
@@ -1,4 +1,4 @@
 AUX yapsy-1.11.223-python36-tests.patch 919 BLAKE2B 51e27515c9e4a129a11aca1e9f37859e0e74386c499fd093e304a27e72d104733a66e643de5303e6ac18df6ad16b2de840025d255f062aa360e3ff18f94dae66 SHA512 aa345024f6afde87f9e3a64da87778f1bd620cd8490d1c564cf74f3a5821eb034d94cf5b464bf567725972122ba78a981cb2d120b3e0f35541a01ecd4f97170a
 DIST Yapsy-1.11.223.tar.gz 80783 BLAKE2B 44f1224f66a35e3ff01d0fb0cf1e0c46fe7932d6fe2ddbaf1c7eed72b7324d8e9fba7be2d32cbec93f33a6d3779b17eb979af751778f672bbffc1119c912e30d SHA512 690d0ab78eafede5a75cf7b7bbcfce00b05c7b6f958980c3b67815bcaf848a8098b6e81afd1d95c5821fa4bb7affefab2cde208ff7c8ac7952615c8ddbafe305
-EBUILD yapsy-1.11.223-r2.ebuild 971 BLAKE2B 50c096a787ce476887f24bdad44a0ac116de4da1db614b45ee7fa220dc082fa8b7f05bc433e5e20b3f710d584fe54b3869690c0a00e2ebfab85be0f527b84a74 SHA512 cc3b0c960166e3e4a3d3f0279afae6c94b6e50004c4efa39c5e40bc190334ee324c8ccddba6a7e3eef23caa5387e4ef84cecbda2510d4b066002df5818191783
+EBUILD yapsy-1.11.223-r2.ebuild 965 BLAKE2B 21317db9bcf631d6759b0b7a07f41c7536b1578bbb125e43c95f68817c82de7583e355f2a0e0aee9ab6ff93390b83396aec387fd3e7394543a05fce032d56f0b SHA512 7cee67403c24a8a8ffef4ad46094442375179262ab3e7f70609061a0b06d2de026016baba3337a7af1dc3c745aa6b8ae84111ee99658b5f54fb42aa0bdef02e2
 MISC metadata.xml 423 BLAKE2B a30bb50714d2efa8d7bf299e53a3992ab24fd55ef2670fc7a15f25ed6fd864fd112940b0a202491307de2f74eb339292e32a475a7cbe89cf1dbd2ea4f6f47b8c SHA512 73e423d31a622b7b15bf672cdbada8378d069954acecdf6d729f05ca4297ef01016519adf362b322dced4694de829f079c80a17c836b5ee458b772a3c5fd36d8
diff --git a/dev-python/yapsy/yapsy-1.11.223-r2.ebuild b/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
index 8e3879efcd33..92804cbeb7cd 100644
--- a/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
+++ b/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 
 MY_P="Yapsy-${PV}"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zc-lockfile/Manifest b/dev-python/zc-lockfile/Manifest
index 1e6fcdec77d3..11d0254c6fec 100644
--- a/dev-python/zc-lockfile/Manifest
+++ b/dev-python/zc-lockfile/Manifest
@@ -1,5 +1,5 @@
 DIST zc.lockfile-1.4.tar.gz 11075 BLAKE2B 4fcc18b4d337c1b102916588aef7271fe189f30e442b5d2180b5a20d804f84649d4bf9dc6f601e6b7ee38c4a436c3848b83cbcb1a19974acdf072347b6822b83 SHA512 f145c34088770b50002d1caa88876f9fb11f3b9810fe68b8e1a38d27084d27ce058883228469abb05811f3f11a7b94acdaad8392eb1b6c34c98ddc885cdf77be
 DIST zc.lockfile-2.0.tar.gz 11923 BLAKE2B 7609f64eef4521f0aa95dc899b253570a317bd997cced00665a2dbe22cf7f834ce75daaf4fdf79520157dee31742758aad1844d49c5eccb780e7d5fd2e8e5ac5 SHA512 2586bafacb12540383695a24cb01fd284e61bfa3fcb16431ed0e91278e547c68983363fb69c1ffbd54f7c22db43300ba018ccd2fb3e21666c98860415b7a3c3b
-EBUILD zc-lockfile-1.4.ebuild 1111 BLAKE2B 1729d2d05c835a3a9490755dba0e72dd09b3ccb4bfad2154d2c6bab13d50be5f2fd97e3a67f93164b40f9ecc7bdc1f0e20fb11f1213cb8dc1757c2b61c17fa57 SHA512 bef3b5165e8a9839b07ee0f4a33175dc2885a18090d0305d8d75b48b525411153bb19fcd4dfdfa0134e46b372eaac0b86d0709c4fa9f1ea83b15e4e3a5253562
-EBUILD zc-lockfile-2.0.ebuild 1047 BLAKE2B 90c871b949a93b7fdf7f11f2a88ecdac5fbdda4428e9f7270cc7dc0b7c5cc50a56c4972b4a303ee74f19abd498a48af2e96f145df6b52b6f9827fcadcd234d40 SHA512 68ec87c47b87f18bfbb43fd6fabea87a5f3cc3f3f621b8c52a4b8ce68e6d92112c6837565714120a9dbcd865d9370177fbec314d04b169bc283b3f7ccf459b51
+EBUILD zc-lockfile-1.4.ebuild 1107 BLAKE2B 96c5b6dee80353a87d3618611f6d6ba0221abf507e8631826bc73ac306298e7d5995b4425bea1e3f5402e85cdfa63ae6449b737366b1183742290b228de9d7cb SHA512 0537cff770e012007c2719e05ea2348bb2d65b5563ee51e840c73df02b64f7008a23bc6a021c01f1b355328859f94e11cc5ef3e8997193242e14b702411cad92
+EBUILD zc-lockfile-2.0.ebuild 1041 BLAKE2B b99209f1993f0349ada79c62d187b5d258d5eaa806b997533e401449ef23018b50f88741de1f68eb1b6c73a37e2efd0d8ef2b09959824b8070ee47a94c2be520 SHA512 6e353a1cd6be36254be2014d646dcb5f99af087afa85d3886f708a2c019376da38432a04d84e56a82d3bf20cd708f93f890c71bf0a6fb2435e8d6285573ffeb0
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild b/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
index 0cc2e04dc84b..865969ca4049 100644
--- a/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
index a92d5f9a547e..29d32611f280 100644
--- a/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
+++ b/dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index e537c128b9e4..383d41800484 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-0.19.1.tar.gz 22769 BLAKE2B a63332d70c5610da4fe44cc32d106893241284c3f70b5d6f55f68e3b3dd045a9c39b1009e9dce0b80c836d5ab0693b99974901ee664513c36f34c31907162d46 SHA512 1a7ac803caca1b230eba6c4bcfb714613f218850d9373ea0de609a3c9a509d13acfd14d64f9efbab78637b74aebdf385cf2deded1ff871fc6f3aea4477a07730
 DIST zeroconf-0.24.4.tar.gz 51866 BLAKE2B dd71bda4b0759c61a3e5895e766dff6516ea81ca0c8c9f5a95a8093de8a3a9b15722b99a6af0092b02c1b292bcdb11c02c9f165003b56ca8a793f4a4ca8fd891 SHA512 71678521b05016a7404005a06c8109f861cc8bfe2b3375ac6f1da8f63771271a3d9a095a8db6ccea2e062c5cc28b750a50fbe69218de72646b13a5f03359ea17
-EBUILD zeroconf-0.19.1.ebuild 958 BLAKE2B 4a706d32d42e9c7111c6fb0f82e673d50eed811ddb93cce5e3efacbb6d35ab45024aa29ace7b4abba221568afdc2e73c152dcfc1cdb27284bbb5fe6296bf4997 SHA512 92aec4734cc62dbf8618037445c3830c0496b2d02ca7e3fa6f5ab94e5f6ccb1e3def6e7d846228f5ea61a040406f5558e5f7a71deb9605f35a8d02847f860c64
+EBUILD zeroconf-0.19.1.ebuild 952 BLAKE2B 1ec1e1048667cb166f2ed1d3737e34437e519a7ecf51f39a7999d2c18b083eb36dd0c30ccf30416006bd1c9fd27c596d5f1682e128ccf8391cf1a786410ed7ab SHA512 75f33c04580fb466b02d51dbbf3f14f5ffdb39eb35eb56baefe04b168272b6315d9f3bda5e3086119f59ac3ca33850645069f78ac52a73ca988abab42b4b0c56
 EBUILD zeroconf-0.24.4.ebuild 878 BLAKE2B 78a537d2724242582ec57e70d34e3fcd4a4fd9469cc009cb1dca6903e58674e82fab9571649b402c65accd2c96a7cbfb0e9022e2f7c15a944d675998dc1654df SHA512 182988670d3c7602a8ec714b3ab07effba241187246488fb15ea672011a07bdda9e769aa4535598704e5588b8d8a0e280cb9fccbc66aa15177499174907b2669
 MISC metadata.xml 387 BLAKE2B 9dea981cf6247ad6fb6ddb3b060671ddb031ec703dc00e61e2efb4909478d01b5dfa309ed848dafe321d388156d16f44bc7b803dab79731205e374b5f046757c SHA512 ccee11a4aad084b1ac1dd901d966e1424b7ad3769b4bdf62c2dd44f9cbb6ec1a566443967ba45b37ef6241f43d2a06c17ebb5028254fbf40e0a480fcc3d76f89
diff --git a/dev-python/zeroconf/zeroconf-0.19.1.ebuild b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
index 1c30f94c58a8..8e459a8b24e7 100644
--- a/dev-python/zeroconf/zeroconf-0.19.1.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.19.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index 2dc3ad1339ef..31f485d99602 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -5,5 +5,5 @@ DIST zipp-2.1.0.tar.gz 13758 BLAKE2B 1e1c0e0a7d6b7116c12c8f2af8ba9e807d203920450
 EBUILD zipp-0.6.0.ebuild 1196 BLAKE2B f4c446a07369d5d45f2b0563f070ed38cbf353bb66ed7453ea0931d9cb6e9fd77499dba623b869076e8b02de164b72a0bd207ec0238215bee77a751c73446427 SHA512 9f6570677e31aaf885bc458d44c8b9f6e2a67066fa5f284e5ed3681ef566d9caaf94064ba31563e1c881196960d47ef8a67da010180150a7a85adfdc14b4ba35
 EBUILD zipp-1.0.0.ebuild 1174 BLAKE2B 205255bae18e580668df8b3846b0afa55b335354539395dfa82fae4280c369b4262dba4b41c473a3f062f2dff7ff320b7684ad9416f8a844ad7469961975509e SHA512 a56049b22f5f50283fe43688f05702b95bfd54de25d2e2fdf5c076e28a4dfa65d057c52ee99a685f39af9ae0ae8e3b3f15173030f8f06e82b42deebee8ccbc72
 EBUILD zipp-2.0.1.ebuild 913 BLAKE2B edda049af7d5ab070af46d8462496fd14d8ac4168bfd43c3b0a1f804d45370acb97248c84ea66a412554354321b522b8b47f03e37fc7eeb637b9fc23ab9dd72f SHA512 abfe9bf84a3e07145769ebb30fe35d9229daba3783a4eef482f89c5bf3dfd5e1e2d39761f841f4587495af796e6af4c01c4b31c82a48a79dbcb3e2efe471af13
-EBUILD zipp-2.1.0.ebuild 864 BLAKE2B e795456eff91f50caaaf0e0e5d7330f6fc1c13e9188ac5f550c5a5a55686164fcf88ed7e90e9eedf8743bfb6740bb7781726b72f0f9b0419d9566072509164d6 SHA512 c89efb3cfdcface4607e9a78bda1613f038c227d8ae408879ec2fe3299f0aeafca900b26b7ecc0b1930ee3d11ceea1efb0224d0d9518d94ba57b5250ae8f23a5
+EBUILD zipp-2.1.0.ebuild 882 BLAKE2B 2a288ef0353fde3a521cd370a3ae0fd9ee613c606d9d9be249dd0386824d465f7166c182e23f1be2967649d381c628c35721d1507989d7274b4318aa916c79d3 SHA512 ed4650c30a0f1a685c8bb7674f62757f67202462a9567ea5cea72969b68e2b659182e0764ce969abbee0da37904ed09f6ab09f31ead7153138bfc09f000ff42a
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-2.1.0.ebuild b/dev-python/zipp/zipp-2.1.0.ebuild
index e7606482038e..e49c6c90fb83 100644
--- a/dev-python/zipp/zipp-2.1.0.ebuild
+++ b/dev-python/zipp/zipp-2.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 2dacc550b3c4..72879f01c004 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index dce7e6ff60c6..bf5393626517 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD assistant-5.12.3.ebuild 1174 BLAKE2B e7d9543a813dd923da65f35766b922c8963230e043671344d47eea80e912d22165d629a4db5f602949d8641f04c197ded487a1fc16a78e9d17f696e6df5759a1 SHA512 18ed2c34062cf8913355ac49f6d99ef82bdeb97e84d81cc481bf782d2597de4a41f162066b593c02b4b7b8ffb5b0ca052a602239c39c9c7757d7a9d08092d06e
+EBUILD assistant-5.12.3.ebuild 1169 BLAKE2B 4750147165fbc211930cdadd7a54e3dfc6998979183e247ca6488b26fa6ae82210938938d85bfaba417bce6ab021679cc7bac4f8ca36e2dcd34c8ba111ace265 SHA512 51e78902c8edad21d6ae5cf20c9584bea9909ed2902215e19e75618ad72e5ca41688069fb76f453bdfc7ef3eb5b7e7ee2fde6f21119aaf7f7a027290dd061fd6
 EBUILD assistant-5.13.2.ebuild 1197 BLAKE2B 426575eaf982a93c0aa9db924ff58a67e566d51910c34f1fcc9001bd00af2a1cb27f8e3bb6d852a39f5cf10aabc8f85c19bc4aa02ad153c8a046973c84ca8683 SHA512 ee0b54cedf808c0be0d0dfd331bf2cd38f1581fb07b23f0503d45477fb9f67c8d85681d425fbcb22837c9f94aa477777f5dcd0381222f3e6142b35fff5d64bf5
 EBUILD assistant-5.14.1.ebuild 1200 BLAKE2B 11f1f353d22572a76a4b1c5aa0018ebbaa6907d2df22c1f3910126e00cd56ef0efde80f7edaad140275eb1e19f38c1202537a0349281db320f9eaf6cfcfef174 SHA512 1d2ef963036eeaa79d1506aabad5c8a0063569c6a931cef5ecb9ab5b4893e2e718424307cb08b54ad511ed8f57c610ecbbd08aeaa1cef59500900d7900675878
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.12.3.ebuild b/dev-qt/assistant/assistant-5.12.3.ebuild
index 5a9d7abbba90..e993110952ea 100644
--- a/dev-qt/assistant/assistant-5.12.3.ebuild
+++ b/dev-qt/assistant/assistant-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index be5bdab5f44f..b5e30ef831cd 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD designer-5.12.3.ebuild 1222 BLAKE2B 84271383059666c0312ef5c1551b8b8f3452643f419e0cafacf101aa795805705e0dfb93c6a8ef42db876907d7169425354366c166a027e4e4ab4ab4f13c09e2 SHA512 9475c02d7f23ded348275936e481230da3659648e696bbf897558c7537e32419eb84684b55e996d6d5c9d78ed53be21d27e4431e70db43ae9d4e5bf19afde500
+EBUILD designer-5.12.3.ebuild 1218 BLAKE2B 8e635d69ee2fdb5d3d1867704007a11d07e476e0aa0211b25156dd31e7d3375e182763ebbe2b7bdf2b899c8e37dd03b51ef9f12e9580fcdbc22c889c259f1b4f SHA512 559d6db83d645e8ab3ca150be155bafa4d0b98b075093e5d2b16871842794cf0f78416e2061226164fc92bbf34a3eb68e40adf26ee178483604c00e12682c99c
 EBUILD designer-5.13.2.ebuild 1242 BLAKE2B fefc1523c4b88ece87b452580a5ffb0b0ba9ff6560b7cb0d21318cf6098a7f63e49e5baaf58a7071a46782473d13f410e3a9f652b54f543a2607b6a06570422b SHA512 36b587dbcba3cbdb1d034e2e8e6003fd26e946775a599e0cd1fab22554542d42e6628b4b4ebae6db80e240534f5bce9c9ec66fab1ef3d04baf785cf8d61ac897
 EBUILD designer-5.14.1.ebuild 1247 BLAKE2B b23a0e0b3d596aafb1bcf36f4259d88c2b8341f45355bf4b2297e2ff854721b0900b8d9b8e7728c6337a5f927adb34bee279efb5f5ec3cd7244762022b47c9d1 SHA512 4cf5d947d467aa06251c65bf3fabb66fd5892801b97fc85709c733707659eff3c57c8fca1ba8e6974a1b63127fbef879bad2080d13a3bad6afe6cef26ea6dad4
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.12.3.ebuild b/dev-qt/designer/designer-5.12.3.ebuild
index 6770d674cda8..f2cb763f33d1 100644
--- a/dev-qt/designer/designer-5.12.3.ebuild
+++ b/dev-qt/designer/designer-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index a1df9772868b..d80bd1f04536 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD linguist-tools-5.12.3.ebuild 644 BLAKE2B 4854488e369bbc4dee8cc274ab66f1db06162059c095b96da2d806fb307ab84b3a331d0ad8e2c6c637b7c590930d29891f55663f0bf5ab62b83912bcc65e78d5 SHA512 eaf9fe02e842b7f924f6c89d68a4af12e50d3f4db79ce724cff6ec1ec67794b1d952f3d78c011ea68f5898ae570adfd8fe9c1525febc43c4be18601eaaabf252
+EBUILD linguist-tools-5.12.3.ebuild 640 BLAKE2B d440c1c230002a677d43f888d449b64aef89960c201cf747e62b539f65e2768958c9dbf66833ef4b6cfe7fa51e3992eb4169589a4f0a7aae2e4285b8d76da363 SHA512 1879ead2ef9833f285f2f4fcd3d607914c36043a5145ea66265c3b5d6e19aa224341a13456e0f73c6bf366843568c5ddee2057249f1a71fcb7cdbc879061a1de
 EBUILD linguist-tools-5.13.2.ebuild 680 BLAKE2B ea51f5fc4800fb93505d938130903246eb562d0f67a694a385a90558ca8dbae76fa0680caeb3c522925cb9c84e911268e3d4ef1fa399df51b8203bc4b2b30bad SHA512 de5af56af1145b393a23895189a0bce6654b3abcc975937464448052871097417c3308aea7ae9efece1700436167b701a3d8459210509d74f73b9b566a3be550
 EBUILD linguist-tools-5.14.1.ebuild 685 BLAKE2B f767bc5bb0b8bb1110f83e9656b166246c539c45412801cebed81a7b3fa29f089046b3f2c002ebd1a9933da38a8a33f516a972d550403e1a0244f2e5ae5f559f SHA512 4018116f85ab3578def0086492e05f404c7d0bc5b86ef187e74217765aea90e984cecf0017f868a1b8d17a8376f2d1d162c6120cf65c9fafcd1d348665927474
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
index 25b6f2ea326d..ccb73694ccea 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 2a075a0b6894..5911ae27c9ef 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD linguist-5.12.3.ebuild 956 BLAKE2B 855e3bf1815aceb12e519590199af1120540d436856459f8ef9b825bd83ad9e0d71d88ceefb0d6a37e76a9788726bca37a9c375cc8110263507680eed7490281 SHA512 8dd0937d145764f50e90e532b6b7aecf47a9e8c7717edbf149a8dbeaf6e2d61c21e030a23e9ad06e2c81c193223218d2df690f431d179af5452924a85a48c4be
+EBUILD linguist-5.12.3.ebuild 951 BLAKE2B 4c9f4cae85900c5b5c2d96b11d78e9a9c71595151f78f7354cc553c608adacf5031e3510bec87e52cf1562b5b9e6799d6a919fac156faf637fb377f6aca4a465 SHA512 c8486024c2791384f7bb2702442eacc75b5bf6350cdcfb8b1759a7a8cb8c03e2f1918ef0b26bc35f019b8075c5b0ef3bb72cd74a898cf8e4eb5f8d23ffda4000
 EBUILD linguist-5.13.2.ebuild 972 BLAKE2B 5aab53fa6aaafee4f7acbfea77613b818b39cd15b208eb24022c54587537d567bfede7f49f77bf41fa414016ca9b54ecc91fc2e4070c6ea286932b34f778eabe SHA512 95ba722a30d89d0e9916a2facac917f1594db13ea457a842df8fa1d5c823ab06ece5de7ff8653b04e6fd5b8e6938a82bbdf075936e07bbf9d89b87c722abf675
 EBUILD linguist-5.14.1.ebuild 975 BLAKE2B 20c204f2f9fdaae48b70c026863a45b692ed257365aa900e2ec0c7fd79ee18e1a574464127554e83df56bc3cd4f8c65822279fb84858e23533d088484286a72e SHA512 fa959ff3a2072c205576aa6ca0a4007b73ad388e568cb6509a6c07661678c87fdea00bb5136dd84c289b23a9f68c1d796b39f46244b5d767bc1eeadec25ec05a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.12.3.ebuild b/dev-qt/linguist/linguist-5.12.3.ebuild
index a8112e4388cd..974e26c2fdd5 100644
--- a/dev-qt/linguist/linguist-5.12.3.ebuild
+++ b/dev-qt/linguist/linguist-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index e1b0692a64d3..46a1baf032e5 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD pixeltool-5.12.3.ebuild 403 BLAKE2B 2d698cd23a7cffc84b2f5481b1632116c5b720a5f93b34adc3c0620cc3a21074bc366398b34ea90dde2a80b08bb14ada7383ea2cc7516805679ba563f116aaa2 SHA512 0492ea093e53cc5378180a59d8cc3bb7394699c395020bd4f79332a467dc1a5701f46ed90731cece55d94deed85aeda06b35b9ba567e5dbd9abd6497d3a94699
+EBUILD pixeltool-5.12.3.ebuild 398 BLAKE2B 190959c12900ef072e3bfaca05fb348157dec52ceb87ec1607aea05b355c9968a853fe51b8a41ee34040c30cf6fb6045ee9291234604636245a561788052cf4c SHA512 001bb448f2677932aa6caac134429a620d5e0f4a1509b567cd1cb85bea18442a083507c30e97af6ab452c7c6d11dfe1fa5cb085eff4a6bfc74f6a2f93ddb1e40
 EBUILD pixeltool-5.13.2.ebuild 435 BLAKE2B 07ae39e51a8522b672167641468a4a62d7018e4bb3226011323d07602197b6667311266cfcedf24ba0b79a2f06902edd42579ecb15581ca00abffa943cae3f00 SHA512 545f72fa35c8e7b2a5932e4654a029781fe8083854f710041f9ffcd449e1eb198170f7ea0322f80f4c6265eabe19aef4849d2e32839def671c7f492e28e64972
 EBUILD pixeltool-5.14.1.ebuild 438 BLAKE2B 0d3a2d4567398c07e489020dbd9f17a30b6fc86464de57008b64db2f7bdcffce0d9ba4bb90e8af0e26b482777f05c97118bb6c0c757b020c7960f463dbb641d8 SHA512 79d9ff1a2f06a21d14a7c5992c7bc646dc291e380f94db8d966aab3e3ce1a09031a668652643bf31d55cae3528f3dedb614b73061c53e0de43cf882cf14d666c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
index 8b61712d8edd..8cc3d4c8e1ff 100644
--- a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 6fdda491d29a..4528d50cd692 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD qdbus-5.12.3.ebuild 436 BLAKE2B ab93a01824e558ca7b0139fb5c5bb70ff02149229c3959d91b61e6a2d80d2dafe82eab3fbd9d5476a0840e66e05707f330be96166cd34cc64857949cd3890e1f SHA512 7b8f5499d37285b4e2827c42f1d957902fe80c52c2b133e0e0f36a661f8557aafb239cbb957bf4ed4fef9f97e0a2ea2e24e9493b762745864d37d3acb83606a8
+EBUILD qdbus-5.12.3.ebuild 431 BLAKE2B 66b73681d2c5e2548fc20f7ac0dd653240827cc3c94462de48530396f6aec501886b1f56f9469435b4b0bb4e4e018af9208290f7c062710370a4223b24b7d114 SHA512 2f448256a0513c2da14c8f540e70d676dd0fbe99de506d88f889ca0d305869a1768d6be17530dd2e8074917c0db6b0aa900892cc75c3c2b58571e2d90a3762a0
 EBUILD qdbus-5.13.2.ebuild 472 BLAKE2B 351356cb3d19fd0b886d63fcccbe513ed89462fc5189304097a89037822d0dafe3a1f8f722f3380e7bb95daa26b67b4d4b42aeb5bd12f1a40278d13eaee33547 SHA512 d38443c2157947f106a00331cd339b318ba5e949c1877f31f8328c10458210425f319a9fb64f8cc215f43656014ab5f4eb7a3f95425c88dc22734e7287f87232
 EBUILD qdbus-5.14.1.ebuild 476 BLAKE2B 34f4df2e5943582cfcff2177664f4edd839c8498ecd4efada2813fd7d8050b8b4edf1560932abebb10d75eaa9050c67442a7efb52f56af2918ff2893c0dfe895 SHA512 163d32a8f8151702c8ad0132c00ea2fc175ade4cd67bfcb173e592df5c716863ee798af1480be36d397a21b915a581a9fe873f79db6714d4ce9db2fe9b549fb7
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.12.3.ebuild b/dev-qt/qdbus/qdbus-5.12.3.ebuild
index f7542996687e..cfe68350e12b 100644
--- a/dev-qt/qdbus/qdbus-5.12.3.ebuild
+++ b/dev-qt/qdbus/qdbus-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index c01e080cfd35..74b59dbffc1e 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD qdbusviewer-5.12.3.ebuild 937 BLAKE2B c6464f9d4143f79a7aa4be3d4ba9f708b8c486345ab485b0da265b87bfc63e8db3fc38746238a90cffd61be6df9b96d8a98afbb884940027931eaf090a44fb16 SHA512 332f376454953e3437f9721ffb6d8d0601db3b16989353f6ac7e1e65233f4bd932e84e24505cab0791db25a14295ac03af6364e84eb350b99e56f87d1983a317
+EBUILD qdbusviewer-5.12.3.ebuild 932 BLAKE2B 6595cdbf0bda20c54c1d129ade52e5bd0bd0d3b636d21451027c071f1f4f98b0efa74b385173b162be619563167d1399cae1866872edc34bae6a80b0fc35d153 SHA512 467ea437ac6cd1d45bc80cb24f067119de716de62dd7864cf36a9d59a0f5002f57cb5e927002c2868af3ca0c88e10f2367de100cea26116194a2633c2299f543
 EBUILD qdbusviewer-5.13.2.ebuild 960 BLAKE2B ab27102c124d2754b5673759c71f797602101d0b8d1c5154c24f83b5d34c38f7555e6d3921a4f291d651cdaceadd75438b77f2092b45a04e7f671f3e8943847e SHA512 021f96613b63d060ef86e233460fdf6caa1fb151aaa4f102969bc0cf7d08ab47903a3a41d05ec4d6d2dc11fefe34d6b4810c9e1c40d5dff1138bff1b0364300f
 EBUILD qdbusviewer-5.14.1.ebuild 963 BLAKE2B db7f273d2580b43afc158c10b0e487313795a7fa4c3db3e5ca52a20c4801a89b676f0be5a8579c0a16819ad9f65f19b582445d616c3725315eccc5f36551e296 SHA512 240cdfb186a95205d2b548204c7e033ff4cb79f7fc0c33b0a60661ca7d2d0306f42e6a327ef8b633883e55649db8f32536620a26bb4c7b2e5ad17d53d735a4e4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
index f7f439614408..0fe740208389 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index d5f962e6b0b8..cab19b304cdb 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD qdoc-5.12.3.ebuild 779 BLAKE2B 67a557f16c31ed55d9b4db44ae7d3aa0361a156dbf5cd3ac1a48a357c43ebea1155a0b2ace9ceb9eec6f07978966e63150768b426d141305ccfddcc423cf1d0f SHA512 8930621157406eca757e04f1fcf8375b1770c9ee7c2ed856767af1ce7af0c5b6861eb5898e65bb057d888549ebc1b7b5048d26c5c4870bcf8bcda7a33a0668fd
+EBUILD qdoc-5.12.3.ebuild 774 BLAKE2B 86b50d6d1437ab8803c5e9ef8cbdad801d71aaf34b45f2e102506992aa828cedcd72d03f883b22da584c01b25503d0357409915955901d40c0d2cf87602fb447 SHA512 9040d8591931f2a92c817eab2f50608e33b7d6bad3941d0806224d931679d61876439982f3db612753e7602a771660a852dffb10832531a98fcad139c20f67ea
 EBUILD qdoc-5.13.2.ebuild 799 BLAKE2B 32223e78a5f49acc66410dfc8e530a588a18c8fed0ac92216eccf5470e27f9ee4853c06af0c244c27cd54d18867d303149204e095d3019b731db38a45d30374d SHA512 f2c0f59403e1f3763826e15ce8fc6a75f851791193bbb1068790540298c5a13c25395201facab50bfd7001dd1b8b228faa229d05aaa191129baff2aedfa3acee
 EBUILD qdoc-5.14.1.ebuild 801 BLAKE2B f56554843e028402860c757aa0ebf84d4ac6dd1f6db921cbb485b9dfb5c1a5239e6371c4c7feedf9a9a35b035c86f05d73fea8b1cd291782940883f455bd437d SHA512 3919b666e386fe16bc6829fb70d30deb8c1697711fab07e5a06a0e2ff31248e4cb87b6bb97b28c8d801331cda70ce6cbcc4b59b17878808b9cb801e32c8e46f1
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.12.3.ebuild b/dev-qt/qdoc/qdoc-5.12.3.ebuild
index 1a0cbf0d138a..82a5b3039ff7 100644
--- a/dev-qt/qdoc/qdoc-5.12.3.ebuild
+++ b/dev-qt/qdoc/qdoc-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 1c91583b8d6d..9805edfff60b 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -114,7 +114,7 @@ DIST 5.14.1-0-202001241012qtwidgets-documentation.7z 26791973 BLAKE2B e51d28c717
 DIST 5.14.1-0-202001241012qtx11extras-documentation.7z 36891 BLAKE2B c735e8f944b23e766a57756fb35a4694b610f08f198163b8afe37699868deff8b8296ed30b8a0aa71f8bac3680a0336053e3fc5f2ad0c4137d1ba76ea8b02ca7 SHA512 b2e59aaa849bfca4dab6bb7f5af4cc99608d162a9a66472ae140f3bb0a765a2dd4e79a319443b64f56e489c37986ba4f1dfcd01f19bd9f8cb6c9102e2530763f
 DIST 5.14.1-0-202001241012qtxml-documentation.7z 499902 BLAKE2B 6c116534a4a209246034fbfabe6de5e76a9221afb2716c14a54eced1592e94d78506772b9e788e3ac60bac53842fafee074592f57bc5826a637704209e190963 SHA512 5ac3840b893b1cd24cb9235db1bd3da820f3706e01948e05a120690b54cf7bb2325b18f252980d8640a7cd3e293a87c3233d33696831fdc38a3b1caf77527db1
 DIST 5.14.1-0-202001241012qtxmlpatterns-documentation.7z 1194697 BLAKE2B 75f06e9078d6bc0ef078536a9be487e939dc679f12ce0ad714633f635b835be817cf1d115e3d5f6390997604fb8c40b87d6bd52d6051e45d9cdba34eada9daa3 SHA512 911e09af9bd51725563289cf26f6e5f8198bcd3378b208fff640337db50715251f4faa6314cf917c2b66a496b51641a5a7448c4dd040e80b5bc6fa15158842eb
-EBUILD qt-docs-5.12.3_p201904161302.ebuild 1896 BLAKE2B cc9160adaeb8e92a001c9845d8d35bdedd28fb7778a0b275e661f7b2a650b5aebd78810076821ccd50958da360b7a69e6e94515d04c2db60398b5cad66385f12 SHA512 8fc9506ac02cbacc1d7b559c7b97541f30e6ba4926df788ef38969b6b184fb3c1ed5b8e5f45c7e83726d484edec4a9829e055b319988bb129f40ad320537156d
+EBUILD qt-docs-5.12.3_p201904161302.ebuild 1891 BLAKE2B ae2fa83725303fb2b80197fe58a42e627c0b533445eb356e39c53f46ea15e903f84a59c3b1c905b4a5614bdbda43c044742cd3cc74c58227e2dbb49fbf1ebd30 SHA512 6122277f4f4b11f73e4bdf0d18b70a66fa7c1857b17a052a3f9a7a582408bb5d3e6e8051ab14ac534dbcbb8ea81f36e45519f0e8365bd91ba2c48d06bb7c47bf
 EBUILD qt-docs-5.13.2_p201910220817.ebuild 2621 BLAKE2B e066c8bff52b8f137a83d58a7873641d5803d57888fc557776a13542d885eb943ac5cb4e2e8e5deafd09764aa9b5c1edcf00704800d1fe39b489bee6105cbd5a SHA512 4a4388d331cb94e83da617353dcf4f67b6d1c3eecef61f42448ab98f3ec31455290edfd43c5b5a763000d30c8ee6badc408378afa559103dcab5dc64fada7328
 EBUILD qt-docs-5.14.1_p202001241012.ebuild 2623 BLAKE2B 748f5f5dafeb000327f719257efec906078a9c6bf8cd809ca38ca35410b3243e5a0f6eda30a0fc221d70d445a152256a5dab3f25e67dc609380d114f4db51dd8 SHA512 8887bc7cb952fbf275c1a608609760b272abab2730d270a3fbfc759fc8b9a0b6774b152e912126a11597db7d58ca67817a5f5b2de9ecc308ee9692cfcde8be99
 MISC metadata.xml 3896 BLAKE2B 9ddb79d566a10dffbccfc8fca4f970c1a49b1d2c3f6885474d1919e1647a403877c565b186da92a5823ec49c0e4af92a4478643c608574f2e3b5675334bef2aa SHA512 6418b810cf78d5acee499340352b30589d483c8be74a9412cf9c7a43534b7c5d37fa9e2d5a49e2be079d40e0120e738fac21132ccc04f64aca12895bc3865c80
diff --git a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
index d8ad29ba6427..cd57cd9a98ca 100644
--- a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
@@ -21,7 +21,7 @@ SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="~arm x86"
+KEYWORDS="x86"
 
 IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
 	multimedia networkauth +qch script sensors virtualkeyboard webengine"
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 3999e737b202..a344ef651595 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,7 +1,7 @@
 DIST qtconnectivity-everywhere-src-5.12.3.tar.xz 2750144 BLAKE2B 1c287d15713fc2155cb5b07517fdedf566a686601681efde84b096f8e052dc36a872a8c9d263d54ac38dee0c69b8966f877fd698144b5ef897ff290a50ee0aa5 SHA512 4da406d88c3cf216d53c524d3896f50b19dae124baec904233dbb67163a30a955dee29148b5f5b71c35cb28638912423bb1cf4d38c62aeefa7353bd29e97a269
 DIST qtconnectivity-everywhere-src-5.13.2.tar.xz 2777504 BLAKE2B 96fa60f6685907a2f6a97548bea70551dfd5fb2a1a3d4ffe5b68fe6629f90a52cacb29432f6f64caf8a7426238a37222eaedd515502ec3ade85260e5689b17ca SHA512 ec5269430ce548911f9af44f028bb8032163827d588da6914e9a721ad833277d88bfad43b1cfb4f844443c7a2af6cdbcf2951a339a127c22274612a4e3b90f38
 DIST qtconnectivity-everywhere-src-5.14.1.tar.xz 2803040 BLAKE2B 0a13fd0def6d65c0dde5a13a4c53c3ea4b8aa05da05c35093658a6de8ba30e28a6ead9a72c7918251ca3613ac7d7c498434051bde540b8a6780305c1895ee3e1 SHA512 bebffcda3949d798289fcbf8df99afe8fecb6bf410de3fca278f4290f561b75f667ac1f929e62ec423a56c3d80db06ce53d8992f360201e05ed6953af07ceb1a
-EBUILD qtbluetooth-5.12.3.ebuild 622 BLAKE2B 3647d0266b87f2d6e0b91dee2f8891e982ae7479420d1d0a49a10c958a1e8e5121bbed983e4d31a94f123125a78355ed93928a3c2e47327ee37a82fbace595be SHA512 69613604296d93bb1df6792acc9cf57b18d48bbccc96e436af3cef5772976fc71344c9ebc6de575a6c033795d7b50486a8202527ffe9bcc6aa2b3112de899d87
-EBUILD qtbluetooth-5.13.2.ebuild 636 BLAKE2B e5aee87359ac957c414ffaa1f03c1c27a5a9aed402129b86d756715e311e437cf71e3b9d086a332b0eb9557fc12336ce6210e1df2ac983145e180f34922ccf9c SHA512 540ddd258a7ddb47ff7b2e5fc8cd197255dabdcadad72c345e957167131047039c88b2fbb5b352edcdbb367339d90c13c95b6f1b974b68c337e62791bfb8e9bd
+EBUILD qtbluetooth-5.12.3.ebuild 618 BLAKE2B b6be4610b35d16d3e6e3ac529b66084b53ae956b3193773c4154cbd75f4d696ec7c87598fac7dba229139c3d58b41eae8447bb0799701b73e8e5346f10ac82c7 SHA512 23fa792093cae36b7bd5e35d92de6e8990cb7d0989f04abbb8803969fa2bef0a28e2f6d16120ef1c14c4c4baf26c4366ecb1f9c8bcbb53060be41d987a56447b
+EBUILD qtbluetooth-5.13.2.ebuild 635 BLAKE2B 4a8e76c0643923108ea4808dc9e65cef582daaf964ff5a86b7f551251ada39205a8c2e5c8350aa0c7ff6ea2e75506e021472f79aca94f91bc7dc7db876e8f4c4 SHA512 1282561ee5b5a359fc0ebfb9608f78139ea38d92ebb3722fddb7213ed04c3545c3d9e445b409d92c91d0e5ee26644474049395f433ec37149e403d12bd4bf15c
 EBUILD qtbluetooth-5.14.1.ebuild 638 BLAKE2B eb466960d85f88d33193b5df81afa005536657725bf9ecb4210325f8767bdb638dc0c65ac14975f4ad5eb518853e10a1a06953207f1122a8266c0da78ecbd27a SHA512 ab17fefe047787d4b024d894846e2d8c42030d45008d8b0a4b6ea533c554a98596ef3d5dd13861250c319f461c77ec4878ec7b8767c4b97c6fd094db1d1bef12
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
index ac5b2bcc5a71..1483d1028503 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
index 00bc4a1b3056..fdac527647cf 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 91e800636669..56f95c2ef0ae 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtconcurrent-5.12.3.ebuild 402 BLAKE2B 9e2c3e2f804bd7b2d73347318ad3f65393b6c764aa9e85faca20e36cc3ee2045c0a1b9b4579eb36d3ece862d7857418b34c7f55b9033c0caa0983b4ad5fe2193 SHA512 dfb79f3e61f1259d5eb0d61254e9de32c7898b7cb85710b5dece832bcd2bb3c17afdfb5830949186744f8706c7fd13b74857d2dfd8a2ab82f88b8f1298965c8f
-EBUILD qtconcurrent-5.13.2.ebuild 439 BLAKE2B 8f69ea7a5696068744c26d7ea0816dbe8fa48e926a8420587c08318ec34c1d67d4e486be4a170f23eafe3c89ca082eabd4e9607e2de6fe43099a1afe4941218b SHA512 b08bd528826c3bd214df0b1af2c941d9aca83a7235952aa280d59fcf1eab0dcd3d7253ff1714ca89ba93e7742473bb21d159f0442375f59454d1d511c6f9c27a
+EBUILD qtconcurrent-5.12.3.ebuild 398 BLAKE2B e9c88934dd3e2828410655259cf1f19e55f2983ccfcc0cdb5642c84d54f467ccc45222ab6b58023cb5b5729c43d922ea900ad34b420dc3494c0d8d24aeea465a SHA512 c1a11938a88843b1aa9e2aede448405eeb695aee8bcdae4dc3935642df432820ca422df7659071234aa2506dbfabe216d4ef040358a82a80ef755f174837da20
+EBUILD qtconcurrent-5.13.2.ebuild 438 BLAKE2B 30d2b831c1525d0f9a24f7f05404b406b4d0d9c2a13eb40f4e851b7cff753d80ee316ed9ec445fb1543feb330f0361853f58247b5a6f0d8a04f389d37c625fb5 SHA512 4d808a9b55d262d75fe5690b2c8b0998737e52c4c7c75360178f7ecb1e36f9895beebd5606e9322efd1652769c6e2607da1fd92d15049769318764270cc6d245
 EBUILD qtconcurrent-5.14.1.ebuild 443 BLAKE2B b7117ee4aae22d90c07d207cffacfa9fa83d243dca8a844436e932d501b40176a914d53cf6fa3502f8ded4dd20bf317c7b96ec997745c0c8aa9f2f8cb46cad92 SHA512 caac9b11e1940255adcbb24373ba09d968332e4df1dafdcfa3f929fa322395240b9c5ca276083283ccd1c5de87fa26fdc110091d180260e1de1b1cc627869860
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
index f59eebc63b16..98bacf95e126 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
index fcc7a560718b..48681faaae0d 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 4168be0accad..2b9f96f21ace 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,12 +1,12 @@
 AUX qtcore-5.12.3-CVE-2019-18281.patch 4122 BLAKE2B 057663881e9427edc80a9fbfc97e0f026dff0722e23452d06f16f0ab9ad69af7470ea10dbbd4d076f248edab435a60a0fcc8282a38f963e316b3b262b5029628 SHA512 60b72443dab594e24167abf2dae6f46eb171a7cfbb0e114386ebdbbd8d14b935f33fe6bc086c50f4c8f94e942f88c4bb06dee6656644c619ea5fd23898303944
 AUX qtcore-5.12.3-CVE-2020-0569.patch 1103 BLAKE2B e19236089dde2c6e15ef3f4c53e8cbcf8e68b09d0f61570adbb5e62a449c647e1d51c185735d2086ca336513d51eaf43d3c414eebaf9849cbe9ca3bba33a675c SHA512 721a16079acba96e784713b092543dc187b1c041889da745228b625ae727b602279ff882054929320cabc4228f47233e50fd63fcc75f543d8266f8fb0a043809
 AUX qtcore-5.12.3-CVE-2020-0570.patch 2539 BLAKE2B 87282e51d64cf94cbc33eea6da901bef2135f0b25237dccb72c5f5f107f3270e5286fba15ba413d4e04d3cfa109934c97fea32f8295b727d38f047ffc85b28c7 SHA512 ed05b2efffc96dbd263dfb2714f45190b7bb61a17ff7395ec3d136c6fae2b460eb40a751df615d15394a7b22a989b3163cd1441b164554613aaac4de90cb873b
+AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtcore-5.12.3-r1.ebuild 1678 BLAKE2B 375ac9b155170c9242ace84099345be98776adca28892ded36063fef64ae6f82872f680555dd041d476b6adc526a16b3173f024d83c4e312321d0035f20e984d SHA512 c899510233208b1b8b5b0b3c642688afb13635286e828849d325727c16a39de7acb4c4320a296c157262f081db348c5e9f7e603db0699bf58afd532d610775ec
-EBUILD qtcore-5.12.3-r2.ebuild 1761 BLAKE2B 75e97cad0b984ab2f5298f76ff4b7a6fed6867a26537db5cda078d5274a825549a29088beab4369532e528a2f6c7922829e797cd1fb311e844e429439f5d75d8 SHA512 b6cf9c5b7bb5588734f9ab0dae25359d83186a8de980d5281cc39534e930368780d0e329a867b7ae5c8d6ba284b87778d5ca70efe86c4eb7fcb4bf43ac9302f1
+EBUILD qtcore-5.12.3-r2.ebuild 1755 BLAKE2B 53aeb4bf14488b8b109dd5010fd121366e78c233c57bcce087c9df5adf066d002509995e68a596162f923d36bb7b7512512d6e677a1d7413d9c9e904da449688 SHA512 81eefb280388cbdfe437c4956d6553cbd0b2f4bd718c4e2527b472dca65478d7139cafe67aede6a819d88a0f89687dfba983fc969354b99cb8dcaee884b70f44
 EBUILD qtcore-5.13.2-r1.ebuild 1659 BLAKE2B 48c8eaa36be4c1084d12b501e9e50397097eae45c62475a69d103686bb787f114e393135ecfcaa9a7475fe91412edd40bd84f6ed6312233e9a5cdde1f401f6f7 SHA512 59360b4a7671d52b0448e06db5a8935643626b5e03bfcae25f8071fa533feedc03ced5a7912f3a7b17616d51c2d5a53d4461c291ce6953b4d6f88453dee38a77
-EBUILD qtcore-5.13.2-r2.ebuild 1771 BLAKE2B 4f969411c17dc25e0a81114354d626827df01fc5100c9e56ce4a8721c04e8c93c2de88f1f8affce20b06772d13bd07a70cd38a1cd25c3bce0c0a04262302973f SHA512 6fadf34d160ebc55bd0a6cbdfa4aa7e174e86216a1a014f138859db088766aea78c955c9505ab5352d1df8f1065b216a41db2b2df3c04431cae6a32b7a459c26
-EBUILD qtcore-5.14.1.ebuild 1637 BLAKE2B 0869d9c3dd593453eff5b758664bc736233300df9cd5a161126516bb32100eb36f299a975f2ed49174daea89097971cf942e5a4bf6d7c7723d52209c749536e5 SHA512 e9f88439742e969a6b0505c39960711b1cb01a44239098a48a7b358d8a99ba787aa5e79987d8cc3f092559582155057cb5e7dffe63c9d1803f91208b81fc20ea
+EBUILD qtcore-5.13.2-r2.ebuild 1770 BLAKE2B 5d52cfff1cb34b2c35255a04647901472173c5cfe91cea160070ca71ecb2a9a518aca0ec46e4944f901909503af845e20aa2e911c05c9b9ffba6bdee997b4c32 SHA512 cb69319f0c4676de8669f5c5a5aca6a45cfc325e7bd1796ce37b4480b50e35e4911d07123352119dd1408d57d447eb2384e7471c868154fc5885ea8e6b61f8a4
+EBUILD qtcore-5.14.1-r1.ebuild 1716 BLAKE2B f7cbcb6d8b06dfb49b65a95901c0c47cc01dedce2a263f19f203fe94254becfd0dadf772d58c7f8297dff0b9216f3cfe685cc9be7908d6f14156bbfba9cc0b82 SHA512 8be645c3ab9d5cf4ba3391f611f1a1baa6cee2e28b5a3a6c2a6cdf5019beb5c4221595e8304b4cbaafe2b6fcdef84218026c66de421b7b8644ec5b45a7dd3a13
 MISC metadata.xml 565 BLAKE2B 3f18dd1accf6b8a781b5d2cc5c59440e31e8e7cd9210b53f19ea7c0f867be0ac3f109e823724e92be4a6b0a9a765869520e417f321a5ec53f6ee136a0b68592e SHA512 7d13e8697d2bca8b220e322b0c961d32e34d5e8fac70027c2eb8bdf2b4cd168f1d86f56e375d9bb78d3f06d1f489f66bcaa35a2074302a849a3af6e93fdfb666
diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
new file mode 100644
index 000000000000..30b5abc39759
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
@@ -0,0 +1,50 @@
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 9 Feb 2020 11:45:00 +0100
+Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
+
+In upstream commit:
+
+https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
+
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
+IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
+QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
+During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
+reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
+cmake files regenerated, leading to cmake errors like:
+
+https://bugs.gentoo.org/703306
+https://bugs.gentoo.org/705198
+
+From mkspecs/features/create_cmake.prf:
+
+# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
+# functions whether a Configuration specific generator expression needs to be added to the values
+# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
+# configuration specific values. For singular builds (only release or only debug), we want the
+# values to be applied regardless of the configuration.
+# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
+# build a Debug configuration of an application, even if Qt was built in a Release configuration.
+
+qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
+optional and default to FALSE.
+
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-01-23 13:37:32.000000000 +0100
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-02-09 15:15:21.156219814 +0100
+@@ -538,8 +538,14 @@
+ 
+     file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
+ 
+-    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
+-          IsDebugAndRelease)
++    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
++        set(IsDebugAndRelease FALSE)
++        set (list_var ${ARGN})
++        list(LENGTH list_var num_extra_arg)
++        if (${num_extra_arg} GREATER 0)
++            list(GET list_var 0 IsDebugAndRelease)
++        endif()
++
+         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+ !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild b/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild
deleted file mode 100644
index 8fa01e2779f6..000000000000
--- a/dev-qt/qtcore/qtcore-5.12.3-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=( "${FILESDIR}/${P}-CVE-2019-18281.patch" )
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		-no-feature-statx	# bug 672856
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild b/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
index a4e53c829627..853f70c37ab3 100644
--- a/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.3-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm ~x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
index b2930ae17ffe..260a83e50bdd 100644
--- a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
new file mode 100644
index 000000000000..d96ec59bb319
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-5.14.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/libpcre2[pcre16,unicode]
+	sys-libs/zlib:=
+	icu? ( dev-libs/icu:= )
+	!icu? ( virtual/libiconv )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	!<dev-qt/qtcore-4.8.7-r4:4
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+	src/tools/qlalr
+	doc
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	!:network
+	!:sql
+	!:testlib
+	!:xml
+)
+
+PATCHES=( "${FILESDIR}/${P}-cmake-macro-backward-compat.patch" ) # bug 703306
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
+
+	# fix missing qt_version_tag symbol w/ LTO, bug 674382
+	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		-no-feature-statx	# bug 672856
+		$(qt_use icu)
+		$(qt_use !icu iconv)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
+
+src_install() {
+	qt5-build_src_install
+
+	local flags=(
+		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
+		OPENGL OPENSSL SSL WIDGETS
+	)
+
+	for flag in ${flags[@]}; do
+		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
+
+			#if defined(QT_NO_${flag}) && defined(QT_${flag})
+			# undef QT_NO_${flag}
+			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
+			# define QT_NO_${flag}
+			#endif
+		_EOF_
+	done
+}
diff --git a/dev-qt/qtcore/qtcore-5.14.1.ebuild b/dev-qt/qtcore/qtcore-5.14.1.ebuild
deleted file mode 100644
index 63378ff04bcb..000000000000
--- a/dev-qt/qtcore/qtcore-5.14.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-IUSE="icu systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		-no-feature-statx	# bug 672856
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 68e3a5f4e56f..de42cc690a27 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtdbus-5.12.3.ebuild 646 BLAKE2B 0b94071e2d324235002149bae3e2c62773a05d8b91af6b78ecc5724bb3a0436444357f8a9bcfa3929def93877cb9342696007d1c6bd1d14ff3270f363b28e75e SHA512 533d13b1d9a14558cc89867ca22667e9ad2e5daa72a81ff02b2d0f94104d94e67e8695cc92a32af5f08635e1e132642ff2ef6d4fa0300bc675a587c73a5a7574
+EBUILD qtdbus-5.12.3.ebuild 642 BLAKE2B 255143d76f5145fc7a1790c4efd281ddc828387c6bb3506958e15fc1c418295fb416f959503764c5aa39ef6ba2f1ef4e51eac91c9ce43951ed293d067ea1fbf8 SHA512 58891b93461c54838c9688c1aa23f357b8ea0253d4a3179aaa775441f96dfe498bbc4e6c30afac6bf11c3f1f6c0ce7e0a9779dfbdc6ecb0028e26b8ff10e1d85
 EBUILD qtdbus-5.13.2.ebuild 682 BLAKE2B 96aa59602f4ab6913f26c4e0493a1d60a0987360dc68cf6a757f099e03c032e9b4d70c2766b8c4e55a85e69d0566916d96735db2201d714b429d0a7f81f2da4f SHA512 6378843eb9ef4660c603bcfaf9beeb23047ce7ecc7df19d09facbc3664e46ed8fafece79a7529362b1ba28a684a722b5c51b545c548779c0bc373a0d0aa823b3
 EBUILD qtdbus-5.14.1.ebuild 687 BLAKE2B d9188cd21c503bc721194a86e3f7536b3aa85b2c3a23938e59742ccd5c28d4f9b19d108d96e9c980ecf111d6fcad99ba3477c938eaaa4ea1f79efa93b1641a43 SHA512 64f0681a4ecd54fd450031a78de416875fa9307254097c18c90435f87d81ec1a72c0b4faa6b59b3503839f3c9361a71787059383ba70852cc5d61701012a49c0
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
index 238ccd58751a..05702645cd96 100644
--- a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 1989202eb192..59371178e3b1 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -4,8 +4,8 @@ AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbf
 DIST qtdeclarative-everywhere-src-5.12.3.tar.xz 20513544 BLAKE2B b6c622cb4728d54d0cf382a5a50af4652755ebd1f8e7ebc8bf07a5f3e3355931703ffa443be11dcf36a132b2f3eacb5fce150088209d173f2ca84bc387096026 SHA512 0caddcfee36cbf52bacd3a400d304511255715e2b5a58c1621ca8120610427c57511785457a9e7fa55975b86e7924a3cffddeb7e2e8e6622af85b7ebac35dd20
 DIST qtdeclarative-everywhere-src-5.13.2.tar.xz 20940748 BLAKE2B acc688691a86318478a3f016821bf6e84ba3a552e4f8613414a51ecde8e588783ed80e53eed31bbc321945950754991d20a29290e9cf3b878c5415d1049be3cc SHA512 a3fcc65eccdd598c03991978db6462293781abc80affd9a489253d4a812073832554892d503fa0de32a9ef97ddc74b9ad71e2bd7cfa2f21ce1fc64d1358ab730
 DIST qtdeclarative-everywhere-src-5.14.1.tar.xz 21299728 BLAKE2B dfa0dfc95956f9c9eeb6b790e0221cf745b0cefd89fc070caa741b9cdc644acd990128affbcef6ac585758a02f94b1693ccca77d9de080f04f4d1b6d2304537f SHA512 70094d24a977a5ae4a3a11ee31e49234592faca1ec8195560977e7834778d1b1fdc2a30e555dc6c43c98cef2a39d5c1bf6351093c0f46b9b22b4127f3bebef58
-EBUILD qtdeclarative-5.12.3.ebuild 1154 BLAKE2B 47973f990bb997894afa2852dfa0c775c7aa5112345ac633ba607645a4e4e1adb9cae73c5c9190d43bea106a3ca7d2e76dccde642905ac132c67144978c3f958 SHA512 e76f97d31c5accd7383ae09979cfefee94b4803fefaa3427a149098f4e410a918ee6717c082fb77c3f616369076e03505489470a7957e907c121cf5fa0f04d89
-EBUILD qtdeclarative-5.13.2-r1.ebuild 1296 BLAKE2B 2d3544e898e3e4f4e10d62bd2e70954dafb77af00b3f279e331dfe253c4668588eadee8e2431a031cc6333c292d4a3966008ffddd61d95469fde11e184688524 SHA512 aa034fb96e16fd85743e4f671bee88b6af1e30eb3637e0d60cb8c34cb70cc0b1af6e00b78b08dd8616e3ab43ad2727bec44764b0c30836710268bf719e55a81b
-EBUILD qtdeclarative-5.13.2.ebuild 1156 BLAKE2B f4a592155803e99c9ca1418a83e8dd769bad0d161996d67c253b2d0fe6d4af3c9a4aaa8472c7e186903b2d7bfa817a90adfb638823fa681305154a0110004cd0 SHA512 89c621d65d62d43ae91b895948fef2999afb3fc251a8f8f1689465dc44fc0aa09c84a7d4a75be8fcea3edd36099ff535e13322cc4e719e50efeb553bb6f66c82
+EBUILD qtdeclarative-5.12.3.ebuild 1140 BLAKE2B 729d0c1acb73839bacbbfc7363f29cd0e01ff004a0f182c1a6cbe7f33c23f17be81478939eccd2ac828e727451910ed77901b73795ffe1a20a9f471c06b89dc0 SHA512 f8d5c239ce8a653c77fafccfa4d5df25a46ac7811dd359ae0399c7eab9087cf5b0793061dfb7291a7d84a36668571883ec4920ac2f0e1cc676a9e9f84cc56cdd
+EBUILD qtdeclarative-5.13.2-r1.ebuild 1286 BLAKE2B c681165cf03ee0358cb27492cf830cd2736ac74537294c7de2eea8fb6ef112bc644edfe61b53700ae8e5b9b66776d557b5244c2be61685282792c23b086d2579 SHA512 fd3137e47eeeb06994a9f4ce3a3b7086a4c6fe6fbc69c521bd325b7ff2123a7de50116f1fab74cdd0a8ccfe454555588eace3dfd185c1950a886bc1398fafb0f
+EBUILD qtdeclarative-5.13.2.ebuild 1146 BLAKE2B ddb8a3302fe9d9d427dbb9b8caaaa2c3e718e031a1b4937dee5b7c9a8a12718ef8e78fa355736c7620945c549b3f6f3b85ba501d2fd8c98c08b09cb1f568d37e SHA512 dc4e937e2c6f3717173ccf91bcde93a558f34791d929c25aa1cd073bca96d55419e8326118d5dcd1a37181bfce6e06aa2b4d91c324c6c191d0338a84d74b4679
 EBUILD qtdeclarative-5.14.1.ebuild 1148 BLAKE2B 87599e7f32ce5ec3026227ffb4c707ff0ebf0f5bfab374c19276c1d14d1f393268ec2fb940350ddde023b662cf765c8b1bd96da6fd56e7a52808681b542b2883 SHA512 bf7cffb9ff0e81f113e888f59f1f23802818d81a06946a233e68f63dd33464437994ef1f239b248f24f615e6d56ef00bb7f0d6fa9c6eb88eb803a00f408ed7fb
 MISC metadata.xml 718 BLAKE2B 8726e8349c867c54347bb2fae219fb858a2f31058d7fa83fb7aa5691b3dbff327a9b2ef4cdbfdfc087fe30847d037f55ed92a2797ad961764676c10d348148a5 SHA512 827be20878184958800c2b31b4fcff95e67bfff208d4669c4b0b1f190bbc8ebeb46795e62c06f46dd8ef54c072e82fe9f1b32bef14072e81c8f1dc7428e386c3
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
index ded471a2163f..a7368d05b92d 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="gles2 +jit localstorage +widgets"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
index 5387fa55405a..3662b3d4ce88 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild
index c23608c1066b..50821d0e0011 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.13.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index af2b5f6eac30..5562a46627f5 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD qtdiag-5.12.3.ebuild 693 BLAKE2B 48d3e1240bd5caaf96de4a45938192136c72e7dbfafa6dc629d5def42ac345fb072857addc4b680bf9685eae6f6c44d5f13568d4ae41f3a862a52adef72dcf00 SHA512 c04a56eba3bae68a195028399ccabb7ce8317aac8e94d1008a2a19d9c9f63d1ddd4701f8358e5461f4d7cfac9705e2d43e2d3fc9a1e86491aa69508628e52672
+EBUILD qtdiag-5.12.3.ebuild 688 BLAKE2B 3c05bddb53da59dac46474a557ce9493d563a95f1e36c0170c42d607ed777d753663a59dd8bd0c2693aad3c6aea9e3a6edb2660dbde35c402f83111941f6d69c SHA512 ade86216b8b6859df0287a6ee620ac1d7b9eee0333c5f056abbea652e26e2669541443343b6f2c3e120e7167d88394d9c5df379254d1efe11c2c46c026e0e8c1
 EBUILD qtdiag-5.13.2.ebuild 720 BLAKE2B d52c46274a74a4b2a694cbd147ee9d1089ab2ea2dd824b4aab49e1eed7a58f3abd35b2cb67e83ba88ce2a3873b89fa79a80149c22289ed59d2561b61f2f66b27 SHA512 82f9a9986bc3de934d515c1c5ceafea4749450f05ffbcb2dc60fbdb29c5391cbbbc496b51ed4db58b37f5e37fe64ef68cb0a8780bb9c6ae52db1aa89c92673b6
 EBUILD qtdiag-5.14.1.ebuild 720 BLAKE2B 8a1767e2e0bcd178f44c6b0309112c26b1d8714098674eae92923028ddf5005ec95c8dc5e2e03141e77e80dd256881280216fa1f280abe2588815e054c86eca5 SHA512 402e0ce8f3f7c2ab7bf3907f1a488488566cb75dc928ccc7add1f011eab892eb24847cf233add52a311d7c27d35cca2352a2b902c57a5fd25ad8a62840100ee7
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.12.3.ebuild b/dev-qt/qtdiag/qtdiag-5.12.3.ebuild
index 7762da6fea55..4aa71707c731 100644
--- a/dev-qt/qtdiag/qtdiag-5.12.3.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm ~x86"
+	KEYWORDS="~x86"
 fi
 
 IUSE="+network +widgets"
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 6826754b1a90..5d03a2604da4 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,7 +1,7 @@
 DIST qtgraphicaleffects-everywhere-src-5.12.3.tar.xz 14270884 BLAKE2B 2eae4d2ff7125e57685cbd7aa723e763462a9f5d466ea3b8890d4657ce960233868aa0ecddac37d2dba31a1845c5cab1a33f26ad31d8057067b079454cc7ae49 SHA512 3c5e6d7dc51a92d48cce8424ab1fe60ee75b71ebe2e6bb22e719a35bdaf2210b03f90ac066569f5c086ed67ed1463510625307328299310fad7c587e9fd8b385
 DIST qtgraphicaleffects-everywhere-src-5.13.2.tar.xz 14845928 BLAKE2B 65564c0b94bd50f26ea59c0e63286561c4391dc79f48969fdf5d7a6bcffcb5011d39fa36220c1924211929e6f89baf06878668998467840afb29010b9d5b5d44 SHA512 3cc44d345df2b6d8dc54fd7f94f5632acb39cc6be6966c791303a477c2d21e8650f50ae6c5e37803c6f81236b7607096dc9fdee847fbef115465370f7a0ace2a
 DIST qtgraphicaleffects-everywhere-src-5.14.1.tar.xz 14040704 BLAKE2B 48f84503245496bf0457ea2d31098c2b6d47adb7b7d9afd80837ca02af1710b4cebf0d0bdd5cfa3b6ce95f3921436ebab1e46624e42ce907351c72939e27f183 SHA512 82e3ba00d58137c81be333347970e9e7e8c3301d171792d1f362cff6d5badb7d8148b7748a54d5efd5332f315989f2838638a73d960a8ff3ef875683414880c8
-EBUILD qtgraphicaleffects-5.12.3.ebuild 415 BLAKE2B b6d017dfa2c3bf8265ed4304a6730c544ddb8ae4c26ccefdb54c56661e9f25809919bffd40bad26b0da5103d6a09598406992da347debef2a23be5f3acb16889 SHA512 c5bef7046796465b817d4ffbe3560da84cdb9598892fe29b6ed5fcc07cdca2bcb538dbe45eede5d8eb21eae1fb96e1e5b3702fa584aa9b3218af7918ad512b45
+EBUILD qtgraphicaleffects-5.12.3.ebuild 410 BLAKE2B 0e55951dd23aeb5d722857ba0b5f391c4f79a3ccb08552c9f3ed73f936f46911c649832838dac42468b8a129322a537859165ba613bc5781706abe5adcfc5c4c SHA512 f2b3e8a2a47f7588f3695ba0806965eb2f143dba82a72738a40264999b366bc020a0f5b0b625fcb7820dfc882c7eb3910f358f9ffde474b7f41380a887e8192b
 EBUILD qtgraphicaleffects-5.13.2.ebuild 444 BLAKE2B 08a3a770649458bd21de0467ea98e3e931c1c63b43583b4e6dceba88d4249f10746b54776cb076f58c3ea59665ec28b01d458c1f2ec046730a0d6a407f283cca SHA512 657098ed2bb15910bbb8bffab28292ec6c7c868a658cb4cc85a42b7eac4ad536f90be4d46cb4c20d4ec6ca78f1368df61bd523fb782ebd97f4d72da8c68d32b6
 EBUILD qtgraphicaleffects-5.14.1.ebuild 448 BLAKE2B 2e379ebce1e569228f5f82004779c0f6cb1008b239558dddfc192a09d2320f53574651c862cac214a84f3ceb6a2519d6c6d29a46fc425701d2d0f4bbeec3cd5d SHA512 caf74fee9a7ed9454daf1645d43ecd59ced44f43e6856f2b819f84a3025d4d5549021088beb346af36f3f3786e1263a8dceb30643f5aaa991b19944ee2b398cb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
index 11fa5af3d6d7..1eee24e51e85 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 771be0632d48..3bfd93cbcd76 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,9 +1,10 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 AUX qtgui-5.13.2-no-xcb-no-xkbcommon.patch 1327 BLAKE2B d51ed6761d300aec44fc9f1ac86c6f26649fd28f9dfafa0aeb8de4d5b8bb64c46697cfa2089f2a97a22e5cad311c7b372aac12be16c83b3932f2686a240d25c9 SHA512 71433f589554e2fef82d73cf112d7b5d2e2454ec5e3560878d0af05e6721ce4919623175c9355be7c54568da26c68e8c9dfe6cc956465e005b01e3ab974cb310
+AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtgui-5.12.3-r1.ebuild 3672 BLAKE2B c519e5a1d3d6d1a29cdc704f7258ede855b250d48d4a28b875b193e2fbd818c2f1a70c3d6202c83521e05549ec2d84d95eccdc8fc6425ce52c738d6ead0cfaf4 SHA512 e5fc2889ae9588e92c33b1ff5f79bfe2864bbd1e9d0cb1fae183c315b762d9972c9026901476c27e152d612ddfb5402e755514a94efb8c6c689c822ad98cc3e4
+EBUILD qtgui-5.12.3-r1.ebuild 3668 BLAKE2B 6620cd32938c814cc597051ce5b3d6f4c0f4f5bf16459d0cd421ef3cb595b360d989b5cc56094ac2d2bee1c38b1f3b2bed9d86ee8b306d90a3fdea0cdd894765 SHA512 3e6443bcd235dfe04df30938fb5350eb4b234a0967914ae6209a8b0251ecae86950f0eb8a69b034cf3d4dd9c174e9ae9ab51a889ac2face27d83b8f6f93e1fae
 EBUILD qtgui-5.13.2.ebuild 3850 BLAKE2B 68a765fa93aafb2db53761863001b0033698b9cb2aab6a8a2b558aa2900460f877629c9a737d886ade16d7b24a170f9b6304c9c441f3e4d85abc03c278b15342 SHA512 4ac90834407dde1d9b95893b8cfec007a876945cf9dc195400fae14dbf7a6d499480857b1705c2a2f71c8f2603454e017ce897ca45b8c94ab1b8d63de57fe0cf
-EBUILD qtgui-5.14.1.ebuild 4010 BLAKE2B 5f090ca04e825f277635510d925f17a49a57db7c43cef41b9959895eba878550fa929d0c17be588471e4b419d2622e77a1e447b6e79ef69574c2c8b85e134bba SHA512 56fff2ddb753d34fe70cde4eac94329818808efe62748431a06931cfbdbe90b05df2ed34e711784162c1a5f469b1072b77d45f73e901b5080470e709e5865d30
+EBUILD qtgui-5.14.1-r2.ebuild 4112 BLAKE2B 0f5e00cb56afd17f86992e9230b3b81a69deb00a94c3565e0584f9693d3a2e0ed11559bd31af08a53c511d4d4aefa9b7a866a92af7a8d151a9046dd55659f932 SHA512 9c2684a9f9611552bb315e079fec9bb2ac772d941dd2c7d8019fa8a40886fd98654a9e32da6e68e8667bf25c32e4aceed37d69408b1980db271aa1b75aed2036
 MISC metadata.xml 1322 BLAKE2B b6161b568e3a4c34a8fce62a8cce9e1bd7cabbc0d2d2baa0e5e41295974b877d59adff4983b731bb359040f3662999a7915a1527bedeca9de09eb702541d1ae7 SHA512 dcfcdc8f5622e5d6b8488f07b6de62aae829b564ecdb9fb8b9f273bc2593c312f5265849bb3d2175d0ab468977ac2afb8099519cfb66224d8e5df0efec01ae4a
diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
new file mode 100644
index 000000000000..30b5abc39759
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
@@ -0,0 +1,50 @@
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 9 Feb 2020 11:45:00 +0100
+Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
+
+In upstream commit:
+
+https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
+
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
+IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
+QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
+During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
+reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
+cmake files regenerated, leading to cmake errors like:
+
+https://bugs.gentoo.org/703306
+https://bugs.gentoo.org/705198
+
+From mkspecs/features/create_cmake.prf:
+
+# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
+# functions whether a Configuration specific generator expression needs to be added to the values
+# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
+# configuration specific values. For singular builds (only release or only debug), we want the
+# values to be applied regardless of the configuration.
+# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
+# build a Debug configuration of an application, even if Qt was built in a Release configuration.
+
+qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
+optional and default to FALSE.
+
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-01-23 13:37:32.000000000 +0100
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-02-09 15:15:21.156219814 +0100
+@@ -538,8 +538,14 @@
+ 
+     file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
+ 
+-    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
+-          IsDebugAndRelease)
++    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
++        set(IsDebugAndRelease FALSE)
++        set (list_var ${ARGN})
++        list(LENGTH list_var num_extra_arg)
++        if (${num_extra_arg} GREATER 0)
++            list(GET list_var 0 IsDebugAndRelease)
++        endif()
++
+         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
+ 
+ !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
index 9da6bd76cb93..276e36311bf9 100644
--- a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 # TODO: linuxfb
diff --git a/dev-qt/qtgui/qtgui-5.14.1-r2.ebuild b/dev-qt/qtgui/qtgui-5.14.1-r2.ebuild
new file mode 100644
index 000000000000..e077dd59d735
--- /dev/null
+++ b/dev-qt/qtgui/qtgui-5.14.1-r2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
+SLOT=5/${PV} # bug 707658
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+# TODO: linuxfb
+
+IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
+	jpeg +libinput +png tslib tuio +udev vnc wayland +X"
+REQUIRED_USE="
+	|| ( eglfs X )
+	accessibility? ( dbus X )
+	eglfs? ( egl )
+	ibus? ( dbus )
+	libinput? ( udev )
+	X? ( gles2? ( egl ) )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	~dev-qt/qtcore-${PV}
+	dev-util/gtk-update-icon-cache
+	media-libs/fontconfig
+	>=media-libs/freetype-2.6.1:2
+	>=media-libs/harfbuzz-1.6.0:=
+	sys-libs/zlib:=
+	virtual/opengl
+	dbus? ( ~dev-qt/qtdbus-${PV} )
+	egl? ( media-libs/mesa[egl] )
+	eglfs? (
+		media-libs/mesa[gbm]
+		x11-libs/libdrm
+	)
+	evdev? ( sys-libs/mtdev )
+	gles2? ( media-libs/mesa[gles2] )
+	jpeg? ( virtual/jpeg:0 )
+	libinput? (
+		dev-libs/libinput:=
+		>=x11-libs/libxkbcommon-0.5.0
+	)
+	png? ( media-libs/libpng:0= )
+	tslib? ( >=x11-libs/tslib-1.21 )
+	tuio? ( ~dev-qt/qtnetwork-${PV} )
+	udev? ( virtual/libudev:= )
+	vnc? ( ~dev-qt/qtnetwork-${PV} )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		>=x11-libs/libxcb-1.12:=[xkb]
+		>=x11-libs/libxkbcommon-0.5.0[X]
+		x11-libs/xcb-util-image
+		x11-libs/xcb-util-keysyms
+		x11-libs/xcb-util-renderutil
+		x11-libs/xcb-util-wm
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	evdev? ( sys-kernel/linux-headers )
+	udev? ( sys-kernel/linux-headers )
+"
+# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
+RDEPEND="${COMMON_DEPEND}
+	!<dev-qt/qtimageformats-5.14.0:5
+	!<dev-qt/qtsvg-5.14.0:5
+	!<dev-qt/qtvirtualkeyboard-5.14.0:5
+	!<dev-qt/qtwayland-5.14.0:5
+"
+PDEPEND="
+	ibus? ( app-i18n/ibus )
+	wayland? ( ~dev-qt/qtwayland-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/qvkgen
+	src/gui
+	src/openglextensions
+	src/platformheaders
+	src/platformsupport
+	src/plugins/generic
+	src/plugins/imageformats
+	src/plugins/platforms
+	src/plugins/platforminputcontexts
+)
+
+QT5_GENTOO_CONFIG=(
+	accessibility:accessibility-atspi-bridge
+	egl:egl:
+	eglfs:eglfs:
+	eglfs:eglfs_egldevice:
+	eglfs:eglfs_gbm:
+	evdev:evdev:
+	evdev:mtdev:
+	:fontconfig:
+	:system-freetype:FREETYPE
+	!:no-freetype:
+	!gif:no-gif:
+	gles2::OPENGL_ES
+	gles2:opengles2:OPENGL_ES_2
+	!:no-gui:
+	:system-harfbuzz:
+	!:no-harfbuzz:
+	jpeg:system-jpeg:IMAGEFORMAT_JPEG
+	!jpeg:no-jpeg:
+	libinput
+	libinput:xkbcommon:
+	:opengl
+	png:png:
+	png:system-png:IMAGEFORMAT_PNG
+	!png:no-png:
+	tslib:tslib:
+	udev:libudev:
+	X:xcb:
+	X:xcb-glx:
+	X:xcb-plugin:
+	X:xcb-render:
+	X:xcb-sm:
+	X:xcb-xlib:
+	X:xcb-xinput:
+)
+
+QT5_GENTOO_PRIVATE_CONFIG=(
+	:gui
+)
+
+PATCHES=(
+	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
+	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+)
+
+src_prepare() {
+	# don't add -O3 to CXXFLAGS, bug 549140
+	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
+
+	# egl_x11 is activated when both egl and X are enabled
+	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
+
+	qt_use_disable_config dbus dbus \
+		src/platformsupport/themes/genericunix/genericunix.pri
+
+	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
+
+	qt_use_disable_mod ibus dbus \
+		src/plugins/platforminputcontexts/platforminputcontexts.pro
+
+	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
+		src/plugins/platforms/platforms.pro || die
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		$(usex dbus -dbus-linked '')
+		$(qt_use egl)
+		$(qt_use eglfs)
+		$(usex eglfs '-gbm -kms' '')
+		$(qt_use evdev)
+		$(qt_use evdev mtdev)
+		-fontconfig
+		-system-freetype
+		$(usex gif '' -no-gif)
+		-gui
+		-system-harfbuzz
+		$(qt_use jpeg libjpeg system)
+		$(qt_use libinput)
+		-opengl $(usex gles2 es2 desktop)
+		$(qt_use png libpng system)
+		$(qt_use tslib)
+		$(qt_use udev libudev)
+		$(qt_use X xcb system)
+		$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
+	)
+	if use libinput || use X; then
+		myconf+=( -xkbcommon )
+	fi
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgui/qtgui-5.14.1.ebuild b/dev-qt/qtgui/qtgui-5.14.1.ebuild
deleted file mode 100644
index ab7524bb0d79..000000000000
--- a/dev-qt/qtgui/qtgui-5.14.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2 ibus
-	jpeg +libinput +png tslib tuio +udev vnc wayland +X"
-REQUIRED_USE="
-	|| ( eglfs X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2? ( egl ) )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	sys-libs/zlib:=
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules
-RDEPEND="${COMMON_DEPEND}
-	!<dev-qt/qtimageformats-5.14.0:5
-	!<dev-qt/qtsvg-5.14.0:5
-	!<dev-qt/qtvirtualkeyboard-5.14.0:5
-	!<dev-qt/qtwayland-5.14.0:5
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( ~dev-qt/qtwayland-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2::OPENGL_ES
-	gles2:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		-opengl $(usex gles2 es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use X xcb system)
-		$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 6583eb3f146e..299e86b3fdd3 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD qthelp-5.12.3.ebuild 573 BLAKE2B 898dc9c1c3cdd8a2e121c12417c384facf1597d678d47cb47d3f6062533012f85945f03a373179cc9b3a0b31b67d78ff2c2fe30c888224bfc1e965ab78ffdffd SHA512 01eb13f7a8803c4d45fe888896e62020b76fe90eba4e68aa93e3f308e7ba603aad19441ba59125de46a30aadfe033ab51d80d056e93a642b84e2d3d986a94cb1
+EBUILD qthelp-5.12.3.ebuild 569 BLAKE2B a4388fff8c7ed12ce027bdcca5de5ced7b84381f333f600cb0cb2aab63bc4d6b8b2c70427e81fd1c0105e7974a91389f4571e22170f259fd854ab5b8a973513c SHA512 02155084f5fcc4026563b22af3535c146a7036d910cfd8fd0672117539373cd88f3f131d2fd5e8f1774431cce28af88cdfd7a601d5d56b6640b26aabf93423f5
 EBUILD qthelp-5.13.2.ebuild 609 BLAKE2B c83aad67ecd7fb08a3523f95340684347c25d280058a79c789bad5099b5f6312f4596d51035558b9c43e320b0a8a809c810b96fcaedcaf8db7b2150dbb754aa6 SHA512 6951d1a47587b3673b96944a8b38686f99eda0474d86a3283abcd5c207020d4f3878b12890905ebab1f69c1adc08f0bf725f0b91045b7c3c57530dd6602284c9
 EBUILD qthelp-5.14.1.ebuild 614 BLAKE2B f119042f99f62f8bc490777c1d05051888c2d7394c1e531c4a79faeb94c33e4c58cc90b92c9e53c241fc44531449cb82d0bb68a08477f38e8cb197a45858ffe7 SHA512 97a34d4f31ef00eac784a4881616009ed5087c345f7d2df1ae3f2254f77baded3c73afe2cb2edff68fded0bb3f26afca773b2ea883f0ef4a89f2db1db50a8142
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.12.3.ebuild b/dev-qt/qthelp/qthelp-5.12.3.ebuild
index 0e5276c016f6..a803721b5888 100644
--- a/dev-qt/qthelp/qthelp-5.12.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 07d511a6d759..ccfd0713cf84 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,7 +1,7 @@
 DIST qtimageformats-everywhere-src-5.12.3.tar.xz 1793076 BLAKE2B 59dced7576a50441c704c8debf4a86bb4db7cfb752922020d2932ee2295805b27ece866f3f86e3f89b308e28cfb720fb9c6fa782f29f45e1c3b14fd733096c87 SHA512 59cc9df597e6ac31b10ff7440b0793af13ee84a1b363db631a7aeea7413e650a99a42e8c3f4633926ec93d4ac4c2532674ea27df325ba98132bea83c81d6e6cc
 DIST qtimageformats-everywhere-src-5.13.2.tar.xz 1803796 BLAKE2B 771b883f8b415a7eb7562beaacf28cc6acfd7ce7828e4bdb4c7fe12bc283bbdb79742e15152b0baf0fd8cb0d46bfe88577bace6b13162396f1211aaf79c0e727 SHA512 e76d7efaeab81c4eaf0f41dad150ae6b36ef2246993d344e4611ed865d62a8ac93cca5f62a2c94a97bf16333344490b5a51ca8de1c7eeb460c9ae321f759f4e6
 DIST qtimageformats-everywhere-src-5.14.1.tar.xz 1810072 BLAKE2B 4c5f30fbdf013bfc224401a53b93210b8c44fcff08c99660b606dca85f2dfcf872476d56bc3375dbb9e18154dcaa422542538f12978077811f4cdd400d4f8fdc SHA512 843c8288a79506d4f2ac9e318f9478d689045bd0de1c2d9a529b060bd44dc7823561baef290bc54ed6cc756027f1dcdb8f706a2bd122ec9aec18848e5d316555
-EBUILD qtimageformats-5.12.3.ebuild 504 BLAKE2B 1a0aac3d636c7f5fea3bfa6a3dc67be550f8e4333eb8d6890b525fc305538cb842e179e49bb0cba8b3572cbf6300d206812cd70a21067eaa836d28d822e9b529 SHA512 584a417e89ee548ff9631170843ffac7cb955537200ea254e4a3bbd305aa847aee0e41555d487545a2c66bbdc044a03003f067ff0e64e07abe02679263d070d3
+EBUILD qtimageformats-5.12.3.ebuild 499 BLAKE2B be2e8fb3482d1a91226d735eae2e6a10de1b7756e286ace646793330f6b0d2027723ea4845e2bd89280684ef9c6470cec1ac7df6646476a70137eebe6d5ee72e SHA512 89ad80b8cb5865be7e9d4135f696ec6626ca5f482ef56d5f6a370fa963f4f3e0b503e43181e4461c609630e41a80798090792ee3df2803f9020d67649decdb6c
 EBUILD qtimageformats-5.13.2.ebuild 671 BLAKE2B 22c17b191eba835b0f78747589a032f0930f55dfa83bc127393381ad2b65b6da463748f70e10d04be3b604b3da8b2a3ee385eb8a116a7cf2204bb6dd1d237f6e SHA512 4b59e93f6741cbe7898b349c300ddf73d4dff850f65a0613d95546f006077ed7a82a06ea37d774eeef1ff0883c523e439ff0e3dc1a6cfe285ced7f8f52994fe8
 EBUILD qtimageformats-5.14.1.ebuild 674 BLAKE2B 2aed0c80dd3db32cc8604c02210c9f4776d7511ddcbd9269cfd0fa412c60f6edb46a9acda5755f4d3fb9d7d5d6de02bd96b4309495a6dddfaee4badab683b73f SHA512 b3f7aaccce0cee2810e008a4bd23065886e0226742b7fedaa303034dabb6e1660c8c7db8b4a986f193941cf8c4c20579d1473c28e2af2723ab65821ba9f5f0d6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
index 1778fd4aa6e3..8ec5c809c7a2 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index ed63fe8b127b..b9dfe5ca4954 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,7 @@
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
 DIST qtlocation-everywhere-src-5.13.2.tar.xz 6050044 BLAKE2B 912810dea36652b96b0f93b4e69755f86b0f12b3659420b3771649f00afc4909387768832989e2a7808db90467502bb8eb8f23734d41636c4eefb48c4ea534b4 SHA512 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f
 DIST qtlocation-everywhere-src-5.14.1.tar.xz 6119236 BLAKE2B 8ea66354f17e67d02c3e0a2a6369b55af006f6aa3f7d8b3c0c914df7d01db852a63d3e6a24f11516aea6667dbc9888a361fe9a030b903720f77456ffdaa96710 SHA512 5ccba22c27beb0bbde4b84e510e322445d98f99d87046d463bd054d0a09f0b24af978cf372006aa2cfca0a0ca0fcbb067525a6dc103d2d89592afec0600efcd8
-EBUILD qtlocation-5.12.3.ebuild 934 BLAKE2B 99340b886e0e0e347ef69b489b2384e9f8daaa21080e022dd735ec3db84d315115c203078bc855c5a2306f069706e69b132c8afa7029aa9e9c393c8420f59d25 SHA512 e033320a1ad3c6813a0d5da2538830f66a1553dde680933bf6494901d65c4349a6234246af835f56793bd37e20d1468d614725486491fe3526099e764539d6bb
-EBUILD qtlocation-5.13.2.ebuild 974 BLAKE2B 403fdeef8781b2cea0c4f15af0a1046baee65425907d520d5dbe720a934f9ae3eede91f12cd129c11ff88ab635878db3548c1a5885549758cb75a27c68c65c81 SHA512 36235cba65fe5921e5143c684a0fb121f9c993ace627f55e4e3c50e911c86cdcbd419194bb346ec412af45e27d29b2a5680cbaa9c05febcaba1e9a1df82b3936
+EBUILD qtlocation-5.12.3.ebuild 930 BLAKE2B e18d9652aef2863beedbfe7d21de8d456fe25369ff266951f6ae6b78dd9f61ddfba27222a942b977934c4933d256c1f438af0976851b09ee20af0c78f691cf44 SHA512 f1ed59901f204035783722631e437a311dc33bffcf942faab292b159ecb6d675cbd9d299c1d40962f15aa377c5328eefd4618e28329394633ff73611c1ebde43
+EBUILD qtlocation-5.13.2.ebuild 973 BLAKE2B 023a7d294542f76d6925c14b5c3a0036988f2d096030825f98f953b2d2c42636b2f14a5873ef2a7c45152e166f7e2695c37006178e8794518e36719d69e7c126 SHA512 1719046875e40350a5d7731347b4cdd7b17855519bc9d109a0ee8bee5406ce388651e8b98fc49a45a0e580868bd6b81669fc57d63e67b610682756fdcabc20ae
 EBUILD qtlocation-5.14.1.ebuild 976 BLAKE2B bb519b8f83a00319f1e0d89c115243193cc1b3826f017922d6718abb5ff631ea4ef20cda10ebe9ddbff6adbe131ad84af34592cb4410f9a67bc51ff398b546c9 SHA512 b2810195c3f4cd7949ad1d4d519cafdbb845cb18695811de97e081f5a18b8d32dcc45c534ea25a52494d75508d86f26badc359dd6ea26fc358bfdd4631a5f8bb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
index 56f8b9b18171..ec900f0cfb34 100644
--- a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
index 75ee52770e95..6258747f51ae 100644
--- a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 9ef234117fad..c9405405f4a1 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -2,8 +2,8 @@ AUX qtmultimedia-5.13.2-gstreamer-crash.patch 1395 BLAKE2B d53993a824ee9bcf43d23
 DIST qtmultimedia-everywhere-src-5.12.3.tar.xz 3742244 BLAKE2B 65cc184c2625c998ec0f12d5d2f72401693521c9b5e1f27db342279724789e88e0bd6c6cb741ccf28939e8edbb657dde391ceb24ab0cb97c786c114e7e95743d SHA512 4f10e40aaf73dda2d70502e6a1441149c2b4389e9c7de72245c850d926c3ecb57ca6b09c63d208eff4b9ec63b7f9845eb2740cd0df4e4b7eee8f51746a6d3963
 DIST qtmultimedia-everywhere-src-5.13.2.tar.xz 3820660 BLAKE2B 19949b1256ceeec38a10210a7430082ed197c1f19d37048170fa55a56554e741e3af670733e25fbccf11426d08075f1ac40589a2106169fa0ae9838c8b7725ab SHA512 a18a2dc56ad33068efb78e5fb61df3c45d0102d153a02122ce39917df41acb161469092d0299df228fa7afde53260e9b7acf82ae016b99618c94d2caf02efa51
 DIST qtmultimedia-everywhere-src-5.14.1.tar.xz 3795732 BLAKE2B 2022d204c0e0632865f4dc3431bad0df368552bca084d57ca79c446bc562fbffdbd05087db6160918eec9964d85670f194ee52408d700d2a039a672cd6d4e841 SHA512 5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3
-EBUILD qtmultimedia-5.12.3.ebuild 1407 BLAKE2B bf92a3bc481fbcef11e1003551ce7877d8a600b3ad2e09c9091733118b143b4a1010d832bc1f1f4ec87c24e1bc2e610aef28a52a325cdc3a50b69a31a08dd9dd SHA512 1acc9308b0919fa024879ed346a6707fabda3c42bf04e8b22d6614fac23c09e5c28359bcaff206738ac15102cb1b5180c78805ab29faac64d3ec83508f8ebb98
-EBUILD qtmultimedia-5.13.2-r1.ebuild 1512 BLAKE2B 190a3ef5f4513337435a4564f6ee7f50d973cd555b7376c5927a8e82b3be8ce2bab65bbfa7e9524508634d667c359c15eaf8664540d93f82f1e2b731d4248626 SHA512 c13eb61577e8debd3445eccdeb06a8b726db3e8c37fbca92dd43040f56d11a5f069b4ec0efca874cec67aab97bb20cc7a12a0734faf125d5a0d9c754c04d1735
+EBUILD qtmultimedia-5.12.3.ebuild 1403 BLAKE2B e0c523a1309e99930dfaa92740f65ce87aa67595e6cb52bd3cb97606691b2a6eac8171a2f53c7190718b318d9654062d249f2c4ce53c742e5fc9b11348739185 SHA512 288e02cfb16953ba278f50e45ccaaad060d59c52722669743e11b0452b41177a3aeee6fd237baf24dd6131f4fdc8ae8e739c632089dad3f48669194d2cc4938b
+EBUILD qtmultimedia-5.13.2-r1.ebuild 1511 BLAKE2B 452e376cd721c3ca625e282ee509bf85a86e6b5effb1775b028086fdc633bfd7c4f7fbbfef2a4eb773a9e0cd2dc6284137c599a30fc9294f4fa1c0196ce6d8d5 SHA512 b6ccc65bbf87ab6a5d28f44044bbefaafb9fdc35e73176241cfbcb180aeab61c0dae8f186d582fa07a9285f258fe387d9a33e72ce33f55fb70c7d74b0a55a0ae
 EBUILD qtmultimedia-5.13.2.ebuild 1448 BLAKE2B a932815ba950f6ca4a92467f5b7fee3b768b485b4f5a29ee604cf1ec234444d0fa3c3002eabe7990aa70e4f2be8eb6b5327498ac09279991d8ea5c71a1f8f8c5 SHA512 ab5a885ebedfd17b62ce5762197bc9b689cae6c3a46ffc16d0d37b7f4b43561fcfae6dc3949cab01bf119d492a2a9dbd096dc6a081592391f61a4010692acfb5
 EBUILD qtmultimedia-5.14.1.ebuild 1448 BLAKE2B 6e2efd504b680ea14faf8dd98705c726b9277e80db016e211f5e28eeaa4fb74057b7fb5056b388c6212a006c4c1a76c8faec54cebfd9fe07971ccc90f7b56fa7 SHA512 5349717406ba215a2532b57efc1aaf3464c973402f495308f6318cf48876840df2580e548fccc72370ba8a5e8be633bd86717229f2aa27020468a1e423f0acdf
 MISC metadata.xml 805 BLAKE2B 56ef2ee22f8287c2ec793876037a9a6acfad2766ca3e39bb25ef005918bfdd8ba52e8ef569937ba141fab8562f2829c16c7f317817dad405cfe8df32731ca951 SHA512 651360eaf22174e77d2868d5806cd59ded59b7210996b9fdabec54f166e9b8b350a4c0d47c55419276f087cd9e3249a9fe89188f0b6968f86560b2950a60c0a5
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
index a9f5bb6c8901..1b878987bc27 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
index bbfe6b126785..9c5866b6b7f8 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 4c4bfd1268e7..3fa7e412673d 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtnetwork-5.12.3.ebuild 1270 BLAKE2B 22b5c11ec933f196f0f7eb3cf6b1e641e92c01674b19bdd2552139089e9de7c5f575cc7ecb246e8c0bb5c088a7c92eb409b845bf2f26ff033ea9a7df8a2bab75 SHA512 5607ba6f32179e9fa969acbe23202bd20d4e1ebca59e7610edd1c388aa8021fa1b945017fe3787172e66c01e38edd26c88741abf52fbef40d3f392b2f67383ae
+EBUILD qtnetwork-5.12.3.ebuild 1266 BLAKE2B 9a89cc38e5a5232115b8a279203929565c073e395044d94b65d5ec25c25afe38703a3a4429ccad31371529e5693d1b1b2e9f02e684cb05c5e0965339d5c24c2f SHA512 5a36e799173fc63c71b751fd81ed8f801a2167986ea9a5f8512ec904ccedc8f357ca8c362b200107a4cbd0d5fa89edc20139dad3d3ca4ef96f4c1c89f42fb63e
 EBUILD qtnetwork-5.13.2.ebuild 1306 BLAKE2B daad6c9e76243a5b964fc8aeb8ea476c82d5d7edd096d4d7ed16fe5240ce417bfa7a50f19345d728dcec2feba83d6252409415b1ab0baf7bc3c7473327e22678 SHA512 0f9030be11cba5333370ae2c78ac3513667497c0333feec046d2a0693642945aab85ba2253a2d38810e2ca95f8b056d85884b901ab320757027c8fbd7bb555ee
 EBUILD qtnetwork-5.14.1.ebuild 1311 BLAKE2B 3aa1670f27cf31d63665ae1a95a0697e1a325d795f0b4beba32d38c446c95aace0ba13c7131157eae75b44d7f6d8e67d166aad7360ad15348694ebf39e0fc37a SHA512 fdba4d755b5eeb36c30e1c2e0e67021b3b641149144bb34ffd9a07e484340f22302f0632f59420cd514b36123e0679b8544273096842745c5686d2691cb5cc2c
 MISC metadata.xml 876 BLAKE2B cd547dff93432d3d0c4baba6790166ab951035e3c7b9d66fb9717349626f7ac72ef38daf7c648de40bf73ad59f5f7ad8c85894d73e2c37b24832371bed868656 SHA512 6a38a068dd89a9a1bb470938bf4b2427553356fed8f1a638596e21261363544b8fb770ca2ec9e619aedb4e4ea260b60966924b5b8beb8295804c99cb8d916f5f
diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
index cd32728f067b..17473a4c7e33 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="bindist connman libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 8740aec3635d..a23fd3d526af 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtopengl-5.12.3.ebuild 599 BLAKE2B b0c5ed01e1978ad6cbf07672a28e144e0571af8547d4e4319e31c55bf4bba2bab64465c42d0ef9a426195aece739df9ef58aaf8c7ea46d9fe46fc1ad558e2c6a SHA512 fcd863d10db4f11b5bf42102c967b2922ed412dfc2a5596c0239a875cc60d0b2e1a349a856be8b9572ca6b50dc0d31578385d534f235dd191f4b82796d00e7fc
+EBUILD qtopengl-5.12.3.ebuild 595 BLAKE2B 6edbe1575f0b96d24575b892064509a5500b651390e7b28bf679f6b1cea0583e25edfe9a86e2c8f2bd27ed1b364133c1dbb20adc1a172dedfe5f889292b708cc SHA512 8f61d43c4dac33d80835863a0fbb2f8515241302920be007b8da29d972eb29072fcc6a5b9ac2c90559646725ec761fa5fff2732b5c53a6b207bf10f75d0da618
 EBUILD qtopengl-5.13.2.ebuild 635 BLAKE2B 269ed358bbed6e82b780dc54cd29ac184d5897b7a7589002e8776fa3fb4e09781ecab813e771ab709a705f85117e2c75d75d16a5ecf554e3ff01b166bed6c034 SHA512 1e5d575c6e51794b6d442964e10d0d3e0771b121e01c076647e7a456ec42fa406aef345cd22e8405e3e97ee1a502bb43541dfe45c2c6eaf63d3146b33edae92f
 EBUILD qtopengl-5.14.1.ebuild 640 BLAKE2B 2b4d91f809eb5ca83ba17a0ee75f1fff91976498332a905c7bbdef38818d174e9cb732a75c5414c8e52c7bc1e86bab03cf3b19eee6b8f215eb37e6dea4a05ee2 SHA512 65878b4a2dcc38d40abe446f62e5ce61a7038dcd93ca2188fc05f22a2eeb48fbaa9ca717ee7877e3e79b364d27f39888aa627f2d048443c9cf4dd2f89eb79cc8
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
index 8e3a48223c0c..dcc247233f58 100644
--- a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="gles2"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index b4c8242af5e2..6e3ae830aba5 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,7 +1,7 @@
 DIST qttools-everywhere-src-5.12.3.tar.xz 9809196 BLAKE2B 8d0317dc70c1dc6fc7c125453d22bbaa7decd57f9ba0f7572cc1e27f9494ff3423b5be412bcbd2e841a1f9b7494dae9101b3ac9254c563c24f22492b3b6ec3c9 SHA512 d37c0e11a26a21aa60f29f3b17ddc9895385d848692956e4481e49003cbe9c227daf8fda1c40a2ab70ac8e7e56d3771c1b2964524589eb77ac1f2362c269162e
 DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
-EBUILD qtpaths-5.12.3.ebuild 373 BLAKE2B 6f9361c4aeb0f8c5608db7a79794b13f475360e8d6d3edceb8487896f4c1c5a4028c837ef24e4f235ef2c5bd252d14664f550e6dce43a6beacecca54c2373df7 SHA512 c6b0fae6faa4bc533ec6ca654d9bb3f9dd1575183fbb723ff8a2486d8468f628d6bb95fdec48fe17d017782c04db2931108be05f618b7a2b601eb0da9d1b7cd3
+EBUILD qtpaths-5.12.3.ebuild 368 BLAKE2B 2818f5ecfbf8b10a165f24a63507968b1157d69acdb398415963e33100f2391721878951e2d3ef9091cadc0ff223b8c61dd4c8599d4a9f8953d5297c30c0dd5f SHA512 3cd91e9d2f407fa3b705281ee91e2cfff08332aba46e461f89d06b22f62b5e74f5045270669da5b10feb291345d4247e04a136f2d37ea8873580bcd20eea253d
 EBUILD qtpaths-5.13.2.ebuild 409 BLAKE2B a84f7517135435a6b3e0ff5b0bbfa69caab2e911f7c0f150bd2f745ec576532cc31faaf223974dd1b280da8954f8e3f62f35bc04bb84723987aee3201ac3935a SHA512 a49bf6c4472240b42d117e52e241b7b4ec32f993d1debb009a2b40914fa7e746b6b6f06d42734984477c72f2092cfb0fec150c8e6ac45ec86d19ce27a5834312
 EBUILD qtpaths-5.14.1.ebuild 413 BLAKE2B a35b29332a4a1b5a1579206f3961ffac542eb70aaa06ff75c885ac64e823f525f93b39b544674a95ab96953a96bba2de1c12fd8ab8866dd1561410852bd5a844 SHA512 2100a43804de909c65d926ea2f54288944bccd49523c57d7ded9099dc1f5c50cce6b86c56e9afc51023bd8a080c240f2c0a5fb608d117c9f2271c70e8980bf03
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
index 73ab9f9f78fe..3c2b038665df 100644
--- a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index cbfd2e995460..5ad34ffcdb99 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,7 @@
 DIST qtlocation-everywhere-src-5.12.3.tar.xz 5905856 BLAKE2B b52b9eaea77b4b429db90768d97c7f4d1319c7a860e864acb5afc5c35c0b2c7425afe64909751b2063bad747fe3aa6d899b39532a72065d4cd87935219a196f1 SHA512 91b21e5bc78b960f15c60ae02827cd35292ab1a5dd5a47488d25ce6758177f0ce15545aef3ff9bd1456c6fd84f65cb74d385b726239e2f0be66de0f6fb9a7082
 DIST qtlocation-everywhere-src-5.13.2.tar.xz 6050044 BLAKE2B 912810dea36652b96b0f93b4e69755f86b0f12b3659420b3771649f00afc4909387768832989e2a7808db90467502bb8eb8f23734d41636c4eefb48c4ea534b4 SHA512 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f
 DIST qtlocation-everywhere-src-5.14.1.tar.xz 6119236 BLAKE2B 8ea66354f17e67d02c3e0a2a6369b55af006f6aa3f7d8b3c0c914df7d01db852a63d3e6a24f11516aea6667dbc9888a361fe9a030b903720f77456ffdaa96710 SHA512 5ccba22c27beb0bbde4b84e510e322445d98f99d87046d463bd054d0a09f0b24af978cf372006aa2cfca0a0ca0fcbb067525a6dc103d2d89592afec0600efcd8
-EBUILD qtpositioning-5.12.3.ebuild 812 BLAKE2B 860fdedc616b4ece26dc3ddff41afff19b933af9bb87267d678aa47e8702a2ec466025d8b64bbdce0a75867d115510c87068ce3a7a2c289b346824e468cff872 SHA512 abb62ab40a6e2ba96c43cd19de6a4a67c8f3c90c67208d19a7e0e447ca172a1a9037fd6b0893dc14e9d98279e57a3b2a609d54dba96bf6f645688472eb0a1302
+EBUILD qtpositioning-5.12.3.ebuild 808 BLAKE2B dce16fe54c619b7764c8f350c56603c980acbaf656903d92fab19265dc1935e787ecf9870987370a206cfe9e0ec9235bddea642e5d74b01f8c3aecac31e1ac90 SHA512 56a056722df3fab41c7ee6d85a4b2289e5601514c5a8d4a686ad4a90ff422369fbc58f0a30c3e49a0b149c2b081fefcc763703fef1a69263cd508c01cd47f57c
 EBUILD qtpositioning-5.13.2.ebuild 848 BLAKE2B 1277c31590537f934d9dce64f963f4db5ec563a7d27b5a6111e8570ceac5f8dfbed1edbf4693434a761020898ee8d798bee5724913a4a960927640d6e71a38f8 SHA512 59e9030438338b071e449d352f9e64bd9e2ac90c08a796d170b1145058533484c9fa29aa86bb92757f278476642f827bc5d6fed53c623f332b359a4d1a63857d
 EBUILD qtpositioning-5.14.1.ebuild 853 BLAKE2B d89c06e274722250787fc29a1bf8106cd84b18015872482efc8b00439a02cf45ca5d612d167b9f21e934ea971eb7a44ce541e12794d4bbae4acf42cc58239ab4 SHA512 629a2deda3ab8b945e72062d4f9b5de8f24881ab0f401a429b34358243a43828b72e0ba46d4d1b691f85b3e5f8e3b69053e22afce9544ec862566914b049d766
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
index 6530441c0192..893c36177dd1 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index 4c8a559216f1..01b9ac53946f 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -2,7 +2,7 @@ AUX qtprintsupport-5.13.2-no-cups.patch 2196 BLAKE2B c84c6db10bc05a349d910c3c745
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtprintsupport-5.12.3.ebuild 724 BLAKE2B ae15f6a53933094d9c2771c686b1fe877ef7caf6b941aa4830005111975c104a7a7fc2f296500a6425fc10b29a73662ee7888e732f606dbc59b8873c1d85e685 SHA512 867aad4999b024f34144228e360601fba790558c4316c08c52538d2d93e085a2ced78e030e95cd317ab506c60588688d0be34db43ac0251838d46f533e690f4a
+EBUILD qtprintsupport-5.12.3.ebuild 720 BLAKE2B 93461068b7161a9e40f191f7f4b3101cdb57c0db2e74c3177f3f524398459d4f0d6afbb8348a5d2d5d9c7947b62a978dafceac619ed3cb92a4fa96199e98cf97 SHA512 65eca54aee0e38ab9e5b02ef659da994013e18e84247a6ae0296f0ecf9ba85cf8c303988a699a7680f8f7ef42cbdac00eb5d7bdfd3c3c3665832b791dba35e25
 EBUILD qtprintsupport-5.13.2-r1.ebuild 837 BLAKE2B f6d15c065794319676e36764a995cf1c403c10bb6e02e2ffc3eab9ff083ec3e690facd1f86eda9c5b79f5c97ca8c7d32d36db5d251f9f6d0012ae41f588ffd83 SHA512 c4fdb4c530b04d918bb00da736bf63a198252345a585e65e9d97b18681e1578ea94948dbf9fab52c84c0d119081cbac33cdcc4e1d90f6e7630db492f3e718078
 EBUILD qtprintsupport-5.13.2.ebuild 761 BLAKE2B 6423f7e8124bd8391c9c15f5f37fd0b65fe47aecaec362dbd91d74b6d2909b8bfbeb361c66a043a866b6629af67e62cb0cb406c0f74f9de04afa8dde069ed398 SHA512 eaea2dd2bbb578971229091aadd66c27afbd1dbde99d36a15dba3a1c07109c91584bdae1ef800d1b3589d58e3bc8855b35e5bc549e5cb20a9a9c96ea0e03f5da
 EBUILD qtprintsupport-5.14.1.ebuild 765 BLAKE2B 3a1351e983b2e343c976f318ea55974a177572fd5b55c5085d9df8376922b2df44fdfe6d56985563d1230440fd6ad1e358773c6c9317eeb5d87e221b779ff2f5 SHA512 beee4079ea56b951af90cfd7c4945b10414c207a5f64a890602dcf7552d05d9f8b2f0acb612ceb7f580d74f4829387e9f157af0232011ed9273a49a2c0ed6e82
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
index 6f09126619bf..e8321b9e7c9f 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 25e59e8ab47d..8c8afe23309c 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,7 +1,7 @@
 DIST qtquickcontrols-everywhere-src-5.12.3.tar.xz 6057512 BLAKE2B ebe1f4a431cd58891c8550ac1e50992d290c18df54b6710912397f6856ada50f8807cb52d0fbe43f376d187ba6c3f53a0b826babe10fded480d4088bf842f566 SHA512 23410fb82088591a8bed7e8e4127d13929a03adc0dfd18f7e2f906acdac21f7dcbb15cb2257272b893d937bbb54860992667c11aa0c6157d4a3b871616c4641c
 DIST qtquickcontrols-everywhere-src-5.13.2.tar.xz 5955448 BLAKE2B 9094208aebb517dd39c880a608eb7d426aef58ea5cdae4b45d5ce99b9ec1ade4d138e4f13b778daec14f097b6680c906d9166b0f30e1e9ac77087776bc30fbc5 SHA512 5ec713036fc34c62cfe31eb83172c4922b2ef5584d23239776b2696129d23f61f3984e6a1a7f95ba15ed6b630b62cd1ea66af3d187c1682b8575dd331b764ed0
 DIST qtquickcontrols-everywhere-src-5.14.1.tar.xz 5982788 BLAKE2B c4faeabb3704f43daf2e9387b98a65dee50eabf63f8ce992a7fa158a01e73bf2f5fef6e03740c29f470603fb7cb86a5c7ca48ab3b053f5a905dfad10913f0a7a SHA512 63157debfdab05f8fe141964c5a7d61373a422a7f46c01d1e5a7123998700790c63c8a5f1489c6fb25fd89c3065e1982605180568cf6a69835feeda441582be4
-EBUILD qtquickcontrols-5.12.3.ebuild 709 BLAKE2B 98fcbce7cab190645a332c9828498e7fb2f6863a90ea460767a45c791b95393578f06bc47ae9dd70278410ae6edbc25fa190eac6a25ebe044ba959eddab0aa4d SHA512 c6a455a05be7d7684769fb8fbdcdeafa6b3ebee5a1423f1c966d825effb104a48d2688272d5db751928c7cd95c342f5c60646074c753dc08629bdedb2bff0ee7
+EBUILD qtquickcontrols-5.12.3.ebuild 704 BLAKE2B 637a2169fe4f7f2842d7e59c9666dec7913eb7671301794011df1ab40013d55e108641de9e40131698ad5fef7d762b91655e89296835850ce8c7a6adb859393c SHA512 b07012003a202ff769bd01067b6efd43d0abbff4b2822a6e0f98f90f46ffd3e0e3c73636f0e0c9a8bc3f3deb0fa1940cf882d77a31b2fac789e5abde22a7a3f4
 EBUILD qtquickcontrols-5.13.2.ebuild 738 BLAKE2B 28ba6bcc1e9373b41a1d3da5cdce05a550534a340585b51c37e3110f22516673638236d8b29973a2e41c0e533a4db73d4ad576b20226913bf92abf6953107198 SHA512 e790d1d2210c7e86d0cdbc6fc36cea0b56a5fee81cd2793a15d4743272781ac4804eb37030cbe892e8810bbc5101e5f72553407077762ce66a5a67340c0e3c65
 EBUILD qtquickcontrols-5.14.1.ebuild 742 BLAKE2B bdb7ed3afb9cee48ff6ade378810f953b6ea60d3bb9704efbeffc13fdc48d5bd49fb7029ab21117ca13f56c03d191d3c642fbc92e893a7a2451050953a982974 SHA512 78ee6efb4d458c0361f98bbd6269be84107fa488b43d8fa77f5c54d0543f2ed9d738e6aba3a2219c3b25387fa482c988167f0a27d0ebd35663a74cf1b0a9025f
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
index 6585fd05b1b9..450ee2a11559 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 1a3ca3d2baf5..377b163b9405 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,7 +1,7 @@
 DIST qtquickcontrols2-everywhere-src-5.12.3.tar.xz 9297300 BLAKE2B 53ec7eb16cdbc77d60316dfebd47f0372ce90bc9781dcdb1f0b9360774379138cf3483b52ebae9598bebf7460b300b388663fe35292264007d1f240ccf2bbff6 SHA512 afc1ae9a5a046845b085d5cf0019b79d99914a2d285676bd4d8966f1302513078c8279b71134281c03b2c1209295bca438b9e255774574520498b0b5385bad27
 DIST qtquickcontrols2-everywhere-src-5.13.2.tar.xz 9252912 BLAKE2B 8b5068f53fab7ba26bc7fa6aaf40d13581eaa35cebc55c9def9c7ddf51837f803a169e70dcb62405994c4e9704fb6b02a8bd56a59942c48996a4fbf6a974128f SHA512 f89b5126f0e6b96ccd206cef1229624949cb22f5f925b165af9a3c0ecb6517a0fd29f5c3958fd8ca008f1b000ffb352833ee90ba0ce0fc5f7983636732440a0f
 DIST qtquickcontrols2-everywhere-src-5.14.1.tar.xz 8151808 BLAKE2B 79a9dfc75c3e50f08237377961801eb9971e5489a39d83387340a803d8f6c3956118129cfd26028707ba80b3b7bdc338b7292b6623f2404e30206ddfe3dbd852 SHA512 c35a450e26f9afb79c237133d407442823fb6bb664c0d2c952b92f9084db85f0e7ba02bac9aca3aef45670fed7da34c7ef183297360cb13aee4260513b4393ee
-EBUILD qtquickcontrols2-5.12.3.ebuild 587 BLAKE2B 59cba6642bfe64d6beeed0336b2a977098ea6ed88ecdd65594c48ffa751c117f8fe1ce284141f0b717704d2f2302f4ae682936d2177ff33ad362f8cf7bf1e4eb SHA512 01a6165b1c2cc21ad4d60d1424a0bc2cfdebf6c8f9046b4bf2900f5b53376e98188c2c5737e4087fb43470205f802be2fdeee152a5689eb5a79411350a77a164
+EBUILD qtquickcontrols2-5.12.3.ebuild 582 BLAKE2B 9a2bc4ff650839c6aa2722e9b2b58ed5d58ddcfca66f7d687043644dca985edb39eb5be42d706ac5bd350744b95a08f0d9968fde74b14de25e57b324745bf417 SHA512 b3cff5e8f36e14ba76d1f689942a10a5def65e75ac88d79ac6df9c10014a7fc6fa986ed3b47b62a798dc98ab7cc87a01f35e64f4847fba478e117ca0f20f9f35
 EBUILD qtquickcontrols2-5.13.2.ebuild 600 BLAKE2B 5107e08f7e250629f7eeecdaf379875c6d681a614f831f8d271c111b4aa964199007254e9a30493e46a76c2e7bf5e17ac15c2f7db737b73713161cbfe2448af3 SHA512 13b42aeef146bdc535ecc4fcf5bce8bae2f04664367dbb7d9f9e1123de254d6f9088a0b4654df96c0ae5a56314e7dc419eba01a55e8e6c3f99dfad58931f3bc3
 EBUILD qtquickcontrols2-5.14.1.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
index 082c63e07951..decc77e8a05f 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 7e5d7dcfbc93..b76a6fc3d6e4 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,7 +1,7 @@
 DIST qtscript-everywhere-src-5.12.3.tar.xz 2674896 BLAKE2B 9f655989505c288d22c9d961e79227cee84ce4d91f6a61b7038e3b993da6f610c3703ad24b2146931c7d46b1765b60f73af8adea6d55823d0b973a99b61adac8 SHA512 4c4498acb39536bdc03643fb1717c7a47c82b1734cf67d17d40bc216084f01e837648d261f7f69e317387f9c6efa9aaa6b0df8f5532f55615252c95b1089ca1a
 DIST qtscript-everywhere-src-5.13.2.tar.xz 2696452 BLAKE2B 6d13901412eb8680e8c3376c7bba7197661679ad9d6a4a4f55766a8f36869c0aca268fbf5db8ac4b3ba02ecb25fb9bec8aa914925c826c0e59046802d3bbe4d8 SHA512 45248b7498f316c8532dacd827a958d90fe40b10ec0c88d68f984816152bcd4c6ef22064d4a0582354a37962c590b67731b278311094ac4e257e89adcd9caf40
 DIST qtscript-everywhere-src-5.14.1.tar.xz 2654744 BLAKE2B 758469d0da17e81bbd05856af7028ae4660f9025890a477d4fafd6d37b3c9155301ec66514173d1fdf8bc77c155eb1c3826ede8b3f1df0ea40f8dbe2a9528048 SHA512 9f4fbb038319c93c03117f61380fc6d1064191f0b738de054c2cee2055e7ddbb06ce3d01855b22dc2284858569b4aebb4e838ac0c7432e123421d64909c1d8a4
-EBUILD qtscript-5.12.3.ebuild 638 BLAKE2B c689d9a270e4792b101f00f4423ad0e3072ae5e48b74ecd35636f9551b6d126d41e0626eb281f524ce1fd7fd2fa56e3cac96e93877a27adf6f2a1d57e8d85b53 SHA512 b2839707d18084e07252aa6ca64bfa1195189173f1f43a65e357592c881d2dc08557537289486f6adc3b65f7fa3300ca5a763dd8ebe7648d88166c806e15bbed
+EBUILD qtscript-5.12.3.ebuild 633 BLAKE2B 93c111ff5692b085d2d6d8d6400416fd0fc561608e882239ff6c05aa205bcfa70a668341e8c44b9444f8789f8699307b6709c8fb2a41af8f736c31e22f349c1e SHA512 3f2eb76af58ff73110257b267868c09327aea984a20df4075cac4c65c10605f508ba1bc1464f67cf4c208857e56cffcbe4abb2d088273e1850c0e17095b7379e
 EBUILD qtscript-5.13.2.ebuild 674 BLAKE2B 9d2a0671f1268f78a940a447c65909305c28116ce0f09e264e532cc767ea0878ce0b41058cfa251fdd3a73888f7cbd9e08224f05c70ed07680bee92c3ccff023 SHA512 be53e4e4974b28357280de58c7ce687001d686e3a1a5718a00a98352169c7b8d18f1d1d1481a9e1963e3abb374444f9c2658217136c14932056abcca3be8f59d
 EBUILD qtscript-5.14.1.ebuild 678 BLAKE2B 0b449ad3b23cd214f0e96d45aaa95fc5f44d8e3ead2e39f01bea6d04515ff81096e972d7e0c3413096ad3f2b65a455c989bd402be40b4ff116128a7f9599b756 SHA512 e0e26d042129ac2745351dd1680aa96d08be783b06580cce163339aba3d25e483fad6056e8ffcd53d29b20e5dbab530801e5261daef7e5d6219b67a57a44b041
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.12.3.ebuild b/dev-qt/qtscript/qtscript-5.12.3.ebuild
index fb743bab2139..6f240b1a0f93 100644
--- a/dev-qt/qtscript/qtscript-5.12.3.ebuild
+++ b/dev-qt/qtscript/qtscript-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 629ea7fc0192..760c0ff636a2 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,7 +1,7 @@
 DIST qtsensors-everywhere-src-5.12.3.tar.xz 2037212 BLAKE2B 1f75ceea8fdf8e020e73f2cd8377ca13128bf9aafc71146ad96e7cb1f69df83af2889b5a5684fdfd0abb18553332cdda2f9d8753233ed743d0a136a625941909 SHA512 cf0c8c58bbb84debd6b464bd9b91af7e79a301031613b8a2d0715fa276573dafea0a1c8e472fa2a2d4debd9b26f86a5e6efa9a8d57f7ab9102b1314d609579e5
 DIST qtsensors-everywhere-src-5.13.2.tar.xz 2046708 BLAKE2B 10c28aa33a372a84255ceb04f803e11df77137a6ea2ec7c84a3e07bcee5746b3e8d9d5c0e79ca97ba3b25401087dd434039c6f6b3400aeaba17e0ec4673ad1e8 SHA512 47fc4f9e5fd9451de38896d388b85e6c0813718a860ef7c98666e6a1710baf38e7056a61c799837eea4efef083b79f9c3a380364792fd0f3c107bdd413e1bc6c
 DIST qtsensors-everywhere-src-5.14.1.tar.xz 2050076 BLAKE2B 824f039b9ce960298906df3501554763c6cba211a4a828bc728d67c936a52b1eede7925c23c2326c666d25861536d7aa2943e74698445ffb93b0d9125bcf9ce2 SHA512 48113863561ca0e5ada249505f2e8dd20512c2591823f296e5a4aacbfadf24e221c7ef4564071a300aafb8dcd88e87bb27a864c4f36e534089084c347e2a7bed
-EBUILD qtsensors-5.12.3.ebuild 500 BLAKE2B a8724fe356cfb532f34be65ea904de7f2a0cfd0b048bfe74ba618811b5dfd8ed012070027bb2e9b9496652367ca69fc4fd216b7f4b391a27ffd3fedfede451e9 SHA512 4482698a4f4ded229d3d104a7b6c562bc77d9acbab10178e475a32fee90365407398808d45a21d049265faecce80bec6fc9648d1915e84ac703002eeab84697f
+EBUILD qtsensors-5.12.3.ebuild 496 BLAKE2B bdb31bb54f4324ee34c54e1e6a8f2e2a77733a45771a1f4ca394199a30337e8dc110367d2a7eb0159ad249f9e2d81fc70ad777f13a879942f34c3c65eb419516 SHA512 a48fe4dcee37747cbdbf68da8cd4d52c3793550b2b88cfbd2a6f812a1328c5f61610b0a2c3df80e29e65790c44efb8674b81740ec752a70b6f0467338f954c61
 EBUILD qtsensors-5.13.2.ebuild 537 BLAKE2B dad07d47eefe86972633f8ce41dc0d41f97eff0f56ac57334ae4ddfa7f4000bdfcd0485ee9d47b5208e37f2fb4942409b589139b2aae649f817ffe046de80656 SHA512 126ef384e3fe27561a41f00d07c57b2030348601453b130dbceb05f1c84103516143375a0f500682e218ef89e2d097059b7c7811c4972d160a62ec080443eb88
 EBUILD qtsensors-5.14.1.ebuild 541 BLAKE2B 5dcd6d002fc93ed5d9b6c16beb21a00232cead61bf2e5ae49764e306836fc64b0339b6b0859534535f74942ce9f1ed3414bd35e44cf50a37413269427747d590 SHA512 56a3f5c768d42c2b3d9e1575ff3477792d255a7cef1969c69317bcebaf82649dba4c31ac1ed64ef1acbfd168173270e4b963eeffdc851d0beeba88a6f96f30e5
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
index 816b74b09c1e..4a9a57cfb96e 100644
--- a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index c2cbe67c7c33..59f5dc47edef 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,7 @@
 DIST qtserialport-everywhere-src-5.12.3.tar.xz 302740 BLAKE2B 105999b369422c4e819c85bdcb2899eff2af9c8486ea485bf89f6b1fbe0d78c8760b52e06942145f7a0ad54c0a25ee504d9b3833536af3cfd88a2efeebda5b31 SHA512 42551b74abe1fcaa1972fb1134215987d7c1d0fe73874a4c6ad5b9aadad71a2066a1846c297569bb1562f94e54a406e8074d444deca510a566e27cd386b47ecf
 DIST qtserialport-everywhere-src-5.13.2.tar.xz 310736 BLAKE2B 559576dd0cb4a9eae1220e2801cde03debd80e7cc885b64630479fc9abb8d11c67c93a763a81a5faa482d811f1446fc294919661dbe0e33b8ecfa896f026b6a8 SHA512 e8655eb5f18179a922f96ab5ca0014dbf1da21b581f2e0fc146337321dae85b1218ed48724fb63b211ea7349f428c176543292284d5c2fae63a4e66146f68c68
 DIST qtserialport-everywhere-src-5.14.1.tar.xz 316528 BLAKE2B da634e8e230d7075a9b52130c82af193ee122f1c92e2b80357e81675f17ecd25c68f4a92446ba09958390b5dabd03faa3d04712e2a1b7b943b57a387b424d142 SHA512 89a48df4e31b6ea08b33ba1929b26001c2fc4dd815e7a1860e4a8c3d41437813cc9f0b13c5e2d64bf1357a5a81a619543264e013aa3ca2e5e2439e885ec270eb
-EBUILD qtserialport-5.12.3.ebuild 510 BLAKE2B 35c164000d539f31f223f27c3f4d595528e43df90aaeaf6653b43b322fd09e241a16e51c9eee2af39611b4caa7cafb0b83a245d7a13735ca2bce5d90d1a792d1 SHA512 e802305c74578291cf1b1ba1e583988a113a3ecac51ba731b2759fa1a1068cabc31aae02d66631bad021895445b9eccaa17716b46538283bcb398f7eac725774
+EBUILD qtserialport-5.12.3.ebuild 506 BLAKE2B d4d6a1eb71795bfdec912bbaa682e91eb3ed4d350d95ff4e6c23b513e67c86eaf01b604894a53952b73bad824d54f7ee506effaafd13bc465028627966257c54 SHA512 8844967b253d68a7d9d0b8d64a95dbf017dca6c52c5a2a1df0778827b59c00f260cb15ed6576ed4e65be1253ecbd004c74e098fb96ccfa1a11e779ad78282337
 EBUILD qtserialport-5.13.2.ebuild 546 BLAKE2B 911139f51dcacf5e489066a6ad5624e5020fd6e1ff53f7adacb325b486c50d863601129a7c0da902e02345f4a325b522185d3ece8f5c99943afaa7a4b93f172a SHA512 5d3130d4b8721c17f6886404e70ad855af166b95e880faa4ea892423bf4b99954cf74c7cdf9e5aaff0dbc4607ddb327d35552f8dae3f784687b9faf286b4c43a
 EBUILD qtserialport-5.14.1.ebuild 551 BLAKE2B 6350ce0559c0fe8bbd286800f537fc75a4acbeb3a66287abacfa48772b2963657a16f1a2178f75a18d66a8b9ba56820d8ffbd00adffd5018c5c1d54dc5d083be SHA512 8e19ac9c8b00974f144ed31c1540cf5c78aefbc6e1eba6df609b6a0a85ac4c78fc95399689c28394e998ed90247b4f5f4623edb33f9cf737864fef6658013554
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
index efc12e8b1cee..96e2b5cccfb6 100644
--- a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index fef41034c0b3..bfa7f7073a7e 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,7 +1,7 @@
 DIST qtspeech-everywhere-src-5.12.3.tar.xz 99828 BLAKE2B a48006c84240091c09af185a6cb6b8df732f94452b92d734d4fb7383966d1be04dc0582c366014f7b75deb2d07c54b275adea3bfbb8d307d2dd1056e4d08c94e SHA512 9623a83cdfbed07dffcd8f0808c2a514c97fda72b68827d917f1a8ee3072286ef8bce06b114db94d7a0c3fc79425c2540fa5cadc6551367fd4431e5396395932
 DIST qtspeech-everywhere-src-5.13.2.tar.xz 100312 BLAKE2B c033b95351278d0cbe9a665a16a0b145bbbd6389f19ac63a166cc1fc63b60c3649bf48bae1e0060b855ac278ed240954afcd4bde9adc1a87742a0dc3299aa55a SHA512 9288cfbc37fd308deb41f287e3da38b5bdb83088fbc0f0276426f44c595a53fdc476b1e6122320f28a27f590e4801320eb14599dafa7491aa0d50be0bd124e27
 DIST qtspeech-everywhere-src-5.14.1.tar.xz 101072 BLAKE2B 53aaec0f74f516ddffb154401dfcad334e96f5ab7935e4aeb69d2ad20012c3006ef355b7733023ddd871fdb866aeabbbac809c03dd7d304cc303118e34e482ae SHA512 8249e374735a4a3de6b8795a5c09c9bc285eff8fc7e98e0a2446eb6b7306da1decd657bf92d5b8d195b042e7459097ce9129c8f6e4a23326f698c6e7010c46a1
-EBUILD qtspeech-5.12.3.ebuild 421 BLAKE2B 4b58cf3486b81eaa56019aeebf192925a08eb8d9b691a483093670183fe4cd0eb6f60afa3003beb0ee52fb4701d6117da909637c5774103e8d657942129572d6 SHA512 a7afda093c200e84b81e47690b635f83b8bca9ab6ed889a5917c0af578918deba83ffaabcabd5cc6831f5903758f52f31b09832ef325653bc27b6faad9a4957d
+EBUILD qtspeech-5.12.3.ebuild 416 BLAKE2B 812089b1863217bb6ecc69740615c7f119cf30367df31294e50fc3e48ee7e3d962f71eea2b1554454767b4f9c01733d79ccb870bb662245043afdcebad33a2a3 SHA512 a214503ecfed12da00b527bffecfbce51b27b7c72523cd856b813f3cf8e2bb43cedf83295e51d13524038ca7f6a2ddcab236b6fd8863ab822094a8e77f43b0bc
 EBUILD qtspeech-5.13.2.ebuild 434 BLAKE2B e94c69aacef19bc557de8f366ee5aac18aa88f591ba5e867bc64e9200be05d67a90db91a2d79579a3ef542ca5b407c642b5cbda101f0e9252ca639f89c4b6b7d SHA512 5faeb1df6b1c5f2aa1c27cf47ca7df5d492cad239b3167c57b8545e3dd28e2c70ac70af9a2a1af3a295b88b801f3eacc2e96d6e015c63df7b045c10354630a1a
 EBUILD qtspeech-5.14.1.ebuild 443 BLAKE2B 01cc92ada40c606dd525c64c2204527cf5f9ecea3a56ec9c78b44732e57566e0cf91ee933d1589c20a1ffeefb77fdb46a50521b846f18c8dda2336ff0fb4f252 SHA512 960505cf48951041c7ea2cd4a70e9ff7efd8cace21c5b64923cbba26815a0cdc2cf2f1472546000a1ff8ef5bc25902629861b161c932e6bb98d48e0daa652987
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
index d33ed8c67026..6bb70663def5 100644
--- a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 6d9eb8daa421..fe955bb6faef 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -2,7 +2,7 @@ AUX qtsql-5.13.1-postgresql-12.patch 4639 BLAKE2B 85edeacc1c2021bf5e6abe9f76d40c
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtsql-5.12.3.ebuild 1201 BLAKE2B ad6a6effc813d222636b5066a6704fc89486dc3260ecb5538b27a9cc870366b2aa72575115cfc4b7cae6d985054ab7434c878b65f897e6cfd4a68696c845fc8d SHA512 619fe6c1906b9a26f23f2d619f431f76938dd8230f32cf24c4033c4b01f134ac3597501cdc5345121b7f8ac0d15115ccf31eae17e48d711ac646be611298e412
+EBUILD qtsql-5.12.3.ebuild 1197 BLAKE2B 0a7010392147cf23de6ba73f438e749364fffee1d643e98101421f98db3e9f5ca3f6490a3f607550235a37b1edd99fb75564883fb2236eef932be2816fcfc679 SHA512 9786f47e7a008804ebc8e8f2de5edd09d17815f6a8d82c74eafa449a3bfe3b269a07c8978b9eedefb6fed1748e6b6d053bcf2256c4bae4ff08e09f014dae5db2
 EBUILD qtsql-5.13.2.ebuild 1341 BLAKE2B 39d662a4a82b324e96df2b1528c9e3d9a15213272bae4d32485d3db39c159f8350b2085117e466a7cf2f10f6294ae747644687007e10d0e2923e24f98181f7c3 SHA512 ac36bbd160b857a163a322b09e14692a90d5c3f21d122f7c82833534807c63b346803576e1522a02fa21ebee667e93b0ef3ea29d1a16faa482c364eedb3d409c
 EBUILD qtsql-5.14.1.ebuild 1242 BLAKE2B fcff6cf0126c7beac666985a578cac5dc97baf5ca6c0c4b458c1547da5738515e2eff776c24312d8c2c3a7f49c86f4eb30f80c64eb1a69d329a0503fdc604fd5 SHA512 7669f142c47fa3ba423c415f716e1b6cd8edfb7c94f66eb0d0670da27f02c377ad8692ae81557d7c359eb318ff299b0045723d1a97e2f38d74d35bd76a1853bb
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.12.3.ebuild b/dev-qt/qtsql/qtsql-5.12.3.ebuild
index 5380e0e1dff6..2eef4d42dea3 100644
--- a/dev-qt/qtsql/qtsql-5.12.3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index a4a42820ccba..c48b1fa66504 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,7 +1,7 @@
 DIST qtsvg-everywhere-src-5.12.3.tar.xz 1859680 BLAKE2B 9ee0a2dbde09ef19fc72285f5ec9b865fd65c23bbecc4fcc8969a5f84bbe31818a086e066f32873e0cfd82aaab4a077660eabd2cbcc7494e84949c64b4a99740 SHA512 23517dbdc30d7128fcbeb12a301eeeb300424bb17bc0d156d5e9298c092d3d3afd2cba45768f2512e58977ee2408450f50c385e03a47ccaf3ff6bc7e4fddf61a
 DIST qtsvg-everywhere-src-5.13.2.tar.xz 1890380 BLAKE2B 7b15ea615afe387e39ef4aec60489319230447abe560bbe2ce5dcc283a6ed6d49a44971306baf51791ac910feb25896324d48a21ff3a85ffa4a480354c077ceb SHA512 fbe2df9e8756c8982c0e91c0d0356e50dd22d898087dfd028dfa6ed363ea18e1ddce5d5838d705e2d31509d1d823ccddcaf5f8916c587919e10a39ae04ee0090
 DIST qtsvg-everywhere-src-5.14.1.tar.xz 1879708 BLAKE2B b3af3b007b0a80cb90af361526e09439510e977047bae784728dddf7daf00e2c35d58315423a0ebb4b7326a55957a8d51f19829edd9a371a522625e6a3faadcb SHA512 022f2a4ddfb13e8b35746394f968b117b38bb805869cf3dd8f354d3e76b3e64e47414e9d12dcdb04bcf2162b520ee5521836d6ee4a6d1257e7f1e5ec565ca821
-EBUILD qtsvg-5.12.3.ebuild 416 BLAKE2B f0a92334f76ce5a52c416a84e875d5371a8645d439bbf43710c2bd7cb0fad5716e904d4c2ce68cd0d08729ef08fb30fb9197d7532bc937d1dd2f58320da10218 SHA512 d2073f556d1b61e416d5379820347b198ec47ff75eb4306065c1699d076347ec368355e29d136f9e2742e811976b35495abba794546d8cfc696b9853695c69b4
+EBUILD qtsvg-5.12.3.ebuild 412 BLAKE2B a325809805468bfde4fb21cce8a7a7fbde605e8a115a92c95717fb51314ca885bbd6e31cf2f361a43409f709556191bed73c12e3edac01a4d6b4ae7303f3ed30 SHA512 f35216c4da86a65d4da38b56c1b4e8a75fd9042585a699df458482f6dbf2cf4b1a4d70da5175d169b3514da34d66bc6b379d02ed949aeba70992d7497db62227
 EBUILD qtsvg-5.13.2.ebuild 452 BLAKE2B 89d25de2be334ae65cfc7cc89ed5684dccdd25da903d175245b366b0b01b712405bd111ce8e684c0d63a16fd85991018ccc64c3c176a34a539420b325a4d45b1 SHA512 0ed2442e81ab7b066d2cd0a211b93d9adf3ea87ffec56cb9a010575f249ab69450239c48c88ab726f787cf7d38ec9a074f6cac713b419d7c1673cb919b53e518
 EBUILD qtsvg-5.14.1.ebuild 457 BLAKE2B 6465e3adcb5719db36899e6a68af8f3dde1e6ae72b321f845bc78c46e6533f334dea6ef7e5863b4d55fd2c9e1a724844e864728064c6f63ddb6221732650e5b3 SHA512 21de92c7242d66faa1fcb8fb1d3624b3769803147c2d5edce05a03fb745c26a37b5a4c96a9a153e19645d6d41519adaf86a5f10a2d3e29a8cfd31d0198b1a49c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
index 55dc3766278c..451498261337 100644
--- a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index d3d1745aaad5..9e226c2fb9b9 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qttest-5.12.3.ebuild 500 BLAKE2B 439e3005d4741c4d661f562908908bfc5636bad463787f13d2f7462e90d65914559cf7c04f207ce6d333199ca7c3c333a0fd37b7844a97cf795a7184f31d7d0b SHA512 6c28426c3dd9519a58bd89e149fe33384aed0f9e5bd77ac31f55762098b03adfaa3a2f1d92aa62eb2242a3f76bc7d302fc7e56fbadb2b136475f6a6988b0e8f2
+EBUILD qttest-5.12.3.ebuild 496 BLAKE2B ff2037510b2f71960ea3e1250426f12ff742de4717840739fbee9c62ae3f2148edde75c8c9aafd18911abd35aaec3987aacfa9353b49d308856316f61b35d445 SHA512 b6b3d923570ea230e1a5d40639bd07ce8df7697ec5a556057bd4eb2203f54b9b530f48b326ba4f4d32450cb9c9d41e08e60a88c73e824385eebb3fcd773d7d3a
 EBUILD qttest-5.13.2.ebuild 536 BLAKE2B cf7db578f24f5c030cb867ccf8ddac5650334e54d3664687574d17d5902f7a847e89c42e6b9d1ec45c78d5bfe189ce52c5629e51b72f0092524371971bb228d0 SHA512 15d011a59af306a3bbb9119af3f3251bd709de04f792f4c1df388b510a61d14884861ab9dd0b84e60d000c66ec837dbc6f410ffd92d28e4d53c878ba24d794b4
 EBUILD qttest-5.14.1.ebuild 541 BLAKE2B e0b1084021c6816762423f329c21e7b4b0d36ca3c8062a8c00f7753ad96ce5271d0a7bfade2f606584a1c6d3b4de9a5b59d456fd3efe884f9c9c33d767fa546f SHA512 9a5dab7a8f65dc2614ae3d699b8b75703f85e208dd075a493926652ae499b3d249be63c4cead61a73041b4306a2b441ade0d1663e2aa0f3c436162ab0b362721
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.12.3.ebuild b/dev-qt/qttest/qttest-5.12.3.ebuild
index 89f3ae8814c0..600060d9f9dd 100644
--- a/dev-qt/qttest/qttest-5.12.3.ebuild
+++ b/dev-qt/qttest/qttest-5.12.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index e52e9abcda5e..80c98a9e4adb 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,7 +1,7 @@
 DIST qttranslations-everywhere-src-5.12.3.tar.xz 1375832 BLAKE2B 5fbddd0a1aa58f367b4089dd6560e6251451e623c5e81078ae428a9420386bb6ad60402b6538d4a4004ec28f84df78896e73df81abfae64cd4ddec1c18fa1cf8 SHA512 76e31a3c6a6824666b2f49d7fa0ad6e604f4a8fcb408261cfeb7baa213fc2f54c1382f677c824f47e7a629776637c699fbe215eecfbce85c3ce621c3de9b01ad
 DIST qttranslations-everywhere-src-5.13.2.tar.xz 1365880 BLAKE2B cca622d9bfd4573075a73ae63033592647ad1d79e0c77cef5a7b12829559e1808f8985bb4de110ad4a0eab2889acb326555efc9fb7eee98571827bdeb6705247 SHA512 c2e3af076a90920d571bd12c6a9a218f2756bf52922dba37826791cc9d3e5b027b1d21d83f18dba76f20c029c53a91da396b56e68fb26c3d769a7ba06a3ca855
 DIST qttranslations-everywhere-src-5.14.1.tar.xz 1348664 BLAKE2B 49cdc517dd148fe7b8a96c788533a7a5bb3e94e390db04e509177b4af908bf31c6f2f7784188e353779519315c09fad45f21d0a2e73c6e4beda190df9d65ecf7 SHA512 e90a630fc1014543c3dd07379a7a4098664e25ec59e7c67ec8f9367e015a4351f8914954d3334ff44508a417cbd55a8dcf6f03c91aa75217fc723749726534d3
-EBUILD qttranslations-5.12.3.ebuild 337 BLAKE2B 739881078bda31586757f87e334b7ebb656835f986f0b79e193ce7b6bfd0195dc71a9d1b4acda86e4490edf15239c6cfc8e51770eb7ded5c8cb057d6adf2811f SHA512 21a4cdb6c72bd0aa58844e23a0845b7bef0611e0745c16813e4eaba848a9c3453ff1c6068a10f3a3a8dbafe64c5f00c012e52d5f1a29ad5cdef28af0af9fb30e
+EBUILD qttranslations-5.12.3.ebuild 333 BLAKE2B d1ff00bdcc49996e149470c841bd0c58f182c05ebc6895ad4e69c83a7f735dcecea106f079c30a476da0bf23b8089add96f8596716560882f3a85aa64e0c0bb5 SHA512 c08d2e6a28ca06539bf487739b6ea9ddd609edf16cc6bf72bc4b72800391f6aa65cb7d4b6fdb4c874f2be19dbdb0b266920c9ce07660d5c5d1f4dd5d662b09ae
 EBUILD qttranslations-5.13.2.ebuild 373 BLAKE2B 1dd9b99c7fbcdb8ed9a518f486d98b48fbf8a1c36d9deb3d507b74479a70bf708231090acc4f9e9d82a8bdd9d4f63018c2546cdcbed4f8644cf664da3a4abb7c SHA512 6dcb1cf8482d78f16d44528b9b7d088fa66cdfa1c89332022b9ba7dc6090144ced3b33db6f935a141395758c5c1ca4f7927f9f9b6a69b1c21ec2a9623879c275
 EBUILD qttranslations-5.14.1.ebuild 378 BLAKE2B 0d7d779be190e94f2013cdc097ee2376f828c846570b9b06bfc81d7248e4978af2029efb2e04b9c8c57ac309597de630fd6600828d0ab81928c7434f77f1dbbe SHA512 30ecccf1ab074aee9284a7dfb256b8f82a7eb73877d6c0a0e39265ba42c40c87bd0fbc63f56fc7ebc5fdcdae60a7dec147fe442ce64d17e6ab85ff58c6628e0a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
index 26075dc5ce19..383733e771a7 100644
--- a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 80d99643a59c..2bf63fe29fe0 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,7 +1,7 @@
 DIST qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz 10916144 BLAKE2B 871db74b3540980d4392fa49d77d60c33f5cbd7840cd41797c168c324f9ba46214cf31154cafec9714c17b784c0ed543f5498146cd3c71228c320fd67792735e SHA512 1aa00fec7e333e4fd52891b82c239b532cf41657d9c3f44c6cc1c211a1412dbf5584823511e54f3feb33b3fed9c6e0171b55afde2df9f0a358e2e4885e1b2686
 DIST qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz 10923292 BLAKE2B be6eedc1c1c2246e019e22fbff01f9a307f80bc2e32d9a48eabad792d89c188e92d409181b934bc991f28acb31e6331b601e544e799f362c439dbbf0e5f73db7 SHA512 63b6b1ba7ad00db3ac019b8380e76a7881d3c85cdca62d4d539b0e84bf049880f2d1405ed90cd44259821488b582762af97ea3a06b1bc5cd5e5d975663cb613e
 DIST qtvirtualkeyboard-everywhere-src-5.14.1.tar.xz 10950684 BLAKE2B 4618ed63101c6f76fa33e921feefe63d4ab0541ed2722fb41c5d85879284b5747b1748401c80e3f406de47093f523a53014fb45e43b0be664f8751ea40097b4b SHA512 e9e6605590a83d394ed2cb37fffcaef0ae84cc09bfcf388b95c34aa686f4cc40e8f29fa5441a979cca71f5fdb9b53b777658c2d756226483f6104ce20517f42d
-EBUILD qtvirtualkeyboard-5.12.3.ebuild 1187 BLAKE2B 7da436a7e44f16cf1ad1da4947229ecf801652950320c66abc19d402056990344331363c7132a892abd4a46a68db6621584f36e6d89ccda4dff6548ef222b611 SHA512 62acb2220a957b81974db1bfad34459cbf5a4c1273c5bb9968d86f118e91d7804efa238cd23aa19167f7a8b4f1b3665cfed0bf4274c7ac969026251b543a2b49
+EBUILD qtvirtualkeyboard-5.12.3.ebuild 1182 BLAKE2B b743c74c90ebdc37b286f6fba6e0a016a9029dc12ea1022121617ce1345977e2d75ae16c44e6a6739993c262070957abd7ebc351cff334ef9e87a4505fb6b9e5 SHA512 7f1ce9d878d681f2de1fbbe7e2231269ba5bdf6f9b64330aff8acaafecf60094f35a6540f2f33dcbca4e2363776776c0b82e2aa8be40e82889829b9cff78e255
 EBUILD qtvirtualkeyboard-5.13.2.ebuild 1200 BLAKE2B a90c2a830d1010c4f78af473978f14b4186384089fccf24629f2d70243bcd3be788953953775fed2d64d54992581559ab28a8a550e414465e8dbb63b90918bae SHA512 32c4c395c77cca28c6d46050061f3076ec8008149c6b767133045a94848d2081432bf13cc208cba1646b725b45d99c74b46e11f3a2d12b83a39ad7f97ece54c3
 EBUILD qtvirtualkeyboard-5.14.1.ebuild 1204 BLAKE2B 4d949aa5df208fc05f2bacddb224b288bde6bfcf64f6d4ccc26a511645f39fd4e29694376fba343123d1dfc966b6918ddf1c8ae7dd9b9b4d7923b74c61fb7721 SHA512 9546e67d4f5ccfbbe17c76a21a0e67959f6872a1c1550113b8dd7cb7e2d485cf048e52b52ad4577f3bcaeb544bca7040eadb8d67009e5129ac0552dccd72ce77
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
index d81e51b8c8b9..280f3c3f74ae 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 # TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 9014cbe9898f..7b53afbd0fe0 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -4,7 +4,7 @@ AUX qtwayland-5.13.2-fix-touch-ignored.patch 1274 BLAKE2B a643a7df480ddf24939406
 DIST qtwayland-everywhere-src-5.12.3.tar.xz 432304 BLAKE2B eb2ba520c651467c8ed5f0d870a69c9b07047cb4c05a0c889b36abeab30149861b83ca693efb0bb93dce4f5da5913afc3c8b61933ef0e8307d22b64fce530d87 SHA512 e66f9f41c15cf84165e559a1ff09e20ec21bb3f909b57fab08b0e3f8f9eeacf75d49541b499b1a6514a34d1ba5dd426ec1ce77719910588afa12cb3a7980dc90
 DIST qtwayland-everywhere-src-5.13.2.tar.xz 495536 BLAKE2B eb4352d76caba9ff1d217950b8be40edee1b963a085ca129938ade0d3a68569856bc1a745951d3731c81182b341704568a5036551693cad5926a239587dd506b SHA512 5eb895c2ef8e2e72b71fed027f760913bf754da213e488a6103d9034170a6333f034b3488115a87a5a4e90761425487b9a8ab8e84a68e2e614c159d747408d53
 DIST qtwayland-everywhere-src-5.14.1.tar.xz 544744 BLAKE2B cc74e6ac4519484713795169a91f18ed2535684bf604d12ab900a0fb2502d30c1fa4fbdc5899c4a32505e8f4b2be142d3b16540b6797c1624deac097d45ea41d SHA512 6cdfb527ce8160b562343bfb3959dfcd8ccc91a50817756547f4a0559b77372bee7587bc2e4e658e15b58ecb52c6eb0ef2193e30a285d13c4192bb03a1149cfc
-EBUILD qtwayland-5.12.3.ebuild 1109 BLAKE2B 4e9ca1ef4273b07b0d8f8f1a7f42693d5a638cadc7d69e92ec0d81f6c77f6ca839e0d0cff152554246061ffea885c06de4670dc8f844e09b821362be618d9557 SHA512 60929db079bbba8a5dad0b28b32f227a9a3cadc00cd6bfe9b45001bfba64c8b80b66d804a053310059cee4c00345bc5d14cec965be3ad5df8a3f7078f73a9f12
+EBUILD qtwayland-5.12.3.ebuild 1104 BLAKE2B bb4b521407462f24a4e438a3d91682b8b976422ae2c661905414a7d156dbe6a409c97297c61e247dd3c208e98826f1db3acbf45ca99f4879aca7f4449c5ac10f SHA512 e8dbf7139d9059fe0970ad660d329b35191542a541e3f2ddfbe5ec3d14fb9261713d0dd6c131adf4909d8b1d109aede77254156c7c5ef7054903522bcd26f2e1
 EBUILD qtwayland-5.13.2-r1.ebuild 1353 BLAKE2B 23009b3f906ac833d9774623878c57793dfbaea37cefee47e8d984482c6ed2ea3dbbaca170a8ca310545b0de4832545dbf94fd77ab2ccbc1a5c0a1e251fc689b SHA512 8cc4e5014c294c609e1a4ec8d149e700d3cba63a438daa5fc719ca9357ace304d03084ff7e841773e7cbfd8908316eaa39e0c436a3dfcb805de002325af08d2b
 EBUILD qtwayland-5.14.1.ebuild 1142 BLAKE2B 630eab64e768484e49385d15c88b860837400f75e603fdb8f2bb2f3231ac5b9342f578a745f33464bbbbb2c94901a8ea8a3195c25f2327a2d40badb109eaaa11 SHA512 8c9b581722932a5946776e2ef7f78989037f33d6d50b070767a33f67a7de75b495deb317bcc34cea0ea52b9cd105f50f5f2ff101208347374a52ff3970a63b6f
 MISC metadata.xml 593 BLAKE2B a6af5855403e860ee4a4900cef3019fea4552e8c9edc02ada1de5edc467ae9a8f9d86aff6bc656c4154ddb8018c8c8599b75f92d7b766c48e05e56e37999a009 SHA512 2603bc1d30993bf0d0b94784c7dca7c2cd2d15ff5fce4ca4bbdad4b2dc65a8ab7b7bb8cf207649ca4717ca6e4caaa8c75e079db81f0598511a1355c0f325a00d
diff --git a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
index 8cc97662734d..b5a4ed7dc206 100644
--- a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 99a3d4e47a2a..8e2c86d19ef3 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,7 +1,7 @@
 DIST qtwebchannel-everywhere-src-5.12.3.tar.xz 182808 BLAKE2B 03b1e906e4697844e27a9f4fa7c74bb9df228d31c85071299645ff5441577f749b7019097ac9021f3dda02ca290aba74d3494adfb9b04d8614c82586abbf399f SHA512 2dda4351f5f3a5895a955d0ee77e55f758233672005a068d3e840a01d379727f99287fc6c8fb96516f23a5a8c4ebcb61098690fd3351e79be608e28657534006
 DIST qtwebchannel-everywhere-src-5.13.2.tar.xz 192652 BLAKE2B f028a22f0644ff8d0d037c3007b25b43e038b0c146416ed5e67f31077f6a237975cebe05c557f280d898b378eb6274b8bba44893689f0231ff6e31f057c71b5d SHA512 7d6352016eec58c5212898ada0095337a732f4c67f161b907467a297ca68ad22b1a9c507f5a7482f3c2e6fa29a0e6b4c4ad540b69146c5ea4f87671fc45dffd3
 DIST qtwebchannel-everywhere-src-5.14.1.tar.xz 202524 BLAKE2B 7b64682e7f3716f4da82f89853fa3d682a47d900e9317870d81ba0e33a3c9dfa41570294eac0eeb5f2e80e077de8747cd5c922593e9874b681cd26dbf989e2a8 SHA512 7abe214227efcea665a38488b73286ae8335490d825dd8886270e2c1cbf7382e27d6ec368b28f9876d6843029023a63e58f42e2bdb6aeb1502ae464af3e8666e
-EBUILD qtwebchannel-5.12.3.ebuild 541 BLAKE2B a63ada3e5d6cc481d6d641487ea7287839b3f54aa10d2c8694c27cdbe73784d7bcfcbe1ecaad71594a01f6570aa2ad4ea16b044c75275c145c3c73b4d5703603 SHA512 109b0f7dcd9dfce5ef7eeefdf9f611876de589985e4aa014792b33bfa0660062cc7c0f91ee43d4e46802613fea4d5ac285e49c46a8a99183838a90ce328edbd5
-EBUILD qtwebchannel-5.13.2.ebuild 566 BLAKE2B 21279f4e734449208378f5a0dceda756f1b558ec4dffcd5111b7eface56442d2c60d9f258aaa34b355b3c78a057d761e9ca4b65bf9576e32bdb09db12db67b02 SHA512 b78de8e161234bd4e8cf033c91d2228c7f78fa5a88e0d0bac7666aba5668aaf170347e168cd32f71cc3b92eb54cef9b747f83cc7bf270693b002589a57e1e782
+EBUILD qtwebchannel-5.12.3.ebuild 537 BLAKE2B 84cb8e8684cd5f8e05d9691a2462a506bd2683759c94453759fb6dd486fe24c96504bb843b97785eae4f4ed0ca1111abbebfae83e1a5df9a658acfa315187062 SHA512 6a2698612596e9d0af161541a2b6bb76ed723536b4778ba0a666a9c597714ccf1ff6b74e730311d8d6ca8257094f80780cfff6c61ede689f2fde522249e7a71c
+EBUILD qtwebchannel-5.13.2.ebuild 565 BLAKE2B 0412a79f0198526acb01052bcd25d99f3945ab798560cadc14ed395cd75f6b336fe58d5046cc44005cf2d468a3270674b611d0f22e6863d3392bf6a69f9c8775 SHA512 08a5119693963f5e845b3529a4e0eebd59ed01c447ad32f68d6fe36e21e0d262a5b259f98fbebe971ebca835189c8f64fd59cececab5dad87c06536c65919704
 EBUILD qtwebchannel-5.14.1.ebuild 569 BLAKE2B bb9178f2a14447d0140d04edda6b6a2dfdba9b6f049fe5df3878884242ec195f21c8854dda23303067f225cfc4970cbde6e2bf81285943cafbe6cf356f497711 SHA512 2293a80586cf32498ffaeab853e6010a8ff0a3cd2d89132912a39b1439f4f6ee576a44a9ef16de739ccdaf16af5cae9673c1553891ce77737d4f33d9596b1b71
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
index b8ea150a4a5c..5dac54f247d3 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
index 72f4cd393064..d6669e5de5b2 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 67c9e3f4df8f..f67c9c17779e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,11 +1,11 @@
-AUX qtwebengine-5.11.2-paxmark-mksnapshot.patch 888 BLAKE2B d44e8772dafd8962805abe412470d94ced2d11e47d3e7e25acbfafa54669677a1e072b435a06ed093f7c9ce27d8d98fab4b042cd49862350d77c944418a335b9 SHA512 893aef4801d1f2a3fad1f4d1ef2c2b122d4004b7966e76d8e1adeb8cc5b03ce8b0ddf30d20690ca6e0b15b76074aa386b46b00d0c828b7684c6fcacc33b2865f
 AUX qtwebengine-5.12.0-nouveau-disable-gpu.patch 3740 BLAKE2B fc2745ba0e3ac264d2f59ede3628f6d4d94db8f175c4cf68444e5dabb5fd0266957c804da7e0e761d8f39ddbe2781ae023aef8db1a907907e7db116b48a8cd11 SHA512 fe407c7907e6e9dd09be6e53f4c560ab453e5081fbbac4392b29fdb32cfccd1157e6a9ed2c7839b1aeda2088309e124b7130963175472a660ea46807299e8d9a
 AUX qtwebengine-5.12.5-icu-65.patch 1394 BLAKE2B 223e449a1086c2f062e34752278ba83a828283aa577b92aa3ba28343fb06e18ed6b94990e46729076b099674e2a0936f08958aa72ac3b44f4cc7dd1602b13cfa SHA512 2b530a6a60e1ca71aba7c7d86f7e831799e8bec20ab6c97d79e753d337767c9f44938f19c00714706f2720bb4b0a3599a44046a69ed42372b21bac452b713b68
 AUX qtwebengine-5.12.5-pulseaudio-13.patch 5034 BLAKE2B 12bce7933a58472dfad4581fa8e949d3326c32f307af73bcac054a94759cd5163d97c5ceb326ea1924d086022b9d316d45a4fbed81483eddcfe1c7ba91d708f3 SHA512 7160583ba150812d6e860550a0b7b9f53ae157679025e41aca6e1b0e5186549ecd49d70724ef84ff9d58abf65b598df44f3c54a456ffb1698d96159db2778811
+AUX qtwebengine-5.14.1-disable-fatal-warnings.patch 463 BLAKE2B 711aea51b588c899bc45131e05cf14b3d78c8d88e75ed2531ee338cb70924f6a195bc541e3d00883951b04cca94100ef2b5c5c2c27d5d5546f8da40450c788c2 SHA512 c3c13b4e98079f566a4ac5ac3272f2643f9d2fe179922a8d4e964d604e15d8c386c7cd8e13aa960bba64a6fdd6f590e9fd34a4e824e2054a3f6ea7f7f9935f86
 DIST qtwebengine-everywhere-src-5.12.3.tar.xz 249275648 BLAKE2B 7d2404084a510c62b638dd09736130eeb40e494f9594339afc7df6628878aafed778a2785f6848702d51b3a4ef1dc8b333d5e5eeeeb8f930b4da839eb70bc175 SHA512 5b500ec6653aa6ed70e7826fe394f95c7932eaea5b1b48f6342a6f18294f75e4f954959fa2f42de0685097679389245d2bc80454e8eea202fa18a326d6d5a9a5
 DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
 DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
-EBUILD qtwebengine-5.12.3.ebuild 3640 BLAKE2B 475a098f209fee144ad01041e34380b731f4b53b8adef546e32ada8856faab12bb0ad1488f2142e8918ce40e692c03ab5103050069fe37b994c41501cae08e21 SHA512 991b4dd5ec9713d5b4fca2a6a7d068bc7dded5e135e6a7211e7765d81baa24987959b08bd41d1cfe11e82428a133ccb766c3fa375189e4e9e117879c3fc785d5
-EBUILD qtwebengine-5.13.2.ebuild 3280 BLAKE2B 4ecfdaec53a6cb6677b0d85a08f076d1c6ac95d032602561b677722b3d7a4bc92364fe3d6185361a01b88a85edc2f91ed679ea97df6dd9b2e1b04e22341e8e20 SHA512 bd7fcdfb2869de701a7970555ad0ffc5df51ce40c52acde7922a9aee787633ee9f0c0489d516b5a5f9336f33f53076034248a812e979a9f7187aead325b9f693
-EBUILD qtwebengine-5.14.1.ebuild 3246 BLAKE2B 3c27add6e8ec42de2a73b7bce7219a9ba4823505fbb719b4e34f52ff9f756457eaa3108e704b4b11ed39d8f34b2dc5bb2f4a4191fc91ff7f47e8236d4b5aec45 SHA512 d08064aa4e706c264117e26775a3de06edb832f7b80e029e51ebcafa70eddc0faba8b3f8b7abea44828605a4de436dccc57d630782f4fe56795d6f57580c2574
-MISC metadata.xml 1178 BLAKE2B 3c9dc86e76a316c93c637b10d9939e95e86bda9bbf3d349575594ab68457b72bc72b9c92ab5650dae9e15cf7726ad904b478b6888744f4cac2382d5f9a9943cd SHA512 20bfcdd36c2f2a6fc95f402bfb6a79982b9fd5e16b659395fef3e41cf475ab76493a93cfa30fca505b0d31c0d2b2d4ef9a297ef8d64fe4d50617b74a7b81c707
+EBUILD qtwebengine-5.12.3.ebuild 3440 BLAKE2B dd0b8549dbc036929320cdec79dc2e1ef71385eda722153668ea44e28f35bc6333a85763e318bf3d749257207b99a659a1d36a8420a11927a638d2ac4c23ef28 SHA512 4559734707f5eb1ea14b6696b4ec5df188d060198a872093db8a096736876df8cc35fc479082e812746a5260a4816deae7180034c7906a467fd35a939fbad96e
+EBUILD qtwebengine-5.13.2.ebuild 3085 BLAKE2B bebfe0b97a8c40a0b863403d6330f654ecd755b00ff916e255ba2b250bf2b2685515ea3e29717323c35eefb0d00e845545113c8f5e090e8546143191a3dad9c1 SHA512 c2f5dbc70cadbf1992ccf94aa1c60e96fb9a4924b2864e53cddc5a01e766cac81a90306a51ddd369859ff3141ff4e18391a7c51ea28b54d50976f3b5bb808300
+EBUILD qtwebengine-5.14.1.ebuild 3323 BLAKE2B 52bb7f548a8a01f631f56898ffdf6c5049f212154fb9afd4a60bf7fee92a2a716c61c5b5aaadb10530b32dadf3c3af5e1f08e52e603c4029df447f15af2c2df9 SHA512 cb3023c439cfe26ba965af490b6a7e1d8ab7f2c4671ab0bd047342b4ecd548b7021671ffa080c0965bef90cedb968e9cbbcd8b95e8b366979cd6c26b36df4321
+MISC metadata.xml 1102 BLAKE2B 7ba2157c180e35ea470d8296d157d73f2fa565cbc8319f41f5ae533b02dc981a4d4352efb1ad94f1e298047a3b56cea097aef3ff09a19d33cf861cfb64ee9119 SHA512 d96e13fa5eddde448bce28c9373022909035f9b63e75584e7f320510f853e1c89dc9417f4280d307e29c9a7f75c89c75b5cc00c19c2d6cd6360812719dd0acc8
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
deleted file mode 100644
index f7a5c064fc4e..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Bug: https://bugs.gentoo.org/634220
-
---- a/src/3rdparty/chromium/v8/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/BUILD.gn
-@@ -803,6 +803,7 @@
- 
-     deps = [
-       ":mksnapshot($v8_snapshot_toolchain)",
-+      ":run_paxmark",
-     ]
- 
-     script = "tools/run.py"
-@@ -854,6 +855,28 @@
-     }
-   }
- }
-+action("run_paxmark") {
-+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-+
-+  deps = [
-+    ":mksnapshot($v8_snapshot_toolchain)",
-+  ]
-+
-+  script = "/usr/sbin/pypaxctl"
-+
-+  sources = []
-+
-+  outputs = [
-+     "$target_out_dir/mksnapshot",
-+  ]
-+
-+  args = [
-+    "-sm",
-+    "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
-+                                      "root_out_dir") + "/mksnapshot",
-+                       root_build_dir),
-+  ]
-+}
- 
- action("v8_dump_build_config") {
-   script = "tools/testrunner/utils/dump_build_config.py"
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
new file mode 100644
index 000000000000..40f1f5d6c2a9
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
@@ -0,0 +1,12 @@
+diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
+index 97d3953..dd3d222 100644
+--- a/src/buildtools/config/common.pri
++++ b/src/buildtools/config/common.pri
+@@ -25,6 +25,7 @@ gn_args += \
+     v8_use_external_startup_data=false \
+     toolkit_views=false \
+     treat_warnings_as_errors=false \
++    fatal_linker_warnings=false \
+     safe_browsing_mode=0 \
+     optimize_webui=false \
+     forbid_non_component_debug_builds=false
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index acca7340ba1a..180beb2cfc87 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="geolocation">Enable physical position determination
 			via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="jumbo-build">Combine source files to speed up build process.</flag>
-		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 		<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg>
 			instead of bundled.</flag>
 		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index fbd7648f6f0a..ec2e98d5c56a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
 
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
-IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
-	+system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
 REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND}
 	dev-util/ninja
 	dev-util/re2c
 	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
 	!!=sys-devel/binutils-2.31.1-r5
 	!!=sys-devel/binutils-2.32-r0
 "
@@ -87,8 +86,6 @@ PATCHES+=(
 )
 
 src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
 	if ! use jumbo-build; then
 		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
 			src/core/config/common.pri || die
@@ -137,6 +134,4 @@ src_install() {
 	if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
 		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
 	fi
-
-	pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
 }
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index 0f097f91df8a..f5c244acbfc5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
 
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~x86"
 fi
 
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
-	+system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
 REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
@@ -75,14 +75,11 @@ DEPEND="${RDEPEND}
 	dev-util/ninja
 	dev-util/re2c
 	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
 "
 
 PATCHES+=( "${FILESDIR}/${PN}-5.12.5-icu-65.patch" )
 
 src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
 	if ! use jumbo-build; then
 		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
 			src/core/config/common.pri || die
@@ -126,6 +123,4 @@ src_install() {
 	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
 		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
 	fi
-
-	pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
 }
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index db4d9855990d..92e75c3c12e5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
 
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
-	+system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
 REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
@@ -24,7 +24,6 @@ RDEPEND="
 	~dev-qt/qtdeclarative-${PV}
 	~dev-qt/qtgui-${PV}
 	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}
 	~dev-qt/qtprintsupport-${PV}
 	~dev-qt/qtwebchannel-${PV}[qml]
 	dev-libs/expat
@@ -60,6 +59,7 @@ RDEPEND="
 	x11-libs/libXtst
 	alsa? ( media-libs/alsa-lib )
 	designer? ( ~dev-qt/designer-${PV} )
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
 	pulseaudio? ( media-sound/pulseaudio:= )
 	system-ffmpeg? ( media-video/ffmpeg:0= )
 	system-icu? ( >=dev-libs/icu-60.2:= )
@@ -75,12 +75,13 @@ DEPEND="${RDEPEND}
 	dev-util/ninja
 	dev-util/re2c
 	sys-devel/bison
-	pax_kernel? ( sys-apps/elfix )
 "
 
-src_prepare() {
-	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446
+)
 
+src_prepare() {
 	if ! use jumbo-build; then
 		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
 			src/buildtools/config/common.pri || die
@@ -105,14 +106,15 @@ src_configure() {
 
 	local myqmakeargs=(
 		--
-		-opus
 		-printing-and-pdf
-		-webp
-		$(usex alsa '-alsa' '')
-		$(usex bindist '' '-proprietary-codecs')
-		$(usex pulseaudio '-pulseaudio' '')
-		$(usex system-ffmpeg '-ffmpeg' '')
-		$(usex system-icu '-webengine-icu' '')
+		-system-opus
+		-system-webp
+		$(usex alsa '-alsa' '-no-alsa')
+		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+		$(usex system-icu '-webengine-icu' '-no-webengine-icu')
 	)
 	qt5-build_src_configure
 }
@@ -124,6 +126,4 @@ src_install() {
 	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
 		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
 	fi
-
-	pax-mark m "${D}${QT5_LIBEXECDIR}"/QtWebEngineProcess
 }
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index d663c87e10cf..7b40600b82f0 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,7 +1,7 @@
 DIST qtwebsockets-everywhere-src-5.12.3.tar.xz 235312 BLAKE2B aabe93119aedf18987b4c2211e1cd312a785592ddd0ac371b23e6d5649849bfe231aa24c2de91c20655df7f3a92a614371846060f5b70e09a14f4f7607242fd8 SHA512 212a98d987b4fd16216ac9a1c98e061be6a5bd2e2c4ec8be80424d6f23afeace790fe666abe8a11e2116dc20f17a41ad0c817fceacdfa5f766b93068ac614817
 DIST qtwebsockets-everywhere-src-5.13.2.tar.xz 244668 BLAKE2B a8a0b6327673e8746939e903814adb7194f61eae6954d96bdf25dfe93e15ea7853c4605bef77ba28205afffb1048f11c3b80f6818663681e12cfb1adc064ff2a SHA512 c4d3b31e8110b74485e7fb1d6d82039efe176e8b626209485fbe3843f7a4b9f11708c9b978623d45e45263e6ae9990e927a3f7a9a48ced4dbcb5e954c60f593d
 DIST qtwebsockets-everywhere-src-5.14.1.tar.xz 252616 BLAKE2B 94fa6ee635760f3e09c771731ecbb464f25a66bf836d08afe6d206d1b4cd26a90b8b80bef18e62e105e550f409192c4b9e75c02b3b1810d3993b795000548378 SHA512 ce8926f0c8022182504184141c64897c5c71e430d6366b1d0802247e81445934db419ff61625b046b624de7b459c74f9634ae2a13e2d646a1b1811c4dbe177eb
-EBUILD qtwebsockets-5.12.3.ebuild 502 BLAKE2B 8e4177dae5c6c2e875e641ac96b3595bb237e9cd56a73c0b155aec3f493cfaf7f84f44f188f526b1b6fd91d281e94743acc35a530e3054bfbaefb874ac3ac890 SHA512 f9f2bb2683f193beff3fd952b564ce30f8670b9acf35e468d693bd8563f98a9389d164f62783c0288ba20ee5d3fc693ed40b42813b167219af7d5da580b3be55
-EBUILD qtwebsockets-5.13.2.ebuild 540 BLAKE2B 62d2d4535af4839dc9252e50d9a2e7ec6293beb60b2f7ba0de156db1e5ec11520a2ac29e48bdf2108313ad07e467d44ac1ce8e2d299717ba18599762a5a51269 SHA512 410f07a7aa3def8fb7c216c195a6a570c7f243155c1c403e56776c659e97e50e591c077c9e4512fbd330bd7a1e3579dcfcc8280d14e89eb995dcb2285516b9bb
+EBUILD qtwebsockets-5.12.3.ebuild 498 BLAKE2B 82b87e0e58a5a2a90bc05ed57ab4edcd2bdf81f1bf1e3951b26f0d436f6739470e891d13d33162bf1c50ca02f2557fb327cbfa2fcc55280ffdac537fea733351 SHA512 5dec924ae035e04eb6286787d3603b38e02d0d83de25a35810a19a949486ac3e5424e9c9397cd49f8a46791dc118b99b16a62691661efd9be8c1c1a64a0ee103
+EBUILD qtwebsockets-5.13.2.ebuild 539 BLAKE2B e37ce56a09c5a95bf854cdfa7e93a327b40dcadb6f6d63dc4387cf3b895c85e3624b11b5ce3f8f3bc7f27e14a0bc698747fbd5af617ecf95b546e0daf93b41b5 SHA512 7438f8187510ed7c9213594591cb861d0bdf88acf47d74672c8970253225c55763ae730cf3574e69941ffb0ca58feb13ebda0739e21616930f4329659e3dfd74
 EBUILD qtwebsockets-5.14.1.ebuild 543 BLAKE2B 81ee48cda5fa05343a359d6458e2209496f2e180533db2c4947118d66bdff6dd281ccbf2383ea2176c1b3829bd0c07f1ae0b95e50c4813123c3e23c47614428a SHA512 ed527ddf617aa7def7f2eb8793b56a83627c0a034993b767c0358835ca4b7dda3aeef5ffa483131f69279448893615873ad9768d2bfd8fb5c973ee9bfc22b473
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
index 116ef775f5a9..39f83b243e4a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
index 0470c9ca9563..d9c375383f56 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index e013272e58df..8c43b535a512 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtwidgets-5.12.3.ebuild 995 BLAKE2B 8db2317338c491717aa875ccc59e4c88f09594cb5c5fe9818953ad456fef2d06dcabb03b62c0855d0575af20522a8147937f65739fd06d97ca5a91405f30766e SHA512 826c822844e36013dc8d4bd06316e0e286994f07df8bb62e33320f188aefd2112d1eef2a8b9a57693bbc9c69acece67b492c92cd8f9f2c4ea4e898dbfae76688
+EBUILD qtwidgets-5.12.3.ebuild 991 BLAKE2B c4b7ed1122b057e892aa09ae304a15384e30e4af816059eac30e45d4fff0a2ba9822fa7de94a0cd547e87202c2dba6c068170ea26cbb124bbb229b7121060bed SHA512 3860d9d600545d30aec8ec05307dd16108815b5e9ae04175f2c6cac5b8b801c4d3f312f40b4946be473d794d6ba9f260790a21de844db7b0fd4c5b66184e54f5
 EBUILD qtwidgets-5.13.2.ebuild 1031 BLAKE2B 51d8f2b49f2b76148a5bfe032e08ca31396e3104c9796db363ea68b8b3be9329ad4e643706943022ed7cb6c496804772320a67fda3eb7abb9f790e47fc5d0a0e SHA512 db0366d3af0db13bdcbae882d1deb3e444c06daf7724106846a58494dba73d49e082dd33b312c72326e35e7cf7c4ba222cb870b0efa09cccb1bafe92df84f81a
 EBUILD qtwidgets-5.14.1.ebuild 1029 BLAKE2B 8f85af38196a44593a0455dc9e965792dd13b663148cbfafa25cfab025f49332b49cd7f7ed57fd8fbb9d1c007a2fdd32c5e1e5b3e5970bda180d8512b8b2299e SHA512 3c0a9ba1db1e2976d1aed6e940ac28867472c3e376a2a2c6cba45f826a5cdedea4dd7b7d64ccbe7e52aebcb4d5b8a91c113ac63a7a7ec870d2d10a029e7af948
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
index 0a383e2738e8..dbaebf311870 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 87881ee5d374..c474ace11117 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,7 +1,7 @@
 DIST qtx11extras-everywhere-src-5.12.3.tar.xz 115908 BLAKE2B 9ec7d370630f6c43869f648222ff46368cb57984ae732320974258da5b3905faa372e8fb97c25df8c88ce155c75be601bda28c988cf5b639bf6404213a1dbc54 SHA512 21dda778aaccab44d8c4950fc6cc9fc6748f1f38721d8f775c61754ace81d17a03847cc6fbe98a9d23ea592fd5f6942eedff102d4841daa5847125986c474854
 DIST qtx11extras-everywhere-src-5.13.2.tar.xz 127228 BLAKE2B e1b12f784d657802291419c61646078548e7c4a688b39686b7159d97a281b38e8a05f4a58569ec0abb5bf6f1b5ea5e0221d1c491f23c9c636d3427772074d824 SHA512 229dfffcc6da5cae80412f099c0e1fcdc4d2e13371020cecd1f7dc100475d5ea300a2b4b4da8e3688fdf6a82e371b6feab4f70a171e72a8f56467c7d16f60d7d
 DIST qtx11extras-everywhere-src-5.14.1.tar.xz 135740 BLAKE2B 37402260c79b06c1d83f2b4f3be1374e392ed89444d905b21baa4d4ebbc258cb6f76bce82ef0a29dbc702e238177cd65640af2a096256888b29c8ddc36e2ff4c SHA512 e88c9e0440c5d12003d74182dab5e63f0c65ced93447b5c3cabccd1c8c96e9b8e38fce327e678a433af18d2af683bb4f939dbc3e7bea2e911eeeb71ebe70c058
-EBUILD qtx11extras-5.12.3.ebuild 396 BLAKE2B be05116e9f184773cc5686c897e5a9f780abaf22a47e4e8b1d0256dd93a1867a22a8877cda06e5a143c8a4798cc1acd0bc54a9077ebcf3ceaf82965567ca2c3d SHA512 0f395348177a1094e1832b7c967b0b123e6e9966b3a2e7b8202d568012743ee1852dc77b5ce0a8f90d41dec18d5c23ec038af66c413a8f1917ebe90ba8dfe737
+EBUILD qtx11extras-5.12.3.ebuild 392 BLAKE2B f68bf6b2dda2c8b09481b1dc1abcf41758bd811130f41faeb62b7c21b2d50b1f8102798bc863dc524514044a445a193ec3dd669c93fa7a55dd9f5cf224966ac9 SHA512 a56feb318588e0eacb51f4141929387abccd85c2c60e431f89b224b0621eea76034399e4b28f47cbc8e9ff93fc31f67e33844c2650c99c0d4543cadcf360914f
 EBUILD qtx11extras-5.13.2.ebuild 432 BLAKE2B d0479bcd195fb813b3462b620687e6c0d1cb301f0eacd90efd179a9e781ffa4eaade7983c39076e87cc1e26e2249f7e935f12c728daef9b3369a0260caf65adc SHA512 fad33732474855283befcb5e959a96c3ac48cd7e61bf346c644cea8cb315af48b2702b0f7eea9222b989a0ee8770d304208c811b5ec0d5b146488fc94b2cbaa1
 EBUILD qtx11extras-5.14.1.ebuild 436 BLAKE2B 4be61843a21d0e6986416682d3613c76c8953ee3946fc435c1af771af2bb9a62c9191dabff85bd88edafc81d5029b18f1f8a5b38bc7cefe85f0b42191f5180bc SHA512 6bd6c59c8b68d98a3ee9d4c5fe2816def7c01bc72348a6cf5e7c99d70a46ef0b6b84acc5f478d04dd8863cc5b4222651b204b42aadaa1169d2ba81f5cf7300df
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
index 9cb19dfdec14..f8188c3dedaf 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index f4dca91ab095..2a79185dfc98 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
-EBUILD qtxml-5.12.3.ebuild 455 BLAKE2B f5cbc0d81aaed190cf050994614db270aed66acb2ecb94083982384692ec058c1cc5c45a3df17ffbdf4dcbaeb8b0e63e8ba1840e70cad41248aa8f2926ea9b0e SHA512 9c786f953a3d6e6b9d6f90fe536f939322581d628d0701161aee7183ba0cada34fb9f6d97607b0a410959bbf3652afff7e6d49426327009771a210a114ece411
+EBUILD qtxml-5.12.3.ebuild 451 BLAKE2B 00a4d02f952f856bf04afb56403b5e6ce5539c5a9c773613683f66ccda9a9ec44555e145926a6745fe9788733177e2df7e01622164a39b64fd6f5782a895492d SHA512 f81b738bc0a7a1ee83e23716ed751a3c83fe73f8b6468c5fb45a9b763bd340bbeb1e2d297fbdd4e3c5257095ae16d65741a0eba849c2b0574cdeee8cde321b4b
 EBUILD qtxml-5.13.2.ebuild 491 BLAKE2B f6a575e08857f8fad92b2cbead3989ed25b229b6c3b2eaab3bb7dc88ed7e627b2f663800ad8eb38e2ad098c49dfd2616f6a4b1c4be20a8bb25d221928b3b9baf SHA512 ef4209a2b9f8badf38d0567824420f2df6218ab8b2476320046f1ef06134f5dd297548287b97c4129e347fa92134779bedff3e6bbfa505995d6025f285ed3ee2
 EBUILD qtxml-5.14.1.ebuild 496 BLAKE2B b5d916222653bcd499bf2c45772dc4145458db6f3679565836a341f7af6545a044c819d737a2d7274eb32e3b6725a9cb32f04ea97583deb3783fa53e7139aa49 SHA512 73ce1f5c411b1ed529fb2f739235aaf77a19d3720413d99a088dd51fe4dde0621e471fedf73718fd67e46b2cb72133310b95b2fea048a622b748dd976f32dda2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.12.3.ebuild b/dev-qt/qtxml/qtxml-5.12.3.ebuild
index 5089d1feca99..101ee7259646 100644
--- a/dev-qt/qtxml/qtxml-5.12.3.ebuild
+++ b/dev-qt/qtxml/qtxml-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 3da2f72b8c10..7252401b34e2 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,7 +1,7 @@
 DIST qtxmlpatterns-everywhere-src-5.12.3.tar.xz 1389612 BLAKE2B ec5be0189d6e235dbeeff0660756365c6e900f7b56a1e18506e4c4190bcb4dd4f5242144ae53a5f4dc6334369234d0c8f4a05ce1b324a4002adf4da32cf3474f SHA512 4e421f0c78ca74f726f758bd95b33915297922f3b5a4fff84dde2600969f54f3914828fdb7903c7171e192f81966680b6c6bb4750de0be72728124470e7c798d
 DIST qtxmlpatterns-everywhere-src-5.13.2.tar.xz 1392192 BLAKE2B 4c0ef609a93548e1ec0c6371ed01fa1ba761d1b94e168d016da3c09447680fb4080db3e1ee2a0d6fd51f9c07ebd2fbf7de5f2f1c651dc258afa25f2b3dcc570b SHA512 ee783ec9429d393b165ce4947dd28cc92f018922862daacdbe2258bf4a23b64f2d30e0b781620061bb8063db5b16bf5e79b09c3174436e0bad04821bef305076
 DIST qtxmlpatterns-everywhere-src-5.14.1.tar.xz 1403600 BLAKE2B c0a4f0ebcef74faf196a51bd7e36c4c8a09b1444f2d5460d6fd96ce00b80a37fede9e62848e9bd6701c2b24890108a50faf4340091680972ebcba7c9594f1436 SHA512 01a1e1af16c37cda8de23ed8da7f42f8f59116a3c7ff35fed4c589ab41f32c9e4ee3ef782517538e7d85ed86ad42bf5cf729bee9c239e4a1d7bf30458403a4ed
-EBUILD qtxmlpatterns-5.12.3.ebuild 585 BLAKE2B 9255de679c54c889059e1a76a662e517603bc7fbc6ebdefd167fcb3e8de77921a5ec49f61e01b6f03636a3c3cd8e2dab1166c3ed285fd992fc14a0dc9e75a79b SHA512 8f74854ad998f30de2519db2dc84897bf6c186e662a7e59ff36446e047da9d0b784c8ddd325c0d7267e9ad1f980d04fcf621ce51f6ccf67cda32947578b8133d
+EBUILD qtxmlpatterns-5.12.3.ebuild 581 BLAKE2B 32f4f80b808fe22fa0db5fc04b407becfc2577c6a1ca3a94689682c590e0ffa23cb8c6921052354ab0536acbaa5a181ae51c189f90fcc878746c7308c294115b SHA512 705a8447a1b616756f2ba7d3b78040395e9d98f465cf9094a996b2db1b5b8d9ad03f910ac2d6df58be5f2913892e80ccc2c27a43a09d7d6d57b60a41f688dfd6
 EBUILD qtxmlpatterns-5.13.2.ebuild 621 BLAKE2B d9e0735a02923c3f7acddd803135b0a86cbafe6dac4808812fb869e245920bb766ffa1d87543db78265d0a76a994b7b7bff4e1c256a0bfc211c7444ddba41e5d SHA512 06190d1bc66f10040702c23de87a9c8e2fe9686a65ec5005ad5b6abab95e87de67208119bc7003f0ecf756d06d90571436715c3f26a8d5d829e9a7b06971127e
 EBUILD qtxmlpatterns-5.14.1.ebuild 626 BLAKE2B 72d955fa0935cf43842e8db6f2ed6b801f9c28bfb81b49f8ac0301c91cb667bcfbfc22cbdc356a98458fb368310187f841d0a713002e41206c7c62fca5cdf092 SHA512 6d1fabf23e5da30d77556500067eb35ee7be575970b97af1b49cdb8be431a5398a48b794bcb35f9d4902f1c59da8ff4c066445515470605819e4927932a0113a
 MISC metadata.xml 589 BLAKE2B bbca816148efdf3a04c05ea1c653a4e9a6e7c9c8109283719d53a06188e495df1addfceca8acc374ed03b89391fe14c70eb6e84b4f5343fb7345e841d50d8ee0 SHA512 dfd095f116f9223cea460984b650cf9d6f506f1bc5e43ae38429528d1218863d785fb47e05a3c9eb4891838d58baa967de3ac31d59e38c4de90a5655c8344d4b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
index 470276438050..0e9ceb940d88 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="qml"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4bd62213a3fe..ca84c63d4589 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 099280edec39..a42806b3f207 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -2,6 +2,6 @@ DIST airbrussh-1.3.3.tar.gz 1449872 BLAKE2B b5c19a61bb16d3b4c7379929894c3f58e0e0
 DIST airbrussh-1.3.4.tar.gz 1449949 BLAKE2B 26b7a408e5453554ff422d4da2f53a3fddc6f68ab652673445db24fa53ef52f0b8293d1701406a63d6b6323e5219c9cbc9880879e58e394b2a912b9a1dc22cce SHA512 8fbca27a115b5bc5e87ffaf3a0e91aabdf3e64b22b7192b5e6a38efe862a7ad6720447241eb85dc20a459f07054c298e8f71fcd80a1d461375a4136fab4db409
 DIST airbrussh-1.4.0.tar.gz 1450070 BLAKE2B 94f128cd25c5af48f17fa771c366d3cdf744dc4e7ccef23de583b1ed60ffe1640dd7d02d76fb78573936beb3412c277151b36a870ac3e11222c3135f34b0e140 SHA512 e3a5cb80365a963875e89d15fa2b4dc86985d6b5f13ecfa9baf9ad599b5780ef8ea2c2e4040bb35498a5ecd1c6becb081b3e917cfe082d2db63fd74ba54755b7
 EBUILD airbrussh-1.3.3.ebuild 865 BLAKE2B b482c6bec1ddaea50248784bd3da92831816233e84543e3c631a56b6417a5bf44d0fb3c1b71ec2d0615cc1ac43123bf8655d292068b003e088638ebb04d350ed SHA512 06df970320d26526272c06fdddb482eac2639bdc21c15c1922054f8e5580f5fbe955ff7dc03f2c913af66a5b3be26a4bdbd0e7cc53e47e0d8caee6a160e4c61b
-EBUILD airbrussh-1.3.4.ebuild 866 BLAKE2B 93549bd8ed892df49a1c1226810d06fcdd33598a2bbc1588c709873a68e22fb7cea951a034d4a47cfe8420058e2edefcb50a1e94ad4539a8f7c89e68a3dc0b60 SHA512 38a711f2db641d52727cdf888191c74fe11d6ba11004ce7470b607e7fa9bfcd4928fc107fbd30fb5229456aeabe61423e5e9e265c2f6ede72e39a471357a3c6d
+EBUILD airbrussh-1.3.4.ebuild 865 BLAKE2B 8affb973ef0539e6e626f65d6e4d1774ef880a913f53eceb86234eb5dfa654a50e211ba27fe599252b38c05d1bcc11ad49f9db4137684c97258c947b998bcb38 SHA512 f6359208830ad4b5baa9dd7d0f975a98089b7b5f9591d539ae2e684a55f6ccc44efda2991041540b48d6d44556fec10f3070b7edccdebff482a43530d99267a1
 EBUILD airbrussh-1.4.0.ebuild 866 BLAKE2B 93549bd8ed892df49a1c1226810d06fcdd33598a2bbc1588c709873a68e22fb7cea951a034d4a47cfe8420058e2edefcb50a1e94ad4539a8f7c89e68a3dc0b60 SHA512 38a711f2db641d52727cdf888191c74fe11d6ba11004ce7470b607e7fa9bfcd4928fc107fbd30fb5229456aeabe61423e5e9e265c2f6ede72e39a471357a3c6d
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild
index 70f59a12905a..016e1251a0ff 100644
--- a/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 4b271c17bbb3..7a69063d7bf0 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,3 +1,5 @@
 DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
+DIST backports-3.16.0.gem 154624 BLAKE2B a35adb965c3f9f42fab5fe80fa1ca20a59511e9b265da28bef059e3477fa6a291c86e3b16f837e1f2d2f7e36e6660be29a9fc02713c3f46ad36767dd87baa1f9 SHA512 500386a74162e6c66e606c705dd26296f56118460f300005f0db44025f49bb8f516805921f23e17d0959056a2a8fc320b5ad4c514dd9c22ef811f6325113ae8a
 EBUILD backports-3.15.0.ebuild 678 BLAKE2B 46a2527c429c22bb0e77e135cf0de407cfe8fbb5edf609224951aa477d5682d0a5d990d51364b072dbbbd4b646a36dea951bde9f493c9fe3ef07f940704984b0 SHA512 cfd4d4f78e1f73fe48e5a7c05811f86cd1e3106ac7736362a17a478fca7bbfaec20d0a089cc0ecac7e29b3aa2c75215424822beda966dc1f1212e5fcf2d343a6
+EBUILD backports-3.16.0.ebuild 636 BLAKE2B f463114bf03f2fa30fcc4eb2598d30cf19e87ac67534457e314e58a11896149f56df177ed2c3c613e51c07df14959c25f6cc42e9ba1aa774e7f6779a420b55d6 SHA512 7a747c69538ace589934a854e8e67c436d072fd331915a2a70a6f4a2cfd618e7c6de89fbd61e7159ecaa8cbf19e8bf148f62ea76b24817917cb5f815a9cca3fb
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.16.0.ebuild b/dev-ruby/backports/backports-3.16.0.ebuild
new file mode 100644
index 000000000000..8eda60e184bf
--- /dev/null
+++ b/dev-ruby/backports/backports-3.16.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_TASK_TEST="test"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid activesupport test that no longer works in Rails 5. This also avoids
+	# a dependency on activesupport
+	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
+}
diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest
index f62b5de4f755..d852d6d0c873 100644
--- a/dev-ruby/barby/Manifest
+++ b/dev-ruby/barby/Manifest
@@ -1,3 +1,3 @@
 DIST barby-0.6.8.tar.gz 96647 BLAKE2B b0af8e5573dc7d3d1881c793895d1c440b97bb5609b0759f56bdecfed7b4b74080f96301d2511101abb21760074584905fdc4e94938d38e2a553933686ccf976 SHA512 1d51dece22febd8c8a234241b88edd3ea93eae328e69fbd8dba3f48afcea7943ec4a72252a74b476aae5812ee132de6b87e37f9fd4c2a43d7c79ec68c831b68c
-EBUILD barby-0.6.8.ebuild 2478 BLAKE2B 5c94f28e493178b7798315ebfa7c244892beaedb65bddb65a196882f9cb5edcf1d7002f6e4b8316687ac4f9e9ebe255db346bfb229a664fcaf08ceb8470f6960 SHA512 1af3a0f391b5041b1d2e7604446e5a26d498fa0cec2901134257a201a71ff13e731e8f923f1e415cc8802fc56f7eb32807ec552a259f6e7ea99056eeb7032036
+EBUILD barby-0.6.8.ebuild 2480 BLAKE2B 045c0039fa3f3eb0fbea0041d73eff0a60d1da6899016fbf815b5758bed5586a5935dc758cf9dc03259c0bb6e9e0398467055f4c70b4b688d628df680dcd2613 SHA512 98f5beafa6729bdbf54684d0fcf5cb943f2d0731015992678419ddb2da73725bcf0c445e6f2b1ebad63910f2a14989ba66eb244c4ce7c15b7e296726a2a1a41b
 MISC metadata.xml 1073 BLAKE2B bf39d76c0240bbdeeb85299879247c695237c4a614c1728ef2c432b8049a9e1bf381acdfeafb0bc3083c2238d3b4489790c845d127fafa14038538fa0ef01b8f SHA512 c3e13b0b201a8a8556b5f725d366b78da9ee82bae9707a8722055d0e5e73571560209657e4c7ef69a777934585cdd2d0e001a979f35773f9f31ac99d6346f4dd
diff --git a/dev-ruby/barby/barby-0.6.8.ebuild b/dev-ruby/barby/barby-0.6.8.ebuild
index 8b5f75b2b3d6..78290277d133 100644
--- a/dev-ruby/barby/barby-0.6.8.ebuild
+++ b/dev-ruby/barby/barby-0.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ KEYWORDS="~amd64"
 IUSE="test qrcode rmagick prawn png cairo"
 
 ruby_add_rdepend "
-	rmagick? ( dev-ruby/rmagick )
+	rmagick? ( dev-ruby/rmagick:* )
 	cairo? ( dev-ruby/rcairo )"
 
 ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
diff --git a/dev-ruby/bcrypt_pbkdf/Manifest b/dev-ruby/bcrypt_pbkdf/Manifest
index e4f0f968c48a..b1cbe3c199b6 100644
--- a/dev-ruby/bcrypt_pbkdf/Manifest
+++ b/dev-ruby/bcrypt_pbkdf/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt_pbkdf-1.0.0.gem 24576 BLAKE2B 0d5b1d90d57dbae986fcbb92cabb0ea598d6b928dc97026e8d2078f41898e0c143544a004a561c0a392504baa4b845a27f9c1e19c369f6342f7ace9de7f04d3f SHA512 b582407617633f5277cde9251ed1fd2ca408ae8bd19cc73f107d7932bed38061dc0099d3033ff5def1b586507392c33d8c50815fb156322f0dd08fbbe4a8e967
 DIST bcrypt_pbkdf-1.0.1.gem 24576 BLAKE2B 7ccade2b5eeabcdcffe5c53bf8ed2e4163536229b7ccd356e173c0b2a27c720aa5429ea0081d2a3e7e7cfc52613c32a48529233156b56db4bbd48da61bbd9cdf SHA512 7caf65dc48ec9d51dbde7741b0960e2606129f888787db31fe36f3cf103d51f06156e942badb10310faa8ca9dcf8f7f8dd86358431942a6e2097714ae3462dee
 EBUILD bcrypt_pbkdf-1.0.0.ebuild 1091 BLAKE2B 87453b2647c98479ff54e8fc45ed48ae875682134feb4751bc6094d39a452d539e7a1d176818523392d174c00502b559ef625e2a740bba06b841ef55f2c54da7 SHA512 0cdf6de34b390231c2933b2257577c69a18fde6511b8e73ad9e114abda76d596ab6959d018a63829f5944a576291f9907058a5ff4bf51b2fa930438cc9e6dbc4
-EBUILD bcrypt_pbkdf-1.0.1.ebuild 1096 BLAKE2B 77e7c7b55213eec85fac8b564fb30d5c59406ada5388e98d44b0c946f3df2e1f771ab06f2c49c56a81a8b2780bbc35001302a4e829b745f3b06956b76fcbb3e2 SHA512 78dace2c4790850065b4df022f6901c4ff7c2b426dd85a76deb0cfb9727e4123aed1ec94f788b87ed432ccb678274a8d4df349891ce1a68e26399a00de8ddccc
+EBUILD bcrypt_pbkdf-1.0.1.ebuild 1126 BLAKE2B 1de9596c2f022351f904f89d04a42f6aff409e115360dc8cb7c1890ecf67536d37ca5665de6fc1f89e6020b7f6f8f54da5f3b515f029277a289aa519d47af379 SHA512 b5be2902e3fd7f47e1dc40ef0220e1ecd2c4910d411ecd1e28c318ccfe14f4d95da6248b81a48b68b5ebd942773e71838d885f0045be671b26a8df65796e38d0
 MISC metadata.xml 351 BLAKE2B c94f203ff5c3e7f1b17922c986b5559eefafba479f71868c675bff11099cba93a4d1102f65f5bdff1d1f8cf6ec58d43dfdea33bf9b1301dd22deded3b8e1c758 SHA512 03184605cef97c6fe2390bbf0b4d33d83faf6c05798bea8af352b96f844be84cec02f1845a77f841cc06645ae791cf5c16beeaa1da4967de6ba0c8e1caab04fe
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild
index 54cd5f62f5a5..25f0fe94d727 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -25,7 +25,9 @@ all_ruby_prepare() {
 	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
 
 	# Avoid unneeded rake-compiler dependency
-	sed -i -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
+	sed -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-i Rakefile || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index bbca059f9deb..bc9cc4fcb446 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 815 BLAKE2B e650184ca910e09cbcb7c3ee7cb5efec07b523b2bd9f44d7e10536a6a4068a8fcfed2fa44f96ad7e8f11fd765708c86f04adeed0917b57b09861e130676286f7 SHA512 17c9ec31814d43efaf73880e5979e41d3ff85b9ce60a2372eb93386442be5617ea869bc82967c54d7f39a6bbce82fdd830c2ac72b302d5a49ebb4479389a4521
+EBUILD ed25519-1.2.4.ebuild 815 BLAKE2B a58c3884ae37997621baa3a286096dbaf7ea304bb10f059549b4c8535c8db1b3b5b31940cd1f3f037f25b636e55687dbd5b1c68ff250a447e886366f6f4c8622 SHA512 4e8b1e76e7b9eac7aa36a4d18d6921581927e1dde8d759adf13bbdaab93ea4ead06f6c3e78f65c1a04e5130fc5c3ab130925195496a0c2693f5b7cef1bbc26dd
 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 eab124b782ae..282a543f34f2 100644
--- a/dev-ruby/ed25519/ed25519-1.2.4.ebuild
+++ b/dev-ruby/ed25519/ed25519-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 7fca92e0d18a..f0f21271835b 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,13 +1,7 @@
 DIST faker-1.9.6.tar.gz 1833392 BLAKE2B 826ee480515873d1e250147e5c3749e222b1273a00fd4ae0a2a28dca91c5981290c8540602d89d406e91d98a0f5dbc6fc4a54ab6d7d2b716a4d4957ab32254dc SHA512 1ea0c4194603b5eaec0f4abc2460fb39cb9de97179d7699c3cb37673731ebf8bf03d20fb422911d4725d4308691d4c92a82f5a661e034381cc04066ddcc955bc
 DIST faker-2.10.0.tar.gz 1026104 BLAKE2B 4e669233bc6def8c15d9b042607fed37c6a267494551af71000b7c774f84a90d5dfbc6a168024fa8cf2a16b03d5041c90a94924fd55a96c7c5d091d6907310c9 SHA512 de7abb03be6c0a2a6a367dcf0611b5416c5d2128ddb33252758f1a0ac9a663fdad034e0f7dd3ca8cf060fe5bca011e3a078b2a9b36bab5daec9d7a406d9df7ba
-DIST faker-2.6.0.tar.gz 983084 BLAKE2B 663075668d17b25eef1528379ce0f8079d34672bac658d7cc96d8b3bb07d63d7aec0249409bcee7d60eb033753be8a37ad04c43b22dcfaa5c4dfb735c1663a64 SHA512 ddec1d70e1becab987da2e9c261e7b3e8903fae77e0e7151f8230aac4d6cfc919a3d9497728d262b28bb3e727e9409a360eb76b410f7b701a108c35380059a4b
-DIST faker-2.7.0.tar.gz 986186 BLAKE2B 57cfdc6cf3b241edf3ada2cac3a2430989e5c1ce565701aa0252fcee37d4b61034f423eea1b75a9203b19e66cc070592bc9e13d3a932f68ab3c51c09c8188eb0 SHA512 967cac98efed0f5e35dccca9e78cf4a8a61678d6c1f2bf388db300a4beba8dd9ff004d143c2fea60ab4abdbbff4b5c90354f3cd1cd4c789f80e3fdb81870ed8e
-DIST faker-2.8.0.tar.gz 1013036 BLAKE2B e8839083ecaa5849e491c95cf26fefd19fa9245b0fb977701e7ec867961d92eca70031dbb4b43a18acdd41a40aca042195651851c781efbb00188b0b0ba19ecc SHA512 878fb19ed7c29a038c84b26dde17288c6f3af0493975fe8baf7b48487cd89f80e8e471fba5261617a58354f07ce0323b7e90001b39c0f46dd4b87c64a88ec486
 DIST faker-2.8.1.tar.gz 1019881 BLAKE2B 06336ba84a512058150ac50535e4d6a466628d127999a47f954076250c5fbb01ca901b80e1933286a88ae0770a1fef874ac24299f5d28a327f06f901007c729d SHA512 8cee9dc1ea8c1aea65f117dcfdda0b9cf17c297ead58ed8ee97626f0c448f91e4f87fe4c27a09c5da844af7476ea442ae32e23d829f50d6686b44283569a0902
 EBUILD faker-1.9.6-r1.ebuild 720 BLAKE2B 19d8387ce2fe15cf1fff88f00219e630526321f37645f5011920c68056646c55c5f983f9f3bb8c291a4a90ee6503e118d4c6758a93f39cc78c881c46f4e0ae67 SHA512 50c6bffef40a9ff278234abc58cf4ab71e187dbbc9b48631f547ad6d40637150ca2dc040f5d3208126e1aba09fff97cc8a499437777b7113ba5be934510fcb10
 EBUILD faker-2.10.0.ebuild 732 BLAKE2B 9e2d2b40870cd1e6426224da8a23a0a5ee7b33a53b02143d51bfe34300f874c160ba5ca06f4c4edd97db1bb2ab409b4113f088c784728269bb887c2beea0cf00 SHA512 78208acb8d8259ccdff08ab2cd30705b70af6780278a2cfb656469155f31e0a147db919be1b6f75489cfb84d7bf15f9c02de213c49934cfe50e61cf88e54c9d6
-EBUILD faker-2.6.0.ebuild 732 BLAKE2B a6930679c5c508eb6756824b39a5b2849d9a20699398c1511b8082205dad51c0a2874f4c72131641667a0c877805f75c4503216feca41cfd698a801ba4622a6d SHA512 b1ae2d50004d3b73d5192412db034ef8151cab8505bff95be5e3900236bb96e2dce24d6a53c71c626ed920d1734bf875cb1ca96e57b49f67bf1509554900046e
-EBUILD faker-2.7.0.ebuild 732 BLAKE2B a6930679c5c508eb6756824b39a5b2849d9a20699398c1511b8082205dad51c0a2874f4c72131641667a0c877805f75c4503216feca41cfd698a801ba4622a6d SHA512 b1ae2d50004d3b73d5192412db034ef8151cab8505bff95be5e3900236bb96e2dce24d6a53c71c626ed920d1734bf875cb1ca96e57b49f67bf1509554900046e
-EBUILD faker-2.8.0.ebuild 732 BLAKE2B a6930679c5c508eb6756824b39a5b2849d9a20699398c1511b8082205dad51c0a2874f4c72131641667a0c877805f75c4503216feca41cfd698a801ba4622a6d SHA512 b1ae2d50004d3b73d5192412db034ef8151cab8505bff95be5e3900236bb96e2dce24d6a53c71c626ed920d1734bf875cb1ca96e57b49f67bf1509554900046e
 EBUILD faker-2.8.1.ebuild 732 BLAKE2B a6930679c5c508eb6756824b39a5b2849d9a20699398c1511b8082205dad51c0a2874f4c72131641667a0c877805f75c4503216feca41cfd698a801ba4622a6d SHA512 b1ae2d50004d3b73d5192412db034ef8151cab8505bff95be5e3900236bb96e2dce24d6a53c71c626ed920d1734bf875cb1ca96e57b49f67bf1509554900046e
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-2.6.0.ebuild b/dev-ruby/faker/faker-2.6.0.ebuild
deleted file mode 100644
index 4128467758c3..000000000000
--- a/dev-ruby/faker/faker-2.6.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-1.6 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faker/faker-2.7.0.ebuild b/dev-ruby/faker/faker-2.7.0.ebuild
deleted file mode 100644
index 4128467758c3..000000000000
--- a/dev-ruby/faker/faker-2.7.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-1.6 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/faker/faker-2.8.0.ebuild b/dev-ruby/faker/faker-2.8.0.ebuild
deleted file mode 100644
index 4128467758c3..000000000000
--- a/dev-ruby/faker/faker-2.8.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-1.6 !!<dev-ruby/faker-1.9.6-r1"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/fast_gettext/Manifest b/dev-ruby/fast_gettext/Manifest
index 43f189644340..7c0678e7b475 100644
--- a/dev-ruby/fast_gettext/Manifest
+++ b/dev-ruby/fast_gettext/Manifest
@@ -2,8 +2,10 @@ DIST fast_gettext-1.6.0.tar.gz 88780 BLAKE2B 237a37bf505fe7520a25c6014f052420190
 DIST fast_gettext-1.8.0.tar.gz 89309 BLAKE2B 8ead2922662667c24d07dbc1145002583b1a65edd3cb581ac5bc058560aca38ed083e0470d4834cfdc5abae36f1e8264171b75649343675ab415b28ea2f0e8ab SHA512 0657b5955268166787a32bb74481cd07309018429c21707e061e022d67d5d2448d2d173149f164d16ff5f6c9ffa0feef38369b79daa299e1283fdcdc019ad72e
 DIST fast_gettext-2.0.0.tar.gz 91904 BLAKE2B fc0f752cad55512f502332a8721aa64fe1b3103ecedceac08b82f293575e974e0565b2936ae740e61ef3413919406959c6a78709ddc737b3e7decd710eafbd46 SHA512 f997a63ecccc3a8836e191b8cdcb5ba0e260bedef4cc55efeecb12c1fb3a469cc98e9e565ac773392a2bdf266618a76c8d34b0522d5447967fb85f4dfeea3c10
 DIST fast_gettext-2.0.1.tar.gz 92037 BLAKE2B 109470cb8ede188a7603dca9b79d17066b6fbbcfa13e2cb6b9a5a6f329d1285a042e152b5afaba206ac447fdbdbdb59f79b74ee2ac70ea39a99691a00fc82155 SHA512 edf98e22a39266c55e7d77547fb1b8cb3a07dcb7bd742e2eb93b636072902f065dede0d980bd3a67373f5afeacc39689cbcee33dd62ad10e1e94f6d84bcbc70c
+DIST fast_gettext-2.0.2.tar.gz 92030 BLAKE2B 762f5e5375f29abb6477579aae25c023e7b5db27a41b857523baa3412f8f80f26fc9334ce0937de20cefcf9d845846a362e34540bc5817e9e8ad00c6a7abea8e SHA512 027b35c5d8f93719fbc14cbcd0843f2a0948b49c9cf2fb65e723ba410e6c0c14ce3e42c5ce7abe657946a7da2d20665559b71df1b9855c9a04978946a50beb51
 EBUILD fast_gettext-1.6.0.ebuild 1999 BLAKE2B d56cb283287f37612c2b166b76d31acfd8774968664ab1f107c76e3e32310c6f15119d1357e58a562cd8d3c893e30abb564f97ee2ea846d8a7aedf464fe604d2 SHA512 d760902688d8dfc33a4c26a94e889c3135d17049291fdd1dbf660b5ec8d88f5396a3b7459317d0b9c7dfff7292e714ca95d41856e55cf8202ddd0c85e6700842
 EBUILD fast_gettext-1.8.0.ebuild 2005 BLAKE2B 2112498cf1205917f8768f9ec1bf6f56f8bc133b76e491bf0372027d827a0906ce674e6aaa9a1477c2debbed2245d506d58ef4184bf418422520084bb67798d8 SHA512 2cfefe0afd8d4331f319bd03c1edbb93bf88e9c845238fe63c52e466aca8a5de41762508d70cf987c09846ec220df891a42df330e4cdb324e73ac95111a10447
 EBUILD fast_gettext-2.0.0.ebuild 2114 BLAKE2B 7b5e88f4fcd6f47edbde7c4aa0fa3436ef37d49d0e87cdd5d71429781039a256c549e7652d7a050b1241ce29058adaeee8f4bbe08519b38dc51d4a76107f746c SHA512 f214fd19fc7dda73e617441ec89386b4bf7c5866b39e4e38019c540d1b99d89b137565a214ed8f385129acc6c4e4e49edaa067eaa6cc85c94e3541f7fe1d2bfa
 EBUILD fast_gettext-2.0.1.ebuild 2114 BLAKE2B fc19886b70042de69e7e781c8983f619c1b193313165b190aadbe81a15a99e61aa20d4aa6a1df34b192b5f085bc004edff3efb30cac57374d67d7bb6b362ed07 SHA512 2890a30b895d0ba0a728d024dbadaa374e4514476f8c437bc6503257b273dc004264f6cf1f7b82d1a02c371fe1e778da501151e758cdc736ab848b926a361690
+EBUILD fast_gettext-2.0.2.ebuild 2202 BLAKE2B 113b8ec7d97a2a55ce9f8da0a8315f9d227f2e804e3419ea271a59ed1e9286b52274afe79b91da394b686afce66e97a6ff9631f3f267e55bbd114a5f3205e537 SHA512 b4841e80d4bd22400979ca2b0b148e2374262a5e7c6d34825a24aafce6e0092fed285bfb8e71699601f39784b13dd9054628d9b7e4808654eea2518ea8c989d7
 MISC metadata.xml 346 BLAKE2B 93a39aacb63cc0db79f126c108547c24dd182711584ef61c481b762a35f96cbee330ee29baea8d063e6f2ea2fc0491e572b860156f14be164ab29131a8f047a2 SHA512 1b57982213ae99ae1dc5ea06240bf81f7719f3cc576926de6a0d308f26895236eaa9b3312157eb5af3e47893787c9260e4386988a6f156c9a8b660aae85007ce
diff --git a/dev-ruby/fast_gettext/fast_gettext-2.0.2.ebuild b/dev-ruby/fast_gettext/fast_gettext-2.0.2.ebuild
new file mode 100644
index 000000000000..193ba2972e99
--- /dev/null
+++ b/dev-ruby/fast_gettext/fast_gettext-2.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="fast_gettext.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!"
+HOMEPAGE="https://github.com/grosser/fast_gettext"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm Gemfile.lock || die
+
+	# Remove jeweler and bump from Gemfile since they are not needed for tests.
+	sed -i -e '/jeweler/d' -e '/bump/d' -e '/appraisal/d' Gemfile || die
+	sed -i -e '/single/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/SingleCov/ s:^:#:' spec/{*,*/*}/*spec.rb || die
+
+	# Avoid unneeded dependency on git and development dependencies.
+	sed -e '/git ls-files/ s:^:#:' \
+		-e '/\(wwtd\|bump\|sqlite3\|activerecord\|i18n\|single_cov\|forking_test_runner\|rubocop\)/ s:^:#:' \
+		-e 's:require_relative ":require "./:' \
+		-i fast_gettext.gemspec || die
+
+	# Avoid a test dependency on activerecord since this is now in the
+	# dependency tree for app-admin/puppet and many arches don't have
+	# rails keyworded.
+	sed -i -e '/active_record/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/fast_gettext/translation_repository/db_spec.rb || die
+	rm -f spec/fast_gettext/storage_spec.rb || die
+	sed -i -e '/with i18n loaded/,/^  end/ s:^:#:' spec/fast_gettext/vendor/string_spec.rb || die
+
+	# Don't run a test that requires safe mode which we can't provide
+	# due to insecure directory settings for the portage dir. This spec
+	# also calls out to ruby which won't work with different ruby
+	# implementations.
+	sed -i -e '/can work in SAFE mode/,/^  end/ s:^:#:' spec/fast_gettext/translation_repository/mo_spec.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -i -e "s:bundle exec ruby:bundle exec ${RUBY}:" spec/fast_gettext/vendor/*spec.rb || die
+}
diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest
index 9b964d5dbf56..481a3eff731a 100644
--- a/dev-ruby/jbuilder/Manifest
+++ b/dev-ruby/jbuilder/Manifest
@@ -1,3 +1,5 @@
+DIST jbuilder-2.10.0.gem 28160 BLAKE2B c277a59d53f30132ebe88d6afda5c221d74a399b01cedf6a4863f29e94d329137669942957a21ae9c5c192177dc9e78b6d66d9b5a29c7d4667a0432556c6b28c SHA512 a429422d65ed3eec55f46597f73a97b267fe7d6c7554ec6a6d60e1e1c0a9306b81f7283524602a30af11a141f7cd466a0f7b0a804172bd4008787462f0fa4ffc
 DIST jbuilder-2.9.1.gem 28160 BLAKE2B 52e8a6ed2e6be19d73c22eddc6bcf3817e89f390da3b5eb4bc3308fa0c588f910608cbc6586cab858a5fb9ae6eb22fbade3fb32a426bed665cae18c067d85116 SHA512 aa8607696f5f14f22d163438d876b2a3017af791fdf4d6afd0df6c736ef86294db71f21a719029a2c052c24623d86f05c7aa5315e6f5066c74bc6886c50873fb
+EBUILD jbuilder-2.10.0.ebuild 557 BLAKE2B 2c5bd617e85d0b2767a935d831d833185002220d7533ad4af88d78cb5c5d002a69134f2364df7feee04da8ba1f8bbf87a1f34b71e13f5e62cbc1e01607454523 SHA512 d1f3d27f0755145f600d4f585b00c50caa315ab33726466859591dea17e55725d6c2e2f812293865f791eb6c54a0d3bd9ae4bc09c4ba2109ea303e5d69ee7d28
 EBUILD jbuilder-2.9.1.ebuild 588 BLAKE2B a26d9befeffe98f74f06201505621e6bb2f0e5ab9fb269499b281fd53672637d3461e61615b66244b976e3f9aaf926bb1a847ad2760b8ead97efec452461ad38 SHA512 9e1cf9d0272fe96ae84b0285062609bf6b93b5ef9b87e5f80b7bec30d85a9608aa41ba88727692f6fcd19d8fe946fd0a7875c721cbd3c0298c570c3b9767e3c2
 MISC metadata.xml 326 BLAKE2B 205ea196c26e50f19fae65cb1b0cbb295b08406f3fcd6bb51162f52c48aef883b05aeea5092100e53f00ce2dc5f8c5f5a0c32c810af822b6b4ea0d95730e1ad3 SHA512 935898503cbfde9f698968794d20797e973227e1441489359520aa0ec2966c7cfb8df8c9b64ae4738cb55393ae4d001f38eef28cf379fb9e7ba29feaa18cd37d
diff --git a/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild b/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild
new file mode 100644
index 000000000000..765909fd06b0
--- /dev/null
+++ b/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="TRAVIS=true test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Create JSON structures via a Builder-style DSL"
+HOMEPAGE="https://github.com/rails/jbuilder"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index fbd8159bd5b8..2d7e4121c742 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,5 +1,7 @@
 DIST octokit-4.14.0.tar.gz 3068165 BLAKE2B e50efa246273422daf5aed8e619465886962d361d129a310974c21bbc683c7444ee99e3dc01c184497683d07a48d852c006ab56c6cd4bea8660f16e7ec5eee98 SHA512 2aff18492c0207b8c7ced23adf0e76260d2976331563e22f7a130445b19b816a00281a86b4161d6709025d058c848ef3f7d1a5c64323954f8c03a59be6f6b132
 DIST octokit-4.15.0.tar.gz 3089749 BLAKE2B d10df675c067f0bfc86bd78aa05e48fb37bdf8d4d5f9317d7463838ec9e870380bc503eb621a02a332b6a26bc1780c5d77955b93c695e18674c792b01aa702c3 SHA512 8616dc97c2aee68ee5919045446ad34d3122bda71f0a9e48a7ef3c04ef2e706bb59f7bd344de9f21f912a927aedfdad11f73119e52f62729173d04f052a0c972
+DIST octokit-4.16.0.tar.gz 3090415 BLAKE2B e6f2addd8e85bc5de685fa644dca607a0f1b15fc007a6525c56605204b8423170918364892ac1c11fb200891aa489c563c52761ae622b847309a9cef3500cc31 SHA512 562b62714022d36d16b0e7f728f1b43ae76ed9f57bc7e74a8805519818f4c7203e0cba71e99202e5fabc8af150f26897f2fdc35e8bd2d09e3b1e578cae5d2bbe
 EBUILD octokit-4.14.0.ebuild 871 BLAKE2B 680ffc68ed44702d91aa03fa167b90ed724887e9e6115fa6623509c5ea7f166f08db2489ed12134f303a12efb965bdc293e2344dcaa648cd5f447311992d8a6d SHA512 4352d8e8421f01448fc585c039ea9973028ff3151e3949bb2ba628577d723f7f7b72e7629abc5156ec1eb9c04128c61e09c15ead8a9f435fe71701c71832d883
 EBUILD octokit-4.15.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
+EBUILD octokit-4.16.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.16.0.ebuild b/dev-ruby/octokit/octokit-4.16.0.ebuild
new file mode 100644
index 000000000000..469e4b38183e
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.16.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-0.9
+	>=dev-ruby/sawyer-0.8.0
+"
+
+ruby_add_bdepend "test? ( dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	dev-ruby/vcr:3
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' spec/helper.rb || die
+}
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 22236fbf84aa..589558ba562b 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -3,9 +3,11 @@ DIST ox-2.11.0.tar.gz 201028 BLAKE2B 52c908be2a1d08ad563137f99e68f7734c2fa6aa873
 DIST ox-2.12.0.tar.gz 201909 BLAKE2B 02aad0b822463afce57447b8d2277f00015715eefd570025386d2ff745eac74a934df41c7ce4f4c742593b780783d7040dfcf712600dc6d1246de7a5d90b5e1c SHA512 09f3db6037662cbd6f4fb128f5df61ccf1d22c8949a315f766518984bf1ab57a83789d0b0a9f4982c5356e28190440092971163de3680b36285fab1fed0a91b5
 DIST ox-2.12.1.tar.gz 202784 BLAKE2B b42a364e4e2c1bfbefd06bd0b5162838e473cbd48582e20336cd50173278a81e56eb6cefb826b1155a19ab7ed1484f0e4a4715d640ff0ff7d4fb82d3feade647 SHA512 0bf3b4d21e5b09695595b3846ed893a0d23f4479388036447dc2bfa5440d1b4350289ef023176a9f1fc14383c76388d3ab906ba6c8c919b519bb029438cbd1b1
 DIST ox-2.13.1.tar.gz 208729 BLAKE2B 6d3b006ff252a048f1d634faee3d2d0d9b85e4a0aa06a42b84fe7dac27bf679a41ffadfab2590d925475ed88b8e7084f9d52a3c2257db51393303aaf02f36d1a SHA512 184b7cdb8a160c50b00683e6cad28532dd14d7af4d1c48c5e36c3120f0381271304a66c3ca0da381a62db6c5d628e27a2ee1ee4b866b212cabf18b3ce9a886d4
+DIST ox-2.13.2.tar.gz 208893 BLAKE2B 15e9fca55cb58c10d6336c1399048e72c059889da0b9df8050a6e4cd00393d11507768ed1cab23d452e792f4001a5935e70ba0be24186a1f96a43a7f272823fc SHA512 bc7d8d14c9e3a45529d8a4a32c01d7f51523f814407d437a7dfed0184fad16a9edf4a2b2317c28039613f8f0e0d367b42b4eb8fc00b01287b0154d520e37ce48
 EBUILD ox-2.10.1.ebuild 702 BLAKE2B 4506f7b26619479a6a3e19f04a5dfc5e06df4138f10a7f05578253ae948fd43d943d2072fb8f14f93a4d89a786f9b7884d7fb8dd88356560568cd3a1a8cb973a SHA512 c292bd0a6038c05f2a7665a747d3516f6aa5035e02db88aeb1c35aa874a67a084dc88c7332ccfc501096fb74f457bb7f63889abe7ca6d81f4f5445d48e1180c4
 EBUILD ox-2.11.0.ebuild 703 BLAKE2B 3f5023edc767873c0e4fd05e94fd96d7814460a3d1c7a76dc66bf937b4e10bab6d973627dc54877714dbcaf1f8c88b66ed50a8826f52a3da0740211ecb660101 SHA512 0d052fcf7d238ad037322d004c8478742f2c703e05fe852882228fc1ac5da1581608bdcc78e3e83c12c14b78c18aefbc886e9d380c1166b9771cdb7bc4e70607
 EBUILD ox-2.12.0.ebuild 707 BLAKE2B 489f999ba3ed9e58d2846d284f90bcb344118fedeedac22a8bc4ae8c22df43857e4347daa28461303a33dbe08a38b9057f08c712a90179bb4127206a5ca35698 SHA512 2aa632ec8ba972372fe09a7efa49d1cacf1f7faf9bcc615843777448d148991889aadb7be8f064e4848b5a8444e21f13a36959000915df28035df69afabd0ec1
 EBUILD ox-2.12.1.ebuild 715 BLAKE2B 916ca3f9ce3fd847de972d8fe94973a23ff47a6c676d512ae027cf9a9b9fdd649bb058acce5e8f3f388156010e3a0ade09c80cfe9e7c6e7ae1ce929b4388ffa5 SHA512 301d0292cecbb395f1466b53dfeef2784c333e88ccfef93e663cacdbdcf263a5ea40a121b4a2af87933636bb2cddbac35528becbe2999a0d7460d40c7f679b66
 EBUILD ox-2.13.1.ebuild 715 BLAKE2B 916ca3f9ce3fd847de972d8fe94973a23ff47a6c676d512ae027cf9a9b9fdd649bb058acce5e8f3f388156010e3a0ade09c80cfe9e7c6e7ae1ce929b4388ffa5 SHA512 301d0292cecbb395f1466b53dfeef2784c333e88ccfef93e663cacdbdcf263a5ea40a121b4a2af87933636bb2cddbac35528becbe2999a0d7460d40c7f679b66
+EBUILD ox-2.13.2.ebuild 715 BLAKE2B 916ca3f9ce3fd847de972d8fe94973a23ff47a6c676d512ae027cf9a9b9fdd649bb058acce5e8f3f388156010e3a0ade09c80cfe9e7c6e7ae1ce929b4388ffa5 SHA512 301d0292cecbb395f1466b53dfeef2784c333e88ccfef93e663cacdbdcf263a5ea40a121b4a2af87933636bb2cddbac35528becbe2999a0d7460d40c7f679b66
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.13.2.ebuild b/dev-ruby/ox/ox-2.13.2.ebuild
new file mode 100644
index 000000000000..dfa02327978f
--- /dev/null
+++ b/dev-ruby/ox/ox-2.13.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 03dce5a5c8d6..82d92ee8ba5f 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,7 +1,9 @@
 DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065
 DIST pkg-config-1.3.9.gem 22016 BLAKE2B bb22881e07a251722e5e2344a8ebfea105456c4994da01b6cad53b93c5fab515537c04166be9985bac224944e89506040a2f89886f03c9f5d9c2227551e6e840 SHA512 ffec47956f59daea7eefe749474389cc43b500251b7d35cf268caed975d4b8483990c6c5cc0eb1cb918a7e09edd483fe88d6e7141c13496edeb4d4aac5ab3019
 DIST pkg-config-1.4.0.gem 22016 BLAKE2B a9f56e68580b290bc0b09b07dc059b5ac7141a97a2a4653529fd59aa348bee7ce90a2e752172d2d0f376b67fbb7253f0d3bb38107eb68e3d6bb3f7d57637423c SHA512 d60539519e86e210def73d2536a694e2fc7a6a424c7cdd49b6046420b113520465e1863ef4d90d9491d081b78e16cfff27121d3b7f78a78330c4a242c652ebd7
+DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6
 EBUILD pkg-config-1.2.8.ebuild 816 BLAKE2B 5045cfd8c5c4a37b0a06d39b1d24cd56f1f4703e785f4014badca1af0a3727d1793d05ae58d50998148eeeec41f06d1263d46c779e9f0ba5dd1939f406c30fcf SHA512 ea15c80ab2c5e7861b8aca703c0a75ded6b7634d57eff601475fb422b8666603a809f2063b7d47358a14a176866ac72dec1c9292144dc35af436a5725e7822f4
 EBUILD pkg-config-1.3.9.ebuild 788 BLAKE2B 49582d44e2867db96945d2440f9798f1899b139ec319829a09fb031875942e912e72c8a968ff0cc70a164a0fd75469d4e1400922b5a4633ffd0304a0a0de2fe2 SHA512 0f15c9ed29a8fd5585b3eb53605eebffc54f794539875d176486ec370c3ce316758e539df11dd4dab6b61aedd6a3bba45fedbbb3399345b5ecf398f2b6783136
 EBUILD pkg-config-1.4.0.ebuild 795 BLAKE2B fad01678fbf71307a416a05e29bb78d34df3a6e929160f4bbedf5d36ad8ac7b51319ebaddf274046fc4ebd621e2df7b1d52b6ba57148fc16c41b27837056d69c SHA512 425e525edf41395cc87aa75af779340ceb01fe00adcd89266318eaafb8e11879d10794564216dd09db5e7cc7e285a7ceb76d8964ebb35ea7f5e6720e3079ed52
+EBUILD pkg-config-1.4.1.ebuild 795 BLAKE2B a7ba27e805d5f37574f2ea55f4e94bc4fbbb40c18b581ef52d197352e199517d3e7899ee9813122f2436655750dfa0c0ff98e1d0dc8702224adc79607fbb7648 SHA512 da7ec23c5e5087047783dec6f8882581565fcdce0f7adc060c041624eefc672ee163218af17de79c3bdb134841dd9ca934e037aafca3e075ae087df222a6582a
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
new file mode 100644
index 000000000000..b79bc3efa0bf
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/rcairo/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	# drop failing tests
+	sed -i -e "/test_cflags/,/end/d"\
+		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
+}
diff --git a/dev-ruby/pluggaloid/Manifest b/dev-ruby/pluggaloid/Manifest
index 7215cba3951b..3c5ca6dadca8 100644
--- a/dev-ruby/pluggaloid/Manifest
+++ b/dev-ruby/pluggaloid/Manifest
@@ -2,8 +2,10 @@ DIST pluggaloid-1.1.2.gem 14848 BLAKE2B 72bbcfe71c3c2e6a96425639b0db2af9a10f9288
 DIST pluggaloid-1.2.0.gem 14848 BLAKE2B ee092768b9aac2c64a0ded18f328f0f1a5d67d073da28a3029c9be13554f77565ed2338fe9630115067ecc1d0d712273642e0679a43f822995faaff48cdd7849 SHA512 b17bd264c2e8027ae1a9288b5b9a12f5c0e4c91bebf9cee5328bfe61aaa32662f55901d5ece030702780756474d54028272c7cef18fc79982d9d7c48f04b5acb
 DIST pluggaloid-1.3.1.gem 16384 BLAKE2B cea02ddee3d0edc48b5a43de7737e1ee85d3bb00fa29367e1e540e9824d0433a4973b30214f5b0a01b981d6983d9d783753565598fa9b3815fb31d0a02cbe1ea SHA512 4db3a26d940d55487614e67aeb135121f19261e6d63e77d623f89b2b4eef275c035abb83e1d2d5197a27248c944110a26196f5ff1915fd14bac7d3b39827a020
 DIST pluggaloid-1.4.0.gem 18432 BLAKE2B 4df2180a2facb3d0d82f891bfcf888629fe211cb69ef3e5934619136df7b72f28c0f56e7dd76dde7667eca079beb9c9e5f716662185c565b7252713217fdde8a SHA512 75ce56c1831d79fed9216f0b217ec1a0962db2ba98cb690debeb8edca8a4c27f4f40f498440b35595d756d5a3790fe422fdd63cdf39cd8c157f8bc200879c018
+DIST pluggaloid-1.4.1.gem 18432 BLAKE2B 7f7fde7074547f27248874fa3ec0e7e9a671d8aaaac31dfd5a53e0f377ab28034ed5a3322131bae8d178a32b3d8ad874f329670ac5899527927627d358d60d26 SHA512 fc800576bed6a99d42f43baff482d4242584a4a301d22dd243e58c43800e72e2fd35f997fcfd92a443edf3c99e489d52fd14e6413c8c6e66809fca90cdbbde06
 EBUILD pluggaloid-1.1.2.ebuild 556 BLAKE2B f89267674776c7ac0d5426b887eb5db28aa1df63f1a06af61fbb2d2300fcdec75aa0dd505df58705925ab265a3b2656dfc515390ef06fb13e721f083d0e74077 SHA512 c4c979703f4996345fb7c23d661342c49f3a28fe90705c0fc69d5ac26662a89a2c40b3e8f34b7d796762ecde209bef37fc4c04adf8dd0e6ed01fc7934d04ecd2
 EBUILD pluggaloid-1.2.0.ebuild 558 BLAKE2B 3503584a6126ecdd56f0715c57d6bb3d9902c5fc201cc1e883dd94e11219e5502b802b75f40ed92f1e9cb5ddac834c4a3bee1847aff5f29193604125dd9552a9 SHA512 5fd51185815ebad86f3c4b312c5e7c383ba99f166aba9ee65e98e5ea4cc84bfac45beb31db12b832f797ba896c0712ad4141676c0868b10d5fc9091dfffe5a84
 EBUILD pluggaloid-1.3.1.ebuild 529 BLAKE2B 1785d1e03356c7562e72230a1d9f0d8c569475bca5b0947f011f60930c606ca0944f3a392ec028ea95066f66d83ca4818230b78219946434ca5b60615d014003 SHA512 68c72da7ecdf91054e76b6647b01063aa4913fdea6d54fb81e726c2459c98672b2168a7df1f4d516d13a73d72e69fe8999a58e7919ca842fa0d916daa2a0016f
 EBUILD pluggaloid-1.4.0.ebuild 536 BLAKE2B 5938d6b08fdb81537219c1d135e79a61832923701072e6b6473b6b6f7d170ec4954fe34883a84becf9147051628b042f76446dae683ad4157a40a50cf3c26f08 SHA512 63688f45ecbc61abf85787fe5563f2d98ac4078511faa87a0bee5b029913dd27c59d24412a03d51167a875e9f6579d0ac170aef33e8b6f3b69611483adff3724
+EBUILD pluggaloid-1.4.1.ebuild 536 BLAKE2B 5938d6b08fdb81537219c1d135e79a61832923701072e6b6473b6b6f7d170ec4954fe34883a84becf9147051628b042f76446dae683ad4157a40a50cf3c26f08 SHA512 63688f45ecbc61abf85787fe5563f2d98ac4078511faa87a0bee5b029913dd27c59d24412a03d51167a875e9f6579d0ac170aef33e8b6f3b69611483adff3724
 MISC metadata.xml 411 BLAKE2B c4607d99d68dd5f206741e4021f2c8c2495468085c941aa66fb26aa356029b47ae33d1cdc16b07e256bc1bee58a92f5ca4599432a1b6e7e882275638fd02ecc1 SHA512 24dd8c687efe2f4b36b890912e583b7800151d1209b74b0676ec9c863e263e8858a9a9e465523680890e14243c8a2d67e7a999a1973bc5bb797cebdf886ae546
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild
new file mode 100644
index 000000000000..493b5e874163
--- /dev/null
+++ b/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
+HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/delayer-1.1.0:1
+	dev-ruby/instance_storage:0
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
+}
diff --git a/dev-ruby/puppet_forge/Manifest b/dev-ruby/puppet_forge/Manifest
index ee07d92b8b20..30cbe369315f 100644
--- a/dev-ruby/puppet_forge/Manifest
+++ b/dev-ruby/puppet_forge/Manifest
@@ -1,7 +1,9 @@
 DIST puppet_forge-2.2.9.gem 772608 BLAKE2B 15cad2cc183688262b96a35af46324a3264b8a615fa414bddb6b55587ac30f4fdcc64ddaa0f18b66571bde1a1eb17339bf1fad1630f3a06b6c1575cdbf1c9140 SHA512 753ad4b95db25c1ad284ceb802b03db9724f2a1c1f4522f252428f8ae7c6771361b6a38d070c2ce989bec9538471529cdd92c925501a0f8f4f1bb5e6d8ef3733
 DIST puppet_forge-2.3.0.gem 773632 BLAKE2B 6024eed4c7b62c19c04d4f45a03dd40fa14bf074a1c44c14c766527bc3f4937bd9ac553df14b432834fd3bafa8f680d8b677ccfe6b366b954336888cb9f25aff SHA512 7b14b006562874524c7a5045ae44fc7c3ac932aa32beb3751a6c18e3498401dc22294a81386d2ee25d5f8618efaa425b51798daec6f12193916c76dd28aafe85
 DIST puppet_forge-2.3.1.gem 772608 BLAKE2B a1ceb23ebcd21e600404f5be296c1df5792f01262e5ac85544be49faa10366b25702bf6f957320ac259609bc4832a5946bcff8a5a1dece45b9cc3d6e74aeab06 SHA512 420cf5feb7e1a29a59f81cfcff807f94f889ae3f21a8d4243956f8139e8fdf86514f8a00e96e210a40e8f0bcdde53f06b8f9ca06231012c11b04a9b6cb322f44
+DIST puppet_forge-2.3.2.gem 772608 BLAKE2B edbb92cbed4ad040a9c819d2728c4fee5c2beb2fbf9120f778d0315bc15032f970873974fef3532adff57e44a8671b9027615517761f46b0d1e0954d50522d7f SHA512 00805aee55823dfb57cda03c1ed60e8e1db218ca7c633ec0c7d8459fdcc9d747609c0c426d5544f86f33485e546dd82b115a98fad12897ab087ff119e5cc08be
 EBUILD puppet_forge-2.2.9-r1.ebuild 1131 BLAKE2B 3b045d70353afcd2f131f2ba7cf7966d10ba741ebd28c8a7d1c4d3ab112302a41655f63a936e6ee0420978e05cd03293252a0041892da198eadc3981a582dd7e SHA512 a011f7829f933b56645da19638813ecf2dad0b554a821abdb0f3cf3961b1b5d25b5350b62a868e73d072cc90a66e594dc82aa8ebd07fbf070cc2117240df302f
 EBUILD puppet_forge-2.3.0.ebuild 1124 BLAKE2B 7b020bc53404c093c697d1c6de9d42e06195854db689bc9b81847b8d23a9d9f2f881b7543ad349a8f919ab4b4dc058a1f46d561a7c35208705e42a53cac5a142 SHA512 d5ef7a6e034bb1a24092716e54e788c24ec4517a4e250636da7363c5f932753b230ff935c297bc22db486ecc1c1bc2313a521471256db686daf69858a8c9a819
 EBUILD puppet_forge-2.3.1.ebuild 1093 BLAKE2B bee47bafd045825d57810e49433dc9dc54bf4a34253f72fec1f8894ea5b9baf035c64b10bbdf779c32c56e7c015dc6b21c27083b11290d44f09654b66c300f11 SHA512 302b5dec814eb5e8c53fcdf74a8b9d31b8b8873e7981b492cd8aed7d537d3fad9d4a57f4619875acfcfdc8febc138c5553b92b72eee27475d616a34afcaa64e9
+EBUILD puppet_forge-2.3.2.ebuild 1093 BLAKE2B 359acdfa2ef8f7d282d40f19bd521153a7849eea1403d73c0427d1f79179ee17bfb5337f861c0f73dd4c4c713d4317cec61ba4a612004832536b368d658e5c4d SHA512 baffaea8efeb25f44f56a7ec4943028ec82f7b726c0c805e0cfb2c080673a2f211d1efebe65ff02ceaa48e41464cbe76d07e5210a969fe1dc739d1daacd59fe4
 MISC metadata.xml 569 BLAKE2B 5bf74b6873d2c04f51bf6d15214ef49b130f3e6beb765f2c60c0586293aa2ce5fa5300972ae398e5da98cfb92b1ae6c6a963b337cef8953ecdfabf8a7a4ba056 SHA512 40c90045712dab8d066fe6aae17e71effa89ce11551cb466158f4555e5c61705a0c03404c2bd44c6ae3e5b672ff911432b454f9d003c70a64998acbb8481796a
diff --git a/dev-ruby/puppet_forge/puppet_forge-2.3.2.ebuild b/dev-ruby/puppet_forge/puppet_forge-2.3.2.ebuild
new file mode 100644
index 000000000000..29c7b3a05d2a
--- /dev/null
+++ b/dev-ruby/puppet_forge/puppet_forge-2.3.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL=locales
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
+HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/faraday-0.9.0:0
+	>=dev-ruby/faraday_middleware-0.9.0:0
+	>=dev-ruby/gettext-setup-0.11:0
+	dev-ruby/minitar
+	=dev-ruby/semantic_puppet-1*
+"
+
+all_ruby_prepare() {
+	# Avoid integration and user specs since they all require network access
+	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
+
+	# Fix overly restrictive dependencies
+	sed -i \
+		-e '/faraday/ s/0.15.0/0.99.0/' \
+		-e '/faraday_middleware/ s/0.13.0/0.99.0/' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/pygments_rb/Manifest b/dev-ruby/pygments_rb/Manifest
index ee4b8a606567..db621f425447 100644
--- a/dev-ruby/pygments_rb/Manifest
+++ b/dev-ruby/pygments_rb/Manifest
@@ -1,3 +1,3 @@
 DIST pygments.rb-1.2.1.gem 1176064 BLAKE2B 7a6651606a433a9f15853ee06c3fe9a02d266f9441a08cc92c0db4ba679a97a2a25aaa4e96a621fbda0553e9b0c995ce53c6f828793f4937de12b3089f12963c SHA512 f0fc63ec028169872e28e2181c6a10c8a3f5e7f07074ba9f43475a0b5aa403a03d7045abb03433b600ef3d74c460556355b4ee64be598d3b93ddb1e0bb306259
-EBUILD pygments_rb-1.2.1.ebuild 1537 BLAKE2B ba189a842a9c209f2edc3ea44775b080f678e805a20b05a9bb4965ba398d3a2d91e7ca897b3a13942c114ebcaebefd7e5f11387678005a44ed37eaac2557abdd SHA512 226735705e289a3cac433d4d41f1d4e8b4431d6e822bea83a3a051cc535f49691a2a00384c397ea4fbf03958bcfd74efcd5b2ca035306d62edae394780ddfac0
+EBUILD pygments_rb-1.2.1-r1.ebuild 1580 BLAKE2B 7b7ff0e02e3acbf43c70c3c1731740276318b935bb2a2f5b9809d34e2efae1e1b516f1a328a1f603085ea11f1971258b81ba45b9a244e3633b62c892b8e76769 SHA512 d76bff342826751fdc070b9c88b64790b2015a463d35ab3ef3f36d0d546e1ab2397c930ed07934dc7a43c23eed880efb32a0cfe3717cda714b1f1c7468b53a03
 MISC metadata.xml 342 BLAKE2B c4cab71f5d398ab14a8e95598f510c092fa2cb34fd6facf4c59289c8f78f601d585207eba1ba4822ac6552ae12375e4e786873a55d2a34d2e36c02fa72ab5b02 SHA512 aa104434e5ba9d5a27409be91ee791f898e72aa38632b3c185c09071632915686dd5a3ccb46c24c911468d29cdfed6c6421bdfb0119c28bd5c404be4b55bf789
diff --git a/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild b/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..23f293301191
--- /dev/null
+++ b/dev-ruby/pygments_rb/pygments_rb-1.2.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+PYTHON_COMPAT=( python2_7 )
+
+RUBY_FAKEGEM_NAME="pygments.rb"
+MY_P="${RUBY_FAKEGEM_NAME}-${PV}"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
+
+inherit ruby-fakegem python-single-r1
+
+DESCRIPTION="Pygments syntax highlighting in ruby"
+HOMEPAGE="https://github.com/tmm1/pygments.rb"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
+
+RUBY_S="${MY_P}"
+
+RDEPEND+="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND+=" test? ( ${RDEPEND} )"
+
+ruby_add_rdepend ">=dev-ruby/multi_json-1.0.0"
+ruby_add_bdepend "dev-ruby/rake-compiler"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/s.files/d' pygments.rb.gemspec || die
+	python_fix_shebang lib/pygments/mentos.py
+	# we are loosing a "custom github lexer here", no idea what it is,
+	# but if we need it, it should go into dev-python/pygments
+	rm -r vendor lexers || die "removing bundled libs failed"
+}
+
+each_ruby_compile() {
+	# regenerate the lexer cache, based on the system pygments pkg
+	${RUBY} cache-lexers.rb || die "regenerating lexer cache failed"
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	ruby_fakegem_doins lexers
+}
diff --git a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild b/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
deleted file mode 100644
index 1e51b2fb94b3..000000000000
--- a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-PYTHON_COMPAT=( python2_7 )
-
-RUBY_FAKEGEM_NAME="pygments.rb"
-MY_P="${RUBY_FAKEGEM_NAME}-${PV}"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
-
-inherit ruby-fakegem python-single-r1
-
-DESCRIPTION="Pygments syntax highlighting in ruby"
-HOMEPAGE="https://github.com/tmm1/pygments.rb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
-
-RUBY_S="${MY_P}"
-
-RDEPEND+="
-	${PYTHON_DEPS}
-	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND+=" test? ( ${RDEPEND} )"
-
-ruby_add_rdepend ">=dev-ruby/multi_json-1.0.0"
-ruby_add_bdepend "dev-ruby/rake-compiler"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/s.files/d' pygments.rb.gemspec || die
-	python_fix_shebang lib/pygments/mentos.py
-	# we are loosing a "custom github lexer here", no idea what it is,
-	# but if we need it, it should go into dev-python/pygments
-	rm -r vendor lexers || die "removing bundled libs failed"
-}
-
-each_ruby_compile() {
-	# regenerate the lexer cache, based on the system pygments pkg
-	${RUBY} cache-lexers.rb || die "regenerating lexer cache failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	ruby_fakegem_doins lexers
-}
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 3ab52af61aa4..8f4e48c42520 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -2,9 +2,11 @@ AUX rack-1.2.1-gentoo.patch 410 BLAKE2B 18246afd31b682e66a5bdd92c08bb9faed9a9fe2
 AUX rack-1.6-rewindable-ruby23.patch 1360 BLAKE2B 062c4a474959c4dce61969583b6aec1ae98acff38c1e72f5e22440c4c8938dbaa2142d70a0354948c151eede2b23ca5accadc72aeab366ca1457216d9725292a SHA512 3cb110af584cc3f767a0d3976acb66f37423559865af0726109419728ce6fbe9f484ac2340b1816ae89c1a59ca64330c1bfe4be3910bf6a8ecb05784115a1cda
 DIST rack-1.6.12.gem 230912 BLAKE2B 98a3ae6905535b284a5e723d39db7788f97c11b29506fbdb3c584c53d1dae35d1e8006724e5f63195d8407521806c53a5fcf47544b4241370a3576e6dbea0dc6 SHA512 9d0f6f44d228c1b6a7b0fbf29a1e5a2f45339b4749d563336c1729d88c3e37d6360fedde75b7cfcddcd7e051025fc50f04b594fb68d499899e96e2385478fe76
 DIST rack-2.0.8.gem 256000 BLAKE2B 30fc53abd2a9389ef00b1803d2d329b10288356fadfeaf80e0b6f7d2327b5aea058626f50d228454716007b1be0b316c6083debee98c0d0ee5eed458600f8315 SHA512 88c406cfe38c3db1a3502fc563272a99d8f2e36bfea1122cdea6b6b49b0e6b5649e1f0864161793eed83cb3d934aa260650b703bb1b059c6e56c6073c2060fb2
+DIST rack-2.0.9.gem 256512 BLAKE2B 7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c SHA512 5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
 DIST rack-2.1.1.tar.gz 250934 BLAKE2B d7d50c011d963dbfcd5dc456bca5711fa46c062df88f70280407cf617fde0c954f9a9453ae077dcdeeea54ac6291388420f37f25f629193112aaaa1bead6a55e SHA512 806842fdf1df332fc13d1aa8c4fa3f5bf091eaaf5db8684ad2c2de23d41955f850dad5da3ef7ca89ae5c51a0eea78e2d31b2c5465734ec949948a1fbc911427b
 EBUILD rack-1.6.12.ebuild 1696 BLAKE2B 32c4b3b7ac5eed90a5e9d65a8bc0899bb8f00f1f285a1a4392bed213a00896fb4dcc8dd3ff6b0e89cc09276b4add25e44d0f68c11743eb5696615610030ebd5a SHA512 fb879bc94b7e264802665103f2392303dd22cadb4d4ace4416085b6fb2c515e53c33e113bd09e916bcd0c9452a55464a7f6c5d1eb2972f7ac31aa4e4f4b68446
 EBUILD rack-2.0.8-r1.ebuild 1413 BLAKE2B f37d1550e98bde46d4c9be01f65d3ad26094f2f20a36c34463788a9a6d5b41675363ea3f17882e56588e37b91dfa0432893d7f7850e11a7bf8106bf9936dd24a SHA512 18c1e3f9005ec097dac587e7fbe7faccf93098325407183037d72f398cf9fda6c81efb67023d2e4dfacb4a30f7ec2237bbbbc4d5280e0a53f9355c93f8a40077
 EBUILD rack-2.0.8.ebuild 1387 BLAKE2B 134d5c1dd981d3d595d50129a809f9124d3ca0236de01170e5e87abb66e168a46b8e588c5f4494da0d6e28385142f8c8cc714af0de83d91db96789dd70341bec SHA512 5a4f927a4557f76e5b9ffc739588b833fedee1798c197171e562852fcd53f6095486c643b0ca3fc6cc35d2ab0f30d919f3f3c6eedea60058db8433f067f044ae
+EBUILD rack-2.0.9.ebuild 1413 BLAKE2B f37d1550e98bde46d4c9be01f65d3ad26094f2f20a36c34463788a9a6d5b41675363ea3f17882e56588e37b91dfa0432893d7f7850e11a7bf8106bf9936dd24a SHA512 18c1e3f9005ec097dac587e7fbe7faccf93098325407183037d72f398cf9fda6c81efb67023d2e4dfacb4a30f7ec2237bbbbc4d5280e0a53f9355c93f8a40077
 EBUILD rack-2.1.1.ebuild 1416 BLAKE2B 306fe042aee8f2e79562c8fdd8375f3924a3f77484c487474a3594c806c60ff1dcec51f28d8eecce56667ea063d78c963ec8b81ac0a3a2619ad11580935c8a19 SHA512 831b559f3d8a4da43081b61ee9792c4ef558b50fb0d2e12603e0088462aa1adde4254b8371fef5f0b698de58ceb6cef1c725d2bf40c76c2fd0def1452f8537ca
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.0.9.ebuild b/dev-ruby/rack/rack-2.0.9.ebuild
new file mode 100644
index 000000000000..6ccbc9c8b581
--- /dev/null
+++ b/dev-ruby/rack/rack-2.0.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://rack.github.com/"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6"
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Avoid development dependency
+	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/rbst/Manifest b/dev-ruby/rbst/Manifest
index aebb0dfd36e2..0dcbef42d9b9 100644
--- a/dev-ruby/rbst/Manifest
+++ b/dev-ruby/rbst/Manifest
@@ -1,3 +1,3 @@
 DIST rbst-0.5.1.tar.gz 14039 BLAKE2B 7399e92f98c650842464ea9240775ad776ec8d574c578d8da764778bbe8050be429e2521df82b3b04a0bf9cd18bef4f114890d54ef8d6f34c797f0f2f2e35bc2 SHA512 a7fffc1ccf495c1858d6d9fadd38a4d6a2c27a2da8eda8dad038f4ab881f4521223a35f97d4018d25b32c2621132a623040ba930494b36e1385356ecb87fecdc
-EBUILD rbst-0.5.1.ebuild 1212 BLAKE2B 2ba65ebeedc1d052e930edb75922e1330acb5e459ea78184218a2cbb6a4ccc81d70791e541e1674fa1fe77589d99fc4ec62c724cc551bcf3384c3b3ca1714f91 SHA512 c157b3649a6cae224c179587c65e5fc6a27628e035048453a51303dcc4e7971bc7860a1e7a89ca3d1b9d1722626b16576d40f3af1b479b842883d8ffa869c2b1
+EBUILD rbst-0.5.1.ebuild 1208 BLAKE2B 6b1d9578b7281248c0249c8cbc86040dbf218551396ab2be63df96425c90e1b52a959feaf9179bffd264a9dc4880a45d84b70fcb63fa2cd03f1da53062f5f2d7 SHA512 3e3a542a342be779260e4a5baffe62c587068c2311339be6d7ca554c465605fb7d6263d208cb83cbc23ed9eef3cb3e311da5de18a1735af320586aa6d5629f7b
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/rbst/rbst-0.5.1.ebuild b/dev-ruby/rbst/rbst-0.5.1.ebuild
index a1a9a0c1de73..d26acad50ed3 100644
--- a/dev-ruby/rbst/rbst-0.5.1.ebuild
+++ b/dev-ruby/rbst/rbst-0.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_NAME="RbST"
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 7d7a6f0927a6..6cbf454a8966 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -3,5 +3,5 @@ DIST cairo-1.16.4.gem 196608 BLAKE2B f7cc8d9e2dc5e3f6dc5a6e259f5594bd7a6cfb13c35
 DIST cairo-1.16.5.gem 196608 BLAKE2B df84e6b0b4419471cdaacb7eaecf23b9257b8e0933dba0e3058afefc288cbb2f14acb38d4f5302f095ed37c46469eae61d934c8da2d0b1ef1cc48f06e794179f SHA512 98c10e16a3a2d964dd9b5fd450118068042e721f9655758ca567ed45f418ce1c2b9fe8cfa991a94778eb17d69fef65008d2c21244592f4f1819104bdeb76bdcc
 EBUILD rcairo-1.16.2.ebuild 1793 BLAKE2B c7a07ee26d6e26d19d59ac423ab7b14f9b4df45c19511a36771c3c40edc03e18834c0df8cf4bfd28fbf8b017ae05033fe4bbe266be94dce40bab5e1f6c8c678a SHA512 c6267cc0d698413057a12072368c833ddcd777cc09c9d6ed713fce9670b45bf28a3bb7031d2a59098cdc9fa578de8da1e20e13218bf4baec0ee54029ae5816a5
 EBUILD rcairo-1.16.4.ebuild 1891 BLAKE2B 55ce6d910c377866b51d8ad3d525c56727727bb3fa04ddf28ef6c9a7424a56bde3f06c33eedd5292158ad7161b32344aece891c74503afe798cbc5fa613463cf SHA512 05b7b802b2623cba16d1677d216e35d68c340cb5d962973cfe19068708c8dee57924779b1b62599beae753d543712cf29ab9592ff4059e36a9485906e8ea1de2
-EBUILD rcairo-1.16.5.ebuild 1844 BLAKE2B cb81a8c32e03514b134acc5e036f3c9f04545dd0b7a91016f43c3d0ab672bbad56390a126b831c40a306e2a825735436a17b9adfd3eeb38091f1fe7b6a13755d SHA512 1c6212d3af7c2bea74735d720b922462a30117d9a7633f6856beaa23e836d5e2a0069055098a86591e5fb0836cc3e6e097a36354c31d614ffb849bbb5e23a10a
+EBUILD rcairo-1.16.5.ebuild 1851 BLAKE2B 1b18f691c6666d219daedf12de256e4293ae8a77b1e939b70a8fa79670f59a8bf7ffdd8e9c49e2cdda88b314ec469b9ecc6b9fc757d54b477caa41ec5e2f141d SHA512 3a01341649ffbfbaf6c32d286cd5df1db6c318d60410e5638eb66113622b3890137f8db15707eed60fec44929ce56b53ba02cbce58b1b08f12d2023b69f2d6a9
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rcairo/rcairo-1.16.5.ebuild b/dev-ruby/rcairo/rcairo-1.16.5.ebuild
index 56694baf14ba..ec94518c6401 100644
--- a/dev-ruby/rcairo/rcairo-1.16.5.ebuild
+++ b/dev-ruby/rcairo/rcairo-1.16.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_NAME="cairo"
 
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index 25f6dc360d20..861ad04ca76e 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -3,5 +3,5 @@ DIST request_store-1.4.1.gem 9216 BLAKE2B 06d88b26dfb1834e1a30bd17780e19db75dacf
 DIST request_store-1.5.0.gem 9216 BLAKE2B 75dd49c33cfebcf0deef78be1fe054feb7198b42409ec4b339cefdbdd4fc066159bd18ae6db8001edd0fe20e1e8be1021812e6ffd033eed0bd9730603aaa2daf SHA512 c01d4505d2bc0b88456d0bc49416fcbea67da1e2ab6ef0c7fc900fae8856d82157dc39d2e1d2f299000f74b140f6f13d7352f4684e247d103bbaab7b1705910f
 EBUILD request_store-1.0.5.ebuild 463 BLAKE2B 7df54319509ab1e2755c57463586a436ee94308ec8232d23e8e8b887b61bab3dca3a0320c85936eb1ba45f72a476dfd2c0649faae4883a400db1b78d64c1da8e SHA512 940b617a4dce693da882ab943c1a48cbe0147d6a44967241ca6f2ecfeb25e6918ab71c333467a45aa2e8564ff309bdfd9353470b9262aa4425c0d947ef169fcc
 EBUILD request_store-1.4.1.ebuild 514 BLAKE2B 5e8af7b54455b5f3953db04caa84e653d3cd48267545a0d596e8f35f6691d8bdff5f715c77c7c34295aca6349cf66eb7399a25078a0ad10573aadeeaca41dee0 SHA512 91bd620c6883f99d3ba84250ea1c3cd52f0699da100e683671231e8d35537238d6b386a2f5b65c108e3026a8d3584b67a28bd983a8766aa4aa286837cafc2c17
-EBUILD request_store-1.5.0.ebuild 476 BLAKE2B 86a1ac93c5251f1e5db7e378f76c8d360a55ff56c4dfb94a83d54a8d4ab819af42eeaa5eb053533306f1a717a17a8a42efa070017ceec5cc3eafb1b7581417f5 SHA512 3da7e28f1311882f8ee96cef08ffb929560e90b4d34ad64aed8ca9c27068526d2ae9f355a7445a9cb636be85825e2ae24ea3500e4ff8d77653e1edfb0c863789
+EBUILD request_store-1.5.0.ebuild 483 BLAKE2B fb8097119fc727cf85319c873a8f93d2b05646a6da22ff2065cf7fad6c96989d2c27c8a41119c96e4de3cfa20d58e188d673399bdcc74ced9553f7e153f1f6b7 SHA512 5913f1afc41b25c924dad740af3b09b50a9fde0443776873f0d9d8d01f126089f806b83069abf834d866251ed77e95d650cafe823adbe40f04ecb70e8e7d91de
 MISC metadata.xml 352 BLAKE2B 96f0c7bc363401045297f0819f643d6bb4673c196b9edc4d40ec6aa3c66b9b4921cfcb0e5d5082778a720a68d7fcc26f6d814843f0177f7f548cc0d1f56f34d6 SHA512 ef219e94da98dce395d21d81db23380925391207d00dd4e39d2000ba841f62b237b13733ded2fcd67c36e3d18e9ba28b33fa3905c7d9cd7466fc8c942d577c39
diff --git a/dev-ruby/request_store/request_store-1.5.0.ebuild b/dev-ruby/request_store/request_store-1.5.0.ebuild
index 7502e8ee22d7..09f4d51a5652 100644
--- a/dev-ruby/request_store/request_store-1.5.0.ebuild
+++ b/dev-ruby/request_store/request_store-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/rqrcode_core/Manifest b/dev-ruby/rqrcode_core/Manifest
index 45478dde4ebe..f5b5efe0ffdd 100644
--- a/dev-ruby/rqrcode_core/Manifest
+++ b/dev-ruby/rqrcode_core/Manifest
@@ -1,3 +1,3 @@
 DIST rqrcode_core-0.1.0.tar.gz 20241 BLAKE2B 1d6f97cd8e1188c0a3ba0246d2102a901ac64fb0bb08317479f9061d3273ea49388e4a6ea02c8de6b54f8e928aefab62fe8b0dca8ba9f7ed31625cf84965df4b SHA512 30ba73f45d69360b0efbf543a774c709a4397bd8f726f4edeaa830397187cd5c7535ac5816d65cea00f356f7111f69629f03fa508b7a7fc91d5618c4cebd8167
-EBUILD rqrcode_core-0.1.0.ebuild 654 BLAKE2B b04d021e0cd5764254fbb2bdf2b18107fc86349bee666ad877b53276fcacd53f6f00ef6a02b23c8d74e2d78a87b2e1e2f3eb385d9be70bcc864da00df63971c9 SHA512 37ad08dea75e5d18a935ce0ea26f28e68f1dbf9e741e34e43865b4ae732235d0f1d333929a6acc95717bc0683d14e0ee7c5eec3ab7e530c481c08de4fb7429bb
+EBUILD rqrcode_core-0.1.0.ebuild 661 BLAKE2B ed717a784a2e3b57897807e1dbc612f1dd89cb496cab1ca766f50ea8010bd02cf3f10300986b3ec156a404900013a7642e4cd23c819f7b6a9b4d3d469fe85998 SHA512 29c98562570b3cf101b857d6aa0c137ec23e7a74d045ca0e001c50220f1dd92b20da7d5761f3ef4fd8eb44fb83ec3d94743d50f05cfe025bd081d707302f543f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild
index 58979b3170b3..76d6b6aeafc2 100644
--- a/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild
+++ b/dev-ruby/rqrcode_core/rqrcode_core-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index 71aee2332e2f..45ff5d3fa460 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -3,5 +3,5 @@ DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576
 DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-cairo-gobject-3.3.2.ebuild 949 BLAKE2B 421ba2758697cbaad9ce0a058b40ae1644bdb3cacfddaee283a8b153b15085322c707513ad0f571bdf2bcfab382ef81e6df972e3f65ae4908e638431b90f5ca3 SHA512 60b85c4f9f3c93292476c7a48b1db70e28c5a31e95e22663d9458e429406c3749483891080723d15115e79084ee57dda313826f5aa3f8a0ce0b45905ff8dec28
 EBUILD ruby-cairo-gobject-3.3.6.ebuild 936 BLAKE2B cba00a20f21e2798bd1293d89ba9b04f4df8ac08c4e5bbbb3d2db0cc241a6c1e87a201fcfbc61768eaf3e6df54f6190200e506d3ec6a7eb7f8428c607cb0b8e1 SHA512 71a238d3670caff64ec8a0a9b1c7e1f0d95e2cd032667ad714562a721ef87750a4c0986751047c288823f2226d46595c282b08276180bb493e458c72691375b5
-EBUILD ruby-cairo-gobject-3.3.7.ebuild 936 BLAKE2B cba00a20f21e2798bd1293d89ba9b04f4df8ac08c4e5bbbb3d2db0cc241a6c1e87a201fcfbc61768eaf3e6df54f6190200e506d3ec6a7eb7f8428c607cb0b8e1 SHA512 71a238d3670caff64ec8a0a9b1c7e1f0d95e2cd032667ad714562a721ef87750a4c0986751047c288823f2226d46595c282b08276180bb493e458c72691375b5
+EBUILD ruby-cairo-gobject-3.3.7.ebuild 943 BLAKE2B fec434a1c4c6b3a989af71a036e83f704fd07e31ac68ab94e57ec088b04124a96d80364408f1fd91e7923f8051562d683e1d62265b550c4c5c0d29b9d5556c41 SHA512 83b42e5ef4a64304b6d3acb25857e82c2bc96c9bb0718e83c4d47dc4dd596a550cc2a3c6d51c4b2b2f00b2ec829e79d6b4d50d3b37fb73b9d8e82810607cf5d6
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild
index ecd747dd85fa..85aa662c9da3 100644
--- a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index e411206c9478..bf888a292e1e 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,5 +1,7 @@
 DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
 DIST gettext-3.3.2.gem 289280 BLAKE2B f18af8ca573c7a503983c741cb719896208f062b83382533fe818c0ca2e6b3eb5c4491150dd43ba5701ec0fa9a52c1b7686b938d05da6e4a35c5823fe447b4f9 SHA512 92ec140795fe4477754349375413061f20933daddf71f024b989b85fa05a773aa63583c11d982f7c65ab6e842ed03d2083834883ddd45a76f84655ae814969c2
+DIST gettext-3.3.3.gem 290304 BLAKE2B 17a9020660c0f9793d86428cf5738485e9b76d88d23a41aef053ef2c7034d6b98f1c880a61a37c6b04dfce37dc82672bbd6659312da5279e6e0c85212206559a SHA512 f14cd5166d16c592cec6e9b3ad5b2e5e27889cee0380b70abc3a6a69bcd8bcd1f742c88021e58ba843655d22e731decaeb1151e359fb49f613e71721e675cbf8
 EBUILD ruby-gettext-3.2.9.ebuild 1771 BLAKE2B 3a90a8f5e83d68612b25caaa368a7512553c613f232d0d499e3ac1c5d2e071af887cfcf583072ad2faf3357b2b78bb1359a6dee2dea4f8e76f8c9b093ad2f2a0 SHA512 9cb5126eac74536bf1438f9c80bd1db13ffca9093a80386ae696f33e6952712df355ce78c52d5ce5abac1153ac615f4fb2e26d23aaf0d4b5f1e726db5bce9ac8
 EBUILD ruby-gettext-3.3.2.ebuild 1735 BLAKE2B 44ba7497e1b79b6801ec072f308a96428d2719ac847bec8dec6b9a06de67e9c62fa84ddfc4fe956f656f812c3e08fe02f49c0e9cc821e8a3b23a3389f5f62ff6 SHA512 7a52d6c43e90efd7bd7f64f2d0ac438fe559b42bafed1325be88d94c7b42bb79ca2a181456f42e5b96e1a77f2699afc08e2ca73807487ae068705f71818f7de6
+EBUILD ruby-gettext-3.3.3.ebuild 1735 BLAKE2B 44ba7497e1b79b6801ec072f308a96428d2719ac847bec8dec6b9a06de67e9c62fa84ddfc4fe956f656f812c3e08fe02f49c0e9cc821e8a3b23a3389f5f62ff6 SHA512 7a52d6c43e90efd7bd7f64f2d0ac438fe559b42bafed1325be88d94c7b42bb79ca2a181456f42e5b96e1a77f2699afc08e2ca73807487ae068705f71818f7de6
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.3.ebuild
new file mode 100644
index 000000000000..6dbe1dc2f605
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( Ruby LGPL-3+ )"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+
+	# Avoid tests failing due to a missing test file.
+	#sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
+
+	# Avoid SAFE mode test that fails on ruby 2.6
+	sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
+}
+
+each_ruby_test() {
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/ruby-gio2/Manifest b/dev-ruby/ruby-gio2/Manifest
index 8303d737b19b..bfdd0735b85f 100644
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@@ -3,5 +3,5 @@ DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576
 DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-gio2-3.3.2.ebuild 945 BLAKE2B 203737505ff329c34f97e677c7d29e1efc0dd62ec9300206350a0d716d52d464acd63a4d2ecbf21972650f3ac3ced870dba3cb51e3664e50a82865cc542a2edb SHA512 758ded8237888b5371b5a27cd2d67407516d7a1c7d72a574edf1f21a68ffdb45bd69817ac497414c8e289ee19dd86145f4d00d13c528f7201908c60b1b7cce5a
 EBUILD ruby-gio2-3.3.6.ebuild 932 BLAKE2B a57cc8bd9b607d38800b982184328cb5e2b9bbefeee50f3b03493f06ef4fd42476b0d2c3d85d519d493e065504912060edd8e18c45b01f3c1c985e78d5d44b68 SHA512 f5326cee41a43e63f469c417b92485295042b69c35d2c67e7de9453b7f27e5981948d664549de9a4786da8426b213a5782231989048856c215b81971be6b4c28
-EBUILD ruby-gio2-3.3.7.ebuild 932 BLAKE2B a57cc8bd9b607d38800b982184328cb5e2b9bbefeee50f3b03493f06ef4fd42476b0d2c3d85d519d493e065504912060edd8e18c45b01f3c1c985e78d5d44b68 SHA512 f5326cee41a43e63f469c417b92485295042b69c35d2c67e7de9453b7f27e5981948d664549de9a4786da8426b213a5782231989048856c215b81971be6b4c28
+EBUILD ruby-gio2-3.3.7.ebuild 939 BLAKE2B c239a95b3c450db58feb13711222cc9944b948fec5305c06e2b1f0008dbec9c4d9df42daeaface62b76382b9e78869224cb112c43d72b26ffa0308f59d7251c5 SHA512 994b3e20a586c0282a759ed3523a246d3f25d86a19b99089313f97ad3cc18f89f09857e076c4c4deb84c6ef260a1158582ae5b25901917083c1a524dfb74bcac
 MISC metadata.xml 484 BLAKE2B 92b370579737b078247911f01123a69d4b3a885554f2d0ad7f4f327b2b9d99af9176c362f9fb206f8d0c0cad2f929562f647777333ce0d65819857b56dfa2f0c SHA512 d2a0d82edb1c77c3ce6138842269447a5e1e2ddeb5ffacd1d3c5692132f52ca310a8314285006b98aa277816ed63203542685749d8e13ebf563726c1b63a61bb
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild
index 341d6ab3eb43..8bb8278c24ca 100644
--- a/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 0f039a716ef7..daf62caa58c1 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -3,5 +3,5 @@ DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576
 DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-glib2-3.3.2.ebuild 844 BLAKE2B b28c519fe7926bd0a67f10b58e40bd055642aeed3191f08d391fb0fb1e7d56201462a4c7adcc888b66731a1090219bfa86dc4dce1d801719ef3114468e503fe3 SHA512 71d13d477e756c1cb8e749f692a70d84d75b620a3c1d72447aa9139130d0e0099595348775f4dd6bf32fc2255de1f96252cc68b15627298de4137a1bbd14e8df
 EBUILD ruby-glib2-3.3.6.ebuild 884 BLAKE2B a4872156721bc6f7a65d876c04436c68eec9c8409e91ccdfb9e1477f8c8dfa7654c373d077b519e0905e2a62182f5264fdf80bd7d9273931e6beff524a55b72d SHA512 0f995f8522b503c3f2d2fc5125eab6b2c83aa74ab2d2b3232f4e4ad69ab311cf57d8c29344f6d1b4bca48964b48ee89e0b2602f83cf775bf9e060ecd46e8c435
-EBUILD ruby-glib2-3.3.7.ebuild 877 BLAKE2B c7480a0f7721818f157b65ee48bfd30336cb1eb7436272b2e7a29ab171eca204bc995867e7122b516a28f14f112382c6e998107fb3cf712594aa161d9924b5c7 SHA512 37de2b10b978a2a854095b27453d31737eaf03a2a5b6b0eb6257c432638ee62f43e6a83a3fba435b2ef607ffdb5e422fa64435b81a680d654ce2620f1beb3d3a
+EBUILD ruby-glib2-3.3.7.ebuild 884 BLAKE2B 3979bd2be0ae62c1e3913ac9b3b66b99da2c8b2d39d621c420dc5b650c62b9295d6d8701eb94239ca7abe7205e260077fa7ae9f43f1b373e127e359df548b91a SHA512 e19bb9a3f0003ad425e5314c5867a232a2822cf18ad00b2f780739d56b6e66f17c0163b2f74ee3ac7762caefab74b087dc5439f245a907471c6c6165f7be9fd8
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
index 177fc7b8c9df..d8f7adf0af33 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index b42569548d63..d24267d0ddeb 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -3,5 +3,5 @@ DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576
 DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-gobject-introspection-3.3.2.ebuild 1064 BLAKE2B 58395216023484a4eddbecc51d39ef4181034ae31535d0ae60ae87e31269fc89d955c587e64cd369cdc990fdeabdc96b05302c89e977dcf65e31b5dce5588a61 SHA512 2afddec38dca9c32b3e5b79fe338f52ac8c3dfc02d54e3377bb7928f3e522ecf361d8dde8e29d9d598396309c8c3f22e917101abba3be82b68167393d60ca8e1
 EBUILD ruby-gobject-introspection-3.3.6.ebuild 1051 BLAKE2B 8a7cc0ca7691fd8676a319bac7179b0bb7c9add3555238adfe0428a81cd23fbe88bfab96ed60e3a01bfbba14d34714238142df7fcab50dbe9645367d70458cc5 SHA512 23000a36802cb89711e747fe3d4a0d720409b61a38a964b51cb64942a1c2733d6ed089cafb13ce0443f05367f3ef246d237b31c001432f747d6d09b0fbcd2065
-EBUILD ruby-gobject-introspection-3.3.7.ebuild 1051 BLAKE2B 8a7cc0ca7691fd8676a319bac7179b0bb7c9add3555238adfe0428a81cd23fbe88bfab96ed60e3a01bfbba14d34714238142df7fcab50dbe9645367d70458cc5 SHA512 23000a36802cb89711e747fe3d4a0d720409b61a38a964b51cb64942a1c2733d6ed089cafb13ce0443f05367f3ef246d237b31c001432f747d6d09b0fbcd2065
+EBUILD ruby-gobject-introspection-3.3.7.ebuild 1058 BLAKE2B f64c965eaa2288b3569d9c822aae1f51e3c483483cb77ddb5e9a00ab2b40254cdd345a5edce0678c2b1c5613e50ff99352c5e44af3f25f65e6b087f0bf53dbb1 SHA512 27ba1146a1fa3055f1fc4a28ea45206b41af3b34b91b2066971228935f90da8bb8ea5baf532da50f5e0b85be907992a8ea0a89ed70823c2ad5720c03936565f7
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild
index 2cb9544a2609..2d2bad37ef78 100644
--- a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby-poppler/Manifest b/dev-ruby/ruby-poppler/Manifest
index 00934df897ac..b907dcbbd8d2 100644
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@@ -3,5 +3,5 @@ DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576
 DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
 EBUILD ruby-poppler-3.3.2.ebuild 816 BLAKE2B b763adb627c5f3cd941b026ab16aded21c8eba3cf5bfaf1ddaef6da748dbe57d9638d08942287c86d2174149ebbf832724b554dfee07895edef2d0124fce4119 SHA512 dcc216145cb8b4e3f7dd9199033e5dae2b76efb09b77d88c4d71474e21ec0e94bc69d9da0fe34f1f0add6a11ff0692c2c3c6ce99d5aeb1e6e9eb91285b4929d8
 EBUILD ruby-poppler-3.3.6.ebuild 810 BLAKE2B 453860cddf821f0435b844db09760e5ec5b3f284fa7e58b5e9f973e0f570982dddc447209d2b293cc5472a86c0598b5e21ccecae12d6ed0d7b2f97841dced39f SHA512 18ba58fcecab5398ec48b01cbec4d47a4221a7cbede92517c2414df4a8a700eaf4cd9d38a6a398d0217965bb3c6b5f32dd382d394d7de5df5d6a05ac25e959e8
-EBUILD ruby-poppler-3.3.7.ebuild 810 BLAKE2B 453860cddf821f0435b844db09760e5ec5b3f284fa7e58b5e9f973e0f570982dddc447209d2b293cc5472a86c0598b5e21ccecae12d6ed0d7b2f97841dced39f SHA512 18ba58fcecab5398ec48b01cbec4d47a4221a7cbede92517c2414df4a8a700eaf4cd9d38a6a398d0217965bb3c6b5f32dd382d394d7de5df5d6a05ac25e959e8
+EBUILD ruby-poppler-3.3.7.ebuild 817 BLAKE2B 9f2713edca9a33555fe7171fc962667dc5f472a6146b986cd5789156b5a65eb8d056de34d2e5e83e43881ee412f57120fb68c3f65c870e59a821a002b9e885cf SHA512 3ff8dee801ad2fd396149dde6a9aea45358ee870cb58f78c4e6061d13bd1777c1163110a3a3c3d6a4bb4bdbcc510522930cddc5df9b6caee452292aed8765328
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild
index ed0b2a50186b..681c77dd5d37 100644
--- a/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.3.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 inherit ruby-ng-gnome2
 
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 0f1c1f7e4762..1815ff3d9d8e 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,7 +1,9 @@
 DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57974e622969958dda39f4dc8656a4211378ba51c4b8e8eefafebf82e550ab73a775530eab06ff6419a3dee7f8f7b SHA512 90c8b68245168c7df4ec8d0e6c62d9723d759945823768645614fe085f375c6811a15c35334c485cb59f32f6adb1aa0a06e7df043b09a48ef4e6102d93562b1b
 DIST ruby_parser-3.14.0.gem 467456 BLAKE2B 0eca83b919a87306e35e0a6481b6518d5b7ca04e437f6953de278bc757e8fd53e15dd26d7049a715314fd88c01cbd4fc5123fdc98e3cfa7d063e291f92a39a93 SHA512 077cc4610a768430982735e174ddff762ac677a6d437e0e82ee6615c467997434ec6f556d6144593e548c0e7bb8f7e208485e64085858757c4ba2dc9e606e9b2
 DIST ruby_parser-3.14.1.gem 467968 BLAKE2B bcd72ebdf855111358f12c08518d200b1fdcd6bf860614dc190fc59f8a242d843271ec426797b7a2afb3082ec6775777d83d324d66391e21d1df8a27971e1b10 SHA512 0bbbe8a85e1602fd26d2ea8d19d4e57933251ba94341cda79631f7f0e35ea8f3c5b0c2e6e8bc182340838737d508cc8142167917dbd35e0bdb005889f152d72c
+DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a230d1ec7390ef6b093c717534bfc6648a00240fd07d0f108ee1dcdc9f81b121a0ff0446d4ebf75fa5bf87006fa0 SHA512 65b8977fff322d4ecdbb8da1276d76318f08a13a25d8cf8429ba5ca7097c2b58c03431d60b05eec6cb62be316cf9b1efc753b86e8b67e076fd413d2324bc6655
 EBUILD ruby_parser-3.13.1.ebuild 1147 BLAKE2B ccb4c3ef8e20170ad014651c5998c863c981f42e1006605ec147862118f8c61fc52e2b76a7d312caf8a9fa72010029b673045ac0c53126d8b6f8bd36d261581f SHA512 70e3087add371227f618b709226283c4b4d26417d2cf7ec56f942196c0acbb05223ee859a6b1f7aef95e6b8ea324043a450e8a1d01e197b69aa66dfd95bda161
 EBUILD ruby_parser-3.14.0.ebuild 1112 BLAKE2B bde3969fb6a0e97d9254a90550e712e38e554b153c705c79edab16f5241559591e553441ac2cd94a74c59db6d9a2c563f351c46f87a44b49cdee99ce60a030fd SHA512 a0661c03d6619fee7757763f2def0a9fb8da27d860cd40c0bc47f65c5212264b104d6b7ab6168fc3577a4b61f973eed6049cdc2b8f2e3d498176598a63744546
 EBUILD ruby_parser-3.14.1.ebuild 1086 BLAKE2B a7bd0e0acc05d2695380e8f913119d7dcfece80ed4b411e5cddb3a08c79c2172178377e453567bdf168d7bd2909fbc490971488a512ea3b3072f4efde20262b4 SHA512 7f48dab8c13939417c0b933f270a42a85d31f2f19405ea33b9cce1ace5bb1b2b48198f8fbfb81e0335904e8e3f313a749a758323f7c8d9e7b65a43a8918c5b6f
+EBUILD ruby_parser-3.14.2.ebuild 1086 BLAKE2B a7bd0e0acc05d2695380e8f913119d7dcfece80ed4b411e5cddb3a08c79c2172178377e453567bdf168d7bd2909fbc490971488a512ea3b3072f4efde20262b4 SHA512 7f48dab8c13939417c0b933f270a42a85d31f2f19405ea33b9cce1ace5bb1b2b48198f8fbfb81e0335904e8e3f313a749a758323f7c8d9e7b65a43a8918c5b6f
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
new file mode 100644
index 000000000000..76b25e685651
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.13.0:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index be0cf284d321..f0fd3cd61a32 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,7 +1,9 @@
 DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb17605d5157c969d083a8fca404b1af3db1e2bfdcf76a6b7f392043996d246686dfa73117b9efacec529896d5a8e35 SHA512 d1e1ae7cf13b0b8c2e6786aad1bdeda25697d88abec86fc9415bb76d4e9e98097d2fecf16ceddbc80d1d447064bfa73beec5eaa5270ef38ce224c4bdbcdede3a
 DIST sexp_processor-4.12.1.gem 54784 BLAKE2B 95b238abb3050448cd076cfbda61d60c1d2bd90cfc94c3eafb51187b48a26249eb84b26e2a9469414e61f1c26f7764703fdf33842cb77730219048f999d48b92 SHA512 00f27cfea808ce16eba209207f804a432057d434c181d62f44656798d051c783f0232fa9ff9068ba83c254dfc0bb50d59a83196bf2a5f247f438b6467d9ba701
 DIST sexp_processor-4.13.0.gem 55808 BLAKE2B d807f632e93bbffaf92c31214a5d76fb5f069563af07f3f3c9d8095114d4ffc41a759144f93e1081d4192e6b7d572feab2be10a5fd639bafc0d3b166a4d5b5e1 SHA512 0b83613c10dd268837bddd552910c799e002eea6b409aa9788a5a65957454d2ef601cc023f84d98dbacc34e3c58923d6c43115510bae7ec9d2d72286f141828a
+DIST sexp_processor-4.14.0.gem 55808 BLAKE2B 60e19163bfca60b019b462f251eddc1f3644207f8eb4ac6240cb5eec9365621c56bd0a6741d1371a502c745b41e6a5efa29323a43ce919d823c0f11fd1a4d6f5 SHA512 90a6ed905d79079b51849521e25d8e6aa87c8d9aced75883b4080568a30aa3c349df35bb74556a1755f77ed73d3260ce88534d1967db93b39b34cf28132e0093
 EBUILD sexp_processor-4.12.0.ebuild 795 BLAKE2B 8a7883f4528a25b8a7389dd6388c576198659171d769fdfa318354e06a3ff2415f135778dc62524770525b7e49cc0e267416e85afe7cede3790119ad25689911 SHA512 e23953a9935a9d71823af891fa8229708e5116238bb7cb53eafae37251c2d479464979d2a912c763886a75313b4e4b89bc983d0e19e58dc1ca62f985e4b2e26b
 EBUILD sexp_processor-4.12.1.ebuild 791 BLAKE2B ca40d600c9884ec49bec91d9a8f5fdfa1020c3e6ab657c72a3acb460e649eac97a5bfa642de2b4ce4397a83cb9043a454d2e34532ac73f8b40e741bd60bba02e SHA512 13a733c8fdb7fd4c383f6a792f3f188b8dfe947810926036c7aaeec8cd2ef6f28b2fc253e494935178d126ff6a412c39123c3350f98b592a43fe3656405f942e
 EBUILD sexp_processor-4.13.0.ebuild 767 BLAKE2B 20cf438ff554ac4b0dd6d3f282d7884b14052c51d6f530434b7e366d1f550f978e2cf2fb383cde7b6dd2b3453300853c3f4ca2d7c727fb68a5f20304907be5ef SHA512 37d7c9f1c7a47fd37db1061dd891aae6c358d6a44dfcb3ab8b87d383179ef9f32bd0cd6445090744ed46943664a6aa7bea11da5a6879e9c27f0f884f2412ae8f
+EBUILD sexp_processor-4.14.0.ebuild 760 BLAKE2B 556d25c910b0a343e471d01a7569dc5f98ac498ae7c57ddb489949c2f34c6aec08042babf12a5c079822505865e7f043feff279fae1beaa5d634495597aaf4f4 SHA512 349f5df2daaa2285ad2d42c99a1270ef7adc2670963d75a157f5040f8e9c2a7c0689116c5c27672a4c9f678f9757e9b67c87b88dc267c1f5a8f63d2d490cb415
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.14.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.14.0.ebuild
new file mode 100644
index 000000000000..6b5718af0682
--- /dev/null
+++ b/dev-ruby/sexp_processor/sexp_processor-4.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Processor for s-expressions created as part of the ParseTree project"
+HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/minitest-5.5
+	)"
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 773fa86844f4..959e789d5fe7 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,7 +1,3 @@
-DIST sshkit-1.18.2.gem 150016 BLAKE2B b9427eab02b6967a71252bf4a519d86f06429241e28d661dd424ff7739fd69d68ca9b430096518872141e4e09fbac832e04aab8a89fc1d89ebe5077303b87238 SHA512 a98477dfc9c566ba3777a2557db95aa20c2b220b238d8acd59888c8ac271b71c1bbebb29f37ad87102a155beecdd0b60872b4c735f71f7a65be2c1fb5ae60c8f
-DIST sshkit-1.19.1.gem 155136 BLAKE2B 756d4f2e7575d0b2b2c0cdf885a22739e8b8f458d9ffebd614bc58135bd285853afe63bddc262dfb2d73ca64f6be5ebdb01436bbe25deaad73f5a62d9ac67b33 SHA512 9df31133c4d6b8da753aa2ab65574a813c99d086fff47b42db345057ff3eadce7e24bd6b648b28fcb476282a8b7f204acaec0cc766a3c25c52a3f64223169ebf
 DIST sshkit-1.20.0.gem 155648 BLAKE2B fdb95aed6d407c598abde71591cbe2d7b1f98d91985695509a6545bcabc5c0f3337cfe8f73e82f4b212e3c04b6da09e7521637934baeea7a9b5e268ff72fcad1 SHA512 682234f99d6ae9533c99f0319ad0f3732f2ff166a8f1a07d5ce8ff59fd9606af9440798a39f657dd3899e9278639aa93d5fb29af8f64b2ebea7f3b8e75fb25fa
-EBUILD sshkit-1.18.2.ebuild 1193 BLAKE2B 8e6b7375366dae75c94e52be1c95b2737062ba4f03362d77a0d50ff1309886106372b73cdc856de045e700051ab345e4de05323497132929ccd40a5515d4869d SHA512 90e6ed5687cf7c2e836702f8b51cf5340e4dba7d1abdd6a1ce9b0332456b9f780291e68aae7d0cb84523b34e8520b83e4806b930c75e5888496cac0e9bb49fd5
-EBUILD sshkit-1.19.1.ebuild 1186 BLAKE2B 1a9f107732af28f21c1ca7531b7784cab1421251e117e84049341db28866c3340a499bd207ebfd0050a0b13bf52b5bfd72ea10d22626fb08d3eff8bbd956f720 SHA512 9092f2c25c37a7adedd30bde607e77c43a9c4c043f4af967ae4cf451b094821698fa769f2708a005c354a66bff7f48a776f6cab79d64fc28df56ce6a33795fa4
 EBUILD sshkit-1.20.0.ebuild 1160 BLAKE2B 0d991bef3cb64cdf8d9c3325212092ff7534d8469b80c886ad3988179b2813bbbacd5a446746ed9963587963a2f2a74aa18231e5636da857a4ed40b3b834a06f SHA512 d011cacdd85ab31275bc552fb874371c73aaf9771b11bbf2cbae47099563ebe5bffd1999898cf5aa900db413967bbddd39c961deb92264711ddbb0f94ef2e75f
 MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.18.2.ebuild b/dev-ruby/sshkit/sshkit-1.18.2.ebuild
deleted file mode 100644
index 5c4ef99622e0..000000000000
--- a/dev-ruby/sshkit/sshkit-1.18.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/sshkit/sshkit-1.19.1.ebuild b/dev-ruby/sshkit/sshkit-1.19.1.ebuild
deleted file mode 100644
index 2e3a0b61bd06..000000000000
--- a/dev-ruby/sshkit/sshkit-1.19.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# There are functional tests that require vagrant boxes to be set up.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
-HOMEPAGE="https://github.com/capistrano/sshkit"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/net-ssh-2.8.0:*
-	>=dev-ruby/net-scp-1.1.2
-"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
-	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
-		-e '1irequire "set"; require "pathname"' test/helper.rb || die
-
-	# Fix assumption about parent directory name
-	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
-}
-
-each_ruby_test() {
-	# Run tests directly to avoid dependencies in the Rakefile
-	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index c829ad61dfaa..2074e43edd27 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -2,8 +2,10 @@ DIST webmock-2.3.2.gem 112128 BLAKE2B ef0a722374057d7c5392924f68de8520f08cb0aa03
 DIST webmock-3.6.2.gem 117760 BLAKE2B 132b700323cbc4e753406ccfcc69375107c1d8546fd71bacf13db614d1818926321e2cd27dfc08670f908e0ac5946b06892138c2701fb1f27cfcf9fb6dd56c3d SHA512 1d6141be90840d01e3d7b8e925e0a981ac715fbca1219dd35edd7cf3bcea1c1da3442aaa131e3586f0827a7b06207314119c1f47e6ae64f11f154c70ba6fc5c2
 DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
 DIST webmock-3.8.0.gem 122368 BLAKE2B 17533e0ba297e2caed6de736f7e0b740d33ac8d08d743ef0ac543e443c990fe2a22b14519c599c2d5e36a0bab67d9d72e3aac99ec2ca2dc3f25643b90a75943a SHA512 3c0bb83abafaf1c25f8129fe1017acc323385de0ecf00229f4ebdc1ce60bf83c8d8a05372cfb6e80c2382324854dd985b06ecf3e2003ca4697a65c57c5788d1e
+DIST webmock-3.8.1.gem 122368 BLAKE2B ba956c72f20e2c21cea90b107ef445e42a6995fdb31f9af65c3b561e9e1fbb9fbd299db009a1d83ddfdb473ce030d40aadf6633e23afbd072ee3b4debf7e0be2 SHA512 b1137fabb000469ee88fdd5521756f368463ee49988d5d89b51fa8352362ff249a4849159504834933e5e1248ed9b6791d254528b3cdea461fc9e8e5d92a334c
 EBUILD webmock-2.3.2.ebuild 2039 BLAKE2B aaa37b9bf42a6e40ef0adf60d223604cacfa7f51d425885c8cb04de5932d9b1ccc295e6a7c5f5eb930136e2c45b0a1703651ccbc2c08b2ced92e174729577d61 SHA512 a49f721d3c4c2e29a007aa82137b345aff64f47ba332c8fad9de652a1220d082351f2a25dd232d42b26671610d4fe1a005c3d163ee71d6d1714667985980a505
 EBUILD webmock-3.6.2.ebuild 2045 BLAKE2B 61c109ffb4cd499863db1b6f3c7ca3a200467cdec72959d1fd35219432929272b59759729b70deaf7b76f993655652e5f66ead18b3275bd4d1bf0ddf91d8bc94 SHA512 dadb1c2ca27db4e8158b59c8dbb5a9e8df9ad14012cd9677329b3150f49cfece1a6c508c1437bf5b48cd1e3bf4408bb5b230ac3196679d13624cd5aa22c29b19
 EBUILD webmock-3.7.6.ebuild 2064 BLAKE2B 6ce7dcc34cebd37cb047ceb31954ce3c45648c0621bbdb2a0cfc6585775b0b821d40c40821cf19a47e9d74c24086c7c468579f7dbf24fdd30749af2220eafb2b SHA512 635a7e103b90ea8750a495a867a79cc2b70dd729e486e6567d6f4e23f5673bbdccfd9d61239f97438042c92019fc3288d4403314566b61e89b06814c0c3d2441
 EBUILD webmock-3.8.0.ebuild 2064 BLAKE2B 730a5c9538075fb4e442a0f55178d18f49f023e2884f74369ca5864746f5eb0dc7b5385e80a320b778fd5038cdca0c4feb6e63941bf95ec94d2472bd164aa1c2 SHA512 af177454aa8307e00732c030a1bec82890fb90187280c09e3d75c2f66b63939b597537c18d08c3f0ac93c7b233d126a62835e9bd6a8b0c76ebba002c36fe200c
+EBUILD webmock-3.8.1.ebuild 2064 BLAKE2B 730a5c9538075fb4e442a0f55178d18f49f023e2884f74369ca5864746f5eb0dc7b5385e80a320b778fd5038cdca0c4feb6e63941bf95ec94d2472bd164aa1c2 SHA512 af177454aa8307e00732c030a1bec82890fb90187280c09e3d75c2f66b63939b597537c18d08c3f0ac93c7b233d126a62835e9bd6a8b0c76ebba002c36fe200c
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.8.1.ebuild b/dev-ruby/webmock/webmock-3.8.1.ebuild
new file mode 100644
index 000000000000..04f3e54f7934
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.8.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
+HOMEPAGE="https://github.com/bblimke/webmock"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/rspec:3
+	>=dev-ruby/test-unit-3.0.0
+	dev-ruby/rack
+	>=dev-ruby/httpclient-2.8.0
+	|| ( dev-ruby/http:4 dev-ruby/http:3 ) )"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
+
+	# There is now optional support for curb and typhoeus which we don't
+	# have in Gentoo yet. em_http_request is available in Gentoo but its
+	# version is too old. patron's latest version is not compatible.
+	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
+	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
+
+	# Avoid httpclient specs that require network access, most likely
+	# because mocking does not fully work.
+	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
+		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
+		spec/acceptance/httpclient/httpclient_spec.rb
+
+	# Avoid specs that require network access
+	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
+}
+
+each_ruby_test() {
+	${RUBY} -S rake test NO_CONNECTION=true || die
+	${RUBY} -S rspec-3 spec || die
+
+	einfo "Delay to allow the test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/whole_history_rating/Manifest b/dev-ruby/whole_history_rating/Manifest
index 0c312a12a6df..c515c1185bb7 100644
--- a/dev-ruby/whole_history_rating/Manifest
+++ b/dev-ruby/whole_history_rating/Manifest
@@ -1,4 +1,4 @@
 DIST whole_history_rating-0.1.2.gem 9728 BLAKE2B 506354634ab0390b7805e31ee1982309a903000b69a20992cfa53196da8e685b4ea1c89df7ed96ddd4fc5c8a8974d23dc48625d3e93ebbc09121b32e0ab7216e SHA512 4ee9a3340a5bbe1a0250b469c1210663ff226a1884d13729e169d2c04ef57c615bef117a641d6ac3b29b5d72147009149c291e1f7ad8c4c8028ad3e6fb44c56c
 EBUILD whole_history_rating-0.1.2-r1.ebuild 507 BLAKE2B ec1e84d80089fee7b4ce74cc0386fe705366b9e0bde5bf698a09511c3ee70fafdcaa35c1bac614d83cb0c6daed3633f3f9a468ea888dcdd03b7a574adea971b0 SHA512 b26a7c416b99851b6c69e6af72643b46b671763b93f26d8ed58da63bbbff1e8522f8978096ca820cafe0497d16da72f98c6184d63f993cf3f59c4ce0586ea244
-EBUILD whole_history_rating-0.1.2.ebuild 635 BLAKE2B ae6ce4c361672ca9534a3c502f60b429be2a221be9f9f61a4ca5646e7885b5c72cbe0044c52dbe421801d861f9a3736ef9f6d0d851f038445fd4347385019d89 SHA512 d1e37b9531e545038d28b6d1e929eb66de49da5d526347088e4ad74b5f70916da8292c335a9ab154c4a34ed718d37492b353df1c1ef0ebd9e2d6a76356f64a8a
+EBUILD whole_history_rating-0.1.2.ebuild 650 BLAKE2B ee0313f2cebe5158b2f6af2517043ab81dec648e708eb7f9e0a843708d5193067519125653e2d73b9fafc08deb92dbab17e077943319b1e65e5650188b22a39b SHA512 15d777c54380318185bbcf5d06b76c93bf7b78cc0ecd234bcb716708fe5c06f9f98a5a16fb27b966b021912f8954c33ba9acb089b82e695b50bdfd28133138af
 MISC metadata.xml 914 BLAKE2B 68d087fab3e07ad73034704c9c7907ce67a34fe7ed22beb9c4bf0138b22c799aa97becaacc6d331fcff7a8c0a7b496edbffbd8650051a9604fa5e845bedb492c SHA512 adc3664334965a599fbf0b0ee8b8dbadfce12d2c38d0f94acdd924e1feca5ed549458be20aaabef79436f92ae772d2b40e25f559319ba9a632c2a77fc740dfc5
diff --git a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
index a9746bb09ab3..2f926b2efeef 100644
--- a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
+++ b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="A pure ruby implementation of Remi Coulom's Whole-History Rating algorithm"
-HOMEPAGE="https://github.com/goshrine/${PN}"
+HOMEPAGE="https://github.com/goshrine/whole_history_rating"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 4f524700153d..11effffd8286 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/gauche-gtk/Manifest b/dev-scheme/gauche-gtk/Manifest
index 3c9b5e145908..6fa4b82fa48f 100644
--- a/dev-scheme/gauche-gtk/Manifest
+++ b/dev-scheme/gauche-gtk/Manifest
@@ -1,4 +1,3 @@
-AUX gauche-gtk-glgd.patch 509 BLAKE2B c9c0c02edb732b96b81eedc98d757761dc16fd15b48083f981524c115311a1c9347ab72de611abf9e90a0df0702aaf1975bbb249bcc9d4ac163f4985edfe4310 SHA512 48f4b60711d2bf6fc08c757c7238d0f18225d37022b4e0b0511ef370d26abbc1db7ddd2763f3ec22d08b7ff3a2b648ebc8b605cb7532fb0039e76d3121d16833
 DIST Gauche-gtk2-0.6_pre1.tar.gz 205003 BLAKE2B ecc444c246aa20f67a0030d7d87528596d6c2d69beb7ffaef1b53f80963d2fcc1294a04cacf958df6c3331789b6b0260f911126941d6e672a6c57e3aa4807d81 SHA512 5379dafbfabd536e335c30af18f8ddd13e00238e6d99494bbc8e78ee9cf1db872c08b5deee42ac50898dedde39c441d837312d2d6f559a0d2ac2568c31926f70
-EBUILD gauche-gtk-0.6_pre1.ebuild 1418 BLAKE2B f929407d48c44e8b38cf80b5818c5f3c321df84e34187ce20fe4dc0a8ad47393ead7623cabdfb4f903bc64b2f627742adcbd61246d0800301e3507e9d41ff547 SHA512 b28b6dc87b47a7cafb1c9a906e4196c4c18fa69afa95b2186b62c129ffa815148e8171ff5edbfde19c4a6ec36aaa98e51b6413375a6192b98d1ffb08bb2182db
-MISC metadata.xml 471 BLAKE2B 5c17e51d4c199f82572546d44c846f55d6bc0dce86ac8780dd96a188fd447f0d5047f09ad3186eac3cf1adefe3a7332a5072f65144e6a6f244ab8871e11259b8 SHA512 64fa480b1c697341c1c215f5aae1c7875c796e11ed05e08045635996c996183b8d1decbc1a31846ee5374d81f33ce282fb44bcc84489f9fa854a063d7cbb527d
+EBUILD gauche-gtk-0.6_pre1-r1.ebuild 900 BLAKE2B 268f31e5319100d037dff54bad6dc996571abea14d9f712a14a954db7a2197dfccc669b23fb1c7cd2373c38421a0e3015920a846bc635e0c6a153604ec65d736 SHA512 15e0a1835e8ca73edd8067cbbd381c8fa9fedcc5a7698f017b451e3da6578b2ba51f0eeca88be8a8491e09563bf31c1d90ab7c69f4b9f810b9fcbffc83594e99
+MISC metadata.xml 408 BLAKE2B 3fbbb6389d2c9123bf15f9fb307826178b1108a9f8b07c41d3743fcdc8b66b7e25f0d5b7a7393d626377e1585500bdad62332c86770a5f16817a12f4fd7c06d3 SHA512 2aec10a1aa88a330fe7b2ef04bfe60aeacebdc4d63eded2d6293adf3c7c4dad9e66f84154da12e12565a08b587f207f5ef3b15f817d5636e37c4ee82c0cd4abf
diff --git a/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch b/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
deleted file mode 100644
index 36a723fee98d..000000000000
--- a/dev-scheme/gauche-gtk/files/gauche-gtk-glgd.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/glgd/glgdGraph.c
-+++ b/glgd/glgdGraph.c
-@@ -19,11 +19,7 @@
- #define GLGDGRAPH_CAMORBIT              (0)
- #define GLGDGRAPH_NODENAME              (1)
- #define GLGDGRAPH_LINKNAME              (2)
--#ifdef __MINGW32__
- #define _MAXFLT                         (HUGE_VAL)
--#else  /*!__MINGW32__*/
--#define _MAXFLT                         (HUGE)
--#endif /*!__MINGW32__*/
- #define _PANGO_DPI                      (72)
- #define _PANGO_SCALE                    (3)
- #define _TEXW                           (1024)
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
new file mode 100644
index 000000000000..9497ba267f79
--- /dev/null
+++ b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools vcs-snapshot
+
+MY_P="${PN^g}2-${PV}"
+PV_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
+
+DESCRIPTION="GTK2 binding for Gauche"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${PN^g}2/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="examples"
+RESTRICT="test"
+
+RDEPEND="x11-libs/gtk+:2
+	dev-scheme/gauche"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoconf
+}
+
+src_compile() {
+	emake stubs
+	emake
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto examples
+		dodoc examples/*.scm
+		# install gtk-tutorial
+		docinto examples/gtk-tutorial
+		dodoc examples/gtk-tutorial/*
+	fi
+}
diff --git a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild b/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
deleted file mode 100644
index 408f80d26af2..000000000000
--- a/dev-scheme/gauche-gtk/gauche-gtk-0.6_pre1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools vcs-snapshot
-
-MY_P="${PN^g}2-${PV}"
-PV_COMMIT="0220722c44ef85f2e1b9b14745702c1b923258e8"
-
-DESCRIPTION="GTK2 binding for Gauche"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${PN^g}2/archive/${PV_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="examples glgd nls opengl"
-RESTRICT="test"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="x11-libs/gtk+:2
-	dev-scheme/gauche
-	opengl? (
-		x11-libs/gtkglext
-		dev-scheme/gauche-gl
-	)"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-glgd.patch )
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_configure() {
-	local myconf=()
-	if use opengl; then
-		if use glgd; then
-			if use nls; then
-				myconf+=( --enable-glgd-pango )
-			else
-				myconf+=( --enable-glgd )
-			fi
-		else
-			myconf+=( --enable-gtkgl )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake stubs
-	emake
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		docinto examples
-		dodoc examples/*.scm
-		# install gtk-tutorial
-		docinto examples/gtk-tutorial
-		dodoc examples/gtk-tutorial/*
-		if use opengl; then
-			# install gtkglext
-			dodoc -r examples/gtkglext
-			if use glgd; then
-				# install glgd
-				dodoc -r examples/glgd
-			fi
-		fi
-	fi
-}
diff --git a/dev-scheme/gauche-gtk/metadata.xml b/dev-scheme/gauche-gtk/metadata.xml
index 4dd4d4ed3fd8..fe87f96ca80e 100644
--- a/dev-scheme/gauche-gtk/metadata.xml
+++ b/dev-scheme/gauche-gtk/metadata.xml
@@ -8,9 +8,6 @@
 	<longdescription>
 		Gauche extension module to use GTK.
 	</longdescription>
-	<use>
-		<flag name="glgd">Enable GL graph draw</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">shirok/Gauche-gtk2</remote-id>
 	</upstream>
diff --git a/dev-scheme/scm/Manifest b/dev-scheme/scm/Manifest
index 2c44df92cae7..63a3a516b4dd 100644
--- a/dev-scheme/scm/Manifest
+++ b/dev-scheme/scm/Manifest
@@ -2,5 +2,5 @@ AUX scm-5.5.6-multiplefixes.patch 3014 BLAKE2B 08891323ec487c703a04f72043b73edb0
 AUX scm-5.5.6-respect-ldflags.patch 395 BLAKE2B 1fec97642ad348678070df454bbc2c7e64e17907f986a95cf96a3ead621ebe6f22a2f5dbcccc4fe9f7a8b8b951d935bafc5a64ce5cc0b48a514d2cda6ecebfb3 SHA512 03f740acdde590dbdc67046795aa1bed609721cbf83e7c153f5d1d5524c4761e3025c808855bf5b56d44d917c4aefa7198b96d66729e565b277c1acac7c53356
 DIST scm-5e6.zip 912968 BLAKE2B c059b49364abd25bb2335ad11f82791b96ac95aa9529b914396d08592e46e5aa5cba178b791fc96e3ea3066670c48bdd728609463bea398300b81d979fb304cb SHA512 897370f043401a7961eb1c2e22c951e2144505a1670e328e2c3eab33d52da83f195b873fb7cf8486f412ae52316cfc437c9f2da1432ade70f82eb0da12c2f852
 EBUILD scm-5.5.6-r3.ebuild 3762 BLAKE2B 72bf6fea02e74443e8f449c193168c1db95db448f7702ff06b708c58fc0a3573afa47d29b1e46b6358d0ceb3a0879da0c181adf3a71b56442bd26ee40eaa46c8 SHA512 cc7b0a0e2e185a967bc0fb5a771f7344345f0b24fb6bc9df51971e043f0f717b49a93697ab0ab1018da341a42b2e44647b513b6aad91aaa6c77c310b8c6b159d
-EBUILD scm-5.5.6-r4.ebuild 3730 BLAKE2B 14768043556305926bdc25a5c446f8879e7ff51a9c9b2be5c6a1c9e8fadaa5de9c94daedfaa2810b8b1494f2bb771de5746b314f55c72bacc2a7e9544624eaf5 SHA512 d08819bf9939023757edd314dd486ed40c287cb5cceb3a38c8f994a0b97f2ae7373b56e77b6a742230652f768cd85a652147f9983ec9eb61fe424c49f764a7fe
+EBUILD scm-5.5.6-r4.ebuild 3728 BLAKE2B 477020e96640c8edf1e38be70743c855f1d01d980a132dde2db5319bc9d52ed5eed7fd202132fd805fd206612b4c4b2b9102c6874cb10e20e8af99aa28a6782a SHA512 2f6a93686e92757b48116f2198281f4c03ba4ab39ddb8972bbce411ea1f18cb0a189033f978f7a0e5f40318fc1b33380b402d09ab5ed0e0640d3f82a9ac8f2e0
 MISC metadata.xml 1636 BLAKE2B ad72069e26e5a229c33efa845450fe5991d4c6bb14c39ccf22ba1a2d7903b969354a244a09e6684af4f588b2196e12aa60d658a5f842b5b127396a250377b2b0 SHA512 f0936782a77db52a61d47c86f9d638c66ac9848e8b62fcef182b5346abd55e83a5f275b6a60c865551dd134dcb85a77906d4662f91ed505d167608f8901dc0d0
diff --git a/dev-scheme/scm/scm-5.5.6-r4.ebuild b/dev-scheme/scm/scm-5.5.6-r4.ebuild
index 6496a36b4f9e..a977d7d588b4 100644
--- a/dev-scheme/scm/scm-5.5.6-r4.ebuild
+++ b/dev-scheme/scm/scm-5.5.6-r4.ebuild
@@ -161,7 +161,7 @@ regen_catalog() {
 }
 
 pkg_postinst() {
-	[[ -z ${ROOT%/} ]] && regen_catalog
+	[[ -z ${ROOT} ]] && regen_catalog
 }
 
 pkg_config() {
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 28bbcfafcc95..bfbb4dce9e76 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tclpython/Manifest b/dev-tcltk/tclpython/Manifest
index 2c682edd02b2..76c4a3e28399 100644
--- a/dev-tcltk/tclpython/Manifest
+++ b/dev-tcltk/tclpython/Manifest
@@ -2,7 +2,6 @@ AUX tclpython-4.1-python-3.patch 8863 BLAKE2B 6c1c2fa8f29240b6703911fde24519961f
 AUX tclpython-5.0-gentoo.patch 379 BLAKE2B f5f45d701998af7398a074f59bc25cc613b72f2f8825b46d7060fa039e04cfafc649959c451ec31b194ba47dd3f274e6ba20f8a1fd98b8c73392f0f4398257cc SHA512 8e5caec03836fdd8e2c50e49c6142e1349d577d5f73dc673e6bfdeee5b2d50cc20207dd59e75e7639fb780fda217e500104b4332cddca793e6749d047d5246ee
 DIST tclpython-4.1.tar.bz2 10580 BLAKE2B 98d4783cc52bc907c21d50ee393e25ee084b449db7c393c16b0b1f0420469bd0904d16dc2a6806b776dad7dabd521e5f2e8cc942c720d9e69750385302355608 SHA512 5f08e7129a7d9afeb1ac6bf1ab1c83ad3bb481593c9516c0653c7b4ba0dfb1b3129a336e64b998cec8ef2d2377a6a366b73c640d25839ab280d5079c0b220d54
 DIST tclpython-5.0.tar.gz 19327 BLAKE2B bad25a6eb04dbcd9ca3e9bc81d44f098f31f2acf367ecc32307596d5da3ed95752b3c60d9ee74fc04e21669e0361f0790edad3ad5793c78ece4904beacd92900 SHA512 fe15218fe00e921384dbd9611685b86cb6dfacb515a95545079550aeadaaafc3964e6ef0594a268a3fd900f40d178659e8b7f6f2a6d9aa507b59a8be0bd116af
-EBUILD tclpython-4.1-r4.ebuild 1255 BLAKE2B b54520a550d6ce5449b8fcc4124f35d37c0f2f51d0a9d4e23c2ea44342a25ab0834cd51f4c83a7bc99ad9c548fd83335862a625aa835424dd44172ce50b75943 SHA512 0e8f249e76f33f2723aeb87a0b731396b69625fcb81c4c05d27c90dbe41780e0f620a3ba037b94d11a75756681bcd951817cdc49277d79e179d534da7b4ad827
-EBUILD tclpython-4.1-r6.ebuild 1285 BLAKE2B 5d3ff5d40312c67fa7bf9e1542f7608e3882d2c73da2b98a6221c0c8057d58b253e4af2ad2d1b838aad331907369fe8ad2dfa7b11d94b1b438685eac275f76c2 SHA512 2b41c1d759bf29239ca9f7510aa8d7dc5a7b6387a98746972d2a61d0935651bf1ce6f6b89f4b8897d8cd1bcd8f32b00cf4d6a2a29babb6123e5aa4653d25c769
-EBUILD tclpython-5.0.ebuild 1266 BLAKE2B 162fdbd929090b08fd0f66d8186c539187f6270c2b9b2d7090efac2b3dcfe43dd11296533f0b759d3354bd983dd1a6809cb0d167fe0feb2196003669d15d1cf3 SHA512 5859b729031ac8de2c6301e33c2689bcb8b9f22958d0b8a0348d22599f29c502c76c9439f8a69806b9984df00f3021fb45afb78903134715634e5db27d657f81
+EBUILD tclpython-4.1-r6.ebuild 1279 BLAKE2B 684acb03b7a6d3a5684d16494f3a10d23abfd1da164b528c6dccb78c131bc67554809e318b44604eb4dc07697f5f950dd4634ef8a9c5a0df6d3678fdfb0b6a57 SHA512 addcbf2fb4e252dfdc7915f7df82086c1c62d62f27372e8dbd2b6eccf9d9334d5a89f5b3ae0151666d65974729dbe351d18c1908e2309d471508913ae7daa1f2
+EBUILD tclpython-5.0.ebuild 1260 BLAKE2B 34766b4c2feba32e959202ca17f3ba060cdfb962c79767cb1f536a71ed12da55f011c280427ce97e4ede9bccbc572b93725df9006f37e0ed5ae086cc5b91d807 SHA512 a444ee78eb6b83f1c63b28010b529f9d02a5c28d9160630609455832a94ef5a112a53f5457ae9a4737a90fe0d405b6eae50bd99b0421b07a415a46c1004ca6a1
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
deleted file mode 100644
index 3508b6c02a13..000000000000
--- a/dev-tcltk/tclpython/tclpython-4.1-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="Python package for Tcl"
-HOMEPAGE="http://jfontain.free.fr/tclpython.htm"
-SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-lang/tcl:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_compile() {
-	local cfile="tclpython tclthread"
-	for src in ${cfile}; do
-		compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
-		einfo "${compile}"
-		eval "${compile}" || die
-	done
-
-	link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o tclthread.o -lpthread -lutil $(python_get_LIBS) -ltcl"
-	einfo "${link}"
-	eval "${link}" || die
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/tclpython
-	doins tclpython.so.${PV} pkgIndex.tcl
-	fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV}
-	dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so
-
-	dodoc CHANGES INSTALL README
-	dohtml tclpython.htm
-}
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
index 3c865021275b..e6896c3a0158 100644
--- a/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
+++ b/dev-tcltk/tclpython/tclpython-4.1-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils multilib python-single-r1 toolchain-funcs
 
diff --git a/dev-tcltk/tclpython/tclpython-5.0.ebuild b/dev-tcltk/tclpython/tclpython-5.0.ebuild
index 484457e30484..92786421ee10 100644
--- a/dev-tcltk/tclpython/tclpython-5.0.ebuild
+++ b/dev-tcltk/tclpython/tclpython-5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit multilib python-single-r1 toolchain-funcs
 
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index f3ce8387dfa7..a862c028af7f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/crosstex/Manifest b/dev-tex/crosstex/Manifest
index a1f8111c7f85..087ae2f11a3d 100644
--- a/dev-tex/crosstex/Manifest
+++ b/dev-tex/crosstex/Manifest
@@ -1,3 +1,3 @@
 DIST crosstex-0.6.tar.gz 2366411 BLAKE2B 75ecfbb16b67c9cf7e8bce7e62b4fbc7693b57593196987f066d5ede5c7bdfabeb600d081d9e35eaa0ead830cfa5f97810d971583d951913025cccf42e33e1c9 SHA512 88d42ddbe4b229838c0750bbaf6d099349679a66859e8c28e03888d06bbc4641dd815a37e167700f6494a53e950245af864ea260a7779c3fd50e65cd968de08c
-EBUILD crosstex-0.6-r2.ebuild 899 BLAKE2B 9c2de988b5893880bf1f029b677a0937f79d37c8ccf2d248922222351b5028d8287e78faa27dcdd582cefdfa996f25f8f5dd840b227c80ff7a7746339d97ac24 SHA512 72f437759aea7db0e88f118f8d1e57c6d136788d6fbd131b9650c63a9ef64c578c9f1c190d16ea92b2b2ce7883446cc22ed232b75038a6c8064569b5fc654514
+EBUILD crosstex-0.6-r3.ebuild 932 BLAKE2B ff7be60f2d6297516ba1276876ad2fbde2ae52fc3643eb2b2fa3f6ca45b3adebdab2e09d13e5a3adc99255d7d951dd06b23478ee2de3f4115cbb0cd26d83979a SHA512 4f6d4c6b3cbc601dd4799a80a5caeb9ebb27ed124788e91fe2ae84cd6f95741aaf5e310aeab97febc5635c6b0ff66d02ef645de7ba55929d42c131f6ba5be27d
 MISC metadata.xml 327 BLAKE2B b401e5a95533706ef9ec9d59c7601073de96e18d0faf5fa553472b559345055928dd7978a2f513bc1d92c29bfca7bdcb29c316d09f113b6e0cdc2fe95d6b768c SHA512 8426ec7478b97340f66c69fd58c187f1d3d6ac874703a09bf47620c9f57a015519d1ae4ab424a3ea10718c514feb8ad0e6d91b4516d6cf9f06d8b3278e2bb8e7
diff --git a/dev-tex/crosstex/crosstex-0.6-r2.ebuild b/dev-tex/crosstex/crosstex-0.6-r2.ebuild
deleted file mode 100644
index 9e986f7cd802..000000000000
--- a/dev-tex/crosstex/crosstex-0.6-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="CrossTeX - object oriented BibTeX replacement"
-HOMEPAGE="http://www.cs.cornell.edu/people/egs/crosstex/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	# NB: LIBDIR changed from site-packages to avoid installing .xtx
-	# files to top site-packages dir
-	emake \
-		ROOT="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="/lib/crosstex" \
-		install
-
-	python_fix_shebang "${ED%/}/usr/bin"
-	python_optimize "${ED%/}/usr/lib/crosstex"
-
-	dodoc crosstex.pdf
-	if use examples; then
-		docinto examples
-		dodoc -r tests/.
-	fi
-}
diff --git a/dev-tex/crosstex/crosstex-0.6-r3.ebuild b/dev-tex/crosstex/crosstex-0.6-r3.ebuild
new file mode 100644
index 000000000000..ab2375f5c2c6
--- /dev/null
+++ b/dev-tex/crosstex/crosstex-0.6-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="CrossTeX - object oriented BibTeX replacement"
+HOMEPAGE="http://www.cs.cornell.edu/people/egs/crosstex/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/ply[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	# NB: LIBDIR changed from site-packages to avoid installing .xtx
+	# files to top site-packages dir
+	emake \
+		ROOT="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="/lib/crosstex" \
+		install
+
+	python_fix_shebang "${ED%/}/usr/bin"
+	python_optimize "${ED%/}/usr/lib/crosstex"
+
+	dodoc crosstex.pdf
+	if use examples; then
+		docinto examples
+		dodoc -r tests/.
+	fi
+}
diff --git a/dev-tex/pdfannotextractor/Manifest b/dev-tex/pdfannotextractor/Manifest
index b3332d170954..6655eb1d4f36 100644
--- a/dev-tex/pdfannotextractor/Manifest
+++ b/dev-tex/pdfannotextractor/Manifest
@@ -1,3 +1,6 @@
+AUX PDFAnnotExtractor.java.patch 1043 BLAKE2B 7630ce97561e6c92ebb834539cfc93b2247b49249195e738c952b99671ee33331ac2fc2a655af5bfb2469b9015e78cbd1084d9b20097b5cbbf20cf980f81a009 SHA512 d5b727d1fce4e23a7e4054a6bb1644165dfac207f20371cee0e7935f0d750c33e65a650b590fb97a6c7216137df05f7a0cf4cc4a37428535efea82866379a078
+AUX StringVisitor.java.patch 449 BLAKE2B a294525c1ae93bd5349f7321827e294460c41aed37b81ef436fd2d73388e0c2d54e84da998bf1134f205c026252bf2d7a9beba93a5467ede8fe03595e5100023 SHA512 50982eae2e9479f359daae5ae711207a425fe16af1b9e2a9eea321bde791404fc4a2036e98966c628c8a5c561093fba92e1420709949642a69895669097002e5
+AUX javajars.patch 403 BLAKE2B 1895fcc6398bdbdcff5d6828da11a4d9b2baa5b52eae01a2c3297f265432102fa61283031fc71630ab70b7be9c33a88093bde01bd1c154aadd870cf880fe61cb SHA512 c140c8d6c306c04e092a491a09dfe67cee3afd824790c022ed49198b5ce004481c28addd985427cafbebc350ab8a1c03a5bccfd655bb60631ba3c3e63247a600
 DIST pdfannotextractor-0.1l.zip 48496 BLAKE2B f6c5be87c1b083f8a7b6e894e8ffd0f28b910c67661a9a773164c18ca27acafa22252a78e57d8c521abee2a57f3ce55f55067c7a7b54d51760ed0188571d64df SHA512 043a12545889cbdf9309024bcb381a70eef6ac1c1a3214d678b606c97102dde6cfd473fbd8057f9ed7badebd0fc85db0ce0e05f361a71f8b8c3f71e523f8beba
-EBUILD pdfannotextractor-0.1l-r1.ebuild 1011 BLAKE2B 5dc9be4ab07dca32e9cfaea1f1fa07ca346f392c06e6fd16fecb5aed14e8c608d410507b6d743863e33a88c8dd4cb8764c8b8588033dba6ed9260c08ab8f527e SHA512 c3bd3f48aa2ae4421c52c63281ff887035e69d4e39e2ac4a3252d2b14bbe4dfcaeaf4207800280a5ee4bab0e626dce5ef8ebc7c050f706c47f5557d676895a5e
+EBUILD pdfannotextractor-0.1l-r1.ebuild 1173 BLAKE2B 3b9f45d9643e74b0893823a656171423215ae08c9945c0c456a9d37a27275d2ef5341b90efa5d4af17ebd41ca7f1d5d448545552b17f038b14082085fd8d057b SHA512 793b645c2415516c304afe94d0c45b57be592a86d01bd675557da71a4ff44eef681a1e0d76a696f300a5638d3be8572de674023200ef4432f219b1458516b8ad
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
new file mode 100644
index 000000000000..88c8d372e089
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
@@ -0,0 +1,25 @@
+--- PDFAnnotExtractor.java.org	2015-11-26 16:20:12.614852847 +0800
++++ work/source/latex/pax/src/PDFAnnotExtractor.java	2015-11-26 16:21:42.592303074 +0800
+@@ -24,14 +24,14 @@
+ import java.text.*;
+ import java.util.*;
+ 
+-import org.pdfbox.cos.*;
+-import org.pdfbox.pdfparser.*;
+-import org.pdfbox.pdmodel.*;
+-import org.pdfbox.pdmodel.common.*;
+-import org.pdfbox.pdmodel.interactive.action.*;
+-import org.pdfbox.pdmodel.interactive.action.type.*;
+-import org.pdfbox.pdmodel.interactive.annotation.*;
+-import org.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
++import org.apache.pdfbox.cos.*;
++import org.apache.pdfbox.pdfparser.*;
++import org.apache.pdfbox.pdmodel.*;
++import org.apache.pdfbox.pdmodel.common.*;
++import org.apache.pdfbox.pdmodel.interactive.action.*;
++import org.apache.pdfbox.pdmodel.interactive.action.type.*;
++import org.apache.pdfbox.pdmodel.interactive.annotation.*;
++import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
+ 
+ public class PDFAnnotExtractor implements Constants {
+ 
diff --git a/dev-tex/pdfannotextractor/files/StringVisitor.java.patch b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
new file mode 100644
index 000000000000..1b6a9d1d9161
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
@@ -0,0 +1,14 @@
+Index: work/source/latex/pax/src/StringVisitor.java
+--- StringVisitor.java.org	2015-11-26 16:20:35.434967156 +0800
++++ work/source/latex/pax/src/StringVisitor.java	2015-11-26 16:20:56.504072659 +0800
+@@ -22,8 +22,8 @@
+ 
+ import java.io.*;
+ import java.util.*;
+-import org.pdfbox.cos.*;
+-import org.pdfbox.exceptions.*;
++import org.apache.pdfbox.cos.*;
++import org.apache.pdfbox.exceptions.*;
+ 
+ public class StringVisitor implements ICOSVisitor {
+ 
diff --git a/dev-tex/pdfannotextractor/files/javajars.patch b/dev-tex/pdfannotextractor/files/javajars.patch
new file mode 100644
index 000000000000..bc52050e7b06
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/javajars.patch
@@ -0,0 +1,13 @@
+Index: work/scripts/pax/pdfannotextractor.pl
+===================================================================
+--- work.orig/scripts/pax/pdfannotextractor.pl
++++ work/scripts/pax/pdfannotextractor.pl
+@@ -84,6 +84,8 @@ my @jar_pdfbox = qw[
+     PDFBox-0.7.2.jar
+ ];
+ my @dir_jar = qw[
++    /usr/share/pdfannotextractor/lib
++    /usr/share/pdfbox/lib
+     /usr/share/java
+     /usr/local/share/java
+ ];
diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
index 1b6371bf6dbe..5ae9bb84c9eb 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
@@ -36,6 +36,12 @@ EANT_GENTOO_CLASSPATH="
 	pdfbox-1.8
 	fontbox-1.7
 "
+src_prepare() {
+	eapply "${FILESDIR}"/javajars.patch
+	eapply "${FILESDIR}"/StringVisitor.java.patch
+	eapply "${FILESDIR}"/PDFAnnotExtractor.java.patch
+	default
+}
 
 src_compile() {
 	cd "${S}/source/latex/pax" || die
diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index 6ad5cb1df153..04e84c4b432f 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -1,3 +1,5 @@
 DIST rubber-1.4.tar.gz 109357 BLAKE2B e624674fdadae52890d5599450b741db39c3ddf2ca382a2e87941a87db346cfa33e96e2fb468f052d3f94b7b2086628e675971203a9a4181385c059196fc3df0 SHA512 8b4a9f689702505e19543e5295375c14ae93fb9d6b89d1234fda093d4161551bd58c2485b53678f141d52a140002df08856cfa059f6287721402b74b0ef666f7
+DIST rubber-1.5.1.tar.gz 111812 BLAKE2B 4d08527689d669e3ac8dd6e9050fc09766bfb46c53d9923ce10efc0aaf8a62a962cb2f1c27a0e7a19a9be96710edba923d93589d816aa22305eec33fd08aa08c SHA512 ba22eeddc24b4f9abf0bf087604a4261add648877ec558b766555de09538cd20c21c8cfd9731c1421540bb2479501dd6ed066346d250c6bc981529e31efacc40
 EBUILD rubber-1.4.ebuild 592 BLAKE2B a9a9de9ce465280cedb04efc859ce865c9bf106181a39a4ebcf48d23495eabf313f4bb75e167727da7378ac12086df091e51fca2a57c203f639a1a04ee9e663d SHA512 41a41cb3f4e1286b6659a1c3182d20230097d633c3ce1ea07487a3e2f5b3d678a83024c01dd57ec97d49128198a103c3f893304962575219a07dd9ea72522e6b
+EBUILD rubber-1.5.1.ebuild 653 BLAKE2B 048ca0d9f4b30118f4712e19beeb3ee4c7b70883e14d1daab880a719f793b08c9993e420fd39c14de9c62f4bf39967689de74c4b30bb48b6bf47bfacc10bd300 SHA512 5c5b9a293df49d8d121172bd73b19d5b9cd7ab113873cbff1c29fc420c788479956fa6c67abc56a873e3d71c5fce9366cb36b35842fc4890659766ccc0950115
 MISC metadata.xml 323 BLAKE2B 46540c17674230be613731fbca57ec01370930462c33976af5d00763468eaa70705959ab5d45312430cab731d33ca04f6d8f74788a94c5de7a7bdd9a977f860b SHA512 038fa245ced154fbe7876039c19b87f414d06db21c9b9114274c2ced4221217ffa52e4cafdde1283c00155a3d4249cd7cddbfbdf24122aa67c1ca0f330f9d517
diff --git a/dev-tex/rubber/rubber-1.5.1.ebuild b/dev-tex/rubber/rubber-1.5.1.ebuild
new file mode 100644
index 000000000000..dd7a18c0aa7b
--- /dev/null
+++ b/dev-tex/rubber/rubber-1.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A LaTeX wrapper for automatically building documents"
+HOMEPAGE="https://launchpad.net/rubber/"
+SRC_URI="https://launchpad.net/rubber/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/latex-base"
+BDEPEND="${RDEPEND}
+	virtual/texi2dvi"
+
+python_install() {
+	distutils-r1_python_install \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--infodir="${EPREFIX}"/usr/share/info \
+		--mandir="${EPREFIX}"/usr/share/man
+}
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index e7d8f61f4440..87f00d4df262 100644
--- a/dev-texlive/Manifest.gz
+++ b/dev-texlive/Manifest.gz
diff --git a/dev-texlive/texlive-metapost/Manifest b/dev-texlive/texlive-metapost/Manifest
index aedffb15e47b..478eca651a53 100644
--- a/dev-texlive/texlive-metapost/Manifest
+++ b/dev-texlive/texlive-metapost/Manifest
@@ -96,5 +96,5 @@ DIST texlive-module-textpath-2019.tar.xz 4328 BLAKE2B 01e843dcc2c950564b5327b572
 DIST texlive-module-textpath.doc-2019.tar.xz 237628 BLAKE2B b576a1b5a8e64c439c768dcf696332403c6ed82d629b70397f55cb3531d61b03a0faf8375b637d7164c4c267d8b851f666d0e4999e205ca3e882c82ee64f260b SHA512 5507082be0235ec2253ddc0b03e239607b9d140952799684e5193e4d3d584846d33a59aa9b1630d058f17cacf7cedd2fe0a180b40207ea8f10947b534784fc02
 DIST texlive-module-threeddice-2019.tar.xz 2212 BLAKE2B 9c71fc87f54336849981ad347015810d86f89aaca438246c99e9d2fe72b65236ee9f13b6dfd38bc0d0dd5e7cb49662baca0dd209f6b803a6658a8ee808893690 SHA512 66e6a27aa277b45b44c156d408c764da5bee6dc540f2058a783f02bbe806c95052267a5ed79ea49b5dc356d0f03747e9b186542640b34753a693ecffa158a6a4
 DIST texlive-module-threeddice.doc-2019.tar.xz 119008 BLAKE2B ba4ff5556dbf6d86660882ec889e3fa22dee32c41c6b93e479d1962822ce073d84d30111bd8b85c682f757d2ce571378bcb2c94ba9af6b341d4692fcd7e114de SHA512 c750497229b8bd41eca05b221ed2ca2ca49db8cbbff03bfce2712869d352ae0385e4c10e9730e0b2f8286db9af1e1b87f10d599788a3dfe8d41c28efb8b0e4a6
-EBUILD texlive-metapost-2019.ebuild 2278 BLAKE2B 19af7d69ebd9cab3b5a13b2bf04346f9bbd90b43ebce28d5055ca3259476caef2b74b06a95df30fbc447b4d3ec86fa5bbca289a76ace21058381b7d345a85b5a SHA512 b4140ea9f158604f0a5828e76ffe8c928bce2786a8a8b25be557745420c114bec0b5b43c57b28e6ba86fd401868816c10686456564e8a3e20ff95dd85d43de4d
+EBUILD texlive-metapost-2019.ebuild 2272 BLAKE2B 4c8cb4900fffff1bc3e8f05fe5e41101c23b467d2e4517829a38f47957a582736767d9d76ae481892b49e5ac9c25bd7c2f36042ac2080d9d074f3f09ea8ccd55 SHA512 4c7681e825d8eae7b7b30ac0143a0b85111d4c4182df38bd7f99ec088e5488a852bd8c3c2564e08425e1f1654edf0e8ffcdb58b075e3ed3ab89cc2b134a5f859
 MISC metadata.xml 359 BLAKE2B 8b3bf3704460503fb9f60ef92d86e7631912398637de4ce55933ad5edf272acf8401bd49f9f47c176c6580ea58e58f93532bac040e583f45674c8eca39664a1d SHA512 f6decb141c5a9c40ead9e20dce2c1d9c030c1c03d69ec36ea41dc791b51c97153647d8d3680a0a87592da09e7a369bb9f2ec5c80796022d029fee6a1b9924e2c
diff --git a/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild b/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
index 8e55519b92fa..92ad828684fd 100644
--- a/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
+++ b/dev-texlive/texlive-metapost/texlive-metapost-2019.ebuild
@@ -24,8 +24,8 @@ RDEPEND="${DEPEND} "
 # created and cause collisions.
 
 pkg_setup() {
-	if [ -f "${ROOT%/}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem" ]; then
-		einfo "Removing ${ROOT%/}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem"
-		rm -f "${ROOT%/}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem"
+	if [ -f "${ROOT}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem" ]; then
+		einfo "Removing ${ROOT}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem"
+		rm -f "${ROOT}${EPREFIX}/var/lib/texmf/web2c/metapost/mplib-luatex.mem"
 	fi
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a3058b086cd5..e4d36881a018 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 080a3bc00be2..b9fd9f7d609f 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -3,7 +3,7 @@ DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B 6bff44f3d4dd
 DIST android-studio-ide-191.5791312-linux.tar.gz 765055716 BLAKE2B f0259adce0d3589a1c54ad16c1f745a10f4291ceb3554c9e6bb7433e6d57cb1fe6e1647df880b381172949a95cc908010977b87e3c34a868ccd00edfb3b7ba7c SHA512 39bc345e57fba7b49074f412db71bf1ecccc62cb2b23189149b8b1a72cbc159c285969708c8859def2d4a589cf8241b9a9cef2d93d72cf410554e469e66c20a6
 DIST android-studio-ide-191.5900203-linux.tar.gz 774544330 BLAKE2B f1bf4e808a731336c35d2a264fb7608e2129aab31eb9afe0f6e898603dbc5aac13e3c30335ed7c4567b5d3860299ed5ed4d25ba919eebf3f847955fdd49fced4 SHA512 5b736002e3a5dc0c6ff8897f05d20132444304bbd96ec4f14acf93dee8389e67f2bd037ae6d3df9770254a744f364d04f6324dcc17d49bf07006049c80572afa
 DIST android-studio-ide-191.6010548-linux.tar.gz 774544822 BLAKE2B eeeed14c8749015f7a0c9235552c04195f81a30a727adfc48d56d2b39ead6d8b017600be801e19fd8eae25ffd2ccbd081b59d464d7ae6bbf14c0a42dd508087d SHA512 95e7befa684b02c5261244a0568f2180a3fd5cee2abe47309f4d183aae1c97b47c08af3cd228462f7db10f3bdb40c591472e74ffb9d89f08301fc25a04f41507
-EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3826 BLAKE2B 9021769173d13b280d186ae0508f100b219f5203b6e384bb9499ae6c64303945626ac84c6666ffec73c98173b47bdf89fab376684d6001176a92776bfeac3499 SHA512 39484240e0708a5ea4a1c5f9e0309a0dd42916ad4c7f41a53095131342d17bb7d4de97595aadbea37fcd80ef26b1578bb61de254d2a90e2f031003c6915489d3
+EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3824 BLAKE2B c4b70d4c5986b26f5e64649c217865711f4b6a808ea3477a53cd4024a9905b3bc5d3876c53c1f477d481494ba21a25df3f8d93ac2e6cf0aac928f80a37a560e5 SHA512 35cfb74690f16d2fb1cc1d915338c53014a895304570ad094cd24a1a30674c43221e7780d9be519bff92668778cc7ca514aec8203d5e016642c9b4f485cfa238
 EBUILD android-studio-3.5.0.21.191.5791312.ebuild 3656 BLAKE2B d4ebdfb3462e9d86fc72041cecb82e9e78e181886e0c15b8b75fcfe28c3f0d47002a181812e00db3ce8a2af16fe4d989a043c58c9ed0f2399446927f72424ccc SHA512 f5be1e707d7c51734457c61dfa111f92310e24dd810032d890c7ae1735b67d41ae0b95f546b28d957931b0c0adc2b72e1808e0912ab7f393fa3119d9ae93afc6
 EBUILD android-studio-3.5.1.0.191.5900203.ebuild 3658 BLAKE2B 6aae0b97fefc7fb4ab69e2f2630c6dbf27f054f7a986c001b934e657768f51be4b29664a108b4ff2101ff001eeec7ea65be9df7bfafa8a8d36ca4c93f5ec7b02 SHA512 5a427c9d5cebf3ea2e3b2a767265d8ccb3e22717648243ab3805c884ca79709c6644b9633bbe056169f1c1802be5fa67713af188d6984962de82d7db59fc2477
 EBUILD android-studio-3.5.3.0.191.6010548.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
diff --git a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
index 68d72ad521ee..3ad68189df84 100644
--- a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
@@ -123,7 +123,7 @@ src_install() {
 		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
 		fperms 755 ${dir}/jre/jre/lib/jexec
 	fi
-	chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die
+	chmod 755 "${ED}${dir}"/gradle/gradle-*/bin/gradle || die
 
 	newicon "bin/studio.png" "${PN}.png"
 	make_wrapper ${PN} ${dir}/bin/studio.sh
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index f45104466a0d..94246aed0957 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -4,6 +4,10 @@ AUX apitrace-8.0-docs-install.patch 1452 BLAKE2B e8fe92e29614dcf416221c61cab5989
 AUX apitrace-8.0-glxtrace-only.patch 1591 BLAKE2B 45dae3a9bfdea147fd865124db7865bd389e15f7feec491f1ae520077e06134b9305351295975449dceea13aa65fee11db1a245eec73666b63c8874e72043cd3 SHA512 eea930563f125df25ff0912bcddb925fd3724fa17c1d3f1a9a5648b1f44351d3f79cf44d5e7f59ca8282a0dffb62afba583059721f9e5545707294ea62fa90c4
 AUX apitrace-8.0-system-snappy1.patch 846 BLAKE2B 5c5ba05af785556dcd0a7508698693cf73a283a2a476df89b0e0072841de0ed301aaf5d991353f294511aae29c38bc039c1b6b9b23d3d8f61377bbda05843fc6 SHA512 334f607959f6b4d6b0798e6ba6a1e252d6f8fda4560d0ca44be38da803ce545ea15ce951c40604464d283cebb99b16b606dd0403aaa7c9538380f871b3ec87e7
 AUX apitrace-8.0-system-snappy2.patch 1319 BLAKE2B 4c02a87fde35c004177f1fe9df074e3fa01fbcc7dcf6ab9b497cb69259243f9bfb8b76fd2c78194d624ebaf2fbfbb871155a031d6a58e6dc1b9c426c116a590d SHA512 67e7b3bd69023db8341c74fe30d0f846f6b751cc972681062d491414d31dc65c3869e0387b436436394aaf11e0d001652970daa895b6740f94de9bc4544ef0e7
+AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33dfcd39fd36356691722f593f7ce0fa615279c0e440077b3e29c5a643bf5be8a2406a656bfa91fb9f128c2afa922b3ad832a35 SHA512 0690f8d178fd7a5ca11b26d1e23c9c26e984214cef2e3619a22fc6cf58a7ee96fe0b046dd038c202cd6f60b9175dbdd346813c53ca85932f9a4d9dd40e9bdba1
+AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278
 DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
+DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
 EBUILD apitrace-8.0.ebuild 2560 BLAKE2B 12e58a8f3f6deaa1bad68cded26747eee0103369190acbcdbfe1e8f5226755a853936936855a7b6f25f3bc88b8bdb0b052cde4c03feabe7a6151daa3ba3dbb4c SHA512 a8a38b0ad728a7007932f4f3f79bd35cfa2311387376cb3a3231ac71a4879a41cd29cc200c0a3019066e9a1e20ddca16a76e636d56b88e2587fb3026651bdef0
+EBUILD apitrace-9.0.ebuild 2168 BLAKE2B 7e72e7306c94d2f81306fec1ba34f364507a583f6729bf3d445a0e0177045a5adefcf4282803708ec1cf06d253b65232b09046391c83a152f3212b0b8e7c8e1a SHA512 4a60edf54c6d6d1749d3c3a0c60ecc90045e4a1da3918b6eb0563afc7dea3c28d6d72e5101211042dfbbdf1edf986e75e0e1cac7ba8b932a944f74651fb16f43
 MISC metadata.xml 438 BLAKE2B f88a54537c6bd0c1f9965ec8d520928cea727ba4f8424b49993c4e310078676d9394ddaa64c3c0fb9e0f1bf9eca36142260148945f455e0700dbc362dce73fd6 SHA512 45a818f2bbbfd046e403940734323c027929de373f8366a7de29e4342fe3f98ea27ba2c151f80dbbd33d1110acf2f363669c3c4176d2c15d8b5a783182128cd5
diff --git a/dev-util/apitrace/apitrace-9.0.ebuild b/dev-util/apitrace/apitrace-9.0.ebuild
new file mode 100644
index 000000000000..8c100383021a
--- /dev/null
+++ b/dev-util/apitrace/apitrace-9.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-single-r1
+
+DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
+HOMEPAGE="https://github.com/apitrace/apitrace"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-arch/brotli:=[${MULTILIB_USEDEP}]
+	>=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/mesa[egl,gles1,gles2,X(+),${MULTILIB_USEDEP}]
+	>=media-libs/waffle-1.6.0-r1[egl,${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	sys-process/procps:=[${MULTILIB_USEDEP}]
+	x11-libs/libX11
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5[-gles2]
+	)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# TODO: upstream
+	"${FILESDIR}"/${P}-disable-multiarch.patch
+	"${FILESDIR}"/${P}-brotli-unbundle.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# The apitrace code grubs around in the internal zlib structures.
+	# We have to extract this header and clean it up to keep that working.
+	# Do not be surprised if a zlib upgrade breaks things ...
+	rm -rf thirdparty/{brotli,snappy,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
+}
+
+src_configure() {
+	my_configure() {
+		local mycmakeargs=(
+			-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+			-DENABLE_EGL=ON
+			-DENABLE_CLI=ON
+			-DENABLE_GUI=$(multilib_native_usex qt5)
+			-DENABLE_STATIC_SNAPPY=OFF
+			-DENABLE_WAFFLE=ON
+		)
+		cmake_src_configure
+	}
+
+	multilib_foreach_abi my_configure
+}
+
+src_install() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/apitrace$(get_exeext)
+		/usr/bin/eglretrace$(get_exeext)
+		/usr/bin/glretrace$(get_exeext)
+	)
+
+	cmake-multilib_src_install
+
+	make_libgl_symlinks() {
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+	}
+	multilib_foreach_abi make_libgl_symlinks
+}
diff --git a/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch
new file mode 100644
index 000000000000..5715edaec3f0
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-brotli-unbundle.patch
@@ -0,0 +1,158 @@
+From 3a07d551949ff488d1d669600a07d9c73ff4cc55 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 29 Apr 2019 21:08:02 +0200
+Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from
+ Igalia S.L.
+
+MIT License, which fits well.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++
+ cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 70 insertions(+)
+ create mode 100644 cmake/FindBrotliDec.cmake
+ create mode 100644 cmake/FindBrotliEnc.cmake
+
+diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
+new file mode 100644
+index 00000000..abb06f44
+--- /dev/null
++++ b/cmake/FindBrotliDec.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliDec. Once done, this will define
++#
++#  BROTLIDEC_FOUND - system has BrotliDec.
++#  BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
++#  BROTLIDEC_LIBRARIES - link these to use BrotliDec.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIDEC libbrotlidec)
++
++find_path(BROTLIDEC_INCLUDE_DIRS
++    NAMES brotli/decode.h
++    HINTS ${PC_BROTLIDEC_INCLUDEDIR}
++)
++
++find_library(BROTLIDEC_LIBRARIES
++    NAMES brotlidec
++    HINTS ${PC_BROTLIDEC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliDec
++    REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
++    FOUND_VAR BROTLIDEC_FOUND
++    VERSION_VAR PC_BROTLIDEC_VERSION)
++
++mark_as_advanced(
++    BROTLIDEC_INCLUDE_DIRS
++    BROTLIDEC_LIBRARIES
++)
+diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
+new file mode 100644
+index 00000000..4be347db
+--- /dev/null
++++ b/cmake/FindBrotliEnc.cmake
+@@ -0,0 +1,35 @@
++# Copyright 2017 Igalia S.L. All Rights Reserved.
++#
++# Distributed under MIT license.
++# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
++
++# Try to find BrotliEnc. Once done, this will define
++#
++#  BROTLIENC_FOUND - system has BrotliEnc.
++#  BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories
++#  BROTLIENC_LIBRARIES - link these to use BrotliEnc.
++
++find_package(PkgConfig)
++
++pkg_check_modules(PC_BROTLIENC libbrotlienc)
++
++find_path(BROTLIENC_INCLUDE_DIRS
++    NAMES brotli/encode.h
++    HINTS ${PC_BROTLIENC_INCLUDEDIR}
++)
++
++find_library(BROTLIENC_LIBRARIES
++    NAMES brotlienc
++    HINTS ${PC_BROTLIENC_LIBDIR}
++)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(BrotliEnc
++    REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES
++    FOUND_VAR BROTLIENC_FOUND
++    VERSION_VAR PC_BROTLIENC_VERSION)
++
++mark_as_advanced(
++    BROTLIENC_INCLUDE_DIRS
++    BROTLIENC_LIBRARIES
++)
+-- 
+2.24.1
+
+From 08a410f238aaf6488759e023b66d16cbbd7f6d66 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 29 Apr 2019 21:11:57 +0200
+Subject: [PATCH 2/2] Find system brotli instead of bundled
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt           | 5 +++--
+ cli/CMakeLists.txt       | 2 +-
+ lib/trace/CMakeLists.txt | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c71d24e6..88e6b156 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -491,8 +491,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND)
+ endif ()
+ include_directories (${SNAPPY_INCLUDE_DIRS})
+ 
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include)
+-add_subdirectory (thirdparty/brotli)
++find_package(BrotliDec REQUIRED)
++find_package(BrotliEnc REQUIRED)
++include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS})
+ 
+ if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
+     # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete
+diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
+index 3a3c127e..0b33ddb5 100644
+--- a/cli/CMakeLists.txt
++++ b/cli/CMakeLists.txt
+@@ -39,7 +39,7 @@ add_executable (apitrace
+ 
+ target_link_libraries (apitrace
+     common
+-    brotli_dec brotli_enc brotli_common
++    ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+     ${ZLIB_LIBRARIES}
+     ${SNAPPY_LIBRARIES}
+     ${GETOPT_LIBRARIES}
+diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
+index c68bd00f..ce2e469e 100644
+--- a/lib/trace/CMakeLists.txt
++++ b/lib/trace/CMakeLists.txt
+@@ -31,7 +31,7 @@ target_link_libraries (common
+     guids
+     highlight
+     os
+-    brotli_dec brotli_common
++    ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
+ )
+ 
+ add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
+-- 
+2.24.1
+
diff --git a/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch
new file mode 100644
index 000000000000..37085b1ae299
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-9.0-disable-multiarch.patch
@@ -0,0 +1,53 @@
+From 556397e399994b005524b88171c9c103b8cc1b25 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 29 Apr 2019 20:32:04 +0200
+Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
+
+Respect the libdir cmake already set up for us instead of using
+debian-specific multiarch paths.
+
+Patch was rebased multiple times from 4.0 to 9.0 now.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 17 ++---------------
+ 1 file changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19316e60..6c3c4b85 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -438,15 +438,6 @@ endif ()
+ ##############################################################################
+ # Installation directories
+ 
+-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-    # Debian multiarch support
+-    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+-        OUTPUT_VARIABLE ARCH_SUBDIR
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-    )
+-endif()
+-
+ if (WIN32 OR APPLE)
+     # On Windows/MacOSX, applications are usually installed on a directory of
+     # their own
+@@ -455,12 +446,8 @@ if (WIN32 OR APPLE)
+     set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+     set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+-    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+-    if (ARCH_SUBDIR)
+-        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+-    else ()
+-        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+-    endif ()
++    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
++    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+ endif ()
+ 
+ # Allow customization of the doc installation dir (Slackware uses different
+-- 
+2.24.1
+
diff --git a/dev-util/autodia/Manifest b/dev-util/autodia/Manifest
index ff0060146e64..b1980e0b895e 100644
--- a/dev-util/autodia/Manifest
+++ b/dev-util/autodia/Manifest
@@ -1,4 +1,4 @@
 DIST Autodia-2.14-dbi.patch.gz 343 BLAKE2B fab5420ce032c87ac874ec345289d9d75f5d10d99eb483e8b2f9258dc9ae3b2a6e609098d600dc0dba5fcb4a8f6279bb2e1e51843fcbf98d7203595f581c9cc8 SHA512 2a7c1b4bacfaab3d0c0c16c12362be0a16161db0465ad1b5c4cc955296fd611824aa87b49e7c3672435d10004a383125e2edd3aff640fada2e1694cc02a8abd5
 DIST Autodia-2.14.tar.gz 78070 BLAKE2B cd7d68dd618599b46f59d9304a7c515f6c357a756c9ecaed50e7dfb7e404d4c9810ab5065310d549d5d8c2aede5c7156371c7e4855f73e5ab3893856f39fbd89 SHA512 41cd0d9dd8fc66d70aaf987a8a62ed8b916e9a38263c61cc1cb7994e7bfb24843bbd3440bbdad054fccbf0fbbdaa11ec3a35db2a6f926bc87ba65a5f4ac160ee
-EBUILD autodia-2.140.0-r2.ebuild 729 BLAKE2B 0ff6f548956e35946c2d2deedc37b22930d24a2e71d131692d4d3f331dede168f7db769ac1e14ae1c48168639c02f87b1c40b2595746d28ae9194c91c1112f52 SHA512 f78a9c76239cd50e3deff4e371ce9fdedc33539a5be2839e7c89a27dca5a9d0cf3333a7a215fcf998863c5d7531afa061f4b73248b2161a6ea0d2b5bee268795
+EBUILD autodia-2.140.0-r2.ebuild 754 BLAKE2B fb703dfe70a5cc1ba9165ed4f8528fba3ec50f922637dd75831b8cfddd700e452ba19978e6e70f41db81a66edf6861076b644cafee8c690aea47675f0dc36bde SHA512 af4a4fbc4f5b44cc5d95a63546c467a386042e677385e18ccf54b025478b6fa29f43dcf7676cff9cfd2233849fbdd7da3bc1ee3fa77145824e43a165bae35fa2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/autodia/autodia-2.140.0-r2.ebuild b/dev-util/autodia/autodia-2.140.0-r2.ebuild
index 4e8cb2652bf7..74fb18c1b9f1 100644
--- a/dev-util/autodia/autodia-2.140.0-r2.ebuild
+++ b/dev-util/autodia/autodia-2.140.0-r2.ebuild
@@ -9,7 +9,7 @@ DIST_AUTHOR=TEEJAY
 inherit perl-module
 
 DESCRIPTION="Parses source code, XML or data and produces an XML document in Dia format"
-HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ ${HOMEPAGE}"
+HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ https://metacpan.org/release/Autodia"
 SRC_URI+=" mirror://gentoo/${DIST_NAME}-2.14-dbi.patch.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 1a4fb849535f..3872722426ce 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -10,10 +10,10 @@ DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786
 DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad
 DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
-EBUILD bcc-0.10.0.ebuild 1871 BLAKE2B 38d9e1c40bc869de93b07357aa6febb229c69b85fe7b82c466d174980628bfe4e906769351c8c7d8e54c46cf3e16820579160a184e6c92af309b6f2d30a38240 SHA512 720ea74d30e8dd6a52bc99dca8cca84efba470b52aa00817c0bb96e2c5f4a7e7e258f4c4f96fa9bd654c7617eef963b351d1d61d6551339dcd0035d68ff1eddb
-EBUILD bcc-0.11.0.ebuild 1872 BLAKE2B 20fad90ab3b0e83e1ecf67677a9e975555d7b818aff4a743c9d3736799652c687382616c82b28b09f166587225f88418b750af2bf9909a0918b9d44ae825f133 SHA512 076410f72d5bf6fb89b19ab44abbc0fad10fb29168654623e62bf6c251570de8013f337f7bf6beac76c20a066713ba257c55c8be220d1fc865dd1ea839e7be21
-EBUILD bcc-0.12.0-r1.ebuild 1896 BLAKE2B 0221b49e85aa5f3a2075c9044e3e659b6696ac118d92f27d88d86cd9b6f5b6fd104be07e95421aa04b66c32a778c8432585f923a919c4f4419995479ea6ff75e SHA512 076fed242a48258fef117f37ec146de95bd3887d4339710208d470cca16fbd888e1c917d151e204e0e463e0035659447dab4e1bfc5a7ac33a065f254bb610ab9
-EBUILD bcc-0.6.0.ebuild 1112 BLAKE2B 0f0e9f7f2e08d1ab90c211d98ff94c2005f7f8cb0fa388baec122112f18eb469c9665dd5ba94a0ee891c5dc809a555dd811da7e08efde43a7a0ec4ac3c8674bb SHA512 d599bba3b4f83c503618b0c4e742726ef8c6c0bc126083c2b280b4e032d99a99929f69430a8fead778d3478e00638c596d77e5d09a057e5d92b23157f2c2487d
-EBUILD bcc-0.7.0.ebuild 1116 BLAKE2B 0642d96320fa9caf1b7fdf3261604bf016589e8c9a787dfc8ec6e580296371e2a9d3abe149646542dfc6bec9372b4b1a88a67830f686f722ab46c71969252998 SHA512 ca89d6434fda07221aaa1d7ed8a0ef5b2f42677237b902b64d17d0ddba3d0b3061418be21f592274fa09138b5d7613faf0753cc37c1bf5d46a8d0dfc6eb58114
-EBUILD bcc-0.9.0-r1.ebuild 1659 BLAKE2B bb372d878fb09d2a97cd25462d618989effd99d20299cbe17a87770633018ef62225fa1c64a6d6099c9e7d90866cf3c9766191e8043ac1393d718ab8abbcab85 SHA512 60815c8cf376dda81f4cd6532de08a5780af2b2bdd6d6bd5efe63c0206c2bf02e894fc14906421cf9647c3bd38fe92e37acb15a5f0345f72e3a155a11981fea3
+EBUILD bcc-0.10.0.ebuild 1861 BLAKE2B d5c52a182d41f70391075cd4cfeba883a51eed88307c945d97d9a76f65071a6f2c87b740078d3c2d4951169a668e874bc3d646c0bc5ee4496f188ca450fb7b4c SHA512 1f23b33e218355be4ae7ec60188b5eeb2a58525366857c0c963361aae7df8e0c852bde497d36a80cafc15aeebb3b38513e5c0c9f2e1b649660a0b2438fe2c459
+EBUILD bcc-0.11.0.ebuild 1862 BLAKE2B ed50015774cd375e2bbbf7a5be10ddc53c7864314fbb839027952860e25fafd5bcace7a42936ee316db1e18c13082be994a9b1084d94468f8293b1b780dcb978 SHA512 9701b5a605c19d4fe78ccb68477be41aac1b9fbc9990932e25d28b8e074cc528746893dc7fd70d919366d3b94e83d2b45cf806da94e793b683d07f8611b4d09c
+EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0213be90ee17ecba036b76798529de61b159dd7af7ce56000e071d44923f2707d366383c5f6ed228fb78b10858 SHA512 492110b8a4dd64c30bf8d8f5af5dce183976ee31d3ee5652efe61e7734c779b8a08d9334fdb2c4c0aa4a90df71a5a1d5374677eb9c9566ce534ee760b135caf5
+EBUILD bcc-0.6.0.ebuild 1102 BLAKE2B ee02e6f71606fdfa2962131343765fa357acc978b1db1c4e71e6b8581ea82779e96162cb35b9a926211aff82bd8e47cb9373b61fc73a6cad6303ac1df8f1b457 SHA512 3f777187c426d54c75bde97df690f1ff413acdd71a583a2850fd574c164797a4a78c667635c4e21f59812173cd356c1d44926923c44a72aafbec257982f0fdbc
+EBUILD bcc-0.7.0.ebuild 1106 BLAKE2B 7cb7cb973c6562016373d1960494053b9342e888452a8d96ce5b4aeeedba4e95930d72ab30032640898d05d3c4cc0af9b71d45f5c4b2eb6b426dc300797855b1 SHA512 6e94fbe2bde86853c77de2554aaa1ec2160d67f55a932e4b315acb5cffe7209fe29e079281e813c57869fe409b69e670c15f77afc8400b7c1c4e594da42062e9
+EBUILD bcc-0.9.0-r1.ebuild 1649 BLAKE2B b7dfd851c235f41eaae3457e6e795769075a28ec73fc396e4cce893a2215572bde94410f578427eb79d02442eefb231c59c2f646bc8f0b486a76a5d281ffb355 SHA512 47707d7d2a60562966105c78c7859f1753cf2cb7528c228d4f15ef1f308f8ed1d58cdffea81718fa5df43433d7aa9339631bf42304378b816b46739374b8cdf9
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.10.0.ebuild b/dev-util/bcc/bcc-0.10.0.ebuild
index 7a4272292b00..08138b6375b2 100644
--- a/dev-util/bcc/bcc-0.10.0.ebuild
+++ b/dev-util/bcc/bcc-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils linux-info python-single-r1
 
diff --git a/dev-util/bcc/bcc-0.11.0.ebuild b/dev-util/bcc/bcc-0.11.0.ebuild
index 4fbad99072a8..06720965ca28 100644
--- a/dev-util/bcc/bcc-0.11.0.ebuild
+++ b/dev-util/bcc/bcc-0.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils linux-info python-single-r1
 
diff --git a/dev-util/bcc/bcc-0.12.0-r1.ebuild b/dev-util/bcc/bcc-0.12.0-r1.ebuild
index e200ac3187a1..f14150fc76e6 100644
--- a/dev-util/bcc/bcc-0.12.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.12.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils linux-info python-single-r1
 
diff --git a/dev-util/bcc/bcc-0.6.0.ebuild b/dev-util/bcc/bcc-0.6.0.ebuild
index 852d5503582d..deff44f3e73d 100644
--- a/dev-util/bcc/bcc-0.6.0.ebuild
+++ b/dev-util/bcc/bcc-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils linux-info python-single-r1
 
diff --git a/dev-util/bcc/bcc-0.7.0.ebuild b/dev-util/bcc/bcc-0.7.0.ebuild
index cfcacc44e696..718f0921ce94 100644
--- a/dev-util/bcc/bcc-0.7.0.ebuild
+++ b/dev-util/bcc/bcc-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils linux-info python-single-r1
 
diff --git a/dev-util/bcc/bcc-0.9.0-r1.ebuild b/dev-util/bcc/bcc-0.9.0-r1.ebuild
index 21fd0809c8fd..86203a8d50dc 100644
--- a/dev-util/bcc/bcc-0.9.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils linux-info python-single-r1
 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 513a7faed487..b0a444b9d162 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -5,8 +5,6 @@ AUX boost-build-1.71.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4
 AUX boost-build-1.71.0-no-implicit-march-flags.patch 15700 BLAKE2B dc73dcbd5320db6c57b62a009371325c5e6964ca76dc66f1504a8ff3498c631dd6defc3b46288be3148048856c4385f95bfda32b60751e038b7da205eb4b3e10 SHA512 a4b62f5a0e96896dde641e2d59551036c2844fdff02c5f266f05fcd4b651c096d9af93ec468af3a5f2b98ca1020ca82612da4db3de498b9eb7e9e1bc40654bcc
 AUX boost-build-1.71.0-respect-c_ld-flags.patch 367 BLAKE2B fee2e2f2db024a1421ad7f7d59a17908d6d74bd95c568c27adf9853725d8d92b7460d1c520c2a591f4a8d41213e2bd822044aef490b7b50590a6dac63630dc39 SHA512 148171cd6b1946e4dd0c2cfe734ff9a7e7adb4789868a363bd6f0855fad882f69e34aa079c0e1521864db5f5b7dfa449cfed74236b5f6743ed520ed477e48d1c
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
-DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
-EBUILD boost-build-1.71.0.ebuild 2667 BLAKE2B f1b655fa37c607a5831372e99d33de1e6af8e9f4d4300902d231f21549b19f9fc58828f98fd5db749f1f20ef990a80a4e331fbcd1309259e01aecb092b777726 SHA512 f3d24d9ae199192691fa928f58635c14e4af7f7d052d2a1337398d0d124730e34ee89e12d38852e697fd9c1621861af4c11e2d9137b2096ffa5e47bc01050071
-EBUILD boost-build-1.72.0.ebuild 1995 BLAKE2B e9e45eca81f2de18edca0ec61534a72ef20823995da71aa5ee52ef0ac61867a2247fdd8bc7145dbd942dccc1a2493dcc6673330a83fd0bc4dfdf3a11b853cb38 SHA512 b21d44e58a3be7bdd9cf0aa3e4e327adcd19a08c19f7defbfadbfa3742a8bc8c7d279770a8fcf010a605caa352e3cc5a1a06621a6181644f500e167bb677fa4e
+EBUILD boost-build-1.72.0.ebuild 1993 BLAKE2B 0926bf663d53d487a8a7ee4c5e125053045886f6452a6e865a0b2d0d7ba3cc8075e81c566054b2a169e3ce248b796e22c3d224d80eb26bcf1ea667aaadd30032 SHA512 70c4a1f089aa9d6b6404412a78d2d69dc07756848391ada3ee0c2246fc590ec4a83c23ac94c3a6af7542cd65c39c1bd69e048b3fb60ff4b2eb91b68679c85798
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.71.0.ebuild b/dev-util/boost-build/boost-build-1.71.0.ebuild
deleted file mode 100644
index 721f88bcf9f6..000000000000
--- a/dev-util/boost-build/boost-build-1.71.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic prefix python-single-r1 toolchain-funcs
-
-MY_PV="$(ver_rs 1- _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
-SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples python test"
-RESTRICT="test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!<dev-libs/boost-1.35.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
-	"${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch
-	"${FILESDIR}"/${PN}-1.71.0-add-none-feature-options.patch
-	"${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch
-	"${FILESDIR}"/${PN}-1.71.0-no-implicit-march-flags.patch
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd .. >/dev/null || die
-	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
-	popd >/dev/null || die
-}
-
-src_configure() {
-	hprefixify engine/Jambase
-	tc-export CXX
-}
-
-src_compile() {
-	cd engine || die
-	./build.sh cxx -d+2 $(use_with python python "${ESYSROOT}"/usr) || die "building bjam failed"
-}
-
-src_test() {
-	cd ../test || die
-
-	local -x TMP="${T}"
-
-	DO_DIFF="${EPREFIX}/usr/bin/diff" "${EPYTHON}" test_all.py
-
-	if [[ -s test_results.txt ]]; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
-
-src_install() {
-	dobin engine/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	if ! use python; then
-		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.72.0.ebuild
index 8b9bce04fa9b..7a5ceed1897a 100644
--- a/dev-util/boost-build/boost-build-1.72.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.72.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
index da89ff634ec8..b7824ce1db3d 100644
--- a/dev-util/cccc/Manifest
+++ b/dev-util/cccc/Manifest
@@ -1,5 +1,5 @@
 AUX cccc-MFC-dialect.opt 560 BLAKE2B 65000ebbc99b306318aa2da34031879b7393649573b8509bc12ed6174d59208ea2a06e1af8d98eefb3d142d51e9b98bc9e2a058e8f8f3a68b17f76bb4dfcf6b2 SHA512 e37ded34821690e0b07e4e3da502bccdb5760a38a9f1fbacb6cec4de143cc9c0160684d9a41ce0c3ff8e2a7716889824594d6f8d374a631dbb0de91ccec53903
 AUX cccc-c_dialect.patch 2048 BLAKE2B d97bd8430fe1357779ebf221607ea724485cf5bf572c86f4adcb85ea6d29c41bfeeb562534bccd1787241c024951941921fe6936541c5ea1f72ea923e9612d12 SHA512 5fadc49a0da8ca51b74dd92e673b413b506c8b06dfeabb7da0e2ddf24e7766d58ebbcc00d018677f4b0ff77d10df8b974ff1afd4100c33152e8cad0538b61789
 DIST cccc-3.1.5.tar.gz 662760 BLAKE2B 57817ef9a44f002c017245d7dd3b1ef97fec59b59bce465d5e5e1cc12409b5602cfd8bf7ee938e526af9bcc11398639900d26848aa4f8c7f623669159de17117 SHA512 61544669a75ff7bd99c6ff5bb1e6ec163f2a09f4538493fe60e8f9f95eab7ba19ad6d39b6717ae010a223b8efe48c497a4feb8ead218e350ee2ab91b9c52c969
-EBUILD cccc-3.1.5-r1.ebuild 1519 BLAKE2B fc637824cbff2a1f56db46ce6ea9684f2598dafbbb7c191b8dbfc20779d7945994224b48ee9e886954257960508643e6a8fecc1481f64698b2f515629f49d399 SHA512 04f323a0041d54b968082cc85f4ee2cd14741662015546258f02eee85d4bd4ab772996256d397575a94cd75972246fbd88ea6e93099134e7794ae0750da9fb39
+EBUILD cccc-3.1.5-r1.ebuild 1415 BLAKE2B 2bd96fcfee18319519fea0992eae94f67c062386a66bfe20fa65ef157c54dc54193960b327723f12db617d379dc8ccc0b819face730cf49fb8267319b3869668 SHA512 b7c4e05f6d0bab14f6a16059850e016657b06539250647ea6f4c2ffa4bc339c27b15c1bce9905239393852f7d673b65cead2e37157b5ed3e67172144ec7ee5aa
 MISC metadata.xml 694 BLAKE2B d8992216f3b05e4382fa843df2a71673946c1e81ef7325fef7ad39fa073c092cc86b1cd993582b40b230adb6902a406c30a7b9a00d557e7f2aafcf4e940e51cb SHA512 442e37fb776949e1f59ca7074ba1219e77e7e1be0003c5cace090342823227fca6a9a10ef607d133245985c717811005293bf2044fdb0bacfe2e114eea3ec2ad
diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild
index 856607a6df29..47a91aadc54e 100644
--- a/dev-util/cccc/cccc-3.1.5-r1.ebuild
+++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,19 +52,16 @@ src_install() {
 
 	dodoc README.md
 
-	if use mfc ; then
-		insinto /usr/share/doc/${PF}
-		doins "${FILESDIR}"/cccc-MFC-dialect.opt
-	fi
+	use mfc && dodoc "${FILESDIR}"/cccc-MFC-dialect.opt
 
 	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins cccc/*.html
+		docinto html
+		dodoc cccc/*.html
 		if use apidoc ; then
-			insinto /usr/share/doc/${PF}/html/api
-			doins -r doxygen/html/*
-			insinto /usr/share/doc/${PF}/html/metrics
-			doins ccccout/*
+			docinto html/api
+			dodoc -r doxygen/html/.
+			docinto html/metrics
+			dodoc -r ccccout/.
 		fi
 	fi
 }
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 5b5748bc26aa..8a5d9c7c133e 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,5 +1,5 @@
 AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 BLAKE2B 4dfd4cdff8c71ba3cc160317d27a5bf26b2c5ed0d1278403dd7c5ad2a07e0b55759ec8c67c50b5d36aa1a8912f2b4f653fdb0b7ad1b36865367e28a433ebc4d7 SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9
 DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe
-EBUILD cdiff-1.0.ebuild 700 BLAKE2B 8fe0cc7375051a86d62240e55a85e2b510aa6e1838580007ab8c028b0bd4cabd72b4488c95989c964c9018c1d24258a8cefb0f6cdd88f36e0b6824949245be60 SHA512 70b277acd5621255f7907097ebaf53a1ca4dda320d0a2d2c5bef552cf62038b143a2c06001fe035ea4689ca501b818a288370d4f6bbb0984a9672327ed3d3984
-EBUILD cdiff-9999.ebuild 741 BLAKE2B 609611e9bb4714a374ccc8676ace6fb65540497187097a73db43d104321182cf158d6c9cd1c5b4d01b06784d93b5a41be18daca258d90c7802ec0153eac4fcbc SHA512 1cba6cd1eeaaa914572945f9cd739721894ac24049a94a1213e9f9a094ca53793e9ad2a57c6f3f6ca7befe41880cb83c765e929839680650b91a4f016c87fb7d
-MISC metadata.xml 383 BLAKE2B c2fba0c9ed05af593bf10ae733401d7de8a1396c22094ba912418a796783e069243506edfa72cfb1a706f63c0bcbc5cfb0321b21a5d699a726901ccae682a32f SHA512 c797a47d8258e3aff9bf93328566438192a37c166733e84fd6846ecccb77ea0398c82dd9abbbe90623d4a1fa33405c75ed1defeb832cb2e55b754d3a594bba5f
+EBUILD cdiff-1.0.ebuild 668 BLAKE2B 7a75efc3d54ba0682364bf4153d34d2c0178734131fd59e6ac3aa95c0d807e1709500770d9515560024148c7dd6ea686728724fbf727f86ad3ff14d5f1a2551d SHA512 04aea14fcd0e72413918174a2cef868825a57887594febaf88659c9a4382f02d51d0d2fa23f066c59ab1e1bf2e28c525729e1d8cdaf319bd559bc107a25cdbeb
+EBUILD cdiff-9999.ebuild 709 BLAKE2B f895311883b0a23357253f53f3828f7be26528cfd0aec8d6081d7ff6ba9eca3a9875029400669928810a132450dead3d512f10d82703584558b9853b03464b94 SHA512 813966a691b8d76ca7deff75dd08c9b4266de6a582c7ad80b2987c06794f45db4980914f4d6f76e4937651fec7c3f2dda6ecc46da7e72df0d24491a7396e71cc
+MISC metadata.xml 287 BLAKE2B c4ed1b40666b9a9477093f34cc040421ab141056f8a504c01362180172cf8d843be7c8513e01b7a8d21a4246d02409f2c9877c1961b78799f0166396b85c4333 SHA512 c64ae3d531e511e02a81762196f51a7c44e417e76c9aacd8ecf55e66854dde9e971af79ad983d8b2b9d4eb90793fd175bc8b348aa546170e99c045431f4744ce
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
index 326c78bb675a..f7b4111c9f64 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -16,7 +16,6 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
-	!<app-misc/colordiff-1.0.13-r1
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-apps/less"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 0040b4980847..88b0810474c5 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -17,7 +17,6 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
-	!<app-misc/colordiff-1.0.13-r1
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	sys-apps/less"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/cdiff/metadata.xml b/dev-util/cdiff/metadata.xml
index 8298304ad283..4ec31f8291a1 100644
--- a/dev-util/cdiff/metadata.xml
+++ b/dev-util/cdiff/metadata.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    Colored, side-by-side diff terminal viewer.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">cdiff</remote-id>
-    <remote-id type="github">ymattw/cdiff</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">cdiff</remote-id>
+		<remote-id type="github">ymattw/cdiff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index db4e771d5f57..e0f7c4248ced 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,6 +1,6 @@
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
-DIST devscripts_2.19.6.tar.xz 844316 BLAKE2B 93eddc1d5ff78c579a28f8f54ce317cc251864917aa579094bd392f0811f07dc38447b3bd36a608431cb3d576b05c5e1f6cdc51a453b1c07389a5e1794f1acb5 SHA512 9313af1777d9a9932a81f95492b7cd423afbeacc8afbf6d9400e6430d2ce83abef0e0228a581f705f661183f605f2cadc95e11f1a43daf11fb968bcefc352422
 DIST devscripts_2.19.7.tar.xz 847488 BLAKE2B b3c76d9b0899c01f08d0432f8de0a65d1434afffd35eda33b6c7f442796c2165cdb316290d41313876cd5ef8108e0bba03d173dd52c139908672a6f3d6902588 SHA512 6e31862bc8f0d43678341f40ec527d76cdccc2e6e50c231eb7c6a1eb442f48b6c62e94126644224e9fdbef583be3166e2c7cc65ea15de4a7c20605089b708eb7
-EBUILD checkbashisms-2.19.6.ebuild 890 BLAKE2B b766261b04b2be48b2c9ed540c48e9f8e6a5de05498dd55f3a5740a89b27f2c9b713fe65c275ba21d791f985d9800d9dbd5c034b646f36bd9822e1d992e55c7e SHA512 3bce9e58d293dd4772b23674342bcc96af079aeace7512b04fcdcd51f20d07a739c8461669270d08d7da57c049b895f03ddc33d7f8d2f8d73d264253b79dd56d
-EBUILD checkbashisms-2.19.7.ebuild 892 BLAKE2B 07b1578c67cdf6a8e53005e9ecec39c1d2d854d50ae595b81079cfda2141023bd699f62dfa45824026e16496a9ff879c7397991b8038afa82bf394f7d39c8961 SHA512 186da6cbc20eba27c969e2b84a4896908c268675d6db9a53201ba31a1e5757e16ae5637182ec77e8ac8d2f320540a96927c7190f7492596b95262eaeafaca404
+DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f6055cb791b5697f92fc0e362c1b2a89ac26fc2a45739989ae9f9981c956d90ceefd514645649d1b7fca6d7eeaff9df7d SHA512 6e9505f491bf87df6c0ac384cbf307959fd86e3aea1aecd7e70e88bbe57757035612235bad0244dc7aeedcf964605508f7fd5db582b410dd715380a064389d1d
+EBUILD checkbashisms-2.19.7.ebuild 859 BLAKE2B 93883a2fe97d48a2cd227d37bc7c79f0cf3c26a70fd0d96207742daf7b7b0bfb673a2e1a109668ed88c284a69f4f5126c74190c5abb239e911a6554e3a49da6d SHA512 3d6e002a45f43f2a8205e95cd5a4d2984cc50cbee3038a26bb0705996bbba678c470c0c0196652ec3da687a1d4e52dc1db996fe1af6c27818c7a58f534e14886
+EBUILD checkbashisms-2.20.1.ebuild 861 BLAKE2B 8535b63e8dbd03ad306b07b09863cb990bfedfa9a8cfa7017dc9a70b6b5a8c2ae7c17c78a444fa8f68858e8d8a1ab0fb5737e3947378469bb691d70afc19f08d SHA512 94d502d16ceb3acd0451e1f76f83906b298af427afcad8c145f5ca387d831a99db4ef21180338d3ed8619e1fc2952cf5c83c34ddb50612c8caaebb124948a90f
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.6.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
deleted file mode 100644
index 425cf48b4740..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
index e48d94ca95a3..39f37e6b3b9a 100644
--- a/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.19.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,15 +12,14 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
 RESTRICT="test"
 
 RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
+	virtual/perl-Getopt-Long"
 
 S="${WORKDIR}/${MY_P}/scripts"
 
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
new file mode 100644
index 000000000000..26d0ab390329
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.20.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 40023235994c..7c7f6b4cfb1d 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2019.3.2.tar.gz 504918530 BLAKE2B fd209977752f2e97c42113d082f0e57de0a4c73c3f18d29ba00872f19f753843c719abc96e1e7c1ba2d8afdfd724ef929e803d1ec009019ee9bef735347ae8a0 SHA512 def10008f685c5bac523c2a15920b41482f4877cdfcc26f3aac2dfdfe2cf0e23ebff236750d4f1b04f0076ec6967c127abaf61f0cb1da5a51d873fd0cd029f2a
-EBUILD clion-2019.3.2.ebuild 2157 BLAKE2B a056873673bf62fc31178fa9e4cd36eeae012a4fd556048e80c433ff3f82952f1dd96dbaa21bcd1970fb049b9feb511068deb4dec978627babb1e81e6cae57d5 SHA512 aed58628024651ce9a4efe1c072d1da249a0614fa94553d4ea3f3155efb47792b5b5e31855cf75c6778ec17fd84b45378f0b16ba8bf3972a120163f357fdc5de
-MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
+DIST clion-2019.3.3.tar.gz 505265765 BLAKE2B fac1aab0429e09bafbb2fe6093f8f6d60384cce6a6caf3e529161cf51516ecb399c900e911807872cd773d0c641c340325640097e02a34fb06e5b53764aa19ce SHA512 33c49cb24792830dbf2246753df408213a799c4542a3284ef6a13f4f4022733d3007680822f6230c599fa1c76643834734b8c3638bf9c6cd1c54dc76b758881c
+EBUILD clion-2019.3.3.ebuild 2179 BLAKE2B 198748c33f57fedf4153c6f1d5f3982a901cc951d95e9b9e8c49d716e5ced2cbbac6bae3f186d76b84e3ea5d4f4c4ee33c3ea657c6d4b936120d66d08fbd2252 SHA512 0c223ad5cd9536eaf96b3ff9ad7deabe9f04124cf1b66b009168f676907da8c0e9d5939e428bb9f8baf1d26b48bc0c810f8b1e5abf3b4c3691f02a74116356d3
+MISC metadata.xml 458 BLAKE2B 1393fb2b8c1487a670f3c2fc7c2fe9246d8f18bc7d33e2d494f0ffc3a3492285dab041f3cf810d16e78a312dd3936eb9bad0838ff9a8c3b6a4b7d80b90764fc4 SHA512 c00a66b6722a62222d06c325df55a3d946267ce7a4a452855933d721b936cd05aae5e9acdb784fc8e97235ead35e6625522c579397f43e9755619b1a8dcaccc7
diff --git a/dev-util/clion/clion-2019.3.2.ebuild b/dev-util/clion/clion-2019.3.2.ebuild
deleted file mode 100644
index 85f96b2ea6bd..000000000000
--- a/dev-util/clion/clion-2019.3.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils
-
-DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="https://www.jetbrains.com/clion"
-SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
-	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
-	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="bindist mirror splitdebug"
-IUSE="custom-jdk"
-
-# RDEPENDS may cause false positives in repoman.
-# clion requires cmake and gdb at runtime to build and debug C/C++ projects
-RDEPEND="
-	dev-util/cmake
-	sys-devel/gdb
-	!custom-jdk? ( virtual/jdk )"
-
-QA_PREBUILT="opt/${P}/*"
-
-src_prepare() {
-	default
-
-	local remove_me=(
-		bin/gdb/linux
-		bin/lldb/linux
-		bin/cmake
-		license/CMake*
-		lib/pty4j-native/linux/ppc64le
-	)
-
-	use amd64 || remove_me+=( bin/fsnotifier64 lib/pty4j-native/linux/x86_64)
-	use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
-
-	use custom-jdk || remove_me+=( jbr )
-
-	rm -rv "${remove_me[@]}" || die
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
-
-	if use amd64; then
-		fperms 755 "${dir}"/bin/fsnotifier64
-	fi
-	if use arm; then
-		fperms 755 "${dir}"/bin/fsnotifier-arm
-	fi
-	if use x86; then
-		fperms 755 "${dir}"/bin/fsnotifier
-	fi
-
-	if use custom-jdk; then
-		if [[ -d jbr ]]; then
-		fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.svg" "${PN}.svg"
-	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	dodir /usr/lib/sysctl.d/
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
-}
diff --git a/dev-util/clion/clion-2019.3.3.ebuild b/dev-util/clion/clion-2019.3.3.ebuild
new file mode 100644
index 000000000000..d50ca20ce175
--- /dev/null
+++ b/dev-util/clion/clion-2019.3.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+	Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+	EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+	LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror splitdebug"
+IUSE="custom-jdk"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+	dev-libs/libdbusmenu
+	dev-util/cmake
+	sys-devel/gdb
+	!custom-jdk? ( virtual/jdk )"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		bin/gdb/linux
+		bin/lldb/linux
+		bin/cmake
+		license/CMake*
+		lib/pty4j-native/linux/ppc64le
+	)
+
+	use amd64 || remove_me+=( bin/fsnotifier64 lib/pty4j-native/linux/x86_64)
+	use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
+
+	use custom-jdk || remove_me+=( jbr )
+
+	rm -rv "${remove_me[@]}" || die
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
+
+	if use amd64; then
+		fperms 755 "${dir}"/bin/fsnotifier64
+	fi
+	if use arm; then
+		fperms 755 "${dir}"/bin/fsnotifier-arm
+	fi
+	if use x86; then
+		fperms 755 "${dir}"/bin/fsnotifier
+	fi
+
+	if use custom-jdk; then
+		if [[ -d jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.svg" "${PN}.svg"
+	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
index fd24c2d5ef8b..7b00c206608d 100644
--- a/dev-util/clion/metadata.xml
+++ b/dev-util/clion/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>		
-	<longdescription lang="en">
-		Fully Integrated C/C++ Development Environment.
-	</longdescription>
 	<use>
 		<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
 	</use>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 42f62e11cbb1..6b92b0185060 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -16,10 +16,10 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
-DIST cmake-3.16.2.tar.gz 9109837 BLAKE2B a574325eb1f4c59a5745e3fe1def5ac53c36d4ce8dd74e051d8f4fbf41dab1d0134cf04541c1757df178def1eb65bd0536f1db132f5f9ca894870da1daf5901d SHA512 b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76
 DIST cmake-3.16.3.tar.gz 9111826 BLAKE2B 578c070457074a611504c0113b12bdfc8831c7e2cd523dfb038279404712456032646b107ca4d7d8dbff227e4f326ab053d90e3925a22a68a37d5c4e0d818bb2 SHA512 ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672
-EBUILD cmake-3.13.5.ebuild 6179 BLAKE2B 30b41df2a9bf9dea4a375693b5e8b3a8e1a925df878ec6a83cd198cc45c565b5da77aadc6ec8bed43799ab876a0ab34f4bcd6e9e20363a056b1f31173c2b17f2 SHA512 753b19e4a2ec07adf6ca1c519bcbea5a56b0447ad118bd9e8f42b317e51ea89a9d59d8870bd0dc7ca24ae54ed63ea5079c3f69249b94340f3f062ab29b029d28
-EBUILD cmake-3.14.6.ebuild 6234 BLAKE2B ff767804405e0b1213a1fd291f297e022113319cf741f9012df91d61e359d30587af59233deb1bf72441304c8555a9ebf783f6325e723b784d30555d8dcb7708 SHA512 b356436e7c66c88fae294561bd56264e4ea43d2454f711e499e33874c44af32405e38e9f0e63f2b681a1730aad08bbe97bb7344c49f465e68826ba81d59326bb
-EBUILD cmake-3.16.2-r1.ebuild 5849 BLAKE2B b6b96efe81e308591e77e943d0414f5f71656aa15e548cc6e7bf7000605b430d9459e69959665c82bb7a8a619ee1e719e68597527b06b6c1cf9841262e24b942 SHA512 295ee591dccc69ca1b0c1909ba9a4e7894f949a7040498a3f60d9564a650bc8e5c53534c14069098ea4a5719a2cf36f23ffb51d12986078f1ce108642c5f9ad8
-EBUILD cmake-3.16.3.ebuild 5849 BLAKE2B 4f7136200883703006f741dd569bceab5a18906e3a20cef4b2e0683135efe1990387ac19811041071bd54099cbeae396352fb6f4234b29e25bfb4a5b840362c8 SHA512 8f4734b1031084454487cf4b75c924bc5b68102860706354c8041c066d87d295120fcb5dbdffcae11f0d229137b155410b3fcbffb64b52c188be831468b6cd46
+DIST cmake-3.16.4.tar.gz 9113021 BLAKE2B 5aa34cadec4ed09e4d0c46f6983b88cf81ea719c47a0848a21be36911b223d9e609bdc7f5b52086762ab83e4230a3ec9e38d9c9e3c9c6f508aa2118e769e3783 SHA512 4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
+EBUILD cmake-3.13.5.ebuild 6137 BLAKE2B 1e450506aadc07e1a29d551fe7d7d99471811315a7e0851dad15d3340fafd4fad4915736f0ab6e414d3cefa9fa04b62d4182803e2a6a007b0a662f340d220c3c SHA512 c09ed23c0ecce024f5f0d2f734f32a3aac6f146bc1d0023977881136da048623628fe5d4bb3a226b8970a3057b5186981153fd666c7723c983317f37471d1b88
+EBUILD cmake-3.14.6.ebuild 6192 BLAKE2B a6b5b336573cc343980871bad3f75667505d725d2d7362623e5c6645c3ad52a2897b99ec55ab625f0a19bea97a2dcc954741a1fbf3116f889b1cdd58ab1660d1 SHA512 50a73b9567171e2d1d9051c3645610e606094878269baf245e3961a82ee3038ec85901c1a2cb1b92e161e1c1e32da95e8ef8a272163bf1b847d08cc354e68a63
+EBUILD cmake-3.16.3.ebuild 5807 BLAKE2B ca8e76982988a5cf71ff325b057dee36bc0e49f49255ccd4acdd005d6c9d2ff71210391e2193dc51358fa61cdbe3bd50f9a8f69eb26c31a07c7b510853bb4d77 SHA512 03061e7339a914278aff215cffcdba415a025aafd7bbc2847b5f5b118dc0b02e7287d68ba1e6476563315f63b5d498dd2b0dd00f8fd1a62f8738db7f7e729fec
+EBUILD cmake-3.16.4.ebuild 5807 BLAKE2B ca8e76982988a5cf71ff325b057dee36bc0e49f49255ccd4acdd005d6c9d2ff71210391e2193dc51358fa61cdbe3bd50f9a8f69eb26c31a07c7b510853bb4d77 SHA512 03061e7339a914278aff215cffcdba415a025aafd7bbc2847b5f5b118dc0b02e7287d68ba1e6476563315f63b5d498dd2b0dd00f8fd1a62f8738db7f7e729fec
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index 529cc0a350ef..4c4b1fe6488c 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -162,7 +162,6 @@ src_configure() {
 	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}
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index 81506d785420..4ed3f6c3ca9f 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -161,7 +161,6 @@ src_configure() {
 	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}
diff --git a/dev-util/cmake/cmake-3.16.2-r1.ebuild b/dev-util/cmake/cmake-3.16.2-r1.ebuild
deleted file mode 100644
index f2216b9a5c2d..000000000000
--- a/dev-util/cmake/cmake-3.16.2-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg cmake
-
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/expat-2.0.1
-	>=dev-libs/jsoncpp-1.9.2-r2:0=
-	>=dev-libs/libuv-1.10.0:=
-	>=net-misc/curl-7.21.5[ssl]
-	sys-libs/zlib
-	virtual/pkgconfig
-	emacs? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	# Next patch requires new work from prefix people
-	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc1-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
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# 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/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_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
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_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 "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-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_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)"
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_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_preinst() {
-	use qt5 && xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use qt5 && xdg_pkg_postrm
-}
diff --git a/dev-util/cmake/cmake-3.16.3.ebuild b/dev-util/cmake/cmake-3.16.3.ebuild
index e12b038dca3e..5b1f3688d59a 100644
--- a/dev-util/cmake/cmake-3.16.3.ebuild
+++ b/dev-util/cmake/cmake-3.16.3.ebuild
@@ -151,7 +151,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DCMAKE_DOC_DIR=/share/doc/${PF}
 		-DCMAKE_MAN_DIR=/share/man
 		-DCMAKE_DATA_DIR=/share/${PN}
diff --git a/dev-util/cmake/cmake-3.16.4.ebuild b/dev-util/cmake/cmake-3.16.4.ebuild
new file mode 100644
index 000000000000..5b1f3688d59a
--- /dev/null
+++ b/dev-util/cmake/cmake-3.16.4.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg cmake
+
+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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( >=app-editors/emacs-23.1:* )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	# Next patch requires new work from prefix people
+	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc1-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
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# 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/" \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_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
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake_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 "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-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_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)"
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_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_preinst() {
+	use qt5 && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postrm
+}
diff --git a/dev-util/colorgcc/Manifest b/dev-util/colorgcc/Manifest
index 481c015d4acc..d965885403bf 100644
--- a/dev-util/colorgcc/Manifest
+++ b/dev-util/colorgcc/Manifest
@@ -1,7 +1,7 @@
-AUX colorgcc-1.3.2-gentoo-one.patch 6576 BLAKE2B ef07061997435ff2807f15e2192a11effb8e527f1c179de333a183447b423ea2c5c070fc1693fb24aef17ab6bfe99863fafc5025b2ab8d0f463b37173df96af1 SHA512 c69817277bd8fa63a4cb54abc2b6300d3f31becd189a01605b06b828a11a4b0ea5edf78048bcbf6f271693149376bc625770605d6bb157251c77f7a4608dae91
-AUX colorgcc-1.3.2-gentoo-two.patch 1953 BLAKE2B d5f7c061674ac993c2228fe435b38c0bc06e1b0f9a403219d96e358427e6cadc66ee3532a893d131265d448edc9e79b6c089963c635003ff05f279b84fb2cce4 SHA512 ede1391446346e5701ddb5fb1ee34c87d1d9877b2ec221f07923b6a17e199caa93f3183d4d8f7349955d425a3094a9ce8e2d2ace71a3c5030f811eb0895a834d
-AUX colorgcc-1.3.2-nohang.patch 1752 BLAKE2B 244d7e7480b148849516ac672a7d164c58c4b4dc500d13e03b0fa2626eeb7bd776eb31f3e982cb1255611057bc26810d468ff247f08a7f9d1aeab7dd7ac46e42 SHA512 4c345e7e21e6a53f16197ea64594ddef646045de2d3d4f1ad500f24c081d06490babc7b375d6e5b0968da73d8332da2590e7f6924d81c20fe8ca9d59949d0b22
-AUX colorgcc-1.3.2-note.patch 1922 BLAKE2B 79c2950839c25870bea70a8cb9636a6525283773d8a180a93491d1a93a7d90c2f80814f6f98c75a497eea9b008d10c65b7e872afab47a38484c021aad53c08c2 SHA512 8b9dfd8a3790178a245ffc40bd5631397b9d1acdb5fd06e7c768d9679414174f06036ed09d29b61fc349b9155f95a2505e2dda88736ca899f038b3ca17207a72
+AUX colorgcc-1.3.2-gentoo-one.patch 6357 BLAKE2B f30388de2a406d93e7f19e5b27d35328eef57317751915b63c7ff5ec6199661e679bfba2187e85ed43074bb07c9449e194ebdbd77ce4912880136606f7ebdb7a SHA512 cbc33cd69e554aeca757744a84cd6c5c9dad04b9d449ce797f3b1b3799dcf12dd6919a1934743154b96c7cee6d5c5c17a3813a73ecd73a7a7f935094c4f92585
+AUX colorgcc-1.3.2-gentoo-two.patch 1882 BLAKE2B 5b8b02733b59e90de12eaf5fcd1df7735eb56864c00cd8d1ba3494b51036487eb5c9ddf2f56814fe29eff28f4a22250957139e412463fc84da479e177790ae70 SHA512 89d7a6b23db893d65b940090deaa0d553e1ee66cbbcd495c6570510b0139227a81f7ac9ef8c2665e367155e6fde90d91d8181781f7c131ca57371bce649d7bfd
+AUX colorgcc-1.3.2-nohang.patch 1675 BLAKE2B c31b8a3b64df47f4015d1ccff2e852993791197bd3076596c3f29b154c8f7e256e77278744306cafa9651ce3b253da21358fcee306c61dd6e8384705c594fbc6 SHA512 5842700ec869b1f066035b8facfce056a207e4a7aeb020c1ec3fa277be56f8c513dc5f86df79f73e00c6cde93cccfd1173c5572d3e02233fa2b0e86c2f17b249
+AUX colorgcc-1.3.2-note.patch 1845 BLAKE2B 0a33bf926eacd9b3ade3da542078d7b7738bf7086b7026873fc4e66dbeccbcd6d10f071e8e9c35cb20d7eb4f1752a6c87cbb3361d4714e401f9408fc9dfa9b2a SHA512 8d0a1a64a235c43b66c2813c3d7316f650c3160700d61acc2e1d6deff678da31832259fbc08da05108e42d780ba769b404881b65d0b68bc6c2ec6ebd25b78ae3
 DIST colorgcc-1.3.2.tar.gz 11076 BLAKE2B 80843c200157fea52cc9f0f7f3008a52860ab8e1256490126d499b34f6821957de92755cbda835806e2df83866ef11096d6d80a0739fb87ef7c348ccf58d76af SHA512 1f6031bcc0f6eb6bdaf0359debe13d1a6579c4f5bfb8dfeef79904a2ffcc94322f2c7f9948439c2975bd4ffed1ebaa085bd7ce338289bdf9c170cd40e1c1a448
-EBUILD colorgcc-1.3.2-r7.ebuild 2110 BLAKE2B 41185695aeea6f0fe03b95072c925be02fa03afb91fec5e07ca133dc97e6f909cb598d7c40f0bdc11812f912f00a89f6bc93f39515408d5ff5c76164940968f5 SHA512 52e28974e3c67f4083b979c6cf000d74c3eaa1e46b44541593ef06255acd2aaf4b4c73781a831fe8ebb69747b9e73fe981bb11e4b4b2baab44814dc004264345
+EBUILD colorgcc-1.3.2-r7.ebuild 1985 BLAKE2B 824980286bbc3e7b64959b03711f3ab76a67f05ae4735e4df01b3bea9f0537f1da2f191e134ae5e4cbf96553336745576100b1cadca1a7e0f439b11241391b7b SHA512 4f202286145f3ea53c2e988c462e82d6b3f5683c05cef2f24b8500d9867800417e088acaa93a72b8dde18edd80371ca17bee1471e033939c3da93be35843e389
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
index 60880cdc1e34..899387414cc4 100644
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
@@ -1,18 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Perl script to colorise the gcc output."
 HOMEPAGE="http://schlueters.de/colorgcc.html"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
@@ -24,24 +21,21 @@ PATCHES=(
 	"${FILESDIR}"/${P}-nohang.patch
 )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
 src_install() {
-	dobin "${PN}"
-	dodir "/etc/${PN}" "/usr/lib/${PN}/bin"
-	insinto "/etc/${PN}"
-	doins "${PN}rc"
+	dobin ${PN}
+
+	insinto /etc/${PN}
+	doins ${PN}rc
+
 	einfo "Scanning for compiler front-ends"
-	into "/usr/lib/${PN}/bin"
-	local COMPILERS=( gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ )
+	dodir /usr/lib/${PN}/bin
+	local c COMPILERS=( gcc cc c++ g++ ${CHOST}-gcc ${CHOST}-c++ ${CHOST}-g++ )
 	for c in "${COMPILERS[@]}"; do
 		[[ -n "$(type -p ${c})" ]] && \
-			dosym "/usr/bin/${PN}" "/usr/lib/${PN}/bin/${c}"
+			dosym ../../../bin/${PN} /usr/lib/${PN}/bin/${c}
 	done
 
-	dodoc CREDITS ChangeLog
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
index 68a177ba75c7..13199715c9fa 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-one.patch
@@ -1,5 +1,5 @@
---- colorgcc.orig	1999-04-29 10:16:08.000000000 -0700
-+++ colorgcc	2003-04-11 16:38:52.000000000 -0700
+--- a/colorgcc
++++ b/colorgcc
 @@ -88,16 +88,16 @@
  #
  # 1.0.0 Initial Version
@@ -188,8 +188,8 @@
 +   waitpid($compiler_pid, 0);
 +   exit ($? >> 8);
 +}
---- colorgccrc.orig	1999-04-29 10:16:08.000000000 -0700
-+++ colorgccrc	2003-02-12 17:38:38.000000000 -0800
+--- a/colorgccrc
++++ b/colorgccrc
 @@ -20,12 +20,14 @@
  # For example, srcColor: bold cyan on_yellow
  #
@@ -225,8 +225,8 @@
  errorMessageColor:  bold red
 -
 -
---- INSTALL.orig	1999-04-29 10:16:08.000000000 -0700
-+++ INSTALL	2003-04-07 17:12:25.000000000 -0700
+--- a/INSTALL
++++ b/INSTALL
 @@ -27,9 +27,9 @@
  When "g++" is invoked, colorgcc is run instead.  colorgcc looks at the
  program name to figure out which compiler to use. 
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
index 911a31b21bf3..6cc033255a2a 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-gentoo-two.patch
@@ -1,5 +1,5 @@
---- colorgcc.r9	2003-09-21 12:14:48.000000000 -0700
-+++ colorgcc	2003-09-21 13:11:22.000000000 -0700
+--- a/colorgcc
++++ b/colorgcc
 @@ -95,6 +95,7 @@
  use Cwd 'abs_path';
  
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
index 9602146b0af9..b14a92b59a63 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-nohang.patch
@@ -1,5 +1,5 @@
---- /usr/bin/colorgcc	2010-12-13 00:08:37.000000000 -0200
-+++ colorgcc	2011-10-05 15:26:53.000000000 -0300
+--- a/colorgcc
++++ b/colorgcc
 @@ -221,17 +221,16 @@
  # Figure out which compiler to invoke based on our program name.
  $0 =~ m%.*/(.*)$%;
diff --git a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
index 026503e8f2c9..52cdb165cdda 100644
--- a/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
+++ b/dev-util/colorgcc/files/colorgcc-1.3.2-note.patch
@@ -1,5 +1,5 @@
---- /usr/bin/colorgcc	2009-10-29 20:24:46.717190000 +0100
-+++ colorgcc	2009-10-29 20:27:42.614162888 +0100
+--- a/colorgcc
++++ b/colorgcc
 @@ -102,7 +102,8 @@
     $nocolor{"dumb"} = "true";
  
diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
index c6b52ec31361..5a7e0a312645 100644
--- a/dev-util/conf2struct/Manifest
+++ b/dev-util/conf2struct/Manifest
@@ -1,4 +1,4 @@
 DIST conf2struct-1.0.tar.gz 57393 BLAKE2B 7de4be755ec764d96a321c68ca68b3156889e24f6894ba78b1c88cbeff84525331f1105040d61b1121ca01ece8d50a5aee2268eb73cde3ebbc8b62f679e2451b SHA512 31e8f350af740e79d97f4698dfec9b5e8a31a8a1cee30da0af753db26eda5b61379e9156e1cb492aef5068a4987d5e8202215323b83328e99705ae3ad3c09b81
-EBUILD conf2struct-1.0.ebuild 751 BLAKE2B 4654f087e4773d888890d334ce8a4d12677cd9fe29c8eeef624373cc93c5f7fdf02b7519f095ef57ac3596e812f4713b8efa9d29157646294f7def475529b733 SHA512 093c67b92d56739abefdcf6a98ba80f2e2ad7c36b8b66c781388715dbde889ad0ca07b8d02533b049c397fb8a010781f8e69ae23217960c0e9cd212b34b8ce83
-EBUILD conf2struct-9999.ebuild 746 BLAKE2B 3dea47468f3f014786e4afc60197ef9f9d2bc6940a779031043f7d222acc160423b6bb9b72ef38cdec5651c77077ca8b6b15e0adbe09c0914fc9f2778cbabf05 SHA512 9cc596eb33f72f9983021252e335fef30e38db9cdf565c70adcaa8efee40e1b9fe0e4109a39a0c621d5c8a844906c18689fefbc9894f69bbc30544cf00c60d77
+EBUILD conf2struct-1.0.ebuild 749 BLAKE2B bc09d5cb7e9211ac33277ee5d0b7c9222dadcefd9adb950b3eafb8db0540b8f5d25029f13309b1fc4ce689bec94547010485c106e1868baadb6ba3a2ae640455 SHA512 ea8ea31e672e1b51945348e0fcb54149bd082ce668b1eddb9ea9987e21c578825701698c2d94c3d8e4a65145188d0fb4b189389a8b46ee9072462de626682e0a
+EBUILD conf2struct-9999.ebuild 744 BLAKE2B 9663cb694400dbb030f59ef21146f712061eef12121a5907dc42b5575fb09d6b349de7ab03f3ebe72bf75229442e6434e19e359116208b651167b8307878bf05 SHA512 7130d4e9408355464dcdd59dc1b626e8225ad73e432cd4b9a17c90b8a2e68e164dd0753f13c5b28f03a207c34634363f7ee6a19bb5a0b7066782b5211e1135d6
 MISC metadata.xml 334 BLAKE2B 8a441ec6c49f135a517821de0933e09c01861a135a0a16cad200acb2a695cb04bdc5d4d6ab076b95d7f547a8771984ee3cfca0c074ad1c41db3df5cee2876f60 SHA512 db25be9a745a1ebef49e8e477e24d715453cfe0bb698dc8e42ccf3ef8d8aac3cc9693e3f2873f28b3096016741bbf3c32841f025a06bcee61e9138ac2f6ee8b7
diff --git a/dev-util/conf2struct/conf2struct-1.0.ebuild b/dev-util/conf2struct/conf2struct-1.0.ebuild
index f05ace485dcf..28df9ba3cbb7 100644
--- a/dev-util/conf2struct/conf2struct-1.0.ebuild
+++ b/dev-util/conf2struct/conf2struct-1.0.ebuild
@@ -28,5 +28,5 @@ src_compile(){
 }
 
 src_install(){
-	emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
 }
diff --git a/dev-util/conf2struct/conf2struct-9999.ebuild b/dev-util/conf2struct/conf2struct-9999.ebuild
index b853d93f1b86..e858e5baedb7 100644
--- a/dev-util/conf2struct/conf2struct-9999.ebuild
+++ b/dev-util/conf2struct/conf2struct-9999.ebuild
@@ -28,5 +28,5 @@ src_compile(){
 }
 
 src_install(){
-	emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
 }
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index c8e21db663a2..a174cafa0135 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,3 @@
 DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
-EBUILD d-feet-0.3.14.ebuild 1065 BLAKE2B f1358d5b4189107d553285f030e110fdc44eae48dc81840e896856325ba4f44a924cc73b546b227cde5ee57a476da55519b35eb76d3b51ce17f8113a10ceff9d SHA512 71105d02ed875b333fddb8d6bdff9d404103b566a768eba22a60307c6b3b5c37ccf50da348a357ef490ca2a906a0da040442438e8bf2f6edf409f80c56bf75d5
+EBUILD d-feet-0.3.14-r1.ebuild 1095 BLAKE2B 765ca6630798e043b8ba5d04ad2b6d2928c4f07b46ea11612e1b0890facc4e06c3e7c4300aa41c2405e7a7091a74a159b8f9d63d8df0ce8177d79c7ea9016d1b SHA512 736a6228c6306797a14842c3cf4952fb7db8451d24720639b9bf619a7c00a07cc6f7817c72ddde6b53043e95127a6b3e31c9fbc3b3891995b9aaa988f2f91a3e
 MISC metadata.xml 251 BLAKE2B c20c56e3f057e8bba258876f96b8ef08720698ee3aea60b765a79b1ff134df44036e6a230e071bdac6e5350a3b494975859db42c9693cbf165627bfecc566efd SHA512 0f975a0edfae95b6d15e292492de323063860e21caa4cc1e0ad70509bc3d3ead872daa50c66817efc9a8820e565ab9126d11f20d5daddf5f86b2e96100a4b9b1
diff --git a/dev-util/d-feet/d-feet-0.3.14-r1.ebuild b/dev-util/d-feet/d-feet-0.3.14-r1.ebuild
new file mode 100644
index 000000000000..234a4d26646b
--- /dev/null
+++ b/dev-util/d-feet/d-feet-0.3.14-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+
+inherit gnome2 python-single-r1 virtualx
+
+DESCRIPTION="D-Feet is a powerful D-Bus debugger"
+HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="test +X"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.9.4:3[introspection]
+	>=dev-libs/gobject-introspection-0.9.6:=
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	>=dev-libs/glib-2.34:2
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.3.91:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=sys-apps/dbus-1
+	X? ( x11-libs/libwnck:3[introspection] )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/itstool
+	>=dev-util/intltool-0.40.0
+	test? ( dev-python/pycodestyle )
+" # eautoreconf needs yelp-tools
+
+src_configure() {
+	# Tests are only python pep8 whitespace checking and intltool checks - checking python whitespate style is not useful for us
+	gnome2_src_configure \
+		$(use_enable test tests)
+}
+
+src_test() {
+	virtx default
+}
diff --git a/dev-util/d-feet/d-feet-0.3.14.ebuild b/dev-util/d-feet/d-feet-0.3.14.ebuild
deleted file mode 100644
index e4f0ba6d614d..000000000000
--- a/dev-util/d-feet/d-feet-0.3.14.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test +X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.9.4:3[introspection]
-	>=dev-libs/gobject-introspection-0.9.6:=
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/glib-2.34:2
-	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
-	>=sys-apps/dbus-1
-	X? ( x11-libs/libwnck:3[introspection] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/itstool
-	>=dev-util/intltool-0.40.0
-	test? ( dev-python/pycodestyle )
-" # eautoreconf needs yelp-tools
-
-src_configure() {
-	# Tests are only python pep8 whitespace checking and intltool checks - checking python whitespate style is not useful for us
-	gnome2_src_configure \
-		$(use_enable test tests)
-}
-
-src_test() {
-	virtx default
-}
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 6850cdd32b35..525e359e14d0 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0.ebuild 1168 BLAKE2B 7c2a6bb7317ea115db62783e85c88ef9d65246bed1b56bb72684aab53aa3bc9ae61e91404e9eca020f43e81f943937758f6a1daf3cfdb90951386a510af182da SHA512 802d5da4fb805724b1984a412d29970250fbd055d6d8b9a69849b1255a9861a966b9a5dcd1957c756ecda4258dc75d1a9b0c4268377184ff88e11b2fab6c06e2
+EBUILD dbus-test-runner-19.04.0-r1.ebuild 1245 BLAKE2B f11fd769497d1181d9359739ad0665fed13a4b241dfc54014a9f761d18bf9034469873468773d3c570a72bdb18f6730196d606d9157f1c643862eca2e1f606ae SHA512 f8d15f4118a745676378d60ed02b748d6f10e2a7d8a63341e92853e173c6878bd4bd041562234834d2be3bd88d762a0b2ab0e8c49c54ed8289a49b36edbb9010
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
new file mode 100644
index 000000000000..c4f1875532ba
--- /dev/null
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit flag-o-matic python-single-r1
+
+DESCRIPTION="Run executables under a new DBus session for testing"
+HOMEPAGE="https://launchpad.net/dbus-test-runner"
+SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# now optional:
+#	test? ( dev-util/bustle )
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/intltool
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/dbus-glib
+	dev-libs/glib:2
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/dbusmock[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/dbusmock[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+src_prepare() {
+	default
+
+	# bind to specific Python version (with dbusmock installed)
+	sed -i -e "s:python3:${EPYTHON}:" \
+		libdbustest/dbus-mock.c tests/test-libdbustest-mock.c || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
deleted file mode 100644
index 829f86ec19c3..000000000000
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit flag-o-matic python-single-r1
-
-DESCRIPTION="Run executables under a new DBus session for testing"
-HOMEPAGE="https://launchpad.net/dbus-test-runner"
-SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# now optional:
-#	test? ( dev-util/bustle )
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/intltool
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-python/dbusmock[${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbusmock[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	default
-
-	# bind to specific Python version (with dbusmock installed)
-	sed -i -e "s:python3:${EPYTHON}:" \
-		libdbustest/dbus-mock.c tests/test-libdbustest-mock.c || die
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index e4fc8a3d6dfa..0c378e6ea3b7 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 DIST dialog-1.3-20191110.tar.gz 540825 BLAKE2B 972d5b9d73c413274f09a590886838010feb55817ec94416dbf0da645824e92df9f7e02b9fbf22c226f2fa213876a6fa6de4f1af1ce94a93c53f22ede8d30926 SHA512 858a0cc095a4d52ce50bb77cc46a95ef64bcff1dc9526eb352b8d1d8884949186d1ea93af342eab8cf8a236efc9357bc5be2d1f1564a6f64536026bc1b894397
 DIST dialog-1.3-20191210.tar.gz 541569 BLAKE2B 358349c85afdbe9f1dc9c05b75337980c7ca3f7c6e9429314e8c24af722f696f12383b776828660441b5337c815fcf93b18076e0601e20dd940e0a8a304bb198 SHA512 4196287f26da2aab8376141a1442bccea52bcc6f7003042101df0c6a72aa3e25aa909d9fbcb937b047ab12a2e4349ec4b71b26f6e5cd4ba41cfd5665f732975d
-EBUILD dialog-1.3.20170131.ebuild 1256 BLAKE2B 537f29bc9541df308a3077c73a9fa03e09d6c1e862032d06601036be5a952523db9dbad78af642142baf0f471499a42836b6eff0275eba099fc14ac47e7ab614 SHA512 a718b05e13dfcf525e8e6b75b23d4b8fce8065f23d8ad6358f10e944467e156bce8d1d5bfce4520014431b2cce14eaf2291dc2ba8152d425d04bdec41145775c
-EBUILD dialog-1.3.20191110.ebuild 1230 BLAKE2B 0fb5f6b088617392e795d4743cb2a42ccedb5bf602cedb409e72fc33df6411e36e2885d63ab42e9fdcdc7f2c3b23f4a690126f9aac194ec0787fec459c9b44c1 SHA512 edd73cfbc608a1f7fe609c21bce4af53f63bbc0027e5ee700f0e32c3e899a6a2bab3bb74a1402fc4b4148b4e87616cb1c64c09d007ada7b1ab423bf9ff177196
-EBUILD dialog-1.3.20191210.ebuild 1230 BLAKE2B 0fb5f6b088617392e795d4743cb2a42ccedb5bf602cedb409e72fc33df6411e36e2885d63ab42e9fdcdc7f2c3b23f4a690126f9aac194ec0787fec459c9b44c1 SHA512 edd73cfbc608a1f7fe609c21bce4af53f63bbc0027e5ee700f0e32c3e899a6a2bab3bb74a1402fc4b4148b4e87616cb1c64c09d007ada7b1ab423bf9ff177196
+EBUILD dialog-1.3.20170131.ebuild 1214 BLAKE2B 66e95ce9bf13eebf6fa41cbb5a7a0014f6b48ea142dbbce3c6b97bea7b9b6f15c961280b4b5e0862ea88b61c95dd7a93bbc0410c6a44687a7eb4efeaddb5f404 SHA512 aa392873f5d60327fd9955ec3647138bfafb7a21eb29208eb299cf83148873e4c686bf48dd0f98e4dc37c2b0c07a8b1d2d486638ca2d2c676cf15cd2ce6a9af9
+EBUILD dialog-1.3.20191110.ebuild 1191 BLAKE2B 65b234c07f216c9689af30092148a715667bf05031755c6941690cd10392b9d07520da6bc3a20bda4c994ac249a99777e8ab90837e45b231705b7a8347e69ee3 SHA512 79ad367defc955861cebf64bafcff7a8ed6b9843fe21360531775b59a1c8fecd01e4aad9f61a9203da7bb654c2f1a2b73b63af82ea50a1ab6d01cee92d2aac6d
+EBUILD dialog-1.3.20191210.ebuild 1191 BLAKE2B 65b234c07f216c9689af30092148a715667bf05031755c6941690cd10392b9d07520da6bc3a20bda4c994ac249a99777e8ab90837e45b231705b7a8347e69ee3 SHA512 79ad367defc955861cebf64bafcff7a8ed6b9843fe21360531775b59a1c8fecd01e4aad9f61a9203da7bb654c2f1a2b73b63af82ea50a1ab6d01cee92d2aac6d
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index 1286a1647bd9..fc28b4a96eb0 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,6 @@ DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
 	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
 "
 
 src_prepare() {
diff --git a/dev-util/dialog/dialog-1.3.20191110.ebuild b/dev-util/dialog/dialog-1.3.20191110.ebuild
index 81549340ae07..f119f530eae5 100644
--- a/dev-util/dialog/dialog-1.3.20191110.ebuild
+++ b/dev-util/dialog/dialog-1.3.20191110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,6 @@ DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
 	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
 "
 S=${WORKDIR}/${DIA_P}
 
diff --git a/dev-util/dialog/dialog-1.3.20191210.ebuild b/dev-util/dialog/dialog-1.3.20191210.ebuild
index 81549340ae07..f119f530eae5 100644
--- a/dev-util/dialog/dialog-1.3.20191210.ebuild
+++ b/dev-util/dialog/dialog-1.3.20191210.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,6 @@ DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
 	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
 "
 S=${WORKDIR}/${DIA_P}
 
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 6c5940709391..644ed61ed67c 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1,5 @@
 DIST diffuse-0.4.8.tar.bz2 557966 BLAKE2B 97879c41db390c9e3f0b0634ab34b33021013aaa8e28b0afe98a1131772803129fa81ccc6532a921d28f0eee51c4ccfbecb400645ed4141e6d2fe669e552014e SHA512 0c62976526804a328f1cc1775f842e9575fab50309cc964171af5ee89d8f303d4cbdf66a078ed64bb8826f5a57c2cc7fc59afc1ee87646ece340212d34f2514e
-EBUILD diffuse-0.4.8.ebuild 1206 BLAKE2B a2bc2515294bd6a6734b81f9973d11505e8f39dcb9ba5aa2abf726c4fcda2ced41100f7304526eca0b84ba90642ae41a19d66dd472114b932a0aaa9584b3d89f SHA512 f2965164c8a5823457c6923961efb955043fea45a8cfe3fb71c39ef26d9387c197697b6ab4264785277512be1d6cc4b028d8ed45693109fa5592e171844098df
+DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf
+EBUILD diffuse-0.4.8-r1.ebuild 1239 BLAKE2B 8c34de327c24f6d2c376e86302ecebf020196d3c3e8aafcc8fa5367c57cc3ea2ae816eb256664436502ee708fe39dc1315811e55caca2aff56e74855de71c4e0 SHA512 b6b34b7f7609cd5aae6c0850346c99d73386ddb78dbd467ed3cd64949e10a73aa9d4c892720c53eb66c22df38ae739ce637ec1672696778812299257697470ad
+EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1416 BLAKE2B 0df539779ca60e8a2cad6e218e889439da3988307c7b95918d559d5e7220c58a9ff8faca4493985b44637a9b3839fd7ddc6fe68ac77e29164ceb746d1b0023ad SHA512 fbfc3cd53209517743dae6bea1cc5fc46acef0e64e433ed1bc6f41991097065eabd2963b205585bf2033798bed14170beec72e49d2bcda7eb49527d0d7ce3541
 MISC metadata.xml 408 BLAKE2B ab54e1b8b37a36b5b8e83d374b0ccc2468ed23a7a1a5fc855e41a748e7ae85c6fe85ecffda1f941b1e803ba0eb5cc7829984a2c520f6aecdd383f01c4a88bf96 SHA512 9c4f4f53b106582296f9cd3cd52e86587f0fb4767e01b0bb0464a19ba9aa0badd27f25b4438e1693313b685293c4db652a81c60c338e8673717a5a8ad6791458
diff --git a/dev-util/diffuse/diffuse-0.4.8-r1.ebuild b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
new file mode 100644
index 000000000000..5a0d5a3968a4
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.4.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime python-single-r1
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+	')"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	local i p
+
+	# linguas handling wrt #406433
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
+			if ! has ${i##*/} ${LINGUAS} ; then
+				rm "${S}"/${i}.po || die
+			fi
+		done
+	fi
+
+	python_fix_shebang src/usr/bin/diffuse
+}
+
+src_install() {
+	"${PYTHON}" install.py \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--files-only \
+		--destdir="${D}" \
+		|| die "Installation failed"
+	dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/dev-util/diffuse/diffuse-0.4.8.ebuild b/dev-util/diffuse/diffuse-0.4.8.ebuild
deleted file mode 100644
index 93a43809a4d2..000000000000
--- a/dev-util/diffuse/diffuse-0.4.8.ebuild
+++ /dev/null
@@ -1,57 +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 fdo-mime python-single-r1
-
-DESCRIPTION="A graphical tool to compare and merge text files"
-HOMEPAGE="http://diffuse.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-solaris"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]"
-# file collision, bug #279018
-DEPEND="${DEPEND}
-	!sci-chemistry/tinker"
-
-src_prepare() {
-	local i p
-
-	# linguas handling wrt #406433
-	if [[ -n "${LINGUAS+x}" ]] ; then
-		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
-			if ! has ${i##*/} ${LINGUAS} ; then
-				rm "${S}"/${i}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang src/usr/bin/diffuse
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		--prefix="${EPREFIX}"/usr \
-		--sysconfdir="${EPREFIX}"/etc \
-		--files-only \
-		--destdir="${D}" \
-		|| die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
new file mode 100644
index 000000000000..1cb786be52c5
--- /dev/null
+++ b/dev-util/diffuse/diffuse-0.5.0_alpha7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PLOCALES="cs de es it ja ko pl pt ru sv th zh_CN zh_TW"
+inherit python-single-r1 l10n xdg-utils
+
+DESCRIPTION="A graphical tool to compare and merge text files"
+HOMEPAGE="http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP},cairo]
+	')
+	x11-libs/gtk+:3[introspection]"
+# file collision, bug #279018
+DEPEND="${DEPEND}
+	!sci-chemistry/tinker"
+
+src_prepare() {
+	default
+	l10n_find_plocales_changes translations '' '.po'
+
+	rm_locale() {
+		rm -f translations/${1}.po
+		rm -rf src/usr/share/man/${1}
+		rm -rf src/usr/share/gnome/help/${PN}/$1
+		rm -f src/usr/share/omf/${PN}/${PN}-$1.omf
+	}
+
+	l10n_for_each_disabled_locale_do rm_locale
+}
+
+src_install() {
+	"${PYTHON}" install.py \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--files-only \
+		--destdir="${D}" \
+		|| die "Installation failed"
+	dodoc AUTHORS ChangeLog README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 657f04c9e276..14e3689fc661 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,5 +1,5 @@
 DIST dput-ng_1.10.tar.xz 82608 BLAKE2B e7b3769490ec0bf4de4f763380e9a50fd2c76778c2864a4ba45eb754f2dc4aa896e556ad86939f9bf003a68b1e185b51507dd0a015453dfb39965c63beab4964 SHA512 4a883350e7a0b47c121b752d1e0ab1470924319ef895f55742fc4d8f8a0cb3a0ab4ae18d54495ebc9229b0cbf18fa375848fcdcd2431ee1f66bff6433b9a3b08
 DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df39102b63502d99e5da73aa95efdf66e94f6226105ab2ae97a4bf8c43963784f3ddf2d03217ab5023a7a98f22 SHA512 cfd4a6143b33f29eb32b88972a204ab7a6c2f062299c76167434322ae5d6d2cf8654c5b4d1e96db90dbffe372a04e2a7691694ecf46787c7743dd9ac2b7b317e
-EBUILD dput-ng-1.10.ebuild 1715 BLAKE2B faa98615ae8c62f3acd13b8240de04ddbc8640c87ba042bc3e9e9fed5e9a6a1243811993758b24d328ab7256b0bb968a208530cf17bc7ebc81a7f31721666da5 SHA512 77c5f94d12b1f7c61d214ef6630e8ea226fdf6cf6b1a0c94fd9b2c9d8205269881722ef85b3a00083e74d85fc9c9e5f9bf8c98c6dd1e3299ed9762f5e1050626
-EBUILD dput-ng-1.28.ebuild 1790 BLAKE2B d391c59607aedc945c2c2b443c927b3e4775321dd54f9b499d86f2f39e40cb285b02818ba27ef66ca7393611b9817c9b18a22e371fd17c9ba76c8fc3edb0f22a SHA512 e3ab72d6bc9286ce896b849231a79f87aa4dee2839cf6f8857f491d031840933d0b060e20159947d1fb9c08c81be21547f7dac62a8cfa875302737655386ff2a
+EBUILD dput-ng-1.10-r1.ebuild 1807 BLAKE2B 6adc79ad7d463efaca3a1f2763d05b79380dab0ffad73f0079452eebc721396f4270345bda5288fc9e035f830a95338a8f3d3c0236d09404cf801910fe1de4ad SHA512 83dbafe37dfc865e767c94782bebaf0a85eba80bfe625517816e3e674139cdbeb2f6cc48457c054601033f7224c389d3a874245acdf4c50235f598e0902a0803
+EBUILD dput-ng-1.28-r1.ebuild 1885 BLAKE2B 58f773f840fefd7e4e344c9cb656dedec68260c15e5cf54c5d6f083acfc634a20609b2822a169f3e2006cac3314fa29016c99cb371b8f1a011680525577ca80c SHA512 02a496a285f40afee0a9c9065176a02e55a8692363e9d2c93fc789536ee65c222092a187844e2cafb2f26c32809b64c3e9463fc35b52de3fbd683a035cec56fb
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/dput-ng/dput-ng-1.10-r1.ebuild b/dev-util/dput-ng/dput-ng-1.10-r1.ebuild
new file mode 100644
index 000000000000..eef660cec5b5
--- /dev/null
+++ b/dev-util/dput-ng/dput-ng-1.10-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Next generation Debian package upload tool"
+HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN/-/}"
+
+src_compile() {
+	distutils-r1_src_compile
+
+	mkdir man || die
+	for file in docs/man/*.man; do
+		a2x --doctype manpage --format manpage -D man \
+			"${file}" || die
+	done
+}
+
+src_install() {
+	local DPUT_BINARIES=( dcut dirt dput )
+	local DPUT_ETC=( metas profiles )
+	local DPUT_SHARE=(
+		codenames
+		commands
+		hooks
+		interfaces
+		schemas
+		uploaders
+	)
+
+	distutils-r1_src_install
+
+	for binary in ${DPUT_BINARIES[@]}; do
+		dobin bin/"${binary}"
+	done
+	python_fix_shebang "${D}"/usr/bin
+
+	insinto /etc/dput.d
+	for dir in ${DPUT_ETC[@]}; do
+		doins -r skel/"${dir}"
+	done
+
+	insinto /usr/share/"${PN}"
+	for dir in ${DPUT_SHARE[@]}; do
+		doins -r skel/"${dir}"
+	done
+
+	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
+	doman -i18n="" man/*
+
+	newbashcomp debian/"${PN}".bash-completion dput
+}
+
+python_test() {
+	# test_configs.py failing
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-util/dput-ng/dput-ng-1.10.ebuild b/dev-util/dput-ng/dput-ng-1.10.ebuild
deleted file mode 100644
index 2192829fcc8c..000000000000
--- a/dev-util/dput-ng/dput-ng-1.10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Next generation Debian package upload tool"
-HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/python-debian[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-util/distro-info[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/python-debian[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN/-/}"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	mkdir man || die
-	for file in docs/man/*.man; do
-		a2x --doctype manpage --format manpage -D man \
-			"${file}" || die
-	done
-}
-
-src_install() {
-	local DPUT_BINARIES=( dcut dirt dput )
-	local DPUT_ETC=( metas profiles )
-	local DPUT_SHARE=(
-		codenames
-		commands
-		hooks
-		interfaces
-		schemas
-		uploaders
-	)
-
-	distutils-r1_src_install
-
-	for binary in ${DPUT_BINARIES[@]}; do
-		dobin bin/"${binary}"
-	done
-	python_fix_shebang "${D}"/usr/bin
-
-	insinto /etc/dput.d
-	for dir in ${DPUT_ETC[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	insinto /usr/share/"${PN}"
-	for dir in ${DPUT_SHARE[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
-	doman -i18n="" man/*
-
-	newbashcomp debian/"${PN}".bash-completion dput
-}
-
-python_test() {
-	# test_configs.py failing
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/dput-ng/dput-ng-1.28-r1.ebuild b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
new file mode 100644
index 000000000000..573ed24b99a4
--- /dev/null
+++ b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Next generation Debian package upload tool"
+HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
+		dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-util/debhelper
+	)"
+
+# Requires missing build-essential package
+RESTRICT="test"
+
+src_compile() {
+	distutils-r1_src_compile
+
+	mkdir man || die
+	for file in docs/man/*.man; do
+		a2x --doctype manpage --format manpage -D man \
+			"${file}" || die
+	done
+}
+
+src_install() {
+	local DPUT_BINARIES=( dcut dirt dput )
+	local DPUT_ETC=( metas profiles )
+	local DPUT_SHARE=(
+		codenames
+		commands
+		hooks
+		interfaces
+		schemas
+		uploaders
+	)
+
+	distutils-r1_src_install
+
+	for binary in ${DPUT_BINARIES[@]}; do
+		dobin bin/"${binary}"
+	done
+	python_fix_shebang "${D}"/usr/bin
+
+	insinto /etc/dput.d
+	for dir in ${DPUT_ETC[@]}; do
+		doins -r skel/"${dir}"
+	done
+
+	insinto /usr/share/"${PN}"
+	for dir in ${DPUT_SHARE[@]}; do
+		doins -r skel/"${dir}"
+	done
+
+	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
+	doman -i18n="" man/*
+
+	newbashcomp debian/dcut-completion dcut
+	newbashcomp debian/dput-completion dput
+}
+
+python_test() {
+	# test_configs.py failing
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-util/dput-ng/dput-ng-1.28.ebuild b/dev-util/dput-ng/dput-ng-1.28.ebuild
deleted file mode 100644
index d0864124adac..000000000000
--- a/dev-util/dput-ng/dput-ng-1.28.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Next generation Debian package upload tool"
-HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/python-debian[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-util/distro-info[python,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/python-debian[${PYTHON_USEDEP}]
-		dev-util/debhelper
-	)"
-
-# Requires missing build-essential package
-RESTRICT="test"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	mkdir man || die
-	for file in docs/man/*.man; do
-		a2x --doctype manpage --format manpage -D man \
-			"${file}" || die
-	done
-}
-
-src_install() {
-	local DPUT_BINARIES=( dcut dirt dput )
-	local DPUT_ETC=( metas profiles )
-	local DPUT_SHARE=(
-		codenames
-		commands
-		hooks
-		interfaces
-		schemas
-		uploaders
-	)
-
-	distutils-r1_src_install
-
-	for binary in ${DPUT_BINARIES[@]}; do
-		dobin bin/"${binary}"
-	done
-	python_fix_shebang "${D}"/usr/bin
-
-	insinto /etc/dput.d
-	for dir in ${DPUT_ETC[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	insinto /usr/share/"${PN}"
-	for dir in ${DPUT_SHARE[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
-	doman -i18n="" man/*
-
-	newbashcomp debian/dcut-completion dcut
-	newbashcomp debian/dput-completion dput
-}
-
-python_test() {
-	# test_configs.py failing
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 04a84e5cbfcd..803948be4f35 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,5 +1,5 @@
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
 DIST drone-cli-1.1.4.tar.gz 2843182 BLAKE2B 395501216d09f907897d3d5f7a64e93956786030a354365400e8ec73e2ecb361958f7f9468c3819a77908251450954c91db7369f803516ff2fbeb2050ad6efe7 SHA512 6a0df849f4086913137e36248925fea70e106b95225708bfd37b9a23199d4bed35c6fa18757311cfe23e8c8eef5d66acde207827a7220cec868ffe515539471f
-EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
-EBUILD drone-cli-1.1.4.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
+EBUILD drone-cli-0.8.6.ebuild 732 BLAKE2B 405771f011cff1cfae1dc57e684c58d48f697ed84d275ae8b6d7225fd7df0806c6d124279402cc83c746d2b927113122671fd5be54218138e39c6c241c449516 SHA512 15b056b185e7138eef94b2610d3d4c6c5c81843871edaad2dae22775b845d1401b77c9c17468b47a5365f596711d9bf46213a5e29e1be5fa83517c973f5b0cbd
+EBUILD drone-cli-1.1.4.ebuild 658 BLAKE2B 4136d0771d249f55c33ea9d578853605c498e1e31e1ebca6b6d247775461f4992f2852eb6a3500c48f8e710571a7de56701cf88532603372e042e4c1094ead64 SHA512 5caf3267dcab62131401c81cfd816ad1079e96601cf0a0b1b336cc570e718533c042b055205d07b27828ef2352a3cc53f6d3a780571ed54eca72eb5e89301723
 MISC metadata.xml 328 BLAKE2B c17239362178a88bf5c7d3a268b0f91ffe89f00be35df57fc19fc0b08cb00374053c422d097b93b65ae05b3580a6e4c9b3fea63777e3a3892ab9eb3d22a8b90e SHA512 4a96b4fbecd4a36dd3e5d53e66aca7a75c8e4c4bdcf34bd2a2f36bdf09ca0bf38ceff6ab49454a4b9bbfb0849ae3d129c9b585feda80075f3c69e83a74639055
diff --git a/dev-util/drone-cli/drone-cli-0.8.6.ebuild b/dev-util/drone-cli/drone-cli-0.8.6.ebuild
index 8598f228df1d..2d96ab01c279 100644
--- a/dev-util/drone-cli/drone-cli-0.8.6.ebuild
+++ b/dev-util/drone-cli/drone-cli-0.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,19 +9,16 @@ EGIT_COMMIT="800d6949bd96847b4d5c400e261b18386ea2226f"
 inherit golang-build golang-vcs-snapshot
 
 ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 
 DESCRIPTION="Command-line interface for Drone"
 HOMEPAGE="https://github.com/drone/drone-cli"
 SRC_URI="${ARCHIVE_URI}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
-
+KEYWORDS="~amd64"
 RESTRICT="test"
 
-RDEPEND="!!<dev-util/drone-0.7"
-
 src_compile() {
 	pushd src || die
 	GOPATH="${WORKDIR}/${P}"\
diff --git a/dev-util/drone-cli/drone-cli-1.1.4.ebuild b/dev-util/drone-cli/drone-cli-1.1.4.ebuild
index ca7f0b0fdc7f..fd8edac7bf3e 100644
--- a/dev-util/drone-cli/drone-cli-1.1.4.ebuild
+++ b/dev-util/drone-cli/drone-cli-1.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,19 +8,16 @@ EGO_PN="github.com/drone/drone-cli"
 inherit golang-build golang-vcs-snapshot
 
 ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 
 DESCRIPTION="Command-line interface for Drone"
 HOMEPAGE="https://github.com/drone/drone-cli"
 SRC_URI="${ARCHIVE_URI}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
-
+KEYWORDS="~amd64"
 RESTRICT="test"
 
-RDEPEND="!!<dev-util/drone-0.7"
-
 src_compile() {
 	pushd src || die
 	GOPATH="${WORKDIR}/${P}"\
diff --git a/dev-util/duma/Manifest b/dev-util/duma/Manifest
index 9efbb768488e..e6c6a3b5c2b9 100644
--- a/dev-util/duma/Manifest
+++ b/dev-util/duma/Manifest
@@ -1,5 +1,5 @@
 AUX duma-2.5.15-gcc6.patch 599 BLAKE2B 7fa6c2d42b9c1191e40854aae2bfee236b0c9f9e5360f8c59a32d9b4a89c1a5351812dadce8943848478751ce49db30d5374251a759fa5af9ce28420be64ddbe SHA512 9577e34e97b6f63654a8fa5b6ad26f54733cdd758a2a96b99c2771f9593436501b09ade40e8b20ff61da033e64c635a29b4884a6e4ea3b62fa9a4c12587cf947
 DIST duma-2.5.15-GNUmakefile.patch.bz2 4618 BLAKE2B 506127ce1f8f3d01d0443ab1240c585aa734bf3756ae632ccec8ff88f33fc0ffc5113705d5c3c31c14bf52a2cf3c82132669c2c14d24f0c6df17b8e802c8ef40 SHA512 6d83294897a60c6d0ebac388c8f791adc6a199b2c9838497bcfff39502262014c8437a331e08e3526568d3ef755a7dfdc2557771bdae89c58cd5f714eae70df2
 DIST duma_2_5_15.tar.gz 240479 BLAKE2B c79f47ba418e22a65a2ad2d4cbff796c2a620ec5f36743d543fe1260e61ec700c648033ac3c91e71be3f3e1129a1c12e9f83a91277244962cfbd494d9588d681 SHA512 0e2abdb08cfbaf9fd0a6be348c831a83ac4ee86d2297dcd1c4d625ddb4b2c1c73eef05e2b895e291d5b8076b1baea559c89d475f30e409210df4ab69b71b6345
-EBUILD duma-2.5.15-r2.ebuild 2242 BLAKE2B f995afe5c9881c45ccaf50ef1a5371bb5c8347578c5ad32e9e0d75b92c456bef23895145fba2a194a39151352f5cc028bb03ced90d1b04d8d80002d0a2517f89 SHA512 4691aeae4fb436653248344174b052eb26c41e7cc9c9eac35bb6b913a077b8513261764308286dd6e629e1c02f914083ae1f78db6337a78cd354a4a5d5048abf
+EBUILD duma-2.5.15-r2.ebuild 2218 BLAKE2B b1eaa4c46bbb9ed5e50d2b107946e772913a31f80c5e0bcdb4d1d64360633e26d92730f7a3f7e646d9186c6185c2fc6ee45e761cec81075f48be3e42b8e5fdbe SHA512 3ca62dcb14c312f20cd42721d75dd974311b1cda275076bc9021634102278f5d1e80569d049964edd0ae7fbdeaf2a0212be4dc14047ca8c2d16b93797ac4dfc8
 MISC metadata.xml 600 BLAKE2B ad3ed230f64bc5ead8d50bf7f8949e783ad95f90efbd5bbf8a8a39e6a4a7876d3a4371a5116096d53ba24866accdb6498c816f87da40885f9f7359921bcdeff0 SHA512 f849e5c61d27430f2c7de1f86ac9f12b8424571703e08661bccb0415743bf2e88aea981e72a5b1c287c949c6634e975c5e3f9882b9a29171389bed998c352f08
diff --git a/dev-util/duma/duma-2.5.15-r2.ebuild b/dev-util/duma/duma-2.5.15-r2.ebuild
index 5f6cbd88a61c..411a077e3369 100644
--- a/dev-util/duma/duma-2.5.15-r2.ebuild
+++ b/dev-util/duma/duma-2.5.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -78,8 +78,8 @@ src_install(){
 	dodoc CHANGELOG TODO GNUmakefile
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins example[1-6].cpp example_makes/ex6/Makefile
+		docinto examples
+		dodoc example[1-6].cpp example_makes/ex6/Makefile
 	fi
 }
 
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index cae532728efb..5fb9e2722140 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -12,5 +12,5 @@ DIST electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz 50344964 BLAK
 DIST electron-patches-26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz 115022 BLAKE2B 04f0982d9ac63068fd9e83f53341e43fec8f375d9591777dbcb6612213ecf0473be6d38883cdf0f99fe412f65b494d8765818260ecefd9e77dbd503d5459d9be SHA512 8d05f21d2ab4242cd896f58d1608ccee5ba3b65dae73cacb2261458e2f163e216176276d036cf8fe3375c06a94d08f7a04af79e92eb3d4312d975acd870103d8
 DIST electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-EBUILD electron-2.0.17-r2.ebuild 28921 BLAKE2B 4bb9577d604a2cc9f074a4ae46f643ba151fbd049384c662c2246543d96b745426f5a36920c1fde2af45216fc80c6d6bc4f95f011fe709ba4b7faee7a8add859 SHA512 e0fb2e9504baafb376f5fb5a16aa8126f33a7f0f752ef87e2887af5e59e49a0c45fe49b6805bbd5d6cf30bb336892f4fda24e427f4652990cca9c688483c02e7
-MISC metadata.xml 1187 BLAKE2B f248c347af37f080c18430b63ecae6c5c81e9cffa78dc83abf95a11727031bcb448fcf08667c058d09dd43d7e4ea85348f7512392c76f98cc00a3968897d8682 SHA512 51f6c09e9303148c4d0d5bd1630ca3d799df78fd8dbcc76f257ea0f177d2cc2691ae140f676b98fc334bc186b738a730bd75dcdda7054e549cc274d219055da3
+EBUILD electron-2.0.17-r2.ebuild 28862 BLAKE2B 9d92558ab120edfc36894f63b657985820a71c4195021881845cc80d6d3a4f8402f2aab2efd8ec05fd9bc7d789ee9b2dbb8236e4dbcf72edc5be590e91b9ab66 SHA512 a676179f9307f6b06c3e7836deb3da1dd98cb95bd047dacabbb0c7f52e2dc4ee8911b4e58497cf208e917e7f64a7ac3ac1c5c6e00b413432d7c2f5bea8601d25
+MISC metadata.xml 1044 BLAKE2B 27a2ca05df19d0ce20ea4840b15666a029b6d1373dc19ca7fad6be5cf8e4f3575c78e2b7e860bbc840834d182d1067cab721b615de2c7b9ed0ad8ff1ba715d19 SHA512 4142fd1aa0d4a9e5d55655cc137fe915f3d56dbda71b680c00b6ab66eab6ebb358949be371fe14c86754a6dae24ce18cfca0f441845998a5e33645fabf418176
diff --git a/dev-util/electron/electron-2.0.17-r2.ebuild b/dev-util/electron/electron-2.0.17-r2.ebuild
index a286e7926afe..46cb2bffaee1 100644
--- a/dev-util/electron/electron-2.0.17-r2.ebuild
+++ b/dev-util/electron/electron-2.0.17-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -124,7 +124,6 @@ COMMON_DEPEND="
 			media-video/ffmpeg[-samba]
 			>=net-fs/samba-4.5.10-r1[-debug(-)]
 		)
-		!=net-fs/samba-4.5.12-r0
 		media-libs/opus:=
 	)
 	>=net-dns/c-ares-1.13.0:=
@@ -157,7 +156,6 @@ COMMON_DEPEND="
 "
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND="${COMMON_DEPEND}
-	!<dev-util/electron-0.36.12-r4
 	x11-misc/xdg-utils
 	virtual/opengl
 	virtual/ttf-fonts
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
index fde29b921837..382b50dd07db 100644
--- a/dev-util/electron/metadata.xml
+++ b/dev-util/electron/metadata.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
-	<longdescription>Electron is a cross platform application development framework based on web technologies based on Chromium</longdescription>
 	<use>
 		<flag name="gconf">Use gnome-base/gconf</flag>
 		<flag name="lto">Build with link time optimization enabled</flag>
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 253618d149e9..54833e1c69cb 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,5 +1,5 @@
 DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
 DIST eric6-19.11.tar.gz 16241807 BLAKE2B bd8284164c6c191e91fc08bc42f594107ebab50f71a980ef331d42fbd8d9c488d5674b2f53665718a6e723a228e838d082095fc3c3b2d40c3fb350c5be9a98ee SHA512 a8305c5185687d62231926bd4c484f3786ac1c20d125a1f8fb1b6bc0d42c57ba92bf00aaffd8699f8d7594c6432896bef8db13da85513ba4f217a60223f2f533
-EBUILD eric-18.03.ebuild 1890 BLAKE2B 4b88d3921fd5f3ab9d3a21a5eca1de9b7a914382f731578de66039fc3cf6a96bf261296e990b08501df99e1862dcec4c02d44a06a14daaa3dc9784c7e9fd40a8 SHA512 45d1567fc9e1519746441ed7853600d18c7aabfaf3bba343af02d4d0fc2006f6c486b953cd34c80363dd33478896ba90f90aec1a7919f385a1572ea2c4bb0e17
-EBUILD eric-19.11.ebuild 1381 BLAKE2B 360c32ca7d04511139008ab1902d7e606d4bd3c19e8f376b7fc56471f0e3bfd71ee3258351625a2a052bab0b66cca4eaceb4f0e71537af0057c823bf21695a3b SHA512 214d0b9b90ef9ac3935be9f931a0c4adf8d74ff0967ddbae14d1d88589f61d18606dbceef35baf7759a798e7c6368360aa8320787e1b34b88e19f715d68bbeab
+EBUILD eric-18.03.ebuild 2006 BLAKE2B cdb9fa4fde6f525b8c07ee26766735e4f262306c4f2cd8e2dec4fdefa73e92ca3cd3873d372118e552acd12885c73a181ac1f980fa73796654438bd2956527f2 SHA512 190a12f66be031dbca1e4d566f0a6e3a1ae11a1cfe770984205a3b9cb34f1afd78e3f79b40115c68d751e25d7d7f6a95bc223d4af1528f7dcdcdd2d8419f2398
+EBUILD eric-19.11-r1.ebuild 1488 BLAKE2B a37b87b2fe72c30cbf2a2c7a0ea196a143fa5cd5235ef2ef1e32016951676a08bfdbd9bf3927915d59d22de7c7d7641a9f39b6a79a097a69080e58a67c21e8a9 SHA512 5dd51dbb756ee8545a16846415e22636b7850b9d319d75faac2cdf33ce460eee2d28b9766bf689e1fb70a3e4fc028e35a7be4950fc9d7d5e800bba3e63778ccd
 MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild
index 3e51fdbe81d8..c67b729ada77 100644
--- a/dev-util/eric/eric-18.03.ebuild
+++ b/dev-util/eric/eric-18.03.ebuild
@@ -19,18 +19,22 @@ IUSE=""
 
 DEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/sip-4.14.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_MULTI_USEDEP}]
+	')
 "
 RDEPEND="${DEPEND}
-	|| (
-		dev-python/PyQt5[help,webengine,${PYTHON_USEDEP}]
-		dev-python/PyQt5[help,webkit,${PYTHON_USEDEP}]
-	)
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/PyQt5[help,webengine,${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[help,webkit,${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/coverage-4.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
+	')
 	!dev-util/eric:4
 	!dev-util/eric:5
 "
diff --git a/dev-util/eric/eric-19.11-r1.ebuild b/dev-util/eric/eric-19.11-r1.ebuild
new file mode 100644
index 000000000000..bb8cee447042
--- /dev/null
+++ b/dev-util/eric/eric-19.11-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite,xml"
+inherit python-single-r1 xdg
+
+MY_P=${PN}6-${PV}
+
+DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
+HOMEPAGE="https://eric-ide.python-projects.org/"
+SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="6"
+KEYWORDS="~amd64 ~x86"
+IUSE="spell"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+		dev-python/qscintilla-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		spell? ( dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( eric/docs/{changelog,README.rst,README-eric6-doc.rst,README-passive-debugging.rst,THANKS} )
+
+src_prepare() {
+	default
+
+	# Delete internal copies of dev-python/chardet and dev-python/pygments
+	rm -fr eric/eric6/ThirdParty/{CharDet,Pygments} || die
+}
+
+src_install() {
+	yes n | "${PYTHON}" install.py \
+		-b "${EPREFIX}/usr/bin" \
+		-d "$(python_get_sitedir)" \
+		-i "${D}" \
+		-c \
+		-z \
+		|| die
+
+	python_optimize
+	einstalldocs
+}
diff --git a/dev-util/eric/eric-19.11.ebuild b/dev-util/eric/eric-19.11.ebuild
deleted file mode 100644
index 425d51c2062c..000000000000
--- a/dev-util/eric/eric-19.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg
-
-MY_P=${PN}6-${PV}
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	dev-python/qscintilla-python[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( eric/docs/{changelog,README.rst,README-eric6-doc.rst,README-passive-debugging.rst,THANKS} )
-
-src_prepare() {
-	default
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/eric6/ThirdParty/{CharDet,Pygments} || die
-}
-
-src_install() {
-	yes n | "${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-	einstalldocs
-}
diff --git a/dev-util/fix-la-relink-command/Manifest b/dev-util/fix-la-relink-command/Manifest
index 0e4a197e70d6..7d94a5e0cab1 100644
--- a/dev-util/fix-la-relink-command/Manifest
+++ b/dev-util/fix-la-relink-command/Manifest
@@ -1,3 +1,3 @@
 DIST fix-la-relink-command-0.1.1.tar.xz 5072 BLAKE2B 6307e92fe27612fab088d54ec74809450dc1cac6a6ed86a4779b758c0cbd058239c9bb9151579d408efa354b32b82e5b1dc4bfd65cdacc8abf1ad2bcb84eca26 SHA512 3b3f7f467f932d7737ec1d2cc7d2a71c65d34da4fde3451d6ac8d3545adf564cb2b5c352d89bc580f5f9c19352bfa8eccbecf2eb7bf8b968579d4e4e3bd901bd
-EBUILD fix-la-relink-command-0.1.1.ebuild 709 BLAKE2B 3281304276bf48d7317787c897986d54042da19ac36aed2e3b40cd2d7d426b752672d0361e8ba6583b1d418e7eb33754097fea9b84484f6f96d2cc56ca45bba6 SHA512 30d2cc5ee6883bb4fb5ea95ab8a746b4540593efcf4368e06733bf8ba1c2b5c9491601c10d64403540cd0de364115b5e353537e128f255fd485bb4f079692737
+EBUILD fix-la-relink-command-0.1.1.ebuild 725 BLAKE2B 18a765ebf7b15b16b44ed2e50e51e3f85e1b11a7d921d613b047c1f922cc1758e344eeae4cf639bf12bad1230dddd71271116b77eec7a03086733ed25f787326 SHA512 bc5e352276b1594b7b82026cf6c123f8b709dcaa081c0d8a189f5cd9116d1901b75420e9a927dca786c9861e66220313230caa347395baa06ac9f9a18ffac872
 MISC metadata.xml 247 BLAKE2B c244172cf21ef0085614acb7d2006a342cbb76f77b22de463ab9d9bd1fd8d034ca3c1c8c26aaa4277fecc17d3406d25fa4531d33b58c351ced84020f9df11588 SHA512 4263d2fe40531a2b7495e54d9bbd15557b1f8510a5926f07b1a5ad4446c6dd04f099b5f990483006e6327d7e673f752b4fe63cea60691ab7a3d8722e0f9a82c4
diff --git a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
index aed86719c6a6..cd9b69fc87a2 100644
--- a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
+++ b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI="4"
 
 DESCRIPTION="Helps prevent .la files from relinking to libraries outside a build tree"
-HOMEPAGE="https://dev.gentoo.org/~tetromino/distfiles/${PN}"
+HOMEPAGE="https://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command"
 SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 4a933782415c..8732b6a7c720 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,7 +1,7 @@
 DIST gcovr-3.3.tar.gz 323226 BLAKE2B fe3d6ab4d24032f57ee17c3fc44b10e0b177aad01b072306a99abc7dbfee07b5f14ef34412d36938302bc279dffb2a25502981ba952339c1b4e896762defabb0 SHA512 e5046bc4e38c99691c3bcc58abdfbbe965c46d02c8c50dbf135bd5108bd9bba1fa450ab0b5e23157a178f7c1303ec9c285470e9be1a14274528e5d7051013a08
 DIST gcovr-4.1.tar.gz 193692 BLAKE2B 5536ecbf0636a3a75083d53e2dc239a48e6df740a037954a2aa2e837e764c0530c73fe32c66078efa4c3a6652f907ec15505c8efbac8a1d861031d34b05f4c74 SHA512 aab2a98421557ffe846f644725e5c6cee65afb0c22ca86ce8713516810bc91bd32caf4c5c18e2628f8f4444de6665478a6001cfce3841a8c394fc0b4309d83fb
 DIST gcovr-4.2.tar.gz 222847 BLAKE2B 44864c89b58b526c5afc293168c8af2c9082a99e92f2315485f10430fa5ff959046d189c018e0fa121ff4e9fc3685c13b737c112856c841966052d5fd6c9169a SHA512 bf9e22a58b8390eca391dc8f6ba58c4ca0765e66f18ac6f8d8f80609411df2bab74a846eb179a1aded81b7774fa8a8121bb2d586556aeaf43fd729205b0d0c72
-EBUILD gcovr-3.3.ebuild 440 BLAKE2B 2ce028e987cd62e59f0ea5c6b8412c36f71409dd8c087934bcf0d0b34df5f1c829b9dd5335cd575a952a60213b0ed056b6804f985bcd6f46a0007c769f63c2ac SHA512 c9da775e573658ee505a43c150ba61f88f124250ee20709a851ceef06a480147a416bc384f848741ee0c2d9b54def0b32256fe264c4e7d787f0ac5ff82d8a4fb
+EBUILD gcovr-3.3.ebuild 434 BLAKE2B 249d16231b14bb28164ea71c8cc654a806dd5cd74d21df8913d62a7c3c1448188fe4e72de5c2695cbdc6643125c11ec7e71da0732b53de2d4e0b187797a083fd SHA512 05e7a67f75189b60d5828bc7ede6d1beef7654c1e985b65cb9e0ae5dda95f03e5213575b584fb64b1de1f1129d09e90dd1be04315e426f09ab1d1c661777422a
 EBUILD gcovr-4.1.ebuild 792 BLAKE2B b7d05bf463adde193ac222a9fcb675f38612074b32a52c471bebd61aa861e5149d64c1be81e60e94ec614acf6d2a9fb9c2d4fea1d1d85853d3192cee360b9903 SHA512 a2315910bc8595aa066abed1a08acee5dc933d11081c72b61ae518e8513b54fb47680b64990c195b64c0c8b42aab28a08e7325091bd6b4defc097960b9c405c6
-EBUILD gcovr-4.2.ebuild 994 BLAKE2B 8149d03da3e5d48ae99ca3ff83ea5a46813a27fea2d759d3529f6e33e9b22e2e0e8509c92dae58b7628d2885ed43006aa99296a09a76a88d27639c3de8023659 SHA512 c5386347cb7285efebdd170b45a2fa06314a755befd2bc3e6708e288044c3fc0716acdd5450d5533d55a14483a4e16fe5db623371b555fdc7ce61cf8bb9291e5
+EBUILD gcovr-4.2.ebuild 984 BLAKE2B fe009444cfe12cc94e628954563493d6725a69b5a291bd53ead78ea0120b59d5080ab6fc1aef772d5abe6ed2672cd85d2df0bdf1b668f3633f70cec96c85776f SHA512 afa17145a36a2f5204b6e058acfb335757cafe9b49e74973f892d4d7bb31671c8506f011544509798a6f9c770540fb8e5e51c4666399900099ff6fac52477632
 MISC metadata.xml 404 BLAKE2B 0c1ac87d95e969877abd8993c95d6b723d0faaf645093cc01c3c88dbadce84a218a12d4f799a1e95535d67fcdc5725b02d95cc8b53408af04a1c81382bf223c8 SHA512 472f35c3e963a0eb02f8ede9f996bad20a6b67f364c5b2f40b37b90d552dbc1414af5c01862cd4ed7586a6e02cc10a408134cca6eb994f0b897f2fdef3a2054a
diff --git a/dev-util/gcovr/gcovr-3.3.ebuild b/dev-util/gcovr/gcovr-3.3.ebuild
index bb2e1eb9d28a..3f985aa16771 100644
--- a/dev-util/gcovr/gcovr-3.3.ebuild
+++ b/dev-util/gcovr/gcovr-3.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-util/gcovr/gcovr-4.2.ebuild b/dev-util/gcovr/gcovr-4.2.ebuild
index 52a5d6a028fa..a05006b79490 100644
--- a/dev-util/gcovr/gcovr-4.2.ebuild
+++ b/dev-util/gcovr/gcovr-4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index c0ba27e4dd45..66b199e13d9b 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -2,8 +2,8 @@ DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b
 DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
 DIST geany-plugins-1.35.tar.gz 4656963 BLAKE2B c7c96c7bbd1d17083f75a90eaa741277626db8aeb693cb78d3fcca57136923c58eba1755cc55263d431ff7a992e22b365f91be5e424b4f02eb25299ae3d3cd93 SHA512 9fedb4237096d939919fa40c39a7d19debb19211260a2797b5566c555052dcd8bf9a31a694d057f1dcded794bc75883d0007f8dd9427e3d899434fbf0e8a8e9f
 DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
-EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B 61a4d3d60156efad049b864f267b97b2349b1eb4bd873fa2975fa7e377a66327c4896692c8dc5de6e861873dbe88c0a287d15b639f97a6e0eb170d7eda1f9c6f SHA512 ab960ec6232fbc5b00b3a3eab9475e9d6d5d85219be73bd151ca008d0d2bfc95bac68ccf8f02f47406a701cfa922640315f5ac8d06c2b213abbfa8c5091229a6
-EBUILD geany-plugins-1.34.ebuild 3353 BLAKE2B 34f8a867bd36cf421f694f3ca49faf907b5af79c2ee5f8892d783dcc35fd20d2e2eea767a84c669a6cc770ef2a0b4f77611853f003e516c74900c87dc1bade69 SHA512 bde345d29949e24609328f0571f5ef9651df04b483d06d6349ceeb0db69da57f086c2bda6e52f4b7c9d6c73dccfe5c990dccd3494cd9b4a5cd64b45864118c3c
-EBUILD geany-plugins-1.35.ebuild 3320 BLAKE2B 7c45615b64fb07efddd969116849a251a5b9fb0883b8383719a3dcbc99021a9d059e52efd770e75d97d38911c46a1f2942ed945a46a0386ff2d8a8d9020b91e1 SHA512 7f884d9c6d78f87562e84f9ba582540ca58c604c4158c0c2168e5213e9baae38164ea05cb45ee5e00cd080bc4d65df4e164f02bd6fe632b41fb541292234f710
-EBUILD geany-plugins-1.36.ebuild 3385 BLAKE2B a9512e0e21dd6e5b2eebf44db0c51042d352cc7cccfd65116c4ec475bbd7da9bbd12956f5a31bd06693b991855728a66e6e94ee3b0400010f1340984d9e091b3 SHA512 c62c347df8846cf86f682454b09e3a1d1ed3ccd58c4f7e5087935ed6456ff9cf3f8e1d300aebc4e16ba1d53d709857344fc7cbce61a2baff9d344aa14e6150d2
+EBUILD geany-plugins-1.30.ebuild 3476 BLAKE2B 05ce46c11225923dae92c85f2ee22610f89174d17e4477e60968a7f45c365d0eab65a5dc31033646ad3d631f374dab1e8f9998a3f1537ac318f765b434ed2285 SHA512 b9a1c7a11f3ef6777ab5df13b23e49bb9bf94199290e48b50cc3a8d90e1aa835cea951a41105ee0e70348335d1137c1ad2a3efd5f70ce8ac0dcdecaa8f80a94e
+EBUILD geany-plugins-1.34-r1.ebuild 3389 BLAKE2B f5b8ad2fd7381e2430189bbb26004508c93373c2794a9dda09a362c030cf54674feb086f4018071278f51d62702ec38d7ee596575409d0f6cc91e0f5245eb557 SHA512 409833863b6d1a6b12ac16bbad915b910d9fc1a59067a52039a170751da0e4f9a06e16bb2e98ad4f3503ff886a74327a4f63986e72b3550b7c6d4a09441b07d0
+EBUILD geany-plugins-1.35.ebuild 3358 BLAKE2B 917d11c0797871d74e4db1a08264f7ee539b32a4cd78d523b51a45b89621dd1011e47e262f9c5170168e62c55246cc92608273a0f9df8bbc9e952f8bfffa076e SHA512 7c77e1266185fc4569f10c56fc6d1dfc11dbe7ff7bb199ace577a0483a89e3f4426c84390f761407c56d379da098592c7fb5519ff144b910bb64f5834cfcc2a4
+EBUILD geany-plugins-1.36-r1.ebuild 3423 BLAKE2B 83e441ff75fa3fb15c7c3c66fd224cbe6dc4e87063972d995274fc0c6ad5d883324569732a9979e57b43c53d57804fd5633976838136d84fa8fd48f355026dce SHA512 05d59bf153c3ff2dd45af7c8dde95a54ef9aaea609209fceeba40c2e99082dd1abc86b4a6af3c738b5703cd8e0222a211007171c59ac482222d01917ad69205b
 MISC metadata.xml 1647 BLAKE2B b46873a3918b3506a6331aecf522f78467c4ab88e3d9f1b3caa300afbb83986f377d193ed2da43246eacb3ea104396989569f3e8ea663ee766c580d6b96abac5 SHA512 0030c7fb50c9ed0da05c34ef122762c86a5b9f8345403e80cd2cdff0447a62980608ca7ee484520eb097907bc6d9dfe4b390b0d4888775e3b4125d3ccd198d94
diff --git a/dev-util/geany-plugins/geany-plugins-1.30.ebuild b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
index 10881860323d..3a4674f90cda 100644
--- a/dev-util/geany-plugins/geany-plugins-1.30.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.30.ebuild
@@ -47,7 +47,9 @@ COMMON_DEPEND="
 		>=x11-libs/vte-0.28:0
 		)
 	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 		)
 	scope? ( x11-libs/vte:0 )
diff --git a/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
new file mode 100644
index 000000000000..857c3af11c6e
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.34-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vala
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
+
+IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
+REQUIRED_USE="
+	gtk3? ( !debugger !multiterm !python )
+	!gtk3? ( !markdown )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.34[gtk3=]
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	ctags? ( dev-util/ctags )
+	debugger? ( x11-libs/vte:0 )
+	enchant? ( app-text/enchant:= )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? (
+		gtk3? ( app-text/gtkspell:3= )
+		!gtk3? ( app-text/gtkspell:2 )
+		)
+	lua? ( dev-lang/lua:0= )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk
+		)
+	multiterm? (
+		$(vala_depend)
+		>=x11-libs/vte-0.28:0
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+		)
+	scope? (
+		gtk3? ( x11-libs/vte:2.91 )
+		!gtk3? ( x11-libs/vte:0 )
+		)
+	soup? ( net-libs/libsoup:2.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	scope? ( sys-devel/gdb )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use multiterm && vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-workbench
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable !gtk3 geanydoc)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable python geanypy)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable multiterm)
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/geany-plugins/geany-plugins-1.34.ebuild b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
deleted file mode 100644
index 536edca351fb..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.34.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python )
-	!gtk3? ( !markdown )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.34[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk
-		)
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED%/}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany-plugins/geany-plugins-1.35.ebuild b/dev-util/geany-plugins/geany-plugins-1.35.ebuild
index c3025970983d..dd3e32e86691 100644
--- a/dev-util/geany-plugins/geany-plugins-1.35.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.35.ebuild
@@ -47,7 +47,9 @@ DEPEND="
 		)
 	pretty-printer? ( dev-libs/libxml2:2 )
 	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 		)
 	scope? (
diff --git a/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild b/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
new file mode 100644
index 000000000000..a52dca03895f
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.36-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vala
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+
+IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup workbench"
+REQUIRED_USE="
+	gtk3? ( !multiterm !python )
+	!gtk3? ( !markdown )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.35[gtk3=]
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	ctags? ( dev-util/ctags )
+	debugger? (
+		gtk3? ( x11-libs/vte:2.91 )
+		!gtk3? ( x11-libs/vte:0 )
+		)
+	enchant? ( app-text/enchant:= )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? (
+		gtk3? ( app-text/gtkspell:3= )
+		!gtk3? ( app-text/gtkspell:2 )
+		)
+	lua? ( dev-lang/lua:0= )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:4
+		)
+	multiterm? (
+		$(vala_depend)
+		>=x11-libs/vte-0.28:0
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+		)
+	scope? (
+		gtk3? ( x11-libs/vte:2.91 )
+		!gtk3? ( x11-libs/vte:0 )
+		)
+	soup? ( net-libs/libsoup:2.4 )
+	workbench? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}
+	scope? ( sys-devel/gdb )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use multiterm && vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable !gtk3 geanydoc)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable python geanypy)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable multiterm)
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable workbench)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/geany-plugins/geany-plugins-1.36.ebuild b/dev-util/geany-plugins/geany-plugins-1.36.ebuild
deleted file mode 100644
index 6df50af83e16..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.36.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-
-IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup workbench"
-REQUIRED_USE="
-	gtk3? ( !multiterm !python )
-	!gtk3? ( !markdown )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-util/geany-1.35[gtk3=]
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	enchant? ( app-text/enchant:= )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	markdown? (
-		app-text/discount
-		net-libs/webkit-gtk:4
-		)
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-	scope? (
-		gtk3? ( x11-libs/vte:2.91 )
-		!gtk3? ( x11-libs/vte:0 )
-		)
-	soup? ( net-libs/libsoup:2.4 )
-	workbench? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}
-	scope? ( sys-devel/gdb )
-"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-vimode
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		$(use_enable workbench)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index 0345190af973..16618c89d029 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,4 +1,4 @@
 DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
-EBUILD gertty-1.6.0-r1.ebuild 1241 BLAKE2B 13b30cecfec294f927e056ffbe24c8dd77adb7dd1d5259665d4ff5cca69695d780d2be82304e036df6eb33965043909167ade6ea25017d2ee635789e4365b2fc SHA512 ba57686647c57209560996843997be9f73fa3b1755f1ba5cd80656d891bf03a68e9d37ff5adb883beea7af91502a3c8c36d9ec16d0d0d66308cedbaf8310e10f
-EBUILD gertty-9999.ebuild 1243 BLAKE2B 887fb2e6773a5bbb1afb82f3003fbee37ef4df38bbae2919f1fa039170de20855d46956be9d6c118324eb17868bd17a7e8540e56855feb8bff06e5afaccd8aa7 SHA512 5039a851bc1d72fa716ea47f550ca6bf1b10fe1647a1859fbfffa779908d6b2d624cdcb043bea245dc3be1484aebe6860d917e3f325c43e8d030f5f73678d6fc
-MISC metadata.xml 500 BLAKE2B 0310d985bd0b3824fcf1522d04cbb253fcb3507b96a75073e0e37481cdc7aaf03da638a592bb1470d17e758f2fbcbd6c60d046a7f7ffa18d3c8a6aced2daa76b SHA512 8a39f2a1e526fa077354eacf6a318b4cb11b7a1ec37f2928578bfb13f7d509226a30c0b2b94e6da070e602e54e02fbce0b2129f9421db1f6981eed1e781493f3
+EBUILD gertty-1.6.0-r1.ebuild 1197 BLAKE2B 03abee5914e5cf2483d178323eccb428077ae6176db11b82ce9595cbfe30a2c14e45e685bf1c69f862fc5693d9834caa8b412a0573f3a13db5ea498d64c20bf3 SHA512 2a43f3a43e6e4d99aa657c452ac889d8bd271d85841f74f3a5e829564329dbc7823603daefccbe7832ac46951d003e2902f44eef1419329eaa0afeaffdba5cc3
+EBUILD gertty-9999.ebuild 1199 BLAKE2B 6eb5442bb8ec3aa01a57505805f9e2e62e337f3d98ed2e9a2f135efc4bd3fcacdd4483a2b5e94e836a950903fae94b4314da295bcdbedd3212d13ce658ba9a2b SHA512 560803e94b3386aeeff1495d1810064b2938b781b2c2a9ea3482442a20a5d971993688e20c694a1f06be7ed08178d18eb7277a7993c5d98d324a560abd612a91
+MISC metadata.xml 379 BLAKE2B b46a401263c266a0900d16e3c63e3bf5dd2a6b9d85d81e119ad88270530fb1a5345d6853683bfebe22738192e12f18c0bbd02390bcf540ac1a122ba5f4fba675 SHA512 a37a6ec1e287489f1c8f9058829b927d7ebdca15024fe01643cc888ae45e4567ee9a7897f4d0e4d0facfea89605f2db9c04170b974cf8e9ce9aed43e405d3b84
diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index cba65e08b2ed..357e03afb462 100644
--- a/dev-util/gertty/gertty-1.6.0-r1.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -28,7 +28,6 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 9cb8603575a9..1f82d9932882 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -28,7 +28,6 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
 	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/metadata.xml b/dev-util/gertty/metadata.xml
index fa43bcc48af5..3fb64a2f54dc 100644
--- a/dev-util/gertty/metadata.xml
+++ b/dev-util/gertty/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Gertty is a console-based interface to the Gerrit Code Review system.
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">gertty</remote-id>
 		<remote-id type="github">openstack/gertty</remote-id>
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 5a900a6143e5..d836550011f4 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
-EBUILD glade-3.22.1.ebuild 2304 BLAKE2B dbdd31414bd310486cd4047440f6a04b69e03fb3a219b65533ae9d6e619b82fcbb7ed6c98fbcacacebe43cbe3248bb27f04d0b26e3f6f3c9bdd46605242e9e27 SHA512 2c7d9325d782774afa94a1030d128e352ebdbca462dc2ae696620d2440b73808fb17e6d9710518483cc46c819ec53831dc6dd70605fcc0bef46eda046ee2ec54
+EBUILD glade-3.22.1-r1.ebuild 2343 BLAKE2B 93c4d4e44d12d882e611675681a2df462788f5945c09f5b83dfffce1eb4c8d9582e48effa6198aecbb58dd3b66e46c29381764ca152353ea9d8dadfd9316d310 SHA512 3428c28c9dbbbcfa4f8ce3296dea55b22245597d31d6966d74cf530640e2e231f4c94a785df1d2c662b9bfc0353a4a7cacd53a8ca57337d3b9a7f821cfb96e6b
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1-r1.ebuild b/dev-util/glade/glade-3.22.1-r1.ebuild
new file mode 100644
index 000000000000..bfb3e487bea2
--- /dev/null
+++ b/dev-util/glade/glade-3.22.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 virtualx
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="https://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
+
+IUSE="debug +introspection python webkit"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/atk[introspection?]
+	>=dev-libs/glib-2.53.2:2
+	>=dev-libs/libxml2-2.4.0:2
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.20.0:3[introspection?]
+	x11-libs/pango[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	dev-util/itstool
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf requires:
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+
+RESTRICT="test" # https://gitlab.gnome.org/GNOME/glade/issues/333
+
+PATCHES=(
+	# To avoid file collison with other slots, rename help module.
+	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
+	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gladeui \
+		--enable-libtool-lock \
+		$(usex debug --enable-debug ' ') \
+		$(use_enable introspection) \
+		$(use_enable python) \
+		$(use_enable webkit webkit2gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
+	sed -e 's:name="gladeui":name="gladeui-2":' \
+		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version dev-util/devhelp ; then
+		elog "You may want to install dev-util/devhelp for integration API"
+		elog "documentation support."
+	fi
+}
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
deleted file mode 100644
index 797621143e6a..000000000000
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
-
-IUSE="debug +introspection python webkit"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.53.2:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.20.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-RESTRICT="test" # https://gitlab.gnome.org/GNOME/glade/issues/333
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable webkit webkit2gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index bdfa11c86916..4dea2e7aa157 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -5,5 +5,5 @@ DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679
 DIST gn-0.1616.tar.xz 660332 BLAKE2B dab581d9f05cbe7ed91758d0ec68c61bd4e9fd0357b9cfa04f5276185ed6e810b37d9e2177cf3daec29e25633af2d32c6f733507a77cee7e37681bb977a59818 SHA512 42f68b40eebc423b785b1ba735548b3e5d2b64abd0dc1bb22940b9336c491308f062f547f81b5366c1dfe1f0e3bb41390ed3e3712637765cac1a50499a5e04d2
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
 EBUILD gn-0.1544.ebuild 1202 BLAKE2B c4af8539a46361bedc5bb0d214b36c5fad5fff7e5fe541ad53db4dde9d322988461d826b4f3ce4d1888b3eb6a897d6332efff066f1b1a8b49d4c0beb8c90097a SHA512 4b6544fc24a36e926fa72eb7856cbd47d635ff9c800683105830d12b287b4edc3e410cdf8d74523602e94ee615bba8f650109b8eef930cb1dc65ded4c02a6624
-EBUILD gn-0.1616.ebuild 1212 BLAKE2B 228cf9ab96233a0988236a7579d57ccceb29d2595ff59761fa6520ce53b04b437b2c08709b667d22dc12c55fb3723fa5964b1c5fa311f070526a7f811d4aff15 SHA512 57dc9817674e9d64957327f6ea19009ba77a3ec7313f695e5cc59fda3f34201d72fe61f1460e9b2c7745a462e46ad4a8119a4b5b287822d3a54e7eeeabc8115f
+EBUILD gn-0.1616.ebuild 1206 BLAKE2B a86a974723a4f08f00f079fb201881e611a31482a6e739d19f13d49ad1ee1ad8000df1425dcfd6b4a073543ccf151eafa20d94c6173b2df26dae9a179a5bb149 SHA512 b45b2280e03ba74f60b48a6b719937efe1b88955cfd277f442b1ce555d1c2751f6babc1591d8ffad8747b296503cfc77001cf548948ce4f8c909f47d773bf7b2
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/gn-0.1616.ebuild b/dev-util/gn/gn-0.1616.ebuild
index 701ddaca2fa5..4f6815837be9 100644
--- a/dev-util/gn/gn-0.1616.ebuild
+++ b/dev-util/gn/gn-0.1616.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit ninja-utils python-any-r1 toolchain-funcs
 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index c017d97162d5..2e5f3ebee5c0 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -2,6 +2,6 @@ AUX 3.32.4-optional-vala.patch 898 BLAKE2B ed1ed208eb7b38a2dacee42e0e699c605c863
 DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7 SHA512 468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f
 DIST gnome-builder-3.32.4-patchset.tar.xz 34740 BLAKE2B 6e29ce42b2b1878b5fcec7cf057bcdc015da8817d7f9209f4d03e02bb5837525e329d0627d4465123fb20a0a46415053d7e08b445634659123ebff12d2fb9d09 SHA512 494cf1ff370c7d86d42ec352966169e73b99556dc5a1be0bf0ec53cd78e8550897bb44187ae8f471fe3e10a85dc7d44d44c5edef0569b1d0a7dff7b5d78b1fa1
 DIST gnome-builder-3.32.4.tar.xz 11886980 BLAKE2B a7901566238dd39fe180d1e47089d7f99018be115f407d174472a8371374361fe50f2f15cb6d496a1afa3e30117d83788944636fb6a9487d4a719442ba6ae744 SHA512 a050161465edd448b0359ff781bf97b0cda6c184ea4f89193711a1bac3c7b79f76bac0d3600e3823a86aa19538228619b5d64aea94e8a67f480b5c1f79bc3b93
-EBUILD gnome-builder-3.30.3.ebuild 7046 BLAKE2B 80d59ad24c93ca52f81d316917a28a16561222731dabc20799b7eabd2a3fbe7168025f1d086debdd424e3bb81aac186d7ec0305b86669dbcabecbed84caa9445 SHA512 3ad4ed1153be299f3a23cf242afa859816e8ad27a18825881bc57cc4013d76fe92f917941818a268e6b10d24c1247d5a39a4384e5dff150998d8c70e2827b734
-EBUILD gnome-builder-3.32.4.ebuild 7120 BLAKE2B 2ea02b40860e0814ecbb1c97388f29fd847f4a22c964c80a16dcf11fcb2d6c3793acb9168d51bd1ae87e087b099275093beec58aa3c5c2b2589bf9a885b709e3 SHA512 1b06488c75070afd763fac541d0fda8fc8df49b849caae4ac80cd5164fb3de550b03101d5a34ab66952261b2a5422ba70e639c5f5610962e5dacd0fa82744e5a
+EBUILD gnome-builder-3.30.3-r1.ebuild 7089 BLAKE2B d6bbc1128f8575e1d9435c1c147762374743a187347bad7aecaffe3757359991e1d581c2b407f6fbb7edb4c51b29db32470ed7ed8f7dc2a5023cac891dd1a43b SHA512 3b3c214ff96705f21724a29e3766352327acf21953fce4f5ef81a5ab089adc6c29e3b4e0c64716a7f2f1bf6997b434544fc8301ead43faa216e3bdc97bf621a0
+EBUILD gnome-builder-3.32.4-r1.ebuild 7131 BLAKE2B 870d0c6411650535e6f91ad502e9d902e096547535486c99b323a422a5a5d04b2760fb9651219bef5d9562c13ebec22e1ef7c32ac68d27bf4b81000c24587cee SHA512 e01c9e8c93979f118be1efe8421d2ab3ae7dead854a9c5a41ad9a14a1a267ca791708cbc4d56a8fcf2a0b9806ac41cdb157e8ffe0d7e496917c5a42a7fc4e9e3
 MISC metadata.xml 1212 BLAKE2B 83f431217b3d0b759597a250e40902979fde0a130e5666427824fe3d48fb05120dd596a8f0292ad23373c00bb8bd807cac667ae51f9a996b0275fbb6039084af SHA512 828803d2518b1684db6f0076e4aa851614682198722c67298ee8e73c29726fdae808d1ee17626d15559a9f6fd28d1abb6f651c39fc59de9c233081ba925d826d
diff --git a/dev-util/gnome-builder/gnome-builder-3.30.3-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.3-r1.ebuild
new file mode 100644
index 000000000000..7dce5bd51dfe
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.30.3-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+VALA_MIN_API_VERSION="0.36"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="clang +devhelp doc +git gtk-doc sysprof test vala webkit"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and ${LIBGIT_DEPS}
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet)
+LIBGIT_DEPS="
+	dev-libs/libgit2[ssh,threads]
+	>=dev-libs/libgit2-glib-0.25.0[ssh]
+"
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.30.2[introspection,vala?]
+	>=dev-libs/glib-2.58.0:2
+	>=x11-libs/gtk+-3.24.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.30.1[vala?]
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection,vala?]
+	>=x11-libs/vte-0.40.2:2.91[vala?]
+	>=dev-libs/libxml2-2.9.0
+	git? ( ${LIBGIT_DEPS} )
+	dev-libs/libpcre:3
+	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
+
+	>=dev-libs/gobject-introspection-1.48.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	sysprof? ( >=dev-util/sysprof-3.30.2[gtk] )
+	vala? (
+		dev-lang/vala:=
+		$(vala_depend)
+	)
+" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
+#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
+# TODO: runtime ctags path finding..
+# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2
+#	>=app-text/gspell-1.2.0
+#	>=app-text/enchant:2
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.47.1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust language server via rls; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false
+		-Denable_profiling=false # not passing -pg to CFLAGS
+		-Dfusermount_wrapper=false # meant for flatpak builds
+		-Dwith_tcmalloc=false
+		-Dwith_channel=other
+		-Dwith_editorconfig=true # needs libpcre
+		$(meson_use webkit with_webkit)
+		$(meson_use vala with_vapi)
+		$(meson_use doc with_help)
+		$(meson_use gtk-doc with_docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang with_clang)
+		$(meson_use devhelp with_devhelp)
+		-Dwith_deviced=false
+		-Dwith_flatpak=false
+		$(meson_use git with_git)
+		$(meson_use webkit with_html_preview)
+		-Dwith_spellcheck=false # TODO: requires enchant-2
+		$(meson_use sysprof with_sysprof)
+		$(meson_use vala with_vala_pack)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
deleted file mode 100644
index 54d735947ee1..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-VALA_MIN_API_VERSION="0.36"
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="clang +devhelp doc +git gtk-doc sysprof test vala webkit"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and ${LIBGIT_DEPS}
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet)
-LIBGIT_DEPS="
-	dev-libs/libgit2[ssh,threads]
-	>=dev-libs/libgit2-glib-0.25.0[ssh]
-"
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/libdazzle-3.30.2[introspection,vala?]
-	>=dev-libs/glib-2.58.0:2
-	>=x11-libs/gtk+-3.24.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.0:4[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.30.1[vala?]
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.22.0[python,${PYTHON_USEDEP}]
-	>=dev-libs/template-glib-3.28.0[introspection,vala?]
-	>=x11-libs/vte-0.40.2:2.91[vala?]
-	>=dev-libs/libxml2-2.9.0
-	git? ( ${LIBGIT_DEPS} )
-	dev-libs/libpcre:3
-	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
-
-	>=dev-libs/gobject-introspection-1.48.0:=
-	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	sysprof? ( >=dev-util/sysprof-3.30.2[gtk] )
-	vala? (
-		dev-lang/vala:=
-		$(vala_depend)
-	)
-" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
-#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
-# TODO: runtime ctags path finding..
-# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2
-#	>=app-text/gspell-1.2.0
-#	>=app-text/enchant:2
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus )
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/meson-0.47.1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
-  plugin out of the box functionality.
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust language server via rls; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Denable_tracing=false
-		-Denable_profiling=false # not passing -pg to CFLAGS
-		-Dfusermount_wrapper=false # meant for flatpak builds
-		-Dwith_tcmalloc=false
-		-Dwith_channel=other
-		-Dwith_editorconfig=true # needs libpcre
-		$(meson_use webkit with_webkit)
-		$(meson_use vala with_vapi)
-		$(meson_use doc with_help)
-		$(meson_use gtk-doc with_docs)
-
-		-Dnetwork_tests=false
-		$(meson_use clang with_clang)
-		$(meson_use devhelp with_devhelp)
-		-Dwith_deviced=false
-		-Dwith_flatpak=false
-		$(meson_use git with_git)
-		$(meson_use webkit with_html_preview)
-		-Dwith_spellcheck=false # TODO: requires enchant-2
-		$(meson_use sysprof with_sysprof)
-		$(meson_use vala with_vala_pack)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-src_test() {
-	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild
new file mode 100644
index 000000000000..6a5297578adb
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.32.4-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+VALA_MIN_API_VERSION="0.36"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +glade gtk-doc spell sysprof test vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1 and libsoup-2.4.pc >=2.52.0
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.31.90[introspection,vala?]
+	>=dev-libs/glib-2.59.0:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91[vala?]
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection,vala?]
+	>=x11-libs/vte-0.40.2:2.91[introspection,vala?]
+	>=net-libs/webkit-gtk-2.12.0:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	dev-libs/libgit2[ssh,threads]
+	>=dev-libs/libgit2-glib-0.28[ssh]
+	dev-libs/libpcre:3
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10 )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	sysprof? ( >=dev-util/sysprof-3.31.90[gtk] )
+	vala? (
+		dev-lang/vala:=
+		$(vala_depend)
+	)
+" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
+#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust language server via rls; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+
+PATCHES=(
+	"${WORKDIR}/patches" # gnome-builder-3-32 branch 2020-01-14 (commit 325cfb6d9e4) + cherry-picked meson link_whole fixes
+	"${FILESDIR}"/${PV}-optional-vala.patch
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dfusermount_wrapper=false # meant for flatpak builds
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use vala vapi) # TODO: doesn't work anymore; crude patch included
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		-Dplugin_podman=false
+		$(meson_use glade plugin_glade)
+		-Dplugin_git=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		$(meson_use vala plugin_vala)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gnome-builder/gnome-builder-3.32.4.ebuild b/dev-util/gnome-builder/gnome-builder-3.32.4.ebuild
deleted file mode 100644
index 803ea084530b..000000000000
--- a/dev-util/gnome-builder/gnome-builder-3.32.4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-VALA_MIN_API_VERSION="0.36"
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="clang +devhelp doc +glade gtk-doc spell sysprof test vala"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1 and libsoup-2.4.pc >=2.52.0
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/libdazzle-3.31.90[introspection,vala?]
-	>=dev-libs/glib-2.59.0:2
-	>=x11-libs/gtk+-3.22.26:3[introspection]
-	>=x11-libs/gtksourceview-4.0.0:4[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.19.91[vala?]
-	>=x11-libs/pango-1.38.0
-	$(python_gen_cond_dep '>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]')
-	>=dev-libs/template-glib-3.28.0[introspection,vala?]
-	>=x11-libs/vte-0.40.2:2.91[introspection,vala?]
-	>=net-libs/webkit-gtk-2.12.0:4=[introspection]
-	>=dev-libs/libxml2-2.9.0
-	dev-libs/libgit2[ssh,threads]
-	>=dev-libs/libgit2-glib-0.28[ssh]
-	dev-libs/libpcre:3
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	glade? ( >=dev-util/glade-3.22.0:3.10 )
-	spell? ( >=app-text/gspell-1.8:0=
-		app-text/enchant:2 )
-	sysprof? ( >=dev-util/sysprof-3.31.90[gtk] )
-	vala? (
-		dev-lang/vala:=
-		$(vala_depend)
-	)
-" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
-#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? ( dev-python/sphinx )
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus )
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=dev-util/meson-0.49.2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
-  plugin out of the box functionality.
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust language server via rls; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-
-PATCHES=(
-	"${WORKDIR}/patches" # gnome-builder-3-32 branch 2020-01-14 (commit 325cfb6d9e4) + cherry-picked meson link_whole fixes
-	"${FILESDIR}"/${PV}-optional-vala.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dfusermount_wrapper=false # meant for flatpak builds
-		-Dtcmalloc=false
-		-Dchannel=other
-
-		$(meson_use vala vapi) # TODO: doesn't work anymore; crude patch included
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-
-		-Dnetwork_tests=false
-		$(meson_use clang plugin_clang)
-		$(meson_use devhelp plugin_devhelp)
-		-Dplugin_deviced=false
-		-Dplugin_editorconfig=true # needs libpcre
-		-Dplugin_flatpak=false
-		-Dplugin_podman=false
-		$(meson_use glade plugin_glade)
-		-Dplugin_git=true
-		$(meson_use spell plugin_spellcheck)
-		$(meson_use sysprof plugin_sysprof)
-		$(meson_use vala plugin_vala)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 2d2c4f5b07f6..0ab48ff85010 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-devel-docs-3.30.2.tar.xz 10270272 BLAKE2B 762ffdb17b0538bbb93f7a8752c060a629437f685df8e4fcc1c296d0db4fbb33dfc7839504eac187237f50d9748b5d7ea45d0e55db74db8cef76daf01b5e997f SHA512 7479c999bffba72d7b815b6081142d0549e9e407939c9ff16b6f04cff2517231614c43050313d49894fec31e0e1777379505f66cbea2da5a2644a147dd95846d
+DIST gnome-devel-docs-3.32.1.tar.xz 10281104 BLAKE2B 8f1c49a7829588b3c7e82b5d1c25f34506f8dc0470b4402e2f4f7be1420d6f314f9a88088afc2d5860d34e3c5029c3f129220c9a83a46621bdb2a877f83dfccc SHA512 57cd312aa43f529e4b2cc862a3cf1e3d6dd67baa145d4a3119227a18ff3a7db67aaf0d641e736d0362dda72ab274bdb701f73b8b309c3ba013b843d217d94604
 EBUILD gnome-devel-docs-3.30.2.ebuild 656 BLAKE2B 63b9eaa85a8357d3f024dbcc278f5cf526b28ed40635071659d29eb9031238f007d3c52f73915461a3b1cfbd699b01e28001ffaddec7a02a64ff9b30a7177503 SHA512 a162f4daaca17f2930dec1b82737c8c25cdb95593503ddf2ef6a33a629e3cfdbf27e4318507a4d988c6b40cf3e9c73dc55847c425186f732fa62c9dcfb112f18
+EBUILD gnome-devel-docs-3.32.1.ebuild 658 BLAKE2B e67fc8accf3e3dcf0e0f0e12fd3599765972c6477a6e8b2c7cc21293e12668aac195c474b4134d79cfdbdd7976f1a21e23fe9941ba3899e753c99913edd9b18a SHA512 d7d8dddc94667b362cd09e7410b4962fe99859b5684c1d66c743fe61e09a7d9a685d9153e1fdfe40414b405e018cfb7b91bc59bcae42c4ea62fef8c7cc4c7148
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
new file mode 100644
index 000000000000..5deeb4cc7175
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.32.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="https://developer.gnome.org/"
+
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# Wants to build demo samples
+	gnome2_src_configure ac_cv_path_CC=""
+}
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index cfac0f409b20..1ebb1dd3fa75 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,7 +1,7 @@
 AUX fix_ppc64el_FTBFS.patch 1305 BLAKE2B 9f20c5e91a47f3c88c15990d4ae77c423aa7832f7b95bfc66686751f9f2d8b9eef4ef6b7d73f7fe9296d5d04a154b0330f71000065f03412b440c010d44439e6 SHA512 d1a3f447037c4b7408fa20710989b262d37072c4e0552b74e3e25b673f3da4cb0280bbdccfe2e1c97eeb0b318b3923ad9a3d9afab17ba067e7b6755f33ad4f1d
-DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319e505fc715795cd836ced631b29bfd8e6f8ddf3c7f6dceb0f166523bb0fa55564b1cbc896c8cd8cfd475263c07c39 SHA512 20c3460f806c6425d54e8d1020f15bc8940aacd7bf1367b03a116fb873bbd6c1e1fbb75df1d0ca341eaec813552fec394327175115ea8442a4b7a1ef17f0df2f
-DIST gperftools-2.7.tar.gz 916919 BLAKE2B c48882df45415110c1ec39298e84ec9384f6a82851d95e92435649d2b253b9fb8e29664b474e45881599abf3781731c47ead0b6c454c33be9a207a6a2401a97c SHA512 9aa39689bc18603123204f024ab6dc96099b70a3d304e31ef0cc1e9893cc77bd14ee6eb420e597d40e81e487a2a45e77cf1965873646d056fd4b7bee22a4b0bb
-EBUILD google-perftools-2.6.2.ebuild 2327 BLAKE2B 8732f6b11b70863c41d4e14208289d90e51aaeb01a57865ab94247039dc39b974c9910bca52848087074a8de14e11181c4fd42655176b25c24f3b25f44b3ffca SHA512 6a9946cc7b7429949cf9027820bb16f584c2f6237d1bb4c31b1028f39ef152a4c65975c22d423cf6e475066f9ca107a3b8c363446c8c030dc5f369156037930d
-EBUILD google-perftools-2.7-r1.ebuild 2434 BLAKE2B 6c93958996d29273b1dd8da7c7e29d7d0f70a117e48d97b1dca21b1c499d44b8841a6ba60c319be916ca3768752ac5890efaeeea74332d2e02a3d1f4bb68fa36 SHA512 b3ffbc4d01c2c9a64ae9877b1945396f622415ac20832b2940eabd641a57ca336e9fc9a61ce4652de35082bc2e6c4d67c083df9f96c37b853f2295208d4ff690
-EBUILD google-perftools-2.7.ebuild 2370 BLAKE2B bbd08a3e0267f8f12d4753065c9377cc4e2b13b8069fd4741aa334fc91c446dc1e3107f00843c66ec6fae755ba7ef664a201ee1125be975cd862d5c24faabc06 SHA512 75ce9a01994ceb9f01d6a5cb26d24e2eb5b03e4dbea2307d20fb956186de3ff790151e6888a9b3e9b4b32de2c5b0c322f2f05c3353df13aa002a730cc456f704
+DIST gperftools-2.6.2.tar.gz 911811 BLAKE2B 1201185f3008f75b9db219e47658f5b34294f15d5cae5a9badbc2718d63e58c07e485e84f6af05bdd12398c7ab8af520db9f34f4b33b790b0276ba10fb945358 SHA512 2630687d98cdb7011b9b90ba65e337d74f7e1f7d44190edf5414d0898b906686e547e4bb08979f26fb16ca1ccc065a5a1022dee03539bb1ccdf136439eb99ec1
+DIST gperftools-2.7.tar.gz 916854 BLAKE2B d14c2b88f2986d3691d7184e1759de2066ca50224f745a6291ab2ebd5f7f985dec4916a1c01d61142eca9b64f3742c50b82e64118602afaa7b27ae2d94a4ed4d SHA512 4a8e72b960218b0615281b830b3f1a4a1b27830006c45ed68b1ffd152bb50a8b3beec850526e330e2ad08c28774bdc01dade9bcc3e7c9e26d30823cc55648d77
+EBUILD google-perftools-2.6.2.ebuild 2316 BLAKE2B aad1f1b00224764aec592260f11cfb77874f8f74102f474526e12112b75b37358171435d7caf005fc5edd66a736e22ada0daa438d2e8bf29ce0cb1072d9d2660 SHA512 109e1d8985eca717903afd792f41c9f1cf761f67b940e0db69283bbaeb8f7df200114c8da5177fd03df8fb2b7858a7567766bc9d515ba09fc36539d60a137f83
+EBUILD google-perftools-2.7-r1.ebuild 2423 BLAKE2B 53e964f06c9c4411da879d140a60a8d0c17f4b875e869c7c259e69cb90bb6dfd1ce9df2e8b26834f59009256ef4a44f7a183ad68474aa2237f0b6f39dd1226dd SHA512 48260468ac1eec9a25ee6ad0413d8d10c84921713e33526ed82c8a55c5f6b7f19ed20362d30700bcf1ee5c6531947a7751ed50f3b548a8b5fe18afa881264831
+EBUILD google-perftools-2.7.ebuild 2359 BLAKE2B 2d907ddfa3ea2a268d91bd6543aea89afb92638377e2d93739c670d92765ba60d21ae56ce586907855f8b639aedaa446aea361de5792eb794f1da674d2b0312c SHA512 cb165e5bacac71b2dc8fe67c9e73aa0eadb5659b5d5c788ced040d744fe84dd82acd8977f2ac375167c5fef67e7d28e8145613e3c493d5ebf70eeb8688e256e7
 MISC metadata.xml 921 BLAKE2B 71a3db16b3a5a561ee677caf593ff5c45c01bf1cd449da8782e430ffce02b8661c4a011643192f12329ce164ce0148ee206bef85bf55503aae1161067b8e88ca SHA512 e8198e40382ece3675dd43a1878af9cf189d492bc79f246547423b37426981ab2ab624c6d69bc7d57e8a7bdb1f8f4eee32efb1b7d70ecac159dc2a939e480efb
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
index 7f9bcb09f7e5..44f0d543dc3f 100644
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
 
 DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
 HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
index fb3a1b1d9f3d..bafdc431a0d7 100644
--- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
 
 DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
 HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
index 4dff6288dc5c..8d7bcf2c2cc6 100644
--- a/dev-util/google-perftools/google-perftools-2.7.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
 
 DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
 HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/4"
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index db27230d5d72..e8faba221f78 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,5 +1,3 @@
-DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
 DIST gource-0.51.tar.gz 882783 BLAKE2B 86a95a55ef9e1ec50e19a4859163d7cdc2733b7c55a68e4d2db493e4c6587682b900b2c73525131972da4dde9fc4d9fa41ba728bdc56fd46fc6a559cb4d837f0 SHA512 f29326ffb2aa6f645fb941e08e41f0cbf8dd894d5a4d607b782caeb12a24e6446198027060b880e0ad14a36efbed19023620dd8c890cfc0c027fc90ac2d5be24
-EBUILD gource-0.49.ebuild 1067 BLAKE2B 239950d5088a2a7d8901b60b1b5514a27aae8b4065a1ed6db44d123236bc1bccdf200ed6d3371b331702cf49032aeb162e201d29febc3d552f991034e45efad3 SHA512 f8511d169bb3db902d7bd9f0aa4c0a33cae3d92123a234d516b0ce03044217cdd846241bc979151c683282c9f457eaeb5daf011d283592114135e2a117a5e8f4
 EBUILD gource-0.51.ebuild 1073 BLAKE2B e459bd452df402770251680f9831835dd8985e5cecda52314baa98d42375860ab5385b6193f97555ab44fa8083b4fd9a3549651bc7739c76ce40e8323f4b05df SHA512 9996810d53645f93a3049b1b93679c163f90d240901e07f8d232902e18bb222df0d61c09044fb869fe5cdc5f82ed0242844be487d9f59f2a5c28862b4b09ff0a
 MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.49.ebuild b/dev-util/gource/gource-0.49.ebuild
deleted file mode 100644
index 2674015bbd8c..000000000000
--- a/dev-util/gource/gource-0.49.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 flag-o-matic
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="https://gource.io/"
-SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.46:=[threads(+)]
-	>=media-libs/glew-1.5:0=
-	>=media-libs/libpng-1.2:0=
-	media-libs/libsdl2[video,opengl,X]
-	media-libs/sdl2-image[jpeg,png]
-	dev-libs/libpcre:3
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/mesa[X(+)]
-	virtual/glu:0
-"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/freefont
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=media-libs/glm-0.9.3
-"
-
-DOCS=( README ChangeLog THANKS )
-
-src_configure() {
-	# fix bug #386525
-	# this enables gource to be compiled against dev-libs/tinyxml[stl]
-	if has_version dev-libs/tinyxml[stl]; then
-		append-cppflags -DTIXML_USE_STL;
-	fi
-
-	econf \
-		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
-		--with-tinyxml
-}
diff --git a/dev-util/gquilt/Manifest b/dev-util/gquilt/Manifest
index 809a7358f7d9..5c366f034541 100644
--- a/dev-util/gquilt/Manifest
+++ b/dev-util/gquilt/Manifest
@@ -1,4 +1,4 @@
 AUX gquilt-0.25-desktopfile.patch 402 BLAKE2B 3ea9944012cd638bdf5d182daf4d2a7ce83751b77e448bd4771c8197ff9df9076b967188f61d46e0389bfb0ed79007d4b543bf888f9ee8e20f116c745e35f6f6 SHA512 194fbe15da3a7c89c9fc534d7fc57e8248f004ebbcb9a39298a53561e6bbb18956f9a287ee1f56074ad6d1846eccd4ff06be06b06c388c385e776b754577d6bc
 DIST gquilt-0.25.tar.gz 124957 BLAKE2B a8b293c51511d80ee99b8d0898dd8c9b6f71988a855bf67c4743d745d3c02ecb55d1b6dbdf93e82352a19af8fabe29fa624aead33feca7d73b3cc080bcf85b19 SHA512 fd1b98e87b3bc8438620a7105664c487a5fcfed50ade3e144802fc080dfe3a7d94c76f7ff7274d5a98003cffd8305cf9f193b2f799f4846d59e60233f1782f0d
-EBUILD gquilt-0.25-r1.ebuild 789 BLAKE2B 815e857445b645b611b067e03e3aa6e8d3c1ae29a904a06407cc797ea1e5c0c5ab7bfb3430155794b0c656828a9ab46f347de1116d5a449f331c448bce004166 SHA512 fd7d690284bb809ffaf9311543e3eb341701bda0e6341660c99052a139869d1de5df92cb8c957cbfb122dc9c846ad109f0d954a4368eae040b4e6870e2895f66
+EBUILD gquilt-0.25-r2.ebuild 824 BLAKE2B 8e15775c0a8191be9a113081fb39f8399e53c31c6597a57a0c705683e8b6c0c7692d37be4198fbbe83ac24a425998974205a9fa726245a77d036320892807af9 SHA512 5b221b06099c0f07682d7b6e71078f61251ee94b6a9b762231cf1501b47fdd7ea7d4dbfc3ceba7c1297843a0a5f2fa38dc78a04643c7cf2c9f19da7bc51a8194
 MISC metadata.xml 243 BLAKE2B 17a642a344b88fae8d8900450079e8af46c64bf782bbe91cde98b92eae1103cecc69b3afb16e24888748d86cd5a4e752ca44920d6c8801f5ac4ab891459b1eeb SHA512 409f547397c4745ced5764a70f2d57ee1b71ce617116f5adbfa07556d97019a63e1a2ff309544cc52991a4859bd70f63c4920ecb917853f7c95c981281df25e1
diff --git a/dev-util/gquilt/gquilt-0.25-r1.ebuild b/dev-util/gquilt/gquilt-0.25-r1.ebuild
deleted file mode 100644
index ce0e5f51b9c6..000000000000
--- a/dev-util/gquilt/gquilt-0.25-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A Python/GTK wrapper for quilt"
-HOMEPAGE="http://gquilt.sourceforge.net/ https://sourceforge.net/projects/gquilt/"
-SRC_URI="mirror://sourceforge/gquilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
-	|| ( dev-util/quilt dev-vcs/mercurial )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-PATCHES=( "${FILESDIR}"/${P}-desktopfile.patch )
-
-python_install_all() {
-	distutils-r1_python_install_all
-	domenu ${PN}.desktop
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_doscript ${PN}
-}
diff --git a/dev-util/gquilt/gquilt-0.25-r2.ebuild b/dev-util/gquilt/gquilt-0.25-r2.ebuild
new file mode 100644
index 000000000000..ed04793640e7
--- /dev/null
+++ b/dev-util/gquilt/gquilt-0.25-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A Python/GTK wrapper for quilt"
+HOMEPAGE="http://gquilt.sourceforge.net/ https://sourceforge.net/projects/gquilt/"
+SRC_URI="mirror://sourceforge/gquilt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')
+	|| ( dev-util/quilt dev-vcs/mercurial )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+PATCHES=( "${FILESDIR}"/${P}-desktopfile.patch )
+
+python_install_all() {
+	distutils-r1_python_install_all
+	domenu ${PN}.desktop
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript ${PN}
+}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 4f17a15c4938..f4b94c264b29 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 EBUILD gtk-doc-1.25-r1.ebuild 2767 BLAKE2B 619837d6125ae5ff05c11c15f70ed72c9a5df1b00df0636772ed20cb07cf6d4d5a72c6c32393fb16d936f4ff3990aede8d8f87345ac0a60e2d5d1405ccbb3ffa SHA512 dc6719a0a9160c6aa63aaba4b05667e3cec887d7ace45be3abb1cec3ca27950e8f1c9bcfd5968fc8b6f41923587fe88cc43c36487234b0646274c73738a19e94
-EBUILD gtk-doc-1.32.ebuild 2317 BLAKE2B 751ce9cfd6efdf0e5dd8396c325418da032c243782c8415a3f81da4b8416e427490a61c7e6b69886ac5ba84f24f37f7df532e0b252169b35580b0f235c19df43 SHA512 71656f6840ce3fe8beeca5976b2d2b2c4af491425e28675f8b0aa55af690a13014ea58cb741b079dbda6cb9aa0acada5b2b43b2593551266c381805c880e654a
+EBUILD gtk-doc-1.32-r1.ebuild 2353 BLAKE2B 2bdb453f6f6cd8debe11765014f8ba1fe9249831952c7796a1b622bd8408247d8a970e27e5a1d83f5a92e7cf3575950a029f6176063380df9160791280facd4b SHA512 141831ddd5bd6a9c1fe93b8955837a5989fd3d8f80bd2b82c98f629a82288915a4d35e7c317b13ee03f8c81b6e271a9859fec22f218765bbcc770f7442ec8eae
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
new file mode 100644
index 000000000000..902b77297ded
--- /dev/null
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="https://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+
+IUSE="debug doc emacs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.6:2
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6:2
+	~app-text/docbook-xml-dtd-4.3
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( >=app-editors/emacs-23.1:* )
+	$(python_gen_cond_dep '
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	~dev-util/gtk-doc-am-${PV}
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex)
+RESTRICT="test"
+
+pkg_setup() {
+	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
+		You may set your own key bindings for \"gtk-doc-insert\" and
+		\"gtk-doc-insert-section\" in your ~/.emacs file."
+	SITEFILE=61${PN}-gentoo.el
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Remove global Emacs keybindings, bug #184588
+	eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		$(use_enable debug)
+}
+
+src_compile() {
+	gnome2_src_compile
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan
+
+	# Don't install this file, it's in gtk-doc-am now
+	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		docinto examples
+		dodoc examples/*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use emacs; then
+		elisp-site-regen
+		readme.gentoo_print_elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/gtk-doc/gtk-doc-1.32.ebuild b/dev-util/gtk-doc/gtk-doc-1.32.ebuild
deleted file mode 100644
index e1f94f914082..000000000000
--- a/dev-util/gtk-doc/gtk-doc-1.32.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="GTK+ Documentation Generator"
-HOMEPAGE="https://www.gtk.org/gtk-doc/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-
-IUSE="debug doc emacs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.6:2
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.3.6:2
-	~app-text/docbook-xml-dtd-4.3
-	app-text/docbook-xsl-stylesheets
-	~app-text/docbook-sgml-dtd-3.0
-	>=app-text/docbook-dsssl-stylesheets-1.40
-	emacs? ( >=app-editors/emacs-23.1:* )
-	dev-python/pygments[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	~dev-util/gtk-doc-am-${PV}
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex)
-RESTRICT="test"
-
-pkg_setup() {
-	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
-		You may set your own key bindings for \"gtk-doc-insert\" and
-		\"gtk-doc-insert-section\" in your ~/.emacs file."
-	SITEFILE=61${PN}-gentoo.el
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Remove global Emacs keybindings, bug #184588
-	eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
-		$(use_enable debug)
-}
-
-src_compile() {
-	gnome2_src_compile
-	use emacs && elisp-compile tools/gtk-doc.el
-}
-
-src_install() {
-	gnome2_src_install
-
-	python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan
-
-	# Don't install this file, it's in gtk-doc-am now
-	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
-
-	if use doc; then
-		docinto doc
-		dodoc doc/*
-		docinto examples
-		dodoc examples/*
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} tools/gtk-doc.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use emacs; then
-		elisp-site-regen
-		readme.gentoo_print_elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index 7bea7bb7de2d..ee7256a7c1f4 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
-EBUILD gyp-20170904022846.ebuild 917 BLAKE2B 80903a671bf2f4839514d0078fa44cb7b99461f08f09974c1892bd42cc445a72f5a577d9ae508bd5b635e2dc213b789b18452bc4b9c19b58d545cac5d66b7ff3 SHA512 2e725f98f1bac4af1b8f8519f178335ba111a8831b110c8137d152d777efe6fb35f85413f086e566f2e3c00ed98737085b3b4a35f07e473e7660aac29515a72a
+EBUILD gyp-20170904022846-r1.ebuild 781 BLAKE2B 24eec3c49cbbc76040eca160424eb741f27dbe75d8bd5fff231af238a0c1ae005bbcca327848e2cdc7b2b1d02ed6d575e19898e907153b9f5d5e353e0977be1d SHA512 ff24a4714c3bebb065883d9ea66ef41a832e2848568adf531fd33c80bfd5ffe6bf06e2b4dcee34193567892a46f1d12791894a59a1bdd009b4cf0650c465b064
 EBUILD gyp-99999999999999.ebuild 839 BLAKE2B 23211f1919910dad238ec6c1bda075cf5fa738a8b1b4e0bc1ce5b9139f81d516d3a59dfa705f97815700c600416fffc21b6692c3a75507a7e9b9652b3a949bf0 SHA512 b80be2b5679e6c06c09264b711636593a19a709828bd0c4e4343d8784b56708c4165ffa51ea2e94b8e5d5f4518ee9a7161f00fb57f4bb4d4683ba84b80c21ae0
 MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
diff --git a/dev-util/gyp/gyp-20170904022846-r1.ebuild b/dev-util/gyp/gyp-20170904022846-r1.ebuild
new file mode 100644
index 000000000000..24cd176a09b9
--- /dev/null
+++ b/dev-util/gyp/gyp-20170904022846-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python2_7)
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "99999999999999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://chromium.googlesource.com/external/gyp"
+fi
+
+DESCRIPTION="GYP (Generate Your Projects) meta-build system"
+HOMEPAGE="https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp"
+if [[ "${PV}" == "99999999999999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://home.apache.org/~arfrever/distfiles/${P}.tar.xz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE=""
+
+src_test() {
+	# More errors when DeprecationWarnings enabled.
+	local -x PYTHONWARNINGS=""
+
+	"${PYTHON}" gyptest.py --all --verbose
+}
diff --git a/dev-util/gyp/gyp-20170904022846.ebuild b/dev-util/gyp/gyp-20170904022846.ebuild
deleted file mode 100644
index 1642a828af15..000000000000
--- a/dev-util/gyp/gyp-20170904022846.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2017-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit distutils-r1
-
-if [[ "${PV}" == "99999999999999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://chromium.googlesource.com/external/gyp"
-fi
-
-DESCRIPTION="GYP (Generate Your Projects) meta-build system"
-HOMEPAGE="https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp"
-if [[ "${PV}" == "99999999999999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://home.apache.org/~arfrever/distfiles/${P}.tar.xz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND=""
-RDEPEND="${BDEPEND}"
-
-src_test() {
-	# More errors when DeprecationWarnings enabled.
-	local -x PYTHONWARNINGS=""
-
-	"${PYTHON}" gyptest.py --all --verbose
-}
diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest
index 2fb2c39ca763..6d1fcac2ff27 100644
--- a/dev-util/hxtools/Manifest
+++ b/dev-util/hxtools/Manifest
@@ -1,5 +1,5 @@
 DIST hxtools-20180301.tar.xz 301516 BLAKE2B 6b768e316de6d9b724cdca5beef1ec14e3482aaf1aa34abc138861782266eac32565cdf7713cc65d3863fb1b3463a21446165ecc7df4f39c4fed168d8efdd3df SHA512 10b6a59367a9d5127116a81ae46c4c0f10dd4cecd60ff78b2dfeb2a304c7a34112df2355b9f939558c8e27d0e255e2df6277da9cc558d4368bcbe4d7130d5326
 DIST hxtools-20190428.tar.xz 219012 BLAKE2B a1c2cc48eadb6d2c9016803469a87a18e447705f463f3a059dd9e501a228eaa20355ce1ce36d2c9988c1fb1ff64727ce6e4c0e098b24a88ca591649df36375bf SHA512 268da9c5c09830affe35052769ed2bee2fc4e8f7de3b9ad5eda7a8865ccac88bc1392a6c83b7d4c5faab2b07d7c77c6e77808a8c184bd3e530288c577b5de567
 EBUILD hxtools-20180301.ebuild 802 BLAKE2B a35cb67d8dacdb559df4dafed8ce2ebfa2482030fe5e513a0802ccec0b0192d92bda8a09dc0ecf7dbce5dee39463a92667fa67183a773f0572ffc9f16d4746a9 SHA512 d86fd5d656bf6646c2469f2d83c39370943dba1bced7ecabaa5629be4a0ce4a6b8c6a0958af2480543b00b18d9237c42d3106ed76e2a607e92afffecefdc4029
-EBUILD hxtools-20190428.ebuild 955 BLAKE2B 77a212351dcf16bd147079ac25a9c5e7352984eb1740aff1a305bf18c2b51463c869ad7499d2b21c6e8366a72af20a21ca9528a89633f46170ba9c7850d3b62c SHA512 53c886f9ef0f978d90ad057464ede04f2a6db0d1edcdecee31036fc8661b61130385ff434400d666ddbc5461fb65c40dc91e50e3cc61df9356efbe278b11c72d
+EBUILD hxtools-20190428.ebuild 954 BLAKE2B d5c6a67ee016488bd2708b13196ecce4848ad0caf2d42206d49fb1f033deea75c1099ea468b5f462105399c84e8be9746c3d98bc4af76fcb45984eeb5903e69b SHA512 2c1cad1964d1ccf8cc03cd20953dc3ede1572f5fec20e55ce46d3a386aba4dca6a742961f464a6f2251e30894ee9ab8e6f30204b56cb25a4ba4ab9b0904914ce
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/hxtools/hxtools-20190428.ebuild b/dev-util/hxtools/hxtools-20190428.ebuild
index 0d8b5bfff864..070a3a18b3d6 100644
--- a/dev-util/hxtools/hxtools-20190428.ebuild
+++ b/dev-util/hxtools/hxtools-20190428.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ src_install() {
 	default
 
 	# man2html is provided by man
-	rm -r "${ED}"/usr/bin/man2html || die 
+	rm -r "${ED}"/usr/bin/man2html || die
 	rm -r "${ED}"/usr/share/man/man1/man2html* || die
 
 	# Don't collide with dev-util/cwdiff
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 50007d875d61..a23822c4f39d 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.1.2-python-3.patch 4553 BLAKE2B bc16393f3c7071017255e8f188456e77d89a2ab2d605d6d99882aef4c65c7e5270a9348cf278a98d5ff7527423e899feffbb93b00f12a8c6e9a7b131acb86eba SHA512 fa5065572eb7fdbf38e3d7785ae92bddaeae8eadd9dbd006f5691c8647087df7529015750b66ea7618dd3306fcda80083c8dc2d2f019787137095db5b2c1a4d7
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
-EBUILD imediff2-1.1.2-r5.ebuild 782 BLAKE2B c45ffb1a245173a5a260e6e21581bb7788c940d0a5d7938c1612fb73a879e471c41df9951d5a444b722a90f3e4afffe04d76009d9ded3597caefea51d99c05f6 SHA512 b62e6728b0b506285172c1b4e849e24c9ac0570ee221e0ddc385b60a9ab01b56c20927b0ae130a3299e792e8ff69f83dcebdf1f9a2996af09ef2aa2aebfad3f0
+EBUILD imediff2-1.1.2-r5.ebuild 772 BLAKE2B 46e38890ed7a25e22066e7d0e8385b0fbe335cc41b16806a8589fee0ae2d7096177014c8e204f9f139c4bad20f7e7fa2b767d8e9d84d46fa5c5a0cd83800db73 SHA512 6ff82befc258a0b90d80ca023c097adb6eae738c3678b45ca2b5d6f06f7a62d6a1ad224ce48f7e99e45ba4a0af918795d8f9ebf5fc4d936572252f7cf383aac0
 MISC metadata.xml 246 BLAKE2B 464fa3d4dae2c15dd040a7580e6324ebe6cd2fa1d37a746ce991ec34484621fe6d3ae2362ea7696bde10cd6c466e1c8e0fd1fdcc161de4a502970e9e2841faa4 SHA512 30ecd86dc0fd1e0c83b4401da36f040346046e260e53c9ce77336869a2442d6b432863b031f61aa2209e58e43d172ef471c6fae5ef19a4c9e2a653e60e96c73a
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 1e0262909ebd..4e119dda4185 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1 eapi7-ver
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 93f491c84ca0..a56daf17b226 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,7 +1,7 @@
 DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
 DIST include-what-you-use-8.0.src.tar.gz 545788 BLAKE2B 7b70d951b7ab2d62a8a6168ebf86dc76fd406159155dd93a509b8c39953506166ac18da3028be8dc7edfbb39eb96613b0e344067154dd8614fe7c63ad3ef04c6 SHA512 e75e91ce198b1ec446ed34afcf9fdbcb0534c5edc5346e4884f0f589c73512d778c428aa71c1b109d45a45543a952438610ab21e32ef1f03ff1a014823ed8425
 DIST include-what-you-use-9.0.src.tar.gz 589377 BLAKE2B b695354787070948d81e3e80b07bbe47a84b5609262df2220b6a62e6d648865b17e060951819f45956c6ca858977614d6e0401640509599b391a1165521b20de SHA512 f2d6ba05121a9968da9e42e8ac66f83ca0f35bfbe7cb1d616e2c6479cf2833c4668cb86e46a04ffcd5e77f10a575da9eeee5272c7609b5afad555d79cb640fb4
-EBUILD include-what-you-use-7.0.ebuild 1212 BLAKE2B c33266de88f807a1c6c5520253771e1b6f5c2cf3ca6d15e524b59e74d5447a4ccfd9fd8c78d68c1e6479f31aec4c8a8c08c5ec9d39a41b6d2059b555aee9651d SHA512 de621f948cae0a838670013b7d5896f9fff16ab393647b0f220a50643bffb7767910aaeb1c3bc859107773c84c8f3214ff85b1fff757486bfb322b634de4e05b
-EBUILD include-what-you-use-8.0.ebuild 1212 BLAKE2B e5d2f0c6bd3567d571a3edbe856be0a5643e76d01393723acdce9a6623c841c6345294ec401f29543489c7bdb24c56869143b7e8d9fb07b90556cc28497b9c55 SHA512 0c4ebaf0008bc36d1b33b445ea1a4970451f24af8906c2ecad4796d7dbbac77282ff46bf223b5f3fd803d3223d6c24a9da3dfd0ec4f0928b51b8f84d10422857
-EBUILD include-what-you-use-9.0.ebuild 1212 BLAKE2B ceb97a6f48ccf745b7fec1a5f9f128e853079eff73fd5bfda0b4772d5a43bea63a7b90331d3f2fcca4d8ba11cd5eaea5b2a46a011731f6f76dc75f3c03887af9 SHA512 4e4a6dcb5fb85cef3854296630d9ac589a642e0fe1c41a5873dc670ebe217a499819e721949542dbed81c31bc190ebea164c48f248ee9840f36a66ad14e5cf6f
+EBUILD include-what-you-use-7.0.ebuild 1202 BLAKE2B b5ee7e2bc4b9826c748942afaef191fb766d316408ededda7f816de104c0ea80f1202fd93db5c1206a9fcf00182299773626905b2594abb0173630c70111c128 SHA512 8b4ad10f59bb40e71440b83a000837648899c1976a5952f412e88a6fc449ac1e5eb467543703c3f307b5b988d801528b7e2286a634527113da4477aed73e1b45
+EBUILD include-what-you-use-8.0.ebuild 1202 BLAKE2B 0f23eef8cedf2dcff9f825869e712d03646611bd1d0d021bcbd3b7c5bc8a6918022e99c8f1b501334d452026099b9a880ae45d8488d5538a67fb0d01b7cb2bf9 SHA512 bb3c6e997a6858ba5137bd4a2aa5224b89e4b142d35bafd0bde9dfb7fd38f4dc5c8f32b579f3e935180c36602209667abe629a206436dc79d7eb408f9e87257d
+EBUILD include-what-you-use-9.0.ebuild 1202 BLAKE2B 648f680ade33ceb1f8fbe231b2131e93455b70047033ac4f606d8e9155f9d753353027c93dd2cbd1144f3592b3f55ff9342897644ae8b985b71c07bbbceb3810 SHA512 5c634f121475b8a1b1afded6452c33849a4bcef4b6191630ebabba46c30b69eb0719385074077dd877c7cf9d4f4b9ae078c334e310b400e2b3ffb25c41a318d7
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
index 4f32b5dd25c7..a63ca135ef22 100644
--- a/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
index 6e0b616cc307..8c945d51878d 100644
--- a/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
index 8ef816c7fce5..50d5e25f13ea 100644
--- a/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 9084e97756b3..f45052fc7984 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -5,7 +5,7 @@ AUX indent-2.2.11-texi2html-5.patch 2666 BLAKE2B a92ecd54bead00609c45f3193b3c022
 DIST indent-2.2.11.tar.gz 778563 BLAKE2B 8fe0f245fb852613587da8355a4aa8962e09e1614faf61cf7cea62d6922054547d0739cd1373298af08e4e0cca8d5f4bfc654e03d859c0fe560d0ddb0f63a298 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be
 DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
 DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
-EBUILD indent-2.2.11-r1.ebuild 1219 BLAKE2B 08dc6047a43752e345e39bb3899f062e26331f62c901417dc72462a45b989a4b8ed7ca7ed3f54dba4bea5a104c382b0548d51f5356948eadb0a0aa7cf5ffc6f2 SHA512 51cbdbfe8871f948b0ac4e97e93ffcea4e20dd99f34f613e731fc35c505567ddc48be9faeb3aeb6ade7bb0f00ef109e9e34c2b438abd789b0a82af618ce8b938
-EBUILD indent-2.2.11_p5.ebuild 1382 BLAKE2B 47c045271db8ee765f5516b8b333c81d6bfbe1847c06904244759aaadd730f3bd94c6101df1d8607a3f8f2ab309be4a143a1478700f5d558df921d9524de35ea SHA512 a2db1fd8937a8608d588304731244824d437d3bf90053897c02dec1defdf7f913dfd9c34600b124d7d93b3b3009c7649065726b1f0c1450a339b9baba8e8208d
+EBUILD indent-2.2.11-r1.ebuild 1236 BLAKE2B 2fb87ce01f2d901080799b5a34a4dfd77d4b2030cdba86837d126d6e24f1439c10fb3af19c54b687f52eabf4c9da2ef65e12ec9b7414bd33b367bc2934d896d0 SHA512 e62135759e394b99b387ac75cf63d653b6c5e5fe774e2c208c102cbcd969f50eb7e17c9a56a53bc91628651bf5ec4b6910de85765c9af53943cb0fccb855f3d4
+EBUILD indent-2.2.11_p5.ebuild 1399 BLAKE2B be14d661f50405ac79550204c1241e4c8155e65c800ece7c8821e1988fee674485307d06b6a44a0a2d07bbf05be47036c7fce36e047f34e775612f7bd3d054f6 SHA512 715945569ae4f83a12725c02b0e82f829d85f6f1643d5da0e5296e8bffddf11279b0c8f2f90df47a3659375fd9fe395e3cda447a6983ce0820765927ba75ee22
 EBUILD indent-2.2.12.ebuild 1127 BLAKE2B 7e38608fb850a2249c1fe44edeebc7fb6c875be53120037df3cf173dcf9df45bf312a3f8a7dcbf327436f71a35667234dd50a132509028f517156ac4aadfdd89 SHA512 546599303c7ce7bff6586756a81df6890af9a711a45d1857d37d3e0417a7bb552392dd40fd108d7b84fc6d51867bdb7a6de58ad2b71e280f8b621ed55b395dac
 MISC metadata.xml 371 BLAKE2B f331934c0c8063b13ae4e4290894da6faa7e6f135d1684b7a621b4199b13304496866e7eea31a158a2a0f36ae29da184bca16020425799a6542dd6d213e1b36c SHA512 c3859c430b4d976869789476e59c66bd2967802748abc9a3f53395d170114c21ca11e81c6046fa160ad31d422188dc92f63c9df947ac75ef31bcb1965a7f5dd8
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
index b10e30e9d3e8..2b9b234599f0 100644
--- a/dev-util/indent/indent-2.2.11-r1.ebuild
+++ b/dev-util/indent/indent-2.2.11-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Indent program source files"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-util/indent/indent-2.2.11_p5.ebuild b/dev-util/indent/indent-2.2.11_p5.ebuild
index 3a8feffd428d..f05029bb3436 100644
--- a/dev-util/indent/indent-2.2.11_p5.ebuild
+++ b/dev-util/indent/indent-2.2.11_p5.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit autotools eutils
 
 DESCRIPTION="Indent program source files"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${P/_p*/}.tar.gz
 	http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV/_p*/}-${PV/*_p/}.debian.tar.xz
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index 5414da70088b..406727e01e02 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,5 +1,5 @@
 DIST itstool-2.0.2.tar.bz2 96748 BLAKE2B 7eb8f52c233878a35c01b7eea51c46f9700e9de827d38df41bb3ea78ca4ef284ab59c423aaf9876fceef023cb9d13d2d50c9ab57caff9e5fad217363412cf472 SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2
 DIST itstool-2.0.6.tar.bz2 103067 BLAKE2B 72d3254cb88ef9d02f9b3509a46c2208e98bf6327f139e5d29b99cc6d80651bd41ea3bfb78e48e23cf7c217770cd8c6c74b00946ad9d2608a92925e43457edf0 SHA512 51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7
-EBUILD itstool-2.0.2.ebuild 837 BLAKE2B 1ad56589c59923aa45eede3ce55a1a1085c86fa4d3892ca785176f0bc6211be339eff7d4401f31f1fcebabf2ba2856f403f88a7fcb71a6f687cd92efa72dd17f SHA512 271397921b8ced79de20f73cd3c8abaa8ef9b1815b2f09c6ec0a7446019acc02d587928df02dd73e151207897f0c5abbc891c955ad9f1b476c8f7d28cc9e0f53
-EBUILD itstool-2.0.6.ebuild 879 BLAKE2B 4812c5bbf36c3de33bd36e4bc2396f09df39e1f09305e92372e0a5378ed432bfe24d6d5995bd5806f0539e1e78752afe341382ce6d12c6cde713b0f631764142 SHA512 b1ea4b7ff3607f6d05a3a1a58a8273c8018603fe7acbfa017c168d6e255e1f1a95b02c8096aa172b1998a4d7d0ec8df6b57052d16213c6a36fbae7f9047c2f83
+EBUILD itstool-2.0.2.ebuild 870 BLAKE2B 45e161c7bfa072db3057f5d1a33ffd3d02360cc23702fe337fb208e6a4fd90d269d6af641ccb713d0d78cf0effe1a67ff4ab7c30f6cf80e602d9645a9e6171b4 SHA512 f663b0a482419ac9bc0223939a9c4c5514b779d487b380766c8ce99c50cfc62fbbc21256ed8242dfd59617635c2129d7182a72d88c18309a8e6bc53606349241
+EBUILD itstool-2.0.6-r1.ebuild 915 BLAKE2B 6c071f9d6e7b5cee14ebf5e4f7a9f27609a690b0a3a3266bf3cc6dcf6c9592f5ab872a57f55b2ce836136a19a5c69dae86fdbba3b5a941aedf44bb7a6a5a8583 SHA512 4cccece82e692b9f0af87ef43ce11220f9d1e4b5e1438c6a2e701510eadb08e93fc1e2b95422c9f18e5259675fd27de935141328d370de0b42663fd80f746552
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.2.ebuild b/dev-util/itstool/itstool-2.0.2.ebuild
index c970a0e502df..2606e551b647 100644
--- a/dev-util/itstool/itstool-2.0.2.ebuild
+++ b/dev-util/itstool/itstool-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${RDEPEND}"
 
 pkg_setup() {
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..d277093282fd
--- /dev/null
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit python-single-r1
+
+DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
+HOMEPAGE="http://itstool.org/"
+SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
+
+# files in /usr/share/itstool/its are under a special exception || GPL-3+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
+
+src_test() {
+	:
+	#"${PYTHON}" tests/run_tests.py || die "test suite failed" # Test suite not shipped in tarball
+}
diff --git a/dev-util/itstool/itstool-2.0.6.ebuild b/dev-util/itstool/itstool-2.0.6.ebuild
deleted file mode 100644
index 444c8f20eec7..000000000000
--- a/dev-util/itstool/itstool-2.0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit python-single-r1
-
-DESCRIPTION="Translation tool for XML documents that uses gettext files and ITS rules"
-HOMEPAGE="http://itstool.org/"
-SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
-
-# files in /usr/share/itstool/its are under a special exception || GPL-3+
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-DOCS=(ChangeLog NEWS) # AUTHORS, README are empty
-
-src_test() {
-	:
-	#"${PYTHON}" tests/run_tests.py || die "test suite failed" # Test suite not shipped in tarball
-}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 2cc6ff80fffd..19c870214241 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,7 +1,7 @@
 DIST kdev-python-5.4.5.tar.xz 1072356 BLAKE2B 5ad613c5a32d1fd8661a007f96aac228aeaf0b6b3baa33d2234672e13e70b70adab40f78b914c6b4ce5592e3a90e7e12442c988cc577ac103ca3fc51c2dc6d74 SHA512 d21a4032304b742885718d52bc3ea36885f48ef3f778a1b36b2d75a007cd7a84941a764950d3b2510060809e5c56e541a6216faab723b9c6334331c2c39eb5a1
 DIST kdev-python-5.4.6.tar.xz 1072228 BLAKE2B 199b8f1b0f6a4f072f2fdafa25b2653cfe855c10d601f3be7f47db84140aea84987cf1ae5f0ae19e08af5b3092cfab16aac0704f20ed46c6d872345482a663f3 SHA512 116b5649f59c2ec46aba083f9e0edebfb481c86d7677ce08fe69e161e344addbd6b4f9c955ebc2866ea118d3139377c59315c46b9e7defec119a47ff50bdd2ac
 DIST kdev-python-5.5.0.tar.xz 1073728 BLAKE2B 44a2d2ab47dced0c3c2b91a6bb269ff84e022bd4ae1036358bb7586baf8116432944363ea540ee90b22ff2bddd2cf1047c838a2404f31d6206779c53b35cf721 SHA512 6fde0221de7407a12d29c4a1df8d0d6e965613956d1b5a7fd375f4dd8ab34784b92e5b22dc523c8ce6a4aca80dc3dad16b3e549c0569959b35023b18434add26
-EBUILD kdevelop-python-5.4.5.ebuild 1212 BLAKE2B e4ba668c7c59787d17812a647b41a284221cac3b56d98c8dfa1fe7a00b5af9f245fcc7bd11026cde8f8e1c78cb6754640b9a224fc9009ca51305bd6a9b48ba88 SHA512 d1d585ec58bc73a0bec5e8ed7b964cd74622973ae98f398bfd36a6b93128bee77f6db82a0d294982b406553ef751359d676d61f5e3493e5e5e7ad6d40ae9baa8
-EBUILD kdevelop-python-5.4.6.ebuild 1214 BLAKE2B fc23d22751f44d85e546d3ef3d729e0f65fc1cd2b3dc61be1cbf9831118efef0cf6a3722c3080ddc5981201266f52b8347bd762a8ccd851f116146ff06af9f7e SHA512 7ea709ab6cb2e40482904634b574e8ff79e468c998a60b0845e974c6dc7e95813606a4f0a96af85175724f78077744268ff1feb40a7819058180eee17a174ae6
-EBUILD kdevelop-python-5.5.0.ebuild 1214 BLAKE2B fc23d22751f44d85e546d3ef3d729e0f65fc1cd2b3dc61be1cbf9831118efef0cf6a3722c3080ddc5981201266f52b8347bd762a8ccd851f116146ff06af9f7e SHA512 7ea709ab6cb2e40482904634b574e8ff79e468c998a60b0845e974c6dc7e95813606a4f0a96af85175724f78077744268ff1feb40a7819058180eee17a174ae6
+EBUILD kdevelop-python-5.4.5-r1.ebuild 1248 BLAKE2B 3c8f35f9469adeee5814470cbb1d48a8c2c5481e1621d3c8e81281771cb2e5ff0e74d1366ad4d5ad2f1b1f1870e35e3aef6b7a092160ed3d53beb7f4b772a7cb SHA512 ee6ae3311298a2a3e5ba52ce377265ce58e7fd927471821f55ec5e4ce5efeb6d0ab58701955c82a4c46fd09e9c754862917de0c6268e1d0fe00f1a5ff68b45cd
+EBUILD kdevelop-python-5.4.6.ebuild 1250 BLAKE2B b1d8ef9a9156c286ae962a351e8a00511f3f2c5fe0217930f0c2073634eb013a20ed2eebb24793209efd4fda43f95fca2874a54bee32820ff7e21fe2117a7bfe SHA512 348765baf12fb2f4b4b7d3f38582a6ebae407afb32b54ea2b3a78c29025067543eac3efe7db7ce4008b01104685aee686b9d2f7921a5904dd29fae75b87e4489
+EBUILD kdevelop-python-5.5.0-r1.ebuild 1250 BLAKE2B b1d8ef9a9156c286ae962a351e8a00511f3f2c5fe0217930f0c2073634eb013a20ed2eebb24793209efd4fda43f95fca2874a54bee32820ff7e21fe2117a7bfe SHA512 348765baf12fb2f4b4b7d3f38582a6ebae407afb32b54ea2b3a78c29025067543eac3efe7db7ce4008b01104685aee686b9d2f7921a5904dd29fae75b87e4489
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.5-r1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.5-r1.ebuild
new file mode 100644
index 000000000000..ed59051526ef
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild
deleted file mode 100644
index 5cd079d31e5f..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
index b91e2c1036fe..35aff36588ac 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
@@ -41,7 +41,9 @@ DEPEND="${PYTHON_DEPS}
 	dev-util/kdevelop:5=
 "
 RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 RESTRICT+=" test"
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.5.0-r1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.5.0-r1.ebuild
new file mode 100644
index 000000000000..35aff36588ac
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.5.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.5.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.5.0.ebuild
deleted file mode 100644
index b91e2c1036fe..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 0ccf9de4b8f3..ccd8836e51ac 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,7 +1,7 @@
 DIST kdevelop-5.4.5.tar.xz 7011816 BLAKE2B d067b0b034014b2f3ef7e177b59bde7c86672e8718d6860c5945ad8c8df7531cb427bed1f96b8a8d470da5a51e32134c389df53386a5c4a635825e6892cb060d SHA512 9c795402e10fceda63d0847260018f73d0318ea23a8b67db5c369259b79906a0877f1c43cdaccd5d6a456fef6bc06157dddc99bddc0b742c686057690656d5f5
 DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
 DIST kdevelop-5.5.0.tar.xz 7018184 BLAKE2B 165c54ffe021c420cb688180c44a856b620248180611356429e6a98523afef3d3ea5d7edaed10cee232e614bdb470246f3c9e7b46d3bfbb288efb9e04f6258fd SHA512 6dcce4c9b124fffbd278279e6b5b9f90dff8b2f90faacd8208256951dcf7ac1ab5ae21610347ab508d3e5df49df3096a6c049271f30b1ed84b0f8401e760380f
-EBUILD kdevelop-5.4.5.ebuild 4206 BLAKE2B 9ebbdfe406c2c7dd9543b9ca59c117dd070fa1b8043dcc3d924c4539e93b9bc7947b9c80e37982c1588e8069b9472edb8bbc18a16f958d6f94af17ee40736592 SHA512 269a12d204a1a3090ad1fd0812472e3b420f5153deb0cda68aa0bb5be60ce44dba35f938655d66d922def5e385eb16e07ffe2c44252f2adddee2f87e75ff6871
-EBUILD kdevelop-5.4.6.ebuild 4208 BLAKE2B f584a1f7d51b64d779ca1637fce0444e143b7dc019b647452a8bbbc0646bbc01edd849abea187e97f1a43614e424addc588b3c3bb4be61aff21f23c6fcfc5db9 SHA512 6dd6e298ff879fd5fe0783528f03e8462856dcc6f39ffb678f5cfcce6b416049bb0c99e85899c5309c8250d1fbe3639963674a10fbf87cc1194edff6cb761f17
-EBUILD kdevelop-5.5.0.ebuild 4208 BLAKE2B e14dfa7ebc945c6d80b38689904e063d67099d4b8c9cf3db8e9b6691bd297752409c28d09c5f384b241074ceb656b89ec427a65f1501487b886b4156cfc70dcf SHA512 fa5fad18258608652ec70fec83dfdbaacc9aa70c20507a1d2421ddc85a3999efc7450b0eaf020b045e883ec70c1184649ba60ea205ae8e5968596bbd4976381e
+EBUILD kdevelop-5.4.5.ebuild 4182 BLAKE2B 62d749e681d2ae1c04696116c07eb61febb5a8ba5037a940922ddd7af14152d286d975941adfca671e403ab6bc443c9c35e7f5a289095feeea414f9454c7b64a SHA512 805bc1f19cc1f7e83fcba44599a6c785a3dd6fdf2f283501f44e37e39643c649a3d82c35142d3108db428219cfe388966e60534b52062c82960734901f55ed85
+EBUILD kdevelop-5.4.6.ebuild 4184 BLAKE2B 46fbf4262b65b695ff06236e98811ef3d6f9f8331c025efce48cd1c97f572dca90b98fe3ba2e79c00df417a82551dca39013d6f950132634a240ac39b1a8b71e SHA512 b18b97ccaa683d913bbe706d5cbd555c21147b328fd7ce078958a8495bcb63e8a7f5105d7de62bda893ca87926d60d83a90dca7d6433ca248c6e6b530f296b8e
+EBUILD kdevelop-5.5.0.ebuild 4184 BLAKE2B 8c0e33affb793ed26a46f302539474d35ed25b7b348dfdbd600eba6616d5f50d6953ad5c02a401c4441517d27159b16e589f8b656b4a846c8bb4c06a4d6d4075 SHA512 e29af32bebbe59c74ca801323dfdd87accabcd068557d1bba5ec8caea5dc9e1cee6fc3f54e830313ccc041100814831ee328af621da8ba55f6ae85730510552d
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.5.ebuild b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
index e431aec2acbc..aed3f2eb6593 100644
--- a/dev-util/kdevelop/kdevelop-5.4.5.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
@@ -95,7 +95,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-devel/gdb-7.0[python]
 	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
 	!dev-util/kdevelop-clang-tidy
-	!dev-util/kdevplatform
 "
 
 RESTRICT+=" test"
diff --git a/dev-util/kdevelop/kdevelop-5.4.6.ebuild b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
index 5590f33b0143..b13b61d8b882 100644
--- a/dev-util/kdevelop/kdevelop-5.4.6.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
@@ -95,7 +95,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-devel/gdb-7.0[python]
 	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
 	!dev-util/kdevelop-clang-tidy
-	!dev-util/kdevplatform
 "
 
 RESTRICT+=" test"
diff --git a/dev-util/kdevelop/kdevelop-5.5.0.ebuild b/dev-util/kdevelop/kdevelop-5.5.0.ebuild
index 97d8be27a258..c9a2d82240aa 100644
--- a/dev-util/kdevelop/kdevelop-5.5.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.5.0.ebuild
@@ -95,7 +95,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-devel/gdb-7.0[python]
 	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
 	!dev-util/kdevelop-clang-tidy
-	!dev-util/kdevplatform
 "
 
 RESTRICT+=" test"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4f126f6849cb..4e977149b4cb 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,10 +4,10 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lldb-10.0.0.9999.ebuild 2382 BLAKE2B 5daf2ebbcac5611bc6c4f3532de45717dcbada6938d5be50fd993288dac115009258c43cf42523dec4db1b54927c12aaf49802a223d4f761cf20d7877f314678 SHA512 5e558304588a243f9618055778e5398c7a78a5e718ff2671df68f949d3cb17d2cac722f5c50353a6fcd6dcad4d69463d83cdf648a1f13f015d23a0e3058ad667
-EBUILD lldb-10.0.0_rc1.ebuild 2382 BLAKE2B 5daf2ebbcac5611bc6c4f3532de45717dcbada6938d5be50fd993288dac115009258c43cf42523dec4db1b54927c12aaf49802a223d4f761cf20d7877f314678 SHA512 5e558304588a243f9618055778e5398c7a78a5e718ff2671df68f949d3cb17d2cac722f5c50353a6fcd6dcad4d69463d83cdf648a1f13f015d23a0e3058ad667
-EBUILD lldb-11.0.0.9999.ebuild 2382 BLAKE2B 5daf2ebbcac5611bc6c4f3532de45717dcbada6938d5be50fd993288dac115009258c43cf42523dec4db1b54927c12aaf49802a223d4f761cf20d7877f314678 SHA512 5e558304588a243f9618055778e5398c7a78a5e718ff2671df68f949d3cb17d2cac722f5c50353a6fcd6dcad4d69463d83cdf648a1f13f015d23a0e3058ad667
-EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
-EBUILD lldb-8.0.1.ebuild 3078 BLAKE2B ab71eaa79f68bb2023b3a1376920fb423e9ecd643bdd9421924889ceb370c549fea57f6d8513e2b41305729f0380d62940656023f098c4773f834fb41d591ed9 SHA512 0d78eaadb05dccb38a8e02ddd9b0c7740be3438f65d17766cea26112d74c91ecc204d4eba80eb39a80009276d8baf8166e59987eebe13674eafe5794381d3189
-EBUILD lldb-9.0.1.ebuild 2318 BLAKE2B 74047aad559a58ece8df8682d9f237e1a1e4b655869ba78a5d2379cf5ef16429058d0728fe6851666c79cab9bcc90319a6f5b3366da4e085267af17c644f6c50 SHA512 1e24bb6c916bd2e85aac3d83c687532a063fe70f9c4b327e42877dca0606ecbfaed34bb7359114ae896693f5e21542c317403e0c8e3b0af4e880ab151519a8fa
+EBUILD lldb-10.0.0.9999.ebuild 2462 BLAKE2B b37292bd9fffc2a07989afa7a75b49c04ee625db4d8b47d741e54bf4fb9378c1269ea155f616d4e7936ea915ddbe14648755c2d97cdd00f994e645eb83e5c702 SHA512 bb528c1c6f08fd5b114ac63a06947920615c9573c02f9f33c3910bb2a55c53851a988d680db7e367bcd86e79e016d7be8e6c0f5e417042d41e9d5be8c8695c68
+EBUILD lldb-10.0.0_rc1.ebuild 2462 BLAKE2B b37292bd9fffc2a07989afa7a75b49c04ee625db4d8b47d741e54bf4fb9378c1269ea155f616d4e7936ea915ddbe14648755c2d97cdd00f994e645eb83e5c702 SHA512 bb528c1c6f08fd5b114ac63a06947920615c9573c02f9f33c3910bb2a55c53851a988d680db7e367bcd86e79e016d7be8e6c0f5e417042d41e9d5be8c8695c68
+EBUILD lldb-11.0.0.9999.ebuild 2462 BLAKE2B b37292bd9fffc2a07989afa7a75b49c04ee625db4d8b47d741e54bf4fb9378c1269ea155f616d4e7936ea915ddbe14648755c2d97cdd00f994e645eb83e5c702 SHA512 bb528c1c6f08fd5b114ac63a06947920615c9573c02f9f33c3910bb2a55c53851a988d680db7e367bcd86e79e016d7be8e6c0f5e417042d41e9d5be8c8695c68
+EBUILD lldb-7.1.0-r1.ebuild 3171 BLAKE2B 9f53fa589292b8b2ac77c950172c5a9c8c63b1e76906f560ff1f9564c910b4fea6fc5366c55a4479782209df7de2c40c14c967d733aa524b9fd45ff446b69a2b SHA512 d7440c64bffcbb075b2752e939ba3495f1618a0debb88ff00b31fcd0bb31b4b29005b48094e37ad04fb9231571a1ffc123b7d8048ae909f71e1a21b85c3b2bca
+EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
+EBUILD lldb-9.0.1-r1.ebuild 2398 BLAKE2B d7200682b56826e28979ec37b822d460f6fe01746d735a6cc2da56210798e6cd24e5d7fa8f6b386e913674363f473033f657d639b945bfe07ef2c033194ddd55 SHA512 64b2a9b48049ef8c3156b30231655d87528259497e73cd5b93af2118f32377787b61ca8f7e6c4246d581a9c4fbc0b879ba7b2832ec2b09f70c9b43eb3dae5168
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index 332d07439b76..33100fdcdcc4 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -24,8 +24,12 @@ RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
 	lzma? ( app-arch/xz-utils:= )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
-		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-10.0.0_rc1.ebuild b/dev-util/lldb/lldb-10.0.0_rc1.ebuild
index 332d07439b76..33100fdcdcc4 100644
--- a/dev-util/lldb/lldb-10.0.0_rc1.ebuild
+++ b/dev-util/lldb/lldb-10.0.0_rc1.ebuild
@@ -24,8 +24,12 @@ RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
 	lzma? ( app-arch/xz-utils:= )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
-		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index 332d07439b76..33100fdcdcc4 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -24,8 +24,12 @@ RDEPEND="
 	libedit? ( dev-libs/libedit:0= )
 	lzma? ( app-arch/xz-utils:= )
 	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
@@ -33,7 +37,9 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	python? ( >=dev-lang/swig-3.0.11 )
 	test? (
-		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-7.1.0-r1.ebuild b/dev-util/lldb/lldb-7.1.0-r1.ebuild
new file mode 100644
index 000000000000..a1d46a863097
--- /dev/null
+++ b/dev-util/lldb/lldb-7.1.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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 llvm multiprocessing python-single-r1 \
+	toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="amd64 arm64 x86"
+IUSE="libedit ncurses +python test"
+# Tests are known to fail, and we are not going to address the failures
+# in this version.
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+	)
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/lldb/lldb-7.1.0.ebuild b/dev-util/lldb/lldb-7.1.0.ebuild
deleted file mode 100644
index a2c3d26a6531..000000000000
--- a/dev-util/lldb/lldb-7.1.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="libedit ncurses +python test"
-# Tests are known to fail, and we are not going to address the failures
-# in this version.
-RESTRICT="test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-8.0.1-r1.ebuild b/dev-util/lldb/lldb-8.0.1-r1.ebuild
new file mode 100644
index 000000000000..fa7d98390e6e
--- /dev/null
+++ b/dev-util/lldb/lldb-8.0.1-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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 llvm multiprocessing python-single-r1 \
+	toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
+	test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="libedit ncurses +python test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+	)
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1.ebuild
deleted file mode 100644
index 2adb8cdb9ad3..000000000000
--- a/dev-util/lldb/lldb-8.0.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 llvm multiprocessing python-single-r1 \
-	toolchain-funcs
-
-MY_P=${P/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
-	test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="libedit ncurses +python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-9.0.1-r1.ebuild b/dev-util/lldb/lldb-9.0.1-r1.ebuild
new file mode 100644
index 000000000000..2afd2452347e
--- /dev/null
+++ b/dev-util/lldb/lldb-9.0.1-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
+	toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 x86"
+IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-9.0.1.ebuild b/dev-util/lldb/lldb-9.0.1.ebuild
deleted file mode 100644
index 20d744e17b96..000000000000
--- a/dev-util/lldb/lldb-9.0.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="libedit ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
-		sys-devel/lld )
-	${PYTHON_DEPS}"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use python && python_optimize
-}
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 0d96f6e94632..9fbfbcad9c91 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,3 @@
 DIST meld-3.20.1.tar.xz 594812 BLAKE2B a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78 SHA512 cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
-EBUILD meld-3.20.1.ebuild 895 BLAKE2B 3fba9c3984529910a5037c95d94bc0bca502e41ab536e8a9f0137eec297f9bb3fd25eed865c48c25f78c6870c94454e2bf126a50076e3c2bced9b8867c64bc88 SHA512 058ba3d3c59d6747e575f5f602ce0fa238d22dbcf01b7490cf86a0870b031ae82ee3dae19425b43d4159cf054f9f723559c06069f1ab8ee8e18c89325a6e0328
+EBUILD meld-3.20.1-r1.ebuild 931 BLAKE2B f0d83fb33c7a2fca0bcea034fe25ca8439cdfca097fdd3ae571f416e65d45b59042132bbc3e1a9fc65255d5fde225678c329c4eb8d8e562fe54a9ec2de100afd SHA512 62b485acadc0572a74c89802e3818acac8e8eb4e3ea2cbb1b0baffadf64cfcf433defec7cf1d08859984b80eb815ef5c004d20bd301c4fa4ff01be6a504459bb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.1-r1.ebuild b/dev-util/meld/meld-3.20.1-r1.ebuild
new file mode 100644
index 000000000000..7891198a1d56
--- /dev/null
+++ b/dev-util/meld/meld-3.20.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2[dbus]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.20:3[introspection]
+	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/meld/meld-3.20.1.ebuild b/dev-util/meld/meld-3.20.1.ebuild
deleted file mode 100644
index 7b08ebcc80d2..000000000000
--- a/dev-util/meld/meld-3.20.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2[dbus]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
-	>=x11-libs/pango-1.34[introspection]
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/itstool
-	sys-devel/gettext
-"
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
diff --git a/dev-util/molecule-core/Manifest b/dev-util/molecule-core/Manifest
index 2e8bb1abe046..ec64fe82a14e 100644
--- a/dev-util/molecule-core/Manifest
+++ b/dev-util/molecule-core/Manifest
@@ -1,3 +1,3 @@
 DIST molecule-core-1.0.2.tar.bz2 30616 BLAKE2B 00aff5ffa61eac63dbd9bf93027f24e5953a1cb1daa8855e9904f75b8afc68677306ccda40cb5a1db765b086a8cce608ffa5a24efd69de7cab86c43ae3aec07b SHA512 1f501960e4029cb993680c7356aa8fc0ac7afa249d106b4ce97afb39f58cd666640bcf9fd8cee64482077ad23f91da743d6ce54e82863faab20d68a1814d92cb
-EBUILD molecule-core-1.0.2-r1.ebuild 621 BLAKE2B ca04a0d60702c14edcc2fa8f53c329836860485d056101fe88be7f56798bad38bb594a28b82ade7627678d4a2178274ff465384f35424b68a5546f449812042d SHA512 dc94063aca6731747a3079c87672be120e48a57c78e73151f7767915edfd2c55402d5bcc88dc1d323e1234384a9e649e7886697bb122b880480fb3326344184c
+EBUILD molecule-core-1.0.2-r1.ebuild 593 BLAKE2B cdbeab18d059ff73bdc7850b089589e818744dfffbc721abbfcbf74272960bb65701fa7e01bcbb99ffda016919638ec17414528703ad2547ce68c370e2163501 SHA512 8aa0fc8d11605cb1ba0f703935c6ec2d87ece0049588e8d9a649a6ce1b85149b9789fdb269647e6d3e19596385139819fda8d8f99e891f8e4f41e6f1b32946eb
 MISC metadata.xml 1197 BLAKE2B 2ab6fff633d6e31b8c8721f39138026dafd6ac7a5fa9e559e93f39b12e59a4f449704a8a2f4c3dd2f2d1aeb1572e0af22afb54ecd0da9b1165c0af5ebeb43f08 SHA512 740155e85fbd48b3e747a88cd6a1b612f1f6802e9a62c7a3f454fa4908150e0c37ed3c10505b4192acba929d45714bad4856aa3945c33ed5fd48e59435553362
diff --git a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
index 042948d69fd4..eb6c76146ff1 100644
--- a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
+++ b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
+
 PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1
@@ -13,12 +14,11 @@ SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="dev-util/intltool
 	sys-devel/gettext"
-RDEPEND="!<dev-util/molecule-1
+RDEPEND="
 	sys-process/lsof
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
index 5f483b6ca30c..f1e2a0ca4950 100644
--- a/dev-util/molecule-plugins/Manifest
+++ b/dev-util/molecule-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST molecule-plugins-1.0.3.tar.bz2 17662 BLAKE2B 6bbbd484ec7fc8441bfccc8c716475e9bf831804a79a0add1dedd428f2dadbbd1a3025966db25619c34364f2a0b6873946c121f1df6fd3a2dc041a3a7341565a SHA512 e00bb7ed9a19452f0363e3453b56a86c22b2f96b843798ad20c6c61a87acf72a389158bb7c8b1b09cbcdfbcbb4b081996c47b6327d790b72c98a13270ce4cb6c
-EBUILD molecule-plugins-1.0.3.ebuild 678 BLAKE2B ebd1dcf59c70ac15ed36fb062340e1e8b757102478606bbbac3e3302f57da42ea511f8a273d574029dbadafe905d9bd9fe315933d62786ff9c55501e68f89806 SHA512 f3b35c7825526fba5cbed0ffc2bb465eea4b1df25c00cdbf9d26c4bc3c823d8c185c7a489c772c1af5a7128dd0efc92b465eeda52f0362a96ada97f461577fbc
+EBUILD molecule-plugins-1.0.3.ebuild 648 BLAKE2B 527419a85922fdc9ff3e37c438649898cde7a138af270d0b65527e9fb4385b78b49ed76d8ff5e7f66cd470190e8d812a9aa415119c01df5ad52666a3e42d80f2 SHA512 199266e104fdd65a22e9418d9aa02a1b50853cb1acecbe7dc426a62f00456869363dc284ff7d60a29e358816ffa633372d501afde98f84d9439c4d34a836569e
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
index b42a13d5ae25..440806e6e83a 100644
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
+++ b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
+
 PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1
@@ -13,12 +14,10 @@ SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
-	>=dev-util/molecule-core-1.0.1
-	!<dev-util/molecule-1"
+	>=dev-util/molecule-core-1.0.1"
 RDEPEND="${DEPEND}
 	net-misc/rsync
 	sys-fs/squashfs-tools
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index 7c995f6ee3a8..00b0b69290cc 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -4,5 +4,5 @@ DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c
 DIST buildsystem-1.8.tar.gz 38617 BLAKE2B 0fd5539feae0b81828efe90c82baf6ce7fceec2f2189adddb0e32d2106f9263ebd14b32f3dce8daae13110f0e69801caed48ce81709ce09d809ba50041690cc7 SHA512 0f577f4867e5e12770f9b9c42ea55e884362180bc195b6ebf56e56305ce84e230407cd2ebb3b182cc03087ffef5f39187e52e2e2f8f2b86aa20a16fa33bdff8b
 EBUILD netsurf-buildsystem-1.7-r1.ebuild 703 BLAKE2B e899d1dabcffcb2de57ebfc6cf9cc3881293eb6ec8f326ecd0bb2cbb67cfaa259f5f5b0e2171a87cafb3028618053066b4b377b947f8c16e17625ea6658d44da SHA512 0c3ae21fed977aec71868fbcf65592d07e53d54ceceaf0403be67da250c1579aebd1180cfdaebabeeaa2034b5ad3612ef5ae68c41402daecc431ae30da00e9ba
 EBUILD netsurf-buildsystem-1.7.ebuild 667 BLAKE2B 5ee9fa5f299be918fbb2a0a0d1b6ea7d9ba59f46a33b7adcfc79f983be441716f7fd5daeb958b77bc24e24134e750c1f1cfe90a433061d1e20c9ba86bbf852ad SHA512 6f1d11399681e786a997efd6cbfbaf7f393c919626f681f9360ace98a6b7233210053d6e5109311dbd4b3edf0d6327d0aa1c7f736eb8ada9bcc4d4f204865c20
-EBUILD netsurf-buildsystem-1.8.ebuild 698 BLAKE2B c6023d4d2d4ff1ed48b07cb6409f4b775f17a128e4829234911a626a7902be4a0726068ecd136c0a672205fbc6c261a9f8d3801ad0896d31dded415ad5983cf0 SHA512 948d75658a74188ab56f74462f45f8fd8e1120e604ca6ad0fb4343ff6baa6ccfc65f3ffa5fe6ca18939e439698a964b50fa4fde6c26aac0be730f01d45c79b9e
+EBUILD netsurf-buildsystem-1.8.ebuild 697 BLAKE2B 2aa1b000abf3d8b3ad0c5c15c5e60619a9108709f8272e8a390ad478f23285117c76b7bf958b68a1be9070d373455235bac1cb0f6e2b38f26162bdc8f9ca767c SHA512 6dd95f3bd5bd75b3b302229aa160fc2078f31db8991dc09106ddb6fd3b3ccf48527c3e5df9d8eba79b344de283ced8d622e97c8714d3f76fe62056714dcb6d6c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
index 8ce86e785d65..9d572ce4508b 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 3b8d8fae8a4d..dd3f5338f7c6 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -3,9 +3,9 @@ DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
-EBUILD ninja-1.8.2-r1.ebuild 2700 BLAKE2B cd4447774a0d216c683a50f4e8da0e929819906357d1cc5d523024e26a3c58da448dec07118958b15e4fad058189d3c07bd8857645c23db4ab76882b2d9635ff SHA512 1ffd863f81980669ab90f003e46fa7447357a7d41a53cb7414fcc7c1006095d78ed28d535797059523235cf11acec49e4dc666855f9f933a0bdf86539347977f
-EBUILD ninja-1.8.2-r2.ebuild 2700 BLAKE2B 2c34df96e0b655a249a1e6c01e5429101c212a0658332daee1befcaa1ff14af5397ba19eb2703ff1c37c73942347a6a455c5c5bcd8d5f125b326cfd3ed69f5b8 SHA512 00d767a58867ffd834c4c775dbf573dfd276c563be166f660139f51dc99b1d1848112f600624f7221c01bdca3649b713ba84b5dc91246c4eaebb1fd7f818b497
-EBUILD ninja-1.8.2.ebuild 2558 BLAKE2B 3e1fb8f8376723ee47c59fbd94ab80a877d0105fc5437f419ddaf630079d43c08e93fa973b200585c6de361e0b383c8b59e792bf198aaa32108c6fd70e5f550b SHA512 e620286445437b8bd3d3963aa209e0d1662802e5e710830bba156912a2bf62b656ef9ad1c1a94d6332b22ea7875a4093653dd1193d798ddf74270fbc480f1906
-EBUILD ninja-1.9.0.ebuild 2762 BLAKE2B 84a230be226d88b6a421cb287e283d4d5b5a8fcaa17a3b90efa99daa9541fc5608f051612b433273274a59a7d864a44d18e6513859200a1696d3e9aea953d750 SHA512 1b8d72ae9da50bc0b9573bac266ca9b96272fcb9672b2a171d806fcb3b7955a23b12e465c667c006be5e8c605a09eb9a3862d73403df97893c75d3196e48dba9
-EBUILD ninja-9999.ebuild 2711 BLAKE2B 999158f073e0e89d4ac3448d50a775a4b055c9a9524aa92cd8e0f3c9b0591aa798e9fcb5649ef26c9316686e4a3eccdb998834834686ec64243441f094c75cf7 SHA512 781697bd6aca1615c37eb3b3baa68f92ce3a157f3f9a8a7baf76d97902824b0b35a7513638577c54183dda83a00632fe4bd9cb55602d67c262d23d4896180134
+EBUILD ninja-1.8.2-r1.ebuild 2654 BLAKE2B 5d0757bf132dd69674690f2c5f51655f93f0aea24d8d7e38bb4350ea654bfb282bfb9701e2a8c60d79874e51e87957303ffa8dd4847959487c5c092cd7218fc7 SHA512 cd6dbd86067de10d3aaf5b1d770ac326f0f6cdff956cc7fcf3f52a315ede06cbcb49bbded6f738563b6ed81fa058c1491a7ca71864872a89ec8265d499e7313b
+EBUILD ninja-1.8.2-r2.ebuild 2654 BLAKE2B fd8f1228cf17a6ffc0d7e639ccd01adc30074fb176845d6356640623e6d63c8f0cabe16fac2251fae1fe8377d2b6a5df317a7f1eb5748cf05d8985473e79d8ea SHA512 994796da508fca452ae76fe1dadc4b1fb278a5f0f406a948fde2823eabca2167be4a57f020c3675e61e8b496c856e77420ba5c3a51ef6fc3afd14bff12756e8e
+EBUILD ninja-1.8.2.ebuild 2512 BLAKE2B 3f0f843aa2ca6a0b59a89171519065080a66fd6216bbfb23ae9fdc9c51851e4f211efb70048bd650d1dad1ba6006b5091e3dea7f00c174e10f71c2d2fd7355c4 SHA512 60bfe10982ccb0b6a44aa17a690fe674aa740a2c3c6fc251d999c1537b8fbfba56af47b4a1dc30e6de32b097f38d19beece276f7e3e404d6748b5adcd4def9ed
+EBUILD ninja-1.9.0.ebuild 2758 BLAKE2B 741a1dd283d4230ca400290abf865cc00256deadd1796633c563d9c31b4587436dedc85015a6e86471755d054941ee86cdca79c5f82bc80c2ec6fdf1b90d671b SHA512 0494684f2f2f2bab98b9c45f0c3cb7aa414b92636a0494aedb46ee860ea59bc9d59146f850c4a481f6ddb11d75ae4a92001c995b59c3d8a0ecbd07773d3d3689
+EBUILD ninja-9999.ebuild 2707 BLAKE2B 691b88ffd652b9ad6aaa5e881fe6f47a08e9f6e87d8d80b3e9fb20947c59b2b833da7c6bc7ec778945ac8c2316a3496fea1d84d78502460b35808c15ad80842f SHA512 cce1a3a1900b27d9dd1cb2517f70ff65735f8c2c189886797c9d8608681634ce0de6c2a319e12b6c8bfe99dc5bffd51bf296e2260b54ed8dd8057217c732ff56
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index 792e3102bb19..def8432c182b 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -44,8 +44,7 @@ RDEPEND="
 			app-editors/vim
 			app-editors/gvim
 		)
-	)
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+	)"
 
 run_for_build() {
 	if tc-is-cross-compiler; then
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 51bc23afa6b7..155653a132cb 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -44,8 +44,7 @@ RDEPEND="
 			app-editors/vim
 			app-editors/gvim
 		)
-	)
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+	)"
 
 run_for_build() {
 	if tc-is-cross-compiler; then
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 939c76c4ab26..3f0879829033 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -41,8 +41,7 @@ RDEPEND="
 			app-editors/vim
 			app-editors/gvim
 		)
-	)
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+	)"
 
 run_for_build() {
 	if tc-is-cross-compiler; then
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 843267a75dde..c0e633894cb9 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index e9f27dec4ff3..8c9e987cef2f 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/numdiff/Manifest b/dev-util/numdiff/Manifest
index da14b1b630bd..209da65dd6c7 100644
--- a/dev-util/numdiff/Manifest
+++ b/dev-util/numdiff/Manifest
@@ -1,4 +1,4 @@
 AUX numdiff-5.9.0-fix-build-system.patch 6824 BLAKE2B ab87d5f4df3df3077ccc182bcda77ab3c8eb707353d7365eaca391373bc371e2f15274eee2d2e82956a38e9d2bd61f15fee424b3a475a97d822f7ff041dce651 SHA512 4ae5dcb4534b11ed54d3ef8f44b48ec5a20b7c4eb747bd14be9c7ba078c1e3cfbd107a3c1da1dabc4aba5881e1b14e2decef41cce6d4a06e8e5c1a780ccf2818
 DIST numdiff-5.9.0.tar.gz 915117 BLAKE2B 3f1edda377f43a9658bb62de1bfc02c8ff26f93f934628d5ac815c68b30e8817b9e004821aaa8c741686af4641993defd20f48e241bbd91b1f8c1b6edb4502c4 SHA512 7be7aad30afbb2a964046815807be0d9149edd18364660443220ce7032248cf83bf840eaf89e19193c8c68ad075cfa81759301574ed73151526e4eea34d33f86
-EBUILD numdiff-5.9.0.ebuild 860 BLAKE2B c6613f7cf8249055a7d0d5968bafd5bb30ddab627c6430cd84bc8a0e46832a9627911fb02fad6e3ee99145e4057914c8c9ee3b9ac6a709b40f253a71af6780d0 SHA512 30c748f22fde1a546c238581224a96a97994f3db62817403829dd04b2190bb41101ac21f326b8dd0e73c75c6851099724d68377bd6ecbc60720d8c09f4ca160c
+EBUILD numdiff-5.9.0.ebuild 845 BLAKE2B 67c44f461e8681894ebde0ed3dfe65bacde40f9d31370d0d1847fc5b360d968825a6b6f17a627abdd3c78f2b55c8ba7212a0cf9b978a9152883c790c10e5417f SHA512 40ff52862aeab59aca29b5d358b568a325dac70cb8704c7d59b1a86b00f5bec12a66c7941371841da6d9f979064b87cad6409f864496f9ed19f554cbd42e5f28
 MISC metadata.xml 728 BLAKE2B b7459ab987baa5670b7ef5e050cf226ae89eb309887b1b950a3c363a231de229a594d8648aa6a32a9338a13a86025b43172c2c8e60a4c1b4c563a898e11e765a SHA512 f3480f48dd59ec51ae287c3a450fded09688865280f3b8e5d61b9b80d5565e75aee5ac9a5b945dd4e4ea00733709961f58e3ca09b793d3e3c1e4642f9bb0fd31
diff --git a/dev-util/numdiff/numdiff-5.9.0.ebuild b/dev-util/numdiff/numdiff-5.9.0.ebuild
index aeea42ca7bb0..ed9dec004b3d 100644
--- a/dev-util/numdiff/numdiff-5.9.0.ebuild
+++ b/dev-util/numdiff/numdiff-5.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="File comparision, ignoring small numeric differences and formats"
-HOMEPAGE="http://www.nongnu.org/numdiff/"
-SRC_URI="http://savannah.nongnu.org/download/numdiff/${P}.tar.gz"
+HOMEPAGE="https://www.nongnu.org/numdiff/"
+SRC_URI="https://savannah.nongnu.org/download/numdiff/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -16,8 +16,7 @@ IUSE="+nls +gmp"
 
 RDEPEND="
 	gmp? ( dev-libs/gmp:0= )
-	nls? ( sys-devel/gettext )
-	!dev-util/ndiff"
+	nls? ( sys-devel/gettext )"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index eea66d1488a9..c01812e6f567 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -15,8 +15,8 @@ DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3349 BLAKE2B 19495576988f7e01178ecef6117b4e1a1186ec98174ab77bc14233ba55b199c4ac7068e4f734eba984f6546883aa8dd1787c1eda7b40c60829a0587d8286ba9c SHA512 719f934f1acf7599405a910be3b14f5888583eadc281bc93599ab8441b82c1fca6147d904a8622495c5410a86897c4acb45b3907bf44cc9e00ac9cde905e61fa
-EBUILD nvidia-cuda-toolkit-10.1.105-r1.ebuild 3768 BLAKE2B 3e0a0527e9f174452d27f4072bee45036737a6f4b1615ffdddd99eb1dcd65ee31ade936088c1df8596cdeb4b8b2c165a45753b213f3a9ba90ec0dae58470e29e SHA512 d833f528da327e9478c3ee1bcff3dd722f9a165f45907fd82079d4380aa627ae0e88c684a1c5c37b6397ef30428f01343b16465edeb0144322bfd2accc8f79c4
-EBUILD nvidia-cuda-toolkit-10.1.168.ebuild 3768 BLAKE2B 1499833ee57cd8f57243f1a4c7f2db7d5288945a217a8f56ce345b23ab820d2098f1d2b22a35550146e9f6a2a4806902556dce661acc2c83d358c6c6a4b77c2d SHA512 6737ffda572af284a65c07727dd4d7e67081e7aae3e7d656c3d4c5db7d9ef0f17ffbde069d7fc936d909881670ea34dc2025147741146a59a0330b16cc42444c
+EBUILD nvidia-cuda-toolkit-10.1.105-r1.ebuild 3766 BLAKE2B 23ae9496d807464edd0f6c0e4cd4a35f3f74f9f1a0f17933d6b74ac6bd66ed82983f9840e7cc2f6dc90b3390ab8675a25e3e00083128e5c4d87f09e4fc5778bb SHA512 ce961ea3d45ea6aed2a13e554ee1df0cfffe4766642dc8c13c5c80ce0cff94b57af5f5a6d7ed0f32cb798644cfb31360afcb01d1875fdf6f3aae8c4217b90d03
+EBUILD nvidia-cuda-toolkit-10.1.168.ebuild 3766 BLAKE2B 791325838877f6a2f4ec75b13ed5b4f6d4a7182ddf2fe19afaed308b2d4df67ed2741ec20e40f1fe48dd6cfa5734d4741ba2c0c091e274d649b0fb6863012e49 SHA512 d56254341196de6f5091eae3e537e1fccf066793d4274979b0915c1518adfa7b6c90941fe9b65caed1d68a1e87edb4318dbb1487069ad066639450d21181a99e
 EBUILD nvidia-cuda-toolkit-10.1.243-r1.ebuild 4068 BLAKE2B 8a0aed8f0b383064af4e78382e26c3d1b30148b2a952943cf24b04094a7fc7cada59df9a5073ccf49b409b79af2773aa5629b45bcb8d3b22bdcbc337fb425aef SHA512 9454e7b8b9e1078cf52f06ae297a9cdb5943368d51437c000a369aeecaf90d639f944039ec3deb194d9d83527efdf03b99e00b14a91169975720a6cda16e5385
 EBUILD nvidia-cuda-toolkit-10.2.89.ebuild 3821 BLAKE2B 002b8907aaf2b16f96f69ec692c4245ec0a1722a5bc017067cac8c465fb2e4381863385265a8b5799f43edc51522a3b2f50b2225b0d15f14481a27c6aa17d383 SHA512 b7df4abffcfc02732e66ae97ef1736362e9eb8d46a655a43b2b145cc04dc7cf1c08739782e5972d58c5dbacf9828f4a32fe124016d0265e60d43cf3604a18fdf
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
index 49309eb9f297..de2c8e277a46 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.105-r1.ebuild
@@ -120,7 +120,7 @@ src_install() {
 
 pkg_postinst_check() {
 	local a b
-	a="$(${EROOT%/}/opt/cuda/bin/cuda-config -s)"
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
 	b="0.0"
 	for v in $a; do
 		if ver_test "${v}" -gt "${b}"; then
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168.ebuild
index 2f30ea558cca..bbac873e8ec3 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.168.ebuild
@@ -120,7 +120,7 @@ src_install() {
 
 pkg_postinst_check() {
 	local a b
-	a="$(${EROOT%/}/opt/cuda/bin/cuda-config -s)"
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
 	b="0.0"
 	for v in $a; do
 		if ver_test "${v}" -gt "${b}"; then
diff --git a/dev-util/patchbin/Manifest b/dev-util/patchbin/Manifest
index 86ee022a4631..df7fb6c0b7ae 100644
--- a/dev-util/patchbin/Manifest
+++ b/dev-util/patchbin/Manifest
@@ -1,4 +1,4 @@
 DIST patchbin-20160208.tar.gz 9713001 BLAKE2B 4ce3c5d43f7b0a909b5058b3877cecef68f703d803bcb6a4e4b7e907dedaab98cbe87f33a5211a318f8146e9ef4753da18d58b3cbc8e4ff715b58d82227ad7b6 SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a
-EBUILD patchbin-20160208.ebuild 1103 BLAKE2B 0eecf61deea38d19fc0b31e507bd8fa94a5834108e8ccba8a9e86c2b50f4e3af579bbdf7104242859654ba8b655b5a26cb37feecacab120aa7008ef7151086ea SHA512 928d2db4d0b90e6617c0c245fd5af83652aa5f3579f443625d9356bec8ea0b8e2a25cfaab5623cfd6f6fe71979d49260b3a61650fafd733c005dc8ae8c6b9cc1
-EBUILD patchbin-99999999.ebuild 1105 BLAKE2B d75b7f420dfa0dbab95f5bdd13ca9fe8b577cddef936e709d7524d79e16e5594ef9fcceab3b95107fd28c60cd54634e5eeab5be020555c586caadefabbed8d35 SHA512 60e936f2309f222744ee7cddba01a50621fb32dbe979f738da84d75c91f0fc29277e00d6dcf221156bec4c71412f97755e63c7cf3f9dbc11a4749eb69ef271fb
+EBUILD patchbin-20160208.ebuild 1005 BLAKE2B 3d82acb4a83591fc62326a8255f77993831553ff855d03d2a68204d2695f547dd7c834df38e363ae868dc8d0d33b10881e6ca1f7faf4c3dc045e4ef1831f95e6 SHA512 b95dd4c43b002253828e53b14d11e78c10d7a859484bfba1f750c9b5a2df88fecf166049c5be34d760c983d38a136812ce04930e92adb9232ac817b1944d4314
+EBUILD patchbin-99999999.ebuild 1007 BLAKE2B d411705e8d857e4c6d3f69e6f9545ae630b3bba7384e018df8cc1310c208d081eeb829045696434074a3590a487dbfd0297ddb27ec9f5d24a669194ea28a77de SHA512 adcfd9d895cd87424bcbeb30711bdd0c137786c860f42dae86aeaa47197ee44fb62ea1f9c66aa71c831721de67c8dc9cf165f363a3a477001f4a281da7d186d4
 MISC metadata.xml 528 BLAKE2B 566d71b86021dba9948978378279d2a4c95d50e4402c31c3da9bb3e1ab50d1d6148e104e3e3ea4c688a2bf1f720f3c4379d3eefc2eb57d316d9952d3f1e04409 SHA512 d15966f28c81025fd34bc247fc2f3f4ceda3c7dadd23f28487c80fe3155666665b9dd451e59356cd6bdcd30197be9a0439ab5c0b9383ab655870aa9033d58d94
diff --git a/dev-util/patchbin/patchbin-20160208.ebuild b/dev-util/patchbin/patchbin-20160208.ebuild
index 314b06b51f67..37723059a047 100644
--- a/dev-util/patchbin/patchbin-20160208.ebuild
+++ b/dev-util/patchbin/patchbin-20160208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,14 +26,8 @@ RDEPEND="
 	sys-apps/coreutils
 	sys-apps/gawk
 	sys-apps/grep
-	userland_BSD? (
-		sys-freebsd/freebsd-bin
-		sys-freebsd/freebsd-ubin
-	)
-	userland_GNU? (
-		sys-apps/util-linux
-		sys-devel/patch
-	)
+	sys-apps/util-linux
+	sys-devel/patch
 "
 
 src_prepare(){
diff --git a/dev-util/patchbin/patchbin-99999999.ebuild b/dev-util/patchbin/patchbin-99999999.ebuild
index c937a002e2fa..69d98763e9f6 100644
--- a/dev-util/patchbin/patchbin-99999999.ebuild
+++ b/dev-util/patchbin/patchbin-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,14 +26,8 @@ RDEPEND="
 	sys-apps/coreutils
 	sys-apps/gawk
 	sys-apps/grep
-	userland_BSD? (
-		sys-freebsd/freebsd-bin
-		sys-freebsd/freebsd-ubin
-	)
-	userland_GNU? (
-		sys-apps/util-linux
-		sys-devel/patch
-	)
+	sys-apps/util-linux
+	sys-devel/patch
 "
 
 src_prepare(){
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index f76ecce4a914..c0bc0acecb66 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,6 @@
-DIST pkgcheck-0.7.4.tar.gz 222384 BLAKE2B 4461a4b01755a6e1095c4a80c001381807e7b153ecc1b7770b0b58e2f4aebc2db35cbe4f37354424ecb8c7d139cc2258568df28c00f0a0c082dec8831161c885 SHA512 11ba1ea9e40d56fb24c136296b8ff06643d3519e330421fd0ec336ff5d9fb079f9e04269cb1521a60e6d68fa5cd7c03e0c595a042d7f9ec77944a30e399abe74
 DIST pkgcheck-0.7.5.tar.gz 229979 BLAKE2B 134a67e139fed22f70fc5af5a1644df17ac46ca093b47cae0d362702ff33be320b838ac7c3c6e6d3c309644f7399ff0c33d6e6152d385be8312311b760d636d8 SHA512 eb46847ad5293e5cd6043e5f1edbb4307bf41593bc19a44c73ccb67590545055ce9fd3cddc25e4cc693bb2666aaf24944070796546743e0d7417f8e47cd516d0
-EBUILD pkgcheck-0.7.4.ebuild 1318 BLAKE2B 9373935373bbb8d12d78e6ee7a3e179e0c2adb1987e1fb22f379352d62486806010ff0d9136a37eb051d29487968eddcaae7b1e0045eea8c30e088cdf463dd18 SHA512 6b5ab1b5492d99685e041a6f78960bf5f0fd23dea682ceb94bf080409dbba5aa3c7cdfc18796ca1a30ea8e7ddfde9fabc92394610a7cef7276e1690adaefd5b6
+DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
 EBUILD pkgcheck-0.7.5.ebuild 1328 BLAKE2B de00cf2b30071fd2f9ae0dfe001cd1b42a41f77fba341ab06e0f2f623fd8ac10fd56593ab228d37b53e588fa79c5161eafa08c853842bf6255ec9bb7a9a8af4b SHA512 900be48478f2a12947263464f937c3f1b2868744ffbbee755c35fb08e1d982ab62ed165b4cb0d8cb11dbd3902a965691705885cb6e6ced6e6e481d96a54d4fc3
-EBUILD pkgcheck-9999.ebuild 1328 BLAKE2B de00cf2b30071fd2f9ae0dfe001cd1b42a41f77fba341ab06e0f2f623fd8ac10fd56593ab228d37b53e588fa79c5161eafa08c853842bf6255ec9bb7a9a8af4b SHA512 900be48478f2a12947263464f937c3f1b2868744ffbbee755c35fb08e1d982ab62ed165b4cb0d8cb11dbd3902a965691705885cb6e6ced6e6e481d96a54d4fc3
+EBUILD pkgcheck-0.7.6.ebuild 1328 BLAKE2B 6c4e1486d82f4adf6bdbd84697bae4a74c28c9c380ed256fab6dc431d4abf7007b70a54e4065a9d010d50aca2626e4d83346c19102b976eb0a8b1c95a0fbd153 SHA512 3bf0d03e5e931913f0721ba3474f59542bae97721428ff6cac17dd8e7c26ca17aef695933d492b98999dda6ec34eea7877a40bcf1bcc59246df5a92bdba301e1
+EBUILD pkgcheck-9999.ebuild 1328 BLAKE2B 6c4e1486d82f4adf6bdbd84697bae4a74c28c9c380ed256fab6dc431d4abf7007b70a54e4065a9d010d50aca2626e4d83346c19102b976eb0a8b1c95a0fbd153 SHA512 3bf0d03e5e931913f0721ba3474f59542bae97721428ff6cac17dd8e7c26ca17aef695933d492b98999dda6ec34eea7877a40bcf1bcc59246df5a92bdba301e1
 MISC metadata.xml 658 BLAKE2B a3140b5593fe37271a936139ddb1d0d0155213476353176837cc8587d0da787f99fbe568ff81c88abd4e20638c62527abeb0267404eae03125f11711d52c38e9 SHA512 3854c339a8b6f209f52782225ab37f76333f023db3d6bd7ed927b79aecc79837918b6af1cf0bfecdb7bb9d64bab5fa47dc287b30eab2508fd3df0bb26ac55cb0
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild
deleted file mode 100644
index bbcc3dd247b0..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="network perl test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.9[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	network? ( dev-python/requests[${PYTHON_USEDEP}] )
-	perl? ( dev-perl/Gentoo-PerlMod-Version )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild
new file mode 100644
index 000000000000..d3aed7fc337b
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="network perl test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	network? ( dev-python/requests[${PYTHON_USEDEP}] )
+	perl? ( dev-perl/Gentoo-PerlMod-Version )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 61ffc645f69f..d3aed7fc337b 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]
+		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 5b0f7c7e2b64..70d347cef48f 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2019.3.1.tar.gz 389620376 BLAKE2B a780ab27feef9747539d9cd607b67c7e047d0a7c1eb6b090a63c4f1c11c80c49e5091a29d80ea249ace1f16acdcd418f0a4901e10c2c623e792da9d7d0e7c9d6 SHA512 4bfa78a5f3993e85ad5ba624ed9e586d195b9f4bffa8bd764e8dba27edc1cdc0bd2b3bba86135156c1f306601db290703e61e7561badc7dcb634dc5826134b1f
 DIST pycharm-community-2019.3.2.tar.gz 391689310 BLAKE2B 11627839e823e2d6c946f5fa25df28cb919960300c51dcc2883989341228604dad9ebf365ffc055809bf3768d757b40cb059a7b5cc492935733c5576ff3f9933 SHA512 6c9e607d938a23be78b4acb5aa39e6276720347aac6fadfbaf456e4f05af4b55ef24f4a97f3aca91b6f09d68af7ec834a5af5e08b775d1439d573cff6c6d3e7c
+DIST pycharm-community-2019.3.3.tar.gz 391606138 BLAKE2B a07bf941ea7a98cadf6ff15b8f69e745ceecf0a820a098811d462a638b0d1b749e1580e23f0cfbdb78a9740e0f41777dd7d505527b6bc83f9c9d5e9ff70a6c95 SHA512 566667109662cffeaba6da9b5e5837adb00f8fbb29523f8415d4fd691cb71f7a40952d28c3713c0409ecbf50ce116ef83bf34a4cbe46015a2a11593771dc97a9
 EBUILD pycharm-community-2019.3.1.ebuild 1081 BLAKE2B d49f11879fd7738cc89bb207314120b1b4348085253d5cb6d125501e287f4ea30cfa0599d37eeec7ddff905f97786cb6a171c394ea352ebbac5d47d13e231396 SHA512 c67c25fc781b5219231b48aec8ddcd8051c23de6c4766b80d511d363c44cff1a5aaccea98d716ecb7ae4360c419bb9ea390d396704f1da11fb5c2de0ad6674ef
 EBUILD pycharm-community-2019.3.2.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
+EBUILD pycharm-community-2019.3.3.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild
new file mode 100644
index 000000000000..0600c9803a8d
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index f87c912833fa..22d9970e9a33 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-professional-2019.3.1.tar.gz 509724729 BLAKE2B cd466d9c2b0f9be8442c719066d5647f0b9631dde38b782d23250207760247380419d7470826da2d5c4203dbca2742aa8fcd1987a4204d229cd700ac6f6a68f2 SHA512 3c3ad0546926dac4a0e336e04a16bb5f630066c7b2abeb16eda698fcc92dd0c165237bb3ad9b6382b38b989e67b8c3a4649bf8361421c7da6916a99eb3ea4633
 DIST pycharm-professional-2019.3.2.tar.gz 513486485 BLAKE2B eba9f0adb8f289f42ee2f50df506dfe628e3b835aedd7a8c0c03da39e5bc5921a6600ea7194c81674a5aad50cbc2f2afb0387dcc88a037e1a92a4fa0f2f3984b SHA512 e3a0e750c821ebd6736e39641d635db1c0a3aa00592d7ede204ce547fc12d69209a253caa4284f76607543f08da594f29ca38c3f8b586848c5b2277ae7227b8a
+DIST pycharm-professional-2019.3.3.tar.gz 513714430 BLAKE2B 7891d5290b87d8f01904860a80f2a5b7e90e41bf894decbdf04f5f322ed269eaf042954ad17656594ee85dc5518cbc69ea4c6b12b9f3febeb068021751fba5d8 SHA512 33f40be3f20370a0a62833510ed9c69b0a022e9298540bea0287038edfd6c8362cee1eb26592279728bf57f41bba2c921400ac56d4b371c8a3881d4f978115a0
 EBUILD pycharm-professional-2019.3.1.ebuild 1225 BLAKE2B f391b217ab5e079cea973682a259b5c9e2a538f81536c6d52134b6316239e11bee5badf789db2850c6241b448691c8101b44d5d1b562c8c27e2cc67902b8b203 SHA512 5fa13adbab2a9e321d955dd66fd3788a3a27dcb40a8214ebb100d6fc71abc357cbd1c10b0dd5468dbfef5a4c19c61779fd9e1e26e9c6face057e25d9ffedcc0b
 EBUILD pycharm-professional-2019.3.2.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
+EBUILD pycharm-professional-2019.3.3.ebuild 1227 BLAKE2B 32b33249906a636ce0a79164c09470c742bb7a207300c347b9fcd4c5ef660b917e58df07adfed39f8cd3d44a9905eecddb96969cb2860b9acbdd1c743fb15613 SHA512 185ca8aa08be3fefb66efd0e8e8d0fa6ca3b7f363fee26c5d152f66b29ac08fc2dbb9b99f0ce611237c5e76f33be8fba61354eb607825a4c8801b18cb9abce51
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
new file mode 100644
index 000000000000..bb09db041ff9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index e7300a6bd351..ad1c87a139ed 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,3 @@
-DIST RBTools-0.7.11.tar.gz 171777 BLAKE2B 67a0cf7d2f1e019a6b5b280a6448747037abb70d498c15b3bb2b0a415a1234e25e159929fc66484f56ad27acdbfe6bcf7bea9adb7042addbd96b88e4a9150ecc SHA512 ea02fbf02f7972d73a90097bc763549e54d130dc81e6325f0b65906d9e03819d4a9202b1e286a04bad5a17c2440b5e84fb9abe447f2b7717acc0f2c46de783cb
 DIST RBTools-1.0.2.tar.gz 199085 BLAKE2B 469bc0a4d440437126af936c370d40eefa4c59717a955cd1853a1fc437554c251508fabc797b8c6631327fd14d43545cab3710fdbe50b1ad87d4df41d6cc96ba SHA512 2b05c310b877ad57589dedbad638956b81cc539bc793ccbe6f17608f6b979a0f2767998b1e941ef826a435cf0b034cbb2b7fdb6b937d83d5bb2fa9d2f45f70a1
-EBUILD rbtools-0.7.11.ebuild 685 BLAKE2B 23a2124dfd97d3aeea04869713e3fb123965f499f4ee93cc9ded5f480cfa6b671c78eb0944e9d3bd76cfd2d7cff66b1c202a8e351d788734227f70b975644f79 SHA512 cab62b1a9c2f832b08c3c493e6cd343bfe56a287f45b43c4c32483e2e143612877ab6b67e8a36c3ea759510b0263953d6f165887749f519a61b13ead3bb079ef
-EBUILD rbtools-1.0.2.ebuild 740 BLAKE2B ea50076ab8d4d9e7d7d9dfa56459a158473eada076aca8a501cf24006374df591c2d7acf71b32eabb6ac0a847d877f8f0e11cf839d5ebbf4bca81c4beb1b3ca8 SHA512 be87550734fec846648fe0922c4351fc7b9638ff1d3fba7440dc3f8841c8b58037262801bc17edce14edb262e7cc2cf2cb244579f85c67ae0592ac50f6ba3963
+EBUILD rbtools-1.0.2.ebuild 738 BLAKE2B 7e597356b71c8919b80bab4c2753035fccdc66a8e68d5e6dc9a96b00db123fdf023479022c353e965534e821df08b570233e235410dd7618a8bac295119365ac SHA512 a91727a260eaa5669427b6afcd43638b0b4d6b13b954911ee3d8478052234c728dd9856e261aee9ee9a9fddf5fec22653346ed805017dc518fc129f76a77c9d4
 MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/rbtools-0.7.11.ebuild b/dev-util/rbtools/rbtools-0.7.11.ebuild
deleted file mode 100644
index 942063d7b747..000000000000
--- a/dev-util/rbtools/rbtools-0.7.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_PN="RBTools"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Command line tools for use with Review Board"
-HOMEPAGE="https://www.reviewboard.org/"
-SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/rbtools/rbtools-1.0.2.ebuild b/dev-util/rbtools/rbtools-1.0.2.ebuild
index 06ee7e70ea7a..c8348a8df9ff 100644
--- a/dev-util/rbtools/rbtools-1.0.2.ebuild
+++ b/dev-util/rbtools/rbtools-1.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index cedd7b2b34ac..753476cf9ad8 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -5,5 +5,5 @@ DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993
 EBUILD re2c-1.1.1.ebuild 764 BLAKE2B e5ec3c2114ea391a21512b8970040f8afc7b20a926f2a55d6667e1a1490ffefbfd11e450e99dbb30abc25c5686eb4c0d5d609c21e4202ff1cac60f0ffbdade0e SHA512 b1da1bb78a5b581927dd5c4b347bc92b110a8399f0ef41e189acf60734b7e450c09a528c366f244858c00cfb0bac6a10595e05d0d00d214c036f858ebdeb8e66
 EBUILD re2c-1.2.1.ebuild 724 BLAKE2B fb7f8df52e886a9b13062ec02728b4446d209c5cf8730861fb2cfa13b03e10231997e72c19684097c57e57063f10080d32603fbf2da79716e6653116ed17c47b SHA512 ad17c13302bf7ed3bf1c8bd27cc56e3c3f4a86f29089b3a7db9eee17cb05c3220596e77d435004683746c9424f441f4454a88f6ac93870e7c51a2cb06e380f3d
 EBUILD re2c-1.2.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
-EBUILD re2c-1.3.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
+EBUILD re2c-1.3.ebuild 733 BLAKE2B dc2b1b51119ec6b375de3b9e03398b85bca108058d2760b6feb035acf545e51c3b0f2797d2b937b3812dd17444b6a6f68ba985e8bc9a7379ba5503c76d8e79d3 SHA512 d03303179066976bf42fa2f3225b6db039b1f36e6589a6f09861dd9592bbe0af59349678b6d701b681bc562575bc507ff6828056990898885e7b51dc62cd4afe
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.3.ebuild b/dev-util/re2c/re2c-1.3.ebuild
index a21542c2d598..cedebb2c1f27 100644
--- a/dev-util/re2c/re2c-1.3.ebuild
+++ b/dev-util/re2c/re2c-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_configure() {
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 08cc36b33c69..8bf61463945f 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,4 +1,4 @@
 DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
-EBUILD redo-0.42.ebuild 1021 BLAKE2B 20de212a0cfefd413028c3492235a074366971c9680b2ec2b01381531ba3a2fad44f0a38f0404329ab08442ca950c1a5d427251727785ebb65d75280b052727f SHA512 bae98a58189cba6452a5cbe59d5b3a40b50b229cb01830ca97da4e43a2d5029cf4969b9f1d5db1d09138226e8b92ea9bed40872f890c9525ebc1a7e05b755a7d
-EBUILD redo-99999.ebuild 1013 BLAKE2B a9ca19da5f94f366d48a048d85f37028ac557ad8a2477ff3198c25ce1ffcb4a0202d55ea1cef1d087c77cdd61148b126b365b789d0f7c041d516c146e935a0de SHA512 c01c16ed861d3829d070b5663dc4f35728d0f4b4ca89b7becae0e3423a9a87e221cb8a3a2e36f03c5f81c2108acdc489f988fa6879dea1fc3bf7ad02136474e9
+EBUILD redo-0.42-r1.ebuild 1064 BLAKE2B 76ac6a5c76fe9b73695bea9b523fbccee16de07cf77eecff673dd1d770449c6acea9b8e62bf7e3ce34fe0a0adf6b13dac8dd2bf9fcc9da647dba28ab263849ac SHA512 8f03fa82a0b69cf564e29632f5faa223f469414ad6ae1ede6e35f80e4ca700d72b17712e8a232d4700d1602b94a3ff03c69672d1455c0af0d3b04251d02d7454
+EBUILD redo-99999.ebuild 1056 BLAKE2B b40c139b4c3bc20d687392e83bd089acbab56ffc82219a26621b9594b45fd21d38bd747366f390d955852c92b20d2949b5f355142cf0777322866e92729da521 SHA512 1057760528dd118e5ac10d26c7b3fb10e9bba98163b37d256b361ed3c975b4c5475d331813612ff171cad124b8e402e9707bb26018afd6211aed04c4f7a6b236
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.42-r1.ebuild b/dev-util/redo/redo-0.42-r1.ebuild
new file mode 100644
index 000000000000..ea14d07a6f6a
--- /dev/null
+++ b/dev-util/redo/redo-0.42-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit multilib multiprocessing python-single-r1
+
+DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
+HOMEPAGE="https://github.com/apenwarr/redo"
+SRC_URI="https://github.com/apenwarr/redo/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_compile() {
+	./do -j$(makeopts_jobs) build || die
+}
+
+src_test() {
+	./do -j$(makeopts_jobs) test || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	DOCDIR="${D}/usr/share/doc/${PF}" \
+	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+	./do -j$(makeopts_jobs) \
+		install || die
+
+	python_fix_shebang "${D}"
+
+	sed -i \
+		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		"${D}"/usr/bin/* || die
+}
diff --git a/dev-util/redo/redo-0.42.ebuild b/dev-util/redo/redo-0.42.ebuild
deleted file mode 100644
index 17098dc04661..000000000000
--- a/dev-util/redo/redo-0.42.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit multilib multiprocessing python-single-r1
-
-DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
-HOMEPAGE="https://github.com/apenwarr/redo"
-SRC_URI="https://github.com/apenwarr/redo/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-BDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	${BDEPEND}
-"
-S=${WORKDIR}/${PN}-${P}
-
-src_compile() {
-	./do -j$(makeopts_jobs) build || die
-}
-
-src_test() {
-	./do -j$(makeopts_jobs) test || die
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	DOCDIR="${D}/usr/share/doc/${PF}" \
-	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-	./do -j$(makeopts_jobs) \
-		install || die
-
-	python_fix_shebang "${D}"
-
-	sed -i \
-		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
-		"${D}"/usr/bin/* || die
-}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 57197b9f75d3..6e92129f9b4a 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,8 +16,10 @@ KEYWORDS=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 BDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}
 "
 RDEPEND="
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 3031d73c4cc4..c4cd6b38ee20 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,8 +1,8 @@
 DIST rosdep-0.13.0.tar.gz 301327 BLAKE2B 39c39903bb2e6c07dfd4e3aa9546acf434498db518c3bda04ef79c46ed5d13b7cd55978c78bea8294d8e5b84ddddef22814436566f3f958d91d3964650399a08 SHA512 c42aa17ee9b31f7013415e99a484a66a7a7fb52abef4cc9045658150ce0c36b475f2885ebfff537f9ce9f8fd5eeaef5482226c5bff5b4a3df03cc72b149db07a
 DIST rosdep-0.14.0.tar.gz 301534 BLAKE2B 86e4fb42e682218dc1d68851a0023f2fbddc5a8a89d90dd33cc7223080792e3d3dea7607a57692428f81589abc693c9f843be4c10ca81b6419da7e383d1c7987 SHA512 abf9c294b9fb01aa4c32bd7ad563119874e162d6031255edce642eeee1512da39a03383aa6cd55f090587df2b6bd1dc83bc53163be9d2b53be6178ec8a422f66
 DIST rosdep-0.15.0.tar.gz 301659 BLAKE2B c7e5602e78e8f4892f16ef41d7423e653750def24f043c2519646b8c038bcb39b62d60323ef4e8a496a863bb74f51cdce7aebb1b5423120562a34c1988437510 SHA512 d9def23a4c01636a42dbccf99be96b9704eb96641da00db4305c63b18fa0f69de1ae402bcf7fff4030bc20097496086ff9168794d1e5cd44153cb3a84ba18509
-EBUILD rosdep-0.13.0.ebuild 1517 BLAKE2B fe316205bacf370094664c11bd7d3bf73e410e95dac67b306f125d463cee47dd8282b0631bd9dca1da1fd34fa4b31bd4f5066e573f934d9487f46f8d9475d32d SHA512 6570ef9759ea07a11c7d046c98ef0caa5281c9ce1f4e6839d56c975fd0e7680480463598fbda7e42805606a4063d1af77e167affd5a78ee847738a84d3aff43f
-EBUILD rosdep-0.14.0.ebuild 1517 BLAKE2B fe316205bacf370094664c11bd7d3bf73e410e95dac67b306f125d463cee47dd8282b0631bd9dca1da1fd34fa4b31bd4f5066e573f934d9487f46f8d9475d32d SHA512 6570ef9759ea07a11c7d046c98ef0caa5281c9ce1f4e6839d56c975fd0e7680480463598fbda7e42805606a4063d1af77e167affd5a78ee847738a84d3aff43f
-EBUILD rosdep-0.15.0.ebuild 1517 BLAKE2B fe316205bacf370094664c11bd7d3bf73e410e95dac67b306f125d463cee47dd8282b0631bd9dca1da1fd34fa4b31bd4f5066e573f934d9487f46f8d9475d32d SHA512 6570ef9759ea07a11c7d046c98ef0caa5281c9ce1f4e6839d56c975fd0e7680480463598fbda7e42805606a4063d1af77e167affd5a78ee847738a84d3aff43f
-EBUILD rosdep-9999.ebuild 1517 BLAKE2B fe316205bacf370094664c11bd7d3bf73e410e95dac67b306f125d463cee47dd8282b0631bd9dca1da1fd34fa4b31bd4f5066e573f934d9487f46f8d9475d32d SHA512 6570ef9759ea07a11c7d046c98ef0caa5281c9ce1f4e6839d56c975fd0e7680480463598fbda7e42805606a4063d1af77e167affd5a78ee847738a84d3aff43f
+EBUILD rosdep-0.13.0.ebuild 1511 BLAKE2B 074cb745dc6f0c3fb1e15418f7d9f15d881579e25b0bb3baa2b1c18a76385ccd8816423c9e1503d5bd15cd3231cf100dd0ed8fe9083ad56eadd1d166d9f4b584 SHA512 960e230395e6d533d0e9634ae02c8fc03e147938571b65e9ad04694974105d7d6b89d96a2ed6c8e76ae509a75f6f65861637dd7419c304082e5e4c7bbf9d419d
+EBUILD rosdep-0.14.0.ebuild 1511 BLAKE2B 074cb745dc6f0c3fb1e15418f7d9f15d881579e25b0bb3baa2b1c18a76385ccd8816423c9e1503d5bd15cd3231cf100dd0ed8fe9083ad56eadd1d166d9f4b584 SHA512 960e230395e6d533d0e9634ae02c8fc03e147938571b65e9ad04694974105d7d6b89d96a2ed6c8e76ae509a75f6f65861637dd7419c304082e5e4c7bbf9d419d
+EBUILD rosdep-0.15.0.ebuild 1511 BLAKE2B 074cb745dc6f0c3fb1e15418f7d9f15d881579e25b0bb3baa2b1c18a76385ccd8816423c9e1503d5bd15cd3231cf100dd0ed8fe9083ad56eadd1d166d9f4b584 SHA512 960e230395e6d533d0e9634ae02c8fc03e147938571b65e9ad04694974105d7d6b89d96a2ed6c8e76ae509a75f6f65861637dd7419c304082e5e4c7bbf9d419d
+EBUILD rosdep-9999.ebuild 1511 BLAKE2B 074cb745dc6f0c3fb1e15418f7d9f15d881579e25b0bb3baa2b1c18a76385ccd8816423c9e1503d5bd15cd3231cf100dd0ed8fe9083ad56eadd1d166d9f4b584 SHA512 960e230395e6d533d0e9634ae02c8fc03e147938571b65e9ad04694974105d7d6b89d96a2ed6c8e76ae509a75f6f65861637dd7419c304082e5e4c7bbf9d419d
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.13.0.ebuild b/dev-util/rosdep/rosdep-0.13.0.ebuild
index 2e5c95c40b2a..ae19fe69509a 100644
--- a/dev-util/rosdep/rosdep-0.13.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-0.14.0.ebuild b/dev-util/rosdep/rosdep-0.14.0.ebuild
index 2e5c95c40b2a..ae19fe69509a 100644
--- a/dev-util/rosdep/rosdep-0.14.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.14.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-0.15.0.ebuild b/dev-util/rosdep/rosdep-0.15.0.ebuild
index 2e5c95c40b2a..ae19fe69509a 100644
--- a/dev-util/rosdep/rosdep-0.15.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.15.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 2e5c95c40b2a..ae19fe69509a 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index f1e1bfb351dd..7bd550729108 100644
--- a/dev-util/rosinstall/Manifest
+++ b/dev-util/rosinstall/Manifest
@@ -1,4 +1,4 @@
 DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1558 BLAKE2B cf67f6eee320c859894140beee43f0103205b41fa4cb2dfdc9bca324def123bb9474f54625d3977456d03dbb4899eaf0acbed42ae92bbc9f955246a588b99de4 SHA512 3315066a2c14f10d443f52ae9237f0c49a92cfb3477e98921262f0b32eb3bfe44db545f9865fc93c286ab4f05a73c0a784e13bf1330d0adf053275f4203844d1
-EBUILD rosinstall-9999.ebuild 1558 BLAKE2B cf67f6eee320c859894140beee43f0103205b41fa4cb2dfdc9bca324def123bb9474f54625d3977456d03dbb4899eaf0acbed42ae92bbc9f955246a588b99de4 SHA512 3315066a2c14f10d443f52ae9237f0c49a92cfb3477e98921262f0b32eb3bfe44db545f9865fc93c286ab4f05a73c0a784e13bf1330d0adf053275f4203844d1
+EBUILD rosinstall-0.7.8.ebuild 1552 BLAKE2B 92d2145bb35d449c54520b0b4775b6619556bb75c47ef2486dfaf7926dcdc0a20c14edb8f8c1890d9969176b6fd3193fb08de3076ab1ddfec5c7549c859e0e44 SHA512 6673b3be83adb13a099086b25c80226f9823bf99ff98aeaaeac2f6f73c1f25486c2ddb868401df0ff2746046df6626dcc3ef21596a9cc53e26dd39c1fa3ae103
+EBUILD rosinstall-9999.ebuild 1552 BLAKE2B 92d2145bb35d449c54520b0b4775b6619556bb75c47ef2486dfaf7926dcdc0a20c14edb8f8c1890d9969176b6fd3193fb08de3076ab1ddfec5c7549c859e0e44 SHA512 6673b3be83adb13a099086b25c80226f9823bf99ff98aeaaeac2f6f73c1f25486c2ddb868401df0ff2746046df6626dcc3ef21596a9cc53e26dd39c1fa3ae103
 MISC metadata.xml 333 BLAKE2B 55190f2209aab41e0f1625fb699d61be2a53d0af996feff9ee5b0cbb5326363dcb915aa83427096f1723b885806a4cdb5b6cd2285c76064bf0b889b624fbcc31 SHA512 5c6ef4930985cd5c2ea51b18a25d7cc2a5e387bdbd26e42f8710d6ce903cf13fe85ee1f1d13a0ffe82c8056dd295a3e25268ec58353508f30bf10404ae4ffb8a
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index 98808ef69d7a..9e8721ba8342 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index 98808ef69d7a..9e8721ba8342 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index d7052ba5445e..de563fa510e7 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,6 +1,6 @@
 DIST rosinstall_generator-0.1.13.tar.gz 11186 BLAKE2B bb6f95eba12ee6b9adfa22d46475d555aa9b3bed225e3be52a52f380bbd1ab3f86871a9a816c56c874f8545d2ef648e226ad5d8d3346444a92202865265260f1 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c
 DIST rosinstall_generator-0.1.14.tar.gz 11419 BLAKE2B af9754f46589aac1e9bb265345319c4037d2b1e10ea8119859e2715b2828974bc4422cac25f84216c401f35b7cddde207e7562afb07e753328940db347b69a20 SHA512 45461917afaf93f38b118951c272ba71a408d2c276b4019739c9c8dc9407812bf166bb762910ce45cedc9b31e2796922a69681ad461c468c7ed2372a1d189904
-EBUILD rosinstall_generator-0.1.13.ebuild 933 BLAKE2B cb16793afbfedcbc020f21c98f825a5f152c0e2db8be75e0c5e8f1d82312383bbb4a5c96935f52e0e245e6c68d7d7cf20926c05831b677804cceb31d8923cb7e SHA512 018c7d68e9bc203b1ec2a631af4888ef78d7feadf3516ea7fe038c9474b215e82dc53d472e98d8c69a7bc614db714af46413ca7a5f7ce81d5b447994b83b32f9
-EBUILD rosinstall_generator-0.1.14.ebuild 1068 BLAKE2B a7bc13ba3b7c02e9a71137e0c4e642434e816a3e15ac621f7e7bc857dc7845c894cdd5924d42bc7301e2cff21c75a8de718aad32f3779a77e627473ed016c90b SHA512 8bc8d38ea513650a6cd2bc951e67fced9bd2b10e446189fcfaba110a1ea60c65182dbb53a17e5b453fc2b61dcfca9e28f8dae025afe17c976dc2fe162c56a68b
-EBUILD rosinstall_generator-9999.ebuild 1068 BLAKE2B a7bc13ba3b7c02e9a71137e0c4e642434e816a3e15ac621f7e7bc857dc7845c894cdd5924d42bc7301e2cff21c75a8de718aad32f3779a77e627473ed016c90b SHA512 8bc8d38ea513650a6cd2bc951e67fced9bd2b10e446189fcfaba110a1ea60c65182dbb53a17e5b453fc2b61dcfca9e28f8dae025afe17c976dc2fe162c56a68b
+EBUILD rosinstall_generator-0.1.13.ebuild 927 BLAKE2B 740ba1c9f92b57910520ea268c5b750f4386644abee085671fcb18bd2d6dd9e3d9570e8936350e58cd3fd3357b95e5367970c83d7fac31ff7d09416eb60b4683 SHA512 e5fec4e1c60fb18156644ff02e0067eec142f316a7ec0265e975884a6b8618b238a061f87f489eeaff5e77827b203263173fae162285f0bcdb37658215a88375
+EBUILD rosinstall_generator-0.1.14.ebuild 1062 BLAKE2B f3775ef7c5961166c60dd37622bb6f24eed6b57c7893779686a161352e535f9e19ad0859ad27c8687bed21d5daed2a6b60cc676aeb607f04429d841660a9bd73 SHA512 82b38f11458e58c7fa269ed5c20a225148f0008f61d7e4fb2ebbc5388720d5258d45b0f708e3b0b1acfbf4d95fd5786afb49b44b2b8c56c9f5ca9080f29a3445
+EBUILD rosinstall_generator-9999.ebuild 1062 BLAKE2B f3775ef7c5961166c60dd37622bb6f24eed6b57c7893779686a161352e535f9e19ad0859ad27c8687bed21d5daed2a6b60cc676aeb607f04429d841660a9bd73 SHA512 82b38f11458e58c7fa269ed5c20a225148f0008f61d7e4fb2ebbc5388720d5258d45b0f708e3b0b1acfbf4d95fd5786afb49b44b2b8c56c9f5ca9080f29a3445
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
index bffe8ab6f375..7419030810a4 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
index c29af060ec6c..2b89625c44ca 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index c29af060ec6c..2b89625c44ca 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index b8532e12bc18..b853fae09010 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,3 +1,4 @@
 DIST rpmdevtools-8.10.tar.xz 94976 BLAKE2B 290044a511f77111487cef40b6b9bd706f0bf6b2b65681a931839f1fd00aa490c106492de35643c8a7218762e4e92c9bd44a42d8976472c15748d9ad94f0d5c0 SHA512 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57
-EBUILD rpmdevtools-8.10.ebuild 769 BLAKE2B 1c28573992da646b7fa4cc5e71679e8c66c6671615aee8845e37833852852c05f0e2b803a835a5e9b41ec9ae878e34d820d422b2dc7fc55d315aa58daa13c103 SHA512 8c39b0b3f70595226a60199f0b32263d9c6a5b7c3a219d716c7ff08ab3593e21e4ca46aa39346681de3e49ca2307324a9b8d182719842d3850710fd532f59d41
+EBUILD rpmdevtools-8.10-r1.ebuild 773 BLAKE2B 257165ab05e7975b379ad63d5a6123f57b15c433a57bcc17d3bedd03c2602db4e08b5153c3fbbc0cc0cab7606940e1d59af76f82d1132c903608ea5269c1171e SHA512 533f076112813def380f6082bfeefc0da8bbaf5dd1e1171ca45d70e9d66144c34cc6a53cea2904d0139a1abe19abcaf2789de00680b62acb1956a36969406904
+EBUILD rpmdevtools-8.10-r2.ebuild 774 BLAKE2B 1c2b4b4e4be4c713bf0712c532e3c1ab33763129873b97f8e9e614ffc6f135fe63f92a0ccfc88a66c9b6206163665fb4fc86f6a3243c112bd7a23297ca847bb9 SHA512 3d9a79161685d7d023a2c50f5d06b402402b9139f642fea63f5dbceefaa74979d86c61fc805da07418cf8c2d3cba6c5d6ab700bc0221a4c87c81617d719d5811
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.10-r1.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.10-r1.ebuild
new file mode 100644
index 000000000000..eb1fb39a1655
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-8.10-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://pagure.io/rpmdevtools"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-lang/perl:*
+"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/help2man
+"
+
+src_prepare() {
+	default
+	python_fix_shebang rpmdev-{rmdevelrpms.py,checksig,sort,vercmp,bumpspec}
+}
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
new file mode 100644
index 000000000000..b2ec0bd71ef2
--- /dev/null
+++ b/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1
+
+DESCRIPTION="Collection of rpm packaging related utilities"
+HOMEPAGE="https://pagure.io/rpmdevtools"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-lang/perl:*
+"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/curl
+	emacs? ( app-emacs/rpm-spec-mode )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/help2man
+"
+
+src_prepare() {
+	default
+	python_fix_shebang rpmdev-{rmdevelrpms.py,checksig,sort,vercmp,bumpspec}
+}
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.10.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.10.ebuild
deleted file mode 100644
index 695baa91caf8..000000000000
--- a/dev-util/rpmdevtools/rpmdevtools-8.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Collection of rpm packaging related utilities"
-HOMEPAGE="https://pagure.io/rpmdevtools"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="emacs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	app-arch/rpm[python,${PYTHON_USEDEP}]
-	dev-lang/perl:*
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/curl
-	emacs? ( app-emacs/rpm-spec-mode )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/help2man
-"
-
-src_prepare() {
-	default
-	python_fix_shebang rpmdev-{rmdevelrpms.py,checksig,sort,vercmp,bumpspec}
-}
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 843f6f90974f..deb93f86e30a 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -3,6 +3,6 @@ AUX rr-5.2.0-tgkill-glibc-2.30.patch 1076 BLAKE2B 52fbe716a4830197800d63eac91188
 AUX rr-5.2.0-ucontext_t.patch 1936 BLAKE2B 11f032058be13960f090a851c09e4612d6a2574d6e54c583d1c7741468810c10b38d4e2a5b24496f8c1a6505bcbc47a6f8fa326ae7853f623d71cbe2b6f1fad2 SHA512 4ee8c1f40926e591e98b268461cc0e5eedcc3d5493bed2ebeedbffcf8745fa7899ed076e7e75cd4e4bfdb413e673795a8ed76f0ef00c68170e992d3b07294c95
 DIST mozilla-rr-5.2.0.tar.gz 1168734 BLAKE2B 2f15c4ec4a271f930334577e98b14e37d2a0eb7cd3443e7110d3562ac4ef30c310e6448a588f4e31f2943a6d4ff0af006cbbafc50722543436fcae3bdc8e453f SHA512 4465985f67e9812b62b91ac7942105a9f976faf0c0d7c352a99a638fe6bdfde024f939b3daa922d431c7fc87118ae4d9d039b00345760fb547c349e8737dc168
 DIST mozilla-rr-5.3.0.tar.gz 1343557 BLAKE2B 80ed2feb52fd34b424193902c02408443e5ae943a34d3fe8e75c4c813042c6dd7f39571924ce94aca558ea5f1630f9bda28bea9d5f7e2d429d772a85d3e3e7ad SHA512 6ae37a3ced0c001208fb981abc18f02b912a2851564955dd8da364cb30d9580ea6c91bedbef6495da5d082954d4f261eeaea81df1e9895b4adf948e9998f4c2b
-EBUILD rr-5.2.0-r1.ebuild 1450 BLAKE2B 640c129935a43188cee50dd412ccf639081f2cbda491c93a6391bf0da58474af6abf899e909a100ca8c485394a62f6b494e476f36ce58f3b3f70c4f76881623b SHA512 b1228db164e3e7c56b3092c76b8d018741d1489889a5df5fa4a02b485f7e45d05f3336bc96b8b0cd997b14d82c96895e88b1d445d5cc95e549f24bd9404c271c
-EBUILD rr-5.3.0.ebuild 1330 BLAKE2B 0d78b1912e5649d49369f25e367b6b6e07e40eae5d45fa7bd37a3464dfce20cf0bf6f54420efaf57b302db65d4486fee71c55fc507b27df9637a84e0a748a6bc SHA512 48057aeb3ee5ec4a35920a332b7ecdafd979cf0c48c6eb8bd193a17ee441a9c0ec3592f24f8f979f60d8d57ff6a0ee6e383ed7bc17fec4158d63a24622bce786
+EBUILD rr-5.2.0-r1.ebuild 1488 BLAKE2B 98a6509563a39415d158f7a2108984648a3c0f3fad8224c15c767c4cbffe71e834f0314bcf39cf4a1a177444edfd735592f6c8ccffbd46d382eac6087d97018e SHA512 bd3c71399d4f1bcb7007129862978c773afb459f41f69f51b661441ac8a6ef950737ae1e269dc9c555026245bf8967b944dee557c1abae9866c4a9d468f33268
+EBUILD rr-5.3.0-r1.ebuild 1368 BLAKE2B 1f9ef787e458c599e0d13efa9b7325dd91d2a84013832f59da1e58d907ebdbeeb0858c29ddfb42ff57213aa100f028e06170b7e6fb28ffe78683c77419382f07 SHA512 797cae8fc2432e41b24ee03db7bfa0466dbf41e19682c08a827da698ae4f784687b9f243e3fe86ce9ca76892b8f421bb5ba0a34cc1d43ce9e2cf8edaf3aeafd5
 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/rr-5.2.0-r1.ebuild b/dev-util/rr/rr-5.2.0-r1.ebuild
index b98223d5136d..b60628ad4eec 100644
--- a/dev-util/rr/rr-5.2.0-r1.ebuild
+++ b/dev-util/rr/rr-5.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,9 @@ RDEPEND="${DEPEND}
 # Add all the deps needed only at build/test time.
 DEPEND+="
 	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pexpect[${PYTHON_MULTI_USEDEP}]
+		')
 		sys-devel/gdb[xml]
 	)"
 
diff --git a/dev-util/rr/rr-5.3.0-r1.ebuild b/dev-util/rr/rr-5.3.0-r1.ebuild
new file mode 100644
index 000000000000..792f4f9768e2
--- /dev/null
+++ b/dev-util/rr/rr-5.3.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake-utils linux-info python-single-r1
+
+DESCRIPTION="Record and Replay Framework"
+HOMEPAGE="https://rr-project.org/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="multilib test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-libs/zlib
+	dev-libs/capnproto
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	sys-devel/gdb[xml]"
+# Add all the deps needed only at build/test time.
+DEPEND+="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pexpect[${PYTHON_MULTI_USEDEP}]
+		')
+		sys-devel/gdb[xml]
+	)"
+
+RESTRICT="test" # toolchain and kernel version dependent
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="SECCOMP"
+		linux-info_pkg_setup
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i 's:-Werror::' CMakeLists.txt || die #609192
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping."
+		return 0
+	fi
+
+	cmake-utils_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-Ddisable32bit=$(usex !multilib) #636786
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-util/rr/rr-5.3.0.ebuild b/dev-util/rr/rr-5.3.0.ebuild
deleted file mode 100644
index 10707860b4ae..000000000000
--- a/dev-util/rr/rr-5.3.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="multilib test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	dev-libs/capnproto
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-devel/gdb[xml]
-	)"
-
-RESTRICT="test" # toolchain and kernel version dependent
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping."
-		return 0
-	fi
-
-	cmake-utils_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-Ddisable32bit=$(usex !multilib) #636786
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index 524ae315c07a..30a7dbec16d4 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,3 +1,3 @@
 DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
-EBUILD scanmem-0.17.ebuild 1083 BLAKE2B d64d1e2a4e1302e1db7899afcd32188423a9892560e15bbca5b7391955fb3390bc9fda4425441b39249139b0a0c931324bea269d0e817a3a8848676171231bb0 SHA512 440b52c71c42b5287fb5246d2c1bfa459a69e976d2c31fa3cbf65939a9269f7b6c8ee17deb4e0865338c01c819c7f70499cc72bfc24768ae348ce2ae9410daf7
+EBUILD scanmem-0.17.ebuild 1077 BLAKE2B c6ed800c7b808a6283a0a01141505bce99542855450003c814dddef0685c0c93d04e9f9cd7d638f1da3f99b3b100d2fc99c5f98fa0715348a4469ebaf8e48a62 SHA512 3558864f6a224cca25e12cefab7cf38a3d3a0b69bb8502e03e5cd47438e4b736aea00bd08763bd4544c3fc28042efcbef9c39b41071f2921a5d1bcc7eb5c124d
 MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
diff --git a/dev-util/scanmem/scanmem-0.17.ebuild b/dev-util/scanmem/scanmem-0.17.ebuild
index 394918a7c74b..2c502521ae88 100644
--- a/dev-util/scanmem/scanmem-0.17.ebuild
+++ b/dev-util/scanmem/scanmem-0.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools eutils python-single-r1
 
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 784e2884d9b7..7452581acf6b 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,12 +1,11 @@
-AUX strace-5.2-linux-5.3-compat.patch 3982 BLAKE2B d60a8a17c6a5e1831d9a37dc5dffc1195c4d7ca27be9bb1e1e4ab109aa1813fd08dec512e7e1cdd836d638030140d5f31a07839ceb5fb01c2d9b32bdd83f27bf SHA512 46c442340aa27b1bb6616efd1bb33c0df2987cc75658555e72401c0628787785070579e2054fb9765e5e184f83f3e233594eee8a5589f48d7e1364d011e5c213
 AUX strace-5.4-fix-LTO-CFLAGS-handling.patch 843 BLAKE2B 2cd4c87e972b2bfe6d5755141a64ffbca386047ea68d37c8871bc37e7475f8eb3ce978ead5082ecb3099f599e12914f087773733a7440875a084a5b452b1f92c SHA512 9606c3334d3e01aecccafaa396b5a7440a652872c590ced3c1a88ca6ef083c176a420dfb2154396f94f65b826d6fe2f20556620f364c17d01d0069d630dc5cfe
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
-DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
 DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
 DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
+DIST strace-5.5.tar.xz 1628744 BLAKE2B ae2ab9b2c756858c3c23640ee19821b8720da84a5e15e4a674768d8f4b51d74b2b490cfa18a862bc3c9d129baeaf09212700bea98ac151db035d03a05afa055d SHA512 317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231
 EBUILD strace-4.26.ebuild 2289 BLAKE2B 9401f15b3cca328531c2ed600f7da2d85fda262482afccea2ac04a2e1f0d0c9fa0de8811e249902584b1efbe53b7f0e7c54ba05180981886778fd3794607655f SHA512 2471e36a14163e1129f7cdbb154d202bc0f4eea63bcaa462ecc4785114878045e62d682cbfb912e105f492cf18b0bc8bd8842842e32c61f04ccc87358e8a0274
-EBUILD strace-5.2.ebuild 2391 BLAKE2B 903f519f389605b6aae22b20609070ae0b2703cdee5952aeb5e153cfea38ed01dfc8721ab40e121bdb40c835fb8d4d053fb8867cef6a3ec3fd86e638a591aaa0 SHA512 489e8ac527c80af548ea5bd0d895f658c6b4f9c0976879e4b5f2aa96b1a4686f81d8548f980a5a6b110d6c790a68fb95cee8ef584076fe76bc026d35ab794b4c
 EBUILD strace-5.3.ebuild 2326 BLAKE2B aa1914d8379ed519685b8b779c62e52c2e260fd409163eb7c774d9858f2be592298ce7990d146851aa3fd2082d34499afad6d2d960eee473200c6bc32bfa3dcb SHA512 c25c7cf8caed9df280f1c2a29258d8c983d6e034bf4fb3e8d55c30f312f72e76b6151663b8991c4cb949eee17e809f37aacd65c56da406f4dc40cf5f534db398
 EBUILD strace-5.4.ebuild 2528 BLAKE2B ea885a47f547887f21633fa50c1834800749df4f822d22c36d2b71a17d7410ab2e3e446699af6e9eb9d436ed6580fa89019a2934f3c6e68432e5732bc850bf1f SHA512 cfed508fcfa5dff270c8d038a8dfeaf10d60ad366d7fee0854bd294b7a06d2411fa2a56965b8f4734d14d5571e391f32fadae25ba40a9e8c8c96a6a991e32b3b
+EBUILD strace-5.5.ebuild 2466 BLAKE2B 922a3bf95b7f03617a52e05074cf472b23c374a18f6a21ad5fcf605119e87532ced47313ebef81bf780a71358974e530927358d1527da01c7eb7932a6db4565e SHA512 8ccbdb58e8eb72772fd2c53a9ecabc089735b0462b2c0632387b40a42d260bc0f5e8304bd137e45c2be320a5bb8cc8b29557dcd979a3930449fcf3aa14e5f163
 EBUILD strace-9999.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch b/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch
deleted file mode 100644
index 254326f04577..000000000000
--- a/dev-util/strace/files/strace-5.2-linux-5.3-compat.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://github.com/strace/strace/commit/60da39553ff92cf741bf7f54daff636bb28cbb3c
-https://bugs.gentoo.org/695260
-
---- a/xlat/v4l2_pix_fmts.h
-+++ b/xlat/v4l2_pix_fmts.h
-@@ -269,19 +269,23 @@ DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
- # define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1')
- #endif
--#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444)
-+#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('B', 'A', '1', '2')");
-+static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
--# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2')
-+# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2')
- #endif
--#if defined(V4L2_PIX_FMT_SGRBG12) || (defined(HAVE_DECL_V4L2_PIX_FMT_SGRBG12) && HAVE_DECL_V4L2_PIX_FMT_SGRBG12)
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# undef V4L2_PIX_FMT_BGRA444
-+#endif
-+#if defined(V4L2_PIX_FMT_BGRA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_BGRA444) && HAVE_DECL_V4L2_PIX_FMT_BGRA444)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
--static_assert((V4L2_PIX_FMT_SGRBG12) == (v4l2_fourcc('B', 'A', '1', '2')), "V4L2_PIX_FMT_SGRBG12 != v4l2_fourcc('B', 'A', '1', '2')");
-+static_assert((V4L2_PIX_FMT_BGRA444) == (v4l2_fourcc('G', 'A', '1', '2')), "V4L2_PIX_FMT_BGRA444 != v4l2_fourcc('G', 'A', '1', '2')");
- DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE
- #else
--# define V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2')
-+# define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2')
- #endif
- #if defined(V4L2_PIX_FMT_RGBA444) || (defined(HAVE_DECL_V4L2_PIX_FMT_RGBA444) && HAVE_DECL_V4L2_PIX_FMT_RGBA444)
- DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
-@@ -1343,8 +1347,17 @@ const struct xlat v4l2_pix_fmts[] = {
-  XLAT(V4L2_PIX_FMT_H264_NO_SC),
-  XLAT(V4L2_PIX_FMT_PWC1),
-  XLAT(V4L2_PIX_FMT_MPEG1),
-- XLAT(V4L2_PIX_FMT_BGRA444),
-  XLAT(V4L2_PIX_FMT_SGRBG12),
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+/*
-+* V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with
-+* the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit
-+* v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12.
-+*/
-+# undef V4L2_PIX_FMT_BGRA444
-+#endif
-+ XLAT(V4L2_PIX_FMT_BGRA444),
-  XLAT(V4L2_PIX_FMT_RGBA444),
-  XLAT(V4L2_PIX_FMT_ABGR444),
-  XLAT(V4L2_PIX_FMT_SGBRG12),
---- a/xlat/v4l2_pix_fmts.in
-+++ b/xlat/v4l2_pix_fmts.in
-@@ -37,8 +37,17 @@ V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
- V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */
- V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
- V4L2_PIX_FMT_MPEG1    v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES     */
--V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */
- V4L2_PIX_FMT_SGRBG12 v4l2_fourcc('B', 'A', '1', '2') /* 12  GRGR.. BGBG.. */
-+#ifndef STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+# define STRACE_WORKAROUND_FOR_V4L2_PIX_FMT_BGRA444
-+/*
-+ * V4L2_PIX_FMT_BGRA444 was introduced in Linux commit v5.2-rc1~33^2~24 with
-+ * the value of v4l2_fourcc('B', 'A', '1', '2') and changed in commit
-+ * v5.2-rc5-403-g22be8233b34f as it clashed with V4L2_PIX_FMT_SGRBG12.
-+ */
-+# undef V4L2_PIX_FMT_BGRA444
-+#endif
-+V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */
- V4L2_PIX_FMT_RGBA444 v4l2_fourcc('R', 'A', '1', '2') /* 16  rrrrgggg bbbbaaaa */
- V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16  aaaabbbb ggggrrrr */
- V4L2_PIX_FMT_SGBRG12 v4l2_fourcc('G', 'B', '1', '2') /* 12  GBGB.. RGRG.. */
diff --git a/dev-util/strace/strace-5.2.ebuild b/dev-util/strace/strace-5.2.ebuild
deleted file mode 100644
index 88a2db590c17..000000000000
--- a/dev-util/strace/strace-5.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind elfutils"
-
-REQUIRED_USE="?? ( unwind elfutils )"
-
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-linux-5.3-compat.patch )
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-	use static && append-ldflags -static -pthread
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	# Don't require mpers support on non-multilib systems. #649560
-	local myeconfargs=(
-		--enable-mpers=check
-		$(use_with unwind libunwind)
-		$(use_with elfutils libdw)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/strace-graph || die
-	fi
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-5.5.ebuild b/dev-util/strace/strace-5.5.ebuild
new file mode 100644
index 000000000000..c6b8e0324fbd
--- /dev/null
+++ b/dev-util/strace/strace-5.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs autotools
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind elfutils"
+
+REQUIRED_USE="?? ( unwind elfutils )"
+
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+
+	# Needed for applied patch (#701516). Remove with next version.
+	# Don't forget about autotools inherit.
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
+	use static && append-ldflags -static -pthread
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	# Don't require mpers support on non-multilib systems. #649560
+	local myeconfargs=(
+		--enable-mpers=check
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index b15f13469e52..cc35967bfcb2 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -2,7 +2,7 @@ AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae
 DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
-EBUILD umockdev-0.11.3.ebuild 1034 BLAKE2B 589e674984d981478e38547eeb04bc69e56667b6747e2a23734d6942cb29588679c677ede17252ecff72cfb7091c97ff6c9fbaaae253cc6953c04143d31da528 SHA512 f60cc5d48b4e6f4f4e1f730a13fe935fb9480cbee61f43480d64de17af0353b79a071b1f61c53f419794cbb77831297754d670150f5941db2efb513d399512cf
-EBUILD umockdev-0.12.1.ebuild 1169 BLAKE2B 3174bf2be83164aa8c1cb5ecb6eab68da576d23d0327ed09f0b6a57c711f51e90b058e6c7e8138bcf9badf474fd15048c85ed3f5550b0fb7a5b2b42c1b660dc5 SHA512 12906cca30dcce8ee3c08e783428a79403ec3490d0832aeffe284021d7a41a02c0c0a132d85ea487fe5bdd703faf2e6583c46b506a3e5b0908f85736e7e9fe61
-EBUILD umockdev-0.9.4.ebuild 723 BLAKE2B 429f95763cb1f393e74273598a26f32e9c3c01bbe32b9cd1ef3c3929499c504b5c9c91d3b92ba4357cbd9b9d8c22d125269c1e59b88eabae870a7d0ef37c9a1c SHA512 aecba648af8462ec81f65d565ba1b0e5aa45834c18d2fcd0e22979509aab2344913294238961a28815e52c97ef793322ea6959dd93feeb03177883e6c01b7d1f
+EBUILD umockdev-0.11.3.ebuild 1028 BLAKE2B c40e76f3c4930caa6f80c84e258efff7b6825150a262c0f2ba5d49f88f846ecf65bce2a6b64b24cad08d3e78b8d825cc846387531e201bfc38c98a241c37974e SHA512 b4842bac3e364fcd05db12d3e78d31fec7584d2d37c543d23402ab62e6a1e8d67b2e83c310921b12baaa14bba291dba8821ef91809163cd6d1bd44744182f2ce
+EBUILD umockdev-0.12.1.ebuild 1163 BLAKE2B e9497cefce1990ca7057eb352595728ab3d7c172a482bb7320e37fbfab02a8690cd38f8901440bc51fdbc93e5de8f01bb23840e59fbb69d97495bc12a657857b SHA512 a9854470b86e44fb97127ef3e368dec74c53c91ca47e67b814b55596ca51d0216ca5b4b8af11b8fbbdc06816f212e9d3405d0f4167cac7bceeddc3c10369ae2d
+EBUILD umockdev-0.9.4.ebuild 717 BLAKE2B d68eec4ddf6087fb9f0768c487595bc0617f6b746b9cd4002b8dd95a25579de89eb582703defaef005c0087c87dba0ccae28a03a9e6ccc414c393d28b9780e19 SHA512 555af33316a54fa0e7ec4c6211a0b1322b9e762b47084fe4698638c7feb95b0f1c025e80d4fcf5c3f8a09ab526f25db38b440c722beb62089b13fae3c60a0b23
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild
index 3d52cf6d2c80..c4d61d96500e 100644
--- a/dev-util/umockdev/umockdev-0.11.3.ebuild
+++ b/dev-util/umockdev/umockdev-0.11.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index b9da4873d6c1..8b36fb5d0bb8 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild b/dev-util/umockdev/umockdev-0.9.4.ebuild
index 0b6c981d4548..4845f7ae319d 100644
--- a/dev-util/umockdev/umockdev-0.9.4.ebuild
+++ b/dev-util/umockdev/umockdev-0.9.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-any-r1
 
diff --git a/dev-util/waf/Manifest b/dev-util/waf/Manifest
index 7b767ce0a98e..0aa7aaa05c29 100644
--- a/dev-util/waf/Manifest
+++ b/dev-util/waf/Manifest
@@ -1,3 +1,3 @@
 DIST waf-1.9.14.tar.bz2 631021 BLAKE2B b822cfcee033846b075baad98c69833d54563a23075704acdf6c140b08cf4c5e263465b618830ecae979eaf741f83a849f37d714c18cf355b49a62bc30214904 SHA512 5b7e556eeb3ceec83e81e9b849786d7921aa06e443aa2fb5f288e3fcef6b05b3a1a6aa4ebcdfd0bd345ea3166980cb926cbea2260a229613bdcb2def86fb5816
-EBUILD waf-1.9.14.ebuild 986 BLAKE2B ff23cb6fa397002e03ad78db5296b10411657ac5778b58573cedbb1ced64499029cc82bd136fd541d6e0e8ce8e2901e778bdbf4ec2de5a3919d7a0e8ab1c7f71 SHA512 4c9861d26af558d87e6157d6663a46942e6622681df99884f80d60ba9715a108b2b3c0ebfdbefc7f26847e1e8c85da1e5e92af4128205c5bc10d95691e6e6293
+EBUILD waf-1.9.14.ebuild 976 BLAKE2B 8dc614debfa8673d99e5ec5cda64a1808ad0b11f0c2e110492a2ac526f5ffe42eba697b094615378ff825268ce096800fb273da93330d711c689a4cab69a4808 SHA512 07f44cde6bd70e93dd018205b0664685af68f31c98f4b46b0d7549b66ad9fa333a23d7b6f1874b37d1d5ae528aa214b5f94ef8e6fdf6bd7865d1a4989239ff8e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/waf/waf-1.9.14.ebuild b/dev-util/waf/waf-1.9.14.ebuild
index bfd0852f26a7..eb73b405ad26 100644
--- a/dev-util/waf/waf-1.9.14.ebuild
+++ b/dev-util/waf/waf-1.9.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-any-r1 toolchain-funcs
 
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index 88f026e13391..a7f5cd6640d3 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,4 +1,4 @@
 DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
-EBUILD wstool-0.1.18.ebuild 1439 BLAKE2B 2e5c6f6e82d521725e123726400d5c5c962b73328d0898d37d30ea7f3ee0c4d7a7480978e03e257cb4f00bfd6717eba92ce17abfb457dbc7ead3bad0c61c5c45 SHA512 cef1e8c8dfc9f26526944b7d917ac6e3d2c53e050dc7985379b741ba43ebf90c2456d183971243e2b61d594edab2f9c3031ff61e57046acc4f37224b463d4910
-EBUILD wstool-9999.ebuild 1439 BLAKE2B 2e5c6f6e82d521725e123726400d5c5c962b73328d0898d37d30ea7f3ee0c4d7a7480978e03e257cb4f00bfd6717eba92ce17abfb457dbc7ead3bad0c61c5c45 SHA512 cef1e8c8dfc9f26526944b7d917ac6e3d2c53e050dc7985379b741ba43ebf90c2456d183971243e2b61d594edab2f9c3031ff61e57046acc4f37224b463d4910
+EBUILD wstool-0.1.18.ebuild 1435 BLAKE2B ea801c5cf49ec2fe7bfee00e62301e28894035f40cb203333745ed39fc3b89e5f250f7a3f7870b1264487f48408401882a3cc60f04a55657ed8d150aa4511bee SHA512 5755d6da684f577894f72b2e59f860487a90a8c8f4ee32a6cbb5fa973fe5ba95484c8b16c097588643a9314f3971cb7487f050cadc640d760e3c2b900a62826b
+EBUILD wstool-9999.ebuild 1435 BLAKE2B ea801c5cf49ec2fe7bfee00e62301e28894035f40cb203333745ed39fc3b89e5f250f7a3f7870b1264487f48408401882a3cc60f04a55657ed8d150aa4511bee SHA512 5755d6da684f577894f72b2e59f860487a90a8c8f4ee32a6cbb5fa973fe5ba95484c8b16c097588643a9314f3971cb7487f050cadc640d760e3c2b900a62826b
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/wstool-0.1.18.ebuild b/dev-util/wstool/wstool-0.1.18.ebuild
index 6dbe2958bdb9..41972a54bea4 100644
--- a/dev-util/wstool/wstool-0.1.18.ebuild
+++ b/dev-util/wstool/wstool-0.1.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 6dbe2958bdb9..41972a54bea4 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index aef8af074a06..4e5c5df50c9c 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -1,4 +1,4 @@
 AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b9b2e9302f7585ce9dfe84f7ac3c2c4cb5fbe0719eff92c61bb918a616a03a058a13e7efe6bfba404cf71bd4c165914 SHA512 6a3ab0d1365d7c511d3d360a95ded27abb4eebc1cf605712603934134c6da96d8d2fe4aea71c9b6d3a2fa1b0ff280f3cfc1b9198608b1e7b6a450ac7b62b06b0
 DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
-EBUILD wxglade-0.8.2.ebuild 1115 BLAKE2B 40eb1248f22f394e4cf3f55507f8918ef3a1f24ab70ef5381fe655ea325a7f2556f9abcaefbaad14d1923ae9556f75487b539069b4e7960812d43013bcddb2ad SHA512 8148a0c55e80d6257d5dc815c64130eea2b67fe58fa65d080cfd3df0db0777dc33e0f2078d57163325461f25ae66abe812ff246419ba00108b8cba3ea29fb28a
+EBUILD wxglade-0.8.2-r1.ebuild 1152 BLAKE2B 2127d501f03bf92e72d54159838b2386c07ba37bce9bb899ba6208558e7e3cbf8d0674ba765988a80742009c64015104658f6e0e2e6fa0cf1fac0ccfa1578ce6 SHA512 96099cec0e21507af065de13ec7f40b66b7d1104c9158b7996c28f8eee4ceced2e62eb1b741871c0e5e98b28272b13fc25cdf8a8a04dc07eee9e1a479d4cee3b
 MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/wxglade-0.8.2-r1.ebuild b/dev-util/wxglade/wxglade-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..98f28398bcb8
--- /dev/null
+++ b/dev-util/wxglade/wxglade-0.8.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+MY_P="wxGlade-${PV}"
+
+DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
+HOMEPAGE="http://wxglade.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wxglade/${MY_P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+RESTRICT="test" #656934
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	python_fix_shebang wxglade.py
+}
+
+src_install() {
+	einstalldocs
+
+	# Install a bigger icon
+	newicon docs_old/html/mondrian_200x200.png ${PN}.png
+
+	dodoc -r docs
+	rm -r docs docs_old || die
+
+	python_moduleinto /usr/lib/wxglade
+	python_domodule .
+	dosym ../../share/doc/${PF}/docs /usr/lib/wxglade/docs
+	fperms 775 /usr/lib/wxglade/wxglade.py
+	dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
+
+	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
+}
diff --git a/dev-util/wxglade/wxglade-0.8.2.ebuild b/dev-util/wxglade/wxglade-0.8.2.ebuild
deleted file mode 100644
index 2cd38d3eaa2d..000000000000
--- a/dev-util/wxglade/wxglade-0.8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-MY_P="wxGlade-${PV}"
-
-DESCRIPTION="Glade-like GUI designer which can generate Python, Perl, C++ or XRC code"
-HOMEPAGE="http://wxglade.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxglade/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-RESTRICT="test" #656934
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	python_fix_shebang wxglade.py
-}
-
-src_install() {
-	einstalldocs
-
-	# Install a bigger icon
-	newicon docs_old/html/mondrian_200x200.png ${PN}.png
-
-	dodoc -r docs
-	rm -r docs docs_old || die
-
-	python_moduleinto /usr/lib/wxglade
-	python_domodule .
-	dosym /usr/share/doc/${PF}/docs /usr/lib/wxglade/docs
-	fperms 775 /usr/lib/wxglade/wxglade.py
-	dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
-
-	make_desktop_entry wxglade wxGlade wxglade "Development;GUIDesigner"
-}
diff --git a/dev-util/xesam-tools/Manifest b/dev-util/xesam-tools/Manifest
index fdec0e6b8213..fc0be915fb8f 100644
--- a/dev-util/xesam-tools/Manifest
+++ b/dev-util/xesam-tools/Manifest
@@ -1,3 +1,3 @@
 DIST xesam-tools-0.7.0.tar.gz 73173 BLAKE2B f1d8f69d18bd72db4ca40131be8c2e9eac8752d18d8958e343e0c6dd5e49b7a6d89399aec4e4306d2f3c35fddbf4530deff4f9fd09ed0c47b2cc59694ff6baec SHA512 3428e18eb52fa205bca872c8b0b1f12f01f58a8fb43239bc2cc78fe52f9903940702dae4116d4775340b69ec949ad2198b57c0c1246fe58dd8ed8b7a6562bf71
-EBUILD xesam-tools-0.7.0-r1.ebuild 879 BLAKE2B 46453a248273d6f4a1e5ba43917b21fb7efa2cee44038829a70dcbebf3a34a3c0d1214fbfe94946908d6dd5b8c61ca0cefa4b6ba419cdf4db398548ec8b050d1 SHA512 cfd2a453e5c22d48c71771bd2934de05014ff50d7e7410ccd2cb09126017436296b66429245e843ac2338f6a36410521c8038c97ec72b5677e49fa4ea18235da
+EBUILD xesam-tools-0.7.0-r2.ebuild 931 BLAKE2B 6b2348f992d753188d48a480edae1bb5b91dba9bf73baa37984d80eda63b6c3ddda1187370d7b97951ebaa98de2c2bab03f144db85449d480febf2b5031d996f SHA512 c90f690219d0a67c3cb38cd1d7816949a2f32e54addb992b5384ba8c1dd481e527191e6d3cb677c3d9ff4ad539e9134efd5ac634751af3d545baa806ef04ab82
 MISC metadata.xml 392 BLAKE2B 3ae2a8f256053d6fa0322ea781210ecc3e225bb0eb67e53edfca71a6dc57fb8e5bd283a1b839f25f8bc3bfaf526a88acc4f1d8c83a8cfabc5a90d0883a995a61 SHA512 10e2dafc4fdaa7f851db74280e47df4f37885d2919383d15f9d51004858d3221178052d55c6fe53fcab101389c1ed028c1d9c4e7ca72360c4620c563ae2a7cdf
diff --git a/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild b/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild
deleted file mode 100644
index a32e8c07ccd7..000000000000
--- a/dev-util/xesam-tools/xesam-tools-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Development tools and examples for the Xesam desktop search API"
-HOMEPAGE="http://xesam.org/people/kamstrup/xesam-tools"
-SRC_URI="http://xesam.org/people/kamstrup/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto "/usr/share/doc/${PF}"
-	doins -r samples
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/demo"
-		doins "demo/demo.py"
-		insopts -m 0755
-		doins demo/[^d]*
-	fi
-}
diff --git a/dev-util/xesam-tools/xesam-tools-0.7.0-r2.ebuild b/dev-util/xesam-tools/xesam-tools-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..676f69b8e2bd
--- /dev/null
+++ b/dev-util/xesam-tools/xesam-tools-0.7.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Development tools and examples for the Xesam desktop search API"
+HOMEPAGE="http://xesam.org/people/kamstrup/xesam-tools"
+SRC_URI="http://xesam.org/people/kamstrup/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+	')"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto "/usr/share/doc/${PF}"
+	doins -r samples
+
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/demo"
+		doins "demo/demo.py"
+		insopts -m 0755
+		doins demo/[^d]*
+	fi
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f97726ced9e3..11cff41eb393 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr-xmloutput/Manifest b/dev-vcs/bzr-xmloutput/Manifest
index 0a8305e521d1..6e40db88b0a8 100644
--- a/dev-vcs/bzr-xmloutput/Manifest
+++ b/dev-vcs/bzr-xmloutput/Manifest
@@ -1,4 +1,4 @@
 AUX bzr-xmloutput-0.8.8_remove-relative-imports.patch 5175 BLAKE2B 5ec184209d5da05c52685f7783d5e80115f29c1004c341b0fc6223efa3314bf7a7242f3513488f8ef2f20a2967e460904ec787ef9fb379fe591636718655d957 SHA512 209b3e4df0123a85a34d9b1f3cb2706fe61ab3bf779011cb16cabcc92245204c06d5be6ab16def6389fadb882b8ff8da5b0551baba988354ef95a777fff355b7
 DIST bzr-xmloutput-0.8.8.tar.gz 49969 BLAKE2B 728783e8d68063c639d153b334116c109f90493d80f7384f4e25deceb97e67843ad27676ac70403124163ebec745adf58fdda38515db3932ff87684e60537377 SHA512 9eb87ba86dd45b7132eca69ef6e52726d7ee2d9211cc3052655e40f5cee2b99e160336c347ddce7ad912c0027e8b6a05ca542f70733d2e3493922cfa311b38ef
-EBUILD bzr-xmloutput-0.8.8-r2.ebuild 611 BLAKE2B 746d20ac3a8035203dd3bf20bbb7618ea91301b3572c1c2b695295a04b7deec6cbe28ace76f471a9f46f21012b8d4d8b03d11387f078fa3696d2e762bb138653 SHA512 6235679d5ca3bf0dbed7f4f455f37bd11d117b3c2f1baf83db554cd2610681a4ab69dae51e8d9ea1cc5b344afb77a9bc5e19b0d1d9eae780a375afabbe9c28d6
+EBUILD bzr-xmloutput-0.8.8-r3.ebuild 646 BLAKE2B 906fdb8ca122c3d076411887990d5146f927c2cedb71ac354a037cfab09671cdd4f0aa8775719ffb8041a73e806254aa9261e85c9fe6c2c48fe95bbf192dc710 SHA512 4c84f30f19d907371bbd01dd2c78dcd9e414ef66b1ec1e2d526a1a1c1b6fb1270de0ef5bb2c9220a9e72df15be4b2ef5e7f05a80a5d1eeab96b8006dda2beab7
 MISC metadata.xml 253 BLAKE2B e68e5578eb3a3b0fecc4d9d53d9df965024851ea16c468ad728307064315ddf8547152e27f3c4a45e1b01f3763b0e7650dc6daa4f067d02dad00194379762bb0 SHA512 4fed0d9c18fc0528aaa734f5d16a7e1a36f582fb4b82365d8515301b04389b98431dfb61868c1e69a50b5cf8b5e19e73cd0facdb3ead5eef094eb24cda3ddbb3
diff --git a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
deleted file mode 100644
index 6006269067ab..000000000000
--- a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Bazaar plugin providing an option to generate XML output for builtin commands"
-HOMEPAGE="http://bazaar-vcs.org/XMLOutput"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-vcs/bzr[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}_remove-relative-imports.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r3.ebuild b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r3.ebuild
new file mode 100644
index 000000000000..3cafe5224888
--- /dev/null
+++ b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Bazaar plugin providing an option to generate XML output for builtin commands"
+HOMEPAGE="http://bazaar-vcs.org/XMLOutput"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-vcs/bzr[${PYTHON_MULTI_USEDEP}]
+	')"
+
+PATCHES=( "${FILESDIR}"/${P}_remove-relative-imports.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index c8852dc2f7c9..1247647f7bfe 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,5 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r12.ebuild 2967 BLAKE2B 61c47efbc6dcdef5e63286a7665e39568c7273df3c25427564cde862d3d3f690c7229a8fc1b42baf0f1042eb5b9121123d657a729a3301476f7bbcadfba964ff SHA512 72a6e5f4f29b85b11247075bf23935e55c8eb806347cad2dd6d80e759e751f9e78cb7400e15c633132c6e0f7de7e94d6bdb149864c9548fb154a3accdf80aebe
+EBUILD cvs-1.12.12-r12.ebuild 2965 BLAKE2B 90aeaa68ff3266954287b81a8eecabc0614bb7a0f17b4036688e3fa400d309fd3c5c28e59029d209e96a0d0e287125bfab70277d7569a62a8d06b643aae3fd26 SHA512 f356680d2ae8ceb0b257021846bc2d9a4e08f67e0c13d6ffc7bb6779078b69f97cc9c5c8ee11c996f0ed7f455a43b3628cef407104716f39b7cdba591f6e1997
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index ff6dca4d2b97..4b4172400eb9 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
@@ -64,7 +64,7 @@ src_configure() {
 	fi
 	econf \
 		--with-external-zlib \
-		--with-tmpdir=${EPREFIX%/}/tmp \
+		--with-tmpdir=${EPREFIX}/tmp \
 		$(use_enable crypt encryption) \
 		$(use_with kerberos gssapi) \
 		$(use_enable nls) \
diff --git a/dev-vcs/cvsps/Manifest b/dev-vcs/cvsps/Manifest
index d68511f39f18..c02773a690b7 100644
--- a/dev-vcs/cvsps/Manifest
+++ b/dev-vcs/cvsps/Manifest
@@ -4,5 +4,5 @@ AUX cvsps-3.13-make.patch 1189 BLAKE2B 682e089bb25716e71f049a2ce1641c14ac8b60a82
 DIST cvsps-2.2b1.tar.gz 62763 BLAKE2B 35a86b93e69aba83fd96294b9ff993100b2b63e9dda9bd21899fc4a6df42513dde1297cebecfa6f95b43e293eb718e55ff3c9af7ac31187c8cfcd38242cefeb8 SHA512 9e6f95df53cdc16566f1606a9299ee641de9b020a373c9004218b3db23fbdcce9e32d4a57dce332580bc4e6429b90977c2753facd0ad8f9a9234b79f03a7a33d
 DIST cvsps-3.13.tar.gz 64437 BLAKE2B ec0755d39be448485a900a99cee9ef79f36343beedef80e10d6b0f48f7746b93ff54ff6b85fc1650408a228e363f45567f107be108d6bb1183c4998c5705f567 SHA512 9fe2be4839c7a6f31a788102fd6ebb1e2e0693f09a4dad2bca5cd5d0788088eb34388d592778f04bcfec9817e3ffffb66d70db9aa47996d3bd1c45cf7cd8464f
 EBUILD cvsps-2.2_beta1.ebuild 907 BLAKE2B d6b48f04387b04db687c0a89e05cb8348df8da9f6ac98f7e4c0c953628ab85cdfe36fb2c9946106009ed4ac038cd9884dcf7649bdf84104deb2e4fecdce507d1 SHA512 6a44090250709ebd3ed9a615cb5918409b35bdcb8bd5994a49d15f9e9314685a166e5a7d369e743cd69be14559bb4c77aa0b5106b68e09797519a6605adb0510
-EBUILD cvsps-3.13-r2.ebuild 1016 BLAKE2B 4b8ad09f420f2cdd8c5deaca57114dfa7ecfb0870d8569f3e071638544a48496d7167e6564c7271de4bdbb0b0f835b4dbb223b2991178f2e06db4d2ff60c496c SHA512 f1163dc80ae8e46c7da93b1f507a4fa22ca2ec6f448a4b8f8fdb0cf89255b1cedd352e08b30ce5a4502fe6013449e8e01d2eca998350b23568c96d2a325e7ffe
+EBUILD cvsps-3.13-r2.ebuild 1015 BLAKE2B 71f3abbc174302c619f8bf26bbd6a236a16fdcccece1774031c85b221d7005c7faf477570e217aeffa489876bb9315e63446478d5ff73164960c4e085056db44 SHA512 095ce3efffa6ba3bade54d99546e5f6eb0ec487708ed9e538109d8593a3aa68ff0debd9fff43cc9bbf8522d4d515c13ed2e0ae0ec3b35db8991765bf29a9b779
 MISC metadata.xml 323 BLAKE2B 2aa38c904f2a7ac09a4c62906f1535332a43428b602632b96d1a728d35e5c8031a50c1750474e932f127d83bc3a56e2e2cfed1d02fb747d33a0045408e8adca3 SHA512 0788681a1fce2712b5722546e57da91895b3c292ff564062f0b16d9c910ad96b4a46e18e5d71a64fdd0a6980d000c2200b791fe95d1b2bff286e94ee60ce4edf
diff --git a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
index 1d9ca2cea5f5..436cdd749942 100644
--- a/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
+++ b/dev-vcs/cvsps/cvsps-3.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib"
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 4fcee1e6900a..9592f15d2e2f 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -4,7 +4,7 @@ AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6
 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
 DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee
 DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
-EBUILD git-cola-2.11.ebuild 2363 BLAKE2B 01ab123c26e500b8643472fc2c7461bd1e5c9430dcd4cdeca87d894f1470c972997b4cecffb71fdfcc1dd5acdc924ec18adfb8952001998327c245cb669ab46c SHA512 e685d1a9e78c4e884ec07262a9135fb19971b2fcd5cae3c67f90360dd54dea001ba3fa7ac471930ca691b03051a3c767a825249eb2e34cb40d3bc2cd56b10fd2
-EBUILD git-cola-3.2.ebuild 2248 BLAKE2B 7e6fabffd82dc9410acda407dcea904ef7d1d790b124dde760dca6b1b236a374a13340e1efc16cf1c667063174d7ca85261a53f174c0456edac0c932bd32476f SHA512 f757277d68f3187481384ec4e95323e1553e46de38ba7a4ef196f4c5c93d66353d2b93e8ee82dcbf3019e02b74eb68b2fee34cc3e6e02ab7697448432304aec2
-EBUILD git-cola-3.5.ebuild 2344 BLAKE2B 7b060cfc0e0aecc104a261fcfa84faaf28ab508a466f710f540784f0866e1b2ffcb8f513e73080b77af3a7a4f008cb38fd7c4d0902860b037b4cde18401bc966 SHA512 0d12db48bf1d9a3ba3949eab203df2e22fea1f9dd1de53a1e36745203ba14565995b7753f876a87868edede8c6e5bd99c364b66604d03d548a4f117b5d83b86b
+EBUILD git-cola-2.11-r1.ebuild 2467 BLAKE2B 41c2c8d7b46bb38fd9c0e29aef1a78f2cc9fe572a66661cb8596cc1793516e03afa9033c3c1e82b1c7d894bf26d99ba422b46b07b0588fe0661a3240bd41aef5 SHA512 3186c8fcced9d3264bcd7ae6f1c1d91c024716aafce4533755d223249f4eb3083a43241e3b377fc748353b9802c5e52296b8c205d4372618bb09c4d9d63eac94
+EBUILD git-cola-3.2.ebuild 2365 BLAKE2B 68c608fbfcadd3e5b86eb5ecefbfc472acef065473d02311e72c1796463c853ae0ef99b94b9ce9419f21e8c62a640897bbd94744ae634acd5f0e140703743ee4 SHA512 de423a52b9db9e4eef1729fc1ffcac9ced5c7c9bdcfadc92380f5af83d5e204ffcef6c32c5fa42a8ffe7fe626cf73942bb0e99d7e2f30eac64c346d056883d09
+EBUILD git-cola-3.5-r1.ebuild 2457 BLAKE2B b4a74fe9749529edba8b0309b6e0368193c3b67b4ce0d3117aca4da1a32c60b8646cd7c77e79e13091a85ebea12092b23e8858f585ce1f090532ae9edf5f602b SHA512 6a7ed3a27d87ca61c4e362eb3b5c017e39233c300d1b04d309f2cf0aa26a7305547abe5ebce6a24349840a19699dbf42646b0e41d50f143b50ea02130f1202c4
 MISC metadata.xml 254 BLAKE2B 0ae656bc7a829c95367497cfe1198346a0586bc944809725fc83ff0b92d33ddadb0a82407300d1467cb4ea75073d2ab0a89b8d67d8efcff400a444b06330c77c SHA512 8a5fe25f733f77a4e70a64521dfffbeeb8539dc709f55dd9a941cc920f7a7e6a8918cb5f07d7b57ee5ad63abdaf31067a217afd081164e68562239b584416109
diff --git a/dev-vcs/git-cola/git-cola-2.11-r1.ebuild b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
new file mode 100644
index 000000000000..f0df3414753e
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo-r1 virtualx
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+# Since PyQt5 is preferred at runtime if installed, depend on that
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pyinotify[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+	')
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? (
+			dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
+			)
+		test? ( dev-python/nose[\${PYTHON_MULTI_USEDEP}] ${VIRTUALX_DEPEND} )
+	")
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.10-disable-live-tests.patch
+)
+
+python_prepare_all() {
+	# Use system QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# remove broken tests
+	rm test/i18n_test.py || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --no-vendor-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild
deleted file mode 100644
index d97f4818b85a..000000000000
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo-r1 virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# Since PyQt5 is preferred at runtime if installed, depend on that
-RDEPEND="
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/QtPy[gui,${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,network,widgets,${PYTHON_USEDEP}]
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] ${VIRTUALX_DEPEND} )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.10-disable-live-tests.patch
-)
-
-python_prepare_all() {
-	# Use system QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# remove broken tests
-	rm test/i18n_test.py || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
-	python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild
index de021727cffa..1d8dcb00b087 100644
--- a/dev-vcs/git-cola/git-cola-3.2.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.2.ebuild
@@ -18,21 +18,26 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/QtPy[gui,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-vcs/git"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		)
-	test? (
-		${VIRTUALX_DEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		)"
+	$(python_gen_cond_dep "
+		doc? (
+			dev-python/sphinx[\${PYTHON_MULTI_USEDEP}]
+			)
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+			)
+	")"
 
 python_prepare_all() {
 	# make sure that tests also use the system provided QtPy
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
new file mode 100644
index 000000000000..9a1bb3679f78
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=true
+inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="https://git-cola.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+		dev-python/send2trash[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-vcs/git"
+BDEPEND="sys-devel/gettext
+	$(python_gen_cond_dep "
+		doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] )
+		test? (
+			${VIRTUALX_DEPEND}
+			dev-python/mock[\${PYTHON_MULTI_USEDEP}]
+			dev-python/nose[\${PYTHON_MULTI_USEDEP}]
+		)
+	")"
+
+python_prepare_all() {
+	# make sure that tests also use the system provided QtPy
+	rm -r qtpy || die
+
+	rm share/git-cola/bin/*askpass* || die
+
+	# don't install docs into wrong location
+	sed -i -e '/doc/d' setup.py || die
+
+	# fix doc directory reference
+	sed -i \
+		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
+		cola/resources.py || die
+
+	# fix ssh-askpass directory reference
+	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=( --no-vendor-libs )
+}
+
+python_compile_all() {
+	cd share/doc/${PN}/ || die
+	if use doc ; then
+		emake all
+	else
+		sed \
+			-e '/^install:/s:install-html::g' \
+			-e '/^install:/s:install-man::g' \
+			-i Makefile || die
+	fi
+}
+
+python_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
+	virtx nosetests --verbose --with-id --with-doctest \
+		--exclude=sphinxtogithub
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install_all() {
+	cd share/doc/${PN}/ || die
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
+	python_optimize "${ED}/usr/share/git-cola/lib/cola"
+
+	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
+
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-vcs/git-cola/git-cola-3.5.ebuild b/dev-vcs/git-cola/git-cola-3.5.ebuild
deleted file mode 100644
index 9fb8610abf7d..000000000000
--- a/dev-vcs/git-cola/git-cola-3.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=true
-inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/QtPy[gui,${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-vcs/git"
-BDEPEND="sys-devel/gettext
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${VIRTUALX_DEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# make sure that tests also use the system provided QtPy
-	rm -r qtpy || die
-
-	rm share/git-cola/bin/*askpass* || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=( --no-vendor-libs )
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc ; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \
-	virtx nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
-	python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-vcs/git-deps/Manifest b/dev-vcs/git-deps/Manifest
index 28ff61877288..93865dc20f86 100644
--- a/dev-vcs/git-deps/Manifest
+++ b/dev-vcs/git-deps/Manifest
@@ -1,2 +1,2 @@
-EBUILD git-deps-9999.ebuild 1028 BLAKE2B d8fdc91d0ce0fefe9314243f60b3dfe5965398094f4680893a3d1ed993987da80e880ba97bb2cc3c71963b650790dfb32b8dd9f04b8a0624b18d7e307f308daf SHA512 2e8826945a6840739f83a266e388fd79ced5394a501d322113e80260711cc1b493d1a060d30b21ca9f967a1651cdd1fcb239a6a390e48488b62c69db6f7e655c
+EBUILD git-deps-9999.ebuild 1068 BLAKE2B f391c0f288187163ef21d5cc75f8c9fd685048ca265674c9686642cd5538f77e7084ec72310b9f09fea136d2b5d9767c4d87a85142a824e7067dc9ed636f5d39 SHA512 3c9636eb7b478d9bc8f66a406c871ddad72d55b7e7e09ed72f3d6225d97a39a2c092b5308bd4302c747cc0193aaf81c581927ee70f7e1081609d75a747dd9180
 MISC metadata.xml 490 BLAKE2B 12b1fd6d7c20349fe5ed2f76cfec260442479834c1cba9ef26722719ff6ea8b0d760519d8f7a62220e10b90b4e328a93898a61c974ece364736d1ad4a9828e8b SHA512 005daa7d1c3abffad1bda794339947dabfdb097a2abe85a1ea5b85fd962332d788d2903301f2b3442a3f35f5b97eb25d3ddd1add00460108ffc857f57c3fa926
diff --git a/dev-vcs/git-deps/git-deps-9999.ebuild b/dev-vcs/git-deps/git-deps-9999.ebuild
index f66f91356572..57d46ddb9f56 100644
--- a/dev-vcs/git-deps/git-deps-9999.ebuild
+++ b/dev-vcs/git-deps/git-deps-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 RDEPEND="
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/pygit2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/flask[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygit2[${PYTHON_MULTI_USEDEP}]
+	')
 	net-libs/nodejs
 	${PYTHON_DEPS}
 	"
diff --git a/dev-vcs/git-spindle/Manifest b/dev-vcs/git-spindle/Manifest
index 7b923b9e84fc..9fb8ee023989 100644
--- a/dev-vcs/git-spindle/Manifest
+++ b/dev-vcs/git-spindle/Manifest
@@ -1,4 +1,3 @@
 DIST git-spindle-3.3.tar.gz 1854895 BLAKE2B b1330ba728a7f124024ad755ead350fc3e8b2a3065afe70f56b4053bc2a308920c5e2ec4d4bfee566ad199d58ec0cc3d25ac69be1e5999a2527a9711b79f4164 SHA512 5d56f51d952ccfea321be79108a795d9e7dd7eca78d966955e76e1c8297eafc9899ef40b6ef1bfff692fe0ce7c3d54ead0ff5fdf31eb559d3ebc0ef9de91c3e8
 EBUILD git-spindle-3.3-r1.ebuild 669 BLAKE2B 030221392aa61557a5a353c4c3bb77b4d32934caf70b196521d12de1e2c012b022eab2c36437c7c44e53c4e0dead5b73a4eb2d9eac99611ca73a1ff4db28737a SHA512 3ae89f482e44a299bae1d1059ab5567c1d2943086206b2eccf10f0650b7a9f22084837b7db28fba46f5ee831896d9445807aaca2eec361cd03f0779edc6a2cbb
-EBUILD git-spindle-3.3.ebuild 558 BLAKE2B 4b26b9e249dff4a544e270371797210e4a5dc38d574b252a6c0b926760cc5a37e9a5631130d3746e49d45f55d3fe6d5d01a3568554476a76cf79443a2a7383cb SHA512 b271c3bef677459ebb1a31b9c44db218608675fd7c891c92c17c74fc9b040c9b6f8ff448ec2ad9af15acd9cfd24341fcf0a07534dcf019367f782c7990b1206b
 MISC metadata.xml 626 BLAKE2B f24c2dedc0f5d576e138ca4eb7a77d892c16ac5b7a96bc41161b49d39e97920ea11eea3bb3c67a72086a756ec40fae9fb8b866eb38c6fd86ba885b41f01d8cdb SHA512 7f2be03b228a372aeb1a17913d790ec69c2d02d684c9495c460fff28b00b4a36e14b66e25e0ed31f0c9c0913ff5292cff02ca690308fe3feee84b66e9b3678b6
diff --git a/dev-vcs/git-spindle/git-spindle-3.3.ebuild b/dev-vcs/git-spindle/git-spindle-3.3.ebuild
deleted file mode 100644
index 3c2c96e2b97a..000000000000
--- a/dev-vcs/git-spindle/git-spindle-3.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Git subcommands for interacting with central services"
-HOMEPAGE="http://seveas.github.io/git-spindle/"
-SRC_URI="https://github.com/seveas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-vcs/git
-	${PYTHON_DEPS}"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-vcs/hgsvn/Manifest b/dev-vcs/hgsvn/Manifest
index 7e6637055e1f..1ea222c4494d 100644
--- a/dev-vcs/hgsvn/Manifest
+++ b/dev-vcs/hgsvn/Manifest
@@ -1,3 +1,3 @@
 DIST hgsvn-0.2.3.zip 199696 BLAKE2B 1947d69a5f9a01d7802a3f0a1fd7f38b15df4f653ca9aaf836646eb03be30e4a4f09c24469a9b118e4eba769a94636fe04d2f7399fb3d835d54c8d0225af6f1e SHA512 d88d683730430b825411b4267c78e82e492f45d55c49c8a19ed159a95390e58507b07217c4e5082a223c3217042fdc1ae2c96648b1880bd441117ca173ca4c09
-EBUILD hgsvn-0.2.3-r1.ebuild 878 BLAKE2B 0a6fca76683472f0215cac5bde3f25ed5553402c8a5d70c7812cd2aaefbb1ff8caf07b6f473dbf934d3fd0ee479eaaaabb02809cb995719c2e52f7ed4ae9bf83 SHA512 42e3aced8630f8c25e2fe5abb9fc8fba696bf3e95a6e70ab214ebc7ddec95a788ae0ec610f2d5196bb2d4daa4163995843a4e18c98bfcbe47af6572b957b089a
+EBUILD hgsvn-0.2.3-r2.ebuild 889 BLAKE2B 7e9003d55c2eaef93c98f3738d9e67abf2e85192fae55b8cd7d0cd14e4efa09a094c7d430afd329b55d7f8f86245beca3492036567a12952da9fc03d0c36e5d1 SHA512 0782e8818fd7d179a613516d02d2caff32ad8f6f30d7e6afb891ea3c0badf12d82f60f696f3c4a8791013ed0b503174deaf26f5ed7c7607cda0d78621f58d0bb
 MISC metadata.xml 344 BLAKE2B 7f7a9ed296fdf435cef6b24832bc3d83d59d795942197655c8c69c75162f0e66832a5c2982201029d7fc1008296f1523c6b6e4b6e34024876ef95a7cafe73a13 SHA512 9d31dde261ac9899cc9b5aa6f503b1d46db57b973ba9d26191f0d6d12424d63a1fce55dfe8d2bc198653c0ea8af1585f3a6b6969dd8b943fbc1d4a19592d819f
diff --git a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild b/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
deleted file mode 100644
index 016859b30c33..000000000000
--- a/dev-vcs/hgsvn/hgsvn-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-PYTHON_REQ_USE="xml"
-
-DESCRIPTION="A set of scripts to work locally on Subversion checkouts using Mercurial"
-HOMEPAGE="https://pypi.org/project/hgsvn/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~x86-macos"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-vcs/mercurial
-"
-RDEPEND="${DEPEND}
-	dev-vcs/subversion[${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	sed -e "/use_setuptools/d" -i setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-	rm -rf "${D}/$(python_get_sitedir)/hgsvn/unittests" || die
-}
diff --git a/dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild b/dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..91a1d656c061
--- /dev/null
+++ b/dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+PYTHON_REQ_USE="xml"
+
+DESCRIPTION="A set of scripts to work locally on Subversion checkouts using Mercurial"
+HOMEPAGE="https://pypi.org/project/hgsvn/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND="
+	app-arch/unzip
+	dev-vcs/mercurial
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-vcs/subversion[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -e "/use_setuptools/d" -i setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	rm -rf "${D}/$(python_get_sitedir)/hgsvn/unittests" || die
+}
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 250963c13400..c467039d4d55 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,3 +1,5 @@
 DIST repo-1.26 29829 BLAKE2B c5dc74214d404e6c11189a3d34c9a771ed5689da14e64588b5db144b6ea3ec38a727238d7dc6e609a22edb5b84d350210564615016f6b36599cf9e3fc3b34ef9 SHA512 1398fab95b4fb4a24fda93d4054384a801b5b70e3dca3a794f458d8e19582ef833ef5a3a0f3a571121d2d9172ce0e70f8b3c6719f6c2f47643ffe6de181e34b4
-EBUILD repo-1.26.ebuild 847 BLAKE2B a86153526d1ecec7490c7a58eef44754d089dda05e9e3840d15a4747da659221f58d5b1d9fe5dbd9f2276c2e35d1022f05132324028d02ae9d4bc5cbb05097cc SHA512 0d5ecc7a9004fedb6d91693234d56d222cf0190cc4ee8c44e8a3ba3592d658f1dd54850af314db22d3a372fe69eb6e2b07651b4700aca76d365c274b33142d2a
+DIST repo-2.0 30067 BLAKE2B 23aaae97c8512e329a4293d82c4e65583861d515dc079fdddbb73473ea0aeb3951315fa7595c70695cf94f030ed2bc97b134ff2aafe774b552132ac8cf4f4045 SHA512 a83525fa87a3fba8d78af1305dd92f5e51f58430bff20f63b8b743ad94d382ecf3edc1888c78f9da4be4d379bfa3ccde79aae5c1d8c173f928d3593ea42156bb
+EBUILD repo-1.26.ebuild 841 BLAKE2B b0c6dd45b5752a9b0d0af84f1d7c2e22a3556cfbec3cbe9aecaf22faadf34fb986c8ee520a8e18a979eb6d8058238a80195577aab3edccf584ae2d3c7f031250 SHA512 e844150bfcfac200304383c0b0f3ea9f77295ebc709b131546637fef96b1af3639cba783208cf0130311c53b2394153b894f2e7f34843f7c89cddecfe080e1f1
+EBUILD repo-2.0.ebuild 868 BLAKE2B 979642b6415c18093ad405a459dcc4431c3758e9d16e1c5e0fe12e88106680f57957975a5ffd8eae5f681d5f0e4c85ffd478c0f3df68cdd0d90f712102e2d01a SHA512 11fe9e4b77479d136d0b0f85751da243fa0bbc419a9ea3caacfb4e8eb55d8503b6019b822504c034debf715c64f9701297500d8415eb42f54ef9d1c886cebbd9
 MISC metadata.xml 338 BLAKE2B 49e4b3e3767754bb7a0661cb388f3e18b372fa713d0e3b92c742cddb2fe21e384b1689fd72b23865d7b363ab01bae90a5a11956593eccc915f1b6c99e52c2718 SHA512 0a83263d882281636f6925d20c9e8b991267a1b7d73d7bd6e545c77372424fd602e28d6c9a82668d0a73500bcb8dd8287f7891b66e3fe1517907001f3fb43cd4
diff --git a/dev-vcs/repo/repo-1.26.ebuild b/dev-vcs/repo/repo-1.26.ebuild
index d1563fd6addb..9d2c58695f06 100644
--- a/dev-vcs/repo/repo-1.26.ebuild
+++ b/dev-vcs/repo/repo-1.26.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-vcs/repo/repo-2.0.ebuild b/dev-vcs/repo/repo-2.0.ebuild
new file mode 100644
index 000000000000..1632716eecc8
--- /dev/null
+++ b/dev-vcs/repo/repo-2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The $PV tracks the *repo launcher version*, not the last signed release
+# of the repo project.  The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo"
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-admin/radmind
+	!dev-util/repo"
+
+S=${WORKDIR}
+
+src_install() {
+	python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+}
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index a5d2ffce84a1..9f900de540c4 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -5,6 +5,6 @@ AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa60
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.12.2.tar.bz2 8506584 BLAKE2B 535e4c6c369537baa7f9fc9123d0314de1bb8d4b3c51e0216662047fd1084ceb6a1f349de54bf575f0eb8e1041fcd6525e6cf27dbd908e2148578cb9fb807bb3 SHA512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136
 DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
-EBUILD subversion-1.12.2.ebuild 15506 BLAKE2B 496cfb7edc67cc127d1513cb83614132257774ed18a45779ff194bb044f723b4897e63b6f7398083620df6bf02cd0f4398f04fc3e3b4fddf915543a4b434fd71 SHA512 52894ce6cadec57392fa895f7fdff3eb4c10208816cded6c5a88db8356a5ab13f17fa3373d7c91d21a514c33404ac6947549798f0ed14c7d48c4690c351c8be8
-EBUILD subversion-1.13.0.ebuild 15515 BLAKE2B e2b4820662dcb8e12362fd2d6cb143ce5b1f884cb2b8526bf6ff69f6375e824bf74cf529080ec9ae7c2a706c45f08c4bbd9ea63982fcfd21c0d9660d59244bff SHA512 b0820e3d8e0a8722534e5803bcb99499899d42f93ce24208052dbf48d129ffeea253b71d76ec4b7b084d292bf9286435e3674fda50c2aa281637d043c4a178b4
+EBUILD subversion-1.12.2.ebuild 15492 BLAKE2B 29e4631386a60d57357be19612136d322485aef4ddde339e749a232b1286a0dce3eb38517bae19bfb4355f5cb6ddef856194e04afdb5096c5e03f81eaff54bb8 SHA512 5c1b9da2237539eb45367d0d09f476675feace3d239af7567a4ce5c4ea606e95214834ba640f9baaba5264a87d52b97c3ec3bfd5ff4b27b06b1ac11f0f8454cb
+EBUILD subversion-1.13.0.ebuild 15501 BLAKE2B 7100a4ec379f8b26c4194e9c59f158ef2fbbf55b395142f7426ab0c20c81075278cc9038b6a321068deefd9ac6b5f6369e6079b5d68d3e62082d642ff3ec28f2 SHA512 2d85d7a9766207ef535f664e87b0f4c351355063914c4756d48caeef940ba6a40479f2d9979de70ffdf6858f7b2fae8ece98780a3a66db3dbd61b5cc38b96394
 MISC metadata.xml 575 BLAKE2B 10cda26a50a50e6ac6b16d578d1a3856f88ac12b56ac6ff1768c4a0e0240b2e6abea6b1f66a6ea7d3f817e75eb9e2d5e14999ad2ba330b55784ec5028781b994 SHA512 f2a6ff822a11d452c133aca4abeb1ffb214d946c7e706d1caa269564c4dc55374c17449a4912df54b12ce562d66058baf2e710f3e9e46ca3602e9d8483555584
diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild
index 133e7dedbf40..3f53e0cbd391 100644
--- a/dev-vcs/subversion/subversion-1.12.2.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.2.ebuild
@@ -184,11 +184,11 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
 		$(use_with apache2 apache-libexecdir)
 		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX}/usr")
 		$(use_enable dso runtime-module-search)
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
@@ -197,8 +197,8 @@ src_configure() {
 		$(use_enable nls)
 		$(use_with sasl)
 		$(use_with http serf)
-		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
 		--disable-experimental-libtool
 		--without-jikes
 		--disable-mod-activation
@@ -261,8 +261,8 @@ src_configure() {
 	fi
 
 	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
 	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf "${myconf[@]}"
 }
diff --git a/dev-vcs/subversion/subversion-1.13.0.ebuild b/dev-vcs/subversion/subversion-1.13.0.ebuild
index 030f59949571..e1cb5bd947d9 100644
--- a/dev-vcs/subversion/subversion-1.13.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.13.0.ebuild
@@ -184,11 +184,11 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
 		$(use_with apache2 apache-libexecdir)
 		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		$(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		$(use_with ctypes-python ctypesgen "${EPREFIX}/usr")
 		$(use_enable dso runtime-module-search)
 		$(use_with gnome-keyring)
 		$(use_enable java javahl)
@@ -197,8 +197,8 @@ src_configure() {
 		$(use_enable nls)
 		$(use_with sasl)
 		$(use_with http serf)
-		--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
+		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
 		--disable-experimental-libtool
 		--without-jikes
 		--disable-mod-activation
@@ -261,8 +261,8 @@ src_configure() {
 	fi
 
 	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
+	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
+	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
 	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf "${myconf[@]}"
 }
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 64138c6de4f1..7b965cd93ab9 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -5,10 +5,12 @@ DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6
 DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359
 DIST svn2git-1.0.13.tar.gz 43738 BLAKE2B 97e9b90402d3c7eedf0fafd3b68429c99d93522dcfe190f88e64b744cb86e5fec0bdd0fabfef39018e290a425a53a2089df88250ff03e447f2963e2ad99fa0e0 SHA512 7cc9a9d70da285533f7f34672fb8f6571cb031d2dd4fc9df904b9e3acf64d97f42027a19bed82478c75a237febf3c8e12ba27a1abcd98403fe24247e5a26a96a
 DIST svn2git-1.0.16.tar.gz 44489 BLAKE2B 0be673592a6032b0f46f7ab80e50862e6979a6540d17eadb2c0e4c3f40737283fb17cc51340810bbfc17dba7ee258537d5618de95da3843851e20ae843a47626 SHA512 11289c98fcae98ec2137b778c064e73f47957c987a8d413946a8cde44d679565eae878e69e3a60b5c48c0753dd4935d001eb6ba28253cea995ee4fd40379b583
+DIST svn2git-1.0.17.tar.gz 46473 BLAKE2B ab862a310f8d21b33d49f5152df458fb1524abe2e353e6395d7b20d80ee3967338ca04ff5e282623937ca13b38e9018ba81d4c3e89f3c69e1002bff7ddd8621a SHA512 6d02ffa0923bcc80878c08e5a4f2f00476485e34d1c7361ddfa8bdfd521c0d36a22b46e7cd872e617ecd604f2d724166ea95008338bba41ee7e1200dc919baf4
 EBUILD svn2git-1.0.11-r1.ebuild 1164 BLAKE2B c838d41cf17d0241e5b1e229263d26e4015b1d76c768c3feffd41521a28752064eab6e2abb47a563777d691e0bf49e3e50458f4a9fa9d23e95f92257924eb11f SHA512 8e81668615ab102e02391130f22696c8c3bbc1ab7f13103691a35440556f62f400019e0922e9230c97e35f9f9875ee7de42f757427d2f7997d2b1ec1dc1b73f4
 EBUILD svn2git-1.0.12.ebuild 1037 BLAKE2B d9796902d0aa1bd12ac44097ca10fb0c3ece022b193dc60f292fae59b8df1a5fa4d4df0742471dc5ba898b584e6b13757c336e740b99c9746fb756e5e66edb71 SHA512 e02aedb85806701cfebc8f28369bf27433b798c44ac9bafb3730cf4b914fc877fc4134a27e69e7ebbcaf047bde6f9bf14b5854613f1da340342009e46a87dd9d
 EBUILD svn2git-1.0.13-r1.ebuild 1081 BLAKE2B 04d13c0be9aecd14e3b2ea52af46e00de2792a140319545bea39bfdbc9515eb411c67fd9383a8674bea5a22611f1cb29a99ad44f28300ec27addfdd859d0317e SHA512 0745ce05c437203dbe4913dac9e238b741ee69a57459ed82265971e464c0eebbff16f635865b0d23d0ca303bc90b980122b8e3966011d5b250b21d1cc02ed756
 EBUILD svn2git-1.0.13.ebuild 1037 BLAKE2B d9796902d0aa1bd12ac44097ca10fb0c3ece022b193dc60f292fae59b8df1a5fa4d4df0742471dc5ba898b584e6b13757c336e740b99c9746fb756e5e66edb71 SHA512 e02aedb85806701cfebc8f28369bf27433b798c44ac9bafb3730cf4b914fc877fc4134a27e69e7ebbcaf047bde6f9bf14b5854613f1da340342009e46a87dd9d
 EBUILD svn2git-1.0.16.ebuild 1034 BLAKE2B ddbb36477b2dbd88f52598c46dfe6c357a3ee03f17ba668897a11cdf1da6b2d11bbaa160526b7ece14437883ba7583a596f3f9c66f5fdf65c693d76427a7b8b7 SHA512 61d9606dc51ba6efd15b615d6573a357a73b84c01303c6b561b6f3f09aed6db4e9698231b86622913a97118b8a85c36df71b238ee5a2bb0390475c13c7c68d1e
+EBUILD svn2git-1.0.17.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
 EBUILD svn2git-9999.ebuild 1021 BLAKE2B a503c85adb6f2b39ac0483dd3f7032b45a181b6b8306c390c76857138630864a28da68f18f9075183ad098217a7a8c888fe60ad4dd1df86918dd5790fdd9b667 SHA512 9fd102538666531b4f689f9eac4ad4ca0dcc7abf4d20692b1ab0abd0b47ff941060c03afc733e09f994618ca5478cc6d662b7324c74e9be0662b6e9c1619f9ab
 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
diff --git a/dev-vcs/svn2git/svn2git-1.0.17.ebuild b/dev-vcs/svn2git/svn2git-1.0.17.ebuild
new file mode 100644
index 000000000000..7b8fb13d3724
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.17.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Tool for one-time conversion from svn to git"
+HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
+else
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=( README.md )
+
+src_configure() {
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+		VERSION=${PV}
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/${PN}/samples
+	doins samples/*.rules
+	dobin svn-all-fast-export
+	dosym svn-all-fast-export /usr/bin/svn2git
+}
diff --git a/dev-vcs/svnmailer/Manifest b/dev-vcs/svnmailer/Manifest
index b74cd8af7232..d71ce45cf2df 100644
--- a/dev-vcs/svnmailer/Manifest
+++ b/dev-vcs/svnmailer/Manifest
@@ -1,3 +1,3 @@
 DIST svnmailer-1.0.9.tar.bz2 354935 BLAKE2B 72a46c39f11295cb789fdc5b1f01162b9cd150828cde15cefef826b0eb44f580abd7a0ce5a56c4e3eb8741b03a7b45a6b5faeb0b58e60baace91949f40cd5ff8 SHA512 2dae9b123e3f511f022cf4d0db75b30b7fad33719382a7ab57897726ababc73bf24bb838cd92258ee5573996e1fef9805f8afbe958694e7cb4682433dba9a6e0
-EBUILD svnmailer-1.0.9-r1.ebuild 760 BLAKE2B 83de962b83e0e9acdc27bbf668dbac5f070b7b76b05fd702f273a5787f9a854d5d5bda9eee4c9542128da8ff62ab59319807527eae4e1ff84d67e340406fc02e SHA512 d7bcc686bb9dfedee4e7992215e69df72f53a83552fbda0efa5e02963b25be22fb2f32898c66460119378128985668a286183a47b7065d8c7326b336779af25d
+EBUILD svnmailer-1.0.9-r2.ebuild 793 BLAKE2B a284571e2ce587d2f1925be7cae187401b4faeb7a6b569f938fa04f806e700272511075c9f871542157f1a6c5c6880859089fa519a9f453394659260a3a23bb9 SHA512 c576d46556c119ef8e77b914ea9456c0ea6ae093f18bce138b31812bc5192c1c26ce70aeb1f6bf29c322cdd4d5772e0cc5f2e6dd1a6bba2ed6c39db5ac093b2b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild b/dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild
deleted file mode 100644
index 27d43db65303..000000000000
--- a/dev-vcs/svnmailer/svnmailer-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A subversion commit notifier written in Python"
-HOMEPAGE="http://opensource.perlig.de/svnmailer/"
-SRC_URI="http://storage.perlig.de/svnmailer/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${DEPEND}
-	dev-vcs/subversion[python,${PYTHON_USEDEP}]
-	virtual/mta"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	sed -i -e "s:man/man1:share/&:" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-vcs/svnmailer/svnmailer-1.0.9-r2.ebuild b/dev-vcs/svnmailer/svnmailer-1.0.9-r2.ebuild
new file mode 100644
index 000000000000..0d5e77c6f358
--- /dev/null
+++ b/dev-vcs/svnmailer/svnmailer-1.0.9-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A subversion commit notifier written in Python"
+HOMEPAGE="http://opensource.perlig.de/svnmailer/"
+SRC_URI="http://storage.perlig.de/svnmailer/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/mta"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -i -e "s:man/man1:share/&:" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index f09bce481c81..7a149c7af13e 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index a840769cdecf..e546aadfa4a7 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: distutils-r1.eclass
@@ -117,15 +117,23 @@ _distutils_set_globals() {
 	local rdep=${PYTHON_DEPS}
 	local bdep=${rdep}
 
+	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+		local sdep="dev-python/setuptools[${PYTHON_USEDEP}]"
+	else
+		local sdep="$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')"
+	fi
+
 	case ${DISTUTILS_USE_SETUPTOOLS} in
 		no|manual)
 			;;
 		bdepend)
-			bdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
+			bdep+=" ${sdep}"
 			;;
 		rdepend)
-			bdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
-			rdep+=" dev-python/setuptools[${PYTHON_USEDEP}]"
+			bdep+=" ${sdep}"
+			rdep+=" ${sdep}"
 			;;
 		*)
 			die "Invalid DISTUTILS_USE_SETUPTOOLS=${DISTUTILS_USE_SETUPTOOLS}"
@@ -387,16 +395,16 @@ distutils_enable_tests() {
 	debug-print-function ${FUNCNAME} "${@}"
 	[[ ${#} -eq 1 ]] || die "${FUNCNAME} takes exactly one argument: test-runner"
 
-	local test_deps
+	local test_pkg
 	case ${1} in
 		nose)
-			test_deps="dev-python/nose[${PYTHON_USEDEP}]"
+			test_pkg="dev-python/nose"
 			python_test() {
 				nosetests -v || die "Tests fail with ${EPYTHON}"
 			}
 			;;
 		pytest)
-			test_deps="dev-python/pytest[${PYTHON_USEDEP}]"
+			test_pkg="dev-python/pytest"
 			python_test() {
 				pytest -vv || die "Tests fail with ${EPYTHON}"
 			}
@@ -416,13 +424,23 @@ distutils_enable_tests() {
 			die "${FUNCNAME}: unsupported argument: ${1}"
 	esac
 
-	if [[ -n ${test_deps} || -n ${RDEPEND} ]]; then
+	local test_deps=${RDEPEND}
+	if [[ -n ${test_pkg} ]]; then
+		if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
+			test_deps+=" ${test_pkg}[${PYTHON_USEDEP}]"
+		else
+			test_deps+=" $(python_gen_cond_dep "
+				${test_pkg}[\${PYTHON_MULTI_USEDEP}]
+			")"
+		fi
+	fi
+	if [[ -n ${test_deps} ]]; then
 		IUSE+=" test"
 		RESTRICT+=" !test? ( test )"
 		if [[ ${EAPI} == [56] ]]; then
-			DEPEND+=" test? ( ${test_deps} ${RDEPEND} )"
+			DEPEND+=" test? ( ${test_deps} )"
 		else
-			BDEPEND+=" test? ( ${test_deps} ${RDEPEND} )"
+			BDEPEND+=" test? ( ${test_deps} )"
 		fi
 	fi
 
diff --git a/eclass/epunt-cxx.eclass b/eclass/epunt-cxx.eclass
index 30802af340b0..1696faea0134 100644
--- a/eclass/epunt-cxx.eclass
+++ b/eclass/epunt-cxx.eclass
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# @DEAD
+# No consumers, this eclass is not useful anymore, as a functioning
+# C++ compiler is required nowadays.  Removal in 15 days.
+
 # @ECLASS: epunt-cxx.eclass
 # @MAINTAINER:
 # base-system@gentoo.org
diff --git a/eclass/fox.eclass b/eclass/fox.eclass
deleted file mode 100644
index b40f8273d15c..000000000000
--- a/eclass/fox.eclass
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# All consumers were last rited.  Removal in 30 days.
-
-# @ECLASS: fox.eclass
-# @MAINTAINER:
-# maintainer-needed@gentoo.org
-# @BLURB: Functionality required the FOX Toolkit and it's applications
-# @DESCRIPTION:
-# This eclass allows building SLOT-able FOX Toolkit installations
-# (x11-libs/fox: headers, libs, and docs), which are by design
-# parallel-installable, while installing only one version of the utils
-# (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator,
-# x11-misc/pathfinder, and x11-misc/shutterbug).
-#
-# Version numbering follows the kernel-style odd-even minor version
-# designation.  Even-number minor versions are API stable, which patch
-# releases aimed mostly at the library; apps generally won't need to be
-# bumped for a patch release.
-#
-# Odd-number versions are development branches with their own SLOT and
-# are API unstable; changes are made to the apps, and likely need to be
-# bumped together with the library.
-#
-# Here are sample [R]DEPENDs for the fox apps
-#	1.6: 'x11-libs/fox:1.6'
-#	1.7: '~x11-libs/fox-${PV}'
-#
-# EAPI phase trickery borrowed from enlightenment.eclass
-
-inherit autotools versionator desktop
-
-
-FOX_EXPF="src_unpack src_compile src_install pkg_postinst"
-case "${EAPI:-0}" in
-	2|3|4|5) FOX_EXPF+=" src_prepare src_configure" ;;
-	*) ;;
-esac
-EXPORT_FUNCTIONS ${FOX_EXPF}
-
-# @ECLASS-VARIABLE: FOX_PV
-# @DESCRIPTION:
-# The version of the FOX Toolkit provided or required by the package
-: ${FOX_PV:=${PV}}
-
-# @ECLASS-VARIABLE: FOXVER
-# @INTERNAL
-# @DESCRIPTION:
-# The major.minor version of FOX_PV, usually acts as $SLOT and is used in
-# building the applications
-FOXVER=$(get_version_component_range 1-2 ${FOX_PV})
-
-# @ECLASS-VARIABLE: FOX_APPS
-# @INTERNAL
-# @DESCRIPTION:
-# The applications originally packaged in the FOX Toolkit
-FOX_APPS="adie calculator pathfinder shutterbug"
-
-# @ECLASS-VARIABLE: FOXCONF
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Set this to add additional configuration options during src_configure
-
-DESCRIPTION="C++ Toolkit for developing Graphical User Interfaces easily and effectively"
-HOMEPAGE="http://www.fox-toolkit.org/"
-SRC_URI="ftp://ftp.fox-toolkit.org/pub/fox-${FOX_PV}.tar.gz"
-
-IUSE="debug doc profile"
-
-if [[ ${PN} != fox ]] ; then
-	FOX_COMPONENT="${FOX_COMPONENT:-${PN}}"
-fi
-
-if [[ -z ${FOX_COMPONENT} ]] ; then
-	DOXYGEN_DEP="doc? ( app-doc/doxygen )"
-fi
-
-if [[ ${PN} != reswrap ]] ; then
-	RESWRAP_DEP="dev-util/reswrap"
-fi
-
-DEPEND="${DOXYGEN_DEP}
-	${RESWRAP_DEP}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/fox-${FOX_PV}"
-
-fox_src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	has src_prepare ${FOX_EXPF} || fox_src_prepare
-}
-
-fox_src_prepare() {
-	# fox changed from configure.in to configure.am in 1.6.38
-	local confFile="configure.ac"
-	[[ -r "configure.in" ]] && confFile="configure.in"
-
-	# Respect system CXXFLAGS
-	sed -i -e 's:CXXFLAGS=""::' $confFile || die "sed ${confFile} error"
-
-	# don't strip binaries
-	sed -i -e '/LDFLAGS="-s ${LDFLAGS}"/d' $confFile || die "sed ${confFile} error"
-
-	# don't build apps from top-level (i.e. x11-libs/fox)
-	# utils == reswrap
-	local d
-	for d in ${FOX_APPS} utils windows ; do
-		sed -i -e "s:${d}::" Makefile.am || die "sed Makefile.am error"
-	done
-
-	# use the installed reswrap for everything else
-	for d in ${FOX_APPS} chart controlpanel tests ; do
-		[[ -d ${d} ]] &&
-		(sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
-			${d}/Makefile.am || die "sed ${d}/Makefile.am error")
-	done
-
-	# use the installed headers and library for apps
-	for d in ${FOX_APPS} ; do
-		sed -i \
-			-e "s:-I\$(top_srcdir)/include -I\$(top_builddir)/include:-I\$(includedir)/fox-${FOXVER}:" \
-			-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
-			-e 's:$(top_builddir)/lib/libFOX:-lFOX:' \
-			-e 's:\.la::' \
-			${d}/Makefile.am || die "sed ${d}/Makefile.am error"
-	done
-
-	eautoreconf
-}
-
-fox_src_configure() {
-	use debug && FOXCONF+=" --enable-debug" \
-		  || FOXCONF+=" --enable-release"
-
-	econf ${FOXCONF} \
-		  $(use_with profile profiling)
-}
-
-
-fox_src_compile() {
-	has src_configure ${FOX_EXPF} || fox_src_configure
-
-	cd "${S}/${FOX_COMPONENT}"
-	emake || die "compile error"
-
-	# build class reference docs (FOXVER >= 1.2)
-	if use doc && [[ -z ${FOX_COMPONENT} ]] ; then
-		emake -C "${S}"/doc docs  || die "doxygen error"
-	fi
-}
-
-fox_src_install() {
-	cd "${S}/${FOX_COMPONENT}"
-
-	emake install \
-		DESTDIR="${D}" \
-		htmldir=/usr/share/doc/${PF}/html \
-		artdir=/usr/share/doc/${PF}/html/art \
-		screenshotsdir=/usr/share/doc/${PF}/html/screenshots \
-		|| die "install error"
-
-	# create desktop menu items for apps
-	case ${FOX_COMPONENT} in
-		adie)
-			newicon big_gif.gif adie.gif
-			make_desktop_entry adie "Adie Text Editor" adie.gif
-			;;
-		calculator)
-			newicon bigcalc.gif foxcalc.gif
-			make_desktop_entry calculator "FOX Calculator" foxcalc.gif
-			;;
-		pathfinder)
-			newicon iconpath.gif pathfinder.gif
-			make_desktop_entry PathFinder "PathFinder" pathfinder.gif "FileManager"
-			;;
-		shutterbug)
-			doicon shutterbug.gif
-			make_desktop_entry shutterbug "ShutterBug" shutterbug.gif "Graphics"
-			;;
-	esac
-
-	for doc in ADDITIONS AUTHORS LICENSE_ADDENDUM README TRACING ; do
-		[ -f $doc ] && dodoc $doc
-	done
-
-	# remove documentation if USE=-doc
-	use doc || rm -fr "${D}/usr/share/doc/${PF}/html"
-
-	# install class reference docs if USE=doc
-	if use doc && [[ -z ${FOX_COMPONENT} ]] ; then
-		dohtml -r "${S}/doc/ref"
-	fi
-
-	# slot fox-config
-	if [[ -f ${D}/usr/bin/fox-config ]] ; then
-		mv "${D}/usr/bin/fox-config" "${D}/usr/bin/fox-${FOXVER}-config" \
-		|| die "failed to install fox-config"
-	fi
-}
-
-fox_pkg_postinst() {
-	if [ -z "${FOX_COMPONENT}" ] ; then
-		echo
-		einfo "Multiple versions of the FOX Toolkit library may now be installed"
-		einfo "in parallel SLOTs on the same system."
-		einfo
-		einfo "The reswrap utility and the applications included in the FOX Toolkit"
-		einfo "(adie, calculator, pathfinder, shutterbug) are now available as"
-		einfo "separate ebuilds."
-		echo
-
-		if version_is_at_least "1.7.25"; then
-			einfo "Fox versions after 1.7.25 ships a pkg-config file called fox17.pc"
-			einfo "instead of the previous fox-config tool."
-			einfo "You now get all info via pkg-config:"
-			einfo
-			einfo "pkg-config fox17 --libs (etc.)"
-		else
-			einfo "The fox-config script has been installed as fox-${FOXVER}-config."
-			einfo "The fox-wrapper package is used to direct calls to fox-config"
-			einfo "to the correct versioned script, based on the WANT_FOX variable."
-			einfo "For example:"
-			einfo
-			einfo "    WANT_FOX=\"${FOXVER}\" fox-config <options>"
-		fi
-		einfo
-	fi
-}
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
deleted file mode 100644
index ecc260d0e9b2..000000000000
--- a/eclass/git-2.eclass
+++ /dev/null
@@ -1,613 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# All consumers were last rited.  Removal in 14 days.
-
-# @ECLASS: git-2.eclass
-# @MAINTAINER:
-# maintainer-needed@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5
-# @BLURB: Eclass for fetching and unpacking git repositories.
-# @DESCRIPTION:
-# Eclass for easing maintenance of live ebuilds using git as remote repository.
-# Eclass support working with git submodules and branching.
-#
-# This eclass is DEPRECATED. Please use git-r3 instead.
-
-case ${EAPI:-0} in
-	0|1|2|3|4|5) ;;
-	*) die "${ECLASS}.eclass is banned in EAPI ${EAPI}";;
-esac
-
-# This eclass support all EAPIs.
-EXPORT_FUNCTIONS src_unpack
-
-PROPERTIES+=" live"
-
-DEPEND="dev-vcs/git"
-
-# @ECLASS-VARIABLE: EGIT_SOURCEDIR
-# @DESCRIPTION:
-# This variable specifies destination where the cloned
-# data are copied to.
-#
-# EGIT_SOURCEDIR="${S}"
-
-# @ECLASS-VARIABLE: EGIT_STORE_DIR
-# @DESCRIPTION:
-# Storage directory for git sources.
-#
-# EGIT_STORE_DIR="${DISTDIR}/egit-src"
-
-# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If non-empty this variable enables support for git submodules in our
-# checkout. Also this makes the checkout to be non-bare for now.
-
-# @ECLASS-VARIABLE: EGIT_OPTIONS
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Variable specifying additional options for fetch command.
-
-# @ECLASS-VARIABLE: EGIT_MASTER
-# @DESCRIPTION:
-# Variable for specifying master branch.
-# Useful when upstream don't have master branch or name it differently.
-#
-# EGIT_MASTER="master"
-
-# @ECLASS-VARIABLE: EGIT_PROJECT
-# @DESCRIPTION:
-# Variable specifying name for the folder where we check out the git
-# repository. Value of this variable should be unique in the
-# EGIT_STORE_DIR as otherwise you would override another repository.
-#
-# EGIT_PROJECT="${EGIT_REPO_URI##*/}"
-
-# @ECLASS-VARIABLE: EGIT_DIR
-# @DESCRIPTION:
-# Directory where we want to store the git data.
-# This variable should not be overridden.
-#
-# EGIT_DIR="${EGIT_STORE_DIR}/${EGIT_PROJECT}"
-
-# @ECLASS-VARIABLE: EGIT_REPO_URI
-# @REQUIRED
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# URI for the repository
-# e.g. http://foo, git://bar
-#
-# It can be overridden via env using packagename_LIVE_REPO
-# variable.
-#
-# Support multiple values:
-# EGIT_REPO_URI="git://a/b.git http://c/d.git"
-
-# @ECLASS-VARIABLE: EVCS_OFFLINE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If non-empty this variable prevents performance of any online
-# operations.
-
-# @ECLASS-VARIABLE: EGIT_BRANCH
-# @DESCRIPTION:
-# Variable containing branch name we want to check out.
-# It can be overridden via env using packagename_LIVE_BRANCH
-# variable.
-#
-# EGIT_BRANCH="${EGIT_MASTER}"
-
-# @ECLASS-VARIABLE: EGIT_COMMIT
-# @DESCRIPTION:
-# Variable containing commit hash/tag we want to check out.
-# It can be overridden via env using packagename_LIVE_COMMIT
-# variable.
-#
-# EGIT_COMMIT="${EGIT_BRANCH}"
-
-# @ECLASS-VARIABLE: EGIT_REPACK
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If non-empty this variable specifies that repository will be repacked to
-# save space. However this can take a REALLY LONG time with VERY big
-# repositories.
-
-# @ECLASS-VARIABLE: EGIT_PRUNE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If non-empty this variable enables pruning all loose objects on each fetch.
-# This is useful if upstream rewinds and rebases branches often.
-
-# @ECLASS-VARIABLE: EGIT_NONBARE
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If non-empty this variable specifies that all checkouts will be done using
-# non bare repositories. This is useful if you can't operate with bare
-# checkouts for some reason.
-
-# @ECLASS-VARIABLE: EGIT_NOUNPACK
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# If non-empty this variable bans unpacking of ${A} content into the srcdir.
-# Default behavior is to unpack ${A} content.
-
-# @FUNCTION: git-2_init_variables
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function initializing all git variables.
-# We define it in function scope so user can define
-# all the variables before and after inherit.
-git-2_init_variables() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local esc_pn liverepo livebranch livecommit
-	esc_pn=${PN//[-+]/_}
-
-	: ${EGIT_SOURCEDIR="${S}"}
-
-	: ${EGIT_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/egit-src"}
-
-	: ${EGIT_HAS_SUBMODULES:=}
-
-	: ${EGIT_OPTIONS:=}
-
-	: ${EGIT_MASTER:=master}
-
-	liverepo=${esc_pn}_LIVE_REPO
-	EGIT_REPO_URI=${!liverepo:-${EGIT_REPO_URI}}
-	[[ ${EGIT_REPO_URI} ]] || die "EGIT_REPO_URI must have some value"
-
-	: ${EVCS_OFFLINE:=}
-
-	livebranch=${esc_pn}_LIVE_BRANCH
-	[[ ${!livebranch} ]] && ewarn "QA: using \"${esc_pn}_LIVE_BRANCH\" variable, you won't get any support"
-	EGIT_BRANCH=${!livebranch:-${EGIT_BRANCH:-${EGIT_MASTER}}}
-
-	livecommit=${esc_pn}_LIVE_COMMIT
-	[[ ${!livecommit} ]] && ewarn "QA: using \"${esc_pn}_LIVE_COMMIT\" variable, you won't get any support"
-	EGIT_COMMIT=${!livecommit:-${EGIT_COMMIT:-${EGIT_BRANCH}}}
-
-	: ${EGIT_REPACK:=}
-
-	: ${EGIT_PRUNE:=}
-}
-
-# @FUNCTION: git-2_submodules
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function wrapping the submodule initialisation and update.
-git-2_submodules() {
-	debug-print-function ${FUNCNAME} "$@"
-	if [[ ${EGIT_HAS_SUBMODULES} ]]; then
-		if [[ ${EVCS_OFFLINE} ]]; then
-			# for submodules operations we need to be online
-			debug-print "${FUNCNAME}: not updating submodules in offline mode"
-			return 1
-		fi
-
-		debug-print "${FUNCNAME}: working in \"${1}\""
-		pushd "${EGIT_DIR}" > /dev/null || die
-
-		debug-print "${FUNCNAME}: git submodule init"
-		git submodule init || die
-		debug-print "${FUNCNAME}: git submodule sync"
-		git submodule sync || die
-		debug-print "${FUNCNAME}: git submodule update"
-		git submodule update || die
-
-		popd > /dev/null || die
-	fi
-}
-
-# @FUNCTION: git-2_branch
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function that changes branch for the repo based on EGIT_COMMIT and
-# EGIT_BRANCH variables.
-git-2_branch() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local branchname src
-
-	debug-print "${FUNCNAME}: working in \"${EGIT_SOURCEDIR}\""
-	pushd "${EGIT_SOURCEDIR}" > /dev/null || die
-
-	local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
-	if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then
-		branchname=tree-${EGIT_COMMIT}
-		src=${EGIT_COMMIT}
-	fi
-	debug-print "${FUNCNAME}: git checkout -b ${branchname} ${src}"
-	git checkout -b ${branchname} ${src} \
-		|| die "${FUNCNAME}: changing the branch failed"
-
-	popd > /dev/null || die
-}
-
-# @FUNCTION: git-2_gc
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function running garbage collector on checked out tree.
-git-2_gc() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local args
-
-	if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then
-		pushd "${EGIT_DIR}" > /dev/null || die
-		ebegin "Garbage collecting the repository"
-		[[ ${EGIT_PRUNE} ]] && args='--prune'
-		debug-print "${FUNCNAME}: git gc ${args}"
-		git gc ${args}
-		eend $?
-		popd > /dev/null || die
-	fi
-}
-
-# @FUNCTION: git-2_prepare_storedir
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function preparing directory where we are going to store SCM
-# repository.
-git-2_prepare_storedir() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local clone_dir
-
-	# initial clone, we have to create master git storage directory and play
-	# nicely with sandbox
-	if [[ ! -d ${EGIT_STORE_DIR} ]]; then
-		debug-print "${FUNCNAME}: Creating git main storage directory"
-		addwrite /
-		mkdir -m 775 -p "${EGIT_STORE_DIR}" \
-			|| die "${FUNCNAME}: can't mkdir \"${EGIT_STORE_DIR}\""
-	fi
-
-	# allow writing into EGIT_STORE_DIR
-	addwrite "${EGIT_STORE_DIR}"
-
-	# calculate git.eclass store dir for data
-	# We will try to clone the old repository,
-	# and we will remove it if we don't need it anymore.
-	EGIT_OLD_CLONE=
-	if [[ ${EGIT_STORE_DIR} == */egit-src ]]; then
-		local old_store_dir=${EGIT_STORE_DIR/%egit-src/git-src}
-		local old_location=${old_store_dir}/${EGIT_PROJECT:-${PN}}
-
-		if [[ -d ${old_location} ]]; then
-			EGIT_OLD_CLONE=${old_location}
-			# required to remove the old clone
-			addwrite "${old_store_dir}"
-		fi
-	fi
-
-	# calculate the proper store dir for data
-	# If user didn't specify the EGIT_DIR, we check if he did specify
-	# the EGIT_PROJECT or get the folder name from EGIT_REPO_URI.
-	EGIT_REPO_URI=${EGIT_REPO_URI%/}
-	if [[ ! ${EGIT_DIR} ]]; then
-		if [[ ${EGIT_PROJECT} ]]; then
-			clone_dir=${EGIT_PROJECT}
-		else
-			local strippeduri=${EGIT_REPO_URI%/.git}
-			clone_dir=${strippeduri##*/}
-		fi
-		EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir}
-
-		if [[ ${EGIT_OLD_CLONE} && ! -d ${EGIT_DIR} ]]; then
-			elog "${FUNCNAME}: ${CATEGORY}/${PF} will be cloned from old location."
-			elog "It will be necessary to rebuild the package to fetch updates."
-			EGIT_REPO_URI="${EGIT_OLD_CLONE} ${EGIT_REPO_URI}"
-		fi
-	fi
-	export EGIT_DIR=${EGIT_DIR}
-	debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"."
-}
-
-# @FUNCTION: git-2_move_source
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir.
-git-2_move_source() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	debug-print "${FUNCNAME}: ${MOVE_COMMAND} \"${EGIT_DIR}\" \"${EGIT_SOURCEDIR}\""
-	pushd "${EGIT_DIR}" > /dev/null || die
-	mkdir -p "${EGIT_SOURCEDIR}" \
-		|| die "${FUNCNAME}: failed to create ${EGIT_SOURCEDIR}"
-	${MOVE_COMMAND} "${EGIT_SOURCEDIR}" \
-		|| die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed"
-	popd > /dev/null || die
-}
-
-# @FUNCTION: git-2_initial_clone
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function running initial clone on specified repo_uri.
-git-2_initial_clone() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local repo_uri
-
-	EGIT_REPO_URI_SELECTED=""
-	for repo_uri in ${EGIT_REPO_URI}; do
-		debug-print "${FUNCNAME}: git clone ${EGIT_LOCAL_OPTIONS} \"${repo_uri}\" \"${EGIT_DIR}\""
-		if git clone ${EGIT_LOCAL_OPTIONS} "${repo_uri}" "${EGIT_DIR}"; then
-			# global variable containing the repo_name we will be using
-			debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\""
-			EGIT_REPO_URI_SELECTED="${repo_uri}"
-			break
-		fi
-	done
-
-	[[ ${EGIT_REPO_URI_SELECTED} ]] \
-		|| die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}"
-}
-
-# @FUNCTION: git-2_update_repo
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function running update command on specified repo_uri.
-git-2_update_repo() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local repo_uri
-
-	if [[ ${EGIT_LOCAL_NONBARE} ]]; then
-		# checkout master branch and drop all other local branches
-		git checkout ${EGIT_MASTER} || die "${FUNCNAME}: can't checkout master branch ${EGIT_MASTER}"
-		for x in $(git branch | grep -v "* ${EGIT_MASTER}" | tr '\n' ' '); do
-			debug-print "${FUNCNAME}: git branch -D ${x}"
-			git branch -D ${x} > /dev/null
-		done
-	fi
-
-	EGIT_REPO_URI_SELECTED=""
-	for repo_uri in ${EGIT_REPO_URI}; do
-		# git urls might change, so reset it
-		git config remote.origin.url "${repo_uri}"
-
-		debug-print "${EGIT_UPDATE_CMD}"
-		if ${EGIT_UPDATE_CMD} > /dev/null; then
-			# global variable containing the repo_name we will be using
-			debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\""
-			EGIT_REPO_URI_SELECTED="${repo_uri}"
-			break
-		fi
-	done
-
-	[[ ${EGIT_REPO_URI_SELECTED} ]] \
-		|| die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}"
-}
-
-# @FUNCTION: git-2_fetch
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function fetching repository from EGIT_REPO_URI and storing it in
-# specified EGIT_STORE_DIR.
-git-2_fetch() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local oldsha cursha repo_type
-
-	[[ ${EGIT_LOCAL_NONBARE} ]] && repo_type="non-bare repository" || repo_type="bare repository"
-
-	if [[ ! -d ${EGIT_DIR} ]]; then
-		git-2_initial_clone
-		pushd "${EGIT_DIR}" > /dev/null || die
-		cursha=$(git rev-parse ${UPSTREAM_BRANCH})
-		echo "GIT NEW clone -->"
-		echo "   repository:               ${EGIT_REPO_URI_SELECTED}"
-		echo "   at the commit:            ${cursha}"
-
-		popd > /dev/null || die
-	elif [[ ${EVCS_OFFLINE} ]]; then
-		pushd "${EGIT_DIR}" > /dev/null || die
-		cursha=$(git rev-parse ${UPSTREAM_BRANCH})
-		echo "GIT offline update -->"
-		echo "   repository:               $(git config remote.origin.url)"
-		echo "   at the commit:            ${cursha}"
-		popd > /dev/null || die
-	else
-		pushd "${EGIT_DIR}" > /dev/null || die
-		oldsha=$(git rev-parse ${UPSTREAM_BRANCH})
-		git-2_update_repo
-		cursha=$(git rev-parse ${UPSTREAM_BRANCH})
-
-		# fetch updates
-		echo "GIT update -->"
-		echo "   repository:               ${EGIT_REPO_URI_SELECTED}"
-		# write out message based on the revisions
-		if [[ "${oldsha}" != "${cursha}" ]]; then
-			echo "   updating from commit:     ${oldsha}"
-			echo "   to commit:                ${cursha}"
-		else
-			echo "   at the commit:            ${cursha}"
-		fi
-
-		# print nice statistic of what was changed
-		git --no-pager diff --stat ${oldsha}..${UPSTREAM_BRANCH}
-		popd > /dev/null || die
-	fi
-	# export the version the repository is at
-	export EGIT_VERSION="${cursha}"
-	# log the repo state
-	[[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \
-		&& echo "   commit:                   ${EGIT_COMMIT}"
-	echo "   branch:                   ${EGIT_BRANCH}"
-	echo "   storage directory:        \"${EGIT_DIR}\""
-	echo "   checkout type:            ${repo_type}"
-
-	# Cleanup after git.eclass
-	if [[ ${EGIT_OLD_CLONE} ]]; then
-		einfo "${FUNCNAME}: removing old clone in ${EGIT_OLD_CLONE}."
-		rm -rf "${EGIT_OLD_CLONE}"
-	fi
-}
-
-# @FUNCTION: git_bootstrap
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function that runs bootstrap command on unpacked source.
-git-2_bootstrap() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# @ECLASS-VARIABLE: EGIT_BOOTSTRAP
-	# @DESCRIPTION:
-	# Command to be executed after checkout and clone of the specified
-	# repository.
-	# enviroment the package will fail if there is no update, thus in
-	# combination with --keep-going it would lead in not-updating
-	# pakcages that are up-to-date.
-	if [[ ${EGIT_BOOTSTRAP} ]]; then
-		pushd "${EGIT_SOURCEDIR}" > /dev/null || die
-		einfo "Starting bootstrap"
-
-		if [[ -f ${EGIT_BOOTSTRAP} ]]; then
-			# we have file in the repo which we should execute
-			debug-print "${FUNCNAME}: bootstraping with file \"${EGIT_BOOTSTRAP}\""
-
-			if [[ -x ${EGIT_BOOTSTRAP} ]]; then
-				eval "./${EGIT_BOOTSTRAP}" \
-					|| die "${FUNCNAME}: bootstrap script failed"
-			else
-				eerror "\"${EGIT_BOOTSTRAP}\" is not executable."
-				eerror "Report upstream, or bug ebuild maintainer to remove bootstrap command."
-				die "\"${EGIT_BOOTSTRAP}\" is not executable"
-			fi
-		else
-			# we execute some system command
-			debug-print "${FUNCNAME}: bootstraping with commands \"${EGIT_BOOTSTRAP}\""
-
-			eval "${EGIT_BOOTSTRAP}" \
-				|| die "${FUNCNAME}: bootstrap commands failed"
-		fi
-
-		einfo "Bootstrap finished"
-		popd > /dev/null || die
-	fi
-}
-
-# @FUNCTION: git-2_migrate_repository
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function migrating between bare and normal checkout repository.
-# This is based on usage of EGIT_SUBMODULES, at least until they
-# start to work with bare checkouts sanely.
-# This function also set some global variables that differ between
-# bare and non-bare checkout.
-git-2_migrate_repository() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local bare returnstate
-
-	# first find out if we have submodules
-	# or user explicitly wants us to use non-bare clones
-	if ! [[ ${EGIT_HAS_SUBMODULES} || ${EGIT_NONBARE} ]]; then
-		bare=1
-	fi
-
-	# test if we already have some repo and if so find out if we have
-	# to migrate the data
-	if [[ -d ${EGIT_DIR} ]]; then
-		if [[ ${bare} && -d ${EGIT_DIR}/.git ]]; then
-			debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy"
-
-			ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy"
-			mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare"
-			export GIT_DIR="${EGIT_DIR}.bare"
-			git config core.bare true > /dev/null
-			returnstate=$?
-			unset GIT_DIR
-			rm -rf "${EGIT_DIR}"
-			mv "${EGIT_DIR}.bare" "${EGIT_DIR}"
-			eend ${returnstate}
-		elif [[ ! ${bare} && ! -d ${EGIT_DIR}/.git ]]; then
-			debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy"
-
-			ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy"
-			git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null
-			returnstate=$?
-			rm -rf "${EGIT_DIR}"
-			mv "${EGIT_DIR}.nonbare" "${EGIT_DIR}"
-			eend ${returnstate}
-		fi
-	fi
-	if [[ ${returnstate} -ne 0 ]]; then
-		debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" failed, removing to start from scratch"
-
-		# migration failed, remove the EGIT_DIR to play it safe
-		einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch."
-		rm -rf "${EGIT_DIR}"
-	fi
-
-	# set various options to work with both targets
-	if [[ ${bare} ]]; then
-		debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\""
-		EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare"
-		MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }"
-		EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
-		UPSTREAM_BRANCH="${EGIT_BRANCH}"
-		EGIT_LOCAL_NONBARE=
-	else
-		debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\""
-		MOVE_COMMAND="cp -pPR ."
-		EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}"
-		EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}"
-		UPSTREAM_BRANCH="origin/${EGIT_BRANCH}"
-		EGIT_LOCAL_NONBARE="true"
-	fi
-}
-
-# @FUNCTION: git-2_cleanup
-# @INTERNAL
-# @DESCRIPTION:
-# Internal function cleaning up all the global variables
-# that are not required after the unpack has been done.
-git-2_cleanup() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Here we can unset only variables that are GLOBAL
-	# defined by the eclass, BUT NOT subject to change
-	# by user (like EGIT_PROJECT).
-	# If ebuild writer polutes his environment it is
-	# his problem only.
-	unset EGIT_DIR
-	unset MOVE_COMMAND
-	unset EGIT_LOCAL_OPTIONS
-	unset EGIT_UPDATE_CMD
-	unset UPSTREAM_BRANCH
-	unset EGIT_LOCAL_NONBARE
-}
-
-# @FUNCTION: git-2_src_unpack
-# @DESCRIPTION:
-# Default git src_unpack function.
-git-2_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	git-2_init_variables
-	git-2_prepare_storedir
-	git-2_migrate_repository
-	git-2_fetch "$@"
-	git-2_gc
-	git-2_submodules
-	git-2_move_source
-	git-2_branch
-	git-2_bootstrap
-	git-2_cleanup
-	echo ">>> Unpacked to ${EGIT_SOURCEDIR}"
-
-	# Users can specify some SRC_URI and we should
-	# unpack the files too.
-	if [[ ! ${EGIT_NOUNPACK} ]]; then
-		if has ${EAPI:-0} 0 1; then
-			[[ ${A} ]] && unpack ${A}
-		else
-			default_src_unpack
-		fi
-	fi
-}
diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass
index 1a684ef00a66..e24fd1875f47 100644
--- a/eclass/latex-package.eclass
+++ b/eclass/latex-package.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: latex-package.eclass
@@ -7,7 +7,7 @@
 # @AUTHOR:
 # Matthew Turk <satai@gentoo.org>
 # Martin Ehmsen <ehmsen@gentoo.org>
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: An eclass for easy installation of LaTeX packages
 # @DESCRIPTION:
 # This eClass is designed to be easy to use and implement.  The vast majority of
@@ -50,21 +50,21 @@
 # signatures EVERY TIME.  For this reason, if you are grabbing from the CTAN,
 # you must either grab each file individually, or find a place to mirror an
 # archive of them.  (iBiblio)
-#
-# It inherits base and eutils in EAPI 5 and earlier.
 
-case ${EAPI:-0} in
-	0|1|2|3|4|5) inherit base eutils ;;
-esac
+if [[ -z ${_LATEX_PACKAGE_ECLASS} ]]; then
+_LATEX_PACKAGE_ECLASS=1
 
 RDEPEND="virtual/latex-base"
 DEPEND="${RDEPEND}
 	>=sys-apps/texinfo-4.2-r5"
+
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6) ;;
-	7) BDEPEND="${DEPEND}"; DEPEND="" ;;
-	*) die "${ECLASS}: Unknown EAPI ${EAPI}" ;;
+	[0-6])
+		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
+	7)	;;
+	*)	die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
 esac
+
 HOMEPAGE="http://www.tug.org/"
 TEXMF="/usr/share/texmf-site"
 
@@ -81,14 +81,6 @@ SUPPLIER="misc"
 # must be set after inherit, as it gets automatically cleared otherwise.
 LATEX_DOC_ARGUMENTS=""
 
-# Kept for backwards compatibility
-latex-package_has_tetex_3() {
-	case ${EAPI:-0} in
-		0|1|2|3|4|5) return 0 ;;
-		*) die "${FUNCNAME} no longer supported in EAPI ${EAPI}" ;;
-	esac
-}
-
 # @FUNCTION: latex-package_src_doinstall
 # @USAGE: [ module ]
 # @DESCRIPTION:
@@ -105,93 +97,94 @@ latex-package_src_doinstall() {
 
 	# This actually follows the directions for a "single-user" system
 	# at http://www.ctan.org/installationadvice/ modified for gentoo.
-	[ -z "$1" ] && latex-package_src_install all
+	[[ -z ${1} ]] && latex-package_src_install all
 
-	while [ "$1" ]; do
-		case $1 in
+	while [[ ${1} ]]; do
+		case ${1} in
 			"sh")
-				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
-				do
-					dobin $i || die "dobin $i failed"
-				done
+				while read -r -d '' i; do
+					dobin ${i}
+				done < <(find -maxdepth 1 -type f -name "*.${1}")
 				;;
+
 			"sty" | "cls" | "fd" | "clo" | "def" | "cfg")
-				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
-				do
+				while read -r -d '' i; do
 					insinto ${TEXMF}/tex/latex/${PN}
-					doins $i || die "doins $i failed"
-				done
+					doins ${i}
+				done < <(find -maxdepth 1 -type f -name "*.${1}")
 				;;
+
 			"dvi" | "ps" | "pdf")
-				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
-				do
+				while read -r -d '' i; do
 					insinto /usr/share/doc/${PF}
-					doins $i || die "doins $i failed"
+					doins ${i}
 					dosym /usr/share/doc/${PF}/$(basename ${i}) ${TEXMF}/doc/latex/${PN}/${i}
-					case "${EAPI:-0}" in
-						0|1|2|3) ;;
-						*)
-							# prevent compression of symlink target
-							docompress -x /usr/share/doc/${PF}/$(basename ${i})
-							;;
-					esac
-				done
+					docompress -x /usr/share/doc/${PF}/$(basename ${i})
+				done < <(find -maxdepth 1 -type f -name "*.${1}")
 				;;
+
 			"tex" | "dtx")
 				if ! in_iuse doc || use doc ; then
-					for i in `find . -maxdepth 1 -type f -name "*.${1}"`
-					do
-						[ -n "${LATEX_PACKAGE_SKIP}" ] && has ${i##*/} ${LATEX_PACKAGE_SKIP} && continue
-						einfo "Making documentation: $i"
-						if pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i ; then
-							pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode $i || die
+					while read -r -d '' i; do
+						[[ -n ${LATEX_PACKAGE_SKIP} ]] && \
+						has ${i##*/} ${LATEX_PACKAGE_SKIP} && \
+						continue
+
+						einfo "Making documentation: ${i}"
+						# some macros need compiler called twice, do it here.
+						set -- pdflatex ${LATEX_DOC_ARGUMENTS} --halt-on-error --interaction=nonstopmode ${i}
+						if "${@}"; then
+							"${@}"
 						else
 							einfo "pdflatex failed, trying texi2dvi"
-							texi2dvi -q -c --language=latex $i || die
+							texi2dvi -q -c --language=latex ${i} || die
 						fi
-					done
+					done < <(find -maxdepth 1 -type f -name "*.${1}")
 				fi
 				;;
+
 			"tfm" | "vf" | "afm")
-				for i in `find . -maxdepth 1 -type f -name "*.${1}"`
-				do
+				while read -r -d '' i; do
 					insinto ${TEXMF}/fonts/${1}/${SUPPLIER}/${PN}
-					doins $i || die "doins $i failed"
-				done
+					doins ${i}
+				done < <(find -maxdepth 1 -type f -name "*.${1}")
 				;;
+
 			"pfb")
-				for i in `find . -maxdepth 1 -type f -name "*.pfb"`
-				do
+				while read -r -d '' i; do
 					insinto ${TEXMF}/fonts/type1/${SUPPLIER}/${PN}
-					doins $i || die "doins $i failed"
-				done
+					doins ${i}
+				done < <(find -maxdepth 1 -type f -name "*.pfb")
 				;;
 			"ttf")
-				for i in `find . -maxdepth 1 -type f -name "*.ttf"`
-				do
+				while read -r -d '' i; do
 					insinto ${TEXMF}/fonts/truetype/${SUPPLIER}/${PN}
-					doins $i || die "doins $i failed"
-				done
+					doins ${i}
+				done < <(find -maxdepth 1 -type f -name "*.ttf")
 				;;
 			"bst")
-				for i in `find . -maxdepth 1 -type f -name "*.bst"`
-				do
+				while read -r -d '' i; do
 					insinto ${TEXMF}/bibtex/bst/${PN}
-					doins $i || die "doins $i failed"
-				done
+					doins ${i}
+				done < <(find -maxdepth 1 -type f -name "*.bst")
 				;;
+
 			"styles")
 				latex-package_src_doinstall sty cls fd clo def cfg bst
 				;;
+
 			"doc")
 				latex-package_src_doinstall tex dtx dvi ps pdf
 				;;
+
 			"fonts")
 				latex-package_src_doinstall tfm vf afm pfb ttf
 				;;
+
 			"bin")
 				latex-package_src_doinstall sh
 				;;
+
 			"all")
 				latex-package_src_doinstall styles fonts bin doc
 				;;
@@ -206,11 +199,10 @@ latex-package_src_doinstall() {
 # relevant files that will be installed
 latex-package_src_compile() {
 	debug-print function $FUNCNAME $*
-	for i in `find \`pwd\` -maxdepth 1 -type f -name "*.ins"`
-	do
-		einfo "Extracting from $i"
-		latex --halt-on-error --interaction=nonstopmode $i || die
-	done
+	while read -r -d '' i; do
+		einfo "Extracting from ${i}"
+		latex --halt-on-error --interaction=nonstopmode ${i} || die
+	done < <(find -maxdepth 1 -type f -name "*.ins")
 }
 
 # @FUNCTION: latex-package_src_install
@@ -219,9 +211,7 @@ latex-package_src_compile() {
 latex-package_src_install() {
 	debug-print function $FUNCNAME $*
 	latex-package_src_doinstall all
-	if [ -n "${DOCS}" ] ; then
-		dodoc ${DOCS}
-	fi
+	einstalldocs
 }
 
 # @FUNCTION: latex-package_pkg_postinst
@@ -251,3 +241,5 @@ latex-package_rehash() {
 }
 
 EXPORT_FUNCTIONS src_compile src_install pkg_postinst pkg_postrm
+
+fi
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index b82c3a29f5c4..739a394ddd18 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: python-single-r1.eclass
@@ -89,9 +89,9 @@ EXPORT_FUNCTIONS pkg_setup
 #
 # It should be noted that in order to preserve metadata immutability,
 # PYTHON_COMPAT_OVERRIDE does not affect IUSE nor dependencies.
-# The state of PYTHON_TARGETS and PYTHON_SINGLE_TARGET is ignored,
-# and the implementation in PYTHON_COMPAT_OVERRIDE is built instead.
-# Dependencies need to be satisfied manually.
+# The state of PYTHON_SINGLE_TARGET is ignored, and the implementation
+# in PYTHON_COMPAT_OVERRIDE is built instead.  Dependencies need to be
+# satisfied manually.
 #
 # Example:
 # @CODE
@@ -139,29 +139,6 @@ EXPORT_FUNCTIONS pkg_setup
 # python_single_target_pypy? ( dev-python/pypy[gdbm] )
 # @CODE
 
-# @ECLASS-VARIABLE: PYTHON_USEDEP
-# @DESCRIPTION:
-# DEPRECATED.  Use PYTHON_SINGLE_USEDEP or python_gen_cond_dep with
-# PYTHON_MULTI_USEDEP placeholder instead.
-#
-# This is an eclass-generated USE-dependency string which can be used to
-# depend on another Python package being built for the same Python
-# implementations.
-#
-# The generate USE-flag list is compatible with packages using python-r1,
-# python-single-r1 and python-distutils-ng eclasses. It must not be used
-# on packages using python.eclass.
-#
-# Example use:
-# @CODE
-# RDEPEND="dev-python/foo[${PYTHON_USEDEP}]"
-# @CODE
-#
-# Example value:
-# @CODE
-# python_targets_python2_7(-)?,python_single_target_python3_4(+)?
-# @CODE
-
 # @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP
 # @DESCRIPTION:
 # This is an eclass-generated USE-dependency string which can be used to
@@ -201,10 +178,8 @@ EXPORT_FUNCTIONS pkg_setup
 
 # @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
 # @DESCRIPTION:
-# This is an eclass-generated required-use expression which ensures the following
-# when more than one python implementation is possible:
-# 1. Exactly one PYTHON_SINGLE_TARGET value has been enabled.
-# 2. The selected PYTHON_SINGLE_TARGET value is enabled in PYTHON_TARGETS.
+# This is an eclass-generated required-use expression which ensures
+# that exactly one PYTHON_SINGLE_TARGET value has been enabled.
 #
 # This expression should be utilized in an ebuild by including it in
 # REQUIRED_USE, optionally behind a use flag.
@@ -216,39 +191,28 @@ EXPORT_FUNCTIONS pkg_setup
 #
 # Example value:
 # @CODE
-# python_single_target_python2_7? ( python_targets_python2_7 )
-# python_single_target_python3_3? ( python_targets_python3_3 )
 # ^^ ( python_single_target_python2_7 python_single_target_python3_3 )
 # @CODE
 
 _python_single_set_globals() {
 	_python_set_impls
 
-	local flags_mt=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_targets_}" )
 	local flags=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_single_target_}" )
-	local unflags=( "${_PYTHON_UNSUPPORTED_IMPLS[@]/#/-python_single_target_}" )
 
 	if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
 		# if only one implementation is supported, use IUSE defaults
 		# to avoid requesting the user to enable it
-		IUSE="+${flags_mt[0]} +${flags[0]}"
+		IUSE="+${flags[0]}"
 	else
-		IUSE="${flags_mt[*]} ${flags[*]}"
+		IUSE="${flags[*]}"
 	fi
 
 	local requse="^^ ( ${flags[*]} )"
-	local optflags="${flags_mt[@]/%/(-)?},${unflags[@]/%/(-)},${flags[@]/%/(+)?}"
-	local usedep="${optflags// /,}"
 	local single_flags="${flags[@]/%/(-)?}"
 	local single_usedep=${single_flags// /,}
 
 	local deps= i PYTHON_PKG_DEP
 	for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-		# The chosen targets need to be in PYTHON_TARGETS as well.
-		# This is in order to enforce correct dependencies on packages
-		# supporting multiple implementations.
-		requse+=" python_single_target_${i}? ( python_targets_${i} )"
-
 		python_export "${i}" PYTHON_PKG_DEP
 		# 1) well, python-exec would suffice as an RDEP
 		# but no point in making this overcomplex, BDEP doesn't hurt anyone
@@ -276,13 +240,6 @@ _python_single_set_globals() {
 			die "PYTHON_REQUIRED_USE integrity check failed"
 		fi
 
-		if [[ ${PYTHON_USEDEP} != "${usedep}" ]]; then
-			eerror "PYTHON_USEDEP have changed between inherits!"
-			eerror "Before: ${PYTHON_USEDEP}"
-			eerror "Now   : ${usedep}"
-			die "PYTHON_USEDEP integrity check failed"
-		fi
-
 		if [[ ${PYTHON_SINGLE_USEDEP} != "${single_usedep}" ]]; then
 			eerror "PYTHON_SINGLE_USEDEP have changed between inherits!"
 			eerror "Before: ${PYTHON_SINGLE_USEDEP}"
@@ -292,10 +249,10 @@ _python_single_set_globals() {
 	else
 		PYTHON_DEPS=${deps}
 		PYTHON_REQUIRED_USE=${requse}
-		PYTHON_USEDEP=${usedep}
+		PYTHON_USEDEP='%PYTHON_USEDEP-HAS-BEEN-REMOVED%'
 		PYTHON_SINGLE_USEDEP=${single_usedep}
-		readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP \
-			PYTHON_SINGLE_USEDEP
+		readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_SINGLE_USEDEP \
+			PYTHON_USEDEP
 	fi
 }
 _python_single_set_globals
@@ -305,45 +262,29 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 
 # @FUNCTION: _python_gen_usedep
 # @INTERNAL
-# @USAGE: <-s|-u> [<pattern>...]
+# @USAGE: [<pattern>...]
 # @DESCRIPTION:
 # Output a USE dependency string for Python implementations which
 # are both in PYTHON_COMPAT and match any of the patterns passed
 # as parameters to the function.
 #
-# The first argument specifies USE-dependency type: '-s' for new-style
-# PYTHON_SINGLE_USEDEP, '-u' for backwards-compatible PYTHON_USEDEP.
-#
 # The patterns can be either fnmatch-style patterns (matched via bash
 # == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
 # appropriately all enabled Python 2/3 implementations (alike
 # python_is_python3). Remember to escape or quote the fnmatch patterns
 # to prevent accidental shell filename expansion.
 #
-# This is an internal function used to implement python_gen_cond_dep
-# and deprecated python_gen_usedep.
+# This is an internal function used to implement python_gen_cond_dep.
 _python_gen_usedep() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local mode=${1}
-	shift
 	local impl matches=()
 
 	for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
 		if _python_impl_matches "${impl}" "${@}"; then
-			case ${mode} in
-				-s)
-					matches+=(
-						"python_single_target_${impl}(-)?"
-					)
-					;;
-				-u)
-					matches+=(
-						"python_targets_${impl}(-)?"
-						"python_single_target_${impl}(+)?"
-					)
-				;;
-			esac
+			matches+=(
+				"python_single_target_${impl}(-)?"
+			)
 		fi
 	done
 
@@ -353,46 +294,6 @@ _python_gen_usedep() {
 	echo "${out// /,}"
 }
 
-# @FUNCTION: python_gen_usedep
-# @USAGE: <pattern> [...]
-# @DESCRIPTION:
-# DEPRECATED.  Please use python_gen_cond_dep instead.
-#
-# Output a USE dependency string for Python implementations which
-# are both in PYTHON_COMPAT and match any of the patterns passed
-# as parameters to the function.
-#
-# The patterns can be either fnmatch-style patterns (matched via bash
-# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
-# appropriately all enabled Python 2/3 implementations (alike
-# python_is_python3). Remember to escape or quote the fnmatch patterns
-# to prevent accidental shell filename expansion.
-#
-# When all implementations are requested, please use ${PYTHON_USEDEP}
-# instead. Please also remember to set an appropriate REQUIRED_USE
-# to avoid ineffective USE flags.
-#
-# Example:
-# @CODE
-# PYTHON_COMPAT=( python{2_7,3_4} )
-# DEPEND="doc? ( dev-python/epydoc[$(python_gen_usedep 'python2*')] )"
-# @CODE
-#
-# It will cause the dependency to look like:
-# @CODE
-# DEPEND="doc? ( dev-python/epydoc[python_targets_python2_7(-)?,...] )"
-# @CODE
-python_gen_usedep() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	# output only once, during some reasonable phase
-	# (avoid spamming cache regen runs)
-	if [[ ${EBUILD_PHASE} == setup ]]; then
-		eqawarn "python_gen_usedep() is deprecated. Please use python_gen_cond_dep instead."
-	fi
-	_python_gen_usedep -u "${@}"
-}
-
 # @FUNCTION: python_gen_useflags
 # @USAGE: [<pattern>...]
 # @DESCRIPTION:
@@ -444,10 +345,9 @@ python_gen_useflags() {
 # to prevent accidental shell filename expansion.
 #
 # In order to enforce USE constraints on the packages, verbatim
-# '${PYTHON_USEDEP}', '${PYTHON_SINGLE_USEDEP}'
-# and '${PYTHON_MULTI_USEDEP}' (quoted!) may be placed in the dependency
-# specification. It will get expanded within the function into a proper
-# USE dependency string.
+# '${PYTHON_SINGLE_USEDEP}' and '${PYTHON_MULTI_USEDEP}' (quoted!) may
+# be placed in the dependency specification. It will get expanded within
+# the function into a proper USE dependency string.
 #
 # Example:
 # @CODE
@@ -473,15 +373,11 @@ python_gen_cond_dep() {
 
 	for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
 		if _python_impl_matches "${impl}" "${@}"; then
-			# substitute ${PYTHON_USEDEP} if used
-			# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
-			#  the code is run at most once)
-			if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
-				local usedep=$(_python_gen_usedep -u "${@}")
-				dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
-			fi
+			# substitute ${PYTHON_SINGLE_USEDEP} if used
+			# (since python_gen_usedep() will not return
+			#  ${PYTHON_SINGLE_USEDEP}, the code is run at most once)
 			if [[ ${dep} == *'${PYTHON_SINGLE_USEDEP}'* ]]; then
-				local usedep=$(_python_gen_usedep -s "${@}")
+				local usedep=$(_python_gen_usedep "${@}")
 				dep=${dep//\$\{PYTHON_SINGLE_USEDEP\}/${usedep}}
 			fi
 			local multi_usedep="python_targets_${impl}(-)"
@@ -586,15 +482,6 @@ python_setup() {
 				die "More than one implementation in PYTHON_SINGLE_TARGET."
 			fi
 
-			if ! use "python_targets_${impl}"; then
-				eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added"
-				eerror "to PYTHON_TARGETS as well. This is in order to ensure that"
-				eerror "dependencies are satisfied correctly. We're sorry"
-				eerror "for the inconvenience."
-				echo
-				die "Build target (${impl}) not in PYTHON_TARGETS."
-			fi
-
 			python_export "${impl}" EPYTHON PYTHON
 			python_wrapper_setup
 		fi
@@ -607,7 +494,7 @@ python_setup() {
 		eerror
 		eerror "${_PYTHON_SUPPORTED_IMPLS[@]}"
 		echo
-		die "No supported Python implementation in PYTHON_SINGLE_TARGET/PYTHON_TARGETS."
+		die "No supported Python implementation in PYTHON_SINGLE_TARGET."
 	fi
 }
 
diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index c6daecea3651..c39e7f3e0f21 100644
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -6,7 +6,7 @@
 # base-system@gentoo.org
 # @BLURB: convenience class for extracting RPMs
 
-inherit eutils
+inherit estack eutils
 
 DEPEND=">=app-arch/rpm2targz-9.0.0.3g"
 
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index 35cf4e322188..33838e3ec8bb 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: scons-utils.eclass
@@ -126,8 +126,9 @@ if [[ ${_PYTHON_ANY_R1} ]]; then
 	}
 	python_check_deps() { scons-utils_python_check_deps; }
 elif [[ ${_PYTHON_SINGLE_R1} ]]; then
-	# when using python-single-r1, use plain PYTHON_USEDEP API
-	BDEPEND="${SCONS_DEPEND}[${PYTHON_USEDEP}]
+	# when using python-single-r1, use PYTHON_MULTI_USEDEP API
+	BDEPEND="
+		$(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_MULTI_USEDEP}]")
 		${PYTHON_DEPS}"
 elif [[ ${EAPI:-0} == [0123456] ]]; then
 	# in older EAPIs, just force Python 2.7
diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh
index d251f85a5eb1..9ef4562edf1a 100755
--- a/eclass/tests/distutils-r1.sh
+++ b/eclass/tests/distutils-r1.sh
@@ -70,9 +70,9 @@ einfo "empty RDEPEND"
 eindent
 RDEPEND=""
 test-distutils_enable_tests pytest \
-	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( dev-python/pytest[${PYTHON_USEDEP}]  )"
+	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (  dev-python/pytest[${PYTHON_USEDEP}] )"
 test-distutils_enable_tests nose \
-	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( dev-python/nose[${PYTHON_USEDEP}]  )"
+	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (  dev-python/nose[${PYTHON_USEDEP}] )"
 test-distutils_enable_tests unittest \
 	"${BASE_IUSE}" "" "${BASE_DEPS}"
 test-distutils_enable_tests setup.py \
@@ -84,13 +84,13 @@ eindent
 BASE_RDEPEND="dev-python/foo[${PYTHON_USEDEP}]"
 RDEPEND=${BASE_RDEPEND}
 test-distutils_enable_tests pytest \
-	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( dev-python/pytest[${PYTHON_USEDEP}] ${BASE_RDEPEND} )"
+	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
 test-distutils_enable_tests nose \
-	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( dev-python/nose[${PYTHON_USEDEP}] ${BASE_RDEPEND} )"
+	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )"
 test-distutils_enable_tests unittest \
-	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (  ${BASE_RDEPEND} )"
+	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} )"
 test-distutils_enable_tests setup.py \
-	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (  ${BASE_RDEPEND} )"
+	"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( ${BASE_RDEPEND} )"
 eoutdent
 
 eoutdent
diff --git a/eclass/texlive-common.eclass b/eclass/texlive-common.eclass
index 593e88558710..2618cba2e1ac 100644
--- a/eclass/texlive-common.eclass
+++ b/eclass/texlive-common.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: texlive-common.eclass
@@ -12,14 +12,15 @@
 # Purpose: Provide various functions used by both texlive-core and texlive
 # modules.
 #
-# Note that this eclass *must* not assume the presence of any standard tex tool
-
-case "${EAPI:-0}" in
-	0|1|2|3|4|5|6)
-		die "EAPI='${EAPI}' is not supported anymore"
-		;;
-	*)
-		;;
+# Note that this eclass *must* not assume the presence of any standard tex too
+
+if [[ -z ${_TEXLIVE_COMMON_ECLASS} ]]; then
+_TEXLIVE_COMMON_ECLASS=1
+
+case ${EAPI:-0} in
+	[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
+	7)     ;;
+	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
 esac
 
 TEXMF_PATH=/usr/share/texmf
@@ -35,17 +36,18 @@ TEXMF_VAR_PATH=/var/lib/texmf
 
 texlive-common_handle_config_files() {
 	# Handle config files properly
-	[ -d "${ED}${TEXMF_PATH}" ] || return
-	cd "${ED}${TEXMF_PATH}"
-	for f in $(find . -name '*.cnf' -type f -o -name '*.cfg' -type f | sed -e "s:\./::g") ; do
-		if [ "${f#*config}" != "${f}" -o "${f#doc}" != "${f}"  -o "${f#source}"	!= "${f}" -o "${f#tex}" != "${f}" ] ; then
+	[[ -d ${ED}${TEXMF_PATH} ]] || return
+	cd "${ED}${TEXMF_PATH}" || die
+
+	while read -r -d '' i; do
+		if [[ ${f#*config} != ${f} || ${f#doc} != ${f} || ${f#source} != ${f} || ${f#tex} != ${f} ]] ; then
 			continue
 		fi
 		dodir /etc/texmf/$(dirname ${f}).d
 		einfo "Moving (and symlinking) ${EPREFIX}${TEXMF_PATH}/${f} to ${EPREFIX}/etc/texmf/$(dirname ${f}).d"
 		mv "${ED}/${TEXMF_PATH}/${f}" "${ED}/etc/texmf/$(dirname ${f}).d" || die "mv ${f} failed."
 		dosym /etc/texmf/$(dirname ${f}).d/$(basename ${f}) ${TEXMF_PATH}/${f}
-	done
+	done < <(find  -name '*.cnf' -type f -o -name '*.cfg' -type f | sed -e "s:\./::g")
 }
 
 # @FUNCTION: texlive-common_is_file_present_in_texmf
@@ -54,10 +56,14 @@ texlive-common_handle_config_files() {
 # Call it from the directory containing texmf and texmf-dist
 
 texlive-common_is_file_present_in_texmf() {
-	local mark="${T}/$1.found"
-	[ -d texmf ] && find texmf -name $1 -exec touch "${mark}" \;
-	[ -d texmf-dist ] && find texmf-dist -name $1 -exec touch "${mark}" \;
-	[ -f "${mark}" ]
+	local mark="${T}/${1}.found"
+	if [[ -d texmf ]]; then
+		find texmf -name ${1} -exec touch ${mark} {} + || die
+	fi
+
+	if [[ -d texmf-dist ]]; then
+		find texmf-dist -name ${1} -exec touch ${mark} {} + || die
+	fi
 }
 
 # @FUNCTION: texlive-common_do_symlinks
@@ -73,24 +79,22 @@ texlive-common_is_file_present_in_texmf() {
 # also do the fmtutil file parsing.
 
 texlive-common_do_symlinks() {
-	while [ $# != 0 ]; do
-		case $1 in
+	while [[ ${#} != 0 ]]; do
+		case ${1} in
 			cont-??|metafun|mptopdf)
-				einfo "Symlink $1 skipped (special case)"
+				einfo "Symlink ${1} skipped (special case)"
 				;;
 			mf)
-				einfo "Symlink $1 -> $2 skipped (texlive-core takes care of it)"
+				einfo "Symlink ${1} -> ${2} skipped (texlive-core takes care of it)"
 				;;
 			*)
-				if [ $1 = $2 ];
-				then
-					einfo "Symlink $1 -> $2 skipped"
-				elif [ -e "${ED}/usr/bin/$1" -o -L "${ED}/usr/bin/$1" ];
-				then
-					einfo "Symlink $1 skipped (file exists)"
+				if [[ ${1} == ${2} ]]; then
+					einfo "Symlink ${1} -> ${2} skipped"
+				elif [[ -e ${ED}/usr/bin/${1} || -L ${ED}/usr/bin/${1} ]]; then
+					einfo "Symlink ${1} skipped (file exists)"
 				else
-					einfo "Making symlink from $1 to $2"
-					dosym $2 /usr/bin/$1
+					einfo "Making symlink from ${1} to ${2}"
+					dosym ${2} /usr/bin/${1}
 				fi
 				;;
 		esac
@@ -123,11 +127,11 @@ etexlinks() {
 # correctly set for the file that it will point to.
 
 dobin_texmf_scripts() {
-	while [ $# -gt 0 ] ; do
+	while [[ ${#} -gt 0 ]] ; do
 		local trg=$(basename ${1} | sed 's,\.[^/]*$,,' | tr '[:upper:]' '[:lower:]')
 		einfo "Installing ${1} as ${trg} bin wrapper"
-		[ -x "${ED}/usr/share/${1}" ] || die "Trying to install a non existing or non executable symlink to /usr/bin: ${1}"
-		dosym ../share/${1} /usr/bin/${trg} || die "failed to install ${1} as $trg"
+		[[ -x ${ED}/usr/share/${1} ]] || die "Trying to install a non existing or non executable symlink to /usr/bin: ${1}"
+		dosym ../share/${1} /usr/bin/${trg}
 		shift
 	done
 }
@@ -140,7 +144,7 @@ dobin_texmf_scripts() {
 
 etexmf-update() {
 	if has_version 'app-text/texlive-core' ; then
-		if [ -z "${ROOT%/}" ] && [ -x "${EPREFIX}"/usr/sbin/texmf-update ] ; then
+		if [[ -z ${ROOT} && -x "${EPREFIX}"/usr/sbin/texmf-update ]] ; then
 			"${EPREFIX}"/usr/sbin/texmf-update
 		else
 			ewarn "Cannot run texmf-update for some reason."
@@ -158,9 +162,9 @@ etexmf-update() {
 
 efmtutil-sys() {
 	if has_version 'app-text/texlive-core' ; then
-		if [ -z "${ROOT%/}" ] && [ -x "${EPREFIX}"/usr/bin/fmtutil-sys ] ; then
+		if [[ -z ${ROOT} && -x "${EPREFIX}"/usr/bin/fmtutil-sys ]] ; then
 			einfo "Rebuilding formats"
-			"${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null
+			"${EPREFIX}"/usr/bin/fmtutil-sys --all &> /dev/null || die
 		else
 			ewarn "Cannot run fmtutil-sys for some reason."
 			ewarn "Your formats might be inconsistent with your installed ${PN} version"
@@ -168,3 +172,5 @@ efmtutil-sys() {
 		fi
 	fi
 }
+
+fi
diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass
index 52b26cdca4dc..3f31f35e1abb 100644
--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: texlive-module.eclass
@@ -68,13 +68,13 @@
 # Information to display about the package.
 # e.g. for enabling/disabling a feature
 
-case "${EAPI:-0}" in
-	0|1|2|3|4|5|6)
-		die "EAPI='${EAPI}' is not supported anymore"
-		;;
-	*)
-		inherit texlive-common
-		;;
+if [[ -z ${_TEXLIVE_MODULE_ECLASS} ]]; then
+_TEXLIVE_MODULE_ECLASS=1
+
+case ${EAPI:-0} in
+	[0-6])	die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
+	7)	inherit texlive-common ;;
+	*)	die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
 esac
 
 HOMEPAGE="http://www.tug.org/texlive/"
@@ -97,14 +97,14 @@ for i in ${TEXLIVE_MODULE_CONTENTS}; do
 done
 
 # Forge doc SRC_URI
-[ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} doc? ("
+[[ -n ${TEXLIVE_MODULE_DOC_CONTENTS} ]] && SRC_URI="${SRC_URI} doc? ("
 for i in ${TEXLIVE_MODULE_DOC_CONTENTS}; do
 	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}"
 done
-[ -n "${TEXLIVE_MODULE_DOC_CONTENTS}" ] && SRC_URI="${SRC_URI} )"
+[[ -n ${TEXLIVE_MODULE_DOC_CONTENTS} ]] && SRC_URI="${SRC_URI} )"
 
 # Forge source SRC_URI
-if [ -n "${TEXLIVE_MODULE_SRC_CONTENTS}" ] ; then
+if [[ -n ${TEXLIVE_MODULE_SRC_CONTENTS} ]] ; then
 	SRC_URI="${SRC_URI} source? ("
 	for i in ${TEXLIVE_MODULE_SRC_CONTENTS}; do
 		SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}"
@@ -122,7 +122,7 @@ IUSE="${IUSE} doc"
 # A space separated list of Tex engines that can be made optional.
 # e.g. "luatex luajittex"
 
-if [ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] ; then
+if [[ -n ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ]] ; then
 	for engine in ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ; do
 		IUSE="${IUSE} +${engine}"
 	done
@@ -140,10 +140,12 @@ RELOC_TARGET=texmf-dist
 texlive-module_src_unpack() {
 	unpack ${A}
 
-	grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	grep RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist" || die
+	{ for i in $(<"${T}/reloclist"); do  dirname ${i}; done; } | uniq > "${T}/dirlist"
 	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+		if [[ ! -d ${RELOC_TARGET}/${i} ]]; then
+			mkdir -p "${RELOC_TARGET}/${i}" || die
+		fi
 	done
 	for i in $(<"${T}/reloclist"); do
 		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
@@ -161,14 +163,14 @@ texlive-module_add_format() {
 	local name engine mode patterns options
 	eval $@
 	einfo "Appending to format.${PN}.cnf for $@"
-	[ -d texmf-dist/fmtutil ] || mkdir -p texmf-dist/fmtutil
-	[ -f texmf-dist/fmtutil/format.${PN}.cnf ] || { echo "# Generated for ${PN}	by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; }
-	[ -n "${TEXLIVE_MODULE_OPTIONAL_ENGINE}" ] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled"
-	if [ "${mode}" = "disabled" ]; then
-		printf "#! " >> texmf-dist/fmtutil/format.${PN}.cnf
+	[[ -d texmf-dist/fmtutil ]] || mkdir -p texmf-dist/fmtutil || die
+	[[ -f texmf-dist/fmtutil/format.${PN}.cnf ]] || { echo "# Generated for ${PN}	by texlive-module.eclass" > texmf-dist/fmtutil/format.${PN}.cnf; }
+	[[ -n ${TEXLIVE_MODULE_OPTIONAL_ENGINE} ]] && has ${engine} ${TEXLIVE_MODULE_OPTIONAL_ENGINE} && use !${engine} && mode="disabled"
+	if [[ ${mode} = disabled ]]; then
+		printf "#! " >> texmf-dist/fmtutil/format.${PN}.cnf || die
 	fi
-	[ -z "${patterns}" ] && patterns="-"
-	printf "${name}\t${engine}\t${patterns}\t${options}\n" >> texmf-dist/fmtutil/format.${PN}.cnf
+	[[ -z ${patterns} ]] && patterns="-"
+	printf "${name}\t${engine}\t${patterns}\t${options}\n" >> texmf-dist/fmtutil/format.${PN}.cnf || die
 }
 
 # @FUNCTION: texlive-module_make_language_def_lines
@@ -180,13 +182,13 @@ texlive-module_make_language_def_lines() {
 	local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial
 	eval $@
 	einfo "Generating language.def entry for $@"
-	[ -z "$lefthyphenmin" ] && lefthyphenmin="2"
-	[ -z "$righthyphenmin" ] && righthyphenmin="3"
-	echo "\\addlanguage{$name}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def"
-	if [ -n "$synonyms" ] ; then
+	[[ -z ${lefthyphenmin} ]] && lefthyphenmin="2"
+	[[ -z ${righthyphenmin} ]] && righthyphenmin="3"
+	echo "\\addlanguage{$name}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" || die
+	if [[ -n ${synonyms} ]]; then
 		for i in $(echo $synonyms | tr ',' ' ') ; do
 			einfo "Generating language.def synonym $i for $@"
-			echo "\\addlanguage{$i}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def"
+			echo "\\addlanguage{$i}{$file}{}{$lefthyphenmin}{$righthyphenmin}" >> "${S}/language.${PN}.def" || die
 		done
 	fi
 }
@@ -200,11 +202,11 @@ texlive-module_make_language_dat_lines() {
 	local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial
 	eval $@
 	einfo "Generating language.dat entry for $@"
-	echo "$name $file" >> "${S}/language.${PN}.dat"
-	if [ -n "$synonyms" ] ; then
-		for i in $(echo $synonyms | tr ',' ' ') ; do
-			einfo "Generating language.dat synonym $i for $@"
-			echo "=$i" >> "${S}/language.${PN}.dat"
+	echo "$name $file" >> "${S}/language.${PN}.dat" || die
+	if [[ -n ${synonyms} ]]; then
+		for i in $(echo ${synonyms} | tr ',' ' ') ; do
+			einfo "Generating language.dat synonym ${i} for $@"
+			echo "=${i}" >> "${S}/language.${PN}.dat" || die
 		done
 	fi
 }
@@ -217,7 +219,7 @@ texlive-module_make_language_dat_lines() {
 texlive-module_synonyms_to_language_lua_line() {
 	local prev=""
 	for i in $(echo $@ | tr ',' ' ') ; do
-		printf "${prev} '%s'" $i
+		printf "${prev} '%s'" ${i}
 		prev=","
 	done
 }
@@ -233,17 +235,27 @@ texlive-module_make_language_lua_lines() {
 	local lefthyphenmin righthyphenmin synonyms name file file_patterns file_exceptions luaspecial
 	local dest="${S}/language.${PN}.dat.lua"
 	eval $@
-	[ -z "$lefthyphenmin"  ] && lefthyphenmin="2"
-	[ -z "$righthyphenmin" ] && righthyphenmin="3"
+	[[ -z ${lefthyphenmin}  ]] && lefthyphenmin="2"
+	[[ -z ${righthyphenmin} ]] && righthyphenmin="3"
 	einfo "Generating language.dat.lua entry for $@"
-	printf "\t['%s'] = {\n" "$name"                                                                 >> "$dest"
-	printf "\t\tloader = '%s',\n" "$file"                                                           >> "$dest"
-	printf "\t\tlefthyphenmin = %s,\n\t\trighthyphenmin = %s,\n" "$lefthyphenmin" "$righthyphenmin" >> "$dest"
-	printf "\t\tsynonyms = {%s },\n" "$(texlive-module_synonyms_to_language_lua_line "$synonyms")"  >> "$dest"
-	[ -n "$file_patterns"   ] && printf "\t\tpatterns = '%s',\n" "$file_patterns"                   >> "$dest"
-	[ -n "$file_exceptions" ] && printf "\t\thyphenation = '%s',\n"	"$file_exceptions"              >> "$dest"
-	[ -n "$luaspecial"      ] && printf "\t\tspecial = '%s',\n" "$luaspecial"                       >> "$dest"
-	printf "\t},\n"                                                                                 >> "$dest"
+	printf "\t['%s'] = {\n" "${name}"                                                                   >> "${dest}" || die
+	printf "\t\tloader = '%s',\n" "${file}"                                                             >> "${dest}" || die
+	printf "\t\tlefthyphenmin = %s,\n\t\trighthyphenmin = %s,\n" "${lefthyphenmin}" "${righthyphenmin}" >> "${dest}" || die
+	printf "\t\tsynonyms = {%s },\n" "$(texlive-module_synonyms_to_language_lua_line "${synonyms}")"    >> "${dest}" || die
+
+	if [[ -n ${file_patterns} ]]; then
+		printf "\t\tpatterns = '%s',\n" "${file_patterns}"                   >> "${dest}" || die
+	fi
+
+	if [[ -n ${file_exceptions} ]]; then
+		printf "\t\thyphenation = '%s',\n"	"${file_exceptions}"          >> "${dest}" || die
+	fi
+
+	if [[ -n ${luaspecial} ]]; then
+		printf "\t\tspecial = '%s',\n" "$luaspecial"                          >> "${dest}" || die
+	fi
+
+	printf "\t},\n"                                                                >> "${dest}" || die
 }
 
 # @FUNCTION: texlive-module_src_compile
@@ -263,7 +275,7 @@ texlive-module_src_compile() {
 	# later
 	for i in "${S}"/tlpkg/tlpobj/*;
 	do
-		grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' >> "${T}/jobs"
+		grep '^execute ' "${i}" | sed -e 's/^execute //' | tr ' \t' '##' >> "${T}/jobs" || die
 	done
 
 	for i in $(<"${T}/jobs");
@@ -271,7 +283,7 @@ texlive-module_src_compile() {
 		j="$(echo $i | tr '#' ' ')"
 		command=${j%% *}
 		parameter=${j#* }
-		case "${command}" in
+		case ${command} in
 			addMap)
 				echo "Map ${parameter}" >> "${S}/${PN}.cfg";;
 			addMixedMap)
@@ -283,14 +295,14 @@ texlive-module_src_compile() {
 			addDvipdfmMap)
 				echo "f	${parameter}" >> "${S}/${PN}-config";;
 			AddHyphen)
-				texlive-module_make_language_def_lines "$parameter"
-				texlive-module_make_language_dat_lines "$parameter"
-				texlive-module_make_language_lua_lines "$parameter"
+				texlive-module_make_language_def_lines ${parameter}
+				texlive-module_make_language_dat_lines ${parameter}
+				texlive-module_make_language_lua_lines ${parameter}
 				;;
 			AddFormat)
-				texlive-module_add_format "$parameter";;
+				texlive-module_add_format ${parameter};;
 			BuildFormat)
-				einfo "Format $parameter already built.";;
+				einfo "Format ${parameter} already built.";;
 			BuildLanguageDat)
 				einfo "Language file $parameter already generated.";;
 			*)
@@ -304,10 +316,14 @@ texlive-module_src_compile() {
 
 	# Build format files
 	for i in texmf-dist/fmtutil/format*.cnf; do
-		if [ -f "${i}" ]; then
+		if [[ -f ${i} ]]; then
 			einfo "Building format ${i}"
-			[ -d texmf-var ] || mkdir texmf-var
-			[ -d texmf-var/web2c ] || mkdir texmf-var/web2c
+			if [[ ! -d texmf-var ]]; then
+				mkdir texmf-var || die
+			fi
+			if [[ ! -d texmf-var/web2c ]]; then
+				mkdir texmf-var/web2c || die
+			fi
 			VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}/texmf:${S}/texmf-dist:${S}/texmf-var"\
 				env -u TEXINPUTS $fmt_call --cnffile "${i}" --fmtdir "${S}/texmf-var/web2c" --all\
 				|| die "failed to build format ${i}"
@@ -326,50 +342,64 @@ texlive-module_src_compile() {
 
 texlive-module_src_install() {
 	for i in texmf-dist/fmtutil/format*.cnf; do
-		[ -f "${i}" ] && etexlinks "${i}"
+		[[ -f ${i} ]] && etexlinks "${i}"
 	done
 
 	dodir /usr/share
-	if use doc; then
-		[ -d texmf-doc ] && cp -pR texmf-doc "${ED}/usr/share/"
+	if use doc && [[ -d texmf-doc ]]; then
+		cp -pR texmf-doc "${ED}/usr/share/" || die
 	else
-		[ -d texmf/doc ] && rm -rf texmf/doc
-		[ -d texmf-dist/doc ] && rm -rf texmf-dist/doc
+		if [[ -d texmf-dist/doc ]]; then
+			rm -rf texmf-dist/doc || die
+		fi
+
+		if [[ -d texmf/doc ]]; then
+			rm -rf texmf/doc || die
+		fi
+	fi
+
+	if [[ -d texmf ]]; then
+		cp -pR texmf "${ED}/usr/share/" || die
+	fi
+
+	if [[ -d texmf-dist ]]; then
+		cp -pR texmf-dist "${ED}/usr/share/" || die
 	fi
 
-	[ -d texmf ] && cp -pR texmf "${ED}/usr/share/"
-	[ -d texmf-dist ] && cp -pR texmf-dist "${ED}/usr/share/"
-	[ -d tlpkg ] && use source && cp -pR tlpkg "${ED}/usr/share/"
+	if [[ -d tlpkg ]] && use source; then
+		cp -pR tlpkg "${ED}/usr/share/" || die
+	fi
 
 	insinto /var/lib/texmf
-	[ -d texmf-var ] && doins -r texmf-var/*
+
+	[[ -d texmf-var ]] && doins -r texmf-var/.
 
 	insinto /etc/texmf/updmap.d
-	[ -f "${S}/${PN}.cfg" ] && doins "${S}/${PN}.cfg"
+	[[ -f ${S}/${PN}.cfg ]] && doins "${S}/${PN}.cfg"
 	insinto /etc/texmf/dvips.d
-	[ -f "${S}/${PN}-config.ps" ] && doins "${S}/${PN}-config.ps"
+	[[ -f ${S}/${PN}-config.ps ]] && doins "${S}/${PN}-config.ps"
 	insinto /etc/texmf/dvipdfm/config
-	[ -f "${S}/${PN}-config" ] && doins "${S}/${PN}-config"
+	[[ -f ${S}/${PN}-config ]] && doins "${S}/${PN}-config"
 
-	if [ -f "${S}/language.${PN}.def" ] ; then
+	if [[ -f ${S}/language.${PN}.def ]] ; then
 		insinto /etc/texmf/language.def.d
 		doins "${S}/language.${PN}.def"
 	fi
 
-	if [ -f "${S}/language.${PN}.dat" ] ; then
+	if [[ -f ${S}/language.${PN}.dat ]] ; then
 		insinto /etc/texmf/language.dat.d
 		doins "${S}/language.${PN}.dat"
 	fi
 
-	if [ -f "${S}/language.${PN}.dat.lua" ] ; then
+	if [[ -f ${S}/language.${PN}.dat.lua ]] ; then
 		insinto /etc/texmf/language.dat.lua.d
 		doins "${S}/language.${PN}.dat.lua"
 	fi
 
-	[ -n "${TEXLIVE_MODULE_BINSCRIPTS}" ] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS}
-	if [ -n "${TEXLIVE_MODULE_BINLINKS}" ] ; then
+	[[ -n ${TEXLIVE_MODULE_BINSCRIPTS} ]] && dobin_texmf_scripts ${TEXLIVE_MODULE_BINSCRIPTS}
+	if [[ -n ${TEXLIVE_MODULE_BINLINKS} ]] ; then
 		for i in ${TEXLIVE_MODULE_BINLINKS} ; do
-			[ -f "${ED}/usr/bin/${i%:*}" ] || die "Trying to install an invalid	BINLINK. This should not happen. Please file a bug."
+			[[ -f ${ED}/usr/bin/${i%:*} ]] || die "Trying to install an invalid	BINLINK. This should not happen. Please file a bug."
 			dosym ${i%:*} /usr/bin/${i#*:}
 		done
 	fi
@@ -386,7 +416,7 @@ texlive-module_src_install() {
 
 texlive-module_pkg_postinst() {
 	etexmf-update
-	[ -n "${TL_MODULE_INFORMATION}" ] && elog "${TL_MODULE_INFORMATION}"
+	[[ -n ${TL_MODULE_INFORMATION} ]] && elog "${TL_MODULE_INFORMATION}"
 }
 
 # @FUNCTION: texlive-module_pkg_postrm
@@ -400,3 +430,5 @@ texlive-module_pkg_postrm() {
 }
 
 EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
+
+fi
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 03e335dac5c5..71c3cbc8c76d 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -67,18 +67,23 @@ tc_version_is_between() {
 GCC_PV=${TOOLCHAIN_GCC_PV:-${PV}}
 GCC_PVR=${GCC_PV}
 [[ ${PR} != "r0" ]] && GCC_PVR=${GCC_PVR}-${PR}
+
+# GCC_RELEASE_VER must always match 'gcc/BASE-VER' value.
+# It's an internal representation of gcc version used for:
+# - versioned paths on disk
+# - 'gcc -dumpversion' output. Must always match <digit>.<digit>.<digit>.
 GCC_RELEASE_VER=$(ver_cut 1-3 ${GCC_PV})
+
 GCC_BRANCH_VER=$(ver_cut 1-2 ${GCC_PV})
 GCCMAJOR=$(ver_cut 1 ${GCC_PV})
 GCCMINOR=$(ver_cut 2 ${GCC_PV})
 GCCMICRO=$(ver_cut 3 ${GCC_PV})
 
-# gcc hardcodes it's internal version into gcc/BASE-VER
-# and assumes various directories and tools to have the
-# same name.
-# TODO: once ada ebuilds are fixed turn it to
-#     GCC_CONFIG_VER=${GCC_RELEASE_VER}
-GCC_CONFIG_VER=${GCC_CONFIG_VER:-${GCC_RELEASE_VER}}
+# Ideally this variable should allow for custom gentoo versioning
+# of binary and gcc-config names not directly tied to upstream
+# versioning. In practive it's hard to untangle from gcc/BASE-VER
+# (GCC_RELEASE_VER) value.
+GCC_CONFIG_VER=${GCC_RELEASE_VER}
 
 # Pre-release support. Versioning schema:
 # 1.0.0_pre9999: live ebuild
@@ -445,60 +450,7 @@ toolchain_src_unpack() {
 		git-r3_src_unpack
 	fi
 
-	if [[ -n ${GCC_A_FAKEIT} ]] ; then
-		eerror "Please migrate from 'GCC_A_FAKEIT' to 'default_src_unpack()'"
-		gcc_quick_unpack
-	else
-		# Just unpack every tarball from SRC_URI
-		default_src_unpack
-	fi
-}
-
-gcc_quick_unpack() {
-	pushd "${WORKDIR}" > /dev/null
-	export PATCH_GCC_VER=${PATCH_GCC_VER:-${GCC_RELEASE_VER}}
-	export UCLIBC_GCC_VER=${UCLIBC_GCC_VER:-${PATCH_GCC_VER}}
-	export PIE_GCC_VER=${PIE_GCC_VER:-${GCC_RELEASE_VER}}
-	export HTB_GCC_VER=${HTB_GCC_VER:-${GCC_RELEASE_VER}}
-	export SPECS_GCC_VER=${SPECS_GCC_VER:-${GCC_RELEASE_VER}}
-
-	# Injection point for more tarballs. dev-lang/gnat-gpl uses
-	# 'GCC_A_FAKEIT' to specify it's own source and binary tarballs.
-	if [[ -n ${GCC_A_FAKEIT} ]] ; then
-		unpack ${GCC_A_FAKEIT}
-	elif tc_is_live ; then
-		: # sources comes from git, not tarball
-	elif [[ -n ${SNAPSHOT} ]] ; then
-		unpack gcc-${SNAPSHOT}.tar.xz
-	else
-		if tc_version_is_between 5.5 6 || tc_version_is_between 6.4 7 || tc_version_is_at_least 7.2 ; then
-			unpack gcc-${GCC_RELEASE_VER}.tar.xz
-		else
-			unpack gcc-${GCC_RELEASE_VER}.tar.bz2
-		fi
-	fi
-
-	[[ -n ${PATCH_VER} ]] && \
-		unpack gcc-${PATCH_GCC_VER}-patches-${PATCH_VER}.tar.bz2
-
-	[[ -n ${UCLIBC_VER} ]] && \
-		unpack gcc-${UCLIBC_GCC_VER}-uclibc-patches-${UCLIBC_VER}.tar.bz2
-
-	if want_pie ; then
-		if [[ -n ${PIE_CORE} ]] ; then
-			unpack ${PIE_CORE}
-		else
-			unpack gcc-${PIE_GCC_VER}-piepatches-v${PIE_VER}.tar.bz2
-		fi
-		[[ -n ${SPECS_VER} ]] && \
-			unpack gcc-${SPECS_GCC_VER}-specs-${SPECS_VER}.tar.bz2
-	fi
-
-	use_if_iuse boundschecking && unpack "bounds-checking-gcc-${HTB_GCC_VER}-${HTB_VER}.patch.bz2"
-
-	[[ -n ${CYGWINPORTS_GITREV} ]] && use elibc_Cygwin && unpack "gcc-cygwinports-${CYGWINPORTS_GITREV}.tar.gz"
-
-	popd > /dev/null
+	default_src_unpack
 }
 
 #---->> src_prepare <<----
@@ -584,9 +536,7 @@ toolchain_src_prepare() {
 		local actual_version=$(< "${S}"/gcc/BASE-VER)
 		if [[ "${GCC_RELEASE_VER}" != "${actual_version}" ]] ; then
 			eerror "'${S}/gcc/BASE-VER' contains '${actual_version}', expected '${GCC_RELEASE_VER}'"
-			# TODO: once ada ebuilds are fixed turn it to 'die'
-			eerror "Please set GCC_RELEASE_VER to '${actual_version}'"
-			echo "${GCC_CONFIG_VER}" > "${S}"/gcc/BASE-VER
+			die "Please set 'TOOLCHAIN_GCC_PV' to '${actual_version}'"
 		fi
 	fi
 
diff --git a/eclass/user-info.eclass b/eclass/user-info.eclass
new file mode 100644
index 000000000000..15e9238ab44b
--- /dev/null
+++ b/eclass/user-info.eclass
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: user-info.eclass
+# @MAINTAINER:
+# base-system@gentoo.org (Linux)
+# Michał Górny <mgorny@gentoo.org> (NetBSD)
+# @BLURB: Read-only access to user and group information
+
+if [[ -z ${_USER_INFO_ECLASS} ]]; then
+_USER_INFO_ECLASS=1
+
+# @FUNCTION: egetent
+# @USAGE: <database> <key>
+# @DESCRIPTION:
+# Small wrapper for getent (Linux), nidump (< Mac OS X 10.5),
+# dscl (Mac OS X 10.5), and pw (FreeBSD) used in enewuser()/enewgroup().
+#
+# Supported databases: group passwd
+egetent() {
+	local db=$1 key=$2
+
+	[[ $# -ge 3 ]] && die "usage: egetent <database> <key>"
+
+	case ${db} in
+	passwd|group) ;;
+	*) die "sorry, database '${db}' not yet supported; file a bug" ;;
+	esac
+
+	case ${CHOST} in
+	*-freebsd*|*-dragonfly*)
+		case ${db} in
+		passwd) db="user" ;;
+		*) ;;
+		esac
+
+		# lookup by uid/gid
+		local opts
+		if [[ ${key} == [[:digit:]]* ]] ; then
+			[[ ${db} == "user" ]] && opts="-u" || opts="-g"
+		fi
+
+		pw show ${db} ${opts} "${key}" -q
+		;;
+	*-openbsd*)
+		grep "${key}:\*:" /etc/${db}
+		;;
+	*)
+		# ignore nscd output if we're not running as root
+		type -p nscd >/dev/null && nscd -i "${db}" 2>/dev/null
+		getent "${db}" "${key}"
+		;;
+	esac
+}
+
+# @FUNCTION: egetusername
+# @USAGE: <uid>
+# @DESCRIPTION:
+# Gets the username for given UID.
+egetusername() {
+	[[ $# -eq 1 ]] || die "usage: egetusername <uid>"
+
+	egetent passwd "$1" | cut -d: -f1
+}
+
+# @FUNCTION: egetgroupname
+# @USAGE: <gid>
+# @DESCRIPTION:
+# Gets the group name for given GID.
+egetgroupname() {
+	[[ $# -eq 1 ]] || die "usage: egetgroupname <gid>"
+
+	egetent group "$1" | cut -d: -f1
+}
+
+# @FUNCTION: egethome
+# @USAGE: <user>
+# @DESCRIPTION:
+# Gets the home directory for the specified user.
+egethome() {
+	local pos
+
+	[[ $# -eq 1 ]] || die "usage: egethome <user>"
+
+	case ${CHOST} in
+	*-freebsd*|*-dragonfly*)
+		pos=9
+		;;
+	*)	# Linux, NetBSD, OpenBSD, etc...
+		pos=6
+		;;
+	esac
+
+	egetent passwd "$1" | cut -d: -f${pos}
+}
+
+# @FUNCTION: egetshell
+# @USAGE: <user>
+# @DESCRIPTION:
+# Gets the shell for the specified user.
+egetshell() {
+	local pos
+
+	[[ $# -eq 1 ]] || die "usage: egetshell <user>"
+
+	case ${CHOST} in
+	*-freebsd*|*-dragonfly*)
+		pos=10
+		;;
+	*)	# Linux, NetBSD, OpenBSD, etc...
+		pos=7
+		;;
+	esac
+
+	egetent passwd "$1" | cut -d: -f${pos}
+}
+
+# @FUNCTION: egetcomment
+# @USAGE: <user>
+# @DESCRIPTION:
+# Gets the comment field for the specified user.
+egetcomment() {
+	local pos
+
+	[[ $# -eq 1 ]] || die "usage: egetcomment <user>"
+
+	case ${CHOST} in
+	*-freebsd*|*-dragonfly*)
+		pos=8
+		;;
+	*)	# Linux, NetBSD, OpenBSD, etc...
+		pos=5
+		;;
+	esac
+
+	egetent passwd "$1" | cut -d: -f${pos}
+}
+
+# @FUNCTION: egetgroups
+# @USAGE: <user>
+# @DESCRIPTION:
+# Gets all the groups user belongs to.  The primary group is returned
+# first, then all supplementary groups.  Groups are ','-separated.
+egetgroups() {
+	[[ $# -eq 1 ]] || die "usage: egetgroups <user>"
+
+	local egroups_arr
+	read -r -a egroups_arr < <(id -G -n "$1")
+
+	local g groups=${egroups_arr[0]}
+	# sort supplementary groups to make comparison possible
+	while read -r g; do
+		[[ -n ${g} ]] && groups+=",${g}"
+	done < <(printf '%s\n' "${egroups_arr[@]:1}" | sort)
+	echo "${groups}"
+}
+
+fi
diff --git a/eclass/user.eclass b/eclass/user.eclass
index f433d32bf7ed..9bd0b607eab8 100644
--- a/eclass/user.eclass
+++ b/eclass/user.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: user.eclass
@@ -13,6 +13,8 @@
 if [[ -z ${_USER_ECLASS} ]]; then
 _USER_ECLASS=1
 
+inherit user-info
+
 # @FUNCTION: _assert_pkg_ebuild_phase
 # @INTERNAL
 # @USAGE: <calling func name>
@@ -27,49 +29,6 @@ _assert_pkg_ebuild_phase() {
 	esac
 }
 
-# @FUNCTION: egetent
-# @USAGE: <database> <key>
-# @DESCRIPTION:
-# Small wrapper for getent (Linux), nidump (< Mac OS X 10.5),
-# dscl (Mac OS X 10.5), and pw (FreeBSD) used in enewuser()/enewgroup().
-#
-# Supported databases: group passwd
-egetent() {
-	local db=$1 key=$2
-
-	[[ $# -ge 3 ]] && die "usage: egetent <database> <key>"
-
-	case ${db} in
-	passwd|group) ;;
-	*) die "sorry, database '${db}' not yet supported; file a bug" ;;
-	esac
-
-	case ${CHOST} in
-	*-freebsd*|*-dragonfly*)
-		case ${db} in
-		passwd) db="user" ;;
-		*) ;;
-		esac
-
-		# lookup by uid/gid
-		local opts
-		if [[ ${key} == [[:digit:]]* ]] ; then
-			[[ ${db} == "user" ]] && opts="-u" || opts="-g"
-		fi
-
-		pw show ${db} ${opts} "${key}" -q
-		;;
-	*-openbsd*)
-		grep "${key}:\*:" /etc/${db}
-		;;
-	*)
-		# ignore nscd output if we're not running as root
-		type -p nscd >/dev/null && nscd -i "${db}" 2>/dev/null
-		getent "${db}" "${key}"
-		;;
-	esac
-}
-
 # @FUNCTION: user_get_nologin
 # @INTERNAL
 # @DESCRIPTION:
@@ -351,108 +310,6 @@ enewgroup() {
 	esac
 }
 
-# @FUNCTION: egetusername
-# @USAGE: <uid>
-# @DESCRIPTION:
-# Gets the username for given UID.
-egetusername() {
-	[[ $# -eq 1 ]] || die "usage: egetusername <uid>"
-
-	egetent passwd "$1" | cut -d: -f1
-}
-
-# @FUNCTION: egetgroupname
-# @USAGE: <gid>
-# @DESCRIPTION:
-# Gets the group name for given GID.
-egetgroupname() {
-	[[ $# -eq 1 ]] || die "usage: egetgroupname <gid>"
-
-	egetent group "$1" | cut -d: -f1
-}
-
-# @FUNCTION: egethome
-# @USAGE: <user>
-# @DESCRIPTION:
-# Gets the home directory for the specified user.
-egethome() {
-	local pos
-
-	[[ $# -eq 1 ]] || die "usage: egethome <user>"
-
-	case ${CHOST} in
-	*-freebsd*|*-dragonfly*)
-		pos=9
-		;;
-	*)	# Linux, NetBSD, OpenBSD, etc...
-		pos=6
-		;;
-	esac
-
-	egetent passwd "$1" | cut -d: -f${pos}
-}
-
-# @FUNCTION: egetshell
-# @USAGE: <user>
-# @DESCRIPTION:
-# Gets the shell for the specified user.
-egetshell() {
-	local pos
-
-	[[ $# -eq 1 ]] || die "usage: egetshell <user>"
-
-	case ${CHOST} in
-	*-freebsd*|*-dragonfly*)
-		pos=10
-		;;
-	*)	# Linux, NetBSD, OpenBSD, etc...
-		pos=7
-		;;
-	esac
-
-	egetent passwd "$1" | cut -d: -f${pos}
-}
-
-# @FUNCTION: egetcomment
-# @USAGE: <user>
-# @DESCRIPTION:
-# Gets the comment field for the specified user.
-egetcomment() {
-	local pos
-
-	[[ $# -eq 1 ]] || die "usage: egetshell <user>"
-
-	case ${CHOST} in
-	*-freebsd*|*-dragonfly*)
-		pos=8
-		;;
-	*)	# Linux, NetBSD, OpenBSD, etc...
-		pos=5
-		;;
-	esac
-
-	egetent passwd "$1" | cut -d: -f${pos}
-}
-
-# @FUNCTION: egetgroups
-# @USAGE: <user>
-# @DESCRIPTION:
-# Gets all the groups user belongs to.  The primary group is returned
-# first, then all supplementary groups.  Groups are ','-separated.
-egetgroups() {
-	[[ $# -eq 1 ]] || die "usage: egetgroups <user>"
-
-	local egroups_arr
-	read -r -a egroups_arr < <(id -G -n "$1")
-
-	local g groups=${egroups_arr[0]}
-	# sort supplementary groups to make comparison possible
-	while read -r g; do
-		[[ -n ${g} ]] && groups+=",${g}"
-	done < <(printf '%s\n' "${egroups_arr[@]:1}" | sort)
-	echo "${groups}"
-}
-
 # @FUNCTION: esethome
 # @USAGE: <user> <homedir>
 # @DESCRIPTION:
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index f2efe591f32c..8a1d84b41f6e 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
index 44da18b95788..41a4fa16c3f0 100644
--- a/games-action/extreme-tuxracer/Manifest
+++ b/games-action/extreme-tuxracer/Manifest
@@ -1,3 +1,5 @@
 DIST etr-0.7.4.tar.xz 44179876 BLAKE2B 040554b8053e7f513526b539479dddd3740e002348e169453dcbd1cec28fa15e1abff13c1b02cbd61552d04974e3ec508b0d9b24e1162e4d113f284103b877d9 SHA512 780263859ee3510b0c421f10c190b479db62a1268def14f18ecf7ff84c470cf28f1a2b077fcb21d8bd447cde8b3a7f280aced5cd830eb3aa174b3e461e9efae1
+DIST extreme-tuxracer-0.7.5.tar.xz 44180024 BLAKE2B 6c4cb4cdfe19e376a6bc5fa164ea17592f0aa46b5d297957219a501e8b294e3a071909b2ce168424e734e1d06a5ef81647d5a392e6943b71a6bafd50890206e3 SHA512 62ea5ccdacb3e793760fe793133f1866179dffd938fd4b8e5c369371d847320a247bf85a89648b7c01078dc18a65ac6eac30a59bfe710032c79c16ab93f9e4aa
 EBUILD extreme-tuxracer-0.7.4.ebuild 999 BLAKE2B 74b97dadc7c7a3c3a53a0fef3b07807d0e81ef7c9d27dac402c5c0b233663a990e26f36bf34020c036fd1ed6cce52cbf7d16a4ba447a0986c9bad799ec049da6 SHA512 c6ed3ce0cb2686aacc05878f2a8cefc4d9964d7fd4848dec8461988d01a565735b2ba0c293a1ba6a048abab815b323b50f730f81e8b7b2a10d2d9ff16b06d4da
+EBUILD extreme-tuxracer-0.7.5.ebuild 972 BLAKE2B 7356e1481034e974a9a2d6e44cd27b23288f161624811bf824f09ce197f73bc6d5a7248c5c26001c3069f5586e63a7c39511476f54b768897cfe45124a39bbbd SHA512 33fb046d03674b19d62fba6370f2ab2555c5e0b1f3f14f7173c65488317a713120245b6cc9a26663862777564ee387aa66a2cfdd4e33d0117da471453478a03f
 MISC metadata.xml 527 BLAKE2B 3512706041a2f8e35680d809119af7f52e648094801a6451806317e220df0a8e64143ddb6041991e1590df4b89ab1e63b853e2ec91ac94a05bc10afb4e74d872 SHA512 b384907967acf80208014d768908547687f0820495fabdb71e938fb07521ab6f7ec017857e92b3cd2f46c8ffd8ff4634bf1bdc6beaa789329c5b5302f2cdc0cf
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.5.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.5.ebuild
new file mode 100644
index 000000000000..37ca8a6dbf5b
--- /dev/null
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="High speed arctic racing game based on Tux Racer"
+HOMEPAGE="https://extremetuxracer.sourceforge.net"
+SRC_URI="https://download.sourceforge.net/extremetuxracer/etr-${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsfml:0=
+	virtual/glu
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/etr-${PV/_/}"
+
+src_prepare() {
+	default
+	# kind of ugly in there so we'll do it ourselves
+	sed -i -e '/SUBDIRS/s/resources doc//' Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{code,courses_events,guide,score_algorithm}
+	doicon -s 48 resources/etr.png
+	doicon -s scalable resources/etr.svg
+	domenu resources/etr.desktop
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-action/supermariowar/Manifest b/games-action/supermariowar/Manifest
index 5842c1973769..92e84895c189 100644
--- a/games-action/supermariowar/Manifest
+++ b/games-action/supermariowar/Manifest
@@ -1,5 +1,5 @@
 AUX smwd.initd 902 BLAKE2B 51705ecd466e19f809d9a31dd33a20290fd0aa27832fe52514f1eaffb2ddd89787ff41420614773767c85ade56cccf8bcfb7241d07db47fddbea77c3d94d8b02 SHA512 0c3c9efaa9d239899abf754dee6af71b59f4706e057484502e76abbc0b8ae3a620581c0b3eb7a7ef2f2d050676de46854b033c34d87596b18f195fb7d19495a0
 AUX supermariowar-2.0_beta1-yaml-cpp-config.cmake 655 BLAKE2B 036aef4603f0cb91de6ece5c5de86fa8fa0e440398e022e4f560764a38030b9fead1ed127b9aebf6a97948660b2c999b20da3791b08691883b7c6e2c80166191 SHA512 a43d28d12962f23a0689533315415597e046bcb09c28a1457d2320da00e376e39939b89839b60e73f368c044ced42b5ccdb909dcdc40a1a345b70fa313ba0bfa
 DIST supermariowar-2.0_beta1.tar.gz 13545366 BLAKE2B 497f8d4a8b6e7073c07f2da56e1ace71354fc898660ff866f19ff1d8737e56358eb500d0994dfeeea640dc3ac5aa509be7f31daa75305afc72df8f1497cd5211 SHA512 0849d23ea613d69f32c184dd5f470815a4c68b15836e46e40c30c5a3a6ea2216d4d3305f356e8fdd5b42f4008d9b07f0b9fac84b9f801a4b9f888ba188c56e0b
-EBUILD supermariowar-2.0_beta1-r1.ebuild 2490 BLAKE2B 26c7d8c60e8be50f9f88347e785e7f5cd979ca6ef2eadb993e29bec57edcc0ec11a4121d81f4421d3a997a19fea3abf30dead33f0edc2b07a6556f7738e85185 SHA512 0ced196e8f2af31e5ce3d3e4661ff4fcd468d9f3af7d5c2b9fce148fc9d5249d41cd6b5cc45b1f1973fdc341cbc59fc717a04114d4a9eb073c062454f6032a3a
+EBUILD supermariowar-2.0_beta1-r1.ebuild 2448 BLAKE2B 393706340e3019d084b2d600b7e463d2f0d2e0737e435ca850f9e83bd9341492fb7182671e39dc17d8df466fc5415ded0f62444e3aef7765719a0be72cf0b2f0 SHA512 64fdbaf8c8381e6ff1496861bb4c82f240c0373f5489f9d4887d1cd0dc57119eb45896f1920f274686a60a83bdec2d13f2e8b28b832d5a614a43481ab8fee96f
 MISC metadata.xml 430 BLAKE2B 020d88a651b04c55427bd67c3ab8efae38575b634ac31ac8b4be8b1527b4f61dd7adb3eb171457fffc83fec10f1a432e280ebce5b25a8a1e32f86a13db3f83fe SHA512 7f7e6599a60ee829ecc2a7db5d956c6ac23b8e213d2e56d8c414a30e1dc7ea5577c080bb79430287ae6df8cae863c99a268fabc0ca2cc06c7d301cc7d9668df1
diff --git a/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild b/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
index d78992bbd8aa..826d4507de75 100644
--- a/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
+++ b/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
@@ -49,7 +49,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_STATIC_LIBS=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DSMW_BINDIR="${EPREFIX}/usr/bin"
 		-DSMW_DATADIR="${EPREFIX}/usr/share/${PF}"
 	)
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 5ab5373edecb..828e20584af7 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
index c21122a8a000..5d41a1aa5e45 100644
--- a/games-arcade/funnyboat/Manifest
+++ b/games-arcade/funnyboat/Manifest
@@ -1,4 +1,4 @@
 DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
 DIST funnyboat_1.5-11.debian.tar.xz 12572 BLAKE2B 691a547cdc2ad07515268fe3e5c828d557f691746e9a9f136dc2634b9130210330ebd68b89fdc783373e5b660ddfe1caf2b74465e6d473b8e7c66a602b3a3f10 SHA512 9dd117e71715ec0a421061c1b71447ac9413b0d80f0337ab4cecc941324f6b9b2466981ed39a9670fa0c56075e60499eeb619ec0bfd8c7c010469d56d3ed66ec
-EBUILD funnyboat-1.5_p11.ebuild 1150 BLAKE2B c15fe28cca00f427063881d50fcf9e3746f2a142a447822826131d1f14a045496b488b0cda94d265f525a86c52ef2e4271a42885ee6ba6bc0b09eaaa13194a8a SHA512 16fe973c776bb5bb7f2b559b5888c4b496239c313f31ed9a2ad92d2b022842e8357b2620d4665e3ebd3e1398ee6a08bb72a19373c52da4e901178c39c39378a0
+EBUILD funnyboat-1.5_p11-r1.ebuild 1186 BLAKE2B a2617e37fdcc4208c0c08e280c568bd058dd6c51bcd68cd20239aa0cd0408ea241d4eb2bac9db561cfbc7082f17b4ef7a19c2277f8c8321f8aa8732aafc5ca21 SHA512 1bb46ef9b18b14b816d2789edb889da70bf6143cf985f6eb083dc12c8659d092d23b43ae50450c4cdabdc7d5ab44c5ce19c476b15b1f86338b7cf7eddbd0de46
 MISC metadata.xml 332 BLAKE2B 0f043d28ad918706a08b16364c276af4e7cb3c7f686d799ccf40e54a673d87eceb011a1c72bff3332ce2ca2a9ea62268365f00c26b5bbc5d1f0f4a367522441f SHA512 840d32294f544c648307a82c390a64aea38a6f2931734e377d576ceff26047d9dbff9486d60b0164570a4826fbd148a5af14528c336aa41c4ad6dd51790095b7
diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild
new file mode 100644
index 000000000000..ca795f62ebaa
--- /dev/null
+++ b/games-arcade/funnyboat/funnyboat-1.5_p11-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop eutils gnome2-utils python-single-r1 xdg
+
+DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
+HOMEPAGE="http://funnyboat.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P/_p*}-src.zip
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pygame-1.6.2[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${DEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	# Drop Debian specific patch
+	rm "${WORKDIR}"/debian/patches/use_debian_vera_ttf.patch || die
+	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
+
+	xdg_src_prepare
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r data *.py
+	python_optimize "${ED}"/usr/share/${PN}
+
+	dodoc *.txt
+
+	make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN}
+
+	newicon data/titanic.png ${PN}.png
+	make_desktop_entry ${PN} "Trip on the Funny Boat"
+}
diff --git a/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild b/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild
deleted file mode 100644
index 39266cdc5900..000000000000
--- a/games-arcade/funnyboat/funnyboat-1.5_p11.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit desktop eutils gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
-HOMEPAGE="http://funnyboat.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P/_p*}-src.zip
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pygame-1.6.2[${PYTHON_USEDEP}]
-"
-DEPEND="${DEPEND}"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	# Drop Debian specific patch
-	rm "${WORKDIR}"/debian/patches/use_debian_vera_ttf.patch || die
-	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
-
-	xdg_src_prepare
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r data *.py
-	python_optimize "${ED}"/usr/share/${PN}
-
-	dodoc *.txt
-
-	make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN}
-
-	newicon data/titanic.png ${PN}.png
-	make_desktop_entry ${PN} "Trip on the Funny Boat"
-}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 97ba206a1a56..ebcfac92ce9c 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 2efc2c6718c8..28355711bd2e 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -3,5 +3,5 @@ AUX pysolfc-locales.patch 655 BLAKE2B ce8068858b91eead34f3ff374959d362aef3c1b2e6
 DIST PySolFC-Cardsets--Minimal-2.0.1.tar.xz 1450064 BLAKE2B 629318963ee9bf82f6ab0de03f1b59047b896f7528d0f9f5be973fb550b496b523238b9ef8fcdc034f53b5a7adc4c3b56326e912bb83fcfa7e7ad2f9dec8be6b SHA512 56c9ad3c1f9231c6f3866366d694eb6be6036b1b46c8a1ffbd6f7a243a19ab377d30ee4ccaae34f13e35727357d4168db7d9bc044562ec2d86445fb8aec84e4a
 DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
 DIST pysolfc-2.6.4.tar.gz 7380668 BLAKE2B d172a5d69ab2d9ca2c2c56327111b564bcdaf4800f0903051bd5a4f06e22be7ca5630f7f8b9b70b7ebfcb7ad88cc5fea2357e13a9f0bb791edb6edd42f210127 SHA512 da127a2859315eba72b6affe8210068b3b8bf16837ba106a268e0de84b908528aef1a97d5fc63cecfa89317e3bef815758e44007c50d772fb96a1f62045e5906
-EBUILD pysolfc-2.6.4.ebuild 2096 BLAKE2B c7d849181aaa4df2dc30f3cbc27fb0e267338a257224651da4049235df550aeca76239cd1ee1ed4534ba78fe428a7267386c0256f02fd2f70e88c22d218e561b SHA512 a18af380621c7ec795c1299042e92a1729a0875230f1daff7f3f9cc3f42ae0679178314a1ca89330fb6f9fad98e8659b5ddba2f71f76658f1c671684110e6100
+EBUILD pysolfc-2.6.4-r1.ebuild 2158 BLAKE2B fb56e6f9fe1f7e98c0322f8a66fad1fd14264e45fa3bd1f2dfcc099c4c5e511cde481c262c227841daf5aca507535fe2714747f40978ccc225c82617e1307b2f SHA512 d87b99707c6bebe937318e758fbfc41e3bc5078834d8c974fc8a0696af7bae17b774c9e97b6bb58080c1f32a0dacd26ab6c4d85439cb7762ca4bd6a07510897b
 MISC metadata.xml 562 BLAKE2B 1c818819cff77a23b88ca9ba0e67dab5a1ec9e388f68bd125acc0514306df05d76f2e9137aad414aebe2ed91b2632d04ca9f71435545846099c90a5c42e14ad5 SHA512 e3c7ecd4c54a21b46ee4ce4abc994fd5b8b486e4d5924755c0817fb0a29784a2fb36a10ed7aa36d4d5fa2c6518187702d879efc305a17c7699e8fe99bb09d107
diff --git a/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..1ecc1b59d1e2
--- /dev/null
+++ b/games-board/pysolfc/pysolfc-2.6.4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 desktop
+
+MY_PN=PySolFC
+CARD_BASE="${MY_PN}-Cardsets"
+CARD_BASEV="${CARD_BASE}-2.0"
+CARD_BASE_MINV="${CARD_BASE}--Minimal-2.0.1"
+SF_CARD_BASE="mirror://sourceforge/${PN}/${CARD_BASE}"
+
+DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
+HOMEPAGE="https://pysolfc.sourceforge.net/"
+SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
+	extra-cardsets? ( ${SF_CARD_BASE}/${CARD_BASEV}/${CARD_BASEV}.tar.bz2 )
+	!extra-cardsets? ( ${SF_CARD_BASE}/minimal/${CARD_BASE_MINV}.tar.xz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="extra-cardsets minimal +sound"
+
+S="${WORKDIR}/${MY_PN}-${P}"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/random2[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		!minimal? (
+			dev-python/pillow[tk,${PYTHON_MULTI_USEDEP}]
+			dev-tcltk/tktable
+		)
+		sound? (
+			dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-gentoo.patch" #591904
+	"${FILESDIR}/${PN}-locales.patch"
+)
+
+python_prepare_all() {
+	sed -i \
+		-e "/pysol.desktop/d" \
+		-e "s:share/icons:share/pixmaps:" \
+		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	pushd html-src > /dev/null || die "html-src not found"
+	PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
+	mv images html/ || die "mv images failed"
+	popd > /dev/null
+}
+
+python_install_all() {
+	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
+
+	if use extra-cardsets; then
+		insinto /usr/share/${PN}
+		doins -r "${WORKDIR}"/"${CARD_BASEV}"/*
+	else
+		# upstream bug #89
+		# repo does not contain minimal cardsets in archive
+		insinto /usr/share/${PN}
+		doins -r "${WORKDIR}"/"${CARD_BASE_MINV}"/*
+	fi
+
+	dosym ../doc/${PF}/html /usr/share/${PN}/html
+
+	doman docs/*.6
+	DOCS=( README.md AUTHORS.md docs/README docs/README.SOURCE )
+	HTML_DOCS=( html-src/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/games-board/pysolfc/pysolfc-2.6.4.ebuild b/games-board/pysolfc/pysolfc-2.6.4.ebuild
deleted file mode 100644
index 1eb2a374992b..000000000000
--- a/games-board/pysolfc/pysolfc-2.6.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1 desktop
-
-MY_PN=PySolFC
-CARD_BASE="${MY_PN}-Cardsets"
-CARD_BASEV="${CARD_BASE}-2.0"
-CARD_BASE_MINV="${CARD_BASE}--Minimal-2.0.1"
-SF_CARD_BASE="mirror://sourceforge/${PN}/${CARD_BASE}"
-
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="https://pysolfc.sourceforge.net/"
-SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
-	extra-cardsets? ( ${SF_CARD_BASE}/${CARD_BASEV}/${CARD_BASEV}.tar.bz2 )
-	!extra-cardsets? ( ${SF_CARD_BASE}/minimal/${CARD_BASE_MINV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-S="${WORKDIR}/${MY_PN}-${P}"
-
-RDEPEND="
-	dev-python/random2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!minimal? (
-		dev-python/pillow[tk,${PYTHON_USEDEP}]
-		dev-tcltk/tktable
-	)
-	sound? (
-		dev-python/pygame[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gentoo.patch" #591904
-	"${FILESDIR}/${PN}-locales.patch"
-)
-
-python_prepare_all() {
-	sed -i \
-		-e "/pysol.desktop/d" \
-		-e "s:share/icons:share/pixmaps:" \
-		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	pushd html-src > /dev/null || die "html-src not found"
-	PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
-	mv images html/ || die "mv images failed"
-	popd > /dev/null
-}
-
-python_install_all() {
-	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
-
-	if use extra-cardsets; then
-		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/"${CARD_BASEV}"/*
-	else
-		# upstream bug #89
-		# repo does not contain minimal cardsets in archive
-		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/"${CARD_BASE_MINV}"/*
-	fi
-
-	dosym ../doc/${PF}/html /usr/share/${PN}/html
-
-	doman docs/*.6
-	DOCS=( README.md AUTHORS.md docs/README docs/README.SOURCE )
-	HTML_DOCS=( html-src/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 891bb17271e5..7666798ed49b 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
index 730310de56a5..146a19854425 100644
--- a/games-emulation/desmume/Manifest
+++ b/games-emulation/desmume/Manifest
@@ -3,4 +3,4 @@ AUX desmume-0.9.11-gcc6.patch 1991 BLAKE2B ffb0a58f7317aa50fe17c4abe1ba6c9bbf9cb
 AUX desmume-0.9.11-gcc7.patch 832 BLAKE2B 80accd7e22d22163692be58f2da288db4b4009603f9cf9fca4d709e44dfae4496c9b7610c82bf6bfc47c470837dccec83a95e124c3ad9a8cead654cd389a3476 SHA512 9c9b0452a6aaf860583ad97737fb7142601a5ff6f4b720037c9b4d2aeab533c12ffbb1a216753f7e9e4f04350a4e276c5606624ab633f4c2bea517ec0233db8f
 DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B 31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c
 EBUILD desmume-0.9.11-r2.ebuild 778 BLAKE2B 43c3a3e4e773015deb7298a27c89afd385ee51f17609aae9690e429e70d81ab4db1123184f42fa0136fd6c6a1502e7e6f89a2f0067d0ab329d19820bc57c17ad SHA512 d8cedd2e9fc22ac1b57b3537387ea500055fc70bf07fc0e347af93a686f0867e9921a74dc44a3c01c60ebe344f8693ef65cdd2a74592ec173b8444c7f684e6b5
-MISC metadata.xml 407 BLAKE2B a64ba166734f13f34fec0ca394d4d51bc70f2cb9539981e068e544f3139584ee3ec2da89a02ef9203008cb73213213adb148c978311ae36d95749e553d10605b SHA512 89d3a5b608525bfa1f05503017619520d82c663241668c3d5fa5602e625cbfe02564b04d7bac0e97bbe53ff8eba08a6895fb0e8cd519d0d88efd29a0ca64ac4b
+MISC metadata.xml 330 BLAKE2B eb079764905cfeea2e4851dcf8b3cc66f0be8181abe0a0e103bfcfc1da46231d257c60946d165f87d231446f18cfa1ee53e0593e2f7788f60d587da8684e0936 SHA512 169091ef557b69e2f43fd21e696ce662d3c65a1b22ff6b9b7f3e452a8d065f20c2904b0e5f85058d03ca93a73c1acb4ae0f3426b9f3727486897847ff29ac8ba
diff --git a/games-emulation/desmume/metadata.xml b/games-emulation/desmume/metadata.xml
index d906b044dcad..7b0fa88f32e9 100644
--- a/games-emulation/desmume/metadata.xml
+++ b/games-emulation/desmume/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hanno@gentoo.org</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index 97bb64e49168..e3658a9e5f16 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,5 +1,5 @@
 AUX hatari-2.2.1-default-rom.patch 698 BLAKE2B 5830bf75aa9039f0fda3f354bef50fa5dc6c7bea658c2f540a39f21f9b52fbb51447d1f1819ca3eebd248a93f7d255e9ef98a912aa908fbb15277a9ed106b853 SHA512 24659ea52cccb641010b08778608d87b4849b605b2825804f63f1285483605fdc2559f6ce6e17a5a71f801981c7bcf5d429dfc84f6dc6e5ed4cad9f1d957482f
 AUX hatari-2.2.1-joystick.patch 2172 BLAKE2B 67be6915d79612d851bcd617637e05d076f8a498194957a21ee6213c77fc0c7b718220afb0749bb2ccfa9322af34b020391fd8be9540dd1f7ed694f510215c2d SHA512 54b73d294dcc061abc4e037515f18bd0aa2e311c97010b687fce5cd90e427aac431bf820a1dd9ce2b2632e1662496e423582d80b1d55f23eef0734f03adfb2b8
 DIST hatari-2.2.1.tar.bz2 4162798 BLAKE2B 51938a649957779652b0debf7f867b2abe2d54fd3bb31086542f9f5970d01a120455e4381a9cb173724fbc7c45359d4009377bfe99038b338142fa5b82723533 SHA512 0e4c148a355a53c9cf79bdd28e5d7bb5f3389c780576017c6ebe2b69465d67522f373945f0e51681120ece24f5f08442265515486d2d7df7a02d9cd94cc44f1e
-EBUILD hatari-2.2.1.ebuild 2129 BLAKE2B da9ea44a77cf53173b97d807d4e06a20892c7f862ccd7ef47568557771da1a7820ed31246b9f0e718ecc32008ee233d0694c5c4623f1b11ba0cc302e74989ea9 SHA512 0a6001eff71d119cd9ec28e2c62c72278b3a7007836a00f7be8cfdde32a69758a19d168aad2fc0f45ebda8a3191bc805fdc4ce19589d852ea2c6ab335e6fac92
+EBUILD hatari-2.2.1-r1.ebuild 2165 BLAKE2B 991d569df2a1c47552c733bed8597b7dabfac60490c11d75e3dc23295d6f6a1e5a530344f36d49b0453f7714517cad4ff824c632bf0966dd2d64e55983714564 SHA512 df0bbd7bc4479a61fc5f336636c003abe8908e78ce82b5d2a9326e4b2b8f2ecf29a35d376a73a3618666ad2c6f718d1badb124c2d4d234c44624e83531a65993
 MISC metadata.xml 619 BLAKE2B 452a04b03222a27e8790a2ce0b38d81899baaf65c9fcdeb22dcec9950cc0fddf027525b23bdb7739fee45ed1daec47071b3d1262006fc3f10c6ff07a8b1bd148 SHA512 6d87d6ab08072cc43e1f42160d0df993dfba7b2f5480261024bdb637f3169062e530029a248c7bee514c604629f6c04c80dd5c609d23bca639a5ef720c266e42
diff --git a/games-emulation/hatari/hatari-2.2.1-r1.ebuild b/games-emulation/hatari/hatari-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..f6d9298755d1
--- /dev/null
+++ b/games-emulation/hatari/hatari-2.2.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+inherit cmake python-single-r1 xdg
+
+DESCRIPTION="Atari ST emulator"
+HOMEPAGE="https://hatari.tuxfamily.org/"
+SRC_URI="https://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="capsimage microphone png portmidi readline +sdl2 udev zlib"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
+	microphone? ( media-libs/portaudio )
+	png? ( media-libs/libpng:0= )
+	portmidi? ( media-libs/portmidi )
+	readline? ( sys-libs/readline:0= )
+	sdl2? ( media-libs/libsdl2[sound,video,X] )
+	!sdl2? ( media-libs/libsdl[sound,video,X] )
+	udev? ( virtual/udev )
+	zlib? ( sys-libs/zlib )
+"
+
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=games-emulation/emutos-0.9.9.1
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-default-rom.patch
+	"${FILESDIR}"/${PN}-2.2.1-joystick.patch
+)
+
+DOCS=(
+	readme.txt
+	doc/{changelog,coding,scsi-driver,thanks,video-recording}.txt
+)
+
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+
+	sed -i "s/\.1\.gz\b/.1/g;T;s/gzip[^\$]*/cat /g" {*/,}*/CMakeLists.txt || die
+	sed -i "s:\"doc\" + sep + \"hatari\":\"doc/${PF}\":" python-ui/uihelpers.py || die
+	sed -i "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
+
+	# Use emutos package rather than bundled ROM.
+	rm src/tos.img || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
+		-DENABLE_SDL2=$(usex sdl2)
+		-DCMAKE_DISABLE_FIND_PACKAGE_CapsImage=$(usex !capsimage)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PortAudio=$(usex !microphone)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PortMidi=$(usex !portmidi)
+		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Readline=$(usex !readline)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Udev=$(usex !udev)
+		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/${PN}/
+}
diff --git a/games-emulation/hatari/hatari-2.2.1.ebuild b/games-emulation/hatari/hatari-2.2.1.ebuild
deleted file mode 100644
index 7c7a695b755a..000000000000
--- a/games-emulation/hatari/hatari-2.2.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="https://hatari.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="capsimage microphone png portmidi readline +sdl2 udev zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
-	microphone? ( media-libs/portaudio )
-	png? ( media-libs/libpng:0= )
-	portmidi? ( media-libs/portmidi )
-	readline? ( sys-libs/readline:0= )
-	sdl2? ( media-libs/libsdl2[sound,video,X] )
-	!sdl2? ( media-libs/libsdl[sound,video,X] )
-	udev? ( virtual/udev )
-	zlib? ( sys-libs/zlib )
-"
-
-RDEPEND="
-	${DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=games-emulation/emutos-0.9.9.1
-"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-default-rom.patch
-	"${FILESDIR}"/${PN}-2.2.1-joystick.patch
-)
-
-DOCS=(
-	readme.txt
-	doc/{changelog,coding,scsi-driver,thanks,video-recording}.txt
-)
-
-src_prepare() {
-	xdg_environment_reset
-	cmake_src_prepare
-
-	sed -i "s/\.1\.gz\b/.1/g;T;s/gzip[^\$]*/cat /g" {*/,}*/CMakeLists.txt || die
-	sed -i "s:\"doc\" + sep + \"hatari\":\"doc/${PF}\":" python-ui/uihelpers.py || die
-	sed -i "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
-
-	# Use emutos package rather than bundled ROM.
-	rm src/tos.img || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DENABLE_SDL2=$(usex sdl2)
-		-DCMAKE_DISABLE_FIND_PACKAGE_CapsImage=$(usex !capsimage)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PortAudio=$(usex !microphone)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PortMidi=$(usex !portmidi)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Readline=$(usex !readline)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Udev=$(usex !udev)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_fix_shebang "${ED}"/usr/share/${PN}/
-}
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index ab994c2f5954..b323f839bc9b 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,7 +1,7 @@
 AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad96788184cbc19e1d983a37524d63618ce45009fba555f31f75c8a325156ae0cbfff74531c469add6c867ffc73f47e8 SHA512 c95b5abd255f4d0a1d9efa8b45126fea2c57ed2110358687a14d44c5ccc8f670f33a5e9b56bd9e3ea4806ad2429a84b70d796bec9c909262379bba5914e7d51d
 AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
-EBUILD pcsx2-1.4.0-r1.ebuild 2862 BLAKE2B 3d18870ff5ea8f0cfe42ac5d4c42b513e004a46b6540bc7bcf25c29b28cfaefb07ee3da983112f54442714c5a1551a89c8b8fcf9fe5b00c6729c4c75c63a6c84 SHA512 bea798521b7978df7a06a1130c38d8b57e68902e03915a2efde51cf541c9ab2da3f67ac3a1c90f86acdd7904c13bbb19369247c39ce436ac79674f67e15a89ad
-EBUILD pcsx2-1.4.0-r2.ebuild 2148 BLAKE2B fee2c9d47d0b3dd81a797041de886f020d4f5fb9632a7fd6c2e05358570193014acaa77442cf0a23bc9b69689445d969a0f39ff19388f5dbca42b8dc93480740 SHA512 4453bac7d69a9672086c7685f3baf168ec39db9c071f6bacbda327e351f2f8e37bad1de053582ca3ec7b5cdfe5195563f41ca0d0bdd7e26bb88d68ee49d9bc1a
-EBUILD pcsx2-9999.ebuild 2584 BLAKE2B fde9e169850d881a7342744c3e75947132f05c02fca9d89796972ca51c209a666eb48217e76e10c4e71dbc650454df10aa7f4c2b5fe38c9d2835da1af419ad2d SHA512 ad583d88d131c676149b8214c60e5d75ef96db9bf70730176863255ec9e1de817c19d3474778b812f56422bc55d6059d53a911f53ea52b10e970c80139f6d656
+EBUILD pcsx2-1.4.0-r1.ebuild 2832 BLAKE2B 1ebf8618d762764f5ff9e53c3ae0e5a90a8054230294878132d787e2b7cd433cf6a179856b5924c3d3603c07210a568f4409e25530746143f4f8cb1ece6a89ad SHA512 0060e393441adb1a34ff5a832cf4d7ea256c3f46fc062f38c535528cb9b855e75739ff9ddb4db16f8c95d4e7d43bd0e98f99697e7b17eb819019a9ead1697180
+EBUILD pcsx2-1.4.0-r2.ebuild 2118 BLAKE2B f528b3ab99655b98d397d3b304e194800ad9f993af4e161d88cc38aea612349b548f17569e9daca915cdfae6d8f6a434739172c59ec4a9a728b4b891695e8797 SHA512 1d28e7c107acc2493d7693c9d3468f29bb570056d1f6ce22f119419196980d167af192bb3c8ae6b401d38306e6efb1f6a82cdcef75027924b2d9b73c356a0c87
+EBUILD pcsx2-9999.ebuild 2554 BLAKE2B a5a35e364bc6eb4f09aef0ffdb18896725a6ece8db554bf69ebf8c9e53adc32c505c46fef7733a1378741d0b3d3c66d3d9ddf1dff97796c50027a2088918f568 SHA512 2ab2d57542ae776f48fb426262e095b4c0c4a6f8e71874e0ed7b36ef670cf9842cc3387cd69fa0fcd17d9386a2be926b7c5cc77b8a9bf7c4b1a61b6c4ea8ebf9
 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
index 0ddc30dd7ba3..1d948bfb065e 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild
@@ -86,7 +86,6 @@ src_configure() {
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
index 11e3f7bd7c96..f4c574ef75a8 100644
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -65,7 +65,6 @@ src_configure() {
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f5e4931ead16..24784ff64676 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -72,7 +72,6 @@ src_configure() {
 		-DPACKAGE_MODE=TRUE
 		-DXDG_STD=TRUE
 
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 3f4327eac47d..534b14a5c128 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,8 +1,5 @@
-AUX vbam-2.1.0-performance_fixup.patch 1515 BLAKE2B fdc77976e24c1df0bb3be97f709874d768a68b238111281f2ffa0edec205bf0f7de831dd5d96e7ac77a6fa47a02781b2e248cba00d767da42c291bdc0255ffb8 SHA512 1b6cc31d6a7ef66eadc4150bf8c42edc6dbad3f08f2b508e9a62159373b218e130eeeb4afed87d2696a15d4b41775f1348f567d74d6debb3bb665b75949d2aa8
 AUX vbam-2.1.4-cmake_fix.patch 5436 BLAKE2B 4af1b32f33c99cb66f7b551853fc49a402f860918214efcabb57bd1138bbe2977659fa50432f371cb443456cc0b75cbcd4f917936ae5246e1bb72a8868833cdf SHA512 3d33468003820d83b0a64fd4c086369293757a88c7883eaaf255f3fbc7aa438f08f249345a582b5eeb5269a6bf0bf0df1274aafed54931cafebda4c4c7112247
-DIST vbam-2.1.0.tar.gz 2977888 BLAKE2B 48884b10d13cdeddfae1dc5a94a4576ebfd7aab263225650a7d4f7138854da3c8bbffa4a8f08e9da001cd967f0e85a7beb82f86350031264a66bfdd5403d36dd SHA512 e4489c84880a7a70e7e94104ffbbdd805e9f15d5c962c0c13a7470496d2fdad8e21c1ddb161b776eb0b1a0c7583182df5838da5a523ce31dac620aa2a7842321
 DIST vbam-2.1.4.tar.gz 3891574 BLAKE2B 5255fe814ab583c433f273c31b36933c09301330b47b2deefa453453c1d127c29a1b9de2e945e6706b1f9d9ec517444989818f3db329b96c106bf5d51ec71ae3 SHA512 9070715797c6be1648661019f236eb9328eb409f52e80e15aac52d814cf4155cf1ea37c230557c1288f152f0d27d838b11bee38679787a8d5198ca81f173d896
-EBUILD vbam-2.1.0.ebuild 2191 BLAKE2B 5ca4979634d3f9d04f6424b674d94ffe0dc868d831175f29ddc8943d445bd79bf378fad97ee8207ae3b65e08db17a7b1660d07e61e02eb3fab6f78ddeb535240 SHA512 a64571b4c5f9d03922a14b283ecb73bf59f03082abe12ba8427d159864fecac5b4c045ff107f5acc163473333655dd56318a9597115cece0a48a88f8e76e1bba
 EBUILD vbam-2.1.4.ebuild 2063 BLAKE2B ad1663e98e860bad92385e8baf17c2e0fb2ed0c0d03d6254bd2325c048fa5ede4fd322a07685336f32270f303b23db6b07f9a6a080686a2810210090e007fc4c SHA512 68961ec0544e4bb34d60574cb503ce0f7acfee711e88bd2931937cd24441600551218335d2e77e6b841d2628aeb88608f21c641fc6447e65ed2a5d76af34f3b9
 EBUILD vbam-9999.ebuild 2014 BLAKE2B 28059f24c8fa795830070e2a91f8d6102230ceaa0ef431b1bb711032f892af61e349755088ff7c4ad2fc2fc82f2a58ec604769600778b8cfe0d986178dd36067 SHA512 38e35b629583132c3bd8dfb65b6e25cd5ffce540a5e96bd6616a3b6ab55e0f056587d333fb9041187852591b3d3a19bb3dd304675ce3dbdd5a647443dbe907de
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch b/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
deleted file mode 100644
index c99f829bdc08..000000000000
--- a/games-emulation/vbam/files/vbam-2.1.0-performance_fixup.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a8d0508cf299a58b2a659d6017b049db121de8ba Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Mon, 2 Jul 2018 18:32:18 -0700
-Subject: [PATCH] use GetWindow()->Refresh() in Wayland only
-
-Some people are reporting stuttering, and @retro-wertz tested both
-DrawArea() and Refresh() on wxgtk3 under xorg and found that the
-Refresh() method produces more stuttering.
-
-Change the compile check for wxgtk2 to a runtime check for wayland, and
-use Refresh() under Wayland only.
----
- src/wx/panel.cpp | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
-index e4b86301..faaf6e4d 100644
---- a/src/wx/panel.cpp
-+++ b/src/wx/panel.cpp
-@@ -1817,19 +1817,16 @@ void DrawingPanelBase::DrawArea(uint8_t** data)
-     }
- 
-     // next, draw the frame (queue a PaintEv) Refresh must be used under
--    // Wayland or nothing is drawn, however it causes high CPU usage with GTK2,
--    // so use the old method in that case
--#if !defined(__WXGTK__) || defined(__WXGTK3__)
--    GetWindow()->Refresh();
--#else
--    {
-+    // Wayland or nothing is drawn.
-+    if (wxGetApp().UsingWayland())
-+        GetWindow()->Refresh();
-+    else {
-         DrawingPanelBase* panel = wxGetApp().frame->GetPanel()->panel;
-         if (panel) {
-             wxClientDC dc(panel->GetWindow());
-             panel->DrawArea(dc);
-         }
-     }
--#endif
- 
-     // finally, draw on-screen text using wx method, if possible
-     // this method flickers too much right now
diff --git a/games-emulation/vbam/vbam-2.1.0.ebuild b/games-emulation/vbam/vbam-2.1.0.ebuild
deleted file mode 100644
index 3d0c2496b2e0..000000000000
--- a/games-emulation/vbam/vbam-2.1.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/visualboyadvance-m-${PV}"
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
-
-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:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	wxwidgets? ( virtual/imagemagick-tools )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-performance_fixup.patch"
-)
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-	local mycmakeargs=(
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_LINK=$(usex link)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENAL=$(usex openal)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.6
-	fi
-	use wxwidgets && doman src/debian/visualboyadvance-m.6
-}
-
-pkg_preinst() {
-	if use wxwidgets ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 43c05a2d21f2..319df8bc769d 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
index 628bad1f7cc6..3984ac733119 100644
--- a/games-fps/doomsday/Manifest
+++ b/games-fps/doomsday/Manifest
@@ -1,3 +1,3 @@
 DIST doomsday-2.1.1.tar.gz 47526008 BLAKE2B bf941048d160058273df09d67b09e140c10d141cd73ff56d0f3162045696d81533aba9a8c9ff39fc29530248ee8b2f6dd2b3da76a929fb6263c311e65bcbdd82 SHA512 9df0afa0465ef3c3bb30cccf8ca51596e8e6e5584775a695c9c3278f15bcf7e9f7aaeaa0917f0a1de9fbb1174f2ae83a1ee85fba63bef6e49be957836f1107a3
-EBUILD doomsday-2.1.1.ebuild 2027 BLAKE2B 7422420cd913ae8e8bad1ad8725457c66fa7248f07f7b986242056cb342de25662f9a83809e54fb35ef82fb6c569d34598771cf3003d02c1d153d15bdff53693 SHA512 cf2e4c760562c919fef08390d7e7241d78b1dd4a88b81b5d67f971f57450d9342b9a0bfd17d4885c70d652c322ab8fc1958d9579360e8e2fc1649c562583a314
+EBUILD doomsday-2.1.1.ebuild 2017 BLAKE2B 13033af197a066e2badad2076af8806a57fe7aecc5ff5401a79e9affbd5411db6ffd0b62ac11f172d90268e65ba5aeb8c10cb41e968e6abd84e6f8a02714cb2e SHA512 afdd377336802350e0ade8447d779a7893ca423d12f98b4b8bc63267b68b5ee9914895c7824650f3a57250f3b0ab33e502ec21a47fabdfe60217f6ed4e506a78
 MISC metadata.xml 771 BLAKE2B 8a5effc2f449a9b4448dead1a37e9df047ae2e1608c26522d99b02e2d9561e8c129dbdb93f5a713dce72cee09edd8eaed61f38a278d995b3a7fc7e1a5c468bed SHA512 8bc89aa4bab55338472489ec1e92b47cb676b3110a1d3609d8e5a0d51965955770f045405665bff2e401f34697ef4d4b52341a668d08909a92db8eb660c18e00
diff --git a/games-fps/doomsday/doomsday-2.1.1.ebuild b/games-fps/doomsday/doomsday-2.1.1.ebuild
index 8eb5fd81fbea..ba671d858301 100644
--- a/games-fps/doomsday/doomsday-2.1.1.ebuild
+++ b/games-fps/doomsday/doomsday-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake python-any-r1 readme.gentoo-r1
 
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index ba36617c61b3..d028698609e1 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/childsplay/Manifest b/games-kids/childsplay/Manifest
index 86962f605752..d04c4147cf02 100644
--- a/games-kids/childsplay/Manifest
+++ b/games-kids/childsplay/Manifest
@@ -3,5 +3,5 @@ AUX childsplay-0.90.2-gentoo.patch 895 BLAKE2B dd8ea9ee59ddd57cf0172197247491f91
 DIST childsplay-0.90.2.tgz 2330022 BLAKE2B 83370489c52bd62ae46aee6f2d01d5ff42c17887105c5e4b1ba2c9f95c8869b8e315447fe60f6f325d6d6479c7ebf2c82832ffadf4414419976ed1507ed0a889 SHA512 0cc59f893f43f47fec18a6ba04e3d5b4c4b41e6c387fcd64859a65a0660b4d1c8803cd092932fc9d24a4d4b9784d6cc62cc2efc4e841ca62a205f17aec8dec68
 DIST childsplay_plugins-0.90.tgz 4528735 BLAKE2B 1aacd311138c97a868cacca723941ec582ef049831ce1ddb10f2e524f1109ceb81cf4bd34d16f2c857c4ce42ac49f7f5cb9d785e229e11f540476544093e6cb1 SHA512 f1c47c544da364bde6023cf8450d96423d214749f800d783661b6fb16f73c8bbc899ee7f997f36e11b43aff7655332c29445f865ff22dd475ad4ce4a0557e763
 DIST childsplay_plugins_lfc-0.90.tgz 6159653 BLAKE2B eb117a526f6c2caf43578dc0027d8d3b2849529d132ffc55b92d59efbfc12681f31961c265b3f6ab592a17db1a05987458b265bdf68054cef16386b71d2e28a1 SHA512 4fa8f59aae64520de03fd6527dbe7339f320ef377deca19fe91cf5591b364d853cfb9d73b8469417178fcf4bc074d6ed39a1704a20cb5a82657722862c749313
-EBUILD childsplay-0.90.2-r1.ebuild 3914 BLAKE2B 1deb5b73b35c56ed2d07719db6f1aff61760aa2a8660629c68ecbf0ae23e99fc0137c427c1ffb059e669ab3919a8c9bb124759c6c01bb5bc228cb15d73b164d8 SHA512 35e0bde061f8103da30fd1112ad3132fb07f9022a35cc015c9f1f970b1dbd47c5c4186441aece5e5f1e9045af6136b3ca26f93415c134884350018c876a99543
+EBUILD childsplay-0.90.2-r2.ebuild 3947 BLAKE2B 81558cf85174c82a37c9ab3c0c94bfdbb4b912cd9cac1057a3926eed4d2f514c6a86c0373d30e097ba4051cb13f9db32086e5be6da5d4e730439fa17bb01650b SHA512 1e979ee92b476840e15c74fc448085a7723c657debc323d7999241e65aa4830adffbc5d08728c82c0eec849f931f81c071d9be73784660955842d3d75bcec3a1
 MISC metadata.xml 516 BLAKE2B 785e9855bda1d0268ce6328d5e01cee50332941fc73203bcb7e85678225df29ad48bc1db13c5ccddb1e6fa1bdf25418a5dc2e840eb220c6b1995cd31ddb73c2d SHA512 145c6baf1c8115b4fbf694360c48e53ab31c32ec2cc2d3b2f9bb159377f4629b827014833155f17468cb5fccc98a8bef1ef8bc6fd64dab39d1d8fdf2b16e9275
diff --git a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild b/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
deleted file mode 100644
index 3c535ad41d94..000000000000
--- a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
+++ /dev/null
@@ -1,147 +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 eutils python-single-r1 games
-
-DESCRIPTION="A suite of educational games for young children"
-HOMEPAGE="http://childsplay.sourceforge.net/"
-PLUGINS_VERSION="0.90"
-PLUGINS_LFC_VERSION="0.90"
-SRC_URI="mirror://sourceforge/childsplay/${P}.tgz
-	mirror://sourceforge/childsplay/${PN}_plugins-${PLUGINS_VERSION}.tgz
-	mirror://sourceforge/childsplay/${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-	media-libs/libogg"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_prepare() {
-	local DIR
-
-	# Copy the plugins into the main package.
-	mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die
-	mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die
-	for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do
-		mv ../${DIR}/Data/*.icon.png Data/icons || die
-		cp -r ../${DIR}/lib/* lib || die
-		mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die
-		rm -rf ../${DIR}
-	done
-	gunzip man/childsplay.6.gz
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	python_fix_shebang .
-}
-
-src_install() {
-	local fn
-
-	# The following variables are based on Childsplay's INSTALL.sh
-	_LOCALEDIR=/usr/share/locale
-	_ASSETMLDIR=/usr/share/assetml
-	_SCOREDIR=${GAMES_STATEDIR}
-	_SCOREFILE=${_SCOREDIR}/childsplay.score
-	_CPDIR=$(games_get_libdir)/childsplay
-	_SHAREDIR=${GAMES_DATADIR}/childsplay
-	_LIBDIR=${_CPDIR}/lib
-	_MODULESDIR=${_LIBDIR}
-	_SHARELIBDATADIR=${_SHAREDIR}/lib
-	_SHAREDATADIR=${_SHAREDIR}/Data
-	_RCDIR=${_SHARELIBDATADIR}/ConfigData
-	_HOME_DIR_NAME=.childsplay
-	_CHILDSPLAYRC=childsplayrc
-
-	dodir \
-		"${_CPDIR}" \
-		"${_LIBDIR}" \
-		"${_SHAREDIR}" \
-		"${_SHARELIBDATADIR}" \
-		"${_SCOREDIR}" \
-		"${_LOCALEDIR}" \
-		"${_ASSETMLDIR}"
-
-	# create BASEPATH.py
-	cat >BASEPATH.py <<EOF
-## Automated file--please do not edit
-LOCALEDIR="${_LOCALEDIR}"
-ASSETMLDIR="${_ASSETMLDIR}"
-SCOREDIR="${_SCOREDIR}"
-SCOREFILE="${_SCOREFILE}"
-CPDIR="${_CPDIR}"
-SHAREDIR="${_SHAREDIR}"
-LIBDIR="${_LIBDIR}"
-MODULESDIR="${_MODULESDIR}"
-SHARELIBDATADIR="${_SHARELIBDATADIR}"
-SHAREDATADIR="${_SHAREDATADIR}"
-RCDIR="${_RCDIR}"
-HOME_DIR_NAME="${_HOME_DIR_NAME}"
-CHILDSPLAYRC="${_CHILDSPLAYRC}"
-EOF
-
-	# copy software and data
-	cp -r *.py "${D}/${_CPDIR}" || die "cp failed"
-	cp -r Data "${D}/${_SHAREDIR}" || die "cp failed"
-	rm "${D}/${_SHAREDIR}/Data/childsplay.score"  # this copy won't be used
-
-	for fn in $(ls lib); do
-		if [[ -d lib/${fn} ]] ; then
-			cp -r lib/${fn} "${D}/${_SHARELIBDATADIR}" || die
-		else
-			cp lib/${fn} "${D}/${_LIBDIR}" || die
-		fi
-	done
-
-	if [[ ${LINGUAS+set} ]]; then
-		for lang in $LINGUAS; do
-			[[ -d locale/$lang ]] && cp -r locale/$lang "${D}/${_LOCALEDIR}"
-		done
-	else
-		cp -r locale/* "${D}/${_LOCALEDIR}" || die
-	fi
-	cp -r assetml/* "${D}/${_ASSETMLDIR}" || die
-
-	# initialize the score file
-	cp Data/childsplay.score "${D}/${_SCOREFILE}" || die
-	SCORE_GAMES="Packid,Numbers,Soundmemory,Fallingletters,Findsound,Findsound2,Billiard"
-	${PYTHON} add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES
-
-	# translate for the letters game
-	${PYTHON} letters-trans.py "${D}/${_ASSETMLDIR}" << EOF
-Q
-EOF
-
-	doman man/childsplay.6
-	dodoc doc/README* doc/Changelog doc/copyright
-
-	# Make a launcher.
-	dogamesbin "${FILESDIR}"/childsplay
-	sed -i \
-		-e "s:GENTOO_DIR:${_CPDIR}:" \
-		-e "s:python:${PYTHON}:" \
-		"${D}${GAMES_BINDIR}"/childsplay \
-		|| die "sed failed"
-
-	python_optimize "${D}${_CPDIR}"
-
-	newicon assetml/childsplay/childsplay-images/chpl-icon-48.png ${PN}.png
-	make_desktop_entry childsplay Childsplay
-
-	prepgamesdirs
-	fperms g+w "${_SCOREFILE}"
-}
diff --git a/games-kids/childsplay/childsplay-0.90.2-r2.ebuild b/games-kids/childsplay/childsplay-0.90.2-r2.ebuild
new file mode 100644
index 000000000000..a0714b344639
--- /dev/null
+++ b/games-kids/childsplay/childsplay-0.90.2-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 games
+
+DESCRIPTION="A suite of educational games for young children"
+HOMEPAGE="http://childsplay.sourceforge.net/"
+PLUGINS_VERSION="0.90"
+PLUGINS_LFC_VERSION="0.90"
+SRC_URI="mirror://sourceforge/childsplay/${P}.tgz
+	mirror://sourceforge/childsplay/${PN}_plugins-${PLUGINS_VERSION}.tgz
+	mirror://sourceforge/childsplay/${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/sdl-image[gif,jpeg,png]
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer[vorbis]
+	media-libs/libogg"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	local DIR
+
+	# Copy the plugins into the main package.
+	mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die
+	mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die
+	for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do
+		mv ../${DIR}/Data/*.icon.png Data/icons || die
+		cp -r ../${DIR}/lib/* lib || die
+		mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die
+		rm -rf ../${DIR}
+	done
+	gunzip man/childsplay.6.gz
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	python_fix_shebang .
+}
+
+src_install() {
+	local fn
+
+	# The following variables are based on Childsplay's INSTALL.sh
+	_LOCALEDIR=/usr/share/locale
+	_ASSETMLDIR=/usr/share/assetml
+	_SCOREDIR=${GAMES_STATEDIR}
+	_SCOREFILE=${_SCOREDIR}/childsplay.score
+	_CPDIR=$(games_get_libdir)/childsplay
+	_SHAREDIR=${GAMES_DATADIR}/childsplay
+	_LIBDIR=${_CPDIR}/lib
+	_MODULESDIR=${_LIBDIR}
+	_SHARELIBDATADIR=${_SHAREDIR}/lib
+	_SHAREDATADIR=${_SHAREDIR}/Data
+	_RCDIR=${_SHARELIBDATADIR}/ConfigData
+	_HOME_DIR_NAME=.childsplay
+	_CHILDSPLAYRC=childsplayrc
+
+	dodir \
+		"${_CPDIR}" \
+		"${_LIBDIR}" \
+		"${_SHAREDIR}" \
+		"${_SHARELIBDATADIR}" \
+		"${_SCOREDIR}" \
+		"${_LOCALEDIR}" \
+		"${_ASSETMLDIR}"
+
+	# create BASEPATH.py
+	cat >BASEPATH.py <<EOF
+## Automated file--please do not edit
+LOCALEDIR="${_LOCALEDIR}"
+ASSETMLDIR="${_ASSETMLDIR}"
+SCOREDIR="${_SCOREDIR}"
+SCOREFILE="${_SCOREFILE}"
+CPDIR="${_CPDIR}"
+SHAREDIR="${_SHAREDIR}"
+LIBDIR="${_LIBDIR}"
+MODULESDIR="${_MODULESDIR}"
+SHARELIBDATADIR="${_SHARELIBDATADIR}"
+SHAREDATADIR="${_SHAREDATADIR}"
+RCDIR="${_RCDIR}"
+HOME_DIR_NAME="${_HOME_DIR_NAME}"
+CHILDSPLAYRC="${_CHILDSPLAYRC}"
+EOF
+
+	# copy software and data
+	cp -r *.py "${D}/${_CPDIR}" || die "cp failed"
+	cp -r Data "${D}/${_SHAREDIR}" || die "cp failed"
+	rm "${D}/${_SHAREDIR}/Data/childsplay.score"  # this copy won't be used
+
+	for fn in $(ls lib); do
+		if [[ -d lib/${fn} ]] ; then
+			cp -r lib/${fn} "${D}/${_SHARELIBDATADIR}" || die
+		else
+			cp lib/${fn} "${D}/${_LIBDIR}" || die
+		fi
+	done
+
+	if [[ ${LINGUAS+set} ]]; then
+		for lang in $LINGUAS; do
+			[[ -d locale/$lang ]] && cp -r locale/$lang "${D}/${_LOCALEDIR}"
+		done
+	else
+		cp -r locale/* "${D}/${_LOCALEDIR}" || die
+	fi
+	cp -r assetml/* "${D}/${_ASSETMLDIR}" || die
+
+	# initialize the score file
+	cp Data/childsplay.score "${D}/${_SCOREFILE}" || die
+	SCORE_GAMES="Packid,Numbers,Soundmemory,Fallingletters,Findsound,Findsound2,Billiard"
+	${PYTHON} add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES
+
+	# translate for the letters game
+	${PYTHON} letters-trans.py "${D}/${_ASSETMLDIR}" << EOF
+Q
+EOF
+
+	doman man/childsplay.6
+	dodoc doc/README* doc/Changelog doc/copyright
+
+	# Make a launcher.
+	dogamesbin "${FILESDIR}"/childsplay
+	sed -i \
+		-e "s:GENTOO_DIR:${_CPDIR}:" \
+		-e "s:python:${PYTHON}:" \
+		"${D}${GAMES_BINDIR}"/childsplay \
+		|| die "sed failed"
+
+	python_optimize "${D}${_CPDIR}"
+
+	newicon assetml/childsplay/childsplay-images/chpl-icon-48.png ${PN}.png
+	make_desktop_entry childsplay Childsplay
+
+	prepgamesdirs
+	fperms g+w "${_SCOREFILE}"
+}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 5ff4532dcc04..9cb3400f5ef7 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/openmsx/Manifest b/games-misc/openmsx/Manifest
index 274e584c6ce3..fac3e02934f9 100644
--- a/games-misc/openmsx/Manifest
+++ b/games-misc/openmsx/Manifest
@@ -1,3 +1,5 @@
+AUX openmsx-0.3.1-python3.patch 8650 BLAKE2B 8a26d10fcac16895ad0db10c242aee0be00dbfd3071d909af7f0bdeb1a9ff289bbd51f4861d5cb171128bb857e5ee4d62b0994724dfa1aa228c5c444522ef477 SHA512 d454d982df8f6b6e07f588c6a8b4a3e8e7053f9a8ad6906a83d25f163caf744225e56754d3871b76efd7d2e432c01badd1e3371758dcd7bf4f8ff88b61d8c0a7
 DIST openmsx-0.3.1-source.tar.gz 152798 BLAKE2B 8c6d757b708bf5af9312318d13bf99b7326ed3cf82d158c4e639e04eab5c722d76976820a6a8913cef93246225578fcbd598afde11f09cdadc47d626d977d947 SHA512 e455f99f32d1daa77157def4f109dd1456169ae2b527290035b6a52f591c13fb7464fd221e00eb46bf03f51e8d0101de08a9e47cebe2430ad05a840ab235973e
 EBUILD openmsx-0.3.1-r2.ebuild 702 BLAKE2B 464524bf487c6a872ed156d2275088160279c7ec874b2a968c240485ac67270f454d983e652d43aafd942cfde1be67e93090fbe33d72221230dcb2dd4e901c0f SHA512 86565b559cb611d4b6d1fa235e3f7d5fb6327d242a8de44cda7b3d4f1246e2393d4c7026a49831fb9266ba09c4d7f1bdbf72215b8c7d7cdaacf971b7c346774e
+EBUILD openmsx-0.3.1-r3.ebuild 756 BLAKE2B 7e9aa4fd5390dc133a79af2d87e9965cd42b9567f5cba1cfb1860365ae6ed55fd65e274c4a9ddef2a31b6426af9069e76f7324c99dc4c70c91dbfb874e31bd29 SHA512 a564c7c35e634210f21a4b5f85ba89f607077ecfac065e3b1beb8d3cf721aaf0d87c6f13e41c0b470e1b4dccef59da8d7202304c32b759dfc35e64363397a5c0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/openmsx/files/openmsx-0.3.1-python3.patch b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
new file mode 100644
index 000000000000..0e8a44a5ec3d
--- /dev/null
+++ b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch
@@ -0,0 +1,306 @@
+From 7b298b1bacc56392b9a19ba6b95d368309832ad7 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Fri, 7 Feb 2020 13:15:16 +0200
+Subject: [PATCH] Fix: support Python 3
+
+Correct tabs and spaces in scripts to make them consistent.
+Don't call deprecated methods.
+
+Upstream-Status: Submitted [https://github.com/OpenTTD/OpenMSX/pull/2]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ scripts/authorlist.py    | 20 ++++++++---------
+ scripts/md5list.py       | 48 ++++++++++++++++++++--------------------
+ scripts/midifiles.py     | 30 ++++++++++++-------------
+ scripts/namelist.py      | 34 ++++++++++++++--------------
+ scripts/playlist.py      | 42 +++++++++++++++++------------------
+ scripts/sanitize_list.py | 48 ++++++++++++++++++++--------------------
+ 6 files changed, 111 insertions(+), 111 deletions(-)
+
+diff --git a/scripts/authorlist.py b/scripts/authorlist.py
+index 689ddb9..e041d64 100755
+--- a/scripts/authorlist.py
++++ b/scripts/authorlist.py
+@@ -14,14 +14,14 @@ import string
+ import sys
+ 
+ while 1:
+-    data = sys.stdin.readline()
+-    if data != '':
+-        # do some processing of the contents of
+-        # the data variable
+-        separate = string.split(data,";")
+-        print '%-30s %s' % (separate[1]+":", separate[2])
+-        # end of data processing command group
++	data = sys.stdin.readline()
++	if data != '':
++		# do some processing of the contents of
++		# the data variable
++		separate = data.split(';')
++		print('%-30s %s' % (separate[1]+":", separate[2]))
++		# end of data processing command group
+ 		#        sys.stdout.write(res)
+-    else:
+-        sys.stdout.flush()
+-        break
++	else:
++		sys.stdout.flush()
++		break
+diff --git a/scripts/md5list.py b/scripts/md5list.py
+index cf611fc..a60f977 100755
+--- a/scripts/md5list.py
++++ b/scripts/md5list.py
+@@ -16,28 +16,28 @@ import subprocess
+ import os
+ 
+ while 1:
+-    data = sys.stdin.readline()
+-    if data != '':
+-	# leave out all comment lines (lines starting with '#')
+-	comment_pos = string.find(data,'#')
+-	if comment_pos == 0:
+-		continue
+-	# separate the single entries by ';'
+-	separate = string.split(data,";")
+-	if len(separate) != 4:
+-		continue
+-	systemtype = (os.uname())[0]
+-	if systemtype == 'Linux':
+-		md5call = ["md5sum"]
+-	elif systemtype == 'Darwin':
+-		md5call = ["md5", "-r"]
++	data = sys.stdin.readline()
++	if data != '':
++		# leave out all comment lines (lines starting with '#')
++		comment_pos = data.find('#')
++		if comment_pos == 0:
++			continue
++		# separate the single entries by ';'
++		separate = data.split(';')
++		if len(separate) != 4:
++			continue
++		systemtype = (os.uname())[0]
++		if systemtype == 'Linux':
++			md5call = ["md5sum"]
++		elif systemtype == 'Darwin':
++			md5call = ["md5", "-r"]
++		else:
++			md5call = ["md5sum"]
++		md5call = md5call + ["src/"+separate[1].strip()]
++		md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0]
++		md5sum = md5sum.split()
++		res = "%-32s = %s\n" % (separate[1], md5sum[0])
++		sys.stdout.write(res)
+ 	else:
+-		md5call = ["md5sum"]
+-	md5call = md5call + ["src/"+string.strip(separate[1])]
+-	md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0]
+-	md5sum = string.split(md5sum)
+-	res = "%-32s = %s\n" % (separate[1], md5sum[0])
+-        sys.stdout.write(res)
+-    else:
+-        sys.stdout.flush()
+-        break
++		sys.stdout.flush()
++		break
+diff --git a/scripts/midifiles.py b/scripts/midifiles.py
+index 3b5ec57..a89e4f2 100755
+--- a/scripts/midifiles.py
++++ b/scripts/midifiles.py
+@@ -15,18 +15,18 @@ import sys
+ 
+ res = ""
+ while 1:
+-    data = sys.stdin.readline()
+-    if data != '':
+-	# leave out all comment lines (lines starting with '#')
+-	comment_pos = string.find(data,'#')
+-	if comment_pos == 0:
+-		continue
+-	# separate the single entries by ';'
+-        separate = string.split(data,";")
+-	if len(separate) != 4:
+-		continue
+-	res = res + " src/" + string.strip(separate[1])
+-    else:
+-	sys.stdout.write(res)
+-        sys.stdout.flush()
+-        break
++	data = sys.stdin.readline()
++	if data != '':
++		# leave out all comment lines (lines starting with '#')
++		comment_pos = data.find('#')
++		if comment_pos == 0:
++			continue
++		# separate the single entries by ';'
++		separate = data.split(';')
++		if len(separate) != 4:
++			continue
++		res = res + " src/" + separate[1].strip()
++	else:
++		sys.stdout.write(res)
++		sys.stdout.flush()
++		break
+diff --git a/scripts/namelist.py b/scripts/namelist.py
+index cdac127..107ad00 100755
+--- a/scripts/namelist.py
++++ b/scripts/namelist.py
+@@ -14,23 +14,23 @@ import string
+ import sys
+ 
+ while 1:
+-    data = sys.stdin.readline()
+-    if data != '':
+-	# leave out all comment lines (lines starting with '#')
+-	comment_pos = string.find(data,'#')
+-	if comment_pos == 0:
+-		continue
+-	# separate the single entries by ';'
+-        separate = string.split(data,";")
+-	if len(separate) != 4:
+-		continue
+-	res = "%-32s = %s\n" % (separate[1], string.strip(separate[3]))
+-        sys.stdout.write(res)
+-    else:
+-        sys.stdout.flush()
+-        break
++	data = sys.stdin.readline()
++	if data != '':
++		# leave out all comment lines (lines starting with '#')
++		comment_pos = data.find('#')
++		if comment_pos == 0:
++			continue
++		# separate the single entries by ';'
++		separate = data.split(';')
++		if len(separate) != 4:
++			continue
++		res = "%-32s = %s\n" % (separate[1], separate[3].strip())
++		sys.stdout.write(res)
++	else:
++		sys.stdout.flush()
++		break
+ 
+ def authorlist(mystr):
+-	separate = string.split()
++	separate = separate.split()
+ 	for str in separate:
+-		print string.strip(str)
+\ No newline at end of file
++		print(str.strip())
+diff --git a/scripts/playlist.py b/scripts/playlist.py
+index 939d03d..e77b02a 100755
+--- a/scripts/playlist.py
++++ b/scripts/playlist.py
+@@ -14,27 +14,27 @@ import string
+ import sys
+ 
+ while 1:
+-    data = sys.stdin.readline()
+-    if data != '':
+-	# leave out all comment lines (lines starting with '#')
+-	comment_pos = string.find(data,'#')
+-	if comment_pos == 0:
+-		continue
+-	# separate the single entries by ';'
+-        separate = string.split(data,";")
+-	res = ""
+-	# leave out all lines which don't have the proper number of elements
+-	if len(separate) >= 1:
+-		res = string.strip(separate[0]) + " = "
+-	if len(separate) == 4:
+-		res = res + separate[1]
+-	res = res + "\n"
+-        sys.stdout.write(res)
+-    else:
+-        sys.stdout.flush()
+-        break
++	data = sys.stdin.readline()
++	if data != '':
++		# leave out all comment lines (lines starting with '#')
++		comment_pos = data.find('#')
++		if comment_pos == 0:
++			continue
++		# separate the single entries by ';'
++		separate = data.split(';')
++		res = ""
++		# leave out all lines which don't have the proper number of elements
++		if len(separate) >= 1:
++			res = separate[0].strip() + " = "
++		if len(separate) == 4:
++			res = res + separate[1]
++		res = res + "\n"
++		sys.stdout.write(res)
++	else:
++		sys.stdout.flush()
++		break
+ 
+ def authorlist(mystr):
+-	separate = string.split()
++	separate = separate.split()
+ 	for str in separate:
+-		print string.strip(str)
+\ No newline at end of file
++		print(str.strip())
+diff --git a/scripts/sanitize_list.py b/scripts/sanitize_list.py
+index f97709a..5368831 100755
+--- a/scripts/sanitize_list.py
++++ b/scripts/sanitize_list.py
+@@ -14,30 +14,30 @@ import string
+ import sys
+ 
+ while 1:
+-    data = sys.stdin.readline()
+-    if data != '':
+-	# leave out all comment lines (lines starting with '#')
+-	comment_pos = string.find(data,'#')
+-	if comment_pos == 0:
+-		continue
+-	# separate the single entries by ';'
+-        separate = string.split(data,";")
+-	if len(separate) != 4:
+-		continue
+-	res = ""
+-	for str in separate:
+-		if res != '':
+-			res = res + ";" + string.strip(str)
+-		else:
+-			res = string.strip(str)
+-        # end of data processing command group
+-	res = res + "\n"
+-        sys.stdout.write(res)
+-    else:
+-        sys.stdout.flush()
+-        break
++	data = sys.stdin.readline()
++	if data != '':
++		# leave out all comment lines (lines starting with '#')
++		comment_pos = data.find('#')
++		if comment_pos == 0:
++			continue
++		# separate the single entries by ';'
++		separate = data.split(';')
++		if len(separate) != 4:
++			continue
++		res = ""
++		for str in separate:
++			if res != '':
++				res = res + ";" + str.strip()
++			else:
++				res = str.strip()
++		# end of data processing command group
++		res = res + "\n"
++		sys.stdout.write(res)
++	else:
++		sys.stdout.flush()
++		break
+ 
+ def authorlist(mystr):
+-	separate = string.split()
++	separate = separate.split()
+ 	for str in separate:
+-		print string.strip(str)
+\ No newline at end of file
++		print(str.strip())
+-- 
+2.25.0
+
diff --git a/games-misc/openmsx/openmsx-0.3.1-r3.ebuild b/games-misc/openmsx/openmsx-0.3.1-r3.ebuild
new file mode 100644
index 000000000000..256776545d93
--- /dev/null
+++ b/games-misc/openmsx/openmsx-0.3.1-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-any-r1
+
+DESCRIPTION="Open source music base set for OpenTTD"
+HOMEPAGE="https://wiki.openttd.org/OpenMSX https://github.com/OpenTTD/OpenMSX"
+SRC_URI="https://cdn.openttd.org/openmsx-releases/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${P}-python3.patch )
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake _V= bundle
+}
+
+src_install() {
+	insinto "/usr/share/games/openttd/gm/${P}"
+	doins ${P}/{*.mid,openmsx.obm}
+	dodoc ${P}/{changelog.txt,readme.txt}
+}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index ff98d5d5fc12..9ad99c6f27c2 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
index 77b6e5ebaec8..631fa0ebe32d 100644
--- a/games-puzzle/angrydd/Manifest
+++ b/games-puzzle/angrydd/Manifest
@@ -1,4 +1,4 @@
 DIST angrydd-1.0.1.tar.gz 5331883 BLAKE2B de8a418b881f17e0869d9b8004b6db3cee56c1bb05729a5238f6357d3072ff10afb864252fcb3cef5c90d136ad7c8739afd71b88c932545203f2e9752c5eac81 SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0
 DIST angrydd_1.0.1-13.debian.tar.xz 11940 BLAKE2B d64ae1f878f3dfe4eee9f236ce6869f7ce3d77021a09593240a84860157781ecd776be7a06edbb48d1e340c654c50f4463b76b42049076e9c02b6397988ca9df SHA512 123d593ac7ceff8f6fe5d70442b92e6564f4e6ee668450cb623bbdeb4633cad6e04cf896d93cacc5e11bda08cb61b7c92ce0b99072e6e12b21e023620d12b360
-EBUILD angrydd-1.0.1_p13.ebuild 1176 BLAKE2B 9688e6504169eb00f1cb80663ad6576bb76dfed060b8ef05513d68c6e3b9415b149fc945a5509bf69420a9957a0463333884134d9b3e4d2b76617284cb8c9644 SHA512 b8724a45d1c547bdb010ab9f1563ff063c7197b1623407b951e9fa8e9a055ea89694a9bcb48802298dd831976f1e80e1a2afc1905765ac0deb6a77f6f3922065
+EBUILD angrydd-1.0.1_p13-r1.ebuild 1212 BLAKE2B 9b6a6b6475d86bd8864d52d497e32a320dc69072641343a80df512e66978906e0fd2e2320905f11f04901b5bebe4ea30bae375bc535fa716105cea508942d6e8 SHA512 5340ac1dc157d1d66adea7df746a799c041fb6676c20cd9dd178eb4999e356edaef723e1a8de79859f30c3051914e1d0e62686ecf36f10ec943c0c5f3444b0e2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
new file mode 100644
index 000000000000..3ed88c2a33d3
--- /dev/null
+++ b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
+HOMEPAGE="https://www.sacredchao.net/~piman/angrydd/"
+SRC_URI="
+	https://www.sacredchao.net/~piman/angrydd/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${P/_p*}"
+
+src_prepare() {
+	default
+	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
+	python_fix_shebang .
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="/usr/share/" \
+		TO="${PN}" \
+		install
+	rm -rf "${ED}/usr/share/games" "${ED}/usr/share/share" || die
+
+	python_optimize "${ED}/usr/share/${PN}"
+
+	dodir /usr/bin
+	dosym "../share/${PN}/angrydd.py" "/usr/bin/${PN}"
+	doman angrydd.6
+	dodoc README TODO HACKING
+
+	doicon angrydd.png
+	make_desktop_entry angrydd "Angry, Drunken Dwarves"
+}
diff --git a/games-puzzle/angrydd/angrydd-1.0.1_p13.ebuild b/games-puzzle/angrydd/angrydd-1.0.1_p13.ebuild
deleted file mode 100644
index 24ba06527628..000000000000
--- a/games-puzzle/angrydd/angrydd-1.0.1_p13.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit desktop python-single-r1
-
-DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
-HOMEPAGE="https://www.sacredchao.net/~piman/angrydd/"
-SRC_URI="
-	https://www.sacredchao.net/~piman/angrydd/${P/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/_p*}"
-
-src_prepare() {
-	default
-	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
-	python_fix_shebang .
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="/usr/share/" \
-		TO="${PN}" \
-		install
-	rm -rf "${ED}/usr/share/games" "${ED}/usr/share/share" || die
-
-	python_optimize "${ED}/usr/share/${PN}"
-
-	dodir /usr/bin
-	dosym "../share/${PN}/angrydd.py" "/usr/bin/${PN}"
-	doman angrydd.6
-	dodoc README TODO HACKING
-
-	doicon angrydd.png
-	make_desktop_entry angrydd "Angry, Drunken Dwarves"
-}
diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
index ef11b52bc354..9bb53265e828 100644
--- a/games-puzzle/meandmyshadow/Manifest
+++ b/games-puzzle/meandmyshadow/Manifest
@@ -1,4 +1,4 @@
 AUX meandmyshadow-0.4-cmake.patch 479 BLAKE2B a242388410af6608f7bca6dd09c125049f5e62c142ac5633d63389755bad41b0a6a3761bb189fac5fde3bfec3fd45c6d39ccb097602a617f627f7e4860ff4222 SHA512 caf5db2cc564feb07753e86788b9f3deb7d280d5fb0474bfee0238fe80af0179aa5b7772b1a5033be55a6dff5f32c9913f8952f973cd30bbce7e1a992ed76e9e
 DIST meandmyshadow-0.4-src.tar.gz 16962805 BLAKE2B 607c08c0484b049e02ed54d2483f30f1c7af8aeffc31c977dba335e57eb14734517469f345387778875567db7f446b159dfbc7e51832cddc0d29e8352b308b29 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b
-EBUILD meandmyshadow-0.4-r1.ebuild 1183 BLAKE2B 370e15518b5d280e57f4e4f7954a19a1df6254dd3a1a8a3a64d0dea0f3101801a4176c220144e61d4a2bc12c72c0f0e8b6d3453c5ade55b5e0fee6bf27c4e820 SHA512 a715992109689a592c8dab50e890180b5bbc4c40ff0260732e176cedd2d9db777305d55b3757e4da202f18000912d71ed9e826151fd97e264ac5515924f58767
+EBUILD meandmyshadow-0.4-r1.ebuild 1151 BLAKE2B 80943bcd20f3d29080127ebd3919e43806c1088f6debe1e4751efd8cc76fc176e3f82b34762343b83e2ea467c197d323d337b3b07ca6f5f71ab2e800e3a10601 SHA512 8e871a70aac93a8c55632b84c1dc6f990815e11d90248ebe911dab7c511150a7aca6b47a94e592ce07d0ac3811080726506714daea07b0fc28f5377c061fe9f7
 MISC metadata.xml 336 BLAKE2B ef2dbc4f110f2be12490cafc36b1efa95c025822eebdcda0cbec755f1c943d4111304cb0b0a0b415b297ee8face8bef5328a062d28fac6f00ce5ab4f20a8f321 SHA512 8641b7544c71bf31e801587fb889e92e248b4c3500be88ae976423e39d93a6d870b18f05d7af9ce0e0c1d5e2ec081501cecb070cbf2a1452724cc20851617a55
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
index 567f9a34f9b4..6bd50063b3b2 100644
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
@@ -35,7 +35,6 @@ PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DCMAKE_INSTALL_PREFIX="/usr"
 		-DBINDIR="/usr/bin"
 		-DDATAROOTDIR="/usr/share"
 		-DICONDIR=/usr/share/icons
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index f861e94c8792..6cba7c98367d 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
 AUX pathological-1.1.3-build-r1.patch 294 BLAKE2B ca608731e0e25134f2ce66d8336e73fceb9a4201199a770857e6a5e8235ef387ab2bd9f7fb27f9434c8042131d09fb49eec39582d59bca3661a4ab489d181159 SHA512 ae7ba9c82cc51232b69fe5756ca5ae17d816c395b091f43c344f86439b3e08bdf2c4bcb9272f2b4e47ab1756432a9455c25c94dfe914ab2d2e5bfde99839483a
 DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
 DIST pathological_1.1.3-16.debian.tar.xz 12992 BLAKE2B 3209f1d6b867f8d7baf83dda22f94829ba880a7aeff2a7587b883cac406e21b5c20d703a55599bc8692caa49553102ed1b4b0f7ac11c490b400ccbca7608d6cf SHA512 3d946a6d3c0daa4f0dac256c6e5fa053942a101aaae229836c8290dffc4556279169f71eff6bf4814d26ee30f466df9d7014b504c259aba139c3919c704db3ee
-EBUILD pathological-1.1.3_p16.ebuild 2213 BLAKE2B 673cdb9598c7a0fc215d90239aeda921619c75c2d78e224952dd530814e3c3a90f3a921a6cfbbeae39c0791e292f69eaf53c744a68151d564fb642749b5bc44d SHA512 be4a4108301c7a9f4001a96c4df78810f3bc24d29a877df6323a93cc620f633a340910080d3e26ffafc7f14463c0854e2852bad5264509bc352dbaec700ce888
+EBUILD pathological-1.1.3_p16-r1.ebuild 2249 BLAKE2B 96b27622d8b087dc44e0031b8e34e59ee2b1cc1e6ee1a17649c7b396437fe287cf4b03234c42ca6f7d44c69622cac2153ffe4015d5654c5877e02aaa14b2b34a SHA512 cc7a77c598630d6ee24ae88804e3a35f928db0aa6bd14def17c7e17abeb06aa784b53eaa8809a7f301918d98729ea46eadd6b790181a456ef76654d878afedee
 MISC metadata.xml 335 BLAKE2B 775a6a1e8fcce8caa16099edfe9513a7dd1528584f8a54090e5064d9dc7b7c956caa585d90878f1f39148faf224fd941c04a2fe1be4cfdc3f1b1c27cf3a2a6c8 SHA512 d37783b18071c416deb0bbc6702ca086e84653bc7a54bc76283285eb0ece1f82a4f1b1a57ae6572b174c21a4d6d629d77f7edb8d2883cd2401f8cb0943646eaa
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
new file mode 100644
index 000000000000..41ac5a9ae172
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
+HOMEPAGE="http://pathological.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pygame-1.5.5[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	doc? ( media-libs/netpbm )
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unpack ./${PN}.6.gz
+}
+
+src_prepare() {
+	default
+
+	# Debian fixes
+	# We don't face this bug, this way we skip needing to convert the
+	# files at build time
+	sed -i -e '/60_use_ogg_music.patch/d' "${WORKDIR}"/debian/patches/series || die
+
+	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+		eapply -p1 "${WORKDIR}/debian/patches/${p}"
+	done
+
+	# Fix prestripped files
+	eapply "${FILESDIR}/${PN}-1.1.3-build-r1.patch"
+
+	if use doc ; then
+		sed -i -e '5,$ s/=/ /g' makehtml || die
+	else
+		echo "#!/bin/sh" > makehtml
+	fi
+
+	sed -i \
+		-e "s:/usr/share/games:/usr/share:" \
+		-e "s:exec:exec ${EPYTHON}:" \
+		${PN} || die
+
+	sed -i \
+		-e 's:\xa9:(C):' \
+		-e "s:/usr/lib/${PN}/bin:/usr/$(get_libdir)/${PN}:" \
+		${PN}.py || die
+
+	python_fix_shebang ${PN}.py
+}
+
+src_install() {
+	dobin ${PN}
+
+	exeinto /usr/"$(get_libdir)"/${PN}
+	doexe write-highscores
+
+	insinto /usr/share/${PN}
+	doins -r circuits graphics music sounds ${PN}.py
+
+	insinto /var/games/
+	doins ${PN}_scores
+	fperms 660 /var/games/${PN}_scores
+
+	doman ${PN}.6
+	use doc && local HTML_DOCS=( html/. )
+	einstalldocs
+	dodoc changelog
+
+	doicon ${PN}.xpm
+	make_desktop_entry ${PN} Pathological ${PN}
+
+	# remove some unneeded resource files
+	rm -f "${ED}"/usr/share/${PN}/graphics/*.xcf
+}
+
+pkg_postinst() {
+	if ! has_version "media-libs/sdl-mixer[mod]" ; then
+		echo
+		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
+		elog "no background music will be played."
+		echo
+	fi
+
+}
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16.ebuild
deleted file mode 100644
index f1e7df2a7630..000000000000
--- a/games-puzzle/pathological/pathological-1.1.3_p16.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit desktop python-single-r1
-
-DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
-HOMEPAGE="http://pathological.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	doc? ( media-libs/netpbm )
-"
-
-S="${WORKDIR}/${P/_p*}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack ./${PN}.6.gz
-}
-
-src_prepare() {
-	default
-
-	# Debian fixes
-	# We don't face this bug, this way we skip needing to convert the
-	# files at build time
-	sed -i -e '/60_use_ogg_music.patch/d' "${WORKDIR}"/debian/patches/series || die
-
-	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
-		eapply -p1 "${WORKDIR}/debian/patches/${p}"
-	done
-
-	# Fix prestripped files
-	eapply "${FILESDIR}/${PN}-1.1.3-build-r1.patch"
-
-	if use doc ; then
-		sed -i -e '5,$ s/=/ /g' makehtml || die
-	else
-		echo "#!/bin/sh" > makehtml
-	fi
-
-	sed -i \
-		-e "s:/usr/share/games:/usr/share:" \
-		-e "s:exec:exec ${EPYTHON}:" \
-		${PN} || die
-
-	sed -i \
-		-e 's:\xa9:(C):' \
-		-e "s:/usr/lib/${PN}/bin:/usr/$(get_libdir)/${PN}:" \
-		${PN}.py || die
-
-	python_fix_shebang ${PN}.py
-}
-
-src_install() {
-	dobin ${PN}
-
-	exeinto /usr/"$(get_libdir)"/${PN}
-	doexe write-highscores
-
-	insinto /usr/share/${PN}
-	doins -r circuits graphics music sounds ${PN}.py
-
-	insinto /var/games/
-	doins ${PN}_scores
-	fperms 660 /var/games/${PN}_scores
-
-	doman ${PN}.6
-	use doc && local HTML_DOCS=( html/. )
-	einstalldocs
-	dodoc changelog
-
-	doicon ${PN}.xpm
-	make_desktop_entry ${PN} Pathological ${PN}
-
-	# remove some unneeded resource files
-	rm -f "${ED}"/usr/share/${PN}/graphics/*.xcf
-}
-
-pkg_postinst() {
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		echo
-		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
-		elog "no background music will be played."
-		echo
-	fi
-
-}
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 2a96e57e14af..89ea98033bfe 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index c748848269d4..4be260e1046a 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,5 +1,5 @@
 DIST freedroidRPG-0.16.tar.gz 225570013 BLAKE2B ad87ad3d368c94eb1f3dae2d4c3df97b9bc88acccbec4cbcd31e42b411bb96506faac23f8de9b0317a1ab926b34bd01196adce617ab7b731354049d3fb010643 SHA512 039ee4bfcd58e29a3cfa26ae7f2bc8aed7c289119476bb8f8486006910cf6a2127ba49f7526fac887392ca9e5320fb1a59ba068834e162348905423908b0755a
 DIST freedroidRPG-1.0rc2.tar.gz 233852127 BLAKE2B c87c2314d17037873acf4fc24ce20790c9ec40c8f7b1ea27e6ab9c543abb671bc50b3ff5b86900f7111d1f1a899213dcb90529d2e39918801c9cc3a42585f02e SHA512 a79afdb089691dd59b0128f34f7068c69fac8c057a0485bca3275f4914b1c9c0f21cbb9102ecdc99911b70456c078dbdeb8981fd7714836cd9535677bcc4d1e7
 EBUILD freedroidrpg-0.16-r1.ebuild 1781 BLAKE2B 4ab53881ba87e23fd60353a9f303eb321ca9cfddec398c5e43dd1c51d4939803c0ce60491389c62304efa7159ce2c7452d25de27241a9131275425741c8a255b SHA512 2f4df51a1208eb76f03d830d671f8433bdb2a0c03ed99c06fb1af4e1be8e6e4c09dd566f7bf6faddf6dbf81c1c6c20e80087fbd7cd2e3fe51fbacb0d02fa90ec
-EBUILD freedroidrpg-1.0_rc2.ebuild 2307 BLAKE2B 447576b155c875c061e331e70aaf8780efc6b03b5201ab9ceba0dffb9f5ab4b2fc0ee7d54b55f85fe88b62f9f02b79bb672c8b0ea17230a517a1bb90f3054253 SHA512 b59e3da28415c3ffa8b3e4feaf1a298e3714b13e938aa2ed5636632faf8799551d19fd6417919ec78dfbb322af2be74afc1da2ee60a766cfc413c20bec31363c
+EBUILD freedroidrpg-1.0_rc2.ebuild 2301 BLAKE2B 1bcd27bf1f811a94ba6bf2eea42b89db5e61e18b01107e10958c96b4376359e544704441cb02bec9f919a268bd32a782cd37a927d2317bd525836e2b31d8a873 SHA512 211883a6e5f0aeae2b2be0bd433e57f96c371440b12d95faa989d8279de3fb9304b5837746fd5e062b85cef96a9d0b2a3942833cecc67ee7b4fe8ab9f1ca32eb
 MISC metadata.xml 1683 BLAKE2B ec2dd3f95adac5207c2c267c676487a9bce23014ae2fe5aec5c8ac29c06e943d61ebc9889a863e2045bfb9c31c871c77030567ef6759b8280f277718525bee8d SHA512 a65fc6904f206288a06e67956c56c7ff0d80ccd8bd634e6c085bbd8ed88977bec5ae5984b0e02acd1c89b403ab8bc211d697140d6f3d00a9205c1db37c2d5346
diff --git a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
index 3a65a0e316b0..a78a6e421625 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools flag-o-matic desktop python-any-r1 xdg
 
 MY_PV=$(ver_rs 2 '')
diff --git a/games-rpg/wastesedge/Manifest b/games-rpg/wastesedge/Manifest
index b5c48d08831d..b109a9be236e 100644
--- a/games-rpg/wastesedge/Manifest
+++ b/games-rpg/wastesedge/Manifest
@@ -1,3 +1,3 @@
 DIST wastesedge-src-0.3.5.tar.gz 10749912 BLAKE2B ec4cd1135cd09c92937c8749905872b635e72575662bb7c1e188281e47ec0a285045aced378659fed20942c4bc7e67f11fa95e1cf0fe220c0be0f3b6527aa754 SHA512 d4c77eb1bde2c28002e4f56a6bfa5f816ea53de7061b5e60635f15c670ff45c3a18e3316b92007f74033a62538503f14b67e1175cf22c718c22ca1021dc7af3b
-EBUILD wastesedge-0.3.5-r1.ebuild 928 BLAKE2B 595575e48351558ba975efa879eb4fd4d9fbbbbfdba7d062baf058b81209cc6ddfc01ee6dd47f993758286047ece4a7dd132cbed2527bc9603f14c63994120b2 SHA512 f757a85487292a0ef783f9f8b653ddd2a83d5c859e64c3dea27749d301ff6b2ccf5f7e34f5de4e31434f0c74d471b838b469dc05651f7747a24504c4d63f180b
+EBUILD wastesedge-0.3.5-r2.ebuild 935 BLAKE2B 6f2825755b8a62934bc3980d9fecafcbe5cb7579daa024231d241dea688dcc6c4aa3b50ac9cd29b42cb5c7ead3a09cd5f63de27f476887b22da52ee3f1a8cb42 SHA512 ed6df83766783edf213526910d84cad72ecab8b58d9f058a80541444f147904946abcd82d771b8258601532a4336f5ddbeea34b0ecf94b9459ce43ff27adbb26
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild b/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
deleted file mode 100644
index 380732ee9982..000000000000
--- a/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-DESCRIPTION="role playing game to showcase the adonthell engine"
-HOMEPAGE="http://adonthell.nongnu.org/download/"
-SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="userpriv"
-
-RDEPEND="${PYTHON_DEPS}
-	>=games-rpg/adonthell-0.3.5-r2[${PYTHON_USEDEP}]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_configure(){
-	econf \
-		$(use_enable nls) \
-		--with-adonthell-binary="/usr/bin/adonthell"
-}
-
-src_install(){
-	emake DESTDIR="${D}" pixmapdir=/usr/share/pixmaps install
-	dodoc AUTHORS ChangeLog NEWS PLAYING README
-	make_desktop_entry adonthell-wastesedge "Waste's Edge" wastesedge_32x32
-}
diff --git a/games-rpg/wastesedge/wastesedge-0.3.5-r2.ebuild b/games-rpg/wastesedge/wastesedge-0.3.5-r2.ebuild
new file mode 100644
index 000000000000..48a424de17da
--- /dev/null
+++ b/games-rpg/wastesedge/wastesedge-0.3.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="role playing game to showcase the adonthell engine"
+HOMEPAGE="http://adonthell.nongnu.org/download/"
+SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="userpriv"
+
+RDEPEND="${PYTHON_DEPS}
+	>=games-rpg/adonthell-0.3.5-r2[${PYTHON_SINGLE_USEDEP}]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_configure(){
+	econf \
+		$(use_enable nls) \
+		--with-adonthell-binary="/usr/bin/adonthell"
+}
+
+src_install(){
+	emake DESTDIR="${D}" pixmapdir=/usr/share/pixmaps install
+	dodoc AUTHORS ChangeLog NEWS PLAYING README
+	make_desktop_entry adonthell-wastesedge "Waste's Edge" wastesedge_32x32
+}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index bbdcf966ed46..ee7052d9b1cc 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
index 8402d7d24450..282b1b8717df 100644
--- a/games-simulation/crrcsim/Manifest
+++ b/games-simulation/crrcsim/Manifest
@@ -2,5 +2,5 @@ AUX crrcsim-0.9.13-buildsystem.patch 2183 BLAKE2B 2f1fb768f93e7d3db1fbd7a2a30c82
 AUX crrcsim-0.9.13-gcc6.patch 461 BLAKE2B 7e2016db5781e0158e27d999fb1d88d07dc6294740466c736a2e42eb46547fdb35ac112b6c8e93a5571103d28d6037a6acdb2be752bfb2650cc349538e72c3f4 SHA512 34bda65c0791622adb8436d08b60e6a877c2a3bbb12f93379686c39c2c572364c0fa265011bbc788229fa2ddaa3bfa3be8397d2ff98ea967f423fa3cd48465e9
 AUX crrcsim-cgal_gmp.patch 352 BLAKE2B 1a9cf7250753c1a0099dd07b5020b7c5af89dffa8387d68f71c51e21a7803ecb2395144de65915ce84cf077b522fecc5790d26190abf9673fef687d1e16f0d6b SHA512 1b8302f71e220df54b73819988f866a7e35ec6b11d271a6a57ad886372fba4eb1a02367ab9942030baf04fbeb5fa093d23e38de2614c39c2c75e76795ec69274
 DIST crrcsim-0.9.13.tar.gz 8337392 BLAKE2B ccaaf3a4255b2082fc52712d49302c7de1347b87e9489c6d859662365f1cd5af538fe76cee232aed61b0c1b68138c47a2e34e128071c3e098e20f1d51c1c409c SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab
-EBUILD crrcsim-0.9.13.ebuild 1209 BLAKE2B 909e462a8c52b7039ca8ce5a0d3aca5aa52bb21e2dca7893ee5d17f08627b444f76c13c1b8fe6ebe5e91ad3c193aa353bfbff241821dffe038eca498446a836a SHA512 cf82ae112798b1b6002adbcd379ce4288acedfed5bdd1d560b983193d876eb2afd3274437d8aff6dcaa7b544c4111708fb698c9d7109cec02c909f34e11e0f60
+EBUILD crrcsim-0.9.13.ebuild 1205 BLAKE2B 085c079e3a71f53cdfc8d89f9257cc1f5a65a4b0792141ba2e76f41a7fd511a6557c17951e655d5e747991e7d8bc8b87644b9f1f4a423117ca7600ac68c29667 SHA512 c3842dd67323d227561bc41f1db058d4237e6b7e0d218d4e8f534431ce2a9111dcb9bfcb785697aa76deca1e80d6c9d3e48a8d2ef2f2cdeb1f762e47ed3960a3
 MISC metadata.xml 330 BLAKE2B 24c61e826448ee0ceecc562776289a0a80c259c718cce5dc0f23523b5091a329933eb6a98c46ecd038b856db3f1d86588d82d62924b5d40dd0ee64c569c1e9ff SHA512 a57fe17fafb1d4cca975665b68283233a1f6b62e25bf903cd5ef7954572f3963471d453da9c569044405ab005105f6d35ae28b679d35eebd01ba61d0166349c8
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
index 4d20e437844b..2345ffb53a16 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -37,8 +37,8 @@ src_prepare() {
 src_configure() {
 	econf \
 		--datadir="/usr/share" \
-		--datarootdir="${EPREFIX%/}/usr/share" \
-		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
+		--datarootdir="${EPREFIX}/usr/share" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_with portaudio)
 }
 
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 632da9cbf15a..f38bed658847 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -2,6 +2,6 @@ AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2d
 AUX flightgear-2018.3.2-cmake.patch 1322 BLAKE2B 4b68e744cf0cd7ea9582025980d055f8def5d5d1c82cabf133d4d1f9e35d501e28fdba1fca51ed409caa6398043fa52a82f68f77ce8f34a3f0a3ce45fa526352 SHA512 5ae183a04df6f12e23e87649210249a0857d5915aba40198507d2e45ee6fba6b997575df40457cb8e214b9fe9f4b81f4bec8fadb3875f1bbebf0c3181ba4fce3
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2019.1.1.tar.bz2 8440986 BLAKE2B da387456aaa6e8b86a8a865989f40c6bbcef4bf378175628c26fb172161cc3b278e4b16a3a270b7ed7fcf70329a88754c9a875a14f919fa90f284a485c909cce SHA512 edcc464af0bde4766e61137211276d77a6bb297567b0168dfaf3b97fdb9a595e5e8a0b84232680fcc975cf195261b9751edb79ae73123333feb31ab3d7215d8c
-EBUILD flightgear-2019.1.1.ebuild 4327 BLAKE2B 71b5479c5f2d082e765e9ec235e11c16c501430d6ae87f5b573fc94fc53e86067a80671f03b062f4823dfd961fb674199d2afa1a0195bf0d09a05c6bd95094a9 SHA512 5c02a2cdf92c826d55882983c863c0bcc623b333fd2d9235aa99a9ded4404ea9efdf9f4d6a53e0ef8c0301c6471124451494db2a91a20eb879b4c4fb7d7637ba
-EBUILD flightgear-9999.ebuild 4358 BLAKE2B 99e4fc1717e36ff393fb23de058daeca6b1837b224daea3cd0e2515b9d16f305e262e64ab4ff30ec6d88c6eed5d1c047e6be460f01eb9aef951f96aaea03411c SHA512 c443982a2dc2b33a4b3db3976ca2c6bb997fef4c0b51c290f6438a8a0a64bbd1064992a8766a13a23647395d76fbf99d01cd92599a19c5190e2628dfb83bf085
+EBUILD flightgear-2019.1.1.ebuild 4373 BLAKE2B afea502ee7e1ebc2dda52a53a89b66d5fe4db011d711cb9c4582fa2addc7cbb0c057f73c522708f2cf6fd11ffedc1e42e676e26c595bb52c0c1d43d9eb01c4fb SHA512 ca8d29f60f4a54085f1997ec5824f4bfb87537a390f1d4bcad66275a01a7f400675163059d91026450e80d92398dfa84005242db1a010bac31e67d429d13e9c9
+EBUILD flightgear-9999.ebuild 4404 BLAKE2B ffb54ae7eabdd3a14856a3fe990efe3413a3f095389f2bb4d711ddf931e44d66e50382e46e14f598b5889f94cb2724c87963bf45b4353f8f462bb59533e80f4b SHA512 a7bfc2131c1ba2de71ccaf3b9336d03ed33018e2724e0db676adf9550826264041c0915a9bd4be48234324375bfba53c0da413aeadbf575fcc089f8f6062ef4e
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/flightgear-2019.1.1.ebuild b/games-simulation/flightgear/flightgear-2019.1.1.ebuild
index 5eb17e2184a5..a8847f1ad50a 100644
--- a/games-simulation/flightgear/flightgear-2019.1.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2019.1.1.ebuild
@@ -92,6 +92,8 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=OFF # see CPU_FLAGS
+		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_TERRASYNC=$(usex utils)
 		-DENABLE_TRAFFIC=$(usex utils)
@@ -114,7 +116,7 @@ src_configure() {
 		-DWITH_FGPANEL=$(usex utils)
 	)
 	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+		append-flags -msse2 -mfpmath=sse
 	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 6303c1ab598d..ce6c889aeb77 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_BRANCH="next"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
+IUSE="cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax"
 
 # Needs --fg-root with path to flightgear-data passed to test runner passed,
 # not really worth patching
@@ -81,7 +81,6 @@ src_configure() {
 		-DENABLE_FGELEV=$(usex utils)
 		-DENABLE_FGJS=$(usex utils)
 		-DENABLE_FGVIEWER=$(usex utils)
-		-DENABLE_FLITE=OFF
 		-DENABLE_GDAL=$(usex gdal)
 		-DENABLE_GPSSMOOTH=$(usex utils)
 		-DENABLE_HID_INPUT=$(usex udev)
@@ -94,6 +93,8 @@ src_configure() {
 		-DENABLE_PROFILE=OFF
 		-DENABLE_QT=$(usex qt5)
 		-DENABLE_RTI=OFF
+		-DENABLE_SIMD=OFF # see CPU_FLAGS
+		-DENABLE_SIMD_CODE=$(usex cpu_flags_x86_sse2)
 		-DENABLE_STGMERGE=ON
 		-DENABLE_TERRASYNC=$(usex utils)
 		-DENABLE_TRAFFIC=$(usex utils)
@@ -106,8 +107,8 @@ src_configure() {
 		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
 		-DSP_FDMS=ON
 		-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
-		-DSYSTEM_FLITE=ON
-		-DSYSTEM_HTS_ENGINE=ON
+		-DSYSTEM_FLITE=OFF
+		-DSYSTEM_HTS_ENGINE=OFF
 		-DSYSTEM_SPEEX=ON
 		-DSYSTEM_GSM=ON
 		-DSYSTEM_SQLITE=ON
@@ -116,7 +117,7 @@ src_configure() {
 		-DWITH_FGPANEL=$(usex utils)
 	)
 	if use cpu_flags_x86_sse2; then
-		append-flags -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize
+		append-flags -msse2 -mfpmath=sse
 	fi
 	if use gdal && use utils; then
 		mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index c5a28d451211..13db3ea56d1b 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,4 +1,4 @@
 DIST endgame-singularity-music-007.zip 51774799 BLAKE2B 78595b16e422d2312be860686aca9401f6f1eed35fe40dbbc3a3999b1feb5e32aa6d51a66d94c9241aca2b6606bb7135491298b94c8033a1437c2cd7b23f9120 SHA512 ab46e77c833085f0c5b1b46fef72ab807e79ca422ad043ef67a4bf4384cb0177319f21b4bd01496e6c3fc6fe9a2f36ec256e19f0e829ad7bf9f0c5bd38bf0fe5
 DIST singularity-1.0a1.tar.gz 1927083 BLAKE2B aeed099dd33c135f5b2e21f5e907646f32aaa0879a1b2e1f09c19045499ae52b004a8f52fee72bfe0977805899e4c7cdff6abf36e9fd3604f73cba7e395c265e SHA512 8ce624a50819e0abc04fd81a1d7658eab64ea8325de0a5790ec2a92e5fa6b62cfef8fe705fe8b209194c05927e3cf5adfc6f48934e0a70edf8b251c24084fc25
-EBUILD singularity-1.0_alpha1.ebuild 1244 BLAKE2B a713c6bb60a887afde322b73483c8d387b7ea4d23a5b294cfbaa6c7513c49f1356ec4200057abeebb3c590c5dded3872da0954c36c14b5a72146bb7a1519f9fd SHA512 805522acd2b6812cc98da1ba53b0bd7710906073ff1ef168e7b3a9baca300ce96bb14d696e1b46ee604e641700b377899ec9a287d7bdf0980b30d0afa9cd3092
+EBUILD singularity-1.0_alpha1-r1.ebuild 1294 BLAKE2B 2b620f4eb89cd9974670f4cf3fc78538aa7df113dc2c43df0020d25501161761cf27215cf7a7a6b15072e9442f52adfa8907ff1cf078dae899d2e5f4eb3588de SHA512 cfb5fb0a506e1057a1b1478e853e5f589943a272eee4dec59f4426f826db43e356a10c399dacd7ddd7f9022a89a78536286d8c6d12cf495b762d50c1c57c2704
 MISC metadata.xml 342 BLAKE2B 599486446074178c42f941d12e8babc285e015798d4c925f93d52040278ebba1d538223639d0d03d387901fbf216d0adb5c514f2a49318da3571509e03b52ec5 SHA512 558b706d3e1ac877859ef93f34cebbca1e477a8dc92ef7448b288c8794fc8ae9e5a62b54e9ec8f553637db7a6b051c3908c036bf704bcbd4d44a030aa7fde983
diff --git a/games-simulation/singularity/singularity-1.0_alpha1-r1.ebuild b/games-simulation/singularity/singularity-1.0_alpha1-r1.ebuild
new file mode 100644
index 000000000000..644b755a6c29
--- /dev/null
+++ b/games-simulation/singularity/singularity-1.0_alpha1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop eutils python-single-r1
+
+MUSIC="endgame-${PN}-music-007"
+DESCRIPTION="Simulation of a true AI. Go from computer to computer, chased by the whole world"
+HOMEPAGE="http://www.emhsoft.com/singularity/ https://github.com/singularity/singularity"
+SRC_URI="https://github.com/singularity/singularity/releases/download/${P/_alpha/a}/${P/_alpha/a}.tar.gz
+	http://emhsoft.com/singularity/${MUSIC}.zip"
+
+LICENSE="GPL-2 CC-BY-SA-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+		dev-python/polib[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${P/_alpha/a}"
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${PN}" "${PN}.py"
+
+	python_optimize "${ED}/usr/share/${PN}"
+
+	insinto /usr/share/${PN}/${PN}/music
+	doins "${WORKDIR}"/${MUSIC}/*
+
+	make_wrapper ${PN} "${EPYTHON} ${PN}.py" /usr/share/${PN}
+	dodoc README.txt TODO Changelog AUTHORS
+
+	domenu "${PN}.desktop"
+	newicon "${PN}"/data/themes/default/images/icon.png "${PN}.png"
+}
diff --git a/games-simulation/singularity/singularity-1.0_alpha1.ebuild b/games-simulation/singularity/singularity-1.0_alpha1.ebuild
deleted file mode 100644
index d54f147ac48d..000000000000
--- a/games-simulation/singularity/singularity-1.0_alpha1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit desktop eutils python-single-r1
-
-MUSIC="endgame-${PN}-music-007"
-DESCRIPTION="Simulation of a true AI. Go from computer to computer, chased by the whole world"
-HOMEPAGE="http://www.emhsoft.com/singularity/ https://github.com/singularity/singularity"
-SRC_URI="https://github.com/singularity/singularity/releases/download/${P/_alpha/a}/${P/_alpha/a}.tar.gz
-	http://emhsoft.com/singularity/${MUSIC}.zip"
-
-LICENSE="GPL-2 CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/polib[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${P/_alpha/a}"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r "${PN}" "${PN}.py"
-
-	python_optimize "${ED}/usr/share/${PN}"
-
-	insinto /usr/share/${PN}/${PN}/music
-	doins "${WORKDIR}"/${MUSIC}/*
-
-	make_wrapper ${PN} "${EPYTHON} ${PN}.py" /usr/share/${PN}
-	dodoc README.txt TODO Changelog AUTHORS
-
-	domenu "${PN}.desktop"
-	newicon "${PN}"/data/themes/default/images/icon.png "${PN}.png"
-}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 55d4169bb3de..cf5ba2e3f859 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
index af53de9e725b..97455e1309e2 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -2,7 +2,7 @@ AUX freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch 1030 BLAKE2B d0b4a58e8
 AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
 DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
 DIST freeorion-0.4.8_p20190501.tar.gz 106506540 BLAKE2B 5442eeeaff486a5525b4282c7ef72001a935c4429fea89a720f94a033a2c29e56855605376efe22d13194ae3f49105fe26f37554d2c8d560bfb76dc69d738128 SHA512 d378c0e9b63118261bf5ac1c99190929ff0cd52b3a270e43fe2be80cc7993457bcc7b70083ff493a6b96b250e1988e40470bef410af5ce3d49644ccf934974d3
-EBUILD freeorion-0.4.7.1-r4.ebuild 1811 BLAKE2B 8fb0d60828dfb967a9115202062e262c72553ffedb2549aa10249d242da80f4a65c8a7b4190f4e5677709b40f4f6938f4ba26a78fb461e4a376f9fe7aea9b015 SHA512 a0f9cd75e48170d9b66e0a51af2d4c5e155c08451b65ac88f8842c86b6b470a4732b6592047f48878122f9032b8264e9a7633c50c1ef17bb8c1fe1c05d5f9ce0
-EBUILD freeorion-0.4.8_p20190501.ebuild 1725 BLAKE2B 4c23ba5d2a30ab8ff85f5bf6766c1fd610e29c08e7d9544255afea91ea12213f2e8e1afe9e4f9329d85d7441ca390f5eef6e91487fe158631bfad8d5a7263391 SHA512 511c32e97b8ffd149d26ffd154e280f765069e024f55c1a80d323cb693ee190399061f0cc3bfb9eb77febc67334c4294b4b48e824d6f21284b0114be8cb6bdc9
-EBUILD freeorion-9999.ebuild 1725 BLAKE2B 4c23ba5d2a30ab8ff85f5bf6766c1fd610e29c08e7d9544255afea91ea12213f2e8e1afe9e4f9329d85d7441ca390f5eef6e91487fe158631bfad8d5a7263391 SHA512 511c32e97b8ffd149d26ffd154e280f765069e024f55c1a80d323cb693ee190399061f0cc3bfb9eb77febc67334c4294b4b48e824d6f21284b0114be8cb6bdc9
+EBUILD freeorion-0.4.7.1-r4.ebuild 1844 BLAKE2B bd5c77199e91d7d87b54b50ec372e583e4adc24c4b31847a1d08c63898eac39f61b7d5102e756afc68975eb37c92e3a64e3669bb03c27e0abfe171655781e4ac SHA512 654abb21694b545c4c56519ea3e4f31a7611b640948f41298b4fcd79dd884ce642200e9bdf8b4b89f519168b336319cee793a6a4f8a4e9909a8d1febc4e2664c
+EBUILD freeorion-0.4.8_p20190501-r1.ebuild 1761 BLAKE2B 24e639af83c5d49f01857fb8b8fa217388cf9c97e2477e0bcb46986e77c1acffaead0806f18059fa426714780b369aa550cefe80d455f4789ae084d312b91939 SHA512 26e59e43665b20999b41df5d0866301939452f83d94f521fbe8a92aeccde8954548d9f61581755c507ec02f33f97213f17a987bef9584131b9e47761553e5b73
+EBUILD freeorion-9999.ebuild 1761 BLAKE2B 24e639af83c5d49f01857fb8b8fa217388cf9c97e2477e0bcb46986e77c1acffaead0806f18059fa426714780b369aa550cefe80d455f4789ae084d312b91939 SHA512 26e59e43665b20999b41df5d0866301939452f83d94f521fbe8a92aeccde8954548d9f61581755c507ec02f33f97213f17a987bef9584131b9e47761553e5b73
 MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
index e827e00ef9ec..3811c4a25749 100644
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,9 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.56:=[python,threads,${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/freealut
 	media-libs/freetype
 	media-libs/glew:=
diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild b/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild
new file mode 100644
index 000000000000..5bf1f6f4f99a
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.8_p20190501-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 xdg
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="https://www.freeorion.org"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
+else
+	KEYWORDS="~amd64"
+	if [[ ${PV} = *_p* ]]; then
+		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
+		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${COMMIT}"
+	else
+		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${PN}-${PV/_/-}"
+	fi
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE="dedicated"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.58:=[python,threads,${PYTHON_MULTI_USEDEP}]
+	')
+	!dedicated? (
+		media-libs/freealut
+		>=media-libs/freetype-2.5.5
+		media-libs/glew:=
+		>=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
+		virtual/opengl
+	)
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	# build system is using FindPythonLibs.cmake which needs python:2
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "s/-O3//" -i CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_HEADLESS="$(usex dedicated)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
diff --git a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild b/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
deleted file mode 100644
index 3aea6bd3b5d9..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.8_p20190501.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1 xdg
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="https://www.freeorion.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	KEYWORDS="~amd64"
-	if [[ ${PV} = *_p* ]]; then
-		COMMIT="2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77"
-		SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${COMMIT}"
-	else
-		SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN}-${PV/_/-}"
-	fi
-fi
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE="dedicated"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-libs/boost-1.58:=[python,threads,${PYTHON_USEDEP}]
-	!dedicated? (
-		media-libs/freealut
-		>=media-libs/freetype-2.5.5
-		media-libs/glew:=
-		>=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
-		virtual/opengl
-	)
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_HEADLESS="$(usex dedicated)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
-}
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
index 3aea6bd3b5d9..5bf1f6f4f99a 100644
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ b/games-strategy/freeorion/freeorion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 RDEPEND="
-	>=dev-libs/boost-1.58:=[python,threads,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.58:=[python,threads,${PYTHON_MULTI_USEDEP}]
+	')
 	!dedicated? (
 		media-libs/freealut
 		>=media-libs/freetype-2.5.5
diff --git a/games-strategy/gwp/Manifest b/games-strategy/gwp/Manifest
index e00be7db2e04..025bfc6661da 100644
--- a/games-strategy/gwp/Manifest
+++ b/games-strategy/gwp/Manifest
@@ -1,5 +1,5 @@
 AUX gwp-0.4.0-exec-stack.patch 2842 BLAKE2B 7ab54e843e6b19768f433cae2898e7d9df7380996dc1e2afab8d9d3cf3ce081beef247d12234622e23fe6508aef21f3aecda5f4bc9744be6e9051eabc2aa8751 SHA512 b6845071c5639e4d240742e7470de4723e534814b670e8b98b1971c6e1ae2a64a8d4b8ffaf86ef28bdf3ad6d861dfeee5e2c5e46c43ea955614999fbed46da96
 AUX gwp-0.4.0-gcc41.patch 4100 BLAKE2B 656a9a6b514bd78e61b48a0f43e4230e8164107939c790d599398a0be213383f4f367e9c109cb3935b4a6a150034306f453a72356a2ea408e15e70ffc96ca16b SHA512 0e3acd8978f3a6f1585ad45c2d04c97282daa9173b6d67807d473d79bbc665be4a3471537139e9d710832afeff5e6aa4a3064c3cc36cfe3beba012f330530f31
 DIST gwp-0.4.0.tar.gz 2294453 BLAKE2B 75a688a00b3411c577e6eaae500d15963efb1c96edd82a50863239225fba2d653b52becda8ae71dbe5b88910382d1c64456fc13899e559d3aefefb6bed1e7da5 SHA512 dcb23bb49929bc01129ab5f02b56edb7f775feb0c37bd7613277af8aa0f4b47667f95413725f74a2b83b60159555a50fcabdc8736094aad0684b03cd150b4957
-EBUILD gwp-0.4.0-r3.ebuild 1312 BLAKE2B 7d64a2d61eb2e6359710ea46d8a9e43f08892407cdf9ee8ac6d62681ee29e7d66b11b0aaf0c4c7a78857a6c0e6e46cf16448b7c57f8043246d68d2f084f65cb4 SHA512 6df424a66ea2d011eeeb4b80373f0aeb343f1a12ae56c3a1896d33e16ee4861516ddbf6861878587edf274570bed0555044a6126cf3620e6063571ceab2d24e1
+EBUILD gwp-0.4.0-r4.ebuild 1348 BLAKE2B dcc51746fea6ee4e07e0149f8c9a9af9658e299d259abb883ee03f467d9b8107b0c94d8c640af6a1bc48eb99a2b2c327995adeb3f3bc8271d013245c5c3d0b39 SHA512 4b48d8621ddbdbed4160b6906cd1f91154139f8f7c51396f29719ad0aebcf33038ed9eb2a5f3609411b5cd14666e12356700d813b885d4e7e84fcb24c4444121
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/gwp/gwp-0.4.0-r3.ebuild b/games-strategy/gwp/gwp-0.4.0-r3.ebuild
deleted file mode 100644
index f9a4fa227439..000000000000
--- a/games-strategy/gwp/gwp-0.4.0-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic gnome2 python-single-r1
-
-DESCRIPTION="GNOME client for the classic PBEM strategy game VGA Planets 3"
-HOMEPAGE="http://gwp.lunix.com.ar/"
-SRC_URI="http://gwp.lunix.com.ar/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/libgnomeui
-	gnome-base/libglade
-	app-text/rarian
-	dev-libs/libpcre
-	nls? ( virtual/libintl )
-	opengl? ( x11-libs/gtkglext )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pygtk[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	append-libs -lm
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-exec-stack.patch
-	sed -i \
-		-e '/ -O1/d' \
-		-e '/ -g$/d' \
-		src/Makefile.in || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable opengl gtkglext) \
-		$(use_enable python)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog CHANGES README TODO" \
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/gwp
-}
diff --git a/games-strategy/gwp/gwp-0.4.0-r4.ebuild b/games-strategy/gwp/gwp-0.4.0-r4.ebuild
new file mode 100644
index 000000000000..86e8f30a76bb
--- /dev/null
+++ b/games-strategy/gwp/gwp-0.4.0-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic gnome2 python-single-r1
+
+DESCRIPTION="GNOME client for the classic PBEM strategy game VGA Planets 3"
+HOMEPAGE="http://gwp.lunix.com.ar/"
+SRC_URI="http://gwp.lunix.com.ar/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls opengl python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libgnomeui
+	gnome-base/libglade
+	app-text/rarian
+	dev-libs/libpcre
+	nls? ( virtual/libintl )
+	opengl? ( x11-libs/gtkglext )
+	python? ( ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	append-libs -lm
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-exec-stack.patch
+	sed -i \
+		-e '/ -O1/d' \
+		-e '/ -g$/d' \
+		src/Makefile.in || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable nls) \
+		$(use_enable opengl gtkglext) \
+		$(use_enable python)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog CHANGES README TODO" \
+	gnome2_src_install
+	rm -rf "${D}"/usr/share/doc/gwp
+}
diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
index 8a3e3026011e..a5a268d8f4e6 100644
--- a/games-strategy/lightyears/Manifest
+++ b/games-strategy/lightyears/Manifest
@@ -1,4 +1,4 @@
 AUX lightyears-1.4-gentoo.patch 1280 BLAKE2B fd247d049fe7e32264a0d86ffa06f37ca8a8ffb4fd7b5651adce2008f089b1b83758286b46e33555c61b4a62fb79e6ed93475bf51aff599117fc5eedbfe70680 SHA512 4a8770b29c7aa8b489a8afaac7ba3ec9a2efc1466f6263f35ee531a8e4498a1490080bd390a87309983d62ac0d3a722421058d671c32c7cda91bcc6a94d81be3
 DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
-EBUILD lightyears-1.4-r3.ebuild 1113 BLAKE2B d85187fbb3ea6e6d7a5bd03c3baa409d3ab839825ed66cf7c8b8e0577513fa9e01b72a4fac04ad5216d5a8de53c6a24b3e1a93f164001d88c6c44d9a986d0e41 SHA512 8568b59351e3a2f1fd6149b0796187d026e0a6dd42781b6a75bd6f997c46f36317d0d390f17e886382f99a85b25996d7a9b44bb4ce759b88901f8ba8e113134a
+EBUILD lightyears-1.4-r3.ebuild 1149 BLAKE2B b6a3ceb7e90e36a592f9f453e7f912260c4c734c3ac994035eed763e1da81546df9ece9cce210c009ca53c46a467217b0201fe17e702f638c6905c3c55d1bc6a SHA512 c46b3c155b32fc207717ce5c1cc5b6b062edc9817a147e92a3ec75aa60c844963ebfd23ee8b1e823cfddd01faec4377ca801a8183685a34fbc7bd8dbd7169c18
 MISC metadata.xml 457 BLAKE2B 7f250bdb961fe6d994ebc983f8dfaf3cbe7c4763b766fbcbc199b2db3f33ca273136e827adece324f4c00b611521882b932a1750a372258e0d52daf691a2c1bb SHA512 354fad5eed1305fc7e5ed69de92f7033b651371a1993ccd90d3d6fd9f49975e30e8b5b4c8cfcf8bb6f1284b5ef0df790adf863f76f580945ff3699ff275d5c13
diff --git a/games-strategy/lightyears/lightyears-1.4-r3.ebuild b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
index 4d4cfa964e45..e0e5bb0741d9 100644
--- a/games-strategy/lightyears/lightyears-1.4-r3.ebuild
+++ b/games-strategy/lightyears/lightyears-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,9 @@ KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${RDEPEND}"
 
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
index aa0a4b1f7679..d83273039420 100644
--- a/games-strategy/openra/Manifest
+++ b/games-strategy/openra/Manifest
@@ -11,5 +11,5 @@ DIST SharpFont-4.0.1.zip 151532 BLAKE2B 3745959e449b0745b5cd1c20a9653595ce2166f4
 DIST SharpZipLib-0.86.0.zip 463599 BLAKE2B 5d6374c5daef33afc1faf814992df1ef7001b593594a022657406ac8ce67ac5e00f71cfe9365c4acab2925ef458f9add83ec62dd22e4db74e17efdd1e1091542 SHA512 70ac4a39b599a37ff45733477ba1afb4caee177262b72037998b7eb08a737177f8689bb690759b8090d25b9d408ba8c84e56bec3509997adde62724fcfcdc2b5
 DIST openra-20190314.tar.gz 24551126 BLAKE2B ed6289bbfab9f55aa88ac834dab3a2bab4cea3cb5a3b6934e24feb78bea1df71d839d4434242df666cda6180027a8e6d5b7766b6155ab2e85a4ee639a7950e12 SHA512 a16884cf626a31b3cf21662c307aef505bfcf6d34330f09b10510aa6c88d9d1026f17f2037565827fc95148776b0651fe0559c65db493295957df428793b2d71
 DIST rix0rrr.BeaconLib-1.0.1.zip 17989 BLAKE2B 2a65c9276b725ac6c433eb2cf6e4a13d6e5c07446dbff1e096b100a20eebb2a432c81cfbc13c11fdf672fbd37eb5985497b3fa425a317afe39049a6a967e3a7e SHA512 4fe4c6dfd7ad0f7eb5549c66fe53cd38f74026a8202d3553481bdfdab8ce0788f8b31f05092d93f9751a687badf75a1ec22da201235f2e505893192bb371367f
-EBUILD openra-20190314.ebuild 4892 BLAKE2B 5985d5088bcd3d4c47e558cd19cd0939a941044802d7385d8855a046622337fa5396717b28ffa2700959a7b8514aac71301a2240e35617304a34e053cba410f6 SHA512 8302a6a869ccd4d9689bb6d69cdb0d91bbbf8daa6834d657a09a3f12d9ff70dc59f544a6c51fc030b9384a17c361be5988a758eeb79673e38900c88317de90d9
+EBUILD openra-20190314.ebuild 4890 BLAKE2B 877cefcb68e02b8b157129742462b6496d97e6ab4da74888130bae6e792244cde20c73dee09e23df64d9023a4eb39099581b4e36172564fe2fb9e73661d7c662 SHA512 7378160370f968e5fa937162f7d6e7bce70f5dfbf960c86b177b7e2da8b24d5bdea5c33e3dfd08d6694681d704aa18bda397e5c3af1fa3c4cf03b32dad320aa7
 MISC metadata.xml 507 BLAKE2B 41509ed4d51adffd4aaf548f986ff19ccdf2b382e6265eeca268ccf693fcbf47468fad4ba1fcafb73f2a7fd5893942944f4118ca3b388a2b9299fd9130621d5e SHA512 ffeb53c6a7368c79336656bee82ea41fcdec13ef68f22e70a2ef70b5ba644ae1ad3832406cf54c7afd888ebe3357d2530528f39b07d515b813cf090248fa5186
diff --git a/games-strategy/openra/openra-20190314.ebuild b/games-strategy/openra/openra-20190314.ebuild
index b35f7f76047e..0d1505471e2f 100644
--- a/games-strategy/openra/openra-20190314.ebuild
+++ b/games-strategy/openra/openra-20190314.ebuild
@@ -156,7 +156,7 @@ pkg_config() {
 	cert-sync --quiet "${EROOT}"/etc/ssl/certs/ca-certificates.crt
 	eend $?
 
-	if [[ -n ${ROOT%/} ]]; then
+	if [[ -n ${ROOT} ]]; then
 		echo
 		ewarn "Mono's cert-sync cannot write to your ROOT system so you must manually"
 		ewarn "copy the certificates from ${BROOT}/usr/share/.mono to ${EROOT}/usr/share/.mono."
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index c1dfa6cca67e..f8e3adb9da25 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 3290166f0762..987881ff309e 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -3,7 +3,7 @@ AUX pyfa-2.9.3-import-pyfa.patch 666 BLAKE2B 13b67511a64be93335453b617e1fad56768
 AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
 DIST pyfa-2.14.1.tar.gz 14452477 BLAKE2B e4c688cff14eecaa71f86fb9e22f6a585a3136a4bd7df65c8dd65ed82c2aa9e530210134daaba25251df92dc55a7e538474b39c1d54e4bcb1817eac17791d517 SHA512 d3d3219fa37f44c81d85165c7e780261e149b47db147417ea26edaff448484ce565607aded714a4f44ca23b8c1586c8597ace856020c4c319cea6d39f353b140
 DIST pyfa-2.15.1.tar.gz 14516568 BLAKE2B ba3b1170f35681ab33bece447b4bdf563c8f964037dc6b35cbd23360f7e36c61dd9074e34b5648c7a04b59ad192f5babd75ce2a935940a52e62de8cc174f7e5b SHA512 2d8fcb8608e31c135b8dac7239afe0a5acb0d32fba1291ce6ebafe093ef232c08f0aa42d172ebac5beefb7dba47aad9eb3833c679e3d02edc9cc056739c7538b
-EBUILD pyfa-2.14.1.ebuild 2657 BLAKE2B a5df3021d46db87e386fd609bbc31de973d724995a8aa0493ed8960670a6b3e92704d9a5a7b1691cf95228d062bdd6638385fb2295c3b8e224a95574c1356599 SHA512 74a1637f9c86bacda4713e1ed1cced990f05a6d7aa0d34d62ee153ce197490d6f73c936a551ca68bc19ce4fe9b25fd32e4f7cc3239deaa734179190e96f707b2
-EBUILD pyfa-2.15.1.ebuild 2637 BLAKE2B 15f7df9668597799c55c7d11d4537e0e2a46cceae8e75fc0a4db84148f3119c277a72e13437ffb6cffde95aa6fb3568de40339e54826e4b1650ba891fb76f0ee SHA512 d2c37266541e982b2398797b4e09b1864c4ec3abfc1756e56a90eab6a9c6e3ce841d7fb6da2373f67e8b4d354f4c79b723a60062fcd9ac83c9077df65d567d9a
-EBUILD pyfa-9999.ebuild 2637 BLAKE2B 15f7df9668597799c55c7d11d4537e0e2a46cceae8e75fc0a4db84148f3119c277a72e13437ffb6cffde95aa6fb3568de40339e54826e4b1650ba891fb76f0ee SHA512 d2c37266541e982b2398797b4e09b1864c4ec3abfc1756e56a90eab6a9c6e3ce841d7fb6da2373f67e8b4d354f4c79b723a60062fcd9ac83c9077df65d567d9a
+EBUILD pyfa-2.14.1.ebuild 2807 BLAKE2B 0ac7d54fa394babc6ce843b428786c76952f2ede30e38f691d33a6b60aeb2a20f1e1ef79b8de5e299db5f8761b6b8628044ab71cbbc330feb2a78e4b2d95305d SHA512 5fe53304f63f11edaab725003a8cf61e1143b7a15894f438b27ee129e5fae553a39c797d38ecde201143fb774aff5fb8ea40d0791fb293f4a6a6d8c1b720be63
+EBUILD pyfa-2.15.1-r1.ebuild 2786 BLAKE2B f581cab4f597f217540ece2b71c59bb0c29e90cdb10d451ff30d5d50bfdd59ada3b5cc808f41c3359ca600d6b20476ca91c74ccbec85716a581a6a9582639857 SHA512 3d12fcecbd06b437ddbab27a6610bf40e4d7058c14c58ef6d74103b8f54fd189866dd466bfe72c448f7d8e86490d33e1804b5bd30848105781fc88da6eafb3f4
+EBUILD pyfa-9999.ebuild 2786 BLAKE2B f581cab4f597f217540ece2b71c59bb0c29e90cdb10d451ff30d5d50bfdd59ada3b5cc808f41c3359ca600d6b20476ca91c74ccbec85716a581a6a9582639857 SHA512 3d12fcecbd06b437ddbab27a6610bf40e4d7058c14c58ef6d74103b8f54fd189866dd466bfe72c448f7d8e86490d33e1804b5bd30848105781fc88da6eafb3f4
 MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/pyfa-2.14.1.ebuild b/games-util/pyfa/pyfa-2.14.1.ebuild
index e3c4bc186500..51e160ed66cc 100644
--- a/games-util/pyfa/pyfa-2.14.1.ebuild
+++ b/games-util/pyfa/pyfa-2.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="mirror bindist"
 
 DEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}]
+	')"
 RDEPEND="${DEPEND}
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-	graph? (
-		>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
+		graph? (
+			>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}] )
+	')
 	${PYTHON_DEPS}"
 BDEPEND="app-arch/zip"
 
diff --git a/games-util/pyfa/pyfa-2.15.1-r1.ebuild b/games-util/pyfa/pyfa-2.15.1-r1.ebuild
new file mode 100644
index 000000000000..5c6b262d499b
--- /dev/null
+++ b/games-util/pyfa/pyfa-2.15.1-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit desktop eutils python-single-r1 xdg-utils
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+LICENSE="GPL-3+ all-rights-reserved"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/Pyfa-${PV}
+fi
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')"
+BDEPEND="app-arch/zip"
+
+PATCHES=(
+	# fix import path in the main script for systemwide installation
+	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
+	)
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
+
+	default
+
+	# make python recognize pyfa as a package
+	touch __init__.py || die
+
+	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+		-e "s:%%EPREFIX%%:${EPREFIX}:" \
+		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
+	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+		pyfa.py > pyfa || die
+}
+
+src_install() {
+	python_moduleinto ${PN}
+	python_domodule eos gui service utils graphs
+	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
+	python_doscript pyfa
+
+	insinto /usr/share/${PN}
+
+	einfo "Creating database ..."
+	python ./db_update.py || die
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/games-util/pyfa/pyfa-2.15.1.ebuild b/games-util/pyfa/pyfa-2.15.1.ebuild
deleted file mode 100644
index 68be8d9f02ce..000000000000
--- a/games-util/pyfa/pyfa-2.15.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit desktop eutils python-single-r1 xdg-utils
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/Pyfa-${PV}
-fi
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror bindist"
-
-DEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND="app-arch/zip"
-
-PATCHES=(
-	# fix import path in the main script for systemwide installation
-	"${FILESDIR}/${PN}-2.9.3-import-pyfa.patch"
-	)
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmap_loader.py service/settings.py
-
-	default
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced-1.15.1.py" > configforced.py || die
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		pyfa.py > pyfa || die
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	python_domodule eos gui service utils graphs
-	python_domodule config*.py __init__.py version.yml configforced.py db_update.py
-	python_doscript pyfa
-
-	insinto /usr/share/${PN}
-
-	einfo "Creating database ..."
-	python ./db_update.py || die
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 68be8d9f02ce..5c6b262d499b 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -25,21 +25,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="mirror bindist"
 
 DEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/wxpython-4.0.4[webkit,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cryptography-2.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/logbook-1.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/wxpython-4.0.4[webkit,${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
-	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown2-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.8[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/roman-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown2-2.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/packaging-16.8[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/requests-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/roman-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/matplotlib-2.0.0[wxwidgets,${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')"
 BDEPEND="app-arch/zip"
 
 PATCHES=(
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
index e08e72e89586..be714d76c2af 100644
--- a/games-util/xboxdrv/Manifest
+++ b/games-util/xboxdrv/Manifest
@@ -4,5 +4,5 @@ AUX xboxdrv.initd 446 BLAKE2B f78cf4af5cca703efc0a480c2ba34b0189d2b86a64aa89533e
 AUX xboxdrv.service 371 BLAKE2B afd5f5397f4ae15af69d8e12865201fe159691ba2a36c00fe207304afe5126814fafd0394e7618e9f4d27611bd2c0dd7371717c7a07a57d27c3a4ab8e6e40140 SHA512 80e7657edae9c771740628ef5f9752b79d50288ead33afe97e71ffc6e7d7c24343eeb213668cdc823b28742976e2e56f4defdcd823716897f3262be1fc7832e9
 AUX xboxdrv.udev-rules 251 BLAKE2B 5a3af6d378b2d6ad5bb2da0dfa356c6939a274b194f075281bbfc3dcaee1c5b9fc63740bbfec2ecd0c8245065262a0449c47fad6c522e4773ef2e193018dc95f SHA512 131c90bee6ac4da5e3d51c7212abb362a540092db97af56332cdfe14e836c84c97727823462ea378da6e5544fda2fb4d36fbe00b6210e5663316f914eaa3f4ad
 DIST xboxdrv-0.8.8_p20190118.tar.gz 322541 BLAKE2B ffa1021f974414ab9efebccf89e8be9137647ba7e1adf3bc9dad3b17b362b340f087fdac42c9b91a29a4cfe13295df6d3861fe953d9f96e80df08d4a6b1ce754 SHA512 ede650090c67642dc4729acc37630ae807f354d76f9bf31e23357668b6ae2b8d0261d2cf6e33090ab2120083b0664332dab22f1ed682bcdcbf1cac88b97e67af
-EBUILD xboxdrv-0.8.8_p20190118.ebuild 1546 BLAKE2B fa8c64ad76fa5c7a3cd18e838cd83218081b9634de79734366901d820d6852881bccca3aed61cd903b5a425ab4a18d66063669a5dc8378b30ec85934266c4235 SHA512 84db65950e20c70d2ec7a0bdc412910aaf581aa340738ffeb3ca00d611117a95ec0978cdae14559c0cfbcbadcf3658d0a72a71a423a544eff70828508aad64b1
+EBUILD xboxdrv-0.8.8_p20190118.ebuild 1536 BLAKE2B 576d869b1d5b9c5d3ab18545895c241fa7df76e3326a7bfdbc9c2f74683b70e931564c29e4067c6158d93f9c61003bb873b313014f7b3fe6e5c0ab6733806b41 SHA512 28931e15330eaae86c73c39d72530a193ac074a7f2ab5512437cce2435d52b836f57dfdea087ef2765ee791ffd3316580aea79c83831e1cff4a763622e1ef83c
 MISC metadata.xml 494 BLAKE2B 365b4d5cc3a91765b96e4e206c9beb261e318798e90437e39ae7c2c437f1df07100233f0458acca702e1efadd092a4f788c81ddcdc40b8997cc91a1041047997 SHA512 dec2bdb2eb9d7cab3cb481d9694a805175a4004f0be5956b6711acb833732d7bc8ec3dc9b2c61d00b724bc7986ec186e7b36aa0327337bdab9241d45ee5f1f0e
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
index 1508c02753da..76f9f0a91fc9 100644
--- a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
+++ b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info python-any-r1 scons-utils toolchain-funcs systemd udev
 
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index e1d945803d42..00dc8b152179 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 23ee88c85c83..44a87abb9207 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,8 +1,6 @@
 AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa
 AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f
 AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664
-DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
 DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0
-EBUILD dconf-0.26.1.ebuild 1477 BLAKE2B 43cdd548ec4fc2811bc835f627dd8f5e2ba82aef4bed616a68785cbb1bd147eb8939d9284e181306609cf7fb0e6ab556ea1d6052822e4585db8acb324d9714e8 SHA512 5927c6691cff778c1439a56cb1020a1bf459f2867ca95c3f963824d941d30ff1f9df9b72b547ff0cfd119ac3772eb1c9f0df4f0392eab716a5a654f2ffeb3575
 EBUILD dconf-0.32.0-r2.ebuild 2193 BLAKE2B efcf10a06cd228012b3431f44989914483003d001cd19f5f21d7c4f4b6a1979da6852e85943d4ba4cd1ddb7b694b1d3711a1852a163e77aa33fe39c2971a79b2 SHA512 9ff59d29ab26458301dff735c4467f38cf0c8b90d4610f6617e2fdfca944cb8f33e5fd9d4b438be78f7543cefad01e0e0e110ce3bed27d21c112ff2aa926f7f3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.26.1.ebuild b/gnome-base/dconf/dconf-0.26.1.ebuild
deleted file mode 100644
index f38544da3eaf..000000000000
--- a/gnome-base/dconf/dconf-0.26.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 bash-completion-r1 virtualx
-
-DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	sys-apps/dbus
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.15
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gcov \
-		--enable-man \
-		VALAC=$(type -P true)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# GSettings backend may be one of: memory, gconf, dconf
-	# Only dconf is really considered functional by upstream
-	# must have it enabled over gconf if both are installed
-	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
-	doenvd 51dconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	# Kill existing dconf-service processes as recommended by upstream due to
-	# possible changes in the dconf private dbus API.
-	# dconf-service will be dbus-activated on next use.
-	pids=$(pgrep -x dconf-service)
-	if [[ $? == 0 ]]; then
-		ebegin "Stopping dconf-service; it will automatically restart on demand"
-		kill ${pids}
-		eend $?
-	fi
-}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 16e68ce8b0c4..24319e7c66e5 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -6,6 +6,6 @@ DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b815
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
 DIST gnome-shell-3.32.2-patchset.tar.xz 23540 BLAKE2B 363989a630faa7538ccbf9765a1ccc5995fb4584b00a603ef11e48fee970a6d9791ed1fa92e2344e56cd8c282c9a22779cb8e50e7ec6637e0efda1ccc36579a4 SHA512 e854ba9fd864101009528d94cb310be10495db225380c353b76cd61b082a88f1f89035a0708cd386d1738001cf9949b4a8b8b8d7b1d2675068e01fecb35738c7
 DIST gnome-shell-3.32.2.tar.xz 1454372 BLAKE2B 9da7e17d4e47e187fa2285c6cf942cc8dc955e388179d2ad1fe8036c2908e217fc47d8b1515fc3cf6973e2083de8c350b55912782b9adbcf1b6cc37c7a3a9ae2 SHA512 7d8b25aa75149f096033a8b44d7f6f8d17ddadfcd8f5bb1915652423fe9d9db14902e674508f16fe5c6e7cbe956cde8349ec779c24c46f32b0a346755876bc46
-EBUILD gnome-shell-3.26.2-r4.ebuild 6615 BLAKE2B 46daaf2defe582fb95636af23a87cce49f1415385c5d4a8763cad759ceb052cd9b171fa54caf491155aca0eda4554abe485c1da0ac8d6e6b405f63eb203bfabe SHA512 932a9c8f2cb35ea674df7c7950a45537370de34c26cf75bbb88288c3d6d41761392ffce9c7c710b4d9dd11ed340017c31f8538886f75538d9e51a99f83a324da
-EBUILD gnome-shell-3.32.2.ebuild 6356 BLAKE2B e34cf7b9e3364f7f5ee0ee3268f9b3ad8d7ea3bf8863ff019474abe3c480b0350bf5455066bccb0826d989ce230b4a958982ebf573018bc4fd8dba386545fc6d SHA512 6b46492d2ca5ac18e4fe334fb7b9341fe09634638109215e6f3e64bb3875fc63a7b10315a6797205afbeffcf550224dc9579ba5bfebe218e412c9acf246d4f74
+EBUILD gnome-shell-3.26.2-r4.ebuild 6651 BLAKE2B 5054b063b21e7387efed3f78e25fbfe915f09fbe87827a1f840974ee6ad7b7f448d074a44dd5179f5fd8d6fbd90c5190b74369ba1ea2ba9d70b5da65a20fa29a SHA512 d096f22f0160c1757641bbeb11fd6bc1a0c2c6a06d97a943cab77472d0b60c8eed94c081e04c91ecc0f5d590cbadc9e5bcdc656e002215e51534b4cb7fa913a2
+EBUILD gnome-shell-3.32.2-r1.ebuild 6391 BLAKE2B 48f857ad425a2a651f0ab0191cc629a1e203a44be154d01d2d29f7af3d88fbb35488287cb3936282aab3a27eaa6b4dce3df5253da7b7375b6e88cbb8f3b831c6 SHA512 6dbbf3fb482f5a7511368338991c5caff2180d33b1dc0e3edd0c13488c61baa280c21c1324da236dfe62a2374482c56d140d0f5531d97e593d88c839a3b985ab
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
index 601a0789119c..6daa3d58709a 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
@@ -59,7 +59,9 @@ COMMON_DEPEND="
 	>=x11-libs/libXfixes-5.0
 
 	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/mesa[X(+)]
 "
 # Runtime-only deps are probably incomplete and approximate.
diff --git a/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild
new file mode 100644
index 000000000000..3b1c0f71c323
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.32.2-r1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+	>=dev-libs/libcroco-0.6.8:0.6
+	>=gnome-extra/evolution-data-server-3.17.2:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
+	>=dev-libs/glib-2.57.2:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.54.0
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	>=x11-wm/mutter-3.32.0:0/4[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.27.90
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.2
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	media-libs/gst-plugins-base:1.0
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-31 )
+	elogind? ( >=sys-auth/elogind-237 )
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-2[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	>=dev-libs/libgweather-3.26:2[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-lang/sassc
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Patches from gnome-3-32 branch on top of 3.32.2
+	"${WORKDIR}"/patches/
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/3.32-optional-bluetooth.patch
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/3.28.3-defaults.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Hack in correct python shebang
+	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
+	pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs}
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild
deleted file mode 100644
index cc2d09d474c4..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer support is currently automagic
-DEPEND="
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-extra/evolution-data-server-3.17.2:=
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=dev-libs/glib-2.57.2:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.54.0
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-3.32.0:0/4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.27.90
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.2
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	media-libs/gst-plugins-base:1.0
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4:=[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( >=sys-auth/elogind-237 )
-
-	>=app-accessibility/at-spi2-atk-2.5.3
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection] )
-	media-fonts/cantarell
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-BDEPEND="
-	dev-lang/sassc
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Patches from gnome-3-32 branch on top of 3.32.2
-	"${WORKDIR}"/patches/
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/3.32-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/3.28.3-defaults.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
-	pax-mark m "${ED}/usr/bin/gnome-shell"{,-extension-prefs}
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 5575576b165f..9003cdacc446 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -3,5 +3,5 @@ AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf
 AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde
 AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8
 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735
-EBUILD libglade-2.6.4-r2.ebuild 2862 BLAKE2B afc5edd2b9d11d2907fba5c15ce93c4854e98e1f3f51322547a9d1dcf55dc5d2af9ffe2ba7b60f1dedf05c1ba1f0afda3f4770f38831904979b2704c0cd9a1d7 SHA512 c6d86a3dea07fb276a83d57b62d7129359143b896536cb794cc228d3167947985fe23ca36b6963681c054af62e8714a21dbb974db61888774ccf9c631593a328
+EBUILD libglade-2.6.4-r2.ebuild 2863 BLAKE2B da0344acec107d39ba4c7864a8a6550eacea7f9a7ac51de72b6cd81bfcf7d28b17a559b6fe7891b960c65c472c147b0c2bf0cf35c86e158bed085f8ee1680a6e SHA512 33f972a875ddc3a36119c81607b3e6356b81193f4396445b1152837b013d14d22a14d4e36451b748dba497237e54a60dd1458a094aff8a1ac847e54a2f5d2de3
 MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3
diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
index 169ff539ffa6..cd1c4f1d9d56 100644
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f4e30f424959..288f04b4e210 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index 0609a5756f91..c520c639ee50 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,4 +1,4 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r1.ebuild 1400 BLAKE2B 1eff2159294e582f96506fbbaaedf163d7ee6c6adb5cf8824971e5ea923f8338c9773890f77e0620a5eba7016c89e8603f0dd550dcdb54c07b5bf23470f1e414 SHA512 8a2561cae747ee489341f04fda2cde8b7dfc0eec5a74caf742797497dc3db221e0206fb24bbe43b77efaf72e7f8dd28fca63e0ab4fb022a4ba70cb5ef01f0fc5
-EBUILD chrome-gnome-shell-10-r2.ebuild 1410 BLAKE2B 1a0b6a89aa703cad9dcd490c19d65848425c282a0f688c00e3ff1215aeb6f47da2e2c1f208a75baa44adaab9b7be8c6cc74274de7912bcb92c6b06bb42dc9084 SHA512 a531ec080633a497d82c8fdcb231d78db58409c806983538b9082634d220260af3b467e0df0bd3fafa5d8c5b8977883c0a7e2ce223a987f96b45ef6711e6e172
+EBUILD chrome-gnome-shell-10-r3.ebuild 1433 BLAKE2B 0291ed26b1aea206a1ba70cfbe355bead13f0452b15b04b778a675f5521253957494507b5f3960155aa8e3c8206568a9e2cc45be690abaaf4c091a3c5c37476c SHA512 89aed312c59e3612cb4c0023f0bd8608de1df94cbfd35bc38744ac4673a8e83284124174fe0d64dc0bd8194291cc99a8db38ebcaabc6cbc175866f0cc086ce85
+EBUILD chrome-gnome-shell-10-r4.ebuild 1443 BLAKE2B 299b9bdca0e2e6e1f819bf6b258be131597f9d916f16476e3b5a1d2381b263ae7db1dfba842a897334ac03ff8b141f8a3bc284702c495399a04cbe9e6bed62c3 SHA512 e8d6ec606faada72c84e73c31662242f55ca0d1fd7a35810abe89c7d1de171747788f556900a8889160cbb060567c9f58711dd0590204ba822a6ec187dbdf287
 MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild
deleted file mode 100644
index d60ba0d0a1ec..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-shell
-"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
-		# Workaround www-client/firefox-bin manifests location
-		# Bug: https://bugs.gentoo.org/643522
-		insinto /usr/lib/mozilla/native-messaging-hosts
-		doins "${ED}"/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json
-	fi
-}
-
-pkg_postinst() {
-	elog "Please note that this package provides native messaging connector only."
-	elog "You can install browser extension using link provided at"
-	elog "https://extensions.gnome.org website."
-}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r2.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r2.ebuild
deleted file mode 100644
index cc94f8f1db72..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-shell
-"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
-		# Workaround www-client/firefox-bin manifests location
-		# Bug: https://bugs.gentoo.org/643522
-		insinto /usr/lib/mozilla/native-messaging-hosts
-		doins "${ED}"/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json
-	fi
-}
-
-pkg_postinst() {
-	elog "Please note that this package provides native messaging connector only."
-	elog "You can install browser extension using link provided at"
-	elog "https://extensions.gnome.org website."
-}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
new file mode 100644
index 000000000000..b7c746b42dd3
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
+SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-misc/jq
+	sys-apps/coreutils
+"
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/gnome-shell
+"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
+		# Workaround www-client/firefox-bin manifests location
+		# Bug: https://bugs.gentoo.org/643522
+		insinto /usr/lib/mozilla/native-messaging-hosts
+		doins "${ED}"/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json
+	fi
+}
+
+pkg_postinst() {
+	elog "Please note that this package provides native messaging connector only."
+	elog "You can install browser extension using link provided at"
+	elog "https://extensions.gnome.org website."
+}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
new file mode 100644
index 000000000000..b70997c19680
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
+SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-misc/jq
+	sys-apps/coreutils
+"
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/gnome-shell
+"
+
+src_configure() {
+	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
+		# Workaround www-client/firefox-bin manifests location
+		# Bug: https://bugs.gentoo.org/643522
+		insinto /usr/lib/mozilla/native-messaging-hosts
+		doins "${ED}"/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json
+	fi
+}
+
+pkg_postinst() {
+	elog "Please note that this package provides native messaging connector only."
+	elog "You can install browser extension using link provided at"
+	elog "https://extensions.gnome.org website."
+}
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 6b9a3652be99..bc4e3db5a4c9 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -2,7 +2,7 @@ AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f
 DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
 DIST cinnamon-desktop-3.8.1.tar.gz 489295 BLAKE2B cc2216040387ff573d4cfc740e7e400862c8fc1361f38b2771ac94c490a8710e487ae1d33ab1a7ed98423c94e77bba32db6cbc563e9152c67b011459f91ad123 SHA512 d4b5e6d848a4cb01e811410da8b07d2a400f6632abba9cc0ed74e5321ba3fafd1ec9ac90307eb56ba7047dbfabbad9526e1348533c6207c9a7756c24751da933
 DIST cinnamon-desktop-4.0.1.tar.gz 489598 BLAKE2B 3d223faf0d9381bc5bcd4be131f9dbe1bea0f6ec57cc5413e24fac8a1855737ba55f55faff36436c8b8d6266be264d96ce51ec1bd8c1406f5737c9b3ee41c0a9 SHA512 68ce970736eac025c5cf73239dccd010d70197011e75258dc234bdbb52346466f51fc211c58d2ce730e63fb6250fa763ccbdf44cc08df7a028a0bea01826ddb4
-EBUILD cinnamon-desktop-3.6.2.ebuild 1707 BLAKE2B a27d76ab355d0a08bff965af58ee2e1e0109103b1b1674ec30f56b0a3a2d1b3254465fc0a30fb3970851f03d22da3684cb3422bd8ef3de411989febec57da776 SHA512 6bdae0da4d55048bee8c75089b2dabf984b1b9fdaaabc9c7bd1175bef1ae8aad8f91824b8903e7d0b45660daa461b2270b46c910186b0b890b16e5af35f9a873
-EBUILD cinnamon-desktop-3.8.1.ebuild 1598 BLAKE2B cda2a5ce6c91a8015aa938459ef6accbc52a80af537675e2e9b04f9b0b69fc30dcb392d93fc10eaccacbdb4a5efc5942f8aca071ca9a7430593744e539f863c8 SHA512 ec8376b02023ce576c05803e9bc10bb0a1d66f6da9e46e83299b5a1912dd93312dd5ae50d017eccc210d15373e73073fc228f77be6d4411bec6f5cff910857df
-EBUILD cinnamon-desktop-4.0.1.ebuild 1596 BLAKE2B e9d6cdf9b1456819080c6d1f876a969c71a54e5ad0ec5dc981490b10a8d774bdfcb6be79f01b13a71c3a381b51717b380be0c25c23d69ae1a4b47f0409f1d30d SHA512 59146b09cc7e3731849234c589a8d10ca605baee4ce3c584da29d3871a14c7173f1522e1e4ceed543f10e782d801c9f631d7f2a844178182ca19472c6fee36b0
+EBUILD cinnamon-desktop-3.6.2.ebuild 1743 BLAKE2B 69c3fa571dd2c104c3f68055a31c31c7103535cd777f5b5e10947054d75634fdf00cc784119e4a0b0edc4433d7d4fb3b6ab4c4193b80c82af029147fe7660ef2 SHA512 c3f038f586b59dbdf00f8c68448212a306352cfa56557ac8701669f8f3cbe1957769aef2364d00862b9b1a268afe4b4a2485aa7618224fed1aeae82e8cbc5d65
+EBUILD cinnamon-desktop-3.8.1.ebuild 1634 BLAKE2B 0eaecb7a494e0cdb860b08023d7cf30da2beca7cb55bed7215d630ee8d4ba4e81afabd28a8a0b77391e03ca5e8b83197504ad989b99bee169bd540b4384f8cba SHA512 517f27825555ec909763d654a1b4bd7102f4b80f7b88fff52f5afb01489a50a11c06137ccf72a03fb9595837e11d0e945ec988e1210328157cd81ded08948909
+EBUILD cinnamon-desktop-4.0.1-r1.ebuild 1632 BLAKE2B b657c7b7a8f4cd7ff3662ceadd2c76c9005942b907dc30c585f1d4a4f98184c8c376dc3db250143343050355320f61462b45e59f52dc21ca54ab921e08347f88 SHA512 29e1b11182972589fd035857957f26d605d094eb011b8b232e7b07ae7a7e034674ad0c8ddedd324115dd66905131b35bbdd545bca3c28562bf4a6445506dd9a1
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
index e992aeb0f027..a984f3d7084b 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -32,7 +32,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-apps/accountsservice
 "
 RDEPEND="${COMMON_DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
index 15d3acece1d1..f9831b1fdf9f 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
@@ -32,7 +32,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-apps/accountsservice
 "
 RDEPEND="${COMMON_DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..9faa5c73cd35
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+
+inherit meson eutils gnome2 python-single-r1
+
+DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
+SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
+SLOT="0/4" # subslot = libcinnamon-desktop soname version
+KEYWORDS="amd64 x86"
+IUSE="+introspection systemd"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.37.3:2[dbus]
+	media-sound/pulseaudio[glib]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
+	>=x11-libs/gtk+-3.3.16:3[introspection?]
+	>=x11-libs/libXext-1.1
+	>=x11-libs/libXrandr-1.3
+	x11-libs/cairo:=[X]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	sys-apps/accountsservice
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.6
+	gnome-base/gnome-common
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_configure() {
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# set sane default gschema values for systemd users
+	if use systemd; then
+		insinto /usr/share/glib-2.0/schemas/
+		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
+	fi
+}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
deleted file mode 100644
index 11d093a363c7..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit meson eutils gnome2 python-single-r1
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 x86"
-IUSE="+introspection systemd"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2[dbus]
-	media-sound/pulseaudio[glib]
-	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	sys-apps/accountsservice
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	gnome-base/gnome-common
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_configure() {
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# set sane default gschema values for systemd users
-	if use systemd; then
-		insinto /usr/share/glib-2.0/schemas/
-		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
-	fi
-}
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 00333fc0196f..a851d8d4dd3a 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,7 +1,7 @@
 DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
 DIST cinnamon-screensaver-3.8.0.tar.gz 161238 BLAKE2B 1deb5439c30eed8f16240cdacb20beee3dfeef9529d9efb913f4922b7a53ebf3372f64f80c1afdc9899eb5350b97bccf9a1cb98d703d19afa05e6ce11377531e SHA512 9abed09abfdf193b66c70cd2220d7d7aa056a99b6ffe12e3d80ea8af39d4aef79f0851e83b525850cc56da5944d7b29ceb8c4e15e2bc1e847ce62c13c45d1bdb
 DIST cinnamon-screensaver-4.0.1.tar.gz 156640 BLAKE2B e82354ce36fc325f524e60680c51d46ba7924154e2ff64514687498a7ebbf13d626e5441177d0679c763a4bd3c10a2b7e08ed01470358bc4606be90d37867570 SHA512 c1262d6c1e9575da8007f41f637ab9f7ba33ad5a3a909a7b756cef1f4cb0f323ea4d89fd7498d9589975b9fa6e4715d631413eec7fbcb9c3b46d3a42e02ac7bf
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2048 BLAKE2B 728f9d272a513df250a21a46b145925ffca408e8ea2edb26d2b621301048856d9a2e9368d9c11a5a5d47e9bfd4c00518722331db1b6f1c7196d5d711f01ddec0 SHA512 d19c887fce833b393a3d08261f114807004a596ae304e3f27e54728ad15f5af4c58db53573e4e31e3d4ceba74253449d03bcfee60b31371e3f2d86f9f10a4a0e
-EBUILD cinnamon-screensaver-3.8.0.ebuild 2050 BLAKE2B 5bc23e21d25e85118664b76aad715f4b98f281a428f7f095029503be2322e32efca561868fc85bc25fa9787c84f6c2eb62dba8062507966c536b8b46b67c95c8 SHA512 0c5368eaf2f7c54664eec25cd6e03d0c08487363ef397f83ef1797d424078d72ef6ecd58affb425d30f13867fc7e63d79037e159b9506419f6707e0141c41611
-EBUILD cinnamon-screensaver-4.0.1.ebuild 2015 BLAKE2B 8e34b8d66019b7d26b12c55b2f706d64175c3f969ae75de3de429300de5074bb56ad77cb39e49d64954410b063b082976f62d497bd42b44626ff77f978905d2b SHA512 ab53233f1c32b84e251f2eb499cf73bc8651d6afe92f4481117f305e94e08372fd013924a7c602da6d490bd6b8e94e2dc294d4778f059c4eb37cdf18cbe1401c
+EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2105 BLAKE2B ff5d34cb4f717e3bf6f308943db027bce5efda46c12b6ae9f6992812b0756851883700714bbbfbad7941d1ffd303a968f4b201a7f944400437e907e50a09e278 SHA512 aefbfb732f13e5f9fbf24f0d70d3655dba05a0769076ee82dd2b930c1176155d14d7e28feb1cfe1583455a146432141d827c06f44efae74e28482c4fdd2199d7
+EBUILD cinnamon-screensaver-3.8.0.ebuild 2107 BLAKE2B 70b1a8932cf889d7fb09cbf3e11546555519e1a0d0e4e09ad0089db185ede46368a821838dfcf72f1bc20baa7d36adfbc866465db067a23a957a80568bbe68d6 SHA512 a65b8fa9a8be1839162c7340e8b0a2eb7dd43b7e9ece8062808d4e9d62b42551fffc189ba2b7a730fea5d651d2792dad101cfba13e761aa719584bd826e3703e
+EBUILD cinnamon-screensaver-4.0.1-r1.ebuild 2072 BLAKE2B 006d373a431c276c83af2c4a2af1b18219ea02c52782af790efc67f46dbb1889f2fe672c7cba2bf35882fa2c20e0ba05cba176b7d4f72f5fb16f348904d0daaa SHA512 15f3fd1f49a4010a782ac1ff251881eaf56b87ff972545ca4feb3280cda820696770b3f6948c2540939350e0b89397138e9f1159ba5ccde33c5cd16dbfc987a0
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
index 109631bea787..a9ae0d2b2e4a 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
@@ -47,10 +47,12 @@ COMMON_DEPEND="
 # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
 RDEPEND="${COMMON_DEPEND}
 	!~gnome-extra/cinnamon-1.8.8.1
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
index b4a515ce0514..36c7cc681d2c 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
@@ -47,10 +47,12 @@ COMMON_DEPEND="
 # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
 RDEPEND="${COMMON_DEPEND}
 	!~gnome-extra/cinnamon-1.8.8.1
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..50d097882560
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	!systemd? ( sys-auth/elogind )
+
+	${PYTHON_DEPS}
+
+	pam? ( sys-libs/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+	xinerama? ( x11-libs/libXinerama )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="${COMMON_DEPEND}
+	!~gnome-extra/cinnamon-1.8.8.1
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+		$(use_enable xinerama)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
deleted file mode 100644
index fe990bf96f21..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.1.4:3[introspection]
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	!systemd? ( sys-auth/elogind )
-
-	${PYTHON_DEPS}
-
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable xinerama)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index c73c81907013..01f83ef5d023 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d1
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6
-EBUILD evolution-data-server-3.32.5.ebuild 4353 BLAKE2B c30d4c9b1cd2387a9954dfdd75179cec253c6be31dc1deabe78dff538bd18a5ba47c3e510a1fc4cce97ab45813e6b6ee2c1de639c9467d0876b116452102dda7 SHA512 2eef76ac77415e939a870bd2d421e15b386f7833cc6b76a20c19d44e0944046d4892d53de6ad239b51960e2a90ef0545bc9adbd55ae3ecb23c2594e31d17d04f
+EBUILD evolution-data-server-3.32.5.ebuild 4343 BLAKE2B 659f0a4f4d816830884fef39f3f2a546aa20c06b0019d703c2d5bb670112829d7abc0529a631b87decdfe904677c0b02e9c4a3f0b0fc86930a0419c3450acaac SHA512 7822ea9a2984d795a03f28039d2d3580f9b72d5ee3c1ed0afd79f714ae996e97e8ac55ba3da3682d4ad50ec74c1ce4dd972d75b5aa32dea608a47f907af544e0
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
index 3f15245d2c44..1c26f9c18bec 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 VALA_USE_DEPEND="vapigen"
 
 inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index e8f17901dad7..1caa38f8b75a 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-power-manager-3.30.0.tar.xz 380820 BLAKE2B 9d39df24854f649ab3b40fcf454c7be73d93e3e99050b93ec5dfb86760e27055f856918e5fb7d7b53472a4062cf9b2039a519130bb5d887126a69326d9392737 SHA512 ed0e2a20bd8979fd9064cea9f4485da832eb44a2c727e39cde5ca9f9e2eb75a37e3d1b5a2181d9c666c19b1b300cbc62cd5f9e2c3f36ee4a4dfc3e1537a10329
+DIST gnome-power-manager-3.32.0.tar.xz 379136 BLAKE2B 3f9b385c37fcf1de3741781627d275057f67d489ed4b372f6f68495a707d9e67b78be9f186922a99a606a80008addd570943800ddb2ddd17d2071161b7276c49 SHA512 0ea11085dd015e30c1bdc6913000b63eabf7df76720f2d51d63b075f3b7bd2a610aaa484c53a4092d78d3c484ed8c4e81ec66603bdc6c132b0316113ec6a24a0
 EBUILD gnome-power-manager-3.30.0.ebuild 1094 BLAKE2B dc026aee1e73ff75549bf0f4dff27303ff4e11f039f65684b9cb812b8f04d0e7db920b0507872924b714152855cfdff3ef5e1b34bb6246608e82893a85626ffa SHA512 99d2492bda2450d55244196fcc63eaf814cb110eac13f1bffb058860ce481e2d0fc7daf5fd5be4f200acb115466c6ef0770c4101ce904ad8603609efe14795b7
+EBUILD gnome-power-manager-3.32.0.ebuild 1096 BLAKE2B a393d9460613b5bd75a580cea4e1a3c8c2cd1dd10a5943a5446c3bb6459b8aad0567a02b513151eeba1259815cc27b4874644359e8e4d548a93e0fb8692a6566 SHA512 c035f9faa3e5330b107da9999a50e6525622d2474ec941c50fcae6c1e1a1fa3c0e2c427c3620894f4819878f4022a2b2c1bc5f3d84b1a6ccfc08bbe3916cd624
 MISC metadata.xml 600 BLAKE2B 31046c118a172aa788bcafc57e5a2615d22a9ddbcd56886607a6b07a496adb950f3e05067470ea3b85298acf9ee045fba5fa315e9fe7eb7e72dc3fc9511f5dd3 SHA512 05290535ed07687c59013dbf7b3e527063a48f99da84fc6603ee48b4548d08e0ffe4a2f5836a100786f0ed87bdc43a68cca707c5f5f0c36a8126f53822561ef2
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
new file mode 100644
index 000000000000..245404a12318
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME power statistics"
+HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.8:2
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/cairo-1
+	>=sys-power/upower-0.99:=
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	>=sys-devel/gettext-0.19.7
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
+# (files under ${S}/man).
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test enable-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index d3204dedc183..5a200f14b741 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 DIST gnome-tweaks-3.32.0.tar.xz 241492 BLAKE2B f3c0a25b39726600fc5d53d8d3c343dbcde594642a87fc56dd3fff9b88a3498e0f283568a944fc37445c138201db1f280222eb1161f5b8351c566537404cde5e SHA512 8107e9d2b33ac6c46e8d0076b27a1c3a84e1721e49a6b80da28fe854f6f4f6693bc7f7e836c54d39bafec79dcee8a6e2b2962580a77d7d01bfc06c6d11206d8f
-EBUILD gnome-tweaks-3.32.0.ebuild 1197 BLAKE2B 91c91da8ec72c7a5e04310e7062b6491353ee02bb9482f34d5052673b8000b475cd992ae55e3e4d10922bad30d7c9ad016d4f515edb783c0ee1750f50bc9e6aa SHA512 b3d6c6b0d6752f053ca36cecc0906591f86816bd17b76b3824e958cae07dc477af0faaf52932564d733fcff0ba655a329a62c14fe9224ef18a8e855a49837fcd
+EBUILD gnome-tweaks-3.32.0-r1.ebuild 1233 BLAKE2B 9241987e7079112f706e7de2153153502efa9ec9a187666e2792d797932c03744e1032be24679407fa99ee499b2da205c35335ff3b98a166c2fcebaff1d16967 SHA512 773dcef7bd2f9747dfecdad0d405331a394eb3dfe2a715d14ca828cee634c8e3f92fe76a768f3d1ed368ac8cc771c08a7600ef43fd746ea7ba1eb8592cbf9fc2
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
new file mode 100644
index 000000000000..40f1b553668e
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Customize advanced GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
+
+LICENSE="GPL-3+ CC0-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+"
+# See README.md for list of deps
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.10.2:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=gnome-base/gnome-settings-daemon-3
+	x11-themes/sound-theme-freedesktop
+
+	>=dev-libs/glib-2.58:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=gnome-base/gnome-desktop-3.30:3[introspection]
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gsettings-desktop-schemas-3.28
+	>=gnome-base/gnome-shell-3.24
+	x11-wm/mutter
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=">=sys-devel/gettext-0.19.8"
+
+PATCHES=(
+	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+)
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
deleted file mode 100644
index e01e362cbc48..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome.org meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-"
-# See README.md for list of deps
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gnome-settings-daemon-3
-	x11-themes/sound-theme-freedesktop
-
-	>=dev-libs/glib-2.58:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.30:3[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.28
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=">=sys-devel/gettext-0.19.8"
-
-PATCHES=(
-	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-)
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-}
diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index 5547f2d134d7..fc2cdecdcf9b 100644
--- a/gnustep-base/Manifest.gz
+++ b/gnustep-base/Manifest.gz
diff --git a/gnustep-base/gnustep-updater/Manifest b/gnustep-base/gnustep-updater/Manifest
index d49e5736e65e..75266c35d338 100644
--- a/gnustep-base/gnustep-updater/Manifest
+++ b/gnustep-base/gnustep-updater/Manifest
@@ -1,4 +1,3 @@
 DIST gnustep-updater-0.3.tar.bz2 3685 BLAKE2B df4d4e54243e0ffaa2ba28c71eefb7107b1cec59574f69ba4587a76a759d33d68c4d06250160b97814ef2c00e6e628664c30c760ad1fc3c9ac0c035451b5520a SHA512 079b51c54a7860c4eea65ffc63172ea69e88de4a34f2ca0d0c5ad3a1342ea37ee69edb107f287f04d33c3ee03658edd5386d1323f47e9bc201bc70d68d0c9c4b
-EBUILD gnustep-updater-0.3-r1.ebuild 589 BLAKE2B 1255387930c1d520f63ba458373ca2063020f8e9cde2a81a33d2abd3772348508fe76f734789ee93e2745ae41cd900ef129db267b33bf764f8e66271ac8511e6 SHA512 c13f64ce3a0ef312b65ff2be618c689e4db64615a54e10bd01ad49ecf0b94ac70ce76e75a827bd91ea9355fda8b8b1d732cf20238b13ef18d3483c3b439beb25
-EBUILD gnustep-updater-0.3.ebuild 601 BLAKE2B 015c8ee1e035b0371a71f66d8405afd789cd52f59c24b120a89c42edfac7b714b139ee09bfbcbd76d012d1516058ff1d878b244e403a971b0ca1e6948003ee7d SHA512 33fd7930924c3f591a3a3a1e9bbf57d2c9fdbd6e5e3834c7ed6469c06722407b3e860f1226e427e0772e4209fdbccdff3121cdc28c49cb5a212205dca204bed7
+EBUILD gnustep-updater-0.3-r1.ebuild 585 BLAKE2B 6ac357b7e24d67460399ae725bf4afbe7dc111efad38aad0ddd64b7d33aed570f2c12d1dc132f6356609e6e2c902ec483ac7326b1345c983310838874c7bc915 SHA512 a244e13fa093a405ff7dc6b3bb43e5d4b93ef85936441e7a56aeeeda28e5de434f663c0ea73fccecd0719a0f7b8026e9bf7fa08772fff84b3c4d18434b281575
 MISC metadata.xml 391 BLAKE2B bd0dd26138078e5a04f3a55ee560af0a2ac353c47af2d043ca28cdc55912d0445925f7a0b3691a13a2eca1735ae00573ba7c8d6b4c210b5217451c743e5d782e SHA512 3f5fbaa301d779e176d67686228b59a3130197055577bbfb2c15703ed63b5f8c40f7edadfd0cc06ae1e08d320161fcc399af4e3886b127e40ec562ecc19a0b0c
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
index 2f115238e5ac..c03c159ce0b4 100644
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
+++ b/gnustep-base/gnustep-updater/gnustep-updater-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-misc/pax-utils
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
deleted file mode 100644
index 8c71ceca708d..000000000000
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Helper tool to upgrade Gentoo GNUstep installations"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:GNUstep"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-shells/bash"
-RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	>=gnustep-base/gnustep-make-2.6.0"
-
-src_install() {
-	dosbin gnustep-updater
-	doman gnustep-updater.1
-}
diff --git a/java-virtuals/Manifest.gz b/java-virtuals/Manifest.gz
index e8157d4024ee..b7ed347c234f 100644
--- a/java-virtuals/Manifest.gz
+++ b/java-virtuals/Manifest.gz
diff --git a/java-virtuals/ejb-api/Manifest b/java-virtuals/ejb-api/Manifest
index 3e9dd20746a1..b117bf700912 100644
--- a/java-virtuals/ejb-api/Manifest
+++ b/java-virtuals/ejb-api/Manifest
@@ -1,2 +1,2 @@
-EBUILD ejb-api-0.ebuild 384 BLAKE2B aa603ede7b2a34bc1e4b81c174f2b0f0355003e71fe8005c5c4c19b4c75686e632090a3aff6dce8a8ea1efea93c8c55122a770a7d7478ffd1be3be9626e2241c SHA512 1a62b46a80710d0150b6caf6ec26dbe9abc96411905b2c81d23a7ba49bafe3d77222394d8feec7edee663fa39d0c9c964c456b900aa0514838810a28560cd326
+EBUILD ejb-api-0.ebuild 402 BLAKE2B b0c621a50ffb8bcdba572baa69d281b38cce988d3b5dca468287ba73e5040d493580ba3bcff87a10334707580dc6b99f4de10f3aef3468282bcfa06f880bf160 SHA512 2d71ac3d758979c5b5a53a794a31d8508bb2e2937067320e0274ac0d6101df19a059d9d1c47337089e958df8a8bdcc27fe7eb0fc99e178fcd47498225f2dbd6d
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/ejb-api/ejb-api-0.ebuild b/java-virtuals/ejb-api/ejb-api-0.ebuild
index 0c6ab6168c16..6e1db445cb4d 100644
--- a/java-virtuals/ejb-api/ejb-api-0.ebuild
+++ b/java-virtuals/ejb-api/ejb-api-0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for Enterprise JavaBeans API (javax.ejb)"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/java-virtuals/interceptor-api/Manifest b/java-virtuals/interceptor-api/Manifest
index 714f1e580bc3..90a0a171100a 100644
--- a/java-virtuals/interceptor-api/Manifest
+++ b/java-virtuals/interceptor-api/Manifest
@@ -1,2 +1,2 @@
-EBUILD interceptor-api-0.ebuild 416 BLAKE2B dc87eead284c434fcdb9abd86a6700d20afe000daac6794da45299de5c7bcc34771b503bf0efc7ca9bd35162a86213bd3dee050ab571735693453212d085f360 SHA512 1638548d9fc826367eb4235699e9a71a18eed93721ffe1b6d9c6543e104073a12e90b011693b2a716c2876b23d12bac76d88bf248d603c873a291999dbe386c3
+EBUILD interceptor-api-0.ebuild 434 BLAKE2B a9912a7c65732c474b0ad2c4329a705cac6ba7142b3d793e9c4239e1723d1d991f1cd259fbd0aef6b833f7ee6c73b9a916477abc97a2680177dd81559e8f879c SHA512 4d225477f3a7444ba3dfd0c08e3d543a9d218583549eff9b30aaf699f5826c63e22ddc4da706864747879d32489e66a7fdeefc990edc643f8bfb4c7bcb4df157
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/interceptor-api/interceptor-api-0.ebuild b/java-virtuals/interceptor-api/interceptor-api-0.ebuild
index 74851ce7e7e1..6f5cc9fdf97b 100644
--- a/java-virtuals/interceptor-api/interceptor-api-0.ebuild
+++ b/java-virtuals/interceptor-api/interceptor-api-0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for Interceptor API (javax.interceptor)"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/java-virtuals/jms/Manifest b/java-virtuals/jms/Manifest
index 76fb87a4637e..f056b5066a37 100644
--- a/java-virtuals/jms/Manifest
+++ b/java-virtuals/jms/Manifest
@@ -1,2 +1,2 @@
-EBUILD jms-1.1.ebuild 514 BLAKE2B bd870ba0f0af768e26f85810ec6e02a4fbed0cca5ec4bf661742a5d6abdf83c3092fbe1531d7d78bb52b924d32235ae685c66200f077caf37f9a4ad2d2c44d18 SHA512 e27ae6fbd8a98fca190daaaf468bcea0c8728f794dc7147b64018f71074c3724a08f54d6801638512e2f3d3b6100093877c36f13c44a1cad5b798ec247d0d554
+EBUILD jms-1.1.ebuild 532 BLAKE2B d17d4ae18487b37fe55cef6dc0897cfd998cf42ab168336cefb6415fa2529635384a3ababda2abbac6c0cd5a4ff659d2798c284d3ac62b0f8cd4831dcbbf47fe SHA512 6073750d0939da03f4d4cc81e5f08fc2dace98ef8b51362042fbd75ba1c40ddb79379f7a141f313ebd40742ca7a805655c7e998bbecb8adb6ef65fd27b7637ac
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/jms/jms-1.1.ebuild b/java-virtuals/jms/jms-1.1.ebuild
index 26dafac2bef2..59e485e3323a 100644
--- a/java-virtuals/jms/jms-1.1.ebuild
+++ b/java-virtuals/jms/jms-1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for Java Message Service (JMS) API"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="public-domain"
diff --git a/java-virtuals/jmx/Manifest b/java-virtuals/jmx/Manifest
index 62c56768ecd4..cf57e613ad40 100644
--- a/java-virtuals/jmx/Manifest
+++ b/java-virtuals/jmx/Manifest
@@ -1,2 +1,2 @@
-EBUILD jmx-1.0-r4.ebuild 593 BLAKE2B 5ba02bbbbb51d6538cc3ae7a99b86a0992967ba20b409bbe7a8ea0094f36d0cd6ab70587ace556e198bb9d03d23973d30bfbd05eca77b05852ae67a11aafb757 SHA512 79e52a8233ed6cc24c79ca84fa13e4134f9959002347702e265807f90b7bd80b9df987e09f534ec00192f751123a364c09ede97479b7c450a58c9f14b28797be
+EBUILD jmx-1.0-r4.ebuild 611 BLAKE2B b8e8cb819bbca5445c3049f9c126850fd60557ce56419ff05c00d0ee27921358a4c3e89164bd9d85521162d28de1ce982f8cc08488191d126fd5908efa96628e SHA512 a1f605c7e4e319d22a681971a1870a3535592e8efc3bbcd2e6ff7c03a1cc63e88757110d25e910b4b195db601df44d90906d7f18f023823ebf54d5b47a2c5969
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/jmx/jmx-1.0-r4.ebuild b/java-virtuals/jmx/jmx-1.0-r4.ebuild
index 59d365ee8646..5abb5d8a1a63 100644
--- a/java-virtuals/jmx/jmx-1.0-r4.ebuild
+++ b/java-virtuals/jmx/jmx-1.0-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for Java Management Extensions (JMX)"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="public-domain"
diff --git a/java-virtuals/saaj-api/Manifest b/java-virtuals/saaj-api/Manifest
index c38c7d615acb..b9d578f4bcbd 100644
--- a/java-virtuals/saaj-api/Manifest
+++ b/java-virtuals/saaj-api/Manifest
@@ -1,2 +1,2 @@
-EBUILD saaj-api-1.3-r3.ebuild 433 BLAKE2B 67a95e531e3e4f070fa489a71c1d189740bf85c49e6b7d0360af4fd93c9f9a4a64a4465b32533ea894622fa7b208079a68c8c9f444790fd9d8df0bda298e395d SHA512 4ea16e175b238d501a48de06225da24dcde95b607739d5db77ff24525e1985180e479d380e0db268da16759fce3dfa2028f4afee4ee8e4322fe1d288f41c99a4
+EBUILD saaj-api-1.3-r3.ebuild 451 BLAKE2B d43aa3c4eb0e492a7c8dd80d7ea383c6332eaa7077be43114ea6e7a42a0c08bbacc899f56ad9d17f7537f10924cb81a62045c4f847bbe4d5661af4f02f38e6c8 SHA512 749069ac848bf156c2beee89380cf32c174925308a8df6246121fc1c26995e49d952265e9c7ff7c4b59cfde2f8b4d055e6a0c81ebe69907b234b661351b57311
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild b/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild
index 88df05e41ee9..11e7133f6a10 100644
--- a/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild
+++ b/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for SAAJ 1.3 (AKA JSR-67 MR3) API"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="public-domain"
diff --git a/java-virtuals/script-api/Manifest b/java-virtuals/script-api/Manifest
index ffe69a8e3f34..dc2704b9151c 100644
--- a/java-virtuals/script-api/Manifest
+++ b/java-virtuals/script-api/Manifest
@@ -1,2 +1,2 @@
-EBUILD script-api-1.0-r1.ebuild 439 BLAKE2B 9c55727d3cdd5554d6837a7f8157a9856ef698760f65380b723d1afed4994f2b0929047895ce817d850c52e5d76870ebf37e153a435c87b284aaf29388f91769 SHA512 90f8df25a24ff69c6ab38ace019ffcbec03fa417e01833a260fdb2a3e4542a33f6d5e26b4665c7a7690b51f99e413970fdd9bb4bd26a2a0a92c9c28254c39717
+EBUILD script-api-1.0-r1.ebuild 457 BLAKE2B c1207c5128ad5cacb20abee18f9bbeab5e842f6fb728cdae5ffcf32e7618174f2c4034dbd397231f7cc25b3d5062a997d1aa70969eb5582d5a8a98ad34c9f5b7 SHA512 2ef04f85d88cf78e6acc1e24cafee4d2102330a583af5328cc42835b2ad7c8de73b8b90725cd087f7b908b2b3762912229413b235b4f90a047fba7f5d594c31c
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/script-api/script-api-1.0-r1.ebuild b/java-virtuals/script-api/script-api-1.0-r1.ebuild
index 955461b8b75e..3052b3fa2b49 100644
--- a/java-virtuals/script-api/script-api-1.0-r1.ebuild
+++ b/java-virtuals/script-api/script-api-1.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for Java Scripting API (jsr223)"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="public-domain"
diff --git a/java-virtuals/stax-api/Manifest b/java-virtuals/stax-api/Manifest
index 4d1564e625d3..9604ccfb3a52 100644
--- a/java-virtuals/stax-api/Manifest
+++ b/java-virtuals/stax-api/Manifest
@@ -1,2 +1,2 @@
-EBUILD stax-api-1-r4.ebuild 540 BLAKE2B 1298de0d9440c718436568e333d6af1a587ab935202dc1768a2d5b9e4cb46d8caec9d8d4f5db0aeb17ae901e7ef90df3bb883b1b378cdb33fe2b30768a965dff SHA512 8e6c93f58edc6312c5eefe363e95ba5d921f1e8351c15db119a1c6bd0fc2b86f0c9c72ee1ad066d369672126a9ae63e3cb90d77a41f1cab0981b7467d5326cff
+EBUILD stax-api-1-r4.ebuild 558 BLAKE2B 22bd9f2d84ec444dd3b5e95f3f986d24926eab9ea23d0cd9756473d1ff9b27c6228f3690128ae7c2a04fa41e54a5c2de4c9cf9426bf25bda513e6c26ee251c59 SHA512 1fa7fe6488ab50728d6caea4f6d7a4d504ec30e0f266bdc58e837d47fe4ac56b9d2efa2fd0c24e0dc443f626bb6360d2c26d66c6974c108fa12ecd1597805ecf
 MISC metadata.xml 338 BLAKE2B db24ab4f9e1a1cb4df70df23629d30f7f5027b45eaca4b28196254c74a819b7a1a8c3b4b7f6d40876e7bb102b886b0650492537331bd54b0ecb924211d87141d SHA512 eab5773e5199dd40c9edf1e49984e77e9c40b1cadffb1f6becb857a04e34fd8a333cb544194b3d6cefd72d4d6a28f1f2987d9d94eb5e730f93f0559cbf32fc3f
diff --git a/java-virtuals/stax-api/stax-api-1-r4.ebuild b/java-virtuals/stax-api/stax-api-1-r4.ebuild
index 224e9b47b06e..6e064129b5b2 100644
--- a/java-virtuals/stax-api/stax-api-1-r4.ebuild
+++ b/java-virtuals/stax-api/stax-api-1-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for Streaming API for XML (StAX)"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="public-domain"
diff --git a/java-virtuals/transaction-api/Manifest b/java-virtuals/transaction-api/Manifest
index 412b960d4402..7f1f19a6b8d0 100644
--- a/java-virtuals/transaction-api/Manifest
+++ b/java-virtuals/transaction-api/Manifest
@@ -1,2 +1,2 @@
-EBUILD transaction-api-1.1.ebuild 463 BLAKE2B 6f001466b93035f15399123de65c3ffb292a2c8d98b3938e53d01d0af2ae3e1811e95910f42717e26e4ebe881505e453059aa797c72520ebd7868b80f6963541 SHA512 0058283a57aaca48c52c5d3223eae4096326bebc2de1f01d24f1baa333c2ffc854958af46b7e9ab67b895d391bb0c674eae43d22460f23c6bf575b8ec79f5656
+EBUILD transaction-api-1.1.ebuild 481 BLAKE2B a3bfb07fa8529feb3979ac95763727f41c61511820a12ac736fabdbef3e62abdedbb3b9eb74e6d4e8d7284a0856b05cfe4575aa906b7a3ed9128a9b5cc90622a SHA512 7c2280e990662e506717ff70a5583b4176639b1d1d5c7a16a1961a03607f3510f8e4747a134b8894d69f2791fe67ee332fe9a4b420b1fd01bde96457289d8b75
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/transaction-api/transaction-api-1.1.ebuild b/java-virtuals/transaction-api/transaction-api-1.1.ebuild
index 1ca3ed30b4ea..13dcd3bd4f00 100644
--- a/java-virtuals/transaction-api/transaction-api-1.1.ebuild
+++ b/java-virtuals/transaction-api/transaction-api-1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for Transaction API (javax.transaction)"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="public-domain"
diff --git a/java-virtuals/xmlrpc-api/Manifest b/java-virtuals/xmlrpc-api/Manifest
index ff3d021d79c3..a2c846b63808 100644
--- a/java-virtuals/xmlrpc-api/Manifest
+++ b/java-virtuals/xmlrpc-api/Manifest
@@ -1,2 +1,2 @@
-EBUILD xmlrpc-api-0.ebuild 385 BLAKE2B 6772021f8f7a3032b6cb3ddbae8fed41fbbba6da8708eb4f7b44bdb481fa9bc47bf7d73f33dba02647c9bf75be7975525ba3fcb4b05fcd9b1a0a5c59f5cf5636 SHA512 93b08ca8cdfd0b90fd2fbea7aa6f15650ca6dfe914947b293e551ecace9f0563134e9ceef65afed2d0ea7970fc9dd1d19f2d7e25104d871e67c8748b41280116
+EBUILD xmlrpc-api-0.ebuild 403 BLAKE2B 7c968fc85b5ec6950cf10b0d367111f41488251aa3691d29e212d6d0cc552aef8cf809a41e940bab3b6c374b699a98028d050d7fdf054876ea9cebc9602769ec SHA512 64263792e770fa0f1b08d7742a26c5eb1502e6ae8ff14e970772cf26b542d2788382160541e25ec216e8e13c0535c20463b840ea50db25aaecbe1309a31d5acf
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild b/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
index c03634a68a37..a8af141da72e 100644
--- a/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
+++ b/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit java-virtuals-2
 
 DESCRIPTION="Virtual for XML RPC API (javax.xml.rpc)"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index b84d6319ecdc..b5ec2e8b2044 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 311b1197d571..9df5e712a7ea 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-19.08.3.tar.xz 331796 BLAKE2B 0e43007a230c315919daf5203f5df71caead01b6c63e5a5ba01b1ac45726adcafcaed7e4a87a2900677baf81539630f4238792d62224d41a6fd86dd17f25bfb8 SHA512 e4c22cb43b7ec87f947ceb2746e159d75f6c370f16a9448c7d6ab46b30ce00f25624fc94f68e5a866651e49689248aa36de6f2d72cd3e15d5ef05eb82d6885ae
-DIST akonadi-calendar-19.12.1.tar.xz 332620 BLAKE2B 352e20cbb8e1854760f2d2d88462b8d68fa0b4cb5452217a19babe5c58335eb3d8166d35f59b129d42014db1511a7e35243f792aa84eb7bb8547b32d458c2a02 SHA512 caa1a866e1ab4de33a9f167f2ac7adfc2e772f0b5d470e33c38861f2008b8dbd6abae9e446c84d47f89f538259a25427a036fac7676501ee91de35c7e48e5447
+DIST akonadi-calendar-19.12.2.tar.xz 332076 BLAKE2B 7c4767427593c70a555564d70c03f5588b5a505b29832eb6b23e137cd398658fbdecb59e8b6483b473cce64181ac3c58f6185d3aab76a46af9cfcfb33b735514 SHA512 6853dfc6633506d4505111c7919c58701784a009e7a41a5a532b99363d9865a36cb05b38939ced9732a4661eb0bd318fb43c939d5c335f9b4c806e6855bb42dc
 EBUILD akonadi-calendar-19.08.3.ebuild 1285 BLAKE2B e7891c8ec2730be2e9cc5574a35443c36e9bed92a994e7d73e7c553cfe4a1e9d9976f6ddb464ee2022924fd09af017ad9d9ce1380935dd823b593f70f27bfb29 SHA512 724f482a8673b5908f4862e3080cab926aced7080037624bbc8f62094d388982af98bcfc929ad69686b810907d9c4d1097a0043ef2a2a875cee393c9f53ec68b
-EBUILD akonadi-calendar-19.12.1.ebuild 1289 BLAKE2B 3b4b8718a0dd55b9e00ca4b0006668042c2a27a6f6643e942d44aeca386914641ec217e1c6b212911f4eda3c51be9fdb65c5495bed7fa55fe373493ef7f88180 SHA512 ccc260c54e77cbcc10d87a1db9ec070de2748e4c98eaba1516956ad395f28fdc090691c033b545183d16754a12786b573d0db524eaf48afb35680cec6e812141
+EBUILD akonadi-calendar-19.12.2.ebuild 1266 BLAKE2B 41f3e9052db51434da60fe7a3e860317d82563bd68a302418bae90a7215cdd93b049c20b53f9481b4540a589b43fc1a5cd5f2814f40c1c97d4b587f4ac522447 SHA512 98e99a40c9f9f161b72ff4def6e2b3cfa26b612fa2997766ddb10e287bfa405226c983f148618a6a229d69ceacea694c0824536e0b1e013ef50d288197d69b4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.12.1.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.1.ebuild
deleted file mode 100644
index 190d6785a2d8..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.12.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.12.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.2.ebuild
new file mode 100644
index 000000000000..c4fa962ef7df
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi calendar integration"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index 6122bc8285f1..9aae6f107b30 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-19.08.3.tar.xz 385320 BLAKE2B b533a1195a5e586b8aac42c44a2320c790db96680d9af8cc75f90a8f531b4ff7f53df03f294c4562edc38ccd6a67012c3205750a06c7a6bbb9e784f37cbb7cae SHA512 e22cb4406e06d4c39bca3ceb9cd507a70091e4ae1919b7ec137ce51c2c8151246eca071ec640ddfc1127cf7496deb945c8c617f3f64434a9739ff5736358d47f
-DIST akonadi-contacts-19.12.1.tar.xz 394300 BLAKE2B 374cf20d4c11df71285fa5fe5f766cdd6a3a4f876be00e87cea41efc18a3579b203877aa9034dbdc07df067b035cf812cbe1d573305db1d5c5b500fed42e17ea SHA512 27d97c1e6a53faaf588e427ef5e43ce56b5c03194d34ec0a3d97eef5112c98444fb8e98454acb3225ccb0b05ae726acb7872911dfcddccadec93354c99228724
+DIST akonadi-contacts-19.12.2.tar.xz 392752 BLAKE2B 422822c9a1376ad49a5abb40b99208345992e8bb09ab16d1a1f75627ed86f3d71fd788dd01d64cb4c650e0d3d53bff2895d9a956be3b3a0f53415ebf0096358e SHA512 e007f28a80e63fd4a2c8dce10ef4b8d0b74ae619590d7e54e5f95ea64907b3494580756aeaa7c5e5686d944c6ca57d5f6f44a5125fa7aeaf2bad2cf2a2085f5d
 EBUILD akonadi-contacts-19.08.3.ebuild 1244 BLAKE2B 48f081a536f1c5904c48c6338156401ce1cca7b0181ffc068dece68e2726c03dc840dda1b050d419220b3b278f18dd3c1f3214d3a30e2e9c048895f33692cd9f SHA512 5f0a72b9fa23866f0ed49e76757cf0f19aecfc1b2140ba85ad229403b0e714197806a50e64bf89f8aa687907784dd0383183ab0ae59cd729150ef3a20789d9e3
-EBUILD akonadi-contacts-19.12.1.ebuild 1255 BLAKE2B 3f788cd0f4ce15aadcae9040d12d25ce7c6d4180cadc5a0757634fab4ad10af984fb07b7f1d96734756f465f0cc81f8f0e8a7f9f8f520b9a743669d972547383 SHA512 2368a611b5d535cf51e6e80c7a12620dc4a48003608966babecaa1f70ad94aa15d952b61ed0b74383bc55772d73c2dc293bf07611cd7b18d4a39b12705dd9129
+EBUILD akonadi-contacts-19.12.2.ebuild 1232 BLAKE2B ded2f61f27451fd2ea9c0a56001328047b5f65694b5cf833fdcbc392144e0159b54d2215fa8375611d8fbddb6cd9db079f10ab9b32cf87ff145f96bbbc691ba4 SHA512 2020462e9bb48d3b3d5867014b56e6badcebe1f7c3b12d8cda642d4ce957dadd3910dfdde687b9aa861a0ff780399c53b92e2ec43f062b0535deff51c267d8da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.1.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.1.ebuild
deleted file mode 100644
index aea2473f207c..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.2.ebuild
new file mode 100644
index 000000000000..1d890f901f68
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi contact integration"
+
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-runtime-18.03.80
+"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index 3e44cc44a14b..00292fb0264c 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-import-wizard-19.08.3.tar.xz 438896 BLAKE2B e49aac5ce6f282933e5c31637ef9230a62f176f1f321118986e1b8c39d37ce9b84fb420524fd7d8a9797cf8e17dd1d9305348a1526405257f397706a6b68fbe6 SHA512 8564a9a7d3aa87583bc486de9eb09d31fcc7e7351bdbed282a0dc17e4aa7caf41b8153341bc1e01c58154563f1b6d1e8b85bd46225219a3ea6e59daeec8b4c61
-DIST akonadi-import-wizard-19.12.1.tar.xz 439264 BLAKE2B 229caebcaeed42b050e59057408741437bcb10e59754c14d5afe5953bdfbde88643aadc6eefb6bea554d630dfc8b43414b53bfdeb6abb37e100cd65bf845e6a0 SHA512 19d29c38e13ccc05053b523f40c71c601433aad2c28e6a325f35a5ce91ee5f61c1482825637d1ba4ed96ebc8aa79f795270ecd588c4d82dbbcc79d98d8faab79
+DIST akonadi-import-wizard-19.12.2.tar.xz 438524 BLAKE2B 23363f821c3fd830f2fae97e125aaaed42b56c5516df89fb79a407e2af161064d1c18448dd72921922f745b2e04f4a1eb1be7c7e265bf3064d088d31754004c6 SHA512 560c36999a808329dc537b44741aea659fd0e87cf9542567533a3adc01aad979af5b2784d61d3b2cc62a1607db9d288896d5c420df198ad130ae1a97548471ee
 EBUILD akonadi-import-wizard-19.08.3.ebuild 1263 BLAKE2B 5837545329f4bd0333fce2b4da61b84a78e35b48c82811e543fa5b776c60c6a7da24981bd5ec75e3767533e7bf84f8cd03d6a88f3deca46f1a6822d1a87a53ba SHA512 ef87e02385d2573679e52289da81450d813bdbae65583b83b8b2539f25a7f007dc67c3be42234cd320163ebd92016b4bff6afc74a3883e11cc56d31657e10fd9
-EBUILD akonadi-import-wizard-19.12.1.ebuild 1267 BLAKE2B 944680fa11dfe7b16c86ab08c1e054a5c227535ef87a92a39e02ea4ed321fbb14c09ca0c94a57bd2409b11e803c4a060b4caf44e6dc2f42770fa22de1b932c9a SHA512 a3967de9a9955e9ed8b661a77c237b08142cf3c89cc5dbaa66c6d59cce1648640b2ef52768174785643a9e977cb23d11392a8bddee3671a298a7cae9b80920d6
+EBUILD akonadi-import-wizard-19.12.2.ebuild 1224 BLAKE2B 998d2e67d928cde7a4fe7f3dfabc6614fbfe24369ad81d3f6a525519f75775c89ade4b52de2774ce3001efcec4ff1757752d942d6d089e084cfd7732b120f777 SHA512 9a05b6098ae66c0e96bf31215c3834aef83b3864856d6697d189f49ed40c58537bc35ce26f1e05160778d8f0ff0083cc759b0a1a2ac122913d1d06d172e313d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.1.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.1.ebuild
deleted file mode 100644
index 1c5074e934bd..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.2.ebuild
new file mode 100644
index 000000000000..16a431359ef0
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/mailimporter-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 60992d470bcb..51ff64408727 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-mime-19.08.3.tar.xz 132756 BLAKE2B 4083a820e8ff6c1134f34fc14c179064abbfbb8747a52c1d7ee82a065ae9c96b8e17ac6857e308674ee41f24ed8993a342adf4ff8348751d275e07165aa02a1c SHA512 a8f501f36107818f5e0553aef7a4b958ad58fdea9c335e5ab53fd4dbb7729f49be2c459c6e3ad3d42ff4807817ef38059acbb1d1a11d1f9f88290758299c84c6
-DIST akonadi-mime-19.12.1.tar.xz 132600 BLAKE2B dc4edee30034853a5471d3a73c7a7d196bf7e1ab6430188cb01e13b04fe02f21ed16a15aa52da8a8650209d71a1cc609489dcab8577a3e4d2a943f386bc2db73 SHA512 dd1ef14d7ec9e51bb677c2bddfb082bd10965e94936e23bacec2a167f68fc3965ea83c3636238d9bd1711dc12e3ab3856bb1dec75a7dc7d2f00f16c2c5ad7c0b
+DIST akonadi-mime-19.12.2.tar.xz 131992 BLAKE2B f6a9b2c252e06e19a4395841f45c4b12e6758cbe1e89a4d05d0ee4f98445de068cad3f37aa8ca5f85ee847e63dc89583574dd6fe3eaa3e55c9b2c598eef5875a SHA512 fffa2bb6169fc7b5d8b3ee290a4c9a3c7024381e95236abf722158648592398922575df55ad39c0323d5b79440b5b936a5d2a0a9ec531025d71ae5f6e451640e
 EBUILD akonadi-mime-19.08.3.ebuild 1001 BLAKE2B 14865322f2adb3724e5fb9a25580a4ddcee2dd96b7d7a63821f17b3ce1699bc82a31586cc552cf18d594cbd3bee54dd67fa25b07368dcf54271eba79b65efe12 SHA512 f5c09e46e63e03592bb74eee1396411ce7ba4b8ce02eecc52df76308e5624dfc451f33af381d70d972593b70838971b1c57cfc6bbf796c7057d4a2181ab46eb0
-EBUILD akonadi-mime-19.12.1.ebuild 1005 BLAKE2B 1920b3aaa01ad1fb56ddeac87d6b9740a938c068b819bc18d20fff7bd719bc2c8454e281d7a8e3daf3795a340958c0d6d4c418616c3650c87579a0b00713a3ec SHA512 a6e36762709eac0725ad0267579f5ca843b348a01e93418acb688b7f146e52426ee1e25e8741bf771277c1f4ae364d77e852aeed3786e0c7a844c3ef7a0e5c11
+EBUILD akonadi-mime-19.12.2.ebuild 958 BLAKE2B 52572856165f96d54fb9c80703703098020240c601535ddc0fb9dfd489ec32e798c457da857490091ccd4a71daef38ba4938cc768c4376556d77710fa85b98f3 SHA512 bdb9d4787f25ecdcf6b9e73afcdea32082ed13bdf4822add32369bbb2027902733feef9b5bd1b3d99deab676c3462ada82c94e886a2422be1691e9ed11bb2ff1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.12.1.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.12.1.ebuild
deleted file mode 100644
index b4be13d731db..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-19.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-	!kde-apps/kdepimlibs:4
-"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.12.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.12.2.ebuild
new file mode 100644
index 000000000000..fcc5783ec686
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-19.12.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi mime types"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-runtime-18.03.80
+"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 2a894587c2b4..47e89ee1ff06 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-notes-19.08.3.tar.xz 24416 BLAKE2B da9f89dcfd54c6a0346865bfa445a294beb0708f2fcd5f12710565779604285730507989f5da09c122ebaef8f950c92f1969e7c0a51860ab24895b930878f1d0 SHA512 de3bd78e98e85020c6eb5922e4033f45d323bbd90843932d223f22592b538d9460e027bd89fbf167e9bdad2c4b55d4142e857f89a8d93ab4530ff6f575e92806
-DIST akonadi-notes-19.12.1.tar.xz 24596 BLAKE2B 802341706acabbbf4d6c1576a95a60ce181f9ef3ab230e80608dbbf5470afcd8843da307b861392a9c4e7036bc86b63f9a3d35d6e4f9bee812b0f8650d8c758a SHA512 8bcecef7a035f98832e80215a42e3a509bf95ba344f644f497fcebd1c8da8cd474eb1634d27b76a140cb185df41a19de2e372fe0328dc91d083c7526baa46ce8
+DIST akonadi-notes-19.12.2.tar.xz 24520 BLAKE2B ff38df5665244aedabc76ed46c737150adab25d9818759e9ad3441db8acba8051aeb33b282c67c69771bedb8614a8a0e830449bc16969f75f84134fedad9e3cb SHA512 66c3863fd90337d71b443654663bd4ad01017a60241dbc418355c6971b685118eba13632dff44f577125d4a8d3cc93688b6f005fa62ca9a4a5875558d2383d1a
 EBUILD akonadi-notes-19.08.3.ebuild 484 BLAKE2B b0cd82f452b3463e9fb77d22941d5c3492a4012f70087528240555ad3837f1a1831f4a093a010d987fb4b46a4c415d9e03edbcaba87900db9685d53b11db996c SHA512 281303e4414240e85712cb26dcae33601af39a639cfb7eedea475a5e41f51b6f2b9dd7e495fbf4e635dbf6d65cd67a3fbe7917af719e6df9800a9591b5f4889a
-EBUILD akonadi-notes-19.12.1.ebuild 488 BLAKE2B cdd6e02bf172b64469a331993a56f1a587dff71f34347de3ad5ccd7732b6317ef536320a017a15bbdc288ef39230f2f16fb4633b1c24eb5ad8688da4f770e4b9 SHA512 12c739b453db2651fcecc67bfe724ed313bdc7ed10926f7d832d22305a3a34329330f77522c93a5eb56d6f66a4e496b861b17ba297fe2793a1538c56f9c383eb
+EBUILD akonadi-notes-19.12.2.ebuild 464 BLAKE2B bf9bedb1407f1cdb73962d4b1f2263675f5738aa88f961b505e01ec8abcfb04c12a3e5625af884b9842b051e78b7a71713b6a6eee387eb1943421fc9bc148a8c SHA512 82fc46f22a8522ec5743cf422fd859f0f3513a026c18c1b0ee41bac9e5c850e19b014bb497d943eafe5cad77695ada4c5375e6f700d7d77b4e01a147d5d1e1c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.12.1.ebuild b/kde-apps/akonadi-notes/akonadi-notes-19.12.1.ebuild
deleted file mode 100644
index bb5a50a04b5c..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-19.12.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi notes integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.12.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-19.12.2.ebuild
new file mode 100644
index 000000000000..01a7e8d8867a
--- /dev/null
+++ b/kde-apps/akonadi-notes/akonadi-notes-19.12.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi notes integration"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index d065d3d93eb5..958a86074b9b 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-19.08.3.tar.xz 82480 BLAKE2B eeba0750d0c77d0942efffd01043ddfb02836a0b1174b9c3848c3f696744d6fcb7c7b0f38701da791db0f5f0a209e41ceac3ff1bf9331562b32944186d85065d SHA512 48e9b6247acab7c8dd874693c7302566b43f7758089a51b2c2e4d4c1eeb6ad6d217529c418254f8d930370d69c977264ddd1919f26a7f692ba0cff2426d0b3ec
-DIST akonadi-search-19.12.1.tar.xz 83184 BLAKE2B 0192e2619c3072a43b92c1d07c9dc5c802d6f6c6334b2d61b35077459b05112ec54be11381e76c1e31ba1213685595b7bd7ce32c90d81a9f5b2922022fe7d3c3 SHA512 f077daaef436eaf0cee61a7f8b130344877f8786908bc719523e871482985a7b81ef4548b037d4bc0dab5c464bb2d1f710dbf3b58e326889be2b74e4a8bdf20a
+DIST akonadi-search-19.12.2.tar.xz 83156 BLAKE2B 9fc08db8572a78b4bb593259a157a37d799b1b00b5e3c8070864c5dda9a83550dcd943eaf8c8a15c6ad2cc980d47dcc76f1820ff826b3b26ba6998cf6ceef3fd SHA512 c70b7e4029352831a6c4715fdb3b34a38660bf08d87a4cd5fa02fc5cbc8be080ee83647c68431c20135a67e19392ceaf21ede8a5eae806593657a026455471b7
 EBUILD akonadi-search-19.08.3.ebuild 1302 BLAKE2B 4449fa1eb07b8ae74e8f2eb003c35ca1e7a0dd92ba06c6e9622d57150c9d9c456c7c8f07ea7a01c9f79158a2a20c6c31e8d9b8e387531496414d37de6fd46df9 SHA512 2619de5aeaf8142f4596e190ec438a7da006bef8554ee5cb568e04a1b4a23ee45b2f09860fa620d8376d7e30a2c4ace60aa73b2f204558e04929c016d524a425
-EBUILD akonadi-search-19.12.1.ebuild 1306 BLAKE2B 3657b13b87125becc27b8a42837ce85bc96b3277dd19d6e720f3ed4fb9dbf8535a7d6db793f53126b5dff809564629016eaac08825e2e46a222122c499feec86 SHA512 e046afd9a2c1041d97939c36d4e519e994acaf506f01a7d0632a610b59fe4ece2907e173c8b9d078739599a369fb18cd044720696c77c3c83c254304d5aed852
+EBUILD akonadi-search-19.12.2.ebuild 1243 BLAKE2B b27feed762028b5a2e29d733885928f46e07b089fbc440cfdbae430bcc69f66af3bc8c3f2bcf1a93eb13a29fbd0253547b138ec348b470f5a52b02daa8e6d596 SHA512 9feea760904f64a74d8e2deb7802a9d69f06e9698c9f1f7941810418214a2810be78650578fb5448146cdf96fdb1dbb341ace4e33e8ee8c833009706066b9cd8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-19.12.1.ebuild b/kde-apps/akonadi-search/akonadi-search-19.12.1.ebuild
deleted file mode 100644
index 4d3475b65205..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-19.12.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-libs/xapian-1.3:=[chert(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-19.12.2.ebuild b/kde-apps/akonadi-search/akonadi-search-19.12.2.ebuild
new file mode 100644
index 000000000000..aef3bdd63a9d
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-19.12.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+RDEPEND="
+	>=dev-libs/xapian-1.3:=[chert(+)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
+"
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 301f2a1104c1..899ceb2fe3a3 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,6 +1,6 @@
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
 DIST akonadi-19.08.3.tar.xz 1579468 BLAKE2B c7df5162768a00d395d598a098a25aa789c2e9694958cef47a014a744b4e7322471b3855963fb1ec63708608a59c29f5cdbf7049848d8a44ad7e88366316c18f SHA512 612cf8860476c32462dfa565c392a94f7fdb60953dc3afe7ea87ffdd9e78ec5f01e44aaf2ba0c6b018fa0f4cc75d1c56da1211daa13eb9589f270c2761da1e6e
-DIST akonadi-19.12.1.tar.xz 1579612 BLAKE2B ea907f3c9210fb3df1ab7d9e0154497fb4c9a7ba72f6f6fc9ef958d7b776ed7c42af49f658cece20f86a0f20dd8f216c9bb9c4d901472a48752a09304126e09b SHA512 3a38f6bbdb12a48c3da63466271d880e8371349ec8eef697b0bd64619a54e0355611fd7e2580b6e1f56b0fdae2cbe5fc9652579b7aff6ddbfae3b8b7e7a152e7
+DIST akonadi-19.12.2.tar.xz 1582656 BLAKE2B 7ff246a1e9bd2813c4c42b972d339009625dffe11fb72872aa1b18debbf1b9178da5a098cefe87a2cbc441cebd02690afbef495656977ad4a47b23db30f260fd SHA512 940ce14b637bcde5f77fa57e90e49d5606b07d2920f0734c12dd801fc3dd79bfa8e7278cfcec725ea2a5c7024ba71f4eaf389a2255176b376079dd409a48fe73
 EBUILD akonadi-19.08.3.ebuild 3637 BLAKE2B 281ee22e026301c8adac6744a2a407d44d44361d0f74ad70976c42febe7ea037ce3b78b8078ce6582f13a593c930baf1754771f0779a7d67d7b6ff0713bb224b SHA512 984eb91c0df1d3ba316a28633139419f8df48cc8f1d454cce738474497e740aa63f4cf5e42dde6c310ca87da59466b11617f99feb41de6c6a286384484872e99
-EBUILD akonadi-19.12.1.ebuild 3863 BLAKE2B 1d21ed207b33f333af4987431daa10d70e46c4ba694f0f7b64c3cfe6ac9d6df310285fe116feac62034212f4a5fadc64713b491f35e9bbc306556ea59cd5083c SHA512 17a99f16fc7de49280160665532716bd0f9c81587acdd95384503b751f7ae9117dc29fd3bcc9518db662c882479aa4aa9518e7e34356c79f241fa8fe99805c01
+EBUILD akonadi-19.12.2.ebuild 3818 BLAKE2B 363347eb64217a37d2be25691f3131a72a253c4b37f2b1855b8cfe075a0622e7f6a4f78ed8386a1fec7b8fc2993743c988b1419a5d759029064e317b7ebc4386 SHA512 e78adbb9722db86f5c42ce337aee30607b2618b4f286f326828df8a58010242bc2b1cbc315c5aa4d2df91fe87e452419e71cd8ddc81310d1e57fefa335900f59
 MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-19.12.1.ebuild b/kde-apps/akonadi/akonadi-19.12.1.ebuild
deleted file mode 100644
index 5296e5776274..000000000000
--- a/kde-apps/akonadi/akonadi-19.12.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="LGPL-2.1+"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	kaccounts? (
-		>=kde-apps/kaccounts-integration-${PVCUT}:5
-		net-libs/accounts-qt
-	)
-	sqlite? (
-		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
-		dev-db/sqlite:3
-	)
-	xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-	test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-apps/kapptemplate-17.11.80
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
-
-pkg_setup() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	# reverse driver check to keep the order
-	use sqlite && DRIVER="QSQLITE3"
-	use postgres && DRIVER="QPSQL"
-	use mysql && DRIVER="QMYSQL"
-
-	if use mysql && has_version ">=dev-db/mariadb-10.4"; then
-		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
-		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
-		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
-		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
-		ewarn
-		ewarn "Manual steps are required to fix it, see also:"
-		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
-		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
-		ewarn
-	fi
-
-	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
-		ewarn "or PostgreSQL in your user configuration."
-		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
-	fi
-
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
-		-DBUILD_TOOLS=$(usex tools)
-		$(cmake_use_find_package xml LibXml2)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	# Who knows, maybe it accidentally fixes our permission issues
-	cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-	insinto /usr/share/config/akonadi
-	doins "${T}"/akonadiserverrc
-
-	ecm_src_install
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
-	elog "Available drivers are:"
-	use mysql && elog "  QMYSQL"
-	use postgres && elog "  QPSQL"
-	use sqlite && elog "  QSQLITE3"
-	elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-19.12.2.ebuild b/kde-apps/akonadi/akonadi-19.12.2.ebuild
new file mode 100644
index 000000000000..99c0dfac96ed
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-19.12.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2.1+"
+IUSE="+kaccounts +mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	kaccounts? (
+		>=kde-apps/kaccounts-integration-${PVCUT}:5
+		net-libs/accounts-qt
+	)
+	sqlite? (
+		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
+		dev-db/sqlite:3
+	)
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kapptemplate-17.11.80
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE3"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	if use mysql && has_version ">=dev-db/mariadb-10.4"; then
+		ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
+		ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
+		ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
+		ewarn "  \"Cannot add or update a child row: a foreign key constraint fails\""
+		ewarn
+		ewarn "Manual steps are required to fix it, see also:"
+		ewarn "  https://bugs.gentoo.org/688746 (see Whiteboard)"
+		ewarn "  https://bugs.kde.org/show_bug.cgi?id=409224"
+		ewarn
+	fi
+
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
+		ewarn "or PostgreSQL in your user configuration."
+		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
+	fi
+
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake_use_find_package xml LibXml2)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	ecm_src_install
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE3"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 36fdd797309a..5577983b5966 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
 DIST akonadiconsole-19.08.3.tar.xz 193848 BLAKE2B 0450da29afb328cf63cd027028f65c6e6c498f7269755631b0a5aa654ed1258f76b6b35fb592dd11c3031ee00cd8a02c27592571c748a3f8ff03b6a0a0596e01 SHA512 dec8b73d970e16906fc21bc10cc6b102f79b3891c2e5fbcf543473393803809414a5bf17045fe504d0bce8cf6bd5456b046d0a47b667b2b5902bb61b31fa2071
-DIST akonadiconsole-19.12.1.tar.xz 194176 BLAKE2B ac14e18808777fbddccf864a38d98f850ca3965efb937bc12a85b04d99c685db07b471ff1c541e75ceda54e0d11f9242f68602ec9bd27a9918d3d56185a4ef95 SHA512 84da8064200016c204d8b8e685a3b4199721b305a7ea029690c571c20f209fa6ccaeeefb21ba461010d18e84a2411fa425620308a10f10e56f8a52205c00934d
+DIST akonadiconsole-19.12.2.tar.xz 193792 BLAKE2B 972ecbebe1d406d871ff266b90a46889e054ec06468f2e4a8c909ce664c9568be1bea202421fa466542f3c3349d9043d8be2c6cda6f2cd59d14f4649a2e38b52 SHA512 0739406c6ec5d847e53ab84a1c91b6dff58835e91a9e04c1acd487bd8c1780369cc9c8b317586e4b9c95b7fc33ea45a75ef0d7f7e4da985be64cdd6ab2d6ec00
 EBUILD akonadiconsole-19.08.3.ebuild 1432 BLAKE2B e9181162ddce68b232c939b86656b9737aff6a0870cd218f03b1261b945811661f24321cb55396ef79a007581297040fc9678d10dbefbd9bb6500d32d533041c SHA512 a156364f18fa648fa8ebcf404f18fc5e632f7492e4d96e04fe308dc68d211a33f840f917a3f95f407cc8a20fffbc246d65b58f80f8fd62033430e99e0d080a71
-EBUILD akonadiconsole-19.12.1.ebuild 1477 BLAKE2B 319018488b40eb1ea99e1046f5c8c58e92d0a1719056500aaf7de47e300a96ca0b5ca8c7ec13e0066b15b466b8977069dd55211bdcc19f2feb44c064d0d9ac4a SHA512 643a3d658bc907d5281186adb5b9bd7c8e0dc84f33fa6b173e5c49d95160dbfcd51d2818769ee9d49fd925a09cacf4ad959871a57f48468fd7ae533c087cb59a
+EBUILD akonadiconsole-19.12.2.ebuild 1477 BLAKE2B 319018488b40eb1ea99e1046f5c8c58e92d0a1719056500aaf7de47e300a96ca0b5ca8c7ec13e0066b15b466b8977069dd55211bdcc19f2feb44c064d0d9ac4a SHA512 643a3d658bc907d5281186adb5b9bd7c8e0dc84f33fa6b173e5c49d95160dbfcd51d2818769ee9d49fd925a09cacf4ad959871a57f48468fd7ae533c087cb59a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.12.1.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.12.2.ebuild
index 72ed3a3d699f..72ed3a3d699f 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-19.12.1.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-19.12.2.ebuild
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index 378ad1fe3385..43480a086bb6 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,5 @@
 DIST akregator-19.08.3.tar.xz 2193472 BLAKE2B eaea7e2136736cf0f2ca568782bed6fa9532d2d3f20bf489e5e3934b99f6ac1d63be43099de7b36a4bcf8c2677ec2ae76ee40a313e8545268bf4de7d196328eb SHA512 96b24da53a1491a51949e5fdf4417b1dc2698cd8914a20b202bd03e598c69d9d7605964ec6c4703efaaa4150c3f5ecd84a92714cd89010f84b27c950aedc2475
-DIST akregator-19.12.1.tar.xz 2194456 BLAKE2B 92b95512777d82b86250a5c86d5ea3f6a2a0f1c8211c24063a85506d99e0eb83ae3970abd73043462a114a23e46b2f5f0dbbec00342c60df252445b9fec0dd9f SHA512 dc5822cab8df24dc5a3a2b7eaa7c5c6001a143c33002da479e856537ce68eb3f131d1d67ef689914fadc9724e65bb79d8a789a496eccdc4fcf6fb0ced8f11f15
+DIST akregator-19.12.2.tar.xz 2192676 BLAKE2B e19c9a6f5ffa1fcf419b7a61628d20be1f3a416c73ab41ca3e3101461b8248412e1b14e689379fb462e69bae741f4e4fbb45929f94e39b6d9a29aeaae0ae8ab4 SHA512 e47aba7f39ca54a9008ac156e2eaf740a76fa40fb36b9f3e9b8aa81db2af9a1ded5789178dccb9ddfa75f5b7234c6bc584c59f4f36033f2f635fd5c87eda2e57
 EBUILD akregator-19.08.3.ebuild 1671 BLAKE2B e0840fffc893b183591a4caca49d4c40af45835c9f718a16d8eafcf888bfe16f1ff6b44381e9dc537e40911fa9fe8353e853eb302e1410fe7c600fe86f95b060 SHA512 245d35df58c352a1bbbf54ac24addba112f928f51b33d78eac9bad74420047f36c01e5ad4265fe079a0e53e42b9f5859b02536cd0856558a38ec02e7054e043a
-EBUILD akregator-19.12.1.ebuild 1682 BLAKE2B a8962736d072196e9477308936493f3ed87f5ec404f6a41891b1b4f7049ee32bdb86e59223cb1683b0172705f72ad746d233dab5ed88c86d57159d394ddfbcef SHA512 ca97009727a16ebf65bb7177a73ab52e73ec20b9ec88791bcf74438309a85278dbc068e38f70516f26a5b9e9be012423b14b0ab592c93e18db2a23a0f79a7862
+EBUILD akregator-19.12.2.ebuild 1619 BLAKE2B 302f468136a0a7578a47a251394eb1182ea99da9c14cdd152c2c768ee122ad8527531e2606d024214f09304f016685a7313b00f6fd5410de17c385572de52a23 SHA512 76f2115e610e192825c34acff32a4177d5ad1bb89fd5eef61106ffbef6e9be5c6dab116ff6a5d4e1f0797da909573f570fc57c7ba59a02d3f54a0b2c07f0226c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-19.12.1.ebuild b/kde-apps/akregator/akregator-19.12.1.ebuild
deleted file mode 100644
index 7f4bfe691bb5..000000000000
--- a/kde-apps/akregator/akregator-19.12.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.akregator"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/grantlee:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akregator/akregator-19.12.2.ebuild b/kde-apps/akregator/akregator-19.12.2.ebuild
new file mode 100644
index 000000000000..f6b2ea7281c0
--- /dev/null
+++ b/kde-apps/akregator/akregator-19.12.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.akregator"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/syndication-${KFMIN}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/grantlee:5
+"
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index d0bf71dbf016..d18e79f76186 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
 DIST analitza-19.08.3.tar.xz 332648 BLAKE2B 33b14050ee7a62f4615c131295e935d73fb59c6643bc208f7a6daf1c34fa1d63d7d404e828cc27904588d9ced23186326a322e9657d4d17c28acfa508f23387f SHA512 962e854383b44b8acaa12188d69dc60122455836275dae3f5f79cce7607a1ce998cfdf18f48d4557b2708d91ebc15964c4842b24aad7f9974b9d7299418912bb
-DIST analitza-19.12.1.tar.xz 333156 BLAKE2B d7e5eb39f212776955bd65dfe789f57fbd788747877784d6cef717b503c6be3de8dbb6d2a1546c8b9134a346b689960140c088d257947b9de960c95626066f7b SHA512 793aba78447c1366860f90a6956e65e3a4af9e16a73c5dfe94a08c34ecb4eca364bf4485ac6bef1448f1748b1ac4b2f0fc3373f8fc194bb9435b1acda86a6d0a
+DIST analitza-19.12.2.tar.xz 332136 BLAKE2B d46531c6205c4232a5f7ba025c302cd2bcd44fc31bb58667763bb40aa8d695bf341668ec0e42236a87a19a5da7221b6a61035ade5d60391ef7806f9458373737 SHA512 7393bdd2a8adfc2bd0963cff361bfcd69aff33cb958e62f696c64ae070bd158e37b595d2bb18ecb14f0785bf6c96b5f8a2c4a18e8762daaeda913541050c8ecc
 EBUILD analitza-19.08.3.ebuild 917 BLAKE2B c33b3670798486b1acd399a129ea24866de050434621e070d31e2b7ae904c70a6dab34591d242508aa39c100b179b1a45eb6fe913ddc88d416d8278bdbb82755 SHA512 2aa644045d232b72c93298f6c78f90169222e4560ad2589297f260cc7649b8b91862c47f487df8b692d9156bae94fbbb403db4e1426842cb4498973998170048
-EBUILD analitza-19.12.1.ebuild 921 BLAKE2B 67defaed84c658c67f5925a0f250a1973c41b7c45120fe7ead0a2c271d33a991056e9ad1d79837bb0ed3f9c564a73dc83169755f1bebbd12d85dc19b20d80ac0 SHA512 d4addeddddde657cacd77d9ad218625ed71399407d5d0bf9c6e27fd3e4098f79c8ad9621d5fd5a2ff702962216d2c621e7938db88197b14800c9eb3a463b38cf
+EBUILD analitza-19.12.2.ebuild 921 BLAKE2B 67defaed84c658c67f5925a0f250a1973c41b7c45120fe7ead0a2c271d33a991056e9ad1d79837bb0ed3f9c564a73dc83169755f1bebbd12d85dc19b20d80ac0 SHA512 d4addeddddde657cacd77d9ad218625ed71399407d5d0bf9c6e27fd3e4098f79c8ad9621d5fd5a2ff702962216d2c621e7938db88197b14800c9eb3a463b38cf
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-19.12.1.ebuild b/kde-apps/analitza/analitza-19.12.2.ebuild
index 37c37e163790..37c37e163790 100644
--- a/kde-apps/analitza/analitza-19.12.1.ebuild
+++ b/kde-apps/analitza/analitza-19.12.2.ebuild
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index ae52965e9cbc..4444b3be8061 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-19.08.3.tar.xz 2585196 BLAKE2B 2f3ad8052ad5ead34d30d5fff41c076e387740ac77c80791a8f600d9158c254592916a92e8e181b98adee916baee2f58c3d668bfdd1d9d1be7a36f7b8d61c07c SHA512 2bbbce37e5f892840517688eb4ce78770514eb5c780d34ae3c33c4b4e60cd153ebc190e4613411d5e01f01a78b6a74bad86c79b9efe8a156250c18033a3271cf
-DIST ark-19.12.1.tar.xz 2586724 BLAKE2B e6aa48b7d3b5461b0ed6f4bf8ee4a64ea42e9dd0e4b7f86190a6f5b4d5d8d73aeb0b53a2eddabc45aa523664f02f2d369f16bd93506471d5d6e24cc376731d67 SHA512 6d0b5ea84f5b6b947bf040ed9b6b1c2f0a1f58f75957603481b47d90b4f5d911aa2331e46bd92b4b3a89307664bbf9726273a96bdd165b5bd108645127df1e8e
+DIST ark-19.12.2.tar.xz 2585848 BLAKE2B 672a9f11e6ca373e2662335e2b8cb0abcc16d82ac87725fe9218e9d80b9b70df0aede21d8551df944609b3d398b775a4ae449f94c62a84a30b00700daa534a73 SHA512 158b25ff9cd8b9b53bb7cb58326ed2c0017bfa534522436eedcd7a2041cac428b2314c8e4b9000fdf84051b767a7619c630b7060153630e8f9a93f2595ed7949
 EBUILD ark-19.08.3.ebuild 2231 BLAKE2B bb87b473cf98916e6387ae8287ea68dde284c7387ab718dce6e7e72ca5a5a761923021a86a5761539f28bfea816bc6fd535338dfc9ad15b0594c419cf5323840 SHA512 0dbc44d3d92050e3c6497dc0442f85a414c032d8cd54f47e3c5dc3b7f241d5c204706dedc3998ad3509058ffd00835f25e82f7b24d63cd635f5a6985cfea5a97
-EBUILD ark-19.12.1.ebuild 2250 BLAKE2B 6ff4a860fee5c2bc03914823791d0a47d5715851e4017768e5829440e11544e277661d13603c7d555893560ea6fadeca9cec4cedfb0a278be40ec6165e81a593 SHA512 fe1b6da06cb97f7999927fc5ed04baaeecb3cd1396be4117c2925c4d91b5fcc6155acbacfd5e7345aa966af7de521cb6418323305d65021a0c6cabbfec512828
+EBUILD ark-19.12.2.ebuild 2250 BLAKE2B 6ff4a860fee5c2bc03914823791d0a47d5715851e4017768e5829440e11544e277661d13603c7d555893560ea6fadeca9cec4cedfb0a278be40ec6165e81a593 SHA512 fe1b6da06cb97f7999927fc5ed04baaeecb3cd1396be4117c2925c4d91b5fcc6155acbacfd5e7345aa966af7de521cb6418323305d65021a0c6cabbfec512828
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-19.12.1.ebuild b/kde-apps/ark/ark-19.12.2.ebuild
index 190dafd87995..190dafd87995 100644
--- a/kde-apps/ark/ark-19.12.1.ebuild
+++ b/kde-apps/ark/ark-19.12.2.ebuild
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 2a4267bcbb90..c4e937f10207 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
 DIST artikulate-19.08.3.tar.xz 3998692 BLAKE2B 77849480349e3edbd6b6a98884cc25b28ab6246dd36991f728659d9535f751ff68a13065fca4c510d96b87bfc12982f8c911cb59de2ef13ef33886d8ae157334 SHA512 2c27d37462fde6fe4b1b68efb96f71e4ee4b88c2685274872cad44a264a46a98bddc143d2074b3ccb0fe214a73abd54de204a52aeeb0ddae150a55c0c08ffb8c
-DIST artikulate-19.12.1.tar.xz 4004664 BLAKE2B 1e7214a2f30fb3da888512e645277160b64ad35767d84327f12b22350a74fb9b3fad9e3b8050be1c6e80a1cbee6fc640757084dcb4b6810b802752bff43e0bb6 SHA512 b0e648adc7ee390ee31a2259b2ef891cdf368e6dbdf57c397280447920fef853d443e6dbe7f557dbd6d50c52ce944ee9f87f0021f231af2f888c41480abfd476
+DIST artikulate-19.12.2.tar.xz 4001912 BLAKE2B e6e4daf06961a561a009f995fa5ab460e90e883450f56d5e38efa1272e986a594f943df29181969355b192b447388dbce609a32e431f915fe943f84ea6f0f9f8 SHA512 ef316a11304f6fb131628de8b5a8848ba332fe7709ad7c0c641548518469248432a05af04ae1e78d0bc8d8953aa1b2aaaedc0bac78fe834b65e218bae6dedba8
 EBUILD artikulate-19.08.3.ebuild 1291 BLAKE2B ec41db6f49861a90732a61b1106333ecf8dd80b8cf6cbeba7044ea46e46c7ea562dc8267a0046099498dbd9ef9af4e7b44e8bb43bed27b89912bd01ce8f5d15d SHA512 6728ea8ea58fa5efd63d235a1f4641f21c7bc4fb2e0aa33efb86e73f0df5ec7ed70681616c98c509fb1e97cfe7816626c50cf6cb386c76bd84c3d0875432b28d
-EBUILD artikulate-19.12.1.ebuild 1263 BLAKE2B 0633d9f8f854c030271bcf26e6f359f94f19da5ae203aacd30b3a7397e1f6586052152347c49ecfbf5c7bafd7b532deff485d76b86eb96df5dcc83c238a5d322 SHA512 f7b0e5c78134c39d163b6891e19d3482b7c88fddabc55fff314174fa6a44505e8ac140d50af0b34dad4daba67fe7c5ecf705de225242bf51a1c4cc6357c229d6
+EBUILD artikulate-19.12.2.ebuild 1263 BLAKE2B 0633d9f8f854c030271bcf26e6f359f94f19da5ae203aacd30b3a7397e1f6586052152347c49ecfbf5c7bafd7b532deff485d76b86eb96df5dcc83c238a5d322 SHA512 f7b0e5c78134c39d163b6891e19d3482b7c88fddabc55fff314174fa6a44505e8ac140d50af0b34dad4daba67fe7c5ecf705de225242bf51a1c4cc6357c229d6
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-19.12.1.ebuild b/kde-apps/artikulate/artikulate-19.12.2.ebuild
index b252762c31c4..b252762c31c4 100644
--- a/kde-apps/artikulate/artikulate-19.12.1.ebuild
+++ b/kde-apps/artikulate/artikulate-19.12.2.ebuild
diff --git a/kde-apps/audiocd-kio/Manifest b/kde-apps/audiocd-kio/Manifest
index 76827d0622b8..9e530be684cb 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,6 +1,6 @@
 AUX audiocd-kio-19.04.0-handbook.patch 717 BLAKE2B 997c82779a9598d0ffbb0605ca7b9f71ed62298ea3f3acb2ec88ee99417dac84fd8e6ffa0036d036346bf28612c6bb4323ce2e4f62316c4d321201d00462e665 SHA512 7601c79145be90cc9a49eec28b8ff63e275212d76d4faba779a1cda53c45ad863cd638de64d522c099a2c8858275c92058928a6f4396951aaf370277189e72ba
 DIST audiocd-kio-19.08.3.tar.xz 355684 BLAKE2B c2cdd23f8138982be9eee050a3ed803898f76abf7b1e1aa8dd5a2fc1509dd89c1b26540728ab11461ede2fccdc8799f8ec3731882cf94f4eb89f9f27068bcc64 SHA512 602d125e05e3d86256860efd8bc822373b8d4c464f12ff05c811e16a5adc0d48fcd0523b09b521f5c759021e3f0c2fe47d57928f4be3132a757e61748d447b9e
-DIST audiocd-kio-19.12.1.tar.xz 357524 BLAKE2B 1b4bac11d8c9a2c4c9698d79134cc74d08cd9401f8ff5688089b76afb1d8552403032228efde140a89543b0c6f5c8060325bf86e1bb939170743155cb233cc55 SHA512 57d4dda06e807d517f1212f3f52986800e3edf891ef32447a4bf0ac7370df180212401022d97c8a6f028070d61134a8fb66e3a39d6563e7665db09b5f59a2e51
+DIST audiocd-kio-19.12.2.tar.xz 357144 BLAKE2B 35531cebf675d5063027c1ce855402702694828bebd70114081ab75f81bf28a521046ab0eed28583a0a7d61bbb7888d39f36d988d8dc2ca282d582943b617dc6 SHA512 2420bc90cedcfd50b4c0d1dd0e442c8c55b014ffdf050880c2f85b15bfbca03ae8cf039ff7736042c72bc209441c44d29a0abd8f534a52838060693b967c3688
 EBUILD audiocd-kio-19.08.3.ebuild 1074 BLAKE2B 5d964460e1cc08caab19bca5d0a1f26d641024b5007b6589d549ca38934aad5c490edb3a504666a215ad0db3fc0d2a9cc109968f4d424f0fb7eda5f1ce05c8e1 SHA512 922d6eed629ef335a9284c213cc9df5e044e54462a2d2509240377422e7c71d444722687ecf77f8d2c4f1ccb5429c77d7a79e920ca7a6c3c1c50813aba102aa5
-EBUILD audiocd-kio-19.12.1.ebuild 1078 BLAKE2B da38800c402d33dd1297aff3bc1df86267a7774b3c95a1a0941010016a3c3a6a71f52cfba6696c0263e566cc209509f7deb5c97fd0c5026a7c023cd62d14b283 SHA512 b42206a43bc610c9d73ae506c20d5ccf979329050ed6bb8a8b510f474fb60110547c81850c5678dd97f48ff88f913c9a3430c1d4ea7879c636e3ea56e224854b
+EBUILD audiocd-kio-19.12.2.ebuild 1078 BLAKE2B da38800c402d33dd1297aff3bc1df86267a7774b3c95a1a0941010016a3c3a6a71f52cfba6696c0263e566cc209509f7deb5c97fd0c5026a7c023cd62d14b283 SHA512 b42206a43bc610c9d73ae506c20d5ccf979329050ed6bb8a8b510f474fb60110547c81850c5678dd97f48ff88f913c9a3430c1d4ea7879c636e3ea56e224854b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.12.1.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.12.2.ebuild
index 48c9e0a377ac..48c9e0a377ac 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-19.12.1.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.12.2.ebuild
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 6df57b2187f8..a3494d5a289d 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-widgets-19.08.3.tar.xz 261744 BLAKE2B 43580ec151165c1c5c59363a986e049e3366d1da4ae2ee79de9430ed9a09e9dd60be13ee5f9aaba92032be901be6a0ab497ae45a0735f0d0f64c8ee387d8b732 SHA512 f63525822a3e90e1f0c13e6b8d893f1e796efbd6061cdb6b976d9869e929b1c05ad5af1a955be0c7664372ba82f87978337a4ff3b4141d30cad80ad4606fded5
-DIST baloo-widgets-19.12.1.tar.xz 262636 BLAKE2B 6c7786276a59a6f75560b77a03bf6b6f9e3e9f7b9876c9c2520c8b934f0ee9ac7f2a517d84e6af1b082d80645572d4cbf008d88f1ada3521a713544e7b861264 SHA512 8a59cfa97c7770341efd1b49f784f3f621b9b5ef6f5c3e51fcae62c24f56c805c1bfaaab4537e868613caaf9ab5bd0bdc304e30ab4f540fdf82de07c3f9427c5
+DIST baloo-widgets-19.12.2.tar.xz 260908 BLAKE2B b0eaa9709db60cb851ca48c9d03512e017fcac924b24969fa1161cad72592ebb7237e034fa320ab97afd856fc603178fb929831868433a37bd326908d4f10271 SHA512 810901328fed4f2f53e28dcd2c447c881af626e4261763dd3fc0a3dba527a196c7a0a4b619a05768b6c8503cf974ece577b134313e316c54fd9c0896a53f39fd
 EBUILD baloo-widgets-19.08.3.ebuild 696 BLAKE2B e48b1fffae9384769f1f5470abe88d5a5b979860e2272322fa130f6f08514e2056e0e34570a1f28ede2a05beb00da78753ff5af5d3b72ea8c2c93032d32ba878 SHA512 72e615e2a6b68dfd3b6b0fbbdf129c667ce74c39feffd7028929d2527a7da685478416f1cec27e658e1b8707ab1ddf6c9ec49ce8fed50da3756ea8bffe08d935
-EBUILD baloo-widgets-19.12.1.ebuild 707 BLAKE2B b9a48bdb0dccfb3f89ff72768664c6937f4f4e9d17f5faf93fcd940f10c6d6b6bf32b1947e442d5c4f7c4e8c886843b24dc0c39b5d1c7b7fa5bc366318094359 SHA512 58d6cdf47bbedd96f5d10203eb74dd98a89c132406c1680d155258d61561ea553867de51811e6918c41a7e538cf3af092c50d79692d888fc4bf60510da967c88
+EBUILD baloo-widgets-19.12.2.ebuild 707 BLAKE2B b9a48bdb0dccfb3f89ff72768664c6937f4f4e9d17f5faf93fcd940f10c6d6b6bf32b1947e442d5c4f7c4e8c886843b24dc0c39b5d1c7b7fa5bc366318094359 SHA512 58d6cdf47bbedd96f5d10203eb74dd98a89c132406c1680d155258d61561ea553867de51811e6918c41a7e538cf3af092c50d79692d888fc4bf60510da967c88
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-19.12.1.ebuild b/kde-apps/baloo-widgets/baloo-widgets-19.12.2.ebuild
index 71c73f3ffa35..71c73f3ffa35 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-19.12.1.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-19.12.2.ebuild
diff --git a/kde-apps/blinken/Manifest b/kde-apps/blinken/Manifest
index f554a58ed4ae..fb8b158ac380 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
 DIST blinken-19.08.3.tar.xz 2820600 BLAKE2B cd367cec7664004be89ee242ffc829d4b0e02c76b3c94267af5b3a584012362644917e9dfa051ff9497dc56fc57380a33e0f7a96a09a70fd7cd1784a7cac6037 SHA512 0dd9d9afbaab7365878c4137e520e31cd1809a243598e7d1eb0e51b638306edc7860c9c057326f55f1ba3720f0529b4859cbcfaeef094811af19c07466d65c61
-DIST blinken-19.12.1.tar.xz 2820888 BLAKE2B 4799a80cadf2b08466cb7175f4420a92e0ef1ff419307deadc81c1e77b52cf955674649bf1cd8615230a1ae42b0e0a36989781c8dfb47071cae6de915e049ef9 SHA512 e38444715b47fffa3e2c59832c1de72e45664bb3c585a6fb751154865a567717ee3c0954a90cd3ace807d7903c79d3af94422ece58b3c411c9707da470b158ff
+DIST blinken-19.12.2.tar.xz 2821680 BLAKE2B 9a6eff25af9efdd6df9b2ed647178ec99b3bd52f3af593849f55b0306d8f2f0e0775da4dc4dc351766608c41bd52bdf68405216828d8db6eeafc3f33042d51c6 SHA512 609f44a0eb705c9d1f46e64bc4beb1ff760137dd0e4ad821108040824c064f763af7c03332e6ad86bc64fd568b3d478116cfc63f230d7ecd3f81aa37b504ab2e
 EBUILD blinken-19.08.3.ebuild 911 BLAKE2B ee8f08d87279e273d6b88bc73aced86e56f990d585a7045f5b527858a5666b1cc69792e9d3ea28a08ad3adf168d1a75aa25396da3c3ae91ee31967f47b3cb48e SHA512 3fb4195244031f0555f0ed4d6c282a1fdaa84139807794a4112f35c59cccf80e2a64fa2c718ed8767042f4095673e60cbcf0b51ff951e770380ff378a30dd439
-EBUILD blinken-19.12.1.ebuild 923 BLAKE2B 2e4ec8316b0791be7dfc930e61b5be5e12c2c5ba81d37d395601e2e8d5bf5d70ec9cfb623987a7d934e8fb6ece5178be0cb956af4ed5d2db21383d51d7c7744d SHA512 9621d37ad7258bdb9c0f30bd6230910a5226fba942d7133c3324c6626a39b841784262b0b8cffbf26b7c2e83ef121fa0e381a97f71faeb53aa1cb1a3041c4a16
+EBUILD blinken-19.12.2.ebuild 923 BLAKE2B 2e4ec8316b0791be7dfc930e61b5be5e12c2c5ba81d37d395601e2e8d5bf5d70ec9cfb623987a7d934e8fb6ece5178be0cb956af4ed5d2db21383d51d7c7744d SHA512 9621d37ad7258bdb9c0f30bd6230910a5226fba942d7133c3324c6626a39b841784262b0b8cffbf26b7c2e83ef121fa0e381a97f71faeb53aa1cb1a3041c4a16
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-19.12.1.ebuild b/kde-apps/blinken/blinken-19.12.2.ebuild
index 5605430beaa9..5605430beaa9 100644
--- a/kde-apps/blinken/blinken-19.12.1.ebuild
+++ b/kde-apps/blinken/blinken-19.12.2.ebuild
diff --git a/kde-apps/bomber/Manifest b/kde-apps/bomber/Manifest
index 53bb0a47027f..24c8e27717ba 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
 DIST bomber-19.08.3.tar.xz 821164 BLAKE2B f9bd278b6aadd58421b36155de6e4a6a9e94f492314dfa99b6dc13bdbe562cbab01061ef79b8c1029fd037c6f74e5d2e0ca5ddce8ae998d1d0214a6077812c38 SHA512 991e6601fa5c89dafd8e25fb308ad2ebe4253bf0019e1dfc298128e2003ba9d01ceb21160ff44aa8fce46ce39fdb7152185cd89fa7b1a30e65dc9c04d32c4f50
-DIST bomber-19.12.1.tar.xz 821688 BLAKE2B 05213bae84e19f1fadfd31e523263177d8d3c60c884e178a1ee980e7fbc2ece5a7780b37b3c896c59eb45a05666c7665f3aa4129c2c725e55132b048e58dcace SHA512 1b7a42430768fb697ce98ce9f58fc348d8bdb9a9156960987f4b054e3be3cb9b892f9201f9278a772908e28cffd2e91e9442ca9a4ac92748dd3f4946beb3e170
+DIST bomber-19.12.2.tar.xz 821388 BLAKE2B f3e3e8fbb13b58b6ebd64fd29c7365a24446ecf92c3a2c7b91bb989a3a2d894e60de467fd84172307fb87b0dbf222c736d6135b7045e131671311de462f4c427 SHA512 2ba581ce80021650562d294cebeb8621ca91949785f63a3c17d7746f14c83fb6aeda4fffe4cfbeffacd93aa64d1f2490f30c0597fdd2442edf305919f9eaae89
 EBUILD bomber-19.08.3.ebuild 850 BLAKE2B 3c357e6b604729d193e6c1013feb511213e9cfbebafc64b76207ae61224c27f6a1d4470881deb70a20916e757224d50d7cc51da3d11cc400616acd973443de9f SHA512 5f9c1b9b386c12a3de8404dc6597c67def9cfcead77d52ef8edb26e1d4b706a76d6d428404e225b3c64dd73d3db416c5bc4104b98fdfbebc3da22f2b21e3d48f
-EBUILD bomber-19.12.1.ebuild 861 BLAKE2B 0a5e0be5365eb72b2101b9380ac850f83f9e7364b623bf446f55afe173115355be7a4d3432e680b4d71c2c5a3b83728e40addc44682d60c77c69d7e8e676f95e SHA512 0ea3c9a4a242bcf6f205bceaeb0b869ac68ca08a6edf2b394ee1af923e11348512def14a9516c8af13e86988569ab9fd3bb4881c4344e5dff3ac2e86aea172c8
+EBUILD bomber-19.12.2.ebuild 861 BLAKE2B 0a5e0be5365eb72b2101b9380ac850f83f9e7364b623bf446f55afe173115355be7a4d3432e680b4d71c2c5a3b83728e40addc44682d60c77c69d7e8e676f95e SHA512 0ea3c9a4a242bcf6f205bceaeb0b869ac68ca08a6edf2b394ee1af923e11348512def14a9516c8af13e86988569ab9fd3bb4881c4344e5dff3ac2e86aea172c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-19.12.1.ebuild b/kde-apps/bomber/bomber-19.12.2.ebuild
index 21e75617edf0..21e75617edf0 100644
--- a/kde-apps/bomber/bomber-19.12.1.ebuild
+++ b/kde-apps/bomber/bomber-19.12.2.ebuild
diff --git a/kde-apps/bovo/Manifest b/kde-apps/bovo/Manifest
index 2355f23c801d..4ebfb68b6ba0 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
 DIST bovo-19.08.3.tar.xz 200164 BLAKE2B 706ce9e463bdb72c8a6f2f29825e2e0d7c17df8ca7713de0d0705a0bda3455a589441aaa29fd50751bab8403c3a95d5f283f2bcae8600a37c904f671dceabea1 SHA512 f92150ad31b2230810c573c1ee1f5e5d906587823c747bb347ae62a39385f45b62c28a6452ada80c6c3e7b71c1ce87892d62d4bab41f80bf3fe5da09c3c8a349
-DIST bovo-19.12.1.tar.xz 200264 BLAKE2B ab28684a2f05e63a456cb411c1c859da7bbbd9de8251904175d12bae9c6a01d694e7ab0c77b7fb56dd7b85a292b12c44d14a74754123e5eae2303e803244d38f SHA512 5d4f6dcd9ff1d43ba06f968a153113a8094669711ed82e4a17e9b216704e6288f51c53d2d388eb56bf87f4a832133efd2abf35ae78ca8b22bb17ba6d05b8c335
+DIST bovo-19.12.2.tar.xz 200216 BLAKE2B 4baf4518299bec6c115c01391f8e3de96860feee3799c8bd28d585d85e814442a19348b79b6938fa60fc707158fcb69ba673848461753a5a2e060b23b5033cb9 SHA512 288d6f28aba818745e0bdc7577774c76e942ddcc90dd5b20b1f919544bbba66c1447306a881952442a364cea14d08fb2f30d6f1f6cca28d6270ea5f772f6048f
 EBUILD bovo-19.08.3.ebuild 863 BLAKE2B c913b02f3631a41990e2c83ebbe30a50357010b7afda089de04a855b2efbf30236b49c35395ffb785aae5d234abbaa5cbbf84a537c668c956edf36a363c380e1 SHA512 2982c2c591cb2cdab9ad4f83ead1c35a0302b5aecc17d94a22f73a727133d19fa88793cb3f13fc43e9ac1b997ab20e6da7bb13fc047aee10ee933ded19466842
-EBUILD bovo-19.12.1.ebuild 874 BLAKE2B abd669af1a991ad9e87ca76c740f0b6ed4a0a89dddb47dfb507881d5bb3baa8897c30fa74aee21c8ed727feff79e173e9547632762e6dda451b00fc0914bbe53 SHA512 cab3321a60f2199943950df90d1f4e2b7630509ca0072e64912467ec2872b3e60679e23211c83a850e0067dcf06325703df34ae8e17f5bb31ae1ebcd992a573a
+EBUILD bovo-19.12.2.ebuild 874 BLAKE2B abd669af1a991ad9e87ca76c740f0b6ed4a0a89dddb47dfb507881d5bb3baa8897c30fa74aee21c8ed727feff79e173e9547632762e6dda451b00fc0914bbe53 SHA512 cab3321a60f2199943950df90d1f4e2b7630509ca0072e64912467ec2872b3e60679e23211c83a850e0067dcf06325703df34ae8e17f5bb31ae1ebcd992a573a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-19.12.1.ebuild b/kde-apps/bovo/bovo-19.12.2.ebuild
index 61cdf9d8445e..61cdf9d8445e 100644
--- a/kde-apps/bovo/bovo-19.12.1.ebuild
+++ b/kde-apps/bovo/bovo-19.12.2.ebuild
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 9fab8e84be0e..5b9eb7164532 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-19.08.3.tar.xz 223564 BLAKE2B e0d9f01659a471307db2c7d8c0906297ec4a880cb0019414520b29a14eee68bf39b02d02dd4e5b3b03c3684022f675f30cdb6efb214adaca64dc27f5eec03c25 SHA512 4cc146da96f6a006749e4c3e0962155fc8bcd788d2ed39adbbe73f1d82bc4264349ce06a9b524ff4fb1a1675e0d66345e5bbad8044360b6fe28d9565672f3922
-DIST akonadi-calendar-tools-19.12.1.tar.xz 223748 BLAKE2B 94850f9537b51468b6c91cbb6203b3fa6ff6dc4019beb1d1e852c594cc82e24855817f91ca5ba54273ab2bb60fadcf0f55d6b9c3cd91f863cb9fb16ebda78ad6 SHA512 aa3741db2df022b3669f10d1dc988380ff88b9595653fc77314b97910ef8c2f25193d159b8e86a347f773f0a6a09633ef82ba71a1fc2d769ee50a3f3c501668e
+DIST akonadi-calendar-tools-19.12.2.tar.xz 224032 BLAKE2B 1ad3ac8e3d7c9fbf1e7224478d4672c66058ec6f0be6094e72f55796ffa993c9a138180e7ff37a313ac03192f15b61c23d44937ae740e107d279cc03ff7b960a SHA512 8bad2fb28382f713cd23b4ea7eee9d59c37097c05cb15f2c758da78a804081a67b52be9ead0345e881b4be3b47a578517718ec2a517fa2ed1fd077046acf1502
 EBUILD calendarjanitor-19.08.3.ebuild 1102 BLAKE2B 6e63e0c53b76a31eaeb7b19716b851e1e93bd24661c5f1c6ca7d25c15e1442ac3c578fc70359d66e946f924c7845e6cc5994d200213822d706f9b1f3a8a28735 SHA512 b47bd05fbd95ee39b937b01ddc500940250eabe0c887e079a63812989eac19d0d14280c46fa1e31f078c960a711aa5a0433c11828dea40d18424d753c5117d00
-EBUILD calendarjanitor-19.12.1.ebuild 1105 BLAKE2B e9049ff84ecb4badb0cd07baa7e8c7d6c8c6967ef1fc10e617aef1ca73825aca2bc8316d4d3944962025fa669428037f84b8f3b6ba8a8e249c4613b6361d60f0 SHA512 77b7ccfcb47854c2b5f64cd01c6f52f37373de58fa0fb4c329db6fdc5eefff71686eefcfff7ab115071295c07d57809116f702a8478977f14387cd056eded24f
+EBUILD calendarjanitor-19.12.2.ebuild 1081 BLAKE2B 5b7baa104eb74a119cd3be9671f23c1893d086ea061da73b3d443d96f5399abb1adb5f56f75d30980bae387eca41fdf808a0af67294189713728af073d9c827f SHA512 ca2f0420b2b4d20a90312faffe4ab4c88107e6b555f5754932e2282ac47fc501a0646ec8f97179dae87093b95c347f06c103dac22ae01b98b9736bcca9fb977c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.12.1.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.12.1.ebuild
deleted file mode 100644
index c06c07189035..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-19.12.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory doc konsolekalendar
-	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
-	# delete colliding konsolekalendar translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/konsolekalendar.po || die
-		rm -rf po/*/docs/konsolekalendar || die
-	fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.12.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.12.2.ebuild
new file mode 100644
index 000000000000..5894e3ecd9a8
--- /dev/null
+++ b/kde-apps/calendarjanitor/calendarjanitor-19.12.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_TEST="false"
+KDE_ORG_NAME="akonadi-calendar-tools"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tool to scan calendar data for buggy instances"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory doc konsolekalendar
+	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
+
+	# delete colliding konsolekalendar translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/konsolekalendar.po || die
+		rm -rf po/*/docs/konsolekalendar || die
+	fi
+}
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 9979c5b358fe..3b44e729a1c9 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
 DIST calendarsupport-19.08.3.tar.xz 646440 BLAKE2B f43f743cf6cbe39601cab39d38565f129f6470099770d60ca9805ab4edc7d9ee8427675d76e5f9b948ee3ee47e119661263519f4121547f5ef6778b7f9d1d7c2 SHA512 a93243c625aab807cf04c57fe60ccdac9d4bb341da4639ceff5aa0c65d569107ebae8a07dc0053f2b83028e9729368a08969dacbebdba8e645fa108b4e1ac567
-DIST calendarsupport-19.12.1.tar.xz 646696 BLAKE2B 38350aace83cf28e9b5d0f63f19288f7cb2da1ecdae14254a227b16e8c87f2791b055b476e9919ac80065126d41da280a7d75302783c42a0d9181e0f532ae4ac SHA512 51cb01d0b7cb6c78199fc73fc3d0714ec5e8163b585a06245ca6dc0f133686fafdb11adfd401dc456a8dd151d6caf8ff710a30acf58a1ee6789280f26ab6f7e8
+DIST calendarsupport-19.12.2.tar.xz 647368 BLAKE2B 7eb3974a7d5686bef62f98b097654d090c73c3f97770c613f7b4fb3d68cc4bd957817a6104ec6e09610e6e6bd34ac388f3c09ee6910c51a44e01c0519fccad4b SHA512 c2d83d166ab24fa85ffb17b49d32d16f75f97d438481dad5f6b25363e29f1a06d3a884618439cb50ead422dfc07a7451f4f7a9515bb05130dfa7e6234a427bc9
 EBUILD calendarsupport-19.08.3.ebuild 1296 BLAKE2B cab3f26af8669a71416f63646bca05574cdd9cd79e67af4feb680d4419c42fc9da477fe253e47f9cd2986417431501281c8fa884083813845da71cc03192c39a SHA512 1f59436062c95dc63781378cec3cd342cb201aa0db95ae95fbbe86c1d2debc0dfe7c7199103083194b820c88f39ef10069c7f96b72be9451bb19b035b6fb12a1
-EBUILD calendarsupport-19.12.1.ebuild 1259 BLAKE2B 58048326d5038e8a76b318c859f69bdaab1145948acf602bc3065f920ed6d4e43dbacfcbfeb10c619e0053adb0771b5c9cb5fa7f32e79eabf1de2a6319c455a9 SHA512 4172ae6965dac487f19616c941456c6ace39cb49a38f11e065213d44916f517703a2529ec0eaee6c0b97622f3f614e8b943a79687d311c72d9b94618a1ab99ce
+EBUILD calendarsupport-19.12.2.ebuild 1235 BLAKE2B 8cdbdcf6da5788cfab4f4275b6c5addf890306449a6095b3276f2dd7c617684cc19b8ef990d463a8b0533c03db1856ec917f930ed38c8411bd21202b97374166 SHA512 a391f7b686b9639d0f609b20f2625c6fa2277bb56e98088b2f4c182860adae4a751861819d8733510830c7e07463d0089bd23f3e5a5582a5eedd70215b81a283
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-19.12.1.ebuild b/kde-apps/calendarsupport/calendarsupport-19.12.1.ebuild
deleted file mode 100644
index 1d3a4b2384e0..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-19.12.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/calendarsupport/calendarsupport-19.12.2.ebuild b/kde-apps/calendarsupport/calendarsupport-19.12.2.ebuild
new file mode 100644
index 000000000000..5da9a8a18de1
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-19.12.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Calendar support library"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index d5f94b472971..c859665064f5 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,5 +1,5 @@
 DIST cantor-19.08.3.tar.xz 2538816 BLAKE2B e2445835eb6ffb368b50fab2089642a28ee3548bf572d3265b152696a4d45e1deb984793bae2819361132097f5dd19ea98ddcd7643c3675a8fd7c3f2fe3518a0 SHA512 1dc545c2c122d0303d418c757d7f4079250354e4326f2ec0d4796de343d00beb580ab47945ecc6ea491f4cd893bbfe6fced7eeb0ab8e3122000b4c75912ca807
-DIST cantor-19.12.1.tar.xz 9011172 BLAKE2B f6953676198c5ca41d8591f30e822e8c0e44e43751b72264dcdd1b5282bcb5da60c9472bea52828cc465d7d177d0a983b7a7408e9f63482cd1a28c768570cabe SHA512 2466de7265a79a199c19b62b32fd27a949eee133bac187f9fcf46a7154aab279490f96403f4c5f61c052c6dde6ea20e35189c337c67a8f86e1a8ef1c3e82eb76
+DIST cantor-19.12.2.tar.xz 9010060 BLAKE2B cb76bab97ce29771c3945b911472ed242224c2312c36ccd44eeaeab0b027fc75642f0bafbc39b67c67f1f31c3079cf40fc9a2090cc489ce6ec642f948f4857de SHA512 bc13824d41d6752700b6881eeb1316e422dc2908c7d628dd1401e348b74690e0acf3b6d6b096a7034ecb09a91b96f4c9b30d00b160bb994ffaf065287e81fcbc
 EBUILD cantor-19.08.3.ebuild 3284 BLAKE2B dcc251814d6078991e75f8c7bed3aaddb4f55d4a8fa9cc5f47448acecb644d07bc096ec38c0fe327e7e7cec44baa98178e7907b9c2f558728c794e08b2a73511 SHA512 4ebdd3ec3b7545c633dfd686f7f643ef70d74a7994ddbed6d5979a203c2886f2231b052a2818d4f1fe7f1c76ac8b83bb43bbd8fa7339d282c887f3d041c79da4
-EBUILD cantor-19.12.1.ebuild 3235 BLAKE2B 86c2e67f8ac45824d17e7aec04964cd6139c930d1c0d08c1913854418bd408bfc9a851afb9b0b68e9dc85ff27ff3e834912f90bc0426d295b893b02993604fbd SHA512 95899daf607cba2f3bf273f8f09326e88ae6dc5d3cfa1e2f3c02b8bed6e89dcd5dc7326f8aef006890545a406437f230b0da21e947743b56f2c1b38235f8fa62
+EBUILD cantor-19.12.2.ebuild 3235 BLAKE2B 86c2e67f8ac45824d17e7aec04964cd6139c930d1c0d08c1913854418bd408bfc9a851afb9b0b68e9dc85ff27ff3e834912f90bc0426d295b893b02993604fbd SHA512 95899daf607cba2f3bf273f8f09326e88ae6dc5d3cfa1e2f3c02b8bed6e89dcd5dc7326f8aef006890545a406437f230b0da21e947743b56f2c1b38235f8fa62
 MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-19.12.1.ebuild b/kde-apps/cantor/cantor-19.12.2.ebuild
index 33a7be46e6a5..33a7be46e6a5 100644
--- a/kde-apps/cantor/cantor-19.12.1.ebuild
+++ b/kde-apps/cantor/cantor-19.12.2.ebuild
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 9cdac8c2adae..81d292f6d487 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
 DIST cervisia-19.08.3.tar.xz 1894440 BLAKE2B d5aa3e9404960fca3f241e7c96ce01b5f3f45840d17585d3d3710287e11375d65deabfe21642a26170e9d088743c8acd2bb941ea5ce9484ec1d451202ac74271 SHA512 82253694b67dfdc87f2887d5a2b1866929440439a66b0145b546207786e2509477a5b3766be378e760f3f6f2a224f8c084e8f4280f980e3738ddcdd571dfb0f3
-DIST cervisia-19.12.1.tar.xz 1896352 BLAKE2B 706520fd9667b59b11dd48f4bf6d997521618091bfb2b619d59fdd6abadc0f18ca7b106394781df1f7a4a1139f6def52c16d8edb7ef7d61e541e1d92e480e7f4 SHA512 c3225f97eefbac329a1111093ca4a6aa600c0559c29081b52ba87f8470c1c4762e059670f82278a63749eeedcb2e6cdd7f7d9d03b23f68dff1767818c0e23a67
+DIST cervisia-19.12.2.tar.xz 1893948 BLAKE2B 60ab16afa67c22c739b4fc763c7020a5c2f29d48df8225ef14cfea1b771c59beddcafeb8706ba1354fce4a3dffa1da69ffc436fb5fc66c8c3a22763e8cc46eac SHA512 209d8eb9b201d3e3fc1694a8c10592a106f527e197663b71f87ad0a037518f272889eeee8e69b15806d8ca255ae9e0a3c58c7ece6597fde4b29432be6f4e4896
 EBUILD cervisia-19.08.3.ebuild 1078 BLAKE2B 84682ccfe6c5bd0ddd35158b010f4bfd7b0df3c61d2f8f611e93c58af30678c31c1f762adc4d226b648f0394a97fd18c4cfbc249341389f238684ac236ef9ca3 SHA512 cd481dfeccc5850557fe4c9d030b3198acf0e9c20a705bbbf975e6df9afda13df060980917bc7526843862e17cd763458c55f490dd74b1c49eb3c041af5833f5
-EBUILD cervisia-19.12.1.ebuild 1090 BLAKE2B 77e4092cc31a20a275dbcb7f18dc9b84588114df5afbb43308fd8873b8476948fec4bd9075c77b522730218cef19919d703914942b5f6944e2d5c07e4f2982fd SHA512 0e50d5a0f848c9c529cdc5b279cf7a936a01437efb077ca17ff5a71d1e531329bc9fa427c312a9fed6692040180572adccbfdf1c27f2051ce01e21e827fc48e0
+EBUILD cervisia-19.12.2.ebuild 1090 BLAKE2B 77e4092cc31a20a275dbcb7f18dc9b84588114df5afbb43308fd8873b8476948fec4bd9075c77b522730218cef19919d703914942b5f6944e2d5c07e4f2982fd SHA512 0e50d5a0f848c9c529cdc5b279cf7a936a01437efb077ca17ff5a71d1e531329bc9fa427c312a9fed6692040180572adccbfdf1c27f2051ce01e21e827fc48e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-19.12.1.ebuild b/kde-apps/cervisia/cervisia-19.12.2.ebuild
index 2ddc0732920b..2ddc0732920b 100644
--- a/kde-apps/cervisia/cervisia-19.12.1.ebuild
+++ b/kde-apps/cervisia/cervisia-19.12.2.ebuild
diff --git a/kde-apps/dolphin-plugins-bazaar/Manifest b/kde-apps/dolphin-plugins-bazaar/Manifest
index fe52d0e1247b..07e876d6a27a 100644
--- a/kde-apps/dolphin-plugins-bazaar/Manifest
+++ b/kde-apps/dolphin-plugins-bazaar/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-DIST dolphin-plugins-19.12.1.tar.xz 194676 BLAKE2B 45710e8da5ba6f378dc3eda64f07185e67e6791f59c4ffad628d7678db802dfd9eb4be156e940adfc1e65ffe0351d360c4539c4a56f124fb32fb8603535e609b SHA512 e6bb49acaf6be738510f342700b73c0655147d06667a2b52fc4c4541297603cee66e4239d8c477d8e693c94d860824d6e7f0f9920104476ec5d5796741542b02
+DIST dolphin-plugins-19.12.2.tar.xz 195884 BLAKE2B 5bb575f5c717bb31faceb6f715390a3dc275df5dd526f5edd1cfdf9c2170d235a87dd187e1f14c134806e06c58e0ca946a15dc9cf0fb6f9e9f1e92dd09803941 SHA512 f825b61c0825156d6f0abfefa1ce617135a4bf9521d7feca2a3b677bbcb386d098ceb1c57ca29847e5bfd0e659bf6a2efce3e9a6676e60576f5f58968375ab1a
 EBUILD dolphin-plugins-bazaar-19.08.3.ebuild 1183 BLAKE2B 3f59cf2440c540fbe7cd0ba515b2d458cb274d8646de5d92eeb21174d2fd71813e5506680cca8fbbdd1125fdbcf95ff61f3714768a81c8e73ed70a7676d8ef29 SHA512 588652513f6e2591b322f1f1152917e8a64eaa154637a1a2cf1db17da5f33e9c3f9a2f2207f451c5fe439da11cf7641fc5270f09e81913be0e6b3cb7f4f33ac7
-EBUILD dolphin-plugins-bazaar-19.12.1.ebuild 1368 BLAKE2B 24167009eae0442f1638ef6e92c57a8ee9b12c8f613e6be0a6c04ac0875c4fd4dca555b01391243d60c3381590a38f02904d075ce801cd0af899c8273fc3d1df SHA512 e3221ccc910efe5dfe64385f1e090da2af833b93341f01a0a759414bf58f9997614008ccc05beeff94dd1af908b3ff1f9714a81d0fe80f910d75542e99dd246f
+EBUILD dolphin-plugins-bazaar-19.12.2.ebuild 1368 BLAKE2B 24167009eae0442f1638ef6e92c57a8ee9b12c8f613e6be0a6c04ac0875c4fd4dca555b01391243d60c3381590a38f02904d075ce801cd0af899c8273fc3d1df SHA512 e3221ccc910efe5dfe64385f1e090da2af833b93341f01a0a759414bf58f9997614008ccc05beeff94dd1af908b3ff1f9714a81d0fe80f910d75542e99dd246f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.1.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.2.ebuild
index 9c254d28af01..9c254d28af01 100644
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.1.ebuild
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.2.ebuild
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 5dd6b8221df3..55bbab081d80 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-DIST dolphin-plugins-19.12.1.tar.xz 194676 BLAKE2B 45710e8da5ba6f378dc3eda64f07185e67e6791f59c4ffad628d7678db802dfd9eb4be156e940adfc1e65ffe0351d360c4539c4a56f124fb32fb8603535e609b SHA512 e6bb49acaf6be738510f342700b73c0655147d06667a2b52fc4c4541297603cee66e4239d8c477d8e693c94d860824d6e7f0f9920104476ec5d5796741542b02
+DIST dolphin-plugins-19.12.2.tar.xz 195884 BLAKE2B 5bb575f5c717bb31faceb6f715390a3dc275df5dd526f5edd1cfdf9c2170d235a87dd187e1f14c134806e06c58e0ca946a15dc9cf0fb6f9e9f1e92dd09803941 SHA512 f825b61c0825156d6f0abfefa1ce617135a4bf9521d7feca2a3b677bbcb386d098ceb1c57ca29847e5bfd0e659bf6a2efce3e9a6676e60576f5f58968375ab1a
 EBUILD dolphin-plugins-dropbox-19.08.3.ebuild 1153 BLAKE2B a00f04503ab8664b7ccf9d503a49ed2d25b5997661ea8db0815232122ec692322adbbc468d83ad74ff879263e3bedcb141f9c21dac7f90d340f376846a25b3ac SHA512 e1b5afb04a802e9f3e9af4840e5b700941b6c1bacecc62df710ba879913b25644a97f0623dc1bd79b7919fbecf13e24c3c85f66104bb8bf163ba969305704feb
-EBUILD dolphin-plugins-dropbox-19.12.1.ebuild 1337 BLAKE2B cea628707cf520b4451d19fc21ae866f63b1c9dca2f47b9785b56e0de52999a493665aab3bfd7b60e047a44b7208c271ee03d7756f9b029dc64802db735aadb2 SHA512 0f021b25fcfe2ff9c4d1697cb6a7ebf61344b871ae212790bb56203541c4d83b22d15a191b8061afe480843b87aeeffe5b98e226a7f9ccd6bebaea3cea4d8c7c
+EBUILD dolphin-plugins-dropbox-19.12.2.ebuild 1337 BLAKE2B cea628707cf520b4451d19fc21ae866f63b1c9dca2f47b9785b56e0de52999a493665aab3bfd7b60e047a44b7208c271ee03d7756f9b029dc64802db735aadb2 SHA512 0f021b25fcfe2ff9c4d1697cb6a7ebf61344b871ae212790bb56203541c4d83b22d15a191b8061afe480843b87aeeffe5b98e226a7f9ccd6bebaea3cea4d8c7c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.1.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.2.ebuild
index 18e44e35c577..18e44e35c577 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.1.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.2.ebuild
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index 611e221a59f7..31755f0f1973 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-DIST dolphin-plugins-19.12.1.tar.xz 194676 BLAKE2B 45710e8da5ba6f378dc3eda64f07185e67e6791f59c4ffad628d7678db802dfd9eb4be156e940adfc1e65ffe0351d360c4539c4a56f124fb32fb8603535e609b SHA512 e6bb49acaf6be738510f342700b73c0655147d06667a2b52fc4c4541297603cee66e4239d8c477d8e693c94d860824d6e7f0f9920104476ec5d5796741542b02
+DIST dolphin-plugins-19.12.2.tar.xz 195884 BLAKE2B 5bb575f5c717bb31faceb6f715390a3dc275df5dd526f5edd1cfdf9c2170d235a87dd187e1f14c134806e06c58e0ca946a15dc9cf0fb6f9e9f1e92dd09803941 SHA512 f825b61c0825156d6f0abfefa1ce617135a4bf9521d7feca2a3b677bbcb386d098ceb1c57ca29847e5bfd0e659bf6a2efce3e9a6676e60576f5f58968375ab1a
 EBUILD dolphin-plugins-git-19.08.3.ebuild 1258 BLAKE2B 21b30a3895dc8c30e1e60e90982364dacd37748bc1528fdb99a6d66bdb3e39d3e46eff607c98efeabf2ecec34dacccbcd41cac1c9f2550c5a8e70538af378819 SHA512 458ffc88ca57fcd94d571dba363611dc247efccf5d93160a278573e7533aa1fc33adadbe867c27a78bc5c671fd9ffdbcbff0a32b99311fe23f89eceb9c0e0366
-EBUILD dolphin-plugins-git-19.12.1.ebuild 1450 BLAKE2B 40a523dbbc90acf058101b6332414c58a0f68bc95747cda457c5978e73cf51e96c9c7995542bd69479fe6dd3c3be2a1875132bfa437d3c80da0aa4998f464c76 SHA512 db69afcdf89e044088083af3a734d6c3162edb3d2faa4125498ba4e245f557c3a8bd0ae3ff29b337364a30d6e351408a37c3180ae072b781d62794b908f491af
+EBUILD dolphin-plugins-git-19.12.2.ebuild 1450 BLAKE2B 40a523dbbc90acf058101b6332414c58a0f68bc95747cda457c5978e73cf51e96c9c7995542bd69479fe6dd3c3be2a1875132bfa437d3c80da0aa4998f464c76 SHA512 db69afcdf89e044088083af3a734d6c3162edb3d2faa4125498ba4e245f557c3a8bd0ae3ff29b337364a30d6e351408a37c3180ae072b781d62794b908f491af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.1.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.2.ebuild
index c489a07f85f9..c489a07f85f9 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.1.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.2.ebuild
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index c60fd1bf39bf..dc872503e3f4 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-DIST dolphin-plugins-19.12.1.tar.xz 194676 BLAKE2B 45710e8da5ba6f378dc3eda64f07185e67e6791f59c4ffad628d7678db802dfd9eb4be156e940adfc1e65ffe0351d360c4539c4a56f124fb32fb8603535e609b SHA512 e6bb49acaf6be738510f342700b73c0655147d06667a2b52fc4c4541297603cee66e4239d8c477d8e693c94d860824d6e7f0f9920104476ec5d5796741542b02
+DIST dolphin-plugins-19.12.2.tar.xz 195884 BLAKE2B 5bb575f5c717bb31faceb6f715390a3dc275df5dd526f5edd1cfdf9c2170d235a87dd187e1f14c134806e06c58e0ca946a15dc9cf0fb6f9e9f1e92dd09803941 SHA512 f825b61c0825156d6f0abfefa1ce617135a4bf9521d7feca2a3b677bbcb386d098ceb1c57ca29847e5bfd0e659bf6a2efce3e9a6676e60576f5f58968375ab1a
 EBUILD dolphin-plugins-mercurial-19.08.3.ebuild 1393 BLAKE2B 14ac93d50d135b612ea35e522574b0ee3b0c1e7e922e4110d999e384e41034a73c18b21b8327a7725066aab5e404d885a4c8f064a8418f026533e919945949b0 SHA512 291a93de65c2c6a6acc4c8c9369cde3b71df92fadcd4e2954cc499b89c0232f2f42b8faff458dba0e6344c18cf9a39a732b211d0ed0e2741c31e57a27889bb97
-EBUILD dolphin-plugins-mercurial-19.12.1.ebuild 1578 BLAKE2B 275f999030e35a18e5fd39f5c3d07b585d67ea905bf515bb0389a3f400ff6e8952005446590dbccaa11737f5706c23fab5cb11e4b512566e17f5f972ce180fb9 SHA512 830dcd052badcd75549a9f33c03634df50457c9898cc22867b44c84e703d04c46625cbe9e2e9cbd1fb04203c305c2d501dde31bb966f7556a534b8a1ce4dc543
+EBUILD dolphin-plugins-mercurial-19.12.2.ebuild 1578 BLAKE2B 275f999030e35a18e5fd39f5c3d07b585d67ea905bf515bb0389a3f400ff6e8952005446590dbccaa11737f5706c23fab5cb11e4b512566e17f5f972ce180fb9 SHA512 830dcd052badcd75549a9f33c03634df50457c9898cc22867b44c84e703d04c46625cbe9e2e9cbd1fb04203c305c2d501dde31bb966f7556a534b8a1ce4dc543
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.1.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.2.ebuild
index 7cd6e8a4587a..7cd6e8a4587a 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.1.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.2.ebuild
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index 6f5f5f4027b5..d294f07f4339 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-DIST dolphin-plugins-19.12.1.tar.xz 194676 BLAKE2B 45710e8da5ba6f378dc3eda64f07185e67e6791f59c4ffad628d7678db802dfd9eb4be156e940adfc1e65ffe0351d360c4539c4a56f124fb32fb8603535e609b SHA512 e6bb49acaf6be738510f342700b73c0655147d06667a2b52fc4c4541297603cee66e4239d8c477d8e693c94d860824d6e7f0f9920104476ec5d5796741542b02
+DIST dolphin-plugins-19.12.2.tar.xz 195884 BLAKE2B 5bb575f5c717bb31faceb6f715390a3dc275df5dd526f5edd1cfdf9c2170d235a87dd187e1f14c134806e06c58e0ca946a15dc9cf0fb6f9e9f1e92dd09803941 SHA512 f825b61c0825156d6f0abfefa1ce617135a4bf9521d7feca2a3b677bbcb386d098ceb1c57ca29847e5bfd0e659bf6a2efce3e9a6676e60576f5f58968375ab1a
 EBUILD dolphin-plugins-subversion-19.08.3.ebuild 1225 BLAKE2B 9f2e186f9c1ed186d2209e1e3455285a126181deb30bd3e823dcc93728c2c68a00977b97efd72be51ca216c71b10b1b0bc2bccda66d8484eb738eaac4cc8a37e SHA512 82ef1b2f1c8dfb9ee324b214b7098e7006780c5a5fadb68c8244a3c65583f8502f8a242994aa3ad9e0363a83b53307868193e7b40b2dd5cd9becb1bc64f12d77
-EBUILD dolphin-plugins-subversion-19.12.1.ebuild 1410 BLAKE2B 5e63bdfab1550b0e51e586dfcfd54d9e95eed9f6ad0d10a7b885c55a5c7ccdf4525443eeba12a82b9517ae58db7b64f05b4e9fa856e80acaf692fd33556732c1 SHA512 85c08677fa034aea7d235ddd5d7a1496ac2b580a2a7c18afd1983f497eabcd51b2e1ab4bbccfc7a95426707eaf35804a1523cc23033458f8c147902d121d4399
+EBUILD dolphin-plugins-subversion-19.12.2.ebuild 1410 BLAKE2B 5e63bdfab1550b0e51e586dfcfd54d9e95eed9f6ad0d10a7b885c55a5c7ccdf4525443eeba12a82b9517ae58db7b64f05b4e9fa856e80acaf692fd33556732c1 SHA512 85c08677fa034aea7d235ddd5d7a1496ac2b580a2a7c18afd1983f497eabcd51b2e1ab4bbccfc7a95426707eaf35804a1523cc23033458f8c147902d121d4399
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.2.ebuild
index cb49ab63ca7f..cb49ab63ca7f 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.1.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.2.ebuild
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 7a7fb18e6daa..356e014f40d4 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-19.08.3.tar.xz 5276344 BLAKE2B f894ab567be12bd3c6194c84897c13201a286064f9b1e10690b88433ae712d4d14870783d729d1d61fde89700709ae75262111684ef592e66c1c3c66bb606e9d SHA512 4390f97398b437b24f0139982e068e32a042a0740790b7dbf19747cd77b41c70dd04f0c6ba3120775f8ce48f43bdd3d2cff4590ba5556773950dd73dd9f7aad0
-DIST dolphin-19.12.1.tar.xz 4778220 BLAKE2B 0b4b788912838d36af813e45ad748b08018a7441adeeb2d5ede7f56dc1a2042176b5916c092bad1a6810d1add804835ee96c565c97cfb9e95a21ec372357523e SHA512 a00b13abe9036ac82d4c8c42fe54ad4174d6ca49d733a1ecb86825ce8bfb63d1996d6918afbd3b1681b49eb30754c7dc20017efe0728072b82f6327cd86baec4
+DIST dolphin-19.12.2.tar.xz 4778864 BLAKE2B d334e1d672a5856be0a13588f4238e0866eda11205b7284cb0e20b9f933b65168ab7a26c7aa716453bc2ef1d107c88a30feb595022abe93ea98a0ee98753dd9f SHA512 c9b43a3e923e6f261225ab7ebc0a35722f4aba197015e48739c7b0cc442dfa227875b55e85a28c8703abdfab7b592432d14ca3560155e59ad39a4542345646dc
 EBUILD dolphin-19.08.3.ebuild 2895 BLAKE2B 5330439a85c94fb18a97bb6066f03e9e58706fb69c423cd8afe68da49a935bd109f6835d0cb5c90658e125cf2019f86c3fdf3d610ac3b2f288ee544d28f9761b SHA512 6b454883f6ee0ea7b56f68a5fc76cdd90179f6982ebee89564d0cd2aa9e8336d3aac320459e69c52df361b2d1d232cdecc226147b2c85de12c52d321814f87f4
-EBUILD dolphin-19.12.1.ebuild 2914 BLAKE2B 5d352b8c5e855fc3b431ea30f679dcac689f75b1b17e02f1c2d0f36314af57a75a4efeb01d56761e5923db82f6d72cbbf04ed7381dc68dbe555aa6f121680d0c SHA512 226b6f3b8011fcceca5fb7a50d6d49f6f80b1af286e4070ec537b3d50338fc9852e7f05aa5df8cc5fc4d8787a50900afc5c0583ebd33a4821d64b48391d0e426
+EBUILD dolphin-19.12.2.ebuild 2914 BLAKE2B 5d352b8c5e855fc3b431ea30f679dcac689f75b1b17e02f1c2d0f36314af57a75a4efeb01d56761e5923db82f6d72cbbf04ed7381dc68dbe555aa6f121680d0c SHA512 226b6f3b8011fcceca5fb7a50d6d49f6f80b1af286e4070ec537b3d50338fc9852e7f05aa5df8cc5fc4d8787a50900afc5c0583ebd33a4821d64b48391d0e426
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-19.12.1.ebuild b/kde-apps/dolphin/dolphin-19.12.2.ebuild
index 1dae379b7beb..1dae379b7beb 100644
--- a/kde-apps/dolphin/dolphin-19.12.1.ebuild
+++ b/kde-apps/dolphin/dolphin-19.12.2.ebuild
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 2ffe23e6b144..240ce750ae77 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
 DIST dragon-19.08.3.tar.xz 1350768 BLAKE2B 1650976805f47cf9a405bc24428eb229c9b664d8d98eca17cab9ff4eef1cde68f8972dd675159cd3d256cded58d5b7efa0335a92acd808c2edc766ae9357bb90 SHA512 932a56f236e0fa7b133b667746fa65ea64e4b3f87045ea87712b3bf19f8f32efa3b73090dd72784363918c5d929dc410e20ffd0870bca24f4d7efd0c6fd489f2
-DIST dragon-19.12.1.tar.xz 1351124 BLAKE2B 2e5273c1d7fba621bdac33717baacf46053524964ddb251a7489f7b1b2baffe5aa4527b1b36468c7dc22994dac62300831fcc2a5a3c57c7ab771de028cb59c0f SHA512 dc54ed3e180a53cfd2be0d8d11cdce209aa386a032ff52be26fdbe08f786d8c4dea3019c54bdde5e7e3faf214cd8ab0e1210f42477300e647a9b6a26c4339283
+DIST dragon-19.12.2.tar.xz 1351196 BLAKE2B ab4d2c3f8f2f1bea5c876e324c1d1d94416dee04f9f93d55730f4b2bb7b0ffdaafb1254b0e4bacdcd07124de5c5fea79c3f0d1671eca5f35d350375750f3e5c5 SHA512 598377048786431d4f14eb8b63c3a29c96b9cd4df016eceb4b36b25d5f4367b1f431994e579bb0d9892cd724891f8e840430a15647c71933b264fd5d132f8482
 EBUILD dragon-19.08.3.ebuild 1153 BLAKE2B 771328954c8f12657b8c4ab66e8ec807a8e93a2396a9f4c255014aac68ed5c69eeee995035382508234dc2f515d853831223f084f7bcfeca6193dc75f107128f SHA512 244afeccbb0b0f89687cc02a56634b27eadba64537b72859bc5b96d81200f1626569f42ee6c20b90d645dd6c8d702a90a9e5337d1591cbc15f0809f49a31b9da
-EBUILD dragon-19.12.1.ebuild 1162 BLAKE2B 2648044dfb53cedb1ee55f92d7191034bdcf781d827793c8287899d6b690eb7bc3ae9b9c0135b3f4bfd1faf5fc7ded1e6e7895694182c211feb64d02b4076677 SHA512 7f6dec9ae9faa793687c76e1cc0aa45ab5461fdbdb54f59aa4227c05e732d24056e836637e054e47ad9460baf5043c3d87e712138a26f6f35c6ffd76c8dfa91d
+EBUILD dragon-19.12.2.ebuild 1162 BLAKE2B 2648044dfb53cedb1ee55f92d7191034bdcf781d827793c8287899d6b690eb7bc3ae9b9c0135b3f4bfd1faf5fc7ded1e6e7895694182c211feb64d02b4076677 SHA512 7f6dec9ae9faa793687c76e1cc0aa45ab5461fdbdb54f59aa4227c05e732d24056e836637e054e47ad9460baf5043c3d87e712138a26f6f35c6ffd76c8dfa91d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-19.12.1.ebuild b/kde-apps/dragon/dragon-19.12.2.ebuild
index e8e2cb4afd8f..e8e2cb4afd8f 100644
--- a/kde-apps/dragon/dragon-19.12.1.ebuild
+++ b/kde-apps/dragon/dragon-19.12.2.ebuild
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index cf49d863c1e8..f887854a20c9 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
 DIST eventviews-19.08.3.tar.xz 443148 BLAKE2B 2a59da83d3882fb2b3a59ceefbc723ded681f88c318c0c3e18f82d2963d461429c38fc491165648c7ed0821739323f51695d4e7dd65854704ed3c87a48cb001b SHA512 58636b0614f2df5e8f13b63769685c4f13d1beb2d00f6690cfd99999a428687a1004c8ede0854c3bcfd117cabd1b91ea8a5f739945d6d1d4e79d9bba39046d42
-DIST eventviews-19.12.1.tar.xz 443808 BLAKE2B 8bb73dbb1a8c535b103ce26081b7e8f912f758ff6f046e079ffccfe32cfc514ff5818504f366e283ed185a04cbcb7851aa1488dc5e819dca7029fdc7cb5cca11 SHA512 e1216b43ef96771021422132a00b88111e2b89a83636d616f9ae4f50ff6af5ca7020b2623e46ff872f442ad8a5308ee02643d0acd86605fa4bef6498a597fd70
+DIST eventviews-19.12.2.tar.xz 443504 BLAKE2B f8ac1526cbce561474b0a7411b472cf1407a129d54b02cb6d065ac70de8ae366b6a8bd864c99ab0de286cd3d625144b01c6b85e02e662600507cb3774ef67e89 SHA512 da3fc8e912571a478577ef98e4e6195510edf96a115c6e21fb07f60a62b522f981c8c1b97dbd0dac9265641fe419e77c34afb1e2396640547d11fdce1ff840c1
 EBUILD eventviews-19.08.3.ebuild 1276 BLAKE2B b960bd6f1b5012796708b19954ab92929b6d86ec8d8ef0ae8a58e18ea3723a282b3963f8f851e1d9d11031dca82f7f436cfa0b7057f20e9938d60bf477b8b766 SHA512 24451b365b87e6a6770b77767d5379bce7869ac689ad58885dd5e7777ae26a2765bff1354d796f4ad2c505ac54c9a4a4798135d05ad5f77be3eb65df08a57414
-EBUILD eventviews-19.12.1.ebuild 1280 BLAKE2B be1290bf90fbb0f6662639310b50d46d43e26e89887fdaed8ff2ddf1e77ded7d7977b98226d4cb914ffa8137b9f4c19639bded7eb5099c1daf014eb66fb48ed3 SHA512 339fb4fe0e424d9b154f89c3b44c4d0a8f074809280ea28fa54131135e55877107b524297a2f01d0be23a1af0606286b03e8a8f861afe3468838ce583a437bc2
+EBUILD eventviews-19.12.2.ebuild 1256 BLAKE2B db21bd7457e3819df7bfe578f782fed1cf2728318f79c18d87ae95c45e41609202d9dab59fdc0b69e4fb97ecac54e05833695fbbff6ac505d32832c9739bf391 SHA512 c943401912800237b11ff47b1698b4853b8afc30f86edb280acf58933d0cd8dfb0cf6db374e8a725d0fc8e06ac808a3706dd5154b2d6e71af88948e1b256246c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-19.12.1.ebuild b/kde-apps/eventviews/eventviews-19.12.1.ebuild
deleted file mode 100644
index 811c26b08b8f..000000000000
--- a/kde-apps/eventviews/eventviews-19.12.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/kdiagram:5
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/eventviews/eventviews-19.12.2.ebuild b/kde-apps/eventviews/eventviews-19.12.2.ebuild
new file mode 100644
index 000000000000..748d0d758ff7
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-19.12.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Calendar viewer for KDE PIM"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/kdiagram:5
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 8a728f71fdde..c5ebc8bc5bda 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-19.08.3.tar.xz 25112 BLAKE2B 43ba05e3bf9d731ed599a05b1a1299ae15edc80f01ed5d8be8fa4b1f820632ba9a0b060afb4e04fc672837ce9e46a11d24b21e4c5ede68dff64f6b8dc2540594 SHA512 84e6da40658d4a7963928a509acb982a5cfbe88c3e164096ca946df9e336ab1bbeca8fbd45be1d8f55ee1377645af914561c74ea1da74736cc573a182f385fca
-DIST ffmpegthumbs-19.12.1.tar.xz 27016 BLAKE2B 23a7b8476fda0469d47efc841247ad4e47938349ba386b0d750bb48595d2bc7ee45242d003789800ed0e8691b00000aa52a13cb4f75fd9dd7df9b846324ef0fb SHA512 8a4e35e6f3ff0191b9777a83e82551ba2c315783629e73c1324567ca985da08e38e455c534cd02991926d4842601e86da78f4d899b9d825e15b6747abc3b24c6
+DIST ffmpegthumbs-19.12.2.tar.xz 27168 BLAKE2B 145801b248284aa4a4df69dca13a6c0cf4cad78f9f7c274589741cd5b22dcd61518253c9c0fa45009ba6a555a95fafce717d1cb41967ba7ebb1e30ce573a2794 SHA512 9bf1d0db50d194f31f915ec2dfbd451428755ab574f2548c09c542db644034bd8a581dff5e492316b71451fca917b7ae56422b6f9efc058b88b8ed85b4d118f6
 EBUILD ffmpegthumbs-19.08.3.ebuild 582 BLAKE2B 86e476120949151ad8daa589fff5b141fa08ec3c158d8da914b61847a573b75ca5fb3de5aa3b81b081e9cec5d568af69ab28ef11a105387b1cb980c3c63a408b SHA512 07c4647e190f8d3db5790e0b9b35662f6961f5253053ea57b9b59a004c18abda271f5ef110be202dcef7047a6b0667fb96b3a00fee359e43c7dbbcf4c56bafe6
-EBUILD ffmpegthumbs-19.12.1.ebuild 593 BLAKE2B 98b767619a6114cbfe86f42543f3f5f903ebcbac6a427ea025d14bf4cc5d820927454c38febbcae65204f2e793990696e7009c2787ca21dc97bcd49c17b063ed SHA512 708d84f6ece3d81b6f7ef68217e4c505c204906b403f90e5606259b0edb64bf47eda405570fdd913f324f8bb0251010e9c01d9f699b35404023a5e95018871df
+EBUILD ffmpegthumbs-19.12.2.ebuild 593 BLAKE2B 98b767619a6114cbfe86f42543f3f5f903ebcbac6a427ea025d14bf4cc5d820927454c38febbcae65204f2e793990696e7009c2787ca21dc97bcd49c17b063ed SHA512 708d84f6ece3d81b6f7ef68217e4c505c204906b403f90e5606259b0edb64bf47eda405570fdd913f324f8bb0251010e9c01d9f699b35404023a5e95018871df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.1.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.2.ebuild
index a8b0a89fa42e..a8b0a89fa42e 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.1.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.2.ebuild
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 189aa1c95861..ca39b261117c 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
 DIST filelight-19.08.3.tar.xz 660804 BLAKE2B 94186097da1b1ba7e9148d387e4a2d3164a38f406f318e37e36456c3d137625d520e99b0f5c0b0c305ad834c0305c45d4487636a759f8794cc760691a4e9565d SHA512 547affcf9b78ec06ee981d68e847174d8811907b5220249a616298c43af19c1a35d4d3932306903cbae2873afe92a9b6655c754c6bcd55a8447ea0fd311745b4
-DIST filelight-19.12.1.tar.xz 661828 BLAKE2B b5b985f9bf58b5366a48f87ce0c661d9ff4ff734657a2394cf6f4e3d64f6d84d2b177318378f805f5ed87b55d5e2f05b33dfa8976510f43755e1f15c90a6909d SHA512 a4ad318f94b423d861edcfeb868276d757f1be2101790b1a0bb3ff1f21f8d836f5547e229c27bab378e46a758793fb3501d4afc9a5a76004bbace8c5250c1569
+DIST filelight-19.12.2.tar.xz 661372 BLAKE2B 09388c59f3625d3152e2b8859d5880ee27c8c0aa743384a6c79b1a9466dc2cd8fda67306a08a689024e6377cda409654eebfb9a198e6216e89fb88786264c022 SHA512 339d2a32a27f03a29a81b937aefd82439953935a098b068e588667431bf4509c2e1f3aa147ed9b7ad9810004b44aa75beb7e8713269f50b319d2494ebcfdfa8b
 EBUILD filelight-19.08.3.ebuild 838 BLAKE2B 8da84bf97ea69cbe0eaf4e4f032db65c181e073a8359e8d3d710ac937eefcb364199fab8da145a6b4d7489d36e169505655b31100581debc83ef07ff79bad573 SHA512 82982ed7592aa4ee2f4703bb4d6519a233ef6c0fe5f2de4abe6b4fdd2e940a0a2238f478f66bdb250afa3b6968582795aeb3c2f1212a2c4af5dc6742abbc67ab
-EBUILD filelight-19.12.1.ebuild 906 BLAKE2B 30d3fe75e41dae2e82f698e383ead6b2340aadea25e5e725a1ed29af6f5e4258bdd9098c5aaaa646cd7ad246a45ea539c540131d71cbdc5bf7a8b8cb78f859ee SHA512 f562f22f6e050dd568634b526e3a5258ebf3b9c7539cd906db3d8c4d0c92fd408beeb2c48bccad85b31191908c0f2b9cd8fafb082c859f3b558c956cc3a78fbf
+EBUILD filelight-19.12.2.ebuild 906 BLAKE2B 30d3fe75e41dae2e82f698e383ead6b2340aadea25e5e725a1ed29af6f5e4258bdd9098c5aaaa646cd7ad246a45ea539c540131d71cbdc5bf7a8b8cb78f859ee SHA512 f562f22f6e050dd568634b526e3a5258ebf3b9c7539cd906db3d8c4d0c92fd408beeb2c48bccad85b31191908c0f2b9cd8fafb082c859f3b558c956cc3a78fbf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-19.12.1.ebuild b/kde-apps/filelight/filelight-19.12.2.ebuild
index 5bf4246f8491..5bf4246f8491 100644
--- a/kde-apps/filelight/filelight-19.12.1.ebuild
+++ b/kde-apps/filelight/filelight-19.12.2.ebuild
diff --git a/kde-apps/granatier/Manifest b/kde-apps/granatier/Manifest
index fc6b82559110..2e99e308961b 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
 DIST granatier-19.08.3.tar.xz 1945196 BLAKE2B e9617eba2df293a944d1251aaa863762b1a160599800ac91678ea2121c8307d0db8dd17a5ba00d10b5e457de6023505207a1ccaff16266c8915ae0ceccb57e60 SHA512 8407d4e3a7c0f3858301227ac51e9c2d38e54e20b7cc2210ba6e3444e3da8420aa43256218bbc4311277909d32c7faf3a313dffe564bac0bd01dacb8f5c6a0e9
-DIST granatier-19.12.1.tar.xz 1942664 BLAKE2B 3a8461eff04960c292e3c8b1bcf156e5958049df435d25538c734d9ee46f5d20cb5a5b6a29b97d40a8a83631ac6a98a8ce0cfd8d0c2900eb3d592d4cb06a3a6b SHA512 7c214370418da7e27b2c95ee52cf52ed9674b3dd0a63f8ea493c94aa9b674b22cf62b7509af82cd03f9caa530e8a19bf4c7f9313dd2db90d060a2f43cef2476b
+DIST granatier-19.12.2.tar.xz 1945008 BLAKE2B 02ee4a4b40d0cb475fff9f58c90347ddf91dc67798a3a206cc41021f5920a1a26c2f4f12202cd573a962faac2aac78a96f6088b73b391246d1d2203590ce245b SHA512 1363b81c64ad834bb490c87d241f8e1f368da3c5caf52bd2ef77e81b3815a01bcc18ca65aa44d1287aaceec5e817db85139becc9bd3986fbf6dda0945746953f
 EBUILD granatier-19.08.3.ebuild 907 BLAKE2B 83608a2752f5cdc6753ed0f6bcf50dfc01bc20a172095cfb5570dcb746aaa90183c22d0b0166ace05413770219e83b74f0b265fe85938570ddf20e83b465fbf6 SHA512 fa4d0d491be81413c08c30fb01af1bb23378e3b65b03199effd00d98077b5ce1706682659934a810b585667335486fadff60cb6d4012562035cb9da949c5b77f
-EBUILD granatier-19.12.1.ebuild 918 BLAKE2B 225b6bcd5280c70f823d572bd372ac8e6a42e839dbc3fc7330aae02b0a24a62dbe089b74373a3688bf3c008e4b14bbec7aca093095818f9fe7cc31d0b94c613a SHA512 e319dca3e96e0dcb0f7d3a7bed5c4cd87908bc7d19c46c7f4ef9b8b61015f9fa1004420f47605039ae0d70f0aa749d75a0743fbc4d9eccbefe1c0b73d18140ed
+EBUILD granatier-19.12.2.ebuild 918 BLAKE2B 225b6bcd5280c70f823d572bd372ac8e6a42e839dbc3fc7330aae02b0a24a62dbe089b74373a3688bf3c008e4b14bbec7aca093095818f9fe7cc31d0b94c613a SHA512 e319dca3e96e0dcb0f7d3a7bed5c4cd87908bc7d19c46c7f4ef9b8b61015f9fa1004420f47605039ae0d70f0aa749d75a0743fbc4d9eccbefe1c0b73d18140ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-19.12.1.ebuild b/kde-apps/granatier/granatier-19.12.2.ebuild
index 2dcccf18ed3d..2dcccf18ed3d 100644
--- a/kde-apps/granatier/granatier-19.12.1.ebuild
+++ b/kde-apps/granatier/granatier-19.12.2.ebuild
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 9e933bc021b4..e8be1a0fbf2d 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
 DIST grantlee-editor-19.08.3.tar.xz 111720 BLAKE2B c12d25138bddd4f80e8a2865854650c6ee856c3f9afd1627bdf3e68e426684985c4f08c5db0a73b1435b4205f4b93e3362c4069f607b698ee21c9c344175d005 SHA512 1be20ad47b04e702eb93aea60c0871d410ecca404c2649fde17f0b0cad423a2845afbd665f065c03ed93136f039cd22bb0327a96a71c7b434b84b050270a7acf
-DIST grantlee-editor-19.12.1.tar.xz 111644 BLAKE2B 1c043764e2b5bffa30f07f5745882502431cac6a950ed6f7ccbc2114b87a7a14e92729cfd678db98a0059355b1b07c8a5b8550a0182d831839a70eebbfb889c0 SHA512 df30bedb0b7deedd3b9aa4f52c12b6144415ec99d366209010818aa1feeee3bb578ac7f87f14ae7edb0f639959f9d2b57c7f7df30f4b1ef4ec5fa96922c909f9
+DIST grantlee-editor-19.12.2.tar.xz 111924 BLAKE2B 5b61781b06c68a6233332ab4382ce2a16209da4658c8b8a5554ed7f8cbda0180abfe3a46c37629a2c6f29648dcbca09f4f92d7c9237c5fa820209cb147301eb5 SHA512 f115c3902515972368446fca1b3caf6dab3dc60e415b01a854442e94f719e0bd99a158696e6869fe9f4a2f9006e4bf19a2f556313eadd39ee773cccdedf9af60
 EBUILD grantlee-editor-19.08.3.ebuild 1357 BLAKE2B f070f9dce2f1c785293b9ce2bad4573684e001a7818050be8cca28b6e426c82a09fda7df13c60fbcc2eb1a9e4fdf7cc622967ddf05058b77a0d3f9b9f33c2002 SHA512 caa8e2b7d842e6df08d4593d72404a4e71f9316b638f52df74a7b97c3a9a215d4e9315f4e20ffaff7bd751f810aa0d6b5433aba1bef1227053b27bfd41a049f2
-EBUILD grantlee-editor-19.12.1.ebuild 1361 BLAKE2B 15c3f535251e35e3f7bd4abcd763856a319623658d5c82a6e7b2f0aee36113584177c00383bd3a5f46fa2e93d65451645ee23fa069f856d8c2869798ad29d242 SHA512 001392fcbc686d093425cb3d56c018fa9448bbebe8ddff9fde23e5936fb569c34083e0db66e823dde6de0ac69a666acb2188104ea4daabbcbff2c45814ea4ec6
+EBUILD grantlee-editor-19.12.2.ebuild 1260 BLAKE2B efa6ebbf5d3e316ca946ec6e7186f11843f87bb5d65f62c872a572b562e28b1486555e3474f28f3eee4993df411c5e0b73ff5bfe3b94a9b82a87bb395f1badac SHA512 dfd4237959230f7b3785c36d1f960fba8ebd8785b07d23059a502b52c190095bfc106cde6fce23bfe1d942c34e1bb0e124c64e0fe2c4850e009205f2d33034b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.12.1.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.12.1.ebuild
deleted file mode 100644
index e04a16f0f00a..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-19.12.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.12.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.12.2.ebuild
new file mode 100644
index 000000000000..2b6061881ac5
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.12.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 03066b62b839..3d3e2705eb9f 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
 DIST grantleetheme-19.08.3.tar.xz 52260 BLAKE2B 7da5238e4ee23ff663c283625bfb3628789cf5b3cd01ff6a15a2811f5bdecdc739c23c58dcad792235dfeeb6ad526efe0c301f077d576560919ba03142813671 SHA512 1e84df335d938963fe1a9c62a0a8909613e63d6fe3279cc7bf149afdcac552078af8c4e0125768556cc216eeb6876f6f1a1c9f8e862aac5da1ec1c55bc3040cf
-DIST grantleetheme-19.12.1.tar.xz 55232 BLAKE2B a72e556b2426606cf2908e685b31d8855b86682b275c0288aa31d7aaf4b75172d8b38cc12e5656e045fa627abbc4c7dbb4f67218d980b4d1970bdd0aa6cc5a83 SHA512 cc319f0c81f01bd9dec69b01c37f8b4cc5d4a2ab8814403dbbf3498a84f6582c77b9da6c80b8dc52473035d9d9689325afbbc99d9756f06978d262dd857aa8ac
+DIST grantleetheme-19.12.2.tar.xz 55156 BLAKE2B 5555dd7f5cffbcdc0245327a7167163454b0cad96717eccf772d3e7d31e0fa54ce1f8f5d1801968d1b0e0b0107bd53992f5e7588c4f68807942fdeb17a552f54 SHA512 9aa7323badb74a148174033b4222f7d0250e4e1ab52606cf685787d615775618589d406d404d0a7ea4884875114ab967704b2ee7fe6b432af60ecf798d79ea2c
 EBUILD grantleetheme-19.08.3.ebuild 840 BLAKE2B 3e1cea4dad7e71e82cc248427df7c6e5ceed5c3baeefd78fcdf1fd747167421f42214847a0339dbf1d6e4642fff69a963114b458e96ddd842599bba33e286400 SHA512 1b180ce90b3abea1b154084df9b6fc5510cd33022527835fca1fd6c651e7dec9d0d92effac4ec29bd452411c234d5feb5a32d095b85da4f76887db78e3d4f029
-EBUILD grantleetheme-19.12.1.ebuild 884 BLAKE2B 092d4373865cfddb639ff29487fb6517538e7215146feb41f5284ca49c2623e2a6133597a1a765c18b019af1ec2746bec85b0a00ed74d81212e27b7426bf1d56 SHA512 ba4b84aebb2c8c85ed50148344275ffa63ea37c52378692be65e0c93f2369d0194923ae63caa30813f38ff0e95cdb6a4bc998ea9e4f7fa8e876d2e4156a292d3
+EBUILD grantleetheme-19.12.2.ebuild 821 BLAKE2B 61a3de55bb2aa0b4b2344f5e7f58b81048f8dca4a1a8cdff60b633a80360ab5e8078b850f3d2a86bc05ec2bdf0e488d209dc71e2ee8334a7ff74c0c2b5b252e6 SHA512 0ee8069199d098833524d04eb922237f262c2f13674e1c83e0dfa5e2e6392012a0c255470ba67248a4bdda74d749166856bdbb5b2637918cd6f908302a582c92
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-19.12.1.ebuild b/kde-apps/grantleetheme/grantleetheme-19.12.1.ebuild
deleted file mode 100644
index ada8aaabdbfd..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-19.12.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-19.12.2.ebuild b/kde-apps/grantleetheme/grantleetheme-19.12.2.ebuild
new file mode 100644
index 000000000000..c6e8d4034a2d
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-19.12.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for Grantlee plugins"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+
+# fails if package not already installed
+RESTRICT+=" test"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index ec2e3a2f70db..085fa4d07d0e 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
 DIST gwenview-19.08.3.tar.xz 5723104 BLAKE2B fe369a5be382eb431dde1289bed53cb53dc06a273b99f313b4bb8cfd57f95d85ade5be4799267fc3b6164bef93bb3e5bb8fcde3fccc570eb78ca396d76b944fa SHA512 5db117a5975ee09b8b40fa420cc129fc6cb786a19d67dd391f12a560049134328977f3ed1dbf3f6ba379d46d0d8c00fb2290dda84fb44e90055037818cce84bf
-DIST gwenview-19.12.1.tar.xz 5736512 BLAKE2B 0fd72f10c6330f615197476a7f81ac437836c7e71081004c418f37897cf0b64a2fafdd0067bbb57a19510ca57886b80b37f402b916a87bf05e536c13c54fdc03 SHA512 0349a6db6e3a2da78ce00d33fbaac1aa39781c00a1cc8ad9f46ac9338b7d088c226be16a646fc27c2b5c44eed05b541434d59ad6af31fdb9f597d29fe7ee58f5
+DIST gwenview-19.12.2.tar.xz 5736880 BLAKE2B 6528409b0544b438c0894835065357536449c12a944bedd3a4aac51ce091686a4e4bc36dc6e1f445d041fa2ba7ba731e1235eac5d43a40dfb443ef17e14b6bae SHA512 20479f0bd326584f5004e0ab9642371cee1b832d8d31cbe32659119509bf5281b17e056d36a4e0f1168d81678ed8db7b89bab827e3a6f08aa8fae28fdddd740d
 EBUILD gwenview-19.08.3.ebuild 2966 BLAKE2B e098b217cde95b95b75c405dba7bd4c7fc518c63ce77994796026a7c095f6a513dcb1978ea7ea7519fab94be14c7614c75f1a5f546a1bac46f3c29506cd09a6c SHA512 120c8bceb4bd6e9ef497e0d86e875abdae64a6d2dd766db5a8997437f12d3b9ea799f6b37a6145738720d0c6fb42b5ccfedb01a512ad455b25b870d08a2ba71f
-EBUILD gwenview-19.12.1.ebuild 2979 BLAKE2B 97671430c734292af6da7206cf8d011e98c98157952f8bf9157500fe5097d3e8c64d1de48aa0f37c3db59baddfab6944fb6db023ba630e3b3790f6cb9e0c49d9 SHA512 21c63bcf33d8daece93aae8c8bd63a07c3e50a97be8c3d20b6e632f25d33f44fbf9dbecc12a2a95c205914fb2bc88606d67d28ce5b1a4511593b94a564d691c6
+EBUILD gwenview-19.12.2.ebuild 2979 BLAKE2B 97671430c734292af6da7206cf8d011e98c98157952f8bf9157500fe5097d3e8c64d1de48aa0f37c3db59baddfab6944fb6db023ba630e3b3790f6cb9e0c49d9 SHA512 21c63bcf33d8daece93aae8c8bd63a07c3e50a97be8c3d20b6e632f25d33f44fbf9dbecc12a2a95c205914fb2bc88606d67d28ce5b1a4511593b94a564d691c6
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-19.12.1.ebuild b/kde-apps/gwenview/gwenview-19.12.2.ebuild
index fbf112e706ab..fbf112e706ab 100644
--- a/kde-apps/gwenview/gwenview-19.12.1.ebuild
+++ b/kde-apps/gwenview/gwenview-19.12.2.ebuild
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index 627ec864aeca..ac66abd45900 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
 DIST incidenceeditor-19.08.3.tar.xz 550144 BLAKE2B 8b0fd36d81d117e640ab272460bb29c1ca3e86916927220ec9aa12469f7111a8c1a9b08613fbc7fee5b3e99e66ee8e96088fbde5a0d79916c7f5bbaa29009053 SHA512 4d2ac2416810cad38e37d15dfbc7f19af7557164d9d2317aca0f6b9d3c072750281942068fb70a42a0aecf307c69a6f876ce5f73f39fe39529320c09f841aa4a
-DIST incidenceeditor-19.12.1.tar.xz 550660 BLAKE2B 3e8e445260ee4227a7a36f473088f12b627c5bb2a201627f005e73bc51f379247e67c4efb8130ffa9e484603cec769cdd7345e16ba8c3e14d053032cfb16ffeb SHA512 11e8e3855c021ecd94bea257af14a9d8eeea39dcca13635f37ad86364507497784e74f6f4648a5152fc9b72e491ccd79f7c0b8de6d596859b205b35080ba82e9
+DIST incidenceeditor-19.12.2.tar.xz 548740 BLAKE2B 002edfd868e7d7848b0148951733c22472ae37089feb8ef65a2c7ef8857bc2deaf94dfe7b731e1023e9f38b8f73806830b5d810f1b6410c0ff9fad55a1876611 SHA512 b3477be6a007ae2792d403fb04b396ddec311fc56ea705c8c96a832f6020e1392ac592b89803f834b099b99dae8431db06a7e25d1fcf9f9389c46404edb447ff
 EBUILD incidenceeditor-19.08.3.ebuild 1623 BLAKE2B f8bdb6beb0fd1976827bf4cd24cb6b7e0da3807a2c8b23be0a8c1fed6370710ecca89334f8cdbae8cc042908aa41d12392430065c230dc1c6ce7bad55d29f33f SHA512 20bf76f12a7f60b62d33cb768820b04c9ecc92a50e02347e2f7409594da2b05ad696696541ede68bf788f26a9b6f0b087dfdf4d7f04901374a81d5d8da20b3f5
-EBUILD incidenceeditor-19.12.1.ebuild 1627 BLAKE2B 1e13da9564be4d3987ab2bc3748d213885e788a57a520f66bf0344cb9929bfba332566fb19651ccea3c5ab4f4cac54e512f60121b94eec664482f2b93222d593 SHA512 5a46bb0607b1d41b708481007b5984a23993c20b058dbdebf45fee0910795db2fab653bd8db9d2c0f402622e9a2e93446f38fb974fbca21df825a15c8b37e7b1
+EBUILD incidenceeditor-19.12.2.ebuild 1571 BLAKE2B e9ad3b7eb6b0f55f997622ac8e6601a9cf8770d9906c14c34f184eed8cb922159aefdd383c5dff48d452acd26d8627c8975d71736a5f17edd1f914079c52d9ad SHA512 2d934b0aacb4c5cca0afdf3fc06892f05b7b136b2d4b70ee86df733750011ba279c0e2d4904c90f29e19f90c8a4626b7965eea581b6b1b17897a3b4385c8ee0a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.12.1.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.12.1.ebuild
deleted file mode 100644
index 48bec6f11579..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-19.12.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/kdiagram:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.12.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.12.2.ebuild
new file mode 100644
index 000000000000..4d1d4e7bbb72
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-19.12.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Incidence editor for korganizer"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/kdiagram:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index 728fe57af750..74a34c24dc3c 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
 DIST juk-19.08.3.tar.xz 1867552 BLAKE2B c5cccf09fe27a49ed8235289f7f1df253f0621d38a77995161913bcb1f20c7f3a0193f378782f0eeae50ed9d8fc8517d2c98826e76ef988a043259e109e3c2e9 SHA512 a523b85c1049f3f76bba1f3ba4e9d1086e4c02783a0c5d6262f3843e96f336d52f649fdcca000e1b6432324eb6bc2a6681034d2ab43065b9a93542095c3b4931
-DIST juk-19.12.1.tar.xz 1866084 BLAKE2B 28e851dabcec7c6631257fd373b8d4c3c1bf417ba19d1e7784e3a850c312d74081b128c2fd2e7086fb7373ad3a8cc0953a6710ab27289ce5da73b6911ac9ecb0 SHA512 7d82956689df59c00d18a1ddf37d811e309428131e6be08684d9c3a11976a774b9a007ca1ffa2200e7ae8b0e2c04b88d0c415b68cd67df6d84ac3b63460df845
+DIST juk-19.12.2.tar.xz 1865336 BLAKE2B d0e04fcc2a06a181d3f8080426314be71725bf5fcc9c15b6682a2dee1815ac84c85ce93417d740ff118c309a7b41c395cc9d80afe00ce19e1365ee3c75df6ea8 SHA512 4db732edf5ba0d0e17118bf5722b716fe71dc681456d1456af6484baf12e0d75ec8243ffe25d91522d677c8ce9227392473d135a2f1fd1614066afee29f96b27
 EBUILD juk-19.08.3.ebuild 1285 BLAKE2B 6e7ecb5cfc21f9351b2b436e9e1b452fdf84c2ee21e3614673766f15655a600f308bd72ac83d1432e2ea70182adb9d75ec7543900b431ddb41590dc71a9772c0 SHA512 6666ed0c22e2f478ed37ec3b509fc6570abe00f5782dc860feb7af1149f587ba10d862db342cdf28e7a3d1654bac5d4f3e9577da191f76625c7bec87f9e85a92
-EBUILD juk-19.12.1.ebuild 1295 BLAKE2B a40d77b789c03c26c3cfa51ee8994c855a9927775730541feee871a884e686d0cf4d6e114bd43473bc63a35f852955ffc916058b2c8b265ca708fe2d6b518004 SHA512 256ddc71f984762b7e2d358c38cf6726c90d1996d92d306facbc0efc60ca2ea2aecd42c535730d00416d482b2d65754740e90660150f17469fb94a7dda1b6388
+EBUILD juk-19.12.2.ebuild 1295 BLAKE2B a40d77b789c03c26c3cfa51ee8994c855a9927775730541feee871a884e686d0cf4d6e114bd43473bc63a35f852955ffc916058b2c8b265ca708fe2d6b518004 SHA512 256ddc71f984762b7e2d358c38cf6726c90d1996d92d306facbc0efc60ca2ea2aecd42c535730d00416d482b2d65754740e90660150f17469fb94a7dda1b6388
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-19.12.1.ebuild b/kde-apps/juk/juk-19.12.2.ebuild
index 2fad28e3b4bd..2fad28e3b4bd 100644
--- a/kde-apps/juk/juk-19.12.1.ebuild
+++ b/kde-apps/juk/juk-19.12.2.ebuild
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index c64c3426617e..db13f48323cd 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-19.08.3.tar.xz 10500940 BLAKE2B 8184e6790a312e66f76d3112084e7ec8cf16b67ee3deb2d1fe88df76680d573b26310544c9c747168708494fca0e0c88db9b3ee8f05d66470622a0c42a491e87 SHA512 6a98100a43ba7b18e7333e4782fc070b6faae480c03a788d80d0051b2a72e8e89eb501ef7ffc1f1fa46b18141a6f53407079778b6c51709282cc43530863cf84
-DIST k3b-19.12.1.tar.xz 10501372 BLAKE2B f3f5ef0c05dbd3fc5eba826fd96acc446c2352f314c703b54200d7074f56c5743163ee8e0bca4ce41cf8a252053808a4f3baec2a51a5c1451f375e6ff3b5060d SHA512 b479894ae9fb759f130aa864b7f6447d860ecf09a7dd6c5ce517a72b1719d2bab4bb086b26a8f6232033dfa5ef7905adb53215e081da0b0a6a9d2f704c03c512
+DIST k3b-19.12.2.tar.xz 10515656 BLAKE2B 18a7f5a9b2e494dca928651bc68036e3ea776cc50bddca86113cb99837f1600221f7aeb00cc7d68b315649a65f026524f9938fed6a69d7306a3f28388a3a412c SHA512 bcc5d8a08a00d8b8383c2b5e352e5761e1da1b897500f665e182f0f8622c280fc7549267cd347b15d43d42cb42354eaab7eecc0a35b35767bbe6709a07d4644a
 EBUILD k3b-19.08.3.ebuild 3557 BLAKE2B b80d43255ee74315780430e9a440360197359e1330ef77d9bc237374ee53d2d60b8c7441b41ef97d9ce9a4d441628d3e89d2d1528229a546d10780c150ed37c1 SHA512 b51c4c4c97998520a582de3afcfdd087ace36e984eaec4362f9abc825c8d2ba71e79fe27ee6146aac22d92e0661ccd9980099c9f0963749830d34791d28b8f98
-EBUILD k3b-19.12.1.ebuild 3573 BLAKE2B 862af61a34839ec131d2104d5c78b99a5e326c1a5f086e981f72dcb16bbf503f2cdc47054057fb377f65a14e5c2b0ae3bd698669b1e6fa34567ac72e06547e99 SHA512 0b24e73f10229595b0499b42fcb8d66b7859cf928a88246f1a4d00d14f1d4521db6d6fc3755a1a05c463d664dd522e19c396764c07ae9dbbf580a68f4dfb2c37
+EBUILD k3b-19.12.2.ebuild 3573 BLAKE2B 862af61a34839ec131d2104d5c78b99a5e326c1a5f086e981f72dcb16bbf503f2cdc47054057fb377f65a14e5c2b0ae3bd698669b1e6fa34567ac72e06547e99 SHA512 0b24e73f10229595b0499b42fcb8d66b7859cf928a88246f1a4d00d14f1d4521db6d6fc3755a1a05c463d664dd522e19c396764c07ae9dbbf580a68f4dfb2c37
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-19.12.1.ebuild b/kde-apps/k3b/k3b-19.12.2.ebuild
index 133fad51c62f..133fad51c62f 100644
--- a/kde-apps/k3b/k3b-19.12.1.ebuild
+++ b/kde-apps/k3b/k3b-19.12.2.ebuild
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 296d6eed073a..fecc8a6254ad 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-integration-19.08.3.tar.xz 71924 BLAKE2B b4c6fa383c053843c0b6529d33e8bff7f4fcbbef20287c6f102f696b1ea833e35d889342668d0617fdafc63663ba3bd47ee6178dafe1b76d8e486f8e8c3e92e9 SHA512 f1e7a1c3959b6739aeba3ab8a2bce51116b1b7263951cb55931564f2628f0fbe7eaa876dff9a4b7a4c6846853360293e5949297d4faf5d6a739579bf29245fd6
-DIST kaccounts-integration-19.12.1.tar.xz 66588 BLAKE2B 99b898eea26f74b25b02ffbe7c6c4ece04d7f3e405364377d1a207cbf7b1c5033764067858b32e75c377f6b925abe0693e43f5229f1f6ffbdba99d107d6ee486 SHA512 233f6df594926f6fa5b897f81a5f63ffa71f5b60577c167d77c20fd1a723cbbf6625368e88b2fa9195f7bbc2f40ddc70fcd1cc63fe55a2cb6c0ed1319e8237f7
+DIST kaccounts-integration-19.12.2.tar.xz 65800 BLAKE2B 22c7f2b2bd7c9b9c6ff9d1b9d8564f6e5bb270ea23b49890def36996c1e9d7e55972994eee4ba45092f557e82a0613fc83b2d3dc27ea81679149c694e2096b2b SHA512 378f8d8d5cc470fbd70e197dd472331b648bdf498d9df4a45779aa3d7675c6f196c87ba43ed035f178bbdc9474b74dc1ed1ed7b0a48f83ce651971696d2bdf3e
 EBUILD kaccounts-integration-19.08.3.ebuild 1119 BLAKE2B ae323d64dff359664f76d5a73423d2e9bec23c25942c7ea68e674c6422cf093e6a912539a8395fff9baa105eb28d2ca172a9f5ad67ae99cff75eb075e8c25bc8 SHA512 95b78b84e136bc3f3654a36d4ad4aaf2b45c6dc081db17b0a0638d921cca8ac90ebe00e9d338a3ed63ba64644c8569c2affd887a8b69d79bded343eaf635e167
-EBUILD kaccounts-integration-19.12.1.ebuild 1129 BLAKE2B 297415adb810204c8d8b36ac71ab35cc14eefc6e00089effeca3e555c2b1c86bb968d218cfa0fde88a40dd624a3d8ae66e27cdc113f1203e060053badb075f1d SHA512 e64deb6f149751972ac923d4341943518d78b6fab6627daac814f5b064ca6c5dae99070270e31ccadaadb85b7397486b1f73509676b2fac2725a2ca79d081bf7
+EBUILD kaccounts-integration-19.12.2.ebuild 1129 BLAKE2B 297415adb810204c8d8b36ac71ab35cc14eefc6e00089effeca3e555c2b1c86bb968d218cfa0fde88a40dd624a3d8ae66e27cdc113f1203e060053badb075f1d SHA512 e64deb6f149751972ac923d4341943518d78b6fab6627daac814f5b064ca6c5dae99070270e31ccadaadb85b7397486b1f73509676b2fac2725a2ca79d081bf7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.12.1.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.12.2.ebuild
index 3689671d5225..3689671d5225 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-19.12.1.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-19.12.2.ebuild
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index ceadb6f8447d..a7b824aa41c8 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,5 +1,5 @@
 DIST kaccounts-providers-19.08.3.tar.xz 32104 BLAKE2B c8d23fa7a7ae32caef2ac8ace2efeaf20e41a70b424009d2ab6c4604c817f4910d2400b21c3030cf66f17fb27527a3b81de3c801e38e4aa6bc4fc8526a8401fa SHA512 bb8e6a409688ca7a31ac802ab75e796eb161b9f4495d1ba1b9c3c5aa2d836b917f4549e81ce327ea157f5f19d15fcb0c50c079be49e114dff897066ae3fa1e06
-DIST kaccounts-providers-19.12.1.tar.xz 32204 BLAKE2B bf81bf935d8836f6d93019c2cb3136e79baa7ba7ffeb1865431dd9ca392ee2600787b46b1a1809611b354d8b26fd43f788fac199c04f212c3e8c09d26702534f SHA512 03b88b02cda919aacf8ae460ce896ec8c3a7baeec838f428f1cc225b8632e7e1450ca5aae1496dcf52c0bf90614bdc179ea2234faf0baacc14faed9a2db0f9f8
+DIST kaccounts-providers-19.12.2.tar.xz 31928 BLAKE2B 8d98884b20c289155860d60e6e8dad60f2d6209ceda41c75fe0be5b49514ba6bc6cea762ba8fc4aa471504266413187bd2a4dcdf4686262d7829c5518d1aa4f4 SHA512 6905bafdc872054c108ec5f4be0c0deb36f237434fa37531524a5f9e0ae7e884229a547003fab45d2d42c233c38e2a0db6a4c121f0675c7bcfaa75c86feac5b6
 EBUILD kaccounts-providers-19.08.3.ebuild 754 BLAKE2B 3293c84ef37627c0a00b7173b7307cedf09721c16ab0f4b09085fa47740357fa9532ce168b10e71adf7984d23e82b70d43dc0c915df3b5262e4df7276691bf03 SHA512 af3437c0b702eccd11487a125cb3d103800cbc48ba4c63e8861198cd29264812cace6f9d8956a9bbaed1d22480f53f0bdd82597f450cca23e57e0778f50717f7
-EBUILD kaccounts-providers-19.12.1.ebuild 757 BLAKE2B bb0d01bf4f5d0eff9af32b10e32f8c60c5ee2ea90c4307b9fe8eb5efbcd5fae5f4647d73349159249ccbb7788e6f226d4c8c6392db1ef13f6e883f883c5be233 SHA512 cebd7dd63db2f11934610ca333fcba3f1225a0942e322326c45e6ac8a4f8eefd5b214535667148571170ff8e46c5375278bb73b72d00fd238cfc2d2ba4ac9037
+EBUILD kaccounts-providers-19.12.2.ebuild 757 BLAKE2B bb0d01bf4f5d0eff9af32b10e32f8c60c5ee2ea90c4307b9fe8eb5efbcd5fae5f4647d73349159249ccbb7788e6f226d4c8c6392db1ef13f6e883f883c5be233 SHA512 cebd7dd63db2f11934610ca333fcba3f1225a0942e322326c45e6ac8a4f8eefd5b214535667148571170ff8e46c5375278bb73b72d00fd238cfc2d2ba4ac9037
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.12.1.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.12.2.ebuild
index 92cc7256d5cf..92cc7256d5cf 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-19.12.1.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-19.12.2.ebuild
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index f6035aecc24f..29d80074c203 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kaddressbook-19.08.3.tar.xz 473792 BLAKE2B 3e91dc694f1161efbee03545646cfcf50da42d659fdb15104bc3a348aa37f3390baedca5b74433477b2b1333eabc46434bfc57d299919cf9db8d4fcefda8908f SHA512 82d0f41bf722a24df8db9d040256d69e8818fa5cd52bf42a310e503772b27ee0745476c2ece607bb5acc81dd4f44f85e2a6b5d26e9b4b061772c361520053022
-DIST kaddressbook-19.12.1.tar.xz 2399260 BLAKE2B d5c4a93466b6552b28cb2f547b3cbc1c459edd2635b610e8e6b9cde0da2c1726d1e3c60ad52b3095c659c82dda065975f21cc05494289dc6ec2c4052d12f96ba SHA512 550e291eaccac1d578fa65b10a0909b82a6b07526fb73c1cda914cbd27120737410a5a1dec74634a8c679aa7eca77796b3967a4d485b6dbc0f2a5c4f79b2d293
+DIST kaddressbook-19.12.2.tar.xz 2419276 BLAKE2B 526e930f9613d34a1b5dec08fd8bee161b6ac44efdac9a17cdc251c48635ae6dbd20aac47980d748de7ce317b796a6a3cf56c08045a99a99d0cb90e5b567ec2c SHA512 f9ff89ebb0151204eeeb5258889f3f015ff45b857b2d56f74b18d9c773ff8c5b81af657ecaeb4abe30d0ab999541f66cc85c3d3a9ed4c7c4d80556334eb38c4f
 EBUILD kaddressbook-19.08.3.ebuild 2043 BLAKE2B 6b0e2719ab23872ca0198c7a69a9c08508678530583916335cb04cb74dd0e7dc4d0d7cc80b356298347622b9b28517622d725b8eec2436c32cbd020fa431bea2 SHA512 fe8dcf2b941126f90435655eaa168ee7cfbf3321f2d04998ae4734e7b47cb058783b7ec11869a13b7413e23d53f8e72a54e1bdbc63608979209b605b4540ebfc
-EBUILD kaddressbook-19.12.1.ebuild 1973 BLAKE2B 0b2c60cde8a90a40c1c77d25269568691b79d0498cc263dd778bf309704739d47bfbe98aedef0c42f9fe19821459bf02d050cf159a27411bba876ba8e7622e02 SHA512 d9a62235b2daa916f7a826ae655a91bac1f106fee3fcff7fcad05ccfdaa8790aa79c551644e9635cca4863d4134a89f68ed602f92fecb23f35989fde5a5183f1
+EBUILD kaddressbook-19.12.2.ebuild 1950 BLAKE2B a7ce9a813ea77107633e433a8053b09f3f913a3702413e92d9b2972e64851b4d70db19af401dda5b4fbdfb3d72454ec30a73500ea9fbb9cb1d85071daab076cb SHA512 e387f365cd69a9eff6e9071884887e52360d0d6c905927f1ea77b19dbea568b48ad19fcbe209e7e610db3318add47cdc990c1b2480fb097177f0694b6f532b61
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.1.ebuild b/kde-apps/kaddressbook/kaddressbook-19.12.1.ebuild
deleted file mode 100644
index 73c519a667e0..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-19.12.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/kdepim-addons:${SLOT}" || \
-			elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
-	fi
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.2.ebuild b/kde-apps/kaddressbook/kaddressbook-19.12.2.ebuild
new file mode 100644
index 000000000000..d8e7181fac78
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-19.12.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kaddressbook"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	dev-libs/grantlee:5
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		has_version "kde-apps/kdepim-addons:${SLOT}" || \
+			elog "${PN} is not complete without kde-apps/kdepim-addons:${SLOT}!"
+	fi
+}
diff --git a/kde-apps/kajongg/Manifest b/kde-apps/kajongg/Manifest
index 1d78ff722306..ca1983cbc633 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
 DIST kajongg-19.08.3.tar.xz 4463292 BLAKE2B 9dab5915414155806d13695cd91dfa27289da3d236a954becc4c9657d05db8968f1801738106a2c2ee31ed493817c0924947abf69b3ce0e31700a1541a8161db SHA512 49c5877216e9c73ff66e11fa8d14e3a82e08149f92c5cfb54ac7057096b0b53a46bf4a8eb4ca2f3b7bde066249b4a65b81ee42cf8969d06d221cf8c89a2fe97e
-DIST kajongg-19.12.1.tar.xz 4466720 BLAKE2B ac7ff0b71d2c4352cd8a0a14c22d3c5d1d511ddd97751fe9e644eaad1485665db73dad575d159a9c409be5be387471927f5756168432b404e56aad3eff42d75b SHA512 1f19e13cc0b1026698cc668a31196369da9304959370a2ea4a8cf62e4f1b0d95cec97a2edb95a015cd03890c82e785cdc7f85de88d1ce8f18673b8178ce5d9f5
-EBUILD kajongg-19.08.3.ebuild 1265 BLAKE2B 3f3d46fce4a547467823d76adc8044662bd459d3d8584cc038820e79f8924ec83ba0c8c9dad0bd2965544c280c230d0e39d309de55a557020178ebbb0a3fd2bf SHA512 aa49a61955852a32073233793c0af0e2f964895b06caed6f69ee6ca52e467896cd63fc311c582c884b25dde9818c5ddc4b435208da5a8fe2477486d12109c3d5
-EBUILD kajongg-19.12.1.ebuild 1276 BLAKE2B bb9294f8b0a0137707a86648f83dde0701d18cb8e711eed3092510c0765ea245711c9b3938ddf0b15f8a10a7b2215f9594a1e6b70e9fae6acfe80bb019b5567c SHA512 f37d8f3f9218308f4be52a4a4348166195a9597c52fcf1f140916b6632ab17a79d39890feca4c62fece4b620f482faf3655a70e482a22daa13be2cc4708216e9
+DIST kajongg-19.12.2.tar.xz 4465360 BLAKE2B 01f43987648b2a07046954e29eccbc7fff1134d468a129f9a05d6814a4d56319785c538e23c8d143836cdf64a67af7f145575b17268037b4bf228a0bec6e9aa3 SHA512 a6999391093e16d31442c3b91eba639e929d250332d1e654eb00fde3e0104ff83d071b88a5e42193b03ee172a053d79784f59f02f1679c364c465bf218327342
+EBUILD kajongg-19.08.3-r1.ebuild 1308 BLAKE2B 8688ba5614ff81dee45270f3f7f6d51e1ee9cdbfe4c5784061108a5a2c47d737df05d9517501ef0f5c0b8351e08ed0637f2d87271b6a54c27f635b8213de4391 SHA512 8e1806d38da516622dcfc5eec2e4083cebedecd4305c561b0bd1f13664fa5d8741df836e5e95302df4484644fbdfb0027146c7ba7d55e5395be771ea12ae4681
+EBUILD kajongg-19.12.2-r1.ebuild 1319 BLAKE2B bf1d72536d6fa86c01ce9e66a66d2418bfb0546d081e6f112ea34f602ca77d98945f9c4d5a9d2fbd572b9633fc8010adc1f90b1a6ddc9fe8a1644bcb64ae9f8d SHA512 92aef210c18def0e5c9eb09c6f20bdcb6b8359ac3f7a049aa0ab43d522218e92d8035e797fcd480557e0e86c263e39242f20b6b0b65316ce0a9d0b8d4e67e9c9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-19.08.3-r1.ebuild b/kde-apps/kajongg/kajongg-19.08.3-r1.ebuild
new file mode 100644
index 000000000000..4beb7921dde9
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-19.08.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{6,7} )
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="Classical Mah Jongg for four players"
+HOMEPAGE="https://kde.org/applications/games/kajongg/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-db/sqlite:3
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libkmahjongg-${PVCUT}:5
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src
+	ecm_src_prepare
+	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
+}
+
+src_install() {
+	ecm_src_install
+	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
+	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
+	fperms a+x /usr/share/kajongg/kajongg{,server}.py
+}
diff --git a/kde-apps/kajongg/kajongg-19.08.3.ebuild b/kde-apps/kajongg/kajongg-19.08.3.ebuild
deleted file mode 100644
index 2265010c57f6..000000000000
--- a/kde-apps/kajongg/kajongg-19.08.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://kde.org/applications/games/kajongg/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-db/sqlite:3
-	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	ecm_src_prepare
-	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
-	ecm_src_install
-	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
-	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
-	fperms a+x /usr/share/kajongg/kajongg{,server}.py
-}
diff --git a/kde-apps/kajongg/kajongg-19.12.1.ebuild b/kde-apps/kajongg/kajongg-19.12.1.ebuild
deleted file mode 100644
index 68eaab914c1e..000000000000
--- a/kde-apps/kajongg/kajongg-19.12.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="Classical Mah Jongg for four players"
-HOMEPAGE="https://kde.org/applications/games/org.kde.kajongg"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/libkdegames-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-db/sqlite:3
-	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/libkmahjongg-${PVCUT}:5
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang src
-	ecm_src_prepare
-	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
-}
-
-src_install() {
-	ecm_src_install
-	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
-	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
-	fperms a+x /usr/share/kajongg/kajongg{,server}.py
-}
diff --git a/kde-apps/kajongg/kajongg-19.12.2-r1.ebuild b/kde-apps/kajongg/kajongg-19.12.2-r1.ebuild
new file mode 100644
index 000000000000..2e18c791a78c
--- /dev/null
+++ b/kde-apps/kajongg/kajongg-19.12.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{6,7} )
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="Classical Mah Jongg for four players"
+HOMEPAGE="https://kde.org/applications/games/org.kde.kajongg"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/libkdegames-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-db/sqlite:3
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,svg,widgets,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-16.6.0[${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/libkmahjongg-${PVCUT}:5
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src
+	ecm_src_prepare
+	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
+}
+
+src_install() {
+	ecm_src_install
+	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
+	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
+	fperms a+x /usr/share/kajongg/kajongg{,server}.py
+}
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 6c36ac8e1e35..a12b8e4cf2c6 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kalarm-19.08.3.tar.xz 1823656 BLAKE2B eecb00302fbac54da91a6a4de91da65d503fd64222fd522d330c5ebf115002e1d4eb1baa74054ead486beee701e881291593475dfcc29b2ea094ac9748e817bb SHA512 b1ff5137c4ec1d0067767a7e14a2ce7e2c3c1a621845975140ac538af6aa6dd6bb44f567c2569a8812552379c79f70bfb828ab1b6afa103cabdf07ca492d5dfa
-DIST kalarm-19.12.1.tar.xz 1836264 BLAKE2B a10bdd3aafda5d776d9b7691f72e755df012e6c06b6bc151efe60adee3cdd69cd4f0f977a52ee42b66c305419fe221352187943b108c93c93ad90cdad9c7f79e SHA512 f6728690810571031abb61e53cc54568eadff8ad5211528fd293c5415b6df895ba5acb98c995efdeeb74c117557ef40152843147a02a2f3f8649948586743661
+DIST kalarm-19.12.2.tar.xz 1835088 BLAKE2B d50e8c78d335a12a98f2d0cc5aa4dab398273f1ecd84447e6ff3b48ea0f37367e3f75ae69d113e8b1bb8c99280669210503e9bbb64595ad7c384d8914dc040fa SHA512 b1f183e38209d0f9641af72f2312688d7c9f1ffab73404bcbdc8bc9ea9a28ba3f1863ae3a0f9e8a3a9cce5543756eedd17e657efba48f292207e4b06c0641c51
 EBUILD kalarm-19.08.3.ebuild 2435 BLAKE2B 0b64283500e432b22ddc7011fe2312c08ccd02abaa0dcf1ca21385681d7d5588bc6dcf1a65283d62a90103fd5be8c475809fcc7c512d78f854a3937e5990bd6c SHA512 4d7473695c569d69b9d680f443f6b8167142dfe11841e1edaae17d0ec00190da60ff2be673ba4777fcf390ebcfd26a5b00956a706b7da4b0ede3544730fd7533
-EBUILD kalarm-19.12.1.ebuild 2446 BLAKE2B 21ce9e7e5ab36fa10dc606ac7ec4d67427c0d86eeb5e1d73033431178f695f756e89e1f1723cb1eb68e588a9e1d55f74b378dccc56a21abaa4bb6d8ebcd36f82 SHA512 7501992a01110b3b514e1d06d2fe98922c30721390bf4bd5620e7c4758f9babceb78761b598cc6dd43f04d5886dead2dfdfa8317c19757f6491e14f43addcbe8
+EBUILD kalarm-19.12.2.ebuild 2423 BLAKE2B 665ded9c1e3674e0e6c2a205ea26c9066a954a16543b5b3acf1f41d312567e518315c4c88e21630ed0a84faf7fa226b983f4e3a61760c6e280b92bf3c37e0986 SHA512 dbca88cfade473574d2b909198f46976b4067c77f4c372aebce54b6daf281344a169d2748b3956b5ac7e95cd016b47c829b4efee63c1413df51e2cbbe416608e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-19.12.1.ebuild b/kde-apps/kalarm/kalarm-19.12.1.ebuild
deleted file mode 100644
index dfa4637e5f0a..000000000000
--- a/kde-apps/kalarm/kalarm-19.12.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kalarm
-https://userbase.kde.org/KAlarm"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X"
-
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/phonon[qt5(+)]
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-19.12.2.ebuild b/kde-apps/kalarm/kalarm-19.12.2.ebuild
new file mode 100644
index 000000000000..c0b792daad05
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-19.12.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.kalarm
+https://userbase.kde.org/KAlarm"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X"
+
+BDEPEND="
+	dev-libs/libxslt
+"
+DEPEND="
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kalarmcal-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X Qt5X11Extras)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 86d381e09f14..ec54c3e69df8 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
 DIST kalarmcal-19.08.3.tar.xz 573036 BLAKE2B aca3d5bf38744d603661487aa8a705fbd4e664107ca4ef05fa49e1195bb17a9b0997b078a9e01bf1af5e6c40d7fd3f6137152081cff5dd47af89167452b7a5e3 SHA512 18eea0a1629e9491e65d4041cfb14f878521f4a8455129357ee3b831b8de1a54fe5d1909fd30afdead508216d310f7042ccae8f929bbf0fd456833e6e638ceb0
-DIST kalarmcal-19.12.1.tar.xz 574488 BLAKE2B aca55b40ca32d27c0c09a72abaae72c6cefcaaed6f58ec2624fe3a43b29dfa831a4a178b5e237f63ea451df1614beeae4bbe715f83a0fed66b4b391a76580729 SHA512 c4917f2636b24f9049d279164b61cd526c67fe8b827a68e952abfc6ac056b513b32fbc61b92a7d0cd21ee3d396dd339a95202a3fd64e093afef9fcb085e73b9a
+DIST kalarmcal-19.12.2.tar.xz 574796 BLAKE2B 739897c2059a2723da58158f854fcbe8d72cab186ea1eddf9bab251f81d3ddfd07a4f4f544d92802ef9d07b15c059f32e91694f6de2d538562377c97609ea650 SHA512 00b0e20fea9eab49b573854ffc0ea560b76353c1c9742f24fd303eb8b8e2792a804568c4c2815fc4b22b85623349887ab8c8d09ca10200c63f047aea155a5c44
 EBUILD kalarmcal-19.08.3.ebuild 854 BLAKE2B d84a4f56f005ff01580118935a9d42a4a2dd54d9a320103fa57612915ecc09c68b2edae60e486b74c9deb8daa32b9b8ace447326324b893df2ac0689e6da2dca SHA512 c33c35e0a224c15e37d5c5350f9ce6cdac2c0ed65cd994a7b4f28cd29bb03c92ac8535e38a1d8fa83068b11e9f511445d755bf6f89e35db150af792f6925d003
-EBUILD kalarmcal-19.12.1.ebuild 858 BLAKE2B 30649f9f4cc65a63fdefc9b5c9459f15931e639fa72137e156afd6834286611b689d033068b4927e892243d8e4b0dc3cfe6e220237ddb3bdfe117a03047db03a SHA512 b42ac62ba22d5fd2530918c3e2bf190500dd7892fc64a83a3d8c336e56b9935e8b0384338921c28e35e990a66399462ed25df05a35f136e805bfa540f1ee4cf4
+EBUILD kalarmcal-19.12.2.ebuild 835 BLAKE2B 259bea6fbf47296e7b66d3e63dc406b702344ca4664912c9abce19b4ca60c0ffb14ee009fe7b345143104e04c42a6411938fd1219df5bcbce5f291e146519747 SHA512 5c035bd25b7b2972f02992e24ae067629dcca7e2d1bc64017800c5604074b9bfb989b9915a519651f596e1755797cb28dd751649827ef7e2e7a41b286e0e47c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-19.12.1.ebuild b/kde-apps/kalarmcal/kalarmcal-19.12.1.ebuild
deleted file mode 100644
index 372fc35d0fd2..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-19.12.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-src_test() {
-	LANG="C" ecm_src_test #bug 665626
-}
diff --git a/kde-apps/kalarmcal/kalarmcal-19.12.2.ebuild b/kde-apps/kalarmcal/kalarmcal-19.12.2.ebuild
new file mode 100644
index 000000000000..dc4387c2a5f8
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-19.12.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Client library to access and handling of KAlarm calendar data"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+src_test() {
+	LANG="C" ecm_src_test #bug 665626
+}
diff --git a/kde-apps/kalgebra/Manifest b/kde-apps/kalgebra/Manifest
index 7c640d184224..4bc963f8b9de 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
 DIST kalgebra-19.08.3.tar.xz 1157236 BLAKE2B d1d5309ed6d56578045270ba184582f94e0f14944f5bc4fab2c741958849507dda62b36af20eb25452b372301077a914331a1b777480c9a800aa3cd94b533601 SHA512 a623e4675b1e188411da358f965648b6f9ea60a65d3155c377dc5e60b288a2c757627f1c76cf98629ed23784374f60b2c748cc80ff22a93e3469ad2e3dff310b
-DIST kalgebra-19.12.1.tar.xz 1156408 BLAKE2B b57dbdc2d82334d725292cfcf2d89d7dca0812b3a1c6cc5d2286ee023a00e42e0f31e1994ffca86e1ef09761ee83fefd0e0b6bf6ce8de113f77e5f766ddc4018 SHA512 6c5d4c3c2737895f3d0101593a7329120777eb1c812f451df4d90103d7384040c43f8cbeb428e2899af19ec28f3a1f8ec5eef59d0c2332040876b971db2dfd3e
+DIST kalgebra-19.12.2.tar.xz 1156024 BLAKE2B 9e29611f5d35b0f08a519b3a6690f19ab674f6a0c5236f4b5c96ca649e6262271b0c215ea73a65239c7d7406e1cc8c7779b022948379c8b62720c3a8b450d9f9 SHA512 2ae771a71ef65456a19275fb1ba31727479f59b95d099a52fc389abb74f8ab27498d01fffead543647e179ea9322b88de97f101eea9118b92cea74754c3c9181
 EBUILD kalgebra-19.08.3.ebuild 1166 BLAKE2B 2e44fd44b4b6239841672ff1fa349b31f7401c192d7655120528cb25358564c25d906737f474a4da4c679d4331dbadac91e0114b7b6e0586f4ace03b36e3ff6f SHA512 ad4f31e9bb831813bd00f1862b804ef09915da108f1387cad04148ce7331e326e59fc2bca912c93890db23f199e6f3da368a2b3f0e636eab1068c87f72572c83
-EBUILD kalgebra-19.12.1.ebuild 1178 BLAKE2B d3f5a4b04957940087b712379609e4ab2b513a258e989b14695511bbf274bb10e2b35887a8c549cc34ddf53cfeaa4fe88f7e1552d6f55bd1eac01fd4f0eb21a7 SHA512 823e8101fd6b3e0f738a2423a134176e5cb0c32877ac248aa079f59eadf15962c299c6c29b45ac8d8bb13c81e6639ae2ca7ab76c7912a3eb7069b6647b170026
+EBUILD kalgebra-19.12.2.ebuild 1178 BLAKE2B d3f5a4b04957940087b712379609e4ab2b513a258e989b14695511bbf274bb10e2b35887a8c549cc34ddf53cfeaa4fe88f7e1552d6f55bd1eac01fd4f0eb21a7 SHA512 823e8101fd6b3e0f738a2423a134176e5cb0c32877ac248aa079f59eadf15962c299c6c29b45ac8d8bb13c81e6639ae2ca7ab76c7912a3eb7069b6647b170026
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-19.12.1.ebuild b/kde-apps/kalgebra/kalgebra-19.12.2.ebuild
index 0056530c2e73..0056530c2e73 100644
--- a/kde-apps/kalgebra/kalgebra-19.12.1.ebuild
+++ b/kde-apps/kalgebra/kalgebra-19.12.2.ebuild
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 21d035fdfddc..f57dfb885037 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
 DIST kalzium-19.08.3.tar.xz 26415448 BLAKE2B 8fc50e38201514385dadf7e7f788e90304bde6a82a3c124a55f848d2609d2734a7ea50853c6d9e60103ebc4868cac1ac28d0fea4491828e43d05a28b6372d5db SHA512 a500255222f2e3a7ebfcf580f7afcdb119de0afa2e2a2d06f273c23e518fa9901b528fe9ce6d3343940c93d0eb4a39ebb9a38c6301c347907ab3a54658ed7b53
-DIST kalzium-19.12.1.tar.xz 24596944 BLAKE2B adcad66c75a374e904131a9988e257489dcc06459b4a5b98cc4941b7ef7ccf99ebd3e6d56fc44bd2a7f57933f31009fabb6a6fa31065fc363fde7ba68f250ebd SHA512 5505bba6066ed7dfc38b9af07e368e4c631ba9f4446330f9e6184c32135676694c2e363faf8410833805461dfb1e40451ffa3feb207ab12c58f0151278af748d
+DIST kalzium-19.12.2.tar.xz 24585376 BLAKE2B 724d8b310fa4633e5b093ec69675d869d3af1c384dbf10ae674a9b8294cef45041225e101cf6b3a49f6eec6b0417a61117cd4effc85529b69df5b8fb93b531ec SHA512 e12ca2ce5ef683c66232f057827f823b2fd9b8e604053326e9ba496a319b48fbf025ac4a09c6779ed8c7320c98d87031516e9e6f73b15b17deb4b94219d69039
 EBUILD kalzium-19.08.3.ebuild 1714 BLAKE2B 25fe82120bcc685ff917c6bb2af28d2f721a8098222edb8cb4416da7eb753498d92a3b3f937dcb1236a2b9fc644aa75973e61ca00c03d4e3bfa3e2e89ce84776 SHA512 98931b8ef9199b5c4fd10bca5ad882a6ebf57b6192d8d27a6d8578e2714cd365b746800e7cc9fd496ad3cc88549aaa07b41967a34904aa3e80580239a79069ef
-EBUILD kalzium-19.12.1.ebuild 1691 BLAKE2B 0610225fb83ec559a628ff6dc09995237f295f75383f97ec6ceb9009f7ef93fd7559f4fab261ea578ba88ead418c47c2a45faa5ce8d9b470a86497cdf7ee65b9 SHA512 8e38f7f693eda08006f6e03dd289b031fcc342bd779302aa6c3c19598aabd8cbec9b481b65174e1633a461af23f44fc2018fb6bc2b45077c21205ca41c5c4c68
+EBUILD kalzium-19.12.2.ebuild 1691 BLAKE2B 0610225fb83ec559a628ff6dc09995237f295f75383f97ec6ceb9009f7ef93fd7559f4fab261ea578ba88ead418c47c2a45faa5ce8d9b470a86497cdf7ee65b9 SHA512 8e38f7f693eda08006f6e03dd289b031fcc342bd779302aa6c3c19598aabd8cbec9b481b65174e1633a461af23f44fc2018fb6bc2b45077c21205ca41c5c4c68
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-19.12.1.ebuild b/kde-apps/kalzium/kalzium-19.12.2.ebuild
index b48173de5b25..b48173de5b25 100644
--- a/kde-apps/kalzium/kalzium-19.12.1.ebuild
+++ b/kde-apps/kalzium/kalzium-19.12.2.ebuild
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 15443ce57eb1..b94dbe98ab1d 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
 DIST kamera-19.08.3.tar.xz 100144 BLAKE2B 23e0a242e9c04b9cf93850b7d1df68e6f26a4ede8747d030a07eeeea8b675071317ecff35b3e0a3ad9d0a24d10788ab5482b36885bad55493be55e2f1ef11811 SHA512 a1388abd72f3905a918fc69341e8cd64c37d205530d05e554444c1fdb8d773496d9783e7a26a8b324a8904ad9ef2b1347c77a23f430c0663014e5a66ec63b913
-DIST kamera-19.12.1.tar.xz 103856 BLAKE2B 5e89e5cf300d00a1641f54fdf0577bf960fd72a1c6a57da3614104786be7452c262dc8f183666559d73531aa9879ad71bc877e4f474a87151b2ede0619ac5d42 SHA512 a6d85e3b0e0d16f46e36d6952e3aa132dc79695c085becadc1e9e0ac96628f64de2c4dbee019ac8cf0558396aaec835e5cc5cbdeeb473250d3d27b003b7dd1c1
+DIST kamera-19.12.2.tar.xz 103892 BLAKE2B 758ce1a3df1b70ac1f48c703933f5e211a8b04a4d5fecdb409f8498fa1a44009c2b089bb59ed1b02e969838377d7ecde04f1197521ebe5ddf4814abf161e53fa SHA512 d97a47fe19257b86209c4427ba262f0fcb2f1b26d2d83fc4daa356bfde3ff67441b1a402808b508eeaf04ddb0cb07b7f07c5805e0fc334055f450801b5f1f3fd
 EBUILD kamera-19.08.3.ebuild 742 BLAKE2B bee4355e20fd0aa65e711298507b8f49bc24f54825f8e4879b74b56bbd4591fd148386d4c152a88926db8be8c73bc0750f5d6f0701af6b3e6138f639e1747f6c SHA512 5b22cd59cb9813cf15866d6f3a389299b5c3e870fe6cc0bf87e0cc4eefd00ab84684616e3ead70101990e14c279406f43198c04f60cc3a336d35bea96399d5ef
-EBUILD kamera-19.12.1.ebuild 818 BLAKE2B a2e9c010d4425b81f5bc1ec308fa9236b4d45b97ee7a6ffdc982d2c211d64532f574fde718529c7f039693e36cea9eefc3264cf2cfe32d22ed1f6e6fa155d4c5 SHA512 f19ac20fbf73534414370c7531d58e4acc588dbe6aa808ecbfedd6351b50cf9e3fd14654b17663f8a3645dba7fd8512aa57678c0b5754dcfbd7fae5902764135
+EBUILD kamera-19.12.2.ebuild 818 BLAKE2B a2e9c010d4425b81f5bc1ec308fa9236b4d45b97ee7a6ffdc982d2c211d64532f574fde718529c7f039693e36cea9eefc3264cf2cfe32d22ed1f6e6fa155d4c5 SHA512 f19ac20fbf73534414370c7531d58e4acc588dbe6aa808ecbfedd6351b50cf9e3fd14654b17663f8a3645dba7fd8512aa57678c0b5754dcfbd7fae5902764135
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-19.12.1.ebuild b/kde-apps/kamera/kamera-19.12.2.ebuild
index 4d46fada09bb..4d46fada09bb 100644
--- a/kde-apps/kamera/kamera-19.12.1.ebuild
+++ b/kde-apps/kamera/kamera-19.12.2.ebuild
diff --git a/kde-apps/kamoso/Manifest b/kde-apps/kamoso/Manifest
index 186b611ffd48..6d969b29cce1 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
 DIST kamoso-19.08.3.tar.xz 201848 BLAKE2B 3a136931e95faa459bd9f469f33c410932268073fa3e5cbffb2e9e6ec10a3919c7b634cda13487c84117ade141feed7494f51d100e4b43d5249cb74bf0d8af6f SHA512 d6c1212a469a684cfdedf8868c60d97bbb499b73dc8ffd44f17619718d3baf4988007f9cbdcd614194ef4cf19a09f99b4d830dbe4ca7a170c65f2186e2144f5d
-DIST kamoso-19.12.1.tar.xz 202588 BLAKE2B a8b2fa71d6e3cc2bb9bcc39433bbdc5b0da30d1dd05e78c3d0ede1b1bdd5aff26ffb8a17ed79743b849b1be8e10b63269324c97f86ead9966998237f9cab4876 SHA512 6a459bf3776302eee33e5ceb3f3577110704982b06d1c529444c970fbf3deff070337983f59ba4415d53d6ccceebd5d030e34b2b14bf644414cbd80a422d6eb0
+DIST kamoso-19.12.2.tar.xz 202036 BLAKE2B e4f1cc50d074cb4077160c35415bd8a09baf868df3feaefc64b0be3e2578a0cbe619abff800c5e1616443fc6179b4738ae97d36c39f0a4a53831d12385f4c068 SHA512 919dcec4d2a4b5c553205fec1a8f3c747a9904d0feaab425ce6c4199a25dd8ee998c8ebf97d0521742fb9788697936e89810a3191f8a1fe772d78cd22b94135e
 EBUILD kamoso-19.08.3.ebuild 1054 BLAKE2B 4d9387bb18f68487180b4ba1ae7087209a787821e99ee0af0c835e471c5dd540044b5f6ee60dce0ce1dc17c6104b0c88c3c88db0e60ce5f28f0c97979a41faa0 SHA512 f850cb6acb3f4ef6d18edbfa2e44981f52ab12b382d927465a301046458840d2fcb76bc9f957220f6107a9243ed7432c710cf62fc8aeda6b6d694e69d127f010
-EBUILD kamoso-19.12.1.ebuild 1112 BLAKE2B 296660f7a44bd074d3277e25b2cdfc22b7a9236fb0e375972625b99712c54c8e83d1e1586df456f7afdba83451ee281bedda62a107430d313095d5e15db2c2e4 SHA512 6948aeae1f85b10cae697795b72dc1e807faeacefaca7714e42be23fe525a328233872b8a230c257c366308ad27f303f285473e83182860809edc915f98a3d29
+EBUILD kamoso-19.12.2.ebuild 1112 BLAKE2B 296660f7a44bd074d3277e25b2cdfc22b7a9236fb0e375972625b99712c54c8e83d1e1586df456f7afdba83451ee281bedda62a107430d313095d5e15db2c2e4 SHA512 6948aeae1f85b10cae697795b72dc1e807faeacefaca7714e42be23fe525a328233872b8a230c257c366308ad27f303f285473e83182860809edc915f98a3d29
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-19.12.1.ebuild b/kde-apps/kamoso/kamoso-19.12.2.ebuild
index 9523d579ab95..9523d579ab95 100644
--- a/kde-apps/kamoso/kamoso-19.12.1.ebuild
+++ b/kde-apps/kamoso/kamoso-19.12.2.ebuild
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index f2f89a6e1040..4af20443faeb 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
 DIST kanagram-19.08.3.tar.xz 8031760 BLAKE2B c6af0c58ead32a0e781f843dfe2e23288e5538a5fa9ed05ba6b81143f1c6981a49d5b987c294302fad016c61e1b80b92c1c12a7071055ded08879e01af3b5341 SHA512 72120d98ff5555ed84fab22716c0871d8bb11bd32529bae62d632aa979668d2ff8166c94b46bff91f77aa88b7a355f1afa13ad769771780a9dd52cb0452f7870
-DIST kanagram-19.12.1.tar.xz 8033552 BLAKE2B 9773c606a269b75d17c346a60df6436dcf61d6aaa9c88fae09082fbc7074413b4a9b66036210052abe8f094845c61a0cb0d0047b13fb04b2ae84f9402224eafb SHA512 77d824d91fa8b52916f6f3a3511e5b6c8eb8226a463ea9016d43b8f5a831055e355bb2f1d34d4b934e402fab98017bda06c0f4f46b21d7ab1bb327ee4cfe3985
+DIST kanagram-19.12.2.tar.xz 8033684 BLAKE2B c0d74500e8888475f491b6c754fed41745a9ed23214e1759c91374f717d7ca63ef3762c8f7d74a480f78ba5167658b914ba6076a082efe31258cbdf49bd1b61e SHA512 f426ea393f02cc6de9dc1fab562d08e071b81a280a4ae20b89316ef38f0088b3c834bc9d514b4fc155fb3a997ec34272199d2507f7c576677c9c2a5fb5fe8166
 EBUILD kanagram-19.08.3.ebuild 1280 BLAKE2B 7fc600f13d0850392110a5c6175233f8235dcbcf5ac0347afb8401a546c15b4510ecbc54198edf9fe356235a82eace5648fbe2c7890027656449836651885bd6 SHA512 63f9f0ddd59d3c194286445c334c0036aa901d5642a2290009f3054cedb4f43664879c86de573481a7b7352b8fdf6226835412c6c7c69d4574cfe5d87ad2c131
-EBUILD kanagram-19.12.1.ebuild 1292 BLAKE2B a409b0e413cd0636fcd01fe109770ec9a99626b70d99c923f7f01783fb6415782e8de8abf3fdab3ac10a7e2bdaf9bce87572e11edc402c432a96728fd520bd25 SHA512 2fa7847fbcb23ecb27de27f80a440c722c29e4915b8d175449b8ba1a76ae539638f1fec3eb03db4dc16ae6cb49b294b6ddc5231d77c816fb4ed1cf03909f3208
+EBUILD kanagram-19.12.2.ebuild 1292 BLAKE2B a409b0e413cd0636fcd01fe109770ec9a99626b70d99c923f7f01783fb6415782e8de8abf3fdab3ac10a7e2bdaf9bce87572e11edc402c432a96728fd520bd25 SHA512 2fa7847fbcb23ecb27de27f80a440c722c29e4915b8d175449b8ba1a76ae539638f1fec3eb03db4dc16ae6cb49b294b6ddc5231d77c816fb4ed1cf03909f3208
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-19.12.1.ebuild b/kde-apps/kanagram/kanagram-19.12.2.ebuild
index 794b418f1563..794b418f1563 100644
--- a/kde-apps/kanagram/kanagram-19.12.1.ebuild
+++ b/kde-apps/kanagram/kanagram-19.12.2.ebuild
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index 71ed4048e5d0..c881f4515e77 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
 DIST kapman-19.08.3.tar.xz 2525336 BLAKE2B 7d9b4f846686f212ec11b8b98a66f0a66f5c7c4a72bb2cd8de4a30241e78b51fdfac8e6712585d6ebb55bc28aa67002ad4bfbd132d0ff6b17969fb0e464ea1bc SHA512 8f9054e264017af87d37f11750d803225c498de5e7507bc17be1304e171128bd514e07019ebd8c43bc7604e963bd1596a39ac991ebde0441fa98d22629c1ffce
-DIST kapman-19.12.1.tar.xz 2527020 BLAKE2B 1ec0fa79682f428f8cdc5de23519aa311518720e4d6642cbc01e254a1b8508ee91e5b8d9b1457e3b11facdb82cfebb7555a48ee56dce61c41ad56ef0747c4d18 SHA512 c7d57746f9990751ad3fa52aa20619deea20cc2324f458a45313cc1ad82f0ad229a860e11ab19a21d86e038b72d442deded2eb7427430d07177f9084165756e9
+DIST kapman-19.12.2.tar.xz 2526672 BLAKE2B 82da3d78aca28a4802f745df6c36432550f2e8d431a171b300793cc1bfdda683cea535d43f92ecc311298beed6797efc9eb6c3487732b38689d7c554df4342fb SHA512 fa4ce1063906f9d6c0cafb15f549a62d08f19114a1c73b7fb4b573ac1696ce7dd9b7c444c0f55758fc0be38c2377c2316e4a874e0c5529374d0435ded92f376b
 EBUILD kapman-19.08.3.ebuild 867 BLAKE2B 9748df6515e6f3e1b9cc726e416e3559b1ba1089f48a96e720b1310eb1b7ae83bf955d0832cdf2411926fbcc4cc992833aba530e91aab26f156835c4937bb29e SHA512 3895fc66818c75a786f906e382a89317a6da69e882a628b162a36d5afc32b53bbf05d801a5b273de97856619f93398bfe586989863ade48750b26ccf9265e0e2
-EBUILD kapman-19.12.1.ebuild 878 BLAKE2B 6d7ae084621e730986f260c1bd51cc96aa6509802338fe93fd8b1c797b5d4ae4844ade0633b1e52dbdd7c1ea36fffde843605ba59a4c89aec983aff3e055c3d5 SHA512 6f06bc57fd2eec23279f31fcb4ac574ab61fc0aa7d03afa5efcc221a141830ca1e2cefd0e67c4517d27d729b1317a52bebdaae25207488ef2558a97e7b03a130
+EBUILD kapman-19.12.2.ebuild 878 BLAKE2B 6d7ae084621e730986f260c1bd51cc96aa6509802338fe93fd8b1c797b5d4ae4844ade0633b1e52dbdd7c1ea36fffde843605ba59a4c89aec983aff3e055c3d5 SHA512 6f06bc57fd2eec23279f31fcb4ac574ab61fc0aa7d03afa5efcc221a141830ca1e2cefd0e67c4517d27d729b1317a52bebdaae25207488ef2558a97e7b03a130
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-19.12.1.ebuild b/kde-apps/kapman/kapman-19.12.2.ebuild
index 9fba0e636633..9fba0e636633 100644
--- a/kde-apps/kapman/kapman-19.12.1.ebuild
+++ b/kde-apps/kapman/kapman-19.12.2.ebuild
diff --git a/kde-apps/kapptemplate/Manifest b/kde-apps/kapptemplate/Manifest
index e4d044fa4f34..3622d8f0bbf7 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
 DIST kapptemplate-19.08.3.tar.xz 316724 BLAKE2B eaa289f012bc81e4553adf0b424900122287dec681e188da7c97583a8854741f854341ee94b5ac742a360643adc74c627f28a7d51f9e237d656a3f27f9f301d9 SHA512 215b0144c4a6d2743b9f4cb387f9f7eb75de420949a3e835da992cd7e6d241bea54b225932371741bd4cfcc288b9a2bc89dceee66b47fac84cbc7290e5459baf
-DIST kapptemplate-19.12.1.tar.xz 316820 BLAKE2B 075f22933f39be27e5635381a3ab560ed5d28980ce5cb8b89f8bc56e6092e49ac8631d8af50c6d94e47715ceda90f0efd4c1dd289f57feb3890b24d2f26f7887 SHA512 4f4cac5054447b600c382cfabe4382631cded870b3be81c93ee42aa3041f760c7adc734a7da25c635df20b0522e2f3d49b457806fdaedad99301af62df755a68
+DIST kapptemplate-19.12.2.tar.xz 316848 BLAKE2B 71af7410b75f6cf16d929b8b31e87bace05e7c49d32ed2527f06fa3ec130c8c932be588af883762e4090de5d0fc8729d9058874fde4ad0c3fa764786419e1218 SHA512 5ea42d9364b6da766658a2ae5720f30b9fe1090bf62643d9b5f80001db05d05b1ba1ba2dcafcb886749338ad8a187be7f68cee509389b5f1ddf2f6dc24ebd5f2
 EBUILD kapptemplate-19.08.3.ebuild 845 BLAKE2B 62bc84ee5e536937a94d7a802489e8af702d376635beade33287017a9cf88ecf122f31359842a128b72590b2862f1c65e3be04f37ceb5ffa90393783e1295e25 SHA512 0028da2b8ec0a3d3ff2f28beaae837ffb415111f4ae03c56fee13854e6167c98bec05e4d940a2d392d54a2656a2891688565d504efad600efdc7d39ba9073d9f
-EBUILD kapptemplate-19.12.1.ebuild 857 BLAKE2B c3182825f3b040f502460dd4ae18157a859543cd05730f24e726de5af9c06e3dfd5beb6ba9072ef219a25daa528f450c4af4031f1c7966ebe203a7a52dfee67e SHA512 c5521b0a57771a2c279f5ccb21296f92689d689e527ad73b037671ffd8296f7d61428ea104ad8fd34b00b38251cc4ee2a2ea2985b258344d0088d8be1300801a
+EBUILD kapptemplate-19.12.2.ebuild 857 BLAKE2B c3182825f3b040f502460dd4ae18157a859543cd05730f24e726de5af9c06e3dfd5beb6ba9072ef219a25daa528f450c4af4031f1c7966ebe203a7a52dfee67e SHA512 c5521b0a57771a2c279f5ccb21296f92689d689e527ad73b037671ffd8296f7d61428ea104ad8fd34b00b38251cc4ee2a2ea2985b258344d0088d8be1300801a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-19.12.1.ebuild b/kde-apps/kapptemplate/kapptemplate-19.12.2.ebuild
index cb7207b47cda..cb7207b47cda 100644
--- a/kde-apps/kapptemplate/kapptemplate-19.12.1.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-19.12.2.ebuild
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 5839c4e80654..93f4430f14e3 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,5 +1,5 @@
 DIST kate-19.08.3.tar.xz 5844532 BLAKE2B 34aaceab92783a869de616be9290887f75eba5ef6198e93d90a71d62b441a907a7893916c72ac85c46d6156330322d5297c60c8c9b43cbcd615c05b51cdd0000 SHA512 0a0b33858bd4856bdf29d354603d33541b2c0aab134025db3014aa31cf3231fa2bcc244252872c0b51c28b7cd715556966d9049ce85a8ad614e1f552479c1bc8
-DIST kate-19.12.1.tar.xz 5697944 BLAKE2B 1949b0e488bcf1e0b72accee58472487a42c97ee5bdb3d7713fa8895e4cf4bbf9a10cd69e4b4a8bdf270cbaab720c001a7738f435d615ded0ee13b19a3abe750 SHA512 fa170041b3f1d3544c85b1e8bec1dabca247e1534dd4b1cc008279051375bfea1190b7be4ffed1572f2c4c348fc3d04219aa0bda61f3091d4c820307757dc219
+DIST kate-19.12.2.tar.xz 5733072 BLAKE2B 496cf247ff38fe8fb7951f4c348ed3302a161812e50a6c4df2caa9d105d601f2ccda4bccb1c7aa15b9b27c45201b0c43d5d925e0af236edea9a385b06501d96e SHA512 3c85c2e05593b67591366740d34f7c247ac6ff5f411681c100c6be64d8f5f77d4d0e3a2439c9cb1210084880578b107611d03355d3fe2400226c5755c58f1c61
 EBUILD kate-19.08.3.ebuild 2563 BLAKE2B 96195db78f6095b8c77bc023adac5a1f3bc253717ea5c672d5e51109a4f8104de23a2ba195149c038032074c9d8a22b347ffc1c57012512cef82094db9f4c093 SHA512 2b1d5d92bd6f6c32580bd814038d186a0f3341e06018528ea013829184e7a081f0e5a733848f67fd5dc0e5477cb5e83be4f280585e1a1bbafa87132eb85fe4cb
-EBUILD kate-19.12.1.ebuild 2910 BLAKE2B e1337b5c1d80e1d2f45b691f8d0647072662156def497d7c7f8aaa21f2abdea2acf1df7b487a6c82f957e0fe5f60ee375a0abfb3413229d4f3ca960c544e998b SHA512 233d8ebc952009f7d9b386f84af6de5ac66023f58f91dd50620a24e2be76be76a32142c6e5686dcc011d18a53c22c3f7362171c3eb7229fedfeb6df5a779cb49
+EBUILD kate-19.12.2.ebuild 2910 BLAKE2B e1337b5c1d80e1d2f45b691f8d0647072662156def497d7c7f8aaa21f2abdea2acf1df7b487a6c82f957e0fe5f60ee375a0abfb3413229d4f3ca960c544e998b SHA512 233d8ebc952009f7d9b386f84af6de5ac66023f58f91dd50620a24e2be76be76a32142c6e5686dcc011d18a53c22c3f7362171c3eb7229fedfeb6df5a779cb49
 MISC metadata.xml 928 BLAKE2B 82f8586f3a4473f33f28880a33c6e5949b38f72186838923066dc9c109d6c58101912e4ef9b374e9b6ddec962635e421e0385ac8a6c07e4dc2785006073849f6 SHA512 69c8bcd624acd1cf9260abf1408351450caaff184275126a0a988848e565fbd81602f6b61b858a0f36fe6bba4e96d7af1911600bfe4d9c0cbf32263aab530df8
diff --git a/kde-apps/kate/kate-19.12.1.ebuild b/kde-apps/kate/kate-19.12.2.ebuild
index 7d82c73d1785..7d82c73d1785 100644
--- a/kde-apps/kate/kate-19.12.1.ebuild
+++ b/kde-apps/kate/kate-19.12.2.ebuild
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 24f101a3b801..4140eb79dd2d 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,7 +1,7 @@
 AUX katomic-19.08.3-qt-5.14-1.patch 1864 BLAKE2B 5ba599090cb8e63a3831f9529ebf556504413b3b9c7a095667c03cdc3d1e105cc87fa42d0a1a4ad69da58c7f315de18d20577c709b65ab633e6dce94fa874130 SHA512 518bb34a1707faf57f5919d05e738e26eecec1f8e74a633c2f966f2320c250b158ad0bd7c270677cd59abe3b5c43fd60e60eea6b9811cb66d3c12fff28b01306
 AUX katomic-19.08.3-qt-5.14-2.patch 983 BLAKE2B ee718aa69afab72ce2f70aa9155edbce5f77224f8d995daa5ea47ac26d24c7ac81fc68ee6e921998a7fb3a1fce793b79247fb5512d4d0e8abb7a285c1eba3a0a SHA512 288ef44bb2d8da8f412239f9ef996de2b00e35e12afa93830be7796249d2e8efe85802c25eed610f044ff8f409734bcc5b4c9d40b1b35429c03a5645ee5975bb
 DIST katomic-19.08.3.tar.xz 1423744 BLAKE2B 89c4a6c7a53a086d9da899d65ee552a12c86c663261f27239fe8efe64117342bc5667db6564a573954d86c26b7c6106c6a8b426083d6fcc74250d9fa63eda6dc SHA512 cbf777134dd7e6a8fe1684643943ac665c5a87e2e57d6633e61e6fee0528da2eb9b874506e6b4d8f4d83024f0d62c187296bae9a496f4f9bc3b1ad293baf8671
-DIST katomic-19.12.1.tar.xz 1423324 BLAKE2B c36ac9335b24d724bd43665b1ddf5f952f0be938833929b9fd0ff0ddc9e4cae0d0e5aefd9f27ea044c9100954e2b00fb39aa6a0ed7b5c971d8d4701ab1831931 SHA512 a57f056dbee50363b4f33861ca5221cb1413fbeb1a97994c4da8c2e0a9484f58e99b0e7a813bac1008131ea14b5c2e39722018a5baa53b479ab4af07858f785a
+DIST katomic-19.12.2.tar.xz 1423212 BLAKE2B 6b9ceaca417334624cc9eb0237ee1de7c2211bbfc301434dbcf02f81faa3290248b1af30bbf943aa4b533fc8d380126e72e4e0e15dee87315e33ff6252550ed2 SHA512 6ade67b594ef3444c4a936e51dae93c4d0d2828f52b8704eb51c0af4dab784b9820a575bc30c99caff94c8e55e8de2326dbb8d1ff62d4ee88da48b11e3ef78fc
 EBUILD katomic-19.08.3.ebuild 945 BLAKE2B 5372dec4f1c5a114db20af2c57199b5df0a0b2bd146138cd368afa7bb98c758c02bb72acff2df441894c26c2d9aec00e938e49caca130e3f6cea29f870d396c8 SHA512 cac8c1197629fbe115232efdbaea696eca3344cc2fe0b18a06e6ab87e63a284104fc03f0da5097122115d6ef3cab2b7944d8e16d7270af61cf78cf20d87c168b
-EBUILD katomic-19.12.1.ebuild 900 BLAKE2B 2ec716f9cbad892030ac30c5e1c565414fe0425c41c6e144417d6b18eb1b1424c7f656e2f641e571481f6d8c0d301474ea83738cd9cdfc161ff7ed57c85f3c4a SHA512 3562d3281d941dfbafb789d2543a3780c401b634d9b2205b0906a706d2ae2d4498f0f1228bd0bba9e762a092dace1f670199a3d81e5c35c466fcd6f28014cb1e
+EBUILD katomic-19.12.2.ebuild 900 BLAKE2B 2ec716f9cbad892030ac30c5e1c565414fe0425c41c6e144417d6b18eb1b1424c7f656e2f641e571481f6d8c0d301474ea83738cd9cdfc161ff7ed57c85f3c4a SHA512 3562d3281d941dfbafb789d2543a3780c401b634d9b2205b0906a706d2ae2d4498f0f1228bd0bba9e762a092dace1f670199a3d81e5c35c466fcd6f28014cb1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-19.12.1.ebuild b/kde-apps/katomic/katomic-19.12.2.ebuild
index 685d1b98ba15..685d1b98ba15 100644
--- a/kde-apps/katomic/katomic-19.12.1.ebuild
+++ b/kde-apps/katomic/katomic-19.12.2.ebuild
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 5fb15de30d93..f3dfb03cebd3 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
 DIST kbackup-19.08.3.tar.xz 358156 BLAKE2B eb3a50f201c4b2e92e33b395af80d1368444761a725352fe6535416de53b254532519b97287ebed76fc4ee6075100a1a17df593714d94a56e5fee222099f3230 SHA512 5bef8202d9f0205c39b14f5ffaf99b7e6694afe0188dec3716ac4eb8c50c7f1acad2912b29d113603915ea6e74695c4fffa20ce7b05e81ff8ec5757c6d0435bd
-DIST kbackup-19.12.1.tar.xz 358832 BLAKE2B 33046dd401297e9a1ebc07b98969349ec0cf4042705f5a89141a8dbf8106a7db220ab9e48e2553ced6d04f083694c9cef807e87d9c91ec6d23572c4ba61c31c8 SHA512 7c5fda936e0ba50eed65fa2f2abbff5ad54e94ee71d9be4d50a1f6e9f3d67365098abe4c90244f21d68c177966b8be72d007a108c6cd5ea2eb9b0e5755f72767
+DIST kbackup-19.12.2.tar.xz 358748 BLAKE2B 7329429cbd009528e8aed61df040b4a326e7d032149974c3f5a62712126328e55d76a778118b11534d40a9864962d93bbaa2fd0de78d234011f5e83a60d33307 SHA512 a783307a70c2ac74d944d334db6597561dff9aa29dbdee7e7820d783b896523a3018a826001b311eaa007f6a5f7648ce97754df3b4dea3dc2a91330d1fad9669
 EBUILD kbackup-19.08.3.ebuild 881 BLAKE2B d6e6dfa293ab90fa9b2c7337624a203b306448a5193d65558b5ce48919d95d6e6d42a9612bacca46cdb9a2f0b636832289478037aecefcae279d359a07cbdfba SHA512 a7a300c2cc7502c2eef4f64fa295f457495e9ceb6d0cc4a65d61fb5511c13a4477d3492b44e0901e0ab7fdbc8ec900000c97a259ef2e280269bda1d4943831ff
-EBUILD kbackup-19.12.1.ebuild 958 BLAKE2B c1e17f0ca0de37166370850f2ccd3739e66145ec69a5936784d2f8f1cdf91c183c8edd77348823f536b0ece64b7bcef5c4311cd205842b61442c03ccf2982415 SHA512 0e68797a99b19050ed6c7aade12013036ddb96bc5d24165de402f92832848d85a60f021a47733c678c55f00eb81ef222779a74940a6d04024c13e674ba347d93
+EBUILD kbackup-19.12.2.ebuild 958 BLAKE2B c1e17f0ca0de37166370850f2ccd3739e66145ec69a5936784d2f8f1cdf91c183c8edd77348823f536b0ece64b7bcef5c4311cd205842b61442c03ccf2982415 SHA512 0e68797a99b19050ed6c7aade12013036ddb96bc5d24165de402f92832848d85a60f021a47733c678c55f00eb81ef222779a74940a6d04024c13e674ba347d93
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-19.12.1.ebuild b/kde-apps/kbackup/kbackup-19.12.2.ebuild
index 41c88808d0b8..41c88808d0b8 100644
--- a/kde-apps/kbackup/kbackup-19.12.1.ebuild
+++ b/kde-apps/kbackup/kbackup-19.12.2.ebuild
diff --git a/kde-apps/kblackbox/Manifest b/kde-apps/kblackbox/Manifest
index 9e46461274bd..a20095a427a1 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
 DIST kblackbox-19.08.3.tar.xz 446396 BLAKE2B 3715f7d5eb98058f2aa220637d0ebde9ef8a493133f689de76a88bb3acbe0905c0d86fbcde2239681096816c5c9ed24825eb8e7d8ccea5131213c3c3f854b757 SHA512 c584fb8a51bf63d6611616f7a3e9b839859a6bb825af77fe5243baa335d78d544581404a03802cb894c6eaa297fcf4492f5c49a7accf971aff63af55aa206851
-DIST kblackbox-19.12.1.tar.xz 447776 BLAKE2B 3aee278c00a1b36cc4d42d7700728f05124a2759e6e45d365b2517e24eef8a9a91da7eb0ea55292dc4f66ef1096dd1928ea9a53a49a87ad5ba6ceb75499db252 SHA512 1bfd0349d4df0b4e85ff6bd4689f85ff02f15a3e9cf0082610f455f42bfc0fb6f698ee4e371d20b6c7dbedc0f3dc1ba1d1f881450c3fca964d87a7b53edb49e7
+DIST kblackbox-19.12.2.tar.xz 447116 BLAKE2B fd78b6079acee5d62377056c09193d11d4777cfd61b7c32f9ee226b0f23899b5f9c49c25d9b41a95c0da51e4cbbfab40bb1696965fda0caf2889f601a874f52b SHA512 a0ccbabfc52bac6d503b37af95f9f2b26a092ed1f385deaf212731030da1a0ae06ce6ebcf0ee068094aa8e48dfffdaf4d6fae44e21bdfea388076621647a347c
 EBUILD kblackbox-19.08.3.ebuild 947 BLAKE2B 6d7e340bb119d444ffc019dbaebe0c0f80373d4be0df5341ab642b86b167127ea4ca04b7581eb2b7bf70011c5663a272632ad43a86d888607c67c4c68dce507d SHA512 7f1ce2eafaac197dbca7f632b31eb05a3ba35bb7d0e858d4801b829b0b33cbb14a7690dcfa37d999e1b052db1f52b1425b2e319b13bbed7a0f862741b237171b
-EBUILD kblackbox-19.12.1.ebuild 1015 BLAKE2B 5750edfd71496a11dad4e78b90f4ef424f2b67b822c3341251dc0dd10305c81c035cd3a3f6540240efddebbbea6805e0b2b6e73b46378dbfc4895d5f694706e7 SHA512 5ded3aae124f3eb77b0d35da5c36569db42ab6469462fc2338f22aa175bb242d8c0b3049ab2e8a9ede4d8fb25cc72fc9c2e50da2175b1f3fd251da91d19e5ece
+EBUILD kblackbox-19.12.2.ebuild 1015 BLAKE2B 5750edfd71496a11dad4e78b90f4ef424f2b67b822c3341251dc0dd10305c81c035cd3a3f6540240efddebbbea6805e0b2b6e73b46378dbfc4895d5f694706e7 SHA512 5ded3aae124f3eb77b0d35da5c36569db42ab6469462fc2338f22aa175bb242d8c0b3049ab2e8a9ede4d8fb25cc72fc9c2e50da2175b1f3fd251da91d19e5ece
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-19.12.1.ebuild b/kde-apps/kblackbox/kblackbox-19.12.2.ebuild
index 7b8d2ab51a66..7b8d2ab51a66 100644
--- a/kde-apps/kblackbox/kblackbox-19.12.1.ebuild
+++ b/kde-apps/kblackbox/kblackbox-19.12.2.ebuild
diff --git a/kde-apps/kblocks/Manifest b/kde-apps/kblocks/Manifest
index eebc5571f210..af1b64f6e611 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,6 +1,6 @@
 AUX kblocks-19.08.3-qt-5.14.patch 843 BLAKE2B 896d0f7007d2bcfa8879ab7cabe359ad84c19a9b4f8d7e2e8409d7f4b21f8dffbdaa88585e88278d54ba3922d6dfc291686f81e350468bed5301c08b11316c25 SHA512 16486f935b3a9118194885c3ad8e78582078c8f19adedb1838625b8cfc20d21fbaa86a64b4ed94c873a8f56b8ffafd7588cd5cda470b58016943561f87c13015
 DIST kblocks-19.08.3.tar.xz 1906952 BLAKE2B 2a6a5c2e774aa371a8c69202fc14bec96da8cf1fb4fd03cf2d295656eb0f05c9d8958e467b1063a91714d6c60a3e9133b94286171c5b177ed09a1c2116c41997 SHA512 e7ea3a5bf2f9b2220db2c6df0df7bf9736cd7a3be10dfbe6cb8189f14f3c21ebe8652568d342611e1d6f2754acc1e6ef3593a33acb7655d9836bfc7240a63a53
-DIST kblocks-19.12.1.tar.xz 1908028 BLAKE2B b8af5875a12584ebe40cf31ee24f6c6ca3f29006c846e61f4cdb9ca9c9c7c355d996c626a8b53a5e146c1075f538660ddf18fa9cce6b4e311e3c5205ae645476 SHA512 cab155ee1268e2103dac1c9c8cdd51183ffa32fb70781ed157a0a09720aeeaf136cdaea856e7f89a34261d2925bd4d804d00e53227a482817f4f00ccd73e4e77
+DIST kblocks-19.12.2.tar.xz 1906060 BLAKE2B 0f7aa0519bd6fd4db5b8e6ad246e0031bbff0f96cd91e797da98a01d4f5656f5e0479fb9c452405c630ed3a2d80da594097e31954c238ea6c2bd1e09d82395dd SHA512 15507cee5781c9fdb64ad822e6c2c231fd06842215f2550651ed0243f9d2f049f45ad8c3b0caf78cedf42cce56ae1b9c85bcef7871439d79ae6192b36fd2215d
 EBUILD kblocks-19.08.3.ebuild 891 BLAKE2B 9ffa895d8a1c0390ec25153dc28e8f39dc38b64afc771146dfb729c219f05597aa3fe741fcf7dd9769e5dbb0bc25cd0e5fd36e443ba6178df460d4b4b9009369 SHA512 2e52cc568c8f71c1f7399eb1fa20960cb4a1346c8e7ed4ba861bdfa6ce2f58f02d61cadf0f980786ff66468775485169581cdcc7688a6d4382ab965c41599a1c
-EBUILD kblocks-19.12.1.ebuild 856 BLAKE2B e74b30008902f680ade2331a4a95af86245bedd4a8dceb3e4a596521efe1dc56682a0eaaf0073adc2b4d5250ec2d331d790769df2202ef5b0a7dba5c937f867a SHA512 92e42e43146c74e6e433e91b65875bfba948114e5e9627eb10d154b1b6c45b432a553c91f96dbe7d5dffa6e0bc573b7e505f89ed468fc5903e5b04e6834e5e5f
+EBUILD kblocks-19.12.2.ebuild 856 BLAKE2B e74b30008902f680ade2331a4a95af86245bedd4a8dceb3e4a596521efe1dc56682a0eaaf0073adc2b4d5250ec2d331d790769df2202ef5b0a7dba5c937f867a SHA512 92e42e43146c74e6e433e91b65875bfba948114e5e9627eb10d154b1b6c45b432a553c91f96dbe7d5dffa6e0bc573b7e505f89ed468fc5903e5b04e6834e5e5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-19.12.1.ebuild b/kde-apps/kblocks/kblocks-19.12.2.ebuild
index a8fd6c80411d..a8fd6c80411d 100644
--- a/kde-apps/kblocks/kblocks-19.12.1.ebuild
+++ b/kde-apps/kblocks/kblocks-19.12.2.ebuild
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 79c1c229c5d9..ca911655bc8e 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +1,5 @@
 DIST kblog-19.08.3.tar.xz 72776 BLAKE2B 36231e32c23633d934159dd27e37dc3b9a58da57acdda0fed1f37a63926d91bdf6241a9f52770bbc9fccb4c628d98129e8dc428bab1cacfcb559ab6f4eb3e8a3 SHA512 48d9ae8d891ee7fd0a9ea225e403bd791fb30d483937d72e219a1fb390350266a3b11704dd13f0e8e23ba7c6d808ae8eef9efe831bca55cd3f75223884e01782
-DIST kblog-19.12.1.tar.xz 73080 BLAKE2B 095e1cb0ed2b0971439619eec4bedc483051797aca425338c7dd9e49a0c810a3c0d7adfbc6087c7cdaa7d650f7f4e7a90dfe9051693921d2403453721f58266e SHA512 2ef5f46b150aad896503a485527ac99bbf6f1a4615cc856a72bc987b6c44c8955157a887c67a7a05b1293faf9ea1a5a39722a95d6cf5c09e001289c3016fd5e0
+DIST kblog-19.12.2.tar.xz 72696 BLAKE2B b4de4796a4f405bfe5f8f3cdc4f7a8f077b53a16895d4d49a79c86fbc4041ce9662c002fe6d020d85775c2c4ebb6bd97d069a11ec75878b8e9473b29f3d449da SHA512 2623e0886896fc8b4f9ecb0c68202d163065232f6cab41557c7215d5112defb142efa4f369c65d2b6c4faa0e20d0a5771c0c119afc4d2ba8312aea25ec9e3651
 EBUILD kblog-19.08.3.ebuild 609 BLAKE2B c9f1dc6ed726f22a9896cef77a87e16796080609b6b181eb5e7f2d274a756ba44f7e04acd73156a884f99863e3f9aaa53a436f778323f8adf9a0bdf229efc226 SHA512 2d118e38142124f60330c490ce0257674b788df1d8ff99dce509eb322c62df7e3b6fd88d11f8c4a760dabbe92b2150768238ce82edd7cec8e576692061daa6b7
-EBUILD kblog-19.12.1.ebuild 673 BLAKE2B f44b78f52af51ba931bf08137a7fb1f8af2e3ab66ff1bad1b284717bc42a18d596dee22012347e9b0be27aa6916fe86110dd61f67a172f7c58598687a77d2089 SHA512 356ea4ca7bc586e1e48e8a7771235e5331e4ab544e14a77f3ff8b9309a8f546cbcf0de4be2c803c5cd12fdabb8a317405d722e848f1f07ce2f1fa27f85f4ccbc
+EBUILD kblog-19.12.2.ebuild 649 BLAKE2B 20957650d89a5bd1dc731d711fd6bb4f18886aa2cb6015861dc8e0ec4054628f10dbfa9b6b565c27f1c0bff7f904cc143a49c0aa8c2a9485e865067c61fbf0c6 SHA512 6dacdf4612587eb5c2b688bf635473ff047fdcbd6a3012fa45c6b0bb46efac72657fba084ddaca2ba1154228f6f3aa3dc99b7304df4dfc7c3c6f8d4e9bc4c58e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-19.12.1.ebuild b/kde-apps/kblog/kblog-19.12.1.ebuild
deleted file mode 100644
index 9b197e9fb630..000000000000
--- a/kde-apps/kblog/kblog-19.12.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.63.0
-inherit ecm kde.org
-
-DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
-HOMEPAGE="https://api.kde.org/kdepim/kblog/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
-	>=kde-frameworks/syndication-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kblog/kblog-19.12.2.ebuild b/kde-apps/kblog/kblog-19.12.2.ebuild
new file mode 100644
index 000000000000..abd52556c5a7
--- /dev/null
+++ b/kde-apps/kblog/kblog-19.12.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.63.0
+inherit ecm kde.org
+
+DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
+HOMEPAGE="https://api.kde.org/kdepim/kblog/html/index.html"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
+	>=kde-frameworks/syndication-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index 737aa5c8ae60..9004d4c4b9c5 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
 DIST kbounce-19.08.3.tar.xz 3470400 BLAKE2B aaf42d01e6c5b875c05870a963f0f101729bfd371c55a11b97a255b8a9c210be61eef72cfcbf8c4074a3fb790a938f048eaf94f74114eb0e5e66e95b1a1a404d SHA512 ebd077815b35dcdab594acb23190bd4e913c79a9fa1a206008cf4c329f10b347b689fd6250779329e0c17dacfd8d30c81538b0b98515c688733bf2813fbead9f
-DIST kbounce-19.12.1.tar.xz 3467728 BLAKE2B 29c811d084fc81855fd65a040152ea60671a3ed7280696f9ef5b6ce9927dcb6e69046e4c2b7a7861d193e89ca7ccf5b19bd694ea51d97fadcd23c0753739e4e9 SHA512 5bb871b07de60b0e2f8dd4c429ea8ac1e1cf9c71def3607c012a9f286cb29865a3eb1b15a94eb936d448158d7565c608db858f8af755168687733edf8c1633cf
+DIST kbounce-19.12.2.tar.xz 3467840 BLAKE2B 7e2f4fdc5494117fa3620afd4e693439311b67e876a94c44ac1a178774fcde6494a9ae21b0ca071fe4d1caad3ac4d477cfd4ca966d73c83bf0d1be826b3253d2 SHA512 ed9c53bd4a8cd1d4201bdb4442f36a6e3629e55d818c99f89e8d45d2f1e5b6ee52f2b970dda0a16dcd1ee16eab4c22174481d4eae1d13d2ec2d1e9b954528ae7
 EBUILD kbounce-19.08.3.ebuild 990 BLAKE2B 9e2485d2bec682282aaa532db8debcae8428959ebfbcc5ce6cb2964eb574fe436ad9fca6f7ab89ce43731a049803c1cb04e5c9983cacb2698ae55336b1bcec4f SHA512 32c928ed6f874247717dfa1b9d037bdfb5266382cf52963d1db2e54d62e990377b9a77a223faf261de3ca10f6de7d3ea30580842e64ccea4feb4bf92beb90f12
-EBUILD kbounce-19.12.1.ebuild 997 BLAKE2B d6e38a26be3dc7d5b164b90e2c0bec3534b0bd1f9b0fe7656b86138f44c35034dc64c7cb82b537f60b9a7e47f3417ac8a91e6c25cda73146ec2135bfb928ed94 SHA512 0ec4aa4ef3ae3809a81857ecaf320aad12f3400edc765b8a0153ba8cc6f135e82204f02126b7ed886611465193e0826e367e9f217954b9418e75043ed4f32b50
+EBUILD kbounce-19.12.2.ebuild 997 BLAKE2B d6e38a26be3dc7d5b164b90e2c0bec3534b0bd1f9b0fe7656b86138f44c35034dc64c7cb82b537f60b9a7e47f3417ac8a91e6c25cda73146ec2135bfb928ed94 SHA512 0ec4aa4ef3ae3809a81857ecaf320aad12f3400edc765b8a0153ba8cc6f135e82204f02126b7ed886611465193e0826e367e9f217954b9418e75043ed4f32b50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-19.12.1.ebuild b/kde-apps/kbounce/kbounce-19.12.2.ebuild
index b7aca7d6c61c..b7aca7d6c61c 100644
--- a/kde-apps/kbounce/kbounce-19.12.1.ebuild
+++ b/kde-apps/kbounce/kbounce-19.12.2.ebuild
diff --git a/kde-apps/kbreakout/Manifest b/kde-apps/kbreakout/Manifest
index 81fcc0f8dfcf..6f3eb3f124cb 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
 DIST kbreakout-19.08.3.tar.xz 2276292 BLAKE2B 53a0b4545e88dc4e0c0dde7ea2d6b01d3c2979478df84e39f452129325281cc8245d6656de258dde4aa6d4cb451ea7a30a994e318a10dced4867cba1b327271a SHA512 070f02b8d83304c36a22579e54c0f1b2b971e1123c45617312528f2d05a572ea69e2237b4de6b263922852c89bd71c44b5a0434c38585be46b542ae60a2a9cbe
-DIST kbreakout-19.12.1.tar.xz 2279624 BLAKE2B a2fba6170fd2c8043875b63738c3ea19a8bc80d84b0b214b23dc26e0eaa3194a74dc722930ba474bbd2de54f4a78b79b9efeabf631f95e12e819416b6a5ef700 SHA512 5ae019e6f31a1373ec4ab83a421d0d01cb8644124709c19081fa386d2f8155e7613d53450232e88ec2eaf25fdf0e55494ae84b3f3456d7502a9b52167a35e591
+DIST kbreakout-19.12.2.tar.xz 2276848 BLAKE2B 5d72001a57a67626e7a94e2c7d85840f1515770b4bd72ede52afdfc76dbed2a58c6a035b167c6156ec60249cb99d3c3d6633ea300f1602eba934bf29d0ce9298 SHA512 6d598cbd5e415c01a4e2012dd250f2af6af4aa628ceb57a334c9ce4c440aff8d737ccdeb595af8b70ffbbbb32690d47bff51f5854e1e2dc86e3d8b8745bc0480
 EBUILD kbreakout-19.08.3.ebuild 933 BLAKE2B 064d6401d58d4747944403c1feb936e9c0f326d414badecd7816259f111a824d84899921b2dcdc28a7d92ac550b794e692f6e6b55d5e05c27846612dbf6ec86e SHA512 70ee9a7f777a85adaada18209c1dbe1a839a91b4bea7e9d63a4a2e5fc626b890a56603e668c1783b586647dd1087c95f66921102ad407980526c6b1be6946538
-EBUILD kbreakout-19.12.1.ebuild 940 BLAKE2B f9221e77912cbffc22d9af184e946a1c6a7351267c8c382b8debb7f771283da2be4288bacb5fc798d46cd0a087b185a8989b2fed1910593af6587b1499f5a6c6 SHA512 6edaed261879465890925fdd85e022d84b44bee30c1b7eeb87b2fc78803a002fd48b8fccdf2db247b592f2573b728e1a5ca3fd3255a67027f1a082bb6aacff8d
+EBUILD kbreakout-19.12.2.ebuild 940 BLAKE2B f9221e77912cbffc22d9af184e946a1c6a7351267c8c382b8debb7f771283da2be4288bacb5fc798d46cd0a087b185a8989b2fed1910593af6587b1499f5a6c6 SHA512 6edaed261879465890925fdd85e022d84b44bee30c1b7eeb87b2fc78803a002fd48b8fccdf2db247b592f2573b728e1a5ca3fd3255a67027f1a082bb6aacff8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-19.12.1.ebuild b/kde-apps/kbreakout/kbreakout-19.12.2.ebuild
index 8e987f233b8c..8e987f233b8c 100644
--- a/kde-apps/kbreakout/kbreakout-19.12.1.ebuild
+++ b/kde-apps/kbreakout/kbreakout-19.12.2.ebuild
diff --git a/kde-apps/kbruch/Manifest b/kde-apps/kbruch/Manifest
index 3832e0aa0e1f..6a3ceb970033 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
 DIST kbruch-19.08.3.tar.xz 5602756 BLAKE2B 8026881012777b39dd2233b8deee0a5789f528213626fd941fd855bb2061c0d8dd1fb3c082ce6b737699f0391d2dad8416972eafadb4fcaa60ebdc34d2f43755 SHA512 21a290bc906bb1a9ad93dc6b21e9fe22433679bd74b0484b2060feac74bc37b3b0880032f9d61fc6555b32676707570af4590727299de4efc8b6fd88a0e8fd80
-DIST kbruch-19.12.1.tar.xz 5605632 BLAKE2B 98137aa97e1fa987a08a5ac767b64bf1e5d3d90a9c7029859dd575d084d72fc83af5be3031f9d96b639966dd740d1bb9dfadf25506bd7a1bc7a984bd16a092aa SHA512 ae595d3b9dbfa8d11af286c104e7558b05e80ba14808896a28de2e5bc03a9c9b22b9d3b7d2748546c92a9e6a47c4b5464c593b90c837df7fc381aaf2b832f836
+DIST kbruch-19.12.2.tar.xz 5604600 BLAKE2B 35987a83813e571a57a626a836917bd3391c8c36964c876da34c6c6612e2ce6eded38cf17804800a6d8e050f58fdd23f20f8685c5ef99e624d2d487ab5e89cae SHA512 dee13ebfc48694bdd6ce6aa1b53c1811d61be4605ea4ed388d52f57375a6617b139ca96ac069b43be1cea7e11d96e44934f0ed5047b98adc546ae89e74a4116c
 EBUILD kbruch-19.08.3.ebuild 750 BLAKE2B e43b02eb8b0301cd5f6963143d9c6de88a6f1bc2dfefb68e20db78002b5b49056be3890ca475404c85ac818fbc9d46fd650da803c09de3925850f3b7de6e5c92 SHA512 6a9b7319437fa951c14fa0c82eb99c9bc81333ef1f850cdca3cf8bde171f4374804a0a27caf3bd9fe2798b3f8793fe50d3c9070effbc5ab641de82f16599191c
-EBUILD kbruch-19.12.1.ebuild 762 BLAKE2B b8adca1dff3e69155f62a02d0e50f54c247d945aa5628e256fc584a0403f2f2b33fe1cd33e9156055bd4156130ba52208be590fea049fd2f473140f053045beb SHA512 baa564a5b4d9af3d031509a8d568adc0bb86fb54d94718b89e0defb856a53c992d910ead6b612091b9bfa121e4e5419cc284aa4b505d78f25ec91997566add5e
+EBUILD kbruch-19.12.2.ebuild 762 BLAKE2B b8adca1dff3e69155f62a02d0e50f54c247d945aa5628e256fc584a0403f2f2b33fe1cd33e9156055bd4156130ba52208be590fea049fd2f473140f053045beb SHA512 baa564a5b4d9af3d031509a8d568adc0bb86fb54d94718b89e0defb856a53c992d910ead6b612091b9bfa121e4e5419cc284aa4b505d78f25ec91997566add5e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-19.12.1.ebuild b/kde-apps/kbruch/kbruch-19.12.2.ebuild
index c533e72373ff..c533e72373ff 100644
--- a/kde-apps/kbruch/kbruch-19.12.1.ebuild
+++ b/kde-apps/kbruch/kbruch-19.12.2.ebuild
diff --git a/kde-apps/kcachegrind/Manifest b/kde-apps/kcachegrind/Manifest
index f57d072ebd36..0f8b59907265 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
 DIST kcachegrind-19.08.3.tar.xz 808788 BLAKE2B a53470383c4d9476aae1910775e8add4c8fddfe4e40068747278a43591219a58326f9e9e061eef75f63c886e6b5fd7f6729c4ad6e08de58a8789501aded055eb SHA512 9275e43dd156c661d4aca8d004d75f6822e66c5ed1fe46fb3bc6c30630334ed1ae069c01128d4097fad13e5126f63c0aa56e9bfb5a6f22ac54200f74dfd00f43
-DIST kcachegrind-19.12.1.tar.xz 810148 BLAKE2B b5d1fbbb850f5cab9c4f82c1bed7efe10492d0401147ed1858d11c03e6a067e4e8afa9a34adf4986d61d6c5f32e43da650b6aacd15d2da685aa6caa8c91dd3f8 SHA512 4fd5e195c8269fd59ed3f565590c45ed4705f96bcb390551cd6561e6ef7d0cbf7708679f7c44905858564724a4d0a3866a411c4f9a4763b9a9e57ba8eeb7bdef
+DIST kcachegrind-19.12.2.tar.xz 811360 BLAKE2B bc6357a54342aa847e75655884480a40b6bacb9679e507dc56bbe015f1215d472c02e933c2b2f32eb6b23361b0acea8998d9d7374a677e998768327f65b8e812 SHA512 eb18804b90fda9b35b770253c9927c0fade71cdb1379afaec40db14f82fb4a905a187406e2f07413fd5a2c31811384f030259dcd6bdef777200216f8e7537d4e
 EBUILD kcachegrind-19.08.3.ebuild 1007 BLAKE2B b6d1c48d4ef983cbe8034f2da71c06ecf5214b811f68d096119b76e2e1b5a35a66d5e7aaeae12f6002059595723fba599d955710f408053f5f4f9baebad2a7c4 SHA512 881bde02924c6659aa0d62d762595827afa3d9e2da8e4a4b8849203651435ef23b7189e7e7171c14077b3e2053a2d993c67cb905117479357cae247e24c20991
-EBUILD kcachegrind-19.12.1.ebuild 1005 BLAKE2B b1079f4e0432daca27d7c803f11066ce94af7b45ceadb542ccbc34a583a9e42d5590888cb012d6a7ef6608f0ec4ca70b02c7a46213a83a11df6c2972e458b71d SHA512 e5441ce3b86180105bc1d8da00b4b0b83bec705c8f4b536f4600e35c49b8511ddec7ed4269a1fa68761fa514d16f46144d7babaffaf3c8ed4e93780311abd639
+EBUILD kcachegrind-19.12.2.ebuild 1005 BLAKE2B b1079f4e0432daca27d7c803f11066ce94af7b45ceadb542ccbc34a583a9e42d5590888cb012d6a7ef6608f0ec4ca70b02c7a46213a83a11df6c2972e458b71d SHA512 e5441ce3b86180105bc1d8da00b4b0b83bec705c8f4b536f4600e35c49b8511ddec7ed4269a1fa68761fa514d16f46144d7babaffaf3c8ed4e93780311abd639
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-19.12.1.ebuild b/kde-apps/kcachegrind/kcachegrind-19.12.2.ebuild
index 6fa87eb4554c..6fa87eb4554c 100644
--- a/kde-apps/kcachegrind/kcachegrind-19.12.1.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-19.12.2.ebuild
diff --git a/kde-apps/kcalc/Manifest b/kde-apps/kcalc/Manifest
index 0f0d6edb6cb3..91a16f4993c9 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
 DIST kcalc-19.08.3.tar.xz 372080 BLAKE2B b0215734c8952dd6c787bce46fda5033758b8264b1b6f5bef78e71bfd7e6511b489f53b315c661c8dabd9da82389ea70982fe85a52e85cdf0175bacaff891b48 SHA512 e27eefd90f3b32db383305e1eecade41545dfe8f9dd9a6c5b4f48b2082a7323e5a7d812ee54b45cea28c76ba6e82104e1fd2d001060f1588b4b1d62241421e7f
-DIST kcalc-19.12.1.tar.xz 374860 BLAKE2B a4de7c0978ddcf145409b5099647c9b10957e75697c60f5a864bca777b1a3bf362620421558354eef8a67ba0dc89ddfc92897acb33eb3e3dc20dbb853eca7265 SHA512 8aa7fdb4bd1d9842f2e2036e3f94649328f9b5bc47b4c031aeb787cec0fdf28697ebf9f41cb60e120e59c38b44a2e6d366542ac9228abb859db6ec5eb28b4cf6
+DIST kcalc-19.12.2.tar.xz 374060 BLAKE2B 79ef34d735dcd24d7822109814b795091d79957008f6d70062ea44eeb0c6f8771695eaeec76d5c48586bdce03bd79fcfe519be73350f496add501f52da4b2cf8 SHA512 e67c1202bda13ca5682fb95412ae79159547d59c94c8f7c3894ae5182932d4e29fff4c7cc515a89c873c3e307021152b99e123d6fb4ba9b656a9bd902fa9a1a1
 EBUILD kcalc-19.08.3.ebuild 978 BLAKE2B 3b8dceae5342111276037771246df4f6f5d9958a8eabd924b2e27f673b35f671e27de0dd4a4632da57746a45be0e2bd6f5f6e25a64ef78cd42e1bcc75a77568a SHA512 5b17fa27d2267876b2b7e3763db885ac39713194cca9c42f75fee08c4108d5bbba5575dd3770632599f27fb82a15c96e650b6735fd395faece4e8846ff38aa42
-EBUILD kcalc-19.12.1.ebuild 997 BLAKE2B a312078ad494a1bd3f0a0ecd5ccc4338b42edad7979d528f6a76bf34983bb1c283987138e4ca00da37685141129217b276575828f2bf7a75b7abab35d4e88886 SHA512 06a51b29a6de6ceb3eeeaead824a2d8e1e821ed0acc6e7d02101cb9d2ca00c523e96782f2c8c28853f3460995c233009e8a017b1bb987d61cca2c8f4e1957b95
+EBUILD kcalc-19.12.2.ebuild 997 BLAKE2B a312078ad494a1bd3f0a0ecd5ccc4338b42edad7979d528f6a76bf34983bb1c283987138e4ca00da37685141129217b276575828f2bf7a75b7abab35d4e88886 SHA512 06a51b29a6de6ceb3eeeaead824a2d8e1e821ed0acc6e7d02101cb9d2ca00c523e96782f2c8c28853f3460995c233009e8a017b1bb987d61cca2c8f4e1957b95
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-19.12.1.ebuild b/kde-apps/kcalc/kcalc-19.12.2.ebuild
index 033aa9cd559d..033aa9cd559d 100644
--- a/kde-apps/kcalc/kcalc-19.12.1.ebuild
+++ b/kde-apps/kcalc/kcalc-19.12.2.ebuild
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 70dbeded7b87..b04dbc530835 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcalutils-19.08.3.tar.xz 323380 BLAKE2B 15781ced84c9eeb2ea043a7c39346b5c05248145c63ac2df1c7f94c913e243c027b70ecee104536164e3ceb256c6fb1f0e0b332e743457effb43147b191f48af SHA512 0ff96dfb9cb4a08d982d6c27a2351c703e30f040055ee4c662df7465c4a1656eff369db0bba39e4fec55777a1671c997e6095d7159b36ffa597564c2024d7d84
-DIST kcalutils-19.12.1.tar.xz 322252 BLAKE2B 23d7fd920a735f392b78e2307d13b687cc68acefaf0733d59a6d64abe60e464f8f5d1b03b1bf4752bc33e3a3b3a554820d0a0d5ebdafa0a29b9fa973d8750d5e SHA512 85b1f68623238368c24c47e8dd2402215ef12459e58c2a929035d732814043e84f79b20343fb8414a181f666666dbb84fca97a30d5a3bc76f29ed0efa401f9ff
+DIST kcalutils-19.12.2.tar.xz 321072 BLAKE2B 5d02946689a0253cd268b4fa5035c59020fc5e7def3fb972a7b35e621805c457a5f1f66ac341426117601aab76c0bd200a2948bc766750e61d62d8cf06c364ce SHA512 802cc042d3b1c7c27cc0485e05cbf6573a2ba7f34469605ad99e32be20485b4cd971eef8b4aad2de7e132cfbf75161a8460de973772e5bb7e2c41a4ae6fbeacc
 EBUILD kcalutils-19.08.3.ebuild 987 BLAKE2B 5edf94058f96318187f5d4fdae97a810cb517f1a6f5364239f519432e39bc48bd22aceb2d364b7ddd701ffba949512c1c90f8140b52c8fae0da8a1822cbcde18 SHA512 31e2dd634ae2d2431e55f0d74b9b594f2e434beb3c9f8be62ff1d555ad91a7fbea2ba0a5cce19ba16b3c037f95ac163288405a3bd9854fa1e9d77adb0f243cd1
-EBUILD kcalutils-19.12.1.ebuild 1055 BLAKE2B 4813711c7eb7a4edbb7894c39a4d4485dd5fe527fabae4aab43814be11b8d16655e82f49daaac8bf4ba3b02f5348bc324d79c5041b948e027600303b6287f862 SHA512 d8025dd782755049272fa605ffb630fc43f88bee6cb8c61a9ef560a518965e2da1e32043c54e0265f0e246e4e906c3243dd0434f7101c48a483f7ae723b13062
+EBUILD kcalutils-19.12.2.ebuild 1031 BLAKE2B f6d1b205b3055a5e40add68894e1750953a1f55b45c88755c04530f707d11df812a1374b1bbb81aee0f76632ae3895de2eef3e0c9413b6e94fd9f1f64737f3d9 SHA512 b2ee9372cfb87b1832e52fa99b10d32b725b5860022af1f7c5affbba1b8478cbe10044db4757217bac29dad5c4f1126e7894ea12e7d068b6b19bac329d2b8166
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-19.12.1.ebuild b/kde-apps/kcalutils/kcalutils-19.12.1.ebuild
deleted file mode 100644
index 162ed2732593..000000000000
--- a/kde-apps/kcalutils/kcalutils-19.12.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 653616
-	local myctestargs=(
-		-E "(kcalutils-testincidenceformatter)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kcalutils/kcalutils-19.12.2.ebuild b/kde-apps/kcalutils/kcalutils-19.12.2.ebuild
new file mode 100644
index 000000000000..8fdb0d5215aa
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-19.12.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library providing utility functions for the handling of calendar data"
+HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/grantlee:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 653616
+	local myctestargs=(
+		-E "(kcalutils-testincidenceformatter)"
+	)
+	ecm_src_test
+}
diff --git a/kde-apps/kcharselect/Manifest b/kde-apps/kcharselect/Manifest
index b9366bdc2555..353fac2314a6 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,6 +1,6 @@
 AUX kcharselect-19.08.3-qt-5.14.patch 883 BLAKE2B e36b8ed12dc80512080e3025376b2421fc016381a736271ada23a4b3f27aef19720045fc8eec306e3b73a73133690389b285ec410707ab20f9ed28a7137e7de6 SHA512 e5116469f91135842c4cbe18a20a63c58fe83faf1d0972f54761ea1de6fcdccae3a96cefeca40cc00d3782691ecca04eca731a60610d58261d2340262efcf3b8
 DIST kcharselect-19.08.3.tar.xz 334588 BLAKE2B a402cb308f97aa80f1eee4c82ae07b45241cc446c4c49fdd45b895fbd15696a2b8606a10ee7cdf6ad037c2e7faa58ad862475a114269b388d2d0e6d9c09acb64 SHA512 55c20dc0cacd01f27ea047cf8845c47c93d973b954f3a7481f7949417066b56b031c5bacbf39356f92b785f6ad7113aacec391ec81fafafba6a49dd44366855c
-DIST kcharselect-19.12.1.tar.xz 335132 BLAKE2B 4f4231292050c5c7f09888adbfc3676a26d7e9391bd91ae66b6a32dde36f36bc349a3a564fb480695b63989bc67275f82c2bac96727a9de1300672fab17eb8e1 SHA512 e2bb6bff6876ebc4bdcc4c77c860f01a2c33933840372bb0d2645cdb4b3a61a83110dc398e4417bc7048d5aed23cf91e7a94c381f4972c86bb2083181df9f4f2
+DIST kcharselect-19.12.2.tar.xz 335312 BLAKE2B 489854b093b1c34b7abb1b704bbb1c3c751bf4eb2495fa7c8cae6a84cf066b46aed0970d0d8691ca9ed28b0996d8ceccd4ae9bf9c3dacccf7910a10afe372512 SHA512 474e1c488388ec993915c2b1e0afb5738608fcfbc322c9d6139c43e9e02bda5f659038bb133baea017bdc25365c7aaeae8dcb90bfc69352abda4551333669946
 EBUILD kcharselect-19.08.3.ebuild 829 BLAKE2B cd1555b8a83789a141702249772d5524b7b8a3a4fb9a5eb41a04f621ffc0d854ab88cf38446c91c3bedd118ee9f0eac82857f23b64a0393582458f6a6b34a24a SHA512 d489c2b878c1395f47b8f5a18de15429cd8dc02d066ae6ec8e606ddb3db5e7653a8ba363bb49ebfc5c553769d40b8866d7e4602d7147737444558289c9ee0bda
-EBUILD kcharselect-19.12.1.ebuild 802 BLAKE2B ef19a1dd341f0893e593ef75bbc097b343a5a1023147b8ec0a96c990fa6862772411d68161991771410d89310ea6a10ecc7f647b2145a730a53e603074b8cf27 SHA512 bb03d8f13f6e54e05f8dbb6798b73e3fe76cf8b456862da9bec7a5b8ef9df0ff309e9db622bc6ad1c8b9a5d231a0aac0eddd8ae537f520fc37df4c91122bfe8e
+EBUILD kcharselect-19.12.2.ebuild 802 BLAKE2B ef19a1dd341f0893e593ef75bbc097b343a5a1023147b8ec0a96c990fa6862772411d68161991771410d89310ea6a10ecc7f647b2145a730a53e603074b8cf27 SHA512 bb03d8f13f6e54e05f8dbb6798b73e3fe76cf8b456862da9bec7a5b8ef9df0ff309e9db622bc6ad1c8b9a5d231a0aac0eddd8ae537f520fc37df4c91122bfe8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-19.12.1.ebuild b/kde-apps/kcharselect/kcharselect-19.12.2.ebuild
index e5b076f801fe..e5b076f801fe 100644
--- a/kde-apps/kcharselect/kcharselect-19.12.1.ebuild
+++ b/kde-apps/kcharselect/kcharselect-19.12.2.ebuild
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index f123aa23b008..148530519ce8 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
 DIST kcolorchooser-19.08.3.tar.xz 20984 BLAKE2B 4d1d6581f55462645daed880cfddabcfea7bafb5c36f440bd39ab90ed2b09df8c9d6109ab5fb42d5cd6d13671cb2dba4ad3218fbc61ca11e816399d8de4bbf99 SHA512 5f76dafc07597a25126d8faafe8bb88ee16029cb775e47aeb47c440a74f6d7f1b585d6a72fdddb05136e164c6cd61a58b6a74538d7cdb46d388745b44bed81ba
-DIST kcolorchooser-19.12.1.tar.xz 21524 BLAKE2B 7907e15e1439d6b41658bcc6ff182e6dd0d13cfc27e0d2b7151a4cdce2ce047f5115ae67362614ff11cf159fa4654c15fff0b59864862cb1294bca02a3363ef0 SHA512 e5aef0345e28070c0b5fd01ed48fa144bd00c2050306a50e4bcd52efff8c3d7521a4d301ae1e2ef7b5bbed07a9f5a733060681305b9ffe6d1bf9ae1ce168da59
+DIST kcolorchooser-19.12.2.tar.xz 21444 BLAKE2B 347ca155505463a19c0c0f882916f3d3d0ce1ca536a4e7c58a6e4a33356cf9fe500b0b8e58dfec259b4442154e21843521c21146e012744b9e0f89115a866ccc SHA512 cd3c4860fc576e5eab48a1ace9f0fe95d02632f3ef215a4bd851b256764f0e3fe9b395257f438bbe52801065c39f7c4ca804ac4792a63ae43cc34c9e75502449
 EBUILD kcolorchooser-19.08.3.ebuild 526 BLAKE2B f3678cfd431f88be3cca9ce37ec945d54472e09e7d31df90943b93f378e3d4b5ca806e75f6271537d9ce82c77a89e13f54606887a7c9d8faa46edfd4708a8def SHA512 16a2cecde877bb32b1d094f0b171b7027f6e78b09782842247b6760abfb2e9f73840ed1bad2e0ed9b21590a753352f300c8e5e60d4fedd903220d83f117d0365
-EBUILD kcolorchooser-19.12.1.ebuild 543 BLAKE2B ec1475ddbcadaf0fb2df239264eea60948272517994d2419ef043e8af8bf1cb8bed9451ff995993f6baee003938dd0f094a7024b88ae0a5370d2c1c4c45c0ab3 SHA512 400c4d432657cce877a2115a150422056a72dd85af85794567fffcc36b0111e18eb326b8518cfb6439635ba8761db3d32c2625ab67f9c0be93cba3a9c17e5485
+EBUILD kcolorchooser-19.12.2.ebuild 543 BLAKE2B ec1475ddbcadaf0fb2df239264eea60948272517994d2419ef043e8af8bf1cb8bed9451ff995993f6baee003938dd0f094a7024b88ae0a5370d2c1c4c45c0ab3 SHA512 400c4d432657cce877a2115a150422056a72dd85af85794567fffcc36b0111e18eb326b8518cfb6439635ba8761db3d32c2625ab67f9c0be93cba3a9c17e5485
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-19.12.1.ebuild b/kde-apps/kcolorchooser/kcolorchooser-19.12.2.ebuild
index dd06242feed4..dd06242feed4 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-19.12.1.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-19.12.2.ebuild
diff --git a/kde-apps/kcron/Manifest b/kde-apps/kcron/Manifest
index cf1ad7658faa..564560dd965e 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
 DIST kcron-19.08.3.tar.xz 888268 BLAKE2B add2a4ca160863816825852806246aaaebfba44a0541e3d8f3562f939d377bd4607f100e0ce9fc77a441b10298fcac2b852657f035168a24ccb79aeaa56c628d SHA512 44a08ec81d0cf075f17a192ba88aeb6be71c356aac27e3cc8f69ff21295d14dd78fb3ebb19d78f7f669631805259f8eed24705714722a410b8a01fb20793b90a
-DIST kcron-19.12.1.tar.xz 890828 BLAKE2B 500c48521c5cb0fc64c23febc5ece65b7394ca009cae84ee5b30eb448de506805937baa9c7d1f46dc9ebba4009f1509293f1068d3803301847d7522eae5260d4 SHA512 2645148a2f44b8c54583c6ff6ae5564f7afd3b5cd191ba78ada16bcc93ebf86c8aae362afb1be018f805a79979909d7f83cfa1298ec17a8312ebb4293660b8f7
+DIST kcron-19.12.2.tar.xz 891300 BLAKE2B 7185c9e678220c3d8e4dabee168c9f4b5f959868c1e6d596741168e46cb051bd66ab48f530b41f535b81ed618357db188082c6868e464c3d317ea873ef4d436d SHA512 b0f19f3b135f08426e47d6a2bcaf7a5b5a8643b8a1d0ac8905843d4ce44356e6e634bb5705bf4a86e29f81a1e783106a4697db30233f1d58e78ee896cbca668f
 EBUILD kcron-19.08.3.ebuild 675 BLAKE2B 4acc1c59c6507bd03e16fe21d24d8504cb8a51b93be0de2dc070c3cf8325e4569bfa21ff71cdae91881da3b0afb0564cc4cecfac19cba273cb5507a42749a7f6 SHA512 0b52d361dabe0e474b810e3260b193abe37094271f5e5cf19bde355a50f760ffff05e61a4cec1486718f47684d90fa87a45ab9f154e31e55df798905391e7d84
-EBUILD kcron-19.12.1.ebuild 750 BLAKE2B 842d1460ebea975b3d3217a5caad5f53b5ef5bd69f7980d4966a16a90e0390d19bfadf684dfb14822db7764171f767a7f35848b3d30366e9feb98e0985db58f6 SHA512 51e45e220fa59ceb22d14860749ad9cec529574dd2cbdd4b9a448859104c9539bf6ac5823531aba26f468ca47b97de05a2db393e50f9fe6de0c4ec56ababe218
+EBUILD kcron-19.12.2.ebuild 750 BLAKE2B 842d1460ebea975b3d3217a5caad5f53b5ef5bd69f7980d4966a16a90e0390d19bfadf684dfb14822db7764171f767a7f35848b3d30366e9feb98e0985db58f6 SHA512 51e45e220fa59ceb22d14860749ad9cec529574dd2cbdd4b9a448859104c9539bf6ac5823531aba26f468ca47b97de05a2db393e50f9fe6de0c4ec56ababe218
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-19.12.1.ebuild b/kde-apps/kcron/kcron-19.12.2.ebuild
index 439aaa9b83fd..439aaa9b83fd 100644
--- a/kde-apps/kcron/kcron-19.12.1.ebuild
+++ b/kde-apps/kcron/kcron-19.12.2.ebuild
diff --git a/kde-apps/kdav/Manifest b/kde-apps/kdav/Manifest
index 6085d3f9b9a7..e11a0683dd06 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
 DIST kdav-19.08.3.tar.xz 49824 BLAKE2B bbc0c776c853daf826b2f9152ab5e62c1d031715899b89edd7de7bd0d1ff5bbcd76e3ac7f337e5371730ae99b8e00cbc5b270c21cedcce731d552d9327a3093f SHA512 26cc41326816236896cc5917aef432e6b378157f8b1cb32d6217cbac8166039743450d26228f13027022c1a8064edba8e861ccf7e5af4107c8e07af02d2e9b2b
-DIST kdav-19.12.1.tar.xz 54336 BLAKE2B a4018fb16a4b4ef9fd9905f30183489baf7b5ede53a8fb9119c39cd6fed1facb1fa9cb00e44d102912702ae7bb650b13ccd3364ba2fbbbe07c9589ac603f94f7 SHA512 7a68a49ec147cd62534d35376f2c8e476e108476993b7033a08db74d46b3a4412021045f207cdb4a5cb1c6abe6334b68469dc42e98b88d42e380ab62ff3b06a6
+DIST kdav-19.12.2.tar.xz 54636 BLAKE2B 80426b369b6fa6c4e04436e6f7e180700e9c1b912fea63100886099affa5a97cd0bbac5d6e41ac845c91c0a18dfa0e96e3898c075bbb12916754a3d6afd1f86e SHA512 51b47ada8a329fb1958627cd39117002c2115b00e0bf562e0dee43fdf5e514576e401dc6643fa04b50e415d6b248506cc24d96cd99c40deb99da92016820eae1
 EBUILD kdav-19.08.3.ebuild 755 BLAKE2B 07429cf18d1e31f0aa9b1ec88085d1635327b80819e95dfce0872f18a4e85f85d035248444121d4305647b32486bbafb469fc624a4593c127edb172a93265fdf SHA512 3d5a467b0b436ed1ffd27282b7c93a3c41661b6c62679ead5bda1f37e2fbef44f6d24b42c236237a469ecb7d58363b9360b15ef8d66fe892291897e184812343
-EBUILD kdav-19.12.1.ebuild 819 BLAKE2B 8f5db6504d7299fcc67994429d9e251f740befaefce62a1c8966e91f3c9dc6d399d3f6c96eaee26640d4f5eba27b2e7252852a2e2f179a5d8b7376189744ddd7 SHA512 66a7adb0a6819e43b36082790488af835b2e5dc00284313572bd576b21f03e951288c7242393e5074a2ce4d0d0c6af331e2e34ad5183d20357a890d2abc688d7
+EBUILD kdav-19.12.2.ebuild 795 BLAKE2B 83ff92eb338ee8d6ac9c655ed6306320fa39c37c0040c953a04501a95542c6c03b4b0efffb7d55600538b6caf639b6fc6e3c3e139ea1c71481c1f4c0596904e6 SHA512 098278b0e1cb1302c24ef59044cd6c7a965d95063efd0c56ff40ef249d564e6cdc5e5142af99a4f817355e2fcbd7b6fcea4b5aabde5689caf5b315220034cd5b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-19.12.1.ebuild b/kde-apps/kdav/kdav-19.12.1.ebuild
deleted file mode 100644
index c12e1e94b46f..000000000000
--- a/kde-apps/kdav/kdav-19.12.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="DAV protocol implemention with KJobs"
-HOMEPAGE="https://api.kde.org/kdepim/kdav/html/index.html"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 616808 - DavItemFetchJobTest requires D-Bus
-	# bug 653602 - DavItemsListJobTest mimetypes unsupported
-	local myctestargs=(
-		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kdav/kdav-19.12.2.ebuild b/kde-apps/kdav/kdav-19.12.2.ebuild
new file mode 100644
index 000000000000..8ce00da14c25
--- /dev/null
+++ b/kde-apps/kdav/kdav-19.12.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="DAV protocol implemention with KJobs"
+HOMEPAGE="https://api.kde.org/kdepim/kdav/html/index.html"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 616808 - DavItemFetchJobTest requires D-Bus
+	# bug 653602 - DavItemsListJobTest mimetypes unsupported
+	local myctestargs=(
+		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
+	)
+	ecm_src_test
+}
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index 505a2dbf1345..01fa125ac171 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-apps-meta-19.08.3.ebuild 793 BLAKE2B 22cefeedfc170840ca9eccb5e9eb502764383c7f80000a850d8e5dd9d9755c12bf3f77632695ae81d5101ce2e3959dd3348a5a3c97991dbd0e646beaa076ec22 SHA512 4d06696d96f180a84c216dc3b158cfe49f5a111556b8f13f3223af6d9ed722dbe96ee6cfc3c0c783a5945fdacd8c36c82114bdd046e129cd5d830fce2530ab72
-EBUILD kde-apps-meta-19.12.1.ebuild 796 BLAKE2B 3c748e587c7a812d7a7df7b7384c4505933df37b8dc1c22eb37a92d3a023250c911cb53441b51316e895df8a33902a3dd37386c0f05664445fabf645e48aec9b SHA512 d5f93214334bc9722ee4ac6b5522cf4be5e04a615573fc2a8d3f808ae56c18f284d4d46b392ff6555cb1f450ed732a73f84322252fb294b64128f5504469fa48
+EBUILD kde-apps-meta-19.12.2.ebuild 796 BLAKE2B 3c748e587c7a812d7a7df7b7384c4505933df37b8dc1c22eb37a92d3a023250c911cb53441b51316e895df8a33902a3dd37386c0f05664445fabf645e48aec9b SHA512 d5f93214334bc9722ee4ac6b5522cf4be5e04a615573fc2a8d3f808ae56c18f284d4d46b392ff6555cb1f450ed732a73f84322252fb294b64128f5504469fa48
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-19.12.1.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-19.12.2.ebuild
index 02fb05e6b0ad..02fb05e6b0ad 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-19.12.1.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-19.12.2.ebuild
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 3f72ff0c98d3..a780cc7b35b5 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-scripts-19.08.3.tar.xz 378160 BLAKE2B d51290ecde81016dfec6d83b6d2176f52dfa2396540b00602b60a2687021a0dcbba880f7517fae5974a818fda6faf36bcd9261fb139d4092592e822ce4ba4a32 SHA512 3e041422830d1a6a9ed70e86875e9a1b10fbdff3a2189d0a8554899a007e9700e1791f88e0701426f7a8d49da89341283db7f72686acced5fc5b26e7301d191d
-DIST kde-dev-scripts-19.12.1.tar.xz 378876 BLAKE2B deaf3189a8ab02250e60ed65e396ec6b5bdb4d41ae3cc94480244b9145c21abc9e63e88636228c9851c6592214c5083357b6076eed21c3a0290f634d77ad7e81 SHA512 472c3dbbe781bb3df2deb5a6e24f2ff4f9bac8385ce1f6119ba32b1a17a08defb440dc4a4addd1ed5d4815d54fb8e34dc72c62e23ec2ed0f2d5e6aaa446d14a4
+DIST kde-dev-scripts-19.12.2.tar.xz 378784 BLAKE2B 6b9fa398e709a750eac7650762073211abee37b8d1e353d522fc07c3308f7a9f1bee4aacf7a902bbd888725e2ad259097f587630a18199146edde0df7c632b36 SHA512 e85beb333ee2c2b412eb569a7ffb734a7aeaa6aedc136f27d3d2b9fafa8b120c2ef06104d7f635b7f8068ca5d41922e3c583aad6afbffd876b8aaf9d7094f425
 EBUILD kde-dev-scripts-19.08.3.ebuild 632 BLAKE2B c71ba73a8fed4f15044a47f4084a3a1a4a6f1217a737ad570f1c06b321403f6a9527e40a3f964f6a9e23da20ca4e9aa7a93867b18f59e1f24349e4b7885d51f0 SHA512 c5a238ad81723f89765e6b56af9ae3cbb587101a0f3b0c504c8b7a9dab6c4d7d9e45d303513d2013020eb2c83727fad64e657c80dc8a77f7aae97a3ee7a1b375
-EBUILD kde-dev-scripts-19.12.1.ebuild 636 BLAKE2B 72fd7d74d136d8b72d8da06821a20b4f7b852711e8c07306aed01173cf4b415b869839ce53e322caf334e8256a7d9bee7da22d419425bed95f67049cdeab733c SHA512 c7d7525821154074b4589be656a6be96e09f854b3a896aa8d5d658876a60acaef6496cbce844c50c7e3c445272a0b6dbee529ef3f55090a8495810a87ff644cd
+EBUILD kde-dev-scripts-19.12.2.ebuild 636 BLAKE2B 72fd7d74d136d8b72d8da06821a20b4f7b852711e8c07306aed01173cf4b415b869839ce53e322caf334e8256a7d9bee7da22d419425bed95f67049cdeab733c SHA512 c7d7525821154074b4589be656a6be96e09f854b3a896aa8d5d658876a60acaef6496cbce844c50c7e3c445272a0b6dbee529ef3f55090a8495810a87ff644cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-19.12.1.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-19.12.2.ebuild
index c88f57dcdb92..c88f57dcdb92 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-19.12.1.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-19.12.2.ebuild
diff --git a/kde-apps/kde-dev-utils/Manifest b/kde-apps/kde-dev-utils/Manifest
index caa270101fdd..e402dabf1487 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
 DIST kde-dev-utils-19.08.3.tar.xz 61556 BLAKE2B bdd30dd5d14938616565b2edcd0c24307e355fe487ecc691f2cec6263da1b1e722ac6bb712a7de6b55ccb89f6e58d7ce51bb7cca8a28a49eabbf202957ac1edb SHA512 272baa3f325cae611dda982174edba025ade4cccde6737b5bbccf426142a3bf4c79b4006bcca0aa57a28947947b9d9d5eb5d565385050e5f2e468bec4094f1aa
-DIST kde-dev-utils-19.12.1.tar.xz 64420 BLAKE2B af8c5284d0b3e834f41ad7adbcf0f72a30ec3734c15d65f512a1250c958acf3bc3466084dab458f30c5f8ff534b2dfa839c6962f0785e029efc90bafdd1d6e60 SHA512 fd9f81e7e20b38f1161e58b36eb25669b3d3dba3c5599745d2211d06fb0b4ad49f1a8ea05903be44a0b2d7fbaa0818c02a2fbed51769121caec51b5b3e766b59
+DIST kde-dev-utils-19.12.2.tar.xz 64300 BLAKE2B 6b2375a077105f24f0ac5f8e7eeefadd29fdd4ebcd0c575b83debcadd422013d6eb2c7d9787a1ac34dd0e82a4fa189e1c6e2a2a069e3b810a6f0800c4e38395a SHA512 52bc50b1522d246aa0242d5c308786ebd2f7afa5801b94548798efa6470e2e94afa01866895f4962699174fc6d0885c4dc72fc79d3c5403970bf2e268fd989b5
 EBUILD kde-dev-utils-19.08.3.ebuild 729 BLAKE2B 74bae515fa982f0fec070e8f4816003cfff63465741b533b5c182b2a97f12e064e8aa1dff33dfb613a0163807e7101b79b0bc617d872b7026107fd27704683b8 SHA512 201e77a441cd060f4126a4ffd777a77528cb0b19a1b6c58e3329c90c1f1711437790fe948892ec3c8bb4f737c88ce0951ee8ad644bcda83c444cc823cb0e908b
-EBUILD kde-dev-utils-19.12.1.ebuild 733 BLAKE2B dfc443e9653bd1419ee6b68bd90034aedd109b59a72405f2f96d68dfa606200a9551d83627773a2427311d51d38672e11f07e0cbee81b2b3090a953097b0327e SHA512 5fe5d489ace32113d6e7ea83bb541d8f4cdbf18569d51593c420fd226a032dc83ea651b60a28e3d0e0d5863190c875bd7c52b0dabaa1a2761e2fb35e2a0fea8e
+EBUILD kde-dev-utils-19.12.2.ebuild 733 BLAKE2B dfc443e9653bd1419ee6b68bd90034aedd109b59a72405f2f96d68dfa606200a9551d83627773a2427311d51d38672e11f07e0cbee81b2b3090a953097b0327e SHA512 5fe5d489ace32113d6e7ea83bb541d8f4cdbf18569d51593c420fd226a032dc83ea651b60a28e3d0e0d5863190c875bd7c52b0dabaa1a2761e2fb35e2a0fea8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-19.12.1.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-19.12.2.ebuild
index b19d9d1ea441..b19d9d1ea441 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-19.12.1.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-19.12.2.ebuild
diff --git a/kde-apps/kde-meta/Manifest b/kde-apps/kde-meta/Manifest
index 3eb725518591..2ef7693310ac 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kde-meta-19.08.3.ebuild 364 BLAKE2B cc6297c21de671ee79b7229f58a7ac4839d97c1fff800070ca5a48aca732d23a67e41af7845463d3deb33f98bc3cf443f6403909d192d6506dd9685eefe9dd1c SHA512 e4310bc15e6676dd794fb165cca64f100a2029dcc50544509eb23ba3c5f9aac65629a668bef6f584d6a7e50d710125c507fc50815e288baa33fb7a9e04fc25e4
-EBUILD kde-meta-19.12.1.ebuild 367 BLAKE2B 1c1c2574816fbc70ba33313ce6ebb7e6d968d9d5078da779942f51814ba7b7594dcd2c6aa5a39b2635f70a9961667c17cd2f09a00c7eae76e50112ae118a90d9 SHA512 d4bc4f0caaad85881be38329c9eeefee3b59fffed9cd99f8713e56438a04f8b648583514c909692389fb729adf8994b63f4b4cc60bf872d101319a6117056a39
+EBUILD kde-meta-19.12.2.ebuild 367 BLAKE2B 1c1c2574816fbc70ba33313ce6ebb7e6d968d9d5078da779942f51814ba7b7594dcd2c6aa5a39b2635f70a9961667c17cd2f09a00c7eae76e50112ae118a90d9 SHA512 d4bc4f0caaad85881be38329c9eeefee3b59fffed9cd99f8713e56438a04f8b648583514c909692389fb729adf8994b63f4b4cc60bf872d101319a6117056a39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-19.12.1.ebuild b/kde-apps/kde-meta/kde-meta-19.12.2.ebuild
index 3b632bae0982..3b632bae0982 100644
--- a/kde-apps/kde-meta/kde-meta-19.12.1.ebuild
+++ b/kde-apps/kde-meta/kde-meta-19.12.2.ebuild
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index 8078bbce4c7f..a0f213e13ed8 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeaccessibility-meta-19.08.3.ebuild 414 BLAKE2B 175fa48d376ecc7f34044b22332b222346f407dfb5af47207bdc8e26d228a0d118c4d8b54a9f8eb652671316902822ed38b9abcccab26f1d94b3e32b5f267acd SHA512 fc831517ffc09a62be45ad56b51c08d6659c2107b0a66eeb833980d61bd133acb8270e0712443ee5b406c5e534233b7c03cc3e74e0d4a69d133582e132f5148f
-EBUILD kdeaccessibility-meta-19.12.1.ebuild 417 BLAKE2B 7e3b2037cc6564b9a3256ae36d85ca9e6f059f6e07c029041550bb4c2faaaf7aacfb70d7c7879a60ed32bb0b503ae6780bc2be98bbd7915ffbf1877d0cb23a9e SHA512 47b2498400827c57a52530fc7adc6da18b34067417b06c5439a610fe11e348be4ee80fa8c8fd7a2b1c969a47cf8ca0c3538c5aeef60cdafce3a9c618c7362455
+EBUILD kdeaccessibility-meta-19.12.2.ebuild 417 BLAKE2B 7e3b2037cc6564b9a3256ae36d85ca9e6f059f6e07c029041550bb4c2faaaf7aacfb70d7c7879a60ed32bb0b503ae6780bc2be98bbd7915ffbf1877d0cb23a9e SHA512 47b2498400827c57a52530fc7adc6da18b34067417b06c5439a610fe11e348be4ee80fa8c8fd7a2b1c969a47cf8ca0c3538c5aeef60cdafce3a9c618c7362455
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.12.1.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.12.2.ebuild
index f2be0489e41e..f2be0489e41e 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.12.1.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.12.2.ebuild
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 17bdeaa27fc1..2173c647ea3b 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeadmin-meta-19.08.3.ebuild 398 BLAKE2B e92c78325a8373e5ed684ccf94370b4d8a6b3cc94768c8c7951de423b6ff9add63e0980bff74a20816e69ea8d87eb7e244bac21633a2d3d74b3e353e97f6db78 SHA512 17037a80be080757eaff42c9737cfdd4aa43cd9ce2966e0a85c3d7f21af310ffd773f8a4c844c1c000c365c6535e3d800d02c1a7ca1011cbfb4ea2f8b20ad3ad
-EBUILD kdeadmin-meta-19.12.1.ebuild 408 BLAKE2B 39e83d9a543e231d48c1d856de64addd7bd2a09470277c38b7eae74b1bb306cd4efe5201b87791a4459f1bac00e75d9157a6ea277cc930eebe5e915a9f63023a SHA512 2877895940b13289f9e40f7c1cf9aab9df5099b662fd3b5a29af153a0e33821e6bc87732d65f60529633a6988be70b4918ac02e2d5cac2d89a6602c3745b6043
+EBUILD kdeadmin-meta-19.12.2.ebuild 408 BLAKE2B 39e83d9a543e231d48c1d856de64addd7bd2a09470277c38b7eae74b1bb306cd4efe5201b87791a4459f1bac00e75d9157a6ea277cc930eebe5e915a9f63023a SHA512 2877895940b13289f9e40f7c1cf9aab9df5099b662fd3b5a29af153a0e33821e6bc87732d65f60529633a6988be70b4918ac02e2d5cac2d89a6602c3745b6043
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-19.12.1.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-19.12.2.ebuild
index 5269699a76dd..5269699a76dd 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-19.12.1.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-19.12.2.ebuild
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index 8762ba13f2ce..6ff88a3bbf97 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdebase-meta-19.08.3.ebuild 366 BLAKE2B f31da0c93efd8f0c6de9114376d1a514a9501f1d570331ebb5ea155923031931f39ae71fc31281db3ab5ced8d5610e0a491d585fa985c8c13548090aa6bbc21d SHA512 2e390f8ee93913e36bde9f6d3689843165d87946bd985bfad636f22a888e87f1819199bd84feb91ebcafdeb40ed4120a7a37f81abd31e736233f6c890cfa813c
-EBUILD kdebase-meta-19.12.1.ebuild 376 BLAKE2B 56a9863005f43d4f43697f87f6daef84e3c911a9424339e44f914bc1720376f5865f095eb7f7a515626703264d0448c625508532af9c6729c6998db1afcdfd4f SHA512 da1be4334a59de45c01dc207b5f1a5a5b5e5f566df0e8e5958638d7e2739427a8d67968f1921173a7ea5ffd70030fec7c15f6c12625abd6ab7f8027ae935be35
+EBUILD kdebase-meta-19.12.2.ebuild 369 BLAKE2B cf7572b05be1e00754671d9291c0ffab3dc6d35a4d2fc9a3ebaceceebbe27fa89c34d94c7f216918c2f2f055484581ce56f08b840aad224d5accf3530097c3b9 SHA512 8e1f04a948c29a840fd920dbc23f42f436153f8ee0a1bb0e652efa9225aa6c26245e5ccff6d5b621e042f9c761c802f6ee29cc7029f21e6067f2a48568d62607
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-19.12.1.ebuild b/kde-apps/kdebase-meta/kdebase-meta-19.12.1.ebuild
deleted file mode 100644
index 14a98591b16d..000000000000
--- a/kde-apps/kdebase-meta/kdebase-meta-19.12.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-apps/kdecore-meta-${PV}:${SLOT}
-	kde-plasma/plasma-meta
-"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-19.12.2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-19.12.2.ebuild
new file mode 100644
index 000000000000..bd684af65122
--- /dev/null
+++ b/kde-apps/kdebase-meta/kdebase-meta-19.12.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
+HOMEPAGE="https://kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-apps/kdecore-meta-${PV}:${SLOT}
+	kde-plasma/plasma-meta
+"
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index f0c5f1e5da9e..d6d19581c342 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
 DIST kdebugsettings-19.08.3.tar.xz 55472 BLAKE2B 719549d047cfa771936efb556b032c31cbbf5e996adfa62b4ec2a07b15887cbd2347ba96e4bf642ec51d7bc60dfc16b77e9c8e86a8cf552eb4bc3391d5501b3c SHA512 08201452ebfe8889eced3f2182092a21a839cf717ee8c52b1e26499eaf9541009456397511ec0698968f9767725bff1e4682a603a03654233381509c66aaf514
-DIST kdebugsettings-19.12.1.tar.xz 63088 BLAKE2B d27622669d9ea682161be6f26eb32cbefc3c736298cd98504421234054a4f08a8003893f746b99d5f7d2905853dfed5890c5e3d9c6007b0becfdf440efcb283b SHA512 a14f278b3c5af0d60d466a18c0470b2a03e203eea926d53a86afe3b79b8c5db5ebf76eb2a8af95ad64403afa4a70b612913613df9f6035adf83f9dcf25cfcfbf
+DIST kdebugsettings-19.12.2.tar.xz 63524 BLAKE2B 3d6157b8208195aae1efbb7c558b253426b842eb636fdac0c82845160dc12e0e008d8468ecc38388217ba402dfe471c926353828af2af558ae30b53b0a2714bf SHA512 3e12385c9623b52391bd2b764f1fb2800e17203d284415b6f040c72e31154dd087a590917b390c4e69787ee53ae0c019cdde097ee0530ddd47adb195a86caa17
 EBUILD kdebugsettings-19.08.3.ebuild 724 BLAKE2B 34c705413780b7d5441f88a11b01df4b2a434b15f6ba363b7d19466df6700575a223682cbf626105c54f7a537f51494a25e47256e805b453645e7e488631bb1c SHA512 b7e9f5e9eccf9661cf15773c50b054ae8c75178b214f318dbcf7f479114df509ac1e4aa8c022a90f94bf937eb8661e5afd7720359eb168fea69bc15feb61e85c
-EBUILD kdebugsettings-19.12.1.ebuild 810 BLAKE2B b5484958c2842dc855412fe9b49b94c2a22bd13079e2c9011dc169901ff0d18b5012d801d7b9f142e9c371c760a9d2c5315477b285013f8d6960fb6b6c244d45 SHA512 b466d9d99de47dbf17d4a2e3349624a83681645ea39769cf956853799d2cfec2979031264e055ce5e8c6984ba901ec635b22dd98975e4179cd57b17d0949f80e
+EBUILD kdebugsettings-19.12.2.ebuild 810 BLAKE2B b5484958c2842dc855412fe9b49b94c2a22bd13079e2c9011dc169901ff0d18b5012d801d7b9f142e9c371c760a9d2c5315477b285013f8d6960fb6b6c244d45 SHA512 b466d9d99de47dbf17d4a2e3349624a83681645ea39769cf956853799d2cfec2979031264e055ce5e8c6984ba901ec635b22dd98975e4179cd57b17d0949f80e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-19.12.1.ebuild b/kde-apps/kdebugsettings/kdebugsettings-19.12.2.ebuild
index d152d959d2f8..d152d959d2f8 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-19.12.1.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-19.12.2.ebuild
diff --git a/kde-apps/kdecore-meta/Manifest b/kde-apps/kdecore-meta/Manifest
index a78fbca5de8e..e6aec11df1f2 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdecore-meta-19.08.3.ebuild 929 BLAKE2B 2b374fcd30bb26df2499e57c668de3fec4a4579830d81d3dcb945005878289634bb2eff284c9fd0e3ecb740db082acb3942cdbb85b912e06710ad941b6e385be SHA512 b78fb1acfd7e387337e3f06a3047a9da841ae23c8b19b17e380eacb53b54b144cff29773847c822f5f55e4880531e4a5e602ad894a40aff26216cc0856090209
-EBUILD kdecore-meta-19.12.1.ebuild 888 BLAKE2B 6c82bc361673fd00764f55d935754c4d74d4450d88c3dd5e93a2311109d5d7614d7826df72a4cb5eff95058eeddc3d7827e3b92795d0ea5ba06baafcb547d0b4 SHA512 1703f0c7c7970744519891d5ecec87aeeebe833743c9104507e169cfb09b432dfeeafc01327bd7705d93dd0487cf2f5bb597b9332dc48c319ef35f030f5b8411
+EBUILD kdecore-meta-19.12.2.ebuild 888 BLAKE2B 6c82bc361673fd00764f55d935754c4d74d4450d88c3dd5e93a2311109d5d7614d7826df72a4cb5eff95058eeddc3d7827e3b92795d0ea5ba06baafcb547d0b4 SHA512 1703f0c7c7970744519891d5ecec87aeeebe833743c9104507e169cfb09b432dfeeafc01327bd7705d93dd0487cf2f5bb597b9332dc48c319ef35f030f5b8411
 MISC metadata.xml 828 BLAKE2B 62d5af7d5413a38e7a0d04df003a80a7f863abb11b35e1c16fde156a06667e754b23504d550d585b03eba979c5d3a6d379a1aec4d8d56c54951a63d5b3298287 SHA512 557c5a2ba75b21a8a8f13531cf6e252b5e38d0e0b0475038968ba5bbed1672dceb7518791e88ee01a94966108e2b315aa67341d775fcded1a5e43a5858c902dd
diff --git a/kde-apps/kdecore-meta/kdecore-meta-19.12.1.ebuild b/kde-apps/kdecore-meta/kdecore-meta-19.12.2.ebuild
index c9ab667d262a..c9ab667d262a 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-19.12.1.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-19.12.2.ebuild
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index efa1e9522245..822c0e248728 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
 DIST kdeedu-data-19.08.3.tar.xz 326784 BLAKE2B 99b751c96a4a8113738ef7ec23b252be00e8a286e2d52caa8f1107a3250a2bfbb318cbbc4e9c21a2b7c788ef8e5d759f671a460ebed5f84e1a89e3bc2595ebe6 SHA512 647e1cbcd21dbd535e6462f701a183a670f02f00533c274c10b0da3a3e6d2978836b070ff46e824e68a9f207f7e2461c091e981db26c093d5ed94d5835e49613
-DIST kdeedu-data-19.12.1.tar.xz 327120 BLAKE2B ebea906a9135351af7eec2191d86ad210f533a21f4d4011f59a6737c05fc80e54f2daa0a25881fc94cd33cd4f4ee64b2989c4eeb042f0447f47541046e9c94e0 SHA512 592f35c1a4e52e760b31b0cb4b54b29086f56dc4e13329de9405ed3ad66e5c9195c679945fcb74619f7a9714c3f56808da14d1c231f4d3096872b76602e2c88c
-EBUILD kdeedu-data-19.08.3.ebuild 339 BLAKE2B a8e6814bf20e989c82154ba24b81adf73a9d4adec2a5658caa00987624841ca69967a2341dab0c366c88f5ca683a934d94e5e3d50877bc90913ec4b5178cc6bf SHA512 c2cc5fa5dd0b4070e44f60bd736161f539c43d3383e58e58254eedc15d9ef117a6052499a1ef7fc9b1aa7fef770319f5cbe57e648d52ce3f316b6aa3c8941aa1
-EBUILD kdeedu-data-19.12.1.ebuild 342 BLAKE2B 1cb177dd8446ae5538addecdb035a7b1eabe24392b9f135e3233c917b6fbce89a5cd5f3da915302dfa3482ffba6266a4558596e8f6b7cadad594541dc646ecab SHA512 8b886329c0b0ce8369325fb6324c89b2fc3cec4f07c21e5439ece14f02d25bf5f9886e7d4164af24e958df69706e8f9d4e8c1dc38c92dddd80486d00cfeac772
+DIST kdeedu-data-19.12.2.tar.xz 328612 BLAKE2B b437404e9a2bc52db358b142407814582c8d71dab3579ed5ab8247c67fbbac196e6aed8390c23fd6441b502a3b7425614e8e64edc2818bccc198b92119e3f37c SHA512 1a8895f868bfd10b0a56198dd4571dba63e221c4fd8192ac760766a816a56f4948b45322a0fdbabd95d578206d602edb151896b15184edd007bf62a6421666f9
+EBUILD kdeedu-data-19.08.3-r1.ebuild 345 BLAKE2B 41fd0c86a8ecd727d1429423e0773392fb4e139d8b67e4ad16b7e89a59e2c8716b2fe7f83a5f97b623c18476dfcc2ca586bd054118c88b435bec4fb9298743b9 SHA512 b63edb9b19b9f13a0ec51673a340aef92a9f1c4c227ac7aa7b937de598be703671319e45d5adc8d7bf8b09547c97f990b2ee1574cfc4b68051fcad1cb49c0305
+EBUILD kdeedu-data-19.12.2-r1.ebuild 348 BLAKE2B ccca519c4e8d5ececa2a50c338e7368e733d22e48b0b93c0efa680024d92d54a5117139469dc1c9f2c110094484565fd13afcd5d354814ea30cd9b1d695dd9c4 SHA512 062f8acc364c571e5aeb01efa6f3ff7068b6044a8eb01287a33a00eb27b4823303a6bd937624fd153fd871ae610379f74ca021bf906cf11ca737fa4dec435198
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-19.08.3-r1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-19.08.3-r1.ebuild
new file mode 100644
index 000000000000..fcb228db73f6
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-19.08.3-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake
+
+DESCRIPTION="Shared icons, artwork and data files for educational applications"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/qtcore:5
+	kde-frameworks/extra-cmake-modules:5
+"
diff --git a/kde-apps/kdeedu-data/kdeedu-data-19.08.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-19.08.3.ebuild
deleted file mode 100644
index 1c654103f6a9..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-19.08.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org
-
-DESCRIPTION="Shared icons, artwork and data files for educational applications"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-apps/kdeedu-data/kdeedu-data-19.12.1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-19.12.1.ebuild
deleted file mode 100644
index 56433d6c8e8d..000000000000
--- a/kde-apps/kdeedu-data/kdeedu-data-19.12.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde.org
-
-DESCRIPTION="Shared icons, artwork and data files for educational applications"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-apps/kdeedu-data/kdeedu-data-19.12.2-r1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-19.12.2-r1.ebuild
new file mode 100644
index 000000000000..78a371325103
--- /dev/null
+++ b/kde-apps/kdeedu-data/kdeedu-data-19.12.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake
+
+DESCRIPTION="Shared icons, artwork and data files for educational applications"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-qt/qtcore:5
+	kde-frameworks/extra-cmake-modules:5
+"
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index a01eb3ced252..7e99879ace3c 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeedu-meta-19.08.3.ebuild 1226 BLAKE2B 01f7379c8d0f11a198c04bb6cb59f91968dd224ce1d3caf44cd885ee324219d15c4bf723e19bf54119677ef8690c92f961456d7b19b0f6d5ae885aff37fe6eca SHA512 e1f43afef30a686d3110f5862027d184da0aa1130b5d8c09adfae7caf6e76354538174946de734aaaf7bf1fef7a7f54f81495a32ba8f20d64737b273dba1144d
-EBUILD kdeedu-meta-19.12.1.ebuild 1229 BLAKE2B 668f6abc95047e84ec992ff86a68e173010e7a5bd94a498ab8e3515357c5951e526cae8175d7c4d661aa32ed21db3e0bb81b2155612e97c74cc750a5a9c2a6df SHA512 8e6cb5a4c5af637ecf59c370732a2c6d5a3c99e9efaf7d01cbc851b095e60d17409810275d67fdbf5049810115d85cd4db3ce0a63f971fddd47ffb7be8959a54
+EBUILD kdeedu-meta-19.12.2.ebuild 1229 BLAKE2B 668f6abc95047e84ec992ff86a68e173010e7a5bd94a498ab8e3515357c5951e526cae8175d7c4d661aa32ed21db3e0bb81b2155612e97c74cc750a5a9c2a6df SHA512 8e6cb5a4c5af637ecf59c370732a2c6d5a3c99e9efaf7d01cbc851b095e60d17409810275d67fdbf5049810115d85cd4db3ce0a63f971fddd47ffb7be8959a54
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-19.12.1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-19.12.2.ebuild
index e8123486f55f..e8123486f55f 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-19.12.1.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-19.12.2.ebuild
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index fc5580aba0c8..3829b20b9c1c 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegames-meta-19.08.3.ebuild 1804 BLAKE2B cf7a80b49de349f66d567e40d977f8f5a6903a2f4e9b0f4a6fb1dad9f3eb8080b735c2034564f8c66ec64fbd18b4dfeb39f130c97b1c505d32a3f7ec83a3e668 SHA512 65ae1f729ca29694e752897a3934a6a1084fc6c072b4cdff8f0e982d6294098d904f77d2f2b7b1feae74719ce5d94d5ba0a43866373992385e0b563bf764f4d5
-EBUILD kdegames-meta-19.12.1.ebuild 1807 BLAKE2B 88bb932ff26bd7915855e77d1daaabd61c30ff9ab7b85d38b9d0acd2d32f2529f449d3e62fe99cd8dafbd15b1a3caf1800de35d01a06308693107f7a02e091ef SHA512 5d22a49f4a13e414e7589b7e6afb03067b9c36f63cb24227063224ed3d78baa4d1191c66664a3dad7543d7190c70ba63608c5872df8fc31778ec28b945e4a2c0
+EBUILD kdegames-meta-19.12.2.ebuild 1807 BLAKE2B 88bb932ff26bd7915855e77d1daaabd61c30ff9ab7b85d38b9d0acd2d32f2529f449d3e62fe99cd8dafbd15b1a3caf1800de35d01a06308693107f7a02e091ef SHA512 5d22a49f4a13e414e7589b7e6afb03067b9c36f63cb24227063224ed3d78baa4d1191c66664a3dad7543d7190c70ba63608c5872df8fc31778ec28b945e4a2c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-19.12.1.ebuild b/kde-apps/kdegames-meta/kdegames-meta-19.12.2.ebuild
index ccae75912e5f..ccae75912e5f 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-19.12.1.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-19.12.2.ebuild
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index c15dabec526c..d426893532d0 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdegraphics-meta-19.08.3.ebuild 896 BLAKE2B 9f3d9ef952bfaf23c9c67d971b86b273cf391966fb95050bc5621fa1587f8f675cb1029bb1eaf9559bdf02c7569bd5fa71b3f67fdf9b246a5d31e2af60dbce2e SHA512 c745c30a402596ea6ab0782c5b52b868dbe09a8f31d42280beff220ee21a9d3d2c5e876189af2895ecfb7c9487a56df8fab1dc1eac71371fe4428b24b004d157
-EBUILD kdegraphics-meta-19.12.1.ebuild 906 BLAKE2B 3e99ffe3ba7f280aed40df9b99eae2a715cb5167f949848e5739a0c1b3a8b08172ec1d8ed65409d8a79e495d01e1490de502c55f5249124889c554534f50d99a SHA512 5cb832a5d11850e40cfc951b8c6a351cde9316d7ca4b9de803d5be054abac87c2cf55c03e8160e8d04c00f710827bae8a434eb39f897e9c0e943e3315480abd2
+EBUILD kdegraphics-meta-19.12.2.ebuild 906 BLAKE2B 3e99ffe3ba7f280aed40df9b99eae2a715cb5167f949848e5739a0c1b3a8b08172ec1d8ed65409d8a79e495d01e1490de502c55f5249124889c554534f50d99a SHA512 5cb832a5d11850e40cfc951b8c6a351cde9316d7ca4b9de803d5be054abac87c2cf55c03e8160e8d04c00f710827bae8a434eb39f897e9c0e943e3315480abd2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-19.12.1.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-19.12.2.ebuild
index 5a67dfbf5567..5a67dfbf5567 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-19.12.1.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-19.12.2.ebuild
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 4715b01604cc..5a9dfa2f55a1 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-mobipocket-19.08.3.tar.xz 13496 BLAKE2B 926c79fb21543f46ed8372ce8f41902e25ae3e6363d1d9c8dcd79c5e68f93d324f3fbc18b3d5ce2e9520b238155bc480c847dad31096a602c0741d1f588b5b43 SHA512 7cb8c853d4eb3216c302dd5754b2bb999805399cb8559bc0b90d83642973ca6cdbd14552d7735d2d4156d043c73177e8b3484f37dd92d3eb163839041d11477a
-DIST kdegraphics-mobipocket-19.12.1.tar.xz 15976 BLAKE2B cae9e2ea59265dd74afb7d1dcf0e28b6f449738f8e8957a0499f5a0b6b4c97d15e9b1872fa879d0d7559ba5fe5884c750b1430916b7ad64b7b189bf65e00f1ba SHA512 c663ba0eb297451adfbe4baf1bbed90524468c47da5fdcde2803866579b1a2894387fcdac708b16622c397e31116e3106d89909807159de3dcccd376827375f1
+DIST kdegraphics-mobipocket-19.12.2.tar.xz 16108 BLAKE2B 2628db86ac4c0d3537d9d137cdeb203dd4c5dd248dce1f766b74ad9bfd9f1d4d90e3c722c3c46c7f977eba2a777462b5e6f2266802bec8f1b7207a6d25ecd90b SHA512 ddae0f3f4e3dd02f23c9a7116ca7a3a02b33e817612a84684cf516aa8bf6e2a390d2473be67c9a1df23aa8055b1aa2d109fb1c27586d4cf892ab408e18a30526
 EBUILD kdegraphics-mobipocket-19.08.3.ebuild 508 BLAKE2B e257c4d776ab56f669b5b4003b76aa4de57a0d7e98a8d20ff666e57f341552a88175fd733739e06c9a4bce993cd5dce52e17720b8a9dba75c33059f887dc9d2e SHA512 27c65012ed8756551f7aa6fd424fddd6ed99669787313b454de118448c2113453c97d2b6c940f56f2e901b495d0cc5ac16f20b6f8990dceab28a75a6c9bd18d5
-EBUILD kdegraphics-mobipocket-19.12.1.ebuild 519 BLAKE2B 3a8a1d594286111233ebf090965a50bfba7d44a7b07b88a0f656821aa817b12060e1cf75564f6a2c0cd5f3a24383533e61f3e1e89efae7f60c707cb0b49cee49 SHA512 3bd03ebce4e4fd2a57720cef7a6c686fc6f2d682ecdaa48de0605e2d7e5051ecfb687d5a4d3f131124c06f91381e745f1a9785ee1dab626eeb6699bd10c380d7
+EBUILD kdegraphics-mobipocket-19.12.2.ebuild 519 BLAKE2B 3a8a1d594286111233ebf090965a50bfba7d44a7b07b88a0f656821aa817b12060e1cf75564f6a2c0cd5f3a24383533e61f3e1e89efae7f60c707cb0b49cee49 SHA512 3bd03ebce4e4fd2a57720cef7a6c686fc6f2d682ecdaa48de0605e2d7e5051ecfb687d5a4d3f131124c06f91381e745f1a9785ee1dab626eeb6699bd10c380d7
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.12.1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.12.2.ebuild
index d8566cba0377..d8566cba0377 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.12.1.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.12.2.ebuild
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index 917276418e24..76393cb242ef 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdemultimedia-meta-19.08.3.ebuild 810 BLAKE2B a27d34d31667dbd7e699a73c5f8bb19d4ebcee04abb7d19388d878b6ef3c23d9a00a739f32d0d8932085ffa6940d0234095bf50e0f5cc21cb2adb8f0021aa104 SHA512 f7cc25d8fc3ec363ca696ac6a9490f9eeb6d8ba45f018bcee366e8d51df4183c75144e3b1472365402ff3ce0a06c32207475606a7486b0770eaee75f50e4f70d
-EBUILD kdemultimedia-meta-19.12.1.ebuild 809 BLAKE2B 17dfce75767895676b15ee0a34790a8dd7d619475f1630984f542bfd633371efdd7d2d9eb728ccc11806bb19f519188064c0273d3e3328b6581a0266fa182b3d SHA512 7f0b2129e34059616bc1b17e26afc3b3b8f6dca517517e608ca3d2f270fa32465a3459e88d2696598f42366b7ca7f90a5fd488a6528e241b8e6ebc8f1936486d
+EBUILD kdemultimedia-meta-19.12.2.ebuild 844 BLAKE2B 0de98446fc4f9d02767ec47ec9fcbd9b4ecca4a6ccd1e8f05e857b9e0dc97bd99c81222af1bdf595fd2840e5353c605c20b57c2455d267b8b4333fbefd1e8d22 SHA512 d2f712c66f8876b21d577a7be0d105711626c08d8661a63e27bf335aa2d31b3619578404ef6011b37d9abfd368951c416bc991cda806b1ba8a9ed4e606b6be6d
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.12.1.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.12.1.ebuild
deleted file mode 100644
index 80e2fed5e304..000000000000
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="https://kde.org/applications/multimedia/
-https://multimedia.kde.org/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+cdrom +ffmpeg gstreamer"
-
-RDEPEND="
-	>=kde-apps/dragon-${PV}:${SLOT}
-	>=kde-apps/juk-${PV}:${SLOT}
-	>=kde-apps/kdenlive-${PV}:${SLOT}
-	>=kde-apps/kmix-${PV}:${SLOT}
-	>=kde-apps/kwave-${PV}:${SLOT}
-	cdrom? (
-		>=kde-apps/audiocd-kio-${PV}:${SLOT}
-		>=kde-apps/k3b-${PV}:${SLOT}
-		>=kde-apps/libkcddb-${PV}:${SLOT}
-		>=kde-apps/libkcompactdisc-${PV}:${SLOT}
-	)
-	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
-	gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
-"
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.12.2.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.12.2.ebuild
new file mode 100644
index 000000000000..733e3f5f93a2
--- /dev/null
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.12.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
+HOMEPAGE="https://kde.org/applications/multimedia/
+https://multimedia.kde.org/"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+cdrom +ffmpeg gstreamer"
+
+RDEPEND="
+	>=kde-apps/dragon-${PV}:${SLOT}
+	>=kde-apps/juk-${PV}:${SLOT}
+	>=kde-apps/kdenlive-${PV}:${SLOT}
+	>=kde-apps/kmix-${PV}:${SLOT}
+	>=kde-apps/kwave-${PV}:${SLOT}
+	>=media-sound/elisa-${PV}:${SLOT}
+	cdrom? (
+		>=kde-apps/audiocd-kio-${PV}:${SLOT}
+		>=kde-apps/k3b-${PV}:${SLOT}
+		>=kde-apps/libkcddb-${PV}:${SLOT}
+		>=kde-apps/libkcompactdisc-${PV}:${SLOT}
+	)
+	ffmpeg? ( >=kde-apps/ffmpegthumbs-${PV}:${SLOT} )
+	gstreamer? ( >=kde-apps/kamoso-${PV}:${SLOT} )
+"
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index f6ddbea6361b..179d4b70f0ea 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
 DIST kdenetwork-filesharing-19.08.3.tar.xz 315492 BLAKE2B 0c05508718e924a36e3354969300b21902e64ced803567aafc00121bcf766a30f8a7197dac84fa1597d4b8dd3bf6b2169e1d91d74adf8766696449744111a40e SHA512 d75d3579c9c0d83e79bb7731273af01c3644ed632aae7141952586a67d88618e08a92ecf4fe6089ceefc8d5a0c7c5f57afff367bc2162e4a127d4d6958717c8d
-DIST kdenetwork-filesharing-19.12.1.tar.xz 317620 BLAKE2B c5b8bf5b710353b6412447c9cf9dd30d8dbcacaeea22504699466886ee1d34d57294e94b3fc5587c3a0869371eec4d31ab72f48c5b8387fad08ef8ba600a830b SHA512 646fb8df8acb881eb6f3782d46c9c6d56c414a0efd3ba7febdef09ddb218859f9a7551ef5583e4febe63462a8dea75234691359e31d904f3700a41a0df29d10f
+DIST kdenetwork-filesharing-19.12.2.tar.xz 319016 BLAKE2B a357959fbfe76d36dba15a091e369ff789897fb0311ae0142829fcb968f736c2c948e0b446f563a2cd8e855ee3d1ce85f0dc680b21b4f3c7dab116bd9fe3d397 SHA512 e2297c33aef0cebb0bbf9f2550e94bae5b5940b6b4bee062e03efd22cf5bb1624257f4ff9db2626b266f1f39db8fe23f63ff6daae8e6290791b3924087a9fd1f
 EBUILD kdenetwork-filesharing-19.08.3.ebuild 694 BLAKE2B ebb67c0d9e1e27ad45a0889bac13745d16ea73e554a3a2f888e0beb491195764c8730cfe7516f45b4dae5c862e95d8b0f79c39f6a533a88c58a240f32360df58 SHA512 b389ad6ecca74183e471050e8cec0978ef94466f01e267ff2e22b69370f65c71010242b61fc0dbd49b7b6816b82af3c3fb4a8976afad7e6ca6c937697e484a8b
-EBUILD kdenetwork-filesharing-19.12.1.ebuild 776 BLAKE2B 463e38887394d26bf0b307977c8e3267cd6bdb722f87a205f86edde5892453b6256ceff4c8a4d4ac23e8d94b073d5e89bdcd319bbb7ffe5cf26781c7a5d07ca2 SHA512 2205dca401386d5e8a75543d4d55d4ecfac8c042c4fe68306f88beae21fb6ecdce3e29097a6e083a3bbd61122f849c88c4a2a789c181f5b2d216428976aa3d87
+EBUILD kdenetwork-filesharing-19.12.2.ebuild 776 BLAKE2B 463e38887394d26bf0b307977c8e3267cd6bdb722f87a205f86edde5892453b6256ceff4c8a4d4ac23e8d94b073d5e89bdcd319bbb7ffe5cf26781c7a5d07ca2 SHA512 2205dca401386d5e8a75543d4d55d4ecfac8c042c4fe68306f88beae21fb6ecdce3e29097a6e083a3bbd61122f849c88c4a2a789c181f5b2d216428976aa3d87
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.12.1.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.12.2.ebuild
index 81c4d0bd025c..81c4d0bd025c 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.12.1.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.12.2.ebuild
diff --git a/kde-apps/kdenetwork-meta/Manifest b/kde-apps/kdenetwork-meta/Manifest
index c5901ed36757..6e5c5aa212b8 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdenetwork-meta-19.08.3.ebuild 664 BLAKE2B 65d1caabeed754b40b2e34e31726976fd7cf2c6348031f27526a674a773950a672b9f448ffa96197a9945e4c947263d1027495616a4a19649fc7ce0b02b09275 SHA512 0a605caeb586fd29f9d447335130fb7b13ce0e16d0a9c256eb48cd19561a351a81e05627a47b6b309aab2487a6a6cd26299c9f7d7101b9ee265aa2f07364b46d
-EBUILD kdenetwork-meta-19.12.1.ebuild 667 BLAKE2B 98e886e8c01fd62d03af1791aba499bd19deb8a1b7fc48c85a1bb40995dc13621cb5264414bf212fddbc6bdbc9a2b6af72fb960985bcfb1d0f347bdca10d8840 SHA512 25b0f9944c04d6638fb3cb8ec764545246debcf1ca43c53eae4555895af255eb34ebd9e8606c3ef0c2163a44c385b7e6ba1bc4f1d27e2517c28678a0765df655
+EBUILD kdenetwork-meta-19.12.2.ebuild 667 BLAKE2B 98e886e8c01fd62d03af1791aba499bd19deb8a1b7fc48c85a1bb40995dc13621cb5264414bf212fddbc6bdbc9a2b6af72fb960985bcfb1d0f347bdca10d8840 SHA512 25b0f9944c04d6638fb3cb8ec764545246debcf1ca43c53eae4555895af255eb34ebd9e8606c3ef0c2163a44c385b7e6ba1bc4f1d27e2517c28678a0765df655
 MISC metadata.xml 546 BLAKE2B c0eaa549235c2cf501ecfb5eb2b39bf466193e892715224ff8979528e49d2dd129873714302505f54ea200707eba0682a75a4232bbfe89b78244b5483d93a2dc SHA512 a423dbfbd45bd72c6d5aa9f196c9a4f1b4740400ac31112f358246e40f22ebaf76d3fc66136b4f477ebdfb59c967b45351841718621fc88f5576b71338136e6a
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-19.12.1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-19.12.2.ebuild
index 7a8302c9f8a7..7a8302c9f8a7 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-19.12.1.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-19.12.2.ebuild
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 932ee9efd0ad..d0238e3a8be5 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,8 +1,7 @@
 AUX kdenlive-19.08.3-qt-5.14-1.patch 7106 BLAKE2B c2c3e00603ec83fd98af7a4350f08e422e4e6e5f086119d30637608d10229f2cecde5789af060596bd51991c1f28bd88aafad945c1278266800fcf0282cc1194 SHA512 9076bd07c418be6376d83e223010bb0e64e159a0fb8aef9e58479811158ca851fedd9cd30c42086bfa13edb230dbcf61ad9bd1be4e6570c76d0abab92a685d9a
 AUX kdenlive-19.08.3-qt-5.14-2.patch 1038 BLAKE2B 2e45cbd32a81fd70eb6794ad4aeaf87f9f5dddce820237b00a4aceaea9a02c212cdd7727c414788c23baeebd52231e8fdbbb80a79b85ae89bbc93e0606bcf816 SHA512 0abd4615c6eaff86836220cb39b2785a40436324c701a253a4d1cc8f6aad37a7d11a3c75338f34a1f50cab68a869230af5c74d6d00e8827f77b4016cc877986e
-AUX kdenlive-19.12.1-qt-5.14-new-project-crash.patch 1967 BLAKE2B 553c2e0ea181da2c058feb7007c9450047bf49e6baa8232c780b6bafdc199c60630163c16be14090c9633acc7cf67f205079c222b4c8b753a5d5919f2c121b65 SHA512 2ec593f769cff4619d96a336e4d1ce6f12a39eb5b57584302f9b3ed67b7da189622fc44c74bd10f351b1fdf0c71df08a3c32ea7a47c376618dce545ecdb0c046
 DIST kdenlive-19.08.3.tar.xz 12418064 BLAKE2B bf0765e28f374a21371a9bf3fbc6059d6ac81118d79b0978fd10a3c4959f1343d06773ae278cb6e9a3890c1c1daff79f0a709cebd186b1bc586318e5384ca5da SHA512 187651de7542b86f9332c3eb79e2a27b664f0b4ead19fbb6035963b7be41a2a53b65de37e8c18c50aa794145cfaa2ebaf1b9f721d379c014da9c5f9475048738
-DIST kdenlive-19.12.1.tar.xz 11415280 BLAKE2B 24851efecd12daf18cc0d2767591ed114a2cfd1f190bc41985a17cce24c5d7a4df35d2eeb38a549ed4158c65a30454817cce16b84e6db972e4451bf1e12a82c4 SHA512 2255dc5e75d75fcde800a9c25e3a3d30ed4022eaa749e9275b3a2ac8604861cb9b3e5f20eeb895e7b16fa3740538c008211e25c54357d40d1de0ed37d17001d3
+DIST kdenlive-19.12.2.tar.xz 11441780 BLAKE2B c91d456a2b2ce61962cfd2d02d87d73410b763649084c541bbe24bb0585f5e38f0c262a1baf08322f6d35eb0838f8651b7a5cc1da3de72212341d26803c8020b SHA512 c6773d09aa9af2284ff93ee0bb163dd553b15891c0262350975902b076d5465ad664181e009023aac179dea84b837bc4c7dcd5b4b3914e9f99c624e89e962ba4
 EBUILD kdenlive-19.08.3.ebuild 2602 BLAKE2B ea19aa28bf618a45c937223a494eb038766a64364146cc741798a16f96bc865981e74e27dead848a9414c3cdfa53b3c0d81dd991a2c168fd46041bb014673bc9 SHA512 679b492f6a3480a72e902c8f59533e8b507d415695c92943ade61470c12029afbb10ac18021444731910cd90332e3d245fc57516874bc8bf39770d2f5fb7f904
-EBUILD kdenlive-19.12.1-r1.ebuild 2594 BLAKE2B e90517253c0d5a37a49e87ed66bbb57ddedd2214b3fa4249b0b792324c1b9452ce6197471ab7d05d2da421249f179575f69051abcd9db68e92d18b6d3c33a2cf SHA512 6e92e3a6174479f18e4d98a73b2f547dc5aa8cc3c37727b29edfd45893b1251d4091eb336f55d6c2140040d7469cf4cdd482d38d3aaacc2a145c697a87a7863d
+EBUILD kdenlive-19.12.2.ebuild 2516 BLAKE2B 915879a5fcc889b1b579946bbff976cdd48e9f97890afccb781d3829f8273a1ea18e6aa6156060f260d6f433584ddfbe1748c39563eda7aa78d5b3ac5cc78cf1 SHA512 43bf287318543d4464b6c88860e4b23484ced00f131d7c9e414db4e588e547460be90f79c6c483159347312b0cd2ce65626a77bcc56e87d413d3be92f1018313
 MISC metadata.xml 559 BLAKE2B 4fb6ac38398866a869611dcdc0d9513c5618e7b1864b221d155e5bf1200ffd1081ff8b7dc408d85a97be6146eaf60b1ff1ac695c02e22c2a1537b18a8a1d8f4c SHA512 b76a5322a9fe2a6b7597ac7a6c45525e921cd0102e156939e013c96d876b355b258c0bb917e72a73686819672a2a5a47e7c7d0232468c709e4e88f888ee26cbb
diff --git a/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch b/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch
deleted file mode 100644
index aa4d4914b441..000000000000
--- a/kde-apps/kdenlive/files/kdenlive-19.12.1-qt-5.14-new-project-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From b20a7307368932b35ec0d7cdebb68a710cbbf8ba Mon Sep 17 00:00:00 2001
-From: Jean-Baptiste Mardelle <jb@kdenlive.org>
-Date: Wed, 15 Jan 2020 11:30:20 +0100
-Subject: Fix crash on new project with Qt 5.14 Related to #494
-
----
- src/timeline2/view/timelinewidget.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/timeline2/view/timelinewidget.cpp b/src/timeline2/view/timelinewidget.cpp
-index 452e4d7..f8bf6ed 100644
---- a/src/timeline2/view/timelinewidget.cpp
-+++ b/src/timeline2/view/timelinewidget.cpp
-@@ -65,6 +65,7 @@ TimelineWidget::TimelineWidget(QWidget *parent)
-     // Build transition model for context menu
-     m_transitionModel = TransitionTreeModel::construct(true, this);
-     m_transitionProxyModel = std::make_unique<TransitionFilter>(this);
-+    m_sortModel = std::make_unique<QSortFilterProxyModel>(this);
-     static_cast<TransitionFilter *>(m_transitionProxyModel.get())->setFilterType(true, TransitionType::Favorites);
-     m_transitionProxyModel->setSourceModel(m_transitionModel.get());
-     m_transitionProxyModel->setSortRole(AssetTreeModel::NameRole);
-@@ -89,6 +90,8 @@ TimelineWidget::TimelineWidget(QWidget *parent)
- 
- TimelineWidget::~TimelineWidget()
- {
-+    rootContext()->setContextProperty("multitrack", 0);
-+    rootContext()->setContextProperty("timeline", 0);
-     delete m_proxy;
- }
- 
-@@ -113,11 +116,9 @@ const QStringList TimelineWidget::sortedItems(const QStringList &items, bool isT
- 
- void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, MonitorProxy *proxy)
- {
--    m_sortModel = std::make_unique<QSortFilterProxyModel>(this);
-     m_sortModel->setSourceModel(model.get());
-     m_sortModel->setSortRole(TimelineItemModel::SortRole);
-     m_sortModel->sort(0, Qt::DescendingOrder);
--
-     m_proxy->setModel(model);
-     rootContext()->setContextProperty("multitrack", m_sortModel.get());
-     rootContext()->setContextProperty("controller", model.get());
--- 
-cgit v1.1
diff --git a/kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild b/kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild
deleted file mode 100644
index 8fa5e2c222b8..000000000000
--- a/kde-apps/kdenlive/kdenlive-19.12.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://kdenlive.org/en/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="freesound gles2 semantic-desktop share v4l"
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	dev-cpp/rttr
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2=]
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=media-libs/mlt-6.18.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
-	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	virtual/ffmpeg[encode,sdl,X]
-"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.14-new-project-crash.patch ) # bug #703524
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package freesound Qt5WebKitWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package v4l LibV4L2)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	# Gentoo bug 603168
-	if ! has_version "media-libs/mlt[fftw]" ; then
-		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
-	fi
-}
diff --git a/kde-apps/kdenlive/kdenlive-19.12.2.ebuild b/kde-apps/kdenlive/kdenlive-19.12.2.ebuild
new file mode 100644
index 000000000000..0df5c81ab67a
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-19.12.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://kdenlive.org/en/"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="freesound gles2 semantic-desktop share v4l"
+
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
+	dev-cpp/rttr
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2=]
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-libs/mlt-6.18.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
+	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	virtual/ffmpeg[encode,sdl,X]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package freesound Qt5WebKitWidgets)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package v4l LibV4L2)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	# Gentoo bug 603168
+	if ! has_version "media-libs/mlt[fftw]" ; then
+		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
+	fi
+}
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 8f529f13ce88..8ebb6db37ca1 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-addons-19.08.3.tar.xz 2091080 BLAKE2B 172e8f80dda538d413f85f998657b9882f2fbd61afeb58be3026c12e080551da2a5237a344af6f45b57e6e905c5c07a37b4d34fc3785473b82984620df38d7f7 SHA512 bc9d3cc80a50a758052d9f67fbdb26f9babc8f03e3d83928b63040dc5bc96bf38e76664ced3cc89025835850845d03386093705996dc757e6d46c02a7eda6425
-DIST kdepim-addons-19.12.1.tar.xz 2108956 BLAKE2B d8102d34099d5c3c32d6f2a3d2f2d3849e72868ae6218ea9df86465ce939bed908862928800fac370fda1c9e4dad0d00501e3c3928c81484b600822ca8bc0409 SHA512 fd354798426f763bd8a49081c896899f225add8c679813843c472be0a7cf39f4640ca71dfbf9cdeaaae7de41087c1970aa2d3dbc150ab902289cfcafe65965a6
+DIST kdepim-addons-19.12.2.tar.xz 2111224 BLAKE2B 4ecfc706c76b2a445b4054ee36854b3c4acb5fa11866a3cf839b7fe9a5961f4e22ed84418e7ca069b29c48474e311f996ab10e88cc77f333dd69d8d8936a4438 SHA512 4cfccc98cc05ff08e1a91f9bf8db0805f204e859d7568f45619a57a1f0fc20f50dcb54001efe7ad0bfe729771daa51cb0bb571258bd6d7783064aac8ab1be918
 EBUILD kdepim-addons-19.08.3.ebuild 2604 BLAKE2B 562ca0b7fc83f80191cc6fff399e5fb8d9bc08c738be470f2c957c954799a9f7f1250a74c3fce4a4de3f66df710811b799e6dbd4b9d7a9aa2d1c434671a4b8a1 SHA512 1d9b0c5988c3a41b18595bde9b9e6bbba8370f1c48dba18e0da3e3ca08e7b690f1c2cc7c6b302823fa986bfef2bd3dda208ea8d529999a74783eefbd8fc68103
-EBUILD kdepim-addons-19.12.1.ebuild 2715 BLAKE2B 9e58d91e2d4528a495ff5fa99c82fd490055190697954bdd6b110ad7cee4b699ee3d4caff304a663a7101bb8d50f0113f1628e5f1ffa573a74f3f2fced72c4aa SHA512 cf439afa6dffd0bcc616e50f8b83b11f410374059381f13a7bfbd6a7d86448efc0bdf1aa1d141abda192833cc98d65745c9abe4dda83407d41a3010ff01817a6
+EBUILD kdepim-addons-19.12.2.ebuild 2607 BLAKE2B 6e54046d7c6c8f0207e3a48a477d2bc5a3f53c419ed556739023895452955cd35136275a2138c6c64add7d46c2afc0d68c2065db0fb4f2731dd1813163f10bed SHA512 af7044be2455d78715b06897d1e2113c7c055222111f74a8bc32a33c74e2e644546f431c60fd97e70f225c5de02046852b15405c60de9cf195c70335f25db982
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.12.1.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.12.1.ebuild
deleted file mode 100644
index 6765c2b269a2..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-19.12.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_EXAMPLES="true"
-ECM_TEST="forceoptional-recursive"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="importwizard markdown"
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kitinerary-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
-	markdown? ( app-text/discount )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake_use_find_package importwizard KPimImportWizard)
-		$(cmake_use_find_package markdown Discount)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
-		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
-	fi
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.12.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.12.2.ebuild
new file mode 100644
index 000000000000..1433564fffdd
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.12.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_TEST="forceoptional-recursive"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="importwizard markdown"
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kitinerary-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpkpass-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/libktnef-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
+	markdown? ( app-text/discount )
+"
+DEPEND="${RDEPEND}
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package importwizard KPimImportWizard)
+		$(cmake_use_find_package markdown Discount)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ ${KDE_BUILD_TYPE} = live ]] && ! has_version "kde-misc/kregexpeditor" ; then
+		elog "${PN} Sieve editor plugin can make use of kde-misc/kregexpeditor if installed."
+	fi
+}
diff --git a/kde-apps/kdepim-apps-libs/Manifest b/kde-apps/kdepim-apps-libs/Manifest
index 94c78d5f16e2..48e629520f2b 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-apps-libs-19.08.3.tar.xz 82380 BLAKE2B c3ada3bc94a1a072b601206dd8e2227e62ced0b06065d0d2f81f70a5f5cb26de0249d09c97d73427d133bcdb0ee5e152d015ce7db5306a4e191053fc901fec4f SHA512 9abdb259134ab357c11f95923afe44f5a7508f7f1da61f8fd5101a49935612f20fc26237791abfe90d337c7ca7dfaab1774d16c1e0848faa6ae9c9faf29c425f
-DIST kdepim-apps-libs-19.12.1.tar.xz 82524 BLAKE2B 2a69cee334ba980bb07ec4aea3f9b357ba4064497428ef4b6584a0886a990dc5d42aa943b4a8878ac1d664f8477a193428ebdb0bbc05bf79d9e0fe4853592366 SHA512 85b41e469a3998a2a5c97af50e9eeddfa0b908265fa0a7b4a108a2af02ad7ac6801fff03ee4c2d53a15023aab7fceab166b53762f1b311eb66add01acbf35382
+DIST kdepim-apps-libs-19.12.2.tar.xz 83360 BLAKE2B 71415ee80444f431a43f2fa0633e9e9ea34474caefa822d6b78a7928e2b896b25f8934b4fe24a2b20948fd88066d149860801ad20f5948fcdea2e8e0d9cd1400 SHA512 82392930cd6e3a865b80b7932db3b5b1edcb2c16a45410151119d08a9c100b1111eeb7a249eb256bbdd7dbd990fcfcb7e411b417002de62182cd64d2a3e9ecca
 EBUILD kdepim-apps-libs-19.08.3.ebuild 1082 BLAKE2B f5728a9baf30ae09af7967d71a878d00f3a216b87049f64484d4bf7adfaeea02fa4cde651cce2bdae14aec56bc236d1ee2ab2ab2dc1a3072b0ff4b09b32cd741 SHA512 99187082cb6bc04a67acc6d842548d2ebd185f175abc52be917524d1e436afc4b4c655413feb5a3f7f9b74554754cc9ac5557a067ed192eeaf2d930c280d7447
-EBUILD kdepim-apps-libs-19.12.1.ebuild 1108 BLAKE2B dec65d0b77035bf3083a90f61e8c2fd84bf6a94697c5b6f1a67fa4c9659c80d36cc155a3fda64821e0225079d9d29cf405262f24b32f84b0b741f9f91591820f SHA512 e9c85785e2bda985e68491599191e450f8164d4b1f685b7222aa7f2b7be74df4b3e520ba20441b868bacdaeeb2b775c0bdacc2478bce87890ed2d727cf9794d0
+EBUILD kdepim-apps-libs-19.12.2.ebuild 1084 BLAKE2B a3a16590515b302fa2c349aafd965ca9a9d5941710e27f4a11568652e24b6cc3ded64901662e52ffc1e7a9002eef3a677799e77ab431eb732beb14a4307f38f8 SHA512 2ddff11b4738260b8464b4bab0dd6f66734dccdc7287b2fc79ef3114e4e96fe86eb6591139bc960b8ffcc2366f593a8e8b74db81ff0cc2e8d96d6b21604271ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.1.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.1.ebuild
deleted file mode 100644
index fc105390b176..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for KDE PIM applications"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.2.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.2.ebuild
new file mode 100644
index 000000000000..5e862ea9b1a1
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Libraries for KDE PIM applications"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index b1ede8fe8d8b..e9c1adfd1f4a 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdepim-meta-19.08.3.ebuild 2591 BLAKE2B 5495e8f39925cecec7a6e10a29b654f3f6ead65755d55a2fec5a047ccdb17deee42db80a29a9db4ed58357947ac25a453c868aa0b8c72af98278bad7d39b4d49 SHA512 27658705193ec557e6bbae15066b60ee8c43585e294b39f34d89100a5529dd05c6053004272df50ef420b0404cdd47575c5d84e8a8cbefc5f3620172376552c2
-EBUILD kdepim-meta-19.12.1.ebuild 2605 BLAKE2B 414e8b288d67c33b8e17749bc183e37f61e40577f726608fa33d6e3aac1593a121a4df71972fa146a72abb89dff93f1b36151135aa4cc8b8fd25b3aade7a307e SHA512 27c6940fa2c8c98f7012608f91de07273a3c25389689a0ab3786479793be058d2eeecdce9bcd6ecb7461834904b1977d240b73b192242c087490ce228c970c3b
+EBUILD kdepim-meta-19.12.2.ebuild 2580 BLAKE2B b11f6ba0e76919ca03e9224697f428dc3792287677d477dde9e16e7a3aa0854e1d05f861947997f3c342cea25f7c818e30281207f8c0226a1c602d76f19c3395 SHA512 40653cc35063917b4dea015ea8c1780276a691711cfd4d852fa7e1fe8ed02a56038dacefb61966e1eaf3ca73ed23449f06fe9554c9ebc7f6972ec459bf96722a
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.12.1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-19.12.1.ebuild
deleted file mode 100644
index c1cb82a90a14..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-19.12.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
-	>=kde-apps/akonadi-${PV}:${SLOT}
-	>=kde-apps/akonadiconsole-${PV}:${SLOT}
-	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
-	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
-	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
-	>=kde-apps/akonadi-mime-${PV}:${SLOT}
-	>=kde-apps/akonadi-notes-${PV}:${SLOT}
-	>=kde-apps/akonadi-search-${PV}:${SLOT}
-	>=kde-apps/akregator-${PV}:${SLOT}
-	>=kde-apps/calendarjanitor-${PV}:${SLOT}
-	>=kde-apps/calendarsupport-${PV}:${SLOT}
-	>=kde-apps/eventviews-${PV}:${SLOT}
-	>=kde-apps/grantlee-editor-${PV}:${SLOT}
-	>=kde-apps/grantleetheme-${PV}:${SLOT}
-	>=kde-apps/incidenceeditor-${PV}:${SLOT}
-	>=kde-apps/kaddressbook-${PV}:${SLOT}
-	>=kde-apps/kalarm-${PV}:${SLOT}
-	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kdepim-addons-${PV}:${SLOT}
-	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
-	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
-	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
-	>=kde-apps/kimap-${PV}:${SLOT}
-	>=kde-apps/kitinerary-${PV}:${SLOT}
-	>=kde-apps/kldap-${PV}:${SLOT}
-	>=kde-apps/kleopatra-${PV}:${SLOT}
-	>=kde-apps/kmail-${PV}:${SLOT}
-	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
-	>=kde-apps/kmailtransport-${PV}:${SLOT}
-	>=kde-apps/kmbox-${PV}:${SLOT}
-	>=kde-apps/kmime-${PV}:${SLOT}
-	>=kde-apps/knotes-${PV}:${SLOT}
-	>=kde-apps/konsolekalendar-${PV}:${SLOT}
-	>=kde-apps/kontact-${PV}:${SLOT}
-	>=kde-apps/kontactinterface-${PV}:${SLOT}
-	>=kde-apps/korganizer-${PV}:${SLOT}
-	>=kde-apps/kpimtextedit-${PV}:${SLOT}
-	>=kde-apps/kpkpass-${PV}:${SLOT}
-	>=kde-apps/ksmtp-${PV}:${SLOT}
-	>=kde-apps/libgravatar-${PV}:${SLOT}
-	>=kde-apps/libkdepim-${PV}:${SLOT}
-	>=kde-apps/libkgapi-${PV}:${SLOT}
-	>=kde-apps/libkleo-${PV}:${SLOT}
-	>=kde-apps/libksieve-${PV}:${SLOT}
-	>=kde-apps/libktnef-${PV}:${SLOT}
-	>=kde-apps/mailcommon-${PV}:${SLOT}
-	>=kde-apps/mailimporter-${PV}:${SLOT}
-	>=kde-apps/mbox-importer-${PV}:${SLOT}
-	>=kde-apps/messagelib-${PV}:${SLOT}
-	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
-	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
-	>=kde-apps/pimcommon-${PV}:${SLOT}
-	!kde-apps/kdepim-meta:4
-"
-# Optional runtime dependencies: kde-apps/kmail
-RDEPEND="${RDEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.12.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-19.12.2.ebuild
new file mode 100644
index 000000000000..490f98b87d38
--- /dev/null
+++ b/kde-apps/kdepim-meta/kdepim-meta-19.12.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="bogofilter clamav spamassassin"
+
+RDEPEND="
+	>=kde-apps/akonadi-${PV}:${SLOT}
+	>=kde-apps/akonadiconsole-${PV}:${SLOT}
+	>=kde-apps/akonadi-calendar-${PV}:${SLOT}
+	>=kde-apps/akonadi-contacts-${PV}:${SLOT}
+	>=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
+	>=kde-apps/akonadi-mime-${PV}:${SLOT}
+	>=kde-apps/akonadi-notes-${PV}:${SLOT}
+	>=kde-apps/akonadi-search-${PV}:${SLOT}
+	>=kde-apps/akregator-${PV}:${SLOT}
+	>=kde-apps/calendarjanitor-${PV}:${SLOT}
+	>=kde-apps/calendarsupport-${PV}:${SLOT}
+	>=kde-apps/eventviews-${PV}:${SLOT}
+	>=kde-apps/grantlee-editor-${PV}:${SLOT}
+	>=kde-apps/grantleetheme-${PV}:${SLOT}
+	>=kde-apps/incidenceeditor-${PV}:${SLOT}
+	>=kde-apps/kaddressbook-${PV}:${SLOT}
+	>=kde-apps/kalarm-${PV}:${SLOT}
+	>=kde-apps/kalarmcal-${PV}:${SLOT}
+	>=kde-apps/kcalutils-${PV}:${SLOT}
+	>=kde-apps/kdepim-addons-${PV}:${SLOT}
+	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
+	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
+	>=kde-apps/kidentitymanagement-${PV}:${SLOT}
+	>=kde-apps/kimap-${PV}:${SLOT}
+	>=kde-apps/kitinerary-${PV}:${SLOT}
+	>=kde-apps/kldap-${PV}:${SLOT}
+	>=kde-apps/kleopatra-${PV}:${SLOT}
+	>=kde-apps/kmail-${PV}:${SLOT}
+	>=kde-apps/kmail-account-wizard-${PV}:${SLOT}
+	>=kde-apps/kmailtransport-${PV}:${SLOT}
+	>=kde-apps/kmbox-${PV}:${SLOT}
+	>=kde-apps/kmime-${PV}:${SLOT}
+	>=kde-apps/knotes-${PV}:${SLOT}
+	>=kde-apps/konsolekalendar-${PV}:${SLOT}
+	>=kde-apps/kontact-${PV}:${SLOT}
+	>=kde-apps/kontactinterface-${PV}:${SLOT}
+	>=kde-apps/korganizer-${PV}:${SLOT}
+	>=kde-apps/kpimtextedit-${PV}:${SLOT}
+	>=kde-apps/kpkpass-${PV}:${SLOT}
+	>=kde-apps/ksmtp-${PV}:${SLOT}
+	>=kde-apps/libgravatar-${PV}:${SLOT}
+	>=kde-apps/libkdepim-${PV}:${SLOT}
+	>=kde-apps/libkgapi-${PV}:${SLOT}
+	>=kde-apps/libkleo-${PV}:${SLOT}
+	>=kde-apps/libksieve-${PV}:${SLOT}
+	>=kde-apps/libktnef-${PV}:${SLOT}
+	>=kde-apps/mailcommon-${PV}:${SLOT}
+	>=kde-apps/mailimporter-${PV}:${SLOT}
+	>=kde-apps/mbox-importer-${PV}:${SLOT}
+	>=kde-apps/messagelib-${PV}:${SLOT}
+	>=kde-apps/pim-data-exporter-${PV}:${SLOT}
+	>=kde-apps/pim-sieve-editor-${PV}:${SLOT}
+	>=kde-apps/pimcommon-${PV}:${SLOT}
+"
+# Optional runtime dependencies: kde-apps/kmail
+RDEPEND="${RDEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	clamav? ( app-antivirus/clamav )
+	spamassassin? ( mail-filter/spamassassin )
+"
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index f01f0f91ef97..6e3eb6213ef1 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-runtime-19.08.3.tar.xz 1733348 BLAKE2B 4c78c0e4e3fddbb9694fb877390a6f781e822b4152216946c86da01a29fd55ed06bddae5e159d1e0150ed5dff92a2061237c38616b087ebdbace3a7bad4c6433 SHA512 acdaca2111e2e9542a6c13dca6f43dda5a82f9c6a3905a2f3002c93abb6481e405b6f318c7a3424c2d8aa214b579894a31a3fe86703c479bdd38539f27579098
-DIST kdepim-runtime-19.12.1.tar.xz 1739128 BLAKE2B eac416a753180f474ece204126762a6d3c12bb6044cdd45ccdf8abea26df59dfa3b2ed484ecd57a3f23a32ee3f95a376a2bb5f868438e621b61cf706807938f4 SHA512 53a1de74083282ec1902d52981c61b29e79a33f989e3e05274ebde907c7fae8251bd495f85f7aa73c37f18ab0e92b8ebfb1b558ccd7c390eac46535042351602
+DIST kdepim-runtime-19.12.2.tar.xz 1737572 BLAKE2B 36510d6f16c829ff9b0cfe94b8f688e3ee3634c49fa6caf4d4ca5d4739674c963c6bd1c3b4bf0f44c2a2aaf61c3217e1d09a01792aa2923752548eb993d510f7 SHA512 474adfdd4ae3d0ef40c21198eed6a2afdc5687fa8292d27195b5f473f7841e1ea230150ff775bbab72ba5c62ee920f1ad8f73feb90b4c375056614bca0a92966
 EBUILD kdepim-runtime-19.08.3.ebuild 2552 BLAKE2B 1a5069076bd9d59b20ec8474ae7264d845aadbc89dc1522dcdee32f9e8016689f09878bc087f9543aabf2f445fab6e04c1a53ff46e8ce2464fda597bc09a43ee SHA512 2bbebfb99fee7f57ed961e799589747c5b83c6126271da3b4167f1688da520396826f02257767bd3a8f29db4ca05e0faffd5dbace5e59ec617feca082852afe3
-EBUILD kdepim-runtime-19.12.1.ebuild 2494 BLAKE2B 7ad66c5ae26e2be11f355b035f73ec63d84fe686c79486aa80670ba5259f3cb550bcc2deea8f7683ad8b3dc851be7ee6981f717436451598c8747bf47fdaf7ad SHA512 6a190e5daee858bb04b4591f9e079ad337b9abe1be6460bdc661e67c2313531633628a95c9499d882e3228faba33bec335987d1848903a1cc36484b82492aa30
+EBUILD kdepim-runtime-19.12.2.ebuild 2471 BLAKE2B 34ee8a348d6280469e3f21939146980ffa721af2402dd8efabd2915b6c73998fd36de87e178ca100121592c44d8bb10f767941b49b5745838eacff505a6413c7 SHA512 d8fb81bb6f1c6d664407391833f0339cfcdc190bbbc51b1a8877c439273ecbb79fb13d24e22c64859221c8fd9e328ac76bae7bac6623d635e7ac0459be63d71f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.1.ebuild
deleted file mode 100644
index 1c19038eda79..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# TODO kolab
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kdav-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-misc/akonadi-ews
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.2.ebuild
new file mode 100644
index 000000000000..666e59f09a8d
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# TODO kolab
+BDEPEND="
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/kalarmcal-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kdav-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmbox-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkgapi-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${QTMIN}:5
+	>=dev-qt/qtspeech-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-misc/akonadi-ews
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kdesdk-kioslaves/Manifest b/kde-apps/kdesdk-kioslaves/Manifest
index f44eedd69296..971da48598b8 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-kioslaves-19.08.3.tar.xz 37280 BLAKE2B eb5ab4a1d16e4f8a2b64712e2688563a9d33b9482c88f9d1e5e76c89c7d19957254acad205b706bc6576c7b20e384427bd9a6d6affb0b7efff7b86a29308731d SHA512 f3824c6c9b72e7b3eeb1ad049d04c1e1b05b1ba08ea11744983f884a0dc71ebe6efd93fabdd7236f0bdf71fcb2c98008c3d5a0c784a480c9b909389cc6a78dab
-DIST kdesdk-kioslaves-19.12.1.tar.xz 37300 BLAKE2B e458193e11ad44e60722ad873d0693dff28b1095363e5ace5a7f2e28311ae9a61f682e1f8ad7ae145ada40213f5c1380bdbfc341aa5b1ec3467f948fbaceacdf SHA512 1b9cdde4b863d6e0692ac4fbaf8d71604b37cbcd02ac2a1b686d9e281e07b84b13e82d57b4a4c1d33774bac735509d7c32e0fafde23ae2cdb7bea7bb259d45da
+DIST kdesdk-kioslaves-19.12.2.tar.xz 37436 BLAKE2B 9c3b867bd4f3ce11ad1870c1ee6abda643556396717e99e1acc2fa79771bb422390885d633a698950226385031251e1c1f4ad886922ff1a992e78618ae30b1d6 SHA512 7f386f15064c6fc126b2dbaea5b60478dac23585ee534439557a4dbd3f240e94101621ccdf08589c1ba991d5ddec959e35d869e97891ae2ee757fc0a3c3f0426
 EBUILD kdesdk-kioslaves-19.08.3.ebuild 421 BLAKE2B 3fea6cf9d082d055f6afff1657d1ff984f5c935c29b783b9df2bc1348472ac8fbd6639cf9723ba9b4e8c4f7b3743da699aac28ed68d3c47533ea685046280a4a SHA512 54765d54362851eb2bdb73111fcbf0a2a0c33a97f94743fd2c78ad3a83ec5f3e5931a01115be3f5c6aea3a4b629a2c7addab381ddf195832a0276a681284496e
-EBUILD kdesdk-kioslaves-19.12.1.ebuild 425 BLAKE2B c341ab00a1cfe0970f55d80999718d881f536b5bbfc93a54eeca18df61d21785096931a600363094d9c3aa853c91832967702a6371966a4bb628842bd6366917 SHA512 1f7c342adb26baf9625b892669a9bc475b386c842a23a413296fca28cc1d38ee5654a2731e3203b2f79349f65697627edb3a3ed1744f21838e1e911f809e134d
+EBUILD kdesdk-kioslaves-19.12.2.ebuild 425 BLAKE2B c341ab00a1cfe0970f55d80999718d881f536b5bbfc93a54eeca18df61d21785096931a600363094d9c3aa853c91832967702a6371966a4bb628842bd6366917 SHA512 1f7c342adb26baf9625b892669a9bc475b386c842a23a413296fca28cc1d38ee5654a2731e3203b2f79349f65697627edb3a3ed1744f21838e1e911f809e134d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.12.1.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.12.2.ebuild
index fc9a801a2975..fc9a801a2975 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.12.1.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.12.2.ebuild
diff --git a/kde-apps/kdesdk-meta/Manifest b/kde-apps/kdesdk-meta/Manifest
index 44151877a430..f1dd82a7d640 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdesdk-meta-19.08.3.ebuild 1141 BLAKE2B 5c205c2c799e90d66ecda901b913c7d2d72f77bde4d96968b243e4bfe3f1fc4272a7d6dbe0284920561572965e99399188f1cee551ece6516e83e72f84726332 SHA512 39fde328a2fc2c68db96c288e3d9bd5f6f2eabaa030388706dfd057898f0b41422d0bb9d97ca035d03cc7c522741706949f1b6e41026ab47a4c6d3a19cee9c32
-EBUILD kdesdk-meta-19.12.1.ebuild 1144 BLAKE2B e14079c31510c5ec765c9479976d8f2b3cb02efcc0b9d6d1bfdbfea4bd90e49da32e91579606cbea07615c7cb88ffc572dea277c4dca21756a16346d094a3931 SHA512 2ff5aff41f9fc219d7fa48862b395c543ba71ee04bbd14bb9f3bae5a0d41301487d2481e331f4fd1143594262f8ae02e145bc9e668e333542dfb771d0fe5fe24
+EBUILD kdesdk-meta-19.12.2.ebuild 1144 BLAKE2B e14079c31510c5ec765c9479976d8f2b3cb02efcc0b9d6d1bfdbfea4bd90e49da32e91579606cbea07615c7cb88ffc572dea277c4dca21756a16346d094a3931 SHA512 2ff5aff41f9fc219d7fa48862b395c543ba71ee04bbd14bb9f3bae5a0d41301487d2481e331f4fd1143594262f8ae02e145bc9e668e333542dfb771d0fe5fe24
 MISC metadata.xml 831 BLAKE2B 3ff18fb8e3bd5dc045b904b841e1ed10639381802d746be424ec00dc40e3119fb6f3c066f4706aede87b1e659f4978c6b5a573ead33851983db01cde8d54d566 SHA512 138c632546c3860be6daafdf94c969d2c55e837bb2da18c112d5835511018399ff180ef3417727264899fddbfc3291845420df37c60853a6c9d6b9db5b758349
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-19.12.1.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-19.12.2.ebuild
index 14fa9809f376..14fa9809f376 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-19.12.1.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-19.12.2.ebuild
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 425c07257318..914e20ac9d08 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdesdk-thumbnailers-19.08.3.tar.xz 17292 BLAKE2B bc634494bf28b4a1eb87d34e81207930707272db9ff621d66741130aadf2cdf101d6fe037b6564f5024121192b726dea50ecbbe24cee4b50adccc5e78c42e162 SHA512 ab0e4ad63783365b846e39dd0b0329bc6bd367e879c4847291b096d6f989d1b4fc43f7838d2357a33fd79284c44d76f4faefa0c7890a26317ad6420fafd16bd5
-DIST kdesdk-thumbnailers-19.12.1.tar.xz 17548 BLAKE2B 17f6ea1a7ab6b635c2520cdf3855634c49f05759350751f1f92c4aac218d66b860e016d9fde8bdeaf16737975dfa0eac7d8823b373cd7f6a3506c2e56a78c8f5 SHA512 52536db88e2b62d14d6bcf6e8bbc405b4bade4586e3cfdfb3bb9f8e72e6ae6d704dc610929bf207bda9c20adff557d5e5e4ae54c6398e53b48f843f6c4408652
+DIST kdesdk-thumbnailers-19.12.2.tar.xz 17532 BLAKE2B 488f48e459d9e1551e91945d8bfadfadaef389fafe916af1a56ab7b415a165511b82309da9f3628200b48f0272c4794e945a54405f1a07aa262aa66529f2237c SHA512 0fba03ee8b6339e224b9d470b1ec4cfd79a0d048e30d5e767e52b4347e456119045475c4fd80407f3c91184c45906862c57d30c70b905c05d33157d9cad57d3d
 EBUILD kdesdk-thumbnailers-19.08.3.ebuild 539 BLAKE2B 1536d5ad86a399458ecdd63f7fe3b66ee388b08a4075e69792c14f38d5a9bfaae419d31e760d0fbecdd17ff0a76bc5c1c7fd0cf333641ab8be5f548fa75edcd1 SHA512 6065f74a0f8f9217727835341f9dfc6914b08474b960eeb8ba1fe54f182cfc673e060db97f80edae1e4072fa51229854cea079e95387dafe45f46bb669aaeb6b
-EBUILD kdesdk-thumbnailers-19.12.1.ebuild 543 BLAKE2B 02d8acab33472af3a78dc8d87ccb533d35ea3c02ca46c21059e5f96e94d527084c8421b319a4a72d171160c36274c7481f52539809621d1cd79a314a0a703e98 SHA512 4b9151064f1b9d5446b523fe225e2a8d36281ae34205dc6ae1f86a5e986c63a6fb588244416e98a3e3b546ca0822424e6de60b1f1b593f9af410f03c3dcf34d6
+EBUILD kdesdk-thumbnailers-19.12.2.ebuild 543 BLAKE2B 02d8acab33472af3a78dc8d87ccb533d35ea3c02ca46c21059e5f96e94d527084c8421b319a4a72d171160c36274c7481f52539809621d1cd79a314a0a703e98 SHA512 4b9151064f1b9d5446b523fe225e2a8d36281ae34205dc6ae1f86a5e986c63a6fb588244416e98a3e3b546ca0822424e6de60b1f1b593f9af410f03c3dcf34d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.12.1.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.12.2.ebuild
index 878b9d346ade..878b9d346ade 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.12.1.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.12.2.ebuild
diff --git a/kde-apps/kdeutils-meta/Manifest b/kde-apps/kdeutils-meta/Manifest
index 07d93c0a4007..ce3f6943cb0b 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD kdeutils-meta-19.08.3.ebuild 1174 BLAKE2B e933463d023b96ccc32612b3615bb2ff7695ddde0a9e7d6df6e018aeb51a8dc763b9d127acc8d2ff5eac1bb0aeaad0621e27cc9e6b17c42acf47201639f1b4bf SHA512 44982f87763497f4e595fe4e1068091ed7bba45391c324b7b5b3b19ac20bd4de08ad2138d34e9d92911f12d7e1fc3c48f8b912a204fb91b86581e2d6c31ed07b
-EBUILD kdeutils-meta-19.12.1.ebuild 1210 BLAKE2B 76a51761fdee5d5a9f60834689b089263442f86e4433ece942649134d117547fb6041574b0b06f31775313e51a7506045dfbdee505ba21572efbe0b28ff1f7c9 SHA512 78093f5f528fd5cdb04cab578d69eb9e83f9a1f05bdbbb6cde73cd391b057906bd02fe9f29b261a762529408dfa27c907f8a6b4cb0cb141727fec483af0731fd
+EBUILD kdeutils-meta-19.12.2.ebuild 1210 BLAKE2B 76a51761fdee5d5a9f60834689b089263442f86e4433ece942649134d117547fb6041574b0b06f31775313e51a7506045dfbdee505ba21572efbe0b28ff1f7c9 SHA512 78093f5f528fd5cdb04cab578d69eb9e83f9a1f05bdbbb6cde73cd391b057906bd02fe9f29b261a762529408dfa27c907f8a6b4cb0cb141727fec483af0731fd
 MISC metadata.xml 1004 BLAKE2B f2fed1a10b7eb10ba9016b72fe9c4863e853882e6f66790ffe70e21aace4e10b0fc5c699559934121b071c2e260a83b19d50b5d14adc53dff25d933ea0e8eae6 SHA512 d8f248c827327c4c855cc1ba7c6c9d31578b4a89ecca6dbc0ffde3f2b73b10f66d9923a907dde88481ee933a6047fb18089341ef49b8146836a00cb341a23f7a
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-19.12.1.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-19.12.2.ebuild
index 7f7d9347c3da..7f7d9347c3da 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-19.12.1.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-19.12.2.ebuild
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 066218f47c7c..b3bafe251ea0 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
 DIST kdf-19.08.3.tar.xz 461848 BLAKE2B 896a0c7556a5dfc3ed69f7024dfe731d245d27c62cb674019992a7b517c953d7d728f984aad81eb857c42b97c3c4e823ac5635a7ac7300f7d07f9b7e8863aa69 SHA512 038db4143b5f657f5cc988bee40bfc6f66809abd535d944427b4fa042ade539125249c914ab08ed36569cbc72483dfcf95ff0949e385952af5ff58d5d3abd9ac
-DIST kdf-19.12.1.tar.xz 462236 BLAKE2B c42e672f61d80ffd07bb4f1f4b79cc65cc7deb14fbbd27c69a9e494652782ee3aed0befa20d51f13b9b30eedfc607f77fc6e7ac6609d9a4b561f3235ff71c37a SHA512 a6d3ca8dc81f03f5d27f0cb2f2896fd3bcdd573c7ddde42635f249cc9c9c122fef0e915c16294baffdad175d6d5487f851a12fda8c5b6f6595d71395c0dedd74
+DIST kdf-19.12.2.tar.xz 461856 BLAKE2B ff0ffe97aa5f5420f0898768d13668ef47bf132989bf349fe047f15c4d851c03564c310812656d3d21682c19b4be9ce5337d6547a47473189cb588666b329e83 SHA512 4700d172c3bd818ffcef3aab4383362b00051f6376fc6acc065242ea13bac437c3e7a78c941238985499d586cd7b0d36f8802edd60ac4e46d466600689f5d6fb
 EBUILD kdf-19.08.3.ebuild 877 BLAKE2B 741b7e211ea0a3e0db2e4ea50fe6c9ee4e3dd615126c1c2db4590974571b4aa34a69396f7864814db36567ca74888a0cab7da1ad31d34884a66825f64ce19d1b SHA512 f9729a2c42a32b864bcbf770d058b6ca7845da142f740d16f32e818f2e439eabd78c373101e08f4988ad7ba878c1d36efd86ab86f6e3caf4e64a938c3e2b7994
-EBUILD kdf-19.12.1.ebuild 936 BLAKE2B a097292f07967372a58da512c9061f038a22abbe334187d4b3c9c1e88e639df0ebb79e26d0bc280a520db38baada5108cb657622482fbaee867ff3d1832b5891 SHA512 5c7d2d084b620060e1858a0a7ec4d213c3cbd7f6c17386a5dead4d9bbb2245cc79d67325144ff0256da9c3a4715fbac5608e35e3a4d394406ed26125105d9c15
+EBUILD kdf-19.12.2.ebuild 936 BLAKE2B a097292f07967372a58da512c9061f038a22abbe334187d4b3c9c1e88e639df0ebb79e26d0bc280a520db38baada5108cb657622482fbaee867ff3d1832b5891 SHA512 5c7d2d084b620060e1858a0a7ec4d213c3cbd7f6c17386a5dead4d9bbb2245cc79d67325144ff0256da9c3a4715fbac5608e35e3a4d394406ed26125105d9c15
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-19.12.1.ebuild b/kde-apps/kdf/kdf-19.12.2.ebuild
index 224f9e68c0a0..224f9e68c0a0 100644
--- a/kde-apps/kdf/kdf-19.12.1.ebuild
+++ b/kde-apps/kdf/kdf-19.12.2.ebuild
diff --git a/kde-apps/kdialog/Manifest b/kde-apps/kdialog/Manifest
index 0b3a05c1b01b..698343a35bbf 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
 DIST kdialog-19.08.3.tar.xz 102480 BLAKE2B 8e948999fa3108cae254ed8c00c1ee68f97fb1aea59b2bf66e069068502f14157de95ea2ad66b8203010b3f1db095316393ab0ebdaef7c127e835d6f1ddc5ec2 SHA512 35690c7522bf96ee82081e7ed618205493efdbcd1b91c8a1ad975ec03f9d88b87f58b459f193892519b2deddcaf53d81dd36e271b25ecbbef01463fc51913cbe
-DIST kdialog-19.12.1.tar.xz 104168 BLAKE2B dc6a7ba3ef08bfd724ed57dd6a6638f7b277985ec7ccd58193e621e9a2af88c99a922b7395fcff7a0ab1c1ae35b8374543bba69e3f43046f6b47a90d5fe72375 SHA512 38fffa668d5370400ac27e5b9cc97cf6da94c052996600f2a8c03e1bd9ac91cc98118b9c7f96425db890926ce6a99bb17c2457175b1deee513a946c3ceb0a0cc
+DIST kdialog-19.12.2.tar.xz 103700 BLAKE2B 02e58cba6094f2e902325ddb4c282851d95a6feadc9cb4aee835ea1915e275c6ce4b3e08b39d620876493096cde991e54b6e8fbbf424139b16857ed91cde0fab SHA512 f6882dfdde9275930c289f920db46584aede465bc3a05edd4209de46428fd8e4762ad4d4f678606e4a17f5103ce693ad8f90e26363eab17c1cac1bb6c14c3950
 EBUILD kdialog-19.08.3.ebuild 987 BLAKE2B 0b7d3302d3d80d37f3da4b3a7dd214155bf4a00b7b9ef6f64257a4e97331f64f1b1d11b22db4086dd8a3a08a43bdb198ac2977e34886498a79fa58451a1c05c4 SHA512 8e7875429adb49848c12503bf454d5e15369a8dc6bac8b6ffbd2516382e5833e932d851f937e2d6896d3be0841596e649521bc597171693d902901a4ad60d760
-EBUILD kdialog-19.12.1.ebuild 1064 BLAKE2B 2e56562ae80d7b9df7cd51b7af69ae8f2fcb547902d677b02022a9c483bf65dfe9e85182da88c98a7d75aa18ee73d7eade1aedd51109b79efffa4893d9ced64d SHA512 95bb79e974c673df24ff3a78df70d35c9f8d04821d71a9420ab8029d2b2bfd25de39473d475e40140428c10401b678140438c92be21348d22d970720c1ef6376
+EBUILD kdialog-19.12.2.ebuild 1064 BLAKE2B 2e56562ae80d7b9df7cd51b7af69ae8f2fcb547902d677b02022a9c483bf65dfe9e85182da88c98a7d75aa18ee73d7eade1aedd51109b79efffa4893d9ced64d SHA512 95bb79e974c673df24ff3a78df70d35c9f8d04821d71a9420ab8029d2b2bfd25de39473d475e40140428c10401b678140438c92be21348d22d970720c1ef6376
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-19.12.1.ebuild b/kde-apps/kdialog/kdialog-19.12.2.ebuild
index 9c2a20a1aa06..9c2a20a1aa06 100644
--- a/kde-apps/kdialog/kdialog-19.12.1.ebuild
+++ b/kde-apps/kdialog/kdialog-19.12.2.ebuild
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index df94526a141a..79264fe3ba23 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,7 +1,7 @@
 AUX kdiamond-19.08.3-qt-5.14-1.patch 1202 BLAKE2B 68f49cd83d8b5a10621e4f39c41dd07650c826592d89c934d811e49115d5c52ab9b18a4c59ce140c8c10ece68df3f9b22b96501f38eb8f09dfbfd32f2cfe783b SHA512 65c5909419b30fbd38f676c0db31be527a4a43bb2a087f929e9d7c972d149ba9a9611c72661d6478c368308569cc2c7f70dde1f0604e33e4d9744e065e0e859a
 AUX kdiamond-19.08.3-qt-5.14-2.patch 787 BLAKE2B e39a46a097e40381cdf8bdc1035e2bdbf0b8910b247b0c4f69886073ea4da8b81743e8a9c7725191fa0c500b5c497468c808a3b4acd2c8c13348b14d40539eb5 SHA512 4d2c625eab936b09f5e93b392521eb4e93a6d2c0396a270ba41861b9729d3b96fee4bde356ec842cd49ecc2a2e0481e99b2060f660fe4e177d0d3c57ce37959f
 DIST kdiamond-19.08.3.tar.xz 4694440 BLAKE2B c5026fb0afbde5368cbc6efb658ab692e6e7d941bed40e10279f4027f335345838bc64d804cc2ac2c52b846380355ef069b817aaaa2b932cef7ea1fe227dc39b SHA512 68fd61fd0212a6605ac891b845b763f4fa9c1b6dae7906d67059d85d99fd7f3a4e30e2333e06dc7c1e4fb026f7ebab9d5cc951b5251e25381896cd52f9b7741d
-DIST kdiamond-19.12.1.tar.xz 4694472 BLAKE2B fefbd33d106e887087ec2637055764d49bf2ed1ff055c2aae5fc730ff6c8ec1020b1358e9dd614fb48aa5a61533d6cde252b8c7e37e2f1b46dc44d749c2df32c SHA512 bfdd172723a968b024e2f31e19d2f81bc51464dc4feb996284023809b3cb3160237f34e90318e71e766328a920e2fb781c80b9c43644c931b26781150bf75fa2
+DIST kdiamond-19.12.2.tar.xz 4694440 BLAKE2B 5ad158a177aae9d7a4a29f1971d740d868c0034f0188d3da6c8fd0884d632e3ddec9991fea411e213466e8605201fb5a728771d9e52569e6a75283f27a458671 SHA512 561245b56e66a9824bd75e7c7cab5b758b10a0c59da68dcaa053d7d7d0f0addd47352cd8ed31fb55ed272d2ccb476d228bab2bb391dac594db9a4a2147a1be37
 EBUILD kdiamond-19.08.3.ebuild 1012 BLAKE2B 55735ce242777e827a64178ca807231636d0fd2e3b310faf052327f62fb7bfb1ec2c15831204f534c57fa65a1b9f5a0693c5d3c506908929380877357316d1ee SHA512 27a70e84ae0a6bea56e69cb7b3a4efad13a34185d213302b10654d874bc83f61925172bf9a9f0e28d5a900ef95c46d57d24f15816e514049722fb1db20bd01a9
-EBUILD kdiamond-19.12.1.ebuild 971 BLAKE2B f82e9a7686d1fd870d10fc778948703fb8b1b994e7882a5ba7e35fb93e7ec17a9283840b0510d5c2a53e8e67b7c5b05cfe384971ee43987d7210100455938d24 SHA512 98b3813ee253f693db1fbf70d02c797dc788513fb20902940a0e7d18ae763f511d28a4b5530b3e27efb734195a0398581c8b561f7ac3ab781c3e65ca91a02bd3
+EBUILD kdiamond-19.12.2.ebuild 971 BLAKE2B f82e9a7686d1fd870d10fc778948703fb8b1b994e7882a5ba7e35fb93e7ec17a9283840b0510d5c2a53e8e67b7c5b05cfe384971ee43987d7210100455938d24 SHA512 98b3813ee253f693db1fbf70d02c797dc788513fb20902940a0e7d18ae763f511d28a4b5530b3e27efb734195a0398581c8b561f7ac3ab781c3e65ca91a02bd3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-19.12.1.ebuild b/kde-apps/kdiamond/kdiamond-19.12.2.ebuild
index f502a97a98a6..f502a97a98a6 100644
--- a/kde-apps/kdiamond/kdiamond-19.12.1.ebuild
+++ b/kde-apps/kdiamond/kdiamond-19.12.2.ebuild
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index d34b24dfccd3..351dd8eed9cd 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST keditbookmarks-19.08.3.tar.xz 187176 BLAKE2B 35872576bb07105f72474bb7e2a52b0bcb652e699ee4828a39747519720cb32b5d664f4ba9a8205085aa7f86928f258789f2ab5bf3ef7e10e44210d54e479632 SHA512 dfe6637232b33b01ca74626225c9040f462d4b8db59f10c97a505f3caa56cac07a7a63c154c3ba5be2832a1fa9be9080262773edd8b37469c92288b1a38a397c
-DIST keditbookmarks-19.12.1.tar.xz 187688 BLAKE2B f09bb4ae132bc686f8049c013828de37cb13493ae8a4779e238979ae36a69b5c5ed0614eee8af958ffab68a133494082ea0c1615e63655140152a927bffa38f5 SHA512 3782af35560cc824495c80a411cd26f6eb18737340f3bd5256f4ef43bc564c7d94c7881df35143c71205502694cf00e4447a2173d00f5e2f50e35e2e84e7e024
+DIST keditbookmarks-19.12.2.tar.xz 188168 BLAKE2B 81c457cbb6a9bc7882c1db151c0e684529310454f164e688a3520f6bbfd931284398474400100170c63ef6c394502e0b1014900cdccb673c12cd90c1483307bd SHA512 966d4d86a8329c58659230b5783441512dc06f98f2b76128a9e4c22aaafa22a5cb18a1ed6fa42de3e68a9e2af6ed49cfd7ae96bcce5c10ea6fd02892f714735b
 EBUILD keditbookmarks-19.08.3.ebuild 1153 BLAKE2B bff119eedab6c8fe5f60b439a79cbc7489675f467d9305d193d548e8a6fa5f258999c0438bb719e59a65160acac23d46921a2c8bcd5bec9fdd990c386d1e97c3 SHA512 1a6fd43c26b2a14332200b56fc10abedbc93e95fb7de20e16c018b3007750bd88434653374f23979e607c842cb0b12e0620312497893067cc50829ba74aeabc1
-EBUILD keditbookmarks-19.12.1.ebuild 1164 BLAKE2B 89a216058b359686da0bf1e75bf578712758c10b0a87b9570fae408dce7efaf797a66a24f249b4fe5426176069f08c1a242b9382dabb883ea4c39d889ebdd73b SHA512 13e340a48a025b2ac63399514ff6dfdcece72cd137d9bafbe6e80714070f3805b15f8e94cdbedae31dfbc6c485e16f25259c722586e1af79894f457c4290170c
+EBUILD keditbookmarks-19.12.2.ebuild 1164 BLAKE2B 89a216058b359686da0bf1e75bf578712758c10b0a87b9570fae408dce7efaf797a66a24f249b4fe5426176069f08c1a242b9382dabb883ea4c39d889ebdd73b SHA512 13e340a48a025b2ac63399514ff6dfdcece72cd137d9bafbe6e80714070f3805b15f8e94cdbedae31dfbc6c485e16f25259c722586e1af79894f457c4290170c
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-19.12.1.ebuild b/kde-apps/keditbookmarks/keditbookmarks-19.12.2.ebuild
index 283a74d6aac7..283a74d6aac7 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-19.12.1.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-19.12.2.ebuild
diff --git a/kde-apps/kfind/Manifest b/kde-apps/kfind/Manifest
index 46d0f5629f46..97ce2bf314c9 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
 DIST kfind-19.08.3.tar.xz 269316 BLAKE2B f1c8b7a93085945ce746b3d7eabb687fc7eb625c74bca2f8fc02bdce5dc2ec38e105d87f4632767a4faf9be9afde161969671d2cc6080ea6fa4e89fb8ad3dadd SHA512 d78f00640b40f7143299f3aeef9c16eaca30893daab4d5153c6e3fd2683383e79c2c992cfdc0fc1311386757524dc7e7896341d8b2c1869f5e03321b5f66432b
-DIST kfind-19.12.1.tar.xz 270840 BLAKE2B ad3cb3a3645d41ff24d10a56de44dee4c57207eb0f0fd1dd79fa98935cd2fe333ee4b821a1d45e6879241fa789738a9a9e88c594e73e7daa683a3d675c64f777 SHA512 89410d3008beea2af2ddcc19eb4c891d17eeb0089b600cdfdf2fcc9894cec5da10aacdae7b7248dd2dac61e9fbb851d8a094d87cde35fbedc80347e251f05d07
+DIST kfind-19.12.2.tar.xz 270752 BLAKE2B ba974d8c6be4be05a86fc729447fdaf4501b639ac194c5d7a30c2f6f5c5437d5a434a25811b5d02e59e52c0de48df8899920672445dbed703bde89902428f4e9 SHA512 9f70eafa8e913196df3e04809ce1814fd61be012e73492e2fae2271fd8902321b725c1a60d05ede7229c5b9ac5e737a1fe800986cbdd5e7d6205aec8269c8a49
 EBUILD kfind-19.08.3.ebuild 976 BLAKE2B 0d36893aaccb37b5e3d1704fb652a6596c9515e33afcb3b564ab52ac59fa4f8f92f32a9b38a5e5913927bc40f65b3d5723a1736466abeadccb9e56d92590c966 SHA512 68d28e6f489c5eb337a01e36f67e4c40822ac3fbf05f5d4cc2c0d7de8ec5f88461b3e0a3f6a02c45d1d392f4ed4e31d318f9d4f88f05f7ae2e344a3437a56716
-EBUILD kfind-19.12.1.ebuild 994 BLAKE2B f84479ed27570a2181b7e056aba43bedeb8a24838c4a56707f63d1ef95141f2fa09ed0319da1b8c2a4ba48334b8d88a0b9f7292eeb7068be6e1e14d5a0eacee3 SHA512 229abaac76b47461a3b171dedaa0972aa72eaa77f0925e1b73bf92de312afefd364fa948772075920789601d5c23e3dcb166c526dbaf5c57060a4c2ff2f7d924
+EBUILD kfind-19.12.2.ebuild 994 BLAKE2B f84479ed27570a2181b7e056aba43bedeb8a24838c4a56707f63d1ef95141f2fa09ed0319da1b8c2a4ba48334b8d88a0b9f7292eeb7068be6e1e14d5a0eacee3 SHA512 229abaac76b47461a3b171dedaa0972aa72eaa77f0925e1b73bf92de312afefd364fa948772075920789601d5c23e3dcb166c526dbaf5c57060a4c2ff2f7d924
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-19.12.1.ebuild b/kde-apps/kfind/kfind-19.12.2.ebuild
index d77645c1d763..d77645c1d763 100644
--- a/kde-apps/kfind/kfind-19.12.1.ebuild
+++ b/kde-apps/kfind/kfind-19.12.2.ebuild
diff --git a/kde-apps/kfloppy/Manifest b/kde-apps/kfloppy/Manifest
index 21f2ca026cbf..df7f856e0879 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
 DIST kfloppy-19.08.3.tar.xz 198760 BLAKE2B 42f547306ff27bdfa57825812a9a286cdbe786451b7703bcf275ce0827240e3aea5ad734b44cab4d5bcbbd415299cdcec31afe660926182ef0ac53db08d1c1fe SHA512 533542c053b3128059188599cd024ed328a72286919efc7786d4c95fb08c602a966a7497788d046d4daa92473c06c001af6740fd1c00ed7aa10860ac1083c335
-DIST kfloppy-19.12.1.tar.xz 199648 BLAKE2B 9c08df923469f991dd10234cfc9da6d6d360ae029390b6325a7a444d634733075301e1eed6d4be6b709b400e6973d0c3de3b3d26c917399ba2437577ad322d9b SHA512 21fadc6e11a97e317d57c866de9e4bcae1d6f52f468178801c5e2d856894659ec9ecb121cb434f7f0d0e0b051cfc7e3cc48b62b65d1131138ac194864426bc87
+DIST kfloppy-19.12.2.tar.xz 199624 BLAKE2B ed648e246632e435ac931a35ca5ed8905f16d32e0ea7322f6be2e00d0a4779b6e28ff7c339a0ddb6792c7c1f5d499560d49bce2d58252b057ccf38be7dfd815d SHA512 242dcb496fb0425a3eb1fd5e2f6c59411e00a0be8a6caddba1fad38a6650cc5411c8694fb75b692317e9cfbe49841d370337922a4904c8341e4766a2c347ce8f
 EBUILD kfloppy-19.08.3.ebuild 886 BLAKE2B fa19dcfe18c6470ac26fd6a06dfdd6341b2643aa35a66625bc0e4a9628306e04cae57952912a3a4ae86eba69560c78f66780d477697524a42e5901537e16c4b4 SHA512 242a8a923c673d89521d8a1a4b2c50f1f780726fbdbad1042c41b8251c7c52438dfd23044e1a4ba32ceba4bf828779e21634c6c6c6ccfbbda3b7696204129215
-EBUILD kfloppy-19.12.1.ebuild 899 BLAKE2B 3e2588f4bfdc845da5cfe34c263ec8358d33fc99def0fe9975e47ecf8c0b7c6f5478216ca49d202b5c3a2417b7450b29928c6fabf0a89dfe6b594003b9ad9b08 SHA512 df33478a1e9471c17e516af60d663fb1be402725b4626cda7fc9003b275b61b74b4774aed3bae4f98581c68f36a9d964297e224b8927662cc47f4e62dd5e703a
+EBUILD kfloppy-19.12.2.ebuild 899 BLAKE2B 3e2588f4bfdc845da5cfe34c263ec8358d33fc99def0fe9975e47ecf8c0b7c6f5478216ca49d202b5c3a2417b7450b29928c6fabf0a89dfe6b594003b9ad9b08 SHA512 df33478a1e9471c17e516af60d663fb1be402725b4626cda7fc9003b275b61b74b4774aed3bae4f98581c68f36a9d964297e224b8927662cc47f4e62dd5e703a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-19.12.1.ebuild b/kde-apps/kfloppy/kfloppy-19.12.2.ebuild
index d4e6a5f4aff6..d4e6a5f4aff6 100644
--- a/kde-apps/kfloppy/kfloppy-19.12.1.ebuild
+++ b/kde-apps/kfloppy/kfloppy-19.12.2.ebuild
diff --git a/kde-apps/kfourinline/Manifest b/kde-apps/kfourinline/Manifest
index 9927c105949d..7841df04871d 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
 DIST kfourinline-19.08.3.tar.xz 638368 BLAKE2B 14b43f85698df427adb536b2f0d6278cba6fe2701c87973dc4e20682211f5b3e51c09a18a104a1740d537d3604b5296ae28dea97d9bea79ccdd4a48350d4284b SHA512 c500ba027bc0e773f4ef35cce8d7c9124ef4cc7a9cdf942e236483f37215085e120634895fdf6e958934d69535497952cfb001f3331a6e90bbdd57f823c17ce7
-DIST kfourinline-19.12.1.tar.xz 638532 BLAKE2B d648413b65dedafcb1fc5a7246597d683d3fa31bdffb12b67c639a9a831b028cc9d5719d1ee13e1941354cbf256e043ccd6ff8c514f36d1950f1247e675fb1cf SHA512 a6b4025e3aa04ffe4f456cab4ca875041d0b71bbe5f41c997383e3b4e4032bebaeb29741f974c980fd17235336c48907b79f9f94f631b0ffe155b2c3886dd618
+DIST kfourinline-19.12.2.tar.xz 638824 BLAKE2B e101f96871cb8178619ff375872b492bba97a20894cf7e907091bdcf425af934fd380503672920fe525dbe4e009f952885ef8d044adf644675c152a604fd988f SHA512 995d6f95df5bd624bb6146a441cefb16a70872ab621c0aa2d3aaf56265859d531fa38cdec579650aced13f037499392b1a966d84c148e3db75632507741c8709
 EBUILD kfourinline-19.08.3.ebuild 890 BLAKE2B e3ba5efbfeee3821da3e3252c72d78070b5dfda7eb1c97ecdba89699bc374ee21398b8754495e44edc51fecb995de39836d7c22733ada158ad67b5a8ed8a4df9 SHA512 83a69b694b976340ec8c62ec63d111e15845d55d973844a523849b64786e0215d2c32d7d5e818e06a6ab681c39caeea82c3625cfdfa6b7152dce86b333859359
-EBUILD kfourinline-19.12.1.ebuild 901 BLAKE2B b105480e46d9e30309ee1776afcb47698a9af7069b7322765687d00333f15c002913b5d22d79bb5fc5d3ed7bd3966f198e34296911eade5dd6d9a3941f493ec4 SHA512 314a652a7deb480db07de8ce89765675fbda66f5e3e457fa0b23ecf89bc7eacc0a1d9a816ef006b6a5a9c81a7bfdc7a3938613ffa1d8eda6602a2db88fd44ed3
+EBUILD kfourinline-19.12.2.ebuild 901 BLAKE2B b105480e46d9e30309ee1776afcb47698a9af7069b7322765687d00333f15c002913b5d22d79bb5fc5d3ed7bd3966f198e34296911eade5dd6d9a3941f493ec4 SHA512 314a652a7deb480db07de8ce89765675fbda66f5e3e457fa0b23ecf89bc7eacc0a1d9a816ef006b6a5a9c81a7bfdc7a3938613ffa1d8eda6602a2db88fd44ed3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-19.12.1.ebuild b/kde-apps/kfourinline/kfourinline-19.12.2.ebuild
index 0cce147d6b77..0cce147d6b77 100644
--- a/kde-apps/kfourinline/kfourinline-19.12.1.ebuild
+++ b/kde-apps/kfourinline/kfourinline-19.12.2.ebuild
diff --git a/kde-apps/kgeography/Manifest b/kde-apps/kgeography/Manifest
index 59508c3ee12a..2d9c918d3838 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
 DIST kgeography-19.08.3.tar.xz 10888780 BLAKE2B 9ed7ceb67b86186fe7afef7f5d23789e9e5ffc31c4fd85fd6402fcade31752fd4a15fe7936f364d7a3dca3e68b45fb123c1dc9392fdcfc32d273f7ba59e5247a SHA512 d975bcce54dcae7a8d6ae28865b4a0a195163bfbef3741636e8cac547962013d7a9b58fa20ae3ec0b3b59d1c9370a350bf2f1d75733e53e18357b1e81f07c4cf
-DIST kgeography-19.12.1.tar.xz 10913756 BLAKE2B 97901622452f508a3a2d5de0fdfb6cb9b9d21cbb2f701cce79e9a28272d3880c28f0df1cd8c681648d94aaa61ee6471e81ce7a028d53233529123fe7d7dae3f3 SHA512 068206c3bc2fb498e8470019b376074c1b19bf7ca1326fd1230f7cadf426800729ed5b1e67395ecad363d7d9996d1498ab013f9b2070d614419688cece2ef1fb
+DIST kgeography-19.12.2.tar.xz 10855660 BLAKE2B 17ece77a2e8dc5bb85d397e635ffb1415ffc9a4160fca76e460b7cbd3b57caf71eafc5e285e8e43cac7e4c13dd2b1645e6ac31cd42eb0ed50411b42adbfe7363 SHA512 14bb57a581df72ad320bddad39d4c65282f850b48dcba6cac5fcbb6c6dcd142bde05ad90cb1d5074388b79a4cb9224052b1ea1f57a4a9eec5f39fe68a383ca08
 EBUILD kgeography-19.08.3.ebuild 890 BLAKE2B d9187861bfb424a1d164741846251c1a2f89582bad5819cc2402fd718af3acb38c47ede95caf11a1a3e9ead2243eee29f391cb6c8e2d8230d268c3d45628aac0 SHA512 db28eacd6b9e64b7471f578284a43d6366a5f11c9b58e12100f4931283ede25bb94ebe47487db114469d665b113a0ff05be2c4ca167c2e665aefac8e90e10073
-EBUILD kgeography-19.12.1.ebuild 846 BLAKE2B 447f7014145c52467ca5141360406c1778a06ae11f4096989c942e9427331a8922c3e9d5054d542bf8d2813a1ba0abbaa491cdd63ef1350eb9c309cf57135784 SHA512 6ad71c475b67fbbec3db7e5b642c841edc9b07f116af99a67857d11c8acc5019a1096458b391657982025a2da855a9837f4b3adc20b1705633f6492bcd0cc00f
+EBUILD kgeography-19.12.2.ebuild 846 BLAKE2B 447f7014145c52467ca5141360406c1778a06ae11f4096989c942e9427331a8922c3e9d5054d542bf8d2813a1ba0abbaa491cdd63ef1350eb9c309cf57135784 SHA512 6ad71c475b67fbbec3db7e5b642c841edc9b07f116af99a67857d11c8acc5019a1096458b391657982025a2da855a9837f4b3adc20b1705633f6492bcd0cc00f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-19.12.1.ebuild b/kde-apps/kgeography/kgeography-19.12.2.ebuild
index 2ab9e3c42b9e..2ab9e3c42b9e 100644
--- a/kde-apps/kgeography/kgeography-19.12.1.ebuild
+++ b/kde-apps/kgeography/kgeography-19.12.2.ebuild
diff --git a/kde-apps/kget/Manifest b/kde-apps/kget/Manifest
index 6948b5b5fe4e..7e7fbeb8163a 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
 DIST kget-19.08.3.tar.xz 5232796 BLAKE2B 017d1c8f2afadad476dc09751c69d5611c736584ee0a502be01c21ac60ca2bade31274565b4fed2206733952142ee23b090d8ec42a7f81e9461bc5411b1800f7 SHA512 436139a56f7c7eaaf3983693f455a172d558e7706e5212c9396fd0bde122f7fb3665689b6b81aa8098a20c228d7e9eea8a309c84ab70b325947b2cc11b4718a0
-DIST kget-19.12.1.tar.xz 5239972 BLAKE2B d3e9d94c83a589b7fe2de727bdd1cc4151aa8b55c4dd7bfdb8a04a2c2a4e58b432b56989c4e6abb76020f209d8ed3ca31f19ba201165c471cec87fc222a5ae08 SHA512 3a0e5a26a7726ac1b07a181e3aecd46bd9489d8230419e10b3104bf4d70031b9936f7589f6b60753b19634fdb096318ee71889b6bc3a031ace919d1b11fc20ed
+DIST kget-19.12.2.tar.xz 5239916 BLAKE2B a2ee42bd48ebd88f7a4af2e2ca01b3e488d1bbf3993cb05a6fe7733e67b656edf4fc7c2254131479bf50362e252fddcfcffa3dfc7d9962a11d545f895244ddd9 SHA512 ebb848755e2d0dbc862e59c4b2f64225a2f25b99ff06a144c7883c13692d8fc663e8633be35a87b2868e9c0b382420bc040f102641f2e945bdf84c781af4a75b
 EBUILD kget-19.08.3.ebuild 1989 BLAKE2B 8479f8cf31099cd80d2e3985452d0c3138a2e4a37ef09b347bd0c99f2c388aa32581eca1641c91fc570dd382575eb1b8251e99f2312f8db707dd7e0aaee5c2ec SHA512 709758bf64922c119e676ff01957ff773c32aee883172bed77828a9c494dd7ad30db7af5c0c6a9ce18d638906c1352e82f4ae25f59e8995068c7b15f56582eff
-EBUILD kget-19.12.1.ebuild 2000 BLAKE2B 39432af3ef4c75fcbf982518bca24d3c39e19f3148c252fd2498e791ae58c66fe885a2dd3ecaebd0a8c17357348f4f5d74b5a5c585d4df95d5aaa9a32259e67a SHA512 03e90dc080a3eb281d411e55a3d62ea6eb43d593678e5d330f91592bfad1cf4978f32c90a015e2e2324a1e30527e73662accf3d881ab4babd25589b7c6b819a4
+EBUILD kget-19.12.2.ebuild 2000 BLAKE2B 39432af3ef4c75fcbf982518bca24d3c39e19f3148c252fd2498e791ae58c66fe885a2dd3ecaebd0a8c17357348f4f5d74b5a5c585d4df95d5aaa9a32259e67a SHA512 03e90dc080a3eb281d411e55a3d62ea6eb43d593678e5d330f91592bfad1cf4978f32c90a015e2e2324a1e30527e73662accf3d881ab4babd25589b7c6b819a4
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-19.12.1.ebuild b/kde-apps/kget/kget-19.12.2.ebuild
index b4a90c0057a4..b4a90c0057a4 100644
--- a/kde-apps/kget/kget-19.12.1.ebuild
+++ b/kde-apps/kget/kget-19.12.2.ebuild
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index 7d4ca4c26ab9..6d97c2c38d47 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
 DIST kgoldrunner-19.08.3.tar.xz 4435920 BLAKE2B 2d95f14f41958c4650d59e45b3193b5de4178fce3f3b6ab37bfccd55ebd781c9f2c478e1fee5e381179b3e20fe86b26d49137087b57c976877a4b8e496cde1c1 SHA512 2a9b6b288766e0f2f952df47b0ec5cc58b92c1a96ce2d11a5e74c82f74cb695a5629fa863cdaf5570d4fbf15472ba3100f916a82636f1ffde31b20e1b6a6daed
-DIST kgoldrunner-19.12.1.tar.xz 4430896 BLAKE2B 472dee6dd1ec901a38fe5ae1270018b10ec74f1158bc478cd700037168d56a5e60b5cd592f6aea21d46cdde1a662502ef06aac514938083a8783d36bff38927b SHA512 514d4f015660f000b46aeb19f2f9a3c3315ba78c0603f9022afeb94af8f4e233b235c5c64c12082aadad9af24ba1d4410433e74b29b375380e7bfb3bfb56f405
+DIST kgoldrunner-19.12.2.tar.xz 4435576 BLAKE2B 37ca4287a0b20ad765924db88af5680f82af26e12da19263d8aec43d9334b946ca2f9967e411ba17fa4ee949592ba65edc75c1f370db9b733fb2bb1af4fe2c66 SHA512 fca33bc0373a3994f7130bec67ccf2ff2b309844cec07e2249c000cf2e0979694da386182861193dc0b2028801b72cc50d2d82b74c14f8a13807ea1e982d4625
 EBUILD kgoldrunner-19.08.3.ebuild 1016 BLAKE2B 6698004c8dc1ed57a05b1fbc91d7b201dc39a041128ac10cb955476f6d8ce30d518d318d942755b2c1a90aaaf39491ef19db6f3dff336589d296bf5fae982fba SHA512 4e0ceb36326ae156381c27464af8cddbdba382952d31f4321463d5cb467c5bf23e1ba175843a004d24da40e6c8d94d7de3cacf767ebe56c62e185fa74d3ceddb
-EBUILD kgoldrunner-19.12.1.ebuild 1027 BLAKE2B f8124ec174e9a4bfec113621481e92c983f06603bbcd0c93e76aee6c2879e70c8f4040ad2a75f7aa6cd885c055e18a40fc7588a53c9b624917395060891f2938 SHA512 c29ef4b42cea612d4d1e2df59f7f2bfceb16f2639b3f707153ead8afc974567fd1c0d9358e01a0468c40c3c990beb82376f4c6b2062842554bd23edb41ebe0a6
+EBUILD kgoldrunner-19.12.2.ebuild 1027 BLAKE2B f8124ec174e9a4bfec113621481e92c983f06603bbcd0c93e76aee6c2879e70c8f4040ad2a75f7aa6cd885c055e18a40fc7588a53c9b624917395060891f2938 SHA512 c29ef4b42cea612d4d1e2df59f7f2bfceb16f2639b3f707153ead8afc974567fd1c0d9358e01a0468c40c3c990beb82376f4c6b2062842554bd23edb41ebe0a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-19.12.1.ebuild b/kde-apps/kgoldrunner/kgoldrunner-19.12.2.ebuild
index 42a344e7e27a..42a344e7e27a 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-19.12.1.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-19.12.2.ebuild
diff --git a/kde-apps/kgpg/Manifest b/kde-apps/kgpg/Manifest
index 2180a47ab07b..52a959756e3c 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
 DIST kgpg-19.08.3.tar.xz 2786856 BLAKE2B 38efb63afabb7f757fb76daab61ffff97e7e3a419bb2fa79d779f82d338be8a52eabdcc15da718347ae8a55fbab639f0d2814d4ec38593e830a763013c3449fd SHA512 fc4aa8bd94ed1e11790828a0a38f03bb36b3b866d7702a92dbf6a02fab87beb48997eac1e077d462456aae23182cc792a383b37695b3e6cec16760db494352db
-DIST kgpg-19.12.1.tar.xz 2789500 BLAKE2B 9ff50dfc208fc1d550d2ff48a4e670284ddb85282963797ce59a2043dd70027ec86a3d27024c1f5768fd76be0b605537177c74e648faf68158850f2167ff4728 SHA512 5c5e191bbdbfbf3c4c65334e8c532953049f91eec5df16978fac89d0be6d00432f9e0a14acc85a314aab23da5f647bacae78f38e50be6ef07ed6621d26bf01e7
+DIST kgpg-19.12.2.tar.xz 2790000 BLAKE2B 875415aeddb738c38c32489461db0d65faccca4ed11d2f9e6af9c60070aa8853c7a95b7abcb1391a5fd35f9d6aea161971c6ff556835b8c53ac92798fc389ee4 SHA512 8a1593196c031359d44d4d445aa84a46046dd7abf093bc4d24fa08ab21309a159c4f760a1d22e8362eecbfac6f250dee623a534a084e557b5b677d3f52d59a7c
 EBUILD kgpg-19.08.3.ebuild 1515 BLAKE2B 7e3209d90511f5571703b430037f19da05d8d6670e82359ee77a6bcf88b7f01e8cdf5acc3c6cce8a53e23c946899fb63357b1c99a815ea9219804c212098daa2 SHA512 086e4b2245064b98652d7a0ccdbb9dd67df01e32ae7c0e013f0d68cd048962edd3ed7590cea9ca46873337fc2c318583d277adc5c2f0242dd314c903ac9018a9
-EBUILD kgpg-19.12.1.ebuild 1534 BLAKE2B 072a58454215c6d4ec59ca613f333eef520b7c10b4cc510c0be4a3000cf37295f52b45f3147031b58cc8f695e70cdea1fe74be0dd9ae3d35f4b1852fd4da43ff SHA512 e82296f2594a8def01932666d46e0d470ccab4a13f89069c893d02d41e07f7e483a4a4476f87bdd4863b0c2fca37fa562e4e37d6de0d79b1cb67e8b6921d33d6
+EBUILD kgpg-19.12.2.ebuild 1534 BLAKE2B 072a58454215c6d4ec59ca613f333eef520b7c10b4cc510c0be4a3000cf37295f52b45f3147031b58cc8f695e70cdea1fe74be0dd9ae3d35f4b1852fd4da43ff SHA512 e82296f2594a8def01932666d46e0d470ccab4a13f89069c893d02d41e07f7e483a4a4476f87bdd4863b0c2fca37fa562e4e37d6de0d79b1cb67e8b6921d33d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-19.12.1.ebuild b/kde-apps/kgpg/kgpg-19.12.2.ebuild
index b6aed3813040..b6aed3813040 100644
--- a/kde-apps/kgpg/kgpg-19.12.1.ebuild
+++ b/kde-apps/kgpg/kgpg-19.12.2.ebuild
diff --git a/kde-apps/khangman/Manifest b/kde-apps/khangman/Manifest
index d4a5fcc73ff4..8a133bfdd608 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
 DIST khangman-19.08.3.tar.xz 7116224 BLAKE2B 60d777b920139a40674a53c0c8c8bc368bb600d7a5b005d38e8c35e5087592013dac0e4bcbe71c0221c3671a0a8c194be3e5ce55e9213cd3092e19d094913841 SHA512 c2b389caf6858205de6a30f77c7423e9cc7da59bac20ae0dbc8efe267363ba9e522ed3f985ac78e818d68e18f19a9920419bfdb059acc77de93fa7139777ec1e
-DIST khangman-19.12.1.tar.xz 7113736 BLAKE2B cd909bbdd64979c5ef75d33d3a1be3d3ef8b2202140fcae42adc0bcc4582d09509acd03cc506e8660de7b9d140786a4b4a3fcf17b1daec7ba560eb3bd5e165f8 SHA512 f83b2d7d0f402a6971b0790313dd88e682ac76a11e55d01048f4834228c6131ad62aabcf0e06a7b5f9ed9fd9c7f7e8acfeb5b1a0fd262655ea88f02221760235
+DIST khangman-19.12.2.tar.xz 7122496 BLAKE2B bfa3015bed46668d116473cb27ffa2e73adf2eeb94482f19f082c08be69bdcd81b207b90229d6bc132146e631401eb40af02e1288caa4ddc6c1610fd8b79fd07 SHA512 9c884cadd9cd0a7393c3be98ab8dc44d85690fcf65041ebbe81c0d87dc1e5aa11f965ee283da260400a1122adb6e1740366a5235d0c38276a8222790c4d10d3c
 EBUILD khangman-19.08.3.ebuild 1252 BLAKE2B 42965df5a89a25df3ce7c4fff2039d90056c3474d11fc673962f34b1d21951f27596189fdc62712dbee960604bf044aabc93d7e45ce5e55e9959885b2c52a9ca SHA512 65c1d07db7de47042ab9a38de06b36e1d1c9dd389b2c41317f945e974524065a3364f2cc1147b274170b647314bb2f2151c232a7456e6d927826aae704623b0c
-EBUILD khangman-19.12.1.ebuild 1264 BLAKE2B f5605084775a5e691f805997d3e8590662fc6766dea54916c96de497b5c27285b37df854021a85ebc7d899c5ebb7852f84e018a53b60b12aa89357bd9adea770 SHA512 6e197677b271dbfaae3c5dc266d60c10e254c7ddec2c4e72f22df2dfeb9d72c00aa058caf7d6425dce41fd9e6f4d12352614e37252ff69cc6b147f5b3c86f2de
+EBUILD khangman-19.12.2.ebuild 1264 BLAKE2B f5605084775a5e691f805997d3e8590662fc6766dea54916c96de497b5c27285b37df854021a85ebc7d899c5ebb7852f84e018a53b60b12aa89357bd9adea770 SHA512 6e197677b271dbfaae3c5dc266d60c10e254c7ddec2c4e72f22df2dfeb9d72c00aa058caf7d6425dce41fd9e6f4d12352614e37252ff69cc6b147f5b3c86f2de
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-19.12.1.ebuild b/kde-apps/khangman/khangman-19.12.2.ebuild
index 612726616af1..612726616af1 100644
--- a/kde-apps/khangman/khangman-19.12.1.ebuild
+++ b/kde-apps/khangman/khangman-19.12.2.ebuild
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index 25054bd9efde..8524d889e3a0 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-19.08.3.tar.xz 3846196 BLAKE2B e7907395c74047e2f0426b72e65bb3d82fdde551363640eb281f281ed11e59d5cf8781c4c9b139084cb1896c9747dc52c8a38cf8b125e4ee8c4677aebce2196e SHA512 8d495eb4d6387bfb7f567c4b9f1cef3d48d1ef5317692a702c8c5e983c2feb209b1bab981d40064b4a0ab31063ec5fde24f77223e052f5650dc42b199dd2fdaa
-DIST khelpcenter-19.12.1.tar.xz 3848708 BLAKE2B 720d9abedfcf945624384b75d84e8bec457767e3e00492238fbf783bf70b176f675c67e86d5a49d324699ab2741717ba18dfcb2d3d2c3321a77df2c50f52d6a4 SHA512 fdeadfc81ed406d0d99da483321b3557866ee117a520d43bc2bd67fbcb60fdb7827835d8bf76fcc20c1b547196b8860281d464b40cbf7b290c78d52a613728b3
+DIST khelpcenter-19.12.2.tar.xz 3849036 BLAKE2B e88f8ee1aebb1257a1ce160218c5885a554b595e5a92f518f52a7f03c48092913a76e32735aa0a2a3f4b570fb791490f8671f1b89a11ebfc48810d465aa1f609 SHA512 7733dce8b32933abd72d863454fbd5d7055601c9669435dbf76e416530fb1588d8e37c96c3e85de86ab3e4fc2da5b7d26c672bf5ff67d95eff1ae55e1a7c4e85
 EBUILD khelpcenter-19.08.3.ebuild 1399 BLAKE2B e696b43c2065baebcfbc670f364968dcc54e660298d34f8f31821e36e0e735fff0fc3d13ea9f878b5993f9a4b75ef8e00564720103a431e6b7b4f342899869e0 SHA512 427cc6a04fe5f70592f6ae23cb388ba3d62c8c106533c43e13e4051c4b9c7e078dad6e86ccb8b1551c2bb078600cbf76f0d6c31177599f2c8410a02f7aa6cde5
-EBUILD khelpcenter-19.12.1.ebuild 1511 BLAKE2B d303fb956bcd9237a5193918748c11e6d756a564f1e57a659eca7e6dffcaaa91b681bed0b767a0e92d11d512d82bdd9ad0e4277598b36bb3bfb3765f068929e9 SHA512 f7402b16201dd9c05859d5cf05593df88c91adb8f9003f3f9908e2219f2a20e59aa730aa6c784b8003a3963587bb4920c7407c1a163b088b8aea0e1675638781
+EBUILD khelpcenter-19.12.2.ebuild 1511 BLAKE2B d303fb956bcd9237a5193918748c11e6d756a564f1e57a659eca7e6dffcaaa91b681bed0b767a0e92d11d512d82bdd9ad0e4277598b36bb3bfb3765f068929e9 SHA512 f7402b16201dd9c05859d5cf05593df88c91adb8f9003f3f9908e2219f2a20e59aa730aa6c784b8003a3963587bb4920c7407c1a163b088b8aea0e1675638781
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-19.12.1.ebuild b/kde-apps/khelpcenter/khelpcenter-19.12.2.ebuild
index 1cea492389a9..1cea492389a9 100644
--- a/kde-apps/khelpcenter/khelpcenter-19.12.1.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-19.12.2.ebuild
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index 6f7aeabae80b..ef2fac43226e 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
 DIST kidentitymanagement-19.08.3.tar.xz 149208 BLAKE2B 38ae6417e72a0d601f75d066b0efc126063abe8b21df2f57ae0a80b4f338cef70322f4aff41e180671ff3780707235c3832da8b2a581e30de7abb152bb63d2c3 SHA512 495817643fc01081c81cacb18810ea04d7705d37693cd8e0f3904ef08bf4d71f51f924d1c8640746f9ee6b0c92854aeee8bbda18cdd1ab2d7844e7d2afdfb76d
-DIST kidentitymanagement-19.12.1.tar.xz 149320 BLAKE2B 8d69ea64c886ba58a42eb4929ca2cd909762ece19c93841b0c9dfa7ab13c15a6c55fb470843c692f586ebfd7d02976848615e1104b08ed5a6cb1ab78a33e0cec SHA512 7d01ebba2c1825c3a65c04421d1de04a70739e1bfb8dc3ed8375b2bc415526a92b6a424229a13d0bc5e1189bd99324199d742815746244b489fb5ebf155f57a8
+DIST kidentitymanagement-19.12.2.tar.xz 149424 BLAKE2B 3d5898aa5143eb7b6a50956147730aa2bd36bf2bd99c29185634c4dcd65601bcf254adfccbe3abd8a9afc476b9ba338e13135eafc4d5e8a9dc845ad635b3d3bf SHA512 ddebcba100ee177a3f6ae4b93027e0ebcfc98946ad2a125c99c945bb38a9fbf562023908d77f9b1bbe87737476102476d600f7f3b149083153c3dc7cd1793b85
 EBUILD kidentitymanagement-19.08.3.ebuild 915 BLAKE2B 33eb1df6d68d9172b8a40ba09cab1c7d6a3f4fb99d7d9c7c130549b4992f9594f9444e0a031636ebd00dc31a8c3c3221db8a614372048c494417897504201f30 SHA512 8ab5e60538ad37048da04a37c73916a7ce734b81daa0f20fabe3db65f90dcdaa36f2fa5e6a6f038a934774e3a2cf4a34a7a2860a0f8e4eb498398d410d14329b
-EBUILD kidentitymanagement-19.12.1.ebuild 919 BLAKE2B bc111c4b33d176d963b48b806afeb8065ece31487cba47b238fbd10e0c2e38a756ae3fbd67ea286bc0ba6f31ecd697172f9284299d7b416a51f9a96beb232c0a SHA512 bfdf60d89431634c60d82ebb4860015061d9d8e2f5a428f26086020c67f37abe32fd4bee8587711b75e4713af0ebb24ac08dd83ba79df3f0fef1466f3307ab66
+EBUILD kidentitymanagement-19.12.2.ebuild 895 BLAKE2B 8b96b7abe4803cd34a27e162f029a9e17b0881a4a1d7e8bf7f6a1f05d6770b4094c6d9ff22901b084fef559fe7b95b0bd241cc77485986d8a417dd451f201465 SHA512 d3deaa1ba39dc95fa1952bd4002e7483fe65321efd3ad9f1b25a38cc1a075f430dcd62afa09e9d4a06c9bbde9c8f4c4cf8864cafc253a812e2c1595e86d80205
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-19.12.1.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.1.ebuild
deleted file mode 100644
index 551c511c5974..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-19.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-19.12.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.2.ebuild
new file mode 100644
index 000000000000..53b062bdf727
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library for managing identitites"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index 9691dfd105fc..d77e27aced89 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -3,8 +3,8 @@ AUX kig-19.08.3-scripter-crash.patch 829 BLAKE2B f783a2937f4348c928fa40018005a67
 AUX kig-19.08.3-scripter-python3.patch 981 BLAKE2B 66a23977cbcbfaf7965d1264c1806991c8ab1f7636d7e8da83bc218efb011992f63c43b9b2ebadc5b8c21ce114f6a06c93b7c9a531372ac1abaa608ed9288f30 SHA512 a82612a8cb8e95e2a5e839d27bd27fe0f7942df6cf777ea10653791e26a4175fbdd47981c50ab3d5091831f58555c5b3dba94b4b383a916b21482176377bc21c
 AUX kig-4.12.0-boostpython.patch 1014 BLAKE2B f860ac552eb6e50040ce7cdcb2891e246a64fa69002790015774ff2080fc6b7e850fdacc775d65ed79fc32e97e57304dcbb149f5089a8ecf981989f0894feb36 SHA512 fb9e9269fc4af850635eb88f5a97f2c61d7419fbaeff4bef0ed9d4ebf410c4cd02ab70733c3f1d0b08444e1a878fa74a9d691268f30c339b7855506e56c34fa8
 DIST kig-19.08.3.tar.xz 3497128 BLAKE2B e6611dd70ef47d0c710b5127b01532da4dc0841dbbfd8a151a9a867970389aa3c46d74a1347504beef5ca3c6fbcfaf2521923d7e34306eba580d88ecf002b1f8 SHA512 7e5f315695e9678c3e95822da3e86328dd8d6521d83697c623ac0175ae96fe13490d39e8a338c2112939b6b808fe8a213fafdcad951731b45902d9a2a2807b03
-DIST kig-19.12.1.tar.xz 3501216 BLAKE2B d381c11f14762ccfc8d41752b3905630b078bbdd0922c27da3cf90c7fbf836f613171d8f651652c35e298b3e6676b85aaa2d20783a76b8fa518d2b5e81735274 SHA512 f5c681c1f491f2b6e0d34376b12eb75ed85b7f2d159fba3bf26a3e2b2fee15919e5bbe426e0d4021581a71899853c19a65db4f56263874a2a710b53617260784
-EBUILD kig-19.08.3-r3.ebuild 1763 BLAKE2B 1955248b25c049868dea1677859e34e78d39c5867f5f6c52d6b1fbee939427ba4d017ccd24abd1ed6d04359cd1a792c01acd15230cafeb43dc3612e0d4ffe392 SHA512 771dbc5c54c6486297699f76117b217f14cc36bafe4a90dcc1adf02c0e2e78cc0b2416398339e00da16797005379413676ed0786cb6677410e2eb44967bae69a
-EBUILD kig-19.08.3-r4.ebuild 1807 BLAKE2B cc89c22f6c1e2d7d286810b8ef43ad28e27ba3fb802c69b209a6ecdd8449e789cd6b05f59e5499eb22c84d516413bd0a677e3e839b5c2ed3d796a95d3487d519 SHA512 bc95dcd38326cc8bba20b31d1e6f97bc83b20de3cc691b0d9ff3557d53ffc339cdd65b5f385b0f3e70b2323d95b53fb5c960301a2b7f7d7b37d5ff2b96875fdf
-EBUILD kig-19.12.1-r3.ebuild 1782 BLAKE2B 012c9032a3d852ae86be2be7e4ee0237d90bc1b7b5ea8cd392bef85ca79f4d72614573d0bdff26db7be7ae8e73a3a541d1c1433a2f5a353b6489e931e92c034d SHA512 e4842cfdf4188bd5a0d2a220382f66c8953479af9d739bf24a07cdb8b1eea7de12aaebf5e4515b881c29816dc4902cffd66985f294560d4edd0c4c3d602bd8e9
+DIST kig-19.12.2.tar.xz 3501276 BLAKE2B 75d7f5e827ae38338e32e0d023012305c77ae5195696ab3a55841e377195c5fd0a7653f8708e4208dfba63c9408f48719d3e97827df70f2871f28f352a73906c SHA512 3f091e85d61b5889183097201161ca9378c1085d947a2819e43dc937e8c9c433ba8fba10d8fea1ff1c20af93bd05f9fc8718a130f8d7e17fcd1ab97726cdb117
+EBUILD kig-19.08.3-r5.ebuild 1804 BLAKE2B d32086148197d0898c871f450f4b8172c3235f13f10dce738aec0975b7cb527b3a081f65d54c22a9053c03deb646895f95180461fe3dec103214744ce88ef442 SHA512 47b99ed2b039af72a2cb2ba4c9722610427bd412bf42291c03d54d47cc41aa7025927524dedcf2fe28745a98cd3314bea33d2910c42c64ee4cde94cd4b922b88
+EBUILD kig-19.08.3-r6.ebuild 1848 BLAKE2B 6c28bafb3ca6b6b9a1ca1565cf21442ad8af0b3bbc304eeebbca3dad85a7d8231c5c5012788d61353e910aa188a2fa66be4a0376da96dee9da23c4cc4b1cec9e SHA512 a1377f012ba12711d2d34a1c5a05654721b0c0bcd7494ce42434888ed9261721120741681f6d924e5c510c486afbbcca523bed4001608128756dab2544c6f7f9
+EBUILD kig-19.12.2-r1.ebuild 1823 BLAKE2B 16cbcb008e068f47a52f0ee7b3d6d9a1e74b11b11a2345fdb61a307022afa15b848528d994e56e0e214016f1ddb16c438320fa3d898f69ee8e650cb04910fc74 SHA512 2fa9a2c5263d5f0470bd3eebba362a283da4af1af87ee4c8a43aaf8538d34d20331361eb15a1f1e456fa323c66e6f761512a635645a6f2b54402f8c53709fc2e
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-19.08.3-r3.ebuild b/kde-apps/kig/kig-19.08.3-r3.ebuild
deleted file mode 100644
index 314539d6f4a7..000000000000
--- a/kde-apps/kig/kig-19.08.3-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kig
-https://edu.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
-	"${FILESDIR}"/${P}-scripter-python3.patch
-	"${FILESDIR}"/${P}-pykig-python3.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting BoostPython)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kig/kig-19.08.3-r4.ebuild b/kde-apps/kig/kig-19.08.3-r4.ebuild
deleted file mode 100644
index 79baaa3c251a..000000000000
--- a/kde-apps/kig/kig-19.08.3-r4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kig
-https://edu.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
-	"${FILESDIR}"/${P}-scripter-python3.patch
-	"${FILESDIR}"/${P}-scripter-crash.patch
-	"${FILESDIR}"/${P}-pykig-python3.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting BoostPython)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kig/kig-19.08.3-r5.ebuild b/kde-apps/kig/kig-19.08.3-r5.ebuild
new file mode 100644
index 000000000000..ccc05e430170
--- /dev/null
+++ b/kde-apps/kig/kig-19.08.3-r5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6,7} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kig
+https://edu.kde.org/kig/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
+	scripting? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
+	"${FILESDIR}"/${P}-scripter-python3.patch
+	"${FILESDIR}"/${P}-pykig-python3.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake_use_find_package scripting BoostPython)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kig/kig-19.08.3-r6.ebuild b/kde-apps/kig/kig-19.08.3-r6.ebuild
new file mode 100644
index 000000000000..f49f65563ac0
--- /dev/null
+++ b/kde-apps/kig/kig-19.08.3-r6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6,7} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kig
+https://edu.kde.org/kig/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
+	scripting? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
+	"${FILESDIR}"/${P}-scripter-python3.patch
+	"${FILESDIR}"/${P}-scripter-crash.patch
+	"${FILESDIR}"/${P}-pykig-python3.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake_use_find_package scripting BoostPython)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kig/kig-19.12.1-r3.ebuild b/kde-apps/kig/kig-19.12.1-r3.ebuild
deleted file mode 100644
index a145b7e7a8bb..000000000000
--- a/kde-apps/kig/kig-19.12.1-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{6,7} )
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kig
-https://edu.kde.org/kig/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
-	"${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch
-	"${FILESDIR}"/${PN}-19.08.3-scripter-crash.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake_use_find_package scripting BoostPython)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kig/kig-19.12.2-r1.ebuild b/kde-apps/kig/kig-19.12.2-r1.ebuild
new file mode 100644
index 000000000000..533020b39d28
--- /dev/null
+++ b/kde-apps/kig/kig-19.12.2-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{6,7} )
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="KDE Interactive Geometry tool"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kig
+https://edu.kde.org/kig/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="geogebra scripting"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	geogebra? ( >=dev-qt/qtxmlpatterns-${QTMIN}:5 )
+	scripting? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.48:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
+	"${FILESDIR}"/${PN}-19.08.3-pykig-python3.patch
+	"${FILESDIR}"/${PN}-19.08.3-scripter-crash.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake_use_find_package scripting BoostPython)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 44de8f7924ac..f3ed9246441d 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,6 +1,6 @@
 AUX kigo-19.08.3-qt-5.14.patch 956 BLAKE2B 79374b30f282e17933cbb7969c9ca4a4f4cde3ac402f7097f628ea1d98af9ebf0bb78fc928036c520e57620773a7098cff02b66319c1464646292fef6164596b SHA512 e79b6359b462045fa517778c57b6ac9b0637ab5cee8b39b27ac8e3a9c0dcca022b5bbf99eb49c89c9acaace96593ec65f93f564056bb31aa3ca87c9ccfc2e3ca
 DIST kigo-19.08.3.tar.xz 5227988 BLAKE2B 3cf39c9347c4f83fa810a3e06c6c4d593d233980e7b05dd8222f642673ba90597d124de65007fbbcb243be996a1a36d3b03e3549cb9758605a631b2943f0a7f7 SHA512 7b4eb14923668bbd886686ba3c17daf2a8118cc6988049780dc6e33649282734f2c58798f9e97ca8b9dde97d36d54790bdd5a1c75452adef726343c061d9e46b
-DIST kigo-19.12.1.tar.xz 5227076 BLAKE2B ab4aa2b1caa90706ba0d9233c67c3b602cd15d287133941106d0a6c011eec551369bcff790de1d6282a5d737ea103b90ebb2a5a2a0e0ec642497fed691a29a7a SHA512 15075a8f9cc2fca4dc972939e2a03e6991d4d3da9b58f05f0f68b81533c1354d52e86b21661f12e5b554a630cb14dd6b63b544ed24863263192a479f1d26125e
+DIST kigo-19.12.2.tar.xz 5229364 BLAKE2B 8d4f4d0929a8387d9933bb01dde8903915518220680d71d7ebbe4c97cf7cfd64f0d72f7659b33a9ce84193881068487e0d2ed85f8bc01ec943d051314299d5e1 SHA512 b93ce452bf790f79446ca68529dea538f8fa8680287668da22bd4234eec156e553cea68b23c932fd8019cfd2c92616707018993ca92875085adb686a452aef35
 EBUILD kigo-19.08.3.ebuild 1053 BLAKE2B 5f51ac33256885bd5c0ab79a227d0c6fc3bb3be312f38729e4fa218791ef4d5004bdaff579b371e97b6328070e88092a06fc95c7ad745639911a35f5d0c9150a SHA512 ee04c15495d0379a312f2c1abae33dd2776c64a23c2de8af1faa7fe73e15c1c394c8b3b495fc24233e796db30d921c0936e8c09b437f04d72439842830687663
-EBUILD kigo-19.12.1.ebuild 1018 BLAKE2B 7880758d005079596c43bdc4bfb20a40efcc2d0b7b96f5e0d9ed4e0e5fa432aecb316a8467c848e52135fd54dc0f89eb6265d8bd22c9faa1615f1a6122b48c32 SHA512 cf8517cb9cc2ef54a3a60db65c70d75fef504dd49830bb4d18bc73b136280f54f0fa3f89e441dd3f47b5f199af9d2aed49c55f1ca15319b661b4e1d073536199
+EBUILD kigo-19.12.2.ebuild 1018 BLAKE2B 7880758d005079596c43bdc4bfb20a40efcc2d0b7b96f5e0d9ed4e0e5fa432aecb316a8467c848e52135fd54dc0f89eb6265d8bd22c9faa1615f1a6122b48c32 SHA512 cf8517cb9cc2ef54a3a60db65c70d75fef504dd49830bb4d18bc73b136280f54f0fa3f89e441dd3f47b5f199af9d2aed49c55f1ca15319b661b4e1d073536199
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-19.12.1.ebuild b/kde-apps/kigo/kigo-19.12.2.ebuild
index 732f3f91d979..732f3f91d979 100644
--- a/kde-apps/kigo/kigo-19.12.1.ebuild
+++ b/kde-apps/kigo/kigo-19.12.2.ebuild
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index f91e403169a4..6434aa55b1a6 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
 DIST killbots-19.08.3.tar.xz 1175900 BLAKE2B fa043574ee3267bc56c4927757e1d8d3491c29d92f3f3061467f634f89bcdbcff7e837f16818c05bd79dcb23ccb39d81f6145584136c32ca2e629f3c9e993579 SHA512 cc369d8c89081012aeefb811124bd895f9126ca8aa20c4d7e9132154e8d22f15c0246ff017c9a0f7adda03113a32a4d78ebd66b1af463e200284dcbdd93e43d2
-DIST killbots-19.12.1.tar.xz 1175168 BLAKE2B 0a58e02b1e22f1c7deda19832c121471c3229ca8be34ded944dd36f41aa51da1b3d5e635a4553f8955786eefb2ec5c4329525971f8632dc5acba414379574cb8 SHA512 e5f2388220bfb0f40ed74f108cac896ef7b0a8592ae745bbdbd4d3ca382337735cbb2ab2da936949a2e151efe5bafb76906eb784cd7dce84232489a6fc3c2dcf
+DIST killbots-19.12.2.tar.xz 1175312 BLAKE2B 5654e2c881ab7c33382276a9facf768cd11f5e484670bc7c64ecb2789d910e796bea9b7a7e70e93f2fe07acc7b7af99977ccf9dbf059090cb7adba44f3074267 SHA512 987c9c4cd8fcb412b9e217a89c5b8d30294c707bebb877d77cf72b6c500a31e0e929f33318effd97d9ad4284d85c2ab31647a31c0cf175ed201d9d5c44086988
 EBUILD killbots-19.08.3.ebuild 876 BLAKE2B 6dba1a1f19c26dc9653ce24a1b419d922f45ce63e81bd9982561262eadcbb6756f0a2199c670bac2294235d6c3197dcf34ebb7e6718d0797049032a3654b81e6 SHA512 9db96111eab42086a82f418c039d74c6fce2983dbfff151f6ffa9d763d5d008290693d0086e6092efe2015089240f61c4ed0019b8186a4bc8620272ede4debca
-EBUILD killbots-19.12.1.ebuild 887 BLAKE2B 37d8591082beaf787a2ad76b0818e52b3bf1a60ecfb2ccded44230893d77377f55e1249390237cd8f9314737ca5d455106ac7bced27d83826c40f921cd2c880c SHA512 51807c80223c13ef68203045102f836502e4dbcb46ed2ba5ab6a823f35d4c2138089c95f2327e1086ad729cdb3d3a91939647078eb8c78613c4cb8646a8f7d74
+EBUILD killbots-19.12.2.ebuild 887 BLAKE2B 37d8591082beaf787a2ad76b0818e52b3bf1a60ecfb2ccded44230893d77377f55e1249390237cd8f9314737ca5d455106ac7bced27d83826c40f921cd2c880c SHA512 51807c80223c13ef68203045102f836502e4dbcb46ed2ba5ab6a823f35d4c2138089c95f2327e1086ad729cdb3d3a91939647078eb8c78613c4cb8646a8f7d74
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-19.12.1.ebuild b/kde-apps/killbots/killbots-19.12.2.ebuild
index 7443b5c10aab..7443b5c10aab 100644
--- a/kde-apps/killbots/killbots-19.12.1.ebuild
+++ b/kde-apps/killbots/killbots-19.12.2.ebuild
diff --git a/kde-apps/kimagemapeditor/Manifest b/kde-apps/kimagemapeditor/Manifest
index d163d63ee17d..abf239719970 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
 DIST kimagemapeditor-19.08.3.tar.xz 1070468 BLAKE2B d9efb205c69fe4a4860b7d24701f466d8319802994286cefcaa5deae283885c1525332c824c86927f53ed5e1e13526158a69e15bb5e85a57dddd4b0196784295 SHA512 8ff978bf252b230f213fee0bd4e29c4744e814dea54720c3d50b0faa88fe9bcce393c934d92e9aea4fa8af36bc174d4b4036d7a7a32230519b139af8764c3751
-DIST kimagemapeditor-19.12.1.tar.xz 1070984 BLAKE2B 2385a73bf548c10b7d9e93248e6131a530fe387763be2a0c2de5823fd4521328a8861ea42adfa5007f356754b4c073aecc5cdcb9cb757ddfe7825e229210bd0c SHA512 9a41e1b10074017d8905fa54b5cbd425e7347025f9b1fdb2300c6f230a16e12d492e7d1ab7f6eba1b42167cb7547067622cfab5215cacf7712bc13a9a3a30d58
+DIST kimagemapeditor-19.12.2.tar.xz 1070580 BLAKE2B 3c0ea0ba42267f487291d3f92adaa5ab775b1ae2399c8eb122bdb91530d10652d6ef1b16acfe325b7064904925ef9160409a6e8f403175091e8bfaad186a73a1 SHA512 a76669cda89b24540320a5db3607567d7e8b154a19756f4e7cb1b829e900f1182183fe24bfd57060241162346678d5e4a2f4054f26a97d7f6d60080de52b4b32
 EBUILD kimagemapeditor-19.08.3.ebuild 932 BLAKE2B 3acdfa5ef9c04cefbe2fb5bc60d35f85d53151c1f2a661661d70cb8d7d2da3ab8673bfeccbdd33b0dc68365363b73a022ba5392fc39139104e241da6ab54c3b7 SHA512 1d9a3c28ab5d16e07660cfb180e7cd3c00bd794ab96efc8dfe398c03a63ef7fd7a9f55932437a5c860eb852b68b503d8ec0f4baa15d0310b824b41843bed0a8c
-EBUILD kimagemapeditor-19.12.1.ebuild 950 BLAKE2B e7086bcbccc7549aa64242300131412d135055d485c7c6fad013a433a1aed29cb0f6bcbea6ad83608682a0e99cd25e3011a2bcfccc8634088b27590d9c8c55c4 SHA512 2500479a6ebee13f97d5abccf917a3634fda676a905ed77958ae81aeb32e8e4e9bf841fe3777c268289e0efb3e84dcd746da95d4c699532972dfdb7df5a18e69
+EBUILD kimagemapeditor-19.12.2.ebuild 950 BLAKE2B e7086bcbccc7549aa64242300131412d135055d485c7c6fad013a433a1aed29cb0f6bcbea6ad83608682a0e99cd25e3011a2bcfccc8634088b27590d9c8c55c4 SHA512 2500479a6ebee13f97d5abccf917a3634fda676a905ed77958ae81aeb32e8e4e9bf841fe3777c268289e0efb3e84dcd746da95d4c699532972dfdb7df5a18e69
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-19.12.1.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-19.12.2.ebuild
index cdf6efb27844..cdf6efb27844 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-19.12.1.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-19.12.2.ebuild
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index d05f9ba1b7b6..d78717ff5cab 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
 DIST kimap-19.08.3.tar.xz 119512 BLAKE2B 1a9436352115dbeecf85dddcecb1084ba8702264c1517438235d0785d914ebf94946111360cfa3d7ebd25d6b56b52d8739aa7b9889a3bc2d3149ba509701a580 SHA512 6a3bea5e4f442783fc4ab7b1f8b4425d75638edcdbb3c6f1d8c86e050b4b80deedca987cb868dc1190b126f04c70c55d660d2822929639ed70c359608543ea91
-DIST kimap-19.12.1.tar.xz 119540 BLAKE2B 63389a1298b2d28b2b05c69c81efa6bcd01e2eb853585248dfe12eb4ab6cec4b14b411ee9ec3ef14566bc4def364c7ea6f8d53bdb856b7a90cd3e17068723ba3 SHA512 4a4fe1e929e244e8015f2b3e444aa837f8bb8dd1b1d54c7d09d020a3a5874c4d0abcc9fdd61dc68fea56e50423d88ed0f4b45f96cd7a8556dec70fcef17b16d8
+DIST kimap-19.12.2.tar.xz 119808 BLAKE2B fd04ff470ac07d5e10c63c8ae0891efdd79eddda7300a057684db4dcd3377a5108b26299ac640cd2f984a84122fe4acff29f5092f740161b55c1647567f98682 SHA512 71d0e0385a9e612b8d204fbd12b6fa1c1bcfa4509aaf7db58d832d9aee2d0fc6ed738fed304890bb8b9fc44d7b61d4d7cdb6a55908800de4f6c8d021e567d7ca
 EBUILD kimap-19.08.3.ebuild 845 BLAKE2B 2ff1381b2cec73bca9190cf9ba9daee1162ac5c34f3f322fae1a30b083f5ed186bd09e107871882d33e65e7775e6cae25f1897b7256122c9b9f18b4595589173 SHA512 aebdc3c36780d049dedebfec2f375812dcad1978786cef52b8d5caf61791044e619f418d3a3a32e1d745108d8e8f9cf000a171262639d6c6e722c4d587015cb0
-EBUILD kimap-19.12.1.ebuild 909 BLAKE2B d125f7f7ad1e291aa23f8bb313c9aef1a904c3b100507825cb5addf210e4a9d2db0a30e7f45ff4bf02d5c62ac8e6bb9f6edeec33a7f0e470096af7c75aefc833 SHA512 18937cc88b799321bb73e2bcebc18e57f1014b3bfb3f85d3a6739f497d5447c69fdf820ea2071dc5cdbfb46a6e9c23928ba22a1d4139da29b3fb510fb1c4ad6d
+EBUILD kimap-19.12.2.ebuild 846 BLAKE2B f3183fa4afd4542fb8c856eee2fc419a1df06bf4d3c9ecaa37df345d025ac1b38f934f8f93b125f3e280d2ebdb29f8f9f3ea12a413cf3bfe0c87f492e02e1e62 SHA512 f3e13181060f9399764ffadb5ceabe1474ddedc5340d15d2bb569aaa97701690cbe4c53c7b89d403a2084a2a3fbb3b03106e0fdb8a174cf6d32be0395fb475c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-19.12.1.ebuild b/kde-apps/kimap/kimap-19.12.1.ebuild
deleted file mode 100644
index 7ed569017d82..000000000000
--- a/kde-apps/kimap/kimap-19.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with IMAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	dev-libs/cyrus-sasl
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# tests cannot be run in parallel #605586
-	local myctestargs=(
-		-j1
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/kimap/kimap-19.12.2.ebuild b/kde-apps/kimap/kimap-19.12.2.ebuild
new file mode 100644
index 000000000000..ce477a8f94ce
--- /dev/null
+++ b/kde-apps/kimap/kimap-19.12.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for interacting with IMAP servers"
+HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+"
+# TODO: Convince upstream not to install stuff with tests
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
+"
+
+src_test() {
+	# tests cannot be run in parallel #605586
+	local myctestargs=(
+		-j1
+	)
+	ecm_src_test
+}
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index fb5218b3903e..4736c37f0fa5 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,6 +1,6 @@
 AUX kio-extras-19.08.3-libssh-0.9.2.patch 3114 BLAKE2B c09e9ab0d42bb51c8b7f2edc4c6dc00bad03de719610e95e45fae888bb2603139bbf801dfa891384c68612a215fb783367987dd13fed4da8846ae223d1828a0c SHA512 6c347691eed1154088feb7d4cac761478b7111ebea13d777a8058c1c2b701b1183f4e1a9d339e77423315252326fdecc825279def616c1f6bd0fce8ecfb8a0d9
 DIST kio-extras-19.08.3.tar.xz 577520 BLAKE2B 2ceb208b1860e83b818935d6890194d27ad05c2d058d1d03167969539c41a99172b08c7196ade159e332e562c5573614e79f920415dccf16e4e1918471d92c22 SHA512 e2e5c6e3a8487c7251b77283c63eae75ea071f9d9f5f4544690083ab7f834abf6b10c715cad4fb49fbbfa34d2fbf9de358a4c606b299b2f4bf44444a57cadba6
-DIST kio-extras-19.12.1.tar.xz 579404 BLAKE2B 88a49dfc07aed0da31925fefee6f1b8d9305c38d789b2ce90aae930a2ff0b15d0b57eb2739e3539147f4688fc2fef4e50abdc08c0d3172a8fbf1ab988e777a9c SHA512 1a4bdcd63898b5780aff648abccb596225379b5130133b5bd285a1095198d62e4af262c4be69ca8e5351a3ad4092321ca0834d55745a25d810342cbb938a5567
+DIST kio-extras-19.12.2.tar.xz 579788 BLAKE2B 718068e3c7d75895e2f5be121231364819bfdac10a5b235f3ea7b84f779760bae698f6bd0e07fabce4208c9d9b83e1a7f596b7422393e4bcd3f3e02fbe558bdb SHA512 4586ef6f26c1f6e4491c9afc653052a18eb39f80d616b9ca6059c91e2a1bbc093dfd1055bba8680a542dafd42ae6e0de3d65bc64df34215aa7507e3be66d904d
 EBUILD kio-extras-19.08.3.ebuild 2330 BLAKE2B adee41312ee33c9ca0a577df91d9e858965e31befdac0f3b78cf0c891fbcf082372f15c7bb60d56636f6e16be6d2b18b9119ebc95dbf266b5a990ffa3e84c995 SHA512 8e698f7087fea3206a55fba9fed04d4e415e9653bfde8d7b3324f73c337e660a26a492ef21bcfe39c858b85c813e48e519d4ee38b04f977773f872644b1a5faf
-EBUILD kio-extras-19.12.1.ebuild 2351 BLAKE2B adc1ca90d0f4193392314745c9f54a1beaa36b3d10b901b1c220fd96d26622360017b3b8cdd9ad44de425f5408f958848206f806ca34215beed9c9bba20cd1be SHA512 fea36727b5fa4b0cdb184cf15151a063068e92fe613c1d79861c3bf616db3037ba4521876adbb310742cdb098daeb6e51247be09b4d724e40da175dd2e4800c3
+EBUILD kio-extras-19.12.2.ebuild 2351 BLAKE2B adc1ca90d0f4193392314745c9f54a1beaa36b3d10b901b1c220fd96d26622360017b3b8cdd9ad44de425f5408f958848206f806ca34215beed9c9bba20cd1be SHA512 fea36727b5fa4b0cdb184cf15151a063068e92fe613c1d79861c3bf616db3037ba4521876adbb310742cdb098daeb6e51247be09b4d724e40da175dd2e4800c3
 MISC metadata.xml 667 BLAKE2B 7f837cd50d37a8692d57859a3328770578e13052392bcee145c327e6a07d147f8194ae09ab0c6933fe15eb6964640e8b82495417b3776cac3fce0825fd1fd989 SHA512 3c14222010c942ec878bc049e2e92dc6180305de69804bc024bba1f159d08c97eb61b3e9ad68e14188515bde2b21a026c8068ab465ce8ca22e8e3e0190649154
diff --git a/kde-apps/kio-extras/kio-extras-19.12.1.ebuild b/kde-apps/kio-extras/kio-extras-19.12.2.ebuild
index dac7d525141d..dac7d525141d 100644
--- a/kde-apps/kio-extras/kio-extras-19.12.1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.12.2.ebuild
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index 14c726114cf7..2fe6ec124424 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST kipi-plugins-19.08.3.tar.xz 1629776 BLAKE2B 36ca49c935c4f9bc8aa574e447afc59189a5193102265192ff1b8aab8380f6542a7f9f4cc896146c087b7cffac942bab1bcc1b50ed0e3c3d7378bd2a62bcac79 SHA512 58901a4c0ba40da99aa2d06381cffd61bacfec5ea040abab73044ab38241460b71421629390c93818c74bfee7f195ed29c423462a057f2b1b990e40edeae5c0a
-DIST kipi-plugins-19.12.1.tar.xz 1632168 BLAKE2B 24d8f297a92b3dacdea164e40f90f303be2e60ff126da3222957d5935654fd2f6835dfffc86b24fee8cc505ad2d642dfe737c75efe276e257d8da3164b4cf349 SHA512 9ef7cd7959061ed17501c8819691a33c3b98339a594034a82df3035a8260c2a6c813c9857cf2419c8c5c72960948db0dbd8c7d1c5ed928aae9dc8a2fd451093c
+DIST kipi-plugins-19.12.2.tar.xz 1638840 BLAKE2B 492caf94923a88dcf2d201fc6098e550b4e70c38cf6b32fd367f95c319e8a4cf6e40301422d16284348be8949e4bb2777083a8248337f14fb97c0e75a99c348e SHA512 8a50f774e13a1fd30cc0422cc23a321403a3375a12b8db1e73edae1a13a8b5fd52294a3792eb01059c2695038c62c0370e1b98682179f77e44fd4c4973bcad46
 EBUILD kipi-plugins-19.08.3.ebuild 1517 BLAKE2B 2864e661e937cf1c62e56fd451adbf840855ce4c82a23c706023d8d6fa3b61d7c88a241e2cc5bd5cbe77e4c8b5471bfef66473fbfe930cde0f7552d46ec0da20 SHA512 781065cc26f2e9b48c823b08939d079dc7fe83fe6df829c93c814e1a211cf9c9d71e63c78ed1217e2014c56d167f19efec05d125a853b8ea8ea41272be72d22a
-EBUILD kipi-plugins-19.12.1.ebuild 1527 BLAKE2B dd3ef46e43fcab70994b858563197d515dfd8c8cfa0fafc1f5dab762a5e9ef684f82b52716e9afdc942fd4a29c08c372bc4ec683675a24089bfcb737d7d2f1c0 SHA512 5bbb33ee79b1af51d5d70cb15d393ba4693039ab42d5ffca930774276d13484eac363fa323ebf7efca8d1e56f96bc552fd64e687b4af5c3c6677b8ea73203ffa
+EBUILD kipi-plugins-19.12.2.ebuild 1527 BLAKE2B dd3ef46e43fcab70994b858563197d515dfd8c8cfa0fafc1f5dab762a5e9ef684f82b52716e9afdc942fd4a29c08c372bc4ec683675a24089bfcb737d7d2f1c0 SHA512 5bbb33ee79b1af51d5d70cb15d393ba4693039ab42d5ffca930774276d13484eac363fa323ebf7efca8d1e56f96bc552fd64e687b4af5c3c6677b8ea73203ffa
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.12.1.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.12.2.ebuild
index c30beb737866..c30beb737866 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-19.12.1.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.12.2.ebuild
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index 8e5071fb9d71..7282b5137766 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
 DIST kiriki-19.08.3.tar.xz 373104 BLAKE2B 5944f46442d71acaf776e9ec6122f335727998641bce9f4d9a9dba67dfdc23bfb828259166acbded3c68fd3712a4882b12ebf4e55bce15d0c348d7aa717793d6 SHA512 4d1d706a46648c01827887bd07b25cc2ec5d12baef70ed1983befcdc36d801a3dfbacfc21a62657b8e3d5d5d5a5410b51cc97c10d4921776776d77247ca40d7e
-DIST kiriki-19.12.1.tar.xz 373564 BLAKE2B be58b16dee8ec1df9f7e1d2b504aa5a3c985f1f4a463b7bcbc690fad09b73eaf2d8cb8c6a3d21e86c704511fbc2ac815c407fdb221954439c74004c6e5967444 SHA512 4bf2745be4a704a8eae62733add39606abf4e7502360511e5e307daf3c2c193e52beee3b8f6751f6b1f9f9cd83efa423a6b73c29cad0ca1ea4ee10e2f3337b1f
+DIST kiriki-19.12.2.tar.xz 373524 BLAKE2B 6b1b876fd71b3a248f33bfe042ac9b4ff673183f5bbc4bf2d99773ff956ee8c86907337fea779b533df037e4db38bbb0eac7dc91ef91aba7bcebf653322efbbe SHA512 14dee57e2be53e0da0b1ed51f06fc750c5aa462f5d24c7ce96eaded8b3ed2fc7dab98a40b5ab56b3bd8a214139fbc0e4891d4cdeece5ce49b09169e533cb0d11
 EBUILD kiriki-19.08.3.ebuild 943 BLAKE2B 76d601c9a2fc4bef037802c1bdc95b13fbc33711405e91d30b80912030bb6a7edca6dce70fe973c89ae0d1b3d3f6c64f66d94130a1bf231d40610aff85fe5ce8 SHA512 2bc26da050cb72a887537ed8460973770daaecc60e31f54bc4ee828ac2c0afbdc76d9989b0f3aafb64b8c72c741415b4fc28162c7c4b9e332f62c7681b460959
-EBUILD kiriki-19.12.1.ebuild 954 BLAKE2B e7ce62f1fa2ce5bcd26aa4355c58ccc2b3ad1af0c72a41407e913ae58fd7f6a8efe5fca055686c13011823f024b25e2a09b72cb53e81e88c17655d0fb93ba4c3 SHA512 0a25105b9f92beeb2a4ec1240ec9e32e271b609adf9f41ac900f0cd89924a6d936ccb4ad3793d88faefc5638a1975c8607c6e241aee4df7ba3bba55203db9a0f
+EBUILD kiriki-19.12.2.ebuild 954 BLAKE2B e7ce62f1fa2ce5bcd26aa4355c58ccc2b3ad1af0c72a41407e913ae58fd7f6a8efe5fca055686c13011823f024b25e2a09b72cb53e81e88c17655d0fb93ba4c3 SHA512 0a25105b9f92beeb2a4ec1240ec9e32e271b609adf9f41ac900f0cd89924a6d936ccb4ad3793d88faefc5638a1975c8607c6e241aee4df7ba3bba55203db9a0f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-19.12.1.ebuild b/kde-apps/kiriki/kiriki-19.12.2.ebuild
index 7a6c7421cfeb..7a6c7421cfeb 100644
--- a/kde-apps/kiriki/kiriki-19.12.1.ebuild
+++ b/kde-apps/kiriki/kiriki-19.12.2.ebuild
diff --git a/kde-apps/kiten/Manifest b/kde-apps/kiten/Manifest
index 58706ef73237..05948d34040c 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
 DIST kiten-19.08.3.tar.xz 11279532 BLAKE2B 1cb6ab60b310949b51ab0a1011228921bc2a76914595c2680d3ce68b2289030fa7c32ed60c21859cede4e08097899fb5bed7cae91493ed6bca669c5c420d85f5 SHA512 330544abf9fbf6723588f4fc476275500da90a03f61f55569779cffbb31d6fd83fb752d3bfa6393a4298bac34ed43b52581c4df3555d9ccbd80be4b401147dfd
-DIST kiten-19.12.1.tar.xz 11288524 BLAKE2B 2504f6a7ea8391c47766b982a9065f4a2ad9eed5d6f49187cb157bb97fae1eb18900b5783eaa291b045f46ebd5b659a050f184c11ac59770e17efb1bc37fa86f SHA512 8307b6b67e20c1ad8ecffd1a3bcd5b941a16fb693fe46be1c384b0f163be36b3a75c3e96ac06af9e247df0b2572767077347da95a6a0558c60b5e145ca29870f
+DIST kiten-19.12.2.tar.xz 11285732 BLAKE2B 79b7199bb6e13da9136a92a1146921184cddd313947578f6db7ce742cb3d8d6beaec0981dc2a60bde6b26dce952c68c3ea0185b134d0012674bc8d47869642aa SHA512 f12e75f378fee504ce7e2ac17f52fc9564b23fd0961e29985236134ec61c16671078ce1136448fdc18a0f6858ccd9690085020de6a991571f8c28822c41ef11c
 EBUILD kiten-19.08.3.ebuild 1127 BLAKE2B 2555f0290de7eff557a2fd3037abf962f85b865727f58c4756b4375710af715a6fd242579f0d97b43f6425988204c944af752f43f14aaa444fb528ea89bcc021 SHA512 27170374a5df899eb70147fd3fa769c63f1b3aac3a31b01181d7d7ef110b9aa93afd556daea266b1d21b66293bf64910bed35937549766e9b5dc0affbcb617fd
-EBUILD kiten-19.12.1.ebuild 1139 BLAKE2B a53889c0eca01460f1ec634809861b894dffaab7a3d99b73abbdbbe4edb4f052e39068e9b98795ed788a2bf62bfdaacef381737116660b76c63fe847470f4439 SHA512 83122e677e632934435b6e059ed7e7e3be3675d649b9fc72bfd16348e86a889ca6a0da29ea103e2a01d3191843029fbc935828ea926c74f3d4a4fc8a5e538536
+EBUILD kiten-19.12.2.ebuild 1139 BLAKE2B a53889c0eca01460f1ec634809861b894dffaab7a3d99b73abbdbbe4edb4f052e39068e9b98795ed788a2bf62bfdaacef381737116660b76c63fe847470f4439 SHA512 83122e677e632934435b6e059ed7e7e3be3675d649b9fc72bfd16348e86a889ca6a0da29ea103e2a01d3191843029fbc935828ea926c74f3d4a4fc8a5e538536
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-19.12.1.ebuild b/kde-apps/kiten/kiten-19.12.2.ebuild
index 75f997dc51db..75f997dc51db 100644
--- a/kde-apps/kiten/kiten-19.12.1.ebuild
+++ b/kde-apps/kiten/kiten-19.12.2.ebuild
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 97f5fed07397..7c2afd4f2b27 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,5 @@
 DIST kitinerary-19.08.3.tar.xz 955500 BLAKE2B 1f09ccb61ca37b44efad2af4b2e9adf48f3f60e7368847e8602213602f7d23f016a525fa9e7f0bcd644dbaf2c43bde53d8dfe52d8bf4941b6f2930b30022d774 SHA512 357c8e18353dea4fbf5c73d5948dc81c5ed620e3e43503b62efa6367c13d9807f9c3e6790918c02b968864eabaad12b4f1001f69d2f4cffd4845b40cbb7f2a4d
-DIST kitinerary-19.12.1.tar.xz 1179336 BLAKE2B dbb998ba28d2b4d1857ce844acf9580104087fc561f72270c7a5ba6d82e2ab6a5093125dc1a1f2dd1d2ef8e1e5583bb097e2664f70a07168dadc4f8523d326d2 SHA512 4f39a2c4268fbde352c336e2d093072f2aae847cce12d1c2347dcdc4eb6b5aa42aea5e7bb19a08b2f5dc32571ce3273026302d4ae95901bb7425ed4b7d8ee704
+DIST kitinerary-19.12.2.tar.xz 1182776 BLAKE2B 3061207d02ee65bcf5f9232c1c6cac8302e7f5f0a598e2515b354f8d3da41edc4af9ac39a330d54e87cfd780d7c28ae1efd7426120a43f95b02ec9ad5fcac987 SHA512 09795bc36aadef228c1e2139dce3b09af18682d941b32a035e903942a2f1e2bf6db4aefef9d854a9cb11f5cab3aa3ec6a9b22b1d7b838d2fcbdc56da1872ec90
 EBUILD kitinerary-19.08.3.ebuild 1021 BLAKE2B 4ce8e8a9005769a0acefba2d3ff62de3b3005c90400af0014e3ac90eefc7d1baa8120c517f606982dbe2542f9c6afd7c2dc1f9a51fedd7e7a536f85aae93decd SHA512 536bce33249772c00f4a332ff1a7b9e532de7ca566193d3595887c73ee2dd8e47faae0b0d499f28243c6ce52b4e46fb76dec306dcaf9f14aebf12dee4232f38b
-EBUILD kitinerary-19.12.1.ebuild 978 BLAKE2B 7efbff2d75eae7c0c3dd70c696b57ddc03db530f5e51371d0cc1be7c2804552034ce1a166bf7b83e413aa5da644e142a83719fc7f619c97f06b1798a2973be47 SHA512 77ee2c51e0b25c62cf52ee954f885edda76bbc2f1c4fcd3470427fe028ae8851f0809eb9d91db0b82b832fe155e2701766b2c65926619ed7b1b0fa1886f88d02
+EBUILD kitinerary-19.12.2.ebuild 1031 BLAKE2B b50987b4c2c7e9ebb544a71200fce45beb0b8eaf66cb809bfd23168a725c800285ee3a3eafa99289ee950c695ebce0b9980aba3cd71f426282d1d9cd7634b8bd SHA512 b350f9bf610bca7948c014d9c35bb9ed7e41bad1a83240ec7c93155a04aef7580a0172d0a057402a08faee405c894acca5e49ca12bf04a56b63f03f7d273cc84
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-19.12.1.ebuild b/kde-apps/kitinerary/kitinerary-19.12.1.ebuild
deleted file mode 100644
index e5354f4b32fc..000000000000
--- a/kde-apps/kitinerary/kitinerary-19.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+barcode"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpkpass-${PVCUT}:5
-	app-text/poppler:=[qt5]
-	sys-libs/zlib
-	barcode? ( media-libs/zxing-cpp )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package barcode ZXing)
-	)
-	ecm_src_configure
-}
diff --git a/kde-apps/kitinerary/kitinerary-19.12.2.ebuild b/kde-apps/kitinerary/kitinerary-19.12.2.ebuild
new file mode 100644
index 000000000000..1cdaeded5a55
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-19.12.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+barcode pdf"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpkpass-${PVCUT}:5
+	sys-libs/zlib
+	barcode? ( media-libs/zxing-cpp )
+	pdf? ( app-text/poppler:=[qt5] )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-18.07.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package barcode ZXing)
+		$(cmake_use_find_package pdf Poppler)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index c6a9a0f46510..943208b22426 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
 DIST kjumpingcube-19.08.3.tar.xz 288612 BLAKE2B d62592ff84a535b6d7c6105c4fb5a87e889ff094322e874c7d3042c35b0bdac4fe12bdec15e168aacf57be4dea77883481ebb6fbd2994d390b0bef9cb1005f86 SHA512 5fe15f3d7b6fb1bc7936e147df3d82ed1b178035ff4c3a4e945837f50e8e45190a9a8219c8ee3f8233f8a252422a04fbfba8fb3300fba3c571697de5036587b7
-DIST kjumpingcube-19.12.1.tar.xz 289164 BLAKE2B bf9a60042b99bdec2cfe477ca525680f3acdf2b9847052c1be34e75e0e854308b4105e013fd463f2fb8b836487e018cd0f230f666f845be1bc2ef7a240f4b576 SHA512 b630bd9c7cb8c1e55a374d15b8614a06a2d611dc1beea087668b265cc3e4eee5c7edce7f509943157b610e2331ee8ac11f03b665eeea2d0427a90d3fc7c5f53d
+DIST kjumpingcube-19.12.2.tar.xz 288260 BLAKE2B 7bd508f490a95ece9f016425bfdb45b188e4964642eb51e13b5065bb218e15ab0c760dcf40df4e3e3dfd79c9d96128c16cf1cadfbb1df7912997a978ac4ef419 SHA512 5fe3fb95d8d3ae39d67e4fce4100c06050c28820c265cb111b9b48bed4e549965a659ed7e8bc8383d976c820001efe6abf131cbfcac5528d25e6d645b17b8948
 EBUILD kjumpingcube-19.08.3.ebuild 933 BLAKE2B 8725377be310789ca7a941941bf62d3fb81a4be7210b3fb4f8cc73003e60b9a96f0ed3402fb57bb450c2730424e1566456cfab364770e7ff6ad0361bde3b50ac SHA512 14992acbd5b505a1533ac8e230ff6a7cbe7ac28fa6e15310a7b2d2fff1295a6ecd59706bfd6936bfdd9c57d6643c4bcb642a440a1af89642127f9375fe1f728d
-EBUILD kjumpingcube-19.12.1.ebuild 944 BLAKE2B 9a73f6673b0d46f871ab4ff55cad38b15eb2842c240ba489da081be5e870ed4f42e199c13912741f1915dceb01f83bc53e26eea1ea027bbe373b3b7d3661b706 SHA512 4b3508ba3f79090a304284fa7048c28469fd37b4862d47fac85abb671138d10ea7a585924b4c36b0aa58fe32812521fd43f9a86fab04bd39561f8f4dc2dcaa21
+EBUILD kjumpingcube-19.12.2.ebuild 944 BLAKE2B 9a73f6673b0d46f871ab4ff55cad38b15eb2842c240ba489da081be5e870ed4f42e199c13912741f1915dceb01f83bc53e26eea1ea027bbe373b3b7d3661b706 SHA512 4b3508ba3f79090a304284fa7048c28469fd37b4862d47fac85abb671138d10ea7a585924b4c36b0aa58fe32812521fd43f9a86fab04bd39561f8f4dc2dcaa21
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-19.12.1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-19.12.2.ebuild
index ba03c4be68d8..ba03c4be68d8 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-19.12.1.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-19.12.2.ebuild
diff --git a/kde-apps/kldap/Manifest b/kde-apps/kldap/Manifest
index fa61aa7d054d..26fce9b9c61c 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
 DIST kldap-19.08.3.tar.xz 155372 BLAKE2B df9dd8216da743db09e9e059067a91c4776e26847f1413f281708fdb04372aed7186e7a0b2d1d2bf04a5cca657cfee290c7fa14470c7d1b64244284fafb65213 SHA512 c2e21c0b3755228aea5b2612cb495565aa2161e3502b1d72b5063eb2ee15b4ea1ee820b8183b2820607bc1b0e2eaf33a6983eaa025c2224e557f10dd17fc9d37
-DIST kldap-19.12.1.tar.xz 155468 BLAKE2B 3fd5a4388c12e0510368dd15a654049c6c2bd6e4ff30a8ea1fa7154a1cd670c5af283f0bd04e9200a3b45065f390d07bb1ccc82fda702191ddd9993160ecafb1 SHA512 48445a5bb2ee1e9a897d5306c8641933d8aa18dc34546b136e38d67b944a22760ac1651bbb4d5cbeb3647d005d299813e47b36e9c3ec7bc143a2443847b2622a
+DIST kldap-19.12.2.tar.xz 155096 BLAKE2B 128237e86e963d2fe34251e6e66f8390849ab5e10f9be8a8bc6a1d18ad1896ab3a4b6b77cc6bdcf4f60f5d2d62834c6873c9f6f2d8899c9221203c5ddf24351b SHA512 324e33c2438f14e34e3fcff9a87504f6ba407f5dfede6d9106b40cdc158f063e94135cf37fe00d7311002d8e200a34c8e3084240a6c4e0e27d4651d97d57c29a
 EBUILD kldap-19.08.3.ebuild 832 BLAKE2B 011fe5616b28a97ec7c22adf46c09f565ef2eb6877d4069b390c3da2995a18ce1ab35b6475f7f369bed700da03379dff6f37a2fbe1ffc3be59e53f786d55abf2 SHA512 70608e7e010ecf7cc083c7170fee0b424d22408a92ade5c395597634aa773c2a8933a2f315de0bf7759c12b1336565228f0bdd753da1ec45dc92a385ed105cde
-EBUILD kldap-19.12.1.ebuild 896 BLAKE2B 0db131e1a347193297b23920450718ff728862b0ce8e77a5bdb47df1f6c9d54d5b192d8a473e02d7b565a10ecd178f4d4f2e7c25db6c649f0bdf01870ad19743 SHA512 d24d7d255e79309b2a9cdc0072e3bbbc2c04b6b6413f0c25caf10a35c3b73c7c56fe90796be40d853ee93c471f54e23be1178f01de69401c9f3405579d463495
+EBUILD kldap-19.12.2.ebuild 872 BLAKE2B a27bd0cd4303dc1de02586ea8aaec6054f5239fea9d0532f88c37ed29ccd8ab0da7130e314109cd45c366bbe6b0d1045d3989fecc87e4d40497c1e01b480d94f SHA512 ffbdc277d05348bcd1bc0d90bc8ea8afca6b6c359df7cc9a9c3319e18a997301e53c27fef0c8e730f7e5de9784e70009649b4adb33bdf2564fd48a6baf0abc7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-19.12.1.ebuild b/kde-apps/kldap/kldap-19.12.1.ebuild
deleted file mode 100644
index c748b7242600..000000000000
--- a/kde-apps/kldap/kldap-19.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with LDAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/cyrus-sasl
-	net-nds/openldap
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/kldap/kldap-19.12.2.ebuild b/kde-apps/kldap/kldap-19.12.2.ebuild
new file mode 100644
index 000000000000..efc25563b986
--- /dev/null
+++ b/kde-apps/kldap/kldap-19.12.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for interacting with LDAP servers"
+HOMEPAGE="https://api.kde.org/kdepim/kldap/html/index.html"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	net-nds/openldap
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index b46e79924164..f1f1e649b233 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kleopatra-19.08.3.tar.xz 1928668 BLAKE2B d32556a3b259b8c4e1a25414f11babf0b33ed3c6bd56405771fe23b207084c12a8dfd9a54877cb2cf36e31608b2a163a42021d7d86002a8858405998a6c7eb98 SHA512 546f00e2e8d1bedc62bd5e809ef4b888e40b83b7af315f7d74b40e3579bb23f5b91e69f7d819333dbd3c261a7ea10498f29c06e9bd30b091a0b4f58906f6b63c
-DIST kleopatra-19.12.1.tar.xz 1932580 BLAKE2B bd439c965f35807cd203b9761e3197705b03bdd9d3f12cdc4c7126c1d8df12419b0baed84023c876e22828a5d87ce263e8e90dc3b013e549707ca188408722a1 SHA512 25fd4a5458e3695351c8dbc2acc750902f1b438e3da0988fa525f243bdbe17b5b45cf5ca7ca57a706bfe0d0f8f1e3d03e0b7c70c137f47c2353db5dc98625f6f
+DIST kleopatra-19.12.2.tar.xz 1927004 BLAKE2B 6b6e5b42cc7dafd0b0d3e6929de8ae42acb62e926ddbb12edace03989a3cef919ef1328dd9851fb65c3d3d52f6ece885ebb967ba1ac468bab767faf80ec796d4 SHA512 9c22c6aac485e1ab1a24326d33758f12480c474e9eca57c6651fc85f88a477ce66a8b33e7adbad42561672d93357e7c947596573594a458d01829116e762b658
 EBUILD kleopatra-19.08.3.ebuild 1506 BLAKE2B f03d328a984db916e76dd888de4dfc3a605d97094dca2127cd124b29b08fc60f3063e79aa96dcc11678b538a71797e3b420c791bd2a2874adbd32f9aaae2b496 SHA512 19ca6f1163389bfbc9d921cfb44e49ab5db5a1552ec9df47fe2034ac3df891b0956a3648d0a25abfc83bfb7a98b700d624d1d3d32597870053d97dae7f713227
-EBUILD kleopatra-19.12.1.ebuild 1517 BLAKE2B 810d48a012296fe1533a21b67cec6c688d965768f080a77d0ed93c83c08262f9a3cb22195fcf4894ce80c767458f192e4e88756e81f48150ea0d77a4d00b9857 SHA512 2eea66488760d0555d9c123a2fb4b93d8ae813aa7d330789b498fe7f7b1f90217460276daa8f5ce09b5e26545ee2851c362afbd1c306d330da710a7ed87aeeb3
+EBUILD kleopatra-19.12.2.ebuild 1494 BLAKE2B d236f54d936c249b8f57a82cc45b3a75d7173c7d3bf4a99b8c416a09f04d4885c9ed7de1ae9e76dc0f82ebc0b37ffd81c7bd332cd4f2fdb416e56d92ef4e4550 SHA512 bb59cf5e199bd4c4557f724a636f46cb6e1f6526a675b25859e4e44f6aec6472071c3e476d63dfe19b50d327067ea10dcbaa0e6639b43e962e075800fa82d4b9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-19.12.1.ebuild b/kde-apps/kleopatra/kleopatra-19.12.1.ebuild
deleted file mode 100644
index be6b8ee206cf..000000000000
--- a/kde-apps/kleopatra/kleopatra-19.12.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kleopatra"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/kleopatra/kleopatra-19.12.2.ebuild b/kde-apps/kleopatra/kleopatra-19.12.2.ebuild
new file mode 100644
index 000000000000..aaae51870443
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-19.12.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.kleopatra"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+"
+RDEPEND="${DEPEND}
+	>=app-crypt/gnupg-2.1
+	app-crypt/paperkey
+"
+
+# tests completely broken, bug #641720
+RESTRICT+=" test"
diff --git a/kde-apps/klettres/Manifest b/kde-apps/klettres/Manifest
index b599ad3bd07b..cd0fd860d1e0 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
 DIST klettres-19.08.3.tar.xz 40135784 BLAKE2B 7c6d6d66cc8618c6dcf7a200ad804456140954d3e80e5e2431ab375b6b38c0ba990e5e401feb624b83a87e79af7fcc10070bc6f862b298fa2c9f8a0793f8d11b SHA512 bb6bf0f2b6ccde4b4f2196e9f0154de059420017352152b1059ab799af4c7c796caeb3539394722e97ee79be8930696eab4a22dc5b98f85d40185e0780c88dfb
-DIST klettres-19.12.1.tar.xz 40136336 BLAKE2B 948725c5a1031b5e0ba5c72a1b0236805909b1067e2c0abd2bfdde37150713812e8acca24a9bacccf93e6ccfaedf7451a1583cdedbeb8ca905bd7844adb09d75 SHA512 93c61c67c6503dda9087ed8662d27cad1a8fbf075f85cb2d5ab0e61cec8196b78a7396ca3a9ef794ff60f6269f6cfe5323c87f077b1c4275174213bc33add4fb
+DIST klettres-19.12.2.tar.xz 40138220 BLAKE2B 6068bca6e760fa63b13691d343005d7b0cfb51d8a9ecf6260f431d5c6e3f76a75f104a10c22b9df1ddaa34f4fc27ba1bd2bfcd4594bd1241a95d37e6f45346fd SHA512 f7070b1ff08567fc1a43adbb4c2741714572e62ad87903be3494255ed0d15f1c7c60d56fd62fb1b9b1b64d880f71a87be7d1a56ddd7311e0f0cf249c29b30868
 EBUILD klettres-19.08.3.ebuild 921 BLAKE2B 1751e19a25e7bde8ae0f25cc3787aa33a09d44d2572caea378722d0fb0f58fb73386c94767ee2500f8c258c07a2e15bf42c2ee4e7599be285a1e102a2255e470 SHA512 f7c5bf5d00d21098a77a4547c6fcaf4c16dc046441d814b72b49f3b56bbbf43d0ef8e189d88c048b3172a444c144783de046ea7dffc7c5eba56d555a17740230
-EBUILD klettres-19.12.1.ebuild 933 BLAKE2B 13ef9065d4b88df070aebc9e7536356559f65757c7f0d8b12dea539d5f8ae10ac0d5d6576547c9453997bba2d7ab905cf2102f47caaee11790c55ef5cd38c701 SHA512 105289f2f18a6e63f98812ee6a90e2f8ab90ce01099348e5e82f4d3fb49a3c85b63e3989b3eb5243fc3ab25b2034f1332d543e3a23f581f5572940fc2b0f9a21
+EBUILD klettres-19.12.2.ebuild 933 BLAKE2B 13ef9065d4b88df070aebc9e7536356559f65757c7f0d8b12dea539d5f8ae10ac0d5d6576547c9453997bba2d7ab905cf2102f47caaee11790c55ef5cd38c701 SHA512 105289f2f18a6e63f98812ee6a90e2f8ab90ce01099348e5e82f4d3fb49a3c85b63e3989b3eb5243fc3ab25b2034f1332d543e3a23f581f5572940fc2b0f9a21
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-19.12.1.ebuild b/kde-apps/klettres/klettres-19.12.2.ebuild
index e89ddb4ff92a..e89ddb4ff92a 100644
--- a/kde-apps/klettres/klettres-19.12.1.ebuild
+++ b/kde-apps/klettres/klettres-19.12.2.ebuild
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 1af11c32559e..babadc04ae76 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
 DIST klickety-19.08.3.tar.xz 1389972 BLAKE2B c5a4e1c7f0eea5e13948d15ebedbb2b584f06f9838cc13961c07c3b2d9ff708a45534f88f68ee3cbd8c865dfa7316666a6feab8b3adb498d7483c66b80e7254a SHA512 89bff8d42483a1af1c2ffcefcb04811c4a1e56a72f24c6d422bd3eaf6e729f3d9d7b2294b7b0cb4c56f00dbe37b9c5484534fc84f32db4b2bda730e187aa1b6a
-DIST klickety-19.12.1.tar.xz 1390440 BLAKE2B 91ab6c5148d3087cbd32b371fceb1120e2fcbd54f7cab902f2f758cff95c40249b28d340d84a1120f76e6661090b7f0942f0f50cb8b717267ab83b2a0e73e443 SHA512 44d88230b64cf4ae8e496160f501a5ae9187016ed0308f701ed5505d341cf5c6c75ebd95d85eefc153fa9a8fa24e79d4c37c7e4db3d4e3520cebb07342a4e54b
+DIST klickety-19.12.2.tar.xz 1389944 BLAKE2B 7e0ac0197b392e9b9cd81fd2e363b625d021ea103cb8e37b9e3a04c4fb55fcb2de8d4a8ea201cadc7d3174c1d43e9a74a3b5e8493d0eec7ee28164278e14bee4 SHA512 cb52896a52df710f9404064cd7beb29e15ed158e0954a1bf10b9b3bdd7742d20165e373a94d223aeba9738e5e94735b32a1ffc953119ab55daab47d6c73ed5c3
 EBUILD klickety-19.08.3.ebuild 932 BLAKE2B 2b556c679ac79b5ec709510161173e7565ce93f78a29f5991d57401e645f90f5fa7165d07c14aad34bb56ad1725eb872c2eb111bcaf7a378ac7fb568de4265fc SHA512 9b7a31ca944eb7ac044690ca55d143f29f2cf9a7dee3bf6be069692deb6500143b6bcca3006c88f6705811058ea8085ae2fbeae95841de6ad4d45cf1d1197a36
-EBUILD klickety-19.12.1.ebuild 1044 BLAKE2B 34c1590c5371e4ae8e88792613176b3ba366e6db4de5b3688f12449217316053b4ab864d46b9df0a40144487bb86d0cbba04226629e267b09ea1ea39e17a19c1 SHA512 dd15b9f9c28d4f12bf8d310ad537a7e1f8833828d3189b969a6eb8af68032869f3a13b279544a3e646314b1239e73c0c40ae531402e78900c44b1d3da5051184
+EBUILD klickety-19.12.2.ebuild 1044 BLAKE2B 34c1590c5371e4ae8e88792613176b3ba366e6db4de5b3688f12449217316053b4ab864d46b9df0a40144487bb86d0cbba04226629e267b09ea1ea39e17a19c1 SHA512 dd15b9f9c28d4f12bf8d310ad537a7e1f8833828d3189b969a6eb8af68032869f3a13b279544a3e646314b1239e73c0c40ae531402e78900c44b1d3da5051184
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-19.12.1.ebuild b/kde-apps/klickety/klickety-19.12.2.ebuild
index 90e8991ae92e..90e8991ae92e 100644
--- a/kde-apps/klickety/klickety-19.12.1.ebuild
+++ b/kde-apps/klickety/klickety-19.12.2.ebuild
diff --git a/kde-apps/klines/Manifest b/kde-apps/klines/Manifest
index 2577254db1ce..ebf163d2e077 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,6 +1,6 @@
 AUX klines-19.08.3-qt-5.14.patch 834 BLAKE2B 8036d4f78b3f918f921bb35aaad6fa71462d60338ab4ac05a5f2ecaecdc75c6fb1cc153853a672dd50f489875a3a79b3846c00781cc7b99d574ec3baad739f46 SHA512 b93cf6995deaa6f4d6fdfb0cf5990a87c1e98e4dc59528b0cd6a6647470b5f68639fbbd06c72ca51d11d611ad517367e1432c9e9dca9f4edb85db2bbe02bcc7e
 DIST klines-19.08.3.tar.xz 1781396 BLAKE2B d763f9f7e957688ccc5706bd0066e58e9c262c752b29d484897fe81666bd68fc795cea12ec35ab84a7fac9a674d732c87c88145230ff4c8bed545a3ff7cf913a SHA512 485ff5f504eaea9d40251428b48ea629b042a6b4ec58cf571510e1f257369030774dcb8861095eb7114e1adb09fb19d08d7e9fb14c91cacbf9d28c27da450f8c
-DIST klines-19.12.1.tar.xz 1782308 BLAKE2B 9aecef4ebc8b348d5095bd89e1f4103be5a37cabb18ddee6ae541a3318dff442e4ab0d2bdd3675d36be55ae3810408f02c9663ee615f436d415029ae4944b7b3 SHA512 46a032816eb324925959a9e71993d48d33b5ffc1d4e8209d342c5c6b86fc1f267d2b36952868b65e5e5d436e675e18dc522603e01639258ae4e638390fbd5e85
+DIST klines-19.12.2.tar.xz 1781604 BLAKE2B 6cda79614e735126112b21e5152790ef302bdb125dfc33f6cefff2dada6af8629118b04db25f1a3f2a9dc6d32e31bc5a9cd7e75957b9140d7d39ceb5ecfaecca SHA512 37e44613fb9d97f19e350ecc7ccf4c1c460ec0e1d5186da2561fe6a3294461e8dd235b06d54c237478d1991818a68133414d3d93180930a15dcc233256f41e53
 EBUILD klines-19.08.3.ebuild 983 BLAKE2B e9bd4ecad516f829f88ff0efe9e65395093178cd69fb13c881529846cae1d1306c628c8f835f064733a766b7f15d38face3b823b8c74eaa1b3f54046d9814cb4 SHA512 50e0d6d38917e85706e0dee01f1ffe2d738f3b43b9a2a7afbafb0c0b4dbfd70bea5188a50a8d1d0715e1e2eae953350f030d10361dde04e6dcce7bfa9fe2122f
-EBUILD klines-19.12.1.ebuild 948 BLAKE2B 487bdf738774a594b69d1faf16c9dc81082fed0bcdef0067d107c31cc2159b40ecc751fed81c061a2bf4bea30229fe953cc5b380dd990af55d75786bcac57a68 SHA512 3dea27744d34a1ff867d095364c0cd8aed3a71af1492759f2694bc351f08bf67f44706755258750557a4f52f72787616ee21436d0294d26c54e6bc7393982fd3
+EBUILD klines-19.12.2.ebuild 948 BLAKE2B 487bdf738774a594b69d1faf16c9dc81082fed0bcdef0067d107c31cc2159b40ecc751fed81c061a2bf4bea30229fe953cc5b380dd990af55d75786bcac57a68 SHA512 3dea27744d34a1ff867d095364c0cd8aed3a71af1492759f2694bc351f08bf67f44706755258750557a4f52f72787616ee21436d0294d26c54e6bc7393982fd3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-19.12.1.ebuild b/kde-apps/klines/klines-19.12.2.ebuild
index e3cd01c02768..e3cd01c02768 100644
--- a/kde-apps/klines/klines-19.12.1.ebuild
+++ b/kde-apps/klines/klines-19.12.2.ebuild
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index e26d5eefd27c..e09613711184 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
 DIST kmag-19.08.3.tar.xz 673556 BLAKE2B 1a43c25c807d9044275923b21b95526d6596de33c8105644384157c03efdaf45fa460851361a4f6e8efa5b830cacda73461867127ff865281b95050c00d3ab14 SHA512 d9ee8e1a12d0b1eb9e20923301094eb65bfd680676e57b4e75fe07448d5490bb0836694eed807b6b555ae119576367d15ef8bd6b4b9db011268ce4f2d2a3771b
-DIST kmag-19.12.1.tar.xz 673956 BLAKE2B f9ed1205fcb6fd55b46b373eb398ca8bc5195671d27fd564be2ca3fd851e9eb53bc201940924789fc4a36adcb0d615c022af0f28aacaeaff306803d1f318ea6b SHA512 a203109cd79e12f599e63ae44d1a065404399c644fe0a53992f0a41345b0039996d6f6da9acc791036aaaff720d37e0dec93649f39b5e41b2d17c006ea22cfe1
+DIST kmag-19.12.2.tar.xz 674464 BLAKE2B 51bfab6ec4de54ba98c972b1495b7fe9ae3a1b605c0e7c2e03bda4870e7d84dbc9f3837786f798d9ef0a323aeb4fd5746e6971f6b7f4ca3888ae3d9ebab65fa7 SHA512 9c8161e63b064d6c52b64a3e770c40c7acd45c357ff886ce7934d0b725b7f6e9d19ab9950a773871522be460f3f8bbde09ca67fca57ff7e1568f9874d7e933ed
 EBUILD kmag-19.08.3.ebuild 955 BLAKE2B 6390dea80431073c5c94f457a57c162dc4ad964b112172c66c56f221875c9fc2272db6c05b433c5880c418360fcf8714e1106f919c5bd147a62c00b8ed718ecd SHA512 32f8606d07742b49eec405337a5f70a19a44088f58538ec53c62f8a1506d410d7a4859de215c228d6a7481c8fc7cc3543793ace8f2f6fbb5658b9a445d87b24f
-EBUILD kmag-19.12.1.ebuild 966 BLAKE2B 0dd99c59fae5a832258c2660646acb8bb1b008ceca24232b10148dd9cc2f909ef5aa6da3e312570e149afc9107c95d59d9ed0a1d12ebe22402fc52a8e3d5c98f SHA512 c9f6c9fcbfd7550497ad5411c5fa1df37606192a982e4e5446de27c32382495b176dc70055bf450fda40372835f94d3d6ba59015ad599fd20865b86d64f9ecd8
+EBUILD kmag-19.12.2.ebuild 966 BLAKE2B 0dd99c59fae5a832258c2660646acb8bb1b008ceca24232b10148dd9cc2f909ef5aa6da3e312570e149afc9107c95d59d9ed0a1d12ebe22402fc52a8e3d5c98f SHA512 c9f6c9fcbfd7550497ad5411c5fa1df37606192a982e4e5446de27c32382495b176dc70055bf450fda40372835f94d3d6ba59015ad599fd20865b86d64f9ecd8
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-19.12.1.ebuild b/kde-apps/kmag/kmag-19.12.2.ebuild
index 53f4a1814d5f..53f4a1814d5f 100644
--- a/kde-apps/kmag/kmag-19.12.1.ebuild
+++ b/kde-apps/kmag/kmag-19.12.2.ebuild
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index ae38dfe12420..8e3c08b1cfbf 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST kmahjongg-19.08.3.tar.xz 3379632 BLAKE2B dab79ace503b83032214621d4227bb63eb805cf7df28bd5f4ce63217a67d2fc8626185a500520618e67d3383a7a65f2e50779d5baef8daee7346ffc0a3288c50 SHA512 73a82a08f3ae89a96438f3bb4dc8df2a73efb08bd2a3583d3847ae2a7273838171c255e9275eab4a85661a4d1a4678696969a2f8372aef16d4f5618c497b7702
-DIST kmahjongg-19.12.1.tar.xz 3426076 BLAKE2B 964c6e993bf9c285b10afa3ac4dde1e75df52e8cbdca6a29b43fa30b8dce921c83d62de98e01d1701279151536882dbdb947a8b46f48b02251ac9e23d450fde9 SHA512 3b492c1ddb87d8559ced449fd7a060e7f8333ef7cc8ea55434ea0b2c76ff4235cf396b07b428c8523b753436d8414e834b7ed3557816971d2738d8c91dc3bdbb
+DIST kmahjongg-19.12.2.tar.xz 3426036 BLAKE2B 57bf222c0d6fca57a3c69f36923e940bfc4c32985c19a899d106e55b030294772afe48c3ef28838e7e1af4b3d347ff44996d9f16b5e14a9160d54f466f897817 SHA512 b51d8e9d83dd94a9f3f121fd1251afb1cde09f4698544fa610c514f0ee3b2e3d8c7c0757f3150f324a7182c7a9fcfa98038806e5312adb744beac2a78199e060
 EBUILD kmahjongg-19.08.3.ebuild 1097 BLAKE2B b7b0210adce3cdd50838dcf81680f4d9e6a4a18a1f6c1781a6cd10b0bd1669875128e6c57b20f756fbb02f0d5ed832d6300f70492fd99a8a1029e05ad795845b SHA512 07a53f71a749a2652c2ad1b10bc21a639b2bb251004aca7784b763ba99f49c66d580e4337653af7bf558330dd971baf1f83788e6843f9226eae91fea63fae106
-EBUILD kmahjongg-19.12.1.ebuild 1108 BLAKE2B 88f49a9108236af432e68a37c0d7b5f6744de46b6e5679be3c5338772a9579024fec2ec79e994bd8c31c156dff0a0b3ed6c8f9704b013686e416fa6c543be23c SHA512 003811aec652b7aecac90b8e566b5a8bbbbcf7fa9063a806708fc80cf3a932db23d07591b4bc6d492c1b03dd86789e319e9fb010c9d5446d42230f1ff4ea920d
+EBUILD kmahjongg-19.12.2.ebuild 1108 BLAKE2B 88f49a9108236af432e68a37c0d7b5f6744de46b6e5679be3c5338772a9579024fec2ec79e994bd8c31c156dff0a0b3ed6c8f9704b013686e416fa6c543be23c SHA512 003811aec652b7aecac90b8e566b5a8bbbbcf7fa9063a806708fc80cf3a932db23d07591b4bc6d492c1b03dd86789e319e9fb010c9d5446d42230f1ff4ea920d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-19.12.1.ebuild b/kde-apps/kmahjongg/kmahjongg-19.12.2.ebuild
index bbed799c6521..bbed799c6521 100644
--- a/kde-apps/kmahjongg/kmahjongg-19.12.1.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-19.12.2.ebuild
diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 7d949ea5f06b..fd9fa315447b 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-account-wizard-19.08.3.tar.xz 158132 BLAKE2B bee4936b376b23a5d0952497170f8de03723ad6f4e3298c887701c4ac01e055f980abb1044f4571f31ca540bcacb4872221698b739417267626c0b16f0472802 SHA512 17478c5611bba481f184acd043c8e21f02c832b8da28941ac9f41e37f5b8133c96c6944abd2402e7b42875c058028aaafcc117d5df465214dbae3a93e7e2596a
-DIST kmail-account-wizard-19.12.1.tar.xz 158220 BLAKE2B 9ae5d0d88d5e600138609cd7803d15681483dc07966cd26c21424170a087217a469ed58a6d99713d029707ceae8e663b16b3ffa765a18a3c632e805bbe31db6b SHA512 aedbc7b3d208a6af87cc8435ba70d2cc83f13dd08fc3bb11adac1796b49e75b3f11ab261d02d1aca6f91a389a612eb8c3f8409cc0b2b5ff162c2e3437b943686
+DIST kmail-account-wizard-19.12.2.tar.xz 159308 BLAKE2B d0536b0a046e49ebecab74c681d2d05b2ab56db43ed54dbd713d3a727240a3f0a7154d4cfe535ef039619754d2bec5a01a62c08c9e5b96246a16e5454787da98 SHA512 803eb44ebc28940753095cffac013ecf7ea1a1bd7bf4aa23be9796582ff9c7fd0b13dc94ee2689fdb32d086adb143578b1a23fd282f73b3a7f13765156e1b95a
 EBUILD kmail-account-wizard-19.08.3.ebuild 1662 BLAKE2B 10617b9c762464bd811b6540cc54d7b39695ca794fcbc39cb0c8d4da0a3419da6ae5b1cc805f348f82e1cf972be1788172df6db0818f4d25482ff03869a600ea SHA512 188a26c137aeb9bc1028866193738ac2940cb72dd746e72fe6d0ba09ee158472a931f49050c6100a74194d1ccdf3842ab002335983de724661bd58146ee4c4d7
-EBUILD kmail-account-wizard-19.12.1.ebuild 1666 BLAKE2B 760ead3de6e3f860a960bea883ba1b7c0cdc1e630cbfd6248a1105bdb15dc62af4b6581461b8f239691b73c349e21b8377aae33e874fc873f7507b5eef4ea3fe SHA512 3f4e122fc76e56c4bda8cc9ee936e4b9be88f5fd4ba14b2690f3fa409482d35433ecb915c8bd93da37f8418b7893da92f01e792c780dd3b6279254ececc1b59c
+EBUILD kmail-account-wizard-19.12.2.ebuild 1582 BLAKE2B d26681a958f8f9a3203aaa5d1c00958520c77b0995dd28b11de68704abac899168f41f4bd21990d1834399ceef4f757df7cd4be670d8d94b80aab8e624bb6f19 SHA512 bea2b78d343781f3b6c6709b366e0f3fef4edbd178fc3a5831ea0ca32f3be233618c63cae1eac82b661e9e0b2aa6935877e197d9f62f9d91194bcc447c500a71
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.1.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.1.ebuild
deleted file mode 100644
index 7d56c0600818..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepim-runtime:4
-"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.2.ebuild
new file mode 100644
index 000000000000..16cdd235d9f6
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index c22009fa021b..f995ad69b4c5 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,5 @@
 DIST kmail-19.08.3.tar.xz 4728620 BLAKE2B d487a62df13b49b1d7d054a005481854f8636e72d13be882586f1ebabf0fe02b3c27d47b172da7e0785a905b39cd5ba7e8a9a03d2cefc6be1e542ce354812f20 SHA512 ba8804a47144b62d35a5fa777616426465d5da5d98aaf34d30c7863c12198139e34249315533752a897d48619eb5546810363d5f2bd50622f513e78eb6367001
-DIST kmail-19.12.1.tar.xz 4711040 BLAKE2B 5207af5706cbbccebb7860bfd81852469d68d16fee1d8a1587bdaaff3932595b1070563a3e3f11cc9ef02b33aa3f5172c1857d70b3b27463f2fa4374d2b8693b SHA512 e9a00e9fb33be2b627f46f2b320b2d4e4f96603b635fbea12b2437608558d5bfa2d8662abb36d7722fd5f4e319cf4f47eb4fd4267513e98936a79259d3c27b7d
+DIST kmail-19.12.2.tar.xz 4707516 BLAKE2B 61870fef4a142d01d3be448b599aa961b74ac563cdd866c9ab51f13e078ffd411e790da9cc02f7e986c9d796331835972f4985b8b863318384b903e5b5b41e0c SHA512 84a9dbea7b84d46366d41efdd5640a740fc8ca0c7d62b35f9bd9406e474a3fc685d16d664e3eea4e5b3a1e1896b7ac6bc5d99f1e524f463b71e434ec72a82611
 EBUILD kmail-19.08.3.ebuild 3592 BLAKE2B 818294a2319408edea5c7e908d589d726b03aba6987702af830ce30c2538bfbdb06e9bb8ec20d7603d8ebbbaf02928d3c6bd700ce6034e77cdaf87a0d9badf38 SHA512 b1d9125a1fcc120746263c5e93fcbad105008a6662f038ab117f7376470e5ca6c444adee5dce5c92bdb1a9184f353a31944be82c4dfea682196ea534d7e815d3
-EBUILD kmail-19.12.1.ebuild 3734 BLAKE2B f21cf4dd7e797e4780d084296f28923e526f6422b229264af03135fd467f01ad36f47d724175d97a158e52d714e9c4f6370494954f0fd4aea25c5f5b59dab4e6 SHA512 08f3b57775213e58de8612f03a036e47b7fe510f0086e8245995fd3eb2e35610f19912ec0cfc914cc0d0ed420c1800aaceafb017db692d199b1e8ac0e0f63f84
+EBUILD kmail-19.12.2.ebuild 3679 BLAKE2B 2146e7e537e917b1fc0f5952fe6d48e9d329324d2fd5e7516131bbd5a6a3deae26d64efa40d35f9a509693d6ce9fa86b20da84bed08a7baec1bd302431d86ea8 SHA512 23d934f92ae005d1949da76cae28190e06758babec964d60ce5516266e87054473fcda0163c384b0945c92e5492df7834baeb32bfb32c71ad475117c6cf57734
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-19.12.1.ebuild b/kde-apps/kmail/kmail-19.12.1.ebuild
deleted file mode 100644
index 6f974f55eb5f..000000000000
--- a/kde-apps/kmail/kmail-19.12.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2
-https://kontact.kde.org/components/kmail.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtcore subslot operator when QT_MINIMAL >= 5.14.0
-BDEPEND="
-	dev-libs/libxslt
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/libktnef-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtcore-${QTMIN}:5=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-	>=kde-apps/kmail-account-wizard-${PVCUT}:5
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "KMail supports the following runtime dependencies:"
-		elog "  Virus detection:"
-		elog "    $(pkg_is_installed app-antivirus/clamav)"
-		elog "  Spam filtering:"
-		elog "    $(pkg_is_installed mail-filter/bogofilter)"
-		elog "    $(pkg_is_installed mail-filter/spamassassin)"
-		elog "  Fancy e-mail headers and various useful plugins:"
-		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-		elog "  Crypto config and certificate details GUI:"
-		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-	fi
-}
diff --git a/kde-apps/kmail/kmail-19.12.2.ebuild b/kde-apps/kmail/kmail-19.12.2.ebuild
new file mode 100644
index 000000000000..22712ef46f8e
--- /dev/null
+++ b/kde-apps/kmail/kmail-19.12.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://kde.org/applications/office/org.kde.kmail2
+https://kontact.kde.org/components/kmail.html"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# drop qtcore subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/libktnef-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtcore-${QTMIN}:5=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+	>=kde-apps/kmail-account-wizard-${PVCUT}:5
+"
+
+RESTRICT+=" test" # bug 616878
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "KMail supports the following runtime dependencies:"
+		elog "  Virus detection:"
+		elog "    $(pkg_is_installed app-antivirus/clamav)"
+		elog "  Spam filtering:"
+		elog "    $(pkg_is_installed mail-filter/bogofilter)"
+		elog "    $(pkg_is_installed mail-filter/spamassassin)"
+		elog "  Fancy e-mail headers and various useful plugins:"
+		elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+		elog "  Crypto config and certificate details GUI:"
+		elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+	fi
+}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 419696146a4e..98dd6f79b69f 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
 DIST kmailtransport-19.08.3.tar.xz 166240 BLAKE2B aa05bbd90ac916ea044f1f84842d1f3433c5475b741777b9fc2428cf00f467370afd10273beff92bcc6f72acbdad236118d93d963be19006fdc72fe97c83f342 SHA512 9bc81f8f3ca281ea40661505a5bc192b5bc7cdc80c5556ce617b978c5803f42e8e718dda8530a62a944e156058c290f6b9739f1d6f65e03dd445792a6a1de3dd
-DIST kmailtransport-19.12.1.tar.xz 166340 BLAKE2B 47f9126061386e291a39c61d6a84d5f1e94f77e67a6e35fdae0f547a6335be9dfc85635aef75b36fc7ae238bda8d28c63ea44e2fe13892210ced16286988937b SHA512 3c2b95cbb698ff5c2df475b3a7cb84cffb1c7e62e2399e030a35f266d81249a30c88ad1129fab9a09ef95ecac74e7b23d6c2423c9fb2f34976e6cc91b7303166
+DIST kmailtransport-19.12.2.tar.xz 166984 BLAKE2B 79777d58724b32afe812dbdf2ad226b6d455af8f6288b787efa3ca01725866a9b26a69fe1a4d1df54d90279945749fea4a2328c1f009c46f62d6c8b75a7288bc SHA512 21d995d465cb0ed2ec651d1c423b71611c9767846a32c8f338996425ef93b101aa7141d7d9333b92b224c65286ed615b7729373f30793c32aac08c29dde09e23
 EBUILD kmailtransport-19.08.3.ebuild 1114 BLAKE2B b70aec1a821477b36377d034500c226ee2641e23583672a8211e15117028d2ee079e302377537213a41340203af3b8fd5ea06629fef130ecaa1d9c9e3d7f24b3 SHA512 e5f829ca339630cf098da4dac699c0447b1c935a818fd92f3a81e01199721ce8dae26b189ea196ec1311bae488266b1de4ff42c97ae72fc8a4e4d32271e8c11b
-EBUILD kmailtransport-19.12.1.ebuild 1118 BLAKE2B d46712a12423a8439ccc27fe44ff0e56f23185521d0cf00f25f3c05c6ada8eac2bd2a6e44c646f1a213498ad0464e0400ccc33efa5a86e880ee74a2e8ff492b1 SHA512 c375e91432a6b45d776a856637a662603b50f3cde689222ea1af2af34a79d412ae4fc567a8e4187548946d6f3bf2c9ea94905e9fb979f15fbe700698f7e9b24f
+EBUILD kmailtransport-19.12.2.ebuild 1031 BLAKE2B 09c8488a0c1ced0aa84ba7794b543b1a8f2da465de6d207b80252f763e94b152a76739b0757529cbcfc8db010a29dc3b715c6e6ab028e432b8a00fd3b1d8d7b2 SHA512 6cc39d4afb1aaaddc82e6afeda92590bdebe68c3cc24b90b0caf3a1730aca4992a86c0013102a11cfdf7711f166a406a00c59b59742afb724857fc517498e4dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-19.12.1.ebuild b/kde-apps/kmailtransport/kmailtransport-19.12.1.ebuild
deleted file mode 100644
index 5993ff028da1..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-19.12.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs:4
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-19.12.2.ebuild b/kde-apps/kmailtransport/kmailtransport-19.12.2.ebuild
new file mode 100644
index 000000000000..0d58c6283678
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-19.12.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Mail transport service"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/ksmtp-${PVCUT}:5
+	>=kde-apps/libkgapi-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index 07342893933c..8b2d9be4a5b5 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
 DIST kmbox-19.08.3.tar.xz 24444 BLAKE2B 1af9208c9d9420f85b7ec2550deda2b3ae2d7621717d098b01ee64a26b0e8c744acae5a666868b7365851001ce064bdf1df9cf13d70adf73e25c86452fe3e1ce SHA512 90b0b171df44badfd4a584fe9b6b7d9a874f956eacf5af727cb1d6b019c24e965b7f0830177075ca20ccf7ff3721ed1fa493f34739852555b48a8ac08fc554e2
-DIST kmbox-19.12.1.tar.xz 24592 BLAKE2B 815f226e9f76de698c18eac99eef9dadcffc09f61401e90b82d0ceb6f7fc8487e30b9a92fdcf19ff081ace9200e30bbc79b184b07dd51b49632974f6054b0da6 SHA512 9cfc2502cbf260532f6762a7f491bb3edbf265441260870656100d7acb6c447dbd40e089200d718aac2e881333597b4cfcd340af54455719396c1dc1ab5fbcd8
+DIST kmbox-19.12.2.tar.xz 24688 BLAKE2B d7567de6878c5b27e5be1cc2cacba5a175368132c05611ab06426297be0f7c986865d40db23122a329de23df89266d48f81f39feab16ac6606a3b34f8651895c SHA512 4b16d7e3de5e3e5ed7e5633a0e0d67eb4d7b323a74a67547cbdc9e3d91bff6473ec28dc4d838cca5c2e620b70d1651eb928e0b4c6f341b970155f5183725a703
 EBUILD kmbox-19.08.3.ebuild 352 BLAKE2B 709ad5b61b7f4bcbd7ccd97b0e923ff4a60427fd18611751f48315e4e3c6fef6e792456936b0f10e17f086b50fd1e0bf10d3fe228812aec7bd838eef0685b828 SHA512 1a6134642deeaefdd68219a508f6a02644808495cf8207614273e9c100f800ad81acd744a364541ab4b2f204ee9566de7e4cb0848a908f3037bcf29bb58de909
-EBUILD kmbox-19.12.1.ebuild 356 BLAKE2B a5e77ba20d3672f63b9d1edd6a4dca01e3bbbf983bae58504401389d40ae7bf2d28176f630f2aca7534f2b69c6eaa7c55718bc9dc523da4a0750bb9dcaf63b4b SHA512 8dc40e24d25302b7a70d7d958ab508d758eef6cf7418a7f5237482379a30bdede45ee637eddff1e12e51b64c0d9120b0660e14640d0b64aec4ca0e3aa6596ed6
+EBUILD kmbox-19.12.2.ebuild 356 BLAKE2B a5e77ba20d3672f63b9d1edd6a4dca01e3bbbf983bae58504401389d40ae7bf2d28176f630f2aca7534f2b69c6eaa7c55718bc9dc523da4a0750bb9dcaf63b4b SHA512 8dc40e24d25302b7a70d7d958ab508d758eef6cf7418a7f5237482379a30bdede45ee637eddff1e12e51b64c0d9120b0660e14640d0b64aec4ca0e3aa6596ed6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-19.12.1.ebuild b/kde-apps/kmbox/kmbox-19.12.2.ebuild
index 68363a4586b4..68363a4586b4 100644
--- a/kde-apps/kmbox/kmbox-19.12.1.ebuild
+++ b/kde-apps/kmbox/kmbox-19.12.2.ebuild
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 543e3df6055b..80889feaf326 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
 DIST kmime-19.08.3.tar.xz 146916 BLAKE2B 432a05165d3142892cc3ef1de34a420a627a801f04859c4ada8cef9f995eb9c072cd6ea065daf0f0a2cb337d42c044352871fe9acd1640aef6d49a31b0f999b1 SHA512 c8c03bfa7e716190e08ae05261226e38aafb4a4c86b3ce35ce9d7ed98c3a8a5a676d14894d4a206193e1ffbcfdd95577210d954661805d3ba901494f0cc70ee2
-DIST kmime-19.12.1.tar.xz 146976 BLAKE2B 519832a488116250dd7826435532dcc778a357d71167f3a21fe0ee459aa0b8318bd92a0167b29234fd1b18172794361bb447acef33f14abad49f15053b8d40d5 SHA512 5b150837f5876c0950e9306914fc03e008122244ecfb66330a6feee4857380684118c2e86b7d5512c65803e1306b486a65299b29da036b42222b2450fd3f1bcd
+DIST kmime-19.12.2.tar.xz 146628 BLAKE2B 919e81df10875461155d36dc7515dcfce1dc2b7aa0f84271477cfba7bf25073958a15ad47a4cc797b71496eff673d9c1bfce00e239ff9af43b14bbcbc1682423 SHA512 5df4b5e81de9b4b7026e41faca5efaba3c484ddf18ac4016e67ea9464ae7bc3e2307a184396c9411abacacdf91f4493b1509e45fd322625d935a6f0788f5896d
 EBUILD kmime-19.08.3.ebuild 423 BLAKE2B 71aecdf4c1ceae43d276ea0175ee7b8680a76913a49fdf5722e00e2946631efb3b100d9a59b930ad7edc6ed00f3cafb8442845f4a3535d3889619dcc448b248f SHA512 187bb1a60524768e81b75f153b2347ee1c668621e339e32169bef57a2228772889a2bed5e6974e44ef853452055bdd6c4d2f31904a9739696903dc9054248e96
-EBUILD kmime-19.12.1.ebuild 434 BLAKE2B a478079610f1a90c58c7c55207e1914154b2f8abce89b9c94ae9a1b1ea0fce5c6561025dbbaf7ddaab55662e3c156de2fc7294d9e1a6f5218e22c7a6adadbf56 SHA512 5a3044a48c67aec3f9ee901430e6bd9da47c8fe7da2da5df7066a3ecd46080f302abb3d758ad58629ff78ac95a163f6023f0715bb10c9e36a9421ef02be2719a
+EBUILD kmime-19.12.2.ebuild 410 BLAKE2B 157ed361d97d536aafe31ac20146ef9cc5b35bcc8811e0e74a58e4a1da571679d789db3edd017005f28fbda9aac468aef49f0e6220eb3cbec4b595eccd456e49 SHA512 55f411799fd4e355c433ebe4a38db9fdd4c956ea0024f4bbc73c30dcfab739db9ea76a9fb366ab0f2218d37e1c314e1dbce92e2b20adb1e56f47ac930edaa565
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-19.12.1.ebuild b/kde-apps/kmime/kmime-19.12.1.ebuild
deleted file mode 100644
index 92f6957fa6f8..000000000000
--- a/kde-apps/kmime/kmime-19.12.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.63.0
-inherit ecm kde.org
-
-DESCRIPTION="Libary for handling mail messages and newsgroup articles"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kmime/kmime-19.12.2.ebuild b/kde-apps/kmime/kmime-19.12.2.ebuild
new file mode 100644
index 000000000000..be6eed4cf7b6
--- /dev/null
+++ b/kde-apps/kmime/kmime-19.12.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.63.0
+inherit ecm kde.org
+
+DESCRIPTION="Libary for handling mail messages and newsgroup articles"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index dc92fd758185..1e7046181a0c 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
 DIST kmines-19.08.3.tar.xz 898548 BLAKE2B 115ceeb70657058c8129e2e0c16b8d896c86cddb6a1d8ca2186a05f3dc2ad31a92379c62c99c8b7daed5e27fe24cf47dacf4aac5876ce8e914baba60496ba87d SHA512 6af27ac194f798809aa2002909e9c54b17948b50e94c2846c8ad57f29c8210a1d407d7ba44d3f25b823b6d0a5fae0ad86f5325d9af7657dd394eb899e43856a6
-DIST kmines-19.12.1.tar.xz 898180 BLAKE2B 0c89c1d20d9589e889e72af75df98e45fab23a79a259f1b6a70af6f85d7fdded83385d5cd874ab0ad79d92bdc381bc88bc7cb5f0b355f1bf7fe6c1ba68af47cb SHA512 b80a45a8520411bcc5bf07c7a6689566cd91f2c1ef5d8c8ac16ddef1d50105d4e010a99f85c5f52982199f4fcac0bb731171c57d674048c9eb213392e3dde02e
+DIST kmines-19.12.2.tar.xz 898976 BLAKE2B 41b903c77f3c457938c8353862ba00da77a7362bec851f866c0a01c831b6635ce6a13f0796c91cfacb5f6704f4bd29c3317228f85c10c369ec1f116b9634005c SHA512 5a99d2ec4ec0c365248cb6dfdedc1f7c0e83f5c530c12937a7bad7dcff840751d0bfc59cf638e99365ef86a3ce49e122cad47e5b560bec37c1dd339202bcf589
 EBUILD kmines-19.08.3.ebuild 930 BLAKE2B f2b9f483a6e57581ea44cd67b336fc1229d97f6b46f05504f134fc320711965b9ed1d7beef0da0d6a93cb1d8e005c9026ac3dc4591f9748cde85ffca1fb558a0 SHA512 9728be485e4213d9d58562812a2901663a8e18d442047003f3aee50d44ceecb3b73709cfc9b7302eb1096efbb7bb9bd81acd24c64cf03a4e9814f7fbdc688d95
-EBUILD kmines-19.12.1.ebuild 941 BLAKE2B 94375f0fe80aa536fcb7aa6eb16f1e05af4bd4147f124c52d3a517a077776938db4c992fb0258fed54a6840c5c4870462777c99e147016cb2bd53595f9c58d45 SHA512 21b995b64e8524347d0050f12b2c6553a3bb90f965f1c465fbd4596261303c31cf6c50867c139bcc3fbfbac17f70a21066bfc82b76e98a6c1af39e9eecb7d9ad
+EBUILD kmines-19.12.2.ebuild 941 BLAKE2B 94375f0fe80aa536fcb7aa6eb16f1e05af4bd4147f124c52d3a517a077776938db4c992fb0258fed54a6840c5c4870462777c99e147016cb2bd53595f9c58d45 SHA512 21b995b64e8524347d0050f12b2c6553a3bb90f965f1c465fbd4596261303c31cf6c50867c139bcc3fbfbac17f70a21066bfc82b76e98a6c1af39e9eecb7d9ad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-19.12.1.ebuild b/kde-apps/kmines/kmines-19.12.2.ebuild
index 7715d4502a5b..7715d4502a5b 100644
--- a/kde-apps/kmines/kmines-19.12.1.ebuild
+++ b/kde-apps/kmines/kmines-19.12.2.ebuild
diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest
index ca9a16a95841..c1ade207ca68 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
 DIST kmix-19.08.3.tar.xz 1005308 BLAKE2B 0012bba9b539d612452153c200a62adc3275d8a206b053b9b82f886d0568bf2be0a7a3642473d0145c37101ce00b864184e95a4fbf81c4add5645bcc3f860652 SHA512 d2fb9e02c9981974c3df5438fb3e7544d64a51c7fff6ca5565dbb7bd06beda6bef2268fc5f343cf7acdfc8eb7d0f21d10f85feb7222adaaef1305d587e31cad0
-DIST kmix-19.12.1.tar.xz 1008224 BLAKE2B c6a8de2191d4dcbbf99ff3dd63b795ccdbd60f1499b3ad55699a6e0ca122a7f901b2d163289e742cea8869bf939112f59c29708d8fe2bf323913de9a650836d0 SHA512 1b17f1af2078aa2ebb368c3473ef98e509da13342c12b9e7e8d768cfb0bbf7e2b6a54ea7ce73e957471c9b31d0d3042492979db96ac2f076552f563f91d96dca
+DIST kmix-19.12.2.tar.xz 1006716 BLAKE2B 2b08d97f8a422e4d6fca4b21b74f6d5071d4a26dcb0e54b107a1840876a6214e829f9578d2f61cbce3bbfbcd804f21337bd3b0e0316eec09df13095aeb6c0787 SHA512 948e4881b56a8fc0b707940607f67c401b2644189acfe653b8ac35a8d035eff4a79b8c0890248785062a7696aa785b347cab37ae6882b64f993f242adabd8bf7
 EBUILD kmix-19.08.3.ebuild 1456 BLAKE2B 487533b0b714afcdbcf3429844c6a50758b8b441110c7dc958b37f9d82e720daaa80ae04f776d972ab9f79e8e94a1691b6e2be8fabb46cdbb0c513e0e8768eda SHA512 9fe94ad313e4ebd5063fbc57fefff59a13ca490d278befecb80dc95d6a5dcd87508533347ba9f13ab6e01d9f73ef0aff6e25a6a75cf4233b48748378e7cdd582
-EBUILD kmix-19.12.1.ebuild 1523 BLAKE2B c7f52148058006643748be14ca105444bdd2559e49a3f625e6d22fc07a70a96f78fd98b3cadfdb8c9e782f5a5d4f035d90eafb0c6b60b262f39f363051a7e85e SHA512 73b6eb10d449bb365f12adb0b265f0cded8f5c6deda3a1c8532b00d98ab339945ae7d635fd3d281e48e9f2172cb4a8d84177fc9fadf0916b5c90f4669f590669
+EBUILD kmix-19.12.2.ebuild 1523 BLAKE2B c7f52148058006643748be14ca105444bdd2559e49a3f625e6d22fc07a70a96f78fd98b3cadfdb8c9e782f5a5d4f035d90eafb0c6b60b262f39f363051a7e85e SHA512 73b6eb10d449bb365f12adb0b265f0cded8f5c6deda3a1c8532b00d98ab339945ae7d635fd3d281e48e9f2172cb4a8d84177fc9fadf0916b5c90f4669f590669
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-19.12.1.ebuild b/kde-apps/kmix/kmix-19.12.2.ebuild
index 5564f3ad76ee..5564f3ad76ee 100644
--- a/kde-apps/kmix/kmix-19.12.1.ebuild
+++ b/kde-apps/kmix/kmix-19.12.2.ebuild
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index f9286b29f9b4..43242956517f 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
 DIST kmousetool-19.08.3.tar.xz 113556 BLAKE2B 1a80690a76bbd9ff582073b64837ae3aac1852d748b0d9d97c1f06e094c446be601da0888ea49c01273e190448bcf665f316e6107d8a464248a4539220fed8db SHA512 00d3afb4282a379d9771758af86a99ca65fdfce53482873bc32b8f9818ff56ce01350033a9dececbd89a4e06b15fcd21041a708eafdb74d516eed8bfe7ce69da
-DIST kmousetool-19.12.1.tar.xz 113820 BLAKE2B 476ff184a0fbf6b2532371194644e8a984aa4562c4f287cd90c4dceed03ad139431ad4e90590e0a6c3eafdf41cd732f1f25e1edd503aada5b5a0d213f2d80a42 SHA512 fb368e92bd2963b29bc91f5b0069bbd28783d31cc04cc198ab2b74b0ca6bb71b1e0b5c0ed0990042a880f28df1929ceafadc3997d2dbc34e543fb4c3e821850e
+DIST kmousetool-19.12.2.tar.xz 113876 BLAKE2B a3dc44e43fd570173960a475ab400af1c34d12657a3299180a04ec115b6dfe57757cd8bde870e67f944dbc4dd48d23b476eb5e27ffb807372066b3d57fe8f3fe SHA512 e8788132cfb51034ff0a06bf14c1bb5b4dee3dce6e185996db59874cd57ee7910d99ad03edc7d3c9f8ccb5bbcc5b776c86eea4f538a0bb34b3491c756ecad788
 EBUILD kmousetool-19.08.3.ebuild 873 BLAKE2B 092809d6df0cafbe6973afe7f9a10139016b96d3abe62864bfd4cd8755eab0b3fd2de3f4378715c2047e0e2e3722bc249829ae883107abbba8262628f4a8600a SHA512 174acc8f4426956b70c34af8af1e39c7da49ed83294912be174b4d45cfe70099fc8ccf77d08845d3c4db6a9952fd44d36893feffe68e4a0fe95325eb25e6e00e
-EBUILD kmousetool-19.12.1.ebuild 884 BLAKE2B fb692bf2fde58a6b4506bbadc452fabdebe5d7832d05fd3e8a5dc15b8158d17e8f9fd0ef88953f475f5111c0e469b5a1b4538f84eb65e074e35663d48c40ee63 SHA512 d74680b5ea7721bcbaee1195fc4a6f5f91532adb791844b1b26f6d9783590f90970a623fb3d3bba25efd9a46655c9f0998f47a1a01ee7dbcd6c9e1f4d35b8e81
+EBUILD kmousetool-19.12.2.ebuild 884 BLAKE2B fb692bf2fde58a6b4506bbadc452fabdebe5d7832d05fd3e8a5dc15b8158d17e8f9fd0ef88953f475f5111c0e469b5a1b4538f84eb65e074e35663d48c40ee63 SHA512 d74680b5ea7721bcbaee1195fc4a6f5f91532adb791844b1b26f6d9783590f90970a623fb3d3bba25efd9a46655c9f0998f47a1a01ee7dbcd6c9e1f4d35b8e81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-19.12.1.ebuild b/kde-apps/kmousetool/kmousetool-19.12.2.ebuild
index 6dafce08871b..6dafce08871b 100644
--- a/kde-apps/kmousetool/kmousetool-19.12.1.ebuild
+++ b/kde-apps/kmousetool/kmousetool-19.12.2.ebuild
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest
index dad4a40acce2..57ed695e6a5b 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
 DIST kmouth-19.08.3.tar.xz 1965320 BLAKE2B 493f3483577e292e9199d699886988bc79a4d96a02289f3aa4943e6f07d9f7f2bff26cea62fcf7ad054754e834564d25e89188db1be4db58337a3b0cadfb6d91 SHA512 72643b0185a42614b41b6d575200037eee12492c77e5127624f014a5f7d56e885709b8e12731f434cbe28112fb90faa567c105dca83e6afbb4e75c74d843e76a
-DIST kmouth-19.12.1.tar.xz 1966216 BLAKE2B 283cd8aa9bca77dbde43199344a21146940dbc0f9298c4284b310c3cda046c1c15a1e828815c3947346a02ee248c05b5f15a924429370be013d68472768d4116 SHA512 5422646d0c14ed3dc760e007cc7e12f6b135e7c2eff2fbb39aea01bdca70f2849deefd6c297ee498bc2e6ec6bf7d566e12a97bfc2c6bbb1947cfb64f16ff6ee2
+DIST kmouth-19.12.2.tar.xz 1964648 BLAKE2B c7bc2915a653785ba39841a5e6dbc61c80885a7695337b0f15c8fbc4e98741be78d987e283f23bd8f8163970874d6488046d4c35d8aed4103b0eab0b3828f2c7 SHA512 fa26ef0a8a950bf40d4fd73801926290c19ac969655bf67c7ac0a946ac8c6b3fab1c3e4fd63d9e81e6b51e7ddc296aa9cb03f0269ffd105607cd57ef027acc5d
 EBUILD kmouth-19.08.3.ebuild 903 BLAKE2B ce486a9290ec574a393c11290112ff99b31ab912f6401a5b331c8d995d34ef068ab815ab9a31066f3fc1016db9cacd1e39cccaa40d21c692a88f8e79f0827aaf SHA512 3bbe1758a44106b5081dc51bad76f7c9b7bde4d973e44ceeecc2bdb4ccf442dd5665f964d1adff1a69c458b2797d9c15e3ee68a4c4ddd894873fe026f67eb7b4
-EBUILD kmouth-19.12.1.ebuild 914 BLAKE2B 5dc09a7fb2dfce5d623a9f31d6a00c5dacf1ee55681c6e09e03c0abf0a67003e56aa381fe64a7cd5851abee8f94aeeb073f59b39c3de6ca8c938c9fffeffedf5 SHA512 57062269091fce698d7b7c74b1f634a81c75c2ec39daf0d392a6fd2d86ad8b592e0175f1c54d3a67f9229d715156e91e4c9f6d48156b623df20f36630d9c06a7
+EBUILD kmouth-19.12.2.ebuild 914 BLAKE2B 5dc09a7fb2dfce5d623a9f31d6a00c5dacf1ee55681c6e09e03c0abf0a67003e56aa381fe64a7cd5851abee8f94aeeb073f59b39c3de6ca8c938c9fffeffedf5 SHA512 57062269091fce698d7b7c74b1f634a81c75c2ec39daf0d392a6fd2d86ad8b592e0175f1c54d3a67f9229d715156e91e4c9f6d48156b623df20f36630d9c06a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-19.12.1.ebuild b/kde-apps/kmouth/kmouth-19.12.2.ebuild
index f34472366994..f34472366994 100644
--- a/kde-apps/kmouth/kmouth-19.12.1.ebuild
+++ b/kde-apps/kmouth/kmouth-19.12.2.ebuild
diff --git a/kde-apps/kmplot/Manifest b/kde-apps/kmplot/Manifest
index 5ae414bea696..7b7d0aa84cd3 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
 DIST kmplot-19.08.3.tar.xz 3054096 BLAKE2B 473d87d5e98c1906cafec669e56451301787bee65e43e6fb77495fb76f3e36a2865b85234b6c73adf9999991a06a47c381c210d1566ca9ff4877127bc62b9a78 SHA512 2a2925658ecae3d976a81a3830f8aff71df5ab314f0326378fb2fa95b9aacb364ab5b5603a7bfbc36aa6f3ec88ee6ccdeda4283ac3a0d9c4bb12ba4bb1681979
-DIST kmplot-19.12.1.tar.xz 3054948 BLAKE2B e0e7f24a25948e0bf74da508d0c676c749f93645a8591b682a4eaca9799e4004c4909e5981331a61937bbe9280b91f2047208a1c666a7158c51a657e8f0232da SHA512 79689ce9c9b629845dff01d676aac0af991f5da4183b3b5a9f8a8a09b94fc52aa48958ea6733800e263c8b71c4a557f863265408850d931ead2f94467a842195
+DIST kmplot-19.12.2.tar.xz 3055296 BLAKE2B b54060f7f04b0e9c2e0a96a0d660d325860459a5344d3229423204540505d53710388ca9fdb35a10e28af937fd96bf768778fd85ac81204767c0fe495486c7ba SHA512 178ad4683ffbe82775d2cb53cd925d54912e650d2e5ccfec0d2af3a69eff07d195cd81b50ad75db994939bafe92e565597d285abfe875a7859016421b24cc4f6
 EBUILD kmplot-19.08.3.ebuild 1071 BLAKE2B ea6991edb5e38329cda5d29bc05449ddec6ee5970ca58b08ff0ea34c83aa52b63a429751f57e7ba8943ce639691e69f74a49144a4a2ff7e5c8198cd4a5f1aca3 SHA512 144692c7a7795a74ec28e878d6e50b9e3152d766bb64b7c40512a67b037a74e945c730a780aac81669296bdfbfc7f4b7bfb3b47f78a568164993ccce806d746c
-EBUILD kmplot-19.12.1.ebuild 1083 BLAKE2B e6e881eaded6c1b8fdfe29465302dd7626db177d81e5e3ca1e27bb596b51e8b09024dfd7b1bca2863b87b87e2c09800b2355a2c139c426547b9467395fbd1d21 SHA512 c58b2ca75550b22943a7ed3f866f4711690f4aa60384fb34936b996d55fff58bac2b190ae0d8c1bacfaa7d6604b56332fccd0fb87e8cc0d0ccc0c2f95ba0bf69
+EBUILD kmplot-19.12.2.ebuild 1083 BLAKE2B e6e881eaded6c1b8fdfe29465302dd7626db177d81e5e3ca1e27bb596b51e8b09024dfd7b1bca2863b87b87e2c09800b2355a2c139c426547b9467395fbd1d21 SHA512 c58b2ca75550b22943a7ed3f866f4711690f4aa60384fb34936b996d55fff58bac2b190ae0d8c1bacfaa7d6604b56332fccd0fb87e8cc0d0ccc0c2f95ba0bf69
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-19.12.1.ebuild b/kde-apps/kmplot/kmplot-19.12.2.ebuild
index f2839ac91029..f2839ac91029 100644
--- a/kde-apps/kmplot/kmplot-19.12.1.ebuild
+++ b/kde-apps/kmplot/kmplot-19.12.2.ebuild
diff --git a/kde-apps/knavalbattle/Manifest b/kde-apps/knavalbattle/Manifest
index a63b22bde093..01a3619d5d98 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
 DIST knavalbattle-19.08.3.tar.xz 1281260 BLAKE2B b446600aa8799d5198a2a0399349762fe71259ba08d86e705796ff2b589b0f88ea44bcc991bd6747307246b00ce93eb455052061ddb91a38faea4252205e7065 SHA512 e4e80f729698a9c0ddf6d71dbab9318f25e7b6b70f768b11a7738c21a89de62f08b36f42e226a86a54ff1df7d8c16ac8f946bfef96e4b8d6b00707648c971e7d
-DIST knavalbattle-19.12.1.tar.xz 1280848 BLAKE2B 82613822ab97f38c265940d4c4958c67eff5aa6c989754a962fc63fdc949d531e43b4e586777180687d629f5a8c84707ad38e502dc41d881d23af59359bc3b92 SHA512 d01f4ced36848b049af07dcf6d57097bab20ca5be5325f3453d828212f4010c3e217907f694efb3019034435b5d71a9b05afb9deee56b0a556873339a1e4de86
+DIST knavalbattle-19.12.2.tar.xz 1281752 BLAKE2B 2177c019770254d6958ba90405273a80b74a84d08f01d138e79c5a07a648a747bfca9cacdc045a6c3e9a81ddb880bfa26bfe50620e811bedc3ecf0d452a3815a SHA512 e42ad3a38459aab2b8427d1951363e71c6264c80552f31227f0d1e24b1be2f5095daa0fa047595546534cf133a641cb6d8b5498bdb7d3d38f7e4aac7f6df9ad2
 EBUILD knavalbattle-19.08.3.ebuild 1059 BLAKE2B 6879f59ce53dcf460b408712ed6e5b99ba5c2c957cd119cce6e3a063f8374b43cff4f3ad3be835a60bc03a92589e6519b67c9d349c6e59f2eaeb28d466dc39f8 SHA512 f2d2baedac10ed79695c6809e500c63a8cc7233fb9d3c7f9bc6ddb23051da9807863de0a47950974f3a13d3482b2f1a37480359af2cad3c3bfd8bce53bef18f3
-EBUILD knavalbattle-19.12.1.ebuild 1059 BLAKE2B c0a64e43d9a7cb04022f0831b6c75dc1ea808749c9f267bd00bcf3c32462e99b6e04dc78beaa81bd24a74dec73388b26bce023f8ba4aec7236f96b3a8ae331a7 SHA512 2ccbc6749bd2836f79d8bf3432783549049be51ac74aa3af2345ee026aa0dc3464354d2f214bea1983d697134a2686af4d6da1f2b2099bf044222bbb59d6081d
+EBUILD knavalbattle-19.12.2.ebuild 1059 BLAKE2B c0a64e43d9a7cb04022f0831b6c75dc1ea808749c9f267bd00bcf3c32462e99b6e04dc78beaa81bd24a74dec73388b26bce023f8ba4aec7236f96b3a8ae331a7 SHA512 2ccbc6749bd2836f79d8bf3432783549049be51ac74aa3af2345ee026aa0dc3464354d2f214bea1983d697134a2686af4d6da1f2b2099bf044222bbb59d6081d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-19.12.1.ebuild b/kde-apps/knavalbattle/knavalbattle-19.12.2.ebuild
index 5ef93480d198..5ef93480d198 100644
--- a/kde-apps/knavalbattle/knavalbattle-19.12.1.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-19.12.2.ebuild
diff --git a/kde-apps/knetwalk/Manifest b/kde-apps/knetwalk/Manifest
index a772dc021360..8ed3b7f632b2 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
 DIST knetwalk-19.08.3.tar.xz 1038688 BLAKE2B 61f2730f5d1281dcc5141c161fa4f7b5e618808c48beb50dba997a503ab32fde6c394380a466bcac93eaabcb51c93c0dc2222222495de8be6b8f76c4757bc25f SHA512 874af0de4e3808a1ff497d619c74b2c1d36f765e50b32dbef24bdcbc801d9756e64330465ae8604585acde43f6cd620c98b8896d1dec2c30dd49a821927a336a
-DIST knetwalk-19.12.1.tar.xz 1041176 BLAKE2B 1c6f8b53e5c1272374799f24904b06e59a577715c92546d9a06e358bb7c64b3ad0779009ddc744218d1e7fbf7817199f709bc1ee3015e7be8ff5ed0348541599 SHA512 9ed8be8d3fcf59d19a519121e72451001e249bf86d2aa0b4f2ba67b234f71969c332531b263d715cd524cfca32ea4ba574f1f26e291598fa79de0c263ceb9830
+DIST knetwalk-19.12.2.tar.xz 1041000 BLAKE2B b0374d19506178131830c4d5658513847374c6ddb54ab3d70439470d7dd766a5d0cf68836a7bfe415a1df51154ec3d2cd9e4ecddafd089da4ae592fd9c920afb SHA512 09fc29d832709caf230017ecf1751c0bb5b671bfb4983de77e3cffd9696e3f9e2b30e1bb1aa7d24a5fba4c97b2e4c77dc9b5bf78705855668579a9adc07f6dc1
 EBUILD knetwalk-19.08.3.ebuild 1031 BLAKE2B f5e610e99b472bd828d96f4466d89205a5613a672bcec0e2d13416a61375b90c169228763ee302fe2c4c166ef37a4a691324398910ee86951d1dbcf9a6d71f05 SHA512 cdac5092334e04f8b67bd0522e193652b8cb5b8158622c65c6e29c3847676e2afb76a66d4e788e74ed14e9a56f995f1f139b149d691eb1b51efc84c11c029d74
-EBUILD knetwalk-19.12.1.ebuild 1038 BLAKE2B 0dba820c6541391fa90f13ac35431e1d255d04876d6669a1033576ae75ea3a468f2697656b5ba8cd0e40a061246fb103473673225b228e09cfe0fd9931ee614c SHA512 f9abeae5bec6e26201463d16737779ad31e15aa982888ab0093711d0676aeaef4b1c4cf32b4e932d44c369c2d87510cda05531c2063d4cff1cb6cf125cd1e70b
+EBUILD knetwalk-19.12.2.ebuild 1038 BLAKE2B 0dba820c6541391fa90f13ac35431e1d255d04876d6669a1033576ae75ea3a468f2697656b5ba8cd0e40a061246fb103473673225b228e09cfe0fd9931ee614c SHA512 f9abeae5bec6e26201463d16737779ad31e15aa982888ab0093711d0676aeaef4b1c4cf32b4e932d44c369c2d87510cda05531c2063d4cff1cb6cf125cd1e70b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-19.12.1.ebuild b/kde-apps/knetwalk/knetwalk-19.12.2.ebuild
index 96a8af1cbab0..96a8af1cbab0 100644
--- a/kde-apps/knetwalk/knetwalk-19.12.1.ebuild
+++ b/kde-apps/knetwalk/knetwalk-19.12.2.ebuild
diff --git a/kde-apps/knights/Manifest b/kde-apps/knights/Manifest
index 9de5e22ab744..035a26c792ce 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,5 +1,5 @@
 DIST knights-19.08.3.tar.xz 3515644 BLAKE2B c780c66b837b7edd86d2731af5202de18504b8ecfbc96f4267bc83877f2d650dcf548d3000c2ddd754a339bf92389f786b7d46159a642029b2c7c8af828eda46 SHA512 5108acbae50c86780b1c4dbcdef268af87593f65da2544c8822bf3de169ed1d5a2afd74edce8c35e4be9f9715cbc796ad8120daf198a8ad2d310dc7629094753
-DIST knights-19.12.1.tar.xz 3516696 BLAKE2B f065cd95a19c667b831ccd0665e45092875a0bfdca5e172061a4702b620b8fb30bcf22018de2773fd04438010ca9836cc9f8129607e815580dcc9d21f8a23264 SHA512 34cb9e911778e215fabdf767eed67c5c2637abc0f17039aed8a924f5478f194f87eb7909c96690d2761255f9e31de9aace8a77da399803ac81aad3b28ce928da
+DIST knights-19.12.2.tar.xz 3517448 BLAKE2B 5588c68401a04882ff39d3541dce9b75d81ad69e4fc8982d85e20975743e270f4edb85253da73dfe01233a6bf51363a6eae3ee3c3a365d57ad8c5a88bc3580bf SHA512 1fbb1cb4e861f793b5f4731e6e2e4d5c61069d0036ed1749a0117ca03eb029fd1a2c24d8a8518e14a60381d3ccf95c70ce82e493737c7a3c552f9d471147732b
 EBUILD knights-19.08.3.ebuild 1345 BLAKE2B 40d2f58c755daa235f7faddd428d7af7e6a9836a1dbdddeb3c9e3cd7d1339b0aa681d7355e9f5df83c5890adedfa4b00e2b7897487976ba41b8b4135afbd4541 SHA512 ff8309f6d54d446bce86c4c4ff91f30fb1ac7b7477b8fef85559210ad0a28b731febb76b1a19dcf46b5b1fb2838a22fda7b5775200a809b168d4e0a9d8238d20
-EBUILD knights-19.12.1.ebuild 1355 BLAKE2B a64239fb7e62ef188846ca5fc0150fa890401da5643783dda9325a719c2cadbcb8c3d70629d5812e19875d4cc2afbbf58899e3164a338f57b68c254e529f1207 SHA512 8d4c53b3df24b67b5f6d7924d0d96de12044fca8307d2f0908f7b1a6321b260ee967f586c5254505a3fda5272c3264549756ff2dd540518379dfc9d0b71bc216
+EBUILD knights-19.12.2.ebuild 1355 BLAKE2B a64239fb7e62ef188846ca5fc0150fa890401da5643783dda9325a719c2cadbcb8c3d70629d5812e19875d4cc2afbbf58899e3164a338f57b68c254e529f1207 SHA512 8d4c53b3df24b67b5f6d7924d0d96de12044fca8307d2f0908f7b1a6321b260ee967f586c5254505a3fda5272c3264549756ff2dd540518379dfc9d0b71bc216
 MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-19.12.1.ebuild b/kde-apps/knights/knights-19.12.2.ebuild
index dee7a2d0ac21..dee7a2d0ac21 100644
--- a/kde-apps/knights/knights-19.12.1.ebuild
+++ b/kde-apps/knights/knights-19.12.2.ebuild
diff --git a/kde-apps/knotes/Manifest b/kde-apps/knotes/Manifest
index aaa9a538567e..ee0b66e50459 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
 DIST knotes-19.08.3.tar.xz 319336 BLAKE2B 2ea763279e30399cb7b68895ac33c751c4da3a407bd73dce151ca7febe2054a40a83eee1fb3dfab530b3cc3f9b2b3b1d8c4b99cb8340bf3f77fc41e7a8be4a9f SHA512 abe5fc4306dce76a4880a1abc31a80875004ae6ab8709af4fb373c16d9be53cd7fd54b7e36d0dc405f3a2071258abaffa2804b8a42532a57adec7c90c3b497c7
-DIST knotes-19.12.1.tar.xz 320672 BLAKE2B 3a88ac90f574c951c2e3763a5a3da85ded51184cd5bec2fe5ee2cb6036cf3a0ebbc7c1889c61f243e8e35d1a6bbbd87c84d30bc7fd442969af813d8371508144 SHA512 9e3c4bb036f257608bc07e1cb44aeeef2820b60b1407c77f7f1819ec1f4f9c89e6276ce3b0a81e4552725131450e2eb18feaa6cda2aabf7fdb67dd865a6f16bd
+DIST knotes-19.12.2.tar.xz 320196 BLAKE2B 8317fbfaf682d8202c12e91876fc78eb16feb6ac484be74ed244a7015c5396a5497e0fe16b577a379eac581df2fc479cd61bdbac61a657c3c027718a42da73e9 SHA512 97871fa1002e7dc1641b9c30c9fb50cb1980bb8c235e9cdb22de046ec3b9b1439e2f1da82103f096165fd37cafa6b3017c2b5e275d92dfc402857a28aa3e144a
 EBUILD knotes-19.08.3.ebuild 2096 BLAKE2B b141123402526653f51f8d14e6c0580ec5a77ecde94d0676dab8a06f99a76abee1241dd0c8db9d89809450ba13865bf0b6a497b95aa6b63c88b5a0d0a6e53c75 SHA512 84380e355699fae2486525127a9b879d6b8e0d769f3497bfc97b74df4e2bbfc2b8d8d42f30170e3a569165a8b95b961f5aac15670839799ca44d5d57953a5970
-EBUILD knotes-19.12.1.ebuild 2183 BLAKE2B 82f1e30dfd249640aa24cbe0674ba53e7bd69dd4b05737bd3a086fd7d4ce775c10717376eb609d3b4f96536060119fe82806c58d352f5f9c0c1982283edeac2b SHA512 0c3965f2b76d902c51b3b62b0b89a8d19e5562bd8f6fb5e8354076d96481c1a52e62f8f305a9af635170b968f4bd4cba30e430a0e68e74f64cb3b6600f4dcd4b
+EBUILD knotes-19.12.2.ebuild 2160 BLAKE2B 3fd57d4f47221b130cf605a2d483d489a2c1689021b4bd549226257dae4c17ce43513d879d016d4ac66e9c4e89f6a1406a39731f792bfcffb2b234ae9d7f257f SHA512 aa09941203bf54bb30fe81a55c27982f056d4bb5638b0ec3428081c3ff65d19a906dc912ba1f1d4ab03ae91661ee3ecf7c80915a4699c6dd35789eccb6f3f473
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-19.12.1.ebuild b/kde-apps/knotes/knotes-19.12.1.ebuild
deleted file mode 100644
index 73aaf2dee0cd..000000000000
--- a/kde-apps/knotes/knotes-19.12.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.knotes
-https://kontact.kde.org/components/knotes.html"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake_use_find_package X Qt5X11Extras)
-# 		$(cmake_use_find_package X X11)
-# 	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/knotes/knotes-19.12.2.ebuild b/kde-apps/knotes/knotes-19.12.2.ebuild
new file mode 100644
index 000000000000..bcf5a728315b
--- /dev/null
+++ b/kde-apps/knotes/knotes-19.12.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Note taking application"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.knotes
+https://kontact.kde.org/components/knotes.html"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+src_configure() {
+# 	local mycmakeargs=(
+# 	# FIXME: Does not build (last checked 2016-02-17)
+# 		$(cmake_use_find_package X Qt5X11Extras)
+# 		$(cmake_use_find_package X X11)
+# 	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index b10589cf2d50..2377a3781606 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
 DIST kolf-19.08.3.tar.xz 1029800 BLAKE2B 693909f406e653aec6ebd78afcb30f69a604b93e54e3d88fdd36efe41be3d2c4d33602db3904b0c3ef8717957318317d2a89da299a4cd8b871540082d1d93a51 SHA512 0edc586c8232f0e02906f12331e2021aba2e7cf468a071394175350036b77cfd8d6cd54e2071860d25e796befec4f3a53b94fefb1fd66dcdf0a51d991f32c8bf
-DIST kolf-19.12.1.tar.xz 1023372 BLAKE2B 5dedb79c7d1b5b647ac1ffd9408a1ac6557db485a97529d0d1849f2bf6c854f239a098681af8663fad63c9fec51a6fbcc9e37f9e01f0990f6f150a078f96ad2f SHA512 66fa239b1fe49f881eb8dc54f48412ae0709393de45a551b1d46568ea1d721f07cf456583c603e8f7301e2195f2ae99a85afe1279028ce21c6458da9a6f61f62
+DIST kolf-19.12.2.tar.xz 1029968 BLAKE2B 8748c6af279f91d660f707f7a5978ce20e84ae9f420cfebe0d8425fb0d4a851a1f2cf7bb1c953543f321f2dad7f29871b53b5c7a3812837f714a7c128d60f0eb SHA512 4a3fe1d6a3f67cae4ba614e7c9b44a2922fc51afa8b9e7b37a17b8dc9eae9937cb8faf0a4b22c89ab5a6e4c183e4887711cc6e7cfa9d3a58bab82e67191b17dd
 EBUILD kolf-19.08.3.ebuild 1007 BLAKE2B eccdb8363dd1c7d70111139e45ca044b46b7d5fa6acc5f6b61a4452d0e0bdee1c773e07cef4b51f5ad3cae209919b7eee48cf6ff1056f603ae79bf359fafb0e8 SHA512 9f9cd07ce56a4fabd25c5ce4ad64c307d19903e80bd4b28aed331f3a2fec049e5a1984c37b4c793053cdfd8204ee7c05287ef4acce1655ae347b8978f14e75c1
-EBUILD kolf-19.12.1.ebuild 1014 BLAKE2B dba95172093ef690fb7001934b680b2ee8b062dadafac760a3c38609af48940a4dd62706d2fa7e6cefb526a973f02bfc75a6cc062e44179ebae1399dfb7265ee SHA512 90e49a233b1391c481141d105ae8e1de9e917c7b1c1328855656c344bc8f6809d43851dc286ab476ab2c5bff0d1a3677d9aa2352c6fc7beb2a69054a9c24490a
+EBUILD kolf-19.12.2.ebuild 1014 BLAKE2B dba95172093ef690fb7001934b680b2ee8b062dadafac760a3c38609af48940a4dd62706d2fa7e6cefb526a973f02bfc75a6cc062e44179ebae1399dfb7265ee SHA512 90e49a233b1391c481141d105ae8e1de9e917c7b1c1328855656c344bc8f6809d43851dc286ab476ab2c5bff0d1a3677d9aa2352c6fc7beb2a69054a9c24490a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-19.12.1.ebuild b/kde-apps/kolf/kolf-19.12.2.ebuild
index 6f36e85c138a..6f36e85c138a 100644
--- a/kde-apps/kolf/kolf-19.12.1.ebuild
+++ b/kde-apps/kolf/kolf-19.12.2.ebuild
diff --git a/kde-apps/kollision/Manifest b/kde-apps/kollision/Manifest
index 4048b52c8ff1..27a6c70acc83 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,7 +1,7 @@
 AUX kollision-19.08.3-qt-5.14-1.patch 1197 BLAKE2B df4416d7c3462abde47b8b5ec4669ac69ae9965b8e267d4320775410df8a3090a3e9f28256ef6852ce9e76eda6498ce9dcdef455764e491e13d569cca1a95bf1 SHA512 a10ce0f97cb9658f13233aa32e19e47902ac90a74511c182263fe2ea0ee5c0e90e5061d9a9b8f23589ed6f501e7d927fd549f4eb011dbed2c992d18934883665
 AUX kollision-19.08.3-qt-5.14-2.patch 872 BLAKE2B ed7d8965cad72a262a6031b0925334864c05dc317dccfe8d158148be7c001375f4a3777e9e235297049ec15bff3243e7ceb77fd1a39aa9e588f2a8e0786a8eb5 SHA512 74b2849bc2f639457369bd7b56ab6db7f8a89d13be985eff54e8993308fb0a61d42a7eeaeb3c140d29c77b800e0b05bc1afba34e96bf4ddc4f14a0950bb35a8b
 DIST kollision-19.08.3.tar.xz 280844 BLAKE2B e9f2aa8de4d414676775427c1940390db6298b9bc0aab338f57d85513a20d4efe0cf02b0ff5c755010d68b53b5db36a8c74661da64990b8a9a2fbaea5a96fe05 SHA512 e19d14db64942cc0c1355ba465bc64c6721fc3e723c60ab1ef7b48525747ddebb43551772eaddc15dccdf991e8c11452686cb5590c22b66bf90ca088850e133f
-DIST kollision-19.12.1.tar.xz 281220 BLAKE2B 912216d72d81df5d869178db7f6197e433bae882e738d091048a88c739a79ce41e8e03d0fdf2aca12c1b51dfceb2a091e9f21bd20b4aa0c04a40d7df20f77e94 SHA512 d39de5111c60d33858fa24b96f5b32b53ec06cc1f27345ab12a03abd689ea44f0d143dc71ddf1b107cab811c0f139a7c4d7325fbe021736d4049b360477aa1e2
+DIST kollision-19.12.2.tar.xz 280804 BLAKE2B 938651dd8faa65c723c094a048e80dd092215143abd56ca407de0044b234a2feb8cea299c66657ac6bd2a292176ca623a025b1c8d718ed904de225336fd2c1cd SHA512 fb8fe5a8135d39ad2a25344880dbf207404dbbc1d706ba1216984e11bed8cd4f1c47b3ba3bfabca119dad7e7c57432484d1c1ba4da4e13ce4960f53316730f86
 EBUILD kollision-19.08.3.ebuild 878 BLAKE2B 5ad93bee0a746a36093e96d705d51d79b0ba14c3c0836118074154a2ed0207dd6ab9f19a272ec9586a56a79e692e4b6f8964ce76d8842b79018449d6cba7342d SHA512 1e6ff73ab77480b1fd2ad70b2d186edb7ff4cd45b155ceee7596372de150c5c1f6a2a3e764a6dcf79ac1d2c0487175a3f62e3e8e01ace30ec69f44bf1ea9a364
-EBUILD kollision-19.12.1.ebuild 833 BLAKE2B 7dd90c1e22f07621a51bb767c048e2ca93f13612f1cf7a7e32a3412bb7874b7b6ac44a20cdc80d0e79fb6e54e7645b274e565efdd7040f3eea1a7d5d37df1c77 SHA512 7f9b90be93e64e0c06a5dc5eb5e46c0ff8b565c0089eecdcc8a01d19589d0a9611f09d94e098e51804f84344f07e63b838d7e7cca9f48dde40140a08e6669ae6
+EBUILD kollision-19.12.2.ebuild 833 BLAKE2B 7dd90c1e22f07621a51bb767c048e2ca93f13612f1cf7a7e32a3412bb7874b7b6ac44a20cdc80d0e79fb6e54e7645b274e565efdd7040f3eea1a7d5d37df1c77 SHA512 7f9b90be93e64e0c06a5dc5eb5e46c0ff8b565c0089eecdcc8a01d19589d0a9611f09d94e098e51804f84344f07e63b838d7e7cca9f48dde40140a08e6669ae6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-19.12.1.ebuild b/kde-apps/kollision/kollision-19.12.2.ebuild
index 0d2f62ed5a5c..0d2f62ed5a5c 100644
--- a/kde-apps/kollision/kollision-19.12.1.ebuild
+++ b/kde-apps/kollision/kollision-19.12.2.ebuild
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index 8b9008af4172..bae9d7b694ff 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
 DIST kolourpaint-19.08.3.tar.xz 5654752 BLAKE2B 24a2700197cdec75201b0a51534ee5b14b13c94db82306161319e89db1ea189463e9ef8884ef9162195ca8c2c14ae073244dc6cd85b5c22045fb8905daa3c909 SHA512 97430f2a04d60bfe4d5131e961381b3390181a57cc4b6ca8eda048b60a32804dcd89fec5a69bc50383f88e1bce05a5b7a1dfde33292d0e72f6bda76cda0dd851
-DIST kolourpaint-19.12.1.tar.xz 5651460 BLAKE2B a158d021dbbed74c47099162326a77ef791e234619d07560b81b420398b17b06455820ace0858dc4a5145af8d908371ab0f014880a8d295d7cc0a07be26b7233 SHA512 1e1ac2e423c972b900588f6f1f20d46a9201958bb0c6cb349b38ef8ff1c88d67b1240ad9c4b5fadfe4aa6c72df432e4962d4ff82d722f63e1235baee9a17d8ab
+DIST kolourpaint-19.12.2.tar.xz 5653048 BLAKE2B 2d5ec79f5b9c799ab451b730b0ac44d987a66ab8ccd7d2d58931d8166a57df7b5105b7174243656ca2a53a85d193b801f8b4f2b545807142a0cabc3d247a6f8e SHA512 22006e9f360e7bd004f8387e5b6b989882fdcd93d688efce6a501502f68a34e63e8c87e1179ada70b02ece10536f64ccab2863f5548a46d74400c5fa0410f430
 EBUILD kolourpaint-19.08.3.ebuild 1197 BLAKE2B 03f14c3453b54066668b5cc5d629aa65e5bedac7ccd55030b002f4279a2c5a357e5428202290ef1a78e9a786f96a66e169c38010cf8f7f11e6c9b802cee83687 SHA512 47c4fa641361d1ba707176d368716e52bef79d56708e7c8ff07c87a2e25650f391742257530e4d88f323035738881223783fca7cfeb3a6eb1ae896f287f32dd4
-EBUILD kolourpaint-19.12.1.ebuild 1215 BLAKE2B 0c9797ccf528c232c05c3195e72c9da8d15c9a87e376ef9deecee469336e2ab9144a40ea15cd356ce41f6f716ecd6460c8d677ce9803f1af18b4426d892dd634 SHA512 0f61cbc708fa3751e81280f00695277ee3e74a6233cf52db9efce678c50f6339c36e7d991a1d7659134906178e6cc28820e893254f09a422989609210777b619
+EBUILD kolourpaint-19.12.2.ebuild 1215 BLAKE2B 0c9797ccf528c232c05c3195e72c9da8d15c9a87e376ef9deecee469336e2ab9144a40ea15cd356ce41f6f716ecd6460c8d677ce9803f1af18b4426d892dd634 SHA512 0f61cbc708fa3751e81280f00695277ee3e74a6233cf52db9efce678c50f6339c36e7d991a1d7659134906178e6cc28820e893254f09a422989609210777b619
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-19.12.1.ebuild b/kde-apps/kolourpaint/kolourpaint-19.12.2.ebuild
index 1af665c7c58b..1af665c7c58b 100644
--- a/kde-apps/kolourpaint/kolourpaint-19.12.1.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-19.12.2.ebuild
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index f03e091f1243..ede2c535a3a2 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
 DIST kompare-19.08.3.tar.xz 801168 BLAKE2B a300ccff3e41cd8fa9be9318c201fec82f9cc075bd75f4ff689f6a343d117151fb59015651ffeba26f6b92bb1a4ac335726f21cc8f9c4d4b885d3fec57c4f4e9 SHA512 9a4f78792f300bd20207c1743c07e4a4fa62d05549caf34388b02232395bfbb98eaf31099bdc9326a527d926550ef973426934aba1e1816b3ba78ce1ebb11f25
-DIST kompare-19.12.1.tar.xz 801892 BLAKE2B fc80970bdab75e478a553e427654f318451727abeb9a553c84d57eee7a796d64434f9944b30cabf44f63647bed89a6e25bfc7e7ff327e4c2f84c89d15518431c SHA512 61fe2c076cf73b0f0c7fb98defd93a6ae4f281741ae7984db9a907813771c73c0554c729e5ca14db4be19ec0f259a720fd2108502a2a3a2bd092693a7242dbe6
+DIST kompare-19.12.2.tar.xz 802148 BLAKE2B 88ece2fe9a2959efcb05a5e98866c9b50d0e8915283f08fe814f663e5b98073871b6fcf5cb37625f8700d62afcdf4868b21760c9b7a484ef7b24e06476d52688 SHA512 ebd252fa25130882492cd58a990f5bfbf93c8dcbb8f78405634e78d0fdd68827be65ecf4bf72a0e95d24f7b9a78e7f19528bdd3078abaa509fbdd551248297a4
 EBUILD kompare-19.08.3.ebuild 1117 BLAKE2B 8761e5408de423833aff3e879f47088e7691e056beb9331c62df7ea13f229404e8da980b81f9991db5afdeb5f315eec20474063c0f82745a96f643a222da3b48 SHA512 5c471c78c765daf2af10373813931220702e636a10da5f8e090cc04c2811a021e9bea1863496518a1e09983ff50998a1480edae9ba399424fd0e626e2a90c54f
-EBUILD kompare-19.12.1.ebuild 1129 BLAKE2B e41984491218ebbf751f856e5d2a8bc518f8d8063f0a655c7ee500c8b3621eb804fea8df359540267217bb9dbb5fd34abae5ee586fe619f7a9bf210d768ab71a SHA512 809052c93e0abf786de311cfbcaff57182097a4382020feac39cf4f4ed6aaf2424a42f8d77fde915ddb2260e7389b19c74e9d5964751dcb504911c8ad152c8b0
+EBUILD kompare-19.12.2.ebuild 1129 BLAKE2B e41984491218ebbf751f856e5d2a8bc518f8d8063f0a655c7ee500c8b3621eb804fea8df359540267217bb9dbb5fd34abae5ee586fe619f7a9bf210d768ab71a SHA512 809052c93e0abf786de311cfbcaff57182097a4382020feac39cf4f4ed6aaf2424a42f8d77fde915ddb2260e7389b19c74e9d5964751dcb504911c8ad152c8b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-19.12.1.ebuild b/kde-apps/kompare/kompare-19.12.2.ebuild
index 6e6c88262149..6e6c88262149 100644
--- a/kde-apps/kompare/kompare-19.12.1.ebuild
+++ b/kde-apps/kompare/kompare-19.12.2.ebuild
diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index a452ac3d22e8..f26b4eec41a2 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-19.08.3.tar.xz 7604888 BLAKE2B c66ebcdaffc0b3e502ce4b9bdd981cfd732d37dc7973f6f4f48b5a2a3ced98f55e9c14af699599d4dbb22d398999b899e89adbed72106fd2b8612e93cc682baa SHA512 ea2416fdcc102b41302635964983bf27945e49d53b237479f1cbe7d81a781671884c4e020295dc92d84e2eb14e7a503d0f994ba509eaf4372b8f2c63ae450728
-DIST konqueror-19.12.1.tar.xz 7383336 BLAKE2B 1465fed040b61079737d9e59449d9e7d1a0f48699257916c03d4c73b8ca556efabcfbb9db5aeb5752ddbe47e395aed2d0d77407a5caf10d5256ff8b53f224fbf SHA512 1f6718f4d7b00b07c7fdecf699ff269f6b2e2a3b404a0d7b386adc09a6a2b31ebaf1b0dd411acc70060560a61ca5a796433b3098066f7de7536fc34cde4757ec
+DIST konqueror-19.12.2.tar.xz 7379568 BLAKE2B 2e5c28283db111abc7c2a1306ab409a5bc2d2159b455d80ec189e5d0b06652f35a9a3a725b4c099b4ede0cad6c086efd5b20da1dde8f2eaba0e0b8694f64d590 SHA512 fc65280ade68db9d6e6156059d4c0f88a1f0f4c7866b88149aae7f90812f553bb9b8c9525495d692261e27ea90af50ab73bd45ea96a829f80bd339b97339d9f7
 EBUILD konqueror-19.08.3.ebuild 3297 BLAKE2B f2c50fb3e8fbbb33220d2a0fca19acb618e6a94d6703ff6f1e3fbab936fa96b7da854cee5d822da43d52cd9d101f8db13640e461985bc415d200651e95dc75c0 SHA512 1d00c84028b43257390284500aeb7cc01f9b223987d047cf64a64d302c59e5c7c681383b77a0390ec944beac76ac6b34e4927ee1cff7792299c3199059a31148
-EBUILD konqueror-19.12.1.ebuild 2945 BLAKE2B e585447b9a2aa5f5cba26e444e3738b8cd360e4eeb45cdd21edf42b54e7a3ab7f4b266227c80093587222d59afa42b4eb75f4713da1796d27fcc320804375a24 SHA512 0ff6acc982116d3f2f162037bd1cae6aa61ac8b20b66e0d7c31220004f9f92ac8a37b3ab1b16c3b480f06cc8e99079d2e9b8beb819adb01655b320dff287d655
+EBUILD konqueror-19.12.2.ebuild 2945 BLAKE2B e585447b9a2aa5f5cba26e444e3738b8cd360e4eeb45cdd21edf42b54e7a3ab7f4b266227c80093587222d59afa42b4eb75f4713da1796d27fcc320804375a24 SHA512 0ff6acc982116d3f2f162037bd1cae6aa61ac8b20b66e0d7c31220004f9f92ac8a37b3ab1b16c3b480f06cc8e99079d2e9b8beb819adb01655b320dff287d655
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-19.12.1.ebuild b/kde-apps/konqueror/konqueror-19.12.2.ebuild
index 911b8ea7556c..911b8ea7556c 100644
--- a/kde-apps/konqueror/konqueror-19.12.1.ebuild
+++ b/kde-apps/konqueror/konqueror-19.12.2.ebuild
diff --git a/kde-apps/konquest/Manifest b/kde-apps/konquest/Manifest
index b574018702f4..7c4cc4e27e36 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
 DIST konquest-19.08.3.tar.xz 659172 BLAKE2B c6a3b5fdacce8a22e820ab8aa922b8130792d4c91b3eb1c9ec0115fcdaefc29c04c0c6a44682e3939f20fe6239be8f01868c8d51c3d18ac516250f27f6fb0968 SHA512 d3537ca9395425bcc342884db76fe4db4208b4201dceee67c2203a9dbf3ea45c11826e5bbdb86533292b8c2c1aed8877bfec1a26cc0790be144a7399280cf837
-DIST konquest-19.12.1.tar.xz 658620 BLAKE2B 5af8da79306269b6c4138e9e8ba3e59f4c36a858bce974c0e590fb99226d3c2b7ed3853e58880b37a657eed5f1a4d640c7edca3dd219273d2237a043e6663100 SHA512 0df54754c210256ac8729cf937f7981bc83af3bfeff6cb6095c51a3e9fcbe4797467e2fe6c95a687a2ec75e52adb31140f4751c1903ca94793073fe0328e7367
+DIST konquest-19.12.2.tar.xz 658776 BLAKE2B 817c74a103d230c977527eb37529c32ad28e4ca8e0df82e9bd7b44573c7334c63c8305c3a07ebfc5f50329f51d458108b9a5740aeb3659c31dabeb48870510dd SHA512 27e6320237d1cf54904206d791ffd28c587d0ace66c8ab6acb8e8a786fd00f342eb7e3d6aa8ad29ac3530f615e3e41a0492aba99f90a5dd449ccbcae88503c75
 EBUILD konquest-19.08.3.ebuild 920 BLAKE2B 14e75bf7f2bc5aa886f086e7740681d77e3b428d47826b06c86c568558298c30fc9edee01d147c857e1744ebd747c38c2e19c002ccce4d8f78591d4b403e84b2 SHA512 fef88eed39b4dae8920af97b74437a81d1fffe61ef91d128ca30223357882f79a9c54688c3c236cc8f57eaec2e4f92b55bea6b4e513e621f042e77c5711c0abc
-EBUILD konquest-19.12.1.ebuild 927 BLAKE2B 19b5374d1ea29af2d0d42ad6e90a2cab800d74d64dc3db53d3acbc482a97b8375b0f8d413fcbda3c6b357e11fc615a239cf779da7c49ea6481ac242e966a7f20 SHA512 d56af37e0891918c4f138c426f5a2b862aa469ad225d9afe61e1bac2d0019accdef9563c83e5d71383126911dffc9ee95e8dfac27c95d7879b075beac1dec2cb
+EBUILD konquest-19.12.2.ebuild 927 BLAKE2B 19b5374d1ea29af2d0d42ad6e90a2cab800d74d64dc3db53d3acbc482a97b8375b0f8d413fcbda3c6b357e11fc615a239cf779da7c49ea6481ac242e966a7f20 SHA512 d56af37e0891918c4f138c426f5a2b862aa469ad225d9afe61e1bac2d0019accdef9563c83e5d71383126911dffc9ee95e8dfac27c95d7879b075beac1dec2cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-19.12.1.ebuild b/kde-apps/konquest/konquest-19.12.2.ebuild
index cffbe1eef76d..cffbe1eef76d 100644
--- a/kde-apps/konquest/konquest-19.12.1.ebuild
+++ b/kde-apps/konquest/konquest-19.12.2.ebuild
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index ffd9fd3b36d1..08c8d001c8d0 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,5 @@
 DIST konsole-19.08.3.tar.xz 1147832 BLAKE2B 65d781a3a571b2c80d496c5885d517c9df89623858ce0fb6954d05eabc497add8fcc546b7994413d93de613877e30edc7bcb4944a1d95fc2c443c66d95bc0510 SHA512 140a34b8f73786557b71ac5b23b500950c598ef88795e660c7fde3077c9f5d842ae1eed73966eb14dfb54d2833fa63c310fa2cb340a81c30f31fdd77e9f263dc
-DIST konsole-19.12.1.tar.xz 1158932 BLAKE2B 53f4dbd46034eedd8812d778997786e295fc59fbb168ff9c6d22459c1b984f6854798a01279acbef7f852cdab819c15aedfb8a90ff839c95d12ec855e116a708 SHA512 f838d68733935f7e082ebb0c09036987bf2c13fc27bbd75ff3dbca2cd67bc4c5f9d63b52d032e3f4f5205079711d4f57eaab2133f5fe56a956ddb0aba204f5cd
+DIST konsole-19.12.2.tar.xz 1159780 BLAKE2B 6a95ac5a37f25c7ec6387ff51e9c2318bc9bf9a9460c00c646e85febca1405e26a4ebbd8ed665e759c7a8fc5357792c881fd106b3d0cccf0443d341dd4c87809 SHA512 90d0bcf53a6721fb9bc7391be961cd6ed83fdb4c6ad1517fcaf1685e0aa2c9d4a3a7755c8036b6e54f35fa087dc13d4effb076c8218e7be5c9e13da63e12b9f9
 EBUILD konsole-19.08.3.ebuild 1658 BLAKE2B 79664a72d7097627ac2835d6ea2f99e0be07f52d27e438ba3e71419b038b4625acad2f3de7ddfb0e472796a121ae2c3baa6caea9d8735b75f1cb326f229b339e SHA512 4b5476bcb5820c7538d74631d649b37b37778826641cd1397436adc29fcfb93d4b6d16998cf746e77ab986dbc5a864915f6c87626323ef604d4e38306a399d99
-EBUILD konsole-19.12.1.ebuild 1676 BLAKE2B 4114e448725d354e26a05aa54b8a9c3586b20c11d996aac6223c83ada475fc938da8f732705aec41995af58c59692a495723c4d63cb2641e8708b2fad21f635e SHA512 348a05e040e0c8024d01e523d53e395e7175779311324ec892f7e3cdc90e95f52d10e0633d117d3b67c24475009ebe1014695f5d0b94a47d9a4e09aff284d1da
+EBUILD konsole-19.12.2.ebuild 1676 BLAKE2B 4114e448725d354e26a05aa54b8a9c3586b20c11d996aac6223c83ada475fc938da8f732705aec41995af58c59692a495723c4d63cb2641e8708b2fad21f635e SHA512 348a05e040e0c8024d01e523d53e395e7175779311324ec892f7e3cdc90e95f52d10e0633d117d3b67c24475009ebe1014695f5d0b94a47d9a4e09aff284d1da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-19.12.1.ebuild b/kde-apps/konsole/konsole-19.12.2.ebuild
index babfc6b76f0d..babfc6b76f0d 100644
--- a/kde-apps/konsole/konsole-19.12.1.ebuild
+++ b/kde-apps/konsole/konsole-19.12.2.ebuild
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index 507b259d3b5a..b5620af9de52 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-calendar-tools-19.08.3.tar.xz 223564 BLAKE2B e0d9f01659a471307db2c7d8c0906297ec4a880cb0019414520b29a14eee68bf39b02d02dd4e5b3b03c3684022f675f30cdb6efb214adaca64dc27f5eec03c25 SHA512 4cc146da96f6a006749e4c3e0962155fc8bcd788d2ed39adbbe73f1d82bc4264349ce06a9b524ff4fb1a1675e0d66345e5bbad8044360b6fe28d9565672f3922
-DIST akonadi-calendar-tools-19.12.1.tar.xz 223748 BLAKE2B 94850f9537b51468b6c91cbb6203b3fa6ff6dc4019beb1d1e852c594cc82e24855817f91ca5ba54273ab2bb60fadcf0f55d6b9c3cd91f863cb9fb16ebda78ad6 SHA512 aa3741db2df022b3669f10d1dc988380ff88b9595653fc77314b97910ef8c2f25193d159b8e86a347f773f0a6a09633ef82ba71a1fc2d769ee50a3f3c501668e
+DIST akonadi-calendar-tools-19.12.2.tar.xz 224032 BLAKE2B 1ad3ac8e3d7c9fbf1e7224478d4672c66058ec6f0be6094e72f55796ffa993c9a138180e7ff37a313ac03192f15b61c23d44937ae740e107d279cc03ff7b960a SHA512 8bad2fb28382f713cd23b4ea7eee9d59c37097c05cb15f2c758da78a804081a67b52be9ead0345e881b4be3b47a578517718ec2a517fa2ed1fd077046acf1502
 EBUILD konsolekalendar-19.08.3.ebuild 1005 BLAKE2B 8b7cb9be10c44b63cff9a225b384bd290792bc89dce5861f49df72c47e3c26992b690a2ecb1b121ecb2b8fbcee278deb0ada10aeb642eb3eb695318a31ec9f76 SHA512 c70f745e3821e6f99c4bcbc749dee696a8762afff468f65f1ec19845ea48d806e107cefc37d2ec0de5cd388044e0577fe448533920c8c4e0f142cbed9943dde2
-EBUILD konsolekalendar-19.12.1.ebuild 1008 BLAKE2B e0711f6f037fbd8b9c4eb444b0ac40b35464f6981d6a58601dd36279adca92af47a4231e800fd705aa99ba9b9f217584e10d90ea55104a6dd34b163a721e36c3 SHA512 16194c5516377764533cd4d3c38b67318aff0f99f8328d9cf7dd24ed44ab5dd5d2cdeb9c2246e5aeb377bc8a7eebe74bdd4cc25347cb1193d9395a71bb7e8160
+EBUILD konsolekalendar-19.12.2.ebuild 984 BLAKE2B b0375e55aa59c871250cada55d35ef7fdcf05e727ce11a969545ba1172fdd7b48afd2d9418072a8c6093bda8525d46fb8637f09ebe7636391e958052c6914664 SHA512 158e61081b7af321afce75a103ef13703585e524c279975e4bdc2bf714349ebb0ba582461d79c8d0f67c00a6a0039934944ff45519bc5a6e3af183de9046d431
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.12.1.ebuild b/kde-apps/konsolekalendar/konsolekalendar-19.12.1.ebuild
deleted file mode 100644
index 2e5e8c0a5318..000000000000
--- a/kde-apps/konsolekalendar/konsolekalendar-19.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-inherit ecm kde.org
-
-DESCRIPTION="Command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# delete colliding calendarjanitor translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		rm -f po/*/calendarjanitor.po || die
-	fi
-
-	cmake_comment_add_subdirectory calendarjanitor
-}
diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.12.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-19.12.2.ebuild
new file mode 100644
index 000000000000..0cb75e547fb0
--- /dev/null
+++ b/kde-apps/konsolekalendar/konsolekalendar-19.12.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_NAME="akonadi-calendar-tools"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+inherit ecm kde.org
+
+DESCRIPTION="Command line interface to KDE calendars"
+HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# delete colliding calendarjanitor translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		rm -f po/*/calendarjanitor.po || die
+	fi
+
+	cmake_comment_add_subdirectory calendarjanitor
+}
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 20044208e2c4..72672325891c 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-19.08.3.tar.xz 794920 BLAKE2B 516e3629fa76d123ad13f72899792542f25ea5f403cc6c2bceb2d21c6803c6f9cdff85dfa2a416b3a7a3e2fed527687ab4e3df80e3e8d6e9731c68ba7cfb0cda SHA512 1ff2e0abc2190b43dff223aa870901230cebb1e6badb7d50a501448e1c7def24b28149712c2856fbf312ca2005160d263f2b2920111c022f59c39e7edb441f74
-DIST kontact-19.12.1.tar.xz 795456 BLAKE2B a5d951b6f4ceda0d4dac33f58f3b50737b7a43f3bc06b5b2493718d822125f5ff98e2b8f5b79c1eed6ed7a5112a6e1fbe6ad9f31a54343e7d1c960852144cc6b SHA512 8730c86420324272b282952006d051f189fe52448a9175a0d709ecc846aeb9e7cfae8c2df85ef52beb9bde742369fa78b19ce3204589f1ce08199a35d1523e58
+DIST kontact-19.12.2.tar.xz 790568 BLAKE2B 88c50cd8b2c80b431a0c1905466f7cec52d4b0325bf8a5826fa162a3bb1883c6885b5a723f054a14e3f08c60f4ef5c423c190b3812971cc2cd7c164d73907de5 SHA512 da10a761e41c77d3ee13bdb04b8ed5497157b6e67204027404464a8be8bca4f4428af9278f32356e1fc24fe147bbbba8f277e3806be64e6b12fb3f1a08106c67
 EBUILD kontact-19.08.3.ebuild 1401 BLAKE2B 3ea5a55356972f03dc30c26d2e7e206cb971376c7a220ff4549e3550aa574285dc8e5ee21f0545b1dbbed50fb39ba1737560f90db9686e7a87d1b11b1c58ae10 SHA512 1ef980d849c6eb193d046785ea44866365375eff6d639c6cc37035f222a376f8f68fe84a7c93c9c51b5c4644d69557a5a297563fe216cded46e072d5ec6a5f02
-EBUILD kontact-19.12.1.ebuild 1493 BLAKE2B 5747ee2887956fc3806c279120598849a7bb08cf18b9f7d1de6b938d7c954104d7d1c463a4bc7ae3c9c6af8d3b53b48717d325fbb1d68d56a39bfc33b6af642a SHA512 1c9c37b67a160f739aedb834d76d6717e4d64f45150563d0ffb613c6d7bf6d5ec3b2a93d2a1b86e54feda663de932b0fde3a0533785f67cf50644e733d452b36
+EBUILD kontact-19.12.2.ebuild 1469 BLAKE2B 6ba09e6f26a4e028ae66da24cc7cbe37b2deeb9c9ccd53096fedb06cbd7e5990534af9f91791c182b3e0042723a031ca464e5bd0a1fa2543df3169377f97b4eb SHA512 b465c524702ed526ce4d14613f7a0df3b615bd29e5185a5bf9b191adbbf1f2b9c81f8fbe8b64c16f09653c18178c3e0227c6341168444e56521b68d31ba82177
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-19.12.1.ebuild b/kde-apps/kontact/kontact-19.12.1.ebuild
deleted file mode 100644
index 86805050c6fc..000000000000
--- a/kde-apps/kontact/kontact-19.12.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-HOMEPAGE="https://kontact.kde.org/ https://kde.org/applications/office/org.kde.kontact"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontact/kontact-19.12.2.ebuild b/kde-apps/kontact/kontact-19.12.2.ebuild
new file mode 100644
index 000000000000..5b77a266d4b2
--- /dev/null
+++ b/kde-apps/kontact/kontact-19.12.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+HOMEPAGE="https://kontact.kde.org/ https://kde.org/applications/office/org.kde.kontact"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index 5b4a31a22c51..b80612c6d090 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
 DIST kontactinterface-19.08.3.tar.xz 33176 BLAKE2B 9b9c3b644cc680e83ab6f11afe390c5d967318174a03a5577bc425f2a8f74d5202714d1877f48a17a5c4c16a431d2ab52bf194e615a020ba4a4311b8d74343b5 SHA512 b043fec0f67110f83830c674fdebd18413637542e975989a29e6ce1e1299637c5544b2374e07164af5cb3f19f525003e00eb318eec1c728cc508261b7b733ab9
-DIST kontactinterface-19.12.1.tar.xz 33352 BLAKE2B d3170a6c2f55f8c3ca873e9985315682657fa0514ff0fedf5c10cb02e3a0a3e6e6ca45ae0b6d4e946420db7eef1710325873c9d2f8e45c57a3d1c0fb1e0885e8 SHA512 8b88a9ecd2191437bd17afab850944615a5df9d3f5a4aedf36d6a211270c2b69cff36e264b179299f5d71c00f1ec50fc9047bbe0ab3d76180e2b8fe3d756d308
+DIST kontactinterface-19.12.2.tar.xz 33268 BLAKE2B fd786a4c5d3e0a240fe2877fe2d6268a85c68a850ab3e1bdc6baf54cacada43828b305750f12274ae57b388b0fac19c69cb82a37d3ce6c9ecfd6e97725c79eae SHA512 4c89fe1a7ca578160901a4223050c64d20b4c514493d1db9c49c6214c2be0f7b6fe8de4e19d5c0f97995f33084f5930d540c00c83197fb5209d285db43b61a03
 EBUILD kontactinterface-19.08.3.ebuild 697 BLAKE2B 6330f35e477c6f264eecfba4c7d01d13ca1e44ba0dcc344c4a153e01e799ca38ae091f381b270f18f8630eeb64749cf2396dbf5660fd368e7858178a135df1ee SHA512 08c0fc7b1f8a6a7e64f41c97812b377e21cce70fd5ee2a964ffd928dfd594d71c783aad565d2589ea8534953786438ff7d32f21e925c94d5c7f929b70dfa0e7f
-EBUILD kontactinterface-19.12.1.ebuild 731 BLAKE2B 9bcac94362967127149dbb39d35aa2232034471824deb2d11cb4b627cb39a243ab084ac75a830ee636a870e03dfae7a026c4d30816d7fbdf3a88dbec67e91eec SHA512 5664226fa323c7eecffecf541c4d1651f9323ce91bf84cde3afba1e498d91346508579bb64ccd83e75b82e44a55c99a1378548ec649fe5ef2997a6dc6119cd13
+EBUILD kontactinterface-19.12.2.ebuild 707 BLAKE2B 359c1439c04a59c5e17bd9157690ba194aa302576c3fbb77e8f967c06cdd6cc1dc8d2f441b278b3bcfaff88c85f415d5264d7982a4a381664dcd24f7131b6b6a SHA512 14740c87569f05fea2e2240eaaaba2827a1fb381175edcc3ab81967ba0132fee970f0f3ff198833aca3c59679de330f6bc82c4309a72e71f04284f70be5e52e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-19.12.1.ebuild b/kde-apps/kontactinterface/kontactinterface-19.12.1.ebuild
deleted file mode 100644
index f95870931427..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-19.12.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontactinterface/kontactinterface-19.12.2.ebuild b/kde-apps/kontactinterface/kontactinterface-19.12.2.ebuild
new file mode 100644
index 000000000000..3104bae4d6d0
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-19.12.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for embedding KParts in a Kontact component"
+HOMEPAGE="https://api.kde.org/kdepim/kontactinterface/html/index.html"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index 35c2edf70b6b..914f7aae7709 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
 DIST kopete-19.08.3.tar.xz 9367624 BLAKE2B c7f33d5666f1e72c978c48482ec5c0d260310cf4a90e6ed913b6f2130537db3d9356761bab4186183bb5b86c61ca63303da27dfbb7a6386328d2b85bece23e40 SHA512 41bc20909ec15d6b3cd7c975363dae7a4822a6c563cc721dc2c7afc3ec6c71bc2b7fa90d08d36dedff63e0c68443c55a794743ef0d65b85306a472babe0f2c12
-DIST kopete-19.12.1.tar.xz 9364212 BLAKE2B fa37bde90ee4aa7bf68f992a1e8bd24e89b8edac4fd5f40ba12022a52fc66ece74786bd8fa19fa14e3a9b74d708c53a941f3f9d9c5bf09120426c91f0ddae43f SHA512 4d1032c1127932b831c8f7980c0d128d341e34884481439bf2f040438ae6c102ea3bc0ef7144bc4cfc6e9c964a79aad8e9992e1733de4bbb657d7d6a5c7ed40f
+DIST kopete-19.12.2.tar.xz 9375752 BLAKE2B 4a1e0cefd62f7a8c0a62956600352b781a281c135a2b1e9a933b331e5649c49d86e6ab2b8f93d7198e6f6e16d7e6a258f4eefb90533773a7297ba03a476d7b3d SHA512 81558bb77b998c3f6a50790c09fd81da08049aad016e44997788d271f58171c3ba615e0f15aa6e64cd2e662a4f15e3798a3d7bc92d26ac0b6d72a769c1db5cfc
 EBUILD kopete-19.08.3-r1.ebuild 4711 BLAKE2B e5919dcd28d222a80e0e20689c790d2f563ac00e5f9a3314412997a30d4053e9cfe0ce1f290ba2477f4125e6d814651c355fc8b060c3b785a341a12631b16d49 SHA512 70f6b3d91d82f80648c8a1581067f3270081fb819053306cca020f2b95004ce3901b142456c3f60e899df87df1b8cb4ad238a223ad369d8c73f0dcafc16ed327
-EBUILD kopete-19.12.1.ebuild 4714 BLAKE2B 7ae4310e46d6f9c7f5f798323fb48ea60f4394f32ffd3da0360231f1c189efb18e67a1d0453cbc9ee7e34310e35d1da7bb0e9a2ad0b816c4527f5b4dbdad10bc SHA512 36cb15b4015bb48482b0ef926aeacdc6190a13716a56902cfd8d4cb42a2dd6a8fc73d05d154cbcb891aa5af75cefb6544abf1027fa4b0a9d55bad230d201edd1
+EBUILD kopete-19.12.2.ebuild 4714 BLAKE2B 7ae4310e46d6f9c7f5f798323fb48ea60f4394f32ffd3da0360231f1c189efb18e67a1d0453cbc9ee7e34310e35d1da7bb0e9a2ad0b816c4527f5b4dbdad10bc SHA512 36cb15b4015bb48482b0ef926aeacdc6190a13716a56902cfd8d4cb42a2dd6a8fc73d05d154cbcb891aa5af75cefb6544abf1027fa4b0a9d55bad230d201edd1
 MISC metadata.xml 2102 BLAKE2B 8d82dc772819389b671c1661ad0be0f97703668a6a940c2e142163f4f6e06c110e6d6146144d12ef04b37fb6eb06c57d0bdb766f2c8155848174529111933f2a SHA512 5ca6a22e974c0cb1a24d0dba5ae3f5ff2a860354d653b800655640679c179b90331f436b4ab62338e22e01e145b7c7df2cb9bba82ad8d02436dbbd044d1bfef8
diff --git a/kde-apps/kopete/kopete-19.12.1.ebuild b/kde-apps/kopete/kopete-19.12.2.ebuild
index 04b387dcd2d7..04b387dcd2d7 100644
--- a/kde-apps/kopete/kopete-19.12.1.ebuild
+++ b/kde-apps/kopete/kopete-19.12.2.ebuild
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index b25aff9b5633..80386c592c41 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST korganizer-19.08.3.tar.xz 2222956 BLAKE2B 04b723d856e87dc710e1a27cbd4f8f7790c8a587d7051fdfcc838ebf798d2576312268ad39090c2afa6c5ad764955229ea9b224eadd9cf93c0cde85d1ebdbab7 SHA512 f51b2c569d68a1450cf1f57ec168e33015ebb45d4ff8f5e936523e154c72ad349af2d9d6e7e6269486557d6fe27ca7e24da0591c603fed13eb93e6443bdf4f62
-DIST korganizer-19.12.1.tar.xz 2228744 BLAKE2B e14a4adcd1d53dfb69298373b5d587a9c16535d17ea5df251052d5832a1ce7844f3dd0c7038cc69b69421afd30e8d53e8bbbf2fdc9cb78b1f3e5efe3fa10c204 SHA512 bbfb6e6fd7c3f2b637db42ea02c0a5038720d2c742b4da74d84121fdabd92204ffab5b038bb7e1ceab15ed874d20a78a00d94a756ae3ee2c40e7ce56bfb93b24
+DIST korganizer-19.12.2.tar.xz 2225732 BLAKE2B 956206c66280f172de1d9b5bf196a9d41d3c8dd83a6f40d0936a8549fbc35708f668f0f47c94a1107df81be2affaee8ebb00c27d18ab6a8fa2cb8da3369bf732 SHA512 3b773a7176d5a6c7aed198a1492ef35e920fbda5b68481b1ac1e38495a640ed2c59b4bff879fc85a80359ac85339f4a68a539f2c8b9e91632169a7b150383926
 EBUILD korganizer-19.08.3.ebuild 2804 BLAKE2B 6e3405f380017fb003456710433726a07f3aedc73dcf6d367d48778f19efb6a4d3881960ce63148ac406c7e92b96b347258d3ab0b03c049081344001b3983559 SHA512 5b45ba6bb32422d43fee53bb4f29b5149cec28a9a7d9ae9e2629e1b1a2f2a8a04b7c7d958d007105774fd70f6bbd19ac42b9fb890ab85342b669fdb3b6c6cb72
-EBUILD korganizer-19.12.1.ebuild 2815 BLAKE2B c06669a0975a3e8a63aa0927058c33e92c62701d417e64e12c177d2172f99fcd7c19cfe75e7f83ecc1da2ae6d2633ae7afeaf82fcde793c8872a9fa125858c1c SHA512 5c54f1cd75c626a245ad8ef9f5c62d85754e2f661068f44976799b2d470920a8323e10d12231bff450f1759b50a7963cb31190257ce7eb275d8ad69387eb0c5c
+EBUILD korganizer-19.12.2.ebuild 2760 BLAKE2B ab94db17606c048eea520dff27230d7f7f1d28798b2af2e0271ace34aecbcacba225cc16f34df6261840b552138f4e0ecc60cb5cd45d340dc3db38433c56733c SHA512 0c42c98c4f76fbfce97a945ad1e37c3aac9ce0c04f52b393c16a5495c425c88b43e1b9ecee4b02cc53a71439dc8841d6055b890c7122207f0bf4c92655b37527
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-19.12.1.ebuild b/kde-apps/korganizer/korganizer-19.12.1.ebuild
deleted file mode 100644
index ed4217dad336..000000000000
--- a/kde-apps/korganizer/korganizer-19.12.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://kde.org/applications/office/org.kde.korganizer"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X"
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kldap-${PVCUT}:5
-	>=dev-qt/designer-${QTMIN}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-19.12.2.ebuild b/kde-apps/korganizer/korganizer-19.12.2.ebuild
new file mode 100644
index 000000000000..c3dffdddd597
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-19.12.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://kde.org/applications/office/org.kde.korganizer"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="X"
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/eventviews-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kldap-${PVCUT}:5
+	>=dev-qt/designer-${QTMIN}:5
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index a5e9c37bbdbd..4c3a50f81df4 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,5 +1,5 @@
 DIST kpat-19.08.3.tar.xz 3578320 BLAKE2B eae35ccd8694d99bcc08b51d9c2671b57b7a200777a10568e81ffa74f1c402cc06ce6bf3540d994542bb3856f991f47d23df1ff3e2a077a2c56d4590d0a9ab1b SHA512 894f97b86a852b5310734f90cffc68970816e4514390797e3a2c43ce102a9c624f2b52ad851e78f1c182f45bedecaf496da6b812e0bd6d7c5c60d79133e1d6a3
-DIST kpat-19.12.1.tar.xz 3577416 BLAKE2B 35cb6251b90a8087a55aa245b9f3fdfe20262cb5654f86e9809dc906f858cf3252598e35141d86e59d03fef81e90ba0817feb39d12cbade6c18458521704b8a5 SHA512 271d577b716e38ad3fcc675070dc93be4a78a8a9c5dfcc51a374336c9238959e83c9411cb8eaa08a263ee19be093eab95a8de526619aeb9b7c7fad62d37dd3f4
+DIST kpat-19.12.2.tar.xz 3578024 BLAKE2B b0e443aea97371813a6938963f3019dd45b74ccca188c334240a90340033c77296c613ebe8dfcc5f22bdfd4e6c6a9c0eb78f375fc565e925bbd96a2f986e9705 SHA512 31d23cebd37f9531551b44b3ae69fc4487d2925b9c444956227685ba77371ac74dc958f54aa015a82f98521dde6c5cbf75193977d3f5492f8f0bc7f9354b6a3b
 EBUILD kpat-19.08.3.ebuild 1042 BLAKE2B 51f4240bc2dd1f24b6f434012835acb89af6aaf3d588003bf5474014c6f575ac7c6d7867061ebc158f615423279c1df811fa6a6cba771e2696f39b36a2d0b2f8 SHA512 b86324c5829b92e98d1bd9843c47d3d020fa12d63a0adbf700a18af72f5fb5224eab163c38ad2db38239fb2284eaadcfee5bed5b0f0f5f35a1bdd1e49b1893b9
-EBUILD kpat-19.12.1.ebuild 1094 BLAKE2B a4a18ade6525f1abd554613f6641e2bb36cda88f8fba75b01c3bb5d65ee421a8c1d5c6a3d60ad534250cf774c85cb63f1c61d96c6fa7a10fe88ce21712216206 SHA512 a3c7c3b546c6c203db7f5462926834bd335f07b758c485f409ff813b83b463c9c8ead9ec05fb7b282722155838595937b1060ec815a2152eb5e333a94b63135c
+EBUILD kpat-19.12.2.ebuild 1094 BLAKE2B a4a18ade6525f1abd554613f6641e2bb36cda88f8fba75b01c3bb5d65ee421a8c1d5c6a3d60ad534250cf774c85cb63f1c61d96c6fa7a10fe88ce21712216206 SHA512 a3c7c3b546c6c203db7f5462926834bd335f07b758c485f409ff813b83b463c9c8ead9ec05fb7b282722155838595937b1060ec815a2152eb5e333a94b63135c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-19.12.1.ebuild b/kde-apps/kpat/kpat-19.12.2.ebuild
index 5f36023990f1..5f36023990f1 100644
--- a/kde-apps/kpat/kpat-19.12.1.ebuild
+++ b/kde-apps/kpat/kpat-19.12.2.ebuild
diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest
index d18928ca0b73..3a3bb9066095 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
 DIST kpimtextedit-19.08.3.tar.xz 155000 BLAKE2B 6612226d0c16dff7f0705fec3e0167bfaf6a397cf8bf9c4f11b355a347448190366f5786259f07c086eb73698ac4fce77c9c52e242ad1f529082e09aa29af698 SHA512 a85894133f454e540b3199fefea5db310bc5f4e607979a573c26c9f6e24accbf293fad28b0446f5103c779a37fd2e56578b457f25fcc34790f0ad43ac85ed57c
-DIST kpimtextedit-19.12.1.tar.xz 167340 BLAKE2B 15eb8bda704c9f5211341a62ecfed27fdaad432df61735a2915fd8309f2ac146df8aa3092625cbd31140ffbf3e738e7b231caeb6bc7579b6a082e280bc83d803 SHA512 43b0b68462dbf0b6edec1d0be1b57a793917e98bd2ec0e12d4d9c5834525edc07f2f3c78909002a433b9542758a4782ed0d16c54d5b50d3a99931d97dd379d4e
+DIST kpimtextedit-19.12.2.tar.xz 167624 BLAKE2B f0224319e0b786ac02904fa56047b8e12585f9b88f5c2e24ba4fb9497a5facc4aa2ab50163bb0e40113185f3690090d8c5302483a4a20fff61f3357e6aa883f9 SHA512 a7a0e5312c86d117a3a1c2a2f9992f69a19419bded915a809abf3a9b365ed780bf4dfd94d17662a5f0d59d7163acd6ad032b71e0cceb9800a61764008eb9ea8d
 EBUILD kpimtextedit-19.08.3.ebuild 1135 BLAKE2B 9c8ea5036ab45fd9684c664ba5ae41fe461981699261a3f6ecbd47ac4fa3a7f31ce76234adc6838cbb6c0010ce7cf6942bbc0c62d263cb67b8cdfb98b0ec35c9 SHA512 cb1ec242a9e0dcf67f046184d3ece1314d5d1ea714f968e3304c08ffa53f076977c3ed821f78b885fdb1995928af336d719749948517cc7a1e42645feb914094
-EBUILD kpimtextedit-19.12.1.ebuild 1099 BLAKE2B 5fabd85766dd8b7ed667d21e2e4fa2df17ec96e74dd271b86b033d02c71a372ec3b24f8b27dcf7b965154e7bc39b843f9bdaa99580a3e264eebb1c2dcee18bd6 SHA512 959ee6724779e330913aa2e4377ed7e233a2153b11ce6b214182b9bc8a67cf08bb22b81d3d8e320ccded858019ea55a811476ac712fcdaf6fdc7438131ac34fe
+EBUILD kpimtextedit-19.12.2.ebuild 1036 BLAKE2B eae750f27522b7bdbb496599d31f486f2d8eb4fa8d2020ddc04c89d4aedda3e4b194677e0e4ef9ca179ee4c6be59717fd59147f5b92ca48d5245b702095f7696 SHA512 7aab0c4b4502f4e1e307c9ec6b822e4afa4f93503c95554c21180791265bd54b87969b6f65355e37458d2b7a893f0737572fd74f6c65b446474f9ec071174a9f
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.12.1.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.12.1.ebuild
deleted file mode 100644
index 4138530e490c..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-19.12.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="A textedit with PIM-specific features"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.12.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.12.2.ebuild
new file mode 100644
index 000000000000..fa41a3a5bc45
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-19.12.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="A textedit with PIM-specific features"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtspeech-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/grantlee:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index e3ab3bb953cf..b685d882f816 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,5 @@
 DIST kpkpass-19.08.3.tar.xz 23260 BLAKE2B ee8374d5b7ed9224862b8f723bb73bdd05b7817d29196e843e360d2638a8ae7bdb9e52265177b0adbcc3ec21e5cc4cb23e4ddaf43ad427551b02083d176ab779 SHA512 edb3bb7811eaada34e7b9dc6a30099588d0bc43c8a0634f17bf8bc766050098c49e709477dde6a92e860775d0825786c2a2788367dddb0617bda868bdbe54076
-DIST kpkpass-19.12.1.tar.xz 23268 BLAKE2B 815bcb98a2fa3ff0547b901a78d46cfaa20225457c0e8f10cbf4c93c4f9d383662f0843bb02ea5c8701e5da1cd2c804a3ccec6dace2f0cd096e97b324ed8f419 SHA512 f3db05a980a18d7394d58087a0a5fef3f6f3fc86b9d5778b819dce339c8a7e63e1d980de0a0cef771d8f901489824f302ec2577e169e6b70dbe482cd3434cd54
+DIST kpkpass-19.12.2.tar.xz 23324 BLAKE2B de5b39afc5f6eb1c9d0be98c2a166ac8ea955c59c08d362a1b90fee9cbd336aa878029383cfda0e22aaacb8357ff1baa9e381b53854da61dfafd4967041ba8f3 SHA512 74d2bc23d28c559bd41d9335c5c294e1aa8d49090a30b4b0a2c2900ef409919afa8a334e2652d318e555c5f9ecfa4e52febe8359d1926baaa11860734058f13c
 EBUILD kpkpass-19.08.3.ebuild 523 BLAKE2B 23f0546e7f2abab2a76fd06964b3f9560beb9c6ffef29c20929de5247604d66384873d467278ed0cd4e1e4318610f0f442cb7c889e22e2ca723d09f43cbe811c SHA512 aaa1b564eb1325efba2e444463af352ca7822d6f5a6a8b4db49b3ebe2bd7b1b621e209b8b08b653d0d2cee146c8e5690ffd84d4456f3b35e6db3f26ae56fba66
-EBUILD kpkpass-19.12.1.ebuild 526 BLAKE2B 8d215b07b2a76dcead5f054ee0c9ea3dce343309ec07971729c197a8fed23d39a548900d622f2aef2df0f293f004ce47c50a86d166b74e0614bb22c2007e8541 SHA512 02c3f0d3ed220fb52e0503ec7f2a214ceaf1508965938956106e7dea29beb560404441526225d720d836cc15be5628ddd2703d43a7e2ca8769f15a345a2a15b1
+EBUILD kpkpass-19.12.2.ebuild 526 BLAKE2B 8d215b07b2a76dcead5f054ee0c9ea3dce343309ec07971729c197a8fed23d39a548900d622f2aef2df0f293f004ce47c50a86d166b74e0614bb22c2007e8541 SHA512 02c3f0d3ed220fb52e0503ec7f2a214ceaf1508965938956106e7dea29beb560404441526225d720d836cc15be5628ddd2703d43a7e2ca8769f15a345a2a15b1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-19.12.1.ebuild b/kde-apps/kpkpass/kpkpass-19.12.2.ebuild
index f606e6f9edb0..f606e6f9edb0 100644
--- a/kde-apps/kpkpass/kpkpass-19.12.1.ebuild
+++ b/kde-apps/kpkpass/kpkpass-19.12.2.ebuild
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 8b09fd000442..1edf20371f06 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
 DIST kqtquickcharts-19.08.3.tar.xz 25632 BLAKE2B bdb654d8ec6c8740982480d7df2088cd85b1d2faae343d0fdf9aa4f57e7e42414dc5abe7f1a5f7e9f12c3d8f2abcef893a4799c8f1fe36d0aed4d062235527fd SHA512 4d3ab33818b1b723f7659350d2a56a493b17a72b826890676806d375ec709376a693e04721faf220203dee483881a9d899b7d9eb8a2b876297306fbbaa8eb59e
-DIST kqtquickcharts-19.12.1.tar.xz 25624 BLAKE2B 04d3c67dc62dc1361a4b3fb92652fe71fcaa4fd2dc315729c4037068e9e4a3f52e7f9bdf0ead30316f64a8ed522f6cabc4fe5c066735822e2cacba421b735c5f SHA512 c680ba604a19782d6715ed5390beb54c9905b42b39e7aec56fc523504781a71ea2561a74005a99e48da056dd168959833199132b0dcf53ae69c78bb6ceaa8b3a
+DIST kqtquickcharts-19.12.2.tar.xz 25628 BLAKE2B 80501e8636af8cbeb528b42e8f4dcead050ad5fae473648bfc2eac57b5ca139c16246a5568ff82c198aadc3d3ef19d5d78661fc0c169fc053d8edffc7168fa50 SHA512 7630a5a378abd1cac0a4dc944be764c053542b5294d42dd5cc80668370ab5a9a0c82fff6b0747b5e1ab8c18f0a04cf2c1e513cd0587625d5e9ed118d7002d8ad
 EBUILD kqtquickcharts-19.08.3.ebuild 382 BLAKE2B 12e7d291bd76f7fe8d0801eca90b8f6ded179b76841e6505118806ca0d254572323bb8b7211f0023193a924c2a0aba99014970ebd9ae97a30a1fce975d114313 SHA512 a6939e782bdd0829e26f912a7408b40daa5a7803be70f15f62c31f1cf5ad55590fdff7c8faaab9f3cfd443a29278b7b71eebd0a984567c3fabfdf7a71da8924f
-EBUILD kqtquickcharts-19.12.1.ebuild 386 BLAKE2B dc6a40aa302da0e75d730722ffaa3cb345492fd88cf7252bafab9915ef6c4081e1f5acec30084d633315dcbf8b6fe50a66680f619099b730cc25322d2bf7e0bd SHA512 1aade9c58e657f7ae625cbc4564c4a83c91660aeceb3d30ea316f27cebf937c7d39e5f2ebc0c7023502e88b582ae28d396a01cc1d5418858f0251d08dee0039b
+EBUILD kqtquickcharts-19.12.2.ebuild 386 BLAKE2B dc6a40aa302da0e75d730722ffaa3cb345492fd88cf7252bafab9915ef6c4081e1f5acec30084d633315dcbf8b6fe50a66680f619099b730cc25322d2bf7e0bd SHA512 1aade9c58e657f7ae625cbc4564c4a83c91660aeceb3d30ea316f27cebf937c7d39e5f2ebc0c7023502e88b582ae28d396a01cc1d5418858f0251d08dee0039b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-19.12.1.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-19.12.2.ebuild
index 4933b8cbbdf1..4933b8cbbdf1 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-19.12.1.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-19.12.2.ebuild
diff --git a/kde-apps/krdc/Manifest b/kde-apps/krdc/Manifest
index 496909a54163..429e50d0b85d 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
 DIST krdc-19.08.3.tar.xz 1423272 BLAKE2B a2082f614fd9e305e2bd5d87edcaf2adaa7c29d974b9a00220dc28423a9b17b76704bf9dbe93baa47a6c656bf6a88d4849288cf6544cc0598d657482ebbb959d SHA512 19623548e1ade229cd198361b540c893de8b510099c8819d66034f358b29b13cd7f82a948121187d1a445770f9549a5e59b72394a1f7ace0e0673ed4bca8e1c2
-DIST krdc-19.12.1.tar.xz 1424920 BLAKE2B f88e540c560aab60be8a8844d465524acf3ac863e6c2e8c78eb03bd8336f93788a442bb4c7d45a2eada12b25b6350c014a900594af55b5bc271741102f1bedee SHA512 bf193164e21c509559c7bdbb064aa4273a1f9e0ca528f8b1ff98ff72fc980dd9b3b370d042ce8c222dc2360006175df996b9b9cb1a73b2842030ad40e533e3c2
+DIST krdc-19.12.2.tar.xz 1424844 BLAKE2B 5d89ab7cddc346d40f8803cf6df5a289ad3c859e935785b203defb4cb39c48cd879577e8a9ce544107ff25d808b261d2c07453e6bf307670c4728576390ce38d SHA512 a64d89e436c5f75c4489d6fec0838b1f72fe1e60cbd5986056ce1c632d4c4ea2af22f36b3452152607f9d9793fe91cfc7b9baa4e2d1fe9da12b0ab4911dae8c7
 EBUILD krdc-19.08.3.ebuild 1406 BLAKE2B 64e182ff07efa3068d7c82216b384218b350f5f065fb4bebc76b3dcc68dfc8333431f16acf24651c318dcfc966ad69eb89b1a658f02d55ea4bdefbd95d1127be SHA512 d47d06f2b93ed767e3e1a7b7bcf9b774f545ba50b12f98676be3a874521da0e4b7ab6816277b0408d23d22341d2058d727471b8c65cec1ba1ccf2c000bd0da38
-EBUILD krdc-19.12.1.ebuild 1417 BLAKE2B ed0f0537289592400179728e10a14515dd4770192c03a4a03ab543291af5fce3d49b1ed0495a0ddb8486504c569635433eeaefc1043016abc07dd4893ab5adcb SHA512 507df22bc2b95a4fb371987aa6555edba1a91288f181c9b98a55320989bfb844041fa36d293f42b7d80885605401c1a837c49ca671d7a904ee117cbd02fbc8bf
+EBUILD krdc-19.12.2.ebuild 1417 BLAKE2B ed0f0537289592400179728e10a14515dd4770192c03a4a03ab543291af5fce3d49b1ed0495a0ddb8486504c569635433eeaefc1043016abc07dd4893ab5adcb SHA512 507df22bc2b95a4fb371987aa6555edba1a91288f181c9b98a55320989bfb844041fa36d293f42b7d80885605401c1a837c49ca671d7a904ee117cbd02fbc8bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-19.12.1.ebuild b/kde-apps/krdc/krdc-19.12.2.ebuild
index ab29befed079..ab29befed079 100644
--- a/kde-apps/krdc/krdc-19.12.1.ebuild
+++ b/kde-apps/krdc/krdc-19.12.2.ebuild
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 959dbb2f3dd7..6feeee203647 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
 DIST kreversi-19.08.3.tar.xz 945652 BLAKE2B 0560d87775f86400924cb7fae6b3113c8f6e0d25f718f07e22e302e9bd4ab73a02c80588c0a523a51ebbb57bf1c9d197bad679101fda17e25d0414637dac1ca3 SHA512 9f329b95a0765557eb80a25271859c104b7a64ed35517afd51bf5c33d3a2821453dc7c509730241a80713dcae3f5132b54d3d2bed0e7ca0c22e916b4dfdca0c7
-DIST kreversi-19.12.1.tar.xz 945576 BLAKE2B d695b22e27fe2821ee98525cb8d0421db087911b3626a9847698326c3ec28d6f8bcafc5dc20eff44dad636e12ef3de5e23cbc90be3b2d713552ff154edb88533 SHA512 24253f3bdcd1da5f59a118eb8422b645def3a0d458b57f35301ea67be3b1586cc551b69511317a48ca665ba27d5dadb436c9f2e2cf9ecbadeef9f1f08fe628de
+DIST kreversi-19.12.2.tar.xz 945476 BLAKE2B dd859ce6242d3cf07f107edacf49edba21f7610623fe591bd18ca8f0082d0cba74b23f62e8b0646a34bb10f47e4921bfbacf72cba9bfa3f2c45d193261e20a83 SHA512 84890c26a7b50f9825641af159f02d87e041ffe57fd5ebc0daa55bff7801366bcbdd6ee21a584ff1d177dd1a19c46bcb25a177391e77335b845778957b7737d4
 EBUILD kreversi-19.08.3.ebuild 1088 BLAKE2B f987867876886cb0b46582e14948183016dddefa71657a7353a6603c468afb36ae9fd333f70406bcdf80581ce5e03b6ee2757f83e1a05b25c90c649bf7b03a76 SHA512 aa38a929eacf8b5b51be938da6c7b8b7d588b67939e05366a8b45ba85ddeb1c9bde6254b6f8f15bc5c2ee654b789f90d0ba6234abf9a716bc7a1894b2ed46cb4
-EBUILD kreversi-19.12.1.ebuild 1095 BLAKE2B ff8a28257ce0e7084024f8ca437d13ac3d70aff6e6f972e9efb4c19a16103c6b66bd2cd88aded0071a136414563238eec438b91157a17adcc01bc190c285a8cd SHA512 3c8b2fb419f0d869bfb5f90e1c0851e7097eb4f5e77a656e96ee7ab9dac8ab9074fcefe9ca89c8d37782c2f5e42f518ccaeea327ebb36b02d8db87e2ef0354c7
+EBUILD kreversi-19.12.2.ebuild 1095 BLAKE2B ff8a28257ce0e7084024f8ca437d13ac3d70aff6e6f972e9efb4c19a16103c6b66bd2cd88aded0071a136414563238eec438b91157a17adcc01bc190c285a8cd SHA512 3c8b2fb419f0d869bfb5f90e1c0851e7097eb4f5e77a656e96ee7ab9dac8ab9074fcefe9ca89c8d37782c2f5e42f518ccaeea327ebb36b02d8db87e2ef0354c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-19.12.1.ebuild b/kde-apps/kreversi/kreversi-19.12.2.ebuild
index 66a5755adc93..66a5755adc93 100644
--- a/kde-apps/kreversi/kreversi-19.12.1.ebuild
+++ b/kde-apps/kreversi/kreversi-19.12.2.ebuild
diff --git a/kde-apps/krfb/Manifest b/kde-apps/krfb/Manifest
index 2d4cbaa6ca75..e4651ae88d37 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,6 +1,6 @@
 AUX krfb-19.08.3-portal-support.patch 868 BLAKE2B c1239f4247cb507eae14fe79a6f1e375b438dd23eaeb65eb32f81d81223eb58794524ce753c1aba2304058c202dc72a62bea330d9fe2be5c36f331de2df971f3 SHA512 ee64e02efadd52f4df4a753624790d42bd38aa8e45d984351814a91f3dccb00f1595c7dabffb64287c846d8added370d49580aaeb85f9a97508f8772dab91252
 DIST krfb-19.08.3.tar.xz 1278072 BLAKE2B f4103c255b64a5058eda2d8c580514fc79131590aa33b4b7dfe7e4d42f5cbad88b7a16a2939f33853128cea71769b869ee2a3fa5d78cd738fdef76e45acbeb71 SHA512 4c2012c0fe8363854bc93f7c86918e4d151bc8eb7505327615688ff8631a1c77a2acbdabe23bc56a072b5ccd3df5fe7a864ba0402ecc6171b4862118c814d40c
-DIST krfb-19.12.1.tar.xz 1278880 BLAKE2B f0f3b18da55716f4b15fb153da1e8c38128952cf2f73951ea52d36f38a3cd4711b63b484655d461bcae29db65ec94e4f9089e51d37d2d2cadaa867d275f08166 SHA512 95c3f3eb9734beb5991077ac1057066be392e59ede823c25ebef88067c2b7b1879db9d8cd2592a308cb544bbe262d58ac0b25f8e66578d19d18798fe51d5e964
+DIST krfb-19.12.2.tar.xz 1276620 BLAKE2B abe854e4c76f81259d5756f0fdc1c503fba679c9dea47c4580f30db8b181be1453f662fd9527b44e283703a8e27bfcfe71416c962e30534adc3bedff8b9cc037 SHA512 6730eb847f331211077859d8ce19f3cf04ec724b5a882759fc57cffa9d70624c0548660a94af2cb560fc88e02c0116e258150355d935ab01fd1cc03942904381
 EBUILD krfb-19.08.3.ebuild 1445 BLAKE2B a7d117c051cceaea97c62750070054a84ee90d9483c986e7d2c62bd16bddce96457d46f843f88141b67d00a1e49797f1fc2ddec38357a40851e07d838929dfae SHA512 03cb252a8a2c3372b5266ef704636b533662c905ff30fb5123272869e0e7614fd298f318932556c4d2b7288a99afd570dd675db031e975087570c31ac57040d2
-EBUILD krfb-19.12.1.ebuild 1405 BLAKE2B 3c7ef9fc8ba64a56630474c42df280f643bb68612bcc6eafef1e8e1f03c471a67b2878e256d7a8b144d17dd8ddfbfaf037bb164543da3021ddbbbe949fc4eaf7 SHA512 63a103c9d7b532a0fa7c929fee32a5a772192f83d344336236e87c9a79861d695742a227e277ac83f62bd9dadb5f348ed5bf150fabacf113a27b3941f6aaaad4
+EBUILD krfb-19.12.2.ebuild 1405 BLAKE2B 3c7ef9fc8ba64a56630474c42df280f643bb68612bcc6eafef1e8e1f03c471a67b2878e256d7a8b144d17dd8ddfbfaf037bb164543da3021ddbbbe949fc4eaf7 SHA512 63a103c9d7b532a0fa7c929fee32a5a772192f83d344336236e87c9a79861d695742a227e277ac83f62bd9dadb5f348ed5bf150fabacf113a27b3941f6aaaad4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/krfb-19.12.1.ebuild b/kde-apps/krfb/krfb-19.12.2.ebuild
index 78c3709131f4..78c3709131f4 100644
--- a/kde-apps/krfb/krfb-19.12.1.ebuild
+++ b/kde-apps/krfb/krfb-19.12.2.ebuild
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index b210476a0a60..eb1b48b309c0 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,5 +1,6 @@
 DIST kross-interpreters-19.08.3.tar.xz 151832 BLAKE2B d6ec5c4fb21100a1548beab6c16600120a181aea1dc2da4753c36d9466dc485a17bc54ca49aa97fcf5f968c998a70f4d028daa18bf7a81052b86d2589fea9fd7 SHA512 2c8fc01bf004b4d5780eb6ba0462dc98681abcc6437f06ae35505e4ea8052aaee82d1d4d45d7696ea473e85df051fdf80e6e4112122a6fe45727f8f2a7ec050e
-DIST kross-interpreters-19.12.1.tar.xz 151816 BLAKE2B d79f0deeeb5445315c31474baba5b68d9820493975a5f6203a6cb27c4e12bef22dfaa761fbb32fe026ef872cf62ed8bc8dde100eb745cf12930d2eb98ce35b1f SHA512 66e70008d16fff4480012236e918bfb5bebd4d86456a03240eda81bd004146584c379e4aabba4b54e6f97ab6092360d45596d53b78b351c11f7c1d24f84ea3e0
+DIST kross-interpreters-19.12.2.tar.xz 151384 BLAKE2B e39a54b79941a81b14ded145e85ae3cbfc4b94a46eca0a46040dbcee1cdcc6aa84f3ace3228cd7313aad9fd1734e557e50abf22fc400a951dec838507321e5e4 SHA512 fc77186044991304d45444fb8893a99a830c1d6a006938fb566fb53a2f962914079202bbefb6a203a29df59d46c11cb126358060e2fe42657d8be0d2fcc4aa65
 EBUILD kross-interpreters-19.08.3.ebuild 833 BLAKE2B 72718f83160e9b6f87f2b573dec9f190ba57a5eec45752333940a0a2f7446ab11a1a5e6b9df52bc2462c5f78450c365d38a3c065dfe3f183816750fd9237deb7 SHA512 de95cc9bf768282752d77854cd95f70276b063d7235ad8113b781b01b11642a13c9a107090b04db90f8526defc2278c26002da35368524411163fbb407f1aa01
-EBUILD kross-interpreters-19.12.1.ebuild 837 BLAKE2B 0c4782ca3263458f0ab6fbbd41eef9802f92f84240b86c94568bdfd2b93d333bb23e66d57e73cfea81027e2b971b1831765e4b2624b9cdbf59bd7646ef1e197d SHA512 f95ce49b66742b621ab0432b5834fd09cd3df6b736ba23b7c85fd63eb458837efd9cb0fb62bb5b46fd25b373ac8bc9075a0daafeb377edc9fbfe5046bb7cc6f1
+EBUILD kross-interpreters-19.12.2-r1.ebuild 837 BLAKE2B 4d851a38a36edb04495b2a2b7fa7e775bd4c175969f6228b9ac4d51b51e116e877c1d2dde2cc5bee1b1fd195790d7f50f3497fcfeaf610dccd7b0e4c98634e2c SHA512 1524f81afff3ef280699c0f24d57d28b47780e3a659797a9ddb9f120f8375e9a35f1c86fc830be7df4d21534954943a9ac90a6fcdca19d19a71f77866909df51
+EBUILD kross-interpreters-19.12.2.ebuild 837 BLAKE2B 4d851a38a36edb04495b2a2b7fa7e775bd4c175969f6228b9ac4d51b51e116e877c1d2dde2cc5bee1b1fd195790d7f50f3497fcfeaf610dccd7b0e4c98634e2c SHA512 1524f81afff3ef280699c0f24d57d28b47780e3a659797a9ddb9f120f8375e9a35f1c86fc830be7df4d21534954943a9ac90a6fcdca19d19a71f77866909df51
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.12.1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.12.1.ebuild
deleted file mode 100644
index 2e692c3325a9..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-19.12.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby26"
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1 ruby-single
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+python ruby"
-
-REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_python=$(usex python)
-		-DBUILD_ruby=$(usex ruby)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.12.2-r1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.12.2-r1.ebuild
new file mode 100644
index 000000000000..9b58b5932f54
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-19.12.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby25"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1 ruby-single
+
+DESCRIPTION="Kross interpreter plugins for programming languages"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+python ruby"
+
+REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_python=$(usex python)
+		-DBUILD_ruby=$(usex ruby)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.12.2.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.12.2.ebuild
new file mode 100644
index 000000000000..9b58b5932f54
--- /dev/null
+++ b/kde-apps/kross-interpreters/kross-interpreters-19.12.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby25"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1 ruby-single
+
+DESCRIPTION="Kross interpreter plugins for programming languages"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+python ruby"
+
+REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_python=$(usex python)
+		-DBUILD_ruby=$(usex ruby)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index c15cdb2eaf41..0b6e62e5e162 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,6 +1,6 @@
 AUX kruler-19.08.3-qt-5.14.patch 1395 BLAKE2B e46ce5ca3e4540a8776e5df5ef478abfd6a12d22551d3180c7ee6efe29fb3036020ffb6d512d26651c92aa8b7f3667480903ad81d053c005fd4acf665b29f1d0 SHA512 bd88002f2f5d40861cb8b63bed31a1f541fd11c214c116b1b8a4ef2fa93fe997f8be672c5af5718ffcbd0222d449b898ddf64c3523accd186006cffc9a65d9f5
 DIST kruler-19.08.3.tar.xz 249500 BLAKE2B 49e857bee9076f6f4abde7c719b9c4e7a55d50d70d9beef76ad6e31826aed44c0f66accd5b4ea80afc9543459e27f793973d82930dd0f400ca507b69f9ed51a3 SHA512 25e146e941f6eaf04e4f93cffad0fae777345800f1b80127e39f3701660d4c0f2839d152a82c15b8e5ebe9351a41974e139223984fd6cd99f49b7de36789d139
-DIST kruler-19.12.1.tar.xz 251136 BLAKE2B 96bae348d27eda01c417ca831eb202f3799571dc71f2355464829410da352f9e3537665def39083e9efb978bdce5617ad0071c09f2710aa3199a3e9fe9a803f5 SHA512 0ff1b66d098da6c5784858aa2de9a6c63aa6c6e7a88e563305271b74d8983b6e776cdb772a46c6418913b597a1597459718fa7a54653c0245f892ad5dfe8b248
+DIST kruler-19.12.2.tar.xz 250384 BLAKE2B 3b1d6de006086a38f97095183d90189eb0fc827fe4d4c919dadd33b73710f669e93c44381ce839d1b5275aa3410307502c4e1501c17648a207885f89f81e3f0d SHA512 df7f7cb8ef7917b28132ef7a873cd55db20c20925782087dbd48ad25516674c3478b3a908dfef43e47212cd2487abdc4a2b450a2ee74b98e5e685dbb0722a08a
 EBUILD kruler-19.08.3.ebuild 990 BLAKE2B 65deec241474bfcf08d6bc5c519b93bec90b8b8d0aa4c336289ab6b6d826dd8c11ab7a9399a8e7a5b14926719c7eff27119caf2c81b7531d815f19d9bdd3b724 SHA512 12b6efbe4fda75bb433fd48847756ad4edcf552e613dfa01670dacc7d02789dfdc943bcf6f3abf5f1104527eb2b14df24a77738547e29f046307249353cb207e
-EBUILD kruler-19.12.1.ebuild 961 BLAKE2B 9a632fe2c8d4913d0c04d278d49da7cde8264584e04b9a798a70e8dc9ba43a4df5fb0c0315fd55dc3cc3c1122f3944a6749aeeb0352d64b7f6ad0982ee89e0da SHA512 c02d0a93d6ca14fb787ff120ef9ac27d5db9091de35b965332e8458453f57f60d19d58f62333412641d47119af5f6e97454ee441460333da5332a49996a60bd4
+EBUILD kruler-19.12.2.ebuild 961 BLAKE2B 9a632fe2c8d4913d0c04d278d49da7cde8264584e04b9a798a70e8dc9ba43a4df5fb0c0315fd55dc3cc3c1122f3944a6749aeeb0352d64b7f6ad0982ee89e0da SHA512 c02d0a93d6ca14fb787ff120ef9ac27d5db9091de35b965332e8458453f57f60d19d58f62333412641d47119af5f6e97454ee441460333da5332a49996a60bd4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-19.12.1.ebuild b/kde-apps/kruler/kruler-19.12.2.ebuild
index a21fc46016bc..a21fc46016bc 100644
--- a/kde-apps/kruler/kruler-19.12.1.ebuild
+++ b/kde-apps/kruler/kruler-19.12.2.ebuild
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 1459d6c13b13..3f29542d64ff 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
 DIST kshisen-19.08.3.tar.xz 821980 BLAKE2B 6c1411c3841d01afa31d1cb83781ff4c6c68d51e2eb67e93478402110bbc80dccfba6ba00f897d2eb815ffc59591a6725cea70375b36e4bf1a7cc95b93b7e0b0 SHA512 7bbc3507dc1100361b4d2d0dea9dfa969533956675d2b72137654237224152d4406076fadb5b749a348d5cbe70158aa7656bfc83b047b7490c43f6782e79dddd
-DIST kshisen-19.12.1.tar.xz 823404 BLAKE2B f435b6a3406a4b76a376855a6e3bf2608228608211a89a32383fc327ba6dc115074144a77dfad2dd79828a0f532cf99dd5ba0005798674dc1f949506595f4039 SHA512 f49db76abb81f7ac1a311a8282795ff398df98cd06ed03937bdbdca152cf6063a35a9cce1ad83044bc5986e0b95b37b6c610a5cd2a0df4330477e0b567bf5471
+DIST kshisen-19.12.2.tar.xz 822424 BLAKE2B b06c68594cac7e82d959135ef22939bc3f894baacdefc46834862d760bdf2a67a2a00227f5b97ccd0e7718ecef48f3c10db347471a144d172a97c11688fab3c5 SHA512 dec426a6f7988e0b55d7029f408aa2e87064530bd90f211b0fa40b75887e13b07b9c3af8447223e43456a66269a6f8eef17535d2a7f9b2b8b442a0d5adf334b1
 EBUILD kshisen-19.08.3.ebuild 936 BLAKE2B c0a92c67bde623346b6a3c0cb8b3dabd48c8f11b19c5260b3d82e640d711a0cf8bd801dfc7dc6920d2985c2e57a8a3c5679dcc3143bd0a8002d8cd5701fa1384 SHA512 9dd33cbe0fef3115af09bd6eb4df258858aa9a48f3ad47d7fe70f68f96deb190cb4016df617171ec7346f22f849578b08cf914839f374cb7b81e0d1a01e28f1a
-EBUILD kshisen-19.12.1.ebuild 978 BLAKE2B b4a26e8f2949e01ad51312069f178b03640da787325de8e941ceb7f228c5813fe9e6438193d00b66cd1ae4cd122242d4d373afe080f041d022798bb3dc9ca201 SHA512 85f2a28a88400956f56959f189ce4b7530b1a5122535aca3bc04c7a70047b8b9c66bfce2538f031edae364269a60dc42835ed028cb4a08e03c4f4d07e4c1613d
+EBUILD kshisen-19.12.2.ebuild 978 BLAKE2B b4a26e8f2949e01ad51312069f178b03640da787325de8e941ceb7f228c5813fe9e6438193d00b66cd1ae4cd122242d4d373afe080f041d022798bb3dc9ca201 SHA512 85f2a28a88400956f56959f189ce4b7530b1a5122535aca3bc04c7a70047b8b9c66bfce2538f031edae364269a60dc42835ed028cb4a08e03c4f4d07e4c1613d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-19.12.1.ebuild b/kde-apps/kshisen/kshisen-19.12.2.ebuild
index 0158c9f77500..0158c9f77500 100644
--- a/kde-apps/kshisen/kshisen-19.12.1.ebuild
+++ b/kde-apps/kshisen/kshisen-19.12.2.ebuild
diff --git a/kde-apps/ksirk/Manifest b/kde-apps/ksirk/Manifest
index 0abf80f0b54c..7ac4695f366a 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
 DIST ksirk-19.08.3.tar.xz 6996284 BLAKE2B 4cd50f208df7ccc6bc1ba5ae0ad45b16df2c1533ec1197aca6fe67979b2dca87474809658bf228356bfea4efc3e97125c3f347105cdaff77c55cbe1e276df275 SHA512 4285cd28d8353d60d64fa6a9abc75f7a580e3b600b947be49d768a3d3f9613eaf5655479f1ee5c2bc8139e6efb3dbbbf878a2ef349b017e76a76a2a6c30b9ef8
-DIST ksirk-19.12.1.tar.xz 6999100 BLAKE2B 5aef643e7e650394e225af28ada62db12a1b45132b09e8dd713d89e816e76063bc08fbf61426de8d8a7e4aa54f0fba5998eb9446c3f4ab43aeb5366a2a91f8fd SHA512 a286d3a5e0f450883cd6c19c5d42e31fdc94228b936d7f74c8b7219243d4a8834f83d235e12229e0c7070ee6715ab75b7c1df09383c6e923b6474ff7ad125568
+DIST ksirk-19.12.2.tar.xz 6995304 BLAKE2B 70c17f4fff7f3fc65093d7bfb9b7048e672f7236520e7cf6e657a6ee294d998ae0078bdb9a150ad5655567257819412995449d8761a8366a6990931220a31c80 SHA512 a675e58c177a3c38317c6122c5297f7f1f0f431e27cc8b9a68f56f5c6a7544248c2dd2fbc2f1e246442e113b2f4742a129aa0e278c259404bf23c5e4be7519e8
 EBUILD ksirk-19.08.3.ebuild 1167 BLAKE2B 13d7cac8db91ebdb5cbd067147b2e746e0d745696d1073d101255eb372ea149cb9f7c117f2ff4213aa99fc71eb2f983230b35ba13841416edbe3d35904ab249a SHA512 ddd83c910790d0c3d82ca38db16e2ed804c8e6a18318b01327a1f69e89da21ed478b2126f6929c142f1c2490e4fa66420508dc1a30e6575a6280fed8d3be0ddd
-EBUILD ksirk-19.12.1.ebuild 1174 BLAKE2B 3c832007f84c405fde38b07d426be50eb5db22306f1a464001cdb653f9ce7e2aad318a487b2066976c19c6deffc8da8139696f742ee3c98677f27a4704d717c9 SHA512 68f8b7b72e7e2954ac5a04f6a3ab4cc754ea08ca7633ea77cb5938d2d464f35ec34ed62f5d572c3234bcd8bd045122b959595e77d8dac30be49fa045eb2e05c1
+EBUILD ksirk-19.12.2.ebuild 1174 BLAKE2B 3c832007f84c405fde38b07d426be50eb5db22306f1a464001cdb653f9ce7e2aad318a487b2066976c19c6deffc8da8139696f742ee3c98677f27a4704d717c9 SHA512 68f8b7b72e7e2954ac5a04f6a3ab4cc754ea08ca7633ea77cb5938d2d464f35ec34ed62f5d572c3234bcd8bd045122b959595e77d8dac30be49fa045eb2e05c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-19.12.1.ebuild b/kde-apps/ksirk/ksirk-19.12.2.ebuild
index 82da3182fdf1..82da3182fdf1 100644
--- a/kde-apps/ksirk/ksirk-19.12.1.ebuild
+++ b/kde-apps/ksirk/ksirk-19.12.2.ebuild
diff --git a/kde-apps/ksmtp/Manifest b/kde-apps/ksmtp/Manifest
index 74d66f58a1b2..7ec3431902ba 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
 DIST ksmtp-19.08.3.tar.xz 40472 BLAKE2B 5409e96a99e594f6eb4efea460f6e172c180dde11a31d25ecded542b24a21707fa851d5e8063b331351d0c68a027e5bb92615ef0bbadc3a8255c41d39d39ecdf SHA512 156b1a8bea14ae90162a5c373f53ff519b271f23029b5fd420020fd454da49d004551daadea395d771622d4af09b0cf4e6e0701084943e2572f5a93ac097823d
-DIST ksmtp-19.12.1.tar.xz 40856 BLAKE2B e02fefe456c4b0afb348b40894b493cabce5d2165627feec504780bf5e14418492b484b4565ce211e40df3dcb87de60c58ac33fdbe899b5f6742c5d2919546b0 SHA512 fd93c255f207c637881a71d0ca04b0068c7d6c358532d3e94e54cf5c5a8a984e5f01ff0ac8006b43d75f6e18b8e286715cdcd43034af9350616377f096c89a60
+DIST ksmtp-19.12.2.tar.xz 40800 BLAKE2B 1ae43192ff257a1c534c1fbd96e6b649bb6c03b2300ce61526f69e750dfbb4f5b20624a1bc1863f07e57ea3a9214c45a719172f3d431e14daa560302655d84d7 SHA512 d55055f6a00ba7a7bb6de7983efecd7253a28e275fd3032d210599c5c020fb2869864e2f4b0cb38dcd3faba1b57fbb3e9f0c5f48000ca60d7737f213d00d666e
 EBUILD ksmtp-19.08.3.ebuild 534 BLAKE2B 02b2ea5dcc77f3a0a5f19bef549a51c30cc7f4346c496ff4e1f32be72590a1151e9b7c329423d7162f4014ab7f8caab85492e2489bb13166d28cf17b6ca3533b SHA512 fb268def98f4984251ca974d30cad1030935ca1f0002de479d0a10aa6c04e8f91e45656b5273bd39ca5e5d0f783a06ae76f54cdebe4550f2f72dbb169ac93142
-EBUILD ksmtp-19.12.1.ebuild 598 BLAKE2B ab844e08039cff45834f28e5ae2102f1e68c7ed391d94c44dff1818018aed3dd0c4c9b46a4a86eb7d094267ade38249cb53df2b07238ef4c1ef538eaba3c64ab SHA512 cdd080f2e9935ec4f504aed31c0a164dbf18f2d6f5e538359966a80fc8dd80de5d267c82c2399e56b6260ca187b35f7b85b2f7fce9a9df3d7e5a60deca75e8d7
+EBUILD ksmtp-19.12.2.ebuild 598 BLAKE2B ab844e08039cff45834f28e5ae2102f1e68c7ed391d94c44dff1818018aed3dd0c4c9b46a4a86eb7d094267ade38249cb53df2b07238ef4c1ef538eaba3c64ab SHA512 cdd080f2e9935ec4f504aed31c0a164dbf18f2d6f5e538359966a80fc8dd80de5d267c82c2399e56b6260ca187b35f7b85b2f7fce9a9df3d7e5a60deca75e8d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-19.12.1.ebuild b/kde-apps/ksmtp/ksmtp-19.12.2.ebuild
index 77b2aa8d068b..77b2aa8d068b 100644
--- a/kde-apps/ksmtp/ksmtp-19.12.1.ebuild
+++ b/kde-apps/ksmtp/ksmtp-19.12.2.ebuild
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index 4ff7004db5f7..3dd18a0c0cef 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
 DIST ksnakeduel-19.08.3.tar.xz 604504 BLAKE2B 1150ad321f24d5a5a0f8d5dac12a8230359694ac8e6c225216c03e50c9dde0d6762ff45b667231dd63794b125544e152943e75b4cce8aa005517dd30b84a2d04 SHA512 2f3b6d038678d2e6dac679e6edef4716bd6b1d9d3b87603423036f5d05a93339a7b39949811eb6f1a544038e529e00b2aa2d3646eb8808c572596292c1ae4b00
-DIST ksnakeduel-19.12.1.tar.xz 605248 BLAKE2B 750b1741345f82ff7348607d24b47613a0013101c340a7e4f3696d680c215f8441f5527537870f072bdc12c6133f5dd772bb8dea8dfd76a4bfc85fe87f363778 SHA512 32e807bc82c5c7d1a8c38ee7f93600e49ac9b7f10d3ad755b51c2c69c36cd6bcec182f63a7f54b1bf1f65cee102f6f45a1ef4812b44a2afd5d91934d1928f5f8
+DIST ksnakeduel-19.12.2.tar.xz 605104 BLAKE2B fedb57bcb5abc55d002e3621d2b300a269479f24c6a3cc39abf489456d6ede66afffa9719da739d08bd2f82b9adf1ba3cf549a65b71e3fc673f732e4b9250315 SHA512 6e5603ce8a10b7c64c947a617b5c6dc4ad71d04a1a4073193af39aabb992fa7a9ceeccd717062b97c951f7f3f8338537d6c9f6919d9a6ed1d7b1752292b72df0
 EBUILD ksnakeduel-19.08.3.ebuild 940 BLAKE2B fbe8142c82e05e05b0cc7ee09b29f78a8f4a1800aa3c5f3e087dd857825b8326948427b912a381989d551b8d2182bf2bd55199ee428412589151716dd8126cac SHA512 3b88f4b5007fbcc767b60826751fa63a062b1fc05e7997db537189e93a65ee51c3f4d6047bba7d61001322515bfab9e0c65aeae79773e48d854fbf63131f277e
-EBUILD ksnakeduel-19.12.1.ebuild 951 BLAKE2B 0ec27d9a048a27c8e3d587a5e20751fb6c7cc276ae0b5692484046c9d7ddef839b8a37b90ba4b21a284b4b638949420ebdab373d141f5f7ad934be00f3784248 SHA512 91480d62046ad68a87e4cf279b9b6ef47a4cefd2e73b7aaae92ff00db356205e06164e022636cc0e9786a077ec8021b97c9f3cad904d10c26fb1ed72fbb49cc3
+EBUILD ksnakeduel-19.12.2.ebuild 951 BLAKE2B 0ec27d9a048a27c8e3d587a5e20751fb6c7cc276ae0b5692484046c9d7ddef839b8a37b90ba4b21a284b4b638949420ebdab373d141f5f7ad934be00f3784248 SHA512 91480d62046ad68a87e4cf279b9b6ef47a4cefd2e73b7aaae92ff00db356205e06164e022636cc0e9786a077ec8021b97c9f3cad904d10c26fb1ed72fbb49cc3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-19.12.1.ebuild b/kde-apps/ksnakeduel/ksnakeduel-19.12.2.ebuild
index 7e6bca0816a7..7e6bca0816a7 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-19.12.1.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-19.12.2.ebuild
diff --git a/kde-apps/kspaceduel/Manifest b/kde-apps/kspaceduel/Manifest
index dee29ce8651c..2c1c6d4f4038 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
 DIST kspaceduel-19.08.3.tar.xz 611304 BLAKE2B 67c54a7fcf79f21c11f0c9ca09492017e9d22cbcedd2db33c651eb3ada8ccd2074b809d51fffce0ae4999f301e4cd0f0b8eeacba23dc588199ed7aee85805c79 SHA512 3a3307beab90e87f0a143e57d81fe6e6ac620e79d2417a416b4ca6cbce4dc94be036a7a499359c908df075d1a480d1fe6a00ef15fd74bbe8b36e9fcd6d4d0196
-DIST kspaceduel-19.12.1.tar.xz 611600 BLAKE2B d1f579e1b7378c4505341cd008a8bff69886123bf1301aa5b3f7b83824d376a8d60b91e9fa31e3dba6ff2d164974ef3eba457a9774096e660d24d91850fee2e4 SHA512 bf0fa2409d176af7648e950fbadde70ccfbe08d52d73415d024dda7d41e77f87ed02f806c8c23bffe770719140fcb1af79b6e839a3ec5b9a8b3883a2b8520348
+DIST kspaceduel-19.12.2.tar.xz 611224 BLAKE2B 5077fbed564c51b13aba8760dbbe02ace8874664e3247d5621bb9cf95216296031208bfeb630ef4314ad6fa36e9fccbfa4af9a5fecd84a640e2d9d864967ef7f SHA512 64fce84fc6ed21510d3ff311d7f8f607fa97ecd613cc312685a56a18de27bf1f8a2a923b8bf54491843d04fee18aa9d376ac648887b19aac09ad62e24aebabc0
 EBUILD kspaceduel-19.08.3.ebuild 875 BLAKE2B 1880ce033323fb2e47f44febf2e2949a93df623f3138e4efd4df166327cc4067c93f836df805ccc5fd5b74cc296d3ebaa89cc97434cdaae4f9f373715d7b7e90 SHA512 59a8064353742f1a44d606c5ee9876aaa4e57894a8f7a4b47fd63f4a744e5093752943535cda3fc253d7678190042260420a7e10294ab107d966f043a9d40b52
-EBUILD kspaceduel-19.12.1.ebuild 882 BLAKE2B e4ee6160f34ab57800913fc40e4dcbca87a24415853ef251999be9b7bc21c3b0b81a2eacc7fda444a64bec4b288f156c2f14b444d6c19303851382d4276e61e0 SHA512 f17d0ef389b91939aa52934296ff6620533667566b32bb017fe85d1e4707ee0977cd45ec5337c3c1e23077ddf90d9c1556e088e5bb89dcddef9811a7af36a030
+EBUILD kspaceduel-19.12.2.ebuild 882 BLAKE2B e4ee6160f34ab57800913fc40e4dcbca87a24415853ef251999be9b7bc21c3b0b81a2eacc7fda444a64bec4b288f156c2f14b444d6c19303851382d4276e61e0 SHA512 f17d0ef389b91939aa52934296ff6620533667566b32bb017fe85d1e4707ee0977cd45ec5337c3c1e23077ddf90d9c1556e088e5bb89dcddef9811a7af36a030
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-19.12.1.ebuild b/kde-apps/kspaceduel/kspaceduel-19.12.2.ebuild
index 83a1730f0974..83a1730f0974 100644
--- a/kde-apps/kspaceduel/kspaceduel-19.12.1.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-19.12.2.ebuild
diff --git a/kde-apps/ksquares/Manifest b/kde-apps/ksquares/Manifest
index 057e8fd874cf..d4fb179894c6 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
 DIST ksquares-19.08.3.tar.xz 260604 BLAKE2B 5c96af1c6fba1fa5abc10c8c12131c032d61be5f1c42b68b9412c8b8ef799b7123abbfc59068757f29f2e450a703989dbd0f95de360752f620fc19455ba91bef SHA512 5c30be80598d509fe168978c30554a05337a8461e318f6bb834a02c118fa4f763e832f9d57c3c47b3923941bfb325750e544bb0a5a428ef73886fbf9076eea1a
-DIST ksquares-19.12.1.tar.xz 261364 BLAKE2B c05fca18fe3e756f810bba0043712b7ba859985c913828124e31fb0a7cce750ab3793fbb2667c9f0e4157d452d1abfed68b5b57d1763517e742fae70a9ea661c SHA512 4c2e4b94b231210bc4ff9f035d14ab82d79f7816511e9a3c35ec8155b2a89aeb9454bc9d1738de786a1e4850a2b43a399590e94544f17ae6b3f30f2b69133ae2
+DIST ksquares-19.12.2.tar.xz 261108 BLAKE2B 9454d5f5198ed9543f38cfa9fc049b349fe1a24f3f7e50ca36e70dbd331db789a1ab694571297fdbca6c9aad399e7646cdc04819be7edea0b655e72530755b34 SHA512 e314470ef6ad1ba06b958bc7a496b962a23c42eaa9084a4f93a690a90ffc45d87679e96cdea62c10cf030cc69070fba7c7ed179509f60e7645ad055c435a8b12
 EBUILD ksquares-19.08.3.ebuild 914 BLAKE2B 85bc132c4e687443a3126e7a7af4e73f743db468f820530953e10c0b5979dd245db9c9f7fa9fa1df87f0ce17852845da6e5d0d850fba52c2db5b054b3ef2019b SHA512 0d4c49437d82f2451972d502257228651bd0959e4cd8ca11ee204b64b8c2d478f860831ee9c3954d596a577aa6d30a8ee1920f3dd956d9ec0d384c5ae36f48f8
-EBUILD ksquares-19.12.1.ebuild 921 BLAKE2B 60f56bbded020eaf7ee77a19b6e9f1fcac9546a02980ccd012f9aec02ba4c984138abd801b44eb356967e9fd0214e26e5fb6abc92fb2a179d864fd93847e5719 SHA512 f444c974242de140170db20b2b79ed28f6a3d0ff0149c19d42137ed55d3050aa4a544223a8c598f9051a21091398f203e5664385c51cdc83ef608e454cc771e6
+EBUILD ksquares-19.12.2.ebuild 921 BLAKE2B 60f56bbded020eaf7ee77a19b6e9f1fcac9546a02980ccd012f9aec02ba4c984138abd801b44eb356967e9fd0214e26e5fb6abc92fb2a179d864fd93847e5719 SHA512 f444c974242de140170db20b2b79ed28f6a3d0ff0149c19d42137ed55d3050aa4a544223a8c598f9051a21091398f203e5664385c51cdc83ef608e454cc771e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-19.12.1.ebuild b/kde-apps/ksquares/ksquares-19.12.2.ebuild
index b8e494e8eb64..b8e494e8eb64 100644
--- a/kde-apps/ksquares/ksquares-19.12.1.ebuild
+++ b/kde-apps/ksquares/ksquares-19.12.2.ebuild
diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index cd737319374b..98e23c52bbdb 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
 DIST ksudoku-19.08.3.tar.xz 1649140 BLAKE2B afadfed26d2fa79585d9f52941d5a7a8f0c51ee6fa887e8977292aa20c06e2e0c1e6cea06f11ea46daba3381bcc36015dc533da52cf8f55aacc62398a6894242 SHA512 fcb434bf12ca2a553fed928e258d48173e90da682c776638705047441a690c6ce12a20231ec4005424565a4d1c5d961150e4253cf35ab5e7f8efb044652d6dea
-DIST ksudoku-19.12.1.tar.xz 1649256 BLAKE2B 0c4866410f3102ed4ac3b85ece9b47c92ab2b9612a342a8ef21eb5f3d885f649464953f4d1927222b3557c89f952c5062a1585408f64e5aa8f02c6c1dd9b1b97 SHA512 67785704427ad5ea80e3d7c586cbada6e1297b84bb09311593673213d7bd56abab8b6fa044a7dc07b30ac12e49d8eae73ea353f3d5d0a4c818934a635776eefa
+DIST ksudoku-19.12.2.tar.xz 1650128 BLAKE2B 8ee3b732379d6ede60b436f02fe2d99937035fad1fe48dca7828a94f2b5b0001e4afea5227a952032052d2acea0e566fe478d531eff89d28095a64423087fb37 SHA512 a505e6315e4687c16afe223f6343ec658d3e6672261777c5d607ba964bf1b56ea4740ed739fcca6a29efccbfc3e0b56b3036074ae4af0706bfb2cc236733bbc6
 EBUILD ksudoku-19.08.3.ebuild 1298 BLAKE2B 2943a1c5f49d4c392a7da3c6b7806b1193f02849ded09ce82e5d21e6e19f58a97b77f1dc88129d8132a8151758ab727d89ea860c01d80dd390db8c11c9525f9d SHA512 f9f357221d6789191ec8839c957876c68282c7f45c35ee79cecfac6281995c8ba67c4ca4320aecd5ba70a458972c93dca200fe974f67cb5c6db7bf696c9c14ee
-EBUILD ksudoku-19.12.1.ebuild 1305 BLAKE2B f1ab1d728aff7892e2ec89491569e00b996951b75b2ffb39631a9abd9321c6ec3be48d96545dbef8983afd1f04aa49ac20ac0ef04554c7eee355f13f194f3831 SHA512 dd125a6c9a4ad928cbeb2aa58c40799502cddc7e5aace25a6e95dbc83887bff749940eb6700ce83cfb1d61957b6b963b22a449b29d683ccb84928c1061083daa
+EBUILD ksudoku-19.12.2.ebuild 1305 BLAKE2B f1ab1d728aff7892e2ec89491569e00b996951b75b2ffb39631a9abd9321c6ec3be48d96545dbef8983afd1f04aa49ac20ac0ef04554c7eee355f13f194f3831 SHA512 dd125a6c9a4ad928cbeb2aa58c40799502cddc7e5aace25a6e95dbc83887bff749940eb6700ce83cfb1d61957b6b963b22a449b29d683ccb84928c1061083daa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-19.12.1.ebuild b/kde-apps/ksudoku/ksudoku-19.12.2.ebuild
index b2026bbfdccd..b2026bbfdccd 100644
--- a/kde-apps/ksudoku/ksudoku-19.12.1.ebuild
+++ b/kde-apps/ksudoku/ksudoku-19.12.2.ebuild
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index 572df5266a68..497a6ae345b5 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
 DIST ksystemlog-19.08.3.tar.xz 1928428 BLAKE2B 77efcc19726a9af47a009317196d062fd78bf689618f8b9005fbf41b096e7f3ff76fc0451579163d69336fbfc2b3e9e6b9eea409a5933ed24adf82e5cfd29d6a SHA512 bc2f1f73a04b417579d12351d78a0c66a2814590cffaa191c3d5158e3f0819aa7a24bb69603b6883e4ea753944444fdd2986393c9c8ed83dca81408cd56a655d
-DIST ksystemlog-19.12.1.tar.xz 1928568 BLAKE2B 56da0e73b20f86e8d139a227cbd3689e4978c18564873e5e6515532ab5ce967bab4bbeadcdf25984993eb07707f9510395cb003488e2128099b9d67a04e48d55 SHA512 5ccd4f31f901a3b62bf3d72c7924dba9aaf69b5f927d04574ef88afdbfb56138dfdd50a906828833c1784d706aae6c0978ea2cc42c1e7a08d3f916e13419cdc6
+DIST ksystemlog-19.12.2.tar.xz 1928240 BLAKE2B d458a5ebf6642a51cf45092ae6dbf2e7163c7d7560f446961b54c4d732b90d8c0c626828f550d5a611b5c1deddea313a42f297e40786725d3dcb5266c5ddac38 SHA512 bae6cee05b3149607a6fc9ae4ff84667bcd41d8559c693f8d916bc1e3fb64066e5a82221007991353153d681236f5dbefcb2e2c69dc8e97d2372197d1401ef6e
 EBUILD ksystemlog-19.08.3.ebuild 1742 BLAKE2B f12daab6c4b6d57764f3afe4b923e68948605678b77bc6b49246af2ecde72c06995e126d9c928f586f93b5a6850018660addd76fa79e9e53859dbf05ab489630 SHA512 af44a2f89c9ae8d2add2f7d110f42819a614abbfc90e8ad356c287ba74c7e62e1536719aed01f4d88f70e7e24e86a3f237a143749767b554ff2646cfc9a763ab
-EBUILD ksystemlog-19.12.1.ebuild 1760 BLAKE2B 5f487bdd025f1b2b6ade29b8ff42b74865066ea8e0161564ae5de48ff7e1b678d43e97f38a07b21a79d354d5ab6c4933082606ae4653ae1d400c36de8cb927c2 SHA512 4e387e90655da3e4172cddf70dff2578e69b9575f79fb8ae1bd54f501d220f08d0f5303e580ab140513878c6a8bc449690d3fa7770b8e014ff148306a876c9c0
+EBUILD ksystemlog-19.12.2.ebuild 1760 BLAKE2B 5f487bdd025f1b2b6ade29b8ff42b74865066ea8e0161564ae5de48ff7e1b678d43e97f38a07b21a79d354d5ab6c4933082606ae4653ae1d400c36de8cb927c2 SHA512 4e387e90655da3e4172cddf70dff2578e69b9575f79fb8ae1bd54f501d220f08d0f5303e580ab140513878c6a8bc449690d3fa7770b8e014ff148306a876c9c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-19.12.1.ebuild b/kde-apps/ksystemlog/ksystemlog-19.12.2.ebuild
index 09b3f69b9554..09b3f69b9554 100644
--- a/kde-apps/ksystemlog/ksystemlog-19.12.1.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-19.12.2.ebuild
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 224bb4cf49b5..56686f67d727 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
 DIST kteatime-19.08.3.tar.xz 286792 BLAKE2B f0554fb2260d0474d4add0fc7b7913b35d16d88ff91c080df90e126c02155172a7301cc695b47adc2b2b3924a942e2f5ee71b134c1164425462e3ffcb3227205 SHA512 ad5349955fbff6fefd7fe97e5ff76ef848ecba2c217399ccc5c101b4cc27c7db6ef9d7c93ede6670dbe8482e4707d619f29d640e440cb20f02f70cc955a674b4
-DIST kteatime-19.12.1.tar.xz 286916 BLAKE2B b1a6824dd5a96b1c41d0f5ffa809f4fbb159d477f4fddbc5b2d5386bcf27c19ab561919eee93b582e5bf53a8b0aa491746cc73a5a9db8ca09110531aa1bb52dd SHA512 dde03a9f99013f6a5fbf58eeee4600d994f5a442a6332b4327270926eb2650d74e4da6c8bfad9a29f37126da6528cf3a308040ed27251b7663154231859725a5
+DIST kteatime-19.12.2.tar.xz 287184 BLAKE2B 2e682ce0f153e7890793261f009c8c9ae883976e4fc00fb718f25b33aab8894051dcbce4f0163327fbee1c7bd44c6e572987271add5a09661d16091df785f181 SHA512 020031b1fc2d7e374f3132ab45672a45e88d918697289143a63adbe8b88d7597700a3dae8390a04247c68085d1bde8c3056e84ee44ecbfb36e95fea283eedc81
 EBUILD kteatime-19.08.3.ebuild 861 BLAKE2B 5c578dfba917212a74f6c9772ba24ace72d0c301becb3077b9dd3dc912ea2bd950dcc33da81d5423515d5044a1d31d50b13c540b13c79c388b4367cee0f94f9e SHA512 4741c353281d9a93e1cb90b2459dc49111a804626eae0b1abe5cfe81949a3187257dc5246c74849ddd21d5bfe374e2fc21839ed50352264a45e24c730f7a9c8d
-EBUILD kteatime-19.12.1.ebuild 884 BLAKE2B fe24bbf4668a3a5f517ead76f19fa1a3dcccf467fa34139a91c01db5d8daec858545ddbdc8309ed596501672888ee7d684d6bfb6b3a02ac7b144cef913525031 SHA512 dcb54d66f727249ff0aec9a6529e327cec210b622f4238d56604e74e8208073062110f45ce5b9673d98af8727a256ba0431854caa6294e2c544291cc17ba2604
+EBUILD kteatime-19.12.2.ebuild 884 BLAKE2B fe24bbf4668a3a5f517ead76f19fa1a3dcccf467fa34139a91c01db5d8daec858545ddbdc8309ed596501672888ee7d684d6bfb6b3a02ac7b144cef913525031 SHA512 dcb54d66f727249ff0aec9a6529e327cec210b622f4238d56604e74e8208073062110f45ce5b9673d98af8727a256ba0431854caa6294e2c544291cc17ba2604
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-19.12.1.ebuild b/kde-apps/kteatime/kteatime-19.12.2.ebuild
index ed851b1c3182..ed851b1c3182 100644
--- a/kde-apps/kteatime/kteatime-19.12.1.ebuild
+++ b/kde-apps/kteatime/kteatime-19.12.2.ebuild
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest
index a167d678b3f4..a9bf06b2d450 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
 DIST ktimer-19.08.3.tar.xz 376768 BLAKE2B 989a578a40b51d7570e97557f1f010c3302d86dd4ba687e0b1d971007215a9e494e7f29bd9ad0a92155ae09bf82dae67765e9bc1319d12ea116ec6f18ffb83f9 SHA512 8e8eb803cec7ef2b445817584d44f5e0fcf5cb88dc12a65c8a91577fbe7e2462a5d08603198f8ab4c7dfb4ee139ea61f06087cc09c592ace6b759af2d1d487ff
-DIST ktimer-19.12.1.tar.xz 377424 BLAKE2B e037cafeca8f02b38eb3b5ed6570d0e9438b7a63c1dd4c51370efe31a8a9ba2f229e427966e7ebde464b3e597e59c35ed85019f19514a015adf700b0159105a3 SHA512 48216e36ad22d0133e92e4bfcbf2cf1a182664a4fbe7138df93444b7b34407b922862a85b1b63e34ce1303594c2e866311944c9e7658d848907eb7fca85b0b76
+DIST ktimer-19.12.2.tar.xz 377248 BLAKE2B 1ec7eacc4caeab1b10803bd28d4fddaa6d34065bda6b45e102f7c709232181a33cb92a32ed5d83e7d202347e3758e33b5821fb63c86daf0a277e8fb1656602e8 SHA512 8f63c47827b5dd84e5d09002b306530e81622c032d172b37bb6954327eecd8dd9243609e9e34615c961d09aeba87651dc143424b18c0c93c6e4465ccf7019679
 EBUILD ktimer-19.08.3.ebuild 830 BLAKE2B a5dbbefd2e41c9543bcf0c5a248025a4db690b789c6391658707d57559797516e9139f75f8723601e8a3448bd842de8a9efe57019a77c7cd739ec0d3c53db574 SHA512 014c76b40b7511f7b025e6a4f2b2e1de3812b14b75291855545d1e465c53634339f95a35175725bb56abdac510255febe648cb23986a948f4d9a747947919555
-EBUILD ktimer-19.12.1.ebuild 849 BLAKE2B bd99da74f979897c49a06960506b864ecd2edfeead34f4f79f95c918479414a0b2eee548b7b4ef186102c149df728c8a8914b8c6a14f5cc92b1ffec46d7c6a97 SHA512 bd2906e856680f50fe8b957548145ab42593a91a4de74e809e01069edf8fd34dbcc633fb303caf09dd0a53b2279a60337c8f93392493e2ec267554856ec9fbed
+EBUILD ktimer-19.12.2.ebuild 849 BLAKE2B bd99da74f979897c49a06960506b864ecd2edfeead34f4f79f95c918479414a0b2eee548b7b4ef186102c149df728c8a8914b8c6a14f5cc92b1ffec46d7c6a97 SHA512 bd2906e856680f50fe8b957548145ab42593a91a4de74e809e01069edf8fd34dbcc633fb303caf09dd0a53b2279a60337c8f93392493e2ec267554856ec9fbed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-19.12.1.ebuild b/kde-apps/ktimer/ktimer-19.12.2.ebuild
index 5b18dc2ecb4b..5b18dc2ecb4b 100644
--- a/kde-apps/ktimer/ktimer-19.12.1.ebuild
+++ b/kde-apps/ktimer/ktimer-19.12.2.ebuild
diff --git a/kde-apps/ktouch/Manifest b/kde-apps/ktouch/Manifest
index c3fa59c8743a..c365cdb043c0 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
 DIST ktouch-19.08.3.tar.xz 4937064 BLAKE2B 5098fb24c08e4343320deef501cbd579b575f81797f22bcbce914112d1e4ba1e83e924c8ddb58aa6066aa1a23dbfb8f9b2f451c7a83c960d54335cc950551823 SHA512 934680eb3f43f31ca04058a50b181a1cd6bcc5a9657bc5203c947e05a35706722aa023ce717b6ab4a4b5dd388e91682aee06b2cc1de9ab2030e9437e00ea1176
-DIST ktouch-19.12.1.tar.xz 4932928 BLAKE2B 577bb2feaa1826eff30a87d124a9d8dde1d3faad6ebea92e5ed145a2980b9986bcfa8083be930ca6d6e2667c632b033747c0e953c76225139960cb911fc510eb SHA512 500bb77747d08ef99f9363d12b679ae1a93a54880c1a51e9a33e289ea59b0c20dd62027c9bf410910a3c6bd2bb72acbcaf2ae7dcc3bcefb23382b6dc1feb4d72
+DIST ktouch-19.12.2.tar.xz 4931148 BLAKE2B e4a29a70635dcc65a3ce5764b9e3c1386dcee54a4307ae80743759282e5412a6511e49f30637c80bcad2400a4f8e14f0ee8eb01bf559eaacd1ee2ba694d85f91 SHA512 20d78b0cbce6652c5e4c9e74958cf3fcd0bf56b7a9b1dba508141160b482ceb9e749aeb05917d92e223a0c507227f1bcade3c6844057bc516e6dfdca613f2144
 EBUILD ktouch-19.08.3.ebuild 1648 BLAKE2B 353fb554edc592cc790f1c8cf501ebe6985a01c7a6b991bb83b11e1da5bf5aff085b515b8c50770a5a7438f63b8178dafa4898b4d2c7bec1d923523ca77bc7d0 SHA512 80d831a69202075ef95b52d3fa2626fc606d712d444b3e4dcd47cf6abfc4ffe2257a9dfc21044d19e8ef03c68945c7c8099bdbb850cbd1b3588f20d329f7581d
-EBUILD ktouch-19.12.1.ebuild 1659 BLAKE2B 5d81a57f362bcba6b94aa05aa4c7f9cb66f64e89ed2ccbe6360678d953b235b2dffb5108cfd92e64ebf497e399f16109ebb8be144cf6096217c5847665defa6a SHA512 cddec1d0762af56c3e42b89139c72581646a57e738fea9fbe534b07125908cbe82180e44ccdd90098173fb39965c1dc94e8737873c1e50cc3970827911824b42
+EBUILD ktouch-19.12.2.ebuild 1659 BLAKE2B 5d81a57f362bcba6b94aa05aa4c7f9cb66f64e89ed2ccbe6360678d953b235b2dffb5108cfd92e64ebf497e399f16109ebb8be144cf6096217c5847665defa6a SHA512 cddec1d0762af56c3e42b89139c72581646a57e738fea9fbe534b07125908cbe82180e44ccdd90098173fb39965c1dc94e8737873c1e50cc3970827911824b42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-19.12.1.ebuild b/kde-apps/ktouch/ktouch-19.12.2.ebuild
index 2da6022e4a22..2da6022e4a22 100644
--- a/kde-apps/ktouch/ktouch-19.12.1.ebuild
+++ b/kde-apps/ktouch/ktouch-19.12.2.ebuild
diff --git a/kde-apps/ktp-accounts-kcm/Manifest b/kde-apps/ktp-accounts-kcm/Manifest
index db8531c50b9d..129b213411b2 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,6 +1,6 @@
 AUX ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch 1117 BLAKE2B 3f6d05d10df137aeaaf68890795458314ac43556df7f29493ab129a9046f97aee0775159db57fc7d9c42769f8eef9ce071803828137b75b16206e6d164584408 SHA512 c4509fcb1a3a5051c6175c101dde3e50630c95a922791f92dfefef5db089e3bcd9fb0f9aceacdc0d28558337aed850062b8e641c83cb8dc2acf9d78972a96255
 DIST ktp-accounts-kcm-19.08.3.tar.xz 265200 BLAKE2B 82599ec0c4f9135a2d45f3df1cd53d3018ccb5ef530733fa8fe640f1ab05d9db2f32d15a2292c416455953c58f2eeded94e8ff1400326b37d1c1dc3e28a41684 SHA512 6bccc23631256e91d4962004bdb96949ca79ba0e8f2068a92c763023a2ce71413f559a60c54f84dc5c23fb1facfe7ff08f6c74b68021e6dfbc30d19f3a8c3ba9
-DIST ktp-accounts-kcm-19.12.1.tar.xz 263956 BLAKE2B 8aef754639d799e7c307f6886c9576d8bfa3a35e9bd6b7857287d7071f57aadbc94053ba8c3f9eef49a3929c9f07bdd896639a4c4b273f8ee660d66fc95803f7 SHA512 fc3a179e879e274d846686af88123c812ff7ef07fd7a28d4f3524e93c30aaa6aba6ac7e4bca92b0385cf3f34d081c6ff057a0df14714fc5f1630d2d25e065f70
+DIST ktp-accounts-kcm-19.12.2.tar.xz 265388 BLAKE2B cc49d34e57e898982a13902009d65dfbf23b530aca038c518917b96bdb66ff38b300cff280a1d50f40fc3d49f3aae770b8aab810e87fe702e56b5ccce7797628 SHA512 9461a95f69e43a133744cd05b2cfbe63462f2bbc7dcc130eebafc74a0f6308e3bbdb1804cf6932554309fc1252d59e43c66bf6d73a3d38f7f19b6997c342bf94
 EBUILD ktp-accounts-kcm-19.08.3.ebuild 1793 BLAKE2B ab4f995066ef74f27300759fe3b8e8ebfc1039ccaebe5f00c5334501eb40ff42083a238d2b9673b770a8efc02d1fe48d75c0502121686c49ae98eedce0df4a86 SHA512 21e95d4e790a37739f179e942e0649a89569f0978cbb72d68deebcb5bb91a509983163cbdbf640468a9b8f705ee30535242918c965f33f573a0a201cf575be42
-EBUILD ktp-accounts-kcm-19.12.1.ebuild 1687 BLAKE2B 23d5f4bb692296816d1222c4aacb4c75f1ce081d2567b96efe3295c430391c5d2b3f5064e34ab1dd1229cd318f43999f2eaef324c2d9ea39528e16391aed2521 SHA512 c1b3d219132b8e41645a0b54596b3ad2ee63bab9736f08314ed4a3a24c3680730a50499c8f47dedce25fe549506fe22308e366327eb6ae89b334b23595483517
+EBUILD ktp-accounts-kcm-19.12.2.ebuild 1687 BLAKE2B 23d5f4bb692296816d1222c4aacb4c75f1ce081d2567b96efe3295c430391c5d2b3f5064e34ab1dd1229cd318f43999f2eaef324c2d9ea39528e16391aed2521 SHA512 c1b3d219132b8e41645a0b54596b3ad2ee63bab9736f08314ed4a3a24c3680730a50499c8f47dedce25fe549506fe22308e366327eb6ae89b334b23595483517
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.1.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.2.ebuild
index f19be29f7dab..f19be29f7dab 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.1.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.2.ebuild
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 2234c92ac8c1..7eb0afc16f7f 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-approver-19.08.3.tar.xz 37296 BLAKE2B 39ba0aebcf3adb04add4f65669d15a370c280b863f56b1b59041017ceeadf09460298c5d68745992b6f49d2a9df1fee2f2c242fd1d1222e15ccca11f7491884d SHA512 82745123bf9b3b97f51aaf72e881fd50586945d333726eaa26afaf11e8acec26098532843cfdd02cfa10df92b2656ca8107a5c34c27c5c3518f38f28b0956913
-DIST ktp-approver-19.12.1.tar.xz 37232 BLAKE2B 407de68d8cb2aa8b622cb206f8553406f82011076954960a9d26f720aa2d9eb11f71cafe82251cb26990d533cc2b3f28e878447f5a2fce8fc85b03445b9284a1 SHA512 825c4704edee244e2a52f881fa23b50f41f186b2bbf7df6250c08f11401a10987bd58a01b6be033cdb1984b9b2d869948b9421eae502536e757489128d61adb5
+DIST ktp-approver-19.12.2.tar.xz 37416 BLAKE2B 0bf4015bf23b016b06ac8121070e38de58742adcc174e2c4bffac92ab5071192821e8068cc27452f56e15eb1b58631c9691b671a03dc30ce96fd80c8136f1662 SHA512 19f93108857dcba99d62ca4a3c1b8136f16101d78ca96f4cd090058a9e5ef31007778c9dfc7f4fe5f31b61605f28c3256eeffccc2de5db9c3e85e673043e7068
 EBUILD ktp-approver-19.08.3.ebuild 799 BLAKE2B 2ca166e39c562ccd81f9d7b2db82e0ad0f949f894edbe394c8da16a370738d77bb82e177a7842d289f528358bb2248afc0bb6123cc5287f918bc8c31f1419aae SHA512 785da11c013230ce14ee43995dc97e4ca92cfebe8a15de18a201f239442297eebf2db3453106ae3b52e72eff745874542e594a084c0735985804b2505407cda5
-EBUILD ktp-approver-19.12.1.ebuild 764 BLAKE2B 6058910a035f093cfcceceafa6f6d66827c375142769a1634b572c59e9cb06bcec30bf5ce18ffbd2e983afcd31cd19ffb5d647cab837dfaafa4f77f5b70ee45e SHA512 72145f767f50c2b99e132dd2ff663f08143915a0e5042f48846851f62f0ee266e9a642d2bfd251670d1a214a04950b195ea01c939785357cf93c24c78aa4cd7d
+EBUILD ktp-approver-19.12.2.ebuild 764 BLAKE2B 6058910a035f093cfcceceafa6f6d66827c375142769a1634b572c59e9cb06bcec30bf5ce18ffbd2e983afcd31cd19ffb5d647cab837dfaafa4f77f5b70ee45e SHA512 72145f767f50c2b99e132dd2ff663f08143915a0e5042f48846851f62f0ee266e9a642d2bfd251670d1a214a04950b195ea01c939785357cf93c24c78aa4cd7d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-19.12.1.ebuild b/kde-apps/ktp-approver/ktp-approver-19.12.2.ebuild
index 54a01343322c..54a01343322c 100644
--- a/kde-apps/ktp-approver/ktp-approver-19.12.1.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-19.12.2.ebuild
diff --git a/kde-apps/ktp-auth-handler/Manifest b/kde-apps/ktp-auth-handler/Manifest
index 73f8324203c9..3b2e74cd5762 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-auth-handler-19.08.3.tar.xz 46416 BLAKE2B 90593f21408e69c13b9f6809d286ed0ea165373675cfdc711b6d6c6941b864dd0d04a469acce3ba40a0df624d7e4cf2fbb15b9658c1ff879c49245a437a1e0c0 SHA512 fc3b835c73b141f6d55392ff0c0af096ec19e234e5229d09eee233036b15faa7796b5776a59970f630c3ca82276dd86cfd60a6f403dd34c0882e3e246851e901
-DIST ktp-auth-handler-19.12.1.tar.xz 46508 BLAKE2B 5b6401edb9745e8ff8b08b0b2f59e8efa87300860db9ab2e8288ef44440d56e7ebdb92c51246ef8441464b7394735b1d70ed39b0ea7361127a68a58997092d11 SHA512 8a214dc349422a6c2d0079ea60795d35dc39da552b202eccdceee58350523216a0bee13aff0e453eab61b4bb518052c93a184ce5ccd9054c2d3dc8c26e6c110e
+DIST ktp-auth-handler-19.12.2.tar.xz 46720 BLAKE2B 97d43cdbdeac155501a59a8fe28d50f6661ff80f81be8df77da3dbb8d40ef209c14151ee89521a3fb935bfd7412c14deb08ddccc41ec1edf3e570d7db00b8bdf SHA512 0f914e106f22a7ae9af036c58f23068979530a47a295e609abcd755a064698b0f101f14eddcad2d83bd666cb106c017d5376ddf53ea62ad63443e0c6e8881d9d
 EBUILD ktp-auth-handler-19.08.3.ebuild 959 BLAKE2B 6d21fbc033016ee563c9f44915e823609dd324419e1c1bcffdc74d681b53c1967c6ddeb6ab10a2b11652a5e47c470d9ad952b246f518540cd43d7a1ee3616ce6 SHA512 f6818fa0bd6566f05ffc3b2acddb77553bed9f4b38a126ec1e4a634b6c59c734cee7259dbde8c966f3af1d9c2a81489f1c00b9aa01dc2177a0778bb20ece66c4
-EBUILD ktp-auth-handler-19.12.1.ebuild 924 BLAKE2B 5dd976c9dc4dacf69bfad848917fef672d76ad862db4344929965fe2aa3a8e3850d2df2d0fef33211ec3dfc5d3bccf5cff9c40563dab0d8117c2a0b644e7bf0d SHA512 540fe08e80f6200687f50a7fb0d2141c74722883eb012f52318f60e46c088b228d174020545856e9f39208db54e1f9cf8cf41db18d2e77e37d148d06844c29b8
+EBUILD ktp-auth-handler-19.12.2.ebuild 924 BLAKE2B 5dd976c9dc4dacf69bfad848917fef672d76ad862db4344929965fe2aa3a8e3850d2df2d0fef33211ec3dfc5d3bccf5cff9c40563dab0d8117c2a0b644e7bf0d SHA512 540fe08e80f6200687f50a7fb0d2141c74722883eb012f52318f60e46c088b228d174020545856e9f39208db54e1f9cf8cf41db18d2e77e37d148d06844c29b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-19.12.1.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.12.2.ebuild
index b00a9e858961..b00a9e858961 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-19.12.1.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.12.2.ebuild
diff --git a/kde-apps/ktp-call-ui/Manifest b/kde-apps/ktp-call-ui/Manifest
index 16c21317033d..ba8c1707f96a 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,6 +1,6 @@
 AUX ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch 987 BLAKE2B afb662023b5a754ff702fad6b6a651c934aa10aad66c4c382fb031d26abe40ddfd61265a8c7939ae6ff68d2c49ba996bdf5020a9b3640f6fee500f63817ccd33 SHA512 1f780d3b301353e82629a56dd78ba9556b3051d091e56eeb290c605797dacf22a2cacc81d6b8e320d51ef9234582f75e29dd1436c8e1b48c8b3c792d936a11f8
 DIST ktp-call-ui-19.08.3.tar.xz 97260 BLAKE2B 9b1f6d5c81fe29c702c63841a7566c0dd670b6347b82ecc015f16ca327ef83304a1606440abf43f499a33cb004d43e7ff1f10867b8238795bbf9756c3e6fe433 SHA512 ea3b4050b163ac1c782fd69797889275a195e277b413de3681ba584afe20bff32e0c882c3370c7efd8989daf180c1444e9233b1b14914e3bc9d054e0c1140717
-DIST ktp-call-ui-19.12.1.tar.xz 97340 BLAKE2B 8d56c1b19d817b6d7c267f5f0c2ac9148d5a9395ad2a80e33c91030515cbbab20af7dc0ed9c34bd157f0589dead92ba369abc74695cc1d6d26dfb2b7f6f09243 SHA512 8db82acec29961a056fa53cad313729fb3bc948752cab080970df22ca3d0ddaea2645f831bf5098ae105d8804548391880b54076bbaf3cf355f1e9807e311e80
+DIST ktp-call-ui-19.12.2.tar.xz 97324 BLAKE2B f30e424b21dce6e3422c1dd445a8c9485f49d0f2471139e88a95c740c84f4b8eaee89b9ad448a0b403145557371f6ef534427944b3383304b605d15789dbb40e SHA512 b6b413686d5772c39938cf8a430716b6d7de7b4dc5fdee15c0ed6419540402c662791547f08fa65ff5bad8916172d99d679ad0003e6bc040d3f40e5343f69599
 EBUILD ktp-call-ui-19.08.3.ebuild 1287 BLAKE2B c11a4d53a096e38cb4403d3d149a5f9caa2c42b554ae1646a3185c76f951564bb1a17b7fd63a17b89b9b4a80bae497a5a02220f38aa70085f3f97896763b5c5c SHA512 a231925787dc4741bd7eed0f17d4c4d6d14c897472154cb8d622c6ac35b8cada54a51976dcf83c6bc58c047ce92f25af1f0dacdc68719483142979d04412b852
-EBUILD ktp-call-ui-19.12.1.ebuild 1182 BLAKE2B 5fd49903dc2f3107782876fe8ec597750e8a79c154898d3a420d5b6cf8a06663f02ed4ca0775f5827395fcee4dded8218059c831b96a3112872c984b140db7ab SHA512 859ac3207198e11390be63a53d30838773565f7863b40e60311d645d3fd3ece4247b619a5ae4d4161119b6ae095387dae4590370927a582df869834caf1ce97a
+EBUILD ktp-call-ui-19.12.2.ebuild 1182 BLAKE2B 5fd49903dc2f3107782876fe8ec597750e8a79c154898d3a420d5b6cf8a06663f02ed4ca0775f5827395fcee4dded8218059c831b96a3112872c984b140db7ab SHA512 859ac3207198e11390be63a53d30838773565f7863b40e60311d645d3fd3ece4247b619a5ae4d4161119b6ae095387dae4590370927a582df869834caf1ce97a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-19.12.1.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.12.2.ebuild
index 3f12daa8cd9d..3f12daa8cd9d 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-19.12.1.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-19.12.2.ebuild
diff --git a/kde-apps/ktp-common-internals/Manifest b/kde-apps/ktp-common-internals/Manifest
index 4a9eceac6642..89d696fbb94b 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,6 +1,6 @@
 AUX ktp-common-internals-19.08.3-telepathy-0.9.8.patch 1898 BLAKE2B 72ac4337a881182b0f1d43469f68ec7b11a105f626da42acec134abd9b0e5ebb25a59db57d8656ca5c0e9fcebd88a0ad42549b3d1ec6a9ceaf474d0853ab83b3 SHA512 93c43f7eddc99c22f55308ea1cccf59f7fc5c1d9c57b72d2a8ff7ebdfa00ac3e6319bf33ecaeac8ef53a1f9685b5278f32c2b182184fd64919f97df0825f8563
 DIST ktp-common-internals-19.08.3.tar.xz 445792 BLAKE2B 36ba8abed61b1b45481b1a65d565d6f12e115a9db8bd14b2d8a4f276646387e1c18a27d26cda78bbb5885277de23884329b6d42798abb592e8c8bf555c156ba0 SHA512 255e8e16cf1b374a1106f66f4d69e660a9443d7b28d169730326fd4689a864bdd34bce9a33ff63ba175faf1bf65a1db1484e3dccc229eb3f0918c9fcad965e60
-DIST ktp-common-internals-19.12.1.tar.xz 446044 BLAKE2B 7cd4b6e7a95e4706df98d751a3809b716ebabc6236c2e2ae1076694566f8cf476204435e881f39177af92e2732c3e5849b0880da0e94e5b5f21f798f6858aa6e SHA512 f81feadd73a5d7a8e4ad64f14e4559e1315c5a8f4fe8742e0ccc4050bb31c0e2d499805c4b94817e4ec5f7a9fa503f8b3f5e9cb8800ff983914711b74fd16f56
+DIST ktp-common-internals-19.12.2.tar.xz 446332 BLAKE2B 49b75818f2dc40573e56c1881fa1b395b52fa99d9ddf12d1ab71ae83060a382cf9edf648df6725d521c43bfb2eca0d8a5b121519edcd28bdf0dd8faedac989fc SHA512 77f0edb519f46038ac25c507313fe6d7ee823a9974ef783e634391306aa488ac13afb0c4c669c9a3efeb1927483088be6330b1cfaf45d8a249c1322e04cb5e1d
 EBUILD ktp-common-internals-19.08.3.ebuild 1811 BLAKE2B 68aaf67962dc17a6da7adfa1283e4560f5981eb3b2cf5c2a8056c4fa6cd698618e8554231f865b50b10da894c8bbb69b68863c520dcd60db289ee437b09a399b SHA512 0a216a48fce1ba596b3181408290c890cc89a912161f4afb976a053de01c62fe49169360283f1cbbbed0c4e8022c02ee4c6674f5289510bc158eeff9b1c29d36
-EBUILD ktp-common-internals-19.12.1.ebuild 1722 BLAKE2B 808ea451802f1bceef38069779b56672274fb3402c9b24f346716917b1503d48508e11c3d318139fe9e8ffed2a7536bed53a698a15c980783df2d695580c6586 SHA512 0c28dee23fcf661d9c9a6ade87d56ff0d06fc3e386dff6f19f2c771b080140c98588f3d6a007e4e1dc824f8348cd029acb6344b05ddff473503bcac875498664
+EBUILD ktp-common-internals-19.12.2.ebuild 1722 BLAKE2B 808ea451802f1bceef38069779b56672274fb3402c9b24f346716917b1503d48508e11c3d318139fe9e8ffed2a7536bed53a698a15c980783df2d695580c6586 SHA512 0c28dee23fcf661d9c9a6ade87d56ff0d06fc3e386dff6f19f2c771b080140c98588f3d6a007e4e1dc824f8348cd029acb6344b05ddff473503bcac875498664
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.12.1.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.2.ebuild
index 43d8042e3a5e..43d8042e3a5e 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.12.1.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.2.ebuild
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index b6a3ad9da1c6..67475aa409ee 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-list-19.08.3.tar.xz 149412 BLAKE2B 00c0897e152f25b0fb329f143a472372722922559ba224a64531da08336a703c6735df0fa8c3c547f198d5327e18141dfe1f3b4ab78d0ec2ac7318cb1443a869 SHA512 f91e9454fc20015f3f85e4bd1d75f1bb5b7f6bbb06e1bbaafa8799258673b296665f77c4a8f6cfaf668428a9508141b607d7974af6ef21be790f35d94cdc055c
-DIST ktp-contact-list-19.12.1.tar.xz 149680 BLAKE2B 22aff81784b8ebfd4f2b004502c832c4a07a07661119957e8d38f9888713eadaffcd9cdf4e2346bb285ec57661f99041eb84f6d1ab3803c26d32ec802cea329f SHA512 ec466bc543aa9c45df44488d10fc4d9801a676c7d6d9722e592a31711f1b918ded1d6ee906020d887e11015fbf8f8c406cb9291b5ba8ad9fb60ce47c47a0011d
+DIST ktp-contact-list-19.12.2.tar.xz 149116 BLAKE2B 0b2f71689c575ea42be27ab79a57b035cd69567c82b075fe0227aaec1d5936afe415216f4d3bda91a2eb6545efceecdf355596e67d1ca5006a935de0d08edb96 SHA512 b7b30b8f08fcc6eaad9e5d0058cc77689e170b72d03e92635a7718e54be7ad5e1ab94d1ad99fce4071d128f6e5fea4e74169e8e3db8eda87b3f88dbb06550326
 EBUILD ktp-contact-list-19.08.3.ebuild 1221 BLAKE2B 520dbf9029e757cd9ddbe5f18e832f5994e7dae7b723e047f6be99708c545eace597144e4f33204485beb745971bc9f5c7e036521520d9ef7aa87a527c0448b7 SHA512 7534f7124c25ad5f5952b2fc9c719f749e36cd1dd14a731d6aa0fdc4f44a5baecb7e408efc6be63538c8e91d4d3446e89bc50766bed4b3c80cd6d0d3cdcf2f36
-EBUILD ktp-contact-list-19.12.1.ebuild 1186 BLAKE2B a7f356af06cab49b1fec91750865c1d04ffa2477b1386e00fc6ebca14cca3db42ce6a7f28c35ab1df01a54cc733905e5b677cc62a3d7efcf6f5e6800002bdc54 SHA512 e9c68995815b0b239e916f612b0a7e8b754aca511194493287a462c05be7ea3141d0b52516e6c54bc8eee81ef3df54376275ffc68393f725f8243c57594936cc
+EBUILD ktp-contact-list-19.12.2.ebuild 1186 BLAKE2B a7f356af06cab49b1fec91750865c1d04ffa2477b1386e00fc6ebca14cca3db42ce6a7f28c35ab1df01a54cc733905e5b677cc62a3d7efcf6f5e6800002bdc54 SHA512 e9c68995815b0b239e916f612b0a7e8b754aca511194493287a462c05be7ea3141d0b52516e6c54bc8eee81ef3df54376275ffc68393f725f8243c57594936cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-19.12.1.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-19.12.2.ebuild
index da3ccc2c75f1..da3ccc2c75f1 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-19.12.1.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-19.12.2.ebuild
diff --git a/kde-apps/ktp-contact-runner/Manifest b/kde-apps/ktp-contact-runner/Manifest
index 8b6690a7740d..39c1df16b448 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-contact-runner-19.08.3.tar.xz 42896 BLAKE2B 07be9d0b2f17674f7e693f32f0b85267e9ebf6bbbbdde42c0808a3d435b2358a4653439125ef4ee752837b57ce23a7a7b500268b8ec0cf78a3e0d7644c07b0b3 SHA512 7962f81c554094c7ad876d70c718c9c1ee2dc190041ecb845698748f84825b708fce11c4ee4729c5ed9cb6ebf54ae0b8f42aace6f6e94e1f1b71869c1bfd8f89
-DIST ktp-contact-runner-19.12.1.tar.xz 43056 BLAKE2B d85dd70ee06513075fa5abaa813146e31ecd8bfdeb70394946ae3baa639d9245cb28dae58091c32a7d050589e372acc74d1ff4773a0e44c8ea9a2a43ca48a2dd SHA512 181ed0c159c8842e10583fc24f3b3c9e19b5807e4451e83b0ba67482b4fb9ca30cd657210d59aab9a60bb63e5bfe800a65f39409ef17a824e5cfd195ccc8d3a7
+DIST ktp-contact-runner-19.12.2.tar.xz 43060 BLAKE2B dc0e3f6b60e578974f864ec7134b969bd3825b267f17ecf6225bb16b821a43aad87452b9a6509f0bdbbefe08833484d0aa29f8eff1c3bc68b60c43e14d809088 SHA512 b7e6c7ee173bdb9d57169970e36574c7893217cb6d7b3d092cad292f94304f3eea0b145c5fcfffe3ec2a9c1001aa4990485d992eeafc563b1c6f19388884e2ca
 EBUILD ktp-contact-runner-19.08.3.ebuild 713 BLAKE2B 63bc7cf0abcb08c4b1b3c739dfd424f4fcd27dfe70bcfc7188532a98b2600085c4d7e5922658740a59dea2d5e6265d3b134bb70e52d4e0aee21f7ccb9dd6631f SHA512 f2dd7f698f6ef67a81f993587f8c6419e5396a8d7e99227fc3f2860155ddd98d21279ca1176e9537d44bc699426ce5cf8fddca957fdf756181010829c710864d
-EBUILD ktp-contact-runner-19.12.1.ebuild 678 BLAKE2B e4fbfcfd8cd5f7306efc982b2dc9311fffd001e5866771acb49eaf5824b424f47af1ce0680408abd04f1c7d8dee9b18c23823881066f4b8f9f5099715932fe62 SHA512 acced4d4d3c67fa9145d3066dd7d221bb715b46c63e0f50fddd771244944a76612ea127b899113c3f8150be68b251a9526f1148837e61af6e0eb55695af76ad2
+EBUILD ktp-contact-runner-19.12.2.ebuild 678 BLAKE2B e4fbfcfd8cd5f7306efc982b2dc9311fffd001e5866771acb49eaf5824b424f47af1ce0680408abd04f1c7d8dee9b18c23823881066f4b8f9f5099715932fe62 SHA512 acced4d4d3c67fa9145d3066dd7d221bb715b46c63e0f50fddd771244944a76612ea127b899113c3f8150be68b251a9526f1148837e61af6e0eb55695af76ad2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.12.1.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.12.2.ebuild
index c6e1b6936af1..c6e1b6936af1 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.12.1.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.12.2.ebuild
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 1af5079c5e95..0285011d2abb 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-desktop-applets-19.08.3.tar.xz 43576 BLAKE2B 29ad835fe671cbe514fa52726f28efa450728a53338e95a18dcc26703dbba2c9f20eb46afdc3f1c74eeb8cf2fb27d20964cdc95e8fac110b469b739c9ed7bd11 SHA512 4137547cadc4070a84c3de5ab4b88fbe9a0bf54aec8a35aef9cc328a93af7390452819c47087b2aa2b1b2f4fc5eb4dc4e1426193ff22695a899856ec2871f5fe
-DIST ktp-desktop-applets-19.12.1.tar.xz 43612 BLAKE2B 012efe6b066de36ff66796a7700fbb00709ee8d949a4fb4e85d7124281efd5a5e4b96665abdc5cf9491b6086966e14ec784a00dd5081b1d953b2da362dc740c8 SHA512 39a7f4fb144c7f2f7ad2e1b8a1214b88c10ef52aff04c4f48bbf31d071987b9b472a37d3fe33a96a64bcc643cef817112600de8dd0f38fe64a28f9d2bde0c0e2
+DIST ktp-desktop-applets-19.12.2.tar.xz 43588 BLAKE2B 33804917668cc3bdcdb72697b2f8a42689d7d31aff719811e3523e824136db41825c28a8e349eeb3086e423a7b6867d1762647764560ba1ae58e150beeebe76f SHA512 c6d10e42c819317dcec8678a0001bda0349cdec7dfc7f75b4bf4f39efaf6d1d70e2727e5a7d289eaa808717f5bc8067dfb008f0fbde3c3a88dbf08f01356cbc6
 EBUILD ktp-desktop-applets-19.08.3.ebuild 653 BLAKE2B 7fda1bf2119d7765a316b9a2421521b1d0fc57b05f89a768797ab2af67b1ccd38647eafdbca45d33425cf4811f1cab6ba00860db22a2ac25946b82d6fe849ec9 SHA512 2e739e8ae297b9d83164411f245ba7c5955e7bfa0130f128c2999f9fdfaeab718000ae396d0bd374e3ca29197c7f079f9aaaae62a48f4453bd7c3b6e3b71f560
-EBUILD ktp-desktop-applets-19.12.1.ebuild 618 BLAKE2B a719e79cae17641230226b1713c98f7a94a6673aaf6c96873035540275bda96db83f8ba41996fe2b60b372c691a6825e2949878045eba1035848069955d0a2cc SHA512 31e929b8bc5e6030c6e528542fb8f17722e55544526eeb99d5e7a618609ae5488b6a6fbcc19c70abf68c912f79ad849bc2ed76f7024a1c112628f0fab71b0874
+EBUILD ktp-desktop-applets-19.12.2.ebuild 618 BLAKE2B a719e79cae17641230226b1713c98f7a94a6673aaf6c96873035540275bda96db83f8ba41996fe2b60b372c691a6825e2949878045eba1035848069955d0a2cc SHA512 31e929b8bc5e6030c6e528542fb8f17722e55544526eeb99d5e7a618609ae5488b6a6fbcc19c70abf68c912f79ad849bc2ed76f7024a1c112628f0fab71b0874
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.12.1.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.12.2.ebuild
index 8a9ea861a6a9..8a9ea861a6a9 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.12.1.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.12.2.ebuild
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 531137a36f99..56a306b00035 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-filetransfer-handler-19.08.3.tar.xz 46320 BLAKE2B 91bb936fb2444da73f6eedd9915220a0e8271853cb179a73d43d26464ffc78ef6a3726e103d41b796fe69e2a6f87d4aa2a2213410173006fbe40f445f3c0977a SHA512 66bfbc690149c4bf1ccb8672112c4bbc8cc64abee8707c223fac51ef7eb5ac8f609385b00451ea5d9ac17f89d60ae6b2b7d35636a3f69bd30856b37f1def9b11
-DIST ktp-filetransfer-handler-19.12.1.tar.xz 46140 BLAKE2B ff728868cf718eaeb65c722b81a323f2e7fbe5a6a8f6b288708a2e4a4a3894c94d095876d67cbc235f60697e400831ddf82902e3910c937e740099c639df71a9 SHA512 d55855fe3d9cc357ba87c0e7f6d8efb8920b74887037b57dd926448563c35e21432b2f3a761154d543b09980d41dadbb6212f3a95bf601b3e051bba0944b7263
+DIST ktp-filetransfer-handler-19.12.2.tar.xz 46312 BLAKE2B bd9b45fc9800ea86149e0a6bef9e7afe0d29f3530fbcc293d4ac2c135110c06f77d6e0e078cd9c2987bf7e4715d412862415345cd11073df841d79ff8ad2f37a SHA512 273f8e989e8080a342b9d7c03f041e0b924bf3149b56180121c398c4c5c7500d173269b5b7d4e6ba28c1965db290d498dd1af6e8168cbdc17f47625d397abfe9
 EBUILD ktp-filetransfer-handler-19.08.3.ebuild 729 BLAKE2B 70f9a2dcf230bac293d89e5673ab6d73079323fe20e01b98cdeedfa8efac2ad7dc39088ee61a5fff1598a7465a2914b92aa6a15d95f472851c5a4f302624359a SHA512 26cbbddcaf3b409976748487d2422d2c467376fe160a2c46e21cbb4fa02af6edab6740cc5d314683992460281a7b23df5f847576470b128e2ed7b7c1da3833a6
-EBUILD ktp-filetransfer-handler-19.12.1.ebuild 694 BLAKE2B 78954f9404424164c548b4c32ce812b3b3146772868ef3fda496f88df791cb46c541176b3349414167c83cdd9f1ebc5ffc2f2c342ac92313b1d3f78e304253cb SHA512 8990a3409df1a293d37830f4c0cc0026d8314c366f44a03679bcd69607e3f80f3cbee53e2fa3088b53d84570b3e7874ecfc4977e3527882e4cdc899f42f804b0
+EBUILD ktp-filetransfer-handler-19.12.2.ebuild 694 BLAKE2B 78954f9404424164c548b4c32ce812b3b3146772868ef3fda496f88df791cb46c541176b3349414167c83cdd9f1ebc5ffc2f2c342ac92313b1d3f78e304253cb SHA512 8990a3409df1a293d37830f4c0cc0026d8314c366f44a03679bcd69607e3f80f3cbee53e2fa3088b53d84570b3e7874ecfc4977e3527882e4cdc899f42f804b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.12.1.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.12.2.ebuild
index 3ae4467d04df..3ae4467d04df 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.12.1.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.12.2.ebuild
diff --git a/kde-apps/ktp-kded-module/Manifest b/kde-apps/ktp-kded-module/Manifest
index cf1d0a9bb49a..f61781aeacc5 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-kded-module-19.08.3.tar.xz 97024 BLAKE2B 32b85c663e65a3bbccec44953e6f7b452a834cb2fb0777edff16fdc7f88fc1e7554672108d946433c132246fc11ec46011262bb4d5e043d1c6323cb92d0bb96e SHA512 362c06f501bae142d227ece722cd9217afd1cbd3485c0e90bb3991e5520bb3cfea75d483c0503bfd2920d8941341da4689267d8075621b3181ee1f20d8d468d2
-DIST ktp-kded-module-19.12.1.tar.xz 97656 BLAKE2B 56291a604e636aec42ab69d2151139ea6d7b52400c41a989d2d1d214500d9d9bd78063a972f947508541a56fbadb55aa844b29c93a825625aae08e28857ed073 SHA512 2706bac8150c0affc245cd7ce7fab66d080f9bf31472492e89c80c266fbfc0cfddb796dadc83d82927f881378fd77d86ca43c18b3708a9760e7a27c162a5e6a1
+DIST ktp-kded-module-19.12.2.tar.xz 97220 BLAKE2B cd32a139ef6cd244b7d53984574ced1db311ecc8a0d79e3b1ee7f2d5a761da0cc12edafb87bfcccc5c7a42c0a1d40fdaf0522cf108e51b959c5811704a508cbb SHA512 b1707427b9be46ed8e18278d31c1347a0bef120c1727e7faf02c9125667623c8da70bfaef1356ba52c6289f1d57630afec0224b8bf84a8969d50201fe4ef0014
 EBUILD ktp-kded-module-19.08.3.ebuild 1145 BLAKE2B 7506412f9773a32404ad50cd9c0ef47df595a68641d121c379014f33dca0e1380bc4586be662b172f7e1a70d2b4a0e545c97a697ddd45a363f7cb228d0479493 SHA512 01f861e3e6669178ce6349c2f4847945c5876585872158f866b2b48dece256a1f1afc7f0e95314f93ae54eca2ea6bc856cfd4c35a0253c440526a4717a451f3d
-EBUILD ktp-kded-module-19.12.1.ebuild 1110 BLAKE2B 63be369bdd66735e370d11e07a2fb571c8692357dfcf854c7929d975d9c5eb6884a488daf3e8933c1f6cf028a2ba1136f006bc187c63fb2c362e33d549f34c9c SHA512 655ed9af9b69e2839e9f138d891c88f29b85eba15c48c83ca5358ef3ad9c340533b8b3a57e7db37023795400931e851d78b35308254fbb1b7e8af83d52eba9ab
+EBUILD ktp-kded-module-19.12.2.ebuild 1110 BLAKE2B 63be369bdd66735e370d11e07a2fb571c8692357dfcf854c7929d975d9c5eb6884a488daf3e8933c1f6cf028a2ba1136f006bc187c63fb2c362e33d549f34c9c SHA512 655ed9af9b69e2839e9f138d891c88f29b85eba15c48c83ca5358ef3ad9c340533b8b3a57e7db37023795400931e851d78b35308254fbb1b7e8af83d52eba9ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-19.12.1.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-19.12.2.ebuild
index dcb44d8df18b..dcb44d8df18b 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-19.12.1.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-19.12.2.ebuild
diff --git a/kde-apps/ktp-send-file/Manifest b/kde-apps/ktp-send-file/Manifest
index abc1fa9e1377..f0604ddc15e6 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-send-file-19.08.3.tar.xz 28896 BLAKE2B d00e22ecf4b50ef3bf99a7598838c8bf0b1f545662f41701bbf3c293b4a1cdbd17ace300df7d2ed6c7919699c5ea9b53991b149755b5d2f5da043b73791c217b SHA512 176d0f08a18e9f1431b18c2d41676a97adb99e87d240f0b526161ceef159fe690131e85a50e5df76281159e6cd36c495b798dd6935a32897eeb8a90c1e63da37
-DIST ktp-send-file-19.12.1.tar.xz 29056 BLAKE2B 40d5e377923b921784fc1c13b981612f8a8298f427e4d65168b5de3001653844c3ac6a5a003d70a33e9177496df4e03e23706611e89ec9661db0a90108c3e69c SHA512 75058277d5dd19e6612da16370bbc0a19db841b64dd24224ca01760e9d916ec8f9c4314665c169217711dad4a06098751a9b78166fee70b040a9345db2dfec55
+DIST ktp-send-file-19.12.2.tar.xz 28928 BLAKE2B bec9cb7d861e7e97087fd6e3c6aff41714d49001d63c750e41e4dcd28afe9c4736a26a5a136625bc73b210af256ce18c33338d46e9bb2fd94abee003cc43d8de SHA512 f7372165ea80716942f9b30647a8857be6b9af5d59e544f5dca4a32ca5aab553df6bb7d5422b0626421ede2a0c99859d5bde42a52889eb9f719338ff7f90f0c4
 EBUILD ktp-send-file-19.08.3.ebuild 954 BLAKE2B 2da589669fff32a0f01c3bfb2deb4914c990e7bfb4fa90756fd1e3e783f956f34a65cdd30978b059c75b0761efb5d9341891c9aadf9452aec72df74ada07efe6 SHA512 75ef07abf84fae4d3467deb081e6acc2d2e6e67c02e4fd9fdfefe3a85b036692061bddb98671f93d9f6c4593c2cf561bd25afd151bb67e0b5942e99745387db6
-EBUILD ktp-send-file-19.12.1.ebuild 919 BLAKE2B 4d7bffe66b3d1f7722e4beb6287986987933d33d1d3958ff03e1f340bf4de3e0c47cc772de009bd748a4528bb4f8abb4a766dcba9eab115dddd1104541926408 SHA512 cef0fc5911f59b0330214d3d3f6ce80e290f7aec461ea4ad4a65962e7818c76afd90035f26facc2a0337787b4dbe487b34f5a241bed71166af781d4bbd486fd8
+EBUILD ktp-send-file-19.12.2.ebuild 919 BLAKE2B 4d7bffe66b3d1f7722e4beb6287986987933d33d1d3958ff03e1f340bf4de3e0c47cc772de009bd748a4528bb4f8abb4a766dcba9eab115dddd1104541926408 SHA512 cef0fc5911f59b0330214d3d3f6ce80e290f7aec461ea4ad4a65962e7818c76afd90035f26facc2a0337787b4dbe487b34f5a241bed71166af781d4bbd486fd8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-19.12.1.ebuild b/kde-apps/ktp-send-file/ktp-send-file-19.12.2.ebuild
index 7fd7d41dbf03..7fd7d41dbf03 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-19.12.1.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-19.12.2.ebuild
diff --git a/kde-apps/ktp-text-ui/Manifest b/kde-apps/ktp-text-ui/Manifest
index 185b67c17f28..03159812c7c5 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-text-ui-19.08.3.tar.xz 469764 BLAKE2B 5bd1910f08ef54de06d212805d44ad7596c625023cdab944ad9c4aaa2ae499c3f8a4afb6bc63c8cdfe94e851f122945478a11d8b3c343a1c04c4cd8825f0f4e6 SHA512 a8dae8db2b19ffaa359d8fa6a19e91ca5db416a2d7158b9cf926a268497042397fbe1b2808cf36c2d8e20608b417fb0732d62f67335d0f6564bc546e88ccd733
-DIST ktp-text-ui-19.12.1.tar.xz 471268 BLAKE2B a1a3bba72ccdf3efdd9594c748fd8fe5d2393e4e6c3d0d03b014ffa398660bd10c4d490f5e71121f074df2c1f79e5a26201ee7bf986278ca0c8d7ee95318f5c2 SHA512 9f29e26ff662d2e6adc24d12409317f64e878ddafa193007cae9f9aae65a081578982ac185addc983b09ddf92eddaf6993e801ee8108e375b3ffcfcc25d88457
+DIST ktp-text-ui-19.12.2.tar.xz 470636 BLAKE2B 7ab478306570129bc6cbf0989c295d2816635286bafdc6e3c7b537b4e7ae84607e5f9cadfec793ab0f200b9324bd8113f61f45996f69edbbd03802dab8c68d71 SHA512 65a5e10128da24d0ad8789e00dad62b3be16cc7db642cc39939555b80d82cb57e59bf596f78efaba8ea0c3c1f3effa9891d056f567131da3e5594399d2b6cab3
 EBUILD ktp-text-ui-19.08.3.ebuild 1675 BLAKE2B 524ca3a6f1bba3e4f0d6d9ee71b88fc943d6eacf70694eb49aa25d91ded42377c2a30d45cae040c97db8eb2e24d930cd266d0305d4f8c6c2bba3f2bfe0892534 SHA512 3333eb0ab24fb669931f711bf46bba3537b00e457cfcb4b1d9b1deafee7fafb1abc2c73b09553dcc45bebd3fc59a50829ae1f84b3e47151afc508551e7f53986
-EBUILD ktp-text-ui-19.12.1.ebuild 1640 BLAKE2B 926fd6b41e5d630c2abcc3f1b9e05ebe1af852ca00a77a6d388c82edd2e3cceec1fa0f414c9fe0c692789ad43c9bda81a858727de2bb836dec644a42eb3fcfd4 SHA512 862e6ad6991aa1dcd865b47d2db0d331881e89116f7d3055ec136552a70d31769cba883e4731c7731a9429ed255884c83ae323e8709c0b869c833f25209bd1c9
+EBUILD ktp-text-ui-19.12.2.ebuild 1640 BLAKE2B 926fd6b41e5d630c2abcc3f1b9e05ebe1af852ca00a77a6d388c82edd2e3cceec1fa0f414c9fe0c692789ad43c9bda81a858727de2bb836dec644a42eb3fcfd4 SHA512 862e6ad6991aa1dcd865b47d2db0d331881e89116f7d3055ec136552a70d31769cba883e4731c7731a9429ed255884c83ae323e8709c0b869c833f25209bd1c9
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.12.1.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.12.2.ebuild
index 13731954941f..13731954941f 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.12.1.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.12.2.ebuild
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index 06309391cf88..6ecd57a7d414 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
 DIST ktuberling-19.08.3.tar.xz 32640240 BLAKE2B ae355959a955477f9e0a880cf45df077d84a7eee465bf72a4c809c42ae5500b2dd729514efbf75f712dd88867c1807c4ec12f64fb5bdc9d9e01327b2387f0b5d SHA512 dd977d8cf0f52c2236e572c1f342541e8357ab6916924862b56184a1c825d2797d8f147930a9c32e332b909f7360fc1275f5250f1b183fafb3f8b0278c7063ed
-DIST ktuberling-19.12.1.tar.xz 70754024 BLAKE2B 71634a595f19ab69e00e9544415f4247e2b3a51857c9139d1c69e28aeedb8fb6c51d25d9c44560a1b3cec73e144679a44ce9c54b7dc5036fcc92947e5be57406 SHA512 311da153375bb309ed0a42f1188ee743aee84e363f19000d2b72446a71a8ec3bff19ee713d4e9de431e5bfe9207f945a98650fff99cc8416abcc2b03f33f50bb
+DIST ktuberling-19.12.2.tar.xz 70756448 BLAKE2B 29d9b2d39d35457cf567fc53dd7a0d24af62fe3edebc870238a6e98f83d87f8902ec880947990621e609eb4629f6d0c87861fdcf1095c70e1b9c9fa9498bbbce SHA512 d716154f4915e475c6c43b0d8f47788a849a3376b7aef85c83b538b97b439be6ce56889a644a3b266af539fae010f6bc405fa473596c91116503e155e471f0a7
 EBUILD ktuberling-19.08.3.ebuild 1127 BLAKE2B 2ec7e1f563388636102d202d009bbec29b8ced3c1a91693e989a38d3dbc99d74b3f767f6d9504220ab865e98101f490da8558bc6cf92b64359674df7cbd57206 SHA512 5f5ec1669a4ee3437b2f587bd1cd3758c9ead8fc7398db10a2b8acc56f705dc2c6f9b57041493f366467885476c021257588679c800bf218463292d45e743f12
-EBUILD ktuberling-19.12.1.ebuild 1134 BLAKE2B 65ed811aac344684169f783f40607769ce01063701f7b5b45c88a76330efbfbde904c539b1af13eb0e5f3ca7315c0e09231336d1a4d00013241ca22693e833f2 SHA512 6be3adba2c98df2425b2c3ee66d50781d6436e7c48b511758f3ae864faf4b4c968021717100d88b56a113a38633f1e149da2bafd581d1e865f134c75c2c42d20
+EBUILD ktuberling-19.12.2.ebuild 1134 BLAKE2B 65ed811aac344684169f783f40607769ce01063701f7b5b45c88a76330efbfbde904c539b1af13eb0e5f3ca7315c0e09231336d1a4d00013241ca22693e833f2 SHA512 6be3adba2c98df2425b2c3ee66d50781d6436e7c48b511758f3ae864faf4b4c968021717100d88b56a113a38633f1e149da2bafd581d1e865f134c75c2c42d20
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-19.12.1.ebuild b/kde-apps/ktuberling/ktuberling-19.12.2.ebuild
index 4634d50b961a..4634d50b961a 100644
--- a/kde-apps/ktuberling/ktuberling-19.12.1.ebuild
+++ b/kde-apps/ktuberling/ktuberling-19.12.2.ebuild
diff --git a/kde-apps/kturtle/Manifest b/kde-apps/kturtle/Manifest
index 6c16acea25c4..79882bb5e7e4 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
 DIST kturtle-19.08.3.tar.xz 1829196 BLAKE2B 6b6fc4c681dc61563eb5f17cdd0b4a69f9458f035875c487723f388d7e154017d026bd1596e31748aed64848b7118347bec047971a84d0edb35270f59308b07a SHA512 2aab0d607b27561f377dd965351706c1fe49eca49f5e57a816f62311ea38ad7bb7c85f00ff71efe6b30edd6bb2798b1e5814e3d3708dffedb0f64c1fe173ec1c
-DIST kturtle-19.12.1.tar.xz 1828692 BLAKE2B a4232c8bff84073443ef7668551c0339d9fefa3772dd9cf0737e95eb730bedd9f5d138624681d1404ac6ec4d7ea9bf8fd5be4933252b04de9aee42c8e83a50e4 SHA512 a67f981d26db1a28d4cb722426f6f4c70ce452ed904d1f40b5a79d5bbfb6f091d80593f48fa9bc4d847ff8b63c08d8440c220ad686c172d0d4df50e39c5403d4
+DIST kturtle-19.12.2.tar.xz 1830004 BLAKE2B d0d1d478238bae51f6c9bd75c92dac6475cb95306fe4f9d93da8d61b71c94aa4c4422d33757b2cbb40996bc1fd03a142f1a5d55baba2e15bc62276e17d4087c7 SHA512 5c82f095806c9c234db746c9db2a865dcbc58667ab0c0488e498ccccbd8f5a662f0984424b32dd527ffa747a7e5b1589a040354cceffda1509eaca3996fdbb79
 EBUILD kturtle-19.08.3.ebuild 1005 BLAKE2B bd3d8b7193206a653593e5dd7f2efc48a7949ee7d9aa5d3dc0d1769571bddc906c393240d3e6833a5d47506fee06f93864fb5efa29e4edff9276bca866e5e3e5 SHA512 0ecbc130802da63f41be25723fbf79cff9dfbd329c7aaafb566a40c353d461197a2090d7dd838f5a8452ba686daa14b0b9d748d6063d4ee29f79c04b3e908cbf
-EBUILD kturtle-19.12.1.ebuild 1017 BLAKE2B c36fee5230f852c7bf13a16670871ba21eb7a97bc82caa8a5f8992c439dba7ddad5bf03500f81a7c37bfef1d67d16d15fa9dce7939118d4d2b6df49e8db47b6d SHA512 c35f64d877a73d3255895f4cab272aaf7cdf507acea111d13e3752ff6824f70edb91d2e13fab38f84ae305388c4b722cfd24d88db6f4205bf3bdd0498d93c574
+EBUILD kturtle-19.12.2.ebuild 1017 BLAKE2B c36fee5230f852c7bf13a16670871ba21eb7a97bc82caa8a5f8992c439dba7ddad5bf03500f81a7c37bfef1d67d16d15fa9dce7939118d4d2b6df49e8db47b6d SHA512 c35f64d877a73d3255895f4cab272aaf7cdf507acea111d13e3752ff6824f70edb91d2e13fab38f84ae305388c4b722cfd24d88db6f4205bf3bdd0498d93c574
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-19.12.1.ebuild b/kde-apps/kturtle/kturtle-19.12.2.ebuild
index f29f276211ce..f29f276211ce 100644
--- a/kde-apps/kturtle/kturtle-19.12.1.ebuild
+++ b/kde-apps/kturtle/kturtle-19.12.2.ebuild
diff --git a/kde-apps/kubrick/Manifest b/kde-apps/kubrick/Manifest
index 22ea18b138e7..c83f7c4d20a1 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
 DIST kubrick-19.08.3.tar.xz 313384 BLAKE2B b1f76f57b5301b924c2b20878708fe15dcaa0babcc21467de0a1f8ec09e5b9b128eeaf32f2cadbcd1f9bbc8d54d69a07bd87842358f15e57c5f31ee1ece2077c SHA512 158347fd0f5bd20b098b57ca490bc298ad9e5d78beeac36e60539131c7079a6f9cbcb3bd1bea94663e6aeee63bfa8f1ce90c3e12d7217eece2e85c9e5f171d17
-DIST kubrick-19.12.1.tar.xz 317568 BLAKE2B b9cfabc7a66f4dfffd3d182fa556616e4e4dcf8a8857baed4424372c5cc3644dab8dd4d5e8ec8742513fc1cf5fab6a47757a187703bb3a480c9f6bb7e12f0095 SHA512 a65432e6d8f52a2ee8b4023a1282ce7141ddd5470c394bd399315fe30fdb3122e19a7bf7806b959e5114fa39defd36397294686e70b9713e400e5fde9497be3d
+DIST kubrick-19.12.2.tar.xz 317604 BLAKE2B 602d6c67cc492518106b8e24fa910d980ee1c635aa9c074237a90e5c4c0dab93dc03a2f3cfe930533672d93df67cdcda6383d1984ec1cb7642929583ca9a89a8 SHA512 e005491e7193eabb7e811695fec5f02bc83f55517a355cc8f921f737edb3330f2506da369311802c316d3bbd0b1dc90791238f077e717b9977ed0ee8c689d532
 EBUILD kubrick-19.08.3.ebuild 887 BLAKE2B 34e8e08d2fce4200c7d51198b08cef5d526e9b0d9658bc287e0f4c443f2ebda30cff50a2c45a162aca529b0ffba0350634360d2269496196a5e713f0022a4faa SHA512 12ca2d596496881643b528b857d5517e1f2cbbe9ecdce0687e8cbb717c2277f95abd519cde008bce240473045ed785c598853daf80b289a24056baa92424f253
-EBUILD kubrick-19.12.1.ebuild 898 BLAKE2B 097d3ae3809bb9786abd55149b75cdb0bb381b990bce96ae60b6bb35f60ad1675b1066f980a468c02aec4d8d9020af568336768130e8fb75c9097b0f182a6f99 SHA512 97e9e836d5959545a082bb7717ca52ac7604dbdb5cdee9ec3e5cbf09de91afaac7cf64abc7e30d30565306d18e448210c42a6dda9d31c68a45ebbd71d2cd0be6
+EBUILD kubrick-19.12.2.ebuild 898 BLAKE2B 097d3ae3809bb9786abd55149b75cdb0bb381b990bce96ae60b6bb35f60ad1675b1066f980a468c02aec4d8d9020af568336768130e8fb75c9097b0f182a6f99 SHA512 97e9e836d5959545a082bb7717ca52ac7604dbdb5cdee9ec3e5cbf09de91afaac7cf64abc7e30d30565306d18e448210c42a6dda9d31c68a45ebbd71d2cd0be6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-19.12.1.ebuild b/kde-apps/kubrick/kubrick-19.12.2.ebuild
index 6ead2828a028..6ead2828a028 100644
--- a/kde-apps/kubrick/kubrick-19.12.1.ebuild
+++ b/kde-apps/kubrick/kubrick-19.12.2.ebuild
diff --git a/kde-apps/kwalletmanager/Manifest b/kde-apps/kwalletmanager/Manifest
index e56382297dd7..2d10c325fe9e 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
 DIST kwalletmanager-19.08.3.tar.xz 786804 BLAKE2B 120ddd77efb2eb039e1ff65fc55102a63e3f55500bfc5a3b0b5dc888a8d71ac88f3555d51254c5eea700c6821892fa52fccbed3d52ce6641a4bc362083cbf2c2 SHA512 432c281e468f804076f35c7aa40850c95b7aa0848924349971919baf65c03add00ada921aec6a1882b7e933a5429aac7d1fa0a8fe9569ea0af59fd213df906ec
-DIST kwalletmanager-19.12.1.tar.xz 788792 BLAKE2B 0c27760efacbcae1a7c216e531137f9d16232006343835da6125e4c86bd09bc54e97cc2f057cbf83240ed97a5bffad17d2a094c9ac07e70b30af160ac063ac40 SHA512 f56de8ff45f34ad39f591e5b2cc79fd8d08e8e4fb5ede10be278acbd16bdaef10afd12a41988700985e2d253970b889db3083219c05cc1e3d50888768fc8e23f
+DIST kwalletmanager-19.12.2.tar.xz 788560 BLAKE2B 6392cddb7b42ed78c95535837330d8679880b5039e94a8726d4d5f6c2e3a930254beb98675b457ce620c8592b7c1508595bd34a421031050097296ed2ab49322 SHA512 059b60106660a2841f8367e952dab9efbbef684b817a54e21944e8b2cd77984826033270c4ff7de5857d1c2af2c954b6dcbd160f0d8fffef884837e32abad4a5
 EBUILD kwalletmanager-19.08.3.ebuild 1378 BLAKE2B e319b4f783897f60abf18ae62528e1e740abe8a9c1da2fd847d7652b597f0c7bb993b1474f4f89ffe3989bd709cab4d21563d2bf74cdf109a2ab825452cfbb6c SHA512 106034ca4c94680b5f3cd70c13147451a5ed01a17424e80ecd1afeab92cde9fc63d4116bccf029ca7fe8beaa91ea3d4dd9a4fad7cb8837bacfb7b914c069decc
-EBUILD kwalletmanager-19.12.1.ebuild 1432 BLAKE2B 8bf8fba00a8ede6b685b1ceee94ac00b8c0c643ce6707f1792faebf7eeda0e2b6f22a803b0b9fa0226c2d30bfb955e0f5e8e6dbfc07c393c3b65ed073a60d77a SHA512 acb61d6b81ce8b701f380357fcaac735c2adb34eb6a4737b825b98f62b4f0c4feb88353121b4a974b466314c9c67262d05df357400cfacbcaffffa29b737d586
+EBUILD kwalletmanager-19.12.2.ebuild 1432 BLAKE2B 8bf8fba00a8ede6b685b1ceee94ac00b8c0c643ce6707f1792faebf7eeda0e2b6f22a803b0b9fa0226c2d30bfb955e0f5e8e6dbfc07c393c3b65ed073a60d77a SHA512 acb61d6b81ce8b701f380357fcaac735c2adb34eb6a4737b825b98f62b4f0c4feb88353121b4a974b466314c9c67262d05df357400cfacbcaffffa29b737d586
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-19.12.1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-19.12.2.ebuild
index 7c9d1d1ab2a7..7c9d1d1ab2a7 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-19.12.1.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-19.12.2.ebuild
diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index c4ef94190dd0..03834a2949f8 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
 DIST kwave-19.08.3.tar.xz 6196324 BLAKE2B 33cbc85f3afb4c050f536819c799a7393d5883a7929b73cdbf782f43166990c1adad288e786755f5e9b35cbc7e72b0620d64f731fc6cd481da57aaf692d5084d SHA512 ad332004dbd9ab4b0a0c047a6012c071d44dbe1fe81dface3f68fbd556b52ac7ece5c5da66e704d87dab3db69cfb45a92f5fdecbb638decef7265db9c1945554
-DIST kwave-19.12.1.tar.xz 6191832 BLAKE2B 0db6c6cce0e909d04e161ed593956666e0ca26fb64f03c20a30fc4ef362ca9a984c6d4fce6af4a65f31825ed98690cc94fea1e6b92187737f23a9aed1f5c70ce SHA512 114619d52ffbd8edbfce80ddad7357c8ea8b66a07f75e80416eb2c8d12615313d22f0bd26bc55c0eaec2b07256fcc8af87faf6e80e3542b500c039de24fdf705
+DIST kwave-19.12.2.tar.xz 6199596 BLAKE2B 2f37e2656a7ce0a8659a98cb583cf4e009285aca292f84acc632f7ee342c0d1e36f205fd8bdbba69c3c8ecc564a79d72052cd0714962e815b168af7fb5ca671b SHA512 908aaf1ca599fe1f2d4ea9a20a662d3beb2a9e9452c328761c00288f7e6cfc69ef566620b97d048029a2aadf90bf3f59e8debfef1ae3287f1bd720d19f42cb37
 EBUILD kwave-19.08.3.ebuild 2157 BLAKE2B 204f0e6a500feba79c9471c84bfd08fc9d90645b700cc1bbbf961f17bfa4831679e566a6b82ceec16034441f68fc0c3277c01c0ec84b7523e824c3cfd25766e9 SHA512 bab3b01f5ed6d4cdaed5b4431e9aac65dcd722b40a2180b2c7d56d24a7456dfe786af41e65ff9f3d2b5addbe070c881b9a0e4cfbd8395311d5c824d0e5d6c18e
-EBUILD kwave-19.12.1.ebuild 2135 BLAKE2B ff41c34752e6b8e9a99a6a2b97cfdd21ac7adf9b665fb412cfbdcf2222b3fc89d2ec2e53d940f51daeaacfa52123e4d5f777330c05f22211b59d7adc1f1fd825 SHA512 47a3751be3da2170d7cbb1ec222d06821be4d1bfd1f2782a3b34eacb63d2b10c46022c85c49f8e104fd577ea1378e9e0ebbcbd26d6c9296ba649f7be77dfac2a
+EBUILD kwave-19.12.2.ebuild 2135 BLAKE2B ff41c34752e6b8e9a99a6a2b97cfdd21ac7adf9b665fb412cfbdcf2222b3fc89d2ec2e53d940f51daeaacfa52123e4d5f777330c05f22211b59d7adc1f1fd825 SHA512 47a3751be3da2170d7cbb1ec222d06821be4d1bfd1f2782a3b34eacb63d2b10c46022c85c49f8e104fd577ea1378e9e0ebbcbd26d6c9296ba649f7be77dfac2a
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-19.12.1.ebuild b/kde-apps/kwave/kwave-19.12.2.ebuild
index 90864a6bd297..90864a6bd297 100644
--- a/kde-apps/kwave/kwave-19.12.1.ebuild
+++ b/kde-apps/kwave/kwave-19.12.2.ebuild
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 903487a108bd..a8e1860510da 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
 DIST kwordquiz-19.08.3.tar.xz 4174684 BLAKE2B 12c0fce9044be7dea6b06322faaa6974236149c1901ad1d14a46c0bbd5afd32f330a9deaf36a56190b6520a016ac4323b095482bb9e1931ae47dddaaaace9d84 SHA512 2eace5904211f44d6ace73122a52f7b970e16e68e25921087560322989823ef0c518d5e8a0d07c06f59ca87959f92a35a836486ccd20d82d1b5225ca479e5404
-DIST kwordquiz-19.12.1.tar.xz 4171084 BLAKE2B fb92dcd765a193ad154360f26e1e070f53210bc7242e75f01849f17536ab8faa7be2879bba65fb6097e65320e1e28ee09f088c4fc3795e0faab6ce0e96f1863c SHA512 142bc7633bd584bbd3c99f192725c58b9db652a30021b4ffcbc13fb678c1041321ac4f36b63bd9e67499a7e5e1779922327cd46a2f9775047ee82399dcce36ca
+DIST kwordquiz-19.12.2.tar.xz 4175340 BLAKE2B 2916ad463ac92b1ae5c0c3fe4d7e7a5ab2c971c5631ffb4c8a2c9d3f44018a009a57ef58a7ec92330224756afa60612d25dff5f1de41ea52d10f9440bc76dd45 SHA512 624e2c79aea2075cc9243c4cba9362bc9906b8f0ac14bd05a48976ae0238733a1d29a241669e535d59b37622fe2672686a940bc6bf97143fee025df2181a1e8a
 EBUILD kwordquiz-19.08.3.ebuild 1225 BLAKE2B b0947d55e6b6bc80d5e066b066cdb1dc4d24381125307d6e86b4cb2d32c80ed81d0a68a3ca35df35a85cb44a6f21284fef91a05316407b1b2091fce4b72ffd80 SHA512 869789b852d1a18ab10682361bea9b8d2ceffd957dcaf2298ff26bd1da1c097d85406d315dd9091de0ad5b5e7090c595af0d7ad123fa90b8207218ea8d9ca549
-EBUILD kwordquiz-19.12.1.ebuild 1237 BLAKE2B 4f558cb5449be7715e880018844139eed3a005e1bbec3030c5ffe778866a8a463852fd9c5a7994d5924702c58fa3b8e8b464ced599435043c5e6b0358a521ddc SHA512 a864f748dceff2e3469f11a938f5cf8d72e35dbce186257741192f58e5beb1a64914376e1a084f91e47cf574cf22c1052d93e7badcc3e6084f91a0d2735b9f95
+EBUILD kwordquiz-19.12.2.ebuild 1237 BLAKE2B 4f558cb5449be7715e880018844139eed3a005e1bbec3030c5ffe778866a8a463852fd9c5a7994d5924702c58fa3b8e8b464ced599435043c5e6b0358a521ddc SHA512 a864f748dceff2e3469f11a938f5cf8d72e35dbce186257741192f58e5beb1a64914376e1a084f91e47cf574cf22c1052d93e7badcc3e6084f91a0d2735b9f95
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-19.12.1.ebuild b/kde-apps/kwordquiz/kwordquiz-19.12.2.ebuild
index 517eeebf4d60..517eeebf4d60 100644
--- a/kde-apps/kwordquiz/kwordquiz-19.12.1.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-19.12.2.ebuild
diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index aeafcb90daac..3c559658bf3b 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
 DIST kate-19.08.3.tar.xz 5844532 BLAKE2B 34aaceab92783a869de616be9290887f75eba5ef6198e93d90a71d62b441a907a7893916c72ac85c46d6156330322d5297c60c8c9b43cbcd615c05b51cdd0000 SHA512 0a0b33858bd4856bdf29d354603d33541b2c0aab134025db3014aa31cf3231fa2bcc244252872c0b51c28b7cd715556966d9049ce85a8ad614e1f552479c1bc8
-DIST kate-19.12.1.tar.xz 5697944 BLAKE2B 1949b0e488bcf1e0b72accee58472487a42c97ee5bdb3d7713fa8895e4cf4bbf9a10cd69e4b4a8bdf270cbaab720c001a7738f435d615ded0ee13b19a3abe750 SHA512 fa170041b3f1d3544c85b1e8bec1dabca247e1534dd4b1cc008279051375bfea1190b7be4ffed1572f2c4c348fc3d04219aa0bda61f3091d4c820307757dc219
+DIST kate-19.12.2.tar.xz 5733072 BLAKE2B 496cf247ff38fe8fb7951f4c348ed3302a161812e50a6c4df2caa9d105d601f2ccda4bccb1c7aa15b9b27c45201b0c43d5d925e0af236edea9a385b06501d96e SHA512 3c85c2e05593b67591366740d34f7c247ac6ff5f411681c100c6be64d8f5f77d4d0e3a2439c9cb1210084880578b107611d03355d3fe2400226c5755c58f1c61
 EBUILD kwrite-19.08.3.ebuild 1352 BLAKE2B 18fde4c907ef8a39d72f4eade94b7f152d0dc9dc100552709e594512aad73201212b288005b84ea8af93e3429e30dbab8215500caf1950f30de9d93f5a8c30b8 SHA512 927234c2ae520cd640eced082a138595cd80e0c000ec4112e7d6334dfd449ce7179d4cda73d05306eb4e592700990deaa909b17f5f9bb36d8afd2c93f620a818
-EBUILD kwrite-19.12.1.ebuild 1478 BLAKE2B 6cd42106ed547c59f2a17dad5682d8fc35e47faf713a51305be8299761b4103eeed0c86908474e59fc4a734caa03fbbdfa7705b18e73e137e0010126558f3968 SHA512 607e42e674f4e740d874e6917fddedb102707bebb87ebc67fed3cc66f20b5f48442fbfc85d12e660cbfcb57bf14f68bc2fff97c1af1a27c36ce49fd234d33631
+EBUILD kwrite-19.12.2.ebuild 1478 BLAKE2B 6cd42106ed547c59f2a17dad5682d8fc35e47faf713a51305be8299761b4103eeed0c86908474e59fc4a734caa03fbbdfa7705b18e73e137e0010126558f3968 SHA512 607e42e674f4e740d874e6917fddedb102707bebb87ebc67fed3cc66f20b5f48442fbfc85d12e660cbfcb57bf14f68bc2fff97c1af1a27c36ce49fd234d33631
 MISC metadata.xml 372 BLAKE2B 80ff693fe7c7c67aee3a23b6a658a150e33589f9a42df15e7d1956290947555993789ee023345b585fecda3ae828b9d99107aa72b15a6dbaeaa806d0bc2fc2f0 SHA512 3c9a012ef2f6e23889c5c73b3c418e9e60439ea3e3a58995eb8a8b730bfafa5659c7cdb848d0b340f1456828105d92e85c9cdcf55faf22ac676d2d377a004093
diff --git a/kde-apps/kwrite/kwrite-19.12.1.ebuild b/kde-apps/kwrite/kwrite-19.12.2.ebuild
index 8217ae17d00d..8217ae17d00d 100644
--- a/kde-apps/kwrite/kwrite-19.12.1.ebuild
+++ b/kde-apps/kwrite/kwrite-19.12.2.ebuild
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 9bdba508f57f..af1763179cec 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
 DIST libgravatar-19.08.3.tar.xz 30804 BLAKE2B 6d0e98adce3d3c7cdcafae39b7169d5153af4773cf591ac72a32b3847344072597f92d935e5532aa47c007e9e269877b41f93ad183a537b3f40a633b59f480db SHA512 dea215bc8ea7820b187d0799a1f1e4ed77db0c48247ead770c3e473db03075d8f607e59eb01582c961fa474eea9ead27501f5e6034e58d316d03f1aca3ef7460
-DIST libgravatar-19.12.1.tar.xz 31136 BLAKE2B 51399fccf7887e6bac0309cf3fbdd64f5694e376de679d6dfec364d70996680cb837b996cd41df959aa038a8f70e71c3ba178abbe01427705149bee2625d9299 SHA512 528d75687b8eed632ec8d4b8abc46bbc00e8b9a768e134d9387db5b822c82413745fceb1401415694390b3e2e86bb4720aa1e59a508248bdfbd94c5e66f471b8
+DIST libgravatar-19.12.2.tar.xz 31148 BLAKE2B ba1327e72ec49691f58f5a5105805d76733b0901b9fdb4f6c354857f4e38e12b36ea7d1311b26d36d9a3abc141055b3adfcdbcdc1af9ab0641dc49d8df6215cc SHA512 77206e953f04415e0297513379c2124d5679f2778566c06c8ac90f6295ce08965d14793e12ae1e3b0503603c92983cbce2436fb72d970e10eaf0462dd09e0717
 EBUILD libgravatar-19.08.3.ebuild 838 BLAKE2B 5113216d7cbca78ee884828f1af3b607ab45046727440c5240e37df27106f235c8b32fe016ee5af105c74b30ccb26c9e6bade6615cddf290b912e34c9bfb4135 SHA512 7b9d055236536f2e85a5b7aea55eeae23fc76856a8b2b3e7a3ca7b5b2e349bbe5037e2a360605dadde29bde10100ea299b893d29ded5bc1e68b31ea76921db72
-EBUILD libgravatar-19.12.1.ebuild 842 BLAKE2B 0c905e2cc242a9b6f68cd24cbc30e509c8b4a012ea5fe1f04c8599cb642fe04fa7ef296827c7e0becaf2cb06914033fbe99e64045bbb201831e63a10f87dc610 SHA512 b8e92ceee3d5f1d95c17702ddc06c022f2c6827058204fe2032f7deddeeaeb1f08075a376e4c95de9c862af6bf45509fee8c8e85634093c6df882e0665e80f27
+EBUILD libgravatar-19.12.2.ebuild 818 BLAKE2B c8c1cfe817b922d5ce1e3fc947313ded83c7ef6136adf5b2df4dc366bb1a6efd659782353599a27c4bbe42a39d6f5a4ebc0c95c4adde5aae611a51052b76742c SHA512 cabd6a601c8aac3a6dea8cc2ab3d4967a7300987c77fc57af0033eebcaff79922e1b458d12e24aac82aacdfb52941103a17a1d9684aa7633e150ffaaf8de2c46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-19.12.1.ebuild b/kde-apps/libgravatar/libgravatar-19.12.1.ebuild
deleted file mode 100644
index 6ba2ebc6dc59..000000000000
--- a/kde-apps/libgravatar/libgravatar-19.12.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for gravatar integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-apps/libgravatar/libgravatar-19.12.2.ebuild b/kde-apps/libgravatar/libgravatar-19.12.2.ebuild
new file mode 100644
index 000000000000..73a92d4990da
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-19.12.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library for gravatar integration"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# bug 624584 - needs internet connection
+	local myctestargs=(
+		-E "(gravatar-gravatarresolvurljobtest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index 737d607df3f7..a5b150994a05 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
 DIST libkcddb-19.08.3.tar.xz 424108 BLAKE2B 0306f030709e8c2e30861e047999438a28fc9261a34ccf40ccb3a0a68243430e9e8437baa5beb0c9a2ea8743aeee1c6383b88a120452622e580e219da18d0aa0 SHA512 2d24289bf67c4063fad0e61b2b1e0a062cb2db0e9b5c7e82965e140691d69537c811552871296c9f3e0d8d695596c1386485a7626f8d8d3f79d898827652d659
-DIST libkcddb-19.12.1.tar.xz 424108 BLAKE2B f8ef48a8c36a8c8c4e92a52afac78d1a04c0e5252d085248c720426f39725a6a670e7bbd476699a110b161b82a1e37c651f93a852e1ce43a0d1407e4fe8b9ae2 SHA512 dd8401f603f15d46f1daeda10f9f853e51dcfa1518a12e0f5eaf6dc9148f395e9c75e175fbc1dc6c02efc5e86e72b50bac82cd21e0cdf178e2bc0780f7ffea59
+DIST libkcddb-19.12.2.tar.xz 423792 BLAKE2B 79a23ecce3b70538315e72751ac14d49c45b59a67e6edd027d86924df1e9808680b05f35796a5304d481aab12554cbdca5566fff636fdd76f1da38309056d943 SHA512 55479909f636a429e603556b3126e18e8b44f477fc47b9946f46155da11138b3e81bca4fb407e3234f2d885e348dffaf1b4e1548574cd2f6ed6bf2475cb92fd3
 EBUILD libkcddb-19.08.3.ebuild 1142 BLAKE2B 6f18da5fa54f7c2479a6ac697951420cb03440ba94f4bfbe89c0234206e91e8f70ecc7884aceb6a83f011d075acd387c195daa711a71694679a431518d2b5f59 SHA512 79c5ee39c779289cd23b64493cbed8aadd0996952c111052f85a2f401ff6de8f2f74622d704f8790707f2497ed8fb6a747868ed8c36ecfaa749c4231d87dab2f
-EBUILD libkcddb-19.12.1.ebuild 1146 BLAKE2B b5e7bd070b8a54a35c891c4321c09841dae8746113c20208203dd52fce081512dc22df8fef08331b9e5fc2efcd104e68744b98f999531f0f9f588cb66002ca70 SHA512 d7da1d3e67f1afda913bc6f4444960db009364a76a714730d4dbd370a9ea87d56e0feed7a64f1615671f09afeef95e48017a3c95822382dcf27b3205a9e45e19
+EBUILD libkcddb-19.12.2.ebuild 1146 BLAKE2B b5e7bd070b8a54a35c891c4321c09841dae8746113c20208203dd52fce081512dc22df8fef08331b9e5fc2efcd104e68744b98f999531f0f9f588cb66002ca70 SHA512 d7da1d3e67f1afda913bc6f4444960db009364a76a714730d4dbd370a9ea87d56e0feed7a64f1615671f09afeef95e48017a3c95822382dcf27b3205a9e45e19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-19.12.1.ebuild b/kde-apps/libkcddb/libkcddb-19.12.2.ebuild
index 51dcac926b0b..51dcac926b0b 100644
--- a/kde-apps/libkcddb/libkcddb-19.12.1.ebuild
+++ b/kde-apps/libkcddb/libkcddb-19.12.2.ebuild
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 53447b129e7f..b2c095ace676 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
 DIST libkcompactdisc-19.08.3.tar.xz 88900 BLAKE2B 44bf48787eaae663f21f3552c97601040d426aa8f6d2e0ec7887c59085333091268665657590fb0b8bae9a4b9447176da4e826f2c176116a3609d5f2788b10a4 SHA512 5366a85763ec8fb34038775a2a187b1dc5bad3a7fc7900dc65e3b08ab57f3a73f297ddb47c359baeef7c79af8c797572c724899d1fdf730f728fc65e2dbca6e5
-DIST libkcompactdisc-19.12.1.tar.xz 89216 BLAKE2B 7d58e4faa695413b7dfab01b57904cadcc2bc5de9d8e71d7c987b94fa630ccbc641d0148d97eda02ad42afc90ae61fa033f14c351c976739c41790aefdba4188 SHA512 b3ec9d2aabb7649f03449a82a56b0dcf5418213dfd283be2d407f41d82e8ded237bbd46e6bf15cfabdb4e094b7c55056ff555e0328635d0c326bf37e76ca5e7c
+DIST libkcompactdisc-19.12.2.tar.xz 88860 BLAKE2B 7344017c9ec3cf35c73fb79ed14d5d08ea5789536d46e34e3629afa2abec15199435cdacff814ca7cd33359c5bd172b0203aa8560bc7daa4cf52d2541c6a7d81 SHA512 dcea52e668c61ce828b0eac018b5452efed5e26bd206120dfe8e292a4990af040369b3ad35dbe612533d00ec3a0c85b419e515c6c6a73becee063a4b201ebc01
 EBUILD libkcompactdisc-19.08.3.ebuild 612 BLAKE2B 74a24ac70570d56bef4d46d0b5908b9fc6ad8be1415cffd0c00d9a4d727463410a21e14868d0bf8284a43b2a7aca4eeca2d84867e15ce0263c19b31cbee91518 SHA512 81e20b6df661fe8f31a81bf377c8cd0b0e42e0694bb26e05ab25153eba672d9b9ebda098cf42e514adae18ce7b9bd1a45a9b0f8a608afa73d8048ef790dec637
-EBUILD libkcompactdisc-19.12.1.ebuild 616 BLAKE2B 42b08851d4e69543f8750ffcd1bf39b671f23d50a59a747205ef058b685c84a86d79b5497eddfd8b7abfa694b511c55e65e017ac07de60b0594f06c1ff9d3652 SHA512 0360e7cb9e74e7e81444149280a35a602860d585e8db0f700954b893c6c76493505ef3ef712518ed21702038f202e9e58aafe3e85a9e04d3affd02291036d93e
+EBUILD libkcompactdisc-19.12.2.ebuild 616 BLAKE2B 42b08851d4e69543f8750ffcd1bf39b671f23d50a59a747205ef058b685c84a86d79b5497eddfd8b7abfa694b511c55e65e017ac07de60b0594f06c1ff9d3652 SHA512 0360e7cb9e74e7e81444149280a35a602860d585e8db0f700954b893c6c76493505ef3ef712518ed21702038f202e9e58aafe3e85a9e04d3affd02291036d93e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-19.12.1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-19.12.2.ebuild
index a85e99045541..a85e99045541 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-19.12.1.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-19.12.2.ebuild
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 4549b616ef4d..db46f2f14df9 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
 DIST libkdcraw-19.08.3.tar.xz 42192 BLAKE2B 8ab9615fe8c8ec82398bf20714408667222d53b5b70460c415ebfef236b98428b9d309d4918752a9d5e7d6c67d2b3b5ae04601cc82eab815fce74e654b9f2ef0 SHA512 295e171f174e574c2bd016f597321b2aa04f82bb8fbd4144d1227834cf11b22cbaeb4c07154ce23d917c6fd606f6235680f38e877bb1f769212c7308815dde9d
-DIST libkdcraw-19.12.1.tar.xz 42120 BLAKE2B 66e07a56e9873206ab1a6559cb1ab5bbfecb10a102d48a6923ee6aeb22bc73ee9df35d25e60761faef61ada7c7072e99869f9ad6907dfc3c808b042cecbdaeb0 SHA512 896c5581d4da2dfcc5dceba60f4d155b7942eb6df8f37904c4f8aab54b2c2e2ea63d22b0828b0964810fafe6afac5739e8ddc6c86a292a231c46c0abdb2395a9
+DIST libkdcraw-19.12.2.tar.xz 42080 BLAKE2B 1d837c1ff0f2a5316acb4d82f5980ce16c90ab66299b87dd65aeaba9dc4d578a43f28e655a86c717c7b88e9dcd1eaa60b84fe3d8280d3527a2e03f87ccd0d3e4 SHA512 e1a214ef95040760537346bf26560f02d3cfb1904f539d9ad9122175972c577115e5bd5f4a6723ce7f0cac758bb2d922acbe9f00af9b25b23741f278067335f6
 EBUILD libkdcraw-19.08.3.ebuild 350 BLAKE2B 0c7bc52a5d81c670bacc1ceacd242d34c6965f8c4885755876c39ca78e8751d6802d5bf67d8da70e226e4cfed4a46fd38c7ed1814299f2d0a01573cf9b32cd74 SHA512 7f7728c7f61e5a9a2f7c24e719d32986369a96a6e2456f6a9bab4eb64904e2177aa9d78bf05931ba6d15c573cefcbdd5ee176578100dbe981f1d8fe2269aa672
-EBUILD libkdcraw-19.12.1.ebuild 361 BLAKE2B 3bce9760f73a8150e4e0a5d5f919a1bd67253b3afb76decb25525f8c2b2fe55b1addb3ddd77472df4a33375004cada9b56df083564e1c64294849704d39e4b1b SHA512 9398077c8983f39db155d2e2ff5065d41d0474276edc420ef45823a0f2eab8d1dbcab7f37154b797f541fe5e3237ae7efca60e91d815873b9ad4c98b1c7ee49c
+EBUILD libkdcraw-19.12.2.ebuild 361 BLAKE2B 3bce9760f73a8150e4e0a5d5f919a1bd67253b3afb76decb25525f8c2b2fe55b1addb3ddd77472df4a33375004cada9b56df083564e1c64294849704d39e4b1b SHA512 9398077c8983f39db155d2e2ff5065d41d0474276edc420ef45823a0f2eab8d1dbcab7f37154b797f541fe5e3237ae7efca60e91d815873b9ad4c98b1c7ee49c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-19.12.1.ebuild b/kde-apps/libkdcraw/libkdcraw-19.12.2.ebuild
index 4d5c7dfaa31e..4d5c7dfaa31e 100644
--- a/kde-apps/libkdcraw/libkdcraw-19.12.1.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-19.12.2.ebuild
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest
index 997c207be625..ac77ca8717d0 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
 DIST libkdegames-19.08.3.tar.xz 6387676 BLAKE2B 2dabd0b9bf486a6dadb74c4114dcc59f3ebe9536d79b963b56a7be783db0bf89ce0389d5bf65f07ac13afb484376ee87af563f6866bff248ba98efd13bad535a SHA512 15dfc1818d829071acf7c3190a0efd3b81abe21dc570ad2670846fee874262068f3a493337fb472e6014182aa9f57d9d969d4957166513dd02f61c71e7e40c3b
-DIST libkdegames-19.12.1.tar.xz 6374340 BLAKE2B ce5a7853e2f385d77dde5a0f52f3c5ccce3a59e5f76598dcf179149045b1458ebcb1a8e6c13090b060b73677d4a47ea01fa71c0441f42e932ce9226ee1c28ad0 SHA512 e26ef9b1612ee5ba409d36f93c73debff39a8d13f99eeb417d7a5263f55ce9da172772320001f78d0dd0f65278480ad28d8b9b98a04879be64a08570b207342c
+DIST libkdegames-19.12.2.tar.xz 6381648 BLAKE2B 60212c49d90e87ef9278a40d5f78f298c60c0308006986ebe47cc97d925a68c1314de98b7ab44ebfde4ebf7af106d7280597b5cfaa691e86f105fe4bc770555e SHA512 9efed7f707424e7991125259453221b16a752d6c05eec3eb45628e19a4bbabf8c510c5cbb5dea028d5bd7361620c7b0d6d421ba51b18e30711e60ebbab38678d
 EBUILD libkdegames-19.08.3.ebuild 1479 BLAKE2B 32e584f0f1662d75a921d853bb55adab36f366719e21718aa6107c8bb01dd64b1c1d2053c7c079fc32d1c0ba24befa977490fb140527e365e4278be24e690deb SHA512 4f508f03489864836b0d7435ae3ed195736eec06200effadba42bac8b20bf3a652080ee807e5fabad885d78f41d4bb8db0fa5e91eef30b36e0ecd982b43c31d0
-EBUILD libkdegames-19.12.1.ebuild 1483 BLAKE2B 81824612505029d444865034e92c6bbc76ae75a20004b42833e8bf8f87960d7e5705dc5d338010f00e9bc03420d8c3ca342c8405f4fc60f43428e21ec225ef95 SHA512 c5e1205e9dd3c14bee1b60305c8b66cd6890511b07c5cf8f0146628e7f5d6d07a28cf997bfe379f3db9ec8aeba4a10071c6fb0d3292e3a4bbab6f9bcf0a5ff2d
+EBUILD libkdegames-19.12.2.ebuild 1483 BLAKE2B 81824612505029d444865034e92c6bbc76ae75a20004b42833e8bf8f87960d7e5705dc5d338010f00e9bc03420d8c3ca342c8405f4fc60f43428e21ec225ef95 SHA512 c5e1205e9dd3c14bee1b60305c8b66cd6890511b07c5cf8f0146628e7f5d6d07a28cf997bfe379f3db9ec8aeba4a10071c6fb0d3292e3a4bbab6f9bcf0a5ff2d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-19.12.1.ebuild b/kde-apps/libkdegames/libkdegames-19.12.2.ebuild
index 274758d0b747..274758d0b747 100644
--- a/kde-apps/libkdegames/libkdegames-19.12.1.ebuild
+++ b/kde-apps/libkdegames/libkdegames-19.12.2.ebuild
diff --git a/kde-apps/libkdepim/Manifest b/kde-apps/libkdepim/Manifest
index 6041fe412592..421e91c95581 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
 DIST libkdepim-19.08.3.tar.xz 333408 BLAKE2B 10f4670e0f776f4dd2b4711477a88748c6d1a905b8d067ce86f07115e86f60a3132069768857f0c381380a6e786206986bb2b3e360b5c838d21ce29ce9a6bf02 SHA512 f51973b248c1c6c213dca3da0458e8b8655a46aaae5be780c0fa31e557daba10534c78c8ae327e6f4f4eab55fb654fc720d7e0d71dac2e47a431a9162316f229
-DIST libkdepim-19.12.1.tar.xz 333720 BLAKE2B 08424744d4bd3490f1d297fee4d06b89700ff0ee6da9601fb507af17d21197f9ebb9ac80f8f77ea8820a4b654045c18cd533b3d337672456fdead2a4205900c6 SHA512 a9dabe7c8f0b291ce8931af84e306b32d0a10af00644fb5aa9f2b8efae8ff838358ce2b618bfa7ae7d9a4f71625eb68d04f8ecbbe127d47aca5c97537ef5f378
+DIST libkdepim-19.12.2.tar.xz 332824 BLAKE2B 4bc3e71e4c00a1d462990ff750f50e35693d39f19c078a61e9630cbd5d79a4d308ad1c4710a19ace4571cdeb5138258c0f51b6994b5a60d003354c32c0857030 SHA512 ee86cff7d623bc3a1810cb01650f00242fe20971c2485859a79e84ba787e06adbc9410e76222cf33c8785ad83ce3113124a2ed8b3f8900fc90964372cf1c0481
 EBUILD libkdepim-19.08.3.ebuild 1254 BLAKE2B c1d2ce56108670f840d8dda4f951bf64499e629998b025bb0dbd35444a95b97bdc0fc090a72424d8fa8eb163aca9d968c75df4e3d57c5036e0d15ff43abdd2c5 SHA512 4e6b39a3e6ad2a0d0b8df6e42dec2b7956aac7fe3b9f66795a68116f24e6078b79643636604fe3fa008a0308f51fb0bb5d8663944ca69496da6f00d3bf2525f5
-EBUILD libkdepim-19.12.1.ebuild 1217 BLAKE2B c53c47ff32c13e860703817ca26ea0cfb8a5b7fcf083e0abd12cdddb0a7353f68f8c4dc9e739119d060c0ba6b6387ba22a4d964f7b6dc8391c230e423428cffe SHA512 136af69654498a53620584d7dc8913af0cb8bb85b30289a0b42d9b6b04951d3b26a013f73d075244677512e54600d2f4d01526997c15a31e24fd9816b56b42ea
+EBUILD libkdepim-19.12.2.ebuild 1161 BLAKE2B 3d8d38cbf7e8ecfeb4f1cab14f5cd8232938595930bab32876d5a519be48562e62f128e2d50c3ef274a6da58135a7966c236390fd16268c5bf79dad6c1248fc9 SHA512 1697fe6c74b0808c8c7ea5f210d941111e407622b9dc8bec2985e209fd612bb1caafa15b191ecca0c9242d4750302894dbbfb009604422a88f4d83e9d6df23a3
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-19.12.1.ebuild b/kde-apps/libkdepim/libkdepim-19.12.1.ebuild
deleted file mode 100644
index b7a1335f98b0..000000000000
--- a/kde-apps/libkdepim/libkdepim-19.12.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkdepim/libkdepim-19.12.2.ebuild b/kde-apps/libkdepim/libkdepim-19.12.2.ebuild
new file mode 100644
index 000000000000..416476370d43
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-19.12.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 4f954cf7bdda..5689d1d6386b 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
 DIST libkeduvocdocument-19.08.3.tar.xz 211172 BLAKE2B f22e74227b74168946a89b307a58b999978f56e2fe9e35909c6b5f60e574eb6e40c709089c7978b23890d348e802fc5f59c5c234b1a0f460b8cb90b0efa36343 SHA512 a548dd294bd07fd9c14448bc0d69fb5f58ca7a15f513bf56e6402af3678727321fe2f2a6a6345c2dcd220fbf1f4668075d73065b1c00835298da9f8c186828de
-DIST libkeduvocdocument-19.12.1.tar.xz 211248 BLAKE2B 71d193370475122d2c7ca2b2546e8562e484193ca7bb6ef09d33446653ea43e3d5d9bec0e7f441fb0813000eb73e8a4a17a3b827510047931c09f2a4539d6676 SHA512 9bb12f2099c096a9bfa8650698a0f3562008d072c4deb2c1299307c0332ed621b578ddc9786b5fda47db176fd84e64fb2e3469daa54e3354c046ccfedce274c4
+DIST libkeduvocdocument-19.12.2.tar.xz 206624 BLAKE2B 01d89edaf51eeb51cae7988840dfe315cddb6d00ae831cafd1ddc7e759380e57c8c2b71ae4425401dd500a7beb15ef8abebcded5e01d375a6ae7d234dfbf18c6 SHA512 108f7203d618076b47ce606b238aa237e5a0e58241981f98a0b76348fffd963670df8f4fa7d577ecc2cada4123e136e5ac09b9c8d0a3b7a0af0b4f86cef3f8d5
 EBUILD libkeduvocdocument-19.08.3.ebuild 710 BLAKE2B 6bba2ecec2ea530c2d986d7c2657423a24ce0c6b547d3943f295e8fc63babf8ae9d116a4a1b5bc65e995870433e7f74b60fbe75654fa5291c53539ea944f4773 SHA512 e8c60ae6147318ccac50ebb867a876edf93da953155683d33477dadc1769555688750d5c4f81e679f2288c7f006c9ddacf18d9aca632e474a194ea4442743b77
-EBUILD libkeduvocdocument-19.12.1.ebuild 714 BLAKE2B 6179fb28d819cdefa94fd3d7af1743db318e2549ef0ff85b340e4120e7ab7fed698cad3b5ba14acbe27ca6dd7e9991812735e04b07894807166f408d72b500a5 SHA512 e93ee37da326f37667194133d33fc689f63507a810c380df2522d8a4b19186e0c743b30ecbf9ee92d0e17c66504d24ed41258b348d820af0714a6a35d516c54e
+EBUILD libkeduvocdocument-19.12.2.ebuild 714 BLAKE2B 6179fb28d819cdefa94fd3d7af1743db318e2549ef0ff85b340e4120e7ab7fed698cad3b5ba14acbe27ca6dd7e9991812735e04b07894807166f408d72b500a5 SHA512 e93ee37da326f37667194133d33fc689f63507a810c380df2522d8a4b19186e0c743b30ecbf9ee92d0e17c66504d24ed41258b348d820af0714a6a35d516c54e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-19.12.1.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-19.12.2.ebuild
index 75112c479159..75112c479159 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-19.12.1.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-19.12.2.ebuild
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index c94ef932f485..97f96899eeee 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
 DIST libkexiv2-19.08.3.tar.xz 64520 BLAKE2B 9b37f6a83ba6d141a51e6c1d97e6b93f9495b7c250bff71900831b5c5902654fe50e26c70e6397b88de6b32c66159b09e9ed5d078641b8753e11e993a0be3be9 SHA512 4cdd654de9e658fd145b6004e94c8cbdb39de3787466ef02500cac3f858cf5eda2c0ebee9ad2f4fe129273fecbb61b3c0bf49cddc98209cbe555a63fe8c05549
-DIST libkexiv2-19.12.1.tar.xz 64552 BLAKE2B cae4f8918c1d32ea6bfe79496e67f439f2bfd3b5fb5a96020f3fed27ce78f790fcab6e5f9b521ebb3795a1945c0f703417d43c7b5717cedada31b4645356cc55 SHA512 96eb63aaaabb99c5cc2517f04c6f8c27855d8bddb5e4c88adf1539c04ab85f0b4aea6f53b73ecde551a6ee15656322c6292d3befbfa57e0f4005003adc727773
+DIST libkexiv2-19.12.2.tar.xz 64520 BLAKE2B 5459cdd1ac06d45994ecfb1a8f7a9b7555c3b9bda5e8dab172d889855da7e443f31ec975d5819e356c7228ad8330cd4c8e34295ed49ecf5dceae1d183a84dd1b SHA512 c76a3858e14f83473b34fb1e2130b5424acee5cabd066adb66e5b0673aa8356c0a3ba73b401019ba1db4f819bb2df1c54d3fa1494b307ced3f7e5844edba93d8
 EBUILD libkexiv2-19.08.3.ebuild 346 BLAKE2B 79d038fe565dfbfbe0b5930b38ac88358d7974e12ee6d22b720964dacfa7a6acc74461fae05d79d361719f912026084a3cec0486e5b89ee880a53ce12b9a49b0 SHA512 977f5b5402278b7c5611fcaf08d6f9a13d61b40ab8c6986d1a74ad65aa4922d353d47540bf48e8a99ec2c76ef5ac6ab5efcc56c1ac08e78cf084430601b26719
-EBUILD libkexiv2-19.12.1.ebuild 357 BLAKE2B e2a4cfeca39a895ccdb7f2a60ce8eedf1c44f8e31de6db0d852e2066fb34fa09eebbda9e94eb0969a2a71441ec634f9dbfd979f2a08aa19e4b7b431e2983fbd0 SHA512 3408f373917dc056f997f5ac22db3d6214aa7a9eed64d8fa3c2c37ff175bc9d835d068b1daa8da3e0541b43ac69e8fe02bce14db59e8d857c62034adfc8a761f
+EBUILD libkexiv2-19.12.2.ebuild 357 BLAKE2B e2a4cfeca39a895ccdb7f2a60ce8eedf1c44f8e31de6db0d852e2066fb34fa09eebbda9e94eb0969a2a71441ec634f9dbfd979f2a08aa19e4b7b431e2983fbd0 SHA512 3408f373917dc056f997f5ac22db3d6214aa7a9eed64d8fa3c2c37ff175bc9d835d068b1daa8da3e0541b43ac69e8fe02bce14db59e8d857c62034adfc8a761f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-19.12.1.ebuild b/kde-apps/libkexiv2/libkexiv2-19.12.2.ebuild
index 6affb264a95e..6affb264a95e 100644
--- a/kde-apps/libkexiv2/libkexiv2-19.12.1.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-19.12.2.ebuild
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 18183b1658f0..9e8fa13a794c 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
 DIST libkgapi-19.08.3.tar.xz 234484 BLAKE2B 1903e85c6e8098111864fc5ab2cb48d61a07c4d70a65849b3ce7a2385d0d73f66d7af119d7733fa55a8462285a62584ce11ffc73edc2496d8bff6400b8120524 SHA512 57e9da2b2357ee05d1ebaeabca758854c5221b081bda86f9ab5b3d6725af2efbaeb045591e222e8966066fde393a10e7195475732aeebfa738a1aeaf6ed3e2b0
-DIST libkgapi-19.12.1.tar.xz 238208 BLAKE2B 028d2fc64322050f0aa33ba0887ff13686162383a47ca78a7023ff7b88943d6bb6d2433bd48cd6a65e25201543fd30e711d0b8f87219e5036f41eae9c3895509 SHA512 7f6731b437c94a961c3c3a0c726e39080be27488343ecc065e39201bf288a56db6e0ff0076b9539a9e3960617eeb9d8f3b6fa1947acc2860fb738d8f062ac841
+DIST libkgapi-19.12.2.tar.xz 238256 BLAKE2B 0a701e7f5437eebe4d191278a5c41424ea8651543e2c58a6e24ec78b57b1d568f42ee59261db160124129471ee1153cf9a0dc9596b167db3a0c3c252b3c9ea69 SHA512 e436b8270d5c9398c589ab5341771ca37d16d362437ee5f2fc3cf62e6513b6f23d4ca1674ccb28db781d4ee3ae4325219df932b48e34464d63246d184dc4989e
 EBUILD libkgapi-19.08.3.ebuild 878 BLAKE2B 5d1a22464798e12965692b8d79574b0ca10642942ccd6f66c8f86e41340f017a542526b7ba3737e0d118a102e2401821537180eaea060adca0b240d4210f6467 SHA512 a362616943722c6e1b04dbb62577edba16f71d40a58f3182259baa063af9856ac2bf5da23cfe6f9c3fe0bb35221f8c609124646f2c7bff6dc39ddd7b3d5ccc7b
-EBUILD libkgapi-19.12.1.ebuild 899 BLAKE2B a32a4e7c411409d9625cb11e2ecc880568b71dba87113214d1f876a1c430ff779149f7eff686c58bd16f4b11db2d621e78075266874251a4bba0d4b821549fc6 SHA512 f235f6546344109e91c833321ea0f16eeb0abdfdcdda6aca81dafe5b88188ab95a0c1e253e047244e04ba964edf3c5fef257af6cc3bfe1b2622a537c3e70b094
+EBUILD libkgapi-19.12.2.ebuild 876 BLAKE2B 4ec02734632da1f101dd1b239e6442fbdde4d18e53e6a1dfe9041c6d1081ffd6409e4e11212431cea2f8b1314b922d4281217330a2a8ddc2d1dbf66cc48a774a SHA512 db6bc5348bb6f3c1288c53ad67fb656a41aa2d8d485908684c47e9edcbe382a18453ee2d897d948f93f925bddcb4adbf87f3db7fe1503ee513482c76bcc434ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-19.12.1.ebuild b/kde-apps/libkgapi/libkgapi-19.12.1.ebuild
deleted file mode 100644
index fac8155debec..000000000000
--- a/kde-apps/libkgapi/libkgapi-19.12.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/cyrus-sasl:2
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.07.80:5
-"
diff --git a/kde-apps/libkgapi/libkgapi-19.12.2.ebuild b/kde-apps/libkgapi/libkgapi-19.12.2.ebuild
new file mode 100644
index 000000000000..ebc1ad0ed238
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-19.12.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://api.kde.org/kdepim/libkgapi/html/index.html"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/cyrus-sasl:2
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-runtime-18.07.80:5
+"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index fd86201d457c..9034b1940e9f 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
 DIST libkgeomap-19.08.3.tar.xz 150620 BLAKE2B 96588fe06c447f1ec853ee69e1b33c607964effbb7a697e8792b885b18bb9d2daf1f3c543b7b2f0567ed1b578879aa161156c6ae9870e10d53252e6043534ff3 SHA512 c73089ac399d3516ecf243ad13442e81120e01c3b88d558c607fb5e49273ea76ddc585f3c99ba6a91919fc03d4cbef4bc07830bb44da51568aefaf7c8f510369
-DIST libkgeomap-19.12.1.tar.xz 150780 BLAKE2B 5ed144968450342e8679e1d773107a0b83bd3dd86df8166096ebfa83fe79c145527e2d3f691f520ea22bcfef00f2873889b2db4bdc84e64a2df5031dcb0c1b3b SHA512 b17d2d793b804fe7510ed19fc511c670d3c79bcbb9cbed9caf61073cbdb0a3b6738aea344ed9addfd45c0fd521a5336db0a533e6ad996f894dff035ea9a40219
+DIST libkgeomap-19.12.2.tar.xz 151044 BLAKE2B a2d7a788e952b3e93a960dbecd373e60afff3acbd272c0f660d3417b104de02ed0edae6e1313d0708876c29bb70057b2ac02bad07c8d708b183fee53babe0821 SHA512 46a41d5094928c470b8eac6bfe7d454392a4980a68bcc8f0b94fa4ec1cadd9e13cc10df7ca7d37f04633691d3a597627bab9f752bbfbbd0e619e68f566c58f68
 EBUILD libkgeomap-19.08.3.ebuild 908 BLAKE2B adf4d2653caa820f9d9e0bad445abb99c8780b8b36e4abe6ae4d7fdde70bb16c41fd91d3299ab65c4c52da74e069d958c2ff5a945f3bcb299340dd4556310415 SHA512 3157f91b33ee78b2dcf0493e026ef5089e86f41cf030c91cefa492092ddd4f0d359ef7282cba860bf23a0d9390988bfeed116c0be2e43790094f4b0b782c9e67
-EBUILD libkgeomap-19.12.1.ebuild 911 BLAKE2B bc643fcca04fb1961ee0e55c8720e0e81ba9de4eeeb1c5142586865d7ef1ac7ad9a214e0da92e737c7a2a79325018079956244e02d021fee817388e44ab090d5 SHA512 dff1a43c2ae1beeca55ea2a88acabda5aee09b761f6ec9588173a18532e8f52c87e7668045bef5dae71cd1066c871a00eb1b57bd7043831d88b3a69c6ec2f7d3
+EBUILD libkgeomap-19.12.2.ebuild 911 BLAKE2B bc643fcca04fb1961ee0e55c8720e0e81ba9de4eeeb1c5142586865d7ef1ac7ad9a214e0da92e737c7a2a79325018079956244e02d021fee817388e44ab090d5 SHA512 dff1a43c2ae1beeca55ea2a88acabda5aee09b761f6ec9588173a18532e8f52c87e7668045bef5dae71cd1066c871a00eb1b57bd7043831d88b3a69c6ec2f7d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-19.12.1.ebuild b/kde-apps/libkgeomap/libkgeomap-19.12.2.ebuild
index 6a5b5139e1ee..6a5b5139e1ee 100644
--- a/kde-apps/libkgeomap/libkgeomap-19.12.1.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-19.12.2.ebuild
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 1f656256a3ee..ad24714c9aff 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
 DIST libkipi-19.08.3.tar.xz 103468 BLAKE2B 9583eaa86f72725ae0dd83733f56cf0d846d83caad50723950c282af1d08e4cf21a65645bef6fb8950b22f213c55421107ef40ae33cb40871727fa7761804202 SHA512 6fe9b5e96768c644fc1fc395b0787bf99504fdaed319261f04a0a88be50df5624a5cc3738e609d29da4da50b1db720098986b2da215035752b6c5d0e6b175aa4
-DIST libkipi-19.12.1.tar.xz 103284 BLAKE2B 7352be4730423c8a941c7378edb4e20a3028bfdc8ebfaea91036c01319631c4007104232cea2f02df052cf80eeb453f77c0a723624215b2191fa16d16a1bb4e1 SHA512 8cf859361bb84a3fd6dd2cbbcbfdb6f7600826d20cd2cb3ea36abf86574b5bc40ccef833e2628ea75b54a93252d5bd12b14a8f469dc1788f9a0a86cd8e925698
+DIST libkipi-19.12.2.tar.xz 103208 BLAKE2B ef77b7f5989b745b86d760ea722166e249ebf3a1fb64087029790d0dbb54c5c3ad63c3a0b9e984cf358b53bf1e6cf501b5c075b3b91e5a51a6a6f3498bcc4dad SHA512 a893e188e92ee61cc4048266dedc71b93caefc395fcd447110f6bcd3ebe42a74e22a18cc0b3b96307359e6ad13a61faea8f75274f951be6601942d3472ca4320
 EBUILD libkipi-19.08.3.ebuild 561 BLAKE2B 190f133dd156fe3f0d0300c440f5008c4db7463218c5aea57541067282e1812d0f6fe4d25bf616c07c82377066ae5d42dcec5f00eb4adad95169b687176932a3 SHA512 f24469235667b5edb71f8c4e7978165e961ac164015424dd453dfc6d193d7c6da46ea4cb542e5252239820914553eb4e1b21bc2856b1a305cc85b510df13f2f9
-EBUILD libkipi-19.12.1.ebuild 572 BLAKE2B 1fc1046abf7bb3abed07acf8f2ba027ff5e91ac9e1fbf4b159f0fe419ebc0c0873ee3ac5b6642f4e502e8a2834f35a4e8f5622bef96b37cf6b406f9a575d32b7 SHA512 fc4474b4d6134b1e5478af2f4df1439a59dc058644724441760fa02c0f3b2a92083097635cd644f8808cb1f0d936b318b7f7d8f464f9c39d85f4815ce29672dd
+EBUILD libkipi-19.12.2.ebuild 572 BLAKE2B 1fc1046abf7bb3abed07acf8f2ba027ff5e91ac9e1fbf4b159f0fe419ebc0c0873ee3ac5b6642f4e502e8a2834f35a4e8f5622bef96b37cf6b406f9a575d32b7 SHA512 fc4474b4d6134b1e5478af2f4df1439a59dc058644724441760fa02c0f3b2a92083097635cd644f8808cb1f0d936b318b7f7d8f464f9c39d85f4815ce29672dd
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-19.12.1.ebuild b/kde-apps/libkipi/libkipi-19.12.2.ebuild
index d1f1e28c75f2..d1f1e28c75f2 100644
--- a/kde-apps/libkipi/libkipi-19.12.1.ebuild
+++ b/kde-apps/libkipi/libkipi-19.12.2.ebuild
diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 5b24624c6173..d799e2462044 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
 DIST libkleo-19.08.3.tar.xz 338888 BLAKE2B b0f95c736bd1a8c4b6beca48f486183e46ecb70798451ec92d9d884209ecfd90c4ef74d3c38018b04877c0192436596f5d77c72c432432fc8345521a97858d04 SHA512 b36766d3387e1ca9fda920b50b866c7b736e39037fa65df2c4399bcbee8629b34bd69c08d447273f5368cc14352a58ad32c2ea1ad254d3be1d155eb100ed8883
-DIST libkleo-19.12.1.tar.xz 343720 BLAKE2B 3e84a5c3201840a00cd64e683aafc9292452f74747361f3bb19be55ed9760ee8d346eadacc5ecd4f10cffa9c35bff20fd3fa04349aac87e5db1c80c8c55d7766 SHA512 16d176b5f1d72666e89fd185edcda7be700fcb76760c800558990a046c1bc6560735ead35d15312e294f4b467af1e74797f28817ff15c8fb8252164552989ccd
+DIST libkleo-19.12.2.tar.xz 343340 BLAKE2B 86e77adf297c7b70a93b29164b589704fc3f6a8cb0892c963a544f4248bbfe3f956eedc81ecb0400bf7c3eb3b1f69281a67d8f78d24a4370491032c15c90335a SHA512 c687995cdbacef349c096bf6c3246a762c22c74ba00674b3b2622d35ecee5c3f342e242d512a4d5ded238115b395e1951e365d711954f451b61aff93b5c6b302
 EBUILD libkleo-19.08.3.ebuild 1015 BLAKE2B c3b7a23e91ef7f6238b1cf9998e6106fd155385d2bd7fc7aef3762b8595a4a8bb175b2f599bfdee59fd2a14a5c7c1774ba263f31516a168fdd0616389f964ac6 SHA512 22d579b41d7517e9fa6cdf5e621e512da006cba2ab574f5d5b60ea1cda22332d6f8d0f281647f78a0f03c84eb3bd8d0aab97cfd66f934b38abdf2cd489c1bbe8
-EBUILD libkleo-19.12.1.ebuild 1019 BLAKE2B d04cfa98acffe3c0583fc2e4d77ff5590024b25a9d3147cc09e9e9d2c96d34dc4a91873be349ae663128540a816806826d67a151165df489e679bb34debf440e SHA512 78b3e10d49239420815a4ffa9886a60a83bd23cd6aa181960e3bd4f9d16961c56721ce406e91637c3a004bb467a611da2199b9629cafc847ce10dc9e39b2ed87
+EBUILD libkleo-19.12.2.ebuild 956 BLAKE2B 5ac8f1a17233ca6f477b10cb97d0d2e8f487181c7c17ed8e16378ae5d58583ceb56ec31b283abef702e4a80bed563ffe1b9e150527542d9f02db41a194c36529 SHA512 149f55cda420f8ed5a0937efefc07961b4bc2d452d1791d1996b115dddfdbf9a367f642aedd5e06c9b32eb070785f8667de9d8e19995ac758b9c9cc2fc8521db
 MISC metadata.xml 368 BLAKE2B 971372ca098974cb69299f52e0b44e479517a0fb2f70b6c23fe762d93675674d62e46d5d4faea403edba12828ffc0c32fa274d287d1c71ff499df69d2e52a2d3 SHA512 dbef1e7970af1f4cc05ea180f5beecab9288d5502c365d2dcbdc418a67868baa9245bae8ae0c9d637ddcb3f88a03061285fe144a3a117c722654045fd7a4a58d
diff --git a/kde-apps/libkleo/libkleo-19.12.1.ebuild b/kde-apps/libkleo/libkleo-19.12.1.ebuild
deleted file mode 100644
index 57e1ffd7a255..000000000000
--- a/kde-apps/libkleo/libkleo-19.12.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for encryption handling"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+fancyviewer"
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.11.1[cxx,qt5]
-	fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/libkleo/libkleo-19.12.2.ebuild b/kde-apps/libkleo/libkleo-19.12.2.ebuild
new file mode 100644
index 000000000000..114c6e2f29b6
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-19.12.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for encryption handling"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+fancyviewer"
+
+RDEPEND="
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 29491a0700a4..e73bd9a8d1e0 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
 DIST libkmahjongg-19.08.3.tar.xz 1685196 BLAKE2B 1c0a12f31a4c32b08e8139e13b6524f6d6753df59865477e130d7a09f5c9a3cb06934a84f68faee9912a7def8a753efc8e87a96019da95f24dbeb7bfff4d0bb3 SHA512 d9ee93852fa2493c0842b6d0527fe6c617b074aaefbae24b07a3dbba857e6d565de46c76df37dfad7fdc249a238affd4560c5bda98b1ed27688ef10f21cc48c1
-DIST libkmahjongg-19.12.1.tar.xz 1683948 BLAKE2B 5b68821fbac7bab0133d6288257832bd93daf45681313be265ee96f543f829a2f4e29a5bc43e98c98255d82c6c01fc1971513a7f37d6ce5d74868061b5ffb883 SHA512 643c60a48bb0e0e07607f0103b3a8d1b4b590e1f92e66fca920802e7a3a5f191b9d9906e602f1e846d659574cffa133fd3ab97ac5049d7f62e067baeb9abf153
+DIST libkmahjongg-19.12.2.tar.xz 1682964 BLAKE2B cd0c430e41f883ce535d8f5257e7bc6ce5d5a2c72a5130f579df246fc28a906e6738e97b183342def44a43f8b0134239818abb1c67c676c6a6ae8f1c1a45d36a SHA512 3e03bd0a1b1bea13bf2fec4ea6c256f355b8562f7cdf5fdf3fd3eddd8cd69f1bbb0cbf3a45bc951b3ed3eb8bdbee81c8e8a316834e0f6fd7a75af72954f396a5
 EBUILD libkmahjongg-19.08.3.ebuild 651 BLAKE2B 4866a4d98f5667aee0deb31e9e2d64b8b62700c9a7c8ff917f7997737b6f1b1a42adeb212aa52b1f180c09791a4669392fdd7ed8a229b48b4ffcfbb0d38810bc SHA512 fe39c6623cf2cdf22f0a9e114485a0a49a90f06e2685b6f83226fa94a5b857229e8634ac3c3e6369c431d794a06cd990bc0879956ac4ee8bd3fa40566ab91b4f
-EBUILD libkmahjongg-19.12.1.ebuild 655 BLAKE2B ccc76a27d63036876433164961c60a985f420b37e1247ccf193c9f43a6924235cb6643e538464bb3c8658bc3bc7c27ff60d9bb735dc1f0c475b33d6e9dac5ee8 SHA512 8e8791765e99eeb4db68edbca227e0ea6b4a4468c50f9f0240c772facc6e5874f2830cf5595a85ab305ae8c8b2f5f406810afc1ff53b5e956f6aaf6b29faa418
+EBUILD libkmahjongg-19.12.2.ebuild 655 BLAKE2B ccc76a27d63036876433164961c60a985f420b37e1247ccf193c9f43a6924235cb6643e538464bb3c8658bc3bc7c27ff60d9bb735dc1f0c475b33d6e9dac5ee8 SHA512 8e8791765e99eeb4db68edbca227e0ea6b4a4468c50f9f0240c772facc6e5874f2830cf5595a85ab305ae8c8b2f5f406810afc1ff53b5e956f6aaf6b29faa418
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-19.12.1.ebuild b/kde-apps/libkmahjongg/libkmahjongg-19.12.2.ebuild
index 219208f6f858..219208f6f858 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-19.12.1.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-19.12.2.ebuild
diff --git a/kde-apps/libkomparediff2/Manifest b/kde-apps/libkomparediff2/Manifest
index 1f82e0237daa..86dc23d11fce 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
 DIST libkomparediff2-19.08.3.tar.xz 173512 BLAKE2B 81a9941efa54cb75fd9a06aeb07326c1668c49092a26cb2600d1404f2ec8025e574df1d2d11f9b845720ee251abaeaa05c6fb15cf1d03107c40c73f899a958e1 SHA512 e9b8c06c36dec40475571692b18f3cb67a379c315d90d7c807945248940783c51aaa293776644b3a73ef4f0e2d38dfdd5a4d6dd16fbe7e9aeee3f7cc381cf1e9
-DIST libkomparediff2-19.12.1.tar.xz 173484 BLAKE2B a10497ae8a20f2c4b4dd18c3abe9fac14d525ac6f31808afbba3d0d46e701babfd3c3fe9bf679cb24e967e16dc358f1c7445cc294bb48a8fa4b129b3c7a407a6 SHA512 1f8292bb89b0ebcd568e1874277aac0e4c2c4db46a111f4e7dbbb16e1a6ef1c04164fbabe403ebae04b386aaae4327806a88dae1bae9c9dfed700e7d0fbee1d6
+DIST libkomparediff2-19.12.2.tar.xz 170760 BLAKE2B 26efe579a8c1044f54998b43647fd2b2c96bbe0bf50858e5087ab764f104f4e8f8106d083fd0de50c13cda5a6b04eed98bbb69d03370f68ef0c89e982844b972 SHA512 9cd59ca6946b86c72787b05854779d40be22fce86b86e29ddca2eb3df382448f91fe9caf8f6373b2c7d1b87dc6c95aa5725707c8bf356cf464b97834a0916569
 EBUILD libkomparediff2-19.08.3.ebuild 659 BLAKE2B 1f3415ba65b934d6f8bb9f5a088400f1a8b81cbe4e50aa282930e66640e3bc631936dd7b530fb342d31b75235dd1d8dbce72f680b323d92d22550a3f8ff40dad SHA512 a37a7f8f224c06dc5253e0eb802de0b569ec90321262215b98fb47267f888c90c30957f2a5a016d47bca918b2417a5e23e61b1891057337d47b86eaac529d895
-EBUILD libkomparediff2-19.12.1.ebuild 663 BLAKE2B e05dce919b4ba087706b01f6e56645e7e731af6747ba48cd0ac4b2d5f112c192bea8dd3f6c80f7a758758108773acbd31773bc1c51dbd3357ce4d5296e0e9a3b SHA512 4af07d0a6f03fdf3cbe68709e55e2e20c6f09ece2d1c75fcd4058cf2a3abf9e5741b0c3c5236c9b95caf9b830ad02dbff9719c304b83151ee6988b6ad06148ec
+EBUILD libkomparediff2-19.12.2.ebuild 663 BLAKE2B e05dce919b4ba087706b01f6e56645e7e731af6747ba48cd0ac4b2d5f112c192bea8dd3f6c80f7a758758108773acbd31773bc1c51dbd3357ce4d5296e0e9a3b SHA512 4af07d0a6f03fdf3cbe68709e55e2e20c6f09ece2d1c75fcd4058cf2a3abf9e5741b0c3c5236c9b95caf9b830ad02dbff9719c304b83151ee6988b6ad06148ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-19.12.1.ebuild b/kde-apps/libkomparediff2/libkomparediff2-19.12.2.ebuild
index 86a9865231c6..86a9865231c6 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-19.12.1.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-19.12.2.ebuild
diff --git a/kde-apps/libksane/Manifest b/kde-apps/libksane/Manifest
index 67516c8db900..01ad3a6ccc0b 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
 DIST libksane-19.08.3.tar.xz 138820 BLAKE2B 12a235e665e58311a3aaf579e2590646694d2e2a8075914ba1c6041ce37b2335f072ecf356fc62cb566f4047eea848679841d432bac1c2b17955df1d31d14c42 SHA512 66514aa5918124cd9b9837c7e896ecdaf7cdb4d42c753fb8e95851882a3b2cd705e0463b751470b6b3f142983aa912856c838c1241ec158bcfdd89b3f4a3130d
-DIST libksane-19.12.1.tar.xz 138888 BLAKE2B bb1e44c67fc7146c65f99fb40f205546652a91f7ce60f0a70cf1050feec004a2a3584082497bca4e8e069bb7375bceccfe3b05268e66eb4562184ac886d84b53 SHA512 18c728048886d4f98a76dbc908979418a5012e3a4fb9dea32fcca5b122ef15e13147bf4a010d9bfce3a1d8d7922f100b54416a640383c92862ef06a878ef732b
+DIST libksane-19.12.2.tar.xz 139876 BLAKE2B b203e31ddf71eb8d714be006f11b8f99ab3aa8b1676110f93b669bff639377fe7a4d92ff6201c23ae162e9010461fc051cbfcba7646e882e41d10a5a16f0f41a SHA512 a073cb214cfa84e93091db86c1791647840f7f2d8794e2bc28ab6bac69d1b6d354a4bef85efe557653c54dd40cb15603fb9404799085de544cbe66114de71c33
 EBUILD libksane-19.08.3.ebuild 701 BLAKE2B 6e59928b89f8a808e56e5647062e7910c75281c64c7399b6e988ee9cab24aae77eed18b047d64d45c020c5ce8d0975e46de0eadd0fbd27ebea9db4ac4d412101 SHA512 80b459c50619b0040f294a841c5c914df0413409da68ba8908780dc1eec4019153ab8184219bc0bfc3e575de0eea635c35333e2ad59c5fbbd5a0de4fd1414538
-EBUILD libksane-19.12.1.ebuild 712 BLAKE2B 2928752abd910298c86fb53ce00ef3aa5e153b79f948830e21db3d46929c4506953960f8b29da8fe53c94c2d30bbdf58ed2aa6bfbc1da9f512caf318797586e6 SHA512 cf21eb63a8f884713e283c952751c8cc0266c1f5769dc40f8903f06212d1b0184fb4c5cf638864b043c774f681d4e8baf5b798e89bd4ee7225301c4311ea0379
+EBUILD libksane-19.12.2.ebuild 712 BLAKE2B 2928752abd910298c86fb53ce00ef3aa5e153b79f948830e21db3d46929c4506953960f8b29da8fe53c94c2d30bbdf58ed2aa6bfbc1da9f512caf318797586e6 SHA512 cf21eb63a8f884713e283c952751c8cc0266c1f5769dc40f8903f06212d1b0184fb4c5cf638864b043c774f681d4e8baf5b798e89bd4ee7225301c4311ea0379
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-19.12.1.ebuild b/kde-apps/libksane/libksane-19.12.2.ebuild
index d28552c545dd..d28552c545dd 100644
--- a/kde-apps/libksane/libksane-19.12.1.ebuild
+++ b/kde-apps/libksane/libksane-19.12.2.ebuild
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 2e96ae886c45..ca2b2bd53c28 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,6 +1,6 @@
 AUX libksieve-19.08.3-qt-5.14.patch 1332 BLAKE2B 128c2abb3814624c38e929ce028611e8bb8c9f5755e5d7396be1c9700cb83b6735d0d993beb5b1a61ebca818534243c89da04f02e9e2edc9a398c793e554c3c9 SHA512 f4d6da6434a50de22062ee64f6fd321a641459ac7a802a157aa7a7c09f570017bf276956d91bdd921404212232f416de3cb09fec73cc6d7934360d8ded4e5b5a
 DIST libksieve-19.08.3.tar.xz 549664 BLAKE2B 53c6ce9dd0a30fc8be01003a6610b20ae624e5c481d931cd8a09fa083ba681ee3fc79cfb9d185b12315e69f972e055ae82cd9c829058822f11c6d990b544564c SHA512 f5aee4894b95d48868b08941198ec9370a3855178c2f48330b36473fa2584a43fd7943a9d91f0781a92e79de126d6e78349c8d97b28b96cd2a006126cee3131b
-DIST libksieve-19.12.1.tar.xz 552024 BLAKE2B 1e0f41ab713dcf101274696551bffd0fef68fe21ca0bbb6fd5af82ad0eeaa98e48ab2f828790a9eab8b1ebf3b5182e405722c111cf9fbfae731caff465a23984 SHA512 b80145218b48317ab30da06a0a5fec759b73986098b9c57f0797e925837ab2da568b590b8105b1bb9247304f89a34a5daf56b288de8cb0af842631faa5cc84d5
+DIST libksieve-19.12.2.tar.xz 553448 BLAKE2B 59508fcbfa51a985f56313400eb33685fd766922b70b421f7e676df919069562efdf5d36fc4948970fe450ac87496194ddf27ef67cf86446d0ab5d1b0aaf8b85 SHA512 f7a9c8bf97f3490b25dc6ed84f859a70f51e2f3b3f6a31ff453bbdf1be9793b6987e2b27a9122645485018a7fdcb08831b405ace6d90eb5a9de244de18d6a1a3
 EBUILD libksieve-19.08.3.ebuild 1762 BLAKE2B 7b1cec8c0bb844cd992c185d90d1c09b462a58bc7dcc07d8d2e11b398c24518303b82e313ab5186994f948ceb7394ed4cbe7f4b08b27eebcca6928cd37ba0e0c SHA512 5546224c35191bd38c84d3f3982f5e282aa99b26cb1cc3519f763e3ca352aadab14121bb8f537faa151d8e818ee547128e063539867d97532804a8752b9b5118
-EBUILD libksieve-19.12.1.ebuild 1636 BLAKE2B 24b9617f4448066de29b5dbd93ee9013706932a3b2398565900a08dc8974758e004397652ef7ced9efe114c40971f1cbe0345b6d5ef8120e2bd9164fe2aa337c SHA512 6dd294e69152062a82cfe9830865f178553aa300a5ec75640d3328d810ebbc71110b54c9b08ccdb8822ebe9b621eb31f875d771f536fa9df6a8ef8b83e45258a
+EBUILD libksieve-19.12.2.ebuild 1573 BLAKE2B 9699e0c44f9bc3e01a46031961fd580f7378f0472d98e8ef7d1dfed8afbc495f438a81a1db1febef6099edd89abec61baa1b47d6a0cb9a3f88b95146cfe61dd0 SHA512 89995175dfb247a56460c6734f42c91a9692a443e30ee87494191bf18072f376dd19f0f7f46341e72cefdc1b3ec827301dee6588542aea1fc2ed5b00f17b4926
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-19.12.1.ebuild b/kde-apps/libksieve/libksieve-19.12.1.ebuild
deleted file mode 100644
index 35db36559640..000000000000
--- a/kde-apps/libksieve/libksieve-19.12.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	dev-libs/cyrus-sasl
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use handbook ; then
-		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
-			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
-	fi
-}
diff --git a/kde-apps/libksieve/libksieve-19.12.2.ebuild b/kde-apps/libksieve/libksieve-19.12.2.ebuild
new file mode 100644
index 000000000000..4c52f3fb2bcc
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-19.12.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+RDEPEND="
+	dev-libs/cyrus-sasl
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use handbook ; then
+		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
+			-i kioslave/CMakeLists.txt || die "failed to comment add_subdirectory(doc)"
+	fi
+}
diff --git a/kde-apps/libktnef/Manifest b/kde-apps/libktnef/Manifest
index 87088caccdef..f4ec36f8e608 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
 DIST ktnef-19.08.3.tar.xz 299736 BLAKE2B 7eeead8a6f6bca6e97da8ba10fb1979bff39e8c2df0f68d53816044fa0d1a3d3516e2842b2bfa0b7492e6dd9f2faa124ea5b6a5c018f4320300474c151658d00 SHA512 f8a869116e33962d1c3533bc13abe115412b2764ff033b2b30e2c108dd71d9f30ca3cf8da26de5fd899e50f8324ccd43255e6e5f3cdeaffa3b3e5e3838905baf
-DIST ktnef-19.12.1.tar.xz 299712 BLAKE2B c278951bbbe3ee293823e644923e63de6ce9c590c949b2f3bdfbece920e70cb78251c9b8547d9d6e2a90f926adb067332fb3a1703743827f943a101cb0633f3f SHA512 bb14c55debecc7bee47b360efcc97bcb2951591fee0ad14a5652f6f0574ba677ef6cae851ab93db792544779d77528c8b1aaa80c0b1345157d5b9c3d36cbf656
+DIST ktnef-19.12.2.tar.xz 299940 BLAKE2B c2f9b6bbbf0aee883eb6bf15de321bcdd340b5ca521f5c2569d702b7ef42581ae3137f8a18865cdd5ae911dba2ddcc6904688823625dbed64e04993d519b0e16 SHA512 d57866f9054cf3c7915764e6a735fdcfa9b6d38d7379effd180182ec9436a3f463f21df3938753cad47d9d16b532a9933717c0ad923435bc87a56128797a2d26
 EBUILD libktnef-19.08.3.ebuild 561 BLAKE2B 45f406a7b8c001e435a5c297bf7c924cf26160a61088dae993201dc27a7c84b51428d921a4bd5303694f4c94af47041a71bfbb59a79a9749990e392aaf86aa9a SHA512 4abc12f35d83846a26cf531f170a27f6d40647e8d9817b261e04663793316d8eda6756a653c1d79cecf878185703f06e3dcf2072ee4b346788d0ef969bb0cd18
-EBUILD libktnef-19.12.1.ebuild 565 BLAKE2B 9be6700a2409d693c389a5e104591e7726880f8bcfd25bc190b0cc7071bd2546573611f8d97ee34f82c201230da4d73c76cc6df047859808e4bcfc8f4021097d SHA512 1b93d373748af198288ea6334d8e3c0eb91f3a3eddb40cd572d58dfdae48526e354538732542f4454cf87e67661ef67159c5d6c5c7c742b714b39276f6c4f0d4
+EBUILD libktnef-19.12.2.ebuild 541 BLAKE2B 9380ff2722a25b796bfdf4ee0c87f5fc4ba608b8f18d20f42b381a9add889d6200d31bf98f7d3c02dd74c9cb6f8a1901d28c120c72a5bf4462e4048125a76f72 SHA512 0305444f74ffced98315b390ea239e1fbc7dd370dbff10ad28933475f41fe3b78ed59a74d1500fce1a021a1e68001d373d626167dd9202632dcfd832e1f4b978
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-19.12.1.ebuild b/kde-apps/libktnef/libktnef-19.12.1.ebuild
deleted file mode 100644
index a7244e138c56..000000000000
--- a/kde-apps/libktnef/libktnef-19.12.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="ktnef"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Library for handling TNEF data"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libktnef/libktnef-19.12.2.ebuild b/kde-apps/libktnef/libktnef-19.12.2.ebuild
new file mode 100644
index 000000000000..5ff120c12c3d
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-19.12.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KDE_ORG_NAME="ktnef"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for handling TNEF data"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index b07c6782d6b0..c55a55763695 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
 DIST lokalize-19.08.3.tar.xz 1694144 BLAKE2B fdf181c98a12ece7b37a4a65ec4aac9dc82c62a423e719f29d5be2b7841b8db6660d9f74cec82aa627adece93004c443457ba16c4b68f08ba3c04d9374a9905c SHA512 866e8900fcee9cd1659b85c2438f1348a0030f94a28068f2e8db659823f5364d51dc6277b0d1bfca47c62bd281667136c250f2c58bd25924080346e4f100c729
-DIST lokalize-19.12.1.tar.xz 1701260 BLAKE2B 90aa454915a6663476304236d0cd06bb3cdfa8195f30bc55c7a2dfeb673199f4ffc794c53626ad0c40710ad5cf8be57494584074c7a6a2a10b558ddcbf52ceed SHA512 c0066b47fd6c8e369f3027d1d2dfd121d892ef9de88264553740c80cb7d549b9bfb11d64a86b9f0d0ecada108b06ce2976f3ddbf6ca8fcfb6185dbb1da4797a6
-EBUILD lokalize-19.08.3.ebuild 1731 BLAKE2B 0da9fdb12714f3701f5d9eae14289fc625cc476fbf49c1a37adad397826158a89300f9316b468632e8cfb48c0234a2361c62f42372c77db0a02457297a74b2f7 SHA512 8c19b8813dbaef1783f11170ee67b0cd2befc39a5d2275ace0517d7888d3b47b444d646d8b4060fcff9f92e57a61d5e0a4d1ff748d82d9a80b473d14c99760e4
-EBUILD lokalize-19.12.1.ebuild 1740 BLAKE2B d1110b65021c27da2c702f0e341ad943fe6fd43eac568ec6da0a0968864c118aa53c20a68a2b5d96e868adb8f008c9379a9b8560907868dc3b1b0eb276b663b0 SHA512 ddf216944db57ba1ac14b6ea732b05619b2d0852664633a2cbfbcf16ee5bf4f8a84aca597af2d211ef0e3a7815bfdc7b8a2c9919b245acc1f2cedfa994c1301f
+DIST lokalize-19.12.2.tar.xz 1700824 BLAKE2B 62dc5a1096069a0de13d772d502b5e9b34e7e32ac66ff794be1c83549eac9b690ece5c9eb525d32b9a5297429a2d75f5a3f52ab210ecad860a10a65ab15c47a8 SHA512 7e0614bfc7033df3a573c72e8bf1c3bbcbff0274d9dec0fdb64d634b98df8dc65bf4c9e5732e8483fe768691ab8b374650bd1bc05fff0371888299e3e826766c
+EBUILD lokalize-19.08.3-r1.ebuild 1767 BLAKE2B 4940e176639ef2ef773b5345117a43c4883685df7be3fc4e33e8583b4b0559155e41311a1e07ed62665dc953e5a79861fa39047793df3cf6206e0100f88430dc SHA512 a54c0bf68a9ca985fc52d70069f03fc14cc428e1f3cd08d49bb7a4885a99907794c4f7ef4be93d2c1e18a9bc65baff47d6055a6ffc2bfc2441e27a2a2763f875
+EBUILD lokalize-19.12.2-r1.ebuild 1776 BLAKE2B 1524485c690e592880a2d86cb8d57ac458e99a60b7378e5de9bfb999c9953a5ecf43ee23a1c72d99f99770f94e1c76022c9e993cc0989f82697717632d9b368b SHA512 a6e9d1f6b3ebae81fdb7f05f0873aca6a54e5b52168965dc97c02a73e994359c3e62ad43f60a86bee6dc2fccdf1a64c6fc14c3adebe7ab8d35ad1a1333c50155
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-19.08.3-r1.ebuild b/kde-apps/lokalize/lokalize-19.08.3-r1.ebuild
new file mode 100644
index 000000000000..892e9a972f9a
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-19.08.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{6,7} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="KDE Applications 5 translation tool"
+HOMEPAGE="https://kde.org/applications/development/lokalize
+https://l10n.kde.org/tools/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=app-text/hunspell-1.2.8:=
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_install() {
+	ecm_src_install
+	python_fix_shebang "${ED}/usr/share/${PN}"
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	has_version dev-vcs/subversion || \
+		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
+}
diff --git a/kde-apps/lokalize/lokalize-19.08.3.ebuild b/kde-apps/lokalize/lokalize-19.08.3.ebuild
deleted file mode 100644
index 20cb67f3ba14..000000000000
--- a/kde-apps/lokalize/lokalize-19.08.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://kde.org/applications/development/lokalize
-https://l10n.kde.org/tools/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=app-text/hunspell-1.2.8:=
-"
-RDEPEND="${DEPEND}
-	dev-python/translate-toolkit[${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	python_fix_shebang "${ED}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	has_version dev-vcs/subversion || \
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-}
diff --git a/kde-apps/lokalize/lokalize-19.12.1.ebuild b/kde-apps/lokalize/lokalize-19.12.1.ebuild
deleted file mode 100644
index 7c30ffd1af95..000000000000
--- a/kde-apps/lokalize/lokalize-19.12.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit python-single-r1 ecm kde.org
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://kde.org/applications/office/org.kde.lokalize
-https://l10n.kde.org/tools/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.2.8:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	dev-python/translate-toolkit[${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_install() {
-	ecm_src_install
-	python_fix_shebang "${ED}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	has_version dev-vcs/subversion || \
-		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
-}
diff --git a/kde-apps/lokalize/lokalize-19.12.2-r1.ebuild b/kde-apps/lokalize/lokalize-19.12.2-r1.ebuild
new file mode 100644
index 000000000000..70b6dc762a8e
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-19.12.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="KDE Applications 5 translation tool"
+HOMEPAGE="https://kde.org/applications/office/org.kde.lokalize
+https://l10n.kde.org/tools/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.2.8:=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/translate-toolkit[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_install() {
+	ecm_src_install
+	python_fix_shebang "${ED}/usr/share/${PN}"
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	has_version dev-vcs/subversion || \
+		elog "To be able to autofetch KDE translations in new project wizard, install dev-vcs/subversion."
+}
diff --git a/kde-apps/lskat/Manifest b/kde-apps/lskat/Manifest
index 6508ee3569bf..c17c2f4c08c5 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,7 +1,7 @@
 AUX lskat-19.08.3-qt-5.14-1.patch 2355 BLAKE2B 9860a29c79f0091c0c1fdba5827c2ca9739d9f59643adb1a7cdd6e3b1a888342cc1d7f986eebd1bacdeca3562c4f34d81db883ffb16fc14fd8b87efb7b3e588d SHA512 e7c95fdfe66bddd51bc6ee4f81d05375299384587ab60b6dd5db8bc1781d68c1d5581a01eb3897b44e07dea9fad44b16d9b8ec22950f00f8f6b07cbe4f55f628
 AUX lskat-19.08.3-qt-5.14-2.patch 876 BLAKE2B 07738b892fe135da261a1abff627c546e811ca167c652e662c791889410aa63780b9f172e9855feca1a7c74525047eff3ca9395ba014ce019a58872e3d08df90 SHA512 8ec5088d2a2e2343bfa92d3f7479387714fe2cb0133c9f5400d66cc8e892c7fe4922463a3c3689046423424d68c20b82c14d16d07287c8fd7c8e2abf82dc9d60
 DIST lskat-19.08.3.tar.xz 1219400 BLAKE2B fd7b2b196a8a7fb279f41c9a42f8e942c52420495babc592ac841056f5fa8a0097d0ee841d9de07595e9cc5ca0c8b474ab2047b29d0cbe379b98304f3280846a SHA512 460bc794627fe612fd2fb7a4949d8c74e4b6ca729db9ec7837a9f988ca1dccb192822814d5c4911cf890dc86ae3314903bbd82263a1a892811dc4fcd2501f6e0
-DIST lskat-19.12.1.tar.xz 1219228 BLAKE2B 2285985ea8126ea0ef8597b5acd6303778ba44d74e60e20d262bf83c62bacad2629f8158f650e166f4ee0366884eb4e4bfa7db938b39273e07a026cacbcf1f98 SHA512 b256c7d60397f442be56c489b32b6c50d8ded0553c3dd96414739a59ac5037a4aacd575f905bccb1ca772cedf541dd0502aa724fd215c67bbc4910dde9dbc1d6
+DIST lskat-19.12.2.tar.xz 1219188 BLAKE2B 62b4a73133fe017faec155a7eaf56bbf086100f3f0d756a0d7c7e3aa965aed7d190d01d2b296abc243cb04a24695bac5f098917f2493bbbd5be749fb9345f7a2 SHA512 ecc2f9f3ea61f8efc884c775f393a85c895980a6b1b69c1dc90b64e2569c81b6fbaebec091132756dcf40d4d6fdb343c84a0e6690489bc92d4526851e1b6719c
 EBUILD lskat-19.08.3.ebuild 915 BLAKE2B 182083c672114cc1acf2e2377480ad7218a5ed5e85fc00dcc66a69310f3c6bb81bf84eb27ffc98bac55b63eccd79f89125b1b6b10297af8cc031baa03fa4abd0 SHA512 f3aab70280accd2d5ffa519bdc41b5efc0a0250035aecf0b9430df16a8c67977a85130dc78daccd8ff3ae18d18b718bdd217a65c014601f73c4d7921b6a9eb32
-EBUILD lskat-19.12.1.ebuild 870 BLAKE2B e8cdc60bead78a8a3819eaa6f02fad5f42f9e38d43056e54df2b0e67d747ed1b4fb36c1758fc2b26176c1f60eaabff8f004bb7ae5b16e9d82ea89c0fbce835a0 SHA512 63e9e207b0879acef27e1edf541ba7f69e521572da202f4a0187f810f3283cdbfedb616a86b44232c74ed2ff08f2a76df5f3e9101e12c7994509021b7db7ac29
+EBUILD lskat-19.12.2.ebuild 870 BLAKE2B e8cdc60bead78a8a3819eaa6f02fad5f42f9e38d43056e54df2b0e67d747ed1b4fb36c1758fc2b26176c1f60eaabff8f004bb7ae5b16e9d82ea89c0fbce835a0 SHA512 63e9e207b0879acef27e1edf541ba7f69e521572da202f4a0187f810f3283cdbfedb616a86b44232c74ed2ff08f2a76df5f3e9101e12c7994509021b7db7ac29
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-19.12.1.ebuild b/kde-apps/lskat/lskat-19.12.2.ebuild
index fa5b50fd9d1f..fa5b50fd9d1f 100644
--- a/kde-apps/lskat/lskat-19.12.1.ebuild
+++ b/kde-apps/lskat/lskat-19.12.2.ebuild
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 9d8ecdb2cf71..e62fa98d9e80 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
 DIST mailcommon-19.08.3.tar.xz 693672 BLAKE2B 2be6b716903e83a8e9397a24d8f062b65180e39fef1b0d784804a9bb09a1760d66a2099c331da6456c3bac7654d91c238acc3275961fbd4234afdc11c8784470 SHA512 d1bf8aea689f0cb24dc2030c258795465b3a5e5c16bb49a2f35f62b999faf97cb40f0dd3d4e2bd2d6033e48438bc693fddcfa69d34ad799f4fb22d808f9b06ff
-DIST mailcommon-19.12.1.tar.xz 701392 BLAKE2B 639f8b60776ac49546c51f09b25a491bf95f0a898f5feb4efbdbfed1a432de76884e2d31380a07bd63da2f0a0dc44734dbb8fb33809d2705d51863ed1e74899a SHA512 4af1bb83d4f2a54ba1053708345f47b93b300a14e4cae6ce6f5b631c0155b0973916d26b66fe0a51e6713929a6ea002c07d5d3756b5e9fbdf1b33685b7bb899a
+DIST mailcommon-19.12.2.tar.xz 699336 BLAKE2B cfb9fa71d1e189406154d422e29e3b52c1f6477def749acaf13461a1a85a4f1c0b11ddd93647b582e1f9395780c3f6aa93c356150a7c3c6efda41602d07a5b0f SHA512 f16000d4f0dc40f0a6d645283ac7ab4eae8ae1f07090800c95d2c929ab707179b7c50b0e1820bdcae34a5bfa823331256a17027037109a3628beb21761d66eb8
 EBUILD mailcommon-19.08.3.ebuild 1730 BLAKE2B ed7074cdbba5262db93ec5c9279207eb659ace6c61bb2306bf8714cbca14025609bb815d9a508cc7983d15577e0cab4f61630ce5cabd9558da599f65c2bb9053 SHA512 fc0da1daa5b906ea31e4c6017035f6d16e3bd5779e9ea1115d77e7d718156b1629af15d939809a1c2e33de7668b85cf4a77b3b72917a75f6feaba4e99329e683
-EBUILD mailcommon-19.12.1.ebuild 1736 BLAKE2B 912883f480652e65dce36d657e400a9f16a045d668a485bbcb11634d32fd4ba0749479a65ac388a532a99fd0715963a019b4a1b0974884574215834d2deeb969 SHA512 f47704e8ff71393a088e36421749fe9b39b3aac9b02e513c55ed193bee021843105785c7e4d73ea3577e00f3688ae5afe87bafc8bb6705680ff03db32d08b83a
+EBUILD mailcommon-19.12.2.ebuild 1712 BLAKE2B d125e57c3e88a7ef70edbe3c979b71d6ed95061e3145cdca5a5363706a3d91cb27c4c79796377d47735a351cb953702062cf00f58808f3bb983ed22608221075 SHA512 d61dbde21c7f88300248ea0a3d8de8c66b49c2345c9eceea6fee7eacd2f0eabbd0593b7396abb0bd21030bc8a2a04170ac95d2250860bc7fb0f0a910c36cbd08
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-19.12.1.ebuild b/kde-apps/mailcommon/mailcommon-19.12.1.ebuild
deleted file mode 100644
index c0d0519ae014..000000000000
--- a/kde-apps/mailcommon/mailcommon-19.12.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common mail library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=media-libs/phonon-4.10.90
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-19.12.2.ebuild b/kde-apps/mailcommon/mailcommon-19.12.2.ebuild
new file mode 100644
index 000000000000..acf5aea54867
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-19.12.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Common mail library"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+	dev-libs/libxslt
+"
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailimporter-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=media-libs/phonon-4.10.90
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 29525ab2d517..61a3bd164fbe 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
 DIST mailimporter-19.08.3.tar.xz 540544 BLAKE2B c6424a27e1ae47b268596b65dea94323bb8fa458618ee9362ec32734acbd09952a6b98543f3f57e86838e28a37cafa7a756fcdf13b1584e30a51d2fecb08bf4c SHA512 f0c924eba0b5dbb262402f3f6ee4f4d883304b0578e61399df366e11c1301a1e00d9e72d7c7e5ee62bd2a1339b69354a4dc2e229e80a4455a7d85923d6c9cf0b
-DIST mailimporter-19.12.1.tar.xz 540540 BLAKE2B 2fb733d15c3ff08fff469dd32b31b7afbd3c9cb70d8fafb2bbba90df6f0c15141777b04f311b412e3945d984efcf2786245cae91282ea57a3e67602be1b8b731 SHA512 5c55c8f9f82684f2d357839a20f5e7d83330cba3fd822bef0c0f1a24025b6b4918ae3eda15d60058bec30e82bf28928d3f1b07018da74a67587f782791af2909
+DIST mailimporter-19.12.2.tar.xz 541120 BLAKE2B 68d0a6945711858aec984fd950fa2312af003aefc5d1f8e9abcceb6515f5e19af026868e6750ee8637f2d268e5e5cab07ec6f45dd9ddd6d6016472969a03491b SHA512 9b3e2e3960812005db2399c80ab6ce25306d4fd8b770a82d77d835525190c4f73a641e4e9161a37908fa27dbcf609ee104090628a66d9d6d72d0599a28369244
 EBUILD mailimporter-19.08.3.ebuild 772 BLAKE2B d917b8d21d2ceced977ee534d292b2cf33800cf1668c64d11a707cc7b435d04aa9d37cb95e02eec4754670f385b63f9bf1c174fe75446f5e745a121a692dd69b SHA512 57ea33b78ccb593f5175bcc1fad3cbb3c849dc3fbc5a70ff32620ba2e7cdab37cae30e1b79033ce458227efcf06eb3f280388536acab1f6713108d4257b89697
-EBUILD mailimporter-19.12.1.ebuild 776 BLAKE2B 03d89b692c00ad79f0c8d85de19900493860b309d723e4613cb17e84dada784c5366b66a85398052194c88a64d846b714dc272da62752b7d5b825a98f4e28afc SHA512 02e01dc4b040b772779b587df53df826f41c0304960045b00bdf92642ad0d9f4850ad1efd91ee80f4c32ad43462cb387c43145be26039d9969b0fff7c96588ac
+EBUILD mailimporter-19.12.2.ebuild 752 BLAKE2B 82815831523e0de1eb41539e72e9855574227820d3b7f4a02a335b69647f03c9b482226ce940eff5dd8892361c777b3e7ba9926feb1647a0162d8cceafdd1711 SHA512 b135600f1053e0a6c3eb9f780c6232b69402039805a0f7fff06ac63331aadcded3317043f13b6931f105b8d31027b259b02e4b582167719ffcac8fafecd980d4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-19.12.1.ebuild b/kde-apps/mailimporter/mailimporter-19.12.1.ebuild
deleted file mode 100644
index 10c81a8f06a1..000000000000
--- a/kde-apps/mailimporter/mailimporter-19.12.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library to import mail from various sources"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/mailimporter/mailimporter-19.12.2.ebuild b/kde-apps/mailimporter/mailimporter-19.12.2.ebuild
new file mode 100644
index 000000000000..079c72197ffb
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-19.12.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library to import mail from various sources"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 6c628ba8b18e..1a4fa7924f13 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
 DIST marble-19.08.3.tar.xz 52406676 BLAKE2B c4836b451d0a13cf5de9f736063c7df9e093fa7f6f949aad35fb8f70f80a23c320d34beca5499f9c3bd2e4d43ab26149d6706b998a02bd20ec6088da4ddd0b56 SHA512 7c17b3015ed16d169f7bc2c2c633527a33818495b4894a571b0880011539f9c73eb787ff9705641ff1e4a58ec28418e6a495d6b216bd4807e407eb345cd4dc46
-DIST marble-19.12.1.tar.xz 52200188 BLAKE2B 4697a2f9c1af302712b13219e0b4085bc059b31c9edd99cab70031037d16cbdb5827a1f51649b7a0ced155ab355220021698e824e0fd251eea38bd14944d83b5 SHA512 ccc7bcef68ce372c11b17e8070c72d808a953f0dfed50c366d0e83c76d4f538892034b734be77f44d0ae75e80b72c2db79ac331fd178f8a5b20f4e3adde52487
+DIST marble-19.12.2.tar.xz 52219080 BLAKE2B 9bba726fbe8ff7c084cb84f47967faffeb472a264ebb0e8a122b801c4126e8f4a6146b9e248d04640380c91f59ab1bff632b7ec8da11d2d8e2308cebef12c3bc SHA512 4e8483ae11f929fdbc052b46557e976789b05619ec36847173b80d9c1bfdb90b82ee0c9ee75edae77ccd7f9cd1feb75da5e42fb97078829b5b40cbfbed446d0d
 EBUILD marble-19.08.3-r1.ebuild 2650 BLAKE2B c75ab3a9b9faa0d097f74c5f67dbc1e281f774e9bf474f7a3a331a9da85e21af700d3ed5e8f9f5fc807e5d17ad30d233e94b2cf86ce6739bfee05c45c87c9e72 SHA512 ac54fc804661aa52362daefe6295df09f1e9cfd1f5e56251376c9c54d7fb02f57cd6126b25013ae1c120c04b0c768e138c2688e8a40cfa8680206170addb0f83
-EBUILD marble-19.12.1.ebuild 2653 BLAKE2B bfab79afe416e288df585a1a513f61fa9d36b33535310a17154d3086d1e637c12cf626111eb67e6af9c496c0e919dfade34df6a167ade999dd70bb81fef3ab32 SHA512 8a36e06000cf43ddd087cd60c6652fe6244602c5a055b1dca17857891b9c602501a380a0066b1f74c9b23aa3f16ee1a4fba9d2a29502589516760e1548e90eef
+EBUILD marble-19.12.2.ebuild 2653 BLAKE2B bfab79afe416e288df585a1a513f61fa9d36b33535310a17154d3086d1e637c12cf626111eb67e6af9c496c0e919dfade34df6a167ade999dd70bb81fef3ab32 SHA512 8a36e06000cf43ddd087cd60c6652fe6244602c5a055b1dca17857891b9c602501a380a0066b1f74c9b23aa3f16ee1a4fba9d2a29502589516760e1548e90eef
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-19.12.1.ebuild b/kde-apps/marble/marble-19.12.2.ebuild
index 5da63ef3b694..5da63ef3b694 100644
--- a/kde-apps/marble/marble-19.12.1.ebuild
+++ b/kde-apps/marble/marble-19.12.2.ebuild
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index dd738ae90a0f..5491c8e93cc2 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
 DIST mbox-importer-19.08.3.tar.xz 33320 BLAKE2B 2c555414502951b1071a5af82a2f3ff9ea3618e8ae229a469b9e872208b86567d0f11587f0c63bb995d31f0f82082857d277c1ca7a7c3f3aca4c2f40491cdf65 SHA512 f48cd0e62c5e8820b7c4f764e13be19111d34b7c182283e06afc7a88f4a95c7fe2cf885aa4913aa466db927a6e3bdacd26a9943f68ab8e3da7ab51674733bd8f
-DIST mbox-importer-19.12.1.tar.xz 33328 BLAKE2B 8986d9cfafe0b3d14e9d71dbb380080022781a5c861264857d3dc123b84882ab8ec0cdd17320104fe9b8db515f9ade9f3e78de788bbec0f16ce9f351a101ca11 SHA512 893a5255f856b805a265ba0462101b110218d2631a360ea29c36304cfbfbd69a43bcd414d958d68263fc6ef71399086654fcc09522445139cde489e8f72c2b3f
+DIST mbox-importer-19.12.2.tar.xz 33624 BLAKE2B a34e7782fba31972aae11859ecc47a2f6cd82de001ac52eb8e2200ce755b94ee4b76f9c1ab4fb9e9a201865bb7e54e7e5622be87007ab5ed8500c353cd6bfc3c SHA512 908b108cb18008e0e17d296211d93d26cc099a552f0e8ccc201280518321ea5cde22b71af9996726e96f487036547551673a9f39fdb69318d5d6635ef6c6b867
 EBUILD mbox-importer-19.08.3.ebuild 957 BLAKE2B 41ed513145775ce3c1f89a7b93608cb960079404afbe38c3de53a56096ad9c388f483a756554e7c0860a1867aba5168e4484554a974c62e4193f7a8a9e14706e SHA512 4e6f383d0942505256ec8648440ea2746a62f6fe7e5d819c386a06346e1ee7dc0a1a8c491c03b7e186f6a32b8780f71ea7d834edac5daef982bc401190307d37
-EBUILD mbox-importer-19.12.1.ebuild 961 BLAKE2B a3ad94d71b7f6dc62954d5bc03ab11b14f9fe76b9af88e55b66fc339b326eb4aff797b2a1e213597fff2528a93f263d85a492bfb2aa66c7b5a854080bb80b1b9 SHA512 a7fd00208d037cdff24ccf1a7f557e19be1a9d75b9a405e9b3a917f49746097388dd38e33879f7b6db75e717745306561b0f9e06b584896d48d1c7a908f89e0b
+EBUILD mbox-importer-19.12.2.ebuild 918 BLAKE2B 1bae22f768d2d8272bb43340d45967869281f63735ad83aeb2ea3f7292387e8004e4bbd296a8be9568e3db196d9cf20a0259fc6c0622ebae9208cd6907aa9429 SHA512 6842fbba89203aa32c343817367443df0542f1d8b4477d9201d64c2051f8403c8c95fcda7b075cb922494079b00f53219fb862221d3a70efa22cc4ea6e0348df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-19.12.1.ebuild b/kde-apps/mbox-importer/mbox-importer-19.12.1.ebuild
deleted file mode 100644
index 886df920602e..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-19.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/mbox-importer/mbox-importer-19.12.2.ebuild b/kde-apps/mbox-importer/mbox-importer-19.12.2.ebuild
new file mode 100644
index 000000000000..d29e4dd4c96d
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-19.12.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Import mbox email archives from various sources into Akonadi"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/mailimporter-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 55c60cf9c0d2..448048fd75b5 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
 DIST messagelib-19.08.3.tar.xz 10401352 BLAKE2B 1aefa35536c65b63a7a8e80f04c603a7d79ed79817b216341e561070de54887c445d00a0bcd214ac2d4381a2f43a9522ac9cbe443ad9da412ab4bf7721739554 SHA512 defcd4534b1e61a6e115aa2106e92c8bd0d3405d7ff3e2f4a0616d4cd418cee513367215da57585a66f47d2208c888ed7fdef8f9bf70758f787551d009f746aa
-DIST messagelib-19.12.1.tar.xz 10464964 BLAKE2B a124de1f298d5d93ad03615c35d81b4a4a3c2089380196df24d812db9908663bb49e0a47f1b33d1368ff9f94167fc5f770ee8c4794dcb2ed398f99c02d3c0b89 SHA512 7980f890108165d01d447ed40ab655ac090e9df33dd5f578575581b24ce3cfaa043be57baf2acb711cd8b9fc6fd8c927aaec809a002ddcfd03f9d332eb9ab8a1
+DIST messagelib-19.12.2.tar.xz 10459732 BLAKE2B f2dcfd9c28aff32786000b6afe3d068c16ec308f08cb50781b1ec5e86b2d04c3aa4659bcd207ec74847915ef7760c65c26c71a859429e8c91e39da1e2e7d2db2 SHA512 e7c0ded5ec9869344a5e81ca8930d28ed304f89341d122f402aa01ed9691667916a95e5c4ab5c55689804b911caf397bf7add4c3a44478c1911d55c47d240f0c
 EBUILD messagelib-19.08.3.ebuild 2164 BLAKE2B f3a1b3da5c4c02e85d6fc85065553d08a5d1b5cd76048b10c1be9a2213b3fe545454ab5f5474a4a0a7627a73b31d763f4a2b739040fbb67fdd276df73d2dc441 SHA512 72cd7559d585bbbdddc84678d9e37bd72f2f045d9779fe9f81bf11e20839dc009c9d82abcbf982f3520c14a72895e869b8567ea5555131237eaa98894cbc5075
-EBUILD messagelib-19.12.1.ebuild 2185 BLAKE2B 532f9a97761f0551a71b718e368b445e43d9b438f3db60f4fe5bfccde777104e3ca98c36a69af8eedd922fbaee7ccc520aa97fb9a86311378d0132883fd00395 SHA512 d0a34d23333627ba3d5a7da89c0447d5971fadb8c037b92a003a82bbfd9429b38d13113b072e1d4a0da0552412850107541abafdcda880cd4667b4af2667fa30
+EBUILD messagelib-19.12.2.ebuild 2129 BLAKE2B b0579472329724c3e34e16afe1fbba8d4b14892eb57e8e048f46f3aff561398292864b97d7ff0b12e2101130208e35401c30caa116e5999469eb8127d82a1e3c SHA512 b72f64c2541e81c4c43377d1d9ba1d971f4055278ba6a65e3558639464095ae172c07866d1c89dc713fa965f40ed95585bf1c19b894c056563be1f7647371790
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-19.12.1.ebuild b/kde-apps/messagelib/messagelib-19.12.1.ebuild
deleted file mode 100644
index fc36c3b57283..000000000000
--- a/kde-apps/messagelib/messagelib-19.12.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries for messaging functions"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libgravatar-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	app-crypt/qca:2
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-19.12.2.ebuild b/kde-apps/messagelib/messagelib-19.12.2.ebuild
new file mode 100644
index 000000000000..478d917770b4
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-19.12.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional-recursive"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Libraries for messaging functions"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmbox-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	app-crypt/qca:2
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}"
+
+# bug 579630
+RESTRICT+=" test"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index 604f8ecf9571..be365b6b649d 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,7 +1,7 @@
 AUX minuet-19.08.3-fluidsynth-2.patch 3582 BLAKE2B b9ec13c676c9b8c1dd922d12179dba5bda5c1e7badc7e58d2fad38287ae3e5a75ab7b13eac6137beddad1cfbc16b3085d29f456390ec61cb3eca7b7ac76d44ff SHA512 c0bd1bf3e59e3fcc60111a91b9cf78d554dd0d94d43d71a86c7ec76f2fb4ad202f6bd94da7092a058693ba13f4ce6c9e39c47a63a2562f0a2fe15f67f9439e64
 DIST minuet-19.08.3.tar.xz 27593424 BLAKE2B f0aad2bbb9f4e0f0fbe8e9c493876eb482379610fd173f754aea8cdec06ba3baf5944aa9237dc71e12c0e7e4536e770b4f7fa14740be551e91e41b1a7ee9b733 SHA512 0e21f9f7ef97130f217842ecc430ee3742ab9fb1d86d4b24d11d4b8c42ce77516f0c1c258ebfe731296f7b08a699734daafb25c6a2bb1ae42a32b2e2b414be96
-DIST minuet-19.12.1.tar.xz 27588988 BLAKE2B fc6a64fc41299ceaf25cefb854a1688916771769a1ac68d1c5991cbfbf48db27d51ed6b22efd3ed9e4421ca22861dced7c6c66d83d2907930863c6a89f14f40d SHA512 a5e5b7ea26f8dc3b20c0bb4ce9015fb704f30ad6221c6729ad8bf11cb68b09e4cfb53a541f7786916ce6ea37806d24d73882ea39158cac9d5eee6832fbf42090
+DIST minuet-19.12.2.tar.xz 27591700 BLAKE2B cf5224cf1f7c998bf02f8bdd547fb9dc4e06c7b0b1247664fa1f9f4b485d1bd39e182a7e53a1c92666cdcc7d37c9004353327e59d6c0a22a86f6ae46d6c616c8 SHA512 8c9f39fcaaca1ea54f5ababa40890a834bf99d7920ca5d46e38e4ad2d4d527e88351378c7b2ddb5909abc25b990b234c0e1ef29ce6699b67790b54924a50cd7a
 EBUILD minuet-19.08.3-r1.ebuild 726 BLAKE2B cb110c5c60015553d435c0025df76ef3ff38a4ab161caf4416e8a234636f1059a1e6f0696dc721f40cb9c7449efbbd775849d87d52c8b300bc231c490dd018d2 SHA512 40a22a26fd236b90f87b4d1928cee30144d148184be25706c433821f2a5933aeb5244549e832d1ec9bc0ed1fa0857816acf0bb8b0328585e3f93bc39d5d48094
 EBUILD minuet-19.08.3.ebuild 672 BLAKE2B e20170d977b5255d420f5cd5bf35b8f7a94c061a39d401ff15669b3e3f3f201945592e5431b25289af1ee052204c7fa94f738a5fc5a7b71d2377899a41f6db09 SHA512 42df34239cb680769dcc2867a70e11376722db41ad997a168bc18863c91cbd72f095fee7d853e3d33a613449180c2aaf0e9e643d96341fe5341b9514236c5b22
-EBUILD minuet-19.12.1-r1.ebuild 736 BLAKE2B f70b8768130466b9cb9673474be06f618b8ff566c0593365fdc16b72da7d6656ff8edaa2e41111bff9b7f8cd9581939061f85159a05c78d24f036e45ef4b8dcf SHA512 79d3d010c77d9fe8f67052aa58e9fea2c6810ad984c2edae3da073d5a7ab6e93c89244e8e86f7ae1e11b3962aa9e265f50a83ccacfaffe977a7ea2eae4661afc
+EBUILD minuet-19.12.2.ebuild 736 BLAKE2B f70b8768130466b9cb9673474be06f618b8ff566c0593365fdc16b72da7d6656ff8edaa2e41111bff9b7f8cd9581939061f85159a05c78d24f036e45ef4b8dcf SHA512 79d3d010c77d9fe8f67052aa58e9fea2c6810ad984c2edae3da073d5a7ab6e93c89244e8e86f7ae1e11b3962aa9e265f50a83ccacfaffe977a7ea2eae4661afc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-19.12.1-r1.ebuild b/kde-apps/minuet/minuet-19.12.2.ebuild
index 98fa208cc5cc..98fa208cc5cc 100644
--- a/kde-apps/minuet/minuet-19.12.1-r1.ebuild
+++ b/kde-apps/minuet/minuet-19.12.2.ebuild
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 133189e6dcb5..a7083255a9b9 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
 AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
 DIST okular-19.08.3.tar.xz 7068828 BLAKE2B 8805936e7be73d3eb937fed0fe77d535c0d40fe839c9923466cada7f8cbf0f37253348d608d52eaaa7780c22db5f792ccb9bbbc474d35663e58b5b542b40fd13 SHA512 2fffce8023d9b0d08ec03cc51d21827772ed07c3004fcf8a23589211e7f676b61253dc39c8a41da5d9c4764ac9895c1a0e16c72c7157213b2e79ccaf35db77fa
-DIST okular-19.12.1.tar.xz 7203952 BLAKE2B c811058eead809c02a83f8249818ac57d51b549076d46df09882dfb5489c72c97a4aa318905d799cfd07e0fe37dc14e54f4a14bbef7dfb7aa5adb1080faf4d81 SHA512 6da6f870cd7e3060ca108c630e082fe20e7ecb702ffe7da2892450ca8401d25cd135d1039e883303000ad46b1d98c9bd6707c5eae54e03a225fcdf3f706465ec
+DIST okular-19.12.2.tar.xz 7203480 BLAKE2B 2f97b6d4dbdccbf68726ea20f3e89fb492a7547e9aaea3465f8b5358a21f399cc79e2c50c897c40a27b9001a3d13f637332e8fe6ec300660745924f8a6493533 SHA512 acd9640c120d73a0b84054941a76d8eaa7434fc9a6d82e77edf5bd4827ab17334f4e4bedc521133d922afa7cd9ba9e08057534ac08281fd23f9bed7fff28f304
 EBUILD okular-19.08.3.ebuild 3138 BLAKE2B f777e0bc890e929034594cc10d3bacec0babbab1b0b141e5b1e3d7d128cc87411a2a340796c1ffd00dc0ecc353f033f7ac269c4b92588413b9c82bdc01c7216c SHA512 39bba7b56d1114b51d41f07034b5a960428446bcfad8a44676d3fd734a35ed5d46fe8ba61c0e0e13179122f7d01f7befb915632684daef44e5a50245e26fcb04
-EBUILD okular-19.12.1.ebuild 3155 BLAKE2B d950a4f8880d46ec599c121f55c9336d13d50924ce00fe4ab4b02885f0d49fd33f7ad807980363f252075002146faa625a247acd4f6ce39822b93736627b52fe SHA512 d31b9ccaea3a364d409ed9da14a2fcf669f3cd7646728c5de432fe746c8e526049d7e14686bd2a2f5428557d2b75bd8cf303914ce0ae9f372699048f195dee59
+EBUILD okular-19.12.2.ebuild 3155 BLAKE2B d950a4f8880d46ec599c121f55c9336d13d50924ce00fe4ab4b02885f0d49fd33f7ad807980363f252075002146faa625a247acd4f6ce39822b93736627b52fe SHA512 d31b9ccaea3a364d409ed9da14a2fcf669f3cd7646728c5de432fe746c8e526049d7e14686bd2a2f5428557d2b75bd8cf303914ce0ae9f372699048f195dee59
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-19.12.1.ebuild b/kde-apps/okular/okular-19.12.2.ebuild
index c6e7409eb7f8..c6e7409eb7f8 100644
--- a/kde-apps/okular/okular-19.12.1.ebuild
+++ b/kde-apps/okular/okular-19.12.2.ebuild
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 1d94c4a8b1e9..cc0b9563d299 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,5 +1,5 @@
 DIST palapeli-19.08.3.tar.xz 2069352 BLAKE2B 0ba42e64f3d76f84b826e6da4a9d219b47f52d6241da7b999e0d207078756a30dfaef1775816272a78fdc709ad0659bfe570e53af0cb39e765a1bf5d7debcc4b SHA512 1e263e10a3d6d1dfbc2a0951297cbcc381cd789d5c806ec4ad57db4feef9a9e6a525e61991d03d554a02154652cbfe485a135da72822d03d35579de171c91ee0
-DIST palapeli-19.12.1.tar.xz 2070948 BLAKE2B 750c7c6117356bfc287bf8bf670f6b0ff05dab73356ae623ab478df68744662bf6a1d0e11cd34c43d267110fd788f0dc9da774ccd364b51a2d39af16b0824b43 SHA512 9c5c035c6e8c86f78289b4196cacdb84717bc282e01d5bf44a96e5c5c307a9f0fa1478c97ecd28aeed96db770681c1ba3f234bd17bdce676d76ae58928385d74
+DIST palapeli-19.12.2.tar.xz 2069756 BLAKE2B 31e3c051308b98cc2daea780313bef07467dad8e6c373e21d335392a37bf885e09445757cd6693f32bb41744469f413112c57558dff8cf868e02ccc1fef5cd3a SHA512 cba96383d458fe31f4cd453bdfa43fe38ee63f69391cad12879d74027eaec8da1cc0791ed4ffb352a15cb0207529b4915e3dc65bb7bb5691b29846c7bb65c47e
 EBUILD palapeli-19.08.3.ebuild 1071 BLAKE2B 08f685c532336e0867bb8b348ce63035bf052403a41b0a8680606dc04213d763e69a4ac5bb7086f6c58ca137e21a8d87a6b5dd0faeb752610d6ed00fd38c25b6 SHA512 49777482d2d68667bdab5c22990ed07b437fe3a9237a25f6e65ff18c1a66e1125a1cc98c7c7ef2e65e6e56d36bfc19589d4cb08e87f3c0dc5f2f53fa55874c73
-EBUILD palapeli-19.12.1.ebuild 1082 BLAKE2B 975590f0147982fe01374cd599fc6ecf0995fa1045538c7ce2977e53afcf71cc3f04f5720f0d88b36dfe83bdbff09b80fbb5636ab8b04828e8365243db2fe3cf SHA512 778fd30e6ceecc6555dc56a4b46d6bf3ce98610a1a7e294275e7f291751f4ecb0869261345a8c375fe5e1a6c6a54a2affc16140dee233694383893d9b99cd781
+EBUILD palapeli-19.12.2.ebuild 1082 BLAKE2B 975590f0147982fe01374cd599fc6ecf0995fa1045538c7ce2977e53afcf71cc3f04f5720f0d88b36dfe83bdbff09b80fbb5636ab8b04828e8365243db2fe3cf SHA512 778fd30e6ceecc6555dc56a4b46d6bf3ce98610a1a7e294275e7f291751f4ecb0869261345a8c375fe5e1a6c6a54a2affc16140dee233694383893d9b99cd781
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-19.12.1.ebuild b/kde-apps/palapeli/palapeli-19.12.2.ebuild
index 1fb04084988f..1fb04084988f 100644
--- a/kde-apps/palapeli/palapeli-19.12.1.ebuild
+++ b/kde-apps/palapeli/palapeli-19.12.2.ebuild
diff --git a/kde-apps/parley/Manifest b/kde-apps/parley/Manifest
index f02eb3a3ae42..368d3fcc4c9e 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
 DIST parley-19.08.3.tar.xz 8827432 BLAKE2B 2657373f0cd855aefd898edf8c82f584d0f6c7fbc85e379336765a5334aa476a0f5f76b28a14e19b4ff797a8e552288d68d566158a41774c96ea9e69d56df4ba SHA512 5a8ede27d2a0612b1db3f0693e9f1749c6c20394bee4ab1cb1dd8fe41aff5d0c1c409f6be8d91dae3f540301aaac941d99c14e6fbfd8ce9e56e85a83c89d344b
-DIST parley-19.12.1.tar.xz 8833140 BLAKE2B 27ed95cecb960ccd1cf00e55916bff5eea5b392c0fa36f4dcf45ad116f706e8ba9c90c5a215d7e23166383566c52fd00909429ac5e1fe39f41c587fd35fc2931 SHA512 26177e93341b43637f84a72e5b58d4e3f1d13455703bbd75c0fe2cf3fb67f286c38a513970fd4cb70799fde6592804fae8d6a3f2baa29d4116b5afde34740ee9
+DIST parley-19.12.2.tar.xz 8828756 BLAKE2B 4ae941288b66ae6cbb7cbd33d69b0771d3ceb630eb2482cad210a9a251ce4d2aac1aca1194eeda9d4cf8df6fb23bb7656b4f604c4d3aa7295bead1700fac97f6 SHA512 bae9b6778ebf64fcc59f4c5e42f9d612fb482fe4819808a67ce23a006d459681544401812420e517431a47abb082e9b46b76241a37db50f67620e3ef855487d9
 EBUILD parley-19.08.3.ebuild 1466 BLAKE2B 5da0f24dd8eb29ae4ad67b93066a5e522f73062e6b464893ac9610f92a907567e91e6733b641f139c39f01f3229ff52e1bb199008e2ee18979ea79636459d607 SHA512 68d73d979d9a25eb7eca1b3cfff4279e3a287222e2be61c57ef5ddf90f585ea684982b925ec2b3527c71a46da448bbcfe6326ba8ae636a9def7387023f9c5907
-EBUILD parley-19.12.1.ebuild 1431 BLAKE2B c5edacaeee91915f7815fb42e914827811d352c5b6ede74b067025a004f7993f8f25890e478bb58e5311ff7cc0703b83a3ca7baca93bcd88ed269b984ef89f15 SHA512 2912bd67c464cf9703ecc2f2e0030e92a2072f9aa8cc395ec7a4799723752b3cb2bb2fb48bf2d37c3e84c512422589600ed32a81ce96a28eadaaa01d63fe3b8a
+EBUILD parley-19.12.2.ebuild 1431 BLAKE2B c5edacaeee91915f7815fb42e914827811d352c5b6ede74b067025a004f7993f8f25890e478bb58e5311ff7cc0703b83a3ca7baca93bcd88ed269b984ef89f15 SHA512 2912bd67c464cf9703ecc2f2e0030e92a2072f9aa8cc395ec7a4799723752b3cb2bb2fb48bf2d37c3e84c512422589600ed32a81ce96a28eadaaa01d63fe3b8a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-19.12.1.ebuild b/kde-apps/parley/parley-19.12.2.ebuild
index 66a493bbe3ae..66a493bbe3ae 100644
--- a/kde-apps/parley/parley-19.12.1.ebuild
+++ b/kde-apps/parley/parley-19.12.2.ebuild
diff --git a/kde-apps/picmi/Manifest b/kde-apps/picmi/Manifest
index 93ea61562613..0a727ea34e70 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
 DIST picmi-19.08.3.tar.xz 1358012 BLAKE2B b8567a9e0261854364ef0a5f8c9caf2b87be632529e1621f443f845ffc6725f41690c17d83bcf93a626ddc47cd5a7998390770d0af845c4ad08d6d0b90ad35f8 SHA512 8414ca43b05cbe20a4967d775dc4bb68b70028082bf3d5fd66020b422d6b4b90575ce3c594c4c23706b3ab95618e5e9d5987c86fb6b18cc3b4ba46ab069b74e7
-DIST picmi-19.12.1.tar.xz 1358152 BLAKE2B cfd730139ff98fef1d04836795885344cff0629a8ca0730bf668b544ed26a67a1b350b1bda4dc83532b7932eb44fb55c122b122a753b4783fd94c62b0d4d386e SHA512 8dc64115a4df8696f9248389f37c55499347f4ca75a2f14e7f17e6c6e6d28c4dcffacb2977bd37381b221b7d660365b42c0b07c55d36280666e4f68d531cd82e
+DIST picmi-19.12.2.tar.xz 1357752 BLAKE2B f9807f6be6b9719d71be71b313f362564ce23d7ea9071565a43c0f7f479bd1e5f32bab83b4ec42f456c32eaed3d59b28a7b4b928f1b29ba8f111c10d880ed65e SHA512 0963b316aa053694fc3a505bcfc3f025b8cca48fa8446941c1e1bb8c83f8debdd2fed75dce330fd05505c1c926acfae65a511e3fd09fbbbe187556ef2b1ac729
 EBUILD picmi-19.08.3.ebuild 1034 BLAKE2B f7f8997920500acfbe6cbdba4a3c19625fb53688577a91c19b4f1f604fdc4b7df4625f44506c069a672d2ab9121b8be6c310a39e84e1cf488fc63d348da951fb SHA512 e4085ab1991de90986e96ab9b4776286f0d92da92cd7e3e094d4c65d8f3b4b051afc951a973ce23ff97bd9d2c48ab40b09a10b20a7b1ce148ec28e0fa29800f4
-EBUILD picmi-19.12.1.ebuild 1087 BLAKE2B 5b72c7d2e6fa5d8eb0e0ba5daee2ece5b549e71eba4207f0cb83e2ff370a2853bdc65a5c8dbd2977dc5a00c84b55a332568b49119bef766a852345a5c74f44bc SHA512 0f9761f97f4fadeb3abf9445754ba0f2af2647cbc2dc6b3676c22190a1cc40962059c43407959b02f84466109f08dacebacc2ae10803c113048fd7f5ed3c15f2
+EBUILD picmi-19.12.2.ebuild 1087 BLAKE2B 5b72c7d2e6fa5d8eb0e0ba5daee2ece5b549e71eba4207f0cb83e2ff370a2853bdc65a5c8dbd2977dc5a00c84b55a332568b49119bef766a852345a5c74f44bc SHA512 0f9761f97f4fadeb3abf9445754ba0f2af2647cbc2dc6b3676c22190a1cc40962059c43407959b02f84466109f08dacebacc2ae10803c113048fd7f5ed3c15f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-19.12.1.ebuild b/kde-apps/picmi/picmi-19.12.2.ebuild
index 62650e540757..62650e540757 100644
--- a/kde-apps/picmi/picmi-19.12.1.ebuild
+++ b/kde-apps/picmi/picmi-19.12.2.ebuild
diff --git a/kde-apps/pim-data-exporter/Manifest b/kde-apps/pim-data-exporter/Manifest
index 075d690a902e..2d3f6b26f643 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
 DIST pim-data-exporter-19.08.3.tar.xz 203340 BLAKE2B eca663a60a51c1b5040a374a50da519a39dd01aa3abc87d1daaf27b3de630eff01900086acf82bd58a1a4e6b2b3b29b9559dbf568aa8cffb760ce93b9eea653a SHA512 551251dc0fd260212c0d774ea730d1b863c320595a356dd755dd8ed8bfbe16193cef7967a1114c7cb163ab4bb06e7646992d6ace15c305105dd7f79806348637
-DIST pim-data-exporter-19.12.1.tar.xz 205616 BLAKE2B 1552dd0d3d3a0114ab27c287f4ab1f38839a8a6be105bd52c67bbd3ce0099243082e96ba9ef8265ec9d784aca05cd3777932a9e89e8e32dbe6ce277b8aef47c8 SHA512 262f686f94f3df60b219b4ee6ffed928e9f8bc3ff83b4eb5c9c598562ffd08bcd05fd45f730c4202a7e1c82cc765f803d979d55e2614b9724a44fe621cdf4109
+DIST pim-data-exporter-19.12.2.tar.xz 205416 BLAKE2B 4e11f02ec473b8a7189fe8d5658e49ff6ea0172930484241e06324717d42b4401b4c3ec55b6e31e17d0841e8e849186fbad673ab2d31a75f8bebd12ea895e05e SHA512 bd2e189505fd9d8d76f66d02118d15c4ab8e2533368792c8a2e882052113f3b92ddf250685f058324616ae2300f1b8989296722c06545c7d17b28bf49f01ff1a
 EBUILD pim-data-exporter-19.08.3.ebuild 1395 BLAKE2B 5b7605258c10ffa8658c8e32db4d8cc78a8ed5b2a0fa012bc4b3c6cdaf2a4a12a1948e95bb7dbc977cf6a3046f66a034b66cda1f2e62e54dd4e058d1fd78021b SHA512 f62b82f74bd8ea20c30f616b9c16c2e5cd646f91c108782575777f378e466d7ae1cd96a4df426c34021f37b07c3c441446fd7c4410e0ff15c2fe9298b5275b21
-EBUILD pim-data-exporter-19.12.1.ebuild 1399 BLAKE2B 290e65df096a0f01a44b48b5489752dd0b5e7d874de4e0af76ccf742a439d63934c7952cb25448ae2bbf2747e6c17dfd457ebddd27534dbf1d68397e388537f6 SHA512 003469786d1e887be5fe89ab8218d5bab4fc68df6e0a46f2caf9fa408173c041a58842cf8625a33b37527e098c61c9e3097cc5423637596b3a8d4d80b7545195
+EBUILD pim-data-exporter-19.12.2.ebuild 1356 BLAKE2B acb655b297097e3a5502e18cca93a2dcecf6fe4f07eb3bbeebf3125a0d22174b7f38eaee3fd956b2b3ab5897ed1f5dd48c05712f7977e6a5a1c76cba1574e8d1 SHA512 4cd5bb43e0a88b89f9906bccde21ae53801a73f1345118c3f32aa6bf5f5d5cd319a43c367b5567cc9038eef723b75c23592112ac3c0026e91e3c239172549e3e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.1.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.1.ebuild
deleted file mode 100644
index 951427b1b4c3..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to backup and archive PIM data and configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.2.ebuild
new file mode 100644
index 000000000000..a093267112d3
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Assistant to backup and archive PIM data and configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Backup_Options"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index e0756298bd85..76c7ffc84b72 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
 DIST pim-sieve-editor-19.08.3.tar.xz 451160 BLAKE2B 948a25da795132fbe50548d00a417f27e2350adb2936d424cf6982b309d923badb8ab6cf857be541ce085e5a0d40d4470c69c6049149bc1f3c3b9ddba6d2b734 SHA512 297d22b0cd8f2423812fe5e5a041c3e1ec66334a92ca024b569b1251c01733ad381ab9774b6d3d10788ededdefb4c1b8adf84ac8087b4db9df630a9c4dbb7579
-DIST pim-sieve-editor-19.12.1.tar.xz 450896 BLAKE2B bda96125bb430bf301498c949cc4aa5fced41fb9fa1dcd451f4012e813a98ef1bc5530ec4a8427b247154139135f840c6911b3e3d99a7781c331061354fb40a0 SHA512 b96f6b0cee8bf575fb10f95aad5985567ed97f2c54996ef63b090f9cd586e0d83cb1fc62c1079d6484689aeb82f76b40c82ad0d2f391cde92cd1254b9bfc9ff7
+DIST pim-sieve-editor-19.12.2.tar.xz 451000 BLAKE2B b47c4cf981a72cd163b7e87ec46a21456eac58c9838638cc91b661bb88f953f3d5dfda489aea0cb5c32c6708015bfdab6c79019a3e5dce1677504a65c2042c39 SHA512 77bd1dd93ee74e3932c21d9044c4d78304410733e6079e951cc838a27524bc1d36369bff306049edfc498f0934db346ba262adfd1e89fb56020e61d81513992a
 EBUILD pim-sieve-editor-19.08.3.ebuild 1341 BLAKE2B c158b0dc6338d176dd0b87812fea11c0e45f8c7b8588fe85684f514973133683ceeb49330afebd0af77468a26ff786fe27dc517d54ed4bf16ff042ad395c9c0a SHA512 8620247435d24e7fdbe92bb1a1b7e16ac72c31a18f73313084411ce9ed1e61ad40ae8b751d386a73e584af6f8faf7c73b09fe5d43a58e41cbb609756c1720c98
-EBUILD pim-sieve-editor-19.12.1.ebuild 1345 BLAKE2B 7fcfd3b28d46dbf341e002dbfc764e3c5dc587ebca2d859bd14f252e873d183d98ea236fc75993e59e214638e4b2b09d1e1fa8ba8a70c14288389bdcbb8b9307 SHA512 382fb02b8f7e9196ef17d9e3a3156a0abe48f156e1eea30a80944623c9ac342efed2e6e137747aa6d73b134fc41b99af52255d8af67e6c63808f01ed15024389
+EBUILD pim-sieve-editor-19.12.2.ebuild 1289 BLAKE2B ceb403dd8b42ca9f7b083ff9e999562e3ec61fdf77ad1ca9731cac953159bbbe2e04b339f811abbad978deeb876a50b8f7bb485b9dce137b32c54d1e65813648 SHA512 8ea1cb52ae00001362fb886fc2ab055df0ca14dbde6e1e89b5241e38d279d6fc43171f68fd0e9a0fd02e77dfd965da8c6eda1a79e707a312787375ee398e1cec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.1.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.1.ebuild
deleted file mode 100644
index 856cc230d4e0..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/libksieve-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.2.ebuild
new file mode 100644
index 000000000000..42da839381de
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Assistant for editing IMAP Sieve filters"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/libksieve-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index c166a54f9138..dbcc4a45a9b6 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
 DIST pimcommon-19.08.3.tar.xz 293596 BLAKE2B 31326e8df1cce64849f4cd4672aac2df94709416347ad1cd616db2132ff8537f34034574e015ec54b08917dcccd128f2af8fc2d08a54cad8bf1ba0d9e6f7fafe SHA512 844d36c8ed63ec4de7d5feafd637e1d6b87725e77910839365e9a1e8cfdfd2f46e6e64b42a1ca3837a95b2f7a194fde46d5068b0609d5806fea9295b94c1a2b1
-DIST pimcommon-19.12.1.tar.xz 294524 BLAKE2B 19d55abd744cea719e4afb9e9f9d42d51987485beb405fbf0990549f7b1105f240873af173ca6277acac23695671660d68a5a8f355ae96d15515385d89b82ebc SHA512 0e595377a6932b6a2962f2126fb3a8bcd56962bca6fe8f654657424c3f392e50449572231b485ba4f7bc82b97fe9a9676557153bd38b04972fa4ae1fd4a30722
+DIST pimcommon-19.12.2.tar.xz 293548 BLAKE2B 7f68af2a410c315dd096d6574d654cabf6e4882f11ab1c3ca35f89e377737c63c09fb6d7dbd9acd968e7a1ac02ee92d9ac27b8d4f425ba9099c3beb2779af056 SHA512 84970405e38c5c742d78bbf256afa5625449985389d2bd7436383f1a4be6b12a51eef1dbd931845b09eaeac184477539fec040f485eca1ed53ae9e0f917863f5
 EBUILD pimcommon-19.08.3.ebuild 1756 BLAKE2B 150eae8c00287aec35e3d5d15d52f4713eff0ad9899ac703d1f49424ccbd01ff3a3a7a24b07f9d7919abe12096c44765deb1f24d803b1377bc2af7341ff6ace1 SHA512 3964b70a09c4623fd7f436e23462cf31829792e80e810bed7fb99f8effa8f0fe09eabd2848088306ab6068a4800fb0e6c21916332aa85aa182484a94cb7823de
-EBUILD pimcommon-19.12.1.ebuild 1719 BLAKE2B 33991f6be5ab9358972b83f7fc1324a34b061616322fb0cbb327d14699de92101f2e957108489d8367a818a96f59873dec0f9df0e4fc15ba51063ac769c99d12 SHA512 66b0cf725466bd5c061cb9aa3504526a0ba7ca0c42eed221d0f11fd563fa5b7123164cbaf47d89c24db45adde94b4347d8ff4ca0bfb2ba26c547051e638e2cbc
+EBUILD pimcommon-19.12.2.ebuild 1624 BLAKE2B 0dd431b027dda8f108deb1b45219389678fdc6ef6dd9c80ea8ffe1a9a7801bfc0d479fb0b246882d9611e6117c717fa85689e78e7d99b487ba25f6aae20e89de SHA512 8a0892bf9a7c45de8b082b4aebc74178160bc8e48a68bf2793d46c5870ed848f7dcdf42e4e1fec6db86fa4812b48a047f50a3fa8d2c77d16a84d45a9e78db433
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/pimcommon-19.12.1.ebuild b/kde-apps/pimcommon/pimcommon-19.12.1.ebuild
deleted file mode 100644
index bc27a57f8cf7..000000000000
--- a/kde-apps/pimcommon/pimcommon-19.12.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Common PIM libraries"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=kde-apps/kmime-${PVCUT}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-19.12.2.ebuild b/kde-apps/pimcommon/pimcommon-19.12.2.ebuild
new file mode 100644
index 000000000000..344c7e30604c
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-19.12.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Common PIM libraries"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-libs/libxslt
+"
+RDEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+	test? ( >=kde-apps/kmime-${PVCUT}:5 )
+"
+
+src_test() {
+	# bugs 641730, 661330
+	local myctestargs=(
+		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index b5aefa71b6ba..9ad955b9ada2 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-telepathy-meta-19.08.3.ebuild 981 BLAKE2B c49cc1627e8ae8869e4cfbeb6ebe1f448f8a32643bf05ac6efb7ee4b4531bd9f3f382f3cb6a28067106a81936dec9304b50167c61c905f8a6b1920abcd5cece3 SHA512 e6a78add28bdf7f264c59979dfd0ef6803a85af1bb155b43d9b97920e9cd0d0181958aea8469bee2b96b3ca38f1345f110a09374a90c59f9fb8d6787ba476e1f
-EBUILD plasma-telepathy-meta-19.12.1.ebuild 984 BLAKE2B faa527426be62f73bb116a470ef44ed8918ad126a92f3f1c2828d24e7c2ace9b03877dc38f7df672c424f73efcc9e73bc468fa642d5dd8822d6c59a3c0e1a85c SHA512 6aa16f8275e6d34526efe6d71127931eb538881965e3945edf9a51af241e42cf6c7f453694fa4bec0bf9c1395335b108aabfd9fb1d374721cdecd99735d295eb
+EBUILD plasma-telepathy-meta-19.12.2.ebuild 984 BLAKE2B faa527426be62f73bb116a470ef44ed8918ad126a92f3f1c2828d24e7c2ace9b03877dc38f7df672c424f73efcc9e73bc468fa642d5dd8822d6c59a3c0e1a85c SHA512 6aa16f8275e6d34526efe6d71127931eb538881965e3945edf9a51af241e42cf6c7f453694fa4bec0bf9c1395335b108aabfd9fb1d374721cdecd99735d295eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.12.1.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.12.2.ebuild
index 61c23616dd77..61c23616dd77 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.12.1.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.12.2.ebuild
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 9356af42b31e..102e74165cc7 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
 DIST poxml-19.08.3.tar.xz 43192 BLAKE2B 5105dd1552d94404f41b400ed6ae85ffb17f6b8df62457cb40987b344ae91d0d8bb5707472fb3212c4147b8fe202f7dff91bb5f7bc9d6857d1b945e68dbab89a SHA512 34cc4323def1c62f0d7e088ff664a9001cb9b0b594bc9f47cb5c6546ab43555cffc5c6c0d2d695a81611fd0fa1bc6b7c2693f2b938645721368adc1da1f836f9
-DIST poxml-19.12.1.tar.xz 43364 BLAKE2B 0f306611354fc3c978afb9fe83b6fabd34fb60cc7f29b6e85b9c079897c0a9476441b486f0d695b1d2258a587901630606a4b8ae8508f8b070acf21930390140 SHA512 f2a8f23a782831f8a17f834b190284ff86ddc5e326e1ecd15367d9a23955ba4c6bdfd4e9ee1df40f8bd09d325db7ad98513977a63fdbc08834c5b21f9299a7e3
+DIST poxml-19.12.2.tar.xz 43276 BLAKE2B 09f1b74d94710c38ffec07f142674f407e7470d26b9623815bf897cc9b1ef7b0690d4dcfca45e116e402d46e7941faf86015f6a7ecfac8c2a2b9cded575fd1e3 SHA512 6eef7f69ffd92ba59988c62876e1ca53c10a08f2821ea159e37b5798088a7406be69f463434d41b705aa14b78a147490e185c8510728d8a2a2ed223c230f9626
 EBUILD poxml-19.08.3.ebuild 408 BLAKE2B fe25b5b50848cadf63158800471aaf880a87de1ff2aa97584525489cedcb21139e52e382c18f2cd89df03ca7a1685ecac214fd3234a7f7be8ca502e38929f5b0 SHA512 92ff60b04c3aaab8f576d6d7a6a0ef9320630bb19da30bd6837b7178849cbf4e62122043b02fcd35aea303393084d0d962e7ccb3f7be2ebe42a9ca12305493ce
-EBUILD poxml-19.12.1.ebuild 412 BLAKE2B 024fdaf43564f3b1fe0cad7087f851d0eb935a0b2bb359996c703204cba97eb85c27337a2128cc2fb67555c34291cba8ae9eaae307e73aece066761bf1bf4809 SHA512 dc662b665589db1748abfe5165caed4c79d0a134db58b0cd343364440b3bca9ea4ac7329f4c60707d4c7890b9bce5e0794b4ff8e27c2d2a9dfcbfa3e7d3c187c
+EBUILD poxml-19.12.2.ebuild 412 BLAKE2B 024fdaf43564f3b1fe0cad7087f851d0eb935a0b2bb359996c703204cba97eb85c27337a2128cc2fb67555c34291cba8ae9eaae307e73aece066761bf1bf4809 SHA512 dc662b665589db1748abfe5165caed4c79d0a134db58b0cd343364440b3bca9ea4ac7329f4c60707d4c7890b9bce5e0794b4ff8e27c2d2a9dfcbfa3e7d3c187c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-19.12.1.ebuild b/kde-apps/poxml/poxml-19.12.2.ebuild
index 91e463c5a3fa..91e463c5a3fa 100644
--- a/kde-apps/poxml/poxml-19.12.1.ebuild
+++ b/kde-apps/poxml/poxml-19.12.2.ebuild
diff --git a/kde-apps/print-manager/Manifest b/kde-apps/print-manager/Manifest
index b671a5c4375b..bcc981ce7868 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,7 +1,7 @@
 AUX print-manager-19.08.3-crash-w-cups-jobs-w-duplicate-id.patch 3059 BLAKE2B 3aca0faae876385d7c94d6567caf8403cca51471d1ac225ac68e9589bc8c5db411830d3a54aba453ea9c14fe960ddb131abb254d73572c5bfbd5bf13270558ec SHA512 5050d299d362c5f1047fa6c3e01327e3b702d06512c8f7b2e2b53470bb3e480ae7e5957ff2f2eb0f14c88f6a5f65429ccc1b20f64d05fade4ae547ca7ad8e178
 DIST print-manager-19.08.3.tar.xz 245476 BLAKE2B 218c2d0676ecc5fbb2fbb8ad60cafdc85ccb388db3577f19867fe2e8a266617d010e67878f34d7c02c1e161923db24d817d7b624c1d6472f343d8bd9c025d66f SHA512 b68d9f28a2e387ee11c5756c18a08e60dfb31561721e97b7d55749c60b65b887c217e096ec8bc27004f7da22700500c767b894b84e16a6d571a4cc8e112ffcb8
-DIST print-manager-19.12.1.tar.xz 250772 BLAKE2B b8de65c32bdeec77e3b34de48a8f074e4d05e576eed7be95f45f81e1fdeb4c1d3be2dea99cedfc6b4b99b89249af80b2494a5a87c246f054d069f2d4742ddd28 SHA512 82aa325d7ebd1fd1d73b99eed20f724b4a51f093451ee2de8ce8e486d9ee10aa6c02208d0f9648c713a92d7442f08728358857daed51e7afddac3fa0fca86160
+DIST print-manager-19.12.2.tar.xz 250988 BLAKE2B 56307e6b0fba04254dfe67dc3461e0bd3814b1d21bdd4cc2cc380671ce6bc02efa54a83629b01b1b845a47e45f8911b5e25775bae6f90db5a36cabab9296edaa SHA512 c7cc2aed3342d88f8276400407d1e0c6ffb4f2cf0e342b8717115da869d8321f211846d2979918af363acc34f6c057985e302d4e57c3c1aff2c0d4f80a6506bf
 EBUILD print-manager-19.08.3-r1.ebuild 1772 BLAKE2B d1dc251f6659482b5adf9f063fbe644c5ba20d2fbdbcce6351831aa0a9a7441d79504e3d17e625609e7f75bdda8163a9cbfd57a0a312e3305fe8f324067dc4f7 SHA512 b88cae028e7daad1ff3b95ede395284d4900d0da7caa4803b812b70059ae3f7a3fcf0520a4500569f6a26e740d5b9223ad423c027302971fa5163832ee9fb562
 EBUILD print-manager-19.08.3.ebuild 1698 BLAKE2B cce96648f0a741a461a7721c9b99db6670f332a5ef6e7476eae9bc4d3725df7c48b15e095f47d2686a1763a207b54343f7f30c9c8341683bc45f205828c2c756 SHA512 7f7e435a291710ae8d4344bf1a21f13a2ca44d382d1064206f499ad734a279cb4c8cdc64b9d554c84bcd4393d663614f6796e1f7a4298559a1e7fa685bc9e0e1
-EBUILD print-manager-19.12.1.ebuild 1709 BLAKE2B 77d7e5ef331208e94901b0685331b6d1f3ec7986caebb83fe91784d90073f4244d00ba8af013a558ecbafaa164ee85de025b0eee3b3b9063e46647bc88b7c38d SHA512 4c7070de48980e984c6603963fc09871e67a7a5386d50673eb4f5ae233a80f857e834c02fd582968b6f581b4a86a8d53016ce4a3357d0403b52ee36b424af8a1
+EBUILD print-manager-19.12.2.ebuild 1709 BLAKE2B 77d7e5ef331208e94901b0685331b6d1f3ec7986caebb83fe91784d90073f4244d00ba8af013a558ecbafaa164ee85de025b0eee3b3b9063e46647bc88b7c38d SHA512 4c7070de48980e984c6603963fc09871e67a7a5386d50673eb4f5ae233a80f857e834c02fd582968b6f581b4a86a8d53016ce4a3357d0403b52ee36b424af8a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-19.12.1.ebuild b/kde-apps/print-manager/print-manager-19.12.2.ebuild
index b091537a8088..b091537a8088 100644
--- a/kde-apps/print-manager/print-manager-19.12.1.ebuild
+++ b/kde-apps/print-manager/print-manager-19.12.2.ebuild
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index b3fbbf6d1cb4..e7402a2057d8 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
 DIST rocs-19.08.3.tar.xz 1518032 BLAKE2B 15806d0585d001d71c9fec815fe3411f518da642d059b3fea4e2a1b67b6ae0db71ca3225a9a8e2e2e2da0317bfd2022b0f1b08e0c118325e4d69f041c7a43c04 SHA512 be33c38d698ee71ca3fd629c96dabd60cf47ac684021a6b8a60ded856476093c0cb09a7b75252b17457abe5430439cf19d81ef108f7d18ae4782e0d6c0c20d7b
-DIST rocs-19.12.1.tar.xz 1523004 BLAKE2B 89f8a5588d18a206545218907486848591159599530d54cc3dfe0c9af7c18865c1d148c92ac928ee4ebe9b64aeb00c17fe5d3d508388643e34d1c6e4873e4571 SHA512 4477a9b995419087871c8c3b03c8df22db8107a78683417e13ecf7780af83e197ced6efadc4e4f47b47cb24ff7f85cf053c3b54a4cd737f833011aef80ab063b
+DIST rocs-19.12.2.tar.xz 1516624 BLAKE2B c3336e5f1b97f16c3ebe8b5a11f95274108c86ff22ea92ac9bc526e3582d1b9797d964b67cd6e433796af46b42770dfa0fda9a175a4e2122678f517a9d061b6f SHA512 d42bc5c8d53143579152112f50a85f234e5e43ad34699384a5801b0863b02ec34c26cfa158410a4f2cac108cd3e0dde155ed0f799586dbf9beed02e5a323bd71
 EBUILD rocs-19.08.3.ebuild 1371 BLAKE2B 728449dab498ee953da86bacf16d802f79208c730557fe96296612603d625a36c87abb79102a036967d394ede8a17b382004c0dc2a48a1646f3dc33893879239 SHA512 69eb49eea2b3e236b9c4bb9fc517bf05bff6377c51ab80302099b9f8013eacbbacaa452ffca96ae4b600d1e66d10cdde773af12395a2a971687f0fd2f2e19cf3
-EBUILD rocs-19.12.1.ebuild 1333 BLAKE2B f8d12c85d5777fc232962953d4ee4006dca77cd408fe57f17ff9308a93fe46172148f4a0a9203a92759e6d1a4e2f141d2009a89064924d072c9e3df05bcc2897 SHA512 dd71a7c1a2ee4ee47ff8ba75b3e6611b819f9c20ef39d5f57630a9fc8d8130ef47f62c5384f5a7c45659969f279ea50671178d41ab23dfbb4292d921a2c79480
+EBUILD rocs-19.12.2.ebuild 1333 BLAKE2B f8d12c85d5777fc232962953d4ee4006dca77cd408fe57f17ff9308a93fe46172148f4a0a9203a92759e6d1a4e2f141d2009a89064924d072c9e3df05bcc2897 SHA512 dd71a7c1a2ee4ee47ff8ba75b3e6611b819f9c20ef39d5f57630a9fc8d8130ef47f62c5384f5a7c45659969f279ea50671178d41ab23dfbb4292d921a2c79480
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-19.12.1.ebuild b/kde-apps/rocs/rocs-19.12.2.ebuild
index 2db9cbceb774..2db9cbceb774 100644
--- a/kde-apps/rocs/rocs-19.12.1.ebuild
+++ b/kde-apps/rocs/rocs-19.12.2.ebuild
diff --git a/kde-apps/signon-kwallet-extension/Manifest b/kde-apps/signon-kwallet-extension/Manifest
index 247ebfd43418..2760e3be2d02 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
 DIST signon-kwallet-extension-19.08.3.tar.xz 10616 BLAKE2B 1e38b87883ec6aa86f2e626575ac4bf8aeece3cafff766ee7e6ff808f5e004f72ab89a7e3c9a876d738c963e906a3f9eb8c06fbd23a2e306bc19955eaeaf9aaf SHA512 c7fc80dde77d1eda25b00deb7c6125e94e714c167b60f27dabaaa24d59975bf3e6ae404753ee1fbb7c416dbdd3366a53105532c5e18c4ca472c16894293d3391
-DIST signon-kwallet-extension-19.12.1.tar.xz 10528 BLAKE2B 4cf44ea6af6fb7d1f7147ac5a5f96b66a851f59ef99073b6c128fecc1b81c58d6bbe680619bb69c42e9c610d03b70f66827ba328aa4fedce0b97f5e08af53a07 SHA512 885bfde87efea1069abc89589df0393dcbaf64863f6f3942f83c4881aa38377881748675f5d6007071846cff83dc467ae7434cba33d8c0f08eac7dcb77b30c5b
+DIST signon-kwallet-extension-19.12.2.tar.xz 10576 BLAKE2B 8246a5b7eef63844ed784b9c9c5f12274c1d43b17e5ca0920d04f6a4c6db59320d8c1f0d39f5b9468e28aaeaf304f4e9a7e669bcb0aea2802b5eceb882cca8af SHA512 e63963b8c64bc3f5e01160fa52cf6791024aaedff27e09828dc4f308301cdf61cc3de4e1ba8b4cea762abafafe75dd6ca4dcabf2b1ebc85dedd7e6049928df85
 EBUILD signon-kwallet-extension-19.08.3.ebuild 363 BLAKE2B 9d35be13531fb5339c96e8c7c0f0e545fbe778aae2e4651281cf03838c8aa1ebc207eace9e88af7801d446f421316d83bdab99ac47ce8298e3c24d67086e364d SHA512 a60cadbb4ada67bcc66de291a53073f490b38ef6cc023adf5230e74c3fe6c04e71048b92260db0a1e93f599a88f9114234ad328c583b4368af97ba4018664f03
-EBUILD signon-kwallet-extension-19.12.1.ebuild 367 BLAKE2B a08961ee81dfad33499a5c7dfdfac7ce782967feefcf54628a9d5dcb824eb0fd48bc64c783121726923acdb94a59a099261cb0d26cae74a32b49592c8a37a47f SHA512 7a12b6e731a62364fd8b1b21ccc9f5b2d1fb5003120264dad6e84d17dd64959c8f6dfec2e5389c2a591a2f9c96d9858ec604278aead79408af0f4c198e56b2f2
+EBUILD signon-kwallet-extension-19.12.2.ebuild 367 BLAKE2B a08961ee81dfad33499a5c7dfdfac7ce782967feefcf54628a9d5dcb824eb0fd48bc64c783121726923acdb94a59a099261cb0d26cae74a32b49592c8a37a47f SHA512 7a12b6e731a62364fd8b1b21ccc9f5b2d1fb5003120264dad6e84d17dd64959c8f6dfec2e5389c2a591a2f9c96d9858ec604278aead79408af0f4c198e56b2f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.12.1.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.12.2.ebuild
index 2e6f49c81d23..2e6f49c81d23 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.12.1.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.12.2.ebuild
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 51632ad7d3f7..844ee674f6df 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
 DIST spectacle-19.08.3.tar.xz 966512 BLAKE2B e200150e886e5d0aeba39608b2e62b718cc30bf9443fc59b4cfa425ccf716c1d0e0fd3c81ad447b154ad50392708e8067d945587752a21ed72ce26039cbcbedd SHA512 36a023b1c32c71ff60ba3613800abf16b877f8069937b7feca9d57faab9fdd8fb9db259bec33f96caded688b85e81ad89a6725fa9fb65369f97ad2133273668f
-DIST spectacle-19.12.1.tar.xz 651628 BLAKE2B 1024178371d3b11c2709f583637ec13cee5ebdd37bdb10756dd4b19d6004ea42a1a7204835364e08f904138d1fc6cec24f9c5ba2299740c5c7bef1c5d17883c9 SHA512 cf1a40fef44ddd7eaa516e47df8781cb1ff73287e2b1a579d92053b6ee73671a2c95526f8a5e54621216fe6072de376f9d87745dd5502f7136e0ed4f0adcc65a
+DIST spectacle-19.12.2.tar.xz 652680 BLAKE2B 478a5151023b53ba12ebe25e4cba9f3cc8732de83981777de8669e9bbc23b9f5fbc48f6cb5ae8a206284ecffc656292a300e25c566fc09755614bbe87fa64fd4 SHA512 94934df994800baefa8da5f0841b57e2130e60a7622663916f7d216b0d12b725dd3c5c47cdddea3adddfa311281778eb66d2364fab5c39d20c29057c290ab72e
 EBUILD spectacle-19.08.3.ebuild 1504 BLAKE2B 975540c25c7319b351f884ea502fa5dc98d8a9b94dfe2a66afc98cfb98d66236fe77316bc5d54867ed91a3e97ded094f5eaf9fad770279bdcfb9f74b27700773 SHA512 7282114e684c9cbbc6d4f89ca68994314dd75ba32be101204b199e0069d013c83a7b44258131db43a6b98b72a18477fa47e99c8e945e901a3695e976e8d2baf1
-EBUILD spectacle-19.12.1.ebuild 1583 BLAKE2B ddd2d3bc8c2084937e6e363f96da9a05a47483c153ee0995d6e9a582b44224eb67f751ea2607f9a981e21888e0ac8587264c58d2589978666e232988f200c33d SHA512 3cccece49a5becc4f9c1962962716b4458bf7133252fdb8a25b64b0a1dcaa4d1c5bfef1e94c122ae16d24afe9523b99ce2d74461ac365e48e4667a4cf91f767c
+EBUILD spectacle-19.12.2.ebuild 1583 BLAKE2B ddd2d3bc8c2084937e6e363f96da9a05a47483c153ee0995d6e9a582b44224eb67f751ea2607f9a981e21888e0ac8587264c58d2589978666e232988f200c33d SHA512 3cccece49a5becc4f9c1962962716b4458bf7133252fdb8a25b64b0a1dcaa4d1c5bfef1e94c122ae16d24afe9523b99ce2d74461ac365e48e4667a4cf91f767c
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-19.12.1.ebuild b/kde-apps/spectacle/spectacle-19.12.2.ebuild
index f16d4dc5cfb0..f16d4dc5cfb0 100644
--- a/kde-apps/spectacle/spectacle-19.12.1.ebuild
+++ b/kde-apps/spectacle/spectacle-19.12.2.ebuild
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 7c3e657b00f0..0ec6f4435f25 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
 DIST step-19.08.3.tar.xz 869880 BLAKE2B 29efdd4b38df7e171a02102459124b33b4c3e6fc7bf2d07db35f76e298226a7417922d10c459fcaf6b07c42166afa0c216067ce711667ebee4460bc5ebf4579c SHA512 685529b065d46cd6b1fa0fc29c71177763c8dadbbe541795766820d6797a0902b0b51c5bda58ad23338c573368e2edf440da4596fb877d175c06f3ca362fae74
-DIST step-19.12.1.tar.xz 910284 BLAKE2B 8cfca799542f75cbf0dd67f85828582f683ead1c14b76493c895ad148682b60a82b65c8e1553acbfdd54699eb606784cf0c398ecff44c95cff36cc7882219bae SHA512 70c127544f816b11db25457a18bdc114275c79c867228c6e1e7749b8e89217df329f67690ce4fd7a3a6c27a0f9d9309276820b17f0f8b1506b48c18bc8f0a2b6
+DIST step-19.12.2.tar.xz 915052 BLAKE2B 7359e6749e0cdb454e3284babf4e8789e3f7e5ed8a04e8bf28829a8443b9f8ab43016f2ef1539079a2e1b0d963253b29fa73557d72abcfc70f1281bba65a15df SHA512 81378ea5850369c3cb6c72d8830cfef2669cbdbba4753cbdad9410ad0667a7711685d0042fe9acc47895ff441ad70dba460767c4b6f027e539b3c9a0a8c1c707
 EBUILD step-19.08.3.ebuild 1603 BLAKE2B 32f5c6f687042f65508a5b282b8abe080d5461f2d7e207f0441379f6d1701953b3eb00b89a7637273d0485d76029557f61c732817c268e7b04fedda4ead77311 SHA512 281f063df7e525c793aad035ded4775f6a2b8dbb83ad526e25926eb914c2a957003626bf5da8bde10c4268cc034c0b1af153e71d5b0159e11f7b9f5b47f56be8
-EBUILD step-19.12.1.ebuild 1624 BLAKE2B 374971b8b8fbd4e07318eac6b0a0dc060e1e4a7c402c4b937c52a84ddfdced2796e6599e0aecb45b245ba84e61bc41127511ca0e23dba5628b8fa95adf4795ce SHA512 218951652fff9d9291bb813d4c82382cf2e4294fdac38077d2fe6d298cb6c3a452d4e3f3dd25667e85d73973ba48bb6768f59b440433ccfa97c46b52c2ccb4f3
+EBUILD step-19.12.2.ebuild 1624 BLAKE2B 374971b8b8fbd4e07318eac6b0a0dc060e1e4a7c402c4b937c52a84ddfdced2796e6599e0aecb45b245ba84e61bc41127511ca0e23dba5628b8fa95adf4795ce SHA512 218951652fff9d9291bb813d4c82382cf2e4294fdac38077d2fe6d298cb6c3a452d4e3f3dd25667e85d73973ba48bb6768f59b440433ccfa97c46b52c2ccb4f3
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-19.12.1.ebuild b/kde-apps/step/step-19.12.2.ebuild
index 9457033bdd13..9457033bdd13 100644
--- a/kde-apps/step/step-19.12.1.ebuild
+++ b/kde-apps/step/step-19.12.2.ebuild
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index df73d8251b4f..1bb70a2540f5 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
 DIST svgpart-19.08.3.tar.xz 21264 BLAKE2B bc38e3b50620610f24a34f2dbe87d046cfb830dec2e5486a99299cffd1737515d5580f8b4d63ea9455a9704d4e90d40b37ddfc67e5ce7aee39294d9cd6eaeac1 SHA512 681e3423059bbfb42158fe12569399874f6cfec97aaa39af77476f2ac009eed8bdeabf9c746cfc273564f25ed68d88bdaf2fdfeb39088f3f261e76de007711fa
-DIST svgpart-19.12.1.tar.xz 21272 BLAKE2B bfd683fd616d803ff282a16b8995f3d59dfa6e3a6b2cd0e16f9f932a131ef6c11d71cd8d4e68da1181398c5c9564a15af23b4e5460535314f592d35112673ca6 SHA512 5505fda63b03cdbde5e1187b82a05c081e8805725a61458582109c198f584b439b845319b4243d428261ee136d64fd7111e039bf8a5f31f3035b1236df2bb0ce
+DIST svgpart-19.12.2.tar.xz 21188 BLAKE2B a1d096a7d99da698b3d76d5f76adbc61bed88619392b63271fb794f7eac52734ff6404245e1177e04043b5c2b3fe687788742f1924e50bb1c38095a07937707f SHA512 a40187d066b414b6abc465cc781850f334e185062f10f3df39b772e51ea4790f79f3839dbe37150679085149cab76d99a55a6cd785030fba8775c8f90a909d58
 EBUILD svgpart-19.08.3.ebuild 568 BLAKE2B d3592c1dc1c98b46ccac575869797a5e50a480112267bbe458e46844304486cf7b206179aa52476d3606a090ed7a902f048516bf8f922b4219e3e507b922b574 SHA512 67a796d045505f30a6bd0643de39cc7e9e08a57ee4897f6160deb9da47166f6fee21d04785c4c5073be42e06b36f00b9417411aa2f64f8ffcc0d59a2112b39b0
-EBUILD svgpart-19.12.1.ebuild 579 BLAKE2B a74b41bb49749a96796e5f0aa31735f70318f1fa2178cccbeffa0c02fc42f6e304d9c65b09d842a94995bb0dffff83c3049050b533bfab958261ace7a4269473 SHA512 1a7ccb8bdde61c86f717d3104e3f8649c81a3bea460e647e669288f0a9fa697895a8619de18daffe68a510dc5c6b21e4d4d8fe08a33eed0a53ec694be3df99b4
+EBUILD svgpart-19.12.2.ebuild 579 BLAKE2B a74b41bb49749a96796e5f0aa31735f70318f1fa2178cccbeffa0c02fc42f6e304d9c65b09d842a94995bb0dffff83c3049050b533bfab958261ace7a4269473 SHA512 1a7ccb8bdde61c86f717d3104e3f8649c81a3bea460e647e669288f0a9fa697895a8619de18daffe68a510dc5c6b21e4d4d8fe08a33eed0a53ec694be3df99b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-19.12.1.ebuild b/kde-apps/svgpart/svgpart-19.12.2.ebuild
index 87ae676ebf38..87ae676ebf38 100644
--- a/kde-apps/svgpart/svgpart-19.12.1.ebuild
+++ b/kde-apps/svgpart/svgpart-19.12.2.ebuild
diff --git a/kde-apps/sweeper/Manifest b/kde-apps/sweeper/Manifest
index 3220684f093b..33833e2f4da9 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
 DIST sweeper-19.08.3.tar.xz 368332 BLAKE2B 2fd839ebad7907960fb7481415e01fb5fd4aa9203e6aad422496f7be7dde1814a6dff270b86cac15d4b463f1a26efa44da430dd6000b21737214724cd8a34436 SHA512 acdd7ba323c9763eba762c919489bdc5bc81a877616e13167bde9c5ae8cd9f09fd11c68c200b76f1c79c53b67c41fa56b012f422767a1662320b5aef0731f393
-DIST sweeper-19.12.1.tar.xz 368204 BLAKE2B 20014a5becf16d9ac9f7acb55aaaeee9d682712829ba4cbb34a988016f4b40215138cfccd756fdd28d4beeff578e81f9fc727780ca3727d93b5dfbbcca3ead73 SHA512 4c93f5490a370f3cae16ba31116c04e0a75c4c0a4404fb31c29938e2e5c3de8fefdaa6bfc32db180b79e27a35acf6dccb214219fca1b53eb7c686b2db804276f
+DIST sweeper-19.12.2.tar.xz 368320 BLAKE2B 15f00766108f756af4d2a232672283c5c27b82e6358441c5bfa74d6f2bc84f57cab52538e1eed0542857bc56e27f471cf72d81ff9598a0d8867962457cb9e6a9 SHA512 54f809b2d770d1623366034adb706fa55044bd6c062a2855f47be82bcd6457c4daba1ee8a40a37d33db940f95b3fb6134da8d250e7ba6ff0a8cd999c5da0f6d1
 EBUILD sweeper-19.08.3.ebuild 1020 BLAKE2B 070056c1dc93c1fe4df7b78c5eb17293710e8fa5975645bacf76d418c1cd09121ee3c87875a3b3aa10eef4d28155408ea954f1bd26815c3bf59eb0278b73d5a3 SHA512 2ebc64fcd67662f13208cafc908aac80719b0673b78e1fb83885cda7b506d0770df91c7fd619f6c16a6a31be15a55b01d1a04cd3b5f67f61f2db310089f02530
-EBUILD sweeper-19.12.1.ebuild 1038 BLAKE2B 7391bfd6dcb3041ac72d37678c34c4493369656fa93d3478e8e6851839ed7b16f200a833eb8426dd333e2d5b8a1941fe291b21d512b119799033fd4869552dd7 SHA512 1ff03c26ada93c0b1b5675de568fbb9d2d5c16a3e8481e38d5fbce08156e3b4edc424a328184b6a4051e32ed52cf64c94963c548b84447ad76e19ed27d751cb2
+EBUILD sweeper-19.12.2.ebuild 1038 BLAKE2B 7391bfd6dcb3041ac72d37678c34c4493369656fa93d3478e8e6851839ed7b16f200a833eb8426dd333e2d5b8a1941fe291b21d512b119799033fd4869552dd7 SHA512 1ff03c26ada93c0b1b5675de568fbb9d2d5c16a3e8481e38d5fbce08156e3b4edc424a328184b6a4051e32ed52cf64c94963c548b84447ad76e19ed27d751cb2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-19.12.1.ebuild b/kde-apps/sweeper/sweeper-19.12.2.ebuild
index b79939624867..b79939624867 100644
--- a/kde-apps/sweeper/sweeper-19.12.1.ebuild
+++ b/kde-apps/sweeper/sweeper-19.12.2.ebuild
diff --git a/kde-apps/thumbnailers/Manifest b/kde-apps/thumbnailers/Manifest
index ec715114cc69..3203880b9258 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
 DIST kdegraphics-thumbnailers-19.08.3.tar.xz 43564 BLAKE2B 823310ac379467405b555a9e111ea717d87ed4f25c2fbbc415c94e7496263e1254d28e8ee1f2a7ad6ff491a32ca803260b88d85ca0fe719bd0bf2e02bdf6659f SHA512 0ad62b71fef59868ef7c4a0486c99495d769bc8e0b364410f4b7cbd0f84bf4c2e24c13a3d398eb210fde0e226a44c1939a4d8aaea2090686bd83d4582bc0df65
-DIST kdegraphics-thumbnailers-19.12.1.tar.xz 46080 BLAKE2B a01c4c9fb8e79b3f994855da3cfb95dfe13058d9915dc462c9639d2ddfc76ac45a9b48b21ff9a6f675eea7ab44ddcc81f61f6080fa033700552b50e246cd1c29 SHA512 ece8d5a438f057fe36fa31af885b3ec85acb8980b50508684cd6c654758436071941a79ba764101ab24ffdf5d97f9fef1b5c47981144e85962a10ab2f3cab5c9
+DIST kdegraphics-thumbnailers-19.12.2.tar.xz 46368 BLAKE2B 45694a9b8e212cf6bc7a206b0d1541e508e44b00de34765286d9f9c2401a3de787012f913aeae02425db42dd3a3ef582073ca467b151895bdc7468716f9a8fed SHA512 681544769c986b1e99ef017f15fae3aac09a2624628d252be11a25efda52c3f931df4a5fe48257e766ad51d1ec53dcb03a469a43e2c66cd4ebeab01969824244
 EBUILD thumbnailers-19.08.3.ebuild 703 BLAKE2B 216d3918ebe6b62cb600ca35a4b6251e8b623856ad62cde60585c05802a9756216d88e5b24345afef49af183724cc8d8b25dbe558adffd718dc2994bcc4b1c41 SHA512 8c1814ccb1952f1624ba500ebeda62718a865d252dceef4059726d5942af62468210f393316ee5554fe3d8907e1cf8b6f63786cbfaa07150b7b5b20502f891de
-EBUILD thumbnailers-19.12.1.ebuild 714 BLAKE2B 4e3b56d1a0a03cceb20808fa8105b771a7baec07861c57298becd5b4d5e28d9f4b4b5b6362b944346f84ad665d2c4d9b6056f76a2d3bbe2857432aff7c7a2372 SHA512 0c3ca53f1fa27eb3edbe7f2542c4df6da925a6669dcd81f0daea4adc78efd434ff105b4098505451748027f28544ab7bd5a47a61f2c98e2fa7b42a9be8352257
+EBUILD thumbnailers-19.12.2.ebuild 714 BLAKE2B 4e3b56d1a0a03cceb20808fa8105b771a7baec07861c57298becd5b4d5e28d9f4b4b5b6362b944346f84ad665d2c4d9b6056f76a2d3bbe2857432aff7c7a2372 SHA512 0c3ca53f1fa27eb3edbe7f2542c4df6da925a6669dcd81f0daea4adc78efd434ff105b4098505451748027f28544ab7bd5a47a61f2c98e2fa7b42a9be8352257
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-19.12.1.ebuild b/kde-apps/thumbnailers/thumbnailers-19.12.2.ebuild
index a9342fe5c866..a9342fe5c866 100644
--- a/kde-apps/thumbnailers/thumbnailers-19.12.1.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-19.12.2.ebuild
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 0f5ade336261..23a79340def2 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
 DIST umbrello-19.08.3.tar.xz 3703784 BLAKE2B e992ef076f96da5599fe4315c4b6d8dc948485bf0bd2b14878e481c49fa4fe76087606f58268503dc401e817047d60ee52c27fa90749e28767bf7c4af70b4565 SHA512 1db25788a60e2a639c649a4d01809751b85a122426bdaedbebf6e6cce539b2b0f37893a8a61675df81517d7fe3e57a59377e49fd11e7ceebea5980372e284c9a
-DIST umbrello-19.12.1.tar.xz 3798332 BLAKE2B 968c0187e20d7fdbfcbd731b6de0f711fca1bf1081a96fcc11a5b63c7dc82250986042dac80c7d302f5cf4c248d6614840d37ea1200de022e693f2b65f9664b5 SHA512 230552328e4f9f2ee05c76e1995781a436ed7637d8a9c397080e6b51694524d7396a565d620ea79c8387c857a18d5817a8bd2b6ff0be3a7004d69710096e2c23
+DIST umbrello-19.12.2.tar.xz 3794060 BLAKE2B 831f7a7da672d70c3cf326d588d42e6df028e4c096e4b7be1df89f99e535c56ae117b4a5cbb5cd5719a5273d369092101d1394d0ac629d24e1a35a18fac7025a SHA512 85f3fda1d1f075aaf747265e377fd064e26ffb813fb92ec9157dfebfc5e3ba0e27f28ad1a879083db14f49908d6af688c747b24572705778538adab74d25fde3
 EBUILD umbrello-19.08.3.ebuild 1514 BLAKE2B a5eea2db0fe2cde1895fa17a43dd1af3c246e10b429bf32efc2be1e6fbb721f9438bfc7992bdb3a7bf3584e7dba6abac8009ba7b5981644522b60f1b2d864d82 SHA512 72074ce2dc5f92ea7108f2518882a131c29c400f8c799cef577cc956fea01933d39ac0c16594b7fb069cb8fabe222f1b0db38fe9ed8c854df16ef5f9057c4139
-EBUILD umbrello-19.12.1.ebuild 1522 BLAKE2B 8e5042930a28e6e737cf29002e11ef59a1235d63b66d7b93373ca07d114ecb8b75e9e3b83b56f1ca07dc1ec248e2b5094f0886fe388a0b66a112ee60863d5a43 SHA512 0ab6ea8e34fed4a6f87a4c13ce95668576ba23c8aafcf8d85d432374a4600bd4335e4c1b00bde014de91fa944c9b53f734e25e207efd1cecd8a6817b83e0415c
+EBUILD umbrello-19.12.2.ebuild 1522 BLAKE2B 8e5042930a28e6e737cf29002e11ef59a1235d63b66d7b93373ca07d114ecb8b75e9e3b83b56f1ca07dc1ec248e2b5094f0886fe388a0b66a112ee60863d5a43 SHA512 0ab6ea8e34fed4a6f87a4c13ce95668576ba23c8aafcf8d85d432374a4600bd4335e4c1b00bde014de91fa944c9b53f734e25e207efd1cecd8a6817b83e0415c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-19.12.1.ebuild b/kde-apps/umbrello/umbrello-19.12.2.ebuild
index 2d66709a4099..2d66709a4099 100644
--- a/kde-apps/umbrello/umbrello-19.12.1.ebuild
+++ b/kde-apps/umbrello/umbrello-19.12.2.ebuild
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index 7860b38d0827..5a18ca98a516 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,5 +1,5 @@
 DIST yakuake-19.08.3.tar.xz 371420 BLAKE2B c75ef829bee62a5e3e441ca3c5c26778171bf9f4455e7259cdecb21a625af30906a50dcfcc5e93d83f3648ed100018e3cc039b6525f9e4658b02c693feecd330 SHA512 6326d1923b9bb3c8923ce0b8238d3668c2911346519a5a2c5c9b3a693829d271a83a2ddc061d079d0f4b414814460b39e674e4cb78bf5d069f883fecf5db37f9
-DIST yakuake-19.12.1.tar.xz 372496 BLAKE2B 2605ad8b8d2c0d063f1f068e3c7b2ab3a311b4de22d3d4ba34e69c97b1524135e945ab78e88ab2f5131d084b3f4479a9b7fc487880738c4d3296e4e1d131c02c SHA512 e64646fd0c4c2d68d82b92739effca16149b8099e7616fc5681930bd07589687aceda973d5b4ff26ef199ba6231e373324b98ec6e332559bbdb144306f2c0c63
+DIST yakuake-19.12.2.tar.xz 372232 BLAKE2B 6066cbcaae4ac7614473d7e8ca91cfd190f02e3f2c027756bad0201118e1fb7b020c6d5375d7cf83321913e60feade8594f88a607c1e4fc9a22c3d3df9e4bec0 SHA512 61aa7055e4f65c8c60b7e2cd7306baefdf47c1b164e861f54f7816cad08f21ffc1b244a5a178273cc95c9c7c1d6f34a4cec4782773053f9dccf1c846025ab052
 EBUILD yakuake-19.08.3.ebuild 1558 BLAKE2B 48e54592e614cb0fb0f98aa2e61987fb119c2f7dfbe35398b2d0f67efd66f219d190fc0bad175962f87ca32805d54f7b1bfe1df2e316c795924ac3a3cfba3288 SHA512 0122f0b9050d5a2085679732cdb2d8604da5edcf59f0e96dc5db81cfb0a0100e27fc0a2402f3d93bb2d6f59d7f4b7d0f0859f241afbd0a82e353efb21c27c6f6
-EBUILD yakuake-19.12.1.ebuild 1568 BLAKE2B 244192f8bca802d8dbe60e053266c1c63a4110a5f9854f9e0087680cd74b02c731c0a6b3f0e1586dec2984308a31fd3635f64f03d382b98856baec0f773b8838 SHA512 d78326dfa3fa4082f00e9451b214673a4d61c971707fcc98970af23248a508b15326ffcc211d006fa3e3759823f72e2e92b3cdcf24da1bcf7ec5b4266694e980
+EBUILD yakuake-19.12.2.ebuild 1568 BLAKE2B 244192f8bca802d8dbe60e053266c1c63a4110a5f9854f9e0087680cd74b02c731c0a6b3f0e1586dec2984308a31fd3635f64f03d382b98856baec0f773b8838 SHA512 d78326dfa3fa4082f00e9451b214673a4d61c971707fcc98970af23248a508b15326ffcc211d006fa3e3759823f72e2e92b3cdcf24da1bcf7ec5b4266694e980
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-19.12.1.ebuild b/kde-apps/yakuake/yakuake-19.12.2.ebuild
index 9c6b3fe2299c..9c6b3fe2299c 100644
--- a/kde-apps/yakuake/yakuake-19.12.1.ebuild
+++ b/kde-apps/yakuake/yakuake-19.12.2.ebuild
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index e10d256b491b..fc787ccfd20d 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
 DIST zeroconf-ioslave-19.08.3.tar.xz 39100 BLAKE2B e1255d5b5ca3346c3b708e246dceb630ac5e7c3218032cab82bc327e28f8af2ea114ddc180d991afb3d4c92ddc2afe97492811909d6ed158750da86e8fba187a SHA512 24b7e3f581b99a6305b2fe688c9ace69a7b2ecfc4c7226875b23d2e91b03af1f3dde648c731a25b1bdc091ebadf780a3a06c8cafa051be2579e7a4a65d7d8f43
-DIST zeroconf-ioslave-19.12.1.tar.xz 41824 BLAKE2B 6ddf86edb7c336822c32d356960591ba40a5f270149c859d1e226a4fa416645b0c59f0eff8dfb2ac8d2b78b568e962b2315d2c78e0036b6d05839919329331c3 SHA512 c101d35da16fb50ffb114f015b28ce319af7c91607e573395d8e7dc98e7ef9ee955171ea448def0649f10329bb27c01b75d48a998da7013a7306d1ac53680ac6
+DIST zeroconf-ioslave-19.12.2.tar.xz 42104 BLAKE2B c1cca343204fa2bf78be472ed4c4572acad2c07379865902979b7570d4576a277320ee8a460937fb3872a6a5d87b4ef434dcf26cc0ba7a90962322145e651b0b SHA512 e5aafb041eafa2917a8027398cc3f946f94f99e09f6ff446b47b417d7c114a406dd7788b99d4483377117069da8dc96fc9e8b48dedb6eba189b68710ee7c2cd2
 EBUILD zeroconf-ioslave-19.08.3.ebuild 569 BLAKE2B 63db46925503ed4b25881bab9deeeed83e2630e96b977021071aefe2f34f23e6d099f1b6cdf05ce696a1d7ea04e1d07c7e25fe51d6d42b84cea9dbed6dbe2859 SHA512 20925c6b46281a64ed76a9c96228119060f9f2d71baf360f08e0648177b77a6c5fcfa79627105f86db21c7cbd67a9e2176f480e7c2d2f3e2edbe85c13ee35dbc
-EBUILD zeroconf-ioslave-19.12.1.ebuild 573 BLAKE2B 1f0b850cbb1e5d74d68622a76436ec9183fa1e0e6b2f95287a1f7c01ece36177e89af4a3b24a6f663a689b9d7996170c54c1af2116591b49c7e7c013dc186898 SHA512 59afd5bde2f4d2aa5c76cfabc250e886ed35fe34623c52406b79230c789f64b2057acaed441c94673d938db89e35dc04b58ece9e384c9bc6a2814ab83c55995f
+EBUILD zeroconf-ioslave-19.12.2.ebuild 573 BLAKE2B 1f0b850cbb1e5d74d68622a76436ec9183fa1e0e6b2f95287a1f7c01ece36177e89af4a3b24a6f663a689b9d7996170c54c1af2116591b49c7e7c013dc186898 SHA512 59afd5bde2f4d2aa5c76cfabc250e886ed35fe34623c52406b79230c789f64b2057acaed441c94673d938db89e35dc04b58ece9e384c9bc6a2814ab83c55995f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.12.1.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.12.2.ebuild
index 951851504e91..951851504e91 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.12.1.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.12.2.ebuild
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index baa700f8f6f6..9e1f3cf3bbf3 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 43ae6d18cf81..6361b21fdbfe 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
 DIST attica-5.64.0.tar.xz 63756 BLAKE2B 85647959b8c4a908f272b619ba0f880e71f4eae170dad0d631df3ddca0574b266e7651a8514201d2a053cf789692e728c4a68edb3a68b65736075c51af5156f2 SHA512 a85f9bf62496b8878e77e40f101ae58371b09731d7be86eab0e5adbc0fac9c076d7f740b2dd4471e03105eadc16fc2de663a69f48caf3f5f96040789e6cd64bb
-DIST attica-5.66.0.tar.xz 64464 BLAKE2B fde12c546bb67ef3c888729cb51048fcde6424f0d0223f81b00cf6400d83235ac64b0378a112f515ed05cd2cfff0fa3e0ab4a2dd75396a62e2d7fd0640d93259 SHA512 817a996cfd0a39584e38f8beb50ddcf891ad48d03d28691c256b3c632b22a1f9c4a0a32fb422147118e5ab5a468bf7ed721baff4ed212418a1b3447b5611845c
+DIST attica-5.67.0.tar.xz 64580 BLAKE2B 8add0188c07192eb9dd0597c31410cc7f81f73ad588927622f5320dbeb0f5e8cabb88fef5cd854b75c8d0f45639804327d2f5ab2c617cb53b2601d936f0dc0ca SHA512 59965df4eea792563cb46fd6d6ae8604dff5547917ea22a0ae00659d692ec05851768f66860de15c37631f918c1b54fc07264e9df123da3235c5a43576105cd7
 EBUILD attica-5.64.0.ebuild 460 BLAKE2B 3ecaf98ca04d1f71f9a57240ddbbfad50ffb91cf541033b1fb8f84ca5c54252998b9037f101059c294df5e9b55d71ad6186003f49203fbc0600ef0cb6982b2b5 SHA512 db50ec8bbe4dee7e0ea44b759a7a94ad5574054f46b3b7a58192e2d98a45e484b4eec7668f1632c3a6c6cc50e0030f39483ddfa7e8b349d1a70a4fd72cf51463
-EBUILD attica-5.66.0.ebuild 470 BLAKE2B 7b5f8517681cafe2271b811fad94a8e4de9e751c604fb221e6541f00acc9667ba0cf31d76a4557427d5e162f80d89972e0a170d2f66ad079de8753cd79b54781 SHA512 2451261bd3aa64a301119591a96a76e22f062370d438178e9aca580ade948b90a9c58aaebf76ac487f27a173d5c503ae5d8f643b5227082ab79f20ef7d922d63
+EBUILD attica-5.67.0.ebuild 470 BLAKE2B 7b5f8517681cafe2271b811fad94a8e4de9e751c604fb221e6541f00acc9667ba0cf31d76a4557427d5e162f80d89972e0a170d2f66ad079de8753cd79b54781 SHA512 2451261bd3aa64a301119591a96a76e22f062370d438178e9aca580ade948b90a9c58aaebf76ac487f27a173d5c503ae5d8f643b5227082ab79f20ef7d922d63
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.66.0.ebuild b/kde-frameworks/attica/attica-5.67.0.ebuild
index 64f2e07dfa3a..64f2e07dfa3a 100644
--- a/kde-frameworks/attica/attica-5.66.0.ebuild
+++ b/kde-frameworks/attica/attica-5.67.0.ebuild
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 10a9157eaf49..462ba1393d83 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-5.64.0.tar.xz 277132 BLAKE2B d37a14721053f3396834d76e3855d9606af0bba042dd8b01933d1e004f659c9b739852c7e33eb2ca0abadf6ec99c4369a26d3c61047ac06f5d7d8d05079fb210 SHA512 c01fec2e01ed3b979a9309a5745822e8632e5034882fd62d0a16c2ff61b88351724d078257a2b7faf7ce306a658e9df6780cd18ceeda3e2c70cd7e4523f3d5f1
-DIST baloo-5.66.0.tar.xz 271812 BLAKE2B b09c59da2e7611ec75a7cbe2d1c1fcf612cb40f20fe5530f97f29b55705369f0c70792839057c765cb42a90e39e97032c6fb9165d83835141e1cb25e434b6db2 SHA512 b402dda13e7b1972e32d673e837280745a57b39cd0bd54efff9ef20252f0114dae86816f7cb81c1e62bd5b324c9b539543e235cc8ef59080fd67d79cd024981a
+DIST baloo-5.67.0.tar.xz 273900 BLAKE2B 059ae680e887b5fcdbeb6d68c6760f035660919d727f2d46cf838e6426b0f83625faecbc754518e6968262ef3efb2fb9ea9852ab652e0d80629de9dc59db781f SHA512 065fb29c86e29a848c0bcac68851eb6b02b46e9f32269175a6d8cae80325dc619e020ac1c1f564998381a678d8918c1d7ddb81697e475663816eecb127831d5c
 EBUILD baloo-5.64.0.ebuild 922 BLAKE2B 6cd1fa052ae3467db962b687d3712c05691700c36cb2e294f61c3df2f1ba6a53d398bdd427f31ec427b6053c635a1bc269d2edbfa2f806e8632250f9466d47f3 SHA512 e2b6cfb1c8f3a65e00478c15dc2c3dade2295e80b4753cd3429f983302c53d9c65b153b2016d45e6839c999075154c58a95623840b05c937533d9bdbac14fdd8
-EBUILD baloo-5.66.0.ebuild 932 BLAKE2B e2550a7c3adc16da9a2e7d75e93ec3d1cb868c6438fcdc055797dd3e706fa535e9b7063a5a045bbf4135e8a9adb3ad34bd513d22cb85a9d562eb3416a9fef745 SHA512 eaa19fb498795836e5f8017948b403111cc4a67ace819bce1928ff9281583fafeb80db5e7d0e573a1fe87ee2d6981b333e1ee0c3a6d6a073baab14bd465d6ab2
+EBUILD baloo-5.67.0.ebuild 893 BLAKE2B 9ae3e14cea0e79e92f6aea5bd04dcfd00068b866351f0aa09cb1ae64f8359e67341935e6dc330385df0338073ac6e84072187dbd2675ca85c2c3a1fcc664d475 SHA512 9bf12a1bf1b7ed19795e401633443cb77a9376b534cceb022441d11956e92e56b32e52f8f7a6904b7a6d8af4cc47deb25f37289ec8b8dbbbfe87e84d1bb9be19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.66.0.ebuild b/kde-frameworks/baloo/baloo-5.66.0.ebuild
deleted file mode 100644
index 938d280d12b8..000000000000
--- a/kde-frameworks/baloo/baloo-5.66.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for searching and managing metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kfilemetadata-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kidletime-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-db/lmdb-0.9.17
-"
-RDEPEND="${DEPEND}
-	!kde-frameworks/baloo:4[-minimal(+)]
-"
-
-RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/baloo/baloo-5.67.0.ebuild b/kde-frameworks/baloo/baloo-5.67.0.ebuild
new file mode 100644
index 000000000000..ba93e6eb57ef
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.67.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for searching and managing metadata"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-db/lmdb-0.9.17
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kfilemetadata-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kidletime-${PVCUT}*:5
+	=kde-frameworks/kio-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index e22f2dd50960..d09034faf639 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.64.0.tar.xz 99428 BLAKE2B cb9f45ea6d9cbab8771ceb3bb000f1b6a0bd27d2593ff58ca3521ec4fd0a033fd9e65272fe88db13df93dd30f09bb69077b9b16ad35506868b9a44b2fae5c61f SHA512 87af161f863c4acda338f7ed44612204743f7d65fd1a58b9dc1bb009de63b79583ebc6c28ed867b8da0ec87261d3bd0f39dbb034425bdb19fd20c9c80f6fe27a
-DIST bluez-qt-5.66.0.tar.xz 100760 BLAKE2B b433a22f24e71324f35ea2ef447188a06088e0c0de025a4052ccf1f826b2b3328c498df013880069351c582c38674ffe4d665d8a408f2347c65e23561849ed8d SHA512 5ad94a860297ef785aa04c471ff9a56ed6238081ac4a0fad87a9439b93344d5196cb9e1df8a0c27293e59d6d48503a408826e5f00dadcf4880af00b94cb07fb5
+DIST bluez-qt-5.67.0.tar.xz 100760 BLAKE2B 67420b4ed6e8109071caf4f5f350fcd83234e6f2ac91f73702027346c418d638eb3a26031646ac626ea97d59d10ece6ea16a0215e66ba76dd7c778edb87dec44 SHA512 a90f79960d22ff3fb939d09df226bb5ae8a66e93963b0ff73f6eafcf4d21d003b2e690843527bcfca66208f1e4c1da04d2bf368ce09ba2112a35c2af5cde2787
 EBUILD bluez-qt-5.64.0.ebuild 671 BLAKE2B 6c924d978276d639caeab8fa55e3e77873b5cf129da12b68a27c1cf98767e068089e03b54a5b1512ce1fb866371a3b2bc1bc29c5e153c2977790dee23768bc48 SHA512 c9a81c9c518974ad4215065ec7c2c0c7502008fd8d3d9da24f598bde703424e58fa7ad0e4fc9c3e993c184a424d30156835c787b72677bb84344879b31538c2d
-EBUILD bluez-qt-5.66.0.ebuild 681 BLAKE2B b302f107d532d680100b2b208adf73f1db6f11ed826d0fff40a1b07a4f302a13076adb71e6fbbff5e6b954e55074ba8e491c8b31643274e106f2e2af6d172ff9 SHA512 1212ca75c61b40928d18fc49f52bbf48b2b4dfa2bfd10b6cd44ab62167d5708d89c21fcfc5809704e2d3c600f839a835ac78fdc923a24eb7eb67547712e01264
+EBUILD bluez-qt-5.67.0.ebuild 681 BLAKE2B b302f107d532d680100b2b208adf73f1db6f11ed826d0fff40a1b07a4f302a13076adb71e6fbbff5e6b954e55074ba8e491c8b31643274e106f2e2af6d172ff9 SHA512 1212ca75c61b40928d18fc49f52bbf48b2b4dfa2bfd10b6cd44ab62167d5708d89c21fcfc5809704e2d3c600f839a835ac78fdc923a24eb7eb67547712e01264
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.66.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.67.0.ebuild
index 26d42a1737e8..26d42a1737e8 100644
--- a/kde-frameworks/bluez-qt/bluez-qt-5.66.0.ebuild
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.67.0.ebuild
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 460d5602592f..95c838d47be5 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.64.0.tar.xz 2716900 BLAKE2B f12cfb9b505b010c0fb1cbba53f2f19a5eb5537f1393e1cb8ac6278763ae8c7dd2e67b7a888f924a315aa556aa2b58cd107f25fbda33765df78ffb3e071882bc SHA512 aa463370c330b4ff5f0b8de5f623de8b04de61bfc595e5bc227c1c323d264ab0b43dfa73b99ed356bef36b71ece9bac255f2bb1a39a8717f936dea8032645b2e
-DIST breeze-icons-5.66.0.tar.xz 2739092 BLAKE2B 4d1dacbff61bb53f7eacc2940d55bbe27ee60240205079c6599d7c7d54095b66e15e88c87e0d56f356df210761bd73e284c404d9e757540f97796d6ff8d43325 SHA512 3113dafe338b18a234b8b520d768b8d3e9d5773757f19abe2edda03353e44803cbaff54a67176dcf4b69658d7741dddd6300e3c660980b6d0b52725d862d725f
+DIST breeze-icons-5.67.0.tar.xz 2731080 BLAKE2B 9e8333c17ffc31d2ebd0b7f1b08712125f6904182ced3588bf97232ce93c1f4a96a7a1516666526ebeddb7ed9dec57e6657cb07da6939b3c1dd6b83f08a329ee SHA512 2b35f780888f21600230ed29b4e7d1f3b06981fb5f899f267a895d0d8a3aa3b85c915b3a262bf2864989202d0130fb7f79df76c1c856fdf7e97170b5a7ced9af
 EBUILD breeze-icons-rcc-5.64.0.ebuild 677 BLAKE2B 49afcdfb678d33133047f48311429d199c91ca9dd0beb77709daf83bec6c0a1db4fd75daed6b0b56d44a62fcd992a592612852c5d1edee09abed0c894ae82b35 SHA512 f19bd27e313d6a3ddd91e03bc4acca02c999bc3060618e7d909a17f26dd709aad3620feb479705fdc14156dca05cba9857ec1bb8466bdfafb0b8b9a6a9d53aa8
-EBUILD breeze-icons-rcc-5.66.0.ebuild 687 BLAKE2B 9f5021261e5b38bc2ea377c4c52ed00f1267a014df7cf18511824fc8926afc215fd69967dbfdb43b231a612d73e8395a829998c07fb2e2e3b9af159e6084e165 SHA512 e93b399dfcee1f83c11f2f5871fc0814993a345cd4e2fe0ba67d85df378778afa2844d7a02e8a0ae4fff3664ac77688451c1c606cc0de81bd972e9585e5e61a5
+EBUILD breeze-icons-rcc-5.67.0.ebuild 687 BLAKE2B 9f5021261e5b38bc2ea377c4c52ed00f1267a014df7cf18511824fc8926afc215fd69967dbfdb43b231a612d73e8395a829998c07fb2e2e3b9af159e6084e165 SHA512 e93b399dfcee1f83c11f2f5871fc0814993a345cd4e2fe0ba67d85df378778afa2844d7a02e8a0ae4fff3664ac77688451c1c606cc0de81bd972e9585e5e61a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.66.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.67.0.ebuild
index 6a7e3a576974..6a7e3a576974 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.66.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.67.0.ebuild
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index 4c1c5da64acf..765a2c06ebc0 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.64.0.tar.xz 2716900 BLAKE2B f12cfb9b505b010c0fb1cbba53f2f19a5eb5537f1393e1cb8ac6278763ae8c7dd2e67b7a888f924a315aa556aa2b58cd107f25fbda33765df78ffb3e071882bc SHA512 aa463370c330b4ff5f0b8de5f623de8b04de61bfc595e5bc227c1c323d264ab0b43dfa73b99ed356bef36b71ece9bac255f2bb1a39a8717f936dea8032645b2e
-DIST breeze-icons-5.66.0.tar.xz 2739092 BLAKE2B 4d1dacbff61bb53f7eacc2940d55bbe27ee60240205079c6599d7c7d54095b66e15e88c87e0d56f356df210761bd73e284c404d9e757540f97796d6ff8d43325 SHA512 3113dafe338b18a234b8b520d768b8d3e9d5773757f19abe2edda03353e44803cbaff54a67176dcf4b69658d7741dddd6300e3c660980b6d0b52725d862d725f
+DIST breeze-icons-5.67.0.tar.xz 2731080 BLAKE2B 9e8333c17ffc31d2ebd0b7f1b08712125f6904182ced3588bf97232ce93c1f4a96a7a1516666526ebeddb7ed9dec57e6657cb07da6939b3c1dd6b83f08a329ee SHA512 2b35f780888f21600230ed29b4e7d1f3b06981fb5f899f267a895d0d8a3aa3b85c915b3a262bf2864989202d0130fb7f79df76c1c856fdf7e97170b5a7ced9af
 EBUILD breeze-icons-5.64.0.ebuild 620 BLAKE2B 2082ea88bd04174fa93ea02667309097e4955fec3dfd7ab90160a02dabef7b3e9e81bbdfe1648fa23a48cab0d4c3fbe5a45c531b4eb6b3bffd5a17d7cc3f881f SHA512 3d59a9159e37de48b50afa7176e71fa053c351753b875937bccf21caf6831a6ab50f263f3104b4da90f5b1dbb895e86caa4eb0624aaaad8189b401a7e30143cd
-EBUILD breeze-icons-5.66.0.ebuild 623 BLAKE2B 3121a4ec005ae392e55dab2af689dcf3d60806fd0e876f6638d7e755a6a0d559497385cef9d66084204b3608dac088372e151b5e97da6dbf2ce2e115ec0fa037 SHA512 9b0f0a3a0fa3ecfe70786eee0ffc2177d2ae665d757d81f0daed6dc0d453ddf644c714decaa8c913a395bf82bf970357c4139dce145bcd677c83b887a77b2d5d
+EBUILD breeze-icons-5.67.0.ebuild 623 BLAKE2B 3121a4ec005ae392e55dab2af689dcf3d60806fd0e876f6638d7e755a6a0d559497385cef9d66084204b3608dac088372e151b5e97da6dbf2ce2e115ec0fa037 SHA512 9b0f0a3a0fa3ecfe70786eee0ffc2177d2ae665d757d81f0daed6dc0d453ddf644c714decaa8c913a395bf82bf970357c4139dce145bcd677c83b887a77b2d5d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.66.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.67.0.ebuild
index 47b253140667..47b253140667 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.66.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.67.0.ebuild
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 5d029fe6a3da..d84e3cff1b56 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -2,7 +2,7 @@ AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed926
 AUX extra-cmake-modules-5.64.0-tests.patch 5542 BLAKE2B fd8e8762015fcd205039cbb8a6c5a175a6d115e4f52d6af93537e838ce728f3c6212390d5f64478570f9710ce0d9bdec0e68b23417233d8ae6d90803c682ab20 SHA512 71ef3d46b2d148ba06d446f8e589d8ed3b8b3e3ae47e26f90e4571e587955539aaa28154bbef21c0e070bbbaedea71fc3ccdf38c2417e2fd8868a89c1b52e595
 AUX extra-cmake-modules-5.65.0-disable-qmlplugindump.patch 2666 BLAKE2B a321b9881f643fee4b790ce47063b54722a17d98fcc7a17da4a84fcd412ae1dd5ed959767990ae5953e282fc3a8e9ecd4089aa056f0f366a937aa38bd27e153c SHA512 f43998ab4f9cb334d2a269e589aed9db08bdc8c91f2f5413c6e4ea9c5391068146cb7d9de1c7a0bffe61489075231caee535d1e669d95df3bce1fac6aa4155c9
 DIST extra-cmake-modules-5.64.0.tar.xz 339444 BLAKE2B 361689b58ee5b681afd0ff1dfe4ec8fa96f8ba4b1b559be1045c4551e4f874086130fd90a87327b967c9ec48cf532356e675954ceff5fd51f258dd26907110f9 SHA512 81649a1fbe148eab56ff9147b412303112376343c84767139908b9f39e77debcbbf6b8fe2c1edf3151d3556ab9a826eef9b893cc1ef679d0b5cb37096f23fa44
-DIST extra-cmake-modules-5.66.0.tar.xz 340388 BLAKE2B 0d53ef47bf07aa2546b422b2b1b9f3bd96ffa275e6062fa23656f8a268dfed998eed09e39c1d360e7f6b802007b09825ffa8ded00761a0e75186c18c1f93aec5 SHA512 d0fdf658b636ad7b0cc70d87cb695010969d51f83c62a3b59ffc880c4b2db179170124e4baf185b6261801bad6207c4776536581c5152aeb174784af3b5236a4
+DIST extra-cmake-modules-5.67.0.tar.xz 339812 BLAKE2B 9fa1c93e512341f6ae91dd2bb7126bdc55b5d1df6390a54f1fa7506f1f903a005103d1259f7962e94c0f2e27bf82d8d4c5320053b197c18305d32ba870ced67e SHA512 1a0e185ea4eac16d57c34f140a4709c0bcd9baaa7e0727ab5c1bfee88fe08efe23dc3634d8f73abade98ad6f2dbf529563e0778f0fbeddaa50b435e12b674229
 EBUILD extra-cmake-modules-5.64.0.ebuild 1560 BLAKE2B 99b5bb4f89e149907fca430c4a2257da530e0f012ac7e39c112b69166d7c73aa3243d19a369b86560753851828a46978a0bbe591a1ec3f84dd9890df913b5152 SHA512 43e2cba69f2a4ff4307e54ae898de3f9c0098c1da09a81d9b2cea7a335c53e93d826781e3286213d179f253b476d8ff4b14c811a225afa92b94029a506e41ac3
-EBUILD extra-cmake-modules-5.66.0.ebuild 1591 BLAKE2B 5fb1bfdc8c76fa295afe8d2d9f7dd0af8a3584088a67f05dc63bacea4bf569e4af5a7122c9f7e95cfa2b1882fa9d37e8e191a13610a2911f346fc76d6e711f31 SHA512 aafda711a3f6487645798487a924e989df742829f9c72163634695aac178e2fd3918837a94981d689aebde63b4aad88731111dbbf03456c6c97889572dbefb1d
+EBUILD extra-cmake-modules-5.67.0.ebuild 1591 BLAKE2B 5fb1bfdc8c76fa295afe8d2d9f7dd0af8a3584088a67f05dc63bacea4bf569e4af5a7122c9f7e95cfa2b1882fa9d37e8e191a13610a2911f346fc76d6e711f31 SHA512 aafda711a3f6487645798487a924e989df742829f9c72163634695aac178e2fd3918837a94981d689aebde63b4aad88731111dbbf03456c6c97889572dbefb1d
 MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.66.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild
index 35862e15da7c..35862e15da7c 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.66.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index d912c48a96a6..13ae2eda3c90 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,6 +1,6 @@
 AUX frameworkintegration-5.66.0-unused-dep.patch 744 BLAKE2B 23364d0657d165151d12730157cc085fd90e146bfdbc2a98cd66eb776f792a8366e835deca5e6b841034a2215283ccf0857c96373f5170435c41d96313a462a7 SHA512 e9e060aeb3e0f65c28f90119847873d0d263312e7cd06774f4f20719578f04c8c80cb044f44b27b138de477fa762ab60d6a004c7540940d9ac5eb9e69762d396
 DIST frameworkintegration-5.64.0.tar.xz 1754716 BLAKE2B a9812b62c8973b5286b06388a5a9bb2f65bed49684b72c56696ab8e5ea7a03b24ba9d8b58b210cfbd06d46a695106d81f22b5fbd6440bc68dc639c5385dbce62 SHA512 7288578fcec9c1fe1d768692380acff00267513e0092361b0c0739e669a86ffde1df96f20e0ce91685df440ae7fcd7786d96fc18c1faa00e5e82d7fc9b8d60df
-DIST frameworkintegration-5.66.0.tar.xz 1753696 BLAKE2B e365fac7c3ea7e6583edc94fcfe68cdc3f020e887c1383cba0792a19f4e5aebd29098071fd10b8cb70efd322ce5923159e1126ef7dae74521a8ec505fc5af77a SHA512 d22cc4a2f5552705c0b863d2b73dfffd70a0020bf31dcf17874ac5a8c05de8bbbc88c7e12d455d1a98bc64916cb174a7fdb9677833cb5404c0b7c8f1c9bea2f2
+DIST frameworkintegration-5.67.0.tar.xz 1753624 BLAKE2B cf70bed5acf65240568aafe7b025db339550abc0226d1f560d24636e4368955028148d9dbdf47afbe2e0f98850c9112aaf7ffc02966ffb48e27814adfc7cb65c SHA512 47ec7ebc2b1067074620a5a9e39f5aa664595569fc2d4a1c591e34e9ac52502fffd51f7707a522bf4028f50064f82dfafe2c6b46faa3b0f212b766e6f2ac2186
 EBUILD frameworkintegration-5.64.0.ebuild 1287 BLAKE2B 8d1d3a1103da52c9d8e8d4e503651e0d82ad338886ee096c68e1965ec3f2ad26b17372b1fd8b20f461ff8327696fc6689c7b3ed405d17e6f9572e31efe4432dd SHA512 822d0ec74e2bd6dbebc5974353648b17f48f8516211b4f63c764ef931286610591a239092ac3dc31c53f614014718567493758127325235f777cf55324d2ec24
-EBUILD frameworkintegration-5.66.0-r1.ebuild 1187 BLAKE2B 5dddf8298260916984fee1a46deccf5f9aff58aa4098945966a7bcb6f2f24ce23a99146901ec8c6bd410cf0207ba372607c38c8e38028fc82894e798f914a93e SHA512 4470c77a2e34e7a0b80c54e08cb28af74992a1c274a37053088602c61acd9a17932e9943a1babbc8835c19c0a10382f909cc468aaf38d6d1b1ceaf237be2318b
+EBUILD frameworkintegration-5.67.0.ebuild 1138 BLAKE2B 7651f1dd6bf7bcf7a92f8ace738388ab47df61e0645fb17d19b3fc93fc879ce2408341d835dec96d38632c2e434596359097da7dc8714f440950ac4cdd27c349 SHA512 8bd3791c5e75a8412b24618852f9b0226d20bcda8f05f1e1d4cffc9a4da9b1b341e3d02fa0fdfda5745c33c6928ed14f6a1382ec512daf3ead49e4334d0c9ebf
 MISC metadata.xml 339 BLAKE2B 9adff6fc4d48a8e94cd7701e7a3b956963b25af1538793345846c70186d7536597bcd9a1cac92b292220de5d6c2562864b64556c36cd579041b567d970db6828 SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.66.0-r1.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.66.0-r1.ebuild
deleted file mode 100644
index 16aae189c516..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.66.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="appstream"
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/knewstuff-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	appstream? (
-		app-admin/packagekit-qt
-		dev-libs/appstream[qt5]
-	)
-"
-DEPEND="${RDEPEND}
-	=kde-frameworks/kpackage-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package appstream packagekitqt5)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.67.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.67.0.ebuild
new file mode 100644
index 000000000000..b142ab4aa42e
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.67.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework for integrating Qt applications with KDE Plasma workspaces"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream"
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
+RDEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/knewstuff-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	appstream? (
+		app-admin/packagekit-qt
+		dev-libs/appstream[qt5]
+	)
+"
+DEPEND="${RDEPEND}
+	=kde-frameworks/kpackage-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package appstream packagekitqt5)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kactivities-stats/Manifest b/kde-frameworks/kactivities-stats/Manifest
index 7020c52e1630..41fab22e3134 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-stats-5.64.0.tar.xz 63020 BLAKE2B ae99e6473d4491520ef8eb748f9a06a7da3300e051d0eb642956920986979460dfc8afebdc01e0a6efd4a8fc554d6fb6ab2f535cc0fa0bae876fe1a6f95cb1a9 SHA512 d94698fc755780c49bf9d4521afd1d7ef75a3393965946a9868f6b429d7e6fed5bd808591f9d8037c2d6a8dc6a7f67ed0e823681114b9bb33fe3f4838da14cd1
-DIST kactivities-stats-5.66.0.tar.xz 63196 BLAKE2B 71f419122f24ee0877266b0d8096641d5c648fdf903ecc97547c0b4d08d48deade4d3928ac44e703e388e27dbd35c9cd21b876114c69ceb0b8c1a6a8a02b0bca SHA512 649dbabbad4b6e50363c938f4bf8a881b1b7476c67c638884ee44d879d9ccbdf7e998c59233069bb44fcebcac166750efc8805288dff9b5ec7af808e0dea22b6
+DIST kactivities-stats-5.67.0.tar.xz 63124 BLAKE2B 4645d4bdd5e9cc4b17105f3dee61993441aee849ff31392f3e53db4a0ba1685d1d28fdaa69f2a1882869c46ac0ad7d7a5641ac0a801d7846289fa63a9a66fe2f SHA512 ccd66e179efb5ecc4569ac7fb6897793b6b172cc2b6a458d8610fc1fb35fc1a817a56de8e27b290beb2f941847a0da568c9bf213029cb0dd0a4f0fa5d03c9c55
 EBUILD kactivities-stats-5.64.0.ebuild 509 BLAKE2B ec05da3bf7a9eaccaa43ce58ab656b6842eb07a16877e48b3d6fcd0147531967f462f23fb9dc13222ca7e488b380c8cd8326effaf41a02591ef916b4591fbf5a SHA512 e29871d57adeb52f6c7337119faf954709039406303a15831e642ea16b5386d0b29f470c0478311618fe50b8bbdd4b65d5149d818f85800a374632efbcf8c41e
-EBUILD kactivities-stats-5.66.0.ebuild 519 BLAKE2B 19427eadd321a0e410b6614854e96cdd0819bbbfaa8f1fa676ff99b6ea14175b8e263c8fe05530b6eb281a1bd9322a86963208a75047ccc1d375529f2ee69b36 SHA512 e90ed9a78a89d36b05eeaac23c68bb820e9dca009833ce5d7e4afa9e029f30994f1d5b38e7bde34cf65c6f09f9d632587716df0e0a4cf2baea7947a754e7956f
+EBUILD kactivities-stats-5.67.0.ebuild 519 BLAKE2B 19427eadd321a0e410b6614854e96cdd0819bbbfaa8f1fa676ff99b6ea14175b8e263c8fe05530b6eb281a1bd9322a86963208a75047ccc1d375529f2ee69b36 SHA512 e90ed9a78a89d36b05eeaac23c68bb820e9dca009833ce5d7e4afa9e029f30994f1d5b38e7bde34cf65c6f09f9d632587716df0e0a4cf2baea7947a754e7956f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.66.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.67.0.ebuild
index b09474346a8b..b09474346a8b 100644
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.66.0.ebuild
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.67.0.ebuild
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 3acbad723424..060e6a94ab1a 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-5.64.0.tar.xz 61556 BLAKE2B 617eea15f83c4d55122964f6adcc1d9e4fe6b00ab772cb8e7488a4ee7e030816bd08d734b45e80ddbf99678c4ebc01028d196fb85c55bec0f83a787f6d05bbe1 SHA512 283f2f3f45acfbb54e1b7b592fb6e61ac03ad711dd72d76fe5681bfc88f283e92f7e817ff10014604564f7a5c6c888ed9e745b18c6b9b66359bb29d7f5fbf6c3
-DIST kactivities-5.66.0.tar.xz 61552 BLAKE2B 57833ae0937d2086d1b9f59707a632661a90db102b90ce2b1586972ff71f8aa35e434c23dd267f88913c4888e027d528033ab3a73b7b98f00146120472eabf8b SHA512 5acd604b0eb7bc465243cba77adc549e77749801a218bf497ca29b8bf5e948348cf6d35aaaa8101e37fd3bb989718e5a1216db2648d0036a76eed9b311ff7f23
+DIST kactivities-5.67.0.tar.xz 61204 BLAKE2B 6d9d25126317e763da4fa572ed0495fa1d8f1b5c6a675892753278d55479e0db55e1aa288bc4bb289488199f0857fe72cc206b79edf33e7e6e3676af568227d5 SHA512 d66413643b04bf10941db0fb61e106f0153eb23afdb7cb33814d4000e64ce5973c0f2b9098fe89d95168f4058dcfa9d2f6031d319692fd3aba46b671da8a4df7
 EBUILD kactivities-5.64.0.ebuild 672 BLAKE2B 979fde0e770eb13dc99830a845f254314ba6eee62e115341cc7ff1cdedc063c080418bdae406ea3720a6083e4f46b27b7ef20a4ec783d0ff333a8ccff18ac8a3 SHA512 0330e165b8a13297bad3e77f6b6b4b1956d22daf1a7558c9cfcf69af2f0f6a9438d1782575d8b4de13d73e3bd103599ffb78b920953bc3c453b8f8710b0799b4
-EBUILD kactivities-5.66.0.ebuild 682 BLAKE2B 2f72635d2097b9c04a80e7e9b48f9d6c96428c756bb8a819f3275993191e2f7c92c36c4fb02ce5d0d1f74063b0cebfb8b3b9e5b97e9e209bb9c58b8506c15ed8 SHA512 8590743fa95f5b61ccb39dbe39f05020594171da79778c238731d34ffef6b769d6b05c43dd3932778c0642a429cfcd15c4c9f064d7c726f7595257f5332709d9
+EBUILD kactivities-5.67.0.ebuild 682 BLAKE2B 2f72635d2097b9c04a80e7e9b48f9d6c96428c756bb8a819f3275993191e2f7c92c36c4fb02ce5d0d1f74063b0cebfb8b3b9e5b97e9e209bb9c58b8506c15ed8 SHA512 8590743fa95f5b61ccb39dbe39f05020594171da79778c238731d34ffef6b769d6b05c43dd3932778c0642a429cfcd15c4c9f064d7c726f7595257f5332709d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.66.0.ebuild b/kde-frameworks/kactivities/kactivities-5.67.0.ebuild
index fc26ae5d1f7d..fc26ae5d1f7d 100644
--- a/kde-frameworks/kactivities/kactivities-5.66.0.ebuild
+++ b/kde-frameworks/kactivities/kactivities-5.67.0.ebuild
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 84c879523d5a..e0964b2895b1 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.64.0.tar.xz 397092 BLAKE2B 6dc26a911e45476c69385066e7c501db0e2f1236f4ea1e589e822b7bb515a8908f02e456b482bd4b1ddd5f2dbf7ddec902327f49749a7c71e266b10a35e289e5 SHA512 b32cc42e75cfff6f137970af2aff746016e470229694c5e6c095ef50c725760ad24a6fd3b4ba08af885c5609e70f8f7440b8923d229fc77bbc492498abc7e17e
-DIST kapidox-5.66.0.tar.xz 397472 BLAKE2B 0106a8bd88d828e46c9d0c8c7bbb86bf00d639aacbea9e782f0bb19f0c3e4ab241b5051863fe4a898b974ca344017085798da9ff15e9fe3126d8d55487b06267 SHA512 e6c75780ca4de1c96f9b0874aec00d338e4f8d5d6825d5699b296077bc029419ccc3f0b757a76bb22612f47f377df9fb7f089d464d049b605faa3c917b838238
-EBUILD kapidox-5.64.0.ebuild 549 BLAKE2B 7c47de52f8caca99ebdda350aaaf67ebe6a5c9c669111e526e6c7c05881def17cf54f7b79b3653afb25663b6903bf0b64fa88f8bee2ee88234f577658409ca14 SHA512 e3829f21bf5d489d54fe725b96cfdb138831685ded9f431861b0612673cc8b60cdcb457b4109d6673dc36da0936faa118e4bb5f166ff3b657d9aaceb88bb9dfe
-EBUILD kapidox-5.66.0.ebuild 561 BLAKE2B 6f4960780b1c80aca0a4bf7a116495afe42e1d0a71ef3b18efb7ffc1ff5e8626cb3f610bd106483d7f58e273a75dfd3b7351516b138053eb259ed6fe22f2d1f7 SHA512 421d4fedbea22bf324634747b754336700fd8b61ecce8a7fd5ae2899b10a0ad84c2a34cdb8f62b0ad2c84fcc6ee3311cfe49fce1f91b6758f93474375800aa2b
+DIST kapidox-5.67.0.tar.xz 396744 BLAKE2B ab7fe4609199182dff558f339010ef13ac8ce927fc2c57bf84734b39b2a5253dc1432eed2ab5affd9d1b9648f25919fa112786f8e4b2b5b8cadc9112ecdf41f6 SHA512 2ca39fb6413b4c6fa8026f67b3e46ccfd65043c07d6a3ac678bc0ad6b4855a2e370fe51105d4d07bfe9ca6c10936650848ef2d2d5e91c5445d8cf575fcc84121
+EBUILD kapidox-5.64.0-r1.ebuild 599 BLAKE2B 22b0898dfb45490b4bdd833f4ae5926964ec5d4c37f9d61471a73a05e65956badca10536ff6d358598fa9401f337bb1694fe0c78146caf45f195e9e1652883d0 SHA512 30bb43314ccf3c1f1c43412ca1c3421e3fd1e38cfe6dcb99f58171cb8e0ba45c83933aca43773723a881c089982de47793404ddab3bd94b4b51afb9e6e4fe9a2
+EBUILD kapidox-5.67.0-r1.ebuild 611 BLAKE2B 72836014c7edc93a86f3b0dacd0dec2893ecf4abf0490fb51526a699608d20b51ef8d574d6553c80786d029180a1903a1a6082adff77d3995d5f9cf27b3e7091 SHA512 a35c6e1d46958cbb82bef3233071e6302e9902a74c9c3be681bf26804ac02e98dbada0ded72464f0c840db8c4a54c20cde171c2110d16e69dc7c591ee1c3ab39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.64.0-r1.ebuild b/kde-frameworks/kapidox/kapidox-5.64.0-r1.ebuild
new file mode 100644
index 000000000000..2dcd1c3aac1b
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.64.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python3_{6,7} )
+inherit cmake kde.org distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="amd64 ~arm arm64 x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
+	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
diff --git a/kde-frameworks/kapidox/kapidox-5.64.0.ebuild b/kde-frameworks/kapidox/kapidox-5.64.0.ebuild
deleted file mode 100644
index b3690978c3c9..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.64.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL="true"
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake kde.org distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	media-gfx/graphviz[python,${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/kde-frameworks/kapidox/kapidox-5.66.0.ebuild b/kde-frameworks/kapidox/kapidox-5.66.0.ebuild
deleted file mode 100644
index 7622cbf779bf..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.66.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_SINGLE_IMPL="true"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake kde.org distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	media-gfx/graphviz[python,${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/kde-frameworks/kapidox/kapidox-5.67.0-r1.ebuild b/kde-frameworks/kapidox/kapidox-5.67.0-r1.ebuild
new file mode 100644
index 000000000000..33494afcf510
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.67.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake kde.org distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-doc/doxygen
+	$(python_gen_cond_dep '
+		dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
+	media-gfx/graphviz[python,${PYTHON_SINGLE_USEDEP}]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index bfca91413eed..0726b7bba37c 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
 DIST karchive-5.64.0.tar.xz 458552 BLAKE2B 4a98e15434f3e2530d23cf35c74f8e5b2d3b8f0b321cf388b9ae4e3471a24c30b5b799cab53f4189edca0f8da385be81a010b5743c1f58163f5643d6824f283e SHA512 012f30bb62ea224f416b65d823bdedef20838f8c9bfe1cdda814e2b8c320a47bc93ac46759b5f8df10fbde026873a7024213aba1eb1aa568dc7e545fa5463cd6
-DIST karchive-5.66.0.tar.xz 459012 BLAKE2B 6f3dd84592133163641725e8efa0347db5b064fa09601863c5ad6695eb252c6b53db87a8b5b55b08cc0d07c32b103a26c8c9bc447854830db8e7c1a33d38bf93 SHA512 8bcb01f4a897a82014a15fd5f3a387e3d8f0cbcf16e1116cc6559ef939f7d482f01ed7cdd2c0e5bd5aecebe77bfbd0a9c8effade87c43cb2b81ffed2bd1094e1
+DIST karchive-5.67.0.tar.xz 459424 BLAKE2B 61a864cc05671a13ab49c02c33ecf931ea0e9eb93446be6a26df7acc2c1b4738da1d47860ac111d7105e7a06932cb851b52cca709ee3c1db17ba1d36b594084c SHA512 e8a7695bebc8e9ab9596e10ad0ca9393942e4d3b198929481e59ededde7651859e8944586ddd00036e37c15a8501e5b067eff31562fb2384ab1c3ff6eb27d28e
 EBUILD karchive-5.64.0.ebuild 558 BLAKE2B 12874ec3145dca175a45f3b2894352861f8ec6554cf3661d54ef3bd37458f91e94286bd90a4f18c71990a63e3d1b155da8577654c09300cb55af32c65282c9af SHA512 5caf8908af68974dc82ebe6e79c32a619e8a1890225dc17707eba6394c425d4a62fb70576dcc2fe2069c1498c70a2a4a6cbd56c88a14bcc1718055f689b4b619
-EBUILD karchive-5.66.0.ebuild 561 BLAKE2B 58c15627ff36c45e49ad999af1c091575e24cf43235414965e7dbb6f5e6a0d76791ba1af06507ca2d656b48e205a5a60adc635f8cf9d77ea404625d79176f1c8 SHA512 b2749d9f1e7f564789677a3f14cf76f38ecfaf8f9455984def22ce4000818963c12f0b15b6b847aa5f29ef815c62229c82ebca9c98ad347688251a105bce601f
+EBUILD karchive-5.67.0.ebuild 561 BLAKE2B 58c15627ff36c45e49ad999af1c091575e24cf43235414965e7dbb6f5e6a0d76791ba1af06507ca2d656b48e205a5a60adc635f8cf9d77ea404625d79176f1c8 SHA512 b2749d9f1e7f564789677a3f14cf76f38ecfaf8f9455984def22ce4000818963c12f0b15b6b847aa5f29ef815c62229c82ebca9c98ad347688251a105bce601f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.66.0.ebuild b/kde-frameworks/karchive/karchive-5.67.0.ebuild
index 670e0664b959..670e0664b959 100644
--- a/kde-frameworks/karchive/karchive-5.66.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.67.0.ebuild
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 2ad6867fcaa9..c47ae27df846 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
 DIST kauth-5.64.0.tar.xz 86028 BLAKE2B f325de80edee5afaba9733732baec53241de03d3404d6ce3f5941daa683a6edfca08cfe20172364d88e15484ecef36c145306b7603259ae30bb0b422c9b5f517 SHA512 0dfa8e62930ad7ae3b1c816428a09dc6950479e3579bc143fb7de22d55554c06f6e2501bd5bab48ca08d202097d35993f35c6877f013ad2d1f00b291b7e7e6a5
-DIST kauth-5.66.0.tar.xz 85972 BLAKE2B cc66314e99d9a923288f6592903212ddefa5127db37615247ec5d8e6abc77ac640c9b591ac014763221a6eaea9f7bd796f5e33bfb9e00d3cc4d621c795ce400e SHA512 dbc05ace539ba19cb4ccb0da995ea7049fc7702d2405f0d71c71423b22309df6194457a625525dcf47f504856d80b640276e60fce9369c8efadc1bb5123ca3d2
+DIST kauth-5.67.0.tar.xz 86072 BLAKE2B 2fb9e7dcb370e0902c51b087d300e0c07a703802ae429e39908628222d9403528c3ef69fe6a007046a688fa089234f71635f15d3eb9a42797038af053f675d32 SHA512 f4ed8ffd339c5c7ce3cd974cbdee3ce4a4b766062bf3ad2845596317ea8bc27460767ca48c8a7262cc5778a130d957221612a4b0329ea735ca2b175e209669a5
 EBUILD kauth-5.64.0.ebuild 897 BLAKE2B e1175e67842138bf5d97d69c02c92136945495b28299dd8d9cdb688d92e5bc2d658e11ad4830f480a3d881930238432a4c20ea078f39829de89824fa457db353 SHA512 1d2494273d33174af53b822411b3e5145fdddd91c1e5290365c5643096115df94687c7ed1ee9a7b129cb4cbb65da70bcd3f495b69f6088b5a7303f5c0109e061
-EBUILD kauth-5.66.0.ebuild 907 BLAKE2B 05e494b112f4bbb9a298b88244dfa01c077e1831f134359af7cc24b7e7ed262ca81b6c9e1a7cba436cbc20f71758ef51f32676e0cbffb410a1707687ed9608f8 SHA512 6226d5407e9ebd9a7cbf2fbab7f5d8789a6b4def9c7906c52afcc38cb02b3eacc9f908c4fd2618b48380fcb00edf8b73de1e38adc3cf2a6e25e74eced73b16f1
+EBUILD kauth-5.67.0.ebuild 907 BLAKE2B 05e494b112f4bbb9a298b88244dfa01c077e1831f134359af7cc24b7e7ed262ca81b6c9e1a7cba436cbc20f71758ef51f32676e0cbffb410a1707687ed9608f8 SHA512 6226d5407e9ebd9a7cbf2fbab7f5d8789a6b4def9c7906c52afcc38cb02b3eacc9f908c4fd2618b48380fcb00edf8b73de1e38adc3cf2a6e25e74eced73b16f1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.66.0.ebuild b/kde-frameworks/kauth/kauth-5.67.0.ebuild
index c3991afad63d..c3991afad63d 100644
--- a/kde-frameworks/kauth/kauth-5.66.0.ebuild
+++ b/kde-frameworks/kauth/kauth-5.67.0.ebuild
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 24bdafb24b0c..8968dea8b374 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST kbookmarks-5.64.0.tar.xz 120112 BLAKE2B abd35194939e0ff4cd1c07d3e4641b66f3276989cef4e54167e4edbb92bd95bf99dc13d3d3091caf724f8335221228789d4ed4c89c91c6f6c6a1f24353aaac16 SHA512 66269ead2aaa33e7311c3c7384973050fb8b75ebec17d1f36a3f07216b5bd82d3b92ffe4bfbf306f479784a29b583ce1247a78d9b33637adb3cb95994b7e424f
-DIST kbookmarks-5.66.0.tar.xz 120588 BLAKE2B 5884b597209d751bbc8de421270cb41131ee922ec67eb0a74613a44b39efdb3e67035fbe7b6847c66c9a26a1d1bf4f25cf8886566fdc55adb10e52640ed654f0 SHA512 89dbe160e82b19fe12da531f748abda7144f466cac83c5e9ba2a5e297c85bb8e3a7e9a9d027fd900cf5a5647702616b76ea6e94646ea953711b748cfe3c6bf9c
+DIST kbookmarks-5.67.0.tar.xz 120776 BLAKE2B 67cc22431d9ef75d6a0c7239a39cc40e9db2d941185ffdd96f0085c0f419569885cee8efe65f21214fb6188ff96bc52d26e0d2fe4b1b18fb9ba99920aa3d74d7 SHA512 3ab71f193e3acf2bd0074d3e20e38c9cc3ee9aec207d59b06cb8f7d160b40337d5473f29afd1fec17f0af0d82abd8b31821f46991734ae8906c5fd6aa926e066
 EBUILD kbookmarks-5.64.0.ebuild 808 BLAKE2B 7834a5793dedde9c3940a1e610622421e1095818b6ea39360dcdab5e720511733beca32b5808aa40af4b653cf8143d66bc84670d5ca43e36fe202b9366047e4d SHA512 30124fcf6e6d86000c04daec1f00ba81681d3899b149b8613fed85228535625802431e25d4b9df9641861d23ce3d0bc4e5f1c9e9b08123a22d9b661a77415821
-EBUILD kbookmarks-5.66.0.ebuild 819 BLAKE2B 2e90327e63dd218733f881b022bbe6dc7937ac56a0cb7f399cf48f6e7e55eae057b7d544d2d0c74be89bf6d1da2685c9386f3d612c3337405c8b91c359f4c83f SHA512 f89a5867e5b262da93ad39350b3b0ffb110ba322cc70a06313bbde72755ec257cc9291fd306f6be163800b6ccb5ba268866fcb0bfad817a35a05ec02c22ed123
+EBUILD kbookmarks-5.67.0.ebuild 819 BLAKE2B 2e90327e63dd218733f881b022bbe6dc7937ac56a0cb7f399cf48f6e7e55eae057b7d544d2d0c74be89bf6d1da2685c9386f3d612c3337405c8b91c359f4c83f SHA512 f89a5867e5b262da93ad39350b3b0ffb110ba322cc70a06313bbde72755ec257cc9291fd306f6be163800b6ccb5ba268866fcb0bfad817a35a05ec02c22ed123
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.66.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.67.0.ebuild
index 7e87675a28d2..7e87675a28d2 100644
--- a/kde-frameworks/kbookmarks/kbookmarks-5.66.0.ebuild
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.67.0.ebuild
diff --git a/kde-frameworks/kcalendarcore/Manifest b/kde-frameworks/kcalendarcore/Manifest
index 95df17030366..45dca96a5d17 100644
--- a/kde-frameworks/kcalendarcore/Manifest
+++ b/kde-frameworks/kcalendarcore/Manifest
@@ -1,6 +1,6 @@
 AUX kcalendarcore-5.64.0-fix-RRULE-generation-for-timezones.patch 24027 BLAKE2B 69248f2b712dcc206538da6d3d800035abaad6d886b2eeaa3161faa48be1a2fdf90bec68992c5899b4aa1e2a5ec669a8d13c6d502fb4ee354d3308470ce0fae1 SHA512 e67463a5a2b4d0cf1545a8248fdcec9e277caeb113b105aaeaa37e349fe37d3f94cad1f0317578161e9479b1ffe391c1e53bf044f080936a3d7ea8d1bc48f6bd
 DIST kcalendarcore-5.64.0.tar.xz 249868 BLAKE2B 1ce35ce485e52deaafe2a500295c1623aae7cca8d499e7f16890bfbc67f2f89f9b46518fdcadcf94a06b85be7ea6184de0bdac261324b483726d2cac0e6d6626 SHA512 562f0d35170389002b9a5e5b59fc90c276f4d54f1abc3e8558a6c22aadbd3e971a7eadb90fe793ce088bc0834f2d20c1396085ce2e3c8bb64fddb77b06c24231
-DIST kcalendarcore-5.66.0.tar.xz 249656 BLAKE2B 9100a93986a0f2611662a23adec06e0b207202b6d0b64274d050550b4124d6ea3bdd90878809fa624a83f1d4f60c9e706be3d1d9e2db9fc37682e8691040c2a2 SHA512 155b229c9903f8f72fc54950810e6efbd3fc81a9e546b747170ef9125115617db248a4936206671b4e7aa2337a95791f43f8532762e761f6ad22d4e2e73d45e2
+DIST kcalendarcore-5.67.0.tar.xz 248740 BLAKE2B f23376eb85b309724a45d259ebbb8631d495a68718ca17e3c61a8c0e7a06380d71dcf7270481fc0a96e8782d59e9c049056a8dcd88d331cd4aa6c4b17adc5ff5 SHA512 6c5b10f80b3e2895719617d3de463fbe671ae7dd84640616a13d7c04e45d53792c5629862fe784c949bf04b0e6cf5c93a7bb87651afa4c22d488cfdbd3462f46
 EBUILD kcalendarcore-5.64.0-r1.ebuild 591 BLAKE2B afefe2569441b869ea46e95e358b4eb4a7d15241b872d5eb7bae1fca9d958a7b70238e685d522ccd62b0ea191aa100a2f798d3aca1a1b8a68cc4192e5e448369 SHA512 62f26bba66e48d7ab19d8f01b8561842ba280da5f5a3627dcd840a17a61fad36b51a74613699221a175e4ea4b7cadb58a4d522159f04850b73838dba9553f15a
-EBUILD kcalendarcore-5.66.0.ebuild 514 BLAKE2B 38cc08f4488eb80fee146b1c1ce4248c083d9c83810b9cdbc7a5f1c31514e4f0cde28fc49d63b3565b2a5544c624f3d73a4ba7c15548adf612e76e5af15c2c1f SHA512 6215c5c044d6c23bb246a82b2276232954f246e28c02c9975b27e3121d649ecbc8421cc0dde29c7a0b31d7d3745cf9fcfed9bdc09bf8941e96c51e0599e2e1b6
+EBUILD kcalendarcore-5.67.0.ebuild 514 BLAKE2B 38cc08f4488eb80fee146b1c1ce4248c083d9c83810b9cdbc7a5f1c31514e4f0cde28fc49d63b3565b2a5544c624f3d73a4ba7c15548adf612e76e5af15c2c1f SHA512 6215c5c044d6c23bb246a82b2276232954f246e28c02c9975b27e3121d649ecbc8421cc0dde29c7a0b31d7d3745cf9fcfed9bdc09bf8941e96c51e0599e2e1b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcalendarcore/kcalendarcore-5.66.0.ebuild b/kde-frameworks/kcalendarcore/kcalendarcore-5.67.0.ebuild
index b38d5f3054bd..b38d5f3054bd 100644
--- a/kde-frameworks/kcalendarcore/kcalendarcore-5.66.0.ebuild
+++ b/kde-frameworks/kcalendarcore/kcalendarcore-5.67.0.ebuild
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 7ca5992d0ad1..c3792f87ab65 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcmutils-5.64.0.tar.xz 240248 BLAKE2B 3d7a7817c0e7eafc5cb9213f0571f1e343d79328455f40ffb245e36ba6d360e81b2b5d9179c0179396753ca07b49c9167704a078b517804007f0f7fb19a2d8f4 SHA512 c57df3500a2816a13e5e1e84e4ca4f62c429c013105a843c1b9ee3c6540d1a2a37f78174d1e36266f7ab027ce3073c238bf8441e001d00470fd829632839a05b
-DIST kcmutils-5.66.0.tar.xz 240000 BLAKE2B 7d96fd27cf134e8650f66d3c7cf28f81b4fd0faad38349b5067b55d4d644c0625541e7aef0e5429d57452df8279b2fa71c87965b8741da3539765fa22810cd71 SHA512 720cfc3adddd69b8006b971ab3a1a13d8de8abb2d4cbb49839860156405042f8cd20efde695fcdc3008a5a6c6e157f730fbc07dcc80e48a5c6911fb429084b55
+DIST kcmutils-5.67.0.tar.xz 239872 BLAKE2B 53ca73c4dd63acabeccae7b5bcda077f179f5f8d6acee751035285e21c2e1c100e2c222da88ee1c774c602e2671d3abf65fc06e28ee2f9446378de7f811c70e8 SHA512 f25605b5400fc8bdd9a7153ea368a41d254a08c3abf6cae9e0454d9406af4418b622519d72a41ebc5342a88fedc0ae128198036e97ba49b1ab10de5f2e6f919c
 EBUILD kcmutils-5.64.0.ebuild 903 BLAKE2B 225ded45cc13f7fa8fab2cf0e03a284aaa7f21c2467e39585797ac395ade5f9c7a5dd0de9e2c43d4f7114fea2604fe4d21ed2033d2f434f5e2876494ecdf9e85 SHA512 5c2149f9a360facb8517c52f170280c1d70b8ec3df67addae79d4666e751b56d9e4559dd144f8c9b138366da518f221a8f0aa878b59384d200d71b050d0018bc
-EBUILD kcmutils-5.66.0.ebuild 912 BLAKE2B 2ca2e8caf652f65466ccddb153e27fe27ca0832fe784e4bfd324962f6c56de6172891277e4c1839b33ee116ce195e629863bc5b42e2ec6a526da03171bb7cf86 SHA512 b4a997080808d663f540bf582e518793d10c132820014dfe45d44cc0411d25a8b8f9992a0d83fcbb04d1ffe3a09059736dc9f2171db3635bce71167721e403b6
+EBUILD kcmutils-5.67.0.ebuild 912 BLAKE2B 2ca2e8caf652f65466ccddb153e27fe27ca0832fe784e4bfd324962f6c56de6172891277e4c1839b33ee116ce195e629863bc5b42e2ec6a526da03171bb7cf86 SHA512 b4a997080808d663f540bf582e518793d10c132820014dfe45d44cc0411d25a8b8f9992a0d83fcbb04d1ffe3a09059736dc9f2171db3635bce71167721e403b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.66.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.67.0.ebuild
index ca24c4c0bdbe..ca24c4c0bdbe 100644
--- a/kde-frameworks/kcmutils/kcmutils-5.66.0.ebuild
+++ b/kde-frameworks/kcmutils/kcmutils-5.67.0.ebuild
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 59c19b5f2aa7..2c357380d995 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
 DIST kcodecs-5.64.0.tar.xz 220948 BLAKE2B 8c38d25dc8dd3ed9be56e17aed7115a840574a8ee9a08508cc2d0ae9e4bc387d302b0d752a841a4c434e69963418ee27ee3667a0a99116f1923b9a4d8660b768 SHA512 1bd239c53af28417322408c402b74f2bb4df43efbba64d5b4e2d3a08239caa68ed5ba3a815bccb533ec65c143154bdcc1ea50e74b3c3bde704bb6c6dbd0064b0
-DIST kcodecs-5.66.0.tar.xz 221244 BLAKE2B 5a15d867134b2df440722501c65a1270dd18b5aade067cc3f347f0df4575934a1d0cabe0298ff39a5295dcf9be70808a0f62ef0f3320faa0c9e82d8014bfaa10 SHA512 31e73549ad96a19f634a58e79fccb9c1be0b64e0e6eb89242bf890bcb0c51d445499534e795cafa1e09d5fa6ac8f5b607e346071941296613ae1fcfc2641ceee
+DIST kcodecs-5.67.0.tar.xz 221804 BLAKE2B 1fd5edb6f887f01aa9d30cc71a01f47f20641eb1268c1336f0bcb7a1ad3fc0d3661dbb46c383436f4010558b4ac07f9ab7dd5ba02693b2f0262d3fdaaf97d452 SHA512 aa5eca38cd3e155e28241c79ce1acf2e1267b539c286331fa137ef3b0e41d1f3748366736e44426c2c825eca76939abeaabe1ddf7c7158bfd3f6596f99d19ebe
 EBUILD kcodecs-5.64.0.ebuild 362 BLAKE2B db6cb6359a3b21bc65a73b5cace387e04c6bdd74d0c0d77784cdde5f355ff5c5cb1ca8d60bbe6e5701e97395f2973e8c064e7ace282b2136f8c9d956e3fc4c39 SHA512 f1ceca534debdad5a324a95786b1d07744652870f1b60547f5f7add53fe030070232204ff1e8e57c79740e29222ed222c52f1547d03ab9b9b81e2ce7b3fdc479
-EBUILD kcodecs-5.66.0.ebuild 372 BLAKE2B ebacfd9edf5cdf5ea81c2e63208a2ea148bb3d08255647df59c446511270990a5be1f3c9df5ebc2d271a965e04b29044d4296dbe333b6f032176e9f8166429ae SHA512 aaea6e27e210258253f794bd79df644d8138caf278ca6be37f5d53d015abab993b342fb0b188b1a9db841e2c08040290f0c927e6a84c0666537b1c0cb8ca3a27
+EBUILD kcodecs-5.67.0.ebuild 372 BLAKE2B ebacfd9edf5cdf5ea81c2e63208a2ea148bb3d08255647df59c446511270990a5be1f3c9df5ebc2d271a965e04b29044d4296dbe333b6f032176e9f8166429ae SHA512 aaea6e27e210258253f794bd79df644d8138caf278ca6be37f5d53d015abab993b342fb0b188b1a9db841e2c08040290f0c927e6a84c0666537b1c0cb8ca3a27
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.66.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.67.0.ebuild
index d0db08527082..d0db08527082 100644
--- a/kde-frameworks/kcodecs/kcodecs-5.66.0.ebuild
+++ b/kde-frameworks/kcodecs/kcodecs-5.67.0.ebuild
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index ae41d3088cb5..af0a2058ca8a 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
 DIST kcompletion-5.64.0.tar.xz 119888 BLAKE2B 73ca4589b574659c0396aa2e2615ea586353b91fcef6393056005dcb8a63e04d47f66e81a583caaafc7c96dee2e12626b3a029eeb9c0f46576901a20c479205b SHA512 59f84af0130ca8954f557068e91c86317d7df2b593071aed07790ba7012005394c8180e9408bc686ffd476c14edb4d6f4e3758f7cb9983a4db00237c1dbe578f
-DIST kcompletion-5.66.0.tar.xz 120448 BLAKE2B 4025daed5836313f25e1aee7ca24f39b7b395329b64f08e592459e3df3901749ad9a484f38a54598e434ae2c7482750e214243df161cfe8de47468615cd738d4 SHA512 8adec48d62f5e8051e7f3c5b52c55a52a7a66d041536649fd7424d51ae9ee8ed16e4eae9070e9258fdd7797761af3be3550a4fba1e04090d251f676c91f59136
+DIST kcompletion-5.67.0.tar.xz 120284 BLAKE2B 317942af5cea1bf7b7edf90b7bd7d968eca3e05f6c635e6cc3728a302a9540e41000d8f1c80770db1e51eed78d8d64d76d5ccee590666032d34d7e00b75aefe5 SHA512 beaa0162744a20f74721ff41c643269a24937a5d51275ce01e406724a11c0b74b46b517defa6cd4ad709f3004c11ca7ef8b1e2b2a6665966b2439fd476c9c9aa
 EBUILD kcompletion-5.64.0.ebuild 595 BLAKE2B c67ee9ae3abd45a4ed319194526ddb0a8471ead026b3dc534884feaadb89fcf867616cb7e17395c437764d057df38880349b04f05c25cfc8b8029474fe8ae023 SHA512 76b0683155d0573108e3aa180b6890913b0fea77cce31d6e24830efe13ef62a36b0986e9c458152bfd742171993c3097fdfce59eb7cbde44cd0cde56a1dd6e40
-EBUILD kcompletion-5.66.0.ebuild 605 BLAKE2B db38b7281059ef8673f1b6e30c492699ba855bd1d524b83d08544324ec83871fbaf0e16ff2d0b7ea85012be5e8bec9a7f895b5f21efed36677dcbb5fbe499e23 SHA512 875545d57682ad222a72f781006e34a4716ed82c9d64c810dfc90c867149a71fc6ce0f0c564c16b49f21034f373d72f3cb114e8071e4c7b7613be18c53c438a6
+EBUILD kcompletion-5.67.0.ebuild 605 BLAKE2B db38b7281059ef8673f1b6e30c492699ba855bd1d524b83d08544324ec83871fbaf0e16ff2d0b7ea85012be5e8bec9a7f895b5f21efed36677dcbb5fbe499e23 SHA512 875545d57682ad222a72f781006e34a4716ed82c9d64c810dfc90c867149a71fc6ce0f0c564c16b49f21034f373d72f3cb114e8071e4c7b7613be18c53c438a6
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kcompletion/kcompletion-5.66.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.67.0.ebuild
index e0e1e78217ce..e0e1e78217ce 100644
--- a/kde-frameworks/kcompletion/kcompletion-5.66.0.ebuild
+++ b/kde-frameworks/kcompletion/kcompletion-5.67.0.ebuild
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index a46c4e3dd1cf..02df123c996d 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
 DIST kconfig-5.64.0.tar.xz 242300 BLAKE2B 0784340620eb46c5ed5b4c54ee05c09322eead72edb78f5abce7317340081aefeb553027036a7e662e9dade4bf8f697f4d42ff9325693eb95fe832c5a8f7cd82 SHA512 14e2f58a095eba2ae7e96523602b3426734e8147b60cbfb25068b8be8e8442d3f70489252f21bd3f8367d3c6af146d274205161b104b7dc6f2b0890f48b0816d
-DIST kconfig-5.66.0.tar.xz 244236 BLAKE2B c3f1b8d40360717c2beace9339b03d2daa0466a3740b0183f55c752d671e4f4c040fd1560b0f00b3170a1b56adc12c13478966399268b3a017ef5cd24762d13e SHA512 bf809e1d1dcdfcc36f970f61d99b943db8583cc5c2b6c2b3d68e011d4503e5d22e659146e21b687acb8da890e002ab93b1deba79041f88d18e52f078ab138f74
+DIST kconfig-5.67.0.tar.xz 251292 BLAKE2B abbc4c3d6e85cbfe95eb8a639045c8d24468f7721c02f3406c898a5f217b7dda1c4f2409c1554fe48b0c5abf1c71e1bdd9dde9cd5193f630f970c4371a87afe1 SHA512 772fd17d86e23fa9f7516569b26cb94cb7d7dc55d10241b85addc38b62ae4294399cf1e0c4433f407e7516b76c59ec076fb9ba2b094c5d0dd7a02c6001efc726
 EBUILD kconfig-5.64.0.ebuild 710 BLAKE2B fe4c732d49e4652207e10e775d82d79f4c3f0479bc2983487137c122aeb84e0cce4796518d4b3e6e9cc1d0525c31d1387a21a4df89fe61ac4dd283e07c7a3a36 SHA512 f57f35aff5c8eb40f9615e8b6afed03ff23678ace94fb606965854be8f98c12b1bac5aa8bd9e35b3b149b1a0f839b5d4913e2460a56ee7b6a0bf9b8a4a7f03d9
-EBUILD kconfig-5.66.0.ebuild 720 BLAKE2B da97394f77c43cdabb02c0d4b95a28d56b04cf68068b7d0cc7ec9096d3d81ed89762a10782b50c45f3eb3c7f9445bc33cba70b9bacbde2b8f9e0ac1b35891440 SHA512 f3b603c35ab4bf8baece1d84da439abd25c5ec1fde340316d39fa759ef65c29c5562370aca6e5855e12d83557156e7c9cd7ee7e201e74eaf2fcb76ac1d80e5a3
+EBUILD kconfig-5.67.0.ebuild 720 BLAKE2B da97394f77c43cdabb02c0d4b95a28d56b04cf68068b7d0cc7ec9096d3d81ed89762a10782b50c45f3eb3c7f9445bc33cba70b9bacbde2b8f9e0ac1b35891440 SHA512 f3b603c35ab4bf8baece1d84da439abd25c5ec1fde340316d39fa759ef65c29c5562370aca6e5855e12d83557156e7c9cd7ee7e201e74eaf2fcb76ac1d80e5a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.66.0.ebuild b/kde-frameworks/kconfig/kconfig-5.67.0.ebuild
index 9247f6ac4c1a..9247f6ac4c1a 100644
--- a/kde-frameworks/kconfig/kconfig-5.66.0.ebuild
+++ b/kde-frameworks/kconfig/kconfig-5.67.0.ebuild
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 0a50a77a559f..7c5e16222813 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kconfigwidgets-5.64.0.tar.xz 378708 BLAKE2B ac187592aafb7784296105aa0c17b1d4833a9f07fb127a372bf691a8268c53692bb0948f1fcfffd622400523f6d33aa0546a67879bccc24e647f29bbd57bf7be SHA512 9004f32b4d6af9e6faca4301cf0894598d2ba34f26e2ed9c5baf4420b0f7d3acb1264797a5bd13e613516e987a623f37e42b3e7123ff000628b94a1f45dfb449
-DIST kconfigwidgets-5.66.0.tar.xz 379660 BLAKE2B 5ee7fea9ea65ad9465fd204104c3f534d9dbbeae080161607874d14fad215018c705e495b9798a2c7220147a9f875cc814eec770f12617aa6825120e0e6aefb7 SHA512 2646d63cb969b778f12b883f742bdf6d99eeb91b33e88b190ef32bef27a45aa02159cf584c07dcb5cb7bffaebe9e1eedc6ca938826424309d68bd6ff7cb487b0
+DIST kconfigwidgets-5.67.0.tar.xz 381716 BLAKE2B 8dc6cba654ac6e9d26af3b3356fefea048677dc08b160a81fc852d834d36de966ba3792b67fda6f7446b803916854346389b842e7d90dc8258d21716a8b12596 SHA512 ea48c37616c0622687824ed260afc1ed4507e582cec1862d9f6d5fc3e2c8b2e42bfd5582cfd5e69f8c42d8e714db2065b9f5341f6c036d4d852bf53d36223c92
 EBUILD kconfigwidgets-5.64.0.ebuild 918 BLAKE2B b812a8c0c490263aa2f0f74ed885d420d3654fadf5711f774be69e676bb5e8c7a96a1f7e07858e131886c7fb0629ed3763b3d1c263a68dc1e06abca65594c8fe SHA512 015a7abca676051f9a6da91a26f1c7b501f72f0b000df54e55ad44fbd5dbcd8d3770a4c544cb03923767514aaab831bac3b22c1604fcfca31807e4ac717c18e1
-EBUILD kconfigwidgets-5.66.0.ebuild 928 BLAKE2B 3333680847206c346e94886df8a44de05eadaee42ee29a7911cc83e03c6e9fdfc2ab1058a7b3d016890d70a8ff47e238ead737c2caba0320525bf436a229cc15 SHA512 72ef20d3c05d2ad4876ba9e39078afbcfeb5a64563b5232100a2590b712186b0658e2dc558810f053d68a1489d4b25515118295c00923561495e498083ffc2d2
+EBUILD kconfigwidgets-5.67.0.ebuild 928 BLAKE2B 3333680847206c346e94886df8a44de05eadaee42ee29a7911cc83e03c6e9fdfc2ab1058a7b3d016890d70a8ff47e238ead737c2caba0320525bf436a229cc15 SHA512 72ef20d3c05d2ad4876ba9e39078afbcfeb5a64563b5232100a2590b712186b0658e2dc558810f053d68a1489d4b25515118295c00923561495e498083ffc2d2
 MISC metadata.xml 394 BLAKE2B 28d17170775f8f8551b194b289bf5759acd2ed28b5ddc95a12d966b69ddef1f831badce8752378d83c5e47ce57192853f57c7777339ff152058226955134f238 SHA512 0f8ddc6ff525ea95da5789d9590cdcd26c9a9f9544fc2376f2a7d0f3c06e45c0bf1e5edace3ec30f3b5af0b5663dc4f4e902c773ba6602e942aaa373f50963ac
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.66.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.67.0.ebuild
index 1779853606b3..1779853606b3 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.66.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.67.0.ebuild
diff --git a/kde-frameworks/kcontacts/Manifest b/kde-frameworks/kcontacts/Manifest
index 6181dc5d283b..347a5d8ecfec 100644
--- a/kde-frameworks/kcontacts/Manifest
+++ b/kde-frameworks/kcontacts/Manifest
@@ -1,5 +1,5 @@
 DIST kcontacts-5.64.0.tar.xz 542380 BLAKE2B 2136f354a7fb200da8ea8f5a4cb32cabcbf1819c0c45b1ab7953f6268b70248b0df65cf5830431cd49dc4658bf4d10c984bd488639d10c3d3a114e3f20e9c64a SHA512 dc31b927e9a835364a550885b8a229dddc665043c0d923216d4e1dec270816fd437c8f6572cf27fd3d700dbe2bdca123505024fb6e8e8cb4a5d22b892c922fdc
-DIST kcontacts-5.66.0.tar.xz 543836 BLAKE2B 5131245b18444ab5870630fb63d19be361cf5494e57742195d54b8cf84d37885a4a908adee782b107f7a9bb394377ff0c56b5147e3308c3849e46510535d8143 SHA512 8e11b20d7e6fcda4cd59a0faa5d81fcc09f7214c600612835c088ea70bec952cf94a49cb83390cc3a64e38fc27b459f76ea12729565e4c314c3f1f740dbdec4a
+DIST kcontacts-5.67.0.tar.xz 546776 BLAKE2B 1ba356b1900d933683b02d03794ffbdf2acc217b75fb3b04df9dd1069f3227a944752311df9c980ee8724c410be3b9cf6be3ab6e6e07d442c56a92b8957749ff SHA512 161668100eeb3791cec5fedc18cacb0f3acaa4ea550c7ec5d879a70bbf0930b2ea5049dfa0d31238cb7a5173afc681c959a8ea0606d0d8fc36c593338b0352ba
 EBUILD kcontacts-5.64.0.ebuild 761 BLAKE2B 5f7e96e5821c09f7da78c988f717222dfc5949c754e6d8c9ab27f5c9c96cc71e95bfb97c3a6001154871602a117ff54a80f3869c3d4b4aeca6bf80ec68d64e0d SHA512 2d21cc052ef66a43d84c30e63a21beae167bfdc11ec8d26a456681d984e36b01de3e26c1b06ad2fe4929fe8e072d9e21fe36751a0c2000b8c7844b19e1f4add8
-EBUILD kcontacts-5.66.0.ebuild 771 BLAKE2B c585579401e147c75857808074166415430928054f5f4f9a3a4a938da9d453ae196dd9e53c503ea09bf4dfa75bd9deaadf223a4a7036ff7fe793739992870d6b SHA512 e02e4c6c0954dea6197648c8e357a5e226f62b2456a8c6487ca9b18a2a4a93e386dc6f85f4080d4024123f7ba3435a549b09356a40ffc53fd288a3e3de9b0569
+EBUILD kcontacts-5.67.0.ebuild 748 BLAKE2B af5239f37dd8d30447710f9b964099ab822ee44427f4037354045a64082c051b9f41169d3a0ee4ef0216a9608673f898aa5fb8bfc297c565008f2f3854d5c079 SHA512 289f1bc0f971bf861ff85beaa0209e6348d44bb7b677130436863b6b87ba9953e235ff4afede5a99979530c19b6ec9cea437fbe9721baa1ef328c89596377044
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcontacts/kcontacts-5.66.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.66.0.ebuild
deleted file mode 100644
index 02a6c37c6440..000000000000
--- a/kde-frameworks/kcontacts/kcontacts-5.66.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Address book API based on KDE Frameworks"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kcontacts:5
-	!kde-apps/kdepim-l10n
-	app-text/iso-codes
-"
-
-src_test() {
-	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
-	local myctestargs=(
-		-E "(kcontacts-addresstest|kcontacts-picturetest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/kcontacts/kcontacts-5.67.0.ebuild b/kde-frameworks/kcontacts/kcontacts-5.67.0.ebuild
new file mode 100644
index 000000000000..a6f350816bcf
--- /dev/null
+++ b/kde-frameworks/kcontacts/kcontacts-5.67.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Address book API based on KDE Frameworks"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kcontacts:5
+	app-text/iso-codes
+"
+
+src_test() {
+	# bug #566648 (access to /dev/dri/card0 denied), bug #625988
+	local myctestargs=(
+		-E "(kcontacts-addresstest|kcontacts-picturetest)"
+	)
+	ecm_src_test
+}
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 3fa390e86e7e..723fe6e0d342 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.64.0.tar.xz 375660 BLAKE2B a540d07b70bbeeafce51d467ab90a82eb799cc0cb6d01e574432c4cd19def0a18d45da90ec36cd735413971aa1fd327a8fb8907706978e8f5377bccba4382bbb SHA512 4aa6b02539147d12ce55a8796d36dae3c5a89028210cf874462106cbb37940ddca46c85c448baf3dadfa29bbc4050dbf53de1b25812a9cd78791b3e77ee48c99
-DIST kcoreaddons-5.66.0.tar.xz 368064 BLAKE2B 709514fff85b341c710456ef8bbfbdfadead860badfbd07a95b3dafa1365148d39b9defe6a06b7a602a539dbda52fbd2e72a6bb3975064e7c2f6347fdba21e34 SHA512 86b24604a9d7ff32b5a1e4c43c11a254b788deb0e289625de3c7acf75d435405273b59be2646df9906558f8190124aeedc061f9b963bf336d0200ed799570b60
+DIST kcoreaddons-5.67.0.tar.xz 368976 BLAKE2B 295c66309c1e2d94a66c91d2b17e2de35c1efd03613637dc5f327c01030886fa9d5751707f6e965562dc84bc81be2b85106ec18da8f34878e07f38bf7d86448f SHA512 5210732001712e3f032d773fd5e7671a5df2406630c874c744c3eaddb14df577752ec3ba1e2cd7f11c5f14634d4ab168484a7d992582fbfcb9ef2984366df15f
 EBUILD kcoreaddons-5.64.0.ebuild 775 BLAKE2B 9fbbaea795165feab575c61654cb611c2c6dd600bfa5cccb6ef29fb8ce84a8c70e6b26db847fec4e1ca810ff212efc1496c8404640556d41beb1fc0d1311f07e SHA512 f0f5d06e2de384bc1e7adb7b8ad8ae74915f1a5498615f587ce1ffe5cde5861796f513192792ac33570a83b28eefb67a3089d45925bba14f80e8dd7b2acb3a0c
-EBUILD kcoreaddons-5.66.0.ebuild 785 BLAKE2B b7bc8d762ae6e3d33d04af98c87a9770c58de01d0dacd4277e33148b30a657318bb1526f2ba8702da1e5c5acc2ca5389ed8ebefe5dc5906a4efcef5da803884a SHA512 ee89344e28270605dabd6a1d14f6463c102d0aa98e30bfb4d84a360d10f4eb200a7a3bc255dafd9bfa768328542433ef34fe2b8f5d78e54e9ca5916c6ecb7922
+EBUILD kcoreaddons-5.67.0.ebuild 785 BLAKE2B b7bc8d762ae6e3d33d04af98c87a9770c58de01d0dacd4277e33148b30a657318bb1526f2ba8702da1e5c5acc2ca5389ed8ebefe5dc5906a4efcef5da803884a SHA512 ee89344e28270605dabd6a1d14f6463c102d0aa98e30bfb4d84a360d10f4eb200a7a3bc255dafd9bfa768328542433ef34fe2b8f5d78e54e9ca5916c6ecb7922
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.66.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.67.0.ebuild
index 283049f5fdb2..283049f5fdb2 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.66.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.67.0.ebuild
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 2b79df7bbced..038c6c8e5280 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.64.0.tar.xz 23336 BLAKE2B 44375248264bd2ad98a2774cbdda149f7b5de0d9d7ec9ca3e264418359350371bda6f7779a9b2ad6d253581b10fc090aa345ddca5625d393f70c21babbd100bc SHA512 bfd4de4839a7464f7fc66e667a0262c3119bf51b35b017a9f76446f7db1a3dd0d3418651bf79b4fff580910dcffe7b8c65bdac56ed7ec0bb6a9bdf6e5474e0ed
-DIST kcrash-5.66.0.tar.xz 23312 BLAKE2B e83410eae1489ff756f98432904514bb7b5cc6da24fd76db7277c78a5c27fe330bbd5fbbfb1cdbbd5408e972386853d3ed0ad3fb75a4884062fe819a2b17385b SHA512 0bfb2b7211522608c4e2bdf0677074daff4ca4802c02949eb720df87d5c5ba2b4882c69fd908abd34440ef5fa97e1109535aea94071b646b15d1e7819203cf8f
+DIST kcrash-5.67.0.tar.xz 23460 BLAKE2B 7ad9fe8b52db3663fbf08de2a24812ee0399f3c61172f3b1447957a998e5327542183484feb51b28b7e1f2fd34f759d5a7bdfda872a785a02ca2abd4dd1911cc SHA512 531a204a020ede55eb9b1b873baf10118bef51ca272a2e180cd747f6cb2f55445e7fde8eface542642eaa5cee5dc5c34288c9ee62a013f9c0c413da0c8328e34
 EBUILD kcrash-5.64.0.ebuild 696 BLAKE2B 430632cb36926b375445af16c2f5208afc8e827c740443d103c8e56c1c17ddb329340737f51971035aad599660db0c74eeaab48d2a690127250c081e31b14665 SHA512 69fadd747399e522019fb0558567af3c157bf2dcc33a0843a07277ec20429b82c92d481564e5a986d8d3335d19add997ae6313343bd53ff40d2997ceb90c0d39
-EBUILD kcrash-5.66.0.ebuild 706 BLAKE2B fa2fb5f08b5f02d60f4d14a41dcd732f935baad246917a9f01e509457235aaa317155ac897c8be09afaa9f681b93e2ab0b17a92f23bb692794891b8f9435406b SHA512 240c3b3c50a49a70159df3b33e9e42cad69f9e217ad12fb1905ac5fbb80b48ca6e01763c194b80f0dd59b73bfb0c562b14ef10090f33fb4d0d11fe726e1c2398
+EBUILD kcrash-5.67.0.ebuild 706 BLAKE2B fa2fb5f08b5f02d60f4d14a41dcd732f935baad246917a9f01e509457235aaa317155ac897c8be09afaa9f681b93e2ab0b17a92f23bb692794891b8f9435406b SHA512 240c3b3c50a49a70159df3b33e9e42cad69f9e217ad12fb1905ac5fbb80b48ca6e01763c194b80f0dd59b73bfb0c562b14ef10090f33fb4d0d11fe726e1c2398
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.66.0.ebuild b/kde-frameworks/kcrash/kcrash-5.67.0.ebuild
index 3810b16c9657..3810b16c9657 100644
--- a/kde-frameworks/kcrash/kcrash-5.66.0.ebuild
+++ b/kde-frameworks/kcrash/kcrash-5.67.0.ebuild
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 5981cc93aaca..bce44b246af6 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kdbusaddons-5.64.0.tar.xz 40088 BLAKE2B e2edb4d476cdd53c3cd2796ba49b6ef88934cc0167c47a2ca286ea38ebec2d5f93fc099372b68752c1b0369ccf41ac0b4548b06a82822c140e978cc36763efb0 SHA512 1dc0f7753c143163ba10e62ad773ba020fe88ad8520b47c2b6c9523b27457fb8054d654bc6dbd9aa5f25ce47938343a72fbbc9e91f78eb84e6500d8be8f9cac2
-DIST kdbusaddons-5.66.0.tar.xz 40104 BLAKE2B a7e468f8b44e36531c68864e2f47daf075d45cf828874a1be56ba3b300182c72d66b9fe716988852abad6b470dc67071cbdab23669571ca40e66d8b880936335 SHA512 ee85f691f5916135a2cbcaa9dcea945329fa744a1d81f875a73dfe1d64a52d7d4575dc80eded281c08df8327ae6cddb44e1ff5348c76c51d935bb02c27f17383
+DIST kdbusaddons-5.67.0.tar.xz 39992 BLAKE2B a4663c6668d9f738f949b579fccf9af8af10c9864001bfe0abf2777fb7fddf13b3ce2edaa9f36f9a15af7480fdfa631eba05040f7f8fd102232795c23e77794e SHA512 84f46df5648a0868aa82465072993b91c0448d313c5225184adc4d3760e56ef4af72cc4b0acb84836df1025bc01c54c6813f415f9401d073101d72d9ef6f6972
 EBUILD kdbusaddons-5.64.0.ebuild 591 BLAKE2B 878eca3becf7c0afc1b3a8781a1fd8a3235ace038e3bfac4438f06eda45c3a0f651808a4d3cd4515920ab5e1e7fb706a7eadc6f3a6aca57119f537c5dffd61c0 SHA512 5e06198c5a65139a655bc4283e7d2f93c25ab509340366ce986cff7a0e625389164e91b06a236d79babd1b2c911298d43ca506b1f9c7309972ac73c0a65bc5ad
-EBUILD kdbusaddons-5.66.0.ebuild 601 BLAKE2B 3d90d437703dbb6334650325bd77ffdb627e1a4733719d68dfdb31ced9296cfedbc052f17728d681ee3f413f309619751644ac8801d0790a96ef93787a446dbb SHA512 6c064eac23f53fa3b1f1ce1994fa52321d1b4708d988fb279aa963b22c40f5fb35195eefecc4197166650036d7f3d3e2b985193dc1516e387a5969351d972d5c
+EBUILD kdbusaddons-5.67.0.ebuild 601 BLAKE2B 3d90d437703dbb6334650325bd77ffdb627e1a4733719d68dfdb31ced9296cfedbc052f17728d681ee3f413f309619751644ac8801d0790a96ef93787a446dbb SHA512 6c064eac23f53fa3b1f1ce1994fa52321d1b4708d988fb279aa963b22c40f5fb35195eefecc4197166650036d7f3d3e2b985193dc1516e387a5969351d972d5c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.66.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.67.0.ebuild
index 6cd917caca6b..6cd917caca6b 100644
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.66.0.ebuild
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.67.0.ebuild
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 76cb6b12a00a..703692b1cf0d 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,5 @@
 DIST kdeclarative-5.64.0.tar.xz 174332 BLAKE2B de2094053bc6105915b1a9a6ab05fc582732c864e0f673feb6cc29c37773ab615b3f83dac38538c313ad9f40ad5ada433cc16d9120559c16d31909bdc0183606 SHA512 1e15b67b0ce4f165307750854fd7cb8265f922ccd46f66971106a1ba21a1e798d429ced41830705f1bee0819edefccc788da9fc983ad3f316b7162be4e85f364
-DIST kdeclarative-5.66.0.tar.xz 175372 BLAKE2B 53e28fa701593b59b2232fad94a5de62b2bbb384f972e434d0c0dfafbe6346c9ac384fdf8988f00f691a9489248c379c3e2a84e0c05e7285e3b2650144f8e9ba SHA512 5353cba20b2b4d22ef3fe34bf12f257b1048577775fbd683d8ac439b5b29677bc4fd10be96d58abaacaa14dd671b2688a480e0c31be82b56563e3d9fa04f2170
+DIST kdeclarative-5.67.0.tar.xz 175072 BLAKE2B f6a69e99f735942cee91cfb3aacefb81689681455e65ec4102badb9f646b350e470e62566f40f4cc95d2c513209027d3cf81d69b44ff920add1b4ba9d9ae5fe6 SHA512 0a4eb4c2975c586286fe758c96dc34a3d5aa290c29578b957237602d4ff43a4f4f9423a2e883302e39e4e25029d5ecb18d5d49b8cdebe498b56d13a58c2ae55f
 EBUILD kdeclarative-5.64.0.ebuild 942 BLAKE2B 81d960c94e6050a7d99d82b295627f357dec555e8d08f5815b0471bd4ecae15b58e32689651141acc7776bae4fd3bbcb455fe26f657b24d11c5ebe89de78229c SHA512 bf00b9fb6c1c2919d4ba5b928ec5c3676dde7395506b6aa7deac0a494d91c16743cf89da187e682199d3cd1f7c664e554eca52f65524dfde882d845425a6182a
-EBUILD kdeclarative-5.66.0.ebuild 952 BLAKE2B 96c612e4bea7e78bfed02e53bbf9dd7b81b6c1cf344b6ca909e04e87cbec2d0ea9e708efedd6514fba2901c2feea2da54650817ca93f281dbb34ddd5b1e33731 SHA512 d1a1ff02473336de4d1a4924b0efd09000d0646a248672476b2a4add0000376a94d0e281a1f152d95f6bd2ae7f14dd6f57e279559e4bfd4c8f5ba3c5783af2ac
+EBUILD kdeclarative-5.67.0.ebuild 952 BLAKE2B 96c612e4bea7e78bfed02e53bbf9dd7b81b6c1cf344b6ca909e04e87cbec2d0ea9e708efedd6514fba2901c2feea2da54650817ca93f281dbb34ddd5b1e33731 SHA512 d1a1ff02473336de4d1a4924b0efd09000d0646a248672476b2a4add0000376a94d0e281a1f152d95f6bd2ae7f14dd6f57e279559e4bfd4c8f5ba3c5783af2ac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.66.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.67.0.ebuild
index 6026bc7695aa..6026bc7695aa 100644
--- a/kde-frameworks/kdeclarative/kdeclarative-5.66.0.ebuild
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.67.0.ebuild
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index b8605c020783..20e0f6aaf8ab 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,5 +1,5 @@
 DIST kded-5.64.0.tar.xz 38128 BLAKE2B 496df2d2e3b83759130b84be71ea0f2afe27396c9e6d3b45bb7631b626c4ad970d8d54bd92f31fd407adf7dc574421b2117bb3e5bceae2a31bd40e8337bd1101 SHA512 aa71bd1eef129131349b61da3645c915aceb309099e1ec2f2d66b3496153072647418ca262a8272e1155a45cdf268dc388f67d64303069d055d22564c4871f09
-DIST kded-5.66.0.tar.xz 38056 BLAKE2B 62613378e72a1a5680aef04db342916e52fcbc772f2d32578270ca4983a8ed46a1b428d819c31c616db690847a7cc2d8cdbf802028aa79ce68cfa97a4072c039 SHA512 e65d6e18a33142c05f82153fbc234e0ad4a190d8d98ed13baf6b7b376338a63cbacb1dfdad6a8791b517b9de3300a363400a7a24868c808e0e2a7facb80623b8
+DIST kded-5.67.0.tar.xz 38028 BLAKE2B ec1e53d0038bf458035be083fd9bbd923c80fd1468a760ac5357a4197c02def1ffd6ed03e8c2a3f571959db8cc19fd704708c917ae455791459b5e50ec28d6e1 SHA512 a1b5bcdb22f65d6d74fadde878272448c15f3d6c2e4b95764c73f2ab58fbd65e3625495d50c5202ccdb71a13295cce1e4c05deeb9f4ef7a6054677bd2131ed62
 EBUILD kded-5.64.0.ebuild 828 BLAKE2B bdfa85e7cecc8d00be6ae86b6daf94361261adea03789f9cd583b418b23ccf9d864bb9f699905371b21fcb5cf4c91c29165c965a02de437204e50c953f9a7853 SHA512 bb18cef36aa6615a56cc18306a35918b5d06b2d2012ae96b861cd189710093e0510bf5c05ed0d3a0a7e75ea404c2b8264b59364ded5fee781fb6f51cd4254247
-EBUILD kded-5.66.0.ebuild 838 BLAKE2B 11f84b68059ac8379d2639e1672681d5d2f473ef67f05840f1841c6a006e25b042863cee5998ce1d7fdcc2f792d070e0740b4cb40ca9aa63cc8a6e129c0950c8 SHA512 8ad65a1d84f01c4453cd6139a58b51b78c3f8820caf240df7f5cfde0a1680126678dc3399637505afcd7e7f578d535fbc03931a1026ed14093555943c066db92
+EBUILD kded-5.67.0.ebuild 838 BLAKE2B 11f84b68059ac8379d2639e1672681d5d2f473ef67f05840f1841c6a006e25b042863cee5998ce1d7fdcc2f792d070e0740b4cb40ca9aa63cc8a6e129c0950c8 SHA512 8ad65a1d84f01c4453cd6139a58b51b78c3f8820caf240df7f5cfde0a1680126678dc3399637505afcd7e7f578d535fbc03931a1026ed14093555943c066db92
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kded/kded-5.66.0.ebuild b/kde-frameworks/kded/kded-5.67.0.ebuild
index 578be9d46c8c..578be9d46c8c 100644
--- a/kde-frameworks/kded/kded-5.66.0.ebuild
+++ b/kde-frameworks/kded/kded-5.67.0.ebuild
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 87ca1ba199da..26b29c9602c0 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,5 +1,5 @@
 DIST kdelibs4support-5.64.0.tar.xz 3517040 BLAKE2B 5df22c4d02aa1ce6e980a6ba8d4ce53430ddc8eeb518be95b75aaa491703954f683db9db8d62077a882bfa0cb961600c604582372ea86511d8296239f24039a5 SHA512 7c87b2e02e569e684bb7532421ced3f8bb28171b899cfecc05f16e8e30b64515812c80a3ca3c79d4af7e2cfd5bd7b7fbbf586559948207193adb2692e57de433
-DIST kdelibs4support-5.66.0.tar.xz 3517344 BLAKE2B f1c3fd3da1e3addfdd9561eb3e65e5f3be666b6dd454206e8a5090a0dd0799cf5738446d0f152a234745bc13af6bacffa1195f59e78b0d7c7028cfc74c4444df SHA512 bd6e804386495f8ee6a7bd8fa388331c4a16a38319df4ca4f6310921707c628b0c3041216218e5872720782c466697239fc64a25dcaf7c80d3e9d5d65bbb5726
+DIST kdelibs4support-5.67.0.tar.xz 3516692 BLAKE2B 3ceec7a8baaa5e6bf5fac7beaa99545dccece888ad88f6801930ab3aac5b7d0c25734703d2eb58c9e5bea5e0a393ae828edbf57888d980c58586deee2ad394aa SHA512 68913823e8836890cb97a8d86cfdabd5d8e0f4e2484b932adfdb95a17fadd01dad0fa37058c078d089776e0744c7fac76635dcee998409d55ecc5e90b2e4f43e
 EBUILD kdelibs4support-5.64.0.ebuild 2499 BLAKE2B 3d021d9c71a1085cddf507ca2e9e4c6e32773ded8833023cc6f18722646e5d6694f4871b6526d59a58f04371f3b72640c05282d613c6f0ba1c25d988aa698a4c SHA512 8de29547efd16dbf0164d6d91b6673006630701bcfb83abaf8a1c42fcb699a0c0fb2d3c1de02f27c508bde3a9b6e9b13e0d7cebd098669d303915c4e3fb4eb84
-EBUILD kdelibs4support-5.66.0.ebuild 2509 BLAKE2B 6b396b01b4e25fd89de7ab0d8b36756b07902376859bd69756b6f7485a0d3f3a7d8d9c15ad6cf447df2460fb962d534f46972ab26908b29acb2e660925d34e42 SHA512 2ef7bfad9695bbc4180462ad7e24812ae49d80cd45a070b92d7372dde0f6a68b1f85cb0d0655e892333c2ff3eef5806d6528df259ddcb19c5a13be31ae2fdf4f
+EBUILD kdelibs4support-5.67.0.ebuild 2509 BLAKE2B 6b396b01b4e25fd89de7ab0d8b36756b07902376859bd69756b6f7485a0d3f3a7d8d9c15ad6cf447df2460fb962d534f46972ab26908b29acb2e660925d34e42 SHA512 2ef7bfad9695bbc4180462ad7e24812ae49d80cd45a070b92d7372dde0f6a68b1f85cb0d0655e892333c2ff3eef5806d6528df259ddcb19c5a13be31ae2fdf4f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.66.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.67.0.ebuild
index 070b514c68a6..070b514c68a6 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.66.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.67.0.ebuild
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index a077ac2ab16f..773d1b0399fb 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,5 +1,5 @@
 DIST kdesignerplugin-5.64.0.tar.xz 71080 BLAKE2B 4d60091cd64541e5e0af91b5ce2ed350188cad75f3bf58d12b90c77f82a9c912df0543a8f0d4b2371e7c378d0ce08fc327b356270225613ed2a0a873cc99133c SHA512 abaace216390f35d94bdf8f608b0d8bca475dc3bc0ab193d71774f4904669f86c7e8b600a390fd1470f3e8f57e52885aa89d7d38468644176006e72d981e83e1
-DIST kdesignerplugin-5.66.0.tar.xz 71108 BLAKE2B 32651814bff9f500c313a13fdd54d4c2da519395bdeb799cd480008e7b65b977eb1244588b603457750f2529dabce4102443665bf8ac0f4bd5eb6318479e44bf SHA512 04ed2b9a7c75be32d3f9ddd68f33e4a9c36620ffe80ee2d0599279d445d8236fa63f5a0ceb437fbf9cd8c180944178eff1d26e94fcb807441800a9ea0fd23b28
+DIST kdesignerplugin-5.67.0.tar.xz 70752 BLAKE2B cc45ed8ce61c5945927c05e3d1a921d2873f1f33401db068a81a35a0d47aac88d4d46c4d9b2727325e585962194aab6a1cfffcab0c9c8d96e8793d6f334ae8e1 SHA512 4b2224e07e8e043120af99f248d35483f9fdf36b353a8cfdc8fa602667555a9eb223e421619658b046314f297fd5e91e9de1453626cabd0f785bdec267c1ab6c
 EBUILD kdesignerplugin-5.64.0.ebuild 544 BLAKE2B 7f39fe6edecd467c40931dc5b4dd516221733e116a07ed2a6f0e4889967b8858d35c53d09f8c4146cfca8cdb5ad4fe1d5adc6fd1c5fd826a2062b162199eb4c8 SHA512 509521f39715966d6a3fd41938274c785ba17d5b287b3f686ce8415511d36cf5a167688a9086f48b739bea40113c5721e39be7f7759888681b5d7cccc62783f2
-EBUILD kdesignerplugin-5.66.0.ebuild 554 BLAKE2B 20899fde738e55c32cc7445dc5aebd122d7a018864fb9903ffdbcffbc13f76bd40e0adc3eab7cb62ba9dc453dc885305532d971e0aa30abc513039fae1da98d4 SHA512 4f760efe63b9f25ea12afdd170cad2da7241b1e195f85b499dc0062d9b5619fc9a8054a4bd0136530771c3dcc1970c8ce38c3959babea7fb1a07fa3b477cf110
+EBUILD kdesignerplugin-5.67.0.ebuild 554 BLAKE2B 20899fde738e55c32cc7445dc5aebd122d7a018864fb9903ffdbcffbc13f76bd40e0adc3eab7cb62ba9dc453dc885305532d971e0aa30abc513039fae1da98d4 SHA512 4f760efe63b9f25ea12afdd170cad2da7241b1e195f85b499dc0062d9b5619fc9a8054a4bd0136530771c3dcc1970c8ce38c3959babea7fb1a07fa3b477cf110
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.66.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.67.0.ebuild
index bbb98d443d69..bbb98d443d69 100644
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.66.0.ebuild
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.67.0.ebuild
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index d89289195a5c..b8fc3caf340d 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
 DIST kdesu-5.64.0.tar.xz 47364 BLAKE2B b9e31764170951ff9ac72a89d93f9d3ac4e8565a24f57209d8b8bd171c14e0fe21244583a072274d7ab3e76db7907cf8baa985a916a5bb1bdc5499966b0e1342 SHA512 83395f55f5515ade8286f71dd4301f6d3f32e44278a562a3f6f7d266a0198c55b6e6c790fcdd67d86df184d4497fa7a284471f379c4464da5b6ba05ed11c476b
-DIST kdesu-5.66.0.tar.xz 47264 BLAKE2B 3f93aee839edc1d80d95ab0d3d43cef24bd9bfbe5723cae1751858aa04f460303f8ecbbac4c31eda247c555cdd515b808874c3c9acd3d683ac30fe7b5bac1de4 SHA512 4a8f076d06cce70e5a81c51c0111df1b944d12788893e86605c24cfec6dfed314f5abe096f274fba671ab0ed2e91a0810898933fc2477a9bec9fbfa9fe6e38ec
+DIST kdesu-5.67.0.tar.xz 47480 BLAKE2B 2c86ac6a42bf1dcd5e36888fbc6b8d18d0a0c1b2472125896dc4d2e7f94eeb9bb1cb2f9c4f7da18bbc8791f2b1cf6822dbc6ca73b99a03398aabc55d0848ea8b SHA512 8ea63328e05308736368d7d011691ea942a50554e3faef1c23155bb5d449767e6d21787e45ed1bf6dddaf063016fd7730e46ec14b56796ac1139a4cc9b529ad5
 EBUILD kdesu-5.64.0.ebuild 652 BLAKE2B 299b0bd70f5cd91aa34c80a448057ab773731a3d153aa4e24b6f7186a75ccad90a7e4a01d3e799cbb5ea8f5c466b830a47da5a5effb3015375cddb76dfac6b21 SHA512 4a36364f9ae98e15f4a78a627161a226442dfb9399797150e36e302ccbf59bd1e9cb22b3352337fc9dd1a12292e91ade8fb527a1300c53cbfd4debaba0f1118e
-EBUILD kdesu-5.66.0.ebuild 662 BLAKE2B 7cf1015f7c50bccb076712bde6c24ac9ce00aabb36e63af4436580724b8c119209e36d34f69cd35ced93d40000e2c8710af579200b9f442ef27d02ae3f255861 SHA512 908e99fc13ee4ee1a18e2732294fc8059a234aeb74ce47a1f02437e6eda13f1755c498679107045ab67bdd76b7e3a2cb000deb7054e9c5ddeb00068967bb7a3b
+EBUILD kdesu-5.67.0.ebuild 662 BLAKE2B 7cf1015f7c50bccb076712bde6c24ac9ce00aabb36e63af4436580724b8c119209e36d34f69cd35ced93d40000e2c8710af579200b9f442ef27d02ae3f255861 SHA512 908e99fc13ee4ee1a18e2732294fc8059a234aeb74ce47a1f02437e6eda13f1755c498679107045ab67bdd76b7e3a2cb000deb7054e9c5ddeb00068967bb7a3b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.66.0.ebuild b/kde-frameworks/kdesu/kdesu-5.67.0.ebuild
index fc8d98e4b310..fc8d98e4b310 100644
--- a/kde-frameworks/kdesu/kdesu-5.66.0.ebuild
+++ b/kde-frameworks/kdesu/kdesu-5.67.0.ebuild
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index c280ad361de0..9a2ea55b8d83 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,5 +1,5 @@
 DIST kdewebkit-5.64.0.tar.xz 29808 BLAKE2B 93185e414303640c59473d8df789e22ca8af843458fd0120ee7ed17587570f5e99ed8cbceb2ad303e890e1184ff402402ae6aeb5e93e67826b49e7ed1832fb4f SHA512 bd308fbd32ef0896feb857238933c178b8afcd808b820c3319024985f0ab2ec2b89333a7f8aaca696b55c096d4225181dcf7ae73942527d5b125afa5ff26f23a
-DIST kdewebkit-5.66.0.tar.xz 29792 BLAKE2B d1abc87bbd9a6fef8d9cd359c1b4eb1b4bc2632264cbcfa988d55e70beaa5ce480b1d00ef74fb67f2b581d56dc18a9555096707cbbc732ba6d5f07cc8350512d SHA512 3f41030992aef86f5704d74b9f8b39fae6978adbd817284c672625810be28548695faef648a95c10112a56247cdeddbae6c2ee1229b692494e1d904b45e5c74d
+DIST kdewebkit-5.67.0.tar.xz 29976 BLAKE2B 0b0513078b15a828589b0735a444ef490fdadfe4023c0e0c6ee57a400d05a7978d32cc6a6b003abb5e87dbc6cea76d85bcd10d5b6c3f41661e88dae1f6053610 SHA512 2292adbbf21d549dab9e23f10b81ab8c07fd50f71c11ab10e9e68f65fb71fa7ee50b1bca6b71dc034155dcf5cef458a9494766b76c3dbb73ede69be12de1ae32
 EBUILD kdewebkit-5.64.0.ebuild 955 BLAKE2B 6af1717babd5ecf23024dcdde5dbc201d51e63a964fc9e44ab34b9ad579f4bd26d4129268169f0439f6b3401f23d4dc1a549e6e546eebf12233e7c8567aa42e9 SHA512 99962b501b0b00750a0410885814d583cc5273d163cc0946577908e9f943b42e11a290ea9514a6e872df4b621d7707e59d6bc9041c1245ee2a3e27a083c9ab46
-EBUILD kdewebkit-5.66.0.ebuild 965 BLAKE2B 052b549cbd7e9a799afb04829ff82a8a60709469de7f3808db8bac31899ee86712f261c793b033f04087da87f585de553dfb724302a4fb6acd0e93e8f2ae534f SHA512 7c846d65170768360cf3df9582924845ba7c51350b7713f247f1629c34314ae2eb8e70f59b91b1fb9cb9a4f2cb015420513d92f88e64d57ce10d324025aa3203
+EBUILD kdewebkit-5.67.0.ebuild 965 BLAKE2B 052b549cbd7e9a799afb04829ff82a8a60709469de7f3808db8bac31899ee86712f261c793b033f04087da87f585de553dfb724302a4fb6acd0e93e8f2ae534f SHA512 7c846d65170768360cf3df9582924845ba7c51350b7713f247f1629c34314ae2eb8e70f59b91b1fb9cb9a4f2cb015420513d92f88e64d57ce10d324025aa3203
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.66.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.67.0.ebuild
index 54d115799b05..54d115799b05 100644
--- a/kde-frameworks/kdewebkit/kdewebkit-5.66.0.ebuild
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.67.0.ebuild
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index e923748c4579..2c437652080f 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
 DIST kdnssd-5.64.0.tar.xz 58768 BLAKE2B d99382ec7c6d283d872e1897afa455e4533987893bd6c8e8223193fed7552e7dd0aaa928b29fac5f912f1e05d58cf01e25d4e73db8a2557c94abcde0504c40d5 SHA512 6967ab601a80edf82dd4b6450bac7583151a7ac0787bd66d32e0cb0052dad9bb69ad98cd6f11a77190c63871d9f92612c34bbf05e157fe62f19c9190f7e35968
-DIST kdnssd-5.66.0.tar.xz 58632 BLAKE2B c88b2e6187d0fee068b572a0cf5a2afbddab26db3592e2da18792f6963be4706ae4927d20aeca4868040d5496bad885a9af2a54c97e3382b00f4cf0199c6ed67 SHA512 5465dc85a60790488c21e1e3fc63ea461ec74c371a487e32466ca3263fc1a0449961360d3d5e3ea09bbe1149fc013a9e23555bbac2d406b7d31ebb38290f3bf9
+DIST kdnssd-5.67.0.tar.xz 58760 BLAKE2B 2dba09bb8b3f92e1ac8accb883aaacfcf9c969d829dbab4f211da00fa0c65ade4387dffbd35123d4acfc22e27b8e69db5f3ba8ea2293999ab988d93fa35a0d23 SHA512 6a88b32808b2d2c5e772cbe0474b48d005e826b6bc241d1f645744c70f83402d225d237b4a620832ff84d5b420833006d50ffa791aaeb969eb080028c5c3fcaa
 EBUILD kdnssd-5.64.0.ebuild 637 BLAKE2B 227fa41c69caa3375391bbc044a472cf93088a9a7f8e858b091fb49736f875da27c02ed712df678eef23efea8e3d43e8f185a47aec5a609ef1e0ce073352ba94 SHA512 b7fe6b4d4221629d7a98d6cdaf27d09560d25a9885397b0b38b84dcc52dd24e8da490a26c2cec41480e25b66ed61363eb472931f28f0d84198ca5bb1ebbc25d6
-EBUILD kdnssd-5.66.0.ebuild 647 BLAKE2B d75a8c16633b0fffa8c509f6276fa2b2798f6ce6ac2c58e27e5213c6537a95353b3ddb6ef5dadb3f8a042dc7e7ad1d2de4c00313e6530cf4b4225a234af3cd3a SHA512 010eaa112801a1a0fe1901ba393ea51c43dd832447256437f19d7075e8c617dc4b3f33ac06e3d8f233d86027d1c08f0b39f8f2ad05bb4d8f95bbe464e7f5e8b2
+EBUILD kdnssd-5.67.0.ebuild 647 BLAKE2B d75a8c16633b0fffa8c509f6276fa2b2798f6ce6ac2c58e27e5213c6537a95353b3ddb6ef5dadb3f8a042dc7e7ad1d2de4c00313e6530cf4b4225a234af3cd3a SHA512 010eaa112801a1a0fe1901ba393ea51c43dd832447256437f19d7075e8c617dc4b3f33ac06e3d8f233d86027d1c08f0b39f8f2ad05bb4d8f95bbe464e7f5e8b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.66.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.67.0.ebuild
index b79dba8c28ce..b79dba8c28ce 100644
--- a/kde-frameworks/kdnssd/kdnssd-5.66.0.ebuild
+++ b/kde-frameworks/kdnssd/kdnssd-5.67.0.ebuild
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 3e7ce3344a75..0a1b136d744a 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,6 @@
 AUX kdoctools-5.54.0-gentoo-docbundledir.patch 1055 BLAKE2B 0b57d4d23fdac39a939d1355ddecb5d0ba53c1a2b2ef43fb1127834b1004b4fd63a8e32a160794a51879a103c658068a67663fe8f9e1cb99ede5154cbccf2c1d SHA512 18dcd82bfccec19eccb5993cfabf4ead9222dbf29cad3a9df4b1c225a2693ea0b882dac78f969da7bf98aa4bdf5b09ee28cef6ff28935502439ca20fad427bdb
 DIST kdoctools-5.64.0.tar.xz 429464 BLAKE2B 56623d9171956752eac51ec9cd7c8bedb5ff57c66b14619d1f8e1253c39fd3b00284fdb6ac2f03b3fd54fdbcfe037f07a46c126effe81ae67f67dc801023e98f SHA512 213c343fee983093391b84a81186a36edc7e78651ccf19381579695f9ed70af660131614393420258d63538953e494ff7246892dc4f31e1469bd7ab318eef1f9
-DIST kdoctools-5.66.0.tar.xz 428884 BLAKE2B 906593af7889a6190b3cc0173971d54bd70d63e81d58a6598f3c58639cde5558e5ebd01a86ee2d5be9b2f4ba2a6d87f6be512bc69882e3d2f3f056f509af9a5c SHA512 b830d99bb4c39fd1dd8cb942d0b2b987cdf260ab4547ce7c37650cc9e0b3607d7a0009c02f67cd5b9cc9234cd026bf669d9b17983b569425dff33323ce7df272
+DIST kdoctools-5.67.0.tar.xz 426208 BLAKE2B b6e3cc27f177e84958ba96d796dc1ea3bcdc55cbdc31d0d93e276b71a7f036d1e9bc16acf9ea45fa185cc003c51e3c858bdfb87926aa5ee53bbaa4df1aeffea1 SHA512 bf499b5119ccd76b5beaebcf25e527e0a5852aa2c0b37217a28f128c9fd80c5a5b906f97c59b85475c0b1e18c76728cf067938490e7e9ebe7b7d8bbc71923f9c
 EBUILD kdoctools-5.64.0.ebuild 861 BLAKE2B 408c90fc755119e8723342e22743e77316731772b651923048628994b533a86a06c7a1641377842183873bfbfebe209f7b45c6c6ca8ac9b0d2e3618803f8a274 SHA512 997c5ef6f3c501a2ba3995380d23f8360c3a31ca94acebad1bdf0b8b0b98b004483cb3729665ac8f7e1aee2412dc062ea6fd263680d6a5ea7b5cbfeedd426fb4
-EBUILD kdoctools-5.66.0.ebuild 872 BLAKE2B fe707dab5d1b4b587a8dc8450b04f21e29c3e6f7aaf4e1fab12d0cf1157157e5bdc51d3c6a1e485e26f80fedb26602838d262fa168341e4c46f5c18c155b9003 SHA512 3ec151bb66c1c7cec167cb832d8052ad911a44b9925bd3657c05a82e39a539de9f3884b3142270c436a2c2dbf37702ff643dab8d1bab598801a0494f8aa2b9df
+EBUILD kdoctools-5.67.0.ebuild 872 BLAKE2B fe707dab5d1b4b587a8dc8450b04f21e29c3e6f7aaf4e1fab12d0cf1157157e5bdc51d3c6a1e485e26f80fedb26602838d262fa168341e4c46f5c18c155b9003 SHA512 3ec151bb66c1c7cec167cb832d8052ad911a44b9925bd3657c05a82e39a539de9f3884b3142270c436a2c2dbf37702ff643dab8d1bab598801a0494f8aa2b9df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.66.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.67.0.ebuild
index 1754e1909062..1754e1909062 100644
--- a/kde-frameworks/kdoctools/kdoctools-5.66.0.ebuild
+++ b/kde-frameworks/kdoctools/kdoctools-5.67.0.ebuild
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 638ed1e5cd13..c4eb15a64fe9 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
 DIST kemoticons-5.64.0.tar.xz 1696952 BLAKE2B d0d8d09553b014f28cabb986b2b103639feed2c2295bab5ce01122b20c9ae3655a4cdf49ae29a1412a89e0b7588a2e20960251b182a943911445abe89f0df600 SHA512 f0a3c40984ab3ffc7aa890defdc5371c71383d15963e34bdf6b021a686d959da90f014cd80b255471921dbccba037f27c22c2527a0d0c9734c7b084528c2706c
-DIST kemoticons-5.66.0.tar.xz 1696820 BLAKE2B 2207c9b30e8b99be9e8a9ddb84f91c35e67c8f24bcb0da4ea7303628a429fd631f224f3ad1bf4bfee675b8fbe4202e5b115ff93256969d6441452cd5ec216c20 SHA512 0dc33b7ca48b19b76428e0eccb4e51156f92ad20067c535a3329a0ace3c536cb55fc7771f0f9ae2bdb03a3ce7ff92b50a8acd613b947654c9b55c8c2414d7c68
+DIST kemoticons-5.67.0.tar.xz 1696352 BLAKE2B b7897e31f80f12ad62b65a44c445b7dc27cec0feb98668e65fe319b73ad216b63ca9de0d481212f4f7eb550790b0fa84233aae2d5980d7cfb43907d780758fa9 SHA512 629e136c12850799cb9a8d5ac7bf7486d0c319ee458b1c1430f12d9acf5b374955b29c27eab44f51741fb1b47ef12f58550427ffa17f85135f5d64f59477d2de
 EBUILD kemoticons-5.64.0.ebuild 658 BLAKE2B 43824134c2514173f459b3ff6f1412e5424ef3ab5aceb74e2fdaf38638e4d608d4e6cdde066ba44628afa0a71406ec19b5009e42c76c6647857220f40606afab SHA512 78f592d632924930089c6f655e4e35235cc124a792139f5f520c2e3ae6e5d378c4675d63283f77e2d5e6fee678e586bcd3c2c8c70fb518978060fd8cab9a5edb
-EBUILD kemoticons-5.66.0.ebuild 668 BLAKE2B 65565546f8eaddb5ee635e56698f63c1f9572ffbb7590823a13fe57674dbc8a7b89b20ba2fc116d8412fb19816bb21146083ac2f46c35c3290a57e8f0d96326e SHA512 88d0c2e86c8ea086ab6a0cee443741cf154e78f28177e3fe8caf05bcb090c832dcb0405d5b67c1e52c09905efd5fcdaa728644876726157602ad965d7e853a39
+EBUILD kemoticons-5.67.0.ebuild 668 BLAKE2B 65565546f8eaddb5ee635e56698f63c1f9572ffbb7590823a13fe57674dbc8a7b89b20ba2fc116d8412fb19816bb21146083ac2f46c35c3290a57e8f0d96326e SHA512 88d0c2e86c8ea086ab6a0cee443741cf154e78f28177e3fe8caf05bcb090c832dcb0405d5b67c1e52c09905efd5fcdaa728644876726157602ad965d7e853a39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.66.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.67.0.ebuild
index 5c5ca69d090e..5c5ca69d090e 100644
--- a/kde-frameworks/kemoticons/kemoticons-5.66.0.ebuild
+++ b/kde-frameworks/kemoticons/kemoticons-5.67.0.ebuild
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index b586620b9dda..038c64c28e17 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,5 @@
 DIST kfilemetadata-5.64.0.tar.xz 420636 BLAKE2B 082615af35121ef341726af6ae963964b877bac6b854430541ae76f3c6f35b0bbd406c8d55a71895a9d88fa657d10948824a2efad2b3944e2ca97a212e8bc590 SHA512 3125cd4e316bb5dc07de87f14db07f53f7dbfc967f6f65cf78fa9e7aeaace78b3a487bd74226306a886f68ebc470e5d759d9f377523d9cc56d794982b627b2f6
-DIST kfilemetadata-5.66.0.tar.xz 421892 BLAKE2B 55a06aba11ed582deb610cf1ac07daccb1070242ea4f295555739ad090170465ad96f8cf5a9ae2fce80d13cb1e300783a7649db2a80943c22800a7ee7e087d6f SHA512 6672aabad03b77d35a3f21ef344ef7e41683188b1ec9acda4756e8b6ebd9681d689b8a5249277eed7bf7996d0aeee3c94f5dd89cb693e41561483d02a819d8b5
+DIST kfilemetadata-5.67.0.tar.xz 422184 BLAKE2B b1c66f91f48dabe25a6283a9af3a21164bb05e0d94fe9e463b7306c26b10347dc5835a707f3d9890759023a8f643dc03f6f572dcb1d14ff89c2baa55d49d0e82 SHA512 f15836611b86b93a055b62d4c7f08e35ee7d5d6fe07a7330dce5c251beea72e972c7ad3d4aec251f86d67704aeefed6037b3546a528f6c0653ac6185e86b604b
 EBUILD kfilemetadata-5.64.0.ebuild 1730 BLAKE2B debe8f6212036b68ee8ff1dd2721800b091ff2a4e06dc975e5683c1470cb8d1701f62a3847e0126c4e6a87458b90caac8057a7d673c10ccfdc4154e2fad247b8 SHA512 a3fc65c779fc67afdcad18396c5ef21f56a245b99897fb90385a879aa5ad3ee8189171f7735ef37b206ac3b0d5d4d2156640616c3a3c4e8b3d2b2a7033b48c17
-EBUILD kfilemetadata-5.66.0.ebuild 1742 BLAKE2B ab1e008a82b639b61503509da6925891c26e5b78b2d69a12c9b7f50c747d47060927ecb64cbda46662e10efe27a960e9d1043e3d8f8123ee8856ec3da2afb11d SHA512 f4a8c6718c3bf6cdf2b8845254fdd2abf55ad0d878a17dcb39c183dcb7b32dd1a7f8d9ced367e91f8316d55c0550e4a7fcb14089eb7216c28ce696840991d586
+EBUILD kfilemetadata-5.67.0.ebuild 1742 BLAKE2B ab1e008a82b639b61503509da6925891c26e5b78b2d69a12c9b7f50c747d47060927ecb64cbda46662e10efe27a960e9d1043e3d8f8123ee8856ec3da2afb11d SHA512 f4a8c6718c3bf6cdf2b8845254fdd2abf55ad0d878a17dcb39c183dcb7b32dd1a7f8d9ced367e91f8316d55c0550e4a7fcb14089eb7216c28ce696840991d586
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.66.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.67.0.ebuild
index e2571ceeeda9..e2571ceeeda9 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.66.0.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.67.0.ebuild
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 90b7f4bdbfa2..ff2f036cc942 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,5 @@
 DIST kglobalaccel-5.64.0.tar.xz 84860 BLAKE2B d531f57fa9b4310e2373b2764645431c2a2fea925dc787655643a69aa089a10023e64d7a4605a1ec5f7c210e1486b730d90beaa1c0b108d1970817d82680d06d SHA512 7bb24e2eebe2ef96e00d23f249da4d3f2d55b5ba5cf5c58e094bbb2a5110cf1607bda803a1311a1febf5579d2602be72fd50099203b89b906363af1cdf9caf0a
-DIST kglobalaccel-5.66.0.tar.xz 84624 BLAKE2B 34444aa8fac8fd170c8e928d47c70fcd39f0900797acd032ec45d38ae408b201164d22eea955c8e9e62d08d7b0661b292a227b049de10c4d2aaecae84a4428bc SHA512 49f876984162d6d9d008f8cbc9c08f4d8a8b0a1707d206d0f556c8356730bf6eafa4b000af7d258f39162a1b13a3170b720142de3a39f45983352c17e39b9953
+DIST kglobalaccel-5.67.0.tar.xz 84964 BLAKE2B 248795969c06fa3727be234f6e9599b2cc6391f7e88aa169a475001601ac8c6342697c0c3813d7dacf9f25f52d0de3929634cefc341c551f59e6b2b31815a6e8 SHA512 440447fe394801c2bc33a9dced707464c2f8c21f328d5955f81a1236caf489feb82da128d16210aee0220b557d19cadf0c36d58c471a212bdb2fc6f54918637f
 EBUILD kglobalaccel-5.64.0.ebuild 758 BLAKE2B 9451730502b163ba5430c10bd440c6083c608eecc66fcb2c899f5067900e751b3ca6b434c0deeca68033459888a762d32ed2eabe0754674977783b813ce9809f SHA512 2eba8980bdf186392c0ab3e7bc2d2be9913ca701a33f6161df7f0a43f9cc7148498db4fc03535ee246f5a67a002413b5681bac50742af7b54291fc986a9b4c01
-EBUILD kglobalaccel-5.66.0.ebuild 768 BLAKE2B 0ae10d86b3863a05742a762b2b4361f7e338a4b3869f9a16b7c17f74c164c6acb820a8bb11b959937cb58cb616e8ac5c735411a9e137d2072095e61e5e8cf956 SHA512 3a08e167b5b86324a565c18ddec324f1dffb4d54d5f05e2b094562dbb8a928ba9e2567fe919209742384d2a31611e41e0f8734558c5b9fc73058551d8bbe2e36
+EBUILD kglobalaccel-5.67.0.ebuild 768 BLAKE2B 0ae10d86b3863a05742a762b2b4361f7e338a4b3869f9a16b7c17f74c164c6acb820a8bb11b959937cb58cb616e8ac5c735411a9e137d2072095e61e5e8cf956 SHA512 3a08e167b5b86324a565c18ddec324f1dffb4d54d5f05e2b094562dbb8a928ba9e2567fe919209742384d2a31611e41e0f8734558c5b9fc73058551d8bbe2e36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.66.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.67.0.ebuild
index c6dae7c8d9a7..c6dae7c8d9a7 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.66.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.67.0.ebuild
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index e8d9c0431fcf..a2980cf30860 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kguiaddons-5.64.0.tar.xz 40604 BLAKE2B 1f312cb8edff81f33d39ac32a78d935640a8e876e8eaaeaa4befc9be4f6570e0885b69f621c10792bb9de09b871ec6941407be9e4a2cdd5fab429860c90db6ea SHA512 008838896b415a115f922c2626ae0cff95414ada6a99d7d4b305a78e8534072baa06162dfbbb046527c1f4376db13e14bd9e9e41bcda550c3821da41fba465d0
-DIST kguiaddons-5.66.0.tar.xz 40644 BLAKE2B 76e64f2c37825c35188c820df09681bbcacca2e3ae3494d85641a5e65d363f74bca9cdc6a22321869fec08045993fd330ad220483bf084c861881156d77933b6 SHA512 d5fabe9069e404c91172e9bb73d570abc325c32b82d3265e03822ed89c43025337e371e3970248a2021401f90c406491a2dd4f2a8aff1fbc852aa052a5e8fa9e
+DIST kguiaddons-5.67.0.tar.xz 40580 BLAKE2B ea7c871f236b4a145729a9d54a587c2ddf374aeac6df29791e76cbb81c8cdc3dcf7b0e308a19baedddda186acdf9f5b6019ec11b67ad0dbf14acf967e3c0fbf5 SHA512 4c4c580d6f1af072efc744bd217d25d366b000918c1aec0bd5bde985b00a5f50e560407e53044b098056e7a1a1b77dc1710d15d768196b99b688d38ff1000566
 EBUILD kguiaddons-5.64.0.ebuild 459 BLAKE2B 546f8e2c931b4ab2012aebdfbf8ce76713df02e8912134309469c2fb32067e2d20db3a7bb3feba8021a46a7499dc3afb31645f0dcee9badd1df1d7e3b7acd56e SHA512 5a4b694b420a544efae06b2d3bb08ded02508090c96c792c3dbee460d344909da0b52236c1e9c15782406581745494df5de63a8af88b51f3b86b93b5fe4f5596
-EBUILD kguiaddons-5.66.0.ebuild 469 BLAKE2B 57920fd553afad65460b8f195d9a105428ed009f5c1afac5c7a8f33ece7f15eee2ce81f54f133b4ab1e8e68bda37d10cf128fd4e3745874db43405661235b0fb SHA512 956fdd29a8c652698c7fecc00609324d6c056a821c9106b93477ba761ad1b9379d018f427f5049bff2b33a5b3c18fefd65f16dd66441c6ab318555f66ff04279
+EBUILD kguiaddons-5.67.0.ebuild 469 BLAKE2B 57920fd553afad65460b8f195d9a105428ed009f5c1afac5c7a8f33ece7f15eee2ce81f54f133b4ab1e8e68bda37d10cf128fd4e3745874db43405661235b0fb SHA512 956fdd29a8c652698c7fecc00609324d6c056a821c9106b93477ba761ad1b9379d018f427f5049bff2b33a5b3c18fefd65f16dd66441c6ab318555f66ff04279
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.66.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.67.0.ebuild
index 3533b5d8c8d8..3533b5d8c8d8 100644
--- a/kde-frameworks/kguiaddons/kguiaddons-5.66.0.ebuild
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.67.0.ebuild
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index a521b71d7e36..e7c23329b47e 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,5 @@
 DIST kholidays-5.64.0.tar.xz 206244 BLAKE2B 2040369c2715329de574b6df030879e62be3026d17a8ae3f856ee21ae219c05f7e7ef83639aa5afc8a6d3657ae95b5c63a84868829280d5844ebb16799d323c9 SHA512 a2e06c4c2a5c8afd87a2e9504428dad0ea2de5ef0e35ad29a0600091978abdb0d85285fd82a05ffec3c2a1296f760fe34a33efc08971d0957fb81fb17fffe87b
-DIST kholidays-5.66.0.tar.xz 206244 BLAKE2B 41b088f0986c3a6140b3522b9c651cfb2e53094c591f8838d3a306e6f46f39e2c293004878b365c9087d61dac5da9e2af89fd55b4b5a12e6f8c45b6b8c5b511b SHA512 67599e550da9391cab48925e5d12f8c526e9fc6d9739dc6e4e6db8a5aba91b1c48f2b5a391a4d3b3194abd0c64f7caf27414e8795430cc147a07904a7beb7e31
+DIST kholidays-5.67.0.tar.xz 209816 BLAKE2B 04db5b33f18ee6ecf0e02eb05cd6a835ca2c0454685fe62627c74be3094f532810c938c546948c4d511084df3324764788950184adf1f67420e5781aeda37e47 SHA512 9330ae2f0fcb79b7b93549835d9a9401d23842b67e2b548a50bff888d298122654e71d5a0f6aefc2dd2a198bc34088aadfe0fcfb5b6743937cc761aae8895f4d
 EBUILD kholidays-5.64.0.ebuild 666 BLAKE2B 7760165c86d3a15ef97d7d399a0446c8585bceeaa54e3841826531f488b9a3fae4f5a88973e5fdfa3e998396982615295cecded058ec77fd490b68fff1556742 SHA512 d9163155de987822775472ffe3fcad80a9025b6026777fef57f307248abbdb52c2b9ad776cb1a1935f4ec0a3f743c1a957d7dfa45d43c59aab26602ea3d4e6e7
-EBUILD kholidays-5.66.0.ebuild 676 BLAKE2B e60f5488d5779e9507dd99e41de4c995a573aa17ce60fdb3718399e3d30b235d74cfc0836f785cbb897adefad36f3499839b2cad2aa082f60b0f5e0fb6c7deba SHA512 e8da8badf5e0b0bf2d078d860809d8b534ce20f3e5567a99f1c8221b1471e840e9b03c0f4d4560b18b9f2830bec4ee920e784e1d206499dda34b5f911e8d59fd
+EBUILD kholidays-5.67.0.ebuild 676 BLAKE2B e60f5488d5779e9507dd99e41de4c995a573aa17ce60fdb3718399e3d30b235d74cfc0836f785cbb897adefad36f3499839b2cad2aa082f60b0f5e0fb6c7deba SHA512 e8da8badf5e0b0bf2d078d860809d8b534ce20f3e5567a99f1c8221b1471e840e9b03c0f4d4560b18b9f2830bec4ee920e784e1d206499dda34b5f911e8d59fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kholidays/kholidays-5.66.0.ebuild b/kde-frameworks/kholidays/kholidays-5.67.0.ebuild
index 0fd36805be87..0fd36805be87 100644
--- a/kde-frameworks/kholidays/kholidays-5.66.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.67.0.ebuild
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 7c900ed4a132..6768cc975893 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.64.0.tar.xz 2083068 BLAKE2B 652d097d3b628e2aca16e70bf79e92955c55a5ec5aaa8cbdb9ca6019bd66b0f1b0157931c24248691e78edca38a9c260ff0170d9c0595ee19e30930df428db91 SHA512 920412d9526fc478817b4aaf9a762d75f109f69af3a9eccea8f4a9e855e17666e47b65548f430f0f654ea87afba7d556357d8dd1a910c6a466e1aeb1a9ee9d5e
-DIST khtml-5.66.0.tar.xz 2081304 BLAKE2B b8dede2c087e6bd7338fedf8e4af9634ff75f4a78668c007f2f24efde05d16e8ff8f8a134df7f1a978e493a1e836763859fc782ef2580561740718096830792b SHA512 15171d70fe86a688203b514607a3368f6af05f5021d9139d59f1b8d3012084bf7d269a1481535983df2a13a9a02033b9bd02c17b983b76dd9939db0163fecdbb
+DIST khtml-5.67.0.tar.xz 2085332 BLAKE2B c55e674b02612a2269aa92e790327629ea99af5e9a9796322ebda2b3ee49cd654a400a0c47aecb3aa185ab81179a2b817ba2e14fce3043e4eef9d9c30a57dad5 SHA512 c49dd43e345e3599ed6c3e076895732a30b553ef0db6da0512b6577ebca842529e497964bf71e64d962c9b7456c0ecdb8716792ad163aada1d5444d00d080145
 EBUILD khtml-5.64.0.ebuild 1802 BLAKE2B 732ce5ca88622ace4463c1b03785c5896190be0821fb280a77ce790d3d60173b8b45272eb2d90cdff096cd23296c300dd6be054c018aa291ca932471d99a3a94 SHA512 4f3ae75242e7542930d0a704c288448db606c3c17d65289bdf556f6c97ab10809c296e330ca73c1e40ce0641ef40a8162d71e24430827db11f3281093d7101eb
-EBUILD khtml-5.66.0.ebuild 1812 BLAKE2B 0c1ff68659350ca33c65a1b606b1256843d8bdae88d57952f06df5e4505947622f337129fa6f66c64f05475713aadd965b02648ea96295f9603341b75501c804 SHA512 472a7ce3a7ac02f46aec1c9e47a2f3611d49af6fb7634c524aa74f56ef0a17c3a0d9518fd96daf70bce460e70d4ac846d417408bb6d38aa2353cd9d5634a35b2
+EBUILD khtml-5.67.0.ebuild 1812 BLAKE2B 0c1ff68659350ca33c65a1b606b1256843d8bdae88d57952f06df5e4505947622f337129fa6f66c64f05475713aadd965b02648ea96295f9603341b75501c804 SHA512 472a7ce3a7ac02f46aec1c9e47a2f3611d49af6fb7634c524aa74f56ef0a17c3a0d9518fd96daf70bce460e70d4ac846d417408bb6d38aa2353cd9d5634a35b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.66.0.ebuild b/kde-frameworks/khtml/khtml-5.67.0.ebuild
index 1c807a5c5bfa..1c807a5c5bfa 100644
--- a/kde-frameworks/khtml/khtml-5.66.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.67.0.ebuild
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 13e2ae1e51fe..8e67583613b9 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,6 +1,6 @@
 AUX ki18n-5.57.0-python.patch 512 BLAKE2B 9feb6bd88fbf7ed853be777320d5d4821320da91308866d1afa08f3e7ee1631f3f59e2b096c8aa6f2b2562ead934ab11a03633fa3b09cdccd1e292adee7adfaa SHA512 51462a06c232b9ee1eb1f0e290ba286f7f7702676e5b8c86626dfcaa0ed11b3d15744573643960ead459f9366e21d859e54e344abf7108f084e84dcf0765b596
 DIST ki18n-5.64.0.tar.xz 586948 BLAKE2B 9c3989f530ccaba3bc43f0e30aa9426c8eadca88cbaa44538d8d47ae71442163d31f4593fcc5d34f59e3542f03dd8b9eed90dbf57299f2ddf285632aae0bd893 SHA512 68e65934a19621850a189b9aeb24b48a3bb8ea493ed5af1e490030154f759b653aaf0e1a27b5579ad36ca3cb249c7ef72b7429dbc70aa27be827a608b68577c3
-DIST ki18n-5.66.0.tar.xz 587996 BLAKE2B b5b4b0cbbf4e22a30ac924582ab813488319f5fda015edc13358e77dfb4256cf37d49663b82673a874ab7e06e107678de45f899c0938af8d5556cc89195d878e SHA512 00d310f84af139946864cb17cd85e80bc3ef07d9ede2c92ca56a66b4f31ad79071acf60caad7e8ed758954d396984e1e3f12b5dbf336bb8be2be3349fbfa9245
+DIST ki18n-5.67.0.tar.xz 588772 BLAKE2B 1e55444d1ee1539c526a6d9e1194898dbbb86222ffd3b689bcf5b06b6162ddead183864134831d19a0f37b1403d42b0899cc23215e4a997a5d81eeef5c8d9b84 SHA512 509db8423cb5cc20b927e8f5ee789cd08758a2a2746c7c2275e8b0c2c15c237e847bceb50070256452b28fb4d673f2b84863f65a45a042fbf28bd9b47d0913c1
 EBUILD ki18n-5.64.0.ebuild 751 BLAKE2B 14a00c3194984cfdbbcb27a5e78ea1570691b73ce3438e2fd0a018a99f0c84bff957ff3a1da19ec33e3c7a5993f5c30f95d92764edea14a20329221fd85a6ae8 SHA512 f39819648046b3b1e141c268672e7523b4678ed995e86d4c5c4aba9a039be1f935b2bb9516aeaf49fc273995a92d59ef0966526f17cbb2beb8a2f5b2bb709205
-EBUILD ki18n-5.66.0.ebuild 763 BLAKE2B 035afdb097f1c571378f87631be0728bd8b2ed79331fcd4ba3dab6f52b20fe67e248f815ea26c953d6d69c345436c0b14c78cc33d38d911441140a17c646da84 SHA512 90b9660d7454ae0ca05a846608bbf9424547ec24f66b52c3c102fc89838ab5c26480a95effaffe2fb148c591e3f8eb358eae671e52c450160e8d99a38a66a272
+EBUILD ki18n-5.67.0.ebuild 763 BLAKE2B 035afdb097f1c571378f87631be0728bd8b2ed79331fcd4ba3dab6f52b20fe67e248f815ea26c953d6d69c345436c0b14c78cc33d38d911441140a17c646da84 SHA512 90b9660d7454ae0ca05a846608bbf9424547ec24f66b52c3c102fc89838ab5c26480a95effaffe2fb148c591e3f8eb358eae671e52c450160e8d99a38a66a272
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.66.0.ebuild b/kde-frameworks/ki18n/ki18n-5.67.0.ebuild
index f5ad71ce23dc..f5ad71ce23dc 100644
--- a/kde-frameworks/ki18n/ki18n-5.66.0.ebuild
+++ b/kde-frameworks/ki18n/ki18n-5.67.0.ebuild
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 960887a53477..7b68bb805be3 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
 DIST kiconthemes-5.64.0.tar.xz 209432 BLAKE2B 0c2db037a3b5e2ddade427a61caa2b66d592f989c911aa7912f0bd61c01583a7bef75b4804fc7577faf19179adc3f77c8514bdde5dd0b7152212b4734a8a7557 SHA512 4b58248b8a2ba026fff925fa4f67702cf7c9f4ae259fe99627bbc17783a97ef12b4feb91ac464a7efad82b3f52dbc23ecbfd9dddfd2657cae91ee546e332f835
-DIST kiconthemes-5.66.0.tar.xz 210520 BLAKE2B a58bfab74953bb438b6a04dff398d8da45ba8e31eb44c91778fea3f18442e8f80a7691f80749ec293dd31312e0d05d1159912564cd934b3c6ded66ed90d21b3b SHA512 d220b7c33b42ba08f3d3e2aa5b8b7e2a81e64172fd99b2213a13116f52148f9793b0234466758907ef52bf2287f3f370a59a2c30d6bb9cda7b46f8dbe7e14a8f
+DIST kiconthemes-5.67.0.tar.xz 209548 BLAKE2B 76f4b1534a8679783a0ac0157359a29580c22faf34689c364d05a1adf5b4f0f7fdb05e0d6a9236094fefe6f0ea802a7d12a6a8e0cae296707661819991aada16 SHA512 c54971e1a070d406639033d98c50f46287e1a266ebc859059252a14b267fc86dbb57d45cdadc246f73b31db47ad5b365b2f5b46ccd14d5e3280512f0f334b821
 EBUILD kiconthemes-5.64.0.ebuild 792 BLAKE2B 8de839ae52b69544312f2fe4f56ebe2d8e36ac1d4d5b962098151f9136e70c64c0d2c8862d78542b73dd7675c7d5245b06eee2b0f7005f3201b20b0ae556abce SHA512 37e3d5f6de2d80bdc62072a6d971e11f54d10b4d8f2c8a562a0ba208ca8324c9863d9343bc18d651cb8b045389a0c6897818eba76b78591ee44859e9bd3a013a
-EBUILD kiconthemes-5.66.0.ebuild 802 BLAKE2B 2c6b63d0fcbdce30cdf5f0d16d0806267c9d557c5e0541d20cd3a2a2bec97f2c193cd023f01c716c40a4bf608ddf035b722c2073d32caa6275561b3898446dfe SHA512 d036c1c658b443ff1bad9197a6e56c03bd1619aa802063469752e30ed08b26143913c8370bce32a21256e8ce167a6ada75d153d22770adc246c8db6e5408d3da
+EBUILD kiconthemes-5.67.0.ebuild 802 BLAKE2B 2c6b63d0fcbdce30cdf5f0d16d0806267c9d557c5e0541d20cd3a2a2bec97f2c193cd023f01c716c40a4bf608ddf035b722c2073d32caa6275561b3898446dfe SHA512 d036c1c658b443ff1bad9197a6e56c03bd1619aa802063469752e30ed08b26143913c8370bce32a21256e8ce167a6ada75d153d22770adc246c8db6e5408d3da
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.66.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.67.0.ebuild
index 0ad7045948ed..0ad7045948ed 100644
--- a/kde-frameworks/kiconthemes/kiconthemes-5.66.0.ebuild
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.67.0.ebuild
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 90782055170e..225d11641a06 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
 DIST kidletime-5.64.0.tar.xz 26800 BLAKE2B 7e0fadd09682608558bd04b6b4f5c2b7f3f200d5d79febcf176cc8561aae7f45d847141922af80148fe4b7c095a0281011a2cc77e7bf432e97fff32e5cb03699 SHA512 d915ecf110c771f75e0af0bef28602dd85c1127e0d7f50de828745b7d16d8583bbdf0a81e2609257d796b9edc83de4e65593ce6ef9cbe15b606c8c8d4050bc66
-DIST kidletime-5.66.0.tar.xz 26712 BLAKE2B b4321787fe71b2003e7ca631b0cbd20c794fe88512686d629f7a996fbd2a5969590e1cb09c8bbb9aab863c2c2189df20a19ccc7b4a4f7b80344648018d768f2b SHA512 9020dea8f401a2f4331de6495122ab8fae3c52c5b91c3558d0059c0b0c05c456c2930be8cf35c97da0673a73c9e165b0902c5a9c2da91280740b163ce1c69a5a
+DIST kidletime-5.67.0.tar.xz 29064 BLAKE2B 4c77fbfa84fb6e334361057089099feea961c134daa0e8ce69fc4489240587834b5110807f209956d00f62c83c0078007dcbc736ddc834bd56974f8a7f5ca7c4 SHA512 46c8f2c2b7b36395f1bdd93a1e9a24a720309c889e31318659ca450af538dc1a5f37f51e56549441ec715c4d94dfffd2b5d49671dd997361dc356bb640f5a4e6
 EBUILD kidletime-5.64.0.ebuild 879 BLAKE2B 62aad7f4f54514888f319f849a38f03de2ea632bd3b2e9d64c0432d95db67f2f313d55b59b3d1fa4f3ccc19037af4abc2094456f096eebf37fb7e1b1b1ea7a70 SHA512 9bce808f6dabb3bbde4f9cf9f80361e45a9974e2fd9aa5e1815544a87302d94d0f2645b4de69a88ca5acab38b1ead89ed06c60a7352a3066dfdfa7c341b96e81
-EBUILD kidletime-5.66.0.ebuild 889 BLAKE2B 1414a8dbe3fe1e274c0d993f5e000adb0793ac0d2c18f20951c5e97284cad5e1fb6cfdce9e2e4ddefd47c84e117165c92c0117e8e73cc2a90fee6b13a0457394 SHA512 0e196157a214b90fcbe91f8a95cfba83189fec6aec1069d946d3a9f920367eeaf68f6580e84f4799e6f30d0e79d2493ede32f1ad6f12c66019749b4f85eae731
+EBUILD kidletime-5.67.0.ebuild 889 BLAKE2B 1414a8dbe3fe1e274c0d993f5e000adb0793ac0d2c18f20951c5e97284cad5e1fb6cfdce9e2e4ddefd47c84e117165c92c0117e8e73cc2a90fee6b13a0457394 SHA512 0e196157a214b90fcbe91f8a95cfba83189fec6aec1069d946d3a9f920367eeaf68f6580e84f4799e6f30d0e79d2493ede32f1ad6f12c66019749b4f85eae731
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.66.0.ebuild b/kde-frameworks/kidletime/kidletime-5.67.0.ebuild
index bd515e82d88a..bd515e82d88a 100644
--- a/kde-frameworks/kidletime/kidletime-5.66.0.ebuild
+++ b/kde-frameworks/kidletime/kidletime-5.67.0.ebuild
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index bf6698a5c22f..ef2ccbf082b0 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.64.0.tar.xz 244584 BLAKE2B dd13eb902dc883dd3d378e2b438556ce519da5466978fb62095be88993733c38dd041ae7f9d926cd2ee0fc26bb1959d5ca5067291d191db8e39a01de576ef655 SHA512 64bd790224553b5ea7b600d8007a0fe6e833a1bd991df78b92325962d7f4a62a74d55138c27b683bfec23f4f4e840173a6e4cd2bfb6035c3d36f5b6f84307890
-DIST kimageformats-5.66.0.tar.xz 244464 BLAKE2B 6f723852228b8c3460f4332730de82086d0967eae031f1da326f8a51d007eafec32e06174455d774c794907eec0c33c5820359311ee8d3b0e935d4c206db75ac SHA512 2ce33f4abce28a2d8320899bf9a9643898c0178af28094a9ed1b84bbf0e4faf184e80866817947f744d3535ba5af6b22a675e757c91b107c34db3e53cdde2e65
+DIST kimageformats-5.67.0.tar.xz 244656 BLAKE2B b7658dc6bc0b2468025d142f69d4c9581e79cfe98edaa210d4c493bb63f47c72a50556c9bd01913ae822a7e934b24474401d45f7e98fcd7fcaf54413eaad7a0d SHA512 c54492ba2ca7b7b0771b364c46791b9ab3c11ecd22b9106168a0bce4fc0d3250eb6be9519e30e52ef5de7ab709123c38ed0527d243929c651c20e7e70ef52ec9
 EBUILD kimageformats-5.64.0.ebuild 769 BLAKE2B bacd7f3a149d96c5661384ae4cc4d87b772af1944fbcc353450f6cfe234690fb7f04970b9a209e8d92c1fc6ce5ceca098d041f7508f7bded56fe97e4515abd33 SHA512 c708f08aa555da2d907a6e511273b604a4ed3d0914903d6333cd3815228701f8da1da5aab4d5d8a884a19058d2b95bab603be721cbcc6ee974ac01d3a977fa1f
-EBUILD kimageformats-5.66.0.ebuild 772 BLAKE2B 500265c1970679dee91e24af98c3d8a576eeee401e08823d828e0e1140ea806a049239c77cf61e234d9f922386bc202b4d045e4aed6d004d7a5dd8afb2c919ae SHA512 783f71cc775c214cccad82d36fb72b9e9e562775b2acca4772f53209ff8d376a9cfc0375e62f7d77e4c68ccedaa92116680529e5feb50762a7fe56414fe40f6b
+EBUILD kimageformats-5.67.0.ebuild 772 BLAKE2B 500265c1970679dee91e24af98c3d8a576eeee401e08823d828e0e1140ea806a049239c77cf61e234d9f922386bc202b4d045e4aed6d004d7a5dd8afb2c919ae SHA512 783f71cc775c214cccad82d36fb72b9e9e562775b2acca4772f53209ff8d376a9cfc0375e62f7d77e4c68ccedaa92116680529e5feb50762a7fe56414fe40f6b
 MISC metadata.xml 327 BLAKE2B 830c0a5e6689cfb881f6c878199b45716bf683fabe3ef6cbe51c757efcb057ad253912930b1637d958e26dbe0072ed25fca3051b752084a634dab1d1f34c7e6e SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69
diff --git a/kde-frameworks/kimageformats/kimageformats-5.66.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.67.0.ebuild
index 4b900914bf93..4b900914bf93 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.66.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.67.0.ebuild
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 30a5bf0bb5ef..756764ccb91b 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 DIST kinit-5.64.0.tar.xz 120736 BLAKE2B 01550b13f70b05eb1923d041ab2095db29f7d8da0e651b3ae3835c2a4d109ac22b24af05808cc68d37cd9fa14687d1541ae430fa172ddadcd852e3604767fd02 SHA512 0de8f07e91f5c24d263fda052dbd79a2fecad882e0fc4b2f2bbf82d61cb0249a8c3e8d1131199fa9b561baeed98f61c1646df7f820aab81b3597292a89a3d89e
-DIST kinit-5.66.0.tar.xz 119088 BLAKE2B 26d913a466bac98c5224ebff957c97ebbb1f6a7fc881cee8f65fe1c6922626e8ed45d3276fad0a20261d4c2ba2670af19695bdb700a72d4c77cf16098c2b26f0 SHA512 a8cf86e53cdfb4c361b492f3a8dfe05cea0f1fb5e798e6a043912e9ab229088e0656f60ea9eb92d9e44a3fd882cc0eab93994aa1ffa1646d7ae18c6729d0438a
+DIST kinit-5.67.0.tar.xz 119240 BLAKE2B 81072b60204c95cb562ed65cdbfd683d721afcb7969e3b82050a395cec943957b55310887c9b03aa876e07ca96b8cf2310a9f75e28530f9dcd9bb0e597e55a94 SHA512 d021eaa19b413955e9eedc4f9c756399bdda2f32f95b70534bdf67adeeb873552f072786b342487e7f7861182c2f5274c1755687a5196cb2c069e58f40b6b63f
 EBUILD kinit-5.64.0.ebuild 1085 BLAKE2B f9ccb40192b52c7e413d7f6937367ce5a9b93e980deaa3966d17ee8f052d0e2b9afa5d3c1e76101c71cca17a64116bc793eb6e61b646fc11027f5cd91b48d9d9 SHA512 c1f8357cf161128d469299f2d891de92fe9330103e0e53bb7f6d6b02dd0601b72d4f6fa6cf5779e017ea7eed1fab71125621e8bc78df557a0c8fb3b12ad7f05f
-EBUILD kinit-5.66.0.ebuild 1096 BLAKE2B e47c99bc805961d88af64a681b8fba666dde8dd44d1e0c8746eb9cf5dfe50de5e4de261cdb9a6087d508e54b814510bce85c6c8d9582fea1a6f46d5d465865ff SHA512 b17655dabaa88ad5a9dc16bd1145b615cf62df8e0b7acc9bcfcb9cb4bbe39d89c10a40685af4960a8475a5233d3f973cbe48db5fde29cbfb2b7b7f33fa7cfa5d
+EBUILD kinit-5.67.0.ebuild 1096 BLAKE2B e47c99bc805961d88af64a681b8fba666dde8dd44d1e0c8746eb9cf5dfe50de5e4de261cdb9a6087d508e54b814510bce85c6c8d9582fea1a6f46d5d465865ff SHA512 b17655dabaa88ad5a9dc16bd1145b615cf62df8e0b7acc9bcfcb9cb4bbe39d89c10a40685af4960a8475a5233d3f973cbe48db5fde29cbfb2b7b7f33fa7cfa5d
 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a
diff --git a/kde-frameworks/kinit/kinit-5.66.0.ebuild b/kde-frameworks/kinit/kinit-5.67.0.ebuild
index d1e0bd909242..d1e0bd909242 100644
--- a/kde-frameworks/kinit/kinit-5.66.0.ebuild
+++ b/kde-frameworks/kinit/kinit-5.67.0.ebuild
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index e341e2ae35c5..b8a00c83c420 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,8 +1,9 @@
 AUX kio-5.64.0-fix-ftp-proxy-settings.patch 1328 BLAKE2B e98d9be736b6f2df4928e113533d5894858cb174456407dafab00fd496379f8f223b028beeea0ff37afbac0c676ee6ac78717a48d27bde73bbd7396c8fd9b796 SHA512 44aeb4f6edfa1aa95157cd1596bfac5aa920d66619de1976f22c4fcf214b2ee5fe5856e28fe9d8c1c4a7036d7aa00bc2e1f7217a0395ee25fd9c1e11c7132389
 AUX kio-5.64.0-fix-http-proxy-settings.patch 1357 BLAKE2B 06d2a706dc71eb4febf5577b9243ac21636b55e28f0952208a1fd65189629fbff9fdd45dddba7b003b453510e54623670dd8a344ddc34c6f31a96fe44d6a453a SHA512 931b3bdc63409c997c945c98376152fe397835eda98cb5c312feaeead8136092e73b3ebb22cd054169a9214bbc85f0c6d27adb5a7b70fb47d051165b4f549678
 AUX kio-5.64.0-fix-no-proxy-settings.patch 1722 BLAKE2B 884221f34e9370889e4ca3076fbe824e87eb6801b9463b534856b7b9cb5087b1de1073013d6c9185e6de7a5d4a852a7a6a6ac5f7cca1ef91809947228df54150 SHA512 568169ac2f34114f85ceadbab8a010f4cbbdee790e17132808cb9fa1fc7a3525a545ec47ff242ba29f5f088c33cbf4cbaa22c9e9585a21866ad5820dbe517102
+AUX kio-5.67.0-memleak.patch 1461 BLAKE2B d891dd6e0012e23ac76216ad7f569215bcb17b2283e1e6dfc66ced2633fcbc41eae7830a3f670c8605396387c59b2338b2628f9919dbbeaeb557bea864b40931 SHA512 8dcff03fcd915c1adff16976839fc85b9e2ce6cf509aae29a93b4f385e8af0dad241360c87413943d5755c72de2b4c2da5423d35dc4be84dcc61756502abe407
 DIST kio-5.64.0.tar.xz 3176912 BLAKE2B 148e42792d16a5848ae82767d6b609c6475a0576d930ffafe6276fc44758751e5a435956250c937c05e1d8472a79198b5d4953e7eadc928a19ce74dbe5dc336c SHA512 fe629c397e09d045421ba7fe289e6f0c490510b2574190c23becfd5272c6fe760ed830d6a9282ab61da028028fcff768b82760ac4a010ea88ede0da1d3dc8652
-DIST kio-5.66.0.tar.xz 3202728 BLAKE2B 74721ebaa9ab63fb29b5310f4f49562b20df2e97a3582f80e1060613719096d624e9dac682f3433e16568a6c0cb82c789a1af67afe659b1f7ab1f0d0b79665ab SHA512 7be872029fb93e76663291e868e829603f14fadfb0264c2c7dff351eba64a8574776a595ae57ca920a394e56940b220fc1065c01d0d88858fe3b7a3e5757ce87
+DIST kio-5.67.0.tar.xz 3223032 BLAKE2B 297ebb3f12282951e85edc4eb9869ff3b6fd9536aa312f32ab7403337bb13a142c37edc03ae2295fe55cc935d6952c70e0efda95a3fcc280709e6ef33c30ea04 SHA512 baf1e6abc6ae1ffa4010245a79cb676787217d365fb033f620a9da293565ec267186afaac08791104cead3ce5c87d3a76ec89b796355361b326b16f044691d72
 EBUILD kio-5.64.0-r2.ebuild 2344 BLAKE2B d3e798c1f2e962b09bcb51872819d12cb027664cc7b9bbeef048e4f2f51791cd91502961bd02bcb758c1f4274821586f8a890fdf3a4ac9cd0db35368d6429447 SHA512 641e02da13919f2566031f3c76c2b4b22d1af82b1744a70a21f8831055f76111a83b8ce456e534dfadb2570170f2fc08d35e86a277f191c1271dac673074d725
-EBUILD kio-5.66.0.ebuild 2255 BLAKE2B 07f27995110d736db434d98a4bcbd6c7716025475a667ddcf6603e53b12aec80c34a3a13cfda028609abb5b80e4b5b19eab9d958b5dd460b8c69e0fc27118d4d SHA512 3b8be1b4b16d5047362eabe3b705b4b68474a17c0533dc8f9e9593a4b415bbce121c858ea3c94a047bfaec656126dc1b502fd0002a88959f496b4fdc024f3ba4
+EBUILD kio-5.67.0-r1.ebuild 2464 BLAKE2B 69e9d94d2e6f4e9eef75b1f2aa3d3a383d4171010437ca132d78969a8c2ca4d725f266a18924c901a8ba198664d1f91aa9a135013eb4bf43564f7a83f01a8f3b SHA512 37ce30608d2b4b80a0493fa42e9f8615333ac9fd25fed55ae8ad552649288fc5f6ec30d9fccff930a6b14b32c25b3686d778046f49aef01cc864249e97f5988d
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.67.0-memleak.patch b/kde-frameworks/kio/files/kio-5.67.0-memleak.patch
new file mode 100644
index 000000000000..cf168b791836
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.67.0-memleak.patch
@@ -0,0 +1,43 @@
+From 213ed50634c02d8ec4aa91f0c307cfdd6f78170d Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Wed, 29 Jan 2020 19:50:33 +0100
+Subject: Fix memory leak in KUrlNavigatorPlacesSelector::updateMenu
+
+Summary:
+This method gets called each time solid notices a change, which can in some
+setups be very frequent. It leaked memory as the submenus and their actions
+were not deallocated properly.
+
+Test Plan: Builds. User feedback: "so far so good, 160 MB Memory usage". It was ~7GiB before this patch.
+
+Reviewers: #frameworks, davidedmundson, meven
+
+Reviewed By: davidedmundson, meven
+
+Subscribers: anthonyfieroni, meven, kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D27002
+---
+ src/filewidgets/kurlnavigatorplacesselector.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/filewidgets/kurlnavigatorplacesselector.cpp b/src/filewidgets/kurlnavigatorplacesselector.cpp
+index 7d33930..103a5fc 100644
+--- a/src/filewidgets/kurlnavigatorplacesselector.cpp
++++ b/src/filewidgets/kurlnavigatorplacesselector.cpp
+@@ -71,6 +71,11 @@ void KUrlNavigatorPlacesSelector::updateMenu()
+ {
+     m_placesMenu->clear();
+ 
++    // Submenus have to be deleted explicitly (QTBUG-11070)
++    for(QObject *obj : QObjectList(m_placesMenu->children())) {
++        delete qobject_cast<QMenu*>(obj); // Noop for nullptr
++    }
++
+     updateSelection(m_selectedUrl);
+ 
+     QString previousGroup;
+-- 
+cgit v1.1
diff --git a/kde-frameworks/kio/kio-5.66.0.ebuild b/kde-frameworks/kio/kio-5.66.0.ebuild
deleted file mode 100644
index cfa5f2ece815..000000000000
--- a/kde-frameworks/kio/kio-5.66.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5=[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		x11-libs/libXrender
-	)
-"
-PDEPEND="
-	>=kde-frameworks/kded-${PVCUT}:5
-"
-
-# tests hang
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kio/kio-5.67.0-r1.ebuild b/kde-frameworks/kio/kio-5.67.0-r1.ebuild
new file mode 100644
index 000000000000..ab22fcb45049
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.67.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5=[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND="
+	>=kde-frameworks/kded-${PVCUT}:5
+"
+
+# tests hang
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-memleak.patch # bug 708876, KF-5.68
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index bce25ddde648..51181b63a90e 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami2-5.64.1.tar.xz 155444 BLAKE2B 4dfe452a36e75ce44ccd78107751bce68d873d1f2837ec0c9010292ef70d6a9f5fa8b093e51dcfd28a72ad836c2b87068f9c9fbf1195b5466630f73459ffa9b3 SHA512 e54854c477e38aead0a69178c47bc3ac9874553af999b273454b4d5d0c9552b65d29775bb9c24ab556a022fd8b0f3b743fda3baa6d1dda61d7b1eceed26a4d53
-DIST kirigami2-5.66.0.tar.xz 159452 BLAKE2B 973ed06ce6eb0476ee59db6be3a31209c6d8f5374d27d305bea24be2ff2d3609d63afa56905d9906650f5f83e80a29e858b6591b6b94a6c5b12ee3bd073aabfe SHA512 9ffebb47c026547dd4471cd7e56d4c236a60636543158994349d8e48ebfa451f7153c447bbf467108304ade1768894e14bb0afe3d166906874ae48ee3a5378ed
+DIST kirigami2-5.67.0.tar.xz 160432 BLAKE2B 3612e905e5f85a0d4b1e357b5656b6e522e6aff162a143dadde95f63d185c802a4fd91f8d645ad6179b11dfd5dd7eefe91e28bdf43461df4c09059505398e802 SHA512 8c80539e8c4eaa82f035af12108f3bbb4e837e6acdd744d29538364f936ab4fdc8248004979a01fc44c8e737a544b5de726140f70d91f4e659d8e6bc4f571d39
 EBUILD kirigami-5.64.1.ebuild 991 BLAKE2B 4cc88ad0e09a7702b622efdbf02610be8aa19fd1e4ed0c940010ce00335ccd4995efefe5c0b4c3e0e5f23aac77cbcb285566805892de4b5e064ae269531ac31b SHA512 39be0728384795e4a1470f63820c5d4490889e517d59500a9a85d1796027fbbf783d2998424042947cb9dff3db979387a9dcc108c225b5d5ac842efa69567b78
-EBUILD kirigami-5.66.0.ebuild 1001 BLAKE2B 55f43590180a654e3f98a2cf28ede6f9c06e9f533e9f23b54553c9901fdedbec2027daa43087ae6ad2393cfcd4841eb69acca2b9eaf9447e47bfef381110979a SHA512 042fc5bacc403a36f320a497cc864e7710a121f923157f36b1c205a09f688ed3ada4b32bd691789fc6285e1b79d5b6649d00a8b9cb5fc0b612ca1e1c8f2243ca
+EBUILD kirigami-5.67.0.ebuild 1001 BLAKE2B 55f43590180a654e3f98a2cf28ede6f9c06e9f533e9f23b54553c9901fdedbec2027daa43087ae6ad2393cfcd4841eb69acca2b9eaf9447e47bfef381110979a SHA512 042fc5bacc403a36f320a497cc864e7710a121f923157f36b1c205a09f688ed3ada4b32bd691789fc6285e1b79d5b6649d00a8b9cb5fc0b612ca1e1c8f2243ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.66.0.ebuild b/kde-frameworks/kirigami/kirigami-5.67.0.ebuild
index e04c2eda8d22..e04c2eda8d22 100644
--- a/kde-frameworks/kirigami/kirigami-5.66.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.67.0.ebuild
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 16bc416345f6..6523f7b21c17 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
 DIST kitemmodels-5.64.0.tar.xz 390752 BLAKE2B dc33162f7ef7f4a0fb21c685c0e879acc689cfd29980f12ab20b27ac21f2624d552f9e5f73efc43d62dc8d05cb1324887a51637ce5622cab1cc610e7434542b4 SHA512 d4c486a3401f25e345b87b7d93d4ddc8d03eec6c63b9f1e7d4517ecd501a8855ab7dc790e8acd195b29d3ea6f9b91ba1ad4fe8ea060fcb13cc5b872e63e64ff3
-DIST kitemmodels-5.66.0.tar.xz 394684 BLAKE2B 8af32e41fdfa1404fea77c148bd9d3abf122220114dff9cdb28092a8c63aab365fcdcda2be6ad75aa0ec4cab62c8f5f5f4b494cf6c7eff468a3a042128931eb1 SHA512 2eebf85b69ac6090203fda419bb98052852f5a9feda72833a993374398e4d9fe6ac5520455630dae1e8c542515d44ad8d2163987591fc9bb9dd67f79eda8a5f5
+DIST kitemmodels-5.67.0.tar.xz 394572 BLAKE2B 75f43758398ac209c376b790c62b949ff8b2d508873e3d3698451c45000c0d39adca21897fb75185f52eb7826258c01de41c275897542aef4b1c9dd0a15e8695 SHA512 ea83034e6e3550d2d8533439c6f6a3158ab233e3549a841b7da07dbe77f24dec0de284f6a4e50e62d402e254e40e68ba0b7eb54258307692be8e7fc5f51107aa
 EBUILD kitemmodels-5.64.0.ebuild 375 BLAKE2B a087f6251065ab0b9dfb05ad9d9c24956bdc03e04de44b557dedbf1ebdac9662560b53ed788e4d9ce5b1b71d913c19eb1c1c867ca42b7d0cbc621903b3f62f3d SHA512 625cbcfef9089151980136a520e180b77a87a991e698c519c13011535239a214cd7753bdc6d8f656b59efb990584c738a02362d9b67425d13754dbac3aa07bdb
-EBUILD kitemmodels-5.66.0.ebuild 561 BLAKE2B 9e5273b3233ff4a9d3b74037dcc0ecd391aa716efe309588622bc550341e409ba84ea3f49a25723cf131de99c509baeffd015cfac9bf280fb472e852b80a9c8b SHA512 4d513a8c907fe491674baf52be7097d5c8e70a187ba8c20ac2db01ddd7efeba3ba5083be71394b59e02e873decc0eccafca2cc938ff0a63dd4b4047a9fa2cf78
+EBUILD kitemmodels-5.67.0.ebuild 561 BLAKE2B 9e5273b3233ff4a9d3b74037dcc0ecd391aa716efe309588622bc550341e409ba84ea3f49a25723cf131de99c509baeffd015cfac9bf280fb472e852b80a9c8b SHA512 4d513a8c907fe491674baf52be7097d5c8e70a187ba8c20ac2db01ddd7efeba3ba5083be71394b59e02e873decc0eccafca2cc938ff0a63dd4b4047a9fa2cf78
 MISC metadata.xml 345 BLAKE2B 6ebc0f7092b99e24519fae9baf08d02fbf70a5a648e5110e2bb55fbe37156dc13250e297c6094eee7f5030297b6371af4f7642a2b95002b8f9e2241b4a1b3770 SHA512 5c37c8e0f442b14c74035c501da0b02b9c40ac09d031a098decdf463b0bd5e77c54542aadad406ed07d7860626e668882933dea7c7a9696c922bfa5e0ba4c52a
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.66.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.67.0.ebuild
index f40fa593a684..f40fa593a684 100644
--- a/kde-frameworks/kitemmodels/kitemmodels-5.66.0.ebuild
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.67.0.ebuild
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index d33209b294b7..3724700d4b23 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,6 +1,6 @@
 AUX kitemviews-5.64.0-qt-5.14.0.patch 606 BLAKE2B c25f20679dfa65b6ee90541f26993e9c27ce237ec18b15a5d256b837c7859e849ef50b17c3f00b9ba22f2ff3f220982fbdbb9fea1fef1890e88810a48adc271c SHA512 223151f25ca55103deed84bc8302d8c96c5b923b699527418a9af84548071f63b9d2ab642816509fa474650ed6807a3d3d082e1247bda9b3dac20c6e2a56075f
 DIST kitemviews-5.64.0.tar.xz 76364 BLAKE2B 0a7c4b9413bac3f77d20b3f039e3d492042744cd38c4f01d437953049e8a20903cba91f81a92c5ce6b0e3601c2282246f4c9788683e6589f00ca06a7bd1b5c5f SHA512 065fd2619e6e849ddc5559926a4e9a47b0b23ba233f74d0d778ac87dff82428eb1cd4527cf69efdfa27a89a4571a7b05d0ffe65c12c195222eeb2a557ecfc528
-DIST kitemviews-5.66.0.tar.xz 75968 BLAKE2B 93bd1f0324b304a05267f83816597a0dc0b27a51ad47a0a2762a748e3710a998eba500213a1549500ce61b713159fa3e9ee83da1db4d6146bff4aad2eacc80eb SHA512 e9aaa815dc687ac7287a974e66ef8089524a46ed23937bfad19783e9cc563a0d71c64eac4ee6b2c2460ef624f551d475a86fba6806cca5d03f77cf4594c239b8
+DIST kitemviews-5.67.0.tar.xz 76300 BLAKE2B 314aa212a7ef5d5a5cc37a2f76abdf169b8b41d59c8d9dcaf47ab4f33fe522c2f78ba7d63dfa3ecadd25db02f11976a5a363f0ee51a81ab61fef7c842f4957fe SHA512 5b24be12829833393a58fe513d58356031ad73233db0792e278dc0440b467b7aebced4bd67e2ca41cf0ecdae53b24f5ad289be769fd371fc172c84b982ac3603
 EBUILD kitemviews-5.64.0.ebuild 580 BLAKE2B 8d763e3206859ab57afb853b7150821435925f6fa5055332a61e3d37bb41f9678097ad4d82f2d7f5baf6683e35787ff808d2cec6dec1018da49bbf2cdc51c0c7 SHA512 8a6571348a553c38cfd900f4f3534c5521561d07ca4f976e4d6026c8ab893dcac44941f52ee772aee51d172d22fb13e96b2dcdbdd7bd25a1b8200f94fb78d933
-EBUILD kitemviews-5.66.0.ebuild 542 BLAKE2B 10a00af5ffd3099814d2fb441d99168b4fc91b69ac9eed72f3febe13157d2b1d08ebf739a48efd6f08fc8831a458207205705ed4de86130420ec46551c1834e9 SHA512 fa1c6196f6e92602d935ed2c9334e4c7b8292425e67f8f248f12e95f44d71b7f0f85938f9651726beacc98355fc1847a3d224d6a47750158b00f4526ed65ae53
+EBUILD kitemviews-5.67.0.ebuild 542 BLAKE2B 10a00af5ffd3099814d2fb441d99168b4fc91b69ac9eed72f3febe13157d2b1d08ebf739a48efd6f08fc8831a458207205705ed4de86130420ec46551c1834e9 SHA512 fa1c6196f6e92602d935ed2c9334e4c7b8292425e67f8f248f12e95f44d71b7f0f85938f9651726beacc98355fc1847a3d224d6a47750158b00f4526ed65ae53
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kitemviews/kitemviews-5.66.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.67.0.ebuild
index 1544a75cd0c8..1544a75cd0c8 100644
--- a/kde-frameworks/kitemviews/kitemviews-5.66.0.ebuild
+++ b/kde-frameworks/kitemviews/kitemviews-5.67.0.ebuild
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 06bb0c0f1a24..4e50663c75f4 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.64.0.tar.xz 88212 BLAKE2B e5dc34bce593989b4369e4b68496e8314f75b72997fb56a673013d1c4d640ad8f23a21f00610a7caaaf92e4ffbfd5d2c6cd8b3fb311a784a95061339608f35de SHA512 337b62b67b8b250d0fd2d2506e93f51aa67ad6aea9ecc71be16de4dab21f2ed5aebadd72e350971cd434ea11554f8367eec250188e81a19ab20e2357159a9f48
-DIST kjobwidgets-5.66.0.tar.xz 88368 BLAKE2B bd90b882f8f1e7526a8475232d9483ba03a7dc3a842ddfba317f8794e380b16f14bf9eb41cb0f5b322ddf7a7b35d2a404387aaa1c1e1bda196c12a4894caaa9a SHA512 c4f83c2f362b67a32e930f87dea8f71b8340b8847231688644007c55783380b9f6c22861965f42fdf4b0a423e9ad77c3f9b6af770db1826dca9e2679149aee11
+DIST kjobwidgets-5.67.0.tar.xz 88212 BLAKE2B 0a71c34e1ad2e37d5709cc347b00622ae96ca28328225306e844bbe988a66ccbc3dc14d55ed53d8076f5d20411c24fdde7ec6feea3380ca95b3db56decee30c8 SHA512 1284ffa8960773060d73b12d43f7c4271c76f68138185064105e4a5f62976a4dacc13953e797660d035426a7c95bd5a3c08c4372643216ed2cc91271bcb5873c
 EBUILD kjobwidgets-5.64.0.ebuild 765 BLAKE2B 5a2f40702a52ac2dc1e2723051f4bdb616a2082baf9ce9401089c1229b84567ceaf0e2e7077f682bb42a7b10bbfefe809a2b03a34e0e49685e3a793d538db8d7 SHA512 9aace48f86890abcdc986605f6f7439fb405834aa979d714ad579ee965c97e51575b7c9247dea46ad646432d2c4f39e391faccb123d0b9036ed34e063a8c9117
-EBUILD kjobwidgets-5.66.0.ebuild 775 BLAKE2B 175152f1a8d4123e32acc5d23e14a4a905069f24d1a61c39595ca21589598723134c7195877c194d730e51b07d532a06996b31732ecf96c09023e6d51e9e3329 SHA512 a0ae22f1eb414ac742b7bff8c2af0e1368dc8342acbb0632773182f4cd25a6e484cf8fce51acc2756943cba6835016b5f214881edbd6677e09031974acedf70d
+EBUILD kjobwidgets-5.67.0.ebuild 775 BLAKE2B 175152f1a8d4123e32acc5d23e14a4a905069f24d1a61c39595ca21589598723134c7195877c194d730e51b07d532a06996b31732ecf96c09023e6d51e9e3329 SHA512 a0ae22f1eb414ac742b7bff8c2af0e1368dc8342acbb0632773182f4cd25a6e484cf8fce51acc2756943cba6835016b5f214881edbd6677e09031974acedf70d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.66.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.67.0.ebuild
index 0cc2dc1f22af..0cc2dc1f22af 100644
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.66.0.ebuild
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.67.0.ebuild
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 9dd01a9b022c..d138e3b616ca 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
 DIST kjs-5.64.0.tar.xz 336488 BLAKE2B f5aa5558bbafcbf4b952d4023875644691f04c78f8e4ff6e280a1f757a4995e2613b13b2503b83055da70daaa0d6a8dd6821f9382ca7dba356990a93676d2990 SHA512 d0fece585d3514e510d32cccaf885c0e67655866b2120c72ff1b192d5f4dbb77fe85f83a891b51c856baf19573562009f457caac6b0169576e3d9ceb6b3799d2
-DIST kjs-5.66.0.tar.xz 336464 BLAKE2B d15e64c6fde6506e1a5d70d732788bb70a3bf63c7fd1373ddb7d6012358181270777f119e135a696da804ad92924ccda30e558555dd543fe7a03df483ad0d49e SHA512 8f35f1f8b7d6b581801c3c6d17dc8925aa94d5102d8018c50ebaf86a7f513ec271a1689e3afa0dee30ed1a1794e66601485e0b47cf1b1f25f4da20d1821c699a
+DIST kjs-5.67.0.tar.xz 337244 BLAKE2B 1f66f73c362630e258af07933b5cf121f985b542ccabb6eb7db29ae87749b6dae9aa9427c14f898f28b819eb90c575e278c162bb332c7d519c69d3f6d59400a9 SHA512 8680860094fdfb1ea8946dddd3f37ec7abdef0cec9d5969a02b3c1fe9a8348264efcdad1ee8700d76832893bf484a7623ba19976787960cdaa57155086795fe2
 EBUILD kjs-5.64.0.ebuild 392 BLAKE2B 276842128228a19dd27ea964d4fd7b24dc315eaa3baa148e610787c82a59cf0519f44bf86b61a04edeca2aba5d947c3a5b73ea3ba61ab28fba7731b260ada386 SHA512 65c3cd2da607c99c3fc2942c75c192c6956e9749c9fa505c11d4ca2bedd55c83cd3004eec343e68fc0e5339e5cc90081a3a042e7f0fa25e35bbc03ee24e19896
-EBUILD kjs-5.66.0.ebuild 402 BLAKE2B c9453c2f2779c77b0328a5822d19a3578da198d030fe841579cfdbadc7237dad6cf733102b5fdcbb3e9e647d1bb0db5cef97f68ce42297712db7a7872bad018b SHA512 7f853ec8da09fba6b357e1080e488969284044e6fe3c4be10ce28da87d9868bdafc39424cdd5a1ab52c4586995ca6a53cefc147ec246b95bf9c10f8eda9ad875
+EBUILD kjs-5.67.0.ebuild 402 BLAKE2B c9453c2f2779c77b0328a5822d19a3578da198d030fe841579cfdbadc7237dad6cf733102b5fdcbb3e9e647d1bb0db5cef97f68ce42297712db7a7872bad018b SHA512 7f853ec8da09fba6b357e1080e488969284044e6fe3c4be10ce28da87d9868bdafc39424cdd5a1ab52c4586995ca6a53cefc147ec246b95bf9c10f8eda9ad875
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.66.0.ebuild b/kde-frameworks/kjs/kjs-5.67.0.ebuild
index 19f013d45495..19f013d45495 100644
--- a/kde-frameworks/kjs/kjs-5.66.0.ebuild
+++ b/kde-frameworks/kjs/kjs-5.67.0.ebuild
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 78e02cf3db09..e81501282103 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,5 +1,5 @@
 DIST kjsembed-5.64.0.tar.xz 169920 BLAKE2B 82af2b31f7ca0ff5f0121190b5436d17a308da62d790d9d97bb0ac937a38ed05e1998c13495b5cb29b777d05ec41d37635f96de3e25afe835ea230b28d82abde SHA512 7d921872fad980d90f21056f0a50e402ed3f02abcbeda53642a319a8571bd984ace3d0f9333281ebad64add3095ee2e6329f687e3a1a8ac81c9af8e44cd2fe61
-DIST kjsembed-5.66.0.tar.xz 170144 BLAKE2B 449c855fcefe00a3f17701550937f9a6fe2cc5a9d5497b7467e0ffa3a15dfa17dad5cb8e621d4b60cfba2d8850f22f99f2276e839641ef85502afab04e624b09 SHA512 eba7badb454370ba2671703c01760f97bfa637aa949b297268780afdca91cd4232abb87f4a52fe8cc7cee86377d6853e278408eece034ed54447c26864c7b69f
+DIST kjsembed-5.67.0.tar.xz 170028 BLAKE2B 5747d8fe55fe3282503ba209a58440170f958263b0e618a1b8e01a014d422e37cff4469027e81e3052121b0739cb83ab0ad7b4b905ba0e4421b81c2aa92e5bc9 SHA512 1c1f5b35c8deb14452399ccfb476d69c2cbfdfa1fea4e04ff99a6c6fa9b9264af811ce8e9115209655303fd7853d95fb7825bfe486378f20cc9ade45acc74ad5
 EBUILD kjsembed-5.64.0.ebuild 593 BLAKE2B 3ee26da6e21a16eb938ff6047b27f282eca06103101d32781b3fd51018f64952866b2c02847753f51cfb102e1a9d963592c4c173888ff0f5e8a3549ceb0cbfcb SHA512 a4fe73e752eaba4334c741490ef9413fd36841df7b302b96846c4a2e0eea4f4c3f9bd654ee9be2d819b7c8793491dc3df75bdd559b3fd99895a5b7cd08b7bfed
-EBUILD kjsembed-5.66.0.ebuild 603 BLAKE2B 16beebaf81ef956486961ee4b647e91600b061248a073416bf10b39b3ce5cfc21d9f03bb7349288b2a2d77c103223c9c4393a54f80a113b54087c17d8599bd25 SHA512 073f56608fe05cad011b8bc2186e820f022085d819e8920913a40740fb20f29889f9bd0ad2b9fcb68a85862261436206c1cf8ff61405693d4edecc7e49df758c
+EBUILD kjsembed-5.67.0.ebuild 603 BLAKE2B 16beebaf81ef956486961ee4b647e91600b061248a073416bf10b39b3ce5cfc21d9f03bb7349288b2a2d77c103223c9c4393a54f80a113b54087c17d8599bd25 SHA512 073f56608fe05cad011b8bc2186e820f022085d819e8920913a40740fb20f29889f9bd0ad2b9fcb68a85862261436206c1cf8ff61405693d4edecc7e49df758c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjsembed/kjsembed-5.66.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.67.0.ebuild
index aa0c1b96a151..aa0c1b96a151 100644
--- a/kde-frameworks/kjsembed/kjsembed-5.66.0.ebuild
+++ b/kde-frameworks/kjsembed/kjsembed-5.67.0.ebuild
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index c0002a4f886e..b685f97e1c41 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,5 +1,5 @@
 DIST kmediaplayer-5.64.0.tar.xz 9676 BLAKE2B 1eae1bc91cd9655cf8a18988c8eada28cbf032af1bbf9ee50cf6a8b57f767c89aae9d33e530db1b01584f3b0d074385568ae763eb09e1cc6e70bc2bdec93d85c SHA512 c0c0b8a90f65b44e291f7d09b7ac2083ef0ad60a8de1e0762a2ccedfd5d7299c3a74a1805c8d7f33253ee63772cdd04890dd0b26974371dfa3e35632c188c4c3
-DIST kmediaplayer-5.66.0.tar.xz 9648 BLAKE2B 4c04193aad6a21ab1b3cf6e580ca53f62479471bac7a1afbeb38c564a32dc156dedf9a42b4357eeb4304fab7a42541d04adc154fdfaaaf5029cc97229d4ae544 SHA512 ea4d99ebc345ab42a943652e5d5033c14eb11672218d586bcc809cf977dd0e779babd96237bdb2a93755fb4c19730adac63057ef1019c7ee9caded12ca767c5f
+DIST kmediaplayer-5.67.0.tar.xz 9628 BLAKE2B d14b83fa15fe7f6f4a8d6cfb6b36d8efd0e93d5d8f7785d29ea47aabd3d38d10cf3fd512d4648a1f2b71d80cae9bf7ab9d9f802d06fe0d754b1aa3f20bba5901 SHA512 b5ce946004df9f006f4ac20e7e483765f0b78360f4d6aae9585ba707464dca275ff21a44d159e9834d160ccd832823796ae8f5ad6daf55881371a1d6669e648e
 EBUILD kmediaplayer-5.64.0.ebuild 520 BLAKE2B aac659319bb48693bd8d57e19010b8275260f2e0b30789960b311e65e57b60e1334a7424a7fe2b9d6cf955531eb6b461a45692e86a20462ecebb0414b4a88000 SHA512 fd7c2b91049741c31686d81f77e247da468644bd95392d72979d0dbb36ee0b1bdb0d02829c18a48cda12c2730477bea1b160cdb05c3feecbc4324cb5860f55a8
-EBUILD kmediaplayer-5.66.0.ebuild 530 BLAKE2B 038dcaaca32baf9b0497d3d6cb520bb84f92d85742b5802a0020d914db93885aef3c3959a6a76368ac2d928dc4843b1214240b35941da2885994485b7952c74f SHA512 cc68315f382b4730dc50307ff9c48f0335941210f41e48df4892f3af08f6dc2de1cd3f298c2ff8f1a4cfe55be94e991ead48917465e6dd3feb2d7c4fdc63ec6a
+EBUILD kmediaplayer-5.67.0.ebuild 530 BLAKE2B 038dcaaca32baf9b0497d3d6cb520bb84f92d85742b5802a0020d914db93885aef3c3959a6a76368ac2d928dc4843b1214240b35941da2885994485b7952c74f SHA512 cc68315f382b4730dc50307ff9c48f0335941210f41e48df4892f3af08f6dc2de1cd3f298c2ff8f1a4cfe55be94e991ead48917465e6dd3feb2d7c4fdc63ec6a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.66.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.67.0.ebuild
index 51bf9c206021..51bf9c206021 100644
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.66.0.ebuild
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.67.0.ebuild
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index aafc5449410b..b95276f41a6d 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,5 @@
 DIST knewstuff-5.64.0.tar.xz 1067168 BLAKE2B 2b4fc384c3dc3b611873cabeb39f493882f7c593189fd4c105ea2c30154b93385b5a60d3373255bc8fd6f56f8ac66f8dcfbcdb8c885033c8a28b1a53ae7a2101 SHA512 2f566ea537e0ea777e34a9b1af32ce42c64d6661587432e37c8d76acca9bc43e566642bb33992200b442e183ec80347f5777514f0f11d495d2699056c6aab575
-DIST knewstuff-5.66.0.tar.xz 1082036 BLAKE2B da752396982ab2cb4c2f023b260db411c7183859f51e43ef42e21c2464b79340178561a80c2f150d661009c19df8d2307509e58bc01a4c69ef565bc8b422dee0 SHA512 2d431b27b41a7fef2a024741c9b7746a33297e0f6465f8191a33c48fc1fe88004cb9edd01029c478b8970da465d48679f302ecdb5d7bb190e4bc565d69aac379
+DIST knewstuff-5.67.0.tar.xz 1084568 BLAKE2B 0fadd3e7092aef5e0f4d21b4003b4bfbced024ade6a10bc030e35f87c94c033de74e558fc4165c76ee17a060945e33e6c86a5e6d96d2e7e044463f7ba69e72e9 SHA512 fc9a791f6b8330a8e674d8fc3c6f46d96a43266689552bdd7f0bee53b2ad157ccfc75fab07ba3215e2598127f0c3a6c77a2db96aad338d5c3e6bc2b47e2b2bf6
 EBUILD knewstuff-5.64.0.ebuild 1048 BLAKE2B 81192c8dc6d2c77cd3ff5fcecbfafd0d6a857851c15c795f64e9060a7c5eecc3e37235fb97c969a43d91683f2fffe3e1bd97141fe28e022b5acb0ed454b79718 SHA512 1eeb6b70343de9a8b385ac3e9c97c833f703755e881831395eeacb6c6ba10b01f94a53645ab228e351e6d6925e09b609f16a23823d34fe303342f16ac631062d
-EBUILD knewstuff-5.66.0.ebuild 1059 BLAKE2B e6d59ca5faa93186522e7305ec2cbf49f30a5ef4bfbc4f0856e24eea3e222f24c8f2c62441b3c787d940893ab2bf95d11f69aef92647450458049d9b08422a46 SHA512 92731e412f0b03b9391cd32805ca6bce46fffd9e204813e4b443338e06fecc57654f8f369674512f2c581008978797c763b890e1a51f007444ffc85579b48361
+EBUILD knewstuff-5.67.0.ebuild 1059 BLAKE2B e6d59ca5faa93186522e7305ec2cbf49f30a5ef4bfbc4f0856e24eea3e222f24c8f2c62441b3c787d940893ab2bf95d11f69aef92647450458049d9b08422a46 SHA512 92731e412f0b03b9391cd32805ca6bce46fffd9e204813e4b443338e06fecc57654f8f369674512f2c581008978797c763b890e1a51f007444ffc85579b48361
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.66.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.67.0.ebuild
index fc523811a586..fc523811a586 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.66.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.67.0.ebuild
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index e4d519b69ac7..147d6be425b3 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
 DIST knotifications-5.64.0.tar.xz 116880 BLAKE2B d7e14e73227e0490dbbdfbfdc2353a38ba5ec7345de72c9b53bb52efafe59380951b8a52f0718f14d624a1e06cbbf3d9b3cfb8f50de76e1346c197cdb83d4bad SHA512 3d2b5a4313e25efcbc8de93227efb9ad3d033640b347054ce8526a638c753bbba6d86e94bde9a5b110b34af8ace5af10a161532472eb8649a5d61028c7702f29
-DIST knotifications-5.66.0.tar.xz 117304 BLAKE2B c1dedcca015a0ed5e9ad567b9aa5b71810bbc2edb39b663de986c55d1254141f64befd6e921eb33637ee3e009f8345ae86ae55b96c18a57abd980b93a0446ff5 SHA512 f5a2f809204e87714577e24dc6a9e5d8556bab4a19a491b6dd45ef62f379861e6a2bcba9e023ab60a004f574cf8ec41a3c4764e301cfd085d4eb90c1d7561ec1
+DIST knotifications-5.67.0.tar.xz 117120 BLAKE2B 469c2bfd5d18bbc25659d1279d7b39ab549a820a638eed042b1d9b025e6ae94b1e6a37d25845eb8e38c90a8e7d36984b906f24886cdd94f75ef070ff7c5daf1f SHA512 3ee74f84d8157142e943b348d12601ada8c5741026098abddd1433379753352b7f775d2382f02f7b1d8c8ef3387a3a23a3eecc80826718b5ff07946d5925e300
 EBUILD knotifications-5.64.0.ebuild 1173 BLAKE2B ce484a519f6e627467affbeac423dfe59ff8a0b50e7d476b2a6d3dc02a846cd994e8c4af08db6392898c0f5e39e5ef228a0ea2e6c6a1f22fa01380072cea95ec SHA512 9d332d14211d9081681595a772dff79a63d39a9f216c036d443b2f04a9d1a3a14017ab01705498e85024f28a0a5a11c3f76104691989469b504eaa6154a5f9d4
-EBUILD knotifications-5.66.0.ebuild 1183 BLAKE2B c2a22d9fb627eca627dc0e489b2b2bdd8a2279722bb06628bd0d672791e7027f458c8e2010071369802e62c212f930a8b21c34cd0bc6fbe5c1c0f89f5eabd6d9 SHA512 175c96c052c556e737e6cc265113c0976813c031077719e9d35976641b6bca3d5526eedd79da2f05c40588e709254fb85e1ec568f6ef55ad97420e384f36c540
+EBUILD knotifications-5.67.0.ebuild 1146 BLAKE2B 53434512a46ba03a048e5ae6855cd95df8c9b265adfe4a06e3b84dc610d2f23388b302af727ef3750683b62dcafed1e9a301fa7657912860e3e435dfe9d7ff45 SHA512 1fa37214adfe1f6bd169cd5e3fe2821e4afa3861d033f796f250b1f0feb6654017c2df2894fdb50c65080566d9fbb96468ac77eea68cf08cb24fb3aab8c68874
 MISC metadata.xml 468 BLAKE2B 372e11b35b4abe5a1505ff086f4368f28d3aa137d38d33334404872068c2ea401e225b7c482be11a314d03e4e7b2aa440ec095d4d6ffd9a9a2ec1beb75af2c7e SHA512 70130ce812a1e3d370ac5858fb946372e93cc63a65f4ae3c34639521250949fcf6b79ce51aeee02a701edcaff36d66ad284b0880c3c15a7f33d2c4e44e6a87af
diff --git a/kde-frameworks/knotifications/knotifications-5.66.0.ebuild b/kde-frameworks/knotifications/knotifications-5.66.0.ebuild
deleted file mode 100644
index dc109c28e2a2..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.66.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Framework for notifying the user of an event"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="dbus nls phonon speech X"
-
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-RDEPEND="
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
-	!phonon? ( media-libs/libcanberra )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package dbus dbusmenu-qt5)
-		$(cmake_use_find_package !phonon Canberra)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/knotifications/knotifications-5.67.0.ebuild b/kde-frameworks/knotifications/knotifications-5.67.0.ebuild
new file mode 100644
index 000000000000..f74d40db7be0
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.67.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dbus nls phonon speech X"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] )
+	!phonon? ( media-libs/libcanberra )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package dbus dbusmenu-qt5)
+		$(cmake_use_find_package !phonon Canberra)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 26ab0432bf03..34ee21791b5b 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
 DIST knotifyconfig-5.64.0.tar.xz 84532 BLAKE2B 8ba3c66deb31ba88172970c599d72b6f9e4a2ec33cf1a793572c11c289f7de64ba83e93bed990b17911018413b9b7c7e47c28a109cc6f08a2ce8c42aa896ab92 SHA512 86a1ee111ec67011bdca9f12baf5d10b86cf3d4b783763ab2eae688fd183e17099de6f537ed7c2b66ef174adb5a3aab7e9f0ddd1c5b85e9ef493b1fd2a2e527b
-DIST knotifyconfig-5.66.0.tar.xz 84640 BLAKE2B 276fea2fa194755bfc26093ee5fe254b0d3c03d183b7a5059d7b28e8334e91c9e0cebdc6ff275ed3cfeca47dd16d9148effc5c948463f1a7ca847676aee0308e SHA512 94eda2fef5f7449791cf34f9b58f7729d435d9cdb5cd6627963912b4bc6fae4ff8da7d4d1e99f8461f60ab38c940f697b4f83906ca314243c083eb62e0518d71
+DIST knotifyconfig-5.67.0.tar.xz 84656 BLAKE2B a60ff6d1ac8b08e9a005a91d9e400616471ae3462086c839a609203caf1385749daf96798606d9b6e2670ce71d6f19ee9bf12c0bb6cd8f66935d47653502bd26 SHA512 a53651cf08153d023da880297a4a5b99a10cc3cfee5418ecdce224d9ec2cb6de841de24dc7914bc4a1855f41441d3a51be1c52b1f27e7a72ba5b425c3b85a3cd
 EBUILD knotifyconfig-5.64.0.ebuild 614 BLAKE2B 6cae0aea5fdad9ac2b426a93e46f831d7ce082a184cb8272de5bc15af1ade172373dfb1ff472b0fbe4c7e82835b223c69f621e7ef9df7a8743c1221cdd693506 SHA512 4e26e35f055edf762999fff9552318669f47bdbea3de81b7112dd179abc5090aee64642e52ff8549d9d38b0a2af887eaa0a522c4f4fd14a842d3169c4f46b673
-EBUILD knotifyconfig-5.66.0.ebuild 624 BLAKE2B 750ae29f1e5def0ca64b6681cf0efef6b6bbc3bc56746e56ea742300c68a5e1d35d27a7d34778cb57a103f7b01c9584e871945075a97b7b8fdecb4486e05297c SHA512 850aa6d2f63cb4ce09cd8008597fa1f0f23444be0376db0c8e6a3d5942156da451fa51778f6427116ecaa6132da9fe8eeedc48dff54594126e3de63382abf701
+EBUILD knotifyconfig-5.67.0.ebuild 624 BLAKE2B 750ae29f1e5def0ca64b6681cf0efef6b6bbc3bc56746e56ea742300c68a5e1d35d27a7d34778cb57a103f7b01c9584e871945075a97b7b8fdecb4486e05297c SHA512 850aa6d2f63cb4ce09cd8008597fa1f0f23444be0376db0c8e6a3d5942156da451fa51778f6427116ecaa6132da9fe8eeedc48dff54594126e3de63382abf701
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.66.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.67.0.ebuild
index 1c0c94391fed..1c0c94391fed 100644
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.66.0.ebuild
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.67.0.ebuild
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index 509318599717..c67b377e77e7 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
 DIST kpackage-5.64.0.tar.xz 137852 BLAKE2B 5dadcae766775562e84e7ad167f23d69a65acf7ab71351981b66a20d2ca3046bc02a5d1e671415ebd05abb23bd7ad076d2de98c07f4153a52d802eb7c06bc5ba SHA512 9715a6922e1063d6b0cb6b79f1258ed37c881a05c28771aa5b5abc2899a9545c5a8f264eb4bb74f41d8ff34282fe840ce2a9bd0e60bc8e9b2216efcc0d549028
-DIST kpackage-5.66.0.tar.xz 138324 BLAKE2B 57b3c1b9720e7eac9f1c2757bd6dbe5d7af2f4f280f086bec55baabbea8e11f52ff6bc0ef15ec18ae596416b9e93f9dd529541f474fdf93900f0a0dc3d19c52e SHA512 e8fa4ac749bacac93d005d9ab1de2f8a4c68eacf6f6c1e6524bce5ae7bbfd2e7278eb26425094f003c0286bc5e482fc01200ebfa6d03ebac3a33e565dc732b82
+DIST kpackage-5.67.0.tar.xz 137856 BLAKE2B a033205dceefaf4069542aacbd162cbdbdd5aab87326a2c8bcf70fb7a9a276b0340d24fdc1c67132babba5b3a576dafe9fc93a3bfa72e4c9926476162ce1b81b SHA512 ab8b1793115002e68dacb7334dca6c793975842d34d1c6ff3026e219569589510dcb0a89e5e46e5a5ffceedc80a5f53d3c0ffaa6736e68f650fca534eb363c25
 EBUILD kpackage-5.64.0.ebuild 706 BLAKE2B 6e0fc9ab1510cd36afdefb6c1acfc14bc3ad6c233215230cf4b22df6600dee8916f02342d106dafd36f5c831c40724f9778e04ca202432c1b5ced57a95c7f586 SHA512 01b544d0b5aee25dd27a418ddf476088f9ae0e02146ed3d453133fd11284063a4a2576983b51a75c4d72739c00774e23e4e954f8a5066483d12edf6562c0b444
-EBUILD kpackage-5.66.0.ebuild 717 BLAKE2B 9664817a6227e2fb0f0f56d03bd4c6adfc78a0f4888e0c710abfc209fca74a3139e265dac13cbfe9d2e918794daae9ed27040258e1d81d449abb246962aeb363 SHA512 117571d95944713ab901814f38e34044b324872bfdc2804025d72cad2f631920784104400e03f44ad4acdfa8c2e23f5b8544872cf3601290fb0ddf7d3aa7f0ab
+EBUILD kpackage-5.67.0.ebuild 717 BLAKE2B 9664817a6227e2fb0f0f56d03bd4c6adfc78a0f4888e0c710abfc209fca74a3139e265dac13cbfe9d2e918794daae9ed27040258e1d81d449abb246962aeb363 SHA512 117571d95944713ab901814f38e34044b324872bfdc2804025d72cad2f631920784104400e03f44ad4acdfa8c2e23f5b8544872cf3601290fb0ddf7d3aa7f0ab
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/kpackage-5.66.0.ebuild b/kde-frameworks/kpackage/kpackage-5.67.0.ebuild
index 2bbcd2bd9285..2bbcd2bd9285 100644
--- a/kde-frameworks/kpackage/kpackage-5.66.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.67.0.ebuild
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 5d369c0919eb..26b0df816ab7 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
 DIST kparts-5.64.0.tar.xz 176652 BLAKE2B d75e03b30c994fc3bfe68b9a4e48315ce7c7cb4e56e3720273290e06419a42717004bffdb5aac387696cf1fb2aab6f1a4b5e22886f466e54594f621f446fcdf5 SHA512 2c0fa16a369e4bee1732f481ed9b9b37fb8019f31c868720c8ebc42279464d179eec87904c1dbd188e223015d0f5b112377965c9d58887fba74ab6455a0d1e6c
-DIST kparts-5.66.0.tar.xz 176384 BLAKE2B 3d17cc6a3bf4cba00e09dcd181f8a2262a6d1f0a589fa34299af460e619f51e97a4b878abfbdfb87c25cd86f38e9142020aaa0f2da3dd60eada366cd6271c12e SHA512 44882ca93e641958d690db6ae685f142f95c3192b599c911909464b492374d75e950feeca1121b124e59b55b7690873014534f78905ce6a03c6188621c48c0c8
+DIST kparts-5.67.0.tar.xz 176512 BLAKE2B d3ab7bcaf8e4e6c10f9c0518d9790d905b05af669a6762a7d9a7cb4647146ca0c5d0a3c17894a4e329e6bb76da04822ccee7197e16ab4aba8e3dd21aa548ab65 SHA512 fd53960ecb88123a4ca43810d7b9e9ec4629d9f860b0d3c5413e05b675e44df63f433dcda6eb1876314c9970267f698096cc24e8313a7bf5caae671c2bbe6440
 EBUILD kparts-5.64.0.ebuild 829 BLAKE2B 67bae89897d545c9b0e589a3120ec30620557c4c0f9ded870e77df5e002cc742745a010fb86f254cb3244de98750745d915b7058c51f4ce1fcaffdeb873dd2e1 SHA512 c6316b2f7372cf55a08f881c2d90621b77c02be4603ddc106e48d02a2153de0716b3c7ed2a770c686768c66a73a574f8f77db28b980627d24f9942181b966678
-EBUILD kparts-5.66.0.ebuild 840 BLAKE2B 3afd60a6091695f69864a6140ee1ee5d2a9c48bca6b8b81ead3a80b140fa77286842d493a54246b22a3af2b90fdb375b9a4838868246ac0335c2cd09d397b157 SHA512 360126fb3d1a219c6fa4afeff506a5a457c256086449102d4cc013f647f8b5c622f0d56dfe4f37902c01930a00dc7272683d1657843ea6a3a4553143c48782c3
+EBUILD kparts-5.67.0.ebuild 840 BLAKE2B 3afd60a6091695f69864a6140ee1ee5d2a9c48bca6b8b81ead3a80b140fa77286842d493a54246b22a3af2b90fdb375b9a4838868246ac0335c2cd09d397b157 SHA512 360126fb3d1a219c6fa4afeff506a5a457c256086449102d4cc013f647f8b5c622f0d56dfe4f37902c01930a00dc7272683d1657843ea6a3a4553143c48782c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.66.0.ebuild b/kde-frameworks/kparts/kparts-5.67.0.ebuild
index 5242c8e8ddb9..5242c8e8ddb9 100644
--- a/kde-frameworks/kparts/kparts-5.66.0.ebuild
+++ b/kde-frameworks/kparts/kparts-5.67.0.ebuild
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index 09aaa877927c..38985b75cee1 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
 DIST kpeople-5.64.0.tar.xz 62040 BLAKE2B 77e4b0606c47cc954c5b6672de8df5ecc3d22d3f42ee18f2747e789e879d08b33fc30c3656548a8d712b02ef94a19f49a611a28b1acaeff48a987e2605c34a78 SHA512 d6f23d2d2b0d2d8a3acfcc74beca8848ecf64e013f0cb906f5a4d347b4220d7a3258e856e64441a06e4d5443b958d464832142ffd305f46a99b192001fd7527c
-DIST kpeople-5.66.0.tar.xz 62396 BLAKE2B a9ff0f1dbc676fcfd1da50fb9628c2613dba2ed5860b995f2ec7bf7a76c4341ba5dbfebf4909f50e298ac05cb146cd6213755f54370c20d0ff922341c40cfc1f SHA512 5bfc5641a02f198f5eea3569923f06c4afce48db9e985ebe74e058b319159a6343b880a122ff645f7628017dda41c5d6ac5162a139f9b23956593b6c8ce8f36b
+DIST kpeople-5.67.0.tar.xz 62348 BLAKE2B 91826e964e06cd2aa9d76762cbbe8ef15470831eada6324a53ac91166bcb992d11d37d5ef3ab25caa71206d9df6678f534db78e777efcca62e668601eb142ef4 SHA512 b9bad73466ba99bf7afbef2b4cd2b1719acaada6942275d4e62efa75d5cb90a30ef7514e98fe4477736417f17686d2f278945c47dafaa638b45ccbca25b98b4d
 EBUILD kpeople-5.64.0.ebuild 892 BLAKE2B e6cc414d9162f1e69c1b845bd7ea03ffef5218ebde20d9a864be728d9c8caceed56d4e6bab6bc7eda31df615f83975c96ccaab855260e68e52a4eb35b1f74897 SHA512 a724536af0e9aa816a1e10c688c034fcc82cce4ec0c0513d2709a797745aa37bf5bcc0fef45b75ff30632cefa584b6c46d3932d60be9ef9c0a9f135fe8140328
-EBUILD kpeople-5.66.0.ebuild 902 BLAKE2B 1ee07d75c45b6a9e46bae82c97c8e1054872b34fe07a8388bd5cbfd860d898a52f54bb1ba1cc2fc7b93b4bbf7f221bd3e279ea8f55aeba07705a6f7463d40b42 SHA512 1860cee532281dda0e3fec929e890564d27ac7eaafea3d618e84e7bf0ae9f20d3fdf91bef3ca8611af0c63f1fe91ae515fd8a9e1dc66fa0e0c5fe26e6f0b7895
+EBUILD kpeople-5.67.0.ebuild 864 BLAKE2B 0f323ec5dc119114e73bc303fa84ec7ec2fd9e470f06f36dfb715a289a13da2bb90c06f012e74137c7a83a3e430b5bc0450076da764bb329eee3e09078b6b492 SHA512 1ca5f7a8a745b3df5b87ff48dde3e8835ff7d07b64baf9b3656cae063e0760d44333e1ed68dee7244f0a0a921a0fd9b04ac14bb2118ac4088a1f288f10fbfa43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.66.0.ebuild b/kde-frameworks/kpeople/kpeople-5.66.0.ebuild
deleted file mode 100644
index 9fee0e01a73f..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.66.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://cgit.kde.org/kpeople.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_test() {
-	# personsmodeltest segfaults, bug 668192
-	local myctestargs=(
-		-j1
-		-E "(persondatatest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-frameworks/kpeople/kpeople-5.67.0.ebuild b/kde-frameworks/kpeople/kpeople-5.67.0.ebuild
new file mode 100644
index 000000000000..3772821bbcae
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.67.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://cgit.kde.org/kpeople.git"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# personsmodeltest segfaults, bug 668192
+	local myctestargs=(
+		-j1
+		-E "(persondatatest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 7a617c189a80..08c1f444ad99 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
 DIST kplotting-5.64.0.tar.xz 30260 BLAKE2B e51ce74e3e44d5ab9ca2d76f3ed5a2690f4806f1f4de3b7e27f5df947ab5110e7afd59d209e7b952808a73e59882860fc8f550811ff6b9840bd8428092858910 SHA512 5d6d4dc60915b38e39337ea0041d7bfca4c9086804e46d3de42f6a172e5af3d7870ea432f41d299a73be017ef0efc1d82d52d7e4371b08bb0bf61c82805c65e7
-DIST kplotting-5.66.0.tar.xz 30256 BLAKE2B 9cb7732b7cb0e6a9b650386908772afca4a5283c81d8d8ec26651fac315515338dcde3cfb737d913c63babcaecae066a17beff61789f22d7add4cfd2071e0668 SHA512 8f3ba8dcece142274b754fae7f6b51632f5f4c573dd04032f11adf4991afc6afb129db428f6b6691188338a734349ee32b16519875a16eb2b168a46937f1e59b
+DIST kplotting-5.67.0.tar.xz 30296 BLAKE2B 5a5562a8640b72b9e8e37f3ec8e47dc2970ddcd90885a5215648355b96d79213884c2656c9da341b5801bac1fa4ac07c16f79c5a85ac1bae7bd285c68722f57e SHA512 df6a0389bb95c11c80449fbff2e99b16d8c002ded12b571a908c9b0c7993e4ba47c4ca8de10a444e051dcf26c0d85738ec8f4acd966495e912f70462aec7ac15
 EBUILD kplotting-5.64.0.ebuild 430 BLAKE2B d2cebde321376d24f955fccf1c1f2a972f7dea57df43f3cacce663001551a2f6d92308df1ab88b2959aec4081fa501e81bb7b8fc9b6f0cab0ef8d8e97f2afeab SHA512 38d904fc3a6575ae07cc985d6b283bf080404886a8dd0947046a596d917f0e185459301fb5014431e2d8858b0dcec4b85c3f566ecd58de0f0334d95acb52eab5
-EBUILD kplotting-5.66.0.ebuild 440 BLAKE2B 83288d622026b4efbc33e7b3a11dd51094b8bd6e2a3eea066b58a1ebb779c361821d467485a04804928e95c0ddc7533bea0dbdb6da87d4051e14c2a77581bb27 SHA512 cd16aa93d5923cdbed286e4d72c8ef0e47780b3e9ada1da8404ef8e178a591eeb3f2c797798b99439766694feff2bfe3875cfc3b3cdd0d2b601f3d5c75d75ff4
+EBUILD kplotting-5.67.0.ebuild 440 BLAKE2B 83288d622026b4efbc33e7b3a11dd51094b8bd6e2a3eea066b58a1ebb779c361821d467485a04804928e95c0ddc7533bea0dbdb6da87d4051e14c2a77581bb27 SHA512 cd16aa93d5923cdbed286e4d72c8ef0e47780b3e9ada1da8404ef8e178a591eeb3f2c797798b99439766694feff2bfe3875cfc3b3cdd0d2b601f3d5c75d75ff4
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kplotting/kplotting-5.66.0.ebuild b/kde-frameworks/kplotting/kplotting-5.67.0.ebuild
index e399a266d926..e399a266d926 100644
--- a/kde-frameworks/kplotting/kplotting-5.66.0.ebuild
+++ b/kde-frameworks/kplotting/kplotting-5.67.0.ebuild
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 6d439f038113..1f32d7a5d30b 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
 DIST kpty-5.64.0.tar.xz 58312 BLAKE2B ec92c3e134c7ca6d2b66933d4be1ce86ebf5d04de3569230dd1f422f7133342358e2a000065001a95ede937308d8af4a2117c14b5b888e512ad63311d9c8d8c0 SHA512 2764bcfbde98041a2a8934e35c5cf34a81e68f6ade7a63ac0100c68411d3a52ff2b1f425d7cf9a38da5135fa424087bbf87170e0070d056aac44765c4849848d
-DIST kpty-5.66.0.tar.xz 58396 BLAKE2B 471e413f712ba821309825595fc77bd6ec0cdf35b1a6191901a1cb3c93881ecb5c3dbfea5f3d74e1a47a83ebe9f67aaa26d46610a8fc7c47f790dd1a51078187 SHA512 313bd90f8cd168ae45f4ac101ee3a54987f43233b7acf6c92a234915eb887efb61c1f3765af2f45adf320f364eac8f76f3a7d5283cc21b3f8483192ebdc65c6a
+DIST kpty-5.67.0.tar.xz 58364 BLAKE2B b3c93ed2655ca9f2438372a267dd88b18ef8fae9ac6b4b9321c6b048635ff6b67d5c78f1c18968eca608b18a2fb5e2b8978fac2f0065c3cf50d78f8b0194d02a SHA512 9637a0b1130a1f8310a20447c84efe836c081dac4f07b0ba5b19d188444b30048543a428d90e63765ce7ccb1c9fbbb937b400d594098049a2708a438586c35c0
 EBUILD kpty-5.64.0.ebuild 543 BLAKE2B cd2fdf1176b6146796eb3c99ab46d05df505a7dcdee16d2e11563753a63ce0810dccb084a82a667ef4057d7734e6dcdd9f1c67955d38b8bd05814f643bf53a28 SHA512 a9cceb8163a02c41e6216d64eaf836448f1f50c49309eaa1d5939295bb21a6dcc4f151f70a1212d1604977b897b71a61b8ab26262042733dc9f12131192ea5ef
-EBUILD kpty-5.66.0.ebuild 553 BLAKE2B 7eedd16cef8b168b4ec8a4a329eaa043e484a020bd7745031476a479248afa586418b8a0e2d26e809d218a26d3aeaf2ff4b4c993687e991d8dd79222c3a1b0eb SHA512 31c0e5e8a05742de4789bb124d6ea73f971bde65b26b8291de785a632ff1e4fe5e680bed83fb03b434295663a210d07898d847210ebc54fc66b58b8bb988e8ca
+EBUILD kpty-5.67.0.ebuild 553 BLAKE2B 7eedd16cef8b168b4ec8a4a329eaa043e484a020bd7745031476a479248afa586418b8a0e2d26e809d218a26d3aeaf2ff4b4c993687e991d8dd79222c3a1b0eb SHA512 31c0e5e8a05742de4789bb124d6ea73f971bde65b26b8291de785a632ff1e4fe5e680bed83fb03b434295663a210d07898d847210ebc54fc66b58b8bb988e8ca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.66.0.ebuild b/kde-frameworks/kpty/kpty-5.67.0.ebuild
index 11aa24e729ea..11aa24e729ea 100644
--- a/kde-frameworks/kpty/kpty-5.66.0.ebuild
+++ b/kde-frameworks/kpty/kpty-5.67.0.ebuild
diff --git a/kde-frameworks/kquickcharts/Manifest b/kde-frameworks/kquickcharts/Manifest
index 46af82006d90..7df627c1a95e 100644
--- a/kde-frameworks/kquickcharts/Manifest
+++ b/kde-frameworks/kquickcharts/Manifest
@@ -1,3 +1,3 @@
-DIST kquickcharts-5.66.0.tar.xz 93400 BLAKE2B 569f106e3ba8443987f46c39950c8d67f3cbd3a74f1571f5efef9bb54e4c4b50cffa7856fb5abd0329c87a23978b3130bb1e2b0c0b35fe3d756ec3a31d527d9e SHA512 f224e68b07337e11eded9a306ef5814e81718572cda4e1b721b4c056fb10abbb8b2c9477e257d546bea620787e97f72985f5c47e72036012f3ad92d89a8efe8e
-EBUILD kquickcharts-5.66.0.ebuild 780 BLAKE2B 8f01693589306831de80fc9ea7504bf8594c99d8b0f102b8063395a8bae22682dd1bd367e13c1e50cf5193cae56506b27b04d9cc4fbf1e13958f25a27bd99abe SHA512 299ad69b085470c0bc7501f72ad90f8322ec096c44af346e455483f0441860e09d91aabaf546d8690c27ccccd552d02d780889c4b9b233f6ae11e9f2f561ad80
+DIST kquickcharts-5.67.0.tar.xz 93180 BLAKE2B 1e3eac26cf354e4d794418ad1a0a27422ead5841ac64d061524b73c15bd50fff556299c6b02cfec2a02519beabfc1639007b487c61e1e6a00b1a032b6f69e104 SHA512 f014f9a1ced9e1a45726c1e82f365433e62c9b4c0db5cd157b4b980c45b2477e067d9d2bb67f8a4bf608663f2f4a6754a6150c5424b47bf035c000a6dd0ae37c
+EBUILD kquickcharts-5.67.0.ebuild 780 BLAKE2B 8f01693589306831de80fc9ea7504bf8594c99d8b0f102b8063395a8bae22682dd1bd367e13c1e50cf5193cae56506b27b04d9cc4fbf1e13958f25a27bd99abe SHA512 299ad69b085470c0bc7501f72ad90f8322ec096c44af346e455483f0441860e09d91aabaf546d8690c27ccccd552d02d780889c4b9b233f6ae11e9f2f561ad80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kquickcharts/kquickcharts-5.66.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-5.67.0.ebuild
index b13e806d23b9..b13e806d23b9 100644
--- a/kde-frameworks/kquickcharts/kquickcharts-5.66.0.ebuild
+++ b/kde-frameworks/kquickcharts/kquickcharts-5.67.0.ebuild
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 329ef0db2a6d..cc99a256458f 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
 DIST kross-5.64.0.tar.xz 127848 BLAKE2B 7d79cce9f9702efd492c22eb540b01218e3d70b50a1f55bf3cd1c258fc3b4a3cb7e12bae04ec56cd4fe7c988b6297dac35644f6eb4b1b1d5206e0d453f10497a SHA512 c121e35454082335f67da5d90cc5b78d153200204a1fb295fd40425220ff56419387ec57daaf60f80c1b91a22941be633ff3b0eea4ebbc9eb75f80874fe1c061
-DIST kross-5.66.0.tar.xz 127748 BLAKE2B 25da3d9713dfee7c796a63a8b113961644b56385488154ff2c5f3edec6b41477318355f0007b8fd203dab0b02d8bdbf04cccdf5bdcc26eaad50f4186d5ed910c SHA512 8b3a2876e367749a1f50aed6813521efa16e0551fec5fb8d57f5081bf4a1c27063f53c3c64efc85a986c77244a92bf8c8d4bf9fa38a886fd7b267f426ea9107d
+DIST kross-5.67.0.tar.xz 128256 BLAKE2B f78dd72f17996cd85e9375def0ba3de8ab9eaf96a476d49a5bf622b2efa925828f69c868bf095c530db9b79ea66a8cb772270c5f5f5d8f50c828bf66115aab83 SHA512 ca856f5e5c5540f42477548b74339413efe7c6316a49e1cadd6db00dafb50149d694c95422ce6c0302546e87732d8486cba71339e37e02bddab11db0af2ff540
 EBUILD kross-5.64.0.ebuild 852 BLAKE2B 2db205584f602ccc5a9c6fb8e84465fb7b56d87c13b7de3b6e95d15506785fbc01241a0de8d2f4bde3fffab5ae323a10758e4cae2191eec6c580fe3377621a0d SHA512 0d0da9ca52f036cea95db28eecbcb0dc26fd039eb3b183977256149321d002d2ec3f6aaad8ad92e0cf3f0ff506ead5db1b8b251f97883c5b305a3b56976954cd
-EBUILD kross-5.66.0.ebuild 862 BLAKE2B 6f662fbc238cc714b5f5611c18311b50942ee7a08f39616a75118529dadad1cb035bf9cb1a90ec8a20437e1ecb68976435ac459fc946bff32d8006a97932d675 SHA512 3496cb1976729ffc8eebe7469af530f8e94aeaeafef24169cc4a0d94fd403c2741b54e3062f5bf6c21da0d6d84317e545a6042d5a3d513a438701ded63ed1814
+EBUILD kross-5.67.0.ebuild 862 BLAKE2B 6f662fbc238cc714b5f5611c18311b50942ee7a08f39616a75118529dadad1cb035bf9cb1a90ec8a20437e1ecb68976435ac459fc946bff32d8006a97932d675 SHA512 3496cb1976729ffc8eebe7469af530f8e94aeaeafef24169cc4a0d94fd403c2741b54e3062f5bf6c21da0d6d84317e545a6042d5a3d513a438701ded63ed1814
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.66.0.ebuild b/kde-frameworks/kross/kross-5.67.0.ebuild
index 59745dfdfe69..59745dfdfe69 100644
--- a/kde-frameworks/kross/kross-5.66.0.ebuild
+++ b/kde-frameworks/kross/kross-5.67.0.ebuild
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 58c3ce04cdb8..000137715fc2 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.64.0.tar.xz 62304 BLAKE2B 20c80258c97cfc2f39b84e9fc881ec89c81558880062847163c2f2da04bcf9561e68ac0235cb96d1aae769e4e43fded1070a53aed3f11dcf55f2ae903f0bdb5a SHA512 a7fb3e7ec08ce4f55bcf833640aa3868ce8ff61fd556f1e15a3131dec1b83f34c8dd1f75e85dc121dc4c8d3236fbfd0e4f6770b0aa885cd9612844a5810ab1f0
-DIST krunner-5.66.0.tar.xz 62752 BLAKE2B fd4f30aea13430227bee8d2bc28ed0a3891b0ba8d104b75a3762277f56c60c1f719662f50385d2cc50a99ae1e0509d745626edd5d44cac1c052d7641cef89a78 SHA512 bcbc5e901797f7ca4fa3e9c3185941f38f87dc0ab6ae50c51e382e9440577e8b4eb133d503de0d41a0bcfa49df745997097c8ee008b56dfc7e6354b40df5d50c
+DIST krunner-5.67.0.tar.xz 62568 BLAKE2B ef4a0a35c399f2f6c232d390e8df8c381871bb7770c04116ea7f8c376ccc8ba45e1bfec01f225de2cc2a0a29e4fd0d66f45192a082e7b5be38584b2eeab43e1c SHA512 a43cd902a26d7a0af5b9e5114f96fbeaa2f24918ae64ba0ab899c299ad4c0ff95ca98c19380a61ecdd414c5a3c7ad5fc9924337180a67d9fcc92748b798f7234
 EBUILD krunner-5.64.0.ebuild 889 BLAKE2B 61e997a2ab65f47a6ee47068aa9cb8c173c727d0e135316ee4d77c619132c9b9f536c92f34b1f5d8ee0858d9dad5839ae9d7bcedffb162104fce861d2c385763 SHA512 2b78d2eacb09d0f3b8edfe7274aea04d00a6fcac0f0575bf9d623247a42a778d38a2f661035edb1d955471d2adce4d577a43b0a483caa10cfec9b97650c3574c
-EBUILD krunner-5.66.0.ebuild 899 BLAKE2B 4828daf2c72cd59f8add616710cb461b516ac9a5efbcb4fe9b04062baf459874152dfe9bf1305a292f0190e4f0292a2c64e31c3bd58ced521fe5f553d68f8eb4 SHA512 9828778b0aab5b9715523b819e5f694dcda03dd081a931b2d560c6caf86dd02b5d76ade9c6a63dc17e05eb09a11ad0e09695192a7cc56a5ae11cb36e25c47471
+EBUILD krunner-5.67.0.ebuild 899 BLAKE2B 4828daf2c72cd59f8add616710cb461b516ac9a5efbcb4fe9b04062baf459874152dfe9bf1305a292f0190e4f0292a2c64e31c3bd58ced521fe5f553d68f8eb4 SHA512 9828778b0aab5b9715523b819e5f694dcda03dd081a931b2d560c6caf86dd02b5d76ade9c6a63dc17e05eb09a11ad0e09695192a7cc56a5ae11cb36e25c47471
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/krunner/krunner-5.66.0.ebuild b/kde-frameworks/krunner/krunner-5.67.0.ebuild
index a92875e48e26..a92875e48e26 100644
--- a/kde-frameworks/krunner/krunner-5.66.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.67.0.ebuild
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index cd9acc12d408..58516c0e64dd 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
 DIST kservice-5.64.0.tar.xz 251460 BLAKE2B 09eb32c2ba84f360fea8ea4d472591985563a5eb48779dfd57632f8e0aedbe12cefeabbff6f9302308defdab424fa14e3dea49b0f4f7d3c8f733e7497836cf2e SHA512 8070ad9e565ec713f72dd6da135ecb5d629b09974bf56df52c6faeca875018b7e37c01b6ac71c6b18f17b5210bc314118760e8a8b6d64d6fd4c47f480850e082
-DIST kservice-5.66.0.tar.xz 253196 BLAKE2B 5c20cba79ede915adafe6e1e9d2d9669e60e5bb96313ef5beb74bc6a29f28aa3d60a5ed5a500713a7787dbef6f3a1d65feca59e07f120bf5258e39703dcca448 SHA512 397ab3eb43aef0870e93864d6d45b1ae863dfc65275a041db0fb3d874d0535e7ed841a3ef437980d0cdc1c8351bac3f45d97e1cc432255a97ad79cb5ab7b6fcb
+DIST kservice-5.67.0.tar.xz 256316 BLAKE2B 86905aa090bc3a541741e60489c9396b3074cb5c745be81588a10f0be111908ae46a3a2cb0d728ae8f87eba4a16c2d57c4a8a47fe96e54afe0a9d33a1368290c SHA512 d6f700f1e8a9b178e5141e4336ef395da06fbf859cdc303d54e36a84189c0d9ee6413f394e69e169fc65850dc2b7b9849b72207c2b2177c430fdd8aa4616e395
 EBUILD kservice-5.64.0.ebuild 1036 BLAKE2B 20abfd3b94ded2a378be457e5a09070a22ee236b17f0b79041d46210b8880fd5d4e2789fa6e8c25d9a91040ce4c8bdb5a9ae724349a98aaaf808135716c7a01a SHA512 2f1c0b706bc8a9c39f70c1a4a65a8543be883329412c38bd844419f63e2bd584df8f81eabc50c4a6ec3e41f2549cd98dbf63aa3d181db294de44649e377e2d4a
-EBUILD kservice-5.66.0.ebuild 1047 BLAKE2B bef78382775f1247a0a3bdf2c1dd783d366daacf7ba6422d9293f60caeee82a7197fa4ca5cff2c552ce0cf9faa7f4d49a059ca7bf92754a12f06b3ddc3121496 SHA512 ef4fcd9757655570951849f0d60de8bb3231c8c8adaaf71ab24933eef6f2be302f76603e212917aa48e1892ca6fad7a811218e35f58807e0d42dabd064934950
+EBUILD kservice-5.67.0.ebuild 1047 BLAKE2B bef78382775f1247a0a3bdf2c1dd783d366daacf7ba6422d9293f60caeee82a7197fa4ca5cff2c552ce0cf9faa7f4d49a059ca7bf92754a12f06b3ddc3121496 SHA512 ef4fcd9757655570951849f0d60de8bb3231c8c8adaaf71ab24933eef6f2be302f76603e212917aa48e1892ca6fad7a811218e35f58807e0d42dabd064934950
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kservice/kservice-5.66.0.ebuild b/kde-frameworks/kservice/kservice-5.67.0.ebuild
index 9046968489db..9046968489db 100644
--- a/kde-frameworks/kservice/kservice-5.66.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.67.0.ebuild
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 4fd7e4c0bb73..cf96dd680824 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,5 @@
 DIST ktexteditor-5.64.0.tar.xz 2359280 BLAKE2B bef28882fc0f7b525eaaa3d29305c6a884af5030a2f319c3bb085c5fd74f81f14353c6685faa7e7d67fbe292fae5f56eb452dbdd4a86cab9c015b8cd1ae788c7 SHA512 6a8f1f86cf5cdc259673152a26c3feb952fc2e5a9227c7a78ae52a848acbe5b60d30583539363ebd59fa744fb428441acdf89581b2db44d54c1896248eb18e99
-DIST ktexteditor-5.66.0.tar.xz 2355256 BLAKE2B dcfe38aa59c98c474362b0e341885e100f761915475e9ac5487f9fc446f6f1ec3f30c217dc9b56df478c1234294431263078f20430a6088f24c750a7de60570e SHA512 a20c4ca0f8856ba78c24042d5692790e83816b96820cc94de673b66b5ce8b4880379cec330cd0f3235aab9ed3f12b44bef741e2e56da37419b38d22bfe69192a
+DIST ktexteditor-5.67.0.tar.xz 2332752 BLAKE2B 81914ea853b8b9eab0b4a453fe9e4a56b2df4f076399f68a14a27137bd6143c710d70ea3c8d5863459f9ff462833ad8e4c54c5abfd9f561da8c732578ea8ad05 SHA512 8a485d0e9c78b090285c1ed447cef859dd717097ecaad4a002f08933e3536664cdec2eac21a9968195da08369398b84ce77db49e5762b1900b219902b13a28b0
 EBUILD ktexteditor-5.64.0.ebuild 1580 BLAKE2B 46766d6a50fc08b6f118a91d0ada0261e3196586970bcf2259d363dac97dca9e7fbca5c0b7809cca5a27a267c6e83e652c3771dd0bfe6018518ff3b61d25543f SHA512 e244531a92a70c0c681c0a78f0ae20ea7d01dd9351bdd4d2e7655443981d3e30d9b82d1a16ca2c60723c7001690950c787d19d3259304e45a9b5c5e33cc79d4b
-EBUILD ktexteditor-5.66.0.ebuild 1591 BLAKE2B 6ca1486e2fb3a83c22779654f22c8824659c5bb4bb74b2d49fa66649c4370db7c8f9f543cba66c9f85df667fe542136a24954bf2998eb32848978eef5237adaa SHA512 217da29ae64523dde7d9589f0f3cc94e682bbfe06a7f6f0e592f930abf5a8c3ad6dd7caa43d5e67a8262f124a9b86185babd0c0572ea36086afdba273a821561
+EBUILD ktexteditor-5.67.0.ebuild 1591 BLAKE2B 6ca1486e2fb3a83c22779654f22c8824659c5bb4bb74b2d49fa66649c4370db7c8f9f543cba66c9f85df667fe542136a24954bf2998eb32848978eef5237adaa SHA512 217da29ae64523dde7d9589f0f3cc94e682bbfe06a7f6f0e592f930abf5a8c3ad6dd7caa43d5e67a8262f124a9b86185babd0c0572ea36086afdba273a821561
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.66.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.67.0.ebuild
index ff937208e53a..ff937208e53a 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.66.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.67.0.ebuild
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 57dbd56b73d7..4dc0b783fae9 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ktextwidgets-5.64.0.tar.xz 311400 BLAKE2B 6c3b48489e1cb4415edbdf82e3d2507374d317d96808a9616409db366e318781bd6b0ce3c9ba5c890952dd63b1a48b541cb1b864775488f4f7f029f8de7538b9 SHA512 4c666ce1cd5d34840017944fbc70d664b28d4ba7711a4db2cf646239874f27fdfd7ec42ef9a7e99351dc23f3ee7d53e6d1f4fbaa0ff79c7b4a06aceb01a53f43
-DIST ktextwidgets-5.66.0.tar.xz 310828 BLAKE2B 8d975bd56e7feeccff0ee616a63594a039d0875e9c795f8e9e236743c351cae58c8635719e1aa17342a96ba682255e534e50fa137071d8e1c61eb1f39cfdd51e SHA512 b3cf365c7b2faf15366041488348d96a2bb9a3c8df508a913fab43b81f84db9cddcf795dfda5e0018091bad96e10a2b0c4073dbb80d0eb528fe52867765e4fb8
+DIST ktextwidgets-5.67.0.tar.xz 311000 BLAKE2B 016008e20bb4f99d25147005fc439cc8a54c65a94149ae6ce72b824f73171d8309bb0bfdfd80d49e0c5305d38c8df3da0b2849c462b7fa0332dc87adc144ecac SHA512 9c36e81bc6f94c291fd036173a661454a60d47879607c1d0eaafaff177d6e99ea134a0117918e5e3b3f2951268f7151edeba649ace2272959404efb843e2884a
 EBUILD ktextwidgets-5.64.0.ebuild 1032 BLAKE2B 237b6cc3998787fe355cbae56d67ddd08efa4fd9e6cefcef1822ff95d30193a02b5fef5f56fa935aabad0f3a16481d6625cf94f946f78a18009d82080c407501 SHA512 1006013ef2a1fb0587891292567db2b455b779c8ea62f9ba1f0c2e22585095d69fe9cd8a4c8f14a2f5612f2f3b62ac25bc1cb5ccdbc5419b1966e4e62ea81d89
-EBUILD ktextwidgets-5.66.0.ebuild 1001 BLAKE2B 3929bdf063251a15a6329e9c75e4aaefcb9e7daf565fe6248746dd6c76bcfdd9d2f066f039379de4cdc6dab8e670664390a947963d30e23dd58db991443c902e SHA512 61ebb973c0b709fd6662baf73851a34b1ab19f2d5d75d4762f29238f22872c36e5ce230f4284e0a821ab85a507722f86c5f8c54ff9eb7fa7f8332efcb5421923
+EBUILD ktextwidgets-5.67.0.ebuild 958 BLAKE2B 9f13ca4bbb8671298a49f60ec5575ba00ea1e8411e1a603bf160843c75f30183dabea3f3a730c6222b6d19431505da9431e1bc579feaa3f8aaed135eba69fe97 SHA512 5c5fadb86ea2e8497ee6afef1b08024b377146d71e1eeb402ef1e2a13cc9f460265db24a08c15403a2faa0db56697ea98e50e098e56c672cd287fdd1bb7fce7f
 MISC metadata.xml 399 BLAKE2B ec34ba2aa27c902fbadcc80e20cb0454169efacc5560ce722010c720d036c96ae381f8b07d2565fb1f4a74e56bf684123e5ebaba64621c3a0d21c37e8d2ac394 SHA512 8a6dca910cce7710df6cfea5320dd39d6037b2718bb46276d5a2f141f85b8ba7b56b0c73de2f8c93f4bed110192d1c3f2bc9f76c2f489c002e388673fce16893
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.66.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.66.0.ebuild
deleted file mode 100644
index a56440595bde..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.66.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/sonnet-${PVCUT}*:5
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.67.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.67.0.ebuild
new file mode 100644
index 000000000000..cdf3eb222228
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.67.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="speech"
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/sonnet-${PVCUT}*:5
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 3a235cc304ba..97bcf5541411 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,5 @@
 DIST kunitconversion-5.64.0.tar.xz 835916 BLAKE2B 21ff5d3f4dcc23858beea098d2b912d92c8cb5133f1a936d8ffc218ebfc33f0a58c32238ab0dd7baf6080b70c9bdd46e8557fdaecb0e65503f099d64e7ba9318 SHA512 870a6c02c212eecfabe334555419fa58f93484a5a604f35e0a89f5c8584d58e6863024ac5a31425370f8408112d47a1fd894a0e2e6290dc52ebf77d9f362ac9a
-DIST kunitconversion-5.66.0.tar.xz 832964 BLAKE2B 5a36a63a7601d113f182434e4f5f7f95fec2bce0848342eb00b86260f52ddf55792460288b3832f9d7e5967641725323db1982ad50739a0aac53f6c9e10ac989 SHA512 9138b93710e950a36a007efa2a88fc2d065ad370ecb59e25ed515335cb59be309fcb2374a7207a72d124b9e21f8a6c33dd71a8cd5c76767fe89c01d9c8ec4750
+DIST kunitconversion-5.67.0.tar.xz 838332 BLAKE2B 0eb389c3269cc8ed78c91d6f34afce2c9b7b9dbdbf339d92a5efa189983dc40942d52cca34b47c06b53c49bb224c1ee015099b261aa72972e1af7fba48afb6ed SHA512 04e6c5a96588980c16f1aa5fe88f009c1416f6ad65d333da28f8bd88e6a8541ff61071a1eff95ac66e0b8f835130645f406ed3bf5ab6938ce876b51ec67e73ac
 EBUILD kunitconversion-5.64.0.ebuild 531 BLAKE2B fe5a4f407d2e29514307d1848c6ba7eab0f79820182df6575a16d26a73c89a563f25b511a7d9c0f370a065925999f40547ad2c173952eec2a71e433c781c2e8e SHA512 9167e14cb4852307932c2dd700c6df7fc3dd2db4b61ddeb1bdcdd76c1b3e005e03843de4082852fe27a8b826d6215d947d57634beec0ec1fd8359ba07b4737bd
-EBUILD kunitconversion-5.66.0.ebuild 527 BLAKE2B 03df0b2db8b35be96d263114dbcbad8f1f25c4ae73b7306d8cb53ec651c52d57489e2ca5f915283613f398efe69903ece44e65c3e9561be0a1254eb8473a43a3 SHA512 0f6cc29d9629d1ac3841057861b549cbbf340550b411642cf9534168f228855056d035b6c1c5bbdccad5c352a7d50b74b62cdb28be6434289c5be7de2b73b9df
+EBUILD kunitconversion-5.67.0.ebuild 527 BLAKE2B 03df0b2db8b35be96d263114dbcbad8f1f25c4ae73b7306d8cb53ec651c52d57489e2ca5f915283613f398efe69903ece44e65c3e9561be0a1254eb8473a43a3 SHA512 0f6cc29d9629d1ac3841057861b549cbbf340550b411642cf9534168f228855056d035b6c1c5bbdccad5c352a7d50b74b62cdb28be6434289c5be7de2b73b9df
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.66.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.67.0.ebuild
index e4f002899014..e4f002899014 100644
--- a/kde-frameworks/kunitconversion/kunitconversion-5.66.0.ebuild
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.67.0.ebuild
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 34afed032e5b..98b1df8d21d7 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.64.0.tar.xz 293828 BLAKE2B c42a0c325eb3b5b1cbeb107dd6d302ba257ae73a9c17b7a79a49a0daf978473fa5f9b8229dd4ad6ae742e8834d8b83a8922fbae8de9f56a81e16857b57800b40 SHA512 78a4f2b5587f6bbdbc4b6473083246c6b9f68b4e47093d5061cee1c91b855b1822bdc72437dc25259728ce8cff3d8849d4b343d2fc3921cd05beac1c00159d6d
-DIST kwallet-5.66.0.tar.xz 294596 BLAKE2B f26137c54b344c2727844bdb2abf556e8bd91ad11d3d19c8fdced970d2c4ebf549df1a20c27a54587a1f71b35ccff6f2f30c6248de9e0331ec198a8b174884b6 SHA512 7a1513ca64e0532d8a2ad73118a365b50dddf9751c13d7bb889db1683a08ae05d655fab15dc1496398eb650dde27c36796c76a19eb6e25c9397d13ca86a55f3b
+DIST kwallet-5.67.0.tar.xz 296096 BLAKE2B 621eccad10b4f070a8ce20c9ba65eec6886a3891e2e412ec3bf68d9fb5a5c3d5efb1f5fc9f876bb00f49a4fd00b7d8c7346ae84a28a1b9391709d0beed46da40 SHA512 d71f29c476a7eaef05cfcd345e2569352dc5da11000bff7200dadea026d2a8f725cd777806dee99eb88944050566b630ef7904c250dddba0f68102fc320cf889
 EBUILD kwallet-5.64.0.ebuild 1419 BLAKE2B 546616ebdfad2797b2b5d064310595eff6c930bc4a2c6e8091f797430e3523abb79deac0055fe2f000d5d732c1bff0e0c99c5056021457fca70b9f7c027458f1 SHA512 d24a76a3b7104d940388e9348ea3d250ff78751bb4682466cf7b4e64e2835e6da4309e3b59c32fb7f6c61b3813018d2affd8910b9219a77a5d3722b1ce1b9e53
-EBUILD kwallet-5.66.0.ebuild 1430 BLAKE2B 3c25d2e0655f77f8b92f21d1a84d6890ca97925ae0e21a1ae9d70faacebf0e639d6ebb0c846b46814f1bf1e314df15724d60604fe5333c5645df728118b2b17d SHA512 727006ed0657b6b5aaad7e0b257802ce1e77ebe353e8849942db4969c5d712e6ee50817d0b4991040452e7b98d712e85efa36c02c227ce416de09c8a5b2ff7bd
+EBUILD kwallet-5.67.0.ebuild 1430 BLAKE2B 3c25d2e0655f77f8b92f21d1a84d6890ca97925ae0e21a1ae9d70faacebf0e639d6ebb0c846b46814f1bf1e314df15724d60604fe5333c5645df728118b2b17d SHA512 727006ed0657b6b5aaad7e0b257802ce1e77ebe353e8849942db4969c5d712e6ee50817d0b4991040452e7b98d712e85efa36c02c227ce416de09c8a5b2ff7bd
 MISC metadata.xml 433 BLAKE2B f33e8e33f6e8ddc49a85ec7494416546ddaf4db590b02cb3e4ededc7322cd088b7372291777dd836152df31f0ad890b61638b721fb2fa025d007453850d9e2e3 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4
diff --git a/kde-frameworks/kwallet/kwallet-5.66.0.ebuild b/kde-frameworks/kwallet/kwallet-5.67.0.ebuild
index d14ca3b72e7f..d14ca3b72e7f 100644
--- a/kde-frameworks/kwallet/kwallet-5.66.0.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.67.0.ebuild
diff --git a/kde-frameworks/kwayland/Manifest b/kde-frameworks/kwayland/Manifest
index 317653f37b55..5df17946ad22 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,6 +1,6 @@
 AUX kwayland-5.64.0-qt-5.14.0.patch 696 BLAKE2B 4f10c013496cd26dc7eb088db43ec30b822832e1eac22fdb604c64ee0ac28cc4858fc002175b62ff50718aaa757cdbadb1914c8bfc175a2b05a96331760158e3 SHA512 d4afe4336ec261d8cbf2ca8be41f5ca5e3443f9ed809436e112b1709da278bb80fd3f244f97984e905850f577eded18f5fa33ef6ebc2d53319a9c1ef8149e6a4
 DIST kwayland-5.64.0.tar.xz 339244 BLAKE2B 59c036163c022912f1c71568a6a493d279508d87310285b96f0e44e6cc0d414e02d718e6bdffeeb980e61fd2f09a2eb50eed3a5ed7839b11e41d1ddab817b70e SHA512 b56fb196f9fa3328c30c63d72ec474ef0ad81cef4b873d3ce9fbd67faa95a968609763ce19122058ef27f97857391436513c242bc300e305542bb0386dd1978d
-DIST kwayland-5.66.0.tar.xz 339412 BLAKE2B a56f8b9d55d5a0d8794b8d385a33fa3d6c477837852ae54547d00bec60ee878c4c3ebabd253277ecb41ce661e8a1e63af501dd99e559cdaddc47f89e8516e449 SHA512 dfc04e3b31594dbb9c8f232717353037f9d55fd558308d702b20a7a6ece337e9da0a1f422bec53d3893e9360c298d47314247338dda10c41a5c32f0f6314432b
+DIST kwayland-5.67.0.tar.xz 339916 BLAKE2B d1a4758c733fdb6af84f86789561fd1212a13e7a4f77dae11461c6a2f9018a89973e8ec1fa3e85f07edebcdc3acf28cd75c88135961400ee1bdc828a6acc8a14 SHA512 4f8c4aa2b9faba02b4198cec3c787bfb7e8da6133123146d9c8bac3f20dc9ceb4cc136260dc3af7408e52561156ebf09c67ea62f2551b11a1991e24a72ae0121
 EBUILD kwayland-5.64.0.ebuild 753 BLAKE2B 10514c4c96c8cc9c54af88ad08648d94bc1f6917ba008deeb1b34d4dea0c206f4fc7482c63d743c7e08a0bb581dd004b1137ecb0be3e2e819638434cde24ac7b SHA512 980617cd2459d3bb5d6961a4e029edb0e0cec1ee5d07aff06164dca5c37de7238e23ecaea8970eea1ac882ee5019005652fc1a71067b9cd094796842eb849938
-EBUILD kwayland-5.66.0.ebuild 708 BLAKE2B 4f3afbfacde03ee4b646ab8a3c54a8cbcf88dfb283a8bedb6a4c3dd87fdd079185640b10e9356f852005650b054316f41ff3c6081360f8361f32c7bdd998e96b SHA512 062e8b400e6b657ba1389015ff9f8e0a3b87923df26df22b41ce366ba8c905bc5bb2d6c0a338a3a785d3f83deba1f9b4528f4757d495e07f45cba3dd41542293
+EBUILD kwayland-5.67.0.ebuild 708 BLAKE2B 4f3afbfacde03ee4b646ab8a3c54a8cbcf88dfb283a8bedb6a4c3dd87fdd079185640b10e9356f852005650b054316f41ff3c6081360f8361f32c7bdd998e96b SHA512 062e8b400e6b657ba1389015ff9f8e0a3b87923df26df22b41ce366ba8c905bc5bb2d6c0a338a3a785d3f83deba1f9b4528f4757d495e07f45cba3dd41542293
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.66.0.ebuild b/kde-frameworks/kwayland/kwayland-5.67.0.ebuild
index 62e01942123b..62e01942123b 100644
--- a/kde-frameworks/kwayland/kwayland-5.66.0.ebuild
+++ b/kde-frameworks/kwayland/kwayland-5.67.0.ebuild
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 4792b653f104..154292120485 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.64.0.tar.xz 2204796 BLAKE2B a656843554f0e68343b5784c7ea0e686585ea7bcac1881383c4ce51eceffdef863b9852381fee71d85712bc20eccda54c237dd51e37c77b5e6916ddfcc31ebb1 SHA512 a6bcfb2633fd1f63f82f0624ad742fbe491a98e167b2610269ceb065b3fd3eaaf83ebfd78f74384a7fb7846c449905dd8a86768e15bd3ec1ed3c1b4ebd4fbecb
-DIST kwidgetsaddons-5.66.0.tar.xz 2201300 BLAKE2B 4780698415e28b4860f5340617218d98a7a7b0a960e86b7379c24b7e41d89712275cb593759c36bd284e3719176dc259de74ffc807cd2d85c4bbf449bc092215 SHA512 b1205337c031d73eb97a4fac1eb9398237c51e2e6df2429ad5a001c7857614eb908ee23ccc28d162a86b11f0fe6883f45dd15e706f151fdb42a3eea7568bb373
+DIST kwidgetsaddons-5.67.0.tar.xz 2207140 BLAKE2B a5080a2442053adba0c595920d7eb6cb9f3a28ac0b88c1c626a9c8d5dd172c18050f5d0d2b65600571f5df96ba83678f9df501318d7ccbc32e23bea43a82f50b SHA512 b327e1a1b7ec8c164c874395d1ec4788074cb48fe1e1064b839fdcf93442e5e777470769109dc28211923297841aad8cb9efe27e01fe37cffe247033001dd2d0
 EBUILD kwidgetsaddons-5.64.0.ebuild 686 BLAKE2B ae7db6ffcabc632e3a4805ad60c6867e6c90b0bdb81789376cbfc6ae0240215149b8388705d633b66ab7775719861cd6727cf176c945862b3cf598d6537947f1 SHA512 0860b477d66f046a2427994ae6d27313071c814308b212daf4e6c31b5de0d3ca108214ed6b2f9cffadb3c5e4e7019f291fd8e8ec69ace8e0e21f546bea5ee42d
-EBUILD kwidgetsaddons-5.66.0.ebuild 696 BLAKE2B 2b0a3ad9c148553424ccabbf1b0ebacbf6de6059206afb804467c0d67dfa54c1d05d51d87d1bd46b24387ed2453a40ef9481440aacfa67ea8e88e5f7299092e3 SHA512 71f10966343e6619967f7da661ba6dcb6e16cf59e004862a2933a152cc47e0d075a295165550b206ccdf7004d51a51bf845e552b87b75c15385e528bfc9f3b31
+EBUILD kwidgetsaddons-5.67.0.ebuild 696 BLAKE2B 2b0a3ad9c148553424ccabbf1b0ebacbf6de6059206afb804467c0d67dfa54c1d05d51d87d1bd46b24387ed2453a40ef9481440aacfa67ea8e88e5f7299092e3 SHA512 71f10966343e6619967f7da661ba6dcb6e16cf59e004862a2933a152cc47e0d075a295165550b206ccdf7004d51a51bf845e552b87b75c15385e528bfc9f3b31
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.66.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.67.0.ebuild
index 8e890907160e..8e890907160e 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.66.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.67.0.ebuild
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 24e8552a180b..39b775128b0c 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
 DIST kwindowsystem-5.64.0.tar.xz 171764 BLAKE2B 9364f7ad647f10475c4044b3f87a13d416275c44d76c81e6a23a937edc728e4c3b28380c201c08a94008ec0ffa3261b958476a5e65cf5652acd14cb946d4a714 SHA512 0d5e47ea61f03ae1fd3c8b6d92419d729040523d73976292c702d2897efad01e0b356b0d6230740f656ab59120f8ab8bae02fa513f87f7baa1da3e5cf28fc884
-DIST kwindowsystem-5.66.0.tar.xz 171952 BLAKE2B 232444741ae3064d14d58189490109bf1f300dfe6d21e5a00be04b2c799a1555889a39091a12ff71b98672fd70ccc26871a960cbb24004df94861b2779da567d SHA512 e36703eba7f58d1df58c90b1420b6065e27ef3014c9e73b8abf3420b5783f16a79b8e48c9df117864735d4240042e997d1d5dd47990f398af9de9cd323fab69c
+DIST kwindowsystem-5.67.0.tar.xz 175396 BLAKE2B 9e8ebb93d01e16bcda6f5aa1a8e28bc2949bfec72da18f67f3e7f5cb36eb1143410f7603d3adae9b6b1bb6c90017d51fb20af2d0cb94a1c27e73c44460cbccf9 SHA512 09aab6459c9b90effa8a2524c7415966992fdab986dd2313b3b8a72084f0e511da8b2c490ccc12836cc4c8555fe4c32f8c94d37b39db1d5736af7dd2f6b661bc
 EBUILD kwindowsystem-5.64.0.ebuild 809 BLAKE2B 663c19bcca9517d031708af3b84745ece998d923a0b59a5a2aaceb241f3678f25579d4ec6fe01a909abd41cf2c76488937d6d0310728544b90e4d507125d1660 SHA512 25070e8c0dee6c6c7414fc398a7ea6cd9845e71cea06669b90b7221bd1437b64827e3f6a7dd625227e7646340fe6055adad8c09d67bcda8e5cdeea88ee89a399
-EBUILD kwindowsystem-5.66.0.ebuild 812 BLAKE2B 7c3acc2066ef23e092a09f61bea149b3f377c042223b86c5a1698f98e0cb226592fdc2037f7c934a3253bb34c3bde661b3e9f2e784244596b4bcb1d163b864d1 SHA512 3735c9d46afd6398b9acee3bfdcc9c4f012ae5d3a7e448ed1daecebf4dd833b3bc2423df43ca3d1d24a1959011cbaa48c80f20387853ff1e279b549ed6647ca1
+EBUILD kwindowsystem-5.67.0.ebuild 812 BLAKE2B 7c3acc2066ef23e092a09f61bea149b3f377c042223b86c5a1698f98e0cb226592fdc2037f7c934a3253bb34c3bde661b3e9f2e784244596b4bcb1d163b864d1 SHA512 3735c9d46afd6398b9acee3bfdcc9c4f012ae5d3a7e448ed1daecebf4dd833b3bc2423df43ca3d1d24a1959011cbaa48c80f20387853ff1e279b549ed6647ca1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.66.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.67.0.ebuild
index 0ce9461c442c..0ce9461c442c 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.66.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.67.0.ebuild
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 3008ed58465c..fc0544a2da96 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.64.0.tar.xz 875332 BLAKE2B 08b67d60d504538d3591dc4e9236873008cf8d158344eb567fb5d0f1484514ebed73f2e02fb92685518ae7b34136fe9b27035ac2d3a5b652e0b7b93892c28747 SHA512 07d7991c32c028fe8720630c51e8cfde9917279d02af3ae0ce3f05c55767dc461efe1d4d63bc968fa829f04f00f004a4f8f11d5c71de653fdb001ea4fc84e0ac
-DIST kxmlgui-5.66.0.tar.xz 861580 BLAKE2B 002962cf775347a5a7545c0b312a9fd401bfa95227d566e66004751bb2c935cf6bf732562bcc1a769a5f28cba48165d45117535282e978b24f81f6970972260a SHA512 325e055943ff5cf733cb792136652e07c4576511aee2cd4a91a1a108df8c7946d6c21e8cb5133e3587309dd528bc4c6c3a4a01cfe914574eaae90e37ebf951e9
+DIST kxmlgui-5.67.0.tar.xz 857668 BLAKE2B dd6b40e2bc4e6ca725c910343299057e5c49e739dc4bb6c789b234302279af58cd224aafedb0a1bd5589244392c0780c3919423c4ab90d92313fbc1d02f724d6 SHA512 57e860ae9cb6c82d691b7f463992147f440f5f89cad14ba770a6e16f6d50347a2575a2fa5a0e09decb7e135ad50720f8762d412072d2d2fe868280e07d861e2e
 EBUILD kxmlgui-5.64.0.ebuild 1375 BLAKE2B 788c14c88f1758f942fa0200e16294c6eed0dd0972fbbf5e4d4027fe05d187fd0990801081c8ec952060ff98e86e666d9011b7bec8e48e4ef892486c527c2512 SHA512 9fb53ead67973a916017041426b18c24d7cd20015ff9dcda3d179ad26087b2c5b0deac07b8340bd9e716f632fba56e6b718cb2adc7f324e6129314682b0a2638
-EBUILD kxmlgui-5.66.0.ebuild 1288 BLAKE2B 82b3010144f141c3a259e47b3798a325efb706246554bd2c0f9d1bdfb8561d767d48c8d40ef00c50e536dffe4ff4f6e0303acff0c937d9b3fe9f015cfc6ae3df SHA512 9175fedcda1a4f4cf774b4bcc16d5daac357403587e906395bb4b1dd392dd360afcb295298f6f0bc74ac124d998d962023f0e66f76c55ed2b20c0330cbef83b0
+EBUILD kxmlgui-5.67.0.ebuild 1288 BLAKE2B 82b3010144f141c3a259e47b3798a325efb706246554bd2c0f9d1bdfb8561d767d48c8d40ef00c50e536dffe4ff4f6e0303acff0c937d9b3fe9f015cfc6ae3df SHA512 9175fedcda1a4f4cf774b4bcc16d5daac357403587e906395bb4b1dd392dd360afcb295298f6f0bc74ac124d998d962023f0e66f76c55ed2b20c0330cbef83b0
 MISC metadata.xml 421 BLAKE2B cfb7fbf74b000e0307c956a3ceea0aeca9d772bd660b6891c92cc8dc58d569be446764967ccfdf36752b5b8acb8a1f6b31417a625360133bb517f6072a715a12 SHA512 173d218f5def1b968d5224bbc63213a40468848e5c0ca70cb924d1298e2d1b510edf60e43ce7292d83b7bcf8baa89112cd602520a91bca8670a771a56fa4531c
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.66.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.67.0.ebuild
index 0eb5dbb35766..0eb5dbb35766 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.66.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.67.0.ebuild
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 21bf86a57d37..8bb6dbd4cb4d 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlrpcclient-5.64.0.tar.xz 29828 BLAKE2B b4a28a67364f77ba16300ee0315045b3e0da320f2808300077b503cbc0ad61d0d55e74d7e0acfb7991fefd34574391f741965611e8df26b8f67b3cdc2ac2849c SHA512 c70d5ba6611c15c60f99d484c817fae75e09f245d6416a0e646f4e6e43c78b005e9bcb2207709a81a1c34fa10e7d00f4c31c974807d9bbb925ba8295108b8892
-DIST kxmlrpcclient-5.66.0.tar.xz 29916 BLAKE2B 6ebe84181b7dd5689fd1d41ceeed6f3225294815346a30a1e215605be5e8774d9f970626a375d60f2932e5050fc0debb9944b557e217d3e7bcf73bb3768f7e06 SHA512 23ad2ca60bde4ad8beed9e13ecc6fa9cf5d596ff28e7e2f129a8b969d093aba4427c9671eb6efc7ea349be33d12f4cd73974cc6ea2fbba3631ba914dd84a1611
+DIST kxmlrpcclient-5.67.0.tar.xz 29660 BLAKE2B 4dfd2330a7ebfbec901ff4893627ec2b3736a4610112e4409627876f74d45df4800dbb5cb430154a475ebd0e139a5d8a554f11cda9890b1a432e5e6fb84ca014 SHA512 4c6d2a8f4bc165202bd97921ad98de35e25f977db9ffae31301d24f817a0baeb5516491482ddff12a1cf4df837cca8d363423979cb68734e036bef32e0467ffc
 EBUILD kxmlrpcclient-5.64.0.ebuild 487 BLAKE2B 7bb4c12ad7ed652608968bf63b48934c018da63efc338d9eca9486352f3605061103697872b035a45ca7462a4d0538c4853e047c2fb058a368c80f1a993acb1f SHA512 930d4215a6e319bea8a0408107d2bf42700cfdd9ffaf9cef32b234496910737420ecc75088d424b7cab3d1d1332da91cdba8b8ae3decbe1b58ca8642f037a377
-EBUILD kxmlrpcclient-5.66.0.ebuild 497 BLAKE2B 1c6c371452fab9100ddb9f170b27f05a8f9291b5c056893af71f6690aca28c4245463e91d26d53f3174bfeae7b6a900c82dc53ee54984dca1d483c45ee9bbc46 SHA512 b1849ada02b920ff8ee491b5ab764a353de12763198fa09fc554fee538860540cebb5640fe20e38937351e3eca1edeeadfb6a6acee79131c21813a75052813b7
+EBUILD kxmlrpcclient-5.67.0.ebuild 497 BLAKE2B 1c6c371452fab9100ddb9f170b27f05a8f9291b5c056893af71f6690aca28c4245463e91d26d53f3174bfeae7b6a900c82dc53ee54984dca1d483c45ee9bbc46 SHA512 b1849ada02b920ff8ee491b5ab764a353de12763198fa09fc554fee538860540cebb5640fe20e38937351e3eca1edeeadfb6a6acee79131c21813a75052813b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.66.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.67.0.ebuild
index 3b7f2e1a2e7a..3b7f2e1a2e7a 100644
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.66.0.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.67.0.ebuild
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index c9126e2af179..92da9a24f551 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.64.0.tar.xz 102304 BLAKE2B 5478f7417cc42ba069e3b55ef8d57c3a1fe5239243f29a9283be24b88b7f910e69c22e4bdd6aac68a1df6cd14504229743c5a0d751db15771494f5c29503707a SHA512 e458e74a3803873d2253aaf0fba12c0be9301454e4f649fbc94fd53f4bcbf0d7a46e53772aa4a20ee03a48210b7b04b1d1a6dceb549dd5686add18656495d30e
-DIST modemmanager-qt-5.66.0.tar.xz 101988 BLAKE2B 762597ca7254b92cd8d66b8b9f41818bc4aebe638025068c65546a25dd259362a00673d41d9669d443be72a209e11e1b0b622242c52cbba8e5b1f625aefac437 SHA512 2106d09e54fa47659398116f1066e479524be34bdc62043ab3e2e0264a2402096a3b7a9025157bc747c97a40b3da77c8a5f5e66ae594040bd646d62e5cee42f4
+DIST modemmanager-qt-5.67.0.tar.xz 102080 BLAKE2B f0d918d3323d560e7c91ff1f9886f6f1781911b7a7e917e3a5240d24d934b80e5c4ba9a44ef421f345daa06fbc72e7453f0f45c8b1028b88323b8d17411cf8ad SHA512 8882f4fc2dd22529336db0480e77c352ec3c915c018de3ced7a8c299cd098f4b7981ca015b74ed8d14088c2665d3e59bf9e40b7eb777b3f8e102286c8d04093d
 EBUILD modemmanager-qt-5.64.0.ebuild 459 BLAKE2B ad09bbc9cb08bacf5a43670501477790a9eec13d671a2c3e14bb91ad055706bb347f9822985ae40176d17b0c00cd976ccb23fd9b3f122deeffeb242cefd08fa7 SHA512 6e9f094309c6b432e85018938dcf29e5d556b54e9837c2e1e0b8238d847077c5bc7f36b72fabcaca8e57a296e2a76c8a179a55f8b3cb7b73a3f115b7cf11e4b2
-EBUILD modemmanager-qt-5.66.0.ebuild 469 BLAKE2B 8054ac713a6bfda474e3d842864eb927a56664b7994322a8e6f283c2dd77a204c7e5117c012d1ed93f57d7bb7ca1876beef3e90a42360550e0f5a26956df68e8 SHA512 eaa8e8108649148cd4b5883c5f9175eda3a362e5b39baca885b6f6d728f736d21155e516af95bc8bbb24d19b7be6351b9d59653f82fedfc40c97decd83652b19
+EBUILD modemmanager-qt-5.67.0.ebuild 469 BLAKE2B 8054ac713a6bfda474e3d842864eb927a56664b7994322a8e6f283c2dd77a204c7e5117c012d1ed93f57d7bb7ca1876beef3e90a42360550e0f5a26956df68e8 SHA512 eaa8e8108649148cd4b5883c5f9175eda3a362e5b39baca885b6f6d728f736d21155e516af95bc8bbb24d19b7be6351b9d59653f82fedfc40c97decd83652b19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.66.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.67.0.ebuild
index 170308564699..170308564699 100644
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.66.0.ebuild
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.67.0.ebuild
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 14a505d0c2cf..b92558edf9a5 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST networkmanager-qt-5.64.0.tar.xz 185424 BLAKE2B 8c9e89001ef2f08ed08ad8219c79c9b43738a0e9da621696e32297312359a0630a5ba0f455e02b41e328557ea6cc17b81a70dbeba35ec0c32798e2bd23adb956 SHA512 d84daab49f150820b34ff0e0b37aecc2c5e73be13d326e77a1636e3ab0e7544e98a4f85c18ac551674d9d653ad0f77bfc6a8179f4b33ae57404a730cdfde419a
-DIST networkmanager-qt-5.66.0.tar.xz 185592 BLAKE2B 931b0a48fbaeb17d216f6ef752e0a6a86642feb5b121782f04bcb937805fa4460d74918bbc953548e8715fff90059caab7857d15df7feaffe91e507bc11c604d SHA512 942012c5ea346dfe7be9115bde12ff5ac4834f23684185a17671ddd123f79f1357f3047ca7741ef23fcd59bf622e64b87cab77e29b24356d64725821b6bb77f5
+DIST networkmanager-qt-5.67.0.tar.xz 185900 BLAKE2B 115ce3dae4fad96abe3713e386501ab0397f1f693fb3298a62877dd3eb8450f5fab52073029734f12aa32d46c0a41a648039f63a48c0c47d795f3dd80b77d3a1 SHA512 fd1f0322f83b9252e168c32acc475eb732564fe1b88368ec18afef736089920bb5bd6b24a669703a61cedff73caca7e2a25fb3087d3d73abbc2dd52bcdf024e6
 EBUILD networkmanager-qt-5.64.0.ebuild 693 BLAKE2B a0c801d2dfd844fe82e19b6ad52f6bc319c3124ce34d4fa1b7403efcb3ea9b1cd0297d59fb3ae94a7f30755c2379be938d9bb6824107ac58e089038de96d4a52 SHA512 04cde37849475e7c9f1b65d84724775a0587c425a3fa311e16005cb92e4c5054fbc92479caa35ac70d8d237644e03e13da7e3cdb7ebdfff79ef7c701906a9ad4
-EBUILD networkmanager-qt-5.66.0.ebuild 703 BLAKE2B 698b8cbac5840cde4d66af68465ac9578f51fbbec6fe83d42f9019f7ed3fed36bd0be06e1b0c948ed923915b038af0124f5552ff766515227062c8c8c1c63134 SHA512 2802aee77d302355ac6d8673aef7be938316dc29eb6a6a8cd13bc4adc1af2d432219b20ff07b1d770f2e2b04fcafffa5f74cc1267b3333cbf5922d987e0f9bd7
+EBUILD networkmanager-qt-5.67.0.ebuild 703 BLAKE2B 698b8cbac5840cde4d66af68465ac9578f51fbbec6fe83d42f9019f7ed3fed36bd0be06e1b0c948ed923915b038af0124f5552ff766515227062c8c8c1c63134 SHA512 2802aee77d302355ac6d8673aef7be938316dc29eb6a6a8cd13bc4adc1af2d432219b20ff07b1d770f2e2b04fcafffa5f74cc1267b3333cbf5922d987e0f9bd7
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.66.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.67.0.ebuild
index ce3ba3fecaab..ce3ba3fecaab 100644
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.66.0.ebuild
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.67.0.ebuild
diff --git a/kde-frameworks/oxygen-icons/Manifest b/kde-frameworks/oxygen-icons/Manifest
index f9da40701d96..59ed3e670bf0 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-icons5-5.64.0.tar.xz 233816028 BLAKE2B 0360848b947f489d70800e95becadb4fe9f668afa39521ca8bba06b46b64100f6e0bafa97c52d6162a6523c070bf253b4c46798892ba7832f685dfdd9578772d SHA512 fa5080e9330a3b8669238bad7f163c9a3cffe4b4cb8dd44a7ebb6dfd9a2139008f1b9567e3c058910ebfbe48e789191db3c16abe9cf9b40e3f633822c403530f
-DIST oxygen-icons5-5.66.0.tar.xz 234149580 BLAKE2B c64da887e4aa2c57d355e7cb141e457f9220478ef1ce5115285fcbc18ee37ba4825df0d17f9d0e7b6a6d42c6692d00d98a2f49946c4c06e93c9ca44709cd7f04 SHA512 7d55bc6ae80ec1a703a6f6ac0d81b2999a96c4e2adc7272a7861f5dbd3d5b006249dc929dda82ff262dc00a4656136cffb38646b644dc5578e3382968b22e899
+DIST oxygen-icons5-5.67.0.tar.xz 237578824 BLAKE2B b7fb2739bff330cb76966a489b34134cc414082207403bbfa1715f2e2d4d2078123123c04928fa4e8afd294928eb05a5caeae95a9923ece3d3135f9021e39b29 SHA512 d77da5e218e1abaf78069c3bd339c953e64b9f536d234f7d1a179b28476958170db8a660e2c7f0a04e65ca4ea99704d36b6232d698d6c15f78d4a388a568cc65
 EBUILD oxygen-icons-5.64.0.ebuild 582 BLAKE2B 8738304ec77c0de8153e85fc1e4aa7264fbc6cffa6fa3ad520fb8fc56a2917bf4af25e611414d2bea360891bd26aac893e748888863871726b31d5f3f30e0377 SHA512 6ac4833fdeaaa192c63213b506b66c3815bce70d847703ce85836010af72e399bc821ba347e70ccdb8c4e797b79e1e190c3bc206dd1d2af1341f988057aa1f33
-EBUILD oxygen-icons-5.66.0.ebuild 597 BLAKE2B a21c34807d1a8eae0882bcec86cf50b8493b11087e2e08581d6767d6a77798009d47028586e636c668377ec437c17e5ce60216a2a1d2c75ddccbfe218fc210a9 SHA512 b8cbd013067db82c4b2d3b6f02b7d90c3673f0f63d0ad1beae8ee90b9b375190466991dfb01d76b1b70ee014d3cb99113016f7dfe959ddfe16c1330d9b4baca2
+EBUILD oxygen-icons-5.67.0.ebuild 597 BLAKE2B a21c34807d1a8eae0882bcec86cf50b8493b11087e2e08581d6767d6a77798009d47028586e636c668377ec437c17e5ce60216a2a1d2c75ddccbfe218fc210a9 SHA512 b8cbd013067db82c4b2d3b6f02b7d90c3673f0f63d0ad1beae8ee90b9b375190466991dfb01d76b1b70ee014d3cb99113016f7dfe959ddfe16c1330d9b4baca2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.66.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.67.0.ebuild
index e542820e662a..e542820e662a 100644
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.66.0.ebuild
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.67.0.ebuild
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 9bff951ecab5..0dc71599f4b1 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-framework-5.64.0.tar.xz 3120788 BLAKE2B c9c008e4b4b711ba4c370ba95029c4fc7392fe298057f5f8fe959118ad873325cfef3e3a93cee0dc73c7ce786287f18ab661f22e9f32c5f706aca5d15b70d24a SHA512 d0dcdbc4c537d064a125cef11d07e562a9a3b1bd83442217f8f435260420753c34b4dfddd733fc497533bf16a22fad3746884764395e07cf0f268d5f8435ef3c
-DIST plasma-framework-5.66.0.tar.xz 3124284 BLAKE2B e62675e9880ef0a87c680a7619ce5a4177b27154f2a3c70f788bd436ba1a09924244c138561d53683c02f1aae99cb5f211199e2648203789fdaa97fa8841fc21 SHA512 b6a192e19e4cf4e9172aa3ac6697f58a6d3b198885929c2fd0da0732743153ee17d3d489328b2bffc7f48f5674369c20a025c4ef47aae10a0b50d03a660a7822
+DIST plasma-framework-5.67.0.tar.xz 3127592 BLAKE2B 15eabb6b3c62117ee64a8ceb2c6cee9d1df29942785b5e0e061f062e4ddc5cedb0ea73ea17e597bb09a5eef868cb8aafe81a25d51af19691f05152d05b916f8d SHA512 3708262501b39698a84656b1ec0ea461011369301c7e1f1e5858fdc5b3e06f4fd3a5d7511dba1f91e08e89b2331fcc3204561efd1e06440f97e6b4a32cbd8f92
 EBUILD plasma-5.64.0.ebuild 1899 BLAKE2B e63ebf02875b1bcafe8fcdc4a808b825bf9308c9beb389c9a1f748d04df385740f57fc76a4c87108ba1e8ae9162a557847eedd882336170aade350139bef13d9 SHA512 30dfcde51067155c381cc15f58d182fcb4dbe121ecc9fc8cd0b277cd6c74ed1807b051a64e485bc681a9ec5471576dd9c63819bd535389ed72d1686655784c73
-EBUILD plasma-5.66.0.ebuild 1910 BLAKE2B 0825529d74614bf1695219f9b363297fc8f879e4e58346582984399e799bf55e2f8111fbcd96b80f0aa8589187062f2b1e1864514768e948481336b5db71b96e SHA512 bf81cd8a5b452032602ac078468d3726cc4efcb843945b3a4323e7a212e1777f7e522638f1a708861437c4bae61d28c575259119e4efa64a232678b4ab1b83da
+EBUILD plasma-5.67.0.ebuild 1910 BLAKE2B 0825529d74614bf1695219f9b363297fc8f879e4e58346582984399e799bf55e2f8111fbcd96b80f0aa8589187062f2b1e1864514768e948481336b5db71b96e SHA512 bf81cd8a5b452032602ac078468d3726cc4efcb843945b3a4323e7a212e1777f7e522638f1a708861437c4bae61d28c575259119e4efa64a232678b4ab1b83da
 MISC metadata.xml 337 BLAKE2B 83b14f1456a141498367a54d2b3b1bd22095d8a2ea5d4b348bcc1b27b6e753900e89d2b2f7f6623a9737c6c6fdf4fdc741fb38fef17b17bc458d182e72be919c SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797
diff --git a/kde-frameworks/plasma/plasma-5.66.0.ebuild b/kde-frameworks/plasma/plasma-5.67.0.ebuild
index 27066b6b7ad3..27066b6b7ad3 100644
--- a/kde-frameworks/plasma/plasma-5.66.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.67.0.ebuild
diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest
index 9f752dc9ada2..967d84e36309 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
 DIST prison-5.64.0.tar.xz 42116 BLAKE2B 4e70cdfef7f7e44566d842a533094978e68bba7b658fe57da818ed84b90ceec97e601d525af96989b171c45453bec45a0bab20daee12bde18dc55c41349c7513 SHA512 d8d19d9756d1b46a3fd1d94676730054c79fe01c6990f4ff059154d5ff6cbf20e357ae79784e4f1cc621352017dc3f3b56f309f9b5363bf6d0dab39912c6e930
-DIST prison-5.66.0.tar.xz 42156 BLAKE2B 1834c760f5680076b6cebfcbd1f0d29776cc41908dae5c43a6a87003fd3aff14e30bc32c921ea54bd62dd0eaff6191eaf5fcace8bc482ecc57aaa63b85d42c50 SHA512 0ccdbfc603a21bd152cd8a52508c89de5af4d9465ddf19caee0a8a58115cdcd43ff839a88f90ed43f8afa70d326fe7cda060b83951eeb97d0accdde61af89616
+DIST prison-5.67.0.tar.xz 42124 BLAKE2B 00e607e959967868f81c2dc32e60a647a795a416100e8497313f1529cb26922e25352c83ec5f9363867bfaeade6ade928902aa4c8dee0228bb76132076a1f798 SHA512 cbb1c5fbab33fb7a53a43f159451f77fdb04c1fded62330743bfc7303fd036154450115d9f09593f6c39f226cc94332e9a050568f3e2520dcd6cd41a8ea4c4f9
 EBUILD prison-5.64.0.ebuild 554 BLAKE2B 847a14665e6d15f0a1bb81d311f7a6f893ec4e321e7a3f591aca397358a80227f2b2ef960e742b9321951fa88dfa6c3db4d55e7c2b9c0ee8544e611c78879460 SHA512 033b03521e7afadcee07a7a13f6790aa2efd4eba86186845c3adf6c2dd994a1e8ec726b17a595c46c4ac5a37aaafa0db773d7c7854201e1c4675cdc86ef9ffd9
-EBUILD prison-5.66.0.ebuild 564 BLAKE2B 6b99d80e96098c213afdc6ff6683f9c5b6bce7a05cdb2f038293c5f309f341c8ee2c23bbf66662da28a6ec979024bdde2eef97816df709c9df12c970e01215e8 SHA512 9e0f058840b4a097715b0ba239e3e2f1a82105916f18377d7103541fac77f8fec2d6c76596e25e03d55f0ad6a0f895508e714050bac509fccf8b8a511c742b2f
+EBUILD prison-5.67.0.ebuild 564 BLAKE2B 6b99d80e96098c213afdc6ff6683f9c5b6bce7a05cdb2f038293c5f309f341c8ee2c23bbf66662da28a6ec979024bdde2eef97816df709c9df12c970e01215e8 SHA512 9e0f058840b4a097715b0ba239e3e2f1a82105916f18377d7103541fac77f8fec2d6c76596e25e03d55f0ad6a0f895508e714050bac509fccf8b8a511c742b2f
 MISC metadata.xml 353 BLAKE2B 0131b7b94f9b9f5c0407c2b4d643f397be4308f66a6fd89260861d971c4274b82581f78e7661361cf1ce1800612d0d9fce132c2d9242356a91bdd1e03a04403c SHA512 2068fedd6ea1d72317184bc10ef48574e3795d2e03e9293d0c2bfa685308727a7cffc9429fad89e42a53bddf7e933f6c57ddba56ca00b8a8671707c1a3948473
diff --git a/kde-frameworks/prison/prison-5.66.0.ebuild b/kde-frameworks/prison/prison-5.67.0.ebuild
index ea1ffc8cdec5..ea1ffc8cdec5 100644
--- a/kde-frameworks/prison/prison-5.66.0.ebuild
+++ b/kde-frameworks/prison/prison-5.67.0.ebuild
diff --git a/kde-frameworks/purpose/Manifest b/kde-frameworks/purpose/Manifest
index b1198697ee2b..a49a4e200a95 100644
--- a/kde-frameworks/purpose/Manifest
+++ b/kde-frameworks/purpose/Manifest
@@ -1,6 +1,6 @@
 AUX purpose-5.64.0-ecmqmlmodules.patch 1086 BLAKE2B 53d35424b064777fb64136e409de578137b3ae951e58873c26ca65692fdabef2d5b83e23fb2681f0c1c1cf8b58c9c2d19c05844ea7888958b0f5967dd89ea32a SHA512 92c9d08d64b5e85963a4df6dd7d4e9c31818572d3d5cf31904ee00ccd6566e0971dc1fa0008306db1fdda454f22fcd99aae1f8bac7beabe0333d7d8fbcb6d012
 DIST purpose-5.64.0.tar.xz 154056 BLAKE2B c2d5b0e008cd888c312229783680e02ebcea7765f0c5038d4ac3b6d70357b1372e0a62a5d0e183a8daee38917ca12b4d01a59f7ea1172409d2e55884082383e8 SHA512 841ace0d4f1de6f78f2031e0b372ca08865d827a35db8a7d97c62acfa885e481cf1d05c3ea03ed2ed451eef3322f3bf5753366e9ce053e73d4d590e1ed52b464
-DIST purpose-5.66.0.tar.xz 156260 BLAKE2B f61da542794bd2027db9b466262687cb543efbe1524b0e63898a90f8ddeabc14f9322527d553cf1f20ee477fa1459757d083c52c9144f67bdc9c3a51bf638b74 SHA512 55a71eac7db0403ae9cc2f561c0d64c856d9943e5653c4c45666aa119c53f3c172f71775eb56c0b8d524ff99b5358a3759559c571afb96b7a7f35b5e373147fb
+DIST purpose-5.67.0.tar.xz 156680 BLAKE2B 1bfd4d78eac52162d71bdb8e827eccd4e65a1ce907b87a069f5c188f3f51746b380f6b8d678b7ae74e94b6187e9fe0dc4789bc0cbf2d653e00d286fca5e174b9 SHA512 5035ba1edb62bd6e4d9fcd9aabff94f9c74d795862e787006a4586463a8d809f2b148a47b06ccf7db1039978ed91ef15c65148bbe662396f0f76268931a8d069
 EBUILD purpose-5.64.0-r2.ebuild 1465 BLAKE2B f3f95092aeb1c2c268142349fd7fef32aacb903a2ab15170cd10cf82805a9c45b4c93225411cdbc3968026c95293b17615af6657e4bca4360c928dab90dc3b82 SHA512 2b0ceec0c6c988a7b2857ac0d25afef833698da80257c08844610560b92975aa78326c998dc3694110e30054eb271dd17bd5c078ea2cc6e13cd8b2d2ccda7b7d
-EBUILD purpose-5.66.0.ebuild 1402 BLAKE2B 42578faea95683e3c0c065d44951dbd362bd051bdc530aa77617f80dde2f5530cd7a514bada30d6cada442f99276b810a00942501683e4a29771118d29221856 SHA512 d4302921ed02e1574a03e66c62d65f413014ce082f7a7a186db32e5b082cb6cf09afd09bd099c0d804fb4bb910c015e73067cc5dc8f3ad3d2efee64102232dc3
+EBUILD purpose-5.67.0.ebuild 1402 BLAKE2B 42578faea95683e3c0c065d44951dbd362bd051bdc530aa77617f80dde2f5530cd7a514bada30d6cada442f99276b810a00942501683e4a29771118d29221856 SHA512 d4302921ed02e1574a03e66c62d65f413014ce082f7a7a186db32e5b082cb6cf09afd09bd099c0d804fb4bb910c015e73067cc5dc8f3ad3d2efee64102232dc3
 MISC metadata.xml 441 BLAKE2B bedd6e101cd0b4233d383352c66125b30508c7bbb5f597bdd6854e02b89004e2e9aa968de63357f58fd5e196de40b7f1e4816572f828a7cc5307a657125bf21c SHA512 7d5fce42c371a15a6d05866d5d40436a05b8ec34538ce5fab7d4f47a9dd6ae4312ac4096e646df230ee611bddd040f58fa93f41688517b4205d3785f1ce56acc
diff --git a/kde-frameworks/purpose/purpose-5.66.0.ebuild b/kde-frameworks/purpose/purpose-5.67.0.ebuild
index 1bebde506a67..1bebde506a67 100644
--- a/kde-frameworks/purpose/purpose-5.66.0.ebuild
+++ b/kde-frameworks/purpose/purpose-5.67.0.ebuild
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index f06e2abadad0..fb417f958f26 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
 DIST qqc2-desktop-style-5.64.0.tar.xz 45752 BLAKE2B 45cffe35277930cc0b6b06067127e62fd2a693d492862e44079741c53a8fe73cc2ad3f40d3e2b995f4230e15bd436b603f34d9af2bcd931aaa4ab0d38a1226b4 SHA512 6e4073a994dbaf4405a9e017ed62a90fb3d8f2c79361d73601eec6d6d4031d81234f2eafc11d6c87e72cd19caaa7979fd6c28965749f05c35a44a0a7c2092e6d
-DIST qqc2-desktop-style-5.66.0.tar.xz 46088 BLAKE2B 9f50ff6941c4a1bd1791e69bf90176ae92e552b89dad2dd97b2d42348d4b2724e3bc80d147b83c92d0a2fef36bdbc212b37cb7b776217dc46c7dba76af39230c SHA512 b0582fa59aaafa7f149a7a200b910d91c89040927fc1765ac345857a46d5edec152be40766ccdbe0a8e58d8181fa3895400e7570cf6b2963910a5863f59b5768
+DIST qqc2-desktop-style-5.67.0.tar.xz 46164 BLAKE2B 69ed032acd6d5b9ded4e84234f358a86bc8401796111d406cbc17dbd46dfa8b447e824ea0f375c0f9280dc1d390819fe853f2fde572d5951ce55e7f95cc5bd74 SHA512 800ffbe33cf69987b90464d4f5a7cb08749919e1e202f6940ff8bd14fa440755dace100554e6bd056a5bd4bf8004945cc20f24b7a486d26dfdf03daffff0339f
 EBUILD qqc2-desktop-style-5.64.0.ebuild 669 BLAKE2B 31d861f36692b95a5545711c08120ecc091e60d0a0ea87c2b9ebc6594743c5ed6a3c7c3530f23c50b547a2da4a73f84b6a982e4db9ece815e555580d69d02449 SHA512 cc1cc4a16658fcb97c3610e3f3ad3fd96274a242e0c7f78a2f219a355157058dd16813cd09d1ea82f3421cb4e4fff0d30e07f5a42fae14a39963e4bf09375b61
-EBUILD qqc2-desktop-style-5.66.0.ebuild 679 BLAKE2B ec70264279fdde5a24deb43176dbfd251c8bd4c24059b3d1863ac2131081c80fb0e928738af23c71f1bfe4181b93c11f1e79e2b6d27de4a35ddc2975023b2d79 SHA512 f69c4939986225306e8ccf9ac3155886b46963e4f71cdc22b084eb3aad9d6c64185728716e6f8dbb9fb2e056521e2deef7e5550aef9f61faa57282bb77d41b3b
+EBUILD qqc2-desktop-style-5.67.0.ebuild 679 BLAKE2B ec70264279fdde5a24deb43176dbfd251c8bd4c24059b3d1863ac2131081c80fb0e928738af23c71f1bfe4181b93c11f1e79e2b6d27de4a35ddc2975023b2d79 SHA512 f69c4939986225306e8ccf9ac3155886b46963e4f71cdc22b084eb3aad9d6c64185728716e6f8dbb9fb2e056521e2deef7e5550aef9f61faa57282bb77d41b3b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.66.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.67.0.ebuild
index e49532f72fae..e49532f72fae 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.66.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.67.0.ebuild
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 6df8e3c80ad8..6fdaf04bcac9 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,6 +1,6 @@
 AUX solid-5.64.0-udisks2-media-change-detection.patch 2748 BLAKE2B fce33a1d668deef83fabd7dd553170ca48d50bab2c2b452d28a9d64ef065efb775fdee7771698aba6313f5abb817a34efae5faf1bb8dd1811d992f91fd382135 SHA512 3b90fcfde9088931787bfc7b490b3a0ae3e3bd4a57e0b559bf7ddec80570ae5f5db37b8e1ace97d595d20d59b754858ff31b8965d5fea155dab41ab2aa350ed0
 DIST solid-5.64.0.tar.xz 264304 BLAKE2B 56128117e95e7b142ae83df630183f24fbb46e30f468a01fd39ca3a0d4d67d8ceeb135a05d840b20b0de9d9e1131c8c47bc78761849fa95e311243c8dbcd91d3 SHA512 f1294431973799369afc541db24d33c7c75fd17cce4b843da9c17c782e0a8afd2ba0032e46119c036ddf943747af33c2aa96a1c318ed531c5842b38a1010f857
-DIST solid-5.66.0.tar.xz 264972 BLAKE2B 4b5ee24b7b8241e30020f046a366620c6906bc14515745d30f64589b752f7938eb62101b034dc58d3156c2b29f86c6874617454d9640690fb3827b7e6934942d SHA512 df00bb300a3d5cc3f11fb2fe9c1f64ebff1f7e906097ddf5586b1005299877e17d41529abb2d06510973ab80585084250cec81e89b6cb45291716b20ead0da5d
+DIST solid-5.67.0.tar.xz 265740 BLAKE2B 56589131e08782a74157328e366e9d6f835e855324ced74a5d823b71ab50a13952eb2326c20670b0433c273a35209d22b33acf4fa794540a781df0e019d8f4f8 SHA512 fd5e96b397c6de719c0bcea1c44be069d4cce97d1bdd65b20416cd7dc83646bba83915e565b584cf5131d040809b1e3937084552503ccc7d2db0e2e638b453b1
 EBUILD solid-5.64.0-r1.ebuild 901 BLAKE2B 05940fd418f394976996cfbcb8a8b5368dc841c7c222febc0f83c00501c7efbb6ac878025e92a45b8e52e58d1342ce485ffc55c5eaded7eb7d9851c6c44f254d SHA512 1700093546e34051bf443ed0a6a3fe2215c52344cac1b70a109a326b900c24e7b9d14bc2ad4c2145d6af85940c603e7e698c7a1d640fc93efc3975aaa21bd9d6
-EBUILD solid-5.66.0.ebuild 831 BLAKE2B e71b2f285d18fa807fe5a803d184d7785a2e7ed3cc8f9b50830de7c7b999f57d0b7642c13c32833413b0e211862608eb2944f2cabed79f0bd6a6bbf1e6f13b2b SHA512 ab5e7b9ec2c47ee191a45516609bce1e8999fedb1284fd38b378d519c85ee006ef26612934e68773dc09ff4b2d070dc27525e7d0eadaf7136d9050d0f93d224e
+EBUILD solid-5.67.0.ebuild 831 BLAKE2B e71b2f285d18fa807fe5a803d184d7785a2e7ed3cc8f9b50830de7c7b999f57d0b7642c13c32833413b0e211862608eb2944f2cabed79f0bd6a6bbf1e6f13b2b SHA512 ab5e7b9ec2c47ee191a45516609bce1e8999fedb1284fd38b378d519c85ee006ef26612934e68773dc09ff4b2d070dc27525e7d0eadaf7136d9050d0f93d224e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.66.0.ebuild b/kde-frameworks/solid/solid-5.67.0.ebuild
index 68634750131a..68634750131a 100644
--- a/kde-frameworks/solid/solid-5.66.0.ebuild
+++ b/kde-frameworks/solid/solid-5.67.0.ebuild
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 914424ae4663..b9fbdca21ecb 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
 DIST sonnet-5.64.0.tar.xz 286768 BLAKE2B 299f69e69415c75c64f38b9114611b2fc7b58d23bccbade2d062a5ce348da9bf1f169d16b7dae2748d86974151f2496bb8cb86a9113f7516d4de549abc0dd594 SHA512 37a2f17de5d47a9966452d95d2a2c82816467a6ec0c6a3318c40847b641310c568d84c6acb99f1f4a54d02e8e4b7f17e76eee36410ad194b0a33170557f1282e
-DIST sonnet-5.66.0.tar.xz 288968 BLAKE2B ff492bb8c49ad1be4789b21b7f54db28de404336f03857236bd512217da39949059f29f4c7df9a1882decff956a3b00015c7feb02ff0f9d98290f066a661a063 SHA512 17fee80d64762941f2f7d0d1b349d2b1cb9be440499209ea40ec38332c6cb12a246d5614053e8b0428ce113fef0765e577ca9ef44b2ddb216e33e6a2e947af3b
+DIST sonnet-5.67.0.tar.xz 288752 BLAKE2B 7ebacd4d94e587db6e84874d093f1ca2110274ff9232f2561b14f825865bde7ee91fb39509989de0f88fa4b8522d92b183d1bd835ff622008c5060815932a3d0 SHA512 b31d4cf8dd13553a1e8caeeefbc8aa3bcdbb08fe84139784922fd7475c9dcc3e86e55f90d34e744e743b0c9f78127455752996f519d7279d9505d946dbd4b878
 EBUILD sonnet-5.64.0.ebuild 880 BLAKE2B b60357df5a75ff2f280fea0e149d7e588a00c39228924b42fdb7ae6af40d8878092f0e4edc209b07e7932ff5e237898e08018f65fd7495515e03592c6149fc7f SHA512 239ebc7fd020fedc834a3418fd50e6281505c35d00177f2268c2ff4f2849b1415b76f3e0d31616e36bf2c4854afbc09df4d9702bc2463c2c713deecf45290064
-EBUILD sonnet-5.66.0.ebuild 883 BLAKE2B 48623cdc96339d163b89eac3bb5e979ffc054f80e2596bcf59246206d2464976d2ab767a69ec1abdae5b1533847b25765cfe45ff3d702c21025ad54ee7082072 SHA512 b4576c2c727a95a79326e16f071073981171e80a067d9abfce229d4dd4d3c72630342bd01bef2a7a91a79c02f349a1b4479859dff040608bf94ffd7f6e688285
+EBUILD sonnet-5.67.0.ebuild 883 BLAKE2B 48623cdc96339d163b89eac3bb5e979ffc054f80e2596bcf59246206d2464976d2ab767a69ec1abdae5b1533847b25765cfe45ff3d702c21025ad54ee7082072 SHA512 b4576c2c727a95a79326e16f071073981171e80a067d9abfce229d4dd4d3c72630342bd01bef2a7a91a79c02f349a1b4479859dff040608bf94ffd7f6e688285
 MISC metadata.xml 502 BLAKE2B d76f720d075b51e7bfba2fbf3edf8715f158ff62585596233be3b6d3afb52212e15be4d3cfc4e83e68a52dfe3ac233af1cf82894ce3197016d163f3d2688e673 SHA512 5ffd2a07ba9206a3d6a88970687c3baa068af228e6025cbc662a466eafc0afb3598e390f907b8c334a418394e60f58db07431cd0a85440148f9959be6ea6e0af
diff --git a/kde-frameworks/sonnet/sonnet-5.66.0.ebuild b/kde-frameworks/sonnet/sonnet-5.67.0.ebuild
index 93eac7f8dfbf..93eac7f8dfbf 100644
--- a/kde-frameworks/sonnet/sonnet-5.66.0.ebuild
+++ b/kde-frameworks/sonnet/sonnet-5.67.0.ebuild
diff --git a/kde-frameworks/syndication/Manifest b/kde-frameworks/syndication/Manifest
index 599a16326a61..1558efca4900 100644
--- a/kde-frameworks/syndication/Manifest
+++ b/kde-frameworks/syndication/Manifest
@@ -1,5 +1,5 @@
 DIST syndication-5.64.0.tar.xz 479780 BLAKE2B 0d8b18fede3b194a5dee5b075b2ef77d3537109ae0ddd33efb23e53a7f83adabd3f4b77993bc473e7d1a2779e5280197c82a9f3863342d165ee5f8d6c9ab47c2 SHA512 6ab26136e92f49d8acb4b5117bd2c1450ea779bc0c0d4f194013ae0f26eb19bb85fab93d1b4e08edce25c6158860907c5eed3870c114610b10ced521c5ab12cd
-DIST syndication-5.66.0.tar.xz 508752 BLAKE2B 1833b554a662fa9fb4fb0b8e5d84e83ed44296659c6b036d4620a32a30628320db3219e6ce38648fa8730f688d75d349b2761c431433634226c2e10356fdc4c2 SHA512 0ab81b13ede66b11ec3dc014c0d4c9b46f1a7cb39d0f3beceb4c0786c77f7b560c118584b76dee7dd627ec1db4b874de9bacee1025b88ced8be66a936c9a36a1
+DIST syndication-5.67.0.tar.xz 508556 BLAKE2B 5fd096eee0a383de1b9320a96cd14a87a5eea99f8bfe2a9817cc0faf9d393dedf4de03356c2b47b80bb159e13891703303cec7a2f41455de65cda75c6c5d226a SHA512 c8d1b56b5ac6661bd0156a1b611b3ccf27713c1fc688e3491046f6297f7dfe1b3b8591bd0157613cbe421032ab5f16ed17ab67630175ac0b8f1b7f74bcf011d9
 EBUILD syndication-5.64.0.ebuild 527 BLAKE2B c8978a2bb9b88209037587887559257c2ff2f69b5c46ddbc6f7f1b389ef95c64d94f6791942ff5ece6f3537c93123195573fd404b401ab80a9433fe38d11bf85 SHA512 8b3d2fa71c03722fdf8da989becb26da1e05cb43ddc5b2827a82751b3a5f59fc70b41e9f438cb84b2118d1a5d5ed46d9ce7f98fedfc252a6c25cbdd8ab0bf799
-EBUILD syndication-5.66.0.ebuild 537 BLAKE2B c3e44578647edaee2a564ca7756c1b4913cc6779c566429113e1b786dcbc9a575ec9de80120bfe9bdace11f29c6b5d76517e2c27916f0aefbcf0c4851f96424d SHA512 98ff594c79731d7e6313e38c8ad9e064cf69190367ef86eea5c340a8c8118e1c0317a5e77673bc101ab84f6a3aabf771d24bd7af539d7d090ebaddf20a614be7
+EBUILD syndication-5.67.0.ebuild 537 BLAKE2B c3e44578647edaee2a564ca7756c1b4913cc6779c566429113e1b786dcbc9a575ec9de80120bfe9bdace11f29c6b5d76517e2c27916f0aefbcf0c4851f96424d SHA512 98ff594c79731d7e6313e38c8ad9e064cf69190367ef86eea5c340a8c8118e1c0317a5e77673bc101ab84f6a3aabf771d24bd7af539d7d090ebaddf20a614be7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syndication/syndication-5.66.0.ebuild b/kde-frameworks/syndication/syndication-5.67.0.ebuild
index 889a5c5acacc..889a5c5acacc 100644
--- a/kde-frameworks/syndication/syndication-5.66.0.ebuild
+++ b/kde-frameworks/syndication/syndication-5.67.0.ebuild
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 4983732bcbf1..a5cc0eaa2080 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,5 +1,5 @@
 DIST syntax-highlighting-5.64.0.tar.xz 1572812 BLAKE2B 5e1b7de3bab10fb912e3c3d0d07d84a6ced1cf12b955a9a09ce4d94f3f150edd05a98334a9373a85f928b1fae8df709b0f51327f600b43402520ffeb9a44071f SHA512 3310651de68409190a203eae1e05bfad1742b656ad66a0f6e49eae9ac00e896300d10780675ca0687982c6dee2fafa5880955c86c67e8149637c8fa52842d4c7
-DIST syntax-highlighting-5.66.0.tar.xz 1579312 BLAKE2B e005660edfd3d0c092d92a27e39a1b0fa5be631260c46b8e6f4121a64455e86b759a8e67e51e26b8a96473bb1740cdc0e617e2195099df2e9ca7d6443b0de1a9 SHA512 7cc68e9eaa3b12f2a5a436115cdc05443640bf1ca1a92c7b66a168605fcafc0e19174a8b28ee0683932e0c097970439e9235a5d55c584ffe56e4cf71e77f2cce
+DIST syntax-highlighting-5.67.0.tar.xz 1582228 BLAKE2B 5b51e7336f79993229bec7a6e22715bbb6803b301c97755d6139d4cdba1d446d0273cab435eeca9bf0967c5ddaefcf9cecc09d8a229985ff9fa210c29f384620 SHA512 a14cabfe29da936668dff441334dada4a12b98d6bed9cca991bcb8f80529b681fe8c49d5ee14081ab8410b5d82bc411d9b03baa340c8f5fef245dab8767913a7
 EBUILD syntax-highlighting-5.64.0.ebuild 574 BLAKE2B 89b887648c8beaf0b0d363c9ff8c7db6dd1fff68262a1168f046586721d3e560200da726d941e20aba0b51a5da824a8a36a74f98eb055a716d0cbc4c4e5c3afc SHA512 97eeb5e25785bd207a2e474e7b2d03782d2d6bfb8db7fc3dd05a6f0442595de878e9edff693378d08654418e7695e715e2f13fd9a692fd9a7c2738731628eaa2
-EBUILD syntax-highlighting-5.66.0.ebuild 570 BLAKE2B 016b19b77a211ef9bfb7af1aff3a5c0d54fa9220800341f94ba03d0bf668fe34da44ca3e0e8f6e29f3ed69e51d6f00a149964c0c2563b0e6f0bc074274c68312 SHA512 e86806861ff6d3abf241945cb1ca2d3e221ac36833d74823b3a9ab8bcebea1e6b817e8885d3cfb524721a38aea4561de662e040662315211a54e1a4690ec44a0
+EBUILD syntax-highlighting-5.67.0.ebuild 570 BLAKE2B 016b19b77a211ef9bfb7af1aff3a5c0d54fa9220800341f94ba03d0bf668fe34da44ca3e0e8f6e29f3ed69e51d6f00a149964c0c2563b0e6f0bc074274c68312 SHA512 e86806861ff6d3abf241945cb1ca2d3e221ac36833d74823b3a9ab8bcebea1e6b817e8885d3cfb524721a38aea4561de662e040662315211a54e1a4690ec44a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.66.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.67.0.ebuild
index d9a5fcd1c7cb..d9a5fcd1c7cb 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.66.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.67.0.ebuild
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 68dd9240d942..3d7c00e18ef2 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
 DIST threadweaver-5.64.0.tar.xz 1409536 BLAKE2B 309e879f47af038ccdec8b55c16089834e6d129ed3a3878237b54a12f8c7988ad13242bf6068073870e75bd5f1735feba5d0bc4b90dc9ce7c3f3fdebe3f15075 SHA512 829110df93c46f6cee5e5592369bd44991eb4ba32750f3c1c4b4158f3cf8e7e3b336f5c71c6527d33188a9db95c79a2638fb5ebc9efd1114e8cce7ffaa2b724d
-DIST threadweaver-5.66.0.tar.xz 1411164 BLAKE2B 67513e77804f56d532b3760a15b9e44a76f5abbd64ab3054f1b32c00fafc5f9ea7f64b84520800a5a50cb1b955e445156eb46963d9e582a1c5572ab8405eca5e SHA512 6600ae23dbb258612aa1a3f3f1f2f243d60571d9b47ffeb8ade14a785c788e0823e2e84f54df65eb17423a7507f8c9aea812956015423c59e0ddb89703815816
+DIST threadweaver-5.67.0.tar.xz 1410248 BLAKE2B 4715c822bb8de633c2a81fc849975581f783263f698c413a410204930c1c839429f51de2d10237d239fdd02865ce4f98ac1f5f138623759acd420ef4a1e0f6d2 SHA512 0fc05c6a1656608952b83286768ab9d5a8ec6be526756a95b08874f775521f7a65faaaad18b55d34e8e24eb54fb252f6c467782e0d2a861b710d9b7467e64f0d
 EBUILD threadweaver-5.64.0.ebuild 353 BLAKE2B bf2360e30c435aeea28ba26d50693924fdb6cc7359f6db1fd375b61bbe711e317987f56b5c42cc7ce421b5b14ec63c02f5937d838b497150c4a53e4d176fb613 SHA512 db5028052a8a49d06df3f6be13ffcb69d713b3d61015069fd924ff671681cc147aab84be3878f769598591b92c23aa2907a56548be0e09f51425694a54bcae0c
-EBUILD threadweaver-5.66.0.ebuild 363 BLAKE2B e9cba8a7292e3ada9261047e25e4e36b8b439ae0baba28d77df7f7472eb8a78b9422ce69e1b5d01aacb29c9738499d0d1de857a693415b563e8e72f2e472463f SHA512 e47b53c7b6a615584deafac09d2ac2912f2f540287fdc2b9ff9a76c5a40aa83dffc723ac1419fa2076c923159b35a95a221cdd48778e285e17a77d18e44bcfa6
+EBUILD threadweaver-5.67.0.ebuild 363 BLAKE2B e9cba8a7292e3ada9261047e25e4e36b8b439ae0baba28d77df7f7472eb8a78b9422ce69e1b5d01aacb29c9738499d0d1de857a693415b563e8e72f2e472463f SHA512 e47b53c7b6a615584deafac09d2ac2912f2f540287fdc2b9ff9a76c5a40aa83dffc723ac1419fa2076c923159b35a95a221cdd48778e285e17a77d18e44bcfa6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.66.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.67.0.ebuild
index 62f7250b169a..62f7250b169a 100644
--- a/kde-frameworks/threadweaver/threadweaver-5.66.0.ebuild
+++ b/kde-frameworks/threadweaver/threadweaver-5.67.0.ebuild
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index e8e8e6fd0c39..8e00e21d351b 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index 370e31df7710..287f314b7213 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -2,5 +2,5 @@ AUX kshutdown-5.0-cmake-3.15.patch 996 BLAKE2B 9529d6fb2a82e6c3b3d5be901b9aa48c4
 DIST kshutdown-source-5.0.zip 454848 BLAKE2B 481cafbf5bd3831088ec9168b6eb82e342106b9b570279b6b8ca1db1f2df8c5640b3942f76032559396b504903b18fe106eb940e81822472a63f235e1a004644 SHA512 7a3920315db142f150227e624fa4a765966ec8367a08686214cb072d94a62d24f3a22fbef8fc84411d385be935102cf85df1b001b2922399455cc320c1e0f0db
 DIST kshutdown-source-5.2.zip 445025 BLAKE2B 161a637ded6fa7ddc11daab5bfa20efe51bee0407339e178668c584cc690dd419bfb1e7e134cbc9ec3274a394d47496423f8b3b561cdd8083470daa4e8d24511 SHA512 ac46164da88815604007e637663c42430212b37231d6116fd31b947b24d2bd69aff0d79fcab570425960420d77168de184ccda99dd685bec96bb353cb578ee04
 EBUILD kshutdown-5.0.ebuild 1105 BLAKE2B 42e92eadbab70f27f41e76ec2ce0d4500976830eb0c333b76315c1dd473687d5e4af7764e5776cadbee74b491991e973f940f6599376aba5e855016dbe709758 SHA512 1c7776029fdbee8bf6775464747db33685c94a5fc964c26363428e0988c6c30b0ea995c15780688e5bd95868c3970b29f5367963e704517403074f74aea202da
-EBUILD kshutdown-5.2.ebuild 1155 BLAKE2B a845a0a206636b58c05859acd06240ceebd3eb68041928de086ad0eb6634e54a2c5b6825e38d86af284e490e4387e530953b979e4b945c7a5ad862cadc947fca SHA512 3d8c0ad7636364d7b8b91106c2025512b9648f3e3b33bdd845cdb8ccedb726cca400b36265b0f4de3dba5123898893bb6ad1d707abb2a9a815a68e559d519405
+EBUILD kshutdown-5.2.ebuild 1154 BLAKE2B 50005d96f841c2f2f22020a3ba9c44517ef55b974e47ecec90ac4c421d762b63d1d0f69a994618c765793fa24f15b4a0d73b0f1a5476714333612015adbd44e6 SHA512 fd887d88eb021c655e634ebb608028d0fc7cc46d1fb48b007c6a1c7f237b43bba0480f94f47e86cfb51584607cc2134ea756aabbe3f4fb3ffdeb5050eb791d4d
 MISC metadata.xml 328 BLAKE2B 7fca7d8d10232412fe198ba6c48e27ff6e1f45574255cd0b386f05264822a8bfe84a77f12b5104682d2188f51c230baf6cc6180b50249634cb5bc7bcc0cfa946 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775
diff --git a/kde-misc/kshutdown/kshutdown-5.2.ebuild b/kde-misc/kshutdown/kshutdown-5.2.ebuild
index 26f4fac98beb..fbff8a261640 100644
--- a/kde-misc/kshutdown/kshutdown-5.2.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.zip"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+kde"
 
 BDEPEND="
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 312399520c7d..af5243ddcd12 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index fcbb3b60799f..2542674ae553 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.17.4.tar.xz 514576 BLAKE2B e918577341e8c1f1a476d1530f1d5311f10fbf6c0d7238a54de7f660a94babce80f17f9d7a8c6ca676e918a5a29b259ed01540e9b93ad64c8df6e44521abfab2 SHA512 90e34f7d93b0e5c03c77eeccbf5a19b5c1d5af71e9cbb7e77d5e5a802af76d10d9d832b1d71f088b74d8bc5a6e5612229a9710d874589fa69824843dd5b73bea
 DIST ksysguard-5.17.5.tar.xz 515292 BLAKE2B 216a52db86ea02b0c2e6a4e291ba41e5bfd4833732fc1d027ffdba45e20f688ecc9299646be8b81e010abe3602467f48a33f75278646c6a33359c55216e0b482 SHA512 65c66d469487fafec4eec80ab9fb55e48520d87742b64819eeadd659d7ad43b87f647ef3031aa73f348d5716aa416089012bfb125d44fed01f3fec836d5ef549
-EBUILD ksysguard-5.17.4.ebuild 1386 BLAKE2B ba4cf40fafead5fb922f286154657704a80dd7a53451faacc02491dfd3e62d114bf67ae212a2fcd125d5c103e243f85798e759cb1e58d47df67057c221b29a71 SHA512 e40008933dfb924e7ba25e1684063327a42e98bafbec7397de2dea3493828372029ff1391258c846d2fd7286e78d7a77ca6b06f2bcc3860c7f87ce6d746e7954
-EBUILD ksysguard-5.17.5.ebuild 1396 BLAKE2B 0804c9438f306f7b3c28b3fb3d60048c5aae09f49bae0f9c35c8e5a923b333126764af338e27240d9e7f6e882130523b415b2a7d27f1cbd0f8de8aa5f1c63987 SHA512 e21ce5c305931c9fc93b40a64e6b943e04639d7cb0a6e71b9ef0f5c54a098c66722817dc70a43d5f94aae03d472f39330343cc3b92ef8b24b927d0bc73a3bd9b
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+EBUILD ksysguard-5.17.4.ebuild 1386 BLAKE2B b74fcf2116fcb6ada6c19e21b392a5d2c2993b40a7f4289ac78d29b620173cf0df6f382bbe35c7c5829acc0491a54a11a80f2334f4fb0c5b22e478c27c82b08b SHA512 f800d27ee4bf002d2d2fa0f995144cc50da8422e57c9dcef1c6225ab8fa7d578b80b219747bc73f49c52abbc21961b29660e0c95c7b4c3329613649429e274ab
+EBUILD ksysguard-5.17.5.ebuild 1396 BLAKE2B 731718fe984f9816344437cb770cc04fb73982e6e152dc921a11531ce5c6c55f3681818d7b42d3c3b97b9375d8dd3497144556d369560dd3706325db3ac64eaf SHA512 e532c2d989b90ce309dd2a90391ebab7f606e8397e286087f83ffba9e93709ca7d01e97582078b129fce8c539cf991645aedcf4e8b71a6ab4255288830cd0635
+MISC metadata.xml 373 BLAKE2B 8d97f1bf96cb523b2832ca4bbb01ee86cf1d13b0b1b75809046da8601254283fa079361c1cf55708c851a08fb31b27beb8cf2df24ea9e14e4c32b8ca0692a7f9 SHA512 c1df9a56aba68a93ceae7cb2b9ea9216c40b6f619263cd8025cde82264206019a6b9d0eecb24f3a798d4f6e1a772752ceec500827e96caf8f050b0b132b08051
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
index 2fd49af949f0..ec11cfccfdb9 100644
--- a/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="caps lm-sensors"
+IUSE="lm-sensors pcap"
 
 DEPEND="
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -37,7 +37,7 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	caps? (
+	pcap? (
 		net-libs/libpcap
 		sys-libs/libcap
 	)
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package caps libpcap)
+		$(cmake_use_find_package pcap libpcap)
 		$(cmake_use_find_package lm-sensors Sensors)
 	)
 
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild
index 82039e142cc6..cf7942dbeb68 100644
--- a/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="caps lm-sensors"
+IUSE="lm-sensors pcap"
 
 DEPEND="
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -37,7 +37,7 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	caps? (
+	pcap? (
 		net-libs/libpcap
 		sys-libs/libcap
 	)
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package caps libpcap)
+		$(cmake_use_find_package pcap libpcap)
 		$(cmake_use_find_package lm-sensors Sensors)
 	)
 
diff --git a/kde-plasma/ksysguard/metadata.xml b/kde-plasma/ksysguard/metadata.xml
index 2fdbf33d963d..61d3b2c41702 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="pcap">Enable per-process network statistic collection using <pkg>net-libs/libpcap</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 1721863b8042..32953536bb6f 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index adbab5948778..07a0e2d0680c 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,7 @@
 AUX claws-mail-3.17.4-libetpan_pkgconfig.patch 4483 BLAKE2B b28520c658214e9f6ad4bd0d48835e29f8b37aa7b3915add2d71b8ee7dc3366c38db1de9272dfe8e48588cebf748e6c844f04bc721fe577f66288b849e5c7054 SHA512 39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
 DIST claws-mail-3.17.4.tar.xz 6280252 BLAKE2B 8ddce2e5dfb3ae0ddb646c4f5a81d7e4c3834d2fa7a7f7a7326bf6e160291db4ba5954737bb61a4ae86ebaaab72a695d2e351fe2cf89b187eba4341f5d9b0cd9 SHA512 4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012
-EBUILD claws-mail-3.17.3-r1.ebuild 5893 BLAKE2B 8394664dbc9a94c06dcc5d3865bd36509c34df39f776a9adde05a1e1c7c910381ffe3cb074ae91509bb229a2cd384661c8dd2f7292d2cf9d6276cc68c857eed3 SHA512 d9e78682807fafe6480944a7a3bdb544e685c70e9595581be2930ca1f378669b5e24e8b4cdef3bdc2f8bca8e54fb4edfadb08e3f8b1f2c38cc7f3bb996f7ec9f
+EBUILD claws-mail-3.17.3-r1.ebuild 5891 BLAKE2B 7257c72193741454fd304204de8cdc52793e815712e6bd087d72c430cf25c3b4490542605e0478366079aa8c733d6459aa0513af701be4adff0d0f3aefd06fc7 SHA512 63eed1e908e88147741fe24c4fa29635427f647df9e11d17a1a24fbf86a94887f25d8712af678ad94bc2dc861dc72d7dbb7b531aeba95145bcfefa38143b62de
 EBUILD claws-mail-3.17.4.ebuild 6127 BLAKE2B b33b8175dedba9349720b24c42b5be50a54b0669c0b6e1136de624f66c007390e215d01ef6e53dfc61696ebe5442fb9b1255af27068a0616982f12b4f1b6fb23 SHA512 f3b4cd871bcb28dd41f4cbb1af7c78c9f19ccb7d7299c5ffb4487beaa3fd5bbe562a14fce41991910d2471c346a58c325b39c702db4a5378fc49369c44fc3b4e
 EBUILD claws-mail-9999.ebuild 6062 BLAKE2B f18d83a542cd21c3be36fc30096f26b065502f9a8e9ed789735076104527a65878125c7b00a5d604bdf51e82b59c83482dbe8b3054e0994234ff857925656f12 SHA512 5785f50095538796aa4e654afbe9969f9d4fd5ea4b629303ebc0448887c9f41b370ff5d42e8e575ef3f83164cf82fc2ccf0f460a894ba93ed6a49b5fd0daf861
 MISC metadata.xml 1532 BLAKE2B bf5ed5873952bd13c00e19cbb930026b6eae126caa18a14bde1f4ff7b219fe2f57fcfa3dd4b2dcd5d94acf30da2f8e7a4857bb78049567bf0fbed502977bbed7 SHA512 ea525e1341114ab82508a8423990c3ddde958f5501e0bd7355e25f4ec223ec3cd65b91a1261623bf98c0f06ed91333bb2726d2a6054a0ff49b2d59586507c051
diff --git a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
index ee4bcfdb5be9..e3be1247f910 100644
--- a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
@@ -197,7 +197,7 @@ src_install() {
 	doexe tb2claws-mail update-po uudec uuooffice
 
 	# kill useless files
-	rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
+	rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
 }
 
 pkg_preinst() {
diff --git a/mail-client/hap/Manifest b/mail-client/hap/Manifest
index 30f2bdc1fd34..385a1135367e 100644
--- a/mail-client/hap/Manifest
+++ b/mail-client/hap/Manifest
@@ -1,4 +1,4 @@
-AUX hap-3.7-ncurses.patch 499 BLAKE2B cda1478835ccddd84ee35b484a01020e09a2286195140859c24b52bb17a1abc161c388c19428b72b15f6d658a3b27fcbd9d1f680f9da0a4a3544f4587c84378a SHA512 0993d409e3202fa0bcbd81858f0baf0a56e8044b0ccbb368e2cd4c30c4fb566670557a3983c7fc5b213f5df89b6ef0c6968097339dba4d510de5e28ac56dd35a
+AUX hap-3.7-ncurses.patch 503 BLAKE2B 56111bcd55b0a3048dfe35a248b10ca5df30f57815ec0f363205d082aec74d364ce37f32a231cd848310467500f79157ec36cd8ec074b5ec57406d7aff906811 SHA512 0f4704b54e6df2f27b5b8b9865363f0ffab49ca639b0dae8676742874c4f692ae8ea42cb13d7ce920a90c522ff0105f92e545221d8e5df2a02d982b772cbb986
 DIST hap-3.7.tar 194560 BLAKE2B bf043963ccc0407de0f989ee0d3a4342520603c02fd53d875e41890bfe961ee8d05e355862a00c3be687228d6a69be6c2817d231871e6d26b9c4b500d925cc0d SHA512 3a42b8ae5d4c96812190e0551df289ad748c11f93d7632de1698437246723fd159a3f1a0b6f06c925b31ce8e389b73bc0b3a68f978570ae5d9f283d1651fa42b
-EBUILD hap-3.7-r1.ebuild 845 BLAKE2B 35c1d805c05aa4299835702669b4b7cc0e22f7600f331f952d1f9cb25adff6b6af1fda25fa21fdf95d06775c6f4eaebabd0ac86c61aa8776bbee809e75cd7e41 SHA512 c3d71f0751a47cf3e2d358de2b9330b24bdec5013cec2478983f100ecdbfeeb59304b3e19a83ac2366a37d79abc73b1e7ad1c0dcc610266f5aa3c45b74a551d1
+EBUILD hap-3.7-r1.ebuild 839 BLAKE2B 14e29e88f239357a3f0438c243a51e690a549af4bee53729f50eb8546368e5dd492439d1cdabab59d12e783adc17d63855641250de60f7720d121276e08f290b SHA512 e06987dc7e4dc911d85ede63644c3ee8807bf474d150e1bbfc0a5d6072563ef87e813dbed4143d90cdda43098253c76dbe7a54ecb59c4aaa629abe38327cab84
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-client/hap/files/hap-3.7-ncurses.patch b/mail-client/hap/files/hap-3.7-ncurses.patch
index 1ae79b9e9810..3bd3efa3a1e4 100644
--- a/mail-client/hap/files/hap-3.7-ncurses.patch
+++ b/mail-client/hap/files/hap-3.7-ncurses.patch
@@ -1,5 +1,5 @@
---- configure.in	1996-07-17 00:50:03.000000000 +0300
-+++ configure.in	2013-03-06 15:09:29.579148360 +0200
+--- a/configure.in	1996-07-17 00:50:03.000000000 +0300
++++ b/configure.in	2013-03-06 15:09:29.579148360 +0200
 @@ -6,8 +6,9 @@
  AC_PROG_INSTALL
  
diff --git a/mail-client/hap/hap-3.7-r1.ebuild b/mail-client/hap/hap-3.7-r1.ebuild
index 54db510d8e8a..168f33fc748d 100644
--- a/mail-client/hap/hap-3.7-r1.ebuild
+++ b/mail-client/hap/hap-3.7-r1.ebuild
@@ -1,33 +1,33 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="A terminal mail notification program (replacement for biff)"
 HOMEPAGE="http://www.transbay.net/~enf/sw.html"
 SRC_URI="http://www.transbay.net/~enf/${P}.tar"
 
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses:0="
 RDEPEND="${DEPEND}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ppc x86"
-IUSE=""
 
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	# Fix configure to use ncurses instead of termcap (bug #103105)
-	epatch "${FILESDIR}/${P}-ncurses.patch"
+	eapply "${FILESDIR}/${P}-ncurses.patch"
 
 	# Fix Makefile.in to use our CFLAGS and LDFLAGS
 	sed -i -e "s/^CFLAGS=-O/CFLAGS=${CFLAGS}/" \
 		-e "s/^LDFLAGS=.*/LDFLAGS=${LDFLAGS}/" Makefile.in || die
 
 	# Rebuild the compilation framework
+	default
 	eautoreconf
 }
 
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 38f4c73a1246..1355c89989b0 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -6,9 +6,11 @@ DIST roundcubemail-1.3.8-complete.tar.gz 5534385 BLAKE2B 2f0cb528d0901d267c74d57
 DIST roundcubemail-1.3.9-complete.tar.gz 5521697 BLAKE2B 4689bb43ff02b99a9b2b06d6370a5dce0ec4eca4e4da2a74e33e77ec74ec14bf22b6bab415c8b5fde9bd76bfaed87f183a8979edb353da3ed947f9bfdb0ecb15 SHA512 42ae9b772272b3e82476beeeb0fc5a909fb07ed0bfbdb655627b1e31da1c292f67f5a305452de31b2d60fe5905bcacabd6874dea394a9b0fd66b7921d73500ac
 DIST roundcubemail-1.4.0-complete.tar.gz 6997256 BLAKE2B b19a2d049512ceb53b3844f4680ed061044d2d142bef322c067b381e3be57ecb3181cac4f2492a162da1417fefb4028c36d34dae4bf9064c97568f681bd0c78b SHA512 274372793f1f3af761702f8972f6360f8c8e64a705ff96f1432f6a520d24c9ca0e8ccc3933f26433f1c864bd6c381066fc9eb48bf97e9497b4cbff855412d811
 DIST roundcubemail-1.4.1-complete.tar.gz 6998687 BLAKE2B ff33e512bb202d37d77ae2a4c7820f1061598bee1eb01bed5f15b25ad0e27c0cfe3611b44d451982491b702abcf6d7ae1bc88cbd303bc9a2573fc79efc54bec5 SHA512 0c8e09e93c86aad0f3e3a5a81c5e9ad8ab8aee101ae8ebb78d29556575db94a51a07cbf955ec79235425a961427b826ad27fae750b8eae785eedd195161dabed
+DIST roundcubemail-1.4.2-complete.tar.gz 7006013 BLAKE2B f92b94de3ce58cd145ce3d30875902d44410cb039176be5c2d09a23741b08405b21107b03a0ae302cfdf5a845a49cf044f13a09b582f291639648aac3b2f4c81 SHA512 3f705bc38b44a0b7ea3241b0222f607b040ec01c8ea400b6b6222fbe346570c5f3450e5a188bab99ea171481453eb3f5b1e7457070ace1144558ec662a4273bb
 EBUILD roundcube-1.3.10.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
 EBUILD roundcube-1.3.8.ebuild 2426 BLAKE2B 3028d0e6f300d6eaa7d1cda1ec854b2a3f1149dc5a56e29a89a4de71e3e4b1f2f8d927f5f89cc202e78dfa34d603f58430aee493c03c11cfb9edd7636503b298 SHA512 60d2e8bbf22312f9f81a6ade6628e7ed67ca771ba914e8045cabd2786941c13fb0b363575d6b2edfb9f847e92f255b0441535d12655f08588fd479611e2eca9a
 EBUILD roundcube-1.3.9.ebuild 2432 BLAKE2B ebda963ec305ebeab3345e343e59e6994dd4c91115ac37bc19dca2b0b47ae5796b2594cc09df8b52c476f8d6fa5120dc4917ac2b302cddea931ea07c16972ae6 SHA512 8b3cc79dfb46a75c61aa6b22bc3f7f7bab50c7c80abcb4c6023a98bb45d98aaf67416468eadec8e91979e2dd72462f0da3f3a91838326e0bab6f213217cebbd3
 EBUILD roundcube-1.4.0.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab476c3082bdd1fb0a92487b1351da1dc5c5bc57fab45819255d5adcf6dbb400f6c2ed285abd27b34a7acac77d1928 SHA512 eeba5df2817a2b30f98ebcb05f86fbe7a68b937743fb61c66928a1f32156c63390832e23bcdeeaafa6859c461ef923a30238ab6e71ef1a0c8858c0c3f5fea2da
 EBUILD roundcube-1.4.1.ebuild 1798 BLAKE2B cf44691ff10d390dcf7765af33061f4ff9ab476c3082bdd1fb0a92487b1351da1dc5c5bc57fab45819255d5adcf6dbb400f6c2ed285abd27b34a7acac77d1928 SHA512 eeba5df2817a2b30f98ebcb05f86fbe7a68b937743fb61c66928a1f32156c63390832e23bcdeeaafa6859c461ef923a30238ab6e71ef1a0c8858c0c3f5fea2da
+EBUILD roundcube-1.4.2.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b
 MISC metadata.xml 955 BLAKE2B ca9dd109384433cdaca59b820aae795a4555459cf36f057b17949d601bd5ece8222dbb59502872ac6a16387e55839f859b91a6c6718523aaf66e4b677d25d33e SHA512 ff1b796f79f002814b038763305a404ee2b65d49346a10b423dc8df982ccd4116548c8159bbcd551ccdcdb5824ef6b0774abf6a6bdc851beb896f6e5ed97bf1a
diff --git a/mail-client/roundcube/roundcube-1.4.2.ebuild b/mail-client/roundcube/roundcube-1.4.2.ebuild
new file mode 100644
index 000000000000..6d3b3ede4e45
--- /dev/null
+++ b/mail-client/roundcube/roundcube-1.4.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PN=${PN}mail
+MY_PV=${PV/_/-}
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface"
+HOMEPAGE="https://roundcube.net"
+SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"
+
+# roundcube is GPL-licensed, the rest of the licenses here are
+# for bundled PEAR components, googiespell and utf8.class.php
+LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="change-password enigma ldap mysql postgres sqlite ssl spell"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# this function only sets DEPEND so we need to include that in RDEPEND
+need_httpd_cgi
+
+RDEPEND="
+	${DEPEND}
+	>=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+	virtual/httpd-php
+	change-password? (
+		dev-lang/php[sockets]
+	)
+	enigma? (
+		app-crypt/gnupg
+	)
+	mysql? (
+		|| (
+			dev-lang/php[mysql]
+			dev-lang/php[mysqli]
+		)
+	)
+	spell? ( dev-lang/php[curl,spell] )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG INSTALL README.md UPGRADING
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r [[:lower:]]* SQL
+	doins .htaccess
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/logs
+	webapp_serverowned "${MY_HTDOCSDIR}"/temp
+
+	webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php
+	webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt"
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "You can review the post-upgrade instructions at:"
+		elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt"
+	fi
+}
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 3201d557ed6a..a9ec0215d3c2 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,5 +1,3 @@
-DIST sylpheed-3.6.0.tar.bz2 3568998 BLAKE2B 283ea6c956eb67332b9f1ba34cecb2be853a079d398b5165e925b9adfe33b75d5eab559b91a707b5c76d9253f35acbf4177afcbb90e86fb48b45bcd9aa517768 SHA512 84c59e327690ed7e637e9ce60e630da6cdad771ccc278e31e490ed643da55c295fb47e999ad421fc59dbbcfed990882022b96cf478bd47253692d2e86279c591
 DIST sylpheed-3.7.0.tar.bz2 3612328 BLAKE2B bd8182db8a46b956e12b3da4b15d3ee8184a612e2fb216aca20fd4a022610b17416f994d36b390a5a92835915e95f08bd59bf71154a86962c9564162be891f21 SHA512 490837528bf7ba9d26994cd5fff00b6e5390a127419b9d0efd9fc25c38be1291d55c5b8daebdf5ca9d9159a51c938449e76212328f3eae40cc039db88cb5caa4
-EBUILD sylpheed-3.6.0.ebuild 1609 BLAKE2B 3160b8329b1279523a5a5f7a6e48c106ef993c8221977a82cc074fa1add4f0c3ed1f4929e92bf8d0a86e0ebeb078b38d811cbcca9e6ef55a4d61d3b253b676da SHA512 b25ca2f6355c4a534d95ac23c6a86776f28b7351f940573fcbbec34a5adc4eca157b7745757b3790cfb08601568d7bce10ca7463cd96cd27de612019c550952f
 EBUILD sylpheed-3.7.0.ebuild 1609 BLAKE2B 3160b8329b1279523a5a5f7a6e48c106ef993c8221977a82cc074fa1add4f0c3ed1f4929e92bf8d0a86e0ebeb078b38d811cbcca9e6ef55a4d61d3b253b676da SHA512 b25ca2f6355c4a534d95ac23c6a86776f28b7351f940573fcbbec34a5adc4eca157b7745757b3790cfb08601568d7bce10ca7463cd96cd27de612019c550952f
 MISC metadata.xml 352 BLAKE2B 405cc3d3cb69bbfeb0efdaa63e29393c3e1792bf8ce5a5cfbb69c1bebd9746287e3ee11c30b59d92ac7072965baed99ef991c68553fb24a47ff972feece097e7 SHA512 3392043b42819ac3ed03543881fd1eafc56f253d47d424b8ba4b62346ac04c1e6ac8e925bfcada44320bb26283f4e777832c5349e32a77c1e7b14796c0b03ed8
diff --git a/mail-client/sylpheed/sylpheed-3.6.0.ebuild b/mail-client/sylpheed/sylpheed-3.6.0.ebuild
deleted file mode 100644
index d4d6ec1c76e8..000000000000
--- a/mail-client/sylpheed/sylpheed-3.6.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils
-
-DESCRIPTION="A lightweight email client and newsreader"
-HOMEPAGE="http://sylpheed.sraoss.jp/"
-SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
-IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
-
-CDEPEND="net-libs/liblockfile
-	x11-libs/gtk+:2
-	crypt? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	oniguruma? ( dev-libs/oniguruma:= )
-	pda? ( app-pda/jpilot )
-	spell? (
-		app-text/gtkspell:2
-		dev-libs/dbus-glib
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-RDEPEND="${CDEPEND}
-	app-misc/mime-types
-	net-misc/curl"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	xface? ( media-libs/compface )"
-
-DOCS="AUTHORS ChangeLog* NEW* PLUGIN* README* TODO*"
-
-src_configure() {
-	local htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-	econf \
-		$(use_enable crypt gpgme) \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable oniguruma) \
-		$(use_enable pda jpilot) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl) \
-		$(use_enable xface compface) \
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins \
-		--with-manualdir="${htmldir}"/manual \
-		--with-faqdir="${htmldir}"/faq \
-		--disable-updatecheck
-}
-
-src_install() {
-	default
-
-	doicon *.png
-	domenu *.desktop
-
-	cd plugin/attachment_tool
-	emake DESTDIR="${D}" install-plugin
-	docinto plugin/attachment_tool
-	dodoc README
-}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 808e837b56e9..6196284be2f5 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 2cd73e92cffc..9b251037fbd6 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,5 +1,5 @@
 DIST afew-1.2.0.tar.gz 31831 BLAKE2B 7976dfc1e56461afbd6244220c5d548c7de5e95649bd7ac0c986457c99cfc4574e6f5d6b90bc8985ef37e84f55f52b8417fcc1644c9aadf0a37123e0ea0ecba2 SHA512 98184808ae37e169bdbda9ac43db00e3e0712aaadc9b75e07c8d483c8024aa0cafb0a3424bda5703dfe77a09f5efd9812b80b3468009cfb4562eb5d0069558e4
 DIST afew-1.3.0.tar.gz 33361 BLAKE2B 2553c04fce7e1c9f0a6551a8a01ed85735320bea95fe723050bdbde97aea80b93631c3621ec6cb0687753cbd88ac26725b1c608f7b8a6bcb4fc5bce6d3fce411 SHA512 2e15dc2aa6032b14c3fed57cb5912e3c3471592586f5fa40991b2a007d8a9579c0e1f69e455e1405923b93de64b9b8c126b5ccf8da72144528c57108beea7370
-EBUILD afew-1.2.0.ebuild 819 BLAKE2B e4069a671885f99dd0cfbbf69b90dc7284fe10e1097adb9dbf81583eb1b0de4f4f7c1e16664be26684be169f217ced401619159883e4853f4d7709389782ed63 SHA512 fa6038475ce14ea46b66523d8676147d6ebffa3c264830ea75816232f13b5be19f7ae83ca7ba634fbefaa543c770207b321de1e830ef860a46cb64e2049649f2
-EBUILD afew-1.3.0.ebuild 864 BLAKE2B 0f78c19218a8a1c30492be0a1bac3cd8c20afa3f194c03057a8f3191c8da3469d8ae95f9e0666a18aa89904d229ed930c6f0b2a98cfba1d286587f64e5f114d1 SHA512 2d41afc265e7ba4f62549851d3cd7b39192fa488270aafc7378a654f1b1e482e7b9f91f346e3c73e244d5b1efa5fcd97f748fac263e68a993cfbe614c52e11ce
+EBUILD afew-1.2.0.ebuild 815 BLAKE2B 4073b92aa56297b14c39ed1d954dc69cb2284526a08dca2ef9f1809c63a5b1ec03e4e110fc097e4fa5bccc49a21751379f9a9c2d0a0d9fa7bea967031deb8137 SHA512 bc0a703814c7813d217fecd568ee71ba04bbbefe348733bee0e8b0d9f7b83149fd6d8cc3710b79885cabbc64af4c865b6d96be4b2cdef1a5eccb37d7d108aafd
+EBUILD afew-1.3.0-r1.ebuild 865 BLAKE2B 9b17cdb5481927f3d5dcaa3b19b0305238331e47fc84337bc47edf041021c82c4229a8a9d65b516f81ce92706d991a2cd057dfc53efa313520e76cd361e2dc35 SHA512 03de0950dd23a2fc7d5424d1b17ac1472576cbcc8764fc98ae1bba5cd75c0758b44bccbacca9ceb0b38a15f515a7860d1cc77c124690ab4c96ece5061f2aae99
 MISC metadata.xml 883 BLAKE2B 64c438e53564d21a25684eb8b8bcf6b5a9e53a79202a27eb43a7621669c716f5af96cec95ee616c5ef3d1be91433c523badb16cb1c6363ebb9574066b2d65833 SHA512 5f799a3db42139165f32075a9f753cdc2f11072c067e5602bc37f557b6edfc8c631a8ea9c512e492587224b287f2d996e38a4e690fe294e508f7b9568b6f15e7
diff --git a/mail-filter/afew/afew-1.2.0.ebuild b/mail-filter/afew/afew-1.2.0.ebuild
index 064cd5191335..839aa0f2d51e 100644
--- a/mail-filter/afew/afew-1.2.0.ebuild
+++ b/mail-filter/afew/afew-1.2.0.ebuild
@@ -17,9 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	net-mail/notmuch[python,${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
+	')"
 
 DOCS=( "README.rst" )
 
diff --git a/mail-filter/afew/afew-1.3.0-r1.ebuild b/mail-filter/afew/afew-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..3f9be50612f1
--- /dev/null
+++ b/mail-filter/afew/afew-1.3.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Initial tagging script for Notmuch"
+HOMEPAGE="https://github.com/afewmail/afew"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/dkimpy[${PYTHON_MULTI_USEDEP}]
+		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
+	')"
+
+DOCS=( "README.rst" )
+
+src_prepare() {
+	sed -r \
+		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
+		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc afew/defaults/afew.config
+}
diff --git a/mail-filter/afew/afew-1.3.0.ebuild b/mail-filter/afew/afew-1.3.0.ebuild
deleted file mode 100644
index ea538391bf69..000000000000
--- a/mail-filter/afew/afew-1.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/dkimpy[${PYTHON_USEDEP}]
-	net-mail/notmuch[python,${PYTHON_USEDEP}]"
-
-DOCS=( "README.rst" )
-
-src_prepare() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc afew/defaults/afew.config
-}
diff --git a/mail-filter/pypolicyd-spf/Manifest b/mail-filter/pypolicyd-spf/Manifest
index f1bf87f76d9f..2cf62757f759 100644
--- a/mail-filter/pypolicyd-spf/Manifest
+++ b/mail-filter/pypolicyd-spf/Manifest
@@ -1,3 +1,3 @@
 DIST pypolicyd-spf-2.0.2.tar.gz 38546 BLAKE2B 691cd5db37592be0ef0cda41223280e764e83802e37563f4e6c08505731118199c03d27b0bf51cec0556aa946fc6c7465fe09d3c9100c8e2582a4d85ad828495 SHA512 adcc7b30c6922894f9407edd0637b02a138623f4480ec37635475396826b457c835b3ffb599d1985e306770fe5f72404552ed705bd957e63b5c54ca3d8991673
-EBUILD pypolicyd-spf-2.0.2.ebuild 1212 BLAKE2B 810e17a6971fa6f167a9b15ecf4847745bf999d1dad5f3a911604d5323ff7a44843711bbc3e3b17866c0c024fa3a7925939db863fe5d8bace3b17b7b3ea61697 SHA512 c181503c88943fdf0ff60535816dc971838015fa26085df73b0a2c8ec3b56775069de58d7f2fe3906a9f94f3f7313287d5d3b272edb1db4684292c3af64f338b
+EBUILD pypolicyd-spf-2.0.2.ebuild 1220 BLAKE2B f1c90045fa5cc2d2390077f3c82aebe24c5a79fcaa055a361a12d556f25ac50bb7dfcafafa5574f3fbc6d3c09a0d6c22bb4ee4b2fd153c0071460b2f08a0e461 SHA512 52cd03de6764aa154f510f2d90ea5d67c339edcbcc2acc5c49ce18fd70796e686eed201832a4891d1280fbeeb45fd5cc1c74c69e3e501e8bdad463eb30796ab4
 MISC metadata.xml 356 BLAKE2B e28aba8830da5e0c372cc7090736a5a90c208af79c6fe338e8bf96ef79e17afa05cdabdb48ca172d57fd34203c66ff7e3be4ce4c043b14c0e9694639512a82f3 SHA512 67a8fd46090c3e558e7bf963277e99e11be4d2df97f4a4491a7fbc64a42f89e19af2131d13efec7370df1f27b2eb7385f59e732fae57b6ec67c47f18af8cfc72
diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
index f23806403dc8..19a17d76236a 100644
--- a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
+++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
@@ -14,7 +14,7 @@ PYTHON_REQ_USE="ipv6"
 inherit distutils-r1
 
 DESCRIPTION="Python-based policy daemon for Postfix SPF verification"
-HOMEPAGE="https://launchpad.net/${PN}"
+HOMEPAGE="https://launchpad.net/pypolicyd-spf"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 7c5f711c422d..8959265c7e2a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -4,7 +4,9 @@ AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb269
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
 DIST rspamd-2.1.tar.gz 4232297 BLAKE2B 4685fa404e5a66d2295da57ece8ce1830507b3464c5136952dbb85847a5002c9c45c4f5430d0d60bc199f3aeafde7abf3ac218451f1609b81a5edfd4d0394588 SHA512 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
 DIST rspamd-2.2.tar.gz 4257574 BLAKE2B 3717736ecefea49cfc9e8bf312bdeafa8650dfe1b0a4410d98693add30c77cb054c7620ecc421edd69a2d8bfc1bcb02183951069b15774a588359da8bfb26ac9 SHA512 e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
+DIST rspamd-2.3.tar.gz 4409924 BLAKE2B 825326c8c92b9937be1aed8640acc1c94762bf8de564642e4d1d429025eb9cc7ba943217b35c881c92b888cff0bec68ffae737bfc77ccb02bfc2ebd9d5948bcc SHA512 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
 EBUILD rspamd-2.1.ebuild 2246 BLAKE2B 17bed4c0f2e236e9759b3b7fb179d1206f855a78609066876b3fbe011bdce111bc65179d8ee7839869f82cb1128d93a8e496c7fa095f9b7178847b92b3f0cc45 SHA512 2ecd0cd86a822dba3308dfc4c3cb3bdf6519d94da2c39e03cf7cd45dc33de959f11990a7cbe87d0d7ec265662782378a1136916177dec121dcd1f10ceb4134d7
 EBUILD rspamd-2.2.ebuild 2248 BLAKE2B 4b81fc2bc1c10c00ddaaf637963accba9497ebddcd2c64d89520def31587d381133dc24f1798fb0a403826a811ec674fd1ec81cdd141a909d0aaba0259ddc340 SHA512 04cd76fae324312295acf8af88054425937721128a9756a43acb6b741121c1f97fcaacb06ac310fe4261d9168023390b9d4e72cb153c861c44268c82e0822338
+EBUILD rspamd-2.3.ebuild 2133 BLAKE2B 190371b0c53e43bdd45c49a311ffca5d95f08252483cebd365b15e0bb3dd0f7e999194e43ff66ade199d503073452dfeefe114e9f51a904d5b5741692ec494da SHA512 c33edd128f5be1d8c91b01740fdab899049d721b395fd198020e235aee1c1db9cdb6002c28d0e5adb66267eef10a8a32c5532239046a3ffa859de85f0c2d8f1e
 EBUILD rspamd-9999.ebuild 2133 BLAKE2B 1355862d2b12e23a8b6ec111f51a7b472e7aed0850d8df61a2dfb5782c040868bca6b56fa1c9098ee7b6a79470f1bcd28566b889c4674820b0287acd66443125 SHA512 3d6c12fc8b42b2ad4e3fff454ff6fde4c938f99ddd9797de7c89e463c55f38d89fabd2953b33f934048007e4dbf68264e6f6992e3995c16cbd229b1299958603
 MISC metadata.xml 641 BLAKE2B cf34ec72d9a23ca2a1b7325e9cf35f0f7f5ddd2a7f7ed257614b8d74dac32ba22067ab008513b80a4edb8ac4f4be574967f1d4659f92f269cfeb647b4ad0abfe SHA512 0615158d243771302c5dbe70e80ddbba668286286a45a8c098b944baf75adbf87ff143ee7b07193c5b557fa44ef615b46fa5f7a5e4aa0d3b95118996b2e95328
diff --git a/mail-filter/rspamd/rspamd-2.3.ebuild b/mail-filter/rspamd/rspamd-2.3.ebuild
new file mode 100644
index 000000000000..6fc83c0865fa
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-2.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake pax-utils systemd tmpfiles
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Rapid spam filtering system"
+HOMEPAGE="https://github.com/vstakhov/rspamd"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2"
+
+RDEPEND="
+	acct-group/rspamd
+	acct-user/rspamd
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/libev
+	dev-libs/libsodium
+	dev-util/ragel
+	net-libs/libnsl
+	sys-apps/file
+	blas? ( sci-libs/openblas )
+	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+	jemalloc? ( dev-libs/jemalloc )
+	jit? ( dev-lang/luajit:2 )
+	!jit? ( dev-lang/lua:* )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	pcre2? ( dev-libs/libpcre2[jit=] )
+	!pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e 's/User=_rspamd/User=rspamd/g' \
+		rspamd.service \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFDIR=/etc/rspamd
+		-DRUNDIR=/var/run/rspamd
+		-DDBDIR=/var/lib/rspamd
+		-DLOGDIR=/var/log/rspamd
+		-DENABLE_BLAS=$(usex blas ON OFF)
+		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
+		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
+		-DENABLE_LUAJIT=$(usex jit ON OFF)
+		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	newconfd "${FILESDIR}"/rspamd.conf rspamd
+	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
+	systemd_newunit rspamd.service rspamd.service
+
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+
+	# Remove mprotect for JIT support
+	if use jit; then
+		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
+
+	diropts -o rspamd -g rspamd
+	keepdir /var/{lib,log}/rspamd
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 112f8fe37fac..c57aa2af9eaf 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 9df4fee9a584..0c1d1295e965 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -3,7 +3,7 @@ AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f7
 DIST msmtp-1.8.3.tar.xz 336120 BLAKE2B 4c58dc82e01135bc84176c25c65812414901f134a71aba5460675df3270f1d9dd3a706c66f5773315a38d63463f5c9eb68b584d6e5d0d5f0b1c23d6436d9a2b8 SHA512 c265991c0925d79b28a664ee6832316350d59d546f252989dafb8a517a8be1c496fcc85981325e5b381801a7bcb77e38dabdc12fc5be1bf49b9886a409a21819
 DIST msmtp-1.8.6.tar.xz 339732 BLAKE2B 3dc34bf23c935ea5f67df7e65b035771fd1475311311cca7097e71dac1c7b41a4c58497fd378a35a7f212b8a9b13e2dac6f20e0058d6f3491b52149d789b97d8 SHA512 9d3dd282ddfe2d67b67bb6d29412beebcd666d4ab8e90a664b7dd4b951714da0e3adba72dbe165617b1a170779bcd45e2e7bcf54d1d96fa97089686e71cbea66
 DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d
-EBUILD msmtp-1.8.3.ebuild 3331 BLAKE2B 0ccc2bd238b0b9af11b2c8fdb3c319d486a2b2c2ed91cc1868f12a53d8500d2a9ea178bc275b52d06277d16d6e913a5e8c40731b6da2c252660a393aed5ad55e SHA512 3701110fb7f3da9d01e77abbcc37de054160c799c098edd027ae8a1daba7cb44d7666cb0979049de4fa83f36749bed26896316b67ba31ed03f644d0973105a05
+EBUILD msmtp-1.8.3.ebuild 3329 BLAKE2B 16cc4e0852cb0436ff145d8240b08f68e87a2fb1055c4e78a7f99b55d6957425f83f1ca83afff41f74f3aaa63bc6515de32a8e6758d5a5492f18dd1f4772e05a SHA512 cfa90f737bf99eaf55cd6806538585e9e6a8dd99e98ad6661f5cf673cd5bd94eeba21f2503b90781249793057b70bb75348fc5a361f7d391fca51e39b2c2a065
 EBUILD msmtp-1.8.6.ebuild 3311 BLAKE2B 60941137b2f463d03c257935ceb34847ed3bfbf36a4c4ada4ab4b7a609d2dc7591fb2a69cc60574a335281d95a7a31fe24310f048a99f5b9819419fc9bfe1bdb SHA512 6984e6b635efe5406b2b9b2f2a58805cff932a34851dbf46e3c8ae5f51f4953c21ce8e9c41fe494c452adcde3d8c3ae1c9e0e4ca4759f6abab9a3702964ee4fb
 EBUILD msmtp-1.8.7.ebuild 3311 BLAKE2B 60941137b2f463d03c257935ceb34847ed3bfbf36a4c4ada4ab4b7a609d2dc7591fb2a69cc60574a335281d95a7a31fe24310f048a99f5b9819419fc9bfe1bdb SHA512 6984e6b635efe5406b2b9b2f2a58805cff932a34851dbf46e3c8ae5f51f4953c21ce8e9c41fe494c452adcde3d8c3ae1c9e0e4ca4759f6abab9a3702964ee4fb
 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9
diff --git a/mail-mta/msmtp/msmtp-1.8.3.ebuild b/mail-mta/msmtp/msmtp-1.8.3.ebuild
index 77513593949d..449800749320 100644
--- a/mail-mta/msmtp/msmtp-1.8.3.ebuild
+++ b/mail-mta/msmtp/msmtp-1.8.3.ebuild
@@ -123,7 +123,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "Please edit ${EROOT%/}/etc/msmtprc before first use."
+		einfo "Please edit ${EROOT}/etc/msmtprc before first use."
 		einfo "In addition, per user configuration files can be placed"
 		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
 		einfo "/usr/share/doc/${PF}/ for an example."
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 6f28249609ab..06266e3a18ce 100644
--- a/mail-mta/opensmtpd/Manifest
+++ b/mail-mta/opensmtpd/Manifest
@@ -8,5 +8,5 @@ AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49
 DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f
 DIST opensmtpd-6.6.2p1.tar.gz 777422 BLAKE2B e372a10f618e83ccb6c782d056750f89a5224898a28957509ab306fbe8bb4ea94462c1bbccbbe9c0dea64623c250d9fe9f3b74f2e26eda5d6c232bec50bff1d0 SHA512 b0f7ea94514a4a1880a22996064caa7da0a15e6453236ca2f004402125affa80e9d8c25d3e63826b45045305851959bc58c2c855829e46d6967bf6cd13bd1e91
 EBUILD opensmtpd-6.0.3_p1-r2.ebuild 1910 BLAKE2B e2f00b235de73368d49e209cabc7f0ef80e2a2fd3e967c91a6fe905fa2b3ea0f3e90085d1c7e4c72a9028c1fb5ecfc6ef1f51daf9ddac3c0109fc3394f2d20e7 SHA512 f8c3bf0561a798a4ff39fbf0b123a84626fc7d0e90c7ef7b7357bda4530c9cfb90f64c853bc2f5424bc594c21e2883a3111db30693e6d4da06e9cbb29be94d1c
-EBUILD opensmtpd-6.6.2_p1.ebuild 1991 BLAKE2B c966262b89036eed65c75fe9977687a64b9352ffe210394b36176ec4751e398b1e270d7896349b42d60bf19f81a2173c6de9951c0211d7d1f7726f7c8acaa5e7 SHA512 fe27a9f688a678e98ef73f45a237ae28f2fe412d888185dc23fbb3ebc2f887c1c5635dee61907ccc4986138ff486e1b44d0d58b64d750384f94632bc47d8f1d0
+EBUILD opensmtpd-6.6.2_p1.ebuild 1998 BLAKE2B 6d24269e834350693240f9a0cbbd702994b027102cbaa26c7a98653e2e6f89e3a80fff36c3386a669475520e8b9bdf79f348deb062b6b71f6e88ed6fbf15c2b1 SHA512 bd9791a7fcec94ecc29835942089abb61bdce74e1d442e27072b6c544c505d43d8417dcc1a27a599be1684ec3e0f228e05d3f4bc68a2f78ddeb719683897eece
 MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5
diff --git a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
index 610591f1deec..143540cb4f1c 100644
--- a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="libressl pam +mta"
 
 DEPEND="
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index bd93eb04ed0e..f755e99ff54f 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 61703a53cbd1..38aaab4cc77d 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,3 +1,3 @@
 DIST caja-dropbox-1.22.1.tar.xz 309600 BLAKE2B a54778bae439a52babd4b9c88ed77ef9cebf01cb5e396e9e2dae0e74b1d55bb6b575d301133593b130af86ecb06f35fd2d11c3b7e3d67a7e741798ad701d788d SHA512 e7e9107c7654fac910762727782f35e3039b45e737341937d225126b2f63f8911f99281097b2488d3b79c0ed09fff4270b4c557166b94a722a2b1cd30fea2a2c
-EBUILD caja-dropbox-1.22.1.ebuild 2031 BLAKE2B b397afe9c65f5760d6bea815b63ff02ad1343b1e72e26f276e6e0946ada5c7cc2d6237e5c46a026a4a8c100c187185aae205b4a6f54ae45bcac42335b9f1a7d0 SHA512 d6b01a3e2fd283e167e1df6ec901b0c22851fe94317dcc976da9800ebaa62e4fd3cdd7ef4111e4badd109a4a9909da1f90599a348e6e7058b53144dd9f3e48a9
+EBUILD caja-dropbox-1.22.1-r1.ebuild 2067 BLAKE2B afd44ea71d6f40bf2fbff2f4d6f1d0934e8ab04f32a5f093856a29f679a3e7b7cb4ff13cf2d4aa9653c240ea9d35aa1ee59e398fc7eec7753eb48d23e01f54d1 SHA512 c091c64cf9ee07cf9d9143c6092ecdc60f46327091dd4c84160ab263de81c94a04d19da183a83e1c4403a5d0331f8e7b80c264b35661db3ef0a2d66d0adc693c
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
new file mode 100644
index 000000000000..3ace817fd8b7
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,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="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=mate-base/caja-1.19.1
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXinerama
+	x11-libs/pango
+	${PYTHON_DEPS}"
+
+RDEPEND="${COMMON_DEPEND}
+	net-misc/dropbox"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/docutils
+	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
+
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
+
+	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 Dropbox account"
+	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
+	elog
+}
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.22.1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.22.1.ebuild
deleted file mode 100644
index 5a0b3b6eca9a..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.22.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,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="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.19.1
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libXinerama
-	x11-libs/pango
-	${PYTHON_DEPS}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils
-	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
-
-	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
-
-	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 Dropbox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index c22808be4d69..e999fe0f27b8 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/arkpandora/Manifest b/media-fonts/arkpandora/Manifest
index b3d44ef9f7b8..b6cb72caa8a2 100644
--- a/media-fonts/arkpandora/Manifest
+++ b/media-fonts/arkpandora/Manifest
@@ -1,3 +1,3 @@
 DIST ttf-arkpandora-2.04.tgz 417520 BLAKE2B 4439c5cd9a3858792a3c76470cefc15ff1b4a86df397ea62ad5d67ec3292edd4715d8ca2d0c554e9390ecb117bb0b8fe96149bc73b4401f737ed0629c3ba40a7 SHA512 28d8bea0b68c29ae1ab816b7a35a10140c4dcf7d6ae8f5a5cf287e46fe6cf65c4b7514c1879cddd9d674747c811b376365b63d9939f41769a53c48bbc772cf86
-EBUILD arkpandora-2.04.ebuild 501 BLAKE2B 9009d43537d1a7d5a304a5680d5d8339a376f565d22e0e6df788a7347ee7fe4f9f50d6a902955f6a81e3dfa0864fbac392eb0b418acbc687ffd3e322b1a1251b SHA512 f10ea84cbf01873903629b8084fc44b26da2364a50a207e91af731ab8191e00883c19b06d77a068e6439a0200bd3b221df61910ee812724ebfc3994e6b060267
+EBUILD arkpandora-2.04.ebuild 518 BLAKE2B 85bbf7b979fe36dcb3d3fc4ce3c343e0e42e5bf3973c18ee7b6bc17c56f6890f675653fd5d5ed4d79a72889864c3e49b880d448b3d00ae6c9def6d48e3733284 SHA512 ade8c926b34220caaa32beaa0a416801a59c5296fffa098b30b03e0d65a1812ecaf41b322cc7af604cac92a849d6211b6662c49b08530fdaea36d50c23b3332e
 MISC metadata.xml 234 BLAKE2B 1fff66672cffbf45f59f81eb07ced35707962cf8cd6a10b7596e848489abc2b3f6bd00f629762ac99c59c6edbe687bcaffb61442674bb94c50649e09250d6c68 SHA512 582b5859e81dd9914f3a2665bcdec86d1ba10026f0b0c8207fa0a6a621eaedd40286fc01250e8fed3d63750a4f39c6c8e4e5d358d360c0113e0904f297624ff5
diff --git a/media-fonts/arkpandora/arkpandora-2.04.ebuild b/media-fonts/arkpandora/arkpandora-2.04.ebuild
index f48896be2776..47a6790d79e4 100644
--- a/media-fonts/arkpandora/arkpandora-2.04.ebuild
+++ b/media-fonts/arkpandora/arkpandora-2.04.ebuild
@@ -8,7 +8,7 @@ MY_P="ttf-${P}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Arkpandora MS-TTF replacement font pack"
-HOMEPAGE="https://www.gentoo.org/" # upstream vanished
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" # upstream vanished
 SRC_URI="mirror://gentoo/${MY_P}.tgz"
 
 LICENSE="BitstreamVera"
diff --git a/media-fonts/infinality-ultimate-meta/Manifest b/media-fonts/infinality-ultimate-meta/Manifest
index b8972004af2a..487328eeea18 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 1de1c84c8496bf8ff6d40a785061705fe3307e8d195a4996d893628f3b420310862b5dba246f3e8ed5441aee9b68a2e5d3cb18312199a6af26590bc388dde77d SHA512 75e35eb72c9113f4f379c7314d6d05e55fef3a68ec2f1dd09210f89131e89046a11109501a7853dc59af671498483850d24d0f54c9298e2905e072f02b93be4f
+EBUILD infinality-ultimate-meta-1.ebuild 2666 BLAKE2B 62afce49725fb4fe40ce9f8bc1d5ccea5f55f0baab0c8c31d0fbbdbd4aeccac013027b5ec8f961f9f7605a1c80000c692a87a39e56250fc8b88981e372538390 SHA512 95e07cc0a184898fef9cec07c8fc5fac7e05c8143407553916821c03ee6243a8387c2eb4c29bfcd9db00b4ad55539773276ccf330384d9ad6971d0dbd988cc78
 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 13c8306d60b2..11dbf52d26f7 100644
--- a/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
+++ b/media-fonts/infinality-ultimate-meta/infinality-ultimate-meta-1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Meta package for infinality-ultimate with fonts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
diff --git a/media-fonts/nepali-fonts/Manifest b/media-fonts/nepali-fonts/Manifest
deleted file mode 100644
index 7f7ef619d003..000000000000
--- a/media-fonts/nepali-fonts/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nepali-fonts-1.tar.bz2 555877 BLAKE2B deac623bb4bf0e64c26846a62494e3dd841a8241751e2de66f271964378eb8d7abc98f9f9d0d59db6093bfd1087935c4953e322c80afd7e24947237526528edf SHA512 f9f494aaf6be60b9abe621618a3883f966212dd12357095704b1daa28352e417f521adf3b4863b397ec9bc5f9cfdbfe45959433b7614f3d858f727a6c001ef87
-EBUILD nepali-fonts-1-r1.ebuild 497 BLAKE2B 16292cb5f369325d57f4c041ac7ce349f1d1898f0de496603649c2a81294731fbb7e607f8846692d40a3b89028836f1e42b4ffe7fe0f4bbd9f8085483fc9c407 SHA512 f70b832ea900af3d86c2468c6e9d4fe877dbb8bd540148af4736734c7c16462e56d746719e66697c8c4648a2d17f0fa6cd051f4a83235794922532a5f688cc8a
-MISC metadata.xml 234 BLAKE2B a936e880a7cf2b37756f6cb1ffa44992e9f812fecaee521bc5aa804ad4371731df2b3f647e1432bff27713782a3f8ccbb7fd1105243cb1bd67006f8a98b57ce1 SHA512 eb2691b4aea3787af7906a40be13e5a6daf385faa6e743f1f1fc083473844dbbc489ebe243ee35792b75a4042074476d6622c670d538d0e14536362c485ff8d1
diff --git a/media-fonts/nepali-fonts/metadata.xml b/media-fonts/nepali-fonts/metadata.xml
deleted file mode 100644
index 33cf8572a02e..000000000000
--- a/media-fonts/nepali-fonts/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>fonts@gentoo.org</email>
- <name>Fonts</name>
-</maintainer>
-</pkgmetadata>
diff --git a/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild b/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
deleted file mode 100644
index 86449a1e5a02..000000000000
--- a/media-fonts/nepali-fonts/nepali-fonts-1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-DESCRIPTION="a collection of fonts for Nepali users"
-HOMEPAGE="
-	http://www.mpp.org.np/
-	http://www.nepali.info/
-	http://www.nepalipost.com/
-	http://www.moics.gov.np/download/fonts.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc s390 sh sparc x86"
-
-S="${WORKDIR}/${PN}"
-
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/open-sans/Manifest b/media-fonts/open-sans/Manifest
index 710e07260aae..22c5e018fea5 100644
--- a/media-fonts/open-sans/Manifest
+++ b/media-fonts/open-sans/Manifest
@@ -1,4 +1,4 @@
 DIST open-sans-1.zip 1144311 BLAKE2B 16ea861a26a8cc15ac8486dbfe67ab7b25bedd8cf95da6e0acf3994abc2d03a7b4ca333d645dbe46c08ab9608f333f9d687c819ae45ad48e6c3b43f40a30addd SHA512 ccc0f4600e968a97e9b72a8b1bd7c67eee3651dca628d1a60ec4c1dec48b2de4d31268092636517ad30a9782a1ce31eaa826e2c964e66cc44c657c9b304d8c0b
-EBUILD open-sans-1-r1.ebuild 474 BLAKE2B 00361c193fbc8295bf7be2a2c9b54f0f4ea106ef4e70080e76ddb4e62b27ea3d5a1977c36def6fff3d809514bbf92195f3726b42c3468ca88589e0f4eeddf6af SHA512 7ae586f12ec7107f6d7de8a12a20fc2a661164222f2af85ce93ae5916c326f1e4b40f665622ab5c9f64e045eba71ca0d3f8dc74018964645f0ad4dd21a61d72c
+EBUILD open-sans-1-r1.ebuild 489 BLAKE2B 5b92ff215aa95a75d0c700ff16fd80c9e3b925062e892107466e859581319fb84737b0069d1b7c88915c3fcd9f062e85b4dff3a54846d8d09cda105cab829d1b SHA512 3f2104e44d36ada981ecadf7f91cb6adbda384f10cdc26305bb4482a5ca32624bb7bf03ae9361d09fb475dff92776e500b98220498a42c0c55d82d20e40451d6
 EBUILD open-sans-1.ebuild 471 BLAKE2B 61970154edd4ccbd58f51c4b0a016d414d79bc33845f595a4458fd29b61dfe44030f1205838ecb13671bcf5c1c1e89b17dfbc5f989088fbb03c3beb3d3b506e9 SHA512 6a301f8a5f0360f95671250a1577a4eaabd887382c9d8398cc66de5766669de5e9d8ef51f056455353e7f7fd5686319350a75ef363c8c9a0190e648aa7b5878d
 MISC metadata.xml 244 BLAKE2B e0bf9b0f6266265d6d5cc2e84988bddf02316ff93448093bcacdd41fdb3012c4375e694cf9cbb015ff2e9e185c810a94fdcc71367061cf484fd5e998438d8cc2 SHA512 1515810c51d8c8a86ba49a80a70db683a105643a6246ca7e4b00237f74c41bf453e84768ae640b14f1a72a5f1dd0ffd133a36c6b3257516c4f04de9e9daedfbd
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
index bea7db905f90..8fa17d621e81 100644
--- a/media-fonts/open-sans/open-sans-1-r1.ebuild
+++ b/media-fonts/open-sans/open-sans-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2757a31e1581..0e2c353470b1 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index d1c1bdf5d67d..0a716d92b711 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -13,6 +13,6 @@ AUX alembic-1.7.9-prman.patch 822 BLAKE2B ed5faf9b8e4eb165b82a5001b129403ce0afcb
 AUX alembic-FindIlmBase-pkgconfig.patch 971 BLAKE2B 946766bceb152a1673737af5158be9f5efce812a70adfe36bf5642f150d2576f14c22670cc1bbf9027834c69ac661ca30d27f06f9fbf73f656dd883ce38a381f SHA512 4f5fa5a33c8fb4edcb3c0a5d0290a912015c0e02ecd6340e5dced1f658302034148a1050aee1dcbf3d7d89f11c5e9ea07637c659414951152dd49081c70560c7
 DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
 DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
-EBUILD alembic-1.7.11.ebuild 3116 BLAKE2B 4e99e8f09a6dbb375e9625bfd741b041c5eeb025719f976184b0fcc38de33e85760bb361f49749271cc72cc54e1fb28f061a0ae4a2768aa7bf72d57f1ba34a67 SHA512 fdccd1f49994b8dece041f51c3025a6e65df979f4c92e3ccff2857e553cf2fefe02d928a3472494c79190bdd8db49eb2ffb6224c851b8e96cf2ba70c2d2c215b
-EBUILD alembic-1.7.9.ebuild 3042 BLAKE2B 34e36d9afba3d755b7bb9b93d3c05752cb59b1e9243e8c65400b8ed720ae0d506611508ca4b77bbc6f6d9454f658781351da5f3da3f65ddeac703aeb20de741a SHA512 9432e74649534ae0ce54a8879168b1ae2fac5f33b082fd01c164b42adcb9da93efcbd3e806e7ea226c5a432d380b763b23cb6bc012bbd18e20b77e19ed36c91a
+EBUILD alembic-1.7.11-r1.ebuild 3159 BLAKE2B 38f7f04e3878247c1caa0200c0cf8043102742db00c09188c44c43828c7c8030394f75b4f632817fa5cd51fa81697d2c220333c3a9d34e605bccb07c49d6385f SHA512 7bd681f7e9d9da198657b66cdf31a4e2f9a32f0140bfbf2553bf7fac8f7513132056f0760951362b5835fea9995b0e54af71925c5dd2c4b79e979155ba525818
+EBUILD alembic-1.7.9.ebuild 3085 BLAKE2B 48e9c79a0d0234be4cf1a2a175813b91d29948a14373ff0f8f5fb62d3f95dbc7937d0bb83024683598c52c898e63a0178d8767560dcf83e6c4b02d7b4b2fa1e7 SHA512 6252f40f1f0ea0c1bbee9cd7f2867b77024bb79a15cf4d01ee98bfdd7c5846ed2e0150f67047e87b1dec2c957df608fa1ea42fc7d06a4014a3f5aafb81f8e9d2
 MISC metadata.xml 1343 BLAKE2B b0e902df8e5f04bcbe4e784abe396b926db2de2347560181ab77ee60da7cec55ab10aafda38623109681240992b8b43208fc65fe72fc8dd66cf6ebf09defc085 SHA512 af9abd189b8c15b53b60b818a7ce419b812092ba1725ebfa4d3267c5d2f67018c7f3cc06bc24fe9af614fb420b4f8176585a53920378521779c4ca52c39c22cc
diff --git a/media-gfx/alembic/alembic-1.7.11-r1.ebuild b/media-gfx/alembic/alembic-1.7.11-r1.ebuild
new file mode 100644
index 000000000000..8f112f0a4fd3
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.7.11-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake multiprocessing 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"
+KEYWORDS="~amd64 ~x86"
+IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
+RESTRICT="!test? ( test )"
+
+# pyalembic python bindings need boost
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	hdf5? ( zlib )
+	python? ( boost )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=media-libs/openexr-2.3.0:=
+	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
+	python? ( >=dev-python/pyilmbase-2.3.0[${PYTHON_SINGLE_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+	$(python_gen_cond_dep '
+		boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.8.14-r1 )
+"
+
+DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-Fix-to-find-boost-with-cmake-3.11.patch"
+	"${FILESDIR}/${P}-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
+	"${FILESDIR}/${P}-0003-Fix-env-var-for-renderman.patch"
+	"${FILESDIR}/${P}-0004-Fix-a-compile-issue-with-const.patch"
+	"${FILESDIR}/${P}-0005-Fix-install-locations.patch"
+	"${FILESDIR}/${P}-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	if use doc; then
+		doxygen -u Doxyfile || die "Failed to update Doxyfile"
+		sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
+	fi
+}
+
+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_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		doxygen Doxyfile || die "Failed to build documentation"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	cmake_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 "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/alembic-1.7.11.ebuild b/media-gfx/alembic/alembic-1.7.11.ebuild
deleted file mode 100644
index eaf86523653f..000000000000
--- a/media-gfx/alembic/alembic-1.7.11.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake multiprocessing 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"
-KEYWORDS="~amd64 ~x86"
-IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
-RESTRICT="!test? ( test )"
-
-# pyalembic python bindings need boost
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-	python? ( boost )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=media-libs/openexr-2.3.0:=
-	boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_USEDEP}] )
-	hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
-	python? ( >=dev-python/pyilmbase-2.3.0[${PYTHON_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.8.14-r1 )
-"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-0001-Fix-to-find-boost-with-cmake-3.11.patch"
-	"${FILESDIR}/${P}-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
-	"${FILESDIR}/${P}-0003-Fix-env-var-for-renderman.patch"
-	"${FILESDIR}/${P}-0004-Fix-a-compile-issue-with-const.patch"
-	"${FILESDIR}/${P}-0005-Fix-install-locations.patch"
-	"${FILESDIR}/${P}-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	if use doc; then
-		doxygen -u Doxyfile || die "Failed to update Doxyfile"
-		sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
-	fi
-}
-
-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_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die "Failed to build documentation"
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	cmake_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 "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/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
index 7acd86b893c6..c04e8c9b6f6b 100644
--- a/media-gfx/alembic/alembic-1.7.9.ebuild
+++ b/media-gfx/alembic/alembic-1.7.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,10 +28,12 @@ REQUIRED_USE="
 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}] )
+	python? ( >=dev-python/pyilmbase-2.2.0[${PYTHON_SINGLE_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+	$(python_gen_cond_dep '
+		boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_MULTI_USEDEP}] )
+	')
 "
 DEPEND="
 	${RDEPEND}
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index 076960af9f7b..4f0b781c840b 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,7 +1,4 @@
-AUX apngasm-2.7-string_h.patch 411 BLAKE2B 2b41abb2b338110e65e69412a392c3bcc835cb6808e7235d7ccc38807647f4bdf9a3936305593593b04857bb1a004d5cec4434825c9d53a5ba8ec3858831b401 SHA512 00605660094af0c8f7bbd96a94e02b0ed505f0e2d8bf6643fc6d6d5f92e40411f409630c1d0c538bf874dfd31ccfea2363fea7640edadde5fe2c4d9e15e3e524
 AUX apngasm-2.91-makefile.patch 585 BLAKE2B 8972e2c3b59f4d128f522309496ed643046a18684e003503046927db4e1be06219a9c6818b75bcb0497c7ef5057a91c5f4bee837abca95c89eb79fa8da0fa39e SHA512 f3b9b89ee3071c01bdc08f8a09864956d258abf14aac147a754f6259297ce8a479a067ee5d37225b7dee0f4f419bef53e127266ae770063cdafa478c78d6eda2
-DIST apngasm-2.7-src.zip 11448 BLAKE2B 848a5c9be65bacb3297c9f0b54235f2143be91840c5f0730c0c7bd1c6d273855d730eb9722860f7543eb6e57e8ace5b775f73f5789ee6814f5d62fec02bd2b14 SHA512 28ec70a4ac02021ff85390ad6863aaca5451937209345128ecd5baf76bef9495168c3c4ee5d823afbeb569ca673328673a81b807e7985c3d5d1843c056af7810
 DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
-EBUILD apngasm-2.7.ebuild 716 BLAKE2B 4107ecdef38e348c4df536a50b4d5646082d7dd19f801326f312d3e6bb13867a4f33cf72a24fe1d0c88df236d911d1d137a41d546fb484caa29485516e6ed714 SHA512 52952bcdc1e070979037174b0477ec6f51c661368f436282eb3556db4a10b63c593e607b284d52ad7ba29ef6732d8b6714a56ed4b2ee310c4b728b6698d09df1
 EBUILD apngasm-2.91.ebuild 974 BLAKE2B 40fa7aad5e2fde3388968668a956a1adc6a161de1e32271334a4f938f82adf5665e37ff77db5c56f97e757bb1f5c326cccb1f6085fa6d82e80e1f66625802480 SHA512 0f5a60881ca232d9efea50d3feda4501e5394a52e0411addc61171d248e8b8b309936c8e59ba10bc2104138268f5b9418a7408852861f013d254fc3f63b0bd55
 MISC metadata.xml 479 BLAKE2B 9307c8ff6da1b0010362d8bdb070e6de22c15ba492e71890882adb87c849bd7e3a639bdf8b0d278b0c2df3894f50a71ade73970daba7573b1b4ea968baa5e2e0 SHA512 a630460ee809f9bb4e7ac231cf5d53b9b560926eb515d9a698a1e2d5f6f4318f771cf77e3f47f256b7458a9b1dba67bbc654cf6f9d4bd9e194490b2cd32c8e31
diff --git a/media-gfx/apngasm/apngasm-2.7.ebuild b/media-gfx/apngasm/apngasm-2.7.ebuild
deleted file mode 100644
index 49660f693fc4..000000000000
--- a/media-gfx/apngasm/apngasm-2.7.ebuild
+++ /dev/null
@@ -1,36 +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="create an APNG from multiple PNG files"
-HOMEPAGE="https://sourceforge.net/projects/apngasm/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng:0=[apng]
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-string_h.patch #465780
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) --libs libpng --libs zlib)" ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc readme.txt
-}
diff --git a/media-gfx/apngasm/files/apngasm-2.7-string_h.patch b/media-gfx/apngasm/files/apngasm-2.7-string_h.patch
deleted file mode 100644
index 303e832b37c5..000000000000
--- a/media-gfx/apngasm/files/apngasm-2.7-string_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/465780
-
-Same for all of memcpy(), memset(), strlen() and strcpy():
-
-apngasm.c:141:11: warning: incompatible implicit declaration of built-in function ‘memcpy’ [enabled by default]
-
---- apngasm.c
-+++ apngasm.c
-@@ -29,6 +29,7 @@
-  */

- #include <stdio.h>

- #include <stdlib.h>

-+#include <string.h>

- #include "png.h"     /* original (unpatched) libpng is ok */

- #include "zlib.h"

- 

diff --git a/media-gfx/birdfont/Manifest b/media-gfx/birdfont/Manifest
index 35c5aac72f42..211387d1771d 100644
--- a/media-gfx/birdfont/Manifest
+++ b/media-gfx/birdfont/Manifest
@@ -1,3 +1,3 @@
 DIST birdfont-2.18.3.tar.xz 2333612 BLAKE2B bf1b92bd17b0d9970d091fcbbaadb5a027da35bee57cb9e11611959bf8ca09b08d582aa3e6a950a0b1b26688a8fbb3987197bfabb6156097da6a1343426dc051 SHA512 c86fff4e40ecfc571e3880cfa99f6adf518daae5476ea1b2a78bab031bc832bc5c8d58ecc928eda4922134fd3ceca312b80cbb8cf2fd35ecb8dc7656addb854e
-EBUILD birdfont-2.18.3.ebuild 1820 BLAKE2B 1c2ec7495d671e92344771f2e796d73f04daa8426f858ddf02a0c05deb2392ec2bba98606dc2414e43c37c78e6c2b4d13bb03e9b560b084c23281defe1a1fc62 SHA512 980ce17734d809e00a7e39eecef4ad38dd65fe2c5268d5139f787b0f52d419513cda3edd9fe851d64b2093b3431f6b25c35bb435330590560fdd803c3421757d
+EBUILD birdfont-2.18.3.ebuild 1814 BLAKE2B ff853cbd2de046d8a55312f2bd3dbb512689b38f0f33e5bb92f88e253ee88f20d6daa91d9b5248dc90dd7fae16ca7e8542d8419d3bc4e3b6332e6c3ce17112f0 SHA512 7656a32ba0c00e3b22f4071a9f090c1786c513c38e3ee6c928a8d6d2456e1f38f16705c3b757d6f36d7c84385d902935977b90c9d5a1eeb9b26d276f48473db5
 MISC metadata.xml 352 BLAKE2B a73cbe4b01dfc96aa631fc89a7bbc140d85eeb4e8757965a35a6d5cfcbd74d72499ecdeddabe963a972b9411c83c0099faf88dcef61df8cf1c9dc1b33af051a6 SHA512 ef910c9c78ad31aff97b15546e892bfa52a18ca9ccbf2b325c96c60f440fa09d5535ea2455e42dba2a11983b4e8b7eb7c3881c47fa6d43df6a22ac4d01535adc
diff --git a/media-gfx/birdfont/birdfont-2.18.3.ebuild b/media-gfx/birdfont/birdfont-2.18.3.ebuild
index e1ed19434590..22980e4c63ff 100644
--- a/media-gfx/birdfont/birdfont-2.18.3.ebuild
+++ b/media-gfx/birdfont/birdfont-2.18.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PLOCALES="cs de it nl pt_BR sv"
 
 inherit python-any-r1 vala l10n toolchain-funcs multiprocessing
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b0cb5b71fd6a..d13148e73ab5 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,5 +3,5 @@ AUX blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch 1265 BLAKE2B bff3ae
 AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504
 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
-EBUILD blender-2.79b-r1.ebuild 8224 BLAKE2B bb325cfee1c3a4ac320a1593489bd9abb5927cc9424b34e048b504e6766cbde7112235f0cd5a4d3259a5840f5cacac040aabbc16c17b463617182da0e2f9bac6 SHA512 cd9fd8fdfb9494da34fc832e553fcba803ab532ad78795134073b20d2640e315a87dac800ddb4cbdf97a94df208f09952015983439aefd29aabf9ff023d47a0b
+EBUILD blender-2.79b-r2.ebuild 8274 BLAKE2B 3c110299aa516d3ae43ff98e0cdeea86941d0b7a18bd73a954c8205fafe1f0aa989941004bae14a2748c15ac67ef7f0277f4d509984eef2be65e30547aaa2950 SHA512 3452dea9674903b566b4ba941fecf1528a2d71d9e5b1f8cf323e2f1690265d4e4bf970b97f2d23d391ae995aed843cbf1f748086b8d1df93731ee4d8c6215ca4
 MISC metadata.xml 2628 BLAKE2B b6ac04e033bd54bf3b6918737289e0a12ece3f87543b033ff85748934b6cecdb0cf8084a3c0e7fd766965b6defa4a402980244bec1a0ed2772ffbd12bfe96a8f SHA512 a47e7a85cc98bf0befad9b5ef5ad75276a6649bb5949367294177f19ae763a3dd0eae1ce8d179463c18c33533c37c283c7beabe08fe27d861bd54eb761675e35
diff --git a/media-gfx/blender/blender-2.79b-r1.ebuild b/media-gfx/blender/blender-2.79b-r1.ebuild
deleted file mode 100644
index 22c4be8b581b..000000000000
--- a/media-gfx/blender/blender-2.79b-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit check-reqs cmake-utils xdg-utils flag-o-matic xdg-utils \
-	pax-utils python-single-r1 toolchain-funcs eapi7-ver
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org"
-
-SRC_URI="https://download.blender.org/source/${P}.tar.gz"
-
-# Blender can have letters in the version string,
-# so strip off the letter if it exists.
-MY_PV="$(ver_cut 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ~x86"
-IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \
-	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
-	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
-	osl player sdl sndfile test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	cuda? ( cycles )
-	cycles? ( openexr tiff openimageio )
-	opencl? ( cycles )
-	osl? ( cycles llvm )
-	player? ( game-engine !headless )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/boost-1.62:=[nls?,threads(+)]
-	dev-libs/lzo:2
-	>=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-libs/freetype
-	media-libs/glew:*
-	media-libs/libpng:0=
-	media-libs/libsamplerate
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0=
-	virtual/libintl
-	virtual/opengl
-	collada? ( >=media-libs/opencollada-1.6.18:= )
-	color-management? ( media-libs/opencolorio )
-	cuda? ( dev-util/nvidia-cuda-toolkit:= )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
-	libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
-	fftw? ( sci-libs/fftw:3.0= )
-	!headless? (
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXxf86vm
-	)
-	jack? ( virtual/jack )
-	jemalloc? ( dev-libs/jemalloc:= )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	llvm? ( sys-devel/llvm:= )
-	ndof? (
-		app-misc/spacenavd
-		dev-libs/libspnav
-	)
-	nls? ( virtual/libiconv )
-	openal? ( media-libs/openal )
-	opencl? ( virtual/opencl )
-	openimageio? ( >=media-libs/openimageio-1.7.0 )
-	openexr? (
-		>=media-libs/ilmbase-2.2.0:=
-		>=media-libs/openexr-2.2.0:=
-	)
-	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
-	openvdb? (
-		media-gfx/openvdb[${PYTHON_USEDEP},-abi3-compat(-),abi4-compat(+)]
-		dev-cpp/tbb
-		>=dev-libs/c-blosc-1.5.2
-	)
-	osl? ( media-libs/osl:= )
-	sdl? ( media-libs/libsdl2[sound,joystick] )
-	sndfile? ( media-libs/libsndfile )
-	tiff? ( media-libs/tiff:0 )
-	valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
-	>=dev-cpp/eigen-3.2.8:3
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[-nodot(-),dot(+),latex]
-		dev-python/sphinx[latex]
-	)
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-install-rules.patch"
-	"${FILESDIR}/${P}-gcc-8.patch"
-	"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
-	"${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
-)
-
-blender_check_requirements() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	blender_check_requirements
-}
-
-pkg_setup() {
-	blender_check_requirements
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# we don't want static glew, but it's scattered across
-	# multiple files that differ from version to version
-	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
-	local file
-	while IFS="" read -d $'\0' -r file ; do
-		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
-	done < <(find . -type f -name "CMakeLists.txt")
-
-	# Disable MS Windows help generation. The variable doesn't do what it
-	# it sounds like.
-	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
-	    -i doc/doxygen/Doxyfile || die
-}
-
-src_configure() {
-	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
-	# shadows, see bug #276338 for reference
-	append-flags -funsigned-char
-	append-lfs-flags
-	# Blender is compatible ABI 4 or less, so use ABI 4.
-	append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=4
-
-	local mycmakeargs=(
-		-DPYTHON_VERSION="${EPYTHON/python/}"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DWITH_INSTALL_PORTABLE=OFF
-		-DWITH_PYTHON_INSTALL=OFF
-		-DWITH_PYTHON_INSTALL_NUMPY=OFF
-		-DWITH_STATIC_LIBS=OFF
-		-DWITH_SYSTEM_GLEW=ON
-		-DWITH_SYSTEM_OPENJPEG=ON
-		-DWITH_SYSTEM_EIGEN3=ON
-		-DWITH_SYSTEM_LZO=ON
-		-DWITH_C11=ON
-		-DWITH_CXX11=ON
-		-DWITH_BOOST=ON
-		-DWITH_BULLET=$(usex bullet)
-		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-		-DWITH_CODEC_SNDFILE=$(usex sndfile)
-		-DWITH_CUDA=$(usex cuda)
-		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-		-DWITH_CYCLES=$(usex cycles)
-		-DWITH_CYCLES_OSL=$(usex osl)
-		-DWITH_LLVM=$(usex llvm)
-		-DWITH_FFTW3=$(usex fftw)
-		-DWITH_GAMEENGINE=$(usex game-engine)
-		-DWITH_HEADLESS=$(usex headless)
-		-DWITH_X11=$(usex !headless)
-		-DWITH_IMAGE_DDS=$(usex dds)
-		-DWITH_IMAGE_OPENEXR=$(usex openexr)
-		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-		-DWITH_IMAGE_TIFF=$(usex tiff)
-		-DWITH_INPUT_NDOF=$(usex ndof)
-		-DWITH_INTERNATIONAL=$(usex nls)
-		-DWITH_JACK=$(usex jack)
-		-DWITH_MOD_FLUID=$(usex elbeem)
-		-DWITH_MOD_OCEANSIM=$(usex fftw)
-		-DWITH_OPENAL=$(usex openal)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCOLORIO=$(usex color-management)
-		-DWITH_OPENCOLLADA=$(usex collada)
-		-DWITH_OPENIMAGEIO=$(usex openimageio)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_OPENSUBDIV=$(usex opensubdiv)
-		-DWITH_OPENVDB=$(usex openvdb)
-		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-		-DWITH_PLAYER=$(usex player)
-		-DWITH_SDL=$(usex sdl)
-		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-		-DWITH_ASSERT_ABORT=$(usex debug)
-		-DWITH_GTESTS=$(usex test)
-		-DWITH_DOC_MANPAGE=$(usex man)
-		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-		-DWITH_MEM_VALGRIND=$(usex valgrind)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc; then
-		# Workaround for binary drivers.
-		addpredict /dev/ati
-		addpredict /dev/dri
-		addpredict /dev/nvidiactl
-
-		einfo "Generating Blender C/C++ API docs ..."
-		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
-		doxygen -u Doxyfile || die
-		doxygen || die "doxygen failed to build API docs."
-
-		cd "${CMAKE_USE_DIR}" || die
-		einfo "Generating (BPY) Blender Python API docs ..."
-		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
-
-		cd "${CMAKE_USE_DIR}"/doc/python_api || die
-		sphinx-build sphinx-in BPY_API || die "sphinx failed."
-	fi
-}
-
-src_test() {
-	if use test; then
-		einfo "Running Blender Unit Tests ..."
-		cd "${BUILD_DIR}"/bin/tests || die
-		local f
-		for f in *_test; do
-			./"${f}" || die
-		done
-	fi
-}
-
-src_install() {
-	# Pax mark blender for hardened support.
-	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
-
-	if use doc; then
-		docinto "html/API/python"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
-
-		docinto "html/API/blender"
-		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
-	fi
-
-	cmake-utils_src_install
-
-	# fix doc installdir
-	docinto "html"
-	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
-	rm -r "${ED%/}"/usr/share/doc/blender || die
-
-	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
-	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
-}
-
-pkg_postinst() {
-	elog
-	elog "Blender uses python integration. As such, may have some"
-	elog "inherit risks with running unknown python scripts."
-	elog
-	elog "It is recommended to change your blender temp directory"
-	elog "from /tmp to /home/user/tmp or another tmp file under your"
-	elog "home directory. This can be done by starting blender, then"
-	elog "dragging the main menu down do display all paths."
-	elog
-	ewarn
-	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
-	ewarn "libraries which are shipped with blender. Note that"
-	ewarn "these have caused security issues in the past."
-	ewarn "If you are concerned about security, file a bug upstream:"
-	ewarn "  https://developer.blender.org/"
-	ewarn
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	ewarn ""
-	ewarn "You may want to remove the following directory."
-	ewarn "~/.config/${PN}/${MY_PV}/cache/"
-	ewarn "It may contain extra render kernels not tracked by portage"
-	ewarn ""
-}
diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild b/media-gfx/blender/blender-2.79b-r2.ebuild
new file mode 100644
index 000000000000..e71d9db67e3a
--- /dev/null
+++ b/media-gfx/blender/blender-2.79b-r2.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit check-reqs cmake-utils xdg-utils flag-o-matic xdg-utils \
+	pax-utils python-single-r1 toolchain-funcs eapi7-ver
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+
+SRC_URI="https://download.blender.org/source/${P}.tar.gz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="amd64 ~x86"
+IUSE="+bullet +dds +elbeem +game-engine +openexr collada color-management \
+	cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
+	llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+	osl player sdl sndfile test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	opencl? ( cycles )
+	osl? ( cycles llvm )
+	player? ( game-engine !headless )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/boost-1.62:=[nls?,threads(+)]
+	dev-libs/lzo:2
+	$(python_gen_cond_dep '
+		>=dev-python/numpy-1.10.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/freetype
+	media-libs/glew:*
+	media-libs/libpng:0=
+	media-libs/libsamplerate
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0=
+	virtual/libintl
+	virtual/opengl
+	collada? ( >=media-libs/opencollada-1.6.18:= )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( >=media-libs/openimageio-1.7.0 )
+	openexr? (
+		>=media-libs/ilmbase-2.2.0:=
+		>=media-libs/openexr-2.2.0:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
+	openvdb? (
+		media-gfx/openvdb[${PYTHON_SINGLE_USEDEP},-abi3-compat(-),abi4-compat(+)]
+		dev-cpp/tbb
+		>=dev-libs/c-blosc-1.5.2
+	)
+	osl? ( media-libs/osl:= )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )
+	valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+	>=dev-cpp/eigen-3.2.8:3
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[-nodot(-),dot(+),latex]
+		dev-python/sphinx[latex]
+	)
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-install-rules.patch"
+	"${FILESDIR}/${P}-gcc-8.patch"
+	"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
+	"${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
+)
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+	    -i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+	# Blender is compatible ABI 4 or less, so use ABI 4.
+	append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=4
+
+	local mycmakeargs=(
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_PYTHON_INSTALL=OFF
+		-DWITH_PYTHON_INSTALL_NUMPY=OFF
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_OPENJPEG=ON
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_C11=ON
+		-DWITH_CXX11=ON
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CUDA=$(usex cuda)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GAMEENGINE=$(usex game-engine)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_X11=$(usex !headless)
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PLAYER=$(usex player)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake-utils_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED%/}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherit risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/comix/Manifest b/media-gfx/comix/Manifest
index 9bfac7db4bd3..6be2a2492818 100644
--- a/media-gfx/comix/Manifest
+++ b/media-gfx/comix/Manifest
@@ -1,4 +1,4 @@
 AUX comix-4.0.4-pillow.patch 3658 BLAKE2B f8cbcb64737654dbbe1e4974680cca163b5788a42121e03691fd41bf564ac1c0d6e1d7ca2ef970b69d51c4e704ae37af1a0a57e65f49d5eaa6f41284a07f49ad SHA512 41a37c7f095b1a10182501f0ddd035d97e0b9b150fc5d34871241c5a512c808e5b59ebf1f340b8c41432f0fd8746de9cdc39e7022a54b2f3194a916afadf1e00
 DIST comix-4.0.4.tar.gz 481687 BLAKE2B adf73f63d260fa4171f4e85fe74e25e52253ea4c78eb3d2be8d9319ddeef537899415a582b8f33db76a8e30acf77c2d5bd1fc5b931302040d967bdd39b45e9ff SHA512 9cbc5b1cc100ee50b48b794ce9a7f08130fc7a79376533f0f55904be0e2e8cfe5f8b1deeff2f76e7038a3f81b0f709ce5eea88a709199e1584b73f5259df5f8e
-EBUILD comix-4.0.4-r1.ebuild 1839 BLAKE2B 40d8b1a3ec99a7d0157c2296bde6c6213452c7b81812ad2c7cc7baad10fb9656e225367f18af64d566b7f7d228b8e052877d55e31dd4216121134130dd249733 SHA512 f9809c0348b1d14ac07416e6f35969e82933997afc22cc9ce2f40cd27d469fcaaa091603cb3b85a5bf46cb0313097c702fab8028654da2f00ae8f2a579bb508a
+EBUILD comix-4.0.4-r2.ebuild 1879 BLAKE2B aedcac4792ed3674954ca679b07311add1eeca248dd6cfe079e6bd3f3fa43150a775b0555358e2ba984ae9d798fc27c51c92a08b5d43775e12cf0c8f0ecf4797 SHA512 d381384fe28a6a9372bd229a30e099342c573015a9691b3f3166237400554f3725f34d1c100c19a5851bd98e701b2e24b99b4acef0f0dd0da9a175683da6f612
 MISC metadata.xml 422 BLAKE2B 82b5a9d0e1e0e159549c4f88a3cd00635c93c972adbb6e2f784f2fbd9bf91d2aedb27264066051e73dcd953099e122b2e4d6dbb2a4f52ee6bee2f988843f6c8d SHA512 8a382830d5c7629ee140934a03d9b5b6f4759deae2a1114d16b70634316ff46aa6ceb823a5acca95de7974c25563f8b6e324f32128f61c6fbdb12eb180ec7b6b
diff --git a/media-gfx/comix/comix-4.0.4-r1.ebuild b/media-gfx/comix/comix-4.0.4-r1.ebuild
deleted file mode 100644
index b77704f10cf0..000000000000
--- a/media-gfx/comix/comix-4.0.4-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=5
-
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="ca cs es fr hr hu id ja ko pl pt_BR ru sv zh_CN zh_TW"
-
-inherit eutils gnome2-utils l10n python-single-r1 xdg-utils
-
-DESCRIPTION="A GTK image viewer specifically designed to handle comic books"
-HOMEPAGE="http://comix.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="rar"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	rar? ( || ( app-arch/unrar app-arch/rar ) )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	l10n_find_plocales_changes messages "" "/LC_MESSAGES/comix.po"
-
-	epatch "${FILESDIR}/${P}-pillow.patch" #471522, https://sourceforge.net/p/comix/patches/50/
-
-	# do not install .pyc into /usr/share
-	local pythondir="$(python_get_sitedir)/comix"
-	pythondir="${pythondir#${EPREFIX}/usr/}"
-	sed -i -e "s:share/comix/src:${pythondir}:g" install.py || die
-	python_fix_shebang mime/comicthumb src/comix.py
-}
-
-src_install() {
-	dodir /usr
-	"${PYTHON}" install.py install --no-mime --dir "${D}"usr || die
-
-	insinto /usr/share/mime/packages
-	doins mime/comix.xml
-
-	insinto /etc/gconf/schemas
-	doins mime/comicbook.schemas
-
-	dobin mime/comicthumb
-	dodoc ChangeLog README
-
-	remove_locale() {
-		rm -r "${ED}/usr/share/locale/"$1 || die
-	}
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	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-gfx/comix/comix-4.0.4-r2.ebuild b/media-gfx/comix/comix-4.0.4-r2.ebuild
new file mode 100644
index 000000000000..fa7c18e84d38
--- /dev/null
+++ b/media-gfx/comix/comix-4.0.4-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="ca cs es fr hr hu id ja ko pl pt_BR ru sv zh_CN zh_TW"
+
+inherit eutils gnome2-utils l10n python-single-r1 xdg-utils
+
+DESCRIPTION="A GTK image viewer specifically designed to handle comic books"
+HOMEPAGE="http://comix.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="rar"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+	')"
+RDEPEND="${DEPEND}
+	rar? ( || ( app-arch/unrar app-arch/rar ) )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	l10n_find_plocales_changes messages "" "/LC_MESSAGES/comix.po"
+
+	epatch "${FILESDIR}/${P}-pillow.patch" #471522, https://sourceforge.net/p/comix/patches/50/
+
+	# do not install .pyc into /usr/share
+	local pythondir="$(python_get_sitedir)/comix"
+	pythondir="${pythondir#${EPREFIX}/usr/}"
+	sed -i -e "s:share/comix/src:${pythondir}:g" install.py || die
+	python_fix_shebang mime/comicthumb src/comix.py
+}
+
+src_install() {
+	dodir /usr
+	"${PYTHON}" install.py install --no-mime --dir "${D}"usr || die
+
+	insinto /usr/share/mime/packages
+	doins mime/comix.xml
+
+	insinto /etc/gconf/schemas
+	doins mime/comicbook.schemas
+
+	dobin mime/comicthumb
+	dodoc ChangeLog README
+
+	remove_locale() {
+		rm -r "${ED}/usr/share/locale/"$1 || die
+	}
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+pkg_preinst() {
+	gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	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-gfx/cura/Manifest b/media-gfx/cura/Manifest
index 11fa4870e6e6..bbfc90e67348 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -4,8 +4,8 @@ DIST cura-3.4.1.tar.gz 21720836 BLAKE2B 228ad51d189f83d2a34c2af7a6edcbe468bc32ee
 DIST cura-3.6.0.tar.gz 23388945 BLAKE2B bd2f2e688306e7ef060141abae22c858e9fbb9385e49110079b48e69955c3f6630f8f69ad67fdf2d9e5c1ac0c969cd2d2f416642fc61a63867f79f88985c5c86 SHA512 b56e5575cb0eb15d759999dcd2f4c33873a0a57805a8ba0ec7860811a2137658a656216c969c6e3316d65fbd5e43f2def10a6385ccbf4fc306d15098569ef279
 DIST cura-4.2.1.tar.gz 29288696 BLAKE2B 1332030e63d7056dcb8dd680208b0da8dd33e5c7809957779849bac808fccad9a222505ddbe80d4071474d10ace842aa4459f14560198a9f3eebb5be53f923e1 SHA512 4f47f3f5597d1a56d88207eacacece49edb766c75ae18ddc9fb8689b76c16fd4decc9c8af7cab485aac3c9cffe13095aaad34e1c60634249ae2923ead771ac52
 DIST cura-4.3.0.tar.gz 30433646 BLAKE2B 8490d703cfd4ad07fd5b30d5f776d978baa17ad8751dad53870714596998becebc85cc2fe49fa05eab37b95106315ace97eaa0bbed65b488b522ebbbcba488dc SHA512 3f4ae11e4e28b151e9587c197f814bc97bc225fb2819f4dabaab392ef9896bb119d6fab0df48c9eb4a390a815815d27045eefa933e2e4a9d53331db8d79ea815
-EBUILD cura-3.4.1.ebuild 1671 BLAKE2B 9e148352819851202d42db7270f90158fdd4aa4c8bddb1aa2769769b26decbdbdf3e67d0432f5e017ce0a6ae48f7c07f45cf2cecb4b8c32d67c41490abd120b8 SHA512 a81c643600777b216bf4218857db59afded1e98ccbbdae5c3489b42242dc304246461a9815a2b8eb99c2b5e283b5cec52b61347dbb16a0207ff7183f518ba3f1
-EBUILD cura-3.6.0.ebuild 1671 BLAKE2B 9e148352819851202d42db7270f90158fdd4aa4c8bddb1aa2769769b26decbdbdf3e67d0432f5e017ce0a6ae48f7c07f45cf2cecb4b8c32d67c41490abd120b8 SHA512 a81c643600777b216bf4218857db59afded1e98ccbbdae5c3489b42242dc304246461a9815a2b8eb99c2b5e283b5cec52b61347dbb16a0207ff7183f518ba3f1
-EBUILD cura-4.2.1.ebuild 1357 BLAKE2B e74b46ee6de460b1ae0e5880326f2a1fd0f9d60eb619f62f1053d2b86daa62a5cc0997e41a3469859e87a0651196a91d91d10488a7435eb53afdf1065cb77153 SHA512 2775f01ceda5ca6fc7f30b3a6e18d90c3243a14eb1bd7e4be900b2a8b75611acb2ca5c8d29b1054734d760dac7094258b5d52ef79ef1886a808d414b4ab5038a
-EBUILD cura-4.3.0.ebuild 1357 BLAKE2B e74b46ee6de460b1ae0e5880326f2a1fd0f9d60eb619f62f1053d2b86daa62a5cc0997e41a3469859e87a0651196a91d91d10488a7435eb53afdf1065cb77153 SHA512 2775f01ceda5ca6fc7f30b3a6e18d90c3243a14eb1bd7e4be900b2a8b75611acb2ca5c8d29b1054734d760dac7094258b5d52ef79ef1886a808d414b4ab5038a
+EBUILD cura-3.4.1.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
+EBUILD cura-3.6.0.ebuild 1735 BLAKE2B 407f2d1a162ad50c3e571d3b6809523a93b0d9a49866bb10630d2ca0a13e9bc1769a6fb901c6ee60c9eb9ad36f1a851969969dfe54a805c2641e45b871b65432 SHA512 4d3679148889f8cfcf086adbc957648adfeaf622839d6db3401a694c4932d72e8589c4a6958f614b6954c5163c13b651745233261afb452219adbc3ed92f624e
+EBUILD cura-4.2.1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
+EBUILD cura-4.3.0-r1.ebuild 1421 BLAKE2B 89456bb773708bb3b455143fe11d97e36bf8e88a843ef5b00027de8150fb2d770cd7294878fcb46b3296cd5b16f7da751ec92c865302ca487e27655c12c37751 SHA512 56166afc68952e79a7900ce4c4330b6ce84d34ac55204ab0b6a08a2122366f4ad1fe7404cfa803ab019339d652f810776ce7dd33bf9bb89dfc0738b8308b3208
 MISC metadata.xml 924 BLAKE2B 98684c30170538865b264d21a025a558b66ef0f5b46dd4cc291dacd71367cf775135d66fc379bf6bf0edfacab6e33c939a750fdcc8f036cedb7d9daf5b442072 SHA512 b09e1e1251f3171721bea6ea7ace38beed877525b1a83282035bb34fa871123c0995674d899a486b3ff67ac34429cabc12f9e90ffd1b1e3f60257389a900e483
diff --git a/media-gfx/cura/cura-3.4.1.ebuild b/media-gfx/cura/cura-3.4.1.ebuild
index 16ebf84a070c..f1b275618c69 100644
--- a/media-gfx/cura/cura-3.4.1.ebuild
+++ b/media-gfx/cura/cura-3.4.1.ebuild
@@ -19,13 +19,15 @@ IUSE="+usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
 	>=media-gfx/curaengine-${PV:0:3}
 	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
diff --git a/media-gfx/cura/cura-3.6.0.ebuild b/media-gfx/cura/cura-3.6.0.ebuild
index 16ebf84a070c..f1b275618c69 100644
--- a/media-gfx/cura/cura-3.6.0.ebuild
+++ b/media-gfx/cura/cura-3.6.0.ebuild
@@ -19,13 +19,15 @@ IUSE="+usb zeroconf"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
 	>=media-gfx/curaengine-${PV:0:3}
 	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext"
diff --git a/media-gfx/cura/cura-4.2.1.ebuild b/media-gfx/cura/cura-4.2.1.ebuild
index ba1e9563f25e..d72614d316d0 100644
--- a/media-gfx/cura/cura-4.2.1.ebuild
+++ b/media-gfx/cura/cura-4.2.1.ebuild
@@ -20,13 +20,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
 	>=media-gfx/curaengine-${PV:0:3}
 	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 DEPEND="${RDEPEND}"
 
diff --git a/media-gfx/cura/cura-4.3.0-r1.ebuild b/media-gfx/cura/cura-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..d72614d316d0
--- /dev/null
+++ b/media-gfx/cura/cura-4.3.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit cmake desktop python-single-r1 xdg
+
+MY_PN=Cura
+
+DESCRIPTION="A 3D model slicing application for 3D printing"
+HOMEPAGE="https://github.com/Ultimaker/Cura"
+SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+usb zeroconf"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="${PYTHON_DEPS}
+	>=media-gfx/curaengine-${PV:0:3}
+	>=media-gfx/fdm-materials-${PV:0:3}
+	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	>=dev-python/uranium-${PV:0:3}[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		usb? ( dev-python/pyserial[${PYTHON_MULTI_USEDEP}] )
+		zeroconf? ( dev-python/zeroconf[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" )
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	doicon icons/*.png
+	python_optimize "${D}${get_libdir}"
+}
diff --git a/media-gfx/cura/cura-4.3.0.ebuild b/media-gfx/cura/cura-4.3.0.ebuild
deleted file mode 100644
index ba1e9563f25e..000000000000
--- a/media-gfx/cura/cura-4.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake desktop python-single-r1 xdg
-
-MY_PN=Cura
-
-DESCRIPTION="A 3D model slicing application for 3D printing"
-HOMEPAGE="https://github.com/Ultimaker/Cura"
-SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+usb zeroconf"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/uranium-${PV:0:3}[${PYTHON_USEDEP}]
-	>=media-gfx/curaengine-${PV:0:3}
-	>=media-gfx/fdm-materials-${PV:0:3}
-	>=dev-libs/libsavitar-${PV:0:3}:=[python,${PYTHON_USEDEP}]
-	>=dev-libs/libcharon-${PV:0:3}[${PYTHON_USEDEP}]
-	usb? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${PN}-4.2.1-fix-install-paths.patch" )
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	sed -i "s/set(CURA_VERSION \"master\"/set(CURA_VERSION \"${PV}\"/" CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_SITE_PACKAGES_DIR="$(python_get_sitedir)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	doicon icons/*.png
-	python_optimize "${D}${get_libdir}"
-}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 8a11dd151689..11ad59f509ed 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -3,5 +3,5 @@ AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b1
 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce
 DIST digikam-6.4.0.tar.xz 340146992 BLAKE2B ca1bc8b0d165f9774354d8489a11d46d8d7467edd3c1e90fd3a96024c4b7cd23bfd5c813251183bcca6d4beac9bffeb9d921beaa9a3752f75f1918796aacd719 SHA512 b3b5e9903538d110613aa872c9215f5e7c19f7520a2b9060c24e686f20f72075378b447239dd3e17cb8860cdd35c699399994199b848757f0497ad25a7805e42
 EBUILD digikam-6.3.0-r1.ebuild 4183 BLAKE2B 0c6db20f59f6c2797a05b63483f81e6e741ff41b1b2ff058fd48a8b6fe6c511765cef05a314b942aed178170ecf806228395c55210b2c7732211a794b1bb3d9b SHA512 bb06b989309c24de79b3eb713767ae41b5654297a53d90d74275ad11b2cbcc0fdb2e79bece5f05cd891be3e4ad36f850e7555ca155171ead6ffbe299bc83a5ef
-EBUILD digikam-6.4.0.ebuild 4355 BLAKE2B 2feed71db7ae7b89f76e91b3d1e94640037522f0bf1fe536abd891e40cda9aa695721eb401fc2f568311bcfd86a7dee16b7a1bfd811896e2ec7ff8791f2e471a SHA512 46d92805507617800d7885238f1754579891483015cf19ac2fe7dcb37c90cc0e263551e70490fcbe16c281418451e7fa7152789a97836e99446c99dca1a1b451
+EBUILD digikam-6.4.0.ebuild 4354 BLAKE2B 0140473b280e5a72bb4dd847bde2b1c0ee4a95a8b824ad81ba22556553f14481e1d25fe7b788a6a0f99ca40efcaab38436030228f5f6f9334e4b9772ae0d72dd SHA512 f2fe5044b465abf70c90866c9c36ed2df1efb783fb1b3c630614b1dfb5191152a8fd316d64685f864d9db4328b4b49db5b1f585f6ac6b7c7ddb55cf5fc2ddfb5
 MISC metadata.xml 1368 BLAKE2B 5dec50abba4f748e1f8eb465807c719f4b81759277241169d9e721749a1ba807425f7d46e9feb1edb4dcf3b4dd00b40bfbb353fe479e29c8a1878ad1fbfb5082 SHA512 4cd1ada9c4274338e49a692095d80b572c309bd34c838e2663a18ec1e7230de87e27087febfedde46a0f6af19f1a3f440335750375117d20eacd0c756db8b2f8
diff --git a/media-gfx/digikam/digikam-6.4.0.ebuild b/media-gfx/digikam/digikam-6.4.0.ebuild
index 9ee9030d8c61..92dabb81cb7d 100644
--- a/media-gfx/digikam/digikam-6.4.0.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_BRANCH=stable
 	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
 	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 16b15d87dbf3..ddb06a553378 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,4 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2253 BLAKE2B 2a704f6f1954d9cde078bbdd1a9682f55cb12a048b0169ef66651d269af980c2d90514dd64f76b5e83b63910d115a4ea3b360c8b9dfc84145dc4bc52ccbd8f41 SHA512 824195c10b66e7c65e494f37a3a78584e6cbdf2ca3e7d429050104e91c052b139e5d010afde757f0817fd169c5c222c98bb98162c64d60f1d5e5214697a2e941
+EBUILD engauge-10.6.ebuild 2251 BLAKE2B d7846b51f73af71c961780b660fc24cdf95861c85ca263171f3670b03a1c3ec74cb58825f8578dff800f5d65046f0165340f8a7e06cee4b7c84c037f4b91910f SHA512 80a0aa364ba748065fbba73fa86aee4e3712c10fe29b9549ea43a25aa2923350ebd1019e552783cd2fb8bac9da1d304a95b97be2e785e0511a3c70ab63ba9cde
 MISC metadata.xml 337 BLAKE2B 8c46cdaadb388ccd12d29c41a075ec60130482855d0735cd468a174e631129964fec7c2e7649994e8f958def8ceb8f4ad0ecb60ab69ce37171c9945696825369 SHA512 41201e69d211283450ef6ff45a23e0978934044e170da84de7e7978360bd5ce1e3b277df4a90e00221cca3f987cd6839ee90fceea232c70cebeb69b5bc7c1c6d
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index d9161fe8f238..a1741e7df831 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.ebuild
@@ -70,7 +70,7 @@ src_install() {
 	# Install qt help files
 	insinto /usr/share/doc/${PF} # this must match sed expression in src_prepare
 	doins bin/documentation/engauge.{qch,qhc}
-	docompress -x "${EPREFIX%/}"/usr/share/doc/$PF/engauge.{qch,qhc}
+	docompress -x "${EPREFIX}"/usr/share/doc/$PF/engauge.{qch,qhc}
 
 	if use doc; then
 		pushd doc >/dev/null || die
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 9be5d3fd420b..00e15b24a983 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST eog-plugins-3.26.4.tar.xz 477772 BLAKE2B 104ddf58d33e5513349839312fef820af20d7a3e64a3a8cbd7d964d8250564d6cd62c58cf95fb5359ab95eac8fe2b83ed051e6f3dc8144a8884ec72c74a12622 SHA512 95f2cf2c6ed84b4801517a708f18e1cd673f814d849029a41491f3719512d6a3a2cb5cb11898a7f972f8b674c682245c99964ba2da19b285ed175b720d5396e8
-EBUILD eog-plugins-3.26.4.ebuild 1643 BLAKE2B d9b11d153fe0bf64b28ebecd99f8953dab21764cc608dd0b6f5b2fbc7951d06145875fcc5ea578299d3d92fe7413889de1b1aad472ee24500fa2ba611086bdec SHA512 795624595a121dc071196915473919f2b9c2af1272e60f17bd05ef5cc263345cfabb68eb1bcb37eb34676353265eb939836b2ba1c9a8d345e2dfcc51dbec6881
+EBUILD eog-plugins-3.26.4-r1.ebuild 1688 BLAKE2B a8facd636930691003351dc4f962970dcc19509ef2df7f106899ade4caeade426e2e5223856c7ea8f6a9decc80861d12bebfaa66b1ab164a03d016150b492c05 SHA512 86920010db0205fa3aa896a18b371acb4c72c0a277aed032675eff40cbe87b7985847c7bdddb007b5575072e50732da650e68bad315c6724c9d3cb53ba753eae
 MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild
new file mode 100644
index 000000000000..33ba60e823b5
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.4-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="+exif map picasa +python"
+REQUIRED_USE="
+	map? ( exif )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libpeas-0.7.4:=
+	>=media-gfx/eog-3.15.90
+	>=x11-libs/gtk+-3.14:3
+	exif? ( >=media-libs/libexif-0.6.16 )
+	map? (
+		media-libs/libchamplain:0.12[gtk]
+		>=media-libs/clutter-1.9.4:1.0
+		>=media-libs/clutter-gtk-1.1.2:1.0 )
+	picasa? ( >=dev-libs/libgdata-0.9.1:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.32:2[dbus]
+		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		')
+		gnome-base/gsettings-desktop-schemas
+		media-gfx/eog[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection] )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${RDEPEND}
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
+	use exif && plugins="${plugins},exif-display"
+	use map && plugins="${plugins},map"
+	use picasa && plugins="${plugins},postasa"
+	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
+	gnome2_src_configure \
+		$(use_enable python) \
+		--with-plugins=${plugins}
+}
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
deleted file mode 100644
index c686fd3f919f..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.26.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 02a3b62d42b0..aeac03b21301 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,4 +1,4 @@
 AUX exiv2-0.27.2-libssh-0.9.2.patch 2035 BLAKE2B aeb9be311217b80a347d76a7df14ec11fc2018626cf7e9a813865dffd76038db10432fc2c898c0c26bdb3f1556cd34c0f8e4a25b189bc32733a3b4e018b241bf SHA512 25b4ca539585ddc2f4a11fc24ba49e799689d361f5f99f5552e99bd81179c95968affc4a42acd9ac0ba56f237f29ec53970a134b4dce44274a6044638d5bd78e
 DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
-EBUILD exiv2-0.27.2.ebuild 2470 BLAKE2B 708ab232f370ea3d5baa7120968e98a9247275a317091edbe69a71e58ad3fbea9fb3f7667b7223f7df9d39aefea314adb8c5f9d4a3584a50388987c07488c885 SHA512 c8cf2837010987bab1513e81fec41598de7ff482a4816a32f6d402e6ce19532d2e44a24a1297b0dafb6443567c6bea74b03c82d8d4fd90da63ef70e07444550c
+EBUILD exiv2-0.27.2.ebuild 2460 BLAKE2B a1005706088ae5aa1eb7ee147779e7b52bf4e9e352e07519cf716a7205bb9c891633e72de697349b24e98d88e00e952d8427ca393713ac94920b3523314e6aa3 SHA512 c043dd22d651f746f52551de91950deb18776e24c1d3a33156b4e7072bed395f6bb70dff8b0bf4d9eec4a2cf6ce76851448d93dd31ce47e4009dd5f48dca4939
 MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
index 866a52c4b336..eb4ea7a0803c 100644
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib python-any-r1
 
 DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index e7cc0beab24b..1212f2a0acd8 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -2,5 +2,5 @@ AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4
 DIST feh-3.2.1.tar.bz2 2112281 BLAKE2B 2918d2714f0557e1b67284709bce22c5e14d8f7f545ca33c16ec7928273edf18c9be48a685c3e9a032170bf2b7e572a4b78664f37b2a16c5ae5829b3cc55ca76 SHA512 11a136990f7d02409501f10553659c64ad5d18d4bfaa4e5cfdeb7a2f53ffdb8bd9b8347796c65e75c49615ac4c12bc81bf3a58325f778cb5e0c1608181d7b53a
 DIST feh-3.3.tar.bz2 2112880 BLAKE2B 56042367c0acce966e115e77f3afa1acd3f942a956bc453de364bcd17d90393ad2868039a5793af64826cd50322e4ef5f9f2b9678f982c7c85b025ed208f8bb8 SHA512 0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9
 EBUILD feh-3.2.1.ebuild 1522 BLAKE2B 79c8a59656764fc43e28f15616dc26ffd40b81b1417d885e5c1b89e32a6ff854c7b6af763acddd0897ce58bf0231eb7250319090c48fa282f14218dfb477edd2 SHA512 6e4ef3a5b5a962510bbce7957b09b11d46111ffd10593159d965bd86e09c7da7800175459b8cdc553a58ac616d146a7752253cf72afd6be003cf93be81eb5409
-EBUILD feh-3.3.ebuild 1526 BLAKE2B 15dabb54b5433f46af59e105bb236c8eee767742db5752ab980411e716b8f5243d632f256192d3d933d67bbc30d68d73fef5fe60122a060c40594bc83b10a250 SHA512 0557f644d86c41cdd21e8e3db16f29f7b45d2872bed6f6fe6a5867e54cf8ee86605da7c1aa1ec0ea6614741ae842a44f56d14c4ce38d1a140f4a1d337b215ab0
+EBUILD feh-3.3.ebuild 1466 BLAKE2B 7f802e0c0e92c003602a60f1b1faf1c132c88de3ed6b92138075fe3497fb24f0b8fccef12c7e034e31b407b56cea1a751558ae4b8bb723eb29feca80a6a8fe23 SHA512 52cf87f2fffc675074444ba45bb97a6aebce8c144d29799091040fe9e590a83229bed60120561e0fad18134220f3f9de211b3fb0b19a8d57a8b42c8b00327117
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-gfx/feh/feh-3.3.ebuild b/media-gfx/feh/feh-3.3.ebuild
index ad37f294e684..cdfb177f990f 100644
--- a/media-gfx/feh/feh-3.3.ebuild
+++ b/media-gfx/feh/feh-3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit toolchain-funcs gnome2-utils xdg-utils
+EAPI=7
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="A fast, lightweight imageviewer using imlib2"
 HOMEPAGE="https://feh.finalrewind.org/"
@@ -57,18 +57,14 @@ src_install() {
 	emake "${fehopts[@]}" install
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
 }
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 7579155eaf71..50b89672093b 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -7,7 +7,7 @@ AUX CVE-2020-5395.patch 3073 BLAKE2B 15fa97a633e2c218f512a7d1202555e2465bad9adf0
 DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20
 DIST fontforge-20190801.tar.gz 20766334 BLAKE2B c3206e77da4a966b9e513c41c90e19522f3d1aad990cd3035d7c8a8cc009239811743c12c02df3b02fd91fa5a7738913dba43df14523a738a2232cd2d1a91700 SHA512 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236
 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11
-EBUILD fontforge-20170731-r5.ebuild 2852 BLAKE2B 635d215e7e84c0c022008c5fcd6aa30758023d2cf5b589a1f5db1681d6659c9af849e6c007d57caa4cab33da203542fd5f2ddf685f9c5773d05b3cb978c8f6f1 SHA512 c5449ea9b0a24c43132a9c663b9bb2fe136e3b56691b1ec4ad35fa52bd40820f37f312a8b75dcca1e1fc96c9a1f1712906c97b4f99d6427dcc85c52552ba1a3e
-EBUILD fontforge-20190317-r3.ebuild 2773 BLAKE2B c92f4cb825907a97e26df7f9d3c5c96fd40a9ce28ad28728432a5644ade9c879d37e2d7bf1923429d396f373a58a29a1485ad7ec40bfc65fab2bd89323f802e8 SHA512 6e9963725f1afa2d7be03868bd24eb44f781ac1bc32f893854272c80113f9941f9d8b805953d91d4f7683091f7eeff9b9f0b23ae3b7bc944f3703966f56bc6a9
-EBUILD fontforge-20190801.ebuild 2531 BLAKE2B 3a5adafebf248d965738ae047b1eb2d0ca69e4e410b91c8184d6ce0522d949e2e04190d6b43ba51816976388688db462354031561feb3649c302f0c00b96a4a0 SHA512 b9a8600d01d8d704887924977f52aca61720371ea753aeefd2a1f50a7b08387b71e70f878545f553531ac449f71ab23306487287a4054b14cb0c2458f2548dd0
+EBUILD fontforge-20170731-r5.ebuild 2846 BLAKE2B b46db1ea40d29dbef84dfc10a12acdfed036c39543ce1175efbff8b4c77af0e0da438b87074447796280ae223a8918f8f83ba3cdb589adaf02a75e15e817c634 SHA512 a17303781657c81bedd15e690c8d39354155fdfe123b082e1d68246ea7bb0ca5ad3b3b6e00be54785870c4c270414e03eef104ce248f56e9bdd91295fcd9e321
+EBUILD fontforge-20190317-r3.ebuild 2767 BLAKE2B 0f9e4a2b3635106ea515cebd1d60574ac855b984be40c9b40c06d1b0f68256fb637582dee980ed6990bbdd7f0cb302d2b2f1e423712f1814e698d731b9a83da8 SHA512 5e2efe3ce7bee1d3f157ad48ac1b716a76ed466b38178e0d3d905901b8c8d4af21647dd8df7c1fb7d8d9d2ff1b61f3718d911fe3c159ac0eaec4189220239934
+EBUILD fontforge-20190801.ebuild 2525 BLAKE2B e7ab0458ad00c279f544bb19de2cdb614e33bccb1b9e65043e70cf7b29bbcab11978ee4c820a2a912cd95a2546b7fbf47d19e15148c4d9021085e80eca071bd0 SHA512 8e6e70aa680eb038c1d502c9915fb9cce31c5c9bc1a4ebc580a53cae1eb9589be93c0d2471db6b48695a14e85262d82363fab7189d20e485b2816457f908bd9c
 MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28
diff --git a/media-gfx/fontforge/fontforge-20170731-r5.ebuild b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
index 04d71dc2cee5..90a77ef518b6 100644
--- a/media-gfx/fontforge/fontforge-20170731-r5.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2-utils python-single-r1 xdg-utils
 
diff --git a/media-gfx/fontforge/fontforge-20190317-r3.ebuild b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
index 28c16aebe855..b6d8e0e08cbc 100644
--- a/media-gfx/fontforge/fontforge-20190317-r3.ebuild
+++ b/media-gfx/fontforge/fontforge-20190317-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1 xdg
 
diff --git a/media-gfx/fontforge/fontforge-20190801.ebuild b/media-gfx/fontforge/fontforge-20190801.ebuild
index 31b62099c783..20cd4600afaa 100644
--- a/media-gfx/fontforge/fontforge-20190801.ebuild
+++ b/media-gfx/fontforge/fontforge-20190801.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1 xdg
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index eea609f3389a..aa5db513d85d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -14,9 +14,9 @@ DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B f1254ab0742cf0190f4e50f001d8120fe655b
 DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B 11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999 SHA512 b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.10.14.ebuild 6083 BLAKE2B 30e51fc97a7e1a97e12cad9acb85fa37d276087c3ad859783b5cbd721944d52622945dc6534bcb31cc32d3acb1b2941c8fd46954d66618d59b6232d6bd4a23ad SHA512 689c781bec1643c2b4598258b0b1162bb37abd8c6ab1b1043d1d2a42b530312ef0caeb522f0b53c7624a4552fc825a9a92821979c8ee76be90b42925c526fc21
-EBUILD gimp-2.10.8-r1.ebuild 6104 BLAKE2B bec6521e91558be2f2282baf131598c519f92c93267f687dedcac78fe70d27851c09307eb438009d35f9307c2ae78a77411cb6238cdde84b0ace9165399308cd SHA512 20f59e5aa3a8d5424b65ed9f947123feee6723dd16f946991022b17ac964be37c6aa0a71022928293fc51c542f3a3ad24ad3432fc6680d7214393d87d5159db2
-EBUILD gimp-2.8.22-r1.ebuild 5125 BLAKE2B 880aa0f1b5fbd631f5242a41059b0ba7ec54773b3f49bd6f600361a1de23d65844ec369b1ae3283dc09d2ce7ea51cfa17a6bd68fe50dd2074e14d26e30f74922 SHA512 648e90b0121e4971bdf9fcd09383f790addb5fa63e256f22c1e76b22ed1b92c2d73cb0740d061dc3c1a65311d3b2e8cb843070fb08ea528cb365886d2b495e5e
-EBUILD gimp-2.9.8-r1.ebuild 6042 BLAKE2B 0190f744da671d8b8d89e2596100c2ac2268adb1d278ef3106d89863c6d501c60c1e6a5cc7cb6c831aff43224e23c1c0a818cf5102afc28da637262e51798e44 SHA512 0a5a0aa970e83d5603223e7dd6a989098a150807183626bd45f03a68eb553fe3cb85a999262adfb60ea417a43e7b45f2f2379f746b019216347b52a9497f2a07
-EBUILD gimp-9999.ebuild 6114 BLAKE2B 00745fe1d7fa98a3f681f44f0ca8c8efe3fa7af98ae117ad0b0838376d140c9f7f843eeb87f50d3acb52721d1eb19548b04f0debfd6c9d86647a7270d814109b SHA512 5f7ece5f194ce0d7c526e0aebf69c045f9bddbb4cca2612d73e871ca350bfd5e60ced6bee1f2083096e1b5182b810608d4898ba6391d745e565cb7c02f1c1b0c
+EBUILD gimp-2.10.14-r1.ebuild 6128 BLAKE2B 76a1ce0fe3defafb47cf2f853661e3a5f3ef0be8107fcf52b1df9b4018780a716bc7a6f76dc9a3142583483b7819180b0d9980d8b2b1861238f424a77c3c37ae SHA512 dd91a497d1cf7a4d587a2d7c926c3d1750ff5944c94e64ede97010213975be80893402ac5055be0107b9706ab14a3725652f4b8eb09db6b8ac8da0fd46d5e0ca
+EBUILD gimp-2.10.8-r2.ebuild 6149 BLAKE2B 51647e9a4673cd19e921554e1529a171205d74f3b32c54325f9e03fa08ddb140162fc9cd205da2303fede40e64fc55dbc2345dbff4c9b86df5564d568beff690 SHA512 7a2cdc2ea67f6a1bb0bf36b25e1018fb71aaeb052d05ab086310d9bd03a0b1d20be62485ac1516bd02d3d667a69d3cc64eca1c05f9ea4783e2a9f177a47aca8f
+EBUILD gimp-2.8.22-r2.ebuild 5163 BLAKE2B 030810c37e0c20fa903f581e02c8e9ead89095a7375f1291e2dc771bb4026657c56e3d4f97abca096e0509e005779e3b8f139fe78e12c64b40fe518f6c879a55 SHA512 a457e0c1335a536b4072a09354f41d57a9455f973d93698ef81d1ce1e2d38015c235595400c4e9dff4f3e23856c1fe43c7aea3244e8935eadf0f6ae46ea36215
+EBUILD gimp-2.9.8-r1.ebuild 6087 BLAKE2B 2bcf7bf2256e1a768fc76806b8af465ad48dcc761c9b22a788a2674dfcd08d1cb3c12b3c85f7bf44dc70815bf5b45d3631a41c90201798076d6df7a734d05f7c SHA512 84b90d508a087cf9f31e33abe4c4cf5f6b19200bd25a1cf4d1e2a3bbc41cb7ce7697fade6da4d44e0d86766431b95d7dc927bd45c18e7b33ae62a7b021bde4b5
+EBUILD gimp-9999.ebuild 6152 BLAKE2B 26ca217a370be419450cf6f9ef66ceed8c8d77bc260de37ab74c5f6706b6c032befe261ada5e9a82fe4c6bc8b4893080e1ee64435fd25c39e829b29a499db581 SHA512 6565b9cbe478c9c311a036897cf3c1f9b3841aea0b3095665e0d482ad85cb22274660b1800dbc50f9225e88d2e262c5995d6763d28ef99caa2021f231924ebd8
 MISC metadata.xml 628 BLAKE2B f1326f51db692d6e64d1bb7b44dfada65799d7ab94279771e6bd729189145a8a4bbe7a83c776bfc46acf682ad9f34c84598d25fb0a3606aabfa30383b35a9694 SHA512 cec60cde9763bdb9012fec754b95018f09da5cf7ff2f577206417651df5c18251dd5c58b1e32fb45e7c2121e06c0a5b7dc86d08b9511da4cf103bcf2fa1b6e52
diff --git a/media-gfx/gimp/gimp-2.10.14-r1.ebuild b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
new file mode 100644
index 000000000000..e169695de69b
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.14-r1.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+
+inherit autotools gnome2 python-single-r1 virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="amd64 ~ia64 ~ppc64 x86"
+
+IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	>=app-arch/xz-utils-5.0.0
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.0:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-1.3.0
+	>=media-libs/babl-0.1.72
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.18:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.3.0:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg:0
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.3.2:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python?	(
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/automake-1.11
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
+	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
+		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable python)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_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
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED%/}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.10.14.ebuild b/media-gfx/gimp/gimp-2.10.14.ebuild
deleted file mode 100644
index 63247f2f6b4b..000000000000
--- a/media-gfx/gimp/gimp-2.10.14.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-GNOME2_EAUTORECONF=yes
-
-inherit autotools gnome2 python-single-r1 virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
-
-IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	>=app-arch/xz-utils-5.0.0
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.0:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0
-	>=media-libs/babl-0.1.72
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.18:0.4[cairo]
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.3.0:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg:0
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.3.2:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Disable system CFLAGS suppressing on SSE{2,4.1} support tests by addition of {SSE2,SSE4_1}_EXTRA_CFLAGS: bug #702554
-	sed -i -e 's:\$intrinsics_save_CFLAGS \$SSE2_EXTRA_CFLAGS:\$SSE2_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' \
-		-e 's:\$intrinsics_save_CFLAGS \$SSE4_1_EXTRA_CFLAGS:\$SSE4_1_EXTRA_CFLAGS \$intrinsics_save_CFLAGS:' configure.ac || die
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable python)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_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
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED%/}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.8-r1.ebuild b/media-gfx/gimp/gimp-2.10.8-r1.ebuild
deleted file mode 100644
index c69d663e35e1..000000000000
--- a/media-gfx/gimp/gimp-2.10.8-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-GNOME2_EAUTORECONF=yes
-
-MY_PV="${PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-
-inherit versionator virtualx autotools gnome2 multilib python-single-r1 ltprune
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="amd64 arm64 x86"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
-
-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
-	>=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.58
-	>=media-libs/gegl-0.4.12: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_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
-	)
-	>=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? ( dev-libs/libgudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	heif? ( >=media-libs/libheif-1.1.0:= )"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-		--disable-silent-rules
-
-		$(use_with !aqua x)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_enable altivec)
-		--with-appdata-test
-		--without-libbacktrace
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--without-webkit
-		$(use_with jpeg2k jpeg2000)
-		$(use_with postscript gs)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with webp)
-		$(use_with heif libheif)
-		$(use_enable python)
-		--enable-mp
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with wmf)
-		--with-xmc
-		$(use_with xpm libxpm)
-		$(use_enable vector-icons)
-		--without-xvfb-run
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
-	done
-}
-
-# for https://bugs.gentoo.org/664938
-_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
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_rename_plugins || die
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.8-r2.ebuild b/media-gfx/gimp/gimp-2.10.8-r2.ebuild
new file mode 100644
index 000000000000..936e49178bae
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.8-r2.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF=yes
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+
+inherit versionator virtualx autotools gnome2 multilib python-single-r1 ltprune
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="amd64 arm64 x86"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm"
+
+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
+	>=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.58
+	>=media-libs/gegl-0.4.12: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_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	>=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? ( dev-libs/libgudev:= )
+	unwind? ( sys-libs/libunwind:= )
+	heif? ( >=media-libs/libheif-1.1.0:= )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	sys-apps/findutils
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19
+	doc? ( >=dev-util/gtk-doc-1 )
+	>=sys-devel/libtool-2.2
+	>=sys-devel/automake-1.11
+	dev-util/gtk-doc-am"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+		--disable-silent-rules
+
+		$(use_with !aqua x)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_enable altivec)
+		--with-appdata-test
+		--without-libbacktrace
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--without-webkit
+		$(use_with jpeg2k jpeg2000)
+		$(use_with postscript gs)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with webp)
+		$(use_with heif libheif)
+		$(use_enable python)
+		--enable-mp
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with wmf)
+		--with-xmc
+		$(use_with xpm libxpm)
+		$(use_enable vector-icons)
+		--without-xvfb-run
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+_clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		has ${lang} ${LINGUAS} && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${ED%/}"/usr/share/locale/"${lang}"
+	done
+}
+
+# for https://bugs.gentoo.org/664938
+_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
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || exit 1
+			mv {,${prepend}}${plugin} || exit 1
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	prune_libtool_files --all
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	_rename_plugins || die
+	_clean_up_locales
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
deleted file mode 100644
index 9fc5aa9cdd4c..000000000000
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
-	>=dev-libs/atk-2.2.0
-	>=x11-libs/gtk+-2.24.10:2
-	>=x11-libs/gdk-pixbuf-2.24.1:2
-	>=x11-libs/cairo-1.10.2
-	>=x11-libs/pango-1.29.4
-	xpm? ( x11-libs/libXpm )
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-	x11-themes/hicolor-icon-theme
-	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0:0
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	aqua? ( x11-libs/gtk-mac-integration )
-	curl? ( net-misc/curl )
-	dbus? ( dev-libs/dbus-glib )
-	gnome? ( gnome-base/gvfs )
-	jpeg? ( virtual/jpeg:0 )
-	exif? ( >=media-libs/libexif-0.6.15 )
-	lcms? ( >=media-libs/lcms-2.2:2 )
-	mng? ( media-libs/libmng )
-	pdf? ( >=app-text/poppler-0.12.4[cairo] )
-	png? ( >=media-libs/libpng-1.2.37:0 )
-	python?	(
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svg? ( >=gnome-base/librsvg-2.36.0:2 )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	x11-libs/libXcursor
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.19
-	doc? ( >=dev-util/gtk-doc-1 )
-	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11
-	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	G2CONF="--enable-default-binary \
-		--disable-silent-rules \
-		$(use_with !aqua x) \
-		$(use_with aalib aa) \
-		$(use_with alsa) \
-		$(use_enable altivec) \
-		$(use_with bzip2) \
-		$(use_with curl libcurl) \
-		$(use_with dbus) \
-		$(use_with gnome gvfs) \
-		--without-webkit \
-		$(use_with jpeg libjpeg) \
-		--without-libjasper \
-		$(use_with exif libexif) \
-		$(use_with lcms lcms lcms2) \
-		$(use_with postscript gs) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_with mng libmng) \
-		$(use_with pdf poppler) \
-		$(use_with png libpng) \
-		$(use_enable python) \
-		$(use_enable smp mp) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_with svg librsvg) \
-		$(use_with tiff libtiff) \
-		$(use_with udev gudev) \
-		$(use_with wmf) \
-		--with-xmc \
-		$(use_with xpm libxpm) \
-		--without-xvfb-run"
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cve-2017-17784.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17785.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17786-1.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17786-2.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17787.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17788.patch  # bug 641954
-	epatch "${FILESDIR}"/${P}-cve-2017-17789.patch  # bug 641954
-
-	epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch  # bug 558878
-	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
-	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
-	gnome2_src_prepare
-}
-
-_clean_up_locales() {
-	[[ -z ${LINGUAS+set} ]] && return
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		has ${lang} ${LINGUAS} && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
-	done
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	prune_libtool_files --all
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	_clean_up_locales
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.22-r2.ebuild b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
new file mode 100644
index 000000000000..3d4251ed76a5
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.8.22-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="2"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
+
+RDEPEND=">=dev-libs/glib-2.30.2:2
+	>=dev-libs/atk-2.2.0
+	>=x11-libs/gtk+-2.24.10:2
+	>=x11-libs/gdk-pixbuf-2.24.1:2
+	>=x11-libs/cairo-1.10.2
+	>=x11-libs/pango-1.29.4
+	xpm? ( x11-libs/libXpm )
+	>=media-libs/freetype-2.1.7
+	>=media-libs/fontconfig-2.2.0
+	sys-libs/zlib
+	dev-libs/libxml2
+	dev-libs/libxslt
+	x11-themes/hicolor-icon-theme
+	>=media-libs/babl-0.1.10
+	>=media-libs/gegl-0.2.0:0
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	aqua? ( x11-libs/gtk-mac-integration )
+	curl? ( net-misc/curl )
+	dbus? ( dev-libs/dbus-glib )
+	gnome? ( gnome-base/gvfs )
+	jpeg? ( virtual/jpeg:0 )
+	exif? ( >=media-libs/libexif-0.6.15 )
+	lcms? ( >=media-libs/lcms-2.2:2 )
+	mng? ( media-libs/libmng )
+	pdf? ( >=app-text/poppler-0.12.4[cairo] )
+	png? ( >=media-libs/libpng-1.2.37:0 )
+	python?	(
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	tiff? ( >=media-libs/tiff-3.5.7:0 )
+	svg? ( >=gnome-base/librsvg-2.36.0:2 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	x11-libs/libXcursor
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )"
+DEPEND="${RDEPEND}
+	sys-apps/findutils
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.19
+	doc? ( >=dev-util/gtk-doc-1 )
+	>=sys-devel/libtool-2.2
+	>=sys-devel/automake-1.11
+	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+S="${WORKDIR}"/${P}
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	G2CONF="--enable-default-binary \
+		--disable-silent-rules \
+		$(use_with !aqua x) \
+		$(use_with aalib aa) \
+		$(use_with alsa) \
+		$(use_enable altivec) \
+		$(use_with bzip2) \
+		$(use_with curl libcurl) \
+		$(use_with dbus) \
+		$(use_with gnome gvfs) \
+		--without-webkit \
+		$(use_with jpeg libjpeg) \
+		--without-libjasper \
+		$(use_with exif libexif) \
+		$(use_with lcms lcms lcms2) \
+		$(use_with postscript gs) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_with mng libmng) \
+		$(use_with pdf poppler) \
+		$(use_with png libpng) \
+		$(use_enable python) \
+		$(use_enable smp mp) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_with svg librsvg) \
+		$(use_with tiff libtiff) \
+		$(use_with udev gudev) \
+		$(use_with wmf) \
+		--with-xmc \
+		$(use_with xpm libxpm) \
+		--without-xvfb-run"
+
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cve-2017-17784.patch  # bug 641954
+	epatch "${FILESDIR}"/${P}-cve-2017-17785.patch  # bug 641954
+	epatch "${FILESDIR}"/${P}-cve-2017-17786-1.patch  # bug 641954
+	epatch "${FILESDIR}"/${P}-cve-2017-17786-2.patch  # bug 641954
+	epatch "${FILESDIR}"/${P}-cve-2017-17787.patch  # bug 641954
+	epatch "${FILESDIR}"/${P}-cve-2017-17788.patch  # bug 641954
+	epatch "${FILESDIR}"/${P}-cve-2017-17789.patch  # bug 641954
+
+	epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch  # bug 558878
+	epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch  # bug 395695, comment 9 and 16
+	epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
+	gnome2_src_prepare
+}
+
+_clean_up_locales() {
+	[[ -z ${LINGUAS+set} ]] && return
+	einfo "Cleaning up locales..."
+	for lang in ${LANGS}; do
+		has ${lang} ${LINGUAS} && {
+			einfo "- keeping ${lang}"
+			continue
+		}
+		rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
+	done
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use python; then
+		python_optimize
+	fi
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	prune_libtool_files --all
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(get_version_component_range 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	_clean_up_locales
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.9.8-r1.ebuild b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
index fc0e9d31d199..73a8c30f70ff 100644
--- a/media-gfx/gimp/gimp-2.9.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.9.8-r1.ebuild
@@ -49,8 +49,10 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	>=media-libs/libpng-1.6.25:0
 	python?	(
 		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygtk-2.10.4:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pycairo-1.0.2[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	>=media-libs/tiff-3.5.7:0
 	>=gnome-base/librsvg-2.40.6:2
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 31756e7a18c7..a8add4680ec1 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -65,7 +65,9 @@ COMMON_DEPEND="
 	postscript? ( app-text/ghostscript-gpl )
 	python? (
 		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	udev? ( >=dev-libs/libgudev-167:= )
 	unwind? ( >=sys-libs/libunwind-1.1.0:= )
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index 27f162bede23..34ab2622a22e 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,9 +1,3 @@
-AUX gnofract4d-3.14-desktop.patch 479 BLAKE2B cfb56a81893b0bc1d9ea1fe119e75ab4324b5f8022deadc3380ae39407e8278ae4c6e425cfacd3072246b5df2083fc513d31f5c40c5505a44fd76ee9a65dde1c SHA512 1b90e6ce53e3b346af48a680d2486a5b69de49f2059f6a02c0f6d722a52ca70165e2935818ca57d58d149625528b923a897c85a34381595b9aae94f0476f90b5
-AUX gnofract4d-3.14-manual.patch 914 BLAKE2B 20be2e073ba3fb8fe06647b091e152a5d29119fe25c88fdd9dba3ad1dbbc0330b2fa15b84348e17601c39bc6c5c1cd9316f5f165889959fbe46731c79b469a66 SHA512 591858a7ba5e28e24cb170b5a6d24b98fd060ca79257542f9b3bcbe26d476ae2331ffa991c5d1726d352223198077e61339277b05e65ef0975944694f74a46ce
-DIST gnofract4d-3.14.1.tar.gz 4660808 BLAKE2B f5125be0414b847f506686734e9234c3d88732be6f7cd0feb9cbe759d6e0584f8ce143d64de17a5fcca9b28d75ae922e00993140f0ccb793d10faadb3221b990 SHA512 bcec1d12c589cdee2f0da5555a075db511debd21d4536db66793f6a28be35656258daffd8cbaaff4b5af041b18ca77c94d910ec4d0c7e14960412c580fd56725
-DIST gnofract4d-3.14.tar.gz 862499 BLAKE2B dcca058b6a625b4d2f0153f896ed029b27b8e6135a310942c4b58bf5a6396977f5ca065061918e99034b6303a5634c5288cac90c887a8dfa87286d24f9f1d04f SHA512 cf3614f60a43f7ab20208fb1a62d3823495c84060d177d2926bad20a475e661d7ec45a7bc14e826229656027fe7c0f68aac093b6b0dc7912e84d8d8ec8ff81e5
 DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
-EBUILD gnofract4d-3.14-r1.ebuild 838 BLAKE2B faf89e7b8110f981fc500a83b10985e71bd60320a3ae1ff4048d9ecef5866399369e13c35904df5d0474afceab7e29c16d69322aac55bf0a7b12500ca97fc6f5 SHA512 639bbddf911d9314e99142e4f55ab968b0898293d8ddeabd286010faa9304a35cb280f39790028360b78e64c8722581239913b37e15e196631a5011b9fb6950a
-EBUILD gnofract4d-3.14.1.ebuild 1142 BLAKE2B b6ff0697afc901a6e4ce549f2c5a6012a191ccec2b36c26e9ca428e753f422e9759a87b3dad612d715f2f4647eb46a63c2ebf6855c077765c8f4f88b7f00ef06 SHA512 63e621da4294d0b18023ff8f6df66d657ca1fff0af0156d226f19ceaa675f75640798b0c5dca34ce9da19769fe355dbe5268b6fc61bbde26236e7b651bfc9ad5
-EBUILD gnofract4d-4.0.1_p1.ebuild 1586 BLAKE2B 9e9767bf940353b7521dfbf8ad98641f0249a22130ee22b9a936093effdb2df4275bec4757609dd86b9bfcff640d9bbc1f34fee000dfa5cda60eb701fee1245f SHA512 fd919929386aae4b36ab9bc65321042b1c26338054b651c0cadf9ee96975308f2111db06123fa987fa0f87ea68f1d3ea62142a495e0e96c59ebb56b4b741f5e0
+EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1666 BLAKE2B ca6a2f20b4cd279798a3a6e3ca9471cc530b131edde088cd511a0ee4f5c0bece2e7e27e5813b91ff66e79856892aa8695a51a764248589ce5661b64b787d1e5c SHA512 eca186d36beba57e9a77e36f8d60224867217f5f3ee6993c16665750a435a32736a82fcbd22077b0d65947dbbc78b6105378cabee51b4d0e294094a269537a68
 MISC metadata.xml 403 BLAKE2B f0bfac9f73e6c64e4535ff9dd389bd65bd622ba3aa0b64d52ef1f3b96a5cf0fbc4913c311b3e227fd9ac91c18f3d78aa9ae085c7610b06e768a39f6f5993121e SHA512 ed69568f628be6a938f2f2cd9a7a2610b881f437ec57eb12baf803b00ddb5f62e7d562a1743eaff5a3fc8d083802cac05ed965aa0d473846e94aa526e66babb4
diff --git a/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch b/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch
deleted file mode 100644
index ca521962460f..000000000000
--- a/media-gfx/gnofract4d/files/gnofract4d-3.14-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/gnofract4d.desktop b/gnofract4d.desktop
-index 4bf055f..b8dfc47 100644
---- a/gnofract4d.desktop
-+++ b/gnofract4d.desktop
-@@ -1,13 +1,10 @@
- [Desktop Entry]
- Version=1.0
--Encoding=UTF-8
- Name=Gnofract 4D Fractal Generator
- Comment=Generate fractal images such as the Mandelbrot set
- Exec=gnofract4d %F
--Icon=gnofract4d-logo.png
-+Icon=gnofract4d-logo
- Terminal=false
- Type=Application
- Categories=GNOME;Graphics;Math;
- MimeType=text/x-gnofract4d-fractal-parameters
--
--
diff --git a/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch b/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch
deleted file mode 100644
index ce1918b33286..000000000000
--- a/media-gfx/gnofract4d/files/gnofract4d-3.14-manual.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/doc/gnofract4d-manual/C/gnofract4d-manual.xml b/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-index 3cea223..0ce6e17 100644
---- a/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-+++ b/doc/gnofract4d-manual/C/gnofract4d-manual.xml
-@@ -2,7 +2,6 @@
- <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- 
- <!ENTITY stdlib SYSTEM "stdlib.xml">
--<!ENTITY commands SYSTEM "commands.xml">
- <!ENTITY tutorial001 SYSTEM "tutorial001.xml">
- <!ENTITY tutorial002 SYSTEM "tutorial002.xml">
- <!ENTITY tutorial003 SYSTEM "tutorial003.xml">
-@@ -625,12 +624,6 @@ see weird effects unless you disable periodicity checking.
- </sect2>
- </sect1>
- 
--<sect1 id="cmdref">
--<title>Command Reference</title>
--<!-- pull in auto-generated list of keyboard and mouse commands -->
--&commands;
--</sect1>
--
- <sect1 id="maths">
- <title> About the maths</title>
- 
diff --git a/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild
deleted file mode 100644
index 73a10f4e5557..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-3.14-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://gnofract4d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	>=dev-python/pygtk-2[${PYTHON_USEDEP}]
-	>=gnome-base/gconf-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	distutils-r1_src_install
-	rm -rf "${D}"/usr/share/doc/${PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild b/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
deleted file mode 100644
index 45040d6819ae..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-3.14.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-MY_PV=V_${PV//./_}
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://edyoung.github.io/gnofract4d/"
-SRC_URI="https://github.com/edyoung/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	>=dev-python/pygtk-2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/gnofract4d-3.14-desktop.patch
-	"${FILESDIR}"/gnofract4d-3.14-manual.patch
-)
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-python_compile_all() {
-	# Needs fixing to be able to generate commands.xml
-	"${EPYTHON}" createdocs.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -rf "${ED%/}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
new file mode 100644
index 000000000000..1563bc834fda
--- /dev/null
+++ b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 eutils virtualx xdg
+
+COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
+
+DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
+HOMEPAGE="http://edyoung.github.io/gnofract4d/"
+SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+doc"
+REQUIRED_USE="test? ( doc )"
+
+COMMON_DEPEND="
+	media-libs/libpng:0=
+	virtual/jpeg:0"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		$(python_gen_cond_dep '
+			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
+		')
+		dev-libs/libxslt
+		x11-libs/gtk+:3[introspection]
+	)"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	virtx pytest fract4d fract4dgui test.py
+}
+
+python_compile_all() {
+	if use doc; then
+		ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
+		"${EPYTHON}" createdocs.py || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	rm -r "${ED}"/usr/share/doc/${PN} || die
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gnome/help/${PN} || die
+	fi
+}
+
+pkg_postinst() {
+	elog "Optional missing features:"
+	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
+}
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
deleted file mode 100644
index 397401cf09f1..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 eutils virtualx xdg
-
-COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="http://edyoung.github.io/gnofract4d/"
-SRC_URI="https://github.com/edyoung/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+doc"
-REQUIRED_USE="test? ( doc )"
-
-COMMON_DEPEND="
-	media-libs/libpng:0=
-	virtual/jpeg:0"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		dev-python/pygobject[${PYTHON_USEDEP}]
-		dev-libs/libxslt
-		x11-libs/gtk+:3[introspection]
-	)"
-
-distutils_enable_tests pytest
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	virtx pytest fract4d fract4dgui test.py
-}
-
-python_compile_all() {
-	if use doc; then
-		ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
-		"${EPYTHON}" createdocs.py || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gnome/help/${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	elog "Optional missing features:"
-	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
-}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 6917049b114d..27a23edb4232 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,4 +1,4 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 DIST graphviz-2.42.3.tar.gz 26246717 BLAKE2B 71c61dcd056c9a2e2655c3be995d1da17b3af0d3374e74400fc38da11ab81849f7b5e528f99fc2046294958a4bab0a411ab204e434360f316a5367403472e8a1 SHA512 e03ca6da0ddb1162bd179d159d7dbb379d55012d63bb922aa800260fce52b65beb1a9b5ca1a5199ad3537201b0b4841efc9facee6e03065c6bd02e840f8a29c9
-EBUILD graphviz-2.42.3.ebuild 7811 BLAKE2B 8d796d79f93a9196fb0b863f98f0ef210c8698a10e70b4529c2511af11a66e266e47eca941ab0499169d66af1ce785f2221b9d4726ee3cb826231beb34c12bcb SHA512 de9f59adb32b0b1d4215490d7946e1812dd813cb800676a71aaa0cae0a47992fd869e4ef2272ef5c009419e836e35e351405dbaec75368d55bd0de9339ecebff
+EBUILD graphviz-2.42.3.ebuild 7801 BLAKE2B 2c37c5480316b56be87b2e04c696f9bbe8e37acfed73de99a7958f377f9c15ed4573cdc9bcb90055b42fed22cf3a42fdfe2c1dce47ba0c06ce3a994d152dbd81 SHA512 aaae718fadae30ac7afdacb87d02262515f6b7224b5b724cd77ea3c910dc85babdfb36cfff7045b13b8cfa12f3b6fca88627ebf970aba3e5524a3a0d5ec3d7ae
 MISC metadata.xml 2211 BLAKE2B 1c39235c1d8c2efce0596cda2d20bf1cf2e81643068f68215f31462b6320f7f31533877630aa3c2b2bc9a7f7856f7b27354a97bb2c61d7e63a6de86f569ed192 SHA512 f7689fe65e46905d48fb2e45c3ad2a1e8f4fcb572515fdd7dfa26cdd21ed1eaf52d8ecaab9c297f5e8df69a205337b8526e0304ddbdb8c4b3e82cb1e428a1e71
diff --git a/media-gfx/graphviz/graphviz-2.42.3.ebuild b/media-gfx/graphviz/graphviz-2.42.3.ebuild
index e0130b73420f..fd8cee3432be 100644
--- a/media-gfx/graphviz/graphviz-2.42.3.ebuild
+++ b/media-gfx/graphviz/graphviz-2.42.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
 
 DESCRIPTION="Open Source Graph Visualization Software"
diff --git a/media-gfx/gtkimageview/Manifest b/media-gfx/gtkimageview/Manifest
index f882c744da2a..b58571812185 100644
--- a/media-gfx/gtkimageview/Manifest
+++ b/media-gfx/gtkimageview/Manifest
@@ -1,3 +1,3 @@
 DIST gtkimageview-1.6.4.tar.gz 1158138 BLAKE2B b59abcbac71d4bd039bf9f3fc2f25f6590f91c4cc320cea90243a4889e020f1a54a3ca5d8a843f7482551ce8da6fafe6e3ce4fbc5a5e32fd6ceb4367b5abb9db SHA512 6378c640006e73aa1ffbf92eb9d4e42570707bc159f0a657b11f027d328088f5e89fc334de170de5ab1a39bed588b0b76f4633688a894cb7def16f1dea9f8e39
-EBUILD gtkimageview-1.6.4.ebuild 1218 BLAKE2B fb4f68ba9231d6b786da90e37852fffd5c5443098b72d761973986340a3643c57a730039bd3f1f67cb1652d0ae083a1bdc27cb99c9ee21f701405829695a47b2 SHA512 399b9c8325165fb25f5aa43a10c7a7aaa753b10f170de0430b2e1cb7fcc58a19b8aea60d356cd10c19f9ae2e79f36c0e29c51402509f46cc96fb69879a6dfbe9
+EBUILD gtkimageview-1.6.4.ebuild 1216 BLAKE2B 0ca91426de4420e01f0fca0703abaf35b556cf778ddd76bc48fa127a96370de4e1be2c8ff2f503dc5caf3d593c1b6cbfd35c4fe1a437c3b416cbb18596fe22ca SHA512 19462e54cafef1ff0547b9f85dd4cb0e52a274ad81d6bb5e1068f117d7c011175c4f38a5305c9b71d3a25947bff406cf576fe9e467862ca33fbafcf01ac0ff14
 MISC metadata.xml 259 BLAKE2B 0a31c91e9ff9700c8a5c77c6eb9ddad55c6b78e7e583213c20adc8e73248c7e8b31c9a11702a0b5a8b665acd2753c145362974d6c5c6aae1979c7845ab4b01d8 SHA512 6744883613ae3b83c57ec9604c5f31717ab714b4f3e7f4f680e4b9e54f622f8e5f753b3cd666862f0e3e6dc4223aee87b89aba472d9f20e1b317595e06aeae30
diff --git a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
index 4a33fe1c6f33..e7f1da0489bc 100644
--- a/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
+++ b/media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 # tests are severely broken, bug #483952
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest
index b9ff306bbb47..10d78a908965 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -1,7 +1,7 @@
 AUX hugin-2019.0.0-exiv2-0.27.1.patch 998 BLAKE2B fd072b1bfb995f3e63ca78b0ad288c6012e6256d8c268fde7b9d3e1fb346544d34807394ac45b244329d96d6e75347c7e06b8cffa44258dd9b59378f56ead112 SHA512 9127921810b9a3cbc7aa216cb961cf5d8eef04ab5beb6baef94851d25e32314dd0565e507e3e57d2d560b6079afcf54e16330935334835fe664842d337732643
 DIST hugin-2019.0.0.tar.bz2 10297887 BLAKE2B 59c4df340f01dc7fa72c08b575fe2449ac40b96ac2e925aaef0d7804df54db25df7b5901cb25a5da4d8e78c93c668081d535517c275cd1ccb40f5159e1c725e5 SHA512 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
 DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
-EBUILD hugin-2019.0.0.ebuild 2213 BLAKE2B b9a6ceedc6b49b493205f5f16ced5ccdc890f6d2f44c0e846a70a09857f5b4ab62b7d64e668f4114d22f3af7d5168cacdbfb95347ff1514b1f0cb64f6b3056f7 SHA512 4b8f7f1107245768e7de1b5ac7a18e65af3a2ec931eafcb525b92374b40894e124bbd6561651e21595a2a1b2f8996e5e3282591fadaef1efc7671afbe64302cc
+EBUILD hugin-2019.0.0.ebuild 2209 BLAKE2B 9206caa49b018f46613c673c26ebd555e6750e640aabff5753dd61a9c744d1718d6a05ab8298cb6d259e11e989d74c5a6224d1c77ea699448a377b9f839fbc10 SHA512 921e1aa1514125756ccba0ac9896978677ea4a1e5672c68eedd671bbd4e28e84f046c39ebddbe7f8489e32d93c9e4a637f8c9a9810ab8269913e4c60f83c0b8c
 EBUILD hugin-2019.2.0.ebuild 2188 BLAKE2B 3a8957b1f5c620503b18ad71475e67b01540e9893a9b3d904ba1656f519dc7efca50cce5c8b986909caa86591d91fbe4c0297b4a0b5ccf9fc23400e454d07862 SHA512 7662be470548fdb35376af51088442751bed2f55a612b40df0eb9dfd93a0dfcd62cf6194bc7641c543bb776d87c8ed517d6a299b2031f01ade06d5a31c2af13c
-EBUILD hugin-9999.ebuild 2062 BLAKE2B b1b80024aa6ff9133550bc152ebd32232bc9afe5cd0d12363b212d46aea9a7c2b93596753840296702819c5b96d01f53309a6140bf5471a18134cb551bdd6e34 SHA512 fe3f6b2d0a2cbc47737718c59c109530a8b9e764da22982cbcf1c0e4b3f35c6d2a84e66098faf677aa47805a0efc9af92c81db6f21c7cd7fb3fb0e43353f55f4
+EBUILD hugin-9999.ebuild 2058 BLAKE2B d7f7ab9b065dcc31cc85033a044b3e8da912779069709e2c1c02c3958744896c9c84cfb2bbf9c802b444e92ce6f6cd86d402254d3b2e5eb5f2b2b766eef069e0 SHA512 65ead2eab2416af88e8529704ee0c936901d3512558e1433eaff5ec3b3db5ba8659b2f72fd4613cc305afb9461003841ce7e3c04b8bbd201c8842ab7ddb5c5c7
 MISC metadata.xml 445 BLAKE2B ac876779272c1b22b648f4231a766d738bedf3b8a5a195fed926e6976531bc4653181a992bdcfaeaa6bdd9c79c21971025f207681490870209852d561aeeae78 SHA512 f2684887481f43030dbe01cf4df354511e4b294d53d7f7fbb9627cdddeb29709d806c6017f2c32557e4e6e288615ab2430fe7d102ea30072e1ea733d60177945
diff --git a/media-gfx/hugin/hugin-2019.0.0.ebuild b/media-gfx/hugin/hugin-2019.0.0.ebuild
index f5dd754fb2f4..1217aa9474d5 100644
--- a/media-gfx/hugin/hugin-2019.0.0.ebuild
+++ b/media-gfx/hugin/hugin-2019.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 448faaebbc26..3eb92a7c66c7 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit mercurial python-single-r1 wxwidgets cmake-utils eapi7-ver xdg
 
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index e9f318a85c1b..e51902325fbf 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -11,7 +11,7 @@ AUX inkscape-1.0_beta1-detect-imagemagick.patch 653 BLAKE2B 1e217306b083550d1f46
 AUX inkscape-1.0_beta1-do-not-compress-man.patch 454 BLAKE2B d680993be80d9069c7986f110d512643849f97fae81a8fdf1ab020a418dfbe44cc2bce3d71c8a79e8acac5170dfc01d084420a439d83f6f0e85706acdc8a0399 SHA512 3fc7ac0750a67b9d90d4ec0eed404ffdaa6910397849fa916eeacf5fb1e77cb0cb17f3f1ba99ad39f16610f2b3d7df387e35d36a0404fbd1fd0f857fa8be822b
 DIST inkscape-0.92.4.tar.bz2 31929728 BLAKE2B 892bf4ed913019b27a9b8897e3ae32c44152163ded0eb345d59915ffdc9818d29f210de3294ef1b05601141185b5e3b10779778551b860f31e7df5c659492c77 SHA512 b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
 DIST inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz 39508392 BLAKE2B fd48f22439d1182aff1db5afd74870a6c1d291afb310fc9fa5036fa3c2547ead8c17f6cd67f77a56f655c56af8ffaa7a349b17166c7b18ef3ddf234aa6e57805 SHA512 029508d4867ac0890b2c9c4d274408f849a17e8a7978853df38543d94e7c08d33546a8a40fbcd940da1ba847f11e37ff2bafa285174b65d45ee5de59e907e78f
-EBUILD inkscape-0.92.4-r1.ebuild 3861 BLAKE2B d471f26fb7d4724dbcff97236700e1ef7654d1d7fd42e348880133a82e72ddc48f2c103dd8ff25a4a552a711043b47d5c54f1f88503416048fce3db6f4bc9e5e SHA512 3948c06d7e5c29e5b3e4af75583e6425f78cd4eef4baf40bddc72bd91daf17dad131bab27d119320598b0d9175c0f69595b1630e5b5eb28ad861835580bd14c7
-EBUILD inkscape-1.0_beta2.ebuild 3897 BLAKE2B 9ec3d94630f97b36f2983b129b67879da4bfcd91cf5ccdbc09767e4c20272d18f0eafca4a2fcfae6a3cd2ede6f4f6355f2393c7351144e52abf35b8184185930 SHA512 e8ff06bd2f34ad265533384169e435bdb6a97194681109e2b32c9e56f97ae3f1ded6182b748543fd849ec60fd86c1eb6adc9e53f0e7fd052f7fd82718a854f5c
-EBUILD inkscape-9999.ebuild 3793 BLAKE2B 5b75509b673f6af853818e36ed610d861816b02e163cd019301193b6b3a919477e396005f30c8c244e6c3a26ed62e52618ccdb3c9e339d9a863f49f6b9fb7e3d SHA512 314586c90cdb19611b35e4594b14883d10a5d6553d80855458cfdd9b374381e9196c58bbaa506c2a1c3fb2d54418f6dc7f77621a434be64c7025459b11717cf0
+EBUILD inkscape-0.92.4-r2.ebuild 3836 BLAKE2B 39efa33d21c2ae8054827c76cfe451a60fbca48b12a4eeb106bd0b03895ecf02102df8fd2c28626d7daf4a720eaeb67d4e3642f214d9f4ad68b3c183826a4e47 SHA512 8c2304ac76e116472f726b952ebc3a47478ca78d50686c1594ea55555b7e39d1f1003118ec6572244735f871a18f55ec49391fbde3d327b204d518cf84978f03
+EBUILD inkscape-1.0_beta2-r1.ebuild 3976 BLAKE2B 683f82a3d9a6c38b300b32d7fa068d9a0f48742c795b96983479b97220fcc9f5b55c5fe5a0db1f4bbbb0db8e7b99ace1f7b6cf55099c53158db92f609b06f194 SHA512 3fa193291787d0cc72538254e0bb078ce1f52f1737a3d73507ec214b1ace7fd1ebd368dfe1bb520017b9204e15b1e504ba6e950c784e93bb4be628c99d287783
+EBUILD inkscape-9999.ebuild 3872 BLAKE2B c6c462f94bcdd5008970dc87ecedd04a92df986896e2d20549f4079abd7d89bc116d963591a84ed14b0088836ed9a9c077992f53a9f5bc453ef0057bf60e0212 SHA512 ff66fcc652da60c452fe883da71cfc09eeb9586595ff91355aa7466784112f872851e8c58acc5d35eac4d2779800ff517a73b013479fef5f35e33ba781fe2729
 MISC metadata.xml 951 BLAKE2B 5610cce03a912f378f4bbb997bb9acc028f2f02c1ec40034ed523b7f7cee2cc980f1f24fb8fbd26b40d494a514769b722ca64e93078c82ad75c9db94a9f19ca4 SHA512 f62078fa96c501f4d8e01d4e539b74b91cbf90997392e903e30db9c3a117c2ccc7f2d3e1c2e62c85362cd0a2d504dd565cfd70f92e5b947d416f8a3f2cd88f8e
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild
deleted file mode 100644
index 8550767b2694..000000000000
--- a/media-gfx/inkscape/inkscape-0.92.4-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
-
-MY_P="${P/_/}"
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
-IUSE+=" lcms nls spell static-libs visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.26.0:=[cairo]
-	>=dev-cpp/glibmm-2.54.1
-	>=dev-cpp/gtkmm-2.18.0:2.4
-	>=dev-cpp/cairomm-1.9.8
-	>=dev-libs/boehm-gc-7.1:=
-	>=dev-libs/glib-2.28
-	>=dev-libs/libsigc++-2.0.12
-	>=dev-libs/libxml2-2.6.20
-	>=dev-libs/libxslt-1.0.15
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/gtk+-2.10.7:2
-	>=x11-libs/pango-1.24
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:2
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	media-gfx/uniconvertor
-	dia? ( app-office/dia )
-	latex? (
-		media-gfx/pstoedit[plotutils]
-		app-text/dvipsk
-		app-text/texlive-core
-	)
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.36
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
-	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
-	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
-	"${FILESDIR}/${PN}-0.48.4-epython.patch"
-	"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
-	"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
-	"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i "s#@EPYTHON@#${EPYTHON}#" \
-		src/extension/implementation/script.cpp || die
-
-	eautoreconf
-
-	# bug 421111
-	python_fix_shebang share/extensions
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		$(use_enable openmp)
-		$(use_enable exif)
-		$(use_enable jpeg)
-		$(use_enable lcms)
-		--enable-poppler-cairo
-		$(use_enable wpg)
-		$(use_enable visio)
-		$(use_enable cdr)
-		$(use_enable dbus dbusapi)
-		$(use_enable imagemagick magick)
-		$(use_with gnome gnome-vfs)
-		$(use_with inkjar)
-		$(use_with spell gtkspell)
-		$(use_with spell aspell)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake -C src helper/sp-marshal.h #686304
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-	python_optimize "${ED%/}"/usr/share/${PN}/extensions
-}
diff --git a/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
new file mode 100644
index 000000000000..bc73e6c6f57d
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-0.92.4-r2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit autotools flag-o-matic gnome2-utils xdg toolchain-funcs python-single-r1
+
+MY_P="${P/_/}"
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.global.ssl.fastly.net/media/resources/file/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
+IUSE="cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex"
+IUSE+=" lcms nls spell static-libs visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.26.0:=[cairo]
+	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/gtkmm-2.18.0:2.4
+	>=dev-cpp/cairomm-1.9.8
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/glib-2.28
+	>=dev-libs/libsigc++-2.0.12
+	>=dev-libs/libxml2-2.6.20
+	>=dev-libs/libxslt-1.0.15
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/gtk+-2.10.7:2
+	>=x11-libs/pango-1.24
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	imagemagick? ( <media-gfx/imagemagick-7:=[cxx] )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:2
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	media-gfx/uniconvertor
+	dia? ( app-office/dia )
+	latex? (
+		media-gfx/pstoedit[plotutils]
+		app-text/dvipsk
+		app-text/texlive-core
+	)
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.36
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.92.1-automagic.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-cppflags.patch"
+	"${FILESDIR}/${PN}-0.92.1-desktop.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-exif.patch"
+	"${FILESDIR}/${PN}-0.91_pre3-sk-man.patch"
+	"${FILESDIR}/${PN}-0.48.4-epython.patch"
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.76.0.patch" #684246
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.82.0.patch"
+	"${FILESDIR}/${PN}-0.92.4-poppler-0.83.0.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i "s#@EPYTHON@#${EPYTHON}#" \
+		src/extension/implementation/script.cpp || die
+
+	eautoreconf
+
+	# bug 421111
+	python_fix_shebang share/extensions
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable openmp)
+		$(use_enable exif)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		--enable-poppler-cairo
+		$(use_enable wpg)
+		$(use_enable visio)
+		$(use_enable cdr)
+		$(use_enable dbus dbusapi)
+		$(use_enable imagemagick magick)
+		$(use_with gnome gnome-vfs)
+		$(use_with inkjar)
+		$(use_with spell gtkspell)
+		$(use_with spell aspell)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake -C src helper/sp-marshal.h #686304
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+	python_optimize "${ED%/}"/usr/share/${PN}/extensions
+}
diff --git a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..52bc56d18a54
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="xml"
+MY_P="${P/_/}"
+RELEASE_SUFFIX="_2019-12-03_2b71d25d45"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/"
+SRC_URI="https://inkscape.org/gallery/item/16197/${MY_P}${RELEASE_SUFFIX}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
+openmp postscript spell static-libs svg2 visio wpg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12
+	>=dev-cpp/glibmm-2.54.1
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40
+	>=dev-libs/boehm-gc-7.1:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	net-libs/libsoup
+	sci-libs/gsl:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.37.2
+	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	dbus? ( dev-libs/dbus-glib )
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	spell? (
+		app-text/aspell
+		app-text/gtkspell:3
+	)
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.65
+"
+
+S="${WORKDIR}/${MY_P}${RELEASE_SUFFIX}"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch
+	"${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_DBUS=$(usex dbus)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=$(usex lcms)
+		-DWITH_NLS=$(usex nls)
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=$(usex !static-libs)
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# No extensions are present in beta1
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+}
diff --git a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
deleted file mode 100644
index fe3ac5ac3a7c..000000000000
--- a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml"
-MY_P="${P/_/}"
-RELEASE_SUFFIX="_2019-12-03_2b71d25d45"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
-SRC_URI="https://inkscape.org/gallery/item/16197/${MY_P}${RELEASE_SUFFIX}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls
-openmp postscript spell static-libs svg2 visio wpg"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
-	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	net-libs/libsoup
-	sci-libs/gsl:=
-	x11-libs/libX11
-	>=x11-libs/pango-1.37.2
-	x11-libs/gtk+:3
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	dbus? ( dev-libs/dbus-glib )
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	spell? (
-		app-text/aspell
-		app-text/gtkspell:3
-	)
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.65
-"
-
-S="${WORKDIR}/${MY_P}${RELEASE_SUFFIX}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0_beta1-detect-imagemagick.patch
-	"${FILESDIR}"/${PN}-1.0_beta1-do-not-compress-man.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=$(usex lcms)
-		-DWITH_NLS=$(usex nls)
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# No extensions are present in beta1
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-}
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 1a10390a90dc..bc57307639b5 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -40,9 +40,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
 	dev-libs/popt
-	dev-python/lxml[${PYTHON_USEDEP}]
 	media-gfx/potrace
-	media-gfx/scour[${PYTHON_USEDEP}]
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/libpng:0=
@@ -51,6 +49,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	x11-libs/libX11
 	>=x11-libs/pango-1.37.2
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		media-gfx/scour[${PYTHON_MULTI_USEDEP}]
+	')
 	cdr? (
 		app-text/libwpg:0.3
 		dev-libs/librevenge
@@ -84,7 +86,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # install these so we could of course just not depend on those and rely
 # on that.
 RDEPEND="${COMMON_DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	dia? ( app-office/dia )
 	postscript? ( app-text/ghostscript-gpl )
 "
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index f978a1d4bb82..540055d51ebe 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,6 @@
+AUX kphotoalbum-5.6-crashfix.patch 1755 BLAKE2B bab46b6f8e28a946165e72ec7931e9ecf355c340b111662c4b7b14c1a0f6024d63a54f1f5ff8337e43387c278394ff911068018560d8456311a17e5946be44ec SHA512 864ff03a92e7a4726fd847e543b9e53192a18196008f58376c28825caa6a04fb0f5c81535f0714031ceb523510fa19a043ace71e27e5a7aacf7a1d07e71e3a0a
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
+DIST kphotoalbum-5.6.tar.xz 11773088 BLAKE2B 933e29a71bbdb678936c1d466894468a62ee0a8903ebbe21d0d9ace619b8b2ceaeaec12bc955bf1513cb53eedc85faa6291549a5f87784323c9c5b556f76d3b3 SHA512 7e950494a9fe591062e488d08f9e675dd0aacacbea640619461cd3bb0ac2fe945f189fe1e30c69614e9ed3751ac3ddfe84d943a0aa2d2f35fc5cd733002938f5
 EBUILD kphotoalbum-5.5.ebuild 1496 BLAKE2B c1196e3b012258e8170c3a8c27318c55c4cb4e4129959be04078de5b0c9714af0fcf0e6774356ad518b4d62326a15eae08ee95cd280eadbd6819ed5c41852352 SHA512 9795d6c59b50bd328c7a5556441abbaa108c308398782e9172ab0617025a0769cfbce3ea0e46f5df1eedfd609f8bbb91638a4c964517adf950efaef8408cda2f
-MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
+EBUILD kphotoalbum-5.6-r1.ebuild 1775 BLAKE2B 21f528296b083240c19671ee6da362e66459f0a91d4c17c92101084d7cb9871e869f904cb7ec19b7d0f87bc2beb5989c24237994fb383bfedc4584c1494dd820 SHA512 b79bce8f53e1e34dfb2de28e0fcd1e0b3f5ac5689d51a489ca43b2f6680d54c951da6c5cad2c27bddbcea59a5132ff62c53798688dd883817de4e990f473d404
+MISC metadata.xml 524 BLAKE2B 9c5dbf76aa448c13bcd650ca6487650f85aa1b961f2c39555cfe97bb94959d79d1c15f9d2836473c564d35a370b2f36efafe29ca8ebf18d97c02374648af9078 SHA512 b8147da9bc6da4da7d9603be758780f6244aa78979f1e2e7bc8f4b578b16cf798b449221b3603c39186fa84c17227ba3fc4976748285ea04ecaf4e3e71cd8f00
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
new file mode 100644
index 000000000000..96b752bf075a
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch
@@ -0,0 +1,41 @@
+From 583e10e8356d2ed64f0358ebf107bff35a98db31 Mon Sep 17 00:00:00 2001
+From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
+Date: Sun, 9 Feb 2020 22:51:15 +0100
+Subject: Fix crash when associating a tag with an area.
+
+If a tag is being associated with an area, the context menu has two
+levels: the direct "associate with <last added tag>" and the sub-menu
+"associate with..." followed by a list of tags.
+
+Each version uses a different function signature for
+ResizableFrame::associateTags. When refactoring connections to the "new"
+signal-slot syntax in commit c38f5136 (thus released in version 5.6), I
+applied the wrong signature to the connect statement.
+
+This resulted in a crash/failed assertion when selecting a tag in the
+described way.
+---
+ AnnotationDialog/ResizableFrame.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/AnnotationDialog/ResizableFrame.cpp b/AnnotationDialog/ResizableFrame.cpp
+index f2dba86..44175fb 100644
+--- a/AnnotationDialog/ResizableFrame.cpp
++++ b/AnnotationDialog/ResizableFrame.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2014-2019 The KPhotoAlbum Development Team
++/* Copyright (C) 2014-2020 The KPhotoAlbum Development Team
+ 
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public
+@@ -522,7 +522,7 @@ void AnnotationDialog::ResizableFrame::addTagActions(QMenu *menu)
+                     submenu->addAction(createAssociateTagAction(tag));
+                 }
+ 
+-                connect(submenu, &QMenu::triggered, this, QOverload<>::of(&ResizableFrame::associateTag));
++                connect(submenu, &QMenu::triggered, this, QOverload<QAction *>::of(&ResizableFrame::associateTag));
+             }
+         }
+     }
+-- 
+cgit v1.1
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
new file mode 100644
index 000000000000..5c27d00b9ab8
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tool for indexing, searching, and viewing images"
+HOMEPAGE="https://www.kphotoalbum.org/"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
+IUSE="+kipi map +raw share"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/phonon[qt5(+)]
+	virtual/jpeg:0
+	kipi? ( kde-apps/libkipi:5= )
+	map? ( kde-apps/libkgeomap:5 )
+	raw? ( kde-apps/libkdcraw:5 )
+	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+	kipi? ( kde-apps/kipi-plugins:5 )
+"
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package kipi KF5Kipi)
+		$(cmake_use_find_package map KF5KGeoMap)
+		$(cmake_use_find_package raw KF5KDcraw)
+		$(cmake_use_find_package share KF5Purpose)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index 2a675ce364ee..ecd49551d433 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -8,5 +8,6 @@
 	<use>
 		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
 		<flag name="map">Enable map display support using <pkg>kde-apps/libkgeomap</pkg></flag>
+		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 3efc287cc1b0..ccd2288d7b92 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,6 @@
 AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4 SHA512 5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
-EBUILD krita-4.2.7.1.ebuild 3042 BLAKE2B 02884d42141bb22b222fa82a619f380c6a22dc6aa0ca0d61f5668259de8a45a23282c333d13e8e006898257672232284a3bbd7a23f37c18a69f300a6de3b5e1e SHA512 63119789211cf958b8352f700a4409e2885d002559d2d9da8cf4fd00fe13578711357a2d863db68b3e34b8bf8eee4f239a95c081cba47c1940187f5d44e8c7eb
-EBUILD krita-4.2.8.2.ebuild 3035 BLAKE2B c61d765ddf20ee41a52ae5f8c4e74224df47d154d0983a025dd8a6268be4d2fc41fac0cbb7b2cc604063f7a5e998497a34233767daeff389d2110559720397db SHA512 8912086f449982aba8edad2f502483e9319eafa45d4c53772aad363df418fd5da2be7330d7e4b7cdf5989cc7ade49943e696d22394a60d9ac83adb7cf398c8c7
+EBUILD krita-4.2.7.1-r1.ebuild 3085 BLAKE2B d74af4a0f54c2d32891331f56af901c53784dfc5225107f6964e0d3233c6bde8ef7448886fac2452e97086b6a0f7274d318c500d579bb1f26f012fcf9dc7d671 SHA512 a21571b44aad77ad5e6d2bed068f2bd847ebe1022604c4e5c7df13439d38811312e4d0943dfb30f276105e52278055c17ab36c04fcb8621be022ca9dde428bd8
+EBUILD krita-4.2.8.2-r1.ebuild 3078 BLAKE2B f750a48f852abf028e06ea9c68c1dffe7fa0d855e9be0d5c426825e0e1155c089f114022d7be8355e441701dde776bb516fe9e06288284050ffd92c756a8e684 SHA512 27c41cba15503acb849278c14678228a445ec0534d80d370200a68f9ab5bfa48d13d903ce9f6bbeffa8aba757ebee8e43e75638575b49cc51844cdc97a5e7cb1
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.2.7.1-r1.ebuild b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
new file mode 100644
index 000000000000..2d2e1b4c6547
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://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}"
+
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+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 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' '' '5=')
+	$(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-libs/quazip
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	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}
+	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.2.4-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_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}
diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild b/media-gfx/krita/krita-4.2.7.1.ebuild
deleted file mode 100644
index 4c9525d74aae..000000000000
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://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}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-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 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' '' '5=')
-	$(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-libs/quazip
-	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/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}
-	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.2.4-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_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-4.2.8.2-r1.ebuild b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
new file mode 100644
index 000000000000..2348b287dfb9
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional-recursive"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[-gles2]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	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-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-gfx/krita/krita-4.2.8.2.ebuild b/media-gfx/krita/krita-4.2.8.2.ebuild
deleted file mode 100644
index 99703d1a2126..000000000000
--- a/media-gfx/krita/krita-4.2.8.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	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-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 0bbe78e07288..592b446c5d1a 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -4,6 +4,6 @@ DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234
 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 EBUILD libimagequant-2.11.7.ebuild 1147 BLAKE2B 41943e15f697966749897fd14aec98dec919ce81189ec5f481517d14eb94a91b95b0b0cdc9f057854a745a2fea5ccf094411900db06eb54dc6aeba410521e871 SHA512 ec8d4ce66233a74974ff6edb4c67dcf5d7f12f4535001bb770d70a995cc5a9b2600f900777fc1996335d49f85efe10a3dc21e547c2b535c68720ee455ec4352f
-EBUILD libimagequant-2.12.2.ebuild 1406 BLAKE2B 69cf7e6dacb7b6b11089a2586f195471ce96b3b55a21badb93d14292ff7a79e783ecb357b0231af715848c2af8d5f11cd71e54f96e479db0c1ed76f163736a77 SHA512 7f7d6fe3f448c506b85cc8e3000b09777dce49f107a621d18b49b047ab222b341632eca299c9641dbdbc0313f79d37573cfcfa9c8de4961f41e96d456de2259c
-EBUILD libimagequant-2.12.3.ebuild 1408 BLAKE2B 4461d184fd6e5af9d598cf4cd4d9d75014eb2d4c41137c5bbce1c099b4ecdffa2f5fb0bf5c84f0854973dbe04ea62e042f9a62f48a681d8d30ec91ac3a0941ee SHA512 8bb3ae3fcf20c8f57e43b6465abfc2c0ecd6d5e12d455c566f541f4d021a1f2a3c134b1006aa5b8bf1e1d8a32d9aaf26c0e50e6a2dcda4b879c988fd3fa4b0c3
+EBUILD libimagequant-2.12.2.ebuild 1402 BLAKE2B 0ee7dbd64971bbad9082cc26a742e42abca7ba6230d8eb9ae8445e7c9460486893afbc561557e474639f1b3146615dcddb8d92c8b69476dc79f93ab14c7ca0f9 SHA512 a5985fea8bb1f48f1205eb6bc70e9dd6d93e42bab5a6417d90306f93e7737dba30c73d1a1ec1add93dcadef5d617828279ab0fa43148f5e0a9357aa1b7f6bd73
+EBUILD libimagequant-2.12.3.ebuild 1404 BLAKE2B 6056841304b2b31bb15d2554083fd2352b4f794b2df2b1077c2ab27ad383bf783a068e27c0c10e6a20b675931910b62b8bedcd13fb2af7d39ad3ad3eed21a488 SHA512 b468bcc5dd8d43d957f52ab8babd0b9dc14470f7d2413cf7f8fddd453336046db03b7fcfb9882b62023b7ea343b6b95d1b6ebe1ff4fd2ed0266598c3050298bd
 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
index de044c9bcfc7..ef2a9b8c654a 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
@@ -30,8 +30,8 @@ src_configure() {
 	tc-export AR CC
 	# Hand rolled configure script, so not all flags are supported.
 	./configure \
-		--prefix="${EPREFIX%/}/usr" \
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use debug && echo --enable-debug) \
 		$(use_enable cpu_flags_x86_sse2 sse) \
 		$(use_with openmp) \
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index 053745426699..c04b34f09632 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
@@ -30,8 +30,8 @@ src_configure() {
 	tc-export AR CC
 	# Hand rolled configure script, so not all flags are supported.
 	./configure \
-		--prefix="${EPREFIX%/}/usr" \
-		--libdir="${EPREFIX%/}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use debug && echo --enable-debug) \
 		$(use_enable cpu_flags_x86_sse2 sse) \
 		$(use_with openmp) \
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 6cd4dc9f69d8..7bebf1f375d0 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b
-EBUILD mypaint-1.2.1-r4.ebuild 1893 BLAKE2B 9dcb7eea376b676720cf638aa48664e307676d0125cc6c0ef6b451e6eac84d54f05e8775d9faaf99f8c4b0eef89d7999ea028dedad3205ae8f8bfc7b9979309e SHA512 1136db76fd4c71255f693f06981fcdf4f6220a4315ba26213168e4c8345d2d42d18ac380b9c50f6aeb97a53b8fc87994738e50f8c58f535f35a6d55701102ff3
+EBUILD mypaint-1.2.1-r5.ebuild 1959 BLAKE2B 2275a7b1cd2792808f710ebecd9545accccf935c8e27557474e8af53a64dc697da551df4158dcf72cdea480fa548e1c6617eb1aa2ace433d86f6237bb924a8b4 SHA512 7d220b043c0186402d2ef9a79cefc220f32d22b370eb64335d92d271b670d7d70aad9c5a9810617d450d6ffe0a28e6f0f93518d74d0bd04b97f9dcde6e2a5208
 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild
deleted file mode 100644
index d30ef32ed435..000000000000
--- a/media-gfx/mypaint/mypaint-1.2.1-r4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic gnome2-utils scons-utils toolchain-funcs python-single-r1 xdg
-
-DESCRIPTION="fast and easy graphics application for digital painters"
-HOMEPAGE="http://mypaint.org/"
-SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	>=dev-libs/json-c-0.11:=
-	media-libs/lcms:2
-	>=media-libs/libmypaint-1.3.0
-	media-libs/libpng:0=
-	gnome-base/librsvg
-	sys-libs/libomp
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	# Workaround scons bug with locales. Bug #352700
-	export LANG="en_US.UTF-8"
-	tc-export CC CXX
-	strip-flags  # scons upstream issue #3017
-	escons
-}
-
-src_install () {
-	escons prefix="${D}/usr" install
-	newicon pixmaps/${PN}_logo.png ${PN}.png
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm -rf "${ED}"/usr/share/locale/${x} || die
-		fi
-	done
-
-	python_optimize "${D}"usr/share/${PN}
-	# not used and broken
-	rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
-	# already provided by system-libmypaint
-	rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
new file mode 100644
index 000000000000..a55e00599696
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic gnome2-utils scons-utils toolchain-funcs python-single-r1 xdg
+
+DESCRIPTION="fast and easy graphics application for digital painters"
+HOMEPAGE="http://mypaint.org/"
+SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/pycairo-1.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
+	>=dev-libs/json-c-0.11:=
+	media-libs/lcms:2
+	>=media-libs/libmypaint-1.3.0
+	media-libs/libpng:0=
+	gnome-base/librsvg
+	sys-libs/libomp
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_compile() {
+	# Workaround scons bug with locales. Bug #352700
+	export LANG="en_US.UTF-8"
+	tc-export CC CXX
+	strip-flags  # scons upstream issue #3017
+	escons
+}
+
+src_install () {
+	escons prefix="${D}/usr" install
+	newicon pixmaps/${PN}_logo.png ${PN}.png
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			rm -rf "${ED}"/usr/share/locale/${x} || die
+		fi
+	done
+
+	python_optimize "${D}"usr/share/${PN}
+	# not used and broken
+	rm -r "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
+	# already provided by system-libmypaint
+	rm "${ED}"/usr/share/locale/*/LC_MESSAGES/libmypaint* || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 150fe89a2c50..b08243215bd2 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -2,8 +2,10 @@ AUX opentoonz-1.1.2-gcc6-no-throw-in-destructors.patch 1469 BLAKE2B cb25eaa0b3e4
 DIST opentoonz-1.1.2.tar.gz 36777909 BLAKE2B d822218c5ea1843a50da8d799bd9edf6998bd424ec2b65600371a0ae9f69aaea0d1c45aa53c3a0287c67459b8101a82bc0c339510859f4fbac3a116c9671df08 SHA512 800a741cb40e7dede79ef92705fc8fe3a23524c8a4397c30f80a81a7513c98606fb1bb5574188969ba08cfe8995d679f9fc5ecb696a6ac14c48aa2646a2c871e
 DIST opentoonz-1.2.1.tar.gz 39843446 BLAKE2B f9035bab5c6fa1d86459b401ca94acbffe8e38a2f5ec2bc97f303c7e829b9f6695480e7ab7a7560909f6ce45109ca1704d5020ff774964b5ed72b1b01588e93b SHA512 3eaf5983b5ec7424338e25975228b9bf6e9da61b2699c52377528966ecf07971868426bda0a64c780c2876cc1f0e4adb63c46767e8099fbfe32a8d1586c13f44
 DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
-EBUILD opentoonz-1.1.2.ebuild 2152 BLAKE2B bbad89bf0799119e05e7ec8e900e786f28e51d4609874e7b676922ab8cc8ecb4506652f836e40778d3963eaea2cf9ec58c8da8fde68393455e60f82868ae3913 SHA512 62ca55a27d0e4ca42f274747b530221e003e67774fb822969f1b7e4e77eb80b961894a6362c45633c642dcbb1e35572ca77056d7cf43fede9f632789bb53aa35
-EBUILD opentoonz-1.2.1-r1.ebuild 2186 BLAKE2B cbd057c9b0cc2830f4168a5e044abd28d59e9395b51341463f204837c0e7a91f0c3a12905a34e06368b4d7f328a743c68808062754dba85d331d69b992970e2b SHA512 0ab9b5ec34212e2ded9a7b80efa8150b2bf4197d43dea613529f782bb1c2470b34beebb244bb38a79e4634e742ff67a9b482c4922d3f78432ae7c81b0dcdfe24
-EBUILD opentoonz-1.3.0-r1.ebuild 1903 BLAKE2B 3761c8c26faa082c4c76704a6f1b17a3d4700181e03f219228f7d33d11574a6485f62d9fe43caa874cb6a86534adc7b7ccb1de5650903a9132b9b9df1e1e2f02 SHA512 c6bb11fecaa28c0789d2c9acb3289b218d3eb673a94c8730bb09f465a6768a17288015751c3a0390ea22832868ada1686545cc2365c7915aeaaf9da215346077
-EBUILD opentoonz-1.3.0.ebuild 1914 BLAKE2B bc234169777f8e3ba8528ffdc7651f8a54b705b3d4928e072de752f9140fe97d760e82d5d07292a230caa9e29d8fe213c7be0ed9466a2ee06c8ac39923466f58 SHA512 eb89c56318659db87a84122dcdb4c75a7492ca98fe49025eb5b825756d81db43130d7b730d5d893372ff4d1b605577e10fa8c37ad1be0a1609c99f992c9e9f8e
+DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
+EBUILD opentoonz-1.1.2.ebuild 2148 BLAKE2B 5c1adbbc2ac37a1c7f86a8c73068157c4eb71bcb0337801e278e60e8588ad4e3f4e4a8895e26016ff335178cf52634acb2d17af94c6d018eeb726a5a5e650074 SHA512 5c1e8613c74b4462f912c7ca61430524fa34b5818728a8aad5bb60bb5a4976dbf571848bd7c29de40fda3294f07dd085cda479e0715c6b2a236a54da8767d0ac
+EBUILD opentoonz-1.2.1-r1.ebuild 2182 BLAKE2B e534e83b2ec8e80b0b4a66ee20f96b95d8f0bd5cab0a39f3aa0e7705a264a9b3047fff1700f4eed91b410840d8e9b6adbe312d6026abb0bfcf331c4bc23c482c SHA512 74ebde75e7d947e2a8e4a2fe1137fd95df85a8e8c89ca5654a7d4cb64c0a7bb96fbb368c553a521f4ecd6aea5d105c1bf7cf633326744ec9d81da781284ac42e
+EBUILD opentoonz-1.3.0-r1.ebuild 1899 BLAKE2B c93035dac4262df5c652b9fe16342fc50436408db9e29189c7dd0286ddb2e40db40ce2304436b396ce5e22f3b7f5e05b1777edde23d651474c240aaea6948dd6 SHA512 c8c35a99f037e2adce3b04ad312ea0f06590eb1dd31f0ad55769e58a80a2006334db2c1fe13fb3ef2f500edaaec43fea3c0bdec751db3e17db5fde93be16e3ff
+EBUILD opentoonz-1.3.0.ebuild 1910 BLAKE2B a119751d568e41f56b5a70f75431a5353002e8504dbc46ca0c6bfd0a817338bf468c91228740c1af3c01af5253278027082627955b8a7b3e9d813ab3630707ff SHA512 912bf4afdf94ba6d8fcf6e764144812a2c1a8b6d6b55cb9fc78e1bcc97ba89bf0d6a888a6803551cac305645ce5da9a6cd0a0647bf1ba3445c1c8db3086b02fa
+EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B 63407ff2f79ce44b991ca53ffa0d606f605f203cae9ce95749293afc29e25f9802061884d1425e82c5a43da4a6fd477087dff9da03faa53e11e92482ce74cf4a SHA512 66e8e879c11a5bd55a9125f786bf2bad513def93eb95113f79c1172202365bcad8a9f655a9fc39459d529427590e1182e0b636eb3bc1ef5187e4c2e6e0c265a3
 MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
index ed5cd3d6884d..41ec70caafc7 100644
--- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild
@@ -54,8 +54,8 @@ src_configure()
 {
 	local mycmakeargs=(
 		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
index bcb59bf1a284..8906b6e2ae54 100644
--- a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild
@@ -53,8 +53,8 @@ src_configure()
 {
 	local mycmakeargs=(
 		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
index 9921de91c2f5..7f206e2ccf0f 100644
--- a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
@@ -52,8 +52,8 @@ CMAKE_USE_DIR="${S}"/toonz/sources
 src_configure() {
 	local mycmakeargs=(
 		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
index a73803cb0e07..760fe526d498 100644
--- a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
+++ b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild
@@ -52,8 +52,8 @@ CMAKE_USE_DIR="${S}"/toonz/sources
 src_configure() {
 	local mycmakeargs=(
 		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
 		-DCMAKE_SKIP_RPATH=ON
 	)
 
diff --git a/media-gfx/opentoonz/opentoonz-1.4.0.ebuild b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
new file mode 100644
index 000000000000..cccd2e4ca023
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.4.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://github.com/opentoonz/opentoonz"
+SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD libtiff"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+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:=
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib
+	virtual/cblas
+	virtual/libusb:1
+	virtual/opengl
+"
+DEPEND="
+	${RDEPEND}
+"
+
+CMAKE_USE_DIR="${S}"/toonz/sources
+CMAKE_MAKEFILE_GENERATOR=emake
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd thirdparty/tiff-4.0.3 || die
+	econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${S}"/thirdparty/tiff-4.0.3 || die
+	emake
+
+	cmake_src_compile
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index fc6521dc0b97..7e890192290d 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -4,6 +4,6 @@ AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B d6508
 DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
 DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
 DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-EBUILD openvdb-4.0.2-r2.ebuild 2067 BLAKE2B ff4e79f2e30a1a9669b6542835ca3f5c010eb9431aad10216e002fa49780253feec6175edd793593e7ef66dc5d415e997f6466d8b4336174cd91a032b8f081cf SHA512 0d1d47dd858e5be0bb00828bfbe3ece2c0ec56f48395b7c0c3d2c621f5be53192a5fa8001d241496231c6428d1824842f7721a06518b88b160e3e6bbd3d5479e
-EBUILD openvdb-5.2.0.ebuild 1802 BLAKE2B 07280548100cbfc4ac8dda53e6622f51910f6fea6700b3eaa20caba8d3587654266347c45487bf922cb024582bbb2dc634c7578650ec876ed379e3a1a1f6b07a SHA512 61a0bc1ae582ab57e6ab19e8aeb7a405b1253966b91f46387455f17f05b2f723d02f4d8d7d3ad63996b00c7dbee1a90f259b1f7bcbc78d9bab3383144f78a228
+EBUILD openvdb-4.0.2-r3.ebuild 2137 BLAKE2B 3d899278e4496b9d1d0d6a7d8d3b708e160409ec10e0a7a1390d9a68ec165cae1f09b0194581fbf4de91fb4093547077a52a6633b64db8661ccc1e8f69d0be38 SHA512 30d53679c8e6e9d553d4a8828ec4a876bc98b69dd248a616c5a821a12c5db56a2ac8f392f9f4dd40b0532cbdcce8871c0c9fc3f3016ae816bd175f54b6469d34
+EBUILD openvdb-5.2.0-r1.ebuild 1872 BLAKE2B c057d4625a41784f401c9426feceee90aa947490a6b643e41eaff70c9c45482d479afc3f219744cc172b48749ea1cf59214155d5ba0b567eebc4f973c919ae46 SHA512 55f6b579fbd4f96b7145d33d9d6ec756093b2054ae109d7e62022a28387d33076b2917020722bc8a143068af7ae19f2835b29c1a5d226f4ea3cb8e7b4fd99130
 MISC metadata.xml 1033 BLAKE2B 303f49be8253322a0bbb94875f7b9b03e127e9d2ab2eea64fbac1cd51f50d5be749c4c45c9491fbf3f56de7420fdb47913b6ef3c2d12f5ea0545042f68d990d4 SHA512 a81a1cd4684197d1d9455b1398c9ba1592d596d52c8e8fc5c0cc8de0357c1f1df7478fd76e4e42cda09524b0bbf41985e13cf530adb7ca7f1605f086207301a8
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
deleted file mode 100644
index e54468f1c2a1..000000000000
--- a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils flag-o-matic python-single-r1
-
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+abi3-compat doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
-	>=dev-libs/c-blosc-1.5.0
-	dev-libs/jemalloc
-	dev-libs/log4cplus
-	media-libs/glfw:=
-	media-libs/openexr:=
-	sys-libs/zlib:=
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	dev-cpp/tbb
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[latex] )
-	test? ( dev-util/cppunit )"
-
-PATCHES=(
-	"${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
-	"${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch"
-	"${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch"
-	"${FILESDIR}/${P}-findboost-fix.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	# To stay in sync with Boost
-	append-cxxflags -std=c++14
-
-	local mycmakeargs=(
-		-DBLOSC_LOCATION="${myprefix}"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DGLFW3_LOCATION="${myprefix}"
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DTBB_LOCATION="${myprefix}"
-		-DUSE_GLFW3=ON
-	)
-
-	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
-	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
new file mode 100644
index 000000000000..c683e96e7099
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-4.0.2-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake-utils flag-o-matic python-single-r1
+
+DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org"
+SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+abi3-compat doc python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	>=dev-libs/c-blosc-1.5.0
+	dev-libs/jemalloc
+	dev-libs/log4cplus
+	media-libs/glfw:=
+	media-libs/openexr:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+DEPEND="${RDEPEND}
+	dev-cpp/tbb
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[latex] )
+	test? ( dev-util/cppunit )"
+
+PATCHES=(
+	"${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
+	"${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch"
+	"${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch"
+	"${FILESDIR}/${P}-findboost-fix.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}/usr/"
+
+	# To stay in sync with Boost
+	append-cxxflags -std=c++14
+
+	local mycmakeargs=(
+		-DBLOSC_LOCATION="${myprefix}"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DGLFW3_LOCATION="${myprefix}"
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
+		-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DTBB_LOCATION="${myprefix}"
+		-DUSE_GLFW3=ON
+	)
+
+	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
+
+	cmake-utils_src_configure
+}
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
new file mode 100644
index 000000000000..acb7886d4438
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-5.2.0-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake-utils flag-o-matic python-single-r1
+
+DESCRIPTION="Libs for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org"
+SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+abi4-compat doc python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	>=dev-libs/c-blosc-1.5.0
+	dev-libs/jemalloc
+	dev-libs/log4cplus
+	media-libs/glfw:=
+	media-libs/openexr:=
+	sys-libs/zlib:=
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.62:=[python,${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+DEPEND="${RDEPEND}
+	dev-cpp/tbb
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[latex] )
+	test? ( dev-util/cppunit )"
+
+PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+	"${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myprefix="${EPREFIX}/usr/"
+
+	local mycmakeargs=(
+		-DBLOSC_LOCATION="${myprefix}"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DGLFW3_LOCATION="${myprefix}"
+		-DOPENVDB_ABI_VERSION_NUMBER=$(usex abi4-compat 4 5)
+		-DOPENVDB_BUILD_DOCS=$(usex doc)
+		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
+		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
+		-DOPENVDB_ENABLE_RPATH=OFF
+		-DTBB_LOCATION="${myprefix}"
+		-DUSE_GLFW3=ON
+	)
+
+	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
+	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
+
+	cmake-utils_src_configure
+}
diff --git a/media-gfx/openvdb/openvdb-5.2.0.ebuild b/media-gfx/openvdb/openvdb-5.2.0.ebuild
deleted file mode 100644
index 3bbdbdb4fb2a..000000000000
--- a/media-gfx/openvdb/openvdb-5.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils flag-o-matic python-single-r1
-
-DESCRIPTION="Libs for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+abi4-compat doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}]
-	>=dev-libs/c-blosc-1.5.0
-	dev-libs/jemalloc
-	dev-libs/log4cplus
-	media-libs/glfw:=
-	media-libs/openexr:=
-	sys-libs/zlib:=
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	dev-cpp/tbb
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[latex] )
-	test? ( dev-util/cppunit )"
-
-PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	local mycmakeargs=(
-		-DBLOSC_LOCATION="${myprefix}"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DGLFW3_LOCATION="${myprefix}"
-		-DOPENVDB_ABI_VERSION_NUMBER=$(usex abi4-compat 4 5)
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DTBB_LOCATION="${myprefix}"
-		-DUSE_GLFW3=ON
-	)
-
-	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
-	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/sigal/Manifest b/media-gfx/sigal/Manifest
index 2e0c901c3f82..f441be68e6ca 100644
--- a/media-gfx/sigal/Manifest
+++ b/media-gfx/sigal/Manifest
@@ -1,3 +1,3 @@
 DIST sigal-1.3.0.tar.gz 3267422 BLAKE2B 0be6dc6b92c8681e47ad7094004793fe78fd8974075958374268bb55f6d2deb903b5ad858c2603c751f74fd2394c945d3f933b3fb44a8f58b18dcd9a2c1c1236 SHA512 132c94a472301a2cc81a4aef13afa8137a6b69dfc035821e22fca6b0598cb94f1788f1a8cf1b47412214c9480867be816070aaa938290a1d10bccc407c38aaf4
-EBUILD sigal-1.3.0.ebuild 878 BLAKE2B 4818ea2706f82c756dbd7f45f4ab0d8f0264d81eb511dafb122b4492c25f7c2709c728bf8d455a6a99308eab07c241065240b071a0fd947584699c5d89732ce2 SHA512 c649a8781fe15ed3d44dd1e863853f77ff96c1a08cc43dd4b88b0fea6f2cbcb8a9243e55ff1d3e9ea3e259167a9f749fcc9f25982d685582e5329841a9a7014a
+EBUILD sigal-1.3.0.ebuild 872 BLAKE2B f3c89f1299b61c8769cd068fe89bee7d4e0848e7ac73486233264e90e7c3252dc5224d862a1d9eb2e8f162a495183853f6f952d874d045f41d0c04131e550176 SHA512 118373cdddec32a41697436295b2f8d8885edd73a14b12d92c71a53c05f6edb6e1d877767a25173d61981282efa0d97b2efb1c6bc7ecfa5bd13ccd1758405894
 MISC metadata.xml 1062 BLAKE2B 2997924c7ffdf6ddf3afd6b8d55ab426c7701eb3beb3c566f870507730f99ddd4875621029e078d7f1db16d582de448257701ff7c6325169fafb71a15e9e2304 SHA512 d49289c1dbd612fe88b6ef3d883b073c4b2985839decd5d3b9d73a3c24e0aa83e37890068be8e127ad1f88f86b9b37f7f2f61299c431b3a21b6219f2671a73d3
diff --git a/media-gfx/sigal/sigal-1.3.0.ebuild b/media-gfx/sigal/sigal-1.3.0.ebuild
index c6ef6d35b74a..50b523364a30 100644
--- a/media-gfx/sigal/sigal-1.3.0.ebuild
+++ b/media-gfx/sigal/sigal-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index acea5755ad46..b1d0e3367795 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -2,6 +2,6 @@ AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f7
 DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb
 EBUILD sxiv-25.ebuild 1293 BLAKE2B 715b77644c20bae1c82681a17ad3dd2d2faa8944148c5df2bd1fe13394aa579fea2ca6d1e903d1512c010a3042e6314ab98a03c59dfdf9079a7413981b177eb6 SHA512 1a1c372246eba6f11fff1fd4821b2f9e20e2fbf45d222d05480c4761417302e05b427654b5ec632b92d4b4865e5749348985dae4c3e09725729bb45d92e2d9dc
-EBUILD sxiv-26.ebuild 1188 BLAKE2B 5d9e15fe964703bc0187ffe4ae1db7170aae5bef4b3dcb3eba40a8a8cfef66122a70164800933cae2a4786a48dd4c2e1faf15349d3564f0f549e8e9c7c58295b SHA512 4f0a3d095154a04902a5e6c4ae10e4b7b82816a0e713bd83ad9135ebf500de13b3449c4b9c3fa41f02fc77294683c12e5837e6acf8a9bd40e77368b06f909148
-EBUILD sxiv-9999.ebuild 1188 BLAKE2B 5d9e15fe964703bc0187ffe4ae1db7170aae5bef4b3dcb3eba40a8a8cfef66122a70164800933cae2a4786a48dd4c2e1faf15349d3564f0f549e8e9c7c58295b SHA512 4f0a3d095154a04902a5e6c4ae10e4b7b82816a0e713bd83ad9135ebf500de13b3449c4b9c3fa41f02fc77294683c12e5837e6acf8a9bd40e77368b06f909148
+EBUILD sxiv-26.ebuild 1239 BLAKE2B c860e96538e8bfe6712ce11d13fcd27d91af12a463dcb6963314d4757f96fa271b0f2bbe403f96cba534c5f3700d551653ac1d765dd7273ffe16cdc9be3739a5 SHA512 f5fed5f22046c485b8f7b621f10a29aaa44496287199752ef26e59db3b5980d307440afcce925ded90403e13d2de689f5eb844660725693864fff9060a603d44
+EBUILD sxiv-9999.ebuild 1239 BLAKE2B c860e96538e8bfe6712ce11d13fcd27d91af12a463dcb6963314d4757f96fa271b0f2bbe403f96cba534c5f3700d551653ac1d765dd7273ffe16cdc9be3739a5 SHA512 f5fed5f22046c485b8f7b621f10a29aaa44496287199752ef26e59db3b5980d307440afcce925ded90403e13d2de689f5eb844660725693864fff9060a603d44
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-26.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
index ff78c92751b8..890ffab338b5 100644
--- a/media-gfx/sxiv/sxiv-26.ebuild
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-25-makefile.patch )
+
 src_prepare() {
 	restore_config config.h
 	default
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index ff78c92751b8..890ffab338b5 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-25-makefile.patch )
+
 src_prepare() {
 	restore_config config.h
 	default
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 83dc35553593..a0c95a371726 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,5 +1,6 @@
+AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5ae11369476bbc60594da9bd766aa1d752020171b82e0d35e0d57ce1499f69e13b5a5f5274c9c530a2d7fa0f9deabda55462f0a0 SHA512 7b4b5dd4da00180f2eb34a7dcdc407e958df69ba843c371c496dc488977aa8045c31e1007f05e9dcb96765bfa83df75caabd92c99114555b252846892292e465
 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980
 DIST transfig-3.2.5e-gentoo-patchset.tar.bz2 21130 BLAKE2B 1c07bc7e85fdde29f5e9290bf3c0df75610a7c219f001920b7412d2c104fe1d8d5b2698d91cde1c08f57d4718547c2dffa0aa859bd53a295c55a285ca4f5fbb7 SHA512 4c6ca63159ae58c35c1a9c818bc3b29715a4015e6a11d283b4d0c57c0cfeccbf38160f61f3c91f9bc68f82a8b5676349bb98866f40f617bb95afd73267d00e97
 DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e
-EBUILD transfig-3.2.5e.ebuild 2935 BLAKE2B b99aafdf73b546f9038e8820ab8ebe07c37b58e045da040fc36aa68db7b489934cbc38831b6764800938715f4b2d61ab7c87ef7bd153e8276b7a1e507f1187ca SHA512 38572c6f9ee4091bb6d648c85bede7bd8d7046f9cdb8ebd802c048d7d144ab907ab8ec055f78bf1b25baa5324b0b13eb7a07b69bebd30c062241f9201c98b79f
+EBUILD transfig-3.2.5e.ebuild 2993 BLAKE2B 89f50342d529fb295a7e60803d5605ec60f7f0d47814b68b944133e95564a7ef2850d67f20d8a2b93f0265bc458b8901c415b72de4ca4348364514417f026c5b SHA512 fe0dd0fe59c4881a6e76ab9199e3ee225cbb6f64880fda01cd67fed169bc7d609677cee3efe983f40e6c3e3a300bb657f427f1ffdfce08ba475c6f88f41bf14a
 MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c
diff --git a/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch b/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch
new file mode 100644
index 000000000000..e0c92161e3ff
--- /dev/null
+++ b/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch
@@ -0,0 +1,30 @@
+--- a/fig2dev/dev/gensvg.c
++++ b/fig2dev/dev/gensvg.c
+@@ -230,10 +230,12 @@
+ };
+ 
+ /* arrowhead arrays */
+-Point   points[50], fillpoints[50], clippoints[50];
+-int     npoints, nfillpoints, nclippoints;
+-int     arrowx1, arrowy1;	/* first point of object */
+-int     arrowx2, arrowy2;	/* second point of object */
++Point   fillpoints[50];
++int     nfillpoints;
++extern Point   points[50], clippoints[50];
++extern int     npoints, nclippoints;
++extern int     arrowx1, arrowy1;	/* first point of object */
++extern int     arrowx2, arrowy2;	/* second point of object */
+ 
+ static int tileno=0; /* number of current tile */ 
+ 
+--- a/fig2dev/fig2dev.h
++++ b/fig2dev/fig2dev.h
+@@ -127,7 +127,7 @@
+ extern char	*prog, *from, *to;
+ extern char	*name;
+ extern double	font_size;
+-Boolean	correct_font_size;	/* use correct font size */
++extern Boolean	correct_font_size;	/* use correct font size */
+ extern double	mag, fontmag;
+ extern FILE	*tfp;
+ 
diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild
index 7e9dcc63d778..668facad5ece 100644
--- a/media-gfx/transfig/transfig-3.2.5e.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -54,6 +54,7 @@ src_prepare() {
 	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-typos.patch
 	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-man-hyphen.patch
 	epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-fprintf_format_warnings.patch
+	epatch "${FILESDIR}"/${PN}-3.2.5e-gcc10-fno-common.patch
 
 	sed -e 's:-L$(ZLIBDIR) -lz::' \
 		-e 's: -lX11::' \
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 18c2237e8f41..9068aa1615b2 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,6 @@
 AUX 5823.patch 1870 BLAKE2B 1a4edc390abd09010fb946035dab6f4ee9223eaa286f9843404db4f95d94e60da73dbf515c99aa857acdcb7d26bca3117fcdfdf2b9514ad45c2e795ab579cc46 SHA512 0cf9d1691816b165ab691cd34807f7c82eea685b5af2d9c483a9427987ae565f44e31bffcec9c3ede6102aa800d3988b054a178ec74f1826be1a88fd9f5ec28c
 DIST valentina-0.6.1.zip 38326440 BLAKE2B 33d9163058b890254120bb0849972941f36526c71ed0acd8df82867a0116a35be4818c31c3ebb8a7322cf53bca4f9e77b2de10ea0df51c46b764f8f9e7abb8d2 SHA512 6511194c734a1b6cd8a1ed489213c288e90bd653dbd8373c4ee13be78e2ae4fe00a35e19a5ee074e868319ab1a13eb8baea35dedb7242b3888d03aa4b4dc69ce
 DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc84d6d8a872a50329bd6b61ae250b489fbf71b19f0453ab5caea0bd7dc821d8c6fbe0fc24a6306d57ce5b34350f9 SHA512 037d2a5305d85d7d6be90c181ee6c39110a86c5f5d77c22453a2933e7d6a43c600f6ffb393015e98f9aab55b0d11291dca482352e1fc74f485578b65b3b84720
-EBUILD valentina-0.6.1-r1.ebuild 2138 BLAKE2B f78ad7ccba1ffbd3cdc8cc9b37f3224597f14edc85443fd7c6e8fb9de4fb8f6561090d6fb2f3784c6ecc351185429f83d7a4c0a4f8bffa1e87d60be26803ed8b SHA512 bb23ed75cda257f20eb5d2dda863095c8b03d8aa7f9932e7bbfa980b29c00f2448606f256f9844df32b6a5f6bd13a2eac7c740ead149950b709162e073c8e102
+EBUILD valentina-0.6.1-r1.ebuild 2136 BLAKE2B b5e29fd5988c8a0187cef2a6df84bb2d82cd59ba6b375bc4e57bcb8dd0ee9f5665a634e845f56320009799326bb0628d27fcf74229f640db5a0ebfdfa7ad3dd1 SHA512 a132e6373561efd9e8c93d59182e8be01c335b5e150203b2eaab806b274e001416a425c1652fd2a768b117e1acbccedd3a54952254178e8d2977cecd642948ac
 EBUILD valentina-9999.ebuild 1922 BLAKE2B 57a28e28e6ab7cefccc216d03365bc4b41dadaea31bdcdc3a198b8122aef3848d209e68219dec0f806303e27027675eff522be11b6d4716d822efe70ee5d1e6f SHA512 b89d500a486d5d9109806fd38bc6a38eb02036b6ff4c4e69cba30b0df6f5a7516d9f2a0187bf77d48f5ff0b3a99327b6c65c25b0575b34502a4695c00c111053
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
index f44a566e76f4..ef3be1080d91 100644
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 4a2661a3858d..af7c283a4248 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -7,6 +7,6 @@ AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a65571
 AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1
 DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
-EBUILD zbar-0.20.1-r1.ebuild 3750 BLAKE2B 259754767901ad0b09db83d38a5ebf7130c5beea96e36a39d2ec30905347f287eff29f558678427d95676c45943c59230f703e3fa8af8fac36d52647d2474586 SHA512 21555d40bd966c9de37cc69fca082cc9bb9cc70733f9b2c4313b6cd52a31bd33dbad8bce4de5b0c820cd8ea22ce36cd4954ee80aa64962385abd1d91f5b321f8
-EBUILD zbar-0.23.ebuild 4994 BLAKE2B 439b61a455f9d12ebf7c4b900f25397d8eea50d26ccbf4750439c857be80ac1fd3024ba4061016314030b9c1e9713f0bebdea10888b1ed02c45a1c44b228795e SHA512 c57cc6cdbec6f0130e49aa5a8051738c9829fa7f92e5f7b8396ee39f667169377fa112e18c22da7205075dd7ac72504d6babb4572564e21440cc1ec09c6a85f8
+EBUILD zbar-0.20.1-r2.ebuild 3795 BLAKE2B a2d47958dd6175ab9bad3f4cfb34e14cb41ff8265848784ade15d5e7de7e4d105d206b0a34739de7119dd35398cdc3f041a6917734234ad0dab9a3d34ca90e30 SHA512 f2fe964c7196ac539aaf95324855b024f594461af471d9bcbb4d611f76b99a25ee430616a2213398beb1e25a66ea511a816ecd0b711be08b8b54ef9cd2f0e616
+EBUILD zbar-0.23-r1.ebuild 5032 BLAKE2B ff4c538a9afacc4007dee2b186cdf5dbf086c93f7915305b6d882b5e326cace8bc25942475b6bb64ce4915c04e08dd4730c7ed537ef5fee3632e664c4806a064 SHA512 f15df43d499480c3d7c85f6207ee3cef58609d5d8723fce35f4c027e136efe9fc8277576a307e8ecd5b9fdb356402bf0dfd38f5e4ed66d908946cf74ec0611f9
 MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
deleted file mode 100644
index 9a6382e3b61f..000000000000
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( X ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	)
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:= )
-		graphicsmagick? ( media-gfx/graphicsmagick:= )
-	)
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	v4l? ( media-libs/libv4l:0= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )
-	java? (
-		>=virtual/jdk-1.8
-		test? (
-			dev-java/junit:4
-			dev-java/hamcrest-core:1.3
-		)
-	)
-	test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
-	fi
-
-	use python && python_fix_shebang examples/upcrpc.py test/*.py
-	java-pkg-opt-2_src_prepare
-
-	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
-		-e '/^AM_CFLAGS=/s: -Werror::' \
-		-i configure.ac || die
-	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-		-i java/Makefile.am || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		$(use_with gtk)
-		$(multilib_native_use_with graphicsmagick graphicsmagick)
-		$(multilib_native_use_with imagemagick)
-		$(multilib_native_use_with java)
-		$(use_with jpeg)
-		$(multilib_native_use_with python python2)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable v4l video)
-		$(use_with X x)
-		$(use_with X xshm)
-		$(use_with xv xv)
-	)
-
-	if multilib_is_native_abi; then
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-			if use test ; then # bug 629078
-				java-pkg_append_ CLASSPATH .
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
-			fi
-		fi
-		if use qt5; then
-			myeconfargs+=(
-				$(use_with qt5 qt)
-				$(use_with qt5)
-			)
-		else
-			myeconfargs+=( --without-qt )
-		fi
-	else
-			myeconfargs+=( --without-qt )
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf "${myeconfargs[@]}"
-
-	# work around out-of-source build issues for multilib systems
-	# https://bugs.gentoo.org/672184
-	mkdir gtk pygtk qt test zbarcam || die
-}
-
-src_test() {
-	virtx multilib-minimal_src_test
-}
-
-src_install() {
-	if use qt5; then
-		local MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/zbar/QZBar.h
-			/usr/include/zbar/QZBarImage.h
-		)
-	fi
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.20.1-r2.ebuild b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
new file mode 100644
index 000000000000..5aba21e790d8
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="https://github.com/mchehab/zbar"
+SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+
+IUSE="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( X ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+	gtk? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	)
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:= )
+		graphicsmagick? ( media-gfx/graphicsmagick:= )
+	)
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		gtk? (
+			$(python_gen_cond_dep '
+				>=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
+			')
+		)
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	v4l? ( media-libs/libv4l:0= )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8 )
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk? ( dev-util/glib-utils )
+	java? (
+		>=virtual/jdk-1.8
+		test? (
+			dev-java/junit:4
+			dev-java/hamcrest-core:1.3
+		)
+	)
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
+	fi
+
+	use python && python_fix_shebang examples/upcrpc.py test/*.py
+	java-pkg-opt-2_src_prepare
+
+	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+		-e '/^AM_CFLAGS=/s: -Werror::' \
+		-i configure.ac || die
+	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+		-i java/Makefile.am || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		$(use_with gtk)
+		$(multilib_native_use_with graphicsmagick graphicsmagick)
+		$(multilib_native_use_with imagemagick)
+		$(multilib_native_use_with java)
+		$(use_with jpeg)
+		$(multilib_native_use_with python python2)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		$(use_enable v4l video)
+		$(use_with X x)
+		$(use_with X xshm)
+		$(use_with xv xv)
+	)
+
+	if multilib_is_native_abi; then
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+			if use test ; then # bug 629078
+				java-pkg_append_ CLASSPATH .
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+			fi
+		fi
+		if use qt5; then
+			myeconfargs+=(
+				$(use_with qt5 qt)
+				$(use_with qt5)
+			)
+		else
+			myeconfargs+=( --without-qt )
+		fi
+	else
+			myeconfargs+=( --without-qt )
+	fi
+
+	ECONF_SOURCE=${S} \
+		econf "${myeconfargs[@]}"
+
+	# work around out-of-source build issues for multilib systems
+	# https://bugs.gentoo.org/672184
+	mkdir gtk pygtk qt test zbarcam || die
+}
+
+src_test() {
+	virtx multilib-minimal_src_test
+}
+
+src_install() {
+	if use qt5; then
+		local MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/zbar/QZBar.h
+			/usr/include/zbar/QZBarImage.h
+		)
+	fi
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
new file mode 100644
index 000000000000..87656810dce6
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
+
+DESCRIPTION="Library and tools for reading barcodes from images or video"
+HOMEPAGE="https://github.com/mchehab/zbar"
+SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv"
+REQUIRED_USE="
+	introspection? ( gtk )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		X? ( imagemagick )
+	)
+	xv? ( X )"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	gtk? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+		introspection? ( dev-libs/gobject-introspection )
+	)
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
+	)
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8 )"
+
+DEPEND="${COMMON_DEPEND}
+	java? (
+		>=virtual/jdk-1.8
+		test? (
+			dev-java/hamcrest-core:1.3
+			dev-java/junit:4
+		)
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk? ( dev-util/glib-utils )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10-errors.patch"
+	"${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch"
+	"${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch"
+	"${FILESDIR}/${P}_fix_python_detect.patch"
+	"${FILESDIR}/${P}_fix_Qt5X11Extras_detect.patch"
+	"${FILESDIR}/${P}_reset_conversion_descriptor_after_close.patch"
+)
+
+DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+	use java && java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if use python || use test; then
+		if use test; then
+			# make tests happy
+			# because one of the test requires loadable py module from the current ${BUILD_DIR}
+			sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
+				-i test/Makefile.am.inc || die
+		fi
+
+		python_fix_shebang \
+			examples/*.py \
+			test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
+	fi
+
+	if use java; then
+		java-pkg-opt-2_src_prepare
+		sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+			-i java/Makefile.am || die
+	fi
+
+	# do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead)
+	sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		$(use_with dbus)
+		$(use_with gtk gtk gtk3) # default is gtk2
+		$(use_with jpeg)
+		$(multilib_native_use_with introspection gir)
+		$(multilib_native_use_with java)
+		$(multilib_native_use_with python python auto)
+		$(use_enable static-libs static)
+		$(use_enable threads pthread)
+		$(use_enable v4l video)
+		$(use_with X x)
+		$(use_with X xshm)
+		$(use_with xv xv)
+	)
+
+	if multilib_is_native_abi; then
+		# both must be enabled to use GraphicsMagick
+		if use graphicsmagick; then
+			myeconfargs+=(
+				--with-graphicsmagick
+				--without-imagemagick
+			)
+		elif use imagemagick; then
+			myeconfargs+=(
+				--with-imagemagick
+				--without-graphicsmagick
+			)
+		else
+			myeconfargs+=(
+				--without-imagemagick
+				--without-graphicsmagick
+			)
+		fi
+
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			append-cflags "$(java-pkg_get-jni-cflags)"
+			if use test; then # bug 629078
+				java-pkg_append_ CLASSPATH .
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
+				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
+			fi
+		fi
+
+		if use qt5; then
+			myeconfargs+=(
+				--with-qt
+				--with-qt5
+			)
+		else
+			myeconfargs+=( --without-qt )
+		fi
+	else
+		myeconfargs+=(
+			--without-qt
+			--without-imagemagick
+			--without-graphicsmagick
+		)
+	fi
+
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+
+	# work around out-of-source build issues for multilib systems (bug 672184)
+	mkdir qt zbarcam || die
+}
+
+src_test() {
+	virtx multilib-minimal_src_test
+}
+
+src_install() {
+	if use qt5; then
+		local MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/zbar/QZBar.h
+			/usr/include/zbar/QZBarImage.h
+		)
+	fi
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	use java && java-pkg-opt-2_pkg_preinst
+}
diff --git a/media-gfx/zbar/zbar-0.23.ebuild b/media-gfx/zbar/zbar-0.23.ebuild
deleted file mode 100644
index 495dc423d47e..000000000000
--- a/media-gfx/zbar/zbar-0.23.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv"
-REQUIRED_USE="
-	introspection? ( gtk )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		X? ( imagemagick )
-	)
-	xv? ( X )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		introspection? ( dev-libs/gobject-introspection )
-	)
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
-	)
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	java? (
-		>=virtual/jdk-1.8
-		test? (
-			dev-java/hamcrest-core:1.3
-			dev-java/junit:4
-		)
-	)
-	test? (
-		${PYTHON_DEPS}
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10-errors.patch"
-	"${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch"
-	"${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch"
-	"${FILESDIR}/${P}_fix_python_detect.patch"
-	"${FILESDIR}/${P}_fix_Qt5X11Extras_detect.patch"
-	"${FILESDIR}/${P}_reset_conversion_descriptor_after_close.patch"
-)
-
-DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python || use test; then
-		if use test; then
-			# make tests happy
-			# because one of the test requires loadable py module from the current ${BUILD_DIR}
-			sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
-				-i test/Makefile.am.inc || die
-		fi
-
-		python_fix_shebang \
-			examples/*.py \
-			test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
-	fi
-
-	if use java; then
-		java-pkg-opt-2_src_prepare
-		sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-			-i java/Makefile.am || die
-	fi
-
-	# do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead)
-	sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		$(use_with dbus)
-		$(use_with gtk gtk gtk3) # default is gtk2
-		$(use_with jpeg)
-		$(multilib_native_use_with introspection gir)
-		$(multilib_native_use_with java)
-		$(multilib_native_use_with python python auto)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable v4l video)
-		$(use_with X x)
-		$(use_with X xshm)
-		$(use_with xv xv)
-	)
-
-	if multilib_is_native_abi; then
-		# both must be enabled to use GraphicsMagick
-		if use graphicsmagick; then
-			myeconfargs+=(
-				--with-graphicsmagick
-				--without-imagemagick
-			)
-		elif use imagemagick; then
-			myeconfargs+=(
-				--with-imagemagick
-				--without-graphicsmagick
-			)
-		else
-			myeconfargs+=(
-				--without-imagemagick
-				--without-graphicsmagick
-			)
-		fi
-
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			append-cflags "$(java-pkg_get-jni-cflags)"
-			if use test; then # bug 629078
-				java-pkg_append_ CLASSPATH .
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
-			fi
-		fi
-
-		if use qt5; then
-			myeconfargs+=(
-				--with-qt
-				--with-qt5
-			)
-		else
-			myeconfargs+=( --without-qt )
-		fi
-	else
-		myeconfargs+=(
-			--without-qt
-			--without-imagemagick
-			--without-graphicsmagick
-		)
-	fi
-
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-
-	# work around out-of-source build issues for multilib systems (bug 672184)
-	mkdir qt zbarcam || die
-}
-
-src_test() {
-	virtx multilib-minimal_src_test
-}
-
-src_install() {
-	if use qt5; then
-		local MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/zbar/QZBar.h
-			/usr/include/zbar/QZBarImage.h
-		)
-	fi
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 304faf127fe7..7ec809498164 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 0a6fde33d954..857ba82288f5 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -9,5 +9,5 @@ EBUILD alsa-lib-1.1.2.ebuild 2124 BLAKE2B 8f964d67aa073c906087ae5d2376378a93b29f
 EBUILD alsa-lib-1.1.8.ebuild 2069 BLAKE2B dfa9c16f9ae9520ac0cd558c0bc53e124c0b59140d104e2c76b25da8cb051a862d6607901ae481d4f786c6cc117618e33dbd6a2a656bb582fbb55c99192e53ac SHA512 55976162d5fef66fea1e2e44edf97953ad8001ba6e3c05cae7affa5d0607f20ffde47c93702a3d5f3ff7fa80071d816a9060afe21f028ed121b88cfad9308469
 EBUILD alsa-lib-1.1.9.ebuild 2076 BLAKE2B a5b993db209ad0fc59d2846c083a0906622a86911fcaa023fdb90de823d95ec33f67b61d710ec5e164e78ad323c774bc524f844f7dbcd3b8e5f0b102b30192b0 SHA512 a13d43dc7efb41f4a47ce06a66e07b8f7846350988fbfd64c01ce9b6c14da35b24a8b02f59383ba339230bb8efaf938c09a8c225e923c00cd207cbc47b646aef
 EBUILD alsa-lib-1.2.1.1-r1.ebuild 2147 BLAKE2B d2bb59384252242313a6bc20197bad9dd8979bf0bec59ea8409793b4516b169caf3279ab88c941404580267dabf604071ac8893889097c63403be2d11c329b12 SHA512 abab7f9e9c1b896afb1f7236f349315acbe71ca32316488148c5ee47e35b0ed67007c2cc645adb89f0fa94f3c297f344ddf962744cdb4071a840b781fba1505f
-EBUILD alsa-lib-1.2.1.2.ebuild 2088 BLAKE2B aea23d684ea4c3828104d3d283eb4923efd160989b75d83144530341122c02b321f662d76c41a2371b0b7c5f95593cc4021bc16df71d4630c4770b7c79fc2143 SHA512 069855fe23236a263bb0110092db1be616e4049e864748b1ed2b96f90c92a4493b17496f64692f5e92e4026672d02d87eeb1ea9b45d14bcfc5931989a865c1b2
+EBUILD alsa-lib-1.2.1.2.ebuild 2087 BLAKE2B 855b04b0753926e2a1be60925a38db1a42a4f2cb0783b2b96f2086ec33293727638a1af167f547704dd86a72706de67b3478df530ffd58d2f464c81a9a3fd1a7 SHA512 42c6f8c252cdd24da9745f7ddf6afe4863655e32ac4352e98594afd849fc4522f6a90e1a2898fa7292dda464ea2f619e2c6516629e8d4239ddb41d2bc81bb9c6
 MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
index 5576b0b97835..1a6d20546cc3 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index dcf9af6c27d7..c3a765771db6 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,4 +1,4 @@
 AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595bf6a0fcea7809090872639e7928f1c58acb000e8f965b5f06a8c5c14e5a46f9c3f4078a5ddb2d907f5cdcceb49c7fb6c SHA512 126bd73800844c0b9e4c2af05b3754bbbacf9e380288cdde7fef666621fcb0b1775bead7fd932c23375efea594ec9f1d3eccf009a90a7994d18b101ba21f1ee2
 DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
-EBUILD alsa-oss-1.1.8.ebuild 1034 BLAKE2B 319cb97fdb88c2c48624f23c9d10353976643491ee5897c792997e554d953e0391975c60175a7ee20e35c0b0565967e6df8f3c44beb20d0954df58c818efd5f4 SHA512 3872ce722d521ffa04f74599bbdc788035c34315e3bf135bd6d64d49515c2748d70616ae4aa6f1dae0b3e59d70f707303b20b1f4d33cd930b714412db01c62e8
+EBUILD alsa-oss-1.1.8.ebuild 1032 BLAKE2B 4725690afd7d58b5e577bc8f0504c545ec200027d1d690f3646549c71e10dce8c16349c54f5b1e84ef21f4625d80047473a6d3f06c036e987db907ece3afe6fe SHA512 81599618c180f720234b18577d4008995d399ede255dde1d36086723d2d82708191ab8ff7323db080a1036d22375aa7f8be2ff4c2b4aa3230088f0005d404d65
 MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index 3f9aa7693e13..527a9794d7f5 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -41,5 +41,5 @@ multilib_src_install_all() {
 		find "${ED}" -name '*.a' -delete || die
 	fi
 	find "${ED}" -name '*.la' -delete || die
-	sed -e 's:\${exec_prefix}/\\$LIB/::' -i "${ED%/}/usr/bin/aoss" || die
+	sed -e 's:\${exec_prefix}/\\$LIB/::' -i "${ED}/usr/bin/aoss" || die
 }
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 0cb97bb6e00a..1846de40ecaa 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
 DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-plugins-2.7.3.ebuild 4315 BLAKE2B f99b4475f1da295309a43fefb329d2905df5fd1fb77664f6222170eaa7031a2b94ee99df739f10ef6c4b82504614ad1299aee56b01bdbe9b22bd5101f18af08c SHA512 d5c5b70242f63b267c137573388ece2876bbc59dd8024083542b60684c16175feeac6aedb831f2d6abe2d763cd784f6225c75c3f4bc22f29617d5687ab926271
-EBUILD avidemux-plugins-2.7.4.ebuild 4231 BLAKE2B b320b836d0cd9ff80cb622e3f03363a92e8ece3b4cfbdb33fd164b2f04d4c9741729ce6e1d9a1865e84f0152aaed81d6e31e1a6d332f57c8795f5ac5c4faea6d SHA512 ac2b70f9970b557c7d155cb016dc32756d1112575fe6d4b8714e11c9ed38d82f5a1bb7a4fe4ad98f3b9ff3a567746a1895162e9ecb4425a6063d6a4180fcf465
+EBUILD avidemux-plugins-2.7.3.ebuild 4309 BLAKE2B a8acc0e4f2ec6864da9fda8921ec607ee42480254b329a92b58b9cd5d84aa01dd9e10cfb3272d438c75d7baf408684fb15b031e639f7e7d08189a2ed2813f87f SHA512 116bc8f4e952cde04b247cd32b63f56da0405e50d2798ee7ed0fda6c4ef9809bbc9e93909d47232eeb8fbd54bdf67797fa06f2b6001488ab7fdd32a21d9d5396
+EBUILD avidemux-plugins-2.7.4.ebuild 4225 BLAKE2B 2c30a228035a7448650ac617e1588ee34f0d29b94d7be680cf457d7a0231db53bc2014c1043d7d6f2fbf1e607fbba9795a45da8f8adac751b5d98e3a1282da64 SHA512 f08e4813618ced792236243a41450f3f2b7664753dc34029221c2a86826df66a7e578bd1a7fbe57a529a00d3934512743a00be36d304e520bd0daeb30eb21afb
 MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
index 0650e3a9f4d8..2886869b6456 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake python-single-r1
 
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
index cad08c9330b6..b88e94f5c0ee 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake python-single-r1
 
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index ff9684147428..12848749c12a 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,5 @@
-DIST cimg-2.7.2.tar.gz 11204962 BLAKE2B dce4198e23d814fc4bd481388ca959cc831927329c5611b057aeb88cb5c3f80facc87433482ee6c1048b8478147db25ca592ecafe18528def156f30f626eef22 SHA512 ad251d2d433497be2fbf812dba7efecfdedc1b38770c34d600f5848fe91c130b8952c8d86fcd58894849175aa31358225e255b1558173ead79c47a985c7b11b2
 DIST cimg-2.8.1.tar.gz 11208148 BLAKE2B 1d53c11f76c63c453b9090d01c9b970a5d38f9accc13ed5f03d3107d218ff1b69a9e3d469cd9a5a51f90a0d0565efeb2523a2f0f7964752ca8ea8f2e2115f45e SHA512 df7bf86e5957c998180494eba70218a86f6e33c85d3f5d441a695a35725bb811956a945f40cc73573d6507dd4bcb25589ec05083ac99539365f73e6bd1247dd9
-EBUILD cimg-2.7.2.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+DIST cimg-2.8.3.tar.gz 11208996 BLAKE2B 1e76f99d20a99955647228cffe5fcd2c26596f4045c2a79cff45b089283146199054628d207c0dda5204d9aeb4c1269dc01639fb8bb1ad95ec61ee68186b9d53 SHA512 3404224446a76cba2295a70ef742cf337675b33481e10d79c94a3994c099bcde1e398b27bf5926395f99ef46fff790668a0ebd24dc894c47982ac1ceaa6d1d1c
 EBUILD cimg-2.8.1.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
+EBUILD cimg-2.8.3.ebuild 589 BLAKE2B 4f29b517cf57fca50633c4abfa9f5c24c5aa9da7c45f9530b24912205ddcb6640b5837a7cbcbe96cd9690a242d3d85d6db84a00a5a07ba5a0a1ae93cd435dc2c SHA512 b783e57a641c122eee451bd7ae49a6dfdd63b0b6a813c56b4322cbb0bcf75f255e68edfb9d5562800c47b1473ef0b9e82ee079d5952ef0630125c12a2d3036d9
 MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-2.7.2.ebuild b/media-libs/cimg/cimg-2.7.2.ebuild
deleted file mode 100644
index a3f01bc9ba22..000000000000
--- a/media-libs/cimg/cimg-2.7.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg"
-SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-S=${WORKDIR}/CImg-v.${PV}
-
-src_install() {
-	doheader CImg.h
-	dodoc README.txt
-
-	use doc && dodoc -r html
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/media-libs/cimg/cimg-2.8.3.ebuild b/media-libs/cimg/cimg-2.8.3.ebuild
new file mode 100644
index 000000000000..3205e035da6e
--- /dev/null
+++ b/media-libs/cimg/cimg-2.8.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ template image processing toolkit"
+HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg"
+SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-2 CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+S=${WORKDIR}/CImg-v.${PV}
+
+src_install() {
+	doheader CImg.h
+	dodoc README.txt
+
+	use doc && dodoc -r html
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 2758ff67a649..b6c26f34fbdb 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,4 @@
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
+EBUILD clutter-gst-3.0.27-r1.ebuild 1412 BLAKE2B e827be76b95d68de1d4a8425eb89ea88cd72aba092168ca12c9a69b009bcfc13a4375db4cd37ea00f3cfaf6d0016a3f8dd60646da10aa6e48ea715efef170efc SHA512 ebacfd6f4ebeb564272061a6a83271aab5d27be28d69686a1b246f0677fa8514b60ec89aa4662934f535e84c4820db0e573405662302629c74203451c5a76a90
 EBUILD clutter-gst-3.0.27.ebuild 1468 BLAKE2B f210609ab87331fadc2aa9140ed4075716b4a137003dfaf212ac35f7da3320d29a74f7f673496844dfdabd4d2f74d8ee3edff2a278e366d4e8d09125ceef8773 SHA512 60a1e06663a54bf046a028aa52312b7d27cd0591da399616659759e29ad19a822737782a44c97227adf0c999c8acb193a2bd151a047cc588eab243bddc2995d3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
new file mode 100644
index 000000000000..42615b32a54f
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X debug examples +introspection udev"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+COMMON_DEPEND="
+	>=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? ( dev-libs/libgudev )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+	!udev? ( media-plugins/gst-plugins-v4l2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# --enable-gl-texture-upload is experimental
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/"${PF}"/examples
+		doins examples/{*.c,*.png,README}
+	fi
+}
diff --git a/media-libs/fontconfig-ultimate/Manifest b/media-libs/fontconfig-ultimate/Manifest
index ae22f1ef6ff4..8b612852bef5 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 cd26b0c4511edfcd3574a5289c9b6ef628a9008173574ccbd769a0ca8a3eddeac8fc3fc85708fb25fbbbe3379d4c3dcf1356a42faf3cb0437c6b6a12c4b975b6 SHA512 e3bc426f980418d18f159ecd29f989c64b3b70ebe3854addae0e2eea71066eacc33037ae1d83db1a07dda73f5d8692f56bee7700dac5c944e456f4d174014bd5
-EBUILD fontconfig-ultimate-2015.08.01.ebuild 3127 BLAKE2B cd26b0c4511edfcd3574a5289c9b6ef628a9008173574ccbd769a0ca8a3eddeac8fc3fc85708fb25fbbbe3379d4c3dcf1356a42faf3cb0437c6b6a12c4b975b6 SHA512 e3bc426f980418d18f159ecd29f989c64b3b70ebe3854addae0e2eea71066eacc33037ae1d83db1a07dda73f5d8692f56bee7700dac5c944e456f4d174014bd5
+EBUILD fontconfig-ultimate-2015.04.ebuild 3144 BLAKE2B abc3861527b4e3b0d72e77a4f80ef33d3c75018a3ed0441a278b4d60147c09ea6686c831e17bc4b16eff60aa0d15e764dcf3d6c800f525176cf2d267d2f44021 SHA512 361749b39ddb8f1953f892a3c39f8f5cc221871bdda4721eb0531d28f79ae08a149694916f65667d417f847b0ec5af0623146654a333f12e4fda37fd4480fa39
+EBUILD fontconfig-ultimate-2015.08.01.ebuild 3144 BLAKE2B abc3861527b4e3b0d72e77a4f80ef33d3c75018a3ed0441a278b4d60147c09ea6686c831e17bc4b16eff60aa0d15e764dcf3d6c800f525176cf2d267d2f44021 SHA512 361749b39ddb8f1953f892a3c39f8f5cc221871bdda4721eb0531d28f79ae08a149694916f65667d417f847b0ec5af0623146654a333f12e4fda37fd4480fa39
 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 fb67d6643e15..d24e41188b45 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.04.ebuild
@@ -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="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 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 fb67d6643e15..d24e41188b45 100644
--- a/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
+++ b/media-libs/fontconfig-ultimate/fontconfig-ultimate-2015.08.01.ebuild
@@ -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="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://github.com/bohoomil/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 73c69cb1fa5b..6dc5b9424e52 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -6,5 +6,5 @@ AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b896
 AUX freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
-EBUILD freeimage-3.18.0-r1.ebuild 2974 BLAKE2B 2dc58bd65dfaf7742fa79f30e3f21ad04cacd113640aa366ee6aa952daee2600a5fb4241ba5a45d9b90a71e745ffe169775765c114eaa1eac698a68aca399c78 SHA512 66bc093e1baa9fd8e4ee95131ad0b1a4d09bb4e1045c636ac384d350be9fe271c2410dfe02e30d5c4ff248f7a3923cebbb577310da53fa5ffa70a361d2fb7a2d
+EBUILD freeimage-3.18.0-r1.ebuild 2972 BLAKE2B 0f4f3b62a4db9fc5d5adaa419f2e92c68d988af0dedf523bb04ea8719e0a1df2cf829d520e0f17d8ecec72c92ec187e47bb67996cb071b0715651cca1a6d906d SHA512 e9ca41ba0394505946e3c1a53b7974d27aa8aea06128befb8123fa8cf25ed8a36a8c2b6b49721304dafb194705d6284ebfcee5b6b8ca6ff0603111ef7a7ecd48
 MISC metadata.xml 403 BLAKE2B e4d54e3da3203c09e5b281d7d9a5ee1c42f98d081751195edb3754809e9cfc9037b79f70da579f01485b4cda65fe4ddaa70f5522d6138af5b214cdbcbd412928 SHA512 08dffea02b8771a4728338c3cdfa0fd7f312d4570838bdfea4ec395c007cc36f3ef87432db5da44468c7b3834855e2de8ae13ddf9447cba9c88da4367c6cc10c
diff --git a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
index 60e82af73945..677a23328f84 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r1.ebuild
@@ -113,6 +113,6 @@ src_compile() {
 }
 
 src_install() {
-	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED%/}"/usr/$(get_libdir)
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
 	einstalldocs
 }
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index acf8ec8ac95f..07d33a7cc43c 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -23,7 +23,7 @@ DIST gegl-0.4.20.tar.xz 4826340 BLAKE2B 0d1087ea983d7fbeb7ea1edb572bea97e9b4e01a
 EBUILD gegl-0.2.0-r6.ebuild 4966 BLAKE2B 90aa2bd833a192cb3f29e3575679af54c44a3476b9c6c1cab0a33d1be9e6d814b4b36fe213bf3c3b09b2dd8ec98bb26837516b7a0eebf4c4a6c89709620c1581 SHA512 80165722f20fa6834b5756f4a20f1fc4bfeed22b4748dd76336ca5f1fad837c25096254e9cb073078f537ff5db79999d622c92a5c052ef0ea7c2a668e4177862
 EBUILD gegl-0.3.34.ebuild 5323 BLAKE2B dc0f672e62994020b85c6f2e9affefaac7d4dca6ab0da46d4f6ef9e14ecae08495bb849024ce77d9e7c7f52eb982ea11d7755e8730136d33ab4576e737d3d4a6 SHA512 9de42db2c3fe569b9524b513408751fa8ffcf2845db5f001b9f914c9549e6b48393c9a4927aea74d9bbbce8c06fa3b257b10b895197af38849ea6b685819aa43
 EBUILD gegl-0.4.16.ebuild 4872 BLAKE2B 5126609563c9d39b6d4d6c691e9c1418859461a936805238f493b53d2766a5240a5cd9252e4659bdb99f9a72df068c601170885243fabb000210223c6dd651bc SHA512 c86beb3fe1024a23ad1ce8307e05c985124b2c74d03d0d2a0abebfbe6749ea76437107a15eefb7e4e5da00cd45d1d485f38c5ce5d34052f9f811839f2837740f
-EBUILD gegl-0.4.18.ebuild 4884 BLAKE2B a87f35e02d29f55b1c6ec473466aad8092dd897455b6164d3ac484a1cabdb24b650798a9e0e4d324bb4f7ab5f5e3f1b4d4096be7f009581a3c2bb1c14d38e5ce SHA512 ecf8d3ff39b8f1d668405ef58b81ab8efdd8de4d62a55765cd4a572ba4e0bd1e65181cca9208d2a4f0600eaf5a84822585b903edc0c1d62038c1b1a4ee9ea774
-EBUILD gegl-0.4.20.ebuild 4863 BLAKE2B 83245542db2dbf9e2b63d9fe909996777de6bf8bb718298a21de6a7ede5e09941a5bb6ecb26b0a1320fae11146a556b37bfd38723b4d667fd15fdf2bc379a550 SHA512 8a5bc3f806ad80b7a3bc83163af7aecd5fba7a2b8e5253644b0112ebf8a6039f4906044ade1339859eb791625bd7be7a6ddc2b165d54608f923060c66a300d33
-EBUILD gegl-9999.ebuild 4471 BLAKE2B aa1aa47a315427f9c374f6ae60c90d320102e0ebf96023324a86885f13af9917c482f3369b0e4777829fa0546b5b013106784a22efb2e2bd5466772fe15fef9c SHA512 2156e13dfc325de26e5624ed563fad372f0c674e33308d60f62fd6eaabbd003b5dc0c9c8f650979d0443a4c2bfbdb0e23f584714d388339d79c62954f99b4cd6
+EBUILD gegl-0.4.18.ebuild 4878 BLAKE2B be26ff0bb228295832b675317423413b400f277034eebba4214115398ae281254d784be6f6d1f1a314dd9ff3c58ecd3d6397143c8331c0668245a1675c982737 SHA512 dbf8429b00f79ed230dac38b9e5c8ea63a32dab638ad3af173359bd25a332b2210195583254dd4e0588910c860a2007dde21ebd9bf39d15be8acbbe3d408f3f3
+EBUILD gegl-0.4.20.ebuild 4857 BLAKE2B cf94e6f7a15e4824f5f97bc9dfc0ad3898a92fa6f7bfced65966621b9a515cea29b89c371d051f75e98b4b9e51568327ccdeb933ea8e81899e93166da10b34c5 SHA512 e3ab09d1214fd189bebf8fc052961a99e31be19848621da3ae03955800ce9deee0a02ee0b6b47485eed786da653ec1527bc87e6e9c5532db94f2b39de1a519ce
+EBUILD gegl-9999.ebuild 4465 BLAKE2B efcc8cfd2a932d910f2a82ab444bc6eb996077fa5ed0b9f9838c16fab29bddbba3eecdddfdcbe90f176a3c55c46360f0fdf67d2daa5195b4e4e62b42066cbee7 SHA512 e73cce2fb1b7d5cb0b1a4af2efe1656e3b48a71e3f97cf573f51691a70073a4c9c1a17f35c8365549e7bd2651ffb573429f5eef0edab298850134ca840df11c1
 MISC metadata.xml 550 BLAKE2B 8afb3a5aa69ba6b3139f3183ed013cd0797edad0865b0aebcd2824a31549f4968e938017adb85506fea2e60c18ea1278fd3bce0ce1cf9be0efb74b1f0b020470 SHA512 8c5637454afcab249f671518153067a99cac9d60d8e9108688b4328a19ea653de21948a63c7e680585d208c0b3230fd2fb87c2d8a0a7266d31bc328342a47016
diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index df5feb8b8690..68dae56ba0d4 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
diff --git a/media-libs/gegl/gegl-0.4.20.ebuild b/media-libs/gegl/gegl-0.4.20.ebuild
index 5623528869a2..35677f76c85d 100644
--- a/media-libs/gegl/gegl-0.4.20.ebuild
+++ b/media-libs/gegl/gegl-0.4.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 25f257ba42c8..a12ca086b180 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 # vala and introspection support is broken, bug #468208
 VALA_USE_DEPEND=vapigen
 
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index 0b7405f0d2a9..5126f12f03c3 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,3 +1,3 @@
 DIST grilo-0.3.11.tar.xz 233516 BLAKE2B 4f239ae99bbd0fefe501e60bbb1249641a2996a26cc8342d5b8daf0665baaad268de9e295bf52b0b504da5c9a0a1f9174664c1afe1303e5dc8a5b547b2e1d160 SHA512 fd46d035982b14ed19681acce3f4878cc678919babc031ce5eb577a21d14f97b905eb5094b344b7fc732bf317fb504dae940cffb7875de2d577bae431b7f9c36
-EBUILD grilo-0.3.11.ebuild 2184 BLAKE2B 2ae4cbc2756227872ec52d9386b7166b89f5e173e08de916027ddf141180715400a031e7f4fd0b9b14c6555d7b541464e54b963adb3da31139c9634e0d5e195e SHA512 d6ba2acd1ccbc8d7b1e8ee70893804922c3a69cb69d01c1fbf165698949a2d427558a6e08beb3de39cd342ef90417dcbfa6ace2d6559cf1d99eae0d5d6532536
+EBUILD grilo-0.3.11.ebuild 2180 BLAKE2B 61b553437971cc50a0e7dc2fd6422285a883c3cbcdd35c10a1c5a7247727c6dd3c7b03c51f3cda9a23e73a4e4da680f685788133b5e190c5c2014470dc8e9450 SHA512 c6089603299430d6da1a6f6635a72914816b0cff07852e86652f6c440cc440c9c26f41bc8fa4e84eea2ef730cbe62444d9281e2daf2d3f1c8f67a884f39dfd0c
 MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.11.ebuild b/media-libs/grilo/grilo-0.3.11.ebuild
index 28f8fec8b7a3..e4711be72aa5 100644
--- a/media-libs/grilo/grilo-0.3.11.ebuild
+++ b/media-libs/grilo/grilo-0.3.11.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome.org meson python-any-r1 vala xdg
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 93265682ab17..a688e88eeb52 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,6 +2,6 @@ AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa
 DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f
 EBUILD harfbuzz-2.6.1.ebuild 3073 BLAKE2B 519f2c37e7b4bd6a6d41254ed054395f3fbbaecac20be9c2b4a5eec242276020738574a4096695c4362c5fd6e73c1dae8e2f4b6945c917b5f699a3ef121ae89c SHA512 52f4ae285b02ef732852ca31f25bc645e542b50dce262031a8535400ece661399b3a1ad4690017f2effbc7242b20373b125144f00cf0ca648e2b1a5436508991
-EBUILD harfbuzz-2.6.4.ebuild 3041 BLAKE2B 90579c7e11d8fefd2e5202884e6a72a398cc23aa14fb1bcc014621cfc09e6e20ec9f52bea3727f44e11ee00e693485e7967f90a1575bee6fd8adc69332a40542 SHA512 c129b8a31ac54c631475d14a43da140d91c7a2a94e0d28c1b198328ca83b45d8f7fd0f9f79ab62173998e5aadbd76a07bd925b1408cd2f6b3cbf67f9e7d4d6af
-EBUILD harfbuzz-9999.ebuild 3058 BLAKE2B d2336819bc96892978b4243bb6771b4a788f85e04f369f12c05f41ab05e6d0bbf1b3fa575016264451171a5bfdd093aa364d405db843c55021e735197dbcc9de SHA512 69baa034155020602c120fc70617fd1f0f086faf40d64dee494bf56ea4313236aaae43f8941fe5af1da0eba15a1bce5bb769479ef2696e31c9ad6cbb23b7a7a4
+EBUILD harfbuzz-2.6.4.ebuild 3035 BLAKE2B 2105b34d683bae161837dc85a30ef86d2c4acfdad35fbfeefa771f77266410bafaa366e9cda6a7259468d917a758a99d33d7e88e22bc2954d75fecb563d1c473 SHA512 201394159bda2791a93e5d6bce7ad0d06a17e3203c6e3726628e9e7bbf1eab668a4d3e5b10f07733bbbbf63b67a3f01c03a835eb11b0c2bed9820a6cbcfa6f3a
+EBUILD harfbuzz-9999.ebuild 3052 BLAKE2B 7bddf0786714c39b3217051fec34c62a18c02b2f10e260e58bd2835691749697b8d0668a261f32049c7a2e07e74be50cfe59fe82ca0a35d99a381f166d246e3b SHA512 215d36533252522c727712da8c7182ac01938a28a40d51b2befaf02bf2b6a9ad1fa7981c95fd855b14d8ddccd9007d143cee880aa7e245d7c86a8dea8b83e1e9
 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
index 5e7efcc0bd61..99e5ac1e9122 100644
--- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 356659abc38a..aee517e2a1ce 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
 
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 509243b976c7..feb2f7926c17 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,5 +1,3 @@
-DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 DIST imlib2-1.6.1.tar.gz 1038614 BLAKE2B 89751ea5548e86b810d621cbcd5b3d37c7ddbedc9e634095f61d91779c1e96d50f87842136687e2b9cefa249b17fc98df61d07b368c7c4f466687ed38f2ed70f SHA512 0c6d874973c46c7e96e49fc391d463ec8c7c5ce9de682600cb4e28ca81ff0366a02055cbec2a2b743204051243d20b2316ab602b98df9d03dcf319297f7e6a13
-EBUILD imlib2-1.5.1-r1.ebuild 2149 BLAKE2B bc74642e7aab58ab589461e82884a7c08e97f59e6e0683d6a4fbb7198a0778b8a4fea82d53350d6c4c0f9d2519625b47dbd3baf3429f5b98fa718af0167ff2d5 SHA512 16507fd770a73fe0d5429f9d7c69159adeb32f04634be9700ee81d3ccc0550cf658b30fe012bcd76087867a94fd2ddd4df8948077aa3380036e5fa78d63d9edd
 EBUILD imlib2-1.6.1.ebuild 2280 BLAKE2B 5ca1c33f001a6cce19c9f84069eb0db510d4c5f1ccb7b70fb8c4373c06cbe0f6f05bad4705ec80dcde79265fd7bc36d8d14e26a9391892df4f0e540213008a79 SHA512 5788af3bad428b6a6e07b46cf3b53909579d61dfc4e9ec50feeaeb402a86910fcaa153bd1841b3a283b3ee1348f6b422e44bff140e8653de18b16f039be99711
 MISC metadata.xml 3005 BLAKE2B 1b67eed4da7c73ed10d37bc2d5706c09e6457d1c8be4420758afe8906771f0cbba1f8ccb21a2bb5988d5271e794c0460019cba7c1241572443c8f6219db4f003 SHA512 dee85662dd1ef54784c0af882ff76581e3ce6f7d67ae6015801fcaa57e6e05b6ce2e67b408e1f66177a19e0519efc9ddc84b01c208e6f397129768d470a0c424
diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
deleted file mode 100644
index a30f232f48d9..000000000000
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib"
-
-REQUIRED_USE="shm? ( X )"
-
-RDEPEND="
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	gif? ( media-libs/giflib[${MULTILIB_USEDEP}] )
-	jpeg? ( ~virtual/jpeg-0:0=[${MULTILIB_USEDEP}] )
-	mp3? ( media-libs/libid3tag[${MULTILIB_USEDEP}] )
-	nls? ( sys-devel/gettext )
-	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
-	tiff? ( >=media-libs/tiff-4.0.4:0[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-	)
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-"
-
-multilib_src_configure() {
-	local myconf_imlib2=(
-		$(use_with bzip2)
-		$(use_with gif)
-		$(use_with jpeg)
-		$(use_with mp3 id3)
-		$(use_with png)
-		$(use_with shm x-shm-fd)
-		$(use_enable static-libs static)
-		$(use_with tiff)
-		$(use_with X x)
-		$(use_with zlib)
-	)
-
-	# imlib2 has different configure options for x86/amd64 assembly
-	if [[ $(tc-arch) == amd64 ]]; then
-		myconf_imlib2+=( $(use_enable cpu_flags_x86_sse2 amd64) --disable-mmx )
-	else
-		myconf_imlib2+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) )
-	fi
-
-	ECONF_SOURCE="${S}" \
-	econf "${myconf_imlib2[@]}"
-}
-
-multilib_src_install() {
-	V=1 emake install DESTDIR="${D}"
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local HTML_DOCS=( "${S}"/doc/. )
-		rm "${S}"/doc/Makefile.{am,in} || die
-	fi
-	einstalldocs
-}
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 456766ad5215..35e37d4066b2 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jb2streams.zip 1285838 BLAKE2B 9a2b6047a7b970439693d6f5fdefb9488019a562e7f8
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 DIST jbig2dec-0.17.tar.gz 141195 BLAKE2B 858befb59c0b943cddbc4ae2e9ffc6cdb7e1dd2185cedbffb577f0152f27a548f565548b4b0a4867e3973692b8b019a565eabe2cf672334a6b2994fd7988dcaf SHA512 79b3957186a30fc304ecd571d31c5cc421364921eb4eba242c3ea941ea111f461773f86c975657fa2ce91f2f79ff9abf760ef9bed404c7a4f35c036e5642ba0f
 EBUILD jbig2dec-0.14.ebuild 1144 BLAKE2B 7a91e03a74cf156cd8a785d31a0601598774afd260884c73a6c20deb3d125afe9fba52d9b03b5dc1146e206d3cf24da23cac775f7b7d0167d641e23a39a1a028 SHA512 fa18e71040784802416b2ead1f3908e5083fc8488921b8fd112ba96982ba3882ca0145b17c7a86700c6b506ef020f6005c5af23021c2d313da111c168fc20a4c
-EBUILD jbig2dec-0.17-r1.ebuild 1628 BLAKE2B ec351eccd7459bbcad944f94809b2fab5d62ba98e8aac87ee1ce0ee748f7e50b365c08c4c21ff52b1e9bc978d4047e0ea531bdc1a6481fa2564fb6321241890e SHA512 d46c2dc1499dda43e92cb70370b60ed1d62573ca1bb2ea363822b708719ba3e1632538c3ef03ec0a5b5ee9d3104a9bfcf2ddb221174b8dcd815556a05809780e
+EBUILD jbig2dec-0.17-r1.ebuild 1618 BLAKE2B fa67815f5b437d0c1715af5c14e662e5ff33e8548056889cba2d39dfa3f880ada543e7911dcf31f6756f60672318ddad47796f2c7d927335fbd07b8b39079563 SHA512 f0d557bdbab3876e018260c5c7356978101772092443eee8897c8225f3c58fd8e65f4235d69908ff663cfe4c2f6e46a0e175339531b233b9eaf75e71194b2bfc
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
index d6865051761e..81ec6ea19bdb 100644
--- a/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.17-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-any-r1
 
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index 30e2d43f9312..7dbdb515bf54 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,4 @@
 DIST libepoxy-1.5.4.tar.gz 337615 BLAKE2B 2793fde6da59079dfadc653c9f0712b0bd2ca1455a8cda7982bce61c35a3629641a30a76db059af635c1fa0076b4e6c56874b199b41d548afbbad8f6e43384e3 SHA512 c8b03f0a39df320fdd163a34c35f9ffbed51bc0174fd89a7dc4b3ab2439413087e1e1a2fe57418520074abd435051cbf03eb2a7bf8897da1712bbbc69cf27cc5
-EBUILD libepoxy-1.5.4.ebuild 1282 BLAKE2B 7fbd18b374d253dc0576d283c9414a5f2379c3bc29b7b4649e59cb2ecc8f745fa25a20e8c64157c2724eafad1e86b353b6f67cdd3e6d4a93344b95f32cc1f3ad SHA512 8c8602880ff0c5538e5db77e68e09a400f25f54d7353e117b395ff1a44e118be40fd82658f170a5901be7bf40879eff78e780f7d1a8d371ff3e2d6bddf45b2ec
-EBUILD libepoxy-9999.ebuild 1291 BLAKE2B bf973caab3794cbb049bced0b544f84a2a34615c216a9ccb4aeac89e6e5d025bba05547164fa8e38053632df467b047c65b634872a4dd04f8902044e124c7a99 SHA512 9d5865264292a985cda4f83e6e6d22c64cbb36a5462ac3b4c5233300940f09f0c24956d17fbd94b6e544c2527529c2a8c6566f756b82f8c32b0a97a0cd6089ee
+EBUILD libepoxy-1.5.4.ebuild 1278 BLAKE2B f944e2ccefd7116c34ea11ad2a786ef9bdff0dfc0487f318dcdee25b18003bb92779de553cfd947222b10e7ada6675c94929051a2276ff6e0910c1aee4e9a620 SHA512 f8df8b09fac21241907439f4a42aefa68d5c2ad0601afcbc399288d40aab238d80b116afc14c25c4763cd898aa912769216d16340abab3ac283a2ad2f1dddb96
+EBUILD libepoxy-9999.ebuild 1287 BLAKE2B ad166aa96a6d735e378eac8e8d74bc432f9892c442095b7cd225e5d899193c17fb72434a6c29e93ac0e9b972bbf606331e59c5f066df3a94bbddff34b5f93f7d SHA512 f64395059f40960a111aa3ba622cbb1847586bc3f8ad22aaaba5da31d2c8ae6770a78c888fbdf2838f2504856a2f83d2ba1850278030d98e8cb6f151fd4ed41f
 MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.4.ebuild b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
index d3f97708c15c..f68358117f44 100644
--- a/media-libs/libepoxy/libepoxy-1.5.4.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 247ffa088bf2..7d68a7cdbcf2 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='xml(+)'
 inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1
 
diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest
index ce9c5e6eea61..49b9b6c4e516 100644
--- a/media-libs/libffado/Manifest
+++ b/media-libs/libffado/Manifest
@@ -1,4 +1,4 @@
 AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1
 DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74
-EBUILD libffado-2.4.1.ebuild 2799 BLAKE2B b88e34d36d8c708f568103cc1ba3995cf90919d5e459329fdb6fa3ffe39eb3ad344156f049e8a4836d3c408f321ec46583ff1ba63c7fbb5b3a8ab6a6cca2e7a3 SHA512 eba45eda82247f03f8b2033ee1eb2f63ab15f09566adbf65ecfe534d2f798ac53b0d2ae3bec1900825f4560d24d6a17a402153023556b9733c4babd590f4a049
+EBUILD libffado-2.4.1-r1.ebuild 2834 BLAKE2B 076b3a28bd30ca0e70ee9965fd202b2dd70127c78b170eb7648f863326364a024c38b0341ad60384e6bd505a2f0889dee6b1ac96c8ff2b76557df728eee7e07d SHA512 72552a6e68f95e4063479512458e7b7cbaeb549947333c5f934f3fbe9831cdce98fba296240e7281e6050e7aa1626079a12680503dd31c2d53a8d57c42ef603b
 MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34
diff --git a/media-libs/libffado/libffado-2.4.1-r1.ebuild b/media-libs/libffado/libffado-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..4d945041ea53
--- /dev/null
+++ b/media-libs/libffado/libffado-2.4.1-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
+
+DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
+HOMEPAGE="http://www.ffado.org"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit subversion
+	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
+else
+	SRC_URI="http://www.ffado.org/files/${P}.tgz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+fi
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="debug qt5 test-programs"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
+	dev-libs/dbus-c++
+	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
+	media-libs/alsa-lib
+	media-libs/libiec61883[${MULTILIB_USEDEP}]
+	sys-apps/dbus
+	sys-libs/libavc1394[${MULTILIB_USEDEP}]
+	sys-libs/libraw1394[${MULTILIB_USEDEP}]
+	qt5? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}]
+		')
+		x11-misc/xdg-utils
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!<media-sound/jack-audio-connection-kit-0.122.0:0
+	!<media-sound/jack-audio-connection-kit-1.9.9:2"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3-scons-fix.patch"
+)
+
+myescons() {
+	local myesconsargs=(
+		PREFIX="${EPREFIX}/usr"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		UDEVDIR="$(get_udevdir)/rules.d"
+		CUSTOM_ENV=true
+		DETECT_USERSPACE_ENV=false
+		DEBUG=$(usex debug)
+		PYPKGDIR="$(python_get_sitedir)"
+		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
+		# -fomit-frame-pointer is added also which can cripple debugging.
+		# we set flags from portage instead
+		ENABLE_OPTIMIZATIONS=false
+		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
+		# lower versions.
+		ENABLE_SETBUFFERSIZE_API_VER=force
+	)
+	if multilib_is_native_abi; then
+		myesconsargs+=(
+			BUILD_MIXER=$(usex qt5 true false)
+			BUILD_TESTS=$(usex test-programs)
+		)
+	else
+		myesconsargs+=(
+			BUILD_MIXER=false
+			BUILD_TESTS=false
+		)
+	fi
+	escons "${myesconsargs[@]}" "${@}"
+}
+
+src_prepare() {
+	default
+
+	# Always use Qt5
+	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
+
+	# Bugs #658052, #659226
+	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export CC CXX
+	myescons
+}
+
+multilib_src_install() {
+	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	python_fix_shebang "${D}"
+	python_optimize "${D}"
+
+	if use qt5; then
+		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
+		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
+	fi
+}
diff --git a/media-libs/libffado/libffado-2.4.1.ebuild b/media-libs/libffado/libffado-2.4.1.ebuild
deleted file mode 100644
index 571be2962fef..000000000000
--- a/media-libs/libffado/libffado-2.4.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal
-
-DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces"
-HOMEPAGE="http://www.ffado.org"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion
-	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
-else
-	SRC_URI="http://www.ffado.org/files/${P}.tgz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="debug qt5 test-programs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}]
-	dev-libs/dbus-c++
-	dev-libs/libconfig[cxx,${MULTILIB_USEDEP}]
-	media-libs/alsa-lib
-	media-libs/libiec61883[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	sys-libs/libavc1394[${MULTILIB_USEDEP}]
-	sys-libs/libraw1394[${MULTILIB_USEDEP}]
-	qt5? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/PyQt5[dbus,${PYTHON_USEDEP}]
-		x11-misc/xdg-utils
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<media-sound/jack-audio-connection-kit-0.122.0:0
-	!<media-sound/jack-audio-connection-kit-1.9.9:2"
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3-scons-fix.patch"
-)
-
-myescons() {
-	local myesconsargs=(
-		PREFIX="${EPREFIX}/usr"
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-		MANDIR="${EPREFIX}/usr/share/man"
-		UDEVDIR="$(get_udevdir)/rules.d"
-		CUSTOM_ENV=true
-		DETECT_USERSPACE_ENV=false
-		DEBUG=$(usex debug)
-		PYPKGDIR="$(python_get_sitedir)"
-		# ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly
-		# -fomit-frame-pointer is added also which can cripple debugging.
-		# we set flags from portage instead
-		ENABLE_OPTIMIZATIONS=false
-		# This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block
-		# lower versions.
-		ENABLE_SETBUFFERSIZE_API_VER=force
-	)
-	if multilib_is_native_abi; then
-		myesconsargs+=(
-			BUILD_MIXER=$(usex qt5 true false)
-			BUILD_TESTS=$(usex test-programs)
-		)
-	else
-		myesconsargs+=(
-			BUILD_MIXER=false
-			BUILD_TESTS=false
-		)
-	fi
-	escons "${myesconsargs[@]}" "${@}"
-}
-
-src_prepare() {
-	default
-
-	# Always use Qt5
-	sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die
-
-	# Bugs #658052, #659226
-	sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC CXX
-	myescons
-}
-
-multilib_src_install() {
-	myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	python_fix_shebang "${D}"
-	python_optimize "${D}"
-
-	if use qt5; then
-		newicon "support/xdg/hi64-apps-ffado.png" "ffado.png"
-		newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop"
-	fi
-}
diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index 6d3cbf390738..006b40bf8c6d 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -3,5 +3,5 @@ AUX libgpod-0.8.3-mono4.patch 334 BLAKE2B 06b76b3939c6b38e9b9bab8aa0d5b471a04032
 AUX libgpod-0.8.3-pkgconfig_overlinking.patch 640 BLAKE2B 74d924d61ce33c4fd0219e8dedb505bd66cd40e9912efb2dbbb5df31c2bea943ea4a4eb8b9e9baf2762966b02efae3f77c73293f8a4a581f6a43be4cc22eb727 SHA512 c8ebcc18ba7b44aef8fada3f9fea88fdaaf6bae12cf809b08f98e85ab6396ae032bfd7706809cd266be67c694749d4364a9cc591eb750478e095cbbcbe061419
 AUX libgpod-0.8.3-segfault.patch 1171 BLAKE2B ae8f00ad8708f23ef83c9f03f5e9a7157c2bdeaf0cfa2ed4542f8cc96295dad0200e968cb180883efa0e93fd180088be84fa0d2f1b40c642ada0caf37f7f3b9a SHA512 9b2f9a4f4e8f41e5d11cbc943cbba915147b81ec66859b62a5986b5d1c5c90526ce522e24499daf3378c201126ac6e5da8ef855a5f2353b933806c5b3aa6effb
 DIST libgpod-0.8.3.tar.bz2 801903 BLAKE2B e9bc54d23be7f54a17eea3f8a07d7bf6a28224d9c0b0f90fb9d44d97af6cf64c31096de5d9fa4b446e1a9463a6e8f3a59929d73bf52ad8d638732868c3c1b7d0 SHA512 e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
-EBUILD libgpod-0.8.3-r2.ebuild 1924 BLAKE2B 8219d141863c8dcc718902e998f03934fde4fe54d7f5800321c7a163881f0ab838fd02bafac89fdf44859956e74df3e61b64469350adcdd879ce94afc7df2fc6 SHA512 73ef0af171d6edddad09b5efd7834f1de38f23d79214c9538de4a8bf53338f75b9bc72bb534257ecdeab7c210b91714e8bf69220a724ccb518b75532bc74c060
+EBUILD libgpod-0.8.3-r2.ebuild 1966 BLAKE2B af392fa7b565e6bbeb8774a5302df860c272d4463cb0511fcb4d33a4f42d9af92bf864bf4ec7a065cfc8c4091d3f5b42b765dac13b0a911314ac4b24d94d5d45 SHA512 09130974ccddfa2f17b96197fdc0df626d9fa45606d286fe4440aee64333288b6e8a4e8caf61be9bdd0907302be4872d4b46bee04fbbe1808a450950bc2bf2d0
 MISC metadata.xml 483 BLAKE2B 39ce660cb10293f1a9dcf4eed9e253c85f8c2eceb17fb380d61fa5a189c3e2676917b7482676c884ad388a84b36c1e915bfc4a278f3b9c90a79f1d3655c08476 SHA512 0cf6044e1a0bbbd172d3421b4f1eab9a7334cdf1d732f6f61e689fad2d998bf302cb5436e4a695ad9d1a1beaf5939cd269b643db4b4edc2d869469a20c2f2827
diff --git a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild b/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
index bbaec2d1a295..dbff81c64076 100644
--- a/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,10 @@ RDEPEND="
 	ios? ( app-pda/libimobiledevice:= )
 	python? (
 		${PYTHON_DEPS}
-		>=media-libs/mutagen-1.8[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=media-libs/mutagen-1.8[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygobject-2.8:2[${PYTHON_MULTI_USEDEP}]
+		')
 		)
 	udev? ( virtual/udev )
 	mono? (
diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 4394b7baae41..0d4813447e68 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,3 +1,3 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.4.1-r3.ebuild 1280 BLAKE2B beda61664ecd87e1828c29522aacc5d671ac33eb15d20c8e56bffe124864b97995b8a2b1be8190b8c69a2925be1045e424fd27a671e723c5acb7fda9c935178b SHA512 bdba2e0f60a22133f716aa8d8b62345415410228634e56466561119aead00340b2ac7d48750a32f06919fdf07c1b67ee57128b625b6552724387921a46f82c04
+EBUILD libkate-0.4.1-r4.ebuild 1318 BLAKE2B d03ca39e171f034a0e41d64f45cedea2db4a91ee2cb8fd05036ad3599db97f9149dcab28965ec7daf65046c0943e7cd00955e89fe1413274f861bcebd60a8740 SHA512 d5ca6143880d49b527535a27b4a8b1a734fa16b29c970e866000f630dd4e72f57a576b16d28bdf0773e3bbb2b2ac91f11a382de61af0740e037b07da43677288
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r3.ebuild
deleted file mode 100644
index 6745423f91c8..000000000000
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib-minimal python-single-r1
-
-DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
-HOMEPAGE="https://code.google.com/p/libkate/"
-SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-
-IUSE="debug doc wxwidgets"
-REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	media-libs/libogg:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	sys-devel/flex[${MULTILIB_USEDEP}]
-	sys-devel/bison
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	wxwidgets? (
-		${PYTHON_DEPS}
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-		media-libs/liboggz )
-"
-
-pkg_setup() {
-	use wxwidgets && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE=${S}
-	econf \
-		--disable-static \
-		$(use_enable debug) \
-		$(multilib_native_use_enable doc) \
-		$(multilib_native_usex wxwidgets '' 'PYTHON=:')
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-	use wxwidgets && python_fix_shebang "${D}"
-}
diff --git a/media-libs/libkate/libkate-0.4.1-r4.ebuild b/media-libs/libkate/libkate-0.4.1-r4.ebuild
new file mode 100644
index 000000000000..3711f2d95de4
--- /dev/null
+++ b/media-libs/libkate/libkate-0.4.1-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit multilib-minimal python-single-r1
+
+DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
+HOMEPAGE="https://code.google.com/p/libkate/"
+SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
+
+IUSE="debug doc wxwidgets"
+REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	media-libs/libogg:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	sys-devel/flex[${MULTILIB_USEDEP}]
+	sys-devel/bison
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${COMMON_DEPEND}
+	wxwidgets? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+		')
+		media-libs/liboggz )
+"
+
+pkg_setup() {
+	use wxwidgets && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local ECONF_SOURCE=${S}
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_usex wxwidgets '' 'PYTHON=:')
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+	use wxwidgets && python_fix_shebang "${D}"
+}
diff --git a/media-libs/libopenshot-audio/Manifest b/media-libs/libopenshot-audio/Manifest
index 874c1aa40574..000d66c06203 100644
--- a/media-libs/libopenshot-audio/Manifest
+++ b/media-libs/libopenshot-audio/Manifest
@@ -1,6 +1,8 @@
 AUX libopenshot-audio-0.1.4-fix-under-linking.patch 642 BLAKE2B d4ff9256d49efb3bc3bf4a626f1f9186ae6e5ac65dd0da517dde4461353f594a8b1d54ad4ea8974be289833984c77a49b351e1b9e0a49288ed993f9f175b097e SHA512 6fdfc0e8d4a2325389a530d166c5bb504ab71a5274d037a07b579d2855c425197bf0e88349204aadcbdfc9e8efd246f10ca3d20378055f739e1d4d8fba97d7c2
 DIST libopenshot-audio-0.1.4.tar.gz 2959997 BLAKE2B 0736d9f4877f46ac90fd236cbdcfce8c1f66f5ac5d5e9762672a4eaeb668eb61a5f1e45996f0feea604d2c30891198fa58fc89f360815336ea18311d019fed2c SHA512 5605164a8c66c33ac893cc2b42cdacffff03eb156a61740c1b2c00dd7e7602a802fa1dc3795c620810e3ee29a290aa6bae8b62bc17eab3f4dd2d8052e0481824
+DIST libopenshot-audio-0.1.9.tar.gz 1710939 BLAKE2B b9b117fe033c00219e9f6babd1d82dccd2f7a3754e916e5411047deca545bbda8c18ea71a1c7ef0952458ffd40b9f109a918c7c226bace569a8be1927c050bd6 SHA512 8113bf6f5747b0f72391a30560f49c97b13c68994097170797cdfeb44813791b90b073a6caffc91ba1a2153a41b86e8c1b188de0daaec3f5c785013c049c1b4d
 DIST libopenshot-audio-0.1.9_pre20190502.tar.gz 1696201 BLAKE2B 6bc0be3f8374f734cb6b7271c09dad8f7da794acb87236441f41999fab9baa3fee69d6a820db51a4c116b3a5113bb8f72da396babd13511d013b8ffafc2c1bf7 SHA512 73ba3e2054de1b74e6ae7c874a61388220efe12b640f741d5e18d9b242d427fd0fc82b03527af7de64ecd6dbe0a450b884c8557bb5a51493be21838e1f4dfd1a
 EBUILD libopenshot-audio-0.1.4.ebuild 665 BLAKE2B bde925e36f3875a26c4688d7bbb151ba499c4b28cc00053306e86c947e601475ae9fca2d3341275800aef5925a2d31ffb73abce975ad02b23499c88428d16f0e SHA512 38a7755b907648bf091c3808571efaaee5c6111042fd3da07b6c97bdb0f8573ccb1fbfb10478a50fb1fa9d0f1a4334141521f3ba8d384b9f06ba95c0d38c4d4c
+EBUILD libopenshot-audio-0.1.9.ebuild 556 BLAKE2B d3a7259d66c66564e743d8983bc396b547df7e41b79f06c30e3f6048ad7d23f440e6f063651e07548afe39d197929729c6c369112a13a4aab3dce88eb5560bf0 SHA512 7daef3d3e56f9cb68162df6cb0c56d5c706a1f7c3701b5afe13d74a5d221254628ce141adc39a316da202f9213c8a696d19c7993562385c7d3cdfed461a78a73
 EBUILD libopenshot-audio-0.1.9_pre20190502.ebuild 625 BLAKE2B 725a7962655c77f0a16b953135528cf13e46b8cbed0edbf3de1076c1a443bd64b98cfc9fba45a83db61ce9be351877ba885dbfa1387cd723b0860e7715887f98 SHA512 c938a556729e0a93af20f3a89264d975d15d1a3dd070474c8e2bf7f7b36560ee45e776091af53858639ac01a9c6ed3f8880223a1816c1b6acf5eb0256cf34987
 MISC metadata.xml 532 BLAKE2B 1c8bbee08ed6782cd3cbec2eb11fa4775966b7dae76444409d393d0e6adcc82cd45993d4598b375c3e4f91a38e02e6856e0c41e141c82c64e8ec4886e86071ec SHA512 edec80960aa8b55318dc2c4c1fcaa1751c69ab7897a9c965be732f5dcd1e195f26ca13f910124b0d57a7d11a78483bcba9268be79efd4a558fab568693450f96
diff --git a/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.ebuild b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.ebuild
new file mode 100644
index 000000000000..ed11d8638bf2
--- /dev/null
+++ b/media-libs/libopenshot-audio/libopenshot-audio-0.1.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Library for audio editing and playback used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/7"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/alsa-lib
+	media-libs/freetype
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+DEPEND="${RDEPEND}"
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 7af3df08b809..d580bae02584 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -1,6 +1,8 @@
 AUX libopenshot-0.2.2-imagemagick7.patch 3545 BLAKE2B e2fe6ae205459c69ff288f14ba2d0a2b461b761e7ff6e9e66e11e4895b10661d5fc2ab9e2011899ca983399af685a0d411aa4820c02d02b4600617bd314d7670 SHA512 06622c81253fd15440e1cf0256a0beb21e2039a5a98a8c889828898b137a9a6efeb6fb295a0646dc5aa12da9805ff73b62c29272b0037cb1ea2454de7571f59b
 DIST libopenshot-0.2.2.tar.gz 11037768 BLAKE2B c307e41bf17d40ae421a541bbdf4cd53c6ef4d97041a476c6910bd156c10815aa5a5811813b24fdc472401516f29cf8cb68fbda17a0b434767c3f3aa63d6f222 SHA512 b89189e57e82da68a063417bba9c94704c04b0546c0aed227daa23a794eee56341a05988d8e28dbd339edfcdeeaed48103b347060eccf94f32fe1a4bf23d6553
+DIST libopenshot-0.2.4.tar.gz 10295888 BLAKE2B 2967f1faa56090355255e24c0367a4171af7433c53eab303c9d88432174d03879ae9fd2e6904e614ea6ba210e0c72c401cab95a1d2aa93ddd2cea2b861e985ce SHA512 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352
 DIST libopenshot-0.2.4_pre20190609.tar.gz 10268173 BLAKE2B 01e07c0a7c051b5804f24fab1bfb920862a165ef14d3fdd020430b9e3a47858842c8cab3408ba0d161cb15cc6e90531a3b5df9ad327a01f414ff2e7e392fc243 SHA512 bf8c06aba6a899cb1ca6fbe9ac89fc859083b03175338c04af8dce68698f4ac78eac0b5b594e2b02390cd5e64576445b1c95324b254a267506353bed97ca16d1
 EBUILD libopenshot-0.2.2.ebuild 2203 BLAKE2B 5df8e0074314e938d24c187b1caa311571e7941db450556363550a42f858eb994e2fcc259f98dbcda49360aa6a244b4e3963a5ae5fad1ee206efb6b727dac6bc SHA512 aa0645ebedd9d4d7e1b81300c9ad39cfcf39277cd7ff9a215204ab0c95e6acd6c9469a4531a3dbb461407e1579941a39248a32c47f3fca01c95ede448494c4ab
+EBUILD libopenshot-0.2.4.ebuild 2342 BLAKE2B 1ef25538ab2cf6d26f591a69e0200404c338001cd2f177fdceef8734c559a7baf0bf752a1b118566569b8e277c1c09549bc6e8ec82973e2cd1dd6320106e192a SHA512 24a0fd2b1dc0a764e8b2ccc88cb6a77a69494cf8354ad2fa84290d8539f01818e9cfd02abe68e4c0c9d55a291d847139952dcf0805ad258554b054bba1c887d6
 EBUILD libopenshot-0.2.4_pre20190609.ebuild 2499 BLAKE2B 197e14dd027fe8b98ed18824e6fdc7b3684327c39a4e9275566e3c569e99415313bd87af1662653f6e7b3394f40846e1a6c04175c1121dec56cfeb4dfa370d19 SHA512 2edc3a1df921921f434aefb3edebc355eb1d54433acef15d8605a77cdd257a5c6977cc565b2137fe944947f5c4044f35ab13717d77ec9d437d912188ad22f296
 MISC metadata.xml 520 BLAKE2B d4eba07a3598f2fd073fb11a885ccb303a30624ea396fe43799348bc7284375d7223f0553cb01b582d5ceb7daa402878c89290eb27a7e6797d366c5bc1146e91 SHA512 19cdd8b9200c01945b48efbd52b78a45ee681244076bde7045d8d737d00fc7fe41cce6845459cccc2e4ff7b4be1e42eb3c6b14f43165435a9122ff266bbf0b15
diff --git a/media-libs/libopenshot/libopenshot-0.2.4.ebuild b/media-libs/libopenshot/libopenshot-0.2.4.ebuild
new file mode 100644
index 000000000000..39d166e92c80
--- /dev/null
+++ b/media-libs/libopenshot/libopenshot-0.2.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake python-single-r1 toolchain-funcs
+
+DESCRIPTION="Video editing library used by OpenShot"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/18"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +imagemagick libav +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/jsoncpp
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5[widgets]
+	>=media-libs/libopenshot-audio-0.1.9:0=
+	net-libs/cppzmq
+	net-libs/zeromq
+	imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] )
+	!libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] )
+	libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )
+	test? ( dev-libs/unittest++ )
+"
+
+check_compiler() {
+	if [[ ${MERGE_TYPE} != binary ]] && ! tc-has-openmp; then
+		eerror "${P} requires a compiler with OpenMP support. Your current"
+		eerror "compiler does not support it. If you use gcc, you can"
+		eerror "re-emerge it with the 'openmp' use flag enabled."
+		die "The current compiler does not support OpenMP"
+	fi
+}
+
+pkg_pretend() {
+	check_compiler
+}
+
+pkg_setup() {
+	check_compiler
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# https://github.com/OpenShot/libopenshot/issues/17
+	use test || cmake_comment_add_subdirectory tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_RUBY=OFF # TODO: add ruby support
+		-DENABLE_PYTHON=$(usex python)
+		-DUSE_SYSTEM_JSONCPP=ON
+		$(cmake_use_find_package imagemagick ImageMagick)
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && cmake_build doc
+}
+
+src_test() {
+	cmake_build os_test
+}
+
+src_install() {
+	local DOCS=( AUTHORS README.md doc/HW-ACCEL.md )
+	use examples && DOCS+=( src/examples/ )
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+
+	cmake_src_install
+	use python && python_optimize
+}
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 09b32dc9fe20..6cb88ddfae29 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,4 +1,4 @@
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
-EBUILD libpagemaker-0.0.4.ebuild 963 BLAKE2B bd7058b441a96b4888dbc446cfcb08b978903132f8177830cc0d782dd28df273918a41c72c55aa9d8205806a04d23b9db7b0072ff18600fb006e8e6cad983bf4 SHA512 0d292c6474ac837be80f508ab584956b66a573d5d1f0cb281c70a485d4491a6e9b801a380f35926f5990587484c941eb796af0cdd4237f39f73d3da43efff2d7
-EBUILD libpagemaker-9999.ebuild 994 BLAKE2B 3bd85ea89d3df0520d91b4116152a339c88e45f04aaace7f868d0c9dca9d9d618b3a1b94b365da73797c51bce3014e18cd8be952a270ba4e0b84e91c24b05f45 SHA512 474a672aaf43ab3cf144d465b58f934f0a21f56553501d1fb1a7c971d6e2168c7af7acea842b2a238928d2fdc3cde0c3f581c6099fec92459327b10400872874
+EBUILD libpagemaker-0.0.4.ebuild 970 BLAKE2B 3c68c8559412da3f05756617fca8a4d205b9b8c38918cb4341d7a1ac5107aa437ab575cccad6fb4ebb8c4990506cc836250fcbb1b9d6509495c6336965f66ccd SHA512 faaac0b6bf091b24fc362a6e120a303ab024f415243904ce45c2d84dbc2fb64967ef9ad8c4999a96eb50e062694a136dc68db20cb4ee74ad9c94d1fad47e217b
+EBUILD libpagemaker-9999.ebuild 1001 BLAKE2B 4b6101beedeff57e5a72f589952d996e94f90237acf4f1f51ed32319729bc95655aa01718c785f56c213f58d385050022a0f8ae927953439513eb4a0f33ebf14 SHA512 5e5b8b7cd1905ef101bf17a03a0d464a1e2c03c0e5cc1a9b6fe1088082a0eb338325ee488d611bd8909e9820a5d2f5ed74d54965c94d2a4150a2475181805acf
 MISC metadata.xml 346 BLAKE2B 3957184c53e81e9b9727c3da9593b8c4e9c3ab4b59c03f4a6deeae528d397affac28282108c760ac4ddd0c6699b3027158ba33abb0540d12aa15c56302b3110d SHA512 2585fb6fd9ef4008842e0a5c7b1db3d86f152e2d012fdddeba02d1ca0c6e1e457f10c01c8e76b030a0316807f38f6a6853c0111790d7cb6a93437259dbdf503c
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
index 52f9c783e3ea..dedef265f14f 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
@@ -7,7 +7,7 @@ EGIT_REPO_URI="git://gerrit.libreoffice.org/${PN}.git"
 [[ ${PV} == 9999 ]] && inherit autotools git-r3
 
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents."
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
 [[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
diff --git a/media-libs/libpagemaker/libpagemaker-9999.ebuild b/media-libs/libpagemaker/libpagemaker-9999.ebuild
index 35b64943085a..e06afc69f315 100644
--- a/media-libs/libpagemaker/libpagemaker-9999.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-9999.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 DESCRIPTION="C++ Library that parses the file format of Aldus/Adobe PageMaker documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker"
 
 LICENSE="MPL-2.0"
 SLOT="0"
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 46e02a2601d6..46949b5ef409 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,8 +3,10 @@ AUX libprojectm-2.1.0-multilib.patch 1245 BLAKE2B 83f75a317b225816b5649c95fdd046
 AUX libprojectm-2.1.0-path.patch 593 BLAKE2B b4f23ca265e02310e1f7e70ab012e2cdf911182a63108f51957641b02ca7ea782ce1bab506bc7e2df2ebb32a2291256e16d22e776a083ee7d185b4ddd7538fe6 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3
 AUX libprojectm-3.1.0-datadir.patch 6569 BLAKE2B 08dc8a6fee7ad8560a7b6c675b2fd5ebb8562fe2e59dfb29bff17646a85c70e65b510b5bc817c7954b7a9f6f3f88f915f6df6814de52a15450e90f3f6e69ffc1 SHA512 ffcb7401022178311844f6f87aef488995b06e83d9f7b82ed4d943d5531252767075b1c8412e55521fb079d303027d178c2cd795a1ea70f7b86959e82b13dcf1
 DIST libprojectm-3.1.1_rc8.tar.gz 54503673 BLAKE2B f7d781c6a0e54414d0a9ba5ab601556384e6af9b6a23a3123d3f3e0b1613549727b75901681beba1cd3fdd4193415d9e0bb927c4f7b69c41f4e4e85adb5f8597 SHA512 dcf2e7a0a826438bee538f052287b2057a303f5c29e77804874c9d5ea9f3cc0395a51f7734eec027a4f4e687c7b9f818bf908084c8b9da0953cd95d7fa12c864
+DIST libprojectm-3.1.2.tar.gz 54503159 BLAKE2B 5b520a6c1553e80de3fc8b0aedff12c50226252ae7a6d651dff910104244e2f0747fc43791b0524f46f8fa305688749fc4f508b76d04506aa17292f2c8789d1c SHA512 c7c8e61b6262324a7d4094f92796732f7c7bf9fdd82df3dc327efe82fd1d3d8277763059ba72e3fea70875952dd763998cd3b69ed64f594fbff8ae489110dfa2
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
 EBUILD libprojectm-2.1.0-r2.ebuild 1475 BLAKE2B e5e37491cb53dc2dbf3977b7b3590e5a717ccef46369525faaf48b882043ecfc03b1430e52562dc65ac3b78d39a1d43cf1aad374f7eac42c7d1549ab45987e3c SHA512 80a29679f901daf04261de929e32c8f26233b3fabd8dbb999284040319f16b322071f42d5a8f1f659f6a5a05ceccf4b799a319aef88f370b95137f21baa76169
 EBUILD libprojectm-3.1.1_rc8-r1.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
+EBUILD libprojectm-3.1.2.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
 EBUILD libprojectm-9999.ebuild 1224 BLAKE2B ead3781dcdb253a516603b31fc4f086e7915d2b968049392e1d7ff9103d2dcc14165fd6ad8e5b6e99e9fdbf3fa7adce081cdc0b21f8e2b19544ab9f6c4f30df1 SHA512 bc54040af535ca7145e4dd35c74720c75301474a88d0ac8de5f57f9270343d2158fedcd40a2cbf5470e64cb2e5cff40ea7bb46643dc14f44c3b3c238ee2ed97a
 MISC metadata.xml 536 BLAKE2B 097c6a56c2e21ee9badc9f08053423f76341ade802b23ffc0ceb3c88c87daafbd5b8d614ffa7f2e4698211cc873412270ddc477ea58a33ffaed76b1f93012e00 SHA512 5f9fede51b40d834ba1078c410b1644f70c6b239b1ff8b1b343e13a0efe33f90464f9300ebe98c138bdf201014c6b6d22e90805efce2a80110007b00b99bdaa0
diff --git a/media-libs/libprojectm/libprojectm-3.1.2.ebuild b/media-libs/libprojectm/libprojectm-3.1.2.ebuild
new file mode 100644
index 000000000000..ec8f42efd454
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-3.1.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git"
+	inherit git-r3
+else
+	MY_PV="${PV/_/-}"
+	SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	S=${WORKDIR}/projectm-${MY_PV}/
+fi
+
+LICENSE="LGPL-2"
+SLOT="0/2"
+IUSE="gles2 qt5 sdl"
+
+RDEPEND="gles2? ( media-libs/mesa[gles2] )
+	media-libs/glm
+	media-libs/mesa[X(+)]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtopengl:5
+		media-sound/pulseaudio
+	)
+	sdl? ( >=media-libs/libsdl2-2.0.5 )
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable gles2 gles)
+		$(use_enable qt5 qt)
+		$(use_enable sdl)
+		--enable-emscripten=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libshout/Manifest b/media-libs/libshout/Manifest
index 161ea9dc81fb..23753337dee0 100644
--- a/media-libs/libshout/Manifest
+++ b/media-libs/libshout/Manifest
@@ -4,7 +4,7 @@ AUX libshout-2.4.2-tls-compile-with-OpenSSL-1.1.0.patch 1862 BLAKE2B d478fa25f07
 DIST libshout-2.4.1.tar.gz 516161 BLAKE2B bedea3c043018eff4675fdb8b95e0bb8ff02a98994a4afcc76537124ebf7357f012f2e9445ebd207b576fc4166fb761d65066fe166fc8b611b96f5c5482a0e92 SHA512 4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219
 DIST libshout-2.4.2.tar.gz 519249 BLAKE2B 15bd6a552eeb39654a07f5a43f670e53b37c0b239424d2530f09f156e1404da8133e557d614aa7c89aa36e3cec093fecd25aa05d855f283d4af51e1b543eb631 SHA512 ae4b042009887de22d105eb8238f4362f6ff51bd645fd51b5a87c4b5e3f5fdc99e9f99f85c24ae2e9d23eab92b854a7e733bf9f8cc61a8362ce984f02a014e93
 DIST libshout-2.4.3.tar.gz 529563 BLAKE2B 30d982fcf52507e07af23113560cfc9e43ca4ce37c286854326ea09215dc30c3c0d57320dce46dd4faec43b3d473df2f7882ad759479fb023166cec3f24327c5 SHA512 fe36778c6640e620f27504cb21234940e18a65a33f9178bf7e77d4baf854a9affc82d85db8ed8c1c8e2d80399685d8be10106fff5be1ddf76e03e2ffeeed1d34
-EBUILD libshout-2.4.1-r2.ebuild 1400 BLAKE2B c422923fd1e22b1a192eb179fe39c8e1828e05205a81efdd03ab58ecdd01172aed50a5d623257d18aa00661389f2a02cd04c5eccc1d017c19a16e9ebbaa56d6f SHA512 bebfddbb54a1141b1ea9f9d0f062c56f7a3a2eb47d2d0a7da27561a330e278331cf2ba83a364d7dcd9a192f5bc1e69328ef5538286e9b852757ea9659d03a8c4
+EBUILD libshout-2.4.1-r2.ebuild 1398 BLAKE2B 1462f1a57236d0c5435e7879a0d47d9038cc0d1b2950c83acc3348ffd635aa81e3a709a2205c1d4cd7c8cd23022fd4f6340b7266f5a22d04c20ffebe52658fe0 SHA512 f8270e181ec3973af5752667899c704d07bb473cec6451f96ded12ec15dc7a7bc4d56dc41694118f35d2073f6462bd7456cd2ed99f95c7ad10f7e5a5b7a9f943
 EBUILD libshout-2.4.2.ebuild 1386 BLAKE2B 61d51d9de79455f9dda811fbb8529d8a7e89c69653174151b6e8a68a38ed98a08766c94abfe3d69e752dcc77b04978ae9d68cb50b8d30d1950426becf4e3a2b9 SHA512 5690b80f51ce03929d80c0e40994ce426b8f69e96cfaf012a3b6a411f745f1f6af10d9544f3d0c76cc9215052ad8e34a10a9df3f986d39c6a3c26ccaab311173
 EBUILD libshout-2.4.3.ebuild 1322 BLAKE2B 6e654babaf39a4de2e46cc471d886f817a1180cb538404883e930e8049588dcc49b6c800ed88a70ce2fa56c2546acf136f21917bc09cd949151b9bcd386bc7db SHA512 3a75537a6f711564abe78c50716158df9b35623a33b4ccc5a47a2efb9bd4feea59507bcc5d7ecf96eb6dc6a2a95a5bc6cb89427e31e1d8acfa23f7acc7a90612
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libshout/libshout-2.4.1-r2.ebuild b/media-libs/libshout/libshout-2.4.1-r2.ebuild
index 1bbb41cef00e..18b33dc28a21 100644
--- a/media-libs/libshout/libshout-2.4.1-r2.ebuild
+++ b/media-libs/libshout/libshout-2.4.1-r2.ebuild
@@ -54,6 +54,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	rm -rf "${ED%/}"/usr/share/doc/${PN} || die
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 2ad507bfa498..c5fb44ef787a 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -8,7 +8,7 @@ AUX libsndfile-1.0.28-CVE-2018-13139.patch 921 BLAKE2B 4fe567555b1c6e5a0c8098eee
 AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998
-EBUILD libsndfile-1.0.28-r4.ebuild 1878 BLAKE2B 920b6105f8d4b281718f670ece41e84a4475a1bb1f390445d54a71bffb6950917c8a5c3bec9c0aa15130ae3682ba920459769a6356df7bd4f844f6da81c1923d SHA512 dcaf60fa2d04ce76145f0c73e067fa7f415dd41837ab42e5af3af76d6588cd407efbe3350c1f885adcad89401c6680b2a003382218359b7e40bdd32010398544
-EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1680 BLAKE2B f9b2e314166905dd9bf06fed23dddf8ada32db1a5cf5cd400c7010fe2b1734b5d260ff4579526a7825c6d6ef3523178e8f957b2d4fa1d02dac6363131b923b52 SHA512 abd08750bf6b02dab4ec12241bc3a5afc697405ee10107260deb828d9303b50bf5c38fea7457d1dba57ea0a5c1c17b35cc3152a7e375b30d59aaebc41a045dab
-EBUILD libsndfile-9999.ebuild 1825 BLAKE2B fdb4c8b69bc59fe5e5d90da4e8820c3ff1f48a78588d3014abf1b2fb174c70d30e0a4c67ccd52437aa3c96c779fe65c2464bd79e1dae4960dbaf9c828934563f SHA512 0469a8114758a3f9a14bdbbb8dcd15572edb381e5fc33bc9c18495a49bae472abfaf7dc24e46595840c5c7def73254c0a19c206095b64f2c1da287fd3a39f2f3
+EBUILD libsndfile-1.0.28-r4.ebuild 1872 BLAKE2B 320ddb0422e2b4fb1484905e1b760527e84ad892181ab0636e81c4832b068e821768eecc4856417f820607cec92fe9f172562c10a70bf5c4c83b5a76c950ff4a SHA512 ef8131a1b8e51e42b97d968eff9349fa2c7da59b8425f6be03060d55772cd849a494cf38664e1669de17d770a34f4d29d1b5a3ac84535762c68dd2c0a58f5595
+EBUILD libsndfile-1.0.29_pre2_p20191024.ebuild 1676 BLAKE2B 4d6361118b00579e9b01f9dbe53cbdbb30dc88cf5c19ade98bff1c9cc526828b433765356521dbb7560a68afef2634efcf33175a32248043e437846b0d4e6f0b SHA512 06b8ff76cba7ca0b1d6f0a8ac48150e61a2846749ccb2009d2ef0b64ffaf6540b15bcdfe4157b21cddc3fd6927669b4dbe60ba6dc663ffe2ef1909a19a0094ff
+EBUILD libsndfile-9999.ebuild 1821 BLAKE2B dfe0d566f1b33bb655e0d7f111e6c3d2a9d7801147cd8158271f731f9c095f77f26f857f2002d5b4a996277fce93e16ab1c94a3ff26ac713ed6fa8b1b622c441 SHA512 7f3461610476f41665d369e74a9ca33622cd9e262183b92ca570429faf18e4cb7efc1de633ad1dd8729730274796f209d4c3930729d1dfb2af8d11d394fa65c6
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
index fb19c93a3548..9d70049aeac8 100644
--- a/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.28-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
index 435eb04300a8..1a1ff9ab655f 100644
--- a/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.29_pre2_p20191024.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 inherit autotools python-any-r1 multilib-minimal
 
diff --git a/media-libs/libsndfile/libsndfile-9999.ebuild b/media-libs/libsndfile/libsndfile-9999.ebuild
index 1409be979875..d8aeacbde190 100644
--- a/media-libs/libsndfile/libsndfile-9999.ebuild
+++ b/media-libs/libsndfile/libsndfile-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
 
 if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
new file mode 100644
index 000000000000..9c0d944eb88d
--- /dev/null
+++ b/media-libs/libtgvoip/Manifest
@@ -0,0 +1,4 @@
+AUX 2.4.4-pulseaudio.patch 1143 BLAKE2B abbfdccd75bebc71a8e8b5d089db8d7e43efaf57deaff5279057dd200ce1b756021f9c0b5445432f0f7621e28dbf56178ee2265cad3ba6a84aad5ec8f4490b6f SHA512 959ea6e3e26c135e486517ef1390e0b47f12ddfe4779f8faa9f2340f7dca547f51e53945f374372e05ab915c11c2f8af7c8b72c6beb055dfbdbcb7aae50abfc0
+DIST libtgvoip-2.4.4_p20200123.tar.gz 1481831 BLAKE2B 5c6b4ecee4d8daf31f52db1070431cb6caee324d58a20207405ebcd2b275a07c57fa524f3f29e8aaa05e50451730d34ad47bb94a180e3ac8a169dac9979582be SHA512 5da722244d66d3793439e0d3132046f1bb7fa8a56941bcac7779e3779f0c8f517fb5a8f3af546e31d16d4f8deedb9bf7a2d694194fef76bbce233bf1ed6579c3
+EBUILD libtgvoip-2.4.4_p20200123.ebuild 1070 BLAKE2B 39eafc007c1968ba7383885d5435dad691b89fed24ea3ecc3251e49f65abbda852bd53258193573a1c2022a9a2074a9be0fd703d77da5d72ae34a8d952a08c78 SHA512 0776fad15d09433c541a88b0033e63bd9d7b727bb9ca747bf4e38bfa022c91f1493060867395feab3d74f41a985fbd83810190490c1ece5800c4ff96a569ebb6
+MISC metadata.xml 384 BLAKE2B 9eea01ea72a5894e8444fd48a7c20725acb60dec5cac6f7e2d6da2b5461890e099050c65d03df1ece80301b07fa2f93d99d7892c7e6742b7da5910f2ca5e98ec SHA512 e13630d4043b0a9067653ef75054cd339fb0b347b76ab7133fede4915f8c3eba858ffa4ab94527887c98db81788c662d2f050717c7ca790ba8071222a3fd2f89
diff --git a/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch b/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch
new file mode 100644
index 000000000000..ecb0d88a07a4
--- /dev/null
+++ b/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch
@@ -0,0 +1,36 @@
+From 1b029a0eb8b65057a31001e812b28f4685298ea4 Mon Sep 17 00:00:00 2001
+From: Seven Du <dujinfang@gmail.com>
+Date: Fri, 17 May 2019 22:19:08 +0800
+Subject: [PATCH] fix build with pulse audio
+
+---
+ audio/AudioInput.cpp  | 2 +-
+ audio/AudioOutput.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/audio/AudioInput.cpp b/audio/AudioInput.cpp
+index dae647a..7b0c4da 100644
+--- a/audio/AudioInput.cpp
++++ b/audio/AudioInput.cpp
+@@ -79,7 +79,7 @@ void AudioInput::EnumerateDevices(std::vector<AudioInputDevice>& devs){
+ #elif defined(WITHOUT_PULSE)
+ 	AudioInputALSA::EnumerateDevices(devs);
+ #else
+-	AudioInputPulse::EnumerateDevices(devs)
++	AudioInputPulse::EnumerateDevices(devs);
+ #endif
+ #endif
+ }
+diff --git a/audio/AudioOutput.cpp b/audio/AudioOutput.cpp
+index 458e8a5..07a3e31 100644
+--- a/audio/AudioOutput.cpp
++++ b/audio/AudioOutput.cpp
+@@ -90,7 +90,7 @@ void AudioOutput::EnumerateDevices(std::vector<AudioOutputDevice>& devs){
+ #elif defined(WITHOUT_PULSE)
+ 	AudioOutputALSA::EnumerateDevices(devs);
+ #else
+-	AudioOutputPulse::EnumerateDevices(devs)
++	AudioOutputPulse::EnumerateDevices(devs);
+ #endif
+ #endif
+ }
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild
new file mode 100644
index 000000000000..06ad597854cc
--- /dev/null
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+EGIT_COMMIT="c5651ffc728336e56d8567f5c6c179e8a5d4fe55"
+
+DESCRIPTION="VoIP library for Telegram clients"
+HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"
+SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="alsa +dsp libressl pulseaudio"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/opus
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+PATCHES=( "${FILESDIR}/2.4.4-pulseaudio.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_enable dsp)
+		$(use_with alsa)
+		$(use_with pulseaudio pulse)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libtgvoip/metadata.xml b/media-libs/libtgvoip/metadata.xml
new file mode 100644
index 000000000000..c5af453673d4
--- /dev/null
+++ b/media-libs/libtgvoip/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>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+		<flag name="dsp">Enable signal processing (echo cancellation, noise suppression, and automatic gain control)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 3c79a18333ad..1e0f53a339f5 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -9,5 +9,5 @@ AUX libwmf-0.2.8.4-pngfix.patch 582 BLAKE2B 942d02776eb50d71222224f5c11fe2457fae
 AUX libwmf-0.2.8.4-use-freetype2-pkg-config.patch 2050 BLAKE2B 1ea7515753b2f3153c78d80573f219279e76021549ac85131ad9e139a5dd787c107cf83af18529429c4d250b77300a8b553d24ba9030735bac6acd68af833734 SHA512 311189d58d8bca7d91967bda84c6475ccec59fa4e11b535ff6919664cdeaa4b668ea688a021911dd7ea77393189c762c3800214acbed9f09d8591c70efa6b058
 AUX libwmf-0.2.8.4-use-system-fonts.patch 840 BLAKE2B b81b973aeb8b1e59c0fdf8a4dfbbad05285dcb3e4fe9f61002a6997c8988fc8e931dda1c2c3d6f250e287bd084f96c6ada464686ccbc22f6224edaa5fb461196 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c
 DIST libwmf-0.2.8.4.tar.gz 2169375 BLAKE2B d86de4483201a07639779e024752d5c00a3dbc7399be353879b828850b74612651bbcf1851f322d62352259b73647038790580a9a4aeb43b7aeb4c1affedcabe SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
-EBUILD libwmf-0.2.8.4-r7.ebuild 2549 BLAKE2B adc035b3661cd2d2e6a4c580898bfc134066d2f21084758560c8ecf853416da1a8fc08e4ff72c9a2b14d87705075d14ca4191d8aa1117380041e379553d7d4d2 SHA512 e8df8965b53e551dc3496fb3754b670df6893102d39dd72b6d546f2ef99da5f36af8979a38e11ffe124a5438e1343305de0ee22fa5bb8bf2651f983afa5ff0bf
+EBUILD libwmf-0.2.8.4-r7.ebuild 2541 BLAKE2B 317803ec16e86476b4a6f5afd5543116d263c3407934a5e13c9f7ae3d30f1212ea12ffb4d9f495d8e7562a74f0ac341964366c0ad0148c0c22769524fe2625ad SHA512 4c030b16ac032d4e5aaead6c9b4bd3e865f0900ea4c1598c32837b0897cc9f032270d09cbae066f065941a79a0741cf3c50640116053d8fef9d166f91b6be683
 MISC metadata.xml 303 BLAKE2B 6ec9acd2a49b905ced51d2fe9ebc14b8c51008bf684cab000a260db8017ef8a99a7710188a3e5e222aa4bb7bccbec3922445ca39eb07250587fa27f7e07061a3 SHA512 548f41b0b51ebf83dfded3b373434f2866fbdbd1f8a709457787d122bef05a21651adc313f63bfea58473c28b209abce34841cb0eac40c7bd8f84dd233d5bcec
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 3c130ff28f52..c4467c021691 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -69,11 +69,11 @@ src_configure() {
 		$(use_with expat)
 		$(use_with !expat libxml2)
 		$(use_with X x)
-		--with-docdir="${EPREFIX%/}"/usr/share/doc/${PF}
-		--with-fontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
 		--with-freetype
-		--with-gsfontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts
-		--with-gsfontmap="${EPREFIX%/}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
+		--with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		--with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap
 		--with-jpeg
 		--with-layers
 		--with-png
diff --git a/media-libs/libxmlbird/Manifest b/media-libs/libxmlbird/Manifest
index 001ceda63308..1160456d4c76 100644
--- a/media-libs/libxmlbird/Manifest
+++ b/media-libs/libxmlbird/Manifest
@@ -1,5 +1,5 @@
 AUX libxmlbird-1.2.0-configure-valac.patch 1789 BLAKE2B 3c073ca4e985e2037f8b7775a0276ff32a1bad71550b4d4ab78ee508492e06e6f040c2cc4ab7507d157c44ae67b17a7a46c066347a1894520d567de8b92a4f5c SHA512 b3b3642b3b0a9c3c18ccdeddd67b08078473ccf4db6de6e33b41c84ef119b13e25034e2c77e958df5e9ca93eb189b89c3b542a58f2e63d039438a21ef6c19d66
 AUX libxmlbird-1.2.0-libdir.patch 7266 BLAKE2B dbed29bdfae04523e0872433f7cff41e56e7478fccb58effa3ba386a04ba853c637bbc10e904994a0f420103c5dc2371712aa33cf891ff935b9af6ccb07b6a24 SHA512 a879ca5fc70be9a9a3baa7311032b166bc88e6f655e195b57447c665fbe3241dc48235a0f849d9fed4542e09937b150cb7e93f75906668d11fead010318e42a9
 DIST libxmlbird-1.2.0.tar.xz 20004 BLAKE2B da712a82b85188b76943c105cf99f1d366d2dec24c67ce515666a1341dbeef512df62fe5c1407f8b125dd28b662877ca474d422336d789852e822066b5449e3f SHA512 0677004a79194dde87f27387ae1faeb19aa2ecd985664ad4f3f7576d39f71e0d05215c92bb15f3e3f1a4053e27025fd1a4151f1ba12774cfa789d47648097e5b
-EBUILD libxmlbird-1.2.0.ebuild 1240 BLAKE2B f5ba74dd5408395ed4c688ca040224710a9bbf01027b958033a8fc732b6e169264d6bddea95bac0e839ec5a5fbe8c0ee7361c4a6d5048dbf743bc81c90ee9af4 SHA512 d05c30a724ca589eb413132a10cc3608f4077c965eef046e07171fefb0febe64d9c166ecfc574176fd2182e4980348c385d6ead228ccf2ce7861103246f384dd
+EBUILD libxmlbird-1.2.0.ebuild 1234 BLAKE2B 1f496007b880311e5bc06f037e583ad8acba61c7d05185e27e90b81d7267143bca1ad6155a3cd8bece7c173a2882170c491ea2e461e238cb1bbc41426f8c72d6 SHA512 cea7cb7fd0615040ef6386959913e4fe9634f6dcb8eee4b0fe98514ca7bb220bd9b14acc4bef3ec044e9639cbdeeab85862100d9f2f8b89779e0dd33be39c5e6
 MISC metadata.xml 351 BLAKE2B bf15ddb7c39336982fa14d3de2aa0043bda64382be7a2b0ba6154839fcef9569c2b6c41d92fdff90abb87c0d7c9b0383e35d5aa402f760ed4feeff0601575bd9 SHA512 9538a6f758475b5381770ba633843b88a4d1b5e780d6822faca6e1c0f576c0e49d1eb44f152b08a89eb092adbc29541b6736362d1ac8c804a8e7f66dc4b69496
diff --git a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
index 8ad6be3e7fe5..67129e1dcdb1 100644
--- a/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
+++ b/media-libs/libxmlbird/libxmlbird-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-any-r1 vala toolchain-funcs multilib eutils multiprocessing
 
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index c9062047675d..0f147b2b301f 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,6 +1,6 @@
 AUX includedir.patch 403 BLAKE2B 27bf2e0e9dfb44bc62d518ac1282cc2b4d2c77a368c6b6ac7c1b09e24183eb8c40871f1c591000879c043ef322bde90c6ee2a6313d37ecb4fc9626f8a66717ab SHA512 c0aed82243a8a5a5155ba5b39e8283b9f24de498cd0a02e1f3907f5bd0c4b92e1dde9c8a7501784da49b3365ddca0fc0aa2d986119bc4543aa2aefeea46f27de
 DIST lilv-0.24.4.tar.bz2 252209 BLAKE2B 71142f6a458a0edbb2087ac6eb6323b6ae4c53e45db22a616f00b22f818f507aa724ebf576f09654a98812b8b9a73689720677e64c715fbf7cd49ba26c7ddb11 SHA512 cb909c83dbac36b51a206fe508aec51e52ddf068f9a159d053888594402def8d140aae0d9e1e1866e722396f7ec8dea4b86d4c1b958f56eb3193b78307918a89
 DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad
-EBUILD lilv-0.24.4-r1.ebuild 1629 BLAKE2B 75a588823b55fd5cb9921325b64a8d623edee627313bfb07efc9b13d95e9ec4d1a9f84188a28f9a60d8b35d4a9ddbb522a28455788f449c6b6707b29b17549ba SHA512 cac828ae14c566ebe9f5987aba2767cc80da5c047dac47dbe4044e976b280bdc6c68e6341f97ad56057d55ef4c3fd571d0ef6853a0f7a105621d5bf473dc0de2
+EBUILD lilv-0.24.4-r1.ebuild 1625 BLAKE2B 38caa30a0a2765df83d9e2f3f008770a9c8ed7d06f4fd66890a1598faa2b705dce46f38bb16867d816bbd1a697028b4edcc28b7fe93fe468c72c9fee02bf631f SHA512 87777ee80c8d0f97100c6206f20de8e0683f941d5c4396d025c6704492589fa33e7282c4105fda4f8e5221669d5d1c587ed8a59ed3b74539b887c6e86417209c
 EBUILD lilv-0.24.6.ebuild 1764 BLAKE2B 27a24f74badb4b2ceaeb0582ba9c787559e57be6c2c6bd47e1dc09f9093e39a2decf872f4fecce4ecdace1b477bb73d5fa5f34a215f47c7bdd4f3363570daa1b SHA512 558fcca32b27a9a86f2e6521af68f6fbe5da732b1c7e6905db2d8fc6eaf0556f8b2dc54b2e090995aa93e797de875063fb5adbedd8e688ca2facda42b0addea1
 MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce
diff --git a/media-libs/lilv/lilv-0.24.4-r1.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
index cbfb7ae97985..0d2ef8f6bd16 100644
--- a/media-libs/lilv/lilv-0.24.4-r1.ebuild
+++ b/media-libs/lilv/lilv-0.24.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index 1c9f8639a34a..122f765247a1 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,6 +1,6 @@
 AUX lv2-1.16.0-python3.patch 855 BLAKE2B 9b6e74afdca510e3f7e43cf99eff7168db2e738bf12697b435accb54037611f2e24cc842b06abe3789503a1cc0a1ca74f50edf55d26dd7712406ba817f4959c0 SHA512 756c794acbdb2941553a60d1966635a66b44ff7209019fc9516d66baffa6101071f0f412b675823d32ad48c47d533a29cbeadc56459e88435509032569d62fbf
 DIST lv2-1.14.0.tar.bz2 386438 BLAKE2B e09e6c2b1bbf24d5896e7803b970fd8877a5b6a9ded0fcf294561c365d5f0b2e89503c0306b02dd956f7ac6ebd9df4ca0c0a17564ef3851443d81847dd41b261 SHA512 6991d848ed9f04a48ca3070efc15af83431f680aa8a8559a02b1666f7b8d43af8e089f78c3b14ad3345dac32fd1c8ad0faf3a3f56dddc07c6f0e0aeef4077498
 DIST lv2-1.16.0.tar.bz2 502116 BLAKE2B 00b364311f61b1a9f251d8eb3e27b66d4a59e313006df549dbb80fc6a1106b588bc59c7766910037ee093254d96e508f8538615666833b0c00c8282301bfe0e4 SHA512 ead6d590cded5dd7a548d6ffe0f2f9f8efadfa7bb9e8b4fa0aea6664ccdfbb3ca697514bddebe695a9442fba5b62714b5cd45c1bf7d0aaef12ffe50972c2d88c
-EBUILD lv2-1.14.0-r1.ebuild 1324 BLAKE2B e413332fbc2df6aa027095fa693fc3ea8d8144e0d05a2f9331c5c257db1737660408563131a1700ce5462e2cca3968f68f1816024910893add10c1ab2ca100d8 SHA512 cb618fd52f319c74929da171202ed571a3c747f28fa79f259361a114a819212349fe6c0f7b6d04f95d99d23f50c17d42328973b81369c7d3c8448ff42ae6bc44
-EBUILD lv2-1.16.0.ebuild 1323 BLAKE2B 2c37360f5a663b64d7fd4e869a0c8756dff5a0e364462cb05868fc3daca6e3552a97e210bb316fd96404cfdb3caca9df80f58697685ec2789b3e3975b263ba5b SHA512 834e5065ecef64f45f1e195846770bf652780c2fd6021533eb790386e0164920446712b763bcbdb21e39620ceb56f8b1d356e1bd290a0e1a321a587f128a2bfb
+EBUILD lv2-1.14.0-r2.ebuild 1368 BLAKE2B d948dc014d98469b58e27f8e640b1f1ecea95c6ea3d359ec870af27c86c55316c84dff55a8369bfb70c38de973ff2c83e171b1d140fde46acd6287d29cd3c500 SHA512 c8fbf1c9937e2020c7820108479ee963eba9b2f3f08c91c86d9880288b29c39df68c35919465590c20cecc6a28ef8fc6d10142ad8402ef37ba820808e098f948
+EBUILD lv2-1.16.0-r1.ebuild 1373 BLAKE2B 9a8ff5fe5ad4a202cef148f8d7d64fc610aa292664088480a0f34d763f67047dbe8b96420c732526509c3d69765391e4175cffaaefb5ca1f81be7ed4c5a57c8c SHA512 8ca3f0b1a45719e13498da01c4d60fb135eee214c55a3186b46621c0bf59d04f0456418f3c2a103b49ed0df84b8651bd909b79a259c76d1910bab6a2bb2af988
 MISC metadata.xml 340 BLAKE2B e8469f758a451316b9d89c286f2d47c82b62d57ff9d43a6f2f93da8cf0abb5579fa8e568d8e6422e5d144a368310ccdec6e89ce2672f53b9db149bbf838afa68 SHA512 a31345dfd0bb1ac92461cd26ffcd20197775288be0ee4a2d660e90b8655f5288166c9613ba42ef3eef6dff6c97d268ffc85af3429eb093ffb29ad9581a5fa33d
diff --git a/media-libs/lv2/lv2-1.14.0-r1.ebuild b/media-libs/lv2/lv2-1.14.0-r1.ebuild
deleted file mode 100644
index 9c33a5afd098..000000000000
--- a/media-libs/lv2/lv2-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="http://lv2plug.in/"
-SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="doc plugins"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
-RDEPEND="${DEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
-	!<media-libs/slv2-0.4.2
-	!media-libs/lv2core
-	!media-libs/lv2-ui"
-DEPEND="${DEPEND}
-	plugins? ( virtual/pkgconfig )
-	doc? ( app-doc/doxygen dev-python/rdflib )"
-DOCS=( "README.md" "NEWS" )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
-		$(use plugins || echo " --no-plugins") \
-		$(multilib_native_usex doc --docs "")
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${D}"
-}
diff --git a/media-libs/lv2/lv2-1.14.0-r2.ebuild b/media-libs/lv2/lv2-1.14.0-r2.ebuild
new file mode 100644
index 000000000000..d44fb841aaa0
--- /dev/null
+++ b/media-libs/lv2/lv2-1.14.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="A simple but extensible successor of LADSPA"
+HOMEPAGE="http://lv2plug.in/"
+SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE="doc plugins"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
+	')
+	!<media-libs/slv2-0.4.2
+	!media-libs/lv2core
+	!media-libs/lv2-ui"
+DEPEND="${DEPEND}
+	plugins? ( virtual/pkgconfig )
+	doc? ( app-doc/doxygen dev-python/rdflib )"
+DOCS=( "README.md" "NEWS" )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
+		$(use plugins || echo " --no-plugins") \
+		$(multilib_native_usex doc --docs "")
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${D}"
+}
diff --git a/media-libs/lv2/lv2-1.16.0-r1.ebuild b/media-libs/lv2/lv2-1.16.0-r1.ebuild
new file mode 100644
index 000000000000..135b11725f72
--- /dev/null
+++ b/media-libs/lv2/lv2-1.16.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="A simple but extensible successor of LADSPA"
+HOMEPAGE="http://lv2plug.in/"
+SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
+IUSE="doc plugins"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	plugins? ( virtual/pkgconfig )
+	doc? ( app-doc/doxygen dev-python/rdflib )
+"
+CDEPEND="
+	${PYTHON_DEPS}
+	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
+"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+		dev-python/rdflib[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DOCS=( "README.md" "NEWS" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-python3.patch"
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
+		$(use plugins || echo " --no-plugins") \
+		$(multilib_native_usex doc --docs "")
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${D}"
+}
diff --git a/media-libs/lv2/lv2-1.16.0.ebuild b/media-libs/lv2/lv2-1.16.0.ebuild
deleted file mode 100644
index ea755948b201..000000000000
--- a/media-libs/lv2/lv2-1.16.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="A simple but extensible successor of LADSPA"
-HOMEPAGE="http://lv2plug.in/"
-SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="doc plugins"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	plugins? ( virtual/pkgconfig )
-	doc? ( app-doc/doxygen dev-python/rdflib )
-"
-CDEPEND="
-	${PYTHON_DEPS}
-	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
-"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
-"
-DOCS=( "README.md" "NEWS" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-python3.patch"
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
-		$(use plugins || echo " --no-plugins") \
-		$(multilib_native_usex doc --docs "")
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${D}"
-}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 97c276df001e..96bbee8f5dac 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,10 @@
 DIST mesa-19.2.8.tar.xz 11462168 BLAKE2B c49d6d3d10b4c85534a75e4bea29fc8b7526c784af5068764de623d40cbb59ecb96beb1969fa1a13815b6bd259bb98faaf42e4969792c6a75ce702d4b2e57155 SHA512 9bedc2f1a5296da96c1a2a491edaea701e70f683b26eac076e8cbef2230156d5d5ddb2330c3a2530afd4982a9893d76ded8d54bc73a98c846de0c3dfa3634c43
 DIST mesa-19.3.2.tar.xz 11834324 BLAKE2B 114912816a08424da1d55c65d8ff4fb97d58022f5968d37938055e0b0fcdfeeebdbdca3c28d187fd85aaf6385d3a1bfbfe3f011f410e9a991519d34cb81697b5 SHA512 fb69999fa7a15cd6f2c254fb6e8fe635e56dc49a5c2c762a96c77815cbad77060b8f81a02e67ac9ec58092ab866e080fb928086a5ac1e61c3efe882e5825cd28
 DIST mesa-19.3.3.tar.xz 11938700 BLAKE2B a2fd88e8c2d8b189ddf4fcebe324d2f6c00e0c101a565eeb783f50ecc7b2b85f3fe698822788807ab9aaf0403a4d27b7c469bd73c891f535e220b9a0204059f9 SHA512 1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9
-DIST mesa-20.0.0-rc1.tar.xz 12085464 BLAKE2B 5d9831eafe9f2e1e3e0c4bc4cb9b76f3b0fca0b6f0c2e6aa4cc72a5f79308eae392f47627f3372400f832bee14dd76914c398c21f2e93d3c42c7ebc5b8c2bda6 SHA512 1b1d5408768b7eec313083ec12218dfaef1f6bb0e209ee7e49b8974af0cdbfdf71860516e459c6933647ec8895ed61f54db64a26662e3e6500e27560f7d98746
+DIST mesa-20.0.0-rc2.tar.xz 12100548 BLAKE2B 6bc2130dd7920d2a6eee845d4f53633e609ec2f8a740e39df23a732db842dbe5e0da6374dd0a8b2dfbd938ef1d0de55281a80c061d568dd609f8ac78da528aee SHA512 27e23925ce7e3a38954088db47d564776c4ac7e028d30ef5c58229b3182b461ece37863a69bc42ea4ff0a4817c46c0b0ca8d70f6fafddb5c3fe60bd9c429563b
 EBUILD mesa-19.2.8.ebuild 14496 BLAKE2B 1135c0e5ac0a205e7e8fa5ad581b2d4d5b08447c71c76be0d97281de65b58ef7531442d61ad8ae248e4488d1664defba56831beb994473488a9ca0ce35d2b4b0 SHA512 0428f593206f9582a8f083fca0148dcd82b1d77776fb0f766f80157f35f7756c075f0dba18e474e94f11ee28ba750eff8890d78ee0d5abf861e0722090329f7e
 EBUILD mesa-19.3.2.ebuild 14486 BLAKE2B 33d8a963751b081b312b15f53d109bfc3d365d9d44c8c75a2d39a3ef9f06259c9e22d725a57b9003966c4206d5335345795ac7f466d5dbc45623ce198d60657f SHA512 b4cfe959b194238f61da07496eb594391f0de2f50864b47f6cbfa3fdd890b89bbf8d691bd6ba0f3c619972a6d2f52e5b2bf8113fea54856957ebad254b96b28b
 EBUILD mesa-19.3.3.ebuild 14486 BLAKE2B 33d8a963751b081b312b15f53d109bfc3d365d9d44c8c75a2d39a3ef9f06259c9e22d725a57b9003966c4206d5335345795ac7f466d5dbc45623ce198d60657f SHA512 b4cfe959b194238f61da07496eb594391f0de2f50864b47f6cbfa3fdd890b89bbf8d691bd6ba0f3c619972a6d2f52e5b2bf8113fea54856957ebad254b96b28b
-EBUILD mesa-20.0.0_rc1.ebuild 14326 BLAKE2B f3de76318c8e1440d994b944f6e1f6ff8a6ebb34543aef009af2291c9e3269c793d266208c6d9a8c2303be396fa6cba28fcface670c50cc537eaaefed020f473 SHA512 dad54d1e532a5d46250a0128dd11f157779841f44763a6bcf27085caa20635c08d9300cc881eb0da9472de592d264ee3a61cc488aa8eff62ee5095d370c18a31
+EBUILD mesa-20.0.0_rc2.ebuild 14326 BLAKE2B f3de76318c8e1440d994b944f6e1f6ff8a6ebb34543aef009af2291c9e3269c793d266208c6d9a8c2303be396fa6cba28fcface670c50cc537eaaefed020f473 SHA512 dad54d1e532a5d46250a0128dd11f157779841f44763a6bcf27085caa20635c08d9300cc881eb0da9472de592d264ee3a61cc488aa8eff62ee5095d370c18a31
 EBUILD mesa-9999.ebuild 14367 BLAKE2B f943f71814589c1298bb2fa36e20fb440185f0b1ad56126268fe25ac2ba364723a1f09e29af71cbc1b54b903dad90d6f86141cc2ce95f0a4009279ae5ab4dc81 SHA512 44fedc245b2088bc41fe5c88fd8bf33a02378ed18fd33f43f04b0cf6dbd5af51f7445718c0239745677b268153f5b68e803a3c6e6374c9640320021fcbf0de4b
 MISC metadata.xml 1917 BLAKE2B 795c4e550486eeb2f1fca9f43ad653c1ea45ba836677a3e68863d38faf5ccbcb140699f10366b2e1449718ffc4104830f378560e8b4646d5892b70a5bbe46262 SHA512 1133638886b3c039f15f7a8fa4ce55684db65f84e9d8c6b50ad8e2de4370d4303c6852c7d22239681923b5eb7fe6ebd77ee2caa41bb1210507268d3c1a69353d
diff --git a/media-libs/mesa/mesa-20.0.0_rc1.ebuild b/media-libs/mesa/mesa-20.0.0_rc2.ebuild
index 39da329b5dd5..39da329b5dd5 100644
--- a/media-libs/mesa/mesa-20.0.0_rc1.ebuild
+++ b/media-libs/mesa/mesa-20.0.0_rc2.ebuild
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 9941a0e8c054..406e410eebef 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -9,5 +9,5 @@ DIST mlt-6.18.0.tar.gz 1430398 BLAKE2B 43d33756ace75dd38c7a223ff297323d3f47d8b7c
 EBUILD mlt-6.16.0-r1.ebuild 5776 BLAKE2B 87676544fa092cee5ea8b39d710f2ee62fe22f3d7cea6ccb07d8d64aab6ba5d032ad709ef05fd5d981dcee66e7297b7367398bda118e4ce6c1c48d0f1f86c009 SHA512 d608429a2c3c62d5e2507e28789f57ee394aa04362bae8e7b2a22a15aecba221effffb065a9e1031a5d11302ede425b03f7f3b04bace9eb766b507b726e197a1
 EBUILD mlt-6.16.0-r2.ebuild 5776 BLAKE2B f7a30d589351353030d89799d8fe719fbdf434c2ab16648f024297f3f24d4d8e3436acc633ccdfb15f7d0a5a27bacea42a372fd445353dc4f6d59f8912455ea7 SHA512 c34b90ff7bcb17f3673f43312ee088154d0a9845f168afc74b7c3e07af52ba18d955e949a2db1ab48b32d1585d58c0f2af3ee7bca33f0df9d223f7e719c55a49
 EBUILD mlt-6.18.0-r1.ebuild 5374 BLAKE2B bc9fbbaed6447ec2dbd1be10de77fb607728ed4c85ce61a8431c6cfd06817285035dbdfe2983bd04fe5df8095b1ed2a34079598f5d1dc85e6404131b438576fd SHA512 7838b7c247abda99c51b3b8dafe3cae6ea6630a7783f8d3efbf59e06809684415d6d1bdcaccdd29d60852690cbe81666113741cbba8fe5029a0e5d17ee993dd2
-EBUILD mlt-6.18.0.ebuild 5367 BLAKE2B 0eb03e758bd30a27616d715589d17f33b3ac1d07cad905513e25b5eb3acad8512a86ddc52f810ebb577c8e3ef8ccdfb6b44262889e9d472914e7bb2648a18de9 SHA512 dce80d749ac175cf49d435c81d938181ac6c91e4d76c96bc26d9b2ef3a2ec5e6c29d4ce7fe0e772084cb3b0d197efbbb6f761510d1c7ffa92ea825c45eb2e0ab
+EBUILD mlt-6.18.0.ebuild 5374 BLAKE2B 2b1702e9bb100178d620a68e5cbc444fced88662cc187e3c03167a456e913a8b99ded0a9417c0207c38b4070d2afacbce09241d587d4b615c8434b7c387189f5 SHA512 267861c33a99b38c26e291af7fdd893bc5ba607ac2fd74f78189b3be032f077d367db17d41ebd031f42b3537c1ead6285f236b9b7eec71531a78b87f3d969cb0
 MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.18.0.ebuild b/media-libs/mlt/mlt-6.18.0.ebuild
index a2df7a96441f..c835916cd8cb 100644
--- a/media-libs/mlt/mlt-6.18.0.ebuild
+++ b/media-libs/mlt/mlt-6.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
 fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
 qt5 rtaudio ruby sdl vdpau vidstab xine xml"
@@ -100,7 +100,7 @@ src_prepare() {
 
 	# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
 	for x in python lua; do
-		sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
+		sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
 	done
 
 	sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index d90eae9018c0..4ee5c39a2714 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -4,6 +4,6 @@ AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd
 AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
 AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
-EBUILD opencolorio-1.1.0-r1.ebuild 2373 BLAKE2B f9bc666f50135262c76c541003bd356ddad7076108deb2e14d268387ad7ef019d8ec6c2b2aa743ebfd6dd8872857df819bbb278ac1e0f55a6ed8d7afbfc5b914 SHA512 22f051766ef13a15910146f20c7935d8c6e97875c7669e8144f67fb0a1573c69121f9bd60cbfd253e513d2a6402809b40443304c0068deafe02cd76298e0e97c
-EBUILD opencolorio-1.1.0-r2.ebuild 2270 BLAKE2B b2b77f56808cb04d6d9087f7aed1cbdbc6f4cfdcd7edd20f4f22007e31a175660c0cc018a137efe074db06436d4ab0142a45f89f0cad3f9e04a950714ce64ebd SHA512 60003203e8b0c54d575e869caae52f07859c5bf0c4db62547873ba59397963e0f741d2e94085cbee33c54ab470866089283449e67b7aad42ac4b58ed57d3df9e
+EBUILD opencolorio-1.1.0-r3.ebuild 2414 BLAKE2B 95c52266c77793fbec05be57c7ee1c2e5a1fff579ef4b0520a20f08ae0fc433b3c6bfc45299bcb2fe47419ef274bd20eee5472e9611199076d6a5c48162d339b SHA512 6cb2ab8f7b5f60249100d5fb1ef15234632d901851a9946fc3a66a1691b64d646a2dc265e7b60baadc52fdea0531a4b0be43377e04532a81025e2f2868ae1c9e
+EBUILD opencolorio-1.1.0-r4.ebuild 2311 BLAKE2B 351293de329dc85cf4ea3b95f38136dfa43ac565ad1103df94665c22bcd55579e166a66c4183eaa3eeb4f354d232c2e92437942ecde5334b62da95d8064a893e SHA512 51325d2ce2cc344485a6314999151ff350bcdd57accb49a2da3e98b02bd3ee6d5cb375097bd95ddb3d10771f2019c389669471348665996815d34c074d086586
 MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
deleted file mode 100644
index e324b83533c8..000000000000
--- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="http://opencolorio.org/"
-
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	opengl? (
-		media-libs/lcms:2
-		media-libs/openimageio
-		media-libs/glew:=
-		media-libs/freeglut
-		virtual/opengl
-	)
-	python? ( ${PYTHON_DEPS} )
-	>=dev-cpp/yaml-cpp-0.5
-	dev-libs/tinyxml"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-compile-error-with-Lut1DOp.cpp.patch"
-	"${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
-	"${FILESDIR}/${P}-remove-building-of-bundled-programs.patch"
-	"${FILESDIR}/${P}-yaml-cpp-0.6.patch"
-	"${FILESDIR}/${P}-remove-Werror.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use python && python_fix_shebang .
-}
-
-src_configure() {
-	# Missing features:
-	# - Truelight and Nuke are not in portage for now, so their support are disabled
-	# - Java bindings was not tested, so disabled
-	# Notes:
-	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
-	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
-	local mycmakeargs=(
-		-DOCIO_BUILD_JNIGLUE=OFF
-		-DOCIO_BUILD_NUKE=OFF
-		-DOCIO_BUILD_SHARED=ON
-		-DOCIO_BUILD_STATIC=$(usex static-libs)
-		-DOCIO_STATIC_JNIGLUE=OFF
-		-DOCIO_BUILD_TRUELIGHT=OFF
-		-DUSE_EXTERNAL_LCMS=ON
-		-DUSE_EXTERNAL_TINYXML=ON
-		-DUSE_EXTERNAL_YAML=ON
-		-DOCIO_BUILD_DOCS=$(usex doc)
-		-DOCIO_BUILD_APPS=$(usex opengl)
-		-DOCIO_BUILD_PYGLUE=$(usex python)
-		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
-		-DOCIO_BUILD_TESTS=$(usex test)
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
deleted file mode 100644
index a4e109ff8155..000000000000
--- a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="http://opencolorio.org/"
-
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	opengl? (
-		media-libs/lcms:2
-		media-libs/openimageio
-		media-libs/glew:=
-		media-libs/freeglut
-		virtual/opengl
-	)
-	python? ( ${PYTHON_DEPS} )
-	>=dev-cpp/yaml-cpp-0.5
-	dev-libs/tinyxml
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-compile-error-with-Lut1DOp.cpp.patch"
-	"${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
-	"${FILESDIR}/${P}-remove-building-of-bundled-programs.patch"
-	"${FILESDIR}/${P}-yaml-cpp-0.6.patch"
-	"${FILESDIR}/${P}-remove-Werror.patch"
-)
-
-S="${WORKDIR}/OpenColorIO-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	use python && python_fix_shebang .
-}
-
-src_configure() {
-	# Missing features:
-	# - Truelight and Nuke are not in portage for now, so their support are disabled
-	# - Java bindings was not tested, so disabled
-	# Notes:
-	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
-	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
-	local mycmakeargs=(
-		-DOCIO_BUILD_JNIGLUE=OFF
-		-DOCIO_BUILD_NUKE=OFF
-		-DOCIO_BUILD_SHARED=ON
-		-DOCIO_BUILD_STATIC=$(usex static-libs)
-		-DOCIO_STATIC_JNIGLUE=OFF
-		-DOCIO_BUILD_TRUELIGHT=OFF
-		-DUSE_EXTERNAL_LCMS=ON
-		-DUSE_EXTERNAL_TINYXML=ON
-		-DUSE_EXTERNAL_YAML=ON
-		-DOCIO_BUILD_DOCS=$(usex doc)
-		-DOCIO_BUILD_APPS=$(usex opengl)
-		-DOCIO_BUILD_PYGLUE=$(usex python)
-		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
-		-DOCIO_BUILD_TESTS=$(usex test)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r3.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r3.ebuild
new file mode 100644
index 000000000000..a6978ea8c3e2
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake-utils python-single-r1 vcs-snapshot
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="http://opencolorio.org/"
+
+SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	opengl? (
+		media-libs/lcms:2
+		media-libs/openimageio
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+	>=dev-cpp/yaml-cpp-0.5
+	dev-libs/tinyxml"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-compile-error-with-Lut1DOp.cpp.patch"
+	"${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
+	"${FILESDIR}/${P}-remove-building-of-bundled-programs.patch"
+	"${FILESDIR}/${P}-yaml-cpp-0.6.patch"
+	"${FILESDIR}/${P}-remove-Werror.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	use python && python_fix_shebang .
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		-DOCIO_BUILD_JNIGLUE=OFF
+		-DOCIO_BUILD_NUKE=OFF
+		-DOCIO_BUILD_SHARED=ON
+		-DOCIO_BUILD_STATIC=$(usex static-libs)
+		-DOCIO_STATIC_JNIGLUE=OFF
+		-DOCIO_BUILD_TRUELIGHT=OFF
+		-DUSE_EXTERNAL_LCMS=ON
+		-DUSE_EXTERNAL_TINYXML=ON
+		-DUSE_EXTERNAL_YAML=ON
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_PYGLUE=$(usex python)
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
new file mode 100644
index 000000000000..5e3887be717e
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="http://opencolorio.org/"
+
+SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	opengl? (
+		media-libs/lcms:2
+		media-libs/openimageio
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+	>=dev-cpp/yaml-cpp-0.5
+	dev-libs/tinyxml
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-compile-error-with-Lut1DOp.cpp.patch"
+	"${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
+	"${FILESDIR}/${P}-remove-building-of-bundled-programs.patch"
+	"${FILESDIR}/${P}-yaml-cpp-0.6.patch"
+	"${FILESDIR}/${P}-remove-Werror.patch"
+)
+
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	use python && python_fix_shebang .
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		-DOCIO_BUILD_JNIGLUE=OFF
+		-DOCIO_BUILD_NUKE=OFF
+		-DOCIO_BUILD_SHARED=ON
+		-DOCIO_BUILD_STATIC=$(usex static-libs)
+		-DOCIO_STATIC_JNIGLUE=OFF
+		-DOCIO_BUILD_TRUELIGHT=OFF
+		-DUSE_EXTERNAL_LCMS=ON
+		-DUSE_EXTERNAL_TINYXML=ON
+		-DUSE_EXTERNAL_YAML=ON
+		-DOCIO_BUILD_DOCS=$(usex doc)
+		-DOCIO_BUILD_APPS=$(usex opengl)
+		-DOCIO_BUILD_PYGLUE=$(usex python)
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 28a8fad17acd..18f3994454bb 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -27,7 +27,7 @@ DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a
 DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
 DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-2.4.13-r3.ebuild 5981 BLAKE2B 82922ac811bc4a27fabbd4ee329b6646066211707496be14c86dc044395daaceb5fa3d0683d5e5eeb73d4ba765d2e8a62dd3323b257612e32d0afef2326ca83f SHA512 c62c40a50aadd992142ffaf389c5ea895f55a87d693928f74cf6b4ac9bc2363dd5e6729cb3cab06ba8141eafd8853d194f252de532322fa625a3d8de852aafac
+EBUILD opencv-2.4.13-r4.ebuild 6028 BLAKE2B 49e634cf091fdbaf69e518f2fde2f3916bdaf39b0fed413d253c22f3c823ef132d49c2c7891b2c6d73e3a7c9b1e3b8efe999940d4d5aff50844b4ad9a5728eb6 SHA512 464e49cf782cabe002d3d5c499932c31cde6ec69658330a8040eb7cbd8a56e94f94ca3cf073780665066e34ee06c338dadbddc18602c6f900a9922ae1edcba74
 EBUILD opencv-3.4.1-r7.ebuild 18644 BLAKE2B 636275f9a39e3fef49f59d2d93e4fe288e73de35e210aec8ec7982058e1f0c98d25a7e7e9ffd85aeccf088225058357c2d7e23330d4a912e3f345a501735a030 SHA512 eba05037ccbdf8858aa799dddad2ddbc031677a69ed808d324e4aa2ae10a29f7f6c0424f92892ea8cdbcf3915da4b47f2a97227bfa35fe390e43c3f5d0439cb5
 EBUILD opencv-4.1.2-r1.ebuild 18329 BLAKE2B f917c45b9d91c362c1470f41ef6f4ad72b5c45d4c3c2c2901a714ebe5898cc3a742ae8a7d15646399d3568bff70b32e63d5d5f82cb6da12864aab88ca98e8cfb SHA512 4ee76673c4284546aa9018cdde1e2b2278e64650695fac63d1677c79beae28dd18b696c19dea7e30d661a9a2dcca22b11bd272c736a582a5b2049029497c4269
 EBUILD opencv-4.1.2-r2.ebuild 18370 BLAKE2B 347aad52543221205f22bf1672b540bb67eb917065b9cb2c9f1dc113ecb4ba967851912ba7abeb48c00a2d3ae076e0a46d51c8a8e682ef8e12401b88627fa8e3 SHA512 c9b204281dee9ca4ba73ee2bca2dfe54d837944a05f8f4f890ec8b82a4177e5d2095c31adbd9a64cf58679f23ebe68cbcb728d3cd8aa0cfe0d0484f8bff29c5a
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
deleted file mode 100644
index caceec0fd66e..000000000000
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2.4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#	gtk? ( !qt4 )
-#	opengl? ( || ( gtk qt4 ) )
-#	openmp? ( !threads )
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		opengl? ( x11-libs/gtkglext )
-	)
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0 )
-	ieee1394? (
-		media-libs/libdc1394
-		sys-libs/libraw1394
-	)
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr )
-	opengl? ( virtual/opengl virtual/glu )
-	png? ( media-libs/libpng:0= )
-	python? (
-		${PYTHON_DEPS}
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qttest:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	threads? ( dev-cpp/tbb )
-	tiff? ( media-libs/tiff:0 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	vtk? ( sci-libs/vtk[rendering] )
-	xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	eigen? ( dev-cpp/eigen:3 )
-	java? ( >=virtual/jdk-1.6 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
-	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
-	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
-	"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
-	"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
-	"${FILESDIR}/${PN}-3.0.0-gles.patch"
-	"${FILESDIR}/${P}-gcc-6.0.patch"
-	"${FILESDIR}/${P}-imgcodecs-refactoring.patch" #bug 627958
-)
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled stuff
-	rm -rf 3rdparty || die "Removing 3rd party components failed"
-	sed -i \
-		-e '/add_subdirectory(3rdparty)/ d' \
-		CMakeLists.txt || die
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-
-	JAVA_ANT_ENCODING="iso-8859-1"
-	# set encoding so even this cmake build will pick it up.
-	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-	java-ant-2_src_configure
-
-	# please dont sort here, order is the same as in CMakeLists.txt
-	local mycmakeargs=(
-	# the optinal dependency libraries
-		-DWITH_1394=$(usex ieee1394)
-		-DWITH_AVFOUNDATION=OFF
-		-DWITH_VTK=$(usex vtk)
-		-DWITH_EIGEN=$(usex eigen)
-		-DWITH_VFW=OFF
-		-DWITH_FFMPEG=$(usex ffmpeg)
-		-DWITH_GSTREAMER=$(usex gstreamer)
-		-DWITH_GSTREAMER_0_10=OFF
-		-DWITH_GTK=$(usex gtk)
-		-DWITH_IMAGEIO=OFF
-		-DWITH_IPP=OFF
-		-DWITH_JASPER=OFF
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_OPENEXR=$(usex openexr)
-		-DWITH_OPENGL=$(usex opengl)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENNI=OFF
-		-DWITH_PNG=$(usex png)
-		-DWITH_PVAPI=OFF
-		-DWITH_QT=$(usex qt5 5 OFF)
-		-DWITH_GIGEAPI=OFF
-		-DWITH_WIN32UI=OFF
-		-DWITH_QUICKTIME=OFF
-		-DWITH_TBB=$(usex threads)
-		-DWITH_OPENMP=$(usex openmp)
-		-DWITH_CSTRIPES=OFF
-		-DWITH_TIFF=$(usex tiff)
-		-DWITH_UNICAP=OFF
-		-DWITH_V4L=$(usex v4l)
-		-DWITH_LIBV4L=$(usex v4l)
-		-DWITH_DSHOW=ON
-		-DWITH_MSMF=OFF
-		-DWITH_XIMEA=OFF
-		-DWITH_XINE=$(usex xine)
-		-DWITH_OPENCL=$(usex opencl)
-		-DWITH_OPENCLAMDFFT=$(usex opencl)
-		-DWITH_OPENCLAMDBLAS=$(usex opencl)
-		-DWITH_INTELPERC=OFF
-		-DWITH_JAVA=$(usex java)
-
-		# the build components
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_ANDROID_EXAMPLES=OFF
-		-DBUILD_DOCS=OFF #too much dark magic in cmakelists
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_PERF_TESTS=OFF
-		-DBUILD_TESTS=$(usex testprograms)
-
-		# install examples
-		-DINSTALL_C_EXAMPLES=$(usex examples)
-		-DINSTALL_TESTS=$(usex testprograms)
-
-		# build options
-		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
-		-DENABLE_SOLUTION_FOLDERS=OFF
-		-DENABLE_PROFILING=OFF
-		-DENABLE_COVERAGE=OFF
-		-DENABLE_OMIT_FRAME_POINTER=OFF
-		-DENABLE_FAST_MATH=OFF					#
-		-DENABLE_SSE=OFF					# these options do nothing but
-		-DENABLE_SSE2=OFF					# add params to CFLAGS
-		-DENABLE_SSE3=OFF
-		-DENABLE_SSSE3=OFF
-		-DENABLE_SSE41=OFF
-		-DENABLE_SSE42=OFF
-
-		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
-	)
-
-	if use cuda; then
-		if [[ "$(gcc-version)" > "4.8" ]]; then
-			# bug 577410
-			# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
-			ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support."
-			mycmakeargs+=( -DWITH_CUDA=OFF )
-			mycmakeargs+=( -DWITH_CUBLAS=OFF )
-			mycmakeargs+=( -DWITH_CUFFT=OFF )
-
-		else
-			mycmakeargs+=( -DWITH_CUDA=ON )
-			mycmakeargs+=( -DWITH_CUBLAS=ON )
-			mycmakeargs+=( -DWITH_CUFFT=ON )
-			mycmakeargs+=( -DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda )
-		fi
-	else
-		mycmakeargs+=( -DWITH_CUDA=OFF )
-		mycmakeargs+=( -DWITH_CUBLAS=OFF )
-		mycmakeargs+=( -DWITH_CUFFT=OFF )
-	fi
-
-	if use examples && use python; then
-		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON )
-	else
-		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF )
-	fi
-
-	# things we want to be hard off or not yet figured out
-	mycmakeargs+=(
-		-DOPENCV_BUILD_3RDPARTY_LIBS=OFF
-		-DBUILD_PACKAGE=OFF
-	)
-
-	# things we want to be hard enabled not worth useflag
-	mycmakeargs+=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DOPENCV_DOC_INSTALL_PATH=
-	)
-
-	# workaround for bug 413429
-	tc-export CC CXX
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencv/opencv-2.4.13-r4.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild
new file mode 100644
index 000000000000..e678316f625b
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.13-r4.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="https://opencv.org"
+
+SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.4"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+#	gtk? ( !qt4 )
+#	opengl? ( || ( gtk qt4 ) )
+#	openmp? ( !threads )
+
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		opengl? ( x11-libs/gtkglext )
+	)
+	java? ( >=virtual/jre-1.6:* )
+	jpeg? ( virtual/jpeg:0 )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr )
+	opengl? ( virtual/opengl virtual/glu )
+	png? ( media-libs/libpng:0= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		')
+	)
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qttest:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff:0 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	vtk? ( sci-libs/vtk[rendering] )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	eigen? ( dev-cpp/eigen:3 )
+	java? ( >=virtual/jdk-1.6 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch"
+	"${FILESDIR}/${PN}-2.4.3-gcc47.patch"
+	"${FILESDIR}/${PN}-2.4.2-cflags.patch"
+	"${FILESDIR}/${PN}-2.4.8-javamagic.patch"
+	"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch"
+	"${FILESDIR}/${PN}-3.0.0-gles.patch"
+	"${FILESDIR}/${P}-gcc-6.0.patch"
+	"${FILESDIR}/${P}-imgcodecs-refactoring.patch" #bug 627958
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bundled stuff
+	rm -rf 3rdparty || die "Removing 3rd party components failed"
+	sed -i \
+		-e '/add_subdirectory(3rdparty)/ d' \
+		CMakeLists.txt || die
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+
+	JAVA_ANT_ENCODING="iso-8859-1"
+	# set encoding so even this cmake build will pick it up.
+	export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+	java-ant-2_src_configure
+
+	# please dont sort here, order is the same as in CMakeLists.txt
+	local mycmakeargs=(
+	# the optinal dependency libraries
+		-DWITH_1394=$(usex ieee1394)
+		-DWITH_AVFOUNDATION=OFF
+		-DWITH_VTK=$(usex vtk)
+		-DWITH_EIGEN=$(usex eigen)
+		-DWITH_VFW=OFF
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_GSTREAMER=$(usex gstreamer)
+		-DWITH_GSTREAMER_0_10=OFF
+		-DWITH_GTK=$(usex gtk)
+		-DWITH_IMAGEIO=OFF
+		-DWITH_IPP=OFF
+		-DWITH_JASPER=OFF
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OPENEXR=$(usex openexr)
+		-DWITH_OPENGL=$(usex opengl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENNI=OFF
+		-DWITH_PNG=$(usex png)
+		-DWITH_PVAPI=OFF
+		-DWITH_QT=$(usex qt5 5 OFF)
+		-DWITH_GIGEAPI=OFF
+		-DWITH_WIN32UI=OFF
+		-DWITH_QUICKTIME=OFF
+		-DWITH_TBB=$(usex threads)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_CSTRIPES=OFF
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_UNICAP=OFF
+		-DWITH_V4L=$(usex v4l)
+		-DWITH_LIBV4L=$(usex v4l)
+		-DWITH_DSHOW=ON
+		-DWITH_MSMF=OFF
+		-DWITH_XIMEA=OFF
+		-DWITH_XINE=$(usex xine)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_OPENCLAMDFFT=$(usex opencl)
+		-DWITH_OPENCLAMDBLAS=$(usex opencl)
+		-DWITH_INTELPERC=OFF
+		-DWITH_JAVA=$(usex java)
+
+		# the build components
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_ANDROID_EXAMPLES=OFF
+		-DBUILD_DOCS=OFF #too much dark magic in cmakelists
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_PERF_TESTS=OFF
+		-DBUILD_TESTS=$(usex testprograms)
+
+		# install examples
+		-DINSTALL_C_EXAMPLES=$(usex examples)
+		-DINSTALL_TESTS=$(usex testprograms)
+
+		# build options
+		-DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+		-DENABLE_SOLUTION_FOLDERS=OFF
+		-DENABLE_PROFILING=OFF
+		-DENABLE_COVERAGE=OFF
+		-DENABLE_OMIT_FRAME_POINTER=OFF
+		-DENABLE_FAST_MATH=OFF					#
+		-DENABLE_SSE=OFF					# these options do nothing but
+		-DENABLE_SSE2=OFF					# add params to CFLAGS
+		-DENABLE_SSE3=OFF
+		-DENABLE_SSSE3=OFF
+		-DENABLE_SSE41=OFF
+		-DENABLE_SSE42=OFF
+
+		-DOPENCV_EXTRA_FLAGS_RELEASE=""				# black magic
+	)
+
+	if use cuda; then
+		if [[ "$(gcc-version)" > "4.8" ]]; then
+			# bug 577410
+			# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
+			ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support."
+			mycmakeargs+=( -DWITH_CUDA=OFF )
+			mycmakeargs+=( -DWITH_CUBLAS=OFF )
+			mycmakeargs+=( -DWITH_CUFFT=OFF )
+
+		else
+			mycmakeargs+=( -DWITH_CUDA=ON )
+			mycmakeargs+=( -DWITH_CUBLAS=ON )
+			mycmakeargs+=( -DWITH_CUFFT=ON )
+			mycmakeargs+=( -DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda )
+		fi
+	else
+		mycmakeargs+=( -DWITH_CUDA=OFF )
+		mycmakeargs+=( -DWITH_CUBLAS=OFF )
+		mycmakeargs+=( -DWITH_CUFFT=OFF )
+	fi
+
+	if use examples && use python; then
+		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON )
+	else
+		mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF )
+	fi
+
+	# things we want to be hard off or not yet figured out
+	mycmakeargs+=(
+		-DOPENCV_BUILD_3RDPARTY_LIBS=OFF
+		-DBUILD_PACKAGE=OFF
+	)
+
+	# things we want to be hard enabled not worth useflag
+	mycmakeargs+=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DOPENCV_DOC_INSTALL_PATH=
+	)
+
+	# workaround for bug 413429
+	tc-export CC CXX
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index dc90623da02f..0724c1fc101c 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1,4 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
-EBUILD openimageio-1.8.17-r1.ebuild 3109 BLAKE2B 99bfcca70f60ad50cf63cea34d8a7e12d5b7940949284b57f7c5c9113905986704798fc33800c9ee7fbb046a9b011007455e9e47df94f3cab564e63578a19d6a SHA512 c40c8f0f68b9dd27e18da5abd15025c4a628fceb28a4170d67eef37c463164d3c597670ec688d39db6526e58d5921e531941241a0e4ec8b58e599e4f3a3b5f92
+EBUILD openimageio-1.8.17-r2.ebuild 3147 BLAKE2B 8fc27aefbc85f11a22f4decefc0ea55f805992cfdc6f2013af3d5e9b6a91b938d6f23d17c5c43455b41bc56721c7593cd3f440a1adb31c707d0c05c276f42425 SHA512 358ddbda5f037708bef1f81751258fc3a72fd0b3fc71fdac1dda1be1d020339ed99bf18476873420df16fa0535f05936aac3b7b6c0e2f03343ade6cbe3848a07
 MISC metadata.xml 840 BLAKE2B b1eb9cb3531989610d82fdbff7e56f87e5ad059c8afd6f7c9f513bc5ef6c7eda497dc06a52e32e5da9cc0231cb1d3acd6ca1ddf4792de002273c599824336e0f SHA512 d183b91af486faaced4d6613eddb1f5e5a0b8007a4cb719875cb858bb1135b4db4c5ee4e70cf9db9e4468a4f044e150fcc6e54670b42f4748ba210d5bde778dd
diff --git a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
deleted file mode 100644
index 8384bd61702d..000000000000
--- a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
-	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
-	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" # bug 431412
-
-BDEPEND="
-	doc? ( app-doc/doxygen[latex] )
-"
-RDEPEND="
-	>=dev-libs/boost-1.62:=
-	dev-libs/pugixml:=
-	>=media-libs/ilmbase-2.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	>=media-libs/openexr-2.2.0-r2:=
-	media-libs/tiff:0=
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	color-management? ( media-libs/opencolorio:= )
-	dicom? ( sci-libs/dcmtk )
-	ffmpeg? ( media-video/ffmpeg:= )
-	field3d? ( media-libs/Field3D:= )
-	gif? ( media-libs/giflib:0= )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
-	opencv? ( media-libs/opencv:= )
-	opengl? (
-		media-libs/glew:=
-		virtual/glu
-		virtual/opengl
-	)
-	ptex? ( media-libs/ptex:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	raw? ( media-libs/libraw:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
-
-PATCHES=( "${FILESDIR}/${P}-boostpython.patch" )
-
-S="${WORKDIR}/oiio-Release-${PV}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
-	# Build with SIMD support
-	local cpufeature
-	local mysimd=()
-	for cpufeature in "${CPU_FEATURES[@]}"; do
-		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
-	done
-
-	# If no CPU SIMDs were used, completely disable them
-	[[ -z ${mysimd} ]] && mysimd=("0")
-
-	local mycmakeargs=(
-		-DINSTALL_DOCS=$(usex doc)
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_JPEGTURBO=ON
-		-DUSE_NUKE=NO # Missing in Gentoo
-		-DUSE_NUKE=OFF
-		-DUSE_OCIO=$(usex color-management)
-		-DUSE_DICOM=$(usex dicom)
-		-DUSE_FFMPEG=$(usex ffmpeg)
-		-DUSE_FIELD3D=$(usex field3d)
-		-DUSE_GIF=$(usex gif)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENCV=$(usex opencv)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_PTEX=$(usex ptex)
-		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt5)
-		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_OPENSSL=$(usex ssl)
-		-DUSE_FREETYPE=$(usex truetype)
-		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
-	)
-
-	cmake_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-1.8.17-r2.ebuild b/media-libs/openimageio/openimageio-1.8.17-r2.ebuild
new file mode 100644
index 000000000000..c6365e2983cb
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.8.17-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit cmake python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="test" # bug 431412
+
+BDEPEND="
+	doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	color-management? ( media-libs/opencolorio:= )
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
+
+PATCHES=( "${FILESDIR}/${P}-boostpython.patch" )
+
+S="${WORKDIR}/oiio-Release-${PV}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DINSTALL_DOCS=$(usex doc)
+		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=NO # Missing in Gentoo
+		-DUSE_NUKE=OFF
+		-DUSE_OCIO=$(usex color-management)
+		-DUSE_DICOM=$(usex dicom)
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_OPENSSL=$(usex ssl)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index ca49fa994338..454e7f8e32f1 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,6 +1,3 @@
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-DIST opus-1.3.tar.gz 1032750 BLAKE2B 7c79cecb957b0353e35758989b07502f2d4531869985639a069dec8737c15061b56ebff5babe31ad316afa9f7787bde6a7c544fa5be10c1e02ccfdff1a80d5c7 SHA512 438635667e72c326d6d06a30e0b3a5564ba6cf5d484066456e1118e1c2fe3a61b959d0afa77a1084b177b72f9230618b6b55c78bc4e24e9127a09fd345b42518
-EBUILD opus-1.3.1-r1.ebuild 1064 BLAKE2B 2e2ec38a2a20ad4037e8d473abd2e5594e5e87ef3fca7a698932dc023be1666aa143ad7569d4fc5bd87fa0a0c43140dc023436d5899442c3ca8ac8089978c14a SHA512 8d874857b52b72f22d63c6875e9e43a5cd2ed32e8d67f5c68e01b3f1a14c6fa8cfd4d0cb302ad20f6fb82e56d9769d5ef43946228bbd22b84a4890c44ae0f5e5
-EBUILD opus-1.3.1.ebuild 952 BLAKE2B 67ae11d184681007655fc1270938cf1e41a6cc172f8f57d1459dae30ec0da9d0f41bcc5e9cad21464de723c25ae7ab9ef559cd5cec4ae3a7d34bfbca872ad284 SHA512 7d60bbf645bc0b6d0558ba7b36363fd1ea7f463edf0c7cf51953fc1b8e8dfd9a0e2b0ec265aac31587e945efdb788f65c4bd13e73ac06b80552488ebfabb46a3
-EBUILD opus-1.3.ebuild 1169 BLAKE2B 153d7f0868bfb71aea06d0396dc1d6862762b068448191a36ddf507d08bda251cde5a2b7b5b7e732be77c5029bf64b367fdbeae7e706d40c12125901ca77bef4 SHA512 7a6e60aeb7105b593369acf0a6fd62db92a8de6b7ddff14fe47d639d987e0f1d923a680b7b9266315d7372f33ffcdad998965251f24192a5bce8a204154aeb1b
+EBUILD opus-1.3.1-r1.ebuild 1055 BLAKE2B cb250cc2c4650c97a712ea1dae761579e23c1d827b204ee84d699d93e2b711b1809c7a59c4215fa33368aab10f718d06156b69186cb1016748c362d0d85820e8 SHA512 8f9f014ca7f6bdd050505ca6bef177e346a134b014219052775f22561feee09e5f7a83b1b80f23fb27297c47de32b9f16cecf575c4bf7eb888ef7897703de84e
 MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
index ae3328a25fd9..aba9e62e775d 100644
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ b/media-libs/opus/opus-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 
diff --git a/media-libs/opus/opus-1.3.1.ebuild b/media-libs/opus/opus-1.3.1.ebuild
deleted file mode 100644
index eeda2865a899..000000000000
--- a/media-libs/opus/opus-1.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
-HOMEPAGE="https://opus-codec.org/"
-SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
-IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-DEPEND="doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable custom-modes)
-		$(use_enable doc)
-		$(use_enable static-libs static)
-	)
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/opus/opus-1.3.ebuild b/media-libs/opus/opus-1.3.ebuild
deleted file mode 100644
index 758b0ac2e0ba..000000000000
--- a/media-libs/opus/opus-1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-inherit multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.xiph.org/opus.git"
-else
-	SRC_URI="https://archive.mozilla.org/pub/opus/${MY_P}.tar.gz"
-	if [[ "${PV}" != *_alpha* ]] && [[ "${PV}" != *_beta* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-	fi
-fi
-
-DESCRIPTION="Open codec designed for internet transmission of interactive speech and audio"
-HOMEPAGE="https://opus-codec.org/"
-
-LICENSE="BSD"
-SLOT="0"
-INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
-IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-DEPEND="
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable custom-modes)
-		$(use_enable doc)
-		$(use_enable static-libs static)
-	)
-	for i in ${INTRINSIC_FLAGS} ; do
-		use ${i} && myeconfargs+=( --enable-intrinsics )
-	done
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest
index db4ca0da669f..6db24c6c687d 100644
--- a/media-libs/oyranos/Manifest
+++ b/media-libs/oyranos/Manifest
@@ -2,6 +2,6 @@ AUX oyranos-0.9.6-mesa-18.3.1.patch 834 BLAKE2B f8cae2cdb21c4588cc1f89c9989ea95c
 AUX oyranos-0.9.6-underlinking.patch 1064 BLAKE2B e05060b0bd88b8ca3edb36f2e9d86b5d2296e16f13420a14473a7b0273bf9b53fdea57cbd6ae4828c3b63d4ec8025757e5b9a4858378861d42f83f537155b2fc SHA512 19b22636294c74a44cad38ff4e795a110154349e89715104afd014a219e254a3749a1e9e59b37ce14f01fe22653c6ae062e11e587456b19c8012cc1315699b09
 DIST oyranos-0.9.6-patches.tar.xz 11680 BLAKE2B 2e082ce2bd091dcb59a92662ec813504fbacf03d452f54260434c3abcd63523b1c718055bb0ea2576202b3f85b4af2b36975902163991e4fe82e8e52f714cf5a SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493
 DIST oyranos-0.9.6.tar.gz 2247841 BLAKE2B b086104e2de949ec08a452fbab16c219daf36a69771f766fafeccffcdb45b74ff9b4d7754f45896c04d04f3fa78fb1faa1ae898b0594d172dd5e6355ca58af9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111
-EBUILD oyranos-0.9.6-r1.ebuild 2818 BLAKE2B 1306b22453dfa535ee4713ceb7435eb069f79c077b7b8ce426b9b67d829e3adba811808e2bb25227d555162567588aa7ac8dbecc6501699033e083cf0ebca582 SHA512 b8081efd598425c490831cc4ea93ce2d8edfde46df4d54b67cdb131c1ec8ff4a7f526a78edb0ba943b3c87ecf79cc23e0e6cb9917a02ca681a03f5944eedfe96
+EBUILD oyranos-0.9.6-r1.ebuild 2669 BLAKE2B e57cb65d4286ec733bf8c01e67d4b438aaf567c7b2abba5303672359254ba4c20ace18c4c08e2396c66be16f9939a401499b3a1c60d388ebca5cfa4df9e9a020 SHA512 696bcde3a1e8b34016119e0429ec446ea3fcdc99e5b42fc0458e304266a6dc862e1ac124af0fa7a268ff7fa6a36f30bb4370aa09c6c940228263dc41f2be49d1
 EBUILD oyranos-9999.ebuild 2635 BLAKE2B ef6ebe70c54e5b9cc7bf0e289ae594f1f9c106c1494f6f74c83efd62d3231f9b38ef23c49fa4bb06d6bc5d316c632d59d5f8fd643dd40300b8dd6376c49ac495 SHA512 00f825173d253661d76da2901a48681a0572abc68b7c147ba6343e813347f0e8c1e98dd5e981a3e7a21042c378c14cf28e030850ac74310aade5a43d83d6c709
 MISC metadata.xml 251 BLAKE2B 0999a9b822622949e7ddd1e5d5b77cd32cf1f689c715a8e9d4c2a4a312d8f59bf2efd06c84f52d71b05149e51514c4f4cecaf30a2c8ab391dcb3a5f7957d7b7e SHA512 bd232a6e37c4b956d15fd9fb66e3b7698c41747b9d3a1b474e8f41a1d7a0d841308526f9ba6a5b250f0140c1af47353bb0adc2e08d09bf8ef52c7b09e66ab891
diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
index 4eee55d10f7d..26ac4c259163 100644
--- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,9 +19,9 @@ HOMEPAGE="https://www.oyranos.org/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X"
+IUSE="cairo cups doc examples exif fltk jpeg raw scanner static-libs test tiff X"
 
-REQUIRED_USE="qt5? ( X ) test? ( static-libs )"
+REQUIRED_USE="test? ( static-libs )"
 
 COMMON_DEPEND="
 	app-admin/elektra
@@ -36,14 +36,6 @@ COMMON_DEPEND="
 	exif? ( media-gfx/exiv2:= )
 	fltk? ( x11-libs/fltk:1 )
 	jpeg? ( virtual/jpeg:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-	)
 	raw? ( media-libs/libraw )
 	scanner? ( media-gfx/sane-backends )
 	tiff? ( media-libs/tiff:0 )
@@ -96,7 +88,7 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex !exif)
 		-DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(usex !fltk)
 		-DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(usex !qt5)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw)
 		-DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner)
 		-DENABLE_STATIC_LIBS=$(usex static-libs)
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 982e007ced68..1d5691f6fd66 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,7 +1,7 @@
 AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
 DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
 DIST partio-1.5.4.tar.gz 291617 BLAKE2B 638fae984d392e1e6c95862ad9a8dd8b8a0d80b2c83dfd03e887af36e420d15fd67f0b2c71e5e8c335668b512660bf14f03a1329ac0d7a48431674a51043585d SHA512 967da5b648b19c45bd0c3c8ff56f891e2d54a07b2cd113f18d5d0b646cbfabd968e31ee48c0e167bf9a911d8d5af42d5291b355da305a2b9134fa78fc23e5636
-EBUILD partio-1.1.0_p20170829.ebuild 1049 BLAKE2B 59be45fbfe12dd538ccac9af82587f956dff90bed589d4a8d065a04aff7c240eddf56e32d3f7ec04208b3e31a8d05390c005cbedcaf40a9f2897adae0a3e08ab SHA512 2c9c46ccd43dfb00eb12039e446f8354e22b0be240f9897a8aa016a59dad5388bce12eb4612c9f6f0e80dcdff33bc2b6d6318c49d6f89aeb893737c9c0b7f95f
-EBUILD partio-1.5.4.ebuild 845 BLAKE2B ba0da04deba2306dfe4a59ed7442549e1ce06dc959157ec1e96169638209280ae54837fa60e3a5e0c08e5cb2e33966125bc2bb3c194b9aef2190ef058dfbf97d SHA512 2905032ff5f5d7f287a84a9f82a27109a667c5fe0e6077ab2d22ef54bccaee8908d0a8df8efab56cdcff37f68ab575f09042e262ce00757d4740026954c5cc8c
-EBUILD partio-9999.ebuild 847 BLAKE2B a2fcce51d829c0af80ebf23ceb8b6e35fc0de12700539b07c770a0c751f70d6f88493c7d7b27b4ebf41b99e372d23f8f38c4021ef0354081e2970d97ce6da80c SHA512 7abd0bcdee18c4704a2a75f62207ee56c822c334f7b9d5b74e1a0110c6f9fe29c9d9f5165ea3ca200d0fc8bcefaa635fb7f7338008526320099629dd4f2b3f8a
+EBUILD partio-1.1.0_p20170829.ebuild 1043 BLAKE2B f1662f643564c16117f72ceae975eaea83579b49ad5759ee121ec42aeb421e55b7fd6965f1b26159458a474663a8dcbe9bb64d6fcf863135582498ae29854954 SHA512 05910b9b2201f9c542429cbf653b29dbcf5b016d565678f40bf699d2c187cf0caf479ad286b5c8d71f59de276475b5cb5418ea14e90c90ec82910bb79e01afee
+EBUILD partio-1.5.4.ebuild 839 BLAKE2B dc586d4cf182949bf72700242671b150eb9c3480db61b0a9e1acb906309eb86bb1fa331d69ac3bc0cbee8112f3427effc8e0711590acb45c80958282a9cb09d4 SHA512 494c1edd504aad12506f61e7822b019efec660a2f9f7e29cfce7edbc3ba4c472ff9369a822a1c1440a7557fa8a0072561d74a01687b7cc4664f6b622b5901fc2
+EBUILD partio-9999.ebuild 841 BLAKE2B 95491a2224a0834ce4e20cf6d0ff45e26815eda71c0f583200df08f95b0a40bf6e5877a436183fc542c095fc2e18ea81d0d3bbe68a34753783dfd6dd6ed18ec5 SHA512 c0fa26e76dc9b92b3cb291fc402e8f443052ca077599b93cc010f8f45b2e1c0ebbd25d0248a498c1d8e1c6f5731c44cf926dbaac7d25733766bb639ec2f1c7e7
 MISC metadata.xml 528 BLAKE2B 76f098570ed5ad0be85fb87b6696903e3b111e6d2d157679a835faa6dea65633c75d18560c486750063703a9b5899747df90fdfadebab38af3688d625b5df2ad SHA512 c9f2d206bc6921c783d1d72134c3a9acd7350c80f2ecb26f45d7617dc2d352f7d84134858956569f084dd444f2a01d186c97b3a83c07b45a468d48579fa01658
diff --git a/media-libs/partio/partio-1.1.0_p20170829.ebuild b/media-libs/partio/partio-1.1.0_p20170829.ebuild
index 51dabc8a8473..9227c54e1723 100644
--- a/media-libs/partio/partio-1.1.0_p20170829.ebuild
+++ b/media-libs/partio/partio-1.1.0_p20170829.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils vcs-snapshot python-single-r1
 
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild
index 3fea34e9cdae..dd11e5974703 100644
--- a/media-libs/partio/partio-1.5.4.ebuild
+++ b/media-libs/partio/partio-1.5.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild
index e081be1b58f9..fb1771b479c3 100644
--- a/media-libs/partio/partio-9999.ebuild
+++ b/media-libs/partio/partio-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 1c34c9546314..7d663fdd7154 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,6 +1,6 @@
 AUX portmidi-217-cmake.patch 13905 BLAKE2B faa559f25b1acec63f17a6b6dcbd228eff2cb50447ba72ea4108c86f36b8142fac54c90e5480d74278e0fa0b28bad68f4f1bfac192434840893dc9039243284f SHA512 b60da799041d6dc4a1bf82981d904cf9bbbaed021397cd2235dc25b18b7c830576ecce8fa0c6992249e03ab84579eff795ae33a8e0d091dcda8ee856491420d4
 AUX portmidi-217-python.patch 764 BLAKE2B bcf569bab2c105f99b7a3b10c0124fa22b7fb0d9d494024c17c01f3bb6641441f1942b4dae76725835e880c4ed90c03e151f218b4eec78b29fdefc343cc00b30 SHA512 5f5e582d1769c995038d1b073eb603e313f1a49b5d7cb832de9f2aef003dfcf34bcd848337dc180ee23bf87ad631887584d339474c45e57b6a78d179c929ec43
-AUX portmidi-217-r3-python.patch 1568 BLAKE2B 039c2bde15d5aaef1f255a0166c3563fcbfe3439dc2dced93b5228e5f5b747c47b70b7a25574d3116652aa3ae7177fbdd95aa03e29f65a05cddbe056b7b7e9e9 SHA512 210db5901f5d31c2e686aaca850f972ae2083834b3599e5e71acbb21374f8136306e087f62d2307767c8f0eb2fddf5a6115486258aaa16aefd4199b6d21f42e2
+AUX portmidi-217-r3-python.patch 1630 BLAKE2B df68b3d216004f6f94fcf9b321deebc76f2891499ba58cf60376695fd02f7de33933274836ca8357996c0fd07006ee545ef7208ac58caaf83e74188327a4362c SHA512 eae1cfd3e3b9d98f5575f93f33f2d88d0b7f674ec059548bd972e58127715bf76131fdc24a9cb9fb4bbd446ef32b1b3ed79d3923332b967e2599446c636ba36c
 DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
 EBUILD portmidi-217-r2.ebuild 3050 BLAKE2B ea034c6366908edeab906b8cd5ee58f1bf75aa1f2a29d7766db7ae94d3576c587a409a96d54704cd8b84e34d4430b0c1e557e2f93be5607bec40803d40afe1eb SHA512 a69e6ca91231cbce5efa1cff3c305ff34ec029c1a113fcf1090dd3ea232f2050dc0e8dd60bae225e20e5c93d1aefd2c568dab897a020485f92b61b0c0ab5dabe
 EBUILD portmidi-217-r3.ebuild 3157 BLAKE2B b61c1d362aacaea932666f97e9cea5554db4c67fc81395eafb6b6ed8c03834a5b9f9bdc3b913c6448a12fbc21d29b4939c4aa559239920659226f1cf2378a968 SHA512 517a5528d1fe9f8451b4d9e60664d7f3414d0d0f1febc838cd1bc3dd9229cfe8c4cc0cb0052a10c78bd8f057e1bc7e0d61e7b737dd2dbbb45fcd797124b3c105
diff --git a/media-libs/portmidi/files/portmidi-217-r3-python.patch b/media-libs/portmidi/files/portmidi-217-r3-python.patch
index cfc6b24e9487..d4024710fa39 100644
--- a/media-libs/portmidi/files/portmidi-217-r3-python.patch
+++ b/media-libs/portmidi/files/portmidi-217-r3-python.patch
@@ -43,7 +43,8 @@ index 14ab1c7..5b1e7c0 100644
      EXTENSION = dict(
          ext_modules=[ 
              Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
-                       library_dirs=["./linux"],
+-                      library_dirs=["./linux"],
++                      library_dirs=["../../portmidi*build"],
 +                      include_dirs=["../pm_common", "../porttime"],
                        libraries = ["portmidi", "asound", "pthread"]
                        )
diff --git a/media-libs/pymemphis/Manifest b/media-libs/pymemphis/Manifest
index b37cbe58a2ca..aa4e7bc11efa 100644
--- a/media-libs/pymemphis/Manifest
+++ b/media-libs/pymemphis/Manifest
@@ -1,3 +1,3 @@
 DIST pymemphis-0.2.1.tar.gz 128848 BLAKE2B fe48cb4e33a7402e02fea007667401b77c38f0fc4f47d5ed61e8fa074a21700db008afd7a6d7ad8bdb34dd9ce3d42f416ceb8f41edb9e551b971077b87969a12 SHA512 0eb2d5112956673e115575b7d6601dd56708f02da2a67a67a0d54dd2fe53654d07e99265092c67834a07eaf8f353a643e7d2a6aa50efd38d5761ac349de1813a
-EBUILD pymemphis-0.2.1-r2.ebuild 777 BLAKE2B 36eab40b9d8996efa2c059c9d379d53158b6ab982ea19dc59576df0355ba49651c2323892b32ab24939684993edd06b625d34b05859fb472aa080d1da3213006 SHA512 f4a6e0e08e9ab6e790b9e7dca21907a25c184c774c0c58617998e92de0291098ec9fda9b1782cadf09ac3cf888235e7a4c93406c9354c6d2b2fad2a21ad77fb9
+EBUILD pymemphis-0.2.1-r3.ebuild 817 BLAKE2B 49e6d8eee752db39b39fa55cbbf4d368398f607c81c163ad9ac1632594400841e50957f558e0e151dd9473210bd57f138f794a2ef1b94e23b1ec621efc3bc777 SHA512 2c8eaad6832eaccb91b7ab9751b802768c8f5c04cb75834e8dd86c6ce4bf1ffc6c42409fa17d7d69c1ad1d2c22ddaf9b6dd81e01ec2da274bfe3aa21cd62ca4d
 MISC metadata.xml 265 BLAKE2B 65aa3f55bbf6646be50460d7fa19c2336d7ab4a88906ef67da5051ef514d3fd7123b17123620457ce87ebac3cdd3f7060c2931905cffd3025a9704824ca879d7 SHA512 c08402155a91423d29d281e4adcb3bcb057a61def37efc13bbaf8ea03c147e258352fcc9d6ef12c935ed65078743d79a5191d72d7838429a80cadee42b32cb8f
diff --git a/media-libs/pymemphis/pymemphis-0.2.1-r2.ebuild b/media-libs/pymemphis/pymemphis-0.2.1-r2.ebuild
deleted file mode 100644
index a9f890cbaea1..000000000000
--- a/media-libs/pymemphis/pymemphis-0.2.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-AT_M4DIR="build/autotools/"
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Python bindings for the libmemphis library"
-HOMEPAGE="http://gitorious.net/pymemphis"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	media-libs/memphis"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}-mainline
-
-src_prepare() {
-	default
-	eautoreconf
-	sed 's:0.1:0.2:g' -i pymemphis.pc.in || die
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/pymemphis/pymemphis-0.2.1-r3.ebuild b/media-libs/pymemphis/pymemphis-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..5239a296f165
--- /dev/null
+++ b/media-libs/pymemphis/pymemphis-0.2.1-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+AT_M4DIR="build/autotools/"
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Python bindings for the libmemphis library"
+HOMEPAGE="http://gitorious.net/pymemphis"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2.1"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/memphis"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}-mainline
+
+src_prepare() {
+	default
+	eautoreconf
+	sed 's:0.1:0.2:g' -i pymemphis.pc.in || die
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/sg/Manifest b/media-libs/sg/Manifest
index 3cedd2d418dc..e61b55fd05b0 100644
--- a/media-libs/sg/Manifest
+++ b/media-libs/sg/Manifest
@@ -1,5 +1,6 @@
+AUX 1.4-AC_CONFIG_HEADERS.patch 316 BLAKE2B ebb73f3d30357cc0ab97c0e79dfa05c2de2d39d0814458191485855962780fc6b81db115f914f20e3aa55922dee76f932dd04c59eb42b83baaeaf1fcf678afa6 SHA512 84e6309e50300b514d64ac0f0f4a47900b7497f208c617d515fbba6344dc286b74bad145beb6779a2b5c78ea7e96c3a283ba443492d485a632e889fda834e496
 AUX 1.4-doc.patch 526 BLAKE2B 907c7a978d1906e4e647440b2dfc3602aa46ff8ba87010c215845070f5f221a6ae505dc428cd408ba80890db383f726f6762d01b5312609397a67cb5b4883c89 SHA512 9e9d48b51264c5d91ef3536630dee112001dd7b2e55a7a3024165f3249efe187b0a77a5fd5b12858c33c3c1171c5f2fe72c4eaf76ddc2d9a7d17b593396cb63d
 AUX 1.4-opengl.patch 2304 BLAKE2B e604cded6b4e1f3fcd0f4bc5e05d5dc1ec1870c6c70ea54f142cb2148610eba6863e1be8507bffcf38cae373b8cdfb6243f873325a00a5a38d7f5af895daad5f SHA512 9ef41aff50c7676ef1f2cd9ab6ffe966ee0761cfc748078d76f46d5f2f40107fac9717ebbe93713a8a7196cc23179b3bf4ec9904be80434d2958e133aea990c6
 DIST sg-1.5.tar.gz 2859299 BLAKE2B f1c2f1a10f73e719a531f80971114a3175e20863aea1d864a142cfbea8d6212801719ca4f727825aa1e54d3c26f202edde61b1ec126e61fad0ed260900320116 SHA512 0e1f931b51e7bdecedc1bb17275d87e7549abf3d4d9eff6daf74cbc97ad1bea94b256fe4accfe27bd0a67f0637bb0d3b363d748f57edd73e07e922d2ea6e24c0
-EBUILD sg-1.5.ebuild 1688 BLAKE2B b7beb7d1ea84c9d0c3abada01807dc4b860b1da49875f0103fc76c80aa7c22dab6dc5ee1d413fac3282fb4ec4011facecb4ac2ce09c25081f5bd25250b42432b SHA512 9bbca854f7d7a078c2bc02fefd8647568445b4b4a1b5859a8aff4e95360f26c5c36410182b552e1b991ec8e20751525d9544d72fbc4995a0ec09f2b2e9135863
+EBUILD sg-1.5.ebuild 1603 BLAKE2B ef185b090e675d826e58de24b8ab04ab56f731113e6cb5985b60229d45216115d90dcc97f5c1cb9d05c1749f709e26ab830383e16333d0c06ef748dc410d55c8 SHA512 27d40f7429a973d5d41a53e0861f0a7c46113aff28d9ceb30f55e279dbe6d2f8e0d3e52c125f1f8c06a259ebf2d3476bfa36bd2a85b3b682e890e94344ef6ecc
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch b/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch
new file mode 100644
index 000000000000..f57b6110593f
--- /dev/null
+++ b/media-libs/sg/files/1.4-AC_CONFIG_HEADERS.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,7 @@
+ dnl 0. autoconf initialization
+ AC_INIT(sg, 1.0, mholst@math.ucsd.edu)
+ AC_CONFIG_SRCDIR(src/ogl/sg/ogl.h)
+-AM_CONFIG_HEADER(src/aaa_inc/sgcf.h)
++AC_CONFIG_HEADERS(src/aaa_inc/sgcf.h)
+ AC_CONFIG_AUX_DIR(config)
+ AC_PREFIX_DEFAULT(${HOME})
+ AC_CANONICAL_BUILD
diff --git a/media-libs/sg/sg-1.5.ebuild b/media-libs/sg/sg-1.5.ebuild
index ba5e44642aa6..a172a6b00e68 100644
--- a/media-libs/sg/sg-1.5.ebuild
+++ b/media-libs/sg/sg-1.5.ebuild
@@ -1,57 +1,52 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib
+inherit autotools
 
 DESCRIPTION="Socket Graphics tool for displaying polygons"
 HOMEPAGE="http://fetk.org/codes/sg/index.html"
 SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="
 	dev-libs/maloc
+	media-libs/mesa[X(+)]
 	virtual/glu
+	x11-libs/libGLw
 	x11-libs/libXaw
-	x11-libs/motif
-	|| (
-		( media-libs/mesa[X(+)] x11-libs/libGLw )
-		media-libs/opengl-apple
-		)"
-DEPEND="
-	${RDEPEND}
+	x11-libs/motif"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
-		media-gfx/graphviz
 		app-doc/doxygen
-		)"
+		media-gfx/graphviz
+	)"
 
 S="${WORKDIR}"/${PN}
 
 PATCHES=(
 	"${FILESDIR}"/1.4-opengl.patch
 	"${FILESDIR}"/1.4-doc.patch
-	)
+	"${FILESDIR}"/1.4-AC_CONFIG_HEADERS.patch
+)
 
 src_prepare() {
-	rm src/{gl,glu,glw} -rf || die
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	autotools-utils_src_prepare
+	default
+	rm -r src/{gl,glu,glw} || die
+
+	eautoreconf
 }
 
 src_configure() {
-	local sg_include
-	local sg_lib
-	local myeconfargs
+	local sg_include="${EPREFIX}"/usr/include
+	local sg_lib="${EPREFIX}"/usr/$(get_libdir)
 
-	sg_include="${EPREFIX}"/usr/include
-	sg_lib="${EPREFIX}"/usr/$(get_libdir)
 	export FETK_LIBRARY="${sg_lib}"
 	export FETK_MOTIF_LIBRARY="${sg_lib}"
 	export FETK_GL_LIBRARY="${sg_lib}"
@@ -63,13 +58,19 @@ src_configure() {
 	export FETK_GL_INCLUDE="${sg_include}"/GL
 	export FETK_MOTIF_INCLUDE="${sg_include}"
 
-	use doc || myeconfargs+=( --with-doxygen= --with-dot= )
+	econf \
+		--disable-static \
+		--disable-triplet \
+		--enable-glforce \
+		--enable-gluforce \
+		--enable-glwforce \
+		--with-doxygen=$(usex doc "${BROOT}"/usr/bin/doxygen "") \
+		--with-dot=$(usex doc "${BROOT}"/usr/bin/dot "")
+}
 
-	myeconfargs+=( --enable-glforce --enable-gluforce --enable-glwforce )
+src_install() {
+	default
 
-	myeconfargs+=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--disable-triplet
-	)
-	autotools-utils_src_configure
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 8ee38b32466a..24f37a18f853 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -3,6 +3,6 @@ AUX shaderc-2019.0-fix-build-against-new-glslang.patch 2158 BLAKE2B df0c6cc0067c
 AUX shaderc-2019.0-fix-glslang-link-order.patch 1030 BLAKE2B 281fc55196762ffbc08daa63a401e13330719c50f9e0f5f30199f9fc96c3c00148eb3a6efb0f4e083eea0a53a19a3f65e0f3e52d995356279a18cf8596029bb3 SHA512 c4fbc5db2a40adc45cdb470c1fc09f65bee38b1f46da84a47c60db3ba081b536539f40567c28111fb598fe6a6ba47602cff3b2835247460d08bab5d5e3ea28c4
 DIST shaderc-2018.0.tar.gz 206013 BLAKE2B b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b SHA512 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
 DIST shaderc-2019.0.tar.gz 232620 BLAKE2B 53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5 SHA512 c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-EBUILD shaderc-2018.0.ebuild 1978 BLAKE2B f85b80ca81fa6ef8206a75525063c2e574498290b607e40f4bf98ac9c6dd09f6ca770ec56d83ac86f43c02ad9ff4411569b36f6c2ee2fab4d52a29f2885dbe0f SHA512 994a1b17f26fca6767f4ce3fe1779895955a8e8a4d48c51c78eec352314c238fa98a5145746e31e787618831551caf7d7145f40f6bb941493207c0fdcc87fc5a
+EBUILD shaderc-2018.0.ebuild 1972 BLAKE2B 59ff84898d5eb429e0cf2ca5eb102cfd0fe652c4a7b6b44409a245509bbbc99ad69e18d65672b6a53ad5eb6b09f8f987a7f538880f4772c2bcfb785f982939a0 SHA512 0665f70683a796084e2da406c6e650ff3632aacf5318e078eb2de50f3d9b123b14b8b04095186bde791cfadc51befcd7abf3805e87d633b777c893234b81e716
 EBUILD shaderc-2019.0-r1.ebuild 2085 BLAKE2B 92c60e5103ec3bb8eb3a40be7b8de11b7ae1045dec1f1d10f762d503ddb4913852538e43746dc9e9376f76f1795e4d93d3508779a4462b39df1604212af67d82 SHA512 8387bbfc8e76865bc19de3c926f33f5005c50e24bfd9e09bee0801970fe63d349e37c4c4821128a7730037424c470185d21bcd16ab31b446202f4e6b8f1f7469
 MISC metadata.xml 335 BLAKE2B 295aaacdd867834ddc93fd5f52a7d5c50b14a63936e4f97f5cba62d7ddc47fda07dc620203f6e27adf01d8df13b5d9c2b0f5621a0d21bb53f8b846b78023ddfa SHA512 f9b82e65002f90c0e253b712ac3a11c483a3d7bb1750d46f3d8bf4de577927421e6e1cb3c3403afb89a8168e02e9b3736cc21adf6994827a17a82b237a8973a5
diff --git a/media-libs/shaderc/shaderc-2018.0.ebuild b/media-libs/shaderc/shaderc-2018.0.ebuild
index 93d43a06d61e..991a67e2d50b 100644
--- a/media-libs/shaderc/shaderc-2018.0.ebuild
+++ b/media-libs/shaderc/shaderc-2018.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-multilib python-any-r1
 
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index 76797e728faa..53661b45d52c 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,5 +1,5 @@
 DIST sratom-0.6.0.tar.bz2 149340 BLAKE2B c661e0c4fba0cdf6cfb8a7dba90ff92135422557a0721bc394c7500853aeb9370554df8a02b7faea2fa222b96db36b20b265cc1fa50e6e06655946dbe992f815 SHA512 899bb01896e2b65b69482041c7e06edc9e45e9a3466392c82a58f16dfc71462a6c3e3e16a5aa50a6347c8366ea72898468910a59a084762f75eb8c7031ceacf8
 DIST sratom-0.6.4.tar.bz2 339707 BLAKE2B acf29c7dd3c4e23bf20ef2811706abdd3543d0fc380183f7f419932c3178ff5e2f6d95c57bad2ef991dbc1e32c6e8a3645238c7b42dfd204942dbc4c05270652 SHA512 6462d8d33ed7ddaa2aea267fab14c9a15bfc077a4f8d26eb493be4c48c95d8dcec614f540bd82fe22aecca641771326a44d175c3991cd473ae371062c78aaac3
-EBUILD sratom-0.6.0-r1.ebuild 1235 BLAKE2B c5ee8d18a0807d2a834642e2b299adadfe4592f2a4ff46e1b6b1607b8ede839c1a51ca6d0fd2c1e914909d7aae18aa30b27f9d815a57ae4ba97f8c9b759a6c2c SHA512 c857efc7c30ae8a6743531af26cc58f6c27a9b205722e5e5fcf253c64cf8389ee6d45fec3e4e09ac65f708f65131224a5ff43daa87162d3ef456900886b82025
+EBUILD sratom-0.6.0-r1.ebuild 1229 BLAKE2B 0cad234a27e8f85563694ce027e73c21825e756d2f1271616826e1b40a56812c101fb3cb753a2502e1e57715858105d5603726fc537fcb1e01b3fa2973469d92 SHA512 17e73a301c2a4de39002470101d1ea96869eed8d063d120c6df24c369abdb5d943f3750868aa65c1596a4f05ce814515914f4b267453497645bb4bc9ddf76e13
 EBUILD sratom-0.6.4.ebuild 1231 BLAKE2B 02fac949c96cae12f35a8ebb8ec4e8b47b6799a9670d6c873ce851110f558503c9827fdecae0e4188c1db65f131baa464b712fe8b12bdc47c6070aefd614c239 SHA512 dae3c0d80f46ab812eecc2ecd0801d2625bc9b8eb32e49b19f23a689b1b7838acad04f4962354364662f2e3d024500e2a3be10a60044eae6956366da68b2dbd4
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/sratom/sratom-0.6.0-r1.ebuild b/media-libs/sratom/sratom-0.6.0-r1.ebuild
index 4160b0476a5b..d9a4052de6c5 100644
--- a/media-libs/sratom/sratom-0.6.0-r1.ebuild
+++ b/media-libs/sratom/sratom-0.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal
 
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index 9e8c0c4cb815..1b46be9e2cf1 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -1,6 +1,6 @@
 AUX stk-4.5.1/010_all_removeForcedFlags.patch 269 BLAKE2B a02fe10d9d3573e063174a096a6a4068b03139ec8b1d1c13097a1309265d53545109ae3a74f81e9b9bb32fefd73b69157037f76f470839b657bfdce10fea3c22 SHA512 7584c52c5e61c1bc8770bd776abe78a43d6a8f6ffcba1f4411c7674766d36220a38051eebd12515fe8d7db2b958d05c38f6940f676ca3aa0041321e81afdd5f4
 AUX stk-4.5.1/020_all_noExamplesOrDemo.patch 1029 BLAKE2B 8ea62554a8a609a1365cbaf42cbfedb8fa257fcd531a01bd014cb41da80c98dbec9f74b9f45b400f2aa6a02dcfb3d58662fea4bf8584e760f5d66827f9760db6 SHA512 546851ad25e842b67a2a441e4e4d27295993a1cfeb659a620a6ebfaeb66c9cfe779c8f1ee506bb93a31bfea9687fbd378a881f11e5ffbe182d1d2b0eb478bbc0
 AUX stk-4.5.1/050_all_cxxflags.patch 306 BLAKE2B 58708b9f0aded3069be8150407d877c97406fe941da895c3e7d7ededeccbbdeeb5dc2c10ef5e1a4b262943cdc147b66605764d58876aeb931e73e86fa8474b72 SHA512 36ecc6f6a03b9df258affd92079d3da06a5506a5e53ddc98934c47401c5b6745de7d0cb82b241c0dffda3d3baea9a32a7462292f1079fffba88425158562fa7f
-DIST stk-4.5.1.tar.gz 2413113 BLAKE2B 5eedf936f26acd3e2f377a198b252ee36bcdbb642f0649c0db6c453beb670a1fc725c94af78ff3e075f50068ae6927b628de0174dba598191ed9f9d2f074c17c SHA512 c4c05edfb49b269d5d2518c06abad8e636c4f67a8598f5a03d406bbef04b8b3315d2592d35c8742ce9163b52215ac87b6349c0012e271a43707d109175b6d336
-EBUILD stk-4.5.1-r1.ebuild 1286 BLAKE2B 68b49ce06ced817767f6565c3c1f2be47ae32967576280943787f75ffd5778feb8160d79c408a550bf691cae88f8ec4c0998254ef053be4cbb65681d3844cf26 SHA512 357e91ef7db68ba8b9a27eb28581aa15c3341633bad1ed3a4769daa8a5a8cb23b401a7b8edabfeebca225ba58ce52beadfdb3305694de846aaf8d8032032ab90
+DIST stk-4.6.1.tar.gz 2593348 BLAKE2B 2cb269b8fb5732d55a394d5b8842c380b6a3e82e7338e972c6d22baf5ba1edee3f03ed699b9950d4a92a7ae3102bbb54f844ffd728c6478ebfb36328a1b89f2a SHA512 2a22078cdb630f7c014a5ab38070fd6a6d1e9aa719401e3190a040cb06b61003cd3095fe1a8890eff59e4fc42594fe893b4c0a8327175e1701c75de7537e1830
+EBUILD stk-4.6.1.ebuild 1364 BLAKE2B b998c93647a5f0b2d257cfb25def730c496ef0492fa374247160d4f5b5119e63f2feb225aa5c08894e0feefa950851ea23603dadc465f726dfeff3e083867eed SHA512 066d65a7f2cca336977b68d0f1d36caafc0d95284e08e2c01a404f4c944178a6310b0544f25f011b496d933d4871c98ee514a89f2b670485108774e94369f646
 MISC metadata.xml 365 BLAKE2B a10b2261fdb56826dfdeb96a89f678dbebd332f99fafe31a5be95ca0db2593b3a14f69b856cda7ca5b3b6edd93f45661118a0c1fa6d6fe2ad7e4c449c579bd9b SHA512 48da9b52d54138bf4d271d39390a78b38641a4accf4f9cff2a0ce4a3954b45805d3a834f5aab0cdd13710e12ec36b5421be6c8a54db8698ae7bcf665c6866012
diff --git a/media-libs/stk/stk-4.5.1-r1.ebuild b/media-libs/stk/stk-4.5.1-r1.ebuild
deleted file mode 100644
index d1f5900803f5..000000000000
--- a/media-libs/stk/stk-4.5.1-r1.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
-
-inherit autotools
-
-DESCRIPTION="Synthesis ToolKit in C++"
-HOMEPAGE="https://ccrma.stanford.edu/software/stk/"
-SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc jack oss static-libs"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${P}"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	#breaks with --disable-foo...uses as --enable-foo
-	local myconf
-	if use debug; then
-		myconf="${myconf} --enable-debug"
-	fi
-	if use oss; then
-		myconf="${myconf} --with-oss"
-	fi
-	if use alsa; then
-		myconf="${myconf} --with-alsa"
-	fi
-	if use jack; then
-		myconf="${myconf} --with-jack"
-	fi
-
-	econf ${myconf} \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		RAWWAVE_PATH=/usr/share/stk/rawwaves/
-}
-
-src_install() {
-	dodoc README.md
-
-	# install the lib
-	dolib src/libstk*
-
-	# install headers
-	insinto /usr/include/stk
-	doins include/*.h
-
-	# install rawwaves
-	insinto /usr/share/stk/rawwaves
-	doins rawwaves/*.raw
-
-	# install docs
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-}
diff --git a/media-libs/stk/stk-4.6.1.ebuild b/media-libs/stk/stk-4.6.1.ebuild
new file mode 100644
index 000000000000..12eb50caa5f9
--- /dev/null
+++ b/media-libs/stk/stk-4.6.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Synthesis ToolKit in C++"
+HOMEPAGE="https://ccrma.stanford.edu/software/stk/"
+SRC_URI="https://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc jack oss static-libs"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.1"
+)
+
+HTML_DOCS=(
+	doc/html/.
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	#breaks with --disable-foo...uses as --enable-foo
+	local myconf
+	if use debug; then
+		myconf="${myconf} --enable-debug"
+	fi
+	if use oss; then
+		myconf="${myconf} --with-oss"
+	fi
+	if use alsa; then
+		myconf="${myconf} --with-alsa"
+	fi
+	if use jack; then
+		myconf="${myconf} --with-jack"
+	fi
+
+	econf ${myconf} \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		RAWWAVE_PATH=/usr/share/stk/rawwaves/
+}
+
+src_install() {
+	dodoc README.md
+
+	# install the lib
+	dolib.so src/libstk*
+	use static-libs && dolib.a src/libstk*
+
+	# install headers
+	insinto /usr/include/stk
+	doins include/*.h
+
+	# install rawwaves
+	insinto /usr/share/stk/rawwaves
+	doins rawwaves/*.raw
+
+	# install docs
+	if use doc; then
+		einstalldocs
+	fi
+}
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 445efa9bd829..9c3252f21850 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +1,6 @@
+AUX waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch 3008 BLAKE2B a81a85ffc11351034454b9f903827a012b0168ed113211e8a1cbab890edebff1baabd1b38a4721f1d4f92d5fb07a17c07e1806139b911be6a35be8ec27333c3e SHA512 ae9f1a6450da0f9a6332762740daf1bcba5740daab4c4fcc952fcebffe36a2d134a72a1a73f58d440a7e520d1065dd6a50ffad3910afb1c74890e7fa692d6d2e
 DIST waffle-1.6.0.tar.xz 224400 BLAKE2B 458add99b346bd75dc757243b9e7db6ac269fb2c1e488333d921c640e10efd182e51e8a5e0312d334593033936adf047fc2339d21e675654d89d66edfb8922b3 SHA512 c8796ab8adf968df2c5c88e2941c83955fe41e87eb2b75b6a5cc61b0d0c06eaa44df2f255f573a51816036dc8bc3ec63f3fb51ccfb7efbfe83cdd50b3f1be13f
+EBUILD waffle-1.6.0-r1.ebuild 1796 BLAKE2B 3d6601f814a0c71838a2733769800b6ebfe490896f4c5331364890dea90451200c8b952699015128e54595c6c1703dcca5cda97d0fd38a066dbf486d8eb2ccd5 SHA512 370c761329baef7d8d8f40717debcec65f354aedf61706e69d0597918a4793e18a884008fb6fc1bfa91186715c519f4acc0de4c53e679f4f3c2cd2425c56f5ce
 EBUILD waffle-1.6.0.ebuild 1644 BLAKE2B df24a6ba36c9cde52116a594f6eda58dde0b04dd7e631ce9b289047fe1ec0e8ee5e25be3386006b8fc6add1bc46fa7eaf0d9d84fab7dee2ed774cf89e0b86b6d SHA512 b85123a6a8cc4fdeb19ccc96b783c4f4828b4f51ccc02177f06db67b1489168c5d2bf19f1dd7816e82ac917a2e3a8dae0a6565a491dd177b43ccb6adce16ff28
-EBUILD waffle-9999.ebuild 1647 BLAKE2B bd565769059852f4a15c9f3362177c6307d8231a45abac074bfbbd2a2909c4a24db5935691303bfe32edd2d556391ebcae913ad19fe29fbb184067a54a1868ae SHA512 45fc09985650274ab570a65c5a221760435ce1007ad911fced36f3cd13aba650c7c9fef2525606e57ce275af9aeb0744a0a349fcde77c536e1c34f419e197a64
+EBUILD waffle-9999.ebuild 1704 BLAKE2B 3228a268c601d962eefcf2763e058faba1941e5892884d0add3c3eac68931671a30c3ad4d002e114d28b2377cdc4ffba05fd7c6d6c41a14335e10981ca66bdaf SHA512 b772a268634d57a47a6859bfb2603df98a09dfe883e41b02d3946968a0fc623d95741188135b7965c047c2448b32ea3ee7fad8cb4e6c61b522ad69e44533ad9f
 MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
new file mode 100644
index 000000000000..ef31275de08e
--- /dev/null
+++ b/media-libs/waffle/files/waffle-1.6.0-meson-Generate-cmake-config-and-version-files-if-mes.patch
@@ -0,0 +1,87 @@
+From b71cfa674db5828a2be04a42ce9996d6677629ee Mon Sep 17 00:00:00 2001
+From: Dylan Baker <dylan@pnwbakers.com>
+Date: Fri, 7 Jun 2019 15:36:09 -0700
+Subject: [PATCH] meson: Generate cmake config and version files if meson is
+ new enough
+
+Meson 0.50.0 added a module similar to the pkg-config module for
+generating cmake config files. Since the CMake build system provides
+these the meson build system should as well.
+
+v2: - Bump version to 0.50 instead of incorrect 0.49
+v3: - remove TODO comment that this fixes
+    - Add a definition of set_and_check for meson-generated Config
+      files.
+
+Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
+---
+ cmake/Modules/WaffleConfig.cmake.in | 10 ++++++++++
+ meson.build                         |  2 --
+ src/waffle/meson.build              | 20 ++++++++++++++++++++
+ 3 files changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/WaffleConfig.cmake.in b/cmake/Modules/WaffleConfig.cmake.in
+index b60b470..4e19755 100644
+--- a/cmake/Modules/WaffleConfig.cmake.in
++++ b/cmake/Modules/WaffleConfig.cmake.in
+@@ -7,6 +7,16 @@
+ 
+ @PACKAGE_INIT@
+ 
++# This should only be used for meson
++if (NOT DEFINED set_and_check)
++    macro(set_and_check _var _file)
++        set(${_var} "${_file}")
++        if(NOT EXISTS "${_file}")
++            message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
++        endif()
++    endmacro()
++endif()
++
+ set_and_check(Waffle_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@waffle_libname@")
+ set_and_check(Waffle_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
+ set(Waffle_LIBRARIES "@waffle_libname@")
+diff --git a/meson.build b/meson.build
+index 29fda22..22b7f59 100644
+--- a/meson.build
++++ b/meson.build
+@@ -231,5 +231,3 @@ endif
+ if get_option('build-examples')
+   subdir('examples')
+ endif
+-
+-# TODO:  CMake config file
+diff --git a/src/waffle/meson.build b/src/waffle/meson.build
+index 322df40..cd68ddf 100644
+--- a/src/waffle/meson.build
++++ b/src/waffle/meson.build
+@@ -211,6 +211,26 @@ pkg.generate(
+   description : 'A library for selecting an OpenGL API and windows system at runtime.',
+ )
+ 
++if meson.version().version_compare('>= 0.50')
++  cmake = import('cmake')
++  cmake.write_basic_package_version_file(
++    name : 'Waffle',
++    version : meson.project_version(),
++    compatibility : 'SameMajorVersion',
++  )
++
++  cmake_conf = configuration_data()
++  cmake_conf.set('waffle_libname', waffle_name)
++  cmake_conf.set('PACKAGE_CMAKE_INSTALL_INCLUDEDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('includedir')))
++  cmake_conf.set('PACKAGE_CMAKE_INSTALL_LIBDIR', join_paths('${PACKAGE_PREFIX_DIR}', get_option('libdir')))
++
++  cmake.configure_package_config_file(
++    name : 'Waffle',
++    input : '../../cmake/Modules/WaffleConfig.cmake.in',
++    configuration : cmake_conf,
++  )
++endif
++
+ if get_option('build-tests')
+   if get_option('default_library') == 'shared'
+     # The unit tests need to poke at internals of the library, but with a
+-- 
+2.24.1
+
diff --git a/media-libs/waffle/waffle-1.6.0-r1.ebuild b/media-libs/waffle/waffle-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..2f9c6de8b559
--- /dev/null
+++ b/media-libs/waffle/waffle-1.6.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/${PN}"
+	GIT_ECLASS="git-r3"
+else
+	SRC_URI="http://www.waffle-gl.org/files/release/${P}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+inherit meson multilib-minimal ${GIT_ECLASS}
+
+DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
+HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc egl gbm test wayland X"
+RESTRICT="test" # gl_basic tests don't work when run from portage
+
+RDEPEND="
+	>=media-libs/mesa-9.1.6[egl?,gbm?,${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+	gbm? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=x11-base/xcb-proto-1.8-r3[${MULTILIB_USEDEP}]
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xml-dtd:4.2
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-Generate-cmake-config-and-version-files-if-mes.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature X glx)
+		$(meson_feature wayland)
+		$(meson_feature X x11_egl)
+		$(meson_feature gbm)
+		$(meson_feature egl surfaceless_egl)
+		$(meson_use test build-tests)
+		$(meson_use doc build-manpages)
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	rm -rf "${D}"/usr/share/doc/waffle1
+}
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 56a48b843787..f088ab0aa6d5 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/wflinfo$(get_exeext)
+)
+
 src_unpack() {
 	default
 	[[ $PV = 9999* ]] && git-r3_src_unpack
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 8eb15b0390d0..820aff6e31b6 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gimp-resynthesizer/Manifest b/media-plugins/gimp-resynthesizer/Manifest
index 94363bb1eeba..48a33fe066b1 100644
--- a/media-plugins/gimp-resynthesizer/Manifest
+++ b/media-plugins/gimp-resynthesizer/Manifest
@@ -1,3 +1,3 @@
 DIST gimp-resynthesizer-2.0.3.tar.gz 11097693 BLAKE2B 51e064ed1a5d31dc3162a27b76c8b68d7652e3efdf2acad1844f4c76b47a6485b4e43788993c344a7154cddd8d2ac1ebda7c24f871ea8d6af332b1f15759f396 SHA512 de18fa41f5c3feaeff3365cc57b49f404f20439c6f84b212bc5cc76ee21f34566b8d093bebef1e6f27dbe3df6a23570dc091d23044a0967957ec0e97a16fa7c4
-EBUILD gimp-resynthesizer-2.0.3-r1.ebuild 706 BLAKE2B caf28446fbd8fd02910a7358f897c1a05e8f09c959642a56a91b3efb1894014083e81007b50cf718d57754a6a21fb1aaa71f64069191eaf5c9db0019a26838f0 SHA512 21dad9e3ab502e0335bc471b47c0935635062416b15ed9242f3d9b100546e5e5434e6a9af240cd0d56e299357409a4cc1c18ca82d7ce0db6de0f4460178df0f3
+EBUILD gimp-resynthesizer-2.0.3-r2.ebuild 710 BLAKE2B 2002945859bcf2f57707e8e1ea565e510e2285d62a845ad4495b976aca37dba544ef198885407b50a900017bf63ae31aae0e4f01350b6b9ec6561ec20c74199c SHA512 b4d0e0b22b3a59d7c9beaa5e854f49523e90ceb58320e327fe325847ad9b738ab396e027f278dc0eee392d7b867ec0741fc85068dc5c942fa9f205facdf881a4
 MISC metadata.xml 877 BLAKE2B 3e503fa59883ed68b3e57793430c0b3d88056a20548dd2de9498f96f0fb881700c93001df8162d63425ec21f817e27aa4c1c526219313818294b72862e133610 SHA512 cba06ed54fa07f78d5a114d679e978135acd13bff7eb69746e51c0f9f8ccc28c77b2692d1d1fb842aa695d7c01ce2e1cc096a362b385f7780fb60dd0c94f56fe
diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r1.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r1.ebuild
deleted file mode 100644
index 092dbe2cbe71..000000000000
--- a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-MY_PN="${PN#gimp-}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Suite of GIMP plugins for texture synthesis"
-HOMEPAGE="https://github.com/bootchk/resynthesizer"
-SRC_URI="https://github.com/bootchk/resynthesizer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="media-gfx/gimp
-	virtual/pkgconfig
-	${PYTHON_DEPS}"
-RDEPEND="media-gfx/gimp[python,${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r2.ebuild b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..3d8ce22e9b37
--- /dev/null
+++ b/media-plugins/gimp-resynthesizer/gimp-resynthesizer-2.0.3-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN#gimp-}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Suite of GIMP plugins for texture synthesis"
+HOMEPAGE="https://github.com/bootchk/resynthesizer"
+SRC_URI="https://github.com/bootchk/resynthesizer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="media-gfx/gimp
+	virtual/pkgconfig
+	${PYTHON_DEPS}"
+RDEPEND="media-gfx/gimp[python,${PYTHON_SINGLE_USEDEP}]
+	${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index c599ec2d87f6..d369556745af 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,5 +1,3 @@
-DIST imlib2_loaders-1.5.1.tar.gz 378169 BLAKE2B a65dabb8fb537489fe77fdc7c197ce4fa91dc13a86d1a5bf5aae4fbc9ac65a4194b57de8d49bb0dc2d906b20b7c79aa458d0ba668aa947a847414f377fd3b540 SHA512 a94996091a7f9f1271c19d24e6edebeb34977a4e67b8300897de0e5afd06bb9b209e404dd86ab3f397c6dec64f4985a515986b6b048d2c13416265eb2058a8a6
 DIST imlib2_loaders-1.6.0.tar.gz 375642 BLAKE2B cf1e8ad887d7b56ab828018e85d5fc635509eadd283ebc051671d8b9129adfded12449a5e8d7d52f4a8bd8e877a0585d62562e169be6176d93ded3dec0569e5d SHA512 948e85260ad9379f71d35ed8f98355f25878acef3bffc9add0419b6c3d3f7eec0dd504701d0bd2ad75a1aacba02e08965a5f0327f7a2832369af34b5d23d9179
-EBUILD imlib2_loaders-1.5.1.ebuild 807 BLAKE2B a2efdf32043ac6fa4e9158e05ceb3716861ea2ede0b9593f4c292f84e55bfd98678b5a56ce6aaf352a8f1773f983d45369307eafb3d352ed40a091a20ec7179f SHA512 997492faf9ad956235729970081a36dae05b45f24c88926634afeaeff6cce42e7d21dc4192cb4ba3ad828c2c0ec670f0ca7692738ef48466c6197f26f1f5fe72
-EBUILD imlib2_loaders-1.6.0.ebuild 876 BLAKE2B 6726b5bfd2d05818f9feca50319b95678e3f9119765821ea620c330f4734ea6ec470298b5de5fee0dc68af90bd01eebf818c6d84b3f277d993ddc74eb75ff909 SHA512 83097dd6c5838f648836bf3badb49602556368113712a39dc27e721f282e8a560131a38678567ccb14f9cbeb770b648f53a5156b4531aae47e024585d181f378
+EBUILD imlib2_loaders-1.6.0.ebuild 853 BLAKE2B d12d69f26e0849c721bcd518c5d48e159fabd803a31cd060fa99558b5a15918b436db25ab73669616b0165dfc34e98204930543ae55e2ca826efd5b057b12db6 SHA512 3277b69a70c8744d311f24016d78984440ba0eaa8a9c0277f0c7e6e5a4265dd9471ee9da1b5f9cca6c53ccd164d249d5335c83d9c785e4b95e7de7490c479b68
 MISC metadata.xml 828 BLAKE2B bb417b5233966162b782c8b9371fbc5b5d6fb3e36cb9d2ce3f3481b82dae184b1f754ad44d9b6275c24d4ff27f48278690eea38174f2ed2dde287fb5778c49fd SHA512 349cb0bbc1ac72e5de17a40b9e913c9fc2288692797255bbb1d48d5017daab8721c646aec489aca777d26a6f1fc5f641a2b30d1aaa2b6f6724678373d98f3e21
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
deleted file mode 100644
index a17b4de02399..000000000000
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Additional image loaders for Imlib2"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="eet xcf"
-
-RDEPEND="
-	>=media-libs/imlib2-${PV}
-	eet? ( dev-libs/efl[eet] )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_enable eet)
-		$(use_enable xcf)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	V=1 emake install DESTDIR="${D}"
-	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild b/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
index 0b2ef19787d0..e8ee8565a1d4 100644
--- a/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
+++ b/media-plugins/imlib2_loaders/imlib2_loaders-1.6.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="eet xcf"
 
 RDEPEND=">=media-libs/imlib2-${PV}
diff --git a/media-plugins/ir_lv2/Manifest b/media-plugins/ir_lv2/Manifest
index 15fadb5fb5bb..01674dac8bfe 100644
--- a/media-plugins/ir_lv2/Manifest
+++ b/media-plugins/ir_lv2/Manifest
@@ -1,6 +1,6 @@
 AUX ir_lv2-1.3.4-respect-flags.patch 1139 BLAKE2B f5e7d891e443c32c21b5db7360479b9d4ac80013805a10a6bd714ab6db5d64cc5d673571894b103db3bea12e5baa2d9f7c4a1053e6d6df517058935d7f799f06 SHA512 a9021b12c6663bf6bb20e87db01981f21afd9ceeeaaedce584389f69abd87c713c937250eea87f12a03610885cd02ab3cea6e756503b1987d1b678acd9e55b14
 DIST ir_lv2-1.2.4.tar.gz 126123 BLAKE2B fab75bf18b642ad59bcb53041462a0d37c84554f0cf6e78c5cdff69ee42a21812a5176083e325018454f6a0a990ce309abed1eea71eb6022ec5981186bf6f29c SHA512 28aac050352380719512efe3346ffddeddb75972e749dc9433cea92973e1ae838c65c6d7196646199218ff3362b24fa9a5e1a3578e74a0b9e268d21083874977
 DIST ir_lv2-1.3.4.tar.gz 126552 BLAKE2B 52f5b236c4680a759c0621ed0f9a394e6e82bdb9aaf4110b325902ae382d2f640a079c53d89c662a192a97d0e79349082cf100636c1a7d6c00738602ca652962 SHA512 6a9c8f906a07c6ed0daa53d8dc3693d535ec4cf63f07b5fcc62ab6638c66992ff7951918b0ce2ef8c65289b19988363be49bba9bb75a20b0463fa972b07ff58c
-EBUILD ir_lv2-1.2.4.ebuild 954 BLAKE2B ee73b1e5fd1edf5430fff325cd91010bd2884e728b217dab858f228084bf70992dd240f806d61ebf3cc9b011f430f9d453feb5c4a7ab1a830ec07192aa89e844 SHA512 e8691ea49d2e8fc94d6e90d8b5eb496a840812eac7a4b627bdb23bd5d5792cc80ff58b4a68f92821dcaf2c3e73c9504f8a2ccdf605f88b11808937072c5e4d09
-EBUILD ir_lv2-1.3.4.ebuild 1381 BLAKE2B 4db1d9acfc6077c24783281d559ecb096a2b3f1732e5aefcb6e1ed269ed230f9e5065042516d810095f1be913f4261e1e078d88d32f3c78c14891033681c9a84 SHA512 721b773e8051a772919092f1162422cd7a2f305d0661740aed164759d2aa8e2eef16ececab691f400a3cf6a64e8fe16f56557edf34e0dc212f510c68bcef52a4
+EBUILD ir_lv2-1.2.4.ebuild 953 BLAKE2B dbffe6edc29622b0e9c530aecf935cf5ce17094c47a685cfd5780777bcbeda9a379e73e4e8bff924445338e76ec41272a6dae8795751a7f60260f2b863f233ff SHA512 ecd86f25e7652e5bbc9dfd177cc0eb0aaea474728730fd1955b318c6bbc90fac7d91f06a0b7df100c3a94839011b5843947ca6c2c03c9cb42e3fa93a41c38110
+EBUILD ir_lv2-1.3.4.ebuild 1380 BLAKE2B 78998f31ff1d35158c0a02ee97c4e67c17d542040941ee563c903bb34250870681fda9063cda9aa125bd019f3ada4aa5d30ad771628b03ea0f4ae5d21bf46af7 SHA512 c8abe786e3e2e624cfb4cb04e0b10549829d3aabaccbfd54608b145787240cb5f7c9f5844042a491870bf247078c12edffb9a40e5c978cca86227369e355b00f
 MISC metadata.xml 319 BLAKE2B de7f0ee9cfe123a77f79cce2ade2dce0e5c3e5243ce13611bf6e9b613f04b7b2824bb70185796ed81d8fdbfc023722c1a45f9cecca16a35f8bf8cfb376dcc322 SHA512 d01e35b0d4b6fac4baefdac78473637585ae45a47f486c114f6fbaaa0c781ccc4d5f55e143c67dfe5fa074fe60cb60dcf5e6f5fd59b6dcd3e582c3e5dac68064
diff --git a/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
index 8fadc5cead93..c02368823b0b 100644
--- a/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
+++ b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN/_/.}-${PV}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="tools"
 
 RDEPEND="media-libs/libsamplerate
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
index 84fbbef3f1c6..03d78346ab04 100644
--- a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN/_/.}-${PV}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="tools"
 
 RDEPEND="media-libs/libsamplerate
diff --git a/media-plugins/kodi-audiodecoder-modplug/Manifest b/media-plugins/kodi-audiodecoder-modplug/Manifest
index 9f0449e37df2..53cefb89e813 100644
--- a/media-plugins/kodi-audiodecoder-modplug/Manifest
+++ b/media-plugins/kodi-audiodecoder-modplug/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-audiodecoder-modplug-2.0.0.tar.gz 30001 BLAKE2B 9ce90103a9b50a37c3f6c8671ecf9986f2b31320fc483dfee6d97331cb56829a9641c8cd1efe1fa9edf6ada360bc1b10bfcff0022022f4ba097a191b52dae0e6 SHA512 8f1cbd95b4fd6dcd560dc615c161e733d7b3413a80abf91c19eb59137e7acf250c9bfd5561a722ddeb52afcc4cf7e2ab0d4f6d8bc5143ef18e0b2c431635063a
-DIST kodi-audiodecoder-modplug-2.0.1.tar.gz 29996 BLAKE2B cf0f4e5f0ca74b3014ebdf4d539f8e9b27cb0b8c5f753866dd2955b1ddabdd60b444cb0b24db1de78b996dd982a6dabcb553a37a105455a399b25b3347961d87 SHA512 ad771a03726f8622f5bba2b98b5ee6484f83c8c66eded57d0d941551ba572c1014ca6f8f29a09a0cf3876db8b046c77db4ac81db6d5a7d51f5048e8aa37a2c77
-DIST kodi-audiodecoder-modplug-2.0.2.tar.gz 76719 BLAKE2B 20e36b95a5ba89a86b41db1c142b4e0c4b36961790ad2331e83a3274ebf0bba2b96eb3ee6d826e1f3fdba1a21fa12dd9ce98bfe5b7b887540120b2ef7a690dee SHA512 c05ccade7f3b3d99b02ca988dd0a0869e6815e0466ee713c7d1239d813d8845f1ff255ebea4be505b08424c630a33de8c032a1b5c37d5f1a1dc3c86f96b3b50a
-EBUILD kodi-audiodecoder-modplug-2.0.0.ebuild 746 BLAKE2B 6100bfca367bfb618d12a59bedfcb19d3930d574dbb502815b7ea04ae1413532369a8cf510020f318f911d16d17b073c6439c2f991b70c1a4d3c2fa6a17eb4eb SHA512 cd60e7b2c102078b7f49b851a221ebc3602fb41c8876947b88efd75e2931369d92163802c62e40a7e768753c53b089ed5a29e86908796384914b236fdb28792c
-EBUILD kodi-audiodecoder-modplug-2.0.1.ebuild 715 BLAKE2B b90fffd3454f4bb47b10a751283fc640ba22049fa7217a486dfabcb7eac2b1cb6ac79c1fb8b20ee6bebb1e461568f488a11e6aeba91757747e941638604d63b8 SHA512 8edf72c5b5902e96549f7570bbbf846daff3984d030afd0a7eb131f9da0e26d8b0896197e11c0ea954f9cedd4020d4967ac03b5cb403646e7058f45e0247b0d1
-EBUILD kodi-audiodecoder-modplug-2.0.2.ebuild 719 BLAKE2B 152aabc380269d94ae6654403b1077c931970cabcf38b63f6664d3652f86fbec5612a27b48ab34ada2558958c1b9f17089dc7f6ef528012fd3a67136fba2a612 SHA512 3d2dc5969cf2d6c1334de69b29d513e697e4568594fe9c86d556d9797650927adf5263b3489e147e83a66c219873cc70cfc124443003ba297044e7beb5a299aa
+DIST kodi-audiodecoder-modplug-2.0.3.tar.gz 77468 BLAKE2B 37d92be2eac6723324f9c2f01fccb95c5f34ffda34b6021475d79be009d27582f3c7f898d7b571e77223fde63fb5577383b81a355b1ada461763aaaf20a3acc3 SHA512 934cd62f48d63b5ae707f85c4f9f1b5dcabc97d1393d1b079b1453e28d088f9cf6d4a404584e1f5cac6ad5769121f798df69bcd88cceaa855b56bac84ead4c4e
+EBUILD kodi-audiodecoder-modplug-2.0.3.ebuild 719 BLAKE2B e31c0d3c619161159481f463b29c088f3e3d4815e2bb584f9b4d6f4cb7b83d3f8d0e121f95d0c8fb52905d234d6cf37635ed8de38c700249d1836c23b0b39d2b SHA512 bb8def4daaf01de2d23ce132ad8483e0ef32c2fe59c3a9fb4761dc8c8517b672f403a6ea882cc6a3305794d977f58286e85cdf0d8d3bfb078bc29e6e03810992
 EBUILD kodi-audiodecoder-modplug-9999.ebuild 720 BLAKE2B 66492e3c4cb4455fe45a1b63e3d37ecdccb439491fe8d41f70b3985e56d470c6096cecdd78ac7d73c74e2a505cce9fc9f38cf230793254419c7dc739cbb33b67 SHA512 51b98ffb5e244b4f613f73286347889349d7853e5665f30915fad0c7fe20f16c61bbfc8e1ec84b58208541f8d98b2a0aa9aec3269161d553bbf170e1ed6c558a
 MISC metadata.xml 442 BLAKE2B 7ac417393f7d1a671942b34984b98caf86a36c6b58ef5ad5eb49806e47ba2e5efad0f208c81343fc63c1949831fb9f8e5b83a16138d7a607ca900a0dce649709 SHA512 5b54a7fba19f53f9b07621207d7c71a95ee934e453bebd00a8a9c4f44831ac51f4055c033872ae937b9df9a9aba6d708bc067bb89f68284fff730dc349c2949b
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild
deleted file mode 100644
index e80d840de639..000000000000
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Modplug decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	media-libs/libmodplug
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.1.ebuild
deleted file mode 100644
index 29fdbe5ef39b..000000000000
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Modplug decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	media-libs/libmodplug
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild
deleted file mode 100644
index 19032c25f16b..000000000000
--- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Modplug decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	>=media-libs/libmodplug-0.8.9.0
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.3.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.3.ebuild
new file mode 100644
index 000000000000..23cb35453357
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Modplug decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.modplug.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.modplug/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.modplug-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	>=media-libs/libmodplug-0.8.9.0
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-nosefart/Manifest b/media-plugins/kodi-audiodecoder-nosefart/Manifest
index 03d7b1f8efc9..0b0b8c7d378a 100644
--- a/media-plugins/kodi-audiodecoder-nosefart/Manifest
+++ b/media-plugins/kodi-audiodecoder-nosefart/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-audiodecoder-nosefart-2.0.0.tar.gz 61006 BLAKE2B 8c3499b8820eb124f6532f722fae39c10880b31d58dce81a1170ae18005047b2ecdb7f9963e1a957de61beaf4a89d682580ea62e739bdc3045e0cd6402685394 SHA512 8dfcae6e81553bccb093dac2aefdbea6e405ebcf3c3505b4647a4970f46ec8aa2f45690a0fd73ff356d074c86c670ab0a60ff5a049dd1e54de3100457fbae935
 DIST kodi-audiodecoder-nosefart-2.0.1.tar.gz 92746 BLAKE2B 0af1578e0f09c4dfbbbddec834522c433922deccbc7f55c4faa4b5b5a7b4fb5563daea77faf745f5f8c61f4d49f168b1e5dee37a2e7d19f2f7d4aa9d685d69ef SHA512 78abac0d6ff2458e5bd3c976d432d5029c07d738dc03f861e068407b60d5ef2f94d7870d803436e8eacd87fdbd47b274e0bdc3367201772cd05084c1ebc8a67c
+DIST kodi-audiodecoder-nosefart-2.0.2.tar.gz 93194 BLAKE2B f8521331857c8a0d739f596000050869e7760b42c2611a3ef7d626c8b4d23514a53e1d5fa5b9cd88abada49791007cf74ef2ff99cf8c34e683a7fb4e2b4e9e42 SHA512 b0d7767562d3ad9305af76e436292f877cc51cad7a55c93c71af64724ae105596a0575d92db1e9e85da9cac06b968569f788ee9314539368d3f663d3b6d7ee54
 EBUILD kodi-audiodecoder-nosefart-2.0.0.ebuild 723 BLAKE2B 710cb2781dd91060752684b0ff799c13bfabb5ae90c6b420008d929257291a6900af663935c4194d4d0a5e6e396a84e05748febb0bc393864bb44da55186c5f3 SHA512 b929e8f7c3b793755b3a43452b3023215c891500f0455678218601aba2e67af4666ccfbc1ac6ce2e380a3c8d39130318e4269acc384d5dc8a44cc4d8fdf6f92d
 EBUILD kodi-audiodecoder-nosefart-2.0.1.ebuild 686 BLAKE2B 94831af2fb67f2a2590ecfb81942c5808e4e4ff04f34a3148faa69de84d9c659b2103f3bdb0a3ba69234b9be8a08b7a6d4bb2300d894011d3853033b25c50fe6 SHA512 a7cb7897600bd638aec857f86660916afa2b971b27d32786cfab6d51f2b23bc389b95885eb3bc019cfd987758d70693ed9fc6de3490dde33151f3913d33a427a
+EBUILD kodi-audiodecoder-nosefart-2.0.2.ebuild 686 BLAKE2B 7d3c706384e49c8213da9fe4c5300877471b2e0cea772e13988cd8e825da9536b77cbf7d1e5c54e157f6b356a42c11c4e3dfee9de3c386f90b6b0cad8443366e SHA512 22027bd71c4a3633d6ecf7429d0b1b39ff76f3f866b5f1951bcd78a10c1f3b20adb3f5e7fa413bc0391a40fc2ff384bcd4d41309633c67e88579300709bb7a0e
 EBUILD kodi-audiodecoder-nosefart-9999.ebuild 687 BLAKE2B ecfa9ef682b4c21b8889e6ae1e51023c63c5770cc5d9fb26b0da422ca494fea6153c243aae64746e4f13a3e367c5e0a2bb5f1917cef3d8d9083f85300def93e1 SHA512 b978ffb4651e5e96ab4c6c2569d7fb33ddfefa41b688be7071eceac0668c812970d3ce59236d3198453113b86621b45a21ce7076d3105cab450d84a099a696ad
 MISC metadata.xml 444 BLAKE2B f2946063cbdf62c0e0eddbb32b3a9f42a7e03c52975934a191a19e0bd59c97bf8bc70b55eeaf45ad3cad54a7081d238cfbbe1e235cc23855d8a7404cac2d436d SHA512 9a6295c8af39d75437b1f56b8a91e234ac1578110e1e64b52ee5ade240bd43764a52ec843735e7e3814fea6a662937315db4ae5e0988c9c016c1f72ab12fe91a
diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.2.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.2.ebuild
new file mode 100644
index 000000000000..9a00e6d07029
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Nosefart decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.nosefart"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.nosefart/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.nosefart-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-sidplay/Manifest b/media-plugins/kodi-audiodecoder-sidplay/Manifest
index 1374da315d48..b843e1e4909e 100644
--- a/media-plugins/kodi-audiodecoder-sidplay/Manifest
+++ b/media-plugins/kodi-audiodecoder-sidplay/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-audiodecoder-sidplay-1.1.3.tar.gz 10362 BLAKE2B e34853b875b8e328d06d67986609b40f31308c4e914f332420c8ce855c1d594b0bdd112689e874a663f189c722db6811ec12bfa64eb1e9b8907045776821d515 SHA512 8d3f43746328999ea817cd52e4e8f0f1454ffb1e243de4941752cfd7ea6f48848fe7d0855e7a9207934cb61e633389fed79379d3302d58c7c9e8c53784fc2adc
-DIST kodi-audiodecoder-sidplay-1.2.0.tar.gz 25655 BLAKE2B c34ca8a4e411875ef83a87443b52d57d48ae1897b15415f982e2f9f3af654bf3f412704d3e58994e64ada1bf2d63c64508afa7682048ed9e81cb2dfd92f9c552 SHA512 28124b04c6fcbcc8df341c8c5b3da6ec57a106a806e70bf9278ed15c471063db4e04190d8886770f9f430d024f273cad16779caeff7de02eb7ef7db1d07dba2d
-DIST kodi-audiodecoder-sidplay-1.2.1.tar.gz 25665 BLAKE2B 7b804fbe379361eb9a0f47e567655a19b0628b211b9c42e7dffc732807739104fd1af6fa4d1ec7f56ae4d52f34aa6097e43c90604be3a3dd696490dbd992200a SHA512 1ab7c39305e37cd7c6509342a6e1dae5b67b33905b4c76a175ab7505affdc9afd20b7c0ceecbd5f5e1a8efbfa03dfd067f8835a190cf201af7ae35d9448453cb
-EBUILD kodi-audiodecoder-sidplay-1.1.3.ebuild 748 BLAKE2B 81a7a05ea5322372334887f5487246d69d98b473fe974114575b2bbdd982f1610e60a5f5fb33a2bf3e47f3f8af9dcf3f84525c949cb3ade5278e058b633d55db SHA512 a303cc4bd142ea7214d8dd60510e2c55ee77b999eb85404b71b00589c7fa5dda1322df48ed593a0e2fab5aeac7c221dfdc047ef7ec901d3e55061241d1912957
-EBUILD kodi-audiodecoder-sidplay-1.2.0.ebuild 787 BLAKE2B 2596024abe066875c915e55802c5199e4da8468fe55c6e030ff2d2ff8e586fc50ef8ba21c7295cb2117c50236a5e29f542add5ccde0af1d5e08c897dcbce9e8e SHA512 bf31fd4b762be242b5eca332f25dd085c74db807734528d6c359612c5b35adc8e7a01da88ff8eda8bf1ff5cb630ac6a9c1cf99d602eaa8268a4c296a7fa3d2bb
-EBUILD kodi-audiodecoder-sidplay-1.2.1.ebuild 787 BLAKE2B 2596024abe066875c915e55802c5199e4da8468fe55c6e030ff2d2ff8e586fc50ef8ba21c7295cb2117c50236a5e29f542add5ccde0af1d5e08c897dcbce9e8e SHA512 bf31fd4b762be242b5eca332f25dd085c74db807734528d6c359612c5b35adc8e7a01da88ff8eda8bf1ff5cb630ac6a9c1cf99d602eaa8268a4c296a7fa3d2bb
+DIST kodi-audiodecoder-sidplay-1.2.2.tar.gz 26125 BLAKE2B 0c6076df3ba167423daccc32feb35509e9cbef9e74499db45e71c77fc51a3484a22c217d49b440d10e169ab2bc905a10875a2f6f38cea294774c8e2312b83b74 SHA512 6af355f3ef3cf11f8d95763f9676d8f8ebadb2f9d2fa4cdb17db75ab29bfeb26d6b56e4d1aceced0742319af943860f3cfef4d0723d62d8ea520bbe529bdf1a9
+EBUILD kodi-audiodecoder-sidplay-1.2.2.ebuild 787 BLAKE2B cad031ecc884e5a46be54d9ca8ea0c673494ae7432881d5c6817acfabbc1197bf0e63fe435c4bfce6291540bfadee6f8e87f8a2d14cb34e714f208359f27f8aa SHA512 3756a70ea4683c3bcc4ae05b422b6de4203b81dcf5b88764524a856d594d6fec3804cf1965d976fde033792c74e936364340106820909295287770fdab944280
 EBUILD kodi-audiodecoder-sidplay-9999.ebuild 788 BLAKE2B 8dc99b84ea3075c5f0f02143a1bd795b842eef683f1794f0d7e2e85d85550286fb5b796d45002f4996942ae2d4f5b7ca2008c80ccb3da0db140bbc3bd3e2cf23 SHA512 6b27618864c8bde3c077bbf0b90f6d66c96bca7361793cd6eaa23c66ca1d5a082dcf8864fedd731873352240b0052bb5cb11ce6e2620334b826f6b89156340c0
 MISC metadata.xml 442 BLAKE2B afc3ae3f9157185ec41cbd144cce22ddd50be0f1409ccb2c764a88a0e448d6504904522d0a18bcf089ca85bbc4a8b05f51e795ec30fb9f7614479835b1ec1185 SHA512 4046b1455fe5c4cb63127751d2fbcc21b3b124609fbe0798c9675e50a837cabf1ef8d7d48103162633a6b47b36394feb1f15d45fc92f6266760de36ea614d6ea
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.ebuild
deleted file mode 100644
index 6d68262da236..000000000000
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="SidPlay decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	=media-libs/kodi-platform-18*
-	media-libs/libsidplay:2
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
deleted file mode 100644
index c84cba0c3321..000000000000
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="SidPlay decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	media-libs/libsidplay:2"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild
deleted file mode 100644
index c84cba0c3321..000000000000
--- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="SidPlay decoder addon for Kodi"
-HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	media-libs/libsidplay:2"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.2.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.2.ebuild
new file mode 100644
index 000000000000..ebe732fc93f9
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SidPlay decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.sidplay.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.sidplay/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.sidplay-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	media-libs/libsidplay:2"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audiodecoder-snesapu/Manifest b/media-plugins/kodi-audiodecoder-snesapu/Manifest
index 1f46d3b54ba4..1ef89279b292 100644
--- a/media-plugins/kodi-audiodecoder-snesapu/Manifest
+++ b/media-plugins/kodi-audiodecoder-snesapu/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-audiodecoder-snesapu-2.0.0.tar.gz 39499 BLAKE2B 5185eaa4e658a443aad400403be827289807b804ba574907a14b0bf5ee3cb5877cd360a0f100f75b309c9214047236723a079b0172d916ca9c4ebea740a5628e SHA512 d1b164a063ae983c49e24a48ed7fdba10f39343e1ed5aad60e0e141f20c8f3bd8115359ccc97bf4583fac7bc1fd9b1dedc800e34cb3d9ee8749c345396696724
 DIST kodi-audiodecoder-snesapu-2.0.1.tar.gz 70042 BLAKE2B cfc0f887a19b7d9fcf579888898820692d388b914709bf551ccbe372b3cb2889a1a9044487b72d270f946ea8f1ffc13f11b59fa0ef424a80f320db74525aa108 SHA512 4dedcee8a894b138637876f630135148d7ada5212913ec5b0eb208ae4a3bf51560ae633d434a91929810c6a75b2b6c5d2144703b04f86f74fcb4770b1c2f814a
+DIST kodi-audiodecoder-snesapu-2.0.2.tar.gz 70750 BLAKE2B 54696e7e9df82474e22754f9fbb662bc12de01e3946f48bc9c093f838ca3add77881f5a7ed8cdbc75689c25cf081d0c0935d81fbe32203039df74c420b4bda8d SHA512 7b3ed7556626fd20492720b7b87c3e3885ee565066c2dd34e239608d3a5845584cca8a7a3be50019f2365150072c28480652f3eda6a4e584da4fa1a45337c9ce
 EBUILD kodi-audiodecoder-snesapu-2.0.0.ebuild 718 BLAKE2B 7b5b99a2d25eabd68267d06716a5aa6713b8901c5ab018fc269c563c0978ef2956754f90e677f820a3b50665e359467584d83a4e8dfb29b543fd6828c74674f0 SHA512 6a31ee44c729433ac50a202d97f3865c7e0f92e0df66e6452bb6f6ba783900c453df7fae77c9cffbbda8fe08f04eab984c767d1a1e35139afde15fe873ea2fdf
 EBUILD kodi-audiodecoder-snesapu-2.0.1.ebuild 681 BLAKE2B 4fa055c566d4434162012c3ed0a6f9470cff69791eec4fe643e2aca779960486de2c0c50c031cb3a3d2badb0603e914d718c6de3d715a70646a4b178a1ad44f6 SHA512 c81d0b1c8e1083dcbbd459646979872097baf6cdff2a4b705bd97990bab3ef783fa76893fd48705712dea38669afc627b0b02c850924e20246b5703eb09801a7
+EBUILD kodi-audiodecoder-snesapu-2.0.2.ebuild 681 BLAKE2B f7e7c05204c11ac195e3c6b46c5cd462329e043743a56513fde132b5c396f8f3a97ea8554eb7dd8e2e9618a0c6bb7bb77e0552789aff21d5f09848748b9bed66 SHA512 d84511894bb581666ff186f45fd8db750dc9b33fe0b8bfb8f564212f252ee3f3545d43cdd51a1010430e410196ef59973f14d524ee6c4cfc1efa3c9c054c388f
 EBUILD kodi-audiodecoder-snesapu-9999.ebuild 682 BLAKE2B 422e69a8b54d67cffe396ea823f8c2d47d389b8b5a502667243b6fbdbb8cdb7c5fb50225e74d89fe86911338a446f12fe71421ad8332ab830a9aee99504f6998 SHA512 deaa7fc53dfec72e2e79a4d97f21a147109f127ef039f12e8dc7a65ab9fdd66fed64764147eb621b59b33602c67dabc63ab83149bf8d34606d69f61e95e13f18
 MISC metadata.xml 438 BLAKE2B 0b8c0545fe3ec7e6ead7eea42baa9255946bf7d27762d392899356ed45e1e7182d7087c25a56b34d114e6de8b95c8a5311fe90b0d52a9e7d007851ec22ab970e SHA512 9561349a81107c52fe83cada11fb8ab55c176fa4e410556741f5259503b7d43732bcf7debfa30a7c98fc7d1e5336abef914a7c31b9663556cd10fc7daf3dab14
diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.2.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.2.ebuild
new file mode 100644
index 000000000000..21851cf08adb
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.snesapu.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.snesapu/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.snesapu-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-stsound/Manifest b/media-plugins/kodi-audiodecoder-stsound/Manifest
index adecdf4413a5..679d32bfaad3 100644
--- a/media-plugins/kodi-audiodecoder-stsound/Manifest
+++ b/media-plugins/kodi-audiodecoder-stsound/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-audiodecoder-stsound-2.0.0.tar.gz 63097 BLAKE2B c797c7fad5811aaa12217cd6c4caf4167581940e25fc2684c04578e06a04e44d683e0871d6847c6cc3367ee5f5925de4e5640b9eb2b4381a713a3ba6c5860dce SHA512 2770da6d379499fc53d013163e28aeb2c1ffdbbe1cb54f2f2a4d5bac33b68d867a8de0865fe72d283f28ded1f3bd79efee7c98fb79f04ff99459d5bcf3f0f1e9
 DIST kodi-audiodecoder-stsound-2.0.1.tar.gz 89746 BLAKE2B 4429890376ed67e10e5abe76d450731a0d05a5892cd8a5f66d49fdbd8f0743547fa7752c87bad11f2b2e49e1519a0fbdf457da91eb16a42554d5a60f2bafecad SHA512 133eee1892817b69ec34d7897316ab6e967e67968b72ad7d73199d36fe86f119ee015f703022fb850c2c8bef11d990bba3c0a5df5f24776d4861cbbcb6b466db
+DIST kodi-audiodecoder-stsound-2.0.2.tar.gz 90362 BLAKE2B 07e99effe9fd60ae723ca61cb1a55408c5cc5458571c6e991c3acfdaf64d635ca24355c0930c79df77afe3e024735be2ec9a46a2d1611014d76364de325aae6a SHA512 6925bc4a21db7b2b997721227689c94bca3389b8c4879d4f10e754231b1be4f0e0cb163f07945624ffb6963c58b6d243b535c7f1490382a89192b50e558227c9
 EBUILD kodi-audiodecoder-stsound-2.0.0.ebuild 718 BLAKE2B 71873f38dc0906481f5f18d83fa6af3ec610f746bace3ba211957efddd902ecbb4a8d4a20f870e81bba94fce0e85e667836828d5a5f06f8136000221df056cf6 SHA512 15e356df7a512f9ed1036bb67b3e86defff69c0f077c751444ea66c847352ea9ca25aac3c61a39cd8c96b4023ae308ef7e418fb234e76fc8bd17dcf15eda393a
 EBUILD kodi-audiodecoder-stsound-2.0.1.ebuild 687 BLAKE2B 9a5740921431f986d7c7a8904fa4164a3fb1d70feb0a5a768b20b91e3b2d99c720da709678678f838af8167fce3c68c23b5526f64a2f892603e2ae156b84b93e SHA512 cad61dac4b12a322d6b9abc95161d3e88df451a145ce0582ebdf050b5ea6afc3186c050f16fcc90fb85a6bd5f6897a2e08fcb45f6063279e6a64f2d7468881fe
+EBUILD kodi-audiodecoder-stsound-2.0.2.ebuild 681 BLAKE2B 8fcc319c5617660e5a1555da7d6fbe02b0c0dec38937aab58370f8b3988c109bbeb6ee954071f93eac32f3a8184308465e428532c01eeae1b0ad930774dbc750 SHA512 3168d5556703af89bc5fdf76a6ce8faefac077bb0c649026a686b99f2b47e125d5dd7fde827e4cfbd935eee15730efb653d336ee60aeabb3c622002e77c7c3eb
 EBUILD kodi-audiodecoder-stsound-9999.ebuild 682 BLAKE2B 5c53aff99e3ba409cbc52f74a43b9486b848293658f9e8d64485b4534d312c656aa2cc9955cae1a6b35145f0407a409cde0ed92a165b6631f774269ea60ada25 SHA512 67bf683a063a3a4c442ef8f844dbd2cf9200070a59ea825c61c258cce1ecd16f71858b9469ee2f67e9ecfb2a0486b53f9c0b67a1f11be9a11dc2fbc854ee06cf
 MISC metadata.xml 437 BLAKE2B 36e61faf2f1098a85827d6f81536b35d874e325a7094d535b742c71b30afaf671ed77cf9d84993ebe5e2407ee316d72453a3e18b3cfe55c0d5ccd9691f3cf12f SHA512 a985c629c36655238f0125134c4f64ffae47add726888adf934b8b66aeb9622a12ac256703206b98ed39f29ecd0a0f9ad9043af80160a8d545a982c9fe659504
diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.2.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.2.ebuild
new file mode 100644
index 000000000000..b17dc2188889
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="SPC decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.stsound"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.stsound.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.stsound/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.stsound-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-timidity/Manifest b/media-plugins/kodi-audiodecoder-timidity/Manifest
index aafe2653a165..23d7fe66435d 100644
--- a/media-plugins/kodi-audiodecoder-timidity/Manifest
+++ b/media-plugins/kodi-audiodecoder-timidity/Manifest
@@ -1,4 +1,6 @@
 DIST kodi-audiodecoder-timidity-2.0.3-Leia.tar.gz 1816069 BLAKE2B d09d51a4f838f0639aeeb3429864923453e50591dcf2ce15227dd08e8c83358ad77ec454b87f67b9f9bfe59cd07099987146e0038c757a9fdc07305f3c167c78 SHA512 8928f493120231ee21dc8e19a5aba7219e3b8fdcfdb648a15ea13577d082e89e6ccef789c4cd0547d31625a090af4a590bb96c8b72f5dc3793a5720bf96f2dc0
+DIST kodi-audiodecoder-timidity-2.0.4-Leia.tar.gz 1816111 BLAKE2B 40fb56b918c735230eecf365ab11573f71ee0d459cd57c290bda69d77b8c740cf72d9a9487dd64ef7efb3e9958b1ec26674e0364c6f50cb64889cd4523bac790 SHA512 6e256c5fc148eea611d05c9658fd22ea0c2ee4b9e97555eb95204aa97784ccde70b20c5802256ecc8d3ae18c5ea170217e2d420aa4bb1a74753c81ea0185686d
 EBUILD kodi-audiodecoder-timidity-2.0.3.ebuild 708 BLAKE2B d575fd18b8342f5e5ff6dc04140b178f7be935b9acf9e64577afa335e108ea10cf909be5498147e1494ccc85c27faee33b13ef50c310294dfb4e68e8d53f67c5 SHA512 65e82f5bb21296ecbb5303ddb01155f63b33cd9f11ea941e2c25bb78c64ed99b98e1a2b9da10747c4d6cd0e508e4595be5b3c63995711a73bbe83b0bb5af406d
+EBUILD kodi-audiodecoder-timidity-2.0.4.ebuild 702 BLAKE2B 6fd2ee0760d4e9dd1a4e9e8d3247837d40c53b4ae35068668fc498f90728afe4cada15668a4b1a42999c992433ed8f7fb1d0c381cbb142c6623583e7bc686acf SHA512 a69394d9e284cfd7458637b34e67b121e7729aa6997c5cf7f8be583cdb97c0d1f318f54414e086e76e88099ce584ea2d1db5b83fd7336c256a6dab298141f785
 EBUILD kodi-audiodecoder-timidity-9999.ebuild 703 BLAKE2B 884aba7ac1e673547d698508977174ee2a82db0afe0d0e5a27f30ada90aee28276c96f09911806489309ac0c5690a4614d82b96f0cb644517257812213f5dd91 SHA512 c7cc8c84203d3c7e9f381083aafacb44229895b25d9e627db5503ec2e5805721e04a4c13b8bde0842700a6a7f21be4cda120d29d758859e2e07d773460591d2a
 MISC metadata.xml 444 BLAKE2B a8bc29439b6fada05640522f57d0c97d905ce14abee08f1cff2ab2e1fc36c20ca4491e836b9092ca4d0c7a2b9e66e66d6882b1c5c77b4973d038b294e7d82503 SHA512 924f94fe1923314c5ab70873705dd30874bdf52c5f2f1d13282c140b0080a71a483206c7554dacf0c4dbfcec9f4f4ac340e024b32fd9286f8ce69d52caa8aaa2
diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.4.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.4.ebuild
new file mode 100644
index 000000000000..e44ae1aee11d
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-2.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Timidity decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.timidity.git"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.timidity/archive/${PV}-${CODENAME}.tar.gz -> ${P}-${CODENAME}.tar.gz"
+	S="${WORKDIR}/audiodecoder.timidity-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/Manifest b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
index b551d46966fd..2a445ec5a14b 100644
--- a/media-plugins/kodi-audiodecoder-vgmstream/Manifest
+++ b/media-plugins/kodi-audiodecoder-vgmstream/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-audiodecoder-vgmstream-1.1.3.tar.gz 236276 BLAKE2B 4323a96ab7d899f40b0cc3243ed9047ca32b2669a845213e7a5703e79e3a4c10d1a37039b0d627d9b636dc1128b49da28e6ba798b44584411b9bb8bd84cc043a SHA512 7f855019e04156b5601a7be0f71a833b241c52bc2dd63f44f2c0c5f3a28b70e14ee9677e5e381ee283d332f167d1dc6e27f1f6cfc5212acb9854cfd93f2b4005
 DIST kodi-audiodecoder-vgmstream-1.1.4.tar.gz 275249 BLAKE2B baa3cc5cf1b744700eb026a03872b694a1c9f293da5e82747b8dc1d84e2dfc487a364d94d2e8f344ca556cd5031a2be6a2af330472863bd68c59cc9a9b158f51 SHA512 002009f9022d38b772e02e920a34562a98b71149db3d551fd913bfcdae50d51fc6caee3a2dbb20e7c5e4371968fc450e9aa50c15815a3ef8425f1cccb6ea4b86
+DIST kodi-audiodecoder-vgmstream-1.1.5.tar.gz 275897 BLAKE2B a9a902b0a2444125675f4f237bfc07c44947856e127b7c0692ccabd0bbe91b90b76f7f6f183b1836bb21698bb932c24dfa3db91063492d024983b3dfce977c53 SHA512 52369b677e0eb04787887241d34db7e24ac1a6c3110ccd9369f1ae4dae190347b0800fed35c0fa28c2dbf268925ef559d91566b745ab6b03000e4c5e1628b90e
 EBUILD kodi-audiodecoder-vgmstream-1.1.3.ebuild 728 BLAKE2B 6af6cca76ee3aeb860bfcaa606edd22385991eb920396ea860a44d34a701a4915d2f3326f14a3e82d9f2fefa885f40649644fef6cd45d3678f23ab6cdb7ed7b7 SHA512 3518755dba1f5db9f6d571c7e3d52e83bb1c790c9b1df844c5152ea0d1a0a370bc4d5bc1efec35b3be642fa64764e962f3ccaa8a5c4c6ef591d449739a1f4fac
 EBUILD kodi-audiodecoder-vgmstream-1.1.4.ebuild 691 BLAKE2B 731c0daf8be6f9c7c069274038171d87b3a124ae67cbba9b7856b762c724dc8ec596043f9b0c66c32e364b9ac0b23ad2733736a42a762633411ec3f99d00c818 SHA512 4cad89536326c1718a6048b509c5bf4077c7a3f6f294715b57f0ce2919e4416908e216f4e0ee1120e4f64b98f13ccb3ebbbc683caa35eeb226305b64ca2ed348
+EBUILD kodi-audiodecoder-vgmstream-1.1.5.ebuild 691 BLAKE2B 8b0f645e4452d2c70c1cf86aadb92fd47ecf9a74493fdae4cde8ab2415d5d61afbb78efe3a2a842d3fa31f7752f2cb2f200eb9e048b10efb7e2e05b803bec7a0 SHA512 444510104ad06ca0e25fb96d610cab06fdfdc0c07841776e9a3c78509f545b09c6436d76da75d7695199cb318fc0e3e13526c20059faf94adc1e0119570e954c
 EBUILD kodi-audiodecoder-vgmstream-9999.ebuild 692 BLAKE2B 405fdbc80942f3dfc224a0128ed0bd62cf67e2ac85165c2101ebd939757676bafe368c841f63f763cb550b2c70540fed98dbf72b9b9a6219bbccee6c80215dcf SHA512 eb585cf2225a28254eda62bd40f63221863c0764ab95e3e3298a08de00808db3f1775dabeb76d4c6360d444032a83f2fc5d3effad9d6929ef96e96439a300570
 MISC metadata.xml 440 BLAKE2B 534e3b04fc69fd47da8b492744fc924ab8e3ffca3b8bb4ab06853dfd5e707f3131630ff06272548c3b05227a9d1cb110441a6b39315203918aca4dfc9fd1c52e SHA512 280074c2c911f1df1c0fbfaead6f51f49992accac7cff643e3d03a0b52f6b64cce156937430d950bc1c875c48c15632d703e5eb69a6c270bdbb25ea7faf7f03d
diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.5.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.5.ebuild
new file mode 100644
index 000000000000..8b31da13fc42
--- /dev/null
+++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="vgmstream decoder addon for Kodi"
+HOMEPAGE="https://github.com/notspiff/audiodecoder.vgmstream"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/notspiff/audiodecoder.vgmstream"
+	inherit git-r3
+	;;
+*)
+	CODENAME="Leia"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/notspiff/audiodecoder.vgmstream/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audiodecoder.vgmstream-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-audioencoder-flac/Manifest b/media-plugins/kodi-audioencoder-flac/Manifest
index 324ac5c7ee30..98bbab0f1f33 100644
--- a/media-plugins/kodi-audioencoder-flac/Manifest
+++ b/media-plugins/kodi-audioencoder-flac/Manifest
@@ -1,12 +1,4 @@
-DIST kodi-audioencoder-flac-2.0.1.tar.gz 20523 BLAKE2B 6ef8f51df7d0c0113389508e3d295b9adf7757684e42ab01ed19f4837881b2f9adfcfd6950f01fb0de54a772a7ea907afd3c4595b0df4b8fd2be647149a5a510 SHA512 4fcbfd4efe52b6983622367eefbbf09a9392c460160d6b4659df0e8b86a565a23f140a22728a2e40b033ad8cdbab68b786e90120dca034dd690217f8ba2b5c01
-DIST kodi-audioencoder-flac-2.0.2.tar.gz 21036 BLAKE2B 52296b0a85b3f6778cf5de67d5b5b95339195f23dcc1d35b4b3e738d7c2ca2932f1584a467a6654837f6baf898f118976c2d67087ada4561971f725978740587 SHA512 5e5ac3e66b193727e5d2d85c5416275adda642502526bf2525864135119f831b0332a50fca9dbb0042cb0a8165fa93de12d49f1e9cd467eb3280f31e3ee99486
-DIST kodi-audioencoder-flac-2.0.3.tar.gz 20974 BLAKE2B 3a328e7168bd3ae16faa0a7fc9917586dfc846903ec1cd4f8115986530da96fc9ffc7e614f5eba810f22bc833b9cf891d5e61d46c3f4db910b1c10f25fe6d661 SHA512 036c4368b09e540f67ad7654ec567d22fd52dcc8690bc22717de33180e6f8c03b0f6a1ecb8bd7a63dd99e65fa4318ef0f256b503fcb295ec0fb03ff38aee0322
-DIST kodi-audioencoder-flac-2.0.4.tar.gz 21010 BLAKE2B f7b59432b2054c6cde1c46728af77194a922d845b166efd90f20c033da234dcbf7e79f6b1e26e6c0ea59d92ede9b99849d59497bd09120bcca22b1c40139e41b SHA512 d58913acc84b892049919c15fd5d82e46f4451eaf6f7993e36e66e1e390f14c86bf0633dfdf60f6751ea23b43b7e0b7a8d2fc7a1c28a87212c614fc16cf33056
-DIST kodi-audioencoder-flac-2.0.5.tar.gz 21077 BLAKE2B 52df110e0c60abe3c309abafcd46c3407690132af95b251188fd701112ed17ca15b9dddaca882183b2f64357717ddc934cae4f072c70d10d049002ccad24f90f SHA512 4c6940be8c84f509a399ed22a38281259327371c7819cde4266ffd3712484664561a9bd3a5ecc8b51c0e45305f90114164f3aa2bc624c0d0d588b212bf28c750
-EBUILD kodi-audioencoder-flac-2.0.1.ebuild 660 BLAKE2B 18fb51dc940f5ef49f33a29304e0b4f4ced49a6337c9a46eeac530474d4dc84a8cfd43513ed14b6ee446e4d7b2efa584dd2e924ac8f396ddbb6ce7325b471785 SHA512 954d4337b5ddc2cb0e20c8ca658b9b8b520638f7a613dcc3265a884cca2f2c28042e9dad96a875fab1cac00e952e8dca17575af2bb3b8b76ed065ca91b95bd79
-EBUILD kodi-audioencoder-flac-2.0.2.ebuild 780 BLAKE2B 3f1dcd1979436652e42309a92c61d05245c9430a777204dbfddc23074f0661729b4c5d09b244b5d78029e0404208040705526b1fef8d03f0780a3765660bfc22 SHA512 070266d21a3b08de67e7e7edf03841fc8c0f654ffb9800fb15da78a48f0438b5aa9caebcb7e7445f90b42a4cf18a2e72b3acb3d708bab073e35bf1e0e4122044
-EBUILD kodi-audioencoder-flac-2.0.3.ebuild 780 BLAKE2B 3f1dcd1979436652e42309a92c61d05245c9430a777204dbfddc23074f0661729b4c5d09b244b5d78029e0404208040705526b1fef8d03f0780a3765660bfc22 SHA512 070266d21a3b08de67e7e7edf03841fc8c0f654ffb9800fb15da78a48f0438b5aa9caebcb7e7445f90b42a4cf18a2e72b3acb3d708bab073e35bf1e0e4122044
-EBUILD kodi-audioencoder-flac-2.0.4.ebuild 780 BLAKE2B 3f1dcd1979436652e42309a92c61d05245c9430a777204dbfddc23074f0661729b4c5d09b244b5d78029e0404208040705526b1fef8d03f0780a3765660bfc22 SHA512 070266d21a3b08de67e7e7edf03841fc8c0f654ffb9800fb15da78a48f0438b5aa9caebcb7e7445f90b42a4cf18a2e72b3acb3d708bab073e35bf1e0e4122044
-EBUILD kodi-audioencoder-flac-2.0.5.ebuild 780 BLAKE2B 3f1dcd1979436652e42309a92c61d05245c9430a777204dbfddc23074f0661729b4c5d09b244b5d78029e0404208040705526b1fef8d03f0780a3765660bfc22 SHA512 070266d21a3b08de67e7e7edf03841fc8c0f654ffb9800fb15da78a48f0438b5aa9caebcb7e7445f90b42a4cf18a2e72b3acb3d708bab073e35bf1e0e4122044
+DIST kodi-audioencoder-flac-2.0.6.tar.gz 21666 BLAKE2B 13c63fd4987dd4e911e3af44642dea33a7d652b5f465654e7038247000aa324ff2b2422f22d7ed88a7f956c3d15dcf960cb9e5bde4b70b3dac3604ada49a099c SHA512 7de2b0f5b36b62bc1f066e5c99fba2aa61baac5f204a75556172aa95332999806a34babef08ac5e516e62a123b83d3befaee6654d3089ebd1a305335a40d88b5
+EBUILD kodi-audioencoder-flac-2.0.6.ebuild 780 BLAKE2B 84225dfc9578b5c517efd71035b5b9e1825bf06ce52a344e1d2974efe7fda3106b9f71c23a62ce6e24fadd3e8bd6f250c546a2463e891d4336558dfd739339d6 SHA512 5f7d55f28d515bd9bb4d7b3e128d7fa794dcabc789f4b9efd7681e5b382d5efb6dbcdbd20565d291dc87bdd2704af940eda2adfae9e1a61f3fa8651d4c43d6e7
 EBUILD kodi-audioencoder-flac-9999.ebuild 781 BLAKE2B 3bf0eb9b89337a2fc30af286b68f35dcd352ad228ed343453dc331b822b810128824392a08a89f839435f28577bc519fedfcd95a63d29dc172c1bb6ec2cd0423 SHA512 e8b422dfb9c97807c215eaa5ff286f17c1844880c8ef9bcc8427a366db4a5cf3769754c7f78f9794ebf5abc9940623dc94d524f48ca4fdc23cdcb31b12be3178
 MISC metadata.xml 432 BLAKE2B 08bd867e97f6d3b7a103a557f95103159b2df2be3ef336f02d1f2551acc722d59331f981d4069451e33439730f0e9648cabb6c2f8559e214b421467759202c3b SHA512 2ef0c92e158ae0677b431163a8ca974a90c9d8acdf9fc95c563b152f1250657fcc0d64a212ff20ddd46585284ffd2e732088426b1e033b07862bfa889b7a4058
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild
deleted file mode 100644
index 68b701ab3ff3..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	media-libs/libogg
-	media-libs/flac
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
deleted file mode 100644
index 15673bd09c98..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	>=media-libs/libogg-1.3.4
-	media-libs/flac
-	"
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
deleted file mode 100644
index 15673bd09c98..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	>=media-libs/libogg-1.3.4
-	media-libs/flac
-	"
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
deleted file mode 100644
index 15673bd09c98..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	>=media-libs/libogg-1.3.4
-	media-libs/flac
-	"
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
deleted file mode 100644
index 15673bd09c98..000000000000
--- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Flac encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	>=media-libs/libogg-1.3.4
-	media-libs/flac
-	"
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
new file mode 100644
index 000000000000..cda8b9b68051
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Flac encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.flac.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/audioencoder.flac/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.flac-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	>=media-libs/libogg-1.3.4
+	media-libs/flac
+	"
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-lame/Manifest b/media-plugins/kodi-audioencoder-lame/Manifest
index 37a11d27fb37..a9a056c6a781 100644
--- a/media-plugins/kodi-audioencoder-lame/Manifest
+++ b/media-plugins/kodi-audioencoder-lame/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-audioencoder-lame-2.0.1.tar.gz 23505 BLAKE2B 706cefee19bfdc19caa7c65101d61a3032f70033b4c8adf40c90009aed81c8b69c30e0a8982cf633267c26ea568b19adbefaf6c035617573fa09ae486a6d8e80 SHA512 eb780f31e96a0c745cb2598212aab39a065cc85b186b579ba2ace4732640588dabf9a6ef2e6ee57ddd793a2790cab0b8c2a1068714b80ecbfa4ae4a6eaf2f4b1
 DIST kodi-audioencoder-lame-2.0.2.tar.gz 20286 BLAKE2B 56ebf807a40d2d77469c454db0011a4c70000bc90cb3cbd41839719e376a56b9d07733a583f551fc74eff6de42b25d6c84027e678f7d5f34bdee9fa576b0ac33 SHA512 e4a73dadba4fafc8e60c1730404f9390a191bec58823202c3193f7f0571e914151c74b6d18e7d48551ae2f493b9ef11a84ddb27976a5f766e1ba512f1a0e141b
+DIST kodi-audioencoder-lame-2.0.4.tar.gz 20819 BLAKE2B 38340fb3069cbb8539ead53e91dbcabd21e169fc5ab76d3b7142b126f192bf8a295e9d7ead2c4e68d822dc1596f0b7e83a962ef8709783979279e4a9aebb562c SHA512 8b57d20c2d02ec7148a83ab7af78eaf92b600a40faa666c4f26b5acb59838ade54f026dc3869b23fc79511fc5901acca5322d2f04336fc8d4f545f5d7c04cb2c
 EBUILD kodi-audioencoder-lame-2.0.1.ebuild 647 BLAKE2B de177cc8b6520999c840a786a31e56d715cce0f815ddccfadba9f6f15e21c5c4931720c4bff995d2dff1a45179018f3d363c585b9ad054a658114d1ae2c4085f SHA512 3f17ff30706653b26f130e6323f0ec22d1bb0933667efde7280d7e97c22a908c651d193f5242115bb4b4af294da7285171104d6b62356d690c0906de1564a422
 EBUILD kodi-audioencoder-lame-2.0.2.ebuild 767 BLAKE2B 293786c3014462b0fafcf270a3b5d3ad04d2e92bc9d1e85b6bcfac729402e87e22d89e102cbeba370bea2273a16b30522c5c4d71d3e962375265a72dc14ae806 SHA512 7ee24e7ac71208e119693ee11d0a91e842d8a21e6e9372ecfb71c1bffb7bf1e26c2251abe7ae082d82db9d00283729bc20bf648e9b086a6faa96079ba1c6d589
+EBUILD kodi-audioencoder-lame-2.0.4.ebuild 767 BLAKE2B 00f6166adfacf05492e361e5ef22f3bcfa30b0492a595ad8e14ef5dbf1efe701f257a9be470c12d29ed58d4753ce072b9cd521ef4527a34f371299c83323b9ca SHA512 df6d5ae65cc0aae4a4409878c432c43af2657a94d40103e8dfae1ca0d47c1d57fe1079267936fd1d910962f40023ca618d2267786b3a7e8e1527c4ab4eb8b12d
 EBUILD kodi-audioencoder-lame-9999.ebuild 768 BLAKE2B faacea6283d1b66dc3216c9f96ea10db35afb5b09f242533b807e9696058f0fdf7e6231519f2ce1c84c802b1c73ec702f95b0163f668fa88967b9d947cfb2a28 SHA512 7f2388b83cfa37440ebe9fd3b8192c164dde125a0ae9e6d96066f4cf1e08c66c4c06620ccf7af3a62221d5c9555f7de0e964b6a617a89825da7d57547a0ee883
 MISC metadata.xml 436 BLAKE2B 89eb2bd7916bd6c206439984ddc7f84b5c04cdfe923b28f911f919720aec90449d40ffaa7d85306e486357d9e2b8b9681b3f3b79624dde542f2cdac218ffa75a SHA512 15bf6ae63d3265efca6ede0b1fd0849d266e58b555b2f1e593eb85752ddd62e56a1684ba33c0194368b564228c88fa55349e7ed088ac376f5b020045f3c4239f
diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
new file mode 100644
index 000000000000..fec255d3dc38
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Lame MP3 encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.lame.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/audioencoder.lame/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.lame-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	>=media-sound/lame-3.100
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-vorbis/Manifest b/media-plugins/kodi-audioencoder-vorbis/Manifest
index a63aff275679..c0b206e83331 100644
--- a/media-plugins/kodi-audioencoder-vorbis/Manifest
+++ b/media-plugins/kodi-audioencoder-vorbis/Manifest
@@ -1,8 +1,4 @@
-DIST kodi-audioencoder-vorbis-2.0.1.tar.gz 15878 BLAKE2B 66bed287d8af393d914678a3e8da13e73d969fe8dabdaa3ed3c579851f40456d12f32f7edf416eb2a9b8734a2868ed8c0d4eb0a22b70fbb74167f3de1cdca2e5 SHA512 ed560a014d135dc9bc57f0185afd3fc4636158309eb4029b0fa1392ef2109c7795902eb37ce051d99199e5834d530c67b63362fdfb9db500a27e10c39d49e1d9
-DIST kodi-audioencoder-vorbis-2.0.2.tar.gz 15881 BLAKE2B 78181ec315abbbc7a3594f11c5730d8e9913f4529ba449c230e18d8d0bdffcb26e756dd6af6ea390a575a5c47e7f34483cd93dbfc0f13e50e1b0fab0eb7b843d SHA512 9f6262cbd39735b6492e9d5a4f2fb0e0277d32428fab2aca463d104e7f49e68ce922c4ee633a830eb855aa42a7cff6392a98637bcc09e5dc19ee57807af02dd2
-DIST kodi-audioencoder-vorbis-2.0.3.tar.gz 15181 BLAKE2B 1ac7fc05d91680cd7de460d6af31ce9c4cd57574636a97e45040286f06dd08e9b2c7a87a967b971e43034dcd6bd9098fc328eaa87e41d3c1fe6ad2b4de48f76a SHA512 9c68cb84ce2cc207b81b98306615425f85054f9e8ad731512a9844521145e1cdda936ede4a6302e0d0a76094aeacb4d60732b375ae1c85705d5528804d42eecc
-EBUILD kodi-audioencoder-vorbis-2.0.1.ebuild 676 BLAKE2B a88b02c3d1675debe95a216a9f798fdd9d5a30963807d89869590fedaf4ef2fa6d2e69b52c540519a9bb18abdd4bf783d3b0afd0f185a74ee90fb02f6126664c SHA512 1d4172c6815c00d4ae4cb27a3f0616b39911defe8f0bc3ca2bfbbc14e28e6aad8d807759f220ae77424d80585cec21451a8229758eed08ecec710ffc1d2f345c
-EBUILD kodi-audioencoder-vorbis-2.0.2.ebuild 801 BLAKE2B bc2db3d68cb7259d7b0e680fd556e0fb76b693b87514fe7b3f916840998b4cc733d9fa597f8e2f2adc377f62ba38bac0c22ca3c0f6c5d50bba48ba10b0f86379 SHA512 1608c55ec61d7c917e45dfc52da9a3ccd536554edb0b7eb552ee7319716e7deb020437e616476a716c097de03ed3fabc783029302a62aa956f3b993b39deef7c
-EBUILD kodi-audioencoder-vorbis-2.0.3.ebuild 804 BLAKE2B 62a0407faf3178fd5aaae91d7258072024b13fbaecf94688a84b33c2116973e8f48bd375226ac77c94531e686944aebb005db1e91bdc504a2b880ed20124b406 SHA512 65f7c65fe5a291fee0977316c05e37675feb0594d9b2dbd2323df4921f3af2521b38ee75ffcd504aa3d59e1c1533d8d7bcf796a3bfdcd7968ed4c0b177e74b77
+DIST kodi-audioencoder-vorbis-2.0.4.tar.gz 16343 BLAKE2B 788d1a64dff47594841e129e734b8bb1f2589b18557ea78477607a265efcc34c723f8e632698bd78b46cc392489a9ef278c21da805f0545b3ebc37811cbb691e SHA512 df618e078d1b0aa3f9b6cbca87288908058f4de13e52056d66239e9606c67a31a84734d8d650520920b8a9e0dfbd1c031aa81e2d1ece1316c11fbd59a6a8d8a2
+EBUILD kodi-audioencoder-vorbis-2.0.4.ebuild 804 BLAKE2B 22723cc0c8d89bfba49810bd5d7ffb5d6c681966bb7548e24c0c8d18f0873a4dcaab132b04960925e7c658b6d3886706dbe6d739bf15464ae4e8021112e5173d SHA512 82607860046b88e28b7f4233a13d1b36c841199583e86cf53c423ba6f79bfbfde5ef78fc29bbacb24f4782814e6cabe8906450249af759b3fd6e71460e97b832
 EBUILD kodi-audioencoder-vorbis-9999.ebuild 806 BLAKE2B 0a68b3f0ad056f2a639e0d20d17b3c0cc10d24ec0a51bd8a02fc9b7fcb22ce9f04c79d001655aeace2fa78832e3ee3bd711718763b0ac9993682a4e27c73d930 SHA512 7e03f237301eca68a65e0f074b16eaec10470c25992895811866278bb2288b53476ad0b1eadba56124fb45eb3fc3e7af2c7055d4ed7ca3978a13408385a2eeb5
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild
deleted file mode 100644
index 639f30b3562b..000000000000
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Vorbis encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	media-libs/libogg
-	media-libs/libvorbis
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild
deleted file mode 100644
index 23e049537e7e..000000000000
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="Vorbis encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/v${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	media-libs/libogg
-	media-libs/libvorbis
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake-utils_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
deleted file mode 100644
index 8f789873e0d6..000000000000
--- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Vorbis encoder addon for Kodi"
-HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	CODENAME="Leia"
-	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	>=media-libs/libogg-1.3.4
-	>=media-libs/libvorbis-1.3.6
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
new file mode 100644
index 000000000000..2e01ace229d1
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="Vorbis encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.vorbis.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/audioencoder.vorbis/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.vorbis-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	>=media-libs/libogg-1.3.4
+	>=media-libs/libvorbis-1.3.6
+	"
+
+RDEPEND="
+	${DEPEND}
+	"
+
+src_prepare(){
+	[ -d depends ] && rm -rf depends || die
+	cmake_src_prepare
+}
diff --git a/media-plugins/kodi-audioencoder-wav/Manifest b/media-plugins/kodi-audioencoder-wav/Manifest
index 00e1f0b15d5a..df8fdacbff77 100644
--- a/media-plugins/kodi-audioencoder-wav/Manifest
+++ b/media-plugins/kodi-audioencoder-wav/Manifest
@@ -1,6 +1,8 @@
 DIST kodi-audioencoder-wav-2.0.1.tar.gz 9850 BLAKE2B 08275b37e033eea178054c2f8e6eab1b1af3073d7c88f8406de54bcc8a57791f55126b8d595d543520e214fc41dec7e2c8d45e64263071a98b01e7ea72ef8d01 SHA512 27746034397fe87bcfb81a429350e234be5fe793ef37f1c4f58ab87c91ef11fec8c808874183e59b325228289d519f948dddd5c9587911f3ffca36ca53641f8d
 DIST kodi-audioencoder-wav-2.0.2.tar.gz 9856 BLAKE2B 105e475e996e74a70712bdcef27cbc261beeb695fe3b0dddcc0d24d7e58a1fb0543cd7e954522e27e91a8bdd2c532190865847aab917d2775742f35c5c1527e4 SHA512 8e4de58bf6b7cc79c4bb24ed9f0906632f34a20c0a17010b4a5e32934d03414840b6a9d0db5b88975b5da2dd675cd743acb64288e2a3e338090f52df9fb228c9
+DIST kodi-audioencoder-wav-2.0.3.tar.gz 10447 BLAKE2B 8ddb4ce4777f35d75e428a4565dba5a949f85a262dec300a23f7b1425eeea416d7cd601fb5b3910df263edc420ea50111393d8d00d3d5834190040f9d5f4edd3 SHA512 f6b444483808b9e75426cd8b3252c4b3ed57811d9f1433d851d3cd6b3168f376bdfa2311aa3797642450b955ff8d231e40c7c49ad03a5f2b1b3e0679ec3a8617
 EBUILD kodi-audioencoder-wav-2.0.1.ebuild 619 BLAKE2B 85236318958ef404e09e37f37880a9ae4f1fc875e197dd10b4ac9651eca03975b6015d774d006f4eba8bb7b057c924ea9381c8788bd45d507ca8f705a563c440 SHA512 457ee9c98394779b65e4697d84773313778ef65881ab508352312027af420821a3cdef2d2172bf1143b8a5ecf618736fb6b7e6c85bded6be884d11c6eef0a3e2
 EBUILD kodi-audioencoder-wav-2.0.2.ebuild 653 BLAKE2B d759a331f9e5c4a35c776acdb064548c655e01d0a0bdcc40f53402af3cb4ea2b19bda3a86c4dace4fab0ed1e9720aa1394a433d8455acef021c3b4a69feca717 SHA512 7f20d935cb21fe5a7a77d35702054a68fbba1c02b0f75c04e0f051e52c42309200cae0314eb5ca136b11ca1ad933bb43b58dd47bb54e0d29be7e5603f2bcc983
+EBUILD kodi-audioencoder-wav-2.0.3.ebuild 653 BLAKE2B d9f74a7e7a7238ba8f99fc114c0594afbb81bd6b27570c5d81b6c657a7973b69425f4c82611be8212934b522e19f7b4040d2e148be1a6d6a3b08d2c94d67ed18 SHA512 03a1c495f46df359a2fb25e0ac33d6327fd5032e892de143f201a998c493ef3d89403d4177c6d66b0da8a9a4ff997961ebc7b7423d3615e00fc25fbdc3c267aa
 EBUILD kodi-audioencoder-wav-9999.ebuild 654 BLAKE2B 399949e9a46918912ff01988300311fa9c855229f8d60341687b1a01eabc34f179d56e1e629d45f1ed973b1dc7059d6474685bdedf717ea241cd06b5799949be SHA512 6279e486ed0852ce4619feb37c2081fa771353b09875e31d74f0d3ddbb5c06413d6d3980d5adb8eae7cfc72034bc953092e43edb3136fc6e542e64d824200fea
 MISC metadata.xml 436 BLAKE2B 3c9c2bb8e781568176bb6635269e8c7fb2761f0f64a192e04fc53f325a79e99b474220c5787d5c2f28dc3e3cbcb3e4aea177d561aa63c6d866f261382126a01d SHA512 e92cafa5a635c7e1ee82d7da9eb48138f7f5267d7b91983f9da417ed25435d87cf5dcc47192df499a8acaaefc0c38713a869a4ec6351dda4dddcdfd5a7d15cce
diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.3.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.3.ebuild
new file mode 100644
index 000000000000..f25d2c02aa48
--- /dev/null
+++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake kodi-addon
+
+DESCRIPTION="WAV encoder addon for Kodi"
+HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
+SRC_URI=""
+
+case ${PV} in
+9999)
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/xbmc/audioencoder.wav.git"
+	inherit git-r3
+	;;
+*)
+	KEYWORDS="~amd64 ~x86"
+	CODENAME="Leia"
+	SRC_URI="https://github.com/xbmc/audioencoder.wav/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/audioencoder.wav-${PV}-${CODENAME}"
+	;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	=media-tv/kodi-18*
+	"
+RDEPEND="
+	${DEPEND}
+	"
diff --git a/media-plugins/kodi-inputstream-rtmp/Manifest b/media-plugins/kodi-inputstream-rtmp/Manifest
index 2d7811659742..379c4ef67fd1 100644
--- a/media-plugins/kodi-inputstream-rtmp/Manifest
+++ b/media-plugins/kodi-inputstream-rtmp/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-inputstream-rtmp-2.0.7.tar.gz 18511 BLAKE2B d7e67883ac0ea59005238d28e8b16e6d53df3b8283b225b2c0523fa7eaf5fbdae44482209c510a2983c0edfa483e195311ce3f1298add1372ce13450832ebbcd SHA512 a67be952bae24083403e5a8783c86af51b24d9f2759fdeb1e4bdc42912c55381189c5925b52743ce79dd03a3e510c65d4972728e2355082b91d73857b1657cd9
-DIST kodi-inputstream-rtmp-2.0.8.tar.gz 68254 BLAKE2B f094cd81f6bbf1854578d12b9b98668ae921ebd89ed6289da5a7d48c3d60b2a40e9ba293422c5c08c969f768d85e0d59ce900c45b57a965f59d6d5bef4abbf64 SHA512 fca7de7cf5ad65081bd25ea1a6cb5c1cdf41f72ba4460256918178060b62e04d389c293add1a10faf899750745ba77244cfb7af97ba613b2abcf6862839c751b
-EBUILD kodi-inputstream-rtmp-2.0.7.ebuild 756 BLAKE2B 728c4a76e037fe5214af42c602a03cb7fb40d3f5617ed02a1f61bea9b96a7557aa081c462df6ce662bfdfcc0684cf7834c87db3262cc709f6f604e7bb8218186 SHA512 bab4fa9793bb52d514d67d57454204a304973bcb983075a837e4df3e7472588ea9c76644e9b30d8a3b6e357edfb6bb6d5d785f49fdf9cb2b7de016df4c2defbb
-EBUILD kodi-inputstream-rtmp-2.0.8.ebuild 756 BLAKE2B 728c4a76e037fe5214af42c602a03cb7fb40d3f5617ed02a1f61bea9b96a7557aa081c462df6ce662bfdfcc0684cf7834c87db3262cc709f6f604e7bb8218186 SHA512 bab4fa9793bb52d514d67d57454204a304973bcb983075a837e4df3e7472588ea9c76644e9b30d8a3b6e357edfb6bb6d5d785f49fdf9cb2b7de016df4c2defbb
+DIST kodi-inputstream-rtmp-2.0.9.tar.gz 66408 BLAKE2B 466419ef7182c53ddbe358ffb9480f756b8ab7f1f8fe790bb7942ac1cbd14731e4ef2faa0c15d31652733fe49881cf7588a6e560e6f132b61da47d7a8e0e0367 SHA512 b38b45f6313bcf2827eabf80875840b8b24cf010e0f44c20241f8a20f438273020ebd34078562581c34c83f3c9109ec953ef1de819c85de2260f0377903fbd23
+EBUILD kodi-inputstream-rtmp-2.0.9.ebuild 756 BLAKE2B 728c4a76e037fe5214af42c602a03cb7fb40d3f5617ed02a1f61bea9b96a7557aa081c462df6ce662bfdfcc0684cf7834c87db3262cc709f6f604e7bb8218186 SHA512 bab4fa9793bb52d514d67d57454204a304973bcb983075a837e4df3e7472588ea9c76644e9b30d8a3b6e357edfb6bb6d5d785f49fdf9cb2b7de016df4c2defbb
 EBUILD kodi-inputstream-rtmp-9999.ebuild 779 BLAKE2B 505a4dd71987cb90c54a5499518594fcb039ec94c2b23fc2c9a37331880c20d8fd8c2670fc580850ac3890328d03a48076b57be68c6d4e6d9f1287fc8784aa4f SHA512 bc655d435a8f126dfd9791ebc9153264f1500716fd4e2caf9da77f94686bb53eea595763a5e61cee440efc5072fedbcc691d9c054a17839f3bf9b562059ca5cc
 MISC metadata.xml 433 BLAKE2B 5b159068b2431fb4b669662f4e36d8768afbda1e076e866678c193590945ff0ba4d6c03228475dda7bb7ca5d204d09e0e5d5804baacbfa653563f199045a1c80 SHA512 0cb47e468304977fd3624c4ec07d254271406897eb4601eac57a68167463a8379e3d8cf4d4e0e4988ae78d832ae39da9a457ba30a7c0fbbe8a32fab4e5e94f53
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.8.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.8.ebuild
deleted file mode 100644
index c7798ff8774b..000000000000
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's RTMP inputstream addon"
-HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/xbmc/inputstream.rtmp.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Leia"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/xbmc/inputstream.rtmp/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/inputstream.rtmp-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-18*
-	media-video/rtmpdump
-	"
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare(){
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.7.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9.ebuild
index c7798ff8774b..c7798ff8774b 100644
--- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.7.ebuild
+++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.9.ebuild
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index e3dde2ec7516..75dfebb6b99b 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,3 +1,3 @@
 DIST mythplugins-30.0.tar.gz 101169041 BLAKE2B 0125c6234c168b9b24110b817e9e9a632187743c9ca44a46a8d464be6c330067f31da6fb252ed2a5fd770756229f2d95a746bd5d0e03be1e97fecc0de86603be SHA512 a29125ca33b1b100f51feb7a2ccff16d62928e474a393f11fc4b4fb77d0a85d9d4dd138acf757b527c0f936f3ff2e7d3eddcacef183d642429e36bc3e44ecbf4
-EBUILD mythplugins-30.0.ebuild 4301 BLAKE2B 506e07b595bf362a6d95c33cf25b09bd092ed4ca06659a0a3e9611d3394733b5a07ec9ec5b20d91d2c85d6008e5dfcc11b9cb99b24935e3401cddf612d7e71cc SHA512 14158b804cc41fccfdf6ebcc583ac4101963319a4b5494cebdaef496229466409eab44ca29e02829690719f658ddb27c862d4aff988a86801f402c28d2a905f6
+EBUILD mythplugins-30.0-r1.ebuild 4398 BLAKE2B a0e26f8966db74833a2bb01ef99ca86f69b2a3fe1073ee0f409780e9b61621bee062c5b3c9a312fc746b2e8a40c924924ad236ea04ec8442e022cbe10ebe0f54 SHA512 1d79d6500f2859fc85f118907de1d7ff49de335d169fad36fe3c81751f6fb319124305789d4bf9f1329802bcdb252f3541826eae00312293803fc40e83656d6a
 MISC metadata.xml 1648 BLAKE2B c3bf88af62ef3c7dc370c085f99e555c890ffbdac07e3a9106ed1c277d4c6943a1be2702b3cb8d376665073d69e42d0e629186825fd09ccb03d5d5378ff2ce31 SHA512 43e6c090619bd621b07683e56aa2c90cb163072aa3c5093f6ec5eda147dd1b67ca01488934bb49f851b8fd667b3f47f2e106b98f7f53d97b600fa5ce77d5c7b0
diff --git a/media-plugins/mythplugins/mythplugins-30.0-r1.ebuild b/media-plugins/mythplugins/mythplugins-30.0-r1.ebuild
new file mode 100644
index 000000000000..c8dc9edb4fb1
--- /dev/null
+++ b/media-plugins/mythplugins/mythplugins-30.0-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
+MY_P=${P%_p*}
+
+inherit python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Official WMythTV plugins"
+HOMEPAGE="https://www.mythtv.org"
+# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
+SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+MYTHPLUGINS="mytharchive +mythbrowser +mythgallery mythgame \
+mythmusic +mythnetvision +mythnews +mythweather mythzmserver mythzoneminder"
+IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/glib:2
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-apps/util-linux
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	hls? (
+		media-libs/faac
+		media-libs/libvpx:=
+		>=media-libs/x264-0.0.20111220:=
+		>=media-sound/lame-3.93.1
+	)
+	ieee1394? (
+		>=media-libs/libiec61883-1.0.0
+		>=sys-libs/libavc1394-0.5.3
+		>=sys-libs/libraw1394-1.2.0
+	)
+	libass? ( >=media-libs/libass-0.9.11:= )
+	=media-tv/mythtv-${PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid]
+	mytharchive? (
+		app-cdr/dvd+rw-tools
+		$(python_gen_cond_dep '
+			dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		')
+		media-video/dvdauthor
+		media-video/mjpegtools[png]
+		media-video/transcode
+		virtual/cdrtools
+	)
+	mythbrowser? ( dev-qt/qtwebkit:5 )
+	mythgallery? (
+		media-libs/tiff:0
+		opengl? ( virtual/opengl:= )
+		exif? ( >media-libs/libexif-0.6.9:= )
+		raw? ( media-gfx/dcraw )
+	)
+	mythgame? ( sys-libs/zlib[minizip] )
+	mythmusic? (
+		>=media-libs/flac-1.1.2
+		media-libs/libogg
+		>=media-libs/libvorbis-1.0
+		>=media-libs/taglib-1.6
+		>=media-sound/lame-3.93.1
+		fftw? ( sci-libs/fftw:3.0= )
+		opengl? ( virtual/opengl )
+		cdda? (
+			dev-libs/libcdio:=
+			cdr? ( virtual/cdrtools )
+		)
+	)
+	mythnetvision? (
+		$(python_gen_cond_dep '
+			dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]
+			dev-python/oauth[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	mythweather? (
+		dev-perl/Date-Manip
+		dev-perl/XML-Simple
+		dev-perl/XML-XPath
+		dev-perl/DateTime
+		dev-perl/Image-Size
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/SOAP-Lite
+		dev-perl/JSON
+	)
+	mythzmserver? ( dev-db/mysql-connector-c:0/18 )
+	theora? ( media-libs/libtheora )
+	xml? ( >=dev-libs/libxml2-2.6.0:= )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+"
+RDEPEND="${DEPEND}
+	!media-plugins/mytharchive
+	!media-plugins/mythbrowser
+	!media-plugins/mythgallery
+	!media-plugins/mythgame
+	!media-plugins/mythmovies
+	!media-plugins/mythmusic
+	!media-plugins/mythnetvision
+	!media-plugins/mythnews
+	!media-plugins/mythweather
+	!media-plugins/mythzmserver
+	!media-plugins/mythzoneminder
+"
+REQUIRED_USE="
+	mythmusic? ( vorbis )
+	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
+	mythnews? ( mythbrowser )
+"
+
+# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
+S="${WORKDIR}/mythtv-${PV}/mythplugins"
+
+DOC_CONTENTS="
+Common plugins are installed by default. Disable unneeded plugins individually with USE flags:
+-mythbrowser -mythgallery -mythmusic -mythnetvision -mythnews -mythweather
+Additional plugins may be installed with USE flags mytharchive mythgame mythzmserver mythzoneminder
+"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		--python=${EPYTHON} \
+		--extra-ldflags="${LDFLAGS}" \
+		$(use_enable cdda cdio) \
+		$(use_enable exif) \
+		$(use_enable exif new-exif) \
+		$(use_enable fftw) \
+		$(use_enable opengl) \
+		$(use_enable raw dcraw) \
+		$(use_enable mytharchive) \
+		$(use_enable mythbrowser) \
+		$(use_enable mythgallery) \
+		$(use_enable mythgame) \
+		$(use_enable mythmusic) \
+		$(use_enable mythnetvision) \
+		$(use_enable mythnews) \
+		$(use_enable mythweather) \
+		$(use_enable mythzmserver) \
+		$(use_enable mythzoneminder)
+}
+
+src_install() {
+	emake STRIP="true" INSTALL_ROOT="${D}" install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-plugins/mythplugins/mythplugins-30.0.ebuild b/media-plugins/mythplugins/mythplugins-30.0.ebuild
deleted file mode 100644
index b574a2449e66..000000000000
--- a/media-plugins/mythplugins/mythplugins-30.0.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
-MY_P=${P%_p*}
-
-inherit python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="Official WMythTV plugins"
-HOMEPAGE="https://www.mythtv.org"
-# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
-SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-MYTHPLUGINS="mytharchive +mythbrowser +mythgallery mythgame \
-mythmusic +mythnetvision +mythnews +mythweather mythzmserver mythzoneminder"
-IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtsql:5
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-apps/util-linux
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXv
-	x11-libs/libXxf86vm
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	hls? (
-		media-libs/faac
-		media-libs/libvpx:=
-		>=media-libs/x264-0.0.20111220:=
-		>=media-sound/lame-3.93.1
-	)
-	ieee1394? (
-		>=media-libs/libiec61883-1.0.0
-		>=sys-libs/libavc1394-0.5.3
-		>=sys-libs/libraw1394-1.2.0
-	)
-	libass? ( >=media-libs/libass-0.9.11:= )
-	=media-tv/mythtv-${PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid]
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		dev-python/pillow[${PYTHON_USEDEP}]
-		media-video/dvdauthor
-		media-video/mjpegtools[png]
-		media-video/transcode
-		virtual/cdrtools
-	)
-	mythbrowser? ( dev-qt/qtwebkit:5 )
-	mythgallery? (
-		media-libs/tiff:0
-		opengl? ( virtual/opengl:= )
-		exif? ( >media-libs/libexif-0.6.9:= )
-		raw? ( media-gfx/dcraw )
-	)
-	mythgame? ( sys-libs/zlib[minizip] )
-	mythmusic? (
-		>=media-libs/flac-1.1.2
-		media-libs/libogg
-		>=media-libs/libvorbis-1.0
-		>=media-libs/taglib-1.6
-		>=media-sound/lame-3.93.1
-		fftw? ( sci-libs/fftw:3.0= )
-		opengl? ( virtual/opengl )
-		cdda? (
-			dev-libs/libcdio:=
-			cdr? ( virtual/cdrtools )
-		)
-	)
-	mythnetvision? (
-		dev-python/pycurl[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/mysql-python[${PYTHON_USEDEP}]
-		dev-python/oauth[${PYTHON_USEDEP}]
-	)
-	mythweather? (
-		dev-perl/Date-Manip
-		dev-perl/XML-Simple
-		dev-perl/XML-XPath
-		dev-perl/DateTime
-		dev-perl/Image-Size
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/SOAP-Lite
-		dev-perl/JSON
-	)
-	mythzmserver? ( dev-db/mysql-connector-c:0/18 )
-	theora? ( media-libs/libtheora )
-	xml? ( >=dev-libs/libxml2-2.6.0:= )
-	xvid? ( >=media-libs/xvid-1.1.0 )
-"
-RDEPEND="${DEPEND}
-	!media-plugins/mytharchive
-	!media-plugins/mythbrowser
-	!media-plugins/mythgallery
-	!media-plugins/mythgame
-	!media-plugins/mythmovies
-	!media-plugins/mythmusic
-	!media-plugins/mythnetvision
-	!media-plugins/mythnews
-	!media-plugins/mythweather
-	!media-plugins/mythzmserver
-	!media-plugins/mythzoneminder
-"
-REQUIRED_USE="
-	mythmusic? ( vorbis )
-	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
-	mythnews? ( mythbrowser )
-"
-
-# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
-S="${WORKDIR}/mythtv-${PV}/mythplugins"
-
-DOC_CONTENTS="
-Common plugins are installed by default. Disable unneeded plugins individually with USE flags:
--mythbrowser -mythgallery -mythmusic -mythnetvision -mythnews -mythweather
-Additional plugins may be installed with USE flags mytharchive mythgame mythzmserver mythzoneminder
-"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		--python=${EPYTHON} \
-		--extra-ldflags="${LDFLAGS}" \
-		$(use_enable cdda cdio) \
-		$(use_enable exif) \
-		$(use_enable exif new-exif) \
-		$(use_enable fftw) \
-		$(use_enable opengl) \
-		$(use_enable raw dcraw) \
-		$(use_enable mytharchive) \
-		$(use_enable mythbrowser) \
-		$(use_enable mythgallery) \
-		$(use_enable mythgame) \
-		$(use_enable mythmusic) \
-		$(use_enable mythnetvision) \
-		$(use_enable mythnews) \
-		$(use_enable mythweather) \
-		$(use_enable mythzmserver) \
-		$(use_enable mythzoneminder)
-}
-
-src_install() {
-	emake STRIP="true" INSTALL_ROOT="${D}" install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f9e87d93bed5..b934edd88828 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/ax25-apps/Manifest b/media-radio/ax25-apps/Manifest
index 981a7ab5e84b..2cd2a382a703 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -1,7 +1,8 @@
+AUX ax25-apps-0.0.8-fno-common.patch 3406 BLAKE2B 528aa74bfb7a6b51215dbc4ace9b257d9bde40dd447051c1484f9bfb82df38befe8de39cc1d91d60a9065e4227c4272606a05d3351dd1d36bf9da148a44df36a SHA512 102672cffc39a942e361ebffc3d1cd910ef7977b653e8c9d1165f5bb0ca456d196f1d63dcaee55e4ea9e257c6d37c053a451c0477a916b50745e7cec2e14aa2d
 AUX ax25-apps-0.8.4-tinfo.patch 582 BLAKE2B 6f5431add14ef4c2ac789d6a3159ec30a4d0a92336a90773968453658964a18db9a6afb2917e41e3688d121718f86d5ee5205effb23b8db4c29155b6eb949b45 SHA512 901218e0dd279f61892e0eadcdcb9e1bc46007c9735efb658f1ee1bd0bb6df9ab8704eec1087ce7550674e03fe643ea13811721c28f9cf0be445e881cb19b626
 AUX ax25ipd.rc 379 BLAKE2B dfc102809a52feffee96d0a5f67874f9241b26a9ee18ccf88a5c04f154f0681f8b9da9190bbad81588de805e10bd49ec0fb0c534f5861405ab0ca59129852a33 SHA512 ce11d6f4bd4f66d79feafec81cde34a62278c9a980299da2feedba8137df8efc607298ff03324dc02ceaacebd2fef9e3a100533b887ba44dec191b759d8e1e67
 AUX ax25mond.rc 383 BLAKE2B 65f830cea757b7c649ab31480e7beaa0e8b40017c3fd59559969942c27c6459340dfa0223de829049bdc0cedd67a2441202ecca60c341162f5eaf621c6fef01e SHA512 c8d8dc7ada7fa427da85b794969e821c5e3cde66871427d36fa5cfc3a03c30735d869444594f3f17074529465325c7b48806a67257b9b3e0ef3fa6ca258e90c2
 AUX ax25rtd.rc 379 BLAKE2B 823318cdaf456d0536d843ddf0a25e2a614ddcc6dfe69f98b7c6c8dda555ef6b2977b873c9e35aaab10974f1ea3d91d8743798f228665908859dc33ff34f3708 SHA512 95df04124449a652bf76a60822c9468bce71d02490beadef409975da3709f7cf2a43ee9088468146d985464a6992125c90980e38efd397c145799cca537ff8dc
 DIST ax25-apps-0.0.8-rc4.tar.gz 442172 BLAKE2B 59a622c0e675cadc90a7d728b899b1820153d6b9e35f3ccdbac74d191f844d1642dd2e9192d6dce0f1208cbc26b98cb1643f8d1041ec3802b833ad5cbc903f81 SHA512 c99b553c5cadb0e389c1cb35e79fea61b628c76f5ef35c35876e492afc7ab796f8781c3ab5987a096f0816389e9772274fe54e88c16fca0fd30013da3d74d38b
-EBUILD ax25-apps-0.0.8_rc4.ebuild 1077 BLAKE2B f21999568a374b36a8043176f263e75f2597db3ae46d3ec240614abaeb7ab78243ff552424c02ef64ebb5a354bd8d6e2b6f789b15002d9e5cfe16d92230218fd SHA512 d35f590065aa6c84af814215442ee15efe75ed5222f9318508bb07e30ac732e54a19ca573c05e845f806b588d398ae50362a9aabef1bf0b5821664abb3c026b9
+EBUILD ax25-apps-0.0.8_rc4.ebuild 1121 BLAKE2B a8fc996669ddb0649340c40504fe0777621b0b555e553f0284fded4f85b9cd504b036a357a22e7a103e794eb1bfb8e7afd21cde3b6f5302ff32f979ae95f98b9 SHA512 92f3f3aba2a5307884c198d92d90e2bdacf57d8866815233859519b6b23cbb924a02b2289a28882016adfae306f76bd84dac60655614471ca89a03b2daeeed23
 MISC metadata.xml 255 BLAKE2B 1be00b412c042706a649da1ef71b5e431369da25a82d18464ba48a54e0353ff297feb91071ac4d75007c756f8e65cb8c59da78efbdb725fb669644de5ba018e4 SHA512 35a18c5a178cc996bb71a27b11fb361198ae96d24ee3cbbc105a64824e1dcddd71d017270539daa3688ec2f04a8f564dd08ca491f62a3da4cca650c9bf35600d
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
index 21b6d557a2c5..f63f96a8ec95 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "$FILESDIR"/$PN-0.8.4-tinfo.patch
+	epatch "$FILESDIR"/$PN-0.0.8-fno-common.patch
 	eautoreconf
 }
 
diff --git a/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch b/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch
new file mode 100644
index 000000000000..1ea5c779ff38
--- /dev/null
+++ b/media-radio/ax25-apps/files/ax25-apps-0.0.8-fno-common.patch
@@ -0,0 +1,87 @@
+diff --git a/ax25ipd/ax25ipd.c b/ax25ipd/ax25ipd.c
+index 461147d..e85b44d 100644
+--- a/ax25ipd/ax25ipd.c
++++ b/ax25ipd/ax25ipd.c
+@@ -35,6 +35,25 @@ int opt_help = 0;
+ char opt_configfile[PATH_MAX];
+ char opt_ttydevice[PATH_MAX];
+ 
++struct stats_s stats;
++
++int udp_mode;
++int ip_mode;
++unsigned short my_udp;
++char ttydevice[PATH_MAX];
++int ttyspeed;
++signed char mycallsign[7];
++unsigned char mycallsign2[7];
++unsigned char myalias[7];
++unsigned char myalias2[7];
++char bc_text[128];
++int bc_interval;
++int bc_every;
++
++int digi;
++int loglevel;
++int dual_port;
++
+ struct option options[] = {
+ 	{"version", 0, NULL, 'v'},
+ 	{"loglevel", 1, NULL, 'l'},
+diff --git a/ax25ipd/ax25ipd.h b/ax25ipd/ax25ipd.h
+index b088247..367024b 100644
+--- a/ax25ipd/ax25ipd.h
++++ b/ax25ipd/ax25ipd.h
+@@ -72,24 +72,25 @@
+ #include	<sys/types.h>
+ #include	<netax25/daemon.h>
+ 
+-int udp_mode;                   /* true if we need a UDP socket */
+-int ip_mode;                    /* true if we need the raw IP socket */
+-unsigned short my_udp;          /* the UDP port to use (network byte order) */
+-char ttydevice[PATH_MAX];       /* the tty device for serial comms */
+-int ttyspeed;                   /* The baud rate on the tty device */
+-unsigned char mycallsign[7];    /* My callsign, shifted ASCII with SSID */
+-unsigned char mycallsign2[7];   /* My seconds port callsign, shifted ASCII with SSID */
+-unsigned char myalias[7];       /* An alias to use */
+-unsigned char myalias2[7];      /* An alias for second port */
+-char bc_text[128];              /* The text for beacon messages */
+-int bc_interval;                /* The interval, in seconds, between beacons */
+-int bc_every;                   /* true=every, false=after */
+-int digi;                       /* True if we are connected to a TNC */
+-int loglevel;                   /* Verbosity level */
++extern int udp_mode;            /* true if we need a UDP socket */
++extern int ip_mode;             /* true if we need the raw IP socket */
++extern unsigned short my_udp;   /* the UDP port to use (network byte order) */
++extern char ttydevice[PATH_MAX]; /* the tty device for serial comms */
++extern int ttyspeed;            /* The baud rate on the tty device */
++extern signed char mycallsign[7];    /* My callsign, shifted ASCII with SSID */
++extern unsigned char mycallsign2[7]; /* My seconds port callsign, shifted ASCII with SSID */
++extern unsigned char myalias[7];  /* An alias to use */
++extern unsigned char myalias2[7]; /* An alias for second port */
++extern char bc_text[128];       /* The text for beacon messages */
++extern int bc_interval;         /* The interval, in seconds, between beacons */
++extern int bc_every;            /* true=every, false=after */
++
++extern int digi;                /* True if we are connected to a TNC */
++extern int loglevel;            /* Verbosity level */
+ /* addition for dual port flag */
+-int dual_port;
++extern int dual_port;
+ 
+-struct {
++struct stats_s {
+ 	int kiss_in;            /* # packets received */
+ 	int kiss_toobig;        /* packet too large */
+ 	int kiss_badtype;       /* control byte non-zero */
+@@ -107,7 +108,9 @@ struct {
+ 	int ip_tooshort;        /* packet too short to be a valid frame */
+ 	int ip_not_for_me;      /* packet not for me (in digi mode) */
+ 	int ip_i_am_dest;       /* I am destination (in digi mode) */
+-} stats;
++};
++
++extern struct stats_s stats;
+ 
+ #define MAX_FRAME 2048
+ 
diff --git a/media-radio/ibp/Manifest b/media-radio/ibp/Manifest
index 1a9e4e2817a0..9f06dc9fcc19 100644
--- a/media-radio/ibp/Manifest
+++ b/media-radio/ibp/Manifest
@@ -1,3 +1,3 @@
 DIST ibp-0.21.tgz 33536 BLAKE2B 0fee17215d6e6fc99dba6d216f4e2b79bf0be89f6edd68fe5b0c0f4ca6fee794274a9ec0c08b73f502fd57dd0208d1d0fcf362d0a8671d94d4a6a613f578e443 SHA512 784bdcae61ce41dff7d88eb2068171dafa607012660393188326e94e323fdf5badebf3d8a24016c83c96c770b6d0935fc35aef5aca6bbfd665b7f2ccf39118ca
-EBUILD ibp-0.21-r1.ebuild 1079 BLAKE2B a7711354089e9df2dcd6e0234c4e684d404180fd1ecfc389ded5d2dcf6782ba80f86178dbb591d65458153912d81c5f4997b417e597a4482d008263c84a4c10f SHA512 c31678c38bda533e02c743dfc1b140c4385ce44ee556ec263bd17dc61c7557cc4c26b94619ebc1960def95d1c954e7892f717e278d6f3093cef0c247a7fd6a2c
+EBUILD ibp-0.21-r1.ebuild 1077 BLAKE2B bd5fa345bfe4a4b5a382111c0ac0fe1e4e34316b4632d75d722799bee72412f736c87fcd2d80ae7954725abb1657caacc2e4d122797ffc0d35b50eb738153c51 SHA512 e3522cd32271047da75eab9b3f683566883c54c5ec8c295ea51979c681057e7208d8830d817deaae12c49e9aea76a515b4c87deca66f297639e2594e57e79a74
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/ibp/ibp-0.21-r1.ebuild b/media-radio/ibp/ibp-0.21-r1.ebuild
index b261a501e781..6af13746f582 100644
--- a/media-radio/ibp/ibp-0.21-r1.ebuild
+++ b/media-radio/ibp/ibp-0.21-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 DESCRIPTION="Shows currently transmitting beacons of the International Beacon Project (IBP)"
-HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}.html"
+HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ibp.html"
 SRC_URI="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/media-radio/js8call/Manifest b/media-radio/js8call/Manifest
index e18da9e39eca..b8440e77dcca 100644
--- a/media-radio/js8call/Manifest
+++ b/media-radio/js8call/Manifest
@@ -1,10 +1,13 @@
 AUX js8call-2.1.0-hamlib-type.patch 752 BLAKE2B b58e648597d467ff559d6ea77abef4fa31b3cc3bf14b72a2e66ba6cb839377c59ced2fad97c104cbd8b90acf09e477584baae6238d90524442d10409fb4a0e09 SHA512 ac65d9f6755d2fa2e5ca3593bf73c2d44716e6bbea29906d59e2a023bbe9821ad98a48e6f8d56eafdb5648884b0d1f9f23c05900e0ec67b5785cf65dcc98e899
+AUX js8call-2.1.1-hamlib-type.patch 377 BLAKE2B 32d0de06d20ec6172a8a2b703f55bbcb46d584ba2fec7de21ae37e8c123f6d27867ff5f6406985dde84186b14f9e048377a43d35562fb7c239b1f1b4d7283891 SHA512 2db6db5042c17cb01a0fb84b93c2b0b4af6912c61c4b2fac02f3097d4325aa4e4d897ef615a37c1348b9a46168c1aa3b1decd07ebecda265314f12afe5570d53
 DIST js8call-1.0.0.tar.bz2 15923224 BLAKE2B 646fd869e6029d57dfd1d9762ede2407e18a18170088df65d1b16a581709065cf45edb23533b9c89193b01a85ec326638efc99202489db54455298a5033696de SHA512 64f24821c9ffd86123ede2baac46bcefd33b5dc5e0496cd44e594e79706ec2f3fdde5ce13c379addbf2bded3e392a1f0fc0f2df0298ce57a22e434a6ab6a1e7a
 DIST js8call-1.1.0.tar.bz2 15993553 BLAKE2B 3538f746b175d0623169d2a13b5c26b334561f604fa25c8dddc15ee2a41319df8bb4c0a905be6340d4d18d87bffd8bd4e9a4eb9ceec3310f33aa22005c0e1c19 SHA512 992408408888a59174811c30fcc07065bcb5e459c355955a59e638ca27da27c2c25df8fa7579ce1c322a76f12780c58821df9fc781cde2cb2b2851312d188787
 DIST js8call-2.0.0.tar.bz2 14434190 BLAKE2B 2d016c93175fe41cd4c24b57fc0a6c65ff5d5630aff68aac4e3e941570f315abe9f083f1686cb95e49d90ea41ac82752fcdd37041727e95820d34bcd0e82e2b1 SHA512 58566d4e6009339ef9a1459bdf2902748200b7a002c8be22067ec97eae16cc42465001e7084ebc00b1e406ae47fe45092226e1c6568253a1bbf95c65f040ab75
 DIST js8call-2.1.0.tar.bz2 14432328 BLAKE2B 3f48be58905cf05af8230b715956ecfec71fd792fafb029cba84c799e51bb1189e158c16ef05bd8959572778aad556a11b0896647a47cc1e6b10ddd48bd033cd SHA512 0edfbc8cbbe3df551d7dc97c7362100d2714e2d37934a053233ca8107247f7fdc67a36b59b1fe701154c9348f27171ddab9c21ffc763072d390431f9dd5382a0
+DIST js8call-2.1.1.tar.bz2 14467115 BLAKE2B 8ebac342a1fc0bd22d6d53d9d6548ba4ec8f49088aa4901fb542f1d82ecdb9c2a23024aa8638191a3e862ab689c004cdde1562a834029bf53c535510300ed82a SHA512 deee4fe56f457b2bd533e9a44a812d8abcd5733079722504d4f06bee5c824a0a1b8c21ae805793fe419fde85f9e2e4aed10c33192f71378cf40afd68648a20a1
 EBUILD js8call-1.0.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
 EBUILD js8call-1.1.0.ebuild 877 BLAKE2B c59f72323ba1e9a17890400ae0bf6134b6907a857c6bb89740bfbcac155e85458e808d34e352bffd9997a7e22aa256cafcc0ada12787e4f0b13b42ab9f30ebcc SHA512 a7941d4f677e003af0b7c7c3bfd63134f7fc5fa4bbb0b059ada6997918d9d1c5133391385e8e59fdc49d15d2c9cdc1bbdc13f4d63c6a8e1585b2c4cac289841a
 EBUILD js8call-2.0.0-r1.ebuild 881 BLAKE2B f2b37d220b6b7bac193df394ebc92c3c03c9b9dfa5cd0f51308a41362fa402577a7ca6d8c71c19717972f38eecac32292e39783cae824885e361a17c4ad470e8 SHA512 4836807736c2433d3e48ba50aa1adc07a6a6f6c3a43a947bc2fa0111aabde0366e4b3752066787676c2b47c3cb036bf191adc67d3683b8bf16381fca7d3c4c04
 EBUILD js8call-2.1.0.ebuild 936 BLAKE2B 23704d418b26b9f5cc02e5520a01ca67efbc5c5085067676544ed6beb18a87ccfc43b118769773d2035321ff90bfca4d432af3b98c2a4115ff5a6a00bdf734c7 SHA512 bc67a252baec3e06e00bbde9d388a4bae820012a9165d78dba56a0b82ff9db575c412d68722af07f33a20fb268811b86d6e1c3e62ee2de3173861eb40e72a289
+EBUILD js8call-2.1.1.ebuild 936 BLAKE2B 8f7fadf4e5abb1f951cf69de1e6445aaff92c0a592c0f00df3f09c7a22443f5092fc321b0593162f3686ea76dc9d6e54f8f35cd04f834cf9b625353f25ccf5da SHA512 3f0b7dc70b2ed0af0abd4e80e0cf4c1d0496a4b84f7497fd7767e8a3cbbaa0ef5e772aa841096f323ea389a97a643cc1e0354b3601f04ec27e12acf8a2319cdd
 MISC metadata.xml 312 BLAKE2B 77446444162f6d430b7cd8c95ea0ff34da775e0a78d355b1e71a5a5e3c64c6f633b0339cdcd2055d3ea1fd5befa5d6655d02d2cb0fd55fd60a408efb33c6cf0a SHA512 caf176b301b2a0385c9c24d8ee1b68077d9cf49b5379f6530c27658450efa8fef6551a4d1492529bdde38e95bb4f5df5f9825c38865874514803e12ad37bc461
diff --git a/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch b/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch
new file mode 100644
index 000000000000..6714949468ad
--- /dev/null
+++ b/media-radio/js8call/files/js8call-2.1.1-hamlib-type.patch
@@ -0,0 +1,14 @@
+--- a/HamlibTransceiver.hpp	2020-02-08 19:14:50.584626858 -0500
++++ b/HamlibTransceiver.hpp	2020-02-08 19:15:09.857524125 -0500
+@@ -14,11 +14,7 @@
+ {
+   typedef struct rig RIG;
+   struct rig_caps;
+-#ifdef JS8_USE_LEGACY_HAMLIB
+   typedef int vfo_t;
+-#else
+-  typedef unsigned int vfo_t;
+-#endif
+ }
+ 
+ // hamlib transceiver and PTT mostly delegated directly to hamlib Rig class
diff --git a/media-radio/js8call/js8call-2.1.1.ebuild b/media-radio/js8call/js8call-2.1.1.ebuild
new file mode 100644
index 000000000000..f461bf8f6b3e
--- /dev/null
+++ b/media-radio/js8call/js8call-2.1.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils vcs-snapshot
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="https://groups.io/g/js8call"
+SRC_URI="https://bitbucket.org/widefido/js8call/get/v${PV}-ga.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	<media-libs/hamlib-3.4
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-hamlib-type.patch" )
+
+src_install() {
+	cmake-utils_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-local || die
+	rm "${D}"/usr/share/doc/JS8Call -R || die
+}
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 6123381ab029..6e74f5366294 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,11 +1,6 @@
 AUX xastir-2.0.0-dont-filter-flags.diff 621 BLAKE2B 7bb56ddfd744123b705e7f00866fa5ac76a3ee0cd5379ee8cb41b7f1eac94ab9e704802b64eb22fe182d594c4d62ece3215122c22f5cd30b3f00c4c60dde875e SHA512 da94db0dcbd79c7b258f3657d0e6135fb93de81f3a2c25a73d68051b1a92156392a638f6a5478f4a0b8b568c4780a4091d7345e4c8cc60ecc190633123da0a6b
-AUX xastir-2.0.4-fortify.diff 4404 BLAKE2B 46f9d2adfd70575301e7d5f9874520baf60e006f315bd6c97ba1683a97a852067ad5b460a4ea68b3854d70882a1a24f7d7873af7f2e350b010853b124af00944 SHA512 f8ba2e3820e599a41dfcb4e60570b320c54625833e3bf0ab649655b1925e1d21d8de776d705bffd3cf85b2ebf43868de17923cf94fa3e4abd787c5d3ec09b920
-AUX xastir-2.0.8-fix-graphicsmagick.diff 1201 BLAKE2B 60c16089c786178b91eb6731b1b95d676fe3a1620d8e55709ccf657a8f3b155d62cebfd141ae41eaac03d8ff26230d6e4f59a0e5bc795db7eb00ea64cf276d1e SHA512 d3ec865bdb2645ef54e555e33659761588f79aafb96261c65112d94a6d17ce3825555dc33cee6b3af1ef45f9c9e588cf8c6f3f67f5587c3a2651886c6869ec11
-AUX xastir-2.0.8-no-builtin-shapelib.diff 2588 BLAKE2B 7de77fa6a75819579084f69ac0aabf4b0d87c7524bedd9b989ecf861949c6c21ce759f40502295f9da41ef1d570087356a9f62ec8545cf2836b98dfea35d0552 SHA512 da7374fd129956887efcf9b21047e75a34d32b391cc5a65416481971dc94722f1c538997ac85c5b47a8b6fb69f85611f04f73859736fe747f41f1edeac53aae6
-AUX xastir-2.0.8-scripts.diff 3398 BLAKE2B 0095733a8c590a76bfbed1596fe6a4bd2faca2070989e703fff6b40ec2e5ee3ad628203de12d321b3e4afd27c6626af5d80453212b9a5b8ba8e2d70178a082a1 SHA512 3e7bf50a1aa0abc67f6c83aa13aceb4478965ad21dea48351ab8d45f72a37e165efda07e822642f1bd1095355823f73a02207f84934ca1fc614a3d4784742dda
 AUX xastir-2.1.2-scripts.diff 3766 BLAKE2B fbad015655864f26dfed1b50ea6c1399fc70088ff092a2cdd1a173879db4bdbba43aea9107cc961890012682d0e265f888b908d553c50018d34ea040dc08243e SHA512 aef4410c53aa3d80c4f3ea48a50759a9a1813801d18fb6dd0cf4e90b8e49358c9f6040cca964b5ce4eefcea2966f197207b25e67dd1b69e1bbd5cf0ba640ae46
-DIST xastir-2.0.8.tar.gz 2697256 BLAKE2B 12a12219885d7923e3262494ac39b7b7f200118953b1e47ae25917f3f1732a1cff931de06462de7d5f1216c9b61561f8090fc49e18b40380eaa58b3559c5f123 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f
+AUX xastir-2.1.4-fno-common.diff 1930 BLAKE2B 97393a5a11af3797819ec68558fc273b059358b6df463b4aa28b5babc31a0fdba395fead457aa485b18bb9119ffdbb865457e7455891194bcd67fc7184126427 SHA512 e4a671f44ad0b4664be30487c45908466acf646389a890ab7448eacfa11ff22fc9a335e18dc06683b3a0b4789c8e2d85c510e456a387647e589b504e77853530
 DIST xastir-2.1.4.tar.gz 2694124 BLAKE2B 90fd8ef340fc5bad43c9501c6530dcd4bd60eaab9c04638c68f80add46f0df24c45db334549915edaee95cbdcc9b7580d6343d81d84cb819f4ef5a76c9f79242 SHA512 e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1
-EBUILD xastir-2.0.8-r1.ebuild 2257 BLAKE2B 090d1625ac5caf048c4765ebd505264624f70dde36a02d8cee9f8444dfcb9dd135e108cf99a40eb29267a7744fbd624355a642ae15a07ee77d38646440a97377 SHA512 9725bfc7e33b60189441c5da81017eb9d5f79e07d27cb55f59a7834992cd93d9d3db9326e30e64f2955b677f046b4839ac6fe348ce6e171ff1a01be2f2746518
-EBUILD xastir-2.1.4.ebuild 1955 BLAKE2B 7c03b17aeba557689ba2cfbc61a51161a18034cdb253741398cf528f429409240b30eec9f45ed6afbe5092f3142fc7087783170347a7a82bfd326bd533d6610f SHA512 cb087cfcc9251c4163e339644eb932efe1b4ff6e3bda221691ecdc4020e10969e1b52a513011c90357f33a9ac58fcc536e700cdb802829ecb2a38a49b657d9de
-MISC metadata.xml 533 BLAKE2B 78ef77d6fa8e34acb3f3a4b1d01fa72fa1dbca850938561fe22ef8c0ab8e17128f2c2174ad72e55915c42f37a9f441314cbbc80c49df7406418b57b7319fb7e6 SHA512 efdef63c89df43ea0761e6f84ec3d285a6592fc199820084767905f66945140a624c117a0bf7b0ec982e47dbe9445252115e31c92a4bc7b006055c0c030c0ff5
+EBUILD xastir-2.1.4.ebuild 2039 BLAKE2B 3dda4bc66aba2db047b0ba56b19aea2a0110491efc32d1539f9a487c8636b0d7439f664072e62f1ae48448669dacea49919230fba71931326539367f911a52cd SHA512 6fb0927483b04660af44b1a4a939569ae852a7ec010f48f89048b84e25a434a0cf616505fde70da5d9e07c2b1eef008d4e5f49f3d2d1d8cb78ffb814340fe64c
+MISC metadata.xml 469 BLAKE2B 2e70497e0928a6ca00c783a8dd257ac66333cd2d9e34e271ca222b0df4dd5ea55b124d2728398d0a8b013355d63bf30907b29b121578921d09f7aee8667f480b SHA512 9ad337ee6c62205e9f7d3350763123bc25ff2e75bd3af6ac4438cc0b164439aa406339b9c2f7a3d6eef439965c888513c5089108944a281a781f27b1fb735758
diff --git a/media-radio/xastir/files/xastir-2.0.4-fortify.diff b/media-radio/xastir/files/xastir-2.0.4-fortify.diff
deleted file mode 100644
index e2c34b007475..000000000000
--- a/media-radio/xastir/files/xastir-2.0.4-fortify.diff
+++ /dev/null
@@ -1,144 +0,0 @@
---- src/rac_data.c.orig	2012-09-23 18:19:22.000000000 +0200
-+++ src/rac_data.c	2012-11-29 21:00:53.000000000 +0100
-@@ -212,7 +212,8 @@
-     char char_offset[16];
-     char index[32];
-     int found = 0;
--    rac_record racdata;
-+    char buffer[sizeof(rac_record)];
-+    rac_record *racdata = (rac_record *)buffer;
-     /*char        filler[8];*/
-     char amacall_path[MAX_VALUE];
- 
-@@ -220,7 +221,7 @@
- 
- 
-     xastir_snprintf(index, sizeof(index)," ");
--    xastir_snprintf(racdata.callsign, sizeof(racdata.callsign)," ");
-+    xastir_snprintf(racdata->callsign, sizeof(racdata->callsign)," ");
- 
-     /* ====================================================================    */
-     /*    Search thru the index, get the RBA                */
-@@ -257,19 +258,19 @@
-         if (callsign[5] == '-')
-             (void)chomp(callsign,5);
- 
--        while (!feof(fdb) && strncmp((char *)&racdata, callsign, 6) < 0)
-+        while (!feof(fdb) && strncmp(buffer, callsign, 6) < 0)
- 
- //WE7U
- // Problem here:  We're sticking 8 bytes too many into racdata!
--            rc = fgets((char *)&racdata, sizeof(racdata), fdb);
-+            rc = fgets(buffer, sizeof(buffer), fdb);
- 
-     } else
-         fprintf(stderr,"Search:Could not open RAC data base: %s\n", get_data_base_dir("fcc/AMACALL.LST") );
- 
-     /*  || (callsign[5] == '-' && strncmp((char *)&racdata,callsign,5) < 0)) */
--    (void)chomp(racdata.callsign, 6);
-+    (void)chomp(racdata->callsign, 6);
- 
--    if (!strncmp((char *)racdata.callsign, callsign, 6)) {
-+    if (!strncmp(racdata->callsign, callsign, 6)) {
-         found = 1;
- 
- // Some of these cause problems on 64-bit processors, so commented
-@@ -293,82 +294,82 @@
-         xastir_snprintf(data->callsign,
-             sizeof(data->callsign),
-             "%s",
--            racdata.callsign);
-+            racdata->callsign);
- 
-         xastir_snprintf(data->first_name,
-             sizeof(data->first_name),
-             "%s",
--            racdata.first_name);
-+            racdata->first_name);
-  
-         xastir_snprintf(data->last_name,
-             sizeof(data->last_name),
-             "%s",
--            racdata.last_name);
-+            racdata->last_name);
-  
-         xastir_snprintf(data->address,
-             sizeof(data->address),
-             "%s",
--            racdata.address);
-+            racdata->address);
-  
-         xastir_snprintf(data->city,
-             sizeof(data->city),
-             "%s",
--            racdata.city);
-+            racdata->city);
-  
-         xastir_snprintf(data->province,
-             sizeof(data->province),
-             "%s",
--            racdata.province);
-+            racdata->province);
-  
-         xastir_snprintf(data->postal_code,
-             sizeof(data->postal_code),
-             "%s",
--            racdata.postal_code);
-+            racdata->postal_code);
-  
-         xastir_snprintf(data->qual_a,
-             sizeof(data->qual_a),
-             "%s",
--            racdata.qual_a);
-+            racdata->qual_a);
-  
-         xastir_snprintf(data->qual_b,
-             sizeof(data->qual_b),
-             "%s",
--            racdata.qual_b);
-+            racdata->qual_b);
-  
-         xastir_snprintf(data->qual_c,
-             sizeof(data->qual_c),
-             "%s",
--            racdata.qual_c);
-+            racdata->qual_c);
-  
-         xastir_snprintf(data->qual_d,
-             sizeof(data->qual_d),
-             "%s",
--            racdata.qual_d);
-+            racdata->qual_d);
-  
-         xastir_snprintf(data->club_name,
-             sizeof(data->club_name),
-             "%s",
--            racdata.club_name);
-+            racdata->club_name);
-  
-         xastir_snprintf(data->club_address,
-             sizeof(data->club_address),
-             "%s",
--            racdata.club_address);
-+            racdata->club_address);
-  
-         xastir_snprintf(data->club_city,
-             sizeof(data->club_city),
-             "%s",
--            racdata.club_city);
-+            racdata->club_city);
-  
-         xastir_snprintf(data->club_province,
-             sizeof(data->club_province),
-             "%s",
--            racdata.club_province);
-+            racdata->club_province);
-  
-         xastir_snprintf(data->club_postal_code,
-             sizeof(data->club_postal_code),
-             "%s",
--            racdata.club_postal_code);
-+            racdata->club_postal_code);
-  
-     }
-     (void)fclose(fdb);
diff --git a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff b/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
deleted file mode 100644
index 8919239fbfde..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-fix-graphicsmagick.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-# backported from xastir-2.1.4 (see bug #688444)
---- a/src/map_geo.c	2019-07-26 15:54:19.534488550 +0200
-+++ b/src/map_geo.c	2019-07-26 15:56:47.779713950 +0200
-@@ -125,20 +125,7 @@
- #undef PACKAGE_TARNAME
- #define XASTIR_PACKAGE_VERSION PACKAGE_VERSION
- #undef PACKAGE_VERSION
--#ifdef HAVE_GRAPHICSMAGICK
--/*#include <GraphicsMagick/magick/api.h>*/
--/* Define MAGICK_IMPLEMENTATION to access private interfaces
-- * such as DestroyImagePixels(). This may not be a good thing,
-- * but DestroyImagePixels() has been in this code for a long
-- * time. Defining MAGIC_IMPLEMENTATION eliminates the warning that is
-- * now (9/28/2010) being seen on some distros (Ubuntu 10.04 and
-- * OpenSuSE-11.3)
-- */
--#define MAGICK_IMPLEMENTATION
- #include <magick/api.h>
--#else   // HAVE_GRAPHICSMAGICK
--#include <magick/api.h>
--#endif  // HAVE_GRAPHICSMAGICK
- #undef PACKAGE_BUGREPORT
- #define PACKAGE_BUGREPORT XASTIR_PACKAGE_BUGREPORT
- #undef XASTIR_PACKAGE_BUGREPORT
-@@ -2030,7 +2017,6 @@
-             if (!SyncImagePixels(image))
-                 fprintf(stderr, "SyncImagePixels Failed....\n");
- 	}
--        DestroyImagePixels(image);
-     }
- 
-     // If were are drawing to a low bpp display (typically < 8bpp)
diff --git a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
deleted file mode 100644
index 8cbdbc2cdb62..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.ac.orig	2016-07-12 07:08:17.988160777 +0200
-+++ configure.ac	2016-07-12 07:11:42.591138389 +0200
-@@ -382,27 +382,17 @@
- 
- # Check for Shapelib
- use_shapelib=yes
--force_internal_shapelib=no
- shapelib_desired=yes
- LIBSHP=""
- SUBSHP=""
- # This symbol will be blank if the proj library hasn't been found, and will
- # have the three programs that need proj if it has
- CONTSHP=""
--AC_ARG_WITH(internal-shapelib,[  --with-internal-shapelib  Force use of internal shapelib library.],force_internal_shapelib=$withval)
- AC_ARG_WITH(shapelib,[  --without-shapelib        Disable shapelib features.],shapelib_desired=$withval)
- if test "${shapelib_desired}" = "no"; then
-   use_shapelib=no
--  force_internal_shapelib=no
- fi
--if test "${force_internal_shapelib}" = "yes"; then
--  AC_MSG_WARN([***************************************************************** ])  
--  AC_MSG_WARN([Internal Shapelib library has been forced.                        ])
--  AC_MSG_WARN([***************************************************************** ])
--  # Temporary setting to get into if block below
--  use_shapelib=no
--fi
--if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then
-+if test "${shapelib_desired}" = "yes" ; then
-   use_shapelib=no
-   AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes
-     LIBS="$LIBS -lshp"
-@@ -411,26 +401,6 @@
-     AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). )
-     break)])
- fi
--if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then
-- AC_MSG_WARN([**************************************************************** ])  
-- AC_MSG_WARN([Your system does not have shapelib installed.  Using an internal ])
-- AC_MSG_WARN([version.  This may lead to a larger filesize for the executable. ])
-- AC_MSG_WARN([Install shapelib on your system to eliminate this warning.       ])
-- AC_MSG_WARN([**************************************************************** ])  
-- LIBSHP="-Lshapelib -lshape"
-- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS"
-- SUBSHP="shapelib" 
-- use_shapelib=yes
-- force_internal_shapelib=yes
-- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) 
-- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). )
-- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. )
--
-- if  test  $use_proj = "yes" 
-- then
--   CONTSHP="shpcentrd$(EXEEXT) shpproj$(EXEEXT) shpdata$(EXEEXT) shpwkb$(EXEEXT)"
-- fi
--fi
- AC_SUBST(SUBSHP)
- AC_SUBST(CONTSHP)
- AC_SUBST(LIBSHP)
diff --git a/media-radio/xastir/files/xastir-2.0.8-scripts.diff b/media-radio/xastir/files/xastir-2.0.8-scripts.diff
deleted file mode 100644
index 35c73246c9ee..000000000000
--- a/media-radio/xastir/files/xastir-2.0.8-scripts.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-# patch scripts location (bug #407185). partially backported from upstream.
---- xastir-2.0.0-orig/scripts/Makefile.am.orig	2012-11-27 05:41:23.000000000 +0100
-+++ xastir-2.0.0/scripts/Makefile.am	2012-12-05 06:21:59.000000000 +0100
-@@ -43,10 +41,8 @@
-     values \
-     values.pl \
-     waypoint-get.pl \
--    xastir-fixcfg.sh \
--    xastir-migrate.sh \
-     Xastir_tigerpoly.py
- 
- install-data-hook:
- 	cd $(DESTDIR)$(scriptsdir) && \
--	chmod a+x *.sh *.pl *.py get-* gpx2* *.bash
-+	chmod a+x *.pl *.py get-* gpx2* *.bash
-diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl
---- xastir-2.0.0.orig/scripts/coord-convert.pl	2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/coord-convert.pl	2012-03-07 15:46:01.000000000 +0000
-@@ -26,7 +26,7 @@
- #
- 
- 
--use lib "${prefix}/lib";
-+use lib /usr/share/xastir/scripts;
- use Coordinate;         # WE7U's Coordinate.pm module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl
---- xastir-2.0.0.orig/scripts/permutations.pl	2010-07-03 22:09:48.000000000 +0000
-+++ xastir-2.0.0/scripts/permutations.pl	2012-03-07 15:42:34.000000000 +0000
-@@ -34,7 +34,7 @@
- #
- 
- 
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate;         # WE7U's Coordinate.pm module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl
---- xastir-2.0.0.orig/scripts/test_coord.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/test_coord.pl	2012-03-07 15:42:34.000000000 +0000
-@@ -33,7 +33,7 @@
- 
- #------------------------------------------------------------------------------------------------
- 
--use lib "/usr/local/lib";
-+use lib "/usr/share/xastir/scripts";
- use Coordinate;		# Snag WE7U's Coordinate module
- 
- 
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl
---- xastir-2.0.0.orig/scripts/toporama250k.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama250k.pl	2012-03-07 15:46:49.000000000 +0000
-@@ -28,14 +28,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- #   by becoming root using the "su" command, using "sudo", or
- #   temporarily changing ownership and/or privileges on the
- #   "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama250k.pl"
-+# - "/usr/share/xastir/scripts/toporama250k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- #   .../maps/toporama/images/
-diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl
---- xastir-2.0.0.orig/scripts/toporama50k.pl	2010-01-31 02:12:23.000000000 +0000
-+++ xastir-2.0.0/scripts/toporama50k.pl	2012-03-07 15:47:01.000000000 +0000
-@@ -27,14 +27,14 @@
- # map files for the whole of Canada!
- #
- #
--# - "cd /usr/local/share/xastir/maps"
-+# - "cd /usr/share/xastir/maps"
- #
- # - Assure you have write privileges in the directory above either
- #   by becoming root using the "su" command, using "sudo", or
- #   temporarily changing ownership and/or privileges on the
- #   "maps" directory.
- #
--# - "/usr/local/lib/xastir/toporama50k.pl"
-+# - "/usr/share/xastir/scripts/toporama50k.pl"
- #
- # - The script will create/populate this directory heirarchy:
- #   .../maps/toporama/images/
diff --git a/media-radio/xastir/files/xastir-2.1.4-fno-common.diff b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
new file mode 100644
index 000000000000..f2580b5977e6
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.1.4-fno-common.diff
@@ -0,0 +1,63 @@
+# Fixes build with -fno-common (bug #706952)
+
+diff --git a/src/objects.h b/src/objects.h
+index b1bf8b5..ef5b9b1 100644
+--- a/src/objects.h
++++ b/src/objects.h
+@@ -95,7 +95,7 @@ if (debug_level & 4) { fprintf(stderr, "Changing euid to %d and egid to %d\n", (
+ //
+ // number_of_predefined_objects holds the actual number of predefined
+ // objects available to display on the Create/Move popup menu.
+-int number_of_predefined_objects;
++extern int number_of_predefined_objects;
+ // File name of ~/.xastir/config file containing definitions for
+ // a predefined object menu.
+ extern char predefined_object_definition_filename[256];
+diff --git a/src/x_spider.c b/src/x_spider.c
+index a1fabc4..e5a0bc3 100644
+--- a/src/x_spider.c
++++ b/src/x_spider.c
+@@ -185,6 +185,7 @@ extern void split_string( char *data, char *cptr[], int max, char search_char );
+ // From database.h
+ extern char my_callsign[];
+ 
++extern char *pname;
+ 
+ typedef struct _pipe_object
+ {
+diff --git a/src/x_spider.h b/src/x_spider.h
+index d8af8e9..a168b1f 100644
+--- a/src/x_spider.h
++++ b/src/x_spider.h
+@@ -31,7 +31,7 @@
+ #define SERV_UDP_PORT       2023
+ 
+ 
+-char *pname;
++extern char *pname;
+ extern int pipe_xastir_to_tcp_server;
+ extern int pipe_tcp_server_to_xastir;
+ extern int pipe_xastir_to_udp_server;
+diff --git a/src/xa_config.c b/src/xa_config.c
+index 9a6f1f3..2ded26c 100644
+--- a/src/xa_config.c
++++ b/src/xa_config.c
+@@ -65,7 +65,7 @@
+ 
+ #define MAX_VALUE 300
+ 
+-//extern char xa_config_dir[];
++char xa_config_dir[1000];       /* cmdline option user config dir */
+ 
+ 
+ 
+diff --git a/src/xa_config.h b/src/xa_config.h
+index 9947145..530fc06 100644
+--- a/src/xa_config.h
++++ b/src/xa_config.h
+@@ -31,4 +31,4 @@ char *get_data_base_dir(char *dir);
+ void save_data(void);
+ void load_data_or_default(void);
+ 
+-char xa_config_dir[1000];       /* cmdline option user config dir */
++extern char xa_config_dir[1000];       /* cmdline option user config dir */
diff --git a/media-radio/xastir/metadata.xml b/media-radio/xastir/metadata.xml
index e44c45094ca1..f7dfda2f7084 100644
--- a/media-radio/xastir/metadata.xml
+++ b/media-radio/xastir/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 	<use>
-		<flag name="gdal">Support for some further map formats</flag>
 		<flag name="geotiff">Install geotiff support. Allows using USGS DRG topo
 			maps or other types of geotiff mapes/images</flag>
 	</use>
diff --git a/media-radio/xastir/xastir-2.0.8-r1.ebuild b/media-radio/xastir/xastir-2.0.8-r1.ebuild
deleted file mode 100644
index 4d12a2c14255..000000000000
--- a/media-radio/xastir/xastir-2.0.8-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="http://xastir.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gdal geotiff +graphicsmagick"
-
-DEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-apps/xfontsel
-	dev-libs/libpcre
-	net-misc/curl
-	sys-libs/db:4.8
-	sci-libs/shapelib
-	!graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] )
-	geotiff? ( sci-libs/proj
-		sci-libs/libgeotiff
-		media-libs/tiff:0 )
-	gdal? ( sci-libs/gdal )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix script location (bug #407185)
-	epatch "${FILESDIR}"/${P}-scripts.diff
-
-	# fix __FORTIFY_SOURCE warning (bug #337365)
-	epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff
-
-	# do not use builtin shapelib if sci-libs/shapelib is not installed
-	# instead build without shapelib support (bug #430704)
-	epatch "${FILESDIR}"/${P}-no-builtin-shapelib.diff
-
-	# do not filter duplicate flags (see bug 411095)
-	epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
-
-	# fix compile problem with newer graphicsmagic
-	epatch "${FILESDIR}"/${PN}-2.0.8-fix-graphicsmagick.diff
-
-	eautoreconf
-}
-
-src_configure() {
-	# provide include path to GraphicsMagic for configure stage
-	use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick
-	econf --with-pcre \
-		--with-shapelib \
-		--with-dbfawk \
-		--without-ax25 \
-		--without-festival \
-		--without-gpsman \
-		$(use_with !graphicsmagick imagemagick) \
-		$(use_with graphicsmagick) \
-		$(use_with geotiff libproj) \
-		$(use_with geotiff) \
-		$(use_with gdal)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -rf "${D}"/usr/share/doc/${PN}
-	dodoc AUTHORS ChangeLog FAQ README README.Contributing \
-		README.Getting-Started README.MAPS
-}
-
-pkg_postinst() {
-	elog "Kernel mode AX.25 and GPSman library not supported."
-	elog
-	elog "Remember you have to be root to add addditional scripts,"
-	elog "maps and other configuration data under /usr/share/xastir."
-}
diff --git a/media-radio/xastir/xastir-2.1.4.ebuild b/media-radio/xastir/xastir-2.1.4.ebuild
index c3f29e3674c3..d779bc0c568b 100644
--- a/media-radio/xastir/xastir-2.1.4.ebuild
+++ b/media-radio/xastir/xastir-2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,9 @@ src_prepare() {
 	# do not filter duplicate flags (see bug 411095)
 	eapply -p0 "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
 
+	# build with -fno-common (bug #706952)
+	eapply "${FILESDIR}"/${P}-fno-common.diff
+
 	eautoreconf
 }
 
diff --git a/media-radio/xdx/Manifest b/media-radio/xdx/Manifest
index 61f352c6ebbe..f8e82a446e8a 100644
--- a/media-radio/xdx/Manifest
+++ b/media-radio/xdx/Manifest
@@ -1,3 +1,4 @@
+AUX xdx-2.5.0-fno-common.patch 720 BLAKE2B 9ac513df6b9d6f4bd4ab34f97ec3bf5d7815d441b85b4ec6dcbd2b1318988b76660e9997bcd39a9585761387ea1aeb617ae98ee37bf74393848e46078487d502 SHA512 43c1a08ba59a06a8d8d6984e78a117328f4ee8910b8cef2cb66e6415a432a54131a48f8018e4fc4c2f85562bb9c3cbd79bd087fd6b57810088bb4ffb5fdb225c
 DIST xdx-2.5.0.tar.gz 342548 BLAKE2B 58f0ab6740f77460d7fc6d19fa7d43a399de4a79d5647174491043eded515dc03e2fb97de8d10e5be16f5ff2b65dda96be78b5710e52c02d48ebcf23b575e6c4 SHA512 e03ac1fde04f921d33a7075a0f9ddc632336c2c4506e69c3e51386c25080c527eb7195729a89edb895308beff05e7544c93831ad03df6db376b9624063a2972a
-EBUILD xdx-2.5.0.ebuild 776 BLAKE2B 0477b18c6e7de236d5b2b65a2ed6bd6a6b143cb1faf151282f40930b103290d576001ecb6afb3ec0efa6e47968d055d9aac519cb5a502dbae803aa71537b9490 SHA512 d26765b8b892c4764dfd513307bce3be76d77ecba63ce8db6fe57d2b5ea2917673584ea746e0e1f52a17f8ea25acfa51fc82c9572ddbe0965aed26852bd26e19
+EBUILD xdx-2.5.0.ebuild 838 BLAKE2B 8a004da7c5d7ad7541eff68ef4ebe493987af67191f4e27bcf0006b68196ad20af400d4210f7301c8ac694e826166c32bc8b52016cb43325ed2c6793e42c2b0f SHA512 0b14aea08da15e73b6ecd4495293724e9e4f8ece123e5ed3e51c6a268baaca7fc47f7cdf765567d77d53dcfce9fa9599964f51603e3214385361426244954a4b
 MISC metadata.xml 335 BLAKE2B d8d6b599df79920e9b97d52adf01f12668c12d61a546367cea81fa7ed31d8bcbce7e4b124cc8e575d9064ed4086e1de32d26b985add25c83ed417ea71d3f7524 SHA512 491d22817b73ee8eda2c59a361682fb63ee8eeaeb15f610e7f55ffbf297f85b667c33ebad1fe1739d36f5995ccaec77d363a9c53f1976742c338553c347c5f0b
diff --git a/media-radio/xdx/files/xdx-2.5.0-fno-common.patch b/media-radio/xdx/files/xdx-2.5.0-fno-common.patch
new file mode 100644
index 000000000000..a707d09b0a78
--- /dev/null
+++ b/media-radio/xdx/files/xdx-2.5.0-fno-common.patch
@@ -0,0 +1,25 @@
+diff --git a/src/gui.c b/src/gui.c
+index a3af442..5298c11 100644
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -76,6 +76,7 @@ extern preferencestype preferences;
+ static void on_highcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data);
+ static void on_soundcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data);
+ 
++guitype *gui;
+ 
+ /**********************************MAIN WINDOW********************************/
+ guitype *
+diff --git a/src/gui.h b/src/gui.h
+index 77b442f..6ba406f 100644
+--- a/src/gui.h
++++ b/src/gui.h
+@@ -53,7 +53,7 @@ typedef struct guitype {
+     gchar           *high8tagname;
+ } guitype;
+ 
+-guitype *gui;
++extern guitype *gui;
+ 
+ guitype *new_gui(void);
+ void create_mainwindow(void);
diff --git a/media-radio/xdx/xdx-2.5.0.ebuild b/media-radio/xdx/xdx-2.5.0.ebuild
index 92511501a99d..ed0eaf1b2f52 100644
--- a/media-radio/xdx/xdx-2.5.0.ebuild
+++ b/media-radio/xdx/xdx-2.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit eutils
 
@@ -19,13 +19,16 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+PATCHES=( "${FILESDIR}/"${P}-fno-common.patch )
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
 src_configure() {
 	econf $(use_enable nls)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	einstalldocs
 }
 
 pkg_postinst() {
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2bde50fc7559..b7dde73a2ccf 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 968c05b7aeb5..baadec002990 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,8 +1,4 @@
 AUX abcmidi-2016.05.05-docs.patch 614 BLAKE2B f9071f832d49d8dcb679843c5724c3a554df5f8f1ac6b545be637c2db6a37096b26c5b80f0b366d4e66f33230431de3b50b1198e2b9fe939e5231321ee1aeb27 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213
-DIST abcMIDI-2019.05.08.zip 562151 BLAKE2B 7b7413b329a69c9f8e7cf8eec9ddb2caceb055d2256d01a2e6045008b861b8aac194bb0b2507fb96a21ddcfe228a789be63c1ad322945a7b824ff39908cefcf4 SHA512 3891e10503f319b406b175d18077c353767b1025bae73fed184988427602412ffd5bb8e1ec0513b9ebff4d0debd81535558a8157b150a4e32abad099279d4312
-DIST abcMIDI-2019.06.30.zip 565169 BLAKE2B 1db656cc8f3a1b67802eb5c91a48f45df26c2dd303b58c65b2f6dd2b93a2bad263ff06f68dd56eeb94f72bdcdb00f03a11fe26e288e8ee4ac28a91c6fa513c93 SHA512 a242ab847453a73966266e3787fe51d9e1a7359d0e3aee2e9b294c02eea88b159721298625d3079b584278d84dfe95fec70a55937b02d25a9eb753eb29799b6d
-DIST abcMIDI-2019.07.12.zip 565648 BLAKE2B 446dacce10d6c7aa1eb331f52fc0e82064b66bf394494c03fdade32147e456efc30ec81a82d27d212f8e32047ef1d63ad86b4c783b58c2f19c359cbc7683c0c2 SHA512 5b5948f5bf6e3560a7f3aaf98c79fda5d3b37c9c7738bc0e268adca06a72fdf1542cbd83be762ef140b54c2132be3529510c7661892b6fe8f843f258bf753f41
-EBUILD abcmidi-2019.05.08.ebuild 793 BLAKE2B 64792e08a135c9faca22b5bd3d882670f2e980bf2fc38859ec6b115f21fd501c8f1a25eafa985db4619a3edc32a2c95c78f830b10064b3816c7282528048f097 SHA512 56201e49df5d0be70b6b1b1d62ce9a7203c44a82518b80d8a6ea153a3a79c5598497f7a1a186eaccea6ec1e31f6c237a154c77f5b8a49d0dbfc1cefbb8904924
-EBUILD abcmidi-2019.06.30.ebuild 793 BLAKE2B 64792e08a135c9faca22b5bd3d882670f2e980bf2fc38859ec6b115f21fd501c8f1a25eafa985db4619a3edc32a2c95c78f830b10064b3816c7282528048f097 SHA512 56201e49df5d0be70b6b1b1d62ce9a7203c44a82518b80d8a6ea153a3a79c5598497f7a1a186eaccea6ec1e31f6c237a154c77f5b8a49d0dbfc1cefbb8904924
-EBUILD abcmidi-2019.07.12.ebuild 793 BLAKE2B 64792e08a135c9faca22b5bd3d882670f2e980bf2fc38859ec6b115f21fd501c8f1a25eafa985db4619a3edc32a2c95c78f830b10064b3816c7282528048f097 SHA512 56201e49df5d0be70b6b1b1d62ce9a7203c44a82518b80d8a6ea153a3a79c5598497f7a1a186eaccea6ec1e31f6c237a154c77f5b8a49d0dbfc1cefbb8904924
+DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de
+EBUILD abcmidi-2020.01.22.ebuild 793 BLAKE2B f0c9abd3f726827008b247db49e3abd8502afd77e94dfd777e6dd88d26a21b66c63d6ddb82d6645a444072e2ef527c73b17c14e88a98492f9f8934ee69dc7887 SHA512 6f6d59511723bfebc2b35b47824a7a0334faca92800b68d4f0b8f800552d9432aa213c3f77422aecbed0185f1440371fe9b2ca15db0d1eb537ada8de6378e32b
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2019.05.08.ebuild b/media-sound/abcmidi/abcmidi-2019.05.08.ebuild
deleted file mode 100644
index ce075821d84d..000000000000
--- a/media-sound/abcmidi/abcmidi-2019.05.08.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
-	default
-
-	rm configure Makefile || die
-	sed -i "s:-O2::" configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2019.06.30.ebuild b/media-sound/abcmidi/abcmidi-2019.06.30.ebuild
deleted file mode 100644
index ce075821d84d..000000000000
--- a/media-sound/abcmidi/abcmidi-2019.06.30.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
-	default
-
-	rm configure Makefile || die
-	sed -i "s:-O2::" configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2019.07.12.ebuild b/media-sound/abcmidi/abcmidi-2019.07.12.ebuild
deleted file mode 100644
index ce075821d84d..000000000000
--- a/media-sound/abcmidi/abcmidi-2019.07.12.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
-	default
-
-	rm configure Makefile || die
-	sed -i "s:-O2::" configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2020.01.22.ebuild b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild
new file mode 100644
index 000000000000..2dfe422dfb9d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2020.01.22.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure Makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 426373bfdbcd..d17e5aff5a7d 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -14,5 +14,5 @@ EBUILD alsa-utils-1.1.2.ebuild 2218 BLAKE2B 8eaace4cf6d675988c76ef1ad983e4c009a9
 EBUILD alsa-utils-1.1.6.ebuild 2268 BLAKE2B de4e179a4c128917b6693705ce05c7906c7c6d7f79518871cec851fc1b03c41516bcb414f5644bc34ded0a91293d0b75524d6cf983c081a7e0d94a758417ac7b SHA512 4acf87ae7149014817cccd3f65fc87ce3bae76b947f40c2b6364fcccabd6797fabe9b64e0ec13814e56389f563d28485242af73dcd9c2d04a1f516924ceb9102
 EBUILD alsa-utils-1.1.8.ebuild 2339 BLAKE2B 24c2a4c6847ebe215755bbbaa24687966949df9accbad985f5c763421c2b2e0f1b56a3ddf9ee24ffef33eb1b00c13cb283c283919291538e44a89d153edef6ce SHA512 305103876116a82fdd95563da46e73ade699157bbfaea0eb163f8c7611067eaa6dec089b1b690fadc11e817be96f706f66550d32c335a04b8c2d012584b443cb
 EBUILD alsa-utils-1.1.9.ebuild 2423 BLAKE2B 27a87cd73011e680060fa04173aaff943b6b7674a0b937588c6421ae2f25bdd5ac1b37a15ec5a80a5d1ece1548275c6892e12a79564a8e3953aaa8ab596ee676 SHA512 38c1fd5cd8463d2cf4dabd3b509ff2270ad33f0c6fc3afba73560563767c8432baaf03bb315876f54ea0c2ebc6dbff23b8ae90599ac2f4cb1d8088f2d72711e2
-EBUILD alsa-utils-1.2.1.ebuild 2340 BLAKE2B c3aacb5956c91e4f57edbad2bdeb772aa16c1582f274a3ec3fb223836eb9d4681d11447898c79caaba32957a5b9af625010ccc8e047a82a24c2edf6155a5bb8b SHA512 9d23e5e734bb72735e36aac722835f20f0378eea4371c306456dc900e4a76d13f39fde6f73239dd9fedccd89407089f1ab3c609649e588fb589e4df86263dccf
+EBUILD alsa-utils-1.2.1.ebuild 2339 BLAKE2B 8e86d03d515a52c3e87810a7f8cc6381722a8d33dd2064fe09134520643f917bfde26ced914d90c51a7948ce0c37d22357b9bf11ede8df6d578f965864bb7393 SHA512 74cad1077d628503b7fd89131d631972aab5c306533d42229ccf83d0f3660adc15d4eb71a4add4c199a9cb8432953bf435c73bbcf18b155b397c5ba2f4ea04bd
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
index 7229b722fb42..437a09a4d803 100644
--- a/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsamixergui/Manifest b/media-sound/alsamixergui/Manifest
index 8237d0a11c1a..fc985e16622f 100644
--- a/media-sound/alsamixergui/Manifest
+++ b/media-sound/alsamixergui/Manifest
@@ -2,5 +2,5 @@ AUX alsamixergui-0.9.0.1.2-fltk-1.1.patch 481 BLAKE2B f95c1efd41761972fb0d40fd19
 AUX alsamixergui-0.9.0.1.2-gcc34.patch 338 BLAKE2B 72d991c5ec3c88c0d96031f1feecefbbba365283295bfcd9484b1fb4faa51d3e743e3a63d19c8a143a0ee4a72f38de365f8f983cb1abdea4487cc527d57e5061 SHA512 5fe717ef8dd9fe3e339b1b96ac255950bc93a4e850aba1dbb546cb02e3c2c9cd4a7e2f93dbfb46002da0e90ed3fee89ac7f2024eb2bb8689a50e7cf124f33c19
 AUX segfault-on-exit.patch 325 BLAKE2B 591d498aa051a2f4405a9d068c84218c38caa9ae237db602a1bda6ce57d99e8ca3d9102ca307c3aaaccd3e2cdd93db74585fa8fc01a59d92d78fc517fee2aa38 SHA512 de0795e1220283822c658204b734d45775d4e1c11582920159eb4016a481c15e4a6c1f4b5f39b451c154a7459f8958506127c75403ac2731ea695ea0a28ed56f
 DIST alsamixergui-0.9.0rc1-2.tar.gz 70255 BLAKE2B 6caac083ce8edbd701fdc6f24bf19e1097dc260d92c4dfeb20f4b5cabba606882d3a94542e01567ef403708c29d0ca7933228b51926f4587d935042466c597af SHA512 c1eac24c87e3d3dd8a582312a24e4f517d084845a3a0cd0a7253e3386685d72a691fe138853002b0277361d397271fbc9f445fd5ad0f5d604e5ad022a408d6b7
-EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 917 BLAKE2B 04108ec26ba767b60221f6f865c8fc18d8928e202f332d2bda935e675f45ffc891aac9bc5f08e3685dd0553c264a583b94b0be39d786cb06e559dfc22a8d72ed SHA512 e4e0f4d43a2b483464076a8682021defdd50e06319ccc35979703f5706a4b84e024005f5e6d635ab69a560a8d5ef6c53395d38dc6b216f1d6f75ca1a1e7cab56
+EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 934 BLAKE2B 78198a2ae0caa7ee0edd301cc37bd26d8f3248de17f0336ebd9eb6a5ffd3839e437beffe716506c51511617128c9cc860b3fec24e8fe7e1e4d46443e66de1a5b SHA512 e56043a68cf02ed77df1bba4c0f0cbc8025f4cf5cbe5ce611cb3dd2d57e40c1ad563f11bdf1d596d861e720802934050b459251e0d9c4ab8603ae925302b9033
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
index bca2f9d1f995..e78df1d5d8ad 100644
--- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -8,7 +8,7 @@ inherit autotools desktop flag-o-matic
 MY_P=${PN}-0.9.0rc1-2
 
 DESCRIPTION="FLTK based amixer Frontend"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index e71d51ff7e64..ea6c8946ce3a 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -3,10 +3,14 @@ AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9
 AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
 AUX audacity-2.3.2-Fix-building-without-midi.patch 1845 BLAKE2B 482cf34d9a43d7fcd9b9104ad5e5a0a5ebe5b744cbc9cd9f2e267e591c822781acf601c355665a0bdb95ee94a758eac72fe4d74b6f9f72cb48b40c7f0cd0a2ac SHA512 d2fcf0c57a7c9a13a15daf6c901430e114193c0cdf395fbacaaf10be6717a6c74dcb1284ede3d12eca1c418f2948483f84fc75c78e80176531c3adbfbbeeae31
 AUX audacity-2.3.2-fix_building_against_system_portaudio.patch 1991 BLAKE2B 2e9609542728d3d5c80471d95a49f3051c061a3a06290820db90a0cad346c759c666ae66a36c26b7005f727f73049c40423fbb2c86c6492f0b89023c80972bf1 SHA512 7b7612249ec7f1eb765fd40b15b89e90fe7e251cd6a49d54643c43e8e2ab6e319b5a49c8432abe6d2440a610a306c6553538835a018ecb0c832aab88cc3f033a
+AUX audacity-2.3.3-Fix-building-against-system-portaudio.patch 1952 BLAKE2B 9a5ef294d55dfe226175d2fdd8b23a9a4e6b3e963c26b9d4d8b430054dba5c39c6ae97f911b720dc53af5173c6a639275dd119c5292f53164e749782fa8f1e46 SHA512 ff85a33922bed3a626dd82c71406d81ac59c36dc45e5d2164662aabcd14a859479304cf684b9f64d0b110a9a1a82042b130c21e820ebd4c917fd9094c0737ed2
 DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802 SHA512 a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
+DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846 SHA512 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44 SHA512 5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
+DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84 SHA512 2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
 EBUILD audacity-2.2.2.ebuild 3343 BLAKE2B 11ad65e95ea0a16b6434017246b0b5063c13df6821a856bcc4116de082f5a673394480a1a15e63065ccded4d8bdea786eb7988dc747440b11d5fbb6fb4504601 SHA512 80136688f1ef9a75424f24bdb98ccfbb8ad7c1dfdabd7a8ede9c4ba837de7039c2109e92fe7b1e13e5e0fa05e6f39af109bc779b20dc04af0ee96b93ba3af660
 EBUILD audacity-2.3.2.ebuild 3308 BLAKE2B 26a4dbfbfa65f793da903e9856925df8f5cfa3dab66f2af941862152769a591c1a1943f2375e4120548b7bbc31c09db1d0fa02209e8e989c4444551e7ac61170 SHA512 1635af065e989252de42db1cd9089d4584b7e4691b4bcb6541657e57abaefef13decc48f4aabee759b02b8471f5c93842336ce7abb77db66edc224b202c77f1f
+EBUILD audacity-2.3.3.ebuild 3252 BLAKE2B 49c23d649bef735975e5b362cee2a5268e498a0d18e71684d0610aa6cb66a1da50ebf8cb841ddb262ed5c50d765e722deceae4f16f1754d8a442f26eab2eab4e SHA512 5c2d855f7b756ee60d17575f37fc0afac0c2c0708429044e367597b8ebe7695a9f4895c776c1f8447d690782227e66e3e371eecfe5a1ceab88539f77bb71f1fd
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild
new file mode 100644
index 000000000000..ceb9bb0503ac
--- /dev/null
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/"
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+	doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+	+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+	>=media-libs/libsndfile-1.0.0
+	>=media-libs/portaudio-19.06.00-r2[alsa?]
+	<media-libs/portaudio-20
+	media-libs/soxr
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( >=media-video/ffmpeg-1.2:= )
+	)
+	flac? ( >=media-libs/flac-1.3.1[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( >=media-sound/lame-3.70 )
+	lv2? (
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/suil
+	)
+	mad? ( >=media-libs/libmad-0.14.2b )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	twolame? ( media-sound/twolame )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+)
+
+src_prepare() {
+	default
+
+	use midi || sed -i \
+		-e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
+		src/Experimental.h || die
+}
+
+src_configure() {
+	setup-wxwidgets
+	append-cxxflags -std=gnu++14
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	local myeconfargs=(
+		--disable-dynamic-loading
+		--enable-nyquist=local
+		--enable-unicode
+		--with-expat
+		--with-lib-preference=system
+		--with-libsndfile
+		--with-libsoxr
+		--with-mod-script-pipe
+		--with-mod-nyq-bench
+		--with-portaudio
+		--with-widgetextra=local
+		--with-wx-version=${WX_GTK_VER}
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable ladspa)
+		$(use_enable nls)
+		$(use_enable vst)
+		$(use_with ffmpeg)
+		$(use_with flac libflac)
+		$(use_with id3tag libid3tag)
+		$(use_with lame)
+		$(use_with lv2)
+		$(use_with mad libmad)
+		$(use_with midi portmidi local)
+		$(use_with midi "" local)
+		$(use_with portmixer)
+		$(use_with sbsms)
+		$(use_with soundtouch)
+		$(use_with twolame libtwolame)
+		$(use_with vamp libvamp)
+		$(use_with vorbis libvorbis)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -r "${ED}"/usr/share/doc || die
+
+	# Install our docs
+	einstalldocs
+
+	if use doc ; then
+		docinto html
+		dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
+		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch b/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch
new file mode 100644
index 000000000000..b44517fca80e
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch
@@ -0,0 +1,56 @@
+From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite <ao2@ao2.it>
+Date: Tue, 7 Nov 2017 13:06:33 +0100
+Subject: [PATCH] Fix building against the system portaudio library
+
+Building against the system portaudio results in this error:
+
+./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
+audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
+unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
+./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
+collect2: error: ld returned 1 exit status
+Makefile:2349: recipe for target 'audacity' failed
+make[3]: *** [audacity] Error 1
+
+This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
+but is resolved as a C++ symbol at link time.
+
+Audacity fixes this in the local tree with this change:
+https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
+
+However this is not general enough for the portaudio debian package.
+
+Since PaUtil_GetTime() is the only function causing problems, just copy
+over the code where it's used.
+---
+ src/AudioIO.cpp | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+--- a/src/AudioIO.cpp
++++ b/src/AudioIO.cpp
+@@ -480,8 +480,23 @@
+    #define ROUND(x) (int) ((x)+0.5)
+    //#include <string.h>
+ //   #include "../lib-src/portmidi/pm_common/portmidi.h"
+-   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
+    #include "NoteTrack.h"
++
++PaTime PaUtil_GetTime( void )
++{
++#ifdef HAVE_MACH_ABSOLUTE_TIME
++    return mach_absolute_time() * machSecondsConversionScaler_;
++#elif defined(HAVE_CLOCK_GETTIME)
++    struct timespec tp;
++    clock_gettime(CLOCK_REALTIME, &tp);
++    return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
++#else
++    struct timeval tv;
++    gettimeofday( &tv, NULL );
++    return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
++#endif
++}
++
+ #endif
+ 
+ #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index 6a021a31b42e..6266fd6218f1 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
 AUX cadence-add-skip-stripping.patch 2184 BLAKE2B 61db0094b2ae8059c1cf162d553db9624cf84e0d92483bd42678b6be8dd0e25aaf7eb5cde6983e65c54cbe61d2f0f1a507d74a73572662c64e489e8c30b7cc56 SHA512 dda75f3b7f23c9303206fde30ca9c90eaf3999edd8b1d02f5cd3e0680d72dc59b0966ce9100d4274490595f7aa6df3ed6ef6f91ed672840341f9d5083805b239
 DIST cadence-0.9.0.tar.gz 2202265 BLAKE2B 03d38f611df05597d2b4016f263d36f2386be421383a38b51dee519514e6d1ed79bf92ea2a789ea868a25d4c805e9e94cd0971f479b772799bf6bf3170349b4a SHA512 381c9c57c1d96452a91969e134420d63ef06f5ec144050779d0a06a1098e8ed1693c70165b6640e04acc448d382e717e71ead1b29ba5043f0668675850cad7d1
-EBUILD cadence-0.9.0-r3.ebuild 2129 BLAKE2B f9c241a53e6c0d37ab25e2268a0259e33801af9d902f94cfac93f09f85f551412c320212b3b639aabfd847330ebd07eb3f22614afcf9bf83c42483aad3a42599 SHA512 794d20385844b6778339f7796050e7565852fa2c20cfd42bbe1ac495a574257101082e271912b6a71e20e55b8cfad5b7be58839c3cb319147d84d4bfc384b6b3
-EBUILD cadence-9999.ebuild 2016 BLAKE2B 5fec7d48d618086a76a5defaa53f39494c51585280180286dbf178294fc003d9a79c4bcba459b57d170f8fc74779ffdddfc0839ca9f14bfd33d0bac335285b94 SHA512 1fb6b9e9d22f5f893684f4e6d7c35c55263ce18a4421df5318abe10a197e8fe9c2a11d6934d41683f95fb332f265d3fd8117dd1aa8edb96c1fabfebb6dd869cd
+EBUILD cadence-0.9.0-r4.ebuild 2172 BLAKE2B 9844a157a8db4819bf551493b44f2ec59e26f724543571821919e40fe25ceb556e35d80513bd93f03de50e1292ce4f68066ccd80590edc03eaaf0de2aefce83a SHA512 bfcfe9642a2ce8988f6526bbbcc846c7ff504853e2c7d6245db87f6337ef8d8e98999c9462183ec8d5418aa186a774ba19c2e872418619b92eb725bed7b28b8d
+EBUILD cadence-9999.ebuild 2059 BLAKE2B 59983428d4250e0fb040b5585b89c5521637f23402fe0b4eadb698de4fc9f90dc62da70ccdba73e3da8c0ad45e7038916c0d48baec9bda758652d4fdc7a05f72 SHA512 f7de8366a38f7e2c832202821a3bae0b43d7172be33de87cfb870e214e9f5fb89af5386002f56501c545477573b4734ef0cbb4b2927af7c1423c127ece7de9f0
 MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-0.9.0-r3.ebuild b/media-sound/cadence/cadence-0.9.0-r3.ebuild
deleted file mode 100644
index 6eb22cdfc3f6..000000000000
--- a/media-sound/cadence/cadence-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit python-single-r1 xdg desktop
-
-DESCRIPTION="Collection of tools useful for audio production"
-HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
-SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="a2jmidid -pulseaudio opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
-CDEPEND="
-	${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
-	media-sound/jack2[dbus]
-	media-sound/jack_capture
-	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( media-sound/pulseaudio[jack] )
-"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
-
-S="${WORKDIR}/Cadence-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
-
-src_prepare() {
-	sed -i -e "s/python3/${EPYTHON}/" \
-		data/cadence \
-		data/cadence-aloop-daemon \
-		data/cadence-jacksettings \
-		data/cadence-logs \
-		data/cadence-render \
-		data/cadence-session-start \
-		data/catarina \
-		data/catia \
-		data/claudia \
-		data/claudia-launcher || die "sed failed"
-
-	default
-}
-
-src_compile() {
-	myemakeargs=(PREFIX="/usr"
-		SKIP_STRIPPING=true
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-
-	# Clean up stuff that shouldn't be installed
-	rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
-	rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop
-	rm -rf "${D}"/usr/share/applications/*.desktop
-
-	if use !pulseaudio; then
-		rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback}
-		rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback}
-	fi
-
-	# Replace desktop entries with QA issues with these
-	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
-	make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
-	make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
-}
diff --git a/media-sound/cadence/cadence-0.9.0-r4.ebuild b/media-sound/cadence/cadence-0.9.0-r4.ebuild
new file mode 100644
index 000000000000..08953c0b0c7f
--- /dev/null
+++ b/media-sound/cadence/cadence-0.9.0-r4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit python-single-r1 xdg desktop
+
+DESCRIPTION="Collection of tools useful for audio production"
+HOMEPAGE="http://kxstudio.linuxaudio.org/Applications:Cadence"
+SRC_URI="https://github.com/falkTX/Cadence/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="a2jmidid -pulseaudio opengl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
+CDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+	')
+	media-sound/jack2[dbus]
+	media-sound/jack_capture
+	a2jmidid? ( media-sound/a2jmidid[dbus] )
+	pulseaudio? ( media-sound/pulseaudio[jack] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+S="${WORKDIR}/Cadence-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
+
+src_prepare() {
+	sed -i -e "s/python3/${EPYTHON}/" \
+		data/cadence \
+		data/cadence-aloop-daemon \
+		data/cadence-jacksettings \
+		data/cadence-logs \
+		data/cadence-render \
+		data/cadence-session-start \
+		data/catarina \
+		data/catia \
+		data/claudia \
+		data/claudia-launcher || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	myemakeargs=(PREFIX="/usr"
+		SKIP_STRIPPING=true
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	# Clean up stuff that shouldn't be installed
+	rm -rf "${D}"/etc/X11/xinit/xinitrc.d/61cadence-session-inject
+	rm -rf "${D}"/etc/xdg/autostart/cadence-session-start.desktop
+	rm -rf "${D}"/usr/share/applications/*.desktop
+
+	if use !pulseaudio; then
+		rm -rf "${D}"/usr/bin/cadence-pulse2{jack,loopback}
+		rm -rf "${D}"/usr/share/cadence/pulse2{jack,loopback}
+	fi
+
+	# Replace desktop entries with QA issues with these
+	make_desktop_entry cadence Cadence cadence "AudioVideo;AudioVideoEditing;Qt"
+	make_desktop_entry catia Catia catia "AudioVideo;AudioVideoEditing;Qt"
+	make_desktop_entry catarina Catarina catarina "AudioVideo;AudioVideoEditing;Qt"
+}
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 2350c0a718dc..1059f334e102 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,8 +20,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # for jack project rendering also needs media-sound/jack_capture which is not in the tree yet
 CDEPEND="
 	${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,${PYTHON_MULTI_USEDEP}]
+	')
 	media-sound/jack2[dbus]
 	media-sound/jack_capture
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 6719fdbb4346..e75ff452b53e 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -2,6 +2,6 @@ AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e
 AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4
 AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
 DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
-EBUILD cmus-2.8.0.ebuild 3815 BLAKE2B 37cd0d5f1a15e6a33d1f6d968593ef25fcbe85516bbb7c8409257b65ef51d18a4a9d3e753f5e48bada15803dc9a802132f70b6e3c2afc4c7a6dbe9b34ce14296 SHA512 956ba9f8bde61420dfc444af9206f345ed535d2a6dc2bb8d5d1a3109fc29fd5be845c4f3361ce637b0d128c25fafe5ffd3a992fbf02dd3fa52ebfd55ef0ccb55
-EBUILD cmus-9999.ebuild 3695 BLAKE2B ff63e104338789551fa0ebc6b03673561332cc645499447c2fb11a4db4c0c25c515a541cd845a6c1d76502f8c3c0f7ef6cba4129f7f4158463aa46f7b5df6757 SHA512 5e1e14bee56ef47c960c29957d9ab00ef245541dc62acac2bf20096caa6132061b770a65bf9e72c66250c6990c60f8529f0c9036668a2de18ad9e05bf1ebdf62
-MISC metadata.xml 935 BLAKE2B 6623b356fec8c0bb8ea7b30ff8b767ba108afdd0f02e4881b2afd7229b4b912f781ec89daf1078a057d6f10638e361889ecb9535b3cd81822a6a88c17972ae58 SHA512 f17d07ee3d1bb7e7a813c12d994005c6603f2c381680d4b79c07504556d7de4a84f3720916f39325eacf846000af39500259e4d2446ca6b302d61c59a1535710
+EBUILD cmus-2.8.0.ebuild 3782 BLAKE2B 6dbc0885dd410fd688cac99bef92f95cb3e80ab9981c88a5a151dd63c6dc2a65be1ea370570a9508df6baaa77272d0c42a86cb3b0d4a2c4eabd42ad1d4dc4bbb SHA512 d19e8f76896ab24eaf56546254e48b1f3d8b9990dc7d1a02667e68fa48972786d238746f8137fcd0f47a6bc2ee8b39dd231129f4c08c1029eec1720949f3e148
+EBUILD cmus-9999.ebuild 3662 BLAKE2B 6f64710e100429e7fa05a4e72af3f1bd4c862ab158eb4ff06acd09ecce472db67c5bcaa9f6c30b0026aeda0d5b89d48210e4293c40c39620df0d494d35852640 SHA512 0c4f08bce224656eaa2c7b76094a47f00db7a89f187568174df9b4c2e75ea9f52d8fa954c9dd1b76177d5ead2c07c3ce2f63d1fcbdc0a5f5c9ba0ddafd3d0482
+MISC metadata.xml 884 BLAKE2B f545c30b4f5c1f497b616e0a14bb26e760d528a36153de4fa8d74a745e2c6ea1207c1a3e4625fb8411261dede9d51239a1ade9b258fa1e95c93c4446548f824f SHA512 5976190ba4ffaa3ba0f9b6774ecfe1922ea4a998759bebcb5d8ae1697b09cc54833b352e171b9f3770800ab0145a0f072e576f25d4799d0a94253c211dcf8962
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
index 83c05f7dc5eb..e4cfd45303e4 100644
--- a/media-sound/cmus/cmus-2.8.0.ebuild
+++ b/media-sound/cmus/cmus-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
 	+vorbis wavpack"
 
@@ -34,7 +34,6 @@ DEPEND="
 	ao? ( media-libs/libao )
 	cddb? ( media-libs/libcddb )
 	cdio? ( dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
 	discid? ( media-libs/libdiscid )
 	elogind? ( sys-auth/elogind )
 	ffmpeg? ( media-video/ffmpeg:= )
@@ -74,16 +73,24 @@ PATCHES=(
 
 S="${WORKDIR}/${P/_/-}"
 
-my_config() {
-	local value
-	use ${1} && value=a || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
 src_configure() {
-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+	my_config() {
+		local value
+		use ${1} && value=a || value=n
+		myconf+=( ${2}=${value} )
+	}
 
+	local debuglevel=1
 	use debug && debuglevel=2
+	local myconf=(
+		CONFIG_CUE=y
+		CONFIG_ARTS=n
+		CONFIG_SUN=n
+		CONFIG_SNDIO=n
+		CONFIG_WAVEOUT=n
+		CONFIG_VTX=n
+		CONFIG_ROAR=n
+	)
 
 	my_config cddb CONFIG_CDDB
 	my_config cdio CONFIG_CDIO
@@ -100,7 +107,6 @@ src_configure() {
 	my_config mp4 CONFIG_MP4
 	my_config aac CONFIG_AAC
 	my_config ffmpeg CONFIG_FFMPEG
-	my_config cue CONFIG_CUE
 	my_config pulseaudio CONFIG_PULSE
 	my_config alsa CONFIG_ALSA
 	my_config jack CONFIG_JACK
@@ -109,12 +115,12 @@ src_configure() {
 	my_config oss CONFIG_OSS
 
 	if use elogind || use systemd; then
-		myconf="${myconf} CONFIG_MPRIS=a"
+		myconf+=( CONFIG_MPRIS=a )
 	else
-		myconf="${myconf} CONFIG_MPRIS=n"
+		myconf+=( CONFIG_MPRIS=n )
 	fi
 
-	./configure prefix="${EPREFIX}"/usr ${myconf} \
+	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
 }
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index 6ae109af57a9..283dda195198 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
+IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
 	+vorbis wavpack"
 
@@ -34,7 +34,6 @@ DEPEND="
 	ao? ( media-libs/libao )
 	cddb? ( media-libs/libcddb )
 	cdio? ( dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
 	discid? ( media-libs/libdiscid )
 	elogind? ( sys-auth/elogind )
 	ffmpeg? ( media-video/ffmpeg:= )
@@ -68,16 +67,24 @@ DOCS=( AUTHORS README.md )
 
 S="${WORKDIR}/${P/_/-}"
 
-my_config() {
-	local value
-	use ${1} && value=a || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
 src_configure() {
-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+	my_config() {
+		local value
+		use ${1} && value=a || value=n
+		myconf+=( ${2}=${value} )
+	}
 
+	local debuglevel=1
 	use debug && debuglevel=2
+	local myconf=(
+		CONFIG_CUE=y
+		CONFIG_ARTS=n
+		CONFIG_SUN=n
+		CONFIG_SNDIO=n
+		CONFIG_WAVEOUT=n
+		CONFIG_VTX=n
+		CONFIG_ROAR=n
+	)
 
 	my_config cddb CONFIG_CDDB
 	my_config cdio CONFIG_CDIO
@@ -94,7 +101,6 @@ src_configure() {
 	my_config mp4 CONFIG_MP4
 	my_config aac CONFIG_AAC
 	my_config ffmpeg CONFIG_FFMPEG
-	my_config cue CONFIG_CUE
 	my_config pulseaudio CONFIG_PULSE
 	my_config alsa CONFIG_ALSA
 	my_config jack CONFIG_JACK
@@ -103,12 +109,12 @@ src_configure() {
 	my_config oss CONFIG_OSS
 
 	if use elogind || use systemd; then
-		myconf="${myconf} CONFIG_MPRIS=a"
+		myconf+=( CONFIG_MPRIS=a )
 	else
-		myconf="${myconf} CONFIG_MPRIS=n"
+		myconf+=( CONFIG_MPRIS=n )
 	fi
 
-	./configure prefix="${EPREFIX}"/usr ${myconf} \
+	./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \
 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
 }
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index f19bd0670b18..671a05ce3c84 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="cdio">Use libcdio for CD support </flag>
-		<flag name="cue">Enable CUE sheet parsing</flag>
 		<flag name="discid">Enable reading the ID of the inserted CD</flag>
 		<flag name="elogind">Enable MPRIS support via <pkg>sys-auth/elogind</pkg></flag>
 		<flag name="pidgin">Install support script for <pkg>net-im/pidgin</pkg></flag>
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 1faef3350734..1bb2fb771617 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -2,7 +2,11 @@ AUX csound-6.13.0-xdg-open.patch 982 BLAKE2B e6643fc554feb8b0fd4cbb4d96e6ca727bf
 AUX repackage.sh 738 BLAKE2B 4e091a526c4402354be54ca4e161eef4ec74adf8e0d218985426e9ba9a808399fb4b8973d9acce3063c968fca561a1429035b01e85588e99c0135521f92ea96c SHA512 fa418daaddcce4f5296596038726720675ad9988f57bbcd943bf2f247fd8368401a193c031ab65bea5753b37274f41cb9bf28dd2b18309bd0cee90b931d2fab1
 DIST Csound6.13.0_manual_html.zip 16436055 BLAKE2B 4ac6d24442cbb09f97f73167df84143df84045a077d3863564bab803e8c9e00c0ca506cff4a37d7aced54817cf95b2c0c6bed1b5ea744e2d11baef08c71f23ab SHA512 87de3efc9aba736751d5bd93bb7bb9d47a3fc4c2e9df4552c9c1f3030f84e1aa29fa421f5360a22993cf0f6f7baae1d70bfb54201e5110f44f5a8c81d955deb5
 DIST Csound6.13.0_manual_pdf.zip 8846303 BLAKE2B f60becbe2df925d3d2db755d0ddf806507c6f8355d5ceb97a5e0ce971a0ee0ba19c44bbd018e41437036d9553db7fe8c44fea875bf36ef752ce5c26467ff3a82 SHA512 30a55ec2c3ab0e243ac48a081954bea1f8fa653d25c908383c49a879972b94ba2ce7c3b3b0701be18ace28dc7fd199597d889fa1f9e5aca478792b835909c8fa
+DIST Csound6.14.0_manual_html.zip 17081006 BLAKE2B 9565c21623a60e06aae82bfbde186e496b5f3ae0eb619289a7db08235c7dcd520bee2283552fdf2ddb4eb85c7b0f184397d2fa0ee14d3bdeff9dccb44a7d7ff1 SHA512 638ecd8bc0b4c981e1f8c5592a123a3b1bb5582ee7017288be224eb670fccda79242ae42b6f6d8e91c2ad2f708af1de3c66283030d4b3373c0ec29ec260f379b
+DIST Csound6.14.0_manual_pdf.zip 8881242 BLAKE2B a91a3689dd3efa5c32c924178b646b73787132a07575f05a65ee1acafc69108ce6c33512e0b703012f75f201a86a0b84e08976f158b01ef5201807d1aaa31c35 SHA512 55769acd58add0ec6df5e188c74e16424deb679aebdbdd50dc5d9006c80a26c31dfe2564e5d71478abcb7a920b40c1f1baa02e4c3fd682a6d3bbc378ddcb8b7d
 DIST csound-6.13.0-distributable.tar.xz 20831668 BLAKE2B efefbb0d2a6532f087a940677dacce41b31be30bd10256300826f92516dddfadf6679f767e23655a0e35d09626ed11b03a13e22b88f378422f6d5a0f7856a566 SHA512 b8bedc893fed678b40d2d9ffa376b4d7557612e63c389145e6292cec4c1e847f6b86184d13b11392980eedfd215f0e08cdc234b2803e389f7387a009d83a3b40
+DIST csound-6.14.0-distributable.tar.xz 21114184 BLAKE2B ebcdff074d77fd6244875a3ccb6c0dc6364b6f3ae0ca0de75cc8ad893c91a30f17237bf7f1b06296f7141d2c9092594dea75b7539f033574bec7c8f36aaf9251 SHA512 21e857a363962c95f0b7702ce8a07713e56b267dae51f2c50d34ae8885f89e2ad0e241e84927d649912cddffeaecc6bfef15ef8958ffb621d825f4547c3632f8
 EBUILD csound-6.13.0.ebuild 7310 BLAKE2B 95ff707d04e049346933503d1a4a1556b7a91ef0a9f8c3633989288249d5427d429ea7c79b6e4f741f8bd6ed97915c07bdcafe9c4994646a908acfe5c15ea67a SHA512 91da3b9efc6695c23bf2c4376baa91e317aa9ee129d3587643c80201c919a9b8f70dd031cea6e690fe62f13788c1981c3a0419a799277aa8373012a7bf921683
-EBUILD csound-9999.ebuild 7346 BLAKE2B 060b23eac2cf5a927fb242bdae49a8463423ca1c295a543ccfb5465932365c5afddf9a253e6adb227f072917a35dcede9bd1891fc206a1ce3d919a8f24b930fa SHA512 7b80fe443eba1ab29ff7640be453d1d3b598e48291cabca93832ccc803e91734f3b38d0e88840b043529e7cbd0359b422cb2b3555251a6110a8148e0b4f3b2d8
+EBUILD csound-6.14.0.ebuild 7350 BLAKE2B 320d965e7133965d0283cda1e9fae24a265c33837cd0299408e1a7a5f26dac1c6005a15aca2a13330f77ae61a8a9a5229dee60e6ffddc44f37dc1c551896e0fa SHA512 bf57349c2a62598a03098bf0e33d89dfb320cbab3adbfd8aec623b8c26df50b84c96aa69f2a255654a2f52c771a31ba4c744c00d6fa46e42accf0f52562b6a0c
+EBUILD csound-9999.ebuild 7350 BLAKE2B 320d965e7133965d0283cda1e9fae24a265c33837cd0299408e1a7a5f26dac1c6005a15aca2a13330f77ae61a8a9a5229dee60e6ffddc44f37dc1c551896e0fa SHA512 bf57349c2a62598a03098bf0e33d89dfb320cbab3adbfd8aec623b8c26df50b84c96aa69f2a255654a2f52c771a31ba4c744c00d6fa46e42accf0f52562b6a0c
 MISC metadata.xml 1295 BLAKE2B 9bfc19eeb1c250b89c6b9d452f5de8a9b0b1283e25bb01ce46c75ef4372844a0605c2384ff17f026e31e10f5670067f8568fe3b3a63675408ac380276d76c65a SHA512 75bfb3c156aaf5b59c6e0291bb4b89f605d9ea6c812eaae2fab6638c74220685835c1b91d436f8f2dfdb90ba625327c4c4e274d7e9dfee6b8fdd6bc3e1679a52
diff --git a/media-sound/csound/csound-6.14.0.ebuild b/media-sound/csound/csound-6.14.0.ebuild
new file mode 100644
index 000000000000..f9db4411fa0f
--- /dev/null
+++ b/media-sound/csound/csound-6.14.0.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# As upstream (and we aswell) are not allowed to redistribute scansyn,
+# we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
+# Reference: https://github.com/csound/csound/issues/1148
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake python-single-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	DOC_P="Csound${PV}"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}-distributable.tar.xz
+		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="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"
+# java doesn't work atm as it needs to have some variables specified to work, see src_configure
+# mp3 doesnt work as media-sound/lame does not install cmake file
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio
+portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
+vim-syntax websocket"
+
+REQUIRED_USE="
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( ${PYTHON_REQUIRED_USE} cxx )
+"
+#	java? ( cxx )
+
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	python? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+# currently not used deps due to some issues
+#	java? ( virtual/jdk:* )
+#	mp3? ( media-sound/lame )
+CDEPEND="
+	dev-cpp/eigen:3
+	>=media-libs/libsndfile-1.0.16
+	media-libs/libsamplerate
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	curl? ( net-misc/curl )
+	dssi? (
+		media-libs/dssi
+		media-libs/ladspa-sdk
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	fltk? ( x11-libs/fltk:1[threads?] )
+	hdf5? ( sci-libs/hdf5 )
+	image? ( media-libs/libpng:0= )
+	jack? ( virtual/jack )
+	keyboard? ( x11-libs/fltk:1[threads?] )
+	linear? ( =sci-mathematics/gmm-5.1* )
+	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 )
+	utils? ( !media-sound/snd )
+	websocket? ( net-libs/libwebsockets:= )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	dev-libs/boost
+"
+
+if [[ ${PV} != "9999" ]]; then
+	DEPEND+="doc? ( app-arch/unzip )"
+fi
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
+)
+
+pkg_setup() {
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_BELA=OFF
+		-DBUILD_BUCHLA_OPCODES=ON
+		-DBUILD_CHUA_OPCODES=$(usex chua)
+		-DBUILD_CSBEATS=$(usex beats)
+		-DBUILD_CUDA_OPCODES=OFF
+		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		-DBUILD_EMUGENS_OPCODES=ON
+		-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FAUST_OPCODES=OFF
+		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
+		-DBUILD_FRAMEBUFFER_OPCODES=ON
+		-DBUILD_HDF5_OPCODES=$(usex hdf5)
+		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DBUILD_INSTALLER=OFF
+		-DBUILD_JACK_OPCODES=$(usex jack)
+		-DBUILD_JAVA_INTERFACE=OFF
+		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
+		-DBUILD_LUA_INTERFACE=$(usex lua)
+		-DBUILD_MP3OUT_OPCODE=OFF
+		-DBUILD_MULTI_CORE=$(usex threads)
+		-DBUILD_OPENCL_OPCODES=OFF
+		-DBUILD_OSC_OPCODES=$(usex osc)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		-DBUILD_PADSYNTH_OPCODES=ON
+		-DBUILD_PLATEREV_OPCODES=ON
+		-DBUILD_PVSGENDY_OPCODE=OFF
+		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_RELEASE=ON
+		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
+		-DBUILD_SELECT_OPCODE=ON
+		-DBUILD_SERIAL_OPCODES=ON
+		-DBUILD_STACK_OPCODES=ON
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
+		-DBUILD_STK_OPCODES=$(usex stk)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_VST4CS_OPCODES=OFF
+		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DBUILD_WIIMOTE_OPCODES=OFF
+		-DBUILD_WINSOUND=OFF
+
+		-DFAIL_MISSING=ON
+		-DNEED_PORTTIME=OFF
+		-DNEW_PARSER_DEBUG=$(usex debug)
+
+		-DUSE_ALSA=$(usex alsa)
+		#-DUSE_ATOMIC_BUILTIN=ON
+		-DUSE_AUDIOUNIT=OFF # Apple specific
+		#-DUSE_COMPILER_OPTIMIZATIONS=ON
+		-DUSE_COREMIDI=OFF # Apple specific
+		-DUSE_CURL=$(usex curl)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DUSE_FLTK=$(usex fltk)
+		-DUSE_GETTEXT=$(usex nls)
+		-DUSE_GIT_COMMIT=ON
+		_DUSE_IPMIDI=ON
+		-DUSE_JACK=$(usex jack)
+		-DUSE_LRINT=ON
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+
+	)
+
+	#use java && mycmakeargs+=(
+		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
+		#-DJAVA_AWT_LIBRARY="?"
+		#-DJAVA_JVM_LIBRARY="?"
+		#-DJAVA_INCLUDE_PATH2="?"
+		#-DJAVA_AWT_INCLUDE_PATH="?"
+	#)
+
+	# set the library that we want to use
+	if use lua ; then
+		local libdir
+		local libname
+
+		if use luajit ; then
+			libdir=$(pkg-config --variable=libdir luajit)
+			libname=$(pkg-config --variable=libname luajit)
+		else
+			libdir=$(pkg-config --variable=libdir lua)
+			libname=$(pkg-config --variable=libname lua)
+			[[ -z "${libname}" ]] && libname="lua"
+		fi
+
+		mycmakeargs+=(
+			-DLUA_LIBRARY="${libdir}/lib${libname}.so"
+		)
+	fi
+
+	use python && mycmakeargs+=(
+		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
+	)
+
+	# this is needed, otherwise it sets LIBRARY INSTALL DIR: lib
+	[[ $(get_libdir) == "lib64" ]] && mycmakeargs+=(
+		-DUSE_LIB64=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_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 f29357886e45..f9db4411fa0f 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # As upstream (and we aswell) are not allowed to redistribute scansyn,
@@ -136,6 +136,7 @@ src_configure() {
 		-DBUILD_FRAMEBUFFER_OPCODES=ON
 		-DBUILD_HDF5_OPCODES=$(usex hdf5)
 		-DBUILD_IMAGE_OPCODES=$(usex image)
+		-DBUILD_INSTALLER=OFF
 		-DBUILD_JACK_OPCODES=$(usex jack)
 		-DBUILD_JAVA_INTERFACE=OFF
 		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
@@ -155,8 +156,7 @@ src_configure() {
 		-DBUILD_SELECT_OPCODE=ON
 		-DBUILD_SERIAL_OPCODES=ON
 		-DBUILD_STACK_OPCODES=ON
-		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
-		-DBUILD_STATIC_LIBRARY=$(usex test)
+		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
 		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
 		-DBUILD_UTILITIES=$(usex utils)
@@ -181,8 +181,8 @@ src_configure() {
 		-DUSE_GETTEXT=$(usex nls)
 		-DUSE_GIT_COMMIT=ON
 		_DUSE_IPMIDI=ON
-		-DUSE_LRINT=ON
 		-DUSE_JACK=$(usex jack)
+		-DUSE_LRINT=ON
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 7d591d234b19..148a6096f556 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,5 @@
 AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114f80b86e35d6d94e48d224fc615c20103dc2b18d63a331ef88c0ee8dfed50e6f4ae0feb9d62a89f8bbf1bf12e68b7b94c9eba48 SHA512 bc85b3150067b26faebc494146e60062658cd8c8110523becbf85ff2034e5a949103ef0a46ff4941338a035a299a7475c9a1bb208e3bdd1935e725723b42416f
 AUX din-43.0.1-makefile.patch 552 BLAKE2B c73746b64789dc54f4186777d507fc77c9a0b25e025be4adb48c4620adf4560ef600a445a8822ac045b0a39b4003c5b9007b5a36ed97fd61cdc6a1b8d96bdf74 SHA512 408d71e3b1e262eb83cc6cf0cd3ab4ee164bb9a6fda5244a6445d627c53b23e3d3d3e64bfb9f2c69e8168ecda0a46f8b4768100710f219a8b78325d238af4207
 DIST din-43.0.1.tar.gz 3644254 BLAKE2B 6b441ce93b3bd68e3bad5d7a6fea1914f250a5e35410f12c64da7ab1f530aa74b4a8f624a7b6ec70e26b62f5b3f8ada674ad7286b89e2569bbec9f3f29cccac6 SHA512 14df7f52a80801f062ed1a81c5625d8730e7bcc21cfa5256ecce9b478494828a3d0877c37434f30883aa519f767a70ba1cee4d203ec57c5bc72de1c47d2d848d
-EBUILD din-43.0.1.ebuild 1064 BLAKE2B 835426d6c379194d6a1a9463b227107c18b56dfdc2c6eaade8363bf80303ceb7418d708dae2f4b9f708e28a961facd1b9b1fb1af0e5bcf043ffef6479abf4c28 SHA512 d451623afd2bb66c7b3f5945aef5421de8db11273d755515e428129133281bfdc87a36d00989890a4656e4844f9c4f78a79858755fdf03f17eebe1632202272a
+EBUILD din-43.0.1.ebuild 1063 BLAKE2B 73f228fd7d55bd0de589daff38faff76711a7089411f98de6a61050958cea7b8199749e0fc4e88161c5b38e2d8c0c37a6bd6ad504cd684ef06cc153e01cc8c7b SHA512 8e7772d3a9b5940110550b0b921bf72e0094368d5d6d90197e9459987b040c8f5d1ef2e720cbbad584dcfc08a9f851ef0402dfdf42d9a453cdd555d7e7ccf681
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-43.0.1.ebuild b/media-sound/din/din-43.0.1.ebuild
index b8471d76fd37..b6aa55e63846 100644
--- a/media-sound/din/din-43.0.1.ebuild
+++ b/media-sound/din/din-43.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 3aca0bb4768c..960f2f04272a 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,3 +1,5 @@
 DIST dir2ogg-0.12.tar.gz 19608 BLAKE2B 39b1210b2458f7774aef64f29b07826a19b274d17a6038fc676557c8b15bed3662f851b87414b9318be154cdadd450001ea45bd8ed6103cffb2ee183511fe617 SHA512 bd76ba168b6e5305e4e5cfd87333200ec72a1d6e7055e966e1544abc842b39743b479b80c63382e10e85eebad92e97ec33e6fe52b0ace2df024ed50468e3946e
-EBUILD dir2ogg-0.12.ebuild 1167 BLAKE2B 332f8a448d1a8045bfe5a4d4469a2c53bb0256a9798d069071ae32b14f831f5b3acdad7f3e588f256f3be008f6c13bf088ebbd2fe07bc8299effd520d61701e9 SHA512 3a2d66203146187194fca8eef7164c923488c1e11dfdc4f5b02218192c05c2483a00a965873bb88a9ce753e12acf133fcb969d601192fd2421405bdfc63c59d6
+DIST dir2ogg-0.13.tar.gz 20338 BLAKE2B 4f00c7e587eb7bba349d7024977d0d67ac9424a09649650e923df7100c60a67db78f363ac9d41931e969a5d8131f9461485f120cc4f308b0abcca4d5b570aba2 SHA512 292c35dd20a8e0499b3bd22d89c6ed0ae0abcf2b58f669316a2f39d45092a1c9a14fb168ad9ac893dfdd5138600c8be5e66502141c9dc7376b18e1e8d1ca5054
+EBUILD dir2ogg-0.12-r1.ebuild 1203 BLAKE2B c9bb4c7f19debf5df3596a25a2e1ddee88953e4da4922602479974bc8cb9b9dd98b08316d6977c0109353f3cd095cdb05b6135700cd6557079a33e97930975b1 SHA512 d74ec08611f7f191bc23d1ecb7888cba382452f021a8cd82e09ce9e851faecbec4b74e708700f917efe6c13f743726fcd15e353dfddcc101014cfe4cb4febc31
+EBUILD dir2ogg-0.13-r1.ebuild 1212 BLAKE2B cdde97feefa67efc9b7eaee724d3671cb378c24db63fa5b68180042d8f873127ad9182921f8d6b50a7a7e7d659fb65d0653541e282f1f444c1cfa7d3e7a9ebb6 SHA512 adfb89aeee4d5e14ed92b30f70077ff12a78aa09a2cd2b69727473ca0248a85503ac9408b918115ef80fda98e013ea5e13e8c6a6cbec058579e415cb877bbaa8
 MISC metadata.xml 420 BLAKE2B 96885d28693df18ad564fe6ff658cd66bc39b3d556dcb5079ba531fea3bf603cdd558cd083c82bf76e06c170bf21e880600981dcb114117e55d585664119f1e5 SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074
diff --git a/media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild
new file mode 100644
index 000000000000..a25556207b96
--- /dev/null
+++ b/media-sound/dir2ogg/dir2ogg-0.12-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+MY_PR=$(ver_cut 1-2)
+DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format"
+HOMEPAGE="https://jak-linux.org/projects/dir2ogg/"
+SRC_URI="https://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="aac flac mac mp3 musepack wavpack wma"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=media-libs/mutagen-1.11[${PYTHON_MULTI_USEDEP}]
+	')
+	media-sound/vorbis-tools[ogg123]
+	aac? ( || (
+		media-libs/faad2
+		media-video/mplayer ) )
+	flac? ( || (
+		media-libs/flac
+		media-video/mplayer ) )
+	mac? ( || (
+		media-sound/mac
+		media-video/mplayer ) )
+	mp3? ( || (
+		media-sound/mpg123
+		media-sound/lame
+		media-video/mplayer
+		media-sound/mpg321 ) )
+	musepack? ( || (
+		>=media-sound/musepack-tools-444
+		media-video/mplayer ) )
+	wavpack? ( || (
+		media-sound/wavpack
+		media-video/mplayer ) )
+	wma? ( media-video/mplayer )"
+
+src_install() {
+	python_doscript dir2ogg
+	doman dir2ogg.1
+	einstalldocs
+}
diff --git a/media-sound/dir2ogg/dir2ogg-0.12.ebuild b/media-sound/dir2ogg/dir2ogg-0.12.ebuild
deleted file mode 100644
index 1e90d2050a91..000000000000
--- a/media-sound/dir2ogg/dir2ogg-0.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-MY_PR=$(ver_cut 1-2)
-DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format"
-HOMEPAGE="https://jak-linux.org/projects/dir2ogg/"
-SRC_URI="https://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="aac flac mac mp3 musepack wavpack wma"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=media-libs/mutagen-1.11[${PYTHON_USEDEP}]
-	media-sound/vorbis-tools[ogg123]
-	aac? ( || (
-		media-libs/faad2
-		media-video/mplayer ) )
-	flac? ( || (
-		media-libs/flac
-		media-video/mplayer ) )
-	mac? ( || (
-		media-sound/mac
-		media-video/mplayer ) )
-	mp3? ( || (
-		media-sound/mpg123
-		media-sound/lame
-		media-video/mplayer
-		media-sound/mpg321 ) )
-	musepack? ( || (
-		>=media-sound/musepack-tools-444
-		media-video/mplayer ) )
-	wavpack? ( || (
-		media-sound/wavpack
-		media-video/mplayer ) )
-	wma? ( media-video/mplayer )"
-
-src_install() {
-	python_doscript dir2ogg
-	doman dir2ogg.1
-	einstalldocs
-}
diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
new file mode 100644
index 000000000000..2ebce1e4d05d
--- /dev/null
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1
+
+MY_PR=$(ver_cut 1-2)
+DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format"
+HOMEPAGE="https://jak-linux.org/projects/dir2ogg/"
+SRC_URI="https://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="aac flac mac mp3 musepack wavpack wma"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=media-libs/mutagen-1.11[${PYTHON_MULTI_USEDEP}]
+	')
+	media-sound/vorbis-tools[ogg123]
+	aac? ( || (
+		media-libs/faad2
+		media-video/mplayer ) )
+	flac? ( || (
+		media-libs/flac
+		media-video/mplayer ) )
+	mac? ( || (
+		media-sound/mac
+		media-video/mplayer ) )
+	mp3? ( || (
+		media-sound/mpg123
+		media-sound/lame
+		media-video/mplayer
+		media-sound/mpg321 ) )
+	musepack? ( || (
+		>=media-sound/musepack-tools-444
+		media-video/mplayer ) )
+	wavpack? ( || (
+		media-sound/wavpack
+		media-video/mplayer ) )
+	wma? ( media-video/mplayer )"
+
+src_install() {
+	python_doscript dir2ogg
+	doman dir2ogg.1
+	einstalldocs
+}
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index d69c9ef77914..d1a393f5e9f8 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r1.ebuild 1801 BLAKE2B f3ff7a8d3d560b5649644757e8a219aa922f68fbe962f9a2da99c3d8fa6a04392dc37332cc268e384ff096881cadcacd8c13f74ba882365448c04765bd298280 SHA512 94ee48b2c57ee907718595ab5aa5ff1620af8cd354c50ea82c9f3d3f0538d8476a966d3a82982e9321c390c53a33db45a95f52d076318ed47af6a7ee727a0242
+EBUILD easytag-2.4.3-r1.ebuild 1802 BLAKE2B 10882d7f51a7be23227fc4c5606737e6d626e633bf185e82b7ebacbe5f7de0f4ff0affd7177989adc9f55a6007b0e733062b9c3a95d09b96f3f35a884691e2e6 SHA512 72793dd60c00c1af19b4e9c8040273e7098bf1d12ad93f8fadfe388567a61eecd9414346cbf5400aebb5e9aea919b46e67e3d0f3d61c773115275563e912060e
 MISC metadata.xml 514 BLAKE2B b5fdb67baedcef2a155492cf00b63b35ae13c7fe214ba657722043bf824e607dfdf3d50deeb24c4ebb2cc704b7deb41d66c8ea8aa2f3b5911a72cb833b9e05a4 SHA512 eb53f395ef50eb4a86865629809332930907f459cd3b7b2d052727e4c25a27fd9e1acd9660fc354eb16ce7f6ff41e323689548e8b8a671e0878344cc0eb9ddc9
diff --git a/media-sound/easytag/easytag-2.4.3-r1.ebuild b/media-sound/easytag/easytag-2.4.3-r1.ebuild
index 3dd2d70b7e1c..ff38eae74dc9 100644
--- a/media-sound/easytag/easytag-2.4.3-r1.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
 RESTRICT="!test? ( test )"
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index f8ceacc82e6a..a35cf011ed38 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
-DIST elisa-19.12.1.tar.xz 1385248 BLAKE2B 3c3aa474e58abc5e5a379c7eedef8064e77cf62c183ab01adf5d4023d73ba906ad8c3ec8ef1fe9c1e717b578150f06f55a8ef7bba0cc3d7a5e5e5535f8310393 SHA512 5ce68c523ae6406dda0e8a04c520a7b4a0c7c8085fec95e24a69021eddd5d57a62cb300e22416d0e0184a52d7000328da072c640f867bb8ad1612adf12b32d2f
-EBUILD elisa-19.12.1.ebuild 1626 BLAKE2B 014e9201c209bbcb28a238d1a8b085bddef7f98703a4a7a808d9d06269d34f7f41522deceab9b51c7fd3db10ede41c401add42d9f5d5d33665f604022b28c256 SHA512 bc9fdfb50dd0a032517d37b6c3322858156dfd08fb1d5757d519806b7ad9dafad270efec39403309428c1a57eaf1311b10e6528764a4416ca182f5903e17859e
+DIST elisa-19.12.2.tar.xz 1386192 BLAKE2B 3a4f5b60557b3da9125a8b2f591dbaf7adeba18fb7c0d1e15411103ea4a3d2497a46536f34221f69a7d478076fdcc1dd6fe778c05296bba0d199edb11cc2d07b SHA512 0600ca545be82248f8e301f01cca17620e705b643e545d050e655d29f6558f64eaeb88cb1cd0f9cc5a84e7aefd1c19de04b90d80c03966aaeb3d785c40213eae
+EBUILD elisa-19.12.2.ebuild 1626 BLAKE2B 014e9201c209bbcb28a238d1a8b085bddef7f98703a4a7a808d9d06269d34f7f41522deceab9b51c7fd3db10ede41c401add42d9f5d5d33665f604022b28c256 SHA512 bc9fdfb50dd0a032517d37b6c3322858156dfd08fb1d5757d519806b7ad9dafad270efec39403309428c1a57eaf1311b10e6528764a4416ca182f5903e17859e
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-19.12.1.ebuild b/media-sound/elisa/elisa-19.12.2.ebuild
index 5f27760cd150..5f27760cd150 100644
--- a/media-sound/elisa/elisa-19.12.1.ebuild
+++ b/media-sound/elisa/elisa-19.12.2.ebuild
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 09f5a6d0bee7..ec9c4ba4a860 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,3 +1,3 @@
 DIST exaile-4.0.0.tar.gz 3635774 BLAKE2B 91a5a0a4b8f3c55ec1c8f6487f30bbc8193b1e8b861bbc4bf3cba18dcef91c8a58c937e7a581378eec9da518565826c35e55b7ab157b7ee4634d36cd71a85c4e SHA512 50ab8ec7a65dc431f2bc71a302d21e59ac3d5939b89a90ec161527e1d5c0b80b8c396f8f323b2959e0b807f577e021863fe423bf26a8f7165a6dd112afca6e45
-EBUILD exaile-4.0.0.ebuild 1809 BLAKE2B b799a034b2784190ed920d3c03cc6986be811b0d738b3ad67e632cb01edbb5f398b741d04d947c4808de4c28ea76972ce1139da89c9908e9a0638f688473ef16 SHA512 f8a6621eb7829c469db9f2cb4aa7e3860bb19c2ea664c10934b0c4438b868f9a3f0d7dd29f9e8ad1e831b9121464d8de635f7c4006d3c006d3b507913d1defac
+EBUILD exaile-4.0.0-r1.ebuild 1887 BLAKE2B 4c36fd07e82e075504e1684c1e8e82f97d5a5a6a148d6a79ba018845c7b4252eba654fd921e4887e89264a837e5e79de82ecc2b994ce018b26d8df5711767e28 SHA512 657b04678257dcb8f1cf287ff630ffe20b67fc5a2cf771c265105e3b8abec2ad6422658af4eba03a0954d2952bda1bce98ee12c4728685c3bf1226b687da3489
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.0.0-r1.ebuild b/media-sound/exaile/exaile-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..5fefb08686f1
--- /dev/null
+++ b/media-sound/exaile/exaile-4.0.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit python-single-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
+	KEYWORDS="amd64 ~sparc x86"
+	S="${WORKDIR}/${PN}-${PV/_/}"
+fi
+
+DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
+HOMEPAGE="https://www.exaile.org/"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="cddb libnotify nls scrobbler"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=media-libs/gst-plugins-base-1.6:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+	media-plugins/gst-plugins-meta:1.0
+	>=x11-libs/gtk+-3.10:3[introspection]
+	cddb? ( dev-python/cddb-py )
+	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.13.2:3[${PYTHON_MULTI_USEDEP}]
+		>=media-libs/mutagen-1.10[${PYTHON_MULTI_USEDEP}]
+		scrobbler? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+BDEPEND="
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+RESTRICT="test" #315589
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_compile() {
+	use nls && emake locale
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/usr/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale)
+
+	python_optimize "${D}/usr/$(get_libdir)/${PN}"
+	python_optimize "${D}/usr/share/${PN}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/exaile/exaile-4.0.0.ebuild b/media-sound/exaile/exaile-4.0.0.ebuild
deleted file mode 100644
index 57c248e3ab85..000000000000
--- a/media-sound/exaile/exaile-4.0.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
-	KEYWORDS="amd64 ~sparc x86"
-	S="${WORKDIR}/${PN}-${PV/_/}"
-fi
-
-DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
-HOMEPAGE="https://www.exaile.org/"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="cddb libnotify nls scrobbler"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
-	>=media-libs/gst-plugins-base-1.6:1.0
-	>=media-libs/gst-plugins-good-1.4:1.0
-	>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
-	media-plugins/gst-plugins-meta:1.0
-	>=x11-libs/gtk+-3.10:3[introspection]
-	cddb? ( dev-python/cddb-py )
-	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
-	scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-"
-
-RESTRICT="test" #315589
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_compile() {
-	use nls && emake locale
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/usr/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	python_optimize "${D}/usr/$(get_libdir)/${PN}"
-	python_optimize "${D}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 41ab07442a59..5dd2dda394d6 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-music-3.32.2.tar.xz 1391112 BLAKE2B ec64d48bcc137c69df77d9d9fadb3fa5c1809850e7a434d501cf6fd680500e57a4e6946ab591db9b715e728f0274f37b659afce53fd9213b3cf74f329f4373f3 SHA512 633748dcb5cf839f29059fd9bdd5283c455a4157d6c004168d9ef80352b83be3db547377034d0d78af0b6a84fec6fb941888bd53aa14c8bf51da880f04170a23
-EBUILD gnome-music-3.32.2.ebuild 1967 BLAKE2B 777989a351397cb5bd4341c4428c6821ac891c9467f2ffe288be41f325f6452a65b67650c7dd07df82f88b79fd313b41131ee31016ce8c6622b18a4cc61d3629 SHA512 cc130173d52de4d8f6823e5dfec8c5d0a6b0452fe6b5251afe4e59329c4423b4f89daea093410115bc6b7e98314132e69ee2602d8f1f5b3bc6a644fee1beb204
+EBUILD gnome-music-3.32.2-r1.ebuild 2010 BLAKE2B b3b123804ae70083bd1196e164edee687a1c3142db14426b60b34417af6a042e86975e3a08f659b92c8683e5dc6f0a3a66dcce804894ec0827748ab1590baca2 SHA512 901c7210a21a1b6702a8513250b83946810e547529536ffceae88cb66e95a29012e058333d75c55c56c01375d8bd940983c2a157e47c3f5f63d75fda3c84f83a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild b/media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild
new file mode 100644
index 000000000000..e461ee6710e5
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.32.2-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="amd64 ~arm64 x86"
+
+DEPEND="${PYTHON_DEPS}
+	net-libs/gnome-online-accounts[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.23.1:3[introspection]
+	>=dev-libs/libdazzle-3.28.0[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=app-misc/tracker-1.99.1:=[introspection(+)]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/grilo-0.3.4:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.8:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+	|| (
+		>=app-misc/tracker-miners-1.99.1[gstreamer]
+		>=app-misc/tracker-miners-1.99.1[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"/usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/gnome-music/gnome-music-3.32.2.ebuild b/media-sound/gnome-music/gnome-music-3.32.2.ebuild
deleted file mode 100644
index 827ced270df9..000000000000
--- a/media-sound/gnome-music/gnome-music-3.32.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="${PYTHON_DEPS}
-	net-libs/gnome-online-accounts[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.23.1:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=app-misc/tracker-1.99.1:=[introspection(+)]
-	>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	>=media-libs/grilo-0.3.4:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.8:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		>=app-misc/tracker-miners-1.99.1[gstreamer]
-		>=app-misc/tracker-miners-1.99.1[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-RESTRICT="test" # only does desktop and appdata validation, and latter needs network to validate screenshot from https
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index ea4d248d1c3b..d267e4db2dd0 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,3 +1,3 @@
 DIST gpodder-3.10.5.tar.gz 1000492 BLAKE2B d3c1381fa613e018c79995a5b5d95958096dab49d4b4d9012e8741efe754f7f9db82e7fc46527e1fb837ce8fbfd3c14d58f8af64f96e51c5750b56402767ddca SHA512 056375d7a21f64e691bd62676d575dfaa8a32e715dc4f7ddf7b0c1cb9e99f07cef5972de812765874afd5a8e8adf220eb7b969afcc8dea1e2e3a76be8886c9cc
-EBUILD gpodder-3.10.5.ebuild 1590 BLAKE2B 260a65e14435dd8439f83293f51c4524ea782267716e6bb370b61b0a72e3992856bd7dd305573704ce772125da0f20500a20cf3cf8470022b928ed7b4c575263 SHA512 a6f5934545a29a8c2b80c8726bcf42ed4ef468f2d625ae4fd2e9ee390cc015b10e67eced4525eba49c579f0bbece7d461e0253d2f7520b36d8ff5bfe3c6af9e2
+EBUILD gpodder-3.10.5-r1.ebuild 1680 BLAKE2B d3cd73a68be7150ce5373d6ba12bc606ba098b04c2b6e029409863d4a7f386b4f734d06253ba8ad099d3e94d18aee5435866d528d714e1af45ac4ec5b3d45187 SHA512 b54953a312bbaf3052d55446ae78fa2d15cca3b2fa675a0dc3216c5740212621fb8eafeadcedbb6a5a78122bfdb74171bda05e79554d70d9f2d1d2e687737a74
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/gpodder/gpodder-3.10.5-r1.ebuild b/media-sound/gpodder/gpodder-3.10.5-r1.ebuild
new file mode 100644
index 000000000000..aaa2fb67b7c9
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.10.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth kernel_linux mtp test"
+RESTRICT="!test? ( test )"
+
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_MULTI_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_MULTI_USEDEP}] ) once they
+# support python3
+COMMON_DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/isort[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/podcastparser-0.6.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mygpoclient-1.8[${PYTHON_MULTI_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] )
+	')
+	bluetooth? ( net-wireless/bluez )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		dev-python/minimock
+		dev-python/coverage
+	)
+"
+
+src_install() {
+	emake PYTHON=python3 DESTDIR="${D}" install
+	distutils-r1_src_install
+}
+
+src_test() {
+	emake releasetest
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/gpodder/gpodder-3.10.5.ebuild b/media-sound/gpodder/gpodder-3.10.5.ebuild
deleted file mode 100644
index bb7216eba8f5..000000000000
--- a/media-sound/gpodder/gpodder-3.10.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A free cross-platform podcast aggregator"
-HOMEPAGE="https://gpodder.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbus bluetooth kernel_linux mtp test"
-RESTRICT="!test? ( test )"
-
-# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
-# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
-# support python3
-COMMON_DEPEND="
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/isort[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	>=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	bluetooth? ( net-wireless/bluez )
-	mtp? ( >=media-libs/libmtp-1.0.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/iproute2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-apps/help2man
-	test? (
-		dev-python/minimock
-		dev-python/coverage
-	)
-"
-
-src_install() {
-	emake PYTHON=python3 DESTDIR="${D}" install
-	distutils-r1_src_install
-}
-
-src_test() {
-	emake releasetest
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index ab0a297accc3..30789bbaecca 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,5 +1,5 @@
-DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
 DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
-EBUILD grip-3.9.0-r1.ebuild 1124 BLAKE2B e633705cc9d607ffa9ffcfe7d34ad36cd366d0cbec773d454ec6b7c56c86837112b3edbbd2d769c534c18b320a4265844e8e434d8a9cbe14068ea70c3a4a1c88 SHA512 5585c26442a7c379313964ac351b2097023fedc92e434312a14baf57e93d62443e3b4a9a01b9fba0cd7fec3ea66a8aaee4a1506b03821656ff180d38d0d9df59
-EBUILD grip-4.0.1-r1.ebuild 1137 BLAKE2B 9714bdcf0b96c4dedc8eeef0c9ad8f1ac2d42f3a6eb34b9375ee0e2b2443e5a8228d81c2989abcf3e9f7239065b11ecc2b1a19219e07c659f8630e83f1dbb72f SHA512 d25736c87d8a8c463834c6340b473cd55a64f86b5a7801aa4f851de8058204a522ae864e881fe304c46914b0289aa47188be6a3910f5cf4592a8c6bb72cd116b
+DIST grip-4.1.0.tar.gz 1208833 BLAKE2B 2ec7913abaef2fc91227e47aee3f729cc8d2d5db63392e271ea8fc8176117ce12bbe0c0644527c6d701906b865da3aba09f4b2ee8c804263789072eae638eef7 SHA512 c3a0010a96e5edfe7bf41f69938a4e0d5fbe08c477d01ac85eccd9a56c0a9b9f3c4b5fdcb661b0257721e941e061b6f2df3685f81926d1c54838deb86f015cb5
+EBUILD grip-4.0.1-r1.ebuild 1133 BLAKE2B 04c5d730635fb2df6a452a381c0743a7ead009fa2c98b823efdb5ff1c64d5a071b8f6cd9458850a0ba9937f64c02c043511b95d8c683d107841ac08c0610a9e6 SHA512 51c4a5c3e014bd315a95216b517f26d23cacaa5c43b36968e6302b73f253a4538dbba1d1e74bd25e4a8d01f7c5427eebca679e3e1b4ee7c9ea9cccec39869bcb
+EBUILD grip-4.1.0.ebuild 1070 BLAKE2B 5efab90df7f66573eeb880f4173910a6e3e307136fb0af110c5cb64f1a1556503734c01ae2a1487eeb47b2641a254f564916e4cf847e9d86000c41712a6daf98 SHA512 b22883a262820fd75f85ecdf23d00b8965e2940f9e1b87b9e59367d63790810418000bd6e638ae0e33c5ebec2659902e5b952bfcae14ef8de9b772e8e8f96ef9
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.9.0-r1.ebuild b/media-sound/grip/grip-3.9.0-r1.ebuild
deleted file mode 100644
index a4f672fef19d..000000000000
--- a/media-sound/grip/grip-3.9.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf \
-		--disable-werror
-}
diff --git a/media-sound/grip/grip-4.0.1-r1.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
index 4a2a041dcddc..c89721d90b02 100644
--- a/media-sound/grip/grip-4.0.1-r1.ebuild
+++ b/media-sound/grip/grip-4.0.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/grip/grip-4.1.0.ebuild b/media-sound/grip/grip-4.1.0.ebuild
new file mode 100644
index 000000000000..41737016470b
--- /dev/null
+++ b/media-sound/grip/grip-4.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	dev-libs/glib:2
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf
+}
diff --git a/media-sound/gst123/Manifest b/media-sound/gst123/Manifest
index 8a646a7d4f95..763e15ec26ce 100644
--- a/media-sound/gst123/Manifest
+++ b/media-sound/gst123/Manifest
@@ -1,5 +1,3 @@
-DIST gst123-0.3.4.tar.bz2 123399 BLAKE2B 3d772affc5d1c8c16daad98ac9a2ef0794cf808391dbf5bb486a33d39bd2bab3d6fe077307a9b8c8cfeb15899b8d2d7b95bf954d5b0e5ae3e0b6c9e40dcd0b6f SHA512 7a5afddd4337b9d843949f49231b64bbc0390b97c40caa3cdac1fe0fd2a7e8a0ce01a77817735770b7a524459daa7e61e79e25c2e3e33769fd29e535d39d866f
 DIST gst123-0.3.5.tar.bz2 125468 BLAKE2B c8e6d9956f4371fc70d43768f0cf537b1c7281b49b3426be4d7b16f6f4c80057e50068f26546a93050d9e0c08284a33264e2a61aeaddab34ec1e09188f2145e3 SHA512 a967e4ba00b9ef744aa7a80e24fb7aa452c29b0b024a3bb446570ae9254ea295563deae1a000e9d363f57ce7aa11e537b124ccc672a98bf3230d371dcfb7e4ee
-EBUILD gst123-0.3.4.ebuild 571 BLAKE2B 198ca0749851ccd8fd380c8baea2acef3af020833d41a76c5711a560910d4a16203585f5dcedcbc7efe9c180985abd2c1d5b5fd4293338f9d939103b39636d81 SHA512 be34bfed4e76199c71ad4dc90c3e76ef37d95b31604b961f12b06b02d09c04a40164dee26e1b725dde9a0facf961cbb7ae68ec2366c94198a8632be997f3917a
 EBUILD gst123-0.3.5.ebuild 571 BLAKE2B a98be522350e4a200d4e11f1b8f4338c2aa483f252854bc2e5ef65892045771685489c3d718c1d42f58a399e8f92b2a9a6870d134df5df3c76600ac7e0fd73fd SHA512 60b697a89fda50eaa056465c37d272f2f0b0df2cf21b9b9f0ea6ac2866129ab9bebe9a7cbbc2daf02c190f83cffd15324b801181c6cfa18a6c8d006732c0493e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gst123/gst123-0.3.4.ebuild b/media-sound/gst123/gst123-0.3.4.ebuild
deleted file mode 100644
index 961e5e14b285..000000000000
--- a/media-sound/gst123/gst123-0.3.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A GStreamer based command line media player"
-HOMEPAGE="http://space.twc.de/~stefan/gst123.php"
-SRC_URI="http://space.twc.de/~stefan/gst123/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-libs/glib:2
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	sys-libs/ncurses:0=
-	x11-libs/gtk+:2
-	x11-libs/libX11
-"
-RDEPEND="${CDEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
diff --git a/media-sound/gtkguitune/Manifest b/media-sound/gtkguitune/Manifest
index 85436dff54c5..45ac7d50c2d2 100644
--- a/media-sound/gtkguitune/Manifest
+++ b/media-sound/gtkguitune/Manifest
@@ -1,3 +1,3 @@
 DIST gtkguitune-gtk2-0.8.tar.gz 660808 BLAKE2B b71a6d5ca8508da3b305b81b3c45f2236676bea5c560404a557b48e9ac3a8ccc9f7b56d7c674e1def041ac47dd8e4e5c730189834e0a14ecb67d43243f3bb8da SHA512 40f23e0661c87e3723a127fd2ceb0acc031b548809e99871611c2dd05140a8ffedbe48c52853a5ff43c7175d77de0f90e5d94d850f999aca29336e055247cf2a
-EBUILD gtkguitune-0.8.ebuild 778 BLAKE2B 8501dad086bb213bc1fa4274d4196d16415246472874e33064424bdd996f277111d80ccca542d606c8564b6e11e6ef491a305cd4890482e32bdf354ac316d6f9 SHA512 0749bca3fecded5b87947e311c16fc990efaa41dd7c49cad1e46d0778438b3c72bfd6e85723fe3e01593ee59d87232148abe4510df6cf22be535c47f50419f13
+EBUILD gtkguitune-0.8.ebuild 795 BLAKE2B 68bde64fca0c30e43f26fbee06c478bcdcc7a38b677497ad21767757f3caa0895649518e924f54063a7692feda5d15df0f458c42170f175765fdd7ab99d048c2 SHA512 d5613b36233b20ac946f8ea3c24c54ee3e54611059fcb3c3c7d0735511164c293bef7369684160db6444051f0a4da459b0eb4ca8e314f03ede3c3a19bb566547
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gtkguitune/gtkguitune-0.8.ebuild b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
index ff2d89b1b4bd..9be8c2d1ca93 100644
--- a/media-sound/gtkguitune/gtkguitune-0.8.ebuild
+++ b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils flag-o-matic gnome2-utils
 
 DESCRIPTION="A guitar tuning program that uses Schmitt-triggering for quick feedback"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${PN}-gtk2-${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
index 9140b8138603..338ba7824df8 100644
--- a/media-sound/jack/Manifest
+++ b/media-sound/jack/Manifest
@@ -2,5 +2,5 @@ AUX jack-3.1.1-add-cddbserver-musicbrainz.patch 403 BLAKE2B 573b751a757ac3783c48
 AUX jack-3.1.1-python26.patch 372 BLAKE2B 77a3cb9adbc63937685e272aa73ecba78b3bc1d245205b343c536de8217789969e5e61d8347a2387e2cf966ed38350cd8f574281eeec34a8f8c359e297db2ffe SHA512 0dd27deeba07774be22a97ac87361f77c1aefd77e4344059d599dab531d416d550f2ab6c6715235387e3f25248b0938520cc8216c85741a8120194d463204de1
 AUX jack-3.1.1-setup-and-cursesmodule.patch 1827 BLAKE2B af11707f5171b5b97ec307083526bc09b4d53a1fa2fdf2bec517b91e19b779a83b7b6e9417e2f48b21364bd34c6ba4cecf5445a15e4ac07d74bfb07b20ce9dc9 SHA512 eb2ad68ccf467495ebab9a9bbe3c5d4b84cfe6dbf167820fc89685ec02f8104046aea74d1031fa9bff10ba2755cfd1f00b044250dcef2d16b13aaf86c6db0044
 DIST jack-3.1.1.tar.gz 318119 BLAKE2B 20ab3aa16cf9f52e23fa9e11d0aea2c31d97afe546e7c199758363d579b99f39c5c864156e8727e04ef4d573ed5398c96916a19e69103bb0998e94526f475a1b SHA512 e34bec0ae89a7619e1f446d1259be06415f57697d1b925799d00554940b4cb6cb40eba9e6e7cf9f2f9eacddbed9fe7a9a48e395530c8a701be3979162a9379d7
-EBUILD jack-3.1.1-r2.ebuild 1083 BLAKE2B 7efabf3e2729f95f4d88e8e01714e59e5e2b7977dd483d1847dfa13697e386b826b90cfda4cfce36a2f8bb996f518a73e9195f2b3c34d4b8b37601e06bb8ca20 SHA512 e980aea0194bbaca7e637258363e8a1c2ef481726d4d89a64125a2bc4970fe4757c5fad14c6ce600eab6cb6367f89872323dbca9c2450fee770d1d85c0521cf6
+EBUILD jack-3.1.1-r3.ebuild 1137 BLAKE2B c0e64c8ee86ef15c3d59b1aad92071b4b398a6ca4366707915cbbe9c6295181419b2d28f41a7a47fa2d858d110f2cd8cc4c3125b8a46d305b4076755bc28b1ab SHA512 df1573d09fe049a48c5196f05aa1acb08f2983fa3abf4e196eb3f9c27886af67c17d64c248231f513eebcfc56ca42d0991803b55207ecfaba58103c2172b8c3a
 MISC metadata.xml 481 BLAKE2B 2bf3ebe03e9ab9b81437608a57cdae359c6afd2f083d19bb75a046fe0c2617e8fc7aa2d78d9ba7b190ac0f7749b71bb6498d12d95c6c62a3dd5c031d0a8af425 SHA512 da4b26c98824b1c2798f941ae95e0bcb4cdd6ef654dff4965d28b3fa8f3952a6162e028d793c9a9e9f866d74c22b3ed74cc99779efb84cd0eef5134c89dde8ac
diff --git a/media-sound/jack/jack-3.1.1-r2.ebuild b/media-sound/jack/jack-3.1.1-r2.ebuild
deleted file mode 100644
index 59c46f78ae98..000000000000
--- a/media-sound/jack/jack-3.1.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
-HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
-SRC_URI="http://www.home.unix-ag.org/arne/jack/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/cddb-py[${PYTHON_USEDEP}]
-	dev-python/id3-py[${PYTHON_USEDEP}]
-	dev-python/pyid3lib[${PYTHON_USEDEP}]
-	dev-python/pyvorbis[${PYTHON_USEDEP}]
-	media-libs/flac
-	media-sound/lame
-	media-sound/cdparanoia"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.1.1-python26.patch"
-	"${FILESDIR}/${PN}-3.1.1-setup-and-cursesmodule.patch"
-	"${FILESDIR}/${PN}-3.1.1-add-cddbserver-musicbrainz.patch"
-)
-
-python_install_all() {
-	insinto /etc
-	newins example.etc.jackrc jackrc
-
-	newman jack.man jack.1
-
-	local DOCS=( README doc/ChangeLog doc/TODO )
-	local HTML_DOCS=( doc/*.{html,css,gif} )
-	distutils-r1_python_install_all
-}
diff --git a/media-sound/jack/jack-3.1.1-r3.ebuild b/media-sound/jack/jack-3.1.1-r3.ebuild
new file mode 100644
index 000000000000..f1953b5662e6
--- /dev/null
+++ b/media-sound/jack/jack-3.1.1-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
+HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
+SRC_URI="http://www.home.unix-ag.org/arne/jack/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cddb-py[${PYTHON_MULTI_USEDEP}]
+		dev-python/id3-py[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyid3lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyvorbis[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/flac
+	media-sound/lame
+	media-sound/cdparanoia"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.1-python26.patch"
+	"${FILESDIR}/${PN}-3.1.1-setup-and-cursesmodule.patch"
+	"${FILESDIR}/${PN}-3.1.1-add-cddbserver-musicbrainz.patch"
+)
+
+python_install_all() {
+	insinto /etc
+	newins example.etc.jackrc jackrc
+
+	newman jack.man jack.1
+
+	local DOCS=( README doc/ChangeLog doc/TODO )
+	local HTML_DOCS=( doc/*.{html,css,gif} )
+	distutils-r1_python_install_all
+}
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index a336a9fa142c..4e4ad639cb74 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,4 @@
 DIST jack2-1.9.13.tar.gz 6485870 BLAKE2B 7acc0a1389af133dafa7368b4285c2a06607d84015601f2d8afbd63a9a08f40210f8206f2febbd0e5cc651513a59419e1d948a56163d2074c4b77da5edd84a52 SHA512 dd83a6535cf92a3c45b5ed31edda5f1cb4a6c1db2ac683d4ea709e226bc30d55b366ce80ee543dfaa600f871079f3754e9314124093e230dc7deeceb828de8aa
-EBUILD jack2-1.9.13-r1.ebuild 2321 BLAKE2B 7c07fec34cefdef500ec7ed3f3ac4e49aeffde1ea4898a27d0924b123f5a0019d29ae9ca946cb5d9c8a6e3bb693f3b2e3f1fdd6809faf4ddb8cc4d806945a0e4 SHA512 11e267b078eaca192b93409767edd091647ed04c9662838298bd4006368c169b7bbc9419b1c14308cb10de86e2ce92def814a88ad2bcbd92f58b9073cdf07783
-EBUILD jack2-9999.ebuild 2341 BLAKE2B 106530d8e45b59df47f06a88a9b9be47d7ac2dd7348fa36d5f6617caf6c1d5b0538ff0e4dd91c1dec20d8cd70752fb3407934b1fafb7b4c4d28b112bfc0ab8dd SHA512 88e1908c3882a56b47534c44d345467ad903ad4f32e0cc23264818f7f1622bfc1402774a0ff00e985d0d18b7ea0ed0375f35d77d18fd0ba31b75b540454f54a9
+EBUILD jack2-1.9.13-r2.ebuild 2352 BLAKE2B cd6d0f708dedb11076593c3cfb1d72fce2458a6b27d1723c09a9dee0637eb3a46b641c38adea4752d82c22db37b22cf5565e2ecf8d133cff876a1b3c48bd7437 SHA512 d29b1395590deb9c92f9be42574cc235cc0d36edd8165c0097965e43fde8116796d3304384451f26bbcde90eeb346befd8e50f912d0e4bcd5c6e0aa2779c98be
+EBUILD jack2-9999.ebuild 2382 BLAKE2B 58412cf7a418c318f773922fc21ccca6cc31d961bf5eeb8f9dba522935e42efd7673ee0f64c1b5c0d61dfb38364be3b12f0bf2f5ab9234bc26e36122c6b79413 SHA512 2e76b8c52caeae909291490eb9c3507940443ebec6f9e2776c6a8a33f0e167e13def5e5d2915450da275121d1fefb111c407a31ebe881f949d433f4c0ea3a5bf
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.13-r1.ebuild b/media-sound/jack2/jack2-1.9.13-r1.ebuild
deleted file mode 100644
index 33700572b3fe..000000000000
--- a/media-sound/jack2/jack2-1.9.13-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~ppc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:* )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--db=$(usex metadata yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.13-r2.ebuild b/media-sound/jack2/jack2-1.9.13-r2.ebuild
new file mode 100644
index 000000000000..ee3545f515bb
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.13-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="amd64 ~ppc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+CDEPEND="${PYTHON_DEPS}
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
+	metadata? ( sys-libs/db:* )
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=no
+		--db=$(usex metadata yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=$(usex ieee1394 yes no)
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 4b1b8633232c..28cd775b1150 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -44,7 +44,11 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 RDEPEND="${COMMON_DEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	dbus? (
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	pam? ( sys-auth/realtime-base )
 	!media-sound/jack-audio-connection-kit:0"
 
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
index d6a17db1c555..7921f139346b 100644
--- a/media-sound/klick/Manifest
+++ b/media-sound/klick/Manifest
@@ -1,5 +1,5 @@
 AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d68ac5160e962e0178637a3406221019c07d4a4035aa4baba00c4d883c005f6190f92cd81888277531ed232c41 SHA512 15d5fadd81f5dcb837ac4f91d62b99834fd192a508d5df9647df994b65807fc3de25eaceccad9b39535dc56abb83feb2f48109cf46d95d1ddb68a8212d096ad3
 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1
 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f
-EBUILD klick-0.12.2-r2.ebuild 1084 BLAKE2B d30ec67ccf5c22d13aac41363d2e5e923d2d51fcaa92e0276afd0a3fd7d79fbe86fc73d883c5ff54c38b83ac772aacaf2e0aac84cd28886105b167523fc54459 SHA512 82ea618508069d17bd3682835a723c55450ef025898a22a5ad16e5a75c1d456483135db7501e667baeeed6b775c1aa200ac9af2adf7ca1f9ad71b2eb6ac18767
+EBUILD klick-0.12.2-r2.ebuild 1078 BLAKE2B e7812de5895b73e71231bdda83ec8ecefaaa72e4f2e06709cc3c40538d0ba656e3cba1267586653cb56bd91bad16cc1fc5e738aa310189a44f2d5b3a4832067c SHA512 2a235742ca754c90e371b13e8d911c7c1f808a40b2356eacab5f1591306feee4dc743b0771182fda1c0e1254af17c5f2de98dbddd0204f13e430e79d109ecefa
 MISC metadata.xml 515 BLAKE2B 2a74e5109388a6bf402aeb0a96682b562a53d50aaec99a52163cc3b6744eafdd8be790af99399871af1d87c20afebc80d900304769303301f26b30df2551441b SHA512 fe2a6ca368b2aa748ba1064bbe484849a502a43f7616456c966fd011999ea73aa607c5ffe8cdb1e53e4400c8276fe3e732733f55b0f0143e140cecffaba8522a
diff --git a/media-sound/klick/klick-0.12.2-r2.ebuild b/media-sound/klick/klick-0.12.2-r2.ebuild
index 6bf7cadb96b2..2cb01450f33a 100644
--- a/media-sound/klick/klick-0.12.2-r2.ebuild
+++ b/media-sound/klick/klick-0.12.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-any-r1 scons-utils toolchain-funcs
 
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index e6fa862a52f3..c35e039787e6 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,12 +1,11 @@
 AUX 5583.patch 8876 BLAKE2B 5a338bed4da06311561dc2ff8bf41317d9e8d2a9218ab570e4396840637a7a4aef3d52b15eb87d388fb9ed76f8a9685036e2c758640c69cd65f910c2408bf4e8 SHA512 464e8dd526f39c2f253d2f3b5a6f932c50a17c7774df0ae076e7b8ae5379e3e5588359fe15ca73825ea56156b5a663178e48ef0d950dcef53ce60808c324ca72
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
-DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d SHA512 81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
-DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
 DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178 SHA512 4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
-EBUILD musescore-3.3.4.ebuild 2449 BLAKE2B 93b00e73bb9e230a1fa5be81fb504fa18b092960136b6921bfc85bfe693a41c39061c72286b5367911a922faf84fd1c8dd3ebeea255f690e4e41be78cb4b281b SHA512 c72fc45cb8999c50a07fec94d953526948f9ed8e2ce2a2286e0ee9543c80cc8d8dee02b2c55c98c943c1b606f0eb598ad4875467c9bc70ccd702fa2713e378a1
-EBUILD musescore-3.3.ebuild 2421 BLAKE2B 71b05ee46489698fa8b8e723360f886f372d900a8bf18a7a8a1deaf9e0c91bc14c6b8a377b00f0122a426e057e070fd35678b492040e6dc57e0cabd17a5514cd SHA512 ae93fd993c1315310f08536a4a822a1fb755332ca09d867cd0053536c98403954832e420168159c8888e69c0a75aa60ce32f5027a08140b6a893ddbb7351e77b
+DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
+EBUILD musescore-3.3.4.ebuild 2439 BLAKE2B fdc912a5a998915acf50550c7b27b2b6340c0e39fbff62c3fa76f2a9bb465b03b4f3001a9f258971b5ae3de8cc0e4334b1222f6c6311e527d44b94ba042088c0 SHA512 d7e09536d4054b6655e86942c7eaa017698bdfd89e2ce00ad29189d8036391d8a04b3c53eae647445b51d7e07e06f7a204012007e2e6bb24c399aa781498cf44
 EBUILD musescore-3.4.1.ebuild 2686 BLAKE2B 2e05fdaea69cd0afc4275272f9c125cf409dca4f3aec36189cc051a6505e93974887c6a8ff54da6074001c1c53cb408251b8800717b6fa0e3810ae4a75e70ecc SHA512 2dc3514c8aaca961ef7e748df718a626ca6f5dc241eb736f6c155e59650f8a548f6dd470a29e0b94fa2719fd657c1d4395c780a56236686b86b3d47934cedf1f
+EBUILD musescore-3.4.2.ebuild 2686 BLAKE2B 2e05fdaea69cd0afc4275272f9c125cf409dca4f3aec36189cc051a6505e93974887c6a8ff54da6074001c1c53cb408251b8800717b6fa0e3810ae4a75e70ecc SHA512 2dc3514c8aaca961ef7e748df718a626ca6f5dc241eb736f6c155e59650f8a548f6dd470a29e0b94fa2719fd657c1d4395c780a56236686b86b3d47934cedf1f
 EBUILD musescore-9999.ebuild 2678 BLAKE2B f52b7a6305e4f6d8866da7af899a13044b924f0a7aca26832042d6afbc14f3fef741c5ba11532db21763ad3c2a1b43fc3d10e134b65e7a6949fc1c35ae5bfcd2 SHA512 be0d219e8b6ae945aaa99c92afa8e1e04f82a30179c3eb2e34699224421b192e5d8a66338697e9affeb59a28013af30be6a612fae3784b10c357f756966b55af
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
index e0e03cdcb56f..d2084f031d14 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -16,8 +16,8 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+KEYWORDS="amd64 x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -47,7 +47,7 @@ DEPEND="
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
+	sf3? ( media-libs/libvorbis )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 RDEPEND="${DEPEND}"
@@ -79,7 +79,7 @@ src_configure() {
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DSOUNDFONT3="$(usex vorbis)"
+		-DSOUNDFONT3="$(usex sf3)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
 	cmake_src_configure
diff --git a/media-sound/musescore/musescore-3.3.ebuild b/media-sound/musescore/musescore-3.3.ebuild
deleted file mode 100644
index f697f3706776..000000000000
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DSOUNDFONT3="$(usex vorbis)"
-		-DBUILD_WEBENGINE="$(usex webengine)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.4.2.ebuild b/media-sound/musescore/musescore-3.4.2.ebuild
new file mode 100644
index 000000000000..fb4ff90af180
--- /dev/null
+++ b/media-sound/musescore/musescore-3.4.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
+	omr? ( app-text/poppler )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	sf3? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAEOLUS=OFF # does not compile
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_CRASH_REPORTER=OFF
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PCH=ON
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PORTMIDI="$(usex portmidi)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TELEMETRY_MODULE=ON
+		-DBUILD_WEBENGINE="$(usex webengine)"
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DHAS_AUDIOFILE=ON
+		-DOCR=OFF
+		-DOMR="$(usex omr)"
+		-DSOUNDFONT3=ON
+		-DZERBERUS="$(usex sfz)"
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
+		-DUSE_SYSTEM_POPPLER=ON
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index dd4a4f5f29ed..f72c34fc897b 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,4 @@
 DIST picard-2.1.3.tar.gz 2995390 BLAKE2B dcb81cad62aba7915aeff321775452cef70819194a76530eb96a0a7b0009f7185d7652f77d07bb795b24939a3feb56b73a59d7377574b2c8f09f406ca7a88d81 SHA512 f082216a1a669ba689725c93859116e8a56991861219adb0e7c6ed4e5d621055268652820688de762f55b8672f19ff01afe5ac1ab7f79a640ea381272de9516f
-EBUILD picard-2.1.3.ebuild 1621 BLAKE2B 1c8be81ae8e25e5d2138d0d2312ffd559ee3c69339de19158b5d791cebc5d26d3174b8822c72beafac6a1717d63fca43a1500e7a607d5908a4dd265920b1e0ac SHA512 f7240b3dea11f56d608237932c3355dd79700aa38eedb4c11a70bdbad84c1ade7ae379731bc79cc288467ae50cf12aaa5958321c11a543e9b89c8085c730c29d
-EBUILD picard-9999.ebuild 1702 BLAKE2B afac69ba0f408f2cd9df2d939552dff799239bcda6d8d482da30d06336fbe50e6b8df229ebe7a257462317987087f6bb11449ea151a4f004686900fc3e2d7a91 SHA512 300fff51cecfc3adce011451636025168e91d5edce5c58060b7d5fc88a0fb5328fdb1b76fd827a4374accf054d83de90f84c1bebd18ca57130626989e8d9ec76
+EBUILD picard-2.1.3-r1.ebuild 1657 BLAKE2B fccc7ac46397e33ff9087da1bd8b3dc03d80ba758dc4abe21c7679977cb1bb8c12967a68c2abdc112f3ca1814030234269ea2a035f144409e218dab3bedf7a09 SHA512 93945e04da0957f96a77a77e670289ce7b9f962533c80c78b0a9f5e53a66384b4c6ae1d268cd088519c38c1da8d79a62154f60d11a908191c27c655597e6af5d
+EBUILD picard-9999.ebuild 1738 BLAKE2B 233f5965ecfa2f84ebff049b03bb961eec74fd4c9b2d13e04915c3882446bb0a3e8d229931852af5ccfcd76b9df3ff618fe5e99a716aac6daf87b8d2903161fe SHA512 7070c7ba182374053632d4c4e986f3f34acc9dbdb6fef040572213ea6bec35c42f2582060ae63ce2a300ac914d5bd2c9d40c97e2c903a87cfb2d69b1253f1d97
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.1.3-r1.ebuild b/media-sound/picard/picard-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..8b04ce903747
--- /dev/null
+++ b/media-sound/picard/picard-2.1.3-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+	')
+	dev-qt/qtgui:5
+	>=media-libs/mutagen-1.38"
+DEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+RESTRICT="test" # doesn't work with ebuilds
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+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_pkg_postinst
+}
diff --git a/media-sound/picard/picard-2.1.3.ebuild b/media-sound/picard/picard-2.1.3.ebuild
deleted file mode 100644
index f995845bc002..000000000000
--- a/media-sound/picard/picard-2.1.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${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
-	>=media-libs/mutagen-1.38"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-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_pkg_postinst
-}
diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild
index a937a75ec7a2..8ddfeb52fa15 100644
--- a/media-sound/picard/picard-9999.ebuild
+++ b/media-sound/picard/picard-9999.ebuild
@@ -26,7 +26,9 @@ BDEPEND="
 	nls? ( dev-qt/linguist-tools:5 )
 "
 RDEPEND="
-	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-qt/qtgui:5[accessibility]
 	>=media-libs/mutagen-1.38"
 
diff --git a/media-sound/pympd/Manifest b/media-sound/pympd/Manifest
index 643d90bb4f01..02d7435fa34c 100644
--- a/media-sound/pympd/Manifest
+++ b/media-sound/pympd/Manifest
@@ -1,4 +1,4 @@
 AUX pympd-0.08.1-desktop-entry.patch 1412 BLAKE2B 9a8f2a3d168b1cd11f36c32f138a698aba87207f80d67f70c5da60a65b8971c795c8a6b4c5d70e3ffed5ddf716b7b9d596ae88a16f41d22dc41bdd1a4bac21ad SHA512 3c6a4bc9f372f879acedb1285f42d2ed939f17751ab2eba0034b604f9b3a5157685afec1a53040a8d5010989a352dc05ec24b3036ad2148d17b619033d889deb
 DIST pympd-0.08.1.tar.gz 101120 BLAKE2B d9b0ea313818eee121762d0d0a047a25e52934cce1b7b2aeb19fe6de90d4603249fecaeb661e99a0039a5b9c22a3ee1af1c6938598a75265d3597fd681c2a744 SHA512 199ea794fbcd5d7678c079bcc07613c106fb43a423f05fb7ef624a41580c263ede147ff9c2f2a22f38a4f150f71d9ee99c99c7524278f8e98525f955233641ea
-EBUILD pympd-0.08.1-r1.ebuild 1247 BLAKE2B 4449e7b10a4c5ad7e6e468baa9bc63c7509d596db08717427df66c443a3b5978a4049bdeec6a94fa3f14a8f5fc90a68d1d35c497596fdc1df82872ecd9eb9ff3 SHA512 0dd88c3dd1ac596fa61667caaaf7d46c058ca98342b9c45ad8457a86372cff00fade9c30ea277ef6ce5cbb563b74d14898d00e8deb47f2d700b1a9b6889eedf3
+EBUILD pympd-0.08.1-r2.ebuild 1280 BLAKE2B 0af06fffe9ec47cafada0ef956a4dd92bba6ec6b470629c94572f1e09121dedb495ba788d7342f500141142afa480e91bc6f8292e77ded047ebf289634cedc29 SHA512 853247a9c684c6956dc142a70ecff5eb0c2267d99a24e310ee066e14ba50b1d9b80c334a7989fd565a22769625421cd42bbb9b9bdef68b67281d7994dcf542cf
 MISC metadata.xml 449 BLAKE2B 40764e2e0cb5cd61d61bb82ad1ae710be0d0dcafbdc1fd0518f77409de48cf8a7691b49c6a10ec8b5040433fcc33eec559d99ecc73f1448e16fe205fc9ce2abc SHA512 d3013665b1a81c7ca4f2dad97d0114417120280527fb76ebc1b2f87a982d6a756c148d249bbebe66437089b9116d3bfeb19631d34dcdea6d9f5d077753f40dd4
diff --git a/media-sound/pympd/pympd-0.08.1-r1.ebuild b/media-sound/pympd/pympd-0.08.1-r1.ebuild
deleted file mode 100644
index 183544630d50..000000000000
--- a/media-sound/pympd/pympd-0.08.1-r1.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
-HOMEPAGE="https://sourceforge.net/projects/pympd"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}]
-	gnome-base/libglade:2.0
-	x11-libs/gdk-pixbuf:2[jpeg]
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-desktop-entry.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	python_fix_shebang .
-	sed -i -e 's:FLAGS =:FLAGS +=:' src/modules/tray/Makefile || die
-	sed -i -e 's:\..\/py:/usr/share/pympd/py:g' src/glade/pympd.glade || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" PREFIX=/usr DESTDIR="${D}"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pympd/pympd-0.08.1-r2.ebuild b/media-sound/pympd/pympd-0.08.1-r2.ebuild
new file mode 100644
index 000000000000..597dce6dfe2d
--- /dev/null
+++ b/media-sound/pympd/pympd-0.08.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
+HOMEPAGE="https://sourceforge.net/projects/pympd"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.6:2[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/libglade:2.0
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop-entry.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang .
+	sed -i -e 's:FLAGS =:FLAGS +=:' src/modules/tray/Makefile || die
+	sed -i -e 's:\..\/py:/usr/share/pympd/py:g' src/glade/pympd.glade || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr DESTDIR="${D}"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 2640aa8af298..df66840e081d 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
-EBUILD rhythmbox-3.4.3.ebuild 3401 BLAKE2B f841ec2be65c595fb0cab80b367ab797ab8da957c44bfaa27dba5d60c8c7a55a70b285b061e0b013ce28aed07510e7a37c87a88791d244ed6b03a2bc24cbcd89 SHA512 4e90ff6bf6fa85569ec1e01edd92c62374f6ba00b64829ff84e482badaf13255808701096971c5a2513dd65ea6e9365a6050e36440025115196677c28ecf1cc3
+EBUILD rhythmbox-3.4.3-r1.ebuild 3446 BLAKE2B b2d0ae2bdbbc025b6ee86ff2940603a8221099e965c625b8aae80f5487fea99560edae867e51ced8a78a82d68590453f8bea7adfb651bd7ef6babead637840de SHA512 a6f13e9d6e2016289e26c32ef5215f7420d6256da34ac8a92d6b0325b987eae9fc2fd8eec3a003553e851f64bd3637b95206a229e2a5ef576ef7e4745b4593fd
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..5d67d46725de
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.7.8:2
+	>=x11-libs/gtk+-3.20.0:3[X,introspection]
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=dev-libs/libpeas-0.7.3[gtk]
+	>=dev-libs/totem-pl-parser-3.2
+	>=net-libs/libsoup-2.42:2.4
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
+	>=media-libs/gstreamer-1.4:1.0[introspection]
+	>=sys-libs/tdb-1.2.6
+	dev-libs/json-glib
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.19:3.0
+		>=media-plugins/gst-plugins-soup-1.4:1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	udev? (
+		dev-libs/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 ) )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3[python,${PYTHON_SINGLE_USEDEP}]
+		net-libs/libsoup:2.4[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
+	upnp-av? (
+		>=media-libs/grilo-0.3:0.3
+		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+# eautoreconf needs yelp-tools
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# --enable-vala just installs the sample vala plugin, and the configure
+	# checks are broken, so don't enable it
+	gnome2_src_configure \
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
+		VALAC=$(type -P true) \
+		--enable-mmkeys \
+		--disable-more-warnings \
+		--disable-static \
+		--disable-vala \
+		$(use_enable daap) \
+		$(use_enable libnotify) \
+		$(use_enable lirc) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable python) \
+		$(use_enable upnp-av grilo) \
+		$(use_with cdr brasero) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with ipod) \
+		$(use_with mtp) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check CK_DEFAULT_TIMEOUT=60
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+	gnome2_src_install
+}
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
deleted file mode 100644
index b018eac61025..000000000000
--- a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1 multilib virtualx
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	ipod? ( udev )
-	mtp? ( udev )
-	dbus? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.7.8:2
-	>=x11-libs/gtk+-3.20.0:3[X,introspection]
-	>=x11-libs/gdk-pixbuf-2.18:2
-	>=dev-libs/gobject-introspection-0.10:=
-	>=dev-libs/libpeas-0.7.3[gtk]
-	>=dev-libs/totem-pl-parser-3.2
-	>=net-libs/libsoup-2.42:2.4
-	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
-	>=media-libs/gstreamer-1.4:1.0[introspection]
-	>=sys-libs/tdb-1.2.6
-	dev-libs/json-glib
-
-	cdr? ( >=app-cdr/brasero-2.91.90 )
-	daap? (
-		>=net-libs/libdmapsharing-2.9.19:3.0
-		>=media-plugins/gst-plugins-soup-1.4:1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	libnotify? ( >=x11-libs/libnotify-0.7.0 )
-	lirc? ( app-misc/lirc )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
-	)
-	udev? (
-		dev-libs/libgudev:=
-		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
-		mtp? ( >=media-libs/libmtp-0.3 ) )
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-libmms:1.0
-	|| (
-		media-plugins/gst-plugins-cdparanoia:1.0
-		media-plugins/gst-plugins-cdio:1.0 )
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		>=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
-		net-libs/libsoup:2.4[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection]
-
-		dbus? ( sys-apps/dbus )
-		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
-	upnp-av? (
-		>=media-libs/grilo-0.3:0.3
-		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-# eautoreconf needs yelp-tools
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# --enable-vala just installs the sample vala plugin, and the configure
-	# checks are broken, so don't enable it
-	gnome2_src_configure \
-		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
-		VALAC=$(type -P true) \
-		--enable-mmkeys \
-		--disable-more-warnings \
-		--disable-static \
-		--disable-vala \
-		$(use_enable daap) \
-		$(use_enable libnotify) \
-		$(use_enable lirc) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable python) \
-		$(use_enable upnp-av grilo) \
-		$(use_with cdr brasero) \
-		$(use_with gnome-keyring libsecret) \
-		$(use_with ipod) \
-		$(use_with mtp) \
-		$(use_with udev gudev)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check CK_DEFAULT_TIMEOUT=60
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
-		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
-
-	gnome2_src_install
-}
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 9ff5447eb0e3..cf0c378395b1 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,3 @@
 DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
-EBUILD soundconverter-3.0.2.ebuild 1791 BLAKE2B 6e3fc703928965af3e6ee7481dd26598868a61f4d9146be78c007d432efe0a071322bcb9635236e5845c50ca21fd8386f810a9f150947fcd9aa751d7de8b13b5 SHA512 35cfe6248eef590a209599a31a28cbde50958923c696d720c14cb36065ff2149a3d36fc31ac06342e2c00c5c86f4cf6a35f6d25e17e144323b568e789a8d2feb
+EBUILD soundconverter-3.0.2-r1.ebuild 1827 BLAKE2B 7c9c3bbd2755db3b88676a8e4db20f5fa6901fa8e6e66cc43bde0c6f4047e0d21e20206008810b49b782a5d7a639517845eebe24a98ed464f7ac4bf7ffc40b33 SHA512 2441edc282b3b502d5c6eed8c68bd21637c2abed2cfa99f85536ecf273c95c731848d1e907984490c231ae7f49b5b6935839c5be16c4f62675cc55d8ddb65cf1
 MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..cc2b0688f896
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="https://soundconverter.org/"
+MY_PV="${PV/_/-}"
+SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="aac flac libnotify mp3 ogg opus vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/gobject-introspection:=
+	x11-libs/gtk+:3[introspection]
+	media-libs/gstreamer:1.0[introspection]
+"
+
+# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
+# List in soundconverter/gstreamer.py
+# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
+RDEPEND="${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+	')
+	libnotify? ( x11-libs/libnotify[introspection] )
+
+	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
+	media-plugins/gst-plugins-meta:1.0
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+	media-libs/gst-plugins-good:1.0
+	mp3? (
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+	)
+	aac? ( media-plugins/gst-plugins-faac:1.0 )
+	opus? (	media-plugins/gst-plugins-opus:1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+RESTRICT="test" # broken pot files list in 3.0.0 release, making src_test fallback to "make test" which fails
+
+src_prepare() {
+	python_fix_shebang .
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
+}
diff --git a/media-sound/soundconverter/soundconverter-3.0.2.ebuild b/media-sound/soundconverter/soundconverter-3.0.2.ebuild
deleted file mode 100644
index 845b2d2ce3bb..000000000000
--- a/media-sound/soundconverter/soundconverter-3.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="https://soundconverter.org/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac flac libnotify mp3 ogg opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/gobject-introspection:=
-	x11-libs/gtk+:3[introspection]
-	media-libs/gstreamer:1.0[introspection]
-"
-
-# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
-# List in soundconverter/gstreamer.py
-# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	libnotify? ( x11-libs/libnotify[introspection] )
-
-	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
-	media-plugins/gst-plugins-meta:1.0
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-	media-libs/gst-plugins-good:1.0
-	mp3? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-lame:1.0
-	)
-	aac? ( media-plugins/gst-plugins-faac:1.0 )
-	opus? (	media-plugins/gst-plugins-opus:1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-RESTRICT="test" # broken pot files list in 3.0.0 release, making src_test fallback to "make test" which fails
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/tunapie/Manifest b/media-sound/tunapie/Manifest
index 7614ebce1926..19c9b9fe18ae 100644
--- a/media-sound/tunapie/Manifest
+++ b/media-sound/tunapie/Manifest
@@ -1,5 +1,5 @@
 DIST tunapie-2.1.17.tar.gz 50165 BLAKE2B 564dcf6344eb3c40c4ab5e34ccf60de442dd4fb878a5fef656006a531742d110987354b728d991799e6dae74cfcbb5b6fdd1ac22e63687342aeb305260f6f47c SHA512 62215f99b863f3db24b78048302f8b2f54aa5b969e9ba09034e98227dcada3f561a1afcf5babd65dca7f251aeeba816352b252f9f8f22fdec77272d7583f7ce9
 DIST tunapie-2.1.19.tar.gz 48459 BLAKE2B 39ea016f5c17874fd885fef2663bb69730663dabf5f828e529c2673d47a98c5d53fc9b384a19b56600f022d0b0351ab118a81bbbe36db2eaf79d84e488cfc0f3 SHA512 6a53034e4172f8c96d6e1c92433a3d94c3e8b8bceb9587ff39bad5e7b97937ac000419c683474427ea293b7ba10d5e9dd845b4aa7eaad1a3bcc5b980d57e5669
-EBUILD tunapie-2.1.17-r1.ebuild 1063 BLAKE2B b304537180fedfe56302b3ba900e21804866f32c401c82a96bcb1dae91934cd686cda6bce853bd2fa358484f37995d7e2525c6cdcbc4c4b69e3e7270b22da821 SHA512 23ca1269bf8768e4cb397df7052c9785986de230d994ede06ab7f0bbffc60f2701a5db0b57911b27fd8e00c286858b38d2fdb619432c1f3c4fd97633461e1ec3
-EBUILD tunapie-2.1.19.ebuild 1063 BLAKE2B b304537180fedfe56302b3ba900e21804866f32c401c82a96bcb1dae91934cd686cda6bce853bd2fa358484f37995d7e2525c6cdcbc4c4b69e3e7270b22da821 SHA512 23ca1269bf8768e4cb397df7052c9785986de230d994ede06ab7f0bbffc60f2701a5db0b57911b27fd8e00c286858b38d2fdb619432c1f3c4fd97633461e1ec3
+EBUILD tunapie-2.1.17-r1.ebuild 1098 BLAKE2B 048470bb11127877c62948beb7d4b0d7f072539185c4524da95b6daf8040837d06cc69eee59898d5ff4bee671d88d59f73d53f6019a0c88a032af44024063b24 SHA512 d99f6a68a06ef19a0a777080235340b1e7eae336852aa82f157ec4f2bb2bb15b0d0040efeca316fef1567972be199cffca2cd584ca400945630751bc59c9479f
+EBUILD tunapie-2.1.19-r1.ebuild 1098 BLAKE2B 048470bb11127877c62948beb7d4b0d7f072539185c4524da95b6daf8040837d06cc69eee59898d5ff4bee671d88d59f73d53f6019a0c88a032af44024063b24 SHA512 d99f6a68a06ef19a0a777080235340b1e7eae336852aa82f157ec4f2bb2bb15b0d0040efeca316fef1567972be199cffca2cd584ca400945630751bc59c9479f
 MISC metadata.xml 330 BLAKE2B da4f15073d6c1a1c06c94e2a5698331bf5fea66719a1e55eba75d0bd40e0817dfbbe67b60af9dda0ee376827ac9ed2f29427520b3f27c697904e2c31657a2994 SHA512 cad1cb083e186bb3b2b34a0d061611a48a85ff7e4295fa5bde40cf7f17d27ea89cb5c09e92a8c4049bd02118215253f7648e1cde5741a7b89260fb9f1fa229a2
diff --git a/media-sound/tunapie/tunapie-2.1.17-r1.ebuild b/media-sound/tunapie/tunapie-2.1.17-r1.ebuild
index db38951688e3..c171a0b8d675 100644
--- a/media-sound/tunapie/tunapie-2.1.17-r1.ebuild
+++ b/media-sound/tunapie/tunapie-2.1.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="offensive"
 
-RDEPEND=">=dev-python/wxpython-2.6[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/wxpython-2.6[${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
diff --git a/media-sound/tunapie/tunapie-2.1.19-r1.ebuild b/media-sound/tunapie/tunapie-2.1.19-r1.ebuild
new file mode 100644
index 000000000000..c171a0b8d675
--- /dev/null
+++ b/media-sound/tunapie/tunapie-2.1.19-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="Directory browser for Radio and TV streams"
+HOMEPAGE="http://tunapie.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="offensive"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/wxpython-2.6[${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	default
+
+	# fix pixmap lookup
+	sed -i -e 's@../pixmaps@../../share/pixmaps@' \
+		src/tunapie2_main.py || die
+
+	# the original script requires more sed than code,
+	cat > tunapie <<-_EOF_ || die
+		#!/bin/sh
+		exec ${EPYTHON} /usr/lib/tunapie/Tunapie.py
+	_EOF_
+}
+
+src_install() {
+	dobin tunapie
+	doman tunapie.1
+	dodoc CHANGELOG README
+
+	python_moduleinto /usr/lib/tunapie
+	python_domodule src/{*.py,*.png}
+
+	doicon src/tplogo.xpm
+	domenu tunapie.desktop
+
+	dodir /etc
+	usex offensive 1 0 > "${ED%/}"/etc/tunapie.config || die
+}
diff --git a/media-sound/tunapie/tunapie-2.1.19.ebuild b/media-sound/tunapie/tunapie-2.1.19.ebuild
deleted file mode 100644
index db38951688e3..000000000000
--- a/media-sound/tunapie/tunapie-2.1.19.ebuild
+++ /dev/null
@@ -1,50 +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 eutils python-single-r1
-
-DESCRIPTION="Directory browser for Radio and TV streams"
-HOMEPAGE="http://tunapie.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="offensive"
-
-RDEPEND=">=dev-python/wxpython-2.6[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	default
-
-	# fix pixmap lookup
-	sed -i -e 's@../pixmaps@../../share/pixmaps@' \
-		src/tunapie2_main.py || die
-
-	# the original script requires more sed than code,
-	cat > tunapie <<-_EOF_ || die
-		#!/bin/sh
-		exec ${EPYTHON} /usr/lib/tunapie/Tunapie.py
-	_EOF_
-}
-
-src_install() {
-	dobin tunapie
-	doman tunapie.1
-	dodoc CHANGELOG README
-
-	python_moduleinto /usr/lib/tunapie
-	python_domodule src/{*.py,*.png}
-
-	doicon src/tplogo.xpm
-	domenu tunapie.desktop
-
-	dodir /etc
-	usex offensive 1 0 > "${ED%/}"/etc/tunapie.config || die
-}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index e8e0b8463699..ec7978e3cc07 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -8,6 +8,6 @@ AUX xmms2-0.8_p20161122-mac-4.patch 1632 BLAKE2B 5bc5c7d499df5faee2fc6b4307af182
 AUX xmms2-0.8_p20161122-perl-no-local.patch 697 BLAKE2B 86ab6bb3594fd45e9a9bdbd07d85d3740ed206eea24652161c7fbbdf620c98a6b002b646aba65a3f017e263bb82d6dc7b933fb53540012c2005d65dd2e667b06 SHA512 eb5afb39409c7c199a844d9452ab829a653d2a1ce8f5d9f1361fa995e851914d5a962d25d8116947a265fabc649f8560aa1947a24cf45d954da7743954fc3cd7
 AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
 DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
-EBUILD xmms2-0.8_p20161122-r4.ebuild 7595 BLAKE2B 934c3be5d48d1333599023aa8ce0fb8cd871a5c48a4c03a8f1b49d8efb0199c793d19c0d1b01d946bc4d5f6ad8bfcb27dc846d02d733c980fe810bd774b17b82 SHA512 2db0d45b99a0090c9636dcabb0a23c40b85aba2e9e481bee6a46ae052f805fbb5e62c90f0938d5a541ea76735f7f2dca734d3c2b9db7da455266f3ad67a10db9
-EBUILD xmms2-0.8_p20161122-r5.ebuild 7816 BLAKE2B 643ab2642018795f535563cf4ea086303ad0ab71781b189e275218672cf1ee9cab4de46ff2949886870b78e868d0545dccdcb8b33a6bcc01085c0513b1be2ab3 SHA512 0b3ddec472458764b7b8fe4df551d56548652554c90fb2740d35444f449c5d7c0a23fa7c444fa3b8d7160e4e6749439fffdf8e6a603a0c7f2e4d51416c4752e2
+EBUILD xmms2-0.8_p20161122-r4.ebuild 7589 BLAKE2B 2519dd96fdbfafdca73f9e7a9c9b8befc3a26fa0b0f99c2a9763ae3b2c749e7df8c8ba0bb87390bf68cc3aecc6df3ddfff05ac021655c077c010067800b768c2 SHA512 e45aa4972e11ee81c14186b095e4c6a8320ff206308d30afa8f5c2833090ae1be2f26cc7a8c11d888695e4540d4b7a3e1c06eafbb96133cf626c2c59bc1d05f1
+EBUILD xmms2-0.8_p20161122-r5.ebuild 7810 BLAKE2B 3c65e59f07517fae732e97af49682393870278d13eee8b94f6d5fad11f892f0f0b8994c52785f238e49d5b4bce99bf17fead5045bea2b7dcee8282cdfc25e63a SHA512 f1bd45e6e44bf0f3971bc724737962f9bff9aab19b459abff072e7fc172eb8fdf4e39959b12a9e7705604c320a5ce34c1f827f0d11d712ca2b32fcb690efbd55
 MISC metadata.xml 2494 BLAKE2B 47ddee51380c99b03e6a449347f68e0f38742c7310d6e128b741abb13c4ce8126cb7177854c05c7a9e22ede612be2aa0befe7fbc69b918d17366a31005ed392e SHA512 f5c30541d2f5f484ced87780f72b2ce02d8f1a5e9cdfd437a870e6a1f53f1b9f71bf266935a20dc6f1f6d2417636dfa6dfe27c947eeddca1d746ad72e0b3c8ae
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
index b5150186d945..8fe00838c3d6 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
index 393d601eabd9..22fe230ca3b7 100644
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 674a0fd8a123..083ee3b9a3b4 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 3afd441be502..c98ddead1c19 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -7,8 +7,8 @@ DIST kodi-18.5.tar.gz 51025415 BLAKE2B c439790a85466d50875cd63ccdc6fee1b16c5ee67
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
-EBUILD kodi-18.3-r1.ebuild 9604 BLAKE2B 51a6fc43bc576276f81049a5c3cea4fc94b16cf67bcb760437f9ed841d349c4bda26d476d510c07d90061cc9e4cbc95dd4ef9f33e6573e6b067f714b84129ed0 SHA512 a9ea9f100e85c6733e60cc4bdc1d878fcd4dbf0e91ae2963aeaf500ba21f5ed571b402a4a1aa996d08db47a381f2e9d3399216d7f4f3fcd803944aa313586fc6
-EBUILD kodi-18.4.ebuild 9488 BLAKE2B 7f278c00289c8e2fc6451168a62368ec1246f8713003ac81f53d4f558a9a2aad9f248717580e3eca29d53ef137751ebe770a1967676f8d5da92ea2d1047e06f8 SHA512 9166241c682630730ece6102827c6a41c62ab7fcd503b01b8464b60edee20ac9dcf28919806c74a4a11b6083620e047b7cdc466a72f28c860fc1655318380f11
-EBUILD kodi-18.5-r1.ebuild 9455 BLAKE2B 6af53fccd8cdc987743446019e7d600e1d4337e6ced4b2e1be3262b72f42716adf5ec1891b341a0ae88e876f822ec69f8a9668680a095ffce9029ed82c44a07f SHA512 c0089e4a92881919534e14a79eea653fb01bfe268c09cb189abf9f6c12e721f08997c715f0bb6328db92af03dbf4018bac5d56df5ae10c9805b9f81b69f9e58b
-EBUILD kodi-9999.ebuild 8890 BLAKE2B 6bd3fdc563714568ed4ace2cba97d7f6d528c42de5dbcb55653525b57ee7d8898ffdeb533f72d30b21501987843e2d87725698885519bfbc20647505c484aff1 SHA512 8706b41a2757493d1890084a9dbc991f17ead0b4f97b2db4d6624fdec4e1852c1c6b637467581accb093cea9aa8d7cd5aea30dd87712ac052c07be882d652fb8
+EBUILD kodi-18.3-r1.ebuild 9637 BLAKE2B f664ff7359fca7b8d9aa4cb02e21d83835ae9de281d0a6540dfe9f6d203fdc263465274e9440cf1919dd64eff769b41a9d44db5aaddb34f9f33dffe5c0a9ca43 SHA512 81a975e03150e5da65928d2730299649fe94ef5538f4577cfeb26eee39cd888b7fec2b5fc4d9d8b814ff8e74c619f4ef00d840a05dd279547524f1743ed19d89
+EBUILD kodi-18.4-r1.ebuild 9521 BLAKE2B 312c594e5dd8c851af3a21e8b373892aed11aab8a2f29ec7442b46439242fe7f9fb04be8ab1460e8752e15258174d1c5ff66fee07cd041a2c65bdc95e0a65e83 SHA512 364ced13e0db628cf535c99137bbad2b5f6cb6f071bb1781e96314b365625cec3936213bae1827fbe6f926ecb2565a32e356b58b3951b10794920d2f9df4aecd
+EBUILD kodi-18.5-r2.ebuild 9492 BLAKE2B 022c819338e0cf341f84e62d2b72381a71a41c2088b27eea9e21a598aaaec2e778df11c19a22448da4bb035611fc5e549d321c08cd76c3e234b4aa343d545739 SHA512 dca47435172ec06cb6ee9514d684559f67f6532c9c037e5b57f374ce3c5d36420c95ed441e914fe5ba35cbb0e6d3581f2797297328758be4d752261a806d501a
+EBUILD kodi-9999.ebuild 8933 BLAKE2B 628426f420f50a98366698d3fd41040bdceb7505fc5d77a8fdb076b42ea196c67e80a90c7490a15a94ee8301c560e233bd19c7a2a44f7e2e10ed73de04a86d6f SHA512 9ffb0ff474db08d9e77519954117e2c8c9f0d499ea000f3b68c21475962eb9fbcbac8bde45e6415b3959c63d1649834cab1fa2c412ae799e73b95d738025d6b2
 MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da
diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
index a249ef137d27..ea0a6609f660 100644
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ b/media-tv/kodi/kodi-18.3-r1.ebuild
@@ -73,8 +73,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.9.4
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
 	>=dev-libs/libcdio-0.94
 	>=dev-libs/libfmt-3.0.1
 	dev-libs/libfstrcmp
@@ -305,11 +305,11 @@ src_test() {
 src_install() {
 	cmake_src_install
 
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
 
 	newicon media/icon48x48.png kodi.png
 
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
 	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
 		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
 
diff --git a/media-tv/kodi/kodi-18.4-r1.ebuild b/media-tv/kodi/kodi-18.4-r1.ebuild
new file mode 100644
index 000000000000..3b37458b80ec
--- /dev/null
+++ b/media-tv/kodi/kodi-18.4-r1.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.0.4"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="18.4"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+PATCHES=(
+	"${FILESDIR}/${PN}-18.5-cassert.patch"
+)
+
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="amd64 x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	^^ ( gbm raspberry-pi wayland X )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.0.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/flatbuffers
+	>=dev-libs/fribidi-0.19.7
+	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/libinput-1.10.5
+	>=dev-libs/libxml2-2.9.4
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
+	>=dev-libs/libcdio-0.94
+	>=dev-libs/libfmt-3.0.1
+	dev-libs/libfstrcmp
+	gbm? (	media-libs/mesa[gbm] )
+	gles? (
+		!raspberry-pi? ( media-libs/mesa[gles2] )
+	)
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.8
+	>=media-libs/libass-0.13.4
+	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+		libressl? ( media-video/ffmpeg[libressl,-openssl] )
+		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.56.1[http2]
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? ( dev-libs/libressl:0= )
+	raspberry-pi? (
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	>=sys-libs/zlib-1.2.11
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		opengl? ( x11-libs/libva[opengl] )
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva[vdpau] )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		>=dev-cpp/waylandpp-0.2.3:=
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	>=x11-libs/libxkbcommon-0.4.1
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? ( app-misc/lirc )
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-libs/rapidjson
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	virtual/jre
+	x86? ( dev-lang/nasm )
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if use gbm; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="gbm"
+			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="wayland"
+			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use raspberry-pi; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all
+}
+
+src_test() {
+	cmake_build check
+}
+
+src_install() {
+	cmake_src_install
+
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4.ebuild
deleted file mode 100644
index f5af05243ea0..000000000000
--- a/media-tv/kodi/kodi-18.4.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-PATCHES=(
-	"${FILESDIR}/${PN}-18.5-cassert.patch"
-)
-
-if [[ ${PV} == *9999 ]] ; then
-	PYTHON_COMPAT=( python2_7 python3_{6,7} )
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-else
-	PYTHON_COMPAT=( python2_7 )
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	^^ ( gbm raspberry-pi wayland X )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		>=app-pda/libplist-2.0.0
-		net-libs/shairplay
-	)
-	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-1.0.2 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/flatbuffers
-	>=dev-libs/fribidi-0.19.7
-	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/libinput-1.10.5
-	>=dev-libs/libxml2-2.9.4
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
-	>=dev-libs/libcdio-0.94
-	>=dev-libs/libfmt-3.0.1
-	dev-libs/libfstrcmp
-	gbm? (	media-libs/mesa[gbm] )
-	gles? (
-		!raspberry-pi? ( media-libs/mesa[gles2] )
-	)
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	media-fonts/roboto
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.8
-	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
-		libressl? ( media-video/ffmpeg[libressl,-openssl] )
-		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	>=net-misc/curl-7.56.1[http2]
-	nfs? ( >=net-fs/libnfs-2.0.0:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
-	libressl? ( dev-libs/libressl:0= )
-	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] )
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	>=sys-libs/zlib-1.2.11
-	udev? ( virtual/udev )
-	vaapi? (
-		x11-libs/libva:=
-		opengl? ( x11-libs/libva[opengl] )
-		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
-		vdpau? ( x11-libs/libva[vdpau] )
-		wayland? ( x11-libs/libva[wayland] )
-		X? ( x11-libs/libva[X] )
-	)
-	virtual/libiconv
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	wayland? (
-		>=dev-cpp/waylandpp-0.2.3:=
-		media-libs/mesa[wayland]
-		>=dev-libs/wayland-protocols-1.7
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		system-ffmpeg? ( media-video/ffmpeg[X] )
-	)
-	x11-libs/libdrm
-	>=x11-libs/libxkbcommon-0.4.1
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? ( app-misc/lirc )
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:2 )
-	upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-libs/rapidjson
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	virtual/jre
-	x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		if python_is_python3; then
-			EGIT_BRANCH="feature_python3"
-			ewarn "Using the experimental Python 3 branch!"
-			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
-			ewarn "To use the non-experimental Python 2 version:"
-			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
-			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
-		fi
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/platform/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_INTERNAL_FSTRCMP=OFF
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRCCLIENT=$(usex lirc)
-		-DENABLE_MARIADBCLIENT=$(usex mariadb)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	if use gbm; then
-		mycmakeargs+=(
-			-DCORE_PLATFORM_NAME="gbm"
-			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
-		)
-	fi
-
-	if use wayland; then
-		mycmakeargs+=(
-			-DCORE_PLATFORM_NAME="wayland"
-			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
-		)
-	fi
-
-	if use raspberry-pi; then
-		mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
-	fi
-
-	if use X; then
-		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_test() {
-	cmake_build check
-}
-
-src_install() {
-	cmake_src_install
-
-	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	newicon media/icon48x48.png kodi.png
-
-	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-18.5-r1.ebuild b/media-tv/kodi/kodi-18.5-r1.ebuild
deleted file mode 100644
index ffe5d7416b7d..000000000000
--- a/media-tv/kodi/kodi-18.5-r1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-PATCHES=(
-	"${FILESDIR}/${P}-cassert.patch"
-)
-
-if [[ ${PV} == *9999 ]] ; then
-	PYTHON_COMPAT=( python2_7 python3_{6,7} )
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	inherit git-r3
-else
-	PYTHON_COMPAT=( python2_7 )
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/rc}
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gles opengl )
-	^^ ( gbm raspberry-pi wayland X )
-	?? ( mariadb mysql )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		>=app-pda/libplist-2.0.0
-		net-libs/shairplay
-	)
-	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-1.0.2 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	dev-libs/expat
-	dev-libs/flatbuffers
-	>=dev-libs/fribidi-0.19.7
-	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/libinput-1.10.5
-	>=dev-libs/libxml2-2.9.4
-	>=dev-libs/lzo-2.04
-	dev-libs/tinyxml[stl]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
-	>=dev-libs/libcdio-0.94
-	>=dev-libs/libfmt-3.0.1
-	dev-libs/libfstrcmp
-	gbm? (	media-libs/mesa[gbm] )
-	gles? (
-		!raspberry-pi? ( media-libs/mesa[gles2] )
-	)
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	media-fonts/roboto
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.8
-	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
-		libressl? ( media-video/ffmpeg[libressl,-openssl] )
-		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	>=net-misc/curl-7.56.1[http2]
-	nfs? ( >=net-fs/libnfs-2.0.0:= )
-	opengl? ( media-libs/glu )
-	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
-	libressl? ( dev-libs/libressl:0= )
-	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	>=sys-libs/zlib-1.2.11
-	udev? ( virtual/udev )
-	vaapi? (
-		x11-libs/libva:=
-		opengl? ( x11-libs/libva[opengl] )
-		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
-		vdpau? ( x11-libs/libva[vdpau] )
-		wayland? ( x11-libs/libva[wayland] )
-		X? ( x11-libs/libva[X] )
-	)
-	virtual/libiconv
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	wayland? (
-		>=dev-cpp/waylandpp-0.2.3:=
-		media-libs/mesa[wayland]
-		>=dev-libs/wayland-protocols-1.7
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		system-ffmpeg? ( media-video/ffmpeg[X] )
-	)
-	x11-libs/libdrm
-	>=x11-libs/libxkbcommon-0.4.1
-	xslt? ( dev-libs/libxslt )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
-	lirc? ( app-misc/lirc )
-	!media-tv/xbmc
-	udisks? ( sys-fs/udisks:2 )
-	upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-lang/swig
-	dev-libs/crossguid
-	dev-libs/rapidjson
-	dev-util/cmake
-	dev-util/gperf
-	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
-	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
-	virtual/pkgconfig
-	virtual/jre
-	x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		if python_is_python3; then
-			EGIT_BRANCH="feature_python3"
-			ewarn "Using the experimental Python 3 branch!"
-			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
-			ewarn "To use the non-experimental Python 2 version:"
-			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
-			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
-		fi
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/platform/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/lib/cpluff
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/cmake/modules/FindCpluff.cmake \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_INTERNAL_FSTRCMP=OFF
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRCCLIENT=$(usex lirc)
-		-DENABLE_MARIADBCLIENT=$(usex mariadb)
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex opengl)
-		-DENABLE_OPTICAL=$(usex dvd)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
-	)
-
-	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	if use gbm; then
-		mycmakeargs+=(
-			-DCORE_PLATFORM_NAME="gbm"
-			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
-		)
-	fi
-
-	if use wayland; then
-		mycmakeargs+=(
-			-DCORE_PLATFORM_NAME="wayland"
-			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
-		)
-	fi
-
-	if use raspberry-pi; then
-		mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
-	fi
-
-	if use X; then
-		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_test() {
-	cmake_build check
-}
-
-src_install() {
-	cmake_src_install
-
-	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	newicon media/icon48x48.png kodi.png
-
-	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	python_domodule tools/EventClients/lib/python/xbmcclient.py
-	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-18.5-r2.ebuild b/media-tv/kodi/kodi-18.5-r2.ebuild
new file mode 100644
index 000000000000..9b455201ee36
--- /dev/null
+++ b/media-tv/kodi/kodi-18.5-r2.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.0.4"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="18.4"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+PATCHES=(
+	"${FILESDIR}/${P}-cassert.patch"
+)
+
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	^^ ( gbm raspberry-pi wayland X )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.0.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/flatbuffers
+	>=dev-libs/fribidi-0.19.7
+	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/libinput-1.10.5
+	>=dev-libs/libxml2-2.9.4
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
+	>=dev-libs/libcdio-0.94
+	>=dev-libs/libfmt-3.0.1
+	dev-libs/libfstrcmp
+	gbm? (	media-libs/mesa[gbm] )
+	gles? (
+		!raspberry-pi? ( media-libs/mesa[gles2] )
+	)
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.8
+	>=media-libs/libass-0.13.4
+	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+		libressl? ( media-video/ffmpeg[libressl,-openssl] )
+		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.56.1[http2]
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? ( dev-libs/libressl:0= )
+	raspberry-pi? (
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	>=sys-libs/zlib-1.2.11
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		opengl? ( x11-libs/libva[opengl] )
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva[vdpau] )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		>=dev-cpp/waylandpp-0.2.3:=
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	>=x11-libs/libxkbcommon-0.4.1
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? ( app-misc/lirc )
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-libs/rapidjson
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	virtual/jre
+	x86? ( dev-lang/nasm )
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if use gbm; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="gbm"
+			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="wayland"
+			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use raspberry-pi; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all
+}
+
+src_test() {
+	cmake_build check
+}
+
+src_install() {
+	cmake_src_install
+
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 96f3f5e54a1d..c78d67f3d625 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -71,8 +71,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libxml2-2.9.4
 	>=dev-libs/lzo-2.04
 	dev-libs/tinyxml[stl]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+	')
 	>=dev-libs/libcdio-0.94
 	>=dev-libs/libfmt-3.0.1
 	dev-libs/libfstrcmp
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index c3380d5647b7..b3e884218a8e 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -12,9 +12,9 @@ DIST plexmediaserver_1.18.3.2156-349e9837e_amd64.deb 87197768 BLAKE2B 1dfb42a025
 DIST plexmediaserver_1.18.3.2156-349e9837e_i386.deb 74116200 BLAKE2B fd5b152704c9c646fce9e2a139c0ac9d500d2514e2fc050d788bd5a65df55df4d7db8b17b0160623738add3f8ca29d3566741cf3c47866d09ac96f4e035e9fa0 SHA512 4a489b807e5f6b0624a879e29eac6816a3dbd31eb8286c76263904c59c7be481dfd6754a5e14ba6ee2247c851cfd0762ca3e4a3004ca5b343bf53a5a1e143552
 DIST plexmediaserver_1.18.4.2171-ac2afe5f8_amd64.deb 86833802 BLAKE2B a59b1ff4f4475b87464e6a7fe441258c95e19db86649bfb5110a1f1a2a5382c847a9d146dec48b726bd8d34622da04dfc31d460f9c91f44f551ab5a87e8ff4ec SHA512 b2106a43996ebbddd179101ab7c054ca7576f6cd60892c78354106875a13e22283fdcddfe39041acc2dc60690a40029edd213651938b04f002fe3680da13d707
 DIST plexmediaserver_1.18.4.2171-ac2afe5f8_i386.deb 73659238 BLAKE2B 3be12b14359f0e7f46f40328414855ece7c36d4cdd0c01dc30cf225ec3e7aef06504b8c2117f634e4ea0960aa387e2d2cfacb2e697d788befa1b76bc973aebf8 SHA512 9641ff170ea3379cf0b6351167206b2923194e831868b1c2245da7bd3a63af12f17ba27c42bd4b4cb8f00bb844e1be6b7427912d1f06096c6e701f579f918d66
-EBUILD plex-media-server-1.13.2-r1.ebuild 5111 BLAKE2B a695cebc1611c173f517c3618efd7733eaadc365d8a9d9519321d55fa0e34cf3101ecc630baf5614387cd3216d1aaf8d2eb76ccc904845d64918a4dde0ea4096 SHA512 9b31ceffb0f1de25250d865e11543851a08f53ba2568f2108bc98b069d295d97ea300baae50a5f9ce2a63aa36242f0162896dfdd6e9b9a428f0effe4a5de4348
-EBUILD plex-media-server-1.14.1.ebuild 5107 BLAKE2B 045768a008b2c7a20ec999bb7a04703aa86020c17cd7038255476793e5633873a239edff0580770d3b8d7d644dec336edae9380af5ae18c0949f8d87f636647a SHA512 a66db8f7a13c4d45b94f4c2f1f29d61c22eabcaf035d00226c860fcb44aba68d709cb9304ca85e0fc530cffe870668c7acba57fc11ea7ce483fbebef21d04802
-EBUILD plex-media-server-1.16.4.ebuild 4067 BLAKE2B bfc37ad99b0bada0e859a83c23a906944209d7c6b38da471f79802dca89716a274513ce85e84f4fd2a083b723733a9191262755356dd30429f5dc47307699685 SHA512 cfd87eba01fc50238bdcd94ca01d74e74281b58f9d4f71d6bd1e8e97189ab7a6077bb1640f5f23cb62febc27701d2c332da2bc4460af595fd74d93f0032b3d13
-EBUILD plex-media-server-1.18.3.ebuild 4433 BLAKE2B d2f1488336132a93aa99d408587d04cac5058b641d698529c10d4034daab6f84782f5a6367f8feb07547f6054e7dc6e3371587f0a6a9aa0025dba6e1fbdbc7e8 SHA512 913127571255dc119a7544087b69a34531b5d64be14abe9a6085cfa0d790efdd80f59e06318a4a918f00190ceec557409484f59b905600d323e7deb7e3fb6e43
-EBUILD plex-media-server-1.18.4.ebuild 4433 BLAKE2B ac17d0c743950abc3fdcdbff7b006b7b2a2d99eaa1b9058c665cbca469a95b9c827073a35ad26b953fd7209634aca36e253c7af83b11ce2aa3c16b51dd31ab84 SHA512 ba54d4449d13e425e7d36bfdb8091aeb47327a37ef539232daf129821e4a28e09cc5cdc84d4ad8723802e9a8aa830de0e1713eddc3124bca559da5cc3acb576e
+EBUILD plex-media-server-1.13.2-r2.ebuild 5123 BLAKE2B 04f0a4091a90979384aa6efef6ed6b28a54b513cda64aac9bcdf70cd34e75af2c35f6ef42872e66ee700c7fce9be5bf7642ef71dd79b2e410c3cf088fc54ee0b SHA512 9155367e90b151a3fc3b24335918180a887034ac02b066e2b5071d8f287f14bb3cd839f3cf1fa02fc91f78dd613971ce8633641eb239e82cf8ddfbef9666d5d1
+EBUILD plex-media-server-1.14.1.ebuild 5143 BLAKE2B f900cd6ef41a11d4dad5dd9890df908361cbdbacfd7c84fa92c305587041824f240134afe2f765b2495ec6fdb7850080a61db93ac1cd0c467a2f3b8ac541d611 SHA512 e80505106e73d0eefe2813a477ace830a18ea094797cf5674225a3482078a1193e3acd328bb3874f969d835205baa787c2e2eb6d0580c1c6e340c029b46f490c
+EBUILD plex-media-server-1.16.4.ebuild 4105 BLAKE2B 7f7a2c21fad0b0b8de58cba982a27dbeaf6897a59dd7fd55bd3940881d7122c3edc751dd7a998e7e5a59de65979a055809fdc53554f2a4e6357cf4fdee13a8fa SHA512 676006b0c5ab0d2b2aa46aa202c6fa1dab64e4e6ce6ce606ac81f3cf25ad108bacde2bc0b0929aa6eafe34777242f001d297b4090252bc1d9661ab39b3bbc65b
+EBUILD plex-media-server-1.18.3.ebuild 4471 BLAKE2B eccc5c50e3776b2a75f3b9e5e39fbf173b9810296bb1ab9a3d8ebbf55de1352a93f625f1db8b7af6fcca5e266d07e8eae551388546823cd9c26fdedcb16a485e SHA512 2e250e2a7679bb20dabe8aa25ddd8c864f0de3878b97303901e400824250d64b8c26deab08c4ae9b811951efff600d7af463fa570cf70c9f785f5caf59b30605
+EBUILD plex-media-server-1.18.4-r1.ebuild 4447 BLAKE2B 1a38bf8e223d4510721a39a2565ee67c78e7f35ce066fb71455e252ac7790c3a7f3b883642b1285831e17b284506a8cad6921e8a9fab8c5186bc607bfd673ded SHA512 94d04736749f38a941fd5cde705d1e782871995b4e95750da307dab8932fb870237a9145e8ce1ed316e5a0d4f7b84248edce8f30bd459174a70e81e48bb04f97
 MISC metadata.xml 367 BLAKE2B 0d52124daec02b05aa2c729fcc943a29b74d871de0dccf8cafb9947908a4eea58b2d893a454cb76230d1a24eecdd4b9ef752c40d52961488bd5722dfba57f2c8 SHA512 9feb86f493b8ba2cf3a3bf8c146e55bbd7701e58bf62ab576a71fecdac0ad0522bfe45650d84f6b0ec94be2fbf07c6db143cce5c69e80a32101084e372e86eb0
diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
deleted file mode 100644
index 8b47a10cad28..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.13.2-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils user systemd unpacker pax-utils python-single-r1
-
-MINOR_VERSION="5154-fd05be322"
-
-_APPNAME="plexmediaserver"
-_USERNAME="plex"
-_SHORTNAME="${_USERNAME}"
-_FULL_VERSION="${PV}.${MINOR_VERSION}"
-
-URI="https://downloads.plex.tv/plex-media-server"
-
-DESCRIPTION="A free media library that is intended for use with a plex client."
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
-SLOT="0"
-LICENSE="Plex"
-RESTRICT="bindist strip"
-KEYWORDS="-* amd64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-apps/fix-gnustack
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	net-dns/avahi
-	${PYTHON_DEPS}"
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/${_APPNAME}/.*"
-	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
-)
-
-EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
-BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
-
-pkg_setup() {
-	enewgroup ${_USERNAME}
-	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_install() {
-	# Move the config to the correct place
-	local CONFIG_VANILLA="/etc/default/plexmediaserver"
-	local CONFIG_PATH="/etc/${_SHORTNAME}"
-	dodir "${CONFIG_PATH}"
-	insinto "${CONFIG_PATH}"
-	doins "${CONFIG_VANILLA#/}"
-	sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
-
-	# Remove Debian specific files
-	rm -rf "usr/share/doc" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}" || die
-
-	# Make sure the logging directory is created
-	local LOGGING_DIR="/var/log/pms"
-	dodir "${LOGGING_DIR}"
-	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
-	keepdir "${LOGGING_DIR}"
-
-	# Create default library folder with correct permissions
-	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
-	dodir "${DEFAULT_LIBRARY_DIR}"
-	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
-	keepdir "${DEFAULT_LIBRARY_DIR}"
-
-	# Install the OpenRC init/conf files
-	doinitd "${FILESDIR}/init.d/${PN}"
-	doconfd "${FILESDIR}/conf.d/${PN}"
-
-	# Disabling due to Bug 644694
-	#_handle_multilib
-
-	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
-	# Plex has its own precompiled libraries.
-	_mask_plex_libraries_revdep
-
-	# Install systemd service file
-	local INIT_NAME="${PN}.service"
-	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
-	systemd_newunit "${INIT}" "${INIT_NAME}"
-
-	_remove_execstack_markings
-	_add_pax_markings
-
-	einfo "Configuring virtualenv"
-	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
-	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
-	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	einfo ""
-	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
-	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
-}
-
-# Disabling the follow function due to Bug 644694.
-# We shouldn't register plex libraries in global
-# library path since this will cause other packages
-# on the system to break.
-
-# Finds out where the library directory is for this system
-# and handles ldflags as to not break library dependencies
-# during rebuilds.
-_handle_multilib() {
-	# Prevent revdep-rebuild, @preserved-rebuild breakage
-	cat > "${T}"/66plex <<-EOF || die
-		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
-	EOF
-
-	doenvd "${T}"/66plex
-}
-
-# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-# so it doesn't try to rebuild libraries that can't be rebuilt.
-_mask_plex_libraries_revdep() {
-	dodir /etc/revdep-rebuild/
-
-	# Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
-	# Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
-	# on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
-	# Thus we will match upstream's directory automatically. If upstream switches their location,
-	# then so should we.
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
-}
-
-# Remove execstack flags from some libraries/executables
-# so that it works in hardened setups.
-_remove_execstack_markings() {
-	for f in "${EXECSTACKED_BINS[@]}"; do
-		# Unquoting 'f' so that expansion works.
-		fix-gnustack -f ${f} > /dev/null
-	done
-}
-
-# Add pax markings to some binaries so that they work on hardened setup.
-_add_pax_markings() {
-	for f in "${BINS_TO_PAX_MARK[@]}"; do
-		pax-mark m "${f}"
-	done
-}
diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
new file mode 100644
index 000000000000..3633cd824ba6
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils user systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="5154-fd05be322"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server"
+
+DESCRIPTION="A free media library that is intended for use with a plex client."
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64.deb )"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-apps/fix-gnustack
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
+
+RDEPEND="
+	net-dns/avahi
+	${PYTHON_DEPS}"
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+EXECSTACKED_BINS=( "${ED%/}/usr/lib/plexmediaserver/libgnsdk_dsp.so*" )
+BINS_TO_PAX_MARK=( "${ED%/}/usr/lib/plexmediaserver/Plex Script Host" )
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/virtualenv_start_pms.patch" )
+
+pkg_setup() {
+	enewgroup ${_USERNAME}
+	enewuser ${_USERNAME} -1 /bin/bash /var/lib/${_APPNAME} "${_USERNAME},video"
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	# Move the config to the correct place
+	local CONFIG_VANILLA="/etc/default/plexmediaserver"
+	local CONFIG_PATH="/etc/${_SHORTNAME}"
+	insinto "${CONFIG_PATH}"
+	doins "${CONFIG_VANILLA#/}"
+	sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
+
+	# Remove Debian specific files
+	rm -rf "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}" || die
+
+	# Make sure the logging directory is created
+	local LOGGING_DIR="/var/log/pms"
+	dodir "${LOGGING_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${LOGGING_DIR}" || die
+	keepdir "${LOGGING_DIR}"
+
+	# Create default library folder with correct permissions
+	local DEFAULT_LIBRARY_DIR="/var/lib/${_APPNAME}"
+	dodir "${DEFAULT_LIBRARY_DIR}"
+	chown "${_USERNAME}":"${_USERNAME}" "${ED%/}/${DEFAULT_LIBRARY_DIR}" || die
+	keepdir "${DEFAULT_LIBRARY_DIR}"
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	# Disabling due to Bug 644694
+	#_handle_multilib
+
+	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
+	# Plex has its own precompiled libraries.
+	_mask_plex_libraries_revdep
+
+	# Install systemd service file
+	local INIT_NAME="${PN}.service"
+	local INIT="${FILESDIR}/systemd/${INIT_NAME}"
+	systemd_newunit "${INIT}" "${INIT_NAME}"
+
+	_remove_execstack_markings
+	_add_pax_markings
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	einfo ""
+	elog "Plex Media Server is now installed. Please check the configuration file in /etc/${_SHORTNAME}/${_APPNAME} to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server', you will then be able to access your library at http://<ip>:32400/web/"
+}
+
+# Disabling the follow function due to Bug 644694.
+# We shouldn't register plex libraries in global
+# library path since this will cause other packages
+# on the system to break.
+
+# Finds out where the library directory is for this system
+# and handles ldflags as to not break library dependencies
+# during rebuilds.
+_handle_multilib() {
+	# Prevent revdep-rebuild, @preserved-rebuild breakage
+	cat > "${T}"/66plex <<-EOF || die
+		LDPATH="${EPREFIX}/usr/$(get_libdir)/plexmediaserver"
+	EOF
+
+	doenvd "${T}"/66plex
+}
+
+# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+# so it doesn't try to rebuild libraries that can't be rebuilt.
+_mask_plex_libraries_revdep() {
+	dodir /etc/revdep-rebuild/
+
+	# Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
+	# Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
+	# on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
+	# Thus we will match upstream's directory automatically. If upstream switches their location,
+	# then so should we.
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
+}
+
+# Remove execstack flags from some libraries/executables
+# so that it works in hardened setups.
+_remove_execstack_markings() {
+	for f in "${EXECSTACKED_BINS[@]}"; do
+		# Unquoting 'f' so that expansion works.
+		fix-gnustack -f ${f} > /dev/null
+	done
+}
+
+# Add pax markings to some binaries so that they work on hardened setup.
+_add_pax_markings() {
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+}
diff --git a/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
index f37b60268a7b..57039153cea1 100644
--- a/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	sys-apps/fix-gnustack
-	dev-python/virtualenv[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
 
 RDEPEND="
 	net-dns/avahi
diff --git a/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
index 1fa5d4363cc5..b939c7a780c1 100644
--- a/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.16.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,10 @@ RESTRICT="bindist strip"
 KEYWORDS="-* ~amd64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
 
 RDEPEND="
 	net-dns/avahi
diff --git a/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
index d4dc6a7ad1a1..8f2e0be664e2 100644
--- a/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,10 @@ RESTRICT="bindist strip"
 KEYWORDS="-* ~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
 BDEPEND="dev-util/patchelf"
 
 RDEPEND="
diff --git a/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild
new file mode 100644
index 000000000000..ff7382861de2
--- /dev/null
+++ b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils systemd unpacker pax-utils python-single-r1
+
+MINOR_VERSION="2171-ac2afe5f8"
+
+_APPNAME="plexmediaserver"
+_USERNAME="plex"
+_SHORTNAME="${_USERNAME}"
+_FULL_VERSION="${PV}.${MINOR_VERSION}"
+
+URI="https://downloads.plex.tv/plex-media-server-new"
+
+DESCRIPTION="A free media library that is intended for use with a plex client"
+HOMEPAGE="https://www.plex.tv/"
+SRC_URI="
+	amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb )
+	x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb )
+"
+SLOT="0"
+LICENSE="Plex"
+RESTRICT="bindist strip"
+KEYWORDS="-* ~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/virtualenv[${PYTHON_MULTI_USEDEP}]
+	')"
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="
+	acct-group/plex
+	acct-user/plex
+	net-dns/avahi
+	${PYTHON_DEPS}"
+
+QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
+QA_PREBUILT="*"
+QA_MULTILIB_PATHS=(
+	"usr/lib/${_APPNAME}/.*"
+	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
+)
+
+BINS_TO_PAX_MARK=(
+	"${ED}/usr/lib/plexmediaserver/Plex Script Host"
+	"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
+)
+
+S="${WORKDIR}"
+PATCHES=(
+	"${FILESDIR}/virtualenv_start_pms_2019.patch"
+	"${FILESDIR}/plexmediamanager.desktop.new.patch"
+	"${FILESDIR}/add_gentoo_profile_as_platform_version.patch"
+)
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_install() {
+	# Move the config to the correct place
+	local config_vanilla="/etc/default/plexmediaserver"
+	local config_path="/etc/${_SHORTNAME}"
+	insinto "${config_path}"
+	doins "${config_vanilla#/}"
+	sed -e "s#${config_vanilla}#${config_path}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
+
+	# Remove Debian specific files
+	rm -r "usr/share/doc" || die
+
+	# Copy main files over to image and preserve permissions so it is portable
+	cp -rp usr/ "${ED}"/ || die
+
+	# Make sure the logging directory is created
+	local logging_dir="/var/log/pms"
+	dodir "${logging_dir}"
+	fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}"
+	keepdir "${logging_dir}"
+
+	# Create default library folder with correct permissions
+	local default_library_dir="/var/lib/${_APPNAME}"
+	dodir "${default_library_dir}"
+	fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}"
+	keepdir "${default_library_dir}"
+
+	# Install the OpenRC init/conf files
+	doinitd "${FILESDIR}/init.d/${PN}"
+	doconfd "${FILESDIR}/conf.d/${PN}"
+
+	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
+	# Plex has its own precompiled libraries.
+	_mask_plex_libraries_revdep
+
+	# Fix RPATH
+	patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die
+
+	# Install systemd service file
+	systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service"
+
+	# Add pax markings to some binaries so that they work on hardened setup
+	for f in "${BINS_TO_PAX_MARK[@]}"; do
+		pax-mark m "${f}"
+	done
+
+	einfo "Configuring virtualenv"
+	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die
+	pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
+	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	elog "Plex Media Server is now installed. Please check the configuration"
+	elog "file in /etc/${_SHORTNAME}/${_APPNAME}"
+	elog "to verify the default settings."
+	elog "To start the Plex Server, run 'rc-config start plex-media-server',"
+	elog "you will then be able to access your library at"
+	elog "http://<ip>:32400/web/"
+}
+
+# Adds the precompiled plex libraries to the revdep-rebuild's mask list
+# so it doesn't try to rebuild libraries that can't be rebuilt.
+_mask_plex_libraries_revdep() {
+	dodir /etc/revdep-rebuild/
+
+	# Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
+	# Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
+	# on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
+	# Thus we will match upstream's directory automatically. If upstream switches their location,
+	# then so should we.
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
+}
diff --git a/media-tv/plex-media-server/plex-media-server-1.18.4.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.4.ebuild
deleted file mode 100644
index 994795f17759..000000000000
--- a/media-tv/plex-media-server/plex-media-server-1.18.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils systemd unpacker pax-utils python-single-r1
-
-MINOR_VERSION="2171-ac2afe5f8"
-
-_APPNAME="plexmediaserver"
-_USERNAME="plex"
-_SHORTNAME="${_USERNAME}"
-_FULL_VERSION="${PV}.${MINOR_VERSION}"
-
-URI="https://downloads.plex.tv/plex-media-server-new"
-
-DESCRIPTION="A free media library that is intended for use with a plex client"
-HOMEPAGE="https://www.plex.tv/"
-SRC_URI="
-	amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb )
-	x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb )
-"
-SLOT="0"
-LICENSE="Plex"
-RESTRICT="bindist strip"
-KEYWORDS="-* ~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]"
-BDEPEND="dev-util/patchelf"
-
-RDEPEND="
-	acct-group/plex
-	acct-user/plex
-	net-dns/avahi
-	${PYTHON_DEPS}"
-
-QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop"
-QA_PREBUILT="*"
-QA_MULTILIB_PATHS=(
-	"usr/lib/${_APPNAME}/.*"
-	"usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*"
-)
-
-BINS_TO_PAX_MARK=(
-	"${ED}/usr/lib/plexmediaserver/Plex Script Host"
-	"${ED}/usr/lib/plexmediaserver/Plex Media Scanner"
-)
-
-S="${WORKDIR}"
-PATCHES=(
-	"${FILESDIR}/virtualenv_start_pms_2019.patch"
-	"${FILESDIR}/plexmediamanager.desktop.new.patch"
-	"${FILESDIR}/add_gentoo_profile_as_platform_version.patch"
-)
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_install() {
-	# Move the config to the correct place
-	local config_vanilla="/etc/default/plexmediaserver"
-	local config_path="/etc/${_SHORTNAME}"
-	dodir "${config_path}"
-	insinto "${config_path}"
-	doins "${config_vanilla#/}"
-	sed -e "s#${config_vanilla}#${config_path}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
-
-	# Remove Debian specific files
-	rm -r "usr/share/doc" || die
-
-	# Copy main files over to image and preserve permissions so it is portable
-	cp -rp usr/ "${ED}"/ || die
-
-	# Make sure the logging directory is created
-	local logging_dir="/var/log/pms"
-	dodir "${logging_dir}"
-	fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}"
-	keepdir "${logging_dir}"
-
-	# Create default library folder with correct permissions
-	local default_library_dir="/var/lib/${_APPNAME}"
-	dodir "${default_library_dir}"
-	fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}"
-	keepdir "${default_library_dir}"
-
-	# Install the OpenRC init/conf files
-	doinitd "${FILESDIR}/init.d/${PN}"
-	doconfd "${FILESDIR}/conf.d/${PN}"
-
-	# Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them.
-	# Plex has its own precompiled libraries.
-	_mask_plex_libraries_revdep
-
-	# Fix RPATH
-	patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die
-
-	# Install systemd service file
-	systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service"
-
-	# Add pax markings to some binaries so that they work on hardened setup
-	for f in "${BINS_TO_PAX_MARK[@]}"; do
-		pax-mark m "${f}"
-	done
-
-	einfo "Configuring virtualenv"
-	virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die
-	pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die
-	find . -type f -exec sed -i -e "s#${D}##g" {} + || die
-	popd &>/dev/null || die
-}
-
-pkg_postinst() {
-	elog "Plex Media Server is now installed. Please check the configuration"
-	elog "file in /etc/${_SHORTNAME}/${_APPNAME}"
-	elog "to verify the default settings."
-	elog "To start the Plex Server, run 'rc-config start plex-media-server',"
-	elog "you will then be able to access your library at"
-	elog "http://<ip>:32400/web/"
-}
-
-# Adds the precompiled plex libraries to the revdep-rebuild's mask list
-# so it doesn't try to rebuild libraries that can't be rebuilt.
-_mask_plex_libraries_revdep() {
-	dodir /etc/revdep-rebuild/
-
-	# Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib.
-	# Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely
-	# on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir).
-	# Thus we will match upstream's directory automatically. If upstream switches their location,
-	# then so should we.
-	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver
-}
diff --git a/media-tv/tvnamer/Manifest b/media-tv/tvnamer/Manifest
index 5957cc5518de..ba4509f02383 100644
--- a/media-tv/tvnamer/Manifest
+++ b/media-tv/tvnamer/Manifest
@@ -1,5 +1,5 @@
 DIST tvnamer-2.4.tar.gz 45272 BLAKE2B d00c584b95f2f1e3878dbf8618c9829412838b5ce72086b52620960a5d2a7b79768a78ae5e67230d7a83f12d1918f2428c5c0cccaadd1f08e5d4b1908ae31d34 SHA512 9271dca535910abed3f5ce24de4e65f7b951d2b6f80e07854bef06d52f7cdf40be8eb76934467ebae08bf919503a434c527a37caade1a3e696fbceb4446884fd
 DIST tvnamer-2.5.tar.gz 46030 BLAKE2B 4bad31df673b11671c8fb57c8e5d4ec8e7513ac63df6bf09d02943e06acab1c8d5f4d40f1d56b5e6a489ab27810aa85f82257df0b795a3ad5fdc4f63fcf5d976 SHA512 56233576a4f6e0b93535667f7d4e823cccba2bce785aaaed10415f5da1a3883fc29396a20fbffdca367fb9d3d748c6efa5b670eee43eece2631b28d640a5c180
-EBUILD tvnamer-2.4.ebuild 502 BLAKE2B ae58c1cffcc8c537b53e4df173cc17854fee032de606edc9516642db3626e6df48961842b4c694743ac86ab340ff06fd535a42eb328479c4c333ff1456299aea SHA512 519a1ada18c5952940e059768d99081231c0ed83db177a702d85fa78c825bedfd646e951e1059d21d94631608fd31aad4fb4abcbbecba70ac10f8f9ed277b7c5
-EBUILD tvnamer-2.5.ebuild 504 BLAKE2B b481e07f3ab5cbc8046fb553e4e49edc49c56b0c3dc3684149bfc8cb82c9f38308cc6562549dcf4e561fe6248b92c4a9aa84ba2724f39a9636b785c14242dc9c SHA512 07f5138412e5fbbb90287242027fd4daa19b2f0c2628a57d1746b0a57270846a9ac51dfa5a957b10de46391e44a6bf021c61c884d970997c5e9f1f96e12fd735
+EBUILD tvnamer-2.4.ebuild 492 BLAKE2B 1f9ffa330d3c1d13615a8d97538b087e4948690b6f427b4e72281c987fd24c27ba19ae6f041737dc33a15549b348648e91ce0f92d0fcebdd1384e6ec41ec6040 SHA512 5ebff75ac001625b6d8a7e9c2b805771bb808ee7358f6d280b4dd9ca08c2c3da1413272a13ab6d971dd8d484cfb1096225501332973575f8896076f0803a5380
+EBUILD tvnamer-2.5.ebuild 494 BLAKE2B b1db24b3ab41583c8b0c5f7598577d5d1e671a600eb5c6f1308182bf144e1f6132e42c7eab4298259f84211b735e4f2767c6e0ebca1158d9fc24ec4c0b6382a8 SHA512 f8abe622dfd872f61be4161806f6396881710a4e61348ba0af350972e41fee8231c2c7346f21e4046e75feb281bfbcab06349468793824f9d643a9171420e7e4
 MISC metadata.xml 379 BLAKE2B 79d429f9497154662e75f4693ab95c5251d65ed6ea06d3870e1f2a639cd470a9207d02ade929f10f9d0d7b0e91ad9629a899546ea02f40b6a4e5aeb5f846716e SHA512 d7a09db1fcdc1ec0b6fb78769fd219248bb4c5e858273d45554d5ac2021678a5d97f9b81cfbcd2ae05a1f9446c1c218463e8375d195335613df5834617463ae6
diff --git a/media-tv/tvnamer/tvnamer-2.4.ebuild b/media-tv/tvnamer/tvnamer-2.4.ebuild
index f871b3f6214f..3dfad7ee909c 100644
--- a/media-tv/tvnamer/tvnamer-2.4.ebuild
+++ b/media-tv/tvnamer/tvnamer-2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
diff --git a/media-tv/tvnamer/tvnamer-2.5.ebuild b/media-tv/tvnamer/tvnamer-2.5.ebuild
index 366b0815ec75..7e3ec1affa5f 100644
--- a/media-tv/tvnamer/tvnamer-2.5.ebuild
+++ b/media-tv/tvnamer/tvnamer-2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Automatic TV episode file renamer, data from thetvdb.com"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4d7b6bc6e24a..04cec9d33219 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index c58e0d9dd087..c3cb5b420682 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -2,5 +2,5 @@ AUX 0.10-fix_lib_path.patch 666 BLAKE2B 03dcaf2732c753885bd34254c988a5d6b5be12df
 AUX griffith-0.13-validators.patch 549 BLAKE2B fb8b53aeea53d331ff01b74a7bfbad05615b7de8f7e2d09057674a582191381a4a4a9348573a22ba9d42814946598f2e5592288799dba39b682509b814cb81f4 SHA512 0ce26c62d26d397fb4b212ada76895af826dfc11ea289f928d1761809bcd67d3e9c0de4a2c3ac402f4cb550ed9b50dc067689d4cc0c8e05f5117317c968e7c9b
 DIST griffith-0.13.tar.gz 1565903 BLAKE2B d3d806ef2a7cef76ce548e3ad785e96938447cb6425ac95fdbb4b5ae233adb2aeb4a274aa24c9e502607bc1287ea30ce8806cb1608fc194531757943e499b0e7 SHA512 dc8117b1a89253a87eb303c5229e6cdffde26b52de9ac4a3409dcc3f6dca64105f13a98cace225a932aefb2d620e828eea66bae57f40328b7ee3c06a944f0bed
 DIST griffith-extra-artwork-0.9.4.tar.gz 124008 BLAKE2B 992f8e4995d0465e891eacfe601eead2323754c60ad0c0a96ea9568dbecf5790039f58212e8a115f382532e1787e4db267b1259ac91de40728f7911f6b2178ae SHA512 09e912b4511c5c4a7b501d9a8f98223d20e58574e667cdb759e66f743cce14b45cce8bf0f9502ff2aacfc09e7a7b37966a887205a74a6e028b832703a65a2734
-EBUILD griffith-0.13-r2.ebuild 2113 BLAKE2B d671255ec142676227d68dde7fb87cdb995fbb621bdfbfa447c11f169e067499bc8ac5ba16ed6520fe738dbc3ab12da55cb0c39f049233a9b57b247f1c6fc884 SHA512 91eb875d5b85a34f78e6d1fb3e5a3b84f508a2f3c35001877ac0aa91c1ea6d876e17f41a2ffe5a066e79e9e0912c331d62f4b701dc41b6466343886d64c673a9
+EBUILD griffith-0.13-r3.ebuild 2184 BLAKE2B 4ae2ac0dd60cdb9cc1d2c53006317534360f826c7593fecb9442f307635cd4958ef46ffb628cd6874614cb310083a13d0edef76f1ecf54a4a491c869adc4da0a SHA512 1c0b70e5dd0517c319ea5d1ac76d4b98fb79dd213fc404294445c22f6fcc28f4e992d282456f6ec4a60f52db230f1e8cbd04157f344f7bed18646f33059b3e0d
 MISC metadata.xml 345 BLAKE2B 2c1e03aeaaa718018760dc5853f6ed18c915c5c436f7fa64e101ebf8cde36b442d41641a0a6bb3b05ecc3cffd138a749bfff1721430a78300c7ce9a312a4b9c2 SHA512 c259fe792b25d60fa4112e229076beeecb198cdb5e7b3b737f8546954039995ad321253d9004d939fb7232b67fb44d4ea0d6cae5e5240baa0c0ad0b9265f5592
diff --git a/media-video/griffith/griffith-0.13-r2.ebuild b/media-video/griffith/griffith-0.13-r2.ebuild
deleted file mode 100644
index aa9efbb2fc61..000000000000
--- a/media-video/griffith/griffith-0.13-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite'
-
-inherit python-single-r1
-
-ARTWORK_PV="0.9.4"
-
-DESCRIPTION="Movie collection manager"
-HOMEPAGE="http://www.griffith.cc/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
-	https://dev.gentoo.org/~hwoarang/distfiles/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	gnome-base/libglade[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.6.1:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/reportlab-1.19[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook2X )"
-
-PATCHES=(
-	"${FILESDIR}/0.10-fix_lib_path.patch"
-	"${FILESDIR}/griffith-0.13-validators.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use doc || { sed -i -e '/docs/d' Makefile || die ; }
-	sed -i \
-		-e 's#/pl/#/pl.UTF-8/#' \
-		"${S}"/docs/pl/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's/ISO-8859-1/UTF-8/' \
-		"${S}"/lib/gconsole.py || die "sed failed"
-
-	default
-}
-
-src_compile() {
-	# Nothing to compile and default `emake` spews an error message
-	true
-}
-
-src_install() {
-	if ! use doc ; then
-		sed -i -e '/docs/d' Makefile || die
-	fi
-
-	emake \
-		LIBDIR="${D}/usr/$(get_libdir)/griffith" \
-		DESTDIR="${D}" DOC2MAN=docbook2man.pl install
-	dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS
-
-	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" || die
-	emake DESTDIR="${D}" install
-	# This carries over from -0.13 but appears to have no effect.
-	python_optimize "${ED}"/usr/share/${PN}
-}
-
-pkg_postinst() {
-	einfo
-	einfo "${PN} can make use of the following optional dependencies"
-	einfo "dev-python/chardet: CSV file encoding detections"
-	einfo "dev-python/mysql-python: Python interface for MySQL connectivity"
-	einfo ">=dev-python/psycopg-2.4: Python interface for PostgreSQL connectivity"
-	einfo
-}
diff --git a/media-video/griffith/griffith-0.13-r3.ebuild b/media-video/griffith/griffith-0.13-r3.ebuild
new file mode 100644
index 000000000000..d606fd887aac
--- /dev/null
+++ b/media-video/griffith/griffith-0.13-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite'
+
+inherit python-single-r1
+
+ARTWORK_PV="0.9.4"
+
+DESCRIPTION="Movie collection manager"
+HOMEPAGE="http://www.griffith.cc/"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+	https://dev.gentoo.org/~hwoarang/distfiles/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	gnome-base/libglade[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygtk-2.6.1:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sqlalchemy-0.5.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/reportlab-1.19[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook2X )"
+
+PATCHES=(
+	"${FILESDIR}/0.10-fix_lib_path.patch"
+	"${FILESDIR}/griffith-0.13-validators.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use doc || { sed -i -e '/docs/d' Makefile || die ; }
+	sed -i \
+		-e 's#/pl/#/pl.UTF-8/#' \
+		"${S}"/docs/pl/Makefile || die "sed failed"
+
+	sed -i \
+		-e 's/ISO-8859-1/UTF-8/' \
+		"${S}"/lib/gconsole.py || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	# Nothing to compile and default `emake` spews an error message
+	true
+}
+
+src_install() {
+	if ! use doc ; then
+		sed -i -e '/docs/d' Makefile || die
+	fi
+
+	emake \
+		LIBDIR="${D}/usr/$(get_libdir)/griffith" \
+		DESTDIR="${D}" DOC2MAN=docbook2man.pl install
+	dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS
+
+	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/" || die
+	emake DESTDIR="${D}" install
+	# This carries over from -0.13 but appears to have no effect.
+	python_optimize "${ED}"/usr/share/${PN}
+}
+
+pkg_postinst() {
+	einfo
+	einfo "${PN} can make use of the following optional dependencies"
+	einfo "dev-python/chardet: CSV file encoding detections"
+	einfo "dev-python/mysql-python: Python interface for MySQL connectivity"
+	einfo ">=dev-python/psycopg-2.4: Python interface for PostgreSQL connectivity"
+	einfo
+}
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 0dcfceeddeb6..c55fc9b07cf9 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -7,6 +7,6 @@ AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287
 DIST handbrake-1.2.2.tar.bz2 18010777 BLAKE2B 75ace4565bef22a6ee8cd3291a393dd20d9a8fcc57b16bca15393f9a5f18949bf104ad69b536453013598ea3dc0ddbceddf85b96e234f09ef2c119810242f48e SHA512 434e6db1acbe01771aeefd2f257bdc58ad84e63ba441f4977f634b9ccb3c708176b928adf1dfa9e20d4948b65876ae9b4dfdc35f9c56f03f34858380090ab29c
 DIST handbrake-1.3.0.tar.bz2 16801695 BLAKE2B 2a71674f557562317ed643064f252f3f88815a0b2fbbf9478f79efdd18282304443a29120effdce8ed9b07d00896d0946be0a7f4a94ae65252f9935c97829fb4 SHA512 40801a5a3756feb33f374e68e7ed743841d33f7a6b22dd2361034f182b32cdcead3ff02a7a6e16f0ffbc7b693541747b048dc606deadf7a8e490aad193e07c4d
 EBUILD handbrake-1.2.2-r3.ebuild 4117 BLAKE2B 03d2185c1a1e8533dcb3b99b1c3ac2c2b48aee108ca6bd5c6901781b5e8d571616f7f50cd99801499c2df06c72731da885e5b86d9d0f5362376ca81c9de84ec1 SHA512 3dd3f38c4881fe5a90257019b8989081ef8dbf5f55120759953af31a75266df8d5c7fe547548ebbfcdaeae4e4ba43f3e33ae991fae530279079332d9a89a4c5b
-EBUILD handbrake-1.3.0-r2.ebuild 4275 BLAKE2B 43fddc9f49b339b9e6257c9e02131334a373f52c503a99be228ce9a5b87b2fd5d8c9abd0a68f119f180911979020c8d9e78efe6d351590e11a4d3412727e9663 SHA512 0a8d3c598653c32da03d568e0a2d5b441cc2b276788d139359bad8388293576f87a389f461650ad59bb3b13d8061abf1e967e4f69be3ef0a6a8374d64edfdd93
-EBUILD handbrake-9999.ebuild 4213 BLAKE2B 4bb317de8260b88f39ddc997c7c2fc60a1901c7105d04f2624d9f324b5851c4d6744d029b0387accc23b3609859c8a334a8c6c9eff7517581683b3b01d7a2e68 SHA512 c035fe2e012f3e2aae938f75628a3f503f5cf76648e46b3ba8deabfde0ce99a8a3e13bfc764b824b0e6182f877881ca42ef1e06752d7e6341da7498e957d2a49
+EBUILD handbrake-1.3.0-r2.ebuild 4265 BLAKE2B e563616a46b2b818201ba7a80860b2cc3f2112b84b42263aa0614a59ae4e857784e891d05dfc93897022f47c86f39466394f3d2b1cd936b05c6678644ee469d7 SHA512 9f577f7040689ecbe5c6e7562f7bf6f2e05bd8740bb2bd4642e5d83b612be37db427de3161190872a903864e5ce0933d5c28f3f2b8f1f164fdf50dd5f2983044
+EBUILD handbrake-9999.ebuild 4203 BLAKE2B f4502d19371e87031eb4ece62144e3bb1eb68d467072dbf54350ff59fd766300d9a0a05753bfb897c61b09a2e6f50773961f18e9d59e5e36592b48fdd990dd04 SHA512 9b7219856c3f100e6560050eb1c84f6bdbdd50a08bb83ec41d431f7f01463c118b0179a82a61aa442290876a0bbca914e36c951453fd30a1235d26a27bc85766
 MISC metadata.xml 1019 BLAKE2B 041873a5db7246fc3a6c6b5544fc4c28b981e6e15996c68c53413fabc46ada335333936e4e6ab160f6fad2b9eafafdb9f37d6651cb692e0d69f814acb02557f5 SHA512 41bb1e4656da0cf4a99fd158da5dcf9ccef2b4355f2cdb8e0017a84d8a65cc21ab382734dd967eaeeaf2d55c11e617e6dabe28eeb0bdd40388e8325a8e4ae42a
diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
index e5f8e2714182..6c8e01b4f37e 100644
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 59a9c3a97a83..753a5a361561 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools eutils gnome2-utils python-any-r1 xdg-utils
 
diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index de68763705e3..798444f57b50 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,5 +1,7 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
+DIST openshot-2.5.0.tar.gz 60153193 BLAKE2B cdc79c68be7cd5b9e2714c98c4edbb5fc9ec349283da8439e9f9e26b2341688e2b8ae0f108413f59582d6e447faeb96d1da6916503299ca40939d73f5983377f SHA512 0944bff48c8957a4a3c5a37428b4d3e45e8ad6e1664812ea90b7c16d014a3c355daf2fe183ce855586114ccfa36c419b6baacc42c4bf871de29bda4c24f2a814
 DIST openshot-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
-EBUILD openshot-2.4.0-r1.ebuild 1271 BLAKE2B 7cdf661ce20add5534d4b56dc3f0480c49a8867c87f435dabe2cf2a4250c6bfc205c6212d40aef0e896ce2d53d3e99906ff20dc1c05ed902bc0b5f2c736b6a5d SHA512 44debba712fb7d542989ee48262f73684f899dc8a92a67563c27754b197c3bbd51e49e5d95d85ee031db5d6b165120bbaf9c1fe581774155deb3266f45b3f097
-EBUILD openshot-2.4.4.ebuild 1206 BLAKE2B 2b56cc68d695cc6e7b3bb482e2b13d5bfe7abcfc8c7091fce0712881f2136b847b43010980bdd38d8b355bbf7183216c44c8dabea480e97d965ce67173cd5d01 SHA512 37bfc6c50c940fb2f8cc75d34074242478bfa6f5ab5dc4ac3b23772499923bdc93e04dd5682c7a5122d89f244a1bac2f9446db74c17df4a6c5629baa9e138164
+EBUILD openshot-2.4.0-r1.ebuild 1283 BLAKE2B 1ca81c34d0d99593719c65c38ec59df75df5ba937ab6f62482a885068f36c5cdebde2bc351d97ab873cdcd87cb7eef6fb5303868ce687ee81526c4030da47f40 SHA512 5a86460edd21308837e2172cbbaa4cc2a02f567982de61b287a294db1d22457598a77113e4ce5f284900c8788703b643075d82885bfefdcad1ead65016fbe1e0
+EBUILD openshot-2.4.4-r1.ebuild 1265 BLAKE2B 1a8dc1f69f0b7c357b10bde0a6d49b3a0731798fd714bbfe0202838d19b74de9144db6e2f0c2efd4f3d1027bc6a3aad9c36bf4df0ad5973d8a5e6497fd7aeb27 SHA512 e4d50ed1ed5ca1d417f5aa3e9951e3c107d66b03acef17040007aa2c0985ae9bea16b2e877e23b68e9d084975c76e8c40b78b083206aad3e69296a1cac2444bc
+EBUILD openshot-2.5.0.ebuild 1238 BLAKE2B 3b0d72a809439def72602de855d7a31efb10a6b94196014b0207b54bf115e1064528351d43fee4fab266ba5aef05bfffe671dc2946df1d8c8d2dc771d49f2408 SHA512 6d1e743de1520665bcec187d981f3c4fa27fae6c969308a9532f2f07b2a091d42b529d844bd96f7940e8ec9e40cde686bde0f7c42e335306299cfbf90841abd7
 MISC metadata.xml 636 BLAKE2B 08e8c695bf15de910bb90ebe5fef7b6883ce1fac03eb6c7de660d280cb402c5a70befd6e99dc281aa76098322439e2c4bff48e63ade946fa390dfe5f1ccbe156 SHA512 1b736005e9564431798291c83f1ccba5de2b03ba18b41a0fe400e2b2b58020fb0863e6aad2c348191f5903f288ed4fef1cef1e7615bbc3e97f2deb35633b5bd4
diff --git a/media-video/openshot/openshot-2.4.0-r1.ebuild b/media-video/openshot/openshot-2.4.0-r1.ebuild
index cbde49448910..e426ccbfaa58 100644
--- a/media-video/openshot/openshot-2.4.0-r1.ebuild
+++ b/media-video/openshot/openshot-2.4.0-r1.ebuild
@@ -21,14 +21,13 @@ SLOT="1"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/libopenshot-0.1.8[python,${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},svg,webkit]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.1.8[python,${PYTHON_SINGLE_USEDEP}]
 "
 
 S="${WORKDIR}"
diff --git a/media-video/openshot/openshot-2.4.4-r1.ebuild b/media-video/openshot/openshot-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..cf2c948c325c
--- /dev/null
+++ b/media-video/openshot/openshot-2.4.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE=xml
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+MY_PN="${PN}-qt"
+
+DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.2.3[python,${PYTHON_SINGLE_USEDEP}]
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-video/openshot/openshot-2.4.4.ebuild b/media-video/openshot/openshot-2.4.4.ebuild
deleted file mode 100644
index 954d0061c562..000000000000
--- a/media-video/openshot/openshot-2.4.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE=xml
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-MY_PN="${PN}-qt"
-
-DESCRIPTION="Free, open-source, non-linear video editor to create and edit videos and movies"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,webkit,widgets]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/libopenshot-0.2.3[python,${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-	# prevent setup.py from trying to update MIME databases
-	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-video/openshot/openshot-2.5.0.ebuild b/media-video/openshot/openshot-2.5.0.ebuild
new file mode 100644
index 000000000000..3d62b7ccd98f
--- /dev/null
+++ b/media-video/openshot/openshot-2.5.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE=xml
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg
+
+MY_PN="${PN}-qt"
+
+DESCRIPTION="An award-winning free and open-source video editor"
+HOMEPAGE="https://www.openshot.org/"
+SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.2.4[python,${PYTHON_SINGLE_USEDEP}]
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	distutils-r1_python_prepare_all
+	# prevent setup.py from trying to update MIME databases
+	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/media-video/photofilmstrip/Manifest b/media-video/photofilmstrip/Manifest
index 18c13196ebda..1b2a5430b1ef 100644
--- a/media-video/photofilmstrip/Manifest
+++ b/media-video/photofilmstrip/Manifest
@@ -1,4 +1,4 @@
 AUX photofilmstrip-3.7.1-disable-docs-by-default.patch 379 BLAKE2B 8af4a4e5ab1f407ba72dad0975a5f17e2eb245a42484dcfcb996a785dc2a49c4e5c22a5136e4dc0c375dc0dc16baeb4cc4ef60b7ec21b48b6f11fadc91383e3f SHA512 92f24eac04653e2be160872a553d96d1d0c763c50879fc124ae3dd9a3f84d7988274965f122eb4ba7709ee9f65409e7d24fda36693129cf55a8d2cd26a4bc539
 DIST photofilmstrip-3.7.1.tar.gz 354585 BLAKE2B df1e8756677814f35a59d7f4d3585647393e37262eb80c3299805cb0811cdfb4a16c96f90aaa192469266805145db68a582671a34f2b2780b75f1e0318460bd7 SHA512 fc2284c6c52eea5d9a6415149681e26505d6e084ad31897c44cde8e2b4845584b8521b375da06fd0a59179bfa73f6aabe769caad7a8186d5f87ecacebaff24fb
-EBUILD photofilmstrip-3.7.1.ebuild 2051 BLAKE2B 39fef7729c1c511e73a5277bb43b50f24c3d266c889288c43f5731e584fb3b2abd155fec2b220ac9226fcb800590fb09d97221661a156d67449360a7b659ba43 SHA512 95e925c4e701916effd7b078de5145c6e8ae10f5f71a653f9aeb7bfc043c41ed936d5437ea75781aec98c2d35d07b6d0f8fea73f0c38a4ca6e338147b5860826
+EBUILD photofilmstrip-3.7.1-r1.ebuild 2141 BLAKE2B 5018c0076339c9571ac84a955b232c3ccbc1b816e3c62cb7cbb57ad1d8c7dee671939ec721ca19dfebcfcf0158e8b15905a8513c077ad4500be9fe63f6a45b48 SHA512 15b71ba2c85dfbf838475a972b274ba51d10a8c6bef9436a2088f3fc16447624c0b4b4034455f8efda556f709244aa4c931bf6fe0f1d30ca3ebe4830daabf011
 MISC metadata.xml 683 BLAKE2B 517c2479c9ce8b3d78afd530cd6f97fcd6fefc73aaffc889584729035151d40fdd5cfe8efcf285aa5e6f3522af8825dab0e214cd5f252bb69da3f5c2b6f17c44 SHA512 58801972ef5326f757ce11964e47267df3b199f36290d0d81d3fecc97f59f678a110c107082d8d8bdebd54fc7268dd75a463a089aa22361157f4770f0d6b7251
diff --git a/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild b/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
new file mode 100644
index 000000000000..642f93edc0e6
--- /dev/null
+++ b/media-video/photofilmstrip/photofilmstrip-3.7.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils xdg-utils
+
+DESCRIPTION="Movie slideshow creator using Ken Burns effect"
+HOMEPAGE="https://www.photofilmstrip.org/en/ https://github.com/PhotoFilmStrip"
+SRC_URI="https://github.com/PhotoFilmStrip/PFS/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/gst-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+	')
+	media-plugins/gst-plugins-jpeg:1.0
+	x11-libs/wxGTK:*[X]"
+DEPEND="
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+PATCHES=( "${FILESDIR}/${P}-disable-docs-by-default.patch" )
+
+src_prepare() {
+	default
+
+	# fix 'unexpected path' QA warning on einstalldocs
+	sed -i 's|"share", "doc", "photofilmstrip"|"share", "doc", "'${PF}'"|g' setup.py ||
+	die "Fixing unexpected path failed."
+
+	# build html docs
+	if use doc; then
+		sed -i 's/Sphinx = None/from sphinx.application import Sphinx/g' -i setup.py ||
+		die "Failed to enable building docs with sphinx."
+	fi
+
+	# fix a QA issue with .desktop file
+	sed -i '/Version=/d' data/photofilmstrip.desktop || die "Failed to update .desktop file."
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	doman docs/manpage/*.1
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	optfeature "additional rendering formats" media-plugins/gst-plugins-bad
+	optfeature "additional rendering formats" media-plugins/gst-plugins-good
+	optfeature "additional rendering formats" media-plugins/gst-plugins-ugly
+	optfeature "ogg/theora support" media-libs/gst-plugins-base[theora]
+	optfeature "h264 (MKV/MP4) support" media-plugins/gst-plugins-x264
+	optfeature "h265 (MKV) support" media-plugins/gst-plugins-x265
+	optfeature "MPEG 1/2 (DVD) support" media-plugins/gst-plugins-mpeg2enc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild b/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
deleted file mode 100644
index bd308e4f0daa..000000000000
--- a/media-video/photofilmstrip/photofilmstrip-3.7.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils xdg-utils
-
-DESCRIPTION="Movie slideshow creator using Ken Burns effect"
-HOMEPAGE="https://www.photofilmstrip.org/en/ https://github.com/PhotoFilmStrip"
-SRC_URI="https://github.com/PhotoFilmStrip/PFS/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-python/gst-python[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-	media-plugins/gst-plugins-jpeg:1.0
-	x11-libs/wxGTK:*[X]"
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/${P}-disable-docs-by-default.patch" )
-
-src_prepare() {
-	default
-
-	# fix 'unexpected path' QA warning on einstalldocs
-	sed -i 's|"share", "doc", "photofilmstrip"|"share", "doc", "'${PF}'"|g' setup.py ||
-	die "Fixing unexpected path failed."
-
-	# build html docs
-	if use doc; then
-		sed -i 's/Sphinx = None/from sphinx.application import Sphinx/g' -i setup.py ||
-		die "Failed to enable building docs with sphinx."
-	fi
-
-	# fix a QA issue with .desktop file
-	sed -i '/Version=/d' data/photofilmstrip.desktop || die "Failed to update .desktop file."
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	doman docs/manpage/*.1
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	optfeature "additional rendering formats" media-plugins/gst-plugins-bad
-	optfeature "additional rendering formats" media-plugins/gst-plugins-good
-	optfeature "additional rendering formats" media-plugins/gst-plugins-ugly
-	optfeature "ogg/theora support" media-libs/gst-plugins-base[theora]
-	optfeature "h264 (MKV/MP4) support" media-plugins/gst-plugins-x264
-	optfeature "h265 (MKV) support" media-plugins/gst-plugins-x265
-	optfeature "MPEG 1/2 (DVD) support" media-plugins/gst-plugins-mpeg2enc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index b53dbc63c253..282c92e35e5c 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -1,4 +1,4 @@
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
-EBUILD pitivi-0.999.ebuild 2359 BLAKE2B 838f7e07298b0a4ef28062f2f8fcd0eb8e7adb3de88c793024a3aa7edad26c2bab690162cdc44d5427d649bf4c39518ead94de84bd43055d89a6b400f5c51635 SHA512 cec1fc77970885bdeed0fe049f5d80d318c9519b01c5d4fd676887bce84b33bf7744d37d6cceee437f08964d7ba9bf74a5591cd97a535e47b4a471ece48d6ad9
+EBUILD pitivi-0.999-r1.ebuild 2500 BLAKE2B a588b27acf90e8adc38585e091e5c20f8e975b87a3ecc84b994c6f50549c4a80b19fd5e7e97bb8027c70a4c5d934a23bfe72930bfdf2b00bfb63fd2f6a4355ab SHA512 26119b42f0a1a7ab0099e092e6de114afa88fd508ede595f0061d63035ba56f326062ce60c89184427d146f11f7077d6833bd6a9177d1c318936972addddee5f
 MISC metadata.xml 379 BLAKE2B a4f21a8cd6e5f4b09d1a89e426610108ab92ba52ef432d1780d100e76e43dda198cee09f105aec83994d4d1fa701be6c33a5981253b6c38b8ec888da08b5975a SHA512 30023299fba3c7c3743e24223d36366e7b59b01540a874ff432b8431ab29b240fdcd4ac4066b228af5421b009cfe4f67fdb69f7d1030c0fa409a4d545ffd43d1
diff --git a/media-video/pitivi/pitivi-0.999-r1.ebuild b/media-video/pitivi/pitivi-0.999-r1.ebuild
new file mode 100644
index 000000000000..aa8949946c6b
--- /dev/null
+++ b/media-video/pitivi/pitivi-0.999-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome.org meson python-single-r1 virtualx xdg
+
+DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
+HOMEPAGE="http://www.pitivi.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="v4l test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# XXX: recommends gst-plugins-libav and frei0r-plugins
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# pycanberra, libav, libnotify and liwnck are optional
+GST_VER="1.14.2"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pycairo-1.10[${PYTHON_MULTI_USEDEP}]
+	')
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+	>=media-plugins/gst-transcoder-1.8.2-r1
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.30.0:2
+
+	>=dev-libs/gobject-introspection-1.34:=
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/gst-python-1.4:1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.8:3[${PYTHON_MULTI_USEDEP}]
+	')
+
+	gnome-base/librsvg:=
+	>=media-libs/gsound-1.0
+
+	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
+	>=media-libs/gst-plugins-good-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
+
+	>=x11-libs/libnotify-0.7[introspection]
+	x11-libs/libwnck:3[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+
+	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/yelp-tools
+	dev-python/setuptools
+	>=dev-util/intltool-0.35.5
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/nose2[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	# Make tests optional, bug #594096
+	# https://gitlab.gnome.org/GNOME/pitivi/issues/2303
+	"${FILESDIR}"/${P}-optional-tests.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Denable-tests=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	export PITIVI_TOP_LEVEL_DIR="${S}"
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"
+}
diff --git a/media-video/pitivi/pitivi-0.999.ebuild b/media-video/pitivi/pitivi-0.999.ebuild
deleted file mode 100644
index 0478303d98c0..000000000000
--- a/media-video/pitivi/pitivi-0.999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome.org meson python-single-r1 virtualx xdg
-
-DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
-HOMEPAGE="http://www.pitivi.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="v4l test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# XXX: recommends gst-plugins-libav and frei0r-plugins
-
-# Do not forget to check pitivi/check.py for dependencies!!!
-# pycanberra, libav, libnotify and liwnck are optional
-GST_VER="1.14.2"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
-	>=x11-libs/cairo-1.10
-
-	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
-	>=media-plugins/gst-transcoder-1.8.2-r1
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/glib-2.30.0:2
-
-	>=dev-libs/gobject-introspection-1.34:=
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
-
-	gnome-base/librsvg:=
-	>=media-libs/gsound-1.0
-
-	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection]
-	>=media-libs/gst-plugins-bad-${GST_VER}:1.0[gtk]
-	>=media-libs/gst-plugins-good-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
-	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
-
-	>=x11-libs/libnotify-0.7[introspection]
-	x11-libs/libwnck:3[introspection]
-	>=x11-libs/gtk+-3.20.0:3[introspection]
-
-	v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/yelp-tools
-	dev-python/setuptools
-	>=dev-util/intltool-0.35.5
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-python/nose2[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	# Make tests optional, bug #594096
-	# https://gitlab.gnome.org/GNOME/pitivi/issues/2303
-	"${FILESDIR}"/${P}-optional-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Denable-tests=$(usex test true false)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-}
-
-src_test() {
-	export PITIVI_TOP_LEVEL_DIR="${S}"
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"
-}
diff --git a/media-video/pymp/Manifest b/media-video/pymp/Manifest
index 98908057572a..a7c5d6dec776 100644
--- a/media-video/pymp/Manifest
+++ b/media-video/pymp/Manifest
@@ -1,3 +1,3 @@
 DIST pymp-1.1.tar.bz2 132710 BLAKE2B 4c834ed96a6436daf6c29fea3e6eeab4e93c03b39897e904650640e4b27b856674f584caa1ef658069cc71c3f83dbab917319290d974641053e848682a7da3dd SHA512 10647af1233c5a030cc32f5efb7790fb93568832547f8c886d49597cff36f5d5606b7b06c00c0206e9eacd6331dbb40bc2331dc30230052b4510be1ffec34500
-EBUILD pymp-1.1-r1.ebuild 1002 BLAKE2B 3f4de8bf37c80393bda131c14dbd0c7f8f93a99c37573a77a3e8010ec6fc442f73a76f7973f23520369efa357e5f77694730245e8bfaff85452563065aa8d1be SHA512 019e9254b4ffea10124599cadf0220d7234ba692ba4fa973b446d2eda04cede65ad59738b4ebc7a7c465ee13245e21162d95e734daa766892779d37c85077859
+EBUILD pymp-1.1-r2.ebuild 1035 BLAKE2B 9b2fcf6f91e958270e93878a4e2d55a6702522f9ee512a1770ede6664da1cc73feca24bfa6cb696c7b626f858a56450398ae87c5d96ef454056147d1897189c1 SHA512 c547be7911917902a18d5a7efe6b92ee3aecb532bcfd517f35588c76b368bc3d9c9664ad63bae21a1589a4507729f012665b8d6c6f30c8512fcac9211b840095
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/pymp/pymp-1.1-r1.ebuild b/media-video/pymp/pymp-1.1-r1.ebuild
deleted file mode 100644
index b9fb82683b78..000000000000
--- a/media-video/pymp/pymp-1.1-r1.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
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-DESCRIPTION="a lean, flexible frontend to mplayer written in python"
-HOMEPAGE="http://jdolan.dyndns.org/trac/wiki/Pymp"
-SRC_URI="http://jdolan.dyndns.org/jaydolan/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-video/mplayer
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="sys-apps/sed"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_compile() {
-	python_fix_shebang pymp.py
-}
-
-src_install() {
-	python_moduleinto /usr/lib/pymp
-	python_domodule *.py
-
-	# note: pymp script is a horrible unnecessary wrapper
-	# a) with a dependency on sys-apps/which;
-	# b) that invokes compiled .pyc directly
-	# do not use it
-	dodir /usr/bin
-	dosym ../lib/pymp/pymp.py /usr/bin/pymp
-	fperms +x /usr/lib/pymp/pymp.py
-
-	dodoc CHANGELOG README
-	doicon pymp.png
-	make_desktop_entry pymp Pymp pymp
-}
diff --git a/media-video/pymp/pymp-1.1-r2.ebuild b/media-video/pymp/pymp-1.1-r2.ebuild
new file mode 100644
index 000000000000..2ce35400dcf3
--- /dev/null
+++ b/media-video/pymp/pymp-1.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="a lean, flexible frontend to mplayer written in python"
+HOMEPAGE="http://jdolan.dyndns.org/trac/wiki/Pymp"
+SRC_URI="http://jdolan.dyndns.org/jaydolan/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-video/mplayer
+	$(python_gen_cond_dep '
+		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}"
+DEPEND="sys-apps/sed"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_compile() {
+	python_fix_shebang pymp.py
+}
+
+src_install() {
+	python_moduleinto /usr/lib/pymp
+	python_domodule *.py
+
+	# note: pymp script is a horrible unnecessary wrapper
+	# a) with a dependency on sys-apps/which;
+	# b) that invokes compiled .pyc directly
+	# do not use it
+	dodir /usr/bin
+	dosym ../lib/pymp/pymp.py /usr/bin/pymp
+	fperms +x /usr/lib/pymp/pymp.py
+
+	dodoc CHANGELOG README
+	doicon pymp.png
+	make_desktop_entry pymp Pymp pymp
+}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 558dc9d96dee..c5e500f1d3f5 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,5 +1,5 @@
 AUX 3.26-gst-inspect-sandbox.patch 1789 BLAKE2B b3bca8f3b5ae8baa2b1767fa09b0d389ea49a105534e99cd0614ddb383a492bb0b3a1a142f3a9c2c840f04242a3b5c4d0f12baaf9ad5a48f74d94f9e0dcc1429 SHA512 821fbf78ad33157e7508364849bc1690657713301b06d62ffde126c7c06a1a019f690cdb66b3728b18c03a60fe201be513d6392a5cfd9181fff783f7b93e1a9b
 AUX 3.32.1-control-plugins.patch 4548 BLAKE2B bafca1010119387693f8acf6b107235677ab2b674e72d6e65da6cf1124e34da05be990adc2a824d3c12fdb1f97e656a03e954900e8329bd412f4c7827f69e319 SHA512 70e0b783d57912eeb2055062eb1b5b980f2f1f54c8e6d5fe9a77936587693008f5f15d982511a8b20b08aecc270fa38d691f13a7632ddcc52f1cad17b4349be7
 DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
-EBUILD totem-3.32.1-r1.ebuild 3101 BLAKE2B 23892d3bc99c6de484934f5282f123774b99bffcbac1fdb0e0676af8c6565bd4189b6b3e6a52a7792965fd9e15d1b3e9c26875f8159efc3436e6057211c4ea66 SHA512 778619ac4ca20f3eb9197c0af9120dbbdf3225bfd9dec605a015d771cc19400f756eff9df2713c24dd0b3ce8fa5e5088bcf37063bafb00ccc0d00f85ac1dee0c
+EBUILD totem-3.32.1-r2.ebuild 3186 BLAKE2B d75f3aa485c4a540306121e78410880135f3e62fe72197840a12a7b54d4558c0d762bb5eabeee1b50db748807fbd450247e71733ad461e8ba50410f29563a0ae SHA512 6663251bb8990af94e942ce6da26e7e10b4100fcf0392bea09e7c97e3e37f4ddf36858379110bef8df239054cef4ea4adb06fb42be641b729df8098824419e75
 MISC metadata.xml 1137 BLAKE2B 4ea20f132e41d6a3d0ca93b5e104445e79ca5db7dbee4e64bdd017f1d5ed3ad3334cdb5ec7dbe1115633698a4ca3faa53ff2e9cffb06d9b83cc81d4955036a36 SHA512 382661d42acb8bc1b8831da810aba91127992530dd6b7677a23005355d70b9c09ad31e37daedbe63a772ac4f34db52b72a244be8977d32cc5f78c4bc78a18e9b
diff --git a/media-video/totem/totem-3.32.1-r1.ebuild b/media-video/totem/totem-3.32.1-r1.ebuild
deleted file mode 100644
index 0a1b3d38e9a1..000000000000
--- a/media-video/totem/totem-3.32.1-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
-
-DESCRIPTION="Media player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="cdr gtk-doc +introspection lirc +python test"
-# see bug #359379
-REQUIRED_USE="
-	python? ( introspection ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-# FIXME:
-# Runtime dependency on gnome-session-2.91
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.19.4:3[introspection?]
-	>=media-libs/gstreamer-1.6.0:1.0
-	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
-	>=media-libs/gst-plugins-good-1.6.0:1.0
-	>=media-libs/grilo-0.3.0:0.3[playlist]
-	>=dev-libs/libpeas-1.1.0[gtk]
-	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
-	>=media-libs/clutter-1.17.3:1.0[gtk]
-	>=media-libs/clutter-gst-2.99.2:3.0
-	>=media-libs/clutter-gtk-1.8.1:1.0
-	gnome-base/gnome-desktop:3=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.14
-	x11-libs/gdk-pixbuf:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-
-	cdr? ( >=dev-libs/libxml2-2.6:2 )
-	lirc? ( app-misc/lirc )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
-"
-RDEPEND="${DEPEND}
-	media-plugins/grilo-plugins:0.3
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	x11-themes/adwaita-icon-theme
-	python? (
-		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
-		dev-python/dbus-python[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-lang/perl
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.5 )
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-# perl for pod2man
-# Prevent dev-python/pylint dep, bug #482538
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-control-plugins.patch # Do not force all plugins
-	"${FILESDIR}"/3.26-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# Disabled: samplepython
-	local plugins="apple-trailers,autoload-subtitles"
-	plugins+=",im-status,media-player-keys,properties"
-	plugins+=",recent,rotation,save-file,screensaver,screenshot"
-	plugins+=",skipto,variable-rate,vimeo"
-	use cdr && plugins+=",brasero-disc-recorder"
-	use lirc && plugins+=",lirc"
-	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
-
-	local emesonargs=(
-		-Denable-easy-codec-installation=yes
-		-Denable-python=$(usex python yes no)
-		-Dwith-plugins=${plugins}
-		$(meson_use gtk-doc enable-gtk-doc)
-		-Denable-introspection=$(usex introspection yes no)
-		-Dgst-inspect=false
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use python ; then
-		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/media-video/totem/totem-3.32.1-r2.ebuild b/media-video/totem/totem-3.32.1-r2.ebuild
new file mode 100644
index 000000000000..dc7f5d912604
--- /dev/null
+++ b/media-video/totem/totem-3.32.1-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="cdr gtk-doc +introspection lirc +python test"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+
+# FIXME:
+# Runtime dependency on gnome-session-2.91
+DEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.19.4:3[introspection?]
+	>=media-libs/gstreamer-1.6.0:1.0
+	>=media-libs/gst-plugins-base-1.6.0:1.0[pango]
+	>=media-libs/gst-plugins-good-1.6.0:1.0
+	>=media-libs/grilo-0.3.0:0.3[playlist]
+	>=dev-libs/libpeas-1.1.0[gtk]
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.8.1:1.0
+	gnome-base/gnome-desktop:3=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+
+	cdr? ( >=dev-libs/libxml2-2.6:2 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-2.90.3:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	media-plugins/grilo-plugins:0.3
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+BDEPEND="
+	dev-lang/perl
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.5 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+# perl for pod2man
+# Prevent dev-python/pylint dep, bug #482538
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-control-plugins.patch # Do not force all plugins
+	"${FILESDIR}"/3.26-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# Disabled: samplepython
+	local plugins="apple-trailers,autoload-subtitles"
+	plugins+=",im-status,media-player-keys,properties"
+	plugins+=",recent,rotation,save-file,screensaver,screenshot"
+	plugins+=",skipto,variable-rate,vimeo"
+	use cdr && plugins+=",brasero-disc-recorder"
+	use lirc && plugins+=",lirc"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+
+	local emesonargs=(
+		-Denable-easy-codec-installation=yes
+		-Denable-python=$(usex python yes no)
+		-Dwith-plugins=${plugins}
+		$(meson_use gtk-doc enable-gtk-doc)
+		-Denable-introspection=$(usex introspection yes no)
+		-Dgst-inspect=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use python ; then
+		python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 60f91e472148..0cd69ad67c19 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,7 +4,7 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.8.ebuild 13113 BLAKE2B 74c803645380d5ebdd9a38368e1ea12c6ef30999efcb53303d92e2acdd73ae92b1df473369a5adc3ea465d6c96169bdf87d60104f769ff4a6570fc34667c36ce SHA512 b82d345e198838297d5001ea80191adf694abe151b4bfa6c58d31b0b9cf2794458d341efbe5bf3e97d6a710df65eb05fb22ef79a6b084ec01699eacb6affe95f
-EBUILD vlc-3.0.9999.ebuild 13118 BLAKE2B 3c6f37e7bf28f15ba51a461270657900b11689bf42b2360cc62b13e8d16eccafb1cb02b3cf7f21fc443f9e6d7a9e24af494c5f10a509230fc56b85b9044c35c3 SHA512 ce64b488341416225f9dc3c24b7dcfb2a6e60d734e517a839c2807be10471c06dabc9841e55fb2f9a1b423798805969818d1ed21b14ff5a0c5e764c7638ce1f9
-EBUILD vlc-9999.ebuild 13057 BLAKE2B 357665845d812917c6e6833839a96aca5fb837041fa9b21d8d32293bf7185072a234c8e831cce3150a8d07edda3c25186856da200661d7731a2249d2fa55839d SHA512 6f13e5f234dc210281b411df857dcdab56806ab8613fa07857276354f1552506329379f02a38e7f98ef074ad5811740180beefb5e3d860a7b866b89c033df530
+EBUILD vlc-3.0.8.ebuild 13116 BLAKE2B bae61a9cfc2da25c4865451413718db7bf0ee19ab33f54e267ad6ba8e6397b04f0f095a8373cd42a8b6f172d79a9dc6de9d29be23d9ab19c61fd109a92d7db59 SHA512 cb22519b6872790fff32b3461b4240f7da539953215f2dc2f61f716913a11d3f7f2c3201f08bab7a79b477b43d5fbb691f50f243ec516657596bf109090cecb4
+EBUILD vlc-3.0.9999.ebuild 13121 BLAKE2B 65ba26a978b35ccb8f8c81d0d7d7af138ad2a4f74edac8da093449f85acbe84995cdd9c18f57060b12085d657c748e68d4371e4dbe7ea5c51ce5873fa806b99f SHA512 fa7c99805959f3dca296d4d3d4af9e0de379e3eca3566fc6d6e30e20f6df94c6899b26de38c456c860e9406a1236ac5ceb9e94b2225e8ee69626b27602ee6124
+EBUILD vlc-9999.ebuild 13060 BLAKE2B 0838c7fb13d400f997870b0781823163d399a7e834d85f2e686b4887a14c2cc6ea84d1c3a3a638bc23bf8bc37abfaf1d843820c914df747836939321fb4abdb8 SHA512 f82bba1e42ff0b0804fcc12e3d6e451671782adb08fdd85c076bfcffbadf3ba9aceef172fb798c1c25dfc629771018c33d9e6d885b818dcb6adffb77817516b0
 MISC metadata.xml 4914 BLAKE2B 9cc2e2e3d4da8bb4c5ec63bc5c0e4b7b9e6e5c567ba0b1c515d806e0ec0fe4a90b15406a6c978a2e37b91805ef922182cc09057364203b641c64365d95b2a9b8 SHA512 37ef990f0444d819d8b68da62a5929964e3d247339347c84ddc929b608b358efa94503caeb379ce1c39dfda4fac3c679db33a7d590d8dd09d7e2552f482cd889
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index 91eb7fe2f527..1365a0718a5e 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -150,7 +150,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 8fad44625193..9e019812fe14 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -150,7 +150,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 6f1c27b496de..116dc942964c 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,7 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
 	nfs? ( >=net-fs/libnfs-0.10.0:= )
 	ogg? ( media-libs/libogg )
-	opencv? ( media-libs/opencv:= )
+	opencv? ( <media-libs/opencv-4:= )
 	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
 	postproc? ( libav? ( media-libs/libpostproc ) )
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b2f113d1740a..3d76a24f43f4 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f997de2c7d66..be70808d571a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Feb 2020 17:38:55 +0000
+Mon, 10 Feb 2020 20:08:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index eb0c95824429..aa7ecf3a8ee6 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 450288 BLAKE2B 3798da941a15fcee18382da626450662d799e35257d8ad4a0b1552a6ddaae69d623b969c7ea2a3ff528f29e7ea6067f37208f6499dc6674753bd8f0bc73ac9b6 SHA512 c989a03018fd5d5d0ec3658457962a1285eb9736eaf370cd03c34b1c2e6807a141280958db2771efc54eda1120570c478512f7e244686722c0c6fc53bcfde64c
-TIMESTAMP 2020-02-05T17:38:58Z
+TIMESTAMP 2020-02-10T20:08:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl46/bJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl5BuFhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBfqw//YnapMTfueG0xlJho/uzDoafoVGfnkwxD+wiLlYvTI4rx2BXfUEOoH+A4
-0ISv/HDbBIt2y9bArJ/Xt9AKKSmHT0g5P0inC8wCcSv7u0s631WLye4hJj2nke/G
-vLXkxeRenpmAWLjVLTacNGSQG7j7tXgWJ5K7LSBashLRPYI+k+CzDcEMg+lgtWlq
-Gf7seyNF+nm/eBa79NfHe3S5fgMpC6DhjjhcuRcnf6enSEV2jQcc2DOZfTJ+9Ijg
-diyMbM5YwWSKlf4ulMCANxA9lL/q7cjQPSXSxV/DASDuge8t8Ad360Z5KanULoGc
-qUCpEDZySIgjSWwUeWvqzW1ChvlubZDUS0yUWKcwMkOXPkiRN23208fJtAJnlDJa
-3WAg6ojLiO4fjJv/DQ2993c9LIAwJYcOU5+zyD66O+hhzAlp7qPIe4CRRYN0vEhX
-VPQXUduK5Andukrpr40O0KK7Joa64f6lB4gyIc4WFgY3tlYTfQ5vXULDTlyDIG6O
-AyoBAzCQG527hY6xFoYF9jHV0p9cbHZrR/luPKmIueM0yyXY6m/DhcpqP/Y4NB6F
-Z19G7EWitIJwPZBM1+eg6dI7Ww5GygjOBj5aJbFNTTcOMmNdO/U/NyEhkUndyYW/
-ErHfVgiAjFU5pgnpyRPhwcPFYkulDlUlbBU0bPcBWbR8yt21NBw=
-=CMVl
+klBalQ/9Gqq0wQqAuz37NGlaL5ZIXYScaXMFHoIkUeLaOV2gAIhZ0+JRkGtDjWU7
+PSFtsENjtOLlXLpBUeeygBVgULpjkWTn0lIWeOGYurI5J5KI4WC2OnPQMa/3vyZl
+aAcbzOFjHSdcb6IwGmFB4Kd3N7XlYXBlz/PL/4JjL7UdI8o8K6rYx3sheEoEJK5S
+uEzv6T5fxRXzU6dQ07cN8nXFoTDHXvmrw3F6elnGmiy0pNvDMJeHnXT4FAZER/hi
+vjgiG+EkoYY65MxFdXnuECKsP1YBIxNP0RXUNBXRoG+Y+qVBHM6f87blyACRga97
+nwBo+jbsU5wEV+bNLXcEg/82LkP+8zMZSzZj35hl5/ikks0Z6+FrmeG/k8+qwHLT
+uOdMMUqwk4x+7JOzCuXANE4RngMBd6R3/UC2QsNcoTALDPR7BfPm/kiiVjEG1mxQ
+Yh0cvowULCPtmlM1rIr83NZlMm+D0fS4HjGQXctiFT6s4oo7daAQJjGzvVP1rs9I
+sFFntp67bcp5ICr+NeYYUOV8ss7Jhf2bjqa6IxBco9UqX9/i98oemAGPQGM22bQv
+AI5fmfG2qwTvNYzdrTVGqCwBthLc7crjd68K1WtFeSeCx5Lmjy2ocjxv4dVZaOEe
++kvT1Ru3vHAAKkpTpIDsoz0rN6M4JJ4KZxNQP20zEE7mGr0N/OE=
+=GKa2
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f997de2c7d66..be70808d571a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Feb 2020 17:38:55 +0000
+Mon, 10 Feb 2020 20:08:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index db673fdccaaf..0da98e416798 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index d07d5c20ecf3..3627064d26a8 100644
--- a/metadata/md5-cache/acct-group/Manifest.gz
+++ b/metadata/md5-cache/acct-group/Manifest.gz
diff --git a/metadata/md5-cache/acct-group/adm-0 b/metadata/md5-cache/acct-group/adm-0
index 10e331f45477..6c1759ed1458 100644
--- a/metadata/md5-cache/acct-group/adm-0
+++ b/metadata/md5-cache/acct-group/adm-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: adm
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=39d71964f4abdd9dbcb7e1d46f8465ff
diff --git a/metadata/md5-cache/acct-group/amule-0 b/metadata/md5-cache/acct-group/amule-0
index ef250f75900a..bc96c557acc9 100644
--- a/metadata/md5-cache/acct-group/amule-0
+++ b/metadata/md5-cache/acct-group/amule-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-p2p/amule
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c29b2069aed0cdb0ec1e5020f1b24f83
diff --git a/metadata/md5-cache/acct-group/asterisk-0 b/metadata/md5-cache/acct-group/asterisk-0
index d77183be463f..4857d2c89eab 100644
--- a/metadata/md5-cache/acct-group/asterisk-0
+++ b/metadata/md5-cache/acct-group/asterisk-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for asterisk
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=49c6c5e707bde0994b4a6ea1dbb5ae1f
diff --git a/metadata/md5-cache/acct-group/audio-0 b/metadata/md5-cache/acct-group/audio-0
index 7be25d5f0a01..800dc751dffa 100644
--- a/metadata/md5-cache/acct-group/audio-0
+++ b/metadata/md5-cache/acct-group/audio-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: audio
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b73f5838fb249b20a45bae74eb578ea6
diff --git a/metadata/md5-cache/acct-group/automx2-0 b/metadata/md5-cache/acct-group/automx2-0
index b273fc02e9e7..d9be17dc8005 100644
--- a/metadata/md5-cache/acct-group/automx2-0
+++ b/metadata/md5-cache/acct-group/automx2-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for www-servers/automx2
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d7884f278a1790dae94edc7e31df370a
diff --git a/metadata/md5-cache/acct-group/avahi-0 b/metadata/md5-cache/acct-group/avahi-0
index f6bb7026ba2e..e94d6c2130a3 100644
--- a/metadata/md5-cache/acct-group/avahi-0
+++ b/metadata/md5-cache/acct-group/avahi-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for avahi
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3067c5893393c6a37d04222a9ef488a4
diff --git a/metadata/md5-cache/acct-group/avahi-autoipd-0 b/metadata/md5-cache/acct-group/avahi-autoipd-0
index 299c29048b67..78b5436145cc 100644
--- a/metadata/md5-cache/acct-group/avahi-autoipd-0
+++ b/metadata/md5-cache/acct-group/avahi-autoipd-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for avahi-autoipd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6fc37fa157e5e768ef980c7606615062
diff --git a/metadata/md5-cache/acct-group/bacula-0 b/metadata/md5-cache/acct-group/bacula-0
index 3f9a03d69ba8..809e98fe81fb 100644
--- a/metadata/md5-cache/acct-group/bacula-0
+++ b/metadata/md5-cache/acct-group/bacula-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the bacula backup system
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=054692d2a0146d98fb8d14494de21fad
diff --git a/metadata/md5-cache/acct-group/bedrock-0 b/metadata/md5-cache/acct-group/bedrock-0
index 616ef0d7f7d0..7a885b4f5209 100644
--- a/metadata/md5-cache/acct-group/bedrock-0
+++ b/metadata/md5-cache/acct-group/bedrock-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Minecraft Bedrock server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d6a3955aedbf661a0fcc1831e2c7cecc
diff --git a/metadata/md5-cache/acct-group/bitcoin-0 b/metadata/md5-cache/acct-group/bitcoin-0
index b1e49cb872a8..1006eb480444 100644
--- a/metadata/md5-cache/acct-group/bitcoin-0
+++ b/metadata/md5-cache/acct-group/bitcoin-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for users with access to system-wide Bitcoin services
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8efe6f15eb91a9af987038c9861c24fe
diff --git a/metadata/md5-cache/acct-group/burp-0 b/metadata/md5-cache/acct-group/burp-0
index 3d8d9ceda086..9fde4726b671 100644
--- a/metadata/md5-cache/acct-group/burp-0
+++ b/metadata/md5-cache/acct-group/burp-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the app-backup/burp server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e3d5e39d1b95bf9351ca5517d737081b
diff --git a/metadata/md5-cache/acct-group/cdrom-0 b/metadata/md5-cache/acct-group/cdrom-0
index dfd6d0b16af1..e2f5c986477d 100644
--- a/metadata/md5-cache/acct-group/cdrom-0
+++ b/metadata/md5-cache/acct-group/cdrom-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: cdrom
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b9858db51d09305b00374dd08cbb7889
diff --git a/metadata/md5-cache/acct-group/ceph-0 b/metadata/md5-cache/acct-group/ceph-0
index 064a6f43ad56..0db02e818ef5 100644
--- a/metadata/md5-cache/acct-group/ceph-0
+++ b/metadata/md5-cache/acct-group/ceph-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: ceph
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c368b708f065fb4797ca8a85a0130970
diff --git a/metadata/md5-cache/acct-group/cinder-0 b/metadata/md5-cache/acct-group/cinder-0
index 181332372256..8e75828a7244 100644
--- a/metadata/md5-cache/acct-group/cinder-0
+++ b/metadata/md5-cache/acct-group/cinder-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: cinder
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2338b3f3fc4f4d39a2d711be9d060968
diff --git a/metadata/md5-cache/acct-group/clamav-0 b/metadata/md5-cache/acct-group/clamav-0
index 8851d937b49b..b47173492975 100644
--- a/metadata/md5-cache/acct-group/clamav-0
+++ b/metadata/md5-cache/acct-group/clamav-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: clamav
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=807db74c7e2a1423cbb6d42275fc080f
diff --git a/metadata/md5-cache/acct-group/cmd5checkpw-0 b/metadata/md5-cache/acct-group/cmd5checkpw-0
index 4319d4104a63..94c762f43cd1 100644
--- a/metadata/md5-cache/acct-group/cmd5checkpw-0
+++ b/metadata/md5-cache/acct-group/cmd5checkpw-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: cmd5checkpw
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9caaa23dddff76dcbb4ffc354805400f
diff --git a/metadata/md5-cache/acct-group/davfs2-0 b/metadata/md5-cache/acct-group/davfs2-0
index f32a0a93838f..d6d6fb3a1703 100644
--- a/metadata/md5-cache/acct-group/davfs2-0
+++ b/metadata/md5-cache/acct-group/davfs2-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: davfs2
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=811977e983d56622e3535a9f8d6d305e
diff --git a/metadata/md5-cache/acct-group/ddclient-0 b/metadata/md5-cache/acct-group/ddclient-0
index 5e47bbd77141..de852289bca6 100644
--- a/metadata/md5-cache/acct-group/ddclient-0
+++ b/metadata/md5-cache/acct-group/ddclient-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the dynamic DNS client
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fb40b31b6f503ed1a980ae287aca8ea7
diff --git a/metadata/md5-cache/acct-group/deluge-0 b/metadata/md5-cache/acct-group/deluge-0
index 80aec7f0ca23..88759de72e8e 100644
--- a/metadata/md5-cache/acct-group/deluge-0
+++ b/metadata/md5-cache/acct-group/deluge-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: deluge
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=be89bf87c0f5b7aca5e475fb2703dcbd
diff --git a/metadata/md5-cache/acct-group/dhcp-0 b/metadata/md5-cache/acct-group/dhcp-0
index bab55a86c89c..1b6412c3e079 100644
--- a/metadata/md5-cache/acct-group/dhcp-0
+++ b/metadata/md5-cache/acct-group/dhcp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dhcp
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a5b3357b396326f7db8c294bb55251fe
diff --git a/metadata/md5-cache/acct-group/dhcpcd-0 b/metadata/md5-cache/acct-group/dhcpcd-0
new file mode 100644
index 000000000000..e6a869677f3a
--- /dev/null
+++ b/metadata/md5-cache/acct-group/dhcpcd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: dhcpcd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
+SLOT=0
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=fa6ae70fc5fe03b606309c3bc9bd6562
diff --git a/metadata/md5-cache/acct-group/dialout-0 b/metadata/md5-cache/acct-group/dialout-0
index 1d46d3f1f93e..9cdd1167f8db 100644
--- a/metadata/md5-cache/acct-group/dialout-0
+++ b/metadata/md5-cache/acct-group/dialout-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dialout
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a1ad90b55d7bd6ef91bc53934e20abd3
diff --git a/metadata/md5-cache/acct-group/disk-0 b/metadata/md5-cache/acct-group/disk-0
index 4c19956016ff..921df333b2ef 100644
--- a/metadata/md5-cache/acct-group/disk-0
+++ b/metadata/md5-cache/acct-group/disk-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: disk
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a20b02cceaa021d9949929392bf56367
diff --git a/metadata/md5-cache/acct-group/dnscrypt-proxy-0 b/metadata/md5-cache/acct-group/dnscrypt-proxy-0
index 5c1a3b98e403..235fe29f531a 100644
--- a/metadata/md5-cache/acct-group/dnscrypt-proxy-0
+++ b/metadata/md5-cache/acct-group/dnscrypt-proxy-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-dns/dnscrypt-proxy
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=06f43a467097deec8d1d5e97e07d40a2
diff --git a/metadata/md5-cache/acct-group/dnsmasq_exporter-0 b/metadata/md5-cache/acct-group/dnsmasq_exporter-0
index c6526c332a5f..0471e7b762ac 100644
--- a/metadata/md5-cache/acct-group/dnsmasq_exporter-0
+++ b/metadata/md5-cache/acct-group/dnsmasq_exporter-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dnsmasq_exporter
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8e4a90152ee0889d2eb93e35015b97fc
diff --git a/metadata/md5-cache/acct-group/docker-0 b/metadata/md5-cache/acct-group/docker-0
index 39e258a822c1..651b889e02a1 100644
--- a/metadata/md5-cache/acct-group/docker-0
+++ b/metadata/md5-cache/acct-group/docker-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: docker
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b75dd269af84d92273d7d2d9283739ca
diff --git a/metadata/md5-cache/acct-group/dovecot-0 b/metadata/md5-cache/acct-group/dovecot-0
index 50bb9311b9f6..bdbb13d4517e 100644
--- a/metadata/md5-cache/acct-group/dovecot-0
+++ b/metadata/md5-cache/acct-group/dovecot-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dovecot
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=307acf2708b69ed1a49b782fcbcbfd3a
diff --git a/metadata/md5-cache/acct-group/dovenull-0 b/metadata/md5-cache/acct-group/dovenull-0
index c987b06545e1..28d073dc366f 100644
--- a/metadata/md5-cache/acct-group/dovenull-0
+++ b/metadata/md5-cache/acct-group/dovenull-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: dovenull
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bae488a748de7501577bafd1d52abeb6
diff --git a/metadata/md5-cache/acct-group/elasticsearch-0 b/metadata/md5-cache/acct-group/elasticsearch-0
index e4f623ce4f7d..0913576f8900 100644
--- a/metadata/md5-cache/acct-group/elasticsearch-0
+++ b/metadata/md5-cache/acct-group/elasticsearch-0
@@ -3,5 +3,5 @@ DESCRIPTION=Elasticsearch program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c781898f3a2a5c779c62444d0e11dc0e
diff --git a/metadata/md5-cache/acct-group/epmd-0 b/metadata/md5-cache/acct-group/epmd-0
index d71666777cd2..914c7aca2eaa 100644
--- a/metadata/md5-cache/acct-group/epmd-0
+++ b/metadata/md5-cache/acct-group/epmd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for Erlang Portmapper Daemon
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=62b448ad61c88acf2787a843221cb3a8
diff --git a/metadata/md5-cache/acct-group/fetchmail-0 b/metadata/md5-cache/acct-group/fetchmail-0
index 07a912e2530e..80c1d852396e 100644
--- a/metadata/md5-cache/acct-group/fetchmail-0
+++ b/metadata/md5-cache/acct-group/fetchmail-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-mail/fetchmail
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d5b312fce59f915af4aa369fd0945164
diff --git a/metadata/md5-cache/acct-group/fhem-0 b/metadata/md5-cache/acct-group/fhem-0
index b43a3f07559e..41190a4cd32a 100644
--- a/metadata/md5-cache/acct-group/fhem-0
+++ b/metadata/md5-cache/acct-group/fhem-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the FHEM perl server for house automation
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3aff19cab346f5a17f6815d97cc87ad3
diff --git a/metadata/md5-cache/acct-group/ftp-0 b/metadata/md5-cache/acct-group/ftp-0
index 33d135b4c13a..6c27b54c6a8b 100644
--- a/metadata/md5-cache/acct-group/ftp-0
+++ b/metadata/md5-cache/acct-group/ftp-0
@@ -3,5 +3,5 @@ DESCRIPTION=File Transfer Protocol server user
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e770669756dc3ee4457445a05f65adbf
diff --git a/metadata/md5-cache/acct-group/gamestat-0 b/metadata/md5-cache/acct-group/gamestat-0
index 587c631fe3f5..876ee90fe97d 100644
--- a/metadata/md5-cache/acct-group/gamestat-0
+++ b/metadata/md5-cache/acct-group/gamestat-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for shared high-score and game state files
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=388e0905310bf778877ef5218d2fa759
diff --git a/metadata/md5-cache/acct-group/geneweb-0 b/metadata/md5-cache/acct-group/geneweb-0
index 25befd60d2ff..13b8f968742d 100644
--- a/metadata/md5-cache/acct-group/geneweb-0
+++ b/metadata/md5-cache/acct-group/geneweb-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for geneweb daemon
 EAPI=7
 KEYWORDS=~amd64 ~x86
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2dcfc74aea034c280415c540cf473889
diff --git a/metadata/md5-cache/acct-group/gerbera-0 b/metadata/md5-cache/acct-group/gerbera-0
index 43d198124ded..3755bdb1a540 100644
--- a/metadata/md5-cache/acct-group/gerbera-0
+++ b/metadata/md5-cache/acct-group/gerbera-0
@@ -3,5 +3,5 @@ DESCRIPTION=Gerbera UPnP Media Server group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=05f5232d19adab18b26d0e4ce4996bfe
diff --git a/metadata/md5-cache/acct-group/git-0 b/metadata/md5-cache/acct-group/git-0
index de88056846e8..9200d6595bc4 100644
--- a/metadata/md5-cache/acct-group/git-0
+++ b/metadata/md5-cache/acct-group/git-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: git
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0f8adce0dd8913074e26d233a5527847
diff --git a/metadata/md5-cache/acct-group/gkrellmd-0 b/metadata/md5-cache/acct-group/gkrellmd-0
index eac7a74cd630..756db5431fa6 100644
--- a/metadata/md5-cache/acct-group/gkrellmd-0
+++ b/metadata/md5-cache/acct-group/gkrellmd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: gkrellmd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6e73e70bcd8ec52941c349a38f8257d2
diff --git a/metadata/md5-cache/acct-group/glance-0 b/metadata/md5-cache/acct-group/glance-0
index 4150507c8f48..8d3481a185da 100644
--- a/metadata/md5-cache/acct-group/glance-0
+++ b/metadata/md5-cache/acct-group/glance-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: glance
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4e0e15ccf19bfcfc90e85892a50b4cfc
diff --git a/metadata/md5-cache/acct-group/graylog-0 b/metadata/md5-cache/acct-group/graylog-0
index ff9da5affa89..0ee59f461bbc 100644
--- a/metadata/md5-cache/acct-group/graylog-0
+++ b/metadata/md5-cache/acct-group/graylog-0
@@ -3,5 +3,5 @@ DESCRIPTION=Graylog program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9108fd7df54daa040cced4052c2c1481
diff --git a/metadata/md5-cache/acct-group/gvm-0 b/metadata/md5-cache/acct-group/gvm-0
index a29c5a5c5c11..7a1b6cbc6083 100644
--- a/metadata/md5-cache/acct-group/gvm-0
+++ b/metadata/md5-cache/acct-group/gvm-0
@@ -3,5 +3,5 @@ DESCRIPTION=Greenbone vulnerability management program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=84783e4f6d9cdb64f1ce59bdac117c7b
diff --git a/metadata/md5-cache/acct-group/heat-0 b/metadata/md5-cache/acct-group/heat-0
index 89ef72c4d360..0e1594092d25 100644
--- a/metadata/md5-cache/acct-group/heat-0
+++ b/metadata/md5-cache/acct-group/heat-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: heat
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=33f81fce01773239f6d9362751ac6bd5
diff --git a/metadata/md5-cache/acct-group/i2p-0 b/metadata/md5-cache/acct-group/i2p-0
index 95f7be85a4ef..2319f05e3b40 100644
--- a/metadata/md5-cache/acct-group/i2p-0
+++ b/metadata/md5-cache/acct-group/i2p-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for system-wide net-vpn/i2p
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8e326f3d1153a991c0d1b33213c3924d
diff --git a/metadata/md5-cache/acct-group/i2pd-0 b/metadata/md5-cache/acct-group/i2pd-0
index 82801f83caf2..71d4a938653b 100644
--- a/metadata/md5-cache/acct-group/i2pd-0
+++ b/metadata/md5-cache/acct-group/i2pd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the system-wide net-vpn/i2pd server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=453194474be9865bd9669c2dd708e289
diff --git a/metadata/md5-cache/acct-group/input-0 b/metadata/md5-cache/acct-group/input-0
index a5c06bb7e9e5..03155bcb18e6 100644
--- a/metadata/md5-cache/acct-group/input-0
+++ b/metadata/md5-cache/acct-group/input-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: input
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=facd231a70bee907d514147f6adddc94
diff --git a/metadata/md5-cache/acct-group/inspircd-0 b/metadata/md5-cache/acct-group/inspircd-0
index 0047e8f6d11f..f18c4850df0c 100644
--- a/metadata/md5-cache/acct-group/inspircd-0
+++ b/metadata/md5-cache/acct-group/inspircd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: inspircd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a795520ec5641579d481dd2b0697614d
diff --git a/metadata/md5-cache/acct-group/ipfs-0 b/metadata/md5-cache/acct-group/ipfs-0
index ada1e243ebbb..50860cb1ee03 100644
--- a/metadata/md5-cache/acct-group/ipfs-0
+++ b/metadata/md5-cache/acct-group/ipfs-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the system-wide net-p2p/go-ipfs-bin server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=45098558a268a5a55b1f6d73ddfa3042
diff --git a/metadata/md5-cache/acct-group/keystone-0 b/metadata/md5-cache/acct-group/keystone-0
index e808bd2821bb..2854b6d89d8f 100644
--- a/metadata/md5-cache/acct-group/keystone-0
+++ b/metadata/md5-cache/acct-group/keystone-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: keystone
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3d0739f8634948fbc860e400bfcba344
diff --git a/metadata/md5-cache/acct-group/kibana-0 b/metadata/md5-cache/acct-group/kibana-0
index 56f8491a5cd4..4f10ea3aa42b 100644
--- a/metadata/md5-cache/acct-group/kibana-0
+++ b/metadata/md5-cache/acct-group/kibana-0
@@ -3,5 +3,5 @@ DESCRIPTION=Kibana program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0589731a7aa4db8784eaf2362f7ef020
diff --git a/metadata/md5-cache/acct-group/kmem-0 b/metadata/md5-cache/acct-group/kmem-0
index 489dce22b232..11dd995672a1 100644
--- a/metadata/md5-cache/acct-group/kmem-0
+++ b/metadata/md5-cache/acct-group/kmem-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kmem
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=10127a30128142690669f5c03c937f4e
diff --git a/metadata/md5-cache/acct-group/knot-0 b/metadata/md5-cache/acct-group/knot-0
index c0104a01fba4..8b9e0fecc5ef 100644
--- a/metadata/md5-cache/acct-group/knot-0
+++ b/metadata/md5-cache/acct-group/knot-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: knot
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2d26cd7f45a3e7ddb78f0fa0f149bd4f
diff --git a/metadata/md5-cache/acct-group/kube-apiserver-0 b/metadata/md5-cache/acct-group/kube-apiserver-0
index c4a959030fcc..bd72d4d6677c 100644
--- a/metadata/md5-cache/acct-group/kube-apiserver-0
+++ b/metadata/md5-cache/acct-group/kube-apiserver-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kube-apiserver
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c054b5f4f98783b29587e9174c912761
diff --git a/metadata/md5-cache/acct-group/kube-controller-manager-0 b/metadata/md5-cache/acct-group/kube-controller-manager-0
index 139326993264..87428a5befb9 100644
--- a/metadata/md5-cache/acct-group/kube-controller-manager-0
+++ b/metadata/md5-cache/acct-group/kube-controller-manager-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kube-controller-manager
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=31dfddf84d88ed7750a80b3ae58b8ede
diff --git a/metadata/md5-cache/acct-group/kube-scheduler-0 b/metadata/md5-cache/acct-group/kube-scheduler-0
index e704d9cffd40..0f4e1af7849d 100644
--- a/metadata/md5-cache/acct-group/kube-scheduler-0
+++ b/metadata/md5-cache/acct-group/kube-scheduler-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kube-scheduler
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4b17bf59c8edde8c9952fa0650a2b085
diff --git a/metadata/md5-cache/acct-group/kvm-0 b/metadata/md5-cache/acct-group/kvm-0
index 1617b2b5b021..7f08a3cc4b6e 100644
--- a/metadata/md5-cache/acct-group/kvm-0
+++ b/metadata/md5-cache/acct-group/kvm-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: kvm
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=067b2dfd01914e403a4c31ea6f6bb8c4
diff --git a/metadata/md5-cache/acct-group/libvirt-0 b/metadata/md5-cache/acct-group/libvirt-0
index 020be69429e7..6c51a3fbde8d 100644
--- a/metadata/md5-cache/acct-group/libvirt-0
+++ b/metadata/md5-cache/acct-group/libvirt-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: libvirt
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=002df7e4906cff6a8f6f26394482abaa
diff --git a/metadata/md5-cache/acct-group/lighttpd-0 b/metadata/md5-cache/acct-group/lighttpd-0
new file mode 100644
index 000000000000..b5ff77ed8d95
--- /dev/null
+++ b/metadata/md5-cache/acct-group/lighttpd-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: lighttpd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
+SLOT=0
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=2be863cecef258cae52996a81bd9a452
diff --git a/metadata/md5-cache/acct-group/logstash-0 b/metadata/md5-cache/acct-group/logstash-0
index 2385a565ae52..b8a8622ec854 100644
--- a/metadata/md5-cache/acct-group/logstash-0
+++ b/metadata/md5-cache/acct-group/logstash-0
@@ -3,5 +3,5 @@ DESCRIPTION=Logstash program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=861a900d93d5467bb8da8fd0adac01f9
diff --git a/metadata/md5-cache/acct-group/lp-0 b/metadata/md5-cache/acct-group/lp-0
index 68781c6efd2d..18fafcf5ce87 100644
--- a/metadata/md5-cache/acct-group/lp-0
+++ b/metadata/md5-cache/acct-group/lp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: lp
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=699dd3f5942b4f58c8a27283ad495391
diff --git a/metadata/md5-cache/acct-group/mail-0 b/metadata/md5-cache/acct-group/mail-0
index f55b154ed096..adf1a7bd28b6 100644
--- a/metadata/md5-cache/acct-group/mail-0
+++ b/metadata/md5-cache/acct-group/mail-0
@@ -3,5 +3,5 @@ DESCRIPTION=Mail program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e3067d3d912fccf59b2f4b2256a57add
diff --git a/metadata/md5-cache/acct-group/man-0 b/metadata/md5-cache/acct-group/man-0
index a72914cc57e2..554db6159308 100644
--- a/metadata/md5-cache/acct-group/man-0
+++ b/metadata/md5-cache/acct-group/man-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: man
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4c96f51f1389cf6ecdcdb10758ffad62
diff --git a/metadata/md5-cache/acct-group/memcached-0 b/metadata/md5-cache/acct-group/memcached-0
index 5f587ad9966f..8d700667d400 100644
--- a/metadata/md5-cache/acct-group/memcached-0
+++ b/metadata/md5-cache/acct-group/memcached-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: memcached
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1e325a3cdfb3722fda6e3aaa83d6a162
diff --git a/metadata/md5-cache/acct-group/messagebus-0 b/metadata/md5-cache/acct-group/messagebus-0
index 7309dde554ae..bbdb6c3ee8e9 100644
--- a/metadata/md5-cache/acct-group/messagebus-0
+++ b/metadata/md5-cache/acct-group/messagebus-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: messagebus
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1534290a1fff9dabea91ec6f8b5facd7
diff --git a/metadata/md5-cache/acct-group/milter-regex-0 b/metadata/md5-cache/acct-group/milter-regex-0
index 279766535264..59731955624d 100644
--- a/metadata/md5-cache/acct-group/milter-regex-0
+++ b/metadata/md5-cache/acct-group/milter-regex-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for mail-filter/milter-regex
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=53c54c448e630b9851d0a09ccf864f46
diff --git a/metadata/md5-cache/acct-group/minecraft-0 b/metadata/md5-cache/acct-group/minecraft-0
index bda5bacf3239..068bfabb18a1 100644
--- a/metadata/md5-cache/acct-group/minecraft-0
+++ b/metadata/md5-cache/acct-group/minecraft-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Minecraft server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0ac2f37208671fa68c6faeb53e64a554
diff --git a/metadata/md5-cache/acct-group/minetest-0 b/metadata/md5-cache/acct-group/minetest-0
index 999eb21a8606..6f3a6c54cf30 100644
--- a/metadata/md5-cache/acct-group/minetest-0
+++ b/metadata/md5-cache/acct-group/minetest-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Minetest server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a0e1e54358c1d20b4ff7a9275538ab88
diff --git a/metadata/md5-cache/acct-group/mongodb-0 b/metadata/md5-cache/acct-group/mongodb-0
index 9a1c35d3ae94..f24357ce9ed8 100644
--- a/metadata/md5-cache/acct-group/mongodb-0
+++ b/metadata/md5-cache/acct-group/mongodb-0
@@ -3,5 +3,5 @@ DESCRIPTION=MongoDB program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7168bb491e7712305a4135f2ebd3cf05
diff --git a/metadata/md5-cache/acct-group/mosquitto-0 b/metadata/md5-cache/acct-group/mosquitto-0
index 332c7d3ea2a7..9918759e5ac9 100644
--- a/metadata/md5-cache/acct-group/mosquitto-0
+++ b/metadata/md5-cache/acct-group/mosquitto-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the mosquitto MQTT broker
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9964002db136e9b2fba22f58708a14b0
diff --git a/metadata/md5-cache/acct-group/msmtpd-0 b/metadata/md5-cache/acct-group/msmtpd-0
index e7ceeea74563..ee93d8f1f915 100644
--- a/metadata/md5-cache/acct-group/msmtpd-0
+++ b/metadata/md5-cache/acct-group/msmtpd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: msmtpd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ad9ddb1047b6e114f628220b4b8ab4d5
diff --git a/metadata/md5-cache/acct-group/munin-0 b/metadata/md5-cache/acct-group/munin-0
index 88e2d4b50eae..85f37e720db0 100644
--- a/metadata/md5-cache/acct-group/munin-0
+++ b/metadata/md5-cache/acct-group/munin-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: munin
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ffaa3ceb6cc3adeaad181674e47fe5e5
diff --git a/metadata/md5-cache/acct-group/murmur-0 b/metadata/md5-cache/acct-group/murmur-0
index d7a4bd88fa8a..f840682c2622 100644
--- a/metadata/md5-cache/acct-group/murmur-0
+++ b/metadata/md5-cache/acct-group/murmur-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: murmur
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=870bb9cb21b6dfa6dbbe73789d526c4c
diff --git a/metadata/md5-cache/acct-group/mysql-0 b/metadata/md5-cache/acct-group/mysql-0
index bdcdc2306d51..46888e71079e 100644
--- a/metadata/md5-cache/acct-group/mysql-0
+++ b/metadata/md5-cache/acct-group/mysql-0
@@ -3,5 +3,5 @@ DESCRIPTION=MySQL program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d8c9ba10da6756eb6b8d6be422784cf0
diff --git a/metadata/md5-cache/acct-group/mythtv-0 b/metadata/md5-cache/acct-group/mythtv-0
index 47638dbb2e49..9f189ea061a8 100644
--- a/metadata/md5-cache/acct-group/mythtv-0
+++ b/metadata/md5-cache/acct-group/mythtv-0
@@ -3,5 +3,5 @@ DESCRIPTION=Mythtv mythbackend server/deamon group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=94f7181abb848deb3e897ead1ec51843
diff --git a/metadata/md5-cache/acct-group/nagios-0 b/metadata/md5-cache/acct-group/nagios-0
index 63ec1c90b575..7bca05f41432 100644
--- a/metadata/md5-cache/acct-group/nagios-0
+++ b/metadata/md5-cache/acct-group/nagios-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nagios
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=326535b7e0fc7dd8049f7228af275525
diff --git a/metadata/md5-cache/acct-group/netbox-0 b/metadata/md5-cache/acct-group/netbox-0
index 2d2207087c11..7fc69369e122 100644
--- a/metadata/md5-cache/acct-group/netbox-0
+++ b/metadata/md5-cache/acct-group/netbox-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: netbox
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=65ef9a0acf0ef3eb808cc22bb6b14ca3
diff --git a/metadata/md5-cache/acct-group/netdata-0 b/metadata/md5-cache/acct-group/netdata-0
index a2fef815c7b7..82862268a5f3 100644
--- a/metadata/md5-cache/acct-group/netdata-0
+++ b/metadata/md5-cache/acct-group/netdata-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: netdata
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=48e09487af82b5d21c249fd930d5fbd6
diff --git a/metadata/md5-cache/acct-group/netdev-0 b/metadata/md5-cache/acct-group/netdev-0
index 81977dbf616a..972db12ea9e4 100644
--- a/metadata/md5-cache/acct-group/netdev-0
+++ b/metadata/md5-cache/acct-group/netdev-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for netdev (avahi)
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=eaa51fc47a62ebc5d502ad5e3e76f991
diff --git a/metadata/md5-cache/acct-group/neutron-0 b/metadata/md5-cache/acct-group/neutron-0
index c44abca19a47..49607686f766 100644
--- a/metadata/md5-cache/acct-group/neutron-0
+++ b/metadata/md5-cache/acct-group/neutron-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: neutron
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c058f2e93fc39a15c0e0e4f13a8921a9
diff --git a/metadata/md5-cache/acct-group/nofiles-0 b/metadata/md5-cache/acct-group/nofiles-0
index a85518d86c86..f15fab9cd12e 100644
--- a/metadata/md5-cache/acct-group/nofiles-0
+++ b/metadata/md5-cache/acct-group/nofiles-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nofiles
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6392b25de4070019a25c20bfcf717e5f
diff --git a/metadata/md5-cache/acct-group/nova-0 b/metadata/md5-cache/acct-group/nova-0
index 8a9bee6e164c..37f16ca7cd19 100644
--- a/metadata/md5-cache/acct-group/nova-0
+++ b/metadata/md5-cache/acct-group/nova-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nova
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=68731c2a87b669070f2036a658e5378c
diff --git a/metadata/md5-cache/acct-group/nsd-0 b/metadata/md5-cache/acct-group/nsd-0
index 60166d3c05e2..d0bada036fb4 100644
--- a/metadata/md5-cache/acct-group/nsd-0
+++ b/metadata/md5-cache/acct-group/nsd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: nsd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=42c98ec2b9cb3d0ebf575318637d6302
diff --git a/metadata/md5-cache/acct-group/ntp-0 b/metadata/md5-cache/acct-group/ntp-0
index c8a3fdf5f12b..bfe2d47a5131 100644
--- a/metadata/md5-cache/acct-group/ntp-0
+++ b/metadata/md5-cache/acct-group/ntp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: ntp
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=55a88933342b8dbd93a66a73f0a50945
diff --git a/metadata/md5-cache/acct-group/oidentd-0 b/metadata/md5-cache/acct-group/oidentd-0
index b942243811ea..4da87306ef9b 100644
--- a/metadata/md5-cache/acct-group/oidentd-0
+++ b/metadata/md5-cache/acct-group/oidentd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: oidentd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=450b8648c688ccecafe4e05c98d2d3aa
diff --git a/metadata/md5-cache/acct-group/openct-0 b/metadata/md5-cache/acct-group/openct-0
index 74d9a99fb774..cd9c68b751e5 100644
--- a/metadata/md5-cache/acct-group/openct-0
+++ b/metadata/md5-cache/acct-group/openct-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: openct
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7ae8badd59b78a22a19e96bd974bccc1
diff --git a/metadata/md5-cache/acct-group/opendkim-0 b/metadata/md5-cache/acct-group/opendkim-0
index 417ec6be8e30..6c2ac89084a7 100644
--- a/metadata/md5-cache/acct-group/opendkim-0
+++ b/metadata/md5-cache/acct-group/opendkim-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for OpenDKIM
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4a24d2712880105f31f30aa9fce49542
diff --git a/metadata/md5-cache/acct-group/openntpd-0 b/metadata/md5-cache/acct-group/openntpd-0
index c53121f854d7..57d9228c0d1a 100644
--- a/metadata/md5-cache/acct-group/openntpd-0
+++ b/metadata/md5-cache/acct-group/openntpd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: openntpd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9a470c142646ab8c66294adc5fcaadbf
diff --git a/metadata/md5-cache/acct-group/openrct2-0 b/metadata/md5-cache/acct-group/openrct2-0
index 5b9789c13b69..119fa43450cf 100644
--- a/metadata/md5-cache/acct-group/openrct2-0
+++ b/metadata/md5-cache/acct-group/openrct2-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the OpenRCT2 dedicated server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2b8669b79cbdad6338a3f095c1528a35
diff --git a/metadata/md5-cache/acct-group/pcscd-0 b/metadata/md5-cache/acct-group/pcscd-0
index 639dc41bc4ac..54f371a07376 100644
--- a/metadata/md5-cache/acct-group/pcscd-0
+++ b/metadata/md5-cache/acct-group/pcscd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: pcscd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=aec8bc8ba57390489ba4fe0a4d3311bc
diff --git a/metadata/md5-cache/acct-group/pdnsd-0 b/metadata/md5-cache/acct-group/pdnsd-0
index 0ed35540e183..239ab07c4d84 100644
--- a/metadata/md5-cache/acct-group/pdnsd-0
+++ b/metadata/md5-cache/acct-group/pdnsd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: pdnsd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d553e3ed473ad56db2ff48168ecac299
diff --git a/metadata/md5-cache/acct-group/placement-0 b/metadata/md5-cache/acct-group/placement-0
index 49b21a51c284..7edb72b4e57e 100644
--- a/metadata/md5-cache/acct-group/placement-0
+++ b/metadata/md5-cache/acct-group/placement-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: placement
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7d315bb1371677e9fe580d9209b28041
diff --git a/metadata/md5-cache/acct-group/plex-0 b/metadata/md5-cache/acct-group/plex-0
index dc0dd6548cd2..285e7bf7efff 100644
--- a/metadata/md5-cache/acct-group/plex-0
+++ b/metadata/md5-cache/acct-group/plex-0
@@ -3,5 +3,5 @@ DESCRIPTION=Plex Media Server group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ed4fedb8b72771c007f0407b425d430f
diff --git a/metadata/md5-cache/acct-group/plugdev-0 b/metadata/md5-cache/acct-group/plugdev-0
index 3d0686748d21..d6c16633e745 100644
--- a/metadata/md5-cache/acct-group/plugdev-0
+++ b/metadata/md5-cache/acct-group/plugdev-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group controlling access to removable media
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e16f6667e906ada718d427073f2812b2
diff --git a/metadata/md5-cache/acct-group/polkitd-0 b/metadata/md5-cache/acct-group/polkitd-0
index aa9061d2c59c..370f6066308a 100644
--- a/metadata/md5-cache/acct-group/polkitd-0
+++ b/metadata/md5-cache/acct-group/polkitd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: polkitd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d217390593e0ce31f04ccb30a5e83e2d
diff --git a/metadata/md5-cache/acct-group/postdrop-0 b/metadata/md5-cache/acct-group/postdrop-0
index aea8e441d1e8..077b5d9c5897 100644
--- a/metadata/md5-cache/acct-group/postdrop-0
+++ b/metadata/md5-cache/acct-group/postdrop-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: postdrop
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1347bec1b03a8e003ee72bb1977b03ec
diff --git a/metadata/md5-cache/acct-group/postfix-0 b/metadata/md5-cache/acct-group/postfix-0
index d6b1e282130a..d0393975f29f 100644
--- a/metadata/md5-cache/acct-group/postfix-0
+++ b/metadata/md5-cache/acct-group/postfix-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: postfix
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1a82ca8b8472e1ff9e647b24a4b78d52
diff --git a/metadata/md5-cache/acct-group/prometheus-0 b/metadata/md5-cache/acct-group/prometheus-0
index 3fbe29cab6d7..94c80627b0de 100644
--- a/metadata/md5-cache/acct-group/prometheus-0
+++ b/metadata/md5-cache/acct-group/prometheus-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: prometheus
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8e64e090ccc75e7b0d343543baf1b432
diff --git a/metadata/md5-cache/acct-group/qemu-0 b/metadata/md5-cache/acct-group/qemu-0
index 4799a6e7861e..9d5fc4739a12 100644
--- a/metadata/md5-cache/acct-group/qemu-0
+++ b/metadata/md5-cache/acct-group/qemu-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: qemu
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a8bc544ee75754c59983fd84f9c7f6f4
diff --git a/metadata/md5-cache/acct-group/qmail-0 b/metadata/md5-cache/acct-group/qmail-0
index efdb97510872..c0ba1ab0fdbb 100644
--- a/metadata/md5-cache/acct-group/qmail-0
+++ b/metadata/md5-cache/acct-group/qmail-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: qmail
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7f94a143fa30ba2bce6af841ab69cb31
diff --git a/metadata/md5-cache/acct-group/quassel-0 b/metadata/md5-cache/acct-group/quassel-0
index ae205fd31fb9..56a021a2cb9e 100644
--- a/metadata/md5-cache/acct-group/quassel-0
+++ b/metadata/md5-cache/acct-group/quassel-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: quassel
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8068dce2d5b35117b7f126d122bdc234
diff --git a/metadata/md5-cache/acct-group/radius-0 b/metadata/md5-cache/acct-group/radius-0
index c0d428c75fdc..bc1c812b8b1e 100644
--- a/metadata/md5-cache/acct-group/radius-0
+++ b/metadata/md5-cache/acct-group/radius-0
@@ -3,5 +3,5 @@ DESCRIPTION=FreeRadius program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fb6e408aa036d4f41c08ea7b91f373da
diff --git a/metadata/md5-cache/acct-group/redis-0 b/metadata/md5-cache/acct-group/redis-0
index 518ece5e3703..d1094948276c 100644
--- a/metadata/md5-cache/acct-group/redis-0
+++ b/metadata/md5-cache/acct-group/redis-0
@@ -3,5 +3,5 @@ DESCRIPTION=Redis program group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e54df88df614dc2a0e51bab2867ab864
diff --git a/metadata/md5-cache/acct-group/redmine-0 b/metadata/md5-cache/acct-group/redmine-0
index dc5c1338e6a0..c58490993ac2 100644
--- a/metadata/md5-cache/acct-group/redmine-0
+++ b/metadata/md5-cache/acct-group/redmine-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: redmine
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e1e0c53a2a042ca7d5b3c084f0d31470
diff --git a/metadata/md5-cache/acct-group/render-0 b/metadata/md5-cache/acct-group/render-0
index d3ef2bbde0bb..9809bacdc994 100644
--- a/metadata/md5-cache/acct-group/render-0
+++ b/metadata/md5-cache/acct-group/render-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: render
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=141ce6e52ae209dc1e4812a47c68c24c
diff --git a/metadata/md5-cache/acct-group/rspamd-0 b/metadata/md5-cache/acct-group/rspamd-0
index 7f138b98ef3a..c7aecbb98ba8 100644
--- a/metadata/md5-cache/acct-group/rspamd-0
+++ b/metadata/md5-cache/acct-group/rspamd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for rspamd - Rapid spam filtering system
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2d7be109ae40148389cd9a1956d7234d
diff --git a/metadata/md5-cache/acct-group/rstudio-server-0 b/metadata/md5-cache/acct-group/rstudio-server-0
index 689574e6c3c4..f4cb1adc3d98 100644
--- a/metadata/md5-cache/acct-group/rstudio-server-0
+++ b/metadata/md5-cache/acct-group/rstudio-server-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for sci-mathematics/rstudio
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e26c106ae4cd9bb7027b3222b64cf4f4
diff --git a/metadata/md5-cache/acct-group/rtkit-0 b/metadata/md5-cache/acct-group/rtkit-0
index c40a65180b46..5c2fda49482e 100644
--- a/metadata/md5-cache/acct-group/rtkit-0
+++ b/metadata/md5-cache/acct-group/rtkit-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Realtime Policy and Watchdog Daemon
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=544ef464e978937b47790cdd5f445b9f
diff --git a/metadata/md5-cache/acct-group/shellinaboxd-0 b/metadata/md5-cache/acct-group/shellinaboxd-0
index edc6b8b1cb0d..d9531746cf01 100644
--- a/metadata/md5-cache/acct-group/shellinaboxd-0
+++ b/metadata/md5-cache/acct-group/shellinaboxd-0
@@ -3,5 +3,5 @@ DESCRIPTION=shellinabox group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=451f2183513582ce207d322a277d6330
diff --git a/metadata/md5-cache/acct-group/slurm-0 b/metadata/md5-cache/acct-group/slurm-0
index d2472eb3e928..84d7e8b843cb 100644
--- a/metadata/md5-cache/acct-group/slurm-0
+++ b/metadata/md5-cache/acct-group/slurm-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the slurm - Highly Scalable Resource Manager
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=87f9289a48adf386a0fbb41a68c65141
diff --git a/metadata/md5-cache/acct-group/smtpd-0 b/metadata/md5-cache/acct-group/smtpd-0
index 9853d08e12f7..72133c59e3b3 100644
--- a/metadata/md5-cache/acct-group/smtpd-0
+++ b/metadata/md5-cache/acct-group/smtpd-0
@@ -3,5 +3,5 @@ DESCRIPTION=daemon group for smtpd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c30685a7882b878d64668f0bfd9cc15c
diff --git a/metadata/md5-cache/acct-group/smtpq-0 b/metadata/md5-cache/acct-group/smtpq-0
index 664ccccfcbd5..c157c6febd2d 100644
--- a/metadata/md5-cache/acct-group/smtpq-0
+++ b/metadata/md5-cache/acct-group/smtpq-0
@@ -3,5 +3,5 @@ DESCRIPTION=queue group for smtpd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f833d30e72519019b0761d9c895c03ac
diff --git a/metadata/md5-cache/acct-group/sogo-0 b/metadata/md5-cache/acct-group/sogo-0
index c41c8a140201..cc838751d900 100644
--- a/metadata/md5-cache/acct-group/sogo-0
+++ b/metadata/md5-cache/acct-group/sogo-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for gnustep-apps/sogo
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4870abd9dbeb608f86178895139c90ec
diff --git a/metadata/md5-cache/acct-group/spectrum-0 b/metadata/md5-cache/acct-group/spectrum-0
index 568a9839a5d1..66d9ee216d6c 100644
--- a/metadata/md5-cache/acct-group/spectrum-0
+++ b/metadata/md5-cache/acct-group/spectrum-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the Spectrum messaging transport
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5e2dc3b7d066c85bb0235650b7fa011b
diff --git a/metadata/md5-cache/acct-group/spire-0 b/metadata/md5-cache/acct-group/spire-0
index ce653d7a7749..7e90d2ff7b20 100644
--- a/metadata/md5-cache/acct-group/spire-0
+++ b/metadata/md5-cache/acct-group/spire-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: spire
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=796313075561b9165534a586dc7ec080
diff --git a/metadata/md5-cache/acct-group/sqlgrey-0 b/metadata/md5-cache/acct-group/sqlgrey-0
index fa32ac225bbe..2d069c15cd5e 100644
--- a/metadata/md5-cache/acct-group/sqlgrey-0
+++ b/metadata/md5-cache/acct-group/sqlgrey-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for SQLGrey
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7a4b933013e060b790b5c866ad69e748
diff --git a/metadata/md5-cache/acct-group/squid-0 b/metadata/md5-cache/acct-group/squid-0
index 51d41dcdd8a2..b8d89d344d06 100644
--- a/metadata/md5-cache/acct-group/squid-0
+++ b/metadata/md5-cache/acct-group/squid-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: squid
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d62ae3398b0ef61de754e048c9483274
diff --git a/metadata/md5-cache/acct-group/sshd-0 b/metadata/md5-cache/acct-group/sshd-0
index 9bcaff84371d..a75561b5d11f 100644
--- a/metadata/md5-cache/acct-group/sshd-0
+++ b/metadata/md5-cache/acct-group/sshd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: sshd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=806fe511e66eff6943cb9b40e5f0d87a
diff --git a/metadata/md5-cache/acct-group/stdiscosrv-0 b/metadata/md5-cache/acct-group/stdiscosrv-0
index f8e13cfdd7ae..f0535f40a011 100644
--- a/metadata/md5-cache/acct-group/stdiscosrv-0
+++ b/metadata/md5-cache/acct-group/stdiscosrv-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Syncthing discovery server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5eac0e1089e8a2a06ba47f663a9ac5be
diff --git a/metadata/md5-cache/acct-group/steamcmd-0 b/metadata/md5-cache/acct-group/steamcmd-0
index f45cde37c42f..5dc98adbf4bc 100644
--- a/metadata/md5-cache/acct-group/steamcmd-0
+++ b/metadata/md5-cache/acct-group/steamcmd-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the SteamCMD server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f88a4e6b8c7ed4e23c410b7c5d103cc1
diff --git a/metadata/md5-cache/acct-group/strelaysrv-0 b/metadata/md5-cache/acct-group/strelaysrv-0
index cb2f24d011ba..3d721a9cbb22 100644
--- a/metadata/md5-cache/acct-group/strelaysrv-0
+++ b/metadata/md5-cache/acct-group/strelaysrv-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the Syncthing relay server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6962ba1fd37accc2190900fee6eea651
diff --git a/metadata/md5-cache/acct-group/stubby-0 b/metadata/md5-cache/acct-group/stubby-0
index bf8f38a1401e..1882038c0e86 100644
--- a/metadata/md5-cache/acct-group/stubby-0
+++ b/metadata/md5-cache/acct-group/stubby-0
@@ -3,5 +3,5 @@ DESCRIPTION=Stubby program group (from net-dns/getdns)
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c2fb213ff5be584d746ef5a6def4ecb8
diff --git a/metadata/md5-cache/acct-group/stunnel-0 b/metadata/md5-cache/acct-group/stunnel-0
index 9ed1c2ae93b4..6e3464632112 100644
--- a/metadata/md5-cache/acct-group/stunnel-0
+++ b/metadata/md5-cache/acct-group/stunnel-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for stunnel
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3046d020a1e659da9ccef029ae395d56
diff --git a/metadata/md5-cache/acct-group/suricata-0 b/metadata/md5-cache/acct-group/suricata-0
index a1680b57adc7..3e90de4f06e6 100644
--- a/metadata/md5-cache/acct-group/suricata-0
+++ b/metadata/md5-cache/acct-group/suricata-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for Suricata IDS
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=316bb514b720d956eba6153835e561e3
diff --git a/metadata/md5-cache/acct-group/swift-0 b/metadata/md5-cache/acct-group/swift-0
index 8184932d6a5c..837038158c4b 100644
--- a/metadata/md5-cache/acct-group/swift-0
+++ b/metadata/md5-cache/acct-group/swift-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: swift
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f85c78533012f1083d50060e1809ee47
diff --git a/metadata/md5-cache/acct-group/syncthing-0 b/metadata/md5-cache/acct-group/syncthing-0
index 22b07ef68d0a..4280bf3be666 100644
--- a/metadata/md5-cache/acct-group/syncthing-0
+++ b/metadata/md5-cache/acct-group/syncthing-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the system-wide net-p2p/syncthing server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9bab7067558a254e4301f6e26b97f00c
diff --git a/metadata/md5-cache/acct-group/systemd-coredump-0 b/metadata/md5-cache/acct-group/systemd-coredump-0
index 228ffb397cfa..ea329d6e1dc4 100644
--- a/metadata/md5-cache/acct-group/systemd-coredump-0
+++ b/metadata/md5-cache/acct-group/systemd-coredump-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-coredump
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ba03881d70141240f8785a9ebe9b635a
diff --git a/metadata/md5-cache/acct-group/systemd-journal-0 b/metadata/md5-cache/acct-group/systemd-journal-0
index 8f30724ff6a2..b4463b340af5 100644
--- a/metadata/md5-cache/acct-group/systemd-journal-0
+++ b/metadata/md5-cache/acct-group/systemd-journal-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-journal
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ee731e89b3add67d993214231cd448f4
diff --git a/metadata/md5-cache/acct-group/systemd-journal-remote-0 b/metadata/md5-cache/acct-group/systemd-journal-remote-0
index 2583fa6caa22..8ae7fed1668c 100644
--- a/metadata/md5-cache/acct-group/systemd-journal-remote-0
+++ b/metadata/md5-cache/acct-group/systemd-journal-remote-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-journal-remote
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b35bee456dacb3def84bb3102b9b9e16
diff --git a/metadata/md5-cache/acct-group/systemd-network-0 b/metadata/md5-cache/acct-group/systemd-network-0
index fc876e192e0b..fa903640b93b 100644
--- a/metadata/md5-cache/acct-group/systemd-network-0
+++ b/metadata/md5-cache/acct-group/systemd-network-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-network
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6105dc422955de35899eb33e050ed61d
diff --git a/metadata/md5-cache/acct-group/systemd-resolve-0 b/metadata/md5-cache/acct-group/systemd-resolve-0
index 7c139a96e2db..1978c0893335 100644
--- a/metadata/md5-cache/acct-group/systemd-resolve-0
+++ b/metadata/md5-cache/acct-group/systemd-resolve-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-resolve
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e4c7a1f08798faad650421105d7f17ec
diff --git a/metadata/md5-cache/acct-group/systemd-timesync-0 b/metadata/md5-cache/acct-group/systemd-timesync-0
index c467a3f83227..9ca4b1edcc0c 100644
--- a/metadata/md5-cache/acct-group/systemd-timesync-0
+++ b/metadata/md5-cache/acct-group/systemd-timesync-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: systemd-timesync
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=783e72d966ed013fde696067340924fd
diff --git a/metadata/md5-cache/acct-group/tape-0 b/metadata/md5-cache/acct-group/tape-0
index 2ba32450bc08..70b83c2c2bb0 100644
--- a/metadata/md5-cache/acct-group/tape-0
+++ b/metadata/md5-cache/acct-group/tape-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: tape
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a34fcb3d861044abe1f10d14972f679b
diff --git a/metadata/md5-cache/acct-group/teamspeak-0 b/metadata/md5-cache/acct-group/teamspeak-0
index 91183f30e7a0..8033763eb426 100644
--- a/metadata/md5-cache/acct-group/teamspeak-0
+++ b/metadata/md5-cache/acct-group/teamspeak-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the TeamSpeak server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3a4f071d6d3d7964df6e732cc98586e2
diff --git a/metadata/md5-cache/acct-group/telegraf-0 b/metadata/md5-cache/acct-group/telegraf-0
new file mode 100644
index 000000000000..56eaf987e360
--- /dev/null
+++ b/metadata/md5-cache/acct-group/telegraf-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=preinst pretend
+DESCRIPTION=System group: telegraf
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
+SLOT=0
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d7fee1e42b2bd162089d2dd2b97b2861
diff --git a/metadata/md5-cache/acct-group/tor-0 b/metadata/md5-cache/acct-group/tor-0
index 6d370fed8133..5a9309911446 100644
--- a/metadata/md5-cache/acct-group/tor-0
+++ b/metadata/md5-cache/acct-group/tor-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for tor daemon
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bb2f9bd4b191e31cef73e1d664fd6edc
diff --git a/metadata/md5-cache/acct-group/tox-0 b/metadata/md5-cache/acct-group/tox-0
index 4d01980c966b..851bcbe5affb 100644
--- a/metadata/md5-cache/acct-group/tox-0
+++ b/metadata/md5-cache/acct-group/tox-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group management for package net-libs/tox
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=638d52c97c3ee3959bebdc852b489031
diff --git a/metadata/md5-cache/acct-group/transmission-0 b/metadata/md5-cache/acct-group/transmission-0
index f1b30e9ac607..8d5c57683523 100644
--- a/metadata/md5-cache/acct-group/transmission-0
+++ b/metadata/md5-cache/acct-group/transmission-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: transmission
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=52e48d456339135bb9b1f5353a1e32bc
diff --git a/metadata/md5-cache/acct-group/tss-0 b/metadata/md5-cache/acct-group/tss-0
index 0ed9848d6d08..3e4331f78d94 100644
--- a/metadata/md5-cache/acct-group/tss-0
+++ b/metadata/md5-cache/acct-group/tss-0
@@ -3,5 +3,5 @@ DESCRIPTION=Trusted Software Stack for TPMs group
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4ed6162a29f40de863ac3aaae7173cd0
diff --git a/metadata/md5-cache/acct-group/tty-0 b/metadata/md5-cache/acct-group/tty-0
index fdca19b075bf..e036c4cd301b 100644
--- a/metadata/md5-cache/acct-group/tty-0
+++ b/metadata/md5-cache/acct-group/tty-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: tty
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=98be503d8e76c6be62c7f29d4f87d16d
diff --git a/metadata/md5-cache/acct-group/turnserver-0 b/metadata/md5-cache/acct-group/turnserver-0
index aca20ee291bb..9699b7213da1 100644
--- a/metadata/md5-cache/acct-group/turnserver-0
+++ b/metadata/md5-cache/acct-group/turnserver-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for a turn server like coturn
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=420f0043feaf030bdfe8c952a308746e
diff --git a/metadata/md5-cache/acct-group/unifi-0 b/metadata/md5-cache/acct-group/unifi-0
index c69604ab45a6..a7a21c4ccea4 100644
--- a/metadata/md5-cache/acct-group/unifi-0
+++ b/metadata/md5-cache/acct-group/unifi-0
@@ -3,5 +3,5 @@ DESCRIPTION=A group for the UniFi controller
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bcbabd7f7349a20158d04360d8ce3435
diff --git a/metadata/md5-cache/acct-group/unrealircd-0 b/metadata/md5-cache/acct-group/unrealircd-0
index dfdb32c1546e..6b08030ec499 100644
--- a/metadata/md5-cache/acct-group/unrealircd-0
+++ b/metadata/md5-cache/acct-group/unrealircd-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: unrealircd
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=260b93e0bc769d63e90462b952aebf54
diff --git a/metadata/md5-cache/acct-group/uptimed-0 b/metadata/md5-cache/acct-group/uptimed-0
index 49b25049817a..9c4eea46db16 100644
--- a/metadata/md5-cache/acct-group/uptimed-0
+++ b/metadata/md5-cache/acct-group/uptimed-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: uptimed
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8c781ce9bdbe5f5e6dabcf07ab1f663c
diff --git a/metadata/md5-cache/acct-group/usb-0 b/metadata/md5-cache/acct-group/usb-0
index a5f9262d7a8c..2ae961ee0685 100644
--- a/metadata/md5-cache/acct-group/usb-0
+++ b/metadata/md5-cache/acct-group/usb-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: usb
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9b830fe958385f19197b60db5157c4af
diff --git a/metadata/md5-cache/acct-group/utmp-0 b/metadata/md5-cache/acct-group/utmp-0
index 30a38a8f61c0..9c30657ccdec 100644
--- a/metadata/md5-cache/acct-group/utmp-0
+++ b/metadata/md5-cache/acct-group/utmp-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: utmp
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8aa5529f38fbd076d459ebaab1b8d848
diff --git a/metadata/md5-cache/acct-group/varnish-0 b/metadata/md5-cache/acct-group/varnish-0
index fd457bf96e3a..486b5cd04843 100644
--- a/metadata/md5-cache/acct-group/varnish-0
+++ b/metadata/md5-cache/acct-group/varnish-0
@@ -3,5 +3,5 @@ DESCRIPTION=group for varnish
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5ada394e0e0f0f0690ec54d87b3958a9
diff --git a/metadata/md5-cache/acct-group/video-0 b/metadata/md5-cache/acct-group/video-0
index e75a1011d42c..01a349a4620f 100644
--- a/metadata/md5-cache/acct-group/video-0
+++ b/metadata/md5-cache/acct-group/video-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: video
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a5f2bb515d6492d449d0c5ebee5ec612
diff --git a/metadata/md5-cache/acct-group/vpopmail-0 b/metadata/md5-cache/acct-group/vpopmail-0
index 91804b857b49..4617598e59c9 100644
--- a/metadata/md5-cache/acct-group/vpopmail-0
+++ b/metadata/md5-cache/acct-group/vpopmail-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: vpopmail
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fcca992c8d81e5fa05c251d359ab8178
diff --git a/metadata/md5-cache/acct-group/wheel-0 b/metadata/md5-cache/acct-group/wheel-0
index 01dc2baa3d03..468f33b0c706 100644
--- a/metadata/md5-cache/acct-group/wheel-0
+++ b/metadata/md5-cache/acct-group/wheel-0
@@ -3,5 +3,5 @@ DESCRIPTION=System group: wheel
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8bf40a3acada0f03317db54cd1ba0704
diff --git a/metadata/md5-cache/acct-group/x2goprint-0 b/metadata/md5-cache/acct-group/x2goprint-0
index cd9cec1b2219..deaecee20434 100644
--- a/metadata/md5-cache/acct-group/x2goprint-0
+++ b/metadata/md5-cache/acct-group/x2goprint-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-misc/x2goserver
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8553a78b4086dbd2c28c62eec795b329
diff --git a/metadata/md5-cache/acct-group/x2gouser-0 b/metadata/md5-cache/acct-group/x2gouser-0
index 77a8e04fccf2..9e9d3c73f54c 100644
--- a/metadata/md5-cache/acct-group/x2gouser-0
+++ b/metadata/md5-cache/acct-group/x2gouser-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for net-misc/x2goserver
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fa743ebbaa3f98cfe19f78eda378a3bf
diff --git a/metadata/md5-cache/acct-group/xrootd-0 b/metadata/md5-cache/acct-group/xrootd-0
index 8a8dca20b30e..329193dcb829 100644
--- a/metadata/md5-cache/acct-group/xrootd-0
+++ b/metadata/md5-cache/acct-group/xrootd-0
@@ -3,5 +3,5 @@ DESCRIPTION=Group for the XRootD server
 EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-group	7126fca4f6bf56620d1ce1fd317066fc	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d22ad4de39ccbe4aea539999ff793f0f
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 9a2286aca01b..7ea8b165377b 100644
--- a/metadata/md5-cache/acct-user/Manifest.gz
+++ b/metadata/md5-cache/acct-user/Manifest.gz
diff --git a/metadata/md5-cache/acct-user/alias-0 b/metadata/md5-cache/acct-user/alias-0
index b11d258926b7..562a89987275 100644
--- a/metadata/md5-cache/acct-user/alias-0
+++ b/metadata/md5-cache/acct-user/alias-0
@@ -5,5 +5,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nofiles acct-group/qmail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a6dc9632cc4d39a30252d9a4e172da62
diff --git a/metadata/md5-cache/acct-user/amule-0 b/metadata/md5-cache/acct-user/amule-0
index 9c8fb0b32a8e..92feaf198e28 100644
--- a/metadata/md5-cache/acct-user/amule-0
+++ b/metadata/md5-cache/acct-user/amule-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/amule
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d7602bcb3b8a44d7426c59f7d1ddd815
diff --git a/metadata/md5-cache/acct-user/asterisk-0 b/metadata/md5-cache/acct-user/asterisk-0
index 4ae6ca83e3e6..f58da6282508 100644
--- a/metadata/md5-cache/acct-user/asterisk-0
+++ b/metadata/md5-cache/acct-user/asterisk-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/asterisk acct-group/dialout
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2cb4dfe68980ce27765c6f11fed1ddff
diff --git a/metadata/md5-cache/acct-user/automx2-0 b/metadata/md5-cache/acct-user/automx2-0
index 724fd81ea499..5aa20d4aa7e6 100644
--- a/metadata/md5-cache/acct-user/automx2-0
+++ b/metadata/md5-cache/acct-user/automx2-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/automx2
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=eb1c547ae1a542486893f3d70a4d1901
diff --git a/metadata/md5-cache/acct-user/avahi-0 b/metadata/md5-cache/acct-user/avahi-0
index 5a46099652c8..724db4e02d94 100644
--- a/metadata/md5-cache/acct-user/avahi-0
+++ b/metadata/md5-cache/acct-user/avahi-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/avahi
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fe1e61d7b398ef70199a38057417b8be
diff --git a/metadata/md5-cache/acct-user/avahi-autoipd-0 b/metadata/md5-cache/acct-user/avahi-autoipd-0
index 70ccb8f22730..eba3b5098524 100644
--- a/metadata/md5-cache/acct-user/avahi-autoipd-0
+++ b/metadata/md5-cache/acct-user/avahi-autoipd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/avahi-autoipd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=de2a2c95003266d0aa483347041cacd7
diff --git a/metadata/md5-cache/acct-user/bacula-0 b/metadata/md5-cache/acct-user/bacula-0
index 225bd6a25690..df69be08346c 100644
--- a/metadata/md5-cache/acct-user/bacula-0
+++ b/metadata/md5-cache/acct-user/bacula-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/bacula acct-group/disk acct-group/tape acct-group/cdrom
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8ccc4d94d15137e771ae0ebd7e7bf805
diff --git a/metadata/md5-cache/acct-user/bedrock-0 b/metadata/md5-cache/acct-user/bedrock-0
index a9a71a18dea1..383e72996dd2 100644
--- a/metadata/md5-cache/acct-user/bedrock-0
+++ b/metadata/md5-cache/acct-user/bedrock-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/bedrock
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3f8ec9e85b86677c585a2f89cca60046
diff --git a/metadata/md5-cache/acct-user/bitcoin-0 b/metadata/md5-cache/acct-user/bitcoin-0
index a729932bd64f..891a056d1439 100644
--- a/metadata/md5-cache/acct-user/bitcoin-0
+++ b/metadata/md5-cache/acct-user/bitcoin-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/bitcoin
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=63daf8d0596a4fe92999f1b83c123aed
diff --git a/metadata/md5-cache/acct-user/burp-0 b/metadata/md5-cache/acct-user/burp-0
index ea2bbe90ce5a..58ef7a73afdd 100644
--- a/metadata/md5-cache/acct-user/burp-0
+++ b/metadata/md5-cache/acct-user/burp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/burp
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6d5ad09bfdcb80ddfad920300080b71c
diff --git a/metadata/md5-cache/acct-user/ceph-0 b/metadata/md5-cache/acct-user/ceph-0
index 9206f535712d..c453af67159c 100644
--- a/metadata/md5-cache/acct-user/ceph-0
+++ b/metadata/md5-cache/acct-user/ceph-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/ceph
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3ea4d95b910d1defb89b0590a04e70b5
diff --git a/metadata/md5-cache/acct-user/cinder-0 b/metadata/md5-cache/acct-user/cinder-0
index 5fea33a7c8b4..590104f2997d 100644
--- a/metadata/md5-cache/acct-user/cinder-0
+++ b/metadata/md5-cache/acct-user/cinder-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/cinder
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d6043b82f68f3c23301104449ea4661c
diff --git a/metadata/md5-cache/acct-user/clamav-0 b/metadata/md5-cache/acct-user/clamav-0
index f88acb91831d..609974976986 100644
--- a/metadata/md5-cache/acct-user/clamav-0
+++ b/metadata/md5-cache/acct-user/clamav-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/clamav
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7e3ed2c42096b55e9f6b00112ff16ea3
diff --git a/metadata/md5-cache/acct-user/cmd5checkpw-0 b/metadata/md5-cache/acct-user/cmd5checkpw-0
index 1faeb32e7492..be992e54f9cc 100644
--- a/metadata/md5-cache/acct-user/cmd5checkpw-0
+++ b/metadata/md5-cache/acct-user/cmd5checkpw-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b3bd6d514a014afdc4b40ced00a31acd
diff --git a/metadata/md5-cache/acct-user/davfs2-0 b/metadata/md5-cache/acct-user/davfs2-0
index 8b02a20deaea..a86acf588028 100644
--- a/metadata/md5-cache/acct-user/davfs2-0
+++ b/metadata/md5-cache/acct-user/davfs2-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/davfs2
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=87845b0c86cbda824a799fc0210bf97a
diff --git a/metadata/md5-cache/acct-user/ddclient-0 b/metadata/md5-cache/acct-user/ddclient-0
index 06ff7b71b4e9..de26a4695d06 100644
--- a/metadata/md5-cache/acct-user/ddclient-0
+++ b/metadata/md5-cache/acct-user/ddclient-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/ddclient
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d86bd0b3f264fb5ab1fb618e168e0dca
diff --git a/metadata/md5-cache/acct-user/deluge-0 b/metadata/md5-cache/acct-user/deluge-0
index 2cc910565e7a..bf1bc23d5ba4 100644
--- a/metadata/md5-cache/acct-user/deluge-0
+++ b/metadata/md5-cache/acct-user/deluge-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/deluge
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=95a25b0e84916ba6641636082d15e280
diff --git a/metadata/md5-cache/acct-user/dhcp-0 b/metadata/md5-cache/acct-user/dhcp-0
index 06d10192e49b..9c8780383109 100644
--- a/metadata/md5-cache/acct-user/dhcp-0
+++ b/metadata/md5-cache/acct-user/dhcp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/dhcp
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=99676fd2e887a56cb54e592ffc4581ba
diff --git a/metadata/md5-cache/acct-user/dhcpcd-0 b/metadata/md5-cache/acct-user/dhcpcd-0
new file mode 100644
index 000000000000..8e455d39c3c0
--- /dev/null
+++ b/metadata/md5-cache/acct-user/dhcpcd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=user for dhcpcd client
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
+RDEPEND=acct-group/dhcpcd
+SLOT=0
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=be32f62b63deac788149a684573026b9
diff --git a/metadata/md5-cache/acct-user/dnscrypt-proxy-0 b/metadata/md5-cache/acct-user/dnscrypt-proxy-0
index f265167d45ae..6e6459665e80 100644
--- a/metadata/md5-cache/acct-user/dnscrypt-proxy-0
+++ b/metadata/md5-cache/acct-user/dnscrypt-proxy-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/dnscrypt-proxy
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=664f3ddcc9b1899890ab516f81480642
diff --git a/metadata/md5-cache/acct-user/dnsmasq_exporter-0 b/metadata/md5-cache/acct-user/dnsmasq_exporter-0
index 37c388d868c4..d9e1c93d2929 100644
--- a/metadata/md5-cache/acct-user/dnsmasq_exporter-0
+++ b/metadata/md5-cache/acct-user/dnsmasq_exporter-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/dnsmasq_exporter
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=abe24aad9ee1c69bc1bcd6369a985591
diff --git a/metadata/md5-cache/acct-user/dovecot-0 b/metadata/md5-cache/acct-user/dovecot-0
index 6d9bf12bfc45..765987ec6b7f 100644
--- a/metadata/md5-cache/acct-user/dovecot-0
+++ b/metadata/md5-cache/acct-user/dovecot-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/dovecot
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=410a5f6c83a833093b98d1dcc966b9d3
diff --git a/metadata/md5-cache/acct-user/dovenull-0 b/metadata/md5-cache/acct-user/dovenull-0
index 750b371ab8cd..aee638d36f6d 100644
--- a/metadata/md5-cache/acct-user/dovenull-0
+++ b/metadata/md5-cache/acct-user/dovenull-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/dovenull
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1405c886d5e56f301892eb8186bf856a
diff --git a/metadata/md5-cache/acct-user/elasticsearch-0 b/metadata/md5-cache/acct-user/elasticsearch-0
index fad44f7026ad..f00c6d69529e 100644
--- a/metadata/md5-cache/acct-user/elasticsearch-0
+++ b/metadata/md5-cache/acct-user/elasticsearch-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/elasticsearch
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=303abe68eab98e1ff3e83bf8d269d09f
diff --git a/metadata/md5-cache/acct-user/epmd-0 b/metadata/md5-cache/acct-user/epmd-0
index c0e3b48a7272..f110e4ac14ad 100644
--- a/metadata/md5-cache/acct-user/epmd-0
+++ b/metadata/md5-cache/acct-user/epmd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/epmd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=21e41d553c9516c34dc1cd72b7603dd8
diff --git a/metadata/md5-cache/acct-user/fetchmail-0 b/metadata/md5-cache/acct-user/fetchmail-0
index 565af39e2063..be469eab788f 100644
--- a/metadata/md5-cache/acct-user/fetchmail-0
+++ b/metadata/md5-cache/acct-user/fetchmail-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/fetchmail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d3d21fa443b96154c83f83c4aa174fcf
diff --git a/metadata/md5-cache/acct-user/fhem-0 b/metadata/md5-cache/acct-user/fhem-0
index b468f7319d1a..eefb3f3f1a5f 100644
--- a/metadata/md5-cache/acct-user/fhem-0
+++ b/metadata/md5-cache/acct-user/fhem-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/fhem
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3b4533de1c110132852cbfc485473ecb
diff --git a/metadata/md5-cache/acct-user/ftp-0 b/metadata/md5-cache/acct-user/ftp-0
index 302e726ebdc1..4c3c783b5db8 100644
--- a/metadata/md5-cache/acct-user/ftp-0
+++ b/metadata/md5-cache/acct-user/ftp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/ftp
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c4f7d3e9113e45d0b587307d6bfd74d0
diff --git a/metadata/md5-cache/acct-user/geneweb-0 b/metadata/md5-cache/acct-user/geneweb-0
index 14578d4f732b..761576c48a99 100644
--- a/metadata/md5-cache/acct-user/geneweb-0
+++ b/metadata/md5-cache/acct-user/geneweb-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=~amd64 ~x86
 RDEPEND=acct-group/geneweb
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=312ab0b641a11e8ce91489d1bd34e222
diff --git a/metadata/md5-cache/acct-user/gerbera-0 b/metadata/md5-cache/acct-user/gerbera-0
index e0955a0754fd..e89c9a41c80c 100644
--- a/metadata/md5-cache/acct-user/gerbera-0
+++ b/metadata/md5-cache/acct-user/gerbera-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/gerbera acct-group/video
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9f69a3f13d8a9d7013b2eac1e6e140c8
diff --git a/metadata/md5-cache/acct-user/git-0 b/metadata/md5-cache/acct-user/git-0
index e07d8666e475..743f40398a2d 100644
--- a/metadata/md5-cache/acct-user/git-0
+++ b/metadata/md5-cache/acct-user/git-0
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh spa
 RDEPEND=acct-group/git
 REQUIRED_USE=^^ ( gitea gitolite )
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b2689a0b55698bda7d9c38bcb1e12720
diff --git a/metadata/md5-cache/acct-user/gkrellmd-0 b/metadata/md5-cache/acct-user/gkrellmd-0
index 583666c0ea6b..6982374f636a 100644
--- a/metadata/md5-cache/acct-user/gkrellmd-0
+++ b/metadata/md5-cache/acct-user/gkrellmd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/gkrellmd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=95088eb9093ebb5b9a0eea9f07b01fbd
diff --git a/metadata/md5-cache/acct-user/glance-0 b/metadata/md5-cache/acct-user/glance-0
index 1bd1942d335b..95a53912e022 100644
--- a/metadata/md5-cache/acct-user/glance-0
+++ b/metadata/md5-cache/acct-user/glance-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/glance
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9416bc7d36dc727632cb6aa9603ac385
diff --git a/metadata/md5-cache/acct-user/graylog-0 b/metadata/md5-cache/acct-user/graylog-0
index 22d7a636a551..8795adc93d0a 100644
--- a/metadata/md5-cache/acct-user/graylog-0
+++ b/metadata/md5-cache/acct-user/graylog-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/graylog
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f4f6774da99a8d45052b4f35cea6b420
diff --git a/metadata/md5-cache/acct-user/gvm-0 b/metadata/md5-cache/acct-user/gvm-0
index 2aa85d06cf46..d73e28e546b9 100644
--- a/metadata/md5-cache/acct-user/gvm-0
+++ b/metadata/md5-cache/acct-user/gvm-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/gvm
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d58e41b5f6230ddc22ae336017d8044e
diff --git a/metadata/md5-cache/acct-user/heat-0 b/metadata/md5-cache/acct-user/heat-0
index 5ccc784eaf07..f45288874266 100644
--- a/metadata/md5-cache/acct-user/heat-0
+++ b/metadata/md5-cache/acct-user/heat-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/heat
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=11c65953154c88544415d29a37a27e01
diff --git a/metadata/md5-cache/acct-user/i2p-0 b/metadata/md5-cache/acct-user/i2p-0
index b008b9338da5..bedc77b9511b 100644
--- a/metadata/md5-cache/acct-user/i2p-0
+++ b/metadata/md5-cache/acct-user/i2p-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/i2p
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ffb6d95288de187e81445f9e9083ac34
diff --git a/metadata/md5-cache/acct-user/i2pd-0 b/metadata/md5-cache/acct-user/i2pd-0
index b037b1998fa1..4280fe1d9676 100644
--- a/metadata/md5-cache/acct-user/i2pd-0
+++ b/metadata/md5-cache/acct-user/i2pd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/i2pd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=876c9cfdec60e447bf4070dd2d4b07c5
diff --git a/metadata/md5-cache/acct-user/inspircd-0 b/metadata/md5-cache/acct-user/inspircd-0
index 68269bd7f914..1498e4db25fb 100644
--- a/metadata/md5-cache/acct-user/inspircd-0
+++ b/metadata/md5-cache/acct-user/inspircd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/inspircd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e040a118122eb50acb419310a419f329
diff --git a/metadata/md5-cache/acct-user/ipfs-0 b/metadata/md5-cache/acct-user/ipfs-0
index a0cd341a5831..40b4a96b76be 100644
--- a/metadata/md5-cache/acct-user/ipfs-0
+++ b/metadata/md5-cache/acct-user/ipfs-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/ipfs
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f906d1058b0bf264e48aba67119f235d
diff --git a/metadata/md5-cache/acct-user/ippl-0 b/metadata/md5-cache/acct-user/ippl-0
index 689697030d62..23bbb65a2239 100644
--- a/metadata/md5-cache/acct-user/ippl-0
+++ b/metadata/md5-cache/acct-user/ippl-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2b03815f1289c6d60dc12e9ea2d438cc
diff --git a/metadata/md5-cache/acct-user/keystone-0 b/metadata/md5-cache/acct-user/keystone-0
index 2c48b71129b6..f9f4c29d2bb0 100644
--- a/metadata/md5-cache/acct-user/keystone-0
+++ b/metadata/md5-cache/acct-user/keystone-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/keystone
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3a6966e2aab7f774aec7fe695f11b9ef
diff --git a/metadata/md5-cache/acct-user/kibana-0 b/metadata/md5-cache/acct-user/kibana-0
index 0441b3095582..706fb648e3c1 100644
--- a/metadata/md5-cache/acct-user/kibana-0
+++ b/metadata/md5-cache/acct-user/kibana-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/kibana
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=17c0ae0e9d9cf04c935f3f27d1585e94
diff --git a/metadata/md5-cache/acct-user/knot-0 b/metadata/md5-cache/acct-user/knot-0
index bcd5244fffc6..936cf50303c7 100644
--- a/metadata/md5-cache/acct-user/knot-0
+++ b/metadata/md5-cache/acct-user/knot-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/knot
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=19cc5d10a4269199806b14aaa3a2733b
diff --git a/metadata/md5-cache/acct-user/kube-apiserver-0 b/metadata/md5-cache/acct-user/kube-apiserver-0
index bc5becb5960a..f5e37d0b5816 100644
--- a/metadata/md5-cache/acct-user/kube-apiserver-0
+++ b/metadata/md5-cache/acct-user/kube-apiserver-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/kube-apiserver
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b2c05b11f8d99eaec8009cf7d506e3f3
diff --git a/metadata/md5-cache/acct-user/kube-controller-manager-0 b/metadata/md5-cache/acct-user/kube-controller-manager-0
index 60ab0882832e..89303da171a0 100644
--- a/metadata/md5-cache/acct-user/kube-controller-manager-0
+++ b/metadata/md5-cache/acct-user/kube-controller-manager-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/kube-controller-manager
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c2333c8e1e62b798bb4a2911e28a3f98
diff --git a/metadata/md5-cache/acct-user/kube-scheduler-0 b/metadata/md5-cache/acct-user/kube-scheduler-0
index 7333c86d6f4f..b313cba886db 100644
--- a/metadata/md5-cache/acct-user/kube-scheduler-0
+++ b/metadata/md5-cache/acct-user/kube-scheduler-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/kube-scheduler
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0005497e87e852466a3be9c9eeb300fc
diff --git a/metadata/md5-cache/acct-user/lighttpd-0 b/metadata/md5-cache/acct-user/lighttpd-0
new file mode 100644
index 000000000000..089414012624
--- /dev/null
+++ b/metadata/md5-cache/acct-user/lighttpd-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=A user for lighttpd
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
+RDEPEND=acct-group/lighttpd
+SLOT=0
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=a59ead6de77457aacb7b168bd38c53ed
diff --git a/metadata/md5-cache/acct-user/logstash-0 b/metadata/md5-cache/acct-user/logstash-0
index 75c6812cbfe1..53fb5f8af05b 100644
--- a/metadata/md5-cache/acct-user/logstash-0
+++ b/metadata/md5-cache/acct-user/logstash-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/logstash
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6d0dd20248b7b73eba0835bdf2613f2a
diff --git a/metadata/md5-cache/acct-user/mail-0 b/metadata/md5-cache/acct-user/mail-0
index e5a2f57f9d09..47d5f70487a3 100644
--- a/metadata/md5-cache/acct-user/mail-0
+++ b/metadata/md5-cache/acct-user/mail-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1d648f45e2af351c6b06ac91ecc6f5e6
diff --git a/metadata/md5-cache/acct-user/man-1 b/metadata/md5-cache/acct-user/man-1
index 55053b5f7660..9dbe38ed3349 100644
--- a/metadata/md5-cache/acct-user/man-1
+++ b/metadata/md5-cache/acct-user/man-1
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/man
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f4f877dbc66a56f26588e4322cff4b53
diff --git a/metadata/md5-cache/acct-user/memcached-0 b/metadata/md5-cache/acct-user/memcached-0
index 0e07ab7a9bcb..c563ac3fa857 100644
--- a/metadata/md5-cache/acct-user/memcached-0
+++ b/metadata/md5-cache/acct-user/memcached-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/memcached
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=09dd2fd3cceb6e638f77c53828575dba
diff --git a/metadata/md5-cache/acct-user/messagebus-0 b/metadata/md5-cache/acct-user/messagebus-0
index c318b8b67913..f8947438f5bd 100644
--- a/metadata/md5-cache/acct-user/messagebus-0
+++ b/metadata/md5-cache/acct-user/messagebus-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/messagebus
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c6ab10cec28a405c686c8707a0441c32
diff --git a/metadata/md5-cache/acct-user/milter-regex-0 b/metadata/md5-cache/acct-user/milter-regex-0
index f49b8871fda3..2206e9c2b745 100644
--- a/metadata/md5-cache/acct-user/milter-regex-0
+++ b/metadata/md5-cache/acct-user/milter-regex-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/milter-regex
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a64af6abe097819ccb40d8574f847f37
diff --git a/metadata/md5-cache/acct-user/minecraft-0 b/metadata/md5-cache/acct-user/minecraft-0
index 167004a3d24e..58d708a61430 100644
--- a/metadata/md5-cache/acct-user/minecraft-0
+++ b/metadata/md5-cache/acct-user/minecraft-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/minecraft
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c18cfc57e0d08d970e7644237883921e
diff --git a/metadata/md5-cache/acct-user/minetest-0 b/metadata/md5-cache/acct-user/minetest-0
index 4cf4e0888285..5a2456e9aabe 100644
--- a/metadata/md5-cache/acct-user/minetest-0
+++ b/metadata/md5-cache/acct-user/minetest-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/minetest
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4dd006a88748daeda668f4396841e395
diff --git a/metadata/md5-cache/acct-user/mongodb-0 b/metadata/md5-cache/acct-user/mongodb-0
index 6b3561523c64..4ca6d4ef5a86 100644
--- a/metadata/md5-cache/acct-user/mongodb-0
+++ b/metadata/md5-cache/acct-user/mongodb-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/mongodb
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c5fc42b4f3b7a0dcbe425dda0edd2a34
diff --git a/metadata/md5-cache/acct-user/mosquitto-0 b/metadata/md5-cache/acct-user/mosquitto-0
index df7188f0040b..33f58bef2992 100644
--- a/metadata/md5-cache/acct-user/mosquitto-0
+++ b/metadata/md5-cache/acct-user/mosquitto-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/mosquitto
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cffcacbe9db1fef3910dd5b12020fb47
diff --git a/metadata/md5-cache/acct-user/mpd-0 b/metadata/md5-cache/acct-user/mpd-0
index 8a5a6e266a2a..29443a247300 100644
--- a/metadata/md5-cache/acct-user/mpd-0
+++ b/metadata/md5-cache/acct-user/mpd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/audio
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6ddca8eb3f013ebcc84913721712b86b
diff --git a/metadata/md5-cache/acct-user/msmtpd-0 b/metadata/md5-cache/acct-user/msmtpd-0
index 107202a4f164..fd9c0ba92ec9 100644
--- a/metadata/md5-cache/acct-user/msmtpd-0
+++ b/metadata/md5-cache/acct-user/msmtpd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/msmtpd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1e86c8bfdb0678c2fee1fdd75c5c990b
diff --git a/metadata/md5-cache/acct-user/munin-0 b/metadata/md5-cache/acct-user/munin-0
index a8387f500e90..ade2f1d32b7e 100644
--- a/metadata/md5-cache/acct-user/munin-0
+++ b/metadata/md5-cache/acct-user/munin-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/munin
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b202c3be345a236c40672091da76dd7c
diff --git a/metadata/md5-cache/acct-user/munin-async-0 b/metadata/md5-cache/acct-user/munin-async-0
index 990f7c4ffa0b..edf96b9b2c6e 100644
--- a/metadata/md5-cache/acct-user/munin-async-0
+++ b/metadata/md5-cache/acct-user/munin-async-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/munin
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b59ba19aeddb7456315bca439cb06e87
diff --git a/metadata/md5-cache/acct-user/murmur-0 b/metadata/md5-cache/acct-user/murmur-0
index d3f6b9e1052a..4111fa316bec 100644
--- a/metadata/md5-cache/acct-user/murmur-0
+++ b/metadata/md5-cache/acct-user/murmur-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/murmur
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=12f204ef54bfecc67ed3baced394ea62
diff --git a/metadata/md5-cache/acct-user/mysql-0 b/metadata/md5-cache/acct-user/mysql-0
index bc5342b352d8..66578da9b795 100644
--- a/metadata/md5-cache/acct-user/mysql-0
+++ b/metadata/md5-cache/acct-user/mysql-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/mysql
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2239e70edb93016adb4f07506c64ee6f
diff --git a/metadata/md5-cache/acct-user/mythtv-0 b/metadata/md5-cache/acct-user/mythtv-0
index 95564e642a38..0d7ffb46ad4c 100644
--- a/metadata/md5-cache/acct-user/mythtv-0
+++ b/metadata/md5-cache/acct-user/mythtv-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/mythtv acct-group/video acct-group/audio acct-group/cdrom acct-group/tty
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c91ae523ceb1d752843373fba89a3203
diff --git a/metadata/md5-cache/acct-user/nagios-0 b/metadata/md5-cache/acct-user/nagios-0
index c5f3be85cf82..9869b4536228 100644
--- a/metadata/md5-cache/acct-user/nagios-0
+++ b/metadata/md5-cache/acct-user/nagios-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nagios
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8583f9acf3e2d3f01c1055593828839b
diff --git a/metadata/md5-cache/acct-user/netbox-0 b/metadata/md5-cache/acct-user/netbox-0
index 15ffebcc9a77..234c359f6a70 100644
--- a/metadata/md5-cache/acct-user/netbox-0
+++ b/metadata/md5-cache/acct-user/netbox-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/netbox
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7576a9a5839d05ecefdb466a6d9d8972
diff --git a/metadata/md5-cache/acct-user/netdata-0 b/metadata/md5-cache/acct-user/netdata-0
index 8c846995472a..e628a41932fe 100644
--- a/metadata/md5-cache/acct-user/netdata-0
+++ b/metadata/md5-cache/acct-user/netdata-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/netdata
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=90cafa4f9013c288db6bdbaeff811456
diff --git a/metadata/md5-cache/acct-user/neutron-0 b/metadata/md5-cache/acct-user/neutron-0
index 963d7aee7222..32e032dd2d5d 100644
--- a/metadata/md5-cache/acct-user/neutron-0
+++ b/metadata/md5-cache/acct-user/neutron-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/neutron
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a97deaa3ef65b7cd8085c81caaa2ac4e
diff --git a/metadata/md5-cache/acct-user/nova-0 b/metadata/md5-cache/acct-user/nova-0
index 2c47523274d0..1015ebca1f93 100644
--- a/metadata/md5-cache/acct-user/nova-0
+++ b/metadata/md5-cache/acct-user/nova-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nova
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f97663b2cf9abbd1a770cda5d05a4ad0
diff --git a/metadata/md5-cache/acct-user/nsd-0 b/metadata/md5-cache/acct-user/nsd-0
index c2dc27df4efc..7634707691a9 100644
--- a/metadata/md5-cache/acct-user/nsd-0
+++ b/metadata/md5-cache/acct-user/nsd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nsd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ba4d4367098caae927e815d356790903
diff --git a/metadata/md5-cache/acct-user/ntp-0 b/metadata/md5-cache/acct-user/ntp-0
index 079259a93f80..12a56bc60b36 100644
--- a/metadata/md5-cache/acct-user/ntp-0
+++ b/metadata/md5-cache/acct-user/ntp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/ntp
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3004c4f4ed33c8637fec813897554580
diff --git a/metadata/md5-cache/acct-user/oidentd-0 b/metadata/md5-cache/acct-user/oidentd-0
index 9f82adff6ec4..b985172a6ff7 100644
--- a/metadata/md5-cache/acct-user/oidentd-0
+++ b/metadata/md5-cache/acct-user/oidentd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/oidentd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9328cdf4e7c095b9937d25ac2d448f61
diff --git a/metadata/md5-cache/acct-user/opendkim-0 b/metadata/md5-cache/acct-user/opendkim-0
index b5c4271231d5..e96442d57e42 100644
--- a/metadata/md5-cache/acct-user/opendkim-0
+++ b/metadata/md5-cache/acct-user/opendkim-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/opendkim
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6c02567e067b47e8f47a8ff80e0b1570
diff --git a/metadata/md5-cache/acct-user/openntpd-0 b/metadata/md5-cache/acct-user/openntpd-0
index 89272e77c225..6b8193cbf58b 100644
--- a/metadata/md5-cache/acct-user/openntpd-0
+++ b/metadata/md5-cache/acct-user/openntpd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/openntpd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=af2b15ac04e4ed3cddeda127e12891c9
diff --git a/metadata/md5-cache/acct-user/openrct2-0 b/metadata/md5-cache/acct-user/openrct2-0
index f75f176c99f4..30d354c6d0d2 100644
--- a/metadata/md5-cache/acct-user/openrct2-0
+++ b/metadata/md5-cache/acct-user/openrct2-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/openrct2
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=741b03e814e139a6e26667284eae9ee2
diff --git a/metadata/md5-cache/acct-user/pcscd-0 b/metadata/md5-cache/acct-user/pcscd-0
index ccac9542f814..56ed6916356a 100644
--- a/metadata/md5-cache/acct-user/pcscd-0
+++ b/metadata/md5-cache/acct-user/pcscd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/pcscd acct-group/openct acct-group/usb
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c5cad9823484267ce60585127ed6f723
diff --git a/metadata/md5-cache/acct-user/pdnsd-0 b/metadata/md5-cache/acct-user/pdnsd-0
index 2385abeddc13..c3ca58188fe5 100644
--- a/metadata/md5-cache/acct-user/pdnsd-0
+++ b/metadata/md5-cache/acct-user/pdnsd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/pdnsd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=964d062348fa7d70ba4f5b0f6c20b9f1
diff --git a/metadata/md5-cache/acct-user/placement-0 b/metadata/md5-cache/acct-user/placement-0
index 1b7cba6c84e9..27f319fdc7de 100644
--- a/metadata/md5-cache/acct-user/placement-0
+++ b/metadata/md5-cache/acct-user/placement-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/placement
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=504e2951bc35a7a7cc780250b0ea85c5
diff --git a/metadata/md5-cache/acct-user/plex-0 b/metadata/md5-cache/acct-user/plex-0
index f2849292607b..f5610fb35ebb 100644
--- a/metadata/md5-cache/acct-user/plex-0
+++ b/metadata/md5-cache/acct-user/plex-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/plex acct-group/video
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bb35790cd1068367d8155f8ad1f812ad
diff --git a/metadata/md5-cache/acct-user/polkitd-0 b/metadata/md5-cache/acct-user/polkitd-0
index dd75584d2c67..50150e0275a6 100644
--- a/metadata/md5-cache/acct-user/polkitd-0
+++ b/metadata/md5-cache/acct-user/polkitd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/polkitd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3463586ac30a8004b934afdd01793c63
diff --git a/metadata/md5-cache/acct-user/postfix-0 b/metadata/md5-cache/acct-user/postfix-0
index 9e62236480a6..f78c5e3e9242 100644
--- a/metadata/md5-cache/acct-user/postfix-0
+++ b/metadata/md5-cache/acct-user/postfix-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/postfix acct-group/mail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ace42b1b52b11ce3fca4e74696128ae3
diff --git a/metadata/md5-cache/acct-user/postmaster-0 b/metadata/md5-cache/acct-user/postmaster-0
index 8f5175eeae2f..b1ea662be1d4 100644
--- a/metadata/md5-cache/acct-user/postmaster-0
+++ b/metadata/md5-cache/acct-user/postmaster-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/mail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4215e7d391c4c711aba698a9da6a2d73
diff --git a/metadata/md5-cache/acct-user/prometheus-0 b/metadata/md5-cache/acct-user/prometheus-0
index 08daee8d53f2..2892b7395427 100644
--- a/metadata/md5-cache/acct-user/prometheus-0
+++ b/metadata/md5-cache/acct-user/prometheus-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/prometheus
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9f6c97821a2a4bd2fdfb1f2489403ca4
diff --git a/metadata/md5-cache/acct-user/qemu-0 b/metadata/md5-cache/acct-user/qemu-0
index 0b10e1288648..d36a5c7ddfd3 100644
--- a/metadata/md5-cache/acct-user/qemu-0
+++ b/metadata/md5-cache/acct-user/qemu-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/qemu acct-group/kvm
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=304c14d1dbbc88dfb27654b70a662ec8
diff --git a/metadata/md5-cache/acct-user/qmaild-0 b/metadata/md5-cache/acct-user/qmaild-0
index d4f937179039..56e5a57c17a7 100644
--- a/metadata/md5-cache/acct-user/qmaild-0
+++ b/metadata/md5-cache/acct-user/qmaild-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d07d4f89ab57965e77186d189d82d2d2
diff --git a/metadata/md5-cache/acct-user/qmaill-0 b/metadata/md5-cache/acct-user/qmaill-0
index d28e4850007e..8b6581a7dcf5 100644
--- a/metadata/md5-cache/acct-user/qmaill-0
+++ b/metadata/md5-cache/acct-user/qmaill-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3185f07915a9a2be7b6b7c750dd39d55
diff --git a/metadata/md5-cache/acct-user/qmailp-0 b/metadata/md5-cache/acct-user/qmailp-0
index 378959c1d41a..f65d3f9f5ffa 100644
--- a/metadata/md5-cache/acct-user/qmailp-0
+++ b/metadata/md5-cache/acct-user/qmailp-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/nofiles
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3c364586371293b358d7c5db712d50db
diff --git a/metadata/md5-cache/acct-user/qmailq-0 b/metadata/md5-cache/acct-user/qmailq-0
index 47d45e927a37..3ac3dfd12034 100644
--- a/metadata/md5-cache/acct-user/qmailq-0
+++ b/metadata/md5-cache/acct-user/qmailq-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/qmail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fb8f4cc88f20795bf95ddc0894e0126e
diff --git a/metadata/md5-cache/acct-user/qmailr-0 b/metadata/md5-cache/acct-user/qmailr-0
index 9a55fc8c1405..a7e25218b6c1 100644
--- a/metadata/md5-cache/acct-user/qmailr-0
+++ b/metadata/md5-cache/acct-user/qmailr-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/qmail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2d694a197491c1a775c3d6edafb438bc
diff --git a/metadata/md5-cache/acct-user/qmails-0 b/metadata/md5-cache/acct-user/qmails-0
index 5af0f85975b3..626db0c583d1 100644
--- a/metadata/md5-cache/acct-user/qmails-0
+++ b/metadata/md5-cache/acct-user/qmails-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/qmail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1e214bd119838a68a2dbef40ef41a3ed
diff --git a/metadata/md5-cache/acct-user/quassel-0 b/metadata/md5-cache/acct-user/quassel-0
index 349697108741..b608620c43a8 100644
--- a/metadata/md5-cache/acct-user/quassel-0
+++ b/metadata/md5-cache/acct-user/quassel-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/quassel
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=76051c211dc8b54b81563228b39a1789
diff --git a/metadata/md5-cache/acct-user/radius-0 b/metadata/md5-cache/acct-user/radius-0
index 1c301dbeb61b..473809bb777f 100644
--- a/metadata/md5-cache/acct-user/radius-0
+++ b/metadata/md5-cache/acct-user/radius-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/radius
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a5ffb56316ad0511d0ac09a90286eb87
diff --git a/metadata/md5-cache/acct-user/redis-0 b/metadata/md5-cache/acct-user/redis-0
index ddbd66846c4a..94c007c083d4 100644
--- a/metadata/md5-cache/acct-user/redis-0
+++ b/metadata/md5-cache/acct-user/redis-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/redis
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9a325403a24df1ed7a18a938f3b99c56
diff --git a/metadata/md5-cache/acct-user/redmine-0 b/metadata/md5-cache/acct-user/redmine-0
index b42764c01f60..1d51dacf7c3e 100644
--- a/metadata/md5-cache/acct-user/redmine-0
+++ b/metadata/md5-cache/acct-user/redmine-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/redmine
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=26ffa625c4c40d55a45384ca87480f37
diff --git a/metadata/md5-cache/acct-user/rspamd-0 b/metadata/md5-cache/acct-user/rspamd-0
index 0b591c5d0a4a..9b998213ff65 100644
--- a/metadata/md5-cache/acct-user/rspamd-0
+++ b/metadata/md5-cache/acct-user/rspamd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/rspamd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8ef85c33e47a45fb8341965ae2d48878
diff --git a/metadata/md5-cache/acct-user/rstudio-server-0 b/metadata/md5-cache/acct-user/rstudio-server-0
index c757bf1f717f..9eb9c9ab9bb9 100644
--- a/metadata/md5-cache/acct-user/rstudio-server-0
+++ b/metadata/md5-cache/acct-user/rstudio-server-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/rstudio-server
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=44b71968a9eb18296740f7ee6c07e727
diff --git a/metadata/md5-cache/acct-user/rtkit-0 b/metadata/md5-cache/acct-user/rtkit-0
index 0c7d0e57b602..44e10eaa4365 100644
--- a/metadata/md5-cache/acct-user/rtkit-0
+++ b/metadata/md5-cache/acct-user/rtkit-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/rtkit
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ce8e63018323dcc6970bb34d49f6ea6c
diff --git a/metadata/md5-cache/acct-user/shellinaboxd-0 b/metadata/md5-cache/acct-user/shellinaboxd-0
index ee6569381c22..027040989377 100644
--- a/metadata/md5-cache/acct-user/shellinaboxd-0
+++ b/metadata/md5-cache/acct-user/shellinaboxd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/shellinaboxd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3e1deca43f9d5ff055633eb7355f95ca
diff --git a/metadata/md5-cache/acct-user/slurm-0 b/metadata/md5-cache/acct-user/slurm-0
index ea3c665f2f95..e40535aaf3c3 100644
--- a/metadata/md5-cache/acct-user/slurm-0
+++ b/metadata/md5-cache/acct-user/slurm-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/slurm
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d98d09d56f76bb3d14f24c681267e864
diff --git a/metadata/md5-cache/acct-user/smtpd-0 b/metadata/md5-cache/acct-user/smtpd-0
index b5ab3c734d80..671873f32c7f 100644
--- a/metadata/md5-cache/acct-user/smtpd-0
+++ b/metadata/md5-cache/acct-user/smtpd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/smtpd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=120edf4c9f64015098547ab471d5b858
diff --git a/metadata/md5-cache/acct-user/smtpq-0 b/metadata/md5-cache/acct-user/smtpq-0
index a1ae78d79292..af134701dc59 100644
--- a/metadata/md5-cache/acct-user/smtpq-0
+++ b/metadata/md5-cache/acct-user/smtpq-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/smtpq
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3057581131fe31493029dd09def448f6
diff --git a/metadata/md5-cache/acct-user/sogo-0 b/metadata/md5-cache/acct-user/sogo-0
index 52216f9cb458..bdd03db4735d 100644
--- a/metadata/md5-cache/acct-user/sogo-0
+++ b/metadata/md5-cache/acct-user/sogo-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/sogo
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1984103c73075728ffbbf8ce1a3c60fd
diff --git a/metadata/md5-cache/acct-user/spectrum-0 b/metadata/md5-cache/acct-user/spectrum-0
index 7fd7846507c3..61d8899f6ba8 100644
--- a/metadata/md5-cache/acct-user/spectrum-0
+++ b/metadata/md5-cache/acct-user/spectrum-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/spectrum
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=167827f76c5814d0cc53ed5e693f8012
diff --git a/metadata/md5-cache/acct-user/spire-0 b/metadata/md5-cache/acct-user/spire-0
index 7fcc5a780529..57acc42b526f 100644
--- a/metadata/md5-cache/acct-user/spire-0
+++ b/metadata/md5-cache/acct-user/spire-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/spire
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9f81947a940b670dab44596013c4050f
diff --git a/metadata/md5-cache/acct-user/sqlgrey-0 b/metadata/md5-cache/acct-user/sqlgrey-0
index 80a60e6f69a9..5a01539acca8 100644
--- a/metadata/md5-cache/acct-user/sqlgrey-0
+++ b/metadata/md5-cache/acct-user/sqlgrey-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/sqlgrey
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=66779f3c0aeae37521d3522d18abab1a
diff --git a/metadata/md5-cache/acct-user/squid-0 b/metadata/md5-cache/acct-user/squid-0
index f353d152c81b..7570b59cefa5 100644
--- a/metadata/md5-cache/acct-user/squid-0
+++ b/metadata/md5-cache/acct-user/squid-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/squid
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a4c915cdf7ca96c4c14527bffee0ca76
diff --git a/metadata/md5-cache/acct-user/sshd-0 b/metadata/md5-cache/acct-user/sshd-0
index b4169eef9a1a..d8ebb6ee2ce6 100644
--- a/metadata/md5-cache/acct-user/sshd-0
+++ b/metadata/md5-cache/acct-user/sshd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/sshd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c0e562c32c3c8bdc95c2071812b7eba3
diff --git a/metadata/md5-cache/acct-user/stdiscosrv-0 b/metadata/md5-cache/acct-user/stdiscosrv-0
index d5935814b147..908c458d1d5a 100644
--- a/metadata/md5-cache/acct-user/stdiscosrv-0
+++ b/metadata/md5-cache/acct-user/stdiscosrv-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/stdiscosrv
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=af44b8606b4a40dab02f5496afe79489
diff --git a/metadata/md5-cache/acct-user/steamcmd-0 b/metadata/md5-cache/acct-user/steamcmd-0
index a6744a01463d..7aaf081006ef 100644
--- a/metadata/md5-cache/acct-user/steamcmd-0
+++ b/metadata/md5-cache/acct-user/steamcmd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/steamcmd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=591b1ef8bc9e8ccf51a31347d7992feb
diff --git a/metadata/md5-cache/acct-user/strelaysrv-0 b/metadata/md5-cache/acct-user/strelaysrv-0
index a0f8b15911c8..81c0f673bc28 100644
--- a/metadata/md5-cache/acct-user/strelaysrv-0
+++ b/metadata/md5-cache/acct-user/strelaysrv-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/strelaysrv
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6f884243bd1b2d10493d2442712e1830
diff --git a/metadata/md5-cache/acct-user/stubby-0 b/metadata/md5-cache/acct-user/stubby-0
index 6dd045ffb135..7a214128e499 100644
--- a/metadata/md5-cache/acct-user/stubby-0
+++ b/metadata/md5-cache/acct-user/stubby-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/stubby
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2cc36dff823cef42ec536a7f273db8b2
diff --git a/metadata/md5-cache/acct-user/stunnel-0 b/metadata/md5-cache/acct-user/stunnel-0
index 72f2ef256870..d08902efdb3f 100644
--- a/metadata/md5-cache/acct-user/stunnel-0
+++ b/metadata/md5-cache/acct-user/stunnel-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/stunnel
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=91214634055c416fb8d3f2ef0da0d833
diff --git a/metadata/md5-cache/acct-user/suricata-0 b/metadata/md5-cache/acct-user/suricata-0
index 29d98d3c3226..9da69f1efa8b 100644
--- a/metadata/md5-cache/acct-user/suricata-0
+++ b/metadata/md5-cache/acct-user/suricata-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/suricata
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1a4af599eb72284e98c4b177bdc8a464
diff --git a/metadata/md5-cache/acct-user/swift-0 b/metadata/md5-cache/acct-user/swift-0
index e040f07fa63f..300414875999 100644
--- a/metadata/md5-cache/acct-user/swift-0
+++ b/metadata/md5-cache/acct-user/swift-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/swift
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=eefcf5a89122294a34b43f0e3588f15e
diff --git a/metadata/md5-cache/acct-user/syncthing-0 b/metadata/md5-cache/acct-user/syncthing-0
index 80395e962c70..4214d1acfb6c 100644
--- a/metadata/md5-cache/acct-user/syncthing-0
+++ b/metadata/md5-cache/acct-user/syncthing-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/syncthing
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=28de358efd6c5e041eec5a14fe5c25b3
diff --git a/metadata/md5-cache/acct-user/systemd-coredump-0 b/metadata/md5-cache/acct-user/systemd-coredump-0
index 48ee63ca50e2..b2dc4201bce2 100644
--- a/metadata/md5-cache/acct-user/systemd-coredump-0
+++ b/metadata/md5-cache/acct-user/systemd-coredump-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/systemd-coredump
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3c1db608ce4a5189047921934cb12aab
diff --git a/metadata/md5-cache/acct-user/systemd-journal-remote-0 b/metadata/md5-cache/acct-user/systemd-journal-remote-0
index c6c3b8eff343..e4be6f18804b 100644
--- a/metadata/md5-cache/acct-user/systemd-journal-remote-0
+++ b/metadata/md5-cache/acct-user/systemd-journal-remote-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/systemd-journal-remote
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2c76c24b248182149eb428205a72a917
diff --git a/metadata/md5-cache/acct-user/systemd-network-0 b/metadata/md5-cache/acct-user/systemd-network-0
index 4708e8144021..fd291aee4ee0 100644
--- a/metadata/md5-cache/acct-user/systemd-network-0
+++ b/metadata/md5-cache/acct-user/systemd-network-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/systemd-network
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3eab8e08499459d01f181d06e7d2950c
diff --git a/metadata/md5-cache/acct-user/systemd-resolve-0 b/metadata/md5-cache/acct-user/systemd-resolve-0
index d47eeb4528cf..661922fc5325 100644
--- a/metadata/md5-cache/acct-user/systemd-resolve-0
+++ b/metadata/md5-cache/acct-user/systemd-resolve-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/systemd-resolve
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3f1c651b891b7a8f654b421abfe5d4e9
diff --git a/metadata/md5-cache/acct-user/systemd-timesync-0 b/metadata/md5-cache/acct-user/systemd-timesync-0
index aef77109267a..343f00b03588 100644
--- a/metadata/md5-cache/acct-user/systemd-timesync-0
+++ b/metadata/md5-cache/acct-user/systemd-timesync-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/systemd-timesync
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bb13fbcbb1217c0817d90f47c25a46c6
diff --git a/metadata/md5-cache/acct-user/teamspeak-0 b/metadata/md5-cache/acct-user/teamspeak-0
index 46690b04e5c5..bb8679be7fd0 100644
--- a/metadata/md5-cache/acct-user/teamspeak-0
+++ b/metadata/md5-cache/acct-user/teamspeak-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/teamspeak
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=670ff1b616f780dba69a63050697332e
diff --git a/metadata/md5-cache/acct-user/telegraf-0 b/metadata/md5-cache/acct-user/telegraf-0
new file mode 100644
index 000000000000..00832aa9a34c
--- /dev/null
+++ b/metadata/md5-cache/acct-user/telegraf-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for telegraf
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
+RDEPEND=acct-group/telegraf
+SLOT=0
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=ca11caddf344e5bf7ed334f2c28deea2
diff --git a/metadata/md5-cache/acct-user/tor-0 b/metadata/md5-cache/acct-user/tor-0
index d38e5fa39a04..59a6bd8c44d1 100644
--- a/metadata/md5-cache/acct-user/tor-0
+++ b/metadata/md5-cache/acct-user/tor-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/tor
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=88b8f5dccdb3fb45557da818184c62ba
diff --git a/metadata/md5-cache/acct-user/tox-0 b/metadata/md5-cache/acct-user/tox-0
index 8495a67fd0f5..ee1f37ddd3f9 100644
--- a/metadata/md5-cache/acct-user/tox-0
+++ b/metadata/md5-cache/acct-user/tox-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/tox
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e53ed4490b105e31f83d6061c6826d26
diff --git a/metadata/md5-cache/acct-user/transmission-1 b/metadata/md5-cache/acct-user/transmission-1
index 272680a1f9c4..645c69a6911b 100644
--- a/metadata/md5-cache/acct-user/transmission-1
+++ b/metadata/md5-cache/acct-user/transmission-1
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/transmission
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0b44ab1a37773fa981c764be3a1a84d7
diff --git a/metadata/md5-cache/acct-user/tss-0 b/metadata/md5-cache/acct-user/tss-0
index 90507c752df7..1503a741f805 100644
--- a/metadata/md5-cache/acct-user/tss-0
+++ b/metadata/md5-cache/acct-user/tss-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/tss
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=48f11bb648ce27ee71d39c1fbb79e27d
diff --git a/metadata/md5-cache/acct-user/turnserver-0 b/metadata/md5-cache/acct-user/turnserver-0
index 158208cb8d97..6dbebe6fc422 100644
--- a/metadata/md5-cache/acct-user/turnserver-0
+++ b/metadata/md5-cache/acct-user/turnserver-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/turnserver
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4013a7a3d0ccb561a03e9f7792891b50
diff --git a/metadata/md5-cache/acct-user/unifi-0 b/metadata/md5-cache/acct-user/unifi-0
index 4ea6139e91c3..a09139052ec5 100644
--- a/metadata/md5-cache/acct-user/unifi-0
+++ b/metadata/md5-cache/acct-user/unifi-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/unifi
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=308d3988d0b53f474b2418af37538bea
diff --git a/metadata/md5-cache/acct-user/unrealircd-0 b/metadata/md5-cache/acct-user/unrealircd-0
index cb8cc73a508d..6be3959c2069 100644
--- a/metadata/md5-cache/acct-user/unrealircd-0
+++ b/metadata/md5-cache/acct-user/unrealircd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/unrealircd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b186b3ee3ae34799a7b3a365e580b64c
diff --git a/metadata/md5-cache/acct-user/uptimed-0 b/metadata/md5-cache/acct-user/uptimed-0
index fb626ca745c7..e82af7e306fe 100644
--- a/metadata/md5-cache/acct-user/uptimed-0
+++ b/metadata/md5-cache/acct-user/uptimed-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/uptimed
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=51d9d153c86d94b7131084e6848be1f1
diff --git a/metadata/md5-cache/acct-user/varnish-0 b/metadata/md5-cache/acct-user/varnish-0
index 165a731b39df..8a6a3de3c3de 100644
--- a/metadata/md5-cache/acct-user/varnish-0
+++ b/metadata/md5-cache/acct-user/varnish-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/varnish
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=795ff016e74f7b1c5620a2af8d0c7fda
diff --git a/metadata/md5-cache/acct-user/vpopmail-0 b/metadata/md5-cache/acct-user/vpopmail-0
index 8cb27e4ab0f8..401f01285e98 100644
--- a/metadata/md5-cache/acct-user/vpopmail-0
+++ b/metadata/md5-cache/acct-user/vpopmail-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/vpopmail
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=95eaba3e880520e2ece0fa8eb6cb97c8
diff --git a/metadata/md5-cache/acct-user/x2goprint-0 b/metadata/md5-cache/acct-user/x2goprint-0
index c6c187379a77..5fcd2d7b675e 100644
--- a/metadata/md5-cache/acct-user/x2goprint-0
+++ b/metadata/md5-cache/acct-user/x2goprint-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/x2goprint
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2ce6100ae1b09fd234d52a2f537b14f0
diff --git a/metadata/md5-cache/acct-user/x2gouser-0 b/metadata/md5-cache/acct-user/x2gouser-0
index f86d2c5c4eb4..5e2de29b0d06 100644
--- a/metadata/md5-cache/acct-user/x2gouser-0
+++ b/metadata/md5-cache/acct-user/x2gouser-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/x2gouser
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2f734bc54cbcfeb1d639491e16706866
diff --git a/metadata/md5-cache/acct-user/xrootd-0 b/metadata/md5-cache/acct-user/xrootd-0
index b92f85432769..04cf4aa5dc91 100644
--- a/metadata/md5-cache/acct-user/xrootd-0
+++ b/metadata/md5-cache/acct-user/xrootd-0
@@ -4,5 +4,5 @@ EAPI=7
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 RDEPEND=acct-group/xrootd
 SLOT=0
-_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=acct-user	0a104863ecbb0c7d2e255d005bcf9578	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5d4f18bf413bb1083dca6eac53dcf136
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index a2e66cab7f20..e956a0a9669b 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/SphinxTrain-1.0.8 b/metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
index eaf025214f1e..0ae6c6b9773f 100644
--- a/metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
+++ b/metadata/md5-cache/app-accessibility/SphinxTrain-1.0.8
@@ -3,12 +3,12 @@ DEPEND=app-accessibility/sphinxbase dev-lang/perl python_single_target_python2_7
 DESCRIPTION=Speech Recognition (Training Module)
 EAPI=5
 HOMEPAGE=http://cmusphinx.sourceforge.net/html/cmusphinx.php
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=BSD-with-attribution
 RDEPEND=app-accessibility/sphinxbase dev-lang/perl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cmusphinx/sphinxtrain-1.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a52bed11534400b1901760bc1bcc9dd9
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
deleted file mode 100644
index 9a4719e063b1..000000000000
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.26.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=dev-libs/libxml2-2.9.1 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gtk module for bridging AT-SPI to Atk
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/at-spi2-atk/2.26/at-spi2-atk-2.26.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e528c1348d5f3e76470914db30cf44e0
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
deleted file mode 100644
index c2a477e09280..000000000000
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.26.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.8 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=D-Bus accessibility specifications and registration daemon
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Accessibility
-IUSE=X +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=700d801a68a428d61a32bbcff2bc9743
diff --git a/metadata/md5-cache/app-accessibility/caribou-0.4.21 b/metadata/md5-cache/app-accessibility/caribou-0.4.21
index 99bf2358e9a3..b06ded2fec5d 100644
--- a/metadata/md5-cache/app-accessibility/caribou-0.4.21
+++ b/metadata/md5-cache/app-accessibility/caribou-0.4.21
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3:3[introspection] x11-libs/gtk+:2 >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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/libxslt >=dev-util/intltool-0.35.5 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=x11-libs/gtk+-3:3[introspection] x11-libs/gtk+:2 >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libxslt >=dev-util/intltool-0.35.5 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Input assistive technology intended for switch and pointer users
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Caribou
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=x11-libs/gtk+-3:3[introspection] x11-libs/gtk+:2 >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=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/glib[dbus] >=dev-python/pyatspi-2.1.90[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=gnome-base/gsettings-desktop-schemas-3 gnome-base/librsvg:2 sys-apps/dbus
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=app-accessibility/at-spi2-core >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=x11-libs/gtk+-3:3[introspection] x11-libs/gtk+:2 >=dev-libs/gobject-introspection-0.10.7:= dev-libs/libgee:0.8 dev-libs/libxml2 >=media-libs/clutter-1.5.11:1.0[introspection] x11-libs/libX11 x11-libs/libxklavier x11-libs/libXtst python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/glib[dbus] >=dev-python/pyatspi-2.1.90[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=gnome-base/gsettings-desktop-schemas-3 gnome-base/librsvg:2 sys-apps/dbus
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/caribou/0.4/caribou-0.4.21.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39cee8f070272abd24e6e53b9321dc2e
+_md5_=566065d82efed70960ab910415265b80
diff --git a/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3 b/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
index 84504d8e9409..b2e073fb3959 100644
--- a/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
+++ b/metadata/md5-cache/app-accessibility/eflite-0.4.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-accessibility/flite-1.4
 SLOT=0
 SRC_URI=mirror://sourceforge/eflite/eflite-0.4.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e25d762ee8942b3c9d855e2e00a8ba80
diff --git a/metadata/md5-cache/app-accessibility/orca-3.32.0 b/metadata/md5-cache/app-accessibility/orca-3.32.0
deleted file mode 100644
index 5a90a67d66c7..000000000000
--- a/metadata/md5-cache/app-accessibility/orca-3.32.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-accessibility/at-spi2-atk-2.32:2 >=app-accessibility/at-spi2-core-2.32:2[introspection] >=dev-libs/atk-2.32 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/liblouis[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Extensible screen reader that provides access to the desktop
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/Orca
-IUSE=+braille +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-accessibility/at-spi2-atk-2.32:2 >=app-accessibility/at-spi2-core-2.32:2[introspection] >=dev-libs/atk-2.32 >=dev-libs/glib-2.28:2 dev-python/gst-python:1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] braille? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/liblouis[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/atk[introspection] >=dev-python/pyatspi-2.32[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/orca/3.32/orca-3.32.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61060ec0c82c20e87c18ee0c64a52b6b
diff --git a/metadata/md5-cache/app-accessibility/orca-3.32.0-r1 b/metadata/md5-cache/app-accessibility/orca-3.32.0-r1
new file mode 100644
index 000000000000..1eb93083924a
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/orca-3.32.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-accessibility/at-spi2-atk-2.32:2 >=app-accessibility/at-spi2-core-2.32:2[introspection] >=dev-libs/atk-2.32 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)] ) braille? ( python_single_target_python3_6? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_6(-)] ) ) >=dev-util/intltool-0.50 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Extensible screen reader that provides access to the desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Orca
+IUSE=+braille +python_single_target_python3_6
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-accessibility/at-spi2-atk-2.32:2 >=app-accessibility/at-spi2-core-2.32:2[introspection] >=dev-libs/atk-2.32 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_6(-)] ) braille? ( python_single_target_python3_6? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_6(-)] dev-libs/liblouis[python,python_targets_python3_6(-)] ) ) dev-libs/atk[introspection] python_single_target_python3_6? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_6(-)] >=dev-python/pyatspi-2.32[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/orca/3.32/orca-3.32.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ab1e15a2abb3d51bb1769f232c7e2ab9
diff --git a/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1 b/metadata/md5-cache/app-accessibility/sphinx3-0.8-r1
index 9c85392e71bc..f59322793648 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	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d82e172cbf8da7613c07e95d2fc8026
diff --git a/metadata/md5-cache/app-accessibility/sphinxbase-0.8 b/metadata/md5-cache/app-accessibility/sphinxbase-0.8
index 1ffc63568df4..a0ea34170dad 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	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5dec7b385c8010a79a35215f1d25295c
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index aaf1f2ad7c5b..8535f81d3768 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.12.0-r1 b/metadata/md5-cache/app-admin/abrt-2.12.0-r1
deleted file mode 100644
index a75d04edfcb5..000000000000
--- a/metadata/md5-cache/app-admin/abrt-2.12.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.10.0[python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 app-text/asciidoc app-text/xmlto dev-libs/satyr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Automatic bug detection and reporting tool
-EAPI=6
-HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
-IUSE=debug selinux +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.10.0[python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 app-arch/cpio app-arch/rpm dev-libs/elfutils dev-libs/json-c:0= dev-python/argcomplete[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/argh[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/humanize[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-apps/util-linux >=sys-devel/gdb-7
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/abrt/abrt/archive/2.12.0.tar.gz -> abrt-2.12.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cad895e939f9eff741d1e76b4f5a50b
diff --git a/metadata/md5-cache/app-admin/abrt-2.12.0-r2 b/metadata/md5-cache/app-admin/abrt-2.12.0-r2
new file mode 100644
index 000000000000..7a8f7a83cf8a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/abrt-2.12.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.10.0[python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 python_single_target_python3_6? ( dev-libs/satyr[python_targets_python3_6(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Automatic bug detection and reporting tool
+EAPI=6
+HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
+IUSE=debug selinux +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.56:2 >=dev-libs/libreport-2.10.0[python] dev-libs/libxml2:2 >=gnome-base/gsettings-desktop-schemas-3.15.1 net-libs/libsoup:2.4 sys-apps/dbus sys-apps/systemd:0= sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 app-arch/cpio app-arch/rpm dev-libs/elfutils dev-libs/json-c:0= sys-apps/util-linux >=sys-devel/gdb-7 python_single_target_python3_6? ( dev-python/argcomplete[python_targets_python3_6(-)] dev-python/argh[python_targets_python3_6(-)] dev-python/humanize[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/abrt/abrt/archive/2.12.0.tar.gz -> abrt-2.12.0.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=968a1a2d9f4ac8e9b57993f875904683
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2 b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2
index 22e5463d3173..2c95a036ae63 100644
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2
+++ b/metadata/md5-cache/app-admin/aerospike-amc-community-3.6.13-r2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-python/eventlet dev-python/flask dev-python/greenlet dev-python/setproctitle www-servers/gunicorn
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-amc-community/3.6.13/aerospike-amc-community-3.6.13.all.x86_64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6f35cc2e0e647837344984b027342838
diff --git a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1 b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
index 9ce7ee6cb988..3e96eecd5d4c 100644
--- a/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
+++ b/metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://www.aerospike.com/download/amc/4.0.19/artifact/linux -> aerospike-amc-community-4.0.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cf40d77563db21a4e3d76a4ae324d824
diff --git a/metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1 b/metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
index 164cbf23e8a2..d084cb6f4fc9 100644
--- a/metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
+++ b/metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Init script to setup Amazon EC2 instance parameters
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-misc/wget
 SLOT=0
-_md5_=be98a79980a67e933b1b83546195f411
+_md5_=96ac3b0653cbef31d5ce1d3ba4aa0e27
diff --git a/metadata/md5-cache/app-admin/ansible-2.7.15 b/metadata/md5-cache/app-admin/ansible-2.7.15
deleted file mode 100644
index 2649f59d94cf..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.7.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.7.15.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8e5d1ef36d5f9c239e0e65aa2808dba1
diff --git a/metadata/md5-cache/app-admin/ansible-2.8.7 b/metadata/md5-cache/app-admin/ansible-2.8.7
deleted file mode 100644
index d513d1edf664..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.8.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.8.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=20b9ea14616e0985dcfb64ab4a1a39cd
diff --git a/metadata/md5-cache/app-admin/ansible-2.8.8 b/metadata/md5-cache/app-admin/ansible-2.8.8
deleted file mode 100644
index 67566318224d..000000000000
--- a/metadata/md5-cache/app-admin/ansible-2.8.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/packaging-16.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx-notfound-page[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/passlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git )
-DESCRIPTION=Model-driven deployment, config management, and command execution framework
-EAPI=7
-HOMEPAGE=https://ansible.com/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/netaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/sshpass virtual/ssh 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.ansible.com/ansible/ansible-2.8.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bd3bf911258d94f430fad8e08b53e458
diff --git a/metadata/md5-cache/app-admin/ansible-2.9.2 b/metadata/md5-cache/app-admin/ansible-2.9.2
index ca50998e26c4..d2b224032b17 100644
--- a/metadata/md5-cache/app-admin/ansible-2.9.2
+++ b/metadata/md5-cache/app-admin/ansible-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible/ansible-2.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b93691abf0988c4d842d6fc723a344b5
diff --git a/metadata/md5-cache/app-admin/ansible-2.9.3 b/metadata/md5-cache/app-admin/ansible-2.9.3
index 07a488e4bfff..be7c87459eca 100644
--- a/metadata/md5-cache/app-admin/ansible-2.9.3
+++ b/metadata/md5-cache/app-admin/ansible-2.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible/ansible-2.9.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6e7ea917269cd67ce387652b9bcbe69
diff --git a/metadata/md5-cache/app-admin/ansible-2.9.4 b/metadata/md5-cache/app-admin/ansible-2.9.4
index aaac61c62c73..2d9934ee4658 100644
--- a/metadata/md5-cache/app-admin/ansible-2.9.4
+++ b/metadata/md5-cache/app-admin/ansible-2.9.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.ansible.com/ansible/ansible-2.9.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6e7ea917269cd67ce387652b9bcbe69
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index c0d5d28315d1..77a6b7d0291f 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f0051f8363efb47269d45dd3b75368c3
diff --git a/metadata/md5-cache/app-admin/ansible-cmdb-1.28 b/metadata/md5-cache/app-admin/ansible-cmdb-1.28
index 1f751f2b83ca..8ffa3cab6c7e 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_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-cmdb/ansible-cmdb-1.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4ffc1259cf4f0a5fab981f28d7e3dd8
diff --git a/metadata/md5-cache/app-admin/ansible-lint-4.0.1 b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
index f5b97147b8af..300c7726b0f8 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-4.0.1
+++ b/metadata/md5-cache/app-admin/ansible-lint-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/v4.0.1.tar.gz -> ansible-lint-4.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d658f6c517054d2e78be2df736673d65
diff --git a/metadata/md5-cache/app-admin/ansible-lint-4.1.0 b/metadata/md5-cache/app-admin/ansible-lint-4.1.0
new file mode 100644
index 000000000000..23046b5eedb7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-lint-4.1.0
@@ -0,0 +1,16 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/ruamel-yaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools_scm_git_archive[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) app-admin/ansible[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
+EAPI=7
+HOMEPAGE=https://github.com/ansible/ansible-lint
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-admin/ansible[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ansible/ansible-lint/archive/v4.1.0.tar.gz -> ansible-lint-4.1.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c5a5d6ae97d865e9611ddb47e71ab483
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 93f857009e89..3d038db75cb3 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee6a68bcdd6127201b9d39aa2364d04d
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 ce113cf83894..45e69d849a33 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e475cac35b358dc4d44c233bfc87782
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.12 b/metadata/md5-cache/app-admin/calamares-3.2.12
index fbf81a78c7c1..e6646a94e97a 100644
--- a/metadata/md5-cache/app-admin/calamares-3.2.12
+++ b/metadata/md5-cache/app-admin/calamares-3.2.12
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( >=dev-qt/qttest-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/yaml-cpp:= python_single_target_python3_6? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)] ) sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_single_target_python3_6(-)?] ) test? ( >=dev-qt/qttest-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Distribution-independent installer framework
 EAPI=7
 HOMEPAGE=https://calamares.io
-IUSE=+networkmanager pythonqt +upower debug test python_targets_python3_6
+IUSE=+networkmanager pythonqt +upower debug test +python_single_target_python3_6
 KEYWORDS=~amd64
 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_python3_6(-)] >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( 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/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-cpp/yaml-cpp:= python_single_target_python3_6? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)] ) sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt[qt5(+)] >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_single_target_python3_6(-)?] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( 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/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.12/calamares-3.2.12.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	kde5	43b81ba8315f22f13c8461215eb0e6dd	kde5-functions	7f1ffe0e976f19abc8fc9ffe0fbccafa	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffaf5649ae4c3004c71c5181dabb36b2
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	kde5	43b81ba8315f22f13c8461215eb0e6dd	kde5-functions	7f1ffe0e976f19abc8fc9ffe0fbccafa	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0712ab7e8356cfc4424108436b1fbf8c
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.17.1 b/metadata/md5-cache/app-admin/calamares-3.2.17.1
deleted file mode 100644
index 821e306d5e6c..000000000000
--- a/metadata/md5-cache/app-admin/calamares-3.2.17.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install postinst postrm preinst 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_python3_6(-)] dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Distribution-independent installer framework
-EAPI=7
-HOMEPAGE=https://calamares.io
-IUSE=+networkmanager pythonqt +upower debug test python_targets_python3_6
-KEYWORDS=~amd64
-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_python3_6(-)] dev-cpp/yaml-cpp:= >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( 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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.17.1/calamares-3.2.17.1.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=675008ad96716d9bb37ec8c831d94e37
diff --git a/metadata/md5-cache/app-admin/calamares-3.2.17.1-r1 b/metadata/md5-cache/app-admin/calamares-3.2.17.1-r1
new file mode 100644
index 000000000000..b15c261f7eb6
--- /dev/null
+++ b/metadata/md5-cache/app-admin/calamares-3.2.17.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/yaml-cpp:= python_single_target_python3_6? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_single_target_python3_6(-)?] ) test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Distribution-independent installer framework
+EAPI=7
+HOMEPAGE=https://calamares.io
+IUSE=+networkmanager pythonqt +upower debug test +python_single_target_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/yaml-cpp:= python_single_target_python3_6? ( >=dev-libs/boost-1.55:=[python,python_targets_python3_6(-)] dev-libs/libpwquality[python_targets_python3_6(-)] ) dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kcrash:5 kde-frameworks/kpackage:5 kde-frameworks/kparts:5 kde-frameworks/kservice:5 sys-apps/dbus sys-apps/dmidecode sys-auth/polkit-qt >=sys-libs/kpmcore-4.0.0:5= pythonqt? ( >=dev-python/PythonQt-3.1:=[python_single_target_python3_6(-)?] ) app-admin/sudo dev-libs/libatasmart net-misc/rsync || ( 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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=https://github.com/calamares/calamares/releases/download/v3.2.17.1/calamares-3.2.17.1.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0f03c7470e0eb4583148a7d49db08b5
diff --git a/metadata/md5-cache/app-admin/cancd-0.1.0-r4 b/metadata/md5-cache/app-admin/cancd-0.1.0-r4
index 9f04493e52bd..bb9f7d81a8a1 100644
--- a/metadata/md5-cache/app-admin/cancd-0.1.0-r4
+++ b/metadata/md5-cache/app-admin/cancd-0.1.0-r4
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://oss.oracle.com/projects/cancd/dist/files/source/cancd-0.1.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e8f1186123503650eb470a9bf7fb68ce
diff --git a/metadata/md5-cache/app-admin/cdist-5.1.3 b/metadata/md5-cache/app-admin/cdist-5.1.3
index 7305960ae084..20c58003b24e 100644
--- a/metadata/md5-cache/app-admin/cdist-5.1.3
+++ b/metadata/md5-cache/app-admin/cdist-5.1.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cdist/cdist-5.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8536c52939d15b722400b2bebc04f4e6
diff --git a/metadata/md5-cache/app-admin/cdist-6.0.0 b/metadata/md5-cache/app-admin/cdist-6.0.0
index 49037d256f1f..78cd1cf5f43f 100644
--- a/metadata/md5-cache/app-admin/cdist-6.0.0
+++ b/metadata/md5-cache/app-admin/cdist-6.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cdist/cdist-6.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9a081fef5986e6dc0bd8f8f6b1aeb98b
diff --git a/metadata/md5-cache/app-admin/clustershell-1.7.3 b/metadata/md5-cache/app-admin/clustershell-1.7.3
index 8e85bc3c5d3d..dcd7777d0268 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db63610921c5b00c57310475e89d511f
diff --git a/metadata/md5-cache/app-admin/conkyforecast-2.24-r1 b/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
index d55dc78b0fd7..c4a024e17a8b 100644
--- a/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
+++ b/metadata/md5-cache/app-admin/conkyforecast-2.24-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Conky weather forecast script with support for language files
 EAPI=5
 HOMEPAGE=https://launchpad.net/~conky-companions
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-admin/conky python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/~conky-companions/+archive/ppa/+files/conkyforecast_2.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e06c266547272f04567fd9641f82960b
diff --git a/metadata/md5-cache/app-admin/consul-1.6.2 b/metadata/md5-cache/app-admin/consul-1.6.2
index 9e054c8b2725..994496480e70 100644
--- a/metadata/md5-cache/app-admin/consul-1.6.2
+++ b/metadata/md5-cache/app-admin/consul-1.6.2
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.6.2.tar.gz -> consul-1.6.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=dbfec7eeb9bd2ececbbadd0eb1805750
diff --git a/metadata/md5-cache/app-admin/consul-1.6.3 b/metadata/md5-cache/app-admin/consul-1.6.3
index 51aec09baf6d..ba094b74fb4e 100644
--- a/metadata/md5-cache/app-admin/consul-1.6.3
+++ b/metadata/md5-cache/app-admin/consul-1.6.3
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul/archive/v1.6.3.tar.gz -> consul-1.6.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1b5ec1f77750207e190f6394850a375d
diff --git a/metadata/md5-cache/app-admin/consul-template-0.23.0 b/metadata/md5-cache/app-admin/consul-template-0.23.0
index a05672ae1ad4..bac7ee478837 100644
--- a/metadata/md5-cache/app-admin/consul-template-0.23.0
+++ b/metadata/md5-cache/app-admin/consul-template-0.23.0
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.23.0.tar.gz -> consul-template-0.23.0.tar.gz https://github.com/BurntSushi/toml/archive/v0.3.1.tar.gz -> github.com-BurntSushi-toml-v0.3.1.tar.gz https://github.com/armon/go-metrics/archive/ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz -> github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz https://github.com/frankban/quicktest/archive/v1.4.0.tar.gz -> github.com-frankban-quicktest-v1.4.0.tar.gz https://github.com/golang/snappy/archive/v0.0.1.tar.gz -> github.com-golang-snappy-v0.0.1.tar.gz https://github.com/google/btree/archive/v1.0.0.tar.gz -> github.com-google-btree-v1.0.0.tar.gz https://github.com/hashicorp/consul/archive/v1.2.0.tar.gz -> github.com-hashicorp-consul-v1.2.0.tar.gz https://github.com/hashicorp/errwrap/archive/v1.0.0.tar.gz -> github.com-hashicorp-errwrap-v1.0.0.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/v0.5.1.tar.gz -> github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz https://github.com/hashicorp/go-gatedio/archive/v0.5.0.tar.gz -> github.com-hashicorp-go-gatedio-v0.5.0.tar.gz https://github.com/hashicorp/go-hclog/archive/v0.9.2.tar.gz -> github.com-hashicorp-go-hclog-v0.9.2.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/v1.1.0.tar.gz -> github.com-hashicorp-go-immutable-radix-v1.1.0.tar.gz https://github.com/hashicorp/go-msgpack/archive/v0.5.5.tar.gz -> github.com-hashicorp-go-msgpack-v0.5.5.tar.gz https://github.com/hashicorp/go-multierror/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-multierror-v1.0.0.tar.gz https://github.com/hashicorp/go-retryablehttp/archive/v0.6.2.tar.gz -> github.com-hashicorp-go-retryablehttp-v0.6.2.tar.gz https://github.com/hashicorp/go-rootcerts/archive/v1.0.1.tar.gz -> github.com-hashicorp-go-rootcerts-v1.0.1.tar.gz https://github.com/hashicorp/go-sockaddr/archive/v1.0.2.tar.gz -> github.com-hashicorp-go-sockaddr-v1.0.2.tar.gz https://github.com/hashicorp/go-syslog/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-syslog-v1.0.0.tar.gz https://github.com/hashicorp/golang-lru/archive/v0.5.3.tar.gz -> github.com-hashicorp-golang-lru-v0.5.3.tar.gz https://github.com/hashicorp/hcl/archive/v1.0.0.tar.gz -> github.com-hashicorp-hcl-v1.0.0.tar.gz https://github.com/hashicorp/logutils/archive/v1.0.0.tar.gz -> github.com-hashicorp-logutils-v1.0.0.tar.gz https://github.com/hashicorp/memberlist/archive/v0.1.4.tar.gz -> github.com-hashicorp-memberlist-v0.1.4.tar.gz https://github.com/hashicorp/serf/archive/v0.8.3.tar.gz -> github.com-hashicorp-serf-v0.8.3.tar.gz https://github.com/hashicorp/vault/archive/746c0b111519166ff2126f55dba7071912c33006.tar.gz -> github.com-hashicorp-vault-746c0b111519166ff2126f55dba7071912c33006.tar.gz https://github.com/mattn/go-shellwords/archive/v1.0.5.tar.gz -> github.com-mattn-go-shellwords-v1.0.5.tar.gz https://github.com/miekg/dns/archive/v1.1.15.tar.gz -> github.com-miekg-dns-v1.1.15.tar.gz https://github.com/mitchellh/go-homedir/archive/v1.1.0.tar.gz -> github.com-mitchellh-go-homedir-v1.1.0.tar.gz https://github.com/mitchellh/hashstructure/archive/v1.0.0.tar.gz -> github.com-mitchellh-hashstructure-v1.0.0.tar.gz https://github.com/mitchellh/mapstructure/archive/v1.1.2.tar.gz -> github.com-mitchellh-mapstructure-v1.1.2.tar.gz https://github.com/pierrec/lz4/archive/v2.2.5.tar.gz -> github.com-pierrec-lz4-v2.2.5.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/ryanuber/go-glob/archive/v1.0.0.tar.gz -> github.com-ryanuber-go-glob-v1.0.0.tar.gz https://github.com/stretchr/testify/archive/v1.3.0.tar.gz -> github.com-stretchr-testify-v1.3.0.tar.gz https://github.com/golang/crypto/archive/4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz -> github.com-golang-crypto-4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz https://github.com/golang/net/archive/ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz -> github.com-golang-net-ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz https://github.com/golang/sys/archive/1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz -> github.com-golang-sys-1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz https://github.com/golang/text/archive/v0.3.2.tar.gz -> github.com-golang-text-v0.3.2.tar.gz https://github.com/golang/time/archive/c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz -> github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz https://github.com/go-check/check/archive/788fd78401277ebd861206a03c884797c6ec5541.tar.gz -> github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz https://github.com/square/go-jose/archive/v2.3.1.tar.gz -> github.com-square-go-jose-v2.3.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.2.tar.gz -> github.com-go-yaml-yaml-v2.2.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=dda1d01a7fa445c845b61fa19c7b3725
diff --git a/metadata/md5-cache/app-admin/consul-template-0.24.0 b/metadata/md5-cache/app-admin/consul-template-0.24.0
index 5ca99f2942d2..01045500463b 100644
--- a/metadata/md5-cache/app-admin/consul-template-0.24.0
+++ b/metadata/md5-cache/app-admin/consul-template-0.24.0
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.24.0.tar.gz -> consul-template-0.24.0.tar.gz https://github.com/BurntSushi/toml/archive/v0.3.1.tar.gz -> github.com-BurntSushi-toml-v0.3.1.tar.gz https://github.com/armon/go-metrics/archive/ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz -> github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz https://github.com/frankban/quicktest/archive/v1.4.0.tar.gz -> github.com-frankban-quicktest-v1.4.0.tar.gz https://github.com/golang/snappy/archive/v0.0.1.tar.gz -> github.com-golang-snappy-v0.0.1.tar.gz https://github.com/google/btree/archive/v1.0.0.tar.gz -> github.com-google-btree-v1.0.0.tar.gz https://github.com/hashicorp/consul/archive/v1.2.0.tar.gz -> github.com-hashicorp-consul-v1.2.0.tar.gz https://github.com/hashicorp/errwrap/archive/v1.0.0.tar.gz -> github.com-hashicorp-errwrap-v1.0.0.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/v0.5.1.tar.gz -> github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz https://github.com/hashicorp/go-gatedio/archive/v0.5.0.tar.gz -> github.com-hashicorp-go-gatedio-v0.5.0.tar.gz https://github.com/hashicorp/go-hclog/archive/v0.9.2.tar.gz -> github.com-hashicorp-go-hclog-v0.9.2.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/v1.1.0.tar.gz -> github.com-hashicorp-go-immutable-radix-v1.1.0.tar.gz https://github.com/hashicorp/go-msgpack/archive/v0.5.5.tar.gz -> github.com-hashicorp-go-msgpack-v0.5.5.tar.gz https://github.com/hashicorp/go-multierror/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-multierror-v1.0.0.tar.gz https://github.com/hashicorp/go-retryablehttp/archive/v0.6.2.tar.gz -> github.com-hashicorp-go-retryablehttp-v0.6.2.tar.gz https://github.com/hashicorp/go-rootcerts/archive/v1.0.1.tar.gz -> github.com-hashicorp-go-rootcerts-v1.0.1.tar.gz https://github.com/hashicorp/go-sockaddr/archive/v1.0.2.tar.gz -> github.com-hashicorp-go-sockaddr-v1.0.2.tar.gz https://github.com/hashicorp/go-syslog/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-syslog-v1.0.0.tar.gz https://github.com/hashicorp/golang-lru/archive/v0.5.3.tar.gz -> github.com-hashicorp-golang-lru-v0.5.3.tar.gz https://github.com/hashicorp/hcl/archive/v1.0.0.tar.gz -> github.com-hashicorp-hcl-v1.0.0.tar.gz https://github.com/hashicorp/logutils/archive/v1.0.0.tar.gz -> github.com-hashicorp-logutils-v1.0.0.tar.gz https://github.com/hashicorp/memberlist/archive/v0.1.4.tar.gz -> github.com-hashicorp-memberlist-v0.1.4.tar.gz https://github.com/hashicorp/serf/archive/v0.8.3.tar.gz -> github.com-hashicorp-serf-v0.8.3.tar.gz https://github.com/hashicorp/vault/archive/746c0b111519166ff2126f55dba7071912c33006.tar.gz -> github.com-hashicorp-vault-746c0b111519166ff2126f55dba7071912c33006.tar.gz https://github.com/mattn/go-shellwords/archive/v1.0.5.tar.gz -> github.com-mattn-go-shellwords-v1.0.5.tar.gz https://github.com/miekg/dns/archive/v1.1.15.tar.gz -> github.com-miekg-dns-v1.1.15.tar.gz https://github.com/mitchellh/go-homedir/archive/v1.1.0.tar.gz -> github.com-mitchellh-go-homedir-v1.1.0.tar.gz https://github.com/mitchellh/hashstructure/archive/v1.0.0.tar.gz -> github.com-mitchellh-hashstructure-v1.0.0.tar.gz https://github.com/mitchellh/mapstructure/archive/v1.1.2.tar.gz -> github.com-mitchellh-mapstructure-v1.1.2.tar.gz https://github.com/pierrec/lz4/archive/v2.2.5.tar.gz -> github.com-pierrec-lz4-v2.2.5.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/ryanuber/go-glob/archive/v1.0.0.tar.gz -> github.com-ryanuber-go-glob-v1.0.0.tar.gz https://github.com/stretchr/testify/archive/v1.3.0.tar.gz -> github.com-stretchr-testify-v1.3.0.tar.gz https://github.com/golang/crypto/archive/4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz -> github.com-golang-crypto-4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz https://github.com/golang/net/archive/ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz -> github.com-golang-net-ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz https://github.com/golang/sys/archive/1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz -> github.com-golang-sys-1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz https://github.com/golang/text/archive/v0.3.2.tar.gz -> github.com-golang-text-v0.3.2.tar.gz https://github.com/golang/time/archive/c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz -> github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz https://github.com/go-check/check/archive/788fd78401277ebd861206a03c884797c6ec5541.tar.gz -> github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz https://github.com/square/go-jose/archive/v2.3.1.tar.gz -> github.com-square-go-jose-v2.3.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.2.tar.gz -> github.com-go-yaml-yaml-v2.2.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8edee055990a553e9c23e598b75db303
diff --git a/metadata/md5-cache/app-admin/denyhosts-2.9 b/metadata/md5-cache/app-admin/denyhosts-2.9
index a5de7190cbb3..6b8e070f922a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f5f303e6bb3cfe8feb86ba51a699992
diff --git a/metadata/md5-cache/app-admin/denyhosts-3.0 b/metadata/md5-cache/app-admin/denyhosts-3.0
index d8c9ba81831b..a3bbc707fdb9 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 7d6a07815bdc..a877e2ac2f89 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b5b2855bb9f0da2b2fa3c0b8e8b4aa7
diff --git a/metadata/md5-cache/app-admin/diamond-4.0-r1 b/metadata/md5-cache/app-admin/diamond-4.0-r1
deleted file mode 100644
index 36ff3da98c0f..000000000000
--- a/metadata/md5-cache/app-admin/diamond-4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) test? ( dev-python/mock ) python_targets_python2_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/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python daemon that collects and publishes system metrics
-EAPI=5
-HOMEPAGE=https://github.com/python-diamond/Diamond
-IUSE=test mongo mysql snmp redis python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-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 )
-RESTRICT=!test? ( test )
-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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b2dcc54f5e5cc3a26cb40742eb067c0
diff --git a/metadata/md5-cache/app-admin/diamond-4.0.515 b/metadata/md5-cache/app-admin/diamond-4.0.515
deleted file mode 100644
index 4d88ef26e0f9..000000000000
--- a/metadata/md5-cache/app-admin/diamond-4.0.515
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) test? ( dev-python/mock dev-python/pysnmp ) python_targets_python2_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/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python daemon that collects and publishes system metrics
-EAPI=5
-HOMEPAGE=https://github.com/python-diamond/Diamond
-IUSE=test mongo mysql snmp redis python_targets_python2_7
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-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 )
-RESTRICT=!test? ( test )
-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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b9a7756d8aad6550f81765f060b36eb
diff --git a/metadata/md5-cache/app-admin/diamond-4.0.515.20170311 b/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
index 002715588083..469e692b1de4 100644
--- a/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
+++ b/metadata/md5-cache/app-admin/diamond-4.0.515.20170311
@@ -4,12 +4,12 @@ DESCRIPTION=Python daemon that collects and publishes system metrics
 EAPI=6
 HOMEPAGE=https://github.com/python-diamond/Diamond
 IUSE=test mongo mysql snmp redis python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 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_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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-diamond/Diamond/archive/73207d04e0739a4ce92bc201b36681c42d9fa7e7.tar.gz -> python-diamond-4.0.515.20170311.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2daf586bdfb1a6827ea2d646d8f119ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed7c0f57154be0072c0ec1cad215b4fb
diff --git a/metadata/md5-cache/app-admin/dxf-7.5.1 b/metadata/md5-cache/app-admin/dxf-7.5.1
index 6ad5d62d070b..9f639503a0ff 100644
--- a/metadata/md5-cache/app-admin/dxf-7.5.1
+++ b/metadata/md5-cache/app-admin/dxf-7.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.5.1.tar.gz -> dxf-7.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ad5125f21ee02aa3c48f98a672b3137
diff --git a/metadata/md5-cache/app-admin/dxf-7.5.2 b/metadata/md5-cache/app-admin/dxf-7.5.2
index d3c082032d0d..fb85cdf843d8 100644
--- a/metadata/md5-cache/app-admin/dxf-7.5.2
+++ b/metadata/md5-cache/app-admin/dxf-7.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davedoesdev/dxf/archive/v7.5.2.tar.gz -> dxf-7.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ad5125f21ee02aa3c48f98a672b3137
diff --git a/metadata/md5-cache/app-admin/eclean-kernel-0.4.3 b/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
index ecdbcd7ef883..3ba0c83949bd 100644
--- a/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
+++ b/metadata/md5-cache/app-admin/eclean-kernel-0.4.3
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Remove outdated built kernels
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/eclean-kernel/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=kernel_linux? ( dev-python/pymountboot[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eclean-kernel/archive/v0.4.3.tar.gz -> eclean-kernel-0.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cd42bfc70769dd05e1f5a9f7e8875c3a
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=da96133b65ef1f46a52211b9deaa922e
diff --git a/metadata/md5-cache/app-admin/equo-302 b/metadata/md5-cache/app-admin/equo-302
deleted file mode 100644
index ad83596b38d4..000000000000
--- a/metadata/md5-cache/app-admin/equo-302
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/asciidoc
-DESCRIPTION=Entropy Package Manager text-based client
-EAPI=5
-HOMEPAGE=http://www.sabayon.org
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-apps/file[python]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ea810a85059cdfea498fd3a063d0a4f2
diff --git a/metadata/md5-cache/app-admin/equo-302-r1 b/metadata/md5-cache/app-admin/equo-302-r1
new file mode 100644
index 000000000000..6ce562ca664a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/equo-302-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~sys-apps/entropy-302[python_single_target_python2_7(-)?] app-text/asciidoc
+DESCRIPTION=Entropy Package Manager text-based client
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~sys-apps/entropy-302[python_single_target_python2_7(-)?] sys-apps/file[python]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c673ccd54feefd7c8a13f3b597d3a34e
diff --git a/metadata/md5-cache/app-admin/exo-1.10.0 b/metadata/md5-cache/app-admin/exo-1.10.0
new file mode 100644
index 000000000000..b6622ad7e42a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/exo-1.10.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/go:=
+DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
+EAPI=7
+HOMEPAGE=https://exoscale.github.io/cli
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/exoscale/cli/archive/v1.10.0.tar.gz -> exo-1.10.0.tar.gz
+_md5_=4613cdf03d7e87ace11d7f888f9c6cf5
diff --git a/metadata/md5-cache/app-admin/exo-1.9.0 b/metadata/md5-cache/app-admin/exo-1.9.0
deleted file mode 100644
index 6a5b6b83e8bb..000000000000
--- a/metadata/md5-cache/app-admin/exo-1.9.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/go:=
-DESCRIPTION=Command-line tool for everything at Exoscale: compute, storage, dns.
-EAPI=7
-HOMEPAGE=https://exoscale.github.io/cli
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.9.0.tar.gz -> exo-1.9.0.tar.gz
-_md5_=4613cdf03d7e87ace11d7f888f9c6cf5
diff --git a/metadata/md5-cache/app-admin/fluentd-1.2.6-r1 b/metadata/md5-cache/app-admin/fluentd-1.2.6-r1
index 3a5db34f4b18..cc5e43ba60b2 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.2.6-r1
+++ b/metadata/md5-cache/app-admin/fluentd-1.2.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.2.6.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8745bf4fb72794bfbc1ef9aac1e4a75f
diff --git a/metadata/md5-cache/app-admin/fluentd-1.3.1 b/metadata/md5-cache/app-admin/fluentd-1.3.1
index 8774be8a3e78..08b435e26e2d 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.3.1
+++ b/metadata/md5-cache/app-admin/fluentd-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.3.1.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fa3b58e9b8660bdd9587c6dc8e78ba71
diff --git a/metadata/md5-cache/app-admin/fluentd-1.3.2 b/metadata/md5-cache/app-admin/fluentd-1.3.2
index d56cbd142a23..4feaacc923cd 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.3.2
+++ b/metadata/md5-cache/app-admin/fluentd-1.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.3.2.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fa3b58e9b8660bdd9587c6dc8e78ba71
diff --git a/metadata/md5-cache/app-admin/fluentd-1.3.3 b/metadata/md5-cache/app-admin/fluentd-1.3.3
index 84d633283aa0..36fa8afd2042 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.3.3
+++ b/metadata/md5-cache/app-admin/fluentd-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.3.3.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ae970460f208820ef188406646336c87
diff --git a/metadata/md5-cache/app-admin/fluentd-1.4.0 b/metadata/md5-cache/app-admin/fluentd-1.4.0
index 93d816199cc4..93b0167d302d 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.4.0
+++ b/metadata/md5-cache/app-admin/fluentd-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.4.0.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ae970460f208820ef188406646336c87
diff --git a/metadata/md5-cache/app-admin/fluentd-1.4.1 b/metadata/md5-cache/app-admin/fluentd-1.4.1
index 145b06ba5325..d38b5318ff85 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.4.1
+++ b/metadata/md5-cache/app-admin/fluentd-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.4.1.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ae970460f208820ef188406646336c87
diff --git a/metadata/md5-cache/app-admin/fluentd-1.4.2 b/metadata/md5-cache/app-admin/fluentd-1.4.2
index ae3db5e17fb2..de4267393ce2 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.4.2
+++ b/metadata/md5-cache/app-admin/fluentd-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.4.2.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1e0e2ea87c4b6f798c734b2178d1067d
diff --git a/metadata/md5-cache/app-admin/fluentd-1.9.0 b/metadata/md5-cache/app-admin/fluentd-1.9.0
index a9be355be078..0c65168849a0 100644
--- a/metadata/md5-cache/app-admin/fluentd-1.9.0
+++ b/metadata/md5-cache/app-admin/fluentd-1.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/fluentd-1.9.0.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=58de2647fdcee221e1fbd2ca12994654
diff --git a/metadata/md5-cache/app-admin/gixy-0.1.20 b/metadata/md5-cache/app-admin/gixy-0.1.20
index e4c2a58b5f06..5b7eddb8b122 100644
--- a/metadata/md5-cache/app-admin/gixy-0.1.20
+++ b/metadata/md5-cache/app-admin/gixy-0.1.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/yandex/gixy/archive/v0.1.20.tar.gz -> gixy-0.1.20.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e7294e65528e6e277b3cf3d9eac03cfd
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2 b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
index 13ba3a647a56..a9f10bfa35c3 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.10-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Single process stack of various system monitors
 EAPI=7
 HOMEPAGE=http://www.gkrellm.net/
 IUSE=gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
 SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0995f4bceeb50e352df83aed32ca9b2d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=52643c0416d75703318d24ba92198f81
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.11 b/metadata/md5-cache/app-admin/gkrellm-2.3.11
index 2d4f05d14478..59c053684bef 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.11
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.11
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango )
 SLOT=2
 SRC_URI=http://gkrellm.srcbox.net/gkrellm-2.3.11.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1aa99d0d88e0b712c37a886184d4b369
diff --git a/metadata/md5-cache/app-admin/glance-19.0.0 b/metadata/md5-cache/app-admin/glance-19.0.0
index 2e9cda796402..93fd30580b78 100644
--- a/metadata/md5-cache/app-admin/glance-19.0.0
+++ b/metadata/md5-cache/app-admin/glance-19.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-19.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=08c8fe289f0530a122db63553eba62ac
diff --git a/metadata/md5-cache/app-admin/glance-19.0.1 b/metadata/md5-cache/app-admin/glance-19.0.1
index d25457644011..724af0ae3000 100644
--- a/metadata/md5-cache/app-admin/glance-19.0.1
+++ b/metadata/md5-cache/app-admin/glance-19.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/glance/glance-19.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=49386e30f1f668b5316463135bb5ff80
diff --git a/metadata/md5-cache/app-admin/glance-2019.2.9999 b/metadata/md5-cache/app-admin/glance-2019.2.9999
index 115dc38d7b44..0f19e8ad7c7b 100644
--- a/metadata/md5-cache/app-admin/glance-2019.2.9999
+++ b/metadata/md5-cache/app-admin/glance-2019.2.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/defusedxml-0.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/eventlet-0.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.8.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/WSME-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-17.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-messaging-9.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/glance_store-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] acct-user/glance acct-group/glance 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=49386e30f1f668b5316463135bb5ff80
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 c5d7ca178325..22c0bcf7666c 100644
--- a/metadata/md5-cache/app-admin/gnome-abrt-1.2.6
+++ b/metadata/md5-cache/app-admin/gnome-abrt-1.2.6
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A utility for viewing problems that have occurred with the system
 EAPI=6
 HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) x11-libs/gtk+:3 >=dev-libs/libreport-2.0.20[python] >=app-admin/abrt-2.10.10-r1 dev-python/pygobject:3 x11-libs/libX11 >=dev-python/pyxdg-0.19
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6d7771bdf71e3874fe1f0186be2bcb0
diff --git a/metadata/md5-cache/app-admin/graylog-2.5.1 b/metadata/md5-cache/app-admin/graylog-2.5.1
index b18933b189f8..095e6c1dc10f 100644
--- a/metadata/md5-cache/app-admin/graylog-2.5.1
+++ b/metadata/md5-cache/app-admin/graylog-2.5.1
@@ -8,5 +8,5 @@ RDEPEND=virtual/jdk:1.8
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://packages.graylog2.org/releases/graylog/graylog-2.5.1.tgz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bdae2ba7a1672abf9e486b5c24bd35e2
diff --git a/metadata/md5-cache/app-admin/hcloud-1.15.0 b/metadata/md5-cache/app-admin/hcloud-1.15.0
new file mode 100644
index 000000000000..d33e5521ae1e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/hcloud-1.15.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/go:=
+DESCRIPTION=A command-line interface for Hetzner Cloud
+EAPI=7
+HOMEPAGE=https://github.com/hetznercloud/cli
+KEYWORDS=~amd64
+LICENSE=MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ago/distfiles/hcloud-1.15.0.tar.xz
+_md5_=7252e0f38e2c4cdcd2bebc1e1779dab4
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 58083966c0b7..44c53c5242d9 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_6? ( dev-lang/python:3.6[ncurses(+)] ) >=dev-lang
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da79a789f6b3aa7c68c617ee4b1c70c4
diff --git a/metadata/md5-cache/app-admin/keepass-2.42.1 b/metadata/md5-cache/app-admin/keepass-2.42.1
deleted file mode 100644
index 1fb0c5789d91..000000000000
--- a/metadata/md5-cache/app-admin/keepass-2.42.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-lang/mono app-arch/unzip
-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.42.1-Source.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9b5643432f71cd6f59e3795989bad13
diff --git a/metadata/md5-cache/app-admin/keepass-2.44 b/metadata/md5-cache/app-admin/keepass-2.44
new file mode 100644
index 000000000000..6839085c2562
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepass-2.44
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-lang/mono app-arch/unzip
+DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
+EAPI=7
+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.44-Source.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a25f2919a45b5e6ed0bf8c652598695a
diff --git a/metadata/md5-cache/app-admin/lib_users-0.14 b/metadata/md5-cache/app-admin/lib_users-0.14
new file mode 100644
index 000000000000..337d56d6caa9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/lib_users-0.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install test
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Check for mapped libs and open files that are marked as deleted
+EAPI=6
+HOMEPAGE=https://github.com/klausman/lib_users
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/klausman/lib_users/archive/v0.14.tar.gz -> lib_users-0.14.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e10df74491af1760bb97a9c86ff5cbfa
diff --git a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1 b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
index 976ac01fa151..659e21246d83 100644
--- a/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
+++ b/metadata/md5-cache/app-admin/logcheck-1.3.18-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=!app-admin/logsentry app-misc/lockfile-progs dev-lang/perl dev-perl/mime-construct virtual/mailx
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/logcheck/logcheck_1.3.18.tar.xz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=28c1e4f3e54d7917cbcdb4e231c2a254
diff --git a/metadata/md5-cache/app-admin/logstash-bin-5.6.15 b/metadata/md5-cache/app-admin/logstash-bin-5.6.15
index 14a6015b9b54..86650c89f16a 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-5.6.15
+++ b/metadata/md5-cache/app-admin/logstash-bin-5.6.15
@@ -10,5 +10,5 @@ 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.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2ed1265b5f98e1420ac9544b1bebd6ce
diff --git a/metadata/md5-cache/app-admin/logstash-bin-7.2.0 b/metadata/md5-cache/app-admin/logstash-bin-7.2.0
index d2ae5cded71c..4f3346d66198 100644
--- a/metadata/md5-cache/app-admin/logstash-bin-7.2.0
+++ b/metadata/md5-cache/app-admin/logstash-bin-7.2.0
@@ -10,5 +10,5 @@ RDEPEND=acct-group/logstash acct-user/logstash virtual/jre >=dev-java/java-confi
 RESTRICT=strip
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-7.2.0.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/logstash/logstash-oss-7.2.0.tar.gz )
-_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0fba9988629bb49f974845c35ecd1689
diff --git a/metadata/md5-cache/app-admin/logsurfer+-1.8-r3 b/metadata/md5-cache/app-admin/logsurfer+-1.8-r3
index 2dee0ac31d75..79826515d074 100644
--- a/metadata/md5-cache/app-admin/logsurfer+-1.8-r3
+++ b/metadata/md5-cache/app-admin/logsurfer+-1.8-r3
@@ -7,5 +7,5 @@ LICENSE=freedist GPL-2+
 RESTRICT=bindist
 SLOT=0
 SRC_URI=mirror://sourceforge/logsurfer/logsurfer-1.8.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=38b43bdb88cbb21a00fdba34d9c3ca06
diff --git a/metadata/md5-cache/app-admin/matter-302 b/metadata/md5-cache/app-admin/matter-302
deleted file mode 100644
index dd5972907c57..000000000000
--- a/metadata/md5-cache/app-admin/matter-302
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=Automated Packages Builder for Portage and Entropy
-EAPI=5
-HOMEPAGE=http://www.sabayon.org
-IUSE=+entropy +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=entropy? ( ~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sys-apps/file[python] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c2d6114f8060a7fd083d9f232a8e3f4
diff --git a/metadata/md5-cache/app-admin/matter-302-r1 b/metadata/md5-cache/app-admin/matter-302-r1
new file mode 100644
index 000000000000..6c1432f3e74f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/matter-302-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Automated Packages Builder for Portage and Entropy
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=+entropy +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=entropy? ( ~sys-apps/entropy-302[python_single_target_python2_7(-)?] ) sys-apps/file[python] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f9bd973d19b84a6a244c30b584c4e7b0
diff --git a/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1 b/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
index 06660b0d1181..064ae903f6ae 100644
--- a/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
+++ b/metadata/md5-cache/app-admin/mms-agent-3.7.0.212_p1
@@ -10,5 +10,5 @@ RDEPEND=!<dev-db/mongodb-3.0.0[mms-agent]
 REQUIRED_USE=|| ( monitoring )
 SLOT=0
 SRC_URI=monitoring? ( amd64? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-3.7.0.212-1.linux_x86_64.tar.gz ) x86? ( https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-3.7.0.212-1.linux_i386.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4bed47a6840a577347ec59c8c3a4cb9b
diff --git a/metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1 b/metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1
index f53d9a02e438..09b263f688ce 100644
--- a/metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1
+++ b/metadata/md5-cache/app-admin/mms-agent-6.0.0.381_p1
@@ -10,5 +10,5 @@ RDEPEND=!<dev-db/mongodb-3.0.0[mms-agent]
 REQUIRED_USE=|| ( monitoring )
 SLOT=0
 SRC_URI=monitoring? ( https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-6.0.0.381-1.linux_x86_64.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d19b9985de457958819f48864a01886d
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.6.17 b/metadata/md5-cache/app-admin/mongo-tools-3.6.17
new file mode 100644
index 000000000000..923cc0d70fc9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.6.17
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=sasl ssl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.17.tar.gz -> mongo-tools-3.6.17.tar.gz
+_md5_=fc0a5c3ebe356bd914a35b642e543d17
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.0.16 b/metadata/md5-cache/app-admin/mongo-tools-4.0.16
new file mode 100644
index 000000000000..0cd21aaa972b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.0.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=sasl ssl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.0.16.tar.gz -> mongo-tools-4.0.16.tar.gz
+_md5_=fc0a5c3ebe356bd914a35b642e543d17
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.2.3 b/metadata/md5-cache/app-admin/mongo-tools-4.2.3
new file mode 100644
index 000000000000..caa1d90055e7
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.2.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=sasl ssl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.2.3.tar.gz -> mongo-tools-4.2.3.tar.gz
+_md5_=fc0a5c3ebe356bd914a35b642e543d17
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 45bc9988bc64..dcb47257134e 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/ngxtop-0.0.3_pre141201.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf0c2539d67a349d3eb5f8dbc8895432
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.1.12 b/metadata/md5-cache/app-admin/packagekit-base-1.1.12
deleted file mode 100644
index c17b847e82d0..000000000000
--- a/metadata/md5-cache/app-admin/packagekit-base-1.1.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.54.0:2 >=sys-auth/polkit-0.114 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-213 ) app-text/docbook-xsl-stylesheets >=dev-cpp/glibmm-2.4 dev-libs/libxml2:2 dev-libs/libxslt dev-libs/vala-common dev-util/glib-utils >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.35.0 sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-architecture API
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
-IUSE=command-not-found consolekit cron elogind entropy +introspection systemd test vala +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.54.0:2 >=sys-auth/polkit-0.114 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-213 ) >=app-portage/layman-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sys-apps/portage-2.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] consolekit? ( sys-auth/consolekit ) entropy? ( >=sys-apps/entropy-234[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( consolekit elogind systemd ) vala? ( introspection ) entropy? ( python_single_target_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0/18
-SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.12.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c3e791050f55ec87612b80466e28257
diff --git a/metadata/md5-cache/app-admin/packagekit-base-1.1.12-r1 b/metadata/md5-cache/app-admin/packagekit-base-1.1.12-r1
new file mode 100644
index 000000000000..97c6de5e885c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/packagekit-base-1.1.12-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.54.0:2 >=sys-auth/polkit-0.114 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-213 ) app-text/docbook-xsl-stylesheets >=dev-cpp/glibmm-2.4 dev-libs/libxml2:2 dev-libs/libxslt dev-libs/vala-common dev-util/glib-utils >=dev-util/gtk-doc-am-1.11 >=dev-util/intltool-0.35.0 sys-devel/autoconf-archive sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Manage packages in a secure way using a cross-distro and cross-architecture API
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
+IUSE=command-not-found consolekit cron elogind entropy +introspection systemd test vala +python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=>=app-shells/bash-completion-2 dev-db/sqlite:3 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.54.0:2 >=sys-auth/polkit-0.114 >=sys-apps/dbus-1.3.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.9:= ) systemd? ( >=sys-apps/systemd-213 ) python_single_target_python2_7? ( >=app-portage/layman-2[python_targets_python2_7(-)] >=sys-apps/portage-2.2[python_targets_python2_7(-)] ) consolekit? ( sys-auth/consolekit ) entropy? ( >=sys-apps/entropy-234[python_single_target_python2_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ^^ ( consolekit elogind systemd ) vala? ( introspection ) entropy? ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0/18
+SRC_URI=https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.12.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=74e4eb680061d6dc93f4907061c508a3
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13 b/metadata/md5-cache/app-admin/ps_mem-3.13
deleted file mode 100644
index df12fd29bc64..000000000000
--- a/metadata/md5-cache/app-admin/ps_mem-3.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-DESCRIPTION=A utility to report core memory usage per program
-EAPI=6
-HOMEPAGE=https://github.com/pixelb/ps_mem
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/pixelb/ps_mem/archive/9f54e1aa3a87ec176ce8b71f02673e0d8293b344.tar.gz -> ps_mem-3.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc26355173a72a580328673ee95ded3b
diff --git a/metadata/md5-cache/app-admin/ps_mem-3.13-r1 b/metadata/md5-cache/app-admin/ps_mem-3.13-r1
new file mode 100644
index 000000000000..6f19b62a6a24
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ps_mem-3.13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] )
+DESCRIPTION=A utility to report core memory usage per program
+EAPI=6
+HOMEPAGE=https://github.com/pixelb/ps_mem
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 sparc x86
+LICENSE=LGPL-2.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/pixelb/ps_mem/archive/9f54e1aa3a87ec176ce8b71f02673e0d8293b344.tar.gz -> ps_mem-3.13.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c1e4f9248f7f99b74172dbdb42bcb3b
diff --git a/metadata/md5-cache/app-admin/puppet-4.10.12 b/metadata/md5-cache/app-admin/puppet-4.10.12
index e104f4485054..e5c0fbc353ec 100644
--- a/metadata/md5-cache/app-admin/puppet-4.10.12
+++ b/metadata/md5-cache/app-admin/puppet-4.10.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-4.10.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e80c42a2649a0d92b2749ac6160e37db
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.17 b/metadata/md5-cache/app-admin/puppet-5.5.17
index f6bb98c847cc..f05df048158f 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.17
+++ b/metadata/md5-cache/app-admin/puppet-5.5.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1500cbfd2e1298a15b773a7977247b29
diff --git a/metadata/md5-cache/app-admin/puppet-5.5.18 b/metadata/md5-cache/app-admin/puppet-5.5.18
index 2d472f354d68..e5e35de19d57 100644
--- a/metadata/md5-cache/app-admin/puppet-5.5.18
+++ b/metadata/md5-cache/app-admin/puppet-5.5.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-5.5.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=39fa6356e87ad0d759656e091b39657d
diff --git a/metadata/md5-cache/app-admin/puppet-6.10.1 b/metadata/md5-cache/app-admin/puppet-6.10.1
index b415b7ab8b2d..95641afcbcb1 100644
--- a/metadata/md5-cache/app-admin/puppet-6.10.1
+++ b/metadata/md5-cache/app-admin/puppet-6.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0ec35180fa765543bfa4772db6ba6aa
diff --git a/metadata/md5-cache/app-admin/puppet-6.11.1 b/metadata/md5-cache/app-admin/puppet-6.11.1
index ab9ea2b1252a..167feb24e5cb 100644
--- a/metadata/md5-cache/app-admin/puppet-6.11.1
+++ b/metadata/md5-cache/app-admin/puppet-6.11.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a0ec35180fa765543bfa4772db6ba6aa
diff --git a/metadata/md5-cache/app-admin/puppet-6.12.0 b/metadata/md5-cache/app-admin/puppet-6.12.0
index 6152b385c353..12915562783b 100644
--- a/metadata/md5-cache/app-admin/puppet-6.12.0
+++ b/metadata/md5-cache/app-admin/puppet-6.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-6.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9e7b739280e14591770fbf97250969b8
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.11.1 b/metadata/md5-cache/app-admin/puppet-agent-6.11.1
index 08da42e438f2..8472e11243bb 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.11.1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.11.1
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/augeas !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !ap
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.11.1-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.11.1-1stretch_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6fec500f7f22479f58edda1fa128dd18
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.11.1-r1 b/metadata/md5-cache/app-admin/puppet-agent-6.11.1-r1
index 5a0ac396eec9..2fc9cedf732a 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.11.1-r1
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.11.1-r1
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.11.1-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.11.1-1stretch_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5060f0272deba1a9b95d663ad61eeb3e
diff --git a/metadata/md5-cache/app-admin/puppet-agent-6.12.0 b/metadata/md5-cache/app-admin/puppet-agent-6.12.0
index 65538d62c9e1..eaa1491d739c 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-6.12.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-6.12.0
@@ -11,5 +11,5 @@ RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-w
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.12.0-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet/p/puppet-agent/puppet-agent_6.12.0-1stretch_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5060f0272deba1a9b95d663ad61eeb3e
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.7.2 b/metadata/md5-cache/app-admin/puppetdb-6.7.2
index c6ec65d3485a..c3f2e635cc25 100644
--- a/metadata/md5-cache/app-admin/puppetdb-6.7.2
+++ b/metadata/md5-cache/app-admin/puppetdb-6.7.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.7.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f9c7186e96e99f02d8d5f1ba966f562e
diff --git a/metadata/md5-cache/app-admin/puppetdb-6.8.0 b/metadata/md5-cache/app-admin/puppetdb-6.8.0
index 9297d72d3644..2a3aac8186a1 100644
--- a/metadata/md5-cache/app-admin/puppetdb-6.8.0
+++ b/metadata/md5-cache/app-admin/puppetdb-6.8.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-6.8.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1e4bae2a3fcc56b1717a037c76f0a46e
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.7.2 b/metadata/md5-cache/app-admin/puppetserver-6.7.2
index 4dd5da875005..22cb3463de8b 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.7.2
+++ b/metadata/md5-cache/app-admin/puppetserver-6.7.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.7.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c57accb56dd69ac44bcafb694f1023c6
diff --git a/metadata/md5-cache/app-admin/puppetserver-6.8.0 b/metadata/md5-cache/app-admin/puppetserver-6.8.0
index 1770ba4d04f2..41c735ca55ae 100644
--- a/metadata/md5-cache/app-admin/puppetserver-6.8.0
+++ b/metadata/md5-cache/app-admin/puppetserver-6.8.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?]
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-6.8.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a939a94caacf85fd00b3a9341439b159
diff --git a/metadata/md5-cache/app-admin/pwman3-0.10.0 b/metadata/md5-cache/app-admin/pwman3-0.10.0
index 72d1e7175dd5..b8ae5e77ab3a 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.10.0
+++ b/metadata/md5-cache/app-admin/pwman3-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.10.0.tar.gz -> pwman3-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbff5ad48e0404a13f86519c2c7daecf
diff --git a/metadata/md5-cache/app-admin/pwman3-0.9.11 b/metadata/md5-cache/app-admin/pwman3-0.9.11
index 40f27d6db9d1..5ff7af0fbca8 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.9.11
+++ b/metadata/md5-cache/app-admin/pwman3-0.9.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pwman3/pwman3/archive/v0.9.11.tar.gz -> pwman3-0.9.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f009800edf2fff42d5d8c62c04f61422
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1910.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.1910.0-r1
index 9bdfc9f37d59..a808489737a8 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.1910.0-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1910.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) 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? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) 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 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=>=dev-libs/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:= ) 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? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) 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 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.1910.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1910.0.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63e69dc1bf298c92bd0d0f6feb77149c
+_md5_=be0afb661b3c391ee7606b3d7659dba2
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1911.0-r1 b/metadata/md5-cache/app-admin/rsyslog-8.1911.0-r1
index a147f3b54277..7f60beedd7cc 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.1911.0-r1
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1911.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) 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? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) 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 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=>=dev-libs/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:= ) 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? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) 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 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.1911.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1911.0.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b313d82a1c37e91f78ce85834323a8a4
+_md5_=7e011edd9e54d7964681a2c55e8de587
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.2001.0 b/metadata/md5-cache/app-admin/rsyslog-8.2001.0
index 0b9a9d7f29f7..b7721b2c13ed 100644
--- a/metadata/md5-cache/app-admin/rsyslog-8.2001.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.2001.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) 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? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) 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 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=>=dev-libs/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:= ) 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? ( dev-db/mysql-connector-c:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) 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 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=6
 HOMEPAGE=https://www.rsyslog.com/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2001.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.2001.0.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=242697ef2bdbbc175dc77decfeeff288
+_md5_=9fac0b37428c32a9a2e5e5e160247ee3
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.3 b/metadata/md5-cache/app-admin/sagan-0.2.3
index 917c0e2b1070..b372e9178d91 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.3
+++ b/metadata/md5-cache/app-admin/sagan-0.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
 SLOT=0
 SRC_URI=http://sagan.quadrantsec.com/download/sagan-0.2.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8137960323090eea13b02136f2e7e7b
diff --git a/metadata/md5-cache/app-admin/sagan-0.2.3-r1 b/metadata/md5-cache/app-admin/sagan-0.2.3-r1
index 6ea98850d935..e81efb7c7308 100644
--- a/metadata/md5-cache/app-admin/sagan-0.2.3-r1
+++ b/metadata/md5-cache/app-admin/sagan-0.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) lognorm? ( dev-libs/liblognorm ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 )
 SLOT=0
 SRC_URI=http://sagan.quadrantsec.com/download/sagan-0.2.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=48ceada163bc38a8b533e74b06ef8b28
diff --git a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3 b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3
index bf6e24478d61..e4218b1ebd85 100644
--- a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3
+++ b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesmtp ) pcap? ( net-libs/libpcap ) mysql? ( virtual/mysql ) lognorm? ( dev-libs/liblognorm dev-libs/json-c:= dev-libs/libee dev-libs/libestr ) libdnet? ( dev-libs/libdnet ) snort? ( >=net-analyzer/snortsam-2.50 ) geoip? ( dev-libs/geoip )
 SLOT=0
 SRC_URI=http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=84ae7993f93af0d6a9b864773ffbe0e9
diff --git a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1 b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
index 777b5a9d2bda..b9d2880e5917 100644
--- a/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
+++ b/metadata/md5-cache/app-admin/sagan-1.0.0_rc3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre app-admin/sagan-rules[lognorm?] smtp? ( net-libs/libesm
 REQUIRED_USE=mysql? ( libdnet )
 SLOT=0
 SRC_URI=http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fccf98705a5695af1376634eecd3956b
diff --git a/metadata/md5-cache/app-admin/salt-2018.3.4 b/metadata/md5-cache/app-admin/salt-2018.3.4
index 71792aef7a5e..4ba74abfe025 100644
--- a/metadata/md5-cache/app-admin/salt-2018.3.4
+++ b/metadata/md5-cache/app-admin/salt-2018.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2018.3.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e3e423fb332e9b0c0259e96e554bccf
diff --git a/metadata/md5-cache/app-admin/salt-2019.2.0-r1 b/metadata/md5-cache/app-admin/salt-2019.2.0-r1
index 5fb99928c1ac..d88a8fb61d59 100644
--- a/metadata/md5-cache/app-admin/salt-2019.2.0-r1
+++ b/metadata/md5-cache/app-admin/salt-2019.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2019.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1d1a3bd7112253dc98a69b80aff5cdd9
diff --git a/metadata/md5-cache/app-admin/salt-2019.2.2 b/metadata/md5-cache/app-admin/salt-2019.2.2
index 54acc110ec68..553168ce9112 100644
--- a/metadata/md5-cache/app-admin/salt-2019.2.2
+++ b/metadata/md5-cache/app-admin/salt-2019.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( raet zeromq ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test ) x86? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/salt/salt-2019.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bff03fcf7f99263021f8ec2989e1370a
diff --git a/metadata/md5-cache/app-admin/serf-0.8.1-r1 b/metadata/md5-cache/app-admin/serf-0.8.1-r1
index 67de904769c2..3c03f8764f84 100644
--- a/metadata/md5-cache/app-admin/serf-0.8.1-r1
+++ b/metadata/md5-cache/app-admin/serf-0.8.1-r1
@@ -8,5 +8,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/serf/archive/v0.8.1.tar.gz -> serf-0.8.1.tar.gz https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c437d68a75b1add11d9a3bd0b68fcdf0
diff --git a/metadata/md5-cache/app-admin/setools-4.2.1 b/metadata/md5-cache/app-admin/setools-4.2.1
index 7cb671e9ce44..b3c9e9ba596b 100644
--- a/metadata/md5-cache/app-admin/setools-4.2.1
+++ b/metadata/md5-cache/app-admin/setools-4.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/archive/4.2.1.tar.gz -> setools-4.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17d1ce443e2f8e2f6a9d0b1aad4f256c
diff --git a/metadata/md5-cache/app-admin/setools-4.2.2 b/metadata/md5-cache/app-admin/setools-4.2.2
index 94226529a449..f7a028cb46e0 100644
--- a/metadata/md5-cache/app-admin/setools-4.2.2
+++ b/metadata/md5-cache/app-admin/setools-4.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.2.2/setools-4.2.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d8400dc3a83612885526c1bc7f3aa02
diff --git a/metadata/md5-cache/app-admin/setools-9999 b/metadata/md5-cache/app-admin/setools-9999
index e87c9becfe9f..c6ee6a54af61 100644
--- a/metadata/md5-cache/app-admin/setools-9999
+++ b/metadata/md5-cache/app-admin/setools-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d29ae4067e2d6cd076ba68415fde147
diff --git a/metadata/md5-cache/app-admin/supernova-2.2.0 b/metadata/md5-cache/app-admin/supernova-2.2.0
index f11d895aa2dd..669838d5bb61 100644
--- a/metadata/md5-cache/app-admin/supernova-2.2.0
+++ b/metadata/md5-cache/app-admin/supernova-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supernova/supernova-2.2.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64a07fd7ea230a9edecf49c9d06404f3
diff --git a/metadata/md5-cache/app-admin/supervisor-3.1.4 b/metadata/md5-cache/app-admin/supervisor-3.1.4
index 8be45ed3de21..e3a555ef9968 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.1.4
+++ b/metadata/md5-cache/app-admin/supervisor-3.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35dd94f879a06c12933f6f3ebff8d679
diff --git a/metadata/md5-cache/app-admin/supervisor-3.3.5 b/metadata/md5-cache/app-admin/supervisor-3.3.5
index e84c6e095f1b..6a62525af200 100644
--- a/metadata/md5-cache/app-admin/supervisor-3.3.5
+++ b/metadata/md5-cache/app-admin/supervisor-3.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-3.3.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b2ec38658e46eb0f3faa0aa72d538411
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.3 b/metadata/md5-cache/app-admin/supervisor-4.0.3
index 92fd36883fae..eac97fde09af 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.0.3
+++ b/metadata/md5-cache/app-admin/supervisor-4.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f1316db54079b2b269aeca42082e2fa8
diff --git a/metadata/md5-cache/app-admin/supervisor-4.0.4 b/metadata/md5-cache/app-admin/supervisor-4.0.4
index 3327e4084a28..14da5df1e692 100644
--- a/metadata/md5-cache/app-admin/supervisor-4.0.4
+++ b/metadata/md5-cache/app-admin/supervisor-4.0.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] ) test? ( >=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/meld3-1.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare test
 DESCRIPTION=A system for controlling process state under UNIX
 EAPI=7
 HOMEPAGE=http://supervisord.org/ https://pypi.org/project/supervisor/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=repoze ZPL BSD HPND GPL-2
-RDEPEND=>=dev-python/meld3-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/meld3-1.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/supervisor/supervisor-4.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=52b405a50c5b6a470148a14e8c46293a
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=31af9c3425f7f79aa44aeee130a6b756
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.22.1 b/metadata/md5-cache/app-admin/syslog-ng-3.22.1
index 2c5acde79d33..71eef6dd4a7c 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.22.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.22.1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
-IUSE=amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd 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
+IUSE=amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.22.1/syslog-ng-3.22.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9e1f928853bae9a33356ca59cbe3ff5a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6dfd57bd96e7132d4b0024c7896e3e7e
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.24.1 b/metadata/md5-cache/app-admin/syslog-ng-3.24.1
index d7ae6ef8d7d1..fdd0d8fb2e9b 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.24.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.24.1
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
-IUSE=amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.24.1/syslog-ng-3.24.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c405d43085e29ca3f11f46a728ca6a25
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b99a065db4ad238c29b91eb61b3bddf8
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.25.1 b/metadata/md5-cache/app-admin/syslog-ng-3.25.1
index 1acec12a57f3..5de4978f7a54 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.25.1
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.25.1
@@ -4,13 +4,13 @@ DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:
 DESCRIPTION=syslog replacement with advanced filtering features
 EAPI=7
 HOMEPAGE=https://syslog-ng.com/open-source-log-management
-IUSE=amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.4 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip2? ( dev-libs/libmaxminddb:= ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) kafka? ( >=dev-libs/librdkafka-1.0.0:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.25.1/syslog-ng-3.25.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=daeb33477e64a4a5008e73328b4f2ad2
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r1 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
index 2313d62ed4af..0b666590ae91 100644
--- a/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=Summarizes the contents of a syslog log file
 EAPI=5
 HOMEPAGE=https://github.com/dpaleino/syslog-summary
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/downloads/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fc1a905a1640918c300a7d10704cf15
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r2 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r2
index c71347c42fd1..40e36b23dbe5 100644
--- a/metadata/md5-cache/app-admin/syslog-summary-1.14-r2
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r2
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst prepare setup
 DESCRIPTION=Summarizes the contents of a syslog log file
 EAPI=6
 HOMEPAGE=https://github.com/dpaleino/syslog-summary
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/downloads/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d1583550459c8f64089a28f392f38f41
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r3 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r3
index 1439d5cae033..29ab4244d1b9 100644
--- a/metadata/md5-cache/app-admin/syslog-summary-1.14-r3
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r3
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst prepare setup
 DESCRIPTION=Summarizes the contents of a syslog log file
 EAPI=7
 HOMEPAGE=https://github.com/dpaleino/syslog-summary
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/downloads/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=332da368e1990a9ff19abc3a019d77fc
diff --git a/metadata/md5-cache/app-admin/sysstat-12.0.5 b/metadata/md5-cache/app-admin/sysstat-12.0.5
deleted file mode 100644
index 0c1fc21329ad..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-12.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( sys-devel/gettext )
-DESCRIPTION=System performance tools for Linux
-EAPI=7
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm-sensors selinux static
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=https://github.com/sysstat/sysstat/archive/v12.0.5.tar.gz -> sysstat-12.0.5.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5c0c69efe5ef4b9428c6ca2110521141
diff --git a/metadata/md5-cache/app-admin/sysstat-12.2.0-r1 b/metadata/md5-cache/app-admin/sysstat-12.2.0-r1
deleted file mode 100644
index 6457b4e0dd8f..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-12.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) nls? ( sys-devel/gettext )
-DESCRIPTION=System performance tools for Linux
-EAPI=7
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm-sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm-sensors? ( sys-apps/lm-sensors:= ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=https://github.com/sysstat/sysstat/archive/v12.2.0.tar.gz -> sysstat-12.2.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ee8b3901d424c78bda7f86d08ec928d8
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2 b/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2
index b99206e5bd6f..6d15490efb2d 100644
--- a/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.5.11-r2
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/pyt
 DESCRIPTION=Graphical user interface for CUPS administration
 EAPI=6
 HOMEPAGE=https://github.com/zdohnal/system-config-printer
-IUSE=doc gnome-keyring policykit python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc gnome-keyring policykit python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycups[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycups[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/urllib3[python_targets_python3_7(-)] ) gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zdohnal/system-config-printer/releases/download/1.5.11/system-config-printer-1.5.11.tar.xz https://dev.gentoo.org/~asturm/distfiles/system-config-printer-1.5.11-patchset-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dbe62986d21f387e3e09b2e90395f79
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=567b5efb0aac227f8b97ed12a917cf92
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.12 b/metadata/md5-cache/app-admin/system-config-printer-1.5.12
deleted file mode 100644
index 9a485470efc1..000000000000
--- a/metadata/md5-cache/app-admin/system-config-printer-1.5.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-perl/XML-Parser dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-python/epydoc ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Graphical user interface for CUPS administration
-EAPI=6
-HOMEPAGE=https://github.com/OpenPrinting/system-config-printer
-IUSE=doc gnome-keyring policykit python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenPrinting/system-config-printer/releases/download/1.5.12/system-config-printer-1.5.12.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2fa5bfcfb67b8dcba349eb373fd738b6
diff --git a/metadata/md5-cache/app-admin/system-config-printer-1.5.12-r1 b/metadata/md5-cache/app-admin/system-config-printer-1.5.12-r1
new file mode 100644
index 000000000000..2de6ec537d9e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/system-config-printer-1.5.12-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] app-text/docbook-xml-dtd:4.1.2 >=app-text/xmlto-0.0.22 dev-perl/XML-Parser dev-util/desktop-file-utils dev-util/intltool sys-devel/gettext virtual/pkgconfig doc? ( dev-python/epydoc ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Graphical user interface for CUPS administration
+EAPI=6
+HOMEPAGE=https://github.com/OpenPrinting/system-config-printer
+IUSE=doc gnome-keyring policykit python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/glib:2 net-print/cups[dbus] virtual/libusb:1 >=virtual/udev-172 x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycups[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycups[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/urllib3[python_targets_python3_7(-)] ) gnome-keyring? ( app-crypt/libsecret[introspection] ) policykit? ( net-print/cups-pk-helper )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/OpenPrinting/system-config-printer/releases/download/1.5.12/system-config-printer-1.5.12.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae40068764455aded54248f750d48d9e
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 45ef85ef3e0d..4761925fd4ae 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a482c0497bce3c0ffb29b24996a2352c
diff --git a/metadata/md5-cache/app-admin/tenshi-0.17 b/metadata/md5-cache/app-admin/tenshi-0.17
index 7a01696f9b62..40a04ed212ce 100644
--- a/metadata/md5-cache/app-admin/tenshi-0.17
+++ b/metadata/md5-cache/app-admin/tenshi-0.17
@@ -7,5 +7,5 @@ LICENSE=ISC
 RDEPEND=dev-lang/perl dev-perl/IO-BufferedSelect sys-apps/coreutils
 SLOT=0
 SRC_URI=https://github.com/inversepath/tenshi/archive/0.17.tar.gz -> tenshi-0.17.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0a683653962683fe9310fcfec6553b6d
diff --git a/metadata/md5-cache/app-admin/ulogd-2.0.7-r1 b/metadata/md5-cache/app-admin/ulogd-2.0.7-r1
index a86fc3f55c2c..f4e0b667b528 100644
--- a/metadata/md5-cache/app-admin/ulogd-2.0.7-r1
+++ b/metadata/md5-cache/app-admin/ulogd-2.0.7-r1
@@ -9,5 +9,5 @@ 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	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 c6ed90dfc071..2e14ea5742d3 100644
--- a/metadata/md5-cache/app-admin/usbview-2.0
+++ b/metadata/md5-cache/app-admin/usbview-2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Display the topology of devices on the USB bus
 EAPI=5
 HOMEPAGE=http://www.kroah.com/linux-usb/
 IUSE=kernel_linux
-KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6070432b4eff632126a7f0f2c521bc77
+_md5_=6101b91dfcd107c88c26c08b4d89ecf4
diff --git a/metadata/md5-cache/app-admin/vault-1.2.3 b/metadata/md5-cache/app-admin/vault-1.2.3
index fbfd2adccf47..523224cd6140 100644
--- a/metadata/md5-cache/app-admin/vault-1.2.3
+++ b/metadata/md5-cache/app-admin/vault-1.2.3
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v1.2.3.tar.gz -> vault-1.2.3.tar.gz webui? ( mirror://gentoo/vault-1.2.3-webui.tar.xz https://dev.gentoo.org/~zmedico/dist/vault-1.2.3-webui.tar.xz )
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=52dcd89f249097892303e2d1f11530ef
diff --git a/metadata/md5-cache/app-admin/vault-1.2.4 b/metadata/md5-cache/app-admin/vault-1.2.4
index 8ca1061f49e6..817be97820c2 100644
--- a/metadata/md5-cache/app-admin/vault-1.2.4
+++ b/metadata/md5-cache/app-admin/vault-1.2.4
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v1.2.4.tar.gz -> vault-1.2.4.tar.gz webui? ( mirror://gentoo/vault-1.2.4-webui.tar.xz https://dev.gentoo.org/~zmedico/dist/vault-1.2.4-webui.tar.xz )
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=52dcd89f249097892303e2d1f11530ef
diff --git a/metadata/md5-cache/app-admin/vault-1.3.0 b/metadata/md5-cache/app-admin/vault-1.3.0
index 8e3198b5c7c9..0ab467b8d621 100644
--- a/metadata/md5-cache/app-admin/vault-1.3.0
+++ b/metadata/md5-cache/app-admin/vault-1.3.0
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hashicorp/vault/archive/v1.3.0.tar.gz -> vault-1.3.0.tar.gz webui? ( mirror://gentoo/vault-1.3.0-webui.tar.xz https://dev.gentoo.org/~zmedico/dist/vault-1.3.0-webui.tar.xz )
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=52dcd89f249097892303e2d1f11530ef
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 b43f92233eb5..42f7d7311d41 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dae9868050e15bebec5abd6b2d04e445
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 bc7baf00d90f..c7250b28cf66 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_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.53.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4bc664b693ab184c746ad166cd44b36
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 a875b8db09aa..9082d07dc17e 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_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=beda35ab9d1e033d7198abe5c465db80
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 89447d9fd34f..cd365c861e88 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_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~twitch153/webapp-config/webapp-config-1.55.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f3252549f643c9eacb935c09ffdf87d
diff --git a/metadata/md5-cache/app-admin/webapp-config-9999 b/metadata/md5-cache/app-admin/webapp-config-9999
index 8593cc4db8ce..47699d0ffd8b 100644
--- a/metadata/md5-cache/app-admin/webapp-config-9999
+++ b/metadata/md5-cache/app-admin/webapp-config-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=portage? ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91290fc9feb3ea844d46282ca098be57
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index 2645c823e1d5..ad8aa416de53 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.101.2-r1 b/metadata/md5-cache/app-antivirus/clamav-0.101.2-r1
index 8f76e4888142..88bd2dd94425 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.101.2-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.101.2-r1
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.101.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebfd5092ace963ed5655a657770766db
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.101.4 b/metadata/md5-cache/app-antivirus/clamav-0.101.4
index d4eab606d078..51bff82a4584 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.101.4
+++ b/metadata/md5-cache/app-antivirus/clamav-0.101.4
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) iconv? ( virt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.101.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ebfd5092ace963ed5655a657770766db
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.102.1-r3 b/metadata/md5-cache/app-antivirus/clamav-0.102.1-r3
index 52522ee71345..fc683266d726 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.102.1-r3
+++ b/metadata/md5-cache/app-antivirus/clamav-0.102.1-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=6
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=acct-group/clamav acct-user/clamav 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= ) dev-libs/libltdl || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) elibc_musl? ( sys-libs/fts-standalone ) !libclamav-only? ( net-misc/curl ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) !!<app-antivirus/clamav-0.99 selinux? ( sec-policy/selinux-clamav )
 REQUIRED_USE=libclamav-only? ( !clamsubmit ) clamsubmit? ( !libclamav-only )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.clamav.net/downloads/production/clamav-0.102.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4aa942d74b94f8264ae6863d92d5261b
+_md5_=59df0ad4ca2e11c46bed270d5ca856e0
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.102.2 b/metadata/md5-cache/app-antivirus/clamav-0.102.2
new file mode 100644
index 000000000000..db88f99bd4c4
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamav-0.102.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/clamav acct-user/clamav 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= ) dev-libs/libltdl || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) elibc_musl? ( sys-libs/fts-standalone ) !libclamav-only? ( net-misc/curl ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=acct-group/clamav acct-user/clamav 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= ) dev-libs/libltdl || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/libmspack xml? ( dev-libs/libxml2 ) elibc_musl? ( sys-libs/fts-standalone ) !libclamav-only? ( net-misc/curl ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) selinux? ( sec-policy/selinux-clamav )
+REQUIRED_USE=libclamav-only? ( !clamsubmit ) clamsubmit? ( !libclamav-only )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.102.2.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a305afdf9e2d01a532228304655605f2
diff --git a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2 b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
index 0d37f7835633..828b7be66dfc 100644
--- a/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
+++ b/metadata/md5-cache/app-antivirus/clamav-unofficial-sigs-5.6.2
@@ -7,5 +7,5 @@ LICENSE=BSD
 RDEPEND=app-crypt/gnupg dev-lang/perl net-dns/bind-tools || ( net-misc/wget net-misc/curl )
 SLOT=0
 SRC_URI=https://github.com/extremeshok/clamav-unofficial-sigs/archive/5.6.2.tar.gz -> clamav-unofficial-sigs-5.6.2.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=dac90635d7671743d0fbd45283cbb557
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f20aed0ada7e670657d5eb7170f13295
diff --git a/metadata/md5-cache/app-antivirus/clamtk-6.02 b/metadata/md5-cache/app-antivirus/clamtk-6.02
deleted file mode 100644
index c25e467e0f6f..000000000000
--- a/metadata/md5-cache/app-antivirus/clamtk-6.02
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=install postinst postrm setup unpack
-DESCRIPTION=A graphical front-end for ClamAV
-EAPI=7
-HOMEPAGE=https://gitlab.com/dave_m/clamtk/wikis/Home
-IUSE=kde nautilus nemo +nls thunar +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece x11-themes/faenza-icon-theme nautilus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/nautilus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.02.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.03.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	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5f060d9e4eabedd038a236ec526e95c
diff --git a/metadata/md5-cache/app-antivirus/clamtk-6.02-r1 b/metadata/md5-cache/app-antivirus/clamtk-6.02-r1
new file mode 100644
index 000000000000..d7b9a47ec9e6
--- /dev/null
+++ b/metadata/md5-cache/app-antivirus/clamtk-6.02-r1
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=install postinst postrm setup unpack
+DESCRIPTION=A graphical front-end for ClamAV
+EAPI=7
+HOMEPAGE=https://gitlab.com/dave_m/clamtk/wikis/Home
+IUSE=kde nautilus nemo +nls thunar +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=app-antivirus/clamav dev-perl/File-chdir dev-perl/Gtk3 dev-perl/JSON dev-perl/LWP-Protocol-https dev-perl/LWP-UserAgent-Cached dev-perl/Locale-gettext dev-perl/Text-CSV dev-perl/glib-perl dev-perl/libwww-perl virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 virtual/perl-Time-Piece x11-themes/faenza-icon-theme nautilus? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/nautilus-python[python_single_target_python2_7(-)?] )
+REQUIRED_USE=nautilus? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.02.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.03.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	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=50939919508b7c648ff0c122bdd7a982
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 0c7deb818294..958b630a35da 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.16.0 b/metadata/md5-cache/app-arch/bloscpack-0.16.0
index c93ad7413336..c1fca3c472a3 100644
--- a/metadata/md5-cache/app-arch/bloscpack-0.16.0
+++ b/metadata/md5-cache/app-arch/bloscpack-0.16.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blosc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/blosc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/blosc[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/deprecated[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Command line interface for Blosc compression
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.16.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=603814f20002484377ef0cc7a2487e03
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 59d4fbb6dd5b..c49f06e8de03 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.6-r1
+++ b/metadata/md5-cache/app-arch/brotli-1.0.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 py
 RESTRICT=!test? ( test )
 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	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76ed666d851d94849a5ec63b52b19202
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.7 b/metadata/md5-cache/app-arch/brotli-1.0.7
index 8ae7f7d4ed43..da6b436ad16a 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.7
+++ b/metadata/md5-cache/app-arch/brotli-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 py
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.7.tar.gz -> brotli-1.0.7.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=464a2428ac81213732faf654dc648a87
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index aa3dbc9ff190..fc9203f39991 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -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_6 python_targets_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b7f208f2028bf5f1b82d894039a3110
diff --git a/metadata/md5-cache/app-arch/cfv-1.18.3-r1 b/metadata/md5-cache/app-arch/cfv-1.18.3-r1
index 59e5320542b9..8e19e656425f 100644
--- a/metadata/md5-cache/app-arch/cfv-1.18.3-r1
+++ b/metadata/md5-cache/app-arch/cfv-1.18.3-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install setup
 DESCRIPTION=Utility to test and create .sfv, .csv, .crc and md5sum files
 EAPI=5
 HOMEPAGE=http://cfv.sourceforge.net/
-IUSE=bittorrent +python_targets_python2_7 +python_single_target_python2_7
+IUSE=bittorrent +python_single_target_python2_7
 KEYWORDS=amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/python-fchksum[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] bittorrent? ( net-p2p/bittornado[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/python-fchksum[python_targets_python2_7(-)] bittorrent? ( net-p2p/bittornado[python_targets_python2_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cfv/cfv-1.18.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3b90f04d236b0f7ae07cdff98baa4881
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2449d45a6029fc4e0fe4e273b9b8a3b8
diff --git a/metadata/md5-cache/app-arch/deb2targz-1-r2 b/metadata/md5-cache/app-arch/deb2targz-1-r2
deleted file mode 100644
index c9c14b10a082..000000000000
--- a/metadata/md5-cache/app-arch/deb2targz-1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Convert a .deb file to a .tar.gz archive
-EAPI=4
-HOMEPAGE=http://www.miketaylor.org.uk/tech/deb/
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://www.miketaylor.org.uk/tech/deb/deb2targz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11e3ae92d4c35e72045029aa74ba7a63
diff --git a/metadata/md5-cache/app-arch/deltarpm-3.6 b/metadata/md5-cache/app-arch/deltarpm-3.6
index 88fa6cdb4362..5f26310cbab6 100644
--- a/metadata/md5-cache/app-arch/deltarpm-3.6
+++ b/metadata/md5-cache/app-arch/deltarpm-3.6
@@ -3,12 +3,12 @@ DEPEND=sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5 python? (
 DESCRIPTION=tools to create and apply deltarpms
 EAPI=7
 HOMEPAGE=https://github.com/rpm-software-management/deltarpm
-IUSE=python system-zlib +python_targets_python2_7 +python_single_target_python2_7
+IUSE=python system-zlib +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=sys-libs/zlib app-arch/xz-utils app-arch/bzip2 <app-arch/rpm-5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://pkgs.fedoraproject.org/repo/pkgs/deltarpm/deltarpm-3.6.tar.bz2/2cc2690bd1088cfc3238c25e59aaaec1/deltarpm-3.6.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=42e1add74a158bf23594bf0fe0533094
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 8304926e3324..2ece8fd94bf1 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82ee837107ff570b035db3abff03553f
diff --git a/metadata/md5-cache/app-arch/lzma-9.20-r1 b/metadata/md5-cache/app-arch/lzma-9.20-r1
index aaaeb92b7e94..b6d2d3ec363e 100644
--- a/metadata/md5-cache/app-arch/lzma-9.20-r1
+++ b/metadata/md5-cache/app-arch/lzma-9.20-r1
@@ -3,9 +3,9 @@ DESCRIPTION=LZMA Stream Compressor from the SDK
 EAPI=6
 HOMEPAGE=https://www.7-zip.org/sdk.html
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=mirror://sourceforge/sevenzip/lzma920.tar.bz2 -> lzma-9.20.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d81e1dbfb0317ae60c06aa7c8ee0fffb
+_md5_=b02392c35f12158583b706845cbf2a50
diff --git a/metadata/md5-cache/app-arch/patool-1.12 b/metadata/md5-cache/app-arch/patool-1.12
index 70dee50b1b37..7d9ae12b026a 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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patool/patool-1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2dad42ecdfb68b449a06c546559e0699
diff --git a/metadata/md5-cache/app-arch/rpm-4.14.1 b/metadata/md5-cache/app-arch/rpm-4.14.1
index db82c3787a6b..9206fd6d2239 100644
--- a/metadata/md5-cache/app-arch/rpm-4.14.1
+++ b/metadata/md5-cache/app-arch/rpm-4.14.1
@@ -3,13 +3,13 @@ DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.
 DESCRIPTION=Red Hat Package Management Utils
 EAPI=6
 HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-IUSE=acl caps doc lua nls python selinux test python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=acl caps doc lua nls python selinux test python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.1.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b74e408f2080d2e08d02578632b905b9
diff --git a/metadata/md5-cache/app-arch/rpm-4.14.1-r1 b/metadata/md5-cache/app-arch/rpm-4.14.1-r1
index ff5978888a5c..f277d19c2253 100644
--- a/metadata/md5-cache/app-arch/rpm-4.14.1-r1
+++ b/metadata/md5-cache/app-arch/rpm-4.14.1-r1
@@ -3,13 +3,13 @@ DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.
 DESCRIPTION=Red Hat Package Management Utils
 EAPI=6
 HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-IUSE=acl caps doc lua nls python selinux test zstd python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=acl caps doc lua nls python selinux test zstd python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.1.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1b0105edfe5c36f12250b7fccfad0988
diff --git a/metadata/md5-cache/app-arch/rpm-4.14.2.1 b/metadata/md5-cache/app-arch/rpm-4.14.2.1
index 0ff9aaedbfb2..ce4d16a16fbe 100644
--- a/metadata/md5-cache/app-arch/rpm-4.14.2.1
+++ b/metadata/md5-cache/app-arch/rpm-4.14.2.1
@@ -3,13 +3,13 @@ DEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.
 DESCRIPTION=Red Hat Package Management Utils
 EAPI=6
 HOMEPAGE=https://rpm.org https://github.com/rpm-software-management/rpm
-IUSE=acl caps doc dbus lua nls python selinux test zstd 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
+IUSE=acl caps doc dbus lua nls python selinux test zstd python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2
 RDEPEND=!app-arch/rpm5 app-arch/libarchive >=sys-libs/db-4.5:* >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dbus? ( sys-apps/dbus ) dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0:*[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-rpm ) dev-lang/perl:=
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.2.1.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=970600e0fe715f2098620b76c577af37
diff --git a/metadata/md5-cache/app-arch/tar-1.32 b/metadata/md5-cache/app-arch/tar-1.32
index 6c9a459102a0..98f1e69a13b6 100644
--- a/metadata/md5-cache/app-arch/tar-1.32
+++ b/metadata/md5-cache/app-arch/tar-1.32
@@ -10,4 +10,4 @@ RDEPEND=!static? ( acl? ( virtual/acl ) ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.32.tar.bz2 mirror://gnu-alpha/tar/tar-1.32.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a432a60e3f402d9cb3501db5acf20c6
+_md5_=9e3285101be44127e2f53ab25467803c
diff --git a/metadata/md5-cache/app-arch/tardelta-1.0.1 b/metadata/md5-cache/app-arch/tardelta-1.0.1
index e0fd23c3c556..77b5ccd97a74 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39977c3464cc742f21350749ba4bd940
diff --git a/metadata/md5-cache/app-arch/unrpa-1.4.1 b/metadata/md5-cache/app-arch/unrpa-1.4.1
index 4e87aa3d4e1a..94a498510053 100644
--- a/metadata/md5-cache/app-arch/unrpa-1.4.1
+++ b/metadata/md5-cache/app-arch/unrpa-1.4.1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Ren'Py's RPA data file extractor
 EAPI=5
 HOMEPAGE=https://github.com/Lattyware/unrpa
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Lattyware/unrpa/archive/1.4.1.tar.gz -> unrpa-1.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2688f6e4ba98cf207db16ff07ae5f479
diff --git a/metadata/md5-cache/app-arch/unrpa-1.4.2 b/metadata/md5-cache/app-arch/unrpa-1.4.2
index 9e22be3f91cc..00561da24233 100644
--- a/metadata/md5-cache/app-arch/unrpa-1.4.2
+++ b/metadata/md5-cache/app-arch/unrpa-1.4.2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Ren'Py's RPA data file extractor
 EAPI=6
 HOMEPAGE=https://github.com/Lattyware/unrpa
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Lattyware/unrpa/archive/1.4.2.tar.gz -> unrpa-1.4.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=61517e3767606a2a2f8ae1e96ea393bc
diff --git a/metadata/md5-cache/app-arch/unrpa-9999 b/metadata/md5-cache/app-arch/unrpa-9999
index 7596d074bef6..e150a332b624 100644
--- a/metadata/md5-cache/app-arch/unrpa-9999
+++ b/metadata/md5-cache/app-arch/unrpa-9999
@@ -3,11 +3,11 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Ren'Py's RPA data file extractor
 EAPI=6
 HOMEPAGE=https://github.com/Lattyware/unrpa
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=61517e3767606a2a2f8ae1e96ea393bc
diff --git a/metadata/md5-cache/app-arch/unzip-6.0_p25 b/metadata/md5-cache/app-arch/unzip-6.0_p25
index 668192b7ea36..ffe91414818b 100644
--- a/metadata/md5-cache/app-arch/unzip-6.0_p25
+++ b/metadata/md5-cache/app-arch/unzip-6.0_p25
@@ -4,10 +4,10 @@ DESCRIPTION=unzipper for pkzip-compressed files
 EAPI=7
 HOMEPAGE=http://www.info-zip.org/
 IUSE=bzip2 natspec unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux
 LICENSE=Info-ZIP
 RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
 SLOT=0
 SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz mirror://debian/pool/main/u/unzip/unzip_6.0-25.debian.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2fdf32800af8b752621321c8c1b9cbce
+_md5_=daddb3ec2fdfac3e13d6d1c165da9e6e
diff --git a/metadata/md5-cache/app-arch/vimball-0.5.1 b/metadata/md5-cache/app-arch/vimball-0.5.1
index 1dbc0ac1151e..65a2b3a8b954 100644
--- a/metadata/md5-cache/app-arch/vimball-0.5.1
+++ b/metadata/md5-cache/app-arch/vimball-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vimball/vimball-0.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=204417b7a10ff98942c3538e0b717277
diff --git a/metadata/md5-cache/app-arch/vimball-9999 b/metadata/md5-cache/app-arch/vimball-9999
index c3476be58e41..a44b0526e06a 100644
--- a/metadata/md5-cache/app-arch/vimball-9999
+++ b/metadata/md5-cache/app-arch/vimball-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=204417b7a10ff98942c3538e0b717277
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index f757d4c28297..c6c982bf9d1b 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/amanda-3.3.9 b/metadata/md5-cache/app-backup/amanda-3.3.9
index 9fcbe0c6cadb..b37d40b72d89 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.9
+++ b/metadata/md5-cache/app-backup/amanda-3.3.9
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.9.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b65fac9693829ba8716af35775bf80de
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.1 b/metadata/md5-cache/app-backup/amanda-3.4.1
index 67e1a718102e..ee4bbe9b2597 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.1
+++ b/metadata/md5-cache/app-backup/amanda-3.4.1
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.4.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b584997545ad4986d2cbef760d14a0ea
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.2 b/metadata/md5-cache/app-backup/amanda-3.4.2
index c934b0d6b3e3..6c4334bb9d08 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.2
+++ b/metadata/md5-cache/app-backup/amanda-3.4.2
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.4.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fade4d83380cd729b3219ec395b97ad9
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.3 b/metadata/md5-cache/app-backup/amanda-3.4.3
index 542e30e0f967..0ec241b5edff 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.3
+++ b/metadata/md5-cache/app-backup/amanda-3.4.3
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.4.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fade4d83380cd729b3219ec395b97ad9
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.4 b/metadata/md5-cache/app-backup/amanda-3.4.4
index 7151d46f0333..ab37cc4017bb 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.4
+++ b/metadata/md5-cache/app-backup/amanda-3.4.4
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.4.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fade4d83380cd729b3219ec395b97ad9
diff --git a/metadata/md5-cache/app-backup/amanda-3.4.5 b/metadata/md5-cache/app-backup/amanda-3.4.5
index 6d6ccb0727b7..9906cf2e865f 100644
--- a/metadata/md5-cache/app-backup/amanda-3.4.5
+++ b/metadata/md5-cache/app-backup/amanda-3.4.5
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.4.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fade4d83380cd729b3219ec395b97ad9
diff --git a/metadata/md5-cache/app-backup/amanda-3.5-r1 b/metadata/md5-cache/app-backup/amanda-3.5-r1
index e312f4b6e72f..3c78fb680bba 100644
--- a/metadata/md5-cache/app-backup/amanda-3.5-r1
+++ b/metadata/md5-cache/app-backup/amanda-3.5-r1
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a27d9fc5ef1307e28f4a4917c21df8f4
diff --git a/metadata/md5-cache/app-backup/amanda-3.5.1-r1 b/metadata/md5-cache/app-backup/amanda-3.5.1-r1
index 070afef29e41..2c1b1ddb7cbd 100644
--- a/metadata/md5-cache/app-backup/amanda-3.5.1-r1
+++ b/metadata/md5-cache/app-backup/amanda-3.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
 RDEPEND=sys-libs/readline:= virtual/awk app-arch/tar dev-lang/perl:= app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 dev-perl/JSON dev-perl/Encode-Locale nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba:= ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st:= sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.5.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1d25e99498136e41876b5bebd3807c3e
diff --git a/metadata/md5-cache/app-backup/attic-0.16-r1 b/metadata/md5-cache/app-backup/attic-0.16-r1
index bb617a6ad005..c5a5b9afc86f 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_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8865603ff2c2a299a52ba363a0441bfb
diff --git a/metadata/md5-cache/app-backup/attic-9999 b/metadata/md5-cache/app-backup/attic-9999
index 33c929a33afc..bbab5ae40331 100644
--- a/metadata/md5-cache/app-backup/attic-9999
+++ b/metadata/md5-cache/app-backup/attic-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/msgpack[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-python/llfuse[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8865603ff2c2a299a52ba363a0441bfb
diff --git a/metadata/md5-cache/app-backup/backintime-1.2.1 b/metadata/md5-cache/app-backup/backintime-1.2.1
index 32480aa93c94..7960d6fc3ad7 100644
--- a/metadata/md5-cache/app-backup/backintime-1.2.1
+++ b/metadata/md5-cache/app-backup/backintime-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/keyring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/openssh net-misc/rsync[xattr,acl] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/keyring[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/keyring[python_targets_python3_7(-)] ) net-misc/openssh net-misc/rsync[xattr,acl] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Backup system inspired by TimeVault and FlyBack
 EAPI=7
 HOMEPAGE=https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/
-IUSE=examples qt5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=examples qt5 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/keyring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5[gui,widgets] )
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/keyring[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/keyring[python_targets_python3_7(-)] ) net-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5[gui,widgets] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/bit-team/backintime/releases/download/v1.2.1/backintime-1.2.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5660257fe9d628c6c12e6bbd18425fb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ee3458ba18debf35d9a3e41949e6240c
diff --git a/metadata/md5-cache/app-backup/backintime-9999 b/metadata/md5-cache/app-backup/backintime-9999
index a06309b72b92..076a65d41217 100644
--- a/metadata/md5-cache/app-backup/backintime-9999
+++ b/metadata/md5-cache/app-backup/backintime-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/keyring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/openssh net-misc/rsync[xattr,acl] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/keyring[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/keyring[python_targets_python3_7(-)] ) net-misc/openssh net-misc/rsync[xattr,acl] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Backup system inspired by TimeVault and FlyBack
 EAPI=7
 HOMEPAGE=https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/
-IUSE=examples qt5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=examples qt5 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/keyring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5[gui,widgets] )
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/keyring[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/keyring[python_targets_python3_7(-)] ) net-misc/openssh net-misc/rsync[xattr,acl] qt5? ( dev-python/PyQt5[gui,widgets] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2ccbe1b60906613e543f69a6844a97a
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=db31795bb8349b6f0f4bee102f3815eb
diff --git a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5 b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
index fc3736d37094..b6cc62699304 100644
--- a/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
+++ b/metadata/md5-cache/app-backup/backuppc-3.3.1-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl app-admin/apache-tools app-admin/makepasswd virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/CGI dev-perl/libwww-perl app-arch/tar app-arch/par2cmdline app-arch/gzip app-arch/bzip2 virtual/mta >=www-apache/mod_perl-2.0.9 www-apache/mpm_itk || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_authn_core,apache2_modules_authz_core,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_fcgid] ) net-misc/rsync dev-perl/File-RsyncP rss? ( dev-perl/XML-RSS ) samba? ( net-fs/samba ) =www-servers/apache-2.4*
 SLOT=0
 SRC_URI=mirror://sourceforge/backuppc/BackupPC-3.3.1.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8f94c6786f934899e2da3a3a53d97fa
diff --git a/metadata/md5-cache/app-backup/bacula-9.0.8-r1 b/metadata/md5-cache/app-backup/bacula-9.0.8-r1
index 4cd15404e79f..eb0ead9e45d2 100644
--- a/metadata/md5-cache/app-backup/bacula-9.0.8-r1
+++ b/metadata/md5-cache/app-backup/bacula-9.0.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp:0 !bacula-clientonly? ( postgres? ( dev-db/postgresql:=[thr
 REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-9.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1e55956ace08d90661229fcc319a90cc
diff --git a/metadata/md5-cache/app-backup/bacula-9.2.2-r2 b/metadata/md5-cache/app-backup/bacula-9.2.2-r2
index 5f86bd0a88ff..0b65bd91b1db 100644
--- a/metadata/md5-cache/app-backup/bacula-9.2.2-r2
+++ b/metadata/md5-cache/app-backup/bacula-9.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
 REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-9.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=efe454172c1cc9fe552811ad40d581a2
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.1-r2 b/metadata/md5-cache/app-backup/bacula-9.4.1-r2
index e234b7fadc19..983b17600345 100644
--- a/metadata/md5-cache/app-backup/bacula-9.4.1-r2
+++ b/metadata/md5-cache/app-backup/bacula-9.4.1-r2
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
 REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-9.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5341698c9e3295df70b6dddbd960d685
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.2-r1 b/metadata/md5-cache/app-backup/bacula-9.4.2-r1
index cfe593c9bb47..3f3d3cbc060b 100644
--- a/metadata/md5-cache/app-backup/bacula-9.4.2-r1
+++ b/metadata/md5-cache/app-backup/bacula-9.4.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
 REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-9.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=328398c092090cac1e669d87cbb0aa3e
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.3-r1 b/metadata/md5-cache/app-backup/bacula-9.4.3-r1
index f471971301fd..e85120120af3 100644
--- a/metadata/md5-cache/app-backup/bacula-9.4.3-r1
+++ b/metadata/md5-cache/app-backup/bacula-9.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
 REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-9.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=328398c092090cac1e669d87cbb0aa3e
diff --git a/metadata/md5-cache/app-backup/bacula-9.4.4-r1 b/metadata/md5-cache/app-backup/bacula-9.4.4-r1
index cefac1ccc1ed..099b7a6d873e 100644
--- a/metadata/md5-cache/app-backup/bacula-9.4.4-r1
+++ b/metadata/md5-cache/app-backup/bacula-9.4.4-r1
@@ -10,5 +10,5 @@ RDEPEND=!bacula-clientonly? ( !bacula-nodir? ( virtual/mta ) postgres? ( dev-db/
 REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacula-clientonly )
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-9.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=328398c092090cac1e669d87cbb0aa3e
diff --git a/metadata/md5-cache/app-backup/bareos-16.2.7-r1 b/metadata/md5-cache/app-backup/bareos-16.2.7-r1
index dfd67fd64ec8..c577f460ef76 100644
--- a/metadata/md5-cache/app-backup/bareos-16.2.7-r1
+++ b/metadata/md5-cache/app-backup/bareos-16.2.7-r1
@@ -3,13 +3,13 @@ DEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph
 DESCRIPTION=Featureful client/server network backup suite
 EAPI=5
 HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp postgres python rados rados-striper readline scsi-crypto sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp postgres python rados rados-striper readline scsi-crypto sql-pooling +sqlite ssl static +storage-daemon tcpd vim-syntax +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/16.2.7.tar.gz -> bareos-16.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cde531c76e1337ab71e3b5a3a3537ebb
diff --git a/metadata/md5-cache/app-backup/bareos-17.2.6 b/metadata/md5-cache/app-backup/bareos-17.2.6
index 305aef77ad05..edcbd4183831 100644
--- a/metadata/md5-cache/app-backup/bareos-17.2.6
+++ b/metadata/md5-cache/app-backup/bareos-17.2.6
@@ -3,13 +3,13 @@ DEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph
 DESCRIPTION=Featureful client/server network backup suite
 EAPI=6
 HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.6.tar.gz -> bareos-17.2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f917c58488b59d52888ebac57a1de8f8
diff --git a/metadata/md5-cache/app-backup/bareos-17.2.7-r1 b/metadata/md5-cache/app-backup/bareos-17.2.7-r1
index e392797dbcde..025662016dd6 100644
--- a/metadata/md5-cache/app-backup/bareos-17.2.7-r1
+++ b/metadata/md5-cache/app-backup/bareos-17.2.7-r1
@@ -3,13 +3,13 @@ DEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph
 DESCRIPTION=Featureful client/server network backup suite
 EAPI=6
 HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon tcpd vim-syntax +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( dev-db/mysql-connector-c:0= ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/17.2.7.tar.gz -> bareos-17.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0bc7b49f771edd0d2dc4b07376044cd2
diff --git a/metadata/md5-cache/app-backup/bareos-18.2.6 b/metadata/md5-cache/app-backup/bareos-18.2.6
index 64727f5d9e95..888074a8e9ca 100644
--- a/metadata/md5-cache/app-backup/bareos-18.2.6
+++ b/metadata/md5-cache/app-backup/bareos-18.2.6
@@ -3,13 +3,13 @@ DEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph
 DESCRIPTION=Featureful client/server network backup suite
 EAPI=6
 HOMEPAGE=http://www.bareos.org/
-IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=X acl cephfs clientonly +director fastlz glusterfs gnutls ipv6 jansson lmdb libressl logwatch mysql ndmp +postgres python rados rados-striper readline scsi-crypto sql-pooling sqlite ssl static +storage-daemon systemd tcpd vim-syntax +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=AGPL-3
 RDEPEND=!app-backup/bacula cephfs? ( sys-cluster/ceph ) rados? ( sys-cluster/ceph ) rados-striper? ( >=sys-cluster/ceph-0.94.2 ) glusterfs? ( sys-cluster/glusterfs ) lmdb? ( dev-db/lmdb ) dev-libs/gmp:0 !clientonly? ( postgres? ( dev-db/postgresql:*[threads] ) mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) director? ( virtual/mta jansson? ( dev-libs/jansson ) ) ) fastlz? ( dev-libs/bareos-fastlzlib ) logwatch? ( sys-apps/logwatch ) tcpd? ( sys-apps/tcp-wrappers ) readline? ( sys-libs/readline:0 ) static? ( acl? ( virtual/acl[static-libs] ) sys-libs/zlib[static-libs] dev-libs/lzo[static-libs] sys-libs/ncurses:=[static-libs] ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) gnutls? ( net-libs/gnutls[static-libs] ) ) ) !static? ( acl? ( virtual/acl ) dev-libs/lzo ssl? ( !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gnutls? ( net-libs/gnutls ) ) sys-libs/ncurses:= sys-libs/zlib ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !clientonly? ( storage-daemon? ( sys-block/mtx app-arch/mt-st ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=static? ( clientonly ) python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/bareos/bareos/archive/Release/18.2.6.tar.gz -> bareos-18.2.6.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fefcd7ecec39df66f464ea6d4bb0fb13
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1 b/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
index 2acbc2d226d2..34278338cc01 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.10-r1
@@ -11,5 +11,5 @@ RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fdec81cf103f66a0986666c5e68db4cf
diff --git a/metadata/md5-cache/app-backup/borgbackup-9999 b/metadata/md5-cache/app-backup/borgbackup-9999
index 4cad7568c5f1..b728414a87f9 100644
--- a/metadata/md5-cache/app-backup/borgbackup-9999
+++ b/metadata/md5-cache/app-backup/borgbackup-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) 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	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4a7fc5785a88a5e37dbc9caa1fd58ef4
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 aa1734fd0372..fa45e553399a 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_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgweb/borgweb-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=173f737917ea2d4ca4d41f9c00280bd7
diff --git a/metadata/md5-cache/app-backup/borgweb-0.3.0 b/metadata/md5-cache/app-backup/borgweb-0.3.0
index 169eb1b83042..26f22544867b 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_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/borgweb/borgweb-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=173f737917ea2d4ca4d41f9c00280bd7
diff --git a/metadata/md5-cache/app-backup/btrbk-0.29.1 b/metadata/md5-cache/app-backup/btrbk-0.29.1
new file mode 100644
index 000000000000..e410448bf3e4
--- /dev/null
+++ b/metadata/md5-cache/app-backup/btrbk-0.29.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst
+DEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.7 )
+DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
+EAPI=7
+HOMEPAGE=https://digint.ch/btrbk/
+IUSE=+mbuffer +doc
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-lang/perl net-misc/openssh mbuffer? ( >=sys-block/mbuffer-20180505 ) >=sys-fs/btrfs-progs-4.12
+SLOT=0
+SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.29.1.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3a4ae6e604d14f965b31c51b64a09f95
diff --git a/metadata/md5-cache/app-backup/bup-0.29.2 b/metadata/md5-cache/app-backup/bup-0.29.2
index 51df8bfac152..9113efbefac3 100644
--- a/metadata/md5-cache/app-backup/bup-0.29.2
+++ b/metadata/md5-cache/app-backup/bup-0.29.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sys-libs/readline:0 dev-vcs/git test? ( dev-lang/perl net-misc/rsync ) doc? ( app-text/pandoc )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/par2cmdline sys-libs/readline:0 dev-vcs/git python_single_target_python2_7? ( dev-python/fuse-python[python_targets_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)] web? ( www-servers/tornado[python_targets_python2_7(-)] ) ) test? ( dev-lang/perl net-misc/rsync ) doc? ( app-text/pandoc )
 DESCRIPTION=A highly efficient backup system based on the git packfile format
 EAPI=6
 HOMEPAGE=https://bup.github.io/ https://github.com/bup/bup
-IUSE=+doc test web +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+doc test web +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/par2cmdline dev-python/fuse-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] web? ( www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sys-libs/readline:0 dev-vcs/git
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/par2cmdline sys-libs/readline:0 dev-vcs/git python_single_target_python2_7? ( dev-python/fuse-python[python_targets_python2_7(-)] dev-python/pylibacl[python_targets_python2_7(-)] dev-python/pyxattr[python_targets_python2_7(-)] web? ( www-servers/tornado[python_targets_python2_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/bup/bup/archive/0.29.2.tar.gz -> bup-0.29.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a17c333b9bad39bc4a80e7a0c8ce8fee
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d4be65f0019be5549015031f94443d58
diff --git a/metadata/md5-cache/app-backup/burp-2.2.18 b/metadata/md5-cache/app-backup/burp-2.2.18
index e52d2de58097..85d1904a6c16 100644
--- a/metadata/md5-cache/app-backup/burp-2.2.18
+++ b/metadata/md5-cache/app-backup/burp-2.2.18
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/uthash net-libs/librsync sys-libs/ncurses:0= sys-libs/zlib !lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grke/burp/archive/2.2.18.tar.gz -> burp-2.2.18.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=22ae41112f789d8d9bf15c6d6ca9a6e5
diff --git a/metadata/md5-cache/app-backup/buttersink-0.6.8 b/metadata/md5-cache/app-backup/buttersink-0.6.8
index 0eb4faf75d5b..b76b387ebeea 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9d0c161ad1f43c051dacbb7e6b927df
diff --git a/metadata/md5-cache/app-backup/buttersink-9999 b/metadata/md5-cache/app-backup/buttersink-9999
index 1d35cf76d404..eff3ca5cce85 100644
--- a/metadata/md5-cache/app-backup/buttersink-9999
+++ b/metadata/md5-cache/app-backup/buttersink-9999
@@ -10,5 +10,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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9d0c161ad1f43c051dacbb7e6b927df
diff --git a/metadata/md5-cache/app-backup/cachedir-1.4 b/metadata/md5-cache/app-backup/cachedir-1.4
index 8f92b4b51aa6..c6e60a6feece 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://git.liw.fi/cachedir/snapshot/cachedir-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bb018c7fde1c77c33194adcd32e43b5
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.10 b/metadata/md5-cache/app-backup/duplicity-0.7.10
index a596c644dc8e..094fbb9a7483 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.10
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.10/+download/duplicity-0.7.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aed624d18e819366f14cf2fa8a6d72a4
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.12 b/metadata/md5-cache/app-backup/duplicity-0.7.12
index bae0351e50cd..3311892389ae 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.12
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.12/+download/duplicity-0.7.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04671167139db67828ed20eeb3d3a8f5
diff --git a/metadata/md5-cache/app-backup/duplicity-0.7.19 b/metadata/md5-cache/app-backup/duplicity-0.7.19
index 8a9c418aa8a7..17152e7b4ea3 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.7.19
+++ b/metadata/md5-cache/app-backup/duplicity-0.7.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.7-series/0.7.19/+download/duplicity-0.7.19.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=df72271c057b5e5a96c991ba35217f2c
diff --git a/metadata/md5-cache/app-backup/duplicity-0.8.09-r1 b/metadata/md5-cache/app-backup/duplicity-0.8.09-r1
index 9b4363506525..3ee9d5268d9f 100644
--- a/metadata/md5-cache/app-backup/duplicity-0.8.09-r1
+++ b/metadata/md5-cache/app-backup/duplicity-0.8.09-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://code.launchpad.net/duplicity/0.8-series/0.8.09/+download/duplicity-0.8.09.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7ef135ac6e5142a41f1f1d3d4d0d0c51
diff --git a/metadata/md5-cache/app-backup/genbackupdata-1.9 b/metadata/md5-cache/app-backup/genbackupdata-1.9
index b623c8858c12..860741700f74 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0c5521315e7dd45912a07750ec55a43
diff --git a/metadata/md5-cache/app-backup/holland-1.0.10 b/metadata/md5-cache/app-backup/holland-1.0.10
index 416117fdd1bc..c8c9f3104a02 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 0c69d0aee265..5f235ebf381b 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 6a80e7f0778e..67442943d356 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 d7537194502c..fb353d95efe4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 86276bbd6b7c..d80e9f662791 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e6399b83cda5..c4723e4e8ab7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 90fc75a3b9b6..c7d45c03baf9 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38ee29ab792df5a754296120689ecd76
diff --git a/metadata/md5-cache/app-backup/mkstage4-0.2 b/metadata/md5-cache/app-backup/mkstage4-0.2
new file mode 100644
index 000000000000..a74ac91d88b5
--- /dev/null
+++ b/metadata/md5-cache/app-backup/mkstage4-0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Bash Utility for Creating Stage 4 Tarballs
+EAPI=7
+HOMEPAGE=https://github.com/TheChymera/mkstage4
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-arch/tar app-shells/bash
+SLOT=0
+SRC_URI=https://github.com/TheChymera/mkstage4/archive/0.2.tar.gz -> mkstage4-0.2.tar.gz
+_md5_=2092c5f8e9e9668ed7dd554de199b641
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3 b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
index ff7b63aad81c..da4cce5dab41 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
+++ b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
@@ -11,5 +11,5 @@ RDEPEND=net-libs/librsync:0= dev-python/pylibacl[python_targets_python2_7(-)?,-p
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/sol1/rdiff-backup/archive/r1.3.3.tar.gz -> rdiff-backup-1.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=29cc6cc2986729b5975591ada15e959e
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-1.4.0_beta b/metadata/md5-cache/app-backup/rdiff-backup-1.4.0_beta
index e16691db83c4..1aab29d965a6 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-1.4.0_beta
+++ b/metadata/md5-cache/app-backup/rdiff-backup-1.4.0_beta
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/librsync-1.0:0= dev-python/pylibacl[python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/rdiff-backup/rdiff-backup/releases/download/v1.4.0.beta/rdiff-backup-1.4.0b0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ab80577a6fa22ca2bdcd789fb292c787
diff --git a/metadata/md5-cache/app-backup/tsm-7.1.8.0 b/metadata/md5-cache/app-backup/tsm-7.1.8.0
index b21b1d24a6ce..4bae1b9ecf42 100644
--- a/metadata/md5-cache/app-backup/tsm-7.1.8.0
+++ b/metadata/md5-cache/app-backup/tsm-7.1.8.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v7r1/Linux/LinuxX86/BA/v718/7.1.8.0-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	rpm	b03b38188e1e83766244d2046785d562	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=441467ba4e841e50c28cf689f3b674b7
diff --git a/metadata/md5-cache/app-backup/tsm-8.1.6.0 b/metadata/md5-cache/app-backup/tsm-8.1.6.0
index e0036173610b..4fd782bd12b9 100644
--- a/metadata/md5-cache/app-backup/tsm-8.1.6.0
+++ b/metadata/md5-cache/app-backup/tsm-8.1.6.0
@@ -9,5 +9,5 @@ RDEPEND=dev-libs/expat dev-libs/libxml2 sys-fs/fuse:0 acl? ( sys-apps/acl ) java
 RESTRICT=strip
 SLOT=0
 SRC_URI=ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v816/8.1.6.0-TIV-TSMBAC-LinuxX86.tar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	rpm	b03b38188e1e83766244d2046785d562	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b256c5e7d57b100e100fae7d356bee1b
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
index f08646de8361..672f54ecc92a 100644
--- a/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10
+++ b/metadata/md5-cache/app-backup/untangle-https-backup-0.0.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/untangle-https-backup-0.0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e6c0c89c53f5dba4aa42a2736a90f35
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index d39a8d60476f..d20f4e9d1cba 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/burn-cd-1.8.0-r1 b/metadata/md5-cache/app-cdr/burn-cd-1.8.0-r1
index 91353cc1f239..f9f7bd3ca3d9 100644
--- a/metadata/md5-cache/app-cdr/burn-cd-1.8.0-r1
+++ b/metadata/md5-cache/app-cdr/burn-cd-1.8.0-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install setup
 DESCRIPTION=Smart console frontend for virtual/cdrtools and dvd+rw-tools
 EAPI=5
 HOMEPAGE=http://burn-cd.sourceforge.net
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/cdrtools app-cdr/dvd+rw-tools
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/burn-cd/burn-cd-1.8.0.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df67b8740a4ebfa50a60affdfc896087
diff --git a/metadata/md5-cache/app-cdr/cdcover-0.7.4-r1 b/metadata/md5-cache/app-cdr/cdcover-0.7.4-r1
index 07deb3d43b7d..537cd822b0cf 100644
--- a/metadata/md5-cache/app-cdr/cdcover-0.7.4-r1
+++ b/metadata/md5-cache/app-cdr/cdcover-0.7.4-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare setup
 DESCRIPTION=cdcover allows the creation of inlay-sheets for jewel cd-cases
 EAPI=5
 HOMEPAGE=http://cdcover.sourceforge.net
-IUSE=cddb +python_targets_python2_7 +python_single_target_python2_7
+IUSE=cddb +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cddb? ( dev-python/cddb-py[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) media-sound/cd-discid
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cddb? ( python_single_target_python2_7? ( dev-python/cddb-py[python_targets_python2_7(-)] ) ) media-sound/cd-discid
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cdcover/cdcover-0.7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41453aeef4160d270fa010b014ae3c49
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7aac93fca799c6e8adc6842c6cc8382f
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.3 b/metadata/md5-cache/app-cdr/cdemu-3.2.3
index 56bac93125c3..146f5ac5f75a 100644
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.3
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.3
@@ -4,12 +4,12 @@ DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 >=sys-devel/gettext-
 DESCRIPTION=Command-line tool for controlling cdemu-daemon
 EAPI=7
 HOMEPAGE=https://cdemu.sourceforge.io
-IUSE=+cdemu-daemon python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+cdemu-daemon python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/cdemu-client/cdemu-client-3.2.3.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8c617ffdefa99390bc0d48b5e62fe89
diff --git a/metadata/md5-cache/app-cdr/cdemu-3.2.4 b/metadata/md5-cache/app-cdr/cdemu-3.2.4
index 72e135100013..5a2fdf145b8b 100644
--- a/metadata/md5-cache/app-cdr/cdemu-3.2.4
+++ b/metadata/md5-cache/app-cdr/cdemu-3.2.4
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DESCRIPTION=Command-line tool for controlling cdemu-daemon
 EAPI=7
 HOMEPAGE=https://cdemu.sourceforge.io
-IUSE=+cdemu-daemon python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+cdemu-daemon python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/cdemu-client/cdemu-client-3.2.4.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=be66550f723fefe6df3279e4377720a4
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.3 b/metadata/md5-cache/app-cdr/gcdemu-3.2.3
index 05f24ab0e601..9ef135681bfb 100644
--- a/metadata/md5-cache/app-cdr/gcdemu-3.2.3
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.3
@@ -4,12 +4,12 @@ DEPEND=dev-util/desktop-file-utils >=dev-util/intltool-0.21 sys-devel/gettext vi
 DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
 EAPI=7
 HOMEPAGE=https://cdemu.sourceforge.io
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/cdemu-daemon:0/7 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/gcdemu/gcdemu-3.2.3.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73f69bf1557403e6f27305d28dc78c76
diff --git a/metadata/md5-cache/app-cdr/gcdemu-3.2.4 b/metadata/md5-cache/app-cdr/gcdemu-3.2.4
index e4e89222b223..dcd7bd53cefd 100644
--- a/metadata/md5-cache/app-cdr/gcdemu-3.2.4
+++ b/metadata/md5-cache/app-cdr/gcdemu-3.2.4
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DESCRIPTION=Gtk+ GUI for controlling cdemu-daemon
 EAPI=7
 HOMEPAGE=https://cdemu.sourceforge.io
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-cdr/cdemu-daemon:0/7 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) gnome-base/librsvg:2 x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/cdemu/gcdemu/gcdemu-3.2.4.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73083ebfe9733a3e82f8cf635e8521eb
diff --git a/metadata/md5-cache/app-cdr/gtkcdlabel-1.15 b/metadata/md5-cache/app-cdr/gtkcdlabel-1.15
index 321a4465c330..fb209d2e29e0 100644
--- a/metadata/md5-cache/app-cdr/gtkcdlabel-1.15
+++ b/metadata/md5-cache/app-cdr/gtkcdlabel-1.15
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-cdr/cdlabelgen-4 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-cdr/cdlabelgen-4 python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] )
 DESCRIPTION=A GUI for cdlabelgen that generates CD labels
 EAPI=6
 HOMEPAGE=http://gtkcdlabel.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-cdr/cdlabelgen-4 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-cdr/cdlabelgen-4 python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkcdlabel/gtkcdlabel-1.15.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0b3da740415a57869d945e5cc1e09ce2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a0cc01a1421f800d0c6d94eb034ccde6
diff --git a/metadata/md5-cache/app-cdr/sync2cd-1.3-r1 b/metadata/md5-cache/app-cdr/sync2cd-1.3-r1
index f67a2f8fec62..207e888bd819 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f83a321d1d1de9c6b6a900574d133c58
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 55e4120c706e..c4d46672cab4 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.39.0 b/metadata/md5-cache/app-crypt/acme-0.39.0
new file mode 100644
index 000000000000..baf79343b2d0
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.39.0
@@ -0,0 +1,16 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/setuptools-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-0.39.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=18bebddd3b3f68b50d8d7c9c29cd1fc3
diff --git a/metadata/md5-cache/app-crypt/acme-0.40.1 b/metadata/md5-cache/app-crypt/acme-0.40.1
new file mode 100644
index 000000000000..601ad9f021df
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-0.40.1
@@ -0,0 +1,16 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/setuptools-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=An implementation of the ACME protocol
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.40.1.tar.gz -> certbot-0.40.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=18bebddd3b3f68b50d8d7c9c29cd1fc3
diff --git a/metadata/md5-cache/app-crypt/acme-1.0.0 b/metadata/md5-cache/app-crypt/acme-1.0.0
index ccf0a8955e77..1cc580caf8ff 100644
--- a/metadata/md5-cache/app-crypt/acme-1.0.0
+++ b/metadata/md5-cache/app-crypt/acme-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.0.0.tar.gz -> certbot-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=18bebddd3b3f68b50d8d7c9c29cd1fc3
diff --git a/metadata/md5-cache/app-crypt/acme-1.1.0 b/metadata/md5-cache/app-crypt/acme-1.1.0
index 7b18be7aee79..6b30d6134a47 100644
--- a/metadata/md5-cache/app-crypt/acme-1.1.0
+++ b/metadata/md5-cache/app-crypt/acme-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.1.0.tar.gz -> certbot-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4b9900ceea87f3800a1505334194e907
diff --git a/metadata/md5-cache/app-crypt/acme-1.2.0 b/metadata/md5-cache/app-crypt/acme-1.2.0
index 5b3d44f6e090..5cc99f8d8287 100644
--- a/metadata/md5-cache/app-crypt/acme-1.2.0
+++ b/metadata/md5-cache/app-crypt/acme-1.2.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xdist[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/setuptools-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/setuptools-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=An implementation of the ACME protocol
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/idna-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/josepy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.10[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/idna-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-toolbelt-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e532f720bd74c6ea0000c5a3a641d277
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4b9900ceea87f3800a1505334194e907
diff --git a/metadata/md5-cache/app-crypt/acme-9999 b/metadata/md5-cache/app-crypt/acme-9999
index 541a84f39b77..e8080fe57b2b 100644
--- a/metadata/md5-cache/app-crypt/acme-9999
+++ b/metadata/md5-cache/app-crypt/acme-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/cryptography-1.3.4[python_targets_python3_6(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4b9900ceea87f3800a1505334194e907
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 e984252f8db3..56e4eb270c86 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_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59bb705f0377958b304bdd1c79ddb963
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-4.0.4 b/metadata/md5-cache/app-crypt/acme-tiny-4.0.4
index c462b4dbb47c..853f846c285e 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-4.0.4
+++ b/metadata/md5-cache/app-crypt/acme-tiny-4.0.4
@@ -11,5 +11,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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/diafygi/acme-tiny/archive/4.0.4.tar.gz -> acme-tiny-4.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e471ff95fbc0865cd0c39ab1bf3663f0
diff --git a/metadata/md5-cache/app-crypt/acme-tiny-9999 b/metadata/md5-cache/app-crypt/acme-tiny-9999
index e88729ce15e4..045cb5c0a699 100644
--- a/metadata/md5-cache/app-crypt/acme-tiny-9999
+++ b/metadata/md5-cache/app-crypt/acme-tiny-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/openssl:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7ab620d0e72af0b6043bd8bc9c3db7bd
diff --git a/metadata/md5-cache/app-crypt/certbot-0.39.0 b/metadata/md5-cache/app-crypt/certbot-0.39.0
new file mode 100644
index 000000000000..07f5b718d0e8
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.39.0
@@ -0,0 +1,16 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-0.39.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=df87ff79a87fa2557ff77e4332a95662
diff --git a/metadata/md5-cache/app-crypt/certbot-0.40.1 b/metadata/md5-cache/app-crypt/certbot-0.40.1
new file mode 100644
index 000000000000..c3b6f6e131e7
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-0.40.1
@@ -0,0 +1,16 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v0.40.1.tar.gz -> certbot-0.40.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=745efd96ff4002b0f017a52d8cc75b1e
diff --git a/metadata/md5-cache/app-crypt/certbot-1.0.0-r1 b/metadata/md5-cache/app-crypt/certbot-1.0.0-r1
index 7e07145cbcbf..48da643fdf49 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.0.0-r1
+++ b/metadata/md5-cache/app-crypt/certbot-1.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.0.0.tar.gz -> certbot-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5bd3f1931cd44fbfbc89b62857dd8574
diff --git a/metadata/md5-cache/app-crypt/certbot-1.1.0 b/metadata/md5-cache/app-crypt/certbot-1.1.0
index f59cbcec0d18..f0a1d1b6b640 100644
--- a/metadata/md5-cache/app-crypt/certbot-1.1.0
+++ b/metadata/md5-cache/app-crypt/certbot-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.1.0.tar.gz -> certbot-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a107143d0a5b67e2a7c9eff2ea029810
diff --git a/metadata/md5-cache/app-crypt/certbot-1.2.0 b/metadata/md5-cache/app-crypt/certbot-1.2.0
deleted file mode 100644
index 6aed0089eeb4..000000000000
--- a/metadata/md5-cache/app-crypt/certbot-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
-EAPI=7
-HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a107143d0a5b67e2a7c9eff2ea029810
diff --git a/metadata/md5-cache/app-crypt/certbot-1.2.0-r1 b/metadata/md5-cache/app-crypt/certbot-1.2.0-r1
new file mode 100644
index 000000000000..9533c09663c7
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/certbot-1.2.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
+EAPI=7
+HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
+IUSE=test test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ad190bc164933bad7d3f47e044308ff1
diff --git a/metadata/md5-cache/app-crypt/certbot-9999 b/metadata/md5-cache/app-crypt/certbot-9999
index 2927b967e4cb..ba8b0ee2369a 100644
--- a/metadata/md5-cache/app-crypt/certbot-9999
+++ b/metadata/md5-cache/app-crypt/certbot-9999
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Let's encrypt client to automate deployment of X.509 certificates
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test test python_targets_python3_6 python_targets_python3_7
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-0.40.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configargparse-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/josepy-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parsedatetime-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyrfc3339[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a107143d0a5b67e2a7c9eff2ea029810
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ad190bc164933bad7d3f47e044308ff1
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.0.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.0.0
index 32bb91b70e0e..817885eddefd 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.0.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.0.0.tar.gz -> certbot-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6f3f74f9a438622376ec1c9b50b0253d
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.1.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.1.0
index 8be5442fc043..e94e63e4c139 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.1.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.1.0.tar.gz -> certbot-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=945bf5afdb0d62e10227ff9eeb4e2e92
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.2.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.2.0
index 06707363f033..910300009d12 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.2.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=961af3924a6252fa7815fefbd77c4724
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index bab47364f6b7..c92ae51b4a34 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=961af3924a6252fa7815fefbd77c4724
diff --git a/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0 b/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0
index bb93bd131981..948fb002274c 100644
--- a/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0
+++ b/metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-1.0[python_targets_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v0.39.0.tar.gz -> certbot-dns-nsone-0.39.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3dc6d94492cb113dcd3cbb8a24a3485c
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.0.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.0.0
index 950f239ccd50..4fd618098dfa 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.0.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.0.0.tar.gz -> certbot-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b18445ea0069ce1a7c1b127209581eb0
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.1.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.1.0
index 4c743293331d..51267438ed94 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.1.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.1.0.tar.gz -> certbot-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1649e29a0d825e12b4d662c36c45b01c
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.2.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.2.0
index e58a4b1146ff..0207f562c88c 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.2.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.2.0.tar.gz -> certbot-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f206d2181e2c25fa152bb636fd024ba9
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index 86c702583870..536bd0f50118 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f206d2181e2c25fa152bb636fd024ba9
diff --git a/metadata/md5-cache/app-crypt/dehydrated-0.6.5 b/metadata/md5-cache/app-crypt/dehydrated-0.6.5
index 81318942d60b..af0531ada3a8 100644
--- a/metadata/md5-cache/app-crypt/dehydrated-0.6.5
+++ b/metadata/md5-cache/app-crypt/dehydrated-0.6.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=cron? ( virtual/cron ) app-shells/bash net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/lukas2511/dehydrated/archive/v0.6.5.tar.gz -> dehydrated-0.6.5.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8c2000a9ecb11380a92fd3cfb213d9e8
diff --git a/metadata/md5-cache/app-crypt/gcr-3.20.0 b/metadata/md5-cache/app-crypt/gcr-3.20.0
deleted file mode 100644
index 71c244ab6d6d..000000000000
--- a/metadata/md5-cache/app-crypt/gcr-3.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/gobject-introspection-common dev-libs/libxslt dev-libs/vala-common dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/gcr
-IUSE=debug gtk +introspection vala test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=app-crypt/p11-kit-0.19 >=dev-libs/glib-2.38:2 >=dev-libs/libgcrypt-1.2.2:0= >=dev-libs/libtasn1-1:= >=sys-apps/dbus-1 gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) !<gnome-base/gnome-keyring-3.3
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/gcr/3.20/gcr-3.20.0.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ba6d0572e1ee63269f41257c4eb755d
diff --git a/metadata/md5-cache/app-crypt/gkeys-0.2 b/metadata/md5-cache/app-crypt/gkeys-0.2
index 6aeaface0f86..971db8c278ba 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_python3_6(-)?,-pyt
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0262d1442ac9a95f359e0780a1fb613
diff --git a/metadata/md5-cache/app-crypt/gkeys-9999 b/metadata/md5-cache/app-crypt/gkeys-9999
index c1915e7517bb..af1752394e9d 100644
--- a/metadata/md5-cache/app-crypt/gkeys-9999
+++ b/metadata/md5-cache/app-crypt/gkeys-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/gnupg =dev-python/pyGPG-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-python/ssl-fetch-9999[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=app-crypt/gentoo-keys-201501052117 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4cbaece5932b9f2a07dd72b6abb8873
diff --git a/metadata/md5-cache/app-crypt/glep63-check-9 b/metadata/md5-cache/app-crypt/glep63-check-9
index fa72c7798ad3..42d540a78d72 100644
--- a/metadata/md5-cache/app-crypt/glep63-check-9
+++ b/metadata/md5-cache/app-crypt/glep63-check-9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( pytho
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/glep63-check/archive/v9.tar.gz -> glep63-check-9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=768c71b497c5acdcbec15e0711622ef3
diff --git a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2 b/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
index 4e413d1662d0..5efb8888fb9d 100644
--- a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
+++ b/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.9.2
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-libs/libassuan:= >=dev-libs/libgcrypt-1.2.2:= >=dev-libs/libgpg-error-1.3:= >=dev-libs/pkcs11-helper-1.02:=
 SLOT=0
 SRC_URI=https://github.com/alonbl/gnupg-pkcs11-scd/releases/download/gnupg-pkcs11-scd-0.9.2/gnupg-pkcs11-scd-0.9.2.tar.bz2
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fa3feabde1839e23059ab8b2aad72a7e
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.0 b/metadata/md5-cache/app-crypt/gpgme-1.13.0
index 20ef881a5812..f414812a77cb 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2b21a23aa1d3809ca7615a065ecb80eb
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1 b/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
index 2f9f32319211..51e2cba16324 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f09faea30f4e00d95b15ef8e7b1d0ac7
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.13.1 b/metadata/md5-cache/app-crypt/gpgme-1.13.1
index 8ea0fa8bb407..4755d897c6ce 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.13.1
+++ b/metadata/md5-cache/app-crypt/gpgme-1.13.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.13.1.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e853a2bc0706410503293628dbf3d3e2
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.5.0 b/metadata/md5-cache/app-crypt/heimdal-7.5.0
index e9f56522951e..95d94915c698 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.5.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.5.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.6 ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Kerberos 5 implementation from KTH
 EAPI=6
 HOMEPAGE=http://www.h5l.org/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.5.0/heimdal-7.5.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=63a4c29e4aa6f5cab984395ca4df716b
+_md5_=b09cfba1dea590bb9b54d490e90c7d9b
diff --git a/metadata/md5-cache/app-crypt/heimdal-7.6.0 b/metadata/md5-cache/app-crypt/heimdal-7.6.0
index d3cb187086b3..aa99ea4d599c 100644
--- a/metadata/md5-cache/app-crypt/heimdal-7.6.0
+++ b/metadata/md5-cache/app-crypt/heimdal-7.6.0
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-perl/JSON >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) )
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-perl/JSON >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) )
 DESCRIPTION=Kerberos 5 implementation from KTH
 EAPI=7
 HOMEPAGE=http://www.h5l.org/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/heimdal/heimdal/releases/download/heimdal-7.6.0/heimdal-7.6.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f7c19c7c944128c47ec4a8b25ccbae86
+_md5_=d2e3487f0e4d83ccc73ea269ec9239ae
diff --git a/metadata/md5-cache/app-crypt/libykneomgr-0.1.8 b/metadata/md5-cache/app-crypt/libykneomgr-0.1.8
deleted file mode 100644
index 935bd3330c31..000000000000
--- a/metadata/md5-cache/app-crypt/libykneomgr-0.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=sys-apps/pcsc-lite dev-libs/libzip
-DESCRIPTION=YubiKey NEO CCID Manager C Library
-EAPI=7
-HOMEPAGE=https://developers.yubico.com/libykneomgr/
-IUSE=kernel_linux
-KEYWORDS=~amd64
-LICENSE=LGPL-3
-RDEPEND=sys-apps/pcsc-lite dev-libs/libzip >=app-crypt/ccid-1.4.18[usb]
-SLOT=0
-SRC_URI=https://developers.yubico.com/libykneomgr/Releases/libykneomgr-0.1.8.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=7b3acf8cf8a0f6801ad125b8f5c41c95
diff --git a/metadata/md5-cache/app-crypt/manuale-1.1.0 b/metadata/md5-cache/app-crypt/manuale-1.1.0
index d44c9ac631e2..c5013b14bd1b 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_6(-)?,-python_single_target
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=568f226cff5ad50bdc64fcdab3c69eed
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1 b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
index 57921219df81..4f06c8d4d929 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg app-misc/lockfile-progs dev-perl/Crypt-OpenSSL-RSA dev-p
 RESTRICT=test
 SLOT=0
 SRC_URI=http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=92d280bdf1d9e23a226db402cde1722b
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2 b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
index a8d137615ba9..6c026d596a6e 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.36-r2
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg net-misc/socat dev-perl/Crypt-OpenSSL-RSA dev-perl/Diges
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.36.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=30bd9348cde168901cc5599226992248
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.37 b/metadata/md5-cache/app-crypt/monkeysphere-0.37
index 644597b1c219..45b9016a27c6 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.37
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.37
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.37.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e86d1e4b88c1ef01657632f967844ace
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.38 b/metadata/md5-cache/app-crypt/monkeysphere-0.38
index bb480ab5fe47..f9b5546f50f3 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.38
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.38
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.38.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d18de51849e6ea250bbc404dfdb2d477
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.39 b/metadata/md5-cache/app-crypt/monkeysphere-0.39
index f531a65ddee2..9dcea40db1d2 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.39
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.39
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.39.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df5cc7c52af46ded0cf6755b25595e8e
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.41 b/metadata/md5-cache/app-crypt/monkeysphere-0.41
index a175e4238618..ebb882db8d1d 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.41
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.41
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6f89b34157cd55d6e07eeea2ee2ab409
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.42 b/metadata/md5-cache/app-crypt/monkeysphere-0.42
index 09a664bf9cdb..b59b1ce4fe82 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.42
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.42
@@ -9,5 +9,5 @@ RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-p
 RESTRICT=test
 SLOT=0/0
 SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.42.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.42.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8d8bf2359661e53aa96e5c195a04da4
diff --git a/metadata/md5-cache/app-crypt/openssl-blacklist-0.5.3 b/metadata/md5-cache/app-crypt/openssl-blacklist-0.5.3
index 537dc6759ebc..ef200306c47e 100644
--- a/metadata/md5-cache/app-crypt/openssl-blacklist-0.5.3
+++ b/metadata/md5-cache/app-crypt/openssl-blacklist-0.5.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=Detection of weak ssl keys produced by certain debian versions in 2006-2008
 EAPI=5
 HOMEPAGE=https://launchpad.net/ubuntu/+source/openssl-blacklist/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/openssl-blacklist/openssl-blacklist_0.5.orig.tar.gz mirror://debian/pool/main/o/openssl-blacklist/openssl-blacklist_0.5-3.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5180573dccc653d72226e19d1f108f6d
diff --git a/metadata/md5-cache/app-crypt/openvpn-blacklist-0.4-r1 b/metadata/md5-cache/app-crypt/openvpn-blacklist-0.4-r1
index 888573f35cbe..dae4f7c4a405 100644
--- a/metadata/md5-cache/app-crypt/openvpn-blacklist-0.4-r1
+++ b/metadata/md5-cache/app-crypt/openvpn-blacklist-0.4-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=Detection of weak openvpn keys produced by certain debian versions in 2006-2008
 EAPI=5
 HOMEPAGE=http://packages.debian.org/sid/openvpn-blacklist
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/openvpn-blacklist/openvpn-blacklist_0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c79664dd9831bf787e744245788c624
diff --git a/metadata/md5-cache/app-crypt/openvpn-blacklist-0.5 b/metadata/md5-cache/app-crypt/openvpn-blacklist-0.5
index 5df33d01f025..0e6a9cb8d175 100644
--- a/metadata/md5-cache/app-crypt/openvpn-blacklist-0.5
+++ b/metadata/md5-cache/app-crypt/openvpn-blacklist-0.5
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=Detection of weak openvpn keys produced by certain debian versions in 2006-2008
 EAPI=5
 HOMEPAGE=http://packages.debian.org/sid/openvpn-blacklist
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/openvpn-blacklist/openvpn-blacklist_0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c97b2e8722a0f27a331365751edd4eed
diff --git a/metadata/md5-cache/app-crypt/pius-2.2.4 b/metadata/md5-cache/app-crypt/pius-2.2.4
index a6f1214caa2e..0f26a5b207ab 100644
--- a/metadata/md5-cache/app-crypt/pius-2.2.4
+++ b/metadata/md5-cache/app-crypt/pius-2.2.4
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gnupg-2.0.0 dev-lang/perl python_targets_python2_7? ( >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/jaymzh/pius/releases/download/v2.2.4/pius-2.2.4.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2f1d9819ff1dfae6fd0197e86f8960ce
diff --git a/metadata/md5-cache/app-crypt/rotix-0.83 b/metadata/md5-cache/app-crypt/rotix-0.83
index c89305fd31c4..6ebe94276dca 100644
--- a/metadata/md5-cache/app-crypt/rotix-0.83
+++ b/metadata/md5-cache/app-crypt/rotix-0.83
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=sys-devel/gettext
 DESCRIPTION=Rotix allows you to generate rotational obfuscations
 EAPI=5
-HOMEPAGE=https://gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-devel/gettext
 SLOT=0
 SRC_URI=http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/rotix-0.83/rotix-0.83.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=35324281e60e7027bbc1a7e45154d819
+_md5_=621230f475e879f45987e8d6b7f7053b
diff --git a/metadata/md5-cache/app-crypt/ssh-multiadd-1.3.2-r1 b/metadata/md5-cache/app-crypt/ssh-multiadd-1.3.2-r1
index 96021f6cad92..c4a7b3a1fa22 100644
--- a/metadata/md5-cache/app-crypt/ssh-multiadd-1.3.2-r1
+++ b/metadata/md5-cache/app-crypt/ssh-multiadd-1.3.2-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare setup
 DESCRIPTION=Adds multiple ssh keys to the ssh authentication agent
 EAPI=5
 HOMEPAGE=http://code.fluffytapeworm.com/projects
-IUSE=X +python_targets_python2_7 +python_single_target_python2_7
+IUSE=X +python_single_target_python2_7
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) X? ( >=net-misc/x11-ssh-askpass-1.2.2 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://code.fluffytapeworm.com/projects/ssh-multiadd-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=849c22720fce6e0a9b033961916926c4
diff --git a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1 b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
index f9a1f9715f20..937739d2794b 100644
--- a/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
+++ b/metadata/md5-cache/app-crypt/tpm-emulator-0.7.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:= 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47a2448d9672ceca2ff10af54a9e705d
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 aafdc8771a5c..96e644f2d03d 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:0= ) selinux? ( sec-policy/selinux-tcsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8bc5db14fb74c249c500265b86a6b1e1
diff --git a/metadata/md5-cache/app-crypt/virtualsmartcard-0.7 b/metadata/md5-cache/app-crypt/virtualsmartcard-0.7
index 24d9580d1ffd..d6072f26e53a 100644
--- a/metadata/md5-cache/app-crypt/virtualsmartcard-0.7
+++ b/metadata/md5-cache/app-crypt/virtualsmartcard-0.7
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Smart card emulator, can be used with Remote Smart Card Reader
 EAPI=7
 HOMEPAGE=https://frankmorgner.github.io/vsmartcard/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) media-gfx/qrencode:= sys-apps/pcsc-lite
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/frankmorgner/vsmartcard/releases/download/virtualsmartcard-0.7/virtualsmartcard-0.7.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e8a13270718057b9aa5c687752f3b878
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
index 35eaf55eaa4b..1cd465fa59c5 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-3.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bc6b14cb34f579c961265269f026624
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3
deleted file mode 100644
index 48eb81b25481..000000000000
--- a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-crypt/yubikey-manager-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <app-crypt/yubikey-manager-4.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/cryptography[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5[widgets] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 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_6 +python_single_target_python3_6
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-crypt/yubikey-manager-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <app-crypt/yubikey-manager-4.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/cryptography[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyotherside[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5[widgets] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qtwidgets:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-1.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09de7289085d761f9c6ebb4c90ce89e0
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3-r1 b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3-r1
new file mode 100644
index 000000000000..aa586b0b1a2e
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-qt-1.1.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=app-crypt/yubikey-manager-1.0.0[python_targets_python3_6(-)] <app-crypt/yubikey-manager-4.0.0[python_targets_python3_6(-)] dev-python/cryptography[python_targets_python3_6(-)] ) dev-python/pyotherside[python_single_target_python3_6(-)?] dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5[widgets] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 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_single_target_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=app-crypt/yubikey-manager-1.0.0[python_targets_python3_6(-)] <app-crypt/yubikey-manager-4.0.0[python_targets_python3_6(-)] dev-python/cryptography[python_targets_python3_6(-)] ) dev-python/pyotherside[python_single_target_python3_6(-)?] dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgraphicaleffects:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5[widgets] dev-qt/qtquickcontrols2:5[widgets] dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtsvg:5 dev-qt/qtwidgets:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-1.1.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=97138beb0f827402660415637bab92c8
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index a54aa5761da1..4c265d6e0c2d 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/myspell-hu-1.6.1 b/metadata/md5-cache/app-dicts/myspell-hu-1.6.1
index 48fb51a044f2..bc53a6d63dd5 100644
--- a/metadata/md5-cache/app-dicts/myspell-hu-1.6.1
+++ b/metadata/md5-cache/app-dicts/myspell-hu-1.6.1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86
 LICENSE=GPL-3 GPL-2 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/magyarispell/hu_HU-1.6.1.tar.gz mirror://sourceforge/magyarispell/huhyphn_v20110815_LibO.tar.gz http://downloadarchive.documentfoundation.org/libreoffice/old/3.6.0.4/rpm/x86/LibO_3.6.0.4_Linux_x86_langpack-rpm_hu.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	myspell-r2	d7a80fcc3949917840a5c8f1a967004c	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	myspell-r2	d7a80fcc3949917840a5c8f1a967004c	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88f66cab51203c36be91270fc62b4dfd
diff --git a/metadata/md5-cache/app-dicts/opendict-0.6.7 b/metadata/md5-cache/app-dicts/opendict-0.6.7
deleted file mode 100644
index 0a8eb13fb6cd..000000000000
--- a/metadata/md5-cache/app-dicts/opendict-0.6.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=OpenDict is a free cross-platform dictionary program
-EAPI=6
-HOMEPAGE=http://opendict.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/opendict/files/opendict-0.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d53b4b3e46f145382187b0159dfbbdbb
diff --git a/metadata/md5-cache/app-dicts/opendict-0.6.7-r1 b/metadata/md5-cache/app-dicts/opendict-0.6.7-r1
new file mode 100644
index 000000000000..98f641a5b90b
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/opendict-0.6.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_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/wxpython:3.0[python_targets_python2_7(-)] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=OpenDict is a free cross-platform dictionary program
+EAPI=6
+HOMEPAGE=http://opendict.sourceforge.net/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/wxpython:3.0[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/opendict/files/opendict-0.6.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2febad02402359a01ca1ae7bfa55967a
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 6ef9a3f775d7..2ea262b5561e 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
deleted file mode 100644
index fe68d8c3f691..000000000000
--- a/metadata/md5-cache/app-doc/cppman-0.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=C++ man pages for Linux, with source from cplusplus.com and cppreference.com
-EAPI=6
-HOMEPAGE=https://github.com/aitjcize/cppman
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
-LICENSE=GPL-3
-RDEPEND=sys-apps/groff dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/html5lib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0df65ec063da249b58be588159ebf9d
diff --git a/metadata/md5-cache/app-doc/cppman-0.4.8-r1 b/metadata/md5-cache/app-doc/cppman-0.4.8-r1
new file mode 100644
index 000000000000..81fc6068637d
--- /dev/null
+++ b/metadata/md5-cache/app-doc/cppman-0.4.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DESCRIPTION=C++ man pages for Linux, with source from cplusplus.com and cppreference.com
+EAPI=6
+HOMEPAGE=https://github.com/aitjcize/cppman
+IUSE=+python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=sys-apps/groff python_single_target_python3_6? ( dev-python/beautifulsoup:4[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/aitjcize/cppman/archive/0.4.8.tar.gz -> cppman-0.4.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18a8baf347259bc6e0e578c761da8583
diff --git a/metadata/md5-cache/app-doc/devmanual-0_pre20200203 b/metadata/md5-cache/app-doc/devmanual-0_pre20200203
deleted file mode 100644
index 9a076ac7c4bb..000000000000
--- a/metadata/md5-cache/app-doc/devmanual-0_pre20200203
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-libs/libxml2 dev-libs/libxslt gnome-base/librsvg media-fonts/open-sans
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=The Gentoo Development Guide
-EAPI=7
-HOMEPAGE=https://devmanual.gentoo.org/
-IUSE=+offline
-KEYWORDS=~amd64 ~arm ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~x64-macos
-LICENSE=CC-BY-SA-4.0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/distfiles/devmanual-0_pre20200203.tar.xz
-_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=dce4c9d6091ba9ce8529d150a7644039
diff --git a/metadata/md5-cache/app-doc/devmanual-0_pre20200207 b/metadata/md5-cache/app-doc/devmanual-0_pre20200207
new file mode 100644
index 000000000000..521e0e8de37a
--- /dev/null
+++ b/metadata/md5-cache/app-doc/devmanual-0_pre20200207
@@ -0,0 +1,12 @@
+BDEPEND=dev-libs/libxml2 dev-libs/libxslt gnome-base/librsvg media-fonts/open-sans
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=The Gentoo Development Guide
+EAPI=7
+HOMEPAGE=https://devmanual.gentoo.org/
+IUSE=+offline
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos
+LICENSE=CC-BY-SA-4.0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/devmanual-0_pre20200207.tar.xz
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=7246d5e53397aad44226735a0e72bfbf
diff --git a/metadata/md5-cache/app-doc/devmanual-9999 b/metadata/md5-cache/app-doc/devmanual-9999
index 0c91dfc22e2a..c7227fa51530 100644
--- a/metadata/md5-cache/app-doc/devmanual-9999
+++ b/metadata/md5-cache/app-doc/devmanual-9999
@@ -8,4 +8,4 @@ LICENSE=CC-BY-SA-4.0
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=a05e12543c060375187ca0b00972b035
+_md5_=558ae53b3db947173c87213310a4a2a8
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.15 b/metadata/md5-cache/app-doc/doxygen-1.8.15
index 58e4b2ede59f..bc68a14d6b35 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.15
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 >=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 ) ) 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=http://www.doxygen.org
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://doxygen.nl/files/doxygen-1.8.15.src.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=425afa9b4f54985da7a77aa3d66f5670
+_md5_=d1bbe416f76a71c05348e336e62f208b
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.16-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.16-r1
index eb5cd02fe305..b41174050474 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.16-r1
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 >=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 ) ) 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=http://www.doxygen.org
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://doxygen.nl/files/doxygen-1.8.16.src.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3aeaea964095cc4d58553e33ad200288
+_md5_=03372bd93bd75181bc40a728d4ccf793
diff --git a/metadata/md5-cache/app-doc/doxygen-9999 b/metadata/md5-cache/app-doc/doxygen-9999
index b2afd4703ea1..dd8eb3fc3046 100644
--- a/metadata/md5-cache/app-doc/doxygen-9999
+++ b/metadata/md5-cache/app-doc/doxygen-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 >=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 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=sys-devel/flex sys-devel/bison doc? ( || ( dev-lang/python:3.6 ) ) 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 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Documentation system for most programming languages
 EAPI=6
 HOMEPAGE=http://www.doxygen.org
@@ -11,4 +11,4 @@ REQUIRED_USE=doc? ( latex )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34f4da39c323d43caa1667a24ea7901b
+_md5_=d4f13247a1fd2a9a93d6953ae9ae1f92
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 898a9339fa22..dc565e4e570a 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.32.1 b/metadata/md5-cache/app-editors/atom-1.32.1
index 8301f65667cf..ea589d51644e 100644
--- a/metadata/md5-cache/app-editors/atom-1.32.1
+++ b/metadata/md5-cache/app-editors/atom-1.32.1
@@ -4,12 +4,12 @@ DEPEND=>=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/lib
 DESCRIPTION=A hackable text editor for the 21st Century
 EAPI=7
 HOMEPAGE=https://atom.io
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=>=app-text/hunspell-1.3.3:= >=dev-libs/libgit2-0.23:=[ssh] >=dev-libs/libpcre2-10.22:=[jit,pcre16] >=dev-libs/oniguruma-6.6.0:= >=dev-util/ctags-5.8 >=gnome-base/libgnome-keyring-3.12:= x11-libs/libxkbfile >=dev-util/electron-2.0.9:2.0 dev-vcs/git !sys-apps/apmd python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/atom/atom/releases/download/v1.32.1/atom.x86_64.rpm -> atom-bin-1.32.1.rpm https://github.com/atom/atom/archive/v1.32.1.tar.gz -> atom-1.32.1.tar.gz https://github.com/elprans/asar/releases/download/v0.14.3-gentoo/asar-build.tar.gz -> asar-0.14.3.tar.gz https://github.com/nodejs/nan/archive/v2.11.1.tar.gz -> nodejs-nan-2.11.1.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/@atom/watcher/-/watcher-1.0.8.tgz -> atomdep-atom--watcher-1.0.8.tar.gz https://registry.npmjs.org/cached-run-in-this-context/-/cached-run-in-this-context-0.5.0.tgz -> atomdep-cached-run-in-this-context-0.5.0.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.7.tgz -> atomdep-fs-admin-0.1.7.tar.gz https://registry.npmjs.org/git-utils/-/git-utils-5.2.1.tgz -> atomdep-git-utils-5.2.1.tar.gz https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.14.tgz -> atomdep-keyboard-layout-2.0.14.tar.gz https://registry.npmjs.org/keytar/-/keytar-4.3.0.tgz -> atomdep-keytar-4.3.0.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-7.0.2.tgz -> atomdep-oniguruma-7.0.2.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.5.0.tgz -> atomdep-spellchecker-3.5.0.tar.gz https://registry.npmjs.org/superstring/-/superstring-2.3.4.tgz -> atomdep-superstring-2.3.4.tar.gz https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.13.15.tgz -> atomdep-tree-sitter-0.13.15.tar.gz https://registry.npmjs.org/tree-sitter-bash/-/tree-sitter-bash-0.13.6.tgz -> atomdep-tree-sitter-bash-0.13.6.tar.gz https://registry.npmjs.org/tree-sitter-c/-/tree-sitter-c-0.13.7.tgz -> atomdep-tree-sitter-c-0.13.7.tar.gz https://registry.npmjs.org/tree-sitter-cpp/-/tree-sitter-cpp-0.13.8.tgz -> atomdep-tree-sitter-cpp-0.13.8.tar.gz https://registry.npmjs.org/tree-sitter-css/-/tree-sitter-css-0.13.7.tgz -> atomdep-tree-sitter-css-0.13.7.tar.gz https://registry.npmjs.org/tree-sitter-embedded-template/-/tree-sitter-embedded-template-0.13.0.tgz -> atomdep-tree-sitter-embedded-template-0.13.0.tar.gz https://registry.npmjs.org/tree-sitter-go/-/tree-sitter-go-0.13.3.tgz -> atomdep-tree-sitter-go-0.13.3.tar.gz https://registry.npmjs.org/tree-sitter-html/-/tree-sitter-html-0.13.5.tgz -> atomdep-tree-sitter-html-0.13.5.tar.gz https://registry.npmjs.org/tree-sitter-javascript/-/tree-sitter-javascript-0.13.8.tgz -> atomdep-tree-sitter-javascript-0.13.8.tar.gz https://registry.npmjs.org/tree-sitter-python/-/tree-sitter-python-0.13.4.tgz -> atomdep-tree-sitter-python-0.13.4.tar.gz https://registry.npmjs.org/tree-sitter-regex/-/tree-sitter-regex-0.13.1.tgz -> atomdep-tree-sitter-regex-0.13.1.tar.gz https://registry.npmjs.org/tree-sitter-ruby/-/tree-sitter-ruby-0.13.11.tgz -> atomdep-tree-sitter-ruby-0.13.11.tar.gz https://registry.npmjs.org/tree-sitter-typescript/-/tree-sitter-typescript-0.13.6.tgz -> atomdep-tree-sitter-typescript-0.13.6.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eef9e4d5f70fcd175f792b345cdf3c30
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.10 b/metadata/md5-cache/app-editors/bluefish-2.2.10
index 20e149005642..6ad7f05d94a5 100644
--- a/metadata/md5-cache/app-editors/bluefish-2.2.10
+++ b/metadata/md5-cache/app-editors/bluefish-2.2.10
@@ -3,13 +3,13 @@ DEPEND=sys-libs/zlib !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 gucharma
 DESCRIPTION=A GTK HTML editor for the experienced web designer or programmer
 EAPI=6
 HOMEPAGE=http://bluefish.openoffice.nl/
-IUSE=+gtk3 gucharmap nls python spell +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+gtk3 gucharmap nls python spell +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) spell? ( >=app-text/enchant-1.4:0 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.10.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d74be7f77f8b90915ec2b5a1e617c299
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 d5e3d61b38ed..aff2cb74ceb0 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f49f78075f06733e8b530fa4dfb2ab7b
diff --git a/metadata/md5-cache/app-editors/emacs-23.4-r18 b/metadata/md5-cache/app-editors/emacs-23.4-r18
index ef2d626b3067..8b515eca4362 100644
--- a/metadata/md5-cache/app-editors/emacs-23.4-r18
+++ b/metadata/md5-cache/app-editors/emacs-23.4-r18
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
 SLOT=23
 SRC_URI=mirror://gnu/emacs/emacs-23.4.tar.bz2 https://dev.gentoo.org/~ulm/emacs/emacs-23.4-patches-23.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b474abdaeafe0638fa5be92358ffe4bc
+_md5_=aed82537626df1c0719f4cfc236be551
diff --git a/metadata/md5-cache/app-editors/emacs-24.5-r7 b/metadata/md5-cache/app-editors/emacs-24.5-r7
index f90b71c8749c..7e9569c46d34 100644
--- a/metadata/md5-cache/app-editors/emacs-24.5-r7
+++ b/metadata/md5-cache/app-editors/emacs-24.5-r7
@@ -12,4 +12,4 @@ 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	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d705634f683a43431340333566e3f1ee
+_md5_=abd682ad919c6696182349004a72f84b
diff --git a/metadata/md5-cache/app-editors/emacs-25.3-r6 b/metadata/md5-cache/app-editors/emacs-25.3-r6
index cde00af40993..bac813fe3cdc 100644
--- a/metadata/md5-cache/app-editors/emacs-25.3-r6
+++ b/metadata/md5-cache/app-editors/emacs-25.3-r6
@@ -12,4 +12,4 @@ 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	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=434fda753337e54ae813c8582da8fa49
+_md5_=0874e3b1445e2dfe52c674e8054ca62d
diff --git a/metadata/md5-cache/app-editors/emacs-26.2 b/metadata/md5-cache/app-editors/emacs-26.2
index eaaee36df88d..4a2b133e2b81 100644
--- a/metadata/md5-cache/app-editors/emacs-26.2
+++ b/metadata/md5-cache/app-editors/emacs-26.2
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.2.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be46fe1459a28605a184d7f65882e4e0
+_md5_=45956c7a01d16c96a4e124b58f7ad82d
diff --git a/metadata/md5-cache/app-editors/emacs-26.3-r1 b/metadata/md5-cache/app-editors/emacs-26.3-r1
index 0ff11936d3ba..85b380eb04d9 100644
--- a/metadata/md5-cache/app-editors/emacs-26.3-r1
+++ b/metadata/md5-cache/app-editors/emacs-26.3-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
 SLOT=26
 SRC_URI=mirror://gnu/emacs/emacs-26.3.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b45cbc9f90cb8e2ed64aae1bf33de1a1
+_md5_=3dd6aba7e55de651f3db27ff8d5440f4
diff --git a/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223 b/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
index b43e8003b3fc..86044076d5aa 100644
--- a/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
+++ b/metadata/md5-cache/app-editors/emacs-27.0.50_pre20191223
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=27-vcs
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-27.0.50_pre20191223.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-27.0.50_pre20191223.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d84750a9a1a05a231677c7005923c5c0
+_md5_=222a57ed205b553f077e4398ce87bed4
diff --git a/metadata/md5-cache/app-editors/emacs-27.0.9999-r1 b/metadata/md5-cache/app-editors/emacs-27.0.9999-r1
index afae90e894e5..c5afc084e707 100644
--- a/metadata/md5-cache/app-editors/emacs-27.0.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-27.0.9999-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
 RESTRICT=test
 SLOT=27-vcs
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2df216ac9d95e120135763dd6b3de2e6
+_md5_=980efcddaf3fb0a75404be8015648b94
diff --git a/metadata/md5-cache/app-editors/emacs-28.0.9999 b/metadata/md5-cache/app-editors/emacs-28.0.9999
index 0b6bc564280f..84232bebfd29 100644
--- a/metadata/md5-cache/app-editors/emacs-28.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-28.0.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( aqua X )
 RESTRICT=test
 SLOT=28-vcs
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=38f055c9eef7f128a9dcdd48b070234f
+_md5_=253a12a267c7990a1d1d2403078fc0bf
diff --git a/metadata/md5-cache/app-editors/gedit-3.32.2-r1 b/metadata/md5-cache/app-editors/gedit-3.32.2-r1
index ae77ce713ba7..9b225f0af993 100644
--- a/metadata/md5-cache/app-editors/gedit-3.32.2-r1
+++ b/metadata/md5-cache/app-editors/gedit-3.32.2-r1
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-lib
 DESCRIPTION=A text editor for the GNOME desktop
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit
-IUSE=+introspection +python gtk-doc spell vala python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+introspection +python gtk-doc spell vala python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.22.0:3[introspection?] >=x11-libs/gtksourceview-4.0.2:4[introspection?] >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/libxml2-2.5.0:2 >=net-libs/libsoup-2.60:2.4 x11-libs/libX11 spell? ( >=app-text/gspell-0.2.5:0= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pycairo[python_targets_python3_6(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_6(-)] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_7(-)] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) ) x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
-REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) spell? ( python )
+REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) spell? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/3.32/gedit-3.32.2.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e682b8073584d483f9bfb8c1fc0d5c20
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-3.32.2-r1 b/metadata/md5-cache/app-editors/gedit-plugins-3.32.2-r1
index 3c832655828e..5142607bd744 100644
--- a/metadata/md5-cache/app-editors/gedit-plugins-3.32.2-r1
+++ b/metadata/md5-cache/app-editors/gedit-plugins-3.32.2-r1
@@ -3,12 +3,12 @@ DEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[
 DESCRIPTION=Official plugins for gedit
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins
-IUSE=+python charmap git terminal vala python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+python charmap git terminal vala python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/gedit-3.16 >=dev-libs/glib-2.32:2 >=dev-libs/libpeas-1.7.0[gtk] >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=app-editors/gedit-3.16[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-editors/gedit-3.16[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-editors/gedit-3.16[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] dev-libs/libpeas[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6 ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] ) vala? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
-REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) terminal? ( python )
+REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) terminal? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit-plugins/3.32/gedit-plugins-3.32.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a5d59463ef012e5d952baa0645532dd
diff --git a/metadata/md5-cache/app-editors/gvim-8.1.1486 b/metadata/md5-cache/app-editors/gvim-8.1.1486
index cc3ad01dcd92..f1d49b85b7e1 100644
--- a/metadata/md5-cache/app-editors/gvim-8.1.1486
+++ b/metadata/md5-cache/app-editors/gvim-8.1.1486
@@ -3,14 +3,14 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl 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
+IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=~app-editors/vim-core-8.1.1486
 RDEPEND=>=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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.1486.tar.gz -> vim-8.1.1486.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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b058ff078673b5ad2ac13e9814c1056
diff --git a/metadata/md5-cache/app-editors/gvim-8.1.1846 b/metadata/md5-cache/app-editors/gvim-8.1.1846
index 137a09c5c0cb..071291671fdc 100644
--- a/metadata/md5-cache/app-editors/gvim-8.1.1846
+++ b/metadata/md5-cache/app-editors/gvim-8.1.1846
@@ -3,14 +3,14 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl 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
+IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=~app-editors/vim-core-8.1.1846
 RDEPEND=>=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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.1846.tar.gz -> vim-8.1.1846.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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e480d643da80bb64c807d1a6dc0ca1f6
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.0055 b/metadata/md5-cache/app-editors/gvim-8.2.0055
index f31a31c7da83..fa6d84538d6b 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.0055
+++ b/metadata/md5-cache/app-editors/gvim-8.2.0055
@@ -3,14 +3,14 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl 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
+IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 PDEPEND=~app-editors/vim-core-8.2.0055
 RDEPEND=>=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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0055.tar.gz -> vim-8.2.0055.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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87a30fde08caee576802bf0f91437cd9
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.0114 b/metadata/md5-cache/app-editors/gvim-8.2.0114
index da1ab8289e8f..e8199c41ee73 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.0114
+++ b/metadata/md5-cache/app-editors/gvim-8.2.0114
@@ -3,13 +3,13 @@ DEPEND=~app-editors/vim-core-8.2.0114 >=app-eselect/eselect-vi-1.1 >=sys-libs/nc
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=~app-editors/vim-core-8.2.0114 >=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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0114.tar.gz -> vim-8.2.0114.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ac0929dbb18dec7b9991dc4ad5b982f
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.0210 b/metadata/md5-cache/app-editors/gvim-8.2.0210
deleted file mode 100644
index 53d12bc7f34d..000000000000
--- a/metadata/md5-cache/app-editors/gvim-8.2.0210
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=~app-editors/vim-core-8.2.0210 >=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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=GUI version of the Vim text editor
-EAPI=7
-HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=vim
-RDEPEND=~app-editors/vim-core-8.2.0210 >=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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/vim/vim/archive/v8.2.0210.tar.gz -> vim-8.2.0210.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4120ccec1f0b3c8d5e97d136f94f6088
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.0210-r1 b/metadata/md5-cache/app-editors/gvim-8.2.0210-r1
new file mode 100644
index 000000000000..0d6e337f857f
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gvim-8.2.0210-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=~app-editors/vim-core-8.2.0210 >=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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=GUI version of the Vim text editor
+EAPI=7
+HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
+IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=vim
+RDEPEND=~app-editors/vim-core-8.2.0210 >=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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/vim/vim/archive/v8.2.0210.tar.gz -> vim-8.2.0210.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5650f7ea1c3e9e0a2123221514741621
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index adf8b414f9e3..10225a29ec15 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -4,12 +4,12 @@ DEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurse
 DESCRIPTION=GUI version of the Vim text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=vim
 PROPERTIES=live
 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? ( gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk? ( gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) !gtk2? ( 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_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4120ccec1f0b3c8d5e97d136f94f6088
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5650f7ea1c3e9e0a2123221514741621
diff --git a/metadata/md5-cache/app-editors/leo-5.6 b/metadata/md5-cache/app-editors/leo-5.6
index aa661ebc9968..3993b568be1b 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3f1e7cccfe38390a8760968bcbedb0f
diff --git a/metadata/md5-cache/app-editors/nano-4.8 b/metadata/md5-cache/app-editors/nano-4.8
new file mode 100644
index 000000000000..620cac4248ea
--- /dev/null
+++ b/metadata/md5-cache/app-editors/nano-4.8
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) ) static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) ) )
+DESCRIPTION=GNU GPL'd Pico clone with more functionality
+EAPI=7
+HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
+IUSE=debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=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/v4/nano-4.8.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=dcde4baa9d0a25e3eec9c960555bae84
diff --git a/metadata/md5-cache/app-editors/nvi-1.81.6-r7 b/metadata/md5-cache/app-editors/nvi-1.81.6-r7
index e44a08d93eca..54c68446c34f 100644
--- a/metadata/md5-cache/app-editors/nvi-1.81.6-r7
+++ b/metadata/md5-cache/app-editors/nvi-1.81.6-r7
@@ -11,4 +11,4 @@ REQUIRED_USE=tcl? ( !unicode )
 SLOT=0
 SRC_URI=http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14148360017bec721fcf0e5a1e94591c
+_md5_=a2f6753c5629899a236302dab88d6884
diff --git a/metadata/md5-cache/app-editors/pluma-1.22.0 b/metadata/md5-cache/app-editors/pluma-1.22.0
index abf2b1f9305f..07119e677d7b 100644
--- a/metadata/md5-cache/app-editors/pluma-1.22.0
+++ b/metadata/md5-cache/app-editors/pluma-1.22.0
@@ -3,13 +3,13 @@ DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-l
 DESCRIPTION=Pluma text editor for the MATE desktop
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=+introspection spell +python_targets_python2_7 +python_single_target_python2_7 test
+IUSE=+introspection spell +python_single_target_python2_7 test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango virtual/libintl introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.2:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/pluma-1.22.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c51f3134fc6fd811edd189387cdabd7
diff --git a/metadata/md5-cache/app-editors/pluma-1.22.1 b/metadata/md5-cache/app-editors/pluma-1.22.1
index cb819ffc3eaf..362aa369cbf3 100644
--- a/metadata/md5-cache/app-editors/pluma-1.22.1
+++ b/metadata/md5-cache/app-editors/pluma-1.22.1
@@ -3,13 +3,13 @@ DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-l
 DESCRIPTION=Pluma text editor for the MATE desktop
 EAPI=6
 HOMEPAGE=https://mate-desktop.org
-IUSE=+introspection spell +python_targets_python2_7 +python_single_target_python2_7 test
+IUSE=+introspection spell +python_single_target_python2_7 test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango virtual/libintl introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.22/pluma-1.22.1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fb7b7e7718d93bb3ac5e66c920d0a90
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.4 b/metadata/md5-cache/app-editors/qhexedit2-0.8.4
index 05b89f276b4e..0d0fbf1805f7 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_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/v0.8.4.tar.gz -> qhexedit2-0.8.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbd7c67328b426b33662d5a2ce8b214c
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 90873eb2704f..cf885abb4b64 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_6 ) )
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/5f3ca79dbe8c765b685636a1751d242a6bfabb7d.tar.gz -> qhexedit2-0.8.4_p20170719.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=852f8b80f23cb2aac2e72b666a53b6c6
diff --git a/metadata/md5-cache/app-editors/retext-7.0.4-r1 b/metadata/md5-cache/app-editors/retext-7.0.4-r1
index a9bca9e6a6c0..b840733b07aa 100644
--- a/metadata/md5-cache/app-editors/retext-7.0.4-r1
+++ b/metadata/md5-cache/app-editors/retext-7.0.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReText/ReText-7.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9d9f5e0f9b2f09b28b32030dc777392
diff --git a/metadata/md5-cache/app-editors/retext-9999 b/metadata/md5-cache/app-editors/retext-9999
index 73e73739036f..ae01fca42a1a 100644
--- a/metadata/md5-cache/app-editors/retext-9999
+++ b/metadata/md5-cache/app-editors/retext-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8c35a6b7c94abc23d803e25467bcbb20
diff --git a/metadata/md5-cache/app-editors/texworks-0.6.3 b/metadata/md5-cache/app-editors/texworks-0.6.3
index 5b060932d4f9..78059eeeb555 100644
--- a/metadata/md5-cache/app-editors/texworks-0.6.3
+++ b/metadata/md5-cache/app-editors/texworks-0.6.3
@@ -4,13 +4,13 @@ DEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/designer:5 dev-qt/qtcore
 DESCRIPTION=A simple interface for working with TeX documents
 EAPI=7
 HOMEPAGE=http://tug.org/texworks/
-IUSE=lua python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 test
+IUSE=lua python python_single_target_python3_6 python_single_target_python3_7 test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/hunspell:= app-text/poppler[qt5] dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtscript:5[scripttools] lua? ( dev-lang/lua:0 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/TeXworks/texworks/archive/release-0.6.3.tar.gz -> texworks-0.6.3.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5fab9a5fde744e8febb5e5812dc50b58
diff --git a/metadata/md5-cache/app-editors/vim-8.1.1486 b/metadata/md5-cache/app-editors/vim-8.1.1486
index 3bf11bb7511c..24e3ded28807 100644
--- a/metadata/md5-cache/app-editors/vim-8.1.1486
+++ b/metadata/md5-cache/app-editors/vim-8.1.1486
@@ -3,12 +3,12 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager 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
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv 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=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.1486 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-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 ) ) vim-pager? ( !minimal )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.1486.tar.gz -> vim-8.1.1486.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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b7f63bdab1bd7bcffaa8da36d5a0566
diff --git a/metadata/md5-cache/app-editors/vim-8.1.1846 b/metadata/md5-cache/app-editors/vim-8.1.1846
index 811878a08d45..c4e3e40affae 100644
--- a/metadata/md5-cache/app-editors/vim-8.1.1846
+++ b/metadata/md5-cache/app-editors/vim-8.1.1846
@@ -3,12 +3,12 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager 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
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.1.1846 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-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 ) ) vim-pager? ( !minimal )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.1.1846.tar.gz -> vim-8.1.1846.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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6fe852f828651ce453b5b6f2929d623
diff --git a/metadata/md5-cache/app-editors/vim-8.2.0055 b/metadata/md5-cache/app-editors/vim-8.2.0055
index 1ae58ccb3aeb..453b376dea03 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.0055
+++ b/metadata/md5-cache/app-editors/vim-8.2.0055
@@ -3,12 +3,12 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager 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
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.0055 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-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 ) ) vim-pager? ( !minimal )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0055.tar.gz -> vim-8.2.0055.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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=81aedf585abbe43f56241af7f6e347aa
diff --git a/metadata/md5-cache/app-editors/vim-8.2.0114 b/metadata/md5-cache/app-editors/vim-8.2.0114
index a2e71352723e..a8ab79ecfa59 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.0114
+++ b/metadata/md5-cache/app-editors/vim-8.2.0114
@@ -3,12 +3,12 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.0114 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) vim-pager? ( !minimal )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0114.tar.gz -> vim-8.2.0114.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc5f45e48221a45abde071edd6c0a979
diff --git a/metadata/md5-cache/app-editors/vim-8.2.0210 b/metadata/md5-cache/app-editors/vim-8.2.0210
index f9ba4b49b9da..d6274d00b802 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.0210
+++ b/metadata/md5-cache/app-editors/vim-8.2.0210
@@ -3,12 +3,12 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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=vim
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-8.2.0210 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) vim-pager? ( !minimal )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0210.tar.gz -> vim-8.2.0210.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1e97f592fb22694654142bb67d1cccf
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index dd6e6405b02e..b276b3e1be0c 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -4,11 +4,11 @@ DEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/
 DESCRIPTION=Vim, an improved vi-style text editor
 EAPI=7
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
-IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux sound tcl terminal vim-pager python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=vim
 PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) !minimal? ( ~app-editors/vim-core-9999 ) vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) vim-pager? ( !minimal )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) vim-pager? ( !minimal )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1e97f592fb22694654142bb67d1cccf
diff --git a/metadata/md5-cache/app-editors/vis-0.5 b/metadata/md5-cache/app-editors/vis-0.5
index 8e0064d69fcb..9bfbf73eb769 100644
--- a/metadata/md5-cache/app-editors/vis-0.5
+++ b/metadata/md5-cache/app-editors/vis-0.5
@@ -4,10 +4,10 @@ DESCRIPTION=modern, legacy free, simple yet efficient vim-like editor
 EAPI=6
 HOMEPAGE=https://github.com/martanne/vis
 IUSE=+ncurses selinux test tre
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=ISC
 RDEPEND=dev-libs/libtermkey ncurses? ( sys-libs/ncurses:0= ) tre? ( dev-libs/tre:= ) app-eselect/eselect-vi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martanne/vis/releases/download/v0.5/vis-v0.5.tar.gz -> vis-0.5.tar.gz test? ( https://github.com/martanne/vis-test/releases/download/v0.3/vis-test-0.3.tar.gz -> vis-test-0.3.tar.gz )
-_md5_=91726c60aca17d3fc2383b1053ad66f8
+_md5_=2f08df5146583abaae847ffb52370d7a
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index ecda0a9e5cb8..d2403653b117 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/ebuild-mode-1.49 b/metadata/md5-cache/app-emacs/ebuild-mode-1.49
index 96a8bddfeb8f..8bfb46cb5f22 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.49
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.49
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.49.tar.xz
 _eclasses_=elisp	17bb0076b1e93d2dba84995228871c99	elisp-common	a1054cff648e1c6a806e17001d052176	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
-_md5_=4f690be16cf253201e0b7cb3b0168cb8
+_md5_=a25617fcac336ecf2ef35fb76c11fa3b
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26 b/metadata/md5-cache/app-emacs/pymacs-0.26
index f683cc088b11..9abf9e38aa92 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.26
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:* python_targets_python2_7? ( >=dev-lang/python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	elisp	17bb0076b1e93d2dba84995228871c99	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp	17bb0076b1e93d2dba84995228871c99	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e08f4a0ade4325913b6679a67ff8479e
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 9e39baa644d1..3a9734188a85 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/buildah-1.14.0 b/metadata/md5-cache/app-emulation/buildah-1.14.0
new file mode 100644
index 000000000000..a36a2c667a7c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/buildah-1.14.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12
+DEFINED_PHASES=compile install postinst prepare test unpack
+DEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+DESCRIPTION=A tool that facilitates building OCI images
+EAPI=7
+HOMEPAGE=https://github.com/containers/buildah
+IUSE=selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= app-emulation/skopeo dev-libs/libgpg-error:= dev-libs/libassuan:= sys-fs/lvm2:= sys-libs/libseccomp:= selinux? ( sys-libs/libselinux:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/buildah/archive/v1.14.0.tar.gz -> buildah-1.14.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	go-module	c1d483897ed4807f97f20fb3b5a3cb7b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f068cfbaaca7866ddd06b0257b447886
diff --git a/metadata/md5-cache/app-emulation/cadvisor-0.34.0 b/metadata/md5-cache/app-emulation/cadvisor-0.34.0
index 78dec2c33092..c06e7aa17271 100644
--- a/metadata/md5-cache/app-emulation/cadvisor-0.34.0
+++ b/metadata/md5-cache/app-emulation/cadvisor-0.34.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/google/cadvisor/archive/v0.34.0.tar.gz -> cadvisor-0.34.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f0c014a0b772057b07a57b43eb77fcb3
diff --git a/metadata/md5-cache/app-emulation/cloud-init-17.2 b/metadata/md5-cache/app-emulation/cloud-init-17.2
index 3dfb53a8e7a6..c68a90214652 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_python3_6 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25a72f1028ccb2c4f143e9a5b189b194
diff --git a/metadata/md5-cache/app-emulation/cloud-init-18.4-r1 b/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
index e68fd2be65d7..9bfa23474378 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
+++ b/metadata/md5-cache/app-emulation/cloud-init-18.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/18.4/+download/cloud-init-18.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a91bdd25c8b0284e7e960f6b175d74e
diff --git a/metadata/md5-cache/app-emulation/cloud-init-18.5 b/metadata/md5-cache/app-emulation/cloud-init-18.5
index 9fd4a161b7cb..d1d94bbaee56 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-18.5
+++ b/metadata/md5-cache/app-emulation/cloud-init-18.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/cloud-init/trunk/18.5/+download/cloud-init-18.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdfd0ea4df5e424a91a05c23a40b8035
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index 5c48cd7c5077..3b24254af1d0 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b116171014734b9f3ab7d86d3bb48be
diff --git a/metadata/md5-cache/app-emulation/containerd-1.2.12 b/metadata/md5-cache/app-emulation/containerd-1.2.12
new file mode 100644
index 000000000000..ffeeedf01589
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.2.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) >=dev-lang/go-1.10
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.io/
+IUSE=apparmor +btrfs +cri hardened +seccomp
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=>=app-emulation/runc-1.0.0_rc8 seccomp? ( sys-libs/libseccomp )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.2.12.tar.gz -> containerd-1.2.12.tar.gz
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=88f83234cef36ab520f66aa835ee07ba
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
index 7436799710c0..345ab0937f8d 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-12.5.0-r2
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-12.5.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45a703cd8346292622a79e1c02b9ca8b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fa280dcadbec8e7364cd1cda8092f690
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2 b/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
index bdbaaf7af024..83372d38908c 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-12.5.1-r2
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-12.5.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
index e513ee0a5b4e..779647fc1a1a 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.0.0-r2
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.0.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
index 517135705c44..f515f1b564ca 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.0.1-r2
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.0.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
index 6207fef01ee0..34802e2a219b 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.0-r2
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
index 4042bfdeff15..d0a632c21341 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.2-r2
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.2.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
index 0a80feabdd6d..585c85cdad3f 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.1.3-r2
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.1.3.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2 b/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
index 0d10e23291e0..c5846b3d2072 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
+++ b/metadata/md5-cache/app-emulation/crossover-bin-13.2.0-r2
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-13.2.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8184bab1ffe7c74c56add09a689885c4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f251a655d9446d12bea3c1eeed4c37ed
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1 b/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
index 4c10665c9174..bc97d743e472 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-14.0.3-r1
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-14.0.3.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d87097ff798f5a41138f31b2d6cf7328
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5e539a4afd878af39125d4c01af82bb5
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1 b/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
index 8e59545d55f3..ce899bb42482 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-14.1.4-r1
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-2
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist fetch test
 SLOT=0
 SRC_URI=install-crossover-14.1.4.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f8bfb1a9c074ebbb2c4e0b2033a5001
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=76e507a9394a11abf6328940e334e230
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
index dd6ea8fde943..68f6096101b3 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.0.0
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.0.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf4e1a6d1acf81b82840768cda91d7bb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=54de466ec26fa168c71ccecd7a888f40
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.0.1 b/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
index 568c540bac18..f39144775513 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.0.1
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.0.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8abf0ad6d1006b84dd26dac3d15de1d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=157beb283d880b6392a5644664bab39b
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.1.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
index 78f71c5d5dd9..7e48968c3a95 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.1.0
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.1.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8abf0ad6d1006b84dd26dac3d15de1d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=157beb283d880b6392a5644664bab39b
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.2.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
index eb059adc3466..e60345fd382f 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.2.0
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.2.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=142a7a2d5ab415ff79ac0c06943f4157
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b8e019148521e1efb27d8ea3c0ce2839
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.3.0 b/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
index 5a9bcf074ff6..629d425c1a7d 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.3.0
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.3.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7a254b774159efa79b83d57992650eb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e04874ac9fba171edcf083d23c07197f
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-15.3.1 b/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
index 5092da580fa2..77338b606ac7 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-15.3.1
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-15.3.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7a254b774159efa79b83d57992650eb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e04874ac9fba171edcf083d23c07197f
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-16.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
index 2a84c544c971..c43ede861f63 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-16.0.0
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-16.0.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7a254b774159efa79b83d57992650eb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e04874ac9fba171edcf083d23c07197f
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-16.2.5 b/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
index 347a317f268c..af2a0c10dd2e 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
+++ b/metadata/md5-cache/app-emulation/crossover-bin-16.2.5
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-16.2.5.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7a254b774159efa79b83d57992650eb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e04874ac9fba171edcf083d23c07197f
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
index 614e736d5ff7..028aaedafe61 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b77210c33dc0f01286d154641f4a8007
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=13f2850b8e7558079f78e58d4b500032
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
index 638a10773e4b..eb66c6d77ddd 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.0.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=42d5a0ff03e55e59c67acf089a522e0a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=55e2a332a5ba25dc3a70c910bb116114
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-17.5.1 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
index b6f3f620c3e6..83eb1f00302d 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=5
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-lang/perl app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.1.bin
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fdb0d0641114106a1540cd2eda24728
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=665274301e8171ea1ac59517e5241b2d
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.0.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
index 69e8abe672ed..14f8aec9eb1b 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.0.0
@@ -3,13 +3,13 @@ DEFINED_PHASES=install nofetch postinst prepare setup unpack
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=7
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.0.0.bin
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=7b31f7cab5050e8a32af051abbe12849
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=dedccc389a81f68b7398c7c19aa08189
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.1.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
index cc774d10f227..a8fa519e2c7f 100644
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.1.0
@@ -3,13 +3,13 @@ DEFINED_PHASES=install nofetch postinst prepare setup unpack
 DESCRIPTION=Commercial version of app-emulation/wine with paid support.
 EAPI=7
 HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist test
 SLOT=0
 SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.1.0.bin
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=7b31f7cab5050e8a32af051abbe12849
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=dedccc389a81f68b7398c7c19aa08189
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.5.0 b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0
deleted file mode 100644
index 7949b2e66e2a..000000000000
--- a/metadata/md5-cache/app-emulation/crossover-bin-18.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/perl app-arch/unzip
-DEFINED_PHASES=install nofetch postinst prepare setup unpack
-DESCRIPTION=Commercial version of app-emulation/wine with paid support.
-EAPI=7
-HOMEPAGE=https://www.codeweavers.com/products/
-IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=CROSSOVER-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=bindist test
-SLOT=0
-SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.5.0.bin
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=7b31f7cab5050e8a32af051abbe12849
diff --git a/metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1 b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1
new file mode 100644
index 000000000000..e65306350f91
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-18.5.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/perl app-arch/unzip
+DEFINED_PHASES=install nofetch postinst prepare setup unpack
+DESCRIPTION=Commercial version of app-emulation/wine with paid support.
+EAPI=7
+HOMEPAGE=https://www.codeweavers.com/products/
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l +python_single_target_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !prefix? ( sys-libs/glibc ) python_single_target_python2_7? ( >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-18.5.0.bin
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=dedccc389a81f68b7398c7c19aa08189
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.32.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.32.0
index 554381668044..a5d64d0f6e08 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.32.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.32.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.32.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=65abf78f27f3e035bda0c9e6199fd045
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-2.33.0 b/metadata/md5-cache/app-emulation/diskimage-builder-2.33.0
index 4b6a75533afe..961cecf1d8a6 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-2.33.0
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-2.33.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-2.33.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=24110faede78fc272e61ffd955df5ea8
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-9999 b/metadata/md5-cache/app-emulation/diskimage-builder-9999
index 8a12de99c80f..4df33d3df0ec 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-9999
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/networkx-1.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=24110faede78fc272e61ffd955df5ea8
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.24.0 b/metadata/md5-cache/app-emulation/docker-compose-1.24.0
index 48430e626a84..78fd1f939f6f 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.24.0
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.24.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.24.0.tar.gz -> docker-compose-1.24.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9cfc0b5b7124459e2991784d339c7ce3
diff --git a/metadata/md5-cache/app-emulation/docker-compose-1.25.4 b/metadata/md5-cache/app-emulation/docker-compose-1.25.4
index 67b38423665a..21772be9fe6f 100644
--- a/metadata/md5-cache/app-emulation/docker-compose-1.25.4
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.25.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/compose/archive/1.25.4.tar.gz -> docker-compose-1.25.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e07737f8e38148a06f3e72676a5885c9
diff --git a/metadata/md5-cache/app-emulation/docker-registry-2.7.1 b/metadata/md5-cache/app-emulation/docker-registry-2.7.1
index 85c8a4b538ca..2b10dbbf8a85 100644
--- a/metadata/md5-cache/app-emulation/docker-registry-2.7.1
+++ b/metadata/md5-cache/app-emulation/docker-registry-2.7.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/docker/distribution/archive/v2.7.1.tar.gz -> docker-registry-2.7.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8d847022785a7d62805f9d4f3c9b8395
diff --git a/metadata/md5-cache/app-emulation/faudio-19.06 b/metadata/md5-cache/app-emulation/faudio-19.06
index 20ff1387c3e9..8ab248d2ab2a 100644
--- a/metadata/md5-cache/app-emulation/faudio-19.06
+++ b/metadata/md5-cache/app-emulation/faudio-19.06
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FNA-XNA/FAudio/archive/19.06.tar.gz -> FAudio-19.06.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d0c7a0e6c88569e63f6165f72fa046
+_md5_=7f7dde91cf16945f055e6f3bf8933154
diff --git a/metadata/md5-cache/app-emulation/faudio-19.09 b/metadata/md5-cache/app-emulation/faudio-19.09
index 6c4581c7182a..022e8612ac41 100644
--- a/metadata/md5-cache/app-emulation/faudio-19.09
+++ b/metadata/md5-cache/app-emulation/faudio-19.09
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FNA-XNA/FAudio/archive/19.09.tar.gz -> FAudio-19.09.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d0c7a0e6c88569e63f6165f72fa046
+_md5_=7f7dde91cf16945f055e6f3bf8933154
diff --git a/metadata/md5-cache/app-emulation/faudio-20.02 b/metadata/md5-cache/app-emulation/faudio-20.02
new file mode 100644
index 000000000000..12838a1b0964
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/faudio-20.02
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/libsdl2-2.0.9[sound,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=FAudio - Accuracy-focused XAudio reimplementation for open platforms
+EAPI=7
+HOMEPAGE=https://fna-xna.github.io/
+IUSE=+abi_x86_32 +abi_x86_64 debug dumpvoices ffmpeg xnasong test utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=media-libs/libsdl2-2.0.9[sound,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ffmpeg? ( media-video/ffmpeg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/FNA-XNA/FAudio/archive/20.02.tar.gz -> FAudio-20.02.tar.gz
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b73c4ae6894478a3fb8733fd7892eaa
diff --git a/metadata/md5-cache/app-emulation/faudio-9999 b/metadata/md5-cache/app-emulation/faudio-9999
index 5abc9d2a21cb..18e13e44f0f9 100644
--- a/metadata/md5-cache/app-emulation/faudio-9999
+++ b/metadata/md5-cache/app-emulation/faudio-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d0c7a0e6c88569e63f6165f72fa046
+_md5_=7f7dde91cf16945f055e6f3bf8933154
diff --git a/metadata/md5-cache/app-emulation/flannel-0.11.0 b/metadata/md5-cache/app-emulation/flannel-0.11.0
index 4a0e07bc855d..66c497295b5a 100644
--- a/metadata/md5-cache/app-emulation/flannel-0.11.0
+++ b/metadata/md5-cache/app-emulation/flannel-0.11.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD ISC LGPL-3 MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coreos/flannel/archive/v0.11.0.tar.gz -> flannel-0.11.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f62ab93e1ddd36f1622752298581b56b
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2
deleted file mode 100644
index bb703679f8a4..000000000000
--- a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=sys-devel/gettext
-DESCRIPTION=PyQt5-based launcher for FS-UAE
-EAPI=7
-HOMEPAGE=https://fs-uae.net/
-IUSE=lha python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=app-emulation/fs-uae dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] lha? ( dev-python/python-lhafile[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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://fs-uae.net/stable/3.0.2/fs-uae-launcher-3.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4e7a793a7a341ee571798f22b941b5d
diff --git a/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2-r1 b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2-r1
new file mode 100644
index 000000000000..3ff0bed87e84
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=sys-devel/gettext
+DESCRIPTION=PyQt5-based launcher for FS-UAE
+EAPI=7
+HOMEPAGE=https://fs-uae.net/
+IUSE=lha python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=app-emulation/fs-uae python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] lha? ( dev-python/python-lhafile[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-),declarative,gui,network,opengl,widgets] dev-python/pyopengl[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] lha? ( dev-python/python-lhafile[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://fs-uae.net/stable/3.0.2/fs-uae-launcher-3.0.2.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64ae5cdc4903e4b14bd7514f8935c163
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8 b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
deleted file mode 100644
index 2f01f0b622ef..000000000000
--- a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 prepare setup test
-DEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= <dev-lang/ghc-8.1:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= !<app-emulation/ganeti-instance-image-0.6-r1 >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-1.0.1.0:0= <dev-haskell/monad-control-1.0.2:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-1.0.1:0= <dev-haskell/snap-core-1.1:0= >=dev-haskell/snap-server-1.0.1:0= <dev-haskell/snap-server-1.1:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= <dev-haskell/test-framework-0.9:0= >=dev-haskell/test-framework-hunit-0.2.7:0= <dev-haskell/test-framework-hunit-0.4:0= >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= <dev-haskell/test-framework-quickcheck2-0.4:0= test? ( dev-python/mock dev-python/pyyaml dev-haskell/haddock:0= >=dev-haskell/hunit-1.2.4.2:0= <dev-haskell/hunit-1.3:0= >=dev-haskell/quickcheck-2.4.2:2= <dev-haskell/quickcheck-2.8.3:2= sys-apps/fakeroot >=net-misc/socat-1.7 dev-util/shelltestrunner )
-DESCRIPTION=Ganeti is a virtual server management software tool
-EAPI=7
-HOMEPAGE=http://www.ganeti.org/
-IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= <dev-lang/ghc-8.1:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= !<app-emulation/ganeti-instance-image-0.6-r1 >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-1.0.1.0:0= <dev-haskell/monad-control-1.0.2:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-1.0.1:0= <dev-haskell/snap-core-1.1:0= >=dev-haskell/snap-server-1.0.1:0= <dev-haskell/snap-server-1.1:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
-REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://downloads.ganeti.org/releases/2.15/ganeti-2.15.2.tar.gz mirror://debian/pool/main/g/ganeti-2.15/ganeti-2.15_2.15.2-11.debian.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=18134a38992f0ede1c9906ca9a2974e4
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r9 b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r9
new file mode 100644
index 000000000000..effb5727b597
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r9
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 prepare setup test
+DEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= <dev-lang/ghc-8.1:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= !<app-emulation/ganeti-instance-image-0.6-r1 >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-1.0.1.0:0= <dev-haskell/monad-control-1.0.2:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-1.0.1:0= <dev-haskell/snap-core-1.1:0= >=dev-haskell/snap-server-1.0.1:0= <dev-haskell/snap-server-1.1:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= <dev-haskell/test-framework-0.9:0= >=dev-haskell/test-framework-hunit-0.2.7:0= <dev-haskell/test-framework-hunit-0.4:0= >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= <dev-haskell/test-framework-quickcheck2-0.4:0= test? ( dev-python/mock dev-python/pyyaml dev-haskell/haddock:0= >=dev-haskell/hunit-1.2.4.2:0= <dev-haskell/hunit-1.3:0= >=dev-haskell/quickcheck-2.4.2:2= <dev-haskell/quickcheck-2.8.3:2= sys-apps/fakeroot >=net-misc/socat-1.7 dev-util/shelltestrunner )
+DESCRIPTION=Ganeti is a virtual server management software tool
+EAPI=7
+HOMEPAGE=http://www.ganeti.org/
+IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= <dev-lang/ghc-8.1:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= !<app-emulation/ganeti-instance-image-0.6-r1 >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-1.0.1.0:0= <dev-haskell/monad-control-1.0.2:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-1.0.1:0= <dev-haskell/snap-core-1.1:0= >=dev-haskell/snap-server-1.0.1:0= <dev-haskell/snap-server-1.1:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
+REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://downloads.ganeti.org/releases/2.15/ganeti-2.15.2.tar.gz mirror://debian/pool/main/g/ganeti-2.15/ganeti-2.15_2.15.2-11.debian.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=95ff721288cc7a4304eb90b159cc8158
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1 b/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
index 6e71911a22f0..595728967331 100644
--- a/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
+++ b/metadata/md5-cache/app-emulation/ganeti-2.16.0_rc1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= <dev-haskell/test-framework-0.9:0= >=dev-haskell/test-framework-hunit-0.2.7:0= <dev-haskell/test-framework-hunit-0.4:0= >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= <dev-haskell/test-framework-quickcheck2-0.4:0= test? ( dev-python/mock dev-python/pyyaml dev-haskell/haddock:0= >=dev-haskell/hunit-1.2.4.2:0= <dev-haskell/hunit-1.3:0= >=dev-haskell/quickcheck-2.4.2:2= <dev-haskell/quickcheck-2.8.3:2= sys-apps/fakeroot >=net-misc/socat-1.7 dev-util/shelltestrunner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= <dev-haskell/test-framework-0.9:0= >=dev-haskell/test-framework-hunit-0.2.7:0= <dev-haskell/test-framework-hunit-0.4:0= >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= <dev-haskell/test-framework-quickcheck2-0.4:0= test? ( dev-python/mock dev-python/pyyaml dev-haskell/haddock:0= >=dev-haskell/hunit-1.2.4.2:0= <dev-haskell/hunit-1.3:0= >=dev-haskell/quickcheck-2.4.2:2= <dev-haskell/quickcheck-2.8.3:2= sys-apps/fakeroot >=net-misc/socat-1.7 dev-util/shelltestrunner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Ganeti is a virtual server management software tool
 EAPI=6
 HOMEPAGE=http://www.ganeti.org/
-IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_targets_python2_7 +python_single_target_python2_7
+IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
-REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
+REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://downloads.ganeti.org/releases/2.16/ganeti-2.16.0~rc1.tar.gz mirror://debian/pool/main/g/ganeti/ganeti_2.16.0~rc1-1.debian.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6261211afc9c552758b32adc0094d70c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=27bb01e69dcc714e5a80a4ed5adb9c1f
diff --git a/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1 b/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
index e47a8bf5fdbd..9d1cff2456fe 100644
--- a/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
+++ b/metadata/md5-cache/app-emulation/ganeti-2.17.0_beta1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc <=dev-python/sphinx-1.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= <dev-haskell/test-framework-0.9:0= >=dev-haskell/test-framework-hunit-0.2.7:0= <dev-haskell/test-framework-hunit-0.4:0= >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= <dev-haskell/test-framework-quickcheck2-0.4:0= test? ( dev-python/mock dev-python/pyyaml dev-haskell/haddock:0= >=dev-haskell/hunit-1.2.4.2:0= <dev-haskell/hunit-1.3:0= >=dev-haskell/quickcheck-2.4.2:2= <dev-haskell/quickcheck-2.8.3:2= sys-apps/fakeroot >=net-misc/socat-1.7 dev-util/shelltestrunner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/m4 app-text/pandoc python_single_target_python2_7? ( <=dev-python/sphinx-1.3.5[python_targets_python2_7(-)] ) media-fonts/urw-fonts media-gfx/graphviz >=dev-haskell/test-framework-0.6:0= <dev-haskell/test-framework-0.9:0= >=dev-haskell/test-framework-hunit-0.2.7:0= <dev-haskell/test-framework-hunit-0.4:0= >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= <dev-haskell/test-framework-quickcheck2-0.4:0= test? ( dev-python/mock dev-python/pyyaml dev-haskell/haddock:0= >=dev-haskell/hunit-1.2.4.2:0= <dev-haskell/hunit-1.3:0= >=dev-haskell/quickcheck-2.4.2:2= <dev-haskell/quickcheck-2.8.3:2= sys-apps/fakeroot >=net-misc/socat-1.7 dev-util/shelltestrunner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Ganeti is a virtual server management software tool
 EAPI=6
 HOMEPAGE=http://www.ganeti.org/
-IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_targets_python2_7 +python_single_target_python2_7
+IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
-REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=dev-libs/openssl:0 python_single_target_python2_7? ( dev-python/paramiko[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)] dev-python/pyinotify[python_targets_python2_7(-)] dev-python/pycurl[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/bitarray[python_targets_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)] dev-python/fdsend[python_targets_python2_7(-)] ) || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 sys-fs/lvm2 >=sys-apps/baselayout-2.0 dev-lang/ghc:0= dev-haskell/cabal:0= dev-haskell/cabal-install:0= >=dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= <dev-haskell/attoparsec-0.14:0 >=dev-haskell/base64-bytestring-1.0.0.1:0= <dev-haskell/base64-bytestring-1.1:0= >=dev-haskell/crypto-4.2.4:0= <dev-haskell/crypto-4.3:0= >=dev-haskell/curl-1.3.7:0= <dev-haskell/curl-1.4:0= >=dev-haskell/hinotify-0.3.2:0= <dev-haskell/hinotify-0.4:0= >=dev-haskell/hslogger-1.1.4:0= <dev-haskell/hslogger-1.3:0= >=dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= <dev-haskell/lifted-base-0.3:0= >=dev-haskell/monad-control-0.3.1.3:0= <dev-haskell/monad-control-1.1:0= >=dev-haskell/network-2.3.0.13:0= <dev-haskell/network-2.7:0= >=dev-haskell/parallel-3.2.0.2:3= <dev-haskell/parallel-3.3:3= >=dev-haskell/temporary-1.1.2.3:0= <dev-haskell/temporary-1.3:0= >=dev-haskell/regex-pcre-0.94.2:0= <dev-haskell/regex-pcre-0.95:0= >=dev-haskell/transformers-base-0.4.1:0= <dev-haskell/transformers-base-0.5:0= >=dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= <dev-haskell/zlib-0.7:0= >=dev-haskell/psqueue-1.1:0= <dev-haskell/psqueue-1.2:0= >=dev-haskell/snap-core-0.8.1:0= <dev-haskell/snap-core-0.10:0= >=dev-haskell/snap-server-0.8.1:0= <dev-haskell/snap-server-0.10:0= >=dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !app-emulation/ganeti-htools
+REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) ^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://downloads.ganeti.org/releases/2.17/ganeti-2.17.0~beta1.tar.gz mirror://debian/pool/main/g/ganeti/ganeti_2.16.0~rc1-1.debian.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2a9f91acc9eec847d6857cad73920241
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ae7e0c34181156086b103db90e8f02d8
diff --git a/metadata/md5-cache/app-emulation/glean-1.10.3 b/metadata/md5-cache/app-emulation/glean-1.10.3
index bd653baad737..5441cdd334e6 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glean/glean-1.10.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80539b48bbc47c53591bd75a9303a88b
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.13 b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
index 2036463ebfb8..344e8af45d0b 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.13
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=6
 HOMEPAGE=http://libguestfs.org/
-IUSE=bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=app-shells/bash-completion-2.0 >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.13.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5ff9f99963dc52facf6a94d392d9f4cc
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=4554d646b3881fa1facdabedcd16efa8
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.36.15 b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
index 311f7ba0d248..b99a7b9abc02 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.36.15
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.36.15
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=6
 HOMEPAGE=http://libguestfs.org/
-IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.02[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1.36
 SRC_URI=http://libguestfs.org/download/1.36-stable/libguestfs-1.36.15.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a80aac63cd1194d572996fdf4c23519
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8eded60c8e67ad42c3e2d68fea1beef4
diff --git a/metadata/md5-cache/app-emulation/libguestfs-1.38.6 b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
index a1351c6e422e..276940c49427 100644
--- a/metadata/md5-cache/app-emulation/libguestfs-1.38.6
+++ b/metadata/md5-cache/app-emulation/libguestfs-1.38.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt dev-util/gperf >=dev-lang/ocaml-4.03[ocamlopt] dev-ml/findlib[ocamlopt] dev-ml/ocaml-gettext >=dev-ml/ounit-2 doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 accessing, inspect and modifying virtual machine (VM) disk images
 EAPI=6
 HOMEPAGE=http://libguestfs.org/
-IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test kernel_linux +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=sys-libs/ncurses:0= sys-devel/gettext >=app-misc/hivex-1.3.1 dev-libs/libpcre:3 app-arch/cpio dev-lang/perl:= virtual/cdrtools >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= >=sys-libs/db-4.6:* app-arch/xz-utils app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) fuse? ( sys-fs/fuse:= ) introspection? ( >=dev-libs/glib-2.26:2 >=dev-libs/gobject-introspection-1.30.0:= ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm media-gfx/icoutils ) virtual/acl sys-libs/libcap lua? ( dev-lang/lua:* ) >=dev-libs/yajl-2.0.4 gtk? ( sys-apps/dbus x11-libs/gtk+:3 ) net-libs/libtirpc sys-libs/libxcrypt app-emulation/libguestfs-appliance
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/1.38
 SRC_URI=http://libguestfs.org/download/1.38-stable/libguestfs-1.38.6.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81d5822fef61a475b564645e9abbd430
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=29f1ffc32ecea1ca3cd8682cc1b9deb5
diff --git a/metadata/md5-cache/app-emulation/libpod-1.8.0 b/metadata/md5-cache/app-emulation/libpod-1.8.0
new file mode 100644
index 000000000000..5691639254c4
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libpod-1.8.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.12
+DEFINED_PHASES=compile install postinst preinst prepare unpack
+DEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= ) dev-go/go-md2man
+DESCRIPTION=Library and podman tool for running OCI-based containers in Pods
+EAPI=7
+HOMEPAGE=https://github.com/containers/libpod/
+IUSE=apparmor btrfs +rootless selinux
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RDEPEND=app-crypt/gpgme:= >=app-emulation/conmon-2.0.0 || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun ) dev-libs/libassuan:= dev-libs/libgpg-error:= sys-fs/lvm2 sys-libs/libseccomp:= apparmor? ( sys-libs/libapparmor ) btrfs? ( sys-fs/btrfs-progs ) rootless? ( app-emulation/slirp4netns ) selinux? ( sys-libs/libselinux:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/libpod/archive/v1.8.0.tar.gz -> libpod-1.8.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	go-module	c1d483897ed4807f97f20fb3b5a3cb7b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=87c8b4510d157bddc8284f0a017181b3
diff --git a/metadata/md5-cache/app-emulation/libvirt-5.10.0 b/metadata/md5-cache/app-emulation/libvirt-5.10.0
index 52759546c1aa..cedec40a06b8 100644
--- a/metadata/md5-cache/app-emulation/libvirt-5.10.0
+++ b/metadata/md5-cache/app-emulation/libvirt-5.10.0
@@ -12,4 +12,4 @@ REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtua
 SLOT=0/5.10.0
 SRC_URI=https://libvirt.org/sources/libvirt-5.10.0.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2e1d15ac2675836f0f92c6059abeea93
+_md5_=fb7c9a2275c36bbd64e1a63a4ecb58fb
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.0.0 b/metadata/md5-cache/app-emulation/libvirt-6.0.0
deleted file mode 100644
index 9cdd557ce031..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-6.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=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 ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) 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-1.5.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-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=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 ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) 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-1.5.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-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/6.0.0
-SRC_URI=https://libvirt.org/sources/libvirt-6.0.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0589cfd7f98aefb73bcca4dc96f4e026
diff --git a/metadata/md5-cache/app-emulation/libvirt-6.0.0-r1 b/metadata/md5-cache/app-emulation/libvirt-6.0.0-r1
new file mode 100644
index 000000000000..d7628ccdefa7
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libvirt-6.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=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 ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) 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-1.5.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-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig
+DESCRIPTION=C toolkit to manipulate virtual machines
+EAPI=7
+HOMEPAGE=http://www.libvirt.org/
+IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=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 ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) 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-1.5.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-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
+REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
+SLOT=0/6.0.0
+SRC_URI=https://libvirt.org/sources/libvirt-6.0.0.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=70bb067a82fcf08e7f4b7ec3da68141b
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index c1d243553423..377fcb822b8b 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=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 ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) 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-1.5.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-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig
+DEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=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 ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) 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-1.5.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-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=7
 HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
+IUSE=apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev +vepa virtualbox virt-network wireshark-plugins xen zfs kernel_linux
 LICENSE=LGPL-2.1
 PROPERTIES=live
 RDEPEND=acct-user/qemu policykit? ( acct-group/libvirt ) app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=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 ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( >=sys-fs/fuse-2.8.6:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] ) 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-1.5.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-4.6.0 app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs )
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66a4e16688498ec5f50b095300f99b14
+_md5_=6c8fdb5639af1d3ecef5f24211557771
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 735beff20dc2..e2203d186441 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_6 ) )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-2.1.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5c1815d7d709ce040e45f33d97e2b65
diff --git a/metadata/md5-cache/app-emulation/lxd-3.14 b/metadata/md5-cache/app-emulation/lxd-3.14
index f2b3e0537eb1..1da5e3b5e527 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.14
+++ b/metadata/md5-cache/app-emulation/lxd-3.14
@@ -11,5 +11,5 @@ RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.14.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f58e44f69caeee015c3d088c86282165
diff --git a/metadata/md5-cache/app-emulation/lxd-3.16-r1 b/metadata/md5-cache/app-emulation/lxd-3.16-r1
index 80aa88658d60..0fb7ee805b21 100644
--- a/metadata/md5-cache/app-emulation/lxd-3.16-r1
+++ b/metadata/md5-cache/app-emulation/lxd-3.16-r1
@@ -11,5 +11,5 @@ RDEPEND=daemon? ( app-arch/xz-utils >=app-emulation/lxc-2.0.7[seccomp] dev-libs/
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxd/lxd-3.16.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ef69b517faae717d26f714e0f0de375f
diff --git a/metadata/md5-cache/app-emulation/playonlinux-4.2.12 b/metadata/md5-cache/app-emulation/playonlinux-4.2.12
index 6f936f87d34f..fba2e21e78dd 100644
--- a/metadata/md5-cache/app-emulation/playonlinux-4.2.12
+++ b/metadata/md5-cache/app-emulation/playonlinux-4.2.12
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst postrm preinst prepare prerm setup
 DESCRIPTION=Set of scripts to easily install and use Windows games and software
 EAPI=6
 HOMEPAGE=https://playonlinux.com/
-IUSE=winbind +python_targets_python2_7 +python_single_target_python2_7
+IUSE=winbind +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/cabextract app-arch/p7zip app-arch/unzip app-crypt/gnupg virtual/wine dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-misc/wget x11-apps/mesa-progs x11-terms/xterm media-gfx/icoutils net-analyzer/netcat virtual/imagemagick-tools winbind? ( net-fs/samba[winbind] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/cabextract app-arch/p7zip app-arch/unzip app-crypt/gnupg virtual/wine python_single_target_python2_7? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] ) net-misc/wget x11-apps/mesa-progs x11-terms/xterm media-gfx/icoutils net-analyzer/netcat virtual/imagemagick-tools winbind? ( net-fs/samba[winbind] )
+REQUIRED_USE=^^ ( python_single_target_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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8640293abef6e3b66431b31e2c1134c3
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a57289d7c013a127e0e75334ce517f28
diff --git a/metadata/md5-cache/app-emulation/playonlinux-4.3.4 b/metadata/md5-cache/app-emulation/playonlinux-4.3.4
deleted file mode 100644
index 8ab25221a558..000000000000
--- a/metadata/md5-cache/app-emulation/playonlinux-4.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare prerm setup
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Set of scripts to easily install and use Windows games and software
-EAPI=7
-HOMEPAGE=https://playonlinux.com/
-IUSE=winbind +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/cabextract app-arch/p7zip app-arch/unzip app-crypt/gnupg app-misc/jq dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-gfx/icoutils || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) net-misc/wget virtual/imagemagick-tools virtual/wine winbind? ( net-fs/samba[winbind] ) x11-apps/mesa-progs x11-terms/xterm
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.playonlinux.com/script_files/PlayOnLinux/4.3.4/PlayOnLinux_4.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4558807bc72a55ae331731194427ac7e
diff --git a/metadata/md5-cache/app-emulation/playonlinux-4.3.4-r1 b/metadata/md5-cache/app-emulation/playonlinux-4.3.4-r1
new file mode 100644
index 000000000000..2355203b961e
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/playonlinux-4.3.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare prerm setup
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Set of scripts to easily install and use Windows games and software
+EAPI=7
+HOMEPAGE=https://playonlinux.com/
+IUSE=winbind +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/cabextract app-arch/p7zip app-arch/unzip app-crypt/gnupg app-misc/jq python_single_target_python2_7? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] ) media-gfx/icoutils || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) net-misc/wget virtual/imagemagick-tools virtual/wine winbind? ( net-fs/samba[winbind] ) x11-apps/mesa-progs x11-terms/xterm
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://www.playonlinux.com/script_files/PlayOnLinux/4.3.4/PlayOnLinux_4.3.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4604414115794ba02e25367ef2094166
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.3.1 b/metadata/md5-cache/app-emulation/protontricks-1.3.1
deleted file mode 100644
index bfd808fa16ec..000000000000
--- a/metadata/md5-cache/app-emulation/protontricks-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-emulation/winetricks dev-python/vdf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DESCRIPTION=app-emulation/winetricks wrapper for Proton (Steam Play) games
-EAPI=7
-HOMEPAGE=https://github.com/Matoking/protontricks
-IUSE=+gui test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-emulation/winetricks dev-python/vdf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://codeload.github.com/Matoking/protontricks/tar.gz/1.3.1 -> protontricks-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4ad8f418eeb143a9ea0ef6c792153ef1
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.3.1-r1 b/metadata/md5-cache/app-emulation/protontricks-1.3.1-r1
new file mode 100644
index 000000000000..afd5147ff510
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/protontricks-1.3.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-emulation/winetricks python_single_target_python3_6? ( dev-python/vdf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_python3_6? ( dev-python/pytest[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DESCRIPTION=app-emulation/winetricks wrapper for Proton (Steam Play) games
+EAPI=7
+HOMEPAGE=https://github.com/Matoking/protontricks
+IUSE=+gui test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-emulation/winetricks python_single_target_python3_6? ( dev-python/vdf[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/vdf[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/vdf[python_targets_python3_8(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://codeload.github.com/Matoking/protontricks/tar.gz/1.3.1 -> protontricks-1.3.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=50d235c26093493d88dd7b1d855be11d
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index e1093e063312..7b5e4584e8c5 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f08d95c11202f8e71971779aa3c8937d
+_md5_=3ed18741a7b37f1f3482e007361defc0
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
index 60f5162c15d1..ae99d0125bec 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup
-DEPEND=dev-libs/glib || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=dev-libs/glib || ( dev-lang/python:3.6 )
 DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
 EAPI=7
 HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-3.1.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=83530982d80a2e47db9598e6a63cd830
+_md5_=36e6da9820e41a9d996d77cd5fcb3d53
diff --git a/metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0 b/metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0
index 447e7e1dbccc..f653e5806cdd 100644
--- a/metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup
-DEPEND=dev-libs/glib || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=dev-libs/glib || ( dev-lang/python:3.6 )
 DESCRIPTION=QEMU Guest Agent (qemu-ga) for use when running inside a VM
 EAPI=7
 HOMEPAGE=https://wiki.qemu.org/Features/GuestAgent
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib
 SLOT=0
 SRC_URI=http://wiki.qemu.org/download/qemu-4.0.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=83530982d80a2e47db9598e6a63cd830
+_md5_=36e6da9820e41a9d996d77cd5fcb3d53
diff --git a/metadata/md5-cache/app-emulation/reg-0.16.1 b/metadata/md5-cache/app-emulation/reg-0.16.1
index 63873470c0e0..ae4ed0230c9c 100644
--- a/metadata/md5-cache/app-emulation/reg-0.16.1
+++ b/metadata/md5-cache/app-emulation/reg-0.16.1
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/genuinetools/reg/archive/4203e559f331009df04a3ca47820989c6c43e138.tar.gz -> reg-0.16.1.tar.gz https://github.com/go-yaml/yaml/archive/eb3733d160e7.tar.gz -> github.com-go-yaml-yaml-eb3733d160e7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=32266a17cddff6b8c39c072dc888079a
diff --git a/metadata/md5-cache/app-emulation/runc-1.0.0_rc10 b/metadata/md5-cache/app-emulation/runc-1.0.0_rc10
new file mode 100644
index 000000000000..9deeb0cd3c79
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/runc-1.0.0_rc10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.10
+DESCRIPTION=runc container cli tools
+EAPI=6
+HOMEPAGE=http://runc.io
+IUSE=+ambient apparmor hardened +kmem +seccomp kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/opencontainers/runc/archive/dc9208a3303feef5b3839f4323d9beb36df0a9dd.tar.gz -> runc-1.0.0_rc10.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0c5b1a53a22aac6205af1d748f72603d
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.0 b/metadata/md5-cache/app-emulation/sen-0.6.0
index d17cd84b8b09..a79ce3155c4b 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.0
+++ b/metadata/md5-cache/app-emulation/sen-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sen/sen-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2988ff6730316abb6c597a1c1423ff7
diff --git a/metadata/md5-cache/app-emulation/sen-0.6.1 b/metadata/md5-cache/app-emulation/sen-0.6.1
index 72dd492fa7ea..49836df0bf11 100644
--- a/metadata/md5-cache/app-emulation/sen-0.6.1
+++ b/metadata/md5-cache/app-emulation/sen-0.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sen/sen-0.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fd2cbe3402ae678faa48f353fea72f53
diff --git a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012 b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012
index 6d048b0d91c6..5ed36ee42c4d 100644
--- a/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012
+++ b/metadata/md5-cache/app-emulation/simplevirt-0.0_p20181012
@@ -9,5 +9,5 @@ RDEPEND=virtual/logger app-emulation/qemu
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/rafaelmartins/simplevirt/archive/78d29d8fa11ce72af5f897430af7bb7d2947a32f.tar.gz -> simplevirt-0.0_p20181012.tar.gz https://github.com/inconshreveable/mousetrap/archive/v1.0.0.tar.gz -> github.com-inconshreveable-mousetrap-v1.0.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.3.tar.gz -> github.com-spf13-cobra-v0.0.3.tar.gz https://github.com/spf13/pflag/archive/v1.0.2.tar.gz -> github.com-spf13-pflag-v1.0.2.tar.gz https://github.com/go-check/check/archive/20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz -> github.com-go-check-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.1.tar.gz -> github.com-go-yaml-yaml-v2.2.1.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5037b5d144669ca9a4337508148fe323
diff --git a/metadata/md5-cache/app-emulation/skopeo-0.1.41 b/metadata/md5-cache/app-emulation/skopeo-0.1.41
new file mode 100644
index 000000000000..1adcc2e2cbba
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/skopeo-0.1.41
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= >=sys-fs/btrfs-progs-4.0.1 >=sys-fs/lvm2-2.02.145:= dev-go/go-md2man
+DESCRIPTION=Command line utility foroperations on container images and image repositories
+EAPI=7
+HOMEPAGE=https://github.com/containers/skopeo
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
+RDEPEND=>=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= >=sys-fs/btrfs-progs-4.0.1 >=sys-fs/lvm2-2.02.145:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/skopeo/archive/v0.1.41.tar.gz -> skopeo-0.1.41.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	go-module	c1d483897ed4807f97f20fb3b5a3cb7b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0b2d22acb4beee5267650039d94fd0f8
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.4.3 b/metadata/md5-cache/app-emulation/slirp4netns-0.4.3
new file mode 100644
index 000000000000..ec5eb43e82a8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/slirp4netns-0.4.3
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=postinst prepare
+DEPEND=dev-libs/glib:2= dev-libs/libpcre:= sys-libs/libseccomp:= sys-libs/libcap:= virtual/pkgconfig
+DESCRIPTION=User-mode networking for unprivileged network namespaces
+EAPI=7
+HOMEPAGE=https://github.com/rootless-containers/slirp4netns
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= dev-libs/libpcre:= sys-libs/libseccomp:= sys-libs/libcap:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.4.3.tar.gz -> slirp4netns-0.4.3.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e87b3fcee5982efcdc81f0bf8bcf71ac
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 c8e358219cb1..b78f974593cd 100644
--- a/metadata/md5-cache/app-emulation/spice-0.14.0-r2
+++ b/metadata/md5-cache/app-emulation/spice-0.14.0-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=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 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) >=app-emulation/spice-protocol-0.12.13 virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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-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 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) >=app-emulation/spice-protocol-0.12.13 virtual/pkgconfig || ( ( dev-lang/python:3.7 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pyparsing-1.5.6-r2[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) smartcard? ( app-emulation/qemu[smartcard] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=SPICE server
 EAPI=6
 HOMEPAGE=https://www.spice-space.org/
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/orc[static-libs(+)?] >=dev-libs/glib-2.22:2[static-libs(+)?] me
 SLOT=0
 SRC_URI=https://www.spice-space.org/download/releases/spice-0.14.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13b5c252eebc0e628abc5e3e726160c1
+_md5_=823138bb21ff395f7f6a0f31b01c2246
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.0.0 b/metadata/md5-cache/app-emulation/virt-manager-2.0.0
index 38b50fdc82c9..994aa1d0cd11 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-2.0.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-2.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/argcomplete[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/argcomplete[python_targets_python3_6(-)] dev-python/ipaddr[python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/argcomplete[python_targets_python3_7(-)] dev-python/ipaddr[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=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] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
 DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org
-IUSE=gnome-keyring gtk policykit sasl python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=gnome-keyring gtk policykit sasl python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/argcomplete[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/argcomplete[python_targets_python3_6(-)] dev-python/ipaddr[python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/argcomplete[python_targets_python3_7(-)] dev-python/ipaddr[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=870fe2622947348e2a120ab34f58d5e5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3cc3598131741ca07dd16aa42b9ff533
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.2.0 b/metadata/md5-cache/app-emulation/virt-manager-2.2.0
index 0b034e7b8fd4..3dd5d33ba89b 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-2.2.0
+++ b/metadata/md5-cache/app-emulation/virt-manager-2.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/argcomplete[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/argcomplete[python_targets_python3_6(-)] dev-python/ipaddr[python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/argcomplete[python_targets_python3_7(-)] dev-python/ipaddr[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
 DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org
-IUSE=gnome-keyring gtk policykit sasl python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=gnome-keyring gtk policykit sasl python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/argcomplete[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/argcomplete[python_targets_python3_6(-)] dev-python/ipaddr[python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/argcomplete[python_targets_python3_7(-)] dev-python/ipaddr[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6064d7455c0b7064900d2441249248e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1cb68d38c491cc7ac053548330f241b
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.2.1 b/metadata/md5-cache/app-emulation/virt-manager-2.2.1
deleted file mode 100644
index 8cf7fadb4fc0..000000000000
--- a/metadata/md5-cache/app-emulation/virt-manager-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=A graphical tool for administering virtual machines
-EAPI=6
-HOMEPAGE=http://virt-manager.org
-IUSE=gnome-keyring gtk policykit sasl python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7e87a1854db891159d6cb4d018483fc
diff --git a/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r1 b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r1
new file mode 100644
index 000000000000..777bba4b57de
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/virt-manager-2.2.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/ipaddr[python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/ipaddr[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DESCRIPTION=A graphical tool for administering virtual machines
+EAPI=6
+HOMEPAGE=http://virt-manager.org
+IUSE=gnome-keyring gtk policykit sasl python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/ipaddr[python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/ipaddr[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=http://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c5e488b2bf0c9da74292b49d5bece6dc
diff --git a/metadata/md5-cache/app-emulation/virt-manager-9999 b/metadata/md5-cache/app-emulation/virt-manager-9999
index 899b9ab4fa7d..64cfaa5e534a 100644
--- a/metadata/md5-cache/app-emulation/virt-manager-9999
+++ b/metadata/md5-cache/app-emulation/virt-manager-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/argcomplete[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/argcomplete[python_targets_python3_6(-)] dev-python/ipaddr[python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/argcomplete[python_targets_python3_7(-)] dev-python/ipaddr[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) dev-lang/perl dev-util/intltool >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A graphical tool for administering virtual machines
 EAPI=6
 HOMEPAGE=http://virt-manager.org
-IUSE=gnome-keyring gtk policykit sasl python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=gnome-keyring gtk policykit sasl python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/argcomplete[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/ipaddr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+RDEPEND=!app-emulation/virtinst python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-cdr/cdrtools >=app-emulation/libvirt-glib-1.0.0[introspection] python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] dev-python/argcomplete[python_targets_python3_6(-)] dev-python/ipaddr[python_targets_python3_6(-)] dev-python/libvirt-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] dev-python/argcomplete[python_targets_python3_7(-)] dev-python/ipaddr[python_targets_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=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/gtksourceview:4[introspection] x11-libs/vte:2.91[introspection] gnome-keyring? ( gnome-base/libgnome-keyring ) policykit? ( sys-auth/polkit[introspection] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8ea83a987cc7d33b99db12e73f440fd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b480baf9dffe6222ea27fefac38ee80
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.32 b/metadata/md5-cache/app-emulation/virtualbox-5.2.32
index 78ba6a2743ef..cda3bd5a45db 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.32
@@ -3,12 +3,12 @@ DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.32 de
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.32 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.32/VirtualBox-5.2.32.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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e88959ac17eb8583f3109c0624dcfca6
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.34 b/metadata/md5-cache/app-emulation/virtualbox-5.2.34
index 0f2144e4176e..56960c61dd68 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.34
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.34
@@ -3,12 +3,12 @@ DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.34 de
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.34 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= media-libs/opus sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.34/VirtualBox-5.2.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.34-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e6ac80f42350c38b23b43486ea86f4d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-5.2.36 b/metadata/md5-cache/app-emulation/virtualbox-5.2.36
index a3f2d5aecb1a..a2739d4cb0a1 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-5.2.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-5.2.36
@@ -3,12 +3,12 @@ DEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.36 de
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=6
 HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-5.2.36 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= media-libs/opus sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.36/VirtualBox-5.2.36.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.36-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ea9e6a0e0db9fa8b39e3442599e3c29
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.14 b/metadata/md5-cache/app-emulation/virtualbox-6.0.14
index c174d9a577f4..e92421525e13 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.14
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.14
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.14 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_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 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.14/VirtualBox-6.0.14.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.14-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05bf04d4bded0090a361da32699f14b0
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.0.16 b/metadata/md5-cache/app-emulation/virtualbox-6.0.16
index a3ac48f05332..1a21ab0d311c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.0.16
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.0.16
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.0.16 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.16/VirtualBox-6.0.16.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.16-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a5efe7a43842d360402c2d0875587ef
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.0 b/metadata/md5-cache/app-emulation/virtualbox-6.1.0
index bf705018330d..d0a0428ec260 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.0
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.0
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.1.0 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.0/VirtualBox-6.1.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.0_rc1-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ef8fe659daf3cb83910f3eb49fc93e1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-6.1.2 b/metadata/md5-cache/app-emulation/virtualbox-6.1.2
index d2c96f9c2fbd..987e9f221b72 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.2
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Family of powerful x86 virtualization products for enterprise and home use
 EAPI=7
 HOMEPAGE=https://www.virtualbox.org/
-IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc elibc_FreeBSD java kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64
 LICENSE=GPL-2 dtrace? ( CDDL )
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-6.1.2 dev-libs/libIDL >=dev-libs/libxslt-1.1.19 net-misc/curl dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcursor x11-libs/libXext x11-libs/libXmu x11-libs/libXt opengl? ( virtual/opengl media-libs/freeglut ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 opengl? ( dev-qt/qtopengl:5 ) x11-libs/libXinerama ) ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
-REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.2/VirtualBox-6.1.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.0_rc1-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ef8fe659daf3cb83910f3eb49fc93e1
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.32 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.32
index fe4f75b1472b..dead2af44d89 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.32
@@ -11,5 +11,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 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.32/VirtualBox-5.2.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=de779df7cbcf477d1dc2c90e9f6eabf4
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.34 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.34
index 2b74042ade45..f2f46767745d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.34
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.34
@@ -11,5 +11,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 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.34/VirtualBox-5.2.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.34-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cf2b98a812b7490e695f609e8121365d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.36 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.36
index c6d0ec15a72d..39d45736be40 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-5.2.36
@@ -11,5 +11,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 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/5.2.36/VirtualBox-5.2.36.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.36-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6685c4154368c619db185507924b7e28
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.14 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.14
index f9085f746008..e6a21d1a58f0 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.14
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.14
@@ -11,5 +11,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 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.14/VirtualBox-6.0.14.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1429563a026517e700672975e90cbc5c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.16 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.16
index aea1f191828d..9716e98dede8 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.16
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.0.16
@@ -11,5 +11,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 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.0.16/VirtualBox-6.0.16.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.16-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f0e21b5c7ee0fd205ed211c0e6e36afc
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.0 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.0
index 1eb33a6e9556..c668d21d20c9 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.0
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.0
@@ -11,5 +11,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 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.0/VirtualBox-6.1.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.0_beta2-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1429563a026517e700672975e90cbc5c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.2 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.2
index bea772226b86..ea4b2431cc68 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.2
@@ -11,5 +11,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 kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.2/VirtualBox-6.1.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.0_rc1-patches-01.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=18048ac8074567e2a44a1aeb0dc24914
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.32 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.32
index 25ef2e73041a..40bd16054296 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.32
@@ -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.32.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0a08d2e52c6d76f54f463853dbd06338
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.34 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.34
index 8f2f9ee95992..bd59323a527c 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.34
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.34
@@ -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.34.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c210b247d11681c3ac34a330572aa81d
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.36 b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.36
index 3fd0f764cd33..c920cc954779 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.36
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-5.2.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.2.36.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b843a51cbdbe3481d1ef2673b30cf7ba
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.14 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.14
index ee27588bc229..aece5db533f5 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.14
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.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-6.0.14.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=659420ed2c93b176afc4cde8854d6492
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.16 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.16
index 5901eda898f1..aefde1482dfe 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.16
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.0.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-6.0.16.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=715b72edd3de0f5845e62bdb91dfed1c
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.0 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.0
index 01ca586b8712..81eb57a7b76d 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.0
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.0
@@ -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-6.1.0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=79ec258e10841ce065f6aa6a74f76075
diff --git a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.2 b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.2
index 4c9209c1ba6b..6aff19f3f489 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.2
+++ b/metadata/md5-cache/app-emulation/virtualbox-modules-6.1.2
@@ -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-6.1.2.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=19b548dc52290edf7865dcdd5c7ee1d0
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 565eda21b826..2de369fcb94d 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	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 5846886beba2..1199ad30134f 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	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 30ced785ecb6..ed235321355e 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=61158e01a8f3e256b1f3fc30744443e8
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.11.3 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.11.3
index a1a019cda596..de7e4ad43c6b 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.11.3
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.11.3
@@ -3,12 +3,12 @@ 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 +python_single_target_python2_7
+IUSE=custom-cflags +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-emulation/xen-tools-4.11.3
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.11.3/xen-4.11.3.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 https://dev.gentoo.org/~dlan/distfiles/xen-4.11.3-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.11.3-upstream-patches-0.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4b6803d57c97895b83d81689e9a2b3e6
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.12.1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.12.1
index 558343782ed6..75b50c59134f 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.12.1
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.12.1
@@ -3,12 +3,12 @@ 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=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-emulation/xen-tools-4.12.1
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.12.1/xen-4.12.1.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	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1a174c6ab6d02b1efe3565ca8d8025ec
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.0 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.0
index 36b610ef74ab..4bb599027b98 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.0
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.13.0
@@ -3,12 +3,12 @@ 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=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-emulation/xen-tools-4.13.0
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.13.0/xen-4.13.0.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	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ce65680da8069688330e1f6929da40a9
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.11.3 b/metadata/md5-cache/app-emulation/xen-tools-4.11.3
deleted file mode 100644
index 67374c66192e..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.11.3
+++ /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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] x86? ( sys-devel/dev86 sys-firmware/ipxe[qemu] sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 sys-devel/dev86 sys-firmware/ipxe[qemu] sys-power/iasl system-seabios? ( sys-firmware/seabios ) ) 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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios +python_targets_python2_7 +python_single_target_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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ovmf? ( hvm ) pygrub? ( python ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.11
-SRC_URI=https://downloads.xenproject.org/release/xen/4.11.3/xen-4.11.3.tar.gz https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-1.11.1.tar.gz ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.11.3-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.11.3-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-19.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-19.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d7f30aa49790586bc3d3d63682079e2c
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.11.3-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.11.3-r1
new file mode 100644
index 000000000000..43234db27815
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.11.3-r1
@@ -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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=sys-kernel/linux-headers-4.11 python_single_target_python2_7? ( dev-python/lxml[python_targets_python2_7(-)] pam? ( dev-python/pypam[python_targets_python2_7(-)] ) ) x86? ( sys-devel/dev86 sys-firmware/ipxe[qemu] sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 sys-devel/dev86 sys-firmware/ipxe[qemu] sys-power/iasl system-seabios? ( sys-firmware/seabios ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python2_7? ( dev-python/markdown[python_targets_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=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api debug doc flask +hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios +python_single_target_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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ovmf? ( hvm ) pygrub? ( python ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.11
+SRC_URI=https://downloads.xenproject.org/release/xen/4.11.3/xen-4.11.3.tar.gz https://git.seabios.org/cgit/seabios.git/snapshot/seabios-rel-1.11.1.tar.gz ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.11.3-upstream-patches-0.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.11.3-upstream-patches-0.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-19.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-19.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2b26a49372fd0561af0c410bb5c03cc7
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.12.1-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.12.1-r1
deleted file mode 100644
index ad3d9691387b..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.12.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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) 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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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=7
-HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios +python_targets_python2_7 +python_single_target_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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.12
-SRC_URI=https://downloads.xenproject.org/release/xen/4.12.1/xen-4.12.1.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.12.1-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.12.1-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-18.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-18.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d3757ce983b9debb7f7e1ad0ca77001d
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.12.1-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.12.1-r2
new file mode 100644
index 000000000000..c62d072fec4a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.12.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=sys-kernel/linux-headers-4.11 python_single_target_python2_7? ( dev-python/lxml[python_targets_python2_7(-)] pam? ( dev-python/pypam[python_targets_python2_7(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python2_7? ( dev-python/markdown[python_targets_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=7
+HOMEPAGE=https://www.xenproject.org
+IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios +python_single_target_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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.12
+SRC_URI=https://downloads.xenproject.org/release/xen/4.12.1/xen-4.12.1.tar.gz https://www.seabios.org/downloads/seabios-1.12.0.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz -> edk2-ef529e6ab7c31290a33045bb1f1837447cc0eb56.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.12.1-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.12.1-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-18.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-18.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=777b8818d7202a9860e3f9a7d06ffb2b
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.13.0 b/metadata/md5-cache/app-emulation/xen-tools-4.13.0
index db53f6d9db0a..b71b32ba18ba 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.13.0
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.13.0
@@ -1,15 +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_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=sys-kernel/linux-headers-4.11 dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] 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 )
+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_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=sys-kernel/linux-headers-4.11 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] pam? ( dev-python/pypam[python_targets_python3_6(-)] ) ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_6? ( dev-python/markdown[python_targets_python3_6(-)] ) 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=7
 HOMEPAGE=https://www.xenproject.org
-IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios +python_targets_python3_6 +python_single_target_python3_6
+IUSE=api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios +python_single_target_python3_6
 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_single_target_python3_6? ( dev-lang/python:3.6[ncurses,xml,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.13
 SRC_URI=https://downloads.xenproject.org/release/xen/4.13.0/xen-4.13.0.tar.gz https://github.com/qemu/seabios/archive/rel-1.12.1.tar.gz -> seabios-1.12.1.tar.gz ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz -> edk2-20d2e5a125e34fc8501026613a71549b2a1a3e54.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1b.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz ) https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-18.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-gentoo-patches-18.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6ff3dafd5dc3b9b647b8a33e64e9fb97
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7960f34de353e3ec385258e0b0c58f47
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 310dcc2f581b..51246d855d01 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-audicle-1.0.1-r1 b/metadata/md5-cache/app-eselect/eselect-audicle-1.0.1-r1
index 387f09f9f6f6..104213dcd9be 100644
--- a/metadata/md5-cache/app-eselect/eselect-audicle-1.0.1-r1
+++ b/metadata/md5-cache/app-eselect/eselect-audicle-1.0.1-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=Manages the /usr/bin/audicle symlink
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/audicle.eselect-1.0.1.bz2
-_md5_=2b192cbfe2c6335aa24022a5653c8a9b
+_md5_=f8101601f0d6c07af73409c6eea0cb5d
diff --git a/metadata/md5-cache/app-eselect/eselect-awk-0.2 b/metadata/md5-cache/app-eselect/eselect-awk-0.2
index e642a0202af1..db119d6d92b2 100644
--- a/metadata/md5-cache/app-eselect/eselect-awk-0.2
+++ b/metadata/md5-cache/app-eselect/eselect-awk-0.2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages the {,/usr}/bin/awk symlink
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~junghans/distfiles/eselect-awk-0.2.tar.gz
-_md5_=415e3ba53f994a759c33374970e89cdb
+_md5_=dcb6eaba76ec040abaa7c36c54ad9b7f
diff --git a/metadata/md5-cache/app-eselect/eselect-blas-0.1 b/metadata/md5-cache/app-eselect/eselect-blas-0.1
index cb9db1ec54cb..ddf747eeefbd 100644
--- a/metadata/md5-cache/app-eselect/eselect-blas-0.1
+++ b/metadata/md5-cache/app-eselect/eselect-blas-0.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=BLAS module for eselect
 EAPI=6
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=4aeaec1c4341e80ea13de89f1b2a9ad3
+_md5_=ad54ac6c94b0a9104fcdb204e67c22a5
diff --git a/metadata/md5-cache/app-eselect/eselect-blas-0.2 b/metadata/md5-cache/app-eselect/eselect-blas-0.2
index 1b16a18a5be7..8c1e1fa9dd44 100644
--- a/metadata/md5-cache/app-eselect/eselect-blas-0.2
+++ b/metadata/md5-cache/app-eselect/eselect-blas-0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=BLAS/CBLAS module for eselect
 EAPI=7
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=20f068908551a96e88fc2a9d017d2335
+_md5_=2c237d5c585898438baab81f94cb72a2
diff --git a/metadata/md5-cache/app-eselect/eselect-chuck-1.0.2 b/metadata/md5-cache/app-eselect/eselect-chuck-1.0.2
index c47484d28260..c25a56079bf1 100644
--- a/metadata/md5-cache/app-eselect/eselect-chuck-1.0.2
+++ b/metadata/md5-cache/app-eselect/eselect-chuck-1.0.2
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<=media-sound/chuck-1.2.1.2
 DESCRIPTION=Manages the /usr/bin/chuck symlink
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/chuck.eselect-1.0.2.bz2
-_md5_=ab98b93bdbc8aa60525236cd0e5775df
+_md5_=583a60c08e3f79987df801c7f8776d6d
diff --git a/metadata/md5-cache/app-eselect/eselect-electron-2.1 b/metadata/md5-cache/app-eselect/eselect-electron-2.1
index 19053e9ef114..353af32ea0f1 100644
--- a/metadata/md5-cache/app-eselect/eselect-electron-2.1
+++ b/metadata/md5-cache/app-eselect/eselect-electron-2.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default Electron slot
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://github.com/elprans/eselect-electron/archive/v2.1.tar.gz -> eselect-electron-2.1.tar.gz
-_md5_=f242e27197ade85efd841ce6b2b68ed0
+_md5_=aa215b9dd6fc2934a752d5d015f61643
diff --git a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1 b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
index 1c3d74d29795..37b9f42f3af3 100644
--- a/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
+++ b/metadata/md5-cache/app-eselect/eselect-fontconfig-1.1-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=An eselect module to manage /etc/fonts/conf.d symlinks
 EAPI=7
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 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=>=app-admin/eselect-1.2.3 >=media-libs/fontconfig-2.4
 SLOT=0
 SRC_URI=mirror://gentoo/fontconfig.eselect-1.1.bz2
-_md5_=d068e6141f3860c3f9681112f4a48344
+_md5_=c76e9cce653200892a1c4e6b3adc6807
diff --git a/metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306 b/metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306
index 2d2ea7e3e531..f1ed04ee36b5 100644
--- a/metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306
+++ b/metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DEPEND=app-admin/eselect >=dev-libs/glib-2.26:2 gnome-base/gsettings-desktop-schemas gnome-base/gnome-shell app-arch/xz-utils
 DESCRIPTION=Manages system defaults for GNOME Shell extensions
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-admin/eselect >=dev-libs/glib-2.26:2 gnome-base/gsettings-desktop-schemas gnome-base/gnome-shell dev-lang/perl dev-perl/JSON
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~leio/distfiles/eselect-gnome-shell-extensions-20180306.tar.xz
-_md5_=d0185b16970447b14c967db09b454ec1
+_md5_=4ba697906c691b77fc8ced864e9007c6
diff --git a/metadata/md5-cache/app-eselect/eselect-lapack-0.2 b/metadata/md5-cache/app-eselect/eselect-lapack-0.2
index 822aa60e711a..0d8dc79125c2 100644
--- a/metadata/md5-cache/app-eselect/eselect-lapack-0.2
+++ b/metadata/md5-cache/app-eselect/eselect-lapack-0.2
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DEPEND=>=app-admin/eselect-1.0.5
 DESCRIPTION=LAPACK module for eselect
 EAPI=7
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.5
 SLOT=0
-_md5_=9526e238dd500d2feca58300cf34b6ea
+_md5_=b854e2d203605cae776488382212122d
diff --git a/metadata/md5-cache/app-eselect/eselect-lua-1 b/metadata/md5-cache/app-eselect/eselect-lua-1
index a63c8f151931..76946962567f 100644
--- a/metadata/md5-cache/app-eselect/eselect-lua-1
+++ b/metadata/md5-cache/app-eselect/eselect-lua-1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DEPEND=>=app-admin/eselect-1.2.4
 DESCRIPTION=Lua eselect module
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.4
 SLOT=0
-_md5_=fb127aa6084f81696bbfed772518cc02
+_md5_=cd08bb43688a32fc24a864e2e8c9e491
diff --git a/metadata/md5-cache/app-eselect/eselect-miniaudicle-1.0.1-r2 b/metadata/md5-cache/app-eselect/eselect-miniaudicle-1.0.1-r2
index 754af6d7a1ac..3b2587839c59 100644
--- a/metadata/md5-cache/app-eselect/eselect-miniaudicle-1.0.1-r2
+++ b/metadata/md5-cache/app-eselect/eselect-miniaudicle-1.0.1-r2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=Manages the /usr/bin/miniAudicle symlink
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/miniaudicle.eselect-1.0.1.bz2
-_md5_=b03d6268e4ab222ced9c98419873175e
+_md5_=f1dabda6064818e330911a625ecf8d38
diff --git a/metadata/md5-cache/app-eselect/eselect-oodict-20100228 b/metadata/md5-cache/app-eselect/eselect-oodict-20100228
index be307b7a0110..11e88273c736 100644
--- a/metadata/md5-cache/app-eselect/eselect-oodict-20100228
+++ b/metadata/md5-cache/app-eselect/eselect-oodict-20100228
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages configuration of dictionaries for OpenOffice.Org
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2
 SLOT=0
 SRC_URI=mirror://gentoo/oodict.eselect-20100228.bz2
-_md5_=df4d0f81098b2d967e9408ff2ad694ea
+_md5_=22378a7ff7ca9c9a3f8ed2cb18b4fac1
diff --git a/metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4 b/metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4
index a11bebb4c0c1..d541a2c59e41 100644
--- a/metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4
+++ b/metadata/md5-cache/app-eselect/eselect-opencl-1.1.0-r4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst
 DEPEND=app-arch/unzip app-arch/xz-utils
 DESCRIPTION=Utility to change the OpenCL implementation being used
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.4
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~xarthisius/distfiles/eselect-opencl-1.1.0-r1.tar.xz https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl10.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl11.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl12.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl20.zip https://github.com/KhronosGroup/OpenCL-Headers/archive/opencl21.zip http://packages.gentooexperimental.org/opencl-cpp-headers.tar
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e76a027576c85d06d7c75556a9d6a5d5
+_md5_=4f164e330ae5e2d4e467963ef03b5a25
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.4 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
index a1b46b7b067a..95c79e546e1c 100644
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.4
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Utility to select the default PostgreSQL slot
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=!<dev-db/postgresql-9.6.2-r1:9.6 !<dev-db/postgresql-9.5.6-r1:9.5 !<dev-db/postgresql-9.4.11-r1:9.4 !<dev-db/postgresql-9.3.16-r1:9.3 !<dev-db/postgresql-9.2.20-r1
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~titanofold/eselect-postgresql-2.4.tbz2
-_md5_=78f148bbb5ce9465fb7e9eabc1d05ec3
+_md5_=085b0a080d98bb198767af6993606533
diff --git a/metadata/md5-cache/app-eselect/eselect-repository-7 b/metadata/md5-cache/app-eselect/eselect-repository-7
index 2c1603e499d8..12a4a2611258 100644
--- a/metadata/md5-cache/app-eselect/eselect-repository-7
+++ b/metadata/md5-cache/app-eselect/eselect-repository-7
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install setup
 DESCRIPTION=Manage repos.conf via eselect
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/eselect-repository
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-admin/eselect python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/eselect-repository/archive/v7.tar.gz -> eselect-repository-7.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9118d0840d965c7f345947175edc48ab
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20170723 b/metadata/md5-cache/app-eselect/eselect-ruby-20170723
index 432c8f3f711e..a532663439a6 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20170723
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20170723
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=6
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20170723.xz
-_md5_=4058c16250c55f749efd1748e3c79894
+_md5_=8b8cb9ab130ee7729e7b5b8b1e7d5053
diff --git a/metadata/md5-cache/app-eselect/eselect-ruby-20190121 b/metadata/md5-cache/app-eselect/eselect-ruby-20190121
index 8e2863291ecd..0a050777675b 100644
--- a/metadata/md5-cache/app-eselect/eselect-ruby-20190121
+++ b/metadata/md5-cache/app-eselect/eselect-ruby-20190121
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Ruby versions
 EAPI=6
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-20190121.xz
-_md5_=31002fe708ee8eb6757699f67609a0c8
+_md5_=72fca9457bbfe9971d4cbeab72b6b755
diff --git a/metadata/md5-cache/app-eselect/eselect-scala-0.1.1 b/metadata/md5-cache/app-eselect/eselect-scala-0.1.1
index 6e3df12739fa..b0593cfa5c75 100644
--- a/metadata/md5-cache/app-eselect/eselect-scala-0.1.1
+++ b/metadata/md5-cache/app-eselect/eselect-scala-0.1.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages multiple Scala versions
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.0.2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~gienah/distfiles/eselect-scala-0.1.1.tar.gz
-_md5_=9cdc34d79203043caaff752237d0718b
+_md5_=c32ab7f670b8c1814a74051c3b9d4f1e
diff --git a/metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1 b/metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1
index 2fb6080b4205..0d214f68a487 100644
--- a/metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1
+++ b/metadata/md5-cache/app-eselect/eselect-sndpeek-1.0.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages the /usr/bin/sndpeek symlink
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/sndpeek.eselect-1.0.1.bz2
-_md5_=dd5b523654b959e63069ba4749eeebfd
+_md5_=be11e8840d9243ceaf56d33dbe8cb827
diff --git a/metadata/md5-cache/app-eselect/eselect-timezone-0.2 b/metadata/md5-cache/app-eselect/eselect-timezone-0.2
index 7e8f301a7556..7451669a2649 100644
--- a/metadata/md5-cache/app-eselect/eselect-timezone-0.2
+++ b/metadata/md5-cache/app-eselect/eselect-timezone-0.2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages timezone selection
 EAPI=6
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~junghans/distfiles/eselect-timezone-0.2.tar.xz
-_md5_=001b96314fba4d83a2c93628a4c51f53
+_md5_=aaca20121e1d6ee20a9b5b404db28a3e
diff --git a/metadata/md5-cache/app-eselect/eselect-timidity-20110513 b/metadata/md5-cache/app-eselect/eselect-timidity-20110513
index 221cfa662328..f831ee8b5ec2 100644
--- a/metadata/md5-cache/app-eselect/eselect-timidity-20110513
+++ b/metadata/md5-cache/app-eselect/eselect-timidity-20110513
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages configuration of TiMidity++ patchsets
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=mirror://gentoo/timidity.eselect-20110513.bz2
-_md5_=85b3e1639bf1c2fe7565c01335d80c45
+_md5_=b5e8f2cb08041c0eab5a19299057ca21
diff --git a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9 b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
index 6f2619815265..203f5dedc458 100644
--- a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
+++ b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages the /usr/bin/vi symlink
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 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=>=app-admin/eselect-1.0.6
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-vi-1.1.9.tar.xz
-_md5_=fab8fc927cdefaa9098767368ba82420
+_md5_=727ee3424b8fb8ef8ada2f631d66af48
diff --git a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9-r1 b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9-r1
index 19129c59472f..33f126172e63 100644
--- a/metadata/md5-cache/app-eselect/eselect-vi-1.1.9-r1
+++ b/metadata/md5-cache/app-eselect/eselect-vi-1.1.9-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages the /usr/bin/vi symlink
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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=app-admin/eselect
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-vi-1.1.9.tar.xz
-_md5_=e329ae2884b0b28afdcf0774e07cc634
+_md5_=2e2fb1389b3f6379b59ee3ac088789cb
diff --git a/metadata/md5-cache/app-eselect/eselect-wine-1.2.2 b/metadata/md5-cache/app-eselect/eselect-wine-1.2.2
index 89637a3533eb..4ac20cbd745f 100644
--- a/metadata/md5-cache/app-eselect/eselect-wine-1.2.2
+++ b/metadata/md5-cache/app-eselect/eselect-wine-1.2.2
@@ -7,4 +7,4 @@ LICENSE=GPL-2+
 RDEPEND=app-admin/eselect dev-util/desktop-file-utils !!app-emulation/wine:0
 SLOT=0
 SRC_URI=https://bitbucket.org/NP-Hardass/eselect-wine/raw/v1.2.2/wine.eselect -> wine.eselect-1.2.2
-_md5_=566b9ef120e5a90b77ea3f87082b5901
+_md5_=56c2f7044145115874b7b52c971a6785
diff --git a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423 b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
index 1ca5d110bad1..20aab412ad82 100644
--- a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
+++ b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20140423
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Eselect module and wrappers for wxWidgets
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~junghans/dist/eselect-wxwidgets-20140423.tar.xz https://dev.gentoo.org/~mgorny/dist/eselect-wxwidgets-files.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=34e90bce9a0657ce1f6f158bb5d97d6f
+_md5_=1f8865bdc30a3f4e17c2a156d7c87624
diff --git a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529 b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
index 0e29dfe61c50..f4a98b5c6aac 100644
--- a/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
+++ b/metadata/md5-cache/app-eselect/eselect-wxwidgets-20180529
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Eselect module and wrappers for wxWidgets
 EAPI=7
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.4.13
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/eselect-wxwidgets-20180529.tar.xz https://dev.gentoo.org/~mgorny/dist/eselect-wxwidgets-files.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d09644a877cf3d4cacd01c53992b85a0
+_md5_=782d22f598a385c5902c55d40a6d044b
diff --git a/metadata/md5-cache/app-eselect/eselect-xvmc-0.4 b/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
index 562080068e1c..4bed51a8a623 100644
--- a/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
+++ b/metadata/md5-cache/app-eselect/eselect-xvmc-0.4
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manages XvMC implementations
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-admin/eselect
 SLOT=0
-_md5_=020899971e8a0ba8946ea6f73ecae613
+_md5_=d0ce6480a253704311ea5ed600ef95f9
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index c3e53f4fccb9..6ba06cd2186f 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/afflib-3.7.18 b/metadata/md5-cache/app-forensics/afflib-3.7.18
index ec6e13386cf3..fad005c4a09b 100644
--- a/metadata/md5-cache/app-forensics/afflib-3.7.18
+++ b/metadata/md5-cache/app-forensics/afflib-3.7.18
@@ -4,12 +4,12 @@ DEPEND=dev-libs/expat sys-libs/zlib:0= fuse? ( sys-fs/fuse:= ) !libressl? ( dev-
 DESCRIPTION=Library that implements the AFF image standard
 EAPI=7
 HOMEPAGE=https://github.com/sshock/AFFLIBv3/
-IUSE=fuse libressl ncurses python qemu readline s3 static-libs threads 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
+IUSE=fuse libressl ncurses python qemu readline s3 static-libs threads python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm hppa ppc x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=dev-libs/expat sys-libs/zlib:0= fuse? ( sys-fs/fuse:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ncurses? ( sys-libs/ncurses:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) s3? ( net-misc/curl )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/sshock/AFFLIBv3/archive/v3.7.18.tar.gz -> afflib-3.7.18.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4481e04cf99770ce3813e948d5d5beac
diff --git a/metadata/md5-cache/app-forensics/openscap-1.2.14 b/metadata/md5-cache/app-forensics/openscap-1.2.14
index 598bbeb333c7..a2398dea5add 100644
--- a/metadata/md5-cache/app-forensics/openscap-1.2.14
+++ b/metadata/md5-cache/app-forensics/openscap-1.2.14
@@ -3,13 +3,13 @@ DEPEND=!nss? ( dev-libs/libgcrypt:0 ) nss? ( dev-libs/nss ) acl? ( virtual/acl )
 DESCRIPTION=Framework which enables integration with Security Content Automation Protocol
 EAPI=5
 HOMEPAGE=http://www.open-scap.org/
-IUSE=acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr +python_targets_python2_7 +python_single_target_python2_7
+IUSE=acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=!nss? ( dev-libs/libgcrypt:0 ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenSCAP/openscap/releases/download/1.2.14/openscap-1.2.14.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09f30008cce5cc3bd8459e7f35814d54
diff --git a/metadata/md5-cache/app-forensics/openscap-9999 b/metadata/md5-cache/app-forensics/openscap-9999
index 8c699ac51fc3..ffb280c320cc 100644
--- a/metadata/md5-cache/app-forensics/openscap-9999
+++ b/metadata/md5-cache/app-forensics/openscap-9999
@@ -3,12 +3,12 @@ DEPEND=!nss? ( dev-libs/libgcrypt:0 ) nss? ( dev-libs/nss ) acl? ( virtual/acl )
 DESCRIPTION=Framework which enables integration with Security Content Automation Protocol
 EAPI=5
 HOMEPAGE=http://www.open-scap.org/
-IUSE=acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr +python_targets_python2_7 +python_single_target_python2_7
+IUSE=acl caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr +python_single_target_python2_7
 LICENSE=LGPL-2.1+
 PROPERTIES=live
 RDEPEND=!nss? ( dev-libs/libgcrypt:0 ) nss? ( dev-libs/nss ) acl? ( virtual/acl ) caps? ( sys-libs/libcap ) gconf? ( gnome-base/gconf ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) rpm? ( >=app-arch/rpm-4.9 ) sql? ( dev-db/opendbx ) xattr? ( sys-apps/attr ) dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt net-misc/curl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1e330f2cbd27906bf187fc75770b7694
diff --git a/metadata/md5-cache/app-forensics/volatility-2.6-r1 b/metadata/md5-cache/app-forensics/volatility-2.6-r1
index 20b815e574e5..7d179c7f1a0a 100644
--- a/metadata/md5-cache/app-forensics/volatility-2.6-r1
+++ b/metadata/md5-cache/app-forensics/volatility-2.6-r1
@@ -11,5 +11,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_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9b75a3bbc691af99014a3648bb11d154
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index b496f57d0370..2cee13dd6e45 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/dbskkd-cdb-2.00 b/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00
index 4a4958078c84..b906caea5539 100644
--- a/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00
+++ b/metadata/md5-cache/app-i18n/dbskkd-cdb-2.00
@@ -8,5 +8,5 @@ LICENSE=BSD-2
 RDEPEND=app-i18n/skk-jisyo[cdb] sys-apps/xinetd
 SLOT=0
 SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/dbskkd-cdb/dbskkd-cdb-2.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e855c03ba4bf338b018530648f20b196
diff --git a/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00 b/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00
index a7ce00bb0692..4bb14126fd79 100644
--- a/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00
+++ b/metadata/md5-cache/app-i18n/dbskkd-cdb-3.00
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-i18n/skk-jisyo[cdb] sys-apps/xinetd
 SLOT=0
 SRC_URI=https://github.com/jj1bdx/dbskkd-cdb/archive/3.00.tar.gz -> dbskkd-cdb-3.00.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b78b4eefe4c09f690822a4396355b7ad
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10
deleted file mode 100644
index e4c039b73af5..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/anthy app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Japanese Anthy engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/anthy app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] nls? ( virtual/libintl )
-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=https://github.com/ibus/ibus-anthy/releases/download/1.5.10/ibus-anthy-1.5.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9725f471fc6fedd68283b47157b0621
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r1 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r1
new file mode 100644
index 000000000000..f98dc9c81fe0
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.10-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/anthy python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Japanese Anthy engine for IBus
+EAPI=6
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls +python_single_target_python3_6
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/anthy python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=abb2a5981a3dc9cc2a9208b436f8ad5c
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9
deleted file mode 100644
index 16d2f7789de9..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/anthy app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Japanese Anthy engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/anthy app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] nls? ( virtual/libintl )
-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=https://github.com/ibus/ibus-anthy/releases/download/1.5.9/ibus-anthy-1.5.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31b1ead3be9d8ebb6f0d38f981f869a7
diff --git a/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9-r1 b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9-r1
new file mode 100644
index 000000000000..45ecf7a34f76
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-anthy-1.5.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/anthy python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Japanese Anthy engine for IBus
+EAPI=6
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls +python_single_target_python3_6
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/anthy python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ebeb30a9eedae7ff0921ae84b594382
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
deleted file mode 100644
index e4be6ea6b45e..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Korean Hangul engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
-IUSE=nls python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
-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=https://github.com/libhangul/ibus-hangul/releases/download/1.5.1/ibus-hangul-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fbc41fb4ece7d4ecc39d716cf322362
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1-r1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1-r1
new file mode 100644
index 000000000000..9c4f4435ee75
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Korean Hangul engine for IBus
+EAPI=6
+HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
+IUSE=nls +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) >=app-i18n/libhangul-0.1 nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c4a190253105a0d60d61011a6e0082f7
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0
deleted file mode 100644
index 535127792e14..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= ) virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
-EAPI=6
-HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
-IUSE=boost lua opencc python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 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[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=app-i18n/libpinyin-2.1.0:= dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
-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=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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ea26abd16616163c8ff4961e26ad66a
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0-r1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0-r1
new file mode 100644
index 000000000000..1f16c2d26536
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.10.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-i18n/libpinyin-2.1.0:= python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= ) virtual/libintl virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
+EAPI=6
+HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
+IUSE=boost lua opencc +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-i18n/libpinyin-2.1.0:= python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
+REQUIRED_USE=^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0e2e12566a24c108ef69a0df8ac87676
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.1
deleted file mode 100644
index 96a98abf8b52..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-db/sqlite:3 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=app-i18n/libpinyin-2.1.0:= dev-db/sqlite:3 dev-libs/glib:2 dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/libintl boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
-DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
-EAPI=7
-HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
-IUSE=boost lua opencc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=app-i18n/libpinyin-2.1.0:= dev-db/sqlite:3 dev-libs/glib:2 dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/libintl boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
-REQUIRED_USE=^^ ( 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=https://github.com/libpinyin/ibus-libpinyin/archive/1.11.1.tar.gz -> ibus-libpinyin-1.11.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d0eff089babd33f1a9bacd3ce33c0c0
diff --git a/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.1-r1 b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.1-r1
new file mode 100644
index 000000000000..1e20fdb12f60
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-libpinyin-1.11.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-db/sqlite:3 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 postinst postrm prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-i18n/libpinyin-2.1.0:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
+DESCRIPTION=Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus
+EAPI=7
+HOMEPAGE=https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/
+IUSE=boost lua opencc python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-i18n/libpinyin-2.1.0:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) boost? ( dev-libs/boost:= ) lua? ( dev-lang/lua:0 ) opencc? ( app-i18n/opencc:= )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/libpinyin/ibus-libpinyin/archive/1.11.1.tar.gz -> ibus-libpinyin-1.11.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=89e593a32579acc40b8f0039c8f9f0bd
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r2 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r2
deleted file mode 100644
index 3a55981812c1..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-i18n/pyzy dev-db/sqlite:3 dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] boost? ( dev-libs/boost ) lua? ( =dev-lang/lua-5.1*:= ) nls? ( virtual/libintl ) dev-util/intltool sys-devel/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Chinese Pinyin and Bopomofo engines for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=boost lua nls +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-i18n/pyzy dev-db/sqlite:3 dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] boost? ( dev-libs/boost ) lua? ( =dev-lang/lua-5.1*:= ) nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7eb89904567c2688bdaa52eb390259d8
diff --git a/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r3 b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r3
new file mode 100644
index 000000000000..16e7c952f44c
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-pinyin-1.5.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-i18n/pyzy dev-db/sqlite:3 python_single_target_python2_7? ( app-i18n/ibus[python(+),python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] ) boost? ( dev-libs/boost ) lua? ( =dev-lang/lua-5.1*:= ) nls? ( virtual/libintl ) dev-util/intltool sys-devel/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Chinese Pinyin and Bopomofo engines for IBus
+EAPI=6
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=boost lua nls +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-i18n/pyzy dev-db/sqlite:3 python_single_target_python2_7? ( app-i18n/ibus[python(+),python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] ) boost? ( dev-libs/boost ) lua? ( =dev-lang/lua-5.1*:= ) nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/ibus-pinyin-1.5.0.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=080c2679199d694c89faa7f1e56ff991
diff --git a/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1 b/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1
deleted file mode 100644
index b1b747d03a30..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ~app-i18n/sunpinyin-3.0.0_rc1:= nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/scons[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DESCRIPTION=Chinese SunPinyin engine for IBus
-EAPI=6
-HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-IUSE=+nls +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 CDDL
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-i18n/ibus[python(+),python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ~app-i18n/sunpinyin-3.0.0_rc1:= nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1.tar.gz -> sunpinyin-3.0.0_rc1.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=e2aaa1dd5f44957cef150dd251834e8e
diff --git a/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1-r1 b/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1-r1
new file mode 100644
index 000000000000..0c3af77e5898
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( app-i18n/ibus[python(+),python_targets_python2_7(-)] ) ~app-i18n/sunpinyin-3.0.0_rc1:= nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) python_single_target_python2_7? ( dev-util/scons[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DESCRIPTION=Chinese SunPinyin engine for IBus
+EAPI=6
+HOMEPAGE=https://github.com/sunpinyin/sunpinyin
+IUSE=+nls +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 CDDL
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( app-i18n/ibus[python(+),python_targets_python2_7(-)] ) ~app-i18n/sunpinyin-3.0.0_rc1:= nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1.tar.gz -> sunpinyin-3.0.0_rc1.tar.gz
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=739be25d8171c313675e7a0591b5a545
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.9.18 b/metadata/md5-cache/app-i18n/ibus-table-1.9.18
deleted file mode 100644
index 7668bc86894a..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-table-1.9.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/ibus[python(+),python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Tables engines for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/ibus[python(+),python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.18/ibus-table-1.9.18.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c01424141bf7a5134b55100e6f4f0d51
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.9.18-r1 b/metadata/md5-cache/app-i18n/ibus-table-1.9.18-r1
new file mode 100644
index 000000000000..0ad32aa6e9ac
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.9.18-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Tables engines for IBus
+EAPI=6
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) virtual/libiconv nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.18/ibus-table-1.9.18.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=70c4b0c4151b7f7c26bdd95e69420b07
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.9.21 b/metadata/md5-cache/app-i18n/ibus-table-1.9.21
deleted file mode 100644
index 3839666850f7..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-table-1.9.21
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/ibus[python(+),python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Tables engines for IBus
-EAPI=6
-HOMEPAGE=https://github.com/ibus/ibus/wiki
-IUSE=nls +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-i18n/ibus[python(+),python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] virtual/libiconv nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.21/ibus-table-1.9.21.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6e5bc477d2e61fe6959844f903203e04
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r1 b/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r1
new file mode 100644
index 000000000000..681b0625a4a0
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.9.21-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) virtual/libiconv nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Tables engines for IBus
+EAPI=6
+HOMEPAGE=https://github.com/ibus/ibus/wiki
+IUSE=nls +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) virtual/libiconv nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.21/ibus-table-1.9.21.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=309cd9021c1fba0e9474e8b96a7ff2b2
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.6.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.6.0
deleted file mode 100644
index 2f76290c6ad7..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-i18n/ibus[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-libs/m17n-lib dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-db/m17n-db-1.7 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Completion input method for IBus
-EAPI=7
-HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
-IUSE=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[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-i18n/ibus[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-libs/m17n-lib dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-db/m17n-db-1.7
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.6.0/ibus-typing-booster-2.6.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=76305da66d809885b3f61566ac2f9040
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.7.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.7.0
deleted file mode 100644
index 3b119d547fd0..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-i18n/ibus[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-libs/m17n-lib dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-db/m17n-db-1.7 sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Completion input method for IBus
-EAPI=7
-HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
-IUSE=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[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-i18n/ibus[python(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-libs/m17n-lib dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-db/m17n-db-1.7
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.7.0/ibus-typing-booster-2.7.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=76305da66d809885b3f61566ac2f9040
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.7.0-r1 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.7.0-r1
new file mode 100644
index 000000000000..039b3f852efc
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.7.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) >=dev-db/m17n-db-1.7 sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Completion input method for IBus
+EAPI=7
+HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
+IUSE=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[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.7.0/ibus-typing-booster-2.7.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bccca7a024805eb1a00817d25678211a
diff --git a/metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.0 b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.0
new file mode 100644
index 000000000000..9da1a7d7a089
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-typing-booster-2.8.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) >=dev-db/m17n-db-1.7 sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Completion input method for IBus
+EAPI=7
+HOMEPAGE=https://mike-fabian.github.io/ibus-typing-booster
+IUSE=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[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/m17n-lib python_single_target_python3_6? ( app-i18n/ibus[python(+),python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-i18n/ibus[python(+),python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pyenchant[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) >=dev-db/m17n-db-1.7
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.8.0/ibus-typing-booster-2.8.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f4c09492ff9575eb6418486ae6689518
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 d0c4ba3cf973..73af34a8726a 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.0-r1
@@ -9,4 +9,4 @@ 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=02dc19f081a5b68c7d610d7ec30935fe
+_md5_=c68741f33d9091a8a4832da1667ed88c
diff --git a/metadata/md5-cache/app-i18n/imhangul-2.1.1 b/metadata/md5-cache/app-i18n/imhangul-2.1.1
index 77a9c4300837..4c087fcc2ab1 100644
--- a/metadata/md5-cache/app-i18n/imhangul-2.1.1
+++ b/metadata/md5-cache/app-i18n/imhangul-2.1.1
@@ -9,4 +9,4 @@ 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45e03343ffff8df52a4302a0a8e29eb2
+_md5_=952e46e196a83f2326f032bdb0ef4dd6
diff --git a/metadata/md5-cache/app-i18n/imhangul-3.1.1 b/metadata/md5-cache/app-i18n/imhangul-3.1.1
index 3831eb05a785..d2ceccbfdefd 100644
--- a/metadata/md5-cache/app-i18n/imhangul-3.1.1
+++ b/metadata/md5-cache/app-i18n/imhangul-3.1.1
@@ -9,4 +9,4 @@ 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a817075f01c1b0ae4065d13605f7c764
+_md5_=76f7fcc4f89127559c53e8580f1e798c
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 bf2aa3734d3a..a00e17ccf944 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cc828b4ab7e01253239713659944c27
diff --git a/metadata/md5-cache/app-i18n/nkf-2.1.4 b/metadata/md5-cache/app-i18n/nkf-2.1.4
index f247ea640ea6..797ced30a529 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_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=929efac0eac935cc6cfaaed4009a118e
diff --git a/metadata/md5-cache/app-i18n/opencc-1.0.5 b/metadata/md5-cache/app-i18n/opencc-1.0.5
index 8ec459724cec..d0c885e95829 100644
--- a/metadata/md5-cache/app-i18n/opencc-1.0.5
+++ b/metadata/md5-cache/app-i18n/opencc-1.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries for conversion between Traditional and Simplified Chinese
 EAPI=6
 HOMEPAGE=https://github.com/BYVoid/OpenCC
 IUSE=doc test
-KEYWORDS=amd64 arm64 hppa ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm64 hppa ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5a3ff83f1bba7d9cfd08d7c22b7deea
+_md5_=dbb9ca08a10e46f16a9e7a1d7411734a
diff --git a/metadata/md5-cache/app-i18n/pology-0.12-r1 b/metadata/md5-cache/app-i18n/pology-0.12-r1
deleted file mode 100644
index 22a5e23a5db9..000000000000
--- a/metadata/md5-cache/app-i18n/pology-0.12-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-devel/gettext
-DESCRIPTION=A framework for custom processing of PO files
-EAPI=7
-HOMEPAGE=http://pology.nedohodnik.net
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-devel/gettext
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://pology.nedohodnik.net/release/pology-0.12.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=909f6b9922ac0fadce71762661ba7611
diff --git a/metadata/md5-cache/app-i18n/pology-0.12-r2 b/metadata/md5-cache/app-i18n/pology-0.12-r2
new file mode 100644
index 000000000000..987f31e2f82f
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/pology-0.12-r2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] ) sys-devel/gettext
+DESCRIPTION=A framework for custom processing of PO files
+EAPI=7
+HOMEPAGE=http://pology.nedohodnik.net
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] ) sys-devel/gettext
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://pology.nedohodnik.net/release/pology-0.12.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=93e5d3add9fcd6bab38ee11b07c66ef9
diff --git a/metadata/md5-cache/app-i18n/pology-9999 b/metadata/md5-cache/app-i18n/pology-9999
index 029f4323148c..d20655fa6bd3 100644
--- a/metadata/md5-cache/app-i18n/pology-9999
+++ b/metadata/md5-cache/app-i18n/pology-9999
@@ -1,14 +1,14 @@
 BDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-devel/gettext
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] ) sys-devel/gettext
 DESCRIPTION=A framework for custom processing of PO files
 EAPI=7
 HOMEPAGE=http://pology.nedohodnik.net
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-devel/gettext
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2 dev-libs/libxslt python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] ) sys-devel/gettext
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5af45f405a61eb729416122e16131a9b
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9e0b522a58c2c412dfdbcafb26ef352e
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.17 b/metadata/md5-cache/app-i18n/scim-1.4.17
index 602ddf270ff3..0553fb363cad 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.17
+++ b/metadata/md5-cache/app-i18n/scim-1.4.17
@@ -4,10 +4,10 @@ DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/scim
 IUSE=doc gtk3
-KEYWORDS=~alpha amd64 arm hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ppc ppc64 sparc x86
 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d999ff6acbaa5caf3340092a6d14cd31
+_md5_=9a2e009d3d875e3b8659d4d22368056a
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.18 b/metadata/md5-cache/app-i18n/scim-1.4.18
index 2171e012b0b3..d7deb7f7c370 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.18
+++ b/metadata/md5-cache/app-i18n/scim-1.4.18
@@ -4,10 +4,10 @@ DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development
 EAPI=6
 HOMEPAGE=https://github.com/scim-im/scim
 IUSE=doc gtk3
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf03ed4b734604c9117de7d21310b969
+_md5_=77c78ade7bc583f25370cb1dd443de48
diff --git a/metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1 b/metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1
index e6fafbdc8a13..bec0d44cc3c3 100644
--- a/metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1
+++ b/metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=app-i18n/scim[gtk3=] ~app-i18n/sunpinyin-3.0.0_rc1:=
 SLOT=0
 SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1.tar.gz -> sunpinyin-3.0.0_rc1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=a0311e0de4414a2ec2c575b5a0787f5a
diff --git a/metadata/md5-cache/app-i18n/skk-jisyo-201605 b/metadata/md5-cache/app-i18n/skk-jisyo-201605
deleted file mode 100644
index c086af0021e3..000000000000
--- a/metadata/md5-cache/app-i18n/skk-jisyo-201605
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=virtual/awk cdb? ( || ( dev-db/tinycdb dev-db/cdb ) )
-DESCRIPTION=Jisyo (dictionary) files for the SKK Japanese-input software
-EAPI=6
-HOMEPAGE=http://openlab.ring.gr.jp/skk/dic.html
-IUSE=cdb
-KEYWORDS=amd64 arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2 freedist public-domain
-SLOT=0
-SRC_URI=mirror://gentoo/skk-jisyo-201605.tar.xz https://dev.gentoo.org/~hattya/distfiles/skk-jisyo-201605.tar.xz
-_md5_=9e47687315760aff02feef860e25c8a7
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r2 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r2
index a2721270ffa7..bb1fce17f138 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r2
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108-r2
@@ -9,5 +9,5 @@ PDEPEND=<=app-i18n/sunpinyin-data-20130220
 RDEPEND=dev-db/sqlite:3
 SLOT=0/3
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ac18fb42b59ec8f3da03fd93da131ab7
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-3.0.0_rc1 b/metadata/md5-cache/app-i18n/sunpinyin-3.0.0_rc1
index abe12e5936e3..6b9fa0ff4faa 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-3.0.0_rc1
+++ b/metadata/md5-cache/app-i18n/sunpinyin-3.0.0_rc1
@@ -9,5 +9,5 @@ PDEPEND=>=app-i18n/sunpinyin-data-20140820
 RDEPEND=dev-db/sqlite:3
 SLOT=0/3
 SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1.tar.gz -> sunpinyin-3.0.0_rc1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=9c40c2b5ebd033e2b80a734d6aac8d78
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r4 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r4
deleted file mode 100644
index 9571d19a2fef..000000000000
--- a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( dev-db/mysql-connector-c:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Japanese handwriting recognition engine
-EAPI=6
-HOMEPAGE=http://tomoe.osdn.jp/
-IUSE=hyperestraier mysql python ruby ruby_targets_ruby24 static-libs subversion +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( dev-db/mysql-connector-c:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ruby? ( || ( ruby_targets_ruby24 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a2fd01e4b018c1149a9a9c3c30bf98f9
diff --git a/metadata/md5-cache/app-i18n/tomoe-0.6.0-r5 b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r5
new file mode 100644
index 000000000000..e7afe5c20127
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/tomoe-0.6.0-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( dev-db/mysql-connector-c:= ) python? ( python_single_target_python2_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[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] ) ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion ) dev-util/glib-utils dev-util/gtk-doc-am dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Japanese handwriting recognition engine
+EAPI=6
+HOMEPAGE=http://tomoe.osdn.jp/
+IUSE=hyperestraier mysql python ruby ruby_targets_ruby24 static-libs subversion +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) mysql? ( dev-db/mysql-connector-c:= ) python? ( python_single_target_python2_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[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] ) ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems dev-ruby/ruby-glib2[ruby_targets_ruby24?] ) subversion? ( dev-vcs/subversion )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ruby? ( || ( ruby_targets_ruby24 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0a23b9bda93b1e66bb1c42a4d6ad95c3
diff --git a/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r4 b/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r4
deleted file mode 100644
index 01e5b980cbe7..000000000000
--- a/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=app-i18n/tomoe[python(+)?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] x11-libs/gtk+:2 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=Tomoe GTK+ interface widget library
-EAPI=6
-HOMEPAGE=http://tomoe.osdn.jp/
-IUSE=python static-libs +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-i18n/tomoe[python(+)?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] x11-libs/gtk+:2 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
-_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bfed32023f69f34d65addcfb25a11e27
diff --git a/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r5 b/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r5
new file mode 100644
index 000000000000..f72e3d5e31e9
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/tomoe-gtk-0.6.0-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup
+DEPEND=app-i18n/tomoe[python(+)?,python_single_target_python2_7(-)?] x11-libs/gtk+:2 python? ( python_single_target_python2_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[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] ) ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Tomoe GTK+ interface widget library
+EAPI=6
+HOMEPAGE=http://tomoe.osdn.jp/
+IUSE=python static-libs +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=app-i18n/tomoe[python(+)?,python_single_target_python2_7(-)?] x11-libs/gtk+:2 python? ( python_single_target_python2_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[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
+_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=db0d7616c244ca5da457b50c04dac7bc
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 47b6c940ef38..215dd3f5022c 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-0.12.4
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.12.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/transifex-client/transifex-client-0.12.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f99ee84cb8cd6f8b570d25adecf34b87
diff --git a/metadata/md5-cache/app-i18n/xsunpinyin-3.0.0_rc1 b/metadata/md5-cache/app-i18n/xsunpinyin-3.0.0_rc1
index 65403a37aa67..f9d244d09c52 100644
--- a/metadata/md5-cache/app-i18n/xsunpinyin-3.0.0_rc1
+++ b/metadata/md5-cache/app-i18n/xsunpinyin-3.0.0_rc1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 CDDL
 RDEPEND=~app-i18n/sunpinyin-3.0.0_rc1:= x11-libs/gtk+:2 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/xsunpinyin/xsunpinyin/archive/v3.0.0-rc1.tar.gz -> sunpinyin-3.0.0_rc1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=5b41b9e2741d388d574ab50fcb0638ed
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index aa805c686677..574aeebfd6e6 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 7d08e0f43a69..de0f150783ba 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9503484fe965847106e9c03e30b5b45
diff --git a/metadata/md5-cache/app-laptop/hdaps-gl-0.0.7 b/metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
index 9fa037f35c2a..f5e47f5cb3b2 100644
--- a/metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
+++ b/metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=media-libs/freeglut media-libs/glu virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/linux-thinkpad/hdaps-gl/releases/download/0.0.7/hdaps-gl-0.0.7.tar.xz
-_md5_=805d3556a99140accf5458b7d2ece2e5
+_md5_=10242ae07b56d04ef721e5bc8f573b4a
diff --git a/metadata/md5-cache/app-laptop/hdapsd-20141203 b/metadata/md5-cache/app-laptop/hdapsd-20141203
index 6f290e0a6edd..f8f2d2f5903b 100644
--- a/metadata/md5-cache/app-laptop/hdapsd-20141203
+++ b/metadata/md5-cache/app-laptop/hdapsd-20141203
@@ -10,4 +10,4 @@ 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2453acd8a834208121cb4ecda4388d07
+_md5_=ecb08252bb5225b068a2702ec8635c53
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index a89535f16efe..f34158aad9a0 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/alertmanager-0.18.0 b/metadata/md5-cache/app-metrics/alertmanager-0.18.0
index fc6df6233a85..c603f93fd254 100644
--- a/metadata/md5-cache/app-metrics/alertmanager-0.18.0
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.18.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.18.0.tar.gz -> alertmanager-0.18.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=99fd3b89fd41b131107499b544d27bea
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.19.0 b/metadata/md5-cache/app-metrics/alertmanager-0.19.0
index 480c842ce518..e923e6a99752 100644
--- a/metadata/md5-cache/app-metrics/alertmanager-0.19.0
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.19.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.19.0.tar.gz -> alertmanager-0.19.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e17389de33bd611d04ee1bc32cb8ae20
diff --git a/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20190226 b/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20190226
index 886d53c06c28..4e710b76ea62 100644
--- a/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20190226
+++ b/metadata/md5-cache/app-metrics/bind_exporter-0.2.0_p20190226
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/digitalocean/bind_exporter/archive/9289b40af62a455ebd587ed4701dd543f4cc5877.tar.gz -> bind_exporter-0.2.0_p20190226.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=66f1659ed6a735044e9c7176016de8ff
diff --git a/metadata/md5-cache/app-metrics/blackbox_exporter-0.15.1 b/metadata/md5-cache/app-metrics/blackbox_exporter-0.15.1
index 016b9a3773ae..73a46eea3963 100644
--- a/metadata/md5-cache/app-metrics/blackbox_exporter-0.15.1
+++ b/metadata/md5-cache/app-metrics/blackbox_exporter-0.15.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.15.1.tar.gz -> blackbox_exporter-0.15.1.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6be345d86377fe333e92c89bde2ad755
diff --git a/metadata/md5-cache/app-metrics/blackbox_exporter-0.16.0 b/metadata/md5-cache/app-metrics/blackbox_exporter-0.16.0
index bec14df0b452..89722032f548 100644
--- a/metadata/md5-cache/app-metrics/blackbox_exporter-0.16.0
+++ b/metadata/md5-cache/app-metrics/blackbox_exporter-0.16.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.16.0.tar.gz -> blackbox_exporter-0.16.0.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cd98d517a64961ed18f0f7f4b9fd85dc
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 a10482ebce1d..90fe5b578dde 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_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da3e069e3c70273f2da4b425f286b17f
diff --git a/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6 b/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
index 2cce2b79fe6a..57651b93af42 100644
--- a/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
+++ b/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/jirwin/burrow_exporter/archive/v0.0.6.tar.gz -> burrow_exporter-0.0.6.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/golang/protobuf/archive/2bba0603135d7d7f5cb73b2125beeda19c09f4ef.tar.gz -> github.com-golang-protobuf-2bba0603135d7d7f5cb73b2125beeda19c09f4ef.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/client_golang/archive/42552c195dd3f3089fbf9cf26e139da150af35aa.tar.gz -> github.com-prometheus-client_golang-42552c195dd3f3089fbf9cf26e139da150af35aa.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/Sirupsen/logrus/archive/ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz -> github.com-Sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz https://github.com/urfave/cli/archive/ab403a54a148f2d857920810291539e1f817ee7b.tar.gz -> github.com-urfave-cli-ab403a54a148f2d857920810291539e1f817ee7b.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=28a2454da451ab87de0941a60829c829
diff --git a/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6-r1 b/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6-r1
index bdfa13664f43..4b33c5d1f987 100644
--- a/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6-r1
+++ b/metadata/md5-cache/app-metrics/burrow_exporter-0.0.6-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/jirwin/burrow_exporter/archive/v0.0.6.tar.gz -> burrow_exporter-0.0.6.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/golang/protobuf/archive/2bba0603135d7d7f5cb73b2125beeda19c09f4ef.tar.gz -> github.com-golang-protobuf-2bba0603135d7d7f5cb73b2125beeda19c09f4ef.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/client_golang/archive/42552c195dd3f3089fbf9cf26e139da150af35aa.tar.gz -> github.com-prometheus-client_golang-42552c195dd3f3089fbf9cf26e139da150af35aa.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz -> github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz https://github.com/prometheus/procfs/archive/65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz -> github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz https://github.com/Sirupsen/logrus/archive/ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz -> github.com-Sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz https://github.com/urfave/cli/archive/ab403a54a148f2d857920810291539e1f817ee7b.tar.gz -> github.com-urfave-cli-ab403a54a148f2d857920810291539e1f817ee7b.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=687d4a047a3ec1bee23b264fa44e22a9
diff --git a/metadata/md5-cache/app-metrics/collectd-5.10.0 b/metadata/md5-cache/app-metrics/collectd-5.10.0
index 01fa047fd359..7c22f9bc7ca7 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.10.0
+++ b/metadata/md5-cache/app-metrics/collectd-5.10.0
@@ -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? ( dev-db/mysql-connector-c:= ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_sysevent? ( dev-libs/yajl:= ) 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/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? ( dev-db/mysql-connector-c:= ) 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_sysevent? ( dev-libs/yajl:= ) 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/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_sysevent 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_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_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+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_sysevent 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_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_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? ( dev-db/mysql-connector-c:= ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_sysevent? ( dev-libs/yajl:= ) 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 ) 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_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 ) ) collectd_plugins_smart? ( udev )
+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? ( dev-db/mysql-connector-c:= ) 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_sysevent? ( dev-libs/yajl:= ) 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 ) collectd_plugins_java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+REQUIRED_USE=collectd_plugins_python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/releases/download/5.10.0/collectd-5.10.0.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1615cf3d5c64cc08f26ad676bc777837
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=92b2fbbe2b9b256ff0eb09e0186a382d
diff --git a/metadata/md5-cache/app-metrics/collectd-5.8.1-r1 b/metadata/md5-cache/app-metrics/collectd-5.8.1-r1
index d6797bad5485..bd99d0dbb448 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.8.1-r1
+++ b/metadata/md5-cache/app-metrics/collectd-5.8.1-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? ( dev-db/mysql-connector-c:= ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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/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? ( dev-db/mysql-connector-c:= ) 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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/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_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+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_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? ( dev-db/mysql-connector-c:= ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_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 ) ) collectd_plugins_smart? ( udev )
+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? ( dev-db/mysql-connector-c:= ) 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_python3_6 python_single_target_python3_7 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://collectd.org/files/collectd-5.8.1.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=b9e73d3429e4a78c46b5be49d8e446b6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=840f628219c5fc810a5f3c78f0ed63d2
diff --git a/metadata/md5-cache/app-metrics/collectd-5.9.1-r2 b/metadata/md5-cache/app-metrics/collectd-5.9.1-r2
index 6231773bced3..9f3795b55c1b 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.9.1-r2
+++ b/metadata/md5-cache/app-metrics/collectd-5.9.1-r2
@@ -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? ( dev-db/mysql-connector-c:= ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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/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? ( dev-db/mysql-connector-c:= ) 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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/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_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+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_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? ( dev-db/mysql-connector-c:= ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_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 ) ) collectd_plugins_smart? ( udev )
+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? ( dev-db/mysql-connector-c:= ) 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_python3_6 python_single_target_python3_7 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/archive/collectd-5.9.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5d9f4115b3d51d0ebba85b8528561e4d
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=0dc7bf1d4c5002729c2c2f38f3475688
diff --git a/metadata/md5-cache/app-metrics/collectd-5.9.2 b/metadata/md5-cache/app-metrics/collectd-5.9.2
index 8cf6478e1e69..1597b3ad1681 100644
--- a/metadata/md5-cache/app-metrics/collectd-5.9.2
+++ b/metadata/md5-cache/app-metrics/collectd-5.9.2
@@ -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? ( dev-db/mysql-connector-c:= ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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/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? ( dev-db/mysql-connector-c:= ) 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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/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_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+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_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? ( dev-db/mysql-connector-c:= ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_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 ) ) collectd_plugins_smart? ( udev )
+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? ( dev-db/mysql-connector-c:= ) 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_python3_6 python_single_target_python3_7 ) ) collectd_plugins_smart? ( udev )
 SLOT=0
 SRC_URI=https://github.com/collectd/collectd/archive/collectd-5.9.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cf3dfe57ac96cd1351e027e7021f7a70
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=9ff32d51fc0bac62c9fc77f38a9e8e3d
diff --git a/metadata/md5-cache/app-metrics/consul_exporter-0.4.0 b/metadata/md5-cache/app-metrics/consul_exporter-0.4.0
index 252d943f065b..ab19d296cc92 100644
--- a/metadata/md5-cache/app-metrics/consul_exporter-0.4.0
+++ b/metadata/md5-cache/app-metrics/consul_exporter-0.4.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/prometheus/consul_exporter/archive/v0.4.0.tar.gz -> consul_exporter-0.4.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=622950157727b47ac28e077c12167690
diff --git a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2 b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
index 1041790c3695..55e89f8e41ee 100644
--- a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
+++ b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/justwatchcom/elasticsearch_exporter/archive/v1.0.2.tar.gz -> elasticsearch_exporter-1.0.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=483a21c55838df5ff4395d6ecb95e082
diff --git a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1 b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1
index 60ab6d348997..b2a8c7ef7df3 100644
--- a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1
+++ b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.0.4_rc1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/justwatchcom/elasticsearch_exporter/archive/v1.0.4rc1.tar.gz -> elasticsearch_exporter-1.0.4_rc1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3fd2841488a79c79f96d7b81615aa706
diff --git a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0 b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0
index bc335aa5e813..1f56ab1aa368 100644
--- a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0
+++ b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/justwatchcom/elasticsearch_exporter/archive/v1.1.0.tar.gz -> elasticsearch_exporter-1.1.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b96154615079380c56270ab90923be03
diff --git a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0_rc1 b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0_rc1
index 88a9fd50eb91..4400690f8e0f 100644
--- a/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0_rc1
+++ b/metadata/md5-cache/app-metrics/elasticsearch_exporter-1.1.0_rc1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/justwatchcom/elasticsearch_exporter/archive/v1.1.0rc1.tar.gz -> elasticsearch_exporter-1.1.0_rc1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7f1a0165d94e5495e2d8b295c8d8c2ec
diff --git a/metadata/md5-cache/app-metrics/github-exporter-04-r1 b/metadata/md5-cache/app-metrics/github-exporter-04-r1
index aad93fe7b155..3bc4bc34d830 100644
--- a/metadata/md5-cache/app-metrics/github-exporter-04-r1
+++ b/metadata/md5-cache/app-metrics/github-exporter-04-r1
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/infinityworks/github-exporter/archive/04.tar.gz -> github-exporter-04.tar.gz https://github.com/beorn7/perks/archive/3a771d9.tar.gz -> github.com-beorn7-perks-3a771d9.tar.gz https://github.com/fatih/structs/archive/878a968.tar.gz -> github.com-fatih-structs-878a968.tar.gz https://github.com/golang/protobuf/archive/347cf4a.tar.gz -> github.com-golang-protobuf-347cf4a.tar.gz https://github.com/infinityworks/go-common/archive/7f20a14.tar.gz -> github.com-infinityworks-go-common-7f20a14.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c182aff.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c182aff.tar.gz https://github.com/prometheus/client_golang/archive/d2ead25.tar.gz -> github.com-prometheus-client_golang-d2ead25.tar.gz https://github.com/prometheus/client_model/archive/f287a10.tar.gz -> github.com-prometheus-client_model-f287a10.tar.gz https://github.com/prometheus/common/archive/2998b13.tar.gz -> github.com-prometheus-common-2998b13.tar.gz https://github.com/prometheus/procfs/archive/b1a0a9a.tar.gz -> github.com-prometheus-procfs-b1a0a9a.tar.gz https://github.com/sirupsen/logrus/archive/eef6b76.tar.gz -> github.com-sirupsen-logrus-eef6b76.tar.gz https://github.com/golang/crypto/archive/ff983b9.tar.gz -> github.com-golang-crypto-ff983b9.tar.gz https://github.com/golang/sys/archive/48ac38b.tar.gz -> github.com-golang-sys-48ac38b.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ae98c7906d89bf8fb47b66ccf813e1a2
diff --git a/metadata/md5-cache/app-metrics/grok_exporter-0.2.6 b/metadata/md5-cache/app-metrics/grok_exporter-0.2.6
index 76cbece9e339..38d1f12271ff 100644
--- a/metadata/md5-cache/app-metrics/grok_exporter-0.2.6
+++ b/metadata/md5-cache/app-metrics/grok_exporter-0.2.6
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/oniguruma-6.9.0:=
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/fstab/grok_exporter/archive/v0.2.6.tar.gz -> grok_exporter-0.2.6.tar.gz https://github.com/prometheus/client_model/archive/56726106282f1985ea77d5305743db7231b0c0a8.tar.gz -> github.com-prometheus-client_model-56726106282f1985ea77d5305743db7231b0c0a8.tar.gz https://github.com/prometheus/common/archive/2998b132700a7d019ff618c06a234b47c1f3f681.tar.gz -> github.com-prometheus-common-2998b132700a7d019ff618c06a234b47c1f3f681.tar.gz https://github.com/prometheus/client_golang/archive/18d13eacc9cce330610a70daf4ed0fef2e846589.tar.gz -> github.com-prometheus-client_golang-18d13eacc9cce330610a70daf4ed0fef2e846589.tar.gz https://github.com/prometheus/procfs/archive/b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1.tar.gz -> github.com-prometheus-procfs-b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz https://github.com/golang/protobuf/archive/347cf4a86c1cb8d262994d8ef5924d4576c5b331.tar.gz -> github.com-golang-protobuf-347cf4a86c1cb8d262994d8ef5924d4576c5b331.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/go-yaml/yaml/archive/51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz -> github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4f6625f9b370d2d4fc4fe10b3bb4a14c
diff --git a/metadata/md5-cache/app-metrics/memcached_exporter-0.5.0 b/metadata/md5-cache/app-metrics/memcached_exporter-0.5.0
index f0c801f79526..310be41614dd 100644
--- a/metadata/md5-cache/app-metrics/memcached_exporter-0.5.0
+++ b/metadata/md5-cache/app-metrics/memcached_exporter-0.5.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/memcached_exporter/archive/v0.5.0.tar.gz -> memcached_exporter-0.5.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f185284d7a445612c40438fdec74b4d7
diff --git a/metadata/md5-cache/app-metrics/mongodb_exporter-0.6.2-r1 b/metadata/md5-cache/app-metrics/mongodb_exporter-0.6.2-r1
index 7c747abbc021..b278cdd002d0 100644
--- a/metadata/md5-cache/app-metrics/mongodb_exporter-0.6.2-r1
+++ b/metadata/md5-cache/app-metrics/mongodb_exporter-0.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 AGPL-3 BSD MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/percona/mongodb_exporter/archive/v0.6.2.tar.gz -> mongodb_exporter-0.6.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5abbddf313dcf3e5f3025a5ab11c49d1
diff --git a/metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1 b/metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1
index c58447b6d928..f98f11e147d8 100644
--- a/metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1
+++ b/metadata/md5-cache/app-metrics/mysqld_exporter-0.10.0-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/mysqld_exporter/archive/v0.10.0.tar.gz -> mysqld_exporter-0.10.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b97b55a0683497c9c347db0fa433cd61
diff --git a/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0 b/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
index 58bea67e28bc..5805d673b040 100644
--- a/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
+++ b/metadata/md5-cache/app-metrics/mysqld_exporter-0.11.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/mysqld_exporter/archive/v0.11.0.tar.gz -> mysqld_exporter-0.11.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7be767158889d62f82dc511907c7901f
diff --git a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3 b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
index a08319e815c1..84a87a6b355f 100644
--- a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
+++ b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.3
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/hnlq715/nginx-vts-exporter/archive/v0.10.3.tar.gz -> nginx-vts-exporter-0.10.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d57ded539dbec036a161c923b2e8b1b8
diff --git a/metadata/md5-cache/app-metrics/node_exporter-0.18.1 b/metadata/md5-cache/app-metrics/node_exporter-0.18.1
index dd28da6aa6a5..9c14b5d87052 100644
--- a/metadata/md5-cache/app-metrics/node_exporter-0.18.1
+++ b/metadata/md5-cache/app-metrics/node_exporter-0.18.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.18.1.tar.gz -> node_exporter-0.18.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f7c69e01e9dd15e73e355c01859cf5f9
diff --git a/metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1 b/metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1
index 76c5b4d53d97..30fd216645c0 100644
--- a/metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1
+++ b/metadata/md5-cache/app-metrics/openvpn_exporter-0.2.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/kumina/openvpn_exporter/archive/0.2.1.tar.gz -> openvpn_exporter-0.2.1.tar.gz https://github.com/prometheus/client_golang/archive/f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz -> github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/golang/protobuf/archive/e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz -> github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/procfs/archive/780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz -> github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ddd261d44f231ae86fff67b5d4ff63d1
diff --git a/metadata/md5-cache/app-metrics/postfix_exporter-0.1.2 b/metadata/md5-cache/app-metrics/postfix_exporter-0.1.2
index 8705e3ccbf04..abaac722c0fb 100644
--- a/metadata/md5-cache/app-metrics/postfix_exporter-0.1.2
+++ b/metadata/md5-cache/app-metrics/postfix_exporter-0.1.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kumina/postfix_exporter/archive/0.1.2.tar.gz -> postfix_exporter-0.1.2.tar.gz https://github.com/coreos/go-systemd/archive/bebb2b01b0473b183e4624aaf8e23ae6f4b22417.tar.gz -> github.com-coreos-go-systemd-bebb2b01b0473b183e4624aaf8e23ae6f4b22417.tar.gz https://github.com/coreos/pkg/archive/97fdf19511ea361ae1c100dd393cc47f8dcfa1e1.tar.gz -> github.com-coreos-pkg-97fdf19511ea361ae1c100dd393cc47f8dcfa1e1.tar.gz https://github.com/prometheus/client_golang/archive/f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz -> github.com-prometheus-client_golang-f504d69affe11ec1ccb2e5948127f86878c9fd57.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/golang/protobuf/archive/e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz -> github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz -> github.com-prometheus-common-38c53a9f4bfcd932d1b00bfc65e256a7fba6b37a.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/prometheus/procfs/archive/780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz -> github.com-prometheus-procfs-780932d4fbbe0e69b84c34c20f5c8d0981e109ea.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=82218d3bac175f6d249bfb400c5cb7a8
diff --git a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.7 b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.7
index 7c5ebd50954a..8dddf9acd3fc 100644
--- a/metadata/md5-cache/app-metrics/postgres_exporter-0.4.7
+++ b/metadata/md5-cache/app-metrics/postgres_exporter-0.4.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/wrouesnel/postgres_exporter/archive/v0.4.7.tar.gz -> postgres_exporter-0.4.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1c6ffe1e8261cd23948026effadbc2fd
diff --git a/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523 b/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
index ff76fc87191b..6cda2bf0fa97 100644
--- a/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
+++ b/metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/prom2json/archive/4a7436442837da72f9e211d99f0145dff3246b66.tar.gz -> prom2json-0.1.0_p20170523.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=699f93213d211f4afbfd735d1264a53d
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.13.1 b/metadata/md5-cache/app-metrics/prometheus-2.13.1
index 5ffdbdf3be20..c3b24b4e56e2 100644
--- a/metadata/md5-cache/app-metrics/prometheus-2.13.1
+++ b/metadata/md5-cache/app-metrics/prometheus-2.13.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/prometheus/prometheus/archive/v2.13.1.tar.gz -> prometheus-2.13.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9601bb130e77caebf569611ba74b3052
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.10.0 b/metadata/md5-cache/app-metrics/pushgateway-0.10.0
index e14b2e75f859..56d0db876aeb 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-0.10.0
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.10.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/pushgateway/archive/v0.10.0.tar.gz -> pushgateway-0.10.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=321b158a7f1142daab64881a6f3203fd
diff --git a/metadata/md5-cache/app-metrics/pushgateway-0.9.1 b/metadata/md5-cache/app-metrics/pushgateway-0.9.1
index bf73c90d2d7f..c5486a3930a4 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-0.9.1
+++ b/metadata/md5-cache/app-metrics/pushgateway-0.9.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/pushgateway/archive/v0.9.1.tar.gz -> pushgateway-0.9.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1b2a2badc89bc8c3833b98b168927c57
diff --git a/metadata/md5-cache/app-metrics/pushgateway-1.0.0 b/metadata/md5-cache/app-metrics/pushgateway-1.0.0
index adbe02581614..1b9b6662cc26 100644
--- a/metadata/md5-cache/app-metrics/pushgateway-1.0.0
+++ b/metadata/md5-cache/app-metrics/pushgateway-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/pushgateway/archive/v1.0.0.tar.gz -> pushgateway-1.0.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=710f5a59c01a271665a042c579e598cb
diff --git a/metadata/md5-cache/app-metrics/rabbitmq_exporter-0.29.0 b/metadata/md5-cache/app-metrics/rabbitmq_exporter-0.29.0
index feccfff87bcf..15f49eb8173b 100644
--- a/metadata/md5-cache/app-metrics/rabbitmq_exporter-0.29.0
+++ b/metadata/md5-cache/app-metrics/rabbitmq_exporter-0.29.0
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/kbudde/rabbitmq_exporter/archive/v0.29.0.tar.gz -> rabbitmq_exporter-0.29.0.tar.gz https://github.com/kbudde/gobert/archive/a6daecb9ddeb548b7cfb3f5ac9deef9ded522730.tar.gz -> github.com-kbudde-gobert-a6daecb9ddeb548b7cfb3f5ac9deef9ded522730.tar.gz https://github.com/prometheus/client_model/archive/f287a105a20ec685d797f65cd0ce8fbeaef42da1.tar.gz -> github.com-prometheus-client_model-f287a105a20ec685d797f65cd0ce8fbeaef42da1.tar.gz https://github.com/prometheus/common/archive/2998b132700a7d019ff618c06a234b47c1f3f681.tar.gz -> github.com-prometheus-common-2998b132700a7d019ff618c06a234b47c1f3f681.tar.gz https://github.com/prometheus/client_golang/archive/d2ead25884778582e740573999f7b07f47e171b4.tar.gz -> github.com-prometheus-client_golang-d2ead25884778582e740573999f7b07f47e171b4.tar.gz https://github.com/prometheus/procfs/archive/b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1.tar.gz -> github.com-prometheus-procfs-b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz https://github.com/golang/protobuf/archive/347cf4a86c1cb8d262994d8ef5924d4576c5b331.tar.gz -> github.com-golang-protobuf-347cf4a86c1cb8d262994d8ef5924d4576c5b331.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/Sirupsen/logrus/archive/78fb3852d92683dc28da6cc3d5f965100677c27d.tar.gz -> github.com-Sirupsen-logrus-78fb3852d92683dc28da6cc3d5f965100677c27d.tar.gz https://github.com/golang/crypto/archive/ff983b9c42bc9fbf91556e191cc8efb585c16908.tar.gz -> github.com-golang-crypto-ff983b9c42bc9fbf91556e191cc8efb585c16908.tar.gz https://github.com/golang/sys/archive/2be51725563103c17124a318f1745b66f2347acb.tar.gz -> github.com-golang-sys-2be51725563103c17124a318f1745b66f2347acb.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6fcf4b2e56fa60dd4b5615811f347794
diff --git a/metadata/md5-cache/app-metrics/redis_exporter-0.20.2 b/metadata/md5-cache/app-metrics/redis_exporter-0.20.2
index a766398c5c0c..039bc41bd1b1 100644
--- a/metadata/md5-cache/app-metrics/redis_exporter-0.20.2
+++ b/metadata/md5-cache/app-metrics/redis_exporter-0.20.2
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/oliver006/redis_exporter/archive/v0.20.2.tar.gz -> redis_exporter-0.20.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f1a722daf763a138991c70d85ed14e82
diff --git a/metadata/md5-cache/app-metrics/redis_exporter-1.1.1 b/metadata/md5-cache/app-metrics/redis_exporter-1.1.1
index d5983ca3ab3e..042188597711 100644
--- a/metadata/md5-cache/app-metrics/redis_exporter-1.1.1
+++ b/metadata/md5-cache/app-metrics/redis_exporter-1.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/oliver006/redis_exporter/archive/v1.1.1.tar.gz -> redis_exporter-1.1.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=015138e7484ffb0c20b1599002e06748
diff --git a/metadata/md5-cache/app-metrics/redis_exporter-1.2.0 b/metadata/md5-cache/app-metrics/redis_exporter-1.2.0
index 91d6613c8e9f..3969351ea152 100644
--- a/metadata/md5-cache/app-metrics/redis_exporter-1.2.0
+++ b/metadata/md5-cache/app-metrics/redis_exporter-1.2.0
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/oliver006/redis_exporter/archive/v1.2.0.tar.gz -> redis_exporter-1.2.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=40cd3b572fa7ee0ea9f210c259c059b7
diff --git a/metadata/md5-cache/app-metrics/redis_exporter-1.2.1 b/metadata/md5-cache/app-metrics/redis_exporter-1.2.1
index dcf08cf4438a..c985402a3a48 100644
--- a/metadata/md5-cache/app-metrics/redis_exporter-1.2.1
+++ b/metadata/md5-cache/app-metrics/redis_exporter-1.2.1
@@ -8,5 +8,5 @@ LICENSE=MIT Apache-2.0 BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/oliver006/redis_exporter/archive/v1.2.1.tar.gz -> redis_exporter-1.2.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e6a773cf5335c098a823c97c7e8dde6f
diff --git a/metadata/md5-cache/app-metrics/snmp_exporter-0.15.0 b/metadata/md5-cache/app-metrics/snmp_exporter-0.15.0
index ba093e72c6ef..ca36a314c9a1 100644
--- a/metadata/md5-cache/app-metrics/snmp_exporter-0.15.0
+++ b/metadata/md5-cache/app-metrics/snmp_exporter-0.15.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prometheus/snmp_exporter/archive/v0.15.0.tar.gz -> snmp_exporter-0.15.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b1c7e6d3bdf96abfde3148560bff06e6
diff --git a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0 b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
index 5032a1d6806f..b16a1f57801f 100644
--- a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
+++ b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.7.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD ISC MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/timonwong/uwsgi_exporter/archive/v0.7.0.tar.gz -> uwsgi_exporter-0.7.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=abf688fcc9fd4b931179faf1637fb89c
diff --git a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0 b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0
index 04689cb86376..2b0a9eaca7c4 100644
--- a/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0
+++ b/metadata/md5-cache/app-metrics/uwsgi_exporter-0.8.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD ISC MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/timonwong/uwsgi_exporter/archive/v0.8.0.tar.gz -> uwsgi_exporter-0.8.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bf83c4aaba16b54152b146c827298e91
diff --git a/metadata/md5-cache/app-metrics/vault_exporter-0.1.2 b/metadata/md5-cache/app-metrics/vault_exporter-0.1.2
index e788f7f350f1..b32adb7b0ce5 100644
--- a/metadata/md5-cache/app-metrics/vault_exporter-0.1.2
+++ b/metadata/md5-cache/app-metrics/vault_exporter-0.1.2
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD MIT MPL-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/grapeshot/vault_exporter/archive/v0.1.2.tar.gz -> vault_exporter-0.1.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9bd6cb39914cd7f1fcde7fa5003743d2
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index cb94d1dcc3ad..fcff8e434a15 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/anki-2.1.0_beta25 b/metadata/md5-cache/app-misc/anki-2.1.0_beta25
index d14a26cad610..a8c6f391087c 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.0_beta25
+++ b/metadata/md5-cache/app-misc/anki-2.1.0_beta25
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)] ) ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A spaced-repetition memory training program (flash cards)
 EAPI=6
 HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound test +python_targets_python3_6 +python_single_target_python3_6
+IUSE=latex +recording +sound test +python_single_target_python3_6
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,svg,webkit,python_targets_python3_6(-)] >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)] ) ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7fac44858ba247ac04dc675a8b52dbda
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=df1b2f2db27647e746b2ef79d04d217e
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 57674363ff04..5d9288d94098 100644
--- a/metadata/md5-cache/app-misc/anki-2.1.0_beta27
+++ b/metadata/md5-cache/app-misc/anki-2.1.0_beta27
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQtWebEngine[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)] dev-python/PyQtWebEngine[python_targets_python3_6(-)] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)] ) ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng ) test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A spaced-repetition memory training program (flash cards)
 EAPI=6
 HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound test +python_targets_python3_6 +python_single_target_python3_6
+IUSE=latex +recording +sound test +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQtWebEngine[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)] dev-python/PyQtWebEngine[python_targets_python3_6(-)] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] recording? ( media-sound/lame >=dev-python/pyaudio-0.2.4[python_targets_python3_6(-)] ) ) sound? ( media-video/mplayer ) latex? ( app-text/texlive app-text/dvipng )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5523fe76fae11879b4dff6f8664c02c8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b63941a7d7418b2818826376041a0aa
diff --git a/metadata/md5-cache/app-misc/anki-2.1.13 b/metadata/md5-cache/app-misc/anki-2.1.13
deleted file mode 100644
index 17934ecb6a7d..000000000000
--- a/metadata/md5-cache/app-misc/anki-2.1.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQtWebEngine[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame ) sound? ( media-video/mpv ) latex? ( app-text/texlive app-text/dvipng ) test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A spaced-repetition memory training program (flash cards)
-EAPI=6
-HOMEPAGE=https://apps.ankiweb.net
-IUSE=latex +recording +sound test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQtWebEngine[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] recording? ( media-sound/lame ) sound? ( media-video/mpv ) latex? ( app-text/texlive app-text/dvipng )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://apps.ankiweb.net/downloads/current/anki-2.1.13-source.tgz -> anki-2.1.13.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a105fc2af8c8d301098686d05623c917
diff --git a/metadata/md5-cache/app-misc/anki-2.1.13-r1 b/metadata/md5-cache/app-misc/anki-2.1.13-r1
new file mode 100644
index 000000000000..07e6c322e75e
--- /dev/null
+++ b/metadata/md5-cache/app-misc/anki-2.1.13-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)] dev-python/PyQtWebEngine[python_targets_python3_6(-)] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] ) recording? ( media-sound/lame ) sound? ( media-video/mpv ) latex? ( app-text/texlive app-text/dvipng ) test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A spaced-repetition memory training program (flash cards)
+EAPI=6
+HOMEPAGE=https://apps.ankiweb.net
+IUSE=latex +recording +sound test +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( || ( ( >=dev-python/PyQt5-5.12[gui,svg,widgets,python_targets_python3_6(-)] dev-python/PyQtWebEngine[python_targets_python3_6(-)] ) <dev-python/PyQt5-5.12[gui,svg,webengine,widgets,python_targets_python3_6(-)] ) >=dev-python/httplib2-0.7.4[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] ) recording? ( media-sound/lame ) sound? ( media-video/mpv ) latex? ( app-text/texlive app-text/dvipng )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://apps.ankiweb.net/downloads/current/anki-2.1.13-source.tgz -> anki-2.1.13.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c93a7588e9aed4861e5bb4398c40646
diff --git a/metadata/md5-cache/app-misc/asciinema-2.0.2 b/metadata/md5-cache/app-misc/asciinema-2.0.2
index a93499148110..179b7b453b45 100644
--- a/metadata/md5-cache/app-misc/asciinema-2.0.2
+++ b/metadata/md5-cache/app-misc/asciinema-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asciinema/asciinema/archive/v2.0.2.tar.gz -> asciinema-2.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=efb3648abd302159d9a56c9dd205d798
diff --git a/metadata/md5-cache/app-misc/beanstalkd-1.10 b/metadata/md5-cache/app-misc/beanstalkd-1.10
index 884ed5b52773..03b78c7959d3 100644
--- a/metadata/md5-cache/app-misc/beanstalkd-1.10
+++ b/metadata/md5-cache/app-misc/beanstalkd-1.10
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/kr/beanstalkd/archive/v1.10.tar.gz -> beanstalkd-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e7676e1b37552ee79409af6b71c0eaf
diff --git a/metadata/md5-cache/app-misc/binwalk-2.1.1 b/metadata/md5-cache/app-misc/binwalk-2.1.1
index b67b01784aad..ad5659799043 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=graph? ( dev-python/pyqtgraph[opengl,python_targets_python3_6(-)?,-pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/ReFirmLabs/binwalk/archive/v2.1.1.tar.gz -> binwalk-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee2e40862a5a8a63dc860252d0ecd242
diff --git a/metadata/md5-cache/app-misc/binwalk-2.2.0 b/metadata/md5-cache/app-misc/binwalk-2.2.0
index 0409d04f3500..6591352bf073 100644
--- a/metadata/md5-cache/app-misc/binwalk-2.2.0
+++ b/metadata/md5-cache/app-misc/binwalk-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ReFirmLabs/binwalk/archive/v2.2.0.tar.gz -> binwalk-2.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a11a5e382ef1c58e1be49a4751db217d
diff --git a/metadata/md5-cache/app-misc/binwalk-9999 b/metadata/md5-cache/app-misc/binwalk-9999
index 9f82818e7245..b58436e66cf1 100644
--- a/metadata/md5-cache/app-misc/binwalk-9999
+++ b/metadata/md5-cache/app-misc/binwalk-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a11a5e382ef1c58e1be49a4751db217d
diff --git a/metadata/md5-cache/app-misc/byobu-5.123 b/metadata/md5-cache/app-misc/byobu-5.123
deleted file mode 100644
index dd95a1f07684..000000000000
--- a/metadata/md5-cache/app-misc/byobu-5.123
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
-EAPI=6
-HOMEPAGE=http://byobu.co
-IUSE=screen +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/newt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://launchpad.net/byobu/trunk/5.123/+download/byobu_5.123.orig.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7e0a42a01b049c46d91155c5ec6273b5
diff --git a/metadata/md5-cache/app-misc/byobu-5.123-r1 b/metadata/md5-cache/app-misc/byobu-5.123-r1
new file mode 100644
index 000000000000..992974ab14a7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/byobu-5.123-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
+EAPI=6
+HOMEPAGE=http://byobu.co
+IUSE=screen +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_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/newt[python_targets_python2_7(-)] ) screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://launchpad.net/byobu/trunk/5.123/+download/byobu_5.123.orig.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a0ac22644f7c9ef5350bd185c9632cc1
diff --git a/metadata/md5-cache/app-misc/byobu-5.124 b/metadata/md5-cache/app-misc/byobu-5.124
index eb876d540842..cd8b2ec0f9fe 100644
--- a/metadata/md5-cache/app-misc/byobu-5.124
+++ b/metadata/md5-cache/app-misc/byobu-5.124
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
 EAPI=6
 HOMEPAGE=http://byobu.co
-IUSE=screen +python_targets_python2_7 +python_single_target_python2_7
+IUSE=screen +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/newt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/newt[python_targets_python2_7(-)] ) screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/byobu/trunk/5.124/+download/byobu_5.124.orig.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a0eb2ed40d1e92060ed79cc820e32e12
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4c28572ebcc116a49c400b8537801ffc
diff --git a/metadata/md5-cache/app-misc/byobu-5.125 b/metadata/md5-cache/app-misc/byobu-5.125
index f34b3a51819d..6f3cd2ad51c0 100644
--- a/metadata/md5-cache/app-misc/byobu-5.125
+++ b/metadata/md5-cache/app-misc/byobu-5.125
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
 EAPI=6
 HOMEPAGE=http://byobu.co
-IUSE=screen +python_targets_python2_7 +python_single_target_python2_7
+IUSE=screen +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/newt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/newt[python_targets_python2_7(-)] ) screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/byobu/trunk/5.125/+download/byobu_5.125.orig.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=74ab63f9080466d092c7a05d4f541597
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4c28572ebcc116a49c400b8537801ffc
diff --git a/metadata/md5-cache/app-misc/byobu-5.129 b/metadata/md5-cache/app-misc/byobu-5.129
index ba077f62dba4..42d04bc18306 100644
--- a/metadata/md5-cache/app-misc/byobu-5.129
+++ b/metadata/md5-cache/app-misc/byobu-5.129
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
 EAPI=7
 HOMEPAGE=http://byobu.co
-IUSE=screen python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=screen python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/newt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-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 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python2_7? ( dev-libs/newt[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-libs/newt[python_targets_python3_6(-)] ) screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/byobu/trunk/5.129/+download/byobu_5.129.orig.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7dbd026d0004d6ae3295dbff89151fda
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=865896d315f8b0e1e2974a9be159bb41
diff --git a/metadata/md5-cache/app-misc/byobu-5.130 b/metadata/md5-cache/app-misc/byobu-5.130
deleted file mode 100644
index b171c50d0599..000000000000
--- a/metadata/md5-cache/app-misc/byobu-5.130
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
-EAPI=7
-HOMEPAGE=http://byobu.co
-IUSE=screen python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/newt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://launchpad.net/byobu/trunk/5.130/+download/byobu_5.130.orig.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=342bf78307c9905a5eed8935fa4eb873
diff --git a/metadata/md5-cache/app-misc/byobu-5.130-r1 b/metadata/md5-cache/app-misc/byobu-5.130-r1
new file mode 100644
index 000000000000..d346ce111723
--- /dev/null
+++ b/metadata/md5-cache/app-misc/byobu-5.130-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
+EAPI=7
+HOMEPAGE=http://byobu.co
+IUSE=screen python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-libs/newt[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/newt[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/newt[python_targets_python3_8(-)] ) screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://launchpad.net/byobu/trunk/5.130/+download/byobu_5.130.orig.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=62a854c5c113ca6ce6b28fba285551cb
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20190110.3.43 b/metadata/md5-cache/app-misc/ca-certificates-20190110.3.43
index a957afe7910e..f52bf290d248 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20190110.3.43
+++ b/metadata/md5-cache/app-misc/ca-certificates-20190110.3.43
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 )
 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_20190110.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_43_RTM/src/nss-3.43.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=83700d587a7b9a1c200e3d8c4eb37bf2
+_md5_=7f98ac7aa4d03de8a97e0ab6d9055720
diff --git a/metadata/md5-cache/app-misc/carbon-c-relay-3.4 b/metadata/md5-cache/app-misc/carbon-c-relay-3.4
index 377832334190..364099e5322f 100644
--- a/metadata/md5-cache/app-misc/carbon-c-relay-3.4
+++ b/metadata/md5-cache/app-misc/carbon-c-relay-3.4
@@ -10,5 +10,5 @@ RDEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip
 REQUIRED_USE=pcre2? ( !oniguruma ) oniguruma? ( !pcre2 )
 SLOT=0
 SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.4/carbon-c-relay-3.4.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=dc3ef382aa6c47c0cd677862a9ad3d5a
diff --git a/metadata/md5-cache/app-misc/carbon-c-relay-3.5 b/metadata/md5-cache/app-misc/carbon-c-relay-3.5
index ba592e09229d..26b4bfc4683d 100644
--- a/metadata/md5-cache/app-misc/carbon-c-relay-3.5
+++ b/metadata/md5-cache/app-misc/carbon-c-relay-3.5
@@ -10,5 +10,5 @@ RDEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip
 REQUIRED_USE=pcre2? ( !oniguruma ) oniguruma? ( !pcre2 )
 SLOT=0
 SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.5/carbon-c-relay-3.5.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bed2147ffcb4d0f137b97e54c66a3920
diff --git a/metadata/md5-cache/app-misc/carbon-c-relay-3.6 b/metadata/md5-cache/app-misc/carbon-c-relay-3.6
index c2c7c5b0598a..fc6561a3fb95 100644
--- a/metadata/md5-cache/app-misc/carbon-c-relay-3.6
+++ b/metadata/md5-cache/app-misc/carbon-c-relay-3.6
@@ -10,5 +10,5 @@ RDEPEND=lz4? ( app-arch/lz4 ) snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip
 REQUIRED_USE=pcre2? ( !oniguruma ) oniguruma? ( !pcre2 )
 SLOT=0
 SRC_URI=https://github.com/grobian/carbon-c-relay/releases/download/v3.6/carbon-c-relay-3.6.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=74db6792b4b6edb8121a9d17e5c40054
diff --git a/metadata/md5-cache/app-misc/chkcrontab-1.7 b/metadata/md5-cache/app-misc/chkcrontab-1.7
index 590d86e95954..cc174653f838 100644
--- a/metadata/md5-cache/app-misc/chkcrontab-1.7
+++ b/metadata/md5-cache/app-misc/chkcrontab-1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lyda/chkcrontab/archive/v1.7.tar.gz -> chkcrontab-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ea4b56b402a681737d827953899cc53
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.1 b/metadata/md5-cache/app-misc/ddcutil-0.9.1
index d3a72d88ef07..12f903512539 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5c2b02524e6e44d883e260a425993b1c
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.5 b/metadata/md5-cache/app-misc/ddcutil-0.9.5
index c11134b33196..e729e234d70f 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.9.5
+++ b/metadata/md5-cache/app-misc/ddcutil-0.9.5
@@ -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.5.tar.gz -> ddcutil-0.9.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8d716e1ab6965b7bcea2edccd584abfa
diff --git a/metadata/md5-cache/app-misc/elasticsearch-5.6.16 b/metadata/md5-cache/app-misc/elasticsearch-5.6.16
index 62f94e92d820..98dcb2af8915 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-5.6.16
+++ b/metadata/md5-cache/app-misc/elasticsearch-5.6.16
@@ -8,5 +8,5 @@ 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.16.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0100b52784be0927302b3f47baa00117
diff --git a/metadata/md5-cache/app-misc/elasticsearch-6.7.1 b/metadata/md5-cache/app-misc/elasticsearch-6.7.1
index f178fb9d2dcf..530a9176ebe9 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-6.7.1
+++ b/metadata/md5-cache/app-misc/elasticsearch-6.7.1
@@ -9,5 +9,5 @@ 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.7.1.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.7.1.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=510458d71ae7e7bab710cbf1ae503996
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.2.1 b/metadata/md5-cache/app-misc/elasticsearch-7.2.1
index 1e6b663ffb2c..966a72b7b925 100644
--- a/metadata/md5-cache/app-misc/elasticsearch-7.2.1
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.2.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
 RDEPEND=virtual/jre
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=113f0d8e85d6af24ff35448fb9831e1e
diff --git a/metadata/md5-cache/app-misc/email2trac-2.6.2-r1 b/metadata/md5-cache/app-misc/email2trac-2.6.2-r1
index f08777fb3b66..f4f1e0f8057e 100644
--- a/metadata/md5-cache/app-misc/email2trac-2.6.2-r1
+++ b/metadata/md5-cache/app-misc/email2trac-2.6.2-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure prepare setup
 DESCRIPTION=Utilities to convert emails to trac tickets
 EAPI=5
 HOMEPAGE=https://oss.trac.surfsara.nl/email2trac
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) <www-apps/trac-1.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) <www-apps/trac-1.1[python_single_target_python2_7(-)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.sara.nl/pub/outgoing/email2trac-2.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d13483b967b227d58aa1ab9a88d44659
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9b4899197a9753a3e5c56bb836560774
diff --git a/metadata/md5-cache/app-misc/email2trac-2.8.4 b/metadata/md5-cache/app-misc/email2trac-2.8.4
index 9ca798d092c5..050539e6c097 100644
--- a/metadata/md5-cache/app-misc/email2trac-2.8.4
+++ b/metadata/md5-cache/app-misc/email2trac-2.8.4
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure prepare setup
 DESCRIPTION=Utilities to convert emails to trac tickets
 EAPI=5
 HOMEPAGE=https://oss.trac.surfsara.nl/email2trac
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) <www-apps/trac-1.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) <www-apps/trac-1.2[python_single_target_python2_7(-)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.sara.nl/pub/outgoing/email2trac-2.8.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad0fa3f47692c73c003e0b363fc59f9a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9e155d28f2e52bf8658b2241697bd312
diff --git a/metadata/md5-cache/app-misc/email2trac-2.8.8 b/metadata/md5-cache/app-misc/email2trac-2.8.8
deleted file mode 100644
index 9a94d5c2dfd2..000000000000
--- a/metadata/md5-cache/app-misc/email2trac-2.8.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DESCRIPTION=Utilities to convert emails to trac tickets
-EAPI=5
-HOMEPAGE=https://oss.trac.surfsara.nl/email2trac
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) <www-apps/trac-1.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=ftp://ftp.sara.nl/pub/outgoing/email2trac-2.8.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad0fa3f47692c73c003e0b363fc59f9a
diff --git a/metadata/md5-cache/app-misc/email2trac-2.8.8-r1 b/metadata/md5-cache/app-misc/email2trac-2.8.8-r1
new file mode 100644
index 000000000000..1d42088b85a4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/email2trac-2.8.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare setup
+DESCRIPTION=Utilities to convert emails to trac tickets
+EAPI=5
+HOMEPAGE=https://oss.trac.surfsara.nl/email2trac
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) <www-apps/trac-1.2[python_single_target_python2_7(-)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=ftp://ftp.sara.nl/pub/outgoing/email2trac-2.8.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9e155d28f2e52bf8658b2241697bd312
diff --git a/metadata/md5-cache/app-misc/evemu-2.6.0 b/metadata/md5-cache/app-misc/evemu-2.6.0
index d4d0300b5677..52758bd4f64f 100644
--- a/metadata/md5-cache/app-misc/evemu-2.6.0
+++ b/metadata/md5-cache/app-misc/evemu-2.6.0
@@ -3,12 +3,12 @@ DEPEND=app-arch/xz-utils python? ( python_single_target_python2_7? ( >=dev-lang/
 DESCRIPTION=tools and bindings for kernel evdev device emulation, data capture, and replay
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Evemu/
-IUSE=python static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=python static-libs +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3 GPL-3
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/libevdev-1.2.99.902
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/evemu/evemu-2.6.0.tar.xz
-_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a35392370840d88f9df525599d4c389c
diff --git a/metadata/md5-cache/app-misc/evemu-2.7.0 b/metadata/md5-cache/app-misc/evemu-2.7.0
index bbf16e83d065..afefe634e47e 100644
--- a/metadata/md5-cache/app-misc/evemu-2.7.0
+++ b/metadata/md5-cache/app-misc/evemu-2.7.0
@@ -3,12 +3,12 @@ DEPEND=app-arch/xz-utils python? ( python_single_target_python2_7? ( >=dev-lang/
 DESCRIPTION=tools and bindings for kernel evdev device emulation, data capture, and replay
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Evemu/
-IUSE=python static-libs python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python static-libs python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3 GPL-3
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) >=dev-libs/libevdev-1.2.99.902
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/evemu/evemu-2.7.0.tar.xz
-_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e102741b3e4d6b05364286bfc1d9344a
diff --git a/metadata/md5-cache/app-misc/gcalcli-4.2.0 b/metadata/md5-cache/app-misc/gcalcli-4.2.0
index d383caefb58f..899552729365 100644
--- a/metadata/md5-cache/app-misc/gcalcli-4.2.0
+++ b/metadata/md5-cache/app-misc/gcalcli-4.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/insanum/gcalcli/archive/v4.2.0.tar.gz -> gcalcli-4.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c96f3fa8be49b6edd3fdf2b80d0be684
diff --git a/metadata/md5-cache/app-misc/geneweb-6.08-r1 b/metadata/md5-cache/app-misc/geneweb-6.08-r1
index a8ca9fa0f2c5..f3aac586f661 100644
--- a/metadata/md5-cache/app-misc/geneweb-6.08-r1
+++ b/metadata/md5-cache/app-misc/geneweb-6.08-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/ocaml[ocamlopt?] dev-ml/camlp5[ocamlopt?]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/geneweb/geneweb/archive/v6.08.tar.gz -> geneweb-6.08.tar.gz https://dev.gentoo.org/~tupone/geneweb-6.08-ocaml-4.patch.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e75bfd826e79c66e1a482a66aca32b38
diff --git a/metadata/md5-cache/app-misc/gentoo-0.20.7 b/metadata/md5-cache/app-misc/gentoo-0.20.7
index 84b66878ffca..398b8ef37c7a 100644
--- a/metadata/md5-cache/app-misc/gentoo-0.20.7
+++ b/metadata/md5-cache/app-misc/gentoo-0.20.7
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical file manager for Unix-like systems, using GTK+
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/gentoo/
 IUSE=nls
-KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>x11-libs/gtk+-3.12:3 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/gentoo/gentoo-0.20.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b337a49895c21176e7282d30b8f53b5
+_md5_=01eb7d70a29d047241079c336f823fe1
diff --git a/metadata/md5-cache/app-misc/geoclue-2.4.13 b/metadata/md5-cache/app-misc/geoclue-2.4.13
index cea0cc0a8678..48a5f4ceaf71 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.4.13
+++ b/metadata/md5-cache/app-misc/geoclue-2.4.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.44: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 x11-libs/libnotify
 SLOT=2.0
 SRC_URI=https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.4.13/geoclue-2.4.13.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=30cc455ce53c552f6b8c1041c629ee2c
diff --git a/metadata/md5-cache/app-misc/geoclue-2.5.3-r2 b/metadata/md5-cache/app-misc/geoclue-2.5.3-r2
index 537bf97c0beb..6a3c28dc2669 100644
--- a/metadata/md5-cache/app-misc/geoclue-2.5.3-r2
+++ b/metadata/md5-cache/app-misc/geoclue-2.5.3-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.14.0 >=net-libs/libsoup-2.
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.0
 SRC_URI=https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.5.3/geoclue-2.5.3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9860a962c6d3f3ec9f205b21ea22c4b1
diff --git a/metadata/md5-cache/app-misc/golly-3.2 b/metadata/md5-cache/app-misc/golly-3.2
index 139ee74e7626..b5f4687b1986 100644
--- a/metadata/md5-cache/app-misc/golly-3.2
+++ b/metadata/md5-cache/app-misc/golly-3.2
@@ -3,12 +3,12 @@ DEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0[X,opengl,tiff?]
 DESCRIPTION=simulator for Conway's Game of Life and other cellular automata
 EAPI=6
 HOMEPAGE=http://golly.sourceforge.net/
-IUSE=tiff +python_targets_python2_7 +python_single_target_python2_7
+IUSE=tiff +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0[X,opengl,tiff?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-3.2-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=654838d0385a809e9d99d64538cf2171
diff --git a/metadata/md5-cache/app-misc/golly-3.3 b/metadata/md5-cache/app-misc/golly-3.3
index f6812476ea20..bbacc1dea7b1 100644
--- a/metadata/md5-cache/app-misc/golly-3.3
+++ b/metadata/md5-cache/app-misc/golly-3.3
@@ -3,12 +3,12 @@ DEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0[X,opengl,tiff?]
 DESCRIPTION=simulator for Conway's Game of Life and other cellular automata
 EAPI=7
 HOMEPAGE=http://golly.sourceforge.net/
-IUSE=tiff +python_targets_python2_7 +python_single_target_python2_7
+IUSE=tiff +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/opengl sys-libs/zlib x11-libs/wxGTK:3.0[X,opengl,tiff?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/golly/golly-3.3-src.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2256aaf806f93d2f2de8c86a27dd463
diff --git a/metadata/md5-cache/app-misc/goobook-3.4 b/metadata/md5-cache/app-misc/goobook-3.4
index eb4804bbca74..b955c1929be5 100644
--- a/metadata/md5-cache/app-misc/goobook-3.4
+++ b/metadata/md5-cache/app-misc/goobook-3.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/goobook/goobook-3.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ed4119990029f6047a19d5727650d949
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 c93e26b370e0..a35d86ea8bf4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32b3c320f718b00018a6a883ef169707
diff --git a/metadata/md5-cache/app-misc/gramps-5.0.1 b/metadata/md5-cache/app-misc/gramps-5.0.1
deleted file mode 100644
index 299fd65fed86..000000000000
--- a/metadata/md5-cache/app-misc/gramps-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DESCRIPTION=Genealogical Research and Analysis Management Programming System
-EAPI=7
-HOMEPAGE=https://gramps-project.org/
-IUSE=+rcs +reports exif geo postscript spell +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/bsddb3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyicu[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,introspection] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/gramps-project/gramps/archive/v5.0.1.tar.gz -> gramps-5.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64c374bfdbcb4fb16b50af03630e3a9b
diff --git a/metadata/md5-cache/app-misc/gramps-5.0.1-r1 b/metadata/md5-cache/app-misc/gramps-5.0.1-r1
new file mode 100644
index 000000000000..ab4812b352fe
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-5.0.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Genealogical Research and Analysis Management Programming System
+EAPI=7
+HOMEPAGE=https://gramps-project.org/
+IUSE=+rcs +reports exif geo postscript spell +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-python/bsddb3[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)] dev-python/pyicu[python_targets_python3_6(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_6(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/gramps-project/gramps/archive/v5.0.1.tar.gz -> gramps-5.0.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4a5510c1216f35347c4b2b8d60d0cae
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.1 b/metadata/md5-cache/app-misc/gramps-5.1.1
index 24a6bcfaf1ec..ab6b5138623c 100644
--- a/metadata/md5-cache/app-misc/gramps-5.1.1
+++ b/metadata/md5-cache/app-misc/gramps-5.1.1
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DESCRIPTION=Genealogical Research and Analysis Management Programming System
 EAPI=7
 HOMEPAGE=https://gramps-project.org/
-IUSE=+rcs +reports exif geo postscript spell +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+rcs +reports exif geo postscript spell +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-python/bsddb3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyicu[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,introspection] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-python/bsddb3[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)] dev-python/pyicu[python_targets_python3_6(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_6(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.1.tar.gz -> gramps-5.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=973bb4c3a338c9502ee9c9d3ff20a5dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0ae20996a5854ee9dfad81439681e188
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.2 b/metadata/md5-cache/app-misc/gramps-5.1.2
deleted file mode 100644
index bf720dde6ed7..000000000000
--- a/metadata/md5-cache/app-misc/gramps-5.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DESCRIPTION=Genealogical Research and Analysis Management Programming System
-EAPI=7
-HOMEPAGE=https://gramps-project.org/
-IUSE=+rcs +reports exif geo postscript spell python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/bsddb3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyicu[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,introspection] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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/gramps-project/gramps/archive/v5.1.2.tar.gz -> gramps-5.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aba275a7bca3dda7b34b63a98fb98947
diff --git a/metadata/md5-cache/app-misc/gramps-5.1.2-r1 b/metadata/md5-cache/app-misc/gramps-5.1.2-r1
new file mode 100644
index 000000000000..8de1dc78e2e6
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-5.1.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=Genealogical Research and Analysis Management Programming System
+EAPI=7
+HOMEPAGE=https://gramps-project.org/
+IUSE=+rcs +reports exif geo postscript spell python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-python/bsddb3[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)] dev-python/pyicu[python_targets_python3_6(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_6(-),introspection] ) ) python_single_target_python3_7? ( dev-python/bsddb3[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_7(-)] dev-python/pyicu[python_targets_python3_7(-)] exif? ( >=media-libs/gexiv2-0.5[python_targets_python3_7(-),introspection] ) ) gnome-base/librsvg:2 >x11-libs/gtk+-3.14.8:3[introspection] x11-libs/pango[introspection] x11-misc/xdg-utils reports? ( media-gfx/graphviz[postscript?] ) geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) spell? ( app-text/gtkspell:3[introspection] ) rcs? ( dev-vcs/rcs ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/gramps-project/gramps/archive/v5.1.2.tar.gz -> gramps-5.1.2.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b941bf4d691e962fe5537594657a845a
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 a8115c26f861..49c694a1655b 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=62a8904126acf3ec7527923c968e4991
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 929bad477532..80d88bc22d5e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bfed100e5d821019750a8c83485ac12
diff --git a/metadata/md5-cache/app-misc/hivex-1.3.14 b/metadata/md5-cache/app-misc/hivex-1.3.14
index 648991a6b475..b2cd27b700a5 100644
--- a/metadata/md5-cache/app-misc/hivex-1.3.14
+++ b/metadata/md5-cache/app-misc/hivex-1.3.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby24? ( ruby? ( dev-ruby/rake[ruby_targets_ruby24(-)] virtual/rubygems[ruby_targets_ruby24(-)] dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( ruby? ( dev-ruby/rake[ruby_targets_ruby25(-)] virtual/rubygems[ruby_targets_ruby25(-)] dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) test? ( ruby_targets_ruby24? ( ruby? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) ) dev-lang/perl
+DEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) perl? ( test? ( dev-perl/Pod-Coverage dev-perl/Test-Pod-Coverage ) ) ruby_targets_ruby24? ( ruby? ( dev-ruby/rake[ruby_targets_ruby24(-)] virtual/rubygems[ruby_targets_ruby24(-)] dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( ruby? ( dev-ruby/rake[ruby_targets_ruby25(-)] virtual/rubygems[ruby_targets_ruby25(-)] dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) test? ( ruby_targets_ruby24? ( ruby? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) ) dev-lang/perl
 DESCRIPTION=Library for reading and writing Windows Registry 'hive' binary files
 EAPI=6
 HOMEPAGE=http://libguestfs.org
-IUSE=ocaml readline +perl python test static-libs ruby test ruby_targets_ruby24 ruby_targets_ruby25 python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=ocaml readline +perl python test static-libs ruby test ruby_targets_ruby24 ruby_targets_ruby25 +python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby_targets_ruby24? ( ruby? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) dev-lang/perl:=
-REQUIRED_USE=python? ( ^^ ( 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 ) ) ruby? ( || ( ruby_targets_ruby24 ruby_targets_ruby25 ) )
+RDEPEND=virtual/libiconv virtual/libintl dev-libs/libxml2:2 ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) readline? ( sys-libs/readline:0 ) perl? ( dev-lang/perl:= dev-perl/IO-stringy ) ruby? ( ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby_targets_ruby24? ( ruby? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( ruby? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ) dev-lang/perl:=
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) ) ruby? ( || ( ruby_targets_ruby24 ruby_targets_ruby25 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://libguestfs.org/download/hivex/hivex-1.3.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34bbb286be9d90433b5e26d4f7280b8a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=028f79b065bfd9120d1fe241adaa497e
diff --git a/metadata/md5-cache/app-misc/icdiff-1.9.1 b/metadata/md5-cache/app-misc/icdiff-1.9.1
index f2eac0769e80..e633453fe47e 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_6 )
 SLOT=0
 SRC_URI=https://github.com/jeffkaufman/icdiff/archive/release-1.9.1.tar.gz -> icdiff-1.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5ae93e68b692b92559cb0ee5cf9f42bc
diff --git a/metadata/md5-cache/app-misc/jot-9.0-r1 b/metadata/md5-cache/app-misc/jot-9.0-r1
index b840d9cea934..3144b11dd105 100644
--- a/metadata/md5-cache/app-misc/jot-9.0-r1
+++ b/metadata/md5-cache/app-misc/jot-9.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.mit.edu/afs/athena/system/rhlinux/athena-9.0/free/SRPMS/athena-jot-9.0-3.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=361537c1db8665bded9fa252ef3c6033
diff --git a/metadata/md5-cache/app-misc/khal-0.10.1-r1 b/metadata/md5-cache/app-misc/khal-0.10.1-r1
index 10e8220a8d3c..ff2c75750ace 100644
--- a/metadata/md5-cache/app-misc/khal-0.10.1-r1
+++ b/metadata/md5-cache/app-misc/khal-0.10.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/click-3.2[python_targets_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.10.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2e47c76153d2c289cd2c90417eae8c28
diff --git a/metadata/md5-cache/app-misc/khal-0.9.10 b/metadata/md5-cache/app-misc/khal-0.9.10
index ea935de6aab3..f2296b73c84f 100644
--- a/metadata/md5-cache/app-misc/khal-0.9.10
+++ b/metadata/md5-cache/app-misc/khal-0.9.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/click-3.2[python_targets_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khal/khal-0.9.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80cab6c95d338d1657270e796a00e441
diff --git a/metadata/md5-cache/app-misc/khard-0.11.4 b/metadata/md5-cache/app-misc/khard-0.11.4
index 95dceb9f2d9e..bf29183e62a0 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_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.11.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c42edb7e635d88fd9657e8ea4f2b3801
diff --git a/metadata/md5-cache/app-misc/khard-0.12.2 b/metadata/md5-cache/app-misc/khard-0.12.2
index db39c4b4c37c..6239c2a99747 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_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=198de3bf6a53c8c8298b9ee932aa341d
diff --git a/metadata/md5-cache/app-misc/khard-0.13.0 b/metadata/md5-cache/app-misc/khard-0.13.0
index e9359256352d..a9c16c1ac325 100644
--- a/metadata/md5-cache/app-misc/khard-0.13.0
+++ b/metadata/md5-cache/app-misc/khard-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/khard/khard-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea0ca86b6276a53730eecbb1f3b34439
diff --git a/metadata/md5-cache/app-misc/ktoblzcheck-1.49 b/metadata/md5-cache/app-misc/ktoblzcheck-1.49
index b6b8ff0fab02..163b0fda2908 100644
--- a/metadata/md5-cache/app-misc/ktoblzcheck-1.49
+++ b/metadata/md5-cache/app-misc/ktoblzcheck-1.49
@@ -3,12 +3,12 @@ DEPEND=app-text/recode sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/wget
 DESCRIPTION=Library to check account numbers and bank codes of German banks
 EAPI=7
 HOMEPAGE=http://ktoblzcheck.sourceforge.net/
-IUSE=python +python_targets_python2_7 +python_single_target_python2_7
+IUSE=python +python_single_target_python2_7
 KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/recode sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/wget www-client/lynx ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/ktoblzcheck/ktoblzcheck-1.49.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e2438d1a8b5cc5dcec3c96d38cd26081
diff --git a/metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r4 b/metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r4
index 96eb319b8eba..6936073cb2ce 100644
--- a/metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r4
+++ b/metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r4
@@ -4,12 +4,12 @@ DEPEND=dmalloc? ( dev-libs/dmalloc ) lcd_devices_astusb? ( virtual/libusb:0= ) l
 DESCRIPTION=A small program that grabs information and displays it on an external LCD
 EAPI=7
 HOMEPAGE=https://lcd4linux.bulix.org/
-IUSE=dmalloc outb lcd_devices_astusb lcd_devices_beckmannegle lcd_devices_bwct lcd_devices_crystalfontz lcd_devices_curses lcd_devices_cwlinux lcd_devices_d4d lcd_devices_dpf lcd_devices_ea232graphic lcd_devices_efn lcd_devices_futabavfd lcd_devices_fw8888 lcd_devices_g15 lcd_devices_glcd2usb lcd_devices_hd44780 lcd_devices_hd44780-i2c lcd_devices_irlcd lcd_devices_lcd2usb lcd_devices_lcdterm lcd_devices_ledmatrix lcd_devices_lph7508 lcd_devices_luise lcd_devices_lw_abp lcd_devices_m50530 lcd_devices_matrixorbital lcd_devices_matrixorbitalgx lcd_devices_milfordinstruments lcd_devices_mdm166a lcd_devices_newhaven lcd_devices_noritake lcd_devices_null lcd_devices_pertelian lcd_devices_phanderson lcd_devices_picgraphic lcd_devices_picolcd lcd_devices_picolcdgraphic lcd_devices_png lcd_devices_ppm lcd_devices_routerboard lcd_devices_sample lcd_devices_samsungspf lcd_devices_serdisplib lcd_devices_shuttlevfd lcd_devices_simplelcd lcd_devices_t6963 lcd_devices_teaklcm lcd_devices_trefon lcd_devices_ula200 lcd_devices_usbhub lcd_devices_usblcd lcd_devices_vnc lcd_devices_wincornixdorf lcd_devices_x11 apm asterisk button-exec cpuinfo dbus diskstats dvb exec event fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3 proc-stat python qnaplog raspi sample statfs uname uptime w1retap wireless +python_targets_python2_7 +python_single_target_python2_7
+IUSE=dmalloc outb lcd_devices_astusb lcd_devices_beckmannegle lcd_devices_bwct lcd_devices_crystalfontz lcd_devices_curses lcd_devices_cwlinux lcd_devices_d4d lcd_devices_dpf lcd_devices_ea232graphic lcd_devices_efn lcd_devices_futabavfd lcd_devices_fw8888 lcd_devices_g15 lcd_devices_glcd2usb lcd_devices_hd44780 lcd_devices_hd44780-i2c lcd_devices_irlcd lcd_devices_lcd2usb lcd_devices_lcdterm lcd_devices_ledmatrix lcd_devices_lph7508 lcd_devices_luise lcd_devices_lw_abp lcd_devices_m50530 lcd_devices_matrixorbital lcd_devices_matrixorbitalgx lcd_devices_milfordinstruments lcd_devices_mdm166a lcd_devices_newhaven lcd_devices_noritake lcd_devices_null lcd_devices_pertelian lcd_devices_phanderson lcd_devices_picgraphic lcd_devices_picolcd lcd_devices_picolcdgraphic lcd_devices_png lcd_devices_ppm lcd_devices_routerboard lcd_devices_sample lcd_devices_samsungspf lcd_devices_serdisplib lcd_devices_shuttlevfd lcd_devices_simplelcd lcd_devices_t6963 lcd_devices_teaklcm lcd_devices_trefon lcd_devices_ula200 lcd_devices_usbhub lcd_devices_usblcd lcd_devices_vnc lcd_devices_wincornixdorf lcd_devices_x11 apm asterisk button-exec cpuinfo dbus diskstats dvb exec event fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3 proc-stat python qnaplog raspi sample statfs uname uptime w1retap wireless +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dmalloc? ( dev-libs/dmalloc ) lcd_devices_astusb? ( virtual/libusb:0= ) lcd_devices_bwct? ( virtual/libusb:0= ) lcd_devices_curses? ( sys-libs/ncurses:0= ) lcd_devices_dpf? ( virtual/libusb:0= ) lcd_devices_g15? ( virtual/libusb:0= ) lcd_devices_glcd2usb? ( virtual/libusb:0= ) lcd_devices_irlcd? ( virtual/libusb:0= ) lcd_devices_lcd2usb? ( virtual/libusb:0= ) lcd_devices_ledmatrix? ( virtual/libusb:0= ) lcd_devices_luise? ( dev-libs/luise-bin virtual/libusb:0= ) lcd_devices_matrixorbitalgx? ( virtual/libusb:0= ) lcd_devices_mdm166a? ( virtual/libusb:0= ) lcd_devices_picolcd? ( virtual/libusb:0= ) lcd_devices_picolcdgraphic? ( virtual/libusb:0= ) lcd_devices_png? ( media-libs/gd[png] media-libs/libpng:0= ) lcd_devices_ppm? ( media-libs/gd ) lcd_devices_samsungspf? ( virtual/libusb:0= ) lcd_devices_serdisplib? ( dev-libs/serdisplib ) lcd_devices_shuttlevfd? ( virtual/libusb:0= ) lcd_devices_trefon? ( virtual/libusb:0= ) lcd_devices_ula200? ( dev-embedded/libftdi:1= virtual/libusb:0= ) lcd_devices_usbhub? ( virtual/libusb:0= ) lcd_devices_usblcd? ( virtual/libusb:0= ) lcd_devices_vnc? ( net-libs/libvncserver ) lcd_devices_x11? ( x11-libs/libX11 ) asterisk? ( net-misc/asterisk ) dbus? ( sys-apps/dbus ) gps? ( dev-libs/nmeap ) hddtemp? ( app-admin/hddtemp ) iconv? ( virtual/libiconv ) mpd? ( media-libs/libmpd ) mpris-dbus? ( sys-apps/dbus ) mysql? ( dev-db/mysql-connector-c:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) wireless? ( || ( net-wireless/iw net-wireless/wireless-tools ) )
-REQUIRED_USE=?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) || ( lcd_devices_astusb lcd_devices_beckmannegle lcd_devices_bwct lcd_devices_crystalfontz lcd_devices_curses lcd_devices_cwlinux lcd_devices_d4d lcd_devices_dpf lcd_devices_ea232graphic lcd_devices_efn lcd_devices_futabavfd lcd_devices_fw8888 lcd_devices_g15 lcd_devices_glcd2usb lcd_devices_hd44780 lcd_devices_hd44780-i2c lcd_devices_irlcd lcd_devices_lcd2usb lcd_devices_lcdterm lcd_devices_ledmatrix lcd_devices_lph7508 lcd_devices_luise lcd_devices_lw_abp lcd_devices_m50530 lcd_devices_matrixorbital lcd_devices_matrixorbitalgx lcd_devices_milfordinstruments lcd_devices_mdm166a lcd_devices_newhaven lcd_devices_noritake lcd_devices_null lcd_devices_pertelian lcd_devices_phanderson lcd_devices_picgraphic lcd_devices_picolcd lcd_devices_picolcdgraphic lcd_devices_png lcd_devices_ppm lcd_devices_routerboard lcd_devices_sample lcd_devices_samsungspf lcd_devices_serdisplib lcd_devices_shuttlevfd lcd_devices_simplelcd lcd_devices_t6963 lcd_devices_teaklcm lcd_devices_trefon lcd_devices_ula200 lcd_devices_usbhub lcd_devices_usblcd lcd_devices_vnc lcd_devices_wincornixdorf lcd_devices_x11 ) || ( apm asterisk button-exec cpuinfo dbus diskstats dvb exec event fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3 proc-stat python qnaplog raspi sample statfs uname uptime w1retap wireless )
+REQUIRED_USE=?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c ) python? ( ^^ ( python_single_target_python2_7 ) ) || ( lcd_devices_astusb lcd_devices_beckmannegle lcd_devices_bwct lcd_devices_crystalfontz lcd_devices_curses lcd_devices_cwlinux lcd_devices_d4d lcd_devices_dpf lcd_devices_ea232graphic lcd_devices_efn lcd_devices_futabavfd lcd_devices_fw8888 lcd_devices_g15 lcd_devices_glcd2usb lcd_devices_hd44780 lcd_devices_hd44780-i2c lcd_devices_irlcd lcd_devices_lcd2usb lcd_devices_lcdterm lcd_devices_ledmatrix lcd_devices_lph7508 lcd_devices_luise lcd_devices_lw_abp lcd_devices_m50530 lcd_devices_matrixorbital lcd_devices_matrixorbitalgx lcd_devices_milfordinstruments lcd_devices_mdm166a lcd_devices_newhaven lcd_devices_noritake lcd_devices_null lcd_devices_pertelian lcd_devices_phanderson lcd_devices_picgraphic lcd_devices_picolcd lcd_devices_picolcdgraphic lcd_devices_png lcd_devices_ppm lcd_devices_routerboard lcd_devices_sample lcd_devices_samsungspf lcd_devices_serdisplib lcd_devices_shuttlevfd lcd_devices_simplelcd lcd_devices_t6963 lcd_devices_teaklcm lcd_devices_trefon lcd_devices_ula200 lcd_devices_usbhub lcd_devices_usblcd lcd_devices_vnc lcd_devices_wincornixdorf lcd_devices_x11 ) || ( apm asterisk button-exec cpuinfo dbus diskstats dvb exec event fifo file gps hddtemp huawei i2c-sensors iconv isdn kvv loadavg meminfo mpd mpris-dbus mysql netdev netinfo pop3 proc-stat python qnaplog raspi sample statfs uname uptime w1retap wireless )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~conikost/files/lcd4linux-0.11.0_pre20170527.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=288717c95abf8a626b024b948bba344d
diff --git a/metadata/md5-cache/app-misc/lfm-2.3-r1 b/metadata/md5-cache/app-misc/lfm-2.3-r1
index 252abeb17761..1775b2941b9f 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6adeb9c9cd5c235a7acbc0da8bd1d0ac
diff --git a/metadata/md5-cache/app-misc/lfm-3.1 b/metadata/md5-cache/app-misc/lfm-3.1
index 78d326482e43..b822c9020915 100644
--- a/metadata/md5-cache/app-misc/lfm-3.1
+++ b/metadata/md5-cache/app-misc/lfm-3.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://inigo.katxi.org/devel/lfm/lfm-3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec8586389a69efc7d856ffd8938251ee
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1 b/metadata/md5-cache/app-misc/lirc-0.10.1
index 8a012eab642c..029edd32fe1a 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.1
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) <dev-python/pyyaml-5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( <dev-python/pyyaml-5[python_targets_python3_6(-)] ) python_single_target_python3_7? ( <dev-python/pyyaml-5[python_targets_python3_7(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
 DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
 EAPI=6
 HOMEPAGE=http://www.lirc.org/
-IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) <dev-python/pyyaml-5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) inputlirc? ( app-misc/inputlircd )
-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 ) gtk? ( X )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( <dev-python/pyyaml-5[python_targets_python3_6(-)] ) python_single_target_python3_7? ( <dev-python/pyyaml-5[python_targets_python3_7(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] python_single_target_python3_6? ( dev-python/pygobject[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject[python_targets_python3_7(-)] ) ) inputlirc? ( app-misc/inputlircd )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d952a23eaf77d637502d9ca54c10c5d2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4f89c1ce377700c3734b857af36558d
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r1 b/metadata/md5-cache/app-misc/lirc-0.10.1-r1
deleted file mode 100644
index 2c9e804e0d24..000000000000
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers
-DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
-EAPI=7
-HOMEPAGE=http://www.lirc.org/
-IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) inputlirc? ( app-misc/inputlircd )
-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 ) gtk? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce590061af3a8a1896e1694bc0ac5948
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r2 b/metadata/md5-cache/app-misc/lirc-0.10.1-r2
deleted file mode 100644
index dcf9cb8864f3..000000000000
--- a/metadata/md5-cache/app-misc/lirc-0.10.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers
-DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
-EAPI=7
-HOMEPAGE=http://www.lirc.org/
-IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) inputlirc? ( app-misc/inputlircd )
-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 ) gtk? ( X )
-SLOT=0
-SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb4bbbbadd746ef5e29f79418cc37f8b
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r3 b/metadata/md5-cache/app-misc/lirc-0.10.1-r3
new file mode 100644
index 000000000000..aeeaf02d8436
--- /dev/null
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers
+DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
+EAPI=7
+HOMEPAGE=http://www.lirc.org/
+IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~arm64 ppc ppc64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] python_single_target_python3_6? ( dev-python/pygobject[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject[python_targets_python3_7(-)] ) ) inputlirc? ( app-misc/inputlircd )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) gtk? ( X )
+SLOT=0
+SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c0b76fca22dbd94ba207d3a4298bb3a3
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.1-r4 b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
new file mode 100644
index 000000000000..1cd9cc96fd51
--- /dev/null
+++ b/metadata/md5-cache/app-misc/lirc-0.10.1-r4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers
+DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
+EAPI=7
+HOMEPAGE=http://www.lirc.org/
+IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X kernel_linux python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] python_single_target_python3_6? ( dev-python/pygobject[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject[python_targets_python3_7(-)] ) ) inputlirc? ( app-misc/inputlircd )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) gtk? ( X )
+SLOT=0
+SRC_URI=mirror://sourceforge/lirc/lirc-0.10.1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=856eee46b270a3a9fab9f2c4a93e499f
diff --git a/metadata/md5-cache/app-misc/livecd-tools-2.5 b/metadata/md5-cache/app-misc/livecd-tools-2.5
index e66608d73035..e0e4fadb2919 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-2.5
+++ b/metadata/md5-cache/app-misc/livecd-tools-2.5
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install setup
 DESCRIPTION=Gentoo LiveCD tools for autoconfiguration of hardware
 EAPI=6
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog net-dialup/mingetty >=sys-apps/baselayout-2 >=sys-apps/openrc-0.8.2-r1 sys-apps/pciutils sys-apps/gawk sys-apps/sed
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.5.tar.bz2
-_md5_=e81c06c35a1c10d71bb12ae2b71b54fa
+_md5_=0421b80367e55ac6e37b9db8568eb9ff
diff --git a/metadata/md5-cache/app-misc/livecd-tools-2.6 b/metadata/md5-cache/app-misc/livecd-tools-2.6
index 5191f0f85167..c0ed57925bdd 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-2.6
+++ b/metadata/md5-cache/app-misc/livecd-tools-2.6
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install setup
 DESCRIPTION=Gentoo LiveCD tools for autoconfiguration of hardware
 EAPI=6
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-util/dialog net-dialup/mingetty >=sys-apps/baselayout-2 >=sys-apps/openrc-0.8.2-r1 sys-apps/pciutils sys-apps/gawk sys-apps/sed
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/livecd-tools-2.6.tar.bz2
-_md5_=5a603525938ca4ce297b56bd2ea63352
+_md5_=b0007074313e866fb4f1d107f54d6002
diff --git a/metadata/md5-cache/app-misc/livecd-tools-9999 b/metadata/md5-cache/app-misc/livecd-tools-9999
index ac25d29fed62..782016f9e540 100644
--- a/metadata/md5-cache/app-misc/livecd-tools-9999
+++ b/metadata/md5-cache/app-misc/livecd-tools-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=install setup unpack
 DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Gentoo LiveCD tools for autoconfiguration of hardware
 EAPI=6
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-util/dialog net-dialup/mingetty >=sys-apps/baselayout-2 >=sys-apps/openrc-0.8.2-r1 sys-apps/pciutils sys-apps/gawk sys-apps/sed
 SLOT=0
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33
-_md5_=d7ff4999c024fea3d754a5390d56268d
+_md5_=81160fa874ed9e6b862136d54acc09cd
diff --git a/metadata/md5-cache/app-misc/mc-4.8.23-r2 b/metadata/md5-cache/app-misc/mc-4.8.23-r2
index 0c5bf000d90e..4931a59335ab 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.23-r2
+++ b/metadata/md5-cache/app-misc/mc-4.8.23-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GNU Midnight Commander is a text based file manager
 EAPI=7
 HOMEPAGE=https://www.midnight-commander.org
 IUSE=+edit gpm nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 REQUIRED_USE=spell? ( edit )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ftp.midnight-commander.org/mc-4.8.23.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5c1a88dff6f576efa793c58c5bf059bd
+_md5_=308b32429da5119d9ff382cd3446272f
diff --git a/metadata/md5-cache/app-misc/metromap-0.1.4-r1 b/metadata/md5-cache/app-misc/metromap-0.1.4-r1
deleted file mode 100644
index 2f93e8db16de..000000000000
--- a/metadata/md5-cache/app-misc/metromap-0.1.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.8:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-devel/gettext
-DESCRIPTION=Metromap is simple pygtk+2 programm for finding paths in metro(subway) maps
-EAPI=5
-HOMEPAGE=http://metromap.antex.ru/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.8:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://metromap.antex.ru/metromap-0.1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e51b740e2bf906e695fb94ca1ff8c3a
diff --git a/metadata/md5-cache/app-misc/metromap-0.1.4-r2 b/metadata/md5-cache/app-misc/metromap-0.1.4-r2
new file mode 100644
index 000000000000..0ab532d33030
--- /dev/null
+++ b/metadata/md5-cache/app-misc/metromap-0.1.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_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[python_targets_python2_7(-)] >=dev-python/pygtk-2.8:2[python_targets_python2_7(-)] ) sys-devel/gettext
+DESCRIPTION=Metromap is simple pygtk+2 programm for finding paths in metro(subway) maps
+EAPI=5
+HOMEPAGE=http://metromap.antex.ru/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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[python_targets_python2_7(-)] >=dev-python/pygtk-2.8:2[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://metromap.antex.ru/metromap-0.1.4.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=beab8a0cfb78ed0773d65cf89615a936
diff --git a/metadata/md5-cache/app-misc/mime-types-9 b/metadata/md5-cache/app-misc/mime-types-9
index ece3961a7e1a..9b0aa3eca07e 100644
--- a/metadata/md5-cache/app-misc/mime-types-9
+++ b/metadata/md5-cache/app-misc/mime-types-9
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Provides /etc/mime.types file
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
 SRC_URI=mirror://gentoo/mime-types-9.tar.bz2
-_md5_=b1b2162ac5b990ee8b8bcb07f5714419
+_md5_=cd3691d453663475accff217e972bad1
diff --git a/metadata/md5-cache/app-misc/mtail-1.1.1-r3 b/metadata/md5-cache/app-misc/mtail-1.1.1-r3
index 3eec527f3c6d..007ee6619941 100644
--- a/metadata/md5-cache/app-misc/mtail-1.1.1-r3
+++ b/metadata/md5-cache/app-misc/mtail-1.1.1-r3
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=Tail workalike, that performs output colourising
 EAPI=5
 HOMEPAGE=http://matt.immute.net/src/mtail/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=HPND
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://matt.immute.net/src/mtail/mtail-1.1.1.tgz http://matt.immute.net/src/mtail/mtailrc-syslog.sample
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d84d1d2db9f3bb0c160211b2ddb5b648
diff --git a/metadata/md5-cache/app-misc/mtail-1.2.0 b/metadata/md5-cache/app-misc/mtail-1.2.0
index f2951e55e745..bd24a8e10435 100644
--- a/metadata/md5-cache/app-misc/mtail-1.2.0
+++ b/metadata/md5-cache/app-misc/mtail-1.2.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=Tail workalike, that performs output colourising
 EAPI=7
 HOMEPAGE=http://matt.immute.net/src/mtail/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=HPND
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://matt.immute.net/src/mtail/mtail-1.2.0.tgz http://matt.immute.net/src/mtail/mtailrc-syslog.sample
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ab4ccd23532f1317d85f5024c7a77e11
diff --git a/metadata/md5-cache/app-misc/notary-0.6.1-r1 b/metadata/md5-cache/app-misc/notary-0.6.1-r1
index 030065dcf629..0494f25183a8 100644
--- a/metadata/md5-cache/app-misc/notary-0.6.1-r1
+++ b/metadata/md5-cache/app-misc/notary-0.6.1-r1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/theupdateframework/notary/archive/v0.6.1.tar.gz -> notary-0.6.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0dafc89ac04f8177aed8837658e6933e
diff --git a/metadata/md5-cache/app-misc/openastro-1.1.56 b/metadata/md5-cache/app-misc/openastro-1.1.56
index 357aef604351..86c96fda43b6 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_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d6668f37b032fd15a5cb7179af66164e
diff --git a/metadata/md5-cache/app-misc/openastro-data-1.8 b/metadata/md5-cache/app-misc/openastro-data-1.8
index 24af7bcd5977..af5cf88863a6 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_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=571414c01a7b410f7f8e4eb360612dc9
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.3-r3 b/metadata/md5-cache/app-misc/pax-utils-1.2.3-r3
index cb147f35f19c..00a1a4fda5db 100644
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.3-r3
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.3-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/pyelftools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) seccomp? ( sys-libs/libseccomp ) caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig ) app-arch/xz-utils
+DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) ) seccomp? ( sys-libs/libseccomp ) caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig ) app-arch/xz-utils
 DESCRIPTION=ELF utils that can check files for security relevant properties
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-IUSE=caps debug python seccomp python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=caps debug python seccomp +python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/pyelftools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) seccomp? ( sys-libs/libseccomp )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) ) seccomp? ( sys-libs/libseccomp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gentoo/pax-utils-1.2.3.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ae2561019a329a0ac35a036ea66b0d00
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=29c47e59ad40bc6afcefeaafd94b838d
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.4 b/metadata/md5-cache/app-misc/pax-utils-1.2.4
deleted file mode 100644
index a7e12b1fe4a5..000000000000
--- a/metadata/md5-cache/app-misc/pax-utils-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/pyelftools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) seccomp? ( sys-libs/libseccomp ) caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig ) app-arch/xz-utils
-DESCRIPTION=ELF utils that can check files for security relevant properties
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-IUSE=caps debug python seccomp python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/pyelftools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) seccomp? ( sys-libs/libseccomp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.2.4.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.4.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=abc05f76327a0fd4b73cc7fbb0e706ab
diff --git a/metadata/md5-cache/app-misc/pax-utils-1.2.4-r1 b/metadata/md5-cache/app-misc/pax-utils-1.2.4-r1
new file mode 100644
index 000000000000..fb4b71cd5457
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pax-utils-1.2.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp ) caps? ( virtual/pkgconfig ) seccomp? ( virtual/pkgconfig ) app-arch/xz-utils
+DESCRIPTION=ELF utils that can check files for security relevant properties
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
+IUSE=caps debug python seccomp python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyelftools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyelftools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) ) seccomp? ( sys-libs/libseccomp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=0
+SRC_URI=mirror://gentoo/pax-utils-1.2.4.tar.xz https://dev.gentoo.org/~slyfox/distfiles/pax-utils-1.2.4.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=d81daf100872279d073436c26368af35
diff --git a/metadata/md5-cache/app-misc/pysmssend-1.48-r2 b/metadata/md5-cache/app-misc/pysmssend-1.48-r2
index ab1106ad498f..1369da50c1e5 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b0db142ec966494cd4998de28db5f29
diff --git a/metadata/md5-cache/app-misc/pystopwatch-2012.12.24.1-r1 b/metadata/md5-cache/app-misc/pystopwatch-2012.12.24.1-r1
index 06e6e34932df..46aeb0ad9f74 100644
--- a/metadata/md5-cache/app-misc/pystopwatch-2012.12.24.1-r1
+++ b/metadata/md5-cache/app-misc/pystopwatch-2012.12.24.1-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup
 DESCRIPTION=clock and two countdown functions that can minimize to the tray
 EAPI=5
 HOMEPAGE=http://xyne.archlinux.ca/projects/pystopwatch
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/librsvg python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) gnome-base/librsvg python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://xyne.archlinux.ca/projects/pystopwatch/src/pystopwatch-2012.12.24.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7692ce55b5bf2de0af08b82bd0433739
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4e078bfd7150dc6392960a79bb5e5600
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.2 b/metadata/md5-cache/app-misc/ranger-1.9.2
index 6e6e22178e4a..6f8bf4f50f00 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.2
+++ b/metadata/md5-cache/app-misc/ranger-1.9.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pager ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( virtual/pager dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.2.tar.gz -> ranger-1.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b1b0a299a33092f45bb724883480ff84
diff --git a/metadata/md5-cache/app-misc/ranger-1.9.3 b/metadata/md5-cache/app-misc/ranger-1.9.3
index f645ffc0b35a..aa4fca78a103 100644
--- a/metadata/md5-cache/app-misc/ranger-1.9.3
+++ b/metadata/md5-cache/app-misc/ranger-1.9.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pager ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( virtual/pager dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ranger/ranger/archive/v1.9.3.tar.gz -> ranger-1.9.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1a32ffeec936928736e20d93db8a0d28
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
index c77e71d6d433..c3e0bd2e24be 100644
--- a/metadata/md5-cache/app-misc/ranger-9999
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pager ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( virtual/pager dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=A vim-inspired file manager for the console
 EAPI=7
@@ -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_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1a32ffeec936928736e20d93db8a0d28
diff --git a/metadata/md5-cache/app-misc/recoll-1.25.19 b/metadata/md5-cache/app-misc/recoll-1.25.19
index 81618d6bf81a..433329b21977 100644
--- a/metadata/md5-cache/app-misc/recoll-1.25.19
+++ b/metadata/md5-cache/app-misc/recoll-1.25.19
@@ -4,12 +4,12 @@ DEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmlib
 DESCRIPTION=A personal full text search package
 EAPI=7
 HOMEPAGE=https://www.lesbonscomptes.com/recoll/
-IUSE=camelcase chm doc +inotify qt5 session +spell webengine kernel_linux python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=camelcase chm doc +inotify qt5 session +spell webengine kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/xapian:= sys-libs/zlib:= virtual/libiconv chm? ( dev-libs/chmlib dev-python/pychm ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 webengine? ( dev-qt/qtwebengine:5[widgets] ) ) session? ( inotify? ( x11-libs/libSM x11-libs/libICE x11-libs/libX11 ) ) spell? ( app-text/aspell ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/unzip
-REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( 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 )
+REQUIRED_USE=session? ( inotify ) webengine? ( qt5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/recoll/recoll-1.25.19.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9590dad31e8845e92ff5a6d6d16fb062
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 38046d828ec0..a3a9dd74fd60 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 c81805fb09a9..6aa2b588f60c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4877732c0bb9af9bc103980df46009b
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-0.9.3 b/metadata/md5-cache/app-misc/resolve-march-native-0.9.3
index 5b908c7710b9..10cf1a92c890 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-0.9.3
+++ b/metadata/md5-cache/app-misc/resolve-march-native-0.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/gcc-4.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.3.tar.gz -> resolve-march-native-0.9.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea8c5af4411eab29fd079f3b4f476733
diff --git a/metadata/md5-cache/app-misc/resolve-march-native-0.9.4 b/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
index 93b3851fe2cc..9086f03aff7e 100644
--- a/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
+++ b/metadata/md5-cache/app-misc/resolve-march-native-0.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/gcc-4.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/resolve-march-native/archive/0.9.4.tar.gz -> resolve-march-native-0.9.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea8c5af4411eab29fd079f3b4f476733
diff --git a/metadata/md5-cache/app-misc/rundeck-bin-2.6.8 b/metadata/md5-cache/app-misc/rundeck-bin-2.6.8
index f63053315b6d..e6472a8dded4 100644
--- a/metadata/md5-cache/app-misc/rundeck-bin-2.6.8
+++ b/metadata/md5-cache/app-misc/rundeck-bin-2.6.8
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://download.rundeck.org/rpm/rundeck-2.6.8-1.20.GA.noarch.rpm http://download.rundeck.org/rpm/rundeck-config-2.6.8-1.20.GA.noarch.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1733d05f8b2dee530d7a2b2fa9558f9f
diff --git a/metadata/md5-cache/app-misc/screen-4.4.0 b/metadata/md5-cache/app-misc/screen-4.4.0
index 08d806727808..fe51e216e8f5 100644
--- a/metadata/md5-cache/app-misc/screen-4.4.0
+++ b/metadata/md5-cache/app-misc/screen-4.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.4.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=23f6ce9cf04387efa99b1e24c014c09f
diff --git a/metadata/md5-cache/app-misc/screen-4.5.1 b/metadata/md5-cache/app-misc/screen-4.5.1
index 2c12bee14b56..b23aa69ba225 100644
--- a/metadata/md5-cache/app-misc/screen-4.5.1
+++ b/metadata/md5-cache/app-misc/screen-4.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.5.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=82dec22b1c309888e6eecb571fa7a816
diff --git a/metadata/md5-cache/app-misc/screen-4.6.0 b/metadata/md5-cache/app-misc/screen-4.6.0
index 04726c096168..313d6433bb59 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.0
+++ b/metadata/md5-cache/app-misc/screen-4.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=29a9332fc21530914b3421ff4786d7c7
diff --git a/metadata/md5-cache/app-misc/screen-4.6.1 b/metadata/md5-cache/app-misc/screen-4.6.1
index 0b285ed66c18..c47182c604fb 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.1
+++ b/metadata/md5-cache/app-misc/screen-4.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbd985486ab92492caa8cd899f03123d
diff --git a/metadata/md5-cache/app-misc/screen-4.6.2 b/metadata/md5-cache/app-misc/screen-4.6.2
index 1d865158e0be..a0825a38771d 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.2
+++ b/metadata/md5-cache/app-misc/screen-4.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-screen )
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d32d4189821a357ba7c298519680e421
diff --git a/metadata/md5-cache/app-misc/screen-4.6.2-r1 b/metadata/md5-cache/app-misc/screen-4.6.2-r1
index 43230060a5f4..439efd59b08d 100644
--- a/metadata/md5-cache/app-misc/screen-4.6.2-r1
+++ b/metadata/md5-cache/app-misc/screen-4.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-screen ) virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.6.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09d13221e5267e252224b9891aafaa7f
diff --git a/metadata/md5-cache/app-misc/screen-4.7.0 b/metadata/md5-cache/app-misc/screen-4.7.0
index 868635d2cb42..b52a8b8e666b 100644
--- a/metadata/md5-cache/app-misc/screen-4.7.0
+++ b/metadata/md5-cache/app-misc/screen-4.7.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-screen ) virtual/tmpfiles
 SLOT=0
 SRC_URI=mirror://gnu/screen/screen-4.7.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=51faf2b62ddd67d80bf833ba44a72bd9
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=8033b195a067bb3bb1f4e9ed73acb0fc
diff --git a/metadata/md5-cache/app-misc/screen-9999 b/metadata/md5-cache/app-misc/screen-9999
index d5fdf9c35c01..380534f6ee66 100644
--- a/metadata/md5-cache/app-misc/screen-9999
+++ b/metadata/md5-cache/app-misc/screen-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam ) selinux? ( sec-policy/selinux-screen ) utmp? ( kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) ) virtual/tmpfiles
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a081b92db10dbf82b646dc699ca26797
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 4b9ff2600eca..8e57f4637ffe 100644
--- a/metadata/md5-cache/app-misc/solaar-0.9.2-r3
+++ b/metadata/md5-cache/app-misc/solaar-0.9.2-r3
@@ -1,14 +1,14 @@
 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 ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/pkgconfig
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/pkgconfig
 DESCRIPTION=A Linux device manager for Logitech's Unifying Receiver peripherals
 EAPI=5
 HOMEPAGE=https://pwr.github.com/Solaar/
-IUSE=doc python_targets_python2_7 python_targets_python3_6 kernel_linux
+IUSE=doc python_targets_python3_6 kernel_linux
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=acct-group/plugdev >=dev-python/pyudev-0.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=acct-group/plugdev >=dev-python/pyudev-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] 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
 SRC_URI=https://github.com/pwr/Solaar/archive/0.9.2.tar.gz -> solaar-0.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7e6cd182c9d4ca3e14aadec7c8255fa
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f05ec291bbade4ff2fb515c10384a025
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.1 b/metadata/md5-cache/app-misc/solaar-1.0.1
index c6a812ce0f0d..56170ca41375 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.1
+++ b/metadata/md5-cache/app-misc/solaar-1.0.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A Linux device manager for Logitech's Unifying Receiver peripherals
 EAPI=7
 HOMEPAGE=https://pwr-solaar.github.io/Solaar/
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 kernel_linux
+IUSE=doc python_targets_python3_6 python_targets_python3_7 kernel_linux
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyudev-0.13[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(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyudev-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.1.tar.gz -> solaar-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d800f8ea04d42a3960714ce97b158e4
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=da50e6cfe2348430b042d56bf7f10409
diff --git a/metadata/md5-cache/app-misc/solaar-1.0.1-r1 b/metadata/md5-cache/app-misc/solaar-1.0.1-r1
index f218847d365f..556d89945bae 100644
--- a/metadata/md5-cache/app-misc/solaar-1.0.1-r1
+++ b/metadata/md5-cache/app-misc/solaar-1.0.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=virtual/pkgconfig 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A Linux device manager for Logitech's Unifying Receiver peripherals
 EAPI=7
 HOMEPAGE=https://pwr-solaar.github.io/Solaar/
-IUSE=doc kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc kernel_linux python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyudev-0.13[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(-)] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=acct-group/plugdev dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyudev-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3[introspection] 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.0.1.tar.gz -> solaar-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de9437eb762f2f4a0687e868b0b2c9f2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c937fa83296fe0a4abfa64d956946de
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.6 b/metadata/md5-cache/app-misc/spacenavd-0.6
index bc2f71cda129..0fcd6b7e5d22 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	epatch	a1bf4756dba418a7238f3be0cb010c54	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=6378aa8df3172f55dae083b8c222bdd1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=eca247b2b20470c3cbac29d9c2adaaa3
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.7 b/metadata/md5-cache/app-misc/spacenavd-0.7
index bb5ebc9bb437..1276dec0c16b 100644
--- a/metadata/md5-cache/app-misc/spacenavd-0.7
+++ b/metadata/md5-cache/app-misc/spacenavd-0.7
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=X? ( x11-apps/xdpyinfo x11-libs/libXi )
 SLOT=0
 SRC_URI=https://github.com/FreeSpacenav/spacenavd/releases/download/v0.7/spacenavd-0.7.tar.gz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=70963f1511f08625cd5eccf2b1045572
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=56f00c0d238dad8b15c246ac58ab7248
diff --git a/metadata/md5-cache/app-misc/spacenavd-0.7.1 b/metadata/md5-cache/app-misc/spacenavd-0.7.1
new file mode 100644
index 000000000000..023aa9a44ca4
--- /dev/null
+++ b/metadata/md5-cache/app-misc/spacenavd-0.7.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=X? ( x11-apps/xdpyinfo x11-libs/libXi )
+DESCRIPTION=The spacenavd daemon provides free alternative to the 3dxserv daemon
+EAPI=7
+HOMEPAGE=http://spacenav.sourceforge.net/
+IUSE=X kernel_linux
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=X? ( x11-apps/xdpyinfo x11-libs/libXi )
+SLOT=0
+SRC_URI=https://github.com/FreeSpacenav/spacenavd/releases/download/v0.7.1/spacenavd-0.7.1.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=3b6aed669457375a8dafc3e03162210b
diff --git a/metadata/md5-cache/app-misc/tails-installer-4.4.11 b/metadata/md5-cache/app-misc/tails-installer-4.4.11
deleted file mode 100644
index d281a14c2e48..000000000000
--- a/metadata/md5-cache/app-misc/tails-installer-4.4.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/python-distutils-extra[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A graphical tool to install or upgrade Tails on a USB stick from an ISO image
-EAPI=6
-HOMEPAGE=https://tails.boum.org https://git.tails.boum.org/liveusb-creator
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/p7zip dev-libs/glib:2 dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-apps/gptfdisk sys-auth/polkit sys-boot/syslinux sys-fs/dosfstools sys-fs/mtools sys-fs/udisks:2[introspection] virtual/cdrtools x11-libs/gtk+:3[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05afcbe58537c0775216e8750a17b6d8
diff --git a/metadata/md5-cache/app-misc/tails-installer-4.4.11-r1 b/metadata/md5-cache/app-misc/tails-installer-4.4.11-r1
new file mode 100644
index 000000000000..de90975d07e6
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tails-installer-4.4.11-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/python-distutils-extra[python_targets_python2_7(-)] ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A graphical tool to install or upgrade Tails on a USB stick from an ISO image
+EAPI=6
+HOMEPAGE=https://tails.boum.org https://git.tails.boum.org/liveusb-creator
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/p7zip dev-libs/glib:2 python_single_target_python2_7? ( dev-python/configobj[python_targets_python2_7(-)] dev-python/pygobject[python_targets_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)] ) sys-apps/gptfdisk sys-auth/polkit sys-boot/syslinux sys-fs/dosfstools sys-fs/mtools sys-fs/udisks:2[introspection] virtual/cdrtools x11-libs/gtk+:3[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=574b29f1d44cccd70504b031758b84ed
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 26c6e7bb6bbe..9077a0b5abf1 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44a96694ca021381bf9f231a5de0b1ae
diff --git a/metadata/md5-cache/app-misc/tmux2html-0.1.11 b/metadata/md5-cache/app-misc/tmux2html-0.1.11
index da531bba3582..ac1fc96f6eb8 100644
--- a/metadata/md5-cache/app-misc/tmux2html-0.1.11
+++ b/metadata/md5-cache/app-misc/tmux2html-0.1.11
@@ -10,5 +10,5 @@ RDEPEND=app-misc/tmux dev-python/setuptools[python_targets_python2_7(-)?,python_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/tweekmonster/tmux2html/archive/0.1.11.tar.gz -> tmux2html-0.1.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b036b6f7e4a4383f17ab96e46d452f4b
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.5.3 b/metadata/md5-cache/app-misc/tmuxp-1.5.3
index 02e67ea3f9f9..37b310e41d06 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.5.3
+++ b/metadata/md5-cache/app-misc/tmuxp-1.5.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tmuxp/tmuxp-1.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d8785b69f9f8590f2aa1e96c0602d9a3
diff --git a/metadata/md5-cache/app-misc/tmuxp-1.5.4 b/metadata/md5-cache/app-misc/tmuxp-1.5.4
index ed196b3f4eaa..6a4d8cd593df 100644
--- a/metadata/md5-cache/app-misc/tmuxp-1.5.4
+++ b/metadata/md5-cache/app-misc/tmuxp-1.5.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/kaptan[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/libtmux-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/libtmux-0.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/pytest-4.1.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-rerunfailures-4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/kaptan[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/libtmux-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/libtmux-0.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/kaptan[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/libtmux-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/libtmux-0.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/pytest-4.1.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-rerunfailures-4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/kaptan[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/libtmux-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/libtmux-0.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/click-7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/click-8.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=tmux session manager. built on libtmux
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/tmuxp/archive/v1.5.4.tar.gz -> tmuxp-1.5.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e833bb0fe25e0d1e328735559587d595
diff --git a/metadata/md5-cache/app-misc/towitoko-2.0.7-r3 b/metadata/md5-cache/app-misc/towitoko-2.0.7-r3
index ff8b80feb844..c949cafd2c01 100644
--- a/metadata/md5-cache/app-misc/towitoko-2.0.7-r3
+++ b/metadata/md5-cache/app-misc/towitoko-2.0.7-r3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=configure postinst
 DESCRIPTION=Driver for Towitoko smartcard readers
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=moneyplex
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/towitoko-2.0.7.tar.gz
-_md5_=6488a0ef3823f7a7e506fc99b0c1d0ca
+_md5_=7a3589576a9e530bf7dbe568036740f4
diff --git a/metadata/md5-cache/app-misc/tracker-miners-2.2.2 b/metadata/md5-cache/app-misc/tracker-miners-2.2.2
index 10deb617ae87..9d40d2788abc 100644
--- a/metadata/md5-cache/app-misc/tracker-miners-2.2.2
+++ b/metadata/md5-cache/app-misc/tracker-miners-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) taglib? ( >=media-libs/taglib-1.6 ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/glib-utils >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.46:2 >=app-misc/tracker-2.2.0:= gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-meta:1.0 ) !gstreamer? ( ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) taglib? ( >=media-libs/taglib-1.6 ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip dev-util/glib-utils >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) gstreamer? ( || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/tracker-miners/2.2/tracker-miners-2.2.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db0ab34eafc11b9fc1baf159afbd018a
+_md5_=2ebc02cf7e1a939ca454d2a5c7275159
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 a2a885804d57..3dee1ed76948 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c125bec99e1de6b669cee6cae2c2f125
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 d73c828aa27e..6ba803a64cfe 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/andreafrancia/trash-cli/archive/5abecd53e1d84f2a5fd3fc60d2f5d71e518826c5.tar.gz -> trash-cli-0.17.1.14_p20170816.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27cc04cc82ac443080dab1073bfed442
diff --git a/metadata/md5-cache/app-misc/unfoo-1.0.8 b/metadata/md5-cache/app-misc/unfoo-1.0.8
index 927b221391d1..64ca25b39f5b 100644
--- a/metadata/md5-cache/app-misc/unfoo-1.0.8
+++ b/metadata/md5-cache/app-misc/unfoo-1.0.8
@@ -10,4 +10,4 @@ RDEPEND=!minimal? ( || ( app-arch/bzip2 app-arch/lbzip2[symlink] app-arch/pbzip2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jlec/unfoo/archive/v1.0.8.tar.gz -> unfoo-1.0.8.tar.gz
-_md5_=eff905feb99486ac54556f2f4dea83e7
+_md5_=d54bcf7f93c6add26845eb5fb1c198c7
diff --git a/metadata/md5-cache/app-misc/uptimed-0.4.1-r1 b/metadata/md5-cache/app-misc/uptimed-0.4.1-r1
index b9a05f0bf198..b8f3236e8d91 100644
--- a/metadata/md5-cache/app-misc/uptimed-0.4.1-r1
+++ b/metadata/md5-cache/app-misc/uptimed-0.4.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/rpodgorny/uptimed/archive/v0.4.1.tar.gz -> uptimed-0.4.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d2f97ff0529e4006587e3e4ea017b2c5
diff --git a/metadata/md5-cache/app-misc/vlock-2.2.3-r1 b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
index d4a8523b91da..592066df3c65 100644
--- a/metadata/md5-cache/app-misc/vlock-2.2.3-r1
+++ b/metadata/md5-cache/app-misc/vlock-2.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=!>=sys-apps/kbd-2.0.4-r1[pam] pam? ( sys-libs/pam )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/WorMzy/vlock/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vlock-2.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a4aabaf9f1caca80f71faa2d8baad869
diff --git a/metadata/md5-cache/app-misc/votrify-5 b/metadata/md5-cache/app-misc/votrify-5
index 010857a76e91..1f58797cca8c 100644
--- a/metadata/md5-cache/app-misc/votrify-5
+++ b/metadata/md5-cache/app-misc/votrify-5
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst setup
 DESCRIPTION=Tool for community verification of Gentoo elections
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/votrify
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-misc/gentoo-elections
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/votrify/archive/v5.tar.gz -> votrify-5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6f9f756d14a885664c62370d16e6628b
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 f508e9c50a3a..cf3f6dd28ea6 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=python script for downloading webcomics
 EAPI=5
 HOMEPAGE=http://collector.skumleren.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://collector.skumleren.net/releases/collector-0.7.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 4ef3134661b0..fbc98f6bb6fa 100644
--- a/metadata/md5-cache/app-misc/workrave-1.10.20
+++ b/metadata/md5-cache/app-misc/workrave-1.10.20
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0:3[introspection?,X] >=dev-cp
 DESCRIPTION=Helpful utility to attack Repetitive Strain Injury (RSI)
 EAPI=6
 HOMEPAGE=http://www.workrave.org/
-IUSE=ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce +python_targets_python2_7 +python_single_target_python2_7
+IUSE=ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce +python_single_target_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3+
 RDEPEND=>=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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=ayatana? ( introspection ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=ayatana? ( introspection ) ^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rcaelers/workrave/archive/v1_10_20.tar.gz -> workrave-1.10.20.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b699841eb3878fa14f2369c406d8ed0
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 993f36f06963..5c48bde8d42c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bd2f7ed1219c9d8360a5a909e31de7b
diff --git a/metadata/md5-cache/app-misc/yq-2.7.1-r1 b/metadata/md5-cache/app-misc/yq-2.7.1-r1
index f1a72bfbac6d..da565e7f3ac5 100644
--- a/metadata/md5-cache/app-misc/yq-2.7.1-r1
+++ b/metadata/md5-cache/app-misc/yq-2.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37ba126f59ac63bb18fbb54603502c6e
diff --git a/metadata/md5-cache/app-misc/yq-2.7.2 b/metadata/md5-cache/app-misc/yq-2.7.2
index 6623c2bc95e1..9102b9145784 100644
--- a/metadata/md5-cache/app-misc/yq-2.7.2
+++ b/metadata/md5-cache/app-misc/yq-2.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c6f2e06809a1fb0efb105c7f64952ddc
diff --git a/metadata/md5-cache/app-misc/yq-2.8.0 b/metadata/md5-cache/app-misc/yq-2.8.0
index d4a8d15e2cf8..f9b15c4573a1 100644
--- a/metadata/md5-cache/app-misc/yq-2.8.0
+++ b/metadata/md5-cache/app-misc/yq-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c6f2e06809a1fb0efb105c7f64952ddc
diff --git a/metadata/md5-cache/app-misc/yq-2.9.2 b/metadata/md5-cache/app-misc/yq-2.9.2
index 5749bdf8511b..d6da7ca7b57f 100644
--- a/metadata/md5-cache/app-misc/yq-2.9.2
+++ b/metadata/md5-cache/app-misc/yq-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c6f2e06809a1fb0efb105c7f64952ddc
diff --git a/metadata/md5-cache/app-misc/yq-2.9.2-r1 b/metadata/md5-cache/app-misc/yq-2.9.2-r1
index 22e493087df7..9465537d69d3 100644
--- a/metadata/md5-cache/app-misc/yq-2.9.2-r1
+++ b/metadata/md5-cache/app-misc/yq-2.9.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yq/yq-2.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec8edb40c751e9fdb441e3f017794558
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index bbacd0f1c758..79b1f9c22a94 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/adb-sync-0_p20181127-r1 b/metadata/md5-cache/app-mobilephone/adb-sync-0_p20181127-r1
index 4afccc8335db..985c06637d33 100644
--- a/metadata/md5-cache/app-mobilephone/adb-sync-0_p20181127-r1
+++ b/metadata/md5-cache/app-mobilephone/adb-sync-0_p20181127-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install setup
 DESCRIPTION=Synchronize files between a PC and an Android device using ADB
 EAPI=6
 HOMEPAGE=https://github.com/google/adb-sync
-IUSE=+channel 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
+IUSE=+channel python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/android-tools channel? ( net-misc/socat )
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/android-tools channel? ( net-misc/socat )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/google/adb-sync/tarball/b0a2a10 -> adb-sync-0_p20181127.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d13f38548f3a67f128310a1be3136b65
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=dabb00ce144be8a43688b92a92aafa47
diff --git a/metadata/md5-cache/app-mobilephone/kannel-1.5.0-r3 b/metadata/md5-cache/app-mobilephone/kannel-1.5.0-r3
index 0a21dd18dda0..b339232310f4 100644
--- a/metadata/md5-cache/app-mobilephone/kannel-1.5.0-r3
+++ b/metadata/md5-cache/app-mobilephone/kannel-1.5.0-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2:2 dev-lang/perl sys-libs/zlib s
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.kannel.org/download/1.5.0/gateway-1.5.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bb8ce9219311e84fad8e80ba1fcb69d0
diff --git a/metadata/md5-cache/app-mobilephone/kannel-1.5.0-r4 b/metadata/md5-cache/app-mobilephone/kannel-1.5.0-r4
index 3abeffd187cd..53cbcd048859 100644
--- a/metadata/md5-cache/app-mobilephone/kannel-1.5.0-r4
+++ b/metadata/md5-cache/app-mobilephone/kannel-1.5.0-r4
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/e2fsprogs-libs dev-libs/libxml2:2 dev-lang/perl sys-libs/zlib s
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.kannel.org/download/1.5.0/gateway-1.5.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0b7a4494cc56686eca2a09c46d7760e9
diff --git a/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1 b/metadata/md5-cache/app-mobilephone/lightblue-0.4-r1
index 68d7c36015fa..293b2ce244c2 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_python2_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lightblue/lightblue-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c4fea002e51bcfc457e2cc9a31eb2cc
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.24.2 b/metadata/md5-cache/app-mobilephone/obexftp-0.24.2
index 69bf963c554d..8451ee0143c7 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.24.2
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.24.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=File transfer over OBEX for mobile phones
 EAPI=6
 HOMEPAGE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
-IUSE=perl python ruby tcl python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=perl python ruby tcl +python_single_target_python3_6
 KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/openobex/obexftp-0.24.2-Source.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f10681e0021bca9c800da4cf81d1060
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5a0f03c8cc76719316a4d133eb768c7
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 dca41c45f956..f56cefb63542 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffc48973beaf30c1a0ef10dd17c20b68
diff --git a/metadata/md5-cache/app-mobilephone/smsclient-2.0.9a-r1 b/metadata/md5-cache/app-mobilephone/smsclient-2.0.9a-r1
index 9080bea6a81c..bcbd8d218666 100644
--- a/metadata/md5-cache/app-mobilephone/smsclient-2.0.9a-r1
+++ b/metadata/md5-cache/app-mobilephone/smsclient-2.0.9a-r1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.smsclient.org/download/smsclient-2.0.9/smsclient-2.0.9a.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f09365eea8881fa4c30c64ce62fe0e0e
diff --git a/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2 b/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2
index 6def0b43f936..9d988aa3b8d4 100644
--- a/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2
+++ b/metadata/md5-cache/app-mobilephone/smstools-3.1.15-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-process/procps stats? ( >=dev-libs/mm-1.4.0 )
 SLOT=0
 SRC_URI=http://smstools3.kekekasvi.com/packages/smstools3-3.1.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2e8d37c4131d50dad008b8cbc676009a
diff --git a/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1 b/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1
index 33794cfa085b..2074f6bba79d 100644
--- a/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1
+++ b/metadata/md5-cache/app-mobilephone/smstools-3.1.21-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-process/procps stats? ( >=dev-libs/mm-1.4.0 )
 SLOT=0
 SRC_URI=http://smstools3.kekekasvi.com/packages/smstools3-3.1.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cca6247bad516b99e0ee76e35a4be809
diff --git a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r2 b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r2
index cd00a4172547..637c7582f875 100644
--- a/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r2
+++ b/metadata/md5-cache/app-mobilephone/sobexsrv-1.0.1-r2
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/openobex-1.7.2-r1 net-wireless/bluez gtk? ( python_single_targ
 DESCRIPTION=Scripting/Secure OBEX Server (for BlueZ Linux)
 EAPI=6
 HOMEPAGE=http://www.mulliner.org/bluetooth/sobexsrv.php
-IUSE=gtk +python_targets_python2_7 +python_single_target_python2_7
+IUSE=gtk +python_single_target_python2_7
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/openobex-1.7.2-r1 net-wireless/bluez gtk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) gtk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.2 )
-REQUIRED_USE=gtk? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=gtk? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.mulliner.org/bluetooth/sobexsrv-1.0.1.tar.gz https://dev.gentoo.org/~joker/sobexsrv-1.0.1-fix64.patch
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=99a62d89e50343556bc1ae594a84474b
diff --git a/metadata/md5-cache/app-mobilephone/wammu-0.44 b/metadata/md5-cache/app-mobilephone/wammu-0.44
index b195cb0643ca..050895757017 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92d4358f47ed28a36e048e60a2fbe69c
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 46da87224fdb..e79e1f045acd 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/auto-multiple-choice-1.3.0-r1 b/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
index 94bc48eaaa2d..ef80f09740ef 100644
--- a/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
+++ b/metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/dblatex app-text/docbook-xml-simple-dtd:* app-text/docbook-xsl-stylesheets
+DEPEND=app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/dblatex app-text/docbook-xml-simple-dtd:* app-text/docbook-xsl-stylesheets virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Create and manage multiple choice questionnaries, including automated marking
 EAPI=7
 HOMEPAGE=http://home.gna.org/auto-qcm/
@@ -10,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-text/texlive[dvi2tty,extra,graphics,png,pstricks,science,truetype,xml,X,luatex,xetex,humanities,publishers] app-text/poppler:= dev-perl/XML-LibXML media-libs/netpbm media-libs/opencv l10n_fr? ( app-text/texlive[l10n_fr] ) l10n_ja? ( app-text/texlive[l10n_ja] ) app-text/pdftk dev-lang/perl:= dev-perl/Glib-Object-Introspection dev-perl/Gtk2 dev-perl/Gtk2-Notify media-gfx/imagemagick dev-perl/XML-Writer dev-perl/Archive-Zip dev-perl/DBI dev-perl/Text-CSV dev-perl/DBD-SQLite dev-perl/Net-CUPS dev-perl/Email-Address dev-perl/Email-MIME dev-perl/Email-Sender virtual/latex-base
 SLOT=0
 SRC_URI=http://download.gna.org/auto-qcm/auto-multiple-choice_1.3.0_sources.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3cab963e09289b2e02d2f322c1329d96
diff --git a/metadata/md5-cache/app-office/dia-0.97.3 b/metadata/md5-cache/app-office/dia-0.97.3
index d49caa159e77..5b6b99ba6692 100644
--- a/metadata/md5-cache/app-office/dia-0.97.3
+++ b/metadata/md5-cache/app-office/dia-0.97.3
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=med
 DESCRIPTION=Diagram/flowchart creation program
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Dia
-IUSE=+cairo doc python debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+IUSE=+cairo doc python debug +python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng:0 sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets ) python? ( >=dev-python/pygtk-2 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/dia/0.97/dia-0.97.3.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e27de858d0c9cb1af20deb1f9c4be060
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6d6ff22002797805fa92c148453712f5
diff --git a/metadata/md5-cache/app-office/gnucash-3.2-r2 b/metadata/md5-cache/app-office/gnucash-3.2-r2
index 6146ebebb5b9..0b56e0afb7a9 100644
--- a/metadata/md5-cache/app-office/gnucash-3.2-r2
+++ b/metadata/md5-cache/app-office/gnucash-3.2-r2
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.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_6 +python_single_target_python3_6
+IUSE=aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite +gui +python_single_target_python3_6
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=doc? ( ~app-doc/gnucash-docs-3.2 gnome-extra/yelp )
 RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_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_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ecbc69981cc7600343d3c322ef84047
diff --git a/metadata/md5-cache/app-office/gnucash-3.3 b/metadata/md5-cache/app-office/gnucash-3.3
index 29e1f6cbc7cf..ccddcfe9eef7 100644
--- a/metadata/md5-cache/app-office/gnucash-3.3
+++ b/metadata/md5-cache/app-office/gnucash-3.3
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.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_6 +python_single_target_python3_6
+IUSE=aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite +gui +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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_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_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=939fc18174bcde240532f07b52d19aea
diff --git a/metadata/md5-cache/app-office/gnucash-3.3-r1 b/metadata/md5-cache/app-office/gnucash-3.3-r1
index a3bdbe334d22..9b99fdfce639 100644
--- a/metadata/md5-cache/app-office/gnucash-3.3-r1
+++ b/metadata/md5-cache/app-office/gnucash-3.3-r1
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.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_6 +python_single_target_python3_6
+IUSE=aqbanking chipcard debug doc examples gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite +gui +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.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.2.0:12=[deprecated,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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_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_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=141681a7114e33983df62034f214aa82
diff --git a/metadata/md5-cache/app-office/gnucash-3.4 b/metadata/md5-cache/app-office/gnucash-3.4
index 097620c2fe2a..b53aee9e269e 100644
--- a/metadata/md5-cache/app-office/gnucash-3.4
+++ b/metadata/md5-cache/app-office/gnucash-3.4
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4
 DESCRIPTION=A personal finance manager
 EAPI=6
 HOMEPAGE=http://www.gnucash.org/
-IUSE=aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite +python_targets_python3_6 +python_single_target_python3_6
+IUSE=aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite +python_single_target_python3_6
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=doc? ( ~app-doc/gnucash-docs-3.4 gnome-extra/yelp )
 RDEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.2.0:12=[deprecated,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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_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_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.4/gnucash-3.4.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=977d17f303057006303448e95d4db372
diff --git a/metadata/md5-cache/app-office/gnucash-3.5 b/metadata/md5-cache/app-office/gnucash-3.5
index 2d11ecad3d1c..77e223abe7bd 100644
--- a/metadata/md5-cache/app-office/gnucash-3.5
+++ b/metadata/md5-cache/app-office/gnucash-3.5
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4
 DESCRIPTION=A personal finance manager
 EAPI=6
 HOMEPAGE=http://www.gnucash.org/
-IUSE=aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite +python_targets_python3_6 +python_single_target_python3_6
+IUSE=aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite +python_single_target_python3_6
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 PDEPEND=doc? ( ~app-doc/gnucash-docs-3.5 gnome-extra/yelp )
 RDEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.2.0:12=[deprecated,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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_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_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.5/gnucash-3.5.tar.bz2 https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4519fec92a09c44c8295f55925798a4d
diff --git a/metadata/md5-cache/app-office/gnucash-3.6 b/metadata/md5-cache/app-office/gnucash-3.6
index b7fae778906b..31a914456a9b 100644
--- a/metadata/md5-cache/app-office/gnucash-3.6
+++ b/metadata/md5-cache/app-office/gnucash-3.6
@@ -3,14 +3,14 @@ DEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4
 DESCRIPTION=A personal finance manager
 EAPI=6
 HOMEPAGE=http://www.gnucash.org/
-IUSE=aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite test +python_targets_python3_6 +python_single_target_python3_6
+IUSE=aqbanking chipcard debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 sqlite test +python_single_target_python3_6
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=doc? ( ~app-doc/gnucash-docs-3.6 gnome-extra/yelp )
 RDEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 >=sys-libs/zlib-1.1.4 >=dev-scheme/guile-2.2.0:12=[deprecated,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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_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_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=chipcard? ( aqbanking ) python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.6/gnucash-3.6.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d0719e793062916ad60a15b196f14c9
diff --git a/metadata/md5-cache/app-office/gnucash-3.7 b/metadata/md5-cache/app-office/gnucash-3.7
index c116a4db5596..00f88ff79eba 100644
--- a/metadata/md5-cache/app-office/gnucash-3.7
+++ b/metadata/md5-cache/app-office/gnucash-3.7
@@ -3,14 +3,14 @@ DEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 dev-libs/boost:=[icu,
 DESCRIPTION=A personal finance manager
 EAPI=6
 HOMEPAGE=http://www.gnucash.org/
-IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 smartcard sqlite test +python_targets_python3_6 +python_single_target_python3_6
+IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 smartcard sqlite test +python_single_target_python3_6
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 PDEPEND=doc? ( ~app-doc/gnucash-docs-3.7 gnome-extra/yelp )
 RDEPEND=>=dev-libs/glib-2.46.0:2 >=dev-libs/libxml2-2.7.0:2 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt >=dev-scheme/guile-2.2.0:12=[deprecated,regex] >=sys-libs/zlib-1.1.4 aqbanking? ( >=net-libs/aqbanking-5[ofx?] sys-libs/gwenhywfar smartcard? ( 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 aqbanking? ( >=sys-libs/gwenhywfar-4.20.2[gtk] ) ) 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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_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=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) smartcard? ( aqbanking )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) ) smartcard? ( aqbanking )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Gnucash/gnucash/releases/download/3.7/gnucash-3.7.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fab39a6613fea9805e8e0669fa6dd36c
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.39 b/metadata/md5-cache/app-office/gnumeric-1.12.39
deleted file mode 100644
index 9fd432319f98..000000000000
--- a/metadata/md5-cache/app-office/gnumeric-1.12.39
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.38.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.38:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) libgda? ( gnome-extra/libgda:5[gtk] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 app-text/yelp-tools virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The GNOME Spreadsheet
-EAPI=6
-HOMEPAGE=http://www.gnumeric.org/
-IUSE=+introspection libgda perl python +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.38.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.38:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) libgda? ( gnome-extra/libgda:5[gtk] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ad91aaa2e3cfbf5d0f55dc21af89108
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.39-r1 b/metadata/md5-cache/app-office/gnumeric-1.12.39-r1
new file mode 100644
index 000000000000..cc85436ec493
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.39-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.38.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.38:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_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-3:3[python_targets_python2_7(-)] ) ) libgda? ( gnome-extra/libgda:5[gtk] ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 app-text/yelp-tools virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The GNOME Spreadsheet
+EAPI=6
+HOMEPAGE=http://www.gnumeric.org/
+IUSE=+introspection libgda perl python +python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.38.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.38:0.10 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_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-3:3[python_targets_python2_7(-)] ) ) libgda? ( gnome-extra/libgda:5[gtk] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.39.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5f5c4932483862c0a16d5e6d73340562
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.44 b/metadata/md5-cache/app-office/gnumeric-1.12.44-r1
index e60566ba6706..e60566ba6706 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.44
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.44-r1
diff --git a/metadata/md5-cache/app-office/gtg-0.3.1 b/metadata/md5-cache/app-office/gtg-0.3.1
index b505afa43619..9c05d7da1131 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aeb6d5493f8ac9369a0fb9cf929bbdfe
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.7 b/metadata/md5-cache/app-office/kmymoney-5.0.7
deleted file mode 100644
index bfcc5d88236f..000000000000
--- a/metadata/md5-cache/app-office/kmymoney-5.0.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-frameworks/kcontacts-5.60.0:5 kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.99.40_beta >=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-qt/qtconcurrent-5.12.3:5 www-client/weboob[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Personal finance manager based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kmymoney.org
-IUSE=activities addressbook calendar hbci holidays ofx quotes webkit weboob test debug +handbook test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-frameworks/kcontacts-5.60.0:5 kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.99.40_beta >=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-qt/qtconcurrent-5.12.3:5 www-client/weboob[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=weboob? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/kmymoney/5.0.7/src/kmymoney-5.0.7.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c035d7ca11fc6058e84b03abc166dd0
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.7-r1 b/metadata/md5-cache/app-office/kmymoney-5.0.7-r1
new file mode 100644
index 000000000000..2a89f3026ca1
--- /dev/null
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-frameworks/kcontacts-5.60.0:5 kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.99.40_beta >=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-qt/qtconcurrent-5.12.3:5 python_single_target_python2_7? ( www-client/weboob[python_targets_python2_7(-)] ) ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Personal finance manager based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kmymoney.org
+IUSE=activities addressbook calendar hbci holidays ofx quotes webkit weboob test debug +handbook test +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-frameworks/kcontacts-5.60.0:5 kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-5.99.40_beta >=sys-libs/gwenhywfar-4.99.22_rc6:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-qt/qtconcurrent-5.12.3:5 python_single_target_python2_7? ( www-client/weboob[python_targets_python2_7(-)] ) ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=weboob? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/kmymoney/5.0.7/src/kmymoney-5.0.7.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4fb2ebe367069af1b7b2dc37478359b
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.8 b/metadata/md5-cache/app-office/kmymoney-5.0.8
deleted file mode 100644
index d68975557df6..000000000000
--- a/metadata/md5-cache/app-office/kmymoney-5.0.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-frameworks/kcontacts-5.60.0:5 kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-6.0.1 >=sys-libs/gwenhywfar-5.1.2:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-qt/qtconcurrent-5.12.3:5 www-client/weboob[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Personal finance manager based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kmymoney.org
-IUSE=activities addressbook calendar hbci holidays ofx quotes webkit weboob test debug +handbook test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-frameworks/kcontacts-5.60.0:5 kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-6.0.1 >=sys-libs/gwenhywfar-5.1.2:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-qt/qtconcurrent-5.12.3:5 www-client/weboob[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=weboob? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/kmymoney/5.0.8/src/kmymoney-5.0.8.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a55fd565fcf0efd7f5d696a967826a1
diff --git a/metadata/md5-cache/app-office/kmymoney-5.0.8-r1 b/metadata/md5-cache/app-office/kmymoney-5.0.8-r1
new file mode 100644
index 000000000000..a36a17e18126
--- /dev/null
+++ b/metadata/md5-cache/app-office/kmymoney-5.0.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-frameworks/kcontacts-5.60.0:5 kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-6.0.1 >=sys-libs/gwenhywfar-5.1.2:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-qt/qtconcurrent-5.12.3:5 python_single_target_python2_7? ( www-client/weboob[python_targets_python2_7(-)] ) ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Personal finance manager based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kmymoney.org
+IUSE=activities addressbook calendar hbci holidays ofx quotes webkit weboob test debug +handbook test +python_single_target_python2_7
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/gpgme-1.7.1-r1[cxx] >=app-office/libalkimia-7.0.0:= dev-libs/gmp:0= dev-libs/kdiagram:5 dev-libs/libgpg-error >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) addressbook? ( >=kde-frameworks/kcontacts-5.60.0:5 kde-apps/akonadi:5 kde-apps/kidentitymanagement:5 ) calendar? ( dev-libs/libical:= ) hbci? ( >=net-libs/aqbanking-6.0.1 >=sys-libs/gwenhywfar-5.1.2:=[qt5] ) holidays? ( >=kde-frameworks/kholidays-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=kde-frameworks/kdewebkit-5.60.0:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) weboob? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-qt/qtconcurrent-5.12.3:5 python_single_target_python2_7? ( www-client/weboob[python_targets_python2_7(-)] ) ) !app-office/kmymoney:4 quotes? ( dev-perl/Finance-Quote ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=weboob? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/kmymoney/5.0.8/src/kmymoney-5.0.8.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97243a30ae0d6f588e3c23de1d15f4b1
diff --git a/metadata/md5-cache/app-office/ledger-3.1.2 b/metadata/md5-cache/app-office/ledger-3.1.2
deleted file mode 100644
index cadfd91ce7cb..000000000000
--- a/metadata/md5-cache/app-office/ledger-3.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/cheetah python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) dev-libs/utfcpp doc? ( sys-apps/texinfo virtual/texi2dvi dev-texlive/texlive-fontsrecommended ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A double-entry accounting system with a command-line reporting interface
-EAPI=6
-HOMEPAGE=https://www.ledger-cli.org/
-IUSE=debug doc emacs python +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/cheetah python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ledger/ledger/archive/v3.1.2.tar.gz -> ledger-3.1.2.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4e22ba5eee4409dac476285d99baa88
diff --git a/metadata/md5-cache/app-office/ledger-3.1.2-r1 b/metadata/md5-cache/app-office/ledger-3.1.2-r1
new file mode 100644
index 000000000000..1bdb454ba7e8
--- /dev/null
+++ b/metadata/md5-cache/app-office/ledger-3.1.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) dev-python/cheetah python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) dev-libs/utfcpp doc? ( sys-apps/texinfo virtual/texi2dvi dev-texlive/texlive-fontsrecommended ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A double-entry accounting system with a command-line reporting interface
+EAPI=6
+HOMEPAGE=https://www.ledger-cli.org/
+IUSE=debug doc emacs python +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[python?] dev-libs/gmp:0= dev-libs/mpfr:0= python? ( python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) dev-python/cheetah python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/ledger/ledger/archive/v3.1.2.tar.gz -> ledger-3.1.2.tar.gz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b0c15a1a629e7be00bdb4c32c817fc2b
diff --git a/metadata/md5-cache/app-office/libreoffice-6.3.4.2 b/metadata/md5-cache/app-office/libreoffice-6.3.4.2
deleted file mode 100644
index 2bd78341307a..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-6.3.4.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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.1 >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=7
-HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-6.3*
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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/liberation-fonts || ( 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=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-RESTRICT=!test? ( test )
-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.3.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.3.4//libreoffice-6.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.3.4//libreoffice-help-6.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.3.4.2/src/libreoffice-6.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.3.4.2/src/libreoffice-help-6.3.4.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	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34a12492f04526011e14437039bf023b
diff --git a/metadata/md5-cache/app-office/libreoffice-6.3.4.2-r1 b/metadata/md5-cache/app-office/libreoffice-6.3.4.2-r1
new file mode 100644
index 000000000000..836856563984
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-6.3.4.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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.1 >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-6.3*
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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/liberation-fonts || ( 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=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RESTRICT=!test? ( test )
+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.3.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.3.4//libreoffice-6.3.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.3.4//libreoffice-help-6.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.3.4.2/src/libreoffice-6.3.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.3.4.2/src/libreoffice-help-6.3.4.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	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c2fa718a38948749502c323bb1f5ffd
diff --git a/metadata/md5-cache/app-office/libreoffice-6.3.9999 b/metadata/md5-cache/app-office/libreoffice-6.3.9999
index 4275e88dc580..70a29ff0bfdf 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.3.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.3.9999
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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.1 >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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.1 >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A full office productivity suite
 EAPI=7
 HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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/liberation-fonts || ( 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=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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/liberation-fonts || ( 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=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 RESTRICT=!test? ( test )
 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	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df5d649703e1b708d472cfbd3d9a58b4
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7ad458ae2aab0f29317c9eca48e4a138
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index ec57620c8cd1..55200628c062 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -1,17 +1,17 @@
 BDEPEND=dev-util/intltool sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig odk? ( >=app-doc/doxygen-1.8.4 ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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.1 >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.8 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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.1 >=dev-util/mdds-1.4.1:1= media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.8 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A full office productivity suite
 EAPI=7
 HOMEPAGE=https://www.libreoffice.org
-IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=accessibility bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND=!app-office/libreoffice-l10n
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) 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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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? ( python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus ) 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 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mariadb? ( dev-db/mariadb-connector-c ) !mariadb? ( 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/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) bluetooth? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
 RESTRICT=!test? ( test )
 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	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd7c144a5f88f19d68b46843fde6d28e
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=20b74441fa092791c5ee37128b23f7f4
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.3.4.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.3.4.2
index e051e767076f..f6a265b3364a 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.3.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.3.4.2
@@ -3,14 +3,14 @@ DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A full office productivity suite. Binary package
 EAPI=7
 HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde elibc_FreeBSD java +python_targets_python3_6 +python_single_target_python3_6
+IUSE=gnome java kde elibc_FreeBSD java +python_single_target_python3_6
 KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 PDEPEND==app-office/libreoffice-l10n-6.3.4.2*
 RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.72.0 dev-libs/icu:0/65.1 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-9.2.0 >=sys-libs/glibc-2.29 virtual/jpeg-compat:62 python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] >=dev-lang/python-exec-2:=[python_targets_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.2 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.14.0 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.28[nss] media-gfx/fontforge 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 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 net-print/cups sys-apps/dbus 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 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( 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_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_6 )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-6.3.4.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.3.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.3.4.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.3.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.3.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-java-6.3.4.2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-6.3.4.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-6.3.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.3.4.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.3.4.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.3.4.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-java-6.3.4.2.xd3 ) ) ) )
-_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b84a41275ff38ba6a53b38318ce64e9
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.3.4.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.3.4.2
index ff2ce70c6df1..d7436f079de7 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.3.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.3.4.2
@@ -10,5 +10,5 @@ RDEPEND=app-text/hunspell
 RESTRICT=strip
 SLOT=0
 SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_am.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_da.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_de.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_el.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_es.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_et.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_he.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_id.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_is.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_it.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_km.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_om.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_si.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_am.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_da.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_de.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_el.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_es.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_et.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_he.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_id.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_is.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_it.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_km.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_om.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_si.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_af.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_as.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_be.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_br.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_my.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_or.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_st.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_te.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_th.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.3.4/rpm/x86_64/LibreOffice_6.3.4_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.3.4/rpm/x86_64/LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz -> LibreOffice_6.3.4.2_Linux_x86-64_rpm_langpack_zu.tar.gz )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	b03b38188e1e83766244d2046785d562
 _md5_=f8dbf346f028178d614d7bcd9756f7b2
diff --git a/metadata/md5-cache/app-office/lyx-2.3.3 b/metadata/md5-cache/app-office/lyx-2.3.3
index b39e45cdd40e..ecc6ea660d5e 100644
--- a/metadata/md5-cache/app-office/lyx-2.3.3
+++ b/metadata/md5-cache/app-office/lyx-2.3.3
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
 EAPI=6
 HOMEPAGE=https://www.lyx.org/
-IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he X +python_targets_python2_7 +python_single_target_python2_7
+IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he X +python_single_target_python2_7
 KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant:0 ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.3/lyx-2.3.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	font	af70de9a23b2f34d4fe4dcb222be0346	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	font	af70de9a23b2f34d4fe4dcb222be0346	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bad996ea217c30a0ae7fbbfc23c15359
diff --git a/metadata/md5-cache/app-office/moneyguru-2.13.1-r1 b/metadata/md5-cache/app-office/moneyguru-2.13.1-r1
deleted file mode 100644
index f4b92b557419..000000000000
--- a/metadata/md5-cache/app-office/moneyguru-2.13.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,gui,widgets,printsupport] dev-qt/qttranslations test? ( <dev-python/pytest-4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/cunit )
-DESCRIPTION=Future-aware personal finances management
-EAPI=7
-HOMEPAGE=https://hardcoded.net/moneyguru
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,gui,widgets,printsupport] dev-qt/qttranslations
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.hardcoded.net/moneyguru-2.13.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b20410af83efd5a9b689568ac2efc151
diff --git a/metadata/md5-cache/app-office/moneyguru-2.13.1-r2 b/metadata/md5-cache/app-office/moneyguru-2.13.1-r2
new file mode 100644
index 000000000000..c98a86d5866c
--- /dev/null
+++ b/metadata/md5-cache/app-office/moneyguru-2.13.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),gui,widgets,printsupport] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-),gui,widgets,printsupport] ) dev-qt/qttranslations test? ( python_single_target_python3_6? ( <dev-python/pytest-4[python_targets_python3_6(-)] ) python_single_target_python3_7? ( <dev-python/pytest-4[python_targets_python3_7(-)] ) dev-util/cunit )
+DESCRIPTION=Future-aware personal finances management
+EAPI=7
+HOMEPAGE=https://hardcoded.net/moneyguru
+IUSE=test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),gui,widgets,printsupport] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-),gui,widgets,printsupport] ) dev-qt/qttranslations
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.hardcoded.net/moneyguru-2.13.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=30720d05c86925ceb5c5913203176acb
diff --git a/metadata/md5-cache/app-office/moneyguru-3.0.1-r1 b/metadata/md5-cache/app-office/moneyguru-3.0.1-r1
deleted file mode 100644
index d581ac472a38..000000000000
--- a/metadata/md5-cache/app-office/moneyguru-3.0.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,gui,widgets,printsupport] dev-qt/qttranslations test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/cunit )
-DESCRIPTION=Future-aware personal finances management
-EAPI=7
-HOMEPAGE=https://hardcoded.net/moneyguru
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,gui,widgets,printsupport] dev-qt/qttranslations
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.hardcoded.net/moneyguru-3.0.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d1e6314083ca35030ade3942e102a11e
diff --git a/metadata/md5-cache/app-office/moneyguru-3.0.1-r2 b/metadata/md5-cache/app-office/moneyguru-3.0.1-r2
new file mode 100644
index 000000000000..8fbecd231a79
--- /dev/null
+++ b/metadata/md5-cache/app-office/moneyguru-3.0.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),gui,widgets,printsupport] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-),gui,widgets,printsupport] ) dev-qt/qttranslations test? ( python_single_target_python3_6? ( dev-python/pytest[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pytest[python_targets_python3_7(-)] ) dev-util/cunit )
+DESCRIPTION=Future-aware personal finances management
+EAPI=7
+HOMEPAGE=https://hardcoded.net/moneyguru
+IUSE=test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),gui,widgets,printsupport] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-),gui,widgets,printsupport] ) dev-qt/qttranslations
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.hardcoded.net/moneyguru-3.0.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=008e19d96147044424717032fd75d687
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.7 b/metadata/md5-cache/app-office/openoffice-bin-4.1.7
index 04210b74d072..eb6fa353062d 100644
--- a/metadata/md5-cache/app-office/openoffice-bin-4.1.7
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.7
@@ -3,14 +3,14 @@ DEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arc
 DESCRIPTION=Apache OpenOffice productivity suite
 EAPI=6
 HOMEPAGE=https://www.openoffice.org/
-IUSE=gnome java l10n_ast l10n_eu l10n_bg l10n_ca l10n_ca-valencia l10n_zh-CN l10n_zh-TW l10n_cs l10n_da l10n_nl l10n_en-GB l10n_fi l10n_fr l10n_gd l10n_gl l10n_de l10n_el l10n_he l10n_hi l10n_hu l10n_it l10n_ja l10n_km l10n_ko l10n_lt l10n_nb l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_sr l10n_sk l10n_sl l10n_es l10n_sv l10n_ta l10n_th l10n_tr l10n_vi +python_targets_python2_7 +python_single_target_python2_7
+IUSE=gnome java l10n_ast l10n_eu l10n_bg l10n_ca l10n_ca-valencia l10n_zh-CN l10n_zh-TW l10n_cs l10n_da l10n_nl l10n_en-GB l10n_fi l10n_fr l10n_gd l10n_gl l10n_de l10n_el l10n_he l10n_hi l10n_hu l10n_it l10n_ja l10n_km l10n_ko l10n_lt l10n_nb l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_sr l10n_sk l10n_sl l10n_es l10n_sv l10n_ta l10n_th l10n_tr l10n_vi +python_single_target_python2_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 PDEPEND=java? ( >=virtual/jre-1.5 )
 RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses-compat:5 x11-libs/libXaw x11-libs/libXinerama
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_install-rpm_en-US.tar.gz ) l10n_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_ast.tar.gz ) ) l10n_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_eu.tar.gz ) ) l10n_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_bg.tar.gz ) ) l10n_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_ca.tar.gz ) ) l10n_ca-valencia? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) l10n_zh-CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) l10n_zh-TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) l10n_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_cs.tar.gz ) ) l10n_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_da.tar.gz ) ) l10n_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_nl.tar.gz ) ) l10n_en-GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) l10n_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_fi.tar.gz ) ) l10n_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_fr.tar.gz ) ) l10n_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_gd.tar.gz ) ) l10n_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_gl.tar.gz ) ) l10n_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_de.tar.gz ) ) l10n_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_el.tar.gz ) ) l10n_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_he.tar.gz ) ) l10n_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_hi.tar.gz ) ) l10n_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_hu.tar.gz ) ) l10n_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_it.tar.gz ) ) l10n_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_ja.tar.gz ) ) l10n_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_km.tar.gz ) ) l10n_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_ko.tar.gz ) ) l10n_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_lt.tar.gz ) ) l10n_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_nb.tar.gz ) ) l10n_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_pl.tar.gz ) ) l10n_pt-BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) l10n_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_pt.tar.gz ) ) l10n_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_ru.tar.gz ) ) l10n_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_sr.tar.gz ) ) l10n_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_sk.tar.gz ) ) l10n_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_sl.tar.gz ) ) l10n_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_es.tar.gz ) ) l10n_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_sv.tar.gz ) ) l10n_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_ta.tar.gz ) ) l10n_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_th.tar.gz ) ) l10n_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_tr.tar.gz ) ) l10n_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.7_Linux_x86_langpack-rpm_vi.tar.gz ) )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97825c32faffb68012d26ee32955075f
diff --git a/metadata/md5-cache/app-office/planner-0.14.6_p20130520 b/metadata/md5-cache/app-office/planner-0.14.6_p20130520
deleted file mode 100644
index 9c15bc09bddb..000000000000
--- a/metadata/md5-cache/app-office/planner-0.14.6_p20130520
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.6:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) eds? ( >=gnome-extra/evolution-data-server-3.6:= >=mail-client/evolution-3.6 ) app-text/rarian dev-util/gtk-doc-am >=dev-util/intltool-0.35.5 gnome-base/gnome-common virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Project manager for Gnome
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Planner
-IUSE=eds examples python +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.6:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) eds? ( >=gnome-extra/evolution-data-server-3.6:= >=mail-client/evolution-3.6 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc815844f9055c59a39ae1e799fa6e58
diff --git a/metadata/md5-cache/app-office/planner-0.14.6_p20130520-r1 b/metadata/md5-cache/app-office/planner-0.14.6_p20130520-r1
new file mode 100644
index 000000000000..6437dd19323e
--- /dev/null
+++ b/metadata/md5-cache/app-office/planner-0.14.6_p20130520-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( python_single_target_python2_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/pygtk-2.6:2[python_targets_python2_7(-)] ) ) eds? ( >=gnome-extra/evolution-data-server-3.6:= >=mail-client/evolution-3.6 ) app-text/rarian dev-util/gtk-doc-am >=dev-util/intltool-0.35.5 gnome-base/gnome-common virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Project manager for Gnome
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Planner
+IUSE=eds examples python +python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( python_single_target_python2_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/pygtk-2.6:2[python_targets_python2_7(-)] ) ) eds? ( >=gnome-extra/evolution-data-server-3.6:= >=mail-client/evolution-3.6 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~eva/distfiles/planner/planner-0.14.6_p20130520.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a58dbed1be33c31ad2f212272935cb7b
diff --git a/metadata/md5-cache/app-office/pybliographer-1.4.0-r2 b/metadata/md5-cache/app-office/pybliographer-1.4.0-r2
deleted file mode 100644
index acf813da105a..000000000000
--- a/metadata/md5-cache/app-office/pybliographer-1.4.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.24.0:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/yelp-tools >=sys-devel/gettext-0.19.8 >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Pybliographer is a tool for working with bibliographic databases
-EAPI=6
-HOMEPAGE=https://pybliographer.org
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.24.0:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/pybliographer/1.4/pybliographer-1.4.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba2d1b9105395ed560b85f4209513bab
diff --git a/metadata/md5-cache/app-office/pybliographer-1.4.0-r3 b/metadata/md5-cache/app-office/pybliographer-1.4.0-r3
new file mode 100644
index 000000000000..b9d8b6554faf
--- /dev/null
+++ b/metadata/md5-cache/app-office/pybliographer-1.4.0-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 python_single_target_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/pygtk-2.24.0:2[python_targets_python2_7(-)] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)] ) app-text/yelp-tools >=sys-devel/gettext-0.19.8 >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Pybliographer is a tool for working with bibliographic databases
+EAPI=6
+HOMEPAGE=https://pybliographer.org
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/recode-3.6-r1 app-text/rarian dev-libs/glib:2 python_single_target_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/pygtk-2.24.0:2[python_targets_python2_7(-)] >=dev-python/python-bibtex-1.2.5[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/pybliographer/1.4/pybliographer-1.4.0.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c780d870ef419833a27af712d5243aa
diff --git a/metadata/md5-cache/app-office/scribus-1.5.5 b/metadata/md5-cache/app-office/scribus-1.5.5
index 68f30dcfedee..be019135e69f 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.5
+++ b/metadata/md5-cache/app-office/scribus-1.5.5
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/libmspub app-text/libqxp 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[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport: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/libzmf 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.67:= ) 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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/libmspub app-text/libqxp 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[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport: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/libzmf 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.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python2_7? ( dev-python/pillow[tk?,python_targets_python2_7(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=7
 HOMEPAGE=https://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk +python_single_target_python2_7
 KEYWORDS=amd64 ~hppa ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/libmspub app-text/libqxp 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[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport: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/libzmf 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.67:= ) 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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) app-text/ghostscript-gpl
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) tk? ( scripts )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/libmspub app-text/libqxp 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[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport: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/libzmf 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.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python2_7? ( dev-python/pillow[tk?,python_targets_python2_7(-)] ) ) app-text/ghostscript-gpl
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) tk? ( scripts )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.5/scribus-1.5.5.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ccec2b3eca6a5c0ba96b19ef60fca22a
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea0651070466cc179642b7e3807b95fd
diff --git a/metadata/md5-cache/app-office/scribus-9999 b/metadata/md5-cache/app-office/scribus-9999
index b990a7b722ab..7cad9e18d00d 100644
--- a/metadata/md5-cache/app-office/scribus-9999
+++ b/metadata/md5-cache/app-office/scribus-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/libmspub app-text/libqxp 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[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport: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/libzmf 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.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/libmspub app-text/libqxp 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[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport: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/libzmf 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.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Desktop publishing (DTP) and layout program
 EAPI=7
 HOMEPAGE=https://www.scribus.net/
-IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/libmspub app-text/libqxp 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[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport: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/libzmf 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.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( dev-python/pillow[tk?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) app-text/ghostscript-gpl
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) tk? ( scripts )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[tk?] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/libmspub app-text/libqxp 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[-gles2] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport: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/libzmf 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.67:= ) hunspell? ( app-text/hunspell:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) osg? ( dev-games/openscenegraph:= ) pdf? ( app-text/podofo:0= ) scripts? ( python_single_target_python3_6? ( dev-python/pillow[tk?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[tk?,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[tk?,python_targets_python3_8(-)] ) ) app-text/ghostscript-gpl
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) tk? ( scripts )
 SLOT=0
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd17d28db4d00564eddbfb5a21acf1c8
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5cef475e958f5ff93225c88daef6e2cc
diff --git a/metadata/md5-cache/app-office/skrooge-2.21.1 b/metadata/md5-cache/app-office/skrooge-2.21.1
index 2b8a9901c05e..caa2a2535373 100644
--- a/metadata/md5-cache/app-office/skrooge-2.21.1
+++ b/metadata/md5-cache/app-office/skrooge-2.21.1
@@ -5,7 +5,7 @@ DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
 EAPI=7
 HOMEPAGE=https://skrooge.org/
 IUSE=activities designer kde ofx webkit test debug +handbook test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlcipher dev-libs/grantlee:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5= >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 activities? ( >=kde-frameworks/kactivities-5.60.0:5 ) kde? ( >=kde-frameworks/krunner-5.60.0:5 ) ofx? ( dev-libs/libofx ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=dev-qt/qtquickcontrols-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=test? ( designer )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.21.1.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf11f6a7d403ded335407ac238b2a10b
+_md5_=918cfada8e830214c8f27d801578ff9b
diff --git a/metadata/md5-cache/app-office/taskcoach-1.4.6 b/metadata/md5-cache/app-office/taskcoach-1.4.6
index f732533407fd..82dd061774b9 100644
--- a/metadata/md5-cache/app-office/taskcoach-1.4.6
+++ b/metadata/md5-cache/app-office/taskcoach-1.4.6
@@ -11,5 +11,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.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b763aec5d3ef9eb76e7dd7b3914a7d7c
diff --git a/metadata/md5-cache/app-office/unoconv-0.8.2 b/metadata/md5-cache/app-office/unoconv-0.8.2
index bd85776643ed..d65d85969346 100644
--- a/metadata/md5-cache/app-office/unoconv-0.8.2
+++ b/metadata/md5-cache/app-office/unoconv-0.8.2
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare setup
 DESCRIPTION=Convert between document formats supported by Libreoffice
 EAPI=6
 HOMEPAGE=http://dag.wiee.rs/home-made/unoconv/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) !app-text/odt2txt virtual/ooo
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) !app-text/odt2txt virtual/ooo
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/dagwieers/unoconv/archive/0.8.2.tar.gz -> unoconv-0.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad880ee1c60ee8939b810f4df6ff74b4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8e038e2cbaa1dd31c901a58fbf648c0e
diff --git a/metadata/md5-cache/app-office/unoconv-0.9 b/metadata/md5-cache/app-office/unoconv-0.9
index 77b20e7e7ef1..6eb9de5e644f 100644
--- a/metadata/md5-cache/app-office/unoconv-0.9
+++ b/metadata/md5-cache/app-office/unoconv-0.9
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare setup
 DESCRIPTION=Convert between document formats supported by LibreOffice
 EAPI=7
 HOMEPAGE=http://dag.wiee.rs/home-made/unoconv/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-text/odt2txt virtual/ooo
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dagwieers/unoconv/archive/0.9.tar.gz -> unoconv-0.9.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=70433f2e71100356e5087cfb0c2be7eb
diff --git a/metadata/md5-cache/app-office/unoconv-0.9.0 b/metadata/md5-cache/app-office/unoconv-0.9.0
index ce57602fde0d..642ef6ad06d7 100644
--- a/metadata/md5-cache/app-office/unoconv-0.9.0
+++ b/metadata/md5-cache/app-office/unoconv-0.9.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install prepare setup
 DESCRIPTION=Convert between document formats supported by LibreOffice
 EAPI=7
 HOMEPAGE=http://dag.wiee.rs/home-made/unoconv/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !app-text/odt2txt virtual/ooo
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dagwieers/unoconv/archive/0.9.0.tar.gz -> unoconv-0.9.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=70433f2e71100356e5087cfb0c2be7eb
diff --git a/metadata/md5-cache/app-office/upwork-5.2.3.771 b/metadata/md5-cache/app-office/upwork-5.2.3.771
deleted file mode 100644
index c941765b8956..000000000000
--- a/metadata/md5-cache/app-office/upwork-5.2.3.771
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-util/patchelf >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Project collaboration and tracking software for upwork.com
-EAPI=7
-HOMEPAGE=https://www.upwork.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=ODESK
-RDEPEND=dev-libs/expat dev-libs/nspr dev-libs/nss gnome-base/gconf media-libs/alsa-lib media-libs/freetype sys-apps/dbus sys-libs/libcap x11-libs/gtk+:2[cups] x11-libs/gtkglext
-SLOT=0
-SRC_URI=amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_2_3_771_okk32anbjc976nah/upwork-5.2.3.771-1fc24.x86_64.rpm -> upwork-5.2.3.771_x86_64.rpm ) x86? ( https://updates-desktopapp.upwork.com/binaries/v5_2_3_771_okk32anbjc976nah/upwork-5.2.3.771-1fc24.i386.rpm -> upwork-5.2.3.771_i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35
-_md5_=a181aa88a2553e6aa47c2b5a92a9a3ac
diff --git a/metadata/md5-cache/app-office/upwork-5.3.3.860 b/metadata/md5-cache/app-office/upwork-5.3.3.860
new file mode 100644
index 000000000000..a9e489efb52b
--- /dev/null
+++ b/metadata/md5-cache/app-office/upwork-5.3.3.860
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=Project collaboration and tracking software for upwork.com
+EAPI=7
+HOMEPAGE=https://www.upwork.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ODESK
+RDEPEND=dev-libs/expat dev-libs/nspr dev-libs/nss gnome-base/gconf media-libs/alsa-lib media-libs/freetype sys-apps/dbus sys-libs/libcap x11-libs/gtk+:3[cups]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://updates-desktopapp.upwork.com/binaries/v5_3_3_860_wub7hae1mtgzk09u/upwork-5.3.3.860-1fc24.x86_64.rpm -> upwork-5.3.3.860_x86_64.rpm ) x86? ( https://updates-desktopapp.upwork.com/binaries/v5_3_3_860_wub7hae1mtgzk09u/upwork-5.3.3.860-1fc24.i386.rpm -> upwork-5.3.3.860_i386.rpm )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562
+_md5_=c5f1883867d1f4a8c35706ef9f287d0e
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index d1e8d3c7ed06..e1589ca026b5 100644
--- a/metadata/md5-cache/app-pda/Manifest.gz
+++ b/metadata/md5-cache/app-pda/Manifest.gz
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
index 4ee769c7f653..1b68c58eb8f1 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/pilot-link-0.12.5.tar.bz2 https://dev.gentoo.org/~mgorny/dist/pilot-link-0.12.5-gentoo-patchset.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79e56a0ff5736d256e41eaec1a8f63e2
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530 b/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
index 82d06a49eb96..e3d3c5b00547 100644
--- a/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.0.8_p20140530
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1+
 RDEPEND=acct-group/plugdev >=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ssuominen/usbmuxd-1.0.8_p20140530.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b69e4f5d4ba65c649938aeb09a9292d
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.1.0 b/metadata/md5-cache/app-pda/usbmuxd-1.1.0
index b5273d4312ef..5c86f57b1658 100644
--- a/metadata/md5-cache/app-pda/usbmuxd-1.1.0
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2 GPL-3 LGPL-2.1+
 RDEPEND=acct-group/plugdev >=app-pda/libimobiledevice-1.1.6 >=app-pda/libplist-1.11 virtual/libusb:1
 SLOT=0
 SRC_URI=http://www.libimobiledevice.org/downloads/usbmuxd-1.1.0.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c0a79c80324e1630acc0ba5943967703
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 2fab58b9bd90..c02d2a692f22 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/diffmask-0.3.3-r4 b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
index 34b7b220f2a0..7cbd4b034af2 100644
--- a/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
+++ b/metadata/md5-cache/app-portage/diffmask-0.3.3-r4
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/diffmask/releases/download/diffmask-0.3.3/diffmask-0.3.3.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5679846475df5c7d2e225b528ad186ef
diff --git a/metadata/md5-cache/app-portage/diffmask-9999 b/metadata/md5-cache/app-portage/diffmask-9999
index 0d8bb506f7df..37fcd6a89c9c 100644
--- a/metadata/md5-cache/app-portage/diffmask-9999
+++ b/metadata/md5-cache/app-portage/diffmask-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3df2cdb317c4b256bee23f53507b7ba2
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 53d0d8f20d30..9fd22f7b2c9b 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_single_t
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0f4c1a4cac6ebb517ceca98365a5090
diff --git a/metadata/md5-cache/app-portage/elicense-1.0.2 b/metadata/md5-cache/app-portage/elicense-1.0.2
index f0193e56bf49..ba2241e9bab4 100644
--- a/metadata/md5-cache/app-portage/elicense-1.0.2
+++ b/metadata/md5-cache/app-portage/elicense-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Whissi/elicense/archive/v1.0.2.tar.gz -> elicense-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4f72333739956d367d77b868af93923e
diff --git a/metadata/md5-cache/app-portage/elicense-9999 b/metadata/md5-cache/app-portage/elicense-9999
index edefb21738df..62da827e2c67 100644
--- a/metadata/md5-cache/app-portage/elicense-9999
+++ b/metadata/md5-cache/app-portage/elicense-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b7221ce7c0dd86770790851ceb02b856
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.8-r1 b/metadata/md5-cache/app-portage/elogv-0.7.8-r1
index 157247a9be40..4861cdd57c85 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.8-r1
+++ b/metadata/md5-cache/app-portage/elogv-0.7.8-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.8.tar.gz -> elogv-0.7.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c4053d84abb2f534bc31858bff2bfaa1
diff --git a/metadata/md5-cache/app-portage/elogv-0.7.8-r2 b/metadata/md5-cache/app-portage/elogv-0.7.8-r2
index 92fec2f8707c..bf65f879b18d 100644
--- a/metadata/md5-cache/app-portage/elogv-0.7.8-r2
+++ b/metadata/md5-cache/app-portage/elogv-0.7.8-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/elogv/archive/0.7.8.tar.gz -> elogv-0.7.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c9bac2e5ed5d68999052ec684b4cc106
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.9 b/metadata/md5-cache/app-portage/elogviewer-2.9
deleted file mode 100644
index e337ffba7cc6..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?]
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
-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=https://github.com/Synss/elogviewer/archive/v2.9.tar.gz -> elogviewer-2.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14fbf27dc72a1979f2dd499c740b0956
diff --git a/metadata/md5-cache/app-portage/elogviewer-2.9-r1 b/metadata/md5-cache/app-portage/elogviewer-2.9-r1
new file mode 100644
index 000000000000..11d70c0fb697
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elogviewer-2.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] >=sys-apps/portage-2.1[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DESCRIPTION=Elog viewer for Gentoo
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/elogviewer
+IUSE=+python_single_target_python3_6
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] >=sys-apps/portage-2.1[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Synss/elogviewer/archive/v2.9.tar.gz -> elogviewer-2.9.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d4821eea0b6393ae04209ade90eef260
diff --git a/metadata/md5-cache/app-portage/elogviewer-3.0 b/metadata/md5-cache/app-portage/elogviewer-3.0
deleted file mode 100644
index c392f0c23b53..000000000000
--- a/metadata/md5-cache/app-portage/elogviewer-3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=sys-apps/portage-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-DESCRIPTION=Elog viewer for Gentoo
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=sys-apps/portage-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/Synss/elogviewer/archive/v3.0.tar.gz -> elogviewer-3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=05a218fb80ac721596a49de00bd2c33a
diff --git a/metadata/md5-cache/app-portage/elogviewer-3.0-r1 b/metadata/md5-cache/app-portage/elogviewer-3.0-r1
new file mode 100644
index 000000000000..b18deb44f01f
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elogviewer-3.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] >=sys-apps/portage-2.1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] >=sys-apps/portage-2.1[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] >=sys-apps/portage-2.1[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] )
+DESCRIPTION=Elog viewer for Gentoo
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/elogviewer
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] >=sys-apps/portage-2.1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] >=sys-apps/portage-2.1[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] >=sys-apps/portage-2.1[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/Synss/elogviewer/archive/v3.0.tar.gz -> elogviewer-3.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=59ce3d054ae3ef0145bd107455724f64
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170815 b/metadata/md5-cache/app-portage/elt-patches-20170815
index dc06ffb59250..fef8005b56e3 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170815
+++ b/metadata/md5-cache/app-portage/elt-patches-20170815
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170815.tar.xz
-_md5_=f8366078c70d2440d3dd9966a7edfd54
+_md5_=fac7f779ac04889fb956f4d9c32188fa
diff --git a/metadata/md5-cache/app-portage/elt-patches-20170826.1 b/metadata/md5-cache/app-portage/elt-patches-20170826.1
index 93c385dc25dc..10522b8391b0 100644
--- a/metadata/md5-cache/app-portage/elt-patches-20170826.1
+++ b/metadata/md5-cache/app-portage/elt-patches-20170826.1
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/elt-patches-20170826.1.tar.xz
-_md5_=5429063858e529b690a38489589663f5
+_md5_=0421383638cd4a33bf65ff2dcedf0bbd
diff --git a/metadata/md5-cache/app-portage/esearch-1.3-r2 b/metadata/md5-cache/app-portage/esearch-1.3-r2
index d5f2ec4bed55..6661b9325a4d 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 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/downloads/fuzzyray/esearch/esearch-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84f3604115bd02192f0ad36a288a026a
diff --git a/metadata/md5-cache/app-portage/esearch-9999 b/metadata/md5-cache/app-portage/esearch-9999
index a6b28d6c9855..d8218daa9892 100644
--- a/metadata/md5-cache/app-portage/esearch-9999
+++ b/metadata/md5-cache/app-portage/esearch-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d80bd0353f18b59dc2787c03515d332
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 063fb917a724..708738022b12 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f064b14c440c..99f2e45930b6 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_pyth
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a1ef5a65d4f3ab72e101f39c419b897
diff --git a/metadata/md5-cache/app-portage/euscan-9999 b/metadata/md5-cache/app-portage/euscan-9999
index b2c59d37f6f0..fb41d6d157bd 100644
--- a/metadata/md5-cache/app-portage/euscan-9999
+++ b/metadata/md5-cache/app-portage/euscan-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85527ee559916d95041b5277370e7a71
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1
index 884ac4b3f7c7..c0120d1c658c 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python2_7? ( >=d
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/hartwork/fetchcommandwrapper/archive/0.8.1.tar.gz -> fetchcommandwrapper-0.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=af6a417cb980571b2bcdaf9f1d471140
diff --git a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2 b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2
index 6d1052aad0b1..7e92960638c3 100644
--- a/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2
+++ b/metadata/md5-cache/app-portage/fetchcommandwrapper-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/aria2-1.10.2[metalink,xmlrpc] python_targets_python2_7? ( >=d
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fetchcommandwrapper/fetchcommandwrapper-0.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bfa925a004040d6e24dcd7c04b1d2088
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 100250d7eff6..af78a3481f86 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_python2_7(-)?,python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 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	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ecd50567888f5057f8317535cfc4ed4d
diff --git a/metadata/md5-cache/app-portage/flaggie-9999 b/metadata/md5-cache/app-portage/flaggie-9999
index 26613a44224d..9086ce033c03 100644
--- a/metadata/md5-cache/app-portage/flaggie-9999
+++ b/metadata/md5-cache/app-portage/flaggie-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0a21d458ae3f1752d944fbba88746131
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 b3ac744e18ab..edbe35415e75 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/downloads/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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1455238f0b74c36504aee0bdc6661b0
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 98146f87a114..3da4d19a87f9 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 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=30989d94e408e744d5b3f4c526df174d
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 399bfa03afa4..f98ab5c96dac 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_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ecf240b3de1ad145a7ad26471d1c3a1
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 92b88b4c488c..f27f02cf2fec 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_single_t
 REQUIRED_USE=|| ( python_targets_python2_7 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ecf3f41d1be34f7c36a6955f6a3edfcd
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 3dfc49289cf8..03324a7aa68c 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_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41bd3ed65a7ba9a111e82292e2da04a0
diff --git a/metadata/md5-cache/app-portage/g-sorcery-9999 b/metadata/md5-cache/app-portage/g-sorcery-9999
index eb4bacdbdea1..cfae1c97805f 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-9999
+++ b/metadata/md5-cache/app-portage/g-sorcery-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0d29687dbab7760fa1c8e62acc060d1d
diff --git a/metadata/md5-cache/app-portage/gemato-14.3 b/metadata/md5-cache/app-portage/gemato-14.3
index 039398ab2cc7..4b9294ea2838 100644
--- a/metadata/md5-cache/app-portage/gemato-14.3
+++ b/metadata/md5-cache/app-portage/gemato-14.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gemato/gemato-14.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0d5225715ad8dc8eaa9c7573a1307d86
diff --git a/metadata/md5-cache/app-portage/gemato-9999 b/metadata/md5-cache/app-portage/gemato-9999
index 0413b748e800..9cde93b51525 100644
--- a/metadata/md5-cache/app-portage/gemato-9999
+++ b/metadata/md5-cache/app-portage/gemato-9999
@@ -11,5 +11,5 @@ RDEPEND=blake2? ( python_targets_pypy3? ( dev-python/pyblake2[python_targets_pyp
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=38b3e7975e7a8c7b20ccfa585577cff5
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.6 b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
index 650af72ca759..de7951470b5a 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.6
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.6
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c03876d20814187c21ea6ddb32cf0f2
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.4.7 b/metadata/md5-cache/app-portage/gentoolkit-0.4.7
index a392502e5c4f..fb932b5ebc51 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.4.7
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.4.7
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoolkit.git/snapshot/gentoolkit-0.4.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0f3e55572f524146d1693aff066ff385
diff --git a/metadata/md5-cache/app-portage/gentoolkit-9999 b/metadata/md5-cache/app-portage/gentoolkit-9999
index a1af42c512a3..f00d741a168d 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-9999
+++ b/metadata/md5-cache/app-portage/gentoolkit-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=sys-apps/portage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/gawk sys-apps/gentoo-functions python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9dcfe7f75e3819664ba2b7785ab3f9b7
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.0 b/metadata/md5-cache/app-portage/gentoopm-0.3.0
index 6b14be57e2cc..0521e29c59c8 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_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61a0bc9b42547ac3004989e3a8934def
diff --git a/metadata/md5-cache/app-portage/gentoopm-0.3.1 b/metadata/md5-cache/app-portage/gentoopm-0.3.1
index 2088f26f2a18..109f7085e443 100644
--- a/metadata/md5-cache/app-portage/gentoopm-0.3.1
+++ b/metadata/md5-cache/app-portage/gentoopm-0.3.1
@@ -11,5 +11,5 @@ RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gentoopm/archive/v0.3.1.tar.gz -> gentoopm-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82cf58aea81e7bde17dc433fa795f923
diff --git a/metadata/md5-cache/app-portage/gentoopm-9999 b/metadata/md5-cache/app-portage/gentoopm-9999
index a0794c027af6..821b3ea262e4 100644
--- a/metadata/md5-cache/app-portage/gentoopm-9999
+++ b/metadata/md5-cache/app-portage/gentoopm-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=|| ( >=sys-apps/pkgcore-0.9.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sys-apps/portage-2.1.10.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1e89151ee6c9602945718d8231a3d61
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 879fef2fe218..a184fe518b0e 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b2d9f1ac1281..e33f04671c6b 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_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d9974ad8b39ce4d932144d636d75ca1
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.3 b/metadata/md5-cache/app-portage/gpyutils-0.3
index e9a58ded2f0a..c14fd8bfb8cc 100644
--- a/metadata/md5-cache/app-portage/gpyutils-0.3
+++ b/metadata/md5-cache/app-portage/gpyutils-0.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-portage/gentoopm-0.3.1[python_targets_python2_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gpyutils/archive/v0.3.tar.gz -> gpyutils-0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=55dc7167109972de283cfdbedaee96ab
diff --git a/metadata/md5-cache/app-portage/gpyutils-9999 b/metadata/md5-cache/app-portage/gpyutils-9999
index c343c780626f..3eb06af145d7 100644
--- a/metadata/md5-cache/app-portage/gpyutils-9999
+++ b/metadata/md5-cache/app-portage/gpyutils-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-portage/gentoopm-0.3.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c556b00db0868640555ff50391c04d1d
diff --git a/metadata/md5-cache/app-portage/grs-0.6-r1 b/metadata/md5-cache/app-portage/grs-0.6-r1
index 2c3e105f91d7..030f83a105d3 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 server? ( app-arch/tar[xattr] app-crypt/md5deep dev-lib
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bb59e33b5fbe46141e0f31bd95def72
diff --git a/metadata/md5-cache/app-portage/grs-0.7 b/metadata/md5-cache/app-portage/grs-0.7
index 6ff16503208e..5c895b9c7a34 100644
--- a/metadata/md5-cache/app-portage/grs-0.7
+++ b/metadata/md5-cache/app-portage/grs-0.7
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-lib
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/grs-0.7.tar.gz https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3acb40013e971ef8cca6036d3851bfda
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index acdcc2b5c46a..7b922e9b8e6f 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-lib
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0980d78605e029d6eca0fea7e5e30f59
diff --git a/metadata/md5-cache/app-portage/gs-elpa-0.1.3 b/metadata/md5-cache/app-portage/gs-elpa-0.1.3
deleted file mode 100644
index c6e308983578..000000000000
--- a/metadata/md5-cache/app-portage/gs-elpa-0.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sexpdata[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-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=g-sorcery backend for elisp packages
-EAPI=5
-HOMEPAGE=https://github.com/jauhien/gs-elpa
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sexpdata[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/jauhien/gs-elpa/archive/0.1.3.tar.gz -> gs-elpa-0.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e64d6ae85f07196a6277564a32b9b0c
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 8dbe73dcc66d..737baa963cb1 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=app-portage/g-sorcery[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=g-sorcery backend for elisp packages
 EAPI=6
 HOMEPAGE=https://github.com/jauhien/gs-elpa
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-portage/g-sorcery[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=app-portage/g-sorcery[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e051d85bd25da4999be391cbcc867f07
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=832a1eca64aeae91eee44c1c66108968
diff --git a/metadata/md5-cache/app-portage/gs-elpa-9999 b/metadata/md5-cache/app-portage/gs-elpa-9999
index a04ac0c21196..97306fcdf7ad 100644
--- a/metadata/md5-cache/app-portage/gs-elpa-9999
+++ b/metadata/md5-cache/app-portage/gs-elpa-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-portage/g-sorcery-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=app-portage/g-sorcery-0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=g-sorcery backend for elisp packages
 EAPI=6
 HOMEPAGE=https://github.com/jauhien/gs-elpa
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=app-portage/g-sorcery-0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[python_targets_python2_7(-)?,-python_single_target_python2_7(-),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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=app-portage/g-sorcery-0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sexpdata[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ea60130ca6b18c987b4cf6cfb3edb26
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d421edc83ffef2a2541ed6a5f3f2944e
diff --git a/metadata/md5-cache/app-portage/gverify-2 b/metadata/md5-cache/app-portage/gverify-2
index 5243884421a8..7985ea4905d1 100644
--- a/metadata/md5-cache/app-portage/gverify-2
+++ b/metadata/md5-cache/app-portage/gverify-2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 DESCRIPTION=gentoo.git signature verification tool
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/gverify
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-crypt/gnupg app-crypt/openpgp-keys-gentoo-auth dev-vcs/git
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-crypt/gnupg app-crypt/openpgp-keys-gentoo-auth dev-vcs/git
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/gverify/archive/v2.tar.gz -> gverify-2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d4d526f4911b9bf1c335c70abc7d527d
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a384e819dfc3f6ad4b89ba442c2b9bdd
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 0e91c362f020..f40c9d2be3f2 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.2-r1
+++ b/metadata/md5-cache/app-portage/layman-2.4.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06138b933a7800a2c062894f36d631aa
diff --git a/metadata/md5-cache/app-portage/layman-2.4.2-r2 b/metadata/md5-cache/app-portage/layman-2.4.2-r2
index 069849c8a716..3e8cd3a4def0 100644
--- a/metadata/md5-cache/app-portage/layman-2.4.2-r2
+++ b/metadata/md5-cache/app-portage/layman-2.4.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/layman/layman-2.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b6187675c6cb4f6f2f0f8eee7a2226c7
diff --git a/metadata/md5-cache/app-portage/layman-9999 b/metadata/md5-cache/app-portage/layman-9999
index 227ee0c6120c..d01abcafa508 100644
--- a/metadata/md5-cache/app-portage/layman-9999
+++ b/metadata/md5-cache/app-portage/layman-9999
@@ -11,5 +11,5 @@ RDEPEND=bazaar? ( dev-vcs/bzr ) cvs? ( dev-vcs/cvs ) darcs? ( dev-vcs/darcs ) gi
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b6187675c6cb4f6f2f0f8eee7a2226c7
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 8710fce52859..120654bc8b6a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 7c736e6c5d70..589458225308 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 9281b732a54d..0fb2949bcdf1 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 ca1b968b47eb..e86f5f1b51ae 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 4a7f1e2b6c79..764329e93e51 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b6e9367cda16..b1db9f542941 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b47d5f079bc473d05a7745d18b504e3
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.0 b/metadata/md5-cache/app-portage/metagen-0.7.0
index 2cda016be2ff..e6d90805391e 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.0
+++ b/metadata/md5-cache/app-portage/metagen-0.7.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://cgit.gentoo.org/proj/metagen.git/snapshot/metagen-0.7.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=45a1115231ae28f0b56eb88f753b6488
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.1 b/metadata/md5-cache/app-portage/metagen-0.7.1
index 61457ed35c6f..6cb67e582544 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.1
+++ b/metadata/md5-cache/app-portage/metagen-0.7.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/metagen/metagen-0.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2a15921355409b9201114e5c45d7f7d6
diff --git a/metadata/md5-cache/app-portage/metagen-0.7.2 b/metadata/md5-cache/app-portage/metagen-0.7.2
index 621784f10980..9e955be73d27 100644
--- a/metadata/md5-cache/app-portage/metagen-0.7.2
+++ b/metadata/md5-cache/app-portage/metagen-0.7.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/metagen/metagen-0.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2a15921355409b9201114e5c45d7f7d6
diff --git a/metadata/md5-cache/app-portage/metagen-9999 b/metadata/md5-cache/app-portage/metagen-9999
index ec529f13240c..b873749c4d68 100644
--- a/metadata/md5-cache/app-portage/metagen-9999
+++ b/metadata/md5-cache/app-portage/metagen-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=60a01e267f48d5dc6c0bd516a87fbec4
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.3 b/metadata/md5-cache/app-portage/mirrorselect-2.2.3
index a8ed00ee19a2..6ddef9ca9605 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6204408747122ba497c43cf7dbd565b9
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
index 00cef1fb5f9b..7a295b9ec8f7 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog net-analyzer/netselect >=dev-python/ssl-fetch-0.3[python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.4.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b7ea97a7fc3b58b65d3fb8a213e7aff9
diff --git a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1 b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
index 70c36196b561..b691f3fa42bd 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
+++ b/metadata/md5-cache/app-portage/mirrorselect-2.2.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)?] >=dev-python/ssl-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/dist/mirrorselect-2.2.6.tar.gz https://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=546022c0a1021896dce5a856fbb362ba
diff --git a/metadata/md5-cache/app-portage/mirrorselect-9999 b/metadata/md5-cache/app-portage/mirrorselect-9999
index a450f1fed99d..9a1dc967e154 100644
--- a/metadata/md5-cache/app-portage/mirrorselect-9999
+++ b/metadata/md5-cache/app-portage/mirrorselect-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-util/dialog >=net-analyzer/netselect-0.4[ipv6(+)] =dev-python/ssl-fetch-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml] ) python_targets_python3_7? ( dev-lang/python:3.7[xml] ) python_targets_python3_8? ( dev-lang/python:3.8[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6254974f1494d3c3fa9869e36135cc06
diff --git a/metadata/md5-cache/app-portage/overlint-0.5.2 b/metadata/md5-cache/app-portage/overlint-0.5.2
index 372c5a257e94..e4e6b6dd7f38 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 )
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/overlint-0.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a035a575e787b723653fa0bba08bd225
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 673fd703172b..62d9d983f913 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_python3_6(-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.hartwork.org/public/overlint-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14cd373f9bdbd0cafd23243307e316a2
diff --git a/metadata/md5-cache/app-portage/pfl-3.0-r2 b/metadata/md5-cache/app-portage/pfl-3.0-r2
index f6edfec99364..15fdd9859aeb 100644
--- a/metadata/md5-cache/app-portage/pfl-3.0-r2
+++ b/metadata/md5-cache/app-portage/pfl-3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=net-misc/curl sys-apps/portage[python_targets_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://files.portagefilelist.de/pfl-3.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=49355639a49476e7b8152897e72c5f5b
diff --git a/metadata/md5-cache/app-portage/pfl-3.0.1-r3 b/metadata/md5-cache/app-portage/pfl-3.0.1-r3
index c472a66d2884..b30b4fd38f4a 100644
--- a/metadata/md5-cache/app-portage/pfl-3.0.1-r3
+++ b/metadata/md5-cache/app-portage/pfl-3.0.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/ssl-fetch-0.4[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~billie/distfiles/pfl-3.0.1.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f9688aced174115bdf3cc87a383ea20a
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 a748e93595fa..810c8e50ceb8 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_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/porthole/porthole-0.6.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54269543e0e006de18ef1f31326608cb
diff --git a/metadata/md5-cache/app-portage/portpeek-2.1.27-r1 b/metadata/md5-cache/app-portage/portpeek-2.1.27-r1
new file mode 100644
index 000000000000..80f7694363a8
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portpeek-2.1.27-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=7
+HOMEPAGE=https://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-portage/gentoolkit-0.4.7 || ( >=sys-apps/portage-2.3.85[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://www.mpagano.com/downloads/portpeek-2.1.27.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6774df6428b7cc92b37ae4bafbb347a7
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.16 b/metadata/md5-cache/app-portage/repoman-2.3.16
index cba860c3f279..f9b25469b0e8 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.16
+++ b/metadata/md5-cache/app-portage/repoman-2.3.16
@@ -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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.16.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5af019ea414389bcbbcc637c74069ffa
diff --git a/metadata/md5-cache/app-portage/repoman-2.3.20 b/metadata/md5-cache/app-portage/repoman-2.3.20
index 1371d16ef612..345539501d9c 100644
--- a/metadata/md5-cache/app-portage/repoman-2.3.20
+++ b/metadata/md5-cache/app-portage/repoman-2.3.20
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/portage-2.3.80[python_targets_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zmedico/portage/archives/repoman-2.3.20.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c9a197f2f9127ed824a6f597fe64cec
diff --git a/metadata/md5-cache/app-portage/repoman-9999 b/metadata/md5-cache/app-portage/repoman-9999
index 0de70f5386b1..efe85d3915cc 100644
--- a/metadata/md5-cache/app-portage/repoman-9999
+++ b/metadata/md5-cache/app-portage/repoman-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/portage-2.3.0_rc[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edf46cc0732220a40be9bd68927771d3
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 449602c01460..26c4247dd08e 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_6 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a546e02e222099543839e81ed64f547f
diff --git a/metadata/md5-cache/app-portage/smart-live-rebuild-9999 b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
index 795968edcc23..9976f759335f 100644
--- a/metadata/md5-cache/app-portage/smart-live-rebuild-9999
+++ b/metadata/md5-cache/app-portage/smart-live-rebuild-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=app-portage/gentoopm-0.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce2c6aba236f9d04cdf6d911c7cbbbc3
diff --git a/metadata/md5-cache/app-portage/tatt-0.5 b/metadata/md5-cache/app-portage/tatt-0.5
index 63d31fc7f062..299be6589b74 100644
--- a/metadata/md5-cache/app-portage/tatt-0.5
+++ b/metadata/md5-cache/app-portage/tatt-0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=arch testing tool
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/tatt
-IUSE=+templates python_targets_python2_7 python_targets_python3_6
+IUSE=+templates python_targets_python3_6
 KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-client/pybugz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-client/pybugz 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
 SRC_URI=https://github.com/gentoo/tatt/archive/v0.5.tar.gz -> tatt-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=206dfb05bd11e46b0b369f0a1951f48b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d754d5550f28645a53392ec242c243fc
diff --git a/metadata/md5-cache/app-portage/tatt-0.6 b/metadata/md5-cache/app-portage/tatt-0.6
index fabe280fb8b9..bbfa70efeeba 100644
--- a/metadata/md5-cache/app-portage/tatt-0.6
+++ b/metadata/md5-cache/app-portage/tatt-0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=arch testing tool
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/tatt
-IUSE=+templates python_targets_python2_7 python_targets_python3_6
+IUSE=+templates python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-client/pybugz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-client/pybugz 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
 SRC_URI=https://github.com/gentoo/tatt/archive/v0.6.tar.gz -> tatt-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43b3ba69fea2d78b477072fe55159724
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10a579849e442e45fc261974e4e37742
diff --git a/metadata/md5-cache/app-portage/tatt-9999 b/metadata/md5-cache/app-portage/tatt-9999
index 135fda8d6820..6d4f22c93f3c 100644
--- a/metadata/md5-cache/app-portage/tatt-9999
+++ b/metadata/md5-cache/app-portage/tatt-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-client/pybugz dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=arch testing tool
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/tatt
-IUSE=+templates python_targets_python2_7 python_targets_python3_6
+IUSE=+templates python_targets_python3_6
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-client/pybugz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=app-portage/eix app-portage/gentoolkit dev-python/configobj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-client/pybugz 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56754e6a5e8da701787db94066542ff1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fadea2bcc328faad7f92c837d46494df
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-17 b/metadata/md5-cache/app-portage/unsymlink-lib-17
deleted file mode 100644
index 278fbe3f9765..000000000000
--- a/metadata/md5-cache/app-portage/unsymlink-lib-17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup test
-DESCRIPTION=Convert your system to SYMLINK_LIB=no
-EAPI=7
-HOMEPAGE=https://github.com/mgorny/unsymlink-lib
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64
-LICENSE=BSD-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-REQUIRED_USE=^^ ( 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=https://github.com/mgorny/unsymlink-lib/archive/v17.tar.gz -> unsymlink-lib-17.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6b226197a91096fe0c8afcd909548ef6
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-17-r1 b/metadata/md5-cache/app-portage/unsymlink-lib-17-r1
new file mode 100644
index 000000000000..acea92c5c798
--- /dev/null
+++ b/metadata/md5-cache/app-portage/unsymlink-lib-17-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup test
+DESCRIPTION=Convert your system to SYMLINK_LIB=no
+EAPI=7
+HOMEPAGE=https://github.com/mgorny/unsymlink-lib
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64
+LICENSE=BSD-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( sys-apps/portage[python_targets_python3_6(-)] ) python_single_target_python3_7? ( sys-apps/portage[python_targets_python3_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/mgorny/unsymlink-lib/archive/v17.tar.gz -> unsymlink-lib-17.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=83dd239f67ea46a49703c0b7e6582632
diff --git a/metadata/md5-cache/app-portage/unsymlink-lib-9999 b/metadata/md5-cache/app-portage/unsymlink-lib-9999
index cc64e8364bab..92119648a54f 100644
--- a/metadata/md5-cache/app-portage/unsymlink-lib-9999
+++ b/metadata/md5-cache/app-portage/unsymlink-lib-9999
@@ -3,11 +3,11 @@ DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Convert your system to SYMLINK_LIB=no
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/unsymlink-lib
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( sys-apps/portage[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cdaab0bf9dc2e05cd621f7f7f4f0fe69
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=074120acc074b1dad9d3bec43d82ceb7
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 1a5362bcbcc1..88e4160ebb09 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/bash-5.0_p16 b/metadata/md5-cache/app-shells/bash-5.0_p16
new file mode 100644
index 000000000000..44ed26c79def
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-5.0_p16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= )
+DESCRIPTION=The standard GNU Bourne again shell
+EAPI=7
+HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
+IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= ) !<sys-apps/portage-2.1.6.7_p1
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-010 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-011 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-012 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-013 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-014 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-015 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-016 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-010 mirror://gnu/bash/bash-5.0-patches/bash50-011 mirror://gnu/bash/bash-5.0-patches/bash50-012 mirror://gnu/bash/bash-5.0-patches/bash50-013 mirror://gnu/bash/bash-5.0-patches/bash50-014 mirror://gnu/bash/bash-5.0-patches/bash50-015 mirror://gnu/bash/bash-5.0-patches/bash50-016
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9c75f9c5800cd2c51604c0df0d48ab6c
diff --git a/metadata/md5-cache/app-shells/bash-5.0_p9 b/metadata/md5-cache/app-shells/bash-5.0_p9
deleted file mode 100644
index 1b385f1a941f..000000000000
--- a/metadata/md5-cache/app-shells/bash-5.0_p9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= )
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=7
-HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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-3
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.0:0= ) !<sys-apps/portage-2.1.6.7_p1
-SLOT=0
-SRC_URI=mirror://gnu/bash/bash-5.0.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-001 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-002 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-003 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-004 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-005 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-006 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-007 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-008 ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/bash50-009 mirror://gnu/bash/bash-5.0-patches/bash50-001 mirror://gnu/bash/bash-5.0-patches/bash50-002 mirror://gnu/bash/bash-5.0-patches/bash50-003 mirror://gnu/bash/bash-5.0-patches/bash50-004 mirror://gnu/bash/bash-5.0-patches/bash50-005 mirror://gnu/bash/bash-5.0-patches/bash50-006 mirror://gnu/bash/bash-5.0-patches/bash50-007 mirror://gnu/bash/bash-5.0-patches/bash50-008 mirror://gnu/bash/bash-5.0-patches/bash50-009
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=76f9337ddc258240e767aa52420c583d
diff --git a/metadata/md5-cache/app-shells/fish-3.0.2 b/metadata/md5-cache/app-shells/fish-3.0.2
index c58e3986075e..a5fb3c5f89c3 100644
--- a/metadata/md5-cache/app-shells/fish-3.0.2
+++ b/metadata/md5-cache/app-shells/fish-3.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Friendly Interactive SHell
 EAPI=7
 HOMEPAGE=http://fishshell.com/
 IUSE=doc nls test
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libpcre2-10.21[pcre32] sys-devel/bc sys-libs/ncurses:0=[unicode]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fish-shell/fish-shell/releases/download/3.0.2/fish-3.0.2.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=26f850d1a41d8f711cdfbf156187679a
+_md5_=7c4ccbf271e8f0af8f001d09acff9fa2
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
index 3b23e8601d1f..160757485ea4 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/snapshot/gentoo-bashcomp-20180302.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ff026eb15e4f6bd9da6a3ec5ce116074
+_md5_=d1e2fe13b740413135c20dd3cab170b3
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
index 454d89d507c6..16ca2c06c45b 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20190211
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/snapshot/gentoo-bashcomp-20190211.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=24ff53485ceae18f35ce546710dac9e8
+_md5_=7d6f08234f2d91cdf573882061da42f7
diff --git a/metadata/md5-cache/app-shells/ksh-2020.0.0 b/metadata/md5-cache/app-shells/ksh-2020.0.0
deleted file mode 100644
index 3270f95f498c..000000000000
--- a/metadata/md5-cache/app-shells/ksh-2020.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=The Original Korn Shell, 1993 revision (ksh93)
-EAPI=7
-HOMEPAGE=https://github.com/att/ast
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=CPL-1.0 EPL-1.0
-RDEPEND=!app-shells/pdksh
-SLOT=0
-SRC_URI=https://github.com/att/ast/releases/download/2020.0.0/ksh-2020.0.0.tar.gz
-_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1e51175cf2050616e2d252d8664ae71a
diff --git a/metadata/md5-cache/app-shells/ksh-2020.0.0-r1 b/metadata/md5-cache/app-shells/ksh-2020.0.0-r1
new file mode 100644
index 000000000000..f65d7d7e9172
--- /dev/null
+++ b/metadata/md5-cache/app-shells/ksh-2020.0.0-r1
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=The Original Korn Shell, 1993 revision (ksh93)
+EAPI=7
+HOMEPAGE=https://github.com/att/ast
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=CPL-1.0 EPL-1.0
+RDEPEND=!app-shells/pdksh
+SLOT=0
+SRC_URI=https://github.com/att/ast/releases/download/2020.0.0/ksh-2020.0.0.tar.gz
+_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3763f6c06f34b0ba838e80438fb196b2
diff --git a/metadata/md5-cache/app-shells/powerline-2.7 b/metadata/md5-cache/app-shells/powerline-2.7
index 6524144c6191..4044b47a6075 100644
--- a/metadata/md5-cache/app-shells/powerline-2.7
+++ b/metadata/md5-cache/app-shells/powerline-2.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/powerline-status/powerline-status-2.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cdb2236ac0f99f7cf9cb2361f9a358ea
diff --git a/metadata/md5-cache/app-shells/powerline-9999 b/metadata/md5-cache/app-shells/powerline-9999
index 2e17a0c441fb..cf3ba78d9c47 100644
--- a/metadata/md5-cache/app-shells/powerline-9999
+++ b/metadata/md5-cache/app-shells/powerline-9999
@@ -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_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cdb2236ac0f99f7cf9cb2361f9a358ea
diff --git a/metadata/md5-cache/app-shells/thefuck-3.27 b/metadata/md5-cache/app-shells/thefuck-3.27
index d6a0d8b85ea0..fa51efff2f6b 100644
--- a/metadata/md5-cache/app-shells/thefuck-3.27
+++ b/metadata/md5-cache/app-shells/thefuck-3.27
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nvbn/thefuck/archive/3.27.tar.gz -> thefuck-3.27.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c65a56a47a8c69900390d7554c64d209
diff --git a/metadata/md5-cache/app-shells/thefuck-3.28 b/metadata/md5-cache/app-shells/thefuck-3.28
index 305cea665ce7..6f944b09721b 100644
--- a/metadata/md5-cache/app-shells/thefuck-3.28
+++ b/metadata/md5-cache/app-shells/thefuck-3.28
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nvbn/thefuck/archive/3.28.tar.gz -> thefuck-3.28.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4f691d50e1c20ab1f260c346ed8948c3
diff --git a/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.0_beta1 b/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.0_beta1
new file mode 100644
index 000000000000..f94b596ebe33
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-syntax-highlighting-0.7.0_beta1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Fish shell like syntax highlighting for zsh
+EAPI=7
+HOMEPAGE=https://github.com/zsh-users/zsh-syntax-highlighting
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=app-shells/zsh
+SLOT=0
+SRC_URI=https://github.com/zsh-users/zsh-syntax-highlighting/archive/0.7.0-beta1.tar.gz -> zsh-syntax-highlighting-0.7.0_beta1.tar.gz
+_eclasses_=readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190
+_md5_=d5a1a04ea6027a5412c53b058baf27d3
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index dc4915b9db15..97bf55d4d07d 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/ansifilter-2.14 b/metadata/md5-cache/app-text/ansifilter-2.14
deleted file mode 100644
index a1d0b61be897..000000000000
--- a/metadata/md5-cache/app-text/ansifilter-2.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Handles text files containing ANSI terminal escape codes
-EAPI=7
-HOMEPAGE=http://www.andre-simon.de/
-IUSE=qt5
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.14.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ffecc15f71de2714b671ecb0d91af66a
diff --git a/metadata/md5-cache/app-text/ansifilter-2.16 b/metadata/md5-cache/app-text/ansifilter-2.16
new file mode 100644
index 000000000000..893473942ecb
--- /dev/null
+++ b/metadata/md5-cache/app-text/ansifilter-2.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+DESCRIPTION=Handles text files containing ANSI terminal escape codes
+EAPI=7
+HOMEPAGE=http://www.andre-simon.de/
+IUSE=qt5
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.16.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d28149f9b64f6de179020b407cd4813e
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016 b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
deleted file mode 100644
index e5da49836fbc..000000000000
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 prepare setup test
-DEPEND=test? ( app-text/dvipng dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond python_single_target_pypy3? ( >=dev-python/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-DESCRIPTION=A plain text human readable/writable document format
-EAPI=7
-HOMEPAGE=http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/
-IUSE=examples graphviz highlight test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2 python_single_target_pypy3? ( >=dev-python/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_pypy3(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/highlight ) )
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0.tar.gz -> asciidoc-8.6.10_p20181016.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8d00dfa93c5f17bda73d2f4f06c2ed1a
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016-r1 b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016-r1
new file mode 100644
index 000000000000..1cff1aaafb90
--- /dev/null
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.10_p20181016-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 prepare setup test
+DEPEND=test? ( app-text/dvipng dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond python_single_target_pypy3? ( >=dev-python/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
+DESCRIPTION=A plain text human readable/writable document format
+EAPI=7
+HOMEPAGE=http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/
+IUSE=examples graphviz highlight test python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt dev-libs/libxml2 python_single_target_pypy3? ( >=dev-python/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight python_single_target_pypy3? ( dev-python/pygments[python_targets_pypy3(-)] ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] ) app-text/highlight ) )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/asciidoc/asciidoc-py3/archive/618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0.tar.gz -> asciidoc-8.6.10_p20181016.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=59f1d8174030d6cfaa55418f9a28808b
diff --git a/metadata/md5-cache/app-text/calibre-3.48.0-r1 b/metadata/md5-cache/app-text/calibre-3.48.0-r1
deleted file mode 100644
index bb001f7c2e4e..000000000000
--- a/metadata/md5-cache/app-text/calibre-3.48.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/3.48.0/calibre-3.48.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac123ffdbb9d7db90674ab2c59f0baf7
diff --git a/metadata/md5-cache/app-text/calibre-3.48.0-r2 b/metadata/md5-cache/app-text/calibre-3.48.0-r2
new file mode 100644
index 000000000000..40836a107b2f
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-3.48.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python2_7? ( >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)] dev-python/sip[python_targets_python2_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks +python_single_target_python2_7
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/3.48.0/calibre-3.48.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ecf947645d1f86910767e775e374b80
diff --git a/metadata/md5-cache/app-text/calibre-4.10.1-r2 b/metadata/md5-cache/app-text/calibre-4.10.1-r2
new file mode 100644
index 000000000000..8734dcfa4909
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-4.10.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python2_7? ( >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)] dev-python/sip[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/4.10.1/calibre-4.10.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5a7ead746ead93137eacdfa034c5d24
diff --git a/metadata/md5-cache/app-text/calibre-4.9.1 b/metadata/md5-cache/app-text/calibre-4.9.1
deleted file mode 100644
index 79dced66d728..000000000000
--- a/metadata/md5-cache/app-text/calibre-4.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/4.9.1/calibre-4.9.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f17e4e9c9d90a15202ec2c025a53570e
diff --git a/metadata/md5-cache/app-text/calibre-4.9.1-r1 b/metadata/md5-cache/app-text/calibre-4.9.1-r1
deleted file mode 100644
index 8b55b615cf4f..000000000000
--- a/metadata/md5-cache/app-text/calibre-4.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
-DESCRIPTION=Ebook management application
-EAPI=7
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/dnspython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=^^ ( 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=https://download.calibre-ebook.com/4.9.1/calibre-4.9.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe9768c791e2cdaa9968773f04b89679
diff --git a/metadata/md5-cache/app-text/calibre-4.9.1-r2 b/metadata/md5-cache/app-text/calibre-4.9.1-r2
new file mode 100644
index 000000000000..da4b3160678d
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-4.9.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) python_single_target_python2_7? ( >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)] dev-python/sip[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/setuptools-23.1.0[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/setuptools-23.1.0[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=7
+HOMEPAGE=https://calibre-ebook.com/
+IUSE=ios +udisks python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 python_single_target_python2_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python2_7(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)] >=dev-python/chardet-3.0.3[python_targets_python2_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python2_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python2_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python2_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python2_7(-)] >=dev-python/lxml-3.8.0[python_targets_python2_7(-)] >=dev-python/markdown-3.0.1[python_targets_python2_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python2_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python2_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python2_7(-)] >=dev-python/pillow-3.2.0[python_targets_python2_7(-)] >=dev-python/psutil-4.3.0[python_targets_python2_7(-)] >=dev-python/pygments-2.3.1[python_targets_python2_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python2_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python2_7(-)] dev-python/regex[python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_6(-)] >=dev-python/chardet-3.0.3[python_targets_python3_6(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_6(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_6(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_6(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_6(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_6(-)] >=dev-python/lxml-3.8.0[python_targets_python3_6(-)] >=dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_6(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_6(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_6(-)] >=dev-python/pillow-3.2.0[python_targets_python3_6(-)] >=dev-python/psutil-4.3.0[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_6(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/apsw-3.25.2_p1[python_targets_python3_7(-)] dev-python/beautifulsoup:4[python_targets_python3_7(-)] >=dev-python/chardet-3.0.3[python_targets_python3_7(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_7(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_7(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_7(-)] dev-python/dnspython[python_targets_python3_7(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_7(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_7(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_7(-)] >=dev-python/lxml-3.8.0[python_targets_python3_7(-)] >=dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_7(-)] >=dev-python/msgpack-0.5.6[python_targets_python3_7(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_7(-)] >=dev-python/pillow-3.2.0[python_targets_python3_7(-)] >=dev-python/psutil-4.3.0[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)] >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,python_targets_python3_7(-)] >=dev-python/PyQtWebEngine-5.12[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= >=dev-qt/qtwebengine-5.12 dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/4.9.1/calibre-4.9.1.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1baebaa27ce2804774351812fa439277
diff --git a/metadata/md5-cache/app-text/capyt-1.1.1 b/metadata/md5-cache/app-text/capyt-1.1.1
index b33ca6445293..32b4cc9e62fd 100644
--- a/metadata/md5-cache/app-text/capyt-1.1.1
+++ b/metadata/md5-cache/app-text/capyt-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/lbatalha/capyt/archive/1.1-1.tar.gz -> capyt-1.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f0f802a0e4a6201d98212731ce29aed8
diff --git a/metadata/md5-cache/app-text/cherrytree-0.37.0-r1 b/metadata/md5-cache/app-text/cherrytree-0.37.0-r1
index 99f273136edf..e8592f1039c2 100644
--- a/metadata/md5-cache/app-text/cherrytree-0.37.0-r1
+++ b/metadata/md5-cache/app-text/cherrytree-0.37.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=nls? ( sys-devel/gettext ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+BDEPEND=nls? ( sys-devel/gettext ) python_single_target_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? ( dev-python/setuptools[python_targets_python2_7(-)] )
 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[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_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? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)] )
 DESCRIPTION=A hierarchical note taking application
 EAPI=7
 HOMEPAGE=https://www.giuspen.com/cherrytree
-IUSE=nls +python_targets_python2_7 +python_single_target_python2_7
+IUSE=nls +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_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? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95407d949a9fdc6a57fe5fbbfed227c9
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=259090bc6838a656ff34903474788e3b
diff --git a/metadata/md5-cache/app-text/cherrytree-0.38.9 b/metadata/md5-cache/app-text/cherrytree-0.38.9
deleted file mode 100644
index 69d3b4265309..000000000000
--- a/metadata/md5-cache/app-text/cherrytree-0.38.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-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[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A hierarchical note taking application
-EAPI=7
-HOMEPAGE=https://www.giuspen.com/cherrytree
-IUSE=nls +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/giuspen/cherrytree/archive/0.38.9.tar.gz -> cherrytree-0.38.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9598d910dd79b144a1effba830e1afad
diff --git a/metadata/md5-cache/app-text/cherrytree-0.38.9-r1 b/metadata/md5-cache/app-text/cherrytree-0.38.9-r1
new file mode 100644
index 000000000000..cc4824277f30
--- /dev/null
+++ b/metadata/md5-cache/app-text/cherrytree-0.38.9-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext ) python_single_target_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? ( dev-python/setuptools[python_targets_python2_7(-)] )
+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[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] )
+DESCRIPTION=A hierarchical note taking application
+EAPI=7
+HOMEPAGE=https://www.giuspen.com/cherrytree
+IUSE=nls +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_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? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pyenchant[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] dev-python/pygtksourceview:2[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/giuspen/cherrytree/archive/0.38.9.tar.gz -> cherrytree-0.38.9.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2ddf424773d4b05f1b8b574255166e6
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 569e3a1b07b0..5ad3ec233028 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=caf7ff251aa57e97dc2a197513b8c0e0
diff --git a/metadata/md5-cache/app-text/dblatex-0.3.7 b/metadata/md5-cache/app-text/dblatex-0.3.7
index 7a86d339a67e..d35f5330984b 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c87ccdf82f2c4a9a0efa18f10b769639
diff --git a/metadata/md5-cache/app-text/dictd-1.12.1-r2 b/metadata/md5-cache/app-text/dictd-1.12.1-r2
index 6becf71a7593..e6cd96a44f2f 100644
--- a/metadata/md5-cache/app-text/dictd-1.12.1-r2
+++ b/metadata/md5-cache/app-text/dictd-1.12.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 ISOC-rfc
 RDEPEND=sys-libs/zlib dev-libs/libmaa dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy ) >=sys-apps/coreutils-6.10
 SLOT=0
 SRC_URI=mirror://sourceforge/dict/dictd-1.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1bc9984579c41bfcc9c9d65dd4b16833
diff --git a/metadata/md5-cache/app-text/diff-pdf-0.3 b/metadata/md5-cache/app-text/diff-pdf-0.3
index 70f67b7372e4..5019c502279e 100644
--- a/metadata/md5-cache/app-text/diff-pdf-0.3
+++ b/metadata/md5-cache/app-text/diff-pdf-0.3
@@ -9,4 +9,4 @@ RDEPEND=app-text/poppler[cairo] dev-libs/glib x11-libs/cairo x11-libs/wxGTK:3.0[
 SLOT=0
 SRC_URI=https://github.com/vslavik/diff-pdf/releases/download/v0.3/diff-pdf-0.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=098281bf25edb7ff8547a4316639a36f
+_md5_=beb3f514986bab7f3a07dfd4d790de87
diff --git a/metadata/md5-cache/app-text/discount-2.2.6 b/metadata/md5-cache/app-text/discount-2.2.6
index ea0126bc9047..2f605f71c1ce 100644
--- a/metadata/md5-cache/app-text/discount-2.2.6
+++ b/metadata/md5-cache/app-text/discount-2.2.6
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install postinst prepare
+DEFINED_PHASES=compile 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/
@@ -9,4 +9,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.6.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=58a66b864a8b326e6de2deaa393d52aa
+_md5_=b5997404848d3015b7d867b0db7e3aba
diff --git a/metadata/md5-cache/app-text/djvusmooth-0.2.18 b/metadata/md5-cache/app-text/djvusmooth-0.2.18
index 0769bfbe9a52..bc095bb37e0e 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a4aee1dcf8c2a6c4631046ecd6c5f10
diff --git a/metadata/md5-cache/app-text/doconce-1.4.4 b/metadata/md5-cache/app-text/doconce-1.4.4
index e7a9680f3502..b3e2ca2c8816 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_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/doconce-1.4.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=224ac26329c8e2f01ca521ff2483ef30
diff --git a/metadata/md5-cache/app-text/duali-0.2.0-r1 b/metadata/md5-cache/app-text/duali-0.2.0-r1
index d10a02b3598f..195b95bf42e1 100644
--- a/metadata/md5-cache/app-text/duali-0.2.0-r1
+++ b/metadata/md5-cache/app-text/duali-0.2.0-r1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] >=
 DESCRIPTION=Arabic dictionary based on the DICT protocol
 EAPI=6
 HOMEPAGE=https://www.arabeyes.org/Duali
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86
 LICENSE=BSD
 PDEPEND=>=app-dicts/duali-data-0.1b-r1
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/arabeyes/duali-0.2.0.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0836bc908ca49e496e41e7d853569fc6
diff --git a/metadata/md5-cache/app-text/dvipsk-5.999_p20190410 b/metadata/md5-cache/app-text/dvipsk-5.999_p20190410
index a5415a35cd75..5f4f28903460 100644
--- a/metadata/md5-cache/app-text/dvipsk-5.999_p20190410
+++ b/metadata/md5-cache/app-text/dvipsk-5.999_p20190410
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/texlive-module-dvips-2019.tar.xz doc? ( mirror://gentoo/texlive-module-dvips.doc-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=624995b8867c9699211686c14fee4956
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1 b/metadata/md5-cache/app-text/enchant-1.6.1
deleted file mode 100644
index 412562a6ad70..000000000000
--- a/metadata/md5-cache/app-text/enchant-1.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) virtual/pkgconfig
-DESCRIPTION=Spellchecker wrapping library
-EAPI=6
-HOMEPAGE=https://abiword.github.io/enchant/
-IUSE=aspell +hunspell static-libs test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
-REQUIRED_USE=|| ( hunspell aspell )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ea7788d11e236560195f248f3438601e
diff --git a/metadata/md5-cache/app-text/epspdf-0.6.0-r1 b/metadata/md5-cache/app-text/epspdf-0.6.0-r1
index f8c51b3e0bdc..83fac36a87b2 100644
--- a/metadata/md5-cache/app-text/epspdf-0.6.0-r1
+++ b/metadata/md5-cache/app-text/epspdf-0.6.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=3755a861e910909d2bcd02d1d3935e48
diff --git a/metadata/md5-cache/app-text/epspdf-0.6.3-r1 b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
index b658191b1319..d19c5facd8db 100644
--- a/metadata/md5-cache/app-text/epspdf-0.6.3-r1
+++ b/metadata/md5-cache/app-text/epspdf-0.6.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
 SLOT=0
 SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.3.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=78034c272a0571d598be48c630898532
diff --git a/metadata/md5-cache/app-text/fbless-0.2.3 b/metadata/md5-cache/app-text/fbless-0.2.3
index f05b0c9b0317..47a01797f9e7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4bf01ff1a2e6856aa804f1c3993acd1
diff --git a/metadata/md5-cache/app-text/grip-4.2.0 b/metadata/md5-cache/app-text/grip-4.2.0
index 0386ba497249..ba4de6019879 100644
--- a/metadata/md5-cache/app-text/grip-4.2.0
+++ b/metadata/md5-cache/app-text/grip-4.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Preview GitHub Markdown files like Readme locally before committing them
 EAPI=6
 HOMEPAGE=https://github.com/joeyespo/grip
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/flask-0.10.1 >=dev-python/markdown-2.5.1 >=dev-python/path-and-address-1.0.0 >=dev-python/pygments-1.6 >=dev-python/requests-2.4.1 python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/flask-0.10.1 >=dev-python/markdown-2.5.1 >=dev-python/path-and-address-1.0.0 >=dev-python/pygments-1.6 >=dev-python/requests-2.4.1 python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grip/grip-4.2.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=603999d92a4bc23a131edea57105ecc1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a1af4c9a7fc9f8e86f66f1b61747900
diff --git a/metadata/md5-cache/app-text/grip-4.5.2 b/metadata/md5-cache/app-text/grip-4.5.2
index 14f150c435ac..4aaec38c8f9d 100644
--- a/metadata/md5-cache/app-text/grip-4.5.2
+++ b/metadata/md5-cache/app-text/grip-4.5.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/docopt-0.4.0 >=dev-python/flask-0.10.1 >=dev-python/markdow
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grip/grip-4.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=25c6ede8fc3b5627925229b6dc1cdb5b
diff --git a/metadata/md5-cache/app-text/groonga-5.0.3 b/metadata/md5-cache/app-text/groonga-5.0.3
index 4748af92aea4..d3e37300c10d 100644
--- a/metadata/md5-cache/app-text/groonga-5.0.3
+++ b/metadata/md5-cache/app-text/groonga-5.0.3
@@ -10,5 +10,5 @@ RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) lib
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3e4cf14cb4ab8c51c2b504a93b20ec5
diff --git a/metadata/md5-cache/app-text/groonga-5.0.9 b/metadata/md5-cache/app-text/groonga-5.0.9
index 1208bb564819..b94e7b9700e8 100644
--- a/metadata/md5-cache/app-text/groonga-5.0.9
+++ b/metadata/md5-cache/app-text/groonga-5.0.9
@@ -10,5 +10,5 @@ RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) lib
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d3e4cf14cb4ab8c51c2b504a93b20ec5
diff --git a/metadata/md5-cache/app-text/groonga-6.1.2 b/metadata/md5-cache/app-text/groonga-6.1.2
index a00c4374423b..2a03323604ce 100644
--- a/metadata/md5-cache/app-text/groonga-6.1.2
+++ b/metadata/md5-cache/app-text/groonga-6.1.2
@@ -10,5 +10,5 @@ RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) lib
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=http://packages.groonga.org/source/groonga/groonga-6.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d4755e6e251e4a64f63aa1b9b860f1f3
diff --git a/metadata/md5-cache/app-text/groonga-8.0.2 b/metadata/md5-cache/app-text/groonga-8.0.2
index 763b7c9a05a0..62f3d04330b9 100644
--- a/metadata/md5-cache/app-text/groonga-8.0.2
+++ b/metadata/md5-cache/app-text/groonga-8.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/onigmo-6.1.1:0= benchmark? ( >=dev-libs/glib-2.8 ) jemalloc?
 REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
 SLOT=0
 SRC_URI=https://packages.groonga.org/source/groonga/groonga-8.0.2.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6fe3c64c8178576f7a55eb526128a9f0
diff --git a/metadata/md5-cache/app-text/gtkspell-2.0.16 b/metadata/md5-cache/app-text/gtkspell-2.0.16
index 33e12894b388..109350c8f255 100644
--- a/metadata/md5-cache/app-text/gtkspell-2.0.16
+++ b/metadata/md5-cache/app-text/gtkspell-2.0.16
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0 dev-util/gtk-doc-am >=dev-util
 DESCRIPTION=Spell checking widget for GTK
 EAPI=4
 HOMEPAGE=http://gtkspell.sourceforge.net/
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0
 SLOT=2
 SRC_URI=http://gtkspell.sourceforge.net/download/gtkspell-2.0.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=959d21792fa68c7e2ae9dcf7af361344
+_md5_=1ef86a707f99b59f63bdc8e79e0ea4a9
diff --git a/metadata/md5-cache/app-text/gtkspell-2.0.16-r1 b/metadata/md5-cache/app-text/gtkspell-2.0.16-r1
new file mode 100644
index 000000000000..db20e49aff67
--- /dev/null
+++ b/metadata/md5-cache/app-text/gtkspell-2.0.16-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0 dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig
+DESCRIPTION=Spell checking widget for GTK
+EAPI=7
+HOMEPAGE=http://gtkspell.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6:0
+SLOT=2
+SRC_URI=http://gtkspell.sourceforge.net/download/gtkspell-2.0.16.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5
+_md5_=397114838200073a70e55bca8102629f
diff --git a/metadata/md5-cache/app-text/gtkspell-3.0.9 b/metadata/md5-cache/app-text/gtkspell-3.0.9
index 0dd7a44d79f4..0993b8ec7067 100644
--- a/metadata/md5-cache/app-text/gtkspell-3.0.9
+++ b/metadata/md5-cache/app-text/gtkspell-3.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=Spell checking widget for GTK
 EAPI=6
 HOMEPAGE=http://gtkspell.sourceforge.net/
 IUSE=+introspection vala
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=app-text/enchant-1.1.6:0 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b90de29ff988a9b133d7b707b0f4fa3
+_md5_=a1966e42a9f9b2f7a0d86b1b1c4e60fb
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 19f2bc128c66..9c66f7db90c5 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_6 )
 SLOT=0
 SRC_URI=https://github.com/mankyd/htmlmin/archive/7bcbb995778fc07e427872dc74af9646fd0c907d.tar.gz -> htmlmin-0.1.11_pre20170909.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b8947d792ae5586fba935478d30f580
diff --git a/metadata/md5-cache/app-text/htmlmin-0.1.12 b/metadata/md5-cache/app-text/htmlmin-0.1.12
index e6681ece9dc5..c8031f643158 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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/h/htmlmin/htmlmin-0.1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ea2c1c4f6ed8a835182fdbfd9d738fd
diff --git a/metadata/md5-cache/app-text/jadetex-3.13-r8 b/metadata/md5-cache/app-text/jadetex-3.13-r8
index c9c3412c2c6a..c40f669168f4 100644
--- a/metadata/md5-cache/app-text/jadetex-3.13-r8
+++ b/metadata/md5-cache/app-text/jadetex-3.13-r8
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=app-text/openjade-1.3.1 dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric
+DEPEND=>=app-text/openjade-1.3.1 dev-texlive/texlive-fontsrecommended dev-texlive/texlive-plaingeneric virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=TeX macros used by Jade TeX output
 EAPI=7
 HOMEPAGE=http://jadetex.sourceforge.net/
@@ -10,5 +9,5 @@ RDEPEND=virtual/latex-base
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jadetex/jadetex-3.13.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=ee1b78f6edf2f724c9787d0b01e5221e
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 c88d7b27ae96..67ee2b704f74 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=874902d0957236962e0ef10b0b546e4e
diff --git a/metadata/md5-cache/app-text/krop-0.5.1 b/metadata/md5-cache/app-text/krop-0.5.1
index 791aef59e170..90c4d1503992 100644
--- a/metadata/md5-cache/app-text/krop-0.5.1
+++ b/metadata/md5-cache/app-text/krop-0.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A tool to crop PDF files
 EAPI=6
 HOMEPAGE=http://arminstraub.com/software/krop
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-python/python-poppler-qt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PyQt5[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
 SRC_URI=http://arminstraub.com/downloads/krop/krop-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8616b96a4575be091d54c1c0eba040d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec2531fc5394c8c61304c3ca4b4e7ca7
diff --git a/metadata/md5-cache/app-text/krop-9999 b/metadata/md5-cache/app-text/krop-9999
index 4afb6ccc4f8e..ca009590ac63 100644
--- a/metadata/md5-cache/app-text/krop-9999
+++ b/metadata/md5-cache/app-text/krop-9999
@@ -1,13 +1,13 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DESCRIPTION=A tool to crop PDF files
 EAPI=7
 HOMEPAGE=http://arminstraub.com/software/krop
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-python/python-poppler-qt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/python-poppler-qt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PyQt5[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a14e013c72816ff3ecd2798b538c933e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd0d28955ab0e12f7ad4752c47b5e825
diff --git a/metadata/md5-cache/app-text/landslide-1.1.3 b/metadata/md5-cache/app-text/landslide-1.1.3
index 1e0d03347b0f..19ccbc3b9b11 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=952981f9a454e8e7b46744c0786f7404
diff --git a/metadata/md5-cache/app-text/libebook-0.1.3 b/metadata/md5-cache/app-text/libebook-0.1.3
index 61cf571621f1..145cc02c4205 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.3
+++ b/metadata/md5-cache/app-text/libebook-0.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Library parsing various ebook formats
 EAPI=6
 HOMEPAGE=https://www.sourceforge.net/projects/libebook/
 IUSE=doc test tools
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.3.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe459c6a46c96df2692af988da2b53a0
+_md5_=3ad50f0cad16232947022c730363821b
diff --git a/metadata/md5-cache/app-text/liblangtag-0.6.3 b/metadata/md5-cache/app-text/liblangtag-0.6.3
index a4fecfe8ea60..5ddeac161a98 100644
--- a/metadata/md5-cache/app-text/liblangtag-0.6.3
+++ b/metadata/md5-cache/app-text/liblangtag-0.6.3
@@ -5,11 +5,11 @@ DESCRIPTION=An interface library to access tags for identifying languages
 EAPI=7
 HOMEPAGE=https://bitbucket.org/tagoh/liblangtag/wiki/Home
 IUSE=debug doc introspection static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=|| ( LGPL-3 MPL-2.0 )
 RDEPEND=dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.3.tar.bz2
 _eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d543e6c9825ec9fcbe6b6350da454af4
+_md5_=3d9ef9d5db85261fc2e3dd11949f6cd9
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24_p5 b/metadata/md5-cache/app-text/libpaper-1.1.24_p5
index b964f8293542..fae8296b5cd0 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.24_p5
+++ b/metadata/md5-cache/app-text/libpaper-1.1.24_p5
@@ -4,9 +4,9 @@ DESCRIPTION=Library for handling paper characteristics
 EAPI=6
 HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24+nmu5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=47cb95e22ea1901f3823f9dd4d39c08f
+_md5_=4bed0c72649fc81c373d49e0cafd9cbb
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.2 b/metadata/md5-cache/app-text/libqxp-0.0.2
index 95b7e4225552..7ece034ca49a 100644
--- a/metadata/md5-cache/app-text/libqxp-0.0.2
+++ b/metadata/md5-cache/app-text/libqxp-0.0.2
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/librevenge dev-libs/icu:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.2.tar.xz
-_md5_=9cc87d415717655805b1e64b10616d93
+_md5_=a66b157541943826591fec3c411d2e1f
diff --git a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1 b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
index d6687c9dbff5..dd7b584746c6 100644
--- a/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
+++ b/metadata/md5-cache/app-text/linuxdoc-tools-0.9.73-r1
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare
-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 )
+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 ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
 EAPI=7
 HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
@@ -10,5 +10,5 @@ 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 >=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/-/archive/0.9.73/linuxdoc-tools-0.9.73.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	latex-package	663b0e5f0410bc8e8d51f11346f0258a	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=66c0c6261850b64fa14be1a728a2ad31
diff --git a/metadata/md5-cache/app-text/manpager-1 b/metadata/md5-cache/app-text/manpager-1
index 53b62b206c5a..f07085966fce 100644
--- a/metadata/md5-cache/app-text/manpager-1
+++ b/metadata/md5-cache/app-text/manpager-1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Enable colorization of man pages
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0a8761bd4d6d531fb7a15c60c205368f
+_md5_=19cc7f0e3a9bfda7343453a7db261832
diff --git a/metadata/md5-cache/app-text/mftrace-1.2.18-r3 b/metadata/md5-cache/app-text/mftrace-1.2.18-r3
index 03cee89c1755..bb0899434f8c 100644
--- a/metadata/md5-cache/app-text/mftrace-1.2.18-r3
+++ b/metadata/md5-cache/app-text/mftrace-1.2.18-r3
@@ -3,13 +3,13 @@ DEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge
 DESCRIPTION=Traces TeX fonts to PFA or PFB fonts (formerly pktrace)
 EAPI=6
 HOMEPAGE=http://lilypond.org/mftrace/
-IUSE=test truetype +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test truetype +python_single_target_python2_7
 KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://lilypond.org/downloads/sources/mftrace/mftrace-1.2.18.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5b6510860004761a6d2f499cb231e568
diff --git a/metadata/md5-cache/app-text/mftrace-1.2.19-r1 b/metadata/md5-cache/app-text/mftrace-1.2.19-r1
index 128af6078c20..41e09a4d8ac2 100644
--- a/metadata/md5-cache/app-text/mftrace-1.2.19-r1
+++ b/metadata/md5-cache/app-text/mftrace-1.2.19-r1
@@ -3,13 +3,13 @@ DEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge
 DESCRIPTION=Traces TeX fonts to PFA or PFB fonts (formerly pktrace)
 EAPI=6
 HOMEPAGE=http://lilypond.org/mftrace/
-IUSE=test truetype +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test truetype +python_single_target_python2_7
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://lilypond.org/downloads/sources/mftrace/mftrace-1.2.19.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bd34780899e702e9fa25391f8420769b
diff --git a/metadata/md5-cache/app-text/nfoview-1.26 b/metadata/md5-cache/app-text/nfoview-1.26
index 3f0381d028a5..d08c6bb9a185 100644
--- a/metadata/md5-cache/app-text/nfoview-1.26
+++ b/metadata/md5-cache/app-text/nfoview-1.26
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.26.tar.gz -> nfoview-1.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b1571c60e4794e30ab2e0b19b189fc3
diff --git a/metadata/md5-cache/app-text/nfoview-1.27 b/metadata/md5-cache/app-text/nfoview-1.27
index c32541032271..363e2fd16117 100644
--- a/metadata/md5-cache/app-text/nfoview-1.27
+++ b/metadata/md5-cache/app-text/nfoview-1.27
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/nfoview/archive/1.27.tar.gz -> nfoview-1.27.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94987a404ded5b5afe0f58fae1d5fd08
diff --git a/metadata/md5-cache/app-text/nfoview-9999 b/metadata/md5-cache/app-text/nfoview-9999
index 00f22bb66714..3146eafe2384 100644
--- a/metadata/md5-cache/app-text/nfoview-9999
+++ b/metadata/md5-cache/app-text/nfoview-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/terminus-font 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b1571c60e4794e30ab2e0b19b189fc3
diff --git a/metadata/md5-cache/app-text/nuspell-3.0.0 b/metadata/md5-cache/app-text/nuspell-3.0.0
new file mode 100644
index 000000000000..c3cdfb495d87
--- /dev/null
+++ b/metadata/md5-cache/app-text/nuspell-3.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-libs/icu doc? ( app-text/ronn ) test? ( >=dev-cpp/catch-2.3.0:0 ) >=dev-libs/boost-1.62[icu]
+DESCRIPTION=Spell checker library and CLI for complex natural languages
+EAPI=7
+HOMEPAGE=https://nuspell.github.io/ https://github.com/nuspell/nuspell
+IUSE=doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=test? ( || ( MPL-1.1 GPL-2+ LGPL-2.1+ ) ) LGPL-3+
+RDEPEND=dev-libs/icu
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://github.com/nuspell/nuspell/archive/v3.0.0.tar.gz -> nuspell-3.0.0.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e86f426b2f18fd873e63d33ee910366e
diff --git a/metadata/md5-cache/app-text/openlp-2.4.6 b/metadata/md5-cache/app-text/openlp-2.4.6
index 6b80cd85a47e..525912e41dc1 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_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://get.openlp.org/2.4.6/OpenLP-2.4.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da1e5274b4b89c6129445b1cd51e83c4
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 0d1a75499d85..037ff42ee3eb 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_6(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e219542aaf64a9a9cc858a3abb79daa3
diff --git a/metadata/md5-cache/app-text/paperwork-1.3.0 b/metadata/md5-cache/app-text/paperwork-1.3.0
index f30c05b0f8d5..551770aa8b68 100644
--- a/metadata/md5-cache/app-text/paperwork-1.3.0
+++ b/metadata/md5-cache/app-text/paperwork-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=~app-text/paperwork-backend-1.3.0[python_targets_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c4ed7d91b02bd559204518b3e71fe5e
diff --git a/metadata/md5-cache/app-text/paperwork-1.3.1 b/metadata/md5-cache/app-text/paperwork-1.3.1
index 3f1af29c8459..2510314af426 100644
--- a/metadata/md5-cache/app-text/paperwork-1.3.1
+++ b/metadata/md5-cache/app-text/paperwork-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=~app-text/paperwork-backend-1.3.1[python_targets_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork/paperwork-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=048c9c2a9bc5e7743df57d8619b708b2
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 5a2dd860a7f3..22e639ef33ff 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=160792403dce97aaaf95a611ab6e9b34
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.3.0 b/metadata/md5-cache/app-text/paperwork-backend-1.3.0
index 7d347c192f60..51eeed1c471f 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-1.3.0
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f475e6e74d330d6ee51b42ced6ea001
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.3.1 b/metadata/md5-cache/app-text/paperwork-backend-1.3.1
index 0e6b52c9700f..fb5b04fd7478 100644
--- a/metadata/md5-cache/app-text/paperwork-backend-1.3.1
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[introspection] dev-python/distro[python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b65aebb3015b50642793489e0918cdf5
diff --git a/metadata/md5-cache/app-text/passivetex-1.25-r1 b/metadata/md5-cache/app-text/passivetex-1.25-r1
index 9a3de3ae3ee7..82cef193e756 100644
--- a/metadata/md5-cache/app-text/passivetex-1.25-r1
+++ b/metadata/md5-cache/app-text/passivetex-1.25-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base >=dev-tex/xmltex-1.9 app-arch/unzip
+DEPEND=virtual/latex-base >=dev-tex/xmltex-1.9 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A namespace-aware XML parser written in Tex
 EAPI=7
 HOMEPAGE=http://www.tei-c.org.uk/Software/passivetex/
@@ -9,5 +8,5 @@ LICENSE=MIT
 RDEPEND=virtual/latex-base >=dev-tex/xmltex-1.9 virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/passivetex-1.25.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=f5559b7ce8e74281572671b89a90deb5
diff --git a/metadata/md5-cache/app-text/pastebinit-1.5 b/metadata/md5-cache/app-text/pastebinit-1.5
deleted file mode 100644
index 260fad691a92..000000000000
--- a/metadata/md5-cache/app-text/pastebinit-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-text/docbook-xsl-stylesheets
-DESCRIPTION=A software that lets you send anything you want directly to a pastebin
-EAPI=5
-HOMEPAGE=https://launchpad.net/pastebinit
-IUSE=crypt python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 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[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] crypt? ( app-crypt/gnupg )
-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=https://launchpad.net/pastebinit/trunk/1.5/+download/pastebinit-1.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24e4713911097ed9fcb3b3bef1a2f6c0
diff --git a/metadata/md5-cache/app-text/pastebinit-1.5-r1 b/metadata/md5-cache/app-text/pastebinit-1.5-r1
new file mode 100644
index 000000000000..8a6fa55702e8
--- /dev/null
+++ b/metadata/md5-cache/app-text/pastebinit-1.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare setup
+DEPEND=app-text/docbook-xsl-stylesheets
+DESCRIPTION=A software that lets you send anything you want directly to a pastebin
+EAPI=5
+HOMEPAGE=https://launchpad.net/pastebinit
+IUSE=crypt +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/configobj[python_targets_python3_6(-)] ) crypt? ( app-crypt/gnupg )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://launchpad.net/pastebinit/trunk/1.5/+download/pastebinit-1.5.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6c0d645d53ff670f7e89427db726df5d
diff --git a/metadata/md5-cache/app-text/pdfarranger-1.3.1 b/metadata/md5-cache/app-text/pdfarranger-1.3.1
index 7751bd765ab7..d3d510cdbaf2 100644
--- a/metadata/md5-cache/app-text/pdfarranger-1.3.1
+++ b/metadata/md5-cache/app-text/pdfarranger-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pikepdf[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jeromerobert/pdfarranger/archive/1.3.1.tar.gz -> pdfarranger-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1811afbfcdd03e3f9e02ce5098f439a5
diff --git a/metadata/md5-cache/app-text/pdfminer-20140328 b/metadata/md5-cache/app-text/pdfminer-20140328
index b59079bb8926..afccf82c86b6 100644
--- a/metadata/md5-cache/app-text/pdfminer-20140328
+++ b/metadata/md5-cache/app-text/pdfminer-20140328
@@ -10,5 +10,5 @@ RDEPEND=python_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-20140328.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d1b81cb66233f986b4e0144a429f17a
diff --git a/metadata/md5-cache/app-text/pdfminer-20140328-r1 b/metadata/md5-cache/app-text/pdfminer-20140328-r1
index cbdc95773a21..80acfbb222cd 100644
--- a/metadata/md5-cache/app-text/pdfminer-20140328-r1
+++ b/metadata/md5-cache/app-text/pdfminer-20140328-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=facb61716e61afd9694fa94f0ee2e28e
diff --git a/metadata/md5-cache/app-text/pdfminer-20191020 b/metadata/md5-cache/app-text/pdfminer-20191020
index a11c4dfb045b..7a6a810725ca 100644
--- a/metadata/md5-cache/app-text/pdfminer-20191020
+++ b/metadata/md5-cache/app-text/pdfminer-20191020
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20191020.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ac1891fa85c221f564eaa581bfa9b2d2
diff --git a/metadata/md5-cache/app-text/pelican-3.7.1 b/metadata/md5-cache/app-text/pelican-3.7.1
index a4890760c052..509caee931fa 100644
--- a/metadata/md5-cache/app-text/pelican-3.7.1
+++ b/metadata/md5-cache/app-text/pelican-3.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/3.7.1.tar.gz -> pelican-3.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f0a847a0347088b1790d656b8fb7ad2
diff --git a/metadata/md5-cache/app-text/pelican-4.0.0 b/metadata/md5-cache/app-text/pelican-4.0.0
index dbe25d8ca981..007cd828294b 100644
--- a/metadata/md5-cache/app-text/pelican-4.0.0
+++ b/metadata/md5-cache/app-text/pelican-4.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.0.0.tar.gz -> pelican-4.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f32d6c03e52b2b60e1e18db63adbedc
diff --git a/metadata/md5-cache/app-text/pelican-4.0.1 b/metadata/md5-cache/app-text/pelican-4.0.1
index 3fd4c1e74f83..d95b41585a67 100644
--- a/metadata/md5-cache/app-text/pelican-4.0.1
+++ b/metadata/md5-cache/app-text/pelican-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.0.1.tar.gz -> pelican-4.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c3909cb3c87de95a773ec89f259f7aba
diff --git a/metadata/md5-cache/app-text/pelican-4.1.2 b/metadata/md5-cache/app-text/pelican-4.1.2
index f55042186912..b42291954b4f 100644
--- a/metadata/md5-cache/app-text/pelican-4.1.2
+++ b/metadata/md5-cache/app-text/pelican-4.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.1.2.tar.gz -> pelican-4.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c3909cb3c87de95a773ec89f259f7aba
diff --git a/metadata/md5-cache/app-text/pelican-4.2.0 b/metadata/md5-cache/app-text/pelican-4.2.0
index 8dc47dd38161..0f79b2062596 100644
--- a/metadata/md5-cache/app-text/pelican-4.2.0
+++ b/metadata/md5-cache/app-text/pelican-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.2.0.tar.gz -> pelican-4.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1856b971700a3b57942f40ea1f563c0f
diff --git a/metadata/md5-cache/app-text/pelican-9999 b/metadata/md5-cache/app-text/pelican-9999
index 9471d39d2a32..c68c0a4ea338 100644
--- a/metadata/md5-cache/app-text/pelican-9999
+++ b/metadata/md5-cache/app-text/pelican-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e49811ec4997d178e5db0dab7849d038
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 3a5a2018c457..2f0c15f1a460 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad0cc85134f542c95594c827f66201e7
diff --git a/metadata/md5-cache/app-text/pylize-1.3b-r1 b/metadata/md5-cache/app-text/pylize-1.3b-r1
deleted file mode 100644
index 359efd449e6c..000000000000
--- a/metadata/md5-cache/app-text/pylize-1.3b-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/empy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Python HTML Slideshow Generator using HTML and CSS
-EAPI=5
-HOMEPAGE=http://www.chrisarndt.de/en/software/pylize/
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-python/empy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08e39eb9df9fb921d2aaf6d0a642e051
diff --git a/metadata/md5-cache/app-text/pylize-1.3b-r2 b/metadata/md5-cache/app-text/pylize-1.3b-r2
new file mode 100644
index 000000000000..fed07518ce2d
--- /dev/null
+++ b/metadata/md5-cache/app-text/pylize-1.3b-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-python/empy[python_targets_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)] ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=Python HTML Slideshow Generator using HTML and CSS
+EAPI=5
+HOMEPAGE=http://www.chrisarndt.de/en/software/pylize/
+IUSE=doc +python_single_target_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( dev-python/empy[python_targets_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://www.chrisarndt.de/en/software/pylize/download/pylize-1.3b.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72195cd1a161641ab5ebd6f0228bd441
diff --git a/metadata/md5-cache/app-text/pytextile-2.3.3 b/metadata/md5-cache/app-text/pytextile-2.3.3
index 69940b0501d0..56a80241f762 100644
--- a/metadata/md5-cache/app-text/pytextile-2.3.3
+++ b/metadata/md5-cache/app-text/pytextile-2.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4642a8c6fd062b264844c9c30645fbe4
diff --git a/metadata/md5-cache/app-text/pytextile-3.0.3 b/metadata/md5-cache/app-text/pytextile-3.0.3
index 052a3de0b6f7..c3458ed8d98f 100644
--- a/metadata/md5-cache/app-text/pytextile-3.0.3
+++ b/metadata/md5-cache/app-text/pytextile-3.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/textile/python-textile/archive/3.0.3.tar.gz -> pytextile-3.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2952f7fdd59bb6c7eb5a30f450b9f3d8
diff --git a/metadata/md5-cache/app-text/qpdf-9.1.1-r1 b/metadata/md5-cache/app-text/qpdf-9.1.1-r1
new file mode 100644
index 000000000000..538b3bafc105
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-9.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
+DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
+EAPI=7
+HOMEPAGE=http://qpdf.sourceforge.net/
+IUSE=doc examples static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+LICENSE=|| ( Apache-2.0 Artistic-2 )
+RDEPEND=net-libs/gnutls:0= sys-libs/zlib virtual/jpeg:0=
+RESTRICT=!test? ( test )
+SLOT=0/26
+SRC_URI=mirror://sourceforge/qpdf/qpdf-9.1.1.tar.gz
+_md5_=0ec00cdfbcdb233f9a1b5616e0364127
diff --git a/metadata/md5-cache/app-text/queequeg-0.91-r2 b/metadata/md5-cache/app-text/queequeg-0.91-r2
index fa54958e2075..8955fab918f9 100644
--- a/metadata/md5-cache/app-text/queequeg-0.91-r2
+++ b/metadata/md5-cache/app-text/queequeg-0.91-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A checker for English grammar, for people who are not native English
 EAPI=6
 HOMEPAGE=http://queequeg.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-dicts/wordnet
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/queequeg/queequeg-0.91.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8296002c637e83456b70f887e5f67aa9
diff --git a/metadata/md5-cache/app-text/referencer-1.2.2-r1 b/metadata/md5-cache/app-text/referencer-1.2.2-r1
index 6dff6731f98a..514d57a6f6c9 100644
--- a/metadata/md5-cache/app-text/referencer-1.2.2-r1
+++ b/metadata/md5-cache/app-text/referencer-1.2.2-r1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Application to organise documents or references, and to generate BibTeX files
 EAPI=6
 HOMEPAGE=https://launchpad.net/referencer
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/poppler-0.12.3-r3[cairo] >=dev-cpp/gtkmm-2.8:2.4 >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc9178371a6aa93f6a9139626409dee0
diff --git a/metadata/md5-cache/app-text/restview-2.9.2 b/metadata/md5-cache/app-text/restview-2.9.2
index a44f96c19caa..dc25a2017dfd 100644
--- a/metadata/md5-cache/app-text/restview-2.9.2
+++ b/metadata/md5-cache/app-text/restview-2.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restview/restview-2.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91a81e29b0319ff8880c56720bd60b83
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 f4a939ba0d5b..7a4daee8dbfb 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38ea701415ced81ad9b831f8827873a3
diff --git a/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15 b/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15
index f97fe143bb8c..7155daa960df 100644
--- a/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15
+++ b/metadata/md5-cache/app-text/sgmltools-lite-3.0.3-r15
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Python interface to SGML software in a DocBook/OpenJade env
 EAPI=7
 HOMEPAGE=http://sgmltools-lite.sourceforge.net/
-IUSE=jadetex +python_targets_python2_7 +python_single_target_python2_7
+IUSE=jadetex +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/sgml-common app-text/docbook-sgml-dtd:3.1 app-text/docbook-dsssl-stylesheets app-text/openjade jadetex? ( app-text/jadetex ) || ( www-client/w3m www-client/lynx ) >=app-text/sgml-common-0.6.3-r7
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/sgmltools-lite/sgmltools-lite/3.0.3/sgmltools-lite-3.0.3.tar.gz https://downloads.sourceforge.net/project/sgmltools-lite/support%20files/0.0.1-1/nw-eps-icons-0.0.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	sgml-catalog-r1	e6ff98989cdecb4311b67afb96edb6f8	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c70f56ddcfbfe202529a4b573c7e2d98
diff --git a/metadata/md5-cache/app-text/sigil-0.9.16 b/metadata/md5-cache/app-text/sigil-0.9.16
deleted file mode 100644
index 6f365a2c8b30..000000000000
--- a/metadata/md5-cache/app-text/sigil-0.9.16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
-DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
-EAPI=7
-HOMEPAGE=https://sigil-ebook.com/
-IUSE=+plugins system-mathjax python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
-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/Sigil-Ebook/Sigil/archive/0.9.16.tar.gz -> sigil-0.9.16.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3320fed1d3f6e11d272b94e05e81d2ad
diff --git a/metadata/md5-cache/app-text/sigil-0.9.16-r1 b/metadata/md5-cache/app-text/sigil-0.9.16-r1
new file mode 100644
index 000000000000..b8cc6022c76e
--- /dev/null
+++ b/metadata/md5-cache/app-text/sigil-0.9.16-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
+EAPI=7
+HOMEPAGE=https://sigil-ebook.com/
+IUSE=+plugins system-mathjax python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ Apache-2.0
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 >=dev-qt/qtxmlpatterns-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/0.9.16.tar.gz -> sigil-0.9.16.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fdb3cda75af5dc52fb3bc6b555069ed
diff --git a/metadata/md5-cache/app-text/sigil-0.9.18 b/metadata/md5-cache/app-text/sigil-0.9.18
index 2f18c28c9c6b..f78b3341a9da 100644
--- a/metadata/md5-cache/app-text/sigil-0.9.18
+++ b/metadata/md5-cache/app-text/sigil-0.9.18
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=7
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
-IUSE=+plugins system-mathjax python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+plugins system-mathjax python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] dev-python/css-parser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssselect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/cssutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/regex[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) system-mathjax? ( dev-libs/mathjax )
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/boost:=[threads] dev-libs/libpcre:3=[pcre16] dev-libs/xerces-c[icu] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/0.9.18.tar.gz -> sigil-0.9.18.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa40a0abb554a1045960899e52385923
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fd2e708ee2d1b3b36293b812cb14ce24
diff --git a/metadata/md5-cache/app-text/sigil-1.0.0 b/metadata/md5-cache/app-text/sigil-1.0.0
index cd367f76f289..5eeb3fd7ed58 100644
--- a/metadata/md5-cache/app-text/sigil-1.0.0
+++ b/metadata/md5-cache/app-text/sigil-1.0.0
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/pyth
 DESCRIPTION=Multi-platform WYSIWYG ebook editor for ePub format
 EAPI=7
 HOMEPAGE=https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil
-IUSE=+plugins system-mathjax python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+plugins system-mathjax python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ Apache-2.0
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/hunspell:= dev-libs/libpcre:3=[pcre16] python_single_target_python3_6? ( dev-python/css-parser[python_targets_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/css-parser[python_targets_python3_7(-)] dev-python/lxml[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) >=dev-qt/qtconcurrent-5.12:5 >=dev-qt/qtcore-5.12:5 >=dev-qt/qtgui-5.12:5 >=dev-qt/qtprintsupport-5.12:5 >=dev-qt/qtwebengine-5.12:5[widgets] >=dev-qt/qtwidgets-5.12:5 sys-libs/zlib[minizip] plugins? ( python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/cssselect[python_targets_python3_6(-)] dev-python/cssutils[python_targets_python3_6(-)] dev-python/html5lib[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/regex[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cssselect[python_targets_python3_7(-)] dev-python/cssutils[python_targets_python3_7(-)] dev-python/html5lib[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/regex[python_targets_python3_7(-)] ) ) system-mathjax? ( dev-libs/mathjax )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Sigil-Ebook/Sigil/archive/1.0.0.tar.gz -> sigil-1.0.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=218e9e3e2df0b2e0453c7a928da4075e
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 f6483dd52350..eb4d321f97b0 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bc738aebe819d573647523d05870edf
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 dc6b08dc28cc..734c152afeb5 100644
--- a/metadata/md5-cache/app-text/stardict-3.0.6-r3
+++ b/metadata/md5-cache/app-text/stardict-3.0.6-r3
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gdk
 DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
 EAPI=6
 HOMEPAGE=http://stardict-4.sourceforge.net/
-IUSE=advertisement debug dictdotcn espeak examples +gucharmap +htmlparse man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse +python_targets_python2_7 +python_single_target_python2_7
+IUSE=advertisement debug dictdotcn espeak examples +gucharmap +htmlparse man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse +python_single_target_python2_7
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86
 LICENSE=CPL-1.0 GPL-3 LGPL-2
 RDEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/pango gucharmap? ( gnome-extra/gucharmap:0= ) spell? ( >=app-text/enchant-1.2:0 ) tools? ( dev-db/mysql-connector-c dev-libs/libpcre:= dev-libs/libxml2:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ) espeak? ( >=app-accessibility/espeak-1.29 ) perl? ( dev-lang/perl )
-REQUIRED_USE=tools? ( python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) )
+REQUIRED_USE=tools? ( python? ( ^^ ( python_single_target_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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e9512706a4cc2c29a317f2f4a0e2779
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 5573aa88ebb6..219958eb037e 100644
--- a/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304
+++ b/metadata/md5-cache/app-text/stardict-4.0.0_pre20170304
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3]
 DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
 EAPI=6
 HOMEPAGE=http://stardict-4.sourceforge.net/ https://github.com/huzheng001/stardict-3
-IUSE=advertisement cal debug dictdotcn espeak examples flite fortune gucharmap +htmlparse info man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse youdaodict +python_targets_python2_7 +python_single_target_python2_7
+IUSE=advertisement cal debug dictdotcn espeak examples flite fortune gucharmap +htmlparse info man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse youdaodict +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=CPL-1.0 GPL-3 LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3] sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango espeak? ( >=app-accessibility/espeak-1.29 ) flite? ( app-accessibility/flite ) gucharmap? ( gnome-extra/gucharmap:2.90= ) spell? ( >=app-text/enchant-1.2:0 ) tools? ( dev-db/mysql-connector-c dev-libs/expat dev-libs/libpcre:= dev-libs/libxml2:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ) info? ( sys-apps/texinfo ) fortune? ( games-misc/fortune-mod ) perl? ( dev-lang/perl )
-REQUIRED_USE=tools? ( python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) )
+REQUIRED_USE=tools? ( python? ( ^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43d7e2b73040d7fc386cc6c27aa22bb4
diff --git a/metadata/md5-cache/app-text/texlive-core-2019-r4 b/metadata/md5-cache/app-text/texlive-core-2019-r4
index 2f71a018267b..812624701f5a 100644
--- a/metadata/md5-cache/app-text/texlive-core-2019-r4
+++ b/metadata/md5-cache/app-text/texlive-core-2019-r4
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LPPL-1.3c TeX
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] >=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] >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:= >=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-20190410-source.tar.xz mirror://gentoo/texlive-core-patches-2019-4.tar.xz mirror://gentoo/texlive-tlpdb-2019.tar.xz mirror://gentoo/texlive-module-tetex-2019.tar.xz mirror://gentoo/texlive-module-hyphen-base-2019.tar.xz mirror://gentoo/texlive-module-gsftopk-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra-2019.tar.xz mirror://gentoo/texlive-module-a2ping-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2019.tar.xz mirror://gentoo/texlive-module-arara-2019.tar.xz mirror://gentoo/texlive-module-asymptote-2019.tar.xz mirror://gentoo/texlive-module-bundledoc-2019.tar.xz mirror://gentoo/texlive-module-checklistings-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk-2019.tar.xz mirror://gentoo/texlive-module-ctanify-2019.tar.xz mirror://gentoo/texlive-module-ctanupload-2019.tar.xz mirror://gentoo/texlive-module-ctie-2019.tar.xz mirror://gentoo/texlive-module-cweb-2019.tar.xz mirror://gentoo/texlive-module-de-macro-2019.tar.xz mirror://gentoo/texlive-module-dtl-2019.tar.xz mirror://gentoo/texlive-module-dtxgen-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty-2019.tar.xz mirror://gentoo/texlive-module-dviasm-2019.tar.xz mirror://gentoo/texlive-module-dvicopy-2019.tar.xz mirror://gentoo/texlive-module-dvidvi-2019.tar.xz mirror://gentoo/texlive-module-dviljk-2019.tar.xz mirror://gentoo/texlive-module-dvipos-2019.tar.xz mirror://gentoo/texlive-module-findhyph-2019.tar.xz mirror://gentoo/texlive-module-fragmaster-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2019.tar.xz mirror://gentoo/texlive-module-hyphenex-2019.tar.xz mirror://gentoo/texlive-module-installfont-2019.tar.xz mirror://gentoo/texlive-module-lacheck-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize-2019.tar.xz mirror://gentoo/texlive-module-latex2man-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion-2019.tar.xz mirror://gentoo/texlive-module-latexpand-2019.tar.xz mirror://gentoo/texlive-module-latexindent-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2019.tar.xz mirror://gentoo/texlive-module-ltximg-2019.tar.xz mirror://gentoo/texlive-module-listings-ext-2019.tar.xz mirror://gentoo/texlive-module-make4ht-2019.tar.xz mirror://gentoo/texlive-module-match_parens-2019.tar.xz mirror://gentoo/texlive-module-mflua-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2019.tar.xz mirror://gentoo/texlive-module-patgen-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2019.tar.xz mirror://gentoo/texlive-module-pdftools-2019.tar.xz mirror://gentoo/texlive-module-pdfxup-2019.tar.xz mirror://gentoo/texlive-module-pfarrei-2019.tar.xz mirror://gentoo/texlive-module-pkfix-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2019.tar.xz mirror://gentoo/texlive-module-purifyeps-2019.tar.xz mirror://gentoo/texlive-module-seetexk-2019.tar.xz mirror://gentoo/texlive-module-srcredact-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx-2019.tar.xz mirror://gentoo/texlive-module-synctex-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook-2019.tar.xz mirror://gentoo/texlive-module-texcount-2019.tar.xz mirror://gentoo/texlive-module-texdef-2019.tar.xz mirror://gentoo/texlive-module-texdiff-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten-2019.tar.xz mirror://gentoo/texlive-module-texdoc-2019.tar.xz mirror://gentoo/texlive-module-texfot-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser-2019.tar.xz mirror://gentoo/texlive-module-texosquery-2019.tar.xz mirror://gentoo/texlive-module-texware-2019.tar.xz mirror://gentoo/texlive-module-tie-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2019.tar.xz mirror://gentoo/texlive-module-web-2019.tar.xz mirror://gentoo/texlive-module-collection-binextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2019.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2019.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-arara.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2019.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2019.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2019.tar.xz mirror://gentoo/texlive-module-ctie.doc-2019.tar.xz mirror://gentoo/texlive-module-cweb.doc-2019.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2019.tar.xz mirror://gentoo/texlive-module-dtl.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2019.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2019.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2019.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2019.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2019.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2019.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2019.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-installfont.doc-2019.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2019.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2019.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2019.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2019.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2019.tar.xz mirror://gentoo/texlive-module-patgen.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2019.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2019.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2019.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2019.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2019.tar.xz mirror://gentoo/texlive-module-synctex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2019.tar.xz mirror://gentoo/texlive-module-texcount.doc-2019.tar.xz mirror://gentoo/texlive-module-texdef.doc-2019.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2019.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-texfot.doc-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2019.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2019.tar.xz mirror://gentoo/texlive-module-texware.doc-2019.tar.xz mirror://gentoo/texlive-module-tie.doc-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-web.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2019.tar.xz mirror://gentoo/texlive-module-arara.source-2019.tar.xz mirror://gentoo/texlive-module-checklistings.source-2019.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2019.tar.xz mirror://gentoo/texlive-module-pythontex.source-2019.tar.xz mirror://gentoo/texlive-module-texdef.source-2019.tar.xz mirror://gentoo/texlive-module-texosquery.source-2019.tar.xz )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6af03454666c62302d79544a9f17a552
diff --git a/metadata/md5-cache/app-text/texlive-core-2019-r7 b/metadata/md5-cache/app-text/texlive-core-2019-r7
deleted file mode 100644
index 0f3854283dc4..000000000000
--- a/metadata/md5-cache/app-text/texlive-core-2019-r7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/ed sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] >=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] >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:=
-DESCRIPTION=A complete TeX distribution
-EAPI=7
-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LPPL-1.3c TeX
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] >=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] >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:= >=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-20190410-source.tar.xz mirror://gentoo/texlive-core-patches-2019-7.tar.xz mirror://gentoo/texlive-tlpdb-2019.tar.xz mirror://gentoo/texlive-module-tetex-2019.tar.xz mirror://gentoo/texlive-module-hyphen-base-2019.tar.xz mirror://gentoo/texlive-module-gsftopk-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra-2019.tar.xz mirror://gentoo/texlive-module-a2ping-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2019.tar.xz mirror://gentoo/texlive-module-arara-2019.tar.xz mirror://gentoo/texlive-module-asymptote-2019.tar.xz mirror://gentoo/texlive-module-bundledoc-2019.tar.xz mirror://gentoo/texlive-module-checklistings-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk-2019.tar.xz mirror://gentoo/texlive-module-ctanify-2019.tar.xz mirror://gentoo/texlive-module-ctanupload-2019.tar.xz mirror://gentoo/texlive-module-ctie-2019.tar.xz mirror://gentoo/texlive-module-cweb-2019.tar.xz mirror://gentoo/texlive-module-de-macro-2019.tar.xz mirror://gentoo/texlive-module-dtl-2019.tar.xz mirror://gentoo/texlive-module-dtxgen-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty-2019.tar.xz mirror://gentoo/texlive-module-dviasm-2019.tar.xz mirror://gentoo/texlive-module-dvicopy-2019.tar.xz mirror://gentoo/texlive-module-dvidvi-2019.tar.xz mirror://gentoo/texlive-module-dviljk-2019.tar.xz mirror://gentoo/texlive-module-dvipos-2019.tar.xz mirror://gentoo/texlive-module-findhyph-2019.tar.xz mirror://gentoo/texlive-module-fragmaster-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2019.tar.xz mirror://gentoo/texlive-module-hyphenex-2019.tar.xz mirror://gentoo/texlive-module-installfont-2019.tar.xz mirror://gentoo/texlive-module-lacheck-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize-2019.tar.xz mirror://gentoo/texlive-module-latex2man-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion-2019.tar.xz mirror://gentoo/texlive-module-latexpand-2019.tar.xz mirror://gentoo/texlive-module-latexindent-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2019.tar.xz mirror://gentoo/texlive-module-ltximg-2019.tar.xz mirror://gentoo/texlive-module-listings-ext-2019.tar.xz mirror://gentoo/texlive-module-make4ht-2019.tar.xz mirror://gentoo/texlive-module-match_parens-2019.tar.xz mirror://gentoo/texlive-module-mflua-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2019.tar.xz mirror://gentoo/texlive-module-patgen-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2019.tar.xz mirror://gentoo/texlive-module-pdftools-2019.tar.xz mirror://gentoo/texlive-module-pdfxup-2019.tar.xz mirror://gentoo/texlive-module-pfarrei-2019.tar.xz mirror://gentoo/texlive-module-pkfix-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2019.tar.xz mirror://gentoo/texlive-module-purifyeps-2019.tar.xz mirror://gentoo/texlive-module-seetexk-2019.tar.xz mirror://gentoo/texlive-module-srcredact-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx-2019.tar.xz mirror://gentoo/texlive-module-synctex-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook-2019.tar.xz mirror://gentoo/texlive-module-texcount-2019.tar.xz mirror://gentoo/texlive-module-texdef-2019.tar.xz mirror://gentoo/texlive-module-texdiff-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten-2019.tar.xz mirror://gentoo/texlive-module-texdoc-2019.tar.xz mirror://gentoo/texlive-module-texfot-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser-2019.tar.xz mirror://gentoo/texlive-module-texosquery-2019.tar.xz mirror://gentoo/texlive-module-texware-2019.tar.xz mirror://gentoo/texlive-module-tie-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2019.tar.xz mirror://gentoo/texlive-module-web-2019.tar.xz mirror://gentoo/texlive-module-collection-binextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2019.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2019.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-arara.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2019.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2019.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2019.tar.xz mirror://gentoo/texlive-module-ctie.doc-2019.tar.xz mirror://gentoo/texlive-module-cweb.doc-2019.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2019.tar.xz mirror://gentoo/texlive-module-dtl.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2019.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2019.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2019.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2019.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2019.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2019.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2019.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-installfont.doc-2019.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2019.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2019.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2019.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2019.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2019.tar.xz mirror://gentoo/texlive-module-patgen.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2019.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2019.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2019.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2019.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2019.tar.xz mirror://gentoo/texlive-module-synctex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2019.tar.xz mirror://gentoo/texlive-module-texcount.doc-2019.tar.xz mirror://gentoo/texlive-module-texdef.doc-2019.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2019.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-texfot.doc-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2019.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2019.tar.xz mirror://gentoo/texlive-module-texware.doc-2019.tar.xz mirror://gentoo/texlive-module-tie.doc-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-web.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2019.tar.xz mirror://gentoo/texlive-module-arara.source-2019.tar.xz mirror://gentoo/texlive-module-checklistings.source-2019.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2019.tar.xz mirror://gentoo/texlive-module-pythontex.source-2019.tar.xz mirror://gentoo/texlive-module-texdef.source-2019.tar.xz mirror://gentoo/texlive-module-texosquery.source-2019.tar.xz )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6f02aa2717c835f69f47c53393e753cc
diff --git a/metadata/md5-cache/app-text/texlive-core-2019-r8 b/metadata/md5-cache/app-text/texlive-core-2019-r8
new file mode 100644
index 000000000000..0cbfe2314991
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-core-2019-r8
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/ed sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] >=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] >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:=
+DESCRIPTION=A complete TeX distribution
+EAPI=7
+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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LPPL-1.3c TeX
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= media-libs/gd[png] >=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] >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/icu-50:= >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.7 ) >=app-text/poppler-0.76.1:= >=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-20190410-source.tar.xz mirror://gentoo/texlive-core-patches-2019-8.tar.xz mirror://gentoo/texlive-tlpdb-2019.tar.xz mirror://gentoo/texlive-module-tetex-2019.tar.xz mirror://gentoo/texlive-module-hyphen-base-2019.tar.xz mirror://gentoo/texlive-module-gsftopk-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra-2019.tar.xz mirror://gentoo/texlive-module-a2ping-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2019.tar.xz mirror://gentoo/texlive-module-arara-2019.tar.xz mirror://gentoo/texlive-module-asymptote-2019.tar.xz mirror://gentoo/texlive-module-bundledoc-2019.tar.xz mirror://gentoo/texlive-module-checklistings-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk-2019.tar.xz mirror://gentoo/texlive-module-ctanify-2019.tar.xz mirror://gentoo/texlive-module-ctanupload-2019.tar.xz mirror://gentoo/texlive-module-ctie-2019.tar.xz mirror://gentoo/texlive-module-cweb-2019.tar.xz mirror://gentoo/texlive-module-de-macro-2019.tar.xz mirror://gentoo/texlive-module-dtl-2019.tar.xz mirror://gentoo/texlive-module-dtxgen-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty-2019.tar.xz mirror://gentoo/texlive-module-dviasm-2019.tar.xz mirror://gentoo/texlive-module-dvicopy-2019.tar.xz mirror://gentoo/texlive-module-dvidvi-2019.tar.xz mirror://gentoo/texlive-module-dviljk-2019.tar.xz mirror://gentoo/texlive-module-dvipos-2019.tar.xz mirror://gentoo/texlive-module-findhyph-2019.tar.xz mirror://gentoo/texlive-module-fragmaster-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2019.tar.xz mirror://gentoo/texlive-module-hyphenex-2019.tar.xz mirror://gentoo/texlive-module-installfont-2019.tar.xz mirror://gentoo/texlive-module-lacheck-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize-2019.tar.xz mirror://gentoo/texlive-module-latex2man-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion-2019.tar.xz mirror://gentoo/texlive-module-latexpand-2019.tar.xz mirror://gentoo/texlive-module-latexindent-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2019.tar.xz mirror://gentoo/texlive-module-ltximg-2019.tar.xz mirror://gentoo/texlive-module-listings-ext-2019.tar.xz mirror://gentoo/texlive-module-make4ht-2019.tar.xz mirror://gentoo/texlive-module-match_parens-2019.tar.xz mirror://gentoo/texlive-module-mflua-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2019.tar.xz mirror://gentoo/texlive-module-patgen-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2019.tar.xz mirror://gentoo/texlive-module-pdftools-2019.tar.xz mirror://gentoo/texlive-module-pdfxup-2019.tar.xz mirror://gentoo/texlive-module-pfarrei-2019.tar.xz mirror://gentoo/texlive-module-pkfix-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2019.tar.xz mirror://gentoo/texlive-module-purifyeps-2019.tar.xz mirror://gentoo/texlive-module-seetexk-2019.tar.xz mirror://gentoo/texlive-module-srcredact-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx-2019.tar.xz mirror://gentoo/texlive-module-synctex-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook-2019.tar.xz mirror://gentoo/texlive-module-texcount-2019.tar.xz mirror://gentoo/texlive-module-texdef-2019.tar.xz mirror://gentoo/texlive-module-texdiff-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten-2019.tar.xz mirror://gentoo/texlive-module-texdoc-2019.tar.xz mirror://gentoo/texlive-module-texfot-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser-2019.tar.xz mirror://gentoo/texlive-module-texosquery-2019.tar.xz mirror://gentoo/texlive-module-texware-2019.tar.xz mirror://gentoo/texlive-module-tie-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2019.tar.xz mirror://gentoo/texlive-module-web-2019.tar.xz mirror://gentoo/texlive-module-collection-binextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2019.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2019.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2019.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-arara.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2019.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2019.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2019.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2019.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2019.tar.xz mirror://gentoo/texlive-module-ctie.doc-2019.tar.xz mirror://gentoo/texlive-module-cweb.doc-2019.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2019.tar.xz mirror://gentoo/texlive-module-dtl.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2019.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2019.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2019.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2019.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2019.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2019.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2019.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2019.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2019.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-installfont.doc-2019.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2019.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2019.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2019.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2019.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2019.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2019.tar.xz mirror://gentoo/texlive-module-patgen.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2019.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2019.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2019.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2019.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2019.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2019.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2019.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2019.tar.xz mirror://gentoo/texlive-module-synctex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2019.tar.xz mirror://gentoo/texlive-module-texcount.doc-2019.tar.xz mirror://gentoo/texlive-module-texdef.doc-2019.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2019.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2019.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-texfot.doc-2019.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2019.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2019.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2019.tar.xz mirror://gentoo/texlive-module-texware.doc-2019.tar.xz mirror://gentoo/texlive-module-tie.doc-2019.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2019.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-web.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2019.tar.xz mirror://gentoo/texlive-module-arara.source-2019.tar.xz mirror://gentoo/texlive-module-checklistings.source-2019.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2019.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2019.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2019.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2019.tar.xz mirror://gentoo/texlive-module-pythontex.source-2019.tar.xz mirror://gentoo/texlive-module-texdef.source-2019.tar.xz mirror://gentoo/texlive-module-texosquery.source-2019.tar.xz )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4076b97d18d8400dbe9d7aa119ff2891
diff --git a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410 b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410
index f066e04540fb..976a40ed1f3d 100644
--- a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410
+++ b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20190410
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-lib
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5aabdfaf33de6d4ed7aebe4fd8d557ac
+_md5_=9b9752ab0da2d9259d983316a860bbb7
diff --git a/metadata/md5-cache/app-text/txt2tags-2.6-r1 b/metadata/md5-cache/app-text/txt2tags-2.6-r1
index 9cad4340eb7f..089bb4a855a2 100644
--- a/metadata/md5-cache/app-text/txt2tags-2.6-r1
+++ b/metadata/md5-cache/app-text/txt2tags-2.6-r1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] >=d
 DESCRIPTION=Generate marked up documents (HTML, etc.)from a plain text file with markup
 EAPI=5
 HOMEPAGE=https://txt2tags.org
-IUSE=emacs tk vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=emacs tk vim-syntax +python_single_target_python2_7
 KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) tk? ( dev-lang/tk ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) emacs? ( >=app-editors/emacs-23.1:* )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://txt2tags.googlecode.com/files/txt2tags-2.6.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d4eeab5f0c94eacb062372290b7ba135
diff --git a/metadata/md5-cache/app-text/txt2tags-3.3 b/metadata/md5-cache/app-text/txt2tags-3.3
index cad04cf1fcf9..06c901d39ed7 100644
--- a/metadata/md5-cache/app-text/txt2tags-3.3
+++ b/metadata/md5-cache/app-text/txt2tags-3.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/jendrikseipp/txt2tags/archive/3.3.tar.gz -> txt2tags-3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4c334a8d108f0f699858e68908988d1
diff --git a/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023 b/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023
new file mode 100644
index 000000000000..1b98c9460934
--- /dev/null
+++ b/metadata/md5-cache/app-text/vilistextum-2.8.0.20191023
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=virtual/libiconv
+DESCRIPTION=HTML to ASCII converter programmed to handle incorrect html
+EAPI=7
+HOMEPAGE=https://bhaak.net/vilistextum/
+IUSE=unicode
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/bhaak/vilistextum/tarball/f299bb5e5f661c345c4b85a3e8de9ad8615ad17a -> vilistextum-2.8.0.20191023.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e6a839b202dbf2649a5bce9ad66b8b22
diff --git a/metadata/md5-cache/app-text/wiki2beamer-0.10.0 b/metadata/md5-cache/app-text/wiki2beamer-0.10.0
index 3116b3c9cb4b..e890fdfd4429 100644
--- a/metadata/md5-cache/app-text/wiki2beamer-0.10.0
+++ b/metadata/md5-cache/app-text/wiki2beamer-0.10.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/unzip doc? ( dev-ruby/asciidoctor )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/unzip doc? ( dev-ruby/asciidoctor )
 DESCRIPTION=Tool to produce LaTeX Beamer code from wiki-like input
 EAPI=7
 HOMEPAGE=https://wiki2beamer.github.io/
-IUSE=doc +examples 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
+IUSE=doc +examples python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/wiki2beamer/wiki2beamer/archive/wiki2beamer-v0.10.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e7af31a0a6417d743b849536ecfe8e30
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f557b1d2efb472dd7b015c9149f7cd7b
diff --git a/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1 b/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
index 563a2aeeb592..1fc44fe0d36a 100644
--- a/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
+++ b/metadata/md5-cache/app-text/wiki2beamer-0.9.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-arch/unzip
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-arch/unzip
 DESCRIPTION=Tool to produce LaTeX Beamer code from wiki-like input
 EAPI=5
 HOMEPAGE=http://wiki2beamer.sourceforge.net/
-IUSE=+examples python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+examples +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 ) FDL-1.3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/wiki2beamer/wiki2beamer-0.9.5.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1e6e2daa573979707f85495e5c25946f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1cca9c94918c58d95a03033cb015d049
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r1 b/metadata/md5-cache/app-text/wscr-1.2-r1
index e52f7c24f519..a093a5ae5b2b 100644
--- a/metadata/md5-cache/app-text/wscr-1.2-r1
+++ b/metadata/md5-cache/app-text/wscr-1.2-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Lightweight and Fast Anagram Solver
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=public-domain
 RDEPEND=sys-apps/miscfiles
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e10c8d20d44b6793c47dc10f53caea70
+_md5_=5ba9dfd5136755f91e9012820922c9a1
diff --git a/metadata/md5-cache/app-text/wscr-1.2-r2 b/metadata/md5-cache/app-text/wscr-1.2-r2
index 2a1a32e640fd..a9cf68b69ed6 100644
--- a/metadata/md5-cache/app-text/wscr-1.2-r2
+++ b/metadata/md5-cache/app-text/wscr-1.2-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=A Lightweight and Fast Anagram Solver
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~mips ~ppc ~x86
 LICENSE=public-domain
 RDEPEND=sys-apps/miscfiles
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=264958d4f0e928fa03e03a0ff07a3b2a
+_md5_=e29124030c8be8b4ee9ff29bd3155f50
diff --git a/metadata/md5-cache/app-text/xapers-0.8.2 b/metadata/md5-cache/app-text/xapers-0.8.2
index a552da66eea6..df1a93860233 100644
--- a/metadata/md5-cache/app-text/xapers-0.8.2
+++ b/metadata/md5-cache/app-text/xapers-0.8.2
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler[utils] dev-libs/xapian-bindings[python,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://finestructure.net/xapers/releases/xapers-0.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=646949f5d747fe6c1be4af4d85cb7194
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.6a-r1 b/metadata/md5-cache/app-text/xiphos-4.0.6a-r1
deleted file mode 100644
index bff7b77c5757..000000000000
--- a/metadata/md5-cache/app-text/xiphos-4.0.6a-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.7.4 dev-libs/glib:2 dev-libs/libxml2:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/rarian dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/intltool dev-util/glib-utils >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
-EAPI=6
-HOMEPAGE=http://xiphos.org/
-IUSE=dbus debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.7.4 dev-libs/glib:2 dev-libs/libxml2:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8714dbd10e90568cf5c0cb81723c386e
diff --git a/metadata/md5-cache/app-text/xiphos-4.0.6a-r2 b/metadata/md5-cache/app-text/xiphos-4.0.6a-r2
new file mode 100644
index 000000000000..303f87aea924
--- /dev/null
+++ b/metadata/md5-cache/app-text/xiphos-4.0.6a-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.7.4 dev-libs/glib:2 gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 python_single_target_python2_7? ( dev-libs/libxml2:2[python_targets_python2_7(-)] gnome-base/gconf[python_targets_python2_7(-)] ) dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/rarian dev-util/intltool dev-util/glib-utils >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext python_single_target_python2_7? ( app-text/gnome-doc-utils[python_targets_python2_7(-)] dev-libs/libxslt[python_targets_python2_7(-)] )
+DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
+EAPI=6
+HOMEPAGE=http://xiphos.org/
+IUSE=dbus debug +python_single_target_python2_7
+KEYWORDS=amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.7.4 dev-libs/glib:2 gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 python_single_target_python2_7? ( dev-libs/libxml2:2[python_targets_python2_7(-)] gnome-base/gconf[python_targets_python2_7(-)] ) dbus? ( dev-libs/dbus-glib )
+REQUIRED_USE=^^ ( python_single_target_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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0ff810c5bf135769ccf6761bad172541
diff --git a/metadata/md5-cache/app-text/xiphos-4.1.0-r1 b/metadata/md5-cache/app-text/xiphos-4.1.0-r1
deleted file mode 100644
index 96ae684011f4..000000000000
--- a/metadata/md5-cache/app-text/xiphos-4.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.8.0 dev-libs/glib:2 dev-libs/libxml2:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/rarian dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/glib-utils dev-util/intltool >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
-EAPI=6
-HOMEPAGE=http://xiphos.org/
-IUSE=dbus debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.8.0 dev-libs/glib:2 dev-libs/libxml2:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b2109e6cb15dd3e1053570f7dd0dd91
diff --git a/metadata/md5-cache/app-text/xiphos-4.1.0-r2 b/metadata/md5-cache/app-text/xiphos-4.1.0-r2
new file mode 100644
index 000000000000..fadbacda88e8
--- /dev/null
+++ b/metadata/md5-cache/app-text/xiphos-4.1.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.8.0 dev-libs/glib:2 gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 python_single_target_python2_7? ( dev-libs/libxml2:2[python_targets_python2_7(-)] gnome-base/gconf[python_targets_python2_7(-)] ) dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/rarian dev-util/glib-utils dev-util/intltool >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext python_single_target_python2_7? ( app-text/gnome-doc-utils[python_targets_python2_7(-)] dev-libs/libxslt[python_targets_python2_7(-)] )
+DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
+EAPI=6
+HOMEPAGE=http://xiphos.org/
+IUSE=dbus debug +python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/sword-1.8.0 dev-libs/glib:2 gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 python_single_target_python2_7? ( dev-libs/libxml2:2[python_targets_python2_7(-)] gnome-base/gconf[python_targets_python2_7(-)] ) dbus? ( dev-libs/dbus-glib )
+REQUIRED_USE=^^ ( python_single_target_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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=33b1f391fb4e7add337e152dd9f569a2
diff --git a/metadata/md5-cache/app-text/xlsx2csv-0.7.6 b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
index a18b8ad6b295..01002bbbe4d5 100644
--- a/metadata/md5-cache/app-text/xlsx2csv-0.7.6
+++ b/metadata/md5-cache/app-text/xlsx2csv-0.7.6
@@ -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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3e4669ac21e251a705d0aa35b884dd28
diff --git a/metadata/md5-cache/app-text/xmldiff-1.1.1 b/metadata/md5-cache/app-text/xmldiff-1.1.1
index f6b981aca3cd..5d07fe80b28a 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_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82d010b7e6b8c7e82e2fec521ca0af91
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 89f752287691..520a18207ebb 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/automatictexplugin-12.5-r1 b/metadata/md5-cache/app-vim/automatictexplugin-12.5-r1
deleted file mode 100644
index 175494ebcf87..000000000000
--- a/metadata/md5-cache/app-vim/automatictexplugin-12.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a comprehensive plugin for editing LaTeX files
-EAPI=5
-HOMEPAGE=http://atp-vim.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) !app-vim/vim-latex app-vim/align app-text/wdiff dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-tex/latexmk dev-tex/detex virtual/tex-base python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/atp-vim/releases/AutomaticTexPlugin_12.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c2590af0b7cb34b49ddf72fa41be9209
diff --git a/metadata/md5-cache/app-vim/automatictexplugin-12.5-r2 b/metadata/md5-cache/app-vim/automatictexplugin-12.5-r2
new file mode 100644
index 000000000000..cfccb09ef173
--- /dev/null
+++ b/metadata/md5-cache/app-vim/automatictexplugin-12.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a comprehensive plugin for editing LaTeX files
+EAPI=5
+HOMEPAGE=http://atp-vim.sourceforge.net/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=|| ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) !app-vim/vim-latex app-vim/align app-text/wdiff python_single_target_python2_7? ( dev-python/psutil[python_targets_python2_7(-)] ) dev-tex/latexmk dev-tex/detex virtual/tex-base python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/atp-vim/releases/AutomaticTexPlugin_12.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=bbc23829d07f34d47d45b0b3681a2aff
diff --git a/metadata/md5-cache/app-vim/colorv-3.0.2-r1 b/metadata/md5-cache/app-vim/colorv-3.0.2-r1
deleted file mode 100644
index da26d1f5508d..000000000000
--- a/metadata/md5-cache/app-vim/colorv-3.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a color tool for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ( app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/colorv-3.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorv-3.0.2.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c39de0773fbcf008d3afc7385f3b2811
diff --git a/metadata/md5-cache/app-vim/colorv-3.0.2-r2 b/metadata/md5-cache/app-vim/colorv-3.0.2-r2
new file mode 100644
index 000000000000..52699ff97456
--- /dev/null
+++ b/metadata/md5-cache/app-vim/colorv-3.0.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: a color tool for vim
+EAPI=6
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( || ( app-editors/vim[python,python_single_target_python2_7(-)?] ( app-editors/gvim[python,python_single_target_python2_7(-)?] dev-python/pygtk:2[python_targets_python2_7(-)] ) ) ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/colorv-3.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorv-3.0.2.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=6f10977cbd47c2e3f5839d2bf6f70130
diff --git a/metadata/md5-cache/app-vim/conque-2.3-r1 b/metadata/md5-cache/app-vim/conque-2.3-r1
index 139f222dbc3b..7feb0275ca26 100644
--- a/metadata/md5-cache/app-vim/conque-2.3-r1
+++ b/metadata/md5-cache/app-vim/conque-2.3-r1
@@ -3,12 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
 DESCRIPTION=vim plugin: Run interactive commands inside a Vim buffer
 EAPI=5
 HOMEPAGE=https://code.google.com/p/conque/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-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 )
+RDEPEND=|| ( app-editors/vim[python,python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://conque.googlecode.com/files/conque_2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=1376b04330230bc9a7a39e1807c90e11
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=a630b3c360d7df4bd908b7a2d6a908fc
diff --git a/metadata/md5-cache/app-vim/easytags-3.11 b/metadata/md5-cache/app-vim/easytags-3.11
index 4709c2668687..968c93a2279c 100644
--- a/metadata/md5-cache/app-vim/easytags-3.11
+++ b/metadata/md5-cache/app-vim/easytags-3.11
@@ -3,12 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: automated tag file generation and syntax highlighting
 EAPI=7
 HOMEPAGE=http://peterodding.com/code/vim/easytags/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-vim/vim-misc-1.17.6 dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-easytags/archive/3.11.tar.gz -> easytags-3.11.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=1d86b78ac0e968dc35a39e251e8e2d0c
diff --git a/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2 b/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
index b8e9bb7f1f82..82629fd8b089 100644
--- a/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
+++ b/metadata/md5-cache/app-vim/editorconfig-vim-0.3.3-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/editorconfig-core-py[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] || ( app-editors/vim[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/editorconfig-core-py[python_targets_python3_6(-)] ) || ( app-editors/vim[python,python_single_target_python3_6(-)?] app-editors/gvim[python,python_single_target_python3_6(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Support EditorConfig files
 EAPI=6
 HOMEPAGE=https://editorconfig.org/
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/editorconfig-core-py[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] || ( app-editors/vim[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/editorconfig-core-py[python_targets_python3_6(-)] ) || ( app-editors/vim[python,python_single_target_python3_6(-)?] app-editors/gvim[python,python_single_target_python3_6(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-vim/archive/v0.3.3.tar.gz -> editorconfig-vim-0.3.3.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=2947dbd65001fb8f13bbb40f004d29e7
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=d1be48986a0f50332edefd980790a193
diff --git a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1 b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
index 762171f8a834..c726c50bd8ee 100644
--- a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
+++ b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: eselect syntax highlighting, filetype and indent settings
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=vim
 RDEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-syntax-20070506.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c01ee31edced4c24f642097fed4c9c06
+_md5_=b362f029b6b96b1fe514354ce049c0a3
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2 b/metadata/md5-cache/app-vim/gundo-2.6.2
deleted file mode 100644
index b0fc1590b787..000000000000
--- a/metadata/md5-cache/app-vim/gundo-2.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: visualize your vim undo tree
-EAPI=6
-HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-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=https://bitbucket.org/sjl/gundo.vim/get/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=df55801ccd2cb25638ae2fe6c57ecf4b
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2-r1 b/metadata/md5-cache/app-vim/gundo-2.6.2-r1
deleted file mode 100644
index 0091839ecc43..000000000000
--- a/metadata/md5-cache/app-vim/gundo-2.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: visualize your vim undo tree
-EAPI=7
-HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=|| ( app-editors/vim[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] app-editors/gvim[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://bitbucket.org/sjl/gundo.vim/get/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=0664d2a4510eec3160bddc22fb846a5b
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2-r2 b/metadata/md5-cache/app-vim/gundo-2.6.2-r2
new file mode 100644
index 000000000000..f808cb2fd93d
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gundo-2.6.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: visualize your vim undo tree
+EAPI=6
+HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
+IUSE=python_single_target_python2_7 python_single_target_python3_6
+KEYWORDS=amd64 x86 ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=|| ( app-editors/vim[python,python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://bitbucket.org/sjl/gundo.vim/get/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=bb76236741193b247f0dc5bae0ea6bc3
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2-r3 b/metadata/md5-cache/app-vim/gundo-2.6.2-r3
new file mode 100644
index 000000000000..5095c9602ec9
--- /dev/null
+++ b/metadata/md5-cache/app-vim/gundo-2.6.2-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: visualize your vim undo tree
+EAPI=7
+HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=|| ( app-editors/vim[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] app-editors/gvim[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://bitbucket.org/sjl/gundo.vim/get/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=5eba787177ba631080120a0b119a6570
diff --git a/metadata/md5-cache/app-vim/notes-0.33.4 b/metadata/md5-cache/app-vim/notes-0.33.4
index 1b1fa80e8a80..d0f53036f763 100644
--- a/metadata/md5-cache/app-vim/notes-0.33.4
+++ b/metadata/md5-cache/app-vim/notes-0.33.4
@@ -3,12 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easy note taking in vim
 EAPI=5
 HOMEPAGE=http://peterodding.com/code/vim/notes/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-vim/vim-misc-1.17.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-notes/archive/0.33.4.tar.gz -> notes-0.33.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=8029c0059bda23ccf3f7d1d39d13b5ab
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.0.1 b/metadata/md5-cache/app-vim/pyclewn-2.0.1
deleted file mode 100644
index ef213ed681b6..000000000000
--- a/metadata/md5-cache/app-vim/pyclewn-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=|| ( >=app-editors/vim-7.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-editors/gvim-7.3[netbeans,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.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(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Pyclewn allows using vim as a front end to a debugger (pdb or gdb)
-EAPI=5
-HOMEPAGE=http://pyclewn.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-editors/gvim-7.3[netbeans,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-arch/vimball python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.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
-SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ddfccfc313b2bba34355e2df05525479
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r1 b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
index 7eeacff46011..ff358e701408 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r1
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pyclewn allows using vim as a front end to a debugger (pdb or gdb)
 EAPI=5
 HOMEPAGE=http://pyclewn.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/vimball python_targets_python2_7? ( dev-python/pdb-clone[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) 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
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35c8309ffd9430efd3bc6753ca93abf1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d35f9c77e7310d41cbff6c7a9388cce7
diff --git a/metadata/md5-cache/app-vim/pydoc-2.0-r1 b/metadata/md5-cache/app-vim/pydoc-2.0-r1
index 1ee07d3cf734..72cf96a1c3f7 100644
--- a/metadata/md5-cache/app-vim/pydoc-2.0-r1
+++ b/metadata/md5-cache/app-vim/pydoc-2.0-r1
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: integrates python documentation view and search tool
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fs111/pydoc.vim/tarball/2.0 -> pydoc-2.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=23071a55613ab292f4be5732e1d3aede
diff --git a/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910 b/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910
deleted file mode 100644
index 86b4f67debd5..000000000000
--- a/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( dev-lisp/abcl dev-lisp/ecls dev-lisp/sbcl dev-lisp/clisp dev-lang/clojure dev-lisp/clozurecl ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/kovisoft/slimv/archive/acf9b30be71c54db4f4875d257b905941ca69ed8.tar.gz -> slimv-0.9.13_p20170910.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=4e7e31d7551a14060b4dfb546aabfbc0
diff --git a/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910-r1 b/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910-r1
new file mode 100644
index 000000000000..6045d18bcd97
--- /dev/null
+++ b/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL
+EAPI=6
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=|| ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( dev-lisp/abcl dev-lisp/ecls dev-lisp/sbcl dev-lisp/clisp dev-lang/clojure dev-lisp/clozurecl ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/kovisoft/slimv/archive/acf9b30be71c54db4f4875d257b905941ca69ed8.tar.gz -> slimv-0.9.13_p20170910.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=d8ec9967c7ff9b2c99a620b1d961b4d5
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0 b/metadata/md5-cache/app-vim/splice-1.1.0
deleted file mode 100644
index 777d15ec153a..000000000000
--- a/metadata/md5-cache/app-vim/splice-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: resolve conflicts during three-way merges
-EAPI=6
-HOMEPAGE=https://bitbucket.org/sjl/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=054f67dc5b1290c43425574f943ec912
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0-r1 b/metadata/md5-cache/app-vim/splice-1.1.0-r1
deleted file mode 100644
index 0d5d5215364c..000000000000
--- a/metadata/md5-cache/app-vim/splice-1.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: resolve conflicts during three-way merges
-EAPI=7
-HOMEPAGE=https://docs.stevelosh.com/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) || ( app-editors/vim[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] app-editors/gvim[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=84dba934c7d921145e3c052da1c3554a
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0-r2 b/metadata/md5-cache/app-vim/splice-1.1.0-r2
new file mode 100644
index 000000000000..605f1422daa6
--- /dev/null
+++ b/metadata/md5-cache/app-vim/splice-1.1.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: resolve conflicts during three-way merges
+EAPI=6
+HOMEPAGE=https://bitbucket.org/sjl/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=563b82cd17216e803cacf309556720e9
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0-r3 b/metadata/md5-cache/app-vim/splice-1.1.0-r3
new file mode 100644
index 000000000000..01c7185f86f5
--- /dev/null
+++ b/metadata/md5-cache/app-vim/splice-1.1.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: resolve conflicts during three-way merges
+EAPI=7
+HOMEPAGE=https://docs.stevelosh.com/splice.vim/ https://www.vim.org/scripts/script.php?script_id=4026
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) || ( app-editors/vim[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] app-editors/gvim[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=7808ce604da0c61adb7be7af2079c62c
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.10.0 b/metadata/md5-cache/app-vim/vim-latex-1.10.0
deleted file mode 100644
index f36496776754..000000000000
--- a/metadata/md5-cache/app-vim/vim-latex-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=A comprehensive set of tools to view, edit and compile LaTeX documents
-EAPI=6
-HOMEPAGE=http://vim-latex.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=vim
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) virtual/latex-base !app-vim/vimtex || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-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/vim-latex/vim-latex-1.10.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d49c790b26b290a17f3119d8724cea61
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.10.0-r1 b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r1
new file mode 100644
index 000000000000..b371b8289e00
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=A comprehensive set of tools to view, edit and compile LaTeX documents
+EAPI=6
+HOMEPAGE=http://vim-latex.sourceforge.net/
+IUSE=python_single_target_python2_7 python_single_target_python3_6
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=vim
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( app-editors/vim[python,python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] ) virtual/latex-base !app-vim/vimtex || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.10.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=f81722a20e5204805049b3835ef5363d
diff --git a/metadata/md5-cache/app-vim/vimcalc-1.3-r2 b/metadata/md5-cache/app-vim/vimcalc-1.3-r2
deleted file mode 100644
index 05c32bac60d6..000000000000
--- a/metadata/md5-cache/app-vim/vimcalc-1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup test
-DEPEND=app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: provides an interactive calculator inside vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3329
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=15317 -> vimcalc-1.3.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b3a93241be5054d0c279f0c6bbb1e363
diff --git a/metadata/md5-cache/app-vim/vimcalc-1.3-r3 b/metadata/md5-cache/app-vim/vimcalc-1.3-r3
new file mode 100644
index 000000000000..d372a157c545
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vimcalc-1.3-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup test
+DEPEND=app-arch/unzip python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: provides an interactive calculator inside vim
+EAPI=5
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3329
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=vim
+RDEPEND=|| ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=15317 -> vimcalc-1.3.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=5dbfa448da49c3a1c1f7ab4cdf909389
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r2 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r2
deleted file mode 100644
index acb1c4fb0730..000000000000
--- a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy and fast outlining
-EAPI=6
-HOMEPAGE=https://github.com/vimoutliner/vimoutliner
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/autopep8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-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=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.tar.gz -> vimoutliner-0.3.6.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=f30c320aae1c1914f1485e408b65d2ad
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r3 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r3
new file mode 100644
index 000000000000..15f1710cf8a8
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: easy and fast outlining
+EAPI=6
+HOMEPAGE=https://github.com/vimoutliner/vimoutliner
+IUSE=python_single_target_python2_7 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python2_7? ( dev-python/autopep8[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/autopep8[python_targets_python3_6(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.tar.gz -> vimoutliner-0.3.6.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=e041172f02d3015cbdf4f24f7b0dd20e
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r1 b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r1
deleted file mode 100644
index 33686c0104c8..000000000000
--- a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/autopep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Vim plugin for easy and fast outlining
-EAPI=6
-HOMEPAGE=https://github.com/vimoutliner/vimoutliner
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/autopep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/4f12628247940d98eedd594961695dc504261058.tar.gz -> vimoutliner-0.4.0_p20180301.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=e653dc2ab293d0bd91324b8804ba3227
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2 b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
new file mode 100644
index 000000000000..9bf87b8e22a1
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup unpack
+DEPEND=python_single_target_python2_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/autopep8[python_targets_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=Vim plugin for easy and fast outlining
+EAPI=6
+HOMEPAGE=https://github.com/vimoutliner/vimoutliner
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_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/autopep8[python_targets_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/4f12628247940d98eedd594961695dc504261058.tar.gz -> vimoutliner-0.4.0_p20180301.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=2a48029a3e05c84076c4fe89192b7dca
diff --git a/metadata/md5-cache/app-vim/vimpress-3.2.0 b/metadata/md5-cache/app-vim/vimpress-3.2.0
deleted file mode 100644
index 159a90c43eec..000000000000
--- a/metadata/md5-cache/app-vim/vimpress-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: manage wordpress blogs from vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3510
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/vimpress-3.2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpress-3.2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=0e7a9e8d1deff34450c294ebf5a6fafa
diff --git a/metadata/md5-cache/app-vim/vimpress-3.2.0-r1 b/metadata/md5-cache/app-vim/vimpress-3.2.0-r1
new file mode 100644
index 000000000000..8ccfc7f491e0
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vimpress-3.2.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: manage wordpress blogs from vim
+EAPI=5
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3510
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=vim
+RDEPEND=|| ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) python_single_target_python2_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/markdown[python_targets_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/vimpress-3.2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpress-3.2.0.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=bd1d549dccce7f9d4e67239aeea585c9
diff --git a/metadata/md5-cache/app-vim/vimpython-1.13-r2 b/metadata/md5-cache/app-vim/vimpython-1.13-r2
index 9093bb0d65cf..d31db7af9f85 100644
--- a/metadata/md5-cache/app-vim/vimpython-1.13-r2
+++ b/metadata/md5-cache/app-vim/vimpython-1.13-r2
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: A set of menus/shortcuts to work with Python files
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=30
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~alpha amd64 ia64 ppc sparc x86
 LICENSE=vim
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
 _md5_=810469e68552719d48a78a058419e97d
diff --git a/metadata/md5-cache/app-vim/voom-5.1-r1 b/metadata/md5-cache/app-vim/voom-5.1-r1
deleted file mode 100644
index 0e8668d833a8..000000000000
--- a/metadata/md5-cache/app-vim/voom-5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: emulates a two-pane text outliner
-EAPI=6
-HOMEPAGE=https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=CC0-1.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/voom-5.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/voom-5.1.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=14e7a791ad3a19bc94c68bdb973eb829
diff --git a/metadata/md5-cache/app-vim/voom-5.1-r2 b/metadata/md5-cache/app-vim/voom-5.1-r2
new file mode 100644
index 000000000000..0d18daba6cec
--- /dev/null
+++ b/metadata/md5-cache/app-vim/voom-5.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: emulates a two-pane text outliner
+EAPI=6
+HOMEPAGE=https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=CC0-1.0
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/voom-5.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/voom-5.1.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=e0a0550db1378297bf3cf692d83f3d06
diff --git a/metadata/md5-cache/app-vim/voom-5.3 b/metadata/md5-cache/app-vim/voom-5.3
deleted file mode 100644
index cd61f0ec435d..000000000000
--- a/metadata/md5-cache/app-vim/voom-5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: emulates a two-pane text outliner
-EAPI=7
-HOMEPAGE=https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=CC0-1.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) || ( app-editors/vim[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] app-editors/gvim[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/vim-voom/VOoM/archive/v5.3.tar.gz -> voom-5.3.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=7f6e4f577172fb05eed19869f66828fc
diff --git a/metadata/md5-cache/app-vim/voom-5.3-r1 b/metadata/md5-cache/app-vim/voom-5.3-r1
new file mode 100644
index 000000000000..15d7d70dab81
--- /dev/null
+++ b/metadata/md5-cache/app-vim/voom-5.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: emulates a two-pane text outliner
+EAPI=7
+HOMEPAGE=https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=CC0-1.0
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) || ( app-editors/vim[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] app-editors/gvim[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/vim-voom/VOoM/archive/v5.3.tar.gz -> voom-5.3.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=53e1207255086041c2af7fe4a2c8000b
diff --git a/metadata/md5-cache/app-vim/youcompleteme-20130910 b/metadata/md5-cache/app-vim/youcompleteme-20130910
index c2afe2b48c74..534a58958319 100644
--- a/metadata/md5-cache/app-vim/youcompleteme-20130910
+++ b/metadata/md5-cache/app-vim/youcompleteme-20130910
@@ -1,15 +1,15 @@
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) || ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) test? ( python_single_target_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)] ) ) sys-devel/make >=dev-util/cmake-3.9.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a code-completion engine for Vim
 EAPI=5
 HOMEPAGE=https://valloric.github.io/YouCompleteMe/
-IUSE=+clang test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+clang test +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) || ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/vim/youcompleteme-20130910.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8ad11cd3802eae63abe1ba1a8b360db
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f0db0ed9dc834425629ee61c8afc54b6
diff --git a/metadata/md5-cache/app-vim/youcompleteme-99999999 b/metadata/md5-cache/app-vim/youcompleteme-99999999
index bf19200be9e8..0a104e18fb38 100644
--- a/metadata/md5-cache/app-vim/youcompleteme-99999999
+++ b/metadata/md5-cache/app-vim/youcompleteme-99999999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) dev-libs/boost[python,threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-cpp/gtest-1.8.0 ) sys-devel/make >=dev-util/cmake-3.9.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) python_single_target_python2_7? ( dev-libs/boost[python,threads,python_targets_python2_7(-)] ) || ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) test? ( python_single_target_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)] ) >=dev-cpp/gtest-1.8.0 ) sys-devel/make >=dev-util/cmake-3.9.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=vim plugin: a code-completion engine for Vim
 EAPI=5
 HOMEPAGE=https://valloric.github.io/YouCompleteMe/
-IUSE=+clang test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+clang test +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) dev-libs/boost[python,threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/bottle[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/sh[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/waitress[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) clang? ( >=sys-devel/clang-3.3 ) python_single_target_python2_7? ( dev-libs/boost[python,threads,python_targets_python2_7(-)] ) || ( app-editors/vim[python,python_single_target_python2_7(-)?] app-editors/gvim[python,python_single_target_python2_7(-)?] ) python_single_target_python2_7? ( dev-python/bottle[python_targets_python2_7(-)] virtual/python-futures[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] dev-python/requests[python_targets_python2_7(-)] dev-python/sh[python_targets_python2_7(-)] dev-python/waitress[python_targets_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8cf599eb1d3c5295461be76405f425c5
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a7b000f879dd2c8fd28ed1008a02221
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 2815cf78ae9a..d7aeabe18d53 100644
--- a/metadata/md5-cache/app-xemacs/Manifest.gz
+++ b/metadata/md5-cache/app-xemacs/Manifest.gz
diff --git a/metadata/md5-cache/app-xemacs/ebuild-mode-1.49 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.49
index b507ed4ed81b..65292ad16e0a 100644
--- a/metadata/md5-cache/app-xemacs/ebuild-mode-1.49
+++ b/metadata/md5-cache/app-xemacs/ebuild-mode-1.49
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=amd64 ~hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.49.tar.xz
-_md5_=e687b82df2b6f85c3fe744d0897afad8
+_md5_=d908082f0fad867d89a051eb3a4e5a06
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index f633b8099eeb..21465eb35bca 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/gnat-suite-bin-2019 b/metadata/md5-cache/dev-ada/gnat-suite-bin-2019
new file mode 100644
index 000000000000..e0a025a8035c
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gnat-suite-bin-2019
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=GNAT Ada suite
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/
+KEYWORDS=~amd64
+LICENSE=GPL-2 GPL-3
+RDEPEND=sys-devel/binutils sys-devel/gdb
+SLOT=2019
+SRC_URI=https://dev.gentoo.org/~tupone/distfiles/gnat-suite-bin-2019.txz
+_md5_=2cbcb366b868564a2469f53c0d5e0b17
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1
index 409154c8814d..cfe11d55eb2c 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2019-r1
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=gmp iconv python readline +shared static-libs static-pic syslog ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,shared?,static-libs?,static-pic?] gmp? ( dev-libs/gmp:* )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8afa31e87a8f1d425054 -> gnatcoll-bindings-2019-20190430-1928C-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3839d4c33029b82ac115cb3a87b55b06
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-db-2019 b/metadata/md5-cache/dev-ada/gnatcoll-db-2019
index c18ae96709ae..f24ca7db204d 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-db-2019
+++ b/metadata/md5-cache/dev-ada/gnatcoll-db-2019
@@ -4,12 +4,12 @@ DEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,a
 DESCRIPTION=GNAT Component Collection
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
-IUSE=db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=db2ada gnatinspect postgres +shared sql sqlite static-libs static-pic xref ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/gnatcoll-core[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,shared?,static-libs?,static-pic?] sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql:* ) xref? ( dev-ada/gnatcoll-bindings[ada_target_gnat_2016(-)?,ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,iconv,shared?,static-libs?,static-pic?] ) ada_target_gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) db2ada? ( sql ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=gnatinspect? ( xref ) xref? ( sqlite ) sqlite? ( sql ) db2ada? ( sql ) ^^ ( ada_target_gnat_2016 ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 ) ^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/gnatcoll-db/archive/fbc46346dc67dfa83ae5132ef72fdd64fbe7e199.tar.gz -> gnatcoll-db-2019-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=084f4c8fb0d763f091a7fe791231558a
diff --git a/metadata/md5-cache/dev-ada/gps-2018-r2 b/metadata/md5-cache/dev-ada/gps-2018-r2
deleted file mode 100644
index 1af25b4ceed7..000000000000
--- a/metadata/md5-cache/dev-ada/gps-2018-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),python] ~dev-ada/gtkada-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] ~dev-ada/libadalang-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=The GNAT Programming Studio
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/tools/gps/
-IUSE=ada_target_gnat_2018 -ada_target_gnat_2016 -ada_target_gnat_2017 -ada_target_gnat_2019 +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),python] ~dev-ada/gtkada-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] ~dev-ada/libadalang-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ada_target_gnat_2018
-RESTRICT=test
-SLOT=0
-SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb -> gps-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> gtk+-3.14.15-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1fee0d66e73628e0e8fef663e511ef82
diff --git a/metadata/md5-cache/dev-ada/gps-2018-r3 b/metadata/md5-cache/dev-ada/gps-2018-r3
new file mode 100644
index 000000000000..df181f07691f
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gps-2018-r3
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),python] ~dev-ada/gtkada-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] ~dev-ada/libadalang-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme python_single_target_python2_7? ( dev-python/pep8[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] )
+DESCRIPTION=The GNAT Programming Studio
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/tools/gps/
+IUSE=ada_target_gnat_2018 -ada_target_gnat_2016 -ada_target_gnat_2017 -ada_target_gnat_2019 +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-),python] ~dev-ada/gtkada-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] ~dev-ada/libadalang-2018[ada_target_gnat_2018(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),-ada_target_gnat_2019(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme python_single_target_python2_7? ( dev-python/pep8[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ada_target_gnat_2018
+RESTRICT=test
+SLOT=0
+SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb -> gps-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a59 -> libadalang-tools-gpl-2018-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> gtk+-3.14.15-src.tar.gz
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5e7d682715e0f14090f8789bdd3093fd
diff --git a/metadata/md5-cache/dev-ada/gps-2019 b/metadata/md5-cache/dev-ada/gps-2019
deleted file mode 100644
index 5e881c270289..000000000000
--- a/metadata/md5-cache/dev-ada/gps-2019
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),python] ~dev-ada/gtkada-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] ~dev-ada/libadalang-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=The GNAT Programming Studio
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/tools/gps/
-IUSE=ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),python] ~dev-ada/gtkada-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] ~dev-ada/libadalang-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme dev-python/pep8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/AdaCore/gps/archive/8606676b6b4fb245faad5e91127b15c2e61174e9.tar.gz -> gps-gpl-2019-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f -> libadalang-tools-2019-20190517-195C4-src.tar.gz https://github.com/AdaCore/ada_language_server/archive/286f2d6bb14ccd4583034b26fd923e1b80cf522c.tar.gz -> ada_language_server-2019-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> gtk+-3.14.15-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e73dd93045288543b95bfb3bb17bc77a
diff --git a/metadata/md5-cache/dev-ada/gps-2019-r1 b/metadata/md5-cache/dev-ada/gps-2019-r1
new file mode 100644
index 000000000000..1afae91ff92b
--- /dev/null
+++ b/metadata/md5-cache/dev-ada/gps-2019-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),python] ~dev-ada/gtkada-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] ~dev-ada/libadalang-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme python_single_target_python2_7? ( dev-python/pep8[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] )
+DESCRIPTION=The GNAT Programming Studio
+EAPI=7
+HOMEPAGE=http://libre.adacore.com/tools/gps/
+IUSE=ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-db[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),db2ada,gnatinspect,xref] dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),python] ~dev-ada/gtkada-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] ~dev-ada/libadalang-2019[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] dev-libs/gobject-introspection dev-libs/libffi sys-devel/llvm:7 sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme python_single_target_python2_7? ( dev-python/pep8[python_targets_python2_7(-)] dev-python/jedi[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AdaCore/gps/archive/8606676b6b4fb245faad5e91127b15c2e61174e9.tar.gz -> gps-gpl-2019-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8f4e31e87a8f1d42509f -> libadalang-tools-2019-20190517-195C4-src.tar.gz https://github.com/AdaCore/ada_language_server/archive/286f2d6bb14ccd4583034b26fd923e1b80cf522c.tar.gz -> ada_language_server-2019-src.tar.gz http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a61 -> gtk+-3.14.15-src.tar.gz
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ff777e860b577ae70051ff0cbd69850d
diff --git a/metadata/md5-cache/dev-ada/langkit-2018 b/metadata/md5-cache/dev-ada/langkit-2018
index 8494a87caf62..608170540312 100644
--- a/metadata/md5-cache/dev-ada/langkit-2018
+++ b/metadata/md5-cache/dev-ada/langkit-2018
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A Python framework to generate language parsers
 EAPI=6
 HOMEPAGE=https://www.adacore.com/community
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako dev-python/pyyaml <dev-python/pyyaml-5 dev-python/enum34 dev-python/funcy dev-python/docutils dev-python/quex
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a -> langkit-gpl-2018.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=47c55b2b45b7d29e44008a755f8fcf68
diff --git a/metadata/md5-cache/dev-ada/langkit-2019 b/metadata/md5-cache/dev-ada/langkit-2019
index f0868b1da954..d55a178e1b51 100644
--- a/metadata/md5-cache/dev-ada/langkit-2019
+++ b/metadata/md5-cache/dev-ada/langkit-2019
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A Python framework to generate language parsers
 EAPI=7
 HOMEPAGE=https://www.adacore.com/community
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako <dev-python/pyyaml-5 dev-python/enum34 dev-python/funcy dev-python/docutils
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8f8a31e87a8f1c967d31 -> langkit-2019-20190510-19B8C-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=04c23e392315f1e1a163d2f5c029a3f7
diff --git a/metadata/md5-cache/dev-ada/libadalang-2018-r2 b/metadata/md5-cache/dev-ada/libadalang-2018-r2
index 7e6412e04aad..123dcdad2ad6 100644
--- a/metadata/md5-cache/dev-ada/libadalang-2018-r2
+++ b/metadata/md5-cache/dev-ada/libadalang-2018-r2
@@ -3,12 +3,12 @@ DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2017(-)?,ada_
 DESCRIPTION=high performance semantic engine for the Ada programming language
 EAPI=7
 HOMEPAGE=https://libre.adacore.com/
-IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+shared static-libs ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
 RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2017(-)?,ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),iconv,shared=,static-libs=] ada_target_gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ^^ ( ada_target_gnat_2017 ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18 -> libadalang-gpl-2018-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f05e08fd180902a227e67236e7f2befa
diff --git a/metadata/md5-cache/dev-ada/libadalang-2019-r1 b/metadata/md5-cache/dev-ada/libadalang-2019-r1
index 93c91e8fc015..1363efc773e4 100644
--- a/metadata/md5-cache/dev-ada/libadalang-2019-r1
+++ b/metadata/md5-cache/dev-ada/libadalang-2019-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),iconv,shared=,static-libs=] ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gprbuild[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] >=dev-ada/langkit-2019
+DEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),gmp,iconv,shared=,static-libs=] ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-ada/gprbuild[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-)] >=dev-ada/langkit-2019
 DESCRIPTION=high performance semantic engine for the Ada programming language
 EAPI=7
 HOMEPAGE=https://libre.adacore.com/
-IUSE=+shared static-libs ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+shared static-libs ada_target_gnat_2018 ada_target_gnat_2019 -ada_target_gnat_2016 -ada_target_gnat_2017 +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
-RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),iconv,shared=,static-libs=] ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
+RDEPEND=dev-python/pyyaml dev-ada/gnatcoll-bindings[ada_target_gnat_2018(-)?,ada_target_gnat_2019(-)?,-ada_target_gnat_2016(-),-ada_target_gnat_2017(-),gmp,iconv,shared=,static-libs=] ada_target_gnat_2018? ( dev-lang/gnat-gpl:7.3.1 ) ada_target_gnat_2019? ( dev-lang/gnat-gpl:8.3.1 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) ^^ ( ada_target_gnat_2018 ada_target_gnat_2019 )
 SLOT=0
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf8f3331e87a8f1c967d27 -> libadalang-2019-20190510-19916-src.tar.gz
-_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=50b4fcf5ee25b1cdb82ab35974966377
+_eclasses_=ada	9205d12ceb057a9282bea2a773e7c681	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=01dc9afde31ee0bd7da82ec7ccfe2589
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 9ebada844ef1..c68fb69bd309 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/atkmm-2.28.0 b/metadata/md5-cache/dev-cpp/atkmm-2.28.0
index 79e52e5960dc..797462e3e073 100644
--- a/metadata/md5-cache/dev-cpp/atkmm-2.28.0
+++ b/metadata/md5-cache/dev-cpp/atkmm-2.28.0
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for the ATK library
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-cpp/gtkmm-2.22.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/atkmm/2.28/atkmm-2.28.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=74b65c37a27b0fe78d48ed7a7746d87f
+_md5_=55402b00c657bcc680f96aab711b5ff2
diff --git a/metadata/md5-cache/dev-cpp/catch-1.12.2 b/metadata/md5-cache/dev-cpp/catch-1.12.2
index 56da0beb2be6..fd44f293b1cf 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.12.2
+++ b/metadata/md5-cache/dev-cpp/catch-1.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
 HOMEPAGE=https://github.com/catchorg/Catch2
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=Boost-1.0
 RDEPEND=!<dev-cpp/catch-1.12.2:0
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/catchorg/Catch2/archive/v1.12.2.tar.gz -> Catch-1.12.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7538ca2573e4570a5f71eb331c1cbe0b
+_md5_=00086a79cd26692511b109fb840fc8ab
diff --git a/metadata/md5-cache/dev-cpp/catch-1.9999 b/metadata/md5-cache/dev-cpp/catch-1.9999
index c923d46ced63..2f7458f4e66b 100644
--- a/metadata/md5-cache/dev-cpp/catch-1.9999
+++ b/metadata/md5-cache/dev-cpp/catch-1.9999
@@ -10,4 +10,4 @@ RDEPEND=!<dev-cpp/catch-1.12.2:0
 RESTRICT=!test? ( test )
 SLOT=1
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f8e4114f4b3960e62c11f8e6da599ef
+_md5_=c99f65d8de15e1009ab10108117d53fb
diff --git a/metadata/md5-cache/dev-cpp/catch-2.5.0 b/metadata/md5-cache/dev-cpp/catch-2.5.0
index b6865d6f233c..d1f37aa818a2 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.5.0
+++ b/metadata/md5-cache/dev-cpp/catch-2.5.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v2.5.0.tar.gz -> Catch2-2.5.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b4eda7c39aeed6d78ec1c1a226a65dc
+_md5_=e8d51f321827f27e5c882328fb714dc2
diff --git a/metadata/md5-cache/dev-cpp/catch-2.7.0 b/metadata/md5-cache/dev-cpp/catch-2.7.0
index 44c2104394f0..23de27e3b7eb 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.7.0
+++ b/metadata/md5-cache/dev-cpp/catch-2.7.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v2.7.0.tar.gz -> Catch2-2.7.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4a91f99b00c7b0860bb9f012d19da1e
+_md5_=2a9fef618942ea755be052197b369874
diff --git a/metadata/md5-cache/dev-cpp/catch-2.9.1 b/metadata/md5-cache/dev-cpp/catch-2.9.1
index bce6b4c900a4..3616d9ba2551 100644
--- a/metadata/md5-cache/dev-cpp/catch-2.9.1
+++ b/metadata/md5-cache/dev-cpp/catch-2.9.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/catchorg/Catch2/archive/v2.9.1.tar.gz -> Catch2-2.9.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4a805f6851de5c0067ac2d15ffe88c1
+_md5_=56ee55fd45be2f084b2d21cb3d758079
diff --git a/metadata/md5-cache/dev-cpp/catch-9999 b/metadata/md5-cache/dev-cpp/catch-9999
index cea75f59d2cc..eaa40d9d761d 100644
--- a/metadata/md5-cache/dev-cpp/catch-9999
+++ b/metadata/md5-cache/dev-cpp/catch-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=Modern C++ header-only framework for unit-tests
 EAPI=7
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4a805f6851de5c0067ac2d15ffe88c1
+_md5_=56ee55fd45be2f084b2d21cb3d758079
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.8.0 b/metadata/md5-cache/dev-cpp/gtest-1.8.0
index 8c34300dd726..eb8e337c343e 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=test? ( || ( dev-lang/python:3.6 ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Google C++ Testing Framework
 EAPI=6
 HOMEPAGE=https://github.com/google/googletest
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 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	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5266ee890fd5e487f77cbf9cdc9944ff
+_md5_=63385566f540551ad3a8a546a966e09f
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 d4f42b80a8dd..ab0ab539d4b8 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=test? ( || ( dev-lang/python:3.6 ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Google C++ Testing Framework
 EAPI=6
 HOMEPAGE=https://github.com/google/googletest
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 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	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7041a85c13d78cd19da53752bbdd3fc
+_md5_=2a6cb7f993336e196d2dc84e1b98e607
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-2.24.5 b/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
index abcb0c8b564c..9d8e0f3a43d7 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
+++ b/metadata/md5-cache/dev-cpp/gtkmm-2.24.5
@@ -4,11 +4,11 @@ DESCRIPTION=C++ interface for GTK+
 EAPI=6
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc examples test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/gtkmm/2.24/gtkmm-2.24.5.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3cfadbc5e681d2a3a401b47d118f9d1
+_md5_=a7211d51a00a5e35c7e9a45fa758f95a
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.24.1 b/metadata/md5-cache/dev-cpp/gtkmm-3.24.1
deleted file mode 100644
index d6e3b5e799d4..000000000000
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.24.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-cpp/glibmm-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig doc? ( media-gfx/graphviz dev-libs/libxslt app-doc/doxygen ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=C++ interface for GTK+
-EAPI=6
-HOMEPAGE=https://www.gtkmm.org
-IUSE=aqua doc test wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-cpp/glibmm-2.54.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/atkmm-2.24.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-REQUIRED_USE=|| ( aqua wayland X )
-RESTRICT=!test? ( test )
-SLOT=3.0
-SRC_URI=mirror://gnome/sources/gtkmm/3.24/gtkmm-3.24.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9335dea675989e74692eba9a866252f
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 54e38b90b926..d6a340a76148 100644
--- a/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
+++ b/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r2
@@ -4,10 +4,10 @@ DESCRIPTION=C++ bindings for libglade
 EAPI=5
 HOMEPAGE=https://www.gtkmm.org
 IUSE=doc examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ppc ppc64 ~sh sparc x86
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39e0e134233da6a75742cc1608be5da1
+_md5_=42a10deda8f3c677d05c6b0977177a24
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0 b/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
index c290d2723b10..ef039ec91125 100644
--- a/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-2.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Guideline Support Library implementation by Microsoft
 EAPI=6
 HOMEPAGE=https://github.com/Microsoft/GSL
 IUSE=test
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Microsoft/GSL/archive/v2.0.0.tar.gz -> ms-gsl-2.0.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc23a83ed4087f123472981571f2e3e1
+_md5_=a1f9cc4a7a5067a63a2a787fde2b935c
diff --git a/metadata/md5-cache/dev-cpp/ms-gsl-2.1.0 b/metadata/md5-cache/dev-cpp/ms-gsl-2.1.0
new file mode 100644
index 000000000000..093c728f9b8d
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/ms-gsl-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/catch:1 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Guideline Support Library implementation by Microsoft
+EAPI=6
+HOMEPAGE=https://github.com/Microsoft/GSL
+IUSE=test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Microsoft/GSL/archive/v2.1.0.tar.gz -> ms-gsl-2.1.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d8368e938ab512d2732a233ac29711b9
diff --git a/metadata/md5-cache/dev-db/4store-1.1.5-r1 b/metadata/md5-cache/dev-db/4store-1.1.5-r1
index 570ece763270..bd5121e31bde 100644
--- a/metadata/md5-cache/dev-db/4store-1.1.5-r1
+++ b/metadata/md5-cache/dev-db/4store-1.1.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/raptor >=dev-libs/rasqal-0.9.18 dev-libs/glib dev-libs/libxml2 dev-libs/libpcre sys-libs/readline sys-libs/ncurses dev-libs/expat sys-libs/zlib
 SLOT=0
 SRC_URI=https://4store.danielknoell.de/download/4store-v1.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08265c23ec6b2c1d343e936f342f763a
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 832b151fcd40..e0464ffde0de 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 44387332e0b0..a2d09c85d67d 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 1937db87c9db..377b014a117b 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 ffc0a03515c3..9f3bf9a34c4c 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18b7043a70251f9f6e6da8a87358d4b0
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.9 b/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.9
index 489c834279e1..62a59d68237a 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.9
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.13.0.9
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.13.0.9/aerospike-server-community-3.13.0.9-debian7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b88c6b6e22054f85335fc8c827f25fc
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.8 b/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.8
index 9e63030efc11..aa43441183c1 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.8
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.14.1.8
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.14.1.8/aerospike-server-community-3.14.1.8-debian7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5b88c6b6e22054f85335fc8c827f25fc
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.4 b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.4
index 3bf7ab0b87c3..ee9f807877df 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.4
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.15.1.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.15.1.4/aerospike-server-community-3.15.1.4-debian7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0770fb13f48a1876b77e917e9b69a31b
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6 b/metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6
index fb13dc3915e4..a875ef01700b 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-3.16.0.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/3.16.0.6/aerospike-server-community-3.16.0.6-debian7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=566b2918ad5230bea201b3aa0249171b
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.1 b/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.1
index f9cb68113042..171a774735cb 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.1
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/4.0.0.1/aerospike-server-community-4.0.0.1-debian7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46b431657340c3c7afeecc2d61fad1cf
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.4 b/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.4
index e60a5b0dda38..2e224b5745d1 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.4
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-4.0.0.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/4.0.0.4/aerospike-server-community-4.0.0.4-debian7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=46b431657340c3c7afeecc2d61fad1cf
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-4.1.0.1 b/metadata/md5-cache/dev-db/aerospike-server-community-4.1.0.1
index 79e6a952179c..18e1c698d2ac 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-4.1.0.1
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-4.1.0.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=sys-libs/readline:0 sys-libs/zlib dev-libs/openssl:0
 SLOT=0
 SRC_URI=http://www.aerospike.com/artifacts/aerospike-server-community/4.1.0.1/aerospike-server-community-4.1.0.1-debian7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56edbd9b6d9cf7ca96d8b28b43799e2a
diff --git a/metadata/md5-cache/dev-db/aerospike-server-community-9999 b/metadata/md5-cache/dev-db/aerospike-server-community-9999
index b1b3b472732b..d22bcc5363c4 100644
--- a/metadata/md5-cache/dev-db/aerospike-server-community-9999
+++ b/metadata/md5-cache/dev-db/aerospike-server-community-9999
@@ -8,5 +8,5 @@ LICENSE=AGPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/jansson dev-libs/jemalloc
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9eef3ca60d15540532ef846e925f0435
diff --git a/metadata/md5-cache/dev-db/barman-2.10 b/metadata/md5-cache/dev-db/barman-2.10
index 7c86354165e6..d91ffec9a124 100644
--- a/metadata/md5-cache/dev-db/barman-2.10
+++ b/metadata/md5-cache/dev-db/barman-2.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/boto[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/pgbarman/2.10/barman-2.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6ac2b2bf5a4bb23c88a996d0a3df0a80
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1 b/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
index fc86bb8e28ef..fc2ee6584824 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-18.10.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b5e811969916d344a3638a3d6819afa
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1 b/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
index 88d7c0e00d0c..c5ea738dd676 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-18.12.17-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=90811aa5f18b7c5d75d1c106351ba907
diff --git a/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1 b/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
index ef2599c42597..1be55c4f28e8 100644
--- a/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-18.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6445a1ff93cd1e89ee18e9bab5c8fe59
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2 b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
index 6449116f4c64..d81cb425215a 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
+++ b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.13.1.11-stable.zip -> clickhouse-19.13.1.11.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34285a44e568392440e06a3c6b50e4e8
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3 b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
index a7cb5f59ac32..68cd8e4fc0c9 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
+++ b/metadata/md5-cache/dev-db/clickhouse-19.13.1.11-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.13.1.11-stable.zip -> clickhouse-19.13.1.11.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3acb3d8a863144a78d04cbd641f5b1fb
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.15.2.2 b/metadata/md5-cache/dev-db/clickhouse-19.15.2.2
index 582620e90d0d..cd4c237dc484 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.15.2.2
+++ b/metadata/md5-cache/dev-db/clickhouse-19.15.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.15.2.2-stable.zip -> clickhouse-19.15.2.2.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0fbba2c0d27820c7e6a0de0ba07979d3
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1 b/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
index c6f43fd4fc1a..d05d63d5c71c 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-19.5.3.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.5.3.8-stable.zip -> clickhouse-19.5.3.8.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7831284a37f7b04096c53c7051d08d9d
diff --git a/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1 b/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
index 56cbda5218a8..48ff996037bf 100644
--- a/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
+++ b/metadata/md5-cache/dev-db/clickhouse-19.9.5.36-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=server? ( cpu_flags_x86_sse4_2 ) static? ( client server tools )
 RESTRICT=!test? ( test )
 SLOT=0/stable
 SRC_URI=https://github.com/yandex/ClickHouse/archive/v19.9.5.36-stable.zip -> clickhouse-19.9.5.36.zip https://github.com/google/cctz/archive/4f9776a.tar.gz -> cctz-4f9776a.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7831284a37f7b04096c53c7051d08d9d
diff --git a/metadata/md5-cache/dev-db/cockroach-19.1.1 b/metadata/md5-cache/dev-db/cockroach-19.1.1
index bccd0bc62d8b..752bbbc0dd76 100644
--- a/metadata/md5-cache/dev-db/cockroach-19.1.1
+++ b/metadata/md5-cache/dev-db/cockroach-19.1.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Cockroach Apache-2.0
 SLOT=0
 SRC_URI=https://binaries.cockroachdb.com/cockroach-v19.1.1.src.tgz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0ddcc8c3dedadf84dfee1429c331d89e
diff --git a/metadata/md5-cache/dev-db/cockroach-2.1.5 b/metadata/md5-cache/dev-db/cockroach-2.1.5
index 011714899210..c2617a285694 100644
--- a/metadata/md5-cache/dev-db/cockroach-2.1.5
+++ b/metadata/md5-cache/dev-db/cockroach-2.1.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Cockroach Apache-2.0
 SLOT=0
 SRC_URI=https://binaries.cockroachdb.com/cockroach-v2.1.5.src.tgz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5d463d1d71238c798ac4b5ce271b31c8
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.17 b/metadata/md5-cache/dev-db/etcd-3.3.17
index abdf6ccb6e53..cf9a4db86ff5 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.17
+++ b/metadata/md5-cache/dev-db/etcd-3.3.17
@@ -10,5 +10,5 @@ RDEPEND=!dev-db/etcdctl
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.3.17.tar.gz -> etcd-3.3.17.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=27399959da17faa9f7c54ea7246694ff
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.18 b/metadata/md5-cache/dev-db/etcd-3.3.18
index 744acd600431..498693f87d0d 100644
--- a/metadata/md5-cache/dev-db/etcd-3.3.18
+++ b/metadata/md5-cache/dev-db/etcd-3.3.18
@@ -10,5 +10,5 @@ RDEPEND=!dev-db/etcdctl
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/coreos/etcd/archive/v3.3.18.tar.gz -> etcd-3.3.18.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0c53f7adca9f485705ae5a5966020748
diff --git a/metadata/md5-cache/dev-db/etcd-3.4.3 b/metadata/md5-cache/dev-db/etcd-3.4.3
index 3557e03800c9..94fadcc11a0e 100644
--- a/metadata/md5-cache/dev-db/etcd-3.4.3
+++ b/metadata/md5-cache/dev-db/etcd-3.4.3
@@ -10,5 +10,5 @@ RDEPEND=!dev-db/etcdctl
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/etcd-io/etcd/archive/v3.4.3.tar.gz -> etcd-3.4.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e50d1ba9a6e20de2e2357a44c9d50f49
diff --git a/metadata/md5-cache/dev-db/firebird-3.0.4.33054.0 b/metadata/md5-cache/dev-db/firebird-3.0.4.33054.0
index 726852d81568..66f66acf34a0 100644
--- a/metadata/md5-cache/dev-db/firebird-3.0.4.33054.0
+++ b/metadata/md5-cache/dev-db/firebird-3.0.4.33054.0
@@ -10,5 +10,5 @@ LICENSE=IDPL Interbase-1.0
 RDEPEND=dev-libs/icu:= dev-libs/libedit dev-libs/libtommath xinetd? ( virtual/inetd ) !sys-cluster/ganglia
 SLOT=0
 SRC_URI=https://github.com/FirebirdSQL/firebird/releases/download/R3_0_4/Firebird-3.0.4.33054-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=378da9d5046b0250ed186233814303cd
diff --git a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2 b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
index 9e13a2c50082..25c2160897bc 100644
--- a/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
+++ b/metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
@@ -10,5 +10,5 @@ RDEPEND=java-virtuals/servlet-api:2.5 >=virtual/jre-1.5 >=dev-java/java-config-2
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/hsqldb/hsqldb_1_8_1_3.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2718cb76eb522285492691255f28ec22
diff --git a/metadata/md5-cache/dev-db/influxdb-1.5.1 b/metadata/md5-cache/dev-db/influxdb-1.5.1
index 45df52a56e53..15254dfbdffd 100644
--- a/metadata/md5-cache/dev-db/influxdb-1.5.1
+++ b/metadata/md5-cache/dev-db/influxdb-1.5.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/influxdb/archive/v1.5.1.tar.gz -> influxdb-1.5.1.tar.gz https://github.com/collectd/go-collectd/archive/e84e8af5356e7f47485bbc95c96da6dd7984a67e.tar.gz -> github.com-collectd-go-collectd-e84e8af5356e7f47485bbc95c96da6dd7984a67e.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/RoaringBitmap/roaring/archive/cefad6e4f79d4fa5d1d758ff937dde300641ccfa.tar.gz -> github.com-RoaringBitmap-roaring-cefad6e4f79d4fa5d1d758ff937dde300641ccfa.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/bmizerany/pat/archive/c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c.tar.gz -> github.com-bmizerany-pat-c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c.tar.gz https://github.com/boltdb/bolt/archive/4b1ebc1869ad66568b313d0dc410e2be72670dda.tar.gz -> github.com-boltdb-bolt-4b1ebc1869ad66568b313d0dc410e2be72670dda.tar.gz https://github.com/cespare/xxhash/archive/1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b.tar.gz -> github.com-cespare-xxhash-1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/dgrijalva/jwt-go/archive/24c63f56522a87ec5339cc3567883f1039378fdb.tar.gz -> github.com-dgrijalva-jwt-go-24c63f56522a87ec5339cc3567883f1039378fdb.tar.gz https://github.com/dgryski/go-bits/archive/2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef.tar.gz -> github.com-dgryski-go-bits-2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef.tar.gz https://github.com/dgryski/go-bitstream/archive/7d46cd22db7004f0cceb6f7975824b560cf0e486.tar.gz -> github.com-dgryski-go-bitstream-7d46cd22db7004f0cceb6f7975824b560cf0e486.tar.gz https://github.com/glycerine/go-unsnap-stream/archive/62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz -> github.com-glycerine-go-unsnap-stream-62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz https://github.com/gogo/protobuf/archive/1c2b16bc280d6635de6c52fc1471ab962dc36ec9.tar.gz -> github.com-gogo-protobuf-1c2b16bc280d6635de6c52fc1471ab962dc36ec9.tar.gz https://github.com/golang/protobuf/archive/1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz -> github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz https://github.com/golang/snappy/archive/d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz -> github.com-golang-snappy-d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz https://github.com/google/go-cmp/archive/18107e6c56edb2d51f965f7d68e59404f0daee54.tar.gz -> github.com-google-go-cmp-18107e6c56edb2d51f965f7d68e59404f0daee54.tar.gz https://github.com/influxdata/influxql/archive/21ddebb5641365d9b92234e8f5a566c41da9ab48.tar.gz -> github.com-influxdata-influxql-21ddebb5641365d9b92234e8f5a566c41da9ab48.tar.gz https://github.com/influxdata/usage-client/archive/6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz -> github.com-influxdata-usage-client-6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz https://github.com/influxdata/yamux/archive/1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz -> github.com-influxdata-yamux-1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz https://github.com/influxdata/yarpc/archive/036268cdec22b7074cd6d50cc6d7315c667063c7.tar.gz -> github.com-influxdata-yarpc-036268cdec22b7074cd6d50cc6d7315c667063c7.tar.gz https://github.com/jsternberg/zap-logfmt/archive/5ea53862c7fa897f44ae0b3004283308c0b0c9d1.tar.gz -> github.com-jsternberg-zap-logfmt-5ea53862c7fa897f44ae0b3004283308c0b0c9d1.tar.gz https://github.com/jwilder/encoding/archive/27894731927e49b0a9023f00312be26733744815.tar.gz -> github.com-jwilder-encoding-27894731927e49b0a9023f00312be26733744815.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/opentracing/opentracing-go/archive/1361b9cd60be79c4c3a7fa9841b3c132e40066a7.tar.gz -> github.com-opentracing-opentracing-go-1361b9cd60be79c4c3a7fa9841b3c132e40066a7.tar.gz https://github.com/paulbellamy/ratecounter/archive/5a11f585a31379765c190c033b6ad39956584447.tar.gz -> github.com-paulbellamy-ratecounter-5a11f585a31379765c190c033b6ad39956584447.tar.gz https://github.com/peterh/liner/archive/88609521dc4b6c858fd4c98b628147da928ce4ac.tar.gz -> github.com-peterh-liner-88609521dc4b6c858fd4c98b628147da928ce4ac.tar.gz https://github.com/philhofer/fwd/archive/1612a298117663d7bc9a760ae20d383413859798.tar.gz -> github.com-philhofer-fwd-1612a298117663d7bc9a760ae20d383413859798.tar.gz https://github.com/prometheus/client_golang/archive/661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz -> github.com-prometheus-client_golang-661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz -> github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz https://github.com/prometheus/procfs/archive/a6e9df898b1336106c743392c48ee0b71f5c4efa.tar.gz -> github.com-prometheus-procfs-a6e9df898b1336106c743392c48ee0b71f5c4efa.tar.gz https://github.com/retailnext/hllpp/archive/38a7bb71b483e855d35010808143beaf05b67f9d.tar.gz -> github.com-retailnext-hllpp-38a7bb71b483e855d35010808143beaf05b67f9d.tar.gz https://github.com/tinylib/msgp/archive/ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20.tar.gz -> github.com-tinylib-msgp-ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20.tar.gz https://github.com/xlab/treeprint/archive/06dfc6fa17cdde904617990a0c2d89e3e332dbb3.tar.gz -> github.com-xlab-treeprint-06dfc6fa17cdde904617990a0c2d89e3e332dbb3.tar.gz https://github.com/uber-go/atomic/archive/54f72d32435d760d5604f17a82e2435b28dc4ba5.tar.gz -> github.com-uber-go-atomic-54f72d32435d760d5604f17a82e2435b28dc4ba5.tar.gz https://github.com/uber-go/multierr/archive/fb7d312c2c04c34f0ad621048bbb953b168f9ff6.tar.gz -> github.com-uber-go-multierr-fb7d312c2c04c34f0ad621048bbb953b168f9ff6.tar.gz https://github.com/uber-go/zap/archive/35aad584952c3e7020db7b839f6b102de6271f89.tar.gz -> github.com-uber-go-zap-35aad584952c3e7020db7b839f6b102de6271f89.tar.gz https://github.com/golang/crypto/archive/9477e0b78b9ac3d0b03822fd95422e2fe07627cd.tar.gz -> github.com-golang-crypto-9477e0b78b9ac3d0b03822fd95422e2fe07627cd.tar.gz https://github.com/golang/net/archive/9dfe39835686865bff950a07b394c12a98ddc811.tar.gz -> github.com-golang-net-9dfe39835686865bff950a07b394c12a98ddc811.tar.gz https://github.com/golang/sync/archive/fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz -> github.com-golang-sync-fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz https://github.com/golang/sys/archive/062cd7e4e68206d8bab9b18396626e855c992658.tar.gz -> github.com-golang-sys-062cd7e4e68206d8bab9b18396626e855c992658.tar.gz https://github.com/golang/text/archive/a71fd10341b064c10f4a81ceac72bcf70f26ea34.tar.gz -> github.com-golang-text-a71fd10341b064c10f4a81ceac72bcf70f26ea34.tar.gz https://github.com/golang/time/archive/6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz -> github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=49ca3070470a789883481974997ca3c8
diff --git a/metadata/md5-cache/dev-db/influxdb-1.6.3 b/metadata/md5-cache/dev-db/influxdb-1.6.3
index bf77d40823d7..4b14b23b19aa 100644
--- a/metadata/md5-cache/dev-db/influxdb-1.6.3
+++ b/metadata/md5-cache/dev-db/influxdb-1.6.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/influxdb/archive/v1.6.3.tar.gz -> influxdb-1.6.3.tar.gz https://github.com/collectd/go-collectd/archive/e84e8af5356e7f47485bbc95c96da6dd7984a67e.tar.gz -> github.com-collectd-go-collectd-e84e8af5356e7f47485bbc95c96da6dd7984a67e.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/RoaringBitmap/roaring/archive/cefad6e4f79d4fa5d1d758ff937dde300641ccfa.tar.gz -> github.com-RoaringBitmap-roaring-cefad6e4f79d4fa5d1d758ff937dde300641ccfa.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/bmizerany/pat/archive/c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c.tar.gz -> github.com-bmizerany-pat-c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c.tar.gz https://github.com/boltdb/bolt/archive/4b1ebc1869ad66568b313d0dc410e2be72670dda.tar.gz -> github.com-boltdb-bolt-4b1ebc1869ad66568b313d0dc410e2be72670dda.tar.gz https://github.com/cespare/xxhash/archive/1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b.tar.gz -> github.com-cespare-xxhash-1b6d2e40c16ba0dfce5c8eac2480ad6e7394819b.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/dgrijalva/jwt-go/archive/24c63f56522a87ec5339cc3567883f1039378fdb.tar.gz -> github.com-dgrijalva-jwt-go-24c63f56522a87ec5339cc3567883f1039378fdb.tar.gz https://github.com/dgryski/go-bits/archive/2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef.tar.gz -> github.com-dgryski-go-bits-2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef.tar.gz https://github.com/dgryski/go-bitstream/archive/7d46cd22db7004f0cceb6f7975824b560cf0e486.tar.gz -> github.com-dgryski-go-bitstream-7d46cd22db7004f0cceb6f7975824b560cf0e486.tar.gz https://github.com/glycerine/go-unsnap-stream/archive/62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz -> github.com-glycerine-go-unsnap-stream-62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz https://github.com/gogo/protobuf/archive/1c2b16bc280d6635de6c52fc1471ab962dc36ec9.tar.gz -> github.com-gogo-protobuf-1c2b16bc280d6635de6c52fc1471ab962dc36ec9.tar.gz https://github.com/golang/protobuf/archive/1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz -> github.com-golang-protobuf-1e59b77b52bf8e4b449a57e6f79f21226d571845.tar.gz https://github.com/golang/snappy/archive/d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz -> github.com-golang-snappy-d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz https://github.com/google/go-cmp/archive/18107e6c56edb2d51f965f7d68e59404f0daee54.tar.gz -> github.com-google-go-cmp-18107e6c56edb2d51f965f7d68e59404f0daee54.tar.gz https://github.com/influxdata/influxql/archive/21ddebb5641365d9b92234e8f5a566c41da9ab48.tar.gz -> github.com-influxdata-influxql-21ddebb5641365d9b92234e8f5a566c41da9ab48.tar.gz https://github.com/influxdata/usage-client/archive/6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz -> github.com-influxdata-usage-client-6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz https://github.com/influxdata/yamux/archive/1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz -> github.com-influxdata-yamux-1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz https://github.com/influxdata/yarpc/archive/036268cdec22b7074cd6d50cc6d7315c667063c7.tar.gz -> github.com-influxdata-yarpc-036268cdec22b7074cd6d50cc6d7315c667063c7.tar.gz https://github.com/jsternberg/zap-logfmt/archive/5ea53862c7fa897f44ae0b3004283308c0b0c9d1.tar.gz -> github.com-jsternberg-zap-logfmt-5ea53862c7fa897f44ae0b3004283308c0b0c9d1.tar.gz https://github.com/jwilder/encoding/archive/27894731927e49b0a9023f00312be26733744815.tar.gz -> github.com-jwilder-encoding-27894731927e49b0a9023f00312be26733744815.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/opentracing/opentracing-go/archive/1361b9cd60be79c4c3a7fa9841b3c132e40066a7.tar.gz -> github.com-opentracing-opentracing-go-1361b9cd60be79c4c3a7fa9841b3c132e40066a7.tar.gz https://github.com/paulbellamy/ratecounter/archive/5a11f585a31379765c190c033b6ad39956584447.tar.gz -> github.com-paulbellamy-ratecounter-5a11f585a31379765c190c033b6ad39956584447.tar.gz https://github.com/peterh/liner/archive/88609521dc4b6c858fd4c98b628147da928ce4ac.tar.gz -> github.com-peterh-liner-88609521dc4b6c858fd4c98b628147da928ce4ac.tar.gz https://github.com/philhofer/fwd/archive/1612a298117663d7bc9a760ae20d383413859798.tar.gz -> github.com-philhofer-fwd-1612a298117663d7bc9a760ae20d383413859798.tar.gz https://github.com/prometheus/client_golang/archive/661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz -> github.com-prometheus-client_golang-661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz -> github.com-prometheus-common-2e54d0b93cba2fd133edc32211dcc32c06ef72ca.tar.gz https://github.com/prometheus/procfs/archive/a6e9df898b1336106c743392c48ee0b71f5c4efa.tar.gz -> github.com-prometheus-procfs-a6e9df898b1336106c743392c48ee0b71f5c4efa.tar.gz https://github.com/retailnext/hllpp/archive/38a7bb71b483e855d35010808143beaf05b67f9d.tar.gz -> github.com-retailnext-hllpp-38a7bb71b483e855d35010808143beaf05b67f9d.tar.gz https://github.com/tinylib/msgp/archive/ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20.tar.gz -> github.com-tinylib-msgp-ad0ff2e232ad2e37faf67087fb24bf8d04a8ce20.tar.gz https://github.com/xlab/treeprint/archive/06dfc6fa17cdde904617990a0c2d89e3e332dbb3.tar.gz -> github.com-xlab-treeprint-06dfc6fa17cdde904617990a0c2d89e3e332dbb3.tar.gz https://github.com/uber-go/atomic/archive/54f72d32435d760d5604f17a82e2435b28dc4ba5.tar.gz -> github.com-uber-go-atomic-54f72d32435d760d5604f17a82e2435b28dc4ba5.tar.gz https://github.com/uber-go/multierr/archive/fb7d312c2c04c34f0ad621048bbb953b168f9ff6.tar.gz -> github.com-uber-go-multierr-fb7d312c2c04c34f0ad621048bbb953b168f9ff6.tar.gz https://github.com/uber-go/zap/archive/35aad584952c3e7020db7b839f6b102de6271f89.tar.gz -> github.com-uber-go-zap-35aad584952c3e7020db7b839f6b102de6271f89.tar.gz https://github.com/golang/crypto/archive/9477e0b78b9ac3d0b03822fd95422e2fe07627cd.tar.gz -> github.com-golang-crypto-9477e0b78b9ac3d0b03822fd95422e2fe07627cd.tar.gz https://github.com/golang/net/archive/9dfe39835686865bff950a07b394c12a98ddc811.tar.gz -> github.com-golang-net-9dfe39835686865bff950a07b394c12a98ddc811.tar.gz https://github.com/golang/sync/archive/fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz -> github.com-golang-sync-fd80eb99c8f653c847d294a001bdf2a3a6f768f5.tar.gz https://github.com/golang/sys/archive/062cd7e4e68206d8bab9b18396626e855c992658.tar.gz -> github.com-golang-sys-062cd7e4e68206d8bab9b18396626e855c992658.tar.gz https://github.com/golang/text/archive/a71fd10341b064c10f4a81ceac72bcf70f26ea34.tar.gz -> github.com-golang-text-a71fd10341b064c10f4a81ceac72bcf70f26ea34.tar.gz https://github.com/golang/time/archive/6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz -> github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=49ca3070470a789883481974997ca3c8
diff --git a/metadata/md5-cache/dev-db/influxdb-1.6.4 b/metadata/md5-cache/dev-db/influxdb-1.6.4
index 313d586e4eab..f6c47459aed0 100644
--- a/metadata/md5-cache/dev-db/influxdb-1.6.4
+++ b/metadata/md5-cache/dev-db/influxdb-1.6.4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/influxdb/archive/v1.6.4.tar.gz -> influxdb-1.6.4.tar.gz https://github.com/collectd/go-collectd/archive/2ce144541b8903101fb8f1483cc0497a68798122.tar.gz -> github.com-collectd-go-collectd-2ce144541b8903101fb8f1483cc0497a68798122.tar.gz https://github.com/BurntSushi/toml/archive/a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz -> github.com-BurntSushi-toml-a368813c5e648fee92e5f6c30e3944ff9d5e8895.tar.gz https://github.com/RoaringBitmap/roaring/archive/d6540aab65a17321470b1661bfc52da1823871e9.tar.gz -> github.com-RoaringBitmap-roaring-d6540aab65a17321470b1661bfc52da1823871e9.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/bmizerany/pat/archive/6226ea591a40176dd3ff9cd8eff81ed6ca721a00.tar.gz -> github.com-bmizerany-pat-6226ea591a40176dd3ff9cd8eff81ed6ca721a00.tar.gz https://github.com/boltdb/bolt/archive/2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8.tar.gz -> github.com-boltdb-bolt-2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8.tar.gz https://github.com/cespare/xxhash/archive/5c37fe3735342a2e0d01c87a907579987c8936cc.tar.gz -> github.com-cespare-xxhash-5c37fe3735342a2e0d01c87a907579987c8936cc.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/dgryski/go-bitstream/archive/9f22ccc24718d9643ac427c8c897ae1a01575783.tar.gz -> github.com-dgryski-go-bitstream-9f22ccc24718d9643ac427c8c897ae1a01575783.tar.gz https://github.com/glycerine/go-unsnap-stream/archive/62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz -> github.com-glycerine-go-unsnap-stream-62a9a9eb44fd8932157b1a8ace2149eff5971af6.tar.gz https://github.com/gogo/protobuf/archive/1adfc126b41513cc696b209667c8656ea7aac67c.tar.gz -> github.com-gogo-protobuf-1adfc126b41513cc696b209667c8656ea7aac67c.tar.gz https://github.com/golang/protobuf/archive/925541529c1fa6821df4e44ce2723319eb2be768.tar.gz -> github.com-golang-protobuf-925541529c1fa6821df4e44ce2723319eb2be768.tar.gz https://github.com/golang/snappy/archive/d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz -> github.com-golang-snappy-d9eb7a3d35ec988b8585d4a0068e462c27d28380.tar.gz https://github.com/google/go-cmp/archive/3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz -> github.com-google-go-cmp-3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz https://github.com/influxdata/influxql/archive/a7267bff5327e316e54c54342b0bc9598753e3d5.tar.gz -> github.com-influxdata-influxql-a7267bff5327e316e54c54342b0bc9598753e3d5.tar.gz https://github.com/influxdata/usage-client/archive/6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz -> github.com-influxdata-usage-client-6d3895376368aa52a3a81d2a16e90f0f52371967.tar.gz https://github.com/influxdata/yamux/archive/1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz -> github.com-influxdata-yamux-1f58ded512de5feabbe30b60c7d33a7a896c5f16.tar.gz https://github.com/influxdata/yarpc/archive/f0da2db138cad2fb425541938fc28dd5a5bc6918.tar.gz -> github.com-influxdata-yarpc-f0da2db138cad2fb425541938fc28dd5a5bc6918.tar.gz https://github.com/jsternberg/zap-logfmt/archive/ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6.tar.gz -> github.com-jsternberg-zap-logfmt-ac4bd917e18a4548ce6e0e765b29a4e7f397b0b6.tar.gz https://github.com/jwilder/encoding/archive/b4e1701a28efcc637d9afcca7d38e495fe909a09.tar.gz -> github.com-jwilder-encoding-b4e1701a28efcc637d9afcca7d38e495fe909a09.tar.gz https://github.com/klauspost/compress/archive/6c8db69c4b49dd4df1fff66996cf556176d0b9bf.tar.gz -> github.com-klauspost-compress-6c8db69c4b49dd4df1fff66996cf556176d0b9bf.tar.gz https://github.com/klauspost/cpuid/archive/ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da.tar.gz -> github.com-klauspost-cpuid-ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da.tar.gz https://github.com/klauspost/crc32/archive/cb6bfca970f6908083f26f39a79009d608efd5cd.tar.gz -> github.com-klauspost-crc32-cb6bfca970f6908083f26f39a79009d608efd5cd.tar.gz https://github.com/klauspost/pgzip/archive/0bf5dcad4ada2814c3c00f996a982270bb81a506.tar.gz -> github.com-klauspost-pgzip-0bf5dcad4ada2814c3c00f996a982270bb81a506.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/3247c84500bff8d9fb6d579d800f20b3e091582c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-3247c84500bff8d9fb6d579d800f20b3e091582c.tar.gz https://github.com/mschoch/smat/archive/90eadee771aeab36e8bf796039b8c261bebebe4f.tar.gz -> github.com-mschoch-smat-90eadee771aeab36e8bf796039b8c261bebebe4f.tar.gz https://github.com/opentracing/opentracing-go/archive/328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz -> github.com-opentracing-opentracing-go-328fceb7548c744337cd010914152b74eaf4c4ab.tar.gz https://github.com/paulbellamy/ratecounter/archive/524851a93235ac051e3540563ed7909357fe24ab.tar.gz -> github.com-paulbellamy-ratecounter-524851a93235ac051e3540563ed7909357fe24ab.tar.gz https://github.com/peterh/liner/archive/6106ee4fe3e8435f18cd10e34557e5e50f0e792a.tar.gz -> github.com-peterh-liner-6106ee4fe3e8435f18cd10e34557e5e50f0e792a.tar.gz https://github.com/philhofer/fwd/archive/bb6d471dc95d4fe11e432687f8b70ff496cf3136.tar.gz -> github.com-philhofer-fwd-bb6d471dc95d4fe11e432687f8b70ff496cf3136.tar.gz https://github.com/prometheus/client_golang/archive/661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz -> github.com-prometheus-client_golang-661e31bf844dfca9aeba15f27ea8aa0d485ad212.tar.gz https://github.com/prometheus/client_model/archive/99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz -> github.com-prometheus-client_model-99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c.tar.gz https://github.com/prometheus/common/archive/e4aa40a9169a88835b849a6efb71e05dc04b88f0.tar.gz -> github.com-prometheus-common-e4aa40a9169a88835b849a6efb71e05dc04b88f0.tar.gz https://github.com/prometheus/procfs/archive/54d17b57dd7d4a3aa092476596b3f8a933bde349.tar.gz -> github.com-prometheus-procfs-54d17b57dd7d4a3aa092476596b3f8a933bde349.tar.gz https://github.com/retailnext/hllpp/archive/101a6d2f8b52abfc409ac188958e7e7be0116331.tar.gz -> github.com-retailnext-hllpp-101a6d2f8b52abfc409ac188958e7e7be0116331.tar.gz https://github.com/tinylib/msgp/archive/b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1.tar.gz -> github.com-tinylib-msgp-b2b6a672cf1e5b90748f79b8b81fc8c5cf0571a1.tar.gz https://github.com/willf/bitset/archive/d860f346b89450988a379d7d705e83c58d1ea227.tar.gz -> github.com-willf-bitset-d860f346b89450988a379d7d705e83c58d1ea227.tar.gz https://github.com/xlab/treeprint/archive/f3a15cfd24bf976c724324cb6846a8b54b88b639.tar.gz -> github.com-xlab-treeprint-f3a15cfd24bf976c724324cb6846a8b54b88b639.tar.gz https://github.com/uber-go/atomic/archive/8474b86a5a6f79c443ce4b2992817ff32cf208b8.tar.gz -> github.com-uber-go-atomic-8474b86a5a6f79c443ce4b2992817ff32cf208b8.tar.gz https://github.com/uber-go/multierr/archive/3c4937480c32f4c13a875a1829af76c98ca3d40a.tar.gz -> github.com-uber-go-multierr-3c4937480c32f4c13a875a1829af76c98ca3d40a.tar.gz https://github.com/uber-go/zap/archive/35aad584952c3e7020db7b839f6b102de6271f89.tar.gz -> github.com-uber-go-zap-35aad584952c3e7020db7b839f6b102de6271f89.tar.gz https://github.com/golang/crypto/archive/c3a3ad6d03f7a915c0f7e194b7152974bb73d287.tar.gz -> github.com-golang-crypto-c3a3ad6d03f7a915c0f7e194b7152974bb73d287.tar.gz https://github.com/golang/net/archive/92b859f39abd2d91a854c9f9c4621b2f5054a92d.tar.gz -> github.com-golang-net-92b859f39abd2d91a854c9f9c4621b2f5054a92d.tar.gz https://github.com/golang/sync/archive/1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz -> github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz https://github.com/golang/sys/archive/d8e400bc7db4870d786864138af681469693d18c.tar.gz -> github.com-golang-sys-d8e400bc7db4870d786864138af681469693d18c.tar.gz https://github.com/golang/text/archive/f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz -> github.com-golang-text-f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz https://github.com/golang/time/archive/26559e0f760e39c24d730d3224364aef164ee23f.tar.gz -> github.com-golang-time-26559e0f760e39c24d730d3224364aef164ee23f.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=01d816769eb09a654839d723e27b50f1
diff --git a/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1 b/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
index b43efa4d4812..08f9c1256a9b 100644
--- a/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
+++ b/metadata/md5-cache/dev-db/libdbi-drivers-0.9.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The libdbi-drivers project maintains drivers for libdbi
 EAPI=7
 HOMEPAGE=http://libdbi-drivers.sourceforge.net/
 IUSE=doc firebird mysql oci8 postgres +sqlite static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-db/libdbi-0.9.0 firebird? ( dev-db/firebird ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=|| ( mysql postgres sqlite firebird oci8 )
@@ -13,4 +13,4 @@ RESTRICT=firebird? ( bindist )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/libdbi-drivers/libdbi-drivers/libdbi-drivers-0.9.0/libdbi-drivers-0.9.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9b14f77812fa5913eb354dbd71aa7e32
+_md5_=6e6f82c247681e48d602ae464eb97eb1
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.38-r1 b/metadata/md5-cache/dev-db/mariadb-10.1.38-r1
index 806d773900fa..3ffac0fc70d7 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.38-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.38-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) !test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.38/source/mariadb-10.1.38.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2b90f7ed85fbef939c30a03a56dd8f7
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ac24baeacafe72dfcb48096c988f6bd9
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.43 b/metadata/md5-cache/dev-db/mariadb-10.1.43
index 7dd63b18bfb4..4b8303fb36a6 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.43
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.43
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.43/source/mariadb-10.1.43.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=789d8383fe9ebba12dc2d1a320462d29
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3e476d8c0be118730d3dbeade05b5b92
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.44 b/metadata/md5-cache/dev-db/mariadb-10.1.44
index 3b60c8ba45c6..aeb212f7a1a2 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.44
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.44
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.44/source/mariadb-10.1.44.tar.gz mirror://gentoo/mysql-extras-20200203-1749Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20200203-1749Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=496d30f4a76e3be687d1ebfbfeae714e
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e12fe8463e7c30a2687e5ace8b3f5941
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.22-r1 b/metadata/md5-cache/dev-db/mariadb-10.2.22-r1
index 065de9d65cab..d0f0d29d45c2 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.22-r1
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.22-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) !test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.22/source/mariadb-10.2.22.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d42e6ec882e5001d0df69d366daa44d
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78a1af1403fa3e4070039c57ac27a44a
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.29 b/metadata/md5-cache/dev-db/mariadb-10.2.29
index 3057475b42b4..5ede73831135 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.29
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.29
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.29/source/mariadb-10.2.29.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b515cc72c024e279e7d75babed51aa5f
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc4f89ba8fbd9a66f4336a4035fa1df4
diff --git a/metadata/md5-cache/dev-db/mariadb-10.2.31 b/metadata/md5-cache/dev-db/mariadb-10.2.31
index 05df9fce3ac7..d0c8e03335b4 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.31
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.31
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.31/source/mariadb-10.2.31.tar.gz mirror://gentoo/mysql-extras-20200203-1749Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20200203-1749Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84afc8b0990757c6fb4d2b6e276b77d8
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3f2a561df92dbe1031adb8d973cd289
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.20 b/metadata/md5-cache/dev-db/mariadb-10.3.20
index acd4c1d4dd48..0d85cc7270d3 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.20
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.20
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.20/source/mariadb-10.3.20.tar.gz mirror://gentoo/mysql-extras-20190305-2052Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190305-2052Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190305-2052Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5752f4c6cf2c0df3e200d279bb33fa6d
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d57595e6812a136599be8542a114c7b3
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.22 b/metadata/md5-cache/dev-db/mariadb-10.3.22
index 5ad141a4d646..abcdf476dab0 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.22
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.22
@@ -12,5 +12,5 @@ REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.3.22/source/mariadb-10.3.22.tar.gz mirror://gentoo/mysql-extras-20200203-1749Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20200203-1749Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a72d2c446b233c32872efab14fcd19db
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e53a31698cced4837b67049b7b63eb30
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.10 b/metadata/md5-cache/dev-db/mariadb-10.4.10
index 8cbb17e0af3b..ca2efc9d0459 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.10
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.10
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.10/source/mariadb-10.4.10.tar.gz mirror://gentoo/mysql-extras-20190731-2258Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190731-2258Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190731-2258Z.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01519b6954fc59b260832b04b7b263f7
+_md5_=9bc45854c1244f279a26521cc552bf7b
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.12 b/metadata/md5-cache/dev-db/mariadb-10.4.12
index 3ff8200c0247..5f625afb0f27 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.12
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.12
@@ -14,4 +14,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.4.12/source/mariadb-10.4.12.tar.gz mirror://gentoo/mysql-extras-20200203-1749Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20200203-1749Z.tar.bz2
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad6d3a99cb02ea7f82d73b350c597358
+_md5_=fed792600e89ea117315a2e38e1bef07
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.66 b/metadata/md5-cache/dev-db/mariadb-5.5.66
index 1185bb198137..31945a24d9ed 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.66
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.66
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc )
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-5.5.66/source/mariadb-5.5.66.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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32e642a155bb6d40c6d00fecc4064813
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4a0d6245c3cc1f851bd9f5c79aee4be1
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.67 b/metadata/md5-cache/dev-db/mariadb-5.5.67
index 58d129525134..e06d69cbe3ea 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.67
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.67
@@ -12,5 +12,5 @@ REQUIRED_USE=server? ( tokudb? ( jemalloc !tcmalloc ) ) ?? ( tcmalloc jemalloc )
 RESTRICT=!bindist? ( bindist ) libressl? ( test ) !test? ( test )
 SLOT=0/18
 SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-5.5.67/source/mariadb-5.5.67.tar.gz mirror://gentoo/mysql-extras-20200203-1749Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20200203-1749Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20200203-1749Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e83737052cfc0094260e4b3a87a3c98
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6dbc6cfd81d89c26b4d4c27797fe63a8
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
index c340378bb0a8..a3082255ff7d 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9624a4a464b46d8298fd8f898bd295a1
+_md5_=e0519ac99832c7aa478d757733bed6cd
diff --git a/metadata/md5-cache/dev-db/metakit-2.4.9.7-r2 b/metadata/md5-cache/dev-db/metakit-2.4.9.7-r2
index 967910f519aa..203f294eb733 100644
--- a/metadata/md5-cache/dev-db/metakit-2.4.9.7-r2
+++ b/metadata/md5-cache/dev-db/metakit-2.4.9.7-r2
@@ -3,13 +3,13 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Embedded database library
 EAPI=5
 HOMEPAGE=http://www.equi4.com/metakit/
-IUSE=python static tcl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=python static tcl +python_single_target_python2_7
 KEYWORDS=amd64 ppc x86
 LICENSE=MIT
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) tcl? ( >=dev-lang/tcl-8.6:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.equi4.com/pub/mk/metakit-2.4.9.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a9a84210474e571d924c116b6553d797
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.13 b/metadata/md5-cache/dev-db/mongodb-3.6.13
index 42eb944d9be0..aaec6db3b0f4 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.13
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.13
@@ -12,5 +12,5 @@ RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.13.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6eaa06a0981839fb32d9b649e2896a8d
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.14 b/metadata/md5-cache/dev-db/mongodb-3.6.14
index 90f7ed9000ba..47d48ecf044e 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.14
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.14
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.14.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=069220b03b21e71a7ba2721e1365ba6a
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.16 b/metadata/md5-cache/dev-db/mongodb-3.6.16
index e35fac6fd2e7..8575c33ae0ee 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.6.16
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.16
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.16.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=069220b03b21e71a7ba2721e1365ba6a
diff --git a/metadata/md5-cache/dev-db/mongodb-3.6.17 b/metadata/md5-cache/dev-db/mongodb-3.6.17
new file mode 100644
index 000000000000..b2c57443b3b4
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-3.6.17
@@ -0,0 +1,16 @@
+BDEPEND=|| ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/cheetah[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pymongo[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl lto mms-agent ssl test +tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 SSPL-1
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.17 )
+RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.17.tar.gz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4ec5f82b6e771929ffb71388bdb8100e
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.12 b/metadata/md5-cache/dev-db/mongodb-4.0.12
index df6facf64279..d6590f0cdc48 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.12
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.12
@@ -12,5 +12,5 @@ RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.12.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=981e41f6d86d84ebdb22a2980fbc6a71
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.13 b/metadata/md5-cache/dev-db/mongodb-4.0.13
index ca019baeb0c7..1c48da094176 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.13
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.13
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.13.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e1158939ecab47da199df4ba62c0e9c
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.14 b/metadata/md5-cache/dev-db/mongodb-4.0.14
index 378489b93a3c..dde1190088f9 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.0.14
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.14
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.14.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e1158939ecab47da199df4ba62c0e9c
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.16 b/metadata/md5-cache/dev-db/mongodb-4.0.16
new file mode 100644
index 000000000000..fac252ed89bb
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.16
@@ -0,0 +1,16 @@
+BDEPEND=|| ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-util/scons-2.5.0[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/cheetah[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pymongo[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl lto mms-agent ssl test +tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 SSPL-1
+PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.16 )
+RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.16.tar.gz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0099d46bfc4cd8a5d569407672920c57
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.1 b/metadata/md5-cache/dev-db/mongodb-4.2.1
index 28767cdacaaf..0e484f60bac5 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.1
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.1
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.1.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3c519a6565e744d93799ff9dac7594b6
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.2 b/metadata/md5-cache/dev-db/mongodb-4.2.2
index a3b0d7c9bfcf..4a801c39fea0 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.2
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.2
@@ -12,5 +12,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/y
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.2.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3c519a6565e744d93799ff9dac7594b6
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.3 b/metadata/md5-cache/dev-db/mongodb-4.2.3
new file mode 100644
index 000000000000..ae284743b356
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( ( dev-lang/python:3.7 >=dev-util/scons-2.5.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-util/scons-2.5.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.7 dev-python/cheetah3[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/psutil[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pyyaml[python_targets_python3_7(-),python_single_target_python3_7(+)] virtual/python-typing[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/cheetah3[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/psutil[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pyyaml[python_targets_python3_6(-),python_single_target_python3_6(+)] virtual/python-typing[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( || ( ( dev-lang/python:3.7 dev-python/pymongo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pymongo[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl lto ssl test +tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 SSPL-1
+PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.3 )
+RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.6.2:= >=dev-libs/boost-1.70:=[threads(+)] >=dev-libs/libpcre-8.42[cxx] app-arch/zstd dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.3.tar.gz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3c519a6565e744d93799ff9dac7594b6
diff --git a/metadata/md5-cache/dev-db/mycli-1.19.0 b/metadata/md5-cache/dev-db/mycli-1.19.0
index c7cb7ed6540e..59a9e267d9b8 100644
--- a/metadata/md5-cache/dev-db/mycli-1.19.0
+++ b/metadata/md5-cache/dev-db/mycli-1.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/mycli/archive/v1.19.0.tar.gz -> mycli-1.19.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e65f775ee5ec63f2e65d97b646bfa503
diff --git a/metadata/md5-cache/dev-db/mycli-1.20.1 b/metadata/md5-cache/dev-db/mycli-1.20.1
index 4b5535bda465..1495cd5badbd 100644
--- a/metadata/md5-cache/dev-db/mycli-1.20.1
+++ b/metadata/md5-cache/dev-db/mycli-1.20.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/mycli/archive/v1.20.1.tar.gz -> mycli-1.20.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=35d2943ef1d2cdefb123048b54e66407
diff --git a/metadata/md5-cache/dev-db/mycli-9999 b/metadata/md5-cache/dev-db/mycli-9999
index e6c923da3183..25ecf27f6282 100644
--- a/metadata/md5-cache/dev-db/mycli-9999
+++ b/metadata/md5-cache/dev-db/mycli-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/cli_helpers-1.1.0[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e654a8049c1187d27124a3b37e5ee4d1
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.4 b/metadata/md5-cache/dev-db/mysql++-3.2.4
index 9b1c6d6e4788..92d7125e7da3 100644
--- a/metadata/md5-cache/dev-db/mysql++-3.2.4
+++ b/metadata/md5-cache/dev-db/mysql++-3.2.4
@@ -10,4 +10,4 @@ RDEPEND=|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )
 SLOT=0/3
 SRC_URI=https://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39343a9a433391d3cc0a7f13ac787712
+_md5_=1d9fc6d565406b97ec781aa3902b00b9
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.44-r1 b/metadata/md5-cache/dev-db/mysql-5.6.44-r1
index b4f2b624c68f..734a8727f032 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.44-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.6.44-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.44.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.44.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.44.tar.gz mirror://gentoo/mysql-extras-20190817-0024Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190817-0024Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190817-0024Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4559ea9dc18c7dffc66f24cd664a155
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0af9065c99073a34dde8942e0470842
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.45-r2 b/metadata/md5-cache/dev-db/mysql-5.6.45-r2
index 8f19012a2051..51c6f7dbe5f1 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.45-r2
+++ b/metadata/md5-cache/dev-db/mysql-5.6.45-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.45.tar.gz https://cdn.mysql.com/archives/mysql-5.6/mysql-5.6.45.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.45.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20190822-1908Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20190822-1908Z.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf979decc5d80676532e1f841dabb409
+_md5_=bff66da8ab3822576daac05cfa0bfd58
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.26-r1 b/metadata/md5-cache/dev-db/mysql-5.7.26-r1
index 8a1eefddb63e..c5934b4e76f7 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.26-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.26-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.26.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.26.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.26.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd62629b794657b0fb5937dc33fef84b
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce074a830099976bc6badc868ce70867
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.27-r1 b/metadata/md5-cache/dev-db/mysql-5.7.27-r1
index e05264e6ece6..aaf4c12eeddc 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.27-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.27-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.27.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.27.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.27.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d502487a188bd16a4d774bcea932a4f
+_md5_=6eb9d44638979837f3972a0e2bc3fa62
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.29 b/metadata/md5-cache/dev-db/mysql-5.7.29
index bc88b91e5eca..29b54fbcd2ea 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.29
+++ b/metadata/md5-cache/dev-db/mysql-5.7.29
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.29.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.29.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.29.tar.gz mirror://gentoo/mysql-extras-20200125-1945Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200125-1945Z.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9a7e02e8512fdcdc7497909c32b9df0
+_md5_=08e73e46b233383ade567e4622f04ec8
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.19-r1 b/metadata/md5-cache/dev-db/mysql-8.0.19-r1
index 02bb284b5833..635e2b2cc852 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.19-r1
+++ b/metadata/md5-cache/dev-db/mysql-8.0.19-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.19.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.19.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.19.tar.gz mirror://gentoo/mysql-extras-20200125-1945Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200125-1945Z.tar.bz2
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfe43e6575e84fb2da5b1de35b943863
+_md5_=3fcdb44d820146f9a3bf366a42719a40
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.2.34 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.34
index e323bde9913e..345451be8c85 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.2.34
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.2.34
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=!bindist? ( bindist ) !test? ( test ) libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.34.tar.gz https://downloads.mysql.com/archives/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.34.tar.gz mirror://gentoo/mysql-extras-20190121-0015Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190121-0015Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4cef9f0872d0afbf8ec3a6e78a087939
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64826d96e31045e626aa1e5efdda2806
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.22 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.22
index 7f3cb2d3d713..d5eb758e64f1 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.3.22
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.3.22
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.22.tar.gz https://downloads.mysql.com/archives/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.22.tar.gz mirror://gentoo/mysql-extras-20190121-0015Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190121-0015Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9d6abdd530494d402b2102c91d87361
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3032ba30d12b3aa39649f5e1c8a2534d
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.4.21 b/metadata/md5-cache/dev-db/mysql-cluster-7.4.21
index de540fa59f8f..ee989f574369 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.4.21
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.4.21
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc ) static? ( yassl )
 RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-Cluster-7.4/mysql-cluster-gpl-7.4.21.tar.gz https://downloads.mysql.com/archives/MySQL-Cluster-7.4/mysql-cluster-gpl-7.4.21.tar.gz mirror://gentoo/mysql-extras-20190121-0015Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190121-0015Z.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=051c7347ec153827896b04409e64efd0
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=afc418a361a7f3b420d790ce24910645
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1
index 25bbcaa3f1e3..68da8098d16f 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.12-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-db/mysql-connector-c:= dev-libs/boost:= !libressl? ( dev-libs/openss
 SLOT=0/7
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-1.1.12.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87b63d0b91d1a6d8dc5241ee9e9453ac
+_md5_=9ac20f92bde9e7e6e950796be722423e
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
index 76cc136f90b9..7e6bb7964e3a 100644
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
+++ b/metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst
 DEPEND=virtual/pkgconfig
 DESCRIPTION=Gentoo MySQL init scripts.
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2 dev-db/mysql-connector-c !prefix? ( acct-group/mysql acct-user/mysql ) virtual/tmpfiles
 SLOT=0
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=21eaa3f095d8a13ae14a6ebae76ccec8
+_md5_=6ef6427fb40678e0c06384040c0d4416
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.16 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.16
index 7cff15522dab..40051441820e 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.16
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.16
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite]
 DESCRIPTION=MySQL Workbench
 EAPI=6
 HOMEPAGE=https://www.mysql.com/products/workbench/
-IUSE=debug doc gnome-keyring +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug doc gnome-keyring +python_single_target_python2_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.7.3[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1[-mdb] virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) gnome-keyring? ( gnome-base/libgnome-keyring ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.16-src.tar.gz https://www.antlr.org/download/antlr-4.7.1-complete.jar
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06d9c9375f6b95b2d74bd8bb0e9046ca
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.17 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.17
index 8c3758e985b0..3e46041e11ad 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.17
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.17
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite]
 DESCRIPTION=MySQL Workbench
 EAPI=6
 HOMEPAGE=https://www.mysql.com/products/workbench/
-IUSE=debug doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug doc +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.17-src.tar.gz https://www.antlr.org/download/antlr-4.7.1-complete.jar
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ebafeabad472bab387b27c94b594616f
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.18 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.18
index 4a23850882a6..60fe8a35160e 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.18
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.18
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite]
 DESCRIPTION=MySQL Workbench
 EAPI=6
 HOMEPAGE=https://www.mysql.com/products/workbench/
-IUSE=debug doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug doc +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.18-src.tar.gz https://www.antlr.org/download/antlr-4.7.1-complete.jar
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aa495287569975d6692fe601450e75ae
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-8.0.19 b/metadata/md5-cache/dev-db/mysql-workbench-8.0.19
index 1dd215f76c09..c2bdbe6944eb 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-8.0.19
+++ b/metadata/md5-cache/dev-db/mysql-workbench-8.0.19
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite]
 DESCRIPTION=MySQL Workbench
 EAPI=6
 HOMEPAGE=https://www.mysql.com/products/workbench/
-IUSE=debug doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug doc +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-crypt/libsecret dev-libs/glib:2 dev-cpp/antlr-cpp:4 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 dev-cpp/gtkmm:3.0 dev-libs/atk >=net-libs/libssh-0.8.5[server] x11-libs/pango x11-libs/gtk+:3 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] >=dev-libs/rapidjson-1.1.0 dev-libs/libsigc++:2 >=dev-libs/boost-1.55.0[nls] >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip dev-libs/libpcre[cxx] >=sci-libs/gdal-1.11.1-r1 virtual/opengl || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] >=dev-db/mysql-connector-c++-1.1.8 dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-8.0.19-src.tar.gz https://www.antlr.org/download/antlr-4.7.1-complete.jar
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c29d8ef53f422f88d79e8ff3faabf79d
diff --git a/metadata/md5-cache/dev-db/percona-server-5.7.27.30 b/metadata/md5-cache/dev-db/percona-server-5.7.27.30
index be93fbbe0a26..e8b3ac5d5227 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.7.27.30
+++ b/metadata/md5-cache/dev-db/percona-server-5.7.27.30
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0/18
 SRC_URI=https://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-5.7.27-30/source/tarball/percona-server-5.7.27-30.tar.gz mirror://sourceforge/boost/boost_1_59_0.tar.gz mirror://gentoo/mysql-extras-20190822-1908Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20190822-1908Z.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a0d236eefa44b8911b1564899137fe1
+_md5_=cd518138b35affa758ca2778aeb9335d
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.18.9 b/metadata/md5-cache/dev-db/percona-server-8.0.18.9
index 1ab2dadfdb40..d81f979f9156 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.18.9
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.18.9
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) libressl? ( test )
 SLOT=0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.18-9/source/tarball/percona-server-8.0.18-9.tar.gz https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 mirror://gentoo/mysql-extras-20200125-1945Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20200125-1945Z.tar.bz2
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28c664b7743d74bca579ef9e77761198
+_md5_=f373313689a0c2fe02c26ea89a619424
diff --git a/metadata/md5-cache/dev-db/pg_activity-1.5.0 b/metadata/md5-cache/dev-db/pg_activity-1.5.0
index 5f5c614abbc1..c3c5004a1827 100644
--- a/metadata/md5-cache/dev-db/pg_activity-1.5.0
+++ b/metadata/md5-cache/dev-db/pg_activity-1.5.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/dalibo/pg_activity/archive/v1.5.0.tar.gz -> pg_activity-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=22ed2301861fceb401ce1af61e43c4ea
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.13 b/metadata/md5-cache/dev-db/pgadmin4-4.13
deleted file mode 100644
index bfeb320fd24f..000000000000
--- a/metadata/md5-cache/dev-db/pgadmin4-4.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/libsodium[-minimal] dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-DESCRIPTION=GUI administration and development platform for PostgreSQL
-EAPI=7
-HOMEPAGE=https://www.pgadmin.org/
-IUSE=doc python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 x86
-LICENSE=POSTGRESQL
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/libsodium[-minimal] dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 >=app-text/htmlmin-0.1.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/blinker-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-1.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-htmlmin-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-login-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-migrate-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-security-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/flask-wtf-0.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/passlib-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/psutil-5.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/psycopg-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-sqlparse-0.2.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pytz-2018.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/simplejson-3.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/speaklater-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/sqlalchemy-1.2.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/sshtunnel-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/wtforms-2.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.13/source/pgadmin4-4.13.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c735cd716464ace198a728d022315d90
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.13-r1 b/metadata/md5-cache/dev-db/pgadmin4-4.13-r1
new file mode 100644
index 000000000000..fd3090570b07
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-4.13-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/libsodium[-minimal] dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) )
+DESCRIPTION=GUI administration and development platform for PostgreSQL
+EAPI=7
+HOMEPAGE=https://www.pgadmin.org/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 x86
+LICENSE=POSTGRESQL
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/libsodium[-minimal] dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 python_single_target_python3_6? ( >=app-text/htmlmin-0.1.12[python_targets_python3_6(-)] >=dev-python/blinker-1.4[python_targets_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python3_6(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_6(-)] >=dev-python/flask-htmlmin-1.5.0[python_targets_python3_6(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_6(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_6(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_6(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_6(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_6(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_6(-)] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_6(-)] >=dev-python/flask-wtf-0.14.2[python_targets_python3_6(-)] >=dev-python/passlib-1.7.1[python_targets_python3_6(-)] >=dev-python/psutil-5.5.1[python_targets_python3_6(-)] >=dev-python/psycopg-2.8[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_6(-)] >=dev-python/python-sqlparse-0.2.4[python_targets_python3_6(-)] >=dev-python/pytz-2018.9[python_targets_python3_6(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_6(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)] >=dev-python/speaklater-1.3[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.2.18[python_targets_python3_6(-)] >=dev-python/sshtunnel-0.1.4[python_targets_python3_6(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-text/htmlmin-0.1.12[python_targets_python3_7(-)] >=dev-python/blinker-1.4[python_targets_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python3_7(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_7(-)] >=dev-python/flask-htmlmin-1.5.0[python_targets_python3_7(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_7(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_7(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_7(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_7(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_7(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_7(-)] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_7(-)] >=dev-python/flask-wtf-0.14.2[python_targets_python3_7(-)] >=dev-python/passlib-1.7.1[python_targets_python3_7(-)] >=dev-python/psutil-5.5.1[python_targets_python3_7(-)] >=dev-python/psycopg-2.8[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_7(-)] >=dev-python/python-sqlparse-0.2.4[python_targets_python3_7(-)] >=dev-python/pytz-2018.9[python_targets_python3_7(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python3_7(-)] >=dev-python/speaklater-1.3[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.2.18[python_targets_python3_7(-)] >=dev-python/sshtunnel-0.1.4[python_targets_python3_7(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.13/source/pgadmin4-4.13.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=110cf3afd98d664ec7800dc7a9c2a0db
diff --git a/metadata/md5-cache/dev-db/pgadmin4-4.17-r1 b/metadata/md5-cache/dev-db/pgadmin4-4.17-r1
new file mode 100644
index 000000000000..8a7f88014b88
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pgadmin4-4.17-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/libsodium[-minimal] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] ) ) virtual/imagemagick-tools[png] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GUI administration and development platform for PostgreSQL
+EAPI=7
+HOMEPAGE=https://www.pgadmin.org/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=POSTGRESQL
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/libsodium[-minimal] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 python_single_target_python3_6? ( >=app-text/htmlmin-0.1.12[python_targets_python3_6(-)] >=dev-python/blinker-1.4[python_targets_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python3_6(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_6(-)] >=dev-python/flask-htmlmin-1.5.0[python_targets_python3_6(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_6(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_6(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_6(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_6(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_6(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_6(-)] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_6(-)] >=dev-python/flask-wtf-0.14.2[python_targets_python3_6(-)] >=dev-python/passlib-1.7.1[python_targets_python3_6(-)] >=dev-python/psutil-5.5.1[python_targets_python3_6(-)] >=dev-python/psycopg-2.8[python_targets_python3_6(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_6(-)] >=dev-python/python-sqlparse-0.2.4[python_targets_python3_6(-)] >=dev-python/pytz-2018.9[python_targets_python3_6(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_6(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)] >=dev-python/speaklater-1.3[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.2.18[python_targets_python3_6(-)] >=dev-python/sshtunnel-0.1.4[python_targets_python3_6(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=app-text/htmlmin-0.1.12[python_targets_python3_7(-)] >=dev-python/blinker-1.4[python_targets_python3_7(-)] >=dev-python/flask-1.0.2[python_targets_python3_7(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_7(-)] >=dev-python/flask-htmlmin-1.5.0[python_targets_python3_7(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_7(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_7(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_7(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_7(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_7(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_7(-)] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_7(-)] >=dev-python/flask-wtf-0.14.2[python_targets_python3_7(-)] >=dev-python/passlib-1.7.1[python_targets_python3_7(-)] >=dev-python/psutil-5.5.1[python_targets_python3_7(-)] >=dev-python/psycopg-2.8[python_targets_python3_7(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_7(-)] >=dev-python/python-sqlparse-0.2.4[python_targets_python3_7(-)] >=dev-python/pytz-2018.9[python_targets_python3_7(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python3_7(-)] >=dev-python/speaklater-1.3[python_targets_python3_7(-)] >=dev-python/sqlalchemy-1.2.18[python_targets_python3_7(-)] >=dev-python/sshtunnel-0.1.4[python_targets_python3_7(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=app-text/htmlmin-0.1.12[python_targets_python3_8(-)] >=dev-python/blinker-1.4[python_targets_python3_8(-)] >=dev-python/flask-1.0.2[python_targets_python3_8(-)] >=dev-python/flask-gravatar-0.5.0[python_targets_python3_8(-)] >=dev-python/flask-htmlmin-1.5.0[python_targets_python3_8(-)] >=dev-python/flask-login-0.4.1[python_targets_python3_8(-)] >=dev-python/flask-mail-0.9.1[python_targets_python3_8(-)] >=dev-python/flask-migrate-2.4.0[python_targets_python3_8(-)] >=dev-python/flask-paranoid-0.2.0[python_targets_python3_8(-)] >=dev-python/flask-principal-0.4.0[python_targets_python3_8(-)] >=dev-python/flask-security-3.0.0[python_targets_python3_8(-)] >=dev-python/flask-sqlalchemy-2.3.2[python_targets_python3_8(-)] >=dev-python/flask-wtf-0.14.2[python_targets_python3_8(-)] >=dev-python/passlib-1.7.1[python_targets_python3_8(-)] >=dev-python/psutil-5.5.1[python_targets_python3_8(-)] >=dev-python/psycopg-2.8[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)] >=dev-python/python-sqlparse-0.2.4[python_targets_python3_8(-)] >=dev-python/pytz-2018.9[python_targets_python3_8(-)] >=dev-python/simplejson-3.16.0[python_targets_python3_8(-)] >=dev-python/six-1.12.0[python_targets_python3_8(-)] >=dev-python/speaklater-1.3[python_targets_python3_8(-)] >=dev-python/sqlalchemy-1.2.18[python_targets_python3_8(-)] >=dev-python/sshtunnel-0.1.4[python_targets_python3_8(-)] >=dev-python/wtforms-2.2.1[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v4.17/source/pgadmin4-4.17.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd56e739aa75efcc1b1dcd15ceb683b2
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 05e13f465d01..47db6f0fbcd8 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=https://ftp.postgresql.org/pub/pgadmin3/release/pgagent/pgAgent-3.4.0-Source.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1eebcc6cb3179dbf9c4da0478550ebd
diff --git a/metadata/md5-cache/dev-db/pgagent-4.0.0 b/metadata/md5-cache/dev-db/pgagent-4.0.0
index e03c7969decb..59f84e2cef29 100644
--- a/metadata/md5-cache/dev-db/pgagent-4.0.0
+++ b/metadata/md5-cache/dev-db/pgagent-4.0.0
@@ -9,5 +9,5 @@ LICENSE=POSTGRESQL GPL-2
 RDEPEND=dev-db/postgresql:* dev-libs/boost
 SLOT=0
 SRC_URI=https://ftp.postgresql.org/pub/pgadmin/pgagent/pgAgent-4.0.0-Source.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2967e84082e229ea1ba7f865c14617c
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.10.0 b/metadata/md5-cache/dev-db/pgbouncer-1.10.0
index ca56a9267354..43c6495bf83c 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.10.0
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.10.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares
 REQUIRED_USE=?? ( c-ares udns )
 SLOT=0
 SRC_URI=https://pgbouncer.github.io/downloads/files/1.10.0/pgbouncer-1.10.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b00c3089de6d89947e541d500bcf0ccb
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.11.0 b/metadata/md5-cache/dev-db/pgbouncer-1.11.0
index e7da422d285a..8e5399f38955 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.11.0
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares
 REQUIRED_USE=?? ( c-ares udns )
 SLOT=0
 SRC_URI=https://pgbouncer.github.io/downloads/files/1.11.0/pgbouncer-1.11.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=224d9be1f0a58f665c3fdf8f1a3087f3
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.12.0 b/metadata/md5-cache/dev-db/pgbouncer-1.12.0
index d2d3d87ed97d..06ad7292e47e 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.12.0
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( c-ares udns )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.pgbouncer.org/downloads/files/1.12.0/pgbouncer-1.12.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d6aff77c38db079297229252f03fdbb2
diff --git a/metadata/md5-cache/dev-db/pgbouncer-1.9.0 b/metadata/md5-cache/dev-db/pgbouncer-1.9.0
index 01322edb458a..d2ac05e9eda6 100644
--- a/metadata/md5-cache/dev-db/pgbouncer-1.9.0
+++ b/metadata/md5-cache/dev-db/pgbouncer-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-2.0 >=sys-libs/glibc-2.10 c-ares? ( >=net-dns/c-ares
 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	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d5926cfd8cf7afa11f423311f2f0b508
diff --git a/metadata/md5-cache/dev-db/pgcli-2.0.2 b/metadata/md5-cache/dev-db/pgcli-2.0.2
index 68e7dba30c0f..a4bcd85233d1 100644
--- a/metadata/md5-cache/dev-db/pgcli-2.0.2
+++ b/metadata/md5-cache/dev-db/pgcli-2.0.2
@@ -10,5 +10,5 @@ RDEPEND=<dev-python/prompt_toolkit-2.1.0[python_targets_python3_6(-)?,-python_si
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgcli/archive/v2.0.2.tar.gz -> pgcli-2.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e47301d2631c3db012ac90ef68389d62
diff --git a/metadata/md5-cache/dev-db/pgcli-2.2.0 b/metadata/md5-cache/dev-db/pgcli-2.2.0
index 17cbf0ead80f..8cf88794cd32 100644
--- a/metadata/md5-cache/dev-db/pgcli-2.2.0
+++ b/metadata/md5-cache/dev-db/pgcli-2.2.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-db/postgresql dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prompt_toolkit-2.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prompt_toolkit-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cli_helpers-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configobj-5.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/humanize-0.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pgspecial-1.11.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setproctitle-1.1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-db/postgresql dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/prompt_toolkit-2.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prompt_toolkit-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cli_helpers-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configobj-5.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/humanize-0.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pgspecial-1.11.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setproctitle-1.1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/prompt_toolkit-2.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prompt_toolkit-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/python-sqlparse-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cli_helpers-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/configobj-5.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/humanize-0.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pgspecial-1.11.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setproctitle-1.1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=CLI for Postgres with auto-completion and syntax highlighting
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgcli/archive/v2.2.0.tar.gz -> pgcli-2.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1dbbf1df095137b431212cddfce1398d
diff --git a/metadata/md5-cache/dev-db/pgmodeler-0.9.1 b/metadata/md5-cache/dev-db/pgmodeler-0.9.1
index 3b38cdfcaf05..1f53eb151cec 100644
--- a/metadata/md5-cache/dev-db/pgmodeler-0.9.1
+++ b/metadata/md5-cache/dev-db/pgmodeler-0.9.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) dev-libs/icu:= dev-libs/libxml2:= dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://github.com/pgmodeler/pgmodeler/archive/v0.9.1.tar.gz -> pgmodeler-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c1939077d449eb741106b5eb6a9f6bca
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=49ba620d2acb0a03fd9951d69bdc00e4
diff --git a/metadata/md5-cache/dev-db/pgpool2-3.7.10 b/metadata/md5-cache/dev-db/pgpool2-3.7.10
index 4b855cb29ed2..aa2cdf7d147b 100644
--- a/metadata/md5-cache/dev-db/pgpool2-3.7.10
+++ b/metadata/md5-cache/dev-db/pgpool2-3.7.10
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-3.7.10.tar.gz -> pgpool-II-3.7.10.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f60e01fcaefa5eb730775a25061a5a56
diff --git a/metadata/md5-cache/dev-db/pgpool2-4.0.5 b/metadata/md5-cache/dev-db/pgpool2-4.0.5
index 5d1f66c23ab1..fa413600648e 100644
--- a/metadata/md5-cache/dev-db/pgpool2-4.0.5
+++ b/metadata/md5-cache/dev-db/pgpool2-4.0.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=https://www.pgpool.net/download.php?f=pgpool-II-4.0.5.tar.gz -> pgpool-II-4.0.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a49b69165ce4ae3b9e0455f26fc1641a
diff --git a/metadata/md5-cache/dev-db/pgpool2-9999 b/metadata/md5-cache/dev-db/pgpool2-9999
index b30f7878e158..9a9a560f54c3 100644
--- a/metadata/md5-cache/dev-db/pgpool2-9999
+++ b/metadata/md5-cache/dev-db/pgpool2-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6= ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5= ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4= ) net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f3dba5c6f2950252ced240829047be57
diff --git a/metadata/md5-cache/dev-db/pgrouting-2.6.2-r1 b/metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
index 9ef09b94c170..eaf03cd1100f 100644
--- a/metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
+++ b/metadata/md5-cache/dev-db/pgrouting-2.6.2-r1
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11=[server] ) postgres_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pgRouting/pgrouting/archive/v2.6.2.tar.gz -> pgrouting-2.6.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d08265b8f2bca6b66b95dd5fef03fc0d
diff --git a/metadata/md5-cache/dev-db/pgtap-0.99.0 b/metadata/md5-cache/dev-db/pgtap-0.99.0
index e8ee1b20afce..7a27fc6322e2 100644
--- a/metadata/md5-cache/dev-db/pgtap-0.99.0
+++ b/metadata/md5-cache/dev-db/pgtap-0.99.0
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_
 RESTRICT=test
 SLOT=0
 SRC_URI=https://api.pgxn.org/dist/pgtap/0.99.0/pgtap-0.99.0.zip
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7c66065e1a538d264302ee86631ee445
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2-r1 b/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
index 9e6512afde9d..eb3338e93441 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6cfa92b549d0485fc3acc45789a18c1c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=12d79c499322c2b7bd9ce406a51babfa
diff --git a/metadata/md5-cache/dev-db/pgxnclient-1.2.1 b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
index 8bd385c76458..3e88f254ab2c 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.2.1
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=911050823831477b8c63a2f6482a18a9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5f710511a22f3fd3b742e6076824ff74
diff --git a/metadata/md5-cache/dev-db/plr-8.3.0.17 b/metadata/md5-cache/dev-db/plr-8.3.0.17
index a6733d94c0a1..9d8cfd6244ef 100644
--- a/metadata/md5-cache/dev-db/plr-8.3.0.17
+++ b/metadata/md5-cache/dev-db/plr-8.3.0.17
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/R postgres_targets_postgres10? ( dev-db/postgresql:10=[server]
 REQUIRED_USE=|| ( postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 postgres_targets_postgres9_4 )
 SLOT=0
 SRC_URI=https://github.com/postgres-plr/plr/archive/REL8_3_0_17.tar.gz -> plr-8.3.0.17.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7125d364b58700fde121f507ea563218
diff --git a/metadata/md5-cache/dev-db/postgis-2.4.7 b/metadata/md5-cache/dev-db/postgis-2.4.7
index 8499f8d8dc18..110d8ab6b48e 100644
--- a/metadata/md5-cache/dev-db/postgis-2.4.7
+++ b/metadata/md5-cache/dev-db/postgis-2.4.7
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres11 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.4.7.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9a9d9c5b3953cfa7c69f3cc3f6cf5ec2
diff --git a/metadata/md5-cache/dev-db/postgis-2.4.8 b/metadata/md5-cache/dev-db/postgis-2.4.8
index c439a9297ba8..b9e706499697 100644
--- a/metadata/md5-cache/dev-db/postgis-2.4.8
+++ b/metadata/md5-cache/dev-db/postgis-2.4.8
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres11 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.4.8.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2c34b228998e9f25f949006ea1cd294b
diff --git a/metadata/md5-cache/dev-db/postgis-2.5.2 b/metadata/md5-cache/dev-db/postgis-2.5.2
index e3d9a39536b0..90a91a070734 100644
--- a/metadata/md5-cache/dev-db/postgis-2.5.2
+++ b/metadata/md5-cache/dev-db/postgis-2.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.5.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2b33efc64647ba66fe49ba3d9bc9bd79
diff --git a/metadata/md5-cache/dev-db/postgis-2.5.3-r1 b/metadata/md5-cache/dev-db/postgis-2.5.3-r1
index fff1bac5ee86..ec9c8b37171f 100644
--- a/metadata/md5-cache/dev-db/postgis-2.5.3-r1
+++ b/metadata/md5-cache/dev-db/postgis-2.5.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-2.5.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8af708b7e92ed7a07d1962aa557a0c2b
diff --git a/metadata/md5-cache/dev-db/postgis-3.0.0-r1 b/metadata/md5-cache/dev-db/postgis-3.0.0-r1
index d5b2c76b640e..9fafa18978e8 100644
--- a/metadata/md5-cache/dev-db/postgis-3.0.0-r1
+++ b/metadata/md5-cache/dev-db/postgis-3.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_pos
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.osgeo.org/postgis/source/postgis-3.0.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=078a865e8c01f9ade54aaba1ba140f1f
diff --git a/metadata/md5-cache/dev-db/postgis-9999 b/metadata/md5-cache/dev-db/postgis-9999
index f0ece185f44a..71da5a01e0d3 100644
--- a/metadata/md5-cache/dev-db/postgis-9999
+++ b/metadata/md5-cache/dev-db/postgis-9999
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres12? ( dev-db/postgresql:12=[server] ) postgres_
 REQUIRED_USE=test? ( doc ) || ( postgres_targets_postgres12 postgres_targets_postgres11 postgres_targets_postgres10 postgres_targets_postgres9_6 postgres_targets_postgres9_5 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=078a865e8c01f9ade54aaba1ba140f1f
diff --git a/metadata/md5-cache/dev-db/postgresql-10.10 b/metadata/md5-cache/dev-db/postgresql-10.10
index 395306751cd4..d7e6a268f00e 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.10
+++ b/metadata/md5-cache/dev-db/postgresql-10.10
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=10
 SRC_URI=https://ftp.postgresql.org/pub/source/v10.10/postgresql-10.10.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=dca91de03223170af296d5f1f5cb65d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f1e66a57fc7981c1fa7d494aa4cd9ccb
diff --git a/metadata/md5-cache/dev-db/postgresql-10.11 b/metadata/md5-cache/dev-db/postgresql-10.11
index 672594456d00..ce34e23cb4fa 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.11
+++ b/metadata/md5-cache/dev-db/postgresql-10.11
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=10
 SRC_URI=https://ftp.postgresql.org/pub/source/v10.11/postgresql-10.11.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1b50464508b285546809b48370f82577
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=fa4da600dd10dfca96171885f2fa3b22
diff --git a/metadata/md5-cache/dev-db/postgresql-10.9 b/metadata/md5-cache/dev-db/postgresql-10.9
index 555188799c6f..07d02eb9a9d0 100644
--- a/metadata/md5-cache/dev-db/postgresql-10.9
+++ b/metadata/md5-cache/dev-db/postgresql-10.9
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc icu kerberos kernel_linux ldap libressl nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:10 !dev-db/postgresql-base:10 !dev-db/postgresql-server:10 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=10
 SRC_URI=https://ftp.postgresql.org/pub/source/v10.9/postgresql-10.9.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0e893008cba9e04c60030a55d9d2c6c4
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=c1c4068c77677f7467a68196aa969a19
diff --git a/metadata/md5-cache/dev-db/postgresql-11.4 b/metadata/md5-cache/dev-db/postgresql-11.4
index ced7d4141f1a..141d000ea963 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.4
+++ b/metadata/md5-cache/dev-db/postgresql-11.4
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=http://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.4/postgresql-11.4.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8fe98b02a68be0f060006adff93d4682
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=8ff195134cfc34fc7f6585caab54dcdf
diff --git a/metadata/md5-cache/dev-db/postgresql-11.5 b/metadata/md5-cache/dev-db/postgresql-11.5
index a24e34c56be3..e592cef928b7 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.5
+++ b/metadata/md5-cache/dev-db/postgresql-11.5
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=http://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.5/postgresql-11.5.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=79b0d5d3581d3393e48a0e7e74b5ab92
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=996a0df47ee7db686cf22d990921827d
diff --git a/metadata/md5-cache/dev-db/postgresql-11.6 b/metadata/md5-cache/dev-db/postgresql-11.6
index f526ece3dc3d..d43ec817edad 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.6
+++ b/metadata/md5-cache/dev-db/postgresql-11.6
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=http://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=11
 SRC_URI=https://ftp.postgresql.org/pub/source/v11.6/postgresql-11.6.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e04aeb9a39ed6f3c5e3dbe379f09a8d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=dda34a9e61bc89e38afcaac729196f20
diff --git a/metadata/md5-cache/dev-db/postgresql-12.0 b/metadata/md5-cache/dev-db/postgresql-12.0
index 2bcd1e35919c..1e032332880c 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.0
+++ b/metadata/md5-cache/dev-db/postgresql-12.0
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=http://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs: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_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:12 !dev-db/postgresql-base:12 !dev-db/postgresql-server:12 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.0/postgresql-12.0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=fb4405445270600f7b6b3137aef983d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1c727c2d93452ec9eb28f546c369ab19
diff --git a/metadata/md5-cache/dev-db/postgresql-12.1 b/metadata/md5-cache/dev-db/postgresql-12.1
index 8fe98a058fcb..7216b8ab9309 100644
--- a/metadata/md5-cache/dev-db/postgresql-12.1
+++ b/metadata/md5-cache/dev-db/postgresql-12.1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=http://www.postgresql.org/
-IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs: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_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:12 !dev-db/postgresql-base:12 !dev-db/postgresql-server:12 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=12
 SRC_URI=https://ftp.postgresql.org/pub/source/v12.1/postgresql-12.1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=a32325bba4ffb8fc2ec5bd3d908193b0
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f69ee029eb018d107277c0b293fc35ff
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.22 b/metadata/md5-cache/dev-db/postgresql-9.4.22
index 8a67aeb60783..1fb7b9de4871 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.22
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.22
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://www.postgresql.org/
-IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux +python_single_target_python3_6
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=9.4
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.4.22/postgresql-9.4.22.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=e7c51686267363de869287c494a6fe88
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e7f9b0afde739b6eef78c1155dfa8145
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.22-r1 b/metadata/md5-cache/dev-db/postgresql-9.4.22-r1
index cfa4edee0a60..d6f2689980fc 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.22-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.22-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.4
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.4.22/postgresql-9.4.22.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e6e1eba1942c185c6f29f61c72a1a653
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d2667fd9572e350838faa30d8b53b24e
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.23 b/metadata/md5-cache/dev-db/postgresql-9.4.23
index 2d08815d98b5..b3053f8d8989 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.23
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.23
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.4
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.4.23/postgresql-9.4.23.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0c3500b87d0c325119b91b2d08791245
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=bf350f6b30e1ee699c7304e566839273
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.24 b/metadata/md5-cache/dev-db/postgresql-9.4.24
index 847123cbbed0..a8e8586c8f7b 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.24
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.24
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.4
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.4.24/postgresql-9.4.24.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=e6e1eba1942c185c6f29f61c72a1a653
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d2667fd9572e350838faa30d8b53b24e
diff --git a/metadata/md5-cache/dev-db/postgresql-9.4.25 b/metadata/md5-cache/dev-db/postgresql-9.4.25
index c9caa1764cd9..23eb7a72fe2a 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.4.25
+++ b/metadata/md5-cache/dev-db/postgresql-9.4.25
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.4 !dev-db/postgresql-base:9.4 !dev-db/postgresql-server:9.4 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.4
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.4.25/postgresql-9.4.25.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ef3ea6c0da273f0985e10859370158c6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=4cc7855bca98365598cc675092af5123
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.17 b/metadata/md5-cache/dev-db/postgresql-9.5.17
index 2132505de564..1dfa21cf4063 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.17
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.17
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://www.postgresql.org/
-IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux +python_single_target_python3_6
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=9.5
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.17/postgresql-9.5.17.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=172de8c275e4f09854b405620fcb2904
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=620f07710b9f6144807de1ccf9aea989
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.17-r1 b/metadata/md5-cache/dev-db/postgresql-9.5.17-r1
index 5109e50c9459..cfbc0ca3fd94 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.17-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.17-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.5
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.17/postgresql-9.5.17.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3bd18d8b079a8076bdd0d44365ac9e33
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=3f558f3ade3fe36dea27e95042422dbf
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.18 b/metadata/md5-cache/dev-db/postgresql-9.5.18
index d19c785ae4e9..af1a10705796 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.18
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.18
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.5
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.18/postgresql-9.5.18.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=6d96f697364de20852f104bd2311d243
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1f67530cf1e7639770af3f91fb22d319
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.19 b/metadata/md5-cache/dev-db/postgresql-9.5.19
index 7e75c2b180a9..cd7bbd2caf60 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.19
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.19
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.5
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.19/postgresql-9.5.19.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3bd18d8b079a8076bdd0d44365ac9e33
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=3f558f3ade3fe36dea27e95042422dbf
diff --git a/metadata/md5-cache/dev-db/postgresql-9.5.20 b/metadata/md5-cache/dev-db/postgresql-9.5.20
index 12fd941c3982..e5ccd8658b9e 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.5.20
+++ b/metadata/md5-cache/dev-db/postgresql-9.5.20
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.5 !dev-db/postgresql-base:9.5 !dev-db/postgresql-server:9.5 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.5
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.5.20/postgresql-9.5.20.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=51592b22f7c413849c9bc08b261b55c9
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=989345996c612028671e663499f6f7d4
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.13 b/metadata/md5-cache/dev-db/postgresql-9.6.13
index 62bab9257a79..0ee597ca6f80 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.13
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig ) virtual/pkgconfig
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=6
 HOMEPAGE=https://www.postgresql.org/
-IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux +python_single_target_python3_6
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.13/postgresql-9.6.13.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ffda589c1dbb2c102887f53990e6a9db
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e2405f9cdcd6ecd68dd1c13fa629e3dd
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.13-r1 b/metadata/md5-cache/dev-db/postgresql-9.6.13-r1
index 213f6e090bd1..834d37f7422d 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.13-r1
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.13-r1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.13/postgresql-9.6.13.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c32a6da51dd4588b418885c31fa66e2e
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=be01a6951b333898aa5e345b96babf34
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.14 b/metadata/md5-cache/dev-db/postgresql-9.6.14
index 97aeed5e1e6b..193c1f9ca526 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.14
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.14
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.14/postgresql-9.6.14.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=64cf1bf816b0e06813f11f8e60ef425c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=4326a3385047b34653583b62cf51c275
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.15 b/metadata/md5-cache/dev-db/postgresql-9.6.15
index fda0ca78bafa..7b9b5ea707f8 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.15
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.15
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.15/postgresql-9.6.15.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c32a6da51dd4588b418885c31fa66e2e
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=be01a6951b333898aa5e345b96babf34
diff --git a/metadata/md5-cache/dev-db/postgresql-9.6.16 b/metadata/md5-cache/dev-db/postgresql-9.6.16
index c67b661286f7..60a70a70f1ef 100644
--- a/metadata/md5-cache/dev-db/postgresql-9.6.16
+++ b/metadata/md5-cache/dev-db/postgresql-9.6.16
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm setup test
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) server? ( systemd? ( sys-apps/systemd ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=9.6
 SRC_URI=https://ftp.postgresql.org/pub/source/v9.6.16/postgresql-9.6.16.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f47579658856baa155078094b36e4426
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=e49efd3cecc971e191e10786035a990b
diff --git a/metadata/md5-cache/dev-db/postgresql-9999 b/metadata/md5-cache/dev-db/postgresql-9999
index f48c5a5cece6..4da3c22e9978 100644
--- a/metadata/md5-cache/dev-db/postgresql-9999
+++ b/metadata/md5-cache/dev-db/postgresql-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) 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 ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 >=dev-lang/perl-5.8 app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:4.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets app-text/openjade dev-libs/libxml2 dev-libs/libxslt sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
+DEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) 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 ) ) ) ) ) ) ) !!<sys-apps/sandbox-2.0 >=dev-lang/perl-5.8 app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:4.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets app-text/openjade dev-libs/libxml2 dev-libs/libxslt sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) xml? ( virtual/pkgconfig )
 DESCRIPTION=PostgreSQL RDBMS
 EAPI=7
 HOMEPAGE=https://www.postgresql.org/
-IUSE=debug icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux systemd ssl static-libs tcl threads uuid xml zlib l10n_af l10n_cs l10n_de l10n_en l10n_es l10n_fa l10n_fr l10n_hr l10n_hu l10n_it l10n_ko l10n_nb l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_tr l10n_zh-CN l10n_zh-TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux 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
+IUSE=debug icu kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux systemd ssl static-libs tcl threads uuid xml zlib l10n_af l10n_cs l10n_de l10n_en l10n_es l10n_fa l10n_fr l10n_hr l10n_hu l10n_it l10n_ko l10n_nb l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_tr l10n_zh-CN l10n_zh-TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_single_target_python3_6 python_single_target_python3_7
 LICENSE=POSTGRESQL GPL-2
 PROPERTIES=live
-RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) 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:13 !dev-db/postgresql-base:13 !dev-db/postgresql-server:13 selinux? ( sec-policy/selinux-postgresql )
-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 ) )
+RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl icu? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( sys-libs/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) 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:13 !dev-db/postgresql-base:13 !dev-db/postgresql-server:13 selinux? ( sec-policy/selinux-postgresql )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=13
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=70e552a69758dd0c6f185aed5eb9f96d
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=4530d8ec66840ccd68801b5e3741c49b
diff --git a/metadata/md5-cache/dev-db/pspg-1.6.5 b/metadata/md5-cache/dev-db/pspg-1.6.5
index 3f24907fc15c..f05d7fbcf282 100644
--- a/metadata/md5-cache/dev-db/pspg-1.6.5
+++ b/metadata/md5-cache/dev-db/pspg-1.6.5
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/1.6.5.tar.gz -> pspg-1.6.5.tar.gz
-_md5_=faec136d106594d816bbc2a4917f7f14
+_md5_=bdba9b99ad2ece4478d70ca49bdd3198
diff --git a/metadata/md5-cache/dev-db/pspg-1.6.8 b/metadata/md5-cache/dev-db/pspg-1.6.8
index 4a541c7225d7..4037d502c569 100644
--- a/metadata/md5-cache/dev-db/pspg-1.6.8
+++ b/metadata/md5-cache/dev-db/pspg-1.6.8
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/1.6.8.tar.gz -> pspg-1.6.8.tar.gz
-_md5_=06a98a173ae0fc3eb6f6a9c88c7b1f2f
+_md5_=8ee6bb5bf42a322691784dab5784c16a
diff --git a/metadata/md5-cache/dev-db/pspg-2.5.4 b/metadata/md5-cache/dev-db/pspg-2.5.4
index 10b6e7704b2c..7be824df9daa 100644
--- a/metadata/md5-cache/dev-db/pspg-2.5.4
+++ b/metadata/md5-cache/dev-db/pspg-2.5.4
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:* dev-db/postgresql:= sys-libs/readline:*
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/2.5.4.tar.gz -> pspg-2.5.4.tar.gz
-_md5_=00135df0961c07354a77a307842aa08c
+_md5_=24c79f8824847bb90094ab833d2ecb98
diff --git a/metadata/md5-cache/dev-db/pspg-2.5.5 b/metadata/md5-cache/dev-db/pspg-2.5.5
index 5de9afc14587..39a2db1eba9f 100644
--- a/metadata/md5-cache/dev-db/pspg-2.5.5
+++ b/metadata/md5-cache/dev-db/pspg-2.5.5
@@ -8,4 +8,4 @@ LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:* dev-db/postgresql:= sys-libs/readline:*
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/2.5.5.tar.gz -> pspg-2.5.5.tar.gz
-_md5_=00135df0961c07354a77a307842aa08c
+_md5_=24c79f8824847bb90094ab833d2ecb98
diff --git a/metadata/md5-cache/dev-db/redis-4.0.14 b/metadata/md5-cache/dev-db/redis-4.0.14
index 5be5ed544780..0cdb7adb94c8 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.14
+++ b/metadata/md5-cache/dev-db/redis-4.0.14
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.14.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f9c0f25b17946c6f853bcc6f5d02e2b5
diff --git a/metadata/md5-cache/dev-db/redis-4.0.2-r1 b/metadata/md5-cache/dev-db/redis-4.0.2-r1
index 6aed5f6c3cd8..ede2d96510d2 100644
--- a/metadata/md5-cache/dev-db/redis-4.0.2-r1
+++ b/metadata/md5-cache/dev-db/redis-4.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-4.0.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4fadac81837bd9825a090490d03eb61a
diff --git a/metadata/md5-cache/dev-db/redis-5.0.5 b/metadata/md5-cache/dev-db/redis-5.0.5
index 88114b258f77..66a68530870f 100644
--- a/metadata/md5-cache/dev-db/redis-5.0.5
+++ b/metadata/md5-cache/dev-db/redis-5.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( tcmalloc jemalloc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.redis.io/releases/redis-5.0.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e85a0281641e04cbe0b6bedb851238ab
diff --git a/metadata/md5-cache/dev-db/sadisplay-0.4.8 b/metadata/md5-cache/dev-db/sadisplay-0.4.8
index a9bc46fb3b80..715b54eab834 100644
--- a/metadata/md5-cache/dev-db/sadisplay-0.4.8
+++ b/metadata/md5-cache/dev-db/sadisplay-0.4.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/estin/sadisplay/get/d67d12894ebd.tar.gz -> sadisplay-0.4.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc1576241425d422857204c0dbdc7659
diff --git a/metadata/md5-cache/dev-db/slony1-2.2.6 b/metadata/md5-cache/dev-db/slony1-2.2.6
index fc59316cce58..5395cc6a0019 100644
--- a/metadata/md5-cache/dev-db/slony1-2.2.6
+++ b/metadata/md5-cache/dev-db/slony1-2.2.6
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=http://main.slony.info/downloads/2.2/source/slony1-2.2.6.tar.bz2 http://main.slony.info/downloads/2.2/source/slony1-2.2.6-docs.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=935eda8f24203e33f9a42ceb58180704
diff --git a/metadata/md5-cache/dev-db/slony1-2.2.7 b/metadata/md5-cache/dev-db/slony1-2.2.7
index a9f69f797261..c830ea8b88d2 100644
--- a/metadata/md5-cache/dev-db/slony1-2.2.7
+++ b/metadata/md5-cache/dev-db/slony1-2.2.7
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11=[server,threads] ) postgres_targets_postgres10? ( dev-db/postgresql:10=[server,threads] ) postgres_targets_postgres9_6? ( dev-db/postgresql:9.6=[server,threads] ) postgres_targets_postgres9_5? ( dev-db/postgresql:9.5=[server,threads] ) postgres_targets_postgres9_4? ( dev-db/postgresql:9.4=[server,threads] ) perl? ( dev-perl/DBD-Pg )
 SLOT=0
 SRC_URI=http://main.slony.info/downloads/2.2/source/slony1-2.2.7.tar.bz2 http://main.slony.info/downloads/2.2/source/slony1-2.2.7-docs.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	postgres	86eeb59f48e87b423d9f22122dab9d04	postgres-multi	fba0b36e29a3e019a9529049008ebcc6	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f30a50965893866ec499e661508ad4cf
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.7 b/metadata/md5-cache/dev-db/unixODBC-2.3.7
index d60999eb7bcc..fa00aedd12b2 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.7
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.7
@@ -5,10 +5,10 @@ DESCRIPTION=A complete ODBC driver manager
 EAPI=7
 HOMEPAGE=http://www.unixodbc.org/
 IUSE=+minimal odbcmanual static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/readline-6.2_p5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.7.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f1c3ef03a8d1a997b42020b74112c92a
+_md5_=b35cb2f4a4119365bf3d890967677c86
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 85a250957ecd..b1f9d9d3ca5a 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/esptool-2.1 b/metadata/md5-cache/dev-embedded/esptool-2.1
index 4ad9af0fd85a..71fdc4477238 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.1
+++ b/metadata/md5-cache/dev-embedded/esptool-2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
 EAPI=6
 HOMEPAGE=https://github.com/espressif/esptool
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyserial-2.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyserial-2.5[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/esptool/esptool-2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2af3fd931fb8e2210e0804643edf0e0c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40f8ff32ab6f3ae2fb827c0003e9bd77
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.6 b/metadata/md5-cache/dev-embedded/esptool-2.6
index 75b7ed349fa0..fc601b258127 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.6
+++ b/metadata/md5-cache/dev-embedded/esptool-2.6
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyelftools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=test? ( dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyserial-3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyelftools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
 EAPI=7
 HOMEPAGE=https://github.com/espressif/esptool
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyserial-3.0[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v2.6.tar.gz -> esptool-2.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=18e815e53e538f5fe01c0637a32f66f3
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8bcedccb095c76b140344eb70e353991
diff --git a/metadata/md5-cache/dev-embedded/esptool-2.8 b/metadata/md5-cache/dev-embedded/esptool-2.8
index f60721b276b1..691dec5b734c 100644
--- a/metadata/md5-cache/dev-embedded/esptool-2.8
+++ b/metadata/md5-cache/dev-embedded/esptool-2.8
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyelftools[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(-)] )
+DEPEND=test? ( dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyserial-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyelftools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
 EAPI=7
 HOMEPAGE=https://github.com/espressif/esptool
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyserial-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyaes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyserial-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v2.8.tar.gz -> esptool-2.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0f41d2b7e97a219ceb87bfb3be90f975
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d33dfc48819876a88f8941a70e063a38
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1 b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
index bacf4ef4211b..ec5e039ca62a 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
+++ b/metadata/md5-cache/dev-embedded/libftdi-0.20-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Userspace access to FTDI USB interface chips
 EAPI=6
 HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
-IUSE=cxx doc examples python python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=cxx doc examples python +python_single_target_python3_6
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 sparc x86
 LICENSE=LGPL-2
-RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3748b26eaad77e62e0957c8d9bac9e6
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea03cbda6c084b977461ba521d2ff5cf
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.2-r1 b/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
index b41995ba907d..650b657cc766 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.2-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Userspace access to FTDI USB interface chips
 EAPI=6
 HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
-IUSE=cxx doc examples python static-libs test tools python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=cxx doc examples python static-libs test tools +python_single_target_python3_6
 KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 sparc x86
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee5f4db981143ba40703d24d5fe75683
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed6366412cf15bfac4b2a50b500f6c51
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.2-r2 b/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
index 6a949e9ed6ee..723346438e89 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Userspace access to FTDI USB interface chips
 EAPI=6
 HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
-IUSE=cxx doc examples python static-libs test tools python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=cxx doc examples python static-libs test tools +python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b66761c234af125fcf05d4492a29431
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=567c2cb0ba4cef2045364b51a5b1694f
diff --git a/metadata/md5-cache/dev-embedded/libftdi-1.4 b/metadata/md5-cache/dev-embedded/libftdi-1.4
index 10aee2f56490..f09499cf9f50 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-1.4
+++ b/metadata/md5-cache/dev-embedded/libftdi-1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Userspace access to FTDI USB interface chips
 EAPI=6
 HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
-IUSE=cxx doc examples python static-libs test tools python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=cxx doc examples python static-libs test tools +python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b66761c234af125fcf05d4492a29431
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=567c2cb0ba4cef2045364b51a5b1694f
diff --git a/metadata/md5-cache/dev-embedded/libftdi-9999 b/metadata/md5-cache/dev-embedded/libftdi-9999
index d2e368c930f0..565760b52ef4 100644
--- a/metadata/md5-cache/dev-embedded/libftdi-9999
+++ b/metadata/md5-cache/dev-embedded/libftdi-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Userspace access to FTDI USB interface chips
 EAPI=6
 HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
-IUSE=cxx doc examples python static-libs test tools python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=cxx doc examples python static-libs test tools +python_single_target_python3_6
 LICENSE=LGPL-2
 PROPERTIES=live
-RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=1
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b66761c234af125fcf05d4492a29431
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=567c2cb0ba4cef2045364b51a5b1694f
diff --git a/metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3 b/metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3
index aa3dc8881c5a..5391944de0a9 100644
--- a/metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3
+++ b/metadata/md5-cache/dev-embedded/nodemcu-uploader-0.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nodemcu-uploader/nodemcu-uploader-0.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac5454f2cd28227f8355cb42c06ecb50
diff --git a/metadata/md5-cache/dev-embedded/platformio-4.1.0 b/metadata/md5-cache/dev-embedded/platformio-4.1.0
deleted file mode 100644
index cf17bcab3fda..000000000000
--- a/metadata/md5-cache/dev-embedded/platformio-4.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=An open source ecosystem for IoT development
-EAPI=7
-HOMEPAGE=https://platformio.org/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/bottle-0.13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/click-5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/click-8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pyserial-3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/pyserial-4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/requests-2.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/requests-3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/semantic_version-2.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/semantic_version-3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/tabulate-0.8.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/tabulate-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pyelftools-0.25[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/pyelftools-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/marshmallow-2.20.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/marshmallow-3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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=mirror://pypi/p/platformio/platformio-4.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=07412ac0a8b424e837b6b969a84e3d50
diff --git a/metadata/md5-cache/dev-embedded/platformio-4.1.0-r1 b/metadata/md5-cache/dev-embedded/platformio-4.1.0-r1
new file mode 100644
index 000000000000..9f81dcb6e329
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/platformio-4.1.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DESCRIPTION=An open source ecosystem for IoT development
+EAPI=7
+HOMEPAGE=https://platformio.org/
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_6? ( <dev-python/bottle-0.13[python_targets_python3_6(-)] >=dev-python/click-5[python_targets_python3_6(-)] <dev-python/click-8[python_targets_python3_6(-)] dev-python/colorama[python_targets_python3_6(-)] >=dev-python/pyserial-3[python_targets_python3_6(-)] <dev-python/pyserial-4[python_targets_python3_6(-)] >=dev-python/requests-2.4[python_targets_python3_6(-)] <dev-python/requests-3[python_targets_python3_6(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_6(-)] <dev-python/semantic_version-3[python_targets_python3_6(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_6(-)] <dev-python/tabulate-1[python_targets_python3_6(-)] >=dev-python/pyelftools-0.25[python_targets_python3_6(-)] <dev-python/pyelftools-1[python_targets_python3_6(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_6(-)] <dev-python/marshmallow-3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( <dev-python/bottle-0.13[python_targets_python3_7(-)] >=dev-python/click-5[python_targets_python3_7(-)] <dev-python/click-8[python_targets_python3_7(-)] dev-python/colorama[python_targets_python3_7(-)] >=dev-python/pyserial-3[python_targets_python3_7(-)] <dev-python/pyserial-4[python_targets_python3_7(-)] >=dev-python/requests-2.4[python_targets_python3_7(-)] <dev-python/requests-3[python_targets_python3_7(-)] >=dev-python/semantic_version-2.8.1[python_targets_python3_7(-)] <dev-python/semantic_version-3[python_targets_python3_7(-)] >=dev-python/tabulate-0.8.3[python_targets_python3_7(-)] <dev-python/tabulate-1[python_targets_python3_7(-)] >=dev-python/pyelftools-0.25[python_targets_python3_7(-)] <dev-python/pyelftools-1[python_targets_python3_7(-)] >=dev-python/marshmallow-2.20.5[python_targets_python3_7(-)] <dev-python/marshmallow-3[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/platformio/platformio-4.1.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=faaf0f2d1f767c742a6df1828a43b48f
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index c6277c35c82f..8d28867c9182 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.2 b/metadata/md5-cache/dev-erlang/epam-1.0.2
index 9eecaf4d5c0d..e1ab35aed480 100644
--- a/metadata/md5-cache/dev-erlang/epam-1.0.2
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/epam/archive/1.0.2.tar.gz -> epam-1.0.2.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=67c98830a3c250a76e3f852c761ce5b7
diff --git a/metadata/md5-cache/dev-erlang/epam-1.0.6 b/metadata/md5-cache/dev-erlang/epam-1.0.6
index dcdaa2ffcccc..e2cb5a3c5073 100644
--- a/metadata/md5-cache/dev-erlang/epam-1.0.6
+++ b/metadata/md5-cache/dev-erlang/epam-1.0.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/erlang-17.1 sys-libs/pam dev-lang/erlang
 SLOT=0
 SRC_URI=https://github.com/processone/epam/archive/1.0.6.tar.gz -> epam-1.0.6.tar.gz
-_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=rebar	2500a38e0c20a46f90fe5e172a2c4267	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=184c4c56fa6cfb6280c6be06908847c1
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index d74680e5da71..a476ddbf9688 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/cardpics-0.4 b/metadata/md5-cache/dev-games/cardpics-0.4
index 613c8160767a..eb51f243db0f 100644
--- a/metadata/md5-cache/dev-games/cardpics-0.4
+++ b/metadata/md5-cache/dev-games/cardpics-0.4
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/cardpics/cardpics-0.4.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ccee334f657015b53e5090362edb55e9
diff --git a/metadata/md5-cache/dev-games/cegui-0.8.7 b/metadata/md5-cache/dev-games/cegui-0.8.7
deleted file mode 100644
index 88f0f6df3136..000000000000
--- a/metadata/md5-cache/dev-games/cegui-0.8.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) freeimage? ( media-libs/freeimage ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua:0 dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7:= ) opengl? ( virtual/opengl virtual/glu media-libs/glew:= ) pcre? ( dev-libs/libpcre ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) tinyxml? ( dev-libs/tinyxml ) truetype? ( media-libs/freetype:2 ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen ) opengl? ( media-libs/glm ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Crazy Eddie's GUI System
-EAPI=5
-HOMEPAGE=http://www.cegui.org.uk/
-IUSE=bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) freeimage? ( media-libs/freeimage ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua:0 dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7:= ) opengl? ( virtual/opengl virtual/glu media-libs/glew:= ) pcre? ( dev-libs/libpcre ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) tinyxml? ( dev-libs/tinyxml ) truetype? ( media-libs/freetype:2 ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] )
-REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fd5c3c227d8000707f8fbec9b194f30
diff --git a/metadata/md5-cache/dev-games/cegui-0.8.7-r1 b/metadata/md5-cache/dev-games/cegui-0.8.7-r1
new file mode 100644
index 000000000000..a632f712cff9
--- /dev/null
+++ b/metadata/md5-cache/dev-games/cegui-0.8.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) freeimage? ( media-libs/freeimage ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua:0 dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7:= ) opengl? ( virtual/opengl virtual/glu media-libs/glew:= ) pcre? ( dev-libs/libpcre ) python? ( python_single_target_python2_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/boost:=[python,python_targets_python2_7(-)] ) ) tinyxml? ( dev-libs/tinyxml ) truetype? ( media-libs/freetype:2 ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen ) opengl? ( media-libs/glm ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Crazy Eddie's GUI System
+EAPI=5
+HOMEPAGE=http://www.cegui.org.uk/
+IUSE=bidi debug devil doc freeimage expat irrlicht lua ogre opengl pcre python static-libs tinyxml truetype xerces-c +xml zip +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-libs/boost:= virtual/libiconv bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) freeimage? ( media-libs/freeimage ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua:0 dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7:= ) opengl? ( virtual/opengl virtual/glu media-libs/glew:= ) pcre? ( dev-libs/libpcre ) python? ( python_single_target_python2_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/boost:=[python,python_targets_python2_7(-)] ) ) tinyxml? ( dev-libs/tinyxml ) truetype? ( media-libs/freetype:2 ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] )
+REQUIRED_USE=|| ( expat tinyxml xerces-c xml ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/crayzedsgui/cegui-0.8.7.tar.bz2
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e2b30c61e160c78ecc324483435dece9
diff --git a/metadata/md5-cache/dev-games/freecell-solver-5.14.0 b/metadata/md5-cache/dev-games/freecell-solver-5.14.0
deleted file mode 100644
index 40c5b91340bf..000000000000
--- a/metadata/md5-cache/dev-games/freecell-solver-5.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/pysol_cards[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] tcmalloc? ( dev-util/google-perftools ) dev-perl/Path-Tiny dev-perl/Template-Toolkit
-DESCRIPTION=C library for automatically solving Freecell and some other solitaire variants
-EAPI=7
-HOMEPAGE=https://fc-solve.shlomifish.org/
-IUSE=tcmalloc python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 arm64 x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/pysol_cards[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] tcmalloc? ( dev-util/google-perftools )
-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://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-5.14.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=673477bc2c902bfc7b42465f523f589d
diff --git a/metadata/md5-cache/dev-games/freecell-solver-5.14.0-r1 b/metadata/md5-cache/dev-games/freecell-solver-5.14.0-r1
new file mode 100644
index 000000000000..8b4ae937c30d
--- /dev/null
+++ b/metadata/md5-cache/dev-games/freecell-solver-5.14.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pysol_cards[python_targets_python3_6(-)] dev-python/random2[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pysol_cards[python_targets_python3_7(-)] dev-python/random2[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pysol_cards[python_targets_python3_8(-)] dev-python/random2[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) tcmalloc? ( dev-util/google-perftools ) dev-perl/Path-Tiny dev-perl/Template-Toolkit
+DESCRIPTION=C library for automatically solving Freecell and some other solitaire variants
+EAPI=7
+HOMEPAGE=https://fc-solve.shlomifish.org/
+IUSE=tcmalloc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 arm64 x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pysol_cards[python_targets_python3_6(-)] dev-python/random2[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pysol_cards[python_targets_python3_7(-)] dev-python/random2[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pysol_cards[python_targets_python3_8(-)] dev-python/random2[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] ) tcmalloc? ( dev-util/google-perftools )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-5.14.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9083d76426348c2cd2607ee4e6dae503
diff --git a/metadata/md5-cache/dev-games/newton-3.14 b/metadata/md5-cache/dev-games/newton-3.14
index 5147c3b4e632..c629258ccd42 100644
--- a/metadata/md5-cache/dev-games/newton-3.14
+++ b/metadata/md5-cache/dev-games/newton-3.14
@@ -8,4 +8,4 @@ LICENSE=ZLIB
 SLOT=0
 SRC_URI=https://github.com/MADEAPPS/newton-dynamics/archive/newton-3.14.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acdbdca106382595dcb8258dd9ba98b9
+_md5_=f881c4adf8692e9fa2d06aa2d2570aa6
diff --git a/metadata/md5-cache/dev-games/ps2-packer-0.4.4 b/metadata/md5-cache/dev-games/ps2-packer-0.4.4
index 6f8c44db15c9..04f892b0efea 100644
--- a/metadata/md5-cache/dev-games/ps2-packer-0.4.4
+++ b/metadata/md5-cache/dev-games/ps2-packer-0.4.4
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/ps2-packer-0.4.4-linux.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33d793e60b653a02f3fa70658078b572
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
index abc11b813fc0..e7434ac519de 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2
@@ -8,5 +8,5 @@ RDEPEND=games-misc/games-envd
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98dc43073c2dc5815dc8ec70839cb33c
diff --git a/metadata/md5-cache/dev-games/simgear-2019.1.1 b/metadata/md5-cache/dev-games/simgear-2019.1.1
index 01cc00f7b8ec..fe287e495bbd 100644
--- a/metadata/md5-cache/dev-games/simgear-2019.1.1
+++ b/metadata/md5-cache/dev-games/simgear-2019.1.1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/simgear-2019.1.1.tar.bz2
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aadb5bc3937433e7e428ba889691803a
+_md5_=d272d1c534782fe113a7560fd4992f12
diff --git a/metadata/md5-cache/dev-games/simgear-9999 b/metadata/md5-cache/dev-games/simgear-9999
index 359a9243a6d2..4b4e2c1c7d5e 100644
--- a/metadata/md5-cache/dev-games/simgear-9999
+++ b/metadata/md5-cache/dev-games/simgear-9999
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/expat dev-games/openscenegraph media-libs/openal net-misc/curl
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=feceb56bbd21e7aac6af03eaf7704676
+_md5_=03b49a73754d2cd244e1ca13dd9f1ed2
diff --git a/metadata/md5-cache/dev-games/tiled-1.2.4 b/metadata/md5-cache/dev-games/tiled-1.2.4
index 34c7e203d44b..f6e30b7b9ee7 100644
--- a/metadata/md5-cache/dev-games/tiled-1.2.4
+++ b/metadata/md5-cache/dev-games/tiled-1.2.4
@@ -4,12 +4,12 @@ DEPEND=>=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=dev
 DESCRIPTION=A general purpose tile map editor
 EAPI=7
 HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python +python_targets_python3_6 +python_single_target_python3_6
+IUSE=examples python +python_single_target_python3_6
 KEYWORDS=amd64
 LICENSE=BSD BSD-2 GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtwidgets-5.9:5 sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/bjorn/tiled/archive/v1.2.4/tiled-1.2.4.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53aee38810ccb0a970b22175493624a7
diff --git a/metadata/md5-cache/dev-games/tiled-1.2.5 b/metadata/md5-cache/dev-games/tiled-1.2.5
index 084dc44b6ef8..be1f1cbe15a6 100644
--- a/metadata/md5-cache/dev-games/tiled-1.2.5
+++ b/metadata/md5-cache/dev-games/tiled-1.2.5
@@ -4,12 +4,12 @@ DEPEND=>=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=dev
 DESCRIPTION=A general purpose tile map editor
 EAPI=7
 HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python +python_targets_python3_6 +python_single_target_python3_6
+IUSE=examples python +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=BSD BSD-2 GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtwidgets-5.9:5 sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/bjorn/tiled/archive/v1.2.5/tiled-1.2.5.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bb674138baaa75f317ce73ef9c0e937
diff --git a/metadata/md5-cache/dev-games/tiled-1.3.1 b/metadata/md5-cache/dev-games/tiled-1.3.1
index 49e1131340ea..6d1d3c9a3f9b 100644
--- a/metadata/md5-cache/dev-games/tiled-1.3.1
+++ b/metadata/md5-cache/dev-games/tiled-1.3.1
@@ -4,12 +4,12 @@ DEPEND=>=dev-qt/qtcore-5.10:5 >=dev-qt/qtdeclarative-5.10:5 >=dev-qt/qtgui-5.10:
 DESCRIPTION=A general purpose tile map editor
 EAPI=7
 HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python +python_targets_python3_6 +python_single_target_python3_6
+IUSE=examples python +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=BSD BSD-2 GPL-2+
 RDEPEND=>=dev-qt/qtcore-5.10:5 >=dev-qt/qtdeclarative-5.10:5 >=dev-qt/qtgui-5.10:5 >=dev-qt/qtnetwork-5.10:5 >=dev-qt/qtwidgets-5.10:5 sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/bjorn/tiled/archive/v1.3.1/tiled-1.3.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab4f70046a2ec0b11f08f2d742ba3ec9
diff --git a/metadata/md5-cache/dev-games/tiled-1.3.2 b/metadata/md5-cache/dev-games/tiled-1.3.2
new file mode 100644
index 000000000000..1307d2dc85ae
--- /dev/null
+++ b/metadata/md5-cache/dev-games/tiled-1.3.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5
+DEFINED_PHASES=configure install postinst postrm setup
+DEPEND=>=dev-qt/qtcore-5.10:5 >=dev-qt/qtdeclarative-5.10:5 >=dev-qt/qtgui-5.10:5 >=dev-qt/qtnetwork-5.10:5 >=dev-qt/qtwidgets-5.10:5 sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
+DESCRIPTION=A general purpose tile map editor
+EAPI=7
+HOMEPAGE=https://www.mapeditor.org/
+IUSE=examples python +python_single_target_python3_6
+KEYWORDS=~amd64
+LICENSE=BSD BSD-2 GPL-2+
+RDEPEND=>=dev-qt/qtcore-5.10:5 >=dev-qt/qtdeclarative-5.10:5 >=dev-qt/qtgui-5.10:5 >=dev-qt/qtnetwork-5.10:5 >=dev-qt/qtwidgets-5.10:5 sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
+SLOT=0
+SRC_URI=https://github.com/bjorn/tiled/archive/v1.3.2/tiled-1.3.2.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=28896e7145c1b35653b2cc8fe36e0314
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index 30035ec093d8..8ca94c7f4408 100644
--- a/metadata/md5-cache/dev-haskell/Manifest.gz
+++ b/metadata/md5-cache/dev-haskell/Manifest.gz
diff --git a/metadata/md5-cache/dev-haskell/regex-tdfa-rc-1.1.8.3 b/metadata/md5-cache/dev-haskell/regex-tdfa-rc-1.1.8.3
index 1d4026ff3577..65383fa114a2 100644
--- a/metadata/md5-cache/dev-haskell/regex-tdfa-rc-1.1.8.3
+++ b/metadata/md5-cache/dev-haskell/regex-tdfa-rc-1.1.8.3
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/mtl:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell
 SLOT=0/1.1.8.3
 SRC_URI=https://hackage.haskell.org/package/regex-tdfa-rc-1.1.8.3/regex-tdfa-rc-1.1.8.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ghc-package	cfc8267c6151d804d0c34bf9e180533f	haskell-cabal	433b5153bec6b0ffe21c7be2210e8396	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1997b69a18a7285dcb3b56de609b2848
+_md5_=da60c751d73fc625934fd378c4c62319
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index a6321d955d9b..b2f0b6582bb3 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/backport-util-concurrent-3.1-r1 b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
index 4c92775900e5..356246b46c3c 100644
--- a/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
+++ b/metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/backport-jsr166/3.1/backport-util-concurrent-Java60-3.1-src.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ef35c5d37c2f68c2f0ed327810bee00e
+_md5_=a9d1dd7bf67d371dc61ad200a7007e97
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 fa686ec61e6a..41b8fc405724 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
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm prerm setup
 DEPEND=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
 DESCRIPTION=Java wrappers around GCJ
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=awt
 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	7cfcabfd055e69d3568103a4e0b0fae7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f46d2f52bd5860c1666574872420e4b3
+_md5_=57f1a8d3a9291c24877f5927f38371ef
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 5aad5e65a1f5..f89545afafb9 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://dev.gentoo.org/~gyakovlev/distfiles/java-config-2.2.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01c7e396b2501f5b8e59893601a34f2c
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-11.0.5 b/metadata/md5-cache/dev-java/java-sdk-docs-11.0.5
index 8cffde47eecf..20977320a2d5 100644
--- a/metadata/md5-cache/dev-java/java-sdk-docs-11.0.5
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-11.0.5
@@ -8,4 +8,4 @@ LICENSE=oracle-java-documentation-11
 RESTRICT=fetch
 SLOT=11
 SRC_URI=jdk-11.0.5_doc-all.zip
-_md5_=d615290ad094490cbcab5a278a3f3a9c
+_md5_=98b753bb546e3fe567dd37df4e3ba5ad
diff --git a/metadata/md5-cache/dev-java/java-sdk-docs-9.0.4 b/metadata/md5-cache/dev-java/java-sdk-docs-9.0.4
index 1120d791b6b0..181a33eddbe5 100644
--- a/metadata/md5-cache/dev-java/java-sdk-docs-9.0.4
+++ b/metadata/md5-cache/dev-java/java-sdk-docs-9.0.4
@@ -8,4 +8,4 @@ LICENSE=oracle-java-documentation-9
 RESTRICT=fetch
 SLOT=9
 SRC_URI=jdk-9.0.4_doc-all.zip
-_md5_=505fa318939ea09fe21ad0826ddb798e
+_md5_=fc0287acc7e75b76b966c36b0d837409
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 8390af9cf299..25481d4c5cd2 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b271bc6eae91d16bc750eb480560bde2
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.1 b/metadata/md5-cache/dev-java/javatoolkit-0.6.1
index d8f6a26a8c3d..883d32ce2397 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.1
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.1.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=917fcd621af483e5352ed066f53388d4
diff --git a/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1 b/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
index 62e6e93cd941..ab5b67403e7a 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
+++ b/metadata/md5-cache/dev-java/javatoolkit-0.6.2-r1
@@ -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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/javatoolkit.git/snapshot/javatoolkit-0.6.2.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d24ed70e3ce18a750a494a9e56c1e187
diff --git a/metadata/md5-cache/dev-java/javatoolkit-9999 b/metadata/md5-cache/dev-java/javatoolkit-9999
index 69356e6c7a10..a1e1e2cd5bf7 100644
--- a/metadata/md5-cache/dev-java/javatoolkit-9999
+++ b/metadata/md5-cache/dev-java/javatoolkit-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3848b4040ad167842f1ccef9becadfc8
diff --git a/metadata/md5-cache/dev-java/objenesis-1.3 b/metadata/md5-cache/dev-java/objenesis-1.3
index 2480da497c2c..c2d12df129a8 100644
--- a/metadata/md5-cache/dev-java/objenesis-1.3
+++ b/metadata/md5-cache/dev-java/objenesis-1.3
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip
 SLOT=0
 SRC_URI=https://objenesis.googlecode.com/files/objenesis-1.3-bin.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a26cf914d4aaf1abe702c698d17df032
+_md5_=e7cb60b881df594283a917867c953068
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.99 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.99
new file mode 100644
index 000000000000..480272d9352d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.99
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.99/src/apache-tomcat-7.0.99-src.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=345148462117e7b9d3a2cde6d2413f73
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.50 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.50
new file mode 100644
index 000000000000..283b93ffe831
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.50
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.50/src/apache-tomcat-8.5.50-src.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ddbacae0e101eae5dbe81c3b764a0100
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.30 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.30
new file mode 100644
index 000000000000..5af0ce99007d
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.30
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.30/src/apache-tomcat-9.0.30-src.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=016c0fca135aa60fbcecf7096105aea4
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.7 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.7
deleted file mode 100644
index 1618ec14b9e1..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.7/src/apache-tomcat-9.0.7-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=156566c5990eb94a484ffdef37774979
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index fc3117bd5901..993bbef1756a 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/R-3.5.3 b/metadata/md5-cache/dev-lang/R-3.5.3
index a0599d7fd2f3..f10e57e44999 100644
--- a/metadata/md5-cache/dev-lang/R-3.5.3
+++ b/metadata/md5-cache/dev-lang/R-3.5.3
@@ -13,4 +13,4 @@ RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.5.3.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a9655b3037228651cdf44571027b9650
+_md5_=fda7e1cec5582673217edac17cc94326
diff --git a/metadata/md5-cache/dev-lang/R-3.6.0 b/metadata/md5-cache/dev-lang/R-3.6.0
index 7d2254f9b5e4..1780bc698f46 100644
--- a/metadata/md5-cache/dev-lang/R-3.6.0
+++ b/metadata/md5-cache/dev-lang/R-3.6.0
@@ -13,4 +13,4 @@ RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.6.0.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a9655b3037228651cdf44571027b9650
+_md5_=fda7e1cec5582673217edac17cc94326
diff --git a/metadata/md5-cache/dev-lang/R-3.6.2 b/metadata/md5-cache/dev-lang/R-3.6.2
index 54de3c7890db..55fabd2d456c 100644
--- a/metadata/md5-cache/dev-lang/R-3.6.2
+++ b/metadata/md5-cache/dev-lang/R-3.6.2
@@ -13,4 +13,4 @@ RESTRICT=minimal? ( test )
 SLOT=0
 SRC_URI=mirror://cran/src/base/R-3/R-3.6.2.tar.gz https://raw.githubusercontent.com/deepayan/rcompletion/78d6830e28ea90a046da79a9b4f70c39594bb6d6/bash_completion/R -> R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=169c0924e0a567c4b9122b0c49df707a
+_md5_=97db2efdd05a11ba2f479e6d4f213953
diff --git a/metadata/md5-cache/dev-lang/erlang-22.2.5 b/metadata/md5-cache/dev-lang/erlang-22.2.5
new file mode 100644
index 000000000000..e71f15ab31c8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-22.2.5
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=7
+HOMEPAGE=https://www.erlang.org/
+IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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/22.2.5
+SRC_URI=https://github.com/erlang/otp/archive/OTP-22.2.5.tar.gz -> erlang-22.2.5.tar.gz http://erlang.org/download/otp_doc_man_22.2.tar.gz -> erlang_doc_man_22.2.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.2.tar.gz -> erlang_doc_html_22.2.tar.gz )
+_eclasses_=elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=5ff5ff31759b92563ecd3f244e450b3b
diff --git a/metadata/md5-cache/dev-lang/erlang-22.2.6 b/metadata/md5-cache/dev-lang/erlang-22.2.6
new file mode 100644
index 000000000000..5f9b08171f9b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/erlang-22.2.6
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
+EAPI=7
+HOMEPAGE=https://www.erlang.org/
+IUSE=doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=Apache-2.0
+RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) 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/22.2.6
+SRC_URI=https://github.com/erlang/otp/archive/OTP-22.2.6.tar.gz -> erlang-22.2.6.tar.gz http://erlang.org/download/otp_doc_man_22.2.tar.gz -> erlang_doc_man_22.2.tar.gz doc? ( http://erlang.org/download/otp_doc_html_22.2.tar.gz -> erlang_doc_html_22.2.tar.gz )
+_eclasses_=elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=5ff5ff31759b92563ecd3f244e450b3b
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4 b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
index 1c236d78e9cc..604b5292fbb0 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2016-r4
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:4.9.4 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=!test? ( test )
 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.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.4.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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ac9d81ea9f971b1a48553000566f0f4
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
index cb5e4bd9c4b6..365684610909 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2017-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:6.3.0 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=!test? ( test )
 SLOT=6.3.0
 SRC_URI=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 ) ) 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 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=710031f328cf39f5d1a6049966aeb4f9
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
index 2288726836c7..cc0f9a951d58 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2018-r3
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:7.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=!test? ( test )
 SLOT=7.3.1
 SRC_URI=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 ) ) mirror://gentoo/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.8.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ea8f21112dd25aa0ba876fe3a4bd2ee
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r1
index 835c3b24244f..e5dfeefb6981 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2019-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2019-r1
@@ -11,5 +11,5 @@ RDEPEND=!sys-devel/gcc:8.3.1 sys-libs/zlib nls? ( virtual/libintl ) virtual/libi
 RESTRICT=!test? ( test )
 SLOT=8.3.1
 SRC_URI=http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49 -> gnat-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049 -> gcc-8-2019-20190517-18C94-src.tar.gz http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50 -> gcc-interface-8-2019-20190510-18F59-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 ) ) mirror://gentoo/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=54678344cc998c8349fae78cce47ced1
diff --git a/metadata/md5-cache/dev-lang/hy-0.14.0 b/metadata/md5-cache/dev-lang/hy-0.14.0
index 4e909d16f53e..6ac487195e5b 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_python3_6 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61b06988f28316e39ae0546e267e5058
diff --git a/metadata/md5-cache/dev-lang/hy-0.15.0 b/metadata/md5-cache/dev-lang/hy-0.15.0
index 6a829445cbd9..0936ce21a038 100644
--- a/metadata/md5-cache/dev-lang/hy-0.15.0
+++ b/metadata/md5-cache/dev-lang/hy-0.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.15.0.tar.gz -> hy-0.15.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ff793b457d61d05439b93377ffca3b45
diff --git a/metadata/md5-cache/dev-lang/hy-0.16.0 b/metadata/md5-cache/dev-lang/hy-0.16.0
index 09d48170a91b..126af4f27100 100644
--- a/metadata/md5-cache/dev-lang/hy-0.16.0
+++ b/metadata/md5-cache/dev-lang/hy-0.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.16.0.tar.gz -> hy-0.16.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a9c244d7992902954b580a006c4eacf3
diff --git a/metadata/md5-cache/dev-lang/hy-0.17.0 b/metadata/md5-cache/dev-lang/hy-0.17.0
index c68d805d874b..b70436c9f825 100644
--- a/metadata/md5-cache/dev-lang/hy-0.17.0
+++ b/metadata/md5-cache/dev-lang/hy-0.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hylang/hy/archive/0.17.0.tar.gz -> hy-0.17.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c31785f04b1df5e165e1f16cd6a431d
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.14.0 b/metadata/md5-cache/dev-lang/jsonnet-0.14.0
deleted file mode 100644
index bbca20592d24..000000000000
--- a/metadata/md5-cache/dev-lang/jsonnet-0.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=A data templating language for app and tool developers
-EAPI=7
-HOMEPAGE=https://jsonnet.org/
-IUSE=custom-optimization python python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
-SLOT=0
-SRC_URI=https://github.com/google/jsonnet/archive/v0.14.0.tar.gz -> jsonnet-0.14.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c13e2e5cb6f634e01a618309b002485
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.14.0-r1 b/metadata/md5-cache/dev-lang/jsonnet-0.14.0-r1
deleted file mode 100644
index 53dbed73e751..000000000000
--- a/metadata/md5-cache/dev-lang/jsonnet-0.14.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=A data templating language for app and tool developers
-EAPI=7
-HOMEPAGE=https://jsonnet.org/
-IUSE=custom-optimization python test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/jsonnet/archive/v0.14.0.tar.gz -> jsonnet-0.14.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c7c2e40d6aa34318df0eb91a4223944d
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.15.0 b/metadata/md5-cache/dev-lang/jsonnet-0.15.0
new file mode 100644
index 000000000000..101bd984c17f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.15.0
@@ -0,0 +1,16 @@
+BDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=A data templating language for app and tool developers
+EAPI=7
+HOMEPAGE=https://jsonnet.org/
+IUSE=custom-optimization python test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/jsonnet/archive/v0.15.0.tar.gz -> jsonnet-0.15.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2ae3beabd4aff89ec9c32879cc8bf61d
diff --git a/metadata/md5-cache/dev-lang/julia-1.2.0 b/metadata/md5-cache/dev-lang/julia-1.2.0
index 677217f7b04f..90a7e26d5f4d 100644
--- a/metadata/md5-cache/dev-lang/julia-1.2.0
+++ b/metadata/md5-cache/dev-lang/julia-1.2.0
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.2.0/julia-1.2.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/2348256acf5759a544e5ca7935f638d2bc091d60 -> julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/454f60150c7f023526d353e1e6b386f93ee0b116 -> julia-utf8proc-454f60150c7f023526d353e1e6b386f93ee0b116.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 http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=887ef758a1b53864821f5e934a508ef0
+_md5_=ca971813836eed4eae45c8081aa5be0b
diff --git a/metadata/md5-cache/dev-lang/julia-1.3.0 b/metadata/md5-cache/dev-lang/julia-1.3.0
index f3a5d1d7110f..d116c8b1fc04 100644
--- a/metadata/md5-cache/dev-lang/julia-1.3.0
+++ b/metadata/md5-cache/dev-lang/julia-1.3.0
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.3.0/julia-1.3.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/35b1504507a7a4168caae3d78db54d1121b121e1 -> julia-libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/5c632c57426f2e4246e3b64dd2fd088d3920f9e5 -> julia-utf8proc-5c632c57426f2e4246e3b64dd2fd088d3920f9e5.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 http://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d5b82688a0d767a536b0582569976985
+_md5_=daad69c60cfc83a8c9240e1e6d387dff
diff --git a/metadata/md5-cache/dev-lang/julia-9999 b/metadata/md5-cache/dev-lang/julia-9999
index 89d50da56020..0b5ed8f00884 100644
--- a/metadata/md5-cache/dev-lang/julia-9999
+++ b/metadata/md5-cache/dev-lang/julia-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-devel/llvm-6.0.0:= >=sys-devel/clang-6.0.0:= dev-libs/double-conve
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f1b63c428d3aadd314b447ff80cd1d7a
+_md5_=5ae7ea3e47aee32a4565a79d386ec8de
diff --git a/metadata/md5-cache/dev-lang/lazarus-2.0.2 b/metadata/md5-cache/dev-lang/lazarus-2.0.2
index 765766ed004f..7ef9b8b9a62d 100644
--- a/metadata/md5-cache/dev-lang/lazarus-2.0.2
+++ b/metadata/md5-cache/dev-lang/lazarus-2.0.2
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=python? ( https://github.com/Alexey-T/Python-for-Lazarus/archive/586eec1a5ea609ef9df2bf586be06825d9fbd50f.tar.gz -> lazarus-2.0.2-python.tar.gz ) https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%202.0.2/lazarus-2.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d
-_md5_=139b26b7faaab2325107cc6d7cfe2ec6
+_md5_=0bfdaece15d55cda9f6097eb94e4b30e
diff --git a/metadata/md5-cache/dev-lang/mlton-20180207 b/metadata/md5-cache/dev-lang/mlton-20180207
index f12fdd281d8c..22b778fa8d5b 100644
--- a/metadata/md5-cache/dev-lang/mlton-20180207
+++ b/metadata/md5-cache/dev-lang/mlton-20180207
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/gmp:*
 SLOT=0/20180207
 SRC_URI=!binary? ( mirror://sourceforge/mlton/mlton-20180207.src.tgz ) !bootstrap-smlnj? ( amd64? ( mirror://sourceforge/mlton/mlton-20180207-1.amd64-linux.tgz ) )
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=730f246811de2c2f669af658cffd0fcc
+_md5_=1ae3e7c43aa8b3b11099f977eff8681a
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.03-r1 b/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
index 51f1180daaab..3c64e3d5855b 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.03-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2019.03.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49dd3041a77a556676662fe764b91552
+_md5_=8eb9eb4331da29f865846a4fa7010a12
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.07-r1 b/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
index 8379ff992933..625bcf20e1ff 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.07-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2019.07.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d830605ff087b369fb099890260a8ec
+_md5_=eba41cfd52444f93d8ad5b683171e8e3
diff --git a/metadata/md5-cache/dev-lang/moarvm-2019.11 b/metadata/md5-cache/dev-lang/moarvm-2019.11
index 735eb2fd7a81..9a62dbb0e9fa 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2019.11
+++ b/metadata/md5-cache/dev-lang/moarvm-2019.11
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2019.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f06b69c603bc90d5104b890d50a16832
+_md5_=d92a9c6c0e72b44eb22a1fced43d5f67
diff --git a/metadata/md5-cache/dev-lang/nqp-2019.03-r1 b/metadata/md5-cache/dev-lang/nqp-2019.03-r1
index 5740e4ef4e64..f6689eb963c3 100644
--- a/metadata/md5-cache/dev-lang/nqp-2019.03-r1
+++ b/metadata/md5-cache/dev-lang/nqp-2019.03-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2019.03/nqp-2019.03.tar.gz -> nqp-2019.03.official.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7b7040bf672095ebd08247d430356583
+_md5_=711bfb82c9e49b0fe62b3c9dbca3b91d
diff --git a/metadata/md5-cache/dev-lang/nqp-2019.07.1 b/metadata/md5-cache/dev-lang/nqp-2019.07.1
index 0b9b5dc0b2a5..5297c423a155 100644
--- a/metadata/md5-cache/dev-lang/nqp-2019.07.1
+++ b/metadata/md5-cache/dev-lang/nqp-2019.07.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2019.07.1/nqp-2019.07.1.tar.gz
 _eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multibuild	40fe59465edacd730c644ec2bc197809
-_md5_=2a3fb5562ce14e761741e9bec21a7efd
+_md5_=b1b309a3040930cef30e4273427bda10
diff --git a/metadata/md5-cache/dev-lang/nqp-2019.11 b/metadata/md5-cache/dev-lang/nqp-2019.11
index e8747cab9a02..12ec8f5f76c4 100644
--- a/metadata/md5-cache/dev-lang/nqp-2019.11
+++ b/metadata/md5-cache/dev-lang/nqp-2019.11
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/perl6/nqp/releases/download/2019.11/nqp-2019.11.tar.gz
 _eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multibuild	40fe59465edacd730c644ec2bc197809
-_md5_=2a3fb5562ce14e761741e9bec21a7efd
+_md5_=b1b309a3040930cef30e4273427bda10
diff --git a/metadata/md5-cache/dev-lang/nqp-9999 b/metadata/md5-cache/dev-lang/nqp-9999
index 91ace8bcb9c6..cbc55cbbb8f7 100644
--- a/metadata/md5-cache/dev-lang/nqp-9999
+++ b/metadata/md5-cache/dev-lang/nqp-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( java moar )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multibuild	40fe59465edacd730c644ec2bc197809
-_md5_=2a3fb5562ce14e761741e9bec21a7efd
+_md5_=b1b309a3040930cef30e4273427bda10
diff --git a/metadata/md5-cache/dev-lang/ocaml-4.09.0 b/metadata/md5-cache/dev-lang/ocaml-4.09.0
index 6f7fe7515ed6..97b9be69b9f2 100644
--- a/metadata/md5-cache/dev-lang/ocaml-4.09.0
+++ b/metadata/md5-cache/dev-lang/ocaml-4.09.0
@@ -4,10 +4,10 @@ DESCRIPTION=Programming language supporting functional, imperative & object-orie
 EAPI=7
 HOMEPAGE=https://ocaml.org/
 IUSE=emacs flambda latex +ocamlopt spacetime xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 PDEPEND=emacs? ( app-emacs/ocaml-mode ) xemacs? ( app-xemacs/ocaml )
 RDEPEND=sys-libs/binutils-libs:= spacetime? ( sys-libs/libunwind:= )
 SLOT=0/4.09.0
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.09.0.tar.gz -> ocaml-4.09.0.tar.gz
-_md5_=8da76606b3bea00a522c2663cd54f160
+_md5_=dcf6f9ffa6c6f9a83ee9dd034b7da226
diff --git a/metadata/md5-cache/dev-lang/python-3.7.5-r1 b/metadata/md5-cache/dev-lang/python-3.7.5-r1
index 5ae47c0f3306..f5eb36b15990 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.7.5-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.5/Python-3.7.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.4-1.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6b6b41c9ad07e762271d3efdbef370cf
+_md5_=308971faf01d7978ef3e390d8627a944
diff --git a/metadata/md5-cache/dev-lang/rust-1.37.0 b/metadata/md5-cache/dev-lang/rust-1.37.0
index 7a2d5259d0a9..622376027468 100644
--- a/metadata/md5-cache/dev-lang/rust-1.37.0
+++ b/metadata/md5-cache/dev-lang/rust-1.37.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:8[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-8* ) ) <sys-devel/llvm-9:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:8[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-8* ) ) <sys-devel/llvm-9:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=stable/1.37
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.xz -> rustc-1.37.0-src.tar.xz amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.36.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.36.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.36.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.36.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.36.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.36.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.36.0-i686-unknown-linux-gnu.tar.xz )
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rust-toolchain	1eff5c2db125c1abe5a532d7e7c9af0e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9cff85b8cc52534f73da019f2b983bc0
+_md5_=08d2095ba7f444d358371b5588b8fd4e
diff --git a/metadata/md5-cache/dev-lang/rust-1.38.0 b/metadata/md5-cache/dev-lang/rust-1.38.0
index df1cd2eaa267..d76c50230308 100644
--- a/metadata/md5-cache/dev-lang/rust-1.38.0
+++ b/metadata/md5-cache/dev-lang/rust-1.38.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=stable/1.38
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.38.0-src.tar.xz -> rustc-1.38.0-src.tar.xz amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.37.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.37.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.37.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.37.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.37.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.37.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.37.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.37.0-i686-unknown-linux-gnu.tar.xz )
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rust-toolchain	1eff5c2db125c1abe5a532d7e7c9af0e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b470432a76a9286ce77248c61641e2d2
+_md5_=41421ff613e11c2bf17f1a518c42d4e8
diff --git a/metadata/md5-cache/dev-lang/rust-1.39.0 b/metadata/md5-cache/dev-lang/rust-1.39.0
index a387c89ad372..e11fd308dde4 100644
--- a/metadata/md5-cache/dev-lang/rust-1.39.0
+++ b/metadata/md5-cache/dev-lang/rust-1.39.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) dev-util/cmake
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=stable/1.39
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.39.0-src.tar.xz -> rustc-1.39.0-src.tar.xz amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.38.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.38.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.38.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.38.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.38.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.38.0-i686-unknown-linux-gnu.tar.xz )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rust-toolchain	1eff5c2db125c1abe5a532d7e7c9af0e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e396018efa29216810a85ec3507bff86
+_md5_=15cd8738b7be3c8f93b54607f4cf23d2
diff --git a/metadata/md5-cache/dev-lang/rust-1.40.0 b/metadata/md5-cache/dev-lang/rust-1.40.0
deleted file mode 100644
index f4d5552f5b3c..000000000000
--- a/metadata/md5-cache/dev-lang/rust-1.40.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=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=7
-HOMEPAGE=https://www.rust-lang.org/
-IUSE=clippy cpu_flags_x86_sse2 debug doc libressl nightly rls rustfmt system-llvm 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_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
-RDEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) >=app-eselect/eselect-rust-20190311 !dev-util/cargo rustfmt? ( !dev-util/rustfmt )
-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_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
-SLOT=stable/1.40
-SRC_URI=https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz -> rustc-1.40.0-src.tar.xz amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.39.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.39.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.39.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.39.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.39.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.39.0-i686-unknown-linux-gnu.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rust-toolchain	1eff5c2db125c1abe5a532d7e7c9af0e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=810c40535538d0267632014410c8b342
diff --git a/metadata/md5-cache/dev-lang/rust-1.40.0-r1 b/metadata/md5-cache/dev-lang/rust-1.40.0-r1
index db218b12b1f7..bb236a168a3d 100644
--- a/metadata/md5-cache/dev-lang/rust-1.40.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.40.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.40.0-r1 =dev-lang/rust-bin-1.40.0* ) ) system-llvm? ( dev-util/cmake dev-util/ninja )
+DEPEND=sys-libs/zlib !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libssh2 net-libs/http-parser:= net-misc/curl[ssl] elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.40.0-r1 =dev-lang/rust-bin-1.40.0* ) ) system-llvm? ( dev-util/cmake dev-util/ninja )
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=stable/1.40
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz -> rustc-1.40.0-src.tar.xz !system-bootstrap? ( amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.39.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.39.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.39.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.39.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.39.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.39.0-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rust-toolchain	1eff5c2db125c1abe5a532d7e7c9af0e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b167ef1efcf0a76f8f142c3f710e9550
+_md5_=ed1dfa0465f19746ba95cee094f84713
diff --git a/metadata/md5-cache/dev-lang/rust-1.41.0 b/metadata/md5-cache/dev-lang/rust-1.41.0
index c96cedbd5b7b..60ccbfe719b5 100644
--- a/metadata/md5-cache/dev-lang/rust-1.41.0
+++ b/metadata/md5-cache/dev-lang/rust-1.41.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( >=dev-lang/rust-1.40.0-r1 >=dev-lang/rust-bin-1.40 ) ) system-llvm? ( dev-util/cmake dev-util/ninja )
+DEPEND=net-libs/libssh2:= net-libs/http-parser:= net-misc/curl:=[ssl] sys-libs/zlib:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/libunwind ) system-llvm? ( || ( sys-devel/llvm:9[llvm_targets_WebAssembly?] wasm? ( =sys-devel/lld-9* ) ) <sys-devel/llvm-10:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( >=dev-lang/rust-1.40.0-r1 >=dev-lang/rust-bin-1.40 ) ) system-llvm? ( dev-util/cmake dev-util/ninja )
 DESCRIPTION=Systems programming language from Mozilla
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 SLOT=stable/1.41
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.41.0-src.tar.xz -> rustc-1.41.0-src.tar.xz !system-bootstrap? ( amd64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-musl.tar.xz ) ) arm? ( https://static.rust-lang.org/dist/rust-1.40.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.40.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.40.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.40.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.40.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.40.0-i686-unknown-linux-gnu.tar.xz ) )
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	rust-toolchain	1eff5c2db125c1abe5a532d7e7c9af0e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9c34a17c6efae3d5053293ce20862bb2
+_md5_=5a8df410385db2e5d6aed6d88af64456
diff --git a/metadata/md5-cache/dev-lang/smlnj-110.82 b/metadata/md5-cache/dev-lang/smlnj-110.82
index f804d56ce152..8ad4a3c146e1 100644
--- a/metadata/md5-cache/dev-lang/smlnj-110.82
+++ b/metadata/md5-cache/dev-lang/smlnj-110.82
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=amd64? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.x86-unix.tgz -> smlnj-110.82-boot.x86-unix.tgz ) ppc? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.ppc-unix.tgz -> smlnj-110.82-boot.ppc-unix.tgz ) sparc? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.sparc-unix.tgz -> smlnj-110.82-boot.sparc-unix.tgz ) x86? ( http://smlnj.cs.uchicago.edu/dist/working/110.82/boot.x86-unix.tgz -> smlnj-110.82-boot.x86-unix.tgz ) http://smlnj.cs.uchicago.edu/dist/working/110.82/doc.tgz -> smlnj-110.82-doc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/config.tgz -> smlnj-110.82-config.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/cm.tgz -> smlnj-110.82-cm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/compiler.tgz -> smlnj-110.82-compiler.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/runtime.tgz -> smlnj-110.82-runtime.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/system.tgz -> smlnj-110.82-system.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/MLRISC.tgz -> smlnj-110.82-MLRISC.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/smlnj-lib.tgz -> smlnj-110.82-smlnj-lib.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/old-basis.tgz -> smlnj-110.82-old-basis.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ckit.tgz -> smlnj-110.82-ckit.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/nlffi.tgz -> smlnj-110.82-nlffi.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/cml.tgz -> smlnj-110.82-cml.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/eXene.tgz -> smlnj-110.82-eXene.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-lpt.tgz -> smlnj-110.82-ml-lpt.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-lex.tgz -> smlnj-110.82-ml-lex.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-yacc.tgz -> smlnj-110.82-ml-yacc.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/ml-burg.tgz -> smlnj-110.82-ml-burg.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/pgraph.tgz -> smlnj-110.82-pgraph.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/trace-debug-profile.tgz -> smlnj-110.82-trace-debug-profile.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/heap2asm.tgz -> smlnj-110.82-heap2asm.tgz http://smlnj.cs.uchicago.edu/dist/working/110.82/smlnj-c.tgz -> smlnj-110.82-smlnj-c.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f0534af066f5095e7a89fd93d495cf54
+_md5_=51c4f8cbbbcb599ac974f94b709a07be
diff --git a/metadata/md5-cache/dev-lang/snobol-1.4.1 b/metadata/md5-cache/dev-lang/snobol-1.4.1
index 68f4dff31ed7..43967b6ac198 100644
--- a/metadata/md5-cache/dev-lang/snobol-1.4.1
+++ b/metadata/md5-cache/dev-lang/snobol-1.4.1
@@ -8,4 +8,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=ftp://ftp.snobol4.org/snobol/old/snobol4-1.4.1.tar.gz
-_md5_=2783429f006884aca84426a9cb26e9e4
+_md5_=9a611fe57edbb19166904630b52f84cf
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-38.3.0 b/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
index b94d45a891bd..0c14d722d6f9 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-38.3.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) ia64? ( test )
 SLOT=38
 SRC_URI=https://archive.mozilla.org/pub/spidermonkey/releases/38.3.0/mozjs-38.3.0sfink2.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot38-patches-01.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1a49a5ee4743e9e2cc08a30b783256a9
+_md5_=1f74d9cdbe0b09eda39127d80351c8a0
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-45.0.2 b/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
index bcd239c1db29..2b769e5e17f4 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
+++ b/metadata/md5-cache/dev-lang/spidermonkey-45.0.2
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) ia64? ( test )
 SLOT=45
 SRC_URI=https://archive.mozilla.org/pub/spidermonkey/releases/45.0.2/mozjs-45.0.2.tar.bz2 https://dev.gentoo.org/~axs/distfiles/spidermonkey-slot45-patches-01.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v4	45c0b61c53e2dbbcf728355c62f8de3c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d0bf48a1646a68a1e8968bf1cb64908
+_md5_=e7f08b53e77fcb4f9f6461c18ce82b11
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d0e20f963823..fd2aaf74de2b 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/angelscript-2.34.0 b/metadata/md5-cache/dev-libs/angelscript-2.34.0
index 0f5511199eee..cfdc88948c8a 100644
--- a/metadata/md5-cache/dev-libs/angelscript-2.34.0
+++ b/metadata/md5-cache/dev-libs/angelscript-2.34.0
@@ -9,4 +9,4 @@ LICENSE=ZLIB
 SLOT=0/2.34.0
 SRC_URI=http://www.angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1f0062b95308bdc434ee60fcd8ff37f7
+_md5_=8b810da22caf0614941861d5caa3efe7
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 5adfd390bc1d..56ac028e8a8c 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
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/expat >=dev-libs/apr-1.6.2:1= berkdb? ( >=sys-libs/db-4:= ) gdb
 SLOT=1
 SRC_URI=mirror://apache/apr/apr-util-1.6.1.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d4062f53387896c8dafb9bcaec6e1da3
+_md5_=5b3263a94ccd6006686a767a3a5f8e07
diff --git a/metadata/md5-cache/dev-libs/atk-2.32.0 b/metadata/md5-cache/dev-libs/atk-2.32.0
index 3b1b4cdd6279..07583590154d 100644
--- a/metadata/md5-cache/dev-libs/atk-2.32.0
+++ b/metadata/md5-cache/dev-libs/atk-2.32.0
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=gtk-doc +introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.32/atk-2.32.0.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48521f8fbc4a28daacc4489ec26c24a8
+_md5_=d99dd6edc8bfe1455854c856206a22d1
diff --git a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178 b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178
index 68b8f6ef20ad..68dfd18eb4fa 100644
--- a/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178
+++ b/metadata/md5-cache/dev-libs/aws-sdk-cpp-1.7.178
@@ -4,13 +4,13 @@ DEPEND=http? ( net-misc/curl:= ) polly? ( media-sound/pulseaudio ) ssl? ( !libre
 DESCRIPTION=AWS SDK for C++
 EAPI=7
 HOMEPAGE=https://aws.amazon.com/sdk-for-cpp/
-IUSE=+http libressl +rtti +ssl static-libs test unity-build access-management apigateway backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ec2 ecr ecs eks elasticache elasticbeanstalk elasticloadbalancing elasticmapreduce email es events fsx globalaccelerator iot kinesis kms lambda lex license-manager lightsail machinelearning macie managedblockchain marketplace opsworks organizations other personalize polly queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract transcribe translate waf +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+http libressl +rtti +ssl static-libs test unity-build access-management apigateway backup batch budgets chime cloud-desktop cloud-dev cloud-media cloud-mobile cloudformation cloudfront cloudhsm cloudsearch cloudwatch cognito config dlm ec2 ecr ecs eks elasticache elasticbeanstalk elasticloadbalancing elasticmapreduce email es events fsx globalaccelerator iot kinesis kms lambda lex license-manager lightsail machinelearning macie managedblockchain marketplace opsworks organizations other personalize polly queues rds rekognition resource-groups route53 s3 sagemaker secretsmanager securityhub serverlessrepo shield sns sqs textract transcribe translate waf +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=http? ( net-misc/curl:= ) polly? ( media-sound/pulseaudio ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) dev-libs/aws-c-common dev-libs/aws-checksums dev-libs/aws-c-event-stream sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aws/aws-sdk-cpp/archive/1.7.178.tar.gz -> aws-sdk-cpp-1.7.178.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=286d2383161e3ec7e4e8f8a15cc770fb
diff --git a/metadata/md5-cache/dev-libs/beignet-1.3.2-r3 b/metadata/md5-cache/dev-libs/beignet-1.3.2-r3
index 437cb8048bc8..4847ca8fb314 100644
--- a/metadata/md5-cache/dev-libs/beignet-1.3.2-r3
+++ b/metadata/md5-cache/dev-libs/beignet-1.3.2-r3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=|| ( dev-lang/python:3.6 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=app-eselect/eselect-opencl media-libs/mesa[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-devel/clang-8.0.0:=[static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ocl-icd? ( dev-libs/ocl-icd )
 DESCRIPTION=OpenCL implementation for Intel Sandy Bridge, Ivy Bridge and Haswell GPUs
@@ -11,4 +11,4 @@ RDEPEND=app-eselect/eselect-opencl media-libs/mesa[X(+),abi_x86_32(-)?,abi_x86_6
 SLOT=0
 SRC_URI=https://01.org/sites/default/files/beignet-1.3.2-source.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db3c0bad342a195132e69e71762b4eeb
+_md5_=f2664d6a2c0e8b8436308e9d9c8a6778
diff --git a/metadata/md5-cache/dev-libs/boost-1.71.0 b/metadata/md5-cache/dev-libs/boost-1.71.0
deleted file mode 100644
index f67973d9ae91..000000000000
--- a/metadata/md5-cache/dev-libs/boost-1.71.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND==dev-util/boost-build-1.71*
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] numpy? ( >=dev-python/numpy-1.14.5[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(-)] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Boost Libraries for C++
-EAPI=7
-HOMEPAGE=https://www.boost.org/
-IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
-LICENSE=Boost-1.0
-RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] numpy? ( >=dev-python/numpy-1.14.5[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(-)] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
-RESTRICT=test
-SLOT=0/1.71.0
-SRC_URI=https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2e0f771f09ba83c8198d95c8dc41d7ab
diff --git a/metadata/md5-cache/dev-libs/boost-1.72.0-r1 b/metadata/md5-cache/dev-libs/boost-1.72.0-r1
index c41cbe6ae34f..19ca56abc333 100644
--- a/metadata/md5-cache/dev-libs/boost-1.72.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.72.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Boost Libraries for C++
 EAPI=7
 HOMEPAGE=https://www.boost.org/
 IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
 LICENSE=Boost-1.0
 RDEPEND=!app-admin/eselect-boost !dev-libs/boost-numpy bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] numpy? ( dev-python/numpy[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(-)] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/1.72.0
 SRC_URI=https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1dd71e2751c131052d4864208f37c836
+_md5_=f50ac13cd58e5409551a8b156d384a54
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 00099334c5d6..eea56acf6203 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_6 python_targets_python3_7 ) )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f4c44563b61bb3447c15c3df5ab0efa3
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0 b/metadata/md5-cache/dev-libs/capstone-4.0
index 0c5e3d15ca54..fc047bf7d2f6 100644
--- a/metadata/md5-cache/dev-libs/capstone-4.0
+++ b/metadata/md5-cache/dev-libs/capstone-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_6 python_targets_python3_7 ) )
 SLOT=0/4
 SRC_URI=https://github.com/aquynh/capstone/archive/4.0.tar.gz -> capstone-4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d4ad124407eb27edf65115a938940907
diff --git a/metadata/md5-cache/dev-libs/capstone-4.0.1 b/metadata/md5-cache/dev-libs/capstone-4.0.1
index 1026f8a6e887..d7b551bf9a5e 100644
--- a/metadata/md5-cache/dev-libs/capstone-4.0.1
+++ b/metadata/md5-cache/dev-libs/capstone-4.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 py
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://github.com/aquynh/capstone/archive/4.0.1.tar.gz -> capstone-4.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a21ea786adac603ae38cafe3bdef29be
diff --git a/metadata/md5-cache/dev-libs/clhpp-2.0.10 b/metadata/md5-cache/dev-libs/clhpp-2.0.10
index acb143ccbe82..4058f620fec8 100644
--- a/metadata/md5-cache/dev-libs/clhpp-2.0.10
+++ b/metadata/md5-cache/dev-libs/clhpp-2.0.10
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=virtual/opencl
 DESCRIPTION=Khronos OpenCL C++ bindings
@@ -10,4 +10,4 @@ RDEPEND=virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-CLHPP/archive/v2.0.10.tar.gz -> clhpp-2.0.10.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b336fd211e5ac8e3480af930d4072126
+_md5_=914eaed94ae2bf52e5a2529167b6e676
diff --git a/metadata/md5-cache/dev-libs/distorm64-3.3.8 b/metadata/md5-cache/dev-libs/distorm64-3.3.8
index b8d35e287c18..75215a2b2180 100644
--- a/metadata/md5-cache/dev-libs/distorm64-3.3.8
+++ b/metadata/md5-cache/dev-libs/distorm64-3.3.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_6 )
 SLOT=0
 SRC_URI=https://github.com/gdabah/distorm/archive/v3.3.8.tar.gz -> distorm-3.3.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a50f3e55796378a74262a5746cd8831
diff --git a/metadata/md5-cache/dev-libs/distorm64-3.4.1 b/metadata/md5-cache/dev-libs/distorm64-3.4.1
index 49b8e0b5d29b..a1785d0c2bc6 100644
--- a/metadata/md5-cache/dev-libs/distorm64-3.4.1
+++ b/metadata/md5-cache/dev-libs/distorm64-3.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_6 )
 SLOT=0
 SRC_URI=https://github.com/gdabah/distorm/archive/v3.4.1.tar.gz -> distorm-3.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a50f3e55796378a74262a5746cd8831
diff --git a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7 b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
index fa615551bcad..0f413ea83711 100644
--- a/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
+++ b/metadata/md5-cache/dev-libs/dmalloc-5.5.2-r7
@@ -5,9 +5,9 @@ DESCRIPTION=A Debug Malloc Library
 EAPI=7
 HOMEPAGE=http://dmalloc.com
 IUSE=static-libs threads
-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=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=http://dmalloc.com/releases/dmalloc-5.5.2.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9891afb46280e1307bd9bd8a333fb0fe
+_md5_=61cd3e64cd5e23d9537d43fd8dc596ee
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.1.5 b/metadata/md5-cache/dev-libs/double-conversion-3.1.5
index 3dae975be2d2..6ec8ea330132 100644
--- a/metadata/md5-cache/dev-libs/double-conversion-3.1.5
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.1.5
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubles
 EAPI=7
 HOMEPAGE=https://github.com/google/double-conversion
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0/3
 SRC_URI=https://github.com/google/double-conversion/archive/v3.1.5.tar.gz -> double-conversion-3.1.5.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f8d1a2f9d9ac912abfe914fc31729ce
+_md5_=656ed41f79ad217c0bcbed2de03df973
diff --git a/metadata/md5-cache/dev-libs/efl-1.22.6 b/metadata/md5-cache/dev-libs/efl-1.22.6
deleted file mode 100644
index 83997736fb88..000000000000
--- a/metadata/md5-cache/dev-libs/efl-1.22.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) wayland? ( x11-libs/libxkbcommon[X] ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org
-IUSE=+bmp dds connman debug drm +eet elogind examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
-RDEPEND=net-misc/curl media-libs/libpng:0= sys-apps/dbus sys-apps/util-linux virtual/jpeg:0= connman? ( net-misc/connman ) drm? ( dev-libs/libinput media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib:= ) gles2? ( media-libs/mesa[egl,gles2] ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) libuv? ( dev-libs/libuv ) luajit? ( dev-lang/luajit:= ) !luajit? ( dev-lang/lua:* ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg x11-libs/cairo ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) X? ( media-libs/freetype x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver gles2? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) wayland? ( x11-libs/libxkbcommon[X] ) ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2 opengl ) fbcon? ( !tslib ) gles2? ( || ( wayland X ) !sdl ) ibus? ( glib ) opengl? ( X ) pulseaudio? ( sound ) sdl? ( opengl ) vnc? ( fbcon X ) wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X )
-SLOT=0
-SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.22.6.tar.xz
-_eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=145f6949982936f5c7b8fb95ed018ab5
diff --git a/metadata/md5-cache/dev-libs/efl-1.23.3 b/metadata/md5-cache/dev-libs/efl-1.23.3
index 3207c52fee7c..d95dd9e557b5 100644
--- a/metadata/md5-cache/dev-libs/efl-1.23.3
+++ b/metadata/md5-cache/dev-libs/efl-1.23.3
@@ -5,7 +5,7 @@ DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
 IUSE=+X bmp connman dds debug doc drm +eet elogind examples fbcon fontconfig fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm xpresent zeroconf
-KEYWORDS=amd64 ~arm ~hppa ~ppc x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
 RDEPEND=dev-libs/check net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg:0= X? ( media-libs/freetype x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver wayland? ( x11-libs/libxkbcommon[X] ) ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput dev-libs/wayland media-libs/mesa[gbm] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gles2? ( media-libs/mesa[egl,gles2] virtual/opengl ) glib? ( dev-libs/glib:2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20191101 ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) svg? ( gnome-base/librsvg ) system-lz4? ( app-arch/lz4 ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xine? ( media-libs/xine-lib ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi )
 REQUIRED_USE=?? ( elogind systemd ) ?? ( gles2 opengl ) ^^ ( lua luajit ) ssl drm? ( gles2 ) examples? ( eet svg ) gles2? ( || ( wayland X ) ) pulseaudio? ( sound ) wayland? ( gles2 !opengl ) xim? ( X ) xpresent? ( X )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.23.3.tar.xz
 _eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce52deeedc74b06b8dc7d7824bbbd62e
+_md5_=705db03444ab53132dd68cf932aa35f7
diff --git a/metadata/md5-cache/dev-libs/ell-0.28 b/metadata/md5-cache/dev-libs/ell-0.28
new file mode 100644
index 000000000000..34cbc009efe9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/ell-0.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
+EAPI=7
+HOMEPAGE=https://01.org/ell
+IUSE=glib pie abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.28.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9a98000dbf7fc9dab80de6ffc1f6a143
diff --git a/metadata/md5-cache/dev-libs/gdl-3.28.0 b/metadata/md5-cache/dev-libs/gdl-3.28.0
index 0eb33efa806f..9aa2510c653b 100644
--- a/metadata/md5-cache/dev-libs/gdl-3.28.0
+++ b/metadata/md5-cache/dev-libs/gdl-3.28.0
@@ -4,10 +4,10 @@ DESCRIPTION=GNOME docking library
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdl
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3cd3d25cb02188c31341a44aec2b673b
+_md5_=11c5a8b5d2ab84818a9f7bff9d822a1e
diff --git a/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1 b/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
index 85443c38ba42..c8938c431b05 100644
--- a/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
+++ b/metadata/md5-cache/dev-libs/go-fuse-0_p20140812-r1
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/hanwen/go-fuse/archive/8c85ded140ac1889372a0e22d8d21e3d10a303bd.tar.gz -> go-fuse-0_p20140812.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9bb2b3273e7ce5d6b74daeb48cc942a
+_md5_=e452b1083b5b13cedaaf5c63d98c0711
diff --git a/metadata/md5-cache/dev-libs/go-fuse-0_p20150422 b/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
index 85a1f2bd347b..9c2371766a4f 100644
--- a/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
+++ b/metadata/md5-cache/dev-libs/go-fuse-0_p20150422
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/hanwen/go-fuse/archive/ffed29ec8b88f61c1b8954134cc48ef03bb26ce1.tar.gz -> go-fuse-0_p20150422.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce5ce5b7f99b31d49e7b4afd23324311
+_md5_=ef4811a67ea7859789ad284f19a525ba
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2 b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
deleted file mode 100644
index 0ea616eaf084..000000000000
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/gobject-introspection-common-1.60.2 >=dev-libs/glib-2.58.0:2 doctool? ( dev-python/mako[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-util/gtk-doc-am-1.19 sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Introspection system for GObject-based libraries
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-IUSE=cairo doctool test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+ GPL-2+
-PDEPEND=cairo? ( x11-libs/cairo[glib] )
-RDEPEND=>=dev-libs/gobject-introspection-common-1.60.2 >=dev-libs/glib-2.58.0:2 doctool? ( dev-python/mako[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 ) test? ( cairo )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be6dad132f559fab0d9632e38be1b9e5
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2-r1 b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2-r1
new file mode 100644
index 000000000000..1bc186a5842a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.60.2-r1
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/gobject-introspection-common-1.60.2 >=dev-libs/glib-2.58.0:2 doctool? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-util/gtk-doc-am-1.19 sys-devel/bison sys-devel/flex test? ( x11-libs/cairo[glib] python_single_target_python3_6? ( dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/markdown[python_targets_python3_7(-)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Introspection system for GObject-based libraries
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
+IUSE=cairo doctool test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+PDEPEND=cairo? ( x11-libs/cairo[glib] )
+RDEPEND=>=dev-libs/gobject-introspection-common-1.60.2 >=dev-libs/glib-2.58.0:2 doctool? ( python_single_target_python3_6? ( dev-python/mako[python_targets_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mako[python_targets_python3_7(-)] dev-python/markdown[python_targets_python3_7(-)] ) ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) test? ( cairo )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gobject-introspection/1.60/gobject-introspection-1.60.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c9f5aa05b0e697c40f46922d1525854
diff --git a/metadata/md5-cache/dev-libs/hiredis-0.13.3 b/metadata/md5-cache/dev-libs/hiredis-0.13.3
index 8f6cd26d923e..8f5494a7ed18 100644
--- a/metadata/md5-cache/dev-libs/hiredis-0.13.3
+++ b/metadata/md5-cache/dev-libs/hiredis-0.13.3
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.13
 SRC_URI=https://github.com/redis/hiredis/archive/v0.13.3.tar.gz -> hiredis-0.13.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7fe9a9d5f6c7fbf27d51414626c813b5
+_md5_=9a37f322e232de49e52a65908104d94f
diff --git a/metadata/md5-cache/dev-libs/hiredis-0.14.0 b/metadata/md5-cache/dev-libs/hiredis-0.14.0
index 588a2ffb84ad..a045e7f0a66f 100644
--- a/metadata/md5-cache/dev-libs/hiredis-0.14.0
+++ b/metadata/md5-cache/dev-libs/hiredis-0.14.0
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.14
 SRC_URI=https://github.com/redis/hiredis/archive/v0.14.0.tar.gz -> hiredis-0.14.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=232628c0270de870bbca526cb28125ec
+_md5_=d6e52552a52b7c7ac01d0fb1a96515fd
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.1.0 b/metadata/md5-cache/dev-libs/hyperscan-5.1.0
index 6b576cd668b0..41c5d9e9b087 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.1.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.1.0
@@ -2,13 +2,13 @@ BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=High-performance regular expression matching library
 EAPI=7
-HOMEPAGE=https://01.org/hyperscan
+HOMEPAGE=https://www.hyperscan.io/ https://github.com/intel/hyperscan
 IUSE=cpu_flags_x86_ssse3 static-libs python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/ragel >=dev-libs/boost-1.57:= net-libs/libpcap
 REQUIRED_USE=cpu_flags_x86_ssse3 || ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/01org/hyperscan/archive/v5.1.0.tar.gz -> hyperscan-5.1.0.tar.gz
+SRC_URI=https://github.com/intel/hyperscan/archive/v5.1.0.tar.gz -> hyperscan-5.1.0.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf2320e13787af1e1071aab48ecba86c
+_md5_=e85d5acd75babc93977a07d01ac41ef1
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.1.1 b/metadata/md5-cache/dev-libs/hyperscan-5.1.1
index 5b0dac4b44f9..6eeb70ee42f5 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.1.1
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.1.1
@@ -2,13 +2,13 @@ BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=High-performance regular expression matching library
 EAPI=7
-HOMEPAGE=https://01.org/hyperscan
+HOMEPAGE=https://www.hyperscan.io/ https://github.com/intel/hyperscan
 IUSE=cpu_flags_x86_ssse3 static-libs python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/ragel dev-libs/boost net-libs/libpcap
 REQUIRED_USE=cpu_flags_x86_ssse3 || ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/01org/hyperscan/archive/v5.1.1.tar.gz -> hyperscan-5.1.1.tar.gz
+SRC_URI=https://github.com/intel/hyperscan/archive/v5.1.1.tar.gz -> hyperscan-5.1.1.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04333b6e0d316dc4d9ab7e7a38cbb315
+_md5_=753c144c47eb1c528d3e6bfea072dc76
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.2.0 b/metadata/md5-cache/dev-libs/hyperscan-5.2.0
index 84cf13249932..23e54671f7d9 100644
--- a/metadata/md5-cache/dev-libs/hyperscan-5.2.0
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.2.0
@@ -2,13 +2,13 @@ BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=High-performance regular expression matching library
 EAPI=7
-HOMEPAGE=https://01.org/hyperscan
+HOMEPAGE=https://www.hyperscan.io/ https://github.com/intel/hyperscan
 IUSE=cpu_flags_x86_ssse3 static-libs python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/ragel dev-libs/boost net-libs/libpcap
 REQUIRED_USE=cpu_flags_x86_ssse3 || ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://github.com/01org/hyperscan/archive/v5.2.0.tar.gz -> hyperscan-5.2.0.tar.gz
+SRC_URI=https://github.com/intel/hyperscan/archive/v5.2.0.tar.gz -> hyperscan-5.2.0.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04333b6e0d316dc4d9ab7e7a38cbb315
+_md5_=753c144c47eb1c528d3e6bfea072dc76
diff --git a/metadata/md5-cache/dev-libs/hyperscan-5.2.1 b/metadata/md5-cache/dev-libs/hyperscan-5.2.1
new file mode 100644
index 000000000000..150382ce1df9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/hyperscan-5.2.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ragel dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost
+DESCRIPTION=High-performance regular expression matching library
+EAPI=7
+HOMEPAGE=https://www.hyperscan.io/ https://github.com/intel/hyperscan
+IUSE=+cpu_flags_x86_ssse3 static-libs python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost
+REQUIRED_USE=cpu_flags_x86_ssse3 || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/intel/hyperscan/archive/v5.2.1.tar.gz -> hyperscan-5.2.1.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=254a9267932d50f22740dabfed448abb
diff --git a/metadata/md5-cache/dev-libs/hyphen-2.8.8 b/metadata/md5-cache/dev-libs/hyphen-2.8.8
deleted file mode 100644
index f28d05db821d..000000000000
--- a/metadata/md5-cache/dev-libs/hyphen-2.8.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-text/hunspell dev-lang/perl
-DESCRIPTION=ALTLinux hyphenation library
-EAPI=6
-HOMEPAGE=http://hunspell.github.io/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2.1 MPL-1.1
-RDEPEND=app-text/hunspell
-SLOT=0
-SRC_URI=mirror://sourceforge/hunspell/hyphen-2.8.8.tar.gz
-_md5_=bd504156ddb1043d551d368f04962158
diff --git a/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1 b/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
index dafa4b663feb..c70ffca01e06 100644
--- a/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
+++ b/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
@@ -4,9 +4,9 @@ DESCRIPTION=ALTLinux hyphenation library
 EAPI=7
 HOMEPAGE=http://hunspell.github.io/
 IUSE=static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 RDEPEND=app-text/hunspell
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/hyphen-2.8.8.tar.gz
-_md5_=b9c4fc8aeda818ad2cff12346cfb7030
+_md5_=39f8b2d4b796b197bd9d7d5f1ccdd0a3
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.2-r1 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.2-r1
index b3041b3cc51a..e0c88d96dfdf 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.2-r1
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=doc? ( app-doc/doxygen || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) )
+DEPEND=doc? ( app-doc/doxygen || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) )
 DESCRIPTION=C++ JSON reader and writer
 EAPI=7
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz -> jsoncpp-1.9.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d67eba5a88c03ba94a7176c3fc85cf2
+_md5_=959cf3b9b0ca72bce51fe612462e09bf
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.2-r2 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.2-r2
index e4335752a679..0efff27d05cf 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.2-r2
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( app-doc/doxygen ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=C++ JSON reader and writer
 EAPI=7
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz -> jsoncpp-1.9.2.tar.gz
 _eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2b5281a1bf7a25f25da8cb585f035d15
+_md5_=46148a1bd627e05ac245c2ac8a4c8701
diff --git a/metadata/md5-cache/dev-libs/keystone-0.9.1 b/metadata/md5-cache/dev-libs/keystone-0.9.1
index c81c854e7a2e..62ab9c32119b 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_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8e595ebd299e6941c6c6eba801e0c31
diff --git a/metadata/md5-cache/dev-libs/keystone-9999 b/metadata/md5-cache/dev-libs/keystone-9999
index be2349f55c54..72a4513e723b 100644
--- a/metadata/md5-cache/dev-libs/keystone-9999
+++ b/metadata/md5-cache/dev-libs/keystone-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 ) || ( 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=69545277248ccc1093936da7aa94e126
diff --git a/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410 b/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410
index 429724aaed7d..6b73715e8fba 100644
--- a/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410
+++ b/metadata/md5-cache/dev-libs/kpathsea-6.3.1_p20190410
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~am
 LICENSE=GPL-2
 SLOT=0/6.3.1
 SRC_URI=mirror://gentoo/texlive-20190410-source.tar.xz mirror://gentoo/kpathsea-texmf.d-9.tar.xz mirror://gentoo/texlive-module-kpathsea-2019.tar.xz doc? ( mirror://gentoo/texlive-module-kpathsea.doc-2019.tar.xz )
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea8f46c730e470f49e05b6926087a622
diff --git a/metadata/md5-cache/dev-libs/kuserfeedback-0.9.90 b/metadata/md5-cache/dev-libs/kuserfeedback-0.9.90
deleted file mode 100644
index 791161c06156..000000000000
--- a/metadata/md5-cache/dev-libs/kuserfeedback-0.9.90
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex doc? ( >=dev-qt/qdoc-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to collect user feedback for applications via telemetry and surveys
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=doc test debug test
-KEYWORDS=~amd64 ~ppc64
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/unstable/kuserfeedback/kuserfeedback-0.9.90.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98810c92f3d69af32cd1689f27560922
diff --git a/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0 b/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
new file mode 100644
index 000000000000..6d9a948c5e73
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/kuserfeedback-1.0.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex doc? ( >=dev-qt/qdoc-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to collect user feedback for applications via telemetry and surveys
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=doc test debug test
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtcharts-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/kuserfeedback/kuserfeedback-1.0.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=30310e952357711939770703af7757d9
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.10.0 b/metadata/md5-cache/dev-libs/leatherman-1.10.0
index 35a92c8be88d..2d71cbccb4b6 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.10.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.10.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.10.0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.10.0.tar.gz -> leatherman-1.10.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=671c23b45beb2b682422a6b9279f897e
+_md5_=61ad0d6ee371dd22f97e8b882e6ac215
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.3.0 b/metadata/md5-cache/dev-libs/leatherman-1.3.0
index ca6eaae3a4f8..a3b36cbbc781 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.3.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.3.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.3.0.tar.gz -> leatherman-1.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa7575e1472009e418d7dd16756642a7
+_md5_=5379f7a62e8cb051dda907c09856cbaf
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.8.0 b/metadata/md5-cache/dev-libs/leatherman-1.8.0
index 8d9f47ef1d4a..112f5e36bf56 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.8.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.8.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.8.0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.8.0.tar.gz -> leatherman-1.8.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5464bed931ef3b8ac1c99cc043e161f9
+_md5_=edb0aadae2395d493ad4d098b19831fb
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.9.0 b/metadata/md5-cache/dev-libs/leatherman-1.9.0
index ead63b2e37a1..5758cf83d5f7 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.9.0
+++ b/metadata/md5-cache/dev-libs/leatherman-1.9.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.9.0
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.9.0.tar.gz -> leatherman-1.9.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5464bed931ef3b8ac1c99cc043e161f9
+_md5_=edb0aadae2395d493ad4d098b19831fb
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.9.1 b/metadata/md5-cache/dev-libs/leatherman-1.9.1
index 178672603cd4..41200ce5bc96 100644
--- a/metadata/md5-cache/dev-libs/leatherman-1.9.1
+++ b/metadata/md5-cache/dev-libs/leatherman-1.9.1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.9.1
 SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.9.1.tar.gz -> leatherman-1.9.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dd7ba4a59c43e1ebf8b2200abe76a22
+_md5_=15d8ab6a9c6d21cd0a45ba82b49e31da
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201
deleted file mode 100644
index e98be298bda4..000000000000
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r201
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libindicator-12.10.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library to allow applications to export a menu into the Unity Menu bar
-EAPI=6
-HOMEPAGE=https://launchpad.net/libappindicator
-IUSE=+introspection python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1 LGPL-3
-RDEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libindicator-12.10.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da5b16e9448aa5fc814e1d512b963543
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r202 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r202
new file mode 100644
index 000000000000..ce09a59e133d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r202
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libindicator-12.10.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= ) python? ( python_single_target_python2_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/pygtk[python_targets_python2_7(-)] ) ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A library to allow applications to export a menu into the Unity Menu bar
+EAPI=6
+HOMEPAGE=https://launchpad.net/libappindicator
+IUSE=+introspection python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
+KEYWORDS=amd64 ~arm x86
+LICENSE=LGPL-2.1 LGPL-3
+RDEPEND=>=dev-libs/dbus-glib-0.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libindicator-12.10.0:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?] introspection? ( >=dev-libs/gobject-introspection-1:= ) python? ( python_single_target_python2_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/pygtk[python_targets_python2_7(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=2
+SRC_URI=https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d1d457afb600c6e5c6ef63f5ff089b1a
diff --git a/metadata/md5-cache/dev-libs/libarcus-3.4.1 b/metadata/md5-cache/dev-libs/libarcus-3.4.1
index 67b8b4c06fea..f8e86cae7248 100644
--- a/metadata/md5-cache/dev-libs/libarcus-3.4.1
+++ b/metadata/md5-cache/dev-libs/libarcus-3.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs +python_targets_python3_6 +python_single_target_python3_6
+IUSE=examples python static-libs +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64c705df824c62a2e8b96a8b9e90938b
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d15a329c5e92317f907fdf5efb36f00
diff --git a/metadata/md5-cache/dev-libs/libarcus-3.6.0 b/metadata/md5-cache/dev-libs/libarcus-3.6.0
index 957a4a8b1c95..8c192b562b7e 100644
--- a/metadata/md5-cache/dev-libs/libarcus-3.6.0
+++ b/metadata/md5-cache/dev-libs/libarcus-3.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs +python_targets_python3_6 +python_single_target_python3_6
+IUSE=examples python static-libs +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/3.6.0.tar.gz -> libarcus-3.6.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64c705df824c62a2e8b96a8b9e90938b
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d15a329c5e92317f907fdf5efb36f00
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.2.0 b/metadata/md5-cache/dev-libs/libarcus-4.2.0
index d39559ff51d4..87f110a48550 100644
--- a/metadata/md5-cache/dev-libs/libarcus-4.2.0
+++ b/metadata/md5-cache/dev-libs/libarcus-4.2.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs +python_targets_python3_6 +python_single_target_python3_6
+IUSE=examples python static-libs +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.2.0.tar.gz -> libarcus-4.2.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8f2c0ddcaa103efaa4dedda72bedc9f
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6fd762a7e5df8ebaaba7c2298aca522b
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.3.0 b/metadata/md5-cache/dev-libs/libarcus-4.3.0
deleted file mode 100644
index 97f6cbd47d1e..000000000000
--- a/metadata/md5-cache/dev-libs/libarcus-4.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-DESCRIPTION=This library facilitates communication between Cura and its backend
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libArcus
-IUSE=examples python static-libs +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-libs/protobuf python? ( dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.3.0.tar.gz -> libarcus-4.3.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c781b333d6eaf3940d1f17d51d8e7b24
diff --git a/metadata/md5-cache/dev-libs/libarcus-4.3.0-r1 b/metadata/md5-cache/dev-libs/libarcus-4.3.0-r1
new file mode 100644
index 000000000000..549e0697352b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libarcus-4.3.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
+DESCRIPTION=This library facilitates communication between Cura and its backend
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/libArcus
+IUSE=examples python static-libs +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/protobuf python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] python? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
+SLOT=0/3
+SRC_URI=https://github.com/Ultimaker/libArcus/archive/4.3.0.tar.gz -> libarcus-4.3.0.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40c4d925ce4238e30c71501ed6226a36
diff --git a/metadata/md5-cache/dev-libs/libburn-1.5.2 b/metadata/md5-cache/dev-libs/libburn-1.5.2
deleted file mode 100644
index 667558287606..000000000000
--- a/metadata/md5-cache/dev-libs/libburn-1.5.2
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=Open-source library for reading, mastering and writing optical discs
-EAPI=7
-HOMEPAGE=https://dev.lovelyhq.com/libburnia/web/wikis/home
-IUSE=debug static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://files.libburnia-project.org/releases/libburn-1.5.2.tar.gz
-_md5_=0bc5affa5b5e6a68911d341c4c0ff183
diff --git a/metadata/md5-cache/dev-libs/libbytesize-1.4 b/metadata/md5-cache/dev-libs/libbytesize-1.4
index efa08e2fdd94..c1d8bafce63f 100644
--- a/metadata/md5-cache/dev-libs/libbytesize-1.4
+++ b/metadata/md5-cache/dev-libs/libbytesize-1.4
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/gmp:0= dev-libs/mpfr:= >=dev-libs/libpcre-8.32 sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint dev-python/polib )
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/gmp:0= dev-libs/mpfr:= >=dev-libs/libpcre-8.32 sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint dev-python/polib )
 DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libbytesize
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/gmp:0= dev-libs/mpfr:= >=dev-libs/libpcre-8.32
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/gmp:0= dev-libs/mpfr:= >=dev-libs/libpcre-8.32
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libbytesize/archive/1.4.tar.gz -> libbytesize-1.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5106ae96a4adf2f6cef991593cf6dff5
+_md5_=72d6897c487f28b144d5bdc462b45b42
diff --git a/metadata/md5-cache/dev-libs/libbytesize-2.2 b/metadata/md5-cache/dev-libs/libbytesize-2.2
new file mode 100644
index 000000000000..1198cece4465
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbytesize-2.2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext doc? ( dev-util/gtk-doc ) test? ( dev-python/pocketlint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/polib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEFINED_PHASES=compile configure install test
+DEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Tiny library providing a C "class" for working with arbitrary big sizes in bytes
+EAPI=7
+HOMEPAGE=https://github.com/storaged-project/libbytesize
+IUSE=doc python test tools python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/gmp:0= dev-libs/mpfr:= dev-libs/libpcre2 python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) tools? ( python )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/storaged-project/libbytesize/releases/download/2.2/libbytesize-2.2.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=956fc58291715e1b6a4a6d8ea20dc48e
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 7c19db428ded..5d7bf1026ff7 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.2-r2
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) python? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) python? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=6
 HOMEPAGE=http://libcec.pulse-eight.com
-IUSE=cubox exynos python raspberry-pi +xrandr kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=cubox exynos python raspberry-pi +xrandr kernel_linux +python_single_target_python3_6
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a3374e0ceca0812321dc7b8c6c22759
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d592f99be0f9708a6632478e45255147
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1 b/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
index 9102e5337b0a..88e9bfa2651a 100644
--- a/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.4-r1
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( dev-lang/swig ) virtual/pkgconfig
+DEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( dev-lang/swig ) virtual/pkgconfig
 DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
 EAPI=7
 HOMEPAGE=http://libcec.pulse-eight.com
-IUSE=cubox exynos python raspberry-pi +xrandr kernel_linux 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
+IUSE=cubox exynos python raspberry-pi +xrandr kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 ) )
+RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 sys-libs/ncurses:= raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.4.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93f9bd0c552341e89c500937f82ee978
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c92b7b7f1a1192034ba096dac0b69ac9
diff --git a/metadata/md5-cache/dev-libs/libcharon-3.4.1 b/metadata/md5-cache/dev-libs/libcharon-3.4.1
index 4c5ee69dedfc..f9a22591159d 100644
--- a/metadata/md5-cache/dev-libs/libcharon-3.4.1
+++ b/metadata/md5-cache/dev-libs/libcharon-3.4.1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2c3ec0e7e1e9441932aa858957a3d03
diff --git a/metadata/md5-cache/dev-libs/libcharon-3.6.0-r1 b/metadata/md5-cache/dev-libs/libcharon-3.6.0-r1
index 8e37c6c6181d..929d5b807bf9 100644
--- a/metadata/md5-cache/dev-libs/libcharon-3.6.0-r1
+++ b/metadata/md5-cache/dev-libs/libcharon-3.6.0-r1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/3.6.0.tar.gz -> libcharon-3.6.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2c3ec0e7e1e9441932aa858957a3d03
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.2.0 b/metadata/md5-cache/dev-libs/libcharon-4.2.0
index e1b56903b509..bab3cc427a70 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.2.0
+++ b/metadata/md5-cache/dev-libs/libcharon-4.2.0
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.2.0.tar.gz -> libcharon-4.2.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c06045330449bb34abf3124d2deef733
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.3.0 b/metadata/md5-cache/dev-libs/libcharon-4.3.0
index cb9818f3d30c..ff9ebc9e2345 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.3.0
+++ b/metadata/md5-cache/dev-libs/libcharon-4.3.0
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=This library facilitates communication between Cura and its backend
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/libCharon
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.3.0.tar.gz -> libcharon-4.3.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cfbc6d3c4e817415fcf3da912822e4c
diff --git a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20191024 b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20191024
index fad2fc8144d3..bb829bc68e03 100644
--- a/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20191024
+++ b/metadata/md5-cache/dev-libs/libclc-0.2.0_pre20191024
@@ -1,4 +1,4 @@
-BDEPEND=|| ( sys-devel/clang:10 sys-devel/clang:9 sys-devel/clang:8 sys-devel/clang:7 sys-devel/clang:6 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+BDEPEND=|| ( sys-devel/clang:10 sys-devel/clang:9 sys-devel/clang:8 sys-devel/clang:7 sys-devel/clang:6 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 )
 DEFINED_PHASES=compile configure prepare setup
 DESCRIPTION=OpenCL C library
 EAPI=7
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/libclc-0.2.0_pre20191024.tar.xz
 _eclasses_=llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2fa1b2c084edc0a7c68412c84c842ae4
+_md5_=5cfa8dc54f0b67915c377ee60d6a5b63
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.12 b/metadata/md5-cache/dev-libs/libdnet-1.12
index 39d35d263632..1689f0e794b8 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9b166b3e8179a4ea6f63218234fe566
diff --git a/metadata/md5-cache/dev-libs/libdnet-1.12-r1 b/metadata/md5-cache/dev-libs/libdnet-1.12-r1
index 261199e16bfc..41970635a27c 100644
--- a/metadata/md5-cache/dev-libs/libdnet-1.12-r1
+++ b/metadata/md5-cache/dev-libs/libdnet-1.12-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/dugsong/libdnet/archive/libdnet-1.12.tar.gz ipv6? ( https://fragroute-ipv6.googlecode.com/files/libdnet-1.12.ipv6-1.patch.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7965fc69d951b32a69c63ebc6ef09b51
diff --git a/metadata/md5-cache/dev-libs/libedit-20190324.3.1 b/metadata/md5-cache/dev-libs/libedit-20190324.3.1
index fe6dac194018..9d32351fe913 100644
--- a/metadata/md5-cache/dev-libs/libedit-20190324.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20190324.3.1
@@ -11,4 +11,4 @@ RDEPEND=>=sys-libs/ncurses-5.9-r3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi
 SLOT=0
 SRC_URI=https://thrysoee.dk/editline/libedit-20190324-3.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=fa215afe5b780b64925dabeaa9012c42
+_md5_=84713263603c124b4540ece48456ae09
diff --git a/metadata/md5-cache/dev-libs/libestr-0.1.11 b/metadata/md5-cache/dev-libs/libestr-0.1.11
index 2ceceac88b3a..c4271e1bfb3a 100644
--- a/metadata/md5-cache/dev-libs/libestr-0.1.11
+++ b/metadata/md5-cache/dev-libs/libestr-0.1.11
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libestr.adiscon.com/files/download/libestr-0.1.11.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=818a2987ba11b2cc0961a2eb429d9d27
+_md5_=8f26feefe09201aa0ac9193aa04b790a
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.8.0 b/metadata/md5-cache/dev-libs/libevdev-1.8.0
index 8b789843e32a..4d831e5ede04 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.8.0
+++ b/metadata/md5-cache/dev-libs/libevdev-1.8.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) doc? ( app-doc/doxygen ) virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( app-doc/doxygen ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Handler library for evdev events
 EAPI=7
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.8.0.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ef62e8860b97521d0ba1201e8bcc183b
+_md5_=9de7df5c5dc459ac37f76acae2164659
diff --git a/metadata/md5-cache/dev-libs/libevdev-9999 b/metadata/md5-cache/dev-libs/libevdev-9999
index 80ee19eee09e..69cc4d68fa8a 100644
--- a/metadata/md5-cache/dev-libs/libevdev-9999
+++ b/metadata/md5-cache/dev-libs/libevdev-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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]
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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
 DESCRIPTION=Handler library for evdev events
 EAPI=7
@@ -9,4 +9,4 @@ PROPERTIES=live
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=472894d98a9d636c1e489e6f21d670b2
+_md5_=525773a45c89ff066d8e3129013003b5
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.11 b/metadata/md5-cache/dev-libs/libevent-2.1.11
index 6b5c61305c20..5c2a339b9a67 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.11
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.11
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.1-7
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.11-stable/libevent-2.1.11-stable.tar.gz -> libevent-2.1.11.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5e2b44a8fa76e39eaa2e7b84aae13d1e
+_md5_=7bd852bb13171b38c4658fe8cc9badf5
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.8 b/metadata/md5-cache/dev-libs/libevent-2.1.8
index b95ec0756fde..dba2198164f0 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.8
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.8
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.1-6
 SRC_URI=https://github.com/libevent/libevent/releases/download/release-2.1.8-stable/libevent-2.1.8-stable.tar.gz -> libevent-2.1.8.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b50e5af422357279db52003661a6edda
+_md5_=4efa87b0b882e6e37e5f33b27ecc0388
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.9999 b/metadata/md5-cache/dev-libs/libevent-2.1.9999
index a5c733db79e0..590df9ea5f3e 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.9999
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.9999
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x
 RESTRICT=test
 SLOT=0/2.1-7
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e3301f0e5697242aa0c481670165f7cd
+_md5_=37943a73f8ff5f89e91e4ec53d33f77b
diff --git a/metadata/md5-cache/dev-libs/libevent-9999 b/metadata/md5-cache/dev-libs/libevent-9999
index fb040f12d4ac..5c1029669fee 100644
--- a/metadata/md5-cache/dev-libs/libevent-9999
+++ b/metadata/md5-cache/dev-libs/libevent-9999
@@ -11,4 +11,4 @@ RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0a5ac73d57e7109f0364c82559899587
+_md5_=36ebf4f4ce66354a643d75edc6703ac0
diff --git a/metadata/md5-cache/dev-libs/libg15render-1.2-r2 b/metadata/md5-cache/dev-libs/libg15render-1.2-r2
index 4e95a3407d6f..445aafab4a66 100644
--- a/metadata/md5-cache/dev-libs/libg15render-1.2-r2
+++ b/metadata/md5-cache/dev-libs/libg15render-1.2-r2
@@ -1,7 +1,8 @@
+BDEPEND=truetype? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/libg15 truetype? ( media-libs/freetype ) truetype? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/libg15 truetype? ( media-libs/freetype )
 DESCRIPTION=Small library for display text and graphics on a Logitech G15 keyboard
-EAPI=6
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/g15tools/
 IUSE=truetype
 KEYWORDS=amd64 ppc ppc64 x86
@@ -10,4 +11,4 @@ RDEPEND=dev-libs/libg15 truetype? ( media-libs/freetype )
 SLOT=0
 SRC_URI=mirror://sourceforge/g15tools/libg15render-1.2.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=94543d316f27677bc014631d6d0969c2
+_md5_=a44c61d6ae410353bd18db69a84937e4
diff --git a/metadata/md5-cache/dev-libs/libg15render-9999 b/metadata/md5-cache/dev-libs/libg15render-9999
deleted file mode 100644
index 66b6e1c66089..000000000000
--- a/metadata/md5-cache/dev-libs/libg15render-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare unpack
-DEPEND=dev-libs/libg15 truetype? ( media-libs/freetype ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Small library for display text and graphics on a Logitech G15 keyboard
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/g15tools/
-IUSE=truetype
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=dev-libs/libg15 truetype? ( media-libs/freetype )
-SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7929e6e6877848379f1d6493b11f4e9a
diff --git a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1 b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
index 2b4a88a54b25..2f509a9ac2ee 100644
--- a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
+++ b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/c
 SLOT=0
 SRC_URI=mirror://sourceforge/libgaminggear/libgaminggear-0.15.1.tar.bz2
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9e2c0d08f4e74c0b86b7128c9335925
+_md5_=2f9aa7fcaa60a834f67f2527c8f1ec6b
diff --git a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1 b/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
deleted file mode 100644
index 4df5bce3dab7..000000000000
--- a/metadata/md5-cache/dev-libs/libgdata-0.17.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.25 >=dev-util/intltool-0.40 virtual/pkgconfig test? ( >=net-libs/uhttpmock-0.5 ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GLib-based library for accessing online service APIs using the GData protocol
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/libgdata
-IUSE=+crypt gnome-online-accounts +introspection static-libs test vala
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/json-glib-0.15[introspection?] >=dev-libs/libxml2-2:2 >=net-libs/liboauth-0.9.4 >=net-libs/libsoup-2.55.90:2.4[introspection?] >=x11-libs/gdk-pixbuf-2.14:2 crypt? ( app-crypt/gcr:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-REQUIRED_USE=gnome-online-accounts? ( crypt ) vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0/22
-SRC_URI=mirror://gnome/sources/libgdata/0.17/libgdata-0.17.9.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e56b19bb72a735eed00bc1e077aa4bc
diff --git a/metadata/md5-cache/dev-libs/libgit2-0.28.4 b/metadata/md5-cache/dev-libs/libgit2-0.28.4
index 3b35323ddf79..34b80c4c6995 100644
--- a/metadata/md5-cache/dev-libs/libgit2-0.28.4
+++ b/metadata/md5-cache/dev-libs/libgit2-0.28.4
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 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:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig
 DESCRIPTION=A linkable library for Git
 EAPI=7
 HOMEPAGE=https://libgit2.org
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/28
 SRC_URI=https://github.com/libgit2/libgit2/archive/v0.28.4.tar.gz -> libgit2-0.28.4.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91688bf38e70e80d1461faed01a5f7cf
+_md5_=421107992c5d9422923401ebe9847322
diff --git a/metadata/md5-cache/dev-libs/libgit2-9999 b/metadata/md5-cache/dev-libs/libgit2-9999
index 51c0801aa85c..44b6e3ceb7fd 100644
--- a/metadata/md5-cache/dev-libs/libgit2-9999
+++ b/metadata/md5-cache/dev-libs/libgit2-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib net-libs/http-parser:= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A linkable library for Git
 EAPI=6
 HOMEPAGE=https://libgit2.org
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sy
 RESTRICT=!test? ( test )
 SLOT=0/28
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1fddf956d7530972ef2ac8fc19dce04
+_md5_=8fd7038d09e86a8d539371608dcd19ba
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.37 b/metadata/md5-cache/dev-libs/libgpg-error-1.37
new file mode 100644
index 000000000000..4c32a8d051cd
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.37
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.37.tar.bz2
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6186039d0ff47167bb25c9e177bb6449
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.3 b/metadata/md5-cache/dev-libs/libgusb-0.3.3
new file mode 100644
index 000000000000..47b27723ed96
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.3
@@ -0,0 +1,16 @@
+BDEPEND=gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
+DESCRIPTION=GObject wrapper for libusb
+EAPI=7
+HOMEPAGE=https://github.com/hughsie/libgusb
+IUSE=gtk-doc +introspection static-libs test vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwids
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.3.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
+_md5_=e7b61f8082928d224a84b3e87b62bb1c
diff --git a/metadata/md5-cache/dev-libs/libgweather-3.34.0 b/metadata/md5-cache/dev-libs/libgweather-3.34.0
new file mode 100644
index 000000000000..b0534ead2be5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgweather-3.34.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Location and timezone database and weather-lookup library
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
+IUSE=glade gtk-doc +introspection +vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.44.0:2 >=x11-libs/gtk+-3.13.5:3[introspection?] >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib >=sys-libs/timezone-data-2010k glade? ( >=dev-util/glade-3.16:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=2/3-16-2
+SRC_URI=mirror://gnome/sources/libgweather/3.34/libgweather-3.34.0.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2d6f66eae7c759ee57f8985340ff3e16
diff --git a/metadata/md5-cache/dev-libs/libhid-0.2.16-r4 b/metadata/md5-cache/dev-libs/libhid-0.2.16-r4
index e5a29c124597..3eee10e71fd0 100644
--- a/metadata/md5-cache/dev-libs/libhid-0.2.16-r4
+++ b/metadata/md5-cache/dev-libs/libhid-0.2.16-r4
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Provides a generic and flexible way to access and interact with USB HID devices
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=doc python static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc python static-libs +python_single_target_python2_7
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) virtual/libusb:0
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://alioth-archive.debian.org/releases/libhid/libhid/0.2.16/libhid-0.2.16.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ff7662ebcb31a559f7e0664495dbdcb1
diff --git a/metadata/md5-cache/dev-libs/libinput-1.14.3 b/metadata/md5-cache/dev-libs/libinput-1.14.3
index 5d4b4f4e5bbb..e71016b86186 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.14.3
+++ b/metadata/md5-cache/dev-libs/libinput-1.14.3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/commonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 DESCRIPTION=Library to handle input devices in Wayland
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.14.3.tar.xz
 _eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=01dafd5fb25c963adf2f8b9c8170db17
+_md5_=b1af59079276a84ae6f1a3dca6c6979e
diff --git a/metadata/md5-cache/dev-libs/libinput-1.15.0 b/metadata/md5-cache/dev-libs/libinput-1.15.0
index 6285cd7fcb2b..77cadfd60d0e 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.15.0
+++ b/metadata/md5-cache/dev-libs/libinput-1.15.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/commonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
 DESCRIPTION=Library to handle input devices in Wayland
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.15.0.tar.xz
 _eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=bb0ad4abdbca06681d49910dd1804442
+_md5_=c6475032ece7754132832573c4a537e0
diff --git a/metadata/md5-cache/dev-libs/libinput-1.15.1 b/metadata/md5-cache/dev-libs/libinput-1.15.1
new file mode 100644
index 000000000000..80a7805d2349
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.15.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
+IUSE=doc input_devices_wacom
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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.15.1.tar.xz
+_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=c6475032ece7754132832573c4a537e0
diff --git a/metadata/md5-cache/dev-libs/libixion-0.14.1 b/metadata/md5-cache/dev-libs/libixion-0.14.1
index 101e925f04c2..bcb5ab5cbddc 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.14.1
+++ b/metadata/md5-cache/dev-libs/libixion-0.14.1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/boost:= >=dev-util/mdds-1.4.1:1= python? ( python_single_target_
 DESCRIPTION=General purpose formula parser & interpreter
 EAPI=7
 HOMEPAGE=https://gitlab.com/ixion/ixion
-IUSE=debug python static-libs +threads python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug python static-libs +threads python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= >=dev-util/mdds-1.4.1:1= python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/0.14
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.14.1.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=53189dcd8259976ee654d2b4adceaa7a
diff --git a/metadata/md5-cache/dev-libs/libixion-9999 b/metadata/md5-cache/dev-libs/libixion-9999
index ab4b7e2ac507..d94538f493b8 100644
--- a/metadata/md5-cache/dev-libs/libixion-9999
+++ b/metadata/md5-cache/dev-libs/libixion-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/boost:= >=dev-util/mdds-1.5.0:1= python? ( python_single_target_
 DESCRIPTION=General purpose formula parser & interpreter
 EAPI=7
 HOMEPAGE=https://gitlab.com/ixion/ixion
-IUSE=debug python static-libs +threads python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug python static-libs +threads python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= >=dev-util/mdds-1.5.0:1= python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/0.15
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=42015608695d02da25cc300358c90799
diff --git a/metadata/md5-cache/dev-libs/liblist-2.4 b/metadata/md5-cache/dev-libs/liblist-2.4
index 5ba107eb1fb8..feebf5374c80 100644
--- a/metadata/md5-cache/dev-libs/liblist-2.4
+++ b/metadata/md5-cache/dev-libs/liblist-2.4
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=doc? ( media-gfx/transfig dev-texlive/texlive-metapost virtual/latex-base ) >=app-portage/elt-patches-20170815
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+DEPEND=doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base )
 DESCRIPTION=Generic linked-list manipulation routines, plus queues and stacks
-EAPI=4
+EAPI=7
 HOMEPAGE=http://ohnopub.net/liblist
-IUSE=doc examples static-libs
+IUSE=doc examples
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=GPL-2
-RDEPEND=doc? ( media-gfx/transfig dev-texlive/texlive-metapost virtual/latex-base )
+RDEPEND=doc? ( dev-texlive/texlive-metapost media-gfx/transfig virtual/latex-base )
 SLOT=0
 SRC_URI=ftp://ohnopublishing.net/mirror/liblist-2.4.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e438dad05402b49fb022b4d08f9958a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6e3e89c89cbbc35482f675f4bb200b8e
diff --git a/metadata/md5-cache/dev-libs/liblouis-3.10.0 b/metadata/md5-cache/dev-libs/liblouis-3.10.0
index 76fad0da61bc..de112670e7ec 100644
--- a/metadata/md5-cache/dev-libs/liblouis-3.10.0
+++ b/metadata/md5-cache/dev-libs/liblouis-3.10.0
@@ -11,5 +11,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_6 ) )
 SLOT=0
 SRC_URI=https://github.com/liblouis/liblouis/archive/v3.10.0.tar.gz -> liblouis-3.10.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=53ac89a2669e750ca2102007097f96d2
diff --git a/metadata/md5-cache/dev-libs/libmacaroons-0.2.0-r1 b/metadata/md5-cache/dev-libs/libmacaroons-0.2.0-r1
index e276e3884aaa..dbef0827c3f8 100644
--- a/metadata/md5-cache/dev-libs/libmacaroons-0.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libmacaroons-0.2.0-r1
@@ -3,13 +3,13 @@ DEPEND=dev-libs/libsodium dev-libs/json-c:= python? ( python_single_target_pytho
 DESCRIPTION=Hyperdex macaroons support library
 EAPI=5
 HOMEPAGE=http://hyperdex.org
-IUSE=test +python +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python +python_single_target_python2_7
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-libs/libsodium dev-libs/json-c:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) test? ( python )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) test? ( python )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://hyperdex.org/src/libmacaroons-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=90c5e7c729ce48a88a5583f12b2a8b40
diff --git a/metadata/md5-cache/dev-libs/libmacaroons-0.3.0 b/metadata/md5-cache/dev-libs/libmacaroons-0.3.0
index 092b1b09f0d2..f3a88a86f4b8 100644
--- a/metadata/md5-cache/dev-libs/libmacaroons-0.3.0
+++ b/metadata/md5-cache/dev-libs/libmacaroons-0.3.0
@@ -3,13 +3,13 @@ DEPEND=dev-libs/libsodium dev-libs/json-c:= python? ( python_single_target_pytho
 DESCRIPTION=Hyperdex macaroons support library
 EAPI=5
 HOMEPAGE=http://hyperdex.org
-IUSE=test +python +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python +python_single_target_python2_7
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-libs/libsodium dev-libs/json-c:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) test? ( python )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) test? ( python )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://hyperdex.org/src/libmacaroons-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=90c5e7c729ce48a88a5583f12b2a8b40
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1 b/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
index 3099f577ffa2..5ad7dcb91ec6 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
+++ b/metadata/md5-cache/dev-libs/libmspack-0.9.1_alpha-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.9.1alpha.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b3e39fcb554c1bd51551f33dea1e6da2
+_md5_=d70a77accd9b338e66b5e2b99fbb5076
diff --git a/metadata/md5-cache/dev-libs/libmspack-9999 b/metadata/md5-cache/dev-libs/libmspack-9999
index e85804470f27..d857d3db6c10 100644
--- a/metadata/md5-cache/dev-libs/libmspack-9999
+++ b/metadata/md5-cache/dev-libs/libmspack-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9b1f3a4e17496760314d434b7d82bc9a
+_md5_=f8e6d134733a91de15b5833b3b35c46c
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1 b/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
index e618c8507f05..47d1672c4c61 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.2.6-r1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/popt python? ( python_single_target_python2_7? ( >=dev-lang/pyth
 DESCRIPTION=library to smooth charset/localization issues
 EAPI=5
 HOMEPAGE=http://natspec.sourceforge.net/
-IUSE=doc python +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc python +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f86c15b35fdf1cd3721d0d82d54c0bd1
diff --git a/metadata/md5-cache/dev-libs/libnatspec-0.3.0 b/metadata/md5-cache/dev-libs/libnatspec-0.3.0
index 40e5c3ed095a..74cd0766f77f 100644
--- a/metadata/md5-cache/dev-libs/libnatspec-0.3.0
+++ b/metadata/md5-cache/dev-libs/libnatspec-0.3.0
@@ -3,12 +3,12 @@ DEPEND=dev-libs/popt python? ( python_single_target_python2_7? ( >=dev-lang/pyth
 DESCRIPTION=library to smooth charset/localization issues
 EAPI=6
 HOMEPAGE=http://natspec.sourceforge.net/
-IUSE=doc python +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc python +python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/popt python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/natspec/libnatspec-0.3.0.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d0a2427c7eb3a13d17d4fe734143c31b
diff --git a/metadata/md5-cache/dev-libs/libnl-3.4.0 b/metadata/md5-cache/dev-libs/libnl-3.4.0
index 16334893b645..f735af9ae5b6 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_6 python_targets_python3_7 ) )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec5f3b2195478418386d115489d34785
diff --git a/metadata/md5-cache/dev-libs/libnl-3.5.0 b/metadata/md5-cache/dev-libs/libnl-3.5.0
index 07cccc8fd882..e40ffc64452b 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.5.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.5.0
@@ -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_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4d5cd7cfee749cbb13f85fdaa0c04415
diff --git a/metadata/md5-cache/dev-libs/libnl-99999999 b/metadata/md5-cache/dev-libs/libnl-99999999
index 14703c76d59d..bbb4e2e0e098 100644
--- a/metadata/md5-cache/dev-libs/libnl-99999999
+++ b/metadata/md5-cache/dev-libs/libnl-99999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=3
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=44031c4d908ffd080cda21394a1668fa
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.14.1-r1 b/metadata/md5-cache/dev-libs/liborcus-0.14.1-r1
index c9ef0fb94236..c38df53a9967 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.14.1-r1
+++ b/metadata/md5-cache/dev-libs/liborcus-0.14.1-r1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_py
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=7
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
-IUSE=python +spreadsheet-model static-libs tools python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python +spreadsheet-model static-libs tools python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) spreadsheet-model? ( >=dev-libs/libixion-0.14.0:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/0.14
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.14.1.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ca9bb76f6ba9878b729cf6ed65857b8f
diff --git a/metadata/md5-cache/dev-libs/liborcus-9999 b/metadata/md5-cache/dev-libs/liborcus-9999
index 7109d5cdc96a..774b0db09514 100644
--- a/metadata/md5-cache/dev-libs/liborcus-9999
+++ b/metadata/md5-cache/dev-libs/liborcus-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_py
 DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=7
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
-IUSE=python +spreadsheet-model static-libs tools python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python +spreadsheet-model static-libs tools python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/boost:=[zlib(+)] sys-libs/zlib python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) spreadsheet-model? ( >=dev-libs/libixion-0.15.0:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/0.15
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=54012ed0a8036384f1240b9c3f9f6eab
diff --git a/metadata/md5-cache/dev-libs/libowfat-0.32-r1 b/metadata/md5-cache/dev-libs/libowfat-0.32-r1
index 660fa7300594..78abc3adb4d1 100644
--- a/metadata/md5-cache/dev-libs/libowfat-0.32-r1
+++ b/metadata/md5-cache/dev-libs/libowfat-0.32-r1
@@ -10,4 +10,4 @@ RDEPEND=diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )
 SLOT=0
 SRC_URI=https://www.fefe.de/libowfat/libowfat-0.32.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cbcf5fc81fc87bc77d7235a936ede6ee
+_md5_=e413e6313a6f92aca5472fc827f8a06c
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.22.0 b/metadata/md5-cache/dev-libs/libpeas-1.22.0
deleted file mode 100644
index f872627ab0fb..000000000000
--- a/metadata/md5-cache/dev-libs/libpeas-1.22.0
+++ /dev/null
@@ -1,15 +0,0 @@
-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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-3.2:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) 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/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 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/
-IUSE=+gtk glade lua luajit +python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+
-RDEPEND=>=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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-3.2:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libpeas/1.22/libpeas-1.22.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de60f82b05a04fc76e40ca429afcacaa
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.22.0-r1 b/metadata/md5-cache/dev-libs/libpeas-1.22.0-r1
new file mode 100644
index 000000000000..fa343ce4c7aa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libpeas-1.22.0-r1
@@ -0,0 +1,15 @@
+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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.2:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.2:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) ) 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/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 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/
+IUSE=+gtk glade lua luajit +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2+
+RDEPEND=>=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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.2:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.2:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libpeas/1.22/libpeas-1.22.0.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b568535538fbbfd4020069ccc6924038
diff --git a/metadata/md5-cache/dev-libs/libpqxx-6.4.5 b/metadata/md5-cache/dev-libs/libpqxx-6.4.5
index c2e53a086ab8..e430dcd0f9ec 100644
--- a/metadata/md5-cache/dev-libs/libpqxx-6.4.5
+++ b/metadata/md5-cache/dev-libs/libpqxx-6.4.5
@@ -10,4 +10,4 @@ RDEPEND=dev-db/postgresql:=
 SLOT=0
 SRC_URI=https://github.com/jtv/libpqxx/archive/6.4.5.tar.gz -> libpqxx-6.4.5.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1666e4d928c9fd1f7809448676dcb1d2
+_md5_=48d2f296b4e535ad0cfa31e7b0de9097
diff --git a/metadata/md5-cache/dev-libs/libprelude-4.0.0 b/metadata/md5-cache/dev-libs/libprelude-4.0.0
index d85c27dd58a7..ab98dddf3a5d 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_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.0.0/libprelude-4.0.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28313cdc91319555b237991213213903
diff --git a/metadata/md5-cache/dev-libs/libprelude-4.1.0 b/metadata/md5-cache/dev-libs/libprelude-4.1.0
index 46988f320839..ed5f46a43934 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_6 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/4.1.0/libprelude-4.1.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ae0fe896b15e0099dd4ecc2fd9ed9b7
diff --git a/metadata/md5-cache/dev-libs/libprelude-5.1.1 b/metadata/md5-cache/dev-libs/libprelude-5.1.1
index d630b20bda49..d794718abb56 100644
--- a/metadata/md5-cache/dev-libs/libprelude-5.1.1
+++ b/metadata/md5-cache/dev-libs/libprelude-5.1.1
@@ -11,5 +11,5 @@ RDEPEND=net-libs/gnutls:= lua? ( dev-lang/lua:* ) perl? ( dev-lang/perl:= ) pyth
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/libprelude-5.1.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9f3da3d5fce074eeb313265b2c2ac0ef
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1 b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
index ed532f7cb9bf..b4e4a42486f5 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
+++ b/metadata/md5-cache/dev-libs/libpreludedb-4.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.0.0 net-libs/gnutls:= mysql? ( dev-db/mysql-conne
 REQUIRED_USE=python? ( || ( python_targets_python2_7 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=885af44dda50da1da2b133730332b949
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1 b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
index 8175cfb1ebde..5b755de902f9 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
+++ b/metadata/md5-cache/dev-libs/libpreludedb-4.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-libs/libprelude-4.1.0 net-libs/gnutls:= mysql? ( dev-db/mysql-conne
 REQUIRED_USE=python? ( || ( python_targets_python2_7 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b203156b2ac9153218fa6f498198b953
diff --git a/metadata/md5-cache/dev-libs/libpreludedb-5.1.0 b/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
index 4ef6d52fb8e5..75d0e24588dc 100644
--- a/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
+++ b/metadata/md5-cache/dev-libs/libpreludedb-5.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.1.0 <dev-libs/libprelude-6 net-libs/gnutls:= mys
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/libpreludedb-5.1.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ccbfffeff38d6bcfb0216457514dfb77
diff --git a/metadata/md5-cache/dev-libs/librelp-1.4.0 b/metadata/md5-cache/dev-libs/librelp-1.4.0
index 09b60c5aa05b..e98f637dace6 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.4.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.4.0
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup test
-DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) virtual/pkgconfig
+DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) virtual/pkgconfig
 DESCRIPTION=An easy to use library for the RELP protocol
 EAPI=7
 HOMEPAGE=http://www.librelp.com/
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=http://download.rsyslog.com/librelp/librelp-1.4.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=08683aec483f73459b9f7137f9603a4d
+_md5_=5cf85fae0458ad64aef3447b2ceae661
diff --git a/metadata/md5-cache/dev-libs/librelp-1.5.0 b/metadata/md5-cache/dev-libs/librelp-1.5.0
index 6d67e3caf972..917abaa5c885 100644
--- a/metadata/md5-cache/dev-libs/librelp-1.5.0
+++ b/metadata/md5-cache/dev-libs/librelp-1.5.0
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup test
-DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) virtual/pkgconfig
+DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.3.17.1:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) virtual/pkgconfig
 DESCRIPTION=An easy to use library for the RELP protocol
 EAPI=7
 HOMEPAGE=https://www.rsyslog.com/librelp/
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.5.0
 SRC_URI=https://download.rsyslog.com/librelp/librelp-1.5.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9ae11f402093612005ce8019ea76a861
+_md5_=1db3ff93b97b1fa679a90d4fe7a84ad5
diff --git a/metadata/md5-cache/dev-libs/libreport-2.10.0 b/metadata/md5-cache/dev-libs/libreport-2.10.0
index 03a41a1bc2e0..a7b10a5cb22e 100644
--- a/metadata/md5-cache/dev-libs/libreport-2.10.0
+++ b/metadata/md5-cache/dev-libs/libreport-2.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/abrt/libreport/archive/2.10.0.tar.gz -> libreport-2.10.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=af83b901c4bda2f88c00c08e608dd0ba
diff --git a/metadata/md5-cache/dev-libs/libressl-3.0.2 b/metadata/md5-cache/dev-libs/libressl-3.0.2
index 5dd77e1ee6bd..61c86c614a94 100644
--- a/metadata/md5-cache/dev-libs/libressl-3.0.2
+++ b/metadata/md5-cache/dev-libs/libressl-3.0.2
@@ -5,7 +5,7 @@ DESCRIPTION=Free version of the SSL/TLS protocol forked from OpenSSL
 EAPI=7
 HOMEPAGE=https://www.libressl.org/
 IUSE=+asm static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ISC openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=!dev-libs/openssl:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/47
 SRC_URI=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.0.2.tar.gz
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=160af28c0e59d53d20bd18f4143d2b6b
+_md5_=f4522866bdf380f6297e758abd72240d
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.4.1 b/metadata/md5-cache/dev-libs/libsavitar-3.4.1
index 3a820ac78ef5..7df3de01e4b0 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-3.4.1
+++ b/metadata/md5-cache/dev-libs/libsavitar-3.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python static-libs +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=560c6c536527172744f0a302b1de777c
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=91e766f4a1873b9b35dc6f889ed91404
diff --git a/metadata/md5-cache/dev-libs/libsavitar-3.6.0 b/metadata/md5-cache/dev-libs/libsavitar-3.6.0
index 0ad511c6f7d7..fbe6265e097c 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-3.6.0
+++ b/metadata/md5-cache/dev-libs/libsavitar-3.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python static-libs +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/3.6.0.tar.gz -> libsavitar-3.6.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=560c6c536527172744f0a302b1de777c
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=91e766f4a1873b9b35dc6f889ed91404
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.2.0 b/metadata/md5-cache/dev-libs/libsavitar-4.2.0
index dfa605e3a4c7..923cc6d94406 100644
--- a/metadata/md5-cache/dev-libs/libsavitar-4.2.0
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.2.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
 DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python static-libs +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0/3
 SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.2.0.tar.gz -> libsavitar-4.2.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b101d6baddfd60ccdbf862b0cb84ce6c
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f2a83233021affb08bca263a2c30578d
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.3.0 b/metadata/md5-cache/dev-libs/libsavitar-4.3.0
deleted file mode 100644
index 05be180d91ac..000000000000
--- a/metadata/md5-cache/dev-libs/libsavitar-4.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/libSavitar
-IUSE=+python static-libs +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0/3
-SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.3.0.tar.gz -> libsavitar-4.3.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ee95522fe2cf09d91505d10590a95fe
diff --git a/metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1 b/metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1
new file mode 100644
index 000000000000..ab6d9657afd6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libsavitar-4.3.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
+DESCRIPTION=C++ implementation of 3mf loading with SIP python bindings
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/libSavitar
+IUSE=+python static-libs +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/pugixml python_single_target_python3_6? ( dev-python/sip[python_targets_python3_6(-)] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
+SLOT=0/3
+SRC_URI=https://github.com/Ultimaker/libSavitar/archive/4.3.0.tar.gz -> libsavitar-4.3.0.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bf1749275f4bce075560c50a95160586
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20151118 b/metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20151118
index a2513c16127e..eb9a8ce147c4 100644
--- a/metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20151118
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20151118
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/secp256k1/archive/6c527eceee7f5105c33c98dfae24ffeffd71f7cf.tar.gz -> secp256k1-v0.0.0_pre20151118.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8552abcedbea6d45cbad33f7da3c590
+_md5_=5aa8aff0722e94da100c0b273b8087cc
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20161213 b/metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20161213
index a98fca4cf7d0..4ee82262ee5b 100644
--- a/metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20161213
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.0.0_pre20161213
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/secp256k1/archive/8225239f490f79842a5a3b82ad6cc8aa11d5208e.tar.gz -> libsecp256k1-v0.0.0_pre20161213.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=afb72235525c0a81d7cb34790b1cf77b
+_md5_=0d2ff42042370fea065e08997c41b511
diff --git a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20170928 b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20170928
index 7e37475d786f..c57e41f02779 100644
--- a/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20170928
+++ b/metadata/md5-cache/dev-libs/libsecp256k1-0.1_pre20170928
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin-core/secp256k1/archive/7a78f60598a6aeb635ef227ead50fb44a209c363.tar.gz -> libsecp256k1-v0.1_pre20170928.tgz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f9124eaab159335d68398d9f0b3b626d
+_md5_=1c3c0433d13094dcbd8f85c5a9016e44
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.14 b/metadata/md5-cache/dev-libs/libtasn1-4.14
deleted file mode 100644
index 3a262dcd312e..000000000000
--- a/metadata/md5-cache/dev-libs/libtasn1-4.14
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-apps/help2man virtual/yacc test? ( valgrind? ( dev-util/valgrind ) ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=ASN.1 library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/libtasn1/
-IUSE=doc static-libs test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0/6
-SRC_URI=mirror://gnu/libtasn1/libtasn1-4.14.tar.gz
-_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ad13e3fec1e57fa786ac04340c759400
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.16.0 b/metadata/md5-cache/dev-libs/libtasn1-4.16.0
new file mode 100644
index 000000000000..1a73577bf1ab
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.16.0
@@ -0,0 +1,13 @@
+BDEPEND=sys-apps/help2man virtual/yacc test? ( valgrind? ( dev-util/valgrind ) ) >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=ASN.1 library
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libtasn1/
+IUSE=doc static-libs test valgrind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-2.1
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=mirror://gnu/libtasn1/libtasn1-4.16.0.tar.gz
+_eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=be9dbfc8d9ed66012ca9ade795741b0f
diff --git a/metadata/md5-cache/dev-libs/libtermkey-0.22 b/metadata/md5-cache/dev-libs/libtermkey-0.22
index 6406e1a691c2..01b4e6354a2a 100644
--- a/metadata/md5-cache/dev-libs/libtermkey-0.22
+++ b/metadata/md5-cache/dev-libs/libtermkey-0.22
@@ -4,10 +4,10 @@ DESCRIPTION=Library for easy processing of keyboard entry from terminal-based pr
 EAPI=6
 HOMEPAGE=http://www.leonerd.org.uk/code/libtermkey/
 IUSE=demos static-libs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
 RDEPEND=dev-libs/unibilium:=
 SLOT=0
 SRC_URI=http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97e23ca6283ce5fc91366db17199a98b
+_md5_=15697add74e8bffdf8f2c7934c9b144f
diff --git a/metadata/md5-cache/dev-libs/libtommath-0.42.0-r1 b/metadata/md5-cache/dev-libs/libtommath-0.42.0-r1
deleted file mode 100644
index ce2537c93b32..000000000000
--- a/metadata/md5-cache/dev-libs/libtommath-0.42.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Optimized and portable routines for integer theoretic applications
-EAPI=4
-HOMEPAGE=https://github.com/libtom/libtommath
-IUSE=doc examples static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=WTFPL-2
-SLOT=0
-SRC_URI=https://github.com/libtom/libtommath/archive/v0.42.0.tar.gz -> libtommath-0.42.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3b222188ee59dff8b0074402165d664
diff --git a/metadata/md5-cache/dev-libs/libtommath-1.0.1 b/metadata/md5-cache/dev-libs/libtommath-1.0.1
deleted file mode 100644
index ad0596700110..000000000000
--- a/metadata/md5-cache/dev-libs/libtommath-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/libtool >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Optimized and portable routines for integer theoretic applications
-EAPI=6
-HOMEPAGE=http://www.libtom.net/
-IUSE=doc examples static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=WTFPL-2
-SLOT=0
-SRC_URI=https://github.com/libtom/libtommath/releases/download/v1.0.1/ltm-1.0.1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=502b6b7eda5bc87c980ddbc0d75dcc68
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 1239e4c1c974..9637b5188661 100644
--- a/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
+++ b/metadata/md5-cache/dev-libs/libunique-1.1.6-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A library for writing single instance application
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Attic/LibUnique
 IUSE=debug dbus +introspection test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 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:= )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libunique/1.1/libunique-1.1.6.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fc2511752a101d5ea989b5918f26a1c
+_md5_=3dc52b5966729ee16d91d28882049fcb
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 d2b38345f4eb..b849edcd5eb6 100644
--- a/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
+++ b/metadata/md5-cache/dev-libs/libunique-3.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A library for writing single instance application
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Attic/LibUnique
 IUSE=debug +introspection test
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 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:= )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libunique/3.0/libunique-3.0.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=154b2e3d4a6c1544b619dbdf52889706
+_md5_=cc8e0bd152f6c5fe857c599081a9e2e5
diff --git a/metadata/md5-cache/dev-libs/libx86emu-1.1 b/metadata/md5-cache/dev-libs/libx86emu-1.1
index 1206e8fbe573..a6fd4754038f 100644
--- a/metadata/md5-cache/dev-libs/libx86emu-1.1
+++ b/metadata/md5-cache/dev-libs/libx86emu-1.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install prepare test unpack
+DEFINED_PHASES=configure install unpack
 DEPEND=>=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=A library for emulating x86
-EAPI=4
+EAPI=7
 HOMEPAGE=https://www.opensuse.org/
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 SLOT=0
 SRC_URI=https://download.opensuse.org/source/factory/repo/oss/suse/src/libx86emu-1.1-9.8.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5168d2dcbd6aa8142a0377adcdfa1f8
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3bc00235c404657c07528561d4aada1a
diff --git a/metadata/md5-cache/dev-libs/libzip-1.6.0 b/metadata/md5-cache/dev-libs/libzip-1.6.0
deleted file mode 100644
index 531983590146..000000000000
--- a/metadata/md5-cache/dev-libs/libzip-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/lzma:= ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
-DESCRIPTION=Library for manipulating zip archives
-EAPI=7
-HOMEPAGE=https://nih.at/libzip/
-IUSE=bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test
-KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/lzma:= ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
-RESTRICT=!test? ( test )
-SLOT=0/5
-SRC_URI=https://www.nih.at/libzip/libzip-1.6.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e367cbe23d047aa3814f2b3c9f08a1f1
diff --git a/metadata/md5-cache/dev-libs/libzip-1.6.1 b/metadata/md5-cache/dev-libs/libzip-1.6.1
new file mode 100644
index 000000000000..d287c7eddeb9
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzip-1.6.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/lzma:= ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
+DESCRIPTION=Library for manipulating zip archives
+EAPI=7
+HOMEPAGE=https://nih.at/libzip/
+IUSE=bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test
+KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=BSD
+RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2:= ) lzma? ( app-arch/lzma:= ) ssl? ( gnutls? ( dev-libs/nettle:0= >=net-libs/gnutls-3.6.5:= ) !gnutls? ( mbedtls? ( net-libs/mbedtls:= ) !mbedtls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) )
+RESTRICT=!test? ( test )
+SLOT=0/5
+SRC_URI=https://www.nih.at/libzip/libzip-1.6.1.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bf15cba9d783faa4f750e95995518916
diff --git a/metadata/md5-cache/dev-libs/marisa-0.2.5 b/metadata/md5-cache/dev-libs/marisa-0.2.5
index 309841ac25a6..9f6f464ab9d1 100644
--- a/metadata/md5-cache/dev-libs/marisa-0.2.5
+++ b/metadata/md5-cache/dev-libs/marisa-0.2.5
@@ -5,11 +5,11 @@ DESCRIPTION=Matching Algorithm with Recursively Implemented StorAge
 EAPI=7
 HOMEPAGE=https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/
 IUSE=python static-libs python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 arm64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm64 ppc ppc64 sparc x86
 LICENSE=|| ( BSD-2 LGPL-2.1+ )
 RDEPEND=python? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/s-yata/marisa-trie/archive/v0.2.5.tar.gz -> marisa-0.2.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7f52325bdd2813516ded174f3d60136b
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8d87b10cf4fc2705a61318c33988bfd3
diff --git a/metadata/md5-cache/dev-libs/marisa-9999 b/metadata/md5-cache/dev-libs/marisa-9999
index 04d6333585c4..633d248e8e3d 100644
--- a/metadata/md5-cache/dev-libs/marisa-9999
+++ b/metadata/md5-cache/dev-libs/marisa-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=509dd981d6814ddc62f1266e0060811e
diff --git a/metadata/md5-cache/dev-libs/mongo-cxx-driver-0.0.2.6.7-r1 b/metadata/md5-cache/dev-libs/mongo-cxx-driver-0.0.2.6.7-r1
index 496e9242f1a6..bc6add7b400c 100644
--- a/metadata/md5-cache/dev-libs/mongo-cxx-driver-0.0.2.6.7-r1
+++ b/metadata/md5-cache/dev-libs/mongo-cxx-driver-0.0.2.6.7-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3 Apache-2.0
 RDEPEND=app-arch/snappy >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.50[threads(+)] >=dev-libs/libpcre-8.30[cxx] dev-util/google-perftools[-minimal] ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-cxx-driver/archive/legacy-0.0-26compat-2.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=821ef338ee6c9f14b097ad1962b64eee
diff --git a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0 b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0
index 68bcc0225247..e3ac5ae4488b 100644
--- a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0
+++ b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/tokumx >=dev-libs/boost-1.50[threads(+)] sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-cxx-driver/archive/legacy-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f9c8df53f29c7d67193c174851a0de3
diff --git a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.5 b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.5
index 26807bc2aa68..ba3cb103b04a 100644
--- a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.5
+++ b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.0.5
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/tokumx >=dev-libs/boost-1.50[threads(+)] sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-cxx-driver/archive/legacy-1.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f9c8df53f29c7d67193c174851a0de3
diff --git a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.1.2-r1 b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.1.2-r1
index 3d27a867c766..4f259f6b3f65 100644
--- a/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.1.2-r1
+++ b/metadata/md5-cache/dev-libs/mongo-cxx-driver-1.1.2-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=!dev-db/tokumx dev-libs/boost:=[threads(+)] sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-cxx-driver/archive/legacy-1.1.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec973e9fef72512882f3968d36326914
diff --git a/metadata/md5-cache/dev-libs/nss-3.50 b/metadata/md5-cache/dev-libs/nss-3.50
new file mode 100644
index 000000000000..0cfcfcebd397
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.50
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/nspr-4.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=7
+HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
+IUSE=cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_50_RTM/src/nss-3.50.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f5c05ae8248925ea6082f2d3ec767f22
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-3.4.1 b/metadata/md5-cache/dev-libs/opencryptoki-3.4.1
index 996fb3eef4b8..faf413456ecd 100644
--- a/metadata/md5-cache/dev-libs/opencryptoki-3.4.1
+++ b/metadata/md5-cache/dev-libs/opencryptoki-3.4.1
@@ -11,5 +11,5 @@ RDEPEND=tpm? ( app-crypt/trousers ) !libressl? ( dev-libs/openssl:0= ) libressl?
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencryptoki/3.4.1/opencryptoki-v3.4.1.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=89761474fdd405fa94fedd7a5aae7332
diff --git a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1 b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1
index 27df0d5b9680..dfb11b3f3d4a 100644
--- a/metadata/md5-cache/dev-libs/opencryptoki-3.6.1
+++ b/metadata/md5-cache/dev-libs/opencryptoki-3.6.1
@@ -11,5 +11,5 @@ RDEPEND=tpm? ( app-crypt/trousers ) !libressl? ( >=dev-libs/openssl-1.1.0:0= ) l
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/opencryptoki/3.6.1/opencryptoki-3.6.1.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6c2b1ba7a28c110ef26b920ac991853c
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r4 b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
index 558c9e921236..2e3f29317983 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r4
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1:= ) usb? ( virtual/libusb:0 ) dev-libs/libltdl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/openct/openct-0.6.20.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e3a477e09ff8ce92b0f1d033ab16ede3
diff --git a/metadata/md5-cache/dev-libs/pigpio-72 b/metadata/md5-cache/dev-libs/pigpio-72
index e8881a2d8bfe..e403e0e84e65 100644
--- a/metadata/md5-cache/dev-libs/pigpio-72
+++ b/metadata/md5-cache/dev-libs/pigpio-72
@@ -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_6 python_targets_python3_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/V72.tar.gz -> pigpio-72.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dea69a2ac47c7d4c8dd9932ef3a123e6
diff --git a/metadata/md5-cache/dev-libs/pigpio-73 b/metadata/md5-cache/dev-libs/pigpio-73
index b762ac9eb728..4b99cc99d669 100644
--- a/metadata/md5-cache/dev-libs/pigpio-73
+++ b/metadata/md5-cache/dev-libs/pigpio-73
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/joan2937/pigpio/archive/V73.tar.gz -> pigpio-73.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=faec3518f50b5ef05cb5182ed788785c
diff --git a/metadata/md5-cache/dev-libs/pigpio-74 b/metadata/md5-cache/dev-libs/pigpio-74
new file mode 100644
index 000000000000..8a03b66c8ff4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pigpio-74
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
+EAPI=7
+HOMEPAGE=http://abyz.me.uk/rpi/pigpio/index.html https://github.com/joan2937/pigpio
+IUSE=python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~arm
+LICENSE=Unlicense
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/joan2937/pigpio/archive/v74.tar.gz -> pigpio-74.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=417370e3ba0f087a58aa9ebb289e233d
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
index 603348ccf1a4..a992ed173d18 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=Protocol Buffers implementation in C
 EAPI=7
 HOMEPAGE=https://github.com/protobuf-c/protobuf-c
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-libs/protobuf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.2/protobuf-c-1.3.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=93a9c4d80fda3e359968626f520944cd
+_md5_=64bd4da4909726ceaff435bdc41d919b
diff --git a/metadata/md5-cache/dev-libs/qrosspython-0.3.2 b/metadata/md5-cache/dev-libs/qrosspython-0.3.2
index ea5170027bcc..96c70f26f2d9 100644
--- a/metadata/md5-cache/dev-libs/qrosspython-0.3.2
+++ b/metadata/md5-cache/dev-libs/qrosspython-0.3.2
@@ -3,12 +3,12 @@ DEPEND=~dev-libs/qrosscore-0.3.2 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 p
 DESCRIPTION=Python scripting backend for Qross
 EAPI=6
 HOMEPAGE=https://github.com/0xd34df00d/Qross
-IUSE=debug +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=~dev-libs/qrosscore-0.3.2 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0751df3b00a09b9baa4e671043d90a68
diff --git a/metadata/md5-cache/dev-libs/qrosspython-9999 b/metadata/md5-cache/dev-libs/qrosspython-9999
index 6b79dd7f67a5..3ce7002c0586 100644
--- a/metadata/md5-cache/dev-libs/qrosspython-9999
+++ b/metadata/md5-cache/dev-libs/qrosspython-9999
@@ -3,11 +3,11 @@ DEPEND=~dev-libs/qrosscore-9999 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 py
 DESCRIPTION=Python scripting backend for Qross
 EAPI=6
 HOMEPAGE=https://github.com/0xd34df00d/Qross
-IUSE=debug +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug +python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=~dev-libs/qrosscore-9999 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f30c93c5f6882654f959acc55e17bc9
diff --git a/metadata/md5-cache/dev-libs/re2-0.2019.12.01 b/metadata/md5-cache/dev-libs/re2-0.2019.12.01
index cc1087ffcf35..f04af08c550c 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2019.12.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2019.12.01
@@ -5,10 +5,10 @@ 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/gentoo-2019-01-01
 SRC_URI=https://github.com/google/re2/archive/2019-12-01.tar.gz -> re2-2019-12-01.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2dfec918243c6d87ef2cfb374a5a452c
+_md5_=d6e0e51675173d48ecd7ccb4db354020
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
index 141d08fc53cc..f63a453cc44f 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.14.1-r2
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1:0 ) perl? ( dev-lang/
 DESCRIPTION=Language bindings for Redland
 EAPI=5
 HOMEPAGE=http://librdf.org/bindings/
-IUSE=lua perl python php ruby +python_targets_python2_7 +python_single_target_python2_7
+IUSE=lua perl python php ruby +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1:0 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( dev-lang/ruby:* dev-ruby/log4r )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.14.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3adc799ac1c13a3c49a0ac7331e9750b
diff --git a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1 b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1
index c727ef733783..691ff0396ba9 100644
--- a/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1
+++ b/metadata/md5-cache/dev-libs/redland-bindings-1.0.17.1
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/pe
 DESCRIPTION=Language bindings for Redland
 EAPI=6
 HOMEPAGE=http://librdf.org/bindings/
-IUSE=lua perl python php ruby php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=lua perl python php ruby php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/redland-1.0.14 lua? ( >=dev-lang/lua-5.1 ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( dev-lang/ruby dev-ruby/log4r ) php? ( php_targets_php7-2? ( dev-lang/php:7.2[-threads] ) php_targets_php7-3? ( dev-lang/php:7.3[-threads] ) php_targets_php7-4? ( dev-lang/php:7.4[-threads] ) ) php? ( php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) php? ( || ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 ) )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-bindings-1.0.17.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f0bb0ff965b34dd2aee54ba74d276120
diff --git a/metadata/md5-cache/dev-libs/serd-0.28.0-r1 b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
index 12b30a46011b..1bdcd1216896 100644
--- a/metadata/md5-cache/dev-libs/serd-0.28.0-r1
+++ b/metadata/md5-cache/dev-libs/serd-0.28.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen )
+DEPEND=|| ( dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen )
 DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/serd/
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.28.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=6eb376ed1e229a27dcb0a394629cdd33
+_md5_=192a117c3cd2d2f83d7787a042e6a573
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.0-r1 b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
index 1869c43fc576..06ceca1972a0 100644
--- a/metadata/md5-cache/dev-libs/sord-0.16.0-r1
+++ b/metadata/md5-cache/dev-libs/sord-0.16.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/serd-0.28.0-r1 || ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEPEND=>=dev-libs/serd-0.28.0-r1 || ( dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
 DESCRIPTION=Library for storing RDF data in memory
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/sord/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sord-0.16.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=841ef581170c679cc20cb95c831e869b
+_md5_=8508d48a6d908f0742977034483727cd
diff --git a/metadata/md5-cache/dev-libs/utfcpp-3.1 b/metadata/md5-cache/dev-libs/utfcpp-3.1
index b2bee0bd421b..f1b3a37d86bc 100644
--- a/metadata/md5-cache/dev-libs/utfcpp-3.1
+++ b/metadata/md5-cache/dev-libs/utfcpp-3.1
@@ -5,10 +5,10 @@ DESCRIPTION=UTF-8 C++ library
 EAPI=7
 HOMEPAGE=https://github.com/nemtrif/utfcpp
 IUSE=test
-KEYWORDS=amd64 arm64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm64 ppc ppc64 sparc x86
 LICENSE=Boost-1.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nemtrif/utfcpp/archive/v3.1.tar.gz -> utfcpp-3.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d5a32779bae44963f532e541e5d47ff
+_md5_=21b374c658a9607e4ab1e9429a4a874a
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.11 b/metadata/md5-cache/dev-libs/volume_key-0.3.11
index 28038474e01e..b07b007576ab 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.11
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.11
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Library for manipulating and storing storage volume encryption keys
 EAPI=7
 HOMEPAGE=https://pagure.io/volume_key
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.11.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a134c73809e74a077007e3959392ddc
diff --git a/metadata/md5-cache/dev-libs/volume_key-0.3.12 b/metadata/md5-cache/dev-libs/volume_key-0.3.12
index 5fcbffce4208..05437c3b4dbc 100644
--- a/metadata/md5-cache/dev-libs/volume_key-0.3.12
+++ b/metadata/md5-cache/dev-libs/volume_key-0.3.12
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Library for manipulating and storing storage volume encryption keys
 EAPI=7
 HOMEPAGE=https://pagure.io/volume_key
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/gpgme dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-apps/util-linux sys-fs/cryptsetup:=
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.pagure.org/volume_key/volume_key-0.3.12.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e129e9f033f38bc1004beb521727a9c7
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.69-r1 b/metadata/md5-cache/dev-libs/zziplib-0.13.69-r1
index 88d0cf98d5dc..791438dcfdb6 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.69-r1
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.69-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Lightweight library for extracting data from files archived in a sin
 EAPI=7
 HOMEPAGE=http://zziplib.sourceforge.net/
 IUSE=doc sdl static-libs test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gdraheim/zziplib/archive/v0.13.69.tar.gz -> zziplib-0.13.69.tar.gz https://dev.gentoo.org/~asturm/distfiles/zziplib-0.13.69-patches.tar.xz https://dev.gentoo.org/~asturm/distfiles/zziplib-0.13.69-man.tar.xz doc? ( https://dev.gentoo.org/~asturm/distfiles/zziplib-0.13.69-html.tar.xz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ef34b9ffffa9c85d90c03ed151af5280
+_md5_=6ee21954be11b4add5c42d331f3cffbd
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index b819d1387a94..5f293a62ef3f 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/camlp4-4.04_p1 b/metadata/md5-cache/dev-ml/camlp4-4.04_p1
index df477c5f55a0..4447a7d5713c 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.04_p1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.04_p1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.04_beta:=[ocamlopt?] dev-ml/ocamlbuild
+DEPEND==dev-lang/ocaml-4.04*:=[ocamlopt?] dev-ml/ocamlbuild
 DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=5
 HOMEPAGE=https://github.com/ocaml/camlp4
 IUSE=+ocamlopt
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.04_beta:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
+RDEPEND==dev-lang/ocaml-4.04*:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
 SLOT=0/4.04_p1
 SRC_URI=https://github.com/ocaml/camlp4/archive/4.04+1.tar.gz -> camlp4-4.04_p1.tar.gz
-_md5_=63f52e85dedd44d50ef4123c10c2dadd
+_md5_=18d57032248091f370aa9e614e9d0562
diff --git a/metadata/md5-cache/dev-ml/camlp4-4.05_p1 b/metadata/md5-cache/dev-ml/camlp4-4.05_p1
index 8e6ae5173654..0846d2b1d308 100644
--- a/metadata/md5-cache/dev-ml/camlp4-4.05_p1
+++ b/metadata/md5-cache/dev-ml/camlp4-4.05_p1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?] dev-ml/ocamlbuild
+DEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?] dev-ml/ocamlbuild
 DESCRIPTION=System for writing extensible parsers for programming languages
 EAPI=5
 HOMEPAGE=https://github.com/ocaml/camlp4
 IUSE=+ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
+RDEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?] !<dev-lang/ocaml-4.02 !<dev-ml/findlib-1.5.5-r1
 SLOT=0/4.05_p1
 SRC_URI=https://github.com/ocaml/camlp4/archive/4.05+1.tar.gz -> camlp4-4.05_p1.tar.gz
-_md5_=fff1c9062d870e5cb2cb1dd05d4a5494
+_md5_=c23fc3e322a4eda14f7990f8ce6e6ee8
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.10 b/metadata/md5-cache/dev-ml/camlp5-7.10
index 826efd878fdf..3207253835b1 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.10
+++ b/metadata/md5-cache/dev-ml/camlp5-7.10
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install
-DEPEND=dev-lang/ocaml >=dev-ml/findlib-1.0.4-r1
+DEPEND=<dev-lang/ocaml-4.09 >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=BSD
-RDEPEND=dev-lang/ocaml
+RDEPEND=<dev-lang/ocaml-4.09
 SLOT=0/7.10
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel710.tar.gz -> camlp5-7.10.tar.gz
 _eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
-_md5_=61c5ef97afaed5bac7894c19f214d726
+_md5_=b9a4148159f2257cbe0fc2d43a096442
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.11 b/metadata/md5-cache/dev-ml/camlp5-7.11
new file mode 100644
index 000000000000..177547c725b2
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/camlp5-7.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=dev-lang/ocaml >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=A preprocessor-pretty-printer of ocaml
+EAPI=7
+HOMEPAGE=https://camlp5.github.io/
+IUSE=doc +ocamlopt
+KEYWORDS=~alpha ~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/ocaml
+SLOT=0/7.11
+SRC_URI=https://github.com/camlp5/camlp5/archive/rel711.tar.gz -> camlp5-7.11.tar.gz
+_eclasses_=findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=61c5ef97afaed5bac7894c19f214d726
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.1 b/metadata/md5-cache/dev-ml/findlib-1.7.1
index 0a2d885cb190..610befa9c6d6 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.7.1
+++ b/metadata/md5-cache/dev-ml/findlib-1.7.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 DESCRIPTION=OCaml tool to find/use non-standard packages
 EAPI=5
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.7.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b3f4d7cc086d3a813df916b9b867e5ef
+_md5_=c4d8452437bdeb6a77a21e93a3594a91
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.2 b/metadata/md5-cache/dev-ml/findlib-1.7.2
index 19fcf5c18281..daa0cf7a96b2 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.7.2
+++ b/metadata/md5-cache/dev-ml/findlib-1.7.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 DESCRIPTION=OCaml tool to find/use non-standard packages
 EAPI=5
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed31efdc6806add58e45e92e6de374ec
+_md5_=bd78d595a6b526d215ff2b5e989ae1ea
diff --git a/metadata/md5-cache/dev-ml/findlib-1.7.3 b/metadata/md5-cache/dev-ml/findlib-1.7.3
index 720ba5a387c9..a19b4794ec7e 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.7.3
+++ b/metadata/md5-cache/dev-ml/findlib-1.7.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 DESCRIPTION=OCaml tool to find/use non-standard packages
 EAPI=5
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
+RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.7.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9262a5adbd7b7bba438849a106e4a514
+_md5_=1afdd858f65d0b36daa9e669ef0f4893
diff --git a/metadata/md5-cache/dev-ml/findlib-1.8.1 b/metadata/md5-cache/dev-ml/findlib-1.8.1
index 31431ace0d4d..0ed57d8f16db 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.8.1
+++ b/metadata/md5-cache/dev-ml/findlib-1.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml tool to find/use non-standard packages
 EAPI=5
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] tk? ( dev-ml/labltk:= )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.8.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ffe0a689b97688250b893debf7a9ac81
+_md5_=25d4cd7acc17618ca8941a04bb4d7db6
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999
index cc0e7ef3830b..8568a58fe7a6 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.0.9999:=[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_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,llvm_targets_VE?,debug?] !sys-devel/llvm[ocaml(-)]
 DESCRIPTION=OCaml bindings for LLVM
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/10.0.0.9999
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24dd0654341a1047bb02d3821eaa4dd7
+_md5_=3e55177e9f33ef05ee033669840f070e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0_rc1 b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0_rc1
index a5f3e8ca987e..b958f461610c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0_rc1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-10.0.0_rc1:=[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_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,llvm_targets_VE?,debug?] !sys-devel/llvm[ocaml(-)]
 DESCRIPTION=OCaml bindings for LLVM
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10.0.0_rc1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24dd0654341a1047bb02d3821eaa4dd7
+_md5_=3e55177e9f33ef05ee033669840f070e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999 b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
index 270107fbbf24..3c08e1a77625 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-11.0.0.9999:=[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_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,llvm_targets_VE?,debug?] !sys-devel/llvm[ocaml(-)]
 DESCRIPTION=OCaml bindings for LLVM
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/11.0.0.9999
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24dd0654341a1047bb02d3821eaa4dd7
+_md5_=3e55177e9f33ef05ee033669840f070e
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1 b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1
index fcbbfa24cc82..d7eff73d0d45 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-lang/perl dev-ml/findlib test? ( dev-ml/ounit ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-9.0.1:=[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_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,debug?] !sys-devel/llvm[ocaml(-)]
 DESCRIPTION=OCaml bindings for LLVM
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/9.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b512b9ed2a7267e5fca45aa8de6d2458
+_md5_=575f28e6f2c3d39d5288c6fa47f29e39
diff --git a/metadata/md5-cache/dev-ml/ocamlbuild-0.10.1 b/metadata/md5-cache/dev-ml/ocamlbuild-0.10.1
index fbb68eb9bc09..95948e46e4b9 100644
--- a/metadata/md5-cache/dev-ml/ocamlbuild-0.10.1
+++ b/metadata/md5-cache/dev-ml/ocamlbuild-0.10.1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?]
 DESCRIPTION=Generic build tool with built-in rules for building OCaml library and programs
 EAPI=5
 HOMEPAGE=https://github.com/ocaml/ocamlbuild
 IUSE=+ocamlopt
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] !<dev-ml/findlib-1.6.1-r1
+RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] !<dev-ml/findlib-1.6.1-r1
 SLOT=0/0.10.1
 SRC_URI=https://github.com/ocaml/ocamlbuild/archive/0.10.1.tar.gz -> ocamlbuild-0.10.1.tar.gz
-_md5_=f9fe1014f79e152e8b6249352f8b2c32
+_md5_=94f253ed5f1a7b5609602046dec5dcfd
diff --git a/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0 b/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
index 97bedc87ba88..37637421608a 100644
--- a/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
+++ b/metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] test? ( dev-ml/findlib )
+DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] test? ( dev-ml/findlib )
 DESCRIPTION=Generic build tool with built-in rules for building OCaml library and programs
 EAPI=5
 HOMEPAGE=https://github.com/ocaml/ocamlbuild
 IUSE=+ocamlopt test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] !<dev-ml/findlib-1.6.1-r1
+RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] !<dev-ml/findlib-1.6.1-r1
 RESTRICT=!test? ( test )
 SLOT=0/0.11.0
 SRC_URI=https://github.com/ocaml/ocamlbuild/archive/0.11.0.tar.gz -> ocamlbuild-0.11.0.tar.gz
-_md5_=c8f676df06d4d2d05ee999189d9e4231
+_md5_=e7f13a826d00a1bf42ee25915c85d8f5
diff --git a/metadata/md5-cache/dev-ml/ocamlweb-1.39 b/metadata/md5-cache/dev-ml/ocamlweb-1.39
index c283327a54a2..5ecff6f58d48 100644
--- a/metadata/md5-cache/dev-ml/ocamlweb-1.39
+++ b/metadata/md5-cache/dev-ml/ocamlweb-1.39
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-lang/ocaml-3.09:= virtual/latex-base dev-texlive/texlive-latexextra
+DEPEND=>=dev-lang/ocaml-3.09:= virtual/latex-base dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=O'Caml literate programming tool
 EAPI=7
 HOMEPAGE=http://www.lri.fr/~filliatr/ocamlweb/
@@ -9,5 +8,5 @@ LICENSE=LGPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=http://www.lri.fr/~filliatr/ftp/ocamlweb/ocamlweb-1.39.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=449f7ac251141f75d15c52ac965d1a3c
diff --git a/metadata/md5-cache/dev-ml/patience_diff-0.9.0 b/metadata/md5-cache/dev-ml/patience_diff-0.9.0
index 2a06000171c9..65135d660f52 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.9.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.9.0
@@ -9,4 +9,4 @@ RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_driver:= dev-ml/ppx_jane:= dev-ml/ocaml-
 SLOT=0/0.9.0
 SRC_URI=https://github.com/janestreet/patience_diff/archive/v0.9.0.tar.gz -> patience_diff-0.9.0.tar.gz
 _eclasses_=opam	c053036d04fbcede5c53fe5752699eb5
-_md5_=1f9504b537b5f20dc0cb4c5e1ecbc963
+_md5_=75362ac63dac46145cfa19141913e9d9
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
index e96791f747e0..3d882a91d8f0 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
+++ b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.03.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/ocaml-4.03.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
+DEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Tools for authors of ppx rewriters
 EAPI=5
 HOMEPAGE=https://github.com/alainfrisch/ppx_tools
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.03.0:=[ocamlopt?]
+RDEPEND=<dev-lang/ocaml-4.09:=[ocamlopt?]
 SLOT=0/5.0.4.03.0
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.0+4.03.0.tar.gz -> ppx_tools-5.0.4.03.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=19bc294b0f7923cfef422d2c35425091
+_md5_=c9beeeaee3d66f98c97cbef90c0d647c
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
index b77e29f131f2..6847ff3bdb2f 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
+++ b/metadata/md5-cache/dev-ml/ppx_tools-5.0.4.05.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
+DEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Tools for authors of ppx rewriters
 EAPI=5
 HOMEPAGE=https://github.com/alainfrisch/ppx_tools
 IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.05_beta:=[ocamlopt?]
+RDEPEND==dev-lang/ocaml-4.05*:=[ocamlopt?]
 SLOT=0/5.0.4.05.0
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.0+4.05.0.tar.gz -> ppx_tools-5.0.4.05.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c193ba9c6fdd8bf0a266528231a15eb2
+_md5_=f235b5dab749d8a1dc37210691c7ebb5
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-5.3.4.08.0 b/metadata/md5-cache/dev-ml/ppx_tools-5.3.4.08.0
new file mode 100644
index 000000000000..eaa23e5a0fd4
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ppx_tools-5.3.4.08.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Tools for authors of ppx rewriters
+EAPI=7
+HOMEPAGE=https://github.com/alainfrisch/ppx_tools
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+SLOT=0/5.3.4.08.0
+SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/5.3+4.08.0.tar.gz -> ppx_tools-5.3.4.08.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a
+_md5_=39ba17f3c0cb2ec896824a689ce31d7c
diff --git a/metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r1 b/metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r1
index dfca2a97f127..111ff03cf7f9 100644
--- a/metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r1
+++ b/metadata/md5-cache/dev-perl/CDDB_get-2.280.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=2
 SRC_URI=mirror://cpan/authors/id/F/FO/FONKIE/CDDB_get-2.28.tar.gz http://armin.emx.at/cddb/CDDB_get-2.28.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e0f3c53e72e989a7a1975cde7f892b0f
+_md5_=2fbffd260c99da778805fe1309805e4c
diff --git a/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0 b/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0
index 816dc5921441..8480b2912a1d 100644
--- a/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0
+++ b/metadata/md5-cache/dev-perl/CGI-FormBuilder-3.100.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f525f2424719140b68f75539bd78a736
+_md5_=dd8ef5a01d92d20bc0759573be7407a7
diff --git a/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r1 b/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r1
index d8a4ef924bd1..095bb342aa4b 100644
--- a/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r1
+++ b/metadata/md5-cache/dev-perl/Cache-Memcached-1.300.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/String-CRC32 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9bbaf47a66b7c5a85d6af7f87fa565f
+_md5_=e1631204e54adbf98eae00fc824d9619
diff --git a/metadata/md5-cache/dev-perl/CursesWidgets-1.997.0-r2 b/metadata/md5-cache/dev-perl/CursesWidgets-1.997.0-r2
index 75533af222d6..c20392a15a20 100644
--- a/metadata/md5-cache/dev-perl/CursesWidgets-1.997.0-r2
+++ b/metadata/md5-cache/dev-perl/CursesWidgets-1.997.0-r2
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5 >=dev-perl/Curses-1.60.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CO/CORLISS/CursesWidgets-1.997.tar.gz http://www.digitalmages.com/perl/CursesWidgets/downloads/CursesWidgets-1.997.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bafcbd6c411e50d18d42cec6499bace7
+_md5_=8a235a0585713a37100c2519389493ed
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2 b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
index 7b65b0fff968..7b406e10532c 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.44.0-r2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.044.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc1f08bc3d98222f27559d8464375fac
+_md5_=1dd9087e570f4d285b573ecc3aee3827
diff --git a/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0 b/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
index 8ec0ba15edb4..5ae64eba3e9d 100644
--- a/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
+++ b/metadata/md5-cache/dev-perl/DBD-mysql-4.50.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=521b13ce87e034ed96e5251613947a74
+_md5_=b51c866bb4a2cc0f1d91f6a740635b8e
diff --git a/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1 b/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
index a2c25c31ce80..96b1ab96444c 100644
--- a/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
+++ b/metadata/md5-cache/dev-perl/Data-Stag-0.140.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/IO-String dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CM/CMUNGALL/Data-Stag-0.14.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32fc220cc295ecd9299b3f209be8b7c3
+_md5_=435c797f3fae18e67f2385ddb9ba9ba6
diff --git a/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0 b/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
index b975ba677449..58de0d53875a 100644
--- a/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
+++ b/metadata/md5-cache/dev-perl/File-RsyncP-0.740.0
@@ -9,4 +9,4 @@ RDEPEND=net-misc/rsync dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CB/CBARRATT/File-RsyncP-0.74.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b090751aa41d0a1ea0cd4a7de3a794d
+_md5_=b345d593969b95c2eb260b2becbde7ad
diff --git a/metadata/md5-cache/dev-perl/Gtk2-1.249.920 b/metadata/md5-cache/dev-perl/Gtk2-1.249.920
index 03eded75c1e4..5ff70a75f69c 100644
--- a/metadata/md5-cache/dev-perl/Gtk2-1.249.920
+++ b/metadata/md5-cache/dev-perl/Gtk2-1.249.920
@@ -4,11 +4,11 @@ DESCRIPTION=Perl bindings for GTK2
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Gtk2
 IUSE=test test
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=x11-libs/gtk+:2 >=dev-perl/Cairo-1 >=dev-perl/glib-perl-1.280.0 >=dev-perl/Pango-1.220.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24992.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=17b45d0e2b3606038bc139722ac737fd
+_md5_=ac04bb07bcdfd2bc0fe803c78d3b9f9f
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
index 740ed37ad664..b955d4de48f7 100644
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz
 _eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d67909714ff170e3773f6b5e45cd1ffe
+_md5_=c1668f727dd2c2bb2e80c97e0f0e536e
diff --git a/metadata/md5-cache/dev-perl/Inline-Python-0.560.0 b/metadata/md5-cache/dev-perl/Inline-Python-0.560.0
index b8033475fd8c..d6a0c3e25059 100644
--- a/metadata/md5-cache/dev-perl/Inline-Python-0.560.0
+++ b/metadata/md5-cache/dev-perl/Inline-Python-0.560.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Proc-ProcessTable-0.530.0 virtual/perl-Test-Simple dev-perl/Test-Deep dev-perl/Test-Number-Delta virtual/perl-Test ) dev-lang/perl
+DEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) virtual/perl-ExtUtils-MakeMaker test? ( >=dev-perl/Proc-ProcessTable-0.530.0 virtual/perl-Test-Simple dev-perl/Test-Deep dev-perl/Test-Number-Delta virtual/perl-Test ) dev-lang/perl
 DESCRIPTION=Easy implementation of Python extensions
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Inline-Python
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=test +python_single_target_python3_6
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/perl:=
-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 )
+RDEPEND=virtual/perl-Data-Dumper >=virtual/perl-Digest-MD5-2.500.0 >=dev-perl/Inline-0.460.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/perl:=
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NI/NINE/Inline-Python-0.56.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=35638164f8cbe1e6ca748ccf6232d424
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c8e5ba79f3ef4d4b344177aa4800e992
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 7d4c33bf6fc0..6bea64c17d9b 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/MogileFS-Server-2.720.0-r1 b/metadata/md5-cache/dev-perl/MogileFS-Server-2.720.0-r1
index 0ab56eedc28f..f4e245382aa5 100644
--- a/metadata/md5-cache/dev-perl/MogileFS-Server-2.720.0-r1
+++ b/metadata/md5-cache/dev-perl/MogileFS-Server-2.720.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( sqlite ) || ( mysql sqlite postgres )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.72.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=19c6dceb6ef63fedeef19d4e359e506c
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=e7a5c4cb5e2421b44325a71e264162c9
diff --git a/metadata/md5-cache/dev-perl/MogileFS-Server-2.730.0 b/metadata/md5-cache/dev-perl/MogileFS-Server-2.730.0
index 056172ff98a2..2f76a04e0159 100644
--- a/metadata/md5-cache/dev-perl/MogileFS-Server-2.730.0
+++ b/metadata/md5-cache/dev-perl/MogileFS-Server-2.730.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( sqlite ) || ( mysql sqlite postgres )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DO/DORMANDO/MogileFS-Server-2.73.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=19c6dceb6ef63fedeef19d4e359e506c
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=e7a5c4cb5e2421b44325a71e264162c9
diff --git a/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0 b/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0
index b317eced97cf..1fb242429e93 100644
--- a/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0
+++ b/metadata/md5-cache/dev-perl/Nmap-Parser-1.360.0
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/perl-Storable-2.0.0 >=dev-perl/XML-Twig-3.160.0 dev-lang/perl:
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AP/APERSAUD/Nmap-Parser-1.36.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=1c5c5df42294b79111a5f158fe4639a9
+_md5_=1df71da15034a80aef031184d9b95e5a
diff --git a/metadata/md5-cache/dev-perl/Pango-1.227.0 b/metadata/md5-cache/dev-perl/Pango-1.227.0
index 11ab1640f3c1..fee294cce235 100644
--- a/metadata/md5-cache/dev-perl/Pango-1.227.0
+++ b/metadata/md5-cache/dev-perl/Pango-1.227.0
@@ -4,11 +4,11 @@ DESCRIPTION=Layout and render international text
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Pango
 IUSE=examples test minimal
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-perl/glib-perl-1.220.0 >=dev-perl/Cairo-1.0.0 >=x11-libs/pango-1.0.0 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=2170f84dfb5c397dd3bcfd1a0cebfebb
+_md5_=c414a49423fd252f4e6de014eb4fe724
diff --git a/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0 b/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0
index 0392d0665c8a..75fb84b74f80 100644
--- a/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0
+++ b/metadata/md5-cache/dev-perl/Perl-Tidy-20171214.0.0
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20171214.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=4663bf2dc81d904e6fce77da38ee5b34
+_md5_=e6d52134860c0a82765b97289e8fb110
diff --git a/metadata/md5-cache/dev-perl/Perl-Tidy-20190915.0.0 b/metadata/md5-cache/dev-perl/Perl-Tidy-20190915.0.0
index cf071b7bf840..fd5665af84c0 100644
--- a/metadata/md5-cache/dev-perl/Perl-Tidy-20190915.0.0
+++ b/metadata/md5-cache/dev-perl/Perl-Tidy-20190915.0.0
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20190915.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=a8432e5362f693473913297298d09c25
+_md5_=e3ef65b0dd86bb3c9904a82e1f37e481
diff --git a/metadata/md5-cache/dev-perl/Test-Inter-1.90.0 b/metadata/md5-cache/dev-perl/Test-Inter-1.90.0
index 0c4155defb13..2361a1ab83b8 100644
--- a/metadata/md5-cache/dev-perl/Test-Inter-1.90.0
+++ b/metadata/md5-cache/dev-perl/Test-Inter-1.90.0
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=860958278348e41ae140b175e93d791c
+_md5_=41527495bf4b0c4eb5f43f57ba14289e
diff --git a/metadata/md5-cache/dev-perl/Wx-0.993.200-r1 b/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
index 855d271f1c65..f82ff890a959 100644
--- a/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
+++ b/metadata/md5-cache/dev-perl/Wx-0.993.200-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=fd58e1af077caca878b81e4a09f765d5
+_md5_=994b7559cf8dd246f40ca8dc5a9a40e9
diff --git a/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2 b/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
index 69019c751d47..e8ab22ca6b29 100644
--- a/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
+++ b/metadata/md5-cache/dev-perl/XML-Grove-0.46_alpha-r2
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/libxml-perl-0.07-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMACLEOD/XML-Grove-0.46alpha.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f27e58da4e2c166e90d4951a35396019
+_md5_=db87527f4ccf149b3e3e0b99048171a1
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.326.0 b/metadata/md5-cache/dev-perl/glib-perl-1.326.0
index 55a94ab0b2c1..63d86fbfc650 100644
--- a/metadata/md5-cache/dev-perl/glib-perl-1.326.0
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.326.0
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.326.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=bcadf10aff92e63888cc8948276c30af
+_md5_=d18c6c8f5f6a7f1fe60401162712bdc0
diff --git a/metadata/md5-cache/dev-perl/glib-perl-1.329.100 b/metadata/md5-cache/dev-perl/glib-perl-1.329.100
index eaf5c092f9a4..8df2926ffef0 100644
--- a/metadata/md5-cache/dev-perl/glib-perl-1.329.100
+++ b/metadata/md5-cache/dev-perl/glib-perl-1.329.100
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=f277e627eeeb79236d9010842648174a
+_md5_=2448fe2d24f3495973d03c30fe90e48d
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 052b6deb095f..d1261dbd3461 100644
--- a/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0
+++ b/metadata/md5-cache/dev-perl/gnome2-perl-1.46.0
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2 dev-perl/Gtk2 gnome-base/libgnomeui gnome-base/libbonobo
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.046.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=07f4b21e495ecd961e2f7d6d3159dc93
+_md5_=1f3e3c916635bc2580f9f0ce219c4af9
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 934d9703f925..cdffec609e60 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
@@ -9,4 +9,4 @@ RDEPEND=>=dev-perl/glib-perl-1.180.0 >=dev-perl/Gtk2-1.42.0 >=x11-libs/libwnck-2
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=553962e92f05ca879cc9f3dce39120c1
+_md5_=f338568dac18142251b9ee9be2ea9306
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 47bc9daf5d6f..f6e6448a0c41 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
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=8bb749e03537a4c2c80da97716c497d1
+_md5_=cb1c1ddd02aca505b37dd79d4df6b07e
diff --git a/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1 b/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
index 32f3a90c5f52..b8005f48ddda 100644
--- a/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-ex-formfactory-0.670.0-r1
@@ -9,4 +9,4 @@ RDEPEND=dev-perl/Gtk2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JRED/Gtk2-Ex-FormFactory-0.67.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c83191ef14e3aa38573aeb5fbef8cec2
+_md5_=6ac2a3fc1f5420a92253fc0dbf1ad954
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 6d4b1fa99e5c..82ec9c6ebfd8 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
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2 gnome-base/libglade:2.0 >=dev-perl/glib-perl-1.020 >=dev
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=99988ffded41e065775e08fc7a793cc2
+_md5_=f17a57738d349f9207d987704000a9e6
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 02891b832786..d5b02047d413 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
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=1892527facf26ed24fc3e35920334a84
+_md5_=9bc67b6fdd5f3a69b9e4a5530d40abc3
diff --git a/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r1 b/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r1
index 884047f7ea5f..c1372cb2bd0b 100644
--- a/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r1
+++ b/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 >=app-text/gtkspell-2:2 >=dev-perl/glib-perl-1.240.0 >=de
 DESCRIPTION=Bindings for GtkSpell with Gtk2.x
 EAPI=5
 HOMEPAGE=http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-Spell
-KEYWORDS=amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/gtk+:2 >=app-text/gtkspell-2:2 >=dev-perl/glib-perl-1.240.0 >=dev-perl/Gtk2-1.012 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-Spell-1.04.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=482c4340976d1d38700b7b78b6b2dff4
+_md5_=6d1413960cf15cde5d9e1d9543a63afa
diff --git a/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r2 b/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r2
index 677da178a746..29c683b81a7b 100644
--- a/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r2
+++ b/metadata/md5-cache/dev-perl/gtk2-spell-1.40.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Bindings for GtkSpell with Gtk2.x
 EAPI=6
 HOMEPAGE=http://gtk2-perl.sf.net/ https://metacpan.org/release/Gtk2-Spell
 IUSE=test
-KEYWORDS=amd64 hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/gtk+:2 >=app-text/gtkspell-2:2 >=dev-perl/glib-perl-1.240.0 >=dev-perl/Gtk2-1.012 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TS/TSCH/Gtk2-Spell-1.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=e4707746d2117da1493a3ca490fa2a4c
+_md5_=b214f871ac180d76dd4f627855064037
diff --git a/metadata/md5-cache/dev-perl/gtk2-trayicon-0.60.0-r2 b/metadata/md5-cache/dev-perl/gtk2-trayicon-0.60.0-r2
index a7472ce0e45c..dd0303f0086c 100644
--- a/metadata/md5-cache/dev-perl/gtk2-trayicon-0.60.0-r2
+++ b/metadata/md5-cache/dev-perl/gtk2-trayicon-0.60.0-r2
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=df5de9213627f0f0bd12c2f01d7d69cb
+_md5_=b521899eb9cb124874203b6d780e7a74
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 6e69112f5d1d..cf006c194916 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
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/gtk+:2 >=dev-perl/glib-perl-1.012 >=dev-perl/Gtk2-1.012 dev-lan
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayManager-0.05.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f65f00fedef465bb844bbbfe39db6114
+_md5_=1a04b69c9a4202cda1ad43be33d14e2e
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 f5e54224e270..23ab48d7a228 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
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayManager-0.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=957972b1f37936661af3115b081c4fff
+_md5_=605d283477375adeb5ffcad6726944ca
diff --git a/metadata/md5-cache/dev-perl/libintl-perl-1.280.0 b/metadata/md5-cache/dev-perl/libintl-perl-1.280.0
index 5aaff841ce6f..84157a1a7d9f 100644
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.280.0
+++ b/metadata/md5-cache/dev-perl/libintl-perl-1.280.0
@@ -9,4 +9,4 @@ RDEPEND=virtual/libintl dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.28.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=106394395426e49b1a2469e7dd627891
+_md5_=79c2e8e7db71978dd72d2134ff275c66
diff --git a/metadata/md5-cache/dev-perl/libintl-perl-1.310.0 b/metadata/md5-cache/dev-perl/libintl-perl-1.310.0
index f03fc1370bea..182b302112a5 100644
--- a/metadata/md5-cache/dev-perl/libintl-perl-1.310.0
+++ b/metadata/md5-cache/dev-perl/libintl-perl-1.310.0
@@ -10,4 +10,4 @@ RDEPEND=virtual/libintl !minimal? ( dev-perl/File-ShareDir ) virtual/perl-File-S
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=ee4b9fadbd6bdd0e26b923c3b0df447f
+_md5_=beafa3f067f6d2a49de28d65d5b1b206
diff --git a/metadata/md5-cache/dev-perl/perl-headers-0.0.1 b/metadata/md5-cache/dev-perl/perl-headers-0.0.1
index e8eda7dd299d..9dfb533a2383 100644
--- a/metadata/md5-cache/dev-perl/perl-headers-0.0.1
+++ b/metadata/md5-cache/dev-perl/perl-headers-0.0.1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/gentoo-perl/perl-headers/archive/0.0.1.tar.gz -> perl-headers-0.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2fc6dc15eea4188afffd79bcef0b7a0e
+_md5_=ddfff9cb6ea5f690f58e2ba4fc62f0b9
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index a6d589780cce..5f3d341c81d8 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/PEAR-Console_CommandLine-1.2.2 b/metadata/md5-cache/dev-php/PEAR-Console_CommandLine-1.2.2
index b9f2216d5684..2d574b7c8866 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_CommandLine-1.2.2
+++ b/metadata/md5-cache/dev-php/PEAR-Console_CommandLine-1.2.2
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Console_CommandLine-1.2.2.tgz
-_md5_=5495eebc93d8ec7c6738644ae7704456
+_md5_=efb56cff6e79d82bfe84f513b1548d17
diff --git a/metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1 b/metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1
index 574433662df3..3f4289f819aa 100644
--- a/metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Console_Getopt-1.4.1-r1
@@ -8,4 +8,4 @@ PDEPEND=dev-php/PEAR-PEAR
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://pear.php.net/get/Console_Getopt-1.4.1.tgz
-_md5_=763d0feb96290e463524abc5787784ce
+_md5_=bef085836e1f1e3416c992d366ae14d3
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2 b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
index 4b05ba04abd8..208611ba574d 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.2
@@ -10,4 +10,4 @@ RDEPEND=app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_Comma
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Crypt_GPG-1.6.2.tgz
-_md5_=a6458bf515b49b93db65d3ff289fe391
+_md5_=692d418d05aeebfb2fd79919d1d4fb6d
diff --git a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3 b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
index e6e002a90ed7..a4a0ca972987 100644
--- a/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
+++ b/metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.3
@@ -10,4 +10,4 @@ RDEPEND=app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_Comma
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Crypt_GPG-1.6.3.tgz
-_md5_=c454d6143ca3181f451bd499970dcd38
+_md5_=e2380fb9345b800d64d7c38f401c814c
diff --git a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0 b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
index e8659105cfed..c9f68b846d5b 100644
--- a/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
+++ b/metadata/md5-cache/dev-php/PEAR-Exception-1.0.0
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:* !<=dev-php/PEAR-PEAR-1.10.3-r1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PEAR_Exception-1.0.0.tgz
-_md5_=3ebc2ae7c1b4f3b67878390c52d3ba8e
+_md5_=6570597d785c6b3eae44454f0c200551
diff --git a/metadata/md5-cache/dev-php/PEAR-File_Archive-1.5.5-r1 b/metadata/md5-cache/dev-php/PEAR-File_Archive-1.5.5-r1
index 6cf3990e251c..336ddda72c6e 100644
--- a/metadata/md5-cache/dev-php/PEAR-File_Archive-1.5.5-r1
+++ b/metadata/md5-cache/dev-php/PEAR-File_Archive-1.5.5-r1
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/php[bzip2,zlib] dev-php/PEAR-MIME_Type dev-php/PEAR-PEAR !minimal? ( dev-php/PEAR-Mail_Mime dev-php/PEAR-Mail dev-php/PEAR-Cache_Lite )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/File_Archive-1.5.5.tgz
-_md5_=ba526615878356892d1305c306dd46e8
+_md5_=861546d4b9e49c295d42fbd83c0c18db
diff --git a/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3 b/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
index ba247e24b2c7..6ea820e4bbcc 100644
--- a/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
+++ b/metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/File_Find-1.3.3.tgz
-_md5_=d140af7bbbac5ef715f294236bdd9b4a
+_md5_=d484e4c5e97a610580ee0a62cdf32caf
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_AJAX-0.5.8 b/metadata/md5-cache/dev-php/PEAR-HTML_AJAX-0.5.8
index 869a2c458a7a..387ff3f0569e 100644
--- a/metadata/md5-cache/dev-php/PEAR-HTML_AJAX-0.5.8
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_AJAX-0.5.8
@@ -6,4 +6,4 @@ KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/HTML_AJAX-0.5.8.tgz
-_md5_=857bb01f1358d1a8b651e234bd86b7e4
+_md5_=850af96be69e54957513f768a511837d
diff --git a/metadata/md5-cache/dev-php/PEAR-Log-1.13.1 b/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
index 0714c0084fcd..70d722063dcb 100644
--- a/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
+++ b/metadata/md5-cache/dev-php/PEAR-Log-1.13.1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-DB dev-php/PEAR-Mail dev-p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Log-1.13.1.tgz
-_md5_=409cd244420f62926937905ec427bd54
+_md5_=4f9e2e7ad66ab23c2cd1afa8550e5b25
diff --git a/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1 b/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
index 13c46ec74755..85a6a3565d4b 100644
--- a/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Math_BigInteger-1.0.3-r1
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Math_BigInteger-1.0.3.tgz
-_md5_=a792c99799d6da2470c55ec8b41d7235
+_md5_=063c26c2d2c561d5f273c77f921396d2
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1 b/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1
index 25a9f3c80b7b..3b49c19dc2f6 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1
@@ -8,4 +8,4 @@ LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-Cache_Lite dev-php/PEAR-HTTP_Request2 dev-php/PEAR-Net_DNS dev-php/PEAR-PEAR examples? ( dev-lang/php:*[cli] dev-php/PEAR-Console_Getopt )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_DNSBL-1.3.7.tgz
-_md5_=487a9174ee2b4e3dde56d829cb71085d
+_md5_=351bdcba0ad64c2ea53989e94b7ffe3a
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1 b/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
index 45f2954bdfe7..fd763923ef49 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_LDAP2-2.2.0-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:*[ldap] dev-php/PEAR-PEAR
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_LDAP2-2.2.0.tgz
-_md5_=bf1ca98bcd8be2ee980b9ac240b86075
+_md5_=947df522378a6eac37c2bb795da586ce
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r2 b/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r2
index 3d8f08194fd0..b83efd8f330d 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r2
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Ping-2.4.5-r2
@@ -8,4 +8,4 @@ LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_Ping-2.4.5.tgz
-_md5_=43af794113214f31cf333a8dd48f4521
+_md5_=718f5084dbf941323bda299e1861c02e
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3 b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3
index c77c31e148ba..230e7f09646b 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.2-r3
@@ -8,4 +8,4 @@ LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-Net_Socket dev-php/PEAR-PEAR sasl? ( dev-php/PEAR-Auth_SASL )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_SMTP-1.7.2.tgz
-_md5_=ae76331c53023db35eee4e8fad69afc0
+_md5_=127bd51b8d4257b7fb942d74113eb51e
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.3 b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.3
index 5946374b6548..6800132a5833 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.3
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SMTP-1.7.3
@@ -8,4 +8,4 @@ LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-Net_Socket dev-php/PEAR-PEAR sasl? ( dev-php/PEAR-Auth_SASL )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Net_SMTP-1.7.3.tgz
-_md5_=19de67d696ed94435e1657deb4833e76
+_md5_=073ee1fa297435fb7265b2e33dcb8d4f
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1 b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1
index 2297f8d5cf77..6ab3059092b7 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.2-r1
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-Net_Socket sasl? ( dev-php/PEAR-Auth_SASL )
 SLOT=0
 SRC_URI=https://github.com/roundcube/Net_Sieve/archive/1.5.2.tar.gz -> PEAR-Net_Sieve-1.5.2.tar.gz
-_md5_=e768b89fd19a9e19157e8d489a810dc0
+_md5_=ab3d9fdda01063edbae7392d22161f5c
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.4 b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.4
index a671a9ea256c..cc7d9aa9720e 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.4
+++ b/metadata/md5-cache/dev-php/PEAR-Net_Sieve-1.5.4
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-Net_Socket sasl? ( dev-php/PEAR-Auth_SASL )
 SLOT=0
 SRC_URI=https://github.com/roundcube/Net_Sieve/archive/1.5.4.tar.gz -> PEAR-Net_Sieve-1.5.4.tar.gz
-_md5_=2ea35ba6cfd2e66cade7d0be1350c406
+_md5_=e0a9b99ed952dd4691753640e06ed609
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10-r1 b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10-r1
index 6ee5062f49cb..d7d85b2c387f 100644
--- a/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Net_SmartIRC-1.1.10-r1
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://github.com/pear/Net_SmartIRC/archive/v1.1.10.tar.gz -> Net_SmartIRC-1.1.10.tar.gz
-_md5_=06d68acb37f3fbd9bdc7bf68028b7203
+_md5_=95fda3f5e44a6646bb7b7887ba021109
diff --git a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1 b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
index 2dd60b6e685c..6ccefd8afaee 100644
--- a/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Numbers_Words-0.18.1-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:* dev-php/PEAR-Math_BigInteger
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Numbers_Words-0.18.1.tgz
-_md5_=491c7e8999c1a2b9f986e40fe6218788
+_md5_=1b2cd988ba274f62a462883d8bfb223d
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6
index ccfda9088e21..0e33352e82be 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.6
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=dev-php/PEAR-Console_Getopt-1.4.1 dev-php/PEAR-Exception >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.3.0
 SLOT=0
 SRC_URI=https://pear.php.net/get/PEAR-1.10.6.tgz
-_md5_=99d71909f7ed252d25c29403832ef8dd
+_md5_=31e58e108fbea5cda8b192a2d97f7d87
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.7 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.7
index 05d239fd530c..ff4ee9d7d8bf 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.7
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.7
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=dev-php/PEAR-Console_Getopt-1.4.1 dev-php/PEAR-Exception >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.3.0
 SLOT=0
 SRC_URI=https://pear.php.net/get/PEAR-1.10.7.tgz
-_md5_=7687f2a0d8b4501f5dbfc5c56458ff34
+_md5_=463b58f079fc8610d18f5bb5dfac8c00
diff --git a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.9 b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.9
index 924edc04e5c7..c3996a83feb3 100644
--- a/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.9
+++ b/metadata/md5-cache/dev-php/PEAR-PEAR-1.10.9
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=dev-php/PEAR-Console_Getopt-1.4.1 dev-php/PEAR-Exception >=dev-php/PEAR-Structures_Graph-1.1.0 >=dev-php/PEAR-XML_Util-1.3.0
 SLOT=0
 SRC_URI=https://pear.php.net/get/PEAR-1.10.9.tgz
-_md5_=7687f2a0d8b4501f5dbfc5c56458ff34
+_md5_=463b58f079fc8610d18f5bb5dfac8c00
diff --git a/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r2 b/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r2
index bc8363a6b4fb..dfb8e008280b 100644
--- a/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r2
+++ b/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r2
@@ -8,4 +8,4 @@ LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:*[bzip2,cli?,tokenizer] dev-php/PEAR-Archive_Tar dev-php/PEAR-Log dev-php/PEAR-PEAR cli? ( dev-php/PEAR-Console_Getopt )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/PHP_Beautifier-0.1.15.tgz
-_md5_=d3ece83f73b675ec3ebcf3f51dd756f7
+_md5_=3eccc37de55bfc06accb4908f68179c3
diff --git a/metadata/md5-cache/dev-php/PEAR-Services_W3C_CSSValidator-0.2.3 b/metadata/md5-cache/dev-php/PEAR-Services_W3C_CSSValidator-0.2.3
index 0f1d5bdcda44..7dd2051f6b21 100644
--- a/metadata/md5-cache/dev-php/PEAR-Services_W3C_CSSValidator-0.2.3
+++ b/metadata/md5-cache/dev-php/PEAR-Services_W3C_CSSValidator-0.2.3
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=dev-lang/php:* dev-php/PEAR-HTTP_Request2
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Services_W3C_CSSValidator-0.2.3.tgz
-_md5_=8a9b9972733b79909c46338e2c79ba73
+_md5_=9e89cc61cc96666e4c1521ed61abe817
diff --git a/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1 b/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1
index bd63a8a5efe4..950fc3052ab8 100644
--- a/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1
@@ -8,4 +8,4 @@ PDEPEND=dev-php/PEAR-PEAR
 RDEPEND=dev-lang/php:*
 SLOT=0
 SRC_URI=https://pear.php.net/get/Structures_Graph-1.1.1.tgz
-_md5_=51f0a95cc2d5ff5a091decda7f230c76
+_md5_=0ec06eed92df696c732cf1d005caa2c7
diff --git a/metadata/md5-cache/dev-php/PEAR-System_Command-1.0.8-r1 b/metadata/md5-cache/dev-php/PEAR-System_Command-1.0.8-r1
index 9ba1c7064925..c137a5f21046 100644
--- a/metadata/md5-cache/dev-php/PEAR-System_Command-1.0.8-r1
+++ b/metadata/md5-cache/dev-php/PEAR-System_Command-1.0.8-r1
@@ -8,4 +8,4 @@ LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/System_Command-1.0.8.tgz
-_md5_=0fb943737ae58bb03486d71a0acd70da
+_md5_=307d5d3d2bc537cb66af524df059a0b9
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2-r1 b/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2-r1
index 6c0c3254a103..3a041d1955f1 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2-r1
@@ -8,4 +8,4 @@ LICENSE=PHP-3.01 examples? ( GPL-2+ OFL-1.1 )
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Text_Figlet-1.0.2.tgz
-_md5_=ed312b0152924afb33c48e59cd335c4a
+_md5_=8a5dac1efd396c44d237422f589b6a4e
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.7.3-r1 b/metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.7.3-r1
index d475d04e234b..f4742360f22e 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.7.3-r1
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Highlighter-0.7.3-r1
@@ -7,4 +7,4 @@ LICENSE=PHP-3.01
 RDEPEND=dev-lang/php dev-php/PEAR-PEAR dev-php/PEAR-XML_Serializer
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Text_Highlighter-0.7.3.tgz
-_md5_=98beb22fe8c9c2c3044fdc31ed2cb09c
+_md5_=ed454d050808faf8eaa90022b1610f24
diff --git a/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1 b/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
index 2ccf12f6c0f9..e580adca68eb 100644
--- a/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
+++ b/metadata/md5-cache/dev-php/PEAR-Text_Password-1.2.1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/Text_Password-1.2.1.tgz
-_md5_=3b852d4209d6855554632d621f3a8d26
+_md5_=4263dd2b6caeb74571fe2d0a89cc5e08
diff --git a/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0_alpha1 b/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0_alpha1
index 9982793d881e..06c1f68175f7 100644
--- a/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0_alpha1
+++ b/metadata/md5-cache/dev-php/PEAR-XML_RSS-1.1.0_alpha1
@@ -7,4 +7,4 @@ LICENSE=PHP-3.01
 RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-XML_Parser
 SLOT=0
 SRC_URI=http://download.pear.php.net/package/XML_RSS-1.1.0a1.tgz
-_md5_=0c400c9bff56c2a5ab957ed57a74fe42
+_md5_=09789f3c386fe1a66042830b63a07279
diff --git a/metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5 b/metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5
index ffe290d79edb..0bd198bb69a9 100644
--- a/metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5
+++ b/metadata/md5-cache/dev-php/doctrine-instantiator-1.0.5
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Utility to instantiate objects in PHP without invoking their constructors
 EAPI=6
-HOMEPAGE=https://github.com/doctrine//instantiator
+HOMEPAGE=https://github.com/doctrine/instantiator
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/doctrine//instantiator/archive/1.0.5.tar.gz -> doctrine-instantiator-1.0.5.tar.gz
-_md5_=b6e0269b10bea40d5f6d68c20a8cb9fc
+_md5_=ab781c67139e5702bee963083dcc2cb3
diff --git a/metadata/md5-cache/dev-php/doctrine-instantiator-1.1.0 b/metadata/md5-cache/dev-php/doctrine-instantiator-1.1.0
index 668f279e1b42..a0d063fcb21b 100644
--- a/metadata/md5-cache/dev-php/doctrine-instantiator-1.1.0
+++ b/metadata/md5-cache/dev-php/doctrine-instantiator-1.1.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=Utility to instantiate objects in PHP without invoking their constructors
 EAPI=6
-HOMEPAGE=https://github.com/doctrine//instantiator
+HOMEPAGE=https://github.com/doctrine/instantiator
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.1:*
 SLOT=0
 SRC_URI=https://github.com/doctrine//instantiator/archive/1.1.0.tar.gz -> doctrine-instantiator-1.1.0.tar.gz
-_md5_=88bbc7dd323be72f1c56b8928eba0cf8
+_md5_=eb3149434014cca6d6c0dc9c3ca82402
diff --git a/metadata/md5-cache/dev-php/maxmind-db-reader-1.4.1 b/metadata/md5-cache/dev-php/maxmind-db-reader-1.4.1
index 341efd55288f..7de2f4a2708f 100644
--- a/metadata/md5-cache/dev-php/maxmind-db-reader-1.4.1
+++ b/metadata/md5-cache/dev-php/maxmind-db-reader-1.4.1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxmind/MaxMind-DB-Reader-php/archive/v1.4.1.tar.gz -> MaxMind-DB-Reader-php-1.4.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6953dca11d4e35605d7c0adbcb496af2
+_md5_=1211b1f60f0b3ff117ae67f401341eb5
diff --git a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.0 b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.0
index 4bf6d6f66038..3e8749a76882 100644
--- a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.0
+++ b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.0
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/myclabs/DeepCopy/archive/1.6.0.tar.gz -> myclabs-deepcopy-1.6.0.tar.gz
-_md5_=1bf9a63a9abe50277cdb7ff141e0f174
+_md5_=94319e61d040bfefb09a61ddeae7ecc1
diff --git a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.1 b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.1
index 187e24643fe6..a2f9600591b7 100644
--- a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.1
+++ b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.1
@@ -7,4 +7,4 @@ LICENSE=MIT
 RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
 SLOT=0
 SRC_URI=https://github.com/myclabs/DeepCopy/archive/1.6.1.tar.gz -> myclabs-deepcopy-1.6.1.tar.gz
-_md5_=008aec94cfec4f2d761892124db00148
+_md5_=27def01b36e76de2da8f6a2aef3574be
diff --git a/metadata/md5-cache/dev-php/php-redmine-api-1.5.16 b/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
index dfdc91c0742e..46d610a416a0 100644
--- a/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
+++ b/metadata/md5-cache/dev-php/php-redmine-api-1.5.16
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:*[curl,json,simplexml]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kbsali/php-redmine-api/archive/v1.5.16.tar.gz -> php-redmine-api-1.5.16.tar.gz
-_md5_=0f1a832e106c5147cd18f50bac1341b9
+_md5_=ecbeb41d733b360d8f0d440a267ff49d
diff --git a/metadata/md5-cache/dev-php/php-redmine-api-1.5.9 b/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
index 97f4e0bc06b6..fb782f8fea00 100644
--- a/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
+++ b/metadata/md5-cache/dev-php/php-redmine-api-1.5.9
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/php:*[curl,json,simplexml]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kbsali/php-redmine-api/archive/v1.5.9.tar.gz -> php-redmine-api-1.5.9.tar.gz
-_md5_=2e334c68d3c31fd99e1d3e5da37d6729
+_md5_=26fdf43ca5b360b40fbbe82451272ee8
diff --git a/metadata/md5-cache/dev-php/realpath_turbo-2.0.0 b/metadata/md5-cache/dev-php/realpath_turbo-2.0.0
index 5acedd28449f..1b2910cf0029 100644
--- a/metadata/md5-cache/dev-php/realpath_turbo-2.0.0
+++ b/metadata/md5-cache/dev-php/realpath_turbo-2.0.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_t
 SLOT=0
 SRC_URI=https://github.com/Whissi/realpath_turbo/releases/download/v2.0.0/realpath_turbo-2.0.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a1565b671bfcbdc52c9d538fb8d961ee
+_md5_=4eb85cdaacf375a8713bf23472c26686
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 1c57738b2d23..c9c712a2e0f4 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/3/3to2/3to2-1.1.1.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=92c2015c9a4c28535bc801dd1f8fd357
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.3.1 b/metadata/md5-cache/dev-python/APScheduler-3.3.1
index e632634a215a..b12284fc34b1 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.3.1
+++ b/metadata/md5-cache/dev-python/APScheduler-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e595c4044b3f35f5ed5241c8358cfc9b
diff --git a/metadata/md5-cache/dev-python/APScheduler-3.5.3 b/metadata/md5-cache/dev-python/APScheduler-3.5.3
index ebd57703da3e..1c130fe43c41 100644
--- a/metadata/md5-cache/dev-python/APScheduler-3.5.3
+++ b/metadata/md5-cache/dev-python/APScheduler-3.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/APScheduler/APScheduler-3.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d7216dd86616191c7140be712c1bf89
diff --git a/metadata/md5-cache/dev-python/Babel-2.5.0 b/metadata/md5-cache/dev-python/Babel-2.5.0
index de9bf541cb26..9707b93aa700 100644
--- a/metadata/md5-cache/dev-python/Babel-2.5.0
+++ b/metadata/md5-cache/dev-python/Babel-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb21a35079c1eab08a13ccdef4d26e7d
diff --git a/metadata/md5-cache/dev-python/Babel-2.5.3 b/metadata/md5-cache/dev-python/Babel-2.5.3
index f03d795b5e82..2cc2e828fc1f 100644
--- a/metadata/md5-cache/dev-python/Babel-2.5.3
+++ b/metadata/md5-cache/dev-python/Babel-2.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=260228e7715969ddc964eac0aefe3a79
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 d702e8db0342..fc959e867015 100644
--- a/metadata/md5-cache/dev-python/Babel-2.5.3-r1
+++ b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc939aedf9e4b113682466647449dc54
diff --git a/metadata/md5-cache/dev-python/Babel-2.6.0 b/metadata/md5-cache/dev-python/Babel-2.6.0
index 7848aecbd0c3..c900d728c4a3 100644
--- a/metadata/md5-cache/dev-python/Babel-2.6.0
+++ b/metadata/md5-cache/dev-python/Babel-2.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e63f66a6b6727c6875d3aa157ad3c921
diff --git a/metadata/md5-cache/dev-python/Babel-2.7.0 b/metadata/md5-cache/dev-python/Babel-2.7.0
index 4575fa90fe94..fa573ef419eb 100644
--- a/metadata/md5-cache/dev-python/Babel-2.7.0
+++ b/metadata/md5-cache/dev-python/Babel-2.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9d8fde0e8964e8bdb374f3b4c70407f9
diff --git a/metadata/md5-cache/dev-python/Babel-2.8.0 b/metadata/md5-cache/dev-python/Babel-2.8.0
index 0924d9efbb31..4752503cc319 100644
--- a/metadata/md5-cache/dev-python/Babel-2.8.0
+++ b/metadata/md5-cache/dev-python/Babel-2.8.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Collection of tools for internationalizing Python applications
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=171a8613b7773c8f4a61e120c0428415
diff --git a/metadata/md5-cache/dev-python/BitVector-3.4.7 b/metadata/md5-cache/dev-python/BitVector-3.4.7
index da137771fdc0..397c86f21784 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.4.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e647505170bce518dfd9f8e1f33281a5
diff --git a/metadata/md5-cache/dev-python/BitVector-3.4.8 b/metadata/md5-cache/dev-python/BitVector-3.4.8
index 18e01ccdb7c2..ad49ef781a2d 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://engineering.purdue.edu/kak/dist/BitVector-3.4.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=783df98625e7a278f98d0b0dbabfb077
diff --git a/metadata/md5-cache/dev-python/CacheControl-0.11.5 b/metadata/md5-cache/dev-python/CacheControl-0.11.5
index 2419efcc8f08..f77ede03ff05 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_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CacheControl/CacheControl-0.11.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3461ce6f1caf1c01921235803c1cb85c
diff --git a/metadata/md5-cache/dev-python/CacheControl-0.11.7 b/metadata/md5-cache/dev-python/CacheControl-0.11.7
index 7d4136a8d129..94221e1ae7de 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_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CacheControl/CacheControl-0.11.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=46abd8a20215cfb784d62271599d244b
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 9c64e92fa129..58a3df446255 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a5eda852e441..d8ba368c60be 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=62415693881a299ff23430ff90673f90
diff --git a/metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1 b/metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
index 28fdd1b38fc6..d6a6a83ae8a1 100644
--- a/metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/GridDataFormats-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.0.3[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/G/GridDataFormats/GridDataFormats-0.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c027846f4d213ea6a66ecb9f8304e067
diff --git a/metadata/md5-cache/dev-python/HeapDict-1.0.0 b/metadata/md5-cache/dev-python/HeapDict-1.0.0
index 5752efb90b27..af61cde9b6a9 100644
--- a/metadata/md5-cache/dev-python/HeapDict-1.0.0
+++ b/metadata/md5-cache/dev-python/HeapDict-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/H/HeapDict/HeapDict-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=be4c8c784923fb5d539efec779ee3353
diff --git a/metadata/md5-cache/dev-python/ImageHash-4.0 b/metadata/md5-cache/dev-python/ImageHash-4.0
index 7537b22e3d63..168e47874960 100644
--- a/metadata/md5-cache/dev-python/ImageHash-4.0
+++ b/metadata/md5-cache/dev-python/ImageHash-4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/I/ImageHash/ImageHash-4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1514ab5869ed14f26430ce09229682db
diff --git a/metadata/md5-cache/dev-python/Kivy-1.10.1 b/metadata/md5-cache/dev-python/Kivy-1.10.1
index 10603d857015..91aa29a25f7b 100644
--- a/metadata/md5-cache/dev-python/Kivy-1.10.1
+++ b/metadata/md5-cache/dev-python/Kivy-1.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kivy/Kivy/archive/1.10.1.tar.gz -> Kivy-1.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0785cbb8e3ca3ce18abdfb61cc918e59
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d07b17c1b826..609aa7357849 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.10.0 b/metadata/md5-cache/dev-python/MechanicalSoup-0.10.0
index 55cd93ccab87..c0081c057965 100644
--- a/metadata/md5-cache/dev-python/MechanicalSoup-0.10.0
+++ b/metadata/md5-cache/dev-python/MechanicalSoup-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/MechanicalSoup/MechanicalSoup/archive/v0.10.0.tar.gz -> MechanicalSoup-0.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ba0e85f6cfdbb3a2b857289cf585d7fb
diff --git a/metadata/md5-cache/dev-python/MechanicalSoup-0.6.0 b/metadata/md5-cache/dev-python/MechanicalSoup-0.6.0
index d27f6c8b85b5..c239898e70a5 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_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MechanicalSoup/MechanicalSoup-0.6.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17cf8ca51ab6647a219c99ac492397e5
diff --git a/metadata/md5-cache/dev-python/Numdifftools-0.9.17-r1 b/metadata/md5-cache/dev-python/Numdifftools-0.9.17-r1
index 4cb3aa103140..58b392dbc7e5 100644
--- a/metadata/md5-cache/dev-python/Numdifftools-0.9.17-r1
+++ b/metadata/md5-cache/dev-python/Numdifftools-0.9.17-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/N/Numdifftools/numdifftools-0.9.17.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8904c1c06f7f39a0742bb1a7a8ef58d4
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.7.9 b/metadata/md5-cache/dev-python/PyContracts-1.7.9
index eaf845c674b3..cb42b6dee117 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.7.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f76d20d2a2e7d11569cb03a037e4170
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.8.0 b/metadata/md5-cache/dev-python/PyContracts-1.8.0
index 743481d6a6e6..1b68b4dbb53f 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25e4daddb5153b67b7ff2703c5b88657
diff --git a/metadata/md5-cache/dev-python/PyContracts-1.8.12 b/metadata/md5-cache/dev-python/PyContracts-1.8.12
index 213dafae07ea..a50048a7efa1 100644
--- a/metadata/md5-cache/dev-python/PyContracts-1.8.12
+++ b/metadata/md5-cache/dev-python/PyContracts-1.8.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyContracts/PyContracts-1.8.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=68da1adbfa0e7228905d7cfa59a3f155
diff --git a/metadata/md5-cache/dev-python/PyDbLite-3.0.4 b/metadata/md5-cache/dev-python/PyDbLite-3.0.4
index b32e67772837..5ac01eb728d0 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyDbLite/PyDbLite-3.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=318a93d7f6aab193390ff62715c2b4f5
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.5.0 b/metadata/md5-cache/dev-python/PyECLib-1.5.0
deleted file mode 100644
index 12f48d5cb940..000000000000
--- a/metadata/md5-cache/dev-python/PyECLib-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/jerasure python_targets_python2_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/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=6
-HOMEPAGE=https://pypi.org/project/PyECLib/
-IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/liberasurecode dev-libs/jerasure python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyeclib/pyeclib-1.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff363b42ff89d230dec0eab4bcc6ee51
diff --git a/metadata/md5-cache/dev-python/PyECLib-1.6.0 b/metadata/md5-cache/dev-python/PyECLib-1.6.0
index 1f26e092d6cf..b48238d766cf 100644
--- a/metadata/md5-cache/dev-python/PyECLib-1.6.0
+++ b/metadata/md5-cache/dev-python/PyECLib-1.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/jerasure python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/jerasure 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
 EAPI=6
 HOMEPAGE=https://pypi.org/project/PyECLib/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=dev-libs/liberasurecode dev-libs/jerasure python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-libs/liberasurecode dev-libs/jerasure 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyeclib/pyeclib-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fce4028792eda4c6afe3bc684eccb5da
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=87ef6a077b2404f3935f9c11525825e4
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.44.1 b/metadata/md5-cache/dev-python/PyGithub-1.44.1
index b9278b7a7e92..36a7fd919605 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.44.1
+++ b/metadata/md5-cache/dev-python/PyGithub-1.44.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.44.1.tar.gz -> PyGithub-1.44.1.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c2a88cdc81a32cff79747b68b2ac5331
diff --git a/metadata/md5-cache/dev-python/PyGithub-1.45 b/metadata/md5-cache/dev-python/PyGithub-1.45
index 157922508f7a..06324f93ec7f 100644
--- a/metadata/md5-cache/dev-python/PyGithub-1.45
+++ b/metadata/md5-cache/dev-python/PyGithub-1.45
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyGithub/PyGithub/archive/v1.45.tar.gz -> PyGithub-1.45.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9834c0684f3323b50eb58b6f42dacfa8
diff --git a/metadata/md5-cache/dev-python/PyPDF2-1.26.0 b/metadata/md5-cache/dev-python/PyPDF2-1.26.0
index 880b3d6ae124..6f38b96549ba 100644
--- a/metadata/md5-cache/dev-python/PyPDF2-1.26.0
+++ b/metadata/md5-cache/dev-python/PyPDF2-1.26.0
@@ -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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python library to work with pdf files
 EAPI=6
 HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/mstamy2/PyPDF2
-IUSE=examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPDF2/PyPDF2-1.26.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd8e074c123d7bf38c80fbbc1961573f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=932c2a7eb370bb215ac66ee8ce575cf8
diff --git a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1 b/metadata/md5-cache/dev-python/PyRSS2Gen-1.1
index 82bacdfe6308..e9706d868723 100644
--- a/metadata/md5-cache/dev-python/PyRSS2Gen-1.1
+++ b/metadata/md5-cache/dev-python/PyRSS2Gen-1.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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=RSS feed generator written in Python
 EAPI=5
 HOMEPAGE=http://www.dalkescientific.com/Python/PyRSS2Gen.html https://pypi.org/project/PyRSS2Gen/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=http://www.dalkescientific.com/Python/PyRSS2Gen-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac8753b5f19ba81e9ddba04f740d1d61
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0950176cd592a2fd1a1476524416fa5f
diff --git a/metadata/md5-cache/dev-python/PySDL2-0.9.6 b/metadata/md5-cache/dev-python/PySDL2-0.9.6
index e6a0b6f4eed0..435a42eecbef 100644
--- a/metadata/md5-cache/dev-python/PySDL2-0.9.6
+++ b/metadata/md5-cache/dev-python/PySDL2-0.9.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySDL2/PySDL2-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=168005e7331d004fc61d57954d0b6cac
diff --git a/metadata/md5-cache/dev-python/PySensors-0.0.4 b/metadata/md5-cache/dev-python/PySensors-0.0.4
index 617eb15d0735..ec42ea8c3c4a 100644
--- a/metadata/md5-cache/dev-python/PySensors-0.0.4
+++ b/metadata/md5-cache/dev-python/PySensors-0.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/lm-sensors-3 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySensors/PySensors-0.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=843ee0e2e7428a59809fb619d7252685
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.7 b/metadata/md5-cache/dev-python/PySocks-1.6.7
index face12257252..5ff7ecf8c9df 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=089384a5815fc5bf3bcf2a23677ee665
diff --git a/metadata/md5-cache/dev-python/PySocks-1.6.8 b/metadata/md5-cache/dev-python/PySocks-1.6.8
index 3b16f1d9ba47..29d687cb8daf 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.6.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6a5761022144a5c897032d003a147c9
diff --git a/metadata/md5-cache/dev-python/PySocks-1.7.1 b/metadata/md5-cache/dev-python/PySocks-1.7.1
index a484b2a9d7c7..14b09c5bae17 100644
--- a/metadata/md5-cache/dev-python/PySocks-1.7.1
+++ b/metadata/md5-cache/dev-python/PySocks-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PySocks/PySocks-1.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=96c678b48f6030944c012f595b7f2baa
diff --git a/metadata/md5-cache/dev-python/PyUtilib-5.6.5 b/metadata/md5-cache/dev-python/PyUtilib-5.6.5
index 25fe84f8b21c..ff402d327719 100644
--- a/metadata/md5-cache/dev-python/PyUtilib-5.6.5
+++ b/metadata/md5-cache/dev-python/PyUtilib-5.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyUtilib/PyUtilib-5.6.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3d41a7d9f3baef33483140d2dac9c917
diff --git a/metadata/md5-cache/dev-python/PyUtilib-5.7.2 b/metadata/md5-cache/dev-python/PyUtilib-5.7.2
index 8d310a9f7016..8bb0911167aa 100644
--- a/metadata/md5-cache/dev-python/PyUtilib-5.7.2
+++ b/metadata/md5-cache/dev-python/PyUtilib-5.7.2
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A collection of Python utilities
 EAPI=7
 HOMEPAGE=https://github.com/PyUtilib/pyutilib
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/PyUtilib/pyutilib/archive/5.7.2.tar.gz -> PyUtilib-5.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c467de5f02b2f6f89349b557edbf1217
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0b515f29ed75dd556cf885d10fe330a9
diff --git a/metadata/md5-cache/dev-python/PythonQt-3.2 b/metadata/md5-cache/dev-python/PythonQt-3.2
index 8008ef66b464..0513a3453445 100644
--- a/metadata/md5-cache/dev-python/PythonQt-3.2
+++ b/metadata/md5-cache/dev-python/PythonQt-3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) ) dev-qt/qtxml:5 virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) ) dev-qt/qtxml:5 virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=A dynamic Python binding for the Qt framework
 EAPI=6
 HOMEPAGE=http://pythonqt.sourceforge.net/
-IUSE=doc +extensions webkit python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc +extensions webkit +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) )
-REQUIRED_USE=webkit? ( extensions ) ^^ ( 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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) )
+REQUIRED_USE=webkit? ( extensions ) ^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythonqt/pythonqt/PythonQt-3.2/PythonQt3.2.zip
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=40be342f4bc4debb410b8e074ad3e62b
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=01565e154c1f6a49962b8287deaaacf6
diff --git a/metadata/md5-cache/dev-python/PythonQt-9999 b/metadata/md5-cache/dev-python/PythonQt-9999
index 0fd8f463f536..8a2497b54ad3 100644
--- a/metadata/md5-cache/dev-python/PythonQt-9999
+++ b/metadata/md5-cache/dev-python/PythonQt-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install preinst prepare setup unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) ) dev-qt/qtxml:5 virtual/pkgconfig doc? ( app-doc/doxygen ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) ) dev-qt/qtxml:5 virtual/pkgconfig doc? ( app-doc/doxygen ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=A dynamic Python binding for the Qt framework
 EAPI=6
 HOMEPAGE=http://pythonqt.sourceforge.net/
-IUSE=doc +extensions webkit python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc +extensions webkit +python_single_target_python3_6
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) )
-REQUIRED_USE=webkit? ( extensions ) ^^ ( 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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 extensions? ( dev-qt/designer:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 webkit? ( dev-qt/qtwebkit:5 ) )
+REQUIRED_USE=webkit? ( extensions ) ^^ ( python_single_target_python3_6 )
 SLOT=0
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e2a65e499a6e6cc92fb36e923394a844
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6dd9abcc1f792fa1ad3f4f2d93e35dab
diff --git a/metadata/md5-cache/dev-python/QtPy-1.4.2 b/metadata/md5-cache/dev-python/QtPy-1.4.2
index f32ff4f9ea30..26ba7e4cd878 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.4.2
+++ b/metadata/md5-cache/dev-python/QtPy-1.4.2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Abstraction layer for PyQt5/PySide
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/qtpy
-IUSE=designer gui opengl svg testlib webkit webengine python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=designer gui opengl svg testlib webkit webengine python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/PyQt5[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(-),designer?,opengl?,svg?,webkit?] gui? ( dev-python/PyQt5[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(-),gui,widgets] ) testlib? ( dev-python/PyQt5[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(-),testlib] ) webengine? ( || ( dev-python/PyQtWebEngine[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[webengine?] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),designer?,opengl?,svg?,webkit?] gui? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets] ) testlib? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),testlib] ) webengine? ( || ( dev-python/PyQtWebEngine[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[webengine?] ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=59389567bba6e7f1127c11d1bc237dde
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a3701bef60af2e6b6e69380813ad3ac0
diff --git a/metadata/md5-cache/dev-python/QtPy-1.9.0 b/metadata/md5-cache/dev-python/QtPy-1.9.0
index 008258abbf7c..84837cdf9a5e 100644
--- a/metadata/md5-cache/dev-python/QtPy-1.9.0
+++ b/metadata/md5-cache/dev-python/QtPy-1.9.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtPy/QtPy-1.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a2cc6101a246b7cdf2582a3daa9b248d
diff --git a/metadata/md5-cache/dev-python/ReParser-1.4.3 b/metadata/md5-cache/dev-python/ReParser-1.4.3
index 8880ce4bb61b..4e17a3cef3f7 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/ReParser/ReParser-1.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d52cd13cdd4b2939e01103d47e92901
diff --git a/metadata/md5-cache/dev-python/Rx-1.6.1 b/metadata/md5-cache/dev-python/Rx-1.6.1
index 2a6f57e35316..7cda4bdd296b 100644
--- a/metadata/md5-cache/dev-python/Rx-1.6.1
+++ b/metadata/md5-cache/dev-python/Rx-1.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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Reactive Extensions for Python
 EAPI=6
 HOMEPAGE=http://reactivex.io/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/R/Rx/Rx-1.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a519542af4b0ee97063f0689d393037a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=084649187f53f864fcd2ac38ba95d386
diff --git a/metadata/md5-cache/dev-python/SaltTesting-2017.6.1 b/metadata/md5-cache/dev-python/SaltTesting-2017.6.1
deleted file mode 100644
index 431af5a0a551..000000000000
--- a/metadata/md5-cache/dev-python/SaltTesting-2017.6.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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Required testing tools needed in the several Salt Stack projects
-EAPI=6
-HOMEPAGE=https://saltstack.com/community/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.4.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/six[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/S/SaltTesting/SaltTesting-2017.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_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 6c2142da86dd..50ac628ba892 100644
--- a/metadata/md5-cache/dev-python/SaltTesting-2018.1.16
+++ b/metadata/md5-cache/dev-python/SaltTesting-2018.1.16
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Required testing tools needed in the several Salt Stack projects
 EAPI=6
 HOMEPAGE=https://saltstack.com/community/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.4.2[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.4.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[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
 SRC_URI=mirror://pypi/S/SaltTesting/SaltTesting-2018.1.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0811a91c933dcdc800d4eeaed0de54a3
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=efca65b17d42e0ff5667860e0b9f1dd4
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 b16d05dd2488..fad7243b955e 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 735314771909..83a05bcab063 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 4ece7c3b2958..8801e5e3ec0f 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cb9d492d3d0c6e4b5a143a2299bc7b1
diff --git a/metadata/md5-cache/dev-python/URLObject-2.4.0 b/metadata/md5-cache/dev-python/URLObject-2.4.0
deleted file mode 100644
index 475d25f1fc85..000000000000
--- a/metadata/md5-cache/dev-python/URLObject-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools python_targets_python2_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/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A utility class for manipulating URLs
-EAPI=5
-HOMEPAGE=https://pypi.org/project/URLObject/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/U/URLObject/URLObject-2.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e21081e97611053e0b211019e79d944a
diff --git a/metadata/md5-cache/dev-python/URLObject-2.4.2-r1 b/metadata/md5-cache/dev-python/URLObject-2.4.2-r1
deleted file mode 100644
index 622cd89a2393..000000000000
--- a/metadata/md5-cache/dev-python/URLObject-2.4.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A utility class for manipulating URLs
-EAPI=6
-HOMEPAGE=https://pypi.org/project/URLObject/
-IUSE=test python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/zacharyvoase/urlobject/archive/v2.4.2.tar.gz -> urlobject-2.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3129c39d0bc12d8039278d12538323c
diff --git a/metadata/md5-cache/dev-python/URLObject-2.4.3 b/metadata/md5-cache/dev-python/URLObject-2.4.3
index 5218d99f9cc1..1205db1ed129 100644
--- a/metadata/md5-cache/dev-python/URLObject-2.4.3
+++ b/metadata/md5-cache/dev-python/URLObject-2.4.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A utility class for manipulating URLs
 EAPI=6
 HOMEPAGE=https://pypi.org/project/URLObject/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zacharyvoase/urlobject/archive/v2.4.3.tar.gz -> urlobject-2.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0084310a726e1d8dc8aa7b0bd279a530
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a6353bdcba538c72ca07f1e20c011609
diff --git a/metadata/md5-cache/dev-python/WSME-0.9.3 b/metadata/md5-cache/dev-python/WSME-0.9.3
index f3ffd1fa9901..2b882deb7a23 100644
--- a/metadata/md5-cache/dev-python/WSME-0.9.3
+++ b/metadata/md5-cache/dev-python/WSME-0.9.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSME/WSME-0.9.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d702c087521ce73d209153ea44dec0b9
diff --git a/metadata/md5-cache/dev-python/XenAPI-2.14 b/metadata/md5-cache/dev-python/XenAPI-2.14
index d0a5bae3fd1c..2f9b6d1a2776 100644
--- a/metadata/md5-cache/dev-python/XenAPI-2.14
+++ b/metadata/md5-cache/dev-python/XenAPI-2.14
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/X/XenAPI/XenAPI-2.14.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8585d2d0671c6b07bdb59dfb040b3f77
diff --git a/metadata/md5-cache/dev-python/YURL-0.13 b/metadata/md5-cache/dev-python/YURL-0.13
index b23d28c22098..da9f6210b444 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e51f84c79f9e..4f0e2e5328c8 100644
--- a/metadata/md5-cache/dev-python/aadict-0.2.3
+++ b/metadata/md5-cache/dev-python/aadict-0.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aadict/aadict-0.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=211dbfe7a3937ef25be08d9cbd849db3
diff --git a/metadata/md5-cache/dev-python/absl-py-0.7.1 b/metadata/md5-cache/dev-python/absl-py-0.7.1
index ad5e982a7e0c..d28722a44c0d 100644
--- a/metadata/md5-cache/dev-python/absl-py-0.7.1
+++ b/metadata/md5-cache/dev-python/absl-py-0.7.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/abseil/abseil-py/archive/pypi-v0.7.1.tar.gz -> absl-py-0.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e0ae0a6e387ecbbd88f7b055605faf5e
diff --git a/metadata/md5-cache/dev-python/absl-py-0.8.1 b/metadata/md5-cache/dev-python/absl-py-0.8.1
index 4afe5d8aeec1..af18dcd0fb50 100644
--- a/metadata/md5-cache/dev-python/absl-py-0.8.1
+++ b/metadata/md5-cache/dev-python/absl-py-0.8.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/abseil/abseil-py/archive/pypi-v0.8.1.tar.gz -> absl-py-0.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b68c73abe5b5ddcae68fdbc795f76de4
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 ec4169afff98..b4871fe03ee3 100644
--- a/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
+++ b/metadata/md5-cache/dev-python/abstract_rendering-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/abstract_rendering/abstract_rendering-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd46732baa5483f43baec99f60752fd9
diff --git a/metadata/md5-cache/dev-python/addons-0.7 b/metadata/md5-cache/dev-python/addons-0.7
index fe2e53557c2d..93d05de49e96 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_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/A/AddOns/AddOns-0.7.zip -> addons-0.7.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ea1a9e3565f4c535411ce28be50df77
diff --git a/metadata/md5-cache/dev-python/aiocontextvars-0.2.2 b/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
index 0bf406e7361c..39f5393e92a6 100644
--- a/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
+++ b/metadata/md5-cache/dev-python/aiocontextvars-0.2.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/contextvars[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/contextvars[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Asyncio support for PEP-567 contextvars backport
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fantix/aiocontextvars/archive/v0.2.2.tar.gz -> aiocontextvars-0.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5253146c229a9cd9538f6a89b4561670
diff --git a/metadata/md5-cache/dev-python/aiodns-2.0.0-r1 b/metadata/md5-cache/dev-python/aiodns-2.0.0-r1
index 7950eb294af5..39656510346e 100644
--- a/metadata/md5-cache/dev-python/aiodns-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/aiodns-2.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/aiodns/aiodns-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f0ef27af488e5aa969e489dd78144fa6
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 e5d90154571c..cfd1cee36dee 100644
--- a/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/aioeventlet-0.5.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aioeventlet/aioeventlet-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8c097b64543dd3aa921db0310271f06d
diff --git a/metadata/md5-cache/dev-python/aiohttp-2.3.10 b/metadata/md5-cache/dev-python/aiohttp-2.3.10
index 44afa01754a0..63b30c061970 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-2.3.10.tar.gz -> aiohttp-2.3.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=422825f4ce47ba50c6d55ff35aa4137e
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.5.4 b/metadata/md5-cache/dev-python/aiohttp-3.5.4
index 261525a9cec0..d6c117e04840 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.5.4
+++ b/metadata/md5-cache/dev-python/aiohttp-3.5.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.5.4.tar.gz -> aiohttp-3.5.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a025c5ceee8f1a59dbf8fc90b8f9346c
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.6.0 b/metadata/md5-cache/dev-python/aiohttp-3.6.0
index 55fb749d32c4..4203921adfee 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.6.0
+++ b/metadata/md5-cache/dev-python/aiohttp-3.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.6.0.tar.gz -> aiohttp-3.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=305f6e925e329e9f115f682af33463f3
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.6.1 b/metadata/md5-cache/dev-python/aiohttp-3.6.1
index 94e9b695938e..a8d920ce851d 100644
--- a/metadata/md5-cache/dev-python/aiohttp-3.6.1
+++ b/metadata/md5-cache/dev-python/aiohttp-3.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.6.1.tar.gz -> aiohttp-3.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=76b883a8942089fd3cf527f9b0025792
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 9a195e020d2b..2104e551e0d1 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=897ac9a77a04839039b1b9e8f55291b2
diff --git a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0 b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0
index 932461364594..6581c1591df6 100644
--- a/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0
+++ b/metadata/md5-cache/dev-python/aiohttp-cors-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/aiohttp-cors/archive/v0.7.0.tar.gz -> aiohttp-cors-0.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a6a0137ff26afac0a83532893736cd9f
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 6fbf569a4369..9c2e4475e81c 100644
--- a/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
+++ b/metadata/md5-cache/dev-python/aiohttp-jinja2-0.15.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-jinja2/aiohttp-jinja2-0.15.0.tar.gz -> aiohttp-jinja2-0.15.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1abd308b4c9b65661a8b45ba5a38ec65
diff --git a/metadata/md5-cache/dev-python/aiohttp-socks-0.2.2 b/metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
index 35096202e4d2..f051c1f9eb40 100644
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
+++ b/metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/0.2.2.tar.gz -> aiohttp-socks-0.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b51e283614cfcdce20277866f57e186c
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.10.2 b/metadata/md5-cache/dev-python/aiorpcX-0.10.2
index 7a7c5c875c4c..77e488437813 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.10.2
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.10.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/attrs-17.3.0[python_targets_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiorpcX/aiorpcX-0.10.2.tar.gz -> aiorpcX-0.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=358bf4fe57e66d34bdce95b42b63b437
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.17.0 b/metadata/md5-cache/dev-python/aiorpcX-0.17.0
index 61f1f037af0d..5ea87ddaf820 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.17.0
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.17.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/attrs-17.3.0[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiorpcX/aiorpcX-0.17.0.tar.gz -> aiorpcX-0.17.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=aabd3e970a4b2429372693d377479eeb
diff --git a/metadata/md5-cache/dev-python/aiorpcX-0.18.3 b/metadata/md5-cache/dev-python/aiorpcX-0.18.3
index b220da41d908..7103a76c440e 100644
--- a/metadata/md5-cache/dev-python/aiorpcX-0.18.3
+++ b/metadata/md5-cache/dev-python/aiorpcX-0.18.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/attrs-17.3.0[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiorpcX/aiorpcX-0.18.3.tar.gz -> aiorpcX-0.18.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=aabd3e970a4b2429372693d377479eeb
diff --git a/metadata/md5-cache/dev-python/aiosmtpd-1.0 b/metadata/md5-cache/dev-python/aiosmtpd-1.0
index 45090b837059..3e5f227ba99e 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_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2110915a74fcef475766095b22729bc0
diff --git a/metadata/md5-cache/dev-python/aiosmtpd-1.1 b/metadata/md5-cache/dev-python/aiosmtpd-1.1
index ffcb5de090f1..3a6684905a8e 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_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2110915a74fcef475766095b22729bc0
diff --git a/metadata/md5-cache/dev-python/aiosmtpd-1.2 b/metadata/md5-cache/dev-python/aiosmtpd-1.2
index 8be8daef2c90..a326c094f701 100644
--- a/metadata/md5-cache/dev-python/aiosmtpd-1.2
+++ b/metadata/md5-cache/dev-python/aiosmtpd-1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiosmtpd/aiosmtpd-1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5da324184783f4f1cbd9ac6b1d03e818
diff --git a/metadata/md5-cache/dev-python/aiotest-0.3 b/metadata/md5-cache/dev-python/aiotest-0.3
index 382b31da2e44..fd6d2d421c39 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiotest/aiotest-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e99c7017992fcbb5d9dfbcbf6f931c55
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.10 b/metadata/md5-cache/dev-python/alabaster-0.7.10
index 763a5a3a1dac..63c64b36309d 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43843680dfb783819c789b16e51f040c
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.11 b/metadata/md5-cache/dev-python/alabaster-0.7.11
index 552eeb069393..b27f530f8102 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7451613a9f18de3451904db663f7ea35
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.12 b/metadata/md5-cache/dev-python/alabaster-0.7.12
index bab75a29b83f..0054b3d45ac0 100644
--- a/metadata/md5-cache/dev-python/alabaster-0.7.12
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=26fb90094ee4daac635c328247453456
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.9 b/metadata/md5-cache/dev-python/alabaster-0.7.9
index 285e13ac54ea..232669e00378 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/alabaster/alabaster-0.7.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b4b101694e5ec1767e685ebefb0cfb7
diff --git a/metadata/md5-cache/dev-python/alagitpull-0.0.23 b/metadata/md5-cache/dev-python/alagitpull-0.0.23
index 30c154c0d0fd..abe628103a35 100644
--- a/metadata/md5-cache/dev-python/alagitpull-0.0.23
+++ b/metadata/md5-cache/dev-python/alagitpull-0.0.23
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/git-pull/alagitpull/archive/v0.0.23.tar.gz -> alagitpull-0.0.23.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6250e29c080908cc09225fbbb077946b
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 a752d4867530..d0ea8f3f27b4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1970143d89ad906a04726a61b2f04a0
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 98fe1596d3d7..89b09cbb3513 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74ce31044b2e4bebc6911be8a3471928
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.3 b/metadata/md5-cache/dev-python/alembic-0.9.3
index b1eb8633c31b..ea0dfca9f338 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.3
+++ b/metadata/md5-cache/dev-python/alembic-0.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13acae59dd198de097d625442188a7a6
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.5 b/metadata/md5-cache/dev-python/alembic-0.9.5
index e6f9427c3d09..0cb628e2c64b 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.5
+++ b/metadata/md5-cache/dev-python/alembic-0.9.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91996e8fd0553fc6479b8e457fb9b1ca
diff --git a/metadata/md5-cache/dev-python/alembic-0.9.7 b/metadata/md5-cache/dev-python/alembic-0.9.7
index a2d33072f88e..79ca99ac2ed3 100644
--- a/metadata/md5-cache/dev-python/alembic-0.9.7
+++ b/metadata/md5-cache/dev-python/alembic-0.9.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-0.9.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13acae59dd198de097d625442188a7a6
diff --git a/metadata/md5-cache/dev-python/alembic-1.0.8 b/metadata/md5-cache/dev-python/alembic-1.0.8
index 7cda7cc1e274..913dd4f66d4e 100644
--- a/metadata/md5-cache/dev-python/alembic-1.0.8
+++ b/metadata/md5-cache/dev-python/alembic-1.0.8
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/sqlalchemy-0.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-editor-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/sqlalchemy-0.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-editor-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=database migrations tool, written by the author of SQLAlchemy
 EAPI=7
 HOMEPAGE=https://bitbucket.org/zzzeek/alembic
-IUSE=test doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/sqlalchemy-0.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-editor-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/sqlalchemy-0.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-editor-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/alembic/alembic-1.0.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=31209c18b91a211846dd368578c6afc6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ee1db9cbb2644ce8d9cee5f27debd92a
diff --git a/metadata/md5-cache/dev-python/algopy-0.5.3 b/metadata/md5-cache/dev-python/algopy-0.5.3
index d228f60a85d7..f6fc3f6972ff 100644
--- a/metadata/md5-cache/dev-python/algopy-0.5.3
+++ b/metadata/md5-cache/dev-python/algopy-0.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/algopy/algopy-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e97acfb19b46230474a856a019696cb5
diff --git a/metadata/md5-cache/dev-python/ament_package-0.8.8 b/metadata/md5-cache/dev-python/ament_package-0.8.8
index 6607b9602142..9280e95e50d6 100644
--- a/metadata/md5-cache/dev-python/ament_package-0.8.8
+++ b/metadata/md5-cache/dev-python/ament_package-0.8.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ament/ament_package/archive/0.8.8.tar.gz -> ament_package-0.8.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1a206206159bf7a07b730ef5cc0b4179
diff --git a/metadata/md5-cache/dev-python/amodem-1.13 b/metadata/md5-cache/dev-python/amodem-1.13
index 63f25f014035..bdd823c12cb9 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07b9729f2e6c749502d1d3455590ea35
diff --git a/metadata/md5-cache/dev-python/amodem-1.13.1 b/metadata/md5-cache/dev-python/amodem-1.13.1
index 3f322a107f81..fcade2382c93 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8cb5ec83d25623440780d8582a1c93c
diff --git a/metadata/md5-cache/dev-python/amodem-1.14.0 b/metadata/md5-cache/dev-python/amodem-1.14.0
index eed1b78e001c..34e6fb60ff74 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8cb5ec83d25623440780d8582a1c93c
diff --git a/metadata/md5-cache/dev-python/amodem-1.15.0 b/metadata/md5-cache/dev-python/amodem-1.15.0
index 094740b3a6c9..b2bdd78734ee 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8cb5ec83d25623440780d8582a1c93c
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 72a7dec43424..85d4bec5de31 100644
--- a/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/amqplib-1.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqplib/amqplib-1.0.2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0887a28b0a5353bf1c1c4b8b03a6e0cd
diff --git a/metadata/md5-cache/dev-python/aniso8601-1.3.0 b/metadata/md5-cache/dev-python/aniso8601-1.3.0
index ce6f95da6937..b343564926d8 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_pypy3(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aniso8601/aniso8601-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d232fab3f47c5c801daa62045a6723a3
diff --git a/metadata/md5-cache/dev-python/aniso8601-3.0.0 b/metadata/md5-cache/dev-python/aniso8601-3.0.0
index 8e87f0952142..2926b4021fcb 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_pypy3(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aniso8601/aniso8601-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=849a40741056f7be2c4094b42704efde
diff --git a/metadata/md5-cache/dev-python/aniso8601-3.0.2 b/metadata/md5-cache/dev-python/aniso8601-3.0.2
index 70c148a6b578..870406014a6d 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_pypy3(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aniso8601/aniso8601-3.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=638e5ab3cd2165f6debb0ca850efcd8b
diff --git a/metadata/md5-cache/dev-python/aniso8601-4.0.1 b/metadata/md5-cache/dev-python/aniso8601-4.0.1
index 1d6cccba69d1..a3c26b2be64a 100644
--- a/metadata/md5-cache/dev-python/aniso8601-4.0.1
+++ b/metadata/md5-cache/dev-python/aniso8601-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/aniso8601/aniso8601-4.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f323d07ee6a25caa2b6db4a7cc0253d
diff --git a/metadata/md5-cache/dev-python/ansi-0.1.3 b/metadata/md5-cache/dev-python/ansi-0.1.3
index 58055ade56aa..98af3eeb93ec 100644
--- a/metadata/md5-cache/dev-python/ansi-0.1.3
+++ b/metadata/md5-cache/dev-python/ansi-0.1.3
@@ -11,5 +11,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/tehmaze/ansi/archive/ansi-0.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b8cadcd1d3ad979b62b33b982fe5b863
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.4.2 b/metadata/md5-cache/dev-python/ansi2html-1.4.2
index 853fa5580ac2..29397380f612 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d811126fbf62ef21c5dcde347561c3ce
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.5.1 b/metadata/md5-cache/dev-python/ansi2html-1.5.1
index 701e60aae585..f0987bf3b7a9 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.5.1
+++ b/metadata/md5-cache/dev-python/ansi2html-1.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3ac431c28782c12264fed56e8026d00b
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.5.2 b/metadata/md5-cache/dev-python/ansi2html-1.5.2
index e4a42b6ebb8a..7cfb52db9105 100644
--- a/metadata/md5-cache/dev-python/ansi2html-1.5.2
+++ b/metadata/md5-cache/dev-python/ansi2html-1.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3ac431c28782c12264fed56e8026d00b
diff --git a/metadata/md5-cache/dev-python/ansicolor-0.2.6 b/metadata/md5-cache/dev-python/ansicolor-0.2.6
index ad10731ae025..5f0fc0615973 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/ansicolor/ansicolor-0.2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8ba2178397af89fd254bd524494f51a
diff --git a/metadata/md5-cache/dev-python/ansicolor-9999 b/metadata/md5-cache/dev-python/ansicolor-9999
index d74172c4485c..3401be27204b 100644
--- a/metadata/md5-cache/dev-python/ansicolor-9999
+++ b/metadata/md5-cache/dev-python/ansicolor-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad43fe781c27d07e8a0409fe4be8aa62
diff --git a/metadata/md5-cache/dev-python/ansimarkup-1.4.0 b/metadata/md5-cache/dev-python/ansimarkup-1.4.0
index 7efa4de029ca..b95b562c4d1f 100644
--- a/metadata/md5-cache/dev-python/ansimarkup-1.4.0
+++ b/metadata/md5-cache/dev-python/ansimarkup-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/python-ansimarkup/archive/v1.4.0.tar.gz -> ansimarkup-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6867dd6c62b524617ebf854bc8667ea8
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 78b826b2eff2..938edbcd98ec 100644
--- a/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
+++ b/metadata/md5-cache/dev-python/anyjson-0.3.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/anyjson/anyjson-0.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad8dc8a0ab935f6c0550b8a3365de7da
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 9830797f8e4e..c8895d140678 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ab9e17e644c71f7d89eb268c0bc4d44
diff --git a/metadata/md5-cache/dev-python/aodhclient-1.2.0 b/metadata/md5-cache/dev-python/aodhclient-1.2.0
index 90c9f6c6866a..79499f4a184c 100644
--- a/metadata/md5-cache/dev-python/aodhclient-1.2.0
+++ b/metadata/md5-cache/dev-python/aodhclient-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aodhclient/aodhclient-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ae0972fe650baa6f81dbddd6349b5f66
diff --git a/metadata/md5-cache/dev-python/apipkg-1.4 b/metadata/md5-cache/dev-python/apipkg-1.4
index c226e8dc323c..6135d1dd53d9 100644
--- a/metadata/md5-cache/dev-python/apipkg-1.4
+++ b/metadata/md5-cache/dev-python/apipkg-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/apipkg/apipkg-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68228c929825e6e55d5d0480304ee1b9
diff --git a/metadata/md5-cache/dev-python/apipkg-1.5 b/metadata/md5-cache/dev-python/apipkg-1.5
index 3bed17f57b00..ff714ed1c292 100644
--- a/metadata/md5-cache/dev-python/apipkg-1.5
+++ b/metadata/md5-cache/dev-python/apipkg-1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/apipkg/apipkg-1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9104abc8789e1c16dc5367229b154d44
diff --git a/metadata/md5-cache/dev-python/apispec-0.35.0 b/metadata/md5-cache/dev-python/apispec-0.35.0
index 6075f2d13f30..2d80077e87dd 100644
--- a/metadata/md5-cache/dev-python/apispec-0.35.0
+++ b/metadata/md5-cache/dev-python/apispec-0.35.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/apispec/apispec-0.35.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e08c99f6ac71ca2225d46fe6f3aba2ac
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.3 b/metadata/md5-cache/dev-python/appdirs-1.4.3
index 3794b79925ca..473d19c60ecc 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=164c134dedec26f596459033a6dbb1da
diff --git a/metadata/md5-cache/dev-python/appdirs-1.4.3-r1 b/metadata/md5-cache/dev-python/appdirs-1.4.3-r1
index 8e9cd3490179..1d3f8eefd9f0 100644
--- a/metadata/md5-cache/dev-python/appdirs-1.4.3-r1
+++ b/metadata/md5-cache/dev-python/appdirs-1.4.3-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ActiveState/appdirs/archive/1.4.3.tar.gz -> appdirs-1.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d9ac27242023244dd9482ec32a2ecf8
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 dd23fa0c0a6e..8a7d804c21e8 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=633c5ef3ac9d0f00ac33bb39de607dd4
diff --git a/metadata/md5-cache/dev-python/apsw-3.25.2_p1 b/metadata/md5-cache/dev-python/apsw-3.25.2_p1
index 2a4f25d9e658..941ab6767978 100644
--- a/metadata/md5-cache/dev-python/apsw-3.25.2_p1
+++ b/metadata/md5-cache/dev-python/apsw-3.25.2_p1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-db/sqlite-3.25.2 python_targets_python2_7? ( >=dev-lang/python-2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/rogerbinns/apsw/releases/download/3.25.2-r1/apsw-3.25.2-r1.zip -> apsw-3.25.2_p1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d19e49e42f604379d7c4dc38b1f8be6e
diff --git a/metadata/md5-cache/dev-python/aquarium-2.3-r1 b/metadata/md5-cache/dev-python/aquarium-2.3-r1
index 899e71d8ec92..3b8925f7094b 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7ff6811dc0cb53af74bc88cf350af9c
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.10.3 b/metadata/md5-cache/dev-python/argcomplete-1.10.3
index d982271f4687..7d8ffcc1ac4d 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.10.3
+++ b/metadata/md5-cache/dev-python/argcomplete-1.10.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.10.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0b054000e6fe6be6dd54d6ab9a6d0d3a
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.11.0 b/metadata/md5-cache/dev-python/argcomplete-1.11.0
index 43f285c0706d..0f1ee3372e0e 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.11.0
+++ b/metadata/md5-cache/dev-python/argcomplete-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3e73b691c9bab8d1df9ac73edfc6d06f
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.11.1 b/metadata/md5-cache/dev-python/argcomplete-1.11.1
index 7cc05a42fe1d..4ec10970aed5 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.11.1
+++ b/metadata/md5-cache/dev-python/argcomplete-1.11.1
@@ -4,12 +4,12 @@ DESCRIPTION=Bash tab completion for argparse
 EAPI=7
 HOMEPAGE=https://pypi.org/project/argcomplete/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( <dev-python/importlib_metadata-2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.11.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3e73b691c9bab8d1df9ac73edfc6d06f
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2b1a7e5ff38b389a18a0ef9cc7004977
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.9.4 b/metadata/md5-cache/dev-python/argcomplete-1.9.4
index e6dd0f7c8bc7..96fc8ac186db 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.9.4
+++ b/metadata/md5-cache/dev-python/argcomplete-1.9.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.9.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4890bacaa092c421b9a095a5a50646e
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 7e2328334866..4995b3fc331c 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.2-r1
+++ b/metadata/md5-cache/dev-python/argh-0.26.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.26.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52f3b05643a0433769898a7551b7f1ad
diff --git a/metadata/md5-cache/dev-python/argh-0.26.2-r2 b/metadata/md5-cache/dev-python/argh-0.26.2-r2
index 309d44f1f779..54a2199dc52d 100644
--- a/metadata/md5-cache/dev-python/argh-0.26.2-r2
+++ b/metadata/md5-cache/dev-python/argh-0.26.2-r2
@@ -1,16 +1,16 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/iocapture[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/iocapture[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=A simple argparse wrapper
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/argh/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-3
-RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argh/argh-0.26.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2ab8804cb7b96a56c8077c858def8743
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=421a11c9d141201b8de25f8a534d91c7
diff --git a/metadata/md5-cache/dev-python/argon2_cffi-19.1.0 b/metadata/md5-cache/dev-python/argon2_cffi-19.1.0
index 6dda2d04a342..69b2933f9003 100644
--- a/metadata/md5-cache/dev-python/argon2_cffi-19.1.0
+++ b/metadata/md5-cache/dev-python/argon2_cffi-19.1.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-crypt/argon2:= dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( app-crypt/argon2:= dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-crypt/argon2:= dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=CFFI bindings to the Argon2 password hashing library
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argon2_cffi/argon2_cffi-19.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3355f58579c7458c81fa090d2300dabe
diff --git a/metadata/md5-cache/dev-python/args-0.1.0 b/metadata/md5-cache/dev-python/args-0.1.0
index a8fd31aa6ba3..c8a68afc3a48 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/args/args-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59908d95cf01d87cc065c29f5415ea9a
diff --git a/metadata/md5-cache/dev-python/args-0.1.0-r1 b/metadata/md5-cache/dev-python/args-0.1.0-r1
index 5f84e75517aa..682741651413 100644
--- a/metadata/md5-cache/dev-python/args-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/args-0.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/args/args-0.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1f33745082d34c82192ca79977367a3b
diff --git a/metadata/md5-cache/dev-python/arpeggio-1.5 b/metadata/md5-cache/dev-python/arpeggio-1.5
index 7cba05ede627..9433fa26627d 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/A/Arpeggio/Arpeggio-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=054a83bce1c221eaf1a643b2c361cf83
diff --git a/metadata/md5-cache/dev-python/arpeggio-1.9.0 b/metadata/md5-cache/dev-python/arpeggio-1.9.0
index 0dbd235cff5b..28bc3f0f46f4 100644
--- a/metadata/md5-cache/dev-python/arpeggio-1.9.0
+++ b/metadata/md5-cache/dev-python/arpeggio-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/igordejanovic/Arpeggio/archive/v1.9.0.tar.gz -> arpeggio-1.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd2b5b56171586bca50e84f2ef6d12b5
diff --git a/metadata/md5-cache/dev-python/arrow-0.10.0 b/metadata/md5-cache/dev-python/arrow-0.10.0
index 353489dcf3cc..d05c112132cc 100644
--- a/metadata/md5-cache/dev-python/arrow-0.10.0
+++ b/metadata/md5-cache/dev-python/arrow-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e7acad33882786fa04343a034db63ba
diff --git a/metadata/md5-cache/dev-python/arrow-0.12.1 b/metadata/md5-cache/dev-python/arrow-0.12.1
index 7bf86e51b189..eceb97c3fd66 100644
--- a/metadata/md5-cache/dev-python/arrow-0.12.1
+++ b/metadata/md5-cache/dev-python/arrow-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd4038b5cd86ebb3f377edd957b544d6
diff --git a/metadata/md5-cache/dev-python/arrow-0.13.1 b/metadata/md5-cache/dev-python/arrow-0.13.1
index ab647aac7adb..d65db77504bc 100644
--- a/metadata/md5-cache/dev-python/arrow-0.13.1
+++ b/metadata/md5-cache/dev-python/arrow-0.13.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/arrow/arrow-0.13.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0b1801ff53ccfad97f95278f6e3ece4f
diff --git a/metadata/md5-cache/dev-python/asciimatics-1.10.0 b/metadata/md5-cache/dev-python/asciimatics-1.10.0
index 31ecc756a108..b4b4adc56510 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e3732649a86d0d3943a3e572c6e4158
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 3ee9a0908b28..35b8a11ae2d9 100644
--- a/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/asciitable-0.8.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asciitable/asciitable-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ddb9c46d36f19ca382e6dbfa97e5b68
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.22.0 b/metadata/md5-cache/dev-python/asn1crypto-0.22.0
index 48d70a87fc3d..16543895e555 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-0.22.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-0.22.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asn1crypto/asn1crypto-0.22.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e3b28802d55a598b90810fdde971a865
diff --git a/metadata/md5-cache/dev-python/asn1crypto-0.24.0 b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
index ad3936446720..454e244ece59 100644
--- a/metadata/md5-cache/dev-python/asn1crypto-0.24.0
+++ b/metadata/md5-cache/dev-python/asn1crypto-0.24.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wbond/asn1crypto/archive/0.24.0.tar.gz -> asn1crypto-0.24.0.gh.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=374c078b9ae0ca47e5711f8da4c3321d
diff --git a/metadata/md5-cache/dev-python/asset-0.6.11 b/metadata/md5-cache/dev-python/asset-0.6.11
index dd87802f4d9b..e8d0732c41f9 100644
--- a/metadata/md5-cache/dev-python/asset-0.6.11
+++ b/metadata/md5-cache/dev-python/asset-0.6.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/asset/asset-0.6.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a7bbdc0870ea6a900a62b1b0e022415
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 3fa0a840d670..f2136d9f2327 100644
--- a/metadata/md5-cache/dev-python/assets-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/assets-0.1.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd6cd80a964e6a194eec01986807e227
diff --git a/metadata/md5-cache/dev-python/astor-0.5 b/metadata/md5-cache/dev-python/astor-0.5
index ee4601b81c58..63cffb6c0e8f 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2e0460af492f506c6d54667f2f3c3c9
diff --git a/metadata/md5-cache/dev-python/astor-0.6 b/metadata/md5-cache/dev-python/astor-0.6
index cdea44fa9a42..ac6476cbfc57 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d17296a76fa9288ec4d2f92fc797089
diff --git a/metadata/md5-cache/dev-python/astor-0.7.1 b/metadata/md5-cache/dev-python/astor-0.7.1
index 97303db5c990..e098eae570c6 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=430f0abcaa90d3aeca096ca0aaef2317
diff --git a/metadata/md5-cache/dev-python/astor-0.8.1 b/metadata/md5-cache/dev-python/astor-0.8.1
index 955be3e047fc..8a5dc6629293 100644
--- a/metadata/md5-cache/dev-python/astor-0.8.1
+++ b/metadata/md5-cache/dev-python/astor-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astor/astor-0.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5ab0f21dbd88aa1d81fde9a75b2f3d83
diff --git a/metadata/md5-cache/dev-python/astroid-1.4.8 b/metadata/md5-cache/dev-python/astroid-1.4.8
index 255d00c22039..0c7451b31c18 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.4.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de0692d53b9705cc32c8d7d6f80cb3ca
diff --git a/metadata/md5-cache/dev-python/astroid-1.6.5 b/metadata/md5-cache/dev-python/astroid-1.6.5
index 8d7f5094721b..af99698cf705 100644
--- a/metadata/md5-cache/dev-python/astroid-1.6.5
+++ b/metadata/md5-cache/dev-python/astroid-1.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-1.6.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f3504cb06c52c8cdf9fd5aa76b0d816
diff --git a/metadata/md5-cache/dev-python/astroid-2.2.5 b/metadata/md5-cache/dev-python/astroid-2.2.5
index 7a3258bc718b..772fb7fbd3a9 100644
--- a/metadata/md5-cache/dev-python/astroid-2.2.5
+++ b/metadata/md5-cache/dev-python/astroid-2.2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-2.2.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=483dc2df35c46d3792cf71366ae97596
diff --git a/metadata/md5-cache/dev-python/astroid-2.3.3 b/metadata/md5-cache/dev-python/astroid-2.3.3
index 1d8a1d8b966f..26d3054745d2 100644
--- a/metadata/md5-cache/dev-python/astroid-2.3.3
+++ b/metadata/md5-cache/dev-python/astroid-2.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/astroid/astroid-2.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cd643d76c911d954a8b7fb4eb83113c3
diff --git a/metadata/md5-cache/dev-python/astunparse-1.6.2 b/metadata/md5-cache/dev-python/astunparse-1.6.2
index 5182aba9e8df..ca75753a1c81 100644
--- a/metadata/md5-cache/dev-python/astunparse-1.6.2
+++ b/metadata/md5-cache/dev-python/astunparse-1.6.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.6.1[python_targets_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/astunparse/astunparse-1.6.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2f4827dc05e55c04357b616b86d1768e
diff --git a/metadata/md5-cache/dev-python/async_generator-1.10 b/metadata/md5-cache/dev-python/async_generator-1.10
index 1c4c42f6d2a0..cabff286f71a 100644
--- a/metadata/md5-cache/dev-python/async_generator-1.10
+++ b/metadata/md5-cache/dev-python/async_generator-1.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_generator/async_generator-1.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5c49328899043c3786e3971233c7e432
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 2ea872dc02f4..8a694346775d 100644
--- a/metadata/md5-cache/dev-python/async_timeout-1.2.1
+++ b/metadata/md5-cache/dev-python/async_timeout-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ca1bf39eb5c5bd2c93757ca8c1d8c96
diff --git a/metadata/md5-cache/dev-python/async_timeout-2.0.1 b/metadata/md5-cache/dev-python/async_timeout-2.0.1
index 7b51743f6011..7fe4098c7f14 100644
--- a/metadata/md5-cache/dev-python/async_timeout-2.0.1
+++ b/metadata/md5-cache/dev-python/async_timeout-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3014fdd881fd5baec2f7def02f17e85c
diff --git a/metadata/md5-cache/dev-python/async_timeout-3.0.1 b/metadata/md5-cache/dev-python/async_timeout-3.0.1
index 9ca8628468d3..d42b08de9fcb 100644
--- a/metadata/md5-cache/dev-python/async_timeout-3.0.1
+++ b/metadata/md5-cache/dev-python/async_timeout-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/async_timeout/async-timeout-3.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b218a3ff4cb80404629535c28a6b6e1f
diff --git a/metadata/md5-cache/dev-python/asynctest-0.12.2 b/metadata/md5-cache/dev-python/asynctest-0.12.2
index a49f9cd2528d..d36ec6fa2659 100644
--- a/metadata/md5-cache/dev-python/asynctest-0.12.2
+++ b/metadata/md5-cache/dev-python/asynctest-0.12.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Martiusweb/asynctest/archive/v0.12.2.tar.gz -> asynctest-0.12.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2b6b455296e1937b789b51f8a7cfea5e
diff --git a/metadata/md5-cache/dev-python/atom-0.4.1 b/metadata/md5-cache/dev-python/atom-0.4.1
index beb44e0868b2..9c45e7b48948 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/atom/atom-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e03042024bb61cab5a209b80d01bf6bd
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 7a1f8367cf74..d6ed44e001ae 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3eeb23b4a82bc0436e8ec37174815f1
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3 b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3
index e7caeefeddff..167f4cefee33 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.1.5-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f1aece06fb1b5bc683f23b2495a79b69
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.2.1 b/metadata/md5-cache/dev-python/atomicwrites-1.2.1
index 239fdf097c50..b687724fb67e 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.2.1
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fc985084adb49ca17ece9eb5583f62e2
diff --git a/metadata/md5-cache/dev-python/atomicwrites-1.3.0 b/metadata/md5-cache/dev-python/atomicwrites-1.3.0
index 3c52a8d04d49..83059f3921b7 100644
--- a/metadata/md5-cache/dev-python/atomicwrites-1.3.0
+++ b/metadata/md5-cache/dev-python/atomicwrites-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/atomicwrites/atomicwrites-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2a08f8c829eaeeca5941bfb3a69f8870
diff --git a/metadata/md5-cache/dev-python/atpublic-1.0 b/metadata/md5-cache/dev-python/atpublic-1.0
index 30c77732db0c..4e1734aa3f3a 100644
--- a/metadata/md5-cache/dev-python/atpublic-1.0
+++ b/metadata/md5-cache/dev-python/atpublic-1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/atpublic/atpublic-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b30f48b1ddd7198d58011dfcbcd37fd4
diff --git a/metadata/md5-cache/dev-python/attrs-18.2.0 b/metadata/md5-cache/dev-python/attrs-18.2.0
index 34b33a8a2ec9..ebc28b99566e 100644
--- a/metadata/md5-cache/dev-python/attrs-18.2.0
+++ b/metadata/md5-cache/dev-python/attrs-18.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-18.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97228f4b7a6eae824239bbc6396dfbe9
diff --git a/metadata/md5-cache/dev-python/attrs-19.1.0 b/metadata/md5-cache/dev-python/attrs-19.1.0
index 0d8f69f6c09d..3f132919ea42 100644
--- a/metadata/md5-cache/dev-python/attrs-19.1.0
+++ b/metadata/md5-cache/dev-python/attrs-19.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-19.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9c363084a8eb06c39560b904e1bba9de
diff --git a/metadata/md5-cache/dev-python/attrs-19.3.0 b/metadata/md5-cache/dev-python/attrs-19.3.0
index 9f958bece9ff..bc61491dcae6 100644
--- a/metadata/md5-cache/dev-python/attrs-19.3.0
+++ b/metadata/md5-cache/dev-python/attrs-19.3.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_pypy3? ( >=dev-python/pypy3-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-python/hypothesis-3.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_pypy3? ( >=dev-python/pypy3-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) >=dev-python/hypothesis-3.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Attributes without boilerplate
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/attrs/attrs-19.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d7fc5ef5671657788449426991e79c0f
diff --git a/metadata/md5-cache/dev-python/audioread-2.1.8-r1 b/metadata/md5-cache/dev-python/audioread-2.1.8-r1
index 84294de9fe11..301813ac8b44 100644
--- a/metadata/md5-cache/dev-python/audioread-2.1.8-r1
+++ b/metadata/md5-cache/dev-python/audioread-2.1.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/audioread/audioread-2.1.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=46da17b08d4698802f2d3ef10194f542
diff --git a/metadata/md5-cache/dev-python/authheaders-0.11.0 b/metadata/md5-cache/dev-python/authheaders-0.11.0
index 99a3f9d38c69..bf3a0b990a40 100644
--- a/metadata/md5-cache/dev-python/authheaders-0.11.0
+++ b/metadata/md5-cache/dev-python/authheaders-0.11.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authheaders/authheaders-0.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=10f3721aacadd3b6e5636cd5b964c96c
diff --git a/metadata/md5-cache/dev-python/authheaders-0.12.1 b/metadata/md5-cache/dev-python/authheaders-0.12.1
index cb717e805dd2..e99b5bb3ee03 100644
--- a/metadata/md5-cache/dev-python/authheaders-0.12.1
+++ b/metadata/md5-cache/dev-python/authheaders-0.12.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authheaders/authheaders-0.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bf83641fb9a6279236ffd51bad5edf57
diff --git a/metadata/md5-cache/dev-python/authres-0.800 b/metadata/md5-cache/dev-python/authres-0.800
index 7755b70c3d12..df181f466d91 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_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/a/authres/authres-0.800.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b27de5581483e98bf09b165750c339d2
diff --git a/metadata/md5-cache/dev-python/authres-1.1.1 b/metadata/md5-cache/dev-python/authres-1.1.1
index 489508971a31..00acd45740c4 100644
--- a/metadata/md5-cache/dev-python/authres-1.1.1
+++ b/metadata/md5-cache/dev-python/authres-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/authres/authres-1.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3e9ad97f0c81e594efda33d8eaad7975
diff --git a/metadata/md5-cache/dev-python/autobahn-17.10.1 b/metadata/md5-cache/dev-python/autobahn-17.10.1
index 83c7e7989078..207662f6c758 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.10.1
+++ b/metadata/md5-cache/dev-python/autobahn-17.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b117322d7117e7bdbbc45210462bf07c
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 ad5aeb6a739d..0b829567bb79 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.5.1-r2
+++ b/metadata/md5-cache/dev-python/autobahn-17.5.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d21b20d3ef0d225a4a30b9e04a66dc5
diff --git a/metadata/md5-cache/dev-python/autobahn-17.9.1 b/metadata/md5-cache/dev-python/autobahn-17.9.1
index e91516336bbe..9c7e0866b309 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.9.1
+++ b/metadata/md5-cache/dev-python/autobahn-17.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b117322d7117e7bdbbc45210462bf07c
diff --git a/metadata/md5-cache/dev-python/autobahn-17.9.2 b/metadata/md5-cache/dev-python/autobahn-17.9.2
index dbf8ae480641..c36410e2d92c 100644
--- a/metadata/md5-cache/dev-python/autobahn-17.9.2
+++ b/metadata/md5-cache/dev-python/autobahn-17.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-17.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b117322d7117e7bdbbc45210462bf07c
diff --git a/metadata/md5-cache/dev-python/autobahn-18.3.1 b/metadata/md5-cache/dev-python/autobahn-18.3.1
index a4e7bc3332dc..bc7c06d6ff37 100644
--- a/metadata/md5-cache/dev-python/autobahn-18.3.1
+++ b/metadata/md5-cache/dev-python/autobahn-18.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autobahn/autobahn-18.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=014af97a4b85a1458f1f20c06bada451
diff --git a/metadata/md5-cache/dev-python/automat-0.5.0 b/metadata/md5-cache/dev-python/automat-0.5.0
index 6bc0ac7b310e..2682626607de 100644
--- a/metadata/md5-cache/dev-python/automat-0.5.0
+++ b/metadata/md5-cache/dev-python/automat-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d8ba0ff8045ab907e6c844b2aa28ae4
diff --git a/metadata/md5-cache/dev-python/automat-0.6.0 b/metadata/md5-cache/dev-python/automat-0.6.0
index fe1284ed92fd..c6c4516ba3a8 100644
--- a/metadata/md5-cache/dev-python/automat-0.6.0
+++ b/metadata/md5-cache/dev-python/automat-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72e0d387c70b7d5c0a01894c81bcaf99
diff --git a/metadata/md5-cache/dev-python/automat-0.7.0 b/metadata/md5-cache/dev-python/automat-0.7.0
index 97a9d9bd2b79..6b035318e074 100644
--- a/metadata/md5-cache/dev-python/automat-0.7.0
+++ b/metadata/md5-cache/dev-python/automat-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c9ab2791e7975e1e451f12d2f1a0896
diff --git a/metadata/md5-cache/dev-python/automat-0.8.0 b/metadata/md5-cache/dev-python/automat-0.8.0
index f6f255f33eb7..21c34659d2da 100644
--- a/metadata/md5-cache/dev-python/automat-0.8.0
+++ b/metadata/md5-cache/dev-python/automat-0.8.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/attrs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/m2r[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/attrs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/m2r[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Self-service finite-state machines for the programmer on the go
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/A/Automat/Automat-0.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=712bb1dc5b08c9aae2610e152aa555d3
diff --git a/metadata/md5-cache/dev-python/automaton-1.12.1 b/metadata/md5-cache/dev-python/automaton-1.12.1
index 625fff91c555..98a0272acdf1 100644
--- a/metadata/md5-cache/dev-python/automaton-1.12.1
+++ b/metadata/md5-cache/dev-python/automaton-1.12.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/automaton/automaton-1.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e1dfcb324be386f7b3208898e0dd3742
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.2 b/metadata/md5-cache/dev-python/autopep8-1.3.2
index 5643b712e9c2..5c93f1d848a6 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.3.2
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ab95d7676a530b449d07f2715971e2d
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.3 b/metadata/md5-cache/dev-python/autopep8-1.3.3
index 0feb903c1862..32e692acd525 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.3.3
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d5dd15e31a440951027358619bdacd7e
diff --git a/metadata/md5-cache/dev-python/autopep8-1.3.5 b/metadata/md5-cache/dev-python/autopep8-1.3.5
index 751b03437429..f8d890f83cc0 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.3.5
+++ b/metadata/md5-cache/dev-python/autopep8-1.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51efb0ca8d1419a3734b04eff6545f4b
diff --git a/metadata/md5-cache/dev-python/autopep8-1.4 b/metadata/md5-cache/dev-python/autopep8-1.4
index 68c75691ab37..364becfaf3e9 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.4
+++ b/metadata/md5-cache/dev-python/autopep8-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51efb0ca8d1419a3734b04eff6545f4b
diff --git a/metadata/md5-cache/dev-python/autopep8-1.4.3 b/metadata/md5-cache/dev-python/autopep8-1.4.3
index e7f1e3a71e5e..a6443ab6bdf5 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.4.3
+++ b/metadata/md5-cache/dev-python/autopep8-1.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e3f0450bfdfafd50a77476a5011315c
diff --git a/metadata/md5-cache/dev-python/autopep8-1.4.4 b/metadata/md5-cache/dev-python/autopep8-1.4.4
index 16263a9d80cb..7fe9853646be 100644
--- a/metadata/md5-cache/dev-python/autopep8-1.4.4
+++ b/metadata/md5-cache/dev-python/autopep8-1.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/autopep8/autopep8-1.4.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f1bbc18e8208812f32741ba0a659b637
diff --git a/metadata/md5-cache/dev-python/autopep8-9999 b/metadata/md5-cache/dev-python/autopep8-9999
index fc197304eb8c..f8b850152a11 100644
--- a/metadata/md5-cache/dev-python/autopep8-9999
+++ b/metadata/md5-cache/dev-python/autopep8-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a87a6f7d4e4ed42d61695d6362d5b0b9
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.11.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.11.0
index 29faf535ad37..9a2f3bf6b522 100644
--- a/metadata/md5-cache/dev-python/aws-sam-translator-1.11.0
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/aws-sam-translator/aws-sam-translator-1.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=701e55155e1553e7d0addb6cef6d8dc8
diff --git a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.4.2 b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.4.2
index 816ae86869fb..fbb90fe416fc 100644
--- a/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.4.2
+++ b/metadata/md5-cache/dev-python/aws-xray-sdk-python-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/aws-xray-sdk/aws-xray-sdk-2.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c66f44c114ce75c05381671c8d8d71cc
diff --git a/metadata/md5-cache/dev-python/awscli-1.16.310 b/metadata/md5-cache/dev-python/awscli-1.16.310
index eb82681eabac..e9dc6e065923 100644
--- a/metadata/md5-cache/dev-python/awscli-1.16.310
+++ b/metadata/md5-cache/dev-python/awscli-1.16.310
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.16.310.tar.gz -> awscli-1.16.310.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1d7f34f89eaa369ea358396ee2e80c0c
diff --git a/metadata/md5-cache/dev-python/awscli-1.16.314 b/metadata/md5-cache/dev-python/awscli-1.16.314
index 186faf8dde7f..178c2eeedf19 100644
--- a/metadata/md5-cache/dev-python/awscli-1.16.314
+++ b/metadata/md5-cache/dev-python/awscli-1.16.314
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.16.314.tar.gz -> awscli-1.16.314.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=900038dff49d9e98d68525ff2d9da039
diff --git a/metadata/md5-cache/dev-python/awscli-1.17.7 b/metadata/md5-cache/dev-python/awscli-1.17.7
index ee8e88984300..11a6ab062676 100644
--- a/metadata/md5-cache/dev-python/awscli-1.17.7
+++ b/metadata/md5-cache/dev-python/awscli-1.17.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aws/aws-cli/archive/1.17.7.tar.gz -> awscli-1.17.7.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=38f94c1fc6d10a40d30d1db2fb223b80
diff --git a/metadata/md5-cache/dev-python/axiom-0.7.2 b/metadata/md5-cache/dev-python/axiom-0.7.2
index 70bc33ed96a6..a5e41f9a004c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 c64dff4ccdda..c1334c117179 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 51df8585e899..7a299c41f0ab 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/babelfish/babelfish-0.5.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a849634f42f7711d8d28b012deb0a3c
diff --git a/metadata/md5-cache/dev-python/babelfish-9999 b/metadata/md5-cache/dev-python/babelfish-9999
index c5483c103472..51699489fdd3 100644
--- a/metadata/md5-cache/dev-python/babelfish-9999
+++ b/metadata/md5-cache/dev-python/babelfish-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1da7cb6812c861b74ae17d281aa6072
diff --git a/metadata/md5-cache/dev-python/backcall-0.1.0 b/metadata/md5-cache/dev-python/backcall-0.1.0
index 6729ed13a0c5..56e3c836bca5 100644
--- a/metadata/md5-cache/dev-python/backcall-0.1.0
+++ b/metadata/md5-cache/dev-python/backcall-0.1.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backcall/backcall-0.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=83d14a5c637205dc42f89a16564781f8
diff --git a/metadata/md5-cache/dev-python/backports-1.0 b/metadata/md5-cache/dev-python/backports-1.0
index 23d511043df7..bab1f3d46826 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_pypy3? ( >=dev-pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~radhermit/dist/backports-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a70ad01d64b2d4d6b32487eecbf02153
diff --git a/metadata/md5-cache/dev-python/backports-abc-0.5 b/metadata/md5-cache/dev-python/backports-abc-0.5
index 9b17a0312bcf..baaacf26b6b2 100644
--- a/metadata/md5-cache/dev-python/backports-abc-0.5
+++ b/metadata/md5-cache/dev-python/backports-abc-0.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports_abc/backports_abc-0.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=aa647bd9cc8ef7ed475373ef26327276
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 b5e82ca19a09..b42298e8b109 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.csv/backports.csv-1.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e73796e868b4ed5e74fb31c2ae950bb
diff --git a/metadata/md5-cache/dev-python/backports-csv-1.0.7 b/metadata/md5-cache/dev-python/backports-csv-1.0.7
index e5ab0bc270f6..85667f2655ca 100644
--- a/metadata/md5-cache/dev-python/backports-csv-1.0.7
+++ b/metadata/md5-cache/dev-python/backports-csv-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.csv/backports.csv-1.0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=62d04b97b4cdd5bf95a72649ed8e8b6b
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 d908c878a4ad..aefdc26d4e30 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a89ce94676bc39752ed5ea097084568
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 5f3766bd98e8..d7924c4c4352 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff8742144774d28a32d41f70d7f66789
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 6365a7d88a70..229e24c27c9b 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db17b1b0a8261ae20e578bdb9d73ddef
diff --git a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.6.1 b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.6.1
index 2d1cf15c5569..740fd40558ef 100644
--- a/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.6.1
+++ b/metadata/md5-cache/dev-python/backports-functools-lru-cache-1.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.functools_lru_cache/backports.functools_lru_cache-1.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6045191987df2926141fc8b8b449d356
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 a24153177e8b..d3aa15a4e0f6 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.10
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=46015dbe371ef625e08a0bce72ef9f95
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 3842d2007c6c..82b03a8e9ba3 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.12
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b037308e0bc3f64336174d81d09d477
diff --git a/metadata/md5-cache/dev-python/backports-lzma-0.0.13 b/metadata/md5-cache/dev-python/backports-lzma-0.0.13
index 7a97211b1f7b..48ef63cdb231 100644
--- a/metadata/md5-cache/dev-python/backports-lzma-0.0.13
+++ b/metadata/md5-cache/dev-python/backports-lzma-0.0.13
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.lzma/backports.lzma-0.0.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=05f8142b7c65f74ca28e3ec4254b8cb6
diff --git a/metadata/md5-cache/dev-python/backports-os-0.1.1 b/metadata/md5-cache/dev-python/backports-os-0.1.1
index e05060a2a336..7d6b1687f556 100644
--- a/metadata/md5-cache/dev-python/backports-os-0.1.1
+++ b/metadata/md5-cache/dev-python/backports-os-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/backports[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pjdelport/backports.os/archive/v0.1.1.tar.gz -> backports-os-0.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d61a52813be1a9a9df1fa439b78f2d0e
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 808a5f778324..e211eb3c7557 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a4fbf2d2ccef..247816d7e74e 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a02bfd14313b..789cab4521dd 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_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48f937cdf2dc2bdca2d0e489a82439a4
diff --git a/metadata/md5-cache/dev-python/backports-tempfile-1.0 b/metadata/md5-cache/dev-python/backports-tempfile-1.0
index 3df71d0337c0..51d4b45c048f 100644
--- a/metadata/md5-cache/dev-python/backports-tempfile-1.0
+++ b/metadata/md5-cache/dev-python/backports-tempfile-1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.tempfile/backports.tempfile-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b3374d53a9521c0cf0fa24f7bcfd639e
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 626793b44656..42f0e86d5787 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4a2a1aecfc5f7ac595a013b67f7590b
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.4 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.4
index 328e927cf54e..4928498909bb 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.4
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=698242b931456789dd0dff0ee8d3792f
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5
index 87a97f7c6c76..9a366e5ad164 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=db0381eb25503973ac9d4570b1649f2b
diff --git a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1 b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
index 6a57817d50be..83b5af000ce0 100644
--- a/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
+++ b/metadata/md5-cache/dev-python/backports-unittest-mock-1.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.unittest_mock/backports.unittest_mock-1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=64d0bb5c82ac8df97d2e0b3a917a6c68
diff --git a/metadata/md5-cache/dev-python/backports-weakref-1.0_p1 b/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
index 30b227849b2f..2ad76615eed4 100644
--- a/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
+++ b/metadata/md5-cache/dev-python/backports-weakref-1.0_p1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backports.weakref/backports.weakref-1.0.post1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=27f9ac0558e5c9c083a7cf03d0f87599
diff --git a/metadata/md5-cache/dev-python/bandit-1.5.1-r1 b/metadata/md5-cache/dev-python/bandit-1.5.1-r1
index dbc510775873..9203e1328fcb 100644
--- a/metadata/md5-cache/dev-python/bandit-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/bandit-1.5.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef7a9f68b2ae30e72c49fcf934221217
diff --git a/metadata/md5-cache/dev-python/basemap-1.0.7-r1 b/metadata/md5-cache/dev-python/basemap-1.0.7-r1
deleted file mode 100644
index 25040910677c..000000000000
--- a/metadata/md5-cache/dev-python/basemap-1.0.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/shapelib || ( >=dev-python/matplotlib-python2-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/matplotlib-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=sci-libs/geos-3.3.1[python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=matplotlib toolkit to plot map projections
-EAPI=5
-HOMEPAGE=https://matplotlib.org/basemap/ https://pypi.org/project/basemap/
-IUSE=examples test python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT GPL-2
-RDEPEND=sci-libs/shapelib || ( >=dev-python/matplotlib-python2-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/matplotlib-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=sci-libs/geos-3.3.1[python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pupynere-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/matplotlib/basemap-1.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f562c54951aa648fd537fcf32944d59
diff --git a/metadata/md5-cache/dev-python/basemap-1.0.7-r2 b/metadata/md5-cache/dev-python/basemap-1.0.7-r2
new file mode 100644
index 000000000000..a59bffd10329
--- /dev/null
+++ b/metadata/md5-cache/dev-python/basemap-1.0.7-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sci-libs/shapelib python_single_target_python2_7? ( || ( >=dev-python/matplotlib-python2-0.98[python_targets_python2_7(-)] >=dev-python/matplotlib-0.98[python_targets_python2_7(-)] ) ) >=sci-libs/geos-3.3.1[python(-),python_single_target_python2_7(-)?] python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=matplotlib toolkit to plot map projections
+EAPI=5
+HOMEPAGE=https://matplotlib.org/basemap/ https://pypi.org/project/basemap/
+IUSE=examples test +python_single_target_python2_7
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=MIT GPL-2
+RDEPEND=sci-libs/shapelib python_single_target_python2_7? ( || ( >=dev-python/matplotlib-python2-0.98[python_targets_python2_7(-)] >=dev-python/matplotlib-0.98[python_targets_python2_7(-)] ) ) >=sci-libs/geos-3.3.1[python(-),python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-python/pupynere-1.0.8[python_targets_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)] dev-python/dap[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/matplotlib/basemap-1.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5562fb3e76dfd3f48ffb318b5350ef97
diff --git a/metadata/md5-cache/dev-python/basemap-1.0.7-r3 b/metadata/md5-cache/dev-python/basemap-1.0.7-r3
deleted file mode 100644
index 4b3dad5dc387..000000000000
--- a/metadata/md5-cache/dev-python/basemap-1.0.7-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/shapelib || ( >=dev-python/matplotlib-python2-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/matplotlib-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=sci-libs/geos-3.3.1[python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=matplotlib toolkit to plot map projections
-EAPI=5
-HOMEPAGE=https://matplotlib.org/basemap/ https://pypi.org/project/basemap/
-IUSE=examples test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT GPL-2
-RDEPEND=sci-libs/shapelib || ( >=dev-python/matplotlib-python2-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/matplotlib-0.98[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=sci-libs/geos-3.3.1[python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pupynere-1.0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/matplotlib/basemap-1.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=268f76e10fdd28737955f8ac55bcef4a
diff --git a/metadata/md5-cache/dev-python/basemap-1.0.7-r4 b/metadata/md5-cache/dev-python/basemap-1.0.7-r4
new file mode 100644
index 000000000000..286bb11e9b2e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/basemap-1.0.7-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sci-libs/shapelib python_single_target_python2_7? ( || ( >=dev-python/matplotlib-python2-0.98[python_targets_python2_7(-)] >=dev-python/matplotlib-0.98[python_targets_python2_7(-)] ) ) >=sci-libs/geos-3.3.1[python(-),python_single_target_python2_7(-)?] python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=matplotlib toolkit to plot map projections
+EAPI=5
+HOMEPAGE=https://matplotlib.org/basemap/ https://pypi.org/project/basemap/
+IUSE=examples test +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT GPL-2
+RDEPEND=sci-libs/shapelib python_single_target_python2_7? ( || ( >=dev-python/matplotlib-python2-0.98[python_targets_python2_7(-)] >=dev-python/matplotlib-0.98[python_targets_python2_7(-)] ) ) >=sci-libs/geos-3.3.1[python(-),python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-python/pupynere-1.0.8[python_targets_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)] dev-python/dap[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/matplotlib/basemap-1.0.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe57c1ae92cbc070e29b0c8f498cdc47
diff --git a/metadata/md5-cache/dev-python/bashate-0.3.1 b/metadata/md5-cache/dev-python/bashate-0.3.1
index 9f670ca5ab8d..8f7aff00063f 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bashate/bashate-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0847174de41339f30ef853b6e3779afc
diff --git a/metadata/md5-cache/dev-python/bashate-0.6.0 b/metadata/md5-cache/dev-python/bashate-0.6.0
index 2e7e44453e87..45496a6fb277 100644
--- a/metadata/md5-cache/dev-python/bashate-0.6.0
+++ b/metadata/md5-cache/dev-python/bashate-0.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bashate/bashate-0.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=70a2eb61b38b0d548aba15d87ab8faee
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 8d58ba8e603a..13dee4fe10a7 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_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/basho-erlastic/basho-erlastic-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61d0e086cbd3036e94013ed05622339b
diff --git a/metadata/md5-cache/dev-python/batinfo-0.3 b/metadata/md5-cache/dev-python/batinfo-0.3
index 338fdd27e5fa..2d4f6f0a9869 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/batinfo/batinfo-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=101feed7139f970da6d815bb399be5f6
diff --git a/metadata/md5-cache/dev-python/batinfo-0.4.2 b/metadata/md5-cache/dev-python/batinfo-0.4.2
index 58e996134518..fd191d0fae2c 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/batinfo/batinfo-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10fc6b9bb248b3dab80106a0ba5c0417
diff --git a/metadata/md5-cache/dev-python/bcolz-1.1.2 b/metadata/md5-cache/dev-python/bcolz-1.1.2
index 54ae96e1da2d..950715084e11 100644
--- a/metadata/md5-cache/dev-python/bcolz-1.1.2
+++ b/metadata/md5-cache/dev-python/bcolz-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcolz/bcolz-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28a866b42847ff9540f6175afc697f74
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.6 b/metadata/md5-cache/dev-python/bcrypt-3.1.6
index 536046e3cc69..dd577df90220 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.6
+++ b/metadata/md5-cache/dev-python/bcrypt-3.1.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcrypt/bcrypt-3.1.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a96683f0d417622a3727f2fb7e2f4b03
diff --git a/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2 b/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
index 1b712bb69dee..e473e8d59962 100644
--- a/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
+++ b/metadata/md5-cache/dev-python/bcrypt-3.1.7-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) >=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) >=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python2_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.1:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) >=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Modern password hashing for software and servers
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bcrypt/bcrypt-3.1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=96eb481428d01afe4eeb34efe7499eb2
diff --git a/metadata/md5-cache/dev-python/beagle-0.2.1 b/metadata/md5-cache/dev-python/beagle-0.2.1
index bc50731051a7..1087cf9689c4 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_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/beagle/beagle-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31d4e88a1ead6585b63e38d446e55cf6
diff --git a/metadata/md5-cache/dev-python/beaker-1.8.1 b/metadata/md5-cache/dev-python/beaker-1.8.1
index 3e216fa887c8..8c9afddb86ac 100644
--- a/metadata/md5-cache/dev-python/beaker-1.8.1
+++ b/metadata/md5-cache/dev-python/beaker-1.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f08526427ccfa5951334099850bace3a
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 3ae410865582..58a18cdba1b8 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_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f1e5d4b8e126cb5759822955107251a
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.5.1 b/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
index 8cdb51f5d36b..3b6f86b320f8 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9f934272bdb7ff5eff03af99ac7e184
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.6.3 b/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
index 13b63760d9bc..b301188c70de 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.6.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=257754bf064c6814cbb6c15789d63080
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.8.1 b/metadata/md5-cache/dev-python/beautifulsoup-4.8.1
index dee280f8447a..473a29f54310 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.8.1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.8.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) test? ( dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8311e35e94e603f4a07371c137b9c330
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.8.2 b/metadata/md5-cache/dev-python/beautifulsoup-4.8.2
index 339489e5652f..33a595c86504 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.8.2
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.8.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) test? ( dev-python/soupsieve[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/html5lib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1ae14b163ab3007053ae670f9d679fca
diff --git a/metadata/md5-cache/dev-python/bert-2.0.0 b/metadata/md5-cache/dev-python/bert-2.0.0
index 3d5ad652af6b..0a41419bfac8 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bert/bert-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6724187cd20d9a76681764e1331b7220
diff --git a/metadata/md5-cache/dev-python/bert-2.2.0 b/metadata/md5-cache/dev-python/bert-2.2.0
index 7bcdf6ef3d76..a6c3197e9434 100644
--- a/metadata/md5-cache/dev-python/bert-2.2.0
+++ b/metadata/md5-cache/dev-python/bert-2.2.0
@@ -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=mirror://pypi/b/bert/bert-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bdf0d927d30093bcfea9c3c2878dae3
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.0 b/metadata/md5-cache/dev-python/betamax-0.8.0
index edad07dc5fad..5207eacc3de6 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.0
+++ b/metadata/md5-cache/dev-python/betamax-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1af1abc1c5ce3ed0e94b40cc24b35b24
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.1 b/metadata/md5-cache/dev-python/betamax-0.8.1
index 4f04938ac79a..e1ca6a2c4edb 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.1
+++ b/metadata/md5-cache/dev-python/betamax-0.8.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=python-requests HTTP exchanges recorder
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9a46b89e9f6597cd293621a24a67cd28
diff --git a/metadata/md5-cache/dev-python/bibtexparser-0.6.2 b/metadata/md5-cache/dev-python/bibtexparser-0.6.2
index a3b45e454244..c96042a02924 100644
--- a/metadata/md5-cache/dev-python/bibtexparser-0.6.2
+++ b/metadata/md5-cache/dev-python/bibtexparser-0.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sciunto-org/python-bibtexparser/archive/v0.6.2.tar.gz -> bibtexparser-0.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d631efeb7d1d5d0549966f7f14a0522e
diff --git a/metadata/md5-cache/dev-python/bibtexparser-1.1.0 b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
index cdca7fb355e5..0ccbb82e9588 100644
--- a/metadata/md5-cache/dev-python/bibtexparser-1.1.0
+++ b/metadata/md5-cache/dev-python/bibtexparser-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sciunto-org/python-bibtexparser/archive/v1.1.0.tar.gz -> bibtexparser-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a4b05849990434c48bf136aa24b1bf7
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 7e801a9ac9ea..754049621798 100644
--- a/metadata/md5-cache/dev-python/billiard-3.5.0.2
+++ b/metadata/md5-cache/dev-python/billiard-3.5.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.5.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b94d3a7afb3fb2a6bb326f2450a47d0
diff --git a/metadata/md5-cache/dev-python/billiard-3.6.0.0 b/metadata/md5-cache/dev-python/billiard-3.6.0.0
index d448db21a296..cb599acc3574 100644
--- a/metadata/md5-cache/dev-python/billiard-3.6.0.0
+++ b/metadata/md5-cache/dev-python/billiard-3.6.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/billiard/billiard-3.6.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4d33d5c930232cb915bc275141cad3b
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.3 b/metadata/md5-cache/dev-python/binaryornot-0.4.3
index 2b75f2cb9b80..0c2a4ed1e79b 100644
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.3
+++ b/metadata/md5-cache/dev-python/binaryornot-0.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/audreyr/binaryornot/archive/0.4.3.tar.gz -> binaryornot-0.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36fac9037c3753dc49a00e5390e4713b
diff --git a/metadata/md5-cache/dev-python/biplist-1.0.1 b/metadata/md5-cache/dev-python/biplist-1.0.1
index c0f503d753d6..fe1dd6ba8bb8 100644
--- a/metadata/md5-cache/dev-python/biplist-1.0.1
+++ b/metadata/md5-cache/dev-python/biplist-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/biplist/biplist-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8d7dbd7bdc240e503c92abb117de1c9
diff --git a/metadata/md5-cache/dev-python/biplist-1.0.2 b/metadata/md5-cache/dev-python/biplist-1.0.2
index 221167fb71a1..b91bbc23e770 100644
--- a/metadata/md5-cache/dev-python/biplist-1.0.2
+++ b/metadata/md5-cache/dev-python/biplist-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/biplist/biplist-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=faede595f77b24346a78dd6bcee29425
diff --git a/metadata/md5-cache/dev-python/bitarray-0.8.1 b/metadata/md5-cache/dev-python/bitarray-0.8.1
index e89a42faf2ad..1672a3a2f6a2 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0710342f795ee6a999db7cd952410e06
diff --git a/metadata/md5-cache/dev-python/bitarray-0.8.3 b/metadata/md5-cache/dev-python/bitarray-0.8.3
index c8280b1d56a3..b323480dfe61 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bitarray/bitarray-0.8.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b1555147dc2520ad5c4814e19aab24e
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.5 b/metadata/md5-cache/dev-python/bitstring-3.1.5
index e7da2518679e..ee5c34ba223a 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/scott-griffiths/bitstring/archive/bitstring-3.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f91ff0d40741d4f1b3445429152c130
diff --git a/metadata/md5-cache/dev-python/blaze-0.11.3 b/metadata/md5-cache/dev-python/blaze-0.11.3
index 078ea654a52b..fea8e9dc642b 100644
--- a/metadata/md5-cache/dev-python/blaze-0.11.3
+++ b/metadata/md5-cache/dev-python/blaze-0.11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blaze/blaze/archive/0.11.3.tar.gz -> blaze-0.11.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6d0445142395bfa45b34e97d6cd44e5
diff --git a/metadata/md5-cache/dev-python/bleach-2.1.3 b/metadata/md5-cache/dev-python/bleach-2.1.3
index da132c2a5f2a..27c2d2d9a105 100644
--- a/metadata/md5-cache/dev-python/bleach-2.1.3
+++ b/metadata/md5-cache/dev-python/bleach-2.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-2.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=848788b8faa822faadfefafccb443c8b
diff --git a/metadata/md5-cache/dev-python/bleach-3.0.2 b/metadata/md5-cache/dev-python/bleach-3.0.2
index 5681255472bf..4ec6134096cf 100644
--- a/metadata/md5-cache/dev-python/bleach-3.0.2
+++ b/metadata/md5-cache/dev-python/bleach-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-3.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ccc58d49c29743d902df71a4c49d2f88
diff --git a/metadata/md5-cache/dev-python/bleach-3.1.0-r1 b/metadata/md5-cache/dev-python/bleach-3.1.0-r1
index ba3993ec3916..288f75514309 100644
--- a/metadata/md5-cache/dev-python/bleach-3.1.0-r1
+++ b/metadata/md5-cache/dev-python/bleach-3.1.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=an easy whitelist-based HTML-sanitizing tool
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bleach/bleach-3.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4e9881d81472d5f5ba1feeb0902cef23
diff --git a/metadata/md5-cache/dev-python/blessings-1.6-r1 b/metadata/md5-cache/dev-python/blessings-1.6-r1
index aaee3c1e732b..262047648bb9 100644
--- a/metadata/md5-cache/dev-python/blessings-1.6-r1
+++ b/metadata/md5-cache/dev-python/blessings-1.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessings/blessings-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=776c09fdb674334c1d6fc6ae02603645
diff --git a/metadata/md5-cache/dev-python/blessings-1.6.1 b/metadata/md5-cache/dev-python/blessings-1.6.1
index 8e32ad1990c6..822d02bc1b47 100644
--- a/metadata/md5-cache/dev-python/blessings-1.6.1
+++ b/metadata/md5-cache/dev-python/blessings-1.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blessings/blessings-1.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=decda70ebca1f965741e4041527f05e5
diff --git a/metadata/md5-cache/dev-python/blessings-1.7 b/metadata/md5-cache/dev-python/blessings-1.7
index dfbde9e618e3..f1c4b182a6b4 100644
--- a/metadata/md5-cache/dev-python/blessings-1.7
+++ b/metadata/md5-cache/dev-python/blessings-1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikrose/blessings/archive/1.7.tar.gz -> blessings-1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=865fcf6a4758d103fe8292981ae77397
diff --git a/metadata/md5-cache/dev-python/blinker-1.4 b/metadata/md5-cache/dev-python/blinker-1.4
index 3359a6e5b0c1..ba4d51c3d628 100644
--- a/metadata/md5-cache/dev-python/blinker-1.4
+++ b/metadata/md5-cache/dev-python/blinker-1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blinker/blinker-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b467b004be4f9a628ced037ba9e82c0
diff --git a/metadata/md5-cache/dev-python/blinker-1.4-r1 b/metadata/md5-cache/dev-python/blinker-1.4-r1
index 2b663b3f34b0..315aef78a542 100644
--- a/metadata/md5-cache/dev-python/blinker-1.4-r1
+++ b/metadata/md5-cache/dev-python/blinker-1.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blinker/blinker-1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c1d20a541684f8c1ac7f96532ec93ad
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 bc09bb8f2b71..c7c6ec01228b 100644
--- a/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1
+++ b/metadata/md5-cache/dev-python/blockdiag-1.5.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blockdiag/blockdiag-1.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=547ac12dcb8f4f998ae1d600114db159
diff --git a/metadata/md5-cache/dev-python/blockdiag-1.5.4 b/metadata/md5-cache/dev-python/blockdiag-1.5.4
index 231b90342898..f3dcd135502d 100644
--- a/metadata/md5-cache/dev-python/blockdiag-1.5.4
+++ b/metadata/md5-cache/dev-python/blockdiag-1.5.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blockdiag/blockdiag-1.5.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a0aeffdf1e5698c4ee3f09dbc342f89
diff --git a/metadata/md5-cache/dev-python/blosc-1.5.1 b/metadata/md5-cache/dev-python/blosc-1.5.1
index 000c85d5a2bd..0d09b8940926 100644
--- a/metadata/md5-cache/dev-python/blosc-1.5.1
+++ b/metadata/md5-cache/dev-python/blosc-1.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blosc/blosc-1.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d877d37d058865ad370f66ac3256113e
diff --git a/metadata/md5-cache/dev-python/bluelet-0.2.0 b/metadata/md5-cache/dev-python/bluelet-0.2.0
index 3c76b20918db..74db8484bae8 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/sampsyo/bluelet/archive/v0.2.0.tar.gz -> bluelet-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2edc4f9aa4b62ed31a2c34ee41ac4475
diff --git a/metadata/md5-cache/dev-python/blurb-1.0.7 b/metadata/md5-cache/dev-python/blurb-1.0.7
index e74b974ce9b6..e3bc336bac67 100644
--- a/metadata/md5-cache/dev-python/blurb-1.0.7
+++ b/metadata/md5-cache/dev-python/blurb-1.0.7
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/29/4f/268f9aa095cbcf53253c665fd0f5103f22dccf246fe317ab9c5c481b38f5/blurb-1.0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b3d78a55ceba9413d5a6ffd5410cae5b
diff --git a/metadata/md5-cache/dev-python/bokeh-0.12.6 b/metadata/md5-cache/dev-python/bokeh-0.12.6
index 842d5bf2776c..dbb34945ec0c 100644
--- a/metadata/md5-cache/dev-python/bokeh-0.12.6
+++ b/metadata/md5-cache/dev-python/bokeh-0.12.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bokeh/bokeh-0.12.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=128a8bf6cae2abfa9cc9d03fb7f62dbf
diff --git a/metadata/md5-cache/dev-python/booleanOperations-0.8.2 b/metadata/md5-cache/dev-python/booleanOperations-0.8.2
index 56c72e2f6eb6..e49e372cd599 100644
--- a/metadata/md5-cache/dev-python/booleanOperations-0.8.2
+++ b/metadata/md5-cache/dev-python/booleanOperations-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/fonttools-3.32.0[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/typemytype/booleanOperations/archive/0.8.2.tar.gz -> booleanOperations-0.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=82878b33e63549a6d92d80eed6b780fe
diff --git a/metadata/md5-cache/dev-python/boto-2.41.0 b/metadata/md5-cache/dev-python/boto-2.41.0
index 70b8c455fc00..15530b25825e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39d20451f4de2e141e8e667c6e076abf
diff --git a/metadata/md5-cache/dev-python/boto-2.48.0 b/metadata/md5-cache/dev-python/boto-2.48.0
index 4e315689b8c6..35448486d152 100644
--- a/metadata/md5-cache/dev-python/boto-2.48.0
+++ b/metadata/md5-cache/dev-python/boto-2.48.0
@@ -12,5 +12,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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4008bc6b9837c3f4e7963ce76654b9e4
diff --git a/metadata/md5-cache/dev-python/boto-2.49.0 b/metadata/md5-cache/dev-python/boto-2.49.0
index f9f8f8d6b774..ddbec9ec7a89 100644
--- a/metadata/md5-cache/dev-python/boto-2.49.0
+++ b/metadata/md5-cache/dev-python/boto-2.49.0
@@ -12,5 +12,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.49.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=46fcb11b9b0df2f0ca62bb13f8a20e0f
diff --git a/metadata/md5-cache/dev-python/boto3-1.10.2 b/metadata/md5-cache/dev-python/boto3-1.10.2
index 53fedfdc4707..875a41c07fc6 100644
--- a/metadata/md5-cache/dev-python/boto3-1.10.2
+++ b/metadata/md5-cache/dev-python/boto3-1.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.10.2.tar.gz -> boto3-1.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdf594eb2889bd8b31773fd5e6bdae7c
diff --git a/metadata/md5-cache/dev-python/boto3-1.9.122 b/metadata/md5-cache/dev-python/boto3-1.9.122
index 142e0a4fdabe..ada39a483a96 100644
--- a/metadata/md5-cache/dev-python/boto3-1.9.122
+++ b/metadata/md5-cache/dev-python/boto3-1.9.122
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.9.122.tar.gz -> boto3-1.9.122.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25aa5383d9b390c2867d12b47fada3e3
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 81a098ce2284..f07338d789eb 100644
--- a/metadata/md5-cache/dev-python/boto3-1.9.4-r1
+++ b/metadata/md5-cache/dev-python/boto3-1.9.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/boto/boto3/archive/1.9.4.tar.gz -> boto3-1.9.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25aa5383d9b390c2867d12b47fada3e3
diff --git a/metadata/md5-cache/dev-python/boto3-9999 b/metadata/md5-cache/dev-python/boto3-9999
index f0e258113f3a..367cc15e60cb 100644
--- a/metadata/md5-cache/dev-python/boto3-9999
+++ b/metadata/md5-cache/dev-python/boto3-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/botocore-1.12.4[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdf594eb2889bd8b31773fd5e6bdae7c
diff --git a/metadata/md5-cache/dev-python/botocore-1.12.122 b/metadata/md5-cache/dev-python/botocore-1.12.122
index 6f878f84aff8..5f80ea455cea 100644
--- a/metadata/md5-cache/dev-python/botocore-1.12.122
+++ b/metadata/md5-cache/dev-python/botocore-1.12.122
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.12.122.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4148cba41f75a74738cf5ea14ac1f70d
diff --git a/metadata/md5-cache/dev-python/botocore-1.13.46 b/metadata/md5-cache/dev-python/botocore-1.13.46
index 1bf851a98cd7..3008d4b00aee 100644
--- a/metadata/md5-cache/dev-python/botocore-1.13.46
+++ b/metadata/md5-cache/dev-python/botocore-1.13.46
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.13.46.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=622780ded89a39907425a82fc9168dc5
diff --git a/metadata/md5-cache/dev-python/botocore-1.13.50 b/metadata/md5-cache/dev-python/botocore-1.13.50
index 13cb9633cae6..45284dc0e12f 100644
--- a/metadata/md5-cache/dev-python/botocore-1.13.50
+++ b/metadata/md5-cache/dev-python/botocore-1.13.50
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.13.50.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=622780ded89a39907425a82fc9168dc5
diff --git a/metadata/md5-cache/dev-python/botocore-1.14.7 b/metadata/md5-cache/dev-python/botocore-1.14.7
index 0bf26140e6fd..9e12497bf3cf 100644
--- a/metadata/md5-cache/dev-python/botocore-1.14.7
+++ b/metadata/md5-cache/dev-python/botocore-1.14.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/botocore/botocore-1.14.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=95dc624d9eaa88db72c87164c45295df
diff --git a/metadata/md5-cache/dev-python/botocore-9999 b/metadata/md5-cache/dev-python/botocore-9999
index 78b8761902bb..fc132a90be1c 100644
--- a/metadata/md5-cache/dev-python/botocore-9999
+++ b/metadata/md5-cache/dev-python/botocore-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=95dc624d9eaa88db72c87164c45295df
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.16 b/metadata/md5-cache/dev-python/bottle-0.12.16
index df8834916617..a4309dfd6cd7 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.16
+++ b/metadata/md5-cache/dev-python/bottle-0.12.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f544dcf04eccfe2fc3ac7fc232c75b69
diff --git a/metadata/md5-cache/dev-python/bottle-0.12.18 b/metadata/md5-cache/dev-python/bottle-0.12.18
index 6e2e4be655ed..d0da5f7f2ecc 100644
--- a/metadata/md5-cache/dev-python/bottle-0.12.18
+++ b/metadata/md5-cache/dev-python/bottle-0.12.18
@@ -4,12 +4,12 @@ DESCRIPTION=A fast and simple micro-framework for small web-applications
 EAPI=7
 HOMEPAGE=https://pypi.org/project/bottle/ https://bottlepy.org/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.12.18.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e19da349a60f260724455b3d13afc500
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e2a904cd655fd8c51cc807cf39e0567a
diff --git a/metadata/md5-cache/dev-python/bottleneck-1.2.1-r1 b/metadata/md5-cache/dev-python/bottleneck-1.2.1-r1
index f9cf2e7571c5..e460f2d8746c 100644
--- a/metadata/md5-cache/dev-python/bottleneck-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/bottleneck-1.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kwgoodman/bottleneck/archive/v1.2.1.tar.gz -> bottleneck-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e9070975ff675b81326a31a80e6e108
diff --git a/metadata/md5-cache/dev-python/bpython-0.17.1 b/metadata/md5-cache/dev-python/bpython-0.17.1
index eaa0f223c946..3a9ee9cc3496 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.17.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f765f90431244c753d350e39841e8e94
diff --git a/metadata/md5-cache/dev-python/bpython-0.18 b/metadata/md5-cache/dev-python/bpython-0.18
index abad484549e3..5cb8607a34ae 100644
--- a/metadata/md5-cache/dev-python/bpython-0.18
+++ b/metadata/md5-cache/dev-python/bpython-0.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bpython/bpython-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b725a760207201b02d58272d7c22c2e7
diff --git a/metadata/md5-cache/dev-python/breathe-4.6.0 b/metadata/md5-cache/dev-python/breathe-4.6.0
index 064e2644f606..82b45eb17757 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_python3_6(-)?,
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/breathe/breathe-4.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c74a08041cf9ca2fcb6db84518553a9
diff --git a/metadata/md5-cache/dev-python/brotlipy-0.7.0 b/metadata/md5-cache/dev-python/brotlipy-0.7.0
index 6b52036ef299..03b377ca5c4d 100644
--- a/metadata/md5-cache/dev-python/brotlipy-0.7.0
+++ b/metadata/md5-cache/dev-python/brotlipy-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b5e8f61f51b59754ca8a49c5d99ba78
diff --git a/metadata/md5-cache/dev-python/brython-3.7.2 b/metadata/md5-cache/dev-python/brython-3.7.2
index f8a0167d6326..d9ba42df63d7 100644
--- a/metadata/md5-cache/dev-python/brython-3.7.2
+++ b/metadata/md5-cache/dev-python/brython-3.7.2
@@ -3,12 +3,12 @@ DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-
 DESCRIPTION=A Python 3 implementation for client-side web programming
 EAPI=6
 HOMEPAGE=http://www.brython.info
-IUSE=vhosts +python_targets_python3_6 +python_single_target_python3_6
+IUSE=vhosts +python_single_target_python3_6
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=3.7.2
 SRC_URI=https://github.com/brython-dev/brython/archive/3.7.2.tar.gz -> brython-3.7.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=15705cab37b434762d9c62abef3fbec6
diff --git a/metadata/md5-cache/dev-python/bsddb3-6.2.4 b/metadata/md5-cache/dev-python/bsddb3-6.2.4
index 988ef67d4541..18d99c26b72e 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/bsddb3/bsddb3-6.2.4.tar.gz
-_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0ec289660e21b0e0b37babe6d751895
diff --git a/metadata/md5-cache/dev-python/bytecodeassembler-0.6 b/metadata/md5-cache/dev-python/bytecodeassembler-0.6
index 87ca162ce9f3..69c761c041e8 100644
--- a/metadata/md5-cache/dev-python/bytecodeassembler-0.6
+++ b/metadata/md5-cache/dev-python/bytecodeassembler-0.6
@@ -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=mirror://pypi/B/BytecodeAssembler/BytecodeAssembler-0.6.zip -> bytecodeassembler-0.6.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=732f27f0cc2298f89601312433e02fa4
diff --git a/metadata/md5-cache/dev-python/bz2file-0.98 b/metadata/md5-cache/dev-python/bz2file-0.98
index a6ad9c674075..fa26b3474e87 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_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/bz2file/bz2file-0.98.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8756942471834b3ebcf2448bc58e95dc
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 7e1482d79fec..48467b7285d5 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.3.1
+++ b/metadata/md5-cache/dev-python/cached-property-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60dd841d707e76229c69554aac2ecb71
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 2de934ed54ad..a817168d971d 100644
--- a/metadata/md5-cache/dev-python/cached-property-1.5.1
+++ b/metadata/md5-cache/dev-python/cached-property-1.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cached-property/cached-property-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ccc73ae28e2f5a56174cea08e73ac36d
diff --git a/metadata/md5-cache/dev-python/cachelib-0.1 b/metadata/md5-cache/dev-python/cachelib-0.1
index f6c194a795c3..bebfad445a45 100644
--- a/metadata/md5-cache/dev-python/cachelib-0.1
+++ b/metadata/md5-cache/dev-python/cachelib-0.1
@@ -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=mirror://pypi/c/cachelib/cachelib-0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2145b31c14ca0951e4b847fdbcdb170a
diff --git a/metadata/md5-cache/dev-python/cachetools-3.1.0 b/metadata/md5-cache/dev-python/cachetools-3.1.0
index f572781a74aa..0c1191c6ae2d 100644
--- a/metadata/md5-cache/dev-python/cachetools-3.1.0
+++ b/metadata/md5-cache/dev-python/cachetools-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-3.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=49b837a029178ab7cef21b7fb1d04a45
diff --git a/metadata/md5-cache/dev-python/cachetools-3.1.1 b/metadata/md5-cache/dev-python/cachetools-3.1.1
index b507423821e6..f2d53ea66a41 100644
--- a/metadata/md5-cache/dev-python/cachetools-3.1.1
+++ b/metadata/md5-cache/dev-python/cachetools-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cachetools/cachetools-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=49b837a029178ab7cef21b7fb1d04a45
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.8.0-r1 b/metadata/md5-cache/dev-python/cairocffi-0.8.0-r1
index e56a2a7fcec6..aa8b466eafd9 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/cairocffi-0.8.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41505618d11edfec23cb15c88994aa58
diff --git a/metadata/md5-cache/dev-python/cairocffi-0.9.0-r1 b/metadata/md5-cache/dev-python/cairocffi-0.9.0-r1
index 4dad9957973c..e38ee2d8a1cb 100644
--- a/metadata/md5-cache/dev-python/cairocffi-0.9.0-r1
+++ b/metadata/md5-cache/dev-python/cairocffi-0.9.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-0.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=e45cb88a7aad2dd4ba1f07a5757480fd
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.0.2-r1 b/metadata/md5-cache/dev-python/cairocffi-1.0.2-r1
index c47b699e660f..880dbc0a1579 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/cairocffi-1.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=11afaae644772d21b8b56becb457d3a1
diff --git a/metadata/md5-cache/dev-python/cairocffi-1.1.0 b/metadata/md5-cache/dev-python/cairocffi-1.1.0
index 7e4637e803b2..007b408405ba 100644
--- a/metadata/md5-cache/dev-python/cairocffi-1.1.0
+++ b/metadata/md5-cache/dev-python/cairocffi-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cairocffi/cairocffi-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=43585a0ee72d8941eec7de9346a438ed
diff --git a/metadata/md5-cache/dev-python/capturer-2.3 b/metadata/md5-cache/dev-python/capturer-2.3
index cf587a1ab964..40940cc31c57 100644
--- a/metadata/md5-cache/dev-python/capturer-2.3
+++ b/metadata/md5-cache/dev-python/capturer-2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/capturer/capturer-2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eaf46443c7e214fb03d1d2b64fd534ae
diff --git a/metadata/md5-cache/dev-python/capturer-2.4 b/metadata/md5-cache/dev-python/capturer-2.4
index c9d0113c0bfd..4366784d1871 100644
--- a/metadata/md5-cache/dev-python/capturer-2.4
+++ b/metadata/md5-cache/dev-python/capturer-2.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/humanfriendly[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/humanfriendly[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Easily capture stdout/stderr of the current process and subprocesses
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/capturer/capturer-2.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8115474341338063ec93bc10cb09472f
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 59427fe6eca5..813061ac78b9 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_python3_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-1.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45d77536d9b3c18e553a17841c897a15
diff --git a/metadata/md5-cache/dev-python/carbon-1.1.5 b/metadata/md5-cache/dev-python/carbon-1.1.5
index b93f9395c92e..1f5019651b31 100644
--- a/metadata/md5-cache/dev-python/carbon-1.1.5
+++ b/metadata/md5-cache/dev-python/carbon-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/carbon/carbon-1.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2438fe43b2cda924808553d4c78841d
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 ae097e0cd672..fd6cb212a5d3 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_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/case/case-1.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb763334f5dcd51735de187fd7f76e45
diff --git a/metadata/md5-cache/dev-python/case-1.5.3 b/metadata/md5-cache/dev-python/case-1.5.3
index 48a20fdaa9ce..4aa034bbebf4 100644
--- a/metadata/md5-cache/dev-python/case-1.5.3
+++ b/metadata/md5-cache/dev-python/case-1.5.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/nose-1.3.7[python_targets_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/case/case-1.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d88c25bd70b4eb515b28242fe6b64d3c
diff --git a/metadata/md5-cache/dev-python/castellan-1.2.2 b/metadata/md5-cache/dev-python/castellan-1.2.2
index da554402e550..6b706da15255 100644
--- a/metadata/md5-cache/dev-python/castellan-1.2.2
+++ b/metadata/md5-cache/dev-python/castellan-1.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/castellan/castellan-1.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3ab1d261e614c275baa3a0a2612a1d23
diff --git a/metadata/md5-cache/dev-python/casttube-0.2.0 b/metadata/md5-cache/dev-python/casttube-0.2.0
index 5bbb04d339eb..d18d3c73c3e5 100644
--- a/metadata/md5-cache/dev-python/casttube-0.2.0
+++ b/metadata/md5-cache/dev-python/casttube-0.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/casttube/casttube-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=924902403a977f122331173d29744d1c
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.12 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.12
index 2aee94ed47ec..6767946f7436 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.12
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.12.tar.gz -> catkin_pkg-0.4.12-gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=918ec4da4a1022316bb783f7e6f3de8d
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.13 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.13
index ef2ff972d399..e489b37c23bf 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.13
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.13
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.13.tar.gz -> catkin_pkg-0.4.13-gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=918ec4da4a1022316bb783f7e6f3de8d
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-0.4.15 b/metadata/md5-cache/dev-python/catkin_pkg-0.4.15
index e762b4e96b7b..d9aedd33b013 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-0.4.15
+++ b/metadata/md5-cache/dev-python/catkin_pkg-0.4.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/catkin_pkg/archive/0.4.15.tar.gz -> catkin_pkg-0.4.15-gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a993830affd2147ce7901ccd10de1be
diff --git a/metadata/md5-cache/dev-python/catkin_pkg-9999 b/metadata/md5-cache/dev-python/catkin_pkg-9999
index 966a72a9800f..12c06fb65e25 100644
--- a/metadata/md5-cache/dev-python/catkin_pkg-9999
+++ b/metadata/md5-cache/dev-python/catkin_pkg-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a993830affd2147ce7901ccd10de1be
diff --git a/metadata/md5-cache/dev-python/cbor-1.0.0 b/metadata/md5-cache/dev-python/cbor-1.0.0
index 1c5a85d4015e..598e60c933ff 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor/cbor-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b9c53dfc03a7233fca7acee90c8ca92
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 775ac7fad622..099e13a50fa9 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a1f5d3764149..6c08766f015b 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6b9fab5dbc18e4d5986396f17f8e947
diff --git a/metadata/md5-cache/dev-python/celery-4.3.0 b/metadata/md5-cache/dev-python/celery-4.3.0
index 9b202125b1e0..3f7ee57157fa 100644
--- a/metadata/md5-cache/dev-python/celery-4.3.0
+++ b/metadata/md5-cache/dev-python/celery-4.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/celery/celery/archive/v4.3.0.tar.gz -> celery-4.3.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=124d5f42d4fa05b8391d4d9083ecfba0
diff --git a/metadata/md5-cache/dev-python/certifi-2018.4.16 b/metadata/md5-cache/dev-python/certifi-2018.4.16
index 4288cb4b50a7..36467bc699ea 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_pypy3? ( >=dev-python/pypy3-5:0=
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2018.4.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a13d7be3a8dc686142982c8576ba5ac
diff --git a/metadata/md5-cache/dev-python/certifi-2019.11.28 b/metadata/md5-cache/dev-python/certifi-2019.11.28
index 6c749b48305d..955bc3026f67 100644
--- a/metadata/md5-cache/dev-python/certifi-2019.11.28
+++ b/metadata/md5-cache/dev-python/certifi-2019.11.28
@@ -11,5 +11,5 @@ RDEPEND=app-misc/ca-certificates python_targets_pypy3? ( >=dev-python/pypy3-5:0=
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2019.11.28.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=53821346498a09926418bf85f23fecf1
diff --git a/metadata/md5-cache/dev-python/certifi-2019.6.16 b/metadata/md5-cache/dev-python/certifi-2019.6.16
index 59774e085a31..0bdb73b00226 100644
--- a/metadata/md5-cache/dev-python/certifi-2019.6.16
+++ b/metadata/md5-cache/dev-python/certifi-2019.6.16
@@ -11,5 +11,5 @@ RDEPEND=app-misc/ca-certificates python_targets_pypy3? ( >=dev-python/pypy3-5:0=
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2019.6.16.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9c227e606f1e15d52f40d236e117d362
diff --git a/metadata/md5-cache/dev-python/certifi-2019.9.11 b/metadata/md5-cache/dev-python/certifi-2019.9.11
index e2d989499b39..6c03887754db 100644
--- a/metadata/md5-cache/dev-python/certifi-2019.9.11
+++ b/metadata/md5-cache/dev-python/certifi-2019.9.11
@@ -11,5 +11,5 @@ RDEPEND=app-misc/ca-certificates python_targets_pypy3? ( >=dev-python/pypy3-5:0=
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2019.9.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=53821346498a09926418bf85f23fecf1
diff --git a/metadata/md5-cache/dev-python/cffi-1.11.2 b/metadata/md5-cache/dev-python/cffi-1.11.2
index 9d81bffcff2d..4a07a8868ff9 100644
--- a/metadata/md5-cache/dev-python/cffi-1.11.2
+++ b/metadata/md5-cache/dev-python/cffi-1.11.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0/1.11.2
 SRC_URI=mirror://pypi/c/cffi/cffi-1.11.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1e8e3b096996b385d61e7eaf61300f9
diff --git a/metadata/md5-cache/dev-python/cffi-1.11.4 b/metadata/md5-cache/dev-python/cffi-1.11.4
index 7ac148799556..55185191a189 100644
--- a/metadata/md5-cache/dev-python/cffi-1.11.4
+++ b/metadata/md5-cache/dev-python/cffi-1.11.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0/1.11.4
 SRC_URI=mirror://pypi/c/cffi/cffi-1.11.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f163fc659d76580809dd2b6d524a10f6
diff --git a/metadata/md5-cache/dev-python/cffi-1.11.5 b/metadata/md5-cache/dev-python/cffi-1.11.5
index 2974703ccf33..a7ec539f48aa 100644
--- a/metadata/md5-cache/dev-python/cffi-1.11.5
+++ b/metadata/md5-cache/dev-python/cffi-1.11.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0/1.11.5
 SRC_URI=mirror://pypi/c/cffi/cffi-1.11.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f573f6be341878fc1cb3ad96ce23bcd2
diff --git a/metadata/md5-cache/dev-python/cffi-1.12.1 b/metadata/md5-cache/dev-python/cffi-1.12.1
index 6e722eb9d3ce..3befe8c4aa07 100644
--- a/metadata/md5-cache/dev-python/cffi-1.12.1
+++ b/metadata/md5-cache/dev-python/cffi-1.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0/1.12.1
 SRC_URI=mirror://pypi/c/cffi/cffi-1.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f573f6be341878fc1cb3ad96ce23bcd2
diff --git a/metadata/md5-cache/dev-python/cffi-1.12.3 b/metadata/md5-cache/dev-python/cffi-1.12.3
index a57ecba5316c..bf763fca956f 100644
--- a/metadata/md5-cache/dev-python/cffi-1.12.3
+++ b/metadata/md5-cache/dev-python/cffi-1.12.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0/1.12.3
 SRC_URI=mirror://pypi/c/cffi/cffi-1.12.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=56f4b0a1fa2ec3aebb08cc04acfdb1c9
diff --git a/metadata/md5-cache/dev-python/cffi-1.13.2 b/metadata/md5-cache/dev-python/cffi-1.13.2
index dd85e0ac9d80..a09bda6a3739 100644
--- a/metadata/md5-cache/dev-python/cffi-1.13.2
+++ b/metadata/md5-cache/dev-python/cffi-1.13.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0/1.13.2
 SRC_URI=mirror://pypi/c/cffi/cffi-1.13.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0f3e1b35b81b1fd4a38f644a31b1b124
diff --git a/metadata/md5-cache/dev-python/cffi-1.9.1 b/metadata/md5-cache/dev-python/cffi-1.9.1
index 28e3f1bd38a2..c5aa53f219fd 100644
--- a/metadata/md5-cache/dev-python/cffi-1.9.1
+++ b/metadata/md5-cache/dev-python/cffi-1.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0/1.9.1
 SRC_URI=mirror://pypi/c/cffi/cffi-1.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=595c088758bbfc30a9aa39d7ce971da1
diff --git a/metadata/md5-cache/dev-python/cfn-python-lint-0.21.6 b/metadata/md5-cache/dev-python/cfn-python-lint-0.21.6
index 0f07f20093c7..9c70d8dfde18 100644
--- a/metadata/md5-cache/dev-python/cfn-python-lint-0.21.6
+++ b/metadata/md5-cache/dev-python/cfn-python-lint-0.21.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/jsonpatch[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cfn-lint/cfn-lint-0.21.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=730fa2ed438a6c59682984f9a3fa7984
diff --git a/metadata/md5-cache/dev-python/cgroup-utils-0.6 b/metadata/md5-cache/dev-python/cgroup-utils-0.6
index 398a2dcf92dd..085a8f3249f2 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=104449b63417f932d2f53fccdc334eb7
diff --git a/metadata/md5-cache/dev-python/chai-1.1.1 b/metadata/md5-cache/dev-python/chai-1.1.1
index 72e11e6acb35..8d7c69b4b48a 100644
--- a/metadata/md5-cache/dev-python/chai-1.1.1
+++ b/metadata/md5-cache/dev-python/chai-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/chai/chai-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=557c82387c60f86ef09be01083f5fffc
diff --git a/metadata/md5-cache/dev-python/chameleon-2.25 b/metadata/md5-cache/dev-python/chameleon-2.25
index 5ff4fc30a57a..3bd5cb02c205 100644
--- a/metadata/md5-cache/dev-python/chameleon-2.25
+++ b/metadata/md5-cache/dev-python/chameleon-2.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Chameleon/Chameleon-2.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4da03fe31b7a1ae25c2981c58817de2
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 46f4d22ea3b6..4facfbc4752c 100644
--- a/metadata/md5-cache/dev-python/characteristic-14.3.0-r1
+++ b/metadata/md5-cache/dev-python/characteristic-14.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/characteristic/characteristic-14.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffc196e1997ddcf4f102be0a95c28d59
diff --git a/metadata/md5-cache/dev-python/characteristic-14.3.0-r2 b/metadata/md5-cache/dev-python/characteristic-14.3.0-r2
index 1898983a43d7..bcc3d6b527f7 100644
--- a/metadata/md5-cache/dev-python/characteristic-14.3.0-r2
+++ b/metadata/md5-cache/dev-python/characteristic-14.3.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/characteristic/characteristic-14.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ca1a088b7c6c175cf3ff215b68135003
diff --git a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3 b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
index 390320dcd44e..855f6d186005 100644
--- a/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
+++ b/metadata/md5-cache/dev-python/characteristic-14.3.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/characteristic/characteristic-14.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3bd0bdccd1e5ecc517ee10c215c5f4b8
diff --git a/metadata/md5-cache/dev-python/chardet-3.0.4 b/metadata/md5-cache/dev-python/chardet-3.0.4
index 557c728351f4..ec555b953b8e 100644
--- a/metadata/md5-cache/dev-python/chardet-3.0.4
+++ b/metadata/md5-cache/dev-python/chardet-3.0.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Universal encoding detector
 EAPI=6
 HOMEPAGE=https://github.com/chardet/chardet https://pypi.org/project/chardet/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18566617354b86fec1a6290c9e758e8d
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 2ddcd24fb9cd..f3ac76e99409 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a9f6fbf20b36241bc074e4dc43012d8
diff --git a/metadata/md5-cache/dev-python/cheetah3-3.2.3 b/metadata/md5-cache/dev-python/cheetah3-3.2.3
index 84b3dbac1c0d..8f95d83f90b1 100644
--- a/metadata/md5-cache/dev-python/cheetah3-3.2.3
+++ b/metadata/md5-cache/dev-python/cheetah3-3.2.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheetah3/Cheetah3-3.2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f2ac5a5ace92c278dc6c6c95382e46c
diff --git a/metadata/md5-cache/dev-python/cheroot-6.0.0 b/metadata/md5-cache/dev-python/cheroot-6.0.0
deleted file mode 100644
index 7f71dcf2a044..000000000000
--- a/metadata/md5-cache/dev-python/cheroot-6.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] <dev-python/setuptools-41.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
-EAPI=6
-HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
-IUSE=test python_targets_pypy3 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cheroot/cheroot-6.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b5bbe7159eabfd8f6e41c644f0a2c893
diff --git a/metadata/md5-cache/dev-python/cheroot-6.0.0-r1 b/metadata/md5-cache/dev-python/cheroot-6.0.0-r1
deleted file mode 100644
index b42cbbc7851e..000000000000
--- a/metadata/md5-cache/dev-python/cheroot-6.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/setuptools-41.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
-EAPI=7
-HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cheroot/cheroot-6.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dd904a122888404f1c7f32a48e492828
diff --git a/metadata/md5-cache/dev-python/cheroot-6.5.4 b/metadata/md5-cache/dev-python/cheroot-6.5.4
deleted file mode 100644
index 12fbd0cda3aa..000000000000
--- a/metadata/md5-cache/dev-python/cheroot-6.5.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/setuptools-41.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
-EAPI=7
-HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
-IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64
-LICENSE=BSD
-RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/C/Cheroot/cheroot-6.5.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=074ba972eba1fe9f4f6deb3393762dd7
diff --git a/metadata/md5-cache/dev-python/cheroot-8.2.1 b/metadata/md5-cache/dev-python/cheroot-8.2.1
index c7110006c892..1a9ef5043446 100644
--- a/metadata/md5-cache/dev-python/cheroot-8.2.1
+++ b/metadata/md5-cache/dev-python/cheroot-8.2.1
@@ -1,16 +1,16 @@
 BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by CherryPy.
 EAPI=7
 HOMEPAGE=https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/more-itertools-2.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-8.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c68ac8f09e28b7ccb5696673e4566ae
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=360fb4e8a8284765dc5f8c0fe2a3b5cb
diff --git a/metadata/md5-cache/dev-python/cherrypy-13.1.0 b/metadata/md5-cache/dev-python/cherrypy-13.1.0
index 7480d3969b4e..1856d717deae 100644
--- a/metadata/md5-cache/dev-python/cherrypy-13.1.0
+++ b/metadata/md5-cache/dev-python/cherrypy-13.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-13.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11d21ec9a6540c9a7375df1a09eca95d
diff --git a/metadata/md5-cache/dev-python/cherrypy-13.1.0-r1 b/metadata/md5-cache/dev-python/cherrypy-13.1.0-r1
index eb03a937fbad..aab860790102 100644
--- a/metadata/md5-cache/dev-python/cherrypy-13.1.0-r1
+++ b/metadata/md5-cache/dev-python/cherrypy-13.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-13.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c9eb8241bbe4e3316c9e75e73bc10d6
diff --git a/metadata/md5-cache/dev-python/cherrypy-17.4.1-r1 b/metadata/md5-cache/dev-python/cherrypy-17.4.1-r1
index d391260e5b58..4488639d31a9 100644
--- a/metadata/md5-cache/dev-python/cherrypy-17.4.1-r1
+++ b/metadata/md5-cache/dev-python/cherrypy-17.4.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-17.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5b38a9f958d3f06efa9ebc2d72d2c8ad
diff --git a/metadata/md5-cache/dev-python/cherrypy-18.1.0-r1 b/metadata/md5-cache/dev-python/cherrypy-18.1.0-r1
index e5de262e4a30..5ab0a7b2f4be 100644
--- a/metadata/md5-cache/dev-python/cherrypy-18.1.0-r1
+++ b/metadata/md5-cache/dev-python/cherrypy-18.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-18.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a483c4aa68ecb7a4689321367eb7b8bc
diff --git a/metadata/md5-cache/dev-python/cherrypy-3.8.0 b/metadata/md5-cache/dev-python/cherrypy-3.8.0
index 9c1069b7c2e8..4daf57de4eda 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_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CherryPy/CherryPy-3.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76ad620f65e72be6d7a08df8ab084de6
diff --git a/metadata/md5-cache/dev-python/chump-1.5.2 b/metadata/md5-cache/dev-python/chump-1.5.2
index ca475cf24b76..a2416349bded 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/karanlyons/chump/archive/0cd59e14267858ab6623d7aa42badc6caa9b8edf.tar.gz -> chump-1.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf135646ce0d93443b7b7064c6b41829
diff --git a/metadata/md5-cache/dev-python/chump-1.6.0 b/metadata/md5-cache/dev-python/chump-1.6.0
index 67ae1459edba..f6814e2fc722 100644
--- a/metadata/md5-cache/dev-python/chump-1.6.0
+++ b/metadata/md5-cache/dev-python/chump-1.6.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/chump/chump-1.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=19b3fe23e24d70beb33e9bb07abb4016
diff --git a/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1 b/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
index ff6d61531d3d..f0cf6d871353 100644
--- a/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/citeproc-py-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rnc2rng[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/citeproc-py/citeproc-py-0.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0fc92c087f0a81e7268f33bac11c6d4b
diff --git a/metadata/md5-cache/dev-python/cjkwrap-2.2 b/metadata/md5-cache/dev-python/cjkwrap-2.2
index 7613f763312b..6bb6e5a9fd2e 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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/fgallaire/cjkwrap/archive/v2.2.tar.gz -> cjkwrap-2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3cff1bce28cdddaa3b41dd6ce2e78aea
diff --git a/metadata/md5-cache/dev-python/cli_helpers-1.2.1 b/metadata/md5-cache/dev-python/cli_helpers-1.2.1
index f6a7cfc4c0cd..28e6f8133898 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-1.2.1
+++ b/metadata/md5-cache/dev-python/cli_helpers-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/cli_helpers/archive/v1.2.1.tar.gz -> cli_helpers-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=576824fa9eb78ab3a71a09d35c372e5b
diff --git a/metadata/md5-cache/dev-python/cli_helpers-9999 b/metadata/md5-cache/dev-python/cli_helpers-9999
index 1616332a34a7..c0a5c8db4d58 100644
--- a/metadata/md5-cache/dev-python/cli_helpers-9999
+++ b/metadata/md5-cache/dev-python/cli_helpers-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/configobj-5.0.5[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=19347e87bbe52b3497d982fcba13a115
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20170823 b/metadata/md5-cache/dev-python/cliapp-1.20170823
index 73a8d8b46d84..c95be03450cb 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_6(
 REQUIRED_USE=|| ( python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84a2b255e63868d2419ff2287f027dff
diff --git a/metadata/md5-cache/dev-python/cliapp-1.20180812.1 b/metadata/md5-cache/dev-python/cliapp-1.20180812.1
index f0e7bb0e8729..99d4898a5617 100644
--- a/metadata/md5-cache/dev-python/cliapp-1.20180812.1
+++ b/metadata/md5-cache/dev-python/cliapp-1.20180812.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cliapp/snapshot/cliapp-1.20180812.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4af27101a4affa5967252e5d41d248a
diff --git a/metadata/md5-cache/dev-python/click-5.1 b/metadata/md5-cache/dev-python/click-5.1
index aa396c88f6d7..39fbf62d30d4 100644
--- a/metadata/md5-cache/dev-python/click-5.1
+++ b/metadata/md5-cache/dev-python/click-5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b08c2c607f983ee2a746b34ec2b14bc6
diff --git a/metadata/md5-cache/dev-python/click-6.6 b/metadata/md5-cache/dev-python/click-6.6
index 4cce4ab283f3..dddeb50dd29b 100644
--- a/metadata/md5-cache/dev-python/click-6.6
+++ b/metadata/md5-cache/dev-python/click-6.6
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88440dab98dc39403b959bcfc500e649
diff --git a/metadata/md5-cache/dev-python/click-6.7 b/metadata/md5-cache/dev-python/click-6.7
index dac0d6cdd3c4..30af186a9a56 100644
--- a/metadata/md5-cache/dev-python/click-6.7
+++ b/metadata/md5-cache/dev-python/click-6.7
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47a8ce2a353a393ce0e1da15fee2b939
diff --git a/metadata/md5-cache/dev-python/click-6.7-r1 b/metadata/md5-cache/dev-python/click-6.7-r1
index 2adc10bf4515..3bdf1dcd7893 100644
--- a/metadata/md5-cache/dev-python/click-6.7-r1
+++ b/metadata/md5-cache/dev-python/click-6.7-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click/click-6.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ba99ed0e8383b3772b244f5c7fd4a387
diff --git a/metadata/md5-cache/dev-python/click-7.0 b/metadata/md5-cache/dev-python/click-7.0
index c7eb6fe106ed..ef9f2944c385 100644
--- a/metadata/md5-cache/dev-python/click-7.0
+++ b/metadata/md5-cache/dev-python/click-7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.0.tar.gz -> click-7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=98be7ddf41f7a41420ecd8653f32d3b6
diff --git a/metadata/md5-cache/dev-python/click-7.0-r1 b/metadata/md5-cache/dev-python/click-7.0-r1
index d7925a103e7d..3e7fdd632b81 100644
--- a/metadata/md5-cache/dev-python/click-7.0-r1
+++ b/metadata/md5-cache/dev-python/click-7.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/click/archive/7.0.tar.gz -> click-7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f2f10a3f6d4e1bc58bde774357bed27e
diff --git a/metadata/md5-cache/dev-python/click-default-group-1.2.2 b/metadata/md5-cache/dev-python/click-default-group-1.2.2
index 812e6003391e..acfe057e64d2 100644
--- a/metadata/md5-cache/dev-python/click-default-group-1.2.2
+++ b/metadata/md5-cache/dev-python/click-default-group-1.2.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/click[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/click[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extends click. Group to invoke a command without explicit subcommand name
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/click-contrib/click-default-group/archive/v1.2.2.tar.gz -> click-default-group-1.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=600cf6adf58f361ba491b055eea05334
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 933f25e25876..b5383b3936ab 100644
--- a/metadata/md5-cache/dev-python/click-log-0.1.8
+++ b/metadata/md5-cache/dev-python/click-log-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Logging integration for Click.
 EAPI=6
 HOMEPAGE=https://github.com/click-contrib/click-log https://pypi.org/project/click-log/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=651fec3c2f0ba1e27673dd5216a4bbbb
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 022904edd941..cb2bdf23d0a4 100644
--- a/metadata/md5-cache/dev-python/click-log-0.2.1
+++ b/metadata/md5-cache/dev-python/click-log-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Logging integration for Click.
 EAPI=6
 HOMEPAGE=https://github.com/click-contrib/click-log https://pypi.org/project/click-log/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=651fec3c2f0ba1e27673dd5216a4bbbb
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 c17131d89027..1ddf78de9952 100644
--- a/metadata/md5-cache/dev-python/click-log-0.3.2
+++ b/metadata/md5-cache/dev-python/click-log-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Logging integration for Click.
 EAPI=6
 HOMEPAGE=https://github.com/click-contrib/click-log https://pypi.org/project/click-log/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-log/click-log-0.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43d8cd8b707b12cc47fcd22cfa51ddbf
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 dd042f552b4d..f2da23bd827a 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/click-plugins/click-plugins-1.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9854a2af0f31fe79bcfbe8e747ea628b
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 4d01046664b5..9e351ea5e91f 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.3.0
+++ b/metadata/md5-cache/dev-python/click-threading-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Multithreaded Click apps made easy.
 EAPI=6
 HOMEPAGE=https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f95774fe36d3adb69aaf506e5119bfa9
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 43ebc1f310fb..b9b93f15e98e 100644
--- a/metadata/md5-cache/dev-python/click-threading-0.4.4
+++ b/metadata/md5-cache/dev-python/click-threading-0.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Multithreaded Click apps made easy.
 EAPI=6
 HOMEPAGE=https://github.com/click-contrib/click-threading https://pypi.org/project/click-threading/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1fb380b8879ad21d8bdbff88a9dc9a4
diff --git a/metadata/md5-cache/dev-python/cliff-2.12.0 b/metadata/md5-cache/dev-python/cliff-2.12.0
index ec338adabc7c..dda33b81e894 100644
--- a/metadata/md5-cache/dev-python/cliff-2.12.0
+++ b/metadata/md5-cache/dev-python/cliff-2.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-2.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c39e761ec5000b0c598b68612c80db10
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 93f7c85a225a..bb4d21e325d3 100644
--- a/metadata/md5-cache/dev-python/cliff-2.12.0-r2
+++ b/metadata/md5-cache/dev-python/cliff-2.12.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-2.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8527c59859cd80a0613f8682fcce146f
diff --git a/metadata/md5-cache/dev-python/cliff-2.18.0 b/metadata/md5-cache/dev-python/cliff-2.18.0
index 72aebd142403..6f201e3061e2 100644
--- a/metadata/md5-cache/dev-python/cliff-2.18.0
+++ b/metadata/md5-cache/dev-python/cliff-2.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-2.18.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=5d7857b14d62cb51f17449c8eb86fc2f
diff --git a/metadata/md5-cache/dev-python/cliff-tablib-1.1-r2 b/metadata/md5-cache/dev-python/cliff-tablib-1.1-r2
index 614657a6ff55..e7aa12040a58 100644
--- a/metadata/md5-cache/dev-python/cliff-tablib-1.1-r2
+++ b/metadata/md5-cache/dev-python/cliff-tablib-1.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/tablib[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff-tablib/cliff-tablib-1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0e564c27e899a38bcfe1c9f4d1da4aa1
diff --git a/metadata/md5-cache/dev-python/cligj-0.4.0 b/metadata/md5-cache/dev-python/cligj-0.4.0
index 5cad67bbd31d..08b81e723060 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cligj/cligj-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39fcb3daeb6d41366b05f716b20efc67
diff --git a/metadata/md5-cache/dev-python/clint-0.5.1 b/metadata/md5-cache/dev-python/clint-0.5.1
index 13bae839c337..aef5b8961ef6 100644
--- a/metadata/md5-cache/dev-python/clint-0.5.1
+++ b/metadata/md5-cache/dev-python/clint-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kennethreitz/clint/archive/v0.5.1.tar.gz -> clint-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6991f574cc4cdecd4202211484223dac
diff --git a/metadata/md5-cache/dev-python/clint-0.5.1-r1 b/metadata/md5-cache/dev-python/clint-0.5.1-r1
index 34fc6af05b2c..23a7133737be 100644
--- a/metadata/md5-cache/dev-python/clint-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/clint-0.5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kennethreitz/clint/archive/v0.5.1.tar.gz -> clint-0.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fdbd252a4b7005529da155ea743c8929
diff --git a/metadata/md5-cache/dev-python/cloudlib-0.5.0 b/metadata/md5-cache/dev-python/cloudlib-0.5.0
index 2bebd3156be4..4b4f4cb50685 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_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudlib/cloudlib-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=caca8038e674367c7def40893e750ad9
diff --git a/metadata/md5-cache/dev-python/cloudpickle-0.3.1 b/metadata/md5-cache/dev-python/cloudpickle-0.3.1
index 3a0ce2967725..1cd6c0772484 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-0.3.1
+++ b/metadata/md5-cache/dev-python/cloudpickle-0.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-0.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ff9d16f9f6864224d217c8fcd0bee82b
diff --git a/metadata/md5-cache/dev-python/cloudpickle-1.2.1 b/metadata/md5-cache/dev-python/cloudpickle-1.2.1
index 92b2233eab6d..ef87a184f0c2 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-1.2.1
+++ b/metadata/md5-cache/dev-python/cloudpickle-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f8d689110a7bfe35407764dc6c2a3752
diff --git a/metadata/md5-cache/dev-python/cloudpickle-1.2.2 b/metadata/md5-cache/dev-python/cloudpickle-1.2.2
index b902d5e22d3b..47408fb91d73 100644
--- a/metadata/md5-cache/dev-python/cloudpickle-1.2.2
+++ b/metadata/md5-cache/dev-python/cloudpickle-1.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-1.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7ddac60e2d8480037798091e07d523cc
diff --git a/metadata/md5-cache/dev-python/cloudpickle-1.3.0 b/metadata/md5-cache/dev-python/cloudpickle-1.3.0
new file mode 100644
index 000000000000..fae5b30f43a8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cloudpickle-1.3.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Extended pickling support for Python objects
+EAPI=7
+HOMEPAGE=https://pypi.org/project/cloudpickle/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/c/cloudpickle/cloudpickle-1.3.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9944062ba46362789388e8600c817ce7
diff --git a/metadata/md5-cache/dev-python/cmd2-0.7.9 b/metadata/md5-cache/dev-python/cmd2-0.7.9
index dbb21d009d30..ce341317bacf 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_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-0.7.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d873160eb3924e0deaa5a65f974cf02c
diff --git a/metadata/md5-cache/dev-python/cmd2-0.8.9 b/metadata/md5-cache/dev-python/cmd2-0.8.9
index 0f9079f23c89..86046ec3ad57 100644
--- a/metadata/md5-cache/dev-python/cmd2-0.8.9
+++ b/metadata/md5-cache/dev-python/cmd2-0.8.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-0.8.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8b06ee3f1bd4364888dc92c42aa323ea
diff --git a/metadata/md5-cache/dev-python/cmd2-0.9.22 b/metadata/md5-cache/dev-python/cmd2-0.9.22
index 84546fafc01c..135d197d03fc 100644
--- a/metadata/md5-cache/dev-python/cmd2-0.9.22
+++ b/metadata/md5-cache/dev-python/cmd2-0.9.22
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-0.9.22.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=4ae5148892e5997acb4058c218df6f42
diff --git a/metadata/md5-cache/dev-python/cmd2-0.9.23 b/metadata/md5-cache/dev-python/cmd2-0.9.23
index 980783561a53..90a3edacf6fd 100644
--- a/metadata/md5-cache/dev-python/cmd2-0.9.23
+++ b/metadata/md5-cache/dev-python/cmd2-0.9.23
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extra features for standard library's cmd module
 EAPI=7
 HOMEPAGE=https://github.com/python-cmd2/cmd2
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-0.9.23.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=19cc605c9c6b9e2090e05b335f232ea3
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=5eaa32b3b9200a5a221e8afce6a67d9b
diff --git a/metadata/md5-cache/dev-python/cmd2-0.9.24 b/metadata/md5-cache/dev-python/cmd2-0.9.24
deleted file mode 100644
index 1d686772c971..000000000000
--- a/metadata/md5-cache/dev-python/cmd2-0.9.24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extra features for standard library's cmd module
-EAPI=7
-HOMEPAGE=https://github.com/python-cmd2/cmd2
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cmd2/cmd2-0.9.24.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=ff3fd0fb677b3b3bea86d0b2fcb560e3
diff --git a/metadata/md5-cache/dev-python/cmd2-0.9.25 b/metadata/md5-cache/dev-python/cmd2-0.9.25
index 29d57ea8690a..7baf7e63b5df 100644
--- a/metadata/md5-cache/dev-python/cmd2-0.9.25
+++ b/metadata/md5-cache/dev-python/cmd2-0.9.25
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extra features for standard library's cmd module
 EAPI=7
 HOMEPAGE=https://github.com/python-cmd2/cmd2
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/colorama-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyperclip-1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-0.9.25.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f846a3722664e316cb6df73c52ceb06a
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=faecfeaeb9cbc98dbaa318519f47e530
diff --git a/metadata/md5-cache/dev-python/colander-1.3.1 b/metadata/md5-cache/dev-python/colander-1.3.1
index 768e1621a551..f8ccdc374ec2 100644
--- a/metadata/md5-cache/dev-python/colander-1.3.1
+++ b/metadata/md5-cache/dev-python/colander-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colander/colander-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec6b49823bc0f99fde02213a31c5e6ba
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 ad4867033a78..4c252b3df4bd 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 d6491e31a581..776403c53bdb 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/collective.checkdocs/collective.checkdocs-0.2.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb84bc888eeeaa7c1679f26ff2f4eb99
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.3 b/metadata/md5-cache/dev-python/colorama-0.3.3
index 7ff9790c6b58..002f7f92d771 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af1695e006ad4b6740100272894b4e1d
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.9 b/metadata/md5-cache/dev-python/colorama-0.3.9
index b74ec05aa385..e34991a0b6e0 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorama/colorama-0.3.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2093e9c2c0ea4b452af14c81ffc3cad
diff --git a/metadata/md5-cache/dev-python/colorama-0.3.9-r1 b/metadata/md5-cache/dev-python/colorama-0.3.9-r1
index 72455349ebda..2bb54c6c8a9a 100644
--- a/metadata/md5-cache/dev-python/colorama-0.3.9-r1
+++ b/metadata/md5-cache/dev-python/colorama-0.3.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.3.9.tar.gz -> colorama-0.3.9.github.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=025f3a585ad8d0251f595109d1fdf731
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.0 b/metadata/md5-cache/dev-python/colorama-0.4.0
index a2dda8b1c722..65d68bf67510 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.0
+++ b/metadata/md5-cache/dev-python/colorama-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.4.0.tar.gz -> colorama-0.4.0.github.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=025f3a585ad8d0251f595109d1fdf731
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.1 b/metadata/md5-cache/dev-python/colorama-0.4.1
index 3251a8eedad4..d60d0214e22f 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.1
+++ b/metadata/md5-cache/dev-python/colorama-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.4.1.tar.gz -> colorama-0.4.1.github.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5f10cf901b4a8ac93ccd4a7bd70f9fa3
diff --git a/metadata/md5-cache/dev-python/colorama-0.4.3 b/metadata/md5-cache/dev-python/colorama-0.4.3
index d9d3f4ee42d1..693ed04ce470 100644
--- a/metadata/md5-cache/dev-python/colorama-0.4.3
+++ b/metadata/md5-cache/dev-python/colorama-0.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tartley/colorama/archive/0.4.3.tar.gz -> colorama-0.4.3.github.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8adce81ed43607de9edb3d51efd5e722
diff --git a/metadata/md5-cache/dev-python/colorclass-2.2.0 b/metadata/md5-cache/dev-python/colorclass-2.2.0
index 5dfbb55324eb..a074541f3edf 100644
--- a/metadata/md5-cache/dev-python/colorclass-2.2.0
+++ b/metadata/md5-cache/dev-python/colorclass-2.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Robpol86/colorclass/archive/v2.2.0.tar.gz -> colorclass-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2ca32c70448a4de7428e7ef35e31c877
diff --git a/metadata/md5-cache/dev-python/colorclass-2.2.0-r1 b/metadata/md5-cache/dev-python/colorclass-2.2.0-r1
index 4e118f5280ec..c3600a15c99e 100644
--- a/metadata/md5-cache/dev-python/colorclass-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/colorclass-2.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Robpol86/colorclass/archive/v2.2.0.tar.gz -> colorclass-2.2.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a63953f48ec0775dd15837e1503b8c00
diff --git a/metadata/md5-cache/dev-python/coloredlogs-10.0 b/metadata/md5-cache/dev-python/coloredlogs-10.0
index 8ea779e03b89..673e4dbfd848 100644
--- a/metadata/md5-cache/dev-python/coloredlogs-10.0
+++ b/metadata/md5-cache/dev-python/coloredlogs-10.0
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/humanfriendly[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/humanfriendly[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/capturer[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/verboselogs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Colored stream handler for the logging module
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=55db312e03671df447c9cfc2939b61e9
diff --git a/metadata/md5-cache/dev-python/coloredlogs-6.1 b/metadata/md5-cache/dev-python/coloredlogs-6.1
index 80dc864b2102..8319fc1f5ce1 100644
--- a/metadata/md5-cache/dev-python/coloredlogs-6.1
+++ b/metadata/md5-cache/dev-python/coloredlogs-6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coloredlogs/coloredlogs-6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c97dcd0f83262db2c4e543d3ac65b116
diff --git a/metadata/md5-cache/dev-python/colorful-0.4.1 b/metadata/md5-cache/dev-python/colorful-0.4.1
index 58f2b9d71ed0..cabe44d2e5f2 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorful/colorful-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=219600e8b7d59466fc342d04bf858142
diff --git a/metadata/md5-cache/dev-python/colorlog-2.7.0 b/metadata/md5-cache/dev-python/colorlog-2.7.0
index 0a0ce63b6c1a..577534c73045 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/colorlog/colorlog-2.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bbbe12ae1ef0d6bfab7e0542d5c25f8
diff --git a/metadata/md5-cache/dev-python/colorlog-3.1.4 b/metadata/md5-cache/dev-python/colorlog-3.1.4
index 1b72b22ff4f4..8c028bbea32d 100644
--- a/metadata/md5-cache/dev-python/colorlog-3.1.4
+++ b/metadata/md5-cache/dev-python/colorlog-3.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorlog/colorlog-3.1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=270157efe7f7b0f49e7d548708baf579
diff --git a/metadata/md5-cache/dev-python/colorspacious-1.1.0 b/metadata/md5-cache/dev-python/colorspacious-1.1.0
index ba3d1eeb107e..e766c319cc93 100644
--- a/metadata/md5-cache/dev-python/colorspacious-1.1.0
+++ b/metadata/md5-cache/dev-python/colorspacious-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/colorspacious/colorspacious-1.1.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=391bfb75a2f0614521fae6f59b2daa4a
diff --git a/metadata/md5-cache/dev-python/columnize-0.3.9 b/metadata/md5-cache/dev-python/columnize-0.3.9
index 03802cf2c53e..dc871f4e5441 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=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/columnize/columnize-0.3.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=570a61e23d7251ca03f11c9b111bc1bd
diff --git a/metadata/md5-cache/dev-python/common-0.1.2 b/metadata/md5-cache/dev-python/common-0.1.2
index c3908aa0968c..57eb013668d9 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_python3_6 )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=mirror://pypi/c/common/common-0.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=901c8bbb56acc5d8619478a197203447
diff --git a/metadata/md5-cache/dev-python/commonmark-0.5.4 b/metadata/md5-cache/dev-python/commonmark-0.5.4
index 59df1e619057..f58efcb4180a 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CommonMark/CommonMark-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3f8d9f10ca2d8da3408dd73adb58e52
diff --git a/metadata/md5-cache/dev-python/commonmark-0.7.5 b/metadata/md5-cache/dev-python/commonmark-0.7.5
index fae5746dce25..8e0ea9b5c5fc 100644
--- a/metadata/md5-cache/dev-python/commonmark-0.7.5
+++ b/metadata/md5-cache/dev-python/commonmark-0.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/CommonMark/CommonMark-0.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4fecc19096ca17cb0036f58baa7de2d
diff --git a/metadata/md5-cache/dev-python/commonmark-0.8.1 b/metadata/md5-cache/dev-python/commonmark-0.8.1
index edd3fac05c55..2c09856ad055 100644
--- a/metadata/md5-cache/dev-python/commonmark-0.8.1
+++ b/metadata/md5-cache/dev-python/commonmark-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/commonmark/commonmark-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef25d1904d0b179c1bf5d95386d7904c
diff --git a/metadata/md5-cache/dev-python/configargparse-0.13.0 b/metadata/md5-cache/dev-python/configargparse-0.13.0
index e5b36d8e8043..9b3224331f29 100644
--- a/metadata/md5-cache/dev-python/configargparse-0.13.0
+++ b/metadata/md5-cache/dev-python/configargparse-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/ConfigArgParse/ConfigArgParse-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5a4bb5abd39fb982fb97acf3fa8bed5f
diff --git a/metadata/md5-cache/dev-python/configargparse-1.0 b/metadata/md5-cache/dev-python/configargparse-1.0
index 9761c3d2707c..8cd4d2f8ed65 100644
--- a/metadata/md5-cache/dev-python/configargparse-1.0
+++ b/metadata/md5-cache/dev-python/configargparse-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bw2/ConfigArgParse/archive/1.0.tar.gz -> ConfigArgParse-1.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=10b28212ca099bcf42628ad6ba8e3035
diff --git a/metadata/md5-cache/dev-python/configclass-0.1.0 b/metadata/md5-cache/dev-python/configclass-0.1.0
index 439504b00cb4..6a02f9b70d74 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_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configclass/configclass-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=732bbded5c2c63ef8dd923e08b43349c
diff --git a/metadata/md5-cache/dev-python/configobj-5.0.6 b/metadata/md5-cache/dev-python/configobj-5.0.6
index c6c2bc782de2..559d8e18ca57 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_python2_7(-)?,python_targets_python3_6(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configobj/configobj-5.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=faf9b4218b488219f65d79fd0ea0b47c
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 c609bb13a3ba..7e43cf0ccb1b 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_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/configparser/configparser-3.3.0r2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0cf7d4fa3c66fc6d17671849362a690a
diff --git a/metadata/md5-cache/dev-python/configparser-3.5.0 b/metadata/md5-cache/dev-python/configparser-3.5.0
index bb3524ee50f4..2de217690ee2 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_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/configparser/configparser-3.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=436179827743e5c10e492643c2d17ecb
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 17cd15225fd6..da4b7e237287 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_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configparser/configparser-3.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5a08a70d962c108c9d4eeff69dd7867
diff --git a/metadata/md5-cache/dev-python/configshell-1.6 b/metadata/md5-cache/dev-python/configshell-1.6
index 44fe17f57455..8f164598b905 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=561d9438e1caaff3fc7233545e90d4ed
diff --git a/metadata/md5-cache/dev-python/configshell-9999 b/metadata/md5-cache/dev-python/configshell-9999
index 70089a544a2e..50dd7ecf6f0a 100644
--- a/metadata/md5-cache/dev-python/configshell-9999
+++ b/metadata/md5-cache/dev-python/configshell-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 da4b5f2ee0d8..d03d92848d51 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configshell-fb/configshell-fb-1.1.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7f8a0fb7f7eadbcdecfe5c74df3183e
diff --git a/metadata/md5-cache/dev-python/configshell-fb-1.1.25 b/metadata/md5-cache/dev-python/configshell-fb-1.1.25
index 1bb81cac2580..dc119ad4bda0 100644
--- a/metadata/md5-cache/dev-python/configshell-fb-1.1.25
+++ b/metadata/md5-cache/dev-python/configshell-fb-1.1.25
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyparsing[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/configshell-fb/configshell-fb-1.1.25.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0cd2c84f678b64d0ffcb1a905d32b2e2
diff --git a/metadata/md5-cache/dev-python/confuse-1.0.0 b/metadata/md5-cache/dev-python/confuse-1.0.0
index ca94ad8616fb..5f6f92b5aff9 100644
--- a/metadata/md5-cache/dev-python/confuse-1.0.0
+++ b/metadata/md5-cache/dev-python/confuse-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/confuse/archive/v1.0.0.tar.gz -> confuse-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1dd9a26f6d771464328c657e6bfbd19b
diff --git a/metadata/md5-cache/dev-python/consonance-0.1.3 b/metadata/md5-cache/dev-python/consonance-0.1.3
index 268b1e8670c6..76a264bf3978 100644
--- a/metadata/md5-cache/dev-python/consonance-0.1.3
+++ b/metadata/md5-cache/dev-python/consonance-0.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tgalal/consonance/archive/0.1.3.tar.gz -> consonance-0.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a59f7de9d4fa4a42459befa08457585
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 e90ded578730..f15c590dd451 100644
--- a/metadata/md5-cache/dev-python/constantly-15.1.0-r1
+++ b/metadata/md5-cache/dev-python/constantly-15.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8d05db984939eb18cb176c330081b3cc
diff --git a/metadata/md5-cache/dev-python/construct-2.8.21 b/metadata/md5-cache/dev-python/construct-2.8.21
index 4d47c2d1d1df..20b27ee13e54 100644
--- a/metadata/md5-cache/dev-python/construct-2.8.21
+++ b/metadata/md5-cache/dev-python/construct-2.8.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.8.21.tar.gz -> construct-2.8.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd6b20cb999473e3e32963724b95ff72
diff --git a/metadata/md5-cache/dev-python/construct-2.9.45 b/metadata/md5-cache/dev-python/construct-2.9.45
index 86a327cecd52..98383b186830 100644
--- a/metadata/md5-cache/dev-python/construct-2.9.45
+++ b/metadata/md5-cache/dev-python/construct-2.9.45
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/construct/construct/archive/v2.9.45.tar.gz -> construct-2.9.45.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a69f5ba00f306ed6afd7074fc3484dc6
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.4 b/metadata/md5-cache/dev-python/contextlib2-0.5.4
index 8ff472ecf0bc..7fc0ae64ecb3 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.4
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4755cf43c9ed66eacdcac287b191e9c9
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.5.5 b/metadata/md5-cache/dev-python/contextlib2-0.5.5
index 493206d8cb14..8a267e541f3f 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.5.5
+++ b/metadata/md5-cache/dev-python/contextlib2-0.5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.5.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f62efd9eb04586706aa4b01047d47b09
diff --git a/metadata/md5-cache/dev-python/contextlib2-0.6.0 b/metadata/md5-cache/dev-python/contextlib2-0.6.0
index b016f21d8565..5525e9d1a8d7 100644
--- a/metadata/md5-cache/dev-python/contextlib2-0.6.0
+++ b/metadata/md5-cache/dev-python/contextlib2-0.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/contextlib2/contextlib2-0.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0f58f1544f2e73e230795e4e407fb7ab
diff --git a/metadata/md5-cache/dev-python/contextvars-2.4 b/metadata/md5-cache/dev-python/contextvars-2.4
index c4e564cb4800..2bb93b564831 100644
--- a/metadata/md5-cache/dev-python/contextvars-2.4
+++ b/metadata/md5-cache/dev-python/contextvars-2.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/immutables[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=test? ( dev-python/immutables[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Backport of Python 3.7 contextvars module (PEP 567) for Python 3.6
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/contextvars/archive/v2.4.tar.gz -> contextvars-2.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dd78d28ce891516f33026ad311888e1e
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1 b/metadata/md5-cache/dev-python/cookies-2.2.1
index 37883bba62d0..a0d3f2267e18 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cookies/cookies-2.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8b23d2da8a0cda57369cb9d0600892ab
diff --git a/metadata/md5-cache/dev-python/cookies-2.2.1-r1 b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
index 363545be1ac5..df517b9b0a23 100644
--- a/metadata/md5-cache/dev-python/cookies-2.2.1-r1
+++ b/metadata/md5-cache/dev-python/cookies-2.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cookies/cookies-2.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7bf53ade11e54921e1b142ec2b809e0c
diff --git a/metadata/md5-cache/dev-python/coreapi-2.3.3 b/metadata/md5-cache/dev-python/coreapi-2.3.3
index ec52d72e7e6e..500ec00bb3ac 100644
--- a/metadata/md5-cache/dev-python/coreapi-2.3.3
+++ b/metadata/md5-cache/dev-python/coreapi-2.3.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/coreschema[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coreapi/coreapi-2.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5db210b1c335beb9681d9e577ac7890e
diff --git a/metadata/md5-cache/dev-python/coreapi-2.3.3-r1 b/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
index b073b3b18cb7..d432cdabf9d6 100644
--- a/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
+++ b/metadata/md5-cache/dev-python/coreapi-2.3.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/coreschema[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coreapi/coreapi-2.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a0178d031de72b949cfb41e287e9aa14
diff --git a/metadata/md5-cache/dev-python/coreschema-0.0.4 b/metadata/md5-cache/dev-python/coreschema-0.0.4
index 16500aaf0078..5a2d17e48273 100644
--- a/metadata/md5-cache/dev-python/coreschema-0.0.4
+++ b/metadata/md5-cache/dev-python/coreschema-0.0.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/coreschema/coreschema-0.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5bf7b7c6e4b484429c2e482e3ba968f4
diff --git a/metadata/md5-cache/dev-python/corner-2.0.1 b/metadata/md5-cache/dev-python/corner-2.0.1
index 720a263ff197..73dd9ce66b27 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/corner/corner-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d7fd486b36d653a17e3a7e6e3cee38a
diff --git a/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r2 b/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r2
index f107097ac0d6..336c7e39a4c4 100644
--- a/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r2
+++ b/metadata/md5-cache/dev-python/cosmolopy-0.1.104-r2
@@ -10,5 +10,5 @@ RDEPEND=|| ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07ed6eef22517baa5f8365cc1b33f381
diff --git a/metadata/md5-cache/dev-python/couchdb-python-1.1 b/metadata/md5-cache/dev-python/couchdb-python-1.1
index 8226f1854dbd..e3349e54dcfe 100644
--- a/metadata/md5-cache/dev-python/couchdb-python-1.1
+++ b/metadata/md5-cache/dev-python/couchdb-python-1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/CouchDB/CouchDB-1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=63252336ae9bbe80adad736f38b1320f
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 2b0027450697..3ae47a32d8a0 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_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5c6f7f7c08db41b89ca5256582c6985
diff --git a/metadata/md5-cache/dev-python/cov-core-1.15.0-r1 b/metadata/md5-cache/dev-python/cov-core-1.15.0-r1
index 9ac8cdaf630f..7430cbe2d3d7 100644
--- a/metadata/md5-cache/dev-python/cov-core-1.15.0-r1
+++ b/metadata/md5-cache/dev-python/cov-core-1.15.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/coverage-3.6[python_targets_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cov-core/cov-core-1.15.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2869bf4b818a98d5695d16576b14e3e8
diff --git a/metadata/md5-cache/dev-python/cov-core-1.7 b/metadata/md5-cache/dev-python/cov-core-1.7
index e96deb8398a5..e9da6005bb10 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_pypy3(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cov-core/cov-core-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a27c91588b7d0c4f00d963faf09e6fe
diff --git a/metadata/md5-cache/dev-python/coverage-4.2 b/metadata/md5-cache/dev-python/coverage-4.2
index e5c8fbf978f3..68b7fabd56a2 100644
--- a/metadata/md5-cache/dev-python/coverage-4.2
+++ b/metadata/md5-cache/dev-python/coverage-4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6eb988b744440c3a379479ee73ec0af7
diff --git a/metadata/md5-cache/dev-python/coverage-4.5.2 b/metadata/md5-cache/dev-python/coverage-4.5.2
index 48d64650df97..55140706ba52 100644
--- a/metadata/md5-cache/dev-python/coverage-4.5.2
+++ b/metadata/md5-cache/dev-python/coverage-4.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=217511f98ebbdb0a89125017670cec21
diff --git a/metadata/md5-cache/dev-python/coverage-4.5.4 b/metadata/md5-cache/dev-python/coverage-4.5.4
index 3b909ef96c18..b6d9e792ae22 100644
--- a/metadata/md5-cache/dev-python/coverage-4.5.4
+++ b/metadata/md5-cache/dev-python/coverage-4.5.4
@@ -4,12 +4,12 @@ DESCRIPTION=Code coverage measurement for Python
 EAPI=7
 HOMEPAGE=https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/coverage/coverage-4.5.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6062c6812160fd2ca6d78f469ba27016
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=986106ee0b6a66a596ae7d925ec123ef
diff --git a/metadata/md5-cache/dev-python/coverage-test-runner-1.15 b/metadata/md5-cache/dev-python/coverage-test-runner-1.15
index f5b342d2b8cf..b61fda352b8a 100644
--- a/metadata/md5-cache/dev-python/coverage-test-runner-1.15
+++ b/metadata/md5-cache/dev-python/coverage-test-runner-1.15
@@ -11,5 +11,5 @@ RDEPEND=dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://git.liw.fi/coverage-test-runner/snapshot/coverage-test-runner-1.15.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c78f94d2bd62e322d1a35226ce0a3c24
diff --git a/metadata/md5-cache/dev-python/crcmod-1.7-r2 b/metadata/md5-cache/dev-python/crcmod-1.7-r2
index b9562bbc2a04..7e31a89ea4d0 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_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://sourceforge/crcmod/crcmod-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=951def4066e3a1556f55c1e6d462bc89
diff --git a/metadata/md5-cache/dev-python/crcmod-1.7-r3 b/metadata/md5-cache/dev-python/crcmod-1.7-r3
index a460072ddf24..d7405260b59e 100644
--- a/metadata/md5-cache/dev-python/crcmod-1.7-r3
+++ b/metadata/md5-cache/dev-python/crcmod-1.7-r3
@@ -10,5 +10,5 @@ RDEPEND=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 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/crcmod/crcmod-1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3cd936cc57b09e28067ca511f9eb19bf
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.17 b/metadata/md5-cache/dev-python/croniter-0.3.17
index 5b47dd0b9768..a28c4144dcd0 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.17
+++ b/metadata/md5-cache/dev-python/croniter-0.3.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8936018262275a3c538dec3671e937f9
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.29 b/metadata/md5-cache/dev-python/croniter-0.3.29
index e00d552bba99..a1fc5a9ae73c 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.29
+++ b/metadata/md5-cache/dev-python/croniter-0.3.29
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.29.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f18e3b7e4ddd9806dd1af668e0cd00a5
diff --git a/metadata/md5-cache/dev-python/croniter-0.3.30 b/metadata/md5-cache/dev-python/croniter-0.3.30
index a31fcffa1255..e9342e988ed3 100644
--- a/metadata/md5-cache/dev-python/croniter-0.3.30
+++ b/metadata/md5-cache/dev-python/croniter-0.3.30
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/croniter/croniter-0.3.30.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f96559c3a7d8ce30d42a8edb1511557
diff --git a/metadata/md5-cache/dev-python/crumbs-2.1.0 b/metadata/md5-cache/dev-python/crumbs-2.1.0
index 8fd312b52a6f..e355bb21d4d1 100644
--- a/metadata/md5-cache/dev-python/crumbs-2.1.0
+++ b/metadata/md5-cache/dev-python/crumbs-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crumbs/crumbs-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=857756dae7fc23956b65f945d342ad3e
diff --git a/metadata/md5-cache/dev-python/cryptography-2.6.1-r1 b/metadata/md5-cache/dev-python/cryptography-2.6.1-r1
index 2eb81b7172b7..fa7114d7cc0e 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.6.1-r1
+++ b/metadata/md5-cache/dev-python/cryptography-2.6.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cbba69490f5ec1ac3d169e35ccfdffb7
diff --git a/metadata/md5-cache/dev-python/cryptography-2.8-r1 b/metadata/md5-cache/dev-python/cryptography-2.8-r1
index c98e6d00bb32..2291bec001d4 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.8-r1
+++ b/metadata/md5-cache/dev-python/cryptography-2.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.8.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-2.8.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fb973a3a56ddf98d62f356fef53d7bec
diff --git a/metadata/md5-cache/dev-python/cryptography-vectors-2.6.1 b/metadata/md5-cache/dev-python/cryptography-vectors-2.6.1
index 128c2152f949..e0193715363f 100644
--- a/metadata/md5-cache/dev-python/cryptography-vectors-2.6.1
+++ b/metadata/md5-cache/dev-python/cryptography-vectors-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography-vectors/cryptography_vectors-2.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=774d785eaf3aab8222883325c0e720b7
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.4 b/metadata/md5-cache/dev-python/css-parser-1.0.4
index 7d655aebec8c..2541798b10bf 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.4
+++ b/metadata/md5-cache/dev-python/css-parser-1.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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1c2e9870323b357fc0b291d87bd800c
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1 b/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
index 2c2906448414..afc68088941c 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.4-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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=08f50635a211ab78e3682ce5b80ac073
diff --git a/metadata/md5-cache/dev-python/cssselect-1.1.0 b/metadata/md5-cache/dev-python/cssselect-1.1.0
index ad20f7b7e7ec..1ceadaa8ac5c 100644
--- a/metadata/md5-cache/dev-python/cssselect-1.1.0
+++ b/metadata/md5-cache/dev-python/cssselect-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/scrapy/cssselect/archive/v1.1.0.tar.gz -> cssselect-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a981330dbbdd345431b3b69ba0cfd8b5
diff --git a/metadata/md5-cache/dev-python/cssselect2-0.2.0 b/metadata/md5-cache/dev-python/cssselect2-0.2.0
index f2ae31f5beab..f0bbb621f7e8 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect2/cssselect2-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d42a36f7d7f87a8eacf53df3d2ded49
diff --git a/metadata/md5-cache/dev-python/cssutils-1.0.1 b/metadata/md5-cache/dev-python/cssutils-1.0.1
index 9e8416a31858..33d77a4f279d 100644
--- a/metadata/md5-cache/dev-python/cssutils-1.0.1
+++ b/metadata/md5-cache/dev-python/cssutils-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssutils/cssutils-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7b6383e35dcde5cfcb253bc24fcb148
diff --git a/metadata/md5-cache/dev-python/cssutils-1.0.2-r1 b/metadata/md5-cache/dev-python/cssutils-1.0.2-r1
index f8d19e4ccca0..4ff22cf4c077 100644
--- a/metadata/md5-cache/dev-python/cssutils-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/cssutils-1.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssutils/cssutils-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=61fdfc39059d2ef79a55e0223ff66b5d
diff --git a/metadata/md5-cache/dev-python/cssutils-1.0.2-r2 b/metadata/md5-cache/dev-python/cssutils-1.0.2-r2
index f6e557f3a900..76aac19bcb4f 100644
--- a/metadata/md5-cache/dev-python/cssutils-1.0.2-r2
+++ b/metadata/md5-cache/dev-python/cssutils-1.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssutils/cssutils-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=55b3dbafa31d8788b5ac75b299afc015
diff --git a/metadata/md5-cache/dev-python/ctypescrypto-0.5 b/metadata/md5-cache/dev-python/ctypescrypto-0.5
index d2e3342e90df..0a3bd8ada95e 100644
--- a/metadata/md5-cache/dev-python/ctypescrypto-0.5
+++ b/metadata/md5-cache/dev-python/ctypescrypto-0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( gost ) || ( python_targets_python3_6 python_targets_python3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vbwagner/ctypescrypto/archive/v0.5.tar.gz -> ctypescrypto-0.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=89884ddfcc21a0c82c46806ace4aecb1
diff --git a/metadata/md5-cache/dev-python/ctypescrypto-9999 b/metadata/md5-cache/dev-python/ctypescrypto-9999
index 33124f98071c..f786575bc38b 100644
--- a/metadata/md5-cache/dev-python/ctypescrypto-9999
+++ b/metadata/md5-cache/dev-python/ctypescrypto-9999
@@ -10,5 +10,5 @@ RDEPEND=gost? ( dev-libs/gost-engine:= ) python_targets_python3_6? ( dev-lang/py
 REQUIRED_USE=test? ( gost ) || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=89884ddfcc21a0c82c46806ace4aecb1
diff --git a/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1 b/metadata/md5-cache/dev-python/ctypesgen-0_p72-r1
index 9085b4d94450..312c83e569a2 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a56c7fe3b7ef6a244daebe64f623340a
diff --git a/metadata/md5-cache/dev-python/cursive-0.2.2 b/metadata/md5-cache/dev-python/cursive-0.2.2
index 8da4b2fb4e05..16d8914ce51d 100644
--- a/metadata/md5-cache/dev-python/cursive-0.2.2
+++ b/metadata/md5-cache/dev-python/cursive-0.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cursive/cursive-0.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ced2da2ee1959e9acb59bf44e9738c5e
diff --git a/metadata/md5-cache/dev-python/curtsies-0.2.11 b/metadata/md5-cache/dev-python/curtsies-0.2.11
index f8a310537efd..8c79a6dc1e42 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.2.11
+++ b/metadata/md5-cache/dev-python/curtsies-0.2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06f8b10f6a5359e8cecfb8fc59fe853b
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.0 b/metadata/md5-cache/dev-python/curtsies-0.3.0
index 77c68ebcb93b..7b4fc7789202 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.3.0
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9a45e2036334d9c2406570320a1a3a18
diff --git a/metadata/md5-cache/dev-python/curtsies-0.3.0-r1 b/metadata/md5-cache/dev-python/curtsies-0.3.0-r1
index 51c46bdece88..af5aa5e9a67a 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.3.0-r1
+++ b/metadata/md5-cache/dev-python/curtsies-0.3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/curtsies/curtsies-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a389357794aa35c77d5553fcaa2cbee7
diff --git a/metadata/md5-cache/dev-python/cvxopt-1.1.9 b/metadata/md5-cache/dev-python/cvxopt-1.1.9
index 6d82996989e1..24140eb81701 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_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/cvxopt/cvxopt/archive/1.1.9.tar.gz -> cvxopt-1.1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=adc83071ac267b8532d5fd2512f198b1
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 ab59b3088699..7ccf3c0f52f1 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cx_Freeze/cx_Freeze-5.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=217708350b855cd83d8ca13e1144b63a
diff --git a/metadata/md5-cache/dev-python/cycler-0.10.0 b/metadata/md5-cache/dev-python/cycler-0.10.0
index 4fb81c0ea149..972f37851245 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_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/C/Cycler/cycler-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5575304ea178e5b22c7345e42fcfc742
diff --git a/metadata/md5-cache/dev-python/cython-0.29.12 b/metadata/md5-cache/dev-python/cython-0.29.12
deleted file mode 100644
index 8cb14258bfa9..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.29.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=A Python to C compiler
-EAPI=7
-HOMEPAGE=https://cython.org https://pypi.org/project/Cython/
-IUSE=doc emacs test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/C/Cython/Cython-0.29.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=30676d477d927e0fd09c273a78bc646f
diff --git a/metadata/md5-cache/dev-python/cython-0.29.13 b/metadata/md5-cache/dev-python/cython-0.29.13
deleted file mode 100644
index abc05394893d..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.29.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) )
-DESCRIPTION=A Python to C compiler
-EAPI=7
-HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
-IUSE=doc emacs test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cython/cython/archive/0.29.13.tar.gz -> cython-0.29.13.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=37c698534fd98891cca7a0dd3d70819b
diff --git a/metadata/md5-cache/dev-python/cython-0.29.14 b/metadata/md5-cache/dev-python/cython-0.29.14
deleted file mode 100644
index c27225ddb669..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.29.14
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=emacs? ( >=app-editors/emacs-23.1:* ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( python_targets_python2_7? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) )
-DESCRIPTION=A Python to C compiler
-EAPI=7
-HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
-IUSE=doc emacs test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/cython/cython/archive/0.29.14.tar.gz -> cython-0.29.14.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=37c698534fd98891cca7a0dd3d70819b
diff --git a/metadata/md5-cache/dev-python/cython-0.29.14-r1 b/metadata/md5-cache/dev-python/cython-0.29.14-r1
index 3f87658995fc..9ae2837212dd 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.14-r1
+++ b/metadata/md5-cache/dev-python/cython-0.29.14-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cython/cython/archive/0.29.14.tar.gz -> cython-0.29.14.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3f166696e0ab7ec26bca7f684861f35f
diff --git a/metadata/md5-cache/dev-python/cython-0.29.15 b/metadata/md5-cache/dev-python/cython-0.29.15
new file mode 100644
index 000000000000..946937ffdd32
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-0.29.15
@@ -0,0 +1,15 @@
+BDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) ) doc? ( || ( ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=A Python to C compiler
+EAPI=7
+HOMEPAGE=https://cython.org https://pypi.org/project/Cython/ https://github.com/cython/cython
+IUSE=emacs test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/cython/cython/archive/0.29.15.tar.gz -> cython-0.29.15.gh.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3f166696e0ab7ec26bca7f684861f35f
diff --git a/metadata/md5-cache/dev-python/cython-0.29.4 b/metadata/md5-cache/dev-python/cython-0.29.4
index 2268d3734741..189b05bdd5a9 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.4
+++ b/metadata/md5-cache/dev-python/cython-0.29.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cython/Cython-0.29.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=10b1d1a4bcab9a9f0d02c1441180ca5e
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.10.0 b/metadata/md5-cache/dev-python/cytoolz-0.10.0
index 374ac82c6718..d51cc3ac9e78 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.10.0
+++ b/metadata/md5-cache/dev-python/cytoolz-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-0.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=df92918fda624f56c99f8903e8df22dd
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.8.0 b/metadata/md5-cache/dev-python/cytoolz-0.8.0
index f39d579ceacc..16f2cdbc6bc5 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.8.0
+++ b/metadata/md5-cache/dev-python/cytoolz-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=358cde6debea14098eaab6438f639195
diff --git a/metadata/md5-cache/dev-python/cytoolz-0.8.2 b/metadata/md5-cache/dev-python/cytoolz-0.8.2
index 23234bce9666..c16e4ef28f82 100644
--- a/metadata/md5-cache/dev-python/cytoolz-0.8.2
+++ b/metadata/md5-cache/dev-python/cytoolz-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cytoolz/cytoolz-0.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0f51e8d3587339091015c61b513c186
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 09af1cc20cd0..4d0a82b0ed70 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_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/d2to1/d2to1-0.2.12.post1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a48e5c3ee9d18aa8805b4a8875a5218e
diff --git a/metadata/md5-cache/dev-python/daemonize-2.5.0 b/metadata/md5-cache/dev-python/daemonize-2.5.0
index 0320bb6d4625..3d8b42103a94 100644
--- a/metadata/md5-cache/dev-python/daemonize-2.5.0
+++ b/metadata/md5-cache/dev-python/daemonize-2.5.0
@@ -11,5 +11,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/thesharp/daemonize/archive/v2.5.0.tar.gz -> daemonize-2.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6016085005f77b4f51e217b29a4f56d0
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 fbec9071ce1f..f70b8babe9f3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2084ee58ef0a0af8cce78ce9a8de22db
diff --git a/metadata/md5-cache/dev-python/dask-1.2.0 b/metadata/md5-cache/dev-python/dask-1.2.0
index cd188238cb27..27f4fb2da767 100644
--- a/metadata/md5-cache/dev-python/dask-1.2.0
+++ b/metadata/md5-cache/dev-python/dask-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dask/dask-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0007b5975c2e91f8fe77daec7ccb7a14
diff --git a/metadata/md5-cache/dev-python/datashape-0.5.4-r1 b/metadata/md5-cache/dev-python/datashape-0.5.4-r1
index 74f5aa02d694..bbcb614e6195 100644
--- a/metadata/md5-cache/dev-python/datashape-0.5.4-r1
+++ b/metadata/md5-cache/dev-python/datashape-0.5.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blaze/datashape/archive/0.5.4.tar.gz -> datashape-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b409f49350b2bcbac0daa8d1ecfdcc0
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.18.2 b/metadata/md5-cache/dev-python/dbusmock-0.18.2
index eb1eb22eae1c..bb63d0a2b19f 100644
--- a/metadata/md5-cache/dev-python/dbusmock-0.18.2
+++ b/metadata/md5-cache/dev-python/dbusmock-0.18.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.18.2/python-dbusmock-0.18.2.tar.gz -> dbusmock-0.18.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cca4dc26e91decb7053515bfa8104f6c
diff --git a/metadata/md5-cache/dev-python/dbusmock-0.18.3 b/metadata/md5-cache/dev-python/dbusmock-0.18.3
new file mode 100644
index 000000000000..469d9e50faa3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dbusmock-0.18.3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-17.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Easily create mock objects on D-Bus for software testing
+EAPI=7
+HOMEPAGE=https://github.com/martinpitt/python-dbusmock
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/martinpitt/python-dbusmock/releases/download/0.18.3/python-dbusmock-0.18.3.tar.gz -> dbusmock-0.18.3.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=15fa95dfe9215af02e4b9cecf0fede5d
diff --git a/metadata/md5-cache/dev-python/ddt-1.1.1 b/metadata/md5-cache/dev-python/ddt-1.1.1
index f0e5d353abf9..45e217866099 100644
--- a/metadata/md5-cache/dev-python/ddt-1.1.1
+++ b/metadata/md5-cache/dev-python/ddt-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/ddt/ddt-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0432b45c84308ab955aafdac6f836a2c
diff --git a/metadata/md5-cache/dev-python/ddt-1.2.2 b/metadata/md5-cache/dev-python/ddt-1.2.2
index ec98d1f66c8f..85a6fa85f46c 100644
--- a/metadata/md5-cache/dev-python/ddt-1.2.2
+++ b/metadata/md5-cache/dev-python/ddt-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/datadriventests/ddt/archive/1.2.2.tar.gz -> ddt-1.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=56897548acf39552f675e6d979e30c2f
diff --git a/metadata/md5-cache/dev-python/debtcollector-1.21.0 b/metadata/md5-cache/dev-python/debtcollector-1.21.0
index 40e161c537a0..3ba8c2f83fe3 100644
--- a/metadata/md5-cache/dev-python/debtcollector-1.21.0
+++ b/metadata/md5-cache/dev-python/debtcollector-1.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/debtcollector/debtcollector-1.21.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4706b1171ad6447d95e715306fd7e284
diff --git a/metadata/md5-cache/dev-python/decorator-4.3.2 b/metadata/md5-cache/dev-python/decorator-4.3.2
index add8f37ac8b2..7f5018b10372 100644
--- a/metadata/md5-cache/dev-python/decorator-4.3.2
+++ b/metadata/md5-cache/dev-python/decorator-4.3.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-4.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=49a2caca6fcdbb999eff20c6ddcce154
diff --git a/metadata/md5-cache/dev-python/decorator-4.4.0 b/metadata/md5-cache/dev-python/decorator-4.4.0
index 477a00fad12a..97f78f31f98b 100644
--- a/metadata/md5-cache/dev-python/decorator-4.4.0
+++ b/metadata/md5-cache/dev-python/decorator-4.4.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-4.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=abdf6eb14b01ef21e825e4649800d83e
diff --git a/metadata/md5-cache/dev-python/decorator-4.4.1 b/metadata/md5-cache/dev-python/decorator-4.4.1
index 677b6afc31b5..e24cb0b9f267 100644
--- a/metadata/md5-cache/dev-python/decorator-4.4.1
+++ b/metadata/md5-cache/dev-python/decorator-4.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/decorator/decorator-4.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6327c3ee7249dc6a81d263d0b5818c73
diff --git a/metadata/md5-cache/dev-python/decoratortools-1.8-r1 b/metadata/md5-cache/dev-python/decoratortools-1.8-r1
index 99b8cd001d35..d777473c62d6 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_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/DecoratorTools/DecoratorTools-1.8.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c07a42b274a144e3bde11a05db339f15
diff --git a/metadata/md5-cache/dev-python/defcon-0.6.0 b/metadata/md5-cache/dev-python/defcon-0.6.0
index 5be1ffbcc4cf..4f1b39f84136 100644
--- a/metadata/md5-cache/dev-python/defcon-0.6.0
+++ b/metadata/md5-cache/dev-python/defcon-0.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/fonttools-3.31.0[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/typesupply/defcon/archive/0.6.0.tar.gz -> defcon-0.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=09c5b768beacdc644a35c6c143d10162
diff --git a/metadata/md5-cache/dev-python/deform-0.9.9 b/metadata/md5-cache/dev-python/deform-0.9.9
index fb424239c409..8059403067d9 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/deform/deform-0.9.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d584c9bc774f4e122b60daf0048e60fe
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.5.0 b/metadata/md5-cache/dev-python/defusedxml-0.5.0
index 50c198cf8860..81aa29349ef8 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_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4fe543e58daedfe4b324fc65f0b699eb
diff --git a/metadata/md5-cache/dev-python/defusedxml-0.6.0 b/metadata/md5-cache/dev-python/defusedxml-0.6.0
index ddb239b8bbed..045fe373fd60 100644
--- a/metadata/md5-cache/dev-python/defusedxml-0.6.0
+++ b/metadata/md5-cache/dev-python/defusedxml-0.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/defusedxml/defusedxml-0.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=308c0c232fe99f613fb679fde1b05e31
diff --git a/metadata/md5-cache/dev-python/demjson-2.2.4 b/metadata/md5-cache/dev-python/demjson-2.2.4
index d4d32ad77d7e..e12e6cf9f116 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1ce9cbf6b5a411bae7fa24668105e1b
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.10 b/metadata/md5-cache/dev-python/denonavr-0.7.10
index dcc9a53c7dd2..84d3e575f63e 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.7.10
+++ b/metadata/md5-cache/dev-python/denonavr-0.7.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1c163b5614d04210ea9c6f3ea452dda0
diff --git a/metadata/md5-cache/dev-python/denonavr-0.7.9 b/metadata/md5-cache/dev-python/denonavr-0.7.9
index 399155591f14..bd4198134c5b 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.7.9
+++ b/metadata/md5-cache/dev-python/denonavr-0.7.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1c163b5614d04210ea9c6f3ea452dda0
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.6 b/metadata/md5-cache/dev-python/deprecated-1.2.6
index ec31d7a094a4..1c665f5ba50c 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.6
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.6.tar.gz -> deprecated-1.2.6.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ab5d4e8f3a2a8ebb165bca42724da78b
diff --git a/metadata/md5-cache/dev-python/deprecated-1.2.7 b/metadata/md5-cache/dev-python/deprecated-1.2.7
index 1bf0514f0bce..59719db34232 100644
--- a/metadata/md5-cache/dev-python/deprecated-1.2.7
+++ b/metadata/md5-cache/dev-python/deprecated-1.2.7
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wrapt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/wrapt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python @deprecated decorator to deprecate old API
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tantale/deprecated/archive/v1.2.7.tar.gz -> deprecated-1.2.7.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b69552d19526b15515097a3abc20a9e5
diff --git a/metadata/md5-cache/dev-python/deprecation-1.0.1 b/metadata/md5-cache/dev-python/deprecation-1.0.1
index 91c821012359..c34e27c16f09 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=633ca703118ff21128761a2cb85981f4
diff --git a/metadata/md5-cache/dev-python/deprecation-2.0.6 b/metadata/md5-cache/dev-python/deprecation-2.0.6
index ec0f85f00067..b002b0b0db08 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.0.6
+++ b/metadata/md5-cache/dev-python/deprecation-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-2.0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bcb6becdb72ea57996b2cee73a3e0cbc
diff --git a/metadata/md5-cache/dev-python/deprecation-2.0.7 b/metadata/md5-cache/dev-python/deprecation-2.0.7
index d2062190ea43..a5d80e54daff 100644
--- a/metadata/md5-cache/dev-python/deprecation-2.0.7
+++ b/metadata/md5-cache/dev-python/deprecation-2.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/deprecation/deprecation-2.0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5726ad6f02512fe63365170b072eefae
diff --git a/metadata/md5-cache/dev-python/dexml-0.5.1 b/metadata/md5-cache/dev-python/dexml-0.5.1
index 19d4c6d4060c..ad0bff7d1405 100644
--- a/metadata/md5-cache/dev-python/dexml-0.5.1
+++ b/metadata/md5-cache/dev-python/dexml-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dexml/dexml-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32788369768ed33fcd970b00404b01a6
diff --git a/metadata/md5-cache/dev-python/dicttoxml-1.7.4 b/metadata/md5-cache/dev-python/dicttoxml-1.7.4
index 06f7e7b055f3..7a0af257b7cb 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dicttoxml/dicttoxml-1.7.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4f39bad3ee64019dd1c680236460fde9
diff --git a/metadata/md5-cache/dev-python/diff-cover-2.3.0 b/metadata/md5-cache/dev-python/diff-cover-2.3.0
index 7cefe9682544..dc75cdff27dc 100644
--- a/metadata/md5-cache/dev-python/diff-cover-2.3.0
+++ b/metadata/md5-cache/dev-python/diff-cover-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Bachmann1234/diff-cover/archive/v2.3.0.tar.gz -> diff-cover-2.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d40e45bbcde9bedf7e8b595d85ff0f68
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20121119 b/metadata/md5-cache/dev-python/diff-match-patch-20121119
index 891ff6613ccc..0f9ade282a36 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_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diff-match-patch/diff-match-patch-20121119.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ee658898a08d9c4c315db89066cf08c
diff --git a/metadata/md5-cache/dev-python/diff-match-patch-20181111 b/metadata/md5-cache/dev-python/diff-match-patch-20181111
index b0119daeaf04..5beb3f266105 100644
--- a/metadata/md5-cache/dev-python/diff-match-patch-20181111
+++ b/metadata/md5-cache/dev-python/diff-match-patch-20181111
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diff-match-patch/diff-match-patch-20181111.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=018408509f600657761636480f995f7f
diff --git a/metadata/md5-cache/dev-python/dill-0.2.5 b/metadata/md5-cache/dev-python/dill-0.2.5
index 95c6d8038116..e0bcda867184 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dill/dill-0.2.5.tgz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c1ea498312541269855c9e370e452db1
diff --git a/metadata/md5-cache/dev-python/dill-0.3.0 b/metadata/md5-cache/dev-python/dill-0.3.0
index 95a43c9ae8dd..9363ab96c608 100644
--- a/metadata/md5-cache/dev-python/dill-0.3.0
+++ b/metadata/md5-cache/dev-python/dill-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dill/dill-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8348551d292b9ec06749978b88029f8c
diff --git a/metadata/md5-cache/dev-python/dill-0.3.1.1 b/metadata/md5-cache/dev-python/dill-0.3.1.1
index 5c2365b2212a..e8106c775bb8 100644
--- a/metadata/md5-cache/dev-python/dill-0.3.1.1
+++ b/metadata/md5-cache/dev-python/dill-0.3.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dill/dill-0.3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cdca8727e23726567a3d9676643df6b2
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 3405d9dae65d..5297fc7fe2a4 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce9b426026fa22196cdbaf901b80bc7a
diff --git a/metadata/md5-cache/dev-python/diskcache-3.1.0 b/metadata/md5-cache/dev-python/diskcache-3.1.0
index 1b65b69e50e8..b0a2b68bcd49 100644
--- a/metadata/md5-cache/dev-python/diskcache-3.1.0
+++ b/metadata/md5-cache/dev-python/diskcache-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskcache/diskcache-3.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e695aeb57fa4cc3ca087ba8cf76f36a2
diff --git a/metadata/md5-cache/dev-python/dissononce-0.34.3 b/metadata/md5-cache/dev-python/dissononce-0.34.3
index 514284a3e685..3b31465a2c5f 100644
--- a/metadata/md5-cache/dev-python/dissononce-0.34.3
+++ b/metadata/md5-cache/dev-python/dissononce-0.34.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tgalal/dissononce/archive/0.34.3.tar.gz -> dissononce-0.34.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e7a98894ca0f48768b8fe9bbd62d9cb7
diff --git a/metadata/md5-cache/dev-python/distlib-0.2.1 b/metadata/md5-cache/dev-python/distlib-0.2.1
index 2b41f507b83d..298010139e6e 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_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/distlib/distlib-0.2.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1316e3970c53ece301b292fe702ab00
diff --git a/metadata/md5-cache/dev-python/distlib-0.2.4 b/metadata/md5-cache/dev-python/distlib-0.2.4
index 730e9ec256b7..6ca90047221e 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_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/distlib/distlib-0.2.4.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=459e9bbd8a5e1713423c6d7ade92079f
diff --git a/metadata/md5-cache/dev-python/distributed-1.18.0 b/metadata/md5-cache/dev-python/distributed-1.18.0
index 7aa888815c4b..ba4810c4eee4 100644
--- a/metadata/md5-cache/dev-python/distributed-1.18.0
+++ b/metadata/md5-cache/dev-python/distributed-1.18.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distributed/distributed-1.18.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=408b2595ffd374c972ba9905278f7d61
diff --git a/metadata/md5-cache/dev-python/distributed-1.18.0-r1 b/metadata/md5-cache/dev-python/distributed-1.18.0-r1
index 199c1335d1c6..020c58f81011 100644
--- a/metadata/md5-cache/dev-python/distributed-1.18.0-r1
+++ b/metadata/md5-cache/dev-python/distributed-1.18.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/distributed/distributed-1.18.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=67976b8ca405642eeb2d2c05a1d8a781
diff --git a/metadata/md5-cache/dev-python/distro-1.0.4 b/metadata/md5-cache/dev-python/distro-1.0.4
index 7887e3b8be22..7a96261e077b 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_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/distro/distro-1.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58c330f49f47b1018b15725d8ab4ddda
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 0e2b88855170..f29e22e298a0 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/dj-database-url/dj-database-url-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16af7dbb76a3e0f0f1b2fcf5849e6763
diff --git a/metadata/md5-cache/dev-python/django-1.11.20 b/metadata/md5-cache/dev-python/django-1.11.20
index 77780156a70a..674e21ad8e9c 100644
--- a/metadata/md5-cache/dev-python/django-1.11.20
+++ b/metadata/md5-cache/dev-python/django-1.11.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.20.tar.gz mirror://pypi/D/Django/Django-1.11.20.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=995b8dda228ff85ba55416dd8f062786
diff --git a/metadata/md5-cache/dev-python/django-1.11.21 b/metadata/md5-cache/dev-python/django-1.11.21
index 3ddfda807608..183ef98ace6f 100644
--- a/metadata/md5-cache/dev-python/django-1.11.21
+++ b/metadata/md5-cache/dev-python/django-1.11.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/1.11/Django-1.11.21.tar.gz mirror://pypi/D/Django/Django-1.11.21.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=026db6e9b62d6fc452d33e4b186a4dad
diff --git a/metadata/md5-cache/dev-python/django-2.1.8 b/metadata/md5-cache/dev-python/django-2.1.8
index c2319b8a9010..ac357d35098e 100644
--- a/metadata/md5-cache/dev-python/django-2.1.8
+++ b/metadata/md5-cache/dev-python/django-2.1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.1/Django-2.1.8.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=218eefe922bd5ad1fac3d19bf36ec479
diff --git a/metadata/md5-cache/dev-python/django-2.1.9 b/metadata/md5-cache/dev-python/django-2.1.9
index 45624946c747..db15f0d21beb 100644
--- a/metadata/md5-cache/dev-python/django-2.1.9
+++ b/metadata/md5-cache/dev-python/django-2.1.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.1/Django-2.1.9.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5647fa086b967d13310093ce00f0eb7c
diff --git a/metadata/md5-cache/dev-python/django-2.2.1 b/metadata/md5-cache/dev-python/django-2.2.1
index 6dd029908959..80ad9dba7b77 100644
--- a/metadata/md5-cache/dev-python/django-2.2.1
+++ b/metadata/md5-cache/dev-python/django-2.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=800b4d80714b99794bf8736188b962e5
diff --git a/metadata/md5-cache/dev-python/django-2.2.2 b/metadata/md5-cache/dev-python/django-2.2.2
index ba1095007571..8dc98d93bfd4 100644
--- a/metadata/md5-cache/dev-python/django-2.2.2
+++ b/metadata/md5-cache/dev-python/django-2.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.djangoproject.com/m/releases/2.2/Django-2.2.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b006f377a8e4b4787f702deb51eca259
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 3ed7620ae122..7c99e8ecbb86 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f24d2fa8ddf7..c26e576fe597 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 624a58aa4214..96c1f53a70cf 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d8414dc1535a0c6b296b846663b1519
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-1.7.0 b/metadata/md5-cache/dev-python/django-auth-ldap-1.7.0
index 6cb21a3d9750..6ed3638698b1 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-1.7.0
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-1.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e0c7204d18085858ccfbad2ae8e22d30
diff --git a/metadata/md5-cache/dev-python/django-auth-ldap-2.1.0 b/metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
index 01d58e1d9c85..026ce410c729 100644
--- a/metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
+++ b/metadata/md5-cache/dev-python/django-auth-ldap-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-auth-ldap/django-auth-ldap-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e56c7e68e37be5c82f451c9ef218e2dd
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 8fcdc944dcab..6b179268c20e 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-baker/django-baker-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bca1181a4bb3dc62c8fa283857ce5562
diff --git a/metadata/md5-cache/dev-python/django-cacheops-4.1 b/metadata/md5-cache/dev-python/django-cacheops-4.1
index 71ee92d03841..b200771839ea 100644
--- a/metadata/md5-cache/dev-python/django-cacheops-4.1
+++ b/metadata/md5-cache/dev-python/django-cacheops-4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.8[python_targets_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cacheops/django-cacheops-4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d21de91d519d334129cdce8ae0fe02f1
diff --git a/metadata/md5-cache/dev-python/django-cacheops-4.2 b/metadata/md5-cache/dev-python/django-cacheops-4.2
index 8f31a8c9590b..abfd9c50e6e1 100644
--- a/metadata/md5-cache/dev-python/django-cacheops-4.2
+++ b/metadata/md5-cache/dev-python/django-cacheops-4.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.8[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cacheops/django-cacheops-4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=827a21fd098f6002f3dd9a6ff2a1d5ba
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-2.5.1 b/metadata/md5-cache/dev-python/django-cors-headers-2.5.1
index b29901c7cd61..38341ceca02d 100644
--- a/metadata/md5-cache/dev-python/django-cors-headers-2.5.1
+++ b/metadata/md5-cache/dev-python/django-cors-headers-2.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cors-headers/django-cors-headers-2.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a86c87f45d68855bec8808d74f83a795
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.0.2 b/metadata/md5-cache/dev-python/django-cors-headers-3.0.2
index 362f6cb31b46..16b1884368d2 100644
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.0.2
+++ b/metadata/md5-cache/dev-python/django-cors-headers-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cors-headers/django-cors-headers-3.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a86c87f45d68855bec8808d74f83a795
diff --git a/metadata/md5-cache/dev-python/django-cors-headers-3.2.1 b/metadata/md5-cache/dev-python/django-cors-headers-3.2.1
index 20f7057e0717..cba9ec5d081a 100644
--- a/metadata/md5-cache/dev-python/django-cors-headers-3.2.1
+++ b/metadata/md5-cache/dev-python/django-cors-headers-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-cors-headers/django-cors-headers-3.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe61d64a30c71b2934f0763a0b715925
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 4f8c07b34eee..33b615c9f1fe 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_python3_6 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f68e3ae9d3eb8ae598811b2eb4293680
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-2.0 b/metadata/md5-cache/dev-python/django-debug-toolbar-2.0
index 20ab201839f7..e37c7ac1f668 100644
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-2.0
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/django-debug-toolbar/django-debug-toolbar/archive/2.0.tar.gz -> django-debug-toolbar-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6af12b33acf1f8b26da303c0ab807727
diff --git a/metadata/md5-cache/dev-python/django-debug-toolbar-2.1 b/metadata/md5-cache/dev-python/django-debug-toolbar-2.1
index d4376e8f2587..20e19ed46886 100644
--- a/metadata/md5-cache/dev-python/django-debug-toolbar-2.1
+++ b/metadata/md5-cache/dev-python/django-debug-toolbar-2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/django-debug-toolbar/django-debug-toolbar/archive/2.1.tar.gz -> django-debug-toolbar-2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0c6d958e94e50885bc8975f022fc2a90
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 6d5d881a79d6..35293bdde88d 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=098736da736b71bdf1630c0c06695e49
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 cfb1b7d94f90..e878c41227c0 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56653f8469eac792e62aedd84219b978
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 d08870e1a206..86ff752a5209 100644
--- a/metadata/md5-cache/dev-python/django-endless-pagination-2.0
+++ b/metadata/md5-cache/dev-python/django-endless-pagination-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edb11476d300f87c3de3adda4f8c84dd
diff --git a/metadata/md5-cache/dev-python/django-filter-2.1.0 b/metadata/md5-cache/dev-python/django-filter-2.1.0
index 85812a877734..361b147b33a9 100644
--- a/metadata/md5-cache/dev-python/django-filter-2.1.0
+++ b/metadata/md5-cache/dev-python/django-filter-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-filter/django-filter-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fad65a03ae528b9a065158bf8391e9eb
diff --git a/metadata/md5-cache/dev-python/django-filter-2.2.0 b/metadata/md5-cache/dev-python/django-filter-2.2.0
index 512213960409..06ba1ddcc007 100644
--- a/metadata/md5-cache/dev-python/django-filter-2.2.0
+++ b/metadata/md5-cache/dev-python/django-filter-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-filter/django-filter-2.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=69b527c18b0ad26202109e8f2778149d
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 ead60e0a30c6..10b30f70c8ac 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f45db1f3cdd8ea8b92ae3cb60d1aa62a
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 5a52481c2be7..68e5f59fa706 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/django-haystack/django-haystack-2.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef96c9f8d4a0a0fe5aec79420499362d
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 1627501a6151..2294d6b9ee20 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=106520bf47e3b810307cba6e0d5b3dee
diff --git a/metadata/md5-cache/dev-python/django-js-asset-1.2.2 b/metadata/md5-cache/dev-python/django-js-asset-1.2.2
index 58a6e4ce59d9..2baca5ee2ed4 100644
--- a/metadata/md5-cache/dev-python/django-js-asset-1.2.2
+++ b/metadata/md5-cache/dev-python/django-js-asset-1.2.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.17[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-js-asset/django-js-asset-1.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d286127112f583225cb37d9fca8c5141
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 6f2d83780507..a51fe336cb43 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a3926effe3dc..de7d226de915 100644
--- a/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
+++ b/metadata/md5-cache/dev-python/django-ldapdb-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-ldapdb/django-ldapdb-0.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38d4a25624b38e26b94713ad5c6ec168
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 6ca4c63dde3f..c023094b1b50 100644
--- a/metadata/md5-cache/dev-python/django-ldapdb-0.4.0
+++ b/metadata/md5-cache/dev-python/django-ldapdb-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-ldapdb/django-ldapdb-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3890c50930673c6f43a7359629b71a75
diff --git a/metadata/md5-cache/dev-python/django-mptt-0.9.1 b/metadata/md5-cache/dev-python/django-mptt-0.9.1
index 7b970048fcae..35dfd3679850 100644
--- a/metadata/md5-cache/dev-python/django-mptt-0.9.1
+++ b/metadata/md5-cache/dev-python/django-mptt-0.9.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-mptt/django-mptt-0.9.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=62833edeb8c7b52a0a62a52d670ee0ad
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 b4f4c34de2e4..c10316ede70f 100644
--- a/metadata/md5-cache/dev-python/django-nose-1.4.4
+++ b/metadata/md5-cache/dev-python/django-nose-1.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-nose/django-nose-1.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e2146d16318e67d3fe5e6d1a9fcd41a
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 f03ff8bb364f..107a7efc77a9 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-oauth-plus/django-oauth-plus-2.2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4aaea6b92dc07c752da4a397cea84e33
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 574cd050d71e..89025777082f 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=949ba1bfcc35f77dbbca508b0ae7afb1
diff --git a/metadata/md5-cache/dev-python/django-otp-0.4.3 b/metadata/md5-cache/dev-python/django-otp-0.4.3
index 5341009e0e57..f507c69441bd 100644
--- a/metadata/md5-cache/dev-python/django-otp-0.4.3
+++ b/metadata/md5-cache/dev-python/django-otp-0.4.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.8[python_targets_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-otp/django-otp-0.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8fdfc02e21110776d22d7ea0774daebb
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 3952c6325493..22085272c71a 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=385241f85c98a7a1ee3419fb01048a28
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 36ef594743cf..5e41539bd034 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c433581c772209b942c95d13abffe8f0
diff --git a/metadata/md5-cache/dev-python/django-piston-9999 b/metadata/md5-cache/dev-python/django-piston-9999
index 646f282209ca..20bbd2463662 100644
--- a/metadata/md5-cache/dev-python/django-piston-9999
+++ b/metadata/md5-cache/dev-python/django-piston-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96b5fca742277745155af28387b25b46
diff --git a/metadata/md5-cache/dev-python/django-prometheus-1.0.15 b/metadata/md5-cache/dev-python/django-prometheus-1.0.15
index 6f35197bfd9f..4654bf1b2b19 100644
--- a/metadata/md5-cache/dev-python/django-prometheus-1.0.15
+++ b/metadata/md5-cache/dev-python/django-prometheus-1.0.15
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/prometheus_client-0.0.21[python_targets_python3_6(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-prometheus/django-prometheus-1.0.15.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ae6d68ca09446583085827dce411bbc9
diff --git a/metadata/md5-cache/dev-python/django-prometheus-1.1.0 b/metadata/md5-cache/dev-python/django-prometheus-1.1.0
index d29b2e717b36..63298c8b830f 100644
--- a/metadata/md5-cache/dev-python/django-prometheus-1.1.0
+++ b/metadata/md5-cache/dev-python/django-prometheus-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/prometheus_client-0.7[python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-prometheus/django-prometheus-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8aba0dab198cbf3bcbfa4fabd5d98ed0
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 3a6a4a73fa74..0949a98486b6 100644
--- a/metadata/md5-cache/dev-python/django-recaptcha-1.0.5
+++ b/metadata/md5-cache/dev-python/django-recaptcha-1.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=786f9a62c9de464f741bb3deb236cfa0
diff --git a/metadata/md5-cache/dev-python/django-redis-4.10.0 b/metadata/md5-cache/dev-python/django-redis-4.10.0
index d734354df869..9441f54674d0 100644
--- a/metadata/md5-cache/dev-python/django-redis-4.10.0
+++ b/metadata/md5-cache/dev-python/django-redis-4.10.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-redis/django-redis-4.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dc075d5a9cab072f5b728ded4c019e41
diff --git a/metadata/md5-cache/dev-python/django-registration-1.0 b/metadata/md5-cache/dev-python/django-registration-1.0
index 5cadfc497548..a1ce56f3af8b 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c9943893c86977986f12539c79c397c
diff --git a/metadata/md5-cache/dev-python/django-rq-1.3.1 b/metadata/md5-cache/dev-python/django-rq-1.3.1
index 87e4ebfcb76c..ba3337250cf4 100644
--- a/metadata/md5-cache/dev-python/django-rq-1.3.1
+++ b/metadata/md5-cache/dev-python/django-rq-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.8.0[python_targets_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-rq/django-rq-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bfa52c85c182be84d6041c6c4021fd68
diff --git a/metadata/md5-cache/dev-python/django-rq-2.1.0 b/metadata/md5-cache/dev-python/django-rq-2.1.0
index 32fbf4ee6afa..7a01d1f5f4af 100644
--- a/metadata/md5-cache/dev-python/django-rq-2.1.0
+++ b/metadata/md5-cache/dev-python/django-rq-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.8.0[python_targets_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-rq/django-rq-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a77fcd13dfa4ae83e2b0163943f9f8de
diff --git a/metadata/md5-cache/dev-python/django-rq-2.2.0 b/metadata/md5-cache/dev-python/django-rq-2.2.0
index e97abfbc9b41..7923422113ae 100644
--- a/metadata/md5-cache/dev-python/django-rq-2.2.0
+++ b/metadata/md5-cache/dev-python/django-rq-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-2.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-rq/django-rq-2.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f3e7972bd5f7dd6a6dcf8c9a7759d6d
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 28e44af5ed94..4a6a6923f36a 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbe4c1711186cf6376047724cddc1f1c
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 4c557f438333..66eebbbaaf3b 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_python3_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=311c23aade9670cac3d6bb2459aa1ef2
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 7a5477a28c47..0c52ca1e3f25 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-sortedm2m/django-sortedm2m-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cadce8e40cf57d4832b9cdd4d9b73f3e
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 ecece98b8d1d..3f7618b3177f 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_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-spurl/django-spurl-0.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7bd94229219317852b2e19c3b8c3a562
diff --git a/metadata/md5-cache/dev-python/django-tables2-2.0.6 b/metadata/md5-cache/dev-python/django-tables2-2.0.6
index 8a0ea66c0f5e..2e185559bf84 100644
--- a/metadata/md5-cache/dev-python/django-tables2-2.0.6
+++ b/metadata/md5-cache/dev-python/django-tables2-2.0.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-tables2/django-tables2-2.0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b8079613710e2bf7dfec00dfd48eb96d
diff --git a/metadata/md5-cache/dev-python/django-tables2-2.2.1 b/metadata/md5-cache/dev-python/django-tables2-2.2.1
index 554ebdf66ae2..08ef6055ae16 100644
--- a/metadata/md5-cache/dev-python/django-tables2-2.2.1
+++ b/metadata/md5-cache/dev-python/django-tables2-2.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-tables2/django-tables2-2.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=495e52891d8394b5a6fcf4722880bf12
diff --git a/metadata/md5-cache/dev-python/django-tagging-0.4.6 b/metadata/md5-cache/dev-python/django-tagging-0.4.6
index 81022b6ec656..18a9fdf3b60a 100644
--- a/metadata/md5-cache/dev-python/django-tagging-0.4.6
+++ b/metadata/md5-cache/dev-python/django-tagging-0.4.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.0[python_targets_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-tagging/django-tagging-0.4.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec50d914616a5c864ea7ab38512a3aa2
diff --git a/metadata/md5-cache/dev-python/django-taggit-0.24.0 b/metadata/md5-cache/dev-python/django-taggit-0.24.0
index 44e8247c4458..4430e54d4ef0 100644
--- a/metadata/md5-cache/dev-python/django-taggit-0.24.0
+++ b/metadata/md5-cache/dev-python/django-taggit-0.24.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit/django-taggit-0.24.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=738a06e703fead58c40b3f63494775ca
diff --git a/metadata/md5-cache/dev-python/django-taggit-1.1.0 b/metadata/md5-cache/dev-python/django-taggit-1.1.0
index fdad93652e02..8251c07fbd81 100644
--- a/metadata/md5-cache/dev-python/django-taggit-1.1.0
+++ b/metadata/md5-cache/dev-python/django-taggit-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit/django-taggit-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=738a06e703fead58c40b3f63494775ca
diff --git a/metadata/md5-cache/dev-python/django-taggit-1.2.0 b/metadata/md5-cache/dev-python/django-taggit-1.2.0
index 67ff00e12357..8bbe6b4b4ed6 100644
--- a/metadata/md5-cache/dev-python/django-taggit-1.2.0
+++ b/metadata/md5-cache/dev-python/django-taggit-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit/django-taggit-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=124f12b4e9e2f1ea70b736dcac73aeea
diff --git a/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7 b/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
index ba152d6b6ae8..e5dea667aafd 100644
--- a/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
+++ b/metadata/md5-cache/dev-python/django-taggit-serializer-0.1.7
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-taggit-serializer/django-taggit-serializer-0.1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dca94a2e3e38ed5b348da6855d9cd5bb
diff --git a/metadata/md5-cache/dev-python/django-timezone-field-3.0 b/metadata/md5-cache/dev-python/django-timezone-field-3.0
index cfb1f62d829e..34caace0b579 100644
--- a/metadata/md5-cache/dev-python/django-timezone-field-3.0
+++ b/metadata/md5-cache/dev-python/django-timezone-field-3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.8[python_targets_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-timezone-field/django-timezone-field-3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=363cebc29e808c40d2a7cd181475e82e
diff --git a/metadata/md5-cache/dev-python/django-timezone-field-4.0 b/metadata/md5-cache/dev-python/django-timezone-field-4.0
index 0193fcbcbd98..48c8785e8ac3 100644
--- a/metadata/md5-cache/dev-python/django-timezone-field-4.0
+++ b/metadata/md5-cache/dev-python/django-timezone-field-4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-2.2[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-timezone-field/django-timezone-field-4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4e33ea4b57e2293fba6ef1987afc8629
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 0d24044477fd..9da240b94d63 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19e3a2474d6b2b6f22ac5dacba8621f3
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 2868b692e568..4d510851ad7e 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9334976550912766024a75e982f7e6e
diff --git a/metadata/md5-cache/dev-python/django_polymorphic-2.0.3 b/metadata/md5-cache/dev-python/django_polymorphic-2.0.3
index 2e242cce96cd..e00ce84fd95c 100644
--- a/metadata/md5-cache/dev-python/django_polymorphic-2.0.3
+++ b/metadata/md5-cache/dev-python/django_polymorphic-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/django-polymorphic/django-polymorphic/archive/v2.0.3.tar.gz -> django_polymorphic-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b17a8427fe768af11c2a044d2032cd6e
diff --git a/metadata/md5-cache/dev-python/djangorestframework-3.10.3 b/metadata/md5-cache/dev-python/djangorestframework-3.10.3
index eb3af7ab969f..0a2f41522a4b 100644
--- a/metadata/md5-cache/dev-python/djangorestframework-3.10.3
+++ b/metadata/md5-cache/dev-python/djangorestframework-3.10.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangorestframework/djangorestframework-3.10.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d9b7852f408ebd6d2ac14079f3f225b
diff --git a/metadata/md5-cache/dev-python/djangorestframework-3.9.2 b/metadata/md5-cache/dev-python/djangorestframework-3.9.2
index 8ef5a8b07133..57790454916a 100644
--- a/metadata/md5-cache/dev-python/djangorestframework-3.9.2
+++ b/metadata/md5-cache/dev-python/djangorestframework-3.9.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangorestframework/djangorestframework-3.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d9b7852f408ebd6d2ac14079f3f225b
diff --git a/metadata/md5-cache/dev-python/djangorestframework-3.9.4 b/metadata/md5-cache/dev-python/djangorestframework-3.9.4
index 954056dcdb53..006733ee9185 100644
--- a/metadata/md5-cache/dev-python/djangorestframework-3.9.4
+++ b/metadata/md5-cache/dev-python/djangorestframework-3.9.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11[python_targets_python3_6(-)?,python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/djangorestframework/djangorestframework-3.9.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d9b7852f408ebd6d2ac14079f3f225b
diff --git a/metadata/md5-cache/dev-python/dkimpy-0.6.2 b/metadata/md5-cache/dev-python/dkimpy-0.6.2
index 12476cc8a9fc..ab329fb81e9f 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dkimpy/dkimpy-0.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2ce430abbbabaf00680953ae9606c8a
diff --git a/metadata/md5-cache/dev-python/dkimpy-0.9.2 b/metadata/md5-cache/dev-python/dkimpy-0.9.2
index 386599077187..c749dc017617 100644
--- a/metadata/md5-cache/dev-python/dkimpy-0.9.2
+++ b/metadata/md5-cache/dev-python/dkimpy-0.9.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython[python_targets_python2_7(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dkimpy/dkimpy-0.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=62f5fda2c2ed2f5351a23af9e35908fa
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.1.6 b/metadata/md5-cache/dev-python/dns-lexicon-3.1.6
index da19ef59e9ed..21ddd4d59619 100644
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.1.6
+++ b/metadata/md5-cache/dev-python/dns-lexicon-3.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dns-lexicon/dns-lexicon-3.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41c3e9408e36557162a2535785d6a8a7
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.3.4 b/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
index eb9c0f1a307c..a8a8d70ee6a2 100644
--- a/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
+++ b/metadata/md5-cache/dev-python/dns-lexicon-3.3.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dns-lexicon/dns-lexicon-3.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41c3e9408e36557162a2535785d6a8a7
diff --git a/metadata/md5-cache/dev-python/dnslib-0.9.6 b/metadata/md5-cache/dev-python/dnslib-0.9.6
index 281854cacb09..dc6e1a4ffcc2 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dnslib/dnslib-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8cd8d9742a76859619a6ee9be5948a4f
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 1908d297758a..a2caef47aee7 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
+++ b/metadata/md5-cache/dev-python/dnspython-1.15.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dnspython/dnspython-1.15.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44cd8196082b57a106e30cc948da8f13
diff --git a/metadata/md5-cache/dev-python/dnspython-1.16.0 b/metadata/md5-cache/dev-python/dnspython-1.16.0
index 7327d0276f9d..628244debc8b 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.16.0
+++ b/metadata/md5-cache/dev-python/dnspython-1.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v1.16.0.tar.gz -> dnspython-1.16.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b7b838c0ed9cdafc67e1d373d1242342
diff --git a/metadata/md5-cache/dev-python/dnspython-1.16.0-r1 b/metadata/md5-cache/dev-python/dnspython-1.16.0-r1
index 0dd9c248c046..e5adf153530b 100644
--- a/metadata/md5-cache/dev-python/dnspython-1.16.0-r1
+++ b/metadata/md5-cache/dev-python/dnspython-1.16.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rthalley/dnspython/archive/v1.16.0.tar.gz -> dnspython-1.16.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f4d6e3d0969b50b012260fb5c6de65c
diff --git a/metadata/md5-cache/dev-python/doc8-0.6.0 b/metadata/md5-cache/dev-python/doc8-0.6.0
index 8e1248c2c59c..2d61f14eca9e 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_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doc8/doc8-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87b06230e7cd17d179c7e09ba54b3751
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 c3a9b75ae7b8..ce8e4ea6bcfa 100644
--- a/metadata/md5-cache/dev-python/docker-py-2.7.0
+++ b/metadata/md5-cache/dev-python/docker-py-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/2.7.0.tar.gz -> docker-py-2.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=732253c7a67c23b6f97ab1b3191e9133
diff --git a/metadata/md5-cache/dev-python/docker-py-3.6.0 b/metadata/md5-cache/dev-python/docker-py-3.6.0
index c9901ee6359d..263b841afee5 100644
--- a/metadata/md5-cache/dev-python/docker-py-3.6.0
+++ b/metadata/md5-cache/dev-python/docker-py-3.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/3.6.0.tar.gz -> docker-py-3.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ce457314165fe46c412bba4c734c163
diff --git a/metadata/md5-cache/dev-python/docker-py-3.7.1 b/metadata/md5-cache/dev-python/docker-py-3.7.1
index 06eb37486a40..2ef846d88b56 100644
--- a/metadata/md5-cache/dev-python/docker-py-3.7.1
+++ b/metadata/md5-cache/dev-python/docker-py-3.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/3.7.1.tar.gz -> docker-py-3.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=02ce5df3d885b98f202b49c74644f86f
diff --git a/metadata/md5-cache/dev-python/docker-py-3.7.3 b/metadata/md5-cache/dev-python/docker-py-3.7.3
index 642e180d3895..75e45398b6b5 100644
--- a/metadata/md5-cache/dev-python/docker-py-3.7.3
+++ b/metadata/md5-cache/dev-python/docker-py-3.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/3.7.3.tar.gz -> docker-py-3.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f367661934d47abfd4cdcf4e7b2b5f49
diff --git a/metadata/md5-cache/dev-python/docker-py-4.1.0 b/metadata/md5-cache/dev-python/docker-py-4.1.0
index 553eeec76aa5..07d640da8050 100644
--- a/metadata/md5-cache/dev-python/docker-py-4.1.0
+++ b/metadata/md5-cache/dev-python/docker-py-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docker/docker-py/archive/4.1.0.tar.gz -> docker-py-4.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0911518cef91a46dea701b3c416eee40
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 83153ac9218c..1073c0724d3d 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d41dacfafc42da2d82d15eb05c918ed2
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 6fed888f387f..61742e81d04f 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e16a04cfd7d71520197c737f098c9ebd
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 02804b89e491..cfab4db1df37 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_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a386a5e6a5f4ad49af29b82434db447a
diff --git a/metadata/md5-cache/dev-python/docker-pycreds-0.4.0 b/metadata/md5-cache/dev-python/docker-pycreds-0.4.0
index 04227fa4952d..7076a0ba9d37 100644
--- a/metadata/md5-cache/dev-python/docker-pycreds-0.4.0
+++ b/metadata/md5-cache/dev-python/docker-pycreds-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/six-1.4.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docker-pycreds/docker-pycreds-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4d556019600559b185ba85c85c24c98
diff --git a/metadata/md5-cache/dev-python/dockerpty-0.4.1 b/metadata/md5-cache/dev-python/dockerpty-0.4.1
index 90603041e283..864736fc8263 100644
--- a/metadata/md5-cache/dev-python/dockerpty-0.4.1
+++ b/metadata/md5-cache/dev-python/dockerpty-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8234441e179db8c2f5d4036e826f4fa5
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 c63939bdabcc..73fe83709eb3 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_pypy3 python_targets_python2_7 python_targets_p
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f677113d80fcfcdfe57f64231fed4318
diff --git a/metadata/md5-cache/dev-python/docopt-0.6.2-r3 b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
index 0f684a6df944..c93edd88e207 100644
--- a/metadata/md5-cache/dev-python/docopt-0.6.2-r3
+++ b/metadata/md5-cache/dev-python/docopt-0.6.2-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/docopt/docopt/archive/0.6.2.tar.gz -> docopt-0.6.2.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=46e999174533c804ef5a26132b415a1d
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 9c9dc1bc7b21..2c1db1e7b3fd 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
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e3ffb0f86d0fb40bdcf3514dbe7bf472
diff --git a/metadata/md5-cache/dev-python/docutils-0.12 b/metadata/md5-cache/dev-python/docutils-0.12
index 5263d9f4908c..37456fe3bfe8 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_pypy3(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=551027ef9ae7fdf569f8b7421dbebe26
diff --git a/metadata/md5-cache/dev-python/docutils-0.13.1 b/metadata/md5-cache/dev-python/docutils-0.13.1
index b6d67452a1ad..fb1e2673b452 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_pypy3(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.13.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03e172f700dc9d4f56f80a2eeef30c7c
diff --git a/metadata/md5-cache/dev-python/docutils-0.14 b/metadata/md5-cache/dev-python/docutils-0.14
index 8e1de3193d04..d0b05a1351c0 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_pypy3(-)?,python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/docutils/docutils-0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e6afcaf715d6b15d8a3b0182e22c05f
diff --git a/metadata/md5-cache/dev-python/docutils-0.15.2 b/metadata/md5-cache/dev-python/docutils-0.15.2
index 829fb868c3d6..44c1e90779e1 100644
--- a/metadata/md5-cache/dev-python/docutils-0.15.2
+++ b/metadata/md5-cache/dev-python/docutils-0.15.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.15.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cc37b407924e790efb1b8f0a9a48cccf
diff --git a/metadata/md5-cache/dev-python/docutils-glep-1.2 b/metadata/md5-cache/dev-python/docutils-glep-1.2
index c6f2ef8f99ae..2f362a840973 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-1.2
+++ b/metadata/md5-cache/dev-python/docutils-glep-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils_glep/docutils_glep-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0cde71e6c1b87420770d167ff279646
diff --git a/metadata/md5-cache/dev-python/docutils-glep-9999 b/metadata/md5-cache/dev-python/docutils-glep-9999
index 8cb01a17903f..31ec2ed2d728 100644
--- a/metadata/md5-cache/dev-python/docutils-glep-9999
+++ b/metadata/md5-cache/dev-python/docutils-glep-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/docutils-0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac55a87dfbfd234730c8e67074a0b0ac
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 384cc25f18e9..d441f196a2d1 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-0.6.4
+++ b/metadata/md5-cache/dev-python/dogpile-cache-0.6.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-0.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=65ad1f37fba9cb48d74148b5516c929e
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-0.7.1 b/metadata/md5-cache/dev-python/dogpile-cache-0.7.1
index d956accc6a76..f2be60880e63 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-0.7.1
+++ b/metadata/md5-cache/dev-python/dogpile-cache-0.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-0.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c700210f61e4bd9e4188b2cb90c1afc5
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 2ddedc171155..af7b3e632669 100644
--- a/metadata/md5-cache/dev-python/dogpile-core-0.4.1
+++ b/metadata/md5-cache/dev-python/dogpile-core-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.core/dogpile.core-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c401bae1a1975fdcd2b3a3625322e7d6
diff --git a/metadata/md5-cache/dev-python/doit-0.29.0 b/metadata/md5-cache/dev-python/doit-0.29.0
index 0dafba029ae4..7320174250bb 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/doit/doit-0.29.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cddcc15c3640a82a722e90eb1ddbb4ac
diff --git a/metadata/md5-cache/dev-python/doit-0.32.0 b/metadata/md5-cache/dev-python/doit-0.32.0
index 619eaed4f384..28f7c6993ebf 100644
--- a/metadata/md5-cache/dev-python/doit-0.32.0
+++ b/metadata/md5-cache/dev-python/doit-0.32.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit/doit-0.32.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=78cf880ff5f4dd5063b83bd490a8a38d
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 b816ed21c650..9a1a3f873608 100644
--- a/metadata/md5-cache/dev-python/doit-py-0.4.0
+++ b/metadata/md5-cache/dev-python/doit-py-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit-py/doit-py-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=78242442fffcdf13b4ccfa9523ec4ad8
diff --git a/metadata/md5-cache/dev-python/doit-py-0.4.0-r1 b/metadata/md5-cache/dev-python/doit-py-0.4.0-r1
index 74c3c7e44bfc..38693937bcb5 100644
--- a/metadata/md5-cache/dev-python/doit-py-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/doit-py-0.4.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-pathlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/doit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/configclass[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+BDEPEND=test? ( virtual/python-pathlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/doit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/configclass[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/pyflakes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-text/hunspell ) doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=doit tasks for python stuff
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/doit-py/doit-py-0.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=81394ca1f511ad095c8a3f9083e0eec2
diff --git a/metadata/md5-cache/dev-python/dominate-2.3.1 b/metadata/md5-cache/dev-python/dominate-2.3.1
index b47bbc453ead..c01c6a9dd4c4 100644
--- a/metadata/md5-cache/dev-python/dominate-2.3.1
+++ b/metadata/md5-cache/dev-python/dominate-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4b55c2470c76871505a262bb2a80a874
diff --git a/metadata/md5-cache/dev-python/dominate-2.3.5 b/metadata/md5-cache/dev-python/dominate-2.3.5
index f285cb45eeb3..7b338b0b85b7 100644
--- a/metadata/md5-cache/dev-python/dominate-2.3.5
+++ b/metadata/md5-cache/dev-python/dominate-2.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.3.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=795ae0b5e8bd26ca06a9ee12053ddae2
diff --git a/metadata/md5-cache/dev-python/dominate-2.4.0 b/metadata/md5-cache/dev-python/dominate-2.4.0
index 16204bb775b4..80f0251f81f1 100644
--- a/metadata/md5-cache/dev-python/dominate-2.4.0
+++ b/metadata/md5-cache/dev-python/dominate-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dominate/dominate-2.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a0e69cfbcb2ff1a2486d2edb0f6ead0
diff --git a/metadata/md5-cache/dev-python/doublex-1.8.1 b/metadata/md5-cache/dev-python/doublex-1.8.1
index 73db2d43796d..c2f6107a0a99 100644
--- a/metadata/md5-cache/dev-python/doublex-1.8.1
+++ b/metadata/md5-cache/dev-python/doublex-1.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e33cdb4bafc1daf337471327eabb824b
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 843092a4c8a1..79daf60f0245 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06b6abf5a66579b0784f8891bf711f2f
diff --git a/metadata/md5-cache/dev-python/dpkt-1.8-r1 b/metadata/md5-cache/dev-python/dpkt-1.8-r1
index 9adfb8e5d5ba..0162a96c1210 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 8d679ed61e27..187d9dc6782a 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 3ec1d26959c1..92dbc87cbe59 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a72a292be4d3ff76e7944e1b38541193
diff --git a/metadata/md5-cache/dev-python/drf-yasg-1.14.0 b/metadata/md5-cache/dev-python/drf-yasg-1.14.0
index 77d4d9ae2ca8..fd91ef5a8215 100644
--- a/metadata/md5-cache/dev-python/drf-yasg-1.14.0
+++ b/metadata/md5-cache/dev-python/drf-yasg-1.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11.7[python_targets_python3_6(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/drf-yasg/drf-yasg-1.14.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fc96b1ebd8cf0cc8c954cd987b5eecbd
diff --git a/metadata/md5-cache/dev-python/drf-yasg-1.16.0 b/metadata/md5-cache/dev-python/drf-yasg-1.16.0
index a22564bca22c..a602558d6e1e 100644
--- a/metadata/md5-cache/dev-python/drf-yasg-1.16.0
+++ b/metadata/md5-cache/dev-python/drf-yasg-1.16.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/django-1.11.7[python_targets_python3_6(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/drf-yasg/drf-yasg-1.16.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fc96b1ebd8cf0cc8c954cd987b5eecbd
diff --git a/metadata/md5-cache/dev-python/drf-yasg-1.17.0 b/metadata/md5-cache/dev-python/drf-yasg-1.17.0
index ec2db685a60d..7171c77eb79b 100644
--- a/metadata/md5-cache/dev-python/drf-yasg-1.17.0
+++ b/metadata/md5-cache/dev-python/drf-yasg-1.17.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/coreapi-2.3.3[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/drf-yasg/drf-yasg-1.17.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=20d12e4747be6dba856b8d8f2e19dcb8
diff --git a/metadata/md5-cache/dev-python/duecredit-0.6.4-r1 b/metadata/md5-cache/dev-python/duecredit-0.6.4-r1
index ea0b01cc4a1c..7e4dba168532 100644
--- a/metadata/md5-cache/dev-python/duecredit-0.6.4-r1
+++ b/metadata/md5-cache/dev-python/duecredit-0.6.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/duecredit/duecredit-0.6.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec12dc1adeecd126905fd64aa3494148
diff --git a/metadata/md5-cache/dev-python/duecredit-0.7.0 b/metadata/md5-cache/dev-python/duecredit-0.7.0
index 2f9b7329eea4..7fdd9e85c30f 100644
--- a/metadata/md5-cache/dev-python/duecredit-0.7.0
+++ b/metadata/md5-cache/dev-python/duecredit-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/citeproc-py-0.4[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/duecredit/duecredit-0.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec12dc1adeecd126905fd64aa3494148
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.1 b/metadata/md5-cache/dev-python/dugong-3.7.1
index 71110dcd9891..89de6d90cbd8 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.1
+++ b/metadata/md5-cache/dev-python/dugong-3.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e988cfe24d4d6e8213bdf0abeebb9fe0
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.2 b/metadata/md5-cache/dev-python/dugong-3.7.2
index aa222c2a6cb4..3734739520b0 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.2
+++ b/metadata/md5-cache/dev-python/dugong-3.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=21673eeb5d3b9f96c7179a1b7c788bb5
diff --git a/metadata/md5-cache/dev-python/dugong-3.7.3 b/metadata/md5-cache/dev-python/dugong-3.7.3
index 48c7e01c432d..65ab7c427e02 100644
--- a/metadata/md5-cache/dev-python/dugong-3.7.3
+++ b/metadata/md5-cache/dev-python/dugong-3.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dugong/dugong-3.7.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1829db3a9a2820e1eb5899e74a10c6b
diff --git a/metadata/md5-cache/dev-python/dulwich-0.18.5 b/metadata/md5-cache/dev-python/dulwich-0.18.5
index 92ea83c027e0..f4ea1ba9c42f 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.18.5
+++ b/metadata/md5-cache/dev-python/dulwich-0.18.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.18.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3f4edc88c206ee325b15580afc647eb
diff --git a/metadata/md5-cache/dev-python/dulwich-0.18.6 b/metadata/md5-cache/dev-python/dulwich-0.18.6
index 3ee855a94539..f803cede03a3 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.18.6
+++ b/metadata/md5-cache/dev-python/dulwich-0.18.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.18.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3783f2d123b2c551e5c578ff5cdd13cc
diff --git a/metadata/md5-cache/dev-python/dulwich-0.19.15 b/metadata/md5-cache/dev-python/dulwich-0.19.15
index 9a1f6901493b..a5ed445147cd 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.19.15
+++ b/metadata/md5-cache/dev-python/dulwich-0.19.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.19.15.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9d7446e9f7f3445bbcc050eb1ca5c74f
diff --git a/metadata/md5-cache/dev-python/dulwich-0.19.4 b/metadata/md5-cache/dev-python/dulwich-0.19.4
index 1cbd358f2eac..1619a3d956c0 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.19.4
+++ b/metadata/md5-cache/dev-python/dulwich-0.19.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.19.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d893279ef5943efd32092105aa81f38d
diff --git a/metadata/md5-cache/dev-python/dulwich-0.19.6 b/metadata/md5-cache/dev-python/dulwich-0.19.6
index fa6093204ec3..5eb103ae2faa 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.19.6
+++ b/metadata/md5-cache/dev-python/dulwich-0.19.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.19.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a13b65103a5dd70f8fbd275fab31ebbb
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.7.2-r2 b/metadata/md5-cache/dev-python/dynd-python-0.7.2-r2
index a03b0b4021d1..544e235ec054 100644
--- a/metadata/md5-cache/dev-python/dynd-python-0.7.2-r2
+++ b/metadata/md5-cache/dev-python/dynd-python-0.7.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libdynd/dynd-python/archive/v0.7.2.tar.gz -> dynd-python-0.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f89d572ec6e09a2db4adc66f156c8b97
diff --git a/metadata/md5-cache/dev-python/e4u-0.1_rc5-r1 b/metadata/md5-cache/dev-python/e4u-0.1_rc5-r1
index db617b59cc66..019ffd09f09e 100644
--- a/metadata/md5-cache/dev-python/e4u-0.1_rc5-r1
+++ b/metadata/md5-cache/dev-python/e4u-0.1_rc5-r1
@@ -11,5 +11,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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=27c58c55972d49b6392ddbbd8e336939
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 1ea6c449b424..158aefe2c850 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e95a5966b6485909d6d0733af098169
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.12 b/metadata/md5-cache/dev-python/ebuildtester-0.1.12
index e0ce44709c0b..4932d9d2b1d8 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.12
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.12.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03315cd3725d408fc4accbde703a42ec
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.13 b/metadata/md5-cache/dev-python/ebuildtester-0.1.13
index bc2b0ca8aa61..3e6ce01fde56 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.13
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.13.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03315cd3725d408fc4accbde703a42ec
diff --git a/metadata/md5-cache/dev-python/ebuildtester-0.1.14 b/metadata/md5-cache/dev-python/ebuildtester-0.1.14
index 53b487ec35be..0d8f5c7e9269 100644
--- a/metadata/md5-cache/dev-python/ebuildtester-0.1.14
+++ b/metadata/md5-cache/dev-python/ebuildtester-0.1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ebuildtester/ebuildtester-0.1.14.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03315cd3725d408fc4accbde703a42ec
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.13 b/metadata/md5-cache/dev-python/ecdsa-0.13
index feb2a78add44..d01b564cc666 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3b1248fa2a6ed47ab6e25c859434ee7
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.13.2 b/metadata/md5-cache/dev-python/ecdsa-0.13.2
index cc02bccb0c13..53d4f759d5c3 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.13.2
+++ b/metadata/md5-cache/dev-python/ecdsa-0.13.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.13.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=799fb1b1aa66dfea87d9367c584852ce
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.13.3 b/metadata/md5-cache/dev-python/ecdsa-0.13.3
index 2bb5c9154c3b..33c4b42119fa 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.13.3
+++ b/metadata/md5-cache/dev-python/ecdsa-0.13.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.13.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=18552e6f49d85e35ad2add252d49ce64
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.14.1 b/metadata/md5-cache/dev-python/ecdsa-0.14.1
index 9afa03820d94..de6b3e802015 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.14.1
+++ b/metadata/md5-cache/dev-python/ecdsa-0.14.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.14.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=49a4e3edb55bd8475201b9f2be09d63b
diff --git a/metadata/md5-cache/dev-python/ecdsa-0.14.1-r1 b/metadata/md5-cache/dev-python/ecdsa-0.14.1-r1
index 274b6a76e8c3..9ea6671952e9 100644
--- a/metadata/md5-cache/dev-python/ecdsa-0.14.1-r1
+++ b/metadata/md5-cache/dev-python/ecdsa-0.14.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/ecdsa/ecdsa-0.14.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c9564e79ba47afc79c97e1fe96a406c1
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 9125c572acdf..39c52f3d98e1 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 01700b3db885..ddd48e30c6f8 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d14e68a99654e525c34900a17c4ed538
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 f62278b1c6fc..571411a4b68a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2569b36f38b5c5837cf151148ccf2cf
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 b6c50d9e94f0..804fa2c1cc5f 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01dd5e2ac2e1d1e93f2bf663b0ab4679
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 3fdde3785bb4..1232c1c655b1 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13ded76794998b0c9f3e2a405179baed
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4-r1 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4-r1
index 8e0abce41c6f..1699ab215a2b 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4-r1
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.5.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/curator/archive/v5.5.4.tar.gz -> elasticsearch-curator-5.5.4.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.3.2.tar.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb39eb15c480cf42eab85114ba80bf92
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.6.0 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.6.0
index 89d19d8114cb..592c1ef1c642 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.6.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/curator/archive/v5.6.0.tar.gz -> elasticsearch-curator-5.6.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.4.3.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=503ebc3b3fd146e9a86f10f7b7e65b49
diff --git a/metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1 b/metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1
index 96ae18a57e97..29d2bced7524 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1
+++ b/metadata/md5-cache/dev-python/elasticsearch-curator-5.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/curator/archive/v5.8.1.tar.gz -> elasticsearch-curator-5.8.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.3.2-linux-x86_64.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d7c7a916045062897e83bc7799a0c95d
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.3.1-r1 b/metadata/md5-cache/dev-python/elasticsearch-py-6.3.1-r1
index dfb3cbdc0124..aedc42f85c47 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-6.3.1-r1
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/6.3.1.tar.gz -> elasticsearch-py-6.3.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.4.0.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=047d560dbb3129461dc12eac5d37c6ae
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-6.4.0 b/metadata/md5-cache/dev-python/elasticsearch-py-6.4.0
index ee6e29683333..e29b984da797 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-6.4.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-6.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/v6.4.0.tar.gz -> elasticsearch-py-6.4.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-6.4.0.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bfdf35aeace23827c3e9d74a5bae11c9
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-7.0.5 b/metadata/md5-cache/dev-python/elasticsearch-py-7.0.5
index 336947e14eec..4e42e7bc6743 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-7.0.5
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-7.0.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/7.0.5.tar.gz -> elasticsearch-py-7.0.5.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e3c32bc7453211adfd7b088677bebf6
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-7.1.0 b/metadata/md5-cache/dev-python/elasticsearch-py-7.1.0
index c3c216731a65..f76eeca8a2ab 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-7.1.0
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-7.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/7.1.0.tar.gz -> elasticsearch-py-7.1.0.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.0.1-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dd3a4d706e0fbd865ef791768e0705c6
diff --git a/metadata/md5-cache/dev-python/elasticsearch-py-7.5.1 b/metadata/md5-cache/dev-python/elasticsearch-py-7.5.1
index 9a86b7ccf46c..1ba60a31f52d 100644
--- a/metadata/md5-cache/dev-python/elasticsearch-py-7.5.1
+++ b/metadata/md5-cache/dev-python/elasticsearch-py-7.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/elasticsearch/elasticsearch-py/archive/7.5.1.tar.gz -> elasticsearch-py-7.5.1.tar.gz test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.5.2-no-jdk-linux-x86_64.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6ea6820ef9e365288ec27dc317dde84a
diff --git a/metadata/md5-cache/dev-python/elementpath-1.3.1 b/metadata/md5-cache/dev-python/elementpath-1.3.1
index 574d6b27ac9a..3c58f720c3ef 100644
--- a/metadata/md5-cache/dev-python/elementpath-1.3.1
+++ b/metadata/md5-cache/dev-python/elementpath-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/elementpath/elementpath-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ee79d481b32a2c20cafb0c99e3c8c32
diff --git a/metadata/md5-cache/dev-python/elementpath-1.4.1 b/metadata/md5-cache/dev-python/elementpath-1.4.1
index 68f0bfd03b9c..6bef11dabaf0 100644
--- a/metadata/md5-cache/dev-python/elementpath-1.4.1
+++ b/metadata/md5-cache/dev-python/elementpath-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/elementpath/elementpath-1.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe3ba176070c27253985fb0c3889a976
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 a2f5fedade8b..9d44c8b6815d 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f4932b15ad1f59b02df861a94c4205b
diff --git a/metadata/md5-cache/dev-python/elib-intl-0_pre20110711 b/metadata/md5-cache/dev-python/elib-intl-0_pre20110711
index 790801f4458a..33578415cbda 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 5c9630b54597..810f9c284ed5 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/E/Embedly/Embedly-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=deb2bca4b8fdb8459fd49a377b44c087
diff --git a/metadata/md5-cache/dev-python/emcee-2.2.1 b/metadata/md5-cache/dev-python/emcee-2.2.1
index c2ddcf873650..5f16165a80c4 100644
--- a/metadata/md5-cache/dev-python/emcee-2.2.1
+++ b/metadata/md5-cache/dev-python/emcee-2.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/emcee/emcee-2.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c6bb3f9731ba0225c6354e64b1f1e50
diff --git a/metadata/md5-cache/dev-python/empy-3.3-r1 b/metadata/md5-cache/dev-python/empy-3.3-r1
index b5b1997b910a..d75459a5569d 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_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.alcyone.com/software/empy/empy-3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=618d5fc8cb260acfbf876f340720b450
diff --git a/metadata/md5-cache/dev-python/empy-3.3.2 b/metadata/md5-cache/dev-python/empy-3.3.2
index 3f27b891370f..6cd4c80a8ce6 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e4384b17f3bc460650c33058d433c12
diff --git a/metadata/md5-cache/dev-python/empy-3.3.3 b/metadata/md5-cache/dev-python/empy-3.3.3
index e1ed4676fe3d..117370e5fe7f 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.alcyone.com/software/empy/empy-3.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2004b83d0da89602f49624211af9d83
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.2.3 b/metadata/md5-cache/dev-python/entrypoints-0.2.3
index 11614e58a4bd..58b637494561 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.2.3
+++ b/metadata/md5-cache/dev-python/entrypoints-0.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com//takluyver/entrypoints/archive/0.2.3.tar.gz -> entrypoints-0.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4abc9216145903dde38ff91922bd3367
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.3 b/metadata/md5-cache/dev-python/entrypoints-0.3
index 2f16e19fb1b1..4d90469b5484 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.3
+++ b/metadata/md5-cache/dev-python/entrypoints-0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/entrypoints/entrypoints-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3616da1ab80ee0d1b4b85aabaf3308ea
diff --git a/metadata/md5-cache/dev-python/entrypoints-0.3-r1 b/metadata/md5-cache/dev-python/entrypoints-0.3-r1
index e16daca21432..45f9fa4ef357 100644
--- a/metadata/md5-cache/dev-python/entrypoints-0.3-r1
+++ b/metadata/md5-cache/dev-python/entrypoints-0.3-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Discover and load entry points from installed packages
 EAPI=7
 HOMEPAGE=https://github.com/takluyver/entrypoints
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-python/configparser-3.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/entrypoints/entrypoints-0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c88f22c67f44ef504fe89c7d451f68a4
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2e394eb605d42cb3e5fde60b950ccfc2
diff --git a/metadata/md5-cache/dev-python/enum34-1.1.6-r1 b/metadata/md5-cache/dev-python/enum34-1.1.6-r1
index 97b9b668d354..3961a306b642 100644
--- a/metadata/md5-cache/dev-python/enum34-1.1.6-r1
+++ b/metadata/md5-cache/dev-python/enum34-1.1.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=mirror://pypi/e/enum34/enum34-1.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9680e3530760c129162bab41330386d4
diff --git a/metadata/md5-cache/dev-python/envoy-0.0.3 b/metadata/md5-cache/dev-python/envoy-0.0.3
index 0c0131412783..fe53d7b833ea 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/envoy/envoy-0.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e423d151b7f367e775ccdaf12dcdad08
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 b34c05c733fb..d847462332b7 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/envoy/envoy-0.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0c98839e1bf6c48b5c53c5ba032fb51
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 81bbffb05203..92417e068fde 100644
--- a/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
+++ b/metadata/md5-cache/dev-python/enzyme-0.4.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ac9969d9caf74c828e528caabe7c77c
diff --git a/metadata/md5-cache/dev-python/enzyme-9999 b/metadata/md5-cache/dev-python/enzyme-9999
index 9da30816dd3b..94058a7bb7da 100644
--- a/metadata/md5-cache/dev-python/enzyme-9999
+++ b/metadata/md5-cache/dev-python/enzyme-9999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ba05669c0162a4dbe8b90eff8c43a1a
diff --git a/metadata/md5-cache/dev-python/epsilon-0.7.0 b/metadata/md5-cache/dev-python/epsilon-0.7.0
index c7ae8fb2681f..4788fac7be21 100644
--- a/metadata/md5-cache/dev-python/epsilon-0.7.0
+++ b/metadata/md5-cache/dev-python/epsilon-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/E/Epsilon/Epsilon-0.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0dedaa5eb14d33b5501915614b2dda7
diff --git a/metadata/md5-cache/dev-python/epsilon-0.7.1 b/metadata/md5-cache/dev-python/epsilon-0.7.1
index e61b8a842157..0654e6d11822 100644
--- a/metadata/md5-cache/dev-python/epsilon-0.7.1
+++ b/metadata/md5-cache/dev-python/epsilon-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/E/Epsilon/Epsilon-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f96f1f21441fb79c53554ba60ade8fd6
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 2c0cf99344f9..715fc3aa96ed 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bc65f441410c1136cd8c091b40cc2d0
diff --git a/metadata/md5-cache/dev-python/eradicate-0.2.1 b/metadata/md5-cache/dev-python/eradicate-0.2.1
index 3c3f6e4f3909..d8baa3bfa34d 100644
--- a/metadata/md5-cache/dev-python/eradicate-0.2.1
+++ b/metadata/md5-cache/dev-python/eradicate-0.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/e/eradicate/eradicate-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a4112ce3970b66cdbd8dd8df3c8c877
diff --git a/metadata/md5-cache/dev-python/errorhandler-2.0.1 b/metadata/md5-cache/dev-python/errorhandler-2.0.1
index 2a809e50f414..49f0e8a11415 100644
--- a/metadata/md5-cache/dev-python/errorhandler-2.0.1
+++ b/metadata/md5-cache/dev-python/errorhandler-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/errorhandler/errorhandler-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2262366bae97b61f6c9804fcdb26975d
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 d18f285a5cc9..8e36774c1920 100644
--- a/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
+++ b/metadata/md5-cache/dev-python/et_xmlfile-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/et_xmlfile/et_xmlfile-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c7fca0a57d85e92a81de5c24b3e114a
diff --git a/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1 b/metadata/md5-cache/dev-python/eunuchs-20050320.1-r1
index 23eae8e32ef4..7c8ebb1b2010 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/e/eunuchs/eunuchs_20050320.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc6842125cdc7ba3567831b7642d3ae8
diff --git a/metadata/md5-cache/dev-python/eventlet-0.18.4 b/metadata/md5-cache/dev-python/eventlet-0.18.4
index 03813a0fb0fc..eba56b567ccc 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.18.4
+++ b/metadata/md5-cache/dev-python/eventlet-0.18.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.18.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f04cefbc07ac5f3cf41eab63268953bc
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 11138ef75b86..648cf7c56a09 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.20.0-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.20.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.20.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8db2a33d21459a0d86f275dd32ce25b0
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 0548e5935f37..4101711da069 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.20.1-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.20.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.20.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4334f39dac6571e10f988d1594705107
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 4c6d1e8eccef..7afd300c945d 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.21.0-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.21.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.21.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4762956489a5d3d16a4d2b9806423dc1
diff --git a/metadata/md5-cache/dev-python/eventlet-0.24.1 b/metadata/md5-cache/dev-python/eventlet-0.24.1
index 186bf8af093f..a5e90b79eae6 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.24.1
+++ b/metadata/md5-cache/dev-python/eventlet-0.24.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.24.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=29013951e5e220645ce157bda75ca7bf
diff --git a/metadata/md5-cache/dev-python/eventlet-0.24.1-r1 b/metadata/md5-cache/dev-python/eventlet-0.24.1-r1
index bf22949089b0..44c2ef47cc4f 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.24.1-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.24.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.24.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f549d4e13e6d9a6a2ddd7c15e8276e5
diff --git a/metadata/md5-cache/dev-python/eventlet-0.25.1 b/metadata/md5-cache/dev-python/eventlet-0.25.1
index be9d0c00e6f7..849ec2d10703 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.25.1
+++ b/metadata/md5-cache/dev-python/eventlet-0.25.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.25.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bc126b17c1f184597c0256ec5d1eca43
diff --git a/metadata/md5-cache/dev-python/eventlet-0.25.1-r1 b/metadata/md5-cache/dev-python/eventlet-0.25.1-r1
index ca87df6754fe..711c7cd77058 100644
--- a/metadata/md5-cache/dev-python/eventlet-0.25.1-r1
+++ b/metadata/md5-cache/dev-python/eventlet-0.25.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dnspython-1.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/monotonic-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/dnspython-1.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/monotonic-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=doc? ( >=dev-python/python-docs-2.7.6-r1:2.7 ) test? ( >=dev-python/dnspython-1.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/monotonic-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Highly concurrent networking library
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/eventlet/eventlet-0.25.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=955ea011adec3be1dead4edcfe462090
diff --git a/metadata/md5-cache/dev-python/execnet-1.4.1 b/metadata/md5-cache/dev-python/execnet-1.4.1
index 1239248bf500..e8b00720d4f1 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1b9f01e27b0e1dcadf538eff986c7abb
diff --git a/metadata/md5-cache/dev-python/execnet-1.5.0 b/metadata/md5-cache/dev-python/execnet-1.5.0
index f4fe13f83a99..61d4a242f52c 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ad3c93e2fc9986e8c575f54341c6c83
diff --git a/metadata/md5-cache/dev-python/execnet-1.7.1 b/metadata/md5-cache/dev-python/execnet-1.7.1
index 5e037eb48bd3..13f4b35e9d28 100644
--- a/metadata/md5-cache/dev-python/execnet-1.7.1
+++ b/metadata/md5-cache/dev-python/execnet-1.7.1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/apipkg-1.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/apipkg-1.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/apipkg-1.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Rapid multi-Python deployment
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/execnet/execnet-1.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7b1a6998dedf77f781e3c0f6c9160073
diff --git a/metadata/md5-cache/dev-python/expects-0.8.0 b/metadata/md5-cache/dev-python/expects-0.8.0
index 0276b4e42f40..644374522358 100644
--- a/metadata/md5-cache/dev-python/expects-0.8.0
+++ b/metadata/md5-cache/dev-python/expects-0.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/expects/expects-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cefdadccc10e2fa46d42e773bc66dfe5
diff --git a/metadata/md5-cache/dev-python/extras-0.0.3 b/metadata/md5-cache/dev-python/extras-0.0.3
index 4eae735cbee0..fcaf864bc06f 100644
--- a/metadata/md5-cache/dev-python/extras-0.0.3
+++ b/metadata/md5-cache/dev-python/extras-0.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/extras/extras-0.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91fb9a247a72eedb389189c92fd324a0
diff --git a/metadata/md5-cache/dev-python/extras-1.0.0 b/metadata/md5-cache/dev-python/extras-1.0.0
index 70a34c3dc728..acaaf3b02fb3 100644
--- a/metadata/md5-cache/dev-python/extras-1.0.0
+++ b/metadata/md5-cache/dev-python/extras-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/e/extras/extras-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a206237b95c19384d33d2574f32c1c4d
diff --git a/metadata/md5-cache/dev-python/extremes-1.1.1 b/metadata/md5-cache/dev-python/extremes-1.1.1
index a4e922894980..8a434cfdcc14 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_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/E/Extremes/Extremes-1.1.1.zip -> extremes-1.1.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4afa1f0738eb1e88a87aecc0584e28bc
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.7.5 b/metadata/md5-cache/dev-python/eyeD3-0.7.5
index 085ba8967a7d..cd9de52e464d 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6c1ee95f5e1caebf6def5c1e8dcf3a1
diff --git a/metadata/md5-cache/dev-python/eyeD3-0.8.11 b/metadata/md5-cache/dev-python/eyeD3-0.8.11
index 1bd90d72a39d..87dd39fc4dc0 100644
--- a/metadata/md5-cache/dev-python/eyeD3-0.8.11
+++ b/metadata/md5-cache/dev-python/eyeD3-0.8.11
@@ -4,11 +4,11 @@ DESCRIPTION=Module for manipulating ID3 (v1 + v2) tags in Python
 EAPI=6
 HOMEPAGE=http://eyed3.nicfit.net/
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 arm ~hppa ~ia64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0.7
 SRC_URI=https://github.com/nicfit/eyeD3/archive/v0.8.11.tar.gz -> eyeD3-0.8.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9de2f08c756c09f4e9eb11f33ad84f1f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef57c3b4a2e12a954140cbdc8ace679d
diff --git a/metadata/md5-cache/dev-python/fabric-2.3.1 b/metadata/md5-cache/dev-python/fabric-2.3.1
index c5b3525910f1..c93bf7cbe465 100644
--- a/metadata/md5-cache/dev-python/fabric-2.3.1
+++ b/metadata/md5-cache/dev-python/fabric-2.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/f/fabric/fabric-2.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=afeb33a74396f581eb9c0b1596a2b566
diff --git a/metadata/md5-cache/dev-python/falcon-1.3.0 b/metadata/md5-cache/dev-python/falcon-1.3.0
index e74e0ab611a5..f2843a166230 100644
--- a/metadata/md5-cache/dev-python/falcon-1.3.0
+++ b/metadata/md5-cache/dev-python/falcon-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13069b1ded6e772eb969ef828a05d0a0
diff --git a/metadata/md5-cache/dev-python/fasteners-0.14.1-r1 b/metadata/md5-cache/dev-python/fasteners-0.14.1-r1
index b151d3713645..f05183ef4699 100644
--- a/metadata/md5-cache/dev-python/fasteners-0.14.1-r1
+++ b/metadata/md5-cache/dev-python/fasteners-0.14.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fasteners/fasteners-0.14.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3187fae7af42c3c15ded4377daec4500
diff --git a/metadata/md5-cache/dev-python/fastparquet-0.1.1 b/metadata/md5-cache/dev-python/fastparquet-0.1.1
index 38841eba422a..3f1d23a34d40 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastparquet/fastparquet-0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=24af99085b9a51dea7cdea0f4270989e
diff --git a/metadata/md5-cache/dev-python/fastparquet-0.1.5 b/metadata/md5-cache/dev-python/fastparquet-0.1.5
index c251587ef3f4..468dd28a1968 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastparquet/fastparquet-0.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=504af08779eb120b2484bf3175ad699f
diff --git a/metadata/md5-cache/dev-python/faulthandler-2.6 b/metadata/md5-cache/dev-python/faulthandler-2.6
index b28e8b9e6da7..7aeccb48a77f 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dca2c9b2770d646ded50b8b3460239db
diff --git a/metadata/md5-cache/dev-python/faulthandler-3.0 b/metadata/md5-cache/dev-python/faulthandler-3.0
index 970c3a49b349..9d5c812f9618 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd1199a3a596334a79ca3fe5b876f7d9
diff --git a/metadata/md5-cache/dev-python/faulthandler-3.1 b/metadata/md5-cache/dev-python/faulthandler-3.1
index b9d046f0a117..0ac99f850896 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a74a49d9c6352355ec3b305b2b48b9ad
diff --git a/metadata/md5-cache/dev-python/fdsend-0.1 b/metadata/md5-cache/dev-python/fdsend-0.1
index 3e0a3b06c49e..daee9432cc45 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://pilcrow.madison.wi.us/sw/fdsend-0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b9aefa628dacb242c8f766ff3e7c793
diff --git a/metadata/md5-cache/dev-python/fedmsg-0.18.3 b/metadata/md5-cache/dev-python/fedmsg-0.18.3
index c79ed779c624..dd9bc1a86bd0 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fedmsg/fedmsg-0.18.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f27f564f2aa03c71e689ea0e50fd360
diff --git a/metadata/md5-cache/dev-python/feedgenerator-1.9 b/metadata/md5-cache/dev-python/feedgenerator-1.9
index fd0d8ef79591..9a7f1b3aac8f 100644
--- a/metadata/md5-cache/dev-python/feedgenerator-1.9
+++ b/metadata/md5-cache/dev-python/feedgenerator-1.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/feedgenerator/feedgenerator-1.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bc0902f38a89bee9ffa50ca4db0eb88c
diff --git a/metadata/md5-cache/dev-python/feedparser-5.2.1 b/metadata/md5-cache/dev-python/feedparser-5.2.1
index 10d9e96d2684..779ab31e731e 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/feedparser/feedparser-5.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acf98dd9c2281a4a2f41b28288f34a72
diff --git a/metadata/md5-cache/dev-python/fido2-0.7.3 b/metadata/md5-cache/dev-python/fido2-0.7.3
index 6ff8c6a87a22..fd352e864f34 100644
--- a/metadata/md5-cache/dev-python/fido2-0.7.3
+++ b/metadata/md5-cache/dev-python/fido2-0.7.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.7.3/fido2-0.7.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d200122a0f6f089aa68163e07121e07
diff --git a/metadata/md5-cache/dev-python/fido2-0.8.1 b/metadata/md5-cache/dev-python/fido2-0.8.1
index 856ce60584e1..cba930a246a9 100644
--- a/metadata/md5-cache/dev-python/fido2-0.8.1
+++ b/metadata/md5-cache/dev-python/fido2-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.8.1/fido2-0.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4f57f3ef085ccdcf2342387ac14bc49c
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0 b/metadata/md5-cache/dev-python/fields-5.0.0
index eb53f6cb85b8..ae45bc3bf0bc 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0
+++ b/metadata/md5-cache/dev-python/fields-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fields/fields-5.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4acc188f48ad3270d98ee2e6ac0d97d8
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0-r1 b/metadata/md5-cache/dev-python/fields-5.0.0-r1
index 169569f41052..7d60c9ff6545 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0-r1
+++ b/metadata/md5-cache/dev-python/fields-5.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fields/fields-5.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a05a5309b0433aac53aa1b40d8fc7419
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0-r2 b/metadata/md5-cache/dev-python/fields-5.0.0-r2
index 0dbb6a220c4d..07b91a6569f0 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0-r2
+++ b/metadata/md5-cache/dev-python/fields-5.0.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fields/fields-5.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8149a3434bf0524f3e504b3373ad9044
diff --git a/metadata/md5-cache/dev-python/filelock-3.0.10 b/metadata/md5-cache/dev-python/filelock-3.0.10
index f537665a3734..5ed20f2a7c52 100644
--- a/metadata/md5-cache/dev-python/filelock-3.0.10
+++ b/metadata/md5-cache/dev-python/filelock-3.0.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/benediktschmitt/py-filelock/archive/v3.0.10.tar.gz -> py-filelock-3.0.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7aeeab8626b5b8066193848363a6b1b8
diff --git a/metadata/md5-cache/dev-python/filelock-3.0.12 b/metadata/md5-cache/dev-python/filelock-3.0.12
index 5f30ac8095b6..60381e59d572 100644
--- a/metadata/md5-cache/dev-python/filelock-3.0.12
+++ b/metadata/md5-cache/dev-python/filelock-3.0.12
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/benediktschmitt/py-filelock/archive/v3.0.12.tar.gz -> py-filelock-3.0.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c4b3410a8065b77a0224766bf9865f1b
diff --git a/metadata/md5-cache/dev-python/filemagic-1.6 b/metadata/md5-cache/dev-python/filemagic-1.6
index 7f47a96fe0c6..7d5a38ca4a39 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/filemagic/filemagic-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b147cb8e056b4b95cd150b2f538ea20
diff --git a/metadata/md5-cache/dev-python/fitsio-0.9.11 b/metadata/md5-cache/dev-python/fitsio-0.9.11
index b6651824cdc9..1a72e1c7834b 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4d4273e65d6dd0617220273a05191b0c
diff --git a/metadata/md5-cache/dev-python/fixtures-1.4.0 b/metadata/md5-cache/dev-python/fixtures-1.4.0
index 5b64c0380256..c594416fb3d6 100644
--- a/metadata/md5-cache/dev-python/fixtures-1.4.0
+++ b/metadata/md5-cache/dev-python/fixtures-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8a34c6543ff8557dd7afbd470869f85
diff --git a/metadata/md5-cache/dev-python/fixtures-3.0.0 b/metadata/md5-cache/dev-python/fixtures-3.0.0
index 0ec0b12f77b5..d4868deb91bf 100644
--- a/metadata/md5-cache/dev-python/fixtures-3.0.0
+++ b/metadata/md5-cache/dev-python/fixtures-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fixtures/fixtures-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1184f54111f5e9c988f66f5bad296e3d
diff --git a/metadata/md5-cache/dev-python/flake8-3.5.0 b/metadata/md5-cache/dev-python/flake8-3.5.0
index d25ffcb848bc..661e1b11bb3d 100644
--- a/metadata/md5-cache/dev-python/flake8-3.5.0
+++ b/metadata/md5-cache/dev-python/flake8-3.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=46bcc73432e883d00dd4a6a348b4dea0
diff --git a/metadata/md5-cache/dev-python/flake8-3.7.9 b/metadata/md5-cache/dev-python/flake8-3.7.9
index 73e7377c36fc..7f4ca6becacf 100644
--- a/metadata/md5-cache/dev-python/flake8-3.7.9
+++ b/metadata/md5-cache/dev-python/flake8-3.7.9
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/entrypoints-0.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/entrypoints-0.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyflakes-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyflakes-2.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pycodestyle-2.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-typing[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/pep8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mock-2.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/entrypoints-0.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/entrypoints-0.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyflakes-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyflakes-2.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pycodestyle-2.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-typing[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/pep8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=>=dev-python/entrypoints-0.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/entrypoints-0.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyflakes-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyflakes-2.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pycodestyle-2.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-typing[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/pep8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/mccabe-0.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mccabe-0.7.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mock-2.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/entrypoints-0.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/entrypoints-0.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyflakes-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pyflakes-2.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pycodestyle-2.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pycodestyle-2.6.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-typing[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/pep8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A wrapper around PyFlakes, pep8 & mccabe
 EAPI=7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8/flake8-3.7.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d82aabcdd14ae34a6d227b0156b9beae
diff --git a/metadata/md5-cache/dev-python/flake8-import-order-0.18 b/metadata/md5-cache/dev-python/flake8-import-order-0.18
index f4cf922757d7..2f5828daf373 100644
--- a/metadata/md5-cache/dev-python/flake8-import-order-0.18
+++ b/metadata/md5-cache/dev-python/flake8-import-order-0.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8-import-order/flake8-import-order-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e19a6556a217121b1f6fd28f07a585a2
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 34144720c172..ab9b9d68d872 100644
--- a/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1
+++ b/metadata/md5-cache/dev-python/flake8-polyfill-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flake8-polyfill/flake8-polyfill-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa8f6731ae8bba9e660563d03a440b06
diff --git a/metadata/md5-cache/dev-python/flaky-3.6.1 b/metadata/md5-cache/dev-python/flaky-3.6.1
index 12e15cea72d8..e7ff767aeab2 100644
--- a/metadata/md5-cache/dev-python/flaky-3.6.1
+++ b/metadata/md5-cache/dev-python/flaky-3.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flaky/flaky-3.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c406d8ceceb803160ef16f12e6bb70c8
diff --git a/metadata/md5-cache/dev-python/flask-0.12.2 b/metadata/md5-cache/dev-python/flask-0.12.2
index 05f758f3c975..610f7197935f 100644
--- a/metadata/md5-cache/dev-python/flask-0.12.2
+++ b/metadata/md5-cache/dev-python/flask-0.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-0.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f3eb9b64f1fafdd3724d04651f98262
diff --git a/metadata/md5-cache/dev-python/flask-1.0.2 b/metadata/md5-cache/dev-python/flask-1.0.2
index 509e142934e5..83eb731ad422 100644
--- a/metadata/md5-cache/dev-python/flask-1.0.2
+++ b/metadata/md5-cache/dev-python/flask-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f84004499133bf0104dfc31aab3dcfc7
diff --git a/metadata/md5-cache/dev-python/flask-1.0.4 b/metadata/md5-cache/dev-python/flask-1.0.4
index f39410327502..40660a24bd1b 100644
--- a/metadata/md5-cache/dev-python/flask-1.0.4
+++ b/metadata/md5-cache/dev-python/flask-1.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-1.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d2e294bd9a632036ea0f3b8ed093dc07
diff --git a/metadata/md5-cache/dev-python/flask-1.1.1 b/metadata/md5-cache/dev-python/flask-1.1.1
index 74b37bb4575e..4d98827b6b45 100644
--- a/metadata/md5-cache/dev-python/flask-1.1.1
+++ b/metadata/md5-cache/dev-python/flask-1.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask/Flask-1.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=34f93ad3bdaade6c5c13093ce5905384
diff --git a/metadata/md5-cache/dev-python/flask-9999 b/metadata/md5-cache/dev-python/flask-9999
index 16bc837a78a2..3d4c04540c3e 100644
--- a/metadata/md5-cache/dev-python/flask-9999
+++ b/metadata/md5-cache/dev-python/flask-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/click[python_targets_pypy3(-)?,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=def580fd39466546c560e168a87cd07e
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 a4d540ea53d7..5204b4899914 100644
--- a/metadata/md5-cache/dev-python/flask-admin-1.5.1
+++ b/metadata/md5-cache/dev-python/flask-admin-1.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Admin/Flask-Admin-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc5e47ac05408727a3414630f3235f92
diff --git a/metadata/md5-cache/dev-python/flask-api-1.0 b/metadata/md5-cache/dev-python/flask-api-1.0
index 7689d69b7a6d..3325b01ee3ba 100644
--- a/metadata/md5-cache/dev-python/flask-api-1.0
+++ b/metadata/md5-cache/dev-python/flask-api-1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flask-api/flask-api/archive/v1.0.tar.gz -> flask-api-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5c5e6a29f34db2d055a734fb01573b0a
diff --git a/metadata/md5-cache/dev-python/flask-api-1.1 b/metadata/md5-cache/dev-python/flask-api-1.1
index 945d034a5351..dd11978225c6 100644
--- a/metadata/md5-cache/dev-python/flask-api-1.1
+++ b/metadata/md5-cache/dev-python/flask-api-1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/flask-api/flask-api/archive/v1.1.tar.gz -> flask-api-1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=80f0525e21a120dbde1ce60f026b51bf
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 5efb6f8bb834..86e9257b174c 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
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4e8619988464a2ca9eb64d499a1e786
diff --git a/metadata/md5-cache/dev-python/flask-babel-0.11.2-r1 b/metadata/md5-cache/dev-python/flask-babel-0.11.2-r1
index 368384361fe6..bcaa51cef86a 100644
--- a/metadata/md5-cache/dev-python/flask-babel-0.11.2-r1
+++ b/metadata/md5-cache/dev-python/flask-babel-0.11.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Babel/Flask-Babel-0.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=358841458ac99cffafbb29e85fc09e34
diff --git a/metadata/md5-cache/dev-python/flask-babel-0.11.2-r2 b/metadata/md5-cache/dev-python/flask-babel-0.11.2-r2
index 4e6edb628c58..6b7e7e68add1 100644
--- a/metadata/md5-cache/dev-python/flask-babel-0.11.2-r2
+++ b/metadata/md5-cache/dev-python/flask-babel-0.11.2-r2
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/flask-sphinx-themes[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/flask-sphinx-themes[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=i18n and l10n support for Flask based on Babel and pytz
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-Babel/
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Babel/Flask-Babel-0.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a672198546b9b556e94b73f5625b816f
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=33a277a952c9cdc62776c13caf79fc28
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 762fd336c9c4..5fe240359253 100644
--- a/metadata/md5-cache/dev-python/flask-babelex-0.9.3
+++ b/metadata/md5-cache/dev-python/flask-babelex-0.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask-sphinx-themes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-sphinx-themes[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Adds i18n/l10n support to Flask applications
 EAPI=6
 HOMEPAGE=https://github.com/mrjoes/flask-babelex https://pypi.org/project/Flask-BabelEx/
-IUSE=doc python_targets_python3_6 python_targets_python3_7
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/Babel-1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/speaklater-1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-BabelEx/Flask-BabelEx-0.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f46752a4e52314fcbb53d75593458ad5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d102ae8ce13ff2b67835b7b9051a7b9
diff --git a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1 b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1
index cf96cd12a3f8..074d4a6e2bfe 100644
--- a/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1
+++ b/metadata/md5-cache/dev-python/flask-bootstrap-3.3.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-bootstrap/archive/3.3.7.1.tar.gz -> flask-bootstrap-3.3.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3f1d1d30fb9d89cf4f7181f05503ef9c
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 ce4810dae878..30967a23c949 100644
--- a/metadata/md5-cache/dev-python/flask-cors-2.1.0
+++ b/metadata/md5-cache/dev-python/flask-cors-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b5d1753f3b17216473ed857ac65eea9
diff --git a/metadata/md5-cache/dev-python/flask-debug-0.4.3 b/metadata/md5-cache/dev-python/flask-debug-0.4.3
index ed1f64513473..5f84787c1f39 100644
--- a/metadata/md5-cache/dev-python/flask-debug-0.4.3
+++ b/metadata/md5-cache/dev-python/flask-debug-0.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/Flask-Debug/archive/0.4.3.tar.gz -> flask-debug-0.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=326f58342f68257c5be115ca00617546
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 0d442059c23e..16993988bd1b 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d8c36b232a4fa51e5648e6edabfbbd2
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 6dc93fd18eb0..830395aef525 100644
--- a/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
+++ b/metadata/md5-cache/dev-python/flask-gravatar-0.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Small extension for Flask to make usage of Gravatar service easy
 EAPI=6
 HOMEPAGE=https://github.com/zzzsochi/Flask-Gravatar/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Gravatar/Flask-Gravatar-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ab77b7e4d4f006a38b5742197b13793
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=71a136c00a370a8a0f8c744c1d7de208
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 b2f4c2b4bf0e..9a318bae7309 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_python3_6? ( dev-lang/p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-HTMLmin/Flask-HTMLmin-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daef8eba046e64df882abdc3f40d5116
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 8d5a80e8a2b2..432dc2057357 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_python3_6? ( dev-lang/p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-HTMLmin/Flask-HTMLmin-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daef8eba046e64df882abdc3f40d5116
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-1.5.0 b/metadata/md5-cache/dev-python/flask-htmlmin-1.5.0
index 0e7c3b1a7a0a..7982caa728fc 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-1.5.0
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-HTMLmin/Flask-HTMLmin-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e39289a8d6aaef3515e21129bb2256b9
diff --git a/metadata/md5-cache/dev-python/flask-htmlmin-1.5.2 b/metadata/md5-cache/dev-python/flask-htmlmin-1.5.2
index e39cc2af3ae6..b622e85df439 100644
--- a/metadata/md5-cache/dev-python/flask-htmlmin-1.5.2
+++ b/metadata/md5-cache/dev-python/flask-htmlmin-1.5.2
@@ -1,16 +1,16 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/htmlmin dev-python/flask dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=app-text/htmlmin dev-python/flask dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Minimize your flask rendered html
 EAPI=7
 HOMEPAGE=https://github.com/hamidfzm/Flask-HTMLmin
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=app-text/htmlmin dev-python/flask 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=app-text/htmlmin dev-python/flask python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-HTMLmin/Flask-HTMLmin-1.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=465b42057ec09bbab539c87844f1a07d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ac818dcad9ecd722c0af2f0f3a36cee3
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 f7f9b325a354..a21d5a2ef1e1 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.3.2.tar.gz -> flask-login-0.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12686e824b2aa5522654a314433c0e3e
diff --git a/metadata/md5-cache/dev-python/flask-login-0.4.1 b/metadata/md5-cache/dev-python/flask-login-0.4.1
deleted file mode 100644
index c5b1c68f958d..000000000000
--- a/metadata/md5-cache/dev-python/flask-login-0.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/semantic_version[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Login session support for Flask
-EAPI=7
-HOMEPAGE=https://pypi.org/project/Flask-Login/
-IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.4.1.tar.gz -> flask-login-0.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=89660ecbbe53d14111e98435c019da47
diff --git a/metadata/md5-cache/dev-python/flask-login-0.4.1-r1 b/metadata/md5-cache/dev-python/flask-login-0.4.1-r1
new file mode 100644
index 000000000000..2c1819e85f45
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-login-0.4.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/semantic_version[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Login session support for Flask
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Flask-Login/
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/maxcountryman/flask-login/archive/0.4.1.tar.gz -> flask-login-0.4.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f752075882a3900ad4ed8ad14eee3791
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 1d8605b2d163..3a51f0963bd0 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/speaklater[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/speaklater[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Flask extension for sending email
 EAPI=6
 HOMEPAGE=https://pythonhosted.org/Flask-Mail/ https://pypi.org/project/Flask-Mail/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Mail/Flask-Mail-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb1c5ce827dc9d3ad43b047ee561ff59
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67a5bc20cc32a8dcaa8a8fc31bebddaf
diff --git a/metadata/md5-cache/dev-python/flask-migrate-2.5.2 b/metadata/md5-cache/dev-python/flask-migrate-2.5.2
index 07e875d02f70..9f9e85dfa2aa 100644
--- a/metadata/md5-cache/dev-python/flask-migrate-2.5.2
+++ b/metadata/md5-cache/dev-python/flask-migrate-2.5.2
@@ -1,16 +1,16 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/alembic-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-0.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/flask-script-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=>=dev-python/alembic-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-0.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/flask-script-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=SQLAlchemy database migrations for Flask applications using Alembic
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Flask-Migrate/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/alembic-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-0.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/alembic-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-0.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-sqlalchemy-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Migrate/Flask-Migrate-2.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b8615b792a0cb3c245df2e699554671e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e1a0e3a10291004dc262338eb3fc5f1e
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 d32116dec116..40906f552618 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Flask support for MongoDB and with WTF model forms
 EAPI=6
 HOMEPAGE=https://pypi.org/project/flask-mongoengine/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mongoengine-0.7.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask-wtf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/flask-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/mongoengine-0.7.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-wtf[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/flask-mongoengine/flask-mongoengine-0.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c498993af95a79e011a70812c067372
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e1dcb06106581c449f5a9df66b3ad177
diff --git a/metadata/md5-cache/dev-python/flask-nav-0.6-r1 b/metadata/md5-cache/dev-python/flask-nav-0.6-r1
index eddc6e9f1b24..38a57cd67a09 100644
--- a/metadata/md5-cache/dev-python/flask-nav-0.6-r1
+++ b/metadata/md5-cache/dev-python/flask-nav-0.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/flask-nav/archive/0.6.tar.gz -> flask-nav-0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c81d24670f3cf6343770882d9220074
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 2fa66cdd7b12..a09936fc6c87 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 5890201d41f7..d766458869e6 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=249f9153c2d022afdf2275792859ab83
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.5.1 b/metadata/md5-cache/dev-python/flask-paginate-0.5.1
index 09929746a704..4b9924a31349 100644
--- a/metadata/md5-cache/dev-python/flask-paginate-0.5.1
+++ b/metadata/md5-cache/dev-python/flask-paginate-0.5.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/flask[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flask-paginate/flask-paginate-0.5.1.tar.gz -> flask-paginate-0.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2f16af3c7f829e9d994ad560fb9dd51c
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.5.2 b/metadata/md5-cache/dev-python/flask-paginate-0.5.2
index 570ff283623a..f82e0ffb437b 100644
--- a/metadata/md5-cache/dev-python/flask-paginate-0.5.2
+++ b/metadata/md5-cache/dev-python/flask-paginate-0.5.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flask-paginate/flask-paginate-0.5.2.tar.gz -> flask-paginate-0.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=27f784248a65b4527ffe5307c17451fd
diff --git a/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1 b/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1
index e219ec50c7fc..778f5b7792d9 100644
--- a/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/flask-paginate-0.5.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lixxu/flask-paginate/archive/510ad833106134711868653fb597bf75ea8ac34f.tar.gz -> flask-paginate-0.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a869b5a24f9bebbb0d6691b0d09a207
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 47fffda671e9..bd3dbf07a25a 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Simple user session protection extension for Flask
 EAPI=6
 HOMEPAGE=https://github.com/miguelgrinberg/flask-paranoid/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miguelgrinberg/flask-paranoid/archive/v0.2.tar.gz -> flask-paranoid-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5c68cd21dc0ccc5a6750d12c39b97a0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=365bc82eca04f79300a82993c4eab01b
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 22b0eea4182b..245180d6f0ea 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 0c9a8bbc8efe..7c056f843c63 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 6dc1fbb0146c..90cbe899e21d 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Identity management for flask
 EAPI=6
 HOMEPAGE=https://pythonhosted.org/Flask-Principal/ https://pypi.org/project/Flask-Principal/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/blinker[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mattupstate/flask-principal/archive/0.4.0.tar.gz -> flask-principal-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c34060572ba2119e4539d624335f4dd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d87832bd1a7a7022922d53abf9e38b5
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 2851f09b7b33..fe8ea8d40787 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_python3_6 )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7995af208073395f5aa0d415378e32a
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 973746f86db3..cff1c4a706b6 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twilio/flask-restful/archive/0.3.5.tar.gz -> flask-restful-0.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d0b3a5ea03156d5ad58e2d6e76d3bc5
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 de4aeac29867..d9ce58398c34 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.6
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twilio/flask-restful/archive/0.3.6.tar.gz -> flask-restful-0.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4de2c4b6be6e96371c971fae54c36dec
diff --git a/metadata/md5-cache/dev-python/flask-restful-0.3.7 b/metadata/md5-cache/dev-python/flask-restful-0.3.7
index ed4309cc2a1f..0c50a0fc266b 100644
--- a/metadata/md5-cache/dev-python/flask-restful-0.3.7
+++ b/metadata/md5-cache/dev-python/flask-restful-0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/twilio/flask-restful/archive/0.3.7.tar.gz -> flask-restful-0.3.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=69616e0458ee616241193906a6a9ee02
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 159dd17da9df..18f1125fd5c3 100644
--- a/metadata/md5-cache/dev-python/flask-script-2.0.6
+++ b/metadata/md5-cache/dev-python/flask-script-2.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flask-0.10.1-r1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] doc? ( dev-python/sphinx[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(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/flask-0.10.1-r1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Flask support for writing external scripts
 EAPI=6
 HOMEPAGE=https://flask-script.readthedocs.io/en/latest/ https://flask-script.readthedocs.io/en/latest/ https://pypi.org/project/Flask-Script/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/flask-0.10.1-r1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Script/Flask-Script-2.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed2db03092605146ff9b073e51d447d8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2abc822a20458db3365d1b3e2363267
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 53aeba7502a4..38c0b0e0f0d3 100644
--- a/metadata/md5-cache/dev-python/flask-security-3.0.0
+++ b/metadata/md5-cache/dev-python/flask-security-3.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flask-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-babelex-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-login-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-mail-0.7.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-principal-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-wtf-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/itsdangerous-0.21[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask-sqlalchemy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask-mongoengine[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/flask-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-babelex-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-login-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-mail-0.7.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-principal-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-wtf-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/itsdangerous-0.21[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-sqlalchemy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-mongoengine[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Simple security for Flask apps
 EAPI=6
 HOMEPAGE=https://pythonhosted.org/Flask-Security/ https://pypi.org/project/Flask-Security/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/flask-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-babelex-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-login-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-mail-0.7.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-principal-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/flask-wtf-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/itsdangerous-0.21[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/passlib-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/flask-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-babelex-0.9.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-login-0.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-mail-0.7.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-principal-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-wtf-0.13.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/itsdangerous-0.21[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/passlib-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Security/Flask-Security-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=507b70c196deb6c470d82a633595599f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=517f366f676160d886f219459ac6989f
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 516c0711644d..9b9180a93cf5 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_pypy3 python_targets_python3_6 )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2285521d1523f58a80140f4637d91d32
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 0b66f03b06ee..4a924299a885 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_pypy3 python_targets_python3_6 )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb4224f92a54fb6c7df405684916f556
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 6f44521a4870..5fd4aac6ad86 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_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Sphinx-Themes/Flask-Sphinx-Themes-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ca11c12551ed0021bf94c2e27fafcac
diff --git a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2 b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
index 95f54885ea7f..36366fb96d37 100644
--- a/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
+++ b/metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Sphinx Themes for Flask related projects and Flask itself
 EAPI=7
 HOMEPAGE=https://github.com/pallets/flask-sphinx-themes https://pypi.org/project/Flask-Sphinx-Themes/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Sphinx-Themes/Flask-Sphinx-Themes-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f0545516943601a6135469bed28ee632
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=df9c6147c6e9f0db9ce9c9feee56585e
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 430cdacad49a..1edc6dd31e6a 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1940aa90a6321e1d56c8b0760cabcc78
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1
index 84bbaf905387..f4e10649048d 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ce8743a8c4db3fc30cf1e8710e69e58e
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1-r1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1-r1
index ae1ecddedd1c..da8897f4e6ac 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1-r1
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-issues[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pallets-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-issues[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pallets-sphinx-themes[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx-issues[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-issues[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-issues[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pallets-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-issues[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pallets-sphinx-themes[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx-issues[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-issues[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=SQLAlchemy support for Flask applications
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6d527981fa7bbf972457890180e4ca84
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 73ae03526262..4b815ec24714 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-Themes/Flask-Themes-0.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42362cbafaef7cb3553642550f74ffaf
diff --git a/metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112 b/metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112
index fe6fb5337fa3..014cc373de5b 100644
--- a/metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112
+++ b/metadata/md5-cache/dev-python/flask-themes-0.1.3_p20180112
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-themes/archive/9eac2dcc9b81c3af29c2386ce1afba9b446562bf.tar.gz -> flask-themes-0.1.3_p20180112.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c783442aa18d9e56664e048bfd610de9
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 a254a988538b..ebd3d60e787e 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/maxcountryman/flask-uploads/archive/0.2.0.tar.gz -> flask-uploads-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9d622766c90c945a1cfd170225a0438
diff --git a/metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1 b/metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1
index 07292d476ba4..f0b863533289 100644
--- a/metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1
+++ b/metadata/md5-cache/dev-python/flask-wtf-0.14.2-r1
@@ -1,16 +1,16 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Simple integration of Flask and WTForms
 EAPI=7
 HOMEPAGE=https://pythonhosted.org/Flask-WTF/ https://pypi.org/project/Flask-WTF/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/Babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flask-babel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/itsdangerous[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wtforms-1.0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Flask-WTF/Flask-WTF-0.14.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=31adce6c3bee01cef23fc4effa4d076c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7e290416c25a851a0c7a589435d1e8e8
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 db6292e1bb21..6746cd4280a3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5deaf68260018b323e0c28021111c7a7
diff --git a/metadata/md5-cache/dev-python/fleep-1.0.1 b/metadata/md5-cache/dev-python/fleep-1.0.1
index da87cb183930..0c90ca4404d1 100644
--- a/metadata/md5-cache/dev-python/fleep-1.0.1
+++ b/metadata/md5-cache/dev-python/fleep-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fleep/fleep-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9aff90a02f83c5528cb2a5f8aaa17234
diff --git a/metadata/md5-cache/dev-python/fleep-9999 b/metadata/md5-cache/dev-python/fleep-9999
index f90fda6890b0..ff7e6e2c7af3 100644
--- a/metadata/md5-cache/dev-python/fleep-9999
+++ b/metadata/md5-cache/dev-python/fleep-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9aff90a02f83c5528cb2a5f8aaa17234
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.2 b/metadata/md5-cache/dev-python/flexmock-0.10.2
index 466d5e9f0df8..87f9e8e5bb12 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.2
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0c048eca8749bf0f2a6794688110b74
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.3 b/metadata/md5-cache/dev-python/flexmock-0.10.3
index ede81ef0fb4f..de5f10ed19b4 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.3
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dfaebb3cef38f9dd41aaa411819c8b13
diff --git a/metadata/md5-cache/dev-python/flexmock-0.10.4 b/metadata/md5-cache/dev-python/flexmock-0.10.4
index 9172d8e41c4d..e4ed504ed11f 100644
--- a/metadata/md5-cache/dev-python/flexmock-0.10.4
+++ b/metadata/md5-cache/dev-python/flexmock-0.10.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flexmock/flexmock-0.10.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dc9a8d30287384e3cfe78fff9494a684
diff --git a/metadata/md5-cache/dev-python/flexx-0.4.1 b/metadata/md5-cache/dev-python/flexx-0.4.1
index d4bf143cf7e6..33d4ef1163ed 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e43970bd9ee19b911679d27deb920038
diff --git a/metadata/md5-cache/dev-python/flipflop-1.0 b/metadata/md5-cache/dev-python/flipflop-1.0
index 561f695c796d..7f0032a45c8e 100644
--- a/metadata/md5-cache/dev-python/flipflop-1.0
+++ b/metadata/md5-cache/dev-python/flipflop-1.0
@@ -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=mirror://pypi/f/flipflop/flipflop-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4ef7ee3baf5e920778bd2d70717afc31
diff --git a/metadata/md5-cache/dev-python/flit-2.1.0 b/metadata/md5-cache/dev-python/flit-2.1.0
index d6ba24481597..25e513153652 100644
--- a/metadata/md5-cache/dev-python/flit-2.1.0
+++ b/metadata/md5-cache/dev-python/flit-2.1.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/flit_core[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep sys-apps/findutils test? ( >=dev-python/pytest-2.7.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flit_core[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygments-github-lexers[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinxcontrib-github-alt[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygments-github-lexers[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinxcontrib-github-alt[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygments-github-lexers[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pygments-github-lexers[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/flit_core[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/grep sys-apps/findutils test? ( >=dev-python/pytest-2.7.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/flit_core[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests_download[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pygments-github-lexers[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinxcontrib-github-alt[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygments-github-lexers[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinxcontrib-github-alt[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygments-github-lexers[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinxcontrib-github-alt[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pygments-github-lexers[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simplified packaging of Python modules
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit/flit-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=399e4c8c8c91298ec4bd99424b834176
diff --git a/metadata/md5-cache/dev-python/flit_core-2.1.0 b/metadata/md5-cache/dev-python/flit_core-2.1.0
index 89bd44b69bdb..28fd859702fa 100644
--- a/metadata/md5-cache/dev-python/flit_core-2.1.0
+++ b/metadata/md5-cache/dev-python/flit_core-2.1.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/testpath[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/intreehooks[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simplified packaging of Python modules (core module)
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/flit_core/flit_core-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1f61e98c26ed72d4f9df3ca479e0a47d
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 e1bb5d114657..62093b314062 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/flower/flower-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=420a3696de15738f6cd2fff5988a0844
diff --git a/metadata/md5-cache/dev-python/flufl-bounce-3.0 b/metadata/md5-cache/dev-python/flufl-bounce-3.0
index 257332b22b4c..49bd24d64ef4 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_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa881ae918460ac1ca1e215fcee25671
diff --git a/metadata/md5-cache/dev-python/flufl-bounce-3.0.1 b/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
new file mode 100644
index 000000000000..ffb1e48818f6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flufl-bounce-3.0.1
@@ -0,0 +1,15 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Email bounce detectors.
+EAPI=7
+HOMEPAGE=https://gitlab.com/warsaw/flufl.bounce
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/f/flufl.bounce/flufl.bounce-3.0.1.tar.gz -> flufl-bounce-3.0.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7cd9614960df2fdd172191d38eb20bc3
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 d286358adb8d..5fb7473c20bd 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_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc6d751985d2f7cfcdef42d8ccb7b02f
diff --git a/metadata/md5-cache/dev-python/flufl-i18n-2.0.2 b/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
new file mode 100644
index 000000000000..2241a4a98235
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flufl-i18n-2.0.2
@@ -0,0 +1,15 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=A high level API for Python internationalization.
+EAPI=7
+HOMEPAGE=https://gitlab.com/warsaw/flufl.i18n
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/f/flufl.i18n/flufl.i18n-2.0.2.tar.gz -> flufl-i18n-2.0.2.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=419be8f2b1d3b4e7268965b61a25b5bc
diff --git a/metadata/md5-cache/dev-python/flufl-lock-3.2 b/metadata/md5-cache/dev-python/flufl-lock-3.2
index 303e143732e6..3aa2bd95200a 100644
--- a/metadata/md5-cache/dev-python/flufl-lock-3.2
+++ b/metadata/md5-cache/dev-python/flufl-lock-3.2
@@ -1,14 +1,15 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=NFS-safe file locking with timeouts for POSIX systems.
-EAPI=6
+EAPI=7
 HOMEPAGE=https://gitlab.com/warsaw/flufl.lock
-IUSE=python_targets_python3_6
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/atpublic[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 )
+RDEPEND=dev-python/atpublic[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/flufl.lock/flufl.lock-3.2.tar.gz -> flufl-lock-3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b854afe11b8601173348ab43aacfc10
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4889dfd7712b44c4d8785eaca43dd599
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 31843543e677..e2100fe6bd4a 100644
--- a/metadata/md5-cache/dev-python/flup-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/flup-1.0.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Random assortment of WSGI servers
 EAPI=5
 HOMEPAGE=https://www.saddi.com/software/flup/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 ~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 ) >=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.saddi.com/software/flup/dist/flup-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a98092d4e677c3259c55c280ef2b80a8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3553ddce514614a3c2e68e2825edaef3
diff --git a/metadata/md5-cache/dev-python/fonttools-3.44.0 b/metadata/md5-cache/dev-python/fonttools-3.44.0
index a05413d4cb41..5c386b90ff4d 100644
--- a/metadata/md5-cache/dev-python/fonttools-3.44.0
+++ b/metadata/md5-cache/dev-python/fonttools-3.44.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/3.44.0.tar.gz -> fonttools-3.44.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=a7c2895b2ef54a7fc25325b79f3256a9
diff --git a/metadata/md5-cache/dev-python/fonttools-4.0.1 b/metadata/md5-cache/dev-python/fonttools-4.0.1
index 1486d6df9e34..1818fc0e9870 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.0.1
+++ b/metadata/md5-cache/dev-python/fonttools-4.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.0.1.tar.gz -> fonttools-4.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=48ca55cfbb19f2e9272e835890733a40
diff --git a/metadata/md5-cache/dev-python/fonttools-4.1.0 b/metadata/md5-cache/dev-python/fonttools-4.1.0
index ce6c756d03f6..5eed7502a53a 100644
--- a/metadata/md5-cache/dev-python/fonttools-4.1.0
+++ b/metadata/md5-cache/dev-python/fonttools-4.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fonttools/fonttools/archive/4.1.0.tar.gz -> fonttools-4.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=d9a4e625f54e0f364498716d51e96b95
diff --git a/metadata/md5-cache/dev-python/formencode-1.3.0-r3 b/metadata/md5-cache/dev-python/formencode-1.3.0-r3
index 422eb59a1030..7db312eab7da 100644
--- a/metadata/md5-cache/dev-python/formencode-1.3.0-r3
+++ b/metadata/md5-cache/dev-python/formencode-1.3.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/F/FormEncode/FormEncode-1.3.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a063a85135a2c19e89b48e3063405ec
diff --git a/metadata/md5-cache/dev-python/fqdn-1.2.0 b/metadata/md5-cache/dev-python/fqdn-1.2.0
index bcc8ee5d5a4b..85970cfde14f 100644
--- a/metadata/md5-cache/dev-python/fqdn-1.2.0
+++ b/metadata/md5-cache/dev-python/fqdn-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/guyhughes/fqdn/archive/v1.2.0.tar.gz -> fqdn-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cad331b322d03c824f4812bc768309e4
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.10 b/metadata/md5-cache/dev-python/freezegun-0.3.10
index f02fae36ea1f..2db79771865a 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.10
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9278fae2a8d6dce95f6293387db09ec5
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.12-r1 b/metadata/md5-cache/dev-python/freezegun-0.3.12-r1
index 2c7feaac5966..9f0a7b13d919 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.12-r1
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.12-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_pypy3? ( >=dev-python/pypy3-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Let your Python tests travel through time
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0c9a7287ebf6eef78718fe03ac4590a7
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.13 b/metadata/md5-cache/dev-python/freezegun-0.3.13
index c44aaea9aa7c..724e3a035d51 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.13
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.13
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_pypy3? ( >=dev-python/pypy3-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Let your Python tests travel through time
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d2d86468a67cb8c55a4908968453816c
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.14 b/metadata/md5-cache/dev-python/freezegun-0.3.14
index fd6c56305e34..8b62e952c08a 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.14
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.14
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>dev-python/python-dateutil-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_pypy3? ( >=dev-python/pypy3-5:0=[sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Let your Python tests travel through time
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.14.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d2d86468a67cb8c55a4908968453816c
diff --git a/metadata/md5-cache/dev-python/frozen-flask-0.15 b/metadata/md5-cache/dev-python/frozen-flask-0.15
index 93f44b6f7388..42cc33dfa7e6 100644
--- a/metadata/md5-cache/dev-python/frozen-flask-0.15
+++ b/metadata/md5-cache/dev-python/frozen-flask-0.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Frozen-Flask/Frozen-Flask-0.15.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d5e86302d6769695e0d14da04467a0e7
diff --git a/metadata/md5-cache/dev-python/fs-0.5.4 b/metadata/md5-cache/dev-python/fs-0.5.4
index 6164cf5842c2..d08fc5a0d5e3 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/fs/fs-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=076dd9723b509538040821fe928c1b80
diff --git a/metadata/md5-cache/dev-python/fs-2.0.21 b/metadata/md5-cache/dev-python/fs-2.0.21
index 3009658b35b6..5c3164ace65d 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/fs/fs-2.0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=076dd9723b509538040821fe928c1b80
diff --git a/metadata/md5-cache/dev-python/fs-2.0.26 b/metadata/md5-cache/dev-python/fs-2.0.26
index e7e985b0e3a9..bdd692130cd4 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/f/fs/fs-2.0.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b564420a417d9daadc55934eeea3040
diff --git a/metadata/md5-cache/dev-python/fs-2.4.8 b/metadata/md5-cache/dev-python/fs-2.4.8
index c69bae2a7444..c03520b9508b 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.8
+++ b/metadata/md5-cache/dev-python/fs-2.4.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fs/fs-2.4.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ab1e14881dd9dca8ecc66788205cdb2
diff --git a/metadata/md5-cache/dev-python/fs-2.4.9 b/metadata/md5-cache/dev-python/fs-2.4.9
index e7c250e755be..c28b78729f54 100644
--- a/metadata/md5-cache/dev-python/fs-2.4.9
+++ b/metadata/md5-cache/dev-python/fs-2.4.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fs/fs-2.4.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=27076a25c8e07d5e6fbd383ac6bf98b8
diff --git a/metadata/md5-cache/dev-python/fudge-1.1.0 b/metadata/md5-cache/dev-python/fudge-1.1.0
index 78582fadc558..e8ec32138f8a 100644
--- a/metadata/md5-cache/dev-python/fudge-1.1.0
+++ b/metadata/md5-cache/dev-python/fudge-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fudge/fudge-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8af85d33b01d0a1eb0b28ce34513b373
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6
index 7e5e305b07a8..8fabb4944705 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcparserlib/funcparserlib-0.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c39e77613ef119fcd4b4a210bd1c602c
diff --git a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1 b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
index 3a404c95386c..15dd5a987cec 100644
--- a/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
+++ b/metadata/md5-cache/dev-python/funcparserlib-0.3.6-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcparserlib/funcparserlib-0.3.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b26d4a10bac1c8f8592492fd2bef52a0
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 5ea0bb3c037c..e59c51c5d6b4 100644
--- a/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/funcsigs-1.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcsigs/funcsigs-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce3e2370ee97abc3a9bb954ba82cb893
diff --git a/metadata/md5-cache/dev-python/functools32-3.2.3 b/metadata/md5-cache/dev-python/functools32-3.2.3
index ec2c543ef546..fcc0896dea98 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_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/functools32/functools32-3.2.3-2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d6cee45d184b19037db4b5c3d4638b92
diff --git a/metadata/md5-cache/dev-python/funcy-1.10.1 b/metadata/md5-cache/dev-python/funcy-1.10.1
index e19b12b552bc..0fbf028fe65b 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/funcy/funcy-1.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9dfc75eb1b8c4c4e7c58a75087cbc0a
diff --git a/metadata/md5-cache/dev-python/funcy-1.8 b/metadata/md5-cache/dev-python/funcy-1.8
index 1cf12eb700df..4280f34211f1 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 44d123398ff3..9063141cc9d7 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_python2_7? ( >=dev-lang/python-2.7.5-r2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fuse/fuse-python-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00ccfa458a259f15736721b9ccebff0a
diff --git a/metadata/md5-cache/dev-python/fuse-python-0.3.1 b/metadata/md5-cache/dev-python/fuse-python-0.3.1
index 79bfdb9e2aaf..5b548c66e4e8 100644
--- a/metadata/md5-cache/dev-python/fuse-python-0.3.1
+++ b/metadata/md5-cache/dev-python/fuse-python-0.3.1
@@ -11,5 +11,5 @@ RDEPEND=sys-fs/fuse:0= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/libfuse/python-fuse/archive/v0.3.1.tar.gz -> fuse-python-0.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6805b8c9bab12d29ba524d6d1005fd56
diff --git a/metadata/md5-cache/dev-python/fuse-python-1.0.0 b/metadata/md5-cache/dev-python/fuse-python-1.0.0
index c26194319218..13e340488693 100644
--- a/metadata/md5-cache/dev-python/fuse-python-1.0.0
+++ b/metadata/md5-cache/dev-python/fuse-python-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=sys-fs/fuse:0= python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/libfuse/python-fuse/archive/v1.0.0.tar.gz -> fuse-python-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d18334862a3eee0b803d723de13fa98a
diff --git a/metadata/md5-cache/dev-python/fusepy-3.0.1 b/metadata/md5-cache/dev-python/fusepy-3.0.1
index ab2477dbb464..9e9d6a6f1da9 100644
--- a/metadata/md5-cache/dev-python/fusepy-3.0.1
+++ b/metadata/md5-cache/dev-python/fusepy-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-fs/fuse-2.9.7:0 !dev-python/fuse-python python_targets_python3_6?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fusepy/fusepy-3.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=13ac0eb45a51de7835fa97058addd524
diff --git a/metadata/md5-cache/dev-python/future-0.17.0 b/metadata/md5-cache/dev-python/future-0.17.0
index 60e4568cccff..b6307b7c86f2 100644
--- a/metadata/md5-cache/dev-python/future-0.17.0
+++ b/metadata/md5-cache/dev-python/future-0.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.17.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4e7523f09499dc48dd587e46e27d7010
diff --git a/metadata/md5-cache/dev-python/future-0.17.1 b/metadata/md5-cache/dev-python/future-0.17.1
index e50194cc0cd2..e66f7ba5d091 100644
--- a/metadata/md5-cache/dev-python/future-0.17.1
+++ b/metadata/md5-cache/dev-python/future-0.17.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.17.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7313f41f3d2d2ce3cf30a36ec3532c03
diff --git a/metadata/md5-cache/dev-python/future-0.18.2 b/metadata/md5-cache/dev-python/future-0.18.2
index 4853808f2fc7..cf7b7c8c9d88 100644
--- a/metadata/md5-cache/dev-python/future-0.18.2
+++ b/metadata/md5-cache/dev-python/future-0.18.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/future/future-0.18.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=850483f5b77484d6a274cde4ecfcec41
diff --git a/metadata/md5-cache/dev-python/futures-3.1.1 b/metadata/md5-cache/dev-python/futures-3.1.1
index 1ee4c8dbab18..998cf8bfbea0 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_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/futures/futures-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08b24b8e6889985f482cd5335e69d201
diff --git a/metadata/md5-cache/dev-python/futures-3.2.0 b/metadata/md5-cache/dev-python/futures-3.2.0
index bb623a4a765f..03ef24883ab0 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_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/futures/futures-3.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9850637caf16c9394f8a6a3de6b673d3
diff --git a/metadata/md5-cache/dev-python/futurist-1.3.1 b/metadata/md5-cache/dev-python/futurist-1.3.1
index 26627ffdfd32..625559591d1b 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futurist/futurist-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=503b986406cb4596b6d704887f13cec9
diff --git a/metadata/md5-cache/dev-python/futurist-1.6.0 b/metadata/md5-cache/dev-python/futurist-1.6.0
index 5e5465c26783..bdd930c65809 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futurist/futurist-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=65c0eb7ee0de5773b886f041537eee22
diff --git a/metadata/md5-cache/dev-python/futurist-1.8.1 b/metadata/md5-cache/dev-python/futurist-1.8.1
index 72c1b36d59d5..23e1207683fd 100644
--- a/metadata/md5-cache/dev-python/futurist-1.8.1
+++ b/metadata/md5-cache/dev-python/futurist-1.8.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/futurist/futurist-1.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0bc5324e6f0a77d1c5adc49257293268
diff --git a/metadata/md5-cache/dev-python/fuzzywuzzy-0.12.0 b/metadata/md5-cache/dev-python/fuzzywuzzy-0.12.0
index ca433f9ec7f5..1cbe74ee3d6c 100644
--- a/metadata/md5-cache/dev-python/fuzzywuzzy-0.12.0
+++ b/metadata/md5-cache/dev-python/fuzzywuzzy-0.12.0
@@ -11,5 +11,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=mirror://pypi/f/fuzzywuzzy/fuzzywuzzy-0.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c52da62f04f40fa80dca03b57481755d
diff --git a/metadata/md5-cache/dev-python/fuzzywuzzy-0.17.0 b/metadata/md5-cache/dev-python/fuzzywuzzy-0.17.0
index dd405a729b49..9316c395b7d6 100644
--- a/metadata/md5-cache/dev-python/fuzzywuzzy-0.17.0
+++ b/metadata/md5-cache/dev-python/fuzzywuzzy-0.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/f/fuzzywuzzy/fuzzywuzzy-0.17.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=02c657f00b0c5e09d8f3381c0bef26df
diff --git a/metadata/md5-cache/dev-python/gast-0.2.2 b/metadata/md5-cache/dev-python/gast-0.2.2
index bcfb065d12de..5a5f78a1f4e9 100644
--- a/metadata/md5-cache/dev-python/gast-0.2.2
+++ b/metadata/md5-cache/dev-python/gast-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gast/gast-0.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8d25ac3717687dd2ff5053264712de6d
diff --git a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5 b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5
index 4a65d2c17fec..f9ed468548d0 100644
--- a/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5
+++ b/metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ace6d8646adeb6bf1a139a9c462e167d
diff --git a/metadata/md5-cache/dev-python/gdata-2.0.18 b/metadata/md5-cache/dev-python/gdata-2.0.18
index 841ca8d775c0..3518946133a8 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+),xml(+)
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gdata/gdata-2.0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e41b6c687a5706516aa9982e91859b71
diff --git a/metadata/md5-cache/dev-python/genshi-0.7 b/metadata/md5-cache/dev-python/genshi-0.7
index 0ad086b41bb5..a5852135202a 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_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72beeef67d488942c9e91a174b74c4d7
diff --git a/metadata/md5-cache/dev-python/genshi-0.7-r1 b/metadata/md5-cache/dev-python/genshi-0.7-r1
index 7a37d7186092..3d4afb109c6a 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_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=140c31581c68f2120f5336c695975ee7
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.3 b/metadata/md5-cache/dev-python/genshi-0.7.3
index b00fd3110609..c0452c8fc548 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7.3
+++ b/metadata/md5-cache/dev-python/genshi-0.7.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Genshi/Genshi-0.7.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6957764f538e2f6002bf4824ec610d16
diff --git a/metadata/md5-cache/dev-python/genty-1.3.2 b/metadata/md5-cache/dev-python/genty-1.3.2
index cdb0bf643b41..423dbc3c33d8 100644
--- a/metadata/md5-cache/dev-python/genty-1.3.2
+++ b/metadata/md5-cache/dev-python/genty-1.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/genty/genty-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efd1b04f97933dde9011ab7c5ae8632e
diff --git a/metadata/md5-cache/dev-python/geoalchemy2-0.3 b/metadata/md5-cache/dev-python/geoalchemy2-0.3
index 9c32b6fe0f2c..2a4b49d7fc57 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geoalchemy/geoalchemy2/archive/0.3.tar.gz -> geoalchemy2-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=714c89300a741ad19759966befe85845
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 c260ff67cdb2..8a81618ba76e 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28784937f659d794e9b7903e5319843d
diff --git a/metadata/md5-cache/dev-python/geopy-1.11.0 b/metadata/md5-cache/dev-python/geopy-1.11.0
index 869d9cc31553..dbdbd5448282 100644
--- a/metadata/md5-cache/dev-python/geopy-1.11.0
+++ b/metadata/md5-cache/dev-python/geopy-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( yahoo timezone ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e46acae4ef4fabe457ea3a6080354138
diff --git a/metadata/md5-cache/dev-python/gevent-1.0.1 b/metadata/md5-cache/dev-python/gevent-1.0.1
index eaa97dc9597c..12725ad32644 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a7496b232caf1439bb83e362a245cc1c
diff --git a/metadata/md5-cache/dev-python/gevent-1.2.1 b/metadata/md5-cache/dev-python/gevent-1.2.1
index c368cc23b33e..ac03171e5630 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d51f89033de5f8867d7ebc18be3b1202
diff --git a/metadata/md5-cache/dev-python/gevent-1.2.2 b/metadata/md5-cache/dev-python/gevent-1.2.2
index 30fe2740f4a0..16a6f7c5074a 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac62c776504f1d41e738110d5be10cc9
diff --git a/metadata/md5-cache/dev-python/gevent-1.3.5 b/metadata/md5-cache/dev-python/gevent-1.3.5
index 2d3f70f4c5c9..0628b3fed1bc 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_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52b7f3b4067c663fe7af1a9af958e5fc
diff --git a/metadata/md5-cache/dev-python/gevent-1.3.7 b/metadata/md5-cache/dev-python/gevent-1.3.7
index 46f375ed9a97..ccaf3bcadd1c 100644
--- a/metadata/md5-cache/dev-python/gevent-1.3.7
+++ b/metadata/md5-cache/dev-python/gevent-1.3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.3.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8082c4e83a06e238ee51331ec99ce703
diff --git a/metadata/md5-cache/dev-python/gevent-1.4.0 b/metadata/md5-cache/dev-python/gevent-1.4.0
index facbe7c6bbd8..40278e07b671 100644
--- a/metadata/md5-cache/dev-python/gevent-1.4.0
+++ b/metadata/md5-cache/dev-python/gevent-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent/gevent-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=08742f42ee8fb6da39e6ae40dd0a06b1
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 32a280c2db24..8310b93bf9a8 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 fb50d66502c9..0c116f339458 100644
--- a/metadata/md5-cache/dev-python/gevent-socketio-0.3.6
+++ b/metadata/md5-cache/dev-python/gevent-socketio-0.3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-socketio/gevent-socketio-0.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91bb77c18e4d09500b6c5d8636afe7c2
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 0bf7cbb455b1..259b14640aa2 100644
--- a/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
+++ b/metadata/md5-cache/dev-python/gevent-websocket-0.10.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gevent-websocket/gevent-websocket-0.10.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e9690345fe0a2709ce70d13696a08661
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 9608226b75b6..220f04b88fff 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 1932543048c0..0de89eb35b06 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7fe9e4fb186a566fdd333717b4eddbf
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1 b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1
index 42a9419be17d..ca2c74dc8546 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ab4f0c9616482b5b092628b2560426b
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 cdab48222159..86c1dab9c5b7 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b317c3cba8f65eaa23f6c9ed43409d41
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 811cbbe4bf28..e177eb3966b3 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/girder-client/girder-client-2.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4eb7441db62384706f13c8aafcbaf292
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 f37c40714d17..c530d62b6604 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97ff05e27d88c25ec7a0ccf114ea508d
diff --git a/metadata/md5-cache/dev-python/git-python-2.1.11 b/metadata/md5-cache/dev-python/git-python-2.1.11
index c74436146517..3c57788f4b46 100644
--- a/metadata/md5-cache/dev-python/git-python-2.1.11
+++ b/metadata/md5-cache/dev-python/git-python-2.1.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-2.1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08361eb89e99b6f71e5f822c69f66dfa
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 79a44857b86d..9cc3340d6e09 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/G/GitPython/GitPython-2.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f647745a751d13732df4484bec38bf56
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 cc9c96d519d4..4e0b293308a4 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-1.26.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=031a08bda3902eb0e5a1a8a19bdb9a6d
diff --git a/metadata/md5-cache/dev-python/git-review-1.27.0 b/metadata/md5-cache/dev-python/git-review-1.27.0
index cd94a2d7c57b..68b0126c3721 100644
--- a/metadata/md5-cache/dev-python/git-review-1.27.0
+++ b/metadata/md5-cache/dev-python/git-review-1.27.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-1.27.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f53eb0440d6a03370dfdc0d129eb1fa1
diff --git a/metadata/md5-cache/dev-python/git-review-1.28.0 b/metadata/md5-cache/dev-python/git-review-1.28.0
index 0c97c07950a7..bbb45b6b1376 100644
--- a/metadata/md5-cache/dev-python/git-review-1.28.0
+++ b/metadata/md5-cache/dev-python/git-review-1.28.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/requests-1.1[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/git-review/git-review-1.28.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=54c7b44d017026a08035b443b445a383
diff --git a/metadata/md5-cache/dev-python/gitdb-0.6.4 b/metadata/md5-cache/dev-python/gitdb-0.6.4
index 555e2f7d47a8..0ffc5997a342 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_python3_6(-)?,-pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb/gitdb-0.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86826f731aefaccbea09c5e85c70484e
diff --git a/metadata/md5-cache/dev-python/gitdb2-2.0.3 b/metadata/md5-cache/dev-python/gitdb2-2.0.3
index 55f7bfd0e1a6..f92c4164e742 100644
--- a/metadata/md5-cache/dev-python/gitdb2-2.0.3
+++ b/metadata/md5-cache/dev-python/gitdb2-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gitdb2/gitdb2-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a1c294ba08e4020363f4ddb88954645
diff --git a/metadata/md5-cache/dev-python/github3-0.9.3 b/metadata/md5-cache/dev-python/github3-0.9.3
index 8237acadb802..1c79055e4d7e 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_python3_6(-)?,-python_sin
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce88942962c0284d6a735dae2873bbde
diff --git a/metadata/md5-cache/dev-python/gitlabform-1.0.7 b/metadata/md5-cache/dev-python/gitlabform-1.0.7
index c8bf7846ab54..ab7e9de502bc 100644
--- a/metadata/md5-cache/dev-python/gitlabform-1.0.7
+++ b/metadata/md5-cache/dev-python/gitlabform-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/egnyte/gitlabform/archive/v1.0.7.tar.gz -> gitlabform-1.0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d8f67d671596fafcfbb58e99d4364871
diff --git a/metadata/md5-cache/dev-python/gitlabform-1.3.0 b/metadata/md5-cache/dev-python/gitlabform-1.3.0
index 93b9443eba4d..18c426e54041 100644
--- a/metadata/md5-cache/dev-python/gitlabform-1.3.0
+++ b/metadata/md5-cache/dev-python/gitlabform-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/egnyte/gitlabform/archive/v1.3.0.tar.gz -> gitlabform-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d8f67d671596fafcfbb58e99d4364871
diff --git a/metadata/md5-cache/dev-python/gitlabform-1.5.0 b/metadata/md5-cache/dev-python/gitlabform-1.5.0
index ac43bca22beb..3985eb18bfaf 100644
--- a/metadata/md5-cache/dev-python/gitlabform-1.5.0
+++ b/metadata/md5-cache/dev-python/gitlabform-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/egnyte/gitlabform/archive/v1.5.0.tar.gz -> gitlabform-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=55e7ca7dd60a2951bacefd9374dcf02a
diff --git a/metadata/md5-cache/dev-python/glance_store-0.28.0 b/metadata/md5-cache/dev-python/glance_store-0.28.0
index f14fc3407da2..706cc57e77bb 100644
--- a/metadata/md5-cache/dev-python/glance_store-0.28.0
+++ b/metadata/md5-cache/dev-python/glance_store-0.28.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glance_store/glance_store-0.28.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=856c624d23ba0c7e0842f9fa7cd54412
diff --git a/metadata/md5-cache/dev-python/glance_store-1.0.1 b/metadata/md5-cache/dev-python/glance_store-1.0.1
index c1844fc54c4f..ef57958eafe0 100644
--- a/metadata/md5-cache/dev-python/glance_store-1.0.1
+++ b/metadata/md5-cache/dev-python/glance_store-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/glance_store/glance_store-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=34bede6e70a217e0def861a0cf56e252
diff --git a/metadata/md5-cache/dev-python/globre-0.1.4 b/metadata/md5-cache/dev-python/globre-0.1.4
index 0dcd43816e58..4cd61c8454d1 100644
--- a/metadata/md5-cache/dev-python/globre-0.1.4
+++ b/metadata/md5-cache/dev-python/globre-0.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/globre/globre-0.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=966f2705f28ca8b6ef71f5aadfe9a71c
diff --git a/metadata/md5-cache/dev-python/globre-0.1.5 b/metadata/md5-cache/dev-python/globre-0.1.5
index 53df3bb920ec..8d6788044c06 100644
--- a/metadata/md5-cache/dev-python/globre-0.1.5
+++ b/metadata/md5-cache/dev-python/globre-0.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/globre/globre-0.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39e527ea8b9c00cbcaf41a6c37d5cd66
diff --git a/metadata/md5-cache/dev-python/glymur-0.8.10 b/metadata/md5-cache/dev-python/glymur-0.8.10
index b7a86dd202e9..2515b6096481 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Glymur/Glymur-0.8.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aa179bb1ba9dfd147dbdb614ec0b1775
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.8 b/metadata/md5-cache/dev-python/gmpy-2.0.8
index ee40201046cf..e8df337cee32 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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.8.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdecd74c3c8d921dcbba1afe6baecad2
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.8-r1 b/metadata/md5-cache/dev-python/gmpy-2.0.8-r1
index be5b56b4c9c1..e19a2a160d27 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.0.8-r1
+++ b/metadata/md5-cache/dev-python/gmpy-2.0.8-r1
@@ -11,5 +11,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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.8.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=acbb11f6aa94ddda94eb536234bd220a
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 0c6f713bbd49..7ca086cc0fe1 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
@@ -4,7 +4,7 @@ DESCRIPTION=Provides python the base files for the Gnome Python Desktop bindings
 EAPI=5
 HOMEPAGE=http://pygtk.org/
 IUSE=debug python_targets_python2_7
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gtk+-2.4:2 >=dev-libs/glib-2.6:2 python_targets_python2_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/pygtk-2.10.3:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !<=dev-python/gnome-python-extras-2.19.1-r2
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86382ec15aad8929e88a4df986d48201
+_md5_=08296468bb7d28f5eae2fe118d626071
diff --git a/metadata/md5-cache/dev-python/gntp-1.0.3 b/metadata/md5-cache/dev-python/gntp-1.0.3
index c541d8241e66..a6b4172e4a61 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gntp/gntp-1.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4d1515935175d0842518ea45b7861a1
diff --git a/metadata/md5-cache/dev-python/gnuplot-py-1.8-r2 b/metadata/md5-cache/dev-python/gnuplot-py-1.8-r2
index 8b410c266c9a..fb5f5cb87ce6 100644
--- a/metadata/md5-cache/dev-python/gnuplot-py-1.8-r2
+++ b/metadata/md5-cache/dev-python/gnuplot-py-1.8-r2
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_singl
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=241af246f9ec60d95bd17a4a52f1e06f
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 9c75e13d6760..d56b05a6fc4e 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ad3d321d464ecd979eeedb7a18d4d24
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 2cc67fce4260..5255160c9bde 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4cb26cbe728551639e0d21002863481
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 f0f848ecc503..30d8f1363495 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=021f24f15f5de9c74833205c259c7c4a
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.7.0 b/metadata/md5-cache/dev-python/google-api-python-client-1.7.0
index 23991d8e58a7..ab06440aa8d0 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.7.0
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.7.0.tar.gz -> google-api-python-client-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5c5e4e9ead9fd8430e18cc123dbd49a8
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-1.7.9 b/metadata/md5-cache/dev-python/google-api-python-client-1.7.9
index 6ab69ee0e1cd..dbf2a7d96d55 100644
--- a/metadata/md5-cache/dev-python/google-api-python-client-1.7.9
+++ b/metadata/md5-cache/dev-python/google-api-python-client-1.7.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/google-api-python-client/archive/v1.7.9.tar.gz -> google-api-python-client-1.7.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5c5e4e9ead9fd8430e18cc123dbd49a8
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.5.30 b/metadata/md5-cache/dev-python/google-apitools-0.5.30
index 934b6100965c..35590e9337a0 100644
--- a/metadata/md5-cache/dev-python/google-apitools-0.5.30
+++ b/metadata/md5-cache/dev-python/google-apitools-0.5.30
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/apitools/archive/v0.5.30.tar.gz -> google-apitools-0.5.30.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fc1bdb2cd8a197770456fbc73bfd9ebb
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 bfee94375f41..8738868f7e20 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-apputils/google-apputils-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8aa8065d6cdbfe4b885924d4db58af29
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 bec81322b088..556705e49340 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-apputils/google-apputils-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc1a5e693f62e78226624d5dd1005a1a
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 ea7ec19478ce..62481225a653 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.0.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6303c1df4ad0885ccb106594f1cfefd
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 52f55cb11f5d..002bd63f8a60 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.1.0
+++ b/metadata/md5-cache/dev-python/google-auth-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ae5748e67e3e81b8c0e577863fa1eee
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 5dc88cb122ce..c29888841e53 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.4.1
+++ b/metadata/md5-cache/dev-python/google-auth-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e28149cf6248ba03c190ea06bd7ee83c
diff --git a/metadata/md5-cache/dev-python/google-auth-1.6.3 b/metadata/md5-cache/dev-python/google-auth-1.6.3
index 868ff4ae6bec..93ec7212b425 100644
--- a/metadata/md5-cache/dev-python/google-auth-1.6.3
+++ b/metadata/md5-cache/dev-python/google-auth-1.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth/google-auth-1.6.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bc5f8807788ec7cdfe05e2f01737e0b6
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 8e74e24a3dac..a08bc6e54933 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f45e79663db80224dc541a7c0a2b5a1
diff --git a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3 b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3
index 1598267d19c5..7cedc16756c1 100644
--- a/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3
+++ b/metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2/archive/e7cd722281d1d897fa9ae6e3b6b78ae142778e6e.tar.gz -> google-auth-httplib2-0.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7e570695cb793b33d62b84e9ec8ff591
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.0 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.0
index aea1a6ee3992..b910010f24f9 100644
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.0
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth-oauthlib/google-auth-oauthlib-0.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=555781d7ff88dfd682f92b4f8395d962
diff --git a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1 b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1
index 304de4feed65..aee5af30e059 100644
--- a/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1
+++ b/metadata/md5-cache/dev-python/google-auth-oauthlib-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/click[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-auth-oauthlib/google-auth-oauthlib-0.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d7fb2177dcf5b525bf06e9b5124034b0
diff --git a/metadata/md5-cache/dev-python/google-pasta-0.1.1 b/metadata/md5-cache/dev-python/google-pasta-0.1.1
index cbe7efbc7387..434791f1df1a 100644
--- a/metadata/md5-cache/dev-python/google-pasta-0.1.1
+++ b/metadata/md5-cache/dev-python/google-pasta-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-pasta/google-pasta-0.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6bad3324a8e43c5b3d8c200c1ba97412
diff --git a/metadata/md5-cache/dev-python/google-pasta-0.1.7 b/metadata/md5-cache/dev-python/google-pasta-0.1.7
index 2ef1213e7feb..b3c040507074 100644
--- a/metadata/md5-cache/dev-python/google-pasta-0.1.7
+++ b/metadata/md5-cache/dev-python/google-pasta-0.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/google-pasta/google-pasta-0.1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=70d574f70871bb47b873503f2bcea674
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 85c7cf910cac..d307f67a1195 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=035c3e927c270b46cb02ec0e748631af
diff --git a/metadata/md5-cache/dev-python/gql-0.1.0 b/metadata/md5-cache/dev-python/gql-0.1.0
index 278810cae928..fe8a70763055 100644
--- a/metadata/md5-cache/dev-python/gql-0.1.0
+++ b/metadata/md5-cache/dev-python/gql-0.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gql/gql-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a340c98b1b300756667dd39c698bd225
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 4ef00fbad6ed..d10122ff4cd8 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_python3_6 )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eed05f568fbc4834839c029734ea2694
diff --git a/metadata/md5-cache/dev-python/graphviz-0.10.1 b/metadata/md5-cache/dev-python/graphviz-0.10.1
index c4564cd014fc..4d99ea00b7d6 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.10.1
+++ b/metadata/md5-cache/dev-python/graphviz-0.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.10.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6351c6212082b07253e68cb30cd0a2dc
diff --git a/metadata/md5-cache/dev-python/graphviz-0.13 b/metadata/md5-cache/dev-python/graphviz-0.13
index 15c86f71d6a2..e12c20dd63cf 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.13
+++ b/metadata/md5-cache/dev-python/graphviz-0.13
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.13.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fd11fb5c09198eeda3c30e8e1610b5da
diff --git a/metadata/md5-cache/dev-python/graphviz-0.7.1 b/metadata/md5-cache/dev-python/graphviz-0.7.1
index 6a4af38ef8a0..d99b81779f32 100644
--- a/metadata/md5-cache/dev-python/graphviz-0.7.1
+++ b/metadata/md5-cache/dev-python/graphviz-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphviz/graphviz-0.7.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8181f6d2dfbef2b434f40f7bf08942c
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.12 b/metadata/md5-cache/dev-python/greenlet-0.4.12
index 27015545cc1f..44ce250ea454 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=178cee807f157d5f1266a75f190b7f73
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.13 b/metadata/md5-cache/dev-python/greenlet-0.4.13
index 77fe29c69691..092d5cf3d73e 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3305835f96d20eef0600b7d1138be189
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.15 b/metadata/md5-cache/dev-python/greenlet-0.4.15
index 2944bc9d3801..79cfb0994b5f 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.15
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5cdf0f4f64a2fc1377a83d0e1425dc28
diff --git a/metadata/md5-cache/dev-python/greenlet-0.4.15-r1 b/metadata/md5-cache/dev-python/greenlet-0.4.15-r1
index a165b0e27dc6..6628b35646b0 100644
--- a/metadata/md5-cache/dev-python/greenlet-0.4.15-r1
+++ b/metadata/md5-cache/dev-python/greenlet-0.4.15-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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenlet/greenlet-0.4.15.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f86f5b3cff031fc3167161b826cf237d
diff --git a/metadata/md5-cache/dev-python/greenstalk-0.5.2 b/metadata/md5-cache/dev-python/greenstalk-0.5.2
index 75ee88c2dd34..d0ad92baf04f 100644
--- a/metadata/md5-cache/dev-python/greenstalk-0.5.2
+++ b/metadata/md5-cache/dev-python/greenstalk-0.5.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/greenstalk/greenstalk-0.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=70787da4b4f5471b504c229a322738fc
diff --git a/metadata/md5-cache/dev-python/greenstalk-1.0.1 b/metadata/md5-cache/dev-python/greenstalk-1.0.1
index 2ace1ff13681..fa8982dc73c2 100644
--- a/metadata/md5-cache/dev-python/greenstalk-1.0.1
+++ b/metadata/md5-cache/dev-python/greenstalk-1.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mayhewj/greenstalk/archive/v1.0.1.tar.gz -> greenstalk-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f6672e86cbeecafd1af7347140f2166c
diff --git a/metadata/md5-cache/dev-python/grpcio-1.16.1 b/metadata/md5-cache/dev-python/grpcio-1.16.1
deleted file mode 100644
index d76ba498f653..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=High-performance RPC framework (python libraries)
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-futures[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
-SRC_URI=mirror://pypi/g/grpcio/grpcio-1.16.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=078a89ca7bdb359b25d6b506911f9566
diff --git a/metadata/md5-cache/dev-python/grpcio-1.17.1 b/metadata/md5-cache/dev-python/grpcio-1.17.1
deleted file mode 100644
index 3c5eb5eb018e..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-1.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=High-performance RPC framework (python libraries)
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-futures[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
-SRC_URI=mirror://pypi/g/grpcio/grpcio-1.17.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=59990d981f84e71e86a9cfc888808907
diff --git a/metadata/md5-cache/dev-python/grpcio-1.18.0 b/metadata/md5-cache/dev-python/grpcio-1.18.0
deleted file mode 100644
index 2f39ae952d6e..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-1.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=High-performance RPC framework (python libraries)
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-futures[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
-SRC_URI=mirror://pypi/g/grpcio/grpcio-1.18.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=59990d981f84e71e86a9cfc888808907
diff --git a/metadata/md5-cache/dev-python/grpcio-1.19.0 b/metadata/md5-cache/dev-python/grpcio-1.19.0
deleted file mode 100644
index bbeb84316c9a..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-1.19.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=High-performance RPC framework (python libraries)
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio/grpcio-1.19.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7f159fc76a20481f843052df05b9e947
diff --git a/metadata/md5-cache/dev-python/grpcio-1.20.1 b/metadata/md5-cache/dev-python/grpcio-1.20.1
deleted file mode 100644
index 52853a42e249..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-1.20.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=High-performance RPC framework (python libraries)
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio/grpcio-1.20.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bf57cd183613b30370526021022db4d3
diff --git a/metadata/md5-cache/dev-python/grpcio-1.21.1 b/metadata/md5-cache/dev-python/grpcio-1.21.1
deleted file mode 100644
index 1704905a1208..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-1.21.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=High-performance RPC framework (python libraries)
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-dns/c-ares:= !<net-libs/grpc-1.16.0[python] sys-libs/zlib:= virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio/grpcio-1.21.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bf57cd183613b30370526021022db4d3
diff --git a/metadata/md5-cache/dev-python/grpcio-1.22.1 b/metadata/md5-cache/dev-python/grpcio-1.22.1
index 66d81a8afbe9..e8415d143518 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.22.1
+++ b/metadata/md5-cache/dev-python/grpcio-1.22.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.22.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2e63192e36f8ebc09fb189a78a2aa36e
diff --git a/metadata/md5-cache/dev-python/grpcio-1.23.0 b/metadata/md5-cache/dev-python/grpcio-1.23.0
index bd8ea2ce4c16..4615c0300906 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.23.0
+++ b/metadata/md5-cache/dev-python/grpcio-1.23.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.23.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2e63192e36f8ebc09fb189a78a2aa36e
diff --git a/metadata/md5-cache/dev-python/grpcio-1.24.3 b/metadata/md5-cache/dev-python/grpcio-1.24.3
index e7d2cc4af850..ceec738b8183 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.24.3
+++ b/metadata/md5-cache/dev-python/grpcio-1.24.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.24.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=94ec4fbca491f78d4ce9a7ce4b330f40
diff --git a/metadata/md5-cache/dev-python/grpcio-1.26.0-r1 b/metadata/md5-cache/dev-python/grpcio-1.26.0-r1
index 00b5f8f40a21..5c64d5ace266 100644
--- a/metadata/md5-cache/dev-python/grpcio-1.26.0-r1
+++ b/metadata/md5-cache/dev-python/grpcio-1.26.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-python/cython-0.28.3[python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio/grpcio-1.26.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=897a615166d17160e5d152a807d81305
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.16.1 b/metadata/md5-cache/dev-python/grpcio-testing-1.16.1
deleted file mode 100644
index 7ebfae4eea75..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-python/grpcio-1.16.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Testing utilities for gRPC Python
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-python/grpcio-1.16.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[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
-SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.16.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=949bf5f7504b32ff81842a9bc8963ab1
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.17.1 b/metadata/md5-cache/dev-python/grpcio-testing-1.17.1
deleted file mode 100644
index 59caf1df640f..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-python/grpcio-1.17.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Testing utilities for gRPC Python
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-python/grpcio-1.17.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[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
-SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.17.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=949bf5f7504b32ff81842a9bc8963ab1
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.18.0 b/metadata/md5-cache/dev-python/grpcio-testing-1.18.0
deleted file mode 100644
index 769b3ff3d488..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-python/grpcio-1.18.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Testing utilities for gRPC Python
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-python/grpcio-1.18.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[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
-SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.18.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=949bf5f7504b32ff81842a9bc8963ab1
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.19.0 b/metadata/md5-cache/dev-python/grpcio-testing-1.19.0
deleted file mode 100644
index 865d352932d5..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.19.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-python/grpcio-1.19.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Testing utilities for gRPC Python
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-python/grpcio-1.19.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.19.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6a61240e302609035cb3abf3b7f6752f
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.20.1 b/metadata/md5-cache/dev-python/grpcio-testing-1.20.1
deleted file mode 100644
index f387549f4a98..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.20.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-python/grpcio-1.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Testing utilities for gRPC Python
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-python/grpcio-1.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.20.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9aefbc6f582e271b784c495885d1b21f
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.21.1 b/metadata/md5-cache/dev-python/grpcio-testing-1.21.1
deleted file mode 100644
index a0f4f2225e66..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.21.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-python/grpcio-1.21.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Testing utilities for gRPC Python
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-python/grpcio-1.21.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.21.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9aefbc6f582e271b784c495885d1b21f
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.22.1 b/metadata/md5-cache/dev-python/grpcio-testing-1.22.1
index bb1ffa653a9f..71c3f0bfa808 100644
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.22.1
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.22.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/grpcio-1.22.1[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.22.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9aefbc6f582e271b784c495885d1b21f
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.23.0 b/metadata/md5-cache/dev-python/grpcio-testing-1.23.0
index 5057ebce97ec..288d73ec6056 100644
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.23.0
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.23.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/grpcio-1.23.0[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.23.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9aefbc6f582e271b784c495885d1b21f
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.24.3 b/metadata/md5-cache/dev-python/grpcio-testing-1.24.3
index cb94898e1a59..be5b96c322b1 100644
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.24.3
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.24.3
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/grpcio-1.24.3[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.24.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9aefbc6f582e271b784c495885d1b21f
diff --git a/metadata/md5-cache/dev-python/grpcio-testing-1.26.0 b/metadata/md5-cache/dev-python/grpcio-testing-1.26.0
index 0c73fe17f7b1..730c8a61edcd 100644
--- a/metadata/md5-cache/dev-python/grpcio-testing-1.26.0
+++ b/metadata/md5-cache/dev-python/grpcio-testing-1.26.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/grpcio-1.26.0[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-testing/grpcio-testing-1.26.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=921698a928b4ed5b025446cc9e27b1c0
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.16.1 b/metadata/md5-cache/dev-python/grpcio-tools-1.16.1
deleted file mode 100644
index 840a64c6eddd..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/grpcio-1.16.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<net-libs/grpc-1.16.0[tools] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Protobuf code generator for gRPC
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/grpcio-1.16.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<net-libs/grpc-1.16.0[tools] 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
-SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.16.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fb0e52da8a1730816df31c7c975124ae
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.17.1 b/metadata/md5-cache/dev-python/grpcio-tools-1.17.1
deleted file mode 100644
index 2d49bd60e8d1..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.17.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/grpcio-1.17.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<net-libs/grpc-1.16.0[tools] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Protobuf code generator for gRPC
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/grpcio-1.17.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<net-libs/grpc-1.16.0[tools] 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
-SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.17.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9815972689f7aab1ad68db6d4e8b62a6
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.18.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.18.0
deleted file mode 100644
index b8f5b3d25a92..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.18.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/grpcio-1.18.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<net-libs/grpc-1.16.0[tools] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Protobuf code generator for gRPC
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/grpcio-1.18.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !<net-libs/grpc-1.16.0[tools] 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
-SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.18.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9815972689f7aab1ad68db6d4e8b62a6
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.19.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.19.0
deleted file mode 100644
index a46c739f58f1..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.19.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/grpcio-1.19.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<net-libs/grpc-1.16.0[tools] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Protobuf code generator for gRPC
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/grpcio-1.19.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<net-libs/grpc-1.16.0[tools] 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.19.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66333228aaa64d0227f66b3a8491e9a6
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.20.1 b/metadata/md5-cache/dev-python/grpcio-tools-1.20.1
deleted file mode 100644
index 6b01ec20d114..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.20.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/grpcio-1.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<net-libs/grpc-1.16.0[tools] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Protobuf code generator for gRPC
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/grpcio-1.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<net-libs/grpc-1.16.0[tools] 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.20.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a4e42a1166e7671f0163ede65d792e0e
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.21.1 b/metadata/md5-cache/dev-python/grpcio-tools-1.21.1
deleted file mode 100644
index 6c36750a2621..000000000000
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.21.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/grpcio-1.21.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<net-libs/grpc-1.16.0[tools] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Protobuf code generator for gRPC
-EAPI=7
-HOMEPAGE=https://grpc.io
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/grpcio-1.21.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !<net-libs/grpc-1.16.0[tools] 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.21.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a4e42a1166e7671f0163ede65d792e0e
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.22.1 b/metadata/md5-cache/dev-python/grpcio-tools-1.22.1
index d39a15356422..d8a58995fcc1 100644
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.22.1
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.22.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.22.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5042922daf039a8f2e94189cacf6f320
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.23.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.23.0
index 31ebb21e90ff..5af022853a18 100644
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.23.0
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.23.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.23.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5042922daf039a8f2e94189cacf6f320
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.24.3 b/metadata/md5-cache/dev-python/grpcio-tools-1.24.3
index fb2da15d7d34..80724f9f0134 100644
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.24.3
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.24.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.24.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5042922daf039a8f2e94189cacf6f320
diff --git a/metadata/md5-cache/dev-python/grpcio-tools-1.26.0 b/metadata/md5-cache/dev-python/grpcio-tools-1.26.0
index 698498537d1c..2c11832f89e7 100644
--- a/metadata/md5-cache/dev-python/grpcio-tools-1.26.0
+++ b/metadata/md5-cache/dev-python/grpcio-tools-1.26.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/grpcio-tools/grpcio-tools-1.26.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d461b6b0c4ff8d315e985eee87b683d1
diff --git a/metadata/md5-cache/dev-python/gsd-1.5.3-r1 b/metadata/md5-cache/dev-python/gsd-1.5.3-r1
index 6e6ce8efc73c..8010cd81867b 100644
--- a/metadata/md5-cache/dev-python/gsd-1.5.3-r1
+++ b/metadata/md5-cache/dev-python/gsd-1.5.3-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://glotzerlab.engin.umich.edu/Downloads/gsd/gsd-v1.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e98b1725b6a4b5ee9273d3caa2460c07
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 df00c31beaf8..1a17ebbce26e 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
@@ -4,7 +4,7 @@ DESCRIPTION=GtkSpell bindings for Python
 EAPI=5
 HOMEPAGE=http://pygtk.org/
 IUSE=doc examples python_targets_python2_7
-KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=app-text/gtkspell:2 ~dev-python/gnome-python-extras-base-2.25.3[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 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome-python-common-r1	983800f23645fc4f9052f1ec6f388e06	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b6c702d6866d2b6c0779ab9405b8659
+_md5_=bb7e9f625ed9bb8dc2a9d46e24d80672
diff --git a/metadata/md5-cache/dev-python/guessit-3.0.0 b/metadata/md5-cache/dev-python/guessit-3.0.0
index 4d3b21ae19c7..66d90d0345e5 100644
--- a/metadata/md5-cache/dev-python/guessit-3.0.0
+++ b/metadata/md5-cache/dev-python/guessit-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/guessit/guessit-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=269489903eb1203da896624ae3ed0397
diff --git a/metadata/md5-cache/dev-python/guessit-9999 b/metadata/md5-cache/dev-python/guessit-9999
index 0d4529dced3c..a1e3912ff396 100644
--- a/metadata/md5-cache/dev-python/guessit-9999
+++ b/metadata/md5-cache/dev-python/guessit-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/babelfish-0.5.5[python_targets_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=499b9f69c072c9c3524484b89c67e55a
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 50ac48bbbf92..473faa57ebcc 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b94e599dcb178e66a99c8db979599413
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 7e02a93b93cd..dc30d9efbf7a 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8077c5f58e734fddde88e011a5298c3
diff --git a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1 b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
index 4f720c5a09cb..2afab8d4559d 100644
--- a/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
+++ b/metadata/md5-cache/dev-python/guzzle_sphinx_theme-0.7.11-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sphinx-1.2[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=36953ca83fe039443be6de368a95964a
diff --git a/metadata/md5-cache/dev-python/h11-0.7.0 b/metadata/md5-cache/dev-python/h11-0.7.0
index 1840ca92f94d..e38f04b1e10d 100644
--- a/metadata/md5-cache/dev-python/h11-0.7.0
+++ b/metadata/md5-cache/dev-python/h11-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-0.7.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f1a9a9364cb6155474e6737beabacac
diff --git a/metadata/md5-cache/dev-python/h11-0.8.1 b/metadata/md5-cache/dev-python/h11-0.8.1
index ffc10270c2f3..5b2733692139 100644
--- a/metadata/md5-cache/dev-python/h11-0.8.1
+++ b/metadata/md5-cache/dev-python/h11-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h11/h11-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fbf09f3aac8e541a40f3e78abb257b8e
diff --git a/metadata/md5-cache/dev-python/h5py-2.10.0 b/metadata/md5-cache/dev-python/h5py-2.10.0
index afd84b5af505..2867ad95f949 100644
--- a/metadata/md5-cache/dev-python/h5py-2.10.0
+++ b/metadata/md5-cache/dev-python/h5py-2.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5c61105db8144b325abe14f72677a818
diff --git a/metadata/md5-cache/dev-python/h5py-2.7.0 b/metadata/md5-cache/dev-python/h5py-2.7.0
index 0ce408b49f6d..70b0c159c026 100644
--- a/metadata/md5-cache/dev-python/h5py-2.7.0
+++ b/metadata/md5-cache/dev-python/h5py-2.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71cf3f23733937fc6457dea76da38164
diff --git a/metadata/md5-cache/dev-python/h5py-2.7.1 b/metadata/md5-cache/dev-python/h5py-2.7.1
index 7058c5afa4c8..b586bdb7ca7d 100644
--- a/metadata/md5-cache/dev-python/h5py-2.7.1
+++ b/metadata/md5-cache/dev-python/h5py-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=65c7cd2dc0838140fb115197c9266b77
diff --git a/metadata/md5-cache/dev-python/h5py-2.9.0 b/metadata/md5-cache/dev-python/h5py-2.9.0
index d0cb945bf45c..e15a27db6aa4 100644
--- a/metadata/md5-cache/dev-python/h5py-2.9.0
+++ b/metadata/md5-cache/dev-python/h5py-2.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-2.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c745d12fa2de54c4c22b076809f4620d
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 9f6e21272a0f..2656a19350fd 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_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-core/hachoir-core-1.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d345056bc65dc1ef0309f8f49524ba6f
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 e56ff4464cc7..6d354a6f0ed3 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_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3ea0221732d45b24722da723b432896
diff --git a/metadata/md5-cache/dev-python/hacking-2.0.0 b/metadata/md5-cache/dev-python/hacking-2.0.0
index 2ad7af5eca87..034eba818acf 100644
--- a/metadata/md5-cache/dev-python/hacking-2.0.0
+++ b/metadata/md5-cache/dev-python/hacking-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hacking/hacking-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2f799c34bfc2710fd2511e4d1734ebf5
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.6.1 b/metadata/md5-cache/dev-python/hcloud-python-1.6.1
index 205807191ba8..de62ac88a897 100644
--- a/metadata/md5-cache/dev-python/hcloud-python-1.6.1
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.6.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/hetznercloud/hcloud-python/archive/v1.6.1.tar.gz -> hcloud-python-1.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fff6bf74fdb331281316111048dc61dd
diff --git a/metadata/md5-cache/dev-python/hcloud-python-1.6.3 b/metadata/md5-cache/dev-python/hcloud-python-1.6.3
index ea1554d15510..9f2305942c27 100644
--- a/metadata/md5-cache/dev-python/hcloud-python-1.6.3
+++ b/metadata/md5-cache/dev-python/hcloud-python-1.6.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-dateutil-2.7.5[python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/hetznercloud/hcloud-python/archive/v1.6.3.tar.gz -> hcloud-python-1.6.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a81973b108ff050e08dbc25797018634
diff --git a/metadata/md5-cache/dev-python/helpdev-0.6.10 b/metadata/md5-cache/dev-python/helpdev-0.6.10
index d1d8f3425796..ea898b9374e4 100644
--- a/metadata/md5-cache/dev-python/helpdev-0.6.10
+++ b/metadata/md5-cache/dev-python/helpdev-0.6.10
@@ -10,5 +10,5 @@ RDEPEND=dev-python/importlib_metadata[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/h/helpdev/helpdev-0.6.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=747e2fac05a8414a25cfb3b62a5ffe2b
diff --git a/metadata/md5-cache/dev-python/hgdistver-0.25 b/metadata/md5-cache/dev-python/hgdistver-0.25
index 45f927911234..40c410a3a4b7 100644
--- a/metadata/md5-cache/dev-python/hgdistver-0.25
+++ b/metadata/md5-cache/dev-python/hgdistver-0.25
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgdistver/hgdistver-0.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0bb2a50c484e7898f4b90e570423d74f
diff --git a/metadata/md5-cache/dev-python/hglib-2.1 b/metadata/md5-cache/dev-python/hglib-2.1
index 262434058098..dc5d57608096 100644
--- a/metadata/md5-cache/dev-python/hglib-2.1
+++ b/metadata/md5-cache/dev-python/hglib-2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-hglib/python-hglib-2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0bbe631dd5ff767c9464852ec8a856cd
diff --git a/metadata/md5-cache/dev-python/hiredis-0.2.0-r1 b/metadata/md5-cache/dev-python/hiredis-0.2.0-r1
index 16933e944fe8..766b5d0a2796 100644
--- a/metadata/md5-cache/dev-python/hiredis-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/hiredis-0.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/hiredis-0.13.1 python_targets_python3_6? ( dev-lang/python:3.
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiredis/hiredis-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=18618e6e27354b3611480bd66fe25a05
diff --git a/metadata/md5-cache/dev-python/hiro-0.2 b/metadata/md5-cache/dev-python/hiro-0.2
index 68e9718acccb..1d5012a3784e 100644
--- a/metadata/md5-cache/dev-python/hiro-0.2
+++ b/metadata/md5-cache/dev-python/hiro-0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72642b60e9821ac26d9fcc8b9df46355
diff --git a/metadata/md5-cache/dev-python/hiro-0.3 b/metadata/md5-cache/dev-python/hiro-0.3
index 6f43334c2c1c..da4c6e90f4b8 100644
--- a/metadata/md5-cache/dev-python/hiro-0.3
+++ b/metadata/md5-cache/dev-python/hiro-0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50c59c92524173c6a2de1b2bbd8c6f8f
diff --git a/metadata/md5-cache/dev-python/hiro-0.5 b/metadata/md5-cache/dev-python/hiro-0.5
index b63a2379e5b2..3bd0454d893b 100644
--- a/metadata/md5-cache/dev-python/hiro-0.5
+++ b/metadata/md5-cache/dev-python/hiro-0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hiro/hiro-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c03c2135d3a66932d645a7fab998c61b
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 5f1b17587d0e..6ec5349f469d 100644
--- a/metadata/md5-cache/dev-python/hpack-2.3.0-r1
+++ b/metadata/md5-cache/dev-python/hpack-2.3.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hpack/hpack-2.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=515f2ee56351006cf977fd4d5d380a2a
diff --git a/metadata/md5-cache/dev-python/hpack-3.0.0 b/metadata/md5-cache/dev-python/hpack-3.0.0
index 9fc25dec8330..6762f2e95d63 100644
--- a/metadata/md5-cache/dev-python/hpack-3.0.0
+++ b/metadata/md5-cache/dev-python/hpack-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hpack/archive/v3.0.0.tar.gz -> hpack-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f8fab3a90b1b9d7fc192a274738c066
diff --git a/metadata/md5-cache/dev-python/html2text-2018.1.9 b/metadata/md5-cache/dev-python/html2text-2018.1.9
index 5fd8a89249e2..c8714df4a73e 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd141d85845a83495b36e1dc993e5a0c
diff --git a/metadata/md5-cache/dev-python/html2text-2019.8.11 b/metadata/md5-cache/dev-python/html2text-2019.8.11
index c9ba52688196..3bb4882099bb 100644
--- a/metadata/md5-cache/dev-python/html2text-2019.8.11
+++ b/metadata/md5-cache/dev-python/html2text-2019.8.11
@@ -5,12 +5,12 @@ DESCRIPTION=Turn HTML into equivalent Markdown-structured text
 EAPI=7
 HOMEPAGE=https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html2text/html2text-2019.8.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=08f46c948b0f0e8a434e1044f1e621bb
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c47b193bed96bd0e1b39fbf5395f89e1
diff --git a/metadata/md5-cache/dev-python/html2text-2019.9.26 b/metadata/md5-cache/dev-python/html2text-2019.9.26
index 2b4ec7671bfd..87abf9052e01 100644
--- a/metadata/md5-cache/dev-python/html2text-2019.9.26
+++ b/metadata/md5-cache/dev-python/html2text-2019.9.26
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html2text/html2text-2019.9.26.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4f9a4e39ad7755c6e8e02b96e2d49474
diff --git a/metadata/md5-cache/dev-python/html2text-2020.1.16 b/metadata/md5-cache/dev-python/html2text-2020.1.16
index e8f205a922d4..f037a52d8d7b 100644
--- a/metadata/md5-cache/dev-python/html2text-2020.1.16
+++ b/metadata/md5-cache/dev-python/html2text-2020.1.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html2text/html2text-2020.1.16.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1796792f065c7619616023d0b77ea1f2
diff --git a/metadata/md5-cache/dev-python/html5-parser-0.4.9 b/metadata/md5-cache/dev-python/html5-parser-0.4.9
index 2b175e27b32a..e5546e54d6b8 100644
--- a/metadata/md5-cache/dev-python/html5-parser-0.4.9
+++ b/metadata/md5-cache/dev-python/html5-parser-0.4.9
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:= dev-python/chardet[python_targets_python2_7(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5-parser/html5-parser-0.4.9.tar.gz -> html5-parser-0.4.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3d8403eda43060e6ccd933d3919514d4
diff --git a/metadata/md5-cache/dev-python/html5lib-0.9999999 b/metadata/md5-cache/dev-python/html5lib-0.9999999
index bad592c1972f..cea4c6d798bb 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.9999999
+++ b/metadata/md5-cache/dev-python/html5lib-0.9999999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-0.9999999.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed752be99f060b30d9736cf597d85b5f
diff --git a/metadata/md5-cache/dev-python/html5lib-0.999999999 b/metadata/md5-cache/dev-python/html5lib-0.999999999
index f198f854edb3..226afb37e775 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.999999999
+++ b/metadata/md5-cache/dev-python/html5lib-0.999999999
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-0.999999999.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9217d9df84f9557615381427297bfbcd
diff --git a/metadata/md5-cache/dev-python/html5lib-1.0.1 b/metadata/md5-cache/dev-python/html5lib-1.0.1
index f8235e782ed6..9ca7e39380d9 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.0.1
+++ b/metadata/md5-cache/dev-python/html5lib-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a7e2b93221f4e72813ad42e5c7af401b
diff --git a/metadata/md5-cache/dev-python/html5lib-1.0.1-r1 b/metadata/md5-cache/dev-python/html5lib-1.0.1-r1
index 03c78bd0217c..cffa206082df 100644
--- a/metadata/md5-cache/dev-python/html5lib-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/html5lib-1.0.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest-expect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=>=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest-expect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/six-1.9[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webencodings[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/html5lib/html5lib-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=beb92e6356ffe63ae9a9484e04b525b6
diff --git a/metadata/md5-cache/dev-python/httmock-1.2.5 b/metadata/md5-cache/dev-python/httmock-1.2.5
index 0fc9cee190f0..bfed6412ead8 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_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f457fc7bd436e337cd816d367ef860a6
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 37c9f18ea013..959cb01913a4 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_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/h/http-parser/http-parser-0.8.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=729443c7f097d3f9801d550057781487
diff --git a/metadata/md5-cache/dev-python/httpauth-0.3 b/metadata/md5-cache/dev-python/httpauth-0.3
index b8d6dc401eea..4852ac96edbe 100644
--- a/metadata/md5-cache/dev-python/httpauth-0.3
+++ b/metadata/md5-cache/dev-python/httpauth-0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpauth/httpauth-0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d86e3db08254f4ce5d76e285ed53d55
diff --git a/metadata/md5-cache/dev-python/httpbin-0.4.1 b/metadata/md5-cache/dev-python/httpbin-0.4.1
index 87357696a79a..8d2f23fdd7e6 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httpbin/httpbin-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1905a255e663c945a664c1d894162531
diff --git a/metadata/md5-cache/dev-python/httpbin-0.7.0 b/metadata/md5-cache/dev-python/httpbin-0.7.0
index 000952e36bfe..1dbdb5e5a0a8 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.7.0
+++ b/metadata/md5-cache/dev-python/httpbin-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpbin/httpbin-0.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a2145a3dbb5c90f698c3ea6ffc508a8b
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 6b360841bcde..ca614150a89e 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.10.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9683d20dd4d4d4faa7850bd75aa527ba
diff --git a/metadata/md5-cache/dev-python/httplib2-0.11.3 b/metadata/md5-cache/dev-python/httplib2-0.11.3
index 08f4dfa52f94..e820371d5f2c 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.11.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=836164f6eb5fd86bcdd779d15e54963f
diff --git a/metadata/md5-cache/dev-python/httplib2-0.12.1 b/metadata/md5-cache/dev-python/httplib2-0.12.1
index 0e3fb8457e72..495fdb460744 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.12.1
+++ b/metadata/md5-cache/dev-python/httplib2-0.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3ee79c4b80f39f0564ad85d8e381c707
diff --git a/metadata/md5-cache/dev-python/httplib2-0.13.0 b/metadata/md5-cache/dev-python/httplib2-0.13.0
index 1f93b7d62c77..71e2785a91aa 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.13.0
+++ b/metadata/md5-cache/dev-python/httplib2-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a4b8b0d6ea1aa8c88416914ee3c1c6bf
diff --git a/metadata/md5-cache/dev-python/httpretty-0.8.14 b/metadata/md5-cache/dev-python/httpretty-0.8.14
index 5586f29bacc2..7b6c68d9a60d 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.8.14
+++ b/metadata/md5-cache/dev-python/httpretty-0.8.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.8.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=715fb4392e068facfdea8fa88c780bc4
diff --git a/metadata/md5-cache/dev-python/httpretty-0.9.6 b/metadata/md5-cache/dev-python/httpretty-0.9.6
index 47998eb8ef6b..2f97b363d2e7 100644
--- a/metadata/md5-cache/dev-python/httpretty-0.9.6
+++ b/metadata/md5-cache/dev-python/httpretty-0.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-0.9.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b3ebead2c941e0ab5a07020adc0e0bde
diff --git a/metadata/md5-cache/dev-python/httpstat-1.2.1-r1 b/metadata/md5-cache/dev-python/httpstat-1.2.1-r1
index 4d8a0a1601bc..9ecea6176990 100644
--- a/metadata/md5-cache/dev-python/httpstat-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/httpstat-1.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/reorx/httpstat/archive/1.2.1.tar.gz -> httpstat-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=34ea68488dd824e61afb4b454807d069
diff --git a/metadata/md5-cache/dev-python/httreplay-0.2.0 b/metadata/md5-cache/dev-python/httreplay-0.2.0
index 9e6546ac14bd..4ce34c415ad1 100644
--- a/metadata/md5-cache/dev-python/httreplay-0.2.0
+++ b/metadata/md5-cache/dev-python/httreplay-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/httreplay/httreplay-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bd409598eb3fcfb9a2dc6a13bb1a0065
diff --git a/metadata/md5-cache/dev-python/humanfriendly-4.17 b/metadata/md5-cache/dev-python/humanfriendly-4.17
index 36c5ef71ffb2..b840580fcdff 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-4.17
+++ b/metadata/md5-cache/dev-python/humanfriendly-4.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xolox/python-humanfriendly/archive/4.17.tar.gz -> humanfriendly-4.17.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=16ee6cd8a7b357a35bd7838bc61231da
diff --git a/metadata/md5-cache/dev-python/humanfriendly-4.18 b/metadata/md5-cache/dev-python/humanfriendly-4.18
index eadf47ec77f6..757f6acb5908 100644
--- a/metadata/md5-cache/dev-python/humanfriendly-4.18
+++ b/metadata/md5-cache/dev-python/humanfriendly-4.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-4.18.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e36eaa16b04bd7d5618e302b4cc9d0e1
diff --git a/metadata/md5-cache/dev-python/humanize-0.5.1 b/metadata/md5-cache/dev-python/humanize-0.5.1
index b95f48b3ed47..f3cc770c5b56 100644
--- a/metadata/md5-cache/dev-python/humanize-0.5.1
+++ b/metadata/md5-cache/dev-python/humanize-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmoiron/humanize/archive/0.5.1.tar.gz -> humanize-0.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=13c16184d34113ab2163bff7a6da88a8
diff --git a/metadata/md5-cache/dev-python/husl-4.0.3 b/metadata/md5-cache/dev-python/husl-4.0.3
index ab34d3f41395..2513ba89b2d3 100644
--- a/metadata/md5-cache/dev-python/husl-4.0.3
+++ b/metadata/md5-cache/dev-python/husl-4.0.3
@@ -11,5 +11,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=mirror://pypi/h/husl/husl-4.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4038abd3a6f545dbb6f2334d4ff841cc
diff --git a/metadata/md5-cache/dev-python/hvac-0.2.17 b/metadata/md5-cache/dev-python/hvac-0.2.17
index ce70c447f623..37dd9c959247 100644
--- a/metadata/md5-cache/dev-python/hvac-0.2.17
+++ b/metadata/md5-cache/dev-python/hvac-0.2.17
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/hvac/hvac-0.2.17.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8b9bee5d89d793d8d54dc36bf506cde3
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 9e1de3734e10..cf0152fa8fbd 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_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=953d574ff8dee26fcc49e79ad3623d02
diff --git a/metadata/md5-cache/dev-python/hyper-h2-3.0.1 b/metadata/md5-cache/dev-python/hyper-h2-3.0.1
deleted file mode 100644
index bb24c73ca961..000000000000
--- a/metadata/md5-cache/dev-python/hyper-h2-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/hyperframe-5.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/hyperframe-6.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hpack-2.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/hpack-4.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=HTTP/2 State-Machine based protocol implementation
-EAPI=6
-HOMEPAGE=https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/hyperframe-5.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/hyperframe-6.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hpack-2.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/hpack-4.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=147fdf8948beefb8fecc7f512fa1312f
diff --git a/metadata/md5-cache/dev-python/hyper-h2-3.1.1 b/metadata/md5-cache/dev-python/hyper-h2-3.1.1
index 26aaca394204..989195278055 100644
--- a/metadata/md5-cache/dev-python/hyper-h2-3.1.1
+++ b/metadata/md5-cache/dev-python/hyper-h2-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v3.1.1.tar.gz -> hyper-h2-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=26dad37a2000c7ecce4990cff569e305
diff --git a/metadata/md5-cache/dev-python/hyper-h2-3.2.0 b/metadata/md5-cache/dev-python/hyper-h2-3.2.0
new file mode 100644
index 000000000000..56bb5f48b348
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hyper-h2-3.2.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/hyperframe-5.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/hyperframe-6.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hpack-3.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/hpack-4.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/enum34-2.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=HTTP/2 State-Machine based protocol implementation
+EAPI=7
+HOMEPAGE=https://python-hyper.org/h2/en/stable/ https://pypi.org/project/h2/
+IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/hyperframe-5.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/hyperframe-6.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/hpack-3.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/hpack-4.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/enum34-1.1.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/enum34-2.0.0[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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-hyper/hyper-h2/archive/v3.2.0.tar.gz -> hyper-h2-3.2.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c5532329e5b169158850e4108c12023e
diff --git a/metadata/md5-cache/dev-python/hyperframe-4.0.1 b/metadata/md5-cache/dev-python/hyperframe-4.0.1
index 1812de2877eb..7f9a1e228d59 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_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/h/hyperframe/hyperframe-4.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=016e86cc7cad5db68b3a81b124e1d7ed
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.1.0 b/metadata/md5-cache/dev-python/hyperframe-5.1.0
index 25ca22750644..d4eafc990499 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_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-5.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a00ed3028353c0c057dc2a69d2570eec
diff --git a/metadata/md5-cache/dev-python/hyperframe-5.2.0 b/metadata/md5-cache/dev-python/hyperframe-5.2.0
index 6e89f7205fef..a14aadb47be7 100644
--- a/metadata/md5-cache/dev-python/hyperframe-5.2.0
+++ b/metadata/md5-cache/dev-python/hyperframe-5.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperframe/hyperframe-5.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e44416f49ef43f84ae3743a48d6a4c5d
diff --git a/metadata/md5-cache/dev-python/hyperlink-17.1.1 b/metadata/md5-cache/dev-python/hyperlink-17.1.1
index 6bc5b34b113a..018d860ad1a5 100644
--- a/metadata/md5-cache/dev-python/hyperlink-17.1.1
+++ b/metadata/md5-cache/dev-python/hyperlink-17.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-17.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cae2d6b5dfab8c8faa9722604aafe2e9
diff --git a/metadata/md5-cache/dev-python/hyperlink-17.3.1 b/metadata/md5-cache/dev-python/hyperlink-17.3.1
index d1c2e74e5670..fc91376e4a17 100644
--- a/metadata/md5-cache/dev-python/hyperlink-17.3.1
+++ b/metadata/md5-cache/dev-python/hyperlink-17.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-17.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9a410b83c73bc16bd69fc40d351f738
diff --git a/metadata/md5-cache/dev-python/hyperlink-18.0.0 b/metadata/md5-cache/dev-python/hyperlink-18.0.0
index 32ffe7f27c9a..c0065be537ac 100644
--- a/metadata/md5-cache/dev-python/hyperlink-18.0.0
+++ b/metadata/md5-cache/dev-python/hyperlink-18.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-18.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d6280d3f39dc5020c0ac3af205a74a1
diff --git a/metadata/md5-cache/dev-python/hyperlink-19.0.0 b/metadata/md5-cache/dev-python/hyperlink-19.0.0
index 69deaf5b7828..4f1c193bde54 100644
--- a/metadata/md5-cache/dev-python/hyperlink-19.0.0
+++ b/metadata/md5-cache/dev-python/hyperlink-19.0.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A featureful, correct URL for Python
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hyperlink/hyperlink-19.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=38acb919319a422cde7d9a6af2ae5bb4
diff --git a/metadata/md5-cache/dev-python/hypothesis-4.47.5 b/metadata/md5-cache/dev-python/hypothesis-4.47.5
index ba8732a4c4d1..d92db061f89d 100644
--- a/metadata/md5-cache/dev-python/hypothesis-4.47.5
+++ b/metadata/md5-cache/dev-python/hypothesis-4.47.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-4.47.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d05c66bb8df735fe77f0dc3bf1e793fc
diff --git a/metadata/md5-cache/dev-python/hypothesis-4.50.8 b/metadata/md5-cache/dev-python/hypothesis-4.50.8
index 0cd5b94d9c47..583026a35efd 100644
--- a/metadata/md5-cache/dev-python/hypothesis-4.50.8
+++ b/metadata/md5-cache/dev-python/hypothesis-4.50.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-4.50.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=16df9a95920867661c988d60c735a9ff
diff --git a/metadata/md5-cache/dev-python/hypothesis-4.55.4 b/metadata/md5-cache/dev-python/hypothesis-4.55.4
deleted file mode 100644
index fb946b77a666..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-4.55.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=7
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-4.55.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b12b45a0896e20eff523de60a1c9884b
diff --git a/metadata/md5-cache/dev-python/hypothesis-4.57.1 b/metadata/md5-cache/dev-python/hypothesis-4.57.1
index 6d792a9151ac..aceb4b7f63d9 100644
--- a/metadata/md5-cache/dev-python/hypothesis-4.57.1
+++ b/metadata/md5-cache/dev-python/hypothesis-4.57.1
@@ -4,12 +4,12 @@ DESCRIPTION=A library for property based testing
 EAPI=7
 HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~sparc x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-4.57.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0457aa1478f8cb97cdf56bd6fdf37a4a
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6ea5098f58bd2172e90ecd973d6a93eb
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.3.0 b/metadata/md5-cache/dev-python/hypothesis-5.3.0
deleted file mode 100644
index a48254c0f5c0..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-5.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=7
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5c2907bee5ce41b337c14ff5926931c2
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.4.0 b/metadata/md5-cache/dev-python/hypothesis-5.4.0
deleted file mode 100644
index f7e20338f50e..000000000000
--- a/metadata/md5-cache/dev-python/hypothesis-5.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A library for property based testing
-EAPI=7
-HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5c2907bee5ce41b337c14ff5926931c2
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.4.1 b/metadata/md5-cache/dev-python/hypothesis-5.4.1
index e65d067813d0..68794d4b27cf 100644
--- a/metadata/md5-cache/dev-python/hypothesis-5.4.1
+++ b/metadata/md5-cache/dev-python/hypothesis-5.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5c2907bee5ce41b337c14ff5926931c2
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.5.0 b/metadata/md5-cache/dev-python/hypothesis-5.5.0
new file mode 100644
index 000000000000..3ea4cb927c36
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.5.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.5.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5c2907bee5ce41b337c14ff5926931c2
diff --git a/metadata/md5-cache/dev-python/hypothesis-5.5.1 b/metadata/md5-cache/dev-python/hypothesis-5.5.1
new file mode 100644
index 000000000000..e86b3ffc9597
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-5.5.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !!<dev-python/typing-3.7.4.1 ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=7
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+),sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+),sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+),sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+),sqlite] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-5.5.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5c2907bee5ce41b337c14ff5926931c2
diff --git a/metadata/md5-cache/dev-python/icalendar-3.11.7 b/metadata/md5-cache/dev-python/icalendar-3.11.7
index 29a8d9d8e71e..224905ce2560 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.11.7
+++ b/metadata/md5-cache/dev-python/icalendar-3.11.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.11.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70761bde751d60110b91df1704dcecc7
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 38773ccce8af..e8fb702b0241 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
+++ b/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.11.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9ab0d7aea475bfb4adc625be7089a1d3
diff --git a/metadata/md5-cache/dev-python/icalendar-3.9.2 b/metadata/md5-cache/dev-python/icalendar-3.9.2
index 05edc87602e4..c3a856ea1d8d 100644
--- a/metadata/md5-cache/dev-python/icalendar-3.9.2
+++ b/metadata/md5-cache/dev-python/icalendar-3.9.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-3.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64a70111b7fa239f790707dc2f057a5f
diff --git a/metadata/md5-cache/dev-python/icalendar-4.0.3 b/metadata/md5-cache/dev-python/icalendar-4.0.3
index c753cdf3cb47..7ebd2e274d85 100644
--- a/metadata/md5-cache/dev-python/icalendar-4.0.3
+++ b/metadata/md5-cache/dev-python/icalendar-4.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/icalendar/icalendar-4.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e56dec19f75575e88c0ad5ec83515a8
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 2b60550580d7..67e5727cefd4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d14fd84d57f23b3e820ac9d3a804702f
diff --git a/metadata/md5-cache/dev-python/idna-2.8 b/metadata/md5-cache/dev-python/idna-2.8
index 5d443f3e9ce8..92d637b45ee4 100644
--- a/metadata/md5-cache/dev-python/idna-2.8
+++ b/metadata/md5-cache/dev-python/idna-2.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna/idna-2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4862b289b63941e9fd58a7ce0479fafb
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 714e28e073eb..8ed98a9a3fe7 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_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna_ssl/idna_ssl-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c470e4abd384c246c5dd1a72db399209
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 9b2bf8121eaa..6b5991331b1e 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_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna-ssl/idna-ssl-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6bb28995e03a0fd0057850211feebb9
diff --git a/metadata/md5-cache/dev-python/idna-ssl-1.1.0 b/metadata/md5-cache/dev-python/idna-ssl-1.1.0
index e1c54a46bb88..2da00a8948c0 100644
--- a/metadata/md5-cache/dev-python/idna-ssl-1.1.0
+++ b/metadata/md5-cache/dev-python/idna-ssl-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/idna-ssl/idna-ssl-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=616a0f31a8270ba1e606679ff0d7afc0
diff --git a/metadata/md5-cache/dev-python/ifaddr-0.1.6 b/metadata/md5-cache/dev-python/ifaddr-0.1.6
index fa69054cfe5a..99f037626d15 100644
--- a/metadata/md5-cache/dev-python/ifaddr-0.1.6
+++ b/metadata/md5-cache/dev-python/ifaddr-0.1.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ifaddr/ifaddr-0.1.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b33e379920b2d9fae6554fb5939f08b3
diff --git a/metadata/md5-cache/dev-python/ijson-2.3 b/metadata/md5-cache/dev-python/ijson-2.3
index 1cc51b31e9b8..de149fc614b3 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_python3_6? ( dev-lang/python:3.6 ) >=dev-la
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/isagalaev/ijson/archive/2.3.tar.gz -> ijson-2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0089238fa76c16cc09c8963cdf1b6156
diff --git a/metadata/md5-cache/dev-python/ijson-2.4 b/metadata/md5-cache/dev-python/ijson-2.4
index 846975e600b9..4292f838c1c1 100644
--- a/metadata/md5-cache/dev-python/ijson-2.4
+++ b/metadata/md5-cache/dev-python/ijson-2.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/yajl python_targets_python3_6? ( dev-lang/python:3.6 ) python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ijson/ijson-2.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=baa6092e26596a128b57cdda3e134af5
diff --git a/metadata/md5-cache/dev-python/ijson-2.5.1 b/metadata/md5-cache/dev-python/ijson-2.5.1
index 85e76120a4f7..17127b035481 100644
--- a/metadata/md5-cache/dev-python/ijson-2.5.1
+++ b/metadata/md5-cache/dev-python/ijson-2.5.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/yajl python_targets_python3_6? ( dev-lang/python:3.6 ) python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ICRAR/ijson/archive/v2.5.1.tar.gz -> ijson-2.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cd5a4787f286d5ae63ab7abaf8530f51
diff --git a/metadata/md5-cache/dev-python/imageio-2.6.1 b/metadata/md5-cache/dev-python/imageio-2.6.1
index 18e2a5cbb368..b10ac790a716 100644
--- a/metadata/md5-cache/dev-python/imageio-2.6.1
+++ b/metadata/md5-cache/dev-python/imageio-2.6.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/imageio/imageio/archive/v2.6.1.tar.gz -> imageio-2.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=935b45fa17c2343ebf8493c2bccf5f5a
diff --git a/metadata/md5-cache/dev-python/imagesize-1.1.0 b/metadata/md5-cache/dev-python/imagesize-1.1.0
index 1a92c5dbdc0d..673c79592882 100644
--- a/metadata/md5-cache/dev-python/imagesize-1.1.0
+++ b/metadata/md5-cache/dev-python/imagesize-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/imagesize/imagesize-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=573bc7db80a6524e8a43488d1298bdf6
diff --git a/metadata/md5-cache/dev-python/imapclient-0.13 b/metadata/md5-cache/dev-python/imapclient-0.13
index 12408cc6d3c3..7a9366c6a992 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_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IMAPClient/IMAPClient-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=619bca2340ee1e269acea5173e40cf23
diff --git a/metadata/md5-cache/dev-python/imapclient-2.1.0 b/metadata/md5-cache/dev-python/imapclient-2.1.0
index b77329ffbeb7..d606a9fdf12e 100644
--- a/metadata/md5-cache/dev-python/imapclient-2.1.0
+++ b/metadata/md5-cache/dev-python/imapclient-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mjs/imapclient/archive/2.1.0.tar.gz -> imapclient-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e959ccdde4535a059fe32cb9078c57df
diff --git a/metadata/md5-cache/dev-python/iminuit-1.2 b/metadata/md5-cache/dev-python/iminuit-1.2
index 8393f8e4aef8..0bf937bac735 100644
--- a/metadata/md5-cache/dev-python/iminuit-1.2
+++ b/metadata/md5-cache/dev-python/iminuit-1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iminuit/iminuit-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3de7bca1dc12e01a518d2afdcd97ab2
diff --git a/metadata/md5-cache/dev-python/iminuit-1.3.3 b/metadata/md5-cache/dev-python/iminuit-1.3.3
index c07d1ddc6b3e..86aa963374bc 100644
--- a/metadata/md5-cache/dev-python/iminuit-1.3.3
+++ b/metadata/md5-cache/dev-python/iminuit-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iminuit/iminuit-1.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3de7bca1dc12e01a518d2afdcd97ab2
diff --git a/metadata/md5-cache/dev-python/immutables-0.11 b/metadata/md5-cache/dev-python/immutables-0.11
index a99601ca003f..d3d90ab49ac1 100644
--- a/metadata/md5-cache/dev-python/immutables-0.11
+++ b/metadata/md5-cache/dev-python/immutables-0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/MagicStack/immutables/archive/v0.11.tar.gz -> immutables-0.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c3629ed0b47ad41cbe56c2defa8289ab
diff --git a/metadata/md5-cache/dev-python/importing-1.10 b/metadata/md5-cache/dev-python/importing-1.10
index ba48b1a18ab3..b3a900cdd8d0 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_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/I/Importing/Importing-1.10.zip -> importing-1.10.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38f506490e7c587ef607f468cb0008bb
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-0.23-r1 b/metadata/md5-cache/dev-python/importlib_metadata-0.23-r1
index f22dc2ff18d6..46ce3bdcf034 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-0.23-r1
+++ b/metadata/md5-cache/dev-python/importlib_metadata-0.23-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-0.23.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e43bf15d096e6cd4f957d5b707696c9
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-1.4.0 b/metadata/md5-cache/dev-python/importlib_metadata-1.4.0
index 182030166c43..60ea71b1e05e 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-1.4.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=16cbd108a8376969dbebbdbf09ddbbb0
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-1.5.0 b/metadata/md5-cache/dev-python/importlib_metadata-1.5.0
index 17be9eec7549..33308ffd4448 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-1.5.0
+++ b/metadata/md5-cache/dev-python/importlib_metadata-1.5.0
@@ -4,12 +4,12 @@ DESCRIPTION=Read metadata from Python packages
 EAPI=7
 HOMEPAGE=https://importlib-metadata.readthedocs.io/
 IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2663ccd6f85b2b51b3ddef0796588d3f
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=357ac47cdf4aa626f45c13191738933d
diff --git a/metadata/md5-cache/dev-python/importlib_resources-1.0.2-r1 b/metadata/md5-cache/dev-python/importlib_resources-1.0.2-r1
index 2addefbe75bb..a1f0e1577c5e 100644
--- a/metadata/md5-cache/dev-python/importlib_resources-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/importlib_resources-1.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_resources/importlib_resources-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6cd096e433f1502cce2365f22035e5a0
diff --git a/metadata/md5-cache/dev-python/incremental-16.10.1 b/metadata/md5-cache/dev-python/incremental-16.10.1
index ae5ab5c37b62..ad39128c79ca 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_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/i/incremental/incremental-16.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e198fc989cb112c76b265527d1eac21
diff --git a/metadata/md5-cache/dev-python/incremental-17.5.0 b/metadata/md5-cache/dev-python/incremental-17.5.0
index 151bcfe61d7e..7404c2c6ecbc 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/incremental/incremental-17.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fbeb5156f6c50fc715e64d10d8629ac5
diff --git a/metadata/md5-cache/dev-python/indexed_gzip-0.8.7 b/metadata/md5-cache/dev-python/indexed_gzip-0.8.7
index 911e3c62f264..cab83948937b 100644
--- a/metadata/md5-cache/dev-python/indexed_gzip-0.8.7
+++ b/metadata/md5-cache/dev-python/indexed_gzip-0.8.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pauldmccarthy/indexed_gzip/archive/v0.8.7.tar.gz -> indexed_gzip-0.8.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=12ac888534c8c4b37e03571379e6c674
diff --git a/metadata/md5-cache/dev-python/inflect-0.2.5 b/metadata/md5-cache/dev-python/inflect-0.2.5
index 3adabf33a6af..269c413b2d08 100644
--- a/metadata/md5-cache/dev-python/inflect-0.2.5
+++ b/metadata/md5-cache/dev-python/inflect-0.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-0.2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6993b9e941fec5deac7a0b355fd1be74
diff --git a/metadata/md5-cache/dev-python/inflect-3.0.2 b/metadata/md5-cache/dev-python/inflect-3.0.2
index 45418c806a01..2c847d3a6700 100644
--- a/metadata/md5-cache/dev-python/inflect-3.0.2
+++ b/metadata/md5-cache/dev-python/inflect-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-3.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=34d07f17f765024ba8da87da0d0d59e9
diff --git a/metadata/md5-cache/dev-python/inflect-4.0.0 b/metadata/md5-cache/dev-python/inflect-4.0.0
index 605560478136..38397ab15c99 100644
--- a/metadata/md5-cache/dev-python/inflect-4.0.0
+++ b/metadata/md5-cache/dev-python/inflect-4.0.0
@@ -4,12 +4,12 @@ DESCRIPTION=Correctly inflect words and numbers
 EAPI=7
 HOMEPAGE=https://github.com/jazzband/inflect
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/inflect/inflect-4.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4556387f11e2d14b5b8be48c7a1fb9c6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=93c18f7ca238dabf66615b2aefc2f5d7
diff --git a/metadata/md5-cache/dev-python/inflection-0.3.1 b/metadata/md5-cache/dev-python/inflection-0.3.1
index 83cc49a20715..2d312d50c0d0 100644
--- a/metadata/md5-cache/dev-python/inflection-0.3.1
+++ b/metadata/md5-cache/dev-python/inflection-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jpvanhal/inflection/archive/0.3.1.tar.gz -> inflection-0.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d206e5aa812797193f85536225266677
diff --git a/metadata/md5-cache/dev-python/influxdb-2.12.0 b/metadata/md5-cache/dev-python/influxdb-2.12.0
index 013f18c0cce4..d5e70237392f 100644
--- a/metadata/md5-cache/dev-python/influxdb-2.12.0
+++ b/metadata/md5-cache/dev-python/influxdb-2.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/influxdb/influxdb-2.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d6efbbcf6cfcccfb55bb8e9fc3e32e1
diff --git a/metadata/md5-cache/dev-python/iniparse-0.4-r2 b/metadata/md5-cache/dev-python/iniparse-0.4-r2
index 9ec48883c064..cdaf704ba678 100644
--- a/metadata/md5-cache/dev-python/iniparse-0.4-r2
+++ b/metadata/md5-cache/dev-python/iniparse-0.4-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/iniparse/iniparse-0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=30b3fcea129a0e38c24c7533ac6d829b
diff --git a/metadata/md5-cache/dev-python/intelhex-2.0 b/metadata/md5-cache/dev-python/intelhex-2.0
index 0392fa27d5ac..b110b6e400ab 100644
--- a/metadata/md5-cache/dev-python/intelhex-2.0
+++ b/metadata/md5-cache/dev-python/intelhex-2.0
@@ -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=mirror://pypi/I/IntelHex/intelhex-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e1761874bea31c809ab81d9c37dd6959
diff --git a/metadata/md5-cache/dev-python/intelhex-2.2.1 b/metadata/md5-cache/dev-python/intelhex-2.2.1
index aae5cc4f2d0f..1fabd95813c4 100644
--- a/metadata/md5-cache/dev-python/intelhex-2.2.1
+++ b/metadata/md5-cache/dev-python/intelhex-2.2.1
@@ -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=mirror://pypi/I/IntelHex/intelhex-2.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dca7643d291f1be52e49878a9a11f32b
diff --git a/metadata/md5-cache/dev-python/intervaltree-2.1.0 b/metadata/md5-cache/dev-python/intervaltree-2.1.0
index 3001b8559fe2..f95a38d592cd 100644
--- a/metadata/md5-cache/dev-python/intervaltree-2.1.0
+++ b/metadata/md5-cache/dev-python/intervaltree-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/intervaltree/intervaltree-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d8f20169cf7ff252ff850d66374e0c2
diff --git a/metadata/md5-cache/dev-python/intervaltree-3.0.2 b/metadata/md5-cache/dev-python/intervaltree-3.0.2
index f968f3ca3073..52a42db7f61f 100644
--- a/metadata/md5-cache/dev-python/intervaltree-3.0.2
+++ b/metadata/md5-cache/dev-python/intervaltree-3.0.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sortedcontainers[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/sortedcontainers[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Editable interval tree data structure for Python 2 and 3
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/intervaltree/intervaltree-3.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fba9aeeeb6842b0eb96abbe7dceeecc7
diff --git a/metadata/md5-cache/dev-python/into-0.2.2 b/metadata/md5-cache/dev-python/into-0.2.2
index e18513c6e4b8..6ba8d528200b 100644
--- a/metadata/md5-cache/dev-python/into-0.2.2
+++ b/metadata/md5-cache/dev-python/into-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/datashape[python_targets_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/into/into-0.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d9a00c5755ab17094512a982c47c4da
diff --git a/metadata/md5-cache/dev-python/intreehooks-1.0 b/metadata/md5-cache/dev-python/intreehooks-1.0
index 0df3aaf94850..492399552081 100644
--- a/metadata/md5-cache/dev-python/intreehooks-1.0
+++ b/metadata/md5-cache/dev-python/intreehooks-1.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Load a PEP 517 backend from inside the source tree
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/intreehooks/intreehooks-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=862ae25bdb814f2c8df1d7446607f6cb
diff --git a/metadata/md5-cache/dev-python/invoke-1.1.1 b/metadata/md5-cache/dev-python/invoke-1.1.1
index 2727b7943cba..55ed5ad02abd 100644
--- a/metadata/md5-cache/dev-python/invoke-1.1.1
+++ b/metadata/md5-cache/dev-python/invoke-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/i/invoke/invoke-1.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=771701002e5e206fe2c12e18a675981c
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 8d6f2ca44e04..87cb54a5ea00 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2-r1
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8a0fc6b44eceb82de4cd6964444839d
diff --git a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2 b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
index 12336cdd29e9..98ef185cc161 100644
--- a/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/iocapture-0.1.2-r2
@@ -1,16 +1,16 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Capture stdout, stderr easily
 EAPI=7
 HOMEPAGE=https://pypi.org/project/iocapture/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/oinume/iocapture/archive/0.1.2.tar.gz -> iocapture-0.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2bb75c7f503a59947ee54a8862eb4b72
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0802355d5171f831f4d09a49decaadcb
diff --git a/metadata/md5-cache/dev-python/ioflo-1.5.0 b/metadata/md5-cache/dev-python/ioflo-1.5.0
index 96acc8f4a092..b0a7e3d8b463 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c88e7cf138eba4ebf9671d91a900fc6b
diff --git a/metadata/md5-cache/dev-python/ioflo-1.7.4 b/metadata/md5-cache/dev-python/ioflo-1.7.4
index 2bb72f8a3347..f471d2d85fd6 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c31c45babce204e61ea936e879acfcaa
diff --git a/metadata/md5-cache/dev-python/ioflo-1.7.5 b/metadata/md5-cache/dev-python/ioflo-1.7.5
index 87fd3e4805af..a09e601fc7a9 100644
--- a/metadata/md5-cache/dev-python/ioflo-1.7.5
+++ b/metadata/md5-cache/dev-python/ioflo-1.7.5
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ioflo/ioflo/archive/v1.7.5.tar.gz -> ioflo-1.7.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e2374b207c7f801bb21a622381d05d9
diff --git a/metadata/md5-cache/dev-python/ip-associations-python-novaclient-ext-0.2 b/metadata/md5-cache/dev-python/ip-associations-python-novaclient-ext-0.2
index 11e01e5eaafe..ccd052b40123 100644
--- a/metadata/md5-cache/dev-python/ip-associations-python-novaclient-ext-0.2
+++ b/metadata/md5-cache/dev-python/ip-associations-python-novaclient-ext-0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-novaclient-2.20.0[python_targets_python3_6(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ip_associations_python_novaclient_ext/ip_associations_python_novaclient_ext-0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3d66b8b1689c221b62560525f5757191
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 a47ef966f6b4..065b349c246e 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_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/i/ipaddr/ipaddr-2.1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b362d6097bcdc8fd23407aefe3b190ce
diff --git a/metadata/md5-cache/dev-python/ipaddr-2.2.0 b/metadata/md5-cache/dev-python/ipaddr-2.2.0
index 175db1a9db0d..559f5c396b6d 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddr/ipaddr-2.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0765fa4aa41487bb7269b77faa947f51
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.14 b/metadata/md5-cache/dev-python/ipaddress-1.0.14
index 575f15bc8556..7e8c1e1946b9 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6a2bd85753e7e2bc7724dfc0757b644
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.18 b/metadata/md5-cache/dev-python/ipaddress-1.0.18
index bb60db82ab3e..77bc49e6fd72 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_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/i/ipaddress/ipaddress-1.0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a9ac72d83af792101720d7730b32fc8
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.19 b/metadata/md5-cache/dev-python/ipaddress-1.0.19
index 9291e7a302f3..91d2ce10f095 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_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/i/ipaddress/ipaddress-1.0.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=616359dacbc8f276a17ecbca074e303f
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.22 b/metadata/md5-cache/dev-python/ipaddress-1.0.22
index 7aa1de5fea0e..a9a9b0bb59c6 100644
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.22
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.22
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.0.22.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8f3408343680eaa494a439ffd4c9878f
diff --git a/metadata/md5-cache/dev-python/ipaddress-1.0.23 b/metadata/md5-cache/dev-python/ipaddress-1.0.23
index 35adbcb5f7bc..8031d4bf1147 100644
--- a/metadata/md5-cache/dev-python/ipaddress-1.0.23
+++ b/metadata/md5-cache/dev-python/ipaddress-1.0.23
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipaddress/ipaddress-1.0.23.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=18c9acc7391d30f7e76832291f301f02
diff --git a/metadata/md5-cache/dev-python/ipcalc-1.99.0 b/metadata/md5-cache/dev-python/ipcalc-1.99.0
index 25b8a5013657..42acc7bb4a79 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_pypy3(-)?,python_targets_python3_6(-)?,-py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/tehmaze/ipcalc/archive/ipcalc-1.99.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a20397bc04e63ae8342e748d82a27589
diff --git a/metadata/md5-cache/dev-python/ipdb-0.10.3 b/metadata/md5-cache/dev-python/ipdb-0.10.3
index befad535d81a..7ff3c0ba55d7 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_python3_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipdb/ipdb-0.10.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ee8b09cc54de2b9d0f075b88b541aa9
diff --git a/metadata/md5-cache/dev-python/ipdbplugin-1.4 b/metadata/md5-cache/dev-python/ipdbplugin-1.4
index 43947a8dd8cd..ff7e64e1ec36 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_python3_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipdbplugin/ipdbplugin-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6e2d871b83bb1ed39d76d7b3d4ee9b4
diff --git a/metadata/md5-cache/dev-python/ipdbplugin-9999 b/metadata/md5-cache/dev-python/ipdbplugin-9999
index fed153a0b7b3..38724b95a788 100644
--- a/metadata/md5-cache/dev-python/ipdbplugin-9999
+++ b/metadata/md5-cache/dev-python/ipdbplugin-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/ipython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ipdb dev-python/nose 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6e2d871b83bb1ed39d76d7b3d4ee9b4
diff --git a/metadata/md5-cache/dev-python/ipy-0.83 b/metadata/md5-cache/dev-python/ipy-0.83
index e8327bcf8216..cc0861953e11 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-0.83.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d4880cfe1d66735f89892e13464c626
diff --git a/metadata/md5-cache/dev-python/ipy-1.00 b/metadata/md5-cache/dev-python/ipy-1.00
index 369903eba6e9..38103d3930ea 100644
--- a/metadata/md5-cache/dev-python/ipy-1.00
+++ b/metadata/md5-cache/dev-python/ipy-1.00
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/I/IPy/IPy-1.00.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=997ff98306dc9b78376b0969b0a93ba3
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 f9adee10c7af..cc1b29c34f70 100644
--- a/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
+++ b/metadata/md5-cache/dev-python/ipykernel-4.6.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-4.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d34a520d84525ed0f9b6b25e69ea8fa
diff --git a/metadata/md5-cache/dev-python/ipykernel-4.8.2 b/metadata/md5-cache/dev-python/ipykernel-4.8.2
index e4c60864a781..1dba789d6ec8 100644
--- a/metadata/md5-cache/dev-python/ipykernel-4.8.2
+++ b/metadata/md5-cache/dev-python/ipykernel-4.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-4.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=199f4b69bbf316559deefd9d4111290e
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.1.0 b/metadata/md5-cache/dev-python/ipykernel-5.1.0
index 2141d95b59d7..1f97f5846873 100644
--- a/metadata/md5-cache/dev-python/ipykernel-5.1.0
+++ b/metadata/md5-cache/dev-python/ipykernel-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-5.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f888c5b5c53fdb0b663a899d05243011
diff --git a/metadata/md5-cache/dev-python/ipykernel-5.1.3 b/metadata/md5-cache/dev-python/ipykernel-5.1.3
index 09ba42923b67..b7d2ff93ab11 100644
--- a/metadata/md5-cache/dev-python/ipykernel-5.1.3
+++ b/metadata/md5-cache/dev-python/ipykernel-5.1.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ipython-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( >=dev-python/ipython-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/ipython-6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/traitlets-4.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose_warnings_filters[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flaky[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=IPython Kernel for Jupyter
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipykernel/ipykernel-5.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a58c13f4f2e0137f8eda0ac950e1821c
diff --git a/metadata/md5-cache/dev-python/ipynb-0.5.1 b/metadata/md5-cache/dev-python/ipynb-0.5.1
index e8ce0ec0ce0b..ab69f357dd11 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4683ccfef1b589d0713c2f464ba792fb
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 f64c013ec42e..12cc62bac3d8 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=457b6a6b5a0379ffaef5fd7e0ac50be3
diff --git a/metadata/md5-cache/dev-python/ipyparallel-6.2.3 b/metadata/md5-cache/dev-python/ipyparallel-6.2.3
index 8e228fa00f5a..950e46e64368 100644
--- a/metadata/md5-cache/dev-python/ipyparallel-6.2.3
+++ b/metadata/md5-cache/dev-python/ipyparallel-6.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipyparallel/ipyparallel-6.2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eecb6e3795a3c6451f6ebeac9d5e7759
diff --git a/metadata/md5-cache/dev-python/ipython-5.4.1-r2 b/metadata/md5-cache/dev-python/ipython-5.4.1-r2
index 22782b1d3624..bd377ba8c88f 100644
--- a/metadata/md5-cache/dev-python/ipython-5.4.1-r2
+++ b/metadata/md5-cache/dev-python/ipython-5.4.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=351f89a31a073a237e73f343a25a5df0
diff --git a/metadata/md5-cache/dev-python/ipython-5.8.0-r1 b/metadata/md5-cache/dev-python/ipython-5.8.0-r1
index 0856d07253ea..f084903f2a3c 100644
--- a/metadata/md5-cache/dev-python/ipython-5.8.0-r1
+++ b/metadata/md5-cache/dev-python/ipython-5.8.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-5.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47c58935e2e73502ea817ffc38fb25d7
diff --git a/metadata/md5-cache/dev-python/ipython-7.5.0 b/metadata/md5-cache/dev-python/ipython-7.5.0
index 36e9049b1d64..8fa76e4fbc77 100644
--- a/metadata/md5-cache/dev-python/ipython-7.5.0
+++ b/metadata/md5-cache/dev-python/ipython-7.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython/ipython-7.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=401dd1c2f6d5c9f040ce76d4eacaf2f1
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 e5b106f7a8d2..2bddc04defe1 100644
--- a/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
+++ b/metadata/md5-cache/dev-python/ipython_genutils-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipython_genutils/ipython_genutils-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf60c7ab935e707c7cf20e14ae94eee2
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.0.0 b/metadata/md5-cache/dev-python/ipywidgets-7.0.0
index eab289db1a3e..cbaba5049c46 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.0.0
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b41795356d9961740ba03dc9f0598140
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.4.2 b/metadata/md5-cache/dev-python/ipywidgets-7.4.2
index 2dd6385b7ff5..0f02d24dbc95 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.4.2
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b72e6bb6b80c4cc4d8829960b8e13c7
diff --git a/metadata/md5-cache/dev-python/ipywidgets-7.4.2-r1 b/metadata/md5-cache/dev-python/ipywidgets-7.4.2-r1
index 76cf8a8ff0d9..154cae031226 100644
--- a/metadata/md5-cache/dev-python/ipywidgets-7.4.2-r1
+++ b/metadata/md5-cache/dev-python/ipywidgets-7.4.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/ipywidgets/ipywidgets-7.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1ced355c33b945a57c780715bb57850f
diff --git a/metadata/md5-cache/dev-python/irc-16.3 b/metadata/md5-cache/dev-python/irc-16.3
index fb5c5149a576..3dbb969b405b 100644
--- a/metadata/md5-cache/dev-python/irc-16.3
+++ b/metadata/md5-cache/dev-python/irc-16.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-16.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=462dab098f2c654731e6760abeaff689
diff --git a/metadata/md5-cache/dev-python/irc-17.1 b/metadata/md5-cache/dev-python/irc-17.1
index 005fe4ad15af..22b2ad785ba3 100644
--- a/metadata/md5-cache/dev-python/irc-17.1
+++ b/metadata/md5-cache/dev-python/irc-17.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-17.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cca52655e8a53431aeb9beee6037ec2f
diff --git a/metadata/md5-cache/dev-python/irc-18.0.0-r1 b/metadata/md5-cache/dev-python/irc-18.0.0-r1
index 4df69b21691b..4de39b6886dd 100644
--- a/metadata/md5-cache/dev-python/irc-18.0.0-r1
+++ b/metadata/md5-cache/dev-python/irc-18.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/irc/irc-18.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=44dc3d5564e18ddf28faa1171e48d707
diff --git a/metadata/md5-cache/dev-python/iso3166-0.8 b/metadata/md5-cache/dev-python/iso3166-0.8
index 5f13f9682dcb..9eddd4d9e90d 100644
--- a/metadata/md5-cache/dev-python/iso3166-0.8
+++ b/metadata/md5-cache/dev-python/iso3166-0.8
@@ -11,5 +11,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=mirror://pypi/i/iso3166/iso3166-0.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0581459e60c59abcf740bafbe0ac614e
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.10 b/metadata/md5-cache/dev-python/iso8601-0.1.10
index 972aa783e3d5..783435f1beec 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.10
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac140cf994e7f4ebc66ba1526ea612a8
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.11 b/metadata/md5-cache/dev-python/iso8601-0.1.11
index 945e437c02f8..46714e07c786 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.11
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e748d5156c1fe11ee73a7dbf8cca802b
diff --git a/metadata/md5-cache/dev-python/iso8601-0.1.12 b/metadata/md5-cache/dev-python/iso8601-0.1.12
index dbf58d945052..311535aa84bb 100644
--- a/metadata/md5-cache/dev-python/iso8601-0.1.12
+++ b/metadata/md5-cache/dev-python/iso8601-0.1.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/iso8601/iso8601-0.1.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cd4eb1705a5248ec4db7bba95bb618c2
diff --git a/metadata/md5-cache/dev-python/iso_639-0.4.5 b/metadata/md5-cache/dev-python/iso_639-0.4.5
index 7e09e2325644..eee2436cf3c7 100644
--- a/metadata/md5-cache/dev-python/iso_639-0.4.5
+++ b/metadata/md5-cache/dev-python/iso_639-0.4.5
@@ -11,5 +11,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=mirror://pypi/i/iso-639/iso-639-0.4.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f0dc11b1063d29ff8f5163f26356352a
diff --git a/metadata/md5-cache/dev-python/isodate-0.5.4 b/metadata/md5-cache/dev-python/isodate-0.5.4
index 898adb0bc5f5..911b3d7656cf 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_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/i/isodate/isodate-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1de6a0882317f4ab3e257b8d8e75a9d4
diff --git a/metadata/md5-cache/dev-python/isodate-0.6.0 b/metadata/md5-cache/dev-python/isodate-0.6.0
index 47b23e0d59f9..4bb4c6fe3cd2 100644
--- a/metadata/md5-cache/dev-python/isodate-0.6.0
+++ b/metadata/md5-cache/dev-python/isodate-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/isodate/isodate-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9a5b100287657cd5f33300cd4459726
diff --git a/metadata/md5-cache/dev-python/isort-4.2.5 b/metadata/md5-cache/dev-python/isort-4.2.5
index 7207f280247a..f1ccdfe870d0 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_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/i/isort/isort-4.2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12ff55b09de6907e36e8317b9d67379f
diff --git a/metadata/md5-cache/dev-python/isort-4.3.15 b/metadata/md5-cache/dev-python/isort-4.3.15
index 8c72ac4d99a4..db403234b43b 100644
--- a/metadata/md5-cache/dev-python/isort-4.3.15
+++ b/metadata/md5-cache/dev-python/isort-4.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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/isort/isort-4.3.15.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=520dd2a9c8ba589f8a55097d0065bc46
diff --git a/metadata/md5-cache/dev-python/isort-4.3.21_p2 b/metadata/md5-cache/dev-python/isort-4.3.21_p2
index 6867e2b7da9e..6fd18a34a052 100644
--- a/metadata/md5-cache/dev-python/isort-4.3.21_p2
+++ b/metadata/md5-cache/dev-python/isort-4.3.21_p2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pipfile[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-futures[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pipfile[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-futures[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pipfile[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-futures[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pipfile[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-futures[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A python utility/library to sort imports
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/timothycrosley/isort/archive/4.3.21-2.tar.gz -> isort-4.3.21_p2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3b5441186c13ebaa010dacb1c5205426
diff --git a/metadata/md5-cache/dev-python/itsdangerous-0.24 b/metadata/md5-cache/dev-python/itsdangerous-0.24
index cd82bd3701b2..3c951d5ab20b 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-0.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bcfe90d468fa232cdd37c3db8c685adf
diff --git a/metadata/md5-cache/dev-python/itsdangerous-0.24-r1 b/metadata/md5-cache/dev-python/itsdangerous-0.24-r1
index c8279aafe5a5..cf55d36b18de 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-0.24-r1
+++ b/metadata/md5-cache/dev-python/itsdangerous-0.24-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-0.24.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=51bc583cb82534b33be86d3177bb1f30
diff --git a/metadata/md5-cache/dev-python/itsdangerous-1.1.0 b/metadata/md5-cache/dev-python/itsdangerous-1.1.0
index 92bcbff2cd52..64e24b12a258 100644
--- a/metadata/md5-cache/dev-python/itsdangerous-1.1.0
+++ b/metadata/md5-cache/dev-python/itsdangerous-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/itsdangerous/itsdangerous-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=06714eca7c19fa90dd2299fc8e663708
diff --git a/metadata/md5-cache/dev-python/itypes-1.1.0 b/metadata/md5-cache/dev-python/itypes-1.1.0
index 35cc91e5dacc..9185f26ebad3 100644
--- a/metadata/md5-cache/dev-python/itypes-1.1.0
+++ b/metadata/md5-cache/dev-python/itypes-1.1.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/i/itypes/itypes-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5a1ffaefe5a6ed25e457388c8324e7bf
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-2.0-r1 b/metadata/md5-cache/dev-python/jaraco-classes-2.0-r1
index d47d4b31bccd..2c206962354b 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-2.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-classes-2.0-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Classes used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.classes
 IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5d77f86ce31440a91b6aff72b1096c0b
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=acb182982436cdcb44088d57d0d01a98
diff --git a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0 b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
index 794c10f15227..f2416b465a5d 100644
--- a/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
+++ b/metadata/md5-cache/dev-python/jaraco-classes-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.classes/jaraco.classes-3.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e07426db249cc80fbe2c27418d6d7eb6
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1 b/metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1
index eaaebf7226ee..a46f2dadb0c7 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1
+++ b/metadata/md5-cache/dev-python/jaraco-collections-1.5.3-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-1.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=528ccea11f315c339b069410e16ab735
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-2.1 b/metadata/md5-cache/dev-python/jaraco-collections-2.1
index 515575163fb6..cd3b90fcfd53 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-2.1
+++ b/metadata/md5-cache/dev-python/jaraco-collections-2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b2ed21fdd67514d85a689c58932491ed
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-3.0.0 b/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
index 526202733a1d..93fed5b18e1c 100644
--- a/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-collections-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-3.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3571cc6cfa57cdaadedc2aa7dc4a35d1
diff --git a/metadata/md5-cache/dev-python/jaraco-envs-1.0.1 b/metadata/md5-cache/dev-python/jaraco-envs-1.0.1
index 37c710d303f3..8815cca02ab2 100644
--- a/metadata/md5-cache/dev-python/jaraco-envs-1.0.1
+++ b/metadata/md5-cache/dev-python/jaraco-envs-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jaraco/jaraco.envs/archive/v1.0.1.tar.gz -> jaraco-envs-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a9ff69e8a29abbeb13a75fd6b59f2bf2
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-1.19-r1 b/metadata/md5-cache/dev-python/jaraco-functools-1.19-r1
index 094320a96ccf..3f458d07eaf8 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-1.19-r1
+++ b/metadata/md5-cache/dev-python/jaraco-functools-1.19-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-1.19.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e2a2b8aa66b128d6c122538eab723024
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-2.0-r1 b/metadata/md5-cache/dev-python/jaraco-functools-2.0-r1
index 1cf094bc4f23..c5b651975d56 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-2.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-functools-2.0-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Additional functions used by other projects by developer jaraco
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.functools
 IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=82eb9c23b73e99c2ddca7dc031b8712f
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fe950374c6bb0fbf7121f74d3a69efe9
diff --git a/metadata/md5-cache/dev-python/jaraco-functools-3.0.0 b/metadata/md5-cache/dev-python/jaraco-functools-3.0.0
index a834fdcc38d2..c245f9e17f81 100644
--- a/metadata/md5-cache/dev-python/jaraco-functools-3.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-functools-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.functools/jaraco.functools-3.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fbbe36239f4ca5e244086b755d0ef57e
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-2.3-r1 b/metadata/md5-cache/dev-python/jaraco-itertools-2.3-r1
index 366e6663b49a..9eb7f0456f3d 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-2.3-r1
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-2.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0f6fe43eea5802c26f950ce25a78a044
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-4.4.2 b/metadata/md5-cache/dev-python/jaraco-itertools-4.4.2
index 6133834c79e9..c4c3a2d056bd 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-4.4.2
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-4.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-4.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9740a023d6ab970da5f74d69a0a655d6
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0 b/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
index c3a78d865d12..21bceb3c7269 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-5.0.0
@@ -4,12 +4,12 @@ DESCRIPTION=Tools for working with iterables. Complements itertools and more_ite
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.itertools
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/namespace-jaraco-2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/inflect[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-5.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=abb76cf0ced6787787ea70ccf0403b61
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9c8316c96beb16a97e0b27ea88724559
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-1.5.2-r1 b/metadata/md5-cache/dev-python/jaraco-logging-1.5.2-r1
index 1f793b95a739..b0038fd4637f 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-1.5.2-r1
+++ b/metadata/md5-cache/dev-python/jaraco-logging-1.5.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-1.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b899dcc6f04f29b255056a4e3ef8068a
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-2.0 b/metadata/md5-cache/dev-python/jaraco-logging-2.0
index 1e9670b0051e..696e383f481e 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-2.0
+++ b/metadata/md5-cache/dev-python/jaraco-logging-2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b3a97ccf2aea3ef7d1c431147bdb661d
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1 b/metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
index bbf974df33e7..54562e289fd0 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-logging-3.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-3.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3efdaaeb8512d119456b31acd727ce9a
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-4.1 b/metadata/md5-cache/dev-python/jaraco-packaging-4.1
index 7fb05218ba1b..003031d3a00f 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-4.1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93310d1041f4b1ab2301db79b41ed214
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-5.1-r1 b/metadata/md5-cache/dev-python/jaraco-packaging-5.1-r1
index 21cb742a3068..738fbe41c9ec 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-5.1-r1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4f58f64f633029338f768eefc2300f3f
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-6.1 b/metadata/md5-cache/dev-python/jaraco-packaging-6.1
index b15ff9076121..bd4f60a020f0 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-6.1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=54af49d4af3f2a558ea5afa98eba4db4
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-6.2 b/metadata/md5-cache/dev-python/jaraco-packaging-6.2
index 3b793c5729e0..0e898beeb887 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-6.2
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-6.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e5133d331ef1155e93782b2f6afc7fe3
diff --git a/metadata/md5-cache/dev-python/jaraco-packaging-6.2-r1 b/metadata/md5-cache/dev-python/jaraco-packaging-6.2-r1
index 2320cf1f2309..c91a41cde5c4 100644
--- a/metadata/md5-cache/dev-python/jaraco-packaging-6.2-r1
+++ b/metadata/md5-cache/dev-python/jaraco-packaging-6.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.packaging/jaraco.packaging-6.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1a2f7de6c128983788d44d417b96d31c
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-1.2-r1 b/metadata/md5-cache/dev-python/jaraco-stream-1.2-r1
index e882f3b0ae71..4f1950874f23 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-1.2-r1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-1.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=82f106bcc04b0914b1b6bce9c9fb9007
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-2.0-r1 b/metadata/md5-cache/dev-python/jaraco-stream-2.0-r1
index d0f3cc62096e..4f629cc54ed5 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-2.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-stream-2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6cf784434d0fe79e80bf11a589f9534a
diff --git a/metadata/md5-cache/dev-python/jaraco-stream-3.0.0 b/metadata/md5-cache/dev-python/jaraco-stream-3.0.0
index db9a93ada0c5..6c66f396f69f 100644
--- a/metadata/md5-cache/dev-python/jaraco-stream-3.0.0
+++ b/metadata/md5-cache/dev-python/jaraco-stream-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.stream/jaraco.stream-3.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f3c010c9084ab91cf21a2fc1600888c
diff --git a/metadata/md5-cache/dev-python/jaraco-text-1.10.1-r1 b/metadata/md5-cache/dev-python/jaraco-text-1.10.1-r1
index 9e789a52a4a6..888195a7f0ce 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-1.10.1-r1
+++ b/metadata/md5-cache/dev-python/jaraco-text-1.10.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-1.10.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=130935277cbba2128d42670c3e9f8310
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.1 b/metadata/md5-cache/dev-python/jaraco-text-3.1
index c77323d2b019..9fb0ecd24669 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.1
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea4b9c85a32ae2aed82241e749af4267
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.2.0 b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
index e33f7439f214..70e874257126 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.2.0
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f7ed4da7a0d00046e6935c18c69a4aeb
diff --git a/metadata/md5-cache/dev-python/jaxml-3.02-r1 b/metadata/md5-cache/dev-python/jaxml-3.02-r1
index 034b2ab6f9b1..57a70616b0c6 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_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/j/jaxml/jaxml-3.02.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15e8c5e5fe1b11d3baec0d976ab69be3
diff --git a/metadata/md5-cache/dev-python/jdcal-1.0 b/metadata/md5-cache/dev-python/jdcal-1.0
index 0d36851692e6..e5908b8225dd 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jdcal/jdcal-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f06b90f39af3a73a5cf473d9e2588d2f
diff --git a/metadata/md5-cache/dev-python/jdcal-1.2 b/metadata/md5-cache/dev-python/jdcal-1.2
index 835e19e62479..ea9cab289594 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jdcal/jdcal-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c28bb831a42a944b27541113fca9f06
diff --git a/metadata/md5-cache/dev-python/jdcal-1.4 b/metadata/md5-cache/dev-python/jdcal-1.4
index c9bdc8d7d973..3c9b4d364924 100644
--- a/metadata/md5-cache/dev-python/jdcal-1.4
+++ b/metadata/md5-cache/dev-python/jdcal-1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jdcal/jdcal-1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=88591164e9397b777549a216cd81d2b2
diff --git a/metadata/md5-cache/dev-python/jedi-0.10.2 b/metadata/md5-cache/dev-python/jedi-0.10.2
index 4386e6793ae9..21d03bdf2803 100644
--- a/metadata/md5-cache/dev-python/jedi-0.10.2
+++ b/metadata/md5-cache/dev-python/jedi-0.10.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.10.2.tar.gz -> jedi-0.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15eb8c44a5fc205c5248aaf72878e958
diff --git a/metadata/md5-cache/dev-python/jedi-0.11.1 b/metadata/md5-cache/dev-python/jedi-0.11.1
index f98c8971dd1c..42c16cb1a435 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.11.1.tar.gz -> jedi-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3ec90c0c2f72cdf2509d9257876aafb
diff --git a/metadata/md5-cache/dev-python/jedi-0.12.0 b/metadata/md5-cache/dev-python/jedi-0.12.0
index 2b8bdd6246f4..f86cebac0aee 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.12.0.tar.gz -> jedi-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a5cb229a3d481894896d13361f2ab2d
diff --git a/metadata/md5-cache/dev-python/jedi-0.12.1 b/metadata/md5-cache/dev-python/jedi-0.12.1
index 96ad1844ee8c..d476e9aafe1f 100644
--- a/metadata/md5-cache/dev-python/jedi-0.12.1
+++ b/metadata/md5-cache/dev-python/jedi-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.12.1.tar.gz -> jedi-0.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bb13c7fc1c3c39cef5635d0c5ab7019
diff --git a/metadata/md5-cache/dev-python/jedi-0.14.1 b/metadata/md5-cache/dev-python/jedi-0.14.1
index 33ce4f00a680..1dceec54ee22 100644
--- a/metadata/md5-cache/dev-python/jedi-0.14.1
+++ b/metadata/md5-cache/dev-python/jedi-0.14.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/parso[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/parso[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Autocompletion library for Python
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jedi/jedi-0.14.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5f70519e5a9e58e517ba24816fa959f1
diff --git a/metadata/md5-cache/dev-python/jedi-0.15.1 b/metadata/md5-cache/dev-python/jedi-0.15.1
index b1359d2be697..9fcfb03288df 100644
--- a/metadata/md5-cache/dev-python/jedi-0.15.1
+++ b/metadata/md5-cache/dev-python/jedi-0.15.1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/parso-0.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/parso-0.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=>=dev-python/parso-0.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-python/parso-0.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Autocompletion library for Python
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.15.1.tar.gz -> jedi-0.15.1.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.15.0.tar.gz -> typeshed-jedi_v0.15.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b792a79b21833d49273870f58af27c6f
diff --git a/metadata/md5-cache/dev-python/jeepney-0.3.1 b/metadata/md5-cache/dev-python/jeepney-0.3.1
index 259ea3731bf9..dafe32373d2c 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.3.1
+++ b/metadata/md5-cache/dev-python/jeepney-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=263564cb209054d50d66cc2eadbffc27
diff --git a/metadata/md5-cache/dev-python/jeepney-0.4.1 b/metadata/md5-cache/dev-python/jeepney-0.4.1
index 5e29c53dbdff..409a0ca8bba4 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.4.1
+++ b/metadata/md5-cache/dev-python/jeepney-0.4.1
@@ -4,12 +4,12 @@ DESCRIPTION=Low-level, pure Python DBus protocol wrapper
 EAPI=7
 HOMEPAGE=https://gitlab.com/takluyver/jeepney
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7161e613847183a0b66ca9eae0b16590
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a4f0e98b3850969ef1e2ade6bc53829b
diff --git a/metadata/md5-cache/dev-python/jellyfish-0.7.2 b/metadata/md5-cache/dev-python/jellyfish-0.7.2
index a1c78d8620a3..ad02f579c5ce 100644
--- a/metadata/md5-cache/dev-python/jellyfish-0.7.2
+++ b/metadata/md5-cache/dev-python/jellyfish-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jellyfish/jellyfish-0.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b96f5ca7dfb04fe41d0592a7315dc6ed
diff --git a/metadata/md5-cache/dev-python/jikanpy-3.4.2 b/metadata/md5-cache/dev-python/jikanpy-3.4.2
index d9d3af8d6cde..2089d7cfed26 100644
--- a/metadata/md5-cache/dev-python/jikanpy-3.4.2
+++ b/metadata/md5-cache/dev-python/jikanpy-3.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/aiohttp[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jikanpy/jikanpy-3.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d1bd9de5cd58031948dc99d9ea2ac945
diff --git a/metadata/md5-cache/dev-python/jinja-2.10.1 b/metadata/md5-cache/dev-python/jinja-2.10.1
index 853555f2e2d7..ba0a30095dfe 100644
--- a/metadata/md5-cache/dev-python/jinja-2.10.1
+++ b/metadata/md5-cache/dev-python/jinja-2.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.10.1.tar.gz -> jinja-2.10.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=19f1d2e9c099b1bd2d44d4d434cfc4ea
diff --git a/metadata/md5-cache/dev-python/jinja-2.10.3 b/metadata/md5-cache/dev-python/jinja-2.10.3
index eb4b309f1a7d..35665e87f119 100644
--- a/metadata/md5-cache/dev-python/jinja-2.10.3
+++ b/metadata/md5-cache/dev-python/jinja-2.10.3
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !dev-python/jinja:compat doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !dev-python/jinja:compat dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !dev-python/jinja:compat doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !dev-python/jinja:compat dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A full-featured template engine for Python
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.10.3.tar.gz -> jinja-2.10.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=03e5e818348e4e59455b3aba71b31650
diff --git a/metadata/md5-cache/dev-python/jinja-2.10.3-r1 b/metadata/md5-cache/dev-python/jinja-2.10.3-r1
index 704cbe1bfb1f..c766bb7f25b6 100644
--- a/metadata/md5-cache/dev-python/jinja-2.10.3-r1
+++ b/metadata/md5-cache/dev-python/jinja-2.10.3-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !dev-python/jinja:compat doc? ( || ( ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-issues[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-issues[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pallets-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx-issues[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pallets-sphinx-themes[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-issues[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !dev-python/jinja:compat dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !dev-python/jinja:compat doc? ( || ( ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx-issues[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-issues[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pallets-sphinx-themes[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx-issues[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pallets-sphinx-themes[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0[threads(+)] dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx-issues[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !dev-python/jinja:compat dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=A full-featured template engine for Python
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/jinja/archive/2.10.3.tar.gz -> jinja-2.10.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3eca4eebf2014a0638d8ede26309c4af
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 18a525be7244..ddafaaf1d53b 100644
--- a/metadata/md5-cache/dev-python/jinja2-time-0.2.0
+++ b/metadata/md5-cache/dev-python/jinja2-time-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jinja2-time/jinja2-time-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05a9a290c22432a330405d7a51d72cb0
diff --git a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0 b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
index c2330c915283..c24f60dd11cd 100644
--- a/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
+++ b/metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/inflect[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jinja2_pluralize/jinja2_pluralize-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ab3a13619c1fd369643d15955574a2b
diff --git a/metadata/md5-cache/dev-python/jira-1.0.14-r2 b/metadata/md5-cache/dev-python/jira-1.0.14-r2
index e654f4dede2f..e47218c2eceb 100644
--- a/metadata/md5-cache/dev-python/jira-1.0.14-r2
+++ b/metadata/md5-cache/dev-python/jira-1.0.14-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/defusedxml[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jira/jira-1.0.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f658bf73abc309c988f49a6d31041292
diff --git a/metadata/md5-cache/dev-python/jmespath-0.9.3-r1 b/metadata/md5-cache/dev-python/jmespath-0.9.3-r1
index 018a8d0d5877..97eaac24d01d 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.9.3-r1
+++ b/metadata/md5-cache/dev-python/jmespath-0.9.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jmespath/jmespath-0.9.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7e05d147f6272e80d09a85eea2e8c4a3
diff --git a/metadata/md5-cache/dev-python/joblib-0.12.2 b/metadata/md5-cache/dev-python/joblib-0.12.2
index 537677166c7c..832ad41f8d63 100644
--- a/metadata/md5-cache/dev-python/joblib-0.12.2
+++ b/metadata/md5-cache/dev-python/joblib-0.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/joblib/joblib-0.12.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c50478344ac3e9dc3c3ae54fe20875c6
diff --git a/metadata/md5-cache/dev-python/jog-0.1.1 b/metadata/md5-cache/dev-python/jog-0.1.1
index 97b2fea31ff5..b159cd687c1f 100644
--- a/metadata/md5-cache/dev-python/jog-0.1.1
+++ b/metadata/md5-cache/dev-python/jog-0.1.1
@@ -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=mirror://pypi/j/jog/jog-0.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d40b8707fc0f85cf198f08af3b81c146
diff --git a/metadata/md5-cache/dev-python/josepy-1.2.0 b/metadata/md5-cache/dev-python/josepy-1.2.0
index af0f39c58a53..9cbd1e1cc658 100644
--- a/metadata/md5-cache/dev-python/josepy-1.2.0
+++ b/metadata/md5-cache/dev-python/josepy-1.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-1.0[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38963ef3af1ad08328de03bb9cd4f596
diff --git a/metadata/md5-cache/dev-python/josepy-1.3.0 b/metadata/md5-cache/dev-python/josepy-1.3.0
index 9d1ac301449c..f379bc539b23 100644
--- a/metadata/md5-cache/dev-python/josepy-1.3.0
+++ b/metadata/md5-cache/dev-python/josepy-1.3.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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/j/josepy/josepy-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ca77e0e4c4e9f00c3bc0908b7ae0a955
diff --git a/metadata/md5-cache/dev-python/jplephem-2.6 b/metadata/md5-cache/dev-python/jplephem-2.6
index f9931fcfd098..ae6c7ccaa452 100644
--- a/metadata/md5-cache/dev-python/jplephem-2.6
+++ b/metadata/md5-cache/dev-python/jplephem-2.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jplephem/jplephem-2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49420f586e524cb431dc1851f3336b17
diff --git a/metadata/md5-cache/dev-python/jpype-0.6.2 b/metadata/md5-cache/dev-python/jpype-0.6.2
index e4e26610fbdf..0fbfaeb28877 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_python3_6? ( dev-lang/pyt
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffe0779b86d03618267d4c3eb63493f5
diff --git a/metadata/md5-cache/dev-python/jpype-0.6.3 b/metadata/md5-cache/dev-python/jpype-0.6.3
index 07c18cb2689d..94b10af72a3c 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_python3_6? ( dev-lang/pyt
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=66cafa6a1c77bd65ef0c3cf8193f9632
diff --git a/metadata/md5-cache/dev-python/jsmin-2.2.1 b/metadata/md5-cache/dev-python/jsmin-2.2.1
index ad048b2f5fbb..5160f181789f 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-2.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=81f8935790cd71f6b1640ebc1dbe8ac4
diff --git a/metadata/md5-cache/dev-python/jsmin-2.2.2 b/metadata/md5-cache/dev-python/jsmin-2.2.2
index af06f4413ae7..75e5f9c80694 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsmin/jsmin-2.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f96ad3ab1cb21e4adcd7aa55ae5adcc4
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 c77fab1d9339..54c0b5f08a88 100644
--- a/metadata/md5-cache/dev-python/json-rpc-1.11.0
+++ b/metadata/md5-cache/dev-python/json-rpc-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/json-rpc/json-rpc-1.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5beb5400882dde5d09d0b8cc7cc318eb
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 8ce35e6e9944..aa452308f974 100644
--- a/metadata/md5-cache/dev-python/json-tools-0.4.0
+++ b/metadata/md5-cache/dev-python/json-tools-0.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/json_tools/json_tools-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ebfb83f79487499836147be270c00b1
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 bf522e5dc685..85f25d0e3d35 100644
--- a/metadata/md5-cache/dev-python/json-tools-0.4.1
+++ b/metadata/md5-cache/dev-python/json-tools-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/json_tools/json_tools-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5b9968072c7f1f2d6e385bdab70be27
diff --git a/metadata/md5-cache/dev-python/jsondiff-1.1.2 b/metadata/md5-cache/dev-python/jsondiff-1.1.2
index 3650ccd1cd10..9694c081e74d 100644
--- a/metadata/md5-cache/dev-python/jsondiff-1.1.2
+++ b/metadata/md5-cache/dev-python/jsondiff-1.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsondiff/jsondiff-1.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e3f35e83cd3cf64d0e8ef0ba2cba7b79
diff --git a/metadata/md5-cache/dev-python/jsonext-0.4.2 b/metadata/md5-cache/dev-python/jsonext-0.4.2
index 7dfd799f7964..8996e0fd7ce9 100644
--- a/metadata/md5-cache/dev-python/jsonext-0.4.2
+++ b/metadata/md5-cache/dev-python/jsonext-0.4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonext/jsonext-0.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=60fdeaf797341fba4ddc1e0274bb26ff
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.4.0 b/metadata/md5-cache/dev-python/jsonmerge-1.4.0
index 2ac5b89c0ec4..285069a3cffa 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonmerge/jsonmerge-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4876915e1c74fb77e4ed8f7aabe5eb7c
diff --git a/metadata/md5-cache/dev-python/jsonmerge-1.6.0 b/metadata/md5-cache/dev-python/jsonmerge-1.6.0
index 8e44ed2de873..5dfa76fc62ae 100644
--- a/metadata/md5-cache/dev-python/jsonmerge-1.6.0
+++ b/metadata/md5-cache/dev-python/jsonmerge-1.6.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonmerge/jsonmerge-1.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0b3f6b72e0161586b1dc499fe2d6d527
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.13 b/metadata/md5-cache/dev-python/jsonpatch-1.13
index cae3897d1ff5..f6dff1eb4d2c 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ff228d1b6e3d24fd92975b9e34518c5
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.15 b/metadata/md5-cache/dev-python/jsonpatch-1.15
index eedf01ff8b46..6e479c15e0f1 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32a8e107205c0b49d97ddd655511e293
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.21 b/metadata/md5-cache/dev-python/jsonpatch-1.21
index 12685432dc9e..b6e617b20849 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd6882da3c68bf5822654baa456a3fff
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.23 b/metadata/md5-cache/dev-python/jsonpatch-1.23
index b7af13375dfa..d9ac58e9922a 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.23
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.23
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpatch/jsonpatch-1.23.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ed049c0d7a9cc112377e9f4a58a51a74
diff --git a/metadata/md5-cache/dev-python/jsonpickle-0.9.3 b/metadata/md5-cache/dev-python/jsonpickle-0.9.3
index be9579ff896c..b71ee5a1da14 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-0.9.3
+++ b/metadata/md5-cache/dev-python/jsonpickle-0.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-0.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a65f9767d17cb1e40ff772021ec33df6
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.2 b/metadata/md5-cache/dev-python/jsonpickle-1.2
index 1f7a84559ee4..3090f8a6af8e 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-1.2
+++ b/metadata/md5-cache/dev-python/jsonpickle-1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0d30976043061978d21905d2274689ad
diff --git a/metadata/md5-cache/dev-python/jsonpointer-1.10 b/metadata/md5-cache/dev-python/jsonpointer-1.10
index 98e6295d87d9..d3528403d93e 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7a733526b27297f9f8d90243b4be090
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.0 b/metadata/md5-cache/dev-python/jsonpointer-2.0
index f1effbe9885e..d9e5ca9fec72 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.0
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e10b5299d45343168ad5330fcff0736e
diff --git a/metadata/md5-cache/dev-python/jsonpointer-2.0-r1 b/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
index 4066dbdb5ecb..81410f632e06 100644
--- a/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
+++ b/metadata/md5-cache/dev-python/jsonpointer-2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonpointer/jsonpointer-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=191053a1b883190e0168e16ecf043e95
diff --git a/metadata/md5-cache/dev-python/jsonref-0.1 b/metadata/md5-cache/dev-python/jsonref-0.1
index dd3075911820..e002c0875d20 100644
--- a/metadata/md5-cache/dev-python/jsonref-0.1
+++ b/metadata/md5-cache/dev-python/jsonref-0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonref/jsonref-0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e5c36b29e97dc0b3b55d4ee22ed4920b
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.3.1 b/metadata/md5-cache/dev-python/jsonrpclib-0.3.1
index 977dd4f1229f..99f7cb8522d4 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_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc7c3219bc7e7e66105e50e4bf12b8ba
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-0.4.0 b/metadata/md5-cache/dev-python/jsonrpclib-0.4.0
index 36c313851ee9..66af941669d2 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-0.4.0
+++ b/metadata/md5-cache/dev-python/jsonrpclib-0.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tcalmant/jsonrpclib/archive/v0.4.0.tar.gz -> jsonrpclib-0.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cf1b814c7a8a1bbe395d9466f235ebf4
diff --git a/metadata/md5-cache/dev-python/jsonrpclib-9999 b/metadata/md5-cache/dev-python/jsonrpclib-9999
index c8cb67513fbb..78cae4416bb2 100644
--- a/metadata/md5-cache/dev-python/jsonrpclib-9999
+++ b/metadata/md5-cache/dev-python/jsonrpclib-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/simplejson[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cc404ec4ee7c66215696b08bc43adcc4
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.3.0 b/metadata/md5-cache/dev-python/jsonschema-2.3.0
index 5c570d2c2669..d6d97d4c39b0 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.3.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13673014645cf1622b5dc0d9458ac5e0
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.4.0 b/metadata/md5-cache/dev-python/jsonschema-2.4.0
index c9b8fe88bdb8..0d43d37b032e 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.4.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df3b671d0de18f932f8d521ac23a53e0
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 b6b6002c23bb..52f3955ffc1a 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
+++ b/metadata/md5-cache/dev-python/jsonschema-2.5.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaf9564206695a154daf2363cab38a65
diff --git a/metadata/md5-cache/dev-python/jsonschema-2.6.0 b/metadata/md5-cache/dev-python/jsonschema-2.6.0
index fc4b53853c58..147ee5fc73a5 100644
--- a/metadata/md5-cache/dev-python/jsonschema-2.6.0
+++ b/metadata/md5-cache/dev-python/jsonschema-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-2.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c8466a866ef3d362a2375aad04342ea
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.0.1 b/metadata/md5-cache/dev-python/jsonschema-3.0.1
index 20867e38965a..2b1f080f8670 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.0.1
+++ b/metadata/md5-cache/dev-python/jsonschema-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-3.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7bfc942c47ed14dff7965376ae33846c
diff --git a/metadata/md5-cache/dev-python/jsonschema-3.2.0 b/metadata/md5-cache/dev-python/jsonschema-3.2.0
index 51be1bbd8546..0b3dd2f73b12 100644
--- a/metadata/md5-cache/dev-python/jsonschema-3.2.0
+++ b/metadata/md5-cache/dev-python/jsonschema-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonschema/jsonschema-3.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cf5aef482d31e6291cd6ab0d283fe7af
diff --git a/metadata/md5-cache/dev-python/jsonxs-0.6 b/metadata/md5-cache/dev-python/jsonxs-0.6
index f519cafe0f06..79fe93abe231 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/j/jsonxs/jsonxs-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9b397f2dfc9bd3a47625a72a11a6788
diff --git a/metadata/md5-cache/dev-python/junit-xml-1.8 b/metadata/md5-cache/dev-python/junit-xml-1.8
index 76a068c4653d..b4c02bbcc7cb 100644
--- a/metadata/md5-cache/dev-python/junit-xml-1.8
+++ b/metadata/md5-cache/dev-python/junit-xml-1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/junit-xml/junit-xml-1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f10106e6db8b588d6b66c1702e87e86a
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 2a8ec96230d4..16436a2372ba 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=936db5a036b019e68d05fa895db648c8
diff --git a/metadata/md5-cache/dev-python/jupyter-1.0.0-r2 b/metadata/md5-cache/dev-python/jupyter-1.0.0-r2
index 0faf845d3522..273af248b02c 100644
--- a/metadata/md5-cache/dev-python/jupyter-1.0.0-r2
+++ b/metadata/md5-cache/dev-python/jupyter-1.0.0-r2
@@ -12,5 +12,5 @@ RDEPEND=dev-python/notebook[python_targets_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=32fcaa9682d49c135b36b2bd7104dc46
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 9b845f102d5f..7a3507ba04f2 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94e1c13e93c76c9bd4e5a5c4b3e35c72
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 b61a6ea7844c..111cf0e05963 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.2.3
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83ffa7db6bc78e5fddfc6037d34ecddb
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1 b/metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1
index b4b0adc87a21..309008fdcd38 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.2.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a511a5adc4d6dff14b782a9b547e9fb5
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.2.4 b/metadata/md5-cache/dev-python/jupyter_client-5.2.4
index cba7f5b10688..f0b488bffd0a 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.2.4
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.2.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=95725d8370275a8fba1e5e2de238f3ae
diff --git a/metadata/md5-cache/dev-python/jupyter_client-5.3.4 b/metadata/md5-cache/dev-python/jupyter_client-5.3.4
index 3fe4e24fe191..ef11cf3c87c0 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-5.3.4
+++ b/metadata/md5-cache/dev-python/jupyter_client-5.3.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-14.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Jupyter protocol implementation and client libraries
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-5.3.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=73f5142e13fda2c3ebadca0899bb8b39
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 fd27ac50e589..5e4f23185ebc 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-5.1.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-5.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-5.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49e44316f765725afae46bc38de01de6
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.0.0 b/metadata/md5-cache/dev-python/jupyter_console-6.0.0
index 38c7143d3e8b..8dbe47389def 100644
--- a/metadata/md5-cache/dev-python/jupyter_console-6.0.0
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-6.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49e44316f765725afae46bc38de01de6
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 3c7bf96aaffa..ada3624a3abb 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_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4099a71678b353b472aeb30c342d503f
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.4.0-r1 b/metadata/md5-cache/dev-python/jupyter_core-4.4.0-r1
index 7f7698455512..c4a93ec44ea4 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.4.0-r1
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.4.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=63ad5e1c386a687df6bbf337cfc10233
diff --git a/metadata/md5-cache/dev-python/jupyter_core-4.6.1 b/metadata/md5-cache/dev-python/jupyter_core-4.6.1
index 7b90c6031042..b52613c5d019 100644
--- a/metadata/md5-cache/dev-python/jupyter_core-4.6.1
+++ b/metadata/md5-cache/dev-python/jupyter_core-4.6.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/ipython-4.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Core common functionality of Jupyter projects
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jupyter_core/jupyter_core-4.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=def585e5a7cdee52c195158fabcef0b9
diff --git a/metadata/md5-cache/dev-python/jwcrypto-0.4.2 b/metadata/md5-cache/dev-python/jwcrypto-0.4.2
index 83899d411cd4..52055cd7264e 100644
--- a/metadata/md5-cache/dev-python/jwcrypto-0.4.2
+++ b/metadata/md5-cache/dev-python/jwcrypto-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/latchset/jwcrypto/archive/v0.4.2.tar.gz -> jwcrypto-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e68ed440f1b2bc9331ad53bf9068258
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 918f9856bfd8..ad185ba615f8 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.3.3
+++ b/metadata/md5-cache/dev-python/kafka-python-1.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/1.3.3.tar.gz -> kafka-python-1.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7b35906a5edbc62b98914bfd62869718
diff --git a/metadata/md5-cache/dev-python/kafka-python-1.4.7 b/metadata/md5-cache/dev-python/kafka-python-1.4.7
index 8c0e6eebb39f..144eb9556f17 100644
--- a/metadata/md5-cache/dev-python/kafka-python-1.4.7
+++ b/metadata/md5-cache/dev-python/kafka-python-1.4.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/1.4.7.tar.gz -> kafka-python-1.4.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cdb0fce3228537cf8a9ac3e1affb2b65
diff --git a/metadata/md5-cache/dev-python/kaitaistruct-0.8 b/metadata/md5-cache/dev-python/kaitaistruct-0.8
index 7f4107f2b295..d4c363755210 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaitaistruct/kaitaistruct-0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff3286a852949a2eb7f97704513dfe26
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12 b/metadata/md5-cache/dev-python/kaptan-0.5.12
index ca06ee7c1b02..81c7898180d3 100644
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12
+++ b/metadata/md5-cache/dev-python/kaptan-0.5.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaptan/kaptan-0.5.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b6e800b87797a9455ffec4dbe20a7ad8
diff --git a/metadata/md5-cache/dev-python/kaptan-0.5.12-r1 b/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
index dac0268461e7..6706fa9bbe0e 100644
--- a/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
+++ b/metadata/md5-cache/dev-python/kaptan-0.5.12-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.13[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.13[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Configuration manager in your pocket
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kaptan/kaptan-0.5.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=362f0e33b90f9cd4e72e352075af436a
diff --git a/metadata/md5-cache/dev-python/kazoo-2.2.1 b/metadata/md5-cache/dev-python/kazoo-2.2.1
index 17968575113c..4db05d95dd6d 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/k/kazoo/kazoo-2.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd2a4744c1f86b33d8d3760e2af8f694
diff --git a/metadata/md5-cache/dev-python/kazoo-2.5.0 b/metadata/md5-cache/dev-python/kazoo-2.5.0
index dce240768a60..2fbc5d572033 100644
--- a/metadata/md5-cache/dev-python/kazoo-2.5.0
+++ b/metadata/md5-cache/dev-python/kazoo-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa956bdcfae406bb9158723defa9b212
diff --git a/metadata/md5-cache/dev-python/kazoo-2.6.1 b/metadata/md5-cache/dev-python/kazoo-2.6.1
index e73e89280557..124db7ced1e6 100644
--- a/metadata/md5-cache/dev-python/kazoo-2.6.1
+++ b/metadata/md5-cache/dev-python/kazoo-2.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/k/kazoo/kazoo-2.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2f2fb80ba7f1296f8112b5b36768ec8f
diff --git a/metadata/md5-cache/dev-python/kconfiglib-13.2.0 b/metadata/md5-cache/dev-python/kconfiglib-13.2.0
index 13b4e7555687..3f7f9330e929 100644
--- a/metadata/md5-cache/dev-python/kconfiglib-13.2.0
+++ b/metadata/md5-cache/dev-python/kconfiglib-13.2.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ulfalizer/Kconfiglib/archive/v13.2.0.tar.gz -> kconfiglib-13.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ccaa46f46a54704471fe50636be0ce3
diff --git a/metadata/md5-cache/dev-python/kconfiglib-13.7.0 b/metadata/md5-cache/dev-python/kconfiglib-13.7.0
index 67b21905b451..b7a101b3f414 100644
--- a/metadata/md5-cache/dev-python/kconfiglib-13.7.0
+++ b/metadata/md5-cache/dev-python/kconfiglib-13.7.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ulfalizer/Kconfiglib/archive/v13.7.0.tar.gz -> kconfiglib-13.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f652b67ca5b6f2d07c34fc228fc80ff3
diff --git a/metadata/md5-cache/dev-python/kconfiglib-14.1.0 b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
index b2df92a0e003..a49cc6c69a73 100644
--- a/metadata/md5-cache/dev-python/kconfiglib-14.1.0
+++ b/metadata/md5-cache/dev-python/kconfiglib-14.1.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[ncurses] ) python_target
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/ulfalizer/Kconfiglib/archive/v14.1.0.tar.gz -> kconfiglib-14.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a2f37e2c2c182b472c7329822e43c31f
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 e0e449dec856..129f59a17f57 100644
--- a/metadata/md5-cache/dev-python/keepassx-0.1.0-r1
+++ b/metadata/md5-cache/dev-python/keepassx-0.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55f61aadfc9cfd0cb835ba30d25b198c
diff --git a/metadata/md5-cache/dev-python/keyring-13.2.1 b/metadata/md5-cache/dev-python/keyring-13.2.1
index 94e69ec8ae27..e00bca2ad671 100644
--- a/metadata/md5-cache/dev-python/keyring-13.2.1
+++ b/metadata/md5-cache/dev-python/keyring-13.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-13.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=176c5f2d0e9cbf89e14e5bc18f09ab64
diff --git a/metadata/md5-cache/dev-python/keyring-13.2.1-r1 b/metadata/md5-cache/dev-python/keyring-13.2.1-r1
index d071d6b2e266..f11701197478 100644
--- a/metadata/md5-cache/dev-python/keyring-13.2.1-r1
+++ b/metadata/md5-cache/dev-python/keyring-13.2.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-13.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fc04b6895259502e0671ec3cfe35bb30
diff --git a/metadata/md5-cache/dev-python/keyring-15.0.0 b/metadata/md5-cache/dev-python/keyring-15.0.0
index 26c251643688..5d68e3dde1fd 100644
--- a/metadata/md5-cache/dev-python/keyring-15.0.0
+++ b/metadata/md5-cache/dev-python/keyring-15.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-15.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21250d69d9d3fabe8379c520fa1e76d5
diff --git a/metadata/md5-cache/dev-python/keyring-18.0.1 b/metadata/md5-cache/dev-python/keyring-18.0.1
index bdfc154db1d4..69781bb1af34 100644
--- a/metadata/md5-cache/dev-python/keyring-18.0.1
+++ b/metadata/md5-cache/dev-python/keyring-18.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keyring/keyring-18.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=58828c18082f0da50973133946020c48
diff --git a/metadata/md5-cache/dev-python/keyring-19.2.0 b/metadata/md5-cache/dev-python/keyring-19.2.0
index 992dd1110654..3678120a5363 100644
--- a/metadata/md5-cache/dev-python/keyring-19.2.0
+++ b/metadata/md5-cache/dev-python/keyring-19.2.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/jaraco-packaging[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/rst-linker[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/jaraco-packaging[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/rst-linker[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/jaraco-packaging[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/rst-linker[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/jaraco-packaging[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/rst-linker[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/jaraco-packaging[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/rst-linker[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/jaraco-packaging[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/rst-linker[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Provides access to the system keyring service
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/keyring/archive/19.2.0.tar.gz -> keyring-19.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=982e09777596f5e3ae8374ab0c73bdad
diff --git a/metadata/md5-cache/dev-python/keyring-19.3.0 b/metadata/md5-cache/dev-python/keyring-19.3.0
index 73e282b6f83c..bd2273485596 100644
--- a/metadata/md5-cache/dev-python/keyring-19.3.0
+++ b/metadata/md5-cache/dev-python/keyring-19.3.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/jaraco-packaging[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/rst-linker[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/jaraco-packaging[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/rst-linker[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/jaraco-packaging[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/rst-linker[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/jaraco-packaging[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/rst-linker[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/jaraco-packaging[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/rst-linker[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/jaraco-packaging[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/rst-linker[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/jaraco-packaging[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/rst-linker[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/jaraco-packaging[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/rst-linker[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Provides access to the system keyring service
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/keyring/archive/v19.3.0.tar.gz -> keyring-19.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f1cf309e288f0ee6ef27717c5557638f
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.1.0 b/metadata/md5-cache/dev-python/keystoneauth-3.1.0
index 9bb6011dfd27..03b84fb43815 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=772dc150f3804f3d9dcec8e3af183f8f
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.10.0 b/metadata/md5-cache/dev-python/keystoneauth-3.10.0
index 108d8cacf93f..945dbb687e5e 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_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f87462c57c2ddaad2a8451cb2b11b231
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.13.1 b/metadata/md5-cache/dev-python/keystoneauth-3.13.1
index 3858ca3b245d..c0bba27c61b4 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-3.13.1
+++ b/metadata/md5-cache/dev-python/keystoneauth-3.13.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.13.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=573b3a27ff5b158c5715b86aa3a6069a
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.17.1 b/metadata/md5-cache/dev-python/keystoneauth-3.17.1
index e165c89a30a5..5d1a9649e08c 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-3.17.1
+++ b/metadata/md5-cache/dev-python/keystoneauth-3.17.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.17.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=573b3a27ff5b158c5715b86aa3a6069a
diff --git a/metadata/md5-cache/dev-python/keystoneauth-3.4.0 b/metadata/md5-cache/dev-python/keystoneauth-3.4.0
index ec732ce1a9f3..50462b11dbe0 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-3.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12f952fe188b6b2f8d318fc27af4b653
diff --git a/metadata/md5-cache/dev-python/keystonemiddleware-7.0.1 b/metadata/md5-cache/dev-python/keystonemiddleware-7.0.1
index 7a6cae41ab33..aaa2a74fa589 100644
--- a/metadata/md5-cache/dev-python/keystonemiddleware-7.0.1
+++ b/metadata/md5-cache/dev-python/keystonemiddleware-7.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystonemiddleware/keystonemiddleware-7.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f45b34ab901d25a61345fc512d3396c4
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 4a2515bdbf5a..9e9afa610a11 100644
--- a/metadata/md5-cache/dev-python/kid-0.9.6-r1
+++ b/metadata/md5-cache/dev-python/kid-0.9.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.kid-templating.org/dist/0.9.6/kid-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05f4297602b328adfdd97d780310dc58
diff --git a/metadata/md5-cache/dev-python/kitchen-1.2.4 b/metadata/md5-cache/dev-python/kitchen-1.2.4
index 53f1847241fc..aaad559dbe52 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kitchen/kitchen-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a64e0a4b27fe268a144423c6e518ef6
diff --git a/metadata/md5-cache/dev-python/kitchen-1.2.5 b/metadata/md5-cache/dev-python/kitchen-1.2.5
index 7136384e9c79..6927f671eca1 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/k/kitchen/kitchen-1.2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=375bd34213ab308a2598426cdad40aa1
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 dfa2ba1b5352..37037cbaee2e 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://pypi.io/packages/source/k/kivy-garden/kivy-garden-0.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c29aa5a2f6c6104cee3b72172aa8e7ef
diff --git a/metadata/md5-cache/dev-python/kiwisolver-1.0.1 b/metadata/md5-cache/dev-python/kiwisolver-1.0.1
index 9d95ccf11acc..14b124dd2773 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/nucleic/kiwi/archive/1.0.1.tar.gz -> kiwisolver-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad46e151efb2dda1f844d32fb97d3ea1
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 f1c120828327..eccb6dc72d6a 100644
--- a/metadata/md5-cache/dev-python/kombu-4.1.0-r1
+++ b/metadata/md5-cache/dev-python/kombu-4.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f82f3c6f976c75d071c4064ad2a9066e
diff --git a/metadata/md5-cache/dev-python/kombu-4.2.1 b/metadata/md5-cache/dev-python/kombu-4.2.1
index f972eb5f515c..aab032e1029f 100644
--- a/metadata/md5-cache/dev-python/kombu-4.2.1
+++ b/metadata/md5-cache/dev-python/kombu-4.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7ff51207d8d7c88549cdfb220522cbe
diff --git a/metadata/md5-cache/dev-python/kombu-4.4.0 b/metadata/md5-cache/dev-python/kombu-4.4.0
index 0758ea9f58ac..0a4390c22454 100644
--- a/metadata/md5-cache/dev-python/kombu-4.4.0
+++ b/metadata/md5-cache/dev-python/kombu-4.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=36b5b5d4a7f9e4130d5514b9a7d015df
diff --git a/metadata/md5-cache/dev-python/kombu-4.6.3 b/metadata/md5-cache/dev-python/kombu-4.6.3
index 2eefffa06eb7..09d4a0b2bd38 100644
--- a/metadata/md5-cache/dev-python/kombu-4.6.3
+++ b/metadata/md5-cache/dev-python/kombu-4.6.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/kombu/kombu-4.6.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=39a16182b9f6212b1289ffbfb666b657
diff --git a/metadata/md5-cache/dev-python/lark-parser-0.7.8 b/metadata/md5-cache/dev-python/lark-parser-0.7.8
index e8afa088e4f9..b486dc70b62f 100644
--- a/metadata/md5-cache/dev-python/lark-parser-0.7.8
+++ b/metadata/md5-cache/dev-python/lark-parser-0.7.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.7.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f20133ad266723e90deed4c8f9c9941f
diff --git a/metadata/md5-cache/dev-python/lazr-config-2.2.1 b/metadata/md5-cache/dev-python/lazr-config-2.2.1
deleted file mode 100644
index 80d9bcb09000..000000000000
--- a/metadata/md5-cache/dev-python/lazr-config-2.2.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_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Create configuration schemas, and process and validate configurations.
-EAPI=6
-HOMEPAGE=https://code.launchpad.net/lazr.config
-IUSE=python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/lazr-delegates[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/l/lazr.config/lazr.config-2.2.1.tar.gz -> lazr-config-2.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=795aa2977718a714e6d4d39aa9bc4b09
diff --git a/metadata/md5-cache/dev-python/lazr-config-2.2.2 b/metadata/md5-cache/dev-python/lazr-config-2.2.2
new file mode 100644
index 000000000000..d5a2b8b26aaa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lazr-config-2.2.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Create configuration schemas, and process and validate configurations.
+EAPI=7
+HOMEPAGE=https://code.launchpad.net/lazr.config
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lazr-delegates[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/l/lazr.config/lazr.config-2.2.2.tar.gz -> lazr-config-2.2.2.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=99ccb037e9465a0a52e7f412b414adce
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 500aee768271..ee4cf98bcac7 100644
--- a/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
+++ b/metadata/md5-cache/dev-python/lazr-delegates-2.0.4
@@ -1,14 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Easily write objects that delegate behavior
-EAPI=6
+EAPI=7
 HOMEPAGE=https://code.launchpad.net/lazr.deletages
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazr.delegates/lazr.delegates-2.0.4.tar.gz -> lazr-delegates-2.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=145af1290e0d364c92b6a4b2f24767d4
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=37aec89887f8f1445a86918186421db4
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 2b19a09540a7..bcf647c0df30 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd263cb9789bf6aebfbddf9f414611d4
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 7df000d1c329..a84fe01f452a 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6001962052e8e7c0eae7f98b286785a
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.4.3 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.4.3
index 1e1b309a3a22..4ddd58f991f1 100644
--- a/metadata/md5-cache/dev-python/lazy-object-proxy-1.4.3
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=67ba8dca0b82f5eae40772c9b846a15f
diff --git a/metadata/md5-cache/dev-python/ldap3-2.2.3 b/metadata/md5-cache/dev-python/ldap3-2.2.3
index 921e98af7742..f03c36e8caf8 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_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/ldap3/ldap3-2.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34f6d76006806bede18d37d6fd969c40
diff --git a/metadata/md5-cache/dev-python/ldap3-2.4.1 b/metadata/md5-cache/dev-python/ldap3-2.4.1
index 819f700de3eb..96ad6c02be44 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_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/ldap3/ldap3-2.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00f6968ebd302368584b746adadd7f87
diff --git a/metadata/md5-cache/dev-python/ldap3-2.5.1 b/metadata/md5-cache/dev-python/ldap3-2.5.1
index 206b1783461e..74831a7b97ed 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_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/ldap3/ldap3-2.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00f6968ebd302368584b746adadd7f87
diff --git a/metadata/md5-cache/dev-python/ldappool-2.3.1 b/metadata/md5-cache/dev-python/ldappool-2.3.1
index fed177dad89a..a31aca20c4f9 100644
--- a/metadata/md5-cache/dev-python/ldappool-2.3.1
+++ b/metadata/md5-cache/dev-python/ldappool-2.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-ldap-3.0.0[python_targets_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/ldappool/ldappool-2.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3e755e9c5b9725658fba48683d179fd9
diff --git a/metadata/md5-cache/dev-python/ldappool-2.4.1 b/metadata/md5-cache/dev-python/ldappool-2.4.1
index 4e7102236aeb..62033fcd67ad 100644
--- a/metadata/md5-cache/dev-python/ldappool-2.4.1
+++ b/metadata/md5-cache/dev-python/ldappool-2.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-ldap-3.0.0[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/ldappool/ldappool-2.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=472de34ab3fad344c6334979c467ad15
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.11.1 b/metadata/md5-cache/dev-python/lesscpy-0.11.1
index b75b1397a82c..6f58341036a0 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60a8b9ab34e74ccd92e7f39af1376140
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.13.0 b/metadata/md5-cache/dev-python/lesscpy-0.13.0
index 8052e4470111..9311937ae1af 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.13.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8faf848f3d3e2be1b8b6560b785cb10
diff --git a/metadata/md5-cache/dev-python/lesscpy-0.9j b/metadata/md5-cache/dev-python/lesscpy-0.9j
index 907e8b2a409a..afe718b07dfa 100644
--- a/metadata/md5-cache/dev-python/lesscpy-0.9j
+++ b/metadata/md5-cache/dev-python/lesscpy-0.9j
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lesscpy/lesscpy-0.9j.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6089ec73af9855a60eec186cd6346e7
diff --git a/metadata/md5-cache/dev-python/libarchive-c-2.7 b/metadata/md5-cache/dev-python/libarchive-c-2.7
index 9b8290125a27..69c325fa07bd 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/libarchive-c/libarchive-c-2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2be952e84269cdbfe7dcfa893cf2cd30
diff --git a/metadata/md5-cache/dev-python/libarchive-c-2.8 b/metadata/md5-cache/dev-python/libarchive-c-2.8
index f9e0b83245d7..82ad2eec71c3 100644
--- a/metadata/md5-cache/dev-python/libarchive-c-2.8
+++ b/metadata/md5-cache/dev-python/libarchive-c-2.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/libarchive-c/libarchive-c-2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aec2c5a2951d341fb83f18bad57c5a47
diff --git a/metadata/md5-cache/dev-python/libcloud-1.5.0 b/metadata/md5-cache/dev-python/libcloud-1.5.0
new file mode 100644
index 000000000000..5d139b297251
--- /dev/null
+++ b/metadata/md5-cache/dev-python/libcloud-1.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lockfile[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Unified Interface to the Cloud - python support libs
+EAPI=5
+HOMEPAGE=https://libcloud.apache.org/
+IUSE=examples test python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://apache/libcloud/apache-libcloud-1.5.0.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4d6e98a680631c9515a43702975676d4
diff --git a/metadata/md5-cache/dev-python/libcloud-2.3.0 b/metadata/md5-cache/dev-python/libcloud-2.3.0
index 156c5285804c..c2958d4c241c 100644
--- a/metadata/md5-cache/dev-python/libcloud-2.3.0
+++ b/metadata/md5-cache/dev-python/libcloud-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/libcloud/apache-libcloud-2.3.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=787bb543ec2d1190ec6284a8b2cde6c8
diff --git a/metadata/md5-cache/dev-python/liblarch-2.1.0 b/metadata/md5-cache/dev-python/liblarch-2.1.0
index ff82ccfcccd6..031fad466ea7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=666cfea545838d6bd8044c6bb21a83a2
diff --git a/metadata/md5-cache/dev-python/libnacl-1.6.1 b/metadata/md5-cache/dev-python/libnacl-1.6.1
index 4afdd243610a..0aecdaf2e501 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_python3_6? ( dev-lang/python:3.6 ) >=d
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b25d796ccd1b8ff25122b485e5af9d1
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.2.4 b/metadata/md5-cache/dev-python/libpillowfight-0.2.4
index f0d23e1d31af..0a413fbe22a8 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.2.4
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypillowfight/pypillowfight-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=167c24cb9115f9686c71cf0bef8ab9b2
diff --git a/metadata/md5-cache/dev-python/libpillowfight-0.3.0 b/metadata/md5-cache/dev-python/libpillowfight-0.3.0
index 5b7a884f5264..3aec54da4905 100644
--- a/metadata/md5-cache/dev-python/libpillowfight-0.3.0
+++ b/metadata/md5-cache/dev-python/libpillowfight-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypillowfight/pypillowfight-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cb259a4e1190cb96fb6045029da26f54
diff --git a/metadata/md5-cache/dev-python/libsass-0.19.4 b/metadata/md5-cache/dev-python/libsass-0.19.4
index 394534630e76..b8481aac1ffc 100644
--- a/metadata/md5-cache/dev-python/libsass-0.19.4
+++ b/metadata/md5-cache/dev-python/libsass-0.19.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/libsass/libsass-0.19.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c56f405a23bb3bd9ee3decdcedd8498d
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.2 b/metadata/md5-cache/dev-python/libtmux-0.8.2
index 439fbf3579cd..24887c136a63 100644
--- a/metadata/md5-cache/dev-python/libtmux-0.8.2
+++ b/metadata/md5-cache/dev-python/libtmux-0.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/l/libtmux/libtmux-0.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f47b10a51f52fbe901c4fcfb46ec3cc4
diff --git a/metadata/md5-cache/dev-python/libtmux-0.8.2-r1 b/metadata/md5-cache/dev-python/libtmux-0.8.2-r1
index 6a0efd68592a..9c1156afdeb8 100644
--- a/metadata/md5-cache/dev-python/libtmux-0.8.2-r1
+++ b/metadata/md5-cache/dev-python/libtmux-0.8.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-misc/tmux ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/alagitpull[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/docutils[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/alagitpull[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/docutils[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/alagitpull[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/docutils[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/alagitpull[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/docutils[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( app-misc/tmux dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/alagitpull[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/docutils[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/alagitpull[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/docutils[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/alagitpull[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/docutils[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/alagitpull[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/docutils[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=python api for tmux
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tmux-python/libtmux/archive/v0.8.2.tar.gz -> libtmux-v0.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f1ae94ce008e0e6442cda6f9f1efef33
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.10.0 b/metadata/md5-cache/dev-python/libvirt-python-5.10.0
index 1d8ebcbdf852..21a81229c1e7 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.10.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=98de32193adf40de29aafa5ea9d118ee
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.2.0 b/metadata/md5-cache/dev-python/libvirt-python-5.2.0
index 8f431dd0b2e9..b3b5924cd236 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.2.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=78675b7045dff9887d8ab4084339117e
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.5.0 b/metadata/md5-cache/dev-python/libvirt-python-5.5.0
index 2b7d87f0471c..09c4099b5582 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.5.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=78675b7045dff9887d8ab4084339117e
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.6.0 b/metadata/md5-cache/dev-python/libvirt-python-5.6.0
index 9648bbe07332..1864d98c5bd2 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.6.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f4b17683a7cf4540b144e58e99537b39
diff --git a/metadata/md5-cache/dev-python/libvirt-python-5.8.0 b/metadata/md5-cache/dev-python/libvirt-python-5.8.0
index e1ce3c1e1e64..f3990b9006f3 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-5.8.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-5.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-5.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=98de32193adf40de29aafa5ea9d118ee
diff --git a/metadata/md5-cache/dev-python/libvirt-python-6.0.0 b/metadata/md5-cache/dev-python/libvirt-python-6.0.0
index ccbc23694852..4f05750eebd5 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-6.0.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-6.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-6.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a91ec8ac3a4d3ef44548f3e4635501f
diff --git a/metadata/md5-cache/dev-python/libvirt-python-9999 b/metadata/md5-cache/dev-python/libvirt-python-9999
index 08ba2e5a7dce..20b863080df2 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-9999
+++ b/metadata/md5-cache/dev-python/libvirt-python-9999
@@ -11,5 +11,5 @@ RDEPEND=app-emulation/libvirt:=[-python(-)] python_targets_python3_6? ( dev-lang
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a91ec8ac3a4d3ef44548f3e4635501f
diff --git a/metadata/md5-cache/dev-python/libzilla-1.5 b/metadata/md5-cache/dev-python/libzilla-1.5
index ae2c07a718e2..7ecfc3e0069a 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_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/monsieurp/libzilla/archive/v1.5.tar.gz -> libzilla-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4166fa8e439e4354e8b8b26258db1b99
diff --git a/metadata/md5-cache/dev-python/line_profiler-2.0 b/metadata/md5-cache/dev-python/line_profiler-2.0
index 985f6d80862b..60398e859e7b 100644
--- a/metadata/md5-cache/dev-python/line_profiler-2.0
+++ b/metadata/md5-cache/dev-python/line_profiler-2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/line_profiler/line_profiler-2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ea1d1918ed7e75b9068ce3aa4db2184
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 ff85cac38d3e..1fc9c79835a7 100644
--- a/metadata/md5-cache/dev-python/line_profiler-2.1.2
+++ b/metadata/md5-cache/dev-python/line_profiler-2.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/line_profiler/line_profiler-2.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6f888401f6bd4e6b055f36ed9462b43
diff --git a/metadata/md5-cache/dev-python/line_profiler-3.0.2 b/metadata/md5-cache/dev-python/line_profiler-3.0.2
new file mode 100644
index 000000000000..42f568757704
--- /dev/null
+++ b/metadata/md5-cache/dev-python/line_profiler-3.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/scikit-build[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ubelt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Line-by-line profiler
+EAPI=7
+HOMEPAGE=https://github.com/pyutils/line_profiler
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/l/line_profiler/line_profiler-3.0.2.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f75a836a1740fc492f12c8867baf79e3
diff --git a/metadata/md5-cache/dev-python/line_profiler-9999 b/metadata/md5-cache/dev-python/line_profiler-9999
deleted file mode 100644
index 82ab1f2b91f9..000000000000
--- a/metadata/md5-cache/dev-python/line_profiler-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Line-by-line profiler
-EAPI=5
-HOMEPAGE=https://github.com/rkern/line_profiler
-IUSE=test python_targets_python3_6
-LICENSE=BSD
-PROPERTIES=live
-RDEPEND=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 )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68981f3bd719aa2f9c6b6b7d0a4be663
diff --git a/metadata/md5-cache/dev-python/linecache2-1.0.0 b/metadata/md5-cache/dev-python/linecache2-1.0.0
index 32da659be16c..917b54967cd6 100644
--- a/metadata/md5-cache/dev-python/linecache2-1.0.0
+++ b/metadata/md5-cache/dev-python/linecache2-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/linecache2/linecache2-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc78bbddf77a1823865c8a2fd01e1521
diff --git a/metadata/md5-cache/dev-python/lit-10.0.0.9999 b/metadata/md5-cache/dev-python/lit-10.0.0.9999
index 2e2735d81c98..4d95d4dfcfc4 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-10.0.0.9999
@@ -10,5 +10,5 @@ RDEPEND=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 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9a5b0d13d5e77130b74a03d7ed0b2032
diff --git a/metadata/md5-cache/dev-python/lit-10.0.0_rc1 b/metadata/md5-cache/dev-python/lit-10.0.0_rc1
index a6e7c2571bd4..1a0f9ce15ce7 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.0_rc1
+++ b/metadata/md5-cache/dev-python/lit-10.0.0_rc1
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9a5b0d13d5e77130b74a03d7ed0b2032
diff --git a/metadata/md5-cache/dev-python/lit-11.0.0.9999 b/metadata/md5-cache/dev-python/lit-11.0.0.9999
index 2e2735d81c98..4d95d4dfcfc4 100644
--- a/metadata/md5-cache/dev-python/lit-11.0.0.9999
+++ b/metadata/md5-cache/dev-python/lit-11.0.0.9999
@@ -10,5 +10,5 @@ RDEPEND=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 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9a5b0d13d5e77130b74a03d7ed0b2032
diff --git a/metadata/md5-cache/dev-python/lit-7.1.0 b/metadata/md5-cache/dev-python/lit-7.1.0
index 97c96b920f5b..f764a4333f90 100644
--- a/metadata/md5-cache/dev-python/lit-7.1.0
+++ b/metadata/md5-cache/dev-python/lit-7.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d76bc6c56959f0cfe044f43d27d0f6e
diff --git a/metadata/md5-cache/dev-python/lit-8.0.1 b/metadata/md5-cache/dev-python/lit-8.0.1
index 3660d54d615e..1eb1a314830d 100644
--- a/metadata/md5-cache/dev-python/lit-8.0.1
+++ b/metadata/md5-cache/dev-python/lit-8.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0d8b7f481ae6cff07b96b3db5c6afe5
diff --git a/metadata/md5-cache/dev-python/lit-9.0.1 b/metadata/md5-cache/dev-python/lit-9.0.1
index 4c7d8033329b..15398512b076 100644
--- a/metadata/md5-cache/dev-python/lit-9.0.1
+++ b/metadata/md5-cache/dev-python/lit-9.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=38ef402bcb0b7b2a3bd3a83284460236
diff --git a/metadata/md5-cache/dev-python/livereload-2.4.1 b/metadata/md5-cache/dev-python/livereload-2.4.1
index 8ac690ebe9e5..743cfb98a02a 100644
--- a/metadata/md5-cache/dev-python/livereload-2.4.1
+++ b/metadata/md5-cache/dev-python/livereload-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c58d8b2072b424544b036774cae8c03f
diff --git a/metadata/md5-cache/dev-python/livereload-2.5.2 b/metadata/md5-cache/dev-python/livereload-2.5.2
index 419810db9dbb..915c759283d8 100644
--- a/metadata/md5-cache/dev-python/livereload-2.5.2
+++ b/metadata/md5-cache/dev-python/livereload-2.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lepture/python-livereload/archive/v2.5.2.tar.gz -> livereload-2.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5578549d04290103973539722d8fe40a
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.2 b/metadata/md5-cache/dev-python/llfuse-1.3.2
index f66eeed16055..3926b9767274 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.2
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-1.3.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68b7cc5da85cf78e457fc0ea3ceb40ce
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.4 b/metadata/md5-cache/dev-python/llfuse-1.3.4
index e586c000c9bc..4188f45f17c6 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.4
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-1.3.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f7378a889d5fc80ffdd929aecfb064f
diff --git a/metadata/md5-cache/dev-python/llfuse-1.3.5 b/metadata/md5-cache/dev-python/llfuse-1.3.5
index 4bfe9d405609..3b13003a6bda 100644
--- a/metadata/md5-cache/dev-python/llfuse-1.3.5
+++ b/metadata/md5-cache/dev-python/llfuse-1.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/llfuse/llfuse-1.3.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b02930c369600a17f2326c583f83549
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.28.0 b/metadata/md5-cache/dev-python/llvmlite-0.28.0
index c6f0b7e82ec5..a0b77c7efd2e 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.28.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.28.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.28.0.tar.gz -> llvmlite-0.28.0.gh.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7385f468bd3c05c5e3d93a9b1719df8f
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.29.0 b/metadata/md5-cache/dev-python/llvmlite-0.29.0
index 77a4fccd493c..944c8240b62d 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.29.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.29.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.29.0.tar.gz -> llvmlite-0.29.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b19811f5ebf803dfcec45e3a745a7080
diff --git a/metadata/md5-cache/dev-python/llvmlite-0.30.0 b/metadata/md5-cache/dev-python/llvmlite-0.30.0
index eef2eaa4cbf3..424ceddb31c8 100644
--- a/metadata/md5-cache/dev-python/llvmlite-0.30.0
+++ b/metadata/md5-cache/dev-python/llvmlite-0.30.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/numba/llvmlite/archive/v0.30.0.tar.gz -> llvmlite-0.30.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	llvm	c74f1124c627537c3be86281b81e10dc	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=aacf69dc250c7f3a0b61a1578930f525
diff --git a/metadata/md5-cache/dev-python/lmdb-0.92 b/metadata/md5-cache/dev-python/lmdb-0.92
index 7e91908fc3f5..3f779ed7ce63 100644
--- a/metadata/md5-cache/dev-python/lmdb-0.92
+++ b/metadata/md5-cache/dev-python/lmdb-0.92
@@ -11,5 +11,5 @@ RDEPEND=dev-db/lmdb:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lmdb/lmdb-0.92.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4ac0e1662594be57b270e46e72e6fa2e
diff --git a/metadata/md5-cache/dev-python/locket-0.2.0 b/metadata/md5-cache/dev-python/locket-0.2.0
index 733c2dd4d81d..207e9ae4f034 100644
--- a/metadata/md5-cache/dev-python/locket-0.2.0
+++ b/metadata/md5-cache/dev-python/locket-0.2.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/locket/locket-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6fd7ad5edae91cdad1b758686715df90
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 3cb53c9063b5..a27185d58476 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.11.0-r1
+++ b/metadata/md5-cache/dev-python/lockfile-0.11.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a703a6f91f2df5a984eaeae07f70cf2
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 f16a4e24d51b..ae98ccfdce10 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7883974963fdf368b7314796b49ff15f
diff --git a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2 b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
index c705bd9c770a..9957f373f460 100644
--- a/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
+++ b/metadata/md5-cache/dev-python/lockfile-0.12.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lockfile/lockfile-0.12.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3f4d7a961f3cd69d5017273d3424ff72
diff --git a/metadata/md5-cache/dev-python/locustio-0.9.0 b/metadata/md5-cache/dev-python/locustio-0.9.0
index 1639f367f0cc..c16c81544216 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_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/locustio/locustio-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9050dd7f1b6998bd781a73c7931bceda
diff --git a/metadata/md5-cache/dev-python/logbook-1.1.0 b/metadata/md5-cache/dev-python/logbook-1.1.0
index ed6922856608..19200590b074 100644
--- a/metadata/md5-cache/dev-python/logbook-1.1.0
+++ b/metadata/md5-cache/dev-python/logbook-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ccaad309e0693fb8cd9ef1a82683787
diff --git a/metadata/md5-cache/dev-python/logbook-1.4.0 b/metadata/md5-cache/dev-python/logbook-1.4.0
index 5df71ced3888..a0367b94de8f 100644
--- a/metadata/md5-cache/dev-python/logbook-1.4.0
+++ b/metadata/md5-cache/dev-python/logbook-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getlogbook/logbook/archive/1.4.0.tar.gz -> logbook-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=118e927b9dc2470cecb8fb2123184e38
diff --git a/metadata/md5-cache/dev-python/logfury-0.1.2 b/metadata/md5-cache/dev-python/logfury-0.1.2
index 8d03f8157a85..f68de6722ca3 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_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logfury/logfury-0.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bd1f72b44d2638b956dcafac4d2dd80
diff --git a/metadata/md5-cache/dev-python/loguru-0.3.2 b/metadata/md5-cache/dev-python/loguru-0.3.2
index 72a7aab2106c..7c7a65b49999 100644
--- a/metadata/md5-cache/dev-python/loguru-0.3.2
+++ b/metadata/md5-cache/dev-python/loguru-0.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Delgan/loguru/archive/0.3.2.tar.gz -> loguru-0.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8d13655d9e3be5127f137df4b5d9dfa6
diff --git a/metadata/md5-cache/dev-python/loguru-0.4.0 b/metadata/md5-cache/dev-python/loguru-0.4.0
index d6188c4185f2..02b3cf9eaec5 100644
--- a/metadata/md5-cache/dev-python/loguru-0.4.0
+++ b/metadata/md5-cache/dev-python/loguru-0.4.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-python/aiocontextvars[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/colorama-0.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( python_targets_python3_6? ( dev-python/aiocontextvars[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-python/colorama-0.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python logging made (stupidly) simple
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Delgan/loguru/archive/0.4.0.tar.gz -> loguru-0.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c8ce765878801a7655362c4bc84fafe7
diff --git a/metadata/md5-cache/dev-python/logutils-0.3.3 b/metadata/md5-cache/dev-python/logutils-0.3.3
index 3f05af1bc0d1..5d9c6e09f037 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logutils/logutils-0.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93faf7fb72b17b7791a4a3aa37517751
diff --git a/metadata/md5-cache/dev-python/logutils-0.3.3-r1 b/metadata/md5-cache/dev-python/logutils-0.3.3-r1
index d1145958ee24..8c7e78d3dffe 100644
--- a/metadata/md5-cache/dev-python/logutils-0.3.3-r1
+++ b/metadata/md5-cache/dev-python/logutils-0.3.3-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/logutils/logutils-0.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4ed81c615642b6e2a78501474ded5b4d
diff --git a/metadata/md5-cache/dev-python/lxc-python2-0.1 b/metadata/md5-cache/dev-python/lxc-python2-0.1
index c748f1a16a08..f260c3e768d6 100644
--- a/metadata/md5-cache/dev-python/lxc-python2-0.1
+++ b/metadata/md5-cache/dev-python/lxc-python2-0.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-emulation/lxc-3.0 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxc-python2/lxc-python2-0.1.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3b5e48a90c78766cd1230d8251b3dbcb
diff --git a/metadata/md5-cache/dev-python/lxml-4.3.3 b/metadata/md5-cache/dev-python/lxml-4.3.3
index 9ef62471f015..56c6cc41f88c 100644
--- a/metadata/md5-cache/dev-python/lxml-4.3.3
+++ b/metadata/md5-cache/dev-python/lxml-4.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-4.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=deee72c43636475407edbb42e1af2fe5
diff --git a/metadata/md5-cache/dev-python/lxml-4.4.2 b/metadata/md5-cache/dev-python/lxml-4.4.2
index a09e959f6ced..5eb6bd50503d 100644
--- a/metadata/md5-cache/dev-python/lxml-4.4.2
+++ b/metadata/md5-cache/dev-python/lxml-4.4.2
@@ -5,12 +5,12 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=7
 HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
 IUSE=doc examples +threads test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5af25dab180ccdd8f642403f85131403
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f6e5fa4e1f3b29f835196439276c9998
diff --git a/metadata/md5-cache/dev-python/lxml-4.4.3 b/metadata/md5-cache/dev-python/lxml-4.4.3
index 5ecd8fdd40cf..647140940188 100644
--- a/metadata/md5-cache/dev-python/lxml-4.4.3
+++ b/metadata/md5-cache/dev-python/lxml-4.4.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=324f62e9a8edff5f274c046b9830e6ce
diff --git a/metadata/md5-cache/dev-python/lxml-4.5.0 b/metadata/md5-cache/dev-python/lxml-4.5.0
index 8b9bfa8e9e52..93a8ec347a9f 100644
--- a/metadata/md5-cache/dev-python/lxml-4.5.0
+++ b/metadata/md5-cache/dev-python/lxml-4.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lxml/lxml/archive/lxml-4.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a47bd80eb93200677c29ad3156500fc7
diff --git a/metadata/md5-cache/dev-python/lz4-0.10.1 b/metadata/md5-cache/dev-python/lz4-0.10.1
index 21f3f74fdd78..3677baac4735 100644
--- a/metadata/md5-cache/dev-python/lz4-0.10.1
+++ b/metadata/md5-cache/dev-python/lz4-0.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-0.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7bf436c03f19bc6c8223f122db11e94f
diff --git a/metadata/md5-cache/dev-python/lz4-0.8.2 b/metadata/md5-cache/dev-python/lz4-0.8.2
index 4d1b7bb262a5..ab9e3612db8d 100644
--- a/metadata/md5-cache/dev-python/lz4-0.8.2
+++ b/metadata/md5-cache/dev-python/lz4-0.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-0.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d95ed13790825992093c54b899c2b19
diff --git a/metadata/md5-cache/dev-python/lz4-2.1.6 b/metadata/md5-cache/dev-python/lz4-2.1.6
index a077a0cc6c5e..ae3fdc32df90 100644
--- a/metadata/md5-cache/dev-python/lz4-2.1.6
+++ b/metadata/md5-cache/dev-python/lz4-2.1.6
@@ -11,5 +11,5 @@ RDEPEND=app-arch/lz4 python_targets_python3_6? ( dev-lang/python:3.6 ) python_ta
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lz4/lz4-2.1.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=930cd901ee3a8dee4ded3b072f21763a
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.31.0-r2 b/metadata/md5-cache/dev-python/m2crypto-0.31.0-r2
index fe8dff9e7b7e..5b7ab625e548 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.31.0-r2
+++ b/metadata/md5-cache/dev-python/m2crypto-0.31.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.31.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a03938c78dd533a551510690ead39166
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.35.2 b/metadata/md5-cache/dev-python/m2crypto-0.35.2
index 508cee2f9c4d..bd3d30204b7b 100644
--- a/metadata/md5-cache/dev-python/m2crypto-0.35.2
+++ b/metadata/md5-cache/dev-python/m2crypto-0.35.2
@@ -11,5 +11,5 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) vi
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.35.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=95c952e306c45be9667ae68cf9c86b21
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.12 b/metadata/md5-cache/dev-python/m2r-0.1.12
index bc2d17d260f5..9c141f60e090 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.12
+++ b/metadata/md5-cache/dev-python/m2r-0.1.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=357b91f60ebdb44bf6900fe204709d3f
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.14 b/metadata/md5-cache/dev-python/m2r-0.1.14
index 820ad562e84e..4a122c8c03f9 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.14
+++ b/metadata/md5-cache/dev-python/m2r-0.1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=87d81877ba01396ba09059ba5ce1265c
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.5 b/metadata/md5-cache/dev-python/m2r-0.1.5
index 56abc656ba86..c80ac2f1e6ab 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.5
+++ b/metadata/md5-cache/dev-python/m2r-0.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89597e5d00889447cac045bf0754b469
diff --git a/metadata/md5-cache/dev-python/m2r-0.1.6 b/metadata/md5-cache/dev-python/m2r-0.1.6
index 4aae537a15e4..66b13b523f6e 100644
--- a/metadata/md5-cache/dev-python/m2r-0.1.6
+++ b/metadata/md5-cache/dev-python/m2r-0.1.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/m2r/m2r-0.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=770bb5359aad82e6eed8288a2d7ee3b8
diff --git a/metadata/md5-cache/dev-python/m2r-0.2.1 b/metadata/md5-cache/dev-python/m2r-0.2.1
index ddbf02ac1e89..5dc78a12f446 100644
--- a/metadata/md5-cache/dev-python/m2r-0.2.1
+++ b/metadata/md5-cache/dev-python/m2r-0.2.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/docutils[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mistune-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/docutils[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mistune-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/docutils[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mistune-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/mistune-2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Markdown to reStructuredText converter
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miyakogi/m2r/archive/v0.2.1.tar.gz -> m2r-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f3d3fc8d85bdd390908e956b96aff96d
diff --git a/metadata/md5-cache/dev-python/mailmanclient-3.1.1 b/metadata/md5-cache/dev-python/mailmanclient-3.1.1
index 4e27ebc8247a..ba870aaa5677 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailmanclient/mailmanclient-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0571c017f5f0302e3645e3a5bc1bd3c7
diff --git a/metadata/md5-cache/dev-python/maintboot-0.1.0 b/metadata/md5-cache/dev-python/maintboot-0.1.0
index 02ddcd151e0b..49095113f6b9 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/maintboot/maintboot-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d9d070a3da83a09e39df320c4505ee1
diff --git a/metadata/md5-cache/dev-python/mako-1.0.3 b/metadata/md5-cache/dev-python/mako-1.0.3
index cf12e8c0bd4e..e3b43f892fc2 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.3
+++ b/metadata/md5-cache/dev-python/mako-1.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb97f361dbe340d3cf7db92dd4ccfebf
diff --git a/metadata/md5-cache/dev-python/mako-1.0.6 b/metadata/md5-cache/dev-python/mako-1.0.6
index 7cedf043876f..48e5c534a443 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.6
+++ b/metadata/md5-cache/dev-python/mako-1.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e60cf1e68e320264892e638d69f6455
diff --git a/metadata/md5-cache/dev-python/mako-1.0.7 b/metadata/md5-cache/dev-python/mako-1.0.7
index f4ba84e07086..b0953818da1b 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.7
+++ b/metadata/md5-cache/dev-python/mako-1.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=06d78d51052d95ede38ad65e77314401
diff --git a/metadata/md5-cache/dev-python/mako-1.1.0 b/metadata/md5-cache/dev-python/mako-1.1.0
index 8d335d76f8e1..675776294e3b 100644
--- a/metadata/md5-cache/dev-python/mako-1.1.0
+++ b/metadata/md5-cache/dev-python/mako-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Mako/Mako-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=599389d9bb423e8a697278263002e310
diff --git a/metadata/md5-cache/dev-python/mamba-0.8.6 b/metadata/md5-cache/dev-python/mamba-0.8.6
index 964a85872701..31f168d62e04 100644
--- a/metadata/md5-cache/dev-python/mamba-0.8.6
+++ b/metadata/md5-cache/dev-python/mamba-0.8.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mamba/mamba-0.8.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eca93f8fffff5c686c491835b5e91263
diff --git a/metadata/md5-cache/dev-python/mando-0.3.2 b/metadata/md5-cache/dev-python/mando-0.3.2
index c72d716bd916..2e0eed2dec34 100644
--- a/metadata/md5-cache/dev-python/mando-0.3.2
+++ b/metadata/md5-cache/dev-python/mando-0.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=78a5cc3a631d8fa022e7601358272f63
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 17026cb141aa..711b1a894d22 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a6c389e2ed5d..ffab56fb2bf8 100644
--- a/metadata/md5-cache/dev-python/mantissa-0.8.4
+++ b/metadata/md5-cache/dev-python/mantissa-0.8.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e48857438c9b3c96f69e5ff89154b62
diff --git a/metadata/md5-cache/dev-python/manuel-1.8.0 b/metadata/md5-cache/dev-python/manuel-1.8.0
index f37c6f333cbc..c5638bea6ea2 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_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/manuel/manuel-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=806faae8e8f852fe139221fb0c2763f9
diff --git a/metadata/md5-cache/dev-python/manuel-1.9.0 b/metadata/md5-cache/dev-python/manuel-1.9.0
index 16e39ae5b6a7..e850ec90ec36 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_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/manuel/manuel-1.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86870883996b44d7b4bae2e87d4db47c
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.11 b/metadata/md5-cache/dev-python/markdown-2.6.11
index 2665eb438ab3..56674ab1a3f5 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.11
+++ b/metadata/md5-cache/dev-python/markdown-2.6.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3f94a1bded390e414cbe8ee22946a27
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.8 b/metadata/md5-cache/dev-python/markdown-2.6.8
index 7fb53562648a..5d1cedd901bb 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.8
+++ b/metadata/md5-cache/dev-python/markdown-2.6.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c3fc4536406aa99d9ddf0fece4e5876
diff --git a/metadata/md5-cache/dev-python/markdown-3.0.1 b/metadata/md5-cache/dev-python/markdown-3.0.1
index 03ffd5574bea..cfe660ae4ad9 100644
--- a/metadata/md5-cache/dev-python/markdown-3.0.1
+++ b/metadata/md5-cache/dev-python/markdown-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f60d4262972effca108af440eaddffb4
diff --git a/metadata/md5-cache/dev-python/markdown-3.1.1 b/metadata/md5-cache/dev-python/markdown-3.1.1
index f30e04735f8f..cc76485a4ad0 100644
--- a/metadata/md5-cache/dev-python/markdown-3.1.1
+++ b/metadata/md5-cache/dev-python/markdown-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21d2451df06302e945d328e2b1cd6d85
diff --git a/metadata/md5-cache/dev-python/markdown-3.1.1-r1 b/metadata/md5-cache/dev-python/markdown-3.1.1-r1
index c23c9e825cf9..f4ae23353a7e 100644
--- a/metadata/md5-cache/dev-python/markdown-3.1.1-r1
+++ b/metadata/md5-cache/dev-python/markdown-3.1.1-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Python implementation of the markdown markup language
 EAPI=7
 HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
 IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4e9c3fba7689811a06645e8283b1020b
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0e49c33d5ace277da7d44a8c2540bfcc
diff --git a/metadata/md5-cache/dev-python/markdown-3.2 b/metadata/md5-cache/dev-python/markdown-3.2
new file mode 100644
index 000000000000..1e2ac8152c4c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/markdown-3.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytidylib[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of the markdown markup language
+EAPI=7
+HOMEPAGE=https://python-markdown.github.io/ https://pypi.org/project/Markdown/ https://github.com/Python-Markdown/markdown
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/M/Markdown/Markdown-3.2.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=47fde6cc955eb8b76c16c3e35fe16eb6
diff --git a/metadata/md5-cache/dev-python/markdown2-2.3.0 b/metadata/md5-cache/dev-python/markdown2-2.3.0
index c68064cc476d..c1c316529328 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/markdown2/markdown2-2.3.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13406ec570e55fb9714ce076bced7d51
diff --git a/metadata/md5-cache/dev-python/markups-3.0.0 b/metadata/md5-cache/dev-python/markups-3.0.0
index c06392f1809b..65f92d811f34 100644
--- a/metadata/md5-cache/dev-python/markups-3.0.0
+++ b/metadata/md5-cache/dev-python/markups-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/Markups/Markups-3.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5871980caefd243b59ad70b5949a6074
diff --git a/metadata/md5-cache/dev-python/markupsafe-0.23 b/metadata/md5-cache/dev-python/markupsafe-0.23
index a5d6833e1843..ac4b470fe2cd 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-0.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5052c4d859c50a399702f265f7e0c54
diff --git a/metadata/md5-cache/dev-python/markupsafe-1.0 b/metadata/md5-cache/dev-python/markupsafe-1.0
index c79526f8ada4..da39f6bd3493 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35be7fcc08870c6e395032e39dbfcdcb
diff --git a/metadata/md5-cache/dev-python/markupsafe-1.1.1 b/metadata/md5-cache/dev-python/markupsafe-1.1.1
index a7e8ccb896ef..688861576c60 100644
--- a/metadata/md5-cache/dev-python/markupsafe-1.1.1
+++ b/metadata/md5-cache/dev-python/markupsafe-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-1.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=31fe13333b4ac8778f7ce8edbe6b9ded
diff --git a/metadata/md5-cache/dev-python/marshmallow-2.20.2 b/metadata/md5-cache/dev-python/marshmallow-2.20.2
index 487bb8097b7b..fe04e1fce252 100644
--- a/metadata/md5-cache/dev-python/marshmallow-2.20.2
+++ b/metadata/md5-cache/dev-python/marshmallow-2.20.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-2.20.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1919b1df6c130c4cf441810b36d7acc6
diff --git a/metadata/md5-cache/dev-python/marshmallow-2.20.5 b/metadata/md5-cache/dev-python/marshmallow-2.20.5
index 8c59ff18368e..b72184481abd 100644
--- a/metadata/md5-cache/dev-python/marshmallow-2.20.5
+++ b/metadata/md5-cache/dev-python/marshmallow-2.20.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-2.20.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1919b1df6c130c4cf441810b36d7acc6
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.0.1 b/metadata/md5-cache/dev-python/marshmallow-3.0.1
index 8140d33d9943..81a6dacd0063 100644
--- a/metadata/md5-cache/dev-python/marshmallow-3.0.1
+++ b/metadata/md5-cache/dev-python/marshmallow-3.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/marshmallow/marshmallow-3.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5cdffdb91cb0c36402d70a937e587ead
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 9b3f96ce1264..ade0e7fb4114 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2fd842d851b97b50a24e4bd3d7f7162
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.2.4 b/metadata/md5-cache/dev-python/matplotlib-2.2.4
index 129d90f705c4..9e68a9884fb7 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.2.4
+++ b/metadata/md5-cache/dev-python/matplotlib-2.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=603dd74f128e1615c32f3c8f5a549983
diff --git a/metadata/md5-cache/dev-python/matplotlib-3.1.2 b/metadata/md5-cache/dev-python/matplotlib-3.1.2
index df284bb7b272..34d305f52617 100644
--- a/metadata/md5-cache/dev-python/matplotlib-3.1.2
+++ b/metadata/md5-cache/dev-python/matplotlib-3.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( cairo latex qt5 tk wxwidgets gtk3 ) || ( python_targets_pyt
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-3.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=6a6e6e4970673ecb4206faf2dbd03812
diff --git a/metadata/md5-cache/dev-python/matplotlib-python2-2.2.4 b/metadata/md5-cache/dev-python/matplotlib-python2-2.2.4
index 07de34878350..60eb17dd113d 100644
--- a/metadata/md5-cache/dev-python/matplotlib-python2-2.2.4
+++ b/metadata/md5-cache/dev-python/matplotlib-python2-2.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/matplotlib/matplotlib-2.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1de826edd1fc2af544a15e3f479b90a0
diff --git a/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.18 b/metadata/md5-cache/dev-python/matplotlib2tikz-0.6.18
index 33cc79a82a06..95e203f8340e 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nschloe/matplotlib2tikz/archive/v0.6.18.tar.gz -> matplotlib2tikz-0.6.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1decb27f820de85e09816f00ca6ac87
diff --git a/metadata/md5-cache/dev-python/matterhook-0.1 b/metadata/md5-cache/dev-python/matterhook-0.1
index 7be6e092b7df..3bb3e6fafedd 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/matterhook/matterhook-0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de032ddf9ce69964fabe0ac2ed2c79d3
diff --git a/metadata/md5-cache/dev-python/mccabe-0.2.1 b/metadata/md5-cache/dev-python/mccabe-0.2.1
index 7747e70c14b4..a93fc7198631 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85fc589ff8ac3402df1eef5d87a59bf0
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1 b/metadata/md5-cache/dev-python/mccabe-0.6.1
index cae124363ba1..75894eda9873 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74dc28e71679cc1a74950bdb9782fc9a
diff --git a/metadata/md5-cache/dev-python/mccabe-0.6.1-r1 b/metadata/md5-cache/dev-python/mccabe-0.6.1-r1
index d66a33b8b12b..44ca41b32561 100644
--- a/metadata/md5-cache/dev-python/mccabe-0.6.1-r1
+++ b/metadata/md5-cache/dev-python/mccabe-0.6.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/flake8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=flake8 plugin: McCabe complexity checker
 EAPI=7
 HOMEPAGE=https://github.com/PyCQA/mccabe
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/flake8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mccabe/mccabe-0.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=df5c4aed55e79c362c84f5091d47fdc9
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9b8970b8b62b906456284fc6f3a76181
diff --git a/metadata/md5-cache/dev-python/mecab-python-0.996 b/metadata/md5-cache/dev-python/mecab-python-0.996
index be18902ffb7d..798332428624 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_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5bee797c2594ac15defe506f8f2c39a
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 d56122e2f595..a3f4ddd9f6a8 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_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/mechanize/src/mechanize-0.2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c53e33cb251ee73c834c3db6d78701eb
diff --git a/metadata/md5-cache/dev-python/mechanize-0.3.6 b/metadata/md5-cache/dev-python/mechanize-0.3.6
index 592a33ef771d..27fee75435ce 100644
--- a/metadata/md5-cache/dev-python/mechanize-0.3.6
+++ b/metadata/md5-cache/dev-python/mechanize-0.3.6
@@ -11,5 +11,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/mechanize/mechanize-0.3.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91051ecf08ab9d2109f2688b00eb2f55
diff --git a/metadata/md5-cache/dev-python/mechanize-0.4.5 b/metadata/md5-cache/dev-python/mechanize-0.4.5
index 72023ce29b09..b867f8a1de16 100644
--- a/metadata/md5-cache/dev-python/mechanize-0.4.5
+++ b/metadata/md5-cache/dev-python/mechanize-0.4.5
@@ -5,11 +5,11 @@ DESCRIPTION=Stateful programmatic web browsing in Python
 EAPI=7
 HOMEPAGE=https://github.com/python-mechanize/mechanize
 IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=|| ( BSD ZPL )
 RDEPEND=>=dev-python/html5lib-0.999999999[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mechanize/mechanize-0.4.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b8c37347173e393a688a342c85b40ee9
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0d80f7977aaa60206a081e6af7769aee
diff --git a/metadata/md5-cache/dev-python/mediafile-0.2.0 b/metadata/md5-cache/dev-python/mediafile-0.2.0
index 2c6167326d0e..a2b8b31b55ec 100644
--- a/metadata/md5-cache/dev-python/mediafile-0.2.0
+++ b/metadata/md5-cache/dev-python/mediafile-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beetbox/mediafile/archive/v0.2.0.tar.gz -> mediafile-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6e0c8cf5962889a952c324242c9f6f8
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 baf846ac4f29..b610b1d8f402 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_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/medusa/medusa-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf5e579140564d177336808f1bdae431
diff --git a/metadata/md5-cache/dev-python/meld3-1.0.2-r2 b/metadata/md5-cache/dev-python/meld3-1.0.2-r2
index ea55b4d5a56a..313465beee60 100644
--- a/metadata/md5-cache/dev-python/meld3-1.0.2-r2
+++ b/metadata/md5-cache/dev-python/meld3-1.0.2-r2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/meld3/meld3-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=25a7f10bffafff1af2af74483e9b55d5
diff --git a/metadata/md5-cache/dev-python/meld3-2.0.0 b/metadata/md5-cache/dev-python/meld3-2.0.0
new file mode 100644
index 000000000000..417a17fea9ef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/meld3-2.0.0
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=meld3 is an HTML/XML templating engine
+EAPI=7
+HOMEPAGE=https://github.com/supervisor/meld3 https://pypi.org/project/meld3/
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=repoze
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/m/meld3/meld3-2.0.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=84fa492790c41fddf8f9ddee6ec50533
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 eaf9c0f76958..34b43666ea5c 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mem_top/mem_top-0.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba421e4c402eae1fc8665f4670bba918
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.47 b/metadata/md5-cache/dev-python/memory_profiler-0.47
index 0513697f3f25..79067cbb74a8 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.47
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.47
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/memory_profiler/memory_profiler-0.47.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=037c5353a2adb6c66651f6d1890fed69
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.54.0 b/metadata/md5-cache/dev-python/memory_profiler-0.54.0
index 9195f58463d6..907d94a581a9 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.54.0
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.54.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/memory_profiler/memory_profiler-0.54.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8c7d34dfd4f788bb2d6726315fd1d03a
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.55.0 b/metadata/md5-cache/dev-python/memory_profiler-0.55.0
index b4f8b06760c1..deec555a9846 100644
--- a/metadata/md5-cache/dev-python/memory_profiler-0.55.0
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.55.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/memory_profiler/memory_profiler-0.55.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5e33fc2b6a8737f604ba3bc69fb5bc8e
diff --git a/metadata/md5-cache/dev-python/memory_profiler-0.57 b/metadata/md5-cache/dev-python/memory_profiler-0.57
new file mode 100644
index 000000000000..e406ed5d65ee
--- /dev/null
+++ b/metadata/md5-cache/dev-python/memory_profiler-0.57
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !dev-lang/mercury dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A module for monitoring memory usage of a python program
+EAPI=7
+HOMEPAGE=https://pypi.org/project/memory_profiler/ https://github.com/fabianp/memory_profiler
+IUSE=examples test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !dev-lang/mercury python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pythonprofilers/memory_profiler/archive/v0.57.tar.gz -> memory_profiler-0.57.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1cd05efa1e418fea9b1f8b86d04cd6d4
diff --git a/metadata/md5-cache/dev-python/mergedict-0.2.0 b/metadata/md5-cache/dev-python/mergedict-0.2.0
index 8fee9a00d6bb..261302f8025e 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_python3_6(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f515efa1c9df10bd076e13e227d29b30
diff --git a/metadata/md5-cache/dev-python/mergedict-0.2.0-r1 b/metadata/md5-cache/dev-python/mergedict-0.2.0-r1
index 45c80919d7fd..f3768e60f5ab 100644
--- a/metadata/md5-cache/dev-python/mergedict-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/mergedict-0.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/python-singledispatch[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0bbdfeacb9f454d4b9e0d09007ba06d9
diff --git a/metadata/md5-cache/dev-python/mergedict-0.3.0 b/metadata/md5-cache/dev-python/mergedict-0.3.0
index 6c6930b2bcfd..63339c6cc4db 100644
--- a/metadata/md5-cache/dev-python/mergedict-0.3.0
+++ b/metadata/md5-cache/dev-python/mergedict-0.3.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-singledispatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( virtual/python-singledispatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python 'dict' with a merge() method
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=823d04478e077d7fcd98b90a8e680b0f
diff --git a/metadata/md5-cache/dev-python/mergedict-1.0.0 b/metadata/md5-cache/dev-python/mergedict-1.0.0
index 0e9a026a28ca..dc91c1a92ca2 100644
--- a/metadata/md5-cache/dev-python/mergedict-1.0.0
+++ b/metadata/md5-cache/dev-python/mergedict-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mergedict/mergedict-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8db61878a27cb9f8fb3bd6f0da25e4ea
diff --git a/metadata/md5-cache/dev-python/metakernel-0.20.4 b/metadata/md5-cache/dev-python/metakernel-0.20.4
index 44a3744e8cd6..fa591669e549 100644
--- a/metadata/md5-cache/dev-python/metakernel-0.20.4
+++ b/metadata/md5-cache/dev-python/metakernel-0.20.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/metakernel/metakernel-0.20.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6103b0086d7dd3850e38a9117b7a583d
diff --git a/metadata/md5-cache/dev-python/meteor-ejson-1.1.0 b/metadata/md5-cache/dev-python/meteor-ejson-1.1.0
index 7d4b181439d3..a456c1f8ad8a 100644
--- a/metadata/md5-cache/dev-python/meteor-ejson-1.1.0
+++ b/metadata/md5-cache/dev-python/meteor-ejson-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meteor-ejson/meteor-ejson-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=652b9baf210b2525a02912a6def0c70f
diff --git a/metadata/md5-cache/dev-python/micawber-0.3.3 b/metadata/md5-cache/dev-python/micawber-0.3.3
index dcb86768f78b..c95880f29c6c 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79de081081b4cac259cf4ec162da451a
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 47921e63c08b..fa4bd5d9c79a 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/microversion_parse/microversion_parse-0.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f836b08ec9d73ebcce3bbdda1c8aeb88
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 7a2c308d4f73..d8a374974d32 100644
--- a/metadata/md5-cache/dev-python/microversion-parse-0.2.1
+++ b/metadata/md5-cache/dev-python/microversion-parse-0.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/microversion_parse/microversion_parse-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2aa7b010865be971a8be2a8ae1e211cf
diff --git a/metadata/md5-cache/dev-python/milk-0.6.1 b/metadata/md5-cache/dev-python/milk-0.6.1
index b954ce82acf8..a3cc78eb6b9a 100644
--- a/metadata/md5-cache/dev-python/milk-0.6.1
+++ b/metadata/md5-cache/dev-python/milk-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/milk/milk-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=676fe2ab0ebc9bb39363999b1be65907
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 e91d7deb42e8..6b71917e414e 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_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/milksets/milksets-0.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb158db2530d4108f3c066bd80bbd72f
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 b109fdfb19f8..124afe10e1bb 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6607575ae7bccdf4d24512de2460419b
diff --git a/metadata/md5-cache/dev-python/mimeparse-1.6.0 b/metadata/md5-cache/dev-python/mimeparse-1.6.0
index 61fabacfc774..c17444f27ccc 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mimeparse/python-mimeparse-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01bc43c7b4e770cbb25867a412ef8881
diff --git a/metadata/md5-cache/dev-python/mimerender-0.6.0 b/metadata/md5-cache/dev-python/mimerender-0.6.0
index 60154392bc87..ecee956a0bd6 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mimerender/mimerender-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1aaac3bb6c8ec37165edd8b21c3ed9a
diff --git a/metadata/md5-cache/dev-python/mini-amf-0.9.1 b/metadata/md5-cache/dev-python/mini-amf-0.9.1
index 49aef634800f..59816c9ee4cc 100644
--- a/metadata/md5-cache/dev-python/mini-amf-0.9.1
+++ b/metadata/md5-cache/dev-python/mini-amf-0.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/zackw/mini-amf/archive/v0.9.1.tar.gz -> mini-amf-0.9.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2475b6459ac3ec770a7f1af2a378cd1c
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.2 b/metadata/md5-cache/dev-python/minidb-2.0.2
index ad415d034be5..165bbf3c1f77 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.2
+++ b/metadata/md5-cache/dev-python/minidb-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/minidb/minidb-2.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5303324bf9cde3f3a1e89bb7f3b7879
diff --git a/metadata/md5-cache/dev-python/minidb-2.0.2-r1 b/metadata/md5-cache/dev-python/minidb-2.0.2-r1
index 7b96f9eb77bb..bdfc114c20c8 100644
--- a/metadata/md5-cache/dev-python/minidb-2.0.2-r1
+++ b/metadata/md5-cache/dev-python/minidb-2.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/minidb/minidb-2.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=edfac57257699a22701d5256a2004f24
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 40e80d1d1fda..367cefbe98eb 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MiniMock/MiniMock-1.2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=38eae454e26d55a6b39068419c831d20
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190824 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190824
index b2adf0303643..3cdc8ced4c2e 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20190824
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.1.20190824
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.1.20190824:0= python_targets_pypy3? ( >=dev-pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20190824.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6440a896756a57bbc5f193282cbeff7f
diff --git a/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224 b/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
index 554669710324..3318283231bd 100644
--- a/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
+++ b/metadata/md5-cache/dev-python/miniupnpc-2.1.20191224
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/miniupnpc-2.1.20191224:0= python_targets_pypy3? ( >=dev-pytho
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/miniupnpc-2.1.20191224.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=11a1e678de4784554d028c8b8e729e58
diff --git a/metadata/md5-cache/dev-python/misaka-1.0.2 b/metadata/md5-cache/dev-python/misaka-1.0.2
index a1b07b140fc4..e022982d0378 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=674f43e245d2e478ee1b4954047970d0
diff --git a/metadata/md5-cache/dev-python/mistune-0.8.3 b/metadata/md5-cache/dev-python/mistune-0.8.3
index c4cec8a2a681..940f1c0c6816 100644
--- a/metadata/md5-cache/dev-python/mistune-0.8.3
+++ b/metadata/md5-cache/dev-python/mistune-0.8.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mistune/mistune-0.8.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=34442e5647c851d4af339ef33e93ccac
diff --git a/metadata/md5-cache/dev-python/mistune-0.8.4 b/metadata/md5-cache/dev-python/mistune-0.8.4
index 3d5bb6f08458..66b48d684b0c 100644
--- a/metadata/md5-cache/dev-python/mistune-0.8.4
+++ b/metadata/md5-cache/dev-python/mistune-0.8.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mistune/mistune-0.8.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=82bdde603c0112a7d7baff3509f7433b
diff --git a/metadata/md5-cache/dev-python/mkdocs-0.15.3 b/metadata/md5-cache/dev-python/mkdocs-0.15.3
index 77b857d0ddd4..12557ee39420 100644
--- a/metadata/md5-cache/dev-python/mkdocs-0.15.3
+++ b/metadata/md5-cache/dev-python/mkdocs-0.15.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8045d910e95b94bfde79b871d6256016
diff --git a/metadata/md5-cache/dev-python/mkdocs-1.0.1 b/metadata/md5-cache/dev-python/mkdocs-1.0.1
index 326bce2e15d9..fc1a5bc410f3 100644
--- a/metadata/md5-cache/dev-python/mkdocs-1.0.1
+++ b/metadata/md5-cache/dev-python/mkdocs-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomchristie/mkdocs/archive/1.0.1.tar.gz -> mkdocs-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40981ade9c1f29f79b2d74deeda5dd1c
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 7355d0f9b4de..a3ee7bdb409f 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=edd362ff8f2dd06652f1d032235ab79e
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootstrap-0.1.1-r1 b/metadata/md5-cache/dev-python/mkdocs-bootstrap-0.1.1-r1
index 63d05542ab36..fa841c4293b2 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootstrap-0.1.1-r1
+++ b/metadata/md5-cache/dev-python/mkdocs-bootstrap-0.1.1-r1
@@ -11,5 +11,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=mirror://pypi/m/mkdocs-bootstrap/mkdocs-bootstrap-0.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=43326eecd9c7963d12de2117e9770b3e
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 fa150c2c1511..5330b44af090 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4960970bc61876d1f96a22c089937c7
diff --git a/metadata/md5-cache/dev-python/mkdocs-bootswatch-0.4.0-r1 b/metadata/md5-cache/dev-python/mkdocs-bootswatch-0.4.0-r1
index aa5432cc5221..cc90cf47b5b1 100644
--- a/metadata/md5-cache/dev-python/mkdocs-bootswatch-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/mkdocs-bootswatch-0.4.0-r1
@@ -11,5 +11,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=mirror://pypi/m/mkdocs-bootswatch/mkdocs-bootswatch-0.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=27a8b16020f1235819a913752aab0bd1
diff --git a/metadata/md5-cache/dev-python/mkpythonproj-1.9 b/metadata/md5-cache/dev-python/mkpythonproj-1.9
index 0ad62c1335c5..71ca30824182 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_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.seanet.com/~hgg9140/comp/download/mkpythonproj-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b02515ae7af0a08b664042fd2c5afa09
diff --git a/metadata/md5-cache/dev-python/mmh3-2.5.1 b/metadata/md5-cache/dev-python/mmh3-2.5.1
index 6efc04133771..1a189c718f29 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mmh3/mmh3-2.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ddf1859e9d619841c4402c55180d7bfc
diff --git a/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1 b/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
index 4c380204978f..c0b022a8b7fd 100644
--- a/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/mmtf-python-1.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/msgpack[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mmtf-python/mmtf-python-1.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eed1ab7d868fba085fa42560b5978e51
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 2995c9778554..d83213a5d120 100644
--- a/metadata/md5-cache/dev-python/mock-1.0.1-r2
+++ b/metadata/md5-cache/dev-python/mock-1.0.1-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b99a5d6798a60fc209a0cf519271d3e4
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 510e925135aa..b74a79e9496f 100644
--- a/metadata/md5-cache/dev-python/mock-1.3.0-r2
+++ b/metadata/md5-cache/dev-python/mock-1.3.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=02093e89499fd0214b04083af4f12e27
diff --git a/metadata/md5-cache/dev-python/mock-2.0.0 b/metadata/md5-cache/dev-python/mock-2.0.0
index 397d9a308046..e9d990c1937a 100644
--- a/metadata/md5-cache/dev-python/mock-2.0.0
+++ b/metadata/md5-cache/dev-python/mock-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mock/mock-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=405477bbed5e3fbcb0ad145e8553a994
diff --git a/metadata/md5-cache/dev-python/mock-3.0.5-r1 b/metadata/md5-cache/dev-python/mock-3.0.5-r1
index f8688bfe92f0..f5f4780fe850 100644
--- a/metadata/md5-cache/dev-python/mock-3.0.5-r1
+++ b/metadata/md5-cache/dev-python/mock-3.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/python-funcsigs-1[python_targets_pypy3(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/testing-cabal/mock/archive/3.0.5.tar.gz -> mock-3.0.5.gh.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=22d83b017c5c4a16185940ae3f2026e2
diff --git a/metadata/md5-cache/dev-python/mockldap-0.3.0 b/metadata/md5-cache/dev-python/mockldap-0.3.0
index aae421468f8e..bb0eb5b792b6 100644
--- a/metadata/md5-cache/dev-python/mockldap-0.3.0
+++ b/metadata/md5-cache/dev-python/mockldap-0.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/mockldap/mockldap-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e81eb4e60e776a97c87d222f8aa06f47
diff --git a/metadata/md5-cache/dev-python/mongoengine-0.10.6 b/metadata/md5-cache/dev-python/mongoengine-0.10.6
index 248a552641ac..4d2a5ee1fe01 100644
--- a/metadata/md5-cache/dev-python/mongoengine-0.10.6
+++ b/metadata/md5-cache/dev-python/mongoengine-0.10.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pymongo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pymongo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A Python Object-Document-Mapper for working with MongoDB
 EAPI=6
 HOMEPAGE=https://github.com/MongoEngine/mongoengine/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/MongoEngine/mongoengine/archive/v0.10.6.tar.gz -> mongoengine-0.10.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18ab23922ea75ea3e04b37bdb6a53b9b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d0bf843907c749ad992a1070c20c6f5e
diff --git a/metadata/md5-cache/dev-python/monotonic-1.4 b/metadata/md5-cache/dev-python/monotonic-1.4
index 3942fb2bef34..29d543dab052 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_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/m/monotonic/monotonic-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5208de80d8633fb0ae4d5429448d3e90
diff --git a/metadata/md5-cache/dev-python/monotonic-1.5 b/metadata/md5-cache/dev-python/monotonic-1.5
index 19ad4c587009..d2ad52270507 100644
--- a/metadata/md5-cache/dev-python/monotonic-1.5
+++ b/metadata/md5-cache/dev-python/monotonic-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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/monotonic/monotonic-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a0bef0866227f2cf5c807a906ab47d6
diff --git a/metadata/md5-cache/dev-python/monotonic-1.5-r1 b/metadata/md5-cache/dev-python/monotonic-1.5-r1
index 3948137b193b..1e61d4cedc0c 100644
--- a/metadata/md5-cache/dev-python/monotonic-1.5-r1
+++ b/metadata/md5-cache/dev-python/monotonic-1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/monotonic/monotonic-1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5ee8a25fb489ab6418359a1724d42291
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 5f29c5c59474..0396252db2f5 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=33e0ca6a74b2d209c68d93ae5adb1e2f
diff --git a/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1 b/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
index d6b8500026f4..0ee3b00c18ba 100644
--- a/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
+++ b/metadata/md5-cache/dev-python/more-itertools-4.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-4.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bbdd5b0d2028361ee86e4154f2ae9dd5
diff --git a/metadata/md5-cache/dev-python/more-itertools-5.0.0 b/metadata/md5-cache/dev-python/more-itertools-5.0.0
index a5f6581b8245..41e819570a20 100644
--- a/metadata/md5-cache/dev-python/more-itertools-5.0.0
+++ b/metadata/md5-cache/dev-python/more-itertools-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-5.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2f24a224047b4a361efe223ebce30e44
diff --git a/metadata/md5-cache/dev-python/more-itertools-7.0.0 b/metadata/md5-cache/dev-python/more-itertools-7.0.0
index c1c8009658d1..f5f84e9b3c32 100644
--- a/metadata/md5-cache/dev-python/more-itertools-7.0.0
+++ b/metadata/md5-cache/dev-python/more-itertools-7.0.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/more-itertools/more-itertools-7.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=87f476c8c1d891c88ca4cb22b8e1ff11
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 10156a5f2f6e..0222e4718899 100644
--- a/metadata/md5-cache/dev-python/moto-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/moto-1.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cd8409ec041a3ce78aef48ba618cb443
diff --git a/metadata/md5-cache/dev-python/moto-1.3.8-r1 b/metadata/md5-cache/dev-python/moto-1.3.8-r1
index dbb4bd0ac224..a46b4a3021bb 100644
--- a/metadata/md5-cache/dev-python/moto-1.3.8-r1
+++ b/metadata/md5-cache/dev-python/moto-1.3.8-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/moto/moto-1.3.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f4e51acbeb43e75db1de8d89b788d66f
diff --git a/metadata/md5-cache/dev-python/moviepy-0.2.2 b/metadata/md5-cache/dev-python/moviepy-0.2.2
index 18f92ffae492..869091631e9d 100644
--- a/metadata/md5-cache/dev-python/moviepy-0.2.2
+++ b/metadata/md5-cache/dev-python/moviepy-0.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Zulko/moviepy/archive/v0.2.2.tar.gz -> moviepy-0.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=251ee1a22bf8f260a1ec03d081c6fd7c
diff --git a/metadata/md5-cache/dev-python/moviepy-1.0.1 b/metadata/md5-cache/dev-python/moviepy-1.0.1
index 2eaafe4eddc6..0188bd5701b2 100644
--- a/metadata/md5-cache/dev-python/moviepy-1.0.1
+++ b/metadata/md5-cache/dev-python/moviepy-1.0.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/imageio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tqdm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/ffmpeg ) 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/imageio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tqdm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/ffmpeg dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/imageio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tqdm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/ffmpeg
 DESCRIPTION=Video editing with Python
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Zulko/moviepy/archive/v1.0.1.tar.gz -> moviepy-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f97b8b9afec3fda65de898f8a5f9198
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 c0387a5d05ce..d27413e4db4f 100644
--- a/metadata/md5-cache/dev-python/mox-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/mox-0.5.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox/mox-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7eba82728f3c4a4fd26c04b771fe7d6f
diff --git a/metadata/md5-cache/dev-python/mox3-0.24.0 b/metadata/md5-cache/dev-python/mox3-0.24.0
index 4fcf8c7c0d6f..9f005092c6d4 100644
--- a/metadata/md5-cache/dev-python/mox3-0.24.0
+++ b/metadata/md5-cache/dev-python/mox3-0.24.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mox3/mox3-0.24.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f59ba1bfacdec4405f7530093d2c6253
diff --git a/metadata/md5-cache/dev-python/mpi4py-3.0.2 b/metadata/md5-cache/dev-python/mpi4py-3.0.2
index ebeb1f9b645c..087e72227ba6 100644
--- a/metadata/md5-cache/dev-python/mpi4py-3.0.2
+++ b/metadata/md5-cache/dev-python/mpi4py-3.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mpi4py/mpi4py-3.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b3ca4ddc6c2b530e6affd2d94c6a57a0
diff --git a/metadata/md5-cache/dev-python/mpmath-1.0.0 b/metadata/md5-cache/dev-python/mpmath-1.0.0
index 4ca988b5d421..14676711bb21 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.0.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mpmath.org/files/mpmath-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50ca13a32dccd16b80782b48a43f3269
diff --git a/metadata/md5-cache/dev-python/mpmath-1.1.0 b/metadata/md5-cache/dev-python/mpmath-1.1.0
index 1a1060668183..2a4f2c32723c 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.1.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fredrik-johansson/mpmath/archive/1.1.0.tar.gz -> mpmath-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0570124a6a3a2fd4032b0df2385f668
diff --git a/metadata/md5-cache/dev-python/msgpack-0.4.8 b/metadata/md5-cache/dev-python/msgpack-0.4.8
index f393ab0505bf..62d91c7f88e5 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.4.8
+++ b/metadata/md5-cache/dev-python/msgpack-0.4.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.4.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=557a2049d5e41bffba1a86880c728c95
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.1 b/metadata/md5-cache/dev-python/msgpack-0.5.1
index c39668922524..845c194df576 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.1
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack-python/msgpack-python-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71a5a734546369fe08a79b58dd6cea37
diff --git a/metadata/md5-cache/dev-python/msgpack-0.5.6 b/metadata/md5-cache/dev-python/msgpack-0.5.6
index b43fa9bb7aa9..9fe3c2ba126c 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.5.6
+++ b/metadata/md5-cache/dev-python/msgpack-0.5.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-0.5.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e013ea7fd784b750df75a31427bfaed3
diff --git a/metadata/md5-cache/dev-python/msgpack-0.6.1 b/metadata/md5-cache/dev-python/msgpack-0.6.1
index c1a4e86e938d..eaee57f240ad 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.6.1
+++ b/metadata/md5-cache/dev-python/msgpack-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ed64d9800249ca6c204be982477dba8
diff --git a/metadata/md5-cache/dev-python/msgpack-0.6.2 b/metadata/md5-cache/dev-python/msgpack-0.6.2
index 27c2f2c9cb3b..3676eb6a49d8 100644
--- a/metadata/md5-cache/dev-python/msgpack-0.6.2
+++ b/metadata/md5-cache/dev-python/msgpack-0.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/msgpack/msgpack-0.6.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=77c83b874c498a23c60acc40553ded6e
diff --git a/metadata/md5-cache/dev-python/multidict-4.1.0 b/metadata/md5-cache/dev-python/multidict-4.1.0
index dc35336b9aab..c784cc6bd71b 100644
--- a/metadata/md5-cache/dev-python/multidict-4.1.0
+++ b/metadata/md5-cache/dev-python/multidict-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.1.0.tar.gz -> multidict-4.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=509dc941f88f04424acaab8aa27b9780
diff --git a/metadata/md5-cache/dev-python/multidict-4.3.1 b/metadata/md5-cache/dev-python/multidict-4.3.1
index a70122821a98..923b633c0937 100644
--- a/metadata/md5-cache/dev-python/multidict-4.3.1
+++ b/metadata/md5-cache/dev-python/multidict-4.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.3.1.tar.gz -> multidict-4.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5770bff87f536550cddd0f2d9cc695a1
diff --git a/metadata/md5-cache/dev-python/multidict-4.5.2 b/metadata/md5-cache/dev-python/multidict-4.5.2
index c4fff6a8cb7a..54e6cee93863 100644
--- a/metadata/md5-cache/dev-python/multidict-4.5.2
+++ b/metadata/md5-cache/dev-python/multidict-4.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.5.2.tar.gz -> multidict-4.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbdf4526518e7ac95f9b505cb3b8d99e
diff --git a/metadata/md5-cache/dev-python/multipledispatch-0.4.9 b/metadata/md5-cache/dev-python/multipledispatch-0.4.9
index 5680803d7127..d79ac76b6198 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/multipledispatch/multipledispatch-0.4.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c1358df26c81a74a28c4b89ace419fe
diff --git a/metadata/md5-cache/dev-python/munch-2.1.1 b/metadata/md5-cache/dev-python/munch-2.1.1
index 375e58ac6962..aafee333a016 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec1a290841fb62f0416a1c2763f4f934
diff --git a/metadata/md5-cache/dev-python/munch-2.2.0 b/metadata/md5-cache/dev-python/munch-2.2.0
index 7de7630e9750..3520f7a4097f 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5f1213eb0c0cd563bc6bd96dc446872
diff --git a/metadata/md5-cache/dev-python/munch-2.3.2 b/metadata/md5-cache/dev-python/munch-2.3.2
index 1cc433f0214c..3816edc705b2 100644
--- a/metadata/md5-cache/dev-python/munch-2.3.2
+++ b/metadata/md5-cache/dev-python/munch-2.3.2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6bac9e0e84e9ed7b597448e7fcc6ea1a
diff --git a/metadata/md5-cache/dev-python/munch-2.5.0 b/metadata/md5-cache/dev-python/munch-2.5.0
index 83ec5f1a35b5..9733d72682c8 100644
--- a/metadata/md5-cache/dev-python/munch-2.5.0
+++ b/metadata/md5-cache/dev-python/munch-2.5.0
@@ -4,12 +4,12 @@ DESCRIPTION=A dot-accessible dictionary (a la JavaScript objects)
 EAPI=7
 HOMEPAGE=https://github.com/Infinidat/munch
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/munch/munch-2.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be3ed436dc969c2b26ca5c1261a104c3
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=333232e221d504914ed850387df7c5db
diff --git a/metadata/md5-cache/dev-python/munkres-1.0.12 b/metadata/md5-cache/dev-python/munkres-1.0.12
index f2668ac2ed63..29ae90369e80 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=571e9ec87e606db6809361ab20c2e349
diff --git a/metadata/md5-cache/dev-python/munkres-1.0.8 b/metadata/md5-cache/dev-python/munkres-1.0.8
index aaada2320276..77c03639e4ff 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/munkres/munkres-1.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9f16c49c966ae3af1f1d76c25e33b3e
diff --git a/metadata/md5-cache/dev-python/munkres-1.1.2 b/metadata/md5-cache/dev-python/munkres-1.1.2
index 05395f5be4fc..d8c697a7c388 100644
--- a/metadata/md5-cache/dev-python/munkres-1.1.2
+++ b/metadata/md5-cache/dev-python/munkres-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/bmc/munkres/archive/release-1.1.2.tar.gz -> munkres-1.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9c8859009013a006f73b1a10ce420138
diff --git a/metadata/md5-cache/dev-python/myghty-1.2-r1 b/metadata/md5-cache/dev-python/myghty-1.2-r1
index 83c380729d43..09b08f26200a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b341831e4fed..ac89a90dc088 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80e2564e275cb03bd205bb76e42880e5
diff --git a/metadata/md5-cache/dev-python/mygpoclient-1.8 b/metadata/md5-cache/dev-python/mygpoclient-1.8
index 0df09ada445d..68933578bdd9 100644
--- a/metadata/md5-cache/dev-python/mygpoclient-1.8
+++ b/metadata/md5-cache/dev-python/mygpoclient-1.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gpodder/mygpoclient/archive/1.8.tar.gz -> mygpoclient-1.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=27e3fc811511e76755d26e2243161bc8
diff --git a/metadata/md5-cache/dev-python/mypy-0.760 b/metadata/md5-cache/dev-python/mypy-0.760
index 42b12fb1de7d..b04903eff2b6 100644
--- a/metadata/md5-cache/dev-python/mypy-0.760
+++ b/metadata/md5-cache/dev-python/mypy-0.760
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy/archive/v0.760.tar.gz -> mypy-0.760.tar.gz https://api.github.com/repos/python/typeshed/tarball/a06abc5 -> mypy-typeshed-0.760-a06abc5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1087590e04e2a805128a0138083a1409
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.1 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.1
index b98b0b589267..7e1b0213803b 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.1
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.1.tar.gz -> mypy_extensions-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=81dd767ce9a5a63c1506be729d4a2de4
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3 b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3
index 9bc91c0b87f3..9460e1e88b52 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-0.4.3
+++ b/metadata/md5-cache/dev-python/mypy_extensions-0.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python/mypy_extensions/archive/0.4.3.tar.gz -> mypy_extensions-0.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf2a5edbc50e35de4b4a150baafb0f2a
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 c9cae890da8d..7b25e598153f 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-2.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1849d62122dcb4a6f55db330015dbb9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e2f965d3d95010b4a8f55e04170e5dab
diff --git a/metadata/md5-cache/dev-python/mysql-connector-python-8.0.18 b/metadata/md5-cache/dev-python/mysql-connector-python-8.0.18
index 19a2ba2c5838..1e1e91fc229d 100644
--- a/metadata/md5-cache/dev-python/mysql-connector-python-8.0.18
+++ b/metadata/md5-cache/dev-python/mysql-connector-python-8.0.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.18.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ff85c1cd75bc0a97f200965c7738c581
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 be972f759a99..771f573290bf 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=29011057dac22efd4f8f264900a55174
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 d263214f8e1e..9f55a047e3ae 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MySQL-python/MySQL-python-1.2.5.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=718cb959f554ba6988b92c62c4873d14
diff --git a/metadata/md5-cache/dev-python/mysql-python-1.2.5-r2 b/metadata/md5-cache/dev-python/mysql-python-1.2.5-r2
index 60941eea0b50..5a6da2c58cef 100644
--- a/metadata/md5-cache/dev-python/mysql-python-1.2.5-r2
+++ b/metadata/md5-cache/dev-python/mysql-python-1.2.5-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-db/mysql-connector-c python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MySQL-python/MySQL-python-1.2.5.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=397ac3b670310aa0babc5e1946f2f13a
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.3.14-r1 b/metadata/md5-cache/dev-python/mysqlclient-1.3.14-r1
index 06609d70add3..734b50d50bf1 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-1.3.14-r1
+++ b/metadata/md5-cache/dev-python/mysqlclient-1.3.14-r1
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/mysql-python dev-db/mysql-connector-c:0= python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.3.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8366d01ad7b6699f0f5e7aea50411a8
diff --git a/metadata/md5-cache/dev-python/mysqlclient-1.4.6 b/metadata/md5-cache/dev-python/mysqlclient-1.4.6
index 477efa3b8725..3a5bc60e58f6 100644
--- a/metadata/md5-cache/dev-python/mysqlclient-1.4.6
+++ b/metadata/md5-cache/dev-python/mysqlclient-1.4.6
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/mysql-python dev-db/mysql-connector-c:0= python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mysqlclient/mysqlclient-1.4.6.tar.gz -> mysqlclient-1.4.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f295ac12df9620d3ccf0ef668fa1b912
diff --git a/metadata/md5-cache/dev-python/nagiosplugin-1.2.4 b/metadata/md5-cache/dev-python/nagiosplugin-1.2.4
index 2591d8b1a4ab..c107a3c16539 100644
--- a/metadata/md5-cache/dev-python/nagiosplugin-1.2.4
+++ b/metadata/md5-cache/dev-python/nagiosplugin-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nagiosplugin/nagiosplugin-1.2.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=71108b63ee6fbe3244f2b9cb8681e3dd
diff --git a/metadata/md5-cache/dev-python/nagiosplugin-1.3.2 b/metadata/md5-cache/dev-python/nagiosplugin-1.3.2
index 91a20859e5de..c5c91fdfa461 100644
--- a/metadata/md5-cache/dev-python/nagiosplugin-1.3.2
+++ b/metadata/md5-cache/dev-python/nagiosplugin-1.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nagiosplugin/nagiosplugin-1.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a4f521ae46ee066f00604589f6eb8986
diff --git a/metadata/md5-cache/dev-python/namespace-repoze-1 b/metadata/md5-cache/dev-python/namespace-repoze-1
index 95e14a785bf3..b5600e5fc60a 100644
--- a/metadata/md5-cache/dev-python/namespace-repoze-1
+++ b/metadata/md5-cache/dev-python/namespace-repoze-1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Namespace package declaration for repoze
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=88d96f1dbb5801e8ab4c4c92ec185eaa
+_md5_=56bceff796aa23c578a71d36f09edca6
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 f09d84988e80..18e9e100cba4 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_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/matplotlib/natgrid-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b665f6bb716dfe86589595fbb9db79b8
diff --git a/metadata/md5-cache/dev-python/natsort-4.0.4 b/metadata/md5-cache/dev-python/natsort-4.0.4
index 05130354313a..081ff3c90c47 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/natsort/natsort-4.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3858b20bae78b45a3f629eae17f7af7b
diff --git a/metadata/md5-cache/dev-python/nautilus-python-1.2.2 b/metadata/md5-cache/dev-python/nautilus-python-1.2.2
deleted file mode 100644
index 1f2e38331c64..000000000000
--- a/metadata/md5-cache/dev-python/nautilus-python-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=gnome-base/nautilus-3[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Python bindings for the Nautilus file manager
-EAPI=6
-HOMEPAGE=https://projects.gnome.org/nautilus-python/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=gnome-base/nautilus-3[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/nautilus-python/1.2/nautilus-python-1.2.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a974bbb053e9ccfc89b90e61612931af
diff --git a/metadata/md5-cache/dev-python/nautilus-python-1.2.2-r1 b/metadata/md5-cache/dev-python/nautilus-python-1.2.2-r1
new file mode 100644
index 000000000000..941b6759753a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nautilus-python-1.2.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( dev-python/pygobject:3[python_targets_python2_7(-)] ) >=gnome-base/nautilus-3[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Python bindings for the Nautilus file manager
+EAPI=6
+HOMEPAGE=https://projects.gnome.org/nautilus-python/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~arm64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( dev-python/pygobject:3[python_targets_python2_7(-)] ) >=gnome-base/nautilus-3[introspection] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus-python/1.2/nautilus-python-1.2.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=be0c4acf5649a983dacf9381e8bb1beb
diff --git a/metadata/md5-cache/dev-python/nbconvert-5.2.1 b/metadata/md5-cache/dev-python/nbconvert-5.2.1
index 917cc0f0f6db..aa56905467a1 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_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-5.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2d2600a44c8ceeec471f170b03dee89
diff --git a/metadata/md5-cache/dev-python/nbconvert-5.5.0 b/metadata/md5-cache/dev-python/nbconvert-5.5.0
index 89ad26b05a2f..dc6fd3aac9b0 100644
--- a/metadata/md5-cache/dev-python/nbconvert-5.5.0
+++ b/metadata/md5-cache/dev-python/nbconvert-5.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nbconvert/nbconvert-5.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cb504c65b1600f3ec0d641019b0be487
diff --git a/metadata/md5-cache/dev-python/nbdime-0.2.0 b/metadata/md5-cache/dev-python/nbdime-0.2.0
index 7b7872b18f90..42714fda906d 100644
--- a/metadata/md5-cache/dev-python/nbdime-0.2.0
+++ b/metadata/md5-cache/dev-python/nbdime-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbdime/nbdime-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=49d1e4499616275739443d5121b1d302
diff --git a/metadata/md5-cache/dev-python/nbformat-4.4.0 b/metadata/md5-cache/dev-python/nbformat-4.4.0
index 312666b3d6b6..705c28240eb7 100644
--- a/metadata/md5-cache/dev-python/nbformat-4.4.0
+++ b/metadata/md5-cache/dev-python/nbformat-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbformat/nbformat-4.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1b951a068aff52e02f3fd8ad27afd3d
diff --git a/metadata/md5-cache/dev-python/nbformat-4.4.0-r1 b/metadata/md5-cache/dev-python/nbformat-4.4.0-r1
index 12a60a89e3c0..363a267bddb7 100644
--- a/metadata/md5-cache/dev-python/nbformat-4.4.0-r1
+++ b/metadata/md5-cache/dev-python/nbformat-4.4.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbformat/nbformat-4.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dc330556bec1e283b5d40d82b21b96fa
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.2.14 b/metadata/md5-cache/dev-python/nbsphinx-0.2.14
index ef30cff13ca7..37db2c839390 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_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.2.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76c1ef3a5447f3bde21a38e0bc2824e9
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.4.1 b/metadata/md5-cache/dev-python/nbsphinx-0.4.1
index 4d1a74f17761..3e1bbf46cd18 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.4.1
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.4.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=472f2782e8b2289a604000c82431ac0d
diff --git a/metadata/md5-cache/dev-python/nbval-0.7 b/metadata/md5-cache/dev-python/nbval-0.7
index 89b306614e83..f1dd7a0b0f56 100644
--- a/metadata/md5-cache/dev-python/nbval-0.7
+++ b/metadata/md5-cache/dev-python/nbval-0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbval/nbval-0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28424c2fe255dea8bbe20a3a501a626a
diff --git a/metadata/md5-cache/dev-python/nbval-0.9.1 b/metadata/md5-cache/dev-python/nbval-0.9.1
index de4055eaba5a..eaaeb16ba368 100644
--- a/metadata/md5-cache/dev-python/nbval-0.9.1
+++ b/metadata/md5-cache/dev-python/nbval-0.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbval/nbval-0.9.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=58f72b440871f3151b081488ed592aaf
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 f48657945140..9c10d71b2ec3 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_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5cc2281b5eb3b24a02b54ae09ab3cdad
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 750031c3edca..5ee4183deff7 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a543219372d757bc11ccc919a2ca9170
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 982de51495eb..a77ef49a0b41 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/pynvim[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4298927cfabb7b97d2eb93c5684c98d
diff --git a/metadata/md5-cache/dev-python/neovim-remote-2.1.0 b/metadata/md5-cache/dev-python/neovim-remote-2.1.0
index 77deab49b4fb..1669abcf1dc0 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-2.1.0
+++ b/metadata/md5-cache/dev-python/neovim-remote-2.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mhinz/neovim-remote/archive/v2.1.0.tar.gz -> neovim-remote-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e14b613f958172bbca7b3ddabd03136e
diff --git a/metadata/md5-cache/dev-python/neovim-remote-2.1.7 b/metadata/md5-cache/dev-python/neovim-remote-2.1.7
index 2843383dedc7..2b633321f807 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-2.1.7
+++ b/metadata/md5-cache/dev-python/neovim-remote-2.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mhinz/neovim-remote/archive/v2.1.7.tar.gz -> neovim-remote-2.1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2e46d4851759b646f4742394a411e03d
diff --git a/metadata/md5-cache/dev-python/neovim-remote-2.2.1 b/metadata/md5-cache/dev-python/neovim-remote-2.2.1
index c2767692aef5..0b2ba303ffcc 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-2.2.1
+++ b/metadata/md5-cache/dev-python/neovim-remote-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mhinz/neovim-remote/archive/v2.2.1.tar.gz -> neovim-remote-2.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2e46d4851759b646f4742394a411e03d
diff --git a/metadata/md5-cache/dev-python/neovim-remote-9999 b/metadata/md5-cache/dev-python/neovim-remote-9999
index c3d1d2d349e6..60236cb08861 100644
--- a/metadata/md5-cache/dev-python/neovim-remote-9999
+++ b/metadata/md5-cache/dev-python/neovim-remote-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pynvim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/psutil[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4298927cfabb7b97d2eb93c5684c98d
diff --git a/metadata/md5-cache/dev-python/netaddr-0.7.19 b/metadata/md5-cache/dev-python/netaddr-0.7.19
index 22fdf1a4d166..a33a00652714 100644
--- a/metadata/md5-cache/dev-python/netaddr-0.7.19
+++ b/metadata/md5-cache/dev-python/netaddr-0.7.19
@@ -11,5 +11,5 @@ REQUIRED_USE=cli? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) |
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/netaddr/netaddr-0.7.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=445fae90ff267599867a535d610aa3a9
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1 b/metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
index 1622c2e82581..fdc534641395 100644
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/netcdf4-python-1.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/netCDF4/netCDF4-1.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f35547ded278e608685ec1e86e1bda03
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.6 b/metadata/md5-cache/dev-python/netifaces-0.10.6
index 48ea4c78295f..f03826b01a0d 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.10.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f4b0016c02109a9ae7cfa21cca61141
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.7 b/metadata/md5-cache/dev-python/netifaces-0.10.7
index 3e7279eb6cdb..47546966fcb9 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.10.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c098a47962aa3a58a16dc51ec1248daf
diff --git a/metadata/md5-cache/dev-python/netifaces-0.10.9 b/metadata/md5-cache/dev-python/netifaces-0.10.9
index 312ef6df84e7..6c34b0e19886 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.10.9
+++ b/metadata/md5-cache/dev-python/netifaces-0.10.9
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.10.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a5dfbb2bf70ca4bccf746a5e6f106a3d
diff --git a/metadata/md5-cache/dev-python/netmiko-1.4.2 b/metadata/md5-cache/dev-python/netmiko-1.4.2
index ff7410eec364..a8455688775a 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netmiko/netmiko-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c689692894fffb572afd6adc9af59de4
diff --git a/metadata/md5-cache/dev-python/netmiko-2.1.1 b/metadata/md5-cache/dev-python/netmiko-2.1.1
index c300a2150688..85d6e3efce73 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netmiko/netmiko-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd339db7dd4a244728caa9ebf696c4f7
diff --git a/metadata/md5-cache/dev-python/networkx-2.2 b/metadata/md5-cache/dev-python/networkx-2.2
index 439cb4e94974..d79ea0e5d00d 100644
--- a/metadata/md5-cache/dev-python/networkx-2.2
+++ b/metadata/md5-cache/dev-python/networkx-2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( extras pandas scipy xml yaml ) || ( python_targets_python3_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.2.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=1676113e537e570b1160d2477471637e
diff --git a/metadata/md5-cache/dev-python/networkx-2.4 b/metadata/md5-cache/dev-python/networkx-2.4
index d4fff4056d94..b83b3c16470d 100644
--- a/metadata/md5-cache/dev-python/networkx-2.4
+++ b/metadata/md5-cache/dev-python/networkx-2.4
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( extras pandas scipy xml yaml ) || ( python_targets_python3_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/networkx/networkx-2.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=94600466e8e3c74f39cd463d38326645
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 c876267663fe..73516212b325 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/neutron-lib/neutron-lib-1.18.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c38d398cf621f6bb9553913880492fb
diff --git a/metadata/md5-cache/dev-python/neutron-lib-1.25.0 b/metadata/md5-cache/dev-python/neutron-lib-1.25.0
index 70ecffdcbbc3..1dbd42628ce9 100644
--- a/metadata/md5-cache/dev-python/neutron-lib-1.25.0
+++ b/metadata/md5-cache/dev-python/neutron-lib-1.25.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/neutron-lib/neutron-lib-1.25.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=43693a25416277d94b748abc87b0006e
diff --git a/metadata/md5-cache/dev-python/neutron-lib-1.29.1 b/metadata/md5-cache/dev-python/neutron-lib-1.29.1
index 915fcf803dd6..eb4c849086f9 100644
--- a/metadata/md5-cache/dev-python/neutron-lib-1.29.1
+++ b/metadata/md5-cache/dev-python/neutron-lib-1.29.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/neutron-lib/neutron-lib-1.29.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9185c846975a74246b0468a3e0351ae2
diff --git a/metadata/md5-cache/dev-python/nevow-0.14.3 b/metadata/md5-cache/dev-python/nevow-0.14.3
index 0713352c67a3..dc763a8da0a5 100644
--- a/metadata/md5-cache/dev-python/nevow-0.14.3
+++ b/metadata/md5-cache/dev-python/nevow-0.14.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/N/Nevow/Nevow-0.14.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f47edb1ae4ea6228f1b58bdb69e2a11
diff --git a/metadata/md5-cache/dev-python/nltk-3.2.3 b/metadata/md5-cache/dev-python/nltk-3.2.3
index 3dda5270dfdf..1528ce766610 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nltk/nltk-3.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e29999a6f8563499856c41446e00e05d
diff --git a/metadata/md5-cache/dev-python/nltk-3.2.5 b/metadata/md5-cache/dev-python/nltk-3.2.5
index eb7187b304fc..edf53abaedee 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nltk/nltk-3.2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c2e5ed77daafb44a321f36510f6b6f4
diff --git a/metadata/md5-cache/dev-python/nnpy-1.4.1 b/metadata/md5-cache/dev-python/nnpy-1.4.1
index e086382462f7..1208d1bc8a46 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ae07db250c0c2240b48b8ebaa1edd11
diff --git a/metadata/md5-cache/dev-python/nnpy-1.4.2 b/metadata/md5-cache/dev-python/nnpy-1.4.2
index 85253776a59f..0ab89ca6d20a 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c748dbda788bef269b83d7f878cbaed
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 2fe7a2bda621..4ddb48e83352 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.2.0
+++ b/metadata/md5-cache/dev-python/node-semver-0.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/node-semver/node-semver-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a41372d093bbdd22fbde6908f97864e
diff --git a/metadata/md5-cache/dev-python/node-semver-0.6.1 b/metadata/md5-cache/dev-python/node-semver-0.6.1
index 8ba9c0b8d43a..4181adffea46 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.6.1
+++ b/metadata/md5-cache/dev-python/node-semver-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/podhmo/python-semver/archive/0.6.1.tar.gz -> node-semver-0.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a7076468932bb37826753c9ae4a6d0e2
diff --git a/metadata/md5-cache/dev-python/node-semver-0.7.0 b/metadata/md5-cache/dev-python/node-semver-0.7.0
index 7f281a23b879..9304a5e04064 100644
--- a/metadata/md5-cache/dev-python/node-semver-0.7.0
+++ b/metadata/md5-cache/dev-python/node-semver-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/podhmo/python-semver/archive/0.7.0.tar.gz -> node-semver-0.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a7076468932bb37826753c9ae4a6d0e2
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.1.3-r1 b/metadata/md5-cache/dev-python/nodeenv-1.1.3-r1
index 066d24d70e4b..50086ca1c6c2 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.1.3-r1
+++ b/metadata/md5-cache/dev-python/nodeenv-1.1.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/nodeenv/nodeenv-1.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=657849a7a91f1353dd4a98805cca7d0d
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 df2db1078a49..bcf1a1a51b2d 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r3
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_pypy3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4b873d2cfa6ecadc3bb285e36117552
diff --git a/metadata/md5-cache/dev-python/nose-1.3.7-r4 b/metadata/md5-cache/dev-python/nose-1.3.7-r4
index d7cf2f78efc8..67cf008920a4 100644
--- a/metadata/md5-cache/dev-python/nose-1.3.7-r4
+++ b/metadata/md5-cache/dev-python/nose-1.3.7-r4
@@ -12,5 +12,5 @@ REQUIRED_USE=coverage? ( || ( python_targets_pypy3 python_targets_python2_7 pyth
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose/nose-1.3.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bddbc931e9532d127c47503bd7224e67
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 55cf24923171..32e9cab33692 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_pypy3(-)?,python_targets_python3_6(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-cover3/nose-cover3-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25e6a962dd831cda61ac2776b55ea0e8
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 9a09b08e9498..642a0f12abf5 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_pypy3(-)?,python_targets_python3_6(-)?,-p
 REQUIRED_USE=|| ( python_targets_pypy3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54c4bf8b1d89e4b10423cf48fda88dae
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 2fc374282937..72e912e546f7 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_pypy3(-)?,python_targets_python3_6(-)?,-p
 REQUIRED_USE=|| ( python_targets_pypy3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16ee8a08a07edb632d4b6c7dee6c42c7
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 3017026e7c63..ebc067903b3e 100644
--- a/metadata/md5-cache/dev-python/nose-exclude-0.5.0
+++ b/metadata/md5-cache/dev-python/nose-exclude-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,py
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-exclude/nose-exclude-0.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5efe47afe8a4d99e2a0d7010f44d2e00
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 dbc767e1f5c4..379aa865b830 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_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-parameterized/nose-parameterized-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb6747d044b59b5a6a0883568306de80
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 56274542fbfa..279755744409 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4134db0af190fd04f69207b4d7408cf
diff --git a/metadata/md5-cache/dev-python/nose-testconfig-0.10 b/metadata/md5-cache/dev-python/nose-testconfig-0.10
index c061079ad900..b92ec36096fe 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_python3_6? ( dev-lang/python:3.6 ) >=dev-
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose-testconfig/nose-testconfig-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e62bb8e3cff9e7c47603d775eec4d85e
diff --git a/metadata/md5-cache/dev-python/nose2-0.9.1-r1 b/metadata/md5-cache/dev-python/nose2-0.9.1-r1
index 2bf454413e80..62f18ced81b2 100644
--- a/metadata/md5-cache/dev-python/nose2-0.9.1-r1
+++ b/metadata/md5-cache/dev-python/nose2-0.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/coverage-4.4.1[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/nose-devs/nose2/archive/0.9.1.tar.gz -> nose2-0.9.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8a02108fe7d95ca92b90a1a99a042bc9
diff --git a/metadata/md5-cache/dev-python/nose_fixes-1.3 b/metadata/md5-cache/dev-python/nose_fixes-1.3
index 01b04cef88b0..9f20ad456971 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_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_fixes/nose_fixes-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab833dfa9692596b8b0ac3ea9d696a29
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 6b893a1b1320..691d6da689ef 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nose_warnings_filters/nose_warnings_filters-0.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ffca04eaec8f940574887df1e8f113f
diff --git a/metadata/md5-cache/dev-python/nosehtmloutput-0.0.5 b/metadata/md5-cache/dev-python/nosehtmloutput-0.0.5
index f125986396f3..fa1a3b5daf5a 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_python3_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nosehtmloutput/nosehtmloutput-0.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f538ec8cff48c7fa84a0371a0531de1
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.10 b/metadata/md5-cache/dev-python/nosexcover-1.0.10
index decdef41f487..f57bd79067e5 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nosexcover/nosexcover-1.0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eec8d26877c4da5d99f5d0508f1aa7a3
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.11 b/metadata/md5-cache/dev-python/nosexcover-1.0.11
index ebd81e16ef93..59d4126eca1c 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_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nosexcover/nosexcover-1.0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f9e7d2a52f4df7160362494aa9cfc29
diff --git a/metadata/md5-cache/dev-python/nosexcover-1.0.11-r1 b/metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
index 2d911d033258..65c3c9d5b26b 100644
--- a/metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
+++ b/metadata/md5-cache/dev-python/nosexcover-1.0.11-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nosexcover/nosexcover-1.0.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c39d9071899efdbac5d4217d1d774ec1
diff --git a/metadata/md5-cache/dev-python/notebook-5.0.0 b/metadata/md5-cache/dev-python/notebook-5.0.0
index 011c728b559d..d0f6a07c0393 100644
--- a/metadata/md5-cache/dev-python/notebook-5.0.0
+++ b/metadata/md5-cache/dev-python/notebook-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c86daed1e17c4b279e02724df7127658
diff --git a/metadata/md5-cache/dev-python/notebook-5.2.1 b/metadata/md5-cache/dev-python/notebook-5.2.1
index e870b51b0d7e..d1a6805e7bdb 100644
--- a/metadata/md5-cache/dev-python/notebook-5.2.1
+++ b/metadata/md5-cache/dev-python/notebook-5.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b539cfd54c8ed62bc4a237ac4aa124ac
diff --git a/metadata/md5-cache/dev-python/notebook-5.7.0 b/metadata/md5-cache/dev-python/notebook-5.7.0
index 07584e029039..8209c9e4ec90 100644
--- a/metadata/md5-cache/dev-python/notebook-5.7.0
+++ b/metadata/md5-cache/dev-python/notebook-5.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4cad93d1c44f56f1591e24c379a847d
diff --git a/metadata/md5-cache/dev-python/notebook-5.7.8 b/metadata/md5-cache/dev-python/notebook-5.7.8
index 6bdd94d4bdd8..554259045802 100644
--- a/metadata/md5-cache/dev-python/notebook-5.7.8
+++ b/metadata/md5-cache/dev-python/notebook-5.7.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notebook/notebook-5.7.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1739b2c7092d454d1e3f176568ad1607
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b35753cd2fb9e4ad216fa921b98379b4
diff --git a/metadata/md5-cache/dev-python/notify2-0.3 b/metadata/md5-cache/dev-python/notify2-0.3
index 7cc740e63e0b..10aba1f7aa0e 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3
+++ b/metadata/md5-cache/dev-python/notify2-0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notify2/notify2-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=daa36f17114582472ef350d1cd66dffa
diff --git a/metadata/md5-cache/dev-python/notify2-0.3.1 b/metadata/md5-cache/dev-python/notify2-0.3.1
index 88ab9a788363..0ebe52d46de9 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3.1
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notify2/notify2-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67ddb2867461feced2e81090e8e5548a
diff --git a/metadata/md5-cache/dev-python/notify2-0.3.1-r1 b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
index 44b5e9757ca6..c290fa883be6 100644
--- a/metadata/md5-cache/dev-python/notify2-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/notify2-0.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/notify2/notify2-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1701a0412eaf740ae65b10eff1def40a
diff --git a/metadata/md5-cache/dev-python/nototools-0_pre20200113 b/metadata/md5-cache/dev-python/nototools-0_pre20200113
index 00d7018e8a7b..21289945f2a5 100644
--- a/metadata/md5-cache/dev-python/nototools-0_pre20200113
+++ b/metadata/md5-cache/dev-python/nototools-0_pre20200113
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/scour >=dev-python/booleanOperations-0.7.0[python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/googlei18n/nototools/archive/9c4375f07c9adc00c700c5d252df6a25d7425870.tar.gz#/nototools-9c4375f07c9adc00c700c5d252df6a25d7425870.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=33007866c60d98bff670bb2f74c09e8d
diff --git a/metadata/md5-cache/dev-python/nototools-0_pre20200207 b/metadata/md5-cache/dev-python/nototools-0_pre20200207
new file mode 100644
index 000000000000..899d9c73a1b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nototools-0_pre20200207
@@ -0,0 +1,14 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Noto fonts support tools and scripts plus web site generation
+EAPI=7
+HOMEPAGE=https://github.com/googlei18n/nototools
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 OFL-1.1
+RDEPEND=media-gfx/scour >=dev-python/booleanOperations-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defcon-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fonttools-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pillow-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyclipper-1.0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-typing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/googlei18n/nototools/archive/9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz#/nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9ed1d8d46eed5adcb34252aaa16553e8
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 586d7af8e73a..d69d6f4b0a4b 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_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c78f34f7ff22589cceb09f64f47e37ed
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 aae9c7f8f9d9..98270c79c53e 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_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c78f34f7ff22589cceb09f64f47e37ed
diff --git a/metadata/md5-cache/dev-python/ntlm-auth-1.3.0 b/metadata/md5-cache/dev-python/ntlm-auth-1.3.0
index 3fbdb5e12e37..902d97838550 100644
--- a/metadata/md5-cache/dev-python/ntlm-auth-1.3.0
+++ b/metadata/md5-cache/dev-python/ntlm-auth-1.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/jborean93/ntlm-auth/archive/v1.3.0.tar.gz -> ntlm-auth-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d3c0b9a2d5fb60550512295d4de72e76
diff --git a/metadata/md5-cache/dev-python/ntlm-auth-1.4.0-r1 b/metadata/md5-cache/dev-python/ntlm-auth-1.4.0-r1
index 057de01ec5ce..02669fb750fa 100644
--- a/metadata/md5-cache/dev-python/ntlm-auth-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/ntlm-auth-1.4.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/jborean93/ntlm-auth/archive/v1.4.0.tar.gz -> ntlm-auth-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d3c0b9a2d5fb60550512295d4de72e76
diff --git a/metadata/md5-cache/dev-python/ntplib-0.3.3 b/metadata/md5-cache/dev-python/ntplib-0.3.3
index 281846ea915d..871ba5632e32 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/n/ntplib/ntplib-0.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57309e5f44af6662be7246d1dc246dd0
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.4 b/metadata/md5-cache/dev-python/nuitka-0.6.4
index 9ca4e2fbc10f..d46119ff595d 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.4
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e7a486f7174a5e19d61ee84a56d37ad0
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.5 b/metadata/md5-cache/dev-python/nuitka-0.6.5
index 72ebed4ebd7a..e1249ff79d52 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.5
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fc18bbc971be2754b0c805ce2490f82e
diff --git a/metadata/md5-cache/dev-python/nuitka-0.6.6 b/metadata/md5-cache/dev-python/nuitka-0.6.6
index 42ddfce0ac6f..5468ddae326d 100644
--- a/metadata/md5-cache/dev-python/nuitka-0.6.6
+++ b/metadata/md5-cache/dev-python/nuitka-0.6.6
@@ -10,5 +10,5 @@ RDEPEND=dev-util/scons[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://nuitka.net/releases/Nuitka-0.6.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d852a04014acf179eef244647633b12d
diff --git a/metadata/md5-cache/dev-python/numba-0.37.0 b/metadata/md5-cache/dev-python/numba-0.37.0
index 56226b8be7d2..122b159104c3 100644
--- a/metadata/md5-cache/dev-python/numba-0.37.0
+++ b/metadata/md5-cache/dev-python/numba-0.37.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/numba/numba/archive/0.37.0.tar.gz -> numba-0.37.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=580cfa3d93960f047c441b65bae83151
diff --git a/metadata/md5-cache/dev-python/numba-0.39.0 b/metadata/md5-cache/dev-python/numba-0.39.0
index f9be15e37bc1..44856109168b 100644
--- a/metadata/md5-cache/dev-python/numba-0.39.0
+++ b/metadata/md5-cache/dev-python/numba-0.39.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/numba/numba/archive/0.39.0.tar.gz -> numba-0.39.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3b65ef3f3cd79ff2e32a1f0dae33b26
diff --git a/metadata/md5-cache/dev-python/numexpr-2.6.8 b/metadata/md5-cache/dev-python/numexpr-2.6.8
index 38c6e7ad2082..10f556b61f45 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.6.8
+++ b/metadata/md5-cache/dev-python/numexpr-2.6.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numexpr/numexpr-2.6.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3fc42136e8422bea7d009100e2cdc3fe
diff --git a/metadata/md5-cache/dev-python/numexpr-2.6.9 b/metadata/md5-cache/dev-python/numexpr-2.6.9
index 2b910bd5a6e1..feb525f4fad3 100644
--- a/metadata/md5-cache/dev-python/numexpr-2.6.9
+++ b/metadata/md5-cache/dev-python/numexpr-2.6.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/numpy-1.6[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/n/numexpr/numexpr-2.6.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a961d81b42ad08b9efc910506efccd5
diff --git a/metadata/md5-cache/dev-python/numpy-1.14.5 b/metadata/md5-cache/dev-python/numpy-1.14.5
index 2fa24b446a1f..730f4c9d07ef 100644
--- a/metadata/md5-cache/dev-python/numpy-1.14.5
+++ b/metadata/md5-cache/dev-python/numpy-1.14.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1849f935b77d67a4827947234e0a5215
diff --git a/metadata/md5-cache/dev-python/numpy-1.15.4 b/metadata/md5-cache/dev-python/numpy-1.15.4
index faf50b38125e..c0e7e8fa67fd 100644
--- a/metadata/md5-cache/dev-python/numpy-1.15.4
+++ b/metadata/md5-cache/dev-python/numpy-1.15.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.15.4.zip doc? ( http://docs.scipy.org/doc/numpy-1.15.4/numpy-html-1.15.4.zip http://docs.scipy.org/doc/numpy-1.15.4/numpy-ref-1.15.4.pdf http://docs.scipy.org/doc/numpy-1.15.4/numpy-user-1.15.4.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b131229e8a148d97f9437b68a1ffd1b9
diff --git a/metadata/md5-cache/dev-python/numpy-1.16.1 b/metadata/md5-cache/dev-python/numpy-1.16.1
index 3db564bc37f3..40517c89ba35 100644
--- a/metadata/md5-cache/dev-python/numpy-1.16.1
+++ b/metadata/md5-cache/dev-python/numpy-1.16.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.16.1.zip doc? ( https://docs.scipy.org/doc/numpy-1.16.1/numpy-html-1.16.1.zip https://docs.scipy.org/doc/numpy-1.16.1/numpy-ref-1.16.1.pdf https://docs.scipy.org/doc/numpy-1.16.1/numpy-user-1.16.1.pdf )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5f756a3520bded3fc98ad31b47841764
diff --git a/metadata/md5-cache/dev-python/numpy-1.16.5 b/metadata/md5-cache/dev-python/numpy-1.16.5
index 6f5fe7fb1773..8e56bdfc663d 100644
--- a/metadata/md5-cache/dev-python/numpy-1.16.5
+++ b/metadata/md5-cache/dev-python/numpy-1.16.5
@@ -5,12 +5,12 @@ DESCRIPTION=Fast array and numerical python library
 EAPI=7
 HOMEPAGE=https://www.numpy.org
 IUSE=doc lapack test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=lapack? ( virtual/cblas virtual/lapack ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] lapack? ( virtual/fortran )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.16.5.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=17147279b04f356d44bc600add37e515
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=293bf57c2571e76e7639a666de566aa2
diff --git a/metadata/md5-cache/dev-python/numpy-1.17.4-r2 b/metadata/md5-cache/dev-python/numpy-1.17.4-r2
index f127477388f8..c62d907324b3 100644
--- a/metadata/md5-cache/dev-python/numpy-1.17.4-r2
+++ b/metadata/md5-cache/dev-python/numpy-1.17.4-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.17.4.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91ce8a8ab5df5ecdfd10359aa923b896
diff --git a/metadata/md5-cache/dev-python/numpy-python2-1.16.5 b/metadata/md5-cache/dev-python/numpy-python2-1.16.5
index b67a3b09eb87..9bc2580c113c 100644
--- a/metadata/md5-cache/dev-python/numpy-python2-1.16.5
+++ b/metadata/md5-cache/dev-python/numpy-python2-1.16.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpy/numpy-1.16.5.zip doc? ( https://numpy.org/doc/1.16/numpy-html.zip -> numpy-html-1.16.4.zip https://numpy.org/doc/1.16/numpy-ref.pdf -> numpy-ref-1.16.4.pdf https://numpy.org/doc/1.16/numpy-user.pdf -> numpy-user-1.16.4.pdf )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8611aaa847b4e64e10b3892690b40697
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.6.0 b/metadata/md5-cache/dev-python/numpydoc-0.6.0
index 297f22fa6604..22d4f4dab81c 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.6.0
+++ b/metadata/md5-cache/dev-python/numpydoc-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bad824f184269a9ec59bda8dec73fe3
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.8.0 b/metadata/md5-cache/dev-python/numpydoc-0.8.0
index 8e818a78fcd4..10b21b89204c 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.8.0
+++ b/metadata/md5-cache/dev-python/numpydoc-0.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=88594e3eb6e3b92076191c4782950a0d
diff --git a/metadata/md5-cache/dev-python/numpydoc-0.9.1 b/metadata/md5-cache/dev-python/numpydoc-0.9.1
index c07b4e0a4633..21c691b6c896 100644
--- a/metadata/md5-cache/dev-python/numpydoc-0.9.1
+++ b/metadata/md5-cache/dev-python/numpydoc-0.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/numpydoc/numpydoc-0.9.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6c79759089fc626c949fcd0347e85073
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 a2530eec9b32..f0815e3147db 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_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/oauth/oauth-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e132a86ab1886eb7ac5a16be717a181f
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 86b86a6c8073..ee2ffcb1cc02 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauth2/oauth2-1.9.0.post1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=453b50d664f340afb1344b31e2067079
diff --git a/metadata/md5-cache/dev-python/oauth2client-2.0.1 b/metadata/md5-cache/dev-python/oauth2client-2.0.1
index d96e602739bd..eed9425a77a7 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_python3_6 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d82e843c57823c6e543ba17b3ead9b0
diff --git a/metadata/md5-cache/dev-python/oauth2client-2.2.0 b/metadata/md5-cache/dev-python/oauth2client-2.2.0
index 880aca80e5fb..909525ff1c5c 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_python3_6 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=45aca6b26ff4dbfae9af4de4d41cf6db
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.2 b/metadata/md5-cache/dev-python/oauth2client-4.1.2
index c7a075f1a8d2..ee3d536f751c 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.2
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v4.1.2.tar.gz -> oauth2client-4.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17738235e20955b111a6edcaeeaa3306
diff --git a/metadata/md5-cache/dev-python/oauth2client-4.1.3 b/metadata/md5-cache/dev-python/oauth2client-4.1.3
index 1c2c93cc63b2..10517ed80175 100644
--- a/metadata/md5-cache/dev-python/oauth2client-4.1.3
+++ b/metadata/md5-cache/dev-python/oauth2client-4.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( pytho
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v4.1.3.tar.gz -> oauth2client-4.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0db85adf999244a9fa1ed703fb17b8b3
diff --git a/metadata/md5-cache/dev-python/oauthlib-1.0.3 b/metadata/md5-cache/dev-python/oauthlib-1.0.3
index dab77a10354c..419a121e4feb 100644
--- a/metadata/md5-cache/dev-python/oauthlib-1.0.3
+++ b/metadata/md5-cache/dev-python/oauthlib-1.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-1.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b84f8d23bee51e1ec04b776c81950bac
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.2 b/metadata/md5-cache/dev-python/oauthlib-2.0.2
index 568f78e37280..d336e68b6e32 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.2
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-2.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe9a28815e2ba7b2e970d5a2edb255ab
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.3 b/metadata/md5-cache/dev-python/oauthlib-2.0.3
index eb0f055d906d..5c58a252b82d 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.3
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf414d9c5c5a8cf232cb7852e836cc4c
diff --git a/metadata/md5-cache/dev-python/oauthlib-2.0.6 b/metadata/md5-cache/dev-python/oauthlib-2.0.6
index 38dd7741792b..e9a9047e42b6 100644
--- a/metadata/md5-cache/dev-python/oauthlib-2.0.6
+++ b/metadata/md5-cache/dev-python/oauthlib-2.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-2.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=91add3cf23661aa4ae1cd8d0904aa226
diff --git a/metadata/md5-cache/dev-python/oauthlib-3.0.1 b/metadata/md5-cache/dev-python/oauthlib-3.0.1
index 48871ef07d2d..77bde82a1351 100644
--- a/metadata/md5-cache/dev-python/oauthlib-3.0.1
+++ b/metadata/md5-cache/dev-python/oauthlib-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oauthlib/oauthlib-3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc5eec6cd0ee7d8acecc05a7da30afca
diff --git a/metadata/md5-cache/dev-python/objgraph-3.1.0 b/metadata/md5-cache/dev-python/objgraph-3.1.0
index 79e485aa9ebb..0f2e98afa568 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_python3_6? ( dev-lang/python:3.6 ) >=d
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6600bd6301d94498b8051741972c0cd
diff --git a/metadata/md5-cache/dev-python/objgraph-3.4.0 b/metadata/md5-cache/dev-python/objgraph-3.4.0
index e527fc82fca4..056d47cf99d8 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.4.0
+++ b/metadata/md5-cache/dev-python/objgraph-3.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/objgraph/objgraph-3.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=58521127ae0dbd217218e16d66e99116
diff --git a/metadata/md5-cache/dev-python/oct2py-3.6.0 b/metadata/md5-cache/dev-python/oct2py-3.6.0
index 689d4024df1b..f7ddf297a597 100644
--- a/metadata/md5-cache/dev-python/oct2py-3.6.0
+++ b/metadata/md5-cache/dev-python/oct2py-3.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oct2py/oct2py-3.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23c963ba6e7a30f15f6c638d87c04443
diff --git a/metadata/md5-cache/dev-python/oct2py-4.0.6 b/metadata/md5-cache/dev-python/oct2py-4.0.6
index 97154fa5be4f..bed226ab138e 100644
--- a/metadata/md5-cache/dev-python/oct2py-4.0.6
+++ b/metadata/md5-cache/dev-python/oct2py-4.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oct2py/oct2py-4.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2fe45d81e7a6e67f919d30814b79a30d
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 f9ce2f135afb..9c20ab1086f4 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/octave_kernel/octave_kernel-0.26.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a100dba3fd11bf3867969f1f74f1f1f8
diff --git a/metadata/md5-cache/dev-python/odfpy-1.3.6 b/metadata/md5-cache/dev-python/odfpy-1.3.6
index 445d059d2d66..d8e7efef253b 100644
--- a/metadata/md5-cache/dev-python/odfpy-1.3.6
+++ b/metadata/md5-cache/dev-python/odfpy-1.3.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/odfpy/odfpy-1.3.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0f5296d3938aca05908d95956c7faa3f
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 7d46809fd60e..8d809e82e0d0 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_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/odo/odo-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72dd5e37bdc4af0edfe54d2b9bb8ad00
diff --git a/metadata/md5-cache/dev-python/olefile-0.44 b/metadata/md5-cache/dev-python/olefile-0.44
index 12c4cb564bd4..ef8669c14d1c 100644
--- a/metadata/md5-cache/dev-python/olefile-0.44
+++ b/metadata/md5-cache/dev-python/olefile-0.44
@@ -10,5 +10,5 @@ RDEPEND=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/decalage2/olefile/releases/download/v0.44/olefile-0.44.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc80f3e286e27346d76ad504e64f3325
diff --git a/metadata/md5-cache/dev-python/olefile-0.46 b/metadata/md5-cache/dev-python/olefile-0.46
index f7e26823058f..e92740f34107 100644
--- a/metadata/md5-cache/dev-python/olefile-0.46
+++ b/metadata/md5-cache/dev-python/olefile-0.46
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/decalage2/olefile/archive/v0.46.tar.gz -> olefile-0.46.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3e31c985c47fb029c3a0628911cfb0d9
diff --git a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7 b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
index 260a61d050a1..aa600a8bfc1f 100644
--- a/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
+++ b/metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/onkyo-eiscp/onkyo-eiscp-1.2.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a839c7d923e090082503b46dc202c99a
diff --git a/metadata/md5-cache/dev-python/openpyxl-2.6.1 b/metadata/md5-cache/dev-python/openpyxl-2.6.1
index df804b595ff8..80a5583d39fd 100644
--- a/metadata/md5-cache/dev-python/openpyxl-2.6.1
+++ b/metadata/md5-cache/dev-python/openpyxl-2.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/openpyxl/openpyxl/get/2.6.1.tar.bz2 -> openpyxl-2.6.1.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ecd43088b03a00151b25c1766874c778
diff --git a/metadata/md5-cache/dev-python/openpyxl-2.6.2 b/metadata/md5-cache/dev-python/openpyxl-2.6.2
index aa9a968e6f72..98f062119dca 100644
--- a/metadata/md5-cache/dev-python/openpyxl-2.6.2
+++ b/metadata/md5-cache/dev-python/openpyxl-2.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/openpyxl/openpyxl/get/2.6.2.tar.bz2 -> openpyxl-2.6.2.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=a597a32809a4b4530639a1846e2626c2
diff --git a/metadata/md5-cache/dev-python/openpyxl-2.6.4 b/metadata/md5-cache/dev-python/openpyxl-2.6.4
index 67b776dba002..e88099706a05 100644
--- a/metadata/md5-cache/dev-python/openpyxl-2.6.4
+++ b/metadata/md5-cache/dev-python/openpyxl-2.6.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/openpyxl/openpyxl/get/2.6.4.tar.bz2 -> openpyxl-2.6.4.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=45088a5ff1751d20c658512ead4553dc
diff --git a/metadata/md5-cache/dev-python/openpyxl-3.0.0 b/metadata/md5-cache/dev-python/openpyxl-3.0.0
index ad6d168c991b..b07777f24112 100644
--- a/metadata/md5-cache/dev-python/openpyxl-3.0.0
+++ b/metadata/md5-cache/dev-python/openpyxl-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/openpyxl/openpyxl/get/3.0.0.tar.bz2 -> openpyxl-3.0.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=45088a5ff1751d20c658512ead4553dc
diff --git a/metadata/md5-cache/dev-python/openpyxl-9999 b/metadata/md5-cache/dev-python/openpyxl-9999
index 3929608d3129..1808bd32c8ce 100644
--- a/metadata/md5-cache/dev-python/openpyxl-9999
+++ b/metadata/md5-cache/dev-python/openpyxl-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/jdcal[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c640f70e502f59f4fadd317d6af1080c
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 999b977870a1..e158b213544c 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_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1df7e69e46978d5ba5961ff76beb8c7
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-1.16.1 b/metadata/md5-cache/dev-python/openstackdocstheme-1.16.1
index 24620e35b87c..42bf36ea5d91 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-1.16.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1dbb641f5a80cf7487bec19c39e26c54
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1 b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
index c368bc168e48..2b111bae41f2 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-1.18.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12aae797b16f28c1c0f7821b23938235
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.27.0 b/metadata/md5-cache/dev-python/openstacksdk-0.27.0
index 946826f76fb6..429ec3ce5b6b 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.27.0
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.27.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.27.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5113553d0088cdf3b322a6569c00fdc8
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.36.0 b/metadata/md5-cache/dev-python/openstacksdk-0.36.0
index 6f5c99b53b32..75f8056f12cf 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.36.0
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.36.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.36.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91832ab75b58bb0982d1da376f66bc31
diff --git a/metadata/md5-cache/dev-python/opt-einsum-3.0.1 b/metadata/md5-cache/dev-python/opt-einsum-3.0.1
index 08ddb309d2d4..c771a8efb17a 100644
--- a/metadata/md5-cache/dev-python/opt-einsum-3.0.1
+++ b/metadata/md5-cache/dev-python/opt-einsum-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/opt-einsum/opt_einsum-3.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eed1ba539665509b19ca4f65c0dc86b9
diff --git a/metadata/md5-cache/dev-python/ordered-set-3.1.1 b/metadata/md5-cache/dev-python/ordered-set-3.1.1
new file mode 100644
index 000000000000..87e55290a601
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ordered-set-3.1.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A mutable set that remembers the order of its entries
+EAPI=7
+HOMEPAGE=https://github.com/LuminosoInsight/ordered-set
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/o/ordered-set/ordered-set-3.1.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ebc13129b21a2675fa116ce8cbe85eb7
diff --git a/metadata/md5-cache/dev-python/ordereddict-1.1 b/metadata/md5-cache/dev-python/ordereddict-1.1
index 76ef81897e73..ed7f3b7bd4dd 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f18955eaff8b1b005eb278d8186c652
diff --git a/metadata/md5-cache/dev-python/os-brick-2.5.5 b/metadata/md5-cache/dev-python/os-brick-2.5.5
index 9d10ae58ec4a..e21fcf0af7e1 100644
--- a/metadata/md5-cache/dev-python/os-brick-2.5.5
+++ b/metadata/md5-cache/dev-python/os-brick-2.5.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-2.5.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd36e5f31b0943f2f6a0b872c90e5c59
diff --git a/metadata/md5-cache/dev-python/os-brick-2.8.2 b/metadata/md5-cache/dev-python/os-brick-2.8.2
index f1a962a8866c..0080de7cf3ec 100644
--- a/metadata/md5-cache/dev-python/os-brick-2.8.2
+++ b/metadata/md5-cache/dev-python/os-brick-2.8.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-brick/os-brick-2.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bd52b965e0376166b8f0602ca372fcb5
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 6feda12b2e0e..2c4d06ec86b7 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_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.29.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d62b0637d7704cb131f50c94122c591b
diff --git a/metadata/md5-cache/dev-python/os-client-config-1.32.0 b/metadata/md5-cache/dev-python/os-client-config-1.32.0
index 4fb303ec0b73..ff92f7cf64e2 100644
--- a/metadata/md5-cache/dev-python/os-client-config-1.32.0
+++ b/metadata/md5-cache/dev-python/os-client-config-1.32.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-1.32.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8214d2fc282d0e6a80d8877f2adae4f3
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 0e56500e8015..1ffd6ec9c469 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
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python3_6(-)?,pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cf5dba7d488109c3f4b5831c3d28347f
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 98cac95da710..806f6b73dcba 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
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/python-novaclient-2.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d0293d31e4ebb5e81575c4e8af07c4e9
diff --git a/metadata/md5-cache/dev-python/os-ken-0.3.1 b/metadata/md5-cache/dev-python/os-ken-0.3.1
index b891d07703bf..d1a73d88f263 100644
--- a/metadata/md5-cache/dev-python/os-ken-0.3.1
+++ b/metadata/md5-cache/dev-python/os-ken-0.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-ken/os-ken-0.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=601dcf27fea06adbe5f962ba678163ea
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 4031198b19cb..4835b581cd06 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_python3_6(-)?,-pytho
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb89197b5707fb31ce9f39f5c4eb03b1
diff --git a/metadata/md5-cache/dev-python/os-resource-classes-0.3.0 b/metadata/md5-cache/dev-python/os-resource-classes-0.3.0
index b40aa3fa18ae..02ff488dbe25 100644
--- a/metadata/md5-cache/dev-python/os-resource-classes-0.3.0
+++ b/metadata/md5-cache/dev-python/os-resource-classes-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-resource-classes/os-resource-classes-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=961528d68a6cb74255bb9c8d2c6c04a1
diff --git a/metadata/md5-cache/dev-python/os-resource-classes-0.5.0 b/metadata/md5-cache/dev-python/os-resource-classes-0.5.0
index 2b09a89c2a7e..59f4a55b46da 100644
--- a/metadata/md5-cache/dev-python/os-resource-classes-0.5.0
+++ b/metadata/md5-cache/dev-python/os-resource-classes-0.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-resource-classes/os-resource-classes-0.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=961528d68a6cb74255bb9c8d2c6c04a1
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 a8fbad56a017..7e67c7ec5452 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_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb0a90760069640954d0ce19140c7839
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.6.0 b/metadata/md5-cache/dev-python/os-service-types-1.6.0
index 2febb78c0015..cdc5d40af083 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.6.0
+++ b/metadata/md5-cache/dev-python/os-service-types-1.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-1.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=24df9d0efc1446bebff59c658dc515c9
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.7.0 b/metadata/md5-cache/dev-python/os-service-types-1.7.0
index 051437e32c8a..92d4e925ccbe 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.7.0
+++ b/metadata/md5-cache/dev-python/os-service-types-1.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=39af084f2d9bbc982eb4cf885cd17159
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 1374f2b72c8c..09f24a5a9e9b 100644
--- a/metadata/md5-cache/dev-python/os-testr-1.0.0
+++ b/metadata/md5-cache/dev-python/os-testr-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-testr/os-testr-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f893531ffe06183674305f21ac91e501
diff --git a/metadata/md5-cache/dev-python/os-traits-0.11.0 b/metadata/md5-cache/dev-python/os-traits-0.11.0
index 091a735cc716..50e8549b7ecd 100644
--- a/metadata/md5-cache/dev-python/os-traits-0.11.0
+++ b/metadata/md5-cache/dev-python/os-traits-0.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-traits/os-traits-0.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a2b3294d770f0b63123313f2492b144
diff --git a/metadata/md5-cache/dev-python/os-traits-0.16.0 b/metadata/md5-cache/dev-python/os-traits-0.16.0
index 4b9dee7935f1..5523711ef7be 100644
--- a/metadata/md5-cache/dev-python/os-traits-0.16.0
+++ b/metadata/md5-cache/dev-python/os-traits-0.16.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-traits/os-traits-0.16.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a2b3294d770f0b63123313f2492b144
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 9a2677c30aee..b6c9e64b7aea 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-traits/os-traits-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db951fdbe4366f12faa84a90792aa141
diff --git a/metadata/md5-cache/dev-python/os-vif-1.15.2 b/metadata/md5-cache/dev-python/os-vif-1.15.2
index 22306f575c15..d441beb33eeb 100644
--- a/metadata/md5-cache/dev-python/os-vif-1.15.2
+++ b/metadata/md5-cache/dev-python/os-vif-1.15.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-vif/os_vif-1.15.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2649c7f0b0931f0114afc68099009d49
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 cdc957190404..cbdf63a795a5 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-vif/os_vif-1.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a30014bf5c510b6a1bef2edc57ecb57e
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 da6ac5b874fe..a6eaea4dd5c9 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_python3_6(-)?,-pytho
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92aedaa688cf50550770ef110610cf75
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 6dace3a1d3a5..77a4e87fbfcb 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-win/os-win-3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2df94efac3c01d872977ed7c27b23f11
diff --git a/metadata/md5-cache/dev-python/os-win-4.2.0 b/metadata/md5-cache/dev-python/os-win-4.2.0
index 023e1a143416..6c717d73a6ed 100644
--- a/metadata/md5-cache/dev-python/os-win-4.2.0
+++ b/metadata/md5-cache/dev-python/os-win-4.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-win/os-win-4.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=54976aeab33733d03899131de957ddbf
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 4af3d4f26ffb..94b6f2f38cb9 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-xenapi/os-xenapi-0.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1073e82fdf29a3561e9e36ee9c20a212
diff --git a/metadata/md5-cache/dev-python/os-xenapi-0.3.4 b/metadata/md5-cache/dev-python/os-xenapi-0.3.4
index eda3053ae067..13ff2559fd31 100644
--- a/metadata/md5-cache/dev-python/os-xenapi-0.3.4
+++ b/metadata/md5-cache/dev-python/os-xenapi-0.3.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-xenapi/os-xenapi-0.3.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=332d492c7f861e0541fa264d6fe86892
diff --git a/metadata/md5-cache/dev-python/osc-lib-1.12.1 b/metadata/md5-cache/dev-python/osc-lib-1.12.1
index e72a86dd8df1..213506ce7443 100644
--- a/metadata/md5-cache/dev-python/osc-lib-1.12.1
+++ b/metadata/md5-cache/dev-python/osc-lib-1.12.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-lib/osc-lib-1.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0ee1ecfd608522d1ffd45917e47fb022
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 3acdddc185a7..fc39903169d8 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-placement/osc-placement-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a5aa96ce057c1aabd10349f1aa4a514
diff --git a/metadata/md5-cache/dev-python/oslo-cache-1.33.2-r1 b/metadata/md5-cache/dev-python/oslo-cache-1.33.2-r1
index 7eb903bc80df..62e6ee527529 100644
--- a/metadata/md5-cache/dev-python/oslo-cache-1.33.2-r1
+++ b/metadata/md5-cache/dev-python/oslo-cache-1.33.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.cache/oslo.cache-1.33.2.tar.gz -> oslo-cache-1.33.2.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/patches/bug-681012.patch
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea5e8c8958ecc8be9f7542efffafcdcf
diff --git a/metadata/md5-cache/dev-python/oslo-cache-1.33.3 b/metadata/md5-cache/dev-python/oslo-cache-1.33.3
index c7a64ec4f8be..7de8203636d3 100644
--- a/metadata/md5-cache/dev-python/oslo-cache-1.33.3
+++ b/metadata/md5-cache/dev-python/oslo-cache-1.33.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.cache/oslo.cache-1.33.3.tar.gz -> oslo-cache-1.33.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=555b34d95273ba7546574e655f2e3b79
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 25412657cf76..6b7675b94f9a 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-3.27.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.27.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a958bee4df8741acc17104e04de50103
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-3.29.1 b/metadata/md5-cache/dev-python/oslo-concurrency-3.29.1
index f15fba11003a..c56e980a21ea 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-3.29.1
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-3.29.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-3.29.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=25c41759185d65acf207429f8934fbf4
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.11.2 b/metadata/md5-cache/dev-python/oslo-config-6.11.2
index 476519921e60..0abadf4da66d 100644
--- a/metadata/md5-cache/dev-python/oslo-config-6.11.2
+++ b/metadata/md5-cache/dev-python/oslo-config-6.11.2
@@ -5,11 +5,11 @@ DESCRIPTION=Oslo Configuration API
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-6.11.2.tar.gz -> oslo-config-6.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ec184d71d07ea5a85f0a1bc4a3d1f579
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=020e1e384a2b616c88f56faa32b30370
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.4.1 b/metadata/md5-cache/dev-python/oslo-config-6.4.1
deleted file mode 100644
index 1030949fdf06..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-6.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-mock-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Oslo Configuration API
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-6.4.1.tar.gz -> oslo-config-6.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ca8e93b8500f81111ae3e94c28bacf9
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.8.1 b/metadata/md5-cache/dev-python/oslo-config-6.8.1
deleted file mode 100644
index 4c01b5b199ba..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-6.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-mock-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Oslo Configuration API
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-6.8.1.tar.gz -> oslo-config-6.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0869a9ef7d186de3f3b7ce8ca0a517cb
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 8e76822027f7..c654bb1a886f 100644
--- a/metadata/md5-cache/dev-python/oslo-context-2.21.0
+++ b/metadata/md5-cache/dev-python/oslo-context-2.21.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-2.21.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a11b2a270a35dc821dc27b8614674eb2
diff --git a/metadata/md5-cache/dev-python/oslo-context-2.22.1 b/metadata/md5-cache/dev-python/oslo-context-2.22.1
index f931ca667067..d2825640ce64 100644
--- a/metadata/md5-cache/dev-python/oslo-context-2.22.1
+++ b/metadata/md5-cache/dev-python/oslo-context-2.22.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-2.22.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=216a00bbf9cf08590a47dc6f3b67040c
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 f8b06a3acea6..315529cbaa41 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.40.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8f97cae0ca41a7ef27baee05942c4e61
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.45.0 b/metadata/md5-cache/dev-python/oslo-db-4.45.0
index db8fcaff4e4f..d3c2958bf92b 100644
--- a/metadata/md5-cache/dev-python/oslo-db-4.45.0
+++ b/metadata/md5-cache/dev-python/oslo-db-4.45.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.45.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f2e7a4fbd69f959cbeb1f25765b755a3
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 6e2d0f616016..59b897c3a58d 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
+++ b/metadata/md5-cache/dev-python/oslo-i18n-3.19.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-3.19.0.tar.gz -> oslo-i18n-3.19.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15138a030f7f36115d9384ff105a84dc
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-3.23.1 b/metadata/md5-cache/dev-python/oslo-i18n-3.23.1
index be6fe7c400b9..c63fe82ac1d1 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-3.23.1
+++ b/metadata/md5-cache/dev-python/oslo-i18n-3.23.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-3.23.1.tar.gz -> oslo-i18n-3.23.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=131b7cc0fb22b7d204b9c851fb798109
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 a250771aba59..6e048851e643 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.39.2
+++ b/metadata/md5-cache/dev-python/oslo-log-3.39.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.39.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1970998f89310442e3953967722d94c0
diff --git a/metadata/md5-cache/dev-python/oslo-log-3.42.3 b/metadata/md5-cache/dev-python/oslo-log-3.42.3
index d6197c504a56..ddaee101f29f 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.42.3
+++ b/metadata/md5-cache/dev-python/oslo-log-3.42.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.42.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5be97e5230ba4412b3a54d9e4bfa92a3
diff --git a/metadata/md5-cache/dev-python/oslo-log-3.44.1 b/metadata/md5-cache/dev-python/oslo-log-3.44.1
index d39fb2dc342f..800709d5c677 100644
--- a/metadata/md5-cache/dev-python/oslo-log-3.44.1
+++ b/metadata/md5-cache/dev-python/oslo-log-3.44.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-3.44.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a98d9953c0019cab3f5413398eb9840e
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-10.2.0 b/metadata/md5-cache/dev-python/oslo-messaging-10.2.0
index 8909044b5759..ee5f76cb4baf 100644
--- a/metadata/md5-cache/dev-python/oslo-messaging-10.2.0
+++ b/metadata/md5-cache/dev-python/oslo-messaging-10.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-10.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=147d5f9977d090ac04faaf82c928a51d
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-8.1.2 b/metadata/md5-cache/dev-python/oslo-messaging-8.1.2
deleted file mode 100644
index 203689e93876..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-8.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=6
-HOMEPAGE=https://pypi.org/project/oslo.messaging/
-IUSE=python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/py-amqp-2.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/kombu-4.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/kombu-4.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pika-0.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pika-pool-0.1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[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
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-8.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d92850af64db36a3e296952875c18ab1
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-9.5.0 b/metadata/md5-cache/dev-python/oslo-messaging-9.5.0
deleted file mode 100644
index 140cf84bc5ae..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-9.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.messaging/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-amqp-2.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kombu-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/kombu-4.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-9.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fa9c06ab1b7a5af443417eba7aaee1b6
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-9.5.1 b/metadata/md5-cache/dev-python/oslo-messaging-9.5.1
deleted file mode 100644
index 8590b3a9da86..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-9.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.messaging/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-amqp-2.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kombu-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/kombu-4.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-9.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5ddf4302bc2bc46a7a0e6620842bbb36
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 0773376166ed..6b52e5e857ed 100644
--- a/metadata/md5-cache/dev-python/oslo-middleware-3.34.0
+++ b/metadata/md5-cache/dev-python/oslo-middleware-3.34.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-3.34.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93498826467708d9631ec8e1ce1a5a61
diff --git a/metadata/md5-cache/dev-python/oslo-middleware-3.37.1 b/metadata/md5-cache/dev-python/oslo-middleware-3.37.1
index 204ddfde7f8b..379a431dc685 100644
--- a/metadata/md5-cache/dev-python/oslo-middleware-3.37.1
+++ b/metadata/md5-cache/dev-python/oslo-middleware-3.37.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.middleware/oslo.middleware-3.37.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9713acbcb5610627f2bef8c7479c83ce
diff --git a/metadata/md5-cache/dev-python/oslo-policy-1.38.1 b/metadata/md5-cache/dev-python/oslo-policy-1.38.1
deleted file mode 100644
index 1d61d26e37d2..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-1.38.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Support for RBAC policy enforcement across all OpenStack services
-EAPI=6
-HOMEPAGE=https://pypi.org/project/oslo.policy/
-IUSE=python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[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
-SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-1.38.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f713589037068353c90cbc315331dfe4
diff --git a/metadata/md5-cache/dev-python/oslo-policy-2.1.1 b/metadata/md5-cache/dev-python/oslo-policy-2.1.1
deleted file mode 100644
index 25d1a8b7dcc6..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-2.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Support for RBAC policy enforcement across all OpenStack services
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.policy/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-2.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9fd2ee33e1f43efd16e4e11767dec866
diff --git a/metadata/md5-cache/dev-python/oslo-policy-2.3.2 b/metadata/md5-cache/dev-python/oslo-policy-2.3.2
deleted file mode 100644
index 507b8dc7d2ab..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-2.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Support for RBAC policy enforcement across all OpenStack services
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.policy/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-2.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9fd2ee33e1f43efd16e4e11767dec866
diff --git a/metadata/md5-cache/dev-python/oslo-policy-2.3.3 b/metadata/md5-cache/dev-python/oslo-policy-2.3.3
index 04acaf9d3409..3d88690f2aaa 100644
--- a/metadata/md5-cache/dev-python/oslo-policy-2.3.3
+++ b/metadata/md5-cache/dev-python/oslo-policy-2.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Support for RBAC policy enforcement across all OpenStack services
 EAPI=7
 HOMEPAGE=https://pypi.org/project/oslo.policy/
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-2.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9bf042400d9b5cb74f9e3119ce4f60f0
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9fd2ee33e1f43efd16e4e11767dec866
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 47e788d3a4e6..6f3717874065 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.29.2
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.29.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.29.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c5761c43640cf23791ea8717a604ae8
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.32.1 b/metadata/md5-cache/dev-python/oslo-privsep-1.32.1
index 86f06d0a40d0..ac0a51e87673 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.32.1
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.32.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.32.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6f0b15fced76aa95c989ecb0b0ee1a8e
diff --git a/metadata/md5-cache/dev-python/oslo-privsep-1.33.3 b/metadata/md5-cache/dev-python/oslo-privsep-1.33.3
index 359b9c8f5e25..194ac3332a95 100644
--- a/metadata/md5-cache/dev-python/oslo-privsep-1.33.3
+++ b/metadata/md5-cache/dev-python/oslo-privsep-1.33.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.privsep/oslo.privsep-1.33.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=35102f7559b56267cc3e861e2e85fe02
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 029c21fc9745..20e67ad03276 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-1.26.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f9c443d8d47431f7f695e1b25203e0de
diff --git a/metadata/md5-cache/dev-python/oslo-reports-1.29.2 b/metadata/md5-cache/dev-python/oslo-reports-1.29.2
index 7f37a0d4242a..ff932ad0c48c 100644
--- a/metadata/md5-cache/dev-python/oslo-reports-1.29.2
+++ b/metadata/md5-cache/dev-python/oslo-reports-1.29.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.reports/oslo.reports-1.29.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=14bcfb442b4bde2befb1ec04134f4389
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 a1a973d9b0a7..a6eaf8c37783 100644
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0
+++ b/metadata/md5-cache/dev-python/oslo-rootwrap-5.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-5.13.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0c154cb026a65023a995a401326b889
diff --git a/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2 b/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
index c3b2896e5da4..de2759ad9440 100644
--- a/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
+++ b/metadata/md5-cache/dev-python/oslo-rootwrap-5.15.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.rootwrap/oslo.rootwrap-5.15.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eeca0f9d9ee37b22f7d4193d54c5ed09
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 41ac81d48054..9ff2e3da88ad 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_python3_6 python_targets_python3_7 )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f59e947353251706ac1e41a783a268d
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-2.28.2 b/metadata/md5-cache/dev-python/oslo-serialization-2.28.2
index 029a7ab03e07..3ceba89f1c9c 100644
--- a/metadata/md5-cache/dev-python/oslo-serialization-2.28.2
+++ b/metadata/md5-cache/dev-python/oslo-serialization-2.28.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-2.28.2.tar.gz -> oslo-serialization-2.28.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e995a810dc2552dff782791482141c69
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.31.8 b/metadata/md5-cache/dev-python/oslo-service-1.31.8
index 9091fe9f5a5d..8f59711e041f 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.31.8
+++ b/metadata/md5-cache/dev-python/oslo-service-1.31.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.31.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e23a57e95e3e63f603e7b0d5b49dac0
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.38.0 b/metadata/md5-cache/dev-python/oslo-service-1.38.0
index d356cf083f70..8f799a7db564 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.38.0
+++ b/metadata/md5-cache/dev-python/oslo-service-1.38.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.38.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1224b0d5f48a83a08116994bf72ce7e0
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.40.2 b/metadata/md5-cache/dev-python/oslo-service-1.40.2
index 587dccf76f4f..d4fa9f9f3692 100644
--- a/metadata/md5-cache/dev-python/oslo-service-1.40.2
+++ b/metadata/md5-cache/dev-python/oslo-service-1.40.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.service/oslo.service-1.40.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a931a1aeb7373da3442fda90022c448b
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 419fd8978efb..649fa2b6ca01 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_python3_6(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslosphinx/oslosphinx-4.18.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2584e33027276c62618b8338907853c
diff --git a/metadata/md5-cache/dev-python/oslo-upgradecheck-0.2.1 b/metadata/md5-cache/dev-python/oslo-upgradecheck-0.2.1
index 7478d3b6b01b..7a19200b38e5 100644
--- a/metadata/md5-cache/dev-python/oslo-upgradecheck-0.2.1
+++ b/metadata/md5-cache/dev-python/oslo-upgradecheck-0.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.upgradecheck/oslo.upgradecheck-0.2.1.tar.gz -> oslo-upgradecheck-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f64bfadc0f834f52e25092c40041009c
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.41.3 b/metadata/md5-cache/dev-python/oslo-utils-3.41.3
deleted file mode 100644
index 1445b30c3123..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-3.41.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/eventlet-0.18.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.18.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ddt-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/bandit-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/sphinx-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Oslo Utility library
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-3.41.3.tar.gz -> oslo-utils-3.41.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=604427bdd2b5053ec8d2bd4532ff9a43
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.41.4 b/metadata/md5-cache/dev-python/oslo-utils-3.41.4
index f7f574268869..152191bc541d 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-3.41.4
+++ b/metadata/md5-cache/dev-python/oslo-utils-3.41.4
@@ -5,12 +5,12 @@ DESCRIPTION=Oslo Utility library
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-3.41.4.tar.gz -> oslo-utils-3.41.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ed91847ba0e6ea1733852654981d99d2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=604427bdd2b5053ec8d2bd4532ff9a43
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 306faf0e699f..ec08c2c8e8ed 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.33.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41bc4175a01d7340eaa484c3df367744
diff --git a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.35.1 b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.35.1
index fa5ed68d77ff..b77450e63452 100644
--- a/metadata/md5-cache/dev-python/oslo-versionedobjects-1.35.1
+++ b/metadata/md5-cache/dev-python/oslo-versionedobjects-1.35.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.versionedobjects/oslo.versionedobjects-1.35.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e570820ae5cf61dbb37ccbf14874a8e6
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 7fa4c82786ad..7874b2e13ea1 100644
--- a/metadata/md5-cache/dev-python/oslo-vmware-2.26.0
+++ b/metadata/md5-cache/dev-python/oslo-vmware-2.26.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.vmware/oslo.vmware-2.26.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=770099f5dfe88c00bee2a5ae2ebfddfa
diff --git a/metadata/md5-cache/dev-python/oslo-vmware-2.32.2 b/metadata/md5-cache/dev-python/oslo-vmware-2.32.2
index 08d095cde99a..e18576e18788 100644
--- a/metadata/md5-cache/dev-python/oslo-vmware-2.32.2
+++ b/metadata/md5-cache/dev-python/oslo-vmware-2.32.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.vmware/oslo.vmware-2.32.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=57391ef27b522990fd4ebb91c541abc2
diff --git a/metadata/md5-cache/dev-python/oslotest-3.2.0 b/metadata/md5-cache/dev-python/oslotest-3.2.0
index 1b0f5738a35d..767846cec158 100644
--- a/metadata/md5-cache/dev-python/oslotest-3.2.0
+++ b/metadata/md5-cache/dev-python/oslotest-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-3.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2a81daaa96eed0c67c0cc2bdd624595
diff --git a/metadata/md5-cache/dev-python/oslotest-3.7.1 b/metadata/md5-cache/dev-python/oslotest-3.7.1
index 39f8e6e01cbf..e701a2814817 100644
--- a/metadata/md5-cache/dev-python/oslotest-3.7.1
+++ b/metadata/md5-cache/dev-python/oslotest-3.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-3.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=31a57b903ea7f1446ba7af76168d2425
diff --git a/metadata/md5-cache/dev-python/osprofiler-2.6.0 b/metadata/md5-cache/dev-python/osprofiler-2.6.0
index 08eb5e72c55f..ae8ec60687b6 100644
--- a/metadata/md5-cache/dev-python/osprofiler-2.6.0
+++ b/metadata/md5-cache/dev-python/osprofiler-2.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/osprofiler/osprofiler-2.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e65cc9f69a3edc6287ec5b894ca92cc8
diff --git a/metadata/md5-cache/dev-python/ovs-2.10.0-r1 b/metadata/md5-cache/dev-python/ovs-2.10.0-r1
index 6c3be6b66a7e..39510f48c49b 100644
--- a/metadata/md5-cache/dev-python/ovs-2.10.0-r1
+++ b/metadata/md5-cache/dev-python/ovs-2.10.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9270657e9676c4faa8254b1ab31a2f0
diff --git a/metadata/md5-cache/dev-python/ovs-2.11.0 b/metadata/md5-cache/dev-python/ovs-2.11.0
index 1e4965705c31..ac0b9205dfac 100644
--- a/metadata/md5-cache/dev-python/ovs-2.11.0
+++ b/metadata/md5-cache/dev-python/ovs-2.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/sortedcontainers[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovs/ovs-2.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9270657e9676c4faa8254b1ab31a2f0
diff --git a/metadata/md5-cache/dev-python/ovsdbapp-0.12.2 b/metadata/md5-cache/dev-python/ovsdbapp-0.12.2
index bc382f348099..8e94108e6bb4 100644
--- a/metadata/md5-cache/dev-python/ovsdbapp-0.12.2
+++ b/metadata/md5-cache/dev-python/ovsdbapp-0.12.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovsdbapp/ovsdbapp-0.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a79315a5915c5cd5aede2cfd3012563b
diff --git a/metadata/md5-cache/dev-python/ovsdbapp-0.15.0 b/metadata/md5-cache/dev-python/ovsdbapp-0.15.0
index 9d12cb0b3f6c..698b12e38106 100644
--- a/metadata/md5-cache/dev-python/ovsdbapp-0.15.0
+++ b/metadata/md5-cache/dev-python/ovsdbapp-0.15.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/ovsdbapp/ovsdbapp-0.15.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c8f24207dd910e48b07a0f41369db278
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 9e43c71827c7..983842d54da5 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.16.0.tar.gz -> owslib-0.16.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3008f632f2ebab873b6fd9634c259f3d
diff --git a/metadata/md5-cache/dev-python/owslib-0.17.1 b/metadata/md5-cache/dev-python/owslib-0.17.1
index c582f3796f6a..3655b06b77ea 100644
--- a/metadata/md5-cache/dev-python/owslib-0.17.1
+++ b/metadata/md5-cache/dev-python/owslib-0.17.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.17.1.tar.gz -> owslib-0.17.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=19c9095031b7a88ff42f73050874e101
diff --git a/metadata/md5-cache/dev-python/owslib-0.17.1-r1 b/metadata/md5-cache/dev-python/owslib-0.17.1-r1
index 2e3ad8f257c5..ea0adcd9afcd 100644
--- a/metadata/md5-cache/dev-python/owslib-0.17.1-r1
+++ b/metadata/md5-cache/dev-python/owslib-0.17.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/geopython/owslib/archive/0.17.1.tar.gz -> owslib-0.17.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f0eeeb2f10d45bdefc116d7610d010ee
diff --git a/metadata/md5-cache/dev-python/packaging-16.8 b/metadata/md5-cache/dev-python/packaging-16.8
index 867687495e3e..f0b4918fb648 100644
--- a/metadata/md5-cache/dev-python/packaging-16.8
+++ b/metadata/md5-cache/dev-python/packaging-16.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-16.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7afea8d21496c0a9c6fe33c0ef9d1676
diff --git a/metadata/md5-cache/dev-python/packaging-19.2 b/metadata/md5-cache/dev-python/packaging-19.2
index ec43467d13df..e8b38c9303a9 100644
--- a/metadata/md5-cache/dev-python/packaging-19.2
+++ b/metadata/md5-cache/dev-python/packaging-19.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-19.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=47a023eb03d5c79bc354406b05068add
diff --git a/metadata/md5-cache/dev-python/packaging-20.0 b/metadata/md5-cache/dev-python/packaging-20.0
index 33bae27373f3..1afab35a225f 100644
--- a/metadata/md5-cache/dev-python/packaging-20.0
+++ b/metadata/md5-cache/dev-python/packaging-20.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-20.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bc908e63f5959f628c35dbb48954214c
diff --git a/metadata/md5-cache/dev-python/packaging-20.1 b/metadata/md5-cache/dev-python/packaging-20.1
index acfacdc703f5..52692a78327c 100644
--- a/metadata/md5-cache/dev-python/packaging-20.1
+++ b/metadata/md5-cache/dev-python/packaging-20.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/packaging/packaging-20.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bc908e63f5959f628c35dbb48954214c
diff --git a/metadata/md5-cache/dev-python/pafy-0.5.5 b/metadata/md5-cache/dev-python/pafy-0.5.5
index eaa0e6a2e1cd..126240a03eaf 100644
--- a/metadata/md5-cache/dev-python/pafy-0.5.5
+++ b/metadata/md5-cache/dev-python/pafy-0.5.5
@@ -10,5 +10,5 @@ RDEPEND=net-misc/youtube-dl[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pafy/pafy-0.5.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e9cc2645bd4852cfd55f429223839aca
diff --git a/metadata/md5-cache/dev-python/pafy-9999 b/metadata/md5-cache/dev-python/pafy-9999
index 39215ce7b11c..32e46078d4f0 100644
--- a/metadata/md5-cache/dev-python/pafy-9999
+++ b/metadata/md5-cache/dev-python/pafy-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=net-misc/youtube-dl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e9cc2645bd4852cfd55f429223839aca
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.4.0 b/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
index c1514d7bf2e4..14d288d27958 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/eclipse/paho.mqtt.python/archive/v1.4.0.tar.gz -> paho-mqtt-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad5ac0088c4e4099c5c3b9bacd3cbf23
diff --git a/metadata/md5-cache/dev-python/paho-mqtt-1.5.0 b/metadata/md5-cache/dev-python/paho-mqtt-1.5.0
index 4c66c7c66feb..87ab476db6c1 100644
--- a/metadata/md5-cache/dev-python/paho-mqtt-1.5.0
+++ b/metadata/md5-cache/dev-python/paho-mqtt-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eclipse/paho.mqtt.python/archive/v1.5.0.tar.gz -> paho-mqtt-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c434d58b2a6a623f6a076905bfc5dde5
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 cef2bcbde9cb..6352aefbfe0a 100644
--- a/metadata/md5-cache/dev-python/paisley-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/paisley-0.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/paisley/paisley-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ea3566c9d0ff014fffff009cb92fc96
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
index 6f7d4ab84606..98ed4f2ed2bc 100644
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/jinja[python_targets_pypy3(-)?,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pallets/pallets-sphinx-themes/archive/1.1.2.tar.gz -> pallets-sphinx-themes-1.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=67de1a80637ffba56fdda0735e69a4d9
diff --git a/metadata/md5-cache/dev-python/pandas-0.24.2 b/metadata/md5-cache/dev-python/pandas-0.24.2
index 6dc610238f87..e73f4b1b8b80 100644
--- a/metadata/md5-cache/dev-python/pandas-0.24.2
+++ b/metadata/md5-cache/dev-python/pandas-0.24.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-0.24.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=67e0878f07aeaa2592411a2b9c355ef8
diff --git a/metadata/md5-cache/dev-python/pandas-9999 b/metadata/md5-cache/dev-python/pandas-9999
index 13ba1b00ee76..0733036eaad9 100644
--- a/metadata/md5-cache/dev-python/pandas-9999
+++ b/metadata/md5-cache/dev-python/pandas-9999
@@ -10,5 +10,5 @@ RDEPEND=>dev-python/numpy-1.7[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d167e38c9e37cf77420e7705179dd8c
diff --git a/metadata/md5-cache/dev-python/pandas-datareader-0.7.0 b/metadata/md5-cache/dev-python/pandas-datareader-0.7.0
index 42b37eb8d4d3..875628177390 100644
--- a/metadata/md5-cache/dev-python/pandas-datareader-0.7.0
+++ b/metadata/md5-cache/dev-python/pandas-datareader-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d4e8609d506f460bc728c0a5ed88af54
diff --git a/metadata/md5-cache/dev-python/pandas-datareader-0.8.1 b/metadata/md5-cache/dev-python/pandas-datareader-0.8.1
index 26bd5d2f1e2f..10281825be53 100644
--- a/metadata/md5-cache/dev-python/pandas-datareader-0.8.1
+++ b/metadata/md5-cache/dev-python/pandas-datareader-0.8.1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandas-0.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pandas-0.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pandas DataFrame extraction from a wide range of Internet sources
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydata/pandas-datareader/archive/v0.8.1.tar.gz -> pandas-datareader-0.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f98c034ce5060102a3148479ba90822b
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 853dd2bab14c..1d5e98e1052f 100644
--- a/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
+++ b/metadata/md5-cache/dev-python/pandocfilters-1.4.2-r1
@@ -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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Utilities for writing pandoc filters in python
 EAPI=6
 HOMEPAGE=https://github.com/jgm/pandocfilters
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandocfilters/pandocfilters-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd33bc6fc892ff5521b343baa4e90d50
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=457c5f90adc66e99efe989c78bb26155
diff --git a/metadata/md5-cache/dev-python/parameterized-0.7.0 b/metadata/md5-cache/dev-python/parameterized-0.7.0
index d06114b8e2a9..bf64df6e1a0a 100644
--- a/metadata/md5-cache/dev-python/parameterized-0.7.0
+++ b/metadata/md5-cache/dev-python/parameterized-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/parameterized/parameterized-0.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=86fd9a6ef1687ef8557506e138113bff
diff --git a/metadata/md5-cache/dev-python/parametrized-0.1 b/metadata/md5-cache/dev-python/parametrized-0.1
index 9b973fd54597..d17aa4632e86 100644
--- a/metadata/md5-cache/dev-python/parametrized-0.1
+++ b/metadata/md5-cache/dev-python/parametrized-0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/parametrized/parametrized-0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=764dc314ef6d30da32f4b25fc8fe86e5
diff --git a/metadata/md5-cache/dev-python/paramiko-2.4.2 b/metadata/md5-cache/dev-python/paramiko-2.4.2
index 2dee3a02550c..58478a50da90 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.4.2
+++ b/metadata/md5-cache/dev-python/paramiko-2.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/2.4.2.tar.gz -> paramiko-2.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=63c16caf1a379f7e6f5b450c2f9e9f28
diff --git a/metadata/md5-cache/dev-python/paramiko-2.6.0 b/metadata/md5-cache/dev-python/paramiko-2.6.0
index 79383f434025..956243ca643d 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.6.0
+++ b/metadata/md5-cache/dev-python/paramiko-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/2.6.0.tar.gz -> paramiko-2.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7a677183fac7d7a7df38dc34a7f8f51f
diff --git a/metadata/md5-cache/dev-python/paramiko-2.7.1 b/metadata/md5-cache/dev-python/paramiko-2.7.1
index cef500e2c0db..0f8114d24512 100644
--- a/metadata/md5-cache/dev-python/paramiko-2.7.1
+++ b/metadata/md5-cache/dev-python/paramiko-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/paramiko/paramiko/archive/2.7.1.tar.gz -> paramiko-2.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7a677183fac7d7a7df38dc34a7f8f51f
diff --git a/metadata/md5-cache/dev-python/paramunittest-0.2 b/metadata/md5-cache/dev-python/paramunittest-0.2
index e92327a913ae..500980aec0e4 100644
--- a/metadata/md5-cache/dev-python/paramunittest-0.2
+++ b/metadata/md5-cache/dev-python/paramunittest-0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Simple extension to have parametrized unit tests.
 EAPI=5
 HOMEPAGE=https://github.com/rik0/ParamUnittest
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/P/ParamUnittest/ParamUnittest-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7cc58b8c539c85d7d332a9f396b66a1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ca2e905107afc9fbcdfb74bd33f08b2
diff --git a/metadata/md5-cache/dev-python/parsedatetime-2.4-r1 b/metadata/md5-cache/dev-python/parsedatetime-2.4-r1
index ed53497e7c66..01837b7f55f6 100644
--- a/metadata/md5-cache/dev-python/parsedatetime-2.4-r1
+++ b/metadata/md5-cache/dev-python/parsedatetime-2.4-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Parse human-readable date/time strings
 EAPI=6
 HOMEPAGE=https://github.com/bear/parsedatetime
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bear/parsedatetime/archive/v2.4.tar.gz -> parsedatetime-2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=971957ba2c8d24ac191b677f1ae33b80
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=20d9806ae711956d320e2a0f201cc166
diff --git a/metadata/md5-cache/dev-python/parsley-1.3 b/metadata/md5-cache/dev-python/parsley-1.3
index 08320c2c10a1..85be844946a1 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12928515a035be8513c31c62d7169b13
diff --git a/metadata/md5-cache/dev-python/parso-0.5.1-r1 b/metadata/md5-cache/dev-python/parso-0.5.1-r1
index c57279347e03..03e819b84ff2 100644
--- a/metadata/md5-cache/dev-python/parso-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/parso-0.5.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.5.1.tar.gz -> parso-0.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d12592dbc5d1b93bf73dbabdc5d510dc
diff --git a/metadata/md5-cache/dev-python/parso-0.5.2 b/metadata/md5-cache/dev-python/parso-0.5.2
index 96c5e36eef4a..26540dbd0277 100644
--- a/metadata/md5-cache/dev-python/parso-0.5.2
+++ b/metadata/md5-cache/dev-python/parso-0.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.5.2.tar.gz -> parso-0.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d7f81c0bd14fd2cd50590ecca883b467
diff --git a/metadata/md5-cache/dev-python/parso-0.6.0 b/metadata/md5-cache/dev-python/parso-0.6.0
index c5d1fd60fc16..8f4e59c69eff 100644
--- a/metadata/md5-cache/dev-python/parso-0.6.0
+++ b/metadata/md5-cache/dev-python/parso-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.6.0.tar.gz -> parso-0.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3b262c60ae90135de5525c262f9b4faf
diff --git a/metadata/md5-cache/dev-python/parso-0.6.1 b/metadata/md5-cache/dev-python/parso-0.6.1
index 33e441a2357b..3707f6b528b1 100644
--- a/metadata/md5-cache/dev-python/parso-0.6.1
+++ b/metadata/md5-cache/dev-python/parso-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/parso/archive/v0.6.1.tar.gz -> parso-0.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3b262c60ae90135de5525c262f9b4faf
diff --git a/metadata/md5-cache/dev-python/partd-0.3.8 b/metadata/md5-cache/dev-python/partd-0.3.8
index e1599281d648..62c11ae8c4b2 100644
--- a/metadata/md5-cache/dev-python/partd-0.3.8
+++ b/metadata/md5-cache/dev-python/partd-0.3.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/partd/partd-0.3.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=829667859e3a8650067fafc4c0eee38c
diff --git a/metadata/md5-cache/dev-python/parver-0.1.1 b/metadata/md5-cache/dev-python/parver-0.1.1
index 7fb72cdf8acb..db036d9f1a5d 100644
--- a/metadata/md5-cache/dev-python/parver-0.1.1
+++ b/metadata/md5-cache/dev-python/parver-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RazerM/parver/archive/0.1.1.tar.gz -> parver-0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a2ccee010862f415ea086a3d6efe02f
diff --git a/metadata/md5-cache/dev-python/parver-0.2.1 b/metadata/md5-cache/dev-python/parver-0.2.1
index 5532a7af4846..1c6969acd3de 100644
--- a/metadata/md5-cache/dev-python/parver-0.2.1
+++ b/metadata/md5-cache/dev-python/parver-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RazerM/parver/archive/0.2.1.tar.gz -> parver-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4608c2f80fe1349572b2f84131f76727
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 eb01b3716cb7..b57874850591 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.1-r1
+++ b/metadata/md5-cache/dev-python/passlib-1.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c88ce244206fbe349dd9d57a9965cd59
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.1-r2 b/metadata/md5-cache/dev-python/passlib-1.7.1-r2
index 869dc84a798e..c9d1524834e1 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.1-r2
+++ b/metadata/md5-cache/dev-python/passlib-1.7.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2b429b725e60716531a740c8141bbf45
diff --git a/metadata/md5-cache/dev-python/passlib-1.7.2 b/metadata/md5-cache/dev-python/passlib-1.7.2
index dc36f5919f1f..2bbc81a9b48f 100644
--- a/metadata/md5-cache/dev-python/passlib-1.7.2
+++ b/metadata/md5-cache/dev-python/passlib-1.7.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) totp? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) totp? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) totp? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Password hashing framework supporting over 20 schemes
 EAPI=7
 HOMEPAGE=https://bitbucket.org/ecollins/passlib/wiki/Home/
 IUSE=+bcrypt doc +scrypt +totp test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
 LICENSE=BSD-2
 RDEPEND=bcrypt? ( dev-python/bcrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) totp? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) scrypt? ( dev-python/scrypt[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passlib/passlib-1.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7d4a52a791170579bf34b0f1e09fba8c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c20e213696deece0817f4f214c9a0df7
diff --git a/metadata/md5-cache/dev-python/passwordmeter-0.1.8 b/metadata/md5-cache/dev-python/passwordmeter-0.1.8
index 40da926c4de0..e6c88ab6b106 100644
--- a/metadata/md5-cache/dev-python/passwordmeter-0.1.8
+++ b/metadata/md5-cache/dev-python/passwordmeter-0.1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/passwordmeter/passwordmeter-0.1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c426fbb07cfc71d841024608276de7f
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 66db0941fd30..f7f6e9e1b98e 100644
--- a/metadata/md5-cache/dev-python/paste-2.0.3-r1
+++ b/metadata/md5-cache/dev-python/paste-2.0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/namespace-paste[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-2.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f19e12e1ed2b5f56edc8a37376fa59e0
diff --git a/metadata/md5-cache/dev-python/paste-3.0.7 b/metadata/md5-cache/dev-python/paste-3.0.7
index 19070a73abfb..3325ec8d727c 100644
--- a/metadata/md5-cache/dev-python/paste-3.0.7
+++ b/metadata/md5-cache/dev-python/paste-3.0.7
@@ -11,5 +11,5 @@ RDEPEND=dev-python/namespace-paste[python_targets_python2_7(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-3.0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=313c981738c4f336412aa5bc960e155c
diff --git a/metadata/md5-cache/dev-python/paste-3.2.3 b/metadata/md5-cache/dev-python/paste-3.2.3
index 2604a32fb2b5..c60c20853ca0 100644
--- a/metadata/md5-cache/dev-python/paste-3.2.3
+++ b/metadata/md5-cache/dev-python/paste-3.2.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] flup? ( python_targets_python2_7? ( dev-python/flup[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) openid? ( python_targets_python2_7? ( dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] flup? ( python_targets_python2_7? ( dev-python/flup[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) openid? ( python_targets_python2_7? ( dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.4.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] flup? ( python_targets_python2_7? ( dev-python/flup[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) openid? ( python_targets_python2_7? ( dev-python/python-openid[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=Tools for using a Web Server Gateway Interface stack
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paste/Paste-3.2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=be5f7377d4689695fed6c143f66b8105
diff --git a/metadata/md5-cache/dev-python/pastedeploy-2.0.1-r1 b/metadata/md5-cache/dev-python/pastedeploy-2.0.1-r1
index 54ff8ea5600d..a4b5cdefdea5 100644
--- a/metadata/md5-cache/dev-python/pastedeploy-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pastedeploy-2.0.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/namespace-paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Load, configure, and compose WSGI applications and servers
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/pastedeploy/archive/2.0.1.tar.gz -> pastedeploy-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=527c545c55a5c5700bc58cf5edc952a6
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 2541f954fcc7..257ca45c1655 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PasteScript/PasteScript-2.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8393af2aadf86da00ecc4f65f7fa819e
diff --git a/metadata/md5-cache/dev-python/patch-1.16 b/metadata/md5-cache/dev-python/patch-1.16
index 907494b44a0d..644247d5431e 100644
--- a/metadata/md5-cache/dev-python/patch-1.16
+++ b/metadata/md5-cache/dev-python/patch-1.16
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Library to parse and apply unified diffs
 EAPI=6
 HOMEPAGE=https://github.com/techtonik/python-patch/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/patch/patch-1.16.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf0867223c77fc7864bb6d5ce34227df
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7a7c9d059089b1ed4c5e43336365bf12
diff --git a/metadata/md5-cache/dev-python/patch-ng-1.17.2 b/metadata/md5-cache/dev-python/patch-ng-1.17.2
index 1532a6e8ca45..30b834d6ac46 100644
--- a/metadata/md5-cache/dev-python/patch-ng-1.17.2
+++ b/metadata/md5-cache/dev-python/patch-ng-1.17.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/patch-ng/patch-ng-1.17.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e10588c9aa313dab8c917d00cc6593f5
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 fa155d8f1133..e5b7e01d66e4 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Functions for server CLI applications used by humans
 EAPI=6
 HOMEPAGE=https://github.com/joeyespo/path-and-address
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/path-and-address/path-and-address-1.1.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e54ac74c62bf270fb981cc83b9935fbf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47df32931550cfb4715d60755f9a2c1f
diff --git a/metadata/md5-cache/dev-python/path-and-address-2.0.1 b/metadata/md5-cache/dev-python/path-and-address-2.0.1
index cb10f67a6a57..70830c989c5b 100644
--- a/metadata/md5-cache/dev-python/path-and-address-2.0.1
+++ b/metadata/md5-cache/dev-python/path-and-address-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/path-and-address/path-and-address-2.0.1.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bee9365d3fe666cc80f0f40ef8b48407
diff --git a/metadata/md5-cache/dev-python/path-py-11.5.2 b/metadata/md5-cache/dev-python/path-py-11.5.2
index 87ff1e3661a5..aeb14369bc08 100644
--- a/metadata/md5-cache/dev-python/path-py-11.5.2
+++ b/metadata/md5-cache/dev-python/path-py-11.5.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A module wrapper for os.path
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path.py/path.py-11.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d8c6e4e5c45cd6d93681b3d82041b797
diff --git a/metadata/md5-cache/dev-python/path-py-12.0.2 b/metadata/md5-cache/dev-python/path-py-12.0.2
index 4a23b9e1256a..7b56f5c7783d 100644
--- a/metadata/md5-cache/dev-python/path-py-12.0.2
+++ b/metadata/md5-cache/dev-python/path-py-12.0.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A module wrapper for os.path
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path.py/path.py-12.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6e7ede6926da2fa422a411a4e433b2a7
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 3ba99321c03c..036d5bb80c23 100644
--- a/metadata/md5-cache/dev-python/path-py-8.1.2
+++ b/metadata/md5-cache/dev-python/path-py-8.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/path.py/path.py-8.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0d68b6bb704775f455f12da4d7058fa
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 418652f39c3c..094309a6ee3d 100644
--- a/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/pathlib-1.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Object-oriented filesystem paths
 EAPI=5
 HOMEPAGE=https://pathlib.readthedocs.org/
 IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib/pathlib-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5744f954720cf580ca1b85a8b8a971ea
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8781187100ea5ac0cdd93bd114cb64c
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.0 b/metadata/md5-cache/dev-python/pathlib2-2.3.0
index 2c17decd7629..5d6ae5a7c557 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_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db44ccfe9839b610be32bf0714181bdf
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.2 b/metadata/md5-cache/dev-python/pathlib2-2.3.2
index a8c533a7aed5..46bf17d73fa0 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.2
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=226e71390e6649723e75f3786035329e
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.5 b/metadata/md5-cache/dev-python/pathlib2-2.3.5
index 3f065d6a6099..5f339aed4de6 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.5
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathlib2/pathlib2-2.3.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2adad6c205111755e003da1abb7831a7
diff --git a/metadata/md5-cache/dev-python/pathspec-0.6.0 b/metadata/md5-cache/dev-python/pathspec-0.6.0
index 73879ae64565..83f9c77995fd 100644
--- a/metadata/md5-cache/dev-python/pathspec-0.6.0
+++ b/metadata/md5-cache/dev-python/pathspec-0.6.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Utility library for gitignore style pattern matching of file paths.
 EAPI=7
 HOMEPAGE=https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=MPL-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathspec/pathspec-0.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e0597ee91ca4d989bcc036eaac777d65
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=44953f8a033bcd8c653912ab704a1473
diff --git a/metadata/md5-cache/dev-python/pathspec-0.7.0 b/metadata/md5-cache/dev-python/pathspec-0.7.0
index a33038800535..fbe6c2293396 100644
--- a/metadata/md5-cache/dev-python/pathspec-0.7.0
+++ b/metadata/md5-cache/dev-python/pathspec-0.7.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathspec/pathspec-0.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=014f033d507328dfa24f3de7ee6ebac2
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 aa924d603365..8fd4438be415 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pattern matching and various utilities for file systems paths
 EAPI=5
 HOMEPAGE=https://pypi.org/project/pathtools/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20c8772b7e0b2ad976e784f0364c0d82
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=54c836367620f940498805c33501586b
diff --git a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3 b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
index effb5eb0f905..debaeab54dd5 100644
--- a/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
+++ b/metadata/md5-cache/dev-python/pathtools-0.1.2-r3
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pattern matching and various utilities for file systems paths
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pathtools/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathtools/pathtools-0.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=58fc9e04468c74935f123ae72c61ea09
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5d1e0014e006d451891142dc3b35cc93
diff --git a/metadata/md5-cache/dev-python/patsy-0.4.1 b/metadata/md5-cache/dev-python/patsy-0.4.1
index 536066fd2572..9711a3c692f4 100644
--- a/metadata/md5-cache/dev-python/patsy-0.4.1
+++ b/metadata/md5-cache/dev-python/patsy-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/patsy/patsy-0.4.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=786d723e405f42ccab5dd33d0b7364d3
diff --git a/metadata/md5-cache/dev-python/patsy-0.5.1 b/metadata/md5-cache/dev-python/patsy-0.5.1
index 0112b44ec405..9a33030ffb67 100644
--- a/metadata/md5-cache/dev-python/patsy-0.5.1
+++ b/metadata/md5-cache/dev-python/patsy-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/patsy/patsy-0.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e241a2fb282701ec723969bbe7fabd9a
diff --git a/metadata/md5-cache/dev-python/paver-1.2.4 b/metadata/md5-cache/dev-python/paver-1.2.4
index 29f241386aca..0f4977199d81 100644
--- a/metadata/md5-cache/dev-python/paver-1.2.4
+++ b/metadata/md5-cache/dev-python/paver-1.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2042e44ee9b4aca07264a56867e5793
diff --git a/metadata/md5-cache/dev-python/paver-1.3.4 b/metadata/md5-cache/dev-python/paver-1.3.4
index 8aa1434c81a8..21e29aef652c 100644
--- a/metadata/md5-cache/dev-python/paver-1.3.4
+++ b/metadata/md5-cache/dev-python/paver-1.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd9e371f703bbb3be8ba4baecb1308c7
diff --git a/metadata/md5-cache/dev-python/paver-1.3.4-r1 b/metadata/md5-cache/dev-python/paver-1.3.4-r1
index be1ffaad129f..5082724c0065 100644
--- a/metadata/md5-cache/dev-python/paver-1.3.4-r1
+++ b/metadata/md5-cache/dev-python/paver-1.3.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Paver/Paver-1.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=136f76963edc6360411da74930ed7567
diff --git a/metadata/md5-cache/dev-python/pbkdf2-1.3 b/metadata/md5-cache/dev-python/pbkdf2-1.3
index e9aed2d0d2e9..99ab34cf50b0 100644
--- a/metadata/md5-cache/dev-python/pbkdf2-1.3
+++ b/metadata/md5-cache/dev-python/pbkdf2-1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Implementation of the password-based key derivation function, PBKDF2, specified in RSA PKCS#5 v2.0
 EAPI=5
 HOMEPAGE=https://www.dlitz.net/software/python-pbkdf2/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbkdf2/pbkdf2-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38bbe3b41051ef61c38633cd8d573f8e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d47084b2693064819124ac7909be107
diff --git a/metadata/md5-cache/dev-python/pbkdf2-1.3-r1 b/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
index b9f994fe5a52..fea56fa11361 100644
--- a/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
+++ b/metadata/md5-cache/dev-python/pbkdf2-1.3-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Implementation of PBKDF2, specified in RSA PKCS#5 v2.0
 EAPI=7
 HOMEPAGE=https://www.dlitz.net/software/python-pbkdf2/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbkdf2/pbkdf2-1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=22cdde6e54b2c28627d8672d63cee2aa
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=25d9a9434b99bb8c9bcca7a184379e3a
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 4e23153ebe07..9fad9dc5a685 100644
--- a/metadata/md5-cache/dev-python/pbr-0.8.2-r1
+++ b/metadata/md5-cache/dev-python/pbr-0.8.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-0.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dcaf827c3d6163dcbe592f74cbd8a9d6
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 a845494c7642..8dc4ed244e28 100644
--- a/metadata/md5-cache/dev-python/pbr-1.10.0-r1
+++ b/metadata/md5-cache/dev-python/pbr-1.10.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-1.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e2380938c701b813b0e3c8247546a77
diff --git a/metadata/md5-cache/dev-python/pbr-3.1.1 b/metadata/md5-cache/dev-python/pbr-3.1.1
index 509164d7a699..e508bc59e6e1 100644
--- a/metadata/md5-cache/dev-python/pbr-3.1.1
+++ b/metadata/md5-cache/dev-python/pbr-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8bae2acce0f88bcc196ce539eb8c060
diff --git a/metadata/md5-cache/dev-python/pbr-4.1.1 b/metadata/md5-cache/dev-python/pbr-4.1.1
index fb2c5e227a1f..2e0075678a77 100644
--- a/metadata/md5-cache/dev-python/pbr-4.1.1
+++ b/metadata/md5-cache/dev-python/pbr-4.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-4.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f63d0d8b114f5c0ddcab2d71d1372589
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 4af9b681b101..aafc18324a4f 100644
--- a/metadata/md5-cache/dev-python/pbr-4.2.0-r1
+++ b/metadata/md5-cache/dev-python/pbr-4.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-4.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=686dfd6fa85c1076e880b7c308c44305
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 abfd94869da2..54f4413151b5 100644
--- a/metadata/md5-cache/dev-python/pbr-4.2.0-r2
+++ b/metadata/md5-cache/dev-python/pbr-4.2.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-4.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3c6e37665000731b0da189750ec1f2c
diff --git a/metadata/md5-cache/dev-python/pbr-5.1.1 b/metadata/md5-cache/dev-python/pbr-5.1.1
index d5abcc50c908..498bf23b12b1 100644
--- a/metadata/md5-cache/dev-python/pbr-5.1.1
+++ b/metadata/md5-cache/dev-python/pbr-5.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pbr/pbr-5.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d0c09cfba635f06cdbba9fb98fbde25
diff --git a/metadata/md5-cache/dev-python/pcapy-0.11.1 b/metadata/md5-cache/dev-python/pcapy-0.11.1
index feb573140e74..7f6cf0774242 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_6 )
 SLOT=0
 SRC_URI=https://github.com/CoreSecurity/pcapy/archive/0.11.1.tar.gz -> pcapy-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bea7e034d4757332afd86d63c6556261
diff --git a/metadata/md5-cache/dev-python/pcapy-0.11.2 b/metadata/md5-cache/dev-python/pcapy-0.11.2
index d3ad25e0214b..195dd48b25d6 100644
--- a/metadata/md5-cache/dev-python/pcapy-0.11.2
+++ b/metadata/md5-cache/dev-python/pcapy-0.11.2
@@ -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_6 )
 SLOT=0
 SRC_URI=https://github.com/CoreSecurity/pcapy/archive/0.11.2.tar.gz -> pcapy-0.11.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2711386f7f4b3664d2c670614de1da81
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 f51510741c3f..3d2eb6830430 100644
--- a/metadata/md5-cache/dev-python/pdb-clone-1.10.1
+++ b/metadata/md5-cache/dev-python/pdb-clone-1.10.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A faster clone of pdb
 EAPI=6
 HOMEPAGE=https://github.com/corpusops/pdbclone
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pdb-clone/pdb-clone-1.10.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c317942801e69afcc933c963e7dd18d3
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd507d19a62bc6bc9177485b5a9285eb
diff --git a/metadata/md5-cache/dev-python/pdfrw-0.2 b/metadata/md5-cache/dev-python/pdfrw-0.2
index 533afc4eb183..3e2dd1f74102 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_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/pdfrw/pdfrw-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2abd73185752def35e323695b11f6ad
diff --git a/metadata/md5-cache/dev-python/pdfrw-0.4 b/metadata/md5-cache/dev-python/pdfrw-0.4
index e2831c2a4ae7..69bc1b108c5b 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_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/p/pdfrw/pdfrw-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b84f416ee6a7a189369cd4ff8b3d5eb
diff --git a/metadata/md5-cache/dev-python/pdoc-0.3.2 b/metadata/md5-cache/dev-python/pdoc-0.3.2
index 139a16c750ce..7bac77e1cac6 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_python3_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pdoc/pdoc-0.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfcefb3db795243050910aa8f0c96341
diff --git a/metadata/md5-cache/dev-python/peak-rules-0.5 b/metadata/md5-cache/dev-python/peak-rules-0.5
index e82b6404f5b2..acc92e1b880e 100644
--- a/metadata/md5-cache/dev-python/peak-rules-0.5
+++ b/metadata/md5-cache/dev-python/peak-rules-0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8985e38ed2e1bd3756d07d22890d16af
diff --git a/metadata/md5-cache/dev-python/pecan-1.3.3-r2 b/metadata/md5-cache/dev-python/pecan-1.3.3-r2
index 4f76b4b4764c..aa8f4f8cb470 100644
--- a/metadata/md5-cache/dev-python/pecan-1.3.3-r2
+++ b/metadata/md5-cache/dev-python/pecan-1.3.3-r2
@@ -11,5 +11,5 @@ RDEPEND=virtual/python-singledispatch[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pecan/pecan-1.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fb86e02d6da026465c12ac3c12ffe777
diff --git a/metadata/md5-cache/dev-python/peewee-3.1.0 b/metadata/md5-cache/dev-python/peewee-3.1.0
index 8456387c251d..186f7ef15763 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_6 )
 SLOT=0
 SRC_URI=https://github.com/coleifer/peewee/archive/3.1.0.tar.gz -> peewee-3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e29b01626e0445369abe3061455dc9a
diff --git a/metadata/md5-cache/dev-python/pelican-minify-0.9 b/metadata/md5-cache/dev-python/pelican-minify-0.9
index 41e19705a283..d11ba5d80cdf 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_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pelican-minify/pelican-minify-0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7d32f6ac9495ee10ecf4e2e958d4780
diff --git a/metadata/md5-cache/dev-python/pep257-2.1.1 b/metadata/md5-cache/dev-python/pep257-2.1.1
index 7811f203a896..74bdf76f3755 100644
--- a/metadata/md5-cache/dev-python/pep257-2.1.1
+++ b/metadata/md5-cache/dev-python/pep257-2.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python docstring style checker
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/pep257
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PyCQA/pydocstyle/archive/2.1.1.tar.gz -> pep257-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d476f1a95e8e5311923dc50e24c8c8e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=39258b4db95b69a37946e3afb7e5c354
diff --git a/metadata/md5-cache/dev-python/pep8-1.5.7 b/metadata/md5-cache/dev-python/pep8-1.5.7
index 977e36d4c001..b3c80e20b021 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.5.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba5794a01964340515e5639fe30feae5
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.0 b/metadata/md5-cache/dev-python/pep8-1.7.0
index ac91c1246472..2b45b59ad32c 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e2c1a18a5ece226a4ea4e93ff1b69e8
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.1 b/metadata/md5-cache/dev-python/pep8-1.7.1
index 370a9621cde6..bdbadb02aea0 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pep8/pep8-1.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff8c2c86ae26aaf753dfe9f0c49c09a8
diff --git a/metadata/md5-cache/dev-python/peppercorn-0.5 b/metadata/md5-cache/dev-python/peppercorn-0.5
index d73ccb04e271..1f4a5d5d7514 100644
--- a/metadata/md5-cache/dev-python/peppercorn-0.5
+++ b/metadata/md5-cache/dev-python/peppercorn-0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A library for converting a token stream into a data structure for use in web form posts
 EAPI=5
 HOMEPAGE=https://github.com/Pylons/peppercorn https://pypi.org/project/peppercorn/
-IUSE=doc python_targets_python2_7 python_targets_python3_6
+IUSE=doc python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=repoze
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/peppercorn/peppercorn-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e1bfbc765c73e70a6b2849b2fb0f589
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7052d1b3ee8923899e5726e6a118651
diff --git a/metadata/md5-cache/dev-python/peppercorn-0.6 b/metadata/md5-cache/dev-python/peppercorn-0.6
index 794b22aa0bf9..b9f0934813bb 100644
--- a/metadata/md5-cache/dev-python/peppercorn-0.6
+++ b/metadata/md5-cache/dev-python/peppercorn-0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Convert a token stream into a web form data structure
 EAPI=6
 HOMEPAGE=https://github.com/Pylons/peppercorn https://pypi.org/project/peppercorn/
-IUSE=doc python_targets_python2_7 python_targets_python3_6
+IUSE=doc python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=repoze
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/peppercorn/peppercorn-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d12ce12f0e787a34d4e08b6eb97ddce0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4f87a66da99c72b3cc75de4c822be5e1
diff --git a/metadata/md5-cache/dev-python/pew-1.1.1 b/metadata/md5-cache/dev-python/pew-1.1.1
index dac3780c5e19..9ff7bd6d0f58 100644
--- a/metadata/md5-cache/dev-python/pew-1.1.1
+++ b/metadata/md5-cache/dev-python/pew-1.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pythonz-bd-1.11.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-17.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/virtualenv-1.11.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/virtualenv-clone-0.2.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/pythonz-bd-1.11.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-17.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/shutilwhich-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/virtualenv-1.11.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/virtualenv-clone-0.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=tool to manage multiple virtualenvs written in pure python
 EAPI=6
 HOMEPAGE=https://github.com/berdario/pew https://pypi.org/project/pew/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pew/pew-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3274bf9f515ec9d02036c07982c192a2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=241c01d6b722859903d144effc048cf3
diff --git a/metadata/md5-cache/dev-python/pexpect-4.2.1 b/metadata/md5-cache/dev-python/pexpect-4.2.1
index 0725a0d54041..528f2f83835e 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.2.1
+++ b/metadata/md5-cache/dev-python/pexpect-4.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-4.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=417dbfcbd29dad1220dfb32b7c637db0
diff --git a/metadata/md5-cache/dev-python/pexpect-4.6.0 b/metadata/md5-cache/dev-python/pexpect-4.6.0
index 8d7314686a1a..9c3b5755d8f3 100644
--- a/metadata/md5-cache/dev-python/pexpect-4.6.0
+++ b/metadata/md5-cache/dev-python/pexpect-4.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/ptyprocess-0.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=doc? ( dev-python/sphinx ) test? ( >=dev-python/ptyprocess-0.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python module for spawning child apps and responding to expected patterns
 EAPI=6
 HOMEPAGE=https://pexpect.readthedocs.io/ https://pypi.org/project/pexpect/ https://github.com/pexpect/pexpect/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pexpect/pexpect-4.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05b8c9a8bfc413fcae97394d8f2b2c2d
diff --git a/metadata/md5-cache/dev-python/pgpdump-1.5 b/metadata/md5-cache/dev-python/pgpdump-1.5
index f3473afbc374..4386fec99a1a 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pgpdump/pgpdump-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb933f86b4f70da160162c4b0a1b39c8
diff --git a/metadata/md5-cache/dev-python/pgspecial-1.11.5 b/metadata/md5-cache/dev-python/pgspecial-1.11.5
index b3eb7d46d221..ee893cce8761 100644
--- a/metadata/md5-cache/dev-python/pgspecial-1.11.5
+++ b/metadata/md5-cache/dev-python/pgspecial-1.11.5
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/click-4.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python implementation of postgres meta commands
 EAPI=7
 HOMEPAGE=https://github.com/dbcli/pgspecial
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD MIT
-RDEPEND=>=dev-python/click-4.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgspecial/archive/v1.11.5.tar.gz -> pgspecial-1.11.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9491815f83e4578d64ef9e479a284f20
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a179ffec9399044d5b1b6a04932ebf27
diff --git a/metadata/md5-cache/dev-python/pgspecial-1.11.7 b/metadata/md5-cache/dev-python/pgspecial-1.11.7
index 1cc2a810ec15..40eea961bc65 100644
--- a/metadata/md5-cache/dev-python/pgspecial-1.11.7
+++ b/metadata/md5-cache/dev-python/pgspecial-1.11.7
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=dev-python/click-4.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[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(-)] )
+DEPEND=test? ( >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python implementation of postgres meta commands
 EAPI=7
 HOMEPAGE=https://github.com/dbcli/pgspecial
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD MIT
-RDEPEND=>=dev-python/click-4.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgspecial/archive/v1.11.7.tar.gz -> pgspecial-1.11.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6a7d6979f05135f8db32d13018eb78a5
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=54debaaaa95ea6072b1b3280de7a5de7
diff --git a/metadata/md5-cache/dev-python/pgspecial-1.11.9 b/metadata/md5-cache/dev-python/pgspecial-1.11.9
index 9366c467b4d2..88f8defdc39b 100644
--- a/metadata/md5-cache/dev-python/pgspecial-1.11.9
+++ b/metadata/md5-cache/dev-python/pgspecial-1.11.9
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( >=dev-python/click-4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psycopg-2.7.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python implementation of postgres meta commands
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dbcli/pgspecial/archive/v1.11.9.tar.gz -> pgspecial-1.11.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=945affe35c3d208ab2def01c2f4cffe7
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.10.22 b/metadata/md5-cache/dev-python/phonenumbers-8.10.22
index ef26646824fb..e207bebfa6f2 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.10.22
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.10.22
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.10.22.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1114d9dd1a757645ece27a7da6c9ce56
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.11.2 b/metadata/md5-cache/dev-python/phonenumbers-8.11.2
index 4cdc4990d9c3..86dd7f07ca76 100644
--- a/metadata/md5-cache/dev-python/phonenumbers-8.11.2
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.11.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/phonenumbers/phonenumbers-8.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d33a35dc8a34afc6d19628ccbabc535e
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.3 b/metadata/md5-cache/dev-python/pickleshare-0.7.3
index 048cc9339854..ad0bccbb8070 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-0.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a830f6c2a5f7426756b6906879830df1
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 285c1cde38b0..7e8974a07ae8 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_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pickleshare/pickleshare-0.7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8e8f9e7ad4e1bde1b9aaca7ad71e51f2
diff --git a/metadata/md5-cache/dev-python/pid-2.2.0 b/metadata/md5-cache/dev-python/pid-2.2.0
index bd819cd7e09e..dbff24a06d0b 100644
--- a/metadata/md5-cache/dev-python/pid-2.2.0
+++ b/metadata/md5-cache/dev-python/pid-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pid/pid-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54b04df88f3ad92a42c88614e49a3016
diff --git a/metadata/md5-cache/dev-python/pid-2.2.5 b/metadata/md5-cache/dev-python/pid-2.2.5
index 8ca02d12e53e..4e9531d4930d 100644
--- a/metadata/md5-cache/dev-python/pid-2.2.5
+++ b/metadata/md5-cache/dev-python/pid-2.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pid/pid-2.2.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d16d82b89c6fd27f6895931fca20fa78
diff --git a/metadata/md5-cache/dev-python/piexif-1.0.12 b/metadata/md5-cache/dev-python/piexif-1.0.12
index 01033d11bc26..992e50fbcfdf 100644
--- a/metadata/md5-cache/dev-python/piexif-1.0.12
+++ b/metadata/md5-cache/dev-python/piexif-1.0.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pillow ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pillow ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Exif manipulation with pure Python
 EAPI=6
 HOMEPAGE=https://github.com/hMatoba/Piexif https://pypi.org/project/piexif/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/piexif/piexif-1.0.12.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3cfa82299a1c8ea24c49dbf09c174e23
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1b4c3644f0c5061dda235c2b71b0a6b5
diff --git a/metadata/md5-cache/dev-python/piexif-1.0.13 b/metadata/md5-cache/dev-python/piexif-1.0.13
index fe56871aeed7..3a1c36cf2496 100644
--- a/metadata/md5-cache/dev-python/piexif-1.0.13
+++ b/metadata/md5-cache/dev-python/piexif-1.0.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pillow ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pillow ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Exif manipulation with pure Python
 EAPI=6
 HOMEPAGE=https://github.com/hMatoba/Piexif https://pypi.org/project/piexif/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/piexif/piexif-1.0.13.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a4ac5dc81e5017c7f58c988c2e496263
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=deaa2a734a71c8c4830d59580cf71b8c
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 951bbc2f0865..d8342075420c 100644
--- a/metadata/md5-cache/dev-python/piexif-1.1.0_beta0
+++ b/metadata/md5-cache/dev-python/piexif-1.1.0_beta0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pillow ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] app-arch/unzip test? ( dev-python/pillow ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Exif manipulation with pure Python
 EAPI=6
 HOMEPAGE=https://github.com/hMatoba/Piexif https://pypi.org/project/piexif/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/piexif/piexif-1.1.0b0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4ed8236c2d28419f2ecb8964673ee20
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d622d637f70dadbe58e25b8b30cb757b
diff --git a/metadata/md5-cache/dev-python/piexif-1.1.3 b/metadata/md5-cache/dev-python/piexif-1.1.3
index 882ad8c86b91..75365b8282f1 100644
--- a/metadata/md5-cache/dev-python/piexif-1.1.3
+++ b/metadata/md5-cache/dev-python/piexif-1.1.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/unzip test? ( dev-python/pillow )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-arch/unzip test? ( dev-python/pillow )
 DESCRIPTION=Exif manipulation with pure Python
 EAPI=7
 HOMEPAGE=https://github.com/hMatoba/Piexif https://pypi.org/project/piexif/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/piexif/piexif-1.1.3.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f5ae1cb9fc081f1ef8ad12773fd01341
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1e823f45ad48924e795725c05056b6ed
diff --git a/metadata/md5-cache/dev-python/pika-0.10.0 b/metadata/md5-cache/dev-python/pika-0.10.0
index 952b99d47bfb..1e1f97499ce3 100644
--- a/metadata/md5-cache/dev-python/pika-0.10.0
+++ b/metadata/md5-cache/dev-python/pika-0.10.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pure-Python implementation of the AMQP
 EAPI=5
 HOMEPAGE=https://pika.readthedocs.org/ https://github.com/pika/pika
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MPL-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pika/pika-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3d3101b18b782ac5fd7820be8124968
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c68b075da5e967c8467758b17bed0854
diff --git a/metadata/md5-cache/dev-python/pika-0.13.0 b/metadata/md5-cache/dev-python/pika-0.13.0
index 75ec6eaa4da5..209f96ab8744 100644
--- a/metadata/md5-cache/dev-python/pika-0.13.0
+++ b/metadata/md5-cache/dev-python/pika-0.13.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Pure-Python implementation of the AMQP
 EAPI=7
 HOMEPAGE=https://pika.readthedocs.org/ https://github.com/pika/pika
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MPL-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pika/pika-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8c8a7d80a2ba8bf19629d95d77bcd4b0
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=930cf13392edd006bd677dc5f9306ea7
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 292a6bb4dd16..5a75c79093ce 100644
--- a/metadata/md5-cache/dev-python/pika-pool-0.1.3
+++ b/metadata/md5-cache/dev-python/pika-pool-0.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A connection pool for pika.
 EAPI=5
 HOMEPAGE=https://github.com/bninja/pika-pool
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/pika-0.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <dev-python/pika-0.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/pika-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] <dev-python/pika-0.11[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
 SRC_URI=mirror://pypi/p/pika-pool/pika-pool-0.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a161fea6d1d033a2ba64da858b97d5ae
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2a703e1db511f0b1e2aefb1dacdbf56
diff --git a/metadata/md5-cache/dev-python/pikepdf-1.8.3 b/metadata/md5-cache/dev-python/pikepdf-1.8.3
index 285593b27e88..e8672f1d8f60 100644
--- a/metadata/md5-cache/dev-python/pikepdf-1.8.3
+++ b/metadata/md5-cache/dev-python/pikepdf-1.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pikepdf/pikepdf/archive/v1.8.3.tar.gz -> pikepdf-1.8.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d5dfd86e64f3fad4b15d2692420f3de6
diff --git a/metadata/md5-cache/dev-python/pilkit-2.0 b/metadata/md5-cache/dev-python/pilkit-2.0
index e8498392e317..6481f0cc6e48 100644
--- a/metadata/md5-cache/dev-python/pilkit-2.0
+++ b/metadata/md5-cache/dev-python/pilkit-2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A collection of utilities and processors for the Python Imaging Libary
 EAPI=6
 HOMEPAGE=https://github.com/matthewwithanm/pilkit
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pillow[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matthewwithanm/pilkit/archive/2.0.tar.gz -> pilkit-2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=585fab5b76e9eb4d117483b8dd484a25
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8f2be37e6580463b3099ddaba77686db
diff --git a/metadata/md5-cache/dev-python/pillow-6.2.1 b/metadata/md5-cache/dev-python/pillow-6.2.1
index e239877ec235..4310f54fd48d 100644
--- a/metadata/md5-cache/dev-python/pillow-6.2.1
+++ b/metadata/md5-cache/dev-python/pillow-6.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python2_7 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/6.2.1.tar.gz -> pillow-6.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=2bc75e9aa1a0d142570e8a974c512a12
diff --git a/metadata/md5-cache/dev-python/pillow-6.2.2 b/metadata/md5-cache/dev-python/pillow-6.2.2
index 3ec9a4d7fd31..e3715663d8ae 100644
--- a/metadata/md5-cache/dev-python/pillow-6.2.2
+++ b/metadata/md5-cache/dev-python/pillow-6.2.2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python2_7 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/6.2.2.tar.gz -> pillow-6.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=b95e3111b67df842043ee1dc2cc5da62
diff --git a/metadata/md5-cache/dev-python/pillow-7.0.0 b/metadata/md5-cache/dev-python/pillow-7.0.0
index 36789ec39f6b..e2bd9017f7c8 100644
--- a/metadata/md5-cache/dev-python/pillow-7.0.0
+++ b/metadata/md5-cache/dev-python/pillow-7.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_python3_6 python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/7.0.0.tar.gz -> pillow-7.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=727b1dfc288a535b681149e80764b67d
diff --git a/metadata/md5-cache/dev-python/pillowfight-0.2 b/metadata/md5-cache/dev-python/pillowfight-0.2
index f9e75ffa9234..8f1b0a0d99f7 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pillowfight/pillowfight-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=21e0b243d571ce27ae7f689d2531aa68
diff --git a/metadata/md5-cache/dev-python/pip-19.1 b/metadata/md5-cache/dev-python/pip-19.1
index c1904fc424c7..fad05e9b6237 100644
--- a/metadata/md5-cache/dev-python/pip-19.1
+++ b/metadata/md5-cache/dev-python/pip-19.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!vanilla? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/19.1.tar.gz -> pip-19.1.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-41.0.1-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.33.1-py2.py3-none-any.whl )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a19f611b9b3f9a8a9d6f6e4291493aaf
diff --git a/metadata/md5-cache/dev-python/pip-19.3.1-r1 b/metadata/md5-cache/dev-python/pip-19.3.1-r1
index 5ce1b9f7a85c..df6694beb84f 100644
--- a/metadata/md5-cache/dev-python/pip-19.3.1-r1
+++ b/metadata/md5-cache/dev-python/pip-19.3.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!vanilla? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/19.3.1.tar.gz -> pip-19.3.1.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-41.4.0-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.33.6-py2.py3-none-any.whl )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e5ea480007e914381e88a5c994d3a095
diff --git a/metadata/md5-cache/dev-python/pip-19.3.1-r2 b/metadata/md5-cache/dev-python/pip-19.3.1-r2
index 43f4c097ac3c..250700d6f0a3 100644
--- a/metadata/md5-cache/dev-python/pip-19.3.1-r2
+++ b/metadata/md5-cache/dev-python/pip-19.3.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/19.3.1.tar.gz -> pip-19.3.1.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-41.4.0-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.33.6-py2.py3-none-any.whl )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=87a630d94e778e68d62affced72d4164
diff --git a/metadata/md5-cache/dev-python/pip-20.0.2 b/metadata/md5-cache/dev-python/pip-20.0.2
index 50b8180e287d..7f75fbdb3848 100644
--- a/metadata/md5-cache/dev-python/pip-20.0.2
+++ b/metadata/md5-cache/dev-python/pip-20.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pip/archive/20.0.2.tar.gz -> pip-20.0.2.tar.gz test? ( https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-44.0.0-py2.py3-none-any.whl https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-0.34.2-py2.py3-none-any.whl )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6eeadd761405d8295ad93fc6e185c3f
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 8727bf10dda1..158f4c5d5162 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_pypy3 python_targets_python2_7 python_targets_p
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1e9348b1d8319f572680642c2f589008
diff --git a/metadata/md5-cache/dev-python/pipenv-2018.11.26 b/metadata/md5-cache/dev-python/pipenv-2018.11.26
index 135a740098c6..8f0f4290d76f 100644
--- a/metadata/md5-cache/dev-python/pipenv-2018.11.26
+++ b/metadata/md5-cache/dev-python/pipenv-2018.11.26
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pipenv/pipenv-2018.11.26.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2e16b067c2af8bc4645d74b75820ef55
diff --git a/metadata/md5-cache/dev-python/pipenv-9.0.0 b/metadata/md5-cache/dev-python/pipenv-9.0.0
index 78966de63d4c..da5067cb337b 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pipenv/pipenv-9.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ddc1e57cc7c9ca390aa4bb3e34ee06bb
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 9c679b314593..7b9013530276 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pipenv/pipenv-9.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34c6eb0868a28cbd63e1c37608067f2c
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 1452243fed22..c47d73058774 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_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pipenv/pipenv-9.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdf2edc9f93c1c5d88198ce996fa813a
diff --git a/metadata/md5-cache/dev-python/pipfile-0.0.2 b/metadata/md5-cache/dev-python/pipfile-0.0.2
index 5cc41a77dec6..90cc7594060b 100644
--- a/metadata/md5-cache/dev-python/pipfile-0.0.2
+++ b/metadata/md5-cache/dev-python/pipfile-0.0.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/toml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/toml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Replacement for the existing standard pip's requirements.txt file
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/pipfile/archive/v0.0.2.tar.gz -> pipfile-0.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2bad4101584d2ad1d31ff687213dc364
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.2.2 b/metadata/md5-cache/dev-python/pkgconfig-1.2.2
index 74d65d575e47..ee452e42722a 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.2.2
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Interface Python with pkg-config
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgconfig/pkgconfig-1.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a05afb45fe69b66702fe9de5526f805f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c40e2dedebcd7aa907181e0424027ef4
diff --git a/metadata/md5-cache/dev-python/pkgconfig-1.4.0 b/metadata/md5-cache/dev-python/pkgconfig-1.4.0
index 494a7b21609d..abad70e7023e 100644
--- a/metadata/md5-cache/dev-python/pkgconfig-1.4.0
+++ b/metadata/md5-cache/dev-python/pkgconfig-1.4.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( virtual/pkgconfig dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( virtual/pkgconfig dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Interface Python with pkg-config
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=virtual/pkgconfig python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgconfig/pkgconfig-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4b4efaa3da3c817002fce923c4da3999
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=62ada3e89a443ddf96ae50ef70788a87
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.2.1 b/metadata/md5-cache/dev-python/pkginfo-1.2.1
index b317a6324d5c..20677846998a 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_pypy3(-)?,python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f795c46f6dadfc7edb9a325b0f61c006
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.4.2 b/metadata/md5-cache/dev-python/pkginfo-1.4.2
index be9b95cee3fe..dcff5bf3ff61 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=045046c19b4410e53e1c214647160a4b
diff --git a/metadata/md5-cache/dev-python/pkginfo-1.5.0.1 b/metadata/md5-cache/dev-python/pkginfo-1.5.0.1
index 50f91ddd2bd7..5cc5dfa011ae 100644
--- a/metadata/md5-cache/dev-python/pkginfo-1.5.0.1
+++ b/metadata/md5-cache/dev-python/pkginfo-1.5.0.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Provides an API for querying the distutils metadata written in a PKG-INFO file
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pkginfo/
 IUSE=doc test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkginfo/pkginfo-1.5.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f5a7fbe7d3db7a58e9525fd5c564845e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=87dfdedc8bd431ca85bc998685c38993
diff --git a/metadata/md5-cache/dev-python/pkipplib-0.07-r1 b/metadata/md5-cache/dev-python/pkipplib-0.07-r1
index 5a30101c05c7..6f124a5ad8b3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7e13d84cd47ea1b710fd13b93a579f5
diff --git a/metadata/md5-cache/dev-python/placefinder-0.3 b/metadata/md5-cache/dev-python/placefinder-0.3
index 896271afbf2d..857a7adfe45a 100644
--- a/metadata/md5-cache/dev-python/placefinder-0.3
+++ b/metadata/md5-cache/dev-python/placefinder-0.3
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Yahoo! BOSS PlaceFinder Python Client
 EAPI=5
 HOMEPAGE=https://github.com/adampresley/placefinder-py
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/placefinder-py/placefinder-py-0.3.tar.gz -> placefinder-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c251b47df37d74d5f2f230c17e1dd600
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=169f2fe1aab9ffe6a7c0b5e38781e2ac
diff --git a/metadata/md5-cache/dev-python/plotly-1.9.6 b/metadata/md5-cache/dev-python/plotly-1.9.6
index 929d68832c4c..b66882935744 100644
--- a/metadata/md5-cache/dev-python/plotly-1.9.6
+++ b/metadata/md5-cache/dev-python/plotly-1.9.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plotly/plotly-1.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bb1bd3caa26220f4d43eeb2dfab0f60
diff --git a/metadata/md5-cache/dev-python/pluggy-0.11.0 b/metadata/md5-cache/dev-python/pluggy-0.11.0
index 880b91b46e88..7470a4475947 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.11.0
+++ b/metadata/md5-cache/dev-python/pluggy-0.11.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=36b7c46d98e325cb8843ce1ee4174de4
diff --git a/metadata/md5-cache/dev-python/pluggy-0.12.0 b/metadata/md5-cache/dev-python/pluggy-0.12.0
index 1d53bafbfd82..a001487162be 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.12.0
+++ b/metadata/md5-cache/dev-python/pluggy-0.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ac9933c16a23fff98e780491bbafba0
diff --git a/metadata/md5-cache/dev-python/pluggy-0.13.0 b/metadata/md5-cache/dev-python/pluggy-0.13.0
index 00bd9d01f515..30472fd115fc 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.13.0
+++ b/metadata/md5-cache/dev-python/pluggy-0.13.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] )
 DESCRIPTION=plugin and hook calling mechanisms for python
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8a740fcbfdd535b565df29a95c133171
diff --git a/metadata/md5-cache/dev-python/pluggy-0.13.1 b/metadata/md5-cache/dev-python/pluggy-0.13.1
index 7caaacd85c62..a610005d60b5 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.13.1
+++ b/metadata/md5-cache/dev-python/pluggy-0.13.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] )
 DESCRIPTION=plugin and hook calling mechanisms for python
 EAPI=7
 HOMEPAGE=https://pluggy.readthedocs.io/ https://github.com/pytest-dev/pluggy https://pypi.org/project/pluggy/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 sparc x86
+KEYWORDS=amd64 ~hppa ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.13.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0104fc2fbc412cd0aa90b24799f8c9fb
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3d1b62f815e6c1c67680a55aced581c6
diff --git a/metadata/md5-cache/dev-python/pluggy-0.5.2 b/metadata/md5-cache/dev-python/pluggy-0.5.2
index ff72fecc66a3..637d489dddeb 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.5.2
+++ b/metadata/md5-cache/dev-python/pluggy-0.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=896c4c5f146a86ed1de863f2923aad2d
diff --git a/metadata/md5-cache/dev-python/pluggy-0.7.1 b/metadata/md5-cache/dev-python/pluggy-0.7.1
index 2a88091a474c..604ad1473138 100644
--- a/metadata/md5-cache/dev-python/pluggy-0.7.1
+++ b/metadata/md5-cache/dev-python/pluggy-0.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluggy/pluggy-0.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5a500fc63b1583671af60244a5953568
diff --git a/metadata/md5-cache/dev-python/pluginbase-0.5 b/metadata/md5-cache/dev-python/pluginbase-0.5
index d9f3062c108c..dc1730829c00 100644
--- a/metadata/md5-cache/dev-python/pluginbase-0.5
+++ b/metadata/md5-cache/dev-python/pluginbase-0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Support library for building plugins sytems in Python
 EAPI=6
 HOMEPAGE=https://github.com/mitsuhiko/pluginbase
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pluginbase/pluginbase-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=657ffce7a2cf0101c73c269590956759
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6638134f97919fbfde7f8798ce82c9bd
diff --git a/metadata/md5-cache/dev-python/plumbum-1.6.4 b/metadata/md5-cache/dev-python/plumbum-1.6.4
index 2ce54e29c12a..af8f7bb10a48 100644
--- a/metadata/md5-cache/dev-python/plumbum-1.6.4
+++ b/metadata/md5-cache/dev-python/plumbum-1.6.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A library for shell script-like programs in python
 EAPI=6
 HOMEPAGE=https://plumbum.readthedocs.io/en/latest/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/plumbum/plumbum-1.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97d5443a9465c87491dcca2209eef9e6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=483b19d34965356618c17b0ec08a5291
diff --git a/metadata/md5-cache/dev-python/plumbum-1.6.7 b/metadata/md5-cache/dev-python/plumbum-1.6.7
index f343ec89b455..79f5cc7e7fa7 100644
--- a/metadata/md5-cache/dev-python/plumbum-1.6.7
+++ b/metadata/md5-cache/dev-python/plumbum-1.6.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A library for shell script-like programs in python
 EAPI=6
 HOMEPAGE=https://plumbum.readthedocs.io/en/latest/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/plumbum/plumbum-1.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1422e9388e50e9928a988d6b832deac5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aaf04c89156694debe9d414f91199bec
diff --git a/metadata/md5-cache/dev-python/plumbum-1.6.8 b/metadata/md5-cache/dev-python/plumbum-1.6.8
index 94b94075825b..28c250eb0e0e 100644
--- a/metadata/md5-cache/dev-python/plumbum-1.6.8
+++ b/metadata/md5-cache/dev-python/plumbum-1.6.8
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A library for shell script-like programs in python
 EAPI=7
 HOMEPAGE=https://plumbum.readthedocs.io/en/latest/ https://github.com/tomerfiliba/plumbum
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tomerfiliba/plumbum/archive/v1.6.8.tar.gz -> plumbum-1.6.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=05b8d62963b695f253a5e1067e9dd293
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=49c492874b1639f35a14a5b5e58784d2
diff --git a/metadata/md5-cache/dev-python/ply-3.10 b/metadata/md5-cache/dev-python/ply-3.10
index 91e61094d502..9c5cd6626043 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0/3.10
 SRC_URI=mirror://pypi/p/ply/ply-3.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5c79923bc601aee5bee33883ff81152
diff --git a/metadata/md5-cache/dev-python/ply-3.11 b/metadata/md5-cache/dev-python/ply-3.11
index 10a4b6e3fdcd..2b27b99638af 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0/3.11
 SRC_URI=mirror://pypi/p/ply/ply-3.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99c6a5e456ec459a0fae25fe985edc83
diff --git a/metadata/md5-cache/dev-python/ply-3.6-r1 b/metadata/md5-cache/dev-python/ply-3.6-r1
index 252b6651431e..d34432f08a74 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_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/3.6
 SRC_URI=http://www.dabeaz.com/ply/ply-3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4669e168f7eda8f418169355ba3f0cac
diff --git a/metadata/md5-cache/dev-python/ply-3.9 b/metadata/md5-cache/dev-python/ply-3.9
index 1250ad1b67b1..3566a117f1be 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0/3.9
 SRC_URI=mirror://pypi/p/ply/ply-3.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c8e578123607eb9d3a5b4c3f8d0f113
diff --git a/metadata/md5-cache/dev-python/plyr-1.0.6 b/metadata/md5-cache/dev-python/plyr-1.0.6
index 99e872bb76a0..9fdd368cbbc7 100644
--- a/metadata/md5-cache/dev-python/plyr-1.0.6
+++ b/metadata/md5-cache/dev-python/plyr-1.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/glyr dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=media-libs/glyr dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A python wrapper for Glyr
 EAPI=5
 HOMEPAGE=https://sahib.github.io/python-glyr/intro.html https://github.com/sahib/python-glyr
-IUSE=doc python_targets_python2_7 python_targets_python3_6
+IUSE=doc python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=media-libs/glyr python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=media-libs/glyr 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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8395b755e1e207b38d40cd597d21cb2f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=69cbbd02fde31e139289d97eec407e8d
diff --git a/metadata/md5-cache/dev-python/plyvel-1.1.0 b/metadata/md5-cache/dev-python/plyvel-1.1.0
index 02af4a8171b7..8331400b5d4e 100644
--- a/metadata/md5-cache/dev-python/plyvel-1.1.0
+++ b/metadata/md5-cache/dev-python/plyvel-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plyvel/plyvel-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e414c71b0e37b876eb7d7e2642be82c
diff --git a/metadata/md5-cache/dev-python/plyvel-1.2.0 b/metadata/md5-cache/dev-python/plyvel-1.2.0
index 7589fe36a011..5b970c51bda5 100644
--- a/metadata/md5-cache/dev-python/plyvel-1.2.0
+++ b/metadata/md5-cache/dev-python/plyvel-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/plyvel/plyvel-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a82165f1c8154eb8750d7c148a6280b1
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 78fc28955f98..4ae15a14113c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b0d07586a8a3802e642058f3acc64db
diff --git a/metadata/md5-cache/dev-python/pmw-1.3.3-r3 b/metadata/md5-cache/dev-python/pmw-1.3.3-r3
index 9bd1cdd52cf0..ffd996f11cbb 100644
--- a/metadata/md5-cache/dev-python/pmw-1.3.3-r3
+++ b/metadata/md5-cache/dev-python/pmw-1.3.3-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=py2
 SRC_URI=mirror://sourceforge/pmw/Pmw.1.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c1cab04232c42603033805b9481d7aff
diff --git a/metadata/md5-cache/dev-python/pmw-2.0.1 b/metadata/md5-cache/dev-python/pmw-2.0.1
index 90dc53d58bc1..5f96877728e6 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_6 )
 RESTRICT=test
 SLOT=py3
 SRC_URI=mirror://pypi/P/Pmw/Pmw-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a5959ebe50812f994e686b316f6b040
diff --git a/metadata/md5-cache/dev-python/pmw-2.0.1-r1 b/metadata/md5-cache/dev-python/pmw-2.0.1-r1
index c8a2557372b5..2730a11fde54 100644
--- a/metadata/md5-cache/dev-python/pmw-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pmw-2.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=py3
 SRC_URI=mirror://pypi/P/Pmw/Pmw-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=2415c56461769a9f5bf95c1ea68f2dcf
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.17 b/metadata/md5-cache/dev-python/pocketlint-0.17
index 344785f6f1e6..129216f4af65 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.17
+++ b/metadata/md5-cache/dev-python/pocketlint-0.17
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.17.tar.gz -> pocketlint-0.17.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=521f4924d13de18f54edb4ad6498fb52
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.19 b/metadata/md5-cache/dev-python/pocketlint-0.19
index e4c3f12bc7b8..61bcb28511c3 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.19
+++ b/metadata/md5-cache/dev-python/pocketlint-0.19
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.19.tar.gz -> pocketlint-0.19.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=81a3de21b34f0d5f4cbef90dece40ed0
diff --git a/metadata/md5-cache/dev-python/pocketlint-0.20 b/metadata/md5-cache/dev-python/pocketlint-0.20
index 8d29f7e93cd4..9771436c87e2 100644
--- a/metadata/md5-cache/dev-python/pocketlint-0.20
+++ b/metadata/md5-cache/dev-python/pocketlint-0.20
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pocketlint/archive/0.20.tar.gz -> pocketlint-0.20.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9c4e0ae9c70d6f0672bdd8a0f07ab47e
diff --git a/metadata/md5-cache/dev-python/pockets-0.5.1 b/metadata/md5-cache/dev-python/pockets-0.5.1
index f069c372ba81..c8eb6c93178b 100644
--- a/metadata/md5-cache/dev-python/pockets-0.5.1
+++ b/metadata/md5-cache/dev-python/pockets-0.5.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flake8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Collection of helpful Python tools
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pockets/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pockets/pockets-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4a7cbcaf93fe7b9cabe3ae3f83b8a43
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=02de26ddd34a6aa95fa302f047a576dc
diff --git a/metadata/md5-cache/dev-python/podcastparser-0.6.4 b/metadata/md5-cache/dev-python/podcastparser-0.6.4
index c51a1d1db74b..b804b585095a 100644
--- a/metadata/md5-cache/dev-python/podcastparser-0.6.4
+++ b/metadata/md5-cache/dev-python/podcastparser-0.6.4
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/podcastparser/podcastparser-0.6.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2ffde49dce4a84841118dc7455a368c4
diff --git a/metadata/md5-cache/dev-python/polib-1.1.0-r1 b/metadata/md5-cache/dev-python/polib-1.1.0-r1
index 16d341e1e101..935699a93e97 100644
--- a/metadata/md5-cache/dev-python/polib-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/polib-1.1.0-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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/polib/polib-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b89069d53503a0220758f87bcd581435
diff --git a/metadata/md5-cache/dev-python/polygon-3.0.7 b/metadata/md5-cache/dev-python/polygon-3.0.7
index 4f573b6ec43e..63623db91eea 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6ca4486ef65a01579c5e39db3eb50e6
diff --git a/metadata/md5-cache/dev-python/portend-2.2 b/metadata/md5-cache/dev-python/portend-2.2
index d13983359d2f..b2e0df249f1d 100644
--- a/metadata/md5-cache/dev-python/portend-2.2
+++ b/metadata/md5-cache/dev-python/portend-2.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=TCP port monitoring utilities
 EAPI=6
 HOMEPAGE=https://pypi.org/project/portend/ https://github.com/jaraco/portend
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=192e5112747f792fd02c029a4fdfc5e8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dcdd58c16edc20a7c1566861514b1d82
diff --git a/metadata/md5-cache/dev-python/portend-2.2-r1 b/metadata/md5-cache/dev-python/portend-2.2-r1
index ba191705c131..86da24956359 100644
--- a/metadata/md5-cache/dev-python/portend-2.2-r1
+++ b/metadata/md5-cache/dev-python/portend-2.2-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=TCP port monitoring utilities
 EAPI=7
 HOMEPAGE=https://pypi.org/project/portend/ https://github.com/jaraco/portend
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ae048d4c7d290a6a0f2872340097008b
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fe0843014eb1fd66beb812595a30ee9a
diff --git a/metadata/md5-cache/dev-python/portend-2.6 b/metadata/md5-cache/dev-python/portend-2.6
index 9e1a90b94bd2..11c8536a12d7 100644
--- a/metadata/md5-cache/dev-python/portend-2.6
+++ b/metadata/md5-cache/dev-python/portend-2.6
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=TCP port monitoring utilities
 EAPI=7
 HOMEPAGE=https://pypi.org/project/portend/ https://github.com/jaraco/portend
-IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
+IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6b056bcd7d950ed7e8ad55993b0feb65
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a6ace8d84eeaaf0b10feeddf1932ed2b
diff --git a/metadata/md5-cache/dev-python/positional-1.1.2 b/metadata/md5-cache/dev-python/positional-1.1.2
index f6831fb74107..ce19fca09924 100644
--- a/metadata/md5-cache/dev-python/positional-1.1.2
+++ b/metadata/md5-cache/dev-python/positional-1.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pbr-1.6[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A decorator which enforces only some args may be passed positionally.
 EAPI=6
 HOMEPAGE=https://github.com/morganfainberg/positional
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wrapt[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
 SRC_URI=mirror://pypi/p/positional/positional-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6193b9f8e99f043f469bbf2238366ff6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8fd942d5daab593381fbfd6d23c0e5af
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 e77c7d28aac2..f7a12aa4a68e 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a7f873fd1ca408acf88512ef5ca9809a
diff --git a/metadata/md5-cache/dev-python/potr-1.0.1 b/metadata/md5-cache/dev-python/potr-1.0.1
index 20bdd77226b9..687a6544bb0d 100644
--- a/metadata/md5-cache/dev-python/potr-1.0.1
+++ b/metadata/md5-cache/dev-python/potr-1.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pycrypto-2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pycrypto-2.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pure Python OTR implementation
 EAPI=5
 HOMEPAGE=https://github.com/python-otr/pure-python-otr
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=LGPL-3+
-RDEPEND=>=dev-python/pycrypto-2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/pycrypto-2.1[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
 SRC_URI=mirror://pypi/p/python-potr/python-potr-1.0.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3db6d3e5d1ed08a3533733b4d2fff1eb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5f7a65f6a10d0b09f39e7f34b1f95484
diff --git a/metadata/md5-cache/dev-python/poyo-0.4.1 b/metadata/md5-cache/dev-python/poyo-0.4.1
index 1ead8df51067..2daa084ecbbd 100644
--- a/metadata/md5-cache/dev-python/poyo-0.4.1
+++ b/metadata/md5-cache/dev-python/poyo-0.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A lightweight YAML Parser for Python
 EAPI=6
 HOMEPAGE=https://github.com/hackebrot/poyo
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poyo/poyo-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e36edd445592c62fa94aa69ff43238bc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b88cdafb2dde47e67587b56df232d243
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 2adef10b1095..d474ac9070ff 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/precis_i18n/precis_i18n-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e4b38f0779e5a431114e75a7acccb2b
diff --git a/metadata/md5-cache/dev-python/precis-i18n-1.0.1 b/metadata/md5-cache/dev-python/precis-i18n-1.0.1
index 1ad88794c781..7867ea4a7fda 100644
--- a/metadata/md5-cache/dev-python/precis-i18n-1.0.1
+++ b/metadata/md5-cache/dev-python/precis-i18n-1.0.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/precis_i18n/precis_i18n-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ce62d803c5dcc7a9c1439ad81ffaf96
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.8 b/metadata/md5-cache/dev-python/pretend-1.0.8
index d73e1624fc84..8dd18ba64601 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pretend/pretend-1.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1289040d742c9e91178aaedc18b4c5e9
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 d31715557550..9c62f09bb1b1 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.8-r1
+++ b/metadata/md5-cache/dev-python/pretend-1.0.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alex/pretend/archive/v1.0.8.tar.gz -> pretend-1.0.8.gh.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a93a837eb1ac4dc2aba41a92e83a782
diff --git a/metadata/md5-cache/dev-python/pretend-1.0.9 b/metadata/md5-cache/dev-python/pretend-1.0.9
index 25d594e897ac..5508e69fc09e 100644
--- a/metadata/md5-cache/dev-python/pretend-1.0.9
+++ b/metadata/md5-cache/dev-python/pretend-1.0.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alex/pretend/archive/v1.0.9.tar.gz -> pretend-1.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0ed13610b7d299652235cb264745aee
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 865662026504..2b1231b52f76 100644
--- a/metadata/md5-cache/dev-python/pretty-yaml-15.8.2
+++ b/metadata/md5-cache/dev-python/pretty-yaml-15.8.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unidecode[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unidecode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=PyYAML-based module to produce pretty and readable YAML-serialized data
 EAPI=7
 HOMEPAGE=https://github.com/mk-fg/pretty-yaml
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm x86
 LICENSE=WTFPL-2
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaml/pyaml-15.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=060b6c89fe66cd8356d0d7ceb6522f1e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8f6076d862fb338cd992d765476e68c5
diff --git a/metadata/md5-cache/dev-python/prettyprinter-0.13.2 b/metadata/md5-cache/dev-python/prettyprinter-0.13.2
index 6a606bf1cbe3..520ce462be67 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_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/prettyprinter/prettyprinter-0.13.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01d1a1fab4200a528dc5bf828b3050ce
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 34b0cd89a52c..218a65d0bacd 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=410ab5dbfcd89b0cebbb3d70cb1e7f45
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2 b/metadata/md5-cache/dev-python/prettytable-0.7.2
index 78f7b7a5962f..11e62b0d6c41 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31fe463bdf7d3841da01069b9223109b
diff --git a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1 b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
index 3ca1e2b05264..a12a64ff352f 100644
--- a/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
+++ b/metadata/md5-cache/dev-python/prettytable-0.7.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PrettyTable/prettytable-0.7.2.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bb12911f2d46a35d44662f9627a8494a
diff --git a/metadata/md5-cache/dev-python/priority-1.3.0 b/metadata/md5-cache/dev-python/priority-1.3.0
index 10093a991ca3..7abd9fbe4f8a 100644
--- a/metadata/md5-cache/dev-python/priority-1.3.0
+++ b/metadata/md5-cache/dev-python/priority-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/priority/priority-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18bc94184dd7af6515543f0c0d4eb393
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 7bd43c059354..9ca4e734d28c 100644
--- a/metadata/md5-cache/dev-python/process-tests-1.2.0
+++ b/metadata/md5-cache/dev-python/process-tests-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f452f25803f12f214051f0d1491f5e5d
diff --git a/metadata/md5-cache/dev-python/process-tests-2.0.2 b/metadata/md5-cache/dev-python/process-tests-2.0.2
index 0d6a1260966e..74722372e3f5 100644
--- a/metadata/md5-cache/dev-python/process-tests-2.0.2
+++ b/metadata/md5-cache/dev-python/process-tests-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/process-tests/process-tests-2.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=04d07af9d96860ec292c37ef6ccbbd59
diff --git a/metadata/md5-cache/dev-python/processing-0.52-r1 b/metadata/md5-cache/dev-python/processing-0.52-r1
index 21116ba89200..304cc628a4c7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5ffd5230529d33321ff24d45ab62cd0
diff --git a/metadata/md5-cache/dev-python/progress-1.2 b/metadata/md5-cache/dev-python/progress-1.2
index 0e3cda69870f..5381b6ca5469 100644
--- a/metadata/md5-cache/dev-python/progress-1.2
+++ b/metadata/md5-cache/dev-python/progress-1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Easy to use progress bars
 EAPI=5
 HOMEPAGE=https://pypi.org/project/progress/ https://github.com/verigak/progress/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/progress/progress-1.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a07c20b57d87a4fe0d1764c28b3764a
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2edbbf527c5c99a5de8cda9e86032a1b
diff --git a/metadata/md5-cache/dev-python/progress-1.3 b/metadata/md5-cache/dev-python/progress-1.3
index d6068e678d90..757279a9266e 100644
--- a/metadata/md5-cache/dev-python/progress-1.3
+++ b/metadata/md5-cache/dev-python/progress-1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Easy to use progress bars
 EAPI=6
 HOMEPAGE=https://pypi.org/project/progress/ https://github.com/verigak/progress/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/progress/progress-1.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9fb002b2ec80f67d300b8d18c3d893d8
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=23de7c216320d6520408203e8878c8a1
diff --git a/metadata/md5-cache/dev-python/progressbar-2.3-r3 b/metadata/md5-cache/dev-python/progressbar-2.3-r3
index 527ff8f808a7..4a4ad079af89 100644
--- a/metadata/md5-cache/dev-python/progressbar-2.3-r3
+++ b/metadata/md5-cache/dev-python/progressbar-2.3-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Text progressbar library for python
 EAPI=5
 HOMEPAGE=https://pypi.org/project/progressbar/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-2.1 BSD )
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar/progressbar-2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d96584822d84b9c1d7bd9cc269915875
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7edd99a8dad6e4fddc56fb9555dcea98
diff --git a/metadata/md5-cache/dev-python/progressbar-2.5 b/metadata/md5-cache/dev-python/progressbar-2.5
index 7a19a08c828e..6181f60feb0e 100644
--- a/metadata/md5-cache/dev-python/progressbar-2.5
+++ b/metadata/md5-cache/dev-python/progressbar-2.5
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Text progressbar library for python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/progressbar/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-2.1 BSD )
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar/progressbar-2.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a7d1357a83314a218467b765878b6990
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=56c0f11e849fcf15e09c8c11a2f026af
diff --git a/metadata/md5-cache/dev-python/progressbar2-3.39.3 b/metadata/md5-cache/dev-python/progressbar2-3.39.3
index 2fb751b4d830..600e306bf692 100644
--- a/metadata/md5-cache/dev-python/progressbar2-3.39.3
+++ b/metadata/md5-cache/dev-python/progressbar2-3.39.3
@@ -10,5 +10,5 @@ RDEPEND=!dev-python/progressbar[python_targets_pypy3(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/progressbar2/progressbar2-3.39.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d88d65f1d6dc51482d81390b9ef5aebe
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.6.0 b/metadata/md5-cache/dev-python/prometheus_client-0.6.0
index f911f8bbe4b4..75c9ac8c7620 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.6.0
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( || ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( || ( dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python client for the Prometheus monitoring system
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prometheus_client/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64
 LICENSE=Apache-2.0
-RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=|| ( dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prometheus/client_python/archive/v0.6.0.tar.gz -> prometheus_client-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3dfc3983c91205fb0c51469263b0a768
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e40bb50b573bf8f41cd86c51a051459
diff --git a/metadata/md5-cache/dev-python/prometheus_client-0.7.1 b/metadata/md5-cache/dev-python/prometheus_client-0.7.1
index 1ed59c085e87..3ae5da52473e 100644
--- a/metadata/md5-cache/dev-python/prometheus_client-0.7.1
+++ b/metadata/md5-cache/dev-python/prometheus_client-0.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( || ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( || ( dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python client for the Prometheus monitoring system
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prometheus_client/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=|| ( dev-python/twisted[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/twisted-web[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/prometheus/client_python/archive/v0.7.1.tar.gz -> prometheus_client-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=526bd1f37993eaa6ffbc82f88e38acdc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f9c408beb6c082da2e631a0a27569afd
diff --git a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.4.1 b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.4.1
index 70db5f27b2b3..ccee6ada7e15 100644
--- a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.4.1
+++ b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rycus86/prometheus_flask_exporter/archive/0.4.1.tar.gz -> prometheus_flask_exporter-0.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6995c1ae52b6c0e111f22355aa1f8de
diff --git a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.5.1 b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.5.1
index f0b650d380a5..b39b55eb955d 100644
--- a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.5.1
+++ b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rycus86/prometheus_flask_exporter/archive/0.5.1.tar.gz -> prometheus_flask_exporter-0.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6995c1ae52b6c0e111f22355aa1f8de
diff --git a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.7.2 b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.7.2
index 8acfd7cb96fe..e06f4e460e6f 100644
--- a/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.7.2
+++ b/metadata/md5-cache/dev-python/prometheus_flask_exporter-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rycus86/prometheus_flask_exporter/archive/0.7.2.tar.gz -> prometheus_flask_exporter-0.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6995c1ae52b6c0e111f22355aa1f8de
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 6baa847bebfa..b4a7fa43fa0a 100644
--- a/metadata/md5-cache/dev-python/promises-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/promises-2.0.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=An implementation of Promises in Python
 EAPI=6
 HOMEPAGE=https://github.com/syrusakbary/promise
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/python-typing[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=virtual/python-typing[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/syrusakbary/promise/archive/v2.0.1.tar.gz -> promise-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a58dc0370caa49028cba026f5d779e4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7f0070157074432306d4df1627d7baeb
diff --git a/metadata/md5-cache/dev-python/promises-2.1-r1 b/metadata/md5-cache/dev-python/promises-2.1-r1
index 5fb8bc434a8a..19783f7ab9d5 100644
--- a/metadata/md5-cache/dev-python/promises-2.1-r1
+++ b/metadata/md5-cache/dev-python/promises-2.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=An implementation of Promises in Python
 EAPI=6
 HOMEPAGE=https://github.com/syrusakbary/promise
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=virtual/python-typing[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=virtual/python-typing[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/promise/promise-2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8fcbe9ec1d46faefe1b0f02458b904f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1367df703d219a5e5ac647b6b1ef065a
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 ab03102a3cad..c8fbc2921dc5 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-1.0.15
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-1.0.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8355937be92dc74d3e752b1a5d95dc09
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c050118ce97f102ceba5a4469b05eb0b
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.10 b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.10
index 044de3c71849..6563f4420b93 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.10
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.10
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-2.0.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ba81dfa5fbd55ea9efb3d1f33bf4dccd
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.6 b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.6
index 144fbcf9947e..454abb7b7d29 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.6
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wcwidth[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wcwidth[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-2.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83e58a581aeba30ab1ba068d3b4ee044
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=629f8089f8dab421e2362829310f85b1
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.7 b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.7
index 398031552ac5..b6afe07f4587 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-2.0.7
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-2.0.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Building powerful interactive command lines in Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/prompt_toolkit/ https://github.com/jonathanslenders/python-prompt-toolkit
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prompt_toolkit/prompt_toolkit-2.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7d4fbdfcd36c84f3dc4af71cbeeaf57
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d926a6875e33d582aa6db4638e99065
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.10.1 b/metadata/md5-cache/dev-python/protobuf-python-3.10.1
index 3b3cf44e0d47..71ac9d95146c 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.10.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.10.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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0/21
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.10.1.tar.gz -> protobuf-3.10.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2b0ea0eee681dbf7656fc94fbee82ae4
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.11.2 b/metadata/md5-cache/dev-python/protobuf-python-3.11.2
index 6e2441ce9046..525cfa4a3d88 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.11.2
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.11.2
@@ -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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0/22
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.11.2.tar.gz -> protobuf-3.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dbdf7de6e49312a51976e1331443a36f
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.8.0 b/metadata/md5-cache/dev-python/protobuf-python-3.8.0
index dce710aab0bf..38b75df25b3e 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.8.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.8.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_6 python_targets_python3_7 )
 SLOT=0/19
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz -> protobuf-3.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=abc4aca8cfd3f6cf5ffc4886e51eed4f
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.9.1 b/metadata/md5-cache/dev-python/protobuf-python-3.9.1
index 2c11d1cb6e11..ebf67572e931 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.9.1
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.9.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_6 python_targets_python3_7 )
 SLOT=0/20
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.9.1.tar.gz -> protobuf-3.9.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4e5f3528300aa8a8e696be0380e765eb
diff --git a/metadata/md5-cache/dev-python/protobuf-python-3.9.2 b/metadata/md5-cache/dev-python/protobuf-python-3.9.2
index b2bfbe43a9dd..a21c6d5b073e 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-3.9.2
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.9.2
@@ -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_6 python_targets_python3_7 )
 SLOT=0/20
 SRC_URI=https://github.com/protocolbuffers/protobuf/archive/v3.9.2.tar.gz -> protobuf-3.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4e5f3528300aa8a8e696be0380e765eb
diff --git a/metadata/md5-cache/dev-python/protobuf-python-9999 b/metadata/md5-cache/dev-python/protobuf-python-9999
index f23a7da395d4..86a9190cd328 100644
--- a/metadata/md5-cache/dev-python/protobuf-python-9999
+++ b/metadata/md5-cache/dev-python/protobuf-python-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ~dev-libs/protobuf-9999 dev-python/namespace-google[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0/22
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a0c343bf02065015fb92a8d0ee996bf4
diff --git a/metadata/md5-cache/dev-python/prov-1.5.0 b/metadata/md5-cache/dev-python/prov-1.5.0
index 366bc97b885d..ce453ee71ae0 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.0
+++ b/metadata/md5-cache/dev-python/prov-1.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/prov/prov-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7efd079db8c6e662950e277496822322
diff --git a/metadata/md5-cache/dev-python/prov-1.5.1 b/metadata/md5-cache/dev-python/prov-1.5.1
index 0a8e81af5b13..3f72de48ca8a 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.1
+++ b/metadata/md5-cache/dev-python/prov-1.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prov/prov-1.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a1fd48ad1d38df11ae1f6a447c02647e
diff --git a/metadata/md5-cache/dev-python/prov-1.5.3 b/metadata/md5-cache/dev-python/prov-1.5.3
index dde2b441d4ab..3d3052ce7881 100644
--- a/metadata/md5-cache/dev-python/prov-1.5.3
+++ b/metadata/md5-cache/dev-python/prov-1.5.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/prov/prov-1.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a1fd48ad1d38df11ae1f6a447c02647e
diff --git a/metadata/md5-cache/dev-python/pslab-python-1.0.1 b/metadata/md5-cache/dev-python/pslab-python-1.0.1
index 85e0eefecefd..b6d9c0207ae1 100644
--- a/metadata/md5-cache/dev-python/pslab-python-1.0.1
+++ b/metadata/md5-cache/dev-python/pslab-python-1.0.1
@@ -11,5 +11,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/fossasia/pslab-python/archive/v1.0.1.tar.gz -> pslab-python-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4aa7e3c60c31fde795c9abaceb006cc6
diff --git a/metadata/md5-cache/dev-python/psutil-5.4.8 b/metadata/md5-cache/dev-python/psutil-5.4.8
index 57725d744a26..e210425a74c4 100644
--- a/metadata/md5-cache/dev-python/psutil-5.4.8
+++ b/metadata/md5-cache/dev-python/psutil-5.4.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.4.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2746274353fa900ac6e7bacaa6d7e8f3
diff --git a/metadata/md5-cache/dev-python/psutil-5.5.0 b/metadata/md5-cache/dev-python/psutil-5.5.0
index 79a3907c005f..2c173d559504 100644
--- a/metadata/md5-cache/dev-python/psutil-5.5.0
+++ b/metadata/md5-cache/dev-python/psutil-5.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=43a3ec2b30c96972d7daf8948e90a584
diff --git a/metadata/md5-cache/dev-python/psutil-5.6.0 b/metadata/md5-cache/dev-python/psutil-5.6.0
index 98853527953a..aa1821cb4e56 100644
--- a/metadata/md5-cache/dev-python/psutil-5.6.0
+++ b/metadata/md5-cache/dev-python/psutil-5.6.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e7a1d5ff078a218d254e7e44595c228c
diff --git a/metadata/md5-cache/dev-python/psutil-5.6.5 b/metadata/md5-cache/dev-python/psutil-5.6.5
index 06bf155d49f9..f21e503607c8 100644
--- a/metadata/md5-cache/dev-python/psutil-5.6.5
+++ b/metadata/md5-cache/dev-python/psutil-5.6.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.6.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5a2906684881da1184c1b8e958959458
diff --git a/metadata/md5-cache/dev-python/psutil-5.6.7 b/metadata/md5-cache/dev-python/psutil-5.6.7
index f5737c178e79..a2319f69beca 100644
--- a/metadata/md5-cache/dev-python/psutil-5.6.7
+++ b/metadata/md5-cache/dev-python/psutil-5.6.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/psutil/psutil-5.6.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f27bf664b3994814accb106ad6ee47c9
diff --git a/metadata/md5-cache/dev-python/psycopg-2.7.4 b/metadata/md5-cache/dev-python/psycopg-2.7.4
index b5acf95598fd..7e1b2062f2db 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_6 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=67a419861b52e226f0319ee27b08e680
diff --git a/metadata/md5-cache/dev-python/psycopg-2.7.5 b/metadata/md5-cache/dev-python/psycopg-2.7.5
index 67604642c02b..8b9f545ab858 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.7.5
+++ b/metadata/md5-cache/dev-python/psycopg-2.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a2300bd890d5b9c51a6b6e6724764ee
diff --git a/metadata/md5-cache/dev-python/psycopg-2.7.7 b/metadata/md5-cache/dev-python/psycopg-2.7.7
index afbbe4f664b1..c1ed57213f07 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.7.7
+++ b/metadata/md5-cache/dev-python/psycopg-2.7.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.7.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c279621e135eb2af9681ff52a4ad739a
diff --git a/metadata/md5-cache/dev-python/psycopg-2.8.3 b/metadata/md5-cache/dev-python/psycopg-2.8.3
index 8048a4cc5e6b..e9582c5edc6e 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.8.3
+++ b/metadata/md5-cache/dev-python/psycopg-2.8.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.8.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12c904eb97260f15b24df7860c25302f
diff --git a/metadata/md5-cache/dev-python/psycopg-2.8.4 b/metadata/md5-cache/dev-python/psycopg-2.8.4
index 938981152704..9e5b7af8ac77 100644
--- a/metadata/md5-cache/dev-python/psycopg-2.8.4
+++ b/metadata/md5-cache/dev-python/psycopg-2.8.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/psycopg2/psycopg2-2.8.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12c904eb97260f15b24df7860c25302f
diff --git a/metadata/md5-cache/dev-python/ptpython-0.33-r1 b/metadata/md5-cache/dev-python/ptpython-0.33-r1
index 0bf9c4a21c3a..2f55ee21967e 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/ptpython/ptpython-0.33.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ac35daa3fa88aab18146a3a7376d6a7
diff --git a/metadata/md5-cache/dev-python/ptpython-2.0.6 b/metadata/md5-cache/dev-python/ptpython-2.0.6
index 34801e8bfaf3..56f2b64b4fe1 100644
--- a/metadata/md5-cache/dev-python/ptpython-2.0.6
+++ b/metadata/md5-cache/dev-python/ptpython-2.0.6
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptpython/ptpython-2.0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0cbf41895c3a7041ce61781be5504693
diff --git a/metadata/md5-cache/dev-python/ptvsd-3.2.1 b/metadata/md5-cache/dev-python/ptvsd-3.2.1
index 506b45437a7b..d4c6551138f9 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/59/de/54ad88ba555ce66920165949febf4810359c000c4c73568a6215603b437d/ptvsd-3.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=210110298c0a5670749dec9287e4fbe1
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.5.1 b/metadata/md5-cache/dev-python/ptyprocess-0.5.1
index 80a7873cffa2..e20f0da1a99e 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.5.1
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptyprocess/ptyprocess-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=24c9fd62ab7ce6b7c659e427995c83a8
diff --git a/metadata/md5-cache/dev-python/ptyprocess-0.5.2 b/metadata/md5-cache/dev-python/ptyprocess-0.5.2
index 63b57224567c..c276cfd7ea67 100644
--- a/metadata/md5-cache/dev-python/ptyprocess-0.5.2
+++ b/metadata/md5-cache/dev-python/ptyprocess-0.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/ptyprocess/ptyprocess-0.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=239a928d2320d5d6893e9a9ddef4e4dc
diff --git a/metadata/md5-cache/dev-python/publicsuffix-2.20190205 b/metadata/md5-cache/dev-python/publicsuffix-2.20190205
index 4115aabece2a..361955723b0f 100644
--- a/metadata/md5-cache/dev-python/publicsuffix-2.20190205
+++ b/metadata/md5-cache/dev-python/publicsuffix-2.20190205
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/publicsuffix2/publicsuffix2-2.20190205.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=680f1b4dc1fa455cba847f3ce46f01cb
diff --git a/metadata/md5-cache/dev-python/pudb-2017.1.4 b/metadata/md5-cache/dev-python/pudb-2017.1.4
index a35789eb2466..ccbbf876d15f 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2017.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=21bbe2e3f5a168d5a8518279d14b3f6e
diff --git a/metadata/md5-cache/dev-python/pudb-2018.1 b/metadata/md5-cache/dev-python/pudb-2018.1
index 76a0c1fc8fd9..6d0f8fb02cab 100644
--- a/metadata/md5-cache/dev-python/pudb-2018.1
+++ b/metadata/md5-cache/dev-python/pudb-2018.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pudb/pudb-2018.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=458160dc5b5a2c4d702096aba6748d12
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 8d7f8b5fa9be..82a351f114a2 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9eb031e349699ca834a98015e32d9db1
diff --git a/metadata/md5-cache/dev-python/pupynere-1.0.15-r2 b/metadata/md5-cache/dev-python/pupynere-1.0.15-r2
index 8736dea5dc52..5b707d28a640 100644
--- a/metadata/md5-cache/dev-python/pupynere-1.0.15-r2
+++ b/metadata/md5-cache/dev-python/pupynere-1.0.15-r2
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_singl
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58170bce028bd27625b02abc7cba8664
diff --git a/metadata/md5-cache/dev-python/pure-sasl-0.6.1 b/metadata/md5-cache/dev-python/pure-sasl-0.6.1
index ba4e87382dfc..e87d715e1714 100644
--- a/metadata/md5-cache/dev-python/pure-sasl-0.6.1
+++ b/metadata/md5-cache/dev-python/pure-sasl-0.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pure-sasl/pure-sasl-0.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4d230f523014106e1791e5d69aef8ed6
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 bec832e4a2e5..ea2da2741624 100644
--- a/metadata/md5-cache/dev-python/pushbullet-py-0.11.0
+++ b/metadata/md5-cache/dev-python/pushbullet-py-0.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pushbullet-py/pushbullet.py-0.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ca5b91e0c61dbea1b692b7da27fa5962
diff --git a/metadata/md5-cache/dev-python/pweave-0.30.3 b/metadata/md5-cache/dev-python/pweave-0.30.3
index cb5108896887..562626797217 100644
--- a/metadata/md5-cache/dev-python/pweave-0.30.3
+++ b/metadata/md5-cache/dev-python/pweave-0.30.3
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/ipython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nbformat[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/notebook[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Scientific report generator and literate programming tool
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pweave/Pweave-0.30.3.tar.gz -> pweave-0.30.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6add629efbc9f4995cc59c34f51474e3
diff --git a/metadata/md5-cache/dev-python/pxml-0.2.12 b/metadata/md5-cache/dev-python/pxml-0.2.12
index 2aef79221387..5172a4be82df 100644
--- a/metadata/md5-cache/dev-python/pxml-0.2.12
+++ b/metadata/md5-cache/dev-python/pxml-0.2.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pxml/pxml-0.2.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f350fa10f605ce44a0c08b7d7f4b8dc
diff --git a/metadata/md5-cache/dev-python/py-1.4.30 b/metadata/md5-cache/dev-python/py-1.4.30
index b11622052fb7..6255b71e2c0c 100644
--- a/metadata/md5-cache/dev-python/py-1.4.30
+++ b/metadata/md5-cache/dev-python/py-1.4.30
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f769555a7eae6a9d6a93af1b23e4614d
diff --git a/metadata/md5-cache/dev-python/py-1.4.34 b/metadata/md5-cache/dev-python/py-1.4.34
index 98ad280edb8d..04cd5500dac5 100644
--- a/metadata/md5-cache/dev-python/py-1.4.34
+++ b/metadata/md5-cache/dev-python/py-1.4.34
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.4.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0655d42042bae77b91307ba80cd3af51
diff --git a/metadata/md5-cache/dev-python/py-1.5.2 b/metadata/md5-cache/dev-python/py-1.5.2
index 13cccd69fc10..4cde5c009539 100644
--- a/metadata/md5-cache/dev-python/py-1.5.2
+++ b/metadata/md5-cache/dev-python/py-1.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b445c602426c8af2bf79c9bf9fea3b7
diff --git a/metadata/md5-cache/dev-python/py-1.5.3 b/metadata/md5-cache/dev-python/py-1.5.3
index 29a47f29bf4e..4e2f6dc51c1a 100644
--- a/metadata/md5-cache/dev-python/py-1.5.3
+++ b/metadata/md5-cache/dev-python/py-1.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=588c39e1cccbc1e99c273972dce04d0e
diff --git a/metadata/md5-cache/dev-python/py-1.5.4 b/metadata/md5-cache/dev-python/py-1.5.4
index 8d430a250339..b21ca1987d43 100644
--- a/metadata/md5-cache/dev-python/py-1.5.4
+++ b/metadata/md5-cache/dev-python/py-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f6707c309fdc4ecd44c0d5f1f4dd76c2
diff --git a/metadata/md5-cache/dev-python/py-1.8.0 b/metadata/md5-cache/dev-python/py-1.8.0
index 02062dab0901..21983758ba82 100644
--- a/metadata/md5-cache/dev-python/py-1.8.0
+++ b/metadata/md5-cache/dev-python/py-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/py/py-1.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=55dbe37c69549bd90f5214b1bf66bfb5
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 50f525d19fbd..c219a2460545 100644
--- a/metadata/md5-cache/dev-python/py-amqp-2.3.2
+++ b/metadata/md5-cache/dev-python/py-amqp-2.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-2.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=482b4f171ee0f4bcee1757ca57fc30c9
diff --git a/metadata/md5-cache/dev-python/py-amqp-2.4.2 b/metadata/md5-cache/dev-python/py-amqp-2.4.2
index 410e8908db8d..ea69d9d08cd4 100644
--- a/metadata/md5-cache/dev-python/py-amqp-2.4.2
+++ b/metadata/md5-cache/dev-python/py-amqp-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-2.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a2d19dcd7f87593bbaf3838f0245e113
diff --git a/metadata/md5-cache/dev-python/py-amqp-2.5.0 b/metadata/md5-cache/dev-python/py-amqp-2.5.0
index 751e8930719b..10a58b294c10 100644
--- a/metadata/md5-cache/dev-python/py-amqp-2.5.0
+++ b/metadata/md5-cache/dev-python/py-amqp-2.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/amqp/amqp-2.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e35fd48354a36a62d39c1efe21b5f17e
diff --git a/metadata/md5-cache/dev-python/py-cpuinfo-5.0.0-r1 b/metadata/md5-cache/dev-python/py-cpuinfo-5.0.0-r1
index 1e68adabbcf1..5d94d9674b45 100644
--- a/metadata/md5-cache/dev-python/py-cpuinfo-5.0.0-r1
+++ b/metadata/md5-cache/dev-python/py-cpuinfo-5.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-cpuinfo/py-cpuinfo-5.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f59edeeb5f79abba5038cd3ade99c95b
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 2c4bd9cbf144..db54d0c74f04 100644
--- a/metadata/md5-cache/dev-python/py-gfm-0.1.1
+++ b/metadata/md5-cache/dev-python/py-gfm-0.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Github-Flavored Markdown for Python-Markdown
 EAPI=5
 HOMEPAGE=https://github.com/google/py-gfm
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/markdown[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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7725addd274da4e5cd3d8cc7f6f4aca1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56379442b210f2794baf60f77d0dd4b7
diff --git a/metadata/md5-cache/dev-python/py-gfm-0.1.4 b/metadata/md5-cache/dev-python/py-gfm-0.1.4
index 0b8b4dac1992..f6852e053508 100644
--- a/metadata/md5-cache/dev-python/py-gfm-0.1.4
+++ b/metadata/md5-cache/dev-python/py-gfm-0.1.4
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)]
+DEPEND=dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Github-Flavored Markdown for Python-Markdown
 EAPI=7
 HOMEPAGE=https://github.com/Zopieux/py-gfm
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/markdown[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Zopieux/py-gfm/archive/0.1.4.tar.gz -> py-gfm-0.1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c3763a85c4532739d59a1acb0733c839
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5fe257a7c5132e8d1806fb35f5876213
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 9080146d77fc..7222d82b451e 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py-lz4framed/py-lz4framed-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9537ce97bb275c9b1c85c79a518f55bd
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 711451d847b5..7b96355e3ef6 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.10.0
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.10.0
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Universal Binary JSON encoder/decoder
 EAPI=6
 HOMEPAGE=https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9b61e6886ba3f70637301bf976d9db08
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82523b08ce3760668daac018395addb0
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 897ad2bbb2b2..03c571391b51 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.11.0
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.11.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Universal Binary JSON encoder/decoder
 EAPI=6
 HOMEPAGE=https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[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
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d653fd5fd648d5b7d547988a30a7d2f8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=372e912da828102e850738166c7b2f84
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 78ac2e839e6b..4092c2a80c1b 100644
--- a/metadata/md5-cache/dev-python/py-ubjson-0.9.0
+++ b/metadata/md5-cache/dev-python/py-ubjson-0.9.0
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Universal Binary JSON encoder/decoder
 EAPI=6
 HOMEPAGE=https://github.com/Iotic-Labs/py-ubjson https://pypi.org/project/py-ubjson/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/py-ubjson/py-ubjson-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ff56f9f1f399426e85b690040918808
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=618c82bd9f05de56b5f7e256d8c39f87
diff --git a/metadata/md5-cache/dev-python/py2neo-3.1.2 b/metadata/md5-cache/dev-python/py2neo-3.1.2
index 25b16698c298..11340a7a90a4 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/py2neo/py2neo-3.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43758192cbf3fe25b702fc94c11376c9
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 1a6f0af5693b..f7e27f315518 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fcde34b4b0e05e2ef5a1b2e60c8fbbe7
diff --git a/metadata/md5-cache/dev-python/pyClamd-0.4.0 b/metadata/md5-cache/dev-python/pyClamd-0.4.0
index a26ea34aab92..a9e81929732e 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyClamd/pyClamd-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43b46a81702c4c52c6b052ac21790c48
diff --git a/metadata/md5-cache/dev-python/pyClamd-0.4.0-r1 b/metadata/md5-cache/dev-python/pyClamd-0.4.0-r1
index fc9a1fef10cc..1f960a44721f 100644
--- a/metadata/md5-cache/dev-python/pyClamd-0.4.0-r1
+++ b/metadata/md5-cache/dev-python/pyClamd-0.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyClamd/pyClamd-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f421f6751212e8ada4bbacd2d50481b
diff --git a/metadata/md5-cache/dev-python/pyFFTW-0.11.1 b/metadata/md5-cache/dev-python/pyFFTW-0.11.1
index a62b3d12a4bd..40b5a2cc399a 100644
--- a/metadata/md5-cache/dev-python/pyFFTW-0.11.1
+++ b/metadata/md5-cache/dev-python/pyFFTW-0.11.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pyFFTW/pyFFTW/archive/v0.11.1.tar.gz -> pyFFTW-0.11.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=acf234892c0c70409b79780fb4b4ad19
diff --git a/metadata/md5-cache/dev-python/pyFFTW-9999 b/metadata/md5-cache/dev-python/pyFFTW-9999
index 45d9b2d9abb7..9540b25111e9 100644
--- a/metadata/md5-cache/dev-python/pyFFTW-9999
+++ b/metadata/md5-cache/dev-python/pyFFTW-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=sci-libs/fftw-3.3:3.0= 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=acf234892c0c70409b79780fb4b4ad19
diff --git a/metadata/md5-cache/dev-python/pyGPG-0.2 b/metadata/md5-cache/dev-python/pyGPG-0.2
index fa45adcad897..268b7cee6e96 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pyGPG/pyGPG-0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a1464cdd734e150c483071b3135f7c15
diff --git a/metadata/md5-cache/dev-python/pyGPG-9999 b/metadata/md5-cache/dev-python/pyGPG-9999
index 3c98f8812296..b9b225fdc151 100644
--- a/metadata/md5-cache/dev-python/pyGPG-9999
+++ b/metadata/md5-cache/dev-python/pyGPG-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-crypt/gnupg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bbe420584e195dc8f70b1a0cd9224866
diff --git a/metadata/md5-cache/dev-python/pyTenable-0.3.18 b/metadata/md5-cache/dev-python/pyTenable-0.3.18
index 9ff95b1fcf55..e48165f10f5d 100644
--- a/metadata/md5-cache/dev-python/pyTenable-0.3.18
+++ b/metadata/md5-cache/dev-python/pyTenable-0.3.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyTenable/pyTenable-0.3.18.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d56180cbdb78670da055ed0973302b0b
diff --git a/metadata/md5-cache/dev-python/pyTenable-0.3.19 b/metadata/md5-cache/dev-python/pyTenable-0.3.19
index 675419c29752..3f23f11b8bf1 100644
--- a/metadata/md5-cache/dev-python/pyTenable-0.3.19
+++ b/metadata/md5-cache/dev-python/pyTenable-0.3.19
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyTenable/pyTenable-0.3.19.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d56180cbdb78670da055ed0973302b0b
diff --git a/metadata/md5-cache/dev-python/pyTenable-0.3.20 b/metadata/md5-cache/dev-python/pyTenable-0.3.20
index 649d5207e21b..820d1acb9179 100644
--- a/metadata/md5-cache/dev-python/pyTenable-0.3.20
+++ b/metadata/md5-cache/dev-python/pyTenable-0.3.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyTenable/pyTenable-0.3.20.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d56180cbdb78670da055ed0973302b0b
diff --git a/metadata/md5-cache/dev-python/pyTenable-0.3.7 b/metadata/md5-cache/dev-python/pyTenable-0.3.7
index 628a9a81d91e..c40d092d4c38 100644
--- a/metadata/md5-cache/dev-python/pyTenable-0.3.7
+++ b/metadata/md5-cache/dev-python/pyTenable-0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyTenable/pyTenable-0.3.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f732386ddcae5bcb55c8c9943e049b45
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.1.7 b/metadata/md5-cache/dev-python/pyacoustid-1.1.7
index af1ff24bd7c7..4f4017dadae8 100644
--- a/metadata/md5-cache/dev-python/pyacoustid-1.1.7
+++ b/metadata/md5-cache/dev-python/pyacoustid-1.1.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/audioread[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyacoustid/pyacoustid-1.1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4b57784ab3915a514af515c3aeba26ca
diff --git a/metadata/md5-cache/dev-python/pyaes-1.6.0 b/metadata/md5-cache/dev-python/pyaes-1.6.0
index 187f6129aeba..0c80183f1cde 100644
--- a/metadata/md5-cache/dev-python/pyaes-1.6.0
+++ b/metadata/md5-cache/dev-python/pyaes-1.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pure-Python Implementation of the AES block-cipher and common modes of operation
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pyaes/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pyaes/pyaes-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=abb1b469fbe6e5e92c659ae438d95ec2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=064cb61c0213a85e6588b355cae7cb38
diff --git a/metadata/md5-cache/dev-python/pyaes-1.6.1-r1 b/metadata/md5-cache/dev-python/pyaes-1.6.1-r1
index 6062be2650fc..3a927cfdfcff 100644
--- a/metadata/md5-cache/dev-python/pyaes-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/pyaes-1.6.1-r1
@@ -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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Pure-Python Implementation of the AES block-cipher and common modes of operation
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pyaes/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyaes/pyaes-1.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fd579dc050e0d8380a858f08e4ad474
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=962b3ab11ddefde28cd7805c6c388e21
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.0.29 b/metadata/md5-cache/dev-python/pyalsa-1.0.29
index 61c86f254892..0bccebe0e6ef 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_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/pyalsa/pyalsa-1.0.29.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53f63499aec44be1dc7b7e74ac875b1e
diff --git a/metadata/md5-cache/dev-python/pyalsa-1.1.6 b/metadata/md5-cache/dev-python/pyalsa-1.1.6
index 634647cf89e0..ee903d54a342 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_python2_7? ( >=dev-lang/python-2.7.5-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/pyalsa/pyalsa-1.1.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9db642a90fa110a65f94e67920f05e80
diff --git a/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2 b/metadata/md5-cache/dev-python/pyalsaaudio-0.7-r2
index 667f403eb5f3..a630fef47ef5 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 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b0d521a33154174f331dcb791686711
diff --git a/metadata/md5-cache/dev-python/pyalsaaudio-0.8.2 b/metadata/md5-cache/dev-python/pyalsaaudio-0.8.2
index 88604ffc5856..b9ca31fcded8 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_6 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ddcf7f816bd427756273730e3dce0e6d
diff --git a/metadata/md5-cache/dev-python/pyamg-3.2.1-r1 b/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
index 3832203f39ee..97f058bd6b83 100644
--- a/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/pyamg-3.2.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyamg/pyamg-3.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9c16b8d749dee5dfc0bb1cbae46a4525
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.2.3 b/metadata/md5-cache/dev-python/pyasn1-0.2.3
index 7891a6863459..40a1f3e5348a 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48ed0c2a037909253b709a16575c5832
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.3.7 b/metadata/md5-cache/dev-python/pyasn1-0.3.7
index d53680b2ca78..a5919e8aa573 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=240cbdab46b12b2085e3a7d7dc7badd7
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.4.2 b/metadata/md5-cache/dev-python/pyasn1-0.4.2
index 3b14bb4e47aa..f531b4d7d45f 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16827e2dc1c6109e77e41360deb8e81c
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.4.3 b/metadata/md5-cache/dev-python/pyasn1-0.4.3
index 71ce21e35919..4b3e86e602dc 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.4.3
+++ b/metadata/md5-cache/dev-python/pyasn1-0.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=87148c8e7a325a915bed309eb171b4a3
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 278d0c165e53..d0be3763a860 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_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efde995eb5b65cda20b09499c85afd70
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 2c7f588bbe3b..41c1c30104af 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_pypy3(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e7aee2153c3466cd69c2b6061c9b7ef
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 cbb1c94d86ad..2b68194c3237 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_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c62ad0602df7659e7dec7d5979ab6bd9
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 f91e7094a54a..7c63dea18f25 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_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efde995eb5b65cda20b09499c85afd70
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 907be738a7a2..9f411091243b 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e6ffc8c5a2e8e91a3ed0dbec574d410
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 dd256a782977..ae5767ab7477 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=801172e6b4b89911b8043fd2c85b008e
diff --git a/metadata/md5-cache/dev-python/pyaudio-0.2.11 b/metadata/md5-cache/dev-python/pyaudio-0.2.11
index 4583402b2f15..b72b4eee8151 100644
--- a/metadata/md5-cache/dev-python/pyaudio-0.2.11
+++ b/metadata/md5-cache/dev-python/pyaudio-0.2.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/portaudio doc? ( dev-python/sphinx ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=media-libs/portaudio doc? ( dev-python/sphinx ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python bindings for PortAudio
 EAPI=5
 HOMEPAGE=http://people.csail.mit.edu/hubert/pyaudio/
-IUSE=doc python_targets_python2_7 python_targets_python3_6
+IUSE=doc python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=media-libs/portaudio python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=media-libs/portaudio 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
 SRC_URI=mirror://pypi/P/PyAudio/PyAudio-0.2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2cd94a9f4b178044e30c1bd1e76395fc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed86e6350f61bd9028f53b981743fab1
diff --git a/metadata/md5-cache/dev-python/pybind11-2.4.3 b/metadata/md5-cache/dev-python/pybind11-2.4.3
index 4213de82bc8d..7d747d4b2534 100644
--- a/metadata/md5-cache/dev-python/pybind11-2.4.3
+++ b/metadata/md5-cache/dev-python/pybind11-2.4.3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pybind11/pybind11-2.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d97ccb688c3bd5bb3401910d74d62ae4
diff --git a/metadata/md5-cache/dev-python/pyblake2-1.1.2 b/metadata/md5-cache/dev-python/pyblake2-1.1.2
index a0ec0de57447..b8f6fff6d85c 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyblake2/pyblake2-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03c0094eb088e0019c998d639fb15f02
diff --git a/metadata/md5-cache/dev-python/pybluez-0.18-r1 b/metadata/md5-cache/dev-python/pybluez-0.18-r1
index 5fedcfbf4c66..961689406ba1 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_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/PyBluez-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c98eebcc6a7dee35b3c67eddab6292fb
diff --git a/metadata/md5-cache/dev-python/pybluez-0.22 b/metadata/md5-cache/dev-python/pybluez-0.22
index a35b45f9a2b1..4e78ba5b1c38 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_python2_7? ( >=dev-lang/python-2.7.5-r
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyBluez/PyBluez-0.22.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce030a31fcce0048f2f3d78c3a945868
diff --git a/metadata/md5-cache/dev-python/pycadf-2.9.0-r1 b/metadata/md5-cache/dev-python/pycadf-2.9.0-r1
index 0659b0fc5662..5ee4291045a2 100644
--- a/metadata/md5-cache/dev-python/pycadf-2.9.0-r1
+++ b/metadata/md5-cache/dev-python/pycadf-2.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycadf/pycadf-2.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f61f321429013588595ec72fa8b04a6e
diff --git a/metadata/md5-cache/dev-python/pycairo-1.18.2 b/metadata/md5-cache/dev-python/pycairo-1.18.2
index 800b1d34ca03..b2599023c143 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.18.2
+++ b/metadata/md5-cache/dev-python/pycairo-1.18.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.18.2/pycairo-1.18.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b04d63f278cef1050fd00dafc0d8730b
diff --git a/metadata/md5-cache/dev-python/pycapnp-0.6.2 b/metadata/md5-cache/dev-python/pycapnp-0.6.2
index 392a2a1a61ce..69be65ccde8d 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_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycapnp/pycapnp-0.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5773073b3edc363c3a31bca659f82ffc
diff --git a/metadata/md5-cache/dev-python/pycapnp-0.6.3 b/metadata/md5-cache/dev-python/pycapnp-0.6.3
index d4cfaf2b2875..583072834110 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_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycapnp/pycapnp-0.6.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5773073b3edc363c3a31bca659f82ffc
diff --git a/metadata/md5-cache/dev-python/pycapnp-0.6.4 b/metadata/md5-cache/dev-python/pycapnp-0.6.4
index 3295ba63a563..3958c35ef128 100644
--- a/metadata/md5-cache/dev-python/pycapnp-0.6.4
+++ b/metadata/md5-cache/dev-python/pycapnp-0.6.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/capnproto-0.6:= python_targets_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycapnp/pycapnp-0.6.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0e94980eb8e9690c4507d42975a344de
diff --git a/metadata/md5-cache/dev-python/pycares-3.1.0_p3 b/metadata/md5-cache/dev-python/pycares-3.1.0_p3
index bfb189b08b41..eae13ebc07c6 100644
--- a/metadata/md5-cache/dev-python/pycares-3.1.0_p3
+++ b/metadata/md5-cache/dev-python/pycares-3.1.0_p3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/saghul/pycares/archive/pycares-3.1.0-fix3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=630612fe15b59ca2141ee72328eb397e
diff --git a/metadata/md5-cache/dev-python/pycares-3.1.1 b/metadata/md5-cache/dev-python/pycares-3.1.1
index c4ef8cda9969..4e75b3bcd291 100644
--- a/metadata/md5-cache/dev-python/pycares-3.1.1
+++ b/metadata/md5-cache/dev-python/pycares-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/saghul/pycares/archive/pycares-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e998d358a78047d50aaecd22d6708535
diff --git a/metadata/md5-cache/dev-python/pycdio-2.1.0 b/metadata/md5-cache/dev-python/pycdio-2.1.0
index b9bf200f7981..c1970bdfe491 100644
--- a/metadata/md5-cache/dev-python/pycdio-2.1.0
+++ b/metadata/md5-cache/dev-python/pycdio-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libcdio-2.0.0 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycdio/pycdio-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c60c60a97ed37b03a54fc4866a8d116b
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 e4208ef0fc0a..f0f95a3db3f8 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c5492387e63058841fece7270b9d02e
diff --git a/metadata/md5-cache/dev-python/pychm-0.8.5 b/metadata/md5-cache/dev-python/pychm-0.8.5
index a62e0c709a0f..a36490e774f7 100644
--- a/metadata/md5-cache/dev-python/pychm-0.8.5
+++ b/metadata/md5-cache/dev-python/pychm-0.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dottedmag/pychm/archive/v0.8.5.tar.gz -> pychm-0.8.5.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=98e9886ad8bcdd4f72eed275bb46892c
diff --git a/metadata/md5-cache/dev-python/pychm-0.8.6 b/metadata/md5-cache/dev-python/pychm-0.8.6
index fb3f8aa8f459..72a535b9b53d 100644
--- a/metadata/md5-cache/dev-python/pychm-0.8.6
+++ b/metadata/md5-cache/dev-python/pychm-0.8.6
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/chmlib ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-libs/chmlib dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/chmlib
 DESCRIPTION=Python bindings for the chmlib library
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dottedmag/pychm/archive/v0.8.6.tar.gz -> pychm-0.8.6.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea9b8c684e5d65f5580764886ccd044d
diff --git a/metadata/md5-cache/dev-python/pychromecast-4.1.0 b/metadata/md5-cache/dev-python/pychromecast-4.1.0
index 2f72cf449c0f..a5f593a9d0e5 100644
--- a/metadata/md5-cache/dev-python/pychromecast-4.1.0
+++ b/metadata/md5-cache/dev-python/pychromecast-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyChromecast/PyChromecast-4.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=81280cdf5d1aae69f32b242deb37b4e6
diff --git a/metadata/md5-cache/dev-python/pychroot-0.10.1 b/metadata/md5-cache/dev-python/pychroot-0.10.1
index 3ef5d972e330..ebf66fbc05d3 100644
--- a/metadata/md5-cache/dev-python/pychroot-0.10.1
+++ b/metadata/md5-cache/dev-python/pychroot-0.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pychroot/pychroot-0.10.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b2754921bf36cef6c1a4da0ccdff6b5c
diff --git a/metadata/md5-cache/dev-python/pychroot-9999 b/metadata/md5-cache/dev-python/pychroot-9999
index b0be9443938f..68e46d4457fa 100644
--- a/metadata/md5-cache/dev-python/pychroot-9999
+++ b/metadata/md5-cache/dev-python/pychroot-9999
@@ -11,5 +11,5 @@ RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b2754921bf36cef6c1a4da0ccdff6b5c
diff --git a/metadata/md5-cache/dev-python/pyclipper-1.1.0 b/metadata/md5-cache/dev-python/pyclipper-1.1.0
index 927da153009e..50fdc4fb1ee7 100644
--- a/metadata/md5-cache/dev-python/pyclipper-1.1.0
+++ b/metadata/md5-cache/dev-python/pyclipper-1.1.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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/fonttools/pyclipper/archive/1.1.0.tar.gz -> pyclipper-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b163edcde4de6e5efc8ef428c6b3f5e2
diff --git a/metadata/md5-cache/dev-python/pycmd-1.2 b/metadata/md5-cache/dev-python/pycmd-1.2
index 27907e66210a..996d7b9a1751 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_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycmd/pycmd-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16757e1e12f8235f46ce9c68ce5edb01
diff --git a/metadata/md5-cache/dev-python/pycobertura-0.10.0 b/metadata/md5-cache/dev-python/pycobertura-0.10.0
index 3ea95673c4fc..9b0e96024952 100644
--- a/metadata/md5-cache/dev-python/pycobertura-0.10.0
+++ b/metadata/md5-cache/dev-python/pycobertura-0.10.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycobertura/pycobertura-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed0694f21c0432dd872d21542109b1b4
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.3.1 b/metadata/md5-cache/dev-python/pycodestyle-2.3.1
index d3ff0193bd34..1403c90cf188 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=875b24f90213c16b3862d0b39de89850
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.4.0 b/metadata/md5-cache/dev-python/pycodestyle-2.4.0
index 3c813259b92d..886ed6795334 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=09af0de8e595f4812764eff79af2c1c9
diff --git a/metadata/md5-cache/dev-python/pycodestyle-2.5.0 b/metadata/md5-cache/dev-python/pycodestyle-2.5.0
index 2928e3f5dbb2..c083841156b8 100644
--- a/metadata/md5-cache/dev-python/pycodestyle-2.5.0
+++ b/metadata/md5-cache/dev-python/pycodestyle-2.5.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycodestyle/pycodestyle-2.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c3e29eafabaa63d1eb54795111daffb1
diff --git a/metadata/md5-cache/dev-python/pycollada-0.6-r1 b/metadata/md5-cache/dev-python/pycollada-0.6-r1
index 62980299a86f..95dfa63b6abd 100644
--- a/metadata/md5-cache/dev-python/pycollada-0.6-r1
+++ b/metadata/md5-cache/dev-python/pycollada-0.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycollada/pycollada/archive/v0.6.tar.gz -> pycollada-0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=12a6691d5e402e5efdc22ee64d91f2d3
diff --git a/metadata/md5-cache/dev-python/pycountry-19.8.18 b/metadata/md5-cache/dev-python/pycountry-19.8.18
index 271e2b37dda0..dad7b82d7a44 100644
--- a/metadata/md5-cache/dev-python/pycountry-19.8.18
+++ b/metadata/md5-cache/dev-python/pycountry-19.8.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycountry/pycountry-19.8.18.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c83893762e4c87a8976697ef1d00499
diff --git a/metadata/md5-cache/dev-python/pycparser-2.14 b/metadata/md5-cache/dev-python/pycparser-2.14
index e3435742f4e5..4f48b81f569a 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.14
+++ b/metadata/md5-cache/dev-python/pycparser-2.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f8082bc2c2861f0595698e677973ec9
diff --git a/metadata/md5-cache/dev-python/pycparser-2.18-r1 b/metadata/md5-cache/dev-python/pycparser-2.18-r1
index 9e497a81b3c2..ef665d6b47ff 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.18-r1
+++ b/metadata/md5-cache/dev-python/pycparser-2.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=849ea9ff7df9fb8fb707254169268902
diff --git a/metadata/md5-cache/dev-python/pycparser-2.19-r1 b/metadata/md5-cache/dev-python/pycparser-2.19-r1
index d2bb4121d7ee..cd67d5da71aa 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.19-r1
+++ b/metadata/md5-cache/dev-python/pycparser-2.19-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96fd0d609208a6e0bcb30c4d43f0e8a0
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 ba359019ee00..3781342a09d0 100644
--- a/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
+++ b/metadata/md5-cache/dev-python/pycrypto-2.6.1-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( gmp ) || ( python_targets_python2_7 python_targets_python3_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d728389060325bbe1a79995b205ab6a
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.4.6 b/metadata/md5-cache/dev-python/pycryptodome-3.4.6
index 900d1abcde47..c0eefad686f3 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_pypy3(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de10da4740d46146925b73fc4aa94959
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.4.7 b/metadata/md5-cache/dev-python/pycryptodome-3.4.7
index 1cdce5881b5d..b63629417de6 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_pypy3(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.4.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e5b8e15202f631d2131ab433b854782
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.6.6 b/metadata/md5-cache/dev-python/pycryptodome-3.6.6
index ca8a63c1657f..1adc5123302e 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_pypy3(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.6.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c903102c0446aedb10d4416f8e02b297
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.7.3 b/metadata/md5-cache/dev-python/pycryptodome-3.7.3
index d8705f2591ce..358bee5179be 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.7.3
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.7.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy3(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.7.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0d3e461cd836a67ef7833ee072981e23
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.8.2 b/metadata/md5-cache/dev-python/pycryptodome-3.8.2
index f6703826b92f..6a57bda035a9 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.8.2
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.8.2
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy3(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0d3e461cd836a67ef7833ee072981e23
diff --git a/metadata/md5-cache/dev-python/pycryptodome-3.9.4 b/metadata/md5-cache/dev-python/pycryptodome-3.9.4
index f9d7d899c3ce..c8b5c9bd05b3 100644
--- a/metadata/md5-cache/dev-python/pycryptodome-3.9.4
+++ b/metadata/md5-cache/dev-python/pycryptodome-3.9.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gmp:0 virtual/python-cffi[python_targets_pypy3(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycryptodome/pycryptodome-3.9.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e2aa33e0ce3188055a7b416fa35dcd6f
diff --git a/metadata/md5-cache/dev-python/pycson-0.7 b/metadata/md5-cache/dev-python/pycson-0.7
index 35f2deb24800..d9dd5605f6e2 100644
--- a/metadata/md5-cache/dev-python/pycson-0.7
+++ b/metadata/md5-cache/dev-python/pycson-0.7
@@ -11,5 +11,5 @@ RDEPEND=dev-python/speg python_targets_python3_6? ( dev-lang/python:3.6 ) python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/avakar/pycson/archive/0.7.tar.gz -> pycson-0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dacaf727b9c3e9ef402793893e0374f0
diff --git a/metadata/md5-cache/dev-python/pycuda-2017.1 b/metadata/md5-cache/dev-python/pycuda-2017.1
index 2843e701023e..6cd0615e52d3 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_python3_6 )
 RESTRICT=userpriv !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2017.1.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=02660ebbe23d43152e8d48211528e800
diff --git a/metadata/md5-cache/dev-python/pycuda-2018.1.1 b/metadata/md5-cache/dev-python/pycuda-2018.1.1
index b978d9f47543..467675ef5fcd 100644
--- a/metadata/md5-cache/dev-python/pycuda-2018.1.1
+++ b/metadata/md5-cache/dev-python/pycuda-2018.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=userpriv !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycuda/pycuda-2018.1.1.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ab57a733a60d249863b13bc801288cae
diff --git a/metadata/md5-cache/dev-python/pycuda-9999 b/metadata/md5-cache/dev-python/pycuda-9999
index b30d7b3ea072..90ce02faa52c 100644
--- a/metadata/md5-cache/dev-python/pycuda-9999
+++ b/metadata/md5-cache/dev-python/pycuda-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost[python,python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=userpriv !test? ( test )
 SLOT=0
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f7e996bf0e1bc005e0526998c974c5f
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 a73371181299..485ef5264341 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73-r1
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=net-print/cups doc? ( dev-python/epydoc[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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-print/cups python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python bindings for the CUPS API
 EAPI=6
 HOMEPAGE=http://cyberelk.net/tim/data/pycups/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_6
+IUSE=examples python_targets_python3_6
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
-RDEPEND=net-print/cups python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=net-print/cups 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
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8992a71a34285893ec394dde5b79509f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a6fbf85743dfd2c13244abeb9ad57d2a
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.73-r2 b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
index a8ff2a97a1ca..c486332f8dfb 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.73-r2
+++ b/metadata/md5-cache/dev-python/pycups-1.9.73-r2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=net-print/cups doc? ( dev-python/epydoc[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-print/cups
 DESCRIPTION=Python bindings for the CUPS API
 EAPI=7
 HOMEPAGE=http://cyberelk.net/tim/data/pycups/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=examples python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
-RDEPEND=net-print/cups python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=net-print/cups 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.73.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=894b03b473438da1ca7a140b4f443568
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4bbb1a32face5fcbd17b45dfb6086022
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0 b/metadata/md5-cache/dev-python/pycurl-7.43.0
index 97af23441e28..7e1db625d36b 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.43.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=237e350e31f813aaf8526a86dd25c62e
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0.2 b/metadata/md5-cache/dev-python/pycurl-7.43.0.2
index aeb29c48ec72..a1214e2897ae 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0.2
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.43.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe3459f97b2c9fe3c091b9904586c357
diff --git a/metadata/md5-cache/dev-python/pycurl-7.43.0.3 b/metadata/md5-cache/dev-python/pycurl-7.43.0.3
index a82e74d80e93..0a0ac1f80abc 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.43.0.3
+++ b/metadata/md5-cache/dev-python/pycurl-7.43.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycurl/pycurl-7.43.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe3459f97b2c9fe3c091b9904586c357
diff --git a/metadata/md5-cache/dev-python/pycxx-6.2.6 b/metadata/md5-cache/dev-python/pycxx-6.2.6
index f7825c7e7687..03a8a0139d58 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/cxx/pycxx-6.2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2845a0bb52bb56cd630a664a0841d2a
diff --git a/metadata/md5-cache/dev-python/pydecomp-0.3 b/metadata/md5-cache/dev-python/pydecomp-0.3
index 0d7a00a90f03..990ec3c8c6e1 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/pydecomp/pyDeComp-0.3.tar.gz -> pydecomp-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6357c483151d5987d36f2a1b4519132f
diff --git a/metadata/md5-cache/dev-python/pydecomp-9999 b/metadata/md5-cache/dev-python/pydecomp-9999
index 09fc748c188a..cdec6bcd1a5d 100644
--- a/metadata/md5-cache/dev-python/pydecomp-9999
+++ b/metadata/md5-cache/dev-python/pydecomp-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9aee0641d30f9b86a6b2c67b01313d24
diff --git a/metadata/md5-cache/dev-python/pydiff-0.2 b/metadata/md5-cache/dev-python/pydiff-0.2
index b65ecdffbd99..2ca573b0428a 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydiff/pydiff-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f87a81fb5c2f0a2f7a421a43596c3b2d
diff --git a/metadata/md5-cache/dev-python/pydiff-0.2-r1 b/metadata/md5-cache/dev-python/pydiff-0.2-r1
index b7c4484b3fa4..c0cb909aefe4 100644
--- a/metadata/md5-cache/dev-python/pydiff-0.2-r1
+++ b/metadata/md5-cache/dev-python/pydiff-0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pydiff/pydiff-0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a9b91efcc252bd369feff8bb91d79d49
diff --git a/metadata/md5-cache/dev-python/pydispatcher-2.0.5 b/metadata/md5-cache/dev-python/pydispatcher-2.0.5
index 38a7faf83ef7..ed7fd1027c80 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a79cf4b071e9a225424de4ae361fb34a
diff --git a/metadata/md5-cache/dev-python/pydispatcher-2.1.2 b/metadata/md5-cache/dev-python/pydispatcher-2.1.2
index d170f302a13d..9e0f3c4cb6cf 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyPyDispatcher/PyPyDispatcher-2.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1087e8842874547beaf1422a31e7947e
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 f0bb18a46a1c..d8a41635b7b0 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2da5225c85652310ea1e6cd78ed1e31
diff --git a/metadata/md5-cache/dev-python/pydns-3.1.1 b/metadata/md5-cache/dev-python/pydns-3.1.1
index 099a14a97795..04b75bd17680 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_6 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://launchpad.net/py3dns/trunk/3.1.1/+download/py3dns-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9670d4f73e3b8224ad2ba355f9ebf361
diff --git a/metadata/md5-cache/dev-python/pydot-1.0.28-r2 b/metadata/md5-cache/dev-python/pydot-1.0.28-r2
deleted file mode 100644
index dcad2498a91e..000000000000
--- a/metadata/md5-cache/dev-python/pydot-1.0.28-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/graphviz 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(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python interface to Graphviz's Dot language
-EAPI=5
-HOMEPAGE=https://pypi.org/project/pydot/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=MIT
-RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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/pydot/pydot-1.0.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d94eec7926ba1348a343acea95228ff9
diff --git a/metadata/md5-cache/dev-python/pydot-1.2.3 b/metadata/md5-cache/dev-python/pydot-1.2.3
deleted file mode 100644
index ca4e1305d5ba..000000000000
--- a/metadata/md5-cache/dev-python/pydot-1.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] media-gfx/graphviz dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to Graphviz's Dot language
-EAPI=6
-HOMEPAGE=https://github.com/erocarrera/pydot https://pypi.org/project/pydot/
-IUSE=test python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=MIT
-RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/erocarrera/pydot/archive/v1.2.3.tar.gz -> pydot-1.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=666d7adf272d7262c709fc22adbf94c3
diff --git a/metadata/md5-cache/dev-python/pydot-1.4.1 b/metadata/md5-cache/dev-python/pydot-1.4.1
index 3fe21a826a44..3ce0c38ef800 100644
--- a/metadata/md5-cache/dev-python/pydot-1.4.1
+++ b/metadata/md5-cache/dev-python/pydot-1.4.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyparsing-2.1.4[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(-)] media-gfx/graphviz dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/chardet[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(-)] )
+DEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/graphviz dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python interface to Graphviz's Dot language
 EAPI=7
 HOMEPAGE=https://github.com/erocarrera/pydot https://pypi.org/project/pydot/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=MIT
-RDEPEND=>=dev-python/pyparsing-2.1.4[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(-)] media-gfx/graphviz python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pyparsing-2.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/graphviz 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pydot/archive/v1.4.1.tar.gz -> pydot-1.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=196babef32961b4f03074f3800283565
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8d4134ee60fcb12959380bc93cb75b9a
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 24d10bc42dc1..26228e947285 100644
--- a/metadata/md5-cache/dev-python/pydot-ng-1.0.0
+++ b/metadata/md5-cache/dev-python/pydot-ng-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pydot/pydot-ng/archive/1.0.0.tar.gz -> pydot-ng-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74a27498a19700550167728a78fd0376
diff --git a/metadata/md5-cache/dev-python/pydotplus-2.0.2 b/metadata/md5-cache/dev-python/pydotplus-2.0.2
index 473a0d7c98e5..7590882699c1 100644
--- a/metadata/md5-cache/dev-python/pydotplus-2.0.2
+++ b/metadata/md5-cache/dev-python/pydotplus-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Improved version of the old pydot project
 EAPI=6
 HOMEPAGE=http://pydotplus.readthedocs.org/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pyparsing[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
 SRC_URI=mirror://pypi/p/pydotplus/pydotplus-2.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9603fc72124d46a171274cef14bb7de4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c409149e60c7e3b2bda488dd79ee3875
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 efa16295a286..9aa3e2d66be1 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 ab316b58a8af..615d6e0e49da 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_python3_6(-)?,-python_singl
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a693e0f9bb067acb7d0fc0985290d28
diff --git a/metadata/md5-cache/dev-python/pyee-1.0.2 b/metadata/md5-cache/dev-python/pyee-1.0.2
index f887f7a4af10..c927ada57881 100644
--- a/metadata/md5-cache/dev-python/pyee-1.0.2
+++ b/metadata/md5-cache/dev-python/pyee-1.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A port of node.js's EventEmitter to python
 EAPI=5
 HOMEPAGE=https://pypi.org/project/pyee/ https://github.com/jfhbrook/pyee
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyee/pyee-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb49d5061023a195c070fb03c5da2a48
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d30f1ac85e7ca721a0e0840421aaf184
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.24 b/metadata/md5-cache/dev-python/pyelftools-0.24
index 648a203ef8bb..597e77be87de 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.24
+++ b/metadata/md5-cache/dev-python/pyelftools-0.24
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=pure-Python library for analyzing ELF files and DWARF debugging information
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools
-IUSE=examples python_targets_python2_7 python_targets_python3_6
+IUSE=examples python_targets_python3_6
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55bc5cd5d352ce1f9dcd0073da8d621a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d982aff56dc7e8db702e9dc0241f9c0e
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.24-r1 b/metadata/md5-cache/dev-python/pyelftools-0.24-r1
index a5d3302aae52..e0ff9ac381f2 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.24-r1
+++ b/metadata/md5-cache/dev-python/pyelftools-0.24-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pure-Python library for analyzing ELF files and DWARF debugging information
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools
-IUSE=examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=examples 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
 LICENSE=public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.24.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c04184311eb7284e42c8a5d1f5905920
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=76e4ad12552d335366768fb9f5547e64
diff --git a/metadata/md5-cache/dev-python/pyelftools-0.25 b/metadata/md5-cache/dev-python/pyelftools-0.25
index 39674d7f7bfa..3f7528b22cd8 100644
--- a/metadata/md5-cache/dev-python/pyelftools-0.25
+++ b/metadata/md5-cache/dev-python/pyelftools-0.25
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pure-Python library for analyzing ELF files and DWARF debugging information
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools
-IUSE=examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyelftools/pyelftools-0.25.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6bd449ac9ff1a5e2c1e43a63d738a042
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=409fb306fc0d20221e846e993ac191c9
diff --git a/metadata/md5-cache/dev-python/pyemf-2.0.0 b/metadata/md5-cache/dev-python/pyemf-2.0.0
index 234b1b1b6688..a8b3bacaf5d7 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-python2[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyemf/pyemf-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74e66bd3e5e4e58833406d669a7931d7
diff --git a/metadata/md5-cache/dev-python/pyenchant-1.6.6 b/metadata/md5-cache/dev-python/pyenchant-1.6.6
index 4ab4d155d4de..e7a0134881ce 100644
--- a/metadata/md5-cache/dev-python/pyenchant-1.6.6
+++ b/metadata/md5-cache/dev-python/pyenchant-1.6.6
@@ -4,12 +4,12 @@ DESCRIPTION=Python bindings for the Enchant spellchecking system
 EAPI=5
 HOMEPAGE=http://pyenchant.sourceforge.net https://pypi.org/project/pyenchant/
 IUSE=test python_targets_python2_7 python_targets_python3_6
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-text/enchant-1.6:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyenchant/pyenchant-1.6.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82f035d90caa76cbcb15fd1fe2995496
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd27240bc2df1d7e343d0e29482164ff
diff --git a/metadata/md5-cache/dev-python/pyenchant-1.6.8 b/metadata/md5-cache/dev-python/pyenchant-1.6.8
index ab4f21b25793..5b552211cf5f 100644
--- a/metadata/md5-cache/dev-python/pyenchant-1.6.8
+++ b/metadata/md5-cache/dev-python/pyenchant-1.6.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyenchant/pyenchant-1.6.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0134050c3b0d8a09ccb965f4bb6cfa6d
diff --git a/metadata/md5-cache/dev-python/pyenchant-2.0.0 b/metadata/md5-cache/dev-python/pyenchant-2.0.0
index 63550c6604be..9a9423c66a34 100644
--- a/metadata/md5-cache/dev-python/pyenchant-2.0.0
+++ b/metadata/md5-cache/dev-python/pyenchant-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyenchant/pyenchant-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cddeb9b8bdddc152206e02d5ad6aba3f
diff --git a/metadata/md5-cache/dev-python/pyev-0.9.0 b/metadata/md5-cache/dev-python/pyev-0.9.0
index f3dbafdf5906..bab914a7a23e 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_python3_6? ( dev-lang/python:3.6 ) >=dev-l
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyev/pyev-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=665411189eb2b72d7f79710c6e81df46
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.4.3 b/metadata/md5-cache/dev-python/pyfakefs-3.4.3
index 3308fde078c8..0e400a683734 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3b3837753c1129dc6dad921f82e01d6
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.5.8 b/metadata/md5-cache/dev-python/pyfakefs-3.5.8
index 2ff787b2e6ab..beaaa0fdd6a6 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-3.5.8
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.5.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.5.8.tar.gz -> pyfakefs-3.5.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=246fef5eb364bd07d7aff0fc1e6af320
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.7.1 b/metadata/md5-cache/dev-python/pyfakefs-3.7.1
index d3b114904ee3..ba9b2074a803 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-3.7.1
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.7.1
@@ -5,12 +5,12 @@ DESCRIPTION=a fake file system that mocks the Python file system modules
 EAPI=7
 HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.7.1.tar.gz -> pyfakefs-3.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=61f0050317d997b25dff0c27b9681ee3
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=63081e04b80b4d2b12789c2bcff0c202
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 c8864c538afb..566aaadbf931 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_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyfeyn/pyfeyn-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6df2ec5ca190ac7ba8ac9591b31838c3
diff --git a/metadata/md5-cache/dev-python/pyfiglet-0.7.5 b/metadata/md5-cache/dev-python/pyfiglet-0.7.5
index 40c5e5c83167..4b235f320427 100644
--- a/metadata/md5-cache/dev-python/pyfiglet-0.7.5
+++ b/metadata/md5-cache/dev-python/pyfiglet-0.7.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=An implementation of figlet written in Python
 EAPI=6
 HOMEPAGE=https://github.com/pwaller/pyfiglet
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pyfiglet/pyfiglet-0.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c54d3dcc5555ceba52ba9b756208bd7a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=28ff709ddc75aa306568f2aaaf9ab2fa
diff --git a/metadata/md5-cache/dev-python/pyflakes-1.6.0 b/metadata/md5-cache/dev-python/pyflakes-1.6.0
index 56679dbe9cb9..7f2079f5e8b3 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89985717a267e25cc3756b0992f1e1c1
diff --git a/metadata/md5-cache/dev-python/pyflakes-2.1.1 b/metadata/md5-cache/dev-python/pyflakes-2.1.1
index 4e07656e787f..02f7061e9a8b 100644
--- a/metadata/md5-cache/dev-python/pyflakes-2.1.1
+++ b/metadata/md5-cache/dev-python/pyflakes-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyflakes/pyflakes-2.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f393c573f633504b60362b8e3e5761ea
diff --git a/metadata/md5-cache/dev-python/pyflann-1.9.1 b/metadata/md5-cache/dev-python/pyflann-1.9.1
index 27a4ebbdd5ad..1e1c9b7c6d37 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11f45aebaf870f1757b75429ed746f70
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.3 b/metadata/md5-cache/dev-python/pyfltk-1.3.3
index fc6a5f2678dc..8686f70bcdd9 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_6 python_targets_python3_7 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eed03ad5b3b81422fde79165dbfe94eb
diff --git a/metadata/md5-cache/dev-python/pyformance-0.3.4 b/metadata/md5-cache/dev-python/pyformance-0.3.4
index 3bb275053aab..b8f74796d9c1 100644
--- a/metadata/md5-cache/dev-python/pyformance-0.3.4
+++ b/metadata/md5-cache/dev-python/pyformance-0.3.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyformance/pyformance-0.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82e322560da3d1cde15821c5362e744c
diff --git a/metadata/md5-cache/dev-python/pyformance-0.4 b/metadata/md5-cache/dev-python/pyformance-0.4
index 187aa286a3ed..58a2af287bd1 100644
--- a/metadata/md5-cache/dev-python/pyformance-0.4
+++ b/metadata/md5-cache/dev-python/pyformance-0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyformance/pyformance-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73011c398c0a0721f609fd6e12c25f29
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.5-r1 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.5-r1
index fc90f12ec9ea..5506a34fc55e 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.5-r1
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.5-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyftpdlib/pyftpdlib-1.5.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7ec36daaec354641a126b7663b42dadd
diff --git a/metadata/md5-cache/dev-python/pygal-2.4.0 b/metadata/md5-cache/dev-python/pygal-2.4.0
index 88ccebae8824..f45a6c6f8a12 100644
--- a/metadata/md5-cache/dev-python/pygal-2.4.0
+++ b/metadata/md5-cache/dev-python/pygal-2.4.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] media-gfx/cairosvg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyquery[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-gfx/cairosvg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyquery[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=A python SVG charts generator
 EAPI=7
 HOMEPAGE=http://pygal.org/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_6
+IUSE=doc examples test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=LGPL-3+
-RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] media-gfx/cairosvg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-gfx/cairosvg[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kozea/pygal/archive/2.4.0.tar.gz -> pygal-2.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4a4d0c8f7e22d2b7fd7af2a0bba9fd6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1ffb675f555a85068e1c0eff8ee7d633
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.3 b/metadata/md5-cache/dev-python/pygame-1.9.3
index f75202eee6b3..2a2dd85074df 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pygame/pygame-1.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00dfe11225a02d0dd9f45a102e116d55
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.6 b/metadata/md5-cache/dev-python/pygame-1.9.6
index cb513145959d..309fca5016e4 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.6
+++ b/metadata/md5-cache/dev-python/pygame-1.9.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pygame/pygame-1.9.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=bdc86163efe965ed08ea800391e768f2
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.6-r1 b/metadata/md5-cache/dev-python/pygame-1.9.6-r1
index 3f5cff5966d6..1b59be831bb6 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.6-r1
+++ b/metadata/md5-cache/dev-python/pygame-1.9.6-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pygame/pygame-1.9.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=4974b409661a1bc0efad5930ba615132
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1
deleted file mode 100644
index 76a574202df3..000000000000
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] media-libs/sdl2-mixer:= media-libs/sdl2-ttf:= virtual/jpeg:0 dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
-EAPI=6
-HOMEPAGE=https://github.com/renpy/pygame_sdl2
-IUSE=python_targets_python2_7 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 ZLIB
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] media-libs/sdl2-mixer:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://www.renpy.org/dl/6.99.12.4/pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a2e6ea9566202bd196c762ae88b5e41
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2
index 8b4ad46ef499..fd9a85d7740d 100644
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.12.4-r2
@@ -11,5 +11,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=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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=44a5ff3ffdda275218cc91ba6f6e7296
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r2 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r2
deleted file mode 100644
index 29ebe6dc2996..000000000000
--- a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] media-libs/sdl2-mixer:= media-libs/sdl2-ttf:= virtual/jpeg:0 dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
-EAPI=6
-HOMEPAGE=https://github.com/renpy/pygame_sdl2
-IUSE=python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 ZLIB
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] media-libs/libpng:0= media-libs/libsdl2:=[video] media-libs/sdl2-image:=[png,jpeg] media-libs/sdl2-mixer:= media-libs/sdl2-ttf:= virtual/jpeg:0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://www.renpy.org/dl/6.99.6/pygame_sdl2-for-renpy-6.99.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=889e9cd41dbe17ab67f50ed8abf8fb27
diff --git a/metadata/md5-cache/dev-python/pygcrypt-1.0.0 b/metadata/md5-cache/dev-python/pygcrypt-1.0.0
index d7e4eccd6bc5..b5400955d18a 100644
--- a/metadata/md5-cache/dev-python/pygcrypt-1.0.0
+++ b/metadata/md5-cache/dev-python/pygcrypt-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygcrypt/pygcrypt-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a305eef892db0ba262044d38c981589
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 8dd1adae358c..cd921732987f 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 1b5df4dcf2ff..6bf6f060fbbd 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c009783242e8edb24ccbb6b737ea13cf
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.0.22-r1 b/metadata/md5-cache/dev-python/pyghmi-1.0.22-r1
index 4e7b10f86fb5..0943d2407d57 100644
--- a/metadata/md5-cache/dev-python/pyghmi-1.0.22-r1
+++ b/metadata/md5-cache/dev-python/pyghmi-1.0.22-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.0.22.tar.gz -> pyghmi-1.0.22.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3345d1d0863ba439221234a102ad8027
diff --git a/metadata/md5-cache/dev-python/pyghmi-1.5.5 b/metadata/md5-cache/dev-python/pyghmi-1.5.5
index 7fe3197d1d47..564ad4d8b1a0 100644
--- a/metadata/md5-cache/dev-python/pyghmi-1.5.5
+++ b/metadata/md5-cache/dev-python/pyghmi-1.5.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyghmi/pyghmi-1.5.5.tar.gz -> pyghmi-1.5.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=16ea100eca7269c6dff8f901bdf246aa
diff --git a/metadata/md5-cache/dev-python/pygit2-0.28.2 b/metadata/md5-cache/dev-python/pygit2-0.28.2
index 3d36d26ef777..e2db9b7c0930 100644
--- a/metadata/md5-cache/dev-python/pygit2-0.28.2
+++ b/metadata/md5-cache/dev-python/pygit2-0.28.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-0.28.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b4a6ed136be2712619b185e3ef2f6231
diff --git a/metadata/md5-cache/dev-python/pygit2-1.0.2 b/metadata/md5-cache/dev-python/pygit2-1.0.2
index 8a1ee3bfdab3..348138c61c21 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.0.2
+++ b/metadata/md5-cache/dev-python/pygit2-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=77afbbe71b9425310ae19798ec63f4a4
diff --git a/metadata/md5-cache/dev-python/pygit2-1.0.3 b/metadata/md5-cache/dev-python/pygit2-1.0.3
index d01cc465009b..87403e229efa 100644
--- a/metadata/md5-cache/dev-python/pygit2-1.0.3
+++ b/metadata/md5-cache/dev-python/pygit2-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygit2/pygit2-1.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=77afbbe71b9425310ae19798ec63f4a4
diff --git a/metadata/md5-cache/dev-python/pyglet-1.2.4 b/metadata/md5-cache/dev-python/pyglet-1.2.4
index d849a6eb5e22..95429d6460ef 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_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyglet/pyglet-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d4ae28b82348cdeb31c0fefbba55385
diff --git a/metadata/md5-cache/dev-python/pygments-2.2.0 b/metadata/md5-cache/dev-python/pygments-2.2.0
index a583b417596c..91718dacf512 100644
--- a/metadata/md5-cache/dev-python/pygments-2.2.0
+++ b/metadata/md5-cache/dev-python/pygments-2.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.2.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb27581fbb3f8dd00f6ad8cbdb8bcd0f
diff --git a/metadata/md5-cache/dev-python/pygments-2.2.0-r1 b/metadata/md5-cache/dev-python/pygments-2.2.0-r1
index a2bcfb45b810..fb49c10d5c01 100644
--- a/metadata/md5-cache/dev-python/pygments-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/pygments-2.2.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.2.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d754da255c572cf2fefee8cac1c061de
diff --git a/metadata/md5-cache/dev-python/pygments-2.3.1 b/metadata/md5-cache/dev-python/pygments-2.3.1
index 812b0faf1227..e46f98a787ad 100644
--- a/metadata/md5-cache/dev-python/pygments-2.3.1
+++ b/metadata/md5-cache/dev-python/pygments-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.3.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e59b9cdd3f416c6574355d4ea26b98f4
diff --git a/metadata/md5-cache/dev-python/pygments-2.4.2 b/metadata/md5-cache/dev-python/pygments-2.4.2
index 102559dec63e..8856d26905f2 100644
--- a/metadata/md5-cache/dev-python/pygments-2.4.2
+++ b/metadata/md5-cache/dev-python/pygments-2.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.4.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6792bda54386c83693174098bce094f0
diff --git a/metadata/md5-cache/dev-python/pygments-2.5.2 b/metadata/md5-cache/dev-python/pygments-2.5.2
index 502d28dd9f4a..c0205036d8f8 100644
--- a/metadata/md5-cache/dev-python/pygments-2.5.2
+++ b/metadata/md5-cache/dev-python/pygments-2.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pygments/Pygments-2.5.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b7adc7613561e2043da8d4831e57520d
diff --git a/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5 b/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
index f1bd7401a711..17f7cfd1b390 100644
--- a/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
+++ b/metadata/md5-cache/dev-python/pygments-github-lexers-0.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/liluo/pygments-github-lexers/archive/v0.0.5.tar.gz -> pygments-github-lexers-0.0.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bdae17db12cb31320687bcc803c25487
diff --git a/metadata/md5-cache/dev-python/pygpgme-0.3-r1 b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
index b2a2e6a95574..87651c82b144 100644
--- a/metadata/md5-cache/dev-python/pygpgme-0.3-r1
+++ b/metadata/md5-cache/dev-python/pygpgme-0.3-r1
@@ -11,5 +11,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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/pygpgme/trunk/0.3/+download/pygpgme-0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4edd8a7ac7c9ac04279a0f2a5f0f826
diff --git a/metadata/md5-cache/dev-python/pygpu-0.6.7 b/metadata/md5-cache/dev-python/pygpu-0.6.7
index 64add448ae0c..b330135ad1b9 100644
--- a/metadata/md5-cache/dev-python/pygpu-0.6.7
+++ b/metadata/md5-cache/dev-python/pygpu-0.6.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Theano/libgpuarray/archive/v0.6.7.tar.gz -> pygpu-0.6.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad91ae5a99a207f006a62a05a4d8fcfc
diff --git a/metadata/md5-cache/dev-python/pygraphviz-1.5 b/metadata/md5-cache/dev-python/pygraphviz-1.5
index 37bfa86e4178..737c89741951 100644
--- a/metadata/md5-cache/dev-python/pygraphviz-1.5
+++ b/metadata/md5-cache/dev-python/pygraphviz-1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pygraphviz/pygraphviz-1.5.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=37fb2475c80412539aeebe5851ce9944
diff --git a/metadata/md5-cache/dev-python/pygresql-5.0.4 b/metadata/md5-cache/dev-python/pygresql-5.0.4
index 40ee1740ede2..eab4c22d3603 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 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=757f1ceafa100b969e59fad4f9a60c89
diff --git a/metadata/md5-cache/dev-python/pygresql-5.0.6 b/metadata/md5-cache/dev-python/pygresql-5.0.6
index 8a787711a5a6..720b4ce18c8d 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.0.6
+++ b/metadata/md5-cache/dev-python/pygresql-5.0.6
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres10? ( dev-db/postgresql:10= ) postgres_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdc3f868ccd4f305aa273241d70665fe
diff --git a/metadata/md5-cache/dev-python/pygresql-5.1 b/metadata/md5-cache/dev-python/pygresql-5.1
index 3052543111ac..6e80217a1cf4 100644
--- a/metadata/md5-cache/dev-python/pygresql-5.1
+++ b/metadata/md5-cache/dev-python/pygresql-5.1
@@ -10,5 +10,5 @@ RDEPEND=postgres_targets_postgres11? ( dev-db/postgresql:11= ) postgres_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyGreSQL/PyGreSQL-5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	postgres	86eeb59f48e87b423d9f22122dab9d04	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=30468b2346c36634dcfc2dde5735e133
diff --git a/metadata/md5-cache/dev-python/pygsl-2.1.1 b/metadata/md5-cache/dev-python/pygsl-2.1.1
index 38f947eec239..fc0138f4b126 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_python3_6(-)?,-python_si
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/pygsl/pygsl/pygsl-2.1.1/pygsl-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39fde237aaadb6228adb09f3241e15b4
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 3d954b839407..289120765bd1 100644
--- a/metadata/md5-cache/dev-python/pygtk-2.24.0-r4
+++ b/metadata/md5-cache/dev-python/pygtk-2.24.0-r4
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+2 bindings for Python
 EAPI=5
 HOMEPAGE=http://www.pygtk.org/
 IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 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.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-2.26.8-r53:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( >=dev-python/numpy-python2-1.16.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/numpy-1.17.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=gnome-base/libglade-2.5:2.0
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=192c97c4daf09d69c307fb86e71221b1
+_md5_=dcf3572a7a3a356c651ad35568c96a9b
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 6217c1e6c66b..6afad972ac72 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36844fad2521cc38a2e6c7d24c4bb361
diff --git a/metadata/md5-cache/dev-python/pyh2o-9999 b/metadata/md5-cache/dev-python/pyh2o-9999
index 4af84dce50ee..cd3e83933402 100644
--- a/metadata/md5-cache/dev-python/pyh2o-9999
+++ b/metadata/md5-cache/dev-python/pyh2o-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=sci-libs/libh2o-0.2.1:= 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	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ad9357f670f5dd670d1dc3f5631fffed
diff --git a/metadata/md5-cache/dev-python/pyhamcrest-1.9.0 b/metadata/md5-cache/dev-python/pyhamcrest-1.9.0
index 73d36ab32a2c..3cc6a82b5d55 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/P/PyHamcrest/PyHamcrest-1.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac20a558523877b213739c79b5611a8f
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 1c664f563034..09cce7a95797 100644
--- a/metadata/md5-cache/dev-python/pyhamcrest-1.9.0-r1
+++ b/metadata/md5-cache/dev-python/pyhamcrest-1.9.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python3_6 python_targets_python3_7 pytho
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hamcrest/PyHamcrest/archive/V1.9.0.tar.gz -> PyHamcrest-1.9.0.gh.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=274428e6513b37569d9d0df570de1701
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.2.3 b/metadata/md5-cache/dev-python/pyhcl-0.2.3
index 996bdf0f96c9..3a3c5123535a 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.2.3
+++ b/metadata/md5-cache/dev-python/pyhcl-0.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/ply-3.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/ply-3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=HCL configuration parser for python
 EAPI=6
 HOMEPAGE=https://github.com/virtuald/pyhcl
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MPL-2.0
-RDEPEND=>=dev-python/ply-3.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/ply-3.4[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyhcl/pyhcl-0.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=529b625ce398a079b1b3a318d4ac2047
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10d4db9b1ab8dbb224813f68dada3e90
diff --git a/metadata/md5-cache/dev-python/pyhcl-0.3.6 b/metadata/md5-cache/dev-python/pyhcl-0.3.6
index b152b8d7e82f..4e04dd38a984 100644
--- a/metadata/md5-cache/dev-python/pyhcl-0.3.6
+++ b/metadata/md5-cache/dev-python/pyhcl-0.3.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/ply-3.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/ply-3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=HCL configuration parser for python
 EAPI=6
 HOMEPAGE=https://github.com/virtuald/pyhcl
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MPL-2.0
-RDEPEND=>=dev-python/ply-3.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/ply-3.4[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyhcl/pyhcl-0.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=529b625ce398a079b1b3a318d4ac2047
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10d4db9b1ab8dbb224813f68dada3e90
diff --git a/metadata/md5-cache/dev-python/pyicu-2.3 b/metadata/md5-cache/dev-python/pyicu-2.3
index 927a41b9951d..fcb8b9fa9622 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.3
+++ b/metadata/md5-cache/dev-python/pyicu-2.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= test? ( dev-python/pytest dev-python/six )
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= test? ( dev-python/pytest dev-python/six )
 DESCRIPTION=Python bindings for dev-libs/icu
 EAPI=7
 HOMEPAGE=https://github.com/ovalhub/pyicu
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyICU/PyICU-2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cf522515e03a71551aedf378f8ba38b2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6e4f76aceb794b694bfb79c3a173dfa1
diff --git a/metadata/md5-cache/dev-python/pyicu-2.3.1 b/metadata/md5-cache/dev-python/pyicu-2.3.1
index 0caa00ad3c24..dc2c9433f9ce 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.3.1
+++ b/metadata/md5-cache/dev-python/pyicu-2.3.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= test? ( dev-python/pytest dev-python/six )
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= test? ( dev-python/pytest dev-python/six )
 DESCRIPTION=Python bindings for dev-libs/icu
 EAPI=7
 HOMEPAGE=https://github.com/ovalhub/pyicu
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/icu:= 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyICU/PyICU-2.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=397e29f8bc377efb539feef87391959c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=387ca195a57da82eb475af76d34147c2
diff --git a/metadata/md5-cache/dev-python/pyicu-2.4.2 b/metadata/md5-cache/dev-python/pyicu-2.4.2
index cbf1fa8a53a4..f21227c07d1e 100644
--- a/metadata/md5-cache/dev-python/pyicu-2.4.2
+++ b/metadata/md5-cache/dev-python/pyicu-2.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/icu:= dev-python/six ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/icu:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/icu:= dev-python/six ) test? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/icu:= dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-libs/icu:=
 DESCRIPTION=Python bindings for dev-libs/icu
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyICU/PyICU-2.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a190b127a33d7fb4f3e5fcb22309df2
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 2ae506b0db1d..412014932e5e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c43dff68187b5429c08ea283af6f1cb
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.3.0-r1 b/metadata/md5-cache/dev-python/pyilmbase-2.3.0-r1
deleted file mode 100644
index e7580ec41ede..000000000000
--- a/metadata/md5-cache/dev-python/pyilmbase-2.3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/boost-1.62.0-r1[python(+),python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ~media-libs/ilmbase-2.3.0:= numpy? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/numpy-1.10.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=virtual/pkgconfig-0-r1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=IlmBase Python bindings
-EAPI=6
-HOMEPAGE=https://www.openexr.com
-IUSE=+numpy +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/boost-1.62.0-r1[python(+),python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ~media-libs/ilmbase-2.3.0:= numpy? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/numpy-1.10.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/openexr/openexr/releases/download/v2.3.0/pyilmbase-2.3.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2f6d01417efbe82a43f85a1cf8020dd7
diff --git a/metadata/md5-cache/dev-python/pyilmbase-2.3.0-r2 b/metadata/md5-cache/dev-python/pyilmbase-2.3.0-r2
new file mode 100644
index 000000000000..5a0a28bc628f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyilmbase-2.3.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~media-libs/ilmbase-2.3.0:= python_single_target_python2_7? ( >=dev-libs/boost-1.62.0-r1[python(+),python_targets_python2_7(-)] numpy? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] >=dev-python/numpy-1.10.4[python_targets_python2_7(-)] ) ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=virtual/pkgconfig-0-r1 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=IlmBase Python bindings
+EAPI=6
+HOMEPAGE=https://www.openexr.com
+IUSE=+numpy +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ~media-libs/ilmbase-2.3.0:= python_single_target_python2_7? ( >=dev-libs/boost-1.62.0-r1[python(+),python_targets_python2_7(-)] numpy? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] >=dev-python/numpy-1.10.4[python_targets_python2_7(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/openexr/openexr/releases/download/v2.3.0/pyilmbase-2.3.0.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ae492c0b6de2e538a3980b10280bc5bb
diff --git a/metadata/md5-cache/dev-python/pyinotify-0.9.6 b/metadata/md5-cache/dev-python/pyinotify-0.9.6
index 9da96580723f..c3da4a354ea2 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_pypy3? ( >=dev-python/pypy3-5:0=[threads(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://seb.dbzteam.org/pub/pyinotify/releases/pyinotify-0.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a51623690bf13ce29f80be4457a5b8e
diff --git a/metadata/md5-cache/dev-python/pyinsane-2.0.10 b/metadata/md5-cache/dev-python/pyinsane-2.0.10
index b1c17536bf5d..0f659ce12793 100644
--- a/metadata/md5-cache/dev-python/pyinsane-2.0.10
+++ b/metadata/md5-cache/dev-python/pyinsane-2.0.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of the Sane API and abstration layer
 EAPI=6
 HOMEPAGE=https://github.com/openpaperwork/pyinsane
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=media-gfx/sane-backends dev-python/pillow[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 )
 RESTRICT=test
 SLOT=2
 SRC_URI=https://github.com/openpaperwork/pyinsane/archive/2.0.10.tar.gz -> pyinsane-2.0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87883d883e15e1cf2af01ab26469fef5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a4e9e06a68ab4ae8bb684ada240811c8
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 89ed7f28c1dc..14d9f94dad1f 100644
--- a/metadata/md5-cache/dev-python/pyinsane-2.0.12-r1
+++ b/metadata/md5-cache/dev-python/pyinsane-2.0.12-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of the Sane API and abstration layer
 EAPI=6
 HOMEPAGE=https://github.com/openpaperwork/pyinsane
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=media-gfx/sane-backends dev-python/pillow[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 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/pyinsane2/pyinsane2-2.0.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=baed38f209eb81c1f579796b848d7fff
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8077dda8b8ef3a797e8a29bb25889cca
diff --git a/metadata/md5-cache/dev-python/pyinsane-2.0.13 b/metadata/md5-cache/dev-python/pyinsane-2.0.13
index 6c7925d4a34d..561956753e42 100644
--- a/metadata/md5-cache/dev-python/pyinsane-2.0.13
+++ b/metadata/md5-cache/dev-python/pyinsane-2.0.13
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[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(-)] )
+DEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python implementation of the Sane API and abstration layer
 EAPI=7
 HOMEPAGE=https://github.com/openpaperwork/pyinsane
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=media-gfx/sane-backends dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=2
 SRC_URI=mirror://pypi/p/pyinsane2/pyinsane2-2.0.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=eca4869a3584ae9d7775e5acd913f4e6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=46e236c9c91a1624f3ddeb1218a9132d
diff --git a/metadata/md5-cache/dev-python/pyjade-4.0.0 b/metadata/md5-cache/dev-python/pyjade-4.0.0
index ea4ef3e13c13..f6e7c2b4cae8 100644
--- a/metadata/md5-cache/dev-python/pyjade-4.0.0
+++ b/metadata/md5-cache/dev-python/pyjade-4.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Jade syntax adapter for Django, Jinja2 and Mako templates
 EAPI=6
 HOMEPAGE=https://github.com/syrusakbary/pyjade
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/4a/04/396ec24e806fd3af7ea5d0f3cb6c7bbd4d00f7064712e4dd48f24c02ca95/pyjade-4.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28a5edbda4c2a963173ff347f74c4b19
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c53b7d2beb889f8e5bf548050e5cae5b
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.5.3 b/metadata/md5-cache/dev-python/pyjwt-1.5.3
index c32e331af42c..eafbf4d235b7 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.5.3
+++ b/metadata/md5-cache/dev-python/pyjwt-1.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-1.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff9548744fee280ca35578e305cf07e3
diff --git a/metadata/md5-cache/dev-python/pyjwt-1.7.1 b/metadata/md5-cache/dev-python/pyjwt-1.7.1
index a24ce03a5ede..d2cac1276b66 100644
--- a/metadata/md5-cache/dev-python/pyjwt-1.7.1
+++ b/metadata/md5-cache/dev-python/pyjwt-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyJWT/PyJWT-1.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4962fec515b35415e7e777abfd560db
diff --git a/metadata/md5-cache/dev-python/pykerberos-1.2.1 b/metadata/md5-cache/dev-python/pykerberos-1.2.1
index d4d8c52c59ac..2147f0098ed2 100644
--- a/metadata/md5-cache/dev-python/pykerberos-1.2.1
+++ b/metadata/md5-cache/dev-python/pykerberos-1.2.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/mit-krb5 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=app-crypt/mit-krb5 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A high-level Python wrapper for Kerberos/GSSAPI operations
 EAPI=7
 HOMEPAGE=http://trac.calendarserver.org/wiki/PyKerberos
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
 LICENSE=Apache-2.0
-RDEPEND=app-crypt/mit-krb5 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=app-crypt/mit-krb5 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pykerberos/pykerberos-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7ff2535e0e2f3b67eae65d9dad9a1d1e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=876f1445b10f116b8cf8ba6f093a44c2
diff --git a/metadata/md5-cache/dev-python/pykka-1.2.1 b/metadata/md5-cache/dev-python/pykka-1.2.1
index e781926dc5a5..f83557057107 100644
--- a/metadata/md5-cache/dev-python/pykka-1.2.1
+++ b/metadata/md5-cache/dev-python/pykka-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pykka/Pykka-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de7d2647590b41b330baa0df3a5ce49f
diff --git a/metadata/md5-cache/dev-python/pykwalify-1.5.2 b/metadata/md5-cache/dev-python/pykwalify-1.5.2
index 679b356bf323..1c793f9ad75b 100644
--- a/metadata/md5-cache/dev-python/pykwalify-1.5.2
+++ b/metadata/md5-cache/dev-python/pykwalify-1.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pykwalify/pykwalify-1.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41c7e65e06712e43399c7ec40c1b74aa
diff --git a/metadata/md5-cache/dev-python/pykwalify-1.7.0 b/metadata/md5-cache/dev-python/pykwalify-1.7.0
index 38cf55cb2c57..6ac64da9353f 100644
--- a/metadata/md5-cache/dev-python/pykwalify-1.7.0
+++ b/metadata/md5-cache/dev-python/pykwalify-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pykwalify/pykwalify-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c61a46a1bc87b1c80e9a3769d10b144e
diff --git a/metadata/md5-cache/dev-python/pykwalify-9999 b/metadata/md5-cache/dev-python/pykwalify-9999
index 3ab882e3e004..777a468cdc41 100644
--- a/metadata/md5-cache/dev-python/pykwalify-9999
+++ b/metadata/md5-cache/dev-python/pykwalify-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/docopt-0.6.2[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4ba75d6d0d0ad03548eb47f36bb9abb9
diff --git a/metadata/md5-cache/dev-python/pylama-7.6.5 b/metadata/md5-cache/dev-python/pylama-7.6.5
index 8adf43bfa5b8..034c16874192 100644
--- a/metadata/md5-cache/dev-python/pylama-7.6.5
+++ b/metadata/md5-cache/dev-python/pylama-7.6.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/klen/pylama/archive/7.6.5.tar.gz -> pylama-7.6.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ecc738ecf7cafd1e51949c6aa3fa6eec
diff --git a/metadata/md5-cache/dev-python/pylast-1.9.0 b/metadata/md5-cache/dev-python/pylast-1.9.0
index d67d400ad70f..5776b4c3556e 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pylast/pylast-1.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c0e4b847915b367f8e2a3d7d6d46e10
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 0b0cd2c8dd6e..09780d8f4622 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/pylibacl/pylibacl-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e43270e9895d0a949d48a5b0a3eec30e
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.5.3 b/metadata/md5-cache/dev-python/pylibacl-0.5.3
index f9b8e31b2987..53b4bbd2d07c 100644
--- a/metadata/md5-cache/dev-python/pylibacl-0.5.3
+++ b/metadata/md5-cache/dev-python/pylibacl-0.5.3
@@ -11,5 +11,5 @@ RDEPEND=sys-apps/acl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/iustin/pylibacl/archive/pylibacl-v0.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=25e85c0fad9fcc6f9cb3d1f927067459
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 c2fb2de7fa7d..0a9c4cec7719 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/pylibmc-1.5.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libmemcached-0.32 doc? ( >=dev-python/sphinx-1.5.1-r1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( net-misc/memcached dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-libs/libmemcached-0.32 doc? ( >=dev-python/sphinx-1.5.1-r1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( net-misc/memcached dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Libmemcached wrapper written as a Python extension
 EAPI=6
 HOMEPAGE=http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/libmemcached-0.32 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-libs/libmemcached-0.32 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lericson/pylibmc/archive/1.5.1.tar.gz -> pylibmc-1.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42ec000c735fa8d8e50a4032b9814269
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b035266d25c45d6b374ce1e91fe97806
diff --git a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1 b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
index 42a172349679..4af185db1210 100644
--- a/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
+++ b/metadata/md5-cache/dev-python/pylibmc-1.6.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-libs/libmemcached-0.32 doc? ( python_targets_python2_7? ( >=dev-python/sphinx-1.5.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/sphinx-1.5.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/sphinx-1.5.1-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) test? ( net-misc/memcached dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=>=dev-libs/libmemcached-0.32 doc? ( python_targets_python3_6? ( >=dev-python/sphinx-1.5.1-r1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/sphinx-1.5.1-r1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) test? ( net-misc/memcached dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare setup test
 DESCRIPTION=Libmemcached wrapper written as a Python extension
 EAPI=7
 HOMEPAGE=http://sendapatch.se/projects/pylibmc/ https://pypi.org/project/pylibmc/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-libs/libmemcached-0.32 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-libs/libmemcached-0.32 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=doc? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lericson/pylibmc/archive/1.6.1.tar.gz -> pylibmc-1.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=11b88c323f5a4d38131d3845b9ed7957
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3a37e6f9ad6a2666a75dea78bee22c12
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 3712a1292388..e3407e8c5f27 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-1.6.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ceb997312db2ab814dd88f8b1c0b8494
diff --git a/metadata/md5-cache/dev-python/pylint-1.8.4 b/metadata/md5-cache/dev-python/pylint-1.8.4
index 6e0c1d9c9125..5f73e2c221ff 100644
--- a/metadata/md5-cache/dev-python/pylint-1.8.4
+++ b/metadata/md5-cache/dev-python/pylint-1.8.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-1.8.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0a887552ada7459c07022a09b474bca
diff --git a/metadata/md5-cache/dev-python/pylint-2.3.1 b/metadata/md5-cache/dev-python/pylint-2.3.1
index d6fd4543a4b7..a7a21bec663d 100644
--- a/metadata/md5-cache/dev-python/pylint-2.3.1
+++ b/metadata/md5-cache/dev-python/pylint-2.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-2.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e07118e92805492a3b59a90fc9abc04f
diff --git a/metadata/md5-cache/dev-python/pylint-2.4.4 b/metadata/md5-cache/dev-python/pylint-2.4.4
index 062425c96b10..1dddeade6d3c 100644
--- a/metadata/md5-cache/dev-python/pylint-2.4.4
+++ b/metadata/md5-cache/dev-python/pylint-2.4.4
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=dev-python/astroid-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mccabe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/astroid-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mccabe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/astroid-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mccabe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[threads(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/astroid-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/isort-4.2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mccabe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Python code static checker
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pylint/pylint-2.4.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=813f31771364e0b8d4eb4a05b26509af
diff --git a/metadata/md5-cache/dev-python/pylzma-0.4.9 b/metadata/md5-cache/dev-python/pylzma-0.4.9
index 0c0a020c48af..d4e6e40d761d 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=069e3f99400d14da5dcb6cd61d965056
diff --git a/metadata/md5-cache/dev-python/pymad-0.10 b/metadata/md5-cache/dev-python/pymad-0.10
index eb328d5769bc..b37356ad2279 100644
--- a/metadata/md5-cache/dev-python/pymad-0.10
+++ b/metadata/md5-cache/dev-python/pymad-0.10
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libmad python_targets_python3_6? ( dev-lang/python:3.6 ) pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/jaqx0r/pymad/archive/version/0.10.tar.gz -> pymad-0.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=17e9a5f427d7b27bbfba568cb0f779cf
diff --git a/metadata/md5-cache/dev-python/pymdstat-0.4.2 b/metadata/md5-cache/dev-python/pymdstat-0.4.2
deleted file mode 100644
index a5f600eda6a2..000000000000
--- a/metadata/md5-cache/dev-python/pymdstat-0.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python library to parse Linux /proc/mdstat
-EAPI=6
-HOMEPAGE=https://github.com/nicolargo/pymdstat https://pypi.org/project/pymdstat/
-IUSE=test python_targets_pypy3 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pymdstat/pymdstat-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=82a62d0222db9ae61009e99cf199e9c2
diff --git a/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1 b/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
new file mode 100644
index 000000000000..e203d8f14e1b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymdstat-0.4.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library to parse Linux /proc/mdstat
+EAPI=7
+HOMEPAGE=https://github.com/nicolargo/pymdstat https://pypi.org/project/pymdstat/
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/nicolargo/pymdstat/archive/v0.4.2.tar.gz -> pymdstat-0.4.2-r1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=34638de7235415be0f3df25e07f3bb64
diff --git a/metadata/md5-cache/dev-python/pymediainfo-4.0 b/metadata/md5-cache/dev-python/pymediainfo-4.0
index 661a99050cd3..629d9676ad5b 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-4.0
+++ b/metadata/md5-cache/dev-python/pymediainfo-4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=46ce15e4a22e122fa6e88155f4d098c2
diff --git a/metadata/md5-cache/dev-python/pymediainfo-4.1 b/metadata/md5-cache/dev-python/pymediainfo-4.1
index 3303f5a6aad8..a8db090a430d 100644
--- a/metadata/md5-cache/dev-python/pymediainfo-4.1
+++ b/metadata/md5-cache/dev-python/pymediainfo-4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymediainfo/pymediainfo-4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=46ce15e4a22e122fa6e88155f4d098c2
diff --git a/metadata/md5-cache/dev-python/pymetar-1.1 b/metadata/md5-cache/dev-python/pymetar-1.1
index d9f3f88a5dd2..d8e6ef95abdb 100644
--- a/metadata/md5-cache/dev-python/pymetar-1.1
+++ b/metadata/md5-cache/dev-python/pymetar-1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://www.schwarzvogel.de/pkgs/pymetar-1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dee5ea3522a94343858ccc7edc9a49db
diff --git a/metadata/md5-cache/dev-python/pymilter-1.0.4-r1 b/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
index 25c2d2901fd6..1d82890936e2 100644
--- a/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
+++ b/metadata/md5-cache/dev-python/pymilter-1.0.4-r1
@@ -11,5 +11,5 @@ RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) python_targets_python3_6?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/sdgathman/pymilter/archive/pymilter-1.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=610f835ceeb994f97586a87bfeafbfae
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 b81ebea9fcea..c10607fbf042 100644
--- a/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/pyminuit-1.2.1-r1
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Minuit numerical function minimization in Python
 EAPI=5
 HOMEPAGE=https://github.com/jpivarski/pyminuit
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d223ba8d8bed123a5f438a16a1e20d4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb766ca5316deb54cfc305d67af5543e
diff --git a/metadata/md5-cache/dev-python/pymongo-3.10.1 b/metadata/md5-cache/dev-python/pymongo-3.10.1
new file mode 100644
index 000000000000..2055bddc6c5d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pymongo-3.10.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=kerberos? ( dev-python/pykerberos[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-db/mongodb-2.6.0 dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Python driver for MongoDB
+EAPI=7
+HOMEPAGE=https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/
+IUSE=doc kerberos test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~hppa ~x86
+LICENSE=Apache-2.0
+RDEPEND=kerberos? ( dev-python/pykerberos[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pymongo/pymongo-3.10.1.tar.gz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=644787a21ec06205e85cc80ba3ed6c04
diff --git a/metadata/md5-cache/dev-python/pymongo-3.4.0 b/metadata/md5-cache/dev-python/pymongo-3.4.0
index b683b8568966..029774cf4fed 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.4.0
+++ b/metadata/md5-cache/dev-python/pymongo-3.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.4.0.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f9c071021ccdabaa5a50f52ca281d2af
diff --git a/metadata/md5-cache/dev-python/pymongo-3.5.1 b/metadata/md5-cache/dev-python/pymongo-3.5.1
index bf7d0be5be83..cca8ac855293 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.5.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.5.1.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ccd301b3673880cdad8ac61c7a94ee48
diff --git a/metadata/md5-cache/dev-python/pymongo-3.7.1 b/metadata/md5-cache/dev-python/pymongo-3.7.1
index cc92c8721c26..82eb442ce027 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.7.1
+++ b/metadata/md5-cache/dev-python/pymongo-3.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.7.1.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd2917a3690fcae91943b53b6650d102
diff --git a/metadata/md5-cache/dev-python/pymongo-3.7.2 b/metadata/md5-cache/dev-python/pymongo-3.7.2
index 7d8390649f10..ffba71c65850 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.7.2
+++ b/metadata/md5-cache/dev-python/pymongo-3.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.7.2.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=472289f2d14f84bdd4bc2056e32dcbb2
diff --git a/metadata/md5-cache/dev-python/pymongo-3.9.0 b/metadata/md5-cache/dev-python/pymongo-3.9.0
index 64fbf8754c1d..b215beb1db8d 100644
--- a/metadata/md5-cache/dev-python/pymongo-3.9.0
+++ b/metadata/md5-cache/dev-python/pymongo-3.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-3.9.0.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d857050c0e5798c8d6bcab522d68ea4b
diff --git a/metadata/md5-cache/dev-python/pymountboot-0.2.2 b/metadata/md5-cache/dev-python/pymountboot-0.2.2
index 8dce496daf53..104b6ce4b1f1 100644
--- a/metadata/md5-cache/dev-python/pymountboot-0.2.2
+++ b/metadata/md5-cache/dev-python/pymountboot-0.2.2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sys-apps/util-linux-2.20
 DESCRIPTION=Python extension module to (re)mount /boot
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/pymountboot/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=sys-apps/util-linux-2.20 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=sys-apps/util-linux-2.20 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pymountboot/releases/download/pymount-0.2.2/pymountboot-0.2.2.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e46cb9c01d16014ff365f768341f6dc5
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=083c61bddeb4e58f16ec7892006d3718
diff --git a/metadata/md5-cache/dev-python/pymountboot-9999 b/metadata/md5-cache/dev-python/pymountboot-9999
index e8bd4a2eecf6..7e6f8ef2b92a 100644
--- a/metadata/md5-cache/dev-python/pymountboot-9999
+++ b/metadata/md5-cache/dev-python/pymountboot-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=sys-apps/util-linux-2.20
 DESCRIPTION=Python extension module to (re)mount /boot
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/pymountboot/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=sys-apps/util-linux-2.20 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=sys-apps/util-linux-2.20 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c6410106c1a1e0f4c2fbfca617297ccc
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=44f805ad18170046df43b5e75792484e
diff --git a/metadata/md5-cache/dev-python/pympler-0.5 b/metadata/md5-cache/dev-python/pympler-0.5
index 3ef7e5580740..9dd3bab65f7f 100644
--- a/metadata/md5-cache/dev-python/pympler-0.5
+++ b/metadata/md5-cache/dev-python/pympler-0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pympler/pympler/archive/0.5.tar.gz -> pympler-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5edd9a78f6cb5c6a9a714fd5bbc3ffe4
diff --git a/metadata/md5-cache/dev-python/pympler-0.6 b/metadata/md5-cache/dev-python/pympler-0.6
index ca48a51d807f..60bcd73d3ba4 100644
--- a/metadata/md5-cache/dev-python/pympler-0.6
+++ b/metadata/md5-cache/dev-python/pympler-0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pympler/pympler/archive/0.6.tar.gz -> pympler-0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d80ad49b738155c8f317947e31060a3b
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 add4bf52da7d..0275edb362e7 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_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pymssql/pymssql-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43adc3b381f89dbe6dba05b551b0709d
diff --git a/metadata/md5-cache/dev-python/pymssql-2.1.3 b/metadata/md5-cache/dev-python/pymssql-2.1.3
index 4b6123578152..c667df8aaecb 100644
--- a/metadata/md5-cache/dev-python/pymssql-2.1.3
+++ b/metadata/md5-cache/dev-python/pymssql-2.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pymssql/pymssql-2.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=84ac703fc1bee3d2cde1a5b421b8e0cf
diff --git a/metadata/md5-cache/dev-python/pymtp-0.0.6 b/metadata/md5-cache/dev-python/pymtp-0.0.6
index f5079a6e4823..6654bf7b14e7 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_6? ( dev-lang/python:3.6 ) >=de
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=819955773bf2d63b050c3a590e206918
diff --git a/metadata/md5-cache/dev-python/pymysql-0.9.3 b/metadata/md5-cache/dev-python/pymysql-0.9.3
index 00f032c316c2..5460f0dfb348 100644
--- a/metadata/md5-cache/dev-python/pymysql-0.9.3
+++ b/metadata/md5-cache/dev-python/pymysql-0.9.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Pure-Python MySQL Driver
 EAPI=7
 HOMEPAGE=https://github.com/PyMySQL/PyMySQL
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/PyMySQL/PyMySQL/archive/v0.9.3.tar.gz -> pymysql-0.9.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5580a2eceea8f71c3f7c426917db3993
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=44623a973ca5d41a9bb96423bf8f2459
diff --git a/metadata/md5-cache/dev-python/pynacl-1.2.1 b/metadata/md5-cache/dev-python/pynacl-1.2.1
index 72d5c970e235..7196a1ca3647 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.2.1
+++ b/metadata/md5-cache/dev-python/pynacl-1.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.2.1.tar.gz -> pynacl-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f0d90acb2a830afef3e483f7dcd9f2ba
diff --git a/metadata/md5-cache/dev-python/pynacl-1.3.0 b/metadata/md5-cache/dev-python/pynacl-1.3.0
index c2b0a823b03e..ebde463c70c4 100644
--- a/metadata/md5-cache/dev-python/pynacl-1.3.0
+++ b/metadata/md5-cache/dev-python/pynacl-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/pynacl/archive/1.3.0.tar.gz -> pynacl-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1f588d998de707286f72dfae059e5b58
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 a94f1774f86c..761b4c215dd0 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2be3f4c7e6dbee83a348639e3340247
diff --git a/metadata/md5-cache/dev-python/pynvim-0.4.0 b/metadata/md5-cache/dev-python/pynvim-0.4.0
index e39f140c1127..c36ed0e49f63 100644
--- a/metadata/md5-cache/dev-python/pynvim-0.4.0
+++ b/metadata/md5-cache/dev-python/pynvim-0.4.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-editors/neovim ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-editors/neovim dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python client for Neovim
 EAPI=7
 HOMEPAGE=https://github.com/neovim/pynvim
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-editors/neovim python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-editors/neovim python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neovim/pynvim/archive/0.4.0.tar.gz -> pynvim-0.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3fffed6c5849b6c7d2244c3fc67b97a9
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d5e5487cc49a6a8cc28ae5d5afe4b210
diff --git a/metadata/md5-cache/dev-python/pynvim-0.4.1 b/metadata/md5-cache/dev-python/pynvim-0.4.1
index dbe0d3dfde0c..c3b2e95f2e54 100644
--- a/metadata/md5-cache/dev-python/pynvim-0.4.1
+++ b/metadata/md5-cache/dev-python/pynvim-0.4.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-editors/neovim ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-editors/neovim dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python client for Neovim
 EAPI=7
 HOMEPAGE=https://github.com/neovim/pynvim
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-editors/neovim python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/msgpack[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-greenlet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-editors/neovim python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/neovim/pynvim/archive/0.4.1.tar.gz -> pynvim-0.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=917b2835f806d2d0784379abfac7a3a0
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ee2283f0e77c504191d7265bcd7af3e8
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 6743a7371436..dea6d48bb82d 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pynzb/pynzb-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4a58fd04e663345256e9775dfbaef8a
diff --git a/metadata/md5-cache/dev-python/pyocr-0.5.3 b/metadata/md5-cache/dev-python/pyocr-0.5.3
index 72f8f4cecd45..d0eb8f2ae035 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.5.3
+++ b/metadata/md5-cache/dev-python/pyocr-0.5.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six
 DESCRIPTION=An optical character recognition (OCR) tool wrapper for python
 EAPI=7
 HOMEPAGE=https://github.com/openpaperwork/pyocr
-IUSE=cuneiform +tesseract python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=cuneiform +tesseract python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyocr/pyocr-0.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cd438a033581465e319e48933e7d6f19
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=059e6f9a52983b52ce0a771e6c8caf95
diff --git a/metadata/md5-cache/dev-python/pyocr-0.6 b/metadata/md5-cache/dev-python/pyocr-0.6
index 4e30f08a13a9..0cac62549670 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.6
+++ b/metadata/md5-cache/dev-python/pyocr-0.6
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six
 DESCRIPTION=An optical character recognition (OCR) tool wrapper for python
 EAPI=7
 HOMEPAGE=https://github.com/openpaperwork/pyocr
-IUSE=cuneiform +tesseract python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=cuneiform +tesseract python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-python/pillow dev-python/six 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyocr/pyocr-0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a2e8032f42ef85914a62343904ce9775
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d34757955edc9edad76d2b2054b308af
diff --git a/metadata/md5-cache/dev-python/pyocr-0.7 b/metadata/md5-cache/dev-python/pyocr-0.7
index 99724da0fcab..744340a7f76c 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.7
+++ b/metadata/md5-cache/dev-python/pyocr-0.7
@@ -11,5 +11,5 @@ RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-
 REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyocr/pyocr-0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=de0a3301c18314e962149df87d0847c6
diff --git a/metadata/md5-cache/dev-python/pyocr-0.7.2 b/metadata/md5-cache/dev-python/pyocr-0.7.2
index e8b72bae5d65..d49b2173b495 100644
--- a/metadata/md5-cache/dev-python/pyocr-0.7.2
+++ b/metadata/md5-cache/dev-python/pyocr-0.7.2
@@ -11,5 +11,5 @@ RDEPEND=cuneiform? ( app-text/cuneiform ) tesseract? ( app-text/tesseract ) dev-
 REQUIRED_USE=|| ( cuneiform tesseract ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyocr/pyocr-0.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=de0a3301c18314e962149df87d0847c6
diff --git a/metadata/md5-cache/dev-python/pyodbc-4.0.16 b/metadata/md5-cache/dev-python/pyodbc-4.0.16
index 3244fc218ce3..6d906d082a37 100644
--- a/metadata/md5-cache/dev-python/pyodbc-4.0.16
+++ b/metadata/md5-cache/dev-python/pyodbc-4.0.16
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/unixODBC-2.3.0 mssql? ( >=dev-db/freetds-0.64[odbc] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-db/unixODBC-2.3.0 mssql? ( >=dev-db/freetds-0.64[odbc] ) dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=python ODBC module to connect to almost any database
 EAPI=6
 HOMEPAGE=https://github.com/mkleehammer/pyodbc
-IUSE=mssql python_targets_python2_7 python_targets_python3_6
+IUSE=mssql python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=>=dev-db/unixODBC-2.3.0 mssql? ( >=dev-db/freetds-0.64[odbc] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-db/unixODBC-2.3.0 mssql? ( >=dev-db/freetds-0.64[odbc] ) 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
 SRC_URI=mirror://pypi/p/pyodbc/pyodbc-4.0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f78d98f145c43a469cfbea5e3a6cee4b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e90dc7d9661082e908f9be24d6660e12
diff --git a/metadata/md5-cache/dev-python/pyodbc-4.0.23 b/metadata/md5-cache/dev-python/pyodbc-4.0.23
index ebbe33d817a4..9a67be9d0f1e 100644
--- a/metadata/md5-cache/dev-python/pyodbc-4.0.23
+++ b/metadata/md5-cache/dev-python/pyodbc-4.0.23
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/unixODBC mssql? ( dev-db/freetds[odbc] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-db/unixODBC mssql? ( dev-db/freetds[odbc] ) dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=python ODBC module to connect to almost any database
 EAPI=6
 HOMEPAGE=https://github.com/mkleehammer/pyodbc
-IUSE=mssql python_targets_python2_7 python_targets_python3_6
+IUSE=mssql python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-db/unixODBC mssql? ( dev-db/freetds[odbc] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-db/unixODBC mssql? ( dev-db/freetds[odbc] ) 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
 SRC_URI=mirror://pypi/p/pyodbc/pyodbc-4.0.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb8677ade9b88623bb6f8226a760ddc7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e29ed586d3562ad73df6169f5f10b634
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 54362d2e5ae5..2d144ad043b3 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_python2_7(
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyode/PyODE-snapshot-2010-03-22.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4193343f0f296cbc36b32ca7d30a47c1
diff --git a/metadata/md5-cache/dev-python/pyogg-1.3-r2 b/metadata/md5-cache/dev-python/pyogg-1.3-r2
index 02b932041584..9d9e69d7da1c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a37876c893f885c0e4547cba89af2593
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 c27a92fb9155..8996b698b846 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53d50addf6b5ab9c4fe97e1dad30a96b
diff --git a/metadata/md5-cache/dev-python/pyopencl-2017.2 b/metadata/md5-cache/dev-python/pyopencl-2017.2
index 6add16407b6d..052baa9e2122 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_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2017.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c48b7963d3c1dbafe62bdef53cfe1b9
diff --git a/metadata/md5-cache/dev-python/pyopengl-3.1.0 b/metadata/md5-cache/dev-python/pyopengl-3.1.0
index 82643aa4b6a7..cb53e3a8ea7c 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82880f06ee685fa624252c28a15c5b80
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 ab774f3491e2..9bfc7a77ca0f 100644
--- a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0
+++ b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Accelerate module for PyOpenGL
 EAPI=5
 HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL-accelerate/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pyopengl[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
 SRC_URI=mirror://pypi/P/PyOpenGL-accelerate/PyOpenGL-accelerate-3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd12b711505f0a5b44c7caaeebc37c91
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ac8a00eff286b3ba6b33716795a8f15
diff --git a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0-r1 b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0-r1
index d88779ee3075..c586905a77ad 100644
--- a/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0-r1
+++ b/metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)]
+DEPEND=dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Accelerate module for PyOpenGL
 EAPI=7
 HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL-accelerate/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/pyopengl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyopengl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyOpenGL-accelerate/PyOpenGL-accelerate-3.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=baeaf1f898acf96ce9af322a6a1313db
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=557822d5ac1f25d4694c694aa1f7a082
diff --git a/metadata/md5-cache/dev-python/pyopenssl-17.5.0 b/metadata/md5-cache/dev-python/pyopenssl-17.5.0
index 59e501aad80c..420a9b232e49 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-17.5.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-17.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-17.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23eaab936923cd1d37bf932095e4c9c6
diff --git a/metadata/md5-cache/dev-python/pyopenssl-18.0.0 b/metadata/md5-cache/dev-python/pyopenssl-18.0.0
index ff98b60258a8..d982ea470f25 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-18.0.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-18.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-18.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=57b560056de2f49f13255bfabfbd193f
diff --git a/metadata/md5-cache/dev-python/pyopenssl-19.0.0 b/metadata/md5-cache/dev-python/pyopenssl-19.0.0
index d9d33eeff335..9d40f9d55356 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-19.0.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-19.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-19.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9fc604206aff2aef246a5b33df4ed966
diff --git a/metadata/md5-cache/dev-python/pyopenssl-19.1.0 b/metadata/md5-cache/dev-python/pyopenssl-19.1.0
index e6c3d4fdc0af..26ee51d09764 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-19.1.0
+++ b/metadata/md5-cache/dev-python/pyopenssl-19.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-19.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bc5b1182b4f0117a2056080cf0f39635
diff --git a/metadata/md5-cache/dev-python/pyotherside-1.5.4 b/metadata/md5-cache/dev-python/pyotherside-1.5.4
index cc3148041d44..08d7a3c88e3c 100644
--- a/metadata/md5-cache/dev-python/pyotherside-1.5.4
+++ b/metadata/md5-cache/dev-python/pyotherside-1.5.4
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Asynchronous Python 3 Bindings for Qt 5
 EAPI=6
 HOMEPAGE=https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thp/pyotherside/archive/1.5.4.tar.gz -> pyotherside-1.5.4.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2bb54c28f63a3dab3930ae082da3aab5
diff --git a/metadata/md5-cache/dev-python/pyotherside-1.5.8 b/metadata/md5-cache/dev-python/pyotherside-1.5.8
index c0c659d1b18e..d323cd9008c8 100644
--- a/metadata/md5-cache/dev-python/pyotherside-1.5.8
+++ b/metadata/md5-cache/dev-python/pyotherside-1.5.8
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Asynchronous Python 3 Bindings for Qt 5
 EAPI=6
 HOMEPAGE=https://github.com/thp/pyotherside https://thp.io/2011/pyotherside/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsvg:5
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/thp/pyotherside/archive/1.5.8.tar.gz -> pyotherside-1.5.8.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=956f842c92323ad34d7c98d93684bef5
diff --git a/metadata/md5-cache/dev-python/pyotp-2.2.6 b/metadata/md5-cache/dev-python/pyotp-2.2.6
index fcfa0deeadb6..06d2c20e1dab 100644
--- a/metadata/md5-cache/dev-python/pyotp-2.2.6
+++ b/metadata/md5-cache/dev-python/pyotp-2.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=PyOTP is a Python library for generating and verifying one-time passwords.
 EAPI=6
 HOMEPAGE=https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pyotp/pyotp-2.2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=910c70692294fa22899df99b7eb1ad7e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0466ff1c447928d4d0e1f029a01f5595
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 84cbffffc0d5..c2fa8b8c7464 100644
--- a/metadata/md5-cache/dev-python/pyotp-2.2.6-r1
+++ b/metadata/md5-cache/dev-python/pyotp-2.2.6-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=PyOTP is a Python library for generating and verifying one-time passwords.
 EAPI=6
 HOMEPAGE=https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyotp/pyotp-2.2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8e166e0c45356713e5a6d04aa22b629
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=14ab387aab26b7e45572a02e21aae5b3
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 7e639a892ab8..70630cdad735 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_6 )
 SLOT=0
 SRC_URI=http://www.pangalactic.org/PyPAM/PyPAM-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac907cd3bbfa948184cdb06b184395c6
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.2.0 b/metadata/md5-cache/dev-python/pyparsing-2.2.0
index 389cb26affeb..f0eff607e3cc 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pyparsing/pyparsing-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f113c83fd1401e5f71530cfbed287e0
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.3.0 b/metadata/md5-cache/dev-python/pyparsing-2.3.0
index 4f5c76a9a7b4..3e3302c89cf7 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.3.0
+++ b/metadata/md5-cache/dev-python/pyparsing-2.3.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1c4a00a8a3b027b7d9558ad06fadd4ee
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.3.1 b/metadata/md5-cache/dev-python/pyparsing-2.3.1
index 0e8ff28fa8cd..2735d9289246 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.3.1
+++ b/metadata/md5-cache/dev-python/pyparsing-2.3.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=197acb810a6c7f3e2bcee0a096874af8
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.4.0 b/metadata/md5-cache/dev-python/pyparsing-2.4.0
index 90adb57dfe4c..56e0ab33e7bd 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.4.0
+++ b/metadata/md5-cache/dev-python/pyparsing-2.4.0
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=50f1a5229bbe9d915c98c0b2b838621e
diff --git a/metadata/md5-cache/dev-python/pyparsing-2.4.6 b/metadata/md5-cache/dev-python/pyparsing-2.4.6
index d607598205fc..4416e058c76e 100644
--- a/metadata/md5-cache/dev-python/pyparsing-2.4.6
+++ b/metadata/md5-cache/dev-python/pyparsing-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/pyparsing/pyparsing/archive/pyparsing_2.4.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b6c0085f50fe3f0ca5cd15f02f0ebc54
diff --git a/metadata/md5-cache/dev-python/pyparted-3.10.7 b/metadata/md5-cache/dev-python/pyparted-3.10.7
index eb888b7c2fb8..abb1259bae4b 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.10.7
+++ b/metadata/md5-cache/dev-python/pyparted-3.10.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/pkgconfig 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python bindings for sys-block/parted
 EAPI=6
 HOMEPAGE=https://github.com/rhinstaller/pyparted/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2+
-RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=!test? ( test )
+RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[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 )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pyparted/archive/v3.10.7.tar.gz -> pyparted-3.10.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c620af98675e52d10781b6ae631ad90
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=742a2e31f48c50a3b47af8c774ebed5d
diff --git a/metadata/md5-cache/dev-python/pyparted-3.11.2 b/metadata/md5-cache/dev-python/pyparted-3.11.2
index a98a47d01c46..21e135099e27 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.11.2
+++ b/metadata/md5-cache/dev-python/pyparted-3.11.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/pkgconfig
+DEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/pkgconfig
 DESCRIPTION=Python bindings for sys-block/parted
 EAPI=7
 HOMEPAGE=https://github.com/rhinstaller/pyparted/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( python_targets_python2_7 ) || ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=!test? ( test )
+RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[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 )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pyparted/archive/v3.11.2.tar.gz -> pyparted-3.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=45f11e414d9336b4494d250071506ecd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5e1307483243a72bfcd5ab6b4e1afd10
diff --git a/metadata/md5-cache/dev-python/pyparted-3.11.3 b/metadata/md5-cache/dev-python/pyparted-3.11.3
index 18fcc3296a7a..cc978c73f96e 100644
--- a/metadata/md5-cache/dev-python/pyparted-3.11.3
+++ b/metadata/md5-cache/dev-python/pyparted-3.11.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=test? ( >=sys-block/parted-3.1 dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/pkgconfig
+DEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] virtual/pkgconfig
 DESCRIPTION=Python bindings for sys-block/parted
 EAPI=7
 HOMEPAGE=https://github.com/rhinstaller/pyparted/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6 python_targets_python3_8
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=test
+RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rhinstaller/pyparted/archive/v3.11.3.tar.gz -> pyparted-3.11.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3e20511c6b9cda0b05e4f1dbf904220f
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=cac162b7e178882f454fba758fe842c0
diff --git a/metadata/md5-cache/dev-python/pyparted-999999 b/metadata/md5-cache/dev-python/pyparted-999999
index 8f375f0d7453..1c4d46dd006c 100644
--- a/metadata/md5-cache/dev-python/pyparted-999999
+++ b/metadata/md5-cache/dev-python/pyparted-999999
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=sys-block/parted-3.1 dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/pkgconfig
+DEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] virtual/pkgconfig
 DESCRIPTION=Python bindings for sys-block/parted
 EAPI=7
 HOMEPAGE=https://github.com/rhinstaller/pyparted/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6 python_targets_python3_8
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=test
+RDEPEND=>=sys-block/parted-3.1 dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=aa1a0aaf3423879db7fa26178fc53fda
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=804b91796ed6acb9133bcb8474edc804
diff --git a/metadata/md5-cache/dev-python/pypax-0.9.5 b/metadata/md5-cache/dev-python/pypax-0.9.5
index acdf5d3ac39a..ea9ab508a385 100644
--- a/metadata/md5-cache/dev-python/pypax-0.9.5
+++ b/metadata/md5-cache/dev-python/pypax-0.9.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python module to get or set either PT_PAX and/or XATTR_PAX flags
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~blueness/elfix/ https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
-IUSE=+ptpax +xtpax python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=+ptpax +xtpax python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-3
-RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/elfix/elfix-0.9.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd8bdf7224f9533c5c9a184b6af6355d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=167a323e8482ede1c37f3d5f2dec9317
diff --git a/metadata/md5-cache/dev-python/pypax-9999 b/metadata/md5-cache/dev-python/pypax-9999
index 4b5315aaaa05..77bf5ff9928b 100644
--- a/metadata/md5-cache/dev-python/pypax-9999
+++ b/metadata/md5-cache/dev-python/pypax-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Python module to get or set either PT_PAX and/or XATTR_PAX flags
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~blueness/elfix/ https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
-IUSE=+ptpax +xtpax python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=+ptpax +xtpax python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=ptpax? ( dev-libs/elfutils ) xtpax? ( sys-apps/attr ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( ptpax xtpax ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f44653113c0b230431edafd057b7e392
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5845322ba1352f6b94210dc9b7dba9cd
diff --git a/metadata/md5-cache/dev-python/pypcap-1.2.1 b/metadata/md5-cache/dev-python/pypcap-1.2.1
index a039b7fb6227..a7892fd85dce 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_python3_6? ( dev-lang/python:3.6 ) >=dev
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da9938453577257c98743eead1f63bd2
diff --git a/metadata/md5-cache/dev-python/pypcap-1.2.2 b/metadata/md5-cache/dev-python/pypcap-1.2.2
index ab961de5cffa..39893589fbf5 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_python3_6? ( dev-lang/python:3.6 ) >=dev
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da9938453577257c98743eead1f63bd2
diff --git a/metadata/md5-cache/dev-python/pypcap-1.2.3 b/metadata/md5-cache/dev-python/pypcap-1.2.3
index f789642ddc26..2f4878a4d3fd 100644
--- a/metadata/md5-cache/dev-python/pypcap-1.2.3
+++ b/metadata/md5-cache/dev-python/pypcap-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=net-libs/libpcap python_targets_python3_6? ( dev-lang/python:3.6 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pynetwork/pypcap/archive/v1.2.3.tar.gz -> pypcap-1.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7f6e63c7bc5192a702f9e2ead4002059
diff --git a/metadata/md5-cache/dev-python/pypeg2-2.15.2 b/metadata/md5-cache/dev-python/pypeg2-2.15.2
index 2ebc03c78c4f..851cd76a083c 100644
--- a/metadata/md5-cache/dev-python/pypeg2-2.15.2
+++ b/metadata/md5-cache/dev-python/pypeg2-2.15.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=An intrinsic PEG Parser-Interpreter for Python
 EAPI=5
 HOMEPAGE=https://fdik.org/pyPEG/ https://bitbucket.org/fdik/pypeg/ https://pypi.org/project/pyPEG2/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyPEG2/pyPEG2-2.15.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1eb27a3ed4bedd57d510f7774fd3396
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ab12c735184f2823be9df422d1feee8c
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.5.27 b/metadata/md5-cache/dev-python/pyperclip-1.5.27
index 2fd3ca7dd62c..c39e9bb17a64 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyperclip/pyperclip-1.5.27.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3395986be8eadd9bf67d314dd415c4e4
diff --git a/metadata/md5-cache/dev-python/pyperclip-1.7.0 b/metadata/md5-cache/dev-python/pyperclip-1.7.0
index 7e114c386158..76c061b0599f 100644
--- a/metadata/md5-cache/dev-python/pyperclip-1.7.0
+++ b/metadata/md5-cache/dev-python/pyperclip-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyperclip/pyperclip-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=f141211768dd6fd6fe76db8a642b73c1
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 1e0146e8b002..88218b32efcf 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 08a32b987187..cb00f5c984a2 100644
--- a/metadata/md5-cache/dev-python/pyphen-0.9.4
+++ b/metadata/md5-cache/dev-python/pyphen-0.9.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python module for hyphenation using hunspell dictionaries
 EAPI=5
 HOMEPAGE=https://github.com/Kozea/Pyphen
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ LGPL-2+ MPL-1.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/P/Pyphen/Pyphen-0.9.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8ecb5aa3cdffb07f2ef35b934749f1a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=80d2efdf3c54e089e9d5378f9888aff1
diff --git a/metadata/md5-cache/dev-python/pypiserver-1.3.1-r1 b/metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
index d3917d4c9706..09e6f9ea8aea 100644
--- a/metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
+++ b/metadata/md5-cache/dev-python/pypiserver-1.3.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools-git[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/passlib[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/twine[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webtest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools-git[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/passlib[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/twine[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webtest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/wheel-0.25.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Minimal PyPI server
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypiserver/pypiserver/archive/v1.3.1.tar.gz -> pypiserver-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec473efb56c97e0babb754644f92a77c
diff --git a/metadata/md5-cache/dev-python/pypng-0.0.18 b/metadata/md5-cache/dev-python/pypng-0.0.18
index 15addf2da6af..9512529e01ab 100644
--- a/metadata/md5-cache/dev-python/pypng-0.0.18
+++ b/metadata/md5-cache/dev-python/pypng-0.0.18
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pure Python PNG image encoder/decoder
 EAPI=6
 HOMEPAGE=https://github.com/drj11/pypng https://pypi.org/project/pypng/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/pypng/pypng-0.0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72e1c977871065a13e349dd29296f9f5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=106afd6cea485c6130f0e88f9f731687
diff --git a/metadata/md5-cache/dev-python/pypodman-0.12.1.2 b/metadata/md5-cache/dev-python/pypodman-0.12.1.2
index a9793fbebcaa..f73780a535f9 100644
--- a/metadata/md5-cache/dev-python/pypodman-0.12.1.2
+++ b/metadata/md5-cache/dev-python/pypodman-0.12.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/libpod/archive/v0.12.1.2.tar.gz -> libpod-0.12.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f03cf0d4777775d8e0cd4ec517bb72cf
diff --git a/metadata/md5-cache/dev-python/pypowervm-1.1.20 b/metadata/md5-cache/dev-python/pypowervm-1.1.20
index def29b1f55c5..1152e8f4a37e 100644
--- a/metadata/md5-cache/dev-python/pypowervm-1.1.20
+++ b/metadata/md5-cache/dev-python/pypowervm-1.1.20
@@ -1,15 +1,15 @@
 BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python binding for the PowerVM REST API
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pypowervm/
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/lxml-3.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-i18n-3.15.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1-modules[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1-modules[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypowervm/pypowervm-1.1.20.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=42dfa1246f7ed178914bc303b0fe6f9f
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=438e5c05b3024f681f2e329adc774301
diff --git a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.0 b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.0
index c1de94a17a59..6290c02f8931 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce69357eefb2f25e51fc889c6e23f5fe
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 cc649cebeb42..16d3d6d8b4ba 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-1.9.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=598c6eebcdea69e790215269f9eaa8b9
diff --git a/metadata/md5-cache/dev-python/pyproj-2.4.2 b/metadata/md5-cache/dev-python/pyproj-2.4.2
index b40b257d8c4e..ab731fc5fe68 100644
--- a/metadata/md5-cache/dev-python/pyproj-2.4.2
+++ b/metadata/md5-cache/dev-python/pyproj-2.4.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/Shapely[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sci-libs/proj-6.2.0 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sci-libs/Shapely[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=sci-libs/proj-6.2.0 dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=sci-libs/proj-6.2.0 dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python interface to the PROJ library
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyproj/pyproj-2.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c7aa60b0605efb456111dcfabe7ed8b4
diff --git a/metadata/md5-cache/dev-python/pyproject2setuppy-2 b/metadata/md5-cache/dev-python/pyproject2setuppy-2
index 979357871182..02b92f696199 100644
--- a/metadata/md5-cache/dev-python/pyproject2setuppy-2
+++ b/metadata/md5-cache/dev-python/pyproject2setuppy-2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Cheap setup.py hack to install flit & poetry-based projects
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/pyproject2setuppy/archive/v2.tar.gz -> pyproject2setuppy-2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=57359b40ebf9f79d6f67f1bd334d50fd
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 d90ae319fb80..b5941a480526 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ceb388caffaf1b54cc9fd2633032058
diff --git a/metadata/md5-cache/dev-python/pypy-7.3.0 b/metadata/md5-cache/dev-python/pypy-7.3.0
index 98eccb105544..c9fb8da91b1f 100644
--- a/metadata/md5-cache/dev-python/pypy-7.3.0
+++ b/metadata/md5-cache/dev-python/pypy-7.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=A fast, compliant alternative implementation of the Python language
 EAPI=7
 HOMEPAGE=https://pypy.org/
 IUSE=bzip2 gdbm +jit libressl ncurses sqlite tk
-KEYWORDS=~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=|| ( dev-python/pypy-exe:7.3.0[bzip2?,ncurses?] dev-python/pypy-exe-bin:7.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy-bin-7.3.0:0
 SLOT=0/73
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.17-r1.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5e8c5e09dcb7fa4750876482a7926113
+_md5_=14d38005ea3ecdf5ffb965c5d8c22252
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.0 b/metadata/md5-cache/dev-python/pypy-exe-7.3.0
index 0898f83c3afd..8d59b9d65508 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-7.3.0
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=PyPy executable (build from source)
 EAPI=7
 HOMEPAGE=https://pypy.org/
 IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
-KEYWORDS=~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.0
 SLOT=7.3.0
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v7.3.0-src.tar.bz2
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0aff6cbcfd6a79d41b9480e8ea58184b
+_md5_=cc7fc908f17e468b5af2ddb87d2979de
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.0_p1 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.0_p1
index b8d8754768c2..11a75aefc6fb 100644
--- a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.0_p1
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.0_p1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=PyPy executable (pre-built version)
 EAPI=7
 HOMEPAGE=https://pypy.org/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0/1 virtual/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.0_p1
 SLOT=7.3.0
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.0-1.xpak -> pypy-exe-7.3.0-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.0-1.xpak -> pypy-exe-7.3.0-1.x86.xpak )
 _eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
-_md5_=466236432107e04d4ae842a453ef5ebd
+_md5_=d50d607f01c9213710f0cb44c52ff99d
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.0 b/metadata/md5-cache/dev-python/pypy3-7.3.0
index 54468f3d502f..7a35e83cf861 100644
--- a/metadata/md5-cache/dev-python/pypy3-7.3.0
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=A fast, compliant alternative implementation of the Python (3.6) lan
 EAPI=7
 HOMEPAGE=https://pypy.org/
 IUSE=bzip2 gdbm +jit libressl ncurses sqlite test tk
-KEYWORDS=~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=|| ( dev-python/pypy3-exe:7.3.0[bzip2?,ncurses?] dev-python/pypy3-exe-bin:7.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-bin-7.3.0:0
 RESTRICT=!test? ( test )
 SLOT=0/pypy36-pp73
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.3.0-src.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fa2c0b6c613f5982998d74b7f01d6455
+_md5_=f3637d9a2ed6116155279fb9c49fc0ce
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-7.3.0 b/metadata/md5-cache/dev-python/pypy3-exe-7.3.0
index 270ab1bec00d..85f411169252 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-7.3.0
+++ b/metadata/md5-cache/dev-python/pypy3-exe-7.3.0
@@ -5,10 +5,10 @@ DESCRIPTION=PyPy3 executable (build from source)
 EAPI=7
 HOMEPAGE=https://pypy.org/
 IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
-KEYWORDS=~amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.0
 SLOT=7.3.0
 SRC_URI=https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.3.0-src.tar.bz2
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e3fe2cdc8fb6db16b30f39dd101573f0
+_md5_=77f3d05a0bbb9cec6e61bd7328621e16
diff --git a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.0_p1 b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.0_p1
index f342562a7c49..fac57a517bf6 100644
--- a/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.0_p1
+++ b/metadata/md5-cache/dev-python/pypy3-exe-bin-7.3.0_p1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=PyPy3 executable (pre-built version)
 EAPI=7
 HOMEPAGE=https://pypy.org/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.1.3:0/1 virtual/libffi:0/7 virtual/libintl:0/0 dev-libs/expat:0/0 app-arch/bzip2:0/1 sys-libs/ncurses:0/6 !dev-python/pypy-exe:7.3.0_p1
 SLOT=7.3.0
 SRC_URI=amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.0-1.xpak -> pypy3-exe-7.3.0-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/pypy3-exe-7.3.0-1.xpak -> pypy3-exe-7.3.0-1.x86.xpak )
 _eclasses_=pax-utils	a41d1fd1c111289ffa04490de6ee79d7
-_md5_=0951eff562fba2f028c4f2e4870d0b2f
+_md5_=abb5608bab3a6174a9d221cabc414e51
diff --git a/metadata/md5-cache/dev-python/pyqrcode-1.2.1 b/metadata/md5-cache/dev-python/pyqrcode-1.2.1
index 017be550f067..f923059da589 100644
--- a/metadata/md5-cache/dev-python/pyqrcode-1.2.1
+++ b/metadata/md5-cache/dev-python/pyqrcode-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=png? ( dev-python/pypng[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=png? ( dev-python/pypng[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A pure Python QR code generator with SVG, EPS, PNG and terminal output
 EAPI=6
 HOMEPAGE=https://github.com/mnooner256/pyqrcode https://pypi.org/project/PyQRCode/
-IUSE=png python_targets_python2_7 python_targets_python3_6
+IUSE=png python_targets_python3_6
 KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=png? ( dev-python/pypng[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=png? ( dev-python/pypng[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
 SRC_URI=mirror://pypi/P/PyQRCode/PyQRCode-1.2.1.tar.gz -> pyqrcode-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=738b682f8f6985ea45dd1a5260eaffe3
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34200dedcd44bc65ab0baa2f9b165256
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 5f39b820e9db..048a484acdd2 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyqt-distutils/pyqt-distutils-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6460818696df03f9e69f95f925312ea0
diff --git a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r2 b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r2
index b3512713568d..4dac0e744e2b 100644
--- a/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r2
+++ b/metadata/md5-cache/dev-python/pyqtgraph-0.10.0-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://www.pyqtgraph.org/downloads/0.10.0/pyqtgraph-0.10.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=184611263f4b085d482decbff01d5eac
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.13 b/metadata/md5-cache/dev-python/pyquery-1.2.13
index 5a8890ce70a1..a3ef84e5c060 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.13
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=871580e34df066922c8543097854e220
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.13-r1 b/metadata/md5-cache/dev-python/pyquery-1.2.13-r1
index 3df045135073..38233c0c5c07 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.13-r1
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.13-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21fd67c9267d18d777f1709cb46a9ba5
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.0 b/metadata/md5-cache/dev-python/pyquery-1.4.0
index 0a6efcc90634..1999c9fc21c3 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.0
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9893e800130ddaf05047e9b5cf6789e0
diff --git a/metadata/md5-cache/dev-python/pyquery-1.4.1 b/metadata/md5-cache/dev-python/pyquery-1.4.1
index 2a417963e02f..942ef6bb3a18 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.4.1
+++ b/metadata/md5-cache/dev-python/pyquery-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c92fd408edb9d6ed0b2f471906ec9a3
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 725a0f9f87da..33ad287b1d5b 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_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.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-0.9.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d12af9659b414f2c06305886f6de5dd
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.0 b/metadata/md5-cache/dev-python/pyrfc3339-1.0
index 51b5628a7678..da11b4f7f63a 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.0
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=test? ( dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Generates and parses RFC 3339 timestamps
 EAPI=6
 HOMEPAGE=https://github.com/kurtraschke/pyRFC3339
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyRFC3339/pyRFC3339-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8946f78b8caa7e8041597ab94b3231ee
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=51a5c7e0da7d3803c81dd3b7b6192f3e
diff --git a/metadata/md5-cache/dev-python/pyrfc3339-1.1 b/metadata/md5-cache/dev-python/pyrfc3339-1.1
index 05ea34cf07bb..53df2b731c66 100644
--- a/metadata/md5-cache/dev-python/pyrfc3339-1.1
+++ b/metadata/md5-cache/dev-python/pyrfc3339-1.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=test? ( dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Generates and parses RFC 3339 timestamps
 EAPI=7
 HOMEPAGE=https://github.com/kurtraschke/pyRFC3339
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyRFC3339/pyRFC3339-1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=739b8c132178e656799ed3073b9aad44
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b0bdeda03d5b35e0b5bda8897816db38
diff --git a/metadata/md5-cache/dev-python/pyro-4.77 b/metadata/md5-cache/dev-python/pyro-4.77
index 21b23d014463..666fe174ff04 100644
--- a/metadata/md5-cache/dev-python/pyro-4.77
+++ b/metadata/md5-cache/dev-python/pyro-4.77
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.77.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bb6ad9b64c6f92a32d252581d573f494
diff --git a/metadata/md5-cache/dev-python/pyro-4.78 b/metadata/md5-cache/dev-python/pyro-4.78
index 982a92aa8677..5a25c8c6f407 100644
--- a/metadata/md5-cache/dev-python/pyro-4.78
+++ b/metadata/md5-cache/dev-python/pyro-4.78
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://pypi/P/Pyro4/Pyro4-4.78.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=abfe63cfdb2b7d70a9297df9cf485b40
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.4.12 b/metadata/md5-cache/dev-python/pyroute2-0.4.12
index 3b3fd4c4a5ec..9a6eedae1d04 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyroute2/pyroute2-0.4.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71e1738402d360392b02f45e8643072c
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.4.21 b/metadata/md5-cache/dev-python/pyroute2-0.4.21
index 6eaaaef4e3c1..54994c248ec5 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyroute2/pyroute2-0.4.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=71e1738402d360392b02f45e8643072c
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.5.5 b/metadata/md5-cache/dev-python/pyroute2-0.5.5
index 02e6b9f2621a..f28fb6ccdc6c 100644
--- a/metadata/md5-cache/dev-python/pyroute2-0.5.5
+++ b/metadata/md5-cache/dev-python/pyroute2-0.5.5
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyroute2/pyroute2-0.5.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e7bed0a300cce6f81d6c168dce2ad3c1
diff --git a/metadata/md5-cache/dev-python/pyroute2-0.5.5-r1 b/metadata/md5-cache/dev-python/pyroute2-0.5.5-r1
index e84f9ae044cc..521cb4fd15de 100644
--- a/metadata/md5-cache/dev-python/pyroute2-0.5.5-r1
+++ b/metadata/md5-cache/dev-python/pyroute2-0.5.5-r1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[sqlite] ) python_targets
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyroute2/pyroute2-0.5.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f6732511397d3dd9fede94d26bc88800
diff --git a/metadata/md5-cache/dev-python/pyrqlite-2.0 b/metadata/md5-cache/dev-python/pyrqlite-2.0
index 8c78d5099a1f..b1b29110dcf2 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-2.0
+++ b/metadata/md5-cache/dev-python/pyrqlite-2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pylint[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python client for rqlite
 EAPI=6
 HOMEPAGE=https://github.com/rqlite/pyrqlite
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rqlite/pyrqlite/archive/v2.0.tar.gz -> pyrqlite-2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2da86655cdae79dd091a19e1811b0a7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d46bb77f128a7765447b15c7ee3c26d0
diff --git a/metadata/md5-cache/dev-python/pyrqlite-9999 b/metadata/md5-cache/dev-python/pyrqlite-9999
index de27189af11f..f715dd50ee59 100644
--- a/metadata/md5-cache/dev-python/pyrqlite-9999
+++ b/metadata/md5-cache/dev-python/pyrqlite-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pylint[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Python client for rqlite
 EAPI=6
 HOMEPAGE=https://github.com/rqlite/pyrqlite
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5a404f224e0c36da49049018d7d8fe9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5f8b95909e2f4093cf59d1943e94b97a
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.13.0 b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
index f5cb093e3a46..f4b7ee548767 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.13.0
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.13.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a68b1174d0bfba919b59e190dea3dab
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.14.2 b/metadata/md5-cache/dev-python/pyrsistent-0.14.2
index 789ba3782a9e..3c8e641b5e78 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.14.2
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.14.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0fcdd76655324cc2ef77350067b4a59
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.14.4 b/metadata/md5-cache/dev-python/pyrsistent-0.14.4
index ab7c6a2ea59c..a5c1504fdf09 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.14.4
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.14.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.14.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28b66b0b42162ed6e78558a29a39b526
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.15.6 b/metadata/md5-cache/dev-python/pyrsistent-0.15.6
index 9a614d55e361..e0eca2be315c 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.15.6
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.15.6
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Persistent/Functional/Immutable data structures
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.15.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a6dc055ad1a7e22e753226c9298b0741
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.6.3 b/metadata/md5-cache/dev-python/pysaml2-4.6.3
index 9b93bf87d4fa..08f483a21bf9 100644
--- a/metadata/md5-cache/dev-python/pysaml2-4.6.3
+++ b/metadata/md5-cache/dev-python/pysaml2-4.6.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cryptography-1.4[python_targets_python3_6(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysaml2/pysaml2-4.6.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=393a7805bcd9282ac598daa5dcbb44d2
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.6.3-r1 b/metadata/md5-cache/dev-python/pysaml2-4.6.3-r1
index 6c8c62c67740..ba686dee9a9c 100644
--- a/metadata/md5-cache/dev-python/pysaml2-4.6.3-r1
+++ b/metadata/md5-cache/dev-python/pysaml2-4.6.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/cryptography-1.4[python_targets_python3_6(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysaml2/pysaml2-4.6.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=21fd65de0f51850753c58f0f366af0bc
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.6.5 b/metadata/md5-cache/dev-python/pysaml2-4.6.5
index dd377a594fc7..3bd7ca9e990f 100644
--- a/metadata/md5-cache/dev-python/pysaml2-4.6.5
+++ b/metadata/md5-cache/dev-python/pysaml2-4.6.5
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/cryptography-1.4[python_targets_python3_6(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysaml2/pysaml2-4.6.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b59f62e53d6154f57983322720a76582
diff --git a/metadata/md5-cache/dev-python/pyscaffold-2.4.4 b/metadata/md5-cache/dev-python/pyscaffold-2.4.4
index 70c14e83d7c6..ffcf4799e3c6 100644
--- a/metadata/md5-cache/dev-python/pyscaffold-2.4.4
+++ b/metadata/md5-cache/dev-python/pyscaffold-2.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyScaffold/pyscaffold-2.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e1e9202c6f5b75ed87af70186e647589
diff --git a/metadata/md5-cache/dev-python/pyscard-1.9.7 b/metadata/md5-cache/dev-python/pyscard-1.9.7
index a365f0c984b0..c6b27b571f40 100644
--- a/metadata/md5-cache/dev-python/pyscard-1.9.7
+++ b/metadata/md5-cache/dev-python/pyscard-1.9.7
@@ -1,15 +1,15 @@
-BDEPEND=dev-lang/swig 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-lang/swig python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/pcsc-lite dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=sys-apps/pcsc-lite dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Smart cards support in python
 EAPI=7
 HOMEPAGE=https://pyscard.sourceforge.io/ https://github.com/LudovicRousseau/pyscard https://pypi.org/project/pyscard/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/pcsc-lite python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=sys-apps/pcsc-lite 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
 SRC_URI=mirror://sourceforge/pyscard/pyscard-1.9.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f3f74f8609b0bbf5e51a3dd30c920104
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b5d0b878135157e88803d52fdc59ecae
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1
index 4d1e8ef7dec0..43a38c033ebe 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_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/p/pysendfile/pysendfile-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bc7b388da6f69e39f8c71e7c5b6d81a
diff --git a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1 b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
index 246538b40579..2f644312d2ec 100644
--- a/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/pysendfile-2.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysendfile/pysendfile-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cc97457e92a3167454b7338cbe8c25f4
diff --git a/metadata/md5-cache/dev-python/pyserial-3.2.1 b/metadata/md5-cache/dev-python/pyserial-3.2.1
index 28bc046d57ac..3fd71e04d72a 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_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/p/pyserial/pyserial-3.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6702b0425519aaeaf0a6f57fd7df0a97
diff --git a/metadata/md5-cache/dev-python/pyserial-3.4 b/metadata/md5-cache/dev-python/pyserial-3.4
index 641573b8bf4c..4c60b1ef43a3 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyserial/pyserial-3.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9466821972193b715e059a1d75bc529b
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 4328eb361b55..8f4e077d56e1 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysha3/pysha3-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=260c1fac39635974f643f776a281244f
diff --git a/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1 b/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
index 5bc4fe93a25c..675b0e250867 100644
--- a/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
+++ b/metadata/md5-cache/dev-python/pyshark-0.3.7.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4af399b62f290d8fab8cb8f3c53d20fe
diff --git a/metadata/md5-cache/dev-python/pyshark-0.4.2.3 b/metadata/md5-cache/dev-python/pyshark-0.4.2.3
index bd7ddd17adf5..3f1f5e072710 100644
--- a/metadata/md5-cache/dev-python/pyshark-0.4.2.3
+++ b/metadata/md5-cache/dev-python/pyshark-0.4.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KimiNewt/pyshark/archive/v0.4.2.3.tar.gz -> pyshark-0.4.2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=69cbd5dc76648dfb5405c549ac4cc077
diff --git a/metadata/md5-cache/dev-python/pysmi-0.1.3 b/metadata/md5-cache/dev-python/pysmi-0.1.3
index 4e499908533d..24d32c27e942 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_6(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysmi/pysmi-0.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bb7469f4cf6d823c77b400259462ffc
diff --git a/metadata/md5-cache/dev-python/pysmi-0.3.1 b/metadata/md5-cache/dev-python/pysmi-0.3.1
index 8320511b3aef..6669e8632970 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_6(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysmi/pysmi-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd2b1afe41a44c09949d4dffd358c517
diff --git a/metadata/md5-cache/dev-python/pysmi-0.3.4 b/metadata/md5-cache/dev-python/pysmi-0.3.4
index e3432523a89e..b750256999ed 100644
--- a/metadata/md5-cache/dev-python/pysmi-0.3.4
+++ b/metadata/md5-cache/dev-python/pysmi-0.3.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_6(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysmi/pysmi-0.3.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8029b82856e8f18ad6c5d49aac77b312
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.10-r1 b/metadata/md5-cache/dev-python/pysnmp-4.4.10-r1
index 79fae8a2da98..093115913d22 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.10-r1
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.10-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python SNMP library
 EAPI=7
 HOMEPAGE=http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc examples python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pysmi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pysmi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.4.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2a9e7b1f3af345fc3733fc8ef5e8b49d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f51836071bb2ea2b3a2b57d84210cfd7
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.12 b/metadata/md5-cache/dev-python/pysnmp-4.4.12
index 70dd27dd8a41..7feed5fcaec8 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.12
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.12
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python SNMP library
 EAPI=7
 HOMEPAGE=http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc examples python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pysmi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pysmi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.4.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2a9e7b1f3af345fc3733fc8ef5e8b49d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f51836071bb2ea2b3a2b57d84210cfd7
diff --git a/metadata/md5-cache/dev-python/pysnmp-4.4.4 b/metadata/md5-cache/dev-python/pysnmp-4.4.4
index 83724d162951..bb95bc656162 100644
--- a/metadata/md5-cache/dev-python/pysnmp-4.4.4
+++ b/metadata/md5-cache/dev-python/pysnmp-4.4.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python SNMP library
 EAPI=6
 HOMEPAGE=http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/
-IUSE=doc examples python_targets_python2_7 python_targets_python3_6
+IUSE=doc examples python_targets_python3_6
 KEYWORDS=amd64 ~arm ~ia64 ppc ~sparc x86
 LICENSE=BSD
-RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pysmi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pysmi[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] || ( dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycrypto[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
 SRC_URI=mirror://pypi/p/pysnmp/pysnmp-4.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e3c6a1e651df728996689933e84c6f1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=60a45ca2421e2dfbf38a0939a22f4aa5
diff --git a/metadata/md5-cache/dev-python/pysnmp-999999 b/metadata/md5-cache/dev-python/pysnmp-999999
index 8e8c5f860f28..1e449279a223 100644
--- a/metadata/md5-cache/dev-python/pysnmp-999999
+++ b/metadata/md5-cache/dev-python/pysnmp-999999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python SNMP library
 EAPI=7
 HOMEPAGE=http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/ https://github.com/etingof/pysnmp
-IUSE=doc examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc examples python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pysmi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pyasn1-0.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pysmi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] || ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycrypto[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=31823aa4a529259ffa75b160862b7191
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=26555b2dbcffb3fdf7c56f9ac0569730
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 d4a8a01fa776..ee90360cbfc9 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysnmp-apps/pysnmp-apps-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2e231ba14ae113a278be65aaee6dd67c
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 7d9c6c309c53..f741563c593c 100644
--- a/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
+++ b/metadata/md5-cache/dev-python/pysnmp-mibs-0.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pysnmp-4.2.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pysnmp-4.2.3[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=SNMP framework in Python - MIBs
 EAPI=6
 HOMEPAGE=http://pysnmp.sf.net/ https://pypi.org/project/pysnmp-mibs/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-python/pysnmp-4.2.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/pysnmp-4.2.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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
 SRC_URI=mirror://pypi/p/pysnmp-mibs/pysnmp-mibs-0.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e55bd9fc62fe7c9505bb48c1bec856fb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4eec82d8144b22d25c368091aa87a2f5
diff --git a/metadata/md5-cache/dev-python/pysol_cards-0.8.6 b/metadata/md5-cache/dev-python/pysol_cards-0.8.6
index db5a2841e3ef..e608afeb9cfc 100644
--- a/metadata/md5-cache/dev-python/pysol_cards-0.8.6
+++ b/metadata/md5-cache/dev-python/pysol_cards-0.8.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysol_cards/pysol_cards-0.8.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d4e0531f331af37dc7561959cfa05844
diff --git a/metadata/md5-cache/dev-python/pysol_cards-0.8.7 b/metadata/md5-cache/dev-python/pysol_cards-0.8.7
index cacd60064711..b3bdf2eea970 100644
--- a/metadata/md5-cache/dev-python/pysol_cards-0.8.7
+++ b/metadata/md5-cache/dev-python/pysol_cards-0.8.7
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysol_cards/pysol_cards-0.8.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=157130e4ba1ab8bbd46ccb40aa4af8b0
diff --git a/metadata/md5-cache/dev-python/pysolr-3.3.2 b/metadata/md5-cache/dev-python/pysolr-3.3.2
index 1632de9592af..5c0c216099da 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysolr/pysolr-3.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d2b91fcec1c16cfac7ced6300266e42
diff --git a/metadata/md5-cache/dev-python/pysolr-3.6.0 b/metadata/md5-cache/dev-python/pysolr-3.6.0
index 6cb15052cc16..45dca6f39c41 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysolr/pysolr-3.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=822b43c1956f28f7dfbd9e81dbb01fe6
diff --git a/metadata/md5-cache/dev-python/pysolr-3.8.1 b/metadata/md5-cache/dev-python/pysolr-3.8.1
index 6f43f12df3ac..22c155396c0d 100644
--- a/metadata/md5-cache/dev-python/pysolr-3.8.1
+++ b/metadata/md5-cache/dev-python/pysolr-3.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysolr/pysolr-3.8.1.tar.gz test? ( https://archive.apache.org/dist/lucene/solr/4.10.4/solr-4.10.4.tgz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3628a56e2db47f457ff67866a2258603
diff --git a/metadata/md5-cache/dev-python/pyspectrum2-0.2.0 b/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
index 1265fef99b2e..a1b4c122b92a 100644
--- a/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
+++ b/metadata/md5-cache/dev-python/pyspectrum2-0.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/stv0g/pyspectrum2/archive/v0.2.0.tar.gz -> pyspectrum2-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f12d8ad0e7c0ef22be47ba6a34d657c3
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.12 b/metadata/md5-cache/dev-python/pyspf-2.0.12
index 9514230fec86..b9967f8d1c82 100644
--- a/metadata/md5-cache/dev-python/pyspf-2.0.12
+++ b/metadata/md5-cache/dev-python/pyspf-2.0.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/authres[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddr-2.1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pydns:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_6? ( dev-python/pydns:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6?] ) python_targets_python3_6? ( dev-lang/python:3.6[ipv6?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/authres[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-python/pydns:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ipv6?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of the Sender Policy Framework (SPF) protocol
 EAPI=5
 HOMEPAGE=https://pypi.org/project/pyspf/
-IUSE=ipv6 test python_targets_python2_7 python_targets_python3_6
+IUSE=ipv6 test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=PSF-2
-RDEPEND=dev-python/authres[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-python/ipaddr-2.1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pydns:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_6? ( dev-python/pydns:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6?] ) python_targets_python3_6? ( dev-lang/python:3.6[ipv6?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=test? ( ipv6 ) || ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/authres[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-python/pydns:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[ipv6?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=test? ( ipv6 ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyspf/pyspf-2.0.12t.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c561d34ea910529df21f4e452f943635
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85374b63e7d6782d5aeedb8afa0899fe
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.1 b/metadata/md5-cache/dev-python/pysrt-1.1.1
index 754274bbd981..81318e5ad7ae 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.1
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/chardet[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python library used to edit or create SubRip files
 EAPI=6
 HOMEPAGE=https://github.com/byroot/pysrt https://pypi.org/project/pysrt/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/chardet[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pypi.python.org/packages/f6/33/16ad65a8973cb8bcb494af09ee1b9ab5ffdd6ff300bce5d3ac7d3cb1f2cc/pysrt-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33803b2b21ed9eddbe19ab3b9fa7b8c6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dbedec27285b401faec086d8fe68a708
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.1-r1 b/metadata/md5-cache/dev-python/pysrt-1.1.1-r1
index 4d459c7edba0..1bcfec04d48d 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.1-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python library used to edit or create SubRip files
 EAPI=7
 HOMEPAGE=https://github.com/byroot/pysrt https://pypi.org/project/pysrt/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysrt/pysrt-1.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=aca06cd09f0f0b84d63a746cb8205b06
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e075b0830ef4e9fb2cffd8d432c9cd13
diff --git a/metadata/md5-cache/dev-python/pysrt-1.1.2 b/metadata/md5-cache/dev-python/pysrt-1.1.2
index b65174c3b75a..a79502e5ce4a 100644
--- a/metadata/md5-cache/dev-python/pysrt-1.1.2
+++ b/metadata/md5-cache/dev-python/pysrt-1.1.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Python library used to edit or create SubRip files
 EAPI=7
 HOMEPAGE=https://github.com/byroot/pysrt https://pypi.org/project/pysrt/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysrt/pysrt-1.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bc02636438b7a98042837174f8319679
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2aae2faac15a14d160ef6deec9714d92
diff --git a/metadata/md5-cache/dev-python/pysrt-9999 b/metadata/md5-cache/dev-python/pysrt-9999
index 3f332ef88a0f..11493f5cb595 100644
--- a/metadata/md5-cache/dev-python/pysrt-9999
+++ b/metadata/md5-cache/dev-python/pysrt-9999
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Python library used to edit or create SubRip files
 EAPI=7
 HOMEPAGE=https://github.com/byroot/pysrt https://pypi.org/project/pysrt/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/chardet[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bc02636438b7a98042837174f8319679
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2aae2faac15a14d160ef6deec9714d92
diff --git a/metadata/md5-cache/dev-python/pystache-0.5.4 b/metadata/md5-cache/dev-python/pystache-0.5.4
index 804b3ad69560..5518968f80bd 100644
--- a/metadata/md5-cache/dev-python/pystache-0.5.4
+++ b/metadata/md5-cache/dev-python/pystache-0.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pystache/pystache-0.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b9311182828621b3604c10193359bbb2
diff --git a/metadata/md5-cache/dev-python/pysvg-0.2.2_p3 b/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
index 1fbb648c7976..2ed066e6cef6 100644
--- a/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
+++ b/metadata/md5-cache/dev-python/pysvg-0.2.2_p3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysvg-py3/pysvg-py3-0.2.2.post3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=69792d3a3b7eb08e20721dc0d626c244
diff --git a/metadata/md5-cache/dev-python/pysvn-1.8.0 b/metadata/md5-cache/dev-python/pysvn-1.8.0
index 187a96d39f48..db8593239677 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_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8b763e6bc1f08d9f890ae3d1380bf80
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 f86f23ee9408..49f8e248f68a 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99552eab5cd0b4736cf1ad46eae244ff
diff --git a/metadata/md5-cache/dev-python/pytables-3.4.4 b/metadata/md5-cache/dev-python/pytables-3.4.4
index 25958c04b479..9d4d1b1dee6b 100644
--- a/metadata/md5-cache/dev-python/pytables-3.4.4
+++ b/metadata/md5-cache/dev-python/pytables-3.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tables/tables-3.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=180199d0d69388ea082354368d1ad0f8
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 5683653dc8fe..75954a6df780 100644
--- a/metadata/md5-cache/dev-python/pyte-0.5.2-r2
+++ b/metadata/md5-cache/dev-python/pyte-0.5.2-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyte/pyte-0.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8a2c0decbe4fa5490049c3c05909355
diff --git a/metadata/md5-cache/dev-python/pyte-0.8.0-r1 b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
index eee82a818c36..eff4b3625e93 100644
--- a/metadata/md5-cache/dev-python/pyte-0.8.0-r1
+++ b/metadata/md5-cache/dev-python/pyte-0.8.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/wcwidth[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Simple VTXXX-compatible terminal emulator
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/selectel/pyte/archive/0.8.0.tar.gz -> pyte-0.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5e13d5fefcee729cb5131919bf4dc9e5
diff --git a/metadata/md5-cache/dev-python/pytest-3.10.1 b/metadata/md5-cache/dev-python/pytest-3.10.1
index 67cecca25128..08e9707d990e 100644
--- a/metadata/md5-cache/dev-python/pytest-3.10.1
+++ b/metadata/md5-cache/dev-python/pytest-3.10.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-3.10.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9499eeae11ca77bda581fb8c36cdda10
diff --git a/metadata/md5-cache/dev-python/pytest-4.5.0 b/metadata/md5-cache/dev-python/pytest-4.5.0
index 8c2858c8c0c1..1fea2acf6017 100644
--- a/metadata/md5-cache/dev-python/pytest-4.5.0
+++ b/metadata/md5-cache/dev-python/pytest-4.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a756d4cc455dfc0304d5ebcd2973c6dd
diff --git a/metadata/md5-cache/dev-python/pytest-4.6.9 b/metadata/md5-cache/dev-python/pytest-4.6.9
index 2d0ad69e2322..85b786d35cae 100644
--- a/metadata/md5-cache/dev-python/pytest-4.6.9
+++ b/metadata/md5-cache/dev-python/pytest-4.6.9
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-4.6.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a8a55f35c4bce58377f6d80cc6938898
diff --git a/metadata/md5-cache/dev-python/pytest-5.3.4 b/metadata/md5-cache/dev-python/pytest-5.3.4
index 85d47b0b7f29..4f34821e9258 100644
--- a/metadata/md5-cache/dev-python/pytest-5.3.4
+++ b/metadata/md5-cache/dev-python/pytest-5.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-5.3.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8561adfdbfcd85bc47426c97fe43dcc0
diff --git a/metadata/md5-cache/dev-python/pytest-5.3.5 b/metadata/md5-cache/dev-python/pytest-5.3.5
index e423efb7b5fc..2100c1a1814c 100644
--- a/metadata/md5-cache/dev-python/pytest-5.3.5
+++ b/metadata/md5-cache/dev-python/pytest-5.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest/pytest-5.3.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4724cccdcebf0497522634b68bc3cf50
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 0abcd9e5aaf3..25beae9820bf 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_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=241544edcc3f19581f1073b05f5130b4
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 f46f7490cd27..a8a69e4f38ca 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_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-aiohttp/pytest-aiohttp-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1ba155ab22e0501bfea741403ce5f09
diff --git a/metadata/md5-cache/dev-python/pytest-arraydiff-0.1 b/metadata/md5-cache/dev-python/pytest-arraydiff-0.1
index fc42ba8655aa..2b993d37914c 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-arraydiff/pytest-arraydiff-0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7664ece5c84d798c8b91695085e8c36e
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.10.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.10.0
index 058701e9d809..624335ceadbf 100644
--- a/metadata/md5-cache/dev-python/pytest-asyncio-0.10.0
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-asyncio/archive/v0.10.0.tar.gz -> pytest-asyncio-0.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6602a328a1d00f30f434181a4a6ba41
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 30c6002d25b5..d2b9bf403356 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6742285d012ff8fc3bbda8efaa587067
diff --git a/metadata/md5-cache/dev-python/pytest-cache-1.0-r2 b/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
index f3be86ed82c7..a1e8e0ac8a51 100644
--- a/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
+++ b/metadata/md5-cache/dev-python/pytest-cache-1.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a90243242e50bc3a32179f9f68176fbc
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 ac05f9d14284..4e0a7d8da174 100644
--- a/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
+++ b/metadata/md5-cache/dev-python/pytest-catchlog-1.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-catchlog/pytest-catchlog-1.2.2.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a3188759bb3fdf381bd3573a23f0399
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 faef734d362d..ecb28997fb13 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.3.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0f0fac192a5d11e42ba069c8318345ee
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.6.1 b/metadata/md5-cache/dev-python/pytest-cov-2.6.1
index 8ba86e9cac18..04447c2599ef 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.6.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=70f0947c1bc015d9acdd69603ce5528f
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.8.1 b/metadata/md5-cache/dev-python/pytest-cov-2.8.1
index eef934e7495f..1437262e9c34 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.8.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4bcf74b67daebff93b328663d7a8758
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 e95b2c9b42b9..c312fdde32ad 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cython/pytest-cython-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c261d910c82e34fb11b8f5c07fdaf0b6
diff --git a/metadata/md5-cache/dev-python/pytest-describe-0.11.1 b/metadata/md5-cache/dev-python/pytest-describe-0.11.1
index b96c38847995..5d76697b32c3 100644
--- a/metadata/md5-cache/dev-python/pytest-describe-0.11.1
+++ b/metadata/md5-cache/dev-python/pytest-describe-0.11.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/pytest-2.6.0[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/pytest-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Describe-style plugin for py.test
 EAPI=7
 HOMEPAGE=https://github.com/ropez/pytest-describe https://pypi.org/project/pytest-describe
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/pytest-2.6.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pytest-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-describe/pytest-describe-0.11.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=46f5347fa13dbf59ed55f0e108ec763d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=01d8eb0488393fc7c63b548d5a84d114
diff --git a/metadata/md5-cache/dev-python/pytest-django-3.4.4 b/metadata/md5-cache/dev-python/pytest-django-3.4.4
index 7113815bd71d..3009020358a9 100644
--- a/metadata/md5-cache/dev-python/pytest-django-3.4.4
+++ b/metadata/md5-cache/dev-python/pytest-django-3.4.4
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.11.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools_scm-1.11.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A Django plugin for py.test
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=>=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pytest-3.6[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-django/pytest-django-3.4.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ae8462ee7ccb26b82cb980e24255c562
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8fdc3ee1178fe098be0fa7b57ad8f570
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 843bf8e8d374..0d1811d28266 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_pypy3(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1bcc63488140832b0c8788e5f117a84
diff --git a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1 b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
index 1f32bd3419aa..7b731e128cf8 100644
--- a/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-expect/pytest-expect-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=999007d8b89b006d529717a9a55f7e64
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 6dc732d488a9..5883662413b8 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-fixture-config/pytest-fixture-config-1.2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f9ade80d9583d0868be44588963b606a
diff --git a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0 b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0
index 3bdde22e966e..28cf76f2896e 100644
--- a/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-fixture-config-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-fixture-config/pytest-fixture-config-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5edb9601062edd4e5658e2a7e63560f2
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 c4b72fc657d4..b0dbc3b2154a 100644
--- a/metadata/md5-cache/dev-python/pytest-flake8-0.8.1
+++ b/metadata/md5-cache/dev-python/pytest-flake8-0.8.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/flake8-3.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=py.test plugin for flake8
 EAPI=6
 HOMEPAGE=https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-flake8
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[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
 SRC_URI=mirror://pypi/p/pytest-flake8/pytest-flake8-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f45876d639f08ea8286b18bcce8b9b77
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d1a990f076501aab9f3c872f0ea91fb0
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 19feca9d33d9..7c73ddde705e 100644
--- a/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
+++ b/metadata/md5-cache/dev-python/pytest-flake8-0.9.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)]
+DEPEND=>=dev-python/flake8-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=py.test plugin for flake8
 EAPI=7
 HOMEPAGE=https://github.com/tholo/pytest-flake8 https://pypi.org/project/pytest-flake8
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=MIT
-RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/flake8-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flake8/pytest-flake8-0.9.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2eacaeafee1cc4317307d40647163285
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=661d60d30d985d7aa8a9f4936782131e
diff --git a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0 b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
index d5b70796c3bb..4a869aa39e83 100644
--- a/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
+++ b/metadata/md5-cache/dev-python/pytest-flakes-4.0.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of small Python functions & classes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-utils/
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-flakes/pytest-flakes-4.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=105711b8db8f141074314f573b219080
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6101e745b40fedf110ee6905c7a4721d
diff --git a/metadata/md5-cache/dev-python/pytest-forked-0.2 b/metadata/md5-cache/dev-python/pytest-forked-0.2
index e38352f24a48..658fe30c2787 100644
--- a/metadata/md5-cache/dev-python/pytest-forked-0.2
+++ b/metadata/md5-cache/dev-python/pytest-forked-0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-forked/pytest-forked-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d075f19ee6f1a982ddb93006c74a24b
diff --git a/metadata/md5-cache/dev-python/pytest-forked-1.1.3 b/metadata/md5-cache/dev-python/pytest-forked-1.1.3
index 49b0fd68ec17..e070dbea7416 100644
--- a/metadata/md5-cache/dev-python/pytest-forked-1.1.3
+++ b/metadata/md5-cache/dev-python/pytest-forked-1.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-forked/pytest-forked-1.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b9ce7336c18419216ed91e089b1475a0
diff --git a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8 b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8
index e6ae717483a7..a5b6b82b46b9 100644
--- a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8
+++ b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2019.1.8
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Provides a helpers pytest namespace
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/pytest-helpers-namespace
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-helpers-namespace/pytest-helpers-namespace-2019.1.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=275c0a0b5950c533cb9aef5d99e9ccda
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=df7e299621384917c3c28f92eef37048
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 17faaf36cce6..b9da193bf67d 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_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-html/pytest-html-1.16.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=98eda96ae2d895a795f301da38e843ab
diff --git a/metadata/md5-cache/dev-python/pytest-html-1.22.1 b/metadata/md5-cache/dev-python/pytest-html-1.22.1
index e09a23b5fec1..525af8b70701 100644
--- a/metadata/md5-cache/dev-python/pytest-html-1.22.1
+++ b/metadata/md5-cache/dev-python/pytest-html-1.22.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-html/pytest-html-1.22.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0d3fd32da26a1fb3b1d8003dbb5eb3d4
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 501d4da82da2..83a104828a6d 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-httpbin/pytest-httpbin-0.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cd4270e30ce52dba19210d6a43490c0
diff --git a/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0 b/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0
index 08d52fefeb24..4e1f9c805d3f 100644
--- a/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0
+++ b/metadata/md5-cache/dev-python/pytest-httpbin-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/httpbin[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/httpbin[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Easily test your HTTP library against a local copy of httpbin
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/pytest-httpbin/archive/v1.0.0.tar.gz -> pytest-httpbin-1.0.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cf3a7efe7ab00573ef3bc501e82b7efa
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 a9520cc50d9f..a44b3496320d 100644
--- a/metadata/md5-cache/dev-python/pytest-isort-0.1.0
+++ b/metadata/md5-cache/dev-python/pytest-isort-0.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/isort-3.9.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cache-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/isort-3.9.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-2.6.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-cache-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=py.test plugin for isort
 EAPI=6
 HOMEPAGE=https://github.com/moccu/pytest-isort https://pypi.org/project/pytest-isort
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/isort-3.9.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-cache-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/isort-3.9.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-2.6.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-cache-1.0[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
 SRC_URI=mirror://pypi/p/pytest-isort/pytest-isort-0.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cec855515bbfa49756f60d7aa2e75925
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3ffa18e3400002445de44ee917a5233
diff --git a/metadata/md5-cache/dev-python/pytest-isort-0.3.1 b/metadata/md5-cache/dev-python/pytest-isort-0.3.1
index 7403d5bf3b99..2267ec6d1900 100644
--- a/metadata/md5-cache/dev-python/pytest-isort-0.3.1
+++ b/metadata/md5-cache/dev-python/pytest-isort-0.3.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/isort-4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/isort-4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-3.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=py.test plugin for isort
 EAPI=7
 HOMEPAGE=https://github.com/moccu/pytest-isort https://pypi.python.org/pypi/pytest-isort
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/isort-4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/isort-4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-3.5[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
 SRC_URI=mirror://pypi/p/pytest-isort/pytest-isort-0.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=73aa25e636a4e2d5d70aa347a0d9b8d0
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e330322859ce18e07aac992acd6f8f8e
diff --git a/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.2 b/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.2
index 4da9f411cceb..9681cb9ce511 100644
--- a/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.2
+++ b/metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tox[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tox[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=It helps to use fixtures in pytest.mark.parametrize
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-lazy-fixture/pytest-lazy-fixture-0.6.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d6fddb0319717dce8d0996257e98dbc9
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 6e0526033712..199caf20e4c2 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.3.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localserver/pytest-localserver-0.3.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=44bff4a4c0ff285f534859899204fbbc
diff --git a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0 b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
index 241e590e07c7..1e5bc493436e 100644
--- a/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
+++ b/metadata/md5-cache/dev-python/pytest-localserver-0.5.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/werkzeug-0.10[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/werkzeug-0.10[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/werkzeug-0.10[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/werkzeug-0.10[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Py.test plugin to test server connections locally
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-localserver/
 IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/werkzeug-0.10[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-localserver/pytest-localserver-0.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6b66ff67f97f2f10b8859e4363db093c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ea758c910e65e4f3a7bf9bc4c09f5b77
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 c1522f164ec3..d223532af00c 100644
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.3.0
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A plugin for pytest that provides access to test session metadata
 EAPI=6
 HOMEPAGE=https://github.com/davehunt/pytest-metadata/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-metadata/pytest-metadata-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37ca4febf0344ea977c9946e0518499e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=878d26f3f626bf861e308d31cd59d491
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 5691f99068e1..135bfd65784a 100644
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A plugin for pytest that provides access to test session metadata
 EAPI=6
 HOMEPAGE=https://github.com/davehunt/pytest-metadata/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/pytest-2.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-metadata/pytest-metadata-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37ca4febf0344ea977c9946e0518499e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=878d26f3f626bf861e308d31cd59d491
diff --git a/metadata/md5-cache/dev-python/pytest-metadata-1.8.0 b/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
index e81953a1944c..c1598b9280f0 100644
--- a/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
+++ b/metadata/md5-cache/dev-python/pytest-metadata-1.8.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pytest-3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=>=dev-python/pytest-3.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=A plugin for pytest that provides access to test session metadata
 EAPI=7
 HOMEPAGE=https://github.com/pytest-dev/pytest-metadata/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MPL-2.0
-RDEPEND=>=dev-python/pytest-3.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/pytest-3.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-metadata/pytest-metadata-1.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b1a52ca285ce51e3300c91035e43e725
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=aa27438c9444cd34cd251d8a984e1b7b
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 01779ba71414..fd1187f6df89 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_pypy3(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f39173d20e9fb5ddb13416a4f5b6813b
diff --git a/metadata/md5-cache/dev-python/pytest-mock-1.11.2 b/metadata/md5-cache/dev-python/pytest-mock-1.11.2
index d958e7fcac26..b50058aa3a97 100644
--- a/metadata/md5-cache/dev-python/pytest-mock-1.11.2
+++ b/metadata/md5-cache/dev-python/pytest-mock-1.11.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-1.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f94193bd9c6acb799b95e7ce66b53b35
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 4bc880822acf..152ee44ffd98 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_pypy3(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mock/pytest-mock-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2075d9507a7e795ee48bc26d00a758b5
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 4a36b9b68dfa..62c8e08cfa9e 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_pypy3(-)?,python_targets_python2_7(-)?,
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c79802200fb8df9086f70247d3a88f1c
diff --git a/metadata/md5-cache/dev-python/pytest-mpl-0.8 b/metadata/md5-cache/dev-python/pytest-mpl-0.8
index 7c2013cd92cf..b326171145f6 100644
--- a/metadata/md5-cache/dev-python/pytest-mpl-0.8
+++ b/metadata/md5-cache/dev-python/pytest-mpl-0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-mpl/pytest-mpl-0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ded88cbfd334dd1266fadaec4c5066e
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 a43c994333ef..c5ba82226eb9 100644
--- a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6
+++ b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=pytest plugin to check PEP8 requirements
 EAPI=6
 HOMEPAGE=https://pypi.org/project/pytest-pep8/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0d89c6e16caaf7d00a83c0393ac0c20
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1469d7946f174e4b255aee035e319e6b
diff --git a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1 b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
index 2246f8b161cd..ea037c307a20 100644
--- a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
+++ b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=pytest plugin to check PEP8 requirements
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-pep8/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b6c7f5b841348990f59caf86df35fdb7
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f534a64a3127fe5215e658e0dba75fbc
diff --git a/metadata/md5-cache/dev-python/pytest-pylint-0.14.1 b/metadata/md5-cache/dev-python/pytest-pylint-0.14.1
index d1dc87fac97c..34d419d1635b 100644
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.14.1
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.14.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] test? ( dev-python/pytest-pep8[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(-)] )
+DEPEND=dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pylint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest-pep8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=pytest plugin to check source code with pylint
 EAPI=7
 HOMEPAGE=https://github.com/carsongee/pytest-pylint
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pylint[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pylint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carsongee/pytest-pylint/archive/0.14.1.tar.gz -> pytest-pylint-0.14.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3afcf50287ab79936e350b9779aef184
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=33cd9be63447c288a559104dc2dffc6e
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 97914cfb1309..b2ba6b81c410 100644
--- a/metadata/md5-cache/dev-python/pytest-pylint-0.7.1
+++ b/metadata/md5-cache/dev-python/pytest-pylint-0.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] test? ( dev-python/pytest-pep8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest-pep8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=pytest plugin to check source code with pylint
 EAPI=6
 HOMEPAGE=https://github.com/carsongee/pytest-pylint
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/carsongee/pytest-pylint/archive/v0.7.1.tar.gz -> pytest-pylint-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e979fdfd005c9c3ed1dcb3b3211b4776
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bdea388a7cdc6285210378f0d90ef58c
diff --git a/metadata/md5-cache/dev-python/pytest-qt-3.3.0 b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
index dc84cc54e401..9b918c3c7686 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-3.3.0
+++ b/metadata/md5-cache/dev-python/pytest-qt-3.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-3.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=2660f5b9db7c6d79554a75696c897815
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 67f432cf2e19..7f4576e6b375 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_pypy3? ( >=dev-python/pypy3-5:0= ) pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7df50e3c4fa4849b6c7e690fd64e5379
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-7.0 b/metadata/md5-cache/dev-python/pytest-rerunfailures-7.0
index a6dc17956934..41afd041a710 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-7.0
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-7.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ede6fb9bd2b1b76d54e45e173f87dae3
diff --git a/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0 b/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
index 908532a12337..8181f5f0b060 100644
--- a/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
+++ b/metadata/md5-cache/dev-python/pytest-rerunfailures-8.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=pytest plugin to re-run tests to eliminate flaky failures
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-rerunfailures/pytest-rerunfailures-8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0b1f5665c6127f183f0143e95e9ad600
diff --git a/metadata/md5-cache/dev-python/pytest-runner-4.2 b/metadata/md5-cache/dev-python/pytest-runner-4.2
index 43eec9d073c8..aa56164542e8 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-4.2
+++ b/metadata/md5-cache/dev-python/pytest-runner-4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ced8832091c4f6919d7d45776336d552
diff --git a/metadata/md5-cache/dev-python/pytest-runner-5.2 b/metadata/md5-cache/dev-python/pytest-runner-5.2
index def316652e21..9e303364e4e3 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-5.2
+++ b/metadata/md5-cache/dev-python/pytest-runner-5.2
@@ -5,12 +5,12 @@ DESCRIPTION=Adds support for tests during installation of setup.py files
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-runner/ https://github.com/pytest-dev/pytest-runner
 IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=32a4e273e5fc829fe3adb28aa10b5528
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=62b9d1113edaa197ce65c82b181205f0
diff --git a/metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1 b/metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
index e870a18557f9..839857e0632e 100644
--- a/metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
+++ b/metadata/md5-cache/dev-python/pytest-salt-2019.2.1_p1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/psutil-4.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-2.8.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/psutil-4.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=PyTest Salt Plugin
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/pytest-salt
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/psutil-4.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pytest-2.8.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/psutil-4.2.0[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
 SRC_URI=mirror://pypi/p/pytest-salt/pytest-salt-2019.2.1.post1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=21f81625a6d6d9cf65c64d39e93ab620
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=27fb52299b91b1ed4440ceca4026fe88
diff --git a/metadata/md5-cache/dev-python/pytest-services-2.0.1 b/metadata/md5-cache/dev-python/pytest-services-2.0.1
index 5f9cec33de93..57c713740ba7 100644
--- a/metadata/md5-cache/dev-python/pytest-services-2.0.1
+++ b/metadata/md5-cache/dev-python/pytest-services-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytest-dev/pytest-services/archive/2.0.1.tar.gz -> pytest-services-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3d5e3640970ab77f1eb6de35df285490
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 9fc062442553..cd75ffca18e3 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd142bfe98276fb79c439789d6018167
diff --git a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0 b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0
index 8730c9951deb..2260daade811 100644
--- a/metadata/md5-cache/dev-python/pytest-shutil-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-shutil-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-shutil/pytest-shutil-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=26580f350e928ea58ac9738c4421b726
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 fda1f17ecad4..766141bcd2df 100644
--- a/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
+++ b/metadata/md5-cache/dev-python/pytest-subtesthack-0.1.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/hypothesis[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A hack for test fixtures, needed for hypothesis inside py.test
 EAPI=6
 HOMEPAGE=https://github.com/untitaker/pytest-subtesthack/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=public-domain
-RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pytest[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/untitaker/pytest-subtesthack/archive/0.1.1.tar.gz -> pytest-subtesthack-0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a863b761407b336844a8869473d77b77
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=436d53ebb79f11180fcadeeb18756d14
diff --git a/metadata/md5-cache/dev-python/pytest-testmon-0.9.15 b/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
index 2f690182fb8a..8ad7a142b270 100644
--- a/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
+++ b/metadata/md5-cache/dev-python/pytest-testmon-0.9.15
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-testmon/pytest-testmon-0.9.15.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5d889e4ecfaa8e702719e86e3bd87abf
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 64e70eb85285..a231b3216fc3 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_pypy3? ( >=dev-python/pypy3-5:0= ) pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1bdfac20e9888a6fdaf7698a53c788d3
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 cf537a270d53..611cc44470ce 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_pypy3? ( >=dev-python/pypy3-5:0= ) pyth
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=81f89c7ef033e09ed2ddc5c1a0ecb0b1
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.3.3 b/metadata/md5-cache/dev-python/pytest-timeout-1.3.3
index 0cf30c38d07e..5a611cdd44bb 100644
--- a/metadata/md5-cache/dev-python/pytest-timeout-1.3.3
+++ b/metadata/md5-cache/dev-python/pytest-timeout-1.3.3
@@ -4,11 +4,11 @@ DESCRIPTION=py.test plugin to abort hanging tests
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-timeout/
 IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c4f7aded1db211a14a54eddc63d13b37
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=aaa86fbd03bd3f6baaa35ede6df67f92
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 553a703ed58b..0dbab1b0cfde 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-virtualenv/pytest-virtualenv-1.2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=471eb8a4af3044b4f15d9e57eaa97be4
diff --git a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0 b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0
index 426e787de5a7..33a1ef6d5d95 100644
--- a/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0
+++ b/metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-virtualenv/pytest-virtualenv-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f3cc78d42275975430b11dcf95b7405c
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.23.2 b/metadata/md5-cache/dev-python/pytest-xdist-1.23.2
index 4663b78f3896..04a17ac49ae9 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.23.2
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.23.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.23.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4105e44e552d1f5ef25a16a471a67284
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.28.0 b/metadata/md5-cache/dev-python/pytest-xdist-1.28.0
index 52b615870a56..0777ba452fc0 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.28.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.28.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.28.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=78a45058142c58cef2a60e244b62d566
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.30.0 b/metadata/md5-cache/dev-python/pytest-xdist-1.30.0
index 4a34974d76bd..baba72f8318d 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.30.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.30.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.30.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bff5a8929fadc2dc82a1f225c082e0cf
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-1.31.0 b/metadata/md5-cache/dev-python/pytest-xdist-1.31.0
index 4a8ac60c8a52..e27664390684 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-1.31.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-1.31.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-1.31.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bff5a8929fadc2dc82a1f225c082e0cf
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 f309835b9fa7..8e2cd8a2f704 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ba2d37f5f4fcdc0dd4aa7559b54d4ca
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1-r1 b/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1-r1
index c386a82ec2fc..4d5dcf267d13 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=28a91444118a6b8877cb86fe7593c928
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1-r2 b/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1-r2
index f1a76525e938..37b27a0be914 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1-r2
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.12.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Manage external processes across test runs
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f8add6f5b44988c7105dfb1cb31a6395
diff --git a/metadata/md5-cache/dev-python/pytest-xprocess-0.13.1 b/metadata/md5-cache/dev-python/pytest-xprocess-0.13.1
index fcfd9721c52f..136dcc96f797 100644
--- a/metadata/md5-cache/dev-python/pytest-xprocess-0.13.1
+++ b/metadata/md5-cache/dev-python/pytest-xprocess-0.13.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Manage external processes across test runs
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xprocess/pytest-xprocess-0.13.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ab8d6566c607f22112abf1ea20f979aa
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 f3a17226e6f3..69eafc2c7557 100644
--- a/metadata/md5-cache/dev-python/python-afl-0.6.1
+++ b/metadata/md5-cache/dev-python/python-afl-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-afl/python-afl-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c64e7ee8dfa7cde50820b3690291defe
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 c19f047b6d94..af32a83358c8 100644
--- a/metadata/md5-cache/dev-python/python-afl-0.7.1
+++ b/metadata/md5-cache/dev-python/python-afl-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-afl/python-afl-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c64e7ee8dfa7cde50820b3690291defe
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 71b1e092e9c7..efe7680d15d6 100644
--- a/metadata/md5-cache/dev-python/python-augeas-0.5.0
+++ b/metadata/md5-cache/dev-python/python-augeas-0.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-admin/augeas python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=app-admin/augeas 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python bindings for Augeas
 EAPI=6
 HOMEPAGE=http://augeas.net/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
-RDEPEND=app-admin/augeas python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=app-admin/augeas 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-augeas/python-augeas-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d6174a84da9723c975784517bd6df31
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=43be15858ae7b8e63f46680197a23aa6
diff --git a/metadata/md5-cache/dev-python/python-augeas-1.0.3 b/metadata/md5-cache/dev-python/python-augeas-1.0.3
index 15932890067d..2c298fe871d5 100644
--- a/metadata/md5-cache/dev-python/python-augeas-1.0.3
+++ b/metadata/md5-cache/dev-python/python-augeas-1.0.3
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)]
+DEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python bindings for Augeas
 EAPI=7
 HOMEPAGE=http://augeas.net/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=app-admin/augeas >=dev-python/cffi-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-augeas/python-augeas-1.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=77605698c2ff371ad6d6e20644b94504
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=24c26de863396a1754506b342dff29c9
diff --git a/metadata/md5-cache/dev-python/python-axolotl-0.2.3 b/metadata/md5-cache/dev-python/python-axolotl-0.2.3
index 2dce3b2a31a2..7e94da2261aa 100644
--- a/metadata/md5-cache/dev-python/python-axolotl-0.2.3
+++ b/metadata/md5-cache/dev-python/python-axolotl-0.2.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tgalal/python-axolotl/archive/0.2.3.tar.gz -> python-axolotl-0.2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6a6f309df491a74747fb16600143cf74
diff --git a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1 b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
index 87ce519537a0..ce64977cc2f4 100644
--- a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
+++ b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=141fc69074d447ab2691a573fabd2dbb
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 019c56528efc..16bbace79faa 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_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/backoff/backoff-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1599a3082febf413f74ff17a49e16594
diff --git a/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1 b/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
index 62a57af677fe..d26fcf58ab62 100644
--- a/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
+++ b/metadata/md5-cache/dev-python/python-barbicanclient-4.8.1
@@ -1,15 +1,15 @@
 BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Client library for Barbican API.
 EAPI=7
 HOMEPAGE=https://github.com/openstack/barbican
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cliff-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/cliff-2.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cliff-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-barbicanclient/python-barbicanclient-4.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c214462ee39ad3bc113a8d24dd435dbe
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3605c3b370d82f18f8d32abf241b9100
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 549aa131ed73..5f525f541e06 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d90badf2c48930335553da06d702638
diff --git a/metadata/md5-cache/dev-python/python-bibtex-1.2.7-r2 b/metadata/md5-cache/dev-python/python-bibtex-1.2.7-r2
index c63ee8e5ca45..195e66d88833 100644
--- a/metadata/md5-cache/dev-python/python-bibtex-1.2.7-r2
+++ b/metadata/md5-cache/dev-python/python-bibtex-1.2.7-r2
@@ -11,5 +11,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_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6118504b2079c19cbc678682a9563645
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 ce8ed4ea362f..6a1953682a01 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-blazarclient/python-blazarclient-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5c58bec587befcc8b581b27c245bb84
diff --git a/metadata/md5-cache/dev-python/python-blazarclient-2.1.0 b/metadata/md5-cache/dev-python/python-blazarclient-2.1.0
index 39f441f9ab48..a42f8de3e731 100644
--- a/metadata/md5-cache/dev-python/python-blazarclient-2.1.0
+++ b/metadata/md5-cache/dev-python/python-blazarclient-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-blazarclient/python-blazarclient-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=072741553a1faa2e521d366ac91e640d
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 5153a53b4bac..dd42b481416b 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_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5e52dd18f6038cc2ebdea41f82f2f90
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 67612add2169..56b2434afafd 100644
--- a/metadata/md5-cache/dev-python/python-bugzilla-2.1.0
+++ b/metadata/md5-cache/dev-python/python-bugzilla-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-bugzilla/python-bugzilla-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da4f504b259e07a6131953edb9ef9521
diff --git a/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.2-r1 b/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.2-r1
index 2f91c15f53fb..198a228cabf0 100644
--- a/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.2-r1
+++ b/metadata/md5-cache/dev-python/python-ceilometerclient-2.6.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ceilometerclient/python-ceilometerclient-2.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ae00be5c186ed971e3af5b6a9045aeb
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-4.1.0 b/metadata/md5-cache/dev-python/python-cinderclient-4.1.0
index 245f3be80f59..3a0309762a75 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-4.1.0
+++ b/metadata/md5-cache/dev-python/python-cinderclient-4.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-4.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e3b50fec941cc7d8a759820990bdc51
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-4.2.1 b/metadata/md5-cache/dev-python/python-cinderclient-4.2.1
index 9683479dc48f..f6f491ba4b3d 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-4.2.1
+++ b/metadata/md5-cache/dev-python/python-cinderclient-4.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-4.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e3b50fec941cc7d8a759820990bdc51
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 5ef5ac653f92..401c9388dd6f 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cluster/cluster-1.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c78c0192bf0d87f000022cce634d8606
diff --git a/metadata/md5-cache/dev-python/python-cstruct-1.7 b/metadata/md5-cache/dev-python/python-cstruct-1.7
index 7c96b1294afb..eed2c5eee4b6 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_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cstruct/cstruct-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aeefdc17f508c7797e142c66cf9e62de
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 03f3a594b160..c70cba2cd5b3 100644
--- a/metadata/md5-cache/dev-python/python-ctags-1.2.4
+++ b/metadata/md5-cache/dev-python/python-ctags-1.2.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Exuberant Ctags indexing python bindings
 EAPI=6
 HOMEPAGE=https://github.com/jonashaag/python-ctags3
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=dev-util/ctags python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-util/ctags python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ctags3/python-ctags3-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d384a8898ed25259809ec69d8a6e9098
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ac990302a108c874063f13b428b8661c
diff --git a/metadata/md5-cache/dev-python/python-ctags-1.3.0 b/metadata/md5-cache/dev-python/python-ctags-1.3.0
index f4a549d240ac..a30334161986 100644
--- a/metadata/md5-cache/dev-python/python-ctags-1.3.0
+++ b/metadata/md5-cache/dev-python/python-ctags-1.3.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Exuberant Ctags indexing python bindings
 EAPI=7
 HOMEPAGE=https://github.com/jonashaag/python-ctags3
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=dev-util/ctags python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-util/ctags python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ctags3/python-ctags3-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=29e8a96b630efcfd491604aff16a87c5
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=56e32470e0b5fd2fc88ff7905a4ccb6f
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 c0249d3c2aaa..860084f1662d 100644
--- a/metadata/md5-cache/dev-python/python-daemon-1.6-r1
+++ b/metadata/md5-cache/dev-python/python-daemon-1.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e041479af6499bae67c79b3183edc9bf
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 d4f539eb8307..7aaceba6cbfd 100644
--- a/metadata/md5-cache/dev-python/python-daemon-2.1.1
+++ b/metadata/md5-cache/dev-python/python-daemon-2.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=491e3d119517db37d70ca2f77c731d86
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 2a92552c3edc..0a55ec8d9176 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-daemon/python-daemon-2.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=70dffae6d88f49ed78607499a9aefe27
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 721f3f3138a8..1ce1d7341a5c 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a245ae71ce743d7eaf88decec201135
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.8.0 b/metadata/md5-cache/dev-python/python-dateutil-2.8.0
index d06532dca302..d2af7bb7c2e2 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.8.0
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a7796d93e926f533055bc334339ca77b
diff --git a/metadata/md5-cache/dev-python/python-dateutil-2.8.1-r1 b/metadata/md5-cache/dev-python/python-dateutil-2.8.1-r1
index 6c20127dc376..1b67031a51ae 100644
--- a/metadata/md5-cache/dev-python/python-dateutil-2.8.1-r1
+++ b/metadata/md5-cache/dev-python/python-dateutil-2.8.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-libs/timezone-data dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-libs/timezone-data ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=>=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-libs/timezone-data dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/six-1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-libs/timezone-data dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extensions to the standard Python datetime module
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-dateutil/python-dateutil-2.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bdcb6398867cbdbcca9b33cf8e9ac26f
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 fde4ba6fc84a..8f129a43ceed 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_python3_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20c6b8c1f5a214d52f83f794bf2d288a
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 144a61097bcb..343a7cfc2e24 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.31.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a3e3011e7b68f938c633eaefd3b2810e
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.36 b/metadata/md5-cache/dev-python/python-debian-0.1.36
index ced0b140ed89..c58e745511ec 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.36
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.36
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.36.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b64927e9853809225ce8d4556930d7eb
diff --git a/metadata/md5-cache/dev-python/python-designateclient-2.11.0 b/metadata/md5-cache/dev-python/python-designateclient-2.11.0
index b58da8b4ca0b..8e7c02e91863 100644
--- a/metadata/md5-cache/dev-python/python-designateclient-2.11.0
+++ b/metadata/md5-cache/dev-python/python-designateclient-2.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-designateclient/python-designateclient-2.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dbd278c503d17b2b3a9cfc5df3d2511e
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 532796097be6..dc4d4d0d3d11 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_python3_6? ( dev-lang/python
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26be318d93bd863bd211fc3651fea483
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 3f58d3cd6378..cf6537a5f570 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_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5544df3e13ae12870c2fe6198233bec2
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 42a8b3e5528b..9d2ce113523b 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.39
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.39
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/python-distutils-extra/trunk/2.39/+download/python-distutils-extra-2.39.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=627d8a3d9cf93c3d8a3f28b83e85b3b9
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.42 b/metadata/md5-cache/dev-python/python-distutils-extra-2.42
index e20f5e5e6377..b5e2b8cd14eb 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.42
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.42
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/p/python-distutils-extra/python-distutils-extra_2.42.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=252a089b30bca9d9d22119c690c37986
diff --git a/metadata/md5-cache/dev-python/python-distutils-extra-2.42-r1 b/metadata/md5-cache/dev-python/python-distutils-extra-2.42-r1
index fa7903f620b5..245441c2ccbb 100644
--- a/metadata/md5-cache/dev-python/python-distutils-extra-2.42-r1
+++ b/metadata/md5-cache/dev-python/python-distutils-extra-2.42-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://ubuntu/pool/universe/p/python-distutils-extra/python-distutils-extra_2.42.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=756b20924b68f31a335dc41d770a1f2d
diff --git a/metadata/md5-cache/dev-python/python-djvulibre-0.8 b/metadata/md5-cache/dev-python/python-djvulibre-0.8
index 66223b300737..f93c8cb9e9c8 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_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-djvulibre/python-djvulibre-0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2cdb2bda10c2866f09b9dd7ded4492d
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 62e1badf5c13..f3bcfdb599c4 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_python3_6(
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=02a18926f8c32cbcb4b500ead2d8aad7
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 193cad964d4f..59bf5508f5a6 100644
--- a/metadata/md5-cache/dev-python/python-editor-1.0.3
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1f5c047570cb91ca70d2dd9852bcf53b
diff --git a/metadata/md5-cache/dev-python/python-editor-1.0.4 b/metadata/md5-cache/dev-python/python-editor-1.0.4
new file mode 100644
index 000000000000..87fd9c897246
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-editor-1.0.4
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=Programmatically open an editor, capture the result.
+EAPI=7
+HOMEPAGE=https://github.com/fmoo/python-editor
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-editor/python-editor-1.0.4.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=881de17661ef7409a636b1b765e9f163
diff --git a/metadata/md5-cache/dev-python/python-efl-1.23.0 b/metadata/md5-cache/dev-python/python-efl-1.23.0
index b3f6ac2550a4..e90f4467f6e1 100644
--- a/metadata/md5-cache/dev-python/python-efl-1.23.0
+++ b/metadata/md5-cache/dev-python/python-efl-1.23.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/bindings/python/python-efl-1.23.0.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=58fb17b55bfdd7b7049e01e68466dfc0
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 19ba2961e10e..5f27d6eaa201 100644
--- a/metadata/md5-cache/dev-python/python-engineio-1.7.0
+++ b/metadata/md5-cache/dev-python/python-engineio-1.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of the Engine.IO realtime server.
 EAPI=6
 HOMEPAGE=https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-engineio/python-engineio-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9dd40a1340cfc8dab6a14523feb354c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c8b16742300a8cb4da5064f952a8609f
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 197acf9a7d5d..22d065a8c43d 100644
--- a/metadata/md5-cache/dev-python/python-engineio-2.2.0
+++ b/metadata/md5-cache/dev-python/python-engineio-2.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of the Engine.IO realtime server.
 EAPI=6
 HOMEPAGE=https://python-engineio.readthedocs.org/ https://github.com/miguelgrinberg/python-engineio/ https://pypi.org/project/python-engineio/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-engineio/python-engineio-2.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9dd40a1340cfc8dab6a14523feb354c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c8b16742300a8cb4da5064f952a8609f
diff --git a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1 b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
index 1316ac184b95..c0dda1fb80d7 100644
--- a/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-etcd/python-etcd-0.4.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1c89bb22d251664f2a855157e40d43ec
diff --git a/metadata/md5-cache/dev-python/python-ethtool-0.14 b/metadata/md5-cache/dev-python/python-ethtool-0.14
index 7eebf128dd3b..d3d54eace4cb 100644
--- a/metadata/md5-cache/dev-python/python-ethtool-0.14
+++ b/metadata/md5-cache/dev-python/python-ethtool-0.14
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libnl:3 python_targets_python3_6? ( dev-lang/python:3.6 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/fedora-python/python-ethtool/archive/v0.14.tar.gz -> python-ethtool-0.14.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bbd7c73695cc46d9e8a6433f22fa20dd
diff --git a/metadata/md5-cache/dev-python/python-evdev-1.1.2-r1 b/metadata/md5-cache/dev-python/python-evdev-1.1.2-r1
index 2f75aa5d6ed7..98aca7c6f334 100644
--- a/metadata/md5-cache/dev-python/python-evdev-1.1.2-r1
+++ b/metadata/md5-cache/dev-python/python-evdev-1.1.2-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library for evdev bindings
 EAPI=7
 HOMEPAGE=https://python-evdev.readthedocs.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/gvalkov/python-evdev/archive/v1.1.2.tar.gz -> python-evdev-1.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1676f91eddb36a194edccb73a3d6016d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=618ade3670010eb17b8e3ca145f50cf6
diff --git a/metadata/md5-cache/dev-python/python-fastimport-0.9.8 b/metadata/md5-cache/dev-python/python-fastimport-0.9.8
index 19354651ebfd..7797fd582053 100644
--- a/metadata/md5-cache/dev-python/python-fastimport-0.9.8
+++ b/metadata/md5-cache/dev-python/python-fastimport-0.9.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastimport/fastimport-0.9.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dce406fa37d3dfaf245f84badca20538
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 c965a00abe21..1787e4a2de2b 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=913f4ce5139f2addd0f324cea4b2cdf6
diff --git a/metadata/md5-cache/dev-python/python-gammu-2.11 b/metadata/md5-cache/dev-python/python-gammu-2.11
index e629f329ec88..32155e6ba6ae 100644
--- a/metadata/md5-cache/dev-python/python-gammu-2.11
+++ b/metadata/md5-cache/dev-python/python-gammu-2.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gammu/python-gammu-2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c360c4027818f1819abab0abdd3d985
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 03677b4caf8e..c279651b6c5a 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_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=018b3e3ae4f91aeb92251ef9cd53f72e
diff --git a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1 b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
index cd9ebfddbb11..4adad4c3d397 100644
--- a/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
+++ b/metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gflags/python-gflags-3.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=73f2d0630065f1a468f9009bc65d7c90
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.13.1 b/metadata/md5-cache/dev-python/python-glanceclient-2.13.1
index 6c2b58de32ab..58139ac762c3 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.13.1
+++ b/metadata/md5-cache/dev-python/python-glanceclient-2.13.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.13.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd4bdf5b94626b7edc75f0962d576697
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-2.16.0 b/metadata/md5-cache/dev-python/python-glanceclient-2.16.0
index c3ae1e956dd6..2d3c39296da6 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-2.16.0
+++ b/metadata/md5-cache/dev-python/python-glanceclient-2.16.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-2.16.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=298898eaf15d971bf43c6c7d3f4bdea1
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.5 b/metadata/md5-cache/dev-python/python-gnupg-0.4.5
index 286f78d70d6c..92cac99d0cab 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.4.5
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.5
@@ -11,5 +11,5 @@ RDEPEND=app-crypt/gnupg python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gnupg/python-gnupg-0.4.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=18184dab546a5f284efe2a0e696c31c1
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.16.2 b/metadata/md5-cache/dev-python/python-heatclient-1.16.2
index 2d62c145d5a2..b0ba229bf87c 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-1.16.2
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.16.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-1.16.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14dd90cd59765d75d879b4ca04d741d2
diff --git a/metadata/md5-cache/dev-python/python-heatclient-1.17.0 b/metadata/md5-cache/dev-python/python-heatclient-1.17.0
index 5abe551d59e4..930fb764c1fe 100644
--- a/metadata/md5-cache/dev-python/python-heatclient-1.17.0
+++ b/metadata/md5-cache/dev-python/python-heatclient-1.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-heatclient/python-heatclient-1.17.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ffa6a495bb614e406386dc5bae650881
diff --git a/metadata/md5-cache/dev-python/python-hpilo-4.0 b/metadata/md5-cache/dev-python/python-hpilo-4.0
index 0dce1407ca2e..001b4713290c 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da7add659a8cd8b6e415e1597bc5c9bf
diff --git a/metadata/md5-cache/dev-python/python-hpilo-4.1 b/metadata/md5-cache/dev-python/python-hpilo-4.1
index 01dd18d14f9e..136b9e14988d 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da7add659a8cd8b6e415e1597bc5c9bf
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 3acc94c1993e..351ba88c65c1 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_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-iptables/python-iptables-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b6b5bb06231e712531d487014e63c50
diff --git a/metadata/md5-cache/dev-python/python-iptables-0.13.0 b/metadata/md5-cache/dev-python/python-iptables-0.13.0
index 493638783695..135aeae74cae 100644
--- a/metadata/md5-cache/dev-python/python-iptables-0.13.0
+++ b/metadata/md5-cache/dev-python/python-iptables-0.13.0
@@ -10,5 +10,5 @@ RDEPEND=net-firewall/iptables python_targets_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-iptables/python-iptables-0.13.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1de9f8f4345d6df85bb9cb192b0ee8e9
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 608524446f9f..8ede4a0e6191 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-1.17.0
+++ b/metadata/md5-cache/dev-python/python-ironicclient-1.17.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-1.17.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=648185f6a0dd268c76f9b4db4478c837
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 0541798fa9be..b8649e3b45f7 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-2.2.1
+++ b/metadata/md5-cache/dev-python/python-ironicclient-2.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-2.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e7dcf50f9bc0d8cb193d0716516e66f6
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-2.7.1 b/metadata/md5-cache/dev-python/python-ironicclient-2.7.1
index 69ffeb11ec1c..b9bfa470fcdb 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-2.7.1
+++ b/metadata/md5-cache/dev-python/python-ironicclient-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-2.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88583d8a715bd829430a462123c2afdb
diff --git a/metadata/md5-cache/dev-python/python-ironicclient-2.7.2 b/metadata/md5-cache/dev-python/python-ironicclient-2.7.2
index 74cfdf7680a8..37bc383b6289 100644
--- a/metadata/md5-cache/dev-python/python-ironicclient-2.7.2
+++ b/metadata/md5-cache/dev-python/python-ironicclient-2.7.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ironicclient/python-ironicclient-2.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88583d8a715bd829430a462123c2afdb
diff --git a/metadata/md5-cache/dev-python/python-iwscan-20080402-r1 b/metadata/md5-cache/dev-python/python-iwscan-20080402-r1
index d69094d2d176..fed98231db38 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_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/python-iwscan-20080402.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b1ba3f8139bfdcfccf248fba352d309
diff --git a/metadata/md5-cache/dev-python/python-jose-3.0.1 b/metadata/md5-cache/dev-python/python-jose-3.0.1
index d7577a721b65..f1e82c1c3310 100644
--- a/metadata/md5-cache/dev-python/python-jose-3.0.1
+++ b/metadata/md5-cache/dev-python/python-jose-3.0.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycryptodome-3.3.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[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(-)] )
+DEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycryptodome-3.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-cov[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=A JavaScript Object Signing and Encryption (JOSE) implementation in Python
 EAPI=7
 HOMEPAGE=https://github.com/mpdavis/python-jose https://pypi.org/project/python-jose/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycryptodome-3.3.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rsa[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyasn1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pycryptodome-3.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mpdavis/python-jose/archive/3.0.1.tar.gz -> python-jose-3.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e154d95af4fa832f3a6413386bd0a061
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=70cd37269b5c0e808d6ec10e548b1c26
diff --git a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.2 b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.2
index 098adb508b51..4abab7694b25 100644
--- a/metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.2
+++ b/metadata/md5-cache/dev-python/python-jsonrpc-server-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/palantir/python-jsonrpc-server/archive/0.3.2.tar.gz -> python-jsonrpc-server-0.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9548717233b9f08812ad875c93313415
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 187f75de82f2..71202e26a9a5 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-3.15.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4b7cbae52ff24da0c232a61c15cbcbf
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 de71327a8d56..9cfdc624d602 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-3.17.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0ffc10d69eb0f612e0a27c20af3f907
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-3.19.0 b/metadata/md5-cache/dev-python/python-keystoneclient-3.19.0
index e680cacc8ac7..a76e8d1b39be 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-3.19.0
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-3.19.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-3.19.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5fe335a2682345565724981359d6c4e3
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-3.21.0 b/metadata/md5-cache/dev-python/python-keystoneclient-3.21.0
index ccab9b771f41..0ad7c4ce1e8a 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-3.21.0
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-3.21.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-3.21.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5fe335a2682345565724981359d6c4e3
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.31.2 b/metadata/md5-cache/dev-python/python-language-server-0.31.2
index afb21d830782..652974e354ba 100644
--- a/metadata/md5-cache/dev-python/python-language-server-0.31.2
+++ b/metadata/md5-cache/dev-python/python-language-server-0.31.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/jedi[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.31.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6dc46582f294653de9455769eb978241
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 70d907b5bd74..62d811e0097a 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_python2_7(-)?,
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e6002c68cde7599a7ece9050324fa1d
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 9bff4a501468..18bf1d8df77b 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_python2_7(-)?,
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d490272c8d012d0d3639abb5c1a88ef
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1 b/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
index 974d9afc7b09..3fca66c275f6 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
+++ b/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9cd762120815cbf1110352544c4178a2
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.2.0 b/metadata/md5-cache/dev-python/python-ldap-3.2.0
new file mode 100644
index 000000000000..545fe1f0d249
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-ldap-3.2.0
@@ -0,0 +1,15 @@
+BDEPEND=>net-nds/openldap-2.4.11:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) test? ( !dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Various LDAP-related Python modules
+EAPI=7
+HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
+IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris
+LICENSE=PSF-2
+RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.2.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d1731f1e12d745117e86ccbdc412b99e
diff --git a/metadata/md5-cache/dev-python/python-ldap-9999 b/metadata/md5-cache/dev-python/python-ldap-9999
index ffbd345226cf..e9ad3fdf2a6e 100644
--- a/metadata/md5-cache/dev-python/python-ldap-9999
+++ b/metadata/md5-cache/dev-python/python-ldap-9999
@@ -1,15 +1,14 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>net-nds/openldap-2.4.11:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) test? ( !dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>net-nds/openldap-2.4.11:=[sasl?,ssl?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) sasl? ( >=dev-libs/cyrus-sasl-2.1 ) test? ( !dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Various LDAP-related Python modules
 EAPI=7
-HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/
-IUSE=doc examples sasl ssl test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap
+IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=PSF-2
 PROPERTIES=live
-RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1e0c1a68bbada9c5f5910c68c3d42ed7
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d1731f1e12d745117e86ccbdc412b99e
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 21b37cf6ab12..235c31ca27f3 100644
--- a/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
+++ b/metadata/md5-cache/dev-python/python-levenshtein-0.12.0
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Functions for fast computation of Levenshtein distance, and edit operations
 EAPI=6
 HOMEPAGE=https://github.com/ztane/python-Levenshtein/ https://pypi.org/project/python-Levenshtein/
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm64 ~ia64 x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-Levenshtein/python-Levenshtein-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=783726cfd54aa77250a6c05adff618cb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dce023abab4b9bed3eb9e380d2184853
diff --git a/metadata/md5-cache/dev-python/python-lhafile-0.2.2 b/metadata/md5-cache/dev-python/python-lhafile-0.2.2
index ff7ac043fa3a..449d58e49d21 100644
--- a/metadata/md5-cache/dev-python/python-lhafile-0.2.2
+++ b/metadata/md5-cache/dev-python/python-lhafile-0.2.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/FrodeSolheim/python-lhafile/archive/v0.2.2.tar.gz -> python-lhafile-0.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=befb7f7d9363133f0e6cfad1c981ff54
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
deleted file mode 100644
index fe1d19fb23a1..000000000000
--- a/metadata/md5-cache/dev-python/python-linux-procfs-0.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python classes to extract information from the Linux kernel /proc files
-EAPI=7
-HOMEPAGE=https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/ https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64
-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
-SRC_URI=mirror://gentoo/python-linux-procfs-0.4.6.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bc4d7f74991c2e9c3a4766849fd46b81
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1 b/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
index a0afad6e1993..d4249c021c96 100644
--- a/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
+++ b/metadata/md5-cache/dev-python/python-linux-procfs-0.6.1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python classes to extract information from the Linux kernel /proc files
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/ https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://cdn.kernel.org/pub/software/libs/python/python-linux-procfs/python-linux-procfs-0.6.1.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a716fccffc541b6ff394ff85020df917
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0675dbf5d990287289acb5daf05454b2
diff --git a/metadata/md5-cache/dev-python/python-linux-procfs-9999 b/metadata/md5-cache/dev-python/python-linux-procfs-9999
deleted file mode 100644
index 5df9ab254493..000000000000
--- a/metadata/md5-cache/dev-python/python-linux-procfs-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Python classes to extract information from the Linux kernel /proc files
-EAPI=7
-HOMEPAGE=https://www.kernel.org/pub/scm/libs/python/python-linux-procfs/ https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/
-IUSE=python_targets_python2_7
-LICENSE=GPL-2
-PROPERTIES=live
-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	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=24f9e02b943121f53bfe0a1d37e353dd
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 400bcad17f25..e0145c66cd8b 100644
--- a/metadata/md5-cache/dev-python/python-ly-0.9.5
+++ b/metadata/md5-cache/dev-python/python-ly-0.9.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Tool and library for manipulating LilyPond files
 EAPI=6
 HOMEPAGE=https://github.com/wbsoft/python-ly https://pypi.org/project/python-ly/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/p/python-ly/python-ly-0.9.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bf43d23c40c03ed6269df2be76eac8f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42859e24078b89c871dc5f7c6154e3b4
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.08-r1 b/metadata/md5-cache/dev-python/python-lzo-1.08-r1
deleted file mode 100644
index edaa9988c0d8..000000000000
--- a/metadata/md5-cache/dev-python/python-lzo-1.08-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/lzo:2 python_targets_python2_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/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python interface to lzo
-EAPI=5
-HOMEPAGE=http://www.oberhumer.com/opensource/lzo/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2: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://www.oberhumer.com/opensource/lzo/download/LZO-v1/python-lzo-1.08.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5c538401cc7374aeb40e550c3e88857
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.11 b/metadata/md5-cache/dev-python/python-lzo-1.11
deleted file mode 100644
index dbb9bcf212bc..000000000000
--- a/metadata/md5-cache/dev-python/python-lzo-1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/lzo:2 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to lzo
-EAPI=6
-HOMEPAGE=https://github.com/jd-boyd/python-lzo
-IUSE=test python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bff9ecfc08524f4f30b75ac63a07bebd
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12 b/metadata/md5-cache/dev-python/python-lzo-1.12
deleted file mode 100644
index 8f1547fb32d6..000000000000
--- a/metadata/md5-cache/dev-python/python-lzo-1.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/lzo:2 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python interface to lzo
-EAPI=6
-HOMEPAGE=https://github.com/jd-boyd/python-lzo
-IUSE=test python_targets_python2_7 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03e395d59e275699e4c0420191a2f7cd
diff --git a/metadata/md5-cache/dev-python/python-lzo-1.12-r1 b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
index 9764f3636f09..c5e9e87fd755 100644
--- a/metadata/md5-cache/dev-python/python-lzo-1.12-r1
+++ b/metadata/md5-cache/dev-python/python-lzo-1.12-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/lzo:2 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[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(-)] )
+DEPEND=dev-libs/lzo:2 dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python interface to lzo
 EAPI=7
 HOMEPAGE=https://github.com/jd-boyd/python-lzo
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-libs/lzo:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-libs/lzo:2 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-lzo/python-lzo-1.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ea33a0c02920fe8200855fe3e6b64b70
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=645a79845e170cf8cc6524f339acb2e9
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 7d4c22c9b184..82b06750dfcf 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_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5306f3c02462c4f0acf04d2788dbf469
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.15-r1 b/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
index aadf1b046dbb..f4ea69c9eeb4 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.15-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Access the libmagic file type identification library
 EAPI=7
 HOMEPAGE=https://github.com/ahupp/python-magic
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux
+KEYWORDS=amd64 arm ~hppa ~ia64 ~sparc x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=sys-apps/file[-python] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b05669e722f6f4192b12a0647498ea86
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b67129a3cff91e7144d4c50a1ad729ca
diff --git a/metadata/md5-cache/dev-python/python-magnumclient-2.12.0 b/metadata/md5-cache/dev-python/python-magnumclient-2.12.0
index 37261eb737b0..fa5a77560bd5 100644
--- a/metadata/md5-cache/dev-python/python-magnumclient-2.12.0
+++ b/metadata/md5-cache/dev-python/python-magnumclient-2.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-magnumclient/python-magnumclient-2.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b217d7e9e3a075d73a98197221c7973f
diff --git a/metadata/md5-cache/dev-python/python-manilaclient-1.27.0 b/metadata/md5-cache/dev-python/python-manilaclient-1.27.0
index 2ac4d3f881b8..d11377737b13 100644
--- a/metadata/md5-cache/dev-python/python-manilaclient-1.27.0
+++ b/metadata/md5-cache/dev-python/python-manilaclient-1.27.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-manilaclient/python-manilaclient-1.27.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a17d2db4c9ad307308118aef755b368a
diff --git a/metadata/md5-cache/dev-python/python-markdown-math-0.6-r1 b/metadata/md5-cache/dev-python/python-markdown-math-0.6-r1
index 46a647204b22..3c8ecf0c7f18 100644
--- a/metadata/md5-cache/dev-python/python-markdown-math-0.6-r1
+++ b/metadata/md5-cache/dev-python/python-markdown-math-0.6-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/markdown-3.0.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/markdown-3.0.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Math extension for Python-Markdown
 EAPI=7
 HOMEPAGE=https://github.com/mitya57/python-markdown-math
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=dev-python/markdown-3.0.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/markdown-3.0.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-markdown-math/python-markdown-math-0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c082ebfd9ab48b38fb1bfdefcdf3d957
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=852555a145d2a8511efaf3dacf6fc873
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 fd5bf46ebf63..28b3681c3e45 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59572093c2ba2e8265dd1eb842355649
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.58 b/metadata/md5-cache/dev-python/python-memcached-1.58
index 927a353f0220..f13e57163f6e 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-memcached/python-memcached-1.58.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=635eb6f74087886ad3e8218d899907bd
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.59 b/metadata/md5-cache/dev-python/python-memcached-1.59
index 2c14c401a8cd..620dbb249c0e 100644
--- a/metadata/md5-cache/dev-python/python-memcached-1.59
+++ b/metadata/md5-cache/dev-python/python-memcached-1.59
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-memcached/python-memcached-1.59.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bc45e79872c6467245a0016be6eed6e3
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 9e9eb84476b3..5b89301f0203 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7550e8c5a0e72992b307c8927dc2aaf8
diff --git a/metadata/md5-cache/dev-python/python-mistralclient-3.8.0 b/metadata/md5-cache/dev-python/python-mistralclient-3.8.0
index a8d03d68d0e7..5c9d3c156beb 100644
--- a/metadata/md5-cache/dev-python/python-mistralclient-3.8.0
+++ b/metadata/md5-cache/dev-python/python-mistralclient-3.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mistralclient/python-mistralclient-3.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=33602fd712856030bec675c611963b9c
diff --git a/metadata/md5-cache/dev-python/python-mistralclient-3.8.1 b/metadata/md5-cache/dev-python/python-mistralclient-3.8.1
index d7e49fa92fb7..6c54782d3d90 100644
--- a/metadata/md5-cache/dev-python/python-mistralclient-3.8.1
+++ b/metadata/md5-cache/dev-python/python-mistralclient-3.8.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-mistralclient/python-mistralclient-3.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c635e79d7edb7eeaa5548c4478f15415
diff --git a/metadata/md5-cache/dev-python/python-monascaclient-1.14.0 b/metadata/md5-cache/dev-python/python-monascaclient-1.14.0
index 6e9504b7ce0f..9ddd183378cb 100644
--- a/metadata/md5-cache/dev-python/python-monascaclient-1.14.0
+++ b/metadata/md5-cache/dev-python/python-monascaclient-1.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-monascaclient/python-monascaclient-1.14.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=77b5cd42bc442acce12e1950e7a2c5ea
diff --git a/metadata/md5-cache/dev-python/python-monascaclient-1.15.0 b/metadata/md5-cache/dev-python/python-monascaclient-1.15.0
index 64bf3357acb1..8c6a6db76d6c 100644
--- a/metadata/md5-cache/dev-python/python-monascaclient-1.15.0
+++ b/metadata/md5-cache/dev-python/python-monascaclient-1.15.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-monascaclient/python-monascaclient-1.15.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7ea9d9f0d6592ceecab2c2ef28ffb0e0
diff --git a/metadata/md5-cache/dev-python/python-mpd-1.0.0 b/metadata/md5-cache/dev-python/python-mpd-1.0.0
index 193024c87759..7c18b037e763 100644
--- a/metadata/md5-cache/dev-python/python-mpd-1.0.0
+++ b/metadata/md5-cache/dev-python/python-mpd-1.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( twisted ) || ( python_targets_python3_6 python_targets_pyth
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Mic92/python-mpd2/archive/v1.0.0.tar.gz -> python-mpd-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2e915bb2a2c740aa35df724c130265aa
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 950ea6ab2488..3cc57fe409a5 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
@@ -11,5 +11,5 @@ RDEPEND=media-libs/libdiscid python_targets_python2_7? ( >=dev-lang/python-2.7.5
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/python-musicbrainz2-0.7.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9e0c7ee1c0154030c9ce41f9e69d000d
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 820b3cc4a072..097f343ea838 100644
--- a/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
+++ b/metadata/md5-cache/dev-python/python-musicbrainz-ngs-0.6
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python bindings for the MusicBrainz NGS and the Cover Art Archive webservices
 EAPI=7
 HOMEPAGE=https://github.com/alastair/python-musicbrainzngs
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc examples test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=BSD-2 ISC
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alastair/python-musicbrainzngs/archive/v0.6.tar.gz -> python-musicbrainzngs0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3c6c6ea243d6c0707bc046efc4b47294
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b05b7dd0fc180b8e1acb6fe639b9d32f
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 27fa9f13354c..f3ce26486f30 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.5.6
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.5.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
 EAPI=6
 HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c58b0a0f198c060fcc90cdf31a3dd32
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9251d6117ef3c0ca6cd1fd3c438355cc
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 19992f0bb669..f664376ed098 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
 EAPI=6
 HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5dd6bb9cb87cc742100a3d5b19752989
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=43ec836ce8161c5825820e8ac64cf4a8
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.10 b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.10
index 5fe42228de21..783a194d49f0 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.10
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.10
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
 EAPI=6
 HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-0.6.10/python-nbxmpp-nbxmpp-0.6.10.tar.bz2 -> python-nbxmpp-0.6.10.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe85b11b28be2aa22fdf471f982a1b1f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4c3392a5e99d9f03856d3fa469cce302
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.10-r1 b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.10-r1
index 1d7377b89b2f..337df466317a 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.10-r1
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.10-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-0.6.10/python-nbxmpp-nbxmpp-0.6.10.tar.bz2 -> python-nbxmpp-0.6.10.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=32300e72f99787d0de2fe49c2f8109fe
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 3dc141fb07e3..c5cc1d7e0139 100644
--- a/metadata/md5-cache/dev-python/python-nbxmpp-0.6.6
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-0.6.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
 EAPI=6
 HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c2b0d2e7274cfd8f09574e1c0d9be55
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ffcb02fd19fd167d1a726c3b334e02b6
diff --git a/metadata/md5-cache/dev-python/python-netlink-0.1 b/metadata/md5-cache/dev-python/python-netlink-0.1
index caf0cf1e132f..92c78c6fe8a2 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_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/N/NetLink/NetLink-0.1.tar.gz -> python-netlink-0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe58168a1249bbf6f6c1288e26940bef
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-6.12.0 b/metadata/md5-cache/dev-python/python-neutronclient-6.12.0
index fe2c69deca6e..487fd9000294 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-6.12.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d8e77e28bf5f1fb9b91fe173398d50ad
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1c55a5227ed8f3ee09157b92a31fbe94
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 f3ab34fcdd63..e3635fba0105 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-6.9.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-6.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( doc ) || ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-6.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25f38f3cd1cae2a47f29ef035cfe4bc7
diff --git a/metadata/md5-cache/dev-python/python-novaclient-13.0.2 b/metadata/md5-cache/dev-python/python-novaclient-13.0.2
index 9511484dcfff..e139f715d6ca 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-13.0.2
+++ b/metadata/md5-cache/dev-python/python-novaclient-13.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-13.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3bbe8063b46b62fa587c5f55877f1d16
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 3139e951247d..5479f1e75d6f 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0739c43e03b21986f9fca943209871d4
diff --git a/metadata/md5-cache/dev-python/python-ntpdshm-0.2.1 b/metadata/md5-cache/dev-python/python-ntpdshm-0.2.1
index 4ed34cb37297..b8619f02905d 100644
--- a/metadata/md5-cache/dev-python/python-ntpdshm-0.2.1
+++ b/metadata/md5-cache/dev-python/python-ntpdshm-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mjuenema/python-ntpdshm/archive/0.2.1.tar.gz -> python-ntpdshm-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2bd47a2d88e5b11a120679e7c9bba8a1
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 f1df3f17c98d..a57ec1e72d20 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_python3_6(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-octaviaclient/python-octaviaclient-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b51e1d64835317ed04113ef6743cd9a8
diff --git a/metadata/md5-cache/dev-python/python-octaviaclient-1.8.0 b/metadata/md5-cache/dev-python/python-octaviaclient-1.8.0
index 669a72c5d8be..30c738dc756d 100644
--- a/metadata/md5-cache/dev-python/python-octaviaclient-1.8.0
+++ b/metadata/md5-cache/dev-python/python-octaviaclient-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/appdirs-1.3.0[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-octaviaclient/python-octaviaclient-1.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4e0a81b17dacb61c0c48e14b9ac501b3
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 287f15a8d4c6..b30fe7d54004 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
@@ -4,12 +4,12 @@ DESCRIPTION=OpenID support for servers and consumers
 EAPI=5
 HOMEPAGE=http://www.openidenabled.com/openid/libraries/python/ https://pypi.org/project/python-openid/
 IUSE=examples mysql postgres sqlite test python_targets_python2_7
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=mysql? ( >=dev-python/mysql-python-1.2.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( dev-python/psycopg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/python-openid-2.2.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3d37790fe07da691b5d6d596a002170
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=278dec68c10a8cc4761a28205e573c9e
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-3.18.1 b/metadata/md5-cache/dev-python/python-openstackclient-3.18.1
index e1dc039d18fd..6decc231ddbc 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-3.18.1
+++ b/metadata/md5-cache/dev-python/python-openstackclient-3.18.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-3.18.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d803f93ec6f2de591bdc377d5cdec60
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 a48c3bb79d1f..379e9a73bc57 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-otrs/python-otrs-0.3.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ab87421724c87877b9be691f8448aea
diff --git a/metadata/md5-cache/dev-python/python-podman-0.12.1.2 b/metadata/md5-cache/dev-python/python-podman-0.12.1.2
index 29a4483d7ba3..fb118cce28e5 100644
--- a/metadata/md5-cache/dev-python/python-podman-0.12.1.2
+++ b/metadata/md5-cache/dev-python/python-podman-0.12.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/libpod/archive/v0.12.1.2.tar.gz -> libpod-0.12.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2f80d599a2b8f7b837ee8be85653506c
diff --git a/metadata/md5-cache/dev-python/python-podman-1.6.0 b/metadata/md5-cache/dev-python/python-podman-1.6.0
index da63fcaef0c8..e9c6a9a65c8e 100644
--- a/metadata/md5-cache/dev-python/python-podman-1.6.0
+++ b/metadata/md5-cache/dev-python/python-podman-1.6.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/podman/podman-1.6.0.tar.gz -> python-podman-1.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=56669cd28852ef4fb594607ae4e13f26
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 34b40f9f0488..9ec678abcc2a 100644
--- a/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
+++ b/metadata/md5-cache/dev-python/python-poppler-qt5-0.24.2_p20170214
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A python binding for libpoppler-qt5
 EAPI=6
 HOMEPAGE=https://github.com/wbsoft/python-poppler-qt5
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=app-text/poppler[qt5] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53359e184a276fd8e7ef8a0438cd50a3
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=603698025648d55c24330f902c1cf494
diff --git a/metadata/md5-cache/dev-python/python-prctl-1.7 b/metadata/md5-cache/dev-python/python-prctl-1.7
index 43003d6e49ca..fe2102ef1969 100644
--- a/metadata/md5-cache/dev-python/python-prctl-1.7
+++ b/metadata/md5-cache/dev-python/python-prctl-1.7
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/libcap python_targets_python3_6? ( dev-lang/python:3.6 ) python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/seveas/python-prctl/archive/v1.7.tar.gz -> python-prctl-1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=58c33f3442952286b3b142aa7d31bc71
diff --git a/metadata/md5-cache/dev-python/python-recaptcha-2.0.1-r1 b/metadata/md5-cache/dev-python/python-recaptcha-2.0.1-r1
index a9b6beb9090c..f2382ffbe38e 100644
--- a/metadata/md5-cache/dev-python/python-recaptcha-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/python-recaptcha-2.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bcdf3d60971a9763e33db7b44c16188
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 b6ffef7827e0..ac8c6433bd3f 100644
--- a/metadata/md5-cache/dev-python/python-redmine-2.0.2
+++ b/metadata/md5-cache/dev-python/python-redmine-2.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-redmine/python-redmine-2.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f68e72037d791f565ae9fc9c5632d9d3
diff --git a/metadata/md5-cache/dev-python/python-saharaclient-2.2.1 b/metadata/md5-cache/dev-python/python-saharaclient-2.2.1
index d6c5a1d03f45..31fc954f7ae0 100644
--- a/metadata/md5-cache/dev-python/python-saharaclient-2.2.1
+++ b/metadata/md5-cache/dev-python/python-saharaclient-2.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-saharaclient/python-saharaclient-2.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bf091d72473129a2452a7553895aa31a
diff --git a/metadata/md5-cache/dev-python/python-scsi-0_pre160211 b/metadata/md5-cache/dev-python/python-scsi-0_pre160211
index cffcc64bc195..dbf411a5ccea 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=652a73b6bd26c8b7a5f6a2bbd5670ca5
diff --git a/metadata/md5-cache/dev-python/python-scsi-9999 b/metadata/md5-cache/dev-python/python-scsi-9999
index 3a24bb69f5a9..7928fd01be08 100644
--- a/metadata/md5-cache/dev-python/python-scsi-9999
+++ b/metadata/md5-cache/dev-python/python-scsi-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=497254741673ef18b35e969bf89de7dd
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 e199053a18a9..a74a137e02a1 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-senlinclient/python-senlinclient-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c62cc0f0af8652a8c56a793a5c62cfaa
diff --git a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r1 b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r1
index 11c52594d68b..874b9290ad97 100644
--- a/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/python-sense-hat-2.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c8e27e7ab67b58390900aba7ee51eb74
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 77d0bdc753b1..a86b6ffc0ab2 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.5/python-slip-0.6.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=993ec9b5d671d6253d1a2ad2282e6d48
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 131081c6a5f6..d3380f698b4e 100644
--- a/metadata/md5-cache/dev-python/python-socketio-1.7.4
+++ b/metadata/md5-cache/dev-python/python-socketio-1.7.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-1.2.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-1.2.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of the Socket.IO realtime server.
 EAPI=6
 HOMEPAGE=https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.org/project/python-socketio/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-1.2.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-1.2.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-socketio/python-socketio-1.7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb98442f67fc00df7f6e205de7c9d40c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=00fcda42d08cd211315aae4a39f5ade6
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 d596f6fb1a3c..0ae7671d687e 100644
--- a/metadata/md5-cache/dev-python/python-socketio-1.8.0
+++ b/metadata/md5-cache/dev-python/python-socketio-1.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-1.2.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-1.2.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of the Socket.IO realtime server.
 EAPI=6
 HOMEPAGE=https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.org/project/python-socketio
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-1.2.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-1.2.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-socketio/python-socketio-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a997a7a769f071de272398dc39a7f65
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6b59d589b3d9d268ff3ab91d3231aff
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 1aac504e5bc0..2c787315492b 100644
--- a/metadata/md5-cache/dev-python/python-socketio-2.0.0
+++ b/metadata/md5-cache/dev-python/python-socketio-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-2.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-2.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of the Socket.IO realtime server.
 EAPI=6
 HOMEPAGE=https://python-socketio.readthedocs.org/ https://github.com/miguelgrinberg/python-socketio/ https://pypi.org/project/python-socketio
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-2.2.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/python-engineio-2.2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] !dev-python/gevent-socketio python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-socketio/python-socketio-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=095062795eccfe60578c01f72683ed05
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84968241b4db912921134e347e6fe7fc
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 d13203b8f372..e74de6c16186 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.2.3
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.2.3
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfa57bf52e9c3b26e1b2c7e799cfb282
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 1cbcc425ca9d..58dbe0559278 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.2.4
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1da12fbc1c4583d5a3ed92872008178f
diff --git a/metadata/md5-cache/dev-python/python-sqlparse-0.3.0 b/metadata/md5-cache/dev-python/python-sqlparse-0.3.0
index cd8511edf378..7979577c5837 100644
--- a/metadata/md5-cache/dev-python/python-sqlparse-0.3.0
+++ b/metadata/md5-cache/dev-python/python-sqlparse-0.3.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] ) test? ( dev-python/pytest[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=A non-validating SQL parser module for Python
 EAPI=7
 HOMEPAGE=https://github.com/andialbrecht/sqlparse
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlparse/sqlparse-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=96cf20d0982cfd10baac4f2d56a768f3
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d58785755fbab5182dab0c5bc5bf2ab3
diff --git a/metadata/md5-cache/dev-python/python-stdnum-1.12 b/metadata/md5-cache/dev-python/python-stdnum-1.12
index 5c80e4200f08..4efd857323ae 100644
--- a/metadata/md5-cache/dev-python/python-stdnum-1.12
+++ b/metadata/md5-cache/dev-python/python-stdnum-1.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-stdnum/python-stdnum-1.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a5528ba84ec60a328eb7503c94549ae0
diff --git a/metadata/md5-cache/dev-python/python-swiftclient-3.7.0 b/metadata/md5-cache/dev-python/python-swiftclient-3.7.0
index a1526cbe590e..6d751d43583b 100644
--- a/metadata/md5-cache/dev-python/python-swiftclient-3.7.0
+++ b/metadata/md5-cache/dev-python/python-swiftclient-3.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-swiftclient/python-swiftclient-3.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=33419a872b138be827b58e4445212f00
diff --git a/metadata/md5-cache/dev-python/python-systemd-233 b/metadata/md5-cache/dev-python/python-systemd-233
index 14b605c92d72..50ed4d80dc2c 100644
--- a/metadata/md5-cache/dev-python/python-systemd-233
+++ b/metadata/md5-cache/dev-python/python-systemd-233
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/systemd:0= test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=sys-apps/systemd:0= test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python module for native access to the systemd facilities
 EAPI=6
 HOMEPAGE=https://github.com/systemd/python-systemd
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~alpha amd64 arm ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/systemd:0= !sys-apps/systemd[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(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=sys-apps/systemd:0= !sys-apps/systemd[python(-)] 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/python-systemd/archive/v233.tar.gz -> python-systemd-233.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b13ebe2e2eb19b368f01bebea4760bb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc6b8e7b057772241329581b3ee64b3c
diff --git a/metadata/md5-cache/dev-python/python-systemd-234 b/metadata/md5-cache/dev-python/python-systemd-234
index f08dfdbcb5d7..c6bad20f97f9 100644
--- a/metadata/md5-cache/dev-python/python-systemd-234
+++ b/metadata/md5-cache/dev-python/python-systemd-234
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/systemd:0= test? ( dev-python/pytest[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(-)] )
+DEPEND=sys-apps/systemd:0=
 DESCRIPTION=Python module for native access to the systemd facilities
 EAPI=7
 HOMEPAGE=https://github.com/systemd/python-systemd
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/systemd:0= !sys-apps/systemd[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=sys-apps/systemd:0= !sys-apps/systemd[python(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/python-systemd/archive/v234.tar.gz -> python-systemd-234.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f3c569bfc349b7a6e9a8e39cd7ff1816
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f64caf02bbb3317998f47b25fa7343ad
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 f26257d74c01..86d8798fa754 100644
--- a/metadata/md5-cache/dev-python/python-termstyle-0.1.10
+++ b/metadata/md5-cache/dev-python/python-termstyle-0.1.10
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=console colouring for python
 EAPI=7
 HOMEPAGE=http://gfxmonk.net/dist/0install/python-termstyle.xml
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 ppc64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/gfxmonk/termstyle/archive/0.1.10.tar.gz -> python-termstyle-0.1.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e71c8566d0d1071649cd68e34f50b09f
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0c8dbadf0c258a8eaac8d6511a7ea5e7
diff --git a/metadata/md5-cache/dev-python/python-troveclient-2.17.0 b/metadata/md5-cache/dev-python/python-troveclient-2.17.0
index 313955175994..d174b1c50645 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-2.17.0
+++ b/metadata/md5-cache/dev-python/python-troveclient-2.17.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-2.17.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1455fdd4a51e96d4b76f8dab4642e218
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 514a5367444c..215423e1a635 100644
--- a/metadata/md5-cache/dev-python/python-troveclient-2.5.0
+++ b/metadata/md5-cache/dev-python/python-troveclient-2.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-troveclient/python-troveclient-2.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=28399210bef2f6cfb5758760bd6af7de
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 9db3ca00de98..57dcc20af0e3 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_python2_7(-)?,-python_s
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfa64eefb8392ff1e5e579fc403c2a4a
diff --git a/metadata/md5-cache/dev-python/python-twitter-3.3 b/metadata/md5-cache/dev-python/python-twitter-3.3
index 317dbd6f3456..ee995f4c378f 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/python-twitter/python-twitter-3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f1493edbde7a4a4927ebf907a612672
diff --git a/metadata/md5-cache/dev-python/python-twitter-3.4.2 b/metadata/md5-cache/dev-python/python-twitter-3.4.2
index 1e4d0f25825d..26423c61e438 100644
--- a/metadata/md5-cache/dev-python/python-twitter-3.4.2
+++ b/metadata/md5-cache/dev-python/python-twitter-3.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bear/python-twitter/archive/v3.4.2.tar.gz -> python-twitter-3.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d96c25e482fdc483dfeab29b81e2cb29
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 45b2691e2316..db85ccb32ca1 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lan
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-uinput/python-uinput-0.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57cac5db82d33862ebe58935f3ee17ea
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 e9cb90f15dcc..4995c9e5d0fe 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
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( curl ) || ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.openidenabled.com/resources/downloads/python-openid/python-urljr-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0598e423445cf22ae488c9d8e852c1eb
diff --git a/metadata/md5-cache/dev-python/python-utils-2.3.0 b/metadata/md5-cache/dev-python/python-utils-2.3.0
index 957c7a889f4b..dfc0890f04d7 100644
--- a/metadata/md5-cache/dev-python/python-utils-2.3.0
+++ b/metadata/md5-cache/dev-python/python-utils-2.3.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-flakes[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-flakes[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of small Python functions & classes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/python-utils/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-utils/python-utils-2.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b43de0c53c6502251e7de51d16c7ae4d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3902d9dd481d7dc2b35b401b22f41f20
diff --git a/metadata/md5-cache/dev-python/python-varlink-29.0.2 b/metadata/md5-cache/dev-python/python-varlink-29.0.2
index 84caea6f640c..3adc78f40caf 100644
--- a/metadata/md5-cache/dev-python/python-varlink-29.0.2
+++ b/metadata/md5-cache/dev-python/python-varlink-29.0.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python implementation of the Varlink protocol
 EAPI=7
 HOMEPAGE=https://github.com/varlink/python
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/varlink/python/archive/29.0.2.tar.gz -> python-varlink-29.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4639566d0b53718aa5ed7b7555a6bb55
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=36de02ddda2ae27098e95a8fbc3831f5
diff --git a/metadata/md5-cache/dev-python/python-varlink-30.3.0 b/metadata/md5-cache/dev-python/python-varlink-30.3.0
index da450de42db8..b34c13e9e049 100644
--- a/metadata/md5-cache/dev-python/python-varlink-30.3.0
+++ b/metadata/md5-cache/dev-python/python-varlink-30.3.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python implementation of the Varlink protocol
 EAPI=7
 HOMEPAGE=https://github.com/varlink/python
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/varlink/python/archive/30.3.0.tar.gz -> python-varlink-30.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=10d249e1b8e053e83155d10793bf7a85
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=204dd55ad9083bc8b3cd81ec37829681
diff --git a/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1 b/metadata/md5-cache/dev-python/python-wpactrl-20081102-r1
index 3770e53421c8..3b9e402f426a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fa6e5fbf65897854c37e48a19d79efa
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 c58201844803..211aac80f6e4 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_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-xlib/python-xlib-0.15rc1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa3941026c3b3a27782573dd9a8ad6ee
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.19 b/metadata/md5-cache/dev-python/python-xlib-0.19
index c626610f04b4..74342a080376 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_python2_7(-)?,python_targets_python3_6(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a754381cd5ea307a9e7918ebdea67f0
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.23 b/metadata/md5-cache/dev-python/python-xlib-0.23
index ad46e689d491..c077684b015b 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.23
+++ b/metadata/md5-cache/dev-python/python-xlib-0.23
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.23/python-xlib-0.23.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd7ba5a68c77cdf97b8fb7beac135d02
diff --git a/metadata/md5-cache/dev-python/python-xlib-0.23-r1 b/metadata/md5-cache/dev-python/python-xlib-0.23-r1
index bfc863e47576..4d2c3062e5ff 100644
--- a/metadata/md5-cache/dev-python/python-xlib-0.23-r1
+++ b/metadata/md5-cache/dev-python/python-xlib-0.23-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xlib/python-xlib/releases/download/0.23/python-xlib-0.23.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88bab6207692b4fd833d5959bce89fed
diff --git a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1 b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
index 645a24e15993..691159d7fe20 100644
--- a/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
+++ b/metadata/md5-cache/dev-python/python-xmp-toolkit-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-xmp-toolkit/python-xmp-toolkit/archive/v2.0.1.tar.gz -> python-xmp-toolkit-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dde7b050b146cf9999f84fae47966295
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 82236dfd5e8a..5f18ea7671e4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=446abdf6ef45eedbf51c646b4762fc0d
diff --git a/metadata/md5-cache/dev-python/python-zaqarclient-1.11.0 b/metadata/md5-cache/dev-python/python-zaqarclient-1.11.0
index 6f6c7d233813..3f364aac660b 100644
--- a/metadata/md5-cache/dev-python/python-zaqarclient-1.11.0
+++ b/metadata/md5-cache/dev-python/python-zaqarclient-1.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-zaqarclient/python-zaqarclient-1.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=990d98e6ed4d42bcc1b4d76fd986b82f
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 e0d8685d5d47..adb858259bcc 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-zaqarclient/python-zaqarclient-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a4f165b65206237031182a34078e09e2
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 9a4c41d730ff..c4143c248280 100644
--- a/metadata/md5-cache/dev-python/python-zipstream-1.1.4
+++ b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A zip archive generator
 EAPI=6
 HOMEPAGE=https://github.com/allanlei/python-zipstream
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/allanlei/python-zipstream/archive/v1.1.4.tar.gz -> python-zipstream-1.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5260c4101df393d0d6bc12a353f4b411
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=61e96ede13ead2ef22432a599f49a98b
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 74ee560805a6..fe28b6737e61 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_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-zunclient/python-zunclient-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2a387023b4f578ea45b42a8aa42e777
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 04e177be7b38..9c9afbf7cc57 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_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-zunclient/python-zunclient-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df32ea7a6953e95b4ec15e5698b44693
diff --git a/metadata/md5-cache/dev-python/python-zunclient-3.3.0 b/metadata/md5-cache/dev-python/python-zunclient-3.3.0
index c7d2a237ed03..96c6e6979e2c 100644
--- a/metadata/md5-cache/dev-python/python-zunclient-3.3.0
+++ b/metadata/md5-cache/dev-python/python-zunclient-3.3.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/prettytable-0.7.1[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-zunclient/python-zunclient-3.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9dbd4e7b0dfa9fb14653a581d827ffd0
diff --git a/metadata/md5-cache/dev-python/python3-lxc-3.0.2 b/metadata/md5-cache/dev-python/python3-lxc-3.0.2
index 71d9f301427d..88b1a57a9715 100644
--- a/metadata/md5-cache/dev-python/python3-lxc-3.0.2
+++ b/metadata/md5-cache/dev-python/python3-lxc-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=app-emulation/lxc-3.0 python_targets_python3_6? ( dev-lang/python:3.6
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=745f9a1b122ce80257db2c00239497ec
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 db9b26580729..763addb5ac9d 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
@@ -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_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(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Python bindings for KDL
 EAPI=5
 HOMEPAGE=http://www.orocos.org/kdl
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
-RDEPEND=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(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5919fb508ce7212dd399125a09e051c8
+_md5_=1ab1b32038262ae1a8c2898850525ab0
diff --git a/metadata/md5-cache/dev-python/python_orocos_kdl-9999 b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
index 082b3c938e28..65c233cf444b 100644
--- a/metadata/md5-cache/dev-python/python_orocos_kdl-9999
+++ b/metadata/md5-cache/dev-python/python_orocos_kdl-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Python bindings for KDL
 EAPI=5
 HOMEPAGE=http://www.orocos.org/kdl
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=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(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=sci-libs/orocos_kdl-1.4.0:= dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5919fb508ce7212dd399125a09e051c8
+_md5_=1ab1b32038262ae1a8c2898850525ab0
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.3.0 b/metadata/md5-cache/dev-python/pythondialog-3.3.0
index 9b2a395c12df..efdbbb0bf057 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? ( >=dev-python/pypy3-5:0= ) python
 REQUIRED_USE=|| ( python_targets_pypy3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ed5b8f88efb131040d688a9c31e4646
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 63a29dab23ab..feb47d482feb 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f39a49288bab3f24126e2ca48551b25
diff --git a/metadata/md5-cache/dev-python/pythondialog-3.4.0 b/metadata/md5-cache/dev-python/pythondialog-3.4.0
index e881592d5942..bc62534feda8 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? ( >=dev-python/pypy3-5:0= ) python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythondialog//3.4.0/python3-pythondialog-3.4.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c00ad892d05f5727e01a5e486d38c39
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 0a657a959b46..f1297936a956 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=python-2
 SRC_URI=mirror://pypi/p/python2-pythondialog/python2-pythondialog-3.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c88789b83ec404a2a2c04af75586c0a5
diff --git a/metadata/md5-cache/dev-python/pythong-2.1.5-r2 b/metadata/md5-cache/dev-python/pythong-2.1.5-r2
deleted file mode 100644
index ed5ac4b3fa6a..000000000000
--- a/metadata/md5-cache/dev-python/pythong-2.1.5-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/tk-8.3.4:0= dev-python/pmw:py2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Nice and powerful spanish development environment for Python
-EAPI=5
-HOMEPAGE=http://www3.uji.es/~dllorens/PythonG/principal.html
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~ia64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/tk-8.3.4:0= dev-python/pmw:py2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www3.uji.es/~dllorens/downloads/pythong/linux/pythonG-2_1_5.tgz doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=550cedf798b7cce8c951985b52246392
diff --git a/metadata/md5-cache/dev-python/pythong-2.1.5-r3 b/metadata/md5-cache/dev-python/pythong-2.1.5-r3
new file mode 100644
index 000000000000..f5096b7d5590
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pythong-2.1.5-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/tk-8.3.4:0= python_single_target_python2_7? ( dev-python/pmw:py2[python_targets_python2_7(-)] )
+DESCRIPTION=Nice and powerful spanish development environment for Python
+EAPI=5
+HOMEPAGE=http://www3.uji.es/~dllorens/PythonG/principal.html
+IUSE=doc +python_single_target_python2_7
+KEYWORDS=~amd64 ~ia64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/tk-8.3.4:0= python_single_target_python2_7? ( dev-python/pmw:py2[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://www3.uji.es/~dllorens/downloads/pythong/linux/pythonG-2_1_5.tgz doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=46f72b841dd1199ec7c4a94a7bbf2407
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 03566a18bef0..b2340cdae1a7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 9ba0eb180d6a..d30de3e2ef8b 100644
--- a/metadata/md5-cache/dev-python/pythonz-bd-1.11.4
+++ b/metadata/md5-cache/dev-python/pythonz-bd-1.11.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-python/resumable-urlretrieve[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/resumable-urlretrieve[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-python/resumable-urlretrieve[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/resumable-urlretrieve[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Manage python installations in your system, berdario's shallow fork
 EAPI=6
 HOMEPAGE=https://github.com/berdario/pythonz/tree/bd https://pypi.org/project/pythonz-bd/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pythonz-bd/pythonz-bd-1.11.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5cb503d64a32187a493b324f64f3095e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f8f15367658887cb05ec8db5abdfea1f
diff --git a/metadata/md5-cache/dev-python/pytidylib-0.3.2 b/metadata/md5-cache/dev-python/pytidylib-0.3.2
index d35637145c50..f52c430298ce 100644
--- a/metadata/md5-cache/dev-python/pytidylib-0.3.2
+++ b/metadata/md5-cache/dev-python/pytidylib-0.3.2
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-text/htmltidy ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( app-text/htmltidy dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=app-text/htmltidy
 DESCRIPTION=Python wrapper for HTML Tidy (tidylib)
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytidylib/pytidylib-0.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea47d9c2e1b54dda362086bb3283c6d5
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.14 b/metadata/md5-cache/dev-python/pytoml-0.1.14
index af723cc35e13..aed312bf11db 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.14
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=365d25e7d919c5a590ebf25e7d4ff476
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.18 b/metadata/md5-cache/dev-python/pytoml-0.1.18
index 29408200df55..2006b46a1314 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.18
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=365d25e7d919c5a590ebf25e7d4ff476
diff --git a/metadata/md5-cache/dev-python/pytoml-0.1.20 b/metadata/md5-cache/dev-python/pytoml-0.1.20
index 5d2b0319d1a0..3910644a062e 100644
--- a/metadata/md5-cache/dev-python/pytoml-0.1.20
+++ b/metadata/md5-cache/dev-python/pytoml-0.1.20
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/avakar/pytoml/archive/v0.1.20.tar.gz -> pytoml-0.1.20.tar.gz test? ( https://github.com/avakar/toml-test/archive/b212790a6b7367489f389411bda009e5ff765f20.tar.gz -> toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4ac40a354ae7eba93d9065e9f431d0ec
diff --git a/metadata/md5-cache/dev-python/pytools-2017.4-r1 b/metadata/md5-cache/dev-python/pytools-2017.4-r1
index 048e933af8b5..fbaa5daf7ad7 100644
--- a/metadata/md5-cache/dev-python/pytools-2017.4-r1
+++ b/metadata/md5-cache/dev-python/pytools-2017.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytools/pytools-2017.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c7148ea1a0674f7a0f52dd63b5505f69
diff --git a/metadata/md5-cache/dev-python/pytools-9999 b/metadata/md5-cache/dev-python/pytools-9999
index 83c28d4cd6e8..1e5ffe7433bc 100644
--- a/metadata/md5-cache/dev-python/pytools-9999
+++ b/metadata/md5-cache/dev-python/pytools-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/appdirs-1.4.0[python_targets_python3_6(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acfa8c1a06c698275ab194f3aa3f2dca
diff --git a/metadata/md5-cache/dev-python/pytrie-0.3 b/metadata/md5-cache/dev-python/pytrie-0.3
index 10d2966ddc32..316d9c98a2df 100644
--- a/metadata/md5-cache/dev-python/pytrie-0.3
+++ b/metadata/md5-cache/dev-python/pytrie-0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/sortedcontainers[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A pure Python implementation of the trie data structure.
 EAPI=6
 HOMEPAGE=https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 arm x86
 LICENSE=BSD
-RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/sortedcontainers[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
 SRC_URI=mirror://pypi/P/PyTrie/PyTrie-0.3.tar.gz -> pytrie-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a9dc53b3a4ff8f708633707a95308319
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13192e05f0430d9c391ec555af085579
diff --git a/metadata/md5-cache/dev-python/pytrie-0.3.1 b/metadata/md5-cache/dev-python/pytrie-0.3.1
index 352a397786c0..fcad94ba6296 100644
--- a/metadata/md5-cache/dev-python/pytrie-0.3.1
+++ b/metadata/md5-cache/dev-python/pytrie-0.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/sortedcontainers[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A pure Python implementation of the trie data structure
 EAPI=6
 HOMEPAGE=https://github.com/gsakkis/pytrie/ https://pypi.org/project/PyTrie/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/sortedcontainers[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
 SRC_URI=mirror://pypi/P/PyTrie/PyTrie-0.3.1.tar.gz -> pytrie-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48640c1d52298bb7f2cd92091859a49f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ddb2f7473010024cd4ee5244376ee0d3
diff --git a/metadata/md5-cache/dev-python/pytz-2016.3 b/metadata/md5-cache/dev-python/pytz-2016.3
index 0a0b4ce1b25f..2361b1c30396 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2016.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52aac1f75a70e343d5507fdf7ddbb46b
diff --git a/metadata/md5-cache/dev-python/pytz-2017.2 b/metadata/md5-cache/dev-python/pytz-2017.2
index f81c7363a0ca..912ee64b4b8b 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2017.2.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6ea88c04f0b0230c2e0d685ce6c2283
diff --git a/metadata/md5-cache/dev-python/pytz-2018.4 b/metadata/md5-cache/dev-python/pytz-2018.4
index 3443fae9f203..cc880628476c 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2018.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2eba5786907473e629649646fb1931f
diff --git a/metadata/md5-cache/dev-python/pytz-2018.9 b/metadata/md5-cache/dev-python/pytz-2018.9
index 520c56c20490..695c4b823cf0 100644
--- a/metadata/md5-cache/dev-python/pytz-2018.9
+++ b/metadata/md5-cache/dev-python/pytz-2018.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2018.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2eba5786907473e629649646fb1931f
diff --git a/metadata/md5-cache/dev-python/pytz-2019.3 b/metadata/md5-cache/dev-python/pytz-2019.3
index 677e4e48ea80..34a425cb9631 100644
--- a/metadata/md5-cache/dev-python/pytz-2019.3
+++ b/metadata/md5-cache/dev-python/pytz-2019.3
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytz/pytz-2019.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af1101e2ad9057a388b23c4d58d26ed6
diff --git a/metadata/md5-cache/dev-python/pyu2f-0.1.4 b/metadata/md5-cache/dev-python/pyu2f-0.1.4
index 8b1388b42b28..4e7c23e845b3 100644
--- a/metadata/md5-cache/dev-python/pyu2f-0.1.4
+++ b/metadata/md5-cache/dev-python/pyu2f-0.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] test? ( dev-python/pyfakefs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pyfakefs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python based U2F host library
 EAPI=6
 HOMEPAGE=https://github.com/google/pyu2f
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/pyu2f/archive/0.1.4.tar.gz -> pyu2f-0.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fe92d3b2f1dd8e6d453477c16e63ab8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce1b038a2543565061b9507fd69e91d0
diff --git a/metadata/md5-cache/dev-python/pyudev-0.21.0 b/metadata/md5-cache/dev-python/pyudev-0.21.0
index 1b8dc04a6534..298df8632508 100644
--- a/metadata/md5-cache/dev-python/pyudev-0.21.0
+++ b/metadata/md5-cache/dev-python/pyudev-0.21.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[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(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[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(-)] test? ( dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/hypothesis[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/udev qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/hypothesis[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python binding to libudev
 EAPI=6
 HOMEPAGE=https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev
-IUSE=pygobject qt5 test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=qt5 test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~arm64 ~mips x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/six[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(-)] virtual/udev pygobject? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt5? ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=pygobject? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/udev qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyudev/pyudev-0.21.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4fff591eacbb064ffbf9ab21c36d6f9f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd563abbba96dea585160341c3397ef4
diff --git a/metadata/md5-cache/dev-python/pyudev-0.22.0 b/metadata/md5-cache/dev-python/pyudev-0.22.0
new file mode 100644
index 000000000000..8ae71759eb65
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyudev-0.22.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/udev qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/udev qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/hypothesis[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Python binding to libudev
+EAPI=7
+HOMEPAGE=https://pyudev.readthedocs.io/en/latest/ https://github.com/pyudev/pyudev
+IUSE=qt5 test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/udev qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyudev/pyudev-0.22.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=69a4f06931eacb4d8074abf941e746b9
diff --git a/metadata/md5-cache/dev-python/pyusb-1.0.2 b/metadata/md5-cache/dev-python/pyusb-1.0.2
index 246c32aa04fc..643f133010c0 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/walac/pyusb/archive/v1.0.2.tar.gz -> pyusb-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32c53d13fac7dc28be719d037409dd2c
diff --git a/metadata/md5-cache/dev-python/pyutil-2.0.0-r1 b/metadata/md5-cache/dev-python/pyutil-2.0.0-r1
index d5202c5d2d80..52ab52b8ef6f 100644
--- a/metadata/md5-cache/dev-python/pyutil-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyutil-2.0.0-r1
@@ -11,5 +11,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_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b90a89a6534fed47aea54ea85ce262d0
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e242193238b52389673a1ed358df5455
diff --git a/metadata/md5-cache/dev-python/pyvorbis-1.4-r4 b/metadata/md5-cache/dev-python/pyvorbis-1.4-r4
index f5272c601f2d..13ba6e750216 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96aabf4049d02d0058b353a2ef4f5ded
diff --git a/metadata/md5-cache/dev-python/pywavelets-0.5.2 b/metadata/md5-cache/dev-python/pywavelets-0.5.2
index 953e8a9d60e9..63883fdeefe1 100644
--- a/metadata/md5-cache/dev-python/pywavelets-0.5.2
+++ b/metadata/md5-cache/dev-python/pywavelets-0.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-0.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=631b56ab119ec5037516f51902c1a4d9
diff --git a/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1 b/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
index 41b3f83d48a7..a68907cc5238 100644
--- a/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
+++ b/metadata/md5-cache/dev-python/pywavelets-0.5.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyWavelets/PyWavelets-0.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cd590a394ca38594f90f8aae881b6e21
diff --git a/metadata/md5-cache/dev-python/pywinrm-0.3.0 b/metadata/md5-cache/dev-python/pywinrm-0.3.0
index df090935010f..2b333e73d933 100644
--- a/metadata/md5-cache/dev-python/pywinrm-0.3.0
+++ b/metadata/md5-cache/dev-python/pywinrm-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/xmltodict[python_targets_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pywinrm/pywinrm-0.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a086eb27754d905e2f6407e0bc699b64
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 a83da0b08bda..a50cd1ffc328 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_python2_7? ( >
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyx/PyX-0.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52aedafabd436421e5e7fc657c81de04
diff --git a/metadata/md5-cache/dev-python/pyx-0.14.1 b/metadata/md5-cache/dev-python/pyx-0.14.1
index b762223887a1..3a621dad8c52 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_6? ( d
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyX/PyX-0.14.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=948b112763bb10f26e2c559646809819
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 6e213fb3b1db..0f72425afe50 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_6? ( d
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/P/PyX/PyX-0.14.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4274b74318dea1b1bc1f1188c3903dc
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 c95e2b9a2bc4..1f15fa2133d7 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=21c7722b5a75ee01c92dfb9ad2a564c1
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.6.1 b/metadata/md5-cache/dev-python/pyxattr-0.6.1
index ea9a8d81d51e..dd17d032a29a 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.6.1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.6.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.6.1.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8d879ca3cb96e40645265339d95800da
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.6.1-r1 b/metadata/md5-cache/dev-python/pyxattr-0.6.1-r1
index 7e9c84e226db..1f8142ab09d9 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.6.1-r1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.6.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.6.1.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=177c3de091c20f92d25122083c70775f
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.7.1 b/metadata/md5-cache/dev-python/pyxattr-0.7.1
index 770ae8cfcabe..1ad42f9a3fcf 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.7.1
+++ b/metadata/md5-cache/dev-python/pyxattr-0.7.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/attr:= ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/recommonmark[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( sys-apps/attr:= dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/recommonmark[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/recommonmark[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-apps/attr:=
 DESCRIPTION=Python interface to xattr
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.7.1.tar.gz https://pyxattr.k1024.org/downloads/pyxattr-0.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=42973f0304e51a59e05d269edb5cc037
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.26-r1 b/metadata/md5-cache/dev-python/pyxdg-0.26-r1
index 0c82ba1c1cba..55de72ecc5eb 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.26-r1
+++ b/metadata/md5-cache/dev-python/pyxdg-0.26-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/takluyver/pyxdg/archive/rel-0.26.tar.gz -> pyxdg-rel-0.26.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=52d133dd5ec154bd3f751856b8f97097
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.12 b/metadata/md5-cache/dev-python/pyyaml-3.12
index 62b7a19600c5..63103ce09a55 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_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-3.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8533ad5fb2f7371143d0555af3eb16fb
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.13 b/metadata/md5-cache/dev-python/pyyaml-3.13
index 4dc0f679e8d0..4a90207e5c1d 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_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-3.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86326d5e7bc1dc6d2e16730f634b109a
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.1 b/metadata/md5-cache/dev-python/pyyaml-5.1
index 53b7458e5548..33edf8ce2bd9 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.1
+++ b/metadata/md5-cache/dev-python/pyyaml-5.1
@@ -11,5 +11,5 @@ RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=63a3a34b9c4d7d7ff99e27dc87a2a4ff
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.1.2 b/metadata/md5-cache/dev-python/pyyaml-5.1.2
index f36119b6e451..f6b507625ce7 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.1.2
+++ b/metadata/md5-cache/dev-python/pyyaml-5.1.2
@@ -11,5 +11,5 @@ RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-5.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ab194da6b21d609fa3d55272f5dbcfc7
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.3 b/metadata/md5-cache/dev-python/pyyaml-5.3
index 76433d27f901..dca11ebcf1d9 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.3
+++ b/metadata/md5-cache/dev-python/pyyaml-5.3
@@ -11,5 +11,5 @@ RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ab194da6b21d609fa3d55272f5dbcfc7
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.5 b/metadata/md5-cache/dev-python/pyzbar-0.1.5
index b5812ab48886..3267c713c74a 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.5
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/NaturalHistoryMuseum/pyzbar/archive/v0.1.5.tar.gz -> pyzbar-0.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64004afb876249619c8715ab7fd31bfe
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.7 b/metadata/md5-cache/dev-python/pyzbar-0.1.7
index 587ef35f751a..2584de8ceb10 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.7
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/NaturalHistoryMuseum/pyzbar/archive/v0.1.7.tar.gz -> pyzbar-0.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64004afb876249619c8715ab7fd31bfe
diff --git a/metadata/md5-cache/dev-python/pyzbar-0.1.8 b/metadata/md5-cache/dev-python/pyzbar-0.1.8
index de1457ac63e6..b63658514349 100644
--- a/metadata/md5-cache/dev-python/pyzbar-0.1.8
+++ b/metadata/md5-cache/dev-python/pyzbar-0.1.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/NaturalHistoryMuseum/pyzbar/archive/v0.1.8.tar.gz -> pyzbar-0.1.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=57e72b7db097c4e666cb8e63fc977ad5
diff --git a/metadata/md5-cache/dev-python/pyzmq-16.0.2 b/metadata/md5-cache/dev-python/pyzmq-16.0.2
index 30690e339bab..5ee5f94ef3fc 100644
--- a/metadata/md5-cache/dev-python/pyzmq-16.0.2
+++ b/metadata/md5-cache/dev-python/pyzmq-16.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-16.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3851f7ac3d064b398bd2ed86586cfac9
diff --git a/metadata/md5-cache/dev-python/pyzmq-17.1.0 b/metadata/md5-cache/dev-python/pyzmq-17.1.0
index 0dcd267428f0..95083d098301 100644
--- a/metadata/md5-cache/dev-python/pyzmq-17.1.0
+++ b/metadata/md5-cache/dev-python/pyzmq-17.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyzmq/pyzmq-17.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ce4958e6899f605db39ece7a4e03b50f
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 a06f71ad369c..71d3b7ac0bb8 100644
--- a/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/pyzor-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=pyzord? ( || ( gdbm redis ) ) test? ( gdbm redis ) || ( python_targ
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/SpamExperts/pyzor/archive/release-1-0-0.tar.gz -> pyzor-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8dd1a94e36a9bb7f79ddb685514976b7
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-2.7 b/metadata/md5-cache/dev-python/qdarkstyle-2.7
index f8bfdf1c62a8..774c464d47a8 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-2.7
+++ b/metadata/md5-cache/dev-python/qdarkstyle-2.7
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/m2r[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) examples? ( >=dev-python/QtPy-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( >=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/m2r[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) examples? ( >=dev-python/QtPy-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=test? ( dev-python/QtPy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=A dark style sheet for QtWidgets application
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/2.7.tar.gz -> qdarkstyle-2.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a909b0f143f4059bf4593a3584c6c094
diff --git a/metadata/md5-cache/dev-python/qpid-python-0.20 b/metadata/md5-cache/dev-python/qpid-python-0.20
index 79a1ff8b42f3..c39e03f61b74 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 69fdebae91c9..35da16aec213 100644
--- a/metadata/md5-cache/dev-python/qrcode-5.1-r1
+++ b/metadata/md5-cache/dev-python/qrcode-5.1-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] 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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=QR Code generator on top of PIL
 EAPI=5
 HOMEPAGE=https://pypi.org/project/qrcode/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qrcode/qrcode-5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cfa64f8df1c06393200cc5308771f392
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b919aec959f08001a8e5cefa2e920be4
diff --git a/metadata/md5-cache/dev-python/qrcode-6.1 b/metadata/md5-cache/dev-python/qrcode-6.1
index b75b2b5b0ab2..c5778a9d621d 100644
--- a/metadata/md5-cache/dev-python/qrcode-6.1
+++ b/metadata/md5-cache/dev-python/qrcode-6.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=QR Code generator on top of PIL
 EAPI=7
 HOMEPAGE=https://pypi.org/project/qrcode/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qrcode/qrcode-6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=31e0e5104d0c3e76ee27f6d60547a351
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=306bb3300902d4958beb0c528a531405
diff --git a/metadata/md5-cache/dev-python/qtawesome-0.4.4 b/metadata/md5-cache/dev-python/qtawesome-0.4.4
index 0a4dc5b25221..3196add14c91 100644
--- a/metadata/md5-cache/dev-python/qtawesome-0.4.4
+++ b/metadata/md5-cache/dev-python/qtawesome-0.4.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Enables iconic fonts such as Font Awesome in PyQt
 EAPI=6
 HOMEPAGE=https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=media-fonts/fontawesome python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=media-fonts/fontawesome 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
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-0.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76bc508473834874d2baf3c60012c244
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4fc51a7193a4ba3748a4b15bfb76e9c
diff --git a/metadata/md5-cache/dev-python/qtawesome-0.5.2 b/metadata/md5-cache/dev-python/qtawesome-0.5.2
index d49cb2a9b8d8..02acbbbe9641 100644
--- a/metadata/md5-cache/dev-python/qtawesome-0.5.2
+++ b/metadata/md5-cache/dev-python/qtawesome-0.5.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Enables iconic fonts such as Font Awesome in PyQt
 EAPI=6
 HOMEPAGE=https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=media-fonts/fontawesome python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=media-fonts/fontawesome 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-0.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c292609b756165e31d9465b527a71ae8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=efed9e79bb4a08044bb8fca87241040e
diff --git a/metadata/md5-cache/dev-python/qtawesome-0.6.1 b/metadata/md5-cache/dev-python/qtawesome-0.6.1
index 3761e9fb808b..f0658181f241 100644
--- a/metadata/md5-cache/dev-python/qtawesome-0.6.1
+++ b/metadata/md5-cache/dev-python/qtawesome-0.6.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-fonts/fontawesome dev-python/QtPy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=test? ( media-fonts/fontawesome dev-python/QtPy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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=test? ( dev-python/pytest-qt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Enables iconic fonts such as Font Awesome in PyQt
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/Q/QtAwesome/QtAwesome-0.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=7b1afa71e653dd92f16e7f283c7b1f88
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.3.1 b/metadata/md5-cache/dev-python/qtconsole-4.3.1
index dd0e77bf6173..9e2109507690 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.3.1
+++ b/metadata/md5-cache/dev-python/qtconsole-4.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6068a49fc77394e1e310a1e8a35bc95c
diff --git a/metadata/md5-cache/dev-python/qtconsole-4.6.0 b/metadata/md5-cache/dev-python/qtconsole-4.6.0
index 0e5148c1cfde..752d93bdc40f 100644
--- a/metadata/md5-cache/dev-python/qtconsole-4.6.0
+++ b/metadata/md5-cache/dev-python/qtconsole-4.6.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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/ipykernel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ipython_genutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jupyter_core[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traitlets[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( >=dev-python/sphinx-1.3.1-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),svg] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyzmq-13[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Qt-based console for Jupyter with support for rich media output
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtconsole/qtconsole-4.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=1400de2dbed4f4b2629094b36f45ad0d
diff --git a/metadata/md5-cache/dev-python/qtsass-0.1.1 b/metadata/md5-cache/dev-python/qtsass-0.1.1
index 83802674b880..64b8baaaea0f 100644
--- a/metadata/md5-cache/dev-python/qtsass-0.1.1
+++ b/metadata/md5-cache/dev-python/qtsass-0.1.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/q/qtsass/qtsass-0.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f8126aa9f4870cbf451971191b5fa29e
diff --git a/metadata/md5-cache/dev-python/quex-0.65.4 b/metadata/md5-cache/dev-python/quex-0.65.4
index 643c3934eb63..5a326489be24 100644
--- a/metadata/md5-cache/dev-python/quex-0.65.4
+++ b/metadata/md5-cache/dev-python/quex-0.65.4
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Mode Oriented Directly Coded Lexical Analyser Generator
 EAPI=6
 HOMEPAGE=http://quex.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/quex/quex-0.65.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d49d3bc0c36225ff4a240987c1304d97
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 69d71b555a5d..39a638f95359 100644
--- a/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.3
+++ b/metadata/md5-cache/dev-python/rackspace-auth-openstack-1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Rackspace Auth Plugin for OpenStack Clients
 EAPI=6
 HOMEPAGE=https://github.com/emonty/rackspace-auth-openstack
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/r/rackspace-auth-openstack/rackspace-auth-openstack-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54d216d457eb8a960a013a138c23e2d3
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2943d17cb60f050d40aee3b5778242d5
diff --git a/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999 b/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
index 990299df5a01..d38ddbe91b5d 100644
--- a/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
+++ b/metadata/md5-cache/dev-python/rackspace-auth-openstack-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Rackspace Auth Plugin for OpenStack Clients
 EAPI=6
 HOMEPAGE=https://github.com/emonty/rackspace-auth-openstack
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03641b3e247cc929dab9ae8e9b69f132
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1dfff0cd74cbabc4fc647fa3b49adf90
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 9bd02c92edf7..152af532a4b0 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rackspace-monitoring/rackspace-monitoring-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=93f60d8947bfbffce124baf63be72326
diff --git a/metadata/md5-cache/dev-python/rackspace-novaclient-2.1 b/metadata/md5-cache/dev-python/rackspace-novaclient-2.1
index 6524a800d634..bfaa478e8e86 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_python3_6(-)?,-pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rackspace-novaclient/rackspace-novaclient-2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39ad3d800def13391f25c20e303018bc
diff --git a/metadata/md5-cache/dev-python/radon-1.4.2 b/metadata/md5-cache/dev-python/radon-1.4.2
index 8e6b20cbf8bf..6c37a583e194 100644
--- a/metadata/md5-cache/dev-python/radon-1.4.2
+++ b/metadata/md5-cache/dev-python/radon-1.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/radon/radon-1.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d98dc34fdee5c0bc6f08bc57a21343b
diff --git a/metadata/md5-cache/dev-python/raet-0.6.8 b/metadata/md5-cache/dev-python/raet-0.6.8
index fcf2d16224c6..f331fe0d2fb2 100644
--- a/metadata/md5-cache/dev-python/raet-0.6.8
+++ b/metadata/md5-cache/dev-python/raet-0.6.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raet/raet-0.6.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0836d8526cab6c119a9262786b98a8a
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 cb4a1875ebad..a2bf4f078ee0 100644
--- a/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
+++ b/metadata/md5-cache/dev-python/ramlfications-0.1.9_p20160718
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d649b46590c37c16d2a39a6ab2a52679
diff --git a/metadata/md5-cache/dev-python/random2-1.0.1 b/metadata/md5-cache/dev-python/random2-1.0.1
index 8df24e4e3326..4f5a8cf11689 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/random2/random2-1.0.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cd96b3f281f01741f2a50502583ef11
diff --git a/metadata/md5-cache/dev-python/random2-1.0.1-r1 b/metadata/md5-cache/dev-python/random2-1.0.1-r1
index 1dd1cf4606aa..cfff9703affb 100644
--- a/metadata/md5-cache/dev-python/random2-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/random2-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/random2/random2-1.0.1.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5e28a18b8bd657c8c756e242ef18d7ac
diff --git a/metadata/md5-cache/dev-python/rarfile-3.0 b/metadata/md5-cache/dev-python/rarfile-3.0
index cfed2d817f8b..2578eeb643be 100644
--- a/metadata/md5-cache/dev-python/rarfile-3.0
+++ b/metadata/md5-cache/dev-python/rarfile-3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Module for RAR archive reading
 EAPI=6
 HOMEPAGE=https://github.com/markokr/rarfile
-IUSE=+compressed python_targets_python2_7 python_targets_python3_6
+IUSE=+compressed python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=ISC
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] compressed? ( || ( app-arch/unrar app-arch/rar ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] compressed? ( || ( app-arch/unrar app-arch/rar ) ) 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
 SRC_URI=mirror://pypi/r/rarfile/rarfile-3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1c17d40b9c94eabecc7da8122e5997d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b52750a63f39b82aa01c19a55660d80
diff --git a/metadata/md5-cache/dev-python/ratelimit-1.4.1 b/metadata/md5-cache/dev-python/ratelimit-1.4.1
index 77335050ac69..16cab3a5db3c 100644
--- a/metadata/md5-cache/dev-python/ratelimit-1.4.1
+++ b/metadata/md5-cache/dev-python/ratelimit-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tomasbasham/ratelimit/archive/v1.4.1.tar.gz -> ratelimit-1.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1fcedc4bc7a514fae424bf9228e7cde
diff --git a/metadata/md5-cache/dev-python/raven-5.33.0 b/metadata/md5-cache/dev-python/raven-5.33.0
index 4fa1e0df226d..12fc991ca935 100644
--- a/metadata/md5-cache/dev-python/raven-5.33.0
+++ b/metadata/md5-cache/dev-python/raven-5.33.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/contextlib2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Raven is a client for Sentry
 EAPI=6
 HOMEPAGE=https://github.com/getsentry/raven-python
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/contextlib2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/contextlib2[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/raven/raven-5.33.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bacee305423d4e1954e0eaaa9fd7ec74
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a84cf6731b6dda09f5b91cce314a6d67
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 20849af2eee6..6de97e604f05 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_python3_6(-)?,-pyth
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7bc80587136a659edce4f3ebe621e3ba
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 c4af9cb7319a..776ff2f29d86 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_python3_6(-)?,-pyth
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb4e6483009d34579514bb377d0b42ea
diff --git a/metadata/md5-cache/dev-python/rdflib-4.2.2 b/metadata/md5-cache/dev-python/rdflib-4.2.2
index f352f8464242..442621bd3459 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.2.2
+++ b/metadata/md5-cache/dev-python/rdflib-4.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=abd2a7429643bf1f962cadc9fccf849d
diff --git a/metadata/md5-cache/dev-python/rdflib-4.2.2-r1 b/metadata/md5-cache/dev-python/rdflib-4.2.2-r1
index 0c5f6f5890cc..3b26a062112d 100644
--- a/metadata/md5-cache/dev-python/rdflib-4.2.2-r1
+++ b/metadata/md5-cache/dev-python/rdflib-4.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rdflib/rdflib-4.2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2714df61c8f6bca80e7c4799c24c4459
diff --git a/metadata/md5-cache/dev-python/readlike-0.1.2 b/metadata/md5-cache/dev-python/readlike-0.1.2
index f4c861092696..8f61f8d8b415 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/readlike/readlike-0.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d035c9781f327be5b28880e17b4b5ea6
diff --git a/metadata/md5-cache/dev-python/readlike-0.1.3 b/metadata/md5-cache/dev-python/readlike-0.1.3
index 8aab3b31cce3..92c107b7b759 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/readlike/readlike-0.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d035c9781f327be5b28880e17b4b5ea6
diff --git a/metadata/md5-cache/dev-python/readme_renderer-17.2 b/metadata/md5-cache/dev-python/readme_renderer-17.2
index b58ce9eafb40..b79cbce43340 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-17.2
+++ b/metadata/md5-cache/dev-python/readme_renderer-17.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-17.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8661403cde15b841a8bd7d1163f5ca29
diff --git a/metadata/md5-cache/dev-python/readme_renderer-24.0-r1 b/metadata/md5-cache/dev-python/readme_renderer-24.0-r1
index 55ce7d84a138..dc9ad94f5520 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-24.0-r1
+++ b/metadata/md5-cache/dev-python/readme_renderer-24.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-24.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0001cfa918b438f4bdd6fb94567d51ca
diff --git a/metadata/md5-cache/dev-python/rebulk-0.9.0 b/metadata/md5-cache/dev-python/rebulk-0.9.0
index e62411eefd50..dd0fbac11fd9 100644
--- a/metadata/md5-cache/dev-python/rebulk-0.9.0
+++ b/metadata/md5-cache/dev-python/rebulk-0.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-runner[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python library that performs advanced searches in strings
 EAPI=6
 HOMEPAGE=https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT Apache-2.0
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rebulk/rebulk-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76a3adbd987f91330205d58389fff8ec
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c683817c3414dbaf2b5ed17694ae610
diff --git a/metadata/md5-cache/dev-python/rebulk-9999 b/metadata/md5-cache/dev-python/rebulk-9999
index a39ac17e40fa..f86ae347a3f6 100644
--- a/metadata/md5-cache/dev-python/rebulk-9999
+++ b/metadata/md5-cache/dev-python/rebulk-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-runner[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Python library that performs advanced searches in strings
 EAPI=6
 HOMEPAGE=https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 LICENSE=MIT Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[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 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4924d5274c5466fb4b4862eb33e22e5d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=626027cbfbd8ca45e6f990619b658804
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.4.0 b/metadata/md5-cache/dev-python/recommonmark-0.4.0
index 258e650e5b05..378fd6fd763f 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/recommonmark/recommonmark-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3bb1bf47bf6f2accb958e3bab7cbc6d
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.5.0 b/metadata/md5-cache/dev-python/recommonmark-0.5.0
index 05c3cd4a7d96..01d0c2c7ebf8 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.5.0
+++ b/metadata/md5-cache/dev-python/recommonmark-0.5.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rtfd/recommonmark/archive/0.5.0.tar.gz -> recommonmark-0.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bbedd584eb1e4b6843a040f4ae779f3c
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 c69a17b32d38..fb266b4842a3 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_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rtfd/recommonmark/archive/33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz -> recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04aadeeed7134682c0c95cfabf561944
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012 b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
index 41147ec7947c..6557b054e83f 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
+++ b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rtfd/recommonmark/archive/fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz -> recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a00de4d1dbd3e7d1d37e35c61d2179b
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012-r1 b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012-r1
index 09e55bffce25..b8a14fd9b5bd 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012-r1
+++ b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rtfd/recommonmark/archive/fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz -> recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=404929a39479197db06aca448d07a7dd
diff --git a/metadata/md5-cache/dev-python/redis-py-3.2.1 b/metadata/md5-cache/dev-python/redis-py-3.2.1
index 7ddb891bd817..69d0a5946d59 100644
--- a/metadata/md5-cache/dev-python/redis-py-3.2.1
+++ b/metadata/md5-cache/dev-python/redis-py-3.2.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-db/redis dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.7.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-db/redis dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-2.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python client for Redis key-value store
 EAPI=7
 HOMEPAGE=https://github.com/andymccurdy/redis-py
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-3.2.1.tar.gz -> redis-py-3.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=99c742513a52aaee34a13b9d86eaeb81
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1659d7e8bffd0175db631772a42beabc
diff --git a/metadata/md5-cache/dev-python/redis-py-3.3.11 b/metadata/md5-cache/dev-python/redis-py-3.3.11
index 0c404dd2e67b..343076945274 100644
--- a/metadata/md5-cache/dev-python/redis-py-3.3.11
+++ b/metadata/md5-cache/dev-python/redis-py-3.3.11
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-db/redis dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.7.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-db/redis dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Python client for Redis key-value store
 EAPI=7
 HOMEPAGE=https://github.com/andymccurdy/redis-py
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/redis/redis-3.3.11.tar.gz -> redis-py-3.3.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d5cbad3bb1e52516e62847c7fd16ad98
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=579ada230499077fab4fb76331f9eb6f
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 aa335e6df57a..e2d84e253d4c 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_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5377c550e330d871aed8272bd008f0fb
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 45006f2998c1..49d6f85b562f 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_pypy3(-)?,python_targets_python3_6(-)
 REQUIRED_USE=|| ( python_targets_pypy3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b87e48df47288bd381569ced72002a97
diff --git a/metadata/md5-cache/dev-python/rednose-0.4.1 b/metadata/md5-cache/dev-python/rednose-0.4.1
index 213c08327404..76f80b5f65be 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_python3_6(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rednose/rednose-0.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7a27a0100cc453222837a09a9966bcff
diff --git a/metadata/md5-cache/dev-python/rednose-0.4.3 b/metadata/md5-cache/dev-python/rednose-0.4.3
index 041d96ff1df5..45ebaece11e9 100644
--- a/metadata/md5-cache/dev-python/rednose-0.4.3
+++ b/metadata/md5-cache/dev-python/rednose-0.4.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rednose/rednose-0.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4ed4bc54e225d200bb2f91fdfe1fe37e
diff --git a/metadata/md5-cache/dev-python/reflink-0.2.1 b/metadata/md5-cache/dev-python/reflink-0.2.1
index 474a7c989c36..ece49c82818a 100644
--- a/metadata/md5-cache/dev-python/reflink-0.2.1
+++ b/metadata/md5-cache/dev-python/reflink-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/reflink/reflink-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=042a1d5e130a30e7e6353e3aeeca65b8
diff --git a/metadata/md5-cache/dev-python/regendoc-0.5 b/metadata/md5-cache/dev-python/regendoc-0.5
index 92d8cfccd4f0..c28cce6e90d0 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_pypy3(-)?,python_targets_python3_6(-)?,-
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/RegenDoc/regendoc-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0bb961041cbad9ae60834985838a737
diff --git a/metadata/md5-cache/dev-python/regendoc-0.6.1 b/metadata/md5-cache/dev-python/regendoc-0.6.1
index 5dfc69a5bcba..2f844d8f61a4 100644
--- a/metadata/md5-cache/dev-python/regendoc-0.6.1
+++ b/metadata/md5-cache/dev-python/regendoc-0.6.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/R/RegenDoc/regendoc-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27c3c3cec63a840dcae9752e4ff9810b
diff --git a/metadata/md5-cache/dev-python/regex-2017.04.05 b/metadata/md5-cache/dev-python/regex-2017.04.05
index 8972dc7fad8f..5c52a858fdc1 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05254d5e95cc4fcc734f5685a2569310
diff --git a/metadata/md5-cache/dev-python/regex-2017.04.05-r1 b/metadata/md5-cache/dev-python/regex-2017.04.05-r1
index 3960e91c1efa..3da71421bbd5 100644
--- a/metadata/md5-cache/dev-python/regex-2017.04.05-r1
+++ b/metadata/md5-cache/dev-python/regex-2017.04.05-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2017.04.05.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a984b4a76c18968560d117b6fcc50056
diff --git a/metadata/md5-cache/dev-python/regex-2019.11.1 b/metadata/md5-cache/dev-python/regex-2019.11.1
index b19f260c9ad2..c6a12f6b8a88 100644
--- a/metadata/md5-cache/dev-python/regex-2019.11.1
+++ b/metadata/md5-cache/dev-python/regex-2019.11.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2019.11.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cd6af0af4f5852fee85f5eb26077cb0f
diff --git a/metadata/md5-cache/dev-python/rencode-1.0.5 b/metadata/md5-cache/dev-python/rencode-1.0.5
index 80d7dd5e54da..e2ea3e762b84 100644
--- a/metadata/md5-cache/dev-python/rencode-1.0.5
+++ b/metadata/md5-cache/dev-python/rencode-1.0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/cython[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=similar to bencode from the BitTorrent project
 EAPI=6
 HOMEPAGE=https://github.com/aresch/rencode
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=https://github.com/aresch/rencode/archive/v1.0.5.tar.gz -> rencode-1.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d4907f7ea0f4f9499dfaade723bc817
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6ad662821769438056e9c2c79e47cb9a
diff --git a/metadata/md5-cache/dev-python/rencode-1.0.5-r1 b/metadata/md5-cache/dev-python/rencode-1.0.5-r1
index a2fecb5016e2..db8b4b27e7a3 100644
--- a/metadata/md5-cache/dev-python/rencode-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/rencode-1.0.5-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=similar to bencode from the BitTorrent project
 EAPI=7
 HOMEPAGE=https://github.com/aresch/rencode
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/aresch/rencode/archive/v1.0.5.tar.gz -> rencode-1.0.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6b3caa74cd9d939c9f61a9884ffaa4fe
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c64f73cd972b84a94a3aeccc19778abc
diff --git a/metadata/md5-cache/dev-python/reno-2.11.2 b/metadata/md5-cache/dev-python/reno-2.11.2
index df1a6fa00fc0..3c0d009f27bb 100644
--- a/metadata/md5-cache/dev-python/reno-2.11.2
+++ b/metadata/md5-cache/dev-python/reno-2.11.2
@@ -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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-2.11.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f03f7b72b244efe970c410313cf10f5
diff --git a/metadata/md5-cache/dev-python/reno-2.11.3 b/metadata/md5-cache/dev-python/reno-2.11.3
index 01a736c52515..586a31b03d31 100644
--- a/metadata/md5-cache/dev-python/reno-2.11.3
+++ b/metadata/md5-cache/dev-python/reno-2.11.3
@@ -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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-2.11.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d773852e44ea72e0208bd4c990eddbb6
diff --git a/metadata/md5-cache/dev-python/reno-2.7.0 b/metadata/md5-cache/dev-python/reno-2.7.0
index 80ef8da3e1ea..f15507ad32a0 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-2.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84fa6dd1f3f28a737d4aa3f9151bc108
diff --git a/metadata/md5-cache/dev-python/reportlab-3.5.13-r1 b/metadata/md5-cache/dev-python/reportlab-3.5.13-r1
index 5fe64b58c9be..e61647a7da96 100644
--- a/metadata/md5-cache/dev-python/reportlab-3.5.13-r1
+++ b/metadata/md5-cache/dev-python/reportlab-3.5.13-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[tiff,truetype,jpeg(+),python_targets_python2_7(-)?,pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reportlab/reportlab-3.5.13.tar.gz http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea4d97b225fa061ea1f6d5343e8584d7
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 269fe740aa9b..bcf4f77f10d4 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.6-r2
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.6-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A tiny LRU cache implementation and decorator
 EAPI=6
 HOMEPAGE=http://www.repoze.org
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=repoze
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2f798afc6052ecc93bd80243c913edb5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62420f3aaedc2026639261e7d7d66d59
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 0bc016fd42c0..4011acf97a6c 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.6-r3
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.6-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A tiny LRU cache implementation and decorator
 EAPI=6
 HOMEPAGE=http://www.repoze.org
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=repoze
-RDEPEND=dev-python/namespace-repoze[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/namespace-repoze[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
 SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ec1046e16f60d4efce8b7e3d25f87af1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=becc2c3c79fdcdef6fbf1d111d4b4a63
diff --git a/metadata/md5-cache/dev-python/repoze-lru-0.7 b/metadata/md5-cache/dev-python/repoze-lru-0.7
index e85a8432ec6d..9ff34da58145 100644
--- a/metadata/md5-cache/dev-python/repoze-lru-0.7
+++ b/metadata/md5-cache/dev-python/repoze-lru-0.7
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A tiny LRU cache implementation and decorator
 EAPI=7
 HOMEPAGE=http://www.repoze.org
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=repoze
-RDEPEND=dev-python/namespace-repoze[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/namespace-repoze[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.lru/repoze.lru-0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=52e35ab725db7d843969b161c9aa1256
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9bc918068efbd419b3955055f7186aea
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 25e452ac8f9b..021bc0be691d 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/namespace-repoze[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/namespace-repoze[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Sphinx extension: auto-generates API docs from Zope interfaces
 EAPI=5
 HOMEPAGE=https://pypi.org/project/repoze.sphinx.autointerface/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=repoze
-RDEPEND=dev-python/namespace-repoze[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/namespace-repoze[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/zope-interface[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
 SRC_URI=mirror://pypi/r/repoze.sphinx.autointerface/repoze.sphinx.autointerface-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48275405d618022ab11dc15458204b44
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4df36e22d9a1f27e5bdccc6b96ae666d
diff --git a/metadata/md5-cache/dev-python/repoze-who-2.2 b/metadata/md5-cache/dev-python/repoze-who-2.2
index b0f576646609..b27e271237eb 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.who/repoze.who-2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d558015f23e3387a870b0218ca82f232
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 033851f4295e..c7e3d5994ffe 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_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/repoze.who/repoze.who-2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26d3a83ecdab343ed2bbbcc3b9d44364
diff --git a/metadata/md5-cache/dev-python/requests-2.21.0-r1 b/metadata/md5-cache/dev-python/requests-2.21.0-r1
index 4a3b03f10e12..ea5a9ea83e31 100644
--- a/metadata/md5-cache/dev-python/requests-2.21.0-r1
+++ b/metadata/md5-cache/dev-python/requests-2.21.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.21.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32d762f04c7c247ede8a525c7e7b0611
diff --git a/metadata/md5-cache/dev-python/requests-2.22.0 b/metadata/md5-cache/dev-python/requests-2.22.0
index 3db3abf27707..6afe7bfe10fb 100644
--- a/metadata/md5-cache/dev-python/requests-2.22.0
+++ b/metadata/md5-cache/dev-python/requests-2.22.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.22.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b9ed3f0c788a398414db28d2cce37684
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 9f1fd3302483..14494b4b5b90 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_python2_7(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-cache/requests-cache-0.4.12.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a45c6abdd823068e58e5de2baaaabb8e
diff --git a/metadata/md5-cache/dev-python/requests-credssp-1.0.2 b/metadata/md5-cache/dev-python/requests-credssp-1.0.2
index 9736ef606993..e1939d1c886c 100644
--- a/metadata/md5-cache/dev-python/requests-credssp-1.0.2
+++ b/metadata/md5-cache/dev-python/requests-credssp-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-credssp/requests-credssp-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=842f51e2927dc3cc9113ea64f1ce8e46
diff --git a/metadata/md5-cache/dev-python/requests-file-1.4.3 b/metadata/md5-cache/dev-python/requests-file-1.4.3
index 04f427c1af9b..55e20980c1fc 100644
--- a/metadata/md5-cache/dev-python/requests-file-1.4.3
+++ b/metadata/md5-cache/dev-python/requests-file-1.4.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-file/requests-file-1.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4ca3cd743ba8054843f436eed0c39d39
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 26ed0b6591aa..d7643980a1ac 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_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-kerberos/requests-kerberos-0.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=22ca6fd9e7c537e26092480947866075
diff --git a/metadata/md5-cache/dev-python/requests-kerberos-0.12.0 b/metadata/md5-cache/dev-python/requests-kerberos-0.12.0
index 2dee9ddf14cc..75d7a842cf10 100644
--- a/metadata/md5-cache/dev-python/requests-kerberos-0.12.0
+++ b/metadata/md5-cache/dev-python/requests-kerberos-0.12.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=A Kerberos authentication handler for python-requests
 EAPI=7
 HOMEPAGE=https://github.com/requests/requests-kerberos/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=>=dev-python/requests-1.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] || ( >=dev-python/pykerberos-1.1.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] <dev-python/pykerberos-2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/requests-1.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] || ( >=dev-python/pykerberos-1.1.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] <dev-python/pykerberos-2[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-kerberos/archive/v0.12.0.tar.gz -> requests-kerberos-0.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e1db637a4e271070c4adbed0e19de522
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=436aeb32a5e23857d2a0bda845980546
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 8a4566904ea6..005e5be7e8f2 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.2.0
+++ b/metadata/md5-cache/dev-python/requests-mock-1.2.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/fixtures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pbr-0.8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/fixtures[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/testtools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Mock out responses from the requests package
 EAPI=6
 HOMEPAGE=https://github.com/jamielennox/requests-mock
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.1[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/requests-1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8fd84752992dbb86ed771bbe45ca3eb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=914c9438b8bbf988a824423c7f4ba4ec
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.5.0 b/metadata/md5-cache/dev-python/requests-mock-1.5.0
index cf5190f7a7f8..f5ca72d4dce3 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.5.0
+++ b/metadata/md5-cache/dev-python/requests-mock-1.5.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/subunit[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/subunit[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/testrepository-0.0.18[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Mock out responses from the requests package
 EAPI=7
 HOMEPAGE=https://github.com/jamielennox/requests-mock
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/requests-1.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b450d1c4dc4f6a09eaad6f2fe05b1c7d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9a6e437893994f6c0e0eee84ea02aaf3
diff --git a/metadata/md5-cache/dev-python/requests-mock-1.5.2 b/metadata/md5-cache/dev-python/requests-mock-1.5.2
index ae49dbf9a993..66bc2b852894 100644
--- a/metadata/md5-cache/dev-python/requests-mock-1.5.2
+++ b/metadata/md5-cache/dev-python/requests-mock-1.5.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-0.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/subunit[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-0.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/subunit[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Mock out responses from the requests package
 EAPI=7
 HOMEPAGE=https://github.com/jamielennox/requests-mock
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/requests-1.1[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-mock/requests-mock-1.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=74b874148eb2a74762da626d09d5f99c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c1ae1475bca4340fedb825b4a20743a6
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 4bd42f474152..6286aa0e1d3c 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_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bafaf52918b7622a939e26e994ca593a
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 6b517e39b609..79c06351fdb3 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_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests_ntlm/requests_ntlm-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f84d11cd9d30b9195f0d7833e9453004
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 6c7fd5ffb10e..01d96db7ab00 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-0.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-oauthlib/archive/v0.7.0.tar.gz -> requests-oauthlib-0.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2264435e9ea1ea3a238384857542de8
diff --git a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0 b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
index 10bab6f09cc0..e73a8fc66cb2 100644
--- a/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
+++ b/metadata/md5-cache/dev-python/requests-oauthlib-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://github.com/requests/requests-oauthlib/archive/v1.3.0.tar.gz -> requests-oauthlib-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=da7f29ad4a47febc033387b7e3b7010c
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 e7f599ade67b..9e05af914ffd 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89263781c06d5c563f980c5944eb3e26
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1 b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
index 0d07880e2e9c..d37a81115a1e 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/requests-3.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( <dev-python/requests-3.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=<dev-python/requests-3.0.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/betamax[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=A utility belt for advanced users of python-requests
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.9.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3c79aea68cecdde3ce58f2203e422060
diff --git a/metadata/md5-cache/dev-python/requests_download-0.1.2 b/metadata/md5-cache/dev-python/requests_download-0.1.2
index f762f17fe8fd..6d5943bac447 100644
--- a/metadata/md5-cache/dev-python/requests_download-0.1.2
+++ b/metadata/md5-cache/dev-python/requests_download-0.1.2
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A convenient function to download to a file using requests
 EAPI=7
 HOMEPAGE=https://github.com/takluyver/requests_download https://pypi.org/project/requests_download/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/takluyver/requests_download/archive/0.1.2.tar.gz -> requests_download-0.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e9458a22f54d246dcc2b23e846540bb1
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=de80e3ea05ee9fd29277f529646b0a9c
diff --git a/metadata/md5-cache/dev-python/requests_pkcs12-1.4 b/metadata/md5-cache/dev-python/requests_pkcs12-1.4
index 1fb7dc81035e..c4697c77c5b5 100644
--- a/metadata/md5-cache/dev-python/requests_pkcs12-1.4
+++ b/metadata/md5-cache/dev-python/requests_pkcs12-1.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Adds PKCS#12 support to the Python requests library in a clean way
 EAPI=7
 HOMEPAGE=https://github.com/m-click/requests_pkcs12
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requests_pkcs12/requests_pkcs12-1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=56d3cd6c912078e0ac45d935b5fffe0d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=72a8a2a20fac0faa8795c3b36ca0a0cc
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.1.3 b/metadata/md5-cache/dev-python/requestsexceptions-1.1.3
index 81e7da573e4a..36a6bc00fd11 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.1.3
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pbr-0.11[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Finds the correct path to exceptions in the requests library.
 EAPI=6
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/pbr-0.11[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
 SRC_URI=mirror://pypi/r/requestsexceptions/requestsexceptions-1.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b05b9137da5ba5d2afc26246c8b1c7c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9dfdb9c078d021e1d38089ae83322709
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index b1370703179d..97448e41e13e 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Finds the correct path to exceptions in the requests library.
 EAPI=6
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requestsexceptions/requestsexceptions-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50b5d3daa13aea149fa552412062b491
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56754c87f741b34cbd4922f43f63a8cb
diff --git a/metadata/md5-cache/dev-python/responses-0.10.7 b/metadata/md5-cache/dev-python/responses-0.10.7
index 5f4b3ac846b6..7e429c51e39e 100644
--- a/metadata/md5-cache/dev-python/responses-0.10.7
+++ b/metadata/md5-cache/dev-python/responses-0.10.7
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-localserver[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Utility for mocking out the Python Requests library
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/responses/responses-0.10.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2cf59fc90497e7377d3ed2948272bf86
diff --git a/metadata/md5-cache/dev-python/responses-0.6.0 b/metadata/md5-cache/dev-python/responses-0.6.0
index 19e164b242cf..0cb0b7009cd4 100644
--- a/metadata/md5-cache/dev-python/responses-0.6.0
+++ b/metadata/md5-cache/dev-python/responses-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getsentry/responses/archive/0.6.0.tar.gz -> responses-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2c65177cc0f470d04b9baf5c3d87ea6
diff --git a/metadata/md5-cache/dev-python/responses-0.9.0 b/metadata/md5-cache/dev-python/responses-0.9.0
index 6c3736743649..469556f0dc06 100644
--- a/metadata/md5-cache/dev-python/responses-0.9.0
+++ b/metadata/md5-cache/dev-python/responses-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/responses/responses-0.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a578770ab393d4060a080683f7ee22ae
diff --git a/metadata/md5-cache/dev-python/restkit-4.2.2 b/metadata/md5-cache/dev-python/restkit-4.2.2
index 162afdbdf35b..d89519dde859 100644
--- a/metadata/md5-cache/dev-python/restkit-4.2.2
+++ b/metadata/md5-cache/dev-python/restkit-4.2.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restkit/restkit-4.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d47dbfe3bc4d663c849475f4c3c9807
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 06963299a8f1..1acb81e74c80 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-0.12.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Checks PyPI validity of reStructuredText
 EAPI=5
 HOMEPAGE=https://pypi.org/project/restructuredtext_lint/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Unlicense
-RDEPEND=>=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/docutils-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/docutils-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/docutils-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/restructuredtext_lint/restructuredtext_lint-0.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7426ed55ac46f92c0c3db74178cc051f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b314d0510b7f7f14e97651d2958fab0a
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 068c0b8dcf9b..08c201ff013e 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-1.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Checks PyPI validity of reStructuredText
 EAPI=6
 HOMEPAGE=https://pypi.org/project/restructuredtext_lint/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Unlicense
-RDEPEND=>=dev-python/docutils-0.11[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/docutils-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/docutils-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/docutils-1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/restructuredtext_lint/restructuredtext_lint-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36963ae25cc434a7ddb6e570f12161f1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bf729660227c65ff45009ea525610775
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 d36a9c6ddce7..35596aaf8282 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_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/resumable-urlretrieve/resumable-urlretrieve-0.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f4ce4e1e8548eb370f0a4dbd2103954
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 0b4b6cbff4b1..322c8d35210f 100644
--- a/metadata/md5-cache/dev-python/retry-decorator-1.0.0
+++ b/metadata/md5-cache/dev-python/retry-decorator-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Decorator for retrying when exceptions occur
 EAPI=5
 HOMEPAGE=https://github.com/pnpnpn/retry-decorator
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 arm x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ad3aaf4353a29f0b4bb1a701143f830
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ae0072160edd900245d2c938f263873
diff --git a/metadata/md5-cache/dev-python/retry-decorator-1.0.0-r1 b/metadata/md5-cache/dev-python/retry-decorator-1.0.0-r1
index 1caeee7aed50..fc5dda487c1f 100644
--- a/metadata/md5-cache/dev-python/retry-decorator-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/retry-decorator-1.0.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Decorator for retrying when exceptions occur
 EAPI=7
 HOMEPAGE=https://github.com/pnpnpn/retry-decorator
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pnpnpn/retry-decorator/archive/v1.0.0.tar.gz -> retry-decorator-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ef8ec4bf3231d4381d3d59175777d12b
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fb7873f25c17f71a3c4b491880e9f0e5
diff --git a/metadata/md5-cache/dev-python/retrying-1.3.3 b/metadata/md5-cache/dev-python/retrying-1.3.3
index 706b948e44f8..967e817be040 100644
--- a/metadata/md5-cache/dev-python/retrying-1.3.3
+++ b/metadata/md5-cache/dev-python/retrying-1.3.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.7.0[python_targets_pypy3(-)?,python_targets_python3_6
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/retrying/retrying-1.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=37c5865312df2b660088caa30add84a0
diff --git a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2 b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
index 709584c63764..8629ffb2c473 100644
--- a/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
+++ b/metadata/md5-cache/dev-python/rfc3339-validator-0.1.2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A pure python RFC3339 validator
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz -> rfc3339-validator-0.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e5cc482f8d38c8042b7ac24edebeda36
diff --git a/metadata/md5-cache/dev-python/rfc3986-0.3.1 b/metadata/md5-cache/dev-python/rfc3986-0.3.1
index b3ec1b88a094..59a687a6391a 100644
--- a/metadata/md5-cache/dev-python/rfc3986-0.3.1
+++ b/metadata/md5-cache/dev-python/rfc3986-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c84ad5e1e9d679d061042622515bda0e
diff --git a/metadata/md5-cache/dev-python/rfc3986-0.4.1 b/metadata/md5-cache/dev-python/rfc3986-0.4.1
index 56cbfb1317b7..80db97c2df10 100644
--- a/metadata/md5-cache/dev-python/rfc3986-0.4.1
+++ b/metadata/md5-cache/dev-python/rfc3986-0.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2160f4ea1743ba77911db75c350abcf0
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.1.0 b/metadata/md5-cache/dev-python/rfc3986-1.1.0
index 6218a537aff1..608b501e328e 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.1.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=034bc5758ec39a41c946204d10791c58
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.2.0 b/metadata/md5-cache/dev-python/rfc3986-1.2.0
index d5929624b768..9355ba99c716 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.2.0
+++ b/metadata/md5-cache/dev-python/rfc3986-1.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3bc233c1d914eb7d9aea489c9fd4c991
diff --git a/metadata/md5-cache/dev-python/rfc3986-1.3.2 b/metadata/md5-cache/dev-python/rfc3986-1.3.2
index 2a51040699b3..b3de6bd43e2e 100644
--- a/metadata/md5-cache/dev-python/rfc3986-1.3.2
+++ b/metadata/md5-cache/dev-python/rfc3986-1.3.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986/rfc3986-1.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d26ff285182c4a8b24c125739593679b
diff --git a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1 b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
index 70eed2f533ed..510df5fcb14a 100644
--- a/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
+++ b/metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/rfc3987[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure python RFC3986 validator
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3986_validator/rfc3986_validator-0.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9c76da14e004f22a4c66a1640b1a9a74
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.7 b/metadata/md5-cache/dev-python/rfc3987-1.3.7
index 84a595599d70..1d0577b2ccfd 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_python2_7? ( dev-python/regex[python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1ed29d0e3e6a3e54c8dd3242e300fa6
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8 b/metadata/md5-cache/dev-python/rfc3987-1.3.8
index b75101c87281..e8c5cc7e9726 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.8
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( dev-python/regex[python_targets_python2_7(-)
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e49f9706ae51123b4bd8a9d31915b2c6
diff --git a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1 b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
index 162521ca410a..42539959f57f 100644
--- a/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
+++ b/metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/regex[python_targets_pypy3(-)?,python_targets_python2_7(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rfc3987/rfc3987-1.3.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=01d3bcceb30ae0d8cfa43644d43deaec
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 a7264cf836de..1d7d910935cf 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea7d5a2c05704da14934b158e2913442
diff --git a/metadata/md5-cache/dev-python/rnc2rng-2.6.1 b/metadata/md5-cache/dev-python/rnc2rng-2.6.1
index d18f7833edec..1259a024d6a8 100644
--- a/metadata/md5-cache/dev-python/rnc2rng-2.6.1
+++ b/metadata/md5-cache/dev-python/rnc2rng-2.6.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rply[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(-)]
+DEPEND=dev-python/rply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=RELAX NG Compact to regular syntax conversion library
 EAPI=7
 HOMEPAGE=https://github.com/djc/rnc2rng
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-RDEPEND=dev-python/rply[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/rply[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rnc2rng/rnc2rng-2.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=611c6f6133846158c2f273b455e3ee2c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2b7d6dba30bc5eff505021d8f0695851
diff --git a/metadata/md5-cache/dev-python/robotbackgroundlogger-1.2 b/metadata/md5-cache/dev-python/robotbackgroundlogger-1.2
index b3a6b89aab43..1847c66f9df5 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/robotbackgroundlogger/robotbackgroundlogger-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6740bc4becd9f75a354911be17482762
diff --git a/metadata/md5-cache/dev-python/robotframework-3.0.2 b/metadata/md5-cache/dev-python/robotframework-3.0.2
index c37150a00502..d0995aee2abe 100644
--- a/metadata/md5-cache/dev-python/robotframework-3.0.2
+++ b/metadata/md5-cache/dev-python/robotframework-3.0.2
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Test automation framework for acceptance testing & test-driven development
 EAPI=6
 HOMEPAGE=https://robotframework.org/ https://pypi.org/project/robotframework/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/r/robotframework/robotframework-3.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7aa4bd99f47f8e78f7abc2acb6b9a9a8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f92e71d5624ac15d261f29567f70b1dc
diff --git a/metadata/md5-cache/dev-python/robotframework-3.0.4 b/metadata/md5-cache/dev-python/robotframework-3.0.4
index d6225d29d74a..86dd538ddcf5 100644
--- a/metadata/md5-cache/dev-python/robotframework-3.0.4
+++ b/metadata/md5-cache/dev-python/robotframework-3.0.4
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Test automation framework for acceptance testing & test-driven development
 EAPI=6
 HOMEPAGE=https://robotframework.org/ https://pypi.org/project/robotframework/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/r/robotframework/robotframework-3.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7aa4bd99f47f8e78f7abc2acb6b9a9a8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f92e71d5624ac15d261f29567f70b1dc
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 3394f8778468..43aeb808b8a9 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 dbff2565b6c1..00c94a1844d9 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 c8f4bbc8a757..8c75ed57184e 100644
--- a/metadata/md5-cache/dev-python/roman-2.0.0
+++ b/metadata/md5-cache/dev-python/roman-2.0.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<dev-python/docutils-0.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] app-arch/unzip 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=!<dev-python/docutils-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=An Integer to Roman numerals converter
 EAPI=5
 HOMEPAGE=https://pypi.org/project/roman/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=PSF-2
-RDEPEND=!<dev-python/docutils-0.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=!<dev-python/docutils-0.9[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-2.0.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7b43b3c260cab4c5c993f540d4167ee
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1bed118a3bcc1ac8c7b0f6fe5ab46c24
diff --git a/metadata/md5-cache/dev-python/roman-3.0 b/metadata/md5-cache/dev-python/roman-3.0
index 7619af464907..8eb6e394e50b 100644
--- a/metadata/md5-cache/dev-python/roman-3.0
+++ b/metadata/md5-cache/dev-python/roman-3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<dev-python/docutils-0.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=!<dev-python/docutils-0.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=An Integer to Roman numerals converter
 EAPI=6
 HOMEPAGE=https://pypi.org/project/roman/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=PSF-2
-RDEPEND=!<dev-python/docutils-0.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=!<dev-python/docutils-0.9[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/roman/roman-3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11d19f1bb2318e388b4b3056a16482a0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=69e021a2ab3f52646bd769af91bf6bda
diff --git a/metadata/md5-cache/dev-python/root_numpy-4.7.3 b/metadata/md5-cache/dev-python/root_numpy-4.7.3
deleted file mode 100644
index e590f7a7254c..000000000000
--- a/metadata/md5-cache/dev-python/root_numpy-4.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sci-physics/root:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=Interface between ROOT and numpy
-EAPI=5
-HOMEPAGE=https://github.com/rootpy/root_numpy
-IUSE=examples test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sci-physics/root:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/root_numpy/root_numpy-4.7.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c20bc9af98e1bc6d80befac5862a4da5
diff --git a/metadata/md5-cache/dev-python/root_numpy-4.7.3-r1 b/metadata/md5-cache/dev-python/root_numpy-4.7.3-r1
new file mode 100644
index 000000000000..ec0cad575c0a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/root_numpy-4.7.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) sci-physics/root:=[python,python_single_target_python3_6(-)?] test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DESCRIPTION=Interface between ROOT and numpy
+EAPI=5
+HOMEPAGE=https://github.com/rootpy/root_numpy
+IUSE=examples test +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) sci-physics/root:=[python,python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/root_numpy/root_numpy-4.7.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ada9f13aeddf13befc47aaaba7a4dd6
diff --git a/metadata/md5-cache/dev-python/rootpy-1.0.1 b/metadata/md5-cache/dev-python/rootpy-1.0.1
deleted file mode 100644
index 132b81f35ba3..000000000000
--- a/metadata/md5-cache/dev-python/rootpy-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sci-physics/root[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[readline] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=Pythonic layer on top of the ROOT framework's PyROOT bindings
-EAPI=6
-HOMEPAGE=http://rootpy.org
-IUSE=examples test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sci-physics/root:=[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pytables[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/root_numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/termcolor[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[readline] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/r/rootpy/rootpy-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2aee6cd473673b81c0c0cd0d5929f255
diff --git a/metadata/md5-cache/dev-python/rootpy-1.0.1-r1 b/metadata/md5-cache/dev-python/rootpy-1.0.1-r1
new file mode 100644
index 000000000000..63d11421c60a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rootpy-1.0.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sci-physics/root[python_single_target_python3_6(-)?] test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[readline] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DESCRIPTION=Pythonic layer on top of the ROOT framework's PyROOT bindings
+EAPI=6
+HOMEPAGE=http://rootpy.org
+IUSE=examples test +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=sci-physics/root:=[python_single_target_python3_6(-)?] dev-python/root_numpy[python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-python/matplotlib[python_targets_python3_6(-)] dev-python/pytables[python_targets_python3_6(-)] dev-python/termcolor[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[readline] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/r/rootpy/rootpy-1.0.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=598e1101d0b6ff8e024faca21045084e
diff --git a/metadata/md5-cache/dev-python/rope-0.10.3 b/metadata/md5-cache/dev-python/rope-0.10.3
deleted file mode 100644
index 58357b0795f2..000000000000
--- a/metadata/md5-cache/dev-python/rope-0.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/docutils[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-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python refactoring library
-EAPI=5
-HOMEPAGE=https://github.com/python-rope/rope
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-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
-SRC_URI=mirror://pypi/r/rope/rope-0.10.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_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 69ef45f9f71f..c226553c923e 100644
--- a/metadata/md5-cache/dev-python/rope-0.10.7
+++ b/metadata/md5-cache/dev-python/rope-0.10.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/docutils[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python refactoring library
 EAPI=6
 HOMEPAGE=https://github.com/python-rope/rope
-IUSE=doc python_targets_python2_7 python_targets_python3_6
+IUSE=doc python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=!dev-python/rope_py3k python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=!dev-python/rope_py3k 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
 SRC_URI=mirror://pypi/r/rope/rope-0.10.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d2620eda6893b45d67515151183ca79
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=17ac047f8897577d3cf5213406cdb3e6
diff --git a/metadata/md5-cache/dev-python/ropemode-0.4 b/metadata/md5-cache/dev-python/ropemode-0.4
index 0e45dbd39a7e..f8f09fe5a06b 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad2d48052c30fcdc4234c8a5918749dd
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.7.2 b/metadata/md5-cache/dev-python/rosdistro-0.7.2
index 17463d1a807b..a5f2c6d14d2e 100644
--- a/metadata/md5-cache/dev-python/rosdistro-0.7.2
+++ b/metadata/md5-cache/dev-python/rosdistro-0.7.2
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Tools to work with catkinized rosdistro files
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rosdistro
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosdistro/archive/0.7.2.tar.gz -> rosdistro-0.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6613e911e47b5b24d68ebaf0f9aaf77e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3c07ce897ee0e18fb5003d513568af38
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.7.4 b/metadata/md5-cache/dev-python/rosdistro-0.7.4
index a93b362f1032..b5212c0fb757 100644
--- a/metadata/md5-cache/dev-python/rosdistro-0.7.4
+++ b/metadata/md5-cache/dev-python/rosdistro-0.7.4
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Tools to work with catkinized rosdistro files
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rosdistro
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosdistro/archive/0.7.4.tar.gz -> rosdistro-0.7.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6613e911e47b5b24d68ebaf0f9aaf77e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3c07ce897ee0e18fb5003d513568af38
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.8.0 b/metadata/md5-cache/dev-python/rosdistro-0.8.0
index 8cdf867e1939..b52739428fe7 100644
--- a/metadata/md5-cache/dev-python/rosdistro-0.8.0
+++ b/metadata/md5-cache/dev-python/rosdistro-0.8.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Tools to work with catkinized rosdistro files
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rosdistro
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rosdistro/archive/0.8.0.tar.gz -> rosdistro-0.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ac4528d894c8c22bec5a6c56f2eea727
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=496f3da9487cd45a32645a8291645700
diff --git a/metadata/md5-cache/dev-python/rosdistro-9999 b/metadata/md5-cache/dev-python/rosdistro-9999
index 29113932b1b1..0031799bcd6d 100644
--- a/metadata/md5-cache/dev-python/rosdistro-9999
+++ b/metadata/md5-cache/dev-python/rosdistro-9999
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Tools to work with catkinized rosdistro files
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rosdistro
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ac4528d894c8c22bec5a6c56f2eea727
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=496f3da9487cd45a32645a8291645700
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.10 b/metadata/md5-cache/dev-python/rospkg-1.1.10
index 15bf6212e53d..fb9080af2e4c 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.1.10
+++ b/metadata/md5-cache/dev-python/rospkg-1.1.10
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Standalone Python library for the ROS package system
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rospkg
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.10.tar.gz -> rospkg-1.1.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e6a24c15911fe01850b7e09aea2e5bb2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c7ce4e3c53a8a0955ff1141031cfdcdc
diff --git a/metadata/md5-cache/dev-python/rospkg-1.1.9 b/metadata/md5-cache/dev-python/rospkg-1.1.9
index c5fea204c28b..1bf1650d79e3 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.1.9
+++ b/metadata/md5-cache/dev-python/rospkg-1.1.9
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Standalone Python library for the ROS package system
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rospkg
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.1.9.tar.gz -> rospkg-1.1.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e6a24c15911fe01850b7e09aea2e5bb2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c7ce4e3c53a8a0955ff1141031cfdcdc
diff --git a/metadata/md5-cache/dev-python/rospkg-1.2.0 b/metadata/md5-cache/dev-python/rospkg-1.2.0
index 19b262713567..744497ce213d 100644
--- a/metadata/md5-cache/dev-python/rospkg-1.2.0
+++ b/metadata/md5-cache/dev-python/rospkg-1.2.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Standalone Python library for the ROS package system
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rospkg
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-infrastructure/rospkg/archive/1.2.0.tar.gz -> rospkg-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=564a5d4ea2e1f42847bada12269a5657
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d8adc7a355c14a37109aea5514b35253
diff --git a/metadata/md5-cache/dev-python/rospkg-9999 b/metadata/md5-cache/dev-python/rospkg-9999
index 73424dcca7b8..af9cf2ae0f76 100644
--- a/metadata/md5-cache/dev-python/rospkg-9999
+++ b/metadata/md5-cache/dev-python/rospkg-9999
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Standalone Python library for the ROS package system
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rospkg
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=564a5d4ea2e1f42847bada12269a5657
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d8adc7a355c14a37109aea5514b35253
diff --git a/metadata/md5-cache/dev-python/routes-2.4.1 b/metadata/md5-cache/dev-python/routes-2.4.1
index 6c6b7696de0d..78d958162e2d 100644
--- a/metadata/md5-cache/dev-python/routes-2.4.1
+++ b/metadata/md5-cache/dev-python/routes-2.4.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=A re-implementation of Rails routes system, mapping URLs to Controllers/Actions
 EAPI=7
 HOMEPAGE=https://routes.readthedocs.io/en/latest/ https://pypi.org/project/Routes/
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=>=dev-python/repoze-lru-0.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/repoze-lru-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Routes/Routes-2.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=04cef22636b31599fcf448e5ab70d163
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f9d8716ec5ee48a0ae7794c32d407bc9
diff --git a/metadata/md5-cache/dev-python/rply-0.7.5 b/metadata/md5-cache/dev-python/rply-0.7.5
index f1e54117f82d..2016628f827d 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.5
+++ b/metadata/md5-cache/dev-python/rply-0.7.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/appdirs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/appdirs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pure python parser generator that also works with RPython
 EAPI=5
 HOMEPAGE=https://github.com/alex/rply
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=946d4a38935bdcf8865b7727a79fc984
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=501e8ce59f723561b07348c0eced6c44
diff --git a/metadata/md5-cache/dev-python/rply-0.7.7 b/metadata/md5-cache/dev-python/rply-0.7.7
index df695bdd5df4..fcae94808c53 100644
--- a/metadata/md5-cache/dev-python/rply-0.7.7
+++ b/metadata/md5-cache/dev-python/rply-0.7.7
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/appdirs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] test? ( dev-python/py[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[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(-)] )
+DEPEND=dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Pure python parser generator that also works with RPython
 EAPI=7
 HOMEPAGE=https://github.com/alex/rply
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alex/rply/archive/v0.7.7.tar.gz -> rply-0.7.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3c4116eab911c98f45340fbc365543df
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1ac32ecc7718f28123fee4baeb69b814
diff --git a/metadata/md5-cache/dev-python/rpy-2.6.2 b/metadata/md5-cache/dev-python/rpy-2.6.2
index 945f82d866f7..81b4579cdc8d 100644
--- a/metadata/md5-cache/dev-python/rpy-2.6.2
+++ b/metadata/md5-cache/dev-python/rpy-2.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rpy2/rpy2-2.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1f69a3e92ddc69745d410dad956a73e
diff --git a/metadata/md5-cache/dev-python/rpy-2.9.0 b/metadata/md5-cache/dev-python/rpy-2.9.0
index ecd9db8ad65c..bbf1cf23d0b7 100644
--- a/metadata/md5-cache/dev-python/rpy-2.9.0
+++ b/metadata/md5-cache/dev-python/rpy-2.9.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rpy2/rpy2-2.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=217b8625036cfc0ee5f039307289fb0c
diff --git a/metadata/md5-cache/dev-python/rpyc-3.4.4 b/metadata/md5-cache/dev-python/rpyc-3.4.4
index 2daa90ca452e..80f15e670c0f 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_python3_6? ( dev-lang/python:3.6 ) >=d
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rpyc/rpyc-3.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72b046ba91d617d3b43dfac44ea9dbf2
diff --git a/metadata/md5-cache/dev-python/rpyc-4.0.2 b/metadata/md5-cache/dev-python/rpyc-4.0.2
index 6ebbf3bb3d26..5a99df4a197b 100644
--- a/metadata/md5-cache/dev-python/rpyc-4.0.2
+++ b/metadata/md5-cache/dev-python/rpyc-4.0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/plumbum[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rpyc/rpyc-4.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8cf4571f61e2cd0a022cd275ce1012d3
diff --git a/metadata/md5-cache/dev-python/rpyc-4.1.4 b/metadata/md5-cache/dev-python/rpyc-4.1.4
index 98edec5f3a10..a61e5ce6fddc 100644
--- a/metadata/md5-cache/dev-python/rpyc-4.1.4
+++ b/metadata/md5-cache/dev-python/rpyc-4.1.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/plumbum[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tomerfiliba/rpyc/archive/4.1.4.tar.gz -> rpyc-4.1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9891dd40dec5f302a2b446610297a6b4
diff --git a/metadata/md5-cache/dev-python/rq-0.13.0 b/metadata/md5-cache/dev-python/rq-0.13.0
index cd0616507678..40f570893b51 100644
--- a/metadata/md5-cache/dev-python/rq-0.13.0
+++ b/metadata/md5-cache/dev-python/rq-0.13.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/redis-py-3.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/click-5.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/redis-py-3.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=simple, lightweight library for creating and processing background jobs
 EAPI=7
 HOMEPAGE=https://github.com/rq/rq
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/redis-py-3.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/click-5.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/redis-py-3.0.0[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
 SRC_URI=mirror://pypi/r/rq/rq-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4533a916754c2f2d72c77c2176616797
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f1de03ad960c34cfc814101f16aabed7
diff --git a/metadata/md5-cache/dev-python/rq-1.0 b/metadata/md5-cache/dev-python/rq-1.0
index 01c772cc5774..e2e92d7a9a5d 100644
--- a/metadata/md5-cache/dev-python/rq-1.0
+++ b/metadata/md5-cache/dev-python/rq-1.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/redis-py-3.0.0[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(-)]
+DEPEND=>=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/redis-py-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=simple, lightweight library for creating and processing background jobs
 EAPI=7
 HOMEPAGE=https://github.com/rq/rq
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-python/click-5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/redis-py-3.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/click-5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/redis-py-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rq/rq-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e9ee48976259541f548c705a774425f7
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1837587fe33fa22bfe9f58839714a5ea
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 441231c6fbd1..8e1f11c3827f 100644
--- a/metadata/md5-cache/dev-python/rsa-3.2.3-r1
+++ b/metadata/md5-cache/dev-python/rsa-3.2.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-0.6.10[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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-0.6.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Pure-Python RSA implementation
 EAPI=5
 HOMEPAGE=https://stuvel.eu/rsa https://pypi.org/project/rsa/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/traceback2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3daf68eeab7f0dc48ee7687ecac8cfcd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=48fd71b0481af4862ad96c4becad144a
diff --git a/metadata/md5-cache/dev-python/rsa-3.4.2-r1 b/metadata/md5-cache/dev-python/rsa-3.4.2-r1
index 50885f4b7dce..bc07519b7921 100644
--- a/metadata/md5-cache/dev-python/rsa-3.4.2-r1
+++ b/metadata/md5-cache/dev-python/rsa-3.4.2-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/traceback2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/traceback2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/unittest2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Pure-Python RSA implementation
 EAPI=7
 HOMEPAGE=https://stuvel.eu/rsa https://pypi.org/project/rsa/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/traceback2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/traceback2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rsa/rsa-3.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9e5709ced8d197226e8a1ec5e034b5e4
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=182fd78349c068e925e5e22df7fc13f4
diff --git a/metadata/md5-cache/dev-python/rst-linker-1.11 b/metadata/md5-cache/dev-python/rst-linker-1.11
index 22b7264a4825..e42877ccf964 100644
--- a/metadata/md5-cache/dev-python/rst-linker-1.11
+++ b/metadata/md5-cache/dev-python/rst-linker-1.11
@@ -5,12 +5,12 @@ DESCRIPTION=Sphinx plugin to add links and timestamps to the changelog
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/rst.linker
 IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/importlib_metadata[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rst.linker/rst.linker-1.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dd9fedb684cce1207acf77a11e165fc3
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c3e6a54c8c98c99355ea94c4d806f380
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 c8bec17ed587..96f87081462a 100644
--- a/metadata/md5-cache/dev-python/rst-linker-1.9-r1
+++ b/metadata/md5-cache/dev-python/rst-linker-1.9-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rst.linker/rst.linker-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e9d7841887d0fd555170918dfa33f1d4
diff --git a/metadata/md5-cache/dev-python/rst-linker-2.0.0 b/metadata/md5-cache/dev-python/rst-linker-2.0.0
index 249d09d154b3..610907b793db 100644
--- a/metadata/md5-cache/dev-python/rst-linker-2.0.0
+++ b/metadata/md5-cache/dev-python/rst-linker-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/rst.linker/rst.linker-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f4144676613ba0f83c4ec6318885f7a5
diff --git a/metadata/md5-cache/dev-python/rst2pdf-0.93-r3 b/metadata/md5-cache/dev-python/rst2pdf-0.93-r3
index 5527a825a92c..80324a470e3c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b646f844a8a94dc2f1b2535ba1be8dab
diff --git a/metadata/md5-cache/dev-python/rtgraph-0.70-r1 b/metadata/md5-cache/dev-python/rtgraph-0.70-r1
index ba5102920fe8..f417e2a85113 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=547653609b1d1659208a929dac4a1f80
diff --git a/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1 b/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
index f91492e57dda..ca336f165bd9 100644
--- a/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
+++ b/metadata/md5-cache/dev-python/rtimulib-7.2.1-r1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python Binding for RTIMULib, a versatile IMU library
 EAPI=7
 HOMEPAGE=https://github.com/RPi-Distro/RTIMULib
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3a5619a4ebf8b1f1e68b92d5201569ad
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8695fc209ef1a6d5a37425ba505beb6a
diff --git a/metadata/md5-cache/dev-python/rtslib-fb-2.1.69 b/metadata/md5-cache/dev-python/rtslib-fb-2.1.69
index b2616db5aaae..aa268169eb39 100644
--- a/metadata/md5-cache/dev-python/rtslib-fb-2.1.69
+++ b/metadata/md5-cache/dev-python/rtslib-fb-2.1.69
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyudev[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/rtslib-fb/rtslib-fb-2.1.69.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fa4840d7b7cc98665ccff3369792ffd8
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 ccb7b6a92d51..c9a0a12f8511 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a94ef83f0238f50af6e32ea6fcf9bf7
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4
index bc9f1261e748..50dcadd3cbdb 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/std.pathlib/get/0.6.4.tar.gz -> ruamel-std-pathlib-0.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=790d499e0ec2b6270789d1e6d960fb4c
diff --git a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r1 b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r1
index abe99a4bb646..569cea8c48fd 100644
--- a/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r1
+++ b/metadata/md5-cache/dev-python/ruamel-std-pathlib-0.6.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/std.pathlib/get/0.6.4.tar.gz -> ruamel-std-pathlib-0.6.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=870d9d74428141370235d571b41e1a51
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 775d21084963..d7c2fdfb6605 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.35
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.35.tar.gz -> ruamel-yaml-0.15.35.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=664d52ac994d4906d2c27270348ddd7f
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96 b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96
index 0b6b38874cac..c91be406a51a 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.96
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.96.tar.gz -> ruamel-yaml-0.15.96.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cb83b0ba194b7cd1ae2424852c49baa
diff --git a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.97 b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.97
index dfb6ccbea1d8..70a8906e2f00 100644
--- a/metadata/md5-cache/dev-python/ruamel-yaml-0.15.97
+++ b/metadata/md5-cache/dev-python/ruamel-yaml-0.15.97
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ruamel/yaml/get/0.15.97.tar.gz -> ruamel-yaml-0.15.97.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=981e15d1192c28eaf38480c3b3cb7ccd
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 b951deb44bce..21afed4bf0ee 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 072d2d37325d..b3b930c0558f 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a46b6244996463c1a2d435ded3b3f87d
diff --git a/metadata/md5-cache/dev-python/ryu-4.26 b/metadata/md5-cache/dev-python/ryu-4.26
index dd4ca2d6fa54..2f55bf6ce2ad 100644
--- a/metadata/md5-cache/dev-python/ryu-4.26
+++ b/metadata/md5-cache/dev-python/ryu-4.26
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pbr[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Component-based Software-defined Networking Framework
 EAPI=6
 HOMEPAGE=http://osrg.github.io/ryu/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/r/ryu/ryu-4.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81f41f410c702dde3a6dc54cacdf5908
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e0bcb73cb0f7c9bf096857a7be475fde
diff --git a/metadata/md5-cache/dev-python/ryu-4.26-r1 b/metadata/md5-cache/dev-python/ryu-4.26-r1
index 13ffb13e8fdf..396a70c97c1d 100644
--- a/metadata/md5-cache/dev-python/ryu-4.26-r1
+++ b/metadata/md5-cache/dev-python/ryu-4.26-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Component-based Software-defined Networking Framework
 EAPI=6
 HOMEPAGE=http://osrg.github.io/ryu/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/ryu/ryu-4.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f6d20f319d634ff8deee29df66e39256
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c65d9b0e46c51972730813a519979741
diff --git a/metadata/md5-cache/dev-python/s3fs-0.1.2 b/metadata/md5-cache/dev-python/s3fs-0.1.2
index a7e09e832bed..a25d886fedf3 100644
--- a/metadata/md5-cache/dev-python/s3fs-0.1.2
+++ b/metadata/md5-cache/dev-python/s3fs-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3fs/s3fs-0.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6dc02778dc41fd6724395883a34183a3
diff --git a/metadata/md5-cache/dev-python/s3fs-0.1.5 b/metadata/md5-cache/dev-python/s3fs-0.1.5
index 903324b1729e..291412cc39ad 100644
--- a/metadata/md5-cache/dev-python/s3fs-0.1.5
+++ b/metadata/md5-cache/dev-python/s3fs-0.1.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3fs/s3fs-0.1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=68bec13531d5920427d235084e099550
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.1.13-r1 b/metadata/md5-cache/dev-python/s3transfer-0.1.13-r1
index 15dc6f541206..4568bd9a2df3 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.1.13-r1
+++ b/metadata/md5-cache/dev-python/s3transfer-0.1.13-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.1.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8d9eb8f963916735918e1a3c04e3032e
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.2.0 b/metadata/md5-cache/dev-python/s3transfer-0.2.0
index cbb774e7f2ee..4a57eabbc281 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.2.0
+++ b/metadata/md5-cache/dev-python/s3transfer-0.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe6ba5bbf7160a4da8461ef2d47364a0
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.2.1 b/metadata/md5-cache/dev-python/s3transfer-0.2.1
index 12c2a9e110d3..efd5431ccadc 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.2.1
+++ b/metadata/md5-cache/dev-python/s3transfer-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=572138d946512c4cdbd2a9fc825e5ef3
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.3.1 b/metadata/md5-cache/dev-python/s3transfer-0.3.1
index 0880facd3a98..8622b85efa8c 100644
--- a/metadata/md5-cache/dev-python/s3transfer-0.3.1
+++ b/metadata/md5-cache/dev-python/s3transfer-0.3.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=00fd2e7ae7ab8adf7554e80b38261ea2
diff --git a/metadata/md5-cache/dev-python/sabyenc-3.3.5 b/metadata/md5-cache/dev-python/sabyenc-3.3.5
index cbdcde7318da..3c4cca8dca02 100644
--- a/metadata/md5-cache/dev-python/sabyenc-3.3.5
+++ b/metadata/md5-cache/dev-python/sabyenc-3.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabyenc/tarball/v3.3.5 -> sabyenc-3.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d29229db9a929a5d75683f182652886e
diff --git a/metadata/md5-cache/dev-python/sabyenc-3.3.6 b/metadata/md5-cache/dev-python/sabyenc-3.3.6
index a6055a2dd8bc..1a458d8a7f83 100644
--- a/metadata/md5-cache/dev-python/sabyenc-3.3.6
+++ b/metadata/md5-cache/dev-python/sabyenc-3.3.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabyenc/archive/v3.3.6.tar.gz -> sabyenc-3.3.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=d78a0e9598cf8da67f16bed0ef717be6
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0 b/metadata/md5-cache/dev-python/scandir-1.10.0
index 0415e102820e..a314c2a35144 100644
--- a/metadata/md5-cache/dev-python/scandir-1.10.0
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=90579c360babfd23be229f8e6591e4f9
diff --git a/metadata/md5-cache/dev-python/scandir-1.10.0-r1 b/metadata/md5-cache/dev-python/scandir-1.10.0-r1
index acfe4d905191..b494da3e4b1c 100644
--- a/metadata/md5-cache/dev-python/scandir-1.10.0-r1
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a41b54c73f86f728c85b27b2353ad540
diff --git a/metadata/md5-cache/dev-python/schedule-0.4.2 b/metadata/md5-cache/dev-python/schedule-0.4.2
index 417ef6c6bf43..7dbf99b264c8 100644
--- a/metadata/md5-cache/dev-python/schedule-0.4.2
+++ b/metadata/md5-cache/dev-python/schedule-0.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/schedule/schedule-0.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa813379d5d149ea31afec77d63a95dc
diff --git a/metadata/md5-cache/dev-python/schedule-0.5.0 b/metadata/md5-cache/dev-python/schedule-0.5.0
index 6504fd6e04d6..558afce98e4e 100644
--- a/metadata/md5-cache/dev-python/schedule-0.5.0
+++ b/metadata/md5-cache/dev-python/schedule-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/schedule/schedule-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8dc89873304d31b197f35e4926841561
diff --git a/metadata/md5-cache/dev-python/schema-0.6.6 b/metadata/md5-cache/dev-python/schema-0.6.6
index 2b7536ec6604..e0bc7d0695ef 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10aee4b37e964e0a8ed45d3e47339380
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.10.0 b/metadata/md5-cache/dev-python/scikit-build-0.10.0
new file mode 100644
index 000000000000..155b4c6c873e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/scikit-build-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx-issues[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx-issues[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/packaging[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flake8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/path-py[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-runner[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[testlib,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Improved build system generator for Python C/C++/Fortran/Cython extensions
+EAPI=7
+HOMEPAGE=https://github.com/scikit-build/scikit-build
+IUSE=doc test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/packaging[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/scikit-build/scikit-build-0.10.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e89f0eadb4473b537705a96368c2996d
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 d6bd63ad804d..09e93e671a18 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_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scoop/scoop-0.7.0.release.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe444981a1ee7cc26acd7fe90095dc9e
diff --git a/metadata/md5-cache/dev-python/scp-0.10.2 b/metadata/md5-cache/dev-python/scp-0.10.2
index 2c7486cc80e1..a71272c067e8 100644
--- a/metadata/md5-cache/dev-python/scp-0.10.2
+++ b/metadata/md5-cache/dev-python/scp-0.10.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=scp module for paramiko
 EAPI=6
 HOMEPAGE=https://github.com/jbardin/scp.py
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=LGPL-2
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/paramiko[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/scp/scp-0.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e22aa119136f0b3a32cdc5c517854e46
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4285671b3a9973247be2f51de2b0d6d9
diff --git a/metadata/md5-cache/dev-python/scripttest-1.2-r1 b/metadata/md5-cache/dev-python/scripttest-1.2-r1
index f852d753cf5a..c63531b02f39 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 382da6714706..1ab0b979fbc4 100644
--- a/metadata/md5-cache/dev-python/scripttest-1.3.0
+++ b/metadata/md5-cache/dev-python/scripttest-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/scripttest/archive/1.3.0.tar.gz -> scripttest-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8864d2011e060db30ebd9e741dc33915
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.0 b/metadata/md5-cache/dev-python/scrypt-0.8.0
index 7129f2da2d6d..2488ea986e8c 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4a23465806565c83432fb1501bbc2dfe
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.13 b/metadata/md5-cache/dev-python/scrypt-0.8.13
index ef2ebf622b0b..652fcebafd10 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.13
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11a423048a0cf76d9195491b8c27b7be
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.13-r2 b/metadata/md5-cache/dev-python/scrypt-0.8.13-r2
index 122907a04f04..e1446a1bdb0a 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.13-r2
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.13-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8f57fbcddf92ae0c0363fa33c6181e9e
diff --git a/metadata/md5-cache/dev-python/sdnotify-0.3.1 b/metadata/md5-cache/dev-python/sdnotify-0.3.1
index 18814cf91a34..42938fdfcfa5 100644
--- a/metadata/md5-cache/dev-python/sdnotify-0.3.1
+++ b/metadata/md5-cache/dev-python/sdnotify-0.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of systemd's service notification protocol (sd_notify)
 EAPI=6
 HOMEPAGE=https://github.com/bb4242/sdnotify https://pypi.org/project/sdnotify/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[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
 SRC_URI=mirror://pypi/s/sdnotify/sdnotify-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58d4db57f6f683d84f79e2dd521bffb5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0adb964492c7c68e3a86c61766757f4e
diff --git a/metadata/md5-cache/dev-python/sdnotify-0.3.2 b/metadata/md5-cache/dev-python/sdnotify-0.3.2
index 06283ccc8921..ce460674dcc9 100644
--- a/metadata/md5-cache/dev-python/sdnotify-0.3.2
+++ b/metadata/md5-cache/dev-python/sdnotify-0.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of systemd's service notification protocol (sd_notify)
 EAPI=6
 HOMEPAGE=https://github.com/bb4242/sdnotify https://pypi.org/project/sdnotify/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[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
 SRC_URI=mirror://pypi/s/sdnotify/sdnotify-0.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed2d5e5145baab95a9c922392d1d98a9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0bd923b634bd49e92ad44c5e13973b99
diff --git a/metadata/md5-cache/dev-python/seaborn-0.7.1 b/metadata/md5-cache/dev-python/seaborn-0.7.1
index 6cc05bca82ab..16f902df9aa7 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.7.1
+++ b/metadata/md5-cache/dev-python/seaborn-0.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3cc05a2617ce3f71ffd871dfa4d6478
diff --git a/metadata/md5-cache/dev-python/seaborn-0.8.1 b/metadata/md5-cache/dev-python/seaborn-0.8.1
index afbf23fbce06..37228bdb78b3 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.8.1
+++ b/metadata/md5-cache/dev-python/seaborn-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3cc05a2617ce3f71ffd871dfa4d6478
diff --git a/metadata/md5-cache/dev-python/seaborn-0.9.0 b/metadata/md5-cache/dev-python/seaborn-0.9.0
index 3304c028dc6e..627af0a597b3 100644
--- a/metadata/md5-cache/dev-python/seaborn-0.9.0
+++ b/metadata/md5-cache/dev-python/seaborn-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/seaborn/seaborn-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3cc05a2617ce3f71ffd871dfa4d6478
diff --git a/metadata/md5-cache/dev-python/secretstorage-2.3.1 b/metadata/md5-cache/dev-python/secretstorage-2.3.1
index a0dc51235ac3..10f53cb7c05a 100644
--- a/metadata/md5-cache/dev-python/secretstorage-2.3.1
+++ b/metadata/md5-cache/dev-python/secretstorage-2.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API.
 EAPI=6
 HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-2.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f003dd094ec10629c4e451c249c89b4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b4bcc1894c9524b73fb5d6e270fd2f9
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.0 b/metadata/md5-cache/dev-python/secretstorage-3.1.0
index 55eafe3e7ede..bfb6b27d6558 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.0
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=84142962bcc9eb6b4668fe8f6751f9ab
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.1 b/metadata/md5-cache/dev-python/secretstorage-3.1.1
index 5f3197d9f52a..48a964ea7434 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.1
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=84142962bcc9eb6b4668fe8f6751f9ab
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.1-r1 b/metadata/md5-cache/dev-python/secretstorage-3.1.1-r1
index 0ac7025392b6..78bbd94daeb5 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.1-r1
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3ca5c862b095d97a438e88385ecdfbd2
diff --git a/metadata/md5-cache/dev-python/selectors34-1.2 b/metadata/md5-cache/dev-python/selectors34-1.2
index e695bfc0dece..d47b89ba7160 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_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/selectors34/selectors34-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fc0f8f2656bc9cf7c2d4ef2afa7fad1
diff --git a/metadata/md5-cache/dev-python/selenium-3.0.2 b/metadata/md5-cache/dev-python/selenium-3.0.2
index 1c65fd5acb9f..f1737055b256 100644
--- a/metadata/md5-cache/dev-python/selenium-3.0.2
+++ b/metadata/md5-cache/dev-python/selenium-3.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python language binding for Selenium Remote Control
 EAPI=6
 HOMEPAGE=http://www.seleniumhq.org
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 arm ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/s/selenium/selenium-3.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c98cc8861a764678807e89f182c41b48
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3437a0187d6ebb8743d1576aa744fd3
diff --git a/metadata/md5-cache/dev-python/selenium-3.13.0 b/metadata/md5-cache/dev-python/selenium-3.13.0
index f855dd5b8369..23bc0979392e 100644
--- a/metadata/md5-cache/dev-python/selenium-3.13.0
+++ b/metadata/md5-cache/dev-python/selenium-3.13.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python language binding for Selenium Remote Control
 EAPI=6
 HOMEPAGE=http://www.seleniumhq.org
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.13.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea7a5e2154f7d02b200ed4a204694ce9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c12ec28a2d6ec96179e9d9b9fe9f2ad
diff --git a/metadata/md5-cache/dev-python/selenium-3.141.0 b/metadata/md5-cache/dev-python/selenium-3.141.0
index b9c701402f1c..c226905d0783 100644
--- a/metadata/md5-cache/dev-python/selenium-3.141.0
+++ b/metadata/md5-cache/dev-python/selenium-3.141.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python language binding for Selenium Remote Control
 EAPI=7
 HOMEPAGE=http://www.seleniumhq.org
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.141.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=28b22c0edf60a52dfaf6c4d2c1aae54c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=eaf35867df0503e74d679698b2cfb31a
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.2 b/metadata/md5-cache/dev-python/semantic_version-2.8.2
index d8bb0d13fa3e..ed13ff2bd17a 100644
--- a/metadata/md5-cache/dev-python/semantic_version-2.8.2
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python library providing a few tools handling SemVer in Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/semantic_version/
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=231d53bf26c25058ee5eaa95015b6ae6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9ff505f3273238da28966091d2215a14
diff --git a/metadata/md5-cache/dev-python/semantic_version-2.8.4 b/metadata/md5-cache/dev-python/semantic_version-2.8.4
new file mode 100644
index 000000000000..83be9f40a950
--- /dev/null
+++ b/metadata/md5-cache/dev-python/semantic_version-2.8.4
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Python library providing a few tools handling SemVer in Python
+EAPI=7
+HOMEPAGE=https://pypi.org/project/semantic_version/
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/semantic_version/semantic_version-2.8.4.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=00c7c3fd7a4829d23dce7daf5d4c0def
diff --git a/metadata/md5-cache/dev-python/semver-2.8.1 b/metadata/md5-cache/dev-python/semver-2.8.1
index 71adf5b90e19..7ed9af2a18b2 100644
--- a/metadata/md5-cache/dev-python/semver-2.8.1
+++ b/metadata/md5-cache/dev-python/semver-2.8.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python module for semantic versioning
 EAPI=7
 HOMEPAGE=https://github.com/k-bx/python-semver
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-bx/python-semver/archive/2.8.1.tar.gz -> semver-2.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d80fc3afb105dabaead5ab85d1e80731
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9afc4fd077b3d7cc42d4cc79cb1c6eaf
diff --git a/metadata/md5-cache/dev-python/semver-2.9.0 b/metadata/md5-cache/dev-python/semver-2.9.0
index fd538d306e49..a80618645cf1 100644
--- a/metadata/md5-cache/dev-python/semver-2.9.0
+++ b/metadata/md5-cache/dev-python/semver-2.9.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python module for semantic versioning
 EAPI=7
 HOMEPAGE=https://github.com/k-bx/python-semver
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/k-bx/python-semver/archive/2.9.0.tar.gz -> semver-2.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=09357adba14740049e9fa2552fe851a3
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1d3d6c7505411dccd6d1b6af875aac35
diff --git a/metadata/md5-cache/dev-python/send2trash-1.3.0 b/metadata/md5-cache/dev-python/send2trash-1.3.0
index 7032668f2487..78d7e64f2e21 100644
--- a/metadata/md5-cache/dev-python/send2trash-1.3.0
+++ b/metadata/md5-cache/dev-python/send2trash-1.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Sends files to the Trash (or Recycle Bin)
 EAPI=5
 HOMEPAGE=http://hg.hardcoded.net/send2trash https://pypi.org/project/Send2Trash/ https://github.com/hsoft/send2trash
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Send2Trash/Send2Trash-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96d4ee2d43bf96fd55e8785054865a2c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d9d208bdb9cb367536ec00365b3444b
diff --git a/metadata/md5-cache/dev-python/send2trash-1.5.0 b/metadata/md5-cache/dev-python/send2trash-1.5.0
index dc0ed5a88dfe..e902762a54b9 100644
--- a/metadata/md5-cache/dev-python/send2trash-1.5.0
+++ b/metadata/md5-cache/dev-python/send2trash-1.5.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Sends files to the Trash (or Recycle Bin)
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Send2Trash/ https://github.com/hsoft/send2trash
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Send2Trash/Send2Trash-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b46a1282c0fe7839e591f80165c72fc3
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=90cac1de3093e7f4f0f68af505526a5d
diff --git a/metadata/md5-cache/dev-python/serpent-1.19 b/metadata/md5-cache/dev-python/serpent-1.19
index 2c75708172b8..526432d45c91 100644
--- a/metadata/md5-cache/dev-python/serpent-1.19
+++ b/metadata/md5-cache/dev-python/serpent-1.19
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A simple serialization library based on ast.literal_eval
 EAPI=7
 HOMEPAGE=https://pypi.org/project/serpent/ https://github.com/irmen/Serpent
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.19.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=afdfddf71e48b81d7c0cd649db7d34fc
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d09d45e3ef863c4bbb2b2adad8297b0a
diff --git a/metadata/md5-cache/dev-python/serpent-1.28 b/metadata/md5-cache/dev-python/serpent-1.28
index ed3ed5c6dc36..d73efa8cf409 100644
--- a/metadata/md5-cache/dev-python/serpent-1.28
+++ b/metadata/md5-cache/dev-python/serpent-1.28
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A simple serialization library based on ast.literal_eval
 EAPI=7
 HOMEPAGE=https://pypi.org/project/serpent/ https://github.com/irmen/Serpent
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.28.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9a9cc52e92a14bbda1737114c9e9d658
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8dbe0e6e30d5b945735112dea7bf3789
diff --git a/metadata/md5-cache/dev-python/serpent-1.30 b/metadata/md5-cache/dev-python/serpent-1.30
index 22468cf079e6..05ff98777f44 100644
--- a/metadata/md5-cache/dev-python/serpent-1.30
+++ b/metadata/md5-cache/dev-python/serpent-1.30
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/serpent/serpent-1.30.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b47e7387b87324deb2dd8300b35a526f
diff --git a/metadata/md5-cache/dev-python/serverfiles-0.2.1 b/metadata/md5-cache/dev-python/serverfiles-0.2.1
index 720eeb6f534e..69e8eb6001bf 100644
--- a/metadata/md5-cache/dev-python/serverfiles-0.2.1
+++ b/metadata/md5-cache/dev-python/serverfiles-0.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/biolab/serverfiles/archive/0.2.1.tar.gz -> serverfiles-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=54f5245f182813439a518238c1a37162
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 c46f50e6de01..a10d17b72a35 100644
--- a/metadata/md5-cache/dev-python/service_identity-14.0.0
+++ b/metadata/md5-cache/dev-python/service_identity-14.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/service_identity/service_identity-14.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9443f7f06fb2ff60a2d647a359ed393e
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 92abe587052d..8e596ec0d8e9 100644
--- a/metadata/md5-cache/dev-python/service_identity-16.0.0
+++ b/metadata/md5-cache/dev-python/service_identity-16.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/service_identity/service_identity-16.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d06483b8095027866c297e629ca1f399
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 41ab158d7f3d..f5f23c30039b 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/service_identity/service_identity-17.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8711b698957c493bba74e955646b9b80
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 65b8207dd929..a5f0c3ccf367 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c31596a7784dcf6ea582bf4485fe2230
diff --git a/metadata/md5-cache/dev-python/service_identity-18.1.0 b/metadata/md5-cache/dev-python/service_identity-18.1.0
index 151e6b289471..c9339d91cfad 100644
--- a/metadata/md5-cache/dev-python/service_identity-18.1.0
+++ b/metadata/md5-cache/dev-python/service_identity-18.1.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/attrs[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Service identity verification for pyOpenSSL
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pyca/service-identity/archive/18.1.0.tar.gz -> service_identity-18.1.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=231cb59d9fa74e23218be4cff51c0fce
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.10 b/metadata/md5-cache/dev-python/setproctitle-1.1.10
index 4514f99b3278..990ca2fc7370 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.10
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4347039a79c7d896fa89f60c1f205723
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1 b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
index d52ee0d1934b..19652ab05079 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.10-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fef1664223acf6ae95206a3c26afa249
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.8 b/metadata/md5-cache/dev-python/setproctitle-1.1.8
index 695cc2f18fc7..19274d87685f 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.8
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b539d4204178c95fb9c5f7944382dad
diff --git a/metadata/md5-cache/dev-python/setuptools-40.6.3 b/metadata/md5-cache/dev-python/setuptools-40.6.3
deleted file mode 100644
index 264de8f1eb83..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-40.6.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip test? ( dev-python/pip[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytest-3.1.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/backports-unittest-mock-1.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-futures[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=6
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
-IUSE=test python_targets_pypy3 python_targets_python2_7 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-40.6.3.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ecc8cfb70cced66887ff814953791502
diff --git a/metadata/md5-cache/dev-python/setuptools-42.0.2 b/metadata/md5-cache/dev-python/setuptools-42.0.2
index cbcbdcc96a2e..ba897834772d 100644
--- a/metadata/md5-cache/dev-python/setuptools-42.0.2
+++ b/metadata/md5-cache/dev-python/setuptools-42.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-42.0.2.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f1390e60a7ca6ab82b16668df218bc03
diff --git a/metadata/md5-cache/dev-python/setuptools-44.0.0 b/metadata/md5-cache/dev-python/setuptools-44.0.0
index e9305bf58402..f5951474eca1 100644
--- a/metadata/md5-cache/dev-python/setuptools-44.0.0
+++ b/metadata/md5-cache/dev-python/setuptools-44.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-44.0.0.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fc63fbf5c0e9eb2bf10c34aa4a42ffba
diff --git a/metadata/md5-cache/dev-python/setuptools-45.0.0 b/metadata/md5-cache/dev-python/setuptools-45.0.0
deleted file mode 100644
index 60c272e25a3e..000000000000
--- a/metadata/md5-cache/dev-python/setuptools-45.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-3.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-futures[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of extensions to Distutils
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools/setuptools-45.0.0.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=137e220fa7c7b3c9d512f614ed5ba13f
diff --git a/metadata/md5-cache/dev-python/setuptools-45.1.0 b/metadata/md5-cache/dev-python/setuptools-45.1.0
index ad1bcefc7881..15b6e9e3fd26 100644
--- a/metadata/md5-cache/dev-python/setuptools-45.1.0
+++ b/metadata/md5-cache/dev-python/setuptools-45.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools/setuptools-45.1.0.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=137e220fa7c7b3c9d512f614ed5ba13f
diff --git a/metadata/md5-cache/dev-python/setuptools-45.2.0 b/metadata/md5-cache/dev-python/setuptools-45.2.0
new file mode 100644
index 000000000000..3642cf02dd6e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-45.2.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-3.7.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-fixture-config[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-virtualenv[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-futures[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of extensions to Distutils
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0=[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-45.2.0.zip
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=eaec7e6e89ed4e68cc57abc05785ad9a
diff --git a/metadata/md5-cache/dev-python/setuptools-git-1.2 b/metadata/md5-cache/dev-python/setuptools-git-1.2
index e8aac39febfd..9974dc498755 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools-git/setuptools-git-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0927740d405bd8d9718cea0b022ce0eb
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 22064afdfca8..c222d2b2c5cb 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_python3_6? ( dev-lang/python:3.6 ) >=de
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_hg/setuptools_hg-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a689cda16c9ec968fedebc4feae8ad62
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 55509e1ab73a..d48cca1ed1ca 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.15.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e8b0120d633dab4a20c6000d04967793
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 eb298307fcf0..41b641292963 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-1.15.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94bd724bb04042769b26f022515ee272
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-3.2.0 b/metadata/md5-cache/dev-python/setuptools_scm-3.2.0
index 5e53cf05bfbc..ac3b6fdd43b4 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-3.2.0
+++ b/metadata/md5-cache/dev-python/setuptools_scm-3.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-3.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6e367ddf0a9d499647f8340c9067a505
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-3.3.1 b/metadata/md5-cache/dev-python/setuptools_scm-3.3.1
index dc2df49e092f..20129d8f734e 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-3.3.1
+++ b/metadata/md5-cache/dev-python/setuptools_scm-3.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-3.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89f08558fe1fd04bb82d19585497bbcd
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-3.4.2 b/metadata/md5-cache/dev-python/setuptools_scm-3.4.2
index d8a96e29e4d0..51d99c5f52a0 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-3.4.2
+++ b/metadata/md5-cache/dev-python/setuptools_scm-3.4.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-3.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a62fcf9896bd79d72bbc9eb911be391e
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-3.4.3 b/metadata/md5-cache/dev-python/setuptools_scm-3.4.3
index 63dac81c0b27..a1d21816f628 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm-3.4.3
+++ b/metadata/md5-cache/dev-python/setuptools_scm-3.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-3.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a62fcf9896bd79d72bbc9eb911be391e
diff --git a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0 b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
index ff77d2f2af8e..b3e82e5f7fdf 100644
--- a/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
+++ b/metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/Changaco/setuptools_scm_git_archive/archive/1.0.tar.gz -> setuptools_scm_git_archive-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=029cb65aa4addfd030048df8cdecb885
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 c5355e2ea5ac..1a3694e05dda 100644
--- a/metadata/md5-cache/dev-python/setuptools_trial-0.6.0
+++ b/metadata/md5-cache/dev-python/setuptools_trial-0.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/pathlib2[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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-16.0.0[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Setuptools plugin that makes unit tests execute with trial instead of pyunit
 EAPI=6
 HOMEPAGE=https://github.com/rutsky/setuptools-trial https://pypi.org/project/setuptools_trial/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/pathlib2[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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-16.0.0[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
 SRC_URI=mirror://pypi/s/setuptools_trial/setuptools_trial-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bd47b023b3fff8aeaa9ddc75265c5d5e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e0fb8613365ca7739e8891d0c7f009bd
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 b73e48265e66..60dc84e83ece 100644
--- a/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
+++ b/metadata/md5-cache/dev-python/sexpdata-0.0.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=a simple S-expression parser/serializer
 EAPI=6
 HOMEPAGE=https://github.com/tkf/sexpdata
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tkf/sexpdata/archive/v0.0.3.tar.gz -> sexpdata-0.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ccdac2a3ba66ba2ad6eff1218728f416
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26d7e24b941d0f0f791533f5a4a4486f
diff --git a/metadata/md5-cache/dev-python/sh-1.12.14 b/metadata/md5-cache/dev-python/sh-1.12.14
index fa8ddbf789d4..5c7bc23298d2 100644
--- a/metadata/md5-cache/dev-python/sh-1.12.14
+++ b/metadata/md5-cache/dev-python/sh-1.12.14
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python subprocess interface
 EAPI=7
 HOMEPAGE=https://github.com/amoffat/sh
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sh/sh-1.12.14.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fb75e75c05e82c21c7e8cd3287e572ac
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=93c3477e6125dcdcc6d53bff14b36813
diff --git a/metadata/md5-cache/dev-python/shutilwhich-1.1.0 b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
index cd9abf421dc5..8e1f45653ea1 100644
--- a/metadata/md5-cache/dev-python/shutilwhich-1.1.0
+++ b/metadata/md5-cache/dev-python/shutilwhich-1.1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A copy & paste backport of Python 3.3's shutil.which function
 EAPI=6
 HOMEPAGE=https://pypi.org/project/shutilwhich/ https://github.com/mbr/shutilwhich
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=PSF-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/shutilwhich/shutilwhich-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d4695e1391051c69c3f4757e815f0a1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=159bd71367ae3e397976ba35e3b8f6f4
diff --git a/metadata/md5-cache/dev-python/simplebayes-1.5.7 b/metadata/md5-cache/dev-python/simplebayes-1.5.7
index ad17e25df8dd..de25c472830c 100644
--- a/metadata/md5-cache/dev-python/simplebayes-1.5.7
+++ b/metadata/md5-cache/dev-python/simplebayes-1.5.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=memory-based, optional-persistence naive bayesian text classifier
 EAPI=6
 HOMEPAGE=https://github.com/hickeroar/simplebayes
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hickeroar/simplebayes/archive/1.5.7.tar.gz -> simplebayes-1.5.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c753c1de2c486c1b4496603633cd067
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cd04fb673c33bbf3b5dce6888c39b6af
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.10 b/metadata/md5-cache/dev-python/simpleeval-0.9.10
index 5bce5e831f3c..98d7347c9367 100644
--- a/metadata/md5-cache/dev-python/simpleeval-0.9.10
+++ b/metadata/md5-cache/dev-python/simpleeval-0.9.10
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6034d4059b521d6313f8e0ce05cd261a
diff --git a/metadata/md5-cache/dev-python/simpleeval-0.9.8 b/metadata/md5-cache/dev-python/simpleeval-0.9.8
index 9b903994b1eb..b19a2deac592 100644
--- a/metadata/md5-cache/dev-python/simpleeval-0.9.8
+++ b/metadata/md5-cache/dev-python/simpleeval-0.9.8
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpleeval/simpleeval-0.9.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0793bc3933abd23c8761e508156b1265
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 0333441183da..119f223bae17 100644
--- a/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/simplegeneric-0.8.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Simple generic functions for Python
 EAPI=5
 HOMEPAGE=https://pypi.org/project/simplegeneric/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ZPL
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplegeneric/simplegeneric-0.8.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7c52ec42050e65cf65ecc461f0b861e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a374f9e4aaa25c392eea25ce4c91ece1
diff --git a/metadata/md5-cache/dev-python/simplejson-3.16.0 b/metadata/md5-cache/dev-python/simplejson-3.16.0
index 1073d3d197f0..49f6d4dd4bf8 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1acc467f2d13b1e99d7f6f3999f878e3
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.0 b/metadata/md5-cache/dev-python/simplejson-3.17.0
index ed52749f1afd..9f54042248ae 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.17.0
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.0
@@ -4,11 +4,11 @@ DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
 EAPI=7
 HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
 IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( MIT AFL-2.1 )
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=85a11d2e732424c689d25f932f27b096
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a43124501260559d07bd2169985121fd
diff --git a/metadata/md5-cache/dev-python/simplekml-1.3.1 b/metadata/md5-cache/dev-python/simplekml-1.3.1
index 1eb66f6b17e5..f7876490d010 100644
--- a/metadata/md5-cache/dev-python/simplekml-1.3.1
+++ b/metadata/md5-cache/dev-python/simplekml-1.3.1
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=enables you to generate KML with as little effort as possible
 EAPI=7
 HOMEPAGE=https://pypi.org/project/simplekml/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplekml/simplekml-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2068a7b98eec77ddfe9867949e951beb
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9f5eeaea559190f02d96a76a6eb3d4da
diff --git a/metadata/md5-cache/dev-python/simplekv-0.11.11 b/metadata/md5-cache/dev-python/simplekv-0.11.11
index fe0e24c4676e..02f001c00776 100644
--- a/metadata/md5-cache/dev-python/simplekv-0.11.11
+++ b/metadata/md5-cache/dev-python/simplekv-0.11.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/simplekv/simplekv-0.11.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7c3d86060ab73d3a6929eb635ff3fd4f
diff --git a/metadata/md5-cache/dev-python/simplekv-0.9.2 b/metadata/md5-cache/dev-python/simplekv-0.9.2
index ad92659e73c1..e7864fc9ded8 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c9dddea87973492dcf43b14486df568
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 43c4b5c5dd4f..24cb7a9ad60c 100644
--- a/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/simplesoapy-1.5.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/simplesoapy/archive/v1.5.1.tar.gz -> simplesoapy-1.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=08f8a2f78e18fd2ee42bc976803bb916
diff --git a/metadata/md5-cache/dev-python/simplesoapy-9999 b/metadata/md5-cache/dev-python/simplesoapy-9999
index 7872c7f79f8a..c000972299b0 100644
--- a/metadata/md5-cache/dev-python/simplesoapy-9999
+++ b/metadata/md5-cache/dev-python/simplesoapy-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-wireless/soapysdr[python] net-wireless/soapysdr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=08f8a2f78e18fd2ee42bc976803bb916
diff --git a/metadata/md5-cache/dev-python/simplespectral-1.0.0 b/metadata/md5-cache/dev-python/simplespectral-1.0.0
index 47fee6be5d01..8afe3616401b 100644
--- a/metadata/md5-cache/dev-python/simplespectral-1.0.0
+++ b/metadata/md5-cache/dev-python/simplespectral-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/xmikos/simplespectral/archive/v1.0.0.tar.gz -> simplespectral-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3951a09063483afd71d3725bdc89b28b
diff --git a/metadata/md5-cache/dev-python/simplespectral-9999 b/metadata/md5-cache/dev-python/simplespectral-9999
index b63606852225..ece49b4c2adf 100644
--- a/metadata/md5-cache/dev-python/simplespectral-9999
+++ b/metadata/md5-cache/dev-python/simplespectral-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] faster? ( sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) fastest? ( dev-python/pyFFTW[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3951a09063483afd71d3725bdc89b28b
diff --git a/metadata/md5-cache/dev-python/simpy-3.0.8 b/metadata/md5-cache/dev-python/simpy-3.0.8
index 749fc8b0782e..311475842c78 100644
--- a/metadata/md5-cache/dev-python/simpy-3.0.8
+++ b/metadata/md5-cache/dev-python/simpy-3.0.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/simpy/simpy-3.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97d3ab1b4f3c99d9c6b9bdd6c6808966
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 1312727e3573..67aa606c33fe 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_python2_7(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/singledispatch/singledispatch-3.4.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f40569ec18ef41c25dfd9d2bf1a40936
diff --git a/metadata/md5-cache/dev-python/six-1.12.0 b/metadata/md5-cache/dev-python/six-1.12.0
index ad7ae0d01e6f..690295ecdbd1 100644
--- a/metadata/md5-cache/dev-python/six-1.12.0
+++ b/metadata/md5-cache/dev-python/six-1.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8cddf622d9525857000377deca638e6e
diff --git a/metadata/md5-cache/dev-python/six-1.13.0 b/metadata/md5-cache/dev-python/six-1.13.0
index 5ec1bc218ab0..5308851878d6 100644
--- a/metadata/md5-cache/dev-python/six-1.13.0
+++ b/metadata/md5-cache/dev-python/six-1.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=565e171161db69f6eb91a29d86debae1
diff --git a/metadata/md5-cache/dev-python/six-1.14.0 b/metadata/md5-cache/dev-python/six-1.14.0
index ee20d4ba3d19..2b06f749fb4d 100644
--- a/metadata/md5-cache/dev-python/six-1.14.0
+++ b/metadata/md5-cache/dev-python/six-1.14.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.14.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=101db1e1edf139f222c412fc8b8ec942
diff --git a/metadata/md5-cache/dev-python/slackclient-1.2.0 b/metadata/md5-cache/dev-python/slackclient-1.2.0
index 45088d1b9dae..a984b35dd382 100644
--- a/metadata/md5-cache/dev-python/slackclient-1.2.0
+++ b/metadata/md5-cache/dev-python/slackclient-1.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/websocket-client-0.35[python_targets_python3_6(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/slackclient/slackclient-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8a87e01c532ce8adb746f3e3f4c8a4cb
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 3e69357dc3d0..a036fe3e203e 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_python2_7(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c5dc880f8e741f5678717ce4967b82d9
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 57e9bd4f853e..e0ddff667861 100644
--- a/metadata/md5-cache/dev-python/slimit-0.8.1-r1
+++ b/metadata/md5-cache/dev-python/slimit-0.8.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rspivak/slimit/archive/0.8.1.tar.gz -> slimit-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6581c88275e35b733ee82039019f0e0b
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.4.0 b/metadata/md5-cache/dev-python/slixmpp-1.4.0
index 3d7964956e4e..05ad3158f774 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.4.0
+++ b/metadata/md5-cache/dev-python/slixmpp-1.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bcfddc037f32ce5ed294a3076480507d
diff --git a/metadata/md5-cache/dev-python/slixmpp-1.4.2 b/metadata/md5-cache/dev-python/slixmpp-1.4.2
index 52c754c52f62..8fcd2b98be92 100644
--- a/metadata/md5-cache/dev-python/slixmpp-1.4.2
+++ b/metadata/md5-cache/dev-python/slixmpp-1.4.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/slixmpp/slixmpp-1.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f01752514dfc9497a338241b2e1cf75c
diff --git a/metadata/md5-cache/dev-python/slixmpp-9999 b/metadata/md5-cache/dev-python/slixmpp-9999
index b23fca8855ad..fd1afb0ad9bc 100644
--- a/metadata/md5-cache/dev-python/slixmpp-9999
+++ b/metadata/md5-cache/dev-python/slixmpp-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/aiodns[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f01752514dfc9497a338241b2e1cf75c
diff --git a/metadata/md5-cache/dev-python/smmap-0.9.0 b/metadata/md5-cache/dev-python/smmap-0.9.0
index dc23ab894fea..34037744a556 100644
--- a/metadata/md5-cache/dev-python/smmap-0.9.0
+++ b/metadata/md5-cache/dev-python/smmap-0.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap/smmap-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ebb091c475abcba89e4d9e34923477f
diff --git a/metadata/md5-cache/dev-python/smmap2-2.0.3 b/metadata/md5-cache/dev-python/smmap2-2.0.3
index 499f48449bac..7ebaa2a7c971 100644
--- a/metadata/md5-cache/dev-python/smmap2-2.0.3
+++ b/metadata/md5-cache/dev-python/smmap2-2.0.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A pure python implementation of a sliding window memory map manager
 EAPI=6
 HOMEPAGE=https://pypi.org/project/smmap2/ https://github.com/gitpython-developers/smmap
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 ~x86
 LICENSE=BSD
-RDEPEND=!dev-python/smmap[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=!dev-python/smmap[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/smmap2/smmap2-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e5932fcdce16f8a1353f242e4b32dc1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a91a9df138af9d82af8b089c9fb34ef
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.7.5 b/metadata/md5-cache/dev-python/snakeoil-0.7.5
index 835fdfa52fd8..bc05328872d4 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.7.5
+++ b/metadata/md5-cache/dev-python/snakeoil-0.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pkgcore/snakeoil/releases/download/v0.7.5/snakeoil-0.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18596db0a244fc44d202534f63464509
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.8.5 b/metadata/md5-cache/dev-python/snakeoil-0.8.5
deleted file mode 100644
index c302a2614edb..000000000000
--- a/metadata/md5-cache/dev-python/snakeoil-0.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=misc common functionality and useful optimizations
-EAPI=6
-HOMEPAGE=https://github.com/pkgcore/snakeoil
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
-LICENSE=BSD BSD-2 MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.8.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b4f6b6396878fdbdcc0da5d82338077
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.8.7 b/metadata/md5-cache/dev-python/snakeoil-0.8.7
index b47324d3aec2..509072284cdb 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.8.7
+++ b/metadata/md5-cache/dev-python/snakeoil-0.8.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.8.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3aef1f99dcd747debc9c44e76af281d9
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.8.8 b/metadata/md5-cache/dev-python/snakeoil-0.8.8
new file mode 100644
index 000000000000..77825232cb3d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.8.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=BSD BSD-2 MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.8.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3aef1f99dcd747debc9c44e76af281d9
diff --git a/metadata/md5-cache/dev-python/snakeoil-9999 b/metadata/md5-cache/dev-python/snakeoil-9999
index 4f46e185dd1f..f07b39f7136c 100644
--- a/metadata/md5-cache/dev-python/snakeoil-9999
+++ b/metadata/md5-cache/dev-python/snakeoil-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_tar
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b4f6b6396878fdbdcc0da5d82338077
diff --git a/metadata/md5-cache/dev-python/snaketrace-0.1.1 b/metadata/md5-cache/dev-python/snaketrace-0.1.1
index 6f428579f2af..836cf5c6d639 100644
--- a/metadata/md5-cache/dev-python/snaketrace-0.1.1
+++ b/metadata/md5-cache/dev-python/snaketrace-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/dcoles/snaketrace/archive/v0.1.1.tar.gz -> snaketrace-0.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=529c9f2561258d3c845fbba05e4df787
diff --git a/metadata/md5-cache/dev-python/snappy-0.5-r2 b/metadata/md5-cache/dev-python/snappy-0.5-r2
index 8e0ff5f44f2e..c81bb53692dc 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07e9c8d1dd684aa7036d4e6bad3b8b63
diff --git a/metadata/md5-cache/dev-python/snappy-0.5.1 b/metadata/md5-cache/dev-python/snappy-0.5.1
index 5b4a52d91a2e..8362d7f56b7d 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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-snappy/python-snappy-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f8ddead1d40379f5aaf16de331a3511
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-1.2.0 b/metadata/md5-cache/dev-python/snowballstemmer-1.2.0
index 8368e7d82748..ae01e8071b65 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59f6c445f1cb0bd87708f2cf1efb026b
diff --git a/metadata/md5-cache/dev-python/snowballstemmer-1.2.1 b/metadata/md5-cache/dev-python/snowballstemmer-1.2.1
index 39ba0fa27ff1..506ca88c0487 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/snowballstemmer/snowballstemmer-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c95925ca8ba82b8a285dbb038212e8e7
diff --git a/metadata/md5-cache/dev-python/soappy-0.12.22 b/metadata/md5-cache/dev-python/soappy-0.12.22
index 77074d906560..57dbc832880d 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e23090414c153f6351fd345c188b608
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 feee3bc200fc..2840ef121e8c 100644
--- a/metadata/md5-cache/dev-python/socketio-client-0.6.6
+++ b/metadata/md5-cache/dev-python/socketio-client-0.6.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/websocket-client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/coverage[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A socket.io client library for Python
 EAPI=5
 HOMEPAGE=https://github.com/invisibleroads/socketIO-client/ https://pypi.org/project/socketIO-client/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/websocket-client[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/websocket-client[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 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a52a1fe6a3a00226ea2547226c161ee4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af5885f80fd4d6a33f4178065bfdd4f9
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 384dccd04a80..2243e06e237a 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_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6df46635c33ca5123a6ed973a4d2f0b0
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3 b/metadata/md5-cache/dev-python/socketpool-0.5.3
index 15266f428b91..7aeafe4a595b 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9307b637cf6a882f02fbcd6b47f459db
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3-r1 b/metadata/md5-cache/dev-python/socketpool-0.5.3-r1
index 05a053e9e25f..bd3b6a9ab53a 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3-r1
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=69d2e6c05020bafc4c10d4e926074f07
diff --git a/metadata/md5-cache/dev-python/socketpool-0.5.3-r2 b/metadata/md5-cache/dev-python/socketpool-0.5.3-r2
index b0483686831e..c63c3cb4ecb3 100644
--- a/metadata/md5-cache/dev-python/socketpool-0.5.3-r2
+++ b/metadata/md5-cache/dev-python/socketpool-0.5.3-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A simple Python socket pool
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/socketpool/socketpool-0.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f68af6a58cad445d52ca0c37c23e1ddd
diff --git a/metadata/md5-cache/dev-python/sortedcollections-0.5.3 b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
index 37412bdb698a..f0b5b575a47a 100644
--- a/metadata/md5-cache/dev-python/sortedcollections-0.5.3
+++ b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/sortedcontainers[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(-)] test? ( dev-python/pytest[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(-)] )
+DEPEND=dev-python/sortedcontainers[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python library to sort collections and containers
 EAPI=7
 HOMEPAGE=http://www.grantjenks.com/docs/sortedcontainers/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/sortedcontainers[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sortedcollections/sortedcollections-0.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=10e52b993dd4772fb6fe889a1632a590
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a0f12cd85eefb860c777e125df766c40
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-1.5.7 b/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
index d61e3a25c360..9c477cfe2190 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
+++ b/metadata/md5-cache/dev-python/sortedcontainers-1.5.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sortedcontainers/sortedcontainers-1.5.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cf622b16fafb62fa7161f5bd646f5e01
diff --git a/metadata/md5-cache/dev-python/sortedcontainers-2.1.0 b/metadata/md5-cache/dev-python/sortedcontainers-2.1.0
index 44fa7c6b6abf..9031d81d9bb1 100644
--- a/metadata/md5-cache/dev-python/sortedcontainers-2.1.0
+++ b/metadata/md5-cache/dev-python/sortedcontainers-2.1.0
@@ -4,12 +4,12 @@ DESCRIPTION=Python library to sort collections and containers
 EAPI=7
 HOMEPAGE=http://www.grantjenks.com/docs/sortedcontainers/ https://pypi.org/project/sortedcontainers/ https://github.com/grantjenks/python-sortedcontainers/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~arm64 ~hppa sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/grantjenks/python-sortedcontainers/archive/v2.1.0.tar.gz -> python-sortedcontainers-2.1.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=452dcd1ee7e6ff68adf98e3253241ef5
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9b4764d3762a97befefdb0c24864da69
diff --git a/metadata/md5-cache/dev-python/soupsieve-1.9.5 b/metadata/md5-cache/dev-python/soupsieve-1.9.5
index 7725bc4f35d5..79d6ddcc5ebf 100644
--- a/metadata/md5-cache/dev-python/soupsieve-1.9.5
+++ b/metadata/md5-cache/dev-python/soupsieve-1.9.5
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/beautifulsoup[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/beautifulsoup[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/soupsieve/archive/1.9.5.tar.gz -> soupsieve-1.9.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=de318d5ce365e3aab42bb5606a897820
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 59ba9f0c5d70..1b6865626bd4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=65ef3d8d2e9e018b12f840e720623bcf
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 e641cf6f9583..1943ab8bb2a2 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.6.1
+++ b/metadata/md5-cache/dev-python/spark-parser-1.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=An Early-Algorithm Context-free grammar Parser
 EAPI=6
 HOMEPAGE=https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dcae88153246a462e34b914177389d95
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d123178381d468fec0271ca82d0b1390
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 9f5cab1c85a8..8433e6447574 100644
--- a/metadata/md5-cache/dev-python/spark-parser-1.8.5
+++ b/metadata/md5-cache/dev-python/spark-parser-1.8.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=An Early-Algorithm Context-free grammar Parser
 EAPI=6
 HOMEPAGE=https://github.com/rocky/python-spark/ https://pypi.org/project/spark_parser/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/spark_parser/spark_parser-1.8.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dcae88153246a462e34b914177389d95
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d123178381d468fec0271ca82d0b1390
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 23c1abb8d0c2..6d19e443667b 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f90c7323c2ba302aeb259c9e8a3ce221
diff --git a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.4 b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.4
index a71b5f9865df..a0b72ce5cd81 100644
--- a/metadata/md5-cache/dev-python/sparql-wrapper-1.8.4
+++ b/metadata/md5-cache/dev-python/sparql-wrapper-1.8.4
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/rdflib-4[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-1.8.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b7773b377a3803178991ba60388bf39f
diff --git a/metadata/md5-cache/dev-python/speaklater-1.3-r1 b/metadata/md5-cache/dev-python/speaklater-1.3-r1
index 3ed4209eb566..bd2bfc3cbf10 100644
--- a/metadata/md5-cache/dev-python/speaklater-1.3-r1
+++ b/metadata/md5-cache/dev-python/speaklater-1.3-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Lazy strings for Python
 EAPI=6
 HOMEPAGE=https://github.com/mitsuhiko/speaklater
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/speaklater/speaklater-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96b43ba712c2dddc7ecc2fbcd1b66cbd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd3a020685fd55e6e1c0d872b9252211
diff --git a/metadata/md5-cache/dev-python/speg-0.3 b/metadata/md5-cache/dev-python/speg-0.3
index 34e90d818e2f..1850e52e6b36 100644
--- a/metadata/md5-cache/dev-python/speg-0.3
+++ b/metadata/md5-cache/dev-python/speg-0.3
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/avakar/speg/archive/v0.3.tar.gz -> speg-0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=23ff5c5375e8d123e3821f59720fb61c
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 8cefbc1d212c..eb62d90f8f5a 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.7.5-r1
+++ b/metadata/md5-cache/dev-python/sphinx-1.7.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7f9923d9528a12e97f10213757738df
diff --git a/metadata/md5-cache/dev-python/sphinx-2.0.1 b/metadata/md5-cache/dev-python/sphinx-2.0.1
index ece64cdcbe5e..3360ad294da9 100644
--- a/metadata/md5-cache/dev-python/sphinx-2.0.1
+++ b/metadata/md5-cache/dev-python/sphinx-2.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5eab7ab4337090e31bd5bcf68f5fad86
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 7f2b75e201c6..184c6562c9e5 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_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-theme/aiohttp-theme-0.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=540dc2f42146b779b4ea73961d602458
diff --git a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.5 b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.5
index 2e7427c49490..b79ce54fe39f 100644
--- a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.5
+++ b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.5
@@ -11,5 +11,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-theme/aiohttp-theme-0.1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9a1220f49cf5a6c02613f0d31bedcb38
diff --git a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6 b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
index a431bab1c69b..4460d44b2191 100644
--- a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
+++ b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.6
@@ -11,5 +11,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/a/aiohttp-theme/aiohttp-theme-0.1.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=19b085310948edbfff669b5f0c55ec06
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 b13b6ab5698c..b69bea9fb2e6 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
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A nice-looking, customizable theme for Sphinx
 EAPI=5
 HOMEPAGE=https://github.com/irskep/sphinx-better-theme https://pypi.org/project/sphinx-better-theme/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/s/sphinx-better-theme/sphinx-better-theme-0.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3954eda3edb3345202b3cfaaadf63fd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3abe2791eec9c86e48adb8ef83837cc
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 a4d65cae796f..5cfcaea3ad60 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b13a483e5e4ec7419ce5079dc0c5af4c
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 3aa26b9b6801..0108d314f0d8 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8776324d3e7d44f136ea4cf664e89ee3
diff --git a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5 b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
index 7d636679b850..441f18c6f6c6 100644
--- a/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
+++ b/metadata/md5-cache/dev-python/sphinx-bootstrap-theme-0.6.5
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.6.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7426c369361449ee608070bcadf2b9fa
diff --git a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4 b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
index a2d6713e0f28..b714de58bf9b 100644
--- a/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
+++ b/metadata/md5-cache/dev-python/sphinx-epytext-0.0.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-epytext/sphinx-epytext-0.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c0d4792fc9a2cb6e194028084091bf10
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 414202cf01c6..794b8f50ca55 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_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-gallery/sphinx-gallery-0.1.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b515a19dc1c490829c01b108a411887b
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.3.1 b/metadata/md5-cache/dev-python/sphinx-gallery-0.3.1
index 045ff383a3b0..af217cfbbbda 100644
--- a/metadata/md5-cache/dev-python/sphinx-gallery-0.3.1
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.3.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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-gallery/sphinx-gallery-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ed4069aa1157e2cd129df20106a64ae
diff --git a/metadata/md5-cache/dev-python/sphinx-issues-1.2.0 b/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
index d0c7f48f7771..4584da6d0678 100644
--- a/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
+++ b/metadata/md5-cache/dev-python/sphinx-issues-1.2.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Sphinx extension for linking to your project's issue tracker
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sloria/sphinx-issues/archive/1.2.0.tar.gz -> sphinx-issues-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5860fcbc3fff87f7d97d08dab00995e0
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 271866fa7fc5..7a39e457753c 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-0.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx-testing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx-testing[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A sphinx extension to include jinja based templates into a sphinx doc
 EAPI=6
 HOMEPAGE=https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c3f3dfb8cad36d9f3e04df96395fb47
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=90d58141e9f0d7709221379476e5bd04
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 cce444a0b991..f1989badb364 100644
--- a/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
+++ b/metadata/md5-cache/dev-python/sphinx-jinja-0.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx-testing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx-testing[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A sphinx extension to include jinja based templates into a sphinx doc
 EAPI=6
 HOMEPAGE=https://github.com/tardyp/sphinx-jinja https://pypi.org/project/sphinx-jinja/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx-1.0[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-jinja/sphinx-jinja-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c3f3dfb8cad36d9f3e04df96395fb47
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=90d58141e9f0d7709221379476e5bd04
diff --git a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.4 b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.4
index a534403798d8..dc72931021b1 100644
--- a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.4
+++ b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.4
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Create a custom 404 page with absolute URLs hardcoded.
 EAPI=7
 HOMEPAGE=https://sphinx-notfound-page.readthedocs.io/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86 ~x64-macos
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-notfound-page/sphinx-notfound-page-0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fbb14990d4ea8676263c4d2591c7b72b
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=33895e0bfb5010fe36f93ccd8222d887
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 b74e418a29c5..e13f5c8fbf31 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5aa9074387a31da34900052c0a4c4ec8
diff --git a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1 b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
index 64db497be585..6c8d5f46b3f7 100644
--- a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
+++ b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ca161aa3bc474cee2436297c21b12f5d
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 7ced5a68f9a5..f4978538b6d2 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-0.7.2
+++ b/metadata/md5-cache/dev-python/sphinx-testing-0.7.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] 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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Testing utility classes and functions for Sphinx extensions
 EAPI=6
 HOMEPAGE=https://github.com/sphinx-doc/sphinx-testing
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=BSD-2
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-0.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4b00365d21b8ba4dd9396d1f2b5fff7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a9b11edc4e9bb3272bbb60bb54a4d8f
diff --git a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1 b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1
index 38c01c0ff97c..45e38f25209d 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1
+++ b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
+DEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Testing utility classes and functions for Sphinx extensions
 EAPI=7
 HOMEPAGE=https://github.com/sphinx-doc/sphinx-testing
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm64 x86
 LICENSE=BSD-2
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2a3da1f96bf03d0efcad32342abfab73
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=46d2c216408b6ab22b0b4bd0dc6dd31b
diff --git a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
index 50f9c8bf92f1..199d9da4bcd3 100644
--- a/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx-testing/sphinx-testing-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c19e6d0ca5cbf09fe42821394513daa3
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 5847e1a76455..ecdf19433ce9 100644
--- a/metadata/md5-cache/dev-python/sphinx_celery-1.3.1
+++ b/metadata/md5-cache/dev-python/sphinx_celery-1.3.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.4[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(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Celery Sphinx Theme and Utilities
 EAPI=7
 HOMEPAGE=https://pypi.org/project/sphinx_celery/ https://github.com/celery/sphinx_celery
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sphinx-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_celery/sphinx_celery-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bebea7cd017d56575689179e9b49ac0e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a368e37d44b583eeb54ccb0a81ebe574
diff --git a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1 b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
index 0c3be5cf1e4f..70e4db06cef2 100644
--- a/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/sphinx_celery-2.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_celery/sphinx_celery-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f3a544b9e1c75619f1438ca7bbebef07
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 7f037ae86d3e..79515246940e 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1d087e09840f8fcd9bd1999ab36e7fdc
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 4726f4084aa4..2f721eb660d8 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0d14497a809ca9099f4df74fc3f3198
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.1 b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.1
index 4116b8e693f5..b7f88027a8fb 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-applehelp-1.0.1
@@ -12,5 +12,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=23686e9b1acd32522247eb929a407265
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 4ffc19633014..add395490997 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=sphinx extension to support coroutines in markup
 EAPI=6
 HOMEPAGE=https://github.com/aio-libs/sphinxcontrib-asyncio
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23f542d08ef86cbcfbfa360d4b2cec79
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=378aaaac4dd74ce5fd52f491099c9b15
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 a820bf4c5c19..fd2213fff981 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c25d88f72ce383f49f1cebda3e16044
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 9269f14274d5..fc1e4de5664c 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/setuptools[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4994313d468894c245d14f76a94b497e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5-r2
index 4c7dec5add83..5a0847fbbdf7 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-1.5.5-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/1.5.5.tar.gz -> sphinxcontrib-blockdiag-1.5.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a54712c2b139ddbdc745be1f0cfdd7c7
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0 b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
index 9fb12aeb1f9e..d6220dde3b6d 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-blockdiag-2.0.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/reportlab[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx-testing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sphinx-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blockdiag-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/reportlab[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx-testing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( >=dev-python/sphinx-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/blockdiag-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A sphinx extension for embedding block diagrams using blockdiag
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/blockdiag/sphinxcontrib-blockdiag/archive/2.0.0.tar.gz -> sphinxcontrib-blockdiag-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=66245233ff3a85dc89c803f3de5b3019
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.1 b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.1
index 09b13fc0d7c9..aef318f54912 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-devhelp-1.0.1
@@ -12,5 +12,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7d62fc45933b279e4572e662ba9e4dcc
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-documentedlist-0.6 b/metadata/md5-cache/dev-python/sphinxcontrib-documentedlist-0.6
index a0d4ad2ff607..a3b831a50d34 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_python3_6(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e57095700e4fa91de8b35db97391112
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 6898bae537bb..6211663866cd 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.3-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.3-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/sphinx-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Extension to link to external Doxygen API documentation
 EAPI=5
 HOMEPAGE=https://pypi.org/project/sphinxcontrib-doxylink/ https://pythonhosted.org/sphinxcontrib-doxylink/ https://bitbucket.org/birkenfeld/sphinx-contrib
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=>=dev-python/sphinx-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyparsing[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
 SRC_URI=mirror://pypi/s/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87ac0ae768485620fc1fa0f485c83b86
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=152ec6c895032d6117d40d4de6d02d9e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.5 b/metadata/md5-cache/dev-python/sphinxcontrib-doxylink-1.5
index ee559b538d4d..6cf58ce5d476 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_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-doxylink/sphinxcontrib-doxylink-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=152a1bb62dbe96e32f6fea14ac27c5dc
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 36c9ab64e526..3f18d4a6c415 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Link to GitHub issues, pull requests, commits and users from Sphinx docs
 EAPI=6
 HOMEPAGE=https://github.com/jupyter/sphinxcontrib_github_alt
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BSD-2
-RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.0.tar.gz -> sphinxcontrib-github-alt-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=407e57899d0c20bac45462055fbbd56f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=98afc6b8de8dacce1047780157b95d01
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1 b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1
index bc98ea0ea401..ed9acf4fd268 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-github-alt-1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/jupyter/sphinxcontrib_github_alt/archive/1.1.tar.gz -> sphinxcontrib-github-alt-1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bf4b3c1751bdcc4510e9ba87973e6034
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 c506eb8152f2..a446d184de4b 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_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=311396a82cff7f4b4738773979df0b35
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.2
index 127b17bb4ada..881f0e547986 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.2
@@ -12,5 +12,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=03aa5382596adada25ee756dd4a76713
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 a9db46c3f13b..8ffe2f4a3b06 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/sphinx-1.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/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/sphinx-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Extension providing a Sphinx domain for describing RESTful HTTP APIs
 EAPI=5
 HOMEPAGE=https://bitbucket.org/birkenfeld/sphinx-contrib/ https://sphinxcontrib-httpdomain.readthedocs.io/en/stable/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD-2
-RDEPEND=>=dev-python/sphinx-1.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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/sphinx-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[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
 SRC_URI=mirror://pypi/s/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ed31c35688ec6cca2a10a210146e46d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8a6a71d3fb0a343708790cc4ac8d55cb
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 0e1eb2fc91dc..462e5910e6a6 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Extension providing a Sphinx domain for describing RESTful HTTP APIs
 EAPI=6
 HOMEPAGE=https://bitbucket.org/birkenfeld/sphinx-contrib/ https://sphinxcontrib-httpdomain.readthedocs.io/en/stable/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56c3e3ebb3760cb8146db48e6b80c600
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3e2750cdd0edca1a72f6ed2f4684577e
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 49e00249d016..e505e45b5639 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=973c285e9b3d95f3d3580edac7744264
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 8060a1e1e22a..2ffef89f9e78 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f791b1d831be50b699ff07198494c48e
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1 b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1
index 2f6caa89f668..d04f902cd2ed 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1
@@ -12,5 +12,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=daca2dd5c711dbbb6bf5de188ef4559b
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 1e0a607d6506..e25c5638c9e5 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7fbd26b5d8268fb48428da73c9beaa03
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 1063c220d079..79dab233b326 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=News Feed extension for Sphinx
 EAPI=6
 HOMEPAGE=https://bitbucket.org/prometheus/sphinxcontrib-newsfeed
-IUSE=examples python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9895bc9aee2a4631991baf43e3743b72
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c73f89f3bff5adeef8a1e8dcd6e85ba5
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5 b/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
index 93e2f5637277..305b2a150b6b 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-pretty-searchresults-0.3.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sphinx-contrib/sphinx-pretty-searchresults/archive/v0.3.5.tar.gz -> sphinxcontrib-pretty-searchresults-0.3.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b9dfcb6e8ad433b8d639528f97679348
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
index 0dd3447a311c..fd54e8d0bdaf 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3264c044b19d3b28f90a2db022716a88
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.2 b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.2
index f397a7725e15..e527018d6754 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-qthelp-1.0.2
@@ -12,5 +12,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bc0dbc783747a077fb609cbb0afac6dc
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.3 b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.3
index 6d7de35264a7..84a1d20f97f3 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.3
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-serializinghtml-1.1.3
@@ -12,5 +12,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ae21d174656d9ef1617fa767641e4f7b
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 d1cc694227d2..76a75472e99c 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-0.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.5[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/sphinx-0.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-0.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx-0.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Sphinx spelling extension
 EAPI=5
 HOMEPAGE=https://bitbucket.org/dhellmann/sphinxcontrib-spelling
-IUSE=doc test python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_python3_6
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=BSD-2
-RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.5[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/sphinx-0.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx-0.6[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-2.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79300791b8e3096956beef8ef06ca636
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f63aea4ced7e6bc3c0d4b3973d39dec
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 4730c38e0511..b3e12ce74874 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.3.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-2.3.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Sphinx spelling extension
 EAPI=6
 HOMEPAGE=https://bitbucket.org/dhellmann/sphinxcontrib-spelling
-IUSE=doc python_targets_python2_7 python_targets_python3_6
+IUSE=doc python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyenchant[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/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[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
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-2.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ca1a2525770f753120695c10f0858b8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d30df537c13677e6843d6003f2dc724
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-4.3.0 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-4.3.0
index 0e1c29704a31..78eee6b47eda 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-4.3.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-4.3.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/fixtures-3.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/testtools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/testtools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Sphinx spelling extension
 EAPI=7
 HOMEPAGE=https://github.com/sphinx-contrib/spelling
-IUSE=doc test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/pbr[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-4.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=96628248fac734a4443adfe9d2fc1648
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e463e03e7fa02d2d77c8e9d8d308904c
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 b679b6f895b4..ff28bf696ff9 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-websupport-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-websupport/sphinxcontrib-websupport-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c5330a27d4e9741d90c486dd0d3687b
diff --git a/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0 b/metadata/md5-cache/dev-python/sphinxtogithub-1.1.0
index fb555cf5cc92..d783c91b3a36 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_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxtogithub/sphinxtogithub-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96895784e13112b933edd8ff87e247ab
diff --git a/metadata/md5-cache/dev-python/spyder-3.2.4 b/metadata/md5-cache/dev-python/spyder-3.2.4
index e0f42126efb8..dbf82bc173c2 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/QtPy[python_targets_python3_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-3.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=959da09d9928de2538f350ba6ff58da2
diff --git a/metadata/md5-cache/dev-python/spyder-3.2.8 b/metadata/md5-cache/dev-python/spyder-3.2.8
index f8bcd9cfd4e3..b2b266f8e6f6 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-3.2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=17b9366b7cc5d919d2462473d45ec681
diff --git a/metadata/md5-cache/dev-python/spyder-3.3.0 b/metadata/md5-cache/dev-python/spyder-3.3.0
index 3e7fdd76db51..a3fc4a374435 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-3.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c81a7b918890dcd1fb07dca697c422d6
diff --git a/metadata/md5-cache/dev-python/spyder-3.3.1 b/metadata/md5-cache/dev-python/spyder-3.3.1
index f51d58cacd76..e45a331deca7 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-3.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c81a7b918890dcd1fb07dca697c422d6
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 81ad08f605db..7715bf8f347e 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=webengine? ( !webkit ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder/spyder-4.0.0b1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b137ace4da2f6278f723c35b830f5b5
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 d0946c4499c7..52051f820f08 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder-kernels/spyder-kernels-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2907392c0fdc8bd01ea89ed00c1281e
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 a62000836418..a848aa741865 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_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder-kernels/spyder-kernels-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2907392c0fdc8bd01ea89ed00c1281e
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-1.8.1 b/metadata/md5-cache/dev-python/spyder-kernels-1.8.1
index 0b14dbb5d825..43f56779cdbd 100644
--- a/metadata/md5-cache/dev-python/spyder-kernels-1.8.1
+++ b/metadata/md5-cache/dev-python/spyder-kernels-1.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cloudpickle[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/spyder-kernels/spyder-kernels-1.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a8c19c5bfbec3b6b587d54b0cbe81e95
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.7.10 b/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
index c92d589b3345..884a540786aa 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.7.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.7.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=446949eb6ddf5e9c9a5826b3a86c9568
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.18 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
index 229ab9e6b5e8..6acaeea45831 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.2.18.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4759b8d0528edcddf6365e9c26f44824
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.11 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.11
index 67f052a42b25..6e7633b59758 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.11
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.11
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d55c99d81227a91f9154149c406c56cc
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.3 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
index 007d8b66bf4a..790e612f0e55 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.3
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=059fbf81f2d1120d86a00e021a20e01e
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.4 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.4
index 033fd63d1122..31c41185a2ea 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.4
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.4
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python2_7
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9676f455d7d15b441c1a8c8a51db8541
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 32e99c57d8a6..67a8389a4c8b 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9fc30bd201c5c9c9ea2ce5fc6b771347
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0-r1 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0-r1
index e55ec52f3cc5..506ecc5653e5 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0-r1
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.11.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.7.8[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=38311629ff1998b54875ff19ffce609f
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.12.0 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.12.0
index 905f5a634cea..74dc8b0f97fa 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.12.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.12.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/sqlalchemy-0.9.6[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=572538d68172b1079444f649e8aff8bd
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 5bf9e475d062..a22ba44a5a6d 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a8553db27178..e645c675e28d 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e79711c5813dcc4477a00429747472c
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
index dc15cb1ebc65..802c2fd3daf3 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rqlite/sqlalchemy-rqlite/archive/v1.0.tar.gz -> sqlalchemy-rqlite-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99b7c290b03facd0ed562837166d7033
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999 b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
index 16224b324740..df0283f9d7e9 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
+++ b/metadata/md5-cache/dev-python/sqlalchemy-rqlite-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=621de8368a73d428a2ba342b0fce4806
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 ee6b527cd3b7..7f34b175b7ca 100644
--- a/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1
+++ b/metadata/md5-cache/dev-python/sqlite3dbm-0.1.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a09e87b8369d942bc3ae3ef70193208d
diff --git a/metadata/md5-cache/dev-python/sqlobject-3.4.0 b/metadata/md5-cache/dev-python/sqlobject-3.4.0
index fce0a7d3a58b..e14248e0fd01 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 d157ce6315da..468f62d356bd 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f2c48b2004d5313c85bf16bf9382765
diff --git a/metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2 b/metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2
index 93b0991b4e56..d036cc09dfdf 100644
--- a/metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2
+++ b/metadata/md5-cache/dev-python/sshtunnel-0.1.4-r2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)]
+DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Pure python SSH tunnels
 EAPI=7
 HOMEPAGE=https://pypi.python.org/pypi/sshtunnel
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
-RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/sshtunnel/sshtunnel-0.1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a6a9e0e88fa453431c0d8f47f4d6a03c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3a279790ba886ec725bed6f0b72561a6
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-0.4 b/metadata/md5-cache/dev-python/ssl-fetch-0.4
index 2cd323923a45..f62a968c05f5 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_python2_7(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dolsen/releases/ssl-fetch/ssl-fetch-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19b50f226291976e5ac61be589a59108
diff --git a/metadata/md5-cache/dev-python/ssl-fetch-9999 b/metadata/md5-cache/dev-python/ssl-fetch-9999
index fddf760db3fc..b0a295395ed1 100644
--- a/metadata/md5-cache/dev-python/ssl-fetch-9999
+++ b/metadata/md5-cache/dev-python/ssl-fetch-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/requests-1.2.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47a38230392c9b998ccda2169b7d7eaa
diff --git a/metadata/md5-cache/dev-python/stapler-1.0_pre20191215-r1 b/metadata/md5-cache/dev-python/stapler-1.0_pre20191215-r1
index 1de3ea26cdb7..22b0b23874b8 100644
--- a/metadata/md5-cache/dev-python/stapler-1.0_pre20191215-r1
+++ b/metadata/md5-cache/dev-python/stapler-1.0_pre20191215-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyPDF2[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/hellerbarde/stapler/archive/875325103234b4a3ed96a4a5167ff78c291edbff.tar.gz -> stapler-1.0_pre20191215.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35d8b9d881fab55e32b175b462828002
diff --git a/metadata/md5-cache/dev-python/statsd-3.2.1 b/metadata/md5-cache/dev-python/statsd-3.2.1
index 25043b719897..010298fe4e96 100644
--- a/metadata/md5-cache/dev-python/statsd-3.2.1
+++ b/metadata/md5-cache/dev-python/statsd-3.2.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A simple statsd client
 EAPI=6
 HOMEPAGE=https://github.com/jsocol/pystatsd https://pypi.org/project/statsd/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsd/statsd-3.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e89354b3b192e6abb6616f9aad8f2d5d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3dcf47e9a48f9330f23cf32c76b0748f
diff --git a/metadata/md5-cache/dev-python/statsd-3.3.0 b/metadata/md5-cache/dev-python/statsd-3.3.0
index 3b329e17fc84..a16358e3e591 100644
--- a/metadata/md5-cache/dev-python/statsd-3.3.0
+++ b/metadata/md5-cache/dev-python/statsd-3.3.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=A simple statsd client
 EAPI=7
 HOMEPAGE=https://github.com/jsocol/pystatsd https://pypi.org/project/statsd
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsd/statsd-3.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0027f45cf91f2d27935d9f999763a380
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bce7e068574f59224888bd0d92f1b838
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.10.2 b/metadata/md5-cache/dev-python/statsmodels-0.10.2
index 366401d9a9ed..91219f7155c9 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.10.2
+++ b/metadata/md5-cache/dev-python/statsmodels-0.10.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.10.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bd58a1857617cb30d98cc6c04a24be70
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.9.0 b/metadata/md5-cache/dev-python/statsmodels-0.9.0
index c6b05f9cf039..d06c62592a7f 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.9.0
+++ b/metadata/md5-cache/dev-python/statsmodels-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1a1dd241e23b72ee726752cda5b6958a
diff --git a/metadata/md5-cache/dev-python/statsmodels-9999 b/metadata/md5-cache/dev-python/statsmodels-9999
index 9ebb949789ad..6f6940da4b0d 100644
--- a/metadata/md5-cache/dev-python/statsmodels-9999
+++ b/metadata/md5-cache/dev-python/statsmodels-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=15ef6f4ee383c1595a5a4782fc33e105
diff --git a/metadata/md5-cache/dev-python/steadymark-0.5.3 b/metadata/md5-cache/dev-python/steadymark-0.5.3
index 9969a3e00608..12ab8817aaa5 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a84ecbdf9e32..76e9743da9a3 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/stestr/stestr-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e437e48920bfef36cd0d4276bdfbfa0f
diff --git a/metadata/md5-cache/dev-python/stevedore-1.25.1 b/metadata/md5-cache/dev-python/stevedore-1.25.1
index a1534cac97ed..2ad6f5aa08f6 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.25.1
+++ b/metadata/md5-cache/dev-python/stevedore-1.25.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-1.25.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9494f633debd687e8c70df19d65bf3b7
diff --git a/metadata/md5-cache/dev-python/stevedore-1.28.0 b/metadata/md5-cache/dev-python/stevedore-1.28.0
index e4c3af6fe93e..5476d6d3cb4d 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.28.0
+++ b/metadata/md5-cache/dev-python/stevedore-1.28.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-1.28.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eaf4d1e0c27d9d953bce0c1408156944
diff --git a/metadata/md5-cache/dev-python/stevedore-1.30.1 b/metadata/md5-cache/dev-python/stevedore-1.30.1
index fff1116ab7af..bbdc79f05e57 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.30.1
+++ b/metadata/md5-cache/dev-python/stevedore-1.30.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-1.30.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3195533af89ac22fa45cf8b8b072a4c4
diff --git a/metadata/md5-cache/dev-python/stevedore-1.31.0 b/metadata/md5-cache/dev-python/stevedore-1.31.0
index 33946d88a657..7db17bfe120d 100644
--- a/metadata/md5-cache/dev-python/stevedore-1.31.0
+++ b/metadata/md5-cache/dev-python/stevedore-1.31.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/reno-2.5.0[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/reno-2.5.0[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/reno-2.5.0[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/openstackdocstheme-1.18.1[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/reno-2.5.0[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx-2.0.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Manage dynamic plugins for Python applications
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-1.31.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3e73ded9bfbee8e5a222573453d1f097
diff --git a/metadata/md5-cache/dev-python/stomper-0.3.0 b/metadata/md5-cache/dev-python/stomper-0.3.0
index a4d9bad80933..c4fca9cf6449 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_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/stomper/stomper-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=798f28d7345db7d8c3e51ea0e0f18ea3
diff --git a/metadata/md5-cache/dev-python/storm-0.20-r1 b/metadata/md5-cache/dev-python/storm-0.20-r1
deleted file mode 100644
index a30e6ea230d7..000000000000
--- a/metadata/md5-cache/dev-python/storm-0.20-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] test? ( dev-python/fixtures[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=An object-relational mapper for Python developed at Canonical
-EAPI=5
-HOMEPAGE=https://storm.canonical.com/ https://pypi.org/project/storm/
-IUSE=mysql postgres sqlite test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) postgres? ( =dev-python/psycopg-2*[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://launchpad.net/storm/trunk/0.20/+download/storm-0.20.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8d9acb7d7634f7e8278e9d1129bff9e
diff --git a/metadata/md5-cache/dev-python/storm-0.20-r2 b/metadata/md5-cache/dev-python/storm-0.20-r2
new file mode 100644
index 000000000000..3ec7fe2a5843
--- /dev/null
+++ b/metadata/md5-cache/dev-python/storm-0.20-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] test? ( dev-python/fixtures[python_targets_python2_7(-)] ) ) python_single_target_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? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=An object-relational mapper for Python developed at Canonical
+EAPI=5
+HOMEPAGE=https://storm.canonical.com/ https://pypi.org/project/storm/
+IUSE=mysql postgres sqlite test +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_single_target_python2_7? ( mysql? ( dev-python/mysql-python[python_targets_python2_7(-)] ) postgres? ( =dev-python/psycopg-2*[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://launchpad.net/storm/trunk/0.20/+download/storm-0.20.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ac884999272503c9a9908d456f529935
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.6 b/metadata/md5-cache/dev-python/strict-rfc3339-0.6
index 085aefe32dd7..4bf751ada8b0 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/strict-rfc3339/strict-rfc3339-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1859793aded611f9bf26953d949657b
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.7 b/metadata/md5-cache/dev-python/strict-rfc3339-0.7
index bd1732ec336e..96975f5c1524 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/strict-rfc3339/strict-rfc3339-0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cf75d3b2c39bbf47a15cf6bbc5d18367
diff --git a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1 b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
index a02584dbb2c0..d36040b31e62 100644
--- a/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
+++ b/metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/danielrichman/strict-rfc3339/archive/version-0.7.tar.gz -> strict-rfc3339-version-0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1120ad2d1a26efdc39331c6c14881bb7
diff --git a/metadata/md5-cache/dev-python/stripe-2.42.0 b/metadata/md5-cache/dev-python/stripe-2.42.0
index a08e435412bc..a5b599811f4a 100644
--- a/metadata/md5-cache/dev-python/stripe-2.42.0
+++ b/metadata/md5-cache/dev-python/stripe-2.42.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stripe/stripe-2.42.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9d9e873d6c04b32235bb576da6b7c6a6
diff --git a/metadata/md5-cache/dev-python/subprocess32-3.2.7 b/metadata/md5-cache/dev-python/subprocess32-3.2.7
index 28c464569b3e..3c9da5a67059 100644
--- a/metadata/md5-cache/dev-python/subprocess32-3.2.7
+++ b/metadata/md5-cache/dev-python/subprocess32-3.2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/subprocess32/subprocess32-3.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f832408d6f736575fb4b2afe4f702661
diff --git a/metadata/md5-cache/dev-python/subprocess32-3.5.4 b/metadata/md5-cache/dev-python/subprocess32-3.5.4
index 5a73eb545912..b99b9ffade08 100644
--- a/metadata/md5-cache/dev-python/subprocess32-3.5.4
+++ b/metadata/md5-cache/dev-python/subprocess32-3.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/subprocess32/subprocess32-3.5.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e8729b5342d579910e828177c0ebc2b3
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 51ee5a727498..fcb722425add 100644
--- a/metadata/md5-cache/dev-python/subunit-1.2.0-r1
+++ b/metadata/md5-cache/dev-python/subunit-1.2.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/subunit/trunk/1.2/+download/subunit-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d89332f8adef6f137eebdd82243ab7e4
diff --git a/metadata/md5-cache/dev-python/subvertpy-0.10.1 b/metadata/md5-cache/dev-python/subvertpy-0.10.1
index 1b150b25a8c5..f251bf293f57 100644
--- a/metadata/md5-cache/dev-python/subvertpy-0.10.1
+++ b/metadata/md5-cache/dev-python/subvertpy-0.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/subvertpy/subvertpy-0.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2cdde516ccc3c79152ebbd8a5fa49e1b
diff --git a/metadata/md5-cache/dev-python/subvertpy-0.9.1 b/metadata/md5-cache/dev-python/subvertpy-0.9.1
index 45b23a91feeb..a8d7613a4e9c 100644
--- a/metadata/md5-cache/dev-python/subvertpy-0.9.1
+++ b/metadata/md5-cache/dev-python/subvertpy-0.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.samba.org/~jelmer/subvertpy/subvertpy-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e346ac8cdeec8691196dbbdd83133f23
diff --git a/metadata/md5-cache/dev-python/suds-0.6-r1 b/metadata/md5-cache/dev-python/suds-0.6-r1
index e23b3efe1c0a..0cf9c0c4b5ef 100644
--- a/metadata/md5-cache/dev-python/suds-0.6-r1
+++ b/metadata/md5-cache/dev-python/suds-0.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=doc? ( python_targets_python2_7 ) || ( python_targets_python2_7 pyt
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3906a2d9efc9b56ccfbd66d71e8895d
diff --git a/metadata/md5-cache/dev-python/sure-1.4.11 b/metadata/md5-cache/dev-python/sure-1.4.11
index 973d1621463b..07692046a077 100644
--- a/metadata/md5-cache/dev-python/sure-1.4.11
+++ b/metadata/md5-cache/dev-python/sure-1.4.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-1.4.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21f18e52a93812d71cd6bbe65d7d3480
diff --git a/metadata/md5-cache/dev-python/svg-path-3.0 b/metadata/md5-cache/dev-python/svg-path-3.0
index 8d866483386b..c4d164eb5974 100644
--- a/metadata/md5-cache/dev-python/svg-path-3.0
+++ b/metadata/md5-cache/dev-python/svg-path-3.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/regebro/svg.path/archive/3.0.tar.gz -> svg.path-3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2e950af5f48a84fffc17794b514b3cd9
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.1.12 b/metadata/md5-cache/dev-python/svgwrite-1.1.12
index 9f544a7c269e..a9148a0412cc 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2d0b1f23633073c3e656d2f07b97267
diff --git a/metadata/md5-cache/dev-python/svgwrite-1.2.1 b/metadata/md5-cache/dev-python/svgwrite-1.2.1
index cc8a303f9dee..699e0c2158b7 100644
--- a/metadata/md5-cache/dev-python/svgwrite-1.2.1
+++ b/metadata/md5-cache/dev-python/svgwrite-1.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mozman/svgwrite/archive/v1.2.1.tar.gz -> svgwrite-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=64d641fa2a0a22c57b2087aa4374768f
diff --git a/metadata/md5-cache/dev-python/swagger-spec-validator-2.4.3 b/metadata/md5-cache/dev-python/swagger-spec-validator-2.4.3
index 10c431ff3e9f..53cf7ddad35c 100644
--- a/metadata/md5-cache/dev-python/swagger-spec-validator-2.4.3
+++ b/metadata/md5-cache/dev-python/swagger-spec-validator-2.4.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[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(-)]
+DEPEND=dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=validate Swagger specs against Swagger 1.1 or 2.0 specification
 EAPI=7
 HOMEPAGE=https://github.com/Yelp/swagger_spec_validator
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/jsonschema[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/swagger-spec-validator/swagger-spec-validator-2.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3c3e44df223ce9c02717cd93eb685d9f
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a9033155ab9ed0f5c314b563298834f3
diff --git a/metadata/md5-cache/dev-python/sybil-1.2.0 b/metadata/md5-cache/dev-python/sybil-1.2.0
index b72d39367f47..77c21dee7c6c 100644
--- a/metadata/md5-cache/dev-python/sybil-1.2.0
+++ b/metadata/md5-cache/dev-python/sybil-1.2.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Automated testing for the examples in your documentation
 EAPI=7
 HOMEPAGE=https://github.com/cjw296/sybil
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sybil/sybil-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bd5a953b32b01a41298e339455936e6d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=840abcae4ac561abcbaab10a73542d66
diff --git a/metadata/md5-cache/dev-python/symboltype-1.0 b/metadata/md5-cache/dev-python/symboltype-1.0
index 22f9791e3232..17ec79ea5c84 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_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/SymbolType/SymbolType-1.0.zip -> symboltype-1.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bf1f9d1d3bdb46454f641373745c55e
diff --git a/metadata/md5-cache/dev-python/symengine-0.3.0 b/metadata/md5-cache/dev-python/symengine-0.3.0
index 22388bcabba5..57d4af38c46d 100644
--- a/metadata/md5-cache/dev-python/symengine-0.3.0
+++ b/metadata/md5-cache/dev-python/symengine-0.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symengine/symengine.py/archive/v0.3.0.tar.gz -> symengine.py-0.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b902f7ce803b601176b481548a2d3df2
diff --git a/metadata/md5-cache/dev-python/symengine-0.5.1 b/metadata/md5-cache/dev-python/symengine-0.5.1
index 41419af977b3..7dec9160a4aa 100644
--- a/metadata/md5-cache/dev-python/symengine-0.5.1
+++ b/metadata/md5-cache/dev-python/symengine-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/symengine/symengine.py/archive/v0.5.1.tar.gz -> symengine.py-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0dda00a28e772a1ea33014cc37046624
diff --git a/metadata/md5-cache/dev-python/sympy-1.0-r1 b/metadata/md5-cache/dev-python/sympy-1.0-r1
index 1559773ec3c5..8b3cd4d79e88 100644
--- a/metadata/md5-cache/dev-python/sympy-1.0-r1
+++ b/metadata/md5-cache/dev-python/sympy-1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) ipython? (
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.0/sympy-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=821b055e0d7d1111777cfc1cac0ce392
diff --git a/metadata/md5-cache/dev-python/sympy-1.3 b/metadata/md5-cache/dev-python/sympy-1.3
index 8231bb8edf52..657d440ef420 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_python3_6 python_targets_python3_7 ) ipython? (
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e66328d2e0fb2cf19f702fedf26356e
diff --git a/metadata/md5-cache/dev-python/sympy-1.5 b/metadata/md5-cache/dev-python/sympy-1.5
index bab117c27b8d..376f11f5a368 100644
--- a/metadata/md5-cache/dev-python/sympy-1.5
+++ b/metadata/md5-cache/dev-python/sympy-1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) ipython? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/releases/download/sympy-1.5/sympy-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=362d1973b0dd9ff52184dbe5983e47c8
diff --git a/metadata/md5-cache/dev-python/sympy-1.5.1 b/metadata/md5-cache/dev-python/sympy-1.5.1
index 742308cfde7f..59afe8097c39 100644
--- a/metadata/md5-cache/dev-python/sympy-1.5.1
+++ b/metadata/md5-cache/dev-python/sympy-1.5.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) ipython? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=eb5f991efae22f65e80fdf6a6242b7ca
diff --git a/metadata/md5-cache/dev-python/sympy-1.5.1-r1 b/metadata/md5-cache/dev-python/sympy-1.5.1-r1
index de8766ed1b4f..2f6c4c8b44e4 100644
--- a/metadata/md5-cache/dev-python/sympy-1.5.1-r1
+++ b/metadata/md5-cache/dev-python/sympy-1.5.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) ipython? (
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=d08441430a8e91b90cf4cefef91a603b
diff --git a/metadata/md5-cache/dev-python/tablib-0.12.1-r1 b/metadata/md5-cache/dev-python/tablib-0.12.1-r1
index 532effec635c..e36fc6a99e8c 100644
--- a/metadata/md5-cache/dev-python/tablib-0.12.1-r1
+++ b/metadata/md5-cache/dev-python/tablib-0.12.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tablib/tablib-0.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21b05597decba187496458934f47bf72
diff --git a/metadata/md5-cache/dev-python/tabulate-0.8.1 b/metadata/md5-cache/dev-python/tabulate-0.8.1
index 7a98559242e1..eb0d01f45bf3 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tabulate/tabulate-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8ae85ba872b5ebf2ac35047beaa4bf14
diff --git a/metadata/md5-cache/dev-python/tabulate-0.8.3 b/metadata/md5-cache/dev-python/tabulate-0.8.3
index 3a7012de0bc7..27ec21f3147b 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.8.3
+++ b/metadata/md5-cache/dev-python/tabulate-0.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tabulate/tabulate-0.8.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5da47821abfb9963abace399c65f4071
diff --git a/metadata/md5-cache/dev-python/tabulate-0.8.6 b/metadata/md5-cache/dev-python/tabulate-0.8.6
index 50f619826e02..60ae5907b19b 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.8.6
+++ b/metadata/md5-cache/dev-python/tabulate-0.8.6
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/colorclass[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) virtual/python-funcsigs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0=[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) dev-python/colorclass[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) virtual/python-funcsigs[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pretty-print tabular data
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/astanin/python-tabulate/archive/v0.8.6.tar.gz -> tabulate-0.8.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=60d72140e404c539e4b7cec230535e28
diff --git a/metadata/md5-cache/dev-python/tagpy-2018.1 b/metadata/md5-cache/dev-python/tagpy-2018.1
index fe26e5e4a8a0..8043a1336613 100644
--- a/metadata/md5-cache/dev-python/tagpy-2018.1
+++ b/metadata/md5-cache/dev-python/tagpy-2018.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:=[python,threads,python_targets_python2_7(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tagpy/tagpy-2018.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=96d8313ae91b49ddde014aa374674664
diff --git a/metadata/md5-cache/dev-python/tappy-2.4 b/metadata/md5-cache/dev-python/tappy-2.4
index 1e2d196b7123..70502a34fe94 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_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tap.py/tap.py-2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=16a7ea21d0a8f151d458f24451b195ef
diff --git a/metadata/md5-cache/dev-python/taskflow-3.4.0 b/metadata/md5-cache/dev-python/taskflow-3.4.0
index 7f35a57244b1..8d9f1227bbb5 100644
--- a/metadata/md5-cache/dev-python/taskflow-3.4.0
+++ b/metadata/md5-cache/dev-python/taskflow-3.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/taskflow/taskflow-3.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e9618f4f15ad276b41770e18c6f59d27
diff --git a/metadata/md5-cache/dev-python/taskflow-3.5.0 b/metadata/md5-cache/dev-python/taskflow-3.5.0
index b46e3c95f2e2..f20d99aa7450 100644
--- a/metadata/md5-cache/dev-python/taskflow-3.5.0
+++ b/metadata/md5-cache/dev-python/taskflow-3.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/taskflow/taskflow-3.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e9618f4f15ad276b41770e18c6f59d27
diff --git a/metadata/md5-cache/dev-python/tblib-1.3.2 b/metadata/md5-cache/dev-python/tblib-1.3.2
index 824effd6ab24..aa686514bf2c 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tblib/tblib-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2f5b842b6c49feab2bcae1056bb05d5
diff --git a/metadata/md5-cache/dev-python/tblib-1.3.2-r1 b/metadata/md5-cache/dev-python/tblib-1.3.2-r1
index fef1834912be..5f5d22588d4c 100644
--- a/metadata/md5-cache/dev-python/tblib-1.3.2-r1
+++ b/metadata/md5-cache/dev-python/tblib-1.3.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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tblib/tblib-1.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7fd5c22c7fc99440b770b5255dc32719
diff --git a/metadata/md5-cache/dev-python/tempest-lib-1.0.0-r1 b/metadata/md5-cache/dev-python/tempest-lib-1.0.0-r1
index 3b411386859b..8bc1e3947508 100644
--- a/metadata/md5-cache/dev-python/tempest-lib-1.0.0-r1
+++ b/metadata/md5-cache/dev-python/tempest-lib-1.0.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempest-lib/tempest-lib-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5b76a99d3fccc1bcf0e4b3580d928e43
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 c84d2c814b0d..45aca80a140d 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_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/T/Tempita/Tempita-0.5.3dev.tar.gz -> tempita-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f9faac029b760cdf8c4d3df30ad6d636
diff --git a/metadata/md5-cache/dev-python/tempita-0.5.3-r2 b/metadata/md5-cache/dev-python/tempita-0.5.3-r2
index 43146fb28434..1fada3d61e21 100644
--- a/metadata/md5-cache/dev-python/tempita-0.5.3-r2
+++ b/metadata/md5-cache/dev-python/tempita-0.5.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/ianb/tempita/get/97392d008cc8.tar.gz -> tempita-0.5.3-bitbucket.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1d3fb300fe843b8ad62a6d0a41b8c269
diff --git a/metadata/md5-cache/dev-python/tempora-1.12 b/metadata/md5-cache/dev-python/tempora-1.12
index fdb351ef46ce..2cf4dbe13480 100644
--- a/metadata/md5-cache/dev-python/tempora-1.12
+++ b/metadata/md5-cache/dev-python/tempora-1.12
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/backports-unittest-mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/backports-unittest-mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/tempora
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-1.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d313ff4d3f7415be2d500a7c863a1879
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=01a91fe9c98b71baa31f287d64af30f5
diff --git a/metadata/md5-cache/dev-python/tempora-1.14.1-r1 b/metadata/md5-cache/dev-python/tempora-1.14.1-r1
index 9c45576f7ed3..428d25116464 100644
--- a/metadata/md5-cache/dev-python/tempora-1.14.1-r1
+++ b/metadata/md5-cache/dev-python/tempora-1.14.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/backports-unittest-mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/rst-linker-1.9[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/backports-unittest-mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/tempora
-IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
+IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/jaraco-functools-1.20[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-1.14.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f0a4280ee929b0066a362efb2fbaac87
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2b03805c33912d40d5d6922e93534c89
diff --git a/metadata/md5-cache/dev-python/tempora-1.7 b/metadata/md5-cache/dev-python/tempora-1.7
index 4489ad2904ac..548481f24940 100644
--- a/metadata/md5-cache/dev-python/tempora-1.7
+++ b/metadata/md5-cache/dev-python/tempora-1.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/backports-unittest-mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/backports-unittest-mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/tempora
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef2c5e929596285d096bc8e64bdad960
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b8807640054524aec6df7e7a3a5c057
diff --git a/metadata/md5-cache/dev-python/tempora-2.0.0 b/metadata/md5-cache/dev-python/tempora-2.0.0
index 1d6a4d421a6b..33063569b064 100644
--- a/metadata/md5-cache/dev-python/tempora-2.0.0
+++ b/metadata/md5-cache/dev-python/tempora-2.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=135f1b43f3851ea43671ef1ec1d1b9fb
diff --git a/metadata/md5-cache/dev-python/tempora-2.1.0 b/metadata/md5-cache/dev-python/tempora-2.1.0
index ba8a6d965a14..6b4ae287a677 100644
--- a/metadata/md5-cache/dev-python/tempora-2.1.0
+++ b/metadata/md5-cache/dev-python/tempora-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempora/tempora-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=135f1b43f3851ea43671ef1ec1d1b9fb
diff --git a/metadata/md5-cache/dev-python/tenacity-4.8.0 b/metadata/md5-cache/dev-python/tenacity-4.8.0
index a46c3d9c464c..ef9b67c588ec 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_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tenacity/tenacity-4.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4671841cf5d678b793920be18cef6eb0
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 01db85cb165f..698d32ae1370 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4110d817b4918f2ce4ebd88ad1561898
diff --git a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2 b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
index fde1f48607a9..75bb03f6e3ba 100644
--- a/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
+++ b/metadata/md5-cache/dev-python/termcolor-1.1.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/termcolor/termcolor-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7ba3f926d2e298d871cda1e1b98380a4
diff --git a/metadata/md5-cache/dev-python/terminado-0.5 b/metadata/md5-cache/dev-python/terminado-0.5
index 5190d124fe32..c9dfbe943539 100644
--- a/metadata/md5-cache/dev-python/terminado-0.5
+++ b/metadata/md5-cache/dev-python/terminado-0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ptyprocess[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(-)] www-servers/tornado[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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/ptyprocess[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=5
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/ptyprocess[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(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/ptyprocess[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] www-servers/tornado[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93674aafb5dfad1bb06255cc671291d0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c669f74c4c23bc24feee71485e0dfb72
diff --git a/metadata/md5-cache/dev-python/terminado-0.6 b/metadata/md5-cache/dev-python/terminado-0.6
index d13b3bd06c8e..e24eda33d633 100644
--- a/metadata/md5-cache/dev-python/terminado-0.6
+++ b/metadata/md5-cache/dev-python/terminado-0.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/ptyprocess[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-0.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=5
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/ptyprocess[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/ptyprocess[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-servers/tornado-0.4[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=220df5dc009fb4aea4d48d34f72afde2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67711e4b6149fe54074b7c76d99bbb83
diff --git a/metadata/md5-cache/dev-python/terminado-0.8.1 b/metadata/md5-cache/dev-python/terminado-0.8.1
index 664585df3313..38157f3a834c 100644
--- a/metadata/md5-cache/dev-python/terminado-0.8.1
+++ b/metadata/md5-cache/dev-python/terminado-0.8.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ptyprocess[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(-)] >=www-servers/tornado-0.4[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(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/ptyprocess[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Terminals served to term.js using Tornado websockets
 EAPI=6
 HOMEPAGE=https://pypi.org/project/terminado/ https://github.com/jupyter/terminado
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/ptyprocess[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(-)] >=www-servers/tornado-0.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/ptyprocess[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=www-servers/tornado-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/terminado/terminado-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fdd0488c88e3d9cd59b5e8f14740c9d0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a79fc0c75bd7f9457354f55a2a9c282f
diff --git a/metadata/md5-cache/dev-python/terminaltables-3.1.0 b/metadata/md5-cache/dev-python/terminaltables-3.1.0
index 8542cd278329..932318dbb868 100644
--- a/metadata/md5-cache/dev-python/terminaltables-3.1.0
+++ b/metadata/md5-cache/dev-python/terminaltables-3.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Robpol86/terminaltables/archive/v3.1.0.tar.gz -> terminaltables-3.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8cc2162d7db94e09acad429df6250e7c
diff --git a/metadata/md5-cache/dev-python/terminaltables-9999 b/metadata/md5-cache/dev-python/terminaltables-9999
index ce2ca46e0dfc..c6c32db0f36b 100644
--- a/metadata/md5-cache/dev-python/terminaltables-9999
+++ b/metadata/md5-cache/dev-python/terminaltables-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=daca5f6d6fd968b30c789ec4d62e5975
diff --git a/metadata/md5-cache/dev-python/test_server-0.0.31 b/metadata/md5-cache/dev-python/test_server-0.0.31
index c96072378173..9115d1471b90 100644
--- a/metadata/md5-cache/dev-python/test_server-0.0.31
+++ b/metadata/md5-cache/dev-python/test_server-0.0.31
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/bottle-0.12.13[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webtest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/bottle-0.12.13[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webtest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Server to test HTTP clients
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lorien/test_server/archive/v0.0.31.tar.gz -> test_server-0.0.31.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3d2484cb2a09f2d2e9d0f1f67a40b56f
diff --git a/metadata/md5-cache/dev-python/testfixtures-4.9.1 b/metadata/md5-cache/dev-python/testfixtures-4.9.1
index 66b8370f3de1..2459190682b1 100644
--- a/metadata/md5-cache/dev-python/testfixtures-4.9.1
+++ b/metadata/md5-cache/dev-python/testfixtures-4.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testfixtures/testfixtures-4.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2f79c14bc669f3e024cc04e7370d6ff
diff --git a/metadata/md5-cache/dev-python/testfixtures-6.8.2 b/metadata/md5-cache/dev-python/testfixtures-6.8.2
index 321bbed8651d..b65926929973 100644
--- a/metadata/md5-cache/dev-python/testfixtures-6.8.2
+++ b/metadata/md5-cache/dev-python/testfixtures-6.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testfixtures/testfixtures-6.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0fbea81aada5c44ca8057e8dcb57e16a
diff --git a/metadata/md5-cache/dev-python/testify-0.11.0 b/metadata/md5-cache/dev-python/testify-0.11.0
index fae70ddc9632..a98a97e8b1a0 100644
--- a/metadata/md5-cache/dev-python/testify-0.11.0
+++ b/metadata/md5-cache/dev-python/testify-0.11.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/six-1.7.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.7.3[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A more pythonic replacement for the unittest module and nose
 EAPI=5
 HOMEPAGE=https://github.com/Yelp/testify https://pypi.org/project/testify/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/six-1.7.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.7.3[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testify/testify-0.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f9ec68560ef839c1e0e9116226d4ee6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd6023e86e8db8f9d4e8fc2ca46003f2
diff --git a/metadata/md5-cache/dev-python/testpath-0.3.1 b/metadata/md5-cache/dev-python/testpath-0.3.1
index 98ba0901d0ff..6ff98b494ae0 100644
--- a/metadata/md5-cache/dev-python/testpath-0.3.1
+++ b/metadata/md5-cache/dev-python/testpath-0.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=test? ( dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Test utilities for code working with files and commands
 EAPI=6
 HOMEPAGE=http://jupyter.org
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/testpath/archive/0.3.1.tar.gz -> testpath-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fc55b28e57e095d6696b94298ed72a0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ee4b5b875b2d64bd52bad21d6e6c0f72
diff --git a/metadata/md5-cache/dev-python/testpath-0.4.4 b/metadata/md5-cache/dev-python/testpath-0.4.4
index 33db84b77cc7..94a1e4d2fb4e 100644
--- a/metadata/md5-cache/dev-python/testpath-0.4.4
+++ b/metadata/md5-cache/dev-python/testpath-0.4.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Test utilities for code working with files and commands
 EAPI=7
 HOMEPAGE=https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/
-IUSE=test test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+IUSE=test test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jupyter/testpath/archive/0.4.4.tar.gz -> testpath-0.4.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c69fe024795cfa27a16517be1103725e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=48a2df2557f8451e1e00443a56e28ec2
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 8a3415bbd732..ffd1e974b316 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd53dd255b40379e48abdab53710d7f5
diff --git a/metadata/md5-cache/dev-python/testrepository-0.0.20 b/metadata/md5-cache/dev-python/testrepository-0.0.20
index 40c4dc6bb7cd..7ea574be1804 100644
--- a/metadata/md5-cache/dev-python/testrepository-0.0.20
+++ b/metadata/md5-cache/dev-python/testrepository-0.0.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testrepository/testrepository-0.0.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a14ecf3e9fa5c8485bbdf5dc3fcb7b9
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 6d72ddf1636f..c57926e14453 100644
--- a/metadata/md5-cache/dev-python/testresources-0.2.7-r2
+++ b/metadata/md5-cache/dev-python/testresources-0.2.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-0.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=60de042a4f4af9fa516dab6e49808cad
diff --git a/metadata/md5-cache/dev-python/testresources-1.0.0 b/metadata/md5-cache/dev-python/testresources-1.0.0
index b0272085b0c7..1f08ea0df4d9 100644
--- a/metadata/md5-cache/dev-python/testresources-1.0.0
+++ b/metadata/md5-cache/dev-python/testresources-1.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=588f113c3da3e7ca884b94b56a71d8a2
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1 b/metadata/md5-cache/dev-python/testresources-2.0.1
index eae26781dbb4..889360ccdff3 100644
--- a/metadata/md5-cache/dev-python/testresources-2.0.1
+++ b/metadata/md5-cache/dev-python/testresources-2.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testresources/testresources-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9fbfb5ca690c0b194f82c261b4ac1bc8
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.5.0 b/metadata/md5-cache/dev-python/testscenarios-0.5.0
index 0ea8b2cd97f2..646826bbaad3 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.5.0
+++ b/metadata/md5-cache/dev-python/testscenarios-0.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testscenarios/testscenarios-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a8567b543ac9910d0992ae95edf0a8f
diff --git a/metadata/md5-cache/dev-python/testtools-2.3.0 b/metadata/md5-cache/dev-python/testtools-2.3.0
index 58627d709d07..5e86a784102f 100644
--- a/metadata/md5-cache/dev-python/testtools-2.3.0
+++ b/metadata/md5-cache/dev-python/testtools-2.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/testtools/testtools-2.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8aa89b3c0821eca8f4304fc7f4f8866
diff --git a/metadata/md5-cache/dev-python/textfsm-0.4.0 b/metadata/md5-cache/dev-python/textfsm-0.4.0
index ac0e47d0b0bb..b5b63113b435 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/textfsm/textfsm-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1cf5d8519d6776a12a79e3ce46061e26
diff --git a/metadata/md5-cache/dev-python/texttable-1.6.2 b/metadata/md5-cache/dev-python/texttable-1.6.2
index b41f65e88877..8b4821fe17ad 100644
--- a/metadata/md5-cache/dev-python/texttable-1.6.2
+++ b/metadata/md5-cache/dev-python/texttable-1.6.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/foutaise/texttable/archive/v1.6.2.tar.gz -> texttable-1.6.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b60f5224f3bd44c38beada0d090f9bf6
diff --git a/metadata/md5-cache/dev-python/textx-1.4 b/metadata/md5-cache/dev-python/textx-1.4
index 2621c5f58e88..19c2709b3900 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/textX/textX-1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1716bf2bb8cbd81029b127082e877e8
diff --git a/metadata/md5-cache/dev-python/theano-1.0.4 b/metadata/md5-cache/dev-python/theano-1.0.4
index d25d7e189ed4..7aaddc47ccec 100644
--- a/metadata/md5-cache/dev-python/theano-1.0.4
+++ b/metadata/md5-cache/dev-python/theano-1.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/Theano/Theano-1.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=943e140946ee5c4e39495c2f3b65186c
diff --git a/metadata/md5-cache/dev-python/thrift-0.11.0 b/metadata/md5-cache/dev-python/thrift-0.11.0
index 0fc683d6782f..93aaf9e13619 100644
--- a/metadata/md5-cache/dev-python/thrift-0.11.0
+++ b/metadata/md5-cache/dev-python/thrift-0.11.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python implementation of Thrift
 EAPI=6
 HOMEPAGE=https://pypi.org/project/thrift/ https://thrift.apache.org/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/t/thrift/thrift-0.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed88d3a6d70e8e739da9fae492929975
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4413527882553c4967fc29fbf8a77f40
diff --git a/metadata/md5-cache/dev-python/thriftpy-0.3.9 b/metadata/md5-cache/dev-python/thriftpy-0.3.9
index 4185d9553558..6b743f2a6e9e 100644
--- a/metadata/md5-cache/dev-python/thriftpy-0.3.9
+++ b/metadata/md5-cache/dev-python/thriftpy-0.3.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cython-0.23[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pure python implementation of Apache Thrift
 EAPI=6
 HOMEPAGE=https://thriftpy.readthedocs.org/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/toro[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/flake8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/toro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-servers/tornado[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
 SRC_URI=mirror://pypi/t/thriftpy/thriftpy-0.3.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b6ce5ca139caa7a44a38dd902212e4a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef276ccee178a4c358e31b30bc31a950
diff --git a/metadata/md5-cache/dev-python/thunarx-python-0.5.1 b/metadata/md5-cache/dev-python/thunarx-python-0.5.1
deleted file mode 100644
index dbfef18dd2d7..000000000000
--- a/metadata/md5-cache/dev-python/thunarx-python-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 >=dev-python/pygobject-3.20:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=xfce-base/thunar-1.7.0 virtual/pkgconfig
-DESCRIPTION=Python bindings for the Thunar file manager
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/bindings/thunarx-python
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 >=dev-python/pygobject-3.20:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=xfce-base/thunar-1.7.0
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/bindings/thunarx-python/0.5/thunarx-python-0.5.1.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fd03808fca8e670e8104ec19191beea3
diff --git a/metadata/md5-cache/dev-python/thunarx-python-0.5.1-r1 b/metadata/md5-cache/dev-python/thunarx-python-0.5.1-r1
new file mode 100644
index 000000000000..a19ca8f62bdc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/thunarx-python-0.5.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 python_single_target_python3_6? ( >=dev-python/pygobject-3.20:3[python_targets_python3_6(-)] ) >=xfce-base/thunar-1.7.0 virtual/pkgconfig
+DESCRIPTION=Python bindings for the Thunar file manager
+EAPI=6
+HOMEPAGE=https://goodies.xfce.org/projects/bindings/thunarx-python
+IUSE=+python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.20:3 >=dev-libs/glib-2.30:2 python_single_target_python3_6? ( >=dev-python/pygobject-3.20:3[python_targets_python3_6(-)] ) >=xfce-base/thunar-1.7.0
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/bindings/thunarx-python/0.5/thunarx-python-0.5.1.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=27ef0167e94b2bf7feb866149bf79a04
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 f5e7754f2685..16463a7c6f69 100644
--- a/metadata/md5-cache/dev-python/timelib-0.2.4-r1
+++ b/metadata/md5-cache/dev-python/timelib-0.2.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15ea4b39dcc7e300727d1244fa510a9a
diff --git a/metadata/md5-cache/dev-python/tinycss-0.4 b/metadata/md5-cache/dev-python/tinycss-0.4
index b6671a4de34a..6f828802a029 100644
--- a/metadata/md5-cache/dev-python/tinycss-0.4
+++ b/metadata/md5-cache/dev-python/tinycss-0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss/tinycss-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=34dffc55eeb15e05d71f0acd7e1474ec
diff --git a/metadata/md5-cache/dev-python/tinycss2-0.5 b/metadata/md5-cache/dev-python/tinycss2-0.5
index 9ea5e886a322..58974ffcfbf4 100644
--- a/metadata/md5-cache/dev-python/tinycss2-0.5
+++ b/metadata/md5-cache/dev-python/tinycss2-0.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/webencodings[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/webencodings[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A complete yet simple CSS parser for Python
 EAPI=6
 HOMEPAGE=https://github.com/Kozea/tinycss2/ https://pypi.org/project/tinycss2/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/webencodings[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/webencodings[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss2/tinycss2-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0383469ac191d4d8945cd0445a0c69a1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9783841c4110f8649599cd789a9ccf78
diff --git a/metadata/md5-cache/dev-python/tinycss2-0.6.1 b/metadata/md5-cache/dev-python/tinycss2-0.6.1
index 7fc0883c12d0..26e2d7e7565a 100644
--- a/metadata/md5-cache/dev-python/tinycss2-0.6.1
+++ b/metadata/md5-cache/dev-python/tinycss2-0.6.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/webencodings[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/webencodings[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A complete yet simple CSS parser for Python
 EAPI=6
 HOMEPAGE=https://github.com/Kozea/tinycss2/ https://pypi.org/project/tinycss2/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-python/webencodings[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/webencodings[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss2/tinycss2-0.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9127143991c7f4b7b697932e35e48cba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b48b43b6a29c59962595733849fe73f8
diff --git a/metadata/md5-cache/dev-python/tinycss2-1.0.2 b/metadata/md5-cache/dev-python/tinycss2-1.0.2
index 4c9bde7f7a3b..e8f01ef33e98 100644
--- a/metadata/md5-cache/dev-python/tinycss2-1.0.2
+++ b/metadata/md5-cache/dev-python/tinycss2-1.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinycss2/tinycss2-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5add5c9f1e80e710b2749073c4eed944
diff --git a/metadata/md5-cache/dev-python/tinyrpc-1.0.1 b/metadata/md5-cache/dev-python/tinyrpc-1.0.1
index 055035610bc6..1d72015f8333 100644
--- a/metadata/md5-cache/dev-python/tinyrpc-1.0.1
+++ b/metadata/md5-cache/dev-python/tinyrpc-1.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tinyrpc/tinyrpc-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eb5210d4333f00ebd434a36d824d7091
diff --git a/metadata/md5-cache/dev-python/tld-0.10 b/metadata/md5-cache/dev-python/tld-0.10
index ecbc46233a77..c7e97a993edd 100644
--- a/metadata/md5-cache/dev-python/tld-0.10
+++ b/metadata/md5-cache/dev-python/tld-0.10
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Extract the top level domain (TLD) from the URL given
 EAPI=7
 HOMEPAGE=https://github.com/barseghyanartur/tld
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.10.tar.gz -> tld-0.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f213c1fd959584ebe9400913d3db1b8c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fb4b0b3a22d781cd5137a277f3815132
diff --git a/metadata/md5-cache/dev-python/tld-0.11.8 b/metadata/md5-cache/dev-python/tld-0.11.8
index 14ac283ccb8b..3a38aa6cb74b 100644
--- a/metadata/md5-cache/dev-python/tld-0.11.8
+++ b/metadata/md5-cache/dev-python/tld-0.11.8
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Extract the top level domain (TLD) from the URL given
 EAPI=7
 HOMEPAGE=https://github.com/barseghyanartur/tld
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.11.8.tar.gz -> tld-0.11.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f213c1fd959584ebe9400913d3db1b8c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fb4b0b3a22d781cd5137a277f3815132
diff --git a/metadata/md5-cache/dev-python/tld-0.9.7 b/metadata/md5-cache/dev-python/tld-0.9.7
index 120a6b66bedc..fc42c280f5d1 100644
--- a/metadata/md5-cache/dev-python/tld-0.9.7
+++ b/metadata/md5-cache/dev-python/tld-0.9.7
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Extract the top level domain (TLD) from the URL given
 EAPI=7
 HOMEPAGE=https://github.com/barseghyanartur/tld
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/barseghyanartur/tld/archive/0.9.7.tar.gz -> tld-0.9.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=229767b18a0c21956206f3c82334c080
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b8783c2b39a2ca0ccde41d72d954f53e
diff --git a/metadata/md5-cache/dev-python/tldextract-2.2.1 b/metadata/md5-cache/dev-python/tldextract-2.2.1
index 2b1232b90a1f..344fe00c26ca 100644
--- a/metadata/md5-cache/dev-python/tldextract-2.2.1
+++ b/metadata/md5-cache/dev-python/tldextract-2.2.1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Accurately separate the TLD from the registered domain and subdomains of a URL.
 EAPI=7
 HOMEPAGE=https://pypi.org/project/tldextract/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/idna[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests-file[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests-file[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tldextract/tldextract-2.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d1b12ea3a7a41eae2ffa0a858db97ae8
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c2db68bfb509bf4f52978eb9fc74f519
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 e55cec89f708..b640ef233a62 100644
--- a/metadata/md5-cache/dev-python/tlslite-0.4.9-r2
+++ b/metadata/md5-cache/dev-python/tlslite-0.4.9-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=TLS Lite is a free python library that implements SSL 3.0 and TLS 1.0/1.1
 EAPI=6
 HOMEPAGE=http://trevp.net/tlslite/ https://pypi.org/project/tlslite/ https://github.com/trevp/tlslite
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD public-domain
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tlslite/tlslite-0.4.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22ca77529ca74ede2f4cda48953abf8f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb11c8a3cb61d4a92ee254f1ee6dee39
diff --git a/metadata/md5-cache/dev-python/toml-0.10.0 b/metadata/md5-cache/dev-python/toml-0.10.0
index df3839a63878..f5e6e3668ed8 100644
--- a/metadata/md5-cache/dev-python/toml-0.10.0
+++ b/metadata/md5-cache/dev-python/toml-0.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/toml/toml-0.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b47fc44ca188e0e3edd803bdc2134bbd
diff --git a/metadata/md5-cache/dev-python/toml-0.10.0-r1 b/metadata/md5-cache/dev-python/toml-0.10.0-r1
index b0de51ef733a..0e1ae0085a90 100644
--- a/metadata/md5-cache/dev-python/toml-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/toml-0.10.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/uiri/toml/archive/0.10.0.tar.gz -> toml-0.10.0-1.tar.gz test? ( https://github.com/BurntSushi/toml-test/archive/39bb76d631ba103a94b377aaf52c979456677fb1.tar.gz -> toml-test-39bb76d631ba103a94b377aaf52c979456677fb1.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=13b9b56a2c6e9ff55953c31e4d1e25a1
diff --git a/metadata/md5-cache/dev-python/toolz-0.8.0 b/metadata/md5-cache/dev-python/toolz-0.8.0
index 607d5c31d60c..b068e4615097 100644
--- a/metadata/md5-cache/dev-python/toolz-0.8.0
+++ b/metadata/md5-cache/dev-python/toolz-0.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=List processing tools and functional utilities
 EAPI=5
 HOMEPAGE=https://pypi.org/project/toolz/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/t/toolz/toolz-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7c2f02e6821e950504234b862f42b31
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b5a8da223688eab56a02dd5e2ab95032
diff --git a/metadata/md5-cache/dev-python/toolz-0.8.2 b/metadata/md5-cache/dev-python/toolz-0.8.2
index 747de977782a..8fdf240b39a8 100644
--- a/metadata/md5-cache/dev-python/toolz-0.8.2
+++ b/metadata/md5-cache/dev-python/toolz-0.8.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=List processing tools and functional utilities
 EAPI=6
 HOMEPAGE=https://pypi.org/project/toolz/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/t/toolz/toolz-0.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ec1b4e4d010a7b84f0676b3c3c8fabd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4844b5c8ba6a8afadfb16c9b55415697
diff --git a/metadata/md5-cache/dev-python/toolz-0.9.0 b/metadata/md5-cache/dev-python/toolz-0.9.0
index 96f62122cd6b..7b34e59b12d4 100644
--- a/metadata/md5-cache/dev-python/toolz-0.9.0
+++ b/metadata/md5-cache/dev-python/toolz-0.9.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=List processing tools and functional utilities
 EAPI=7
 HOMEPAGE=https://pypi.org/project/toolz/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/toolz/toolz-0.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=786c5cef881fd986917e428d08cffff1
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=38faf0df133a1530f0e55c1bb13e731f
diff --git a/metadata/md5-cache/dev-python/tooz-1.60.1 b/metadata/md5-cache/dev-python/tooz-1.60.1
index ec69de711ac8..87def1e54ddd 100644
--- a/metadata/md5-cache/dev-python/tooz-1.60.1
+++ b/metadata/md5-cache/dev-python/tooz-1.60.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8[python_targets_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/tooz/tooz-1.60.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a54eb103ef0f954f43c959aacefea6c8
diff --git a/metadata/md5-cache/dev-python/toro-1.0.1 b/metadata/md5-cache/dev-python/toro-1.0.1
index eb71b73cfe5f..e10236227df4 100644
--- a/metadata/md5-cache/dev-python/toro-1.0.1
+++ b/metadata/md5-cache/dev-python/toro-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Synchronization primitives for Tornado coroutines
 EAPI=6
 HOMEPAGE=https://github.com/ajdavis/toro/
-IUSE=examples test python_targets_python2_7 python_targets_python3_6
+IUSE=examples test python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=virtual/python-futures[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-servers/tornado[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/toro/toro-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=43c1d0ced3a6162146e1f9d379f47fe2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd3dbedcdecb74e10edcc64bb534e82d
diff --git a/metadata/md5-cache/dev-python/towncrier-19.2.0 b/metadata/md5-cache/dev-python/towncrier-19.2.0
index 7f46289982a6..398b82956346 100644
--- a/metadata/md5-cache/dev-python/towncrier-19.2.0
+++ b/metadata/md5-cache/dev-python/towncrier-19.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hawkowl/towncrier/archive/19.2.0.tar.gz -> towncrier-19.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=da3a29aee233050b0905731d1fcce136
diff --git a/metadata/md5-cache/dev-python/tox-2.9.1 b/metadata/md5-cache/dev-python/tox-2.9.1
index 8bf988189944..0b7788dad03b 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_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tox/tox-2.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13871f1532a3db426baced7c7284bc79
diff --git a/metadata/md5-cache/dev-python/tox-3.12.1 b/metadata/md5-cache/dev-python/tox-3.12.1
index 8b0d38501c27..86389d24f587 100644
--- a/metadata/md5-cache/dev-python/tox-3.12.1
+++ b/metadata/md5-cache/dev-python/tox-3.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/3.12.1.tar.gz -> tox-3.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a27a76798d22ed3d9a3192d2142e33d0
diff --git a/metadata/md5-cache/dev-python/tox-3.14.3-r1 b/metadata/md5-cache/dev-python/tox-3.14.3-r1
index f9a1483abdfe..2f9f1393fbfb 100644
--- a/metadata/md5-cache/dev-python/tox-3.14.3-r1
+++ b/metadata/md5-cache/dev-python/tox-3.14.3-r1
@@ -4,12 +4,12 @@ DESCRIPTION=virtualenv-based automation of test activities
 EAPI=7
 HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 sparc x86
+KEYWORDS=amd64 ~ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] <dev-python/pluggy-1.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tox-dev/tox/archive/3.14.3.tar.gz -> tox-3.14.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=976d341050019bc6c94231f90fa7e4c5
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=51645ae03db553e13770de74802ffd62
diff --git a/metadata/md5-cache/dev-python/tox-3.2.1 b/metadata/md5-cache/dev-python/tox-3.2.1
index c70960fa93ef..a71906c37456 100644
--- a/metadata/md5-cache/dev-python/tox-3.2.1
+++ b/metadata/md5-cache/dev-python/tox-3.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tox/tox-3.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6dad42cdbf06e41022d05b5841c62661
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 2bd1cd9598c0..992b9a06ce07 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57c89b7f3d93ee0bef9847d8f61d4024
diff --git a/metadata/md5-cache/dev-python/tqdm-4.23.3 b/metadata/md5-cache/dev-python/tqdm-4.23.3
index 71938c8973f1..5be504afd5bb 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_6 )
 SLOT=0
 SRC_URI=https://github.com/tqdm/tqdm/archive/v4.23.3.tar.gz -> tqdm-4.23.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=635a81e4617bd9a2320fe2796402dc17
diff --git a/metadata/md5-cache/dev-python/tqdm-4.33.0 b/metadata/md5-cache/dev-python/tqdm-4.33.0
index 493dfbafaad3..8487f3f6d2d9 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.33.0
+++ b/metadata/md5-cache/dev-python/tqdm-4.33.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.33.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6da7414ebca304e2430ded4f93cfca3b
diff --git a/metadata/md5-cache/dev-python/tqdm-4.40.0 b/metadata/md5-cache/dev-python/tqdm-4.40.0
index 8fb525a57c48..18d9ae5f9c6a 100644
--- a/metadata/md5-cache/dev-python/tqdm-4.40.0
+++ b/metadata/md5-cache/dev-python/tqdm-4.40.0
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Add a progress meter to your loops in a second
 EAPI=7
 HOMEPAGE=https://github.com/tqdm/tqdm
 IUSE=examples test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~hppa ~sparc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tqdm/tqdm-4.40.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c9fe4ffd49dd8fbfd9537f6b0ae5630c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1105d37b185a10fcfbe62d7209dc96d7
diff --git a/metadata/md5-cache/dev-python/tqdm-9999 b/metadata/md5-cache/dev-python/tqdm-9999
index 23db309c503c..5c88e5ce876c 100644
--- a/metadata/md5-cache/dev-python/tqdm-9999
+++ b/metadata/md5-cache/dev-python/tqdm-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Add a progress meter to your loops in a second
 EAPI=7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c9fe4ffd49dd8fbfd9537f6b0ae5630c
diff --git a/metadata/md5-cache/dev-python/traceback2-1.4.0 b/metadata/md5-cache/dev-python/traceback2-1.4.0
index 3de51f3c8c4b..af6cf28a2611 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traceback2/traceback2-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2abc6dd56febdebbd301e78a9a75233a
diff --git a/metadata/md5-cache/dev-python/traitlets-4.3.2 b/metadata/md5-cache/dev-python/traitlets-4.3.2
index 1ce114f100bc..5ca83de170df 100644
--- a/metadata/md5-cache/dev-python/traitlets-4.3.2
+++ b/metadata/md5-cache/dev-python/traitlets-4.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/traitlets/traitlets-4.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=306ec4230a33f98d6a93d2edc82e7967
diff --git a/metadata/md5-cache/dev-python/transitions-0.7.1 b/metadata/md5-cache/dev-python/transitions-0.7.1
index 236028c4a43a..59e188c0705e 100644
--- a/metadata/md5-cache/dev-python/transitions-0.7.1
+++ b/metadata/md5-cache/dev-python/transitions-0.7.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytransitions/transitions/archive/0.7.1.tar.gz -> transitions-0.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=db4f7f17a962357279d994cbc976b0dc
diff --git a/metadata/md5-cache/dev-python/transitions-0.7.2 b/metadata/md5-cache/dev-python/transitions-0.7.2
index 7be94bc0c226..13c2da7668ec 100644
--- a/metadata/md5-cache/dev-python/transitions-0.7.2
+++ b/metadata/md5-cache/dev-python/transitions-0.7.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pytransitions/transitions/archive/0.7.2.tar.gz -> transitions-0.7.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5689f0b487c9e7be639f0c9f7f6506f5
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-2.4.0 b/metadata/md5-cache/dev-python/translate-toolkit-2.4.0
index 0e43907321f3..b0e9c24540fe 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-2.4.0
+++ b/metadata/md5-cache/dev-python/translate-toolkit-2.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) subtitles? ( || ( python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/translate/translate/releases/download/2.4.0/translate-toolkit-2.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=231e81b182a98589c343856b7cf85aa6
diff --git a/metadata/md5-cache/dev-python/translationstring-1.3 b/metadata/md5-cache/dev-python/translationstring-1.3
index dbd4e4f88834..d7e828928f15 100644
--- a/metadata/md5-cache/dev-python/translationstring-1.3
+++ b/metadata/md5-cache/dev-python/translationstring-1.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Utility library for i18n relied on by various Repoze packages
 EAPI=5
 HOMEPAGE=https://github.com/Pylons/translationstring https://pypi.org/project/translationstring/
-IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_pypy3 python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=repoze
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/translationstring/translationstring-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afbb71e6e303a3e91d50b0f6387e2f9f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78768b644898c8f287b612fa87ea2c2e
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-0.11 b/metadata/md5-cache/dev-python/transmissionrpc-0.11
index 467c0e9a7f0a..d41ed787e301 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_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efa60f60b366185a8d95f2970835be6e
diff --git a/metadata/md5-cache/dev-python/transmissionrpc-9999 b/metadata/md5-cache/dev-python/transmissionrpc-9999
index 7cc9c864da75..6276a9b511e2 100644
--- a/metadata/md5-cache/dev-python/transmissionrpc-9999
+++ b/metadata/md5-cache/dev-python/transmissionrpc-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/six-1.1.0[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa8809d686f67ca913a319b851658d53
diff --git a/metadata/md5-cache/dev-python/treq-17.8.0 b/metadata/md5-cache/dev-python/treq-17.8.0
index b3742cb7d4e6..c7686536f747 100644
--- a/metadata/md5-cache/dev-python/treq-17.8.0
+++ b/metadata/md5-cache/dev-python/treq-17.8.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.4.0[crypt,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyflakes[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pep8[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/httpbin[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-16.4.0[crypt,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyflakes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pep8[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/httpbin[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A requests-like API built on top of twisted.web's Agent
 EAPI=6
 HOMEPAGE=https://github.com/twisted/treq https://pypi.org/project/treq/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/twisted-16.4.0[crypt,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-16.4.0[crypt,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/attrs[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-17.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a44a085a2131ed856055613a59584b3d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bf9032acf90343a9aeedf083563a6bce
diff --git a/metadata/md5-cache/dev-python/trollius-2.1 b/metadata/md5-cache/dev-python/trollius-2.1
index 880152e79f03..747b14099c35 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_python2_7(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/trollius/trollius-2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6fa2fdfa0fa586eb6af48e226fff7977
diff --git a/metadata/md5-cache/dev-python/trollius-2.2 b/metadata/md5-cache/dev-python/trollius-2.2
index 9d164c9c2292..985cae1be347 100644
--- a/metadata/md5-cache/dev-python/trollius-2.2
+++ b/metadata/md5-cache/dev-python/trollius-2.2
@@ -11,5 +11,5 @@ RDEPEND=virtual/python-futures[python_targets_python2_7(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/trollius/trollius-2.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d64e2560fc0311f00be7fe91d23a7c15
diff --git a/metadata/md5-cache/dev-python/trustme-0.5.0-r1 b/metadata/md5-cache/dev-python/trustme-0.5.0-r1
index 7570242ed6ea..21a7bcb63856 100644
--- a/metadata/md5-cache/dev-python/trustme-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/trustme-0.5.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=398caa6b4f5dcf7002e1a2b75ac3ab97
diff --git a/metadata/md5-cache/dev-python/trustme-0.5.2 b/metadata/md5-cache/dev-python/trustme-0.5.2
index e5d03778debe..6c998c5c3553 100644
--- a/metadata/md5-cache/dev-python/trustme-0.5.2
+++ b/metadata/md5-cache/dev-python/trustme-0.5.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ee429e5950e81c30611fd5391f01beb
diff --git a/metadata/md5-cache/dev-python/trustme-0.5.3 b/metadata/md5-cache/dev-python/trustme-0.5.3
index b23eb82859a9..de60e6f22cec 100644
--- a/metadata/md5-cache/dev-python/trustme-0.5.3
+++ b/metadata/md5-cache/dev-python/trustme-0.5.3
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=#1 quality TLS certs while you wait, for the discerning tester
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7033d0f6fa1fd00709cd09fc160f7d9d
diff --git a/metadata/md5-cache/dev-python/trustme-0.6.0 b/metadata/md5-cache/dev-python/trustme-0.6.0
index bd4f7941be93..ac3d38333096 100644
--- a/metadata/md5-cache/dev-python/trustme-0.6.0
+++ b/metadata/md5-cache/dev-python/trustme-0.6.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/idna[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/service_identity[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
 DESCRIPTION=#1 quality TLS certs while you wait, for the discerning tester
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/trustme/trustme-0.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7033d0f6fa1fd00709cd09fc160f7d9d
diff --git a/metadata/md5-cache/dev-python/ttystatus-0.36 b/metadata/md5-cache/dev-python/ttystatus-0.36
index cc74e707fb9d..53af7338b49e 100644
--- a/metadata/md5-cache/dev-python/ttystatus-0.36
+++ b/metadata/md5-cache/dev-python/ttystatus-0.36
@@ -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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://git.liw.fi/ttystatus/snapshot/ttystatus-0.36.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=756d5afa6407f2f96b321b8d0c073fe4
diff --git a/metadata/md5-cache/dev-python/turbocheetah-1.0-r1 b/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
index 57a9878a5105..1e7888fcbf07 100644
--- a/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
+++ b/metadata/md5-cache/dev-python/turbocheetah-1.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboCheetah/TurboCheetah-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5790afc0662ffcaaeacba18d1e0b4d8c
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 14cc5320840a..ae8c81085fd0 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_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboJson/TurboJson-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a46836c7985afab1c609748332dd995
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 be68baef72f6..5d2a26c4eacd 100644
--- a/metadata/md5-cache/dev-python/turbokid-1.0.5-r1
+++ b/metadata/md5-cache/dev-python/turbokid-1.0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/T/TurboKid/TurboKid-1.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=020c5978422515b428d6425683bcd772
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 1a792fe1e42c..f361cabc2010 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python interface to thetvdb.com API
 EAPI=6
 HOMEPAGE=https://github.com/dbr/tvdb_api
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=public-domain
-RDEPEND=dev-python/requests-cache[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/requests-cache[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
 SRC_URI=https://dev.gentoo.org/~thev00d00/distfiles/dev-python/tvdb_api-1.10_pre20150406.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d644b857256a119bf5663d702b0cc153
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3d0ac0d67b6ef989c4cde2c6180af6c
diff --git a/metadata/md5-cache/dev-python/tvdb_api-1.9 b/metadata/md5-cache/dev-python/tvdb_api-1.9
deleted file mode 100644
index 350b8fb1e497..000000000000
--- a/metadata/md5-cache/dev-python/tvdb_api-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools python_targets_python2_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/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python interface to thetvdb.com API
-EAPI=5
-HOMEPAGE=https://github.com/dbr/tvdb_api
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=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_python2_7(-)]
-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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cba58d9aa23b9701bbba11654dc83797
diff --git a/metadata/md5-cache/dev-python/tvdb_api-2.0 b/metadata/md5-cache/dev-python/tvdb_api-2.0
index a763a55b49db..914920689468 100644
--- a/metadata/md5-cache/dev-python/tvdb_api-2.0
+++ b/metadata/md5-cache/dev-python/tvdb_api-2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python interface to thetvdb.com API
 EAPI=6
 HOMEPAGE=https://github.com/dbr/tvdb_api
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-RDEPEND=dev-python/requests-cache[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/requests-cache[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
 SRC_URI=mirror://pypi/t/tvdb_api/tvdb_api-2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bf83aec81ae2e9d62990166af64d4ed
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=69da4e0612bf7ca93d2cd2d44ea01e50
diff --git a/metadata/md5-cache/dev-python/tweepy-3.5.0 b/metadata/md5-cache/dev-python/tweepy-3.5.0
index 0968bf393580..999903a89af5 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/t/tweepy/tweepy-3.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bee0a02fb3b3995f8eb51f8595243be8
diff --git a/metadata/md5-cache/dev-python/twine-1.11.0 b/metadata/md5-cache/dev-python/twine-1.11.0
index 0cd781bd2e0d..e0fc5ab5ea24 100644
--- a/metadata/md5-cache/dev-python/twine-1.11.0
+++ b/metadata/md5-cache/dev-python/twine-1.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/1.11.0.tar.gz -> twine-1.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35f1f32d4ffbe094b9b8046a7b811199
diff --git a/metadata/md5-cache/dev-python/twine-1.15.0 b/metadata/md5-cache/dev-python/twine-1.15.0
index d276076e8f9a..d3cedc3bb406 100644
--- a/metadata/md5-cache/dev-python/twine-1.15.0
+++ b/metadata/md5-cache/dev-python/twine-1.15.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/1.15.0.tar.gz -> twine-1.15.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c88d10320a08f8e37070a749d8923a2f
diff --git a/metadata/md5-cache/dev-python/twine-3.0.0 b/metadata/md5-cache/dev-python/twine-3.0.0
index 64b5f4463cc6..abdac74ceb50 100644
--- a/metadata/md5-cache/dev-python/twine-3.0.0
+++ b/metadata/md5-cache/dev-python/twine-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/3.0.0.tar.gz -> twine-3.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e3c3fcf36c4ba19fe689e526e7aceba6
diff --git a/metadata/md5-cache/dev-python/twine-3.1.1 b/metadata/md5-cache/dev-python/twine-3.1.1
index 7b23063e9111..cd9c49268e44 100644
--- a/metadata/md5-cache/dev-python/twine-3.1.1
+++ b/metadata/md5-cache/dev-python/twine-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/twine/archive/3.1.1.tar.gz -> twine-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5654b714de242c3e85b321ced1df5789
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 89512bde012b..07a2f642fa3c 100644
--- a/metadata/md5-cache/dev-python/twisted-16.6.0-r3
+++ b/metadata/md5-cache/dev-python/twisted-16.6.0-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=846955cd26b08a0bdba09d965e0a6eed
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 f2fffe6be0c3..715b3f2ebc08 100644
--- a/metadata/md5-cache/dev-python/twisted-17.1.0-r2
+++ b/metadata/md5-cache/dev-python/twisted-17.1.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d06a32e383755a1727708a4b24a8ef16
diff --git a/metadata/md5-cache/dev-python/twisted-17.9.0 b/metadata/md5-cache/dev-python/twisted-17.9.0
index f4f9327e856e..ecc3f2ffa065 100644
--- a/metadata/md5-cache/dev-python/twisted-17.9.0
+++ b/metadata/md5-cache/dev-python/twisted-17.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54dde48c48eb8a7e0c7b594c2aa8cec7
diff --git a/metadata/md5-cache/dev-python/twisted-18.4.0 b/metadata/md5-cache/dev-python/twisted-18.4.0
index 54b37c6dbec1..3e5357b9dc78 100644
--- a/metadata/md5-cache/dev-python/twisted-18.4.0
+++ b/metadata/md5-cache/dev-python/twisted-18.4.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/18.4/Twisted-18.4.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=469d5c0344e91a61e1d6f7486f02d05b
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f13228df17132addc319659114e90ea8
diff --git a/metadata/md5-cache/dev-python/twisted-18.7.0 b/metadata/md5-cache/dev-python/twisted-18.7.0
index 4b0ab3411141..d0a625297a39 100644
--- a/metadata/md5-cache/dev-python/twisted-18.7.0
+++ b/metadata/md5-cache/dev-python/twisted-18.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/18.7/Twisted-18.7.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a37dece6d9a0e6b092d62ecf51f40c78
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c875fb80badd49211839b8aa5f7e5b38
diff --git a/metadata/md5-cache/dev-python/twisted-19.10.0 b/metadata/md5-cache/dev-python/twisted-19.10.0
index bc22736399b5..4237acbc8af1 100644
--- a/metadata/md5-cache/dev-python/twisted-19.10.0
+++ b/metadata/md5-cache/dev-python/twisted-19.10.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Twisted/19.10/Twisted-19.10.0.tar.bz2 https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4403f14d6208cb8776e090b2db8657df
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 552cdf393452..2eaf7045f2d2 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d12bf6bf0afa0936a475be8e4ddab551
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 131cea342f2a..e6f5e3231942 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 86db46dd5bfa..fa36db6586e5 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=40f4f811cbb45692b35e541abedc0a3a
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 c265a3cf2c39..dadb4ddaf4d7 100644
--- a/metadata/md5-cache/dev-python/twisted-core-15.2.1
+++ b/metadata/md5-cache/dev-python/twisted-core-15.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://twistedmatrix.com/Releases/Core/15.2/TwistedCore-15.2.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c9f6d0edfecc4d48f9c5a831948e5be
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 d275b43ab0aa..d2d9d9727d3e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d2f2921aa1db2f35aad4b68b2a838a1
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 5807e4e7ae1a..cd4a9c26d10e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 db5cabab51c2..fcaf49ab1bae 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=226d3316edf3f55978ebe3b3080bb6aa
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 c784b43f21ab..df8507d564a3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 07ee06fad7e3..6ceced814cd9 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=767658120c8cc4902f9f093f9c0e70e5
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 e06cc1cb9d28..456628259343 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 ad48b7642d9a..c7085530f887 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3848642ddfc17500a30d153ba236aba
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 b6599aac0212..5f950598a702 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f305d12e01c8..9b703d526051 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 d3b95e89452f..6e4f84a8c4eb 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 54f28a6178ad..5e46f049af07 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a6a5701183170dee79675d449d472ed
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 8cf45ef5e1f8..f044fcd61d82 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a0d61a454218..f3b8f037548c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51e31d097a5f0aa676a4b2075266cebd
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 d042ba311a1d..4e2b969d9124 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c9431db3bb17cd18aecc990d059824a
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 be654f97a7fa..686c4976ae46 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=785ccc1385848b6622573d1372566f41
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 ec5f97b9583c..72e27e403ce0 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1be702c9d14b541235657053dbfa42d
diff --git a/metadata/md5-cache/dev-python/twitter-1.18.0 b/metadata/md5-cache/dev-python/twitter-1.18.0
index 155ceb6b9424..c02801f36054 100644
--- a/metadata/md5-cache/dev-python/twitter-1.18.0
+++ b/metadata/md5-cache/dev-python/twitter-1.18.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=An API and command-line toolset for Twitter (twitter.com)
 EAPI=7
 HOMEPAGE=https://mike.verdone.ca/twitter/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/t/twitter/twitter-1.18.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=70c26d56f87e402c82058e684e0f980a
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ae5a3d4a1909567021c5b014e3ef8b32
diff --git a/metadata/md5-cache/dev-python/twython-3.3.0 b/metadata/md5-cache/dev-python/twython-3.3.0
index d25cb2fb74a3..9c84709d5da7 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_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/twython/twython-3.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=03618facb2e9a963798007e8290a552f
diff --git a/metadata/md5-cache/dev-python/twython-3.6.0 b/metadata/md5-cache/dev-python/twython-3.6.0
index ee73a8ff260b..37f0f056e4bf 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_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/twython/twython-3.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9b50b8f83dee291725b4af9623e905db
diff --git a/metadata/md5-cache/dev-python/txAMQP-0.8.2 b/metadata/md5-cache/dev-python/txAMQP-0.8.2
index 9c962c064177..5d9ac31e2bfa 100644
--- a/metadata/md5-cache/dev-python/txAMQP-0.8.2
+++ b/metadata/md5-cache/dev-python/txAMQP-0.8.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( || ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/twisted-core[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(-)] net-misc/rabbitmq-server )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( || ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted-core[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/rabbitmq-server )
 DESCRIPTION=Python library for communicating with AMQP peers using Twisted
 EAPI=7
 HOMEPAGE=https://github.com/txamqp/txamqp
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=|| ( dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/twisted-core[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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=|| ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted-core[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/six[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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/txamqp/txamqp/archive/0.8.2.tar.gz -> txamqp-0.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=549844fdc7940fc8fab1591420f6496b
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9d861ce7f671e7b085f62dfb667ee123
diff --git a/metadata/md5-cache/dev-python/txaio-2.7.1 b/metadata/md5-cache/dev-python/txaio-2.7.1
index 3f8c9b994a9c..11d88ad058f0 100644
--- a/metadata/md5-cache/dev-python/txaio-2.7.1
+++ b/metadata/md5-cache/dev-python/txaio-2.7.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip dev-python/setuptools[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(-)] doc? ( >=dev-python/sphinx-1.2.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sphinxcontrib-spelling-2.1.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/alabaster[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ~dev-python/mock-1.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.6[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.2.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinxcontrib-spelling-2.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/alabaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.6.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/mock-1.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.6.6[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Compatibility API between asyncio/Twisted/Trollius
 EAPI=6
 HOMEPAGE=https://github.com/crossbario/txaio https://pypi.org/project/txaio/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_python3_6
 KEYWORDS=amd64 arm x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-2.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d31c6738b6d0eccd7e586599b83b3a5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18a9cc2a4a8dae7c3e27f618917e86b7
diff --git a/metadata/md5-cache/dev-python/txaio-2.9.0 b/metadata/md5-cache/dev-python/txaio-2.9.0
index 796bca8d0edc..f764fa769f1b 100644
--- a/metadata/md5-cache/dev-python/txaio-2.9.0
+++ b/metadata/md5-cache/dev-python/txaio-2.9.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[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(-)] doc? ( >=dev-python/sphinx-1.2.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sphinxcontrib-spelling-2.1.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1.9[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.6.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( >=dev-python/sphinx-1.2.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinxcontrib-spelling-2.1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1.9[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( >=dev-python/pytest-2.6.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mock-1.3.0[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Compatibility API between asyncio/Twisted/Trollius
 EAPI=6
 HOMEPAGE=https://github.com/crossbario/txaio https://pypi.org/project/txaio/
-IUSE=doc test python_targets_python2_7 python_targets_python3_6
+IUSE=doc test python_targets_python3_6
 KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-python/trollius-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/futures-3.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/txaio/txaio-2.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f211c7dee52c826fa77074a00400b82b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4d9ec5413e732d40c9bf7e40097be33
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 5dc066105727..40257aabd5b5 100644
--- a/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
+++ b/metadata/md5-cache/dev-python/txgithub-15.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ( >=dev-python/twisted-core-12.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/twisted-web-12.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ) dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=|| ( >=dev-python/twisted-16.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ( >=dev-python/twisted-core-12.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-web-12.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) dev-python/pyopenssl[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=GitHub API client implemented using Twisted
 EAPI=6
 HOMEPAGE=https://github.com/tomprince/txgithub https://pypi.org/project/txgithub/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=|| ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ( >=dev-python/twisted-core-12.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/twisted-web-12.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) ) dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=|| ( >=dev-python/twisted-16.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ( >=dev-python/twisted-core-12.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/twisted-web-12.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ) dev-python/pyopenssl[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 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d84fdc32f2b87a7eac4f03739519aeb4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af8350b98c72dcc73a2d4b3fde7d25c7
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 96a88f51f399..4787224469e6 100644
--- a/metadata/md5-cache/dev-python/txrequests-0.9.5-r1
+++ b/metadata/md5-cache/dev-python/txrequests-0.9.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/requests-1.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/requests-1.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Asynchronous Python HTTP for Humans
 EAPI=6
 HOMEPAGE=https://github.com/tardyp/txrequests
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-1.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/twisted[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/requests-1.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[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
 SRC_URI=mirror://pypi/t/txrequests/txrequests-0.9.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d110666d4fe1de4b75471f16c076ca8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85582e516ac4cc4eb1fc661bb61fc252
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 bbc6ca9eb57b..0fb60b790ca3 100644
--- a/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
+++ b/metadata/md5-cache/dev-python/txtorcon-0.19.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/txtorcon/txtorcon-0.19.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad501d46f634b6456234ae093e2d9638
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.4.0-r1 b/metadata/md5-cache/dev-python/typed-ast-1.4.0-r1
index 83db6d2aeb0b..ba3e3cc9e9be 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.4.0-r1
+++ b/metadata/md5-cache/dev-python/typed-ast-1.4.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/typed_ast/typed_ast-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=04a7f84bf9cc469bfb3755ea48bd1a82
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.4.1 b/metadata/md5-cache/dev-python/typed-ast-1.4.1
index 3cb29a023e22..de5d20bbc889 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.4.1
+++ b/metadata/md5-cache/dev-python/typed-ast-1.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/typed_ast/typed_ast-1.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=69e0e6d77a216e5d9d7cebb7fd2d17f6
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 9b4db2e6626d..89f426c0377d 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_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/typing/typing-3.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=881e699fdbded3b90e6280951f1af1c2
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 ea14958151bf..527a8f15904e 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_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/typing/typing-3.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=adfb87a3f3f28f52b83637a653b5d4b0
diff --git a/metadata/md5-cache/dev-python/typing-3.7.4.1 b/metadata/md5-cache/dev-python/typing-3.7.4.1
index db4d3befd39d..97eae34337a7 100644
--- a/metadata/md5-cache/dev-python/typing-3.7.4.1
+++ b/metadata/md5-cache/dev-python/typing-3.7.4.1
@@ -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=mirror://pypi/t/typing/typing-3.7.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3a2f31d44d9e3463767abc0a36929ef5
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.7.4 b/metadata/md5-cache/dev-python/typing-extensions-3.7.4
index 91e2d76b9324..025d40a37068 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.7.4
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.7.4
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.7.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4eb5031cb67151eff3d4098fab1f2c32
diff --git a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.1 b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.1
index 3f9904d6b274..edfb0b7fe346 100644
--- a/metadata/md5-cache/dev-python/typing-extensions-3.7.4.1
+++ b/metadata/md5-cache/dev-python/typing-extensions-3.7.4.1
@@ -11,5 +11,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/t/typing_extensions/typing_extensions-3.7.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=86fc8917c88b9bcdc003a9a6fc46dd4c
diff --git a/metadata/md5-cache/dev-python/tzlocal-1.2 b/metadata/md5-cache/dev-python/tzlocal-1.2
index 3f2c0d01f156..aa988a2e3956 100644
--- a/metadata/md5-cache/dev-python/tzlocal-1.2
+++ b/metadata/md5-cache/dev-python/tzlocal-1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=tzinfo object for the local timezone
 EAPI=5
 HOMEPAGE=https://github.com/regebro/tzlocal
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=CC0-1.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/t/tzlocal/tzlocal-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35540b51779880de7d807bd5addf3e0c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=65e5ea206987e1f095c40ceb30e85551
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 2965081f03e2..664f92aebcd7 100644
--- a/metadata/md5-cache/dev-python/u-msgpack-2.4.1
+++ b/metadata/md5-cache/dev-python/u-msgpack-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2b53f241ee038c6963a7a53fe80086d0
diff --git a/metadata/md5-cache/dev-python/u-msgpack-2.5.2 b/metadata/md5-cache/dev-python/u-msgpack-2.5.2
index 1904996c11f2..e600f351433f 100644
--- a/metadata/md5-cache/dev-python/u-msgpack-2.5.2
+++ b/metadata/md5-cache/dev-python/u-msgpack-2.5.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/u-msgpack-python/u-msgpack-python-2.5.2.tar.gz -> u-msgpack-2.5.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0029197d6bc87b26eb254f2920da53e2
diff --git a/metadata/md5-cache/dev-python/ubelt-0.8.8 b/metadata/md5-cache/dev-python/ubelt-0.8.8
new file mode 100644
index 000000000000..0b141dc569cc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ubelt-0.8.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ordered-set[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinxcontrib-napoleon[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinxcontrib-napoleon[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinxcontrib-napoleon[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/xdoctest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=A stdlib like feel, and extra batteries. Hashing, Caching, Timing, Progress
+EAPI=7
+HOMEPAGE=https://github.com/Erotemic/ubelt
+IUSE=doc test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/ordered-set[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Erotemic/ubelt/archive/0.8.8.tar.gz -> ubelt-0.8.8.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4bb2acee644507592ddf15a8828c2da9
diff --git a/metadata/md5-cache/dev-python/ufoLib-3.0.0 b/metadata/md5-cache/dev-python/ufoLib-3.0.0
index 2204e05f6652..d73cf42e03d1 100644
--- a/metadata/md5-cache/dev-python/ufoLib-3.0.0
+++ b/metadata/md5-cache/dev-python/ufoLib-3.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/unified-font-object/ufoLib/archive/v3.0.0.tar.gz -> ufoLib-3.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4b444dbfd2f79fec2ea8790320e6dd94
diff --git a/metadata/md5-cache/dev-python/uhashring-1.0 b/metadata/md5-cache/dev-python/uhashring-1.0
index 0620b13efa7e..83d5a3728f65 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/u/uhashring/uhashring-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64e61995d5ec8134b68e735ac841ef19
diff --git a/metadata/md5-cache/dev-python/ujson-1.35 b/metadata/md5-cache/dev-python/ujson-1.35
index 86a529245048..fd2862ed33f1 100644
--- a/metadata/md5-cache/dev-python/ujson-1.35
+++ b/metadata/md5-cache/dev-python/ujson-1.35
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( python_targets_python2_7? ( dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=6
 HOMEPAGE=https://pypi.org/project/ujson/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.35.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f9f10ec097acabd698c85a3f937bcaa
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1f35ec3eb5d9968ae8f95c9266ad17a8
diff --git a/metadata/md5-cache/dev-python/ujson-1.35-r1 b/metadata/md5-cache/dev-python/ujson-1.35-r1
index 8d7e9679894f..20d71ee4ca5d 100644
--- a/metadata/md5-cache/dev-python/ujson-1.35-r1
+++ b/metadata/md5-cache/dev-python/ujson-1.35-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( python_targets_python2_7? ( dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pytz[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ujson/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.35.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=44037b1e2154b9df6391bae560cf848d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=cadf0aaed09396ac30c91c6ea8778c05
diff --git a/metadata/md5-cache/dev-python/uncertainties-3.0.1 b/metadata/md5-cache/dev-python/uncertainties-3.0.1
index 9b5cafb4a204..69dcd466895b 100644
--- a/metadata/md5-cache/dev-python/uncertainties-3.0.1
+++ b/metadata/md5-cache/dev-python/uncertainties-3.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncertainties/uncertainties-3.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ca4fdc286b3ffb7efda43d291c97139
diff --git a/metadata/md5-cache/dev-python/uncompyle6-2.10.1 b/metadata/md5-cache/dev-python/uncompyle6-2.10.1
index 78ffcd64f094..cf88ddf1204b 100644
--- a/metadata/md5-cache/dev-python/uncompyle6-2.10.1
+++ b/metadata/md5-cache/dev-python/uncompyle6-2.10.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uncompyle6/uncompyle6-2.10.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52eed919fa8dc8d66dff91f0abd6d118
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.14.1 b/metadata/md5-cache/dev-python/unicodecsv-0.14.1
index 5806f9172ba1..78a822cf81bc 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unicodecsv/unicodecsv-0.14.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e41e596590c6eb5e20000a8abf7f2150
diff --git a/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1 b/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
index c14e8c5283fe..11b2a969df8c 100644
--- a/metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
+++ b/metadata/md5-cache/dev-python/unicodecsv-0.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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unicodecsv/unicodecsv-0.14.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a2e4eacb6ab8596b1c4fa3f143880007
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.20 b/metadata/md5-cache/dev-python/unidecode-0.04.20
index dcc2f98e145f..b5306ea10b4b 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_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/U/Unidecode/Unidecode-0.04.20.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5068a83780c2c2c42a7489e95a88862c
diff --git a/metadata/md5-cache/dev-python/unidecode-0.04.21 b/metadata/md5-cache/dev-python/unidecode-0.04.21
index 9dbebf64e215..de30f8577628 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_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/U/Unidecode/Unidecode-0.04.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10bea52d6b1bebcf8a5f06df29c33343
diff --git a/metadata/md5-cache/dev-python/unidecode-1.0.22 b/metadata/md5-cache/dev-python/unidecode-1.0.22
index 12b1a9dae466..2a2bb6153baa 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.0.22
+++ b/metadata/md5-cache/dev-python/unidecode-1.0.22
@@ -10,5 +10,5 @@ RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.0.22.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=22b2a1a6f59d5705bb79f239f76c6cda
diff --git a/metadata/md5-cache/dev-python/unidecode-1.0.23 b/metadata/md5-cache/dev-python/unidecode-1.0.23
index 45d34b94544f..decce9558cd8 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.0.23
+++ b/metadata/md5-cache/dev-python/unidecode-1.0.23
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.0.23.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a69b66db9f75c2c242b18fc040ff2d3a
diff --git a/metadata/md5-cache/dev-python/unidecode-1.1.1 b/metadata/md5-cache/dev-python/unidecode-1.1.1
index eb32c1e37208..a9d24f8e64c3 100644
--- a/metadata/md5-cache/dev-python/unidecode-1.1.1
+++ b/metadata/md5-cache/dev-python/unidecode-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/U/Unidecode/Unidecode-1.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=de54fe9aa795a71cc81e83de2642ed0c
diff --git a/metadata/md5-cache/dev-python/unittest-mixins-1.3 b/metadata/md5-cache/dev-python/unittest-mixins-1.3
index 0f150fc9ad3f..2dba3a518857 100644
--- a/metadata/md5-cache/dev-python/unittest-mixins-1.3
+++ b/metadata/md5-cache/dev-python/unittest-mixins-1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nedbat/unittest-mixins/archive/v1.3.tar.gz -> unittest-mixins-1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3322c852f285992890975659a43f0414
diff --git a/metadata/md5-cache/dev-python/unittest-mixins-1.6 b/metadata/md5-cache/dev-python/unittest-mixins-1.6
index 515138686b1f..ca0739a7c199 100644
--- a/metadata/md5-cache/dev-python/unittest-mixins-1.6
+++ b/metadata/md5-cache/dev-python/unittest-mixins-1.6
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A set of mixin classes and other helpers for unittest test case classes
 EAPI=7
 HOMEPAGE=https://github.com/nedbat/unittest-mixins https://pypi.org/project/unittest-mixins/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc64 ~sparc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.10.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nedbat/unittest-mixins/archive/v1.6.tar.gz -> unittest-mixins-1.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4143d1f0f791908895938dcf10edb784
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=dd09a147d38d46e4dda623e61ce2e94c
diff --git a/metadata/md5-cache/dev-python/unittest2-1.1.0 b/metadata/md5-cache/dev-python/unittest2-1.1.0
index 80a0a2843c26..194880d0cb55 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_pypy3(-)?,python_targets_python2_7(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/u/unittest2/unittest2-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae796c8ab4beb2184ea74db4344efe6a
diff --git a/metadata/md5-cache/dev-python/uranium-3.6.0-r1 b/metadata/md5-cache/dev-python/uranium-3.6.0-r1
index c3546044bcd2..a010ad97da7d 100644
--- a/metadata/md5-cache/dev-python/uranium-3.6.0-r1
+++ b/metadata/md5-cache/dev-python/uranium-3.6.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-3.6.0:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 sys-devel/gettext doc? ( app-doc/doxygen ) test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-3.6.0:=[python,python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)] sci-libs/Shapely[python_targets_python3_6(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 sys-devel/gettext doc? ( app-doc/doxygen ) test? ( python_single_target_python3_6? ( dev-python/pytest[python_targets_python3_6(-)] ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A Python framework for building 3D printing related applications
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/Uranium
-IUSE=doc test +python_targets_python3_6 +python_single_target_python3_6
+IUSE=doc test +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-3.6.0:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-3.6.0:=[python,python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)] sci-libs/Shapely[python_targets_python3_6(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/3.6.0.tar.gz -> uranium-3.6.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04a30450be8c83c950ae10ccaf5f39d0
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d19f22c9b6f2671cd77de8c278014af
diff --git a/metadata/md5-cache/dev-python/uranium-4.2.0 b/metadata/md5-cache/dev-python/uranium-4.2.0
index c74ea5e52de1..1baaa027849e 100644
--- a/metadata/md5-cache/dev-python/uranium-4.2.0
+++ b/metadata/md5-cache/dev-python/uranium-4.2.0
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/gettext doc? ( app-doc/doxygen ) test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-util/ninja dev-util/cmake
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/gettext doc? ( app-doc/doxygen ) test? ( python_single_target_python3_6? ( dev-python/pytest[python_targets_python3_6(-)] ) ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.2.0:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.2.0:=[python,python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)] sci-libs/Shapely[python_targets_python3_6(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
 DESCRIPTION=A Python framework for building 3D printing related applications
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/Uranium
-IUSE=debug doc test +python_targets_python3_6 +python_single_target_python3_6
+IUSE=debug doc test +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.2.0:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.2.0:=[python,python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)] sci-libs/Shapely[python_targets_python3_6(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.2.0.tar.gz -> uranium-4.2.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc65246cb5c21ba5317b25628bd1fe4b
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e79db238d846d15aae69400b3e77d7d9
diff --git a/metadata/md5-cache/dev-python/uranium-4.3.0 b/metadata/md5-cache/dev-python/uranium-4.3.0
deleted file mode 100644
index a36392cd77a5..000000000000
--- a/metadata/md5-cache/dev-python/uranium-4.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/gettext doc? ( app-doc/doxygen ) test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/mypy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.3.0:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
-DESCRIPTION=A Python framework for building 3D printing related applications
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/Uranium
-IUSE=debug doc test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.3.0:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=sci-libs/scipy-1.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sci-libs/Shapely[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.3.0.tar.gz -> uranium-4.3.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1233a7025f81a44fa18d0cbb16840aa
diff --git a/metadata/md5-cache/dev-python/uranium-4.3.0-r1 b/metadata/md5-cache/dev-python/uranium-4.3.0-r1
new file mode 100644
index 000000000000..77abb2a3057e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uranium-4.3.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/gettext doc? ( app-doc/doxygen ) test? ( python_single_target_python3_6? ( dev-python/pytest[python_targets_python3_6(-)] dev-python/mypy[python_targets_python3_6(-)] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.3.0:=[python,python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)] sci-libs/Shapely[python_targets_python3_6(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
+DESCRIPTION=A Python framework for building 3D printing related applications
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/Uranium
+IUSE=debug doc test +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~dev-libs/libarcus-4.3.0:=[python,python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-),declarative,network,svg] dev-python/numpy[python_targets_python3_6(-)] >=sci-libs/scipy-1.1[python_targets_python3_6(-)] sci-libs/Shapely[python_targets_python3_6(-)] ) dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/Uranium/archive/4.3.0.tar.gz -> uranium-4.3.0.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d86fdbe8927a341dae10fa2ff79a0db
diff --git a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.1 b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.1
index a033325547e0..23858742e990 100644
--- a/metadata/md5-cache/dev-python/urdf_parser_py-0.4.1
+++ b/metadata/md5-cache/dev-python/urdf_parser_py-0.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=URDF parser for Python
 EAPI=6
 HOMEPAGE=http://wiki.ros.org/urdfdom_py
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/catkin_pkg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_parser_py/archive/0.4.1.tar.gz -> urdf_parser_py-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e80c39af7ae2f6e177bc84350aa289f
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7245edc37ee82c569698ae9717a97fdc
diff --git a/metadata/md5-cache/dev-python/uritemplate-0.6 b/metadata/md5-cache/dev-python/uritemplate-0.6
index e1da0aee81f4..36b43cab0837 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_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=243744bc55992291fb7f43520b7905b9
diff --git a/metadata/md5-cache/dev-python/uritemplate-3.0.0 b/metadata/md5-cache/dev-python/uritemplate-3.0.0
index 281a357d626a..2ea159a2ec16 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_pypy3(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/uritemplate/uritemplate-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=318b27c42d7992bfbc830dc96a64055f
diff --git a/metadata/md5-cache/dev-python/urlgrabber-3.10.1 b/metadata/md5-cache/dev-python/urlgrabber-3.10.1
index 212911a782ed..1ff778e9aa9c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bf1168b3e3fa6b0c8adf5f9b2e9d8ce
diff --git a/metadata/md5-cache/dev-python/urlgrabber-3.10.1-r1 b/metadata/md5-cache/dev-python/urlgrabber-3.10.1-r1
index b608610d1489..6498467c9131 100644
--- a/metadata/md5-cache/dev-python/urlgrabber-3.10.1-r1
+++ b/metadata/md5-cache/dev-python/urlgrabber-3.10.1-r1
@@ -11,5 +11,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_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d6ecbb2047a77d8fac344b8b808141d5
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 9e60d372e7dc..74c9ccc7deee 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af7ab01a442592acb56c6a73530a480b
diff --git a/metadata/md5-cache/dev-python/urllib3-1.24.2 b/metadata/md5-cache/dev-python/urllib3-1.24.2
index 6bbbee89f769..cf052002a448 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.24.2
+++ b/metadata/md5-cache/dev-python/urllib3-1.24.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.24.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=467faaee871a88dafd122540a1e58886
diff --git a/metadata/md5-cache/dev-python/urllib3-1.25.7 b/metadata/md5-cache/dev-python/urllib3-1.25.7
index 3166f62bce8e..1142dc97c450 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.25.7
+++ b/metadata/md5-cache/dev-python/urllib3-1.25.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.25.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3ad79f9278b8b450415f40b5cba53379
diff --git a/metadata/md5-cache/dev-python/urllib3-1.25.8 b/metadata/md5-cache/dev-python/urllib3-1.25.8
index 5f350e880596..c3cf07c327c7 100644
--- a/metadata/md5-cache/dev-python/urllib3-1.25.8
+++ b/metadata/md5-cache/dev-python/urllib3-1.25.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urllib3/urllib3-1.25.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3ad79f9278b8b450415f40b5cba53379
diff --git a/metadata/md5-cache/dev-python/urwid-1.3.1 b/metadata/md5-cache/dev-python/urwid-1.3.1
index 1b59263cf4a6..28b32cb57f3a 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5a342c366a4b27a7cba81a577e8f934a
diff --git a/metadata/md5-cache/dev-python/urwid-2.0.1 b/metadata/md5-cache/dev-python/urwid-2.0.1
index 2070b918115f..f9f92b430bca 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=13b3dbd8b52c71955dc205df2c1ede09
diff --git a/metadata/md5-cache/dev-python/urwid-2.1.0 b/metadata/md5-cache/dev-python/urwid-2.1.0
index a72538dbc040..877f731a2863 100644
--- a/metadata/md5-cache/dev-python/urwid-2.1.0
+++ b/metadata/md5-cache/dev-python/urwid-2.1.0
@@ -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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/u/urwid/urwid-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=24ed51cf23dd8dcc03aeec3fa8f13ac0
diff --git a/metadata/md5-cache/dev-python/urwidtrees-1.0.2 b/metadata/md5-cache/dev-python/urwidtrees-1.0.2
index 3894275d73e4..ece569afbe78 100644
--- a/metadata/md5-cache/dev-python/urwidtrees-1.0.2
+++ b/metadata/md5-cache/dev-python/urwidtrees-1.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Tree widgets for urwid
 EAPI=5
 HOMEPAGE=https://github.com/pazz/urwidtrees
-IUSE=doc python_targets_python2_7 python_targets_python3_6
+IUSE=doc python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/urwid-1.1.0[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
 SRC_URI=https://github.com/pazz/urwidtrees/archive/1.0.2.tar.gz -> urwidtrees-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca6a1553e918f546db6999f9528c1523
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5acf9d8a23fca92c68e6b4e02ad29dd0
diff --git a/metadata/md5-cache/dev-python/urwidtrees-1.0.2-r1 b/metadata/md5-cache/dev-python/urwidtrees-1.0.2-r1
index 7dbfc0a2b091..72b66ee8cf05 100644
--- a/metadata/md5-cache/dev-python/urwidtrees-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/urwidtrees-1.0.2-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[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(-)] )
+DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Tree widgets for urwid
 EAPI=7
 HOMEPAGE=https://github.com/pazz/urwidtrees
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/urwid-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/pazz/urwidtrees/archive/1.0.2.tar.gz -> urwidtrees-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a5a186c9edc8b270a79813a86e64063d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8c210f71345e881cf2545fafd3d8a44a
diff --git a/metadata/md5-cache/dev-python/utidylib-0.3-r2 b/metadata/md5-cache/dev-python/utidylib-0.3-r2
index f3647617a8ec..064d20c1c137 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_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dl.cihar.com/utidylib/uTidylib-0.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c9e4830067cad905bf73f79ffe7d165
diff --git a/metadata/md5-cache/dev-python/utidylib-0.6 b/metadata/md5-cache/dev-python/utidylib-0.6
index 245c745f0220..ba36e82c4ee2 100644
--- a/metadata/md5-cache/dev-python/utidylib-0.6
+++ b/metadata/md5-cache/dev-python/utidylib-0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/u/utidylib/uTidylib-0.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6e8656dea139c3c70569f7ebfa8cd915
diff --git a/metadata/md5-cache/dev-python/utmp-0.4 b/metadata/md5-cache/dev-python/utmp-0.4
index c0938c4b3958..67d031877b88 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_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/utmp/utmp-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e284e78eeeab56607b99c5bead1217a
diff --git a/metadata/md5-cache/dev-python/uvloop-0.12.2 b/metadata/md5-cache/dev-python/uvloop-0.12.2
index bc6591a5ae9a..89b0035a92f8 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.12.2
+++ b/metadata/md5-cache/dev-python/uvloop-0.12.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.12.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=64600d9fd883272f214ad90ec991471b
diff --git a/metadata/md5-cache/dev-python/uvloop-0.13.0 b/metadata/md5-cache/dev-python/uvloop-0.13.0
index 65b7b02c8905..ff4691b05c54 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.13.0
+++ b/metadata/md5-cache/dev-python/uvloop-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91be09c11d5e4e359e5e20cec2405a0d
diff --git a/metadata/md5-cache/dev-python/uvloop-0.14.0 b/metadata/md5-cache/dev-python/uvloop-0.14.0
index 4dc951749727..64c6b00a284b 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.14.0
+++ b/metadata/md5-cache/dev-python/uvloop-0.14.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.14.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91be09c11d5e4e359e5e20cec2405a0d
diff --git a/metadata/md5-cache/dev-python/uvloop-0.8.1 b/metadata/md5-cache/dev-python/uvloop-0.8.1
index 226d6e09d3e1..8623b24011ef 100644
--- a/metadata/md5-cache/dev-python/uvloop-0.8.1
+++ b/metadata/md5-cache/dev-python/uvloop-0.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/uvloop/uvloop-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fde7a8d95c0590a8498c6d4c8f438adc
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.11.1 b/metadata/md5-cache/dev-python/vcrpy-1.11.1
index 0051e92534b9..dc5f82230cf9 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.11.1
+++ b/metadata/md5-cache/dev-python/vcrpy-1.11.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_6? ( dev-python/yarl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-httpbin[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-python/yarl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-httpbin[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up testing
 EAPI=5
 HOMEPAGE=https://github.com/kevin1024/vcrpy
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_6? ( dev-python/yarl[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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-python/yarl[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vcrpy/vcrpy-1.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c42fd2f4553b31a124bda537ea540d2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5a346057254e9099585a90352708bdf9
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.12.0 b/metadata/md5-cache/dev-python/vcrpy-1.12.0
index 55f025b08a6c..5d8a7591a566 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.12.0
+++ b/metadata/md5-cache/dev-python/vcrpy-1.12.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_6? ( dev-python/yarl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-httpbin[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-python/yarl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-httpbin[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up testing
 EAPI=6
 HOMEPAGE=https://github.com/kevin1024/vcrpy
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_6? ( dev-python/yarl[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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-python/yarl[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/vcrpy/archive/v1.12.0.tar.gz -> vcrpy-1.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4bf6722fd205208dbe8a9c294a954421
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c0d20448cb613e0069a7c4d8a2dfe68
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.42 b/metadata/md5-cache/dev-python/vcstools-0.1.42
index eb0180bc57fe..b394c6f94d22 100644
--- a/metadata/md5-cache/dev-python/vcstools-0.1.42
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.42
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[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(-)]
+DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library for interacting with various VCS systems
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/vcstools
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/vcstools/vcstools-0.1.42.tar.gz https://github.com/vcstools/vcstools/archive/0.1.42.tar.gz -> vcstools-0.1.42.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=145c23a2147e2923897e54ededf2281d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e805513d4e12f3bbc15ca52c751e336c
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 4610db462881..aa20a9e05996 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/vcversioner/vcversioner-2.16.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b266495d8210cce4ff219b22299f144
diff --git a/metadata/md5-cache/dev-python/vdf-3.2 b/metadata/md5-cache/dev-python/vdf-3.2
index d942f83a4f94..2e5d3322906e 100644
--- a/metadata/md5-cache/dev-python/vdf-3.2
+++ b/metadata/md5-cache/dev-python/vdf-3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://codeload.github.com/ValvePython/vdf/tar.gz/v3.2 -> vdf-3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea7d122dd716f53d3bcd8f885cc6c49f
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.3 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
index 7083a3753bf7..ccaa58597a2c 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=663297966c49e7d8b3f7927f1010366a
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.4 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
index cc08e148fbc0..f834da1877f2 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=663297966c49e7d8b3f7927f1010366a
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.6 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
index c41e40e65b77..dc462404e9ca 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed4aa274caf565667acb466a6b0b0ce2
diff --git a/metadata/md5-cache/dev-python/vdirsyncer-0.16.7 b/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
index 6ab81b909a6b..7a041ca6f1b1 100644
--- a/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
+++ b/metadata/md5-cache/dev-python/vdirsyncer-0.16.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vdirsyncer/vdirsyncer-0.16.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a84831ddb7ad05035874576ec7593f51
diff --git a/metadata/md5-cache/dev-python/venusian-1.0 b/metadata/md5-cache/dev-python/venusian-1.0
index ef6902ae82a6..582a8f255dda 100644
--- a/metadata/md5-cache/dev-python/venusian-1.0
+++ b/metadata/md5-cache/dev-python/venusian-1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/venusian/venusian-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1bca178df15842c1edf81fa4e1b4e57
diff --git a/metadata/md5-cache/dev-python/venusian-1.0_p20161030 b/metadata/md5-cache/dev-python/venusian-1.0_p20161030
index fa3cf28b6423..fb372b2800d6 100644
--- a/metadata/md5-cache/dev-python/venusian-1.0_p20161030
+++ b/metadata/md5-cache/dev-python/venusian-1.0_p20161030
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Pylons/venusian/archive/ec4032596e3aec987ba29b62cac701608ef3b523.zip -> venusian-1.0_p20161030.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2296fa68d3b50025ee8b5e3f0b6728e1
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.6 b/metadata/md5-cache/dev-python/verboselogs-1.6
index 12bb84bf1321..cadb9d85df25 100644
--- a/metadata/md5-cache/dev-python/verboselogs-1.6
+++ b/metadata/md5-cache/dev-python/verboselogs-1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Verbose logging for Python's logging module
 EAPI=5
 HOMEPAGE=https://pypi.org/project/verboselogs/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/v/verboselogs/verboselogs-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d86a03e02f67b217260b8b4e69ecacd9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1fcbe376f1a0a1dc5b1cb0003e431045
diff --git a/metadata/md5-cache/dev-python/verboselogs-1.7 b/metadata/md5-cache/dev-python/verboselogs-1.7
index 3dc26b47cbc5..e047524003b8 100644
--- a/metadata/md5-cache/dev-python/verboselogs-1.7
+++ b/metadata/md5-cache/dev-python/verboselogs-1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/verboselogs/verboselogs-1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4cd988d6e012a8d4b7f8b21db3a50b87
diff --git a/metadata/md5-cache/dev-python/versioneer-0.16 b/metadata/md5-cache/dev-python/versioneer-0.16
index 43f8dd1ff292..90b71797cc8f 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/versioneer/versioneer-0.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f3c5050bd1cc04188af1e85eed84273
diff --git a/metadata/md5-cache/dev-python/versioneer-0.18 b/metadata/md5-cache/dev-python/versioneer-0.18
index 321e072678d3..b08b7e18d5d4 100644
--- a/metadata/md5-cache/dev-python/versioneer-0.18
+++ b/metadata/md5-cache/dev-python/versioneer-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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/versioneer/versioneer-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e0863230bca782c1379c223a91fde3e
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 6aaea52d532b..6da7a296ef28 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_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/v/versiontools/versiontools-1.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51a4313ef2b4f95dd695a34664b919dc
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 360d860e6baf..0e590691cc77 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:0 >=dev-python/epsilon-0.6.0-r1[python_targets_python2_
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f8e64382361220cec4a173e67e0b2b7
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 238b4bbd64dc..595cdc0f879c 100644
--- a/metadata/md5-cache/dev-python/vertex-0.3.1-r1
+++ b/metadata/md5-cache/dev-python/vertex-0.3.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/V/Vertex/Vertex-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	twisted-r1	0377e962ae6a522c5a3cbabafc04a201	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d324da6e2f3a3f7d31484a9aa896fb6f
diff --git a/metadata/md5-cache/dev-python/vine-1.1.3 b/metadata/md5-cache/dev-python/vine-1.1.3
index c93959c513b0..f954ad4b2448 100644
--- a/metadata/md5-cache/dev-python/vine-1.1.3
+++ b/metadata/md5-cache/dev-python/vine-1.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vine/vine-1.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=78d26c533c3b43b453b8611427b84235
diff --git a/metadata/md5-cache/dev-python/vine-1.3.0 b/metadata/md5-cache/dev-python/vine-1.3.0
index 155a7efefb58..92b24a75e18a 100644
--- a/metadata/md5-cache/dev-python/vine-1.3.0
+++ b/metadata/md5-cache/dev-python/vine-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/vine/vine-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dfd7e8a66e57a314a9ecd0db8cccfa79
diff --git a/metadata/md5-cache/dev-python/virtualenv-16.0.0 b/metadata/md5-cache/dev-python/virtualenv-16.0.0
index aa53d65554ba..6a3b74ded0bd 100644
--- a/metadata/md5-cache/dev-python/virtualenv-16.0.0
+++ b/metadata/md5-cache/dev-python/virtualenv-16.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/16.0.0.tar.gz -> virtualenv-16.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25fe3528f22b4fffeaeb9661756289ba
diff --git a/metadata/md5-cache/dev-python/virtualenv-16.7.9 b/metadata/md5-cache/dev-python/virtualenv-16.7.9
index e7d3cba29759..7c00f80856a7 100644
--- a/metadata/md5-cache/dev-python/virtualenv-16.7.9
+++ b/metadata/md5-cache/dev-python/virtualenv-16.7.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/archive/16.7.9.tar.gz -> virtualenv-16.7.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=331501f0107d8bdec280ae4dd880385e
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 44491672ef1f..30805635db69 100644
--- a/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.2.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=A script for cloning a non-relocatable virtualenv
 EAPI=6
 HOMEPAGE=https://github.com/edwardgeorge/virtualenv-clone
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv-clone/virtualenv-clone-0.2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ba53486990bda65655240786bc945cc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b40fac588f02d73c1d294a78e5ad963
diff --git a/metadata/md5-cache/dev-python/virtualenv-clone-0.5.3 b/metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
index 98585a06dae7..b7e9ec867695 100644
--- a/metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
+++ b/metadata/md5-cache/dev-python/virtualenv-clone-0.5.3
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A script for cloning a non-relocatable virtualenv
 EAPI=7
 HOMEPAGE=https://github.com/edwardgeorge/virtualenv-clone
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenv-clone/virtualenv-clone-0.5.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d7eaa7e07cdb1df1d008a1d50294772d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d4dcafe3ac35cb668ed37988c1b255e0
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
index 0636d51696d9..b78e0939a272 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db052f3b513be83cc8eeaa787dc07b97
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2-r1 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2-r1
index 1798d071cdc4..acc03598b103 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2-r1
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dc9d301b045df176d5bef8be8f260d47
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4
index 915547d7ae87..d48e510bc1ee 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.8.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dc9d301b045df176d5bef8be8f260d47
diff --git a/metadata/md5-cache/dev-python/visitor-0.1.3 b/metadata/md5-cache/dev-python/visitor-0.1.3
index 43dfe818ccd1..985d8a095617 100644
--- a/metadata/md5-cache/dev-python/visitor-0.1.3
+++ b/metadata/md5-cache/dev-python/visitor-0.1.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=A tiny pythonic visitor implementation
 EAPI=7
 HOMEPAGE=https://github.com/mbr/visitor
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mbr/visitor/archive/0.1.3.tar.gz -> visitor-0.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=509df4b7f8407faec04f4e9cf1146592
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3e18f7cc9eb3ac0fb25b73725f43147b
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.3 b/metadata/md5-cache/dev-python/vobject-0.9.3
index da61f60ed2ca..75c2e1219a42 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.3
+++ b/metadata/md5-cache/dev-python/vobject-0.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python package for parsing and generating vCard and vCalendar files
 EAPI=6
 HOMEPAGE=http://eventable.github.io/vobject/ https://pypi.org/project/vobject/ https://github.com/eventable/vobject
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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
 SRC_URI=https://github.com/eventable/vobject/archive/0.9.3.tar.gz -> vobject-0.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5aab8f42573fe9b24b0a5996250ba2d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a507c99b1e29708d02a92a5471cc949
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.5 b/metadata/md5-cache/dev-python/vobject-0.9.5
index 23e229420578..b42c97907143 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.5
+++ b/metadata/md5-cache/dev-python/vobject-0.9.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python package for parsing and generating vCard and vCalendar files
 EAPI=6
 HOMEPAGE=http://eventable.github.io/vobject/ https://pypi.org/project/vobject/ https://github.com/eventable/vobject
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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
 SRC_URI=https://github.com/eventable/vobject/archive/0.9.5.tar.gz -> vobject-0.9.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa689572c28e3f1b59acf13663ecb460
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aed99e48c0923402f643ebc88a20ad85
diff --git a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r1 b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r1
index 0634251117c5..126e0ba0e9bd 100644
--- a/metadata/md5-cache/dev-python/vobject-0.9.6.1-r1
+++ b/metadata/md5-cache/dev-python/vobject-0.9.6.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Python package for parsing and generating vCard and vCalendar files
 EAPI=7
 HOMEPAGE=https://eventable.github.io/vobject/ https://pypi.org/project/vobject/ https://github.com/eventable/vobject
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/python-dateutil-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vobject/vobject-0.9.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ac8a77aed267e5c759095bb5fd776aeb
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=018d28653e8aea1c6273f3b187770a75
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.10.5 b/metadata/md5-cache/dev-python/voluptuous-0.10.5
index cca204a3522d..fb48353be03d 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/voluptuous/voluptuous-0.10.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6e89d31fc2383f81dfd25b5e0d76bc8
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.11.1 b/metadata/md5-cache/dev-python/voluptuous-0.11.1
index c4b42c73035d..61ef9872a4d3 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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/v/voluptuous/voluptuous-0.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ce42790a3aaa0dc12eb4e5e81bb8dc8
diff --git a/metadata/md5-cache/dev-python/vpython-7.4.2 b/metadata/md5-cache/dev-python/vpython-7.4.2
index 5f8629b8e740..14bfc7ca17e4 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vpython/vpython-7.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e575a11c6c3617ce9ea417e2539780e
diff --git a/metadata/md5-cache/dev-python/vpython-7.4.6 b/metadata/md5-cache/dev-python/vpython-7.4.6
index db5b80055bd7..9cbd3aa9d510 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vpython/vpython-7.4.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e575a11c6c3617ce9ea417e2539780e
diff --git a/metadata/md5-cache/dev-python/vulture-0.10 b/metadata/md5-cache/dev-python/vulture-0.10
index 7afb7e3d5a1c..ec9f28f35aee 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_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/v/vulture/vulture-0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab3d6f9e3026ef3b0ffa7cc7749b2fe2
diff --git a/metadata/md5-cache/dev-python/waitress-1.0.2 b/metadata/md5-cache/dev-python/waitress-1.0.2
index a79e13b8c8ec..55a0b5289d19 100644
--- a/metadata/md5-cache/dev-python/waitress-1.0.2
+++ b/metadata/md5-cache/dev-python/waitress-1.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9bf2b8bad838a92e90adaa15fdb6b772
diff --git a/metadata/md5-cache/dev-python/waitress-1.3.1 b/metadata/md5-cache/dev-python/waitress-1.3.1
index ceb0e189b106..e43feaae247b 100644
--- a/metadata/md5-cache/dev-python/waitress-1.3.1
+++ b/metadata/md5-cache/dev-python/waitress-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4ea190de87abe465ce36223503b098e
diff --git a/metadata/md5-cache/dev-python/warlock-1.1.0 b/metadata/md5-cache/dev-python/warlock-1.1.0
index 759beac9d9be..6464a6533b63 100644
--- a/metadata/md5-cache/dev-python/warlock-1.1.0
+++ b/metadata/md5-cache/dev-python/warlock-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e46d9b022adf20eac2e2cfab2b50435b
diff --git a/metadata/md5-cache/dev-python/warlock-1.2.0 b/metadata/md5-cache/dev-python/warlock-1.2.0
index 7db89d356e37..da3513047689 100644
--- a/metadata/md5-cache/dev-python/warlock-1.2.0
+++ b/metadata/md5-cache/dev-python/warlock-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e46d9b022adf20eac2e2cfab2b50435b
diff --git a/metadata/md5-cache/dev-python/warlock-1.3.0 b/metadata/md5-cache/dev-python/warlock-1.3.0
index dec525d95fe9..d83ff4ceba26 100644
--- a/metadata/md5-cache/dev-python/warlock-1.3.0
+++ b/metadata/md5-cache/dev-python/warlock-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/warlock/warlock-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a435b73e958028f07615c560f262cc7d
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 5b08d1929476..f1e4c31be3d4 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
+++ b/metadata/md5-cache/dev-python/watchdog-0.8.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/watchdog/watchdog-0.8.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92a02f79616edae56d8766e0a9431235
diff --git a/metadata/md5-cache/dev-python/watchdog-0.9.0 b/metadata/md5-cache/dev-python/watchdog-0.9.0
index 5526ae11131b..1913d609fd5a 100644
--- a/metadata/md5-cache/dev-python/watchdog-0.9.0
+++ b/metadata/md5-cache/dev-python/watchdog-0.9.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/argh[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pathtools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=test? ( dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/argh[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pathtools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/pytest-timeout-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Python API and shell utilities to monitor file system events
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gorakhargosh/watchdog/archive/v0.9.0.tar.gz -> watchdog-0.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=500714ade0648873ba9d47a2fd96e689
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 4ce8a96f5f4a..6acddec8c806 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcwidth/wcwidth-0.1.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=83462bd7266053e2fff41ab4a36c6d1c
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r2 b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r2
index de98ca9aafe0..d29408429837 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.7-r2
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.7-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcwidth/wcwidth-0.1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0d3ad0f5adec50f335ecccef370bda43
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.1.8 b/metadata/md5-cache/dev-python/wcwidth-0.1.8
index 8f845b7b5e8f..f3021669b9e4 100644
--- a/metadata/md5-cache/dev-python/wcwidth-0.1.8
+++ b/metadata/md5-cache/dev-python/wcwidth-0.1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wcwidth/wcwidth-0.1.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=84ba5a685dc0605fec9ca3871adf890b
diff --git a/metadata/md5-cache/dev-python/weakrefmethod-1.0.3 b/metadata/md5-cache/dev-python/weakrefmethod-1.0.3
index 669ac832b52f..dfe8676bf0d6 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_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/w/weakrefmethod/weakrefmethod-1.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b3218b42312a54fd088e45c1d077394
diff --git a/metadata/md5-cache/dev-python/weasyprint-0.41 b/metadata/md5-cache/dev-python/weasyprint-0.41
index f72ce1a17c98..59a9d36dbd70 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/W/WeasyPrint/WeasyPrint-0.41.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2c8c7366f88a9f06b8912a15dbcfbe61
diff --git a/metadata/md5-cache/dev-python/weasyprint-43 b/metadata/md5-cache/dev-python/weasyprint-43
index 5b2b9a88e4b2..8aad0d75e6d6 100644
--- a/metadata/md5-cache/dev-python/weasyprint-43
+++ b/metadata/md5-cache/dev-python/weasyprint-43
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WeasyPrint/WeasyPrint-43.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a6b18972baec1073588b402e29ad3681
diff --git a/metadata/md5-cache/dev-python/webassets-0.12.1 b/metadata/md5-cache/dev-python/webassets-0.12.1
index fc93dc5b1b58..108b7ac3f2b8 100644
--- a/metadata/md5-cache/dev-python/webassets-0.12.1
+++ b/metadata/md5-cache/dev-python/webassets-0.12.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Asset management for Python web development
 EAPI=6
 HOMEPAGE=https://github.com/miracle2k/webassets
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/miracle2k/webassets/archive/0.12.1.tar.gz -> webassets-0.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be3e2ae4156a95e5933930c48a52ef50
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=163d0be45b0b9ec3528004ff1fe2c9a5
diff --git a/metadata/md5-cache/dev-python/webcolors-1.10 b/metadata/md5-cache/dev-python/webcolors-1.10
index 4a056013fc77..4581e099541b 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.10
+++ b/metadata/md5-cache/dev-python/webcolors-1.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webcolors/webcolors-1.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3965f96985970bad2eed770293d97220
diff --git a/metadata/md5-cache/dev-python/webcolors-1.5 b/metadata/md5-cache/dev-python/webcolors-1.5
index 9190944c1d74..222b6bd57ce5 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.5
+++ b/metadata/md5-cache/dev-python/webcolors-1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webcolors/webcolors-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14dc010ace1d0fbc88f06e154a276a6c
diff --git a/metadata/md5-cache/dev-python/webcolors-1.8.1 b/metadata/md5-cache/dev-python/webcolors-1.8.1
index ade81e1c1485..92e83d165068 100644
--- a/metadata/md5-cache/dev-python/webcolors-1.8.1
+++ b/metadata/md5-cache/dev-python/webcolors-1.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webcolors/webcolors-1.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3516a5c1745b7f6d887ae4113ae03008
diff --git a/metadata/md5-cache/dev-python/webencodings-0.5.1 b/metadata/md5-cache/dev-python/webencodings-0.5.1
index f3373f302ec3..3c2bbee5690a 100644
--- a/metadata/md5-cache/dev-python/webencodings-0.5.1
+++ b/metadata/md5-cache/dev-python/webencodings-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webencodings/webencodings-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c69e7a0503c737b809a67abd0b347d2f
diff --git a/metadata/md5-cache/dev-python/webencodings-0.5.1-r1 b/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
index 13bfccc78333..716c7ccdf7ff 100644
--- a/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
+++ b/metadata/md5-cache/dev-python/webencodings-0.5.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/webencodings/webencodings-0.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4fd59f01dfb60e900029775beb90beca
diff --git a/metadata/md5-cache/dev-python/webob-1.8.2 b/metadata/md5-cache/dev-python/webob-1.8.2
index 2a8d795ae91b..5f1dfebf8ff5 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.2
+++ b/metadata/md5-cache/dev-python/webob-1.8.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=022d38d5e0ca0fef11fb346edd2c2841
diff --git a/metadata/md5-cache/dev-python/webob-1.8.2-r1 b/metadata/md5-cache/dev-python/webob-1.8.2-r1
index e7db66cc6aa8..e7b3e3d32e69 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.2-r1
+++ b/metadata/md5-cache/dev-python/webob-1.8.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=47ac2cd46d0243de34b5b76c0ef646db
diff --git a/metadata/md5-cache/dev-python/webob-1.8.5 b/metadata/md5-cache/dev-python/webob-1.8.5
index 954867eb04dc..825929e40f1f 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.5
+++ b/metadata/md5-cache/dev-python/webob-1.8.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91bbe727d6841a4d3af8f60919fea6a0
diff --git a/metadata/md5-cache/dev-python/webob-1.8.5-r1 b/metadata/md5-cache/dev-python/webob-1.8.5-r1
index 453cb9c610d6..7e0868b5f91a 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.5-r1
+++ b/metadata/md5-cache/dev-python/webob-1.8.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=71871a7249a89384b2c007e292c5354a
diff --git a/metadata/md5-cache/dev-python/webob-1.8.5-r3 b/metadata/md5-cache/dev-python/webob-1.8.5-r3
index 6b18fbe0dc54..0c36f8376430 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.5-r3
+++ b/metadata/md5-cache/dev-python/webob-1.8.5-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6b2a05f24b545ca543e1e4280a36263d
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 4c684beae763..a764e9b1e76a 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.37.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.37.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=WebSocket client for python with hybi13 support
 EAPI=5
 HOMEPAGE=https://github.com/liris/websocket-client
-IUSE=examples python_targets_python2_7 python_targets_python3_6
+IUSE=examples python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86 ~x64-macos
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f189e86f175f048cfcfc437a8c7aa8e0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c291367ceae3a85c457e470c95914459
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 90053c3f8d35..3812e437b88a 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.40.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.40.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=WebSocket client for python with hybi13 support
 EAPI=5
 HOMEPAGE=https://github.com/liris/websocket-client
-IUSE=examples python_targets_python2_7 python_targets_python3_6
+IUSE=examples python_targets_python3_6
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7d62c5c3c6fb2a520fb867c0a12d343
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=589c47aebb2e161a03430883e1cb9a13
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 8fb326405ca5..69d6f1282769 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.47.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.47.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=WebSocket client for python with hybi13 support
 EAPI=6
 HOMEPAGE=https://github.com/websocket-client/websocket-client
-IUSE=examples python_targets_python2_7 python_targets_python3_6
+IUSE=examples python_targets_python3_6
 KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[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
 SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.47.0.tar.gz -> websocket-client-0.47.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88f9d4ad8554aee3cea32a9ff0522b37
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=351ac859ffc7740393889b1349d24cb3
diff --git a/metadata/md5-cache/dev-python/websocket-client-0.48.0 b/metadata/md5-cache/dev-python/websocket-client-0.48.0
index 7b0cced7aaab..b95c95af6d20 100644
--- a/metadata/md5-cache/dev-python/websocket-client-0.48.0
+++ b/metadata/md5-cache/dev-python/websocket-client-0.48.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=WebSocket client for python with hybi13 support
 EAPI=7
 HOMEPAGE=https://github.com/websocket-client/websocket-client
-IUSE=examples test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=examples test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86 ~x64-macos
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/websocket-client/websocket_client-0.48.0.tar.gz -> websocket-client-0.48.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=982ec2f3f85114f09b7ef5a50726cd38
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=27d2797b4e2e658a009c30bc47760d15
diff --git a/metadata/md5-cache/dev-python/websockify-0.8.0 b/metadata/md5-cache/dev-python/websockify-0.8.0
index 028a66cabb16..c785ee11ca79 100644
--- a/metadata/md5-cache/dev-python/websockify-0.8.0
+++ b/metadata/md5-cache/dev-python/websockify-0.8.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/kanaka/websockify/archive/v0.8.0.zip -> websockify-0.8.0.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a03ab9f9ff113c5fb84cfcb0a62bb880
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.21 b/metadata/md5-cache/dev-python/webtest-2.0.21
index c14cfe3b61e1..448640153dd8 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.21
+++ b/metadata/md5-cache/dev-python/webtest-2.0.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bdb3adc49cf42b14c98129a825cc8ba
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.29 b/metadata/md5-cache/dev-python/webtest-2.0.29
index 5f48345d5292..fc52f947d761 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.29
+++ b/metadata/md5-cache/dev-python/webtest-2.0.29
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.29.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26f578c72f59062d6a00ba2bcfb8d716
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.29-r1 b/metadata/md5-cache/dev-python/webtest-2.0.29-r1
index a04110c6e96d..452c1291695b 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.29-r1
+++ b/metadata/md5-cache/dev-python/webtest-2.0.29-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.29.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d155b4c958163e85944f56988ea474d4
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.33 b/metadata/md5-cache/dev-python/webtest-2.0.33
index 1bb8a1319ff4..b4962746beed 100644
--- a/metadata/md5-cache/dev-python/webtest-2.0.33
+++ b/metadata/md5-cache/dev-python/webtest-2.0.33
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/waitress-0.8.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/beautifulsoup:4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-arch/unzip test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyquery[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wsgiproxy2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/waitress-0.8.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/beautifulsoup:4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/waitress-0.8.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/beautifulsoup:4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-arch/unzip test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyquery[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/wsgiproxy2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/paste[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pastedeploy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/waitress-0.8.5[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/beautifulsoup:4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Helper to test WSGI applications
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.33.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f177c496a5f861664ef425f29a2c72d0
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 6d8b5df24330..45e81b8c01dd 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=112cf9eb47f2448f2e42cbb3e46f490a
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 519a4eeb3051..16e8a92410dd 100644
--- a/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/wehjit-0.2.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://jderose.fedorapeople.org/wehjit/0.2.2/wehjit-0.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae6a9fd0cac3a4128239797b35fea0b7
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.12.2 b/metadata/md5-cache/dev-python/werkzeug-0.12.2
index e8092297f419..979c31fe90be 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.12.2
+++ b/metadata/md5-cache/dev-python/werkzeug-0.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.12.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff20489bb8b8747993f68316de70fd22
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.14.1 b/metadata/md5-cache/dev-python/werkzeug-0.14.1
index a77273d408a4..12d04030a121 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.14.1
+++ b/metadata/md5-cache/dev-python/werkzeug-0.14.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.14.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3510804a32fc8b74b1ab7b6c2e2bbea6
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.15.4 b/metadata/md5-cache/dev-python/werkzeug-0.15.4
index 23dcd9b9464e..a18f488df458 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.15.4
+++ b/metadata/md5-cache/dev-python/werkzeug-0.15.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.15.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1b4a67ba18f3d3d8ded7eae47e59c40c
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.15.5 b/metadata/md5-cache/dev-python/werkzeug-0.15.5
index 007e599caaf4..66cafd934ffc 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.15.5
+++ b/metadata/md5-cache/dev-python/werkzeug-0.15.5
@@ -5,12 +5,12 @@ DESCRIPTION=Collection of various utilities for WSGI applications
 EAPI=7
 HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Werkzeug/Werkzeug-0.15.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b1d37f4ba214beb68891e2fcae5f1834
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0b93f77448a9343d5de22d61a72abb5d
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.16.0 b/metadata/md5-cache/dev-python/werkzeug-0.16.0
index 7d237a8d9944..937bb08ec5cf 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.16.0
+++ b/metadata/md5-cache/dev-python/werkzeug-0.16.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Collection of various utilities for WSGI applications
 EAPI=7
 HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/0.16.0.tar.gz -> werkzeug-0.16.0.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1cc460b32298e68d14e04a3ed7fca3a4
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b21c669c12a4ac4de14ecffa42cdc8a2
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.16.1 b/metadata/md5-cache/dev-python/werkzeug-0.16.1
index a3cd09427533..a97ec46c99e2 100644
--- a/metadata/md5-cache/dev-python/werkzeug-0.16.1
+++ b/metadata/md5-cache/dev-python/werkzeug-0.16.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Collection of various utilities for WSGI applications
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/0.16.1.tar.gz -> werkzeug-0.16.1.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=993619d639691697711734822cc65250
diff --git a/metadata/md5-cache/dev-python/werkzeug-1.0.0 b/metadata/md5-cache/dev-python/werkzeug-1.0.0
new file mode 100644
index 000000000000..db816da0ca25
--- /dev/null
+++ b/metadata/md5-cache/dev-python/werkzeug-1.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/click[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Collection of various utilities for WSGI applications
+EAPI=7
+HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pallets/werkzeug/archive/1.0.0.tar.gz -> werkzeug-1.0.0.gh.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c5fe6b83c58e397a91ee4b856cb8ca5c
diff --git a/metadata/md5-cache/dev-python/wheel-0.29.0 b/metadata/md5-cache/dev-python/wheel-0.29.0
index 2aa5aae208c6..7dc2f44f9361 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_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/w/wheel/wheel-0.29.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51cb08a5dd26e12f525d5b1fabdb567e
diff --git a/metadata/md5-cache/dev-python/wheel-0.33.6 b/metadata/md5-cache/dev-python/wheel-0.33.6
index 1339d566761c..9b3a791d6e7f 100644
--- a/metadata/md5-cache/dev-python/wheel-0.33.6
+++ b/metadata/md5-cache/dev-python/wheel-0.33.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/wheel/archive/0.33.6.tar.gz -> wheel-0.33.6.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d955fe09947bb3df760b66163791e1f1
diff --git a/metadata/md5-cache/dev-python/wheel-0.34.2 b/metadata/md5-cache/dev-python/wheel-0.34.2
index fd6c74072f0c..4e31a5b9187c 100644
--- a/metadata/md5-cache/dev-python/wheel-0.34.2
+++ b/metadata/md5-cache/dev-python/wheel-0.34.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pypa/wheel/archive/0.34.2.tar.gz -> wheel-0.34.2.gh.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3cd985d75e6114c41dcc4da57952605d
diff --git a/metadata/md5-cache/dev-python/whelk-2.7.1 b/metadata/md5-cache/dev-python/whelk-2.7.1
index b46c3cc9f889..30ac437841eb 100644
--- a/metadata/md5-cache/dev-python/whelk-2.7.1
+++ b/metadata/md5-cache/dev-python/whelk-2.7.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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Pretending python is a shell
 EAPI=6
 HOMEPAGE=https://pypi.org/project/whelk/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=https://github.com/seveas/whelk/archive/2.7.1.tar.gz -> whelk-2.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93dc0d9d8b0cbeeadd1e8ab7e84b8abb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe535b8710cb329ca1bf8fa1c3122c71
diff --git a/metadata/md5-cache/dev-python/whichcraft-0.4.1 b/metadata/md5-cache/dev-python/whichcraft-0.4.1
index cf60eaee486d..bcefe3e17094 100644
--- a/metadata/md5-cache/dev-python/whichcraft-0.4.1
+++ b/metadata/md5-cache/dev-python/whichcraft-0.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=This package provides cross-platform cross-python shutil.which functionality
 EAPI=5
 HOMEPAGE=https://github.com/pydanny/whichcraft
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=922083d0e623f10f85feb203cd268151
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cda113b9b482bae4a16c373776c8289d
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.13 b/metadata/md5-cache/dev-python/whisper-0.9.13
deleted file mode 100644
index ec52984c85ec..000000000000
--- a/metadata/md5-cache/dev-python/whisper-0.9.13
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Fixed size round-robin style database
-EAPI=5
-HOMEPAGE=https://github.com/graphite-project/whisper
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/w/whisper/whisper-0.9.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75cde8e5de581125bcccc3ce3abdbc68
diff --git a/metadata/md5-cache/dev-python/whisper-0.9.15 b/metadata/md5-cache/dev-python/whisper-0.9.15
deleted file mode 100644
index 31d003a0f2fb..000000000000
--- a/metadata/md5-cache/dev-python/whisper-0.9.15
+++ /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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Fixed size round-robin style database
-EAPI=5
-HOMEPAGE=https://github.com/graphite-project/whisper
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/w/whisper/whisper-0.9.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be3f7e784c9c60569dd95ed10c4b256b
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.3 b/metadata/md5-cache/dev-python/whisper-1.1.3
index aa1801ff317f..6e9bb466eaea 100644
--- a/metadata/md5-cache/dev-python/whisper-1.1.3
+++ b/metadata/md5-cache/dev-python/whisper-1.1.3
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-unittest-mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] virtual/python-unittest-mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] )
 DESCRIPTION=Fixed size round-robin style database
 EAPI=7
 HOMEPAGE=https://github.com/graphite-project/whisper
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~x86 ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.3.tar.gz -> whisper-1.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5a94803b751f48afa524b546bf60d209
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d7ff595814815621f9924f742cbd74c3
diff --git a/metadata/md5-cache/dev-python/whisper-1.1.5 b/metadata/md5-cache/dev-python/whisper-1.1.5
index 95905b38d37f..3765668a6864 100644
--- a/metadata/md5-cache/dev-python/whisper-1.1.5
+++ b/metadata/md5-cache/dev-python/whisper-1.1.5
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-unittest-mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-unittest-mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Fixed size round-robin style database
 EAPI=7
 HOMEPAGE=https://github.com/graphite-project/whisper
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86 ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/graphite-project/whisper/archive/1.1.5.tar.gz -> whisper-1.1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=897f357e409036fb2e2761728a6d9afa
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2efffff1d17ef345e902d1b65ec2521e
diff --git a/metadata/md5-cache/dev-python/whoosh-2.6.0 b/metadata/md5-cache/dev-python/whoosh-2.6.0
index 29aedd1f9089..20426be1f866 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.6.0
+++ b/metadata/md5-cache/dev-python/whoosh-2.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.6.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06f28cb36775a0a7fd035ab2c756f263
diff --git a/metadata/md5-cache/dev-python/whoosh-2.7.4 b/metadata/md5-cache/dev-python/whoosh-2.7.4
index 6c26609c87a6..8dd624a6b479 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.7.4
+++ b/metadata/md5-cache/dev-python/whoosh-2.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ff49331dd4955eb3da9a4dd4fed1d84
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0 b/metadata/md5-cache/dev-python/widgetsnbextension-3.0.0
index 834681853a74..473e72adfe73 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_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2399d020e3018a98f99b7d1ea626cfe4
diff --git a/metadata/md5-cache/dev-python/widgetsnbextension-3.4.2 b/metadata/md5-cache/dev-python/widgetsnbextension-3.4.2
index 45f8111f321b..dfa1e5fdae50 100644
--- a/metadata/md5-cache/dev-python/widgetsnbextension-3.4.2
+++ b/metadata/md5-cache/dev-python/widgetsnbextension-3.4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/notebook[python_targets_python3_6(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/widgetsnbextension/widgetsnbextension-3.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=41a33b54aabda9d71a4a58e6771b0c9f
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.10 b/metadata/md5-cache/dev-python/wrapt-1.10.10
index a97f472acf84..0af6294f2605 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.10
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.10.tar.gz -> wrapt-1.10.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00c06c1bb99b8cbe3971057791b4f8b2
diff --git a/metadata/md5-cache/dev-python/wrapt-1.10.11 b/metadata/md5-cache/dev-python/wrapt-1.10.11
index 003fba20aa7c..4b352691d258 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.10.11
+++ b/metadata/md5-cache/dev-python/wrapt-1.10.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.10.11.tar.gz -> wrapt-1.10.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a31aaded54446a4d5e15d3483e0d6e2c
diff --git a/metadata/md5-cache/dev-python/wrapt-1.11.2 b/metadata/md5-cache/dev-python/wrapt-1.11.2
index 0b3725142f0b..5e281cce545f 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.11.2
+++ b/metadata/md5-cache/dev-python/wrapt-1.11.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.11.2.tar.gz -> wrapt-1.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=40c3628fb47188715e03df44b826fc8e
diff --git a/metadata/md5-cache/dev-python/wrapt-1.11.2-r1 b/metadata/md5-cache/dev-python/wrapt-1.11.2-r1
index 13a4f6303585..92b9f0aade86 100644
--- a/metadata/md5-cache/dev-python/wrapt-1.11.2-r1
+++ b/metadata/md5-cache/dev-python/wrapt-1.11.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/wrapt/archive/1.11.2.tar.gz -> wrapt-1.11.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=84be7d41cbbe20f64ed155188ab4eb62
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 306cab87b1a5..fb2edd6d5578 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.3.4-r1
+++ b/metadata/md5-cache/dev-python/ws4py-0.3.4-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=adc359ad0710c77c84732b855a84562f
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1 b/metadata/md5-cache/dev-python/ws4py-0.5.1
index 7ba4bcd3f58d..a2b25b340f25 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1
+++ b/metadata/md5-cache/dev-python/ws4py-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0c9b8b3e0cdcf86e529225c04720f603
diff --git a/metadata/md5-cache/dev-python/ws4py-9999 b/metadata/md5-cache/dev-python/ws4py-9999
index b33d60b80c55..308298d43e4a 100644
--- a/metadata/md5-cache/dev-python/ws4py-9999
+++ b/metadata/md5-cache/dev-python/ws4py-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=528eafdbab38aab26bd5320784d1e573
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 7cd5cb610ca6..60f85405f27b 100644
--- a/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
+++ b/metadata/md5-cache/dev-python/wsaccel-0.6.2_p20170108
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Accelerator for ws4py, autobahn and tornado
 EAPI=5
 HOMEPAGE=https://pypi.org/project/wsaccel/ https://github.com/methane/wsaccel
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/methane/wsaccel/archive/0fbd074c257c51b73de05b25ccb6488801320a32.zip -> wsaccel-0.6.2_p20170108.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a12dc44b4e076bd91a3e525dd8de7e5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb11f2477d0a5a6f237f8876ac20aa41
diff --git a/metadata/md5-cache/dev-python/wsgiintercept-1.3.1 b/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
index 145ac06310a3..41221f66b4ab 100644
--- a/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
+++ b/metadata/md5-cache/dev-python/wsgiintercept-1.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsgi_intercept/wsgi_intercept-1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=05d5fdccf123f3df60e8d295b1ab132e
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.2
index c4d62cd8ebad..3f60a3a540c5 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_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.2.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=676519caf5700fee7cb08675acd9da9f
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4-r1 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4-r1
index c0ecde939fc0..04b66553ccfd 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4-r1
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5cc75dfb4d502a79299a97ddf61655ac
diff --git a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6 b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6
index 1b0f44d93590..0c300a84c4a7 100644
--- a/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6
+++ b/metadata/md5-cache/dev-python/wsgiproxy2-0.4.6
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/webtest-2.0.17[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/socketpool[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/restkit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( >=dev-python/webtest-2.0.17[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/socketpool[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/restkit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/urllib3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=HTTP proxying tools for WSGI apps
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WSGIProxy2/WSGIProxy2-0.4.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ba484db9592219aa1a4dda9614bc6688
diff --git a/metadata/md5-cache/dev-python/wsproto-0.11.0 b/metadata/md5-cache/dev-python/wsproto-0.11.0
index a55b2c3c1bd0..ea25b6e345a0 100644
--- a/metadata/md5-cache/dev-python/wsproto-0.11.0
+++ b/metadata/md5-cache/dev-python/wsproto-0.11.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-0.11.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61b86a8f274a9eee45d6cdde958280fb
diff --git a/metadata/md5-cache/dev-python/wsproto-0.12.0 b/metadata/md5-cache/dev-python/wsproto-0.12.0
index d9598ce55509..9b82eb6f182a 100644
--- a/metadata/md5-cache/dev-python/wsproto-0.12.0
+++ b/metadata/md5-cache/dev-python/wsproto-0.12.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wsproto/wsproto-0.12.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=75f869a98fb6ba599266b8b27ac774fb
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.3 b/metadata/md5-cache/dev-python/wstools-0.4.3
index 317ce71c0f99..465679a0ac85 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_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=d
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53d2987c0effd8bb8ad2fc090289a222
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 8b45893ab7d5..526865335c94 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.5-r1
+++ b/metadata/md5-cache/dev-python/wstools-0.4.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08285fae964f9318eea3bf08acb843f8
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 12a6316b580f..0f7442597c69 100644
--- a/metadata/md5-cache/dev-python/wtf-peewee-3.0.0
+++ b/metadata/md5-cache/dev-python/wtf-peewee-3.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coleifer/wtf-peewee/archive/3.0.0.tar.gz -> wtf-peewee-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=812ba9a961c27fdeb9214f7515544625
diff --git a/metadata/md5-cache/dev-python/wtforms-2.1 b/metadata/md5-cache/dev-python/wtforms-2.1
index 15af76a32506..2777638bc3f6 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.1
+++ b/metadata/md5-cache/dev-python/wtforms-2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-2.1.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c501e78ab1aa1b5687d0e0513c923177
diff --git a/metadata/md5-cache/dev-python/wtforms-2.2.1 b/metadata/md5-cache/dev-python/wtforms-2.2.1
index 344819841b2f..6b220ebeb4a1 100644
--- a/metadata/md5-cache/dev-python/wtforms-2.2.1
+++ b/metadata/md5-cache/dev-python/wtforms-2.2.1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( >=dev-python/sphinx-0.6[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] doc? ( >=dev-python/sphinx-0.6[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/sqlalchemy[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/webob[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Flexible forms validation and rendering library for python web development
 EAPI=7
 HOMEPAGE=https://wtforms.readthedocs.io/
-IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WTForms/WTForms-2.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4f0f535b705856f470fa6ad3288d86c2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ec31e01d67ec5558e9d8d37a10eaeefc
diff --git a/metadata/md5-cache/dev-python/wurlitzer-2.0.0 b/metadata/md5-cache/dev-python/wurlitzer-2.0.0
index 6556f956c4f3..c6e1de1abeac 100644
--- a/metadata/md5-cache/dev-python/wurlitzer-2.0.0
+++ b/metadata/md5-cache/dev-python/wurlitzer-2.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wurlitzer/wurlitzer-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4f8400b31a062283d93fb898a36cc13c
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 16bc6a2cdf3a..f3066f060fe4 100644
--- a/metadata/md5-cache/dev-python/www-authenticate-0.9.2
+++ b/metadata/md5-cache/dev-python/www-authenticate-0.9.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=WWW-Authenticate header parser
 EAPI=6
 HOMEPAGE=https://github.com/alexsdutton/www-authenticate
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alexsdutton/www-authenticate/archive/0.9.2.tar.gz -> www-authenticate-0.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56d5a6a0543b84247accf217975a3a8d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6054d6d25ec7f393b7405bef88d9df30
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 5d042ff2b0a7..568dcd71105f 100644
--- a/metadata/md5-cache/dev-python/wxpython-3.0.2.0
+++ b/metadata/md5-cache/dev-python/wxpython-3.0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A blending of the wxWindows C++ class library with Python
 EAPI=5
 HOMEPAGE=http://www.wxpython.org/
 IUSE=cairo examples libnotify opengl python_targets_python2_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 ~sh sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~sh sparc x86
 LICENSE=wxWinLL-3
 RDEPEND=dev-lang/python-exec:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=x11-libs/wxGTK-3.0.2.0:3.0=[libnotify=,opengl?,tiff,X] dev-libs/glib:2 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/libpng:0= media-libs/tiff:0 virtual/jpeg x11-libs/gtk+:2 x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( dev-python/pyopengl[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=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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18d47d71efa8dc3c39fc11de24812cd6
+_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c5ad432fd3201faef55ac30ca95462d
diff --git a/metadata/md5-cache/dev-python/wxpython-4.0.6 b/metadata/md5-cache/dev-python/wxpython-4.0.6
index eb67efbe7129..a4235ab8de2a 100644
--- a/metadata/md5-cache/dev-python/wxpython-4.0.6
+++ b/metadata/md5-cache/dev-python/wxpython-4.0.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=4.0
 SRC_URI=mirror://pypi/w/wxPython/wxPython-4.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd24bfab21bab8a76dc49a2b5870a9a3
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 7ed8af441c3b..f548e9c9df86 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_6
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cee6d2d09cd5a0e1bd0ae58af496076f
diff --git a/metadata/md5-cache/dev-python/xapp-1.8.1 b/metadata/md5-cache/dev-python/xapp-1.8.1
index 28e1af9ab6a7..02d30f9110a1 100644
--- a/metadata/md5-cache/dev-python/xapp-1.8.1
+++ b/metadata/md5-cache/dev-python/xapp-1.8.1
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/xapps[introspection] dev-python/psutil[python_targets_python3_6
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/python-xapp/archive/1.8.1.tar.gz -> xapp-1.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=744de28f1bc370591478637de5841780
diff --git a/metadata/md5-cache/dev-python/xarray-0.10.8 b/metadata/md5-cache/dev-python/xarray-0.10.8
index 571048161bbc..e36612e54981 100644
--- a/metadata/md5-cache/dev-python/xarray-0.10.8
+++ b/metadata/md5-cache/dev-python/xarray-0.10.8
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.10.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21c073a52fedb2211c590de19b41a645
diff --git a/metadata/md5-cache/dev-python/xarray-0.12.1 b/metadata/md5-cache/dev-python/xarray-0.12.1
index 9fd98e7ba6b4..c23a81aae487 100644
--- a/metadata/md5-cache/dev-python/xarray-0.12.1
+++ b/metadata/md5-cache/dev-python/xarray-0.12.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.12.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ac5bed0b866fd1171c627633967a3e28
diff --git a/metadata/md5-cache/dev-python/xcffib-0.5.1 b/metadata/md5-cache/dev-python/xcffib-0.5.1
index ab9669523e9c..0a38f06cda41 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.5.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9d61e4a6eb972d0ad9aa5cb95248a6d4
diff --git a/metadata/md5-cache/dev-python/xcffib-0.6.0 b/metadata/md5-cache/dev-python/xcffib-0.6.0
index 2073829a185d..b9595ab7e94a 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.6.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd49cd730c8a6973b5f5906c22d8861b
diff --git a/metadata/md5-cache/dev-python/xcffib-0.7.0 b/metadata/md5-cache/dev-python/xcffib-0.7.0
index 67f0d5e0dd78..1401dc0ffb43 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.7.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=77b5f56700be144c877d913c15f6299f
diff --git a/metadata/md5-cache/dev-python/xcffib-0.8.1 b/metadata/md5-cache/dev-python/xcffib-0.8.1
index 8f53650db61f..e4aa394683bb 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.8.1
+++ b/metadata/md5-cache/dev-python/xcffib-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=40b337480fd1662442191ab6dd4fe240
diff --git a/metadata/md5-cache/dev-python/xcffib-0.9.0 b/metadata/md5-cache/dev-python/xcffib-0.9.0
index 7b60506256c1..b5e579a82928 100644
--- a/metadata/md5-cache/dev-python/xcffib-0.9.0
+++ b/metadata/md5-cache/dev-python/xcffib-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xcffib/xcffib-0.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=d728f7a297975c8e13a8f3c6c7b7a315
diff --git a/metadata/md5-cache/dev-python/xdis-3.3.1 b/metadata/md5-cache/dev-python/xdis-3.3.1
index 9b39f1bff3c7..c55bed3d3418 100644
--- a/metadata/md5-cache/dev-python/xdis-3.3.1
+++ b/metadata/md5-cache/dev-python/xdis-3.3.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python cross-version byte-code disassembler and marshal routines
 EAPI=6
 HOMEPAGE=https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/six-1.10.0[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xdis/xdis-3.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=782f3780c7c1e42c9b6d00423433989b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35372d0f8c9dc50f91b16a3e872e0f41
diff --git a/metadata/md5-cache/dev-python/xdis-3.6.0 b/metadata/md5-cache/dev-python/xdis-3.6.0
index 0e05d96ef730..52952a185c9b 100644
--- a/metadata/md5-cache/dev-python/xdis-3.6.0
+++ b/metadata/md5-cache/dev-python/xdis-3.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/nose-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python cross-version byte-code disassembler and marshal routines
 EAPI=6
 HOMEPAGE=https://github.com/rocky/python-xdis/ https://pypi.org/project/xdis/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/six-1.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/click[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rocky/python-xdis/archive/release-3.6.0.tar.gz -> xdis-3.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13baadc52827e935c6c87037247cc43a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a1ba1a517e270c5823038d0cd5922b6d
diff --git a/metadata/md5-cache/dev-python/xdoctest-0.11.0 b/metadata/md5-cache/dev-python/xdoctest-0.11.0
new file mode 100644
index 000000000000..df021ecff221
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xdoctest-0.11.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A rewrite of Python's builtin doctest module but without all the weirdness
+EAPI=7
+HOMEPAGE=https://github.com/Erotemic/ubelt
+IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/x/xdoctest/xdoctest-0.11.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1458d0b55c74df52a773bb28d1112b5c
diff --git a/metadata/md5-cache/dev-python/xlrd-0.9.4 b/metadata/md5-cache/dev-python/xlrd-0.9.4
index 3b4992c86021..3f9f0620391b 100644
--- a/metadata/md5-cache/dev-python/xlrd-0.9.4
+++ b/metadata/md5-cache/dev-python/xlrd-0.9.4
@@ -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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Library for developers to extract data from Microsoft Excel (tm) spreadsheet files
 EAPI=5
 HOMEPAGE=http://www.python-excel.org/ https://github.com/python-excel/xlrd/
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://pypi/x/xlrd/xlrd-0.9.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57cc1566b096f6f27f9df27893cbdb96
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8daf5eb1a8b154e1465a452c5c82d347
diff --git a/metadata/md5-cache/dev-python/xlrd-1.2.0 b/metadata/md5-cache/dev-python/xlrd-1.2.0
index 34f5aee7c940..6c9e8a593a8e 100644
--- a/metadata/md5-cache/dev-python/xlrd-1.2.0
+++ b/metadata/md5-cache/dev-python/xlrd-1.2.0
@@ -1,14 +1,14 @@
-BDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Library to extract data from Microsoft Excel spreadsheets
 EAPI=7
 HOMEPAGE=http://www.python-excel.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlrd/xlrd-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0e5836f47178af161a68a37e08c0b399
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0a105217d8f725e1e2da80dfcf9a5a61
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-0.7.8 b/metadata/md5-cache/dev-python/xlsxwriter-0.7.8
index e1fdda7e2083..522bc60353b3 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-0.7.8
+++ b/metadata/md5-cache/dev-python/xlsxwriter-0.7.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python module for creating Excel XLSX files
 EAPI=5
 HOMEPAGE=https://pypi.org/project/XlsxWriter/ https://github.com/jmcnamara/XlsxWriter
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/X/XlsxWriter/XlsxWriter-0.7.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=517c61bd34076eadec64bb3cf05be44d
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c21ecd280910637b93719598e02cb69
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8 b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
index 2c4336bd6851..5b386dd0c86b 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
+++ b/metadata/md5-cache/dev-python/xlsxwriter-0.9.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( app-arch/unzip dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( app-arch/unzip dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python module for creating Excel XLSX files
 EAPI=6
 HOMEPAGE=https://github.com/jmcnamara/XlsxWriter
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63611b60a0f4fff43bf2a35126b3ba83
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad043e0fb7d8de9a1a450e1d492507c4
diff --git a/metadata/md5-cache/dev-python/xlutils-2.0.0-r1 b/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
index a182d804c621..ecc0870cbed7 100644
--- a/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
+++ b/metadata/md5-cache/dev-python/xlutils-2.0.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlutils/xlutils-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=75ab5f03b918755ae7cd4d8dbecc6699
diff --git a/metadata/md5-cache/dev-python/xlwt-1.2.0 b/metadata/md5-cache/dev-python/xlwt-1.2.0
index 0c27fdc5ce2c..2a794effb24f 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.2.0
+++ b/metadata/md5-cache/dev-python/xlwt-1.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=303de2e882ce51460a7f283b85561ad9
diff --git a/metadata/md5-cache/dev-python/xlwt-1.3.0 b/metadata/md5-cache/dev-python/xlwt-1.3.0
index 564d8305b6dd..2fa371a16e16 100644
--- a/metadata/md5-cache/dev-python/xlwt-1.3.0
+++ b/metadata/md5-cache/dev-python/xlwt-1.3.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xlwt/xlwt-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d47169283e71adfe541661617a9edd38
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.0.16 b/metadata/md5-cache/dev-python/xmlschema-1.0.16
index fd1775b5ff03..40367e6da64f 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.0.16
+++ b/metadata/md5-cache/dev-python/xmlschema-1.0.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.0.16.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a88348680dbee59b483bf80211f1acd4
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.1.0 b/metadata/md5-cache/dev-python/xmlschema-1.1.0
index 6e43c9692b94..010da52b2e60 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.1.0
+++ b/metadata/md5-cache/dev-python/xmlschema-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a5e9cb14a60bcda4242cc2b0a3de6c06
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.11.0 b/metadata/md5-cache/dev-python/xmltodict-0.11.0
index d1c645b18528..84ad052e58b6 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.11.0
+++ b/metadata/md5-cache/dev-python/xmltodict-0.11.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Makes working with XML feel like you are working with JSON
 EAPI=7
 HOMEPAGE=https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmltodict/xmltodict-0.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d57b1f4fab309dcfa08bcb5a7e5d2138
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6a4f05247e9e0334023cbfd8d30d1ebb
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.12.0 b/metadata/md5-cache/dev-python/xmltodict-0.12.0
index 0d1eaa38a8ad..0ee46a74f7a0 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.12.0
+++ b/metadata/md5-cache/dev-python/xmltodict-0.12.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Makes working with XML feel like you are working with JSON
 EAPI=7
 HOMEPAGE=https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmltodict/xmltodict-0.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2103fa93c50dd72bb975142a8974c9df
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d1069e16f05171d37f7544e9d24d84a8
diff --git a/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1 b/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
index 803ecd94cc9a..8a76fd5facdd 100644
--- a/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
+++ b/metadata/md5-cache/dev-python/xmltodict-0.12.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Makes working with XML feel like you are working with JSON
 EAPI=7
 HOMEPAGE=https://github.com/martinblech/xmltodict/ https://pypi.org/project/xmltodict/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmltodict/xmltodict-0.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=181d68bd9258e8885898d90e17cdf07e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a0e4f71612073ed1117495ee963c114b
diff --git a/metadata/md5-cache/dev-python/xstatic-1.0.1 b/metadata/md5-cache/dev-python/xstatic-1.0.1
index 6d82efa95f9e..771b31c80db1 100644
--- a/metadata/md5-cache/dev-python/xstatic-1.0.1
+++ b/metadata/md5-cache/dev-python/xstatic-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=XStatic base package with minimal support code
 EAPI=6
 HOMEPAGE=https://pypi.org/project/XStatic
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/X/XStatic/XStatic-1.0.1.tar.gz -> xstatic-1.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c0aa090541ce68fbe0171f4af7f0a0b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=951c8f1e260b475a9a1ae7cd3795ea40
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 ecb31782282e..b622efa34be9 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/xstatic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=XStatic Bootstrap-SCSS package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/XStatic-Bootstrap-SCSS
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/xstatic[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 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f86d8c190be957509db579f4c55523f9
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b51c0dd578bcf546a4f744bd6287b694
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 09e033f19171..86da0b380128 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/xstatic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=XStatic DataTables package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/XStatic-DataTables
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/xstatic[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 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13bc1c79df0ed4f81b18694f1112af57
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=00a7467983d73faf7b6f88c54b5ea5c7
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 2f3c6ef374bb..826973f4175f 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/xstatic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=XStatic jQuery package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/XStatic-jQuery
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/xstatic[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 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8cebc94d22e33fa8bc0bf78993c70924
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3f1b4f51cd4840315ef1bb6b71cd4d9f
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 6165f6e59031..0c54d6e65c3c 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/xstatic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=XStatic Patternfly package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/XStatic-Patternfly
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/xstatic[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 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34a7042a5bf94c5d3452c746daadcef7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=96190b414a480f809a38e9eea2dbda14
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 f25ee54cc2e5..3d296fb46612 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/xstatic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=XStatic-Patternfly-Bootstrap-Treeview package
 EAPI=6
 HOMEPAGE=https://pypi.org/project/XStatic-Patternfly-Bootstrap-Treeview
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/xstatic[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/xstatic[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 )
 RESTRICT=!test? ( test )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=684eccd816727a7b56b585691f8dc6fb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=76f3afa76d92814f07cac37cb39c0c9b
diff --git a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9 b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
index 14fc9637ded0..8b1ffd34e41d 100644
--- a/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
+++ b/metadata/md5-cache/dev-python/xvfbwrapper-0.2.9
@@ -1,15 +1,14 @@
-BDEPEND=test? ( 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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python wrapper for running a display inside X virtual framebuffer
 EAPI=7
 HOMEPAGE=https://github.com/cgoldberg/xvfbwrapper https://pypi.org/project/xvfbwrapper/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=x11-base/xorg-server[xvfb] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
+RDEPEND=x11-base/xorg-server[xvfb] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/x/xvfbwrapper/xvfbwrapper-0.2.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=adb383db4e1c114b221180fd9eedced4
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ff3e0a3453141df1c46c49794d68206f
diff --git a/metadata/md5-cache/dev-python/yapf-0.24.0 b/metadata/md5-cache/dev-python/yapf-0.24.0
index dcdcabfe3b71..81f9d7af269a 100644
--- a/metadata/md5-cache/dev-python/yapf-0.24.0
+++ b/metadata/md5-cache/dev-python/yapf-0.24.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.24.0.tar.gz -> yapf-0.24.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3762898ab7ddcaf7205c29f7f191e13c
diff --git a/metadata/md5-cache/dev-python/yapf-0.28.0 b/metadata/md5-cache/dev-python/yapf-0.28.0
index 1d44a8b8ee17..b94f5600b9b1 100644
--- a/metadata/md5-cache/dev-python/yapf-0.28.0
+++ b/metadata/md5-cache/dev-python/yapf-0.28.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/yapf/archive/v0.28.0.tar.gz -> yapf-0.28.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3762898ab7ddcaf7205c29f7f191e13c
diff --git a/metadata/md5-cache/dev-python/yappi-0.98 b/metadata/md5-cache/dev-python/yappi-0.98
index 9a41f44b34e6..684c72826401 100644
--- a/metadata/md5-cache/dev-python/yappi-0.98
+++ b/metadata/md5-cache/dev-python/yappi-0.98
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Yet Another Python Profiler
 EAPI=6
 HOMEPAGE=https://bitbucket.org/sumerc/yappi/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/setuptools[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yappi/yappi-0.98.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ab91246da5f5fee92007da7a133a9f7a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=19d9acaddcb0c01071a7c3ad0d79c5d0
diff --git a/metadata/md5-cache/dev-python/yappi-1.0 b/metadata/md5-cache/dev-python/yappi-1.0
index e818ab307389..88e01cb378f1 100644
--- a/metadata/md5-cache/dev-python/yappi-1.0
+++ b/metadata/md5-cache/dev-python/yappi-1.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[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(-)] )
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Yet Another Python Profiler
 EAPI=7
 HOMEPAGE=https://bitbucket.org/sumerc/yappi/
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yappi/yappi-1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=563e32542e58279d2e308a3aa382885a
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0c5ae9cfe8128bcebe15f6cfac3f1e2b
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 fa95664bf744..baf92d0fb880 100644
--- a/metadata/md5-cache/dev-python/yapsy-1.11.223-r2
+++ b/metadata/md5-cache/dev-python/yapsy-1.11.223-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A fat-free DIY Python plugin management toolkit
 EAPI=6
 HOMEPAGE=http://yapsy.sourceforge.net/
-IUSE=doc python_targets_python2_7 python_targets_python3_6
+IUSE=doc python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=mirror://sourceforge/yapsy/Yapsy-1.11.223/Yapsy-1.11.223.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5490796650b293df81f3f7c0f20dd7de
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7669e3745c84c1dab1722b3f1434fc22
diff --git a/metadata/md5-cache/dev-python/yaql-1.1.3 b/metadata/md5-cache/dev-python/yaql-1.1.3
index dc41ad06a152..140fb6ea6a3a 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_python3_6(-)?,python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yaql/yaql-1.1.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbc7bb9351ecbde0d1a5f811c064d8e5
diff --git a/metadata/md5-cache/dev-python/yarl-1.1.1 b/metadata/md5-cache/dev-python/yarl-1.1.1
index 29d8b1064f03..5a58648a4591 100644
--- a/metadata/md5-cache/dev-python/yarl-1.1.1
+++ b/metadata/md5-cache/dev-python/yarl-1.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff3999673858fe17d8c99650b25da0b4
diff --git a/metadata/md5-cache/dev-python/yarl-1.3.0 b/metadata/md5-cache/dev-python/yarl-1.3.0
index 520cdc8b03f2..5f32a69bb267 100644
--- a/metadata/md5-cache/dev-python/yarl-1.3.0
+++ b/metadata/md5-cache/dev-python/yarl-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53769c6faaf508486e1bdeda81ae33da
diff --git a/metadata/md5-cache/dev-python/yaswfp-0.9.3 b/metadata/md5-cache/dev-python/yaswfp-0.9.3
index d85ea94ba7b7..56f9a95c1fed 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/y/yaswfp/yaswfp-0.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=20fbb4a77a5bbcdd308ae82371768e6e
diff --git a/metadata/md5-cache/dev-python/zVMCloudConnector-1.2.2 b/metadata/md5-cache/dev-python/zVMCloudConnector-1.2.2
index 984dd29f98e6..1b6165289057 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zVMCloudConnector/zVMCloudConnector-1.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1908276323d945e61492798d107604b7
diff --git a/metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1 b/metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
index 75cb14e2021c..dbd34a3cbb5d 100644
--- a/metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
+++ b/metadata/md5-cache/dev-python/zVMCloudConnector-1.4.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zVMCloudConnector/zVMCloudConnector-1.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a8907206d44323591447eb7b3ca88cbc
diff --git a/metadata/md5-cache/dev-python/zake-0.2.1 b/metadata/md5-cache/dev-python/zake-0.2.1
index cb3c3aa711bb..c06038ba6c87 100644
--- a/metadata/md5-cache/dev-python/zake-0.2.1
+++ b/metadata/md5-cache/dev-python/zake-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zake/zake-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad94b72ec643adb3fdc41e1d1c3f9fdb
diff --git a/metadata/md5-cache/dev-python/zbase32-1.1.5 b/metadata/md5-cache/dev-python/zbase32-1.1.5
index 9a4f4f8e5d51..7f4477d5b978 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 0a532e253c54..e0f4c584f6a5 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.buildout/zc.buildout-2.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7db86dd8a17d3d3021ea4ad1309e283e
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-1.4 b/metadata/md5-cache/dev-python/zc-lockfile-1.4
index 9d6ca22b63a1..b55dafd71648 100644
--- a/metadata/md5-cache/dev-python/zc-lockfile-1.4
+++ b/metadata/md5-cache/dev-python/zc-lockfile-1.4
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Basic inter-process locks
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zc.lockfile/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm64
 LICENSE=ZPL
-RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.lockfile/zc.lockfile-1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b3a7474d74a2404188d0ff30a5f2dfa6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=014edea3bc86dcc27031e706a01b4a27
diff --git a/metadata/md5-cache/dev-python/zc-lockfile-2.0 b/metadata/md5-cache/dev-python/zc-lockfile-2.0
index 3c5049e6e3ec..1a7023e950a8 100644
--- a/metadata/md5-cache/dev-python/zc-lockfile-2.0
+++ b/metadata/md5-cache/dev-python/zc-lockfile-2.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
 DESCRIPTION=Basic inter-process locks
 EAPI=7
 HOMEPAGE=https://pypi.org/project/zc.lockfile/
-IUSE=test test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm64 ~hppa ~ppc64 ~sparc ~x86
 LICENSE=ZPL
-RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/setuptools-3.3[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zc.lockfile/zc.lockfile-2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fa2d159552bcefe8db214f53b1a56817
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=424e1838b2809b63df7534dd48d722ad
diff --git a/metadata/md5-cache/dev-python/zeep-3.4.0 b/metadata/md5-cache/dev-python/zeep-3.4.0
index b36d58fdd7e1..5da7092449ed 100644
--- a/metadata/md5-cache/dev-python/zeep-3.4.0
+++ b/metadata/md5-cache/dev-python/zeep-3.4.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/setuptools >=dev-python/appdirs-1.4.0[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zeep/zeep-3.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6999512f333fe50a4face71d6c5b6cfd
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.19.1 b/metadata/md5-cache/dev-python/zeroconf-0.19.1
index a1d4bcde0195..f4dbbad69e42 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.19.1
+++ b/metadata/md5-cache/dev-python/zeroconf-0.19.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/netifaces[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
 EAPI=6
 HOMEPAGE=https://github.com/jstasiak/python-zeroconf https://pypi.org/project/zeroconf/
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
-RDEPEND=dev-python/netifaces[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/netifaces[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zeroconf/zeroconf-0.19.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=79d630e38c015f7449cfd93d5ffc1e38
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ac697379606ccafd3121f33463ccedcb
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.24.4 b/metadata/md5-cache/dev-python/zeroconf-0.24.4
index 2cd5ddeffcb8..7378451b100e 100644
--- a/metadata/md5-cache/dev-python/zeroconf-0.24.4
+++ b/metadata/md5-cache/dev-python/zeroconf-0.24.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zeroconf/zeroconf-0.24.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=caa6196fc3bce372ffeaaf95639b769e
diff --git a/metadata/md5-cache/dev-python/zfec-1.4.24 b/metadata/md5-cache/dev-python/zfec-1.4.24
index d79f7306452d..82b7284cde66 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a2008267f916..b6cb57e91b9f 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.2
+++ b/metadata/md5-cache/dev-python/zict-0.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zict/zict-0.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=545a8dffa826234e04aaa3b904897229
diff --git a/metadata/md5-cache/dev-python/zict-0.1.3 b/metadata/md5-cache/dev-python/zict-0.1.3
index 884dc7a292f3..893392481fd0 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.3
+++ b/metadata/md5-cache/dev-python/zict-0.1.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zict/zict-0.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a64ed54eaeb95a7c853faf09e6c32879
diff --git a/metadata/md5-cache/dev-python/zict-0.1.4 b/metadata/md5-cache/dev-python/zict-0.1.4
index d51a39506506..7894ea175759 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.4
+++ b/metadata/md5-cache/dev-python/zict-0.1.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zict/zict-0.1.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=01b7603dce40a5e43446098dd8e13b6c
diff --git a/metadata/md5-cache/dev-python/zipp-0.6.0 b/metadata/md5-cache/dev-python/zipp-0.6.0
index 2d2d39c6d307..d4894c641a6d 100644
--- a/metadata/md5-cache/dev-python/zipp-0.6.0
+++ b/metadata/md5-cache/dev-python/zipp-0.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-0.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b8b1b3291310928b5bfa8bf0a6db6517
diff --git a/metadata/md5-cache/dev-python/zipp-1.0.0 b/metadata/md5-cache/dev-python/zipp-1.0.0
index b1aa41687e55..8754dd64201e 100644
--- a/metadata/md5-cache/dev-python/zipp-1.0.0
+++ b/metadata/md5-cache/dev-python/zipp-1.0.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/contextlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/contextlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/contextlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/rst-linker-1.9[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( dev-python/contextlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/contextlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/contextlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pathlib2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/unittest2[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/rst-linker-1.9[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-1.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=045f7c390ef640b93f32007fb56e56ee
diff --git a/metadata/md5-cache/dev-python/zipp-2.0.1 b/metadata/md5-cache/dev-python/zipp-2.0.1
index 061c91e44d37..031505f7c06f 100644
--- a/metadata/md5-cache/dev-python/zipp-2.0.1
+++ b/metadata/md5-cache/dev-python/zipp-2.0.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools_scm-3.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools_scm-3.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-),python_single_target_python3_8(+)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/rst-linker-1.9[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/rst-linker-1.9[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-python/pypy3-5:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-),python_single_target_pypy3(+)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-2.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3deff50778d620b30c71069ff0923607
diff --git a/metadata/md5-cache/dev-python/zipp-2.1.0 b/metadata/md5-cache/dev-python/zipp-2.1.0
index e5c486f07673..8c71b5667564 100644
--- a/metadata/md5-cache/dev-python/zipp-2.1.0
+++ b/metadata/md5-cache/dev-python/zipp-2.1.0
@@ -4,12 +4,12 @@ DESCRIPTION=Backport of pathlib-compatible object wrapper for zip files
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/zipp
 IUSE=test doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~arm64 ~hppa ~mips ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zipp/zipp-2.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9f09815737684cf934a5dfbba2f2c35e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=10705a686a34b2a89b6ea23cb0479c9b
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 6768c28e5421..01a9f6ff95b7 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-4.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bcbdadd9ae0ce884cd58a8a2a5a4dde9
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 48c49644ca67..71868a0d1474 100644
--- a/metadata/md5-cache/dev-python/zope-component-4.4.1
+++ b/metadata/md5-cache/dev-python/zope-component-4.4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-4.4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4e40abaac330ce5716d6154af41bf9a5
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 2819305851c3..6e034dd17cf9 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d7594a0840e9d83a96b7334335e6d76
diff --git a/metadata/md5-cache/dev-python/zope-configuration-4.3.1 b/metadata/md5-cache/dev-python/zope-configuration-4.3.1
index 237bb75f4b6a..4cc8dc8c7658 100644
--- a/metadata/md5-cache/dev-python/zope-configuration-4.3.1
+++ b/metadata/md5-cache/dev-python/zope-configuration-4.3.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/zope-i18nmessageid[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.configuration/zope.configuration-4.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=838526c3a61d77394f770c56db0bd5b9
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 061c037c1028..18ba96374c90 100644
--- a/metadata/md5-cache/dev-python/zope-deprecation-4.2.0
+++ b/metadata/md5-cache/dev-python/zope-deprecation-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.deprecation/zope.deprecation-4.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=765d60c7692a2b31ac5ce5a97619f9a1
diff --git a/metadata/md5-cache/dev-python/zope-deprecation-4.4.0 b/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
index 8a471eef3750..f79e00ef0b7f 100644
--- a/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
+++ b/metadata/md5-cache/dev-python/zope-deprecation-4.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.deprecation/zope.deprecation-4.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1bcc0dfe60b46a9a76edf7c0fcce3738
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 6ad12bb31f82..203ac23f592c 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.2.0
+++ b/metadata/md5-cache/dev-python/zope-event-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.event/zope.event-4.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=453f2b4e9e30373fcf712157ef22bc8d
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 0946394280fc..5a3b04b1e046 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.3.0
+++ b/metadata/md5-cache/dev-python/zope-event-4.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Event publishing / dispatch, used by Zope Component Architecture
 EAPI=6
 HOMEPAGE=https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.event/zope.event-4.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d16796913960d03f1fbb420714c05cdd
diff --git a/metadata/md5-cache/dev-python/zope-event-4.4 b/metadata/md5-cache/dev-python/zope-event-4.4
index f4dc63474d29..1bae7be7eca6 100644
--- a/metadata/md5-cache/dev-python/zope-event-4.4
+++ b/metadata/md5-cache/dev-python/zope-event-4.4
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Event publishing / dispatch, used by Zope Component Architecture
 EAPI=7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.event/zope.event-4.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=945e21bb8a5d3b5c144725de17757357
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 cd92379ae96d..edb0bd3f1bcd 100644
--- a/metadata/md5-cache/dev-python/zope-exceptions-4.1.0
+++ b/metadata/md5-cache/dev-python/zope-exceptions-4.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.exceptions/zope.exceptions-4.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43b512c543ff3e59ecb3f0d7612cec27
diff --git a/metadata/md5-cache/dev-python/zope-exceptions-4.3 b/metadata/md5-cache/dev-python/zope-exceptions-4.3
index 7926ade49099..9ca68bfe45e6 100644
--- a/metadata/md5-cache/dev-python/zope-exceptions-4.3
+++ b/metadata/md5-cache/dev-python/zope-exceptions-4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.exceptions/zope.exceptions-4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=95318c920f1c2ce16c94b45ec2e1dc56
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 67fbe3af9961..4e055d9217d1 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.i18nmessageid/zope.i18nmessageid-4.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc9f364565998a4c133b0c953cabd453
diff --git a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0 b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0
index 2f7f24177213..e473b29a25a8 100644
--- a/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0
+++ b/metadata/md5-cache/dev-python/zope-i18nmessageid-5.0.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.i18nmessageid/zope.i18nmessageid-5.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e1182673cc431124967a4128746edc3a
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 75b2b948d246..c9bfd34024bb 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_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88067d09a404de4ee31dc8914fbef001
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 2871cdfec35b..9c9b2b20183b 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.3.2
+++ b/metadata/md5-cache/dev-python/zope-interface-4.3.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e0b322e1753625ea134c507909d760a3
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 fd0a6501b559..c2fa58cea2c4 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.4.3
+++ b/metadata/md5-cache/dev-python/zope-interface-4.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.4.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1eabb2d16653896837683e9009730d5a
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 edb80af63cc2..3c56196f851f 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.5.0
+++ b/metadata/md5-cache/dev-python/zope-interface-4.5.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae0ba984db17c6e540d96190cd0223f5
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.6.0 b/metadata/md5-cache/dev-python/zope-interface-4.6.0
index 9d359dba2da8..c474b7948961 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.6.0
+++ b/metadata/md5-cache/dev-python/zope-interface-4.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5d08ecc4f7dfadf25d6637c1b36d680d
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.7.1 b/metadata/md5-cache/dev-python/zope-interface-4.7.1
index 853e9f62b65a..82ddf1e13ad3 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.7.1
+++ b/metadata/md5-cache/dev-python/zope-interface-4.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0a7fd7d28b70817c1c35171690dd5574
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 d49196485ebd..ce50838be92a 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.schema/zope.schema-4.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1cc101f98ec804b6b8fa6d2b3a0c3256
diff --git a/metadata/md5-cache/dev-python/zope-schema-4.9.3 b/metadata/md5-cache/dev-python/zope-schema-4.9.3
index 44cb605ba9cc..068c9886689c 100644
--- a/metadata/md5-cache/dev-python/zope-schema-4.9.3
+++ b/metadata/md5-cache/dev-python/zope-schema-4.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.schema/zope.schema-4.9.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7f2949df8a2376a0d11b4d6aecce20e7
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 f82647d7e262..bd7cef55b3d1 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_pypy3(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testing/zope.testing-4.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa505562fb7e27f3dbb235287d70a975
diff --git a/metadata/md5-cache/dev-python/zope-testing-4.7-r1 b/metadata/md5-cache/dev-python/zope-testing-4.7-r1
index 937a9a515155..9a0dfbdba4f7 100644
--- a/metadata/md5-cache/dev-python/zope-testing-4.7-r1
+++ b/metadata/md5-cache/dev-python/zope-testing-4.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testing/zope.testing-4.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e81a908497ed913f0caa380971eee8f7
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 5e724bb9cf7f..74030470fb80 100644
--- a/metadata/md5-cache/dev-python/zope-testrunner-4.7.0
+++ b/metadata/md5-cache/dev-python/zope-testrunner-4.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testrunner/zope.testrunner-4.7.0.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=82b329e91fe4c8766561e006a3bae1c2
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.1 b/metadata/md5-cache/dev-python/zope-testrunner-5.1
index 84bb577ef36e..3bac892ac7d9 100644
--- a/metadata/md5-cache/dev-python/zope-testrunner-5.1
+++ b/metadata/md5-cache/dev-python/zope-testrunner-5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.testrunner/zope.testrunner-5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=409b9ee8d4dcb4c869d6b97f4bd1403a
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 672cd260abc8..5a8f6624014a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4586c74e0db37945d10fc784ae99293
diff --git a/metadata/md5-cache/dev-python/zstandard-0.11.0 b/metadata/md5-cache/dev-python/zstandard-0.11.0
index 2d560abd23e3..3ee8a7d2df54 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.11.0
+++ b/metadata/md5-cache/dev-python/zstandard-0.11.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstandard/zstandard-0.11.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e0782724e760ec2bcccd17548a6f0ee3
diff --git a/metadata/md5-cache/dev-python/zstandard-0.12.0 b/metadata/md5-cache/dev-python/zstandard-0.12.0
index 67c1a2c89ed0..49eb4fdd3dbd 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.12.0
+++ b/metadata/md5-cache/dev-python/zstandard-0.12.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstandard/zstandard-0.12.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f8f8b3fc0aa042b32dcdb8d602f09b30
diff --git a/metadata/md5-cache/dev-python/zstandard-0.13.0 b/metadata/md5-cache/dev-python/zstandard-0.13.0
index 10048828a71b..1719c174533f 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.13.0
+++ b/metadata/md5-cache/dev-python/zstandard-0.13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstandard/zstandard-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f9aa182764f4157fc931585eb79779b1
diff --git a/metadata/md5-cache/dev-python/zstandard-0.8.1 b/metadata/md5-cache/dev-python/zstandard-0.8.1
index 4f79d8e26642..c8c3f68f14e6 100644
--- a/metadata/md5-cache/dev-python/zstandard-0.8.1
+++ b/metadata/md5-cache/dev-python/zstandard-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/cffi:=[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/z/zstandard/zstandard-0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b78606713a5808ccf0e653fda74db175
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 19c28acdf6eb..da78dcec63a6 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.12.3 b/metadata/md5-cache/dev-qt/assistant-5.12.3
index 0f1fba1aebd3..3e6c573a3974 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.12.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=webkit debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qthelp-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtsql-5.12.3[sqlite] ~dev-qt/qtwidgets-5.12.3 webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9c85a7b30dd2a0ba2be2aa4bd085bd6
+_md5_=fb37fb056c9e54ddd67b2b63b03f39eb
diff --git a/metadata/md5-cache/dev-qt/designer-5.12.3 b/metadata/md5-cache/dev-qt/designer-5.12.3
index e440566cea4d..f64a61b8e676 100644
--- a/metadata/md5-cache/dev-qt/designer-5.12.3
+++ b/metadata/md5-cache/dev-qt/designer-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces wi
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=declarative webkit debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 declarative? ( ~dev-qt/qtdeclarative-5.12.3[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eca9d1d3bfee915a3d838c623a718af6
+_md5_=b4e19aea12626c531647c581a50cf924
diff --git a/metadata/md5-cache/dev-qt/linguist-5.12.3 b/metadata/md5-cache/dev-qt/linguist-5.12.3
index 625f1f206efb..51b282e46bcf 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.12.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-5.12.3 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c4dcda7869b426a30ac1f39b11e0521
+_md5_=7b544b57b4f267adac3846e6064aa093
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.12.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
index 3f77973c81fb..5bde0f93bc88 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtxml-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=4455932c70ab966180736c1dc829633e
+_md5_=ecc03b9865256683e35bae5b1b4249bc
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.12.3 b/metadata/md5-cache/dev-qt/pixeltool-5.12.3
index 6ce72ff19af1..e69a02f9999e 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.12.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=d1730cd4445349940cd18c97e4360341
+_md5_=df5fb3bf261eda197583af1990927794
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.12.3 b/metadata/md5-cache/dev-qt/qdbus-5.12.3
index cad8cc5dd6cc..c46308de54ef 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=1ebccab698fd54ede37c339c20cde559
+_md5_=a59571dc208df57cfea924e8feafce17
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
index fe96bd013d0b..a179d4471d7e 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 ~dev-qt/qtxml-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20dcd44dea0322bb010b63e794425028
+_md5_=0f16f4e37f7e50c9561beda2198d9b5b
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.12.3 b/metadata/md5-cache/dev-qt/qdoc-5.12.3
index e06b88eb4c02..cbf77109a3fd 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.12.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt documentation generator
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 sys-devel/clang:= qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=c04973070d04f39d285abc18276eb53e
+_md5_=a71101f6d68a67dcdca0f8e49823d85a
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302 b/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
index e0b78608417f..a36a01448d13 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.12.3_p201904161302
@@ -4,9 +4,9 @@ DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
 EAPI=7
 HOMEPAGE=https://doc.qt.io/
 IUSE=3d bluetooth charts datavis declarative graphicaleffects +html location multimedia networkauth +qch script sensors virtualkeyboard webengine
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=FDL-1.3
 REQUIRED_USE=|| ( html qch )
 SLOT=5
 SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc/5.12.3-0-201904161302qt-everywhere-documentation.7z charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtcharts/5.12.3-0-201904161302qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtdatavis3d/5.12.3-0-201904161302qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtnetworkauth/5.12.3-0-201904161302qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtscript/5.12.3-0-201904161302qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtscript/5.12.3-0-201904161302qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtvirtualkeyboard/5.12.3-0-201904161302qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5123_src_doc_examples/qt.qt5.5123.doc.qtwebengine/5.12.3-0-201904161302qtwebengine-documentation.7z )
-_md5_=408c3c69986bc3bccd9b7d777c5ec82d
+_md5_=31bda6e99f4fc9e94a981a26d80e2d02
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
index 6c9cd9af80ce..7e54000f9a17 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.12.3 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtconnectivity-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=23c7ea55d680d5f588f0e6358a1f101f
+_md5_=caaf01c790bf5e218cb93556cafdd056
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.13.2 b/metadata/md5-cache/dev-qt/qtbluetooth-5.13.2
index 33c7aa80745b..9777e3e273a8 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.13.2
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.13.2
@@ -5,11 +5,11 @@ DESCRIPTION=Bluetooth support library for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtconcurrent-5.13.2 ~dev-qt/qtcore-5.13.2 ~dev-qt/qtdbus-5.13.2 >=net-wireless/bluez-5:= qml? ( ~dev-qt/qtdeclarative-5.13.2 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtconnectivity-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f724437c0cca88d3909390dc059ad892
+_md5_=a0a86fd6a27dddabe1f8152166e4637c
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
index b46e2ad5e7f9..c8bff5c1f9e8 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=3afb41372dd0eaa2890d5abab8651645
+_md5_=9ca8dfe778ef699a8a0a6bd904fa3541
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.13.2 b/metadata/md5-cache/dev-qt/qtconcurrent-5.13.2
index d23df4e0eb55..90abe59eef55 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.13.2
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.13.2
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.13.2 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtbase-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=d2c72828e4e3f7ab21fd0e188eca0cc3
+_md5_=238bf983c0c48c860c48c5ab69043d7d
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.12.3-r1 b/metadata/md5-cache/dev-qt/qtcore-5.12.3-r1
deleted file mode 100644
index a1d18e4e2174..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.12.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.12.3 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=6
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd debug test
-KEYWORDS=arm x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.12
-SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=0b4e2227c9299b4dd0d9c43601760aea
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.12.3-r2 b/metadata/md5-cache/dev-qt/qtcore-5.12.3-r2
index 23eefd802d68..5d8fd84a2506 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.12.3-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.12.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=icu systemd debug test
-KEYWORDS=~arm ~x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=ad59879e11e41507eac27eecfca9f6f4
+_md5_=ca9bb2167b2567774355ab791ee53d59
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.13.2-r2 b/metadata/md5-cache/dev-qt/qtcore-5.13.2-r2
index 70d435493515..1c353a62030d 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.13.2-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-5.13.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=icu systemd debug test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtbase-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=0151449210e8c8128ab7b3012023f5e6
+_md5_=592d44ee9f539dbbf4060c06bd2ba78d
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.14.1 b/metadata/md5-cache/dev-qt/qtcore-5.14.1
deleted file mode 100644
index 4447c5d50655..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.14.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( ~dev-qt/qttest-5.14.1 )
-DESCRIPTION=Cross-platform application development framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=icu systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
-RESTRICT=test
-SLOT=5/5.14
-SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=29c317793f6169bdce9370fd7a2e8274
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.14.1-r1 b/metadata/md5-cache/dev-qt/qtcore-5.14.1-r1
new file mode 100644
index 000000000000..aeb7dbd4ad3e
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtcore-5.14.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( ~dev-qt/qttest-5.14.1 )
+DESCRIPTION=Cross-platform application development framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=icu systemd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) !<dev-qt/qtcore-4.8.7-r4:4 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.14
+SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=15c109c40bc086ad6936fdfd89f7b6f2
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.12.3 b/metadata/md5-cache/dev-qt/qtdbus-5.12.3
index 0246f4aeda30..b8ce4c21da2c 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=a3de74758013be35fd32364886f0e44f
+_md5_=78f0c5b0e2b7d26738033c5476437dbd
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
index b416eb499817..0ade2839fc75 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.12.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qttest-5.12.3 localstorage? ( ~dev-qt/qtsql-5.12.3 ) widgets? ( ~dev-qt/qtwidgets-5.12.3[gles2=] ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.12.3 )
+DEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qttest-5.12.3 localstorage? ( ~dev-qt/qtsql-5.12.3 ) widgets? ( ~dev-qt/qtwidgets-5.12.3[gles2=] ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.12.3 )
 DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 +jit localstorage +widgets debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qttest-5.12.3 localstorage? ( ~dev-qt/qtsql-5.12.3 ) widgets? ( ~dev-qt/qtwidgets-5.12.3[gles2=] ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtdeclarative-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f3dafb17cef3fe781d89ed433e2d4ac5
+_md5_=055b7438203451d943e76333f6484104
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.13.2 b/metadata/md5-cache/dev-qt/qtdeclarative-5.13.2
index f5bcf0e7c01b..f9bbb8872933 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.13.2
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.13.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~dev-qt/qtcore-5.13.2 ~dev-qt/qtgui-5.13.2[gles2=] ~dev-qt/qtnetwork-5.13.2 ~dev-qt/qttest-5.13.2 localstorage? ( ~dev-qt/qtsql-5.13.2 ) widgets? ( ~dev-qt/qtwidgets-5.13.2[gles2=] ) test? ( ~dev-qt/qttest-5.13.2 )
 DESCRIPTION=The QML and Quick modules for the Qt5 framework
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtdeclarative-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f7ee2b70f6b338a54705b5b102deafba
+_md5_=765c06ad8bfc48ed026c834b22ba2030
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.13.2-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.13.2-r1
index 8aa497c89653..af34e8da59de 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.13.2-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.13.2-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/perl virtual/pkgconfig
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DEPEND=~dev-qt/qtcore-5.13.2 ~dev-qt/qtgui-5.13.2[gles2=] ~dev-qt/qtnetwork-5.13.2 ~dev-qt/qttest-5.13.2 localstorage? ( ~dev-qt/qtsql-5.13.2 ) widgets? ( ~dev-qt/qtwidgets-5.13.2[gles2=] ) test? ( ~dev-qt/qttest-5.13.2 )
 DESCRIPTION=The QML and Quick modules for the Qt5 framework
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtdeclarative-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=a5d817c9df1077cb8a3c5a41872f0cc4
+_md5_=ec175c58f4dff434841c0b28e0df155a
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.12.3 b/metadata/md5-cache/dev-qt/qtdiag-5.12.3
index 8e97fc4eddf9..eb3d18928699 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Tool for reporting diagnostic information about Qt and its environme
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+network +widgets debug test
-KEYWORDS=~arm ~x86
+KEYWORDS=~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 network? ( ~dev-qt/qtnetwork-5.12.3[ssl] ) widgets? ( ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=3a943afd660bc53359701b72f04f295a
+_md5_=04b9a297f2a49acf6efc5a25aa61355b
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
index 9ee645352233..dbd30831b705 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 dev-qt/qtchooser
 RESTRICT=!test? ( test ) test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtgraphicaleffects-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=5e28aaa9582dc2d8bcbb5202f8fb1b88
+_md5_=0d776d96ab946c6141dbe0ef383db03c
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1 b/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
index 55f05ea24fec..db95a7a6b0bd 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.12.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc +xcb debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus )
 RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.12.3 media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.12.3 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( x11-libs/tslib ) tuio? ( ~dev-qt/qtnetwork-5.12.3 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.12.3 ) xcb? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) dev-qt/qtchooser
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=0c6a8ea2f202853b57871018c4b82fb7
+_md5_=5cfd5603efaf9d5a3d1d7593a60ebf12
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.14.1 b/metadata/md5-cache/dev-qt/qtgui-5.14.1
deleted file mode 100644
index f2a395b7724e..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.14.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.14.1 dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.14.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.14.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.14.1 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qttest-5.14.1 )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=7
-HOMEPAGE=https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc wayland +X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.14.1 )
-RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.14.1 dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.14.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.14.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.14.1 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !<dev-qt/qtimageformats-5.14.0:5 !<dev-qt/qtsvg-5.14.0:5 !<dev-qt/qtvirtualkeyboard-5.14.0:5 !<dev-qt/qtwayland-5.14.0:5 dev-qt/qtchooser
-REQUIRED_USE=|| ( eglfs X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2? ( egl ) )
-RESTRICT=test
-SLOT=5/5.14
-SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=3d8a8475315b9399d65d246a2bf91e04
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.14.1-r2 b/metadata/md5-cache/dev-qt/qtgui-5.14.1-r2
new file mode 100644
index 000000000000..b8b96e9b692f
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtgui-5.14.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.14.1 dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.14.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.14.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.14.1 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( ~dev-qt/qttest-5.14.1 )
+DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=accessibility dbus egl eglfs evdev +gif gles2 ibus jpeg +libinput +png tslib tuio +udev vnc wayland +X debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-5.14.1 )
+RDEPEND=dev-libs/glib:2 ~dev-qt/qtcore-5.14.1 dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= sys-libs/zlib:= virtual/opengl dbus? ( ~dev-qt/qtdbus-5.14.1 ) egl? ( media-libs/mesa[egl] ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) gles2? ( media-libs/mesa[gles2] ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-5.14.1 ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-5.14.1 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !<dev-qt/qtimageformats-5.14.0:5 !<dev-qt/qtsvg-5.14.0:5 !<dev-qt/qtvirtualkeyboard-5.14.0:5 !<dev-qt/qtwayland-5.14.0:5 dev-qt/qtchooser
+REQUIRED_USE=|| ( eglfs X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2? ( egl ) )
+RESTRICT=test
+SLOT=5/5.14.1
+SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=836c52180ba8826d12c6c71bd27175c9
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.12.3 b/metadata/md5-cache/dev-qt/qthelp-5.12.3
index 5b899d2d452b..b1c80c74c4df 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.12.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtsql-5.12.3[sqlite] ~dev-qt/qtwidgets-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=b9052d36c7702ce5018046d8b6e72408
+_md5_=43a8d93d9ca4ccea3dc9e897248c4f8f
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.12.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
index 81189c982341..4f0500e26515 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=mng debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtimageformats-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=683b22b87956aa6b9aae9b8655f2591f
+_md5_=1ee93627c4a83b8285df6fa0b16ba980
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.12.3 b/metadata/md5-cache/dev-qt/qtlocation-5.12.3
index 96c1cd13d736..57f77df64af0 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtpositioning-5.12.3[qml] ~dev-qt/qtsql-5.12.3 sys-libs/zlib dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=4ce6cdab568838e4f46300ea4bf60f6b
+_md5_=096336dd16a13d84d05356fefc436398
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.13.2 b/metadata/md5-cache/dev-qt/qtlocation-5.13.2
index d495f0962966..d5a87f9148ed 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.13.2
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.13.2
@@ -5,11 +5,11 @@ DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~x86
+KEYWORDS=amd64 arm arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.13.2 ~dev-qt/qtdeclarative-5.13.2 ~dev-qt/qtgui-5.13.2 ~dev-qt/qtnetwork-5.13.2 ~dev-qt/qtpositioning-5.13.2[qml] ~dev-qt/qtsql-5.13.2 sys-libs/zlib dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtlocation-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=0038d469abfbfb85381f60327498224f
+_md5_=49ddd2f57a37e823c356a28b1c91e97f
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
index fb4045963c70..48fd5d3a2a3c 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtnetwork-5.12.3 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( ~dev-qt/qtdeclarative-5.12.3 gles2? ( ~dev-qt/qtgui-5.12.3[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.12.3 ~dev-qt/qtwidgets-5.12.3[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtmultimedia-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=4066f1e964089a0464eeeafb0088dfcb
+_md5_=bef8ce30efbedf61a9d0ec75a54e01f0
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.13.2-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.13.2-r1
index 64e8f16a5b86..31396a52651f 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.13.2-r1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.13.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2 gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.13.2 ~dev-qt/qtgui-5.13.2[gles2=] ~dev-qt/qtnetwork-5.13.2 alsa? ( media-libs/alsa-lib ) gstreamer? ( dev-libs/glib:2 media-libs/gstreamer:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-base:1.0 ) pulseaudio? ( media-sound/pulseaudio[glib] ) qml? ( ~dev-qt/qtdeclarative-5.13.2 gles2? ( ~dev-qt/qtgui-5.13.2[egl] ) openal? ( media-libs/openal ) ) widgets? ( ~dev-qt/qtopengl-5.13.2 ~dev-qt/qtwidgets-5.13.2[gles2=] ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtmultimedia-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=bb8ee9eaafac325b53be832ef267ae3c
+_md5_=d94a6c2ade32f0a2af7b8be1ea73f739
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.12.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
index b60d10bda353..b8418cdb71bf 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=bindist connman libproxy networkmanager sctp +ssl debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 sys-libs/zlib:= connman? ( ~dev-qt/qtdbus-5.12.3 ) libproxy? ( net-libs/libproxy ) networkmanager? ( ~dev-qt/qtdbus-5.12.3 ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( dev-libs/openssl:0=[bindist=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=dabafc653a63b8bfd695c3054f620872
+_md5_=add6b52cd8f282292d257e1cbaf90bad
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.12.3 b/metadata/md5-cache/dev-qt/qtopengl-5.12.3
index d9308b655c8f..9a0225ce506f 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 test debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtwidgets-5.12.3[gles2=] virtual/opengl dev-qt/qtchooser
 RESTRICT=!test? ( test ) test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=d50c0db0c79eccb651fa2411e783e3cd
+_md5_=9ec403f0f4e5a932201af10d6aaab848
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.12.3 b/metadata/md5-cache/dev-qt/qtpaths-5.12.3
index 7820b6c8f7c1..afbb1af31f61 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttools-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=6c2c15dc0d1e2141d9404708a27fcf28
+_md5_=fa827c0d0963c87af7875fa0dae31909
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.12.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
index f510aa62bd9a..13ba923552f7 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.12.3
@@ -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=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
 RDEPEND=~dev-qt/qtcore-5.12.3 geoclue? ( ~dev-qt/qtdbus-5.12.3 ) qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtlocation-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=4218d3cf94d908e78b2094e06985cd3a
+_md5_=cf38cece2521e0da74efebb9054c9e31
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
index a0ecf0bf4e0e..76a2946c913c 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=cups gles2 test debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=] ~dev-qt/qtwidgets-5.12.3[gles2=] cups? ( >=net-print/cups-1.4 ) dev-qt/qtchooser
 RESTRICT=!test? ( test ) test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=ae98819fa6778a1687f286ef48b37e51
+_md5_=4f0548b9591f972247ee0a7c192a3b10
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
index 7cd95b9e4d4b..3ab42b824ec0 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of Qt Quick controls to create complete user interfaces (depreca
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+widgets debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 widgets? ( ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=eb5996a70b3bb38a6a2060e579edc69a
+_md5_=ef86dbb5c89f0ccd2ffddb1d41929c64
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
index dbb9ac65a068..46cd8da71725 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=widgets debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 widgets? ( ~dev-qt/qtwidgets-5.12.3 ) ~dev-qt/qtgraphicaleffects-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtquickcontrols2-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=f0d143a2728bd1773b67f02044080d51
+_md5_=906f15652b30484af35e98beda3d9f49
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.12.3 b/metadata/md5-cache/dev-qt/qtscript-5.12.3
index f0b0dfaa8f97..77bfc65b9ce3 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+jit scripttools debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 scripttools? ( ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtscript-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=6d331904d5f60dd2f7186ebe47b01c66
+_md5_=647ca592b90374e6d486460b17863bf2
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.12.3 b/metadata/md5-cache/dev-qt/qtsensors-5.12.3
index d4b0204b75b0..eae219e5270f 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdbus-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtsensors-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=7a251cc31fc0ded30062762a29371129
+_md5_=8f2dc67dd0dcad06c22815b3245d87b5
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.12.3 b/metadata/md5-cache/dev-qt/qtserialport-5.12.3
index 6ef7705bd5f7..25219027e0fa 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtserialport-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=a42a8cffa4aa5d8d8476ab8edfde1635
+_md5_=6dc0bf9605053a12613c1593214bc578
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.12.3 b/metadata/md5-cache/dev-qt/qtspeech-5.12.3
index 490c6f0ef238..9160347e85b8 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Text-to-speech library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=718f85c868b958ec6ebe75481d6282ae
+_md5_=cda6a7dfebd6acc0950948a43c5423fa
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.12.3 b/metadata/md5-cache/dev-qt/qtsql-5.12.3
index 88904f3dfcfa..d8522139008c 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 freetds? ( dev-db/freetds ) mysql? ( dev-db/mysql-connector-c:= ) oci8? ( dev-db/oracle-instantclient:=[sdk] ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) dev-qt/qtchooser
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.12.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=db5650c94f17a00ff7102a61c5d50f4d
+_md5_=c7c97755cdd5a20e070eea204e7f453e
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.12.3 b/metadata/md5-cache/dev-qt/qtsvg-5.12.3
index 29189d83b3dc..fdf13534f522 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtwidgets-5.12.3 sys-libs/zlib:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtsvg-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=3b0e1ff818e2069d8a84866553b5e48d
+_md5_=7b608e10ed2fb9e8693880f5546ad12e
diff --git a/metadata/md5-cache/dev-qt/qttest-5.12.3 b/metadata/md5-cache/dev-qt/qttest-5.12.3
index 2eb9a066ee30..eae1bb773ada 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.12.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=!test? ( test ) test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=fa49f3df2b6cff9cd40e11c8315afacd
+_md5_=88935277fff10d15955a1b2b3b198cec
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.12.3 b/metadata/md5-cache/dev-qt/qttranslations-5.12.3
index b631654826e1..3a10f7effaf0 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.12.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qttranslations-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=5ab150e7fb756c27a968915c489c9fa5
+_md5_=cb0b474f912c320a3fb3e24817b38e9e
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
index c77eb2690995..601eef6a8e31 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Customizable input framework and virtual keyboard for Qt
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=handwriting +spell +xcb debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtsvg-5.12.3 spell? ( app-text/hunspell:= ) xcb? ( x11-libs/libxcb:= ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtvirtualkeyboard-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=b2992d2ee80ff46bde07021e664965a6
+_md5_=d2b0c278a0efa66f0bbcbf930bae516c
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.12.3 b/metadata/md5-cache/dev-qt/qtwayland-5.12.3
index d3e01bf94ffb..06c1d5285a94 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Wayland platform plugin for Qt
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=+libinput xcomposite debug test
-KEYWORDS=~arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3[egl,libinput=] media-libs/mesa[egl] >=x11-libs/libxkbcommon-0.2.0 xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwayland-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=511fb5ba307f8ad5dae1c136ac4eb37e
+_md5_=ed557be4f43a6db7b323a5d1cb75b805
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
index 36bd64614b44..2252d47cd4ef 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebchannel-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=6ac81009b5eafee07a4c96b12e00e29b
+_md5_=6855ac20547ad74f872c521eb843ff00
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.13.2 b/metadata/md5-cache/dev-qt/qtwebchannel-5.13.2
index 7cf6ed59028d..0518f060d954 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.13.2
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.13.2
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.13.2 qml? ( ~dev-qt/qtdeclarative-5.13.2 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwebchannel-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=bb00ad71238de422e744c2b91c87e09f
+_md5_=2861611652240a6d9a5108ec00842235
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.12.3 b/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
index 7808d93fcbe1..9a0c37a359c3 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.12.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwebchannel-5.12.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.12.3 ) geolocation? ( ~dev-qt/qtpositioning-5.12.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.12.3[widgets] ~dev-qt/qtwidgets-5.12.3 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) !!=sys-devel/binutils-2.31.1-r5 !!=sys-devel/binutils-2.32-r0 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.12.3 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwebchannel-5.12.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.12.3 ) geolocation? ( ~dev-qt/qtpositioning-5.12.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.12.3[widgets] ~dev-qt/qtwidgets-5.12.3 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison !!=sys-devel/binutils-2.31.1-r5 !!=sys-devel/binutils-2.32-r0 dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.12.3 )
 DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=arm x86
+IUSE=alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets debug test
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.12.3 ~dev-qt/qtdeclarative-5.12.3 ~dev-qt/qtgui-5.12.3 ~dev-qt/qtnetwork-5.12.3 ~dev-qt/qtprintsupport-5.12.3 ~dev-qt/qtwebchannel-5.12.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.12.3 ) geolocation? ( ~dev-qt/qtpositioning-5.12.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.12.3[widgets] ~dev-qt/qtwidgets-5.12.3 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebengine-everywhere-src-5.12.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=e66a41f684381fd1bd1f69b93ff7b5b7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=f88bcbdb787ff7591d5c7f1aa227becd
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.13.2 b/metadata/md5-cache/dev-qt/qtwebengine-5.13.2
index 976b8090599d..f7b494f1653e 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.13.2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.13.2 ~dev-qt/qtdeclarative-5.13.2 ~dev-qt/qtgui-5.13.2 ~dev-qt/qtnetwork-5.13.2 ~dev-qt/qtpositioning-5.13.2 ~dev-qt/qtprintsupport-5.13.2 ~dev-qt/qtwebchannel-5.13.2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.13.2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.13.2[widgets] ~dev-qt/qtwidgets-5.13.2 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) test? ( ~dev-qt/qttest-5.13.2 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.13.2 ~dev-qt/qtdeclarative-5.13.2 ~dev-qt/qtgui-5.13.2 ~dev-qt/qtnetwork-5.13.2 ~dev-qt/qtpositioning-5.13.2 ~dev-qt/qtprintsupport-5.13.2 ~dev-qt/qtwebchannel-5.13.2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.13.2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.13.2[widgets] ~dev-qt/qtwidgets-5.13.2 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison test? ( ~dev-qt/qttest-5.13.2 )
 DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
 EAPI=7
 HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist designer jumbo-build pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~x86
+IUSE=alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets debug test
+KEYWORDS=amd64 arm arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.13.2 ~dev-qt/qtdeclarative-5.13.2 ~dev-qt/qtgui-5.13.2 ~dev-qt/qtnetwork-5.13.2 ~dev-qt/qtpositioning-5.13.2 ~dev-qt/qtprintsupport-5.13.2 ~dev-qt/qtwebchannel-5.13.2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.13.2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.13.2[widgets] ~dev-qt/qtwidgets-5.13.2 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwebengine-everywhere-src-5.13.2.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=d56d353232a52551292fb82f2220d89a
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=36c8785d65a0c57a2da32146583ddf7c
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.14.1 b/metadata/md5-cache/dev-qt/qtwebengine-5.14.1
index 949420d270d6..b1c2f67ed3b2 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.14.1
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.14.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.14.1 ~dev-qt/qtdeclarative-5.14.1 ~dev-qt/qtgui-5.14.1 ~dev-qt/qtnetwork-5.14.1 ~dev-qt/qtpositioning-5.14.1 ~dev-qt/qtprintsupport-5.14.1 ~dev-qt/qtwebchannel-5.14.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.14.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.14.1[widgets] ~dev-qt/qtwidgets-5.14.1 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) test? ( ~dev-qt/qttest-5.14.1 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.14.1 ~dev-qt/qtdeclarative-5.14.1 ~dev-qt/qtgui-5.14.1 ~dev-qt/qtnetwork-5.14.1 ~dev-qt/qtprintsupport-5.14.1 ~dev-qt/qtwebchannel-5.14.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.14.1 ) geolocation? ( ~dev-qt/qtpositioning-5.14.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.14.1[widgets] ~dev-qt/qtwidgets-5.14.1 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison test? ( ~dev-qt/qttest-5.14.1 )
 DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
 EAPI=7
 HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist designer jumbo-build pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
+IUSE=alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.14.1 ~dev-qt/qtdeclarative-5.14.1 ~dev-qt/qtgui-5.14.1 ~dev-qt/qtnetwork-5.14.1 ~dev-qt/qtpositioning-5.14.1 ~dev-qt/qtprintsupport-5.14.1 ~dev-qt/qtwebchannel-5.14.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.14.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.14.1[widgets] ~dev-qt/qtwidgets-5.14.1 ) dev-qt/qtchooser
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.14.1 ~dev-qt/qtdeclarative-5.14.1 ~dev-qt/qtgui-5.14.1 ~dev-qt/qtnetwork-5.14.1 ~dev-qt/qtprintsupport-5.14.1 ~dev-qt/qtwebchannel-5.14.1[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa[egl,X(+)] media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.14.1 ) geolocation? ( ~dev-qt/qtpositioning-5.14.1 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) widgets? ( ~dev-qt/qtdeclarative-5.14.1[widgets] ~dev-qt/qtwidgets-5.14.1 ) dev-qt/qtchooser
 REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.14
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtwebengine-everywhere-src-5.14.1.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=0cddd2d704cb4215513fc967804f1cfc
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=a4b3917e40c72a712a1957a9d7813492
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
index e108c725d0bd..e31347d02021 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3[ssl=] qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtwebsockets-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=62b025031fef101bafa066fb134ecdfb
+_md5_=953fd031a0caac274e2c62838f88a9ff
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.13.2 b/metadata/md5-cache/dev-qt/qtwebsockets-5.13.2
index 3a7eacc91787..efc1b6cebd43 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.13.2
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.13.2
@@ -5,11 +5,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=7
 HOMEPAGE=https://www.qt.io/
 IUSE=qml +ssl debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.13.2 ~dev-qt/qtnetwork-5.13.2[ssl=] qml? ( ~dev-qt/qtdeclarative-5.13.2 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.13
 SRC_URI=https://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtwebsockets-everywhere-src-5.13.2.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=62844ce662078f5c14927512b42a08ca
+_md5_=ba4729ff4d3e162e53db3e137bdfda13
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.12.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
index a4e3d0dc135d..6fcf9ff29f80 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 gtk +png +xcb debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[gles2=,png=,xcb?] gtk? ( ~dev-qt/qtgui-5.12.3[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=d8da096329c2526766b27d63bb4b5ddd
+_md5_=05b1f3550aaae1ef1562bcee6d3c197d
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.12.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
index 3aab52c50b61..51bdf4aa70e3 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtgui-5.12.3[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtx11extras-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=9ba4ae0f1411e4d2959d044d25c0a7ea
+_md5_=ee2a0de432a206a418d34992cbc4e771
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.12.3 b/metadata/md5-cache/dev-qt/qtxml-5.12.3
index 6a98b1ab13c1..7525fbbb7662 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtbase-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=d617ed46a05160c0bd551ac58c18e083
+_md5_=8c5d03f3364c4b1b9f0df6415dfcbeb9
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
index aa77c5b5cb00..a7b5bd206a8f 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.12.3
@@ -4,11 +4,11 @@ DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 f
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=arm x86
+KEYWORDS=x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.12.3 ~dev-qt/qtnetwork-5.12.3 qml? ( ~dev-qt/qtdeclarative-5.12.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.12
 SRC_URI=https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtxmlpatterns-everywhere-src-5.12.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=41f8b2ecd5a1a7cfad4fc5dda82ea671
+_md5_=be52fa7aff7365e90e7083c8e8350283
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 723802ea1449..4ed68bdaabeb 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/roslaunch-1.14.3-r2 b/metadata/md5-cache/dev-ros/roslaunch-1.14.3-r2
index 958160ea53ae..05a1deac033e 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.14.3-r2
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.14.3-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ros-catkin	16b660d481e62ef00e6af81eeaeb08fb	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ros-catkin	16b660d481e62ef00e6af81eeaeb08fb	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=855c83e5bc571ec17c0c7704c3cecbec
diff --git a/metadata/md5-cache/dev-ros/roslaunch-9999 b/metadata/md5-cache/dev-ros/roslaunch-9999
index 587da24bb61b..80b120446d96 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ros-catkin	16b660d481e62ef00e6af81eeaeb08fb	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ros-catkin	16b660d481e62ef00e6af81eeaeb08fb	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84975cc0e3320e1636f73e53a516c094
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index f87d81b3237b..523513262fc9 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/airbrussh-1.3.4 b/metadata/md5-cache/dev-ruby/airbrussh-1.3.4
index fb2e0c76ac15..0f493f034a1f 100644
--- a/metadata/md5-cache/dev-ruby/airbrussh-1.3.4
+++ b/metadata/md5-cache/dev-ruby/airbrussh-1.3.4
@@ -5,7 +5,7 @@ DESCRIPTION=A replacement log formatter for SSHKit
 EAPI=7
 HOMEPAGE=https://github.com/mattbrictson/airbrussh
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >dev-ruby/sshkit-1.7.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/mattbrictson/airbrussh/archive/v1.3.4.tar.gz -> airbrussh-1.3.4.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=39c0db4d148f85446706426d1f70643b
+_md5_=20c072df5123ab6c63f29704ba0bc694
diff --git a/metadata/md5-cache/dev-ruby/backports-3.16.0 b/metadata/md5-cache/dev-ruby/backports-3.16.0
new file mode 100644
index 000000000000..9e03c89afff3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/backports-3.16.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Backports of Ruby features for older Ruby
+EAPI=7
+HOMEPAGE=https://github.com/marcandre/backports
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/backports-3.16.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d085ac0fc8f455e93bb424c083aed77e
diff --git a/metadata/md5-cache/dev-ruby/barby-0.6.8 b/metadata/md5-cache/dev-ruby/barby-0.6.8
index e1c2ad6863d9..6ccebe544283 100644
--- a/metadata/md5-cache/dev-ruby/barby-0.6.8
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby25(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby26(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ) ) ) test? ( ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby26(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby26(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick:*[ruby_targets_ruby24(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick:*[ruby_targets_ruby25(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( rmagick? ( dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ) ) ) test? ( ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby26(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby26(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
 DESCRIPTION=Ruby barcode generator that doesn't rely on 3rd party libraries
 EAPI=6
 HOMEPAGE=http://toreto.re/barby/
 IUSE=test qrcode rmagick prawn png cairo test test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby25(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby26(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby26(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby26(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+RDEPEND=ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick:*[ruby_targets_ruby24(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick:*[ruby_targets_ruby25(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( rmagick? ( dev-ruby/rmagick:*[ruby_targets_ruby26(-)] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby26(-)] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby26(-)] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=!test? ( test ) prawn? ( test )
 SLOT=0
 SRC_URI=https://github.com/toretore/barby/archive/v0.6.8.tar.gz -> barby-0.6.8.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9671657f43157f64312ebc131e56ebbd
+_md5_=2a980b1c2fc1804c98bd190e50964aaa
diff --git a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.1 b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.1
index 9110687de4b5..f12c35fbf1f2 100644
--- a/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.1
+++ b/metadata/md5-cache/dev-ruby/bcrypt_pbkdf-1.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( virtual/ruby-ssl[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby24? ( test? ( virtual/ruby-ssl[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)
 EAPI=5
 HOMEPAGE=https://github.com/net-ssh/bcrypt_pbkdf-ruby
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/bcrypt_pbkdf-1.0.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3598a85bc8b2dfe23e4f0672af42d4e6
+_md5_=daeb10d10e528c0be37d8415a484f60f
diff --git a/metadata/md5-cache/dev-ruby/ed25519-1.2.4 b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
index 3f2b321f8943..5e147b58eceb 100644
--- a/metadata/md5-cache/dev-ruby/ed25519-1.2.4
+++ b/metadata/md5-cache/dev-ruby/ed25519-1.2.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Library for the Ed25519 public-key signature system
 EAPI=6
 HOMEPAGE=https://github.com/crypto-rb/ed25519
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/ed25519/archive/v1.2.4.tar.gz -> ed25519-1.2.4.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fba72fa73247690deff61616644c7f57
+_md5_=8f1ccf290bfdd64e3cada52efe7efc28
diff --git a/metadata/md5-cache/dev-ruby/faker-2.6.0 b/metadata/md5-cache/dev-ruby/faker-2.6.0
deleted file mode 100644
index e451105239ed..000000000000
--- a/metadata/md5-cache/dev-ruby/faker-2.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby24(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/timecop[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/timecop[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/timecop[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=A library for generating fake data such as names, addresses, and phone numbers
-EAPI=7
-HOMEPAGE=https://github.com/stympy/faker
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby24(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/stympy/faker/archive/v2.6.0.tar.gz -> faker-2.6.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9669ad4053fd73b6e07e8c43bc9f3e9e
diff --git a/metadata/md5-cache/dev-ruby/faker-2.7.0 b/metadata/md5-cache/dev-ruby/faker-2.7.0
deleted file mode 100644
index d2b8ba34e2fa..000000000000
--- a/metadata/md5-cache/dev-ruby/faker-2.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby24(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/timecop[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/timecop[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/timecop[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=A library for generating fake data such as names, addresses, and phone numbers
-EAPI=7
-HOMEPAGE=https://github.com/stympy/faker
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby24(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/stympy/faker/archive/v2.7.0.tar.gz -> faker-2.7.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9669ad4053fd73b6e07e8c43bc9f3e9e
diff --git a/metadata/md5-cache/dev-ruby/faker-2.8.0 b/metadata/md5-cache/dev-ruby/faker-2.8.0
deleted file mode 100644
index 8d0cf833e9e2..000000000000
--- a/metadata/md5-cache/dev-ruby/faker-2.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby24(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/timecop[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/timecop[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/timecop[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=A library for generating fake data such as names, addresses, and phone numbers
-EAPI=7
-HOMEPAGE=https://github.com/stympy/faker
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby24(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby25(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/i18n-1.6[ruby_targets_ruby26(-)] !!<dev-ruby/faker-1.9.6-r1[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/stympy/faker/archive/v2.8.0.tar.gz -> faker-2.8.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9669ad4053fd73b6e07e8c43bc9f3e9e
diff --git a/metadata/md5-cache/dev-ruby/fast_gettext-2.0.2 b/metadata/md5-cache/dev-ruby/fast_gettext-2.0.2
new file mode 100644
index 000000000000..54fb3a0ec60d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/fast_gettext-2.0.2
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=GetText but 3.5x faster, 560x less memory, clean namespace and threadsave!
+EAPI=7
+HOMEPAGE=https://github.com/grosser/fast_gettext
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+LICENSE=public-domain
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/grosser/fast_gettext/archive/v2.0.2.tar.gz -> fast_gettext-2.0.2.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=67a0b44b5cf2b014016c2b25af2d6316
diff --git a/metadata/md5-cache/dev-ruby/jbuilder-2.10.0 b/metadata/md5-cache/dev-ruby/jbuilder-2.10.0
new file mode 100644
index 000000000000..4f2bf83978c0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/jbuilder-2.10.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Create JSON structures via a Builder-style DSL
+EAPI=7
+HOMEPAGE=https://github.com/rails/jbuilder
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/activesupport-5.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/jbuilder-2.10.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8a319ad8a3cceb9b6b46041328ebfeb7
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.16.0 b/metadata/md5-cache/dev-ruby/octokit-4.16.0
new file mode 100644
index 000000000000..2f9cee2d765c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/octokit-4.16.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby24(-)] >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby25(-)] >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby26(-)] >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/mime-types[ruby_targets_ruby24(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby24(-)] dev-ruby/vcr:3[ruby_targets_ruby24(-)] dev-ruby/webmock:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/mime-types[ruby_targets_ruby25(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby25(-)] dev-ruby/vcr:3[ruby_targets_ruby25(-)] dev-ruby/webmock:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mime-types[ruby_targets_ruby26(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby26(-)] dev-ruby/vcr:3[ruby_targets_ruby26(-)] dev-ruby/webmock:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Ruby toolkit for the Github API
+EAPI=7
+HOMEPAGE=https://github.com/octokit/octokit.rb
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby24(-)] >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby25(-)] >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby26(-)] >=dev-ruby/sawyer-0.8.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.16.0.tar.gz -> octokit-4.16.0.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0c7b463e32de516d8b91b13e21b9ab50
diff --git a/metadata/md5-cache/dev-ruby/ox-2.13.2 b/metadata/md5-cache/dev-ruby/ox-2.13.2
new file mode 100644
index 000000000000..80605787aca8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ox-2.13.2
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A fast XML parser and Object marshaller
+EAPI=7
+HOMEPAGE=https://www.ohler.com/ox/ https://github.com/ohler55/ox
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ohler55/ox/archive/v2.13.2.tar.gz -> ox-2.13.2.tar.gz
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9e917d45444b5e207be1c4b8a6f8c85d
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.4.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
new file mode 100644
index 000000000000..25d5008acd0a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( x11-libs/cairo ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A pkg-config implementation by Ruby
+EAPI=7
+HOMEPAGE=https://github.com/rcairo/pkg-config
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/pkg-config-1.4.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=91de094af96db00aab6c508a3902566a
diff --git a/metadata/md5-cache/dev-ruby/pluggaloid-1.4.1 b/metadata/md5-cache/dev-ruby/pluggaloid-1.4.1
new file mode 100644
index 000000000000..da88bc069669
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pluggaloid-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/delayer-1.1.0:1[ruby_targets_ruby25(-)] dev-ruby/instance_storage:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/delayer-1.1.0:1[ruby_targets_ruby26(-)] dev-ruby/instance_storage:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/delayer-1.1.0:1[ruby_targets_ruby27(-)] dev-ruby/instance_storage:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Pluggaloid is extensible plugin system for mikutter
+EAPI=7
+HOMEPAGE=https://rubygems.org/gems/pluggaloid/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/delayer-1.1.0:1[ruby_targets_ruby25(-)] dev-ruby/instance_storage:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/delayer-1.1.0:1[ruby_targets_ruby26(-)] dev-ruby/instance_storage:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/delayer-1.1.0:1[ruby_targets_ruby27(-)] dev-ruby/instance_storage:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/pluggaloid-1.4.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=810ff5a9aa3e2ca75270afe7560f8954
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-2.3.2 b/metadata/md5-cache/dev-ruby/puppet_forge-2.3.2
new file mode 100644
index 000000000000..87c42936e79c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/puppet_forge-2.3.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby24(-)] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby24(-)] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby24(-)] dev-ruby/minitar[ruby_targets_ruby24(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby25(-)] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby25(-)] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby25(-)] dev-ruby/minitar[ruby_targets_ruby25(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby26(-)] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby26(-)] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby26(-)] dev-ruby/minitar[ruby_targets_ruby26(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Tools to access Forge API information on Modules, Users, and Releases
+EAPI=7
+HOMEPAGE=https://github.com/puppetlabs/forge-ruby
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby24(-)] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby24(-)] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby24(-)] dev-ruby/minitar[ruby_targets_ruby24(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby25(-)] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby25(-)] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby25(-)] dev-ruby/minitar[ruby_targets_ruby25(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby26(-)] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby26(-)] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby26(-)] dev-ruby/minitar[ruby_targets_ruby26(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://rubygems.org/gems/puppet_forge-2.3.2.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=94438a6eb22354be98fac05adf694517
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1 b/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1
deleted file mode 100644
index c847da43371b..000000000000
--- a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/rake-compiler[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake-compiler[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Pygments syntax highlighting in ruby
-EAPI=6
-HOMEPAGE=https://github.com/tmm1/pygments.rb
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/pygments.rb-1.2.1.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b405841f60e50018cf7f32a033f24204
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1-r1 b/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1-r1
new file mode 100644
index 000000000000..d424c359cbd8
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( python_single_target_python2_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/pygments-2.2.0[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] ) ) test? ( ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/rake-compiler[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rake-compiler[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DESCRIPTION=Pygments syntax highlighting in ruby
+EAPI=6
+HOMEPAGE=https://github.com/tmm1/pygments.rb
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test +python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_single_target_python2_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/pygments-2.2.0[python_targets_python2_7(-)] dev-python/simplejson[python_targets_python2_7(-)] ) ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/pygments.rb-1.2.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d8fe0606de46bf53f534cce0258e8070
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.9 b/metadata/md5-cache/dev-ruby/rack-2.0.9
new file mode 100644
index 000000000000..17c23b7771dd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.9
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=A modular Ruby webserver interface
+EAPI=7
+HOMEPAGE=https://rack.github.com/
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/ruby-ssl[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/ruby-ssl[ruby_targets_ruby26(-)] ) !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2.0
+SRC_URI=https://rubygems.org/gems/rack-2.0.9.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8b6d18787346feee6b9315ce283b817a
diff --git a/metadata/md5-cache/dev-ruby/rbst-0.5.1 b/metadata/md5-cache/dev-ruby/rbst-0.5.1
index 38b858766eae..f6c04237ddf4 100644
--- a/metadata/md5-cache/dev-ruby/rbst-0.5.1
+++ b/metadata/md5-cache/dev-ruby/rbst-0.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( dev-python/docutils python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-1.1.0:1.0[ruby_targets_ruby24(-)] >=dev-ruby/shoulda-3.5.0:3[ruby_targets_ruby24(-)] >=dev-ruby/test-unit-3.0.9:2[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/mocha-1.1.0:1.0[ruby_targets_ruby25(-)] >=dev-ruby/shoulda-3.5.0:3[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0.9:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/mocha-1.1.0:1.0[ruby_targets_ruby26(-)] >=dev-ruby/shoulda-3.5.0:3[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0.9:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=test? ( dev-python/docutils python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/mocha-1.1.0:1.0[ruby_targets_ruby24(-)] >=dev-ruby/shoulda-3.5.0:3[ruby_targets_ruby24(-)] >=dev-ruby/test-unit-3.0.9:2[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/mocha-1.1.0:1.0[ruby_targets_ruby25(-)] >=dev-ruby/shoulda-3.5.0:3[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0.9:2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/mocha-1.1.0:1.0[ruby_targets_ruby26(-)] >=dev-ruby/shoulda-3.5.0:3[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0.9:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
 DESCRIPTION=A simple Ruby wrapper for processing rST via docutils
 EAPI=6
 HOMEPAGE=https://github.com/alphabetum/rbst
-IUSE=test 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 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=test python_single_target_python3_6 python_single_target_python3_7 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/docutils python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=^^ ( 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 ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=dev-python/docutils python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/alphabetum/rbst/archive/0.5.1.tar.gz -> rbst-0.5.1.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f2433e7c2922fc3171f5809d82cd8644
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=30c5851570e353b1ee4aa0557d31b8af
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.16.5 b/metadata/md5-cache/dev-ruby/rcairo-1.16.5
index 57f3647a7c9f..ae164d4819d5 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.16.5
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.16.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby24(-)] dev-ruby/ruby-glib2[ruby_targets_ruby24(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby24(-)] dev-ruby/ruby-poppler[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby25(-)] dev-ruby/ruby-glib2[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby25(-)] dev-ruby/ruby-poppler[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby26(-)] dev-ruby/ruby-glib2[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby26(-)] dev-ruby/ruby-poppler[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby24(-)] dev-ruby/ruby-glib2[ruby_targets_ruby24(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby24(-)] dev-ruby/ruby-poppler[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby25(-)] dev-ruby/ruby-glib2[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby25(-)] dev-ruby/ruby-poppler[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby26(-)] dev-ruby/ruby-glib2[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby26(-)] dev-ruby/ruby-poppler[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby27(-)] dev-ruby/ruby-glib2[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby27(-)] dev-ruby/ruby-poppler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DESCRIPTION=Ruby bindings for cairo
 EAPI=6
 HOMEPAGE=https://cairographics.org/rcairo/
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Ruby GPL-2 )
-RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=>=x11-libs/cairo-1.2.0[svg] ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.16.5.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=94d864dda9db53a062469ac6bfdd7d17
+_md5_=c5ad9055eed66435dec9b0f0a1a604a8
diff --git a/metadata/md5-cache/dev-ruby/request_store-1.5.0 b/metadata/md5-cache/dev-ruby/request_store-1.5.0
index e2045854dffa..c51815b6d191 100644
--- a/metadata/md5-cache/dev-ruby/request_store-1.5.0
+++ b/metadata/md5-cache/dev-ruby/request_store-1.5.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Per-request global storage for Rack
 EAPI=7
 HOMEPAGE=https://github.com/steveklabnik/request_store
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/rack-1.4:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/request_store-1.5.0.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d86a0be94a7501b99a6ba7e1a5c5742e
+_md5_=35c2d438e6c8e8bb270c918a68bd6b76
diff --git a/metadata/md5-cache/dev-ruby/rqrcode_core-0.1.0 b/metadata/md5-cache/dev-ruby/rqrcode_core-0.1.0
index d4dcc68d7b7c..6432c0bfd3d0 100644
--- a/metadata/md5-cache/dev-ruby/rqrcode_core-0.1.0
+++ b/metadata/md5-cache/dev-ruby/rqrcode_core-0.1.0
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+BDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Library for encoding QR Codes
 EAPI=7
 HOMEPAGE=https://github.com/whomwah/rqrcode_core/
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whomwah/rqrcode_core/archive/v0.1.0.tar.gz -> rqrcode_core-0.1.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=60e190d0088be9d4862eb7ffe532f058
+_md5_=075f092005efcd3c459ddca71fe2d6f5
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.7
index d016d7bac468..d528cabf1a20 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.3.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=x11-libs/cairo test? ( ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] )
+DEPEND=x11-libs/cairo test? ( ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby cairo-gobject bindings
 EAPI=6
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=x11-libs/cairo ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=x11-libs/cairo ruby_targets_ruby24? ( dev-ruby/rcairo[ruby_targets_ruby24(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/rcairo[ruby_targets_ruby25(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rcairo[ruby_targets_ruby26(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d9f2b23a741f8cd543c5504b878d3e0
+_md5_=4d653b1b6e2872869f672345a22c9f8d
diff --git a/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.3 b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.3
new file mode 100644
index 000000000000..9e20c9bafc36
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gettext-3.3.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby25(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby26(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) dev-ruby/racc[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) dev-ruby/racc[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25(-)] dev-ruby/test-unit-rr[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/test-unit-rr[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-devel/gettext ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Native Language Support Library and Tools modeled after GNU gettext package
+EAPI=7
+HOMEPAGE=https://ruby-gettext.github.io/
+IUSE=doc test test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Ruby LGPL-3+ )
+RDEPEND=ruby_targets_ruby25? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby25(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/locale-2.0.5[ruby_targets_ruby26(-)] >=dev-ruby/text-1.3.0[ruby_targets_ruby26(-)] ) sys-devel/gettext ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/gettext-3.3.3.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b7aafaca0848684d354549996b1aa816
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.7
index abc504f98d98..bac31ca967c5 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.3.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] )
+DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby binding of GooCanvas
 EAPI=6
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby27(-)] >=dev-ruby/ruby-gobject-introspection-3.3.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=39433f565b61817a27113f7f6fd00d73
+_md5_=7387b98ca42c6661ac4e69425e03b0cf
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.7
index 845cfd38b850..239ecfe9e054 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.3.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2 ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby24(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] )
+DEPEND=>=dev-libs/glib-2 ruby_targets_ruby24? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby24(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby25(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby26(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/pkg-config-1.3.5[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby Glib2 bindings
 EAPI=6
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=Ruby
-RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c282eeff1f7ddaf41d3adbad302b75d4
+_md5_=c912662232d734a89613dfa3d22124d6
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.7
index 55f8c2cfdc28..73e78eae7ae1 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.3.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] )
+DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby GObjectIntrospection bindings
 EAPI=6
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby24? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.3.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=19bda9475408741c79d558e8c89e421a
+_md5_=39a2316cdf0ea834420d668d584407eb
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.7 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.7
index 27dd954796b1..03803bc0d7a0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.7
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.3.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby24(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] )
+DEPEND=app-text/poppler[cairo] test? ( ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby24(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig ruby_targets_ruby24? ( dev-ruby/pkg-config[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( dev-ruby/pkg-config[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/pkg-config[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby poppler-glib bindings
 EAPI=6
 HOMEPAGE=https://ruby-gnome2.osdn.jp/
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Ruby
-RDEPEND=app-text/poppler[cairo] ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby24(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RDEPEND=app-text/poppler[cairo] ruby_targets_ruby24? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby24(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby25(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby26(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.3.7[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.3.7[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-3.3.7.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-ng-gnome2	17b1fe23816c611b7b75072a02e9147a	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=3e938548fc8a14a75ed77d48b7a9e234
+_md5_=7234067e9e40947fbce9e0f9cffefd55
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2 b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
new file mode 100644
index 000000000000..a204377cc040
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.14.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/racc[ruby_targets_ruby24(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby24(-)] >=dev-ruby/sexp_processor-4.13.0:4[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/racc[ruby_targets_ruby25(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby25(-)] >=dev-ruby/sexp_processor-4.13.0:4[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/racc[ruby_targets_ruby26(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby26(-)] >=dev-ruby/sexp_processor-4.13.0:4[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/racc[ruby_targets_ruby27(-)] >=dev-ruby/minitest-4.3[ruby_targets_ruby27(-)] >=dev-ruby/sexp_processor-4.13.0:4[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-util/unifdef ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A ruby parser written in pure ruby
+EAPI=7
+HOMEPAGE=https://github.com/seattlerb/ruby_parser
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/ruby_parser-3.14.2.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ecb1a8b073ece70a31a14c960fede01a
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.14.0 b/metadata/md5-cache/dev-ruby/sexp_processor-4.14.0
new file mode 100644
index 000000000000..490334c414eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.14.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
+EAPI=7
+HOMEPAGE=https://www.zenspider.com/projects/sexp_processor.html
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=4
+SRC_URI=https://rubygems.org/gems/sexp_processor-4.14.0.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e03593413759b5abbd029e8ac9dd759f
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.18.2 b/metadata/md5-cache/dev-ruby/sshkit-1.18.2
deleted file mode 100644
index e738d87975e8..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.18.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby25(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24(-)] dev-ruby/mocha[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=6
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby25(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/sshkit-1.18.2.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0f0599abd59a7b83fe039082325e1115
diff --git a/metadata/md5-cache/dev-ruby/sshkit-1.19.1 b/metadata/md5-cache/dev-ruby/sshkit-1.19.1
deleted file mode 100644
index 63597b264199..000000000000
--- a/metadata/md5-cache/dev-ruby/sshkit-1.19.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby25(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24(-)] dev-ruby/mocha[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25(-)] dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=SSHKit makes it easy to write structured, testable SSH commands in Ruby
-EAPI=6
-HOMEPAGE=https://github.com/capistrano/sshkit
-IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby24(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby25(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/net-ssh-2.8.0:*[ruby_targets_ruby26(-)] >=dev-ruby/net-scp-1.1.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/sshkit-1.19.1.gem
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6cc5e383794b9243b5a21e594e6f67c9
diff --git a/metadata/md5-cache/dev-ruby/webmock-3.8.1 b/metadata/md5-cache/dev-ruby/webmock-3.8.1
new file mode 100644
index 000000000000..7ff292665d37
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/webmock-3.8.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby25(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby25(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby26(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby24(-)] dev-ruby/rspec:3[ruby_targets_ruby24(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby24(-)] dev-ruby/rack[ruby_targets_ruby24(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby24(-)] || ( dev-ruby/http:4[ruby_targets_ruby24(-)] dev-ruby/http:3[ruby_targets_ruby24(-)] ) ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby25(-)] dev-ruby/rack[ruby_targets_ruby25(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby25(-)] || ( dev-ruby/http:4[ruby_targets_ruby25(-)] dev-ruby/http:3[ruby_targets_ruby25(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/minitest:5[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] >=dev-ruby/test-unit-3.0.0[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] >=dev-ruby/httpclient-2.8.0[ruby_targets_ruby26(-)] || ( dev-ruby/http:4[ruby_targets_ruby26(-)] dev-ruby/http:3[ruby_targets_ruby26(-)] ) ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+DESCRIPTION=Allows stubbing HTTP requests and setting expectations on HTTP requests
+EAPI=7
+HOMEPAGE=https://github.com/bblimke/webmock
+IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby24(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby24(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby25(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby25(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/addressable-2.3.6[ruby_targets_ruby26(-)] >=dev-ruby/crack-0.3.2[ruby_targets_ruby26(-)] >=dev-ruby/hashdiff-0.4.0:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://rubygems.org/gems/webmock-3.8.1.gem
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f4a1b6d0b015ed73168b173750da9d89
diff --git a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2 b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2
index bd17ea15f189..e3e34bf0b23e 100644
--- a/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2
+++ b/metadata/md5-cache/dev-ruby/whole_history_rating-0.1.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/whole_history_rating-0.1.2.gem
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	cca036a1477f29b926bf994faddf4099	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d79c76a9321ff3036128645f87cc3547
+_md5_=932cdb97604337310ba904858bce1959
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index cf0e7515b2ed..50c31d2bac6c 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/gauche-gtk-0.6_pre1 b/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1
deleted file mode 100644
index bcc200fb4a54..000000000000
--- a/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=GTK2 binding for Gauche
-EAPI=6
-HOMEPAGE=http://practical-scheme.net/gauche/
-IUSE=examples glgd nls opengl
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=BSD
-RDEPEND=x11-libs/gtk+:2 dev-scheme/gauche opengl? ( x11-libs/gtkglext dev-scheme/gauche-gl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/shirok/Gauche-gtk2/archive/0220722c44ef85f2e1b9b14745702c1b923258e8.tar.gz -> Gauche-gtk2-0.6_pre1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=0dfcc7b201a4dddc9c2979c031155dff
diff --git a/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1-r1 b/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1-r1
new file mode 100644
index 000000000000..e114768f5d1f
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/gauche-gtk-0.6_pre1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=x11-libs/gtk+:2 dev-scheme/gauche virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GTK2 binding for Gauche
+EAPI=6
+HOMEPAGE=http://practical-scheme.net/gauche/
+IUSE=examples
+KEYWORDS=amd64 ~ppc x86
+LICENSE=BSD
+RDEPEND=x11-libs/gtk+:2 dev-scheme/gauche
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/shirok/Gauche-gtk2/archive/0220722c44ef85f2e1b9b14745702c1b923258e8.tar.gz -> Gauche-gtk2-0.6_pre1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=dcaea0419d0fe8fdfbc533d04e7b8e4b
diff --git a/metadata/md5-cache/dev-scheme/scm-5.5.6-r4 b/metadata/md5-cache/dev-scheme/scm-5.5.6-r4
index 27ed812c7c41..d95273a490e4 100644
--- a/metadata/md5-cache/dev-scheme/scm-5.5.6-r4
+++ b/metadata/md5-cache/dev-scheme/scm-5.5.6-r4
@@ -10,4 +10,4 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/libtermcap-compat )
 SLOT=0
 SRC_URI=http://groups.csail.mit.edu/mac/ftpdir/scm/scm-5e6.zip
-_md5_=a531c126620062194af7bbb59d80a9be
+_md5_=e88bb8d8fd093c81cdd5c8c34d704733
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index e902dd47e1a1..86fc00156566 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/snack-2.2.10-r8 b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r8
index ce843622ffef..962961a73d27 100644
--- a/metadata/md5-cache/dev-tcltk/snack-2.2.10-r8
+++ b/metadata/md5-cache/dev-tcltk/snack-2.2.10-r8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=88377091420b0fa54d35b141bf911bfd
diff --git a/metadata/md5-cache/dev-tcltk/tclpython-4.1-r4 b/metadata/md5-cache/dev-tcltk/tclpython-4.1-r4
deleted file mode 100644
index cb13ab336546..000000000000
--- a/metadata/md5-cache/dev-tcltk/tclpython-4.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/tcl:0=
-DESCRIPTION=Python package for Tcl
-EAPI=5
-HOMEPAGE=http://jfontain.free.fr/tclpython.htm
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/tcl:0=
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://jfontain.free.fr/tclpython-4.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=18edb93efda9fa98df266e6f3da44766
diff --git a/metadata/md5-cache/dev-tcltk/tclpython-4.1-r6 b/metadata/md5-cache/dev-tcltk/tclpython-4.1-r6
index 754558d35277..640cf1d34f03 100644
--- a/metadata/md5-cache/dev-tcltk/tclpython-4.1-r6
+++ b/metadata/md5-cache/dev-tcltk/tclpython-4.1-r6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/tcl:0= sys-libs/binutils-libs
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/tcl:0= sys-libs/binutils-libs
 DESCRIPTION=Python package for Tcl
 EAPI=5
 HOMEPAGE=http://jfontain.free.fr/tclpython.htm
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/tcl:0= sys-libs/binutils-libs
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/tcl:0= sys-libs/binutils-libs
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=http://jfontain.free.fr/tclpython-4.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e7ba8ecfa4e761743f6199b4c5cf44a
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bec83a4abc2ff61514f0caef070d6d6a
diff --git a/metadata/md5-cache/dev-tcltk/tclpython-5.0 b/metadata/md5-cache/dev-tcltk/tclpython-5.0
index 324c3ba113c8..52313c5f7370 100644
--- a/metadata/md5-cache/dev-tcltk/tclpython-5.0
+++ b/metadata/md5-cache/dev-tcltk/tclpython-5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/tcl:0=
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/tcl:0=
 DESCRIPTION=Python package for Tcl
 EAPI=6
 HOMEPAGE=http://jfontain.free.fr/tclpython.htm
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/tcl:0=
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-lang/tcl:0=
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/amykyta3/tclpython/archive/5.0.tar.gz -> tclpython-5.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e195e2dbd23a817826b10c612fa137ae
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2aca6d18d73a64089055b1d141a1f6e7
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index ea50ed2f3e64..21f1f91d36dc 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/aastex-5.2 b/metadata/md5-cache/dev-tex/aastex-5.2
index 5ad5408ae7d1..b5eec9d41715 100644
--- a/metadata/md5-cache/dev-tex/aastex-5.2
+++ b/metadata/md5-cache/dev-tex/aastex-5.2
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package for American Astronomical Society journals. (AASTeX)
 EAPI=7
 HOMEPAGE=https://journals.aas.org/authors/aastex.html
@@ -8,5 +8,5 @@ LICENSE=LPPL-1.3
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=https://www.journals.uchicago.edu/AAS/AASTeX/aastex52.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=4726a42b70260c179926b8f6def35599
diff --git a/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1 b/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
index 2696ba2794e6..0c2bae288e92 100644
--- a/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
+++ b/metadata/md5-cache/dev-tex/abntex-0.9_beta2-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx )
+DEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX macros for writing documents following the ABNT norms
 EAPI=7
 HOMEPAGE=https://www.abntex.net.br/
@@ -10,5 +9,5 @@ LICENSE=LPPL-1.3c
 RDEPEND=dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended lyx? ( app-office/lyx ) virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/abntex/abntex-0.9-beta2.tar.gz doc? ( mirror://sourceforge/abntex/abntex-doc-0.9-beta2.tar.gz )
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=2f27bac4a10d943dbedcf27510898b67
diff --git a/metadata/md5-cache/dev-tex/biblatex-3.12 b/metadata/md5-cache/dev-tex/biblatex-3.12
index 7eef27b1abd9..47fb3a484fd9 100644
--- a/metadata/md5-cache/dev-tex/biblatex-3.12
+++ b/metadata/md5-cache/dev-tex/biblatex-3.12
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric
+DEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Reimplementation of the bibliographic facilities provided by LaTeX
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/
@@ -11,5 +10,5 @@ PDEPEND=biber? ( ~dev-tex/biber-2.12 )
 RDEPEND=dev-texlive/texlive-bibtexextra dev-texlive/texlive-latexextra dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/biblatex/biblatex-3.12.tds.tgz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=6f871749a4dd1173cc7302285923ff55
diff --git a/metadata/md5-cache/dev-tex/biblatex-apa-7.5 b/metadata/md5-cache/dev-tex/biblatex-apa-7.5
index 783e17533dab..d9e0ba19efef 100644
--- a/metadata/md5-cache/dev-tex/biblatex-apa-7.5
+++ b/metadata/md5-cache/dev-tex/biblatex-apa-7.5
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8
+DEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=APA style for BibLaTeX
 EAPI=7
 HOMEPAGE=https://www.ctan.org/pkg/biblatex-apa https://github.com/plk/biblatex-apa
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.3c
 RDEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8 virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/plk/biblatex-apa/archive/v7.5.tar.gz -> biblatex-apa-7.5.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=d0e945fcce6a85223b1486a8dd9a01a2
diff --git a/metadata/md5-cache/dev-tex/biblatex-gost-1.17 b/metadata/md5-cache/dev-tex/biblatex-gost-1.17
index e74b6435af8d..8e1bc64a4f36 100644
--- a/metadata/md5-cache/dev-tex/biblatex-gost-1.17
+++ b/metadata/md5-cache/dev-tex/biblatex-gost-1.17
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8
+DEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Biblatex styles for Russian GOST 7.0.5-2008 bibliography standard
 EAPI=7
 HOMEPAGE=https://github.com/odomanov/biblatex-gost
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.3c
 RDEPEND=dev-texlive/texlive-latexextra >=dev-tex/biblatex-3.8 >=dev-tex/biber-2.8 virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/odomanov/biblatex-gost/archive/ver.1.17.tar.gz -> biblatex-gost-1.17.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=c5fb1a9c302f1029181628d1fbdbac49
diff --git a/metadata/md5-cache/dev-tex/cdcover-1.3b b/metadata/md5-cache/dev-tex/cdcover-1.3b
index 93aabdc8f6de..eacc2a2a5075 100644
--- a/metadata/md5-cache/dev-tex/cdcover-1.3b
+++ b/metadata/md5-cache/dev-tex/cdcover-1.3b
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to create CD case covers
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/macros/latex/contrib/cd-cover/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/cdcover-1.3b.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=6ff46f8922850ee3aa76450a24f77a02
diff --git a/metadata/md5-cache/dev-tex/circuit_macros-8.4 b/metadata/md5-cache/dev-tex/circuit_macros-8.4
index 67c1b66272a2..ad0a65213f9f 100644
--- a/metadata/md5-cache/dev-tex/circuit_macros-8.4
+++ b/metadata/md5-cache/dev-tex/circuit_macros-8.4
@@ -8,5 +8,5 @@ LICENSE=LPPL-1.3c
 RDEPEND=|| ( app-text/texlive[graphics] app-text/texlive[pstricks] ) media-gfx/dpic sys-devel/m4 script? ( app-text/texlive[graphics] dev-texlive/texlive-latexextra )
 SLOT=0
 SRC_URI=https://ece.uwaterloo.ca/~aplevich/Circuit_macros/Circuit_macros.tar.gz -> circuit_macros-8.4.tar.gz
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=41583f7ccf446c53abe6314fc55c9bb3
diff --git a/metadata/md5-cache/dev-tex/circuit_macros-8.4.1 b/metadata/md5-cache/dev-tex/circuit_macros-8.4.1
index 59201aee0501..b01752bf737b 100644
--- a/metadata/md5-cache/dev-tex/circuit_macros-8.4.1
+++ b/metadata/md5-cache/dev-tex/circuit_macros-8.4.1
@@ -8,5 +8,5 @@ LICENSE=LPPL-1.3c
 RDEPEND=|| ( app-text/texlive[graphics] app-text/texlive[pstricks] ) media-gfx/dpic sys-devel/m4 script? ( app-text/texlive[graphics] dev-texlive/texlive-latexextra )
 SLOT=0
 SRC_URI=https://ece.uwaterloo.ca/~aplevich/Circuit_macros/Circuit_macros.tar.gz -> circuit_macros-8.4.1.tar.gz
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=41583f7ccf446c53abe6314fc55c9bb3
diff --git a/metadata/md5-cache/dev-tex/cjk-latex-4.8.4 b/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
index 156ebb6991f9..5112b245b648 100644
--- a/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
+++ b/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
@@ -1,6 +1,6 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=virtual/latex-base dev-libs/kpathsea emacs? ( >=app-editors/emacs-23.1:* )
+DEPEND=virtual/latex-base dev-libs/kpathsea emacs? ( >=app-editors/emacs-23.1:* ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package to use CJK (Chinese/Japanese/Korean) scripts in various encodings
 EAPI=7
 HOMEPAGE=https://cjk.ffii.org/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-libs/kpathsea emacs? ( >=app-editors/emacs-23.1:* ) virtual/latex-base
 SLOT=0
 SRC_URI=ftp://ftp.ffii.org/pub/cjk/cjk-4.8.4.tar.gz mirror://gentoo/cjk-4.8.4-fonts.zip doc? ( ftp://ftp.ffii.org/pub/cjk/cjk-4.8.4-doc.tar.gz )
-_eclasses_=elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	latex-package	663b0e5f0410bc8e8d51f11346f0258a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=564759d064ccf9f0524e53d19a8a0927
diff --git a/metadata/md5-cache/dev-tex/crosstex-0.6-r2 b/metadata/md5-cache/dev-tex/crosstex-0.6-r2
deleted file mode 100644
index 58642cf90590..000000000000
--- a/metadata/md5-cache/dev-tex/crosstex-0.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/ply[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=CrossTeX - object oriented BibTeX replacement
-EAPI=6
-HOMEPAGE=http://www.cs.cornell.edu/people/egs/crosstex/
-IUSE=examples +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/ply[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/crosstex/crosstex-0.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c3be39a2e2be6fe786850c0a424d440f
diff --git a/metadata/md5-cache/dev-tex/crosstex-0.6-r3 b/metadata/md5-cache/dev-tex/crosstex-0.6-r3
new file mode 100644
index 000000000000..704ac083df5d
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/crosstex-0.6-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python2_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/ply[python_targets_python2_7(-)] )
+DESCRIPTION=CrossTeX - object oriented BibTeX replacement
+EAPI=6
+HOMEPAGE=http://www.cs.cornell.edu/people/egs/crosstex/
+IUSE=examples +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/ply[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/crosstex/crosstex-0.6.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ce5a1ba482d85b8251ba7b301cc94e6f
diff --git a/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1 b/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
index 30c615349673..9b8871f48626 100644
--- a/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
+++ b/metadata/md5-cache/dev-tex/culmus-latex-0.7-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base || ( >=media-fonts/culmus-0.110[fancy] <media-fonts/culmus-0.110 ) app-text/t1utils
+DEPEND=virtual/latex-base || ( >=media-fonts/culmus-0.110[fancy] <media-fonts/culmus-0.110 ) app-text/t1utils virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Culmus fonts support for latex
 EAPI=7
 HOMEPAGE=http://ivritex.sourceforge.net/
@@ -10,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/ivritex/culmus-latex-0.7_src.tar.gz -> culmus-latex-0.7.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=30e1d1d7d2f1461ea8a5a753e4b6709b
diff --git a/metadata/md5-cache/dev-tex/currvita-0.9i-r1 b/metadata/md5-cache/dev-tex/currvita-0.9i-r1
index 72f3b2db1f76..acde5cede178 100644
--- a/metadata/md5-cache/dev-tex/currvita-0.9i-r1
+++ b/metadata/md5-cache/dev-tex/currvita-0.9i-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm test
-DEPEND=dev-texlive/texlive-langgerman
+DEPEND=dev-texlive/texlive-langgerman virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A LaTeX package for typesetting a curriculum vitae
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/macros/latex/contrib/currvita/
@@ -9,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-texlive/texlive-langgerman virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/currvita-0.9i.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=ba4cafb91a3940efe46aeee95f687a76
diff --git a/metadata/md5-cache/dev-tex/curve-1.16-r1 b/metadata/md5-cache/dev-tex/curve-1.16-r1
index bcdccc70c07b..652ac0b72a6f 100644
--- a/metadata/md5-cache/dev-tex/curve-1.16-r1
+++ b/metadata/md5-cache/dev-tex/curve-1.16-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-texlive/texlive-latexextra-2010 app-arch/unzip
+DEPEND=>=dev-texlive/texlive-latexextra-2010 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX style for a CV (curriculum vitae) with flavour option
 EAPI=7
 HOMEPAGE=https://ctan.org/tex-archive/macros/latex/contrib/curve/
@@ -10,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=>=dev-texlive/texlive-latexextra-2010 virtual/latex-base
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/macros/latex/contrib/curve.zip -> curve-1.16.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=88320eb5d3d1d9f9a6a74131cfe671af
diff --git a/metadata/md5-cache/dev-tex/dot2tex-2.11.3 b/metadata/md5-cache/dev-tex/dot2tex-2.11.3
index 6c4cf1b9cd3f..ba28ecf93d33 100644
--- a/metadata/md5-cache/dev-tex/dot2tex-2.11.3
+++ b/metadata/md5-cache/dev-tex/dot2tex-2.11.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pydot[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/kjellmf/dot2tex/archive/2.11.3.tar.gz -> dot2tex-2.11.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7227245baf879b88d1ec0544cd59674f
diff --git a/metadata/md5-cache/dev-tex/dot2texi-3.0 b/metadata/md5-cache/dev-tex/dot2texi-3.0
index ab10f29b7cf8..791dab84a7a5 100644
--- a/metadata/md5-cache/dev-tex/dot2texi-3.0
+++ b/metadata/md5-cache/dev-tex/dot2texi-3.0
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=app-arch/unzip
+DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Create graphs within LaTeX using the dot2tex tool
 EAPI=7
 HOMEPAGE=https://www.ctan.org/pkg/dot2texi
@@ -10,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=pstricks? ( dev-texlive/texlive-pstricks ) pgf? ( dev-tex/pgf ) dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra >=dev-tex/dot2tex-2.7.0 virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/dot2texi-3.0.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=44736573af0445990525f7e7f1bf40c2
diff --git a/metadata/md5-cache/dev-tex/dvipost-1.1-r3 b/metadata/md5-cache/dev-tex/dvipost-1.1-r3
index 1f9bceba13ae..2305c21b675b 100644
--- a/metadata/md5-cache/dev-tex/dvipost-1.1-r3
+++ b/metadata/md5-cache/dev-tex/dvipost-1.1-r3
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=post processor for dvi files
 EAPI=7
 HOMEPAGE=http://efeu.cybertec.at/index_en.html
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=http://efeu.cybertec.at/dist/dvipost-1.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	latex-package	663b0e5f0410bc8e8d51f11346f0258a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9cdc634326c3c3282c87f255074e333c
diff --git a/metadata/md5-cache/dev-tex/ellipsis-1.6 b/metadata/md5-cache/dev-tex/ellipsis-1.6
index 7f0e5308c643..d90c0c0ae8f0 100644
--- a/metadata/md5-cache/dev-tex/ellipsis-1.6
+++ b/metadata/md5-cache/dev-tex/ellipsis-1.6
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=app-arch/unzip
+DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Simple package that fixes the way LaTeX centers ellipses
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/macros/latex/contrib/ellipsis/
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/ellipsis-1.6.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=c5c71cfb1023269edf4e0a81b1136074
diff --git a/metadata/md5-cache/dev-tex/envlab-1.2-r1 b/metadata/md5-cache/dev-tex/envlab-1.2-r1
index c2a506dc6910..884d5cd74b7d 100644
--- a/metadata/md5-cache/dev-tex/envlab-1.2-r1
+++ b/metadata/md5-cache/dev-tex/envlab-1.2-r1
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A LaTeX module to format envelopes
 EAPI=7
 HOMEPAGE=https://ctan.org/pkg/envlab
@@ -8,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/envlab-1.2.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=c296943ce52edfad4e52fb20efa301ca
diff --git a/metadata/md5-cache/dev-tex/europecv-20060424-r2 b/metadata/md5-cache/dev-tex/europecv-20060424-r2
index 17de4c62625c..33add556da6c 100644
--- a/metadata/md5-cache/dev-tex/europecv-20060424-r2
+++ b/metadata/md5-cache/dev-tex/europecv-20060424-r2
@@ -1,6 +1,6 @@
-BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-texlive/texlive-latexextra-2008
+DEPEND=>=dev-texlive/texlive-latexextra-2008 virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX class for the standard model for curricula vitae as recommended by the EC
 EAPI=7
 HOMEPAGE=http://www.ctan.org/pkg/europecv
@@ -10,5 +10,5 @@ LICENSE=LPPL-1.2
 RDEPEND=>=dev-texlive/texlive-latexextra-2008 virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/europecv-20060424.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=470af528bf7f006e844330c28d2f83ee
diff --git a/metadata/md5-cache/dev-tex/feynmf-1.08-r6 b/metadata/md5-cache/dev-tex/feynmf-1.08-r6
index 34e0db0e53f7..9809b99f8c41 100644
--- a/metadata/md5-cache/dev-tex/feynmf-1.08-r6
+++ b/metadata/md5-cache/dev-tex/feynmf-1.08-r6
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-texlive/texlive-metapost dev-lang/perl doc? ( dev-texlive/texlive-bibtexextra )
+DEPEND=dev-texlive/texlive-metapost dev-lang/perl doc? ( dev-texlive/texlive-bibtexextra ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Combined LaTeX/Metafont package for drawing of Feynman diagrams
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/feynmf/
@@ -10,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-texlive/texlive-metapost virtual/latex-base
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/feynmf-1.08.tar.gz doc? ( https://dev.gentoo.org/~ulm/distfiles/feynmf-cnl.tar.gz )
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=25647f348e4840ede48d91dbc849d43c
diff --git a/metadata/md5-cache/dev-tex/flabels-1.0 b/metadata/md5-cache/dev-tex/flabels-1.0
index bfa6254f4d1c..688cda298817 100644
--- a/metadata/md5-cache/dev-tex/flabels-1.0
+++ b/metadata/md5-cache/dev-tex/flabels-1.0
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Macros for typesetting lables for the back of files or binders
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/help/Catalogue/entries/flabels.html
@@ -8,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/flabels-1.0.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=50dfe8f15dbd8b2c9d986ecbacf837f3
diff --git a/metadata/md5-cache/dev-tex/floatflt-1.31a-r1 b/metadata/md5-cache/dev-tex/floatflt-1.31a-r1
index 8bc4c043bacc..41c8f4d5c3bb 100644
--- a/metadata/md5-cache/dev-tex/floatflt-1.31a-r1
+++ b/metadata/md5-cache/dev-tex/floatflt-1.31a-r1
@@ -1,5 +1,6 @@
-BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to warp text around figures
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/floatflt/
@@ -8,5 +9,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/floatflt-1.31a.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=9d4c879772c3a87ed721a3b73db3c1a1
diff --git a/metadata/md5-cache/dev-tex/foiltex-2.1.4b b/metadata/md5-cache/dev-tex/foiltex-2.1.4b
index 14d2ae97b716..3a2933b5f4d4 100644
--- a/metadata/md5-cache/dev-tex/foiltex-2.1.4b
+++ b/metadata/md5-cache/dev-tex/foiltex-2.1.4b
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=app-arch/unzip
+DEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to create foils and slides
 EAPI=7
 HOMEPAGE=ftp://ftp.dante.de/tex-archive/help/Catalogue/entries/foiltex.html
@@ -9,5 +8,5 @@ LICENSE=FoilTeX
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/foiltex-2.1.4b.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=7480c5ef4620e831cd0b77f0e6f707f6
diff --git a/metadata/md5-cache/dev-tex/frakturx-20070103-r1 b/metadata/md5-cache/dev-tex/frakturx-20070103-r1
index a27512473425..f17c489c379c 100644
--- a/metadata/md5-cache/dev-tex/frakturx-20070103-r1
+++ b/metadata/md5-cache/dev-tex/frakturx-20070103-r1
@@ -1,5 +1,6 @@
-BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Collection of blackletter fonts for LaTeX
 EAPI=7
 HOMEPAGE=http://www.gaehrken.de/fraktur/
@@ -8,5 +9,5 @@ LICENSE=LPPL-1.2 free-noncomm
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/frakturx-20070103-base.zip mirror://gentoo/frakturx-20070103-tfrak.zip mirror://gentoo/frakturx-20070103-obibel.zip mirror://gentoo/frakturx-20070103-odedruck.zip mirror://gentoo/frakturx-20070103-odeschmk.zip mirror://gentoo/frakturx-20070103-oweissfr.zip mirror://gentoo/frakturx-20070103-oweissgo.zip mirror://gentoo/frakturx-20070103-talteswab.zip mirror://gentoo/frakturx-20070103-tbrtkpf.zip mirror://gentoo/frakturx-20070103-tkngsbg.zip mirror://gentoo/frakturx-20070103-twieynk.zip mirror://gentoo/frakturx-20070103-twieyvig.zip mirror://gentoo/frakturx-20070103-tzentenar.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=9312b3cb1914119837e75aabae3f67ab
diff --git a/metadata/md5-cache/dev-tex/g-brief-4.0.2-r1 b/metadata/md5-cache/dev-tex/g-brief-4.0.2-r1
index f64c3369fec2..e1ae799902cb 100644
--- a/metadata/md5-cache/dev-tex/g-brief-4.0.2-r1
+++ b/metadata/md5-cache/dev-tex/g-brief-4.0.2-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-langgerman app-arch/unzip
+DEPEND=dev-texlive/texlive-langgerman app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX styles for formless letters in German or English
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/g-brief/
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=dev-texlive/texlive-langgerman virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/g-brief-4.0.2.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=7180c4b33d85235c5077e61fb434b36f
diff --git a/metadata/md5-cache/dev-tex/glossaries-4.41 b/metadata/md5-cache/dev-tex/glossaries-4.41
index 8136e61c4ece..b9514c30118b 100644
--- a/metadata/md5-cache/dev-tex/glossaries-4.41
+++ b/metadata/md5-cache/dev-tex/glossaries-4.41
@@ -1,5 +1,6 @@
-BDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric app-arch/unzip
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Create glossaries and lists of acronyms
 EAPI=7
 HOMEPAGE=http://www.ctan.org/pkg/glossaries/
@@ -9,5 +10,5 @@ LICENSE=LPPL-1.2
 RDEPEND=dev-lang/perl dev-texlive/texlive-latexrecommended >=dev-texlive/texlive-latexextra-2012 dev-texlive/texlive-plaingeneric virtual/latex-base
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> glossaries-4.41.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=8a01a10a995cfe2f7ffea0d0fa49b613
diff --git a/metadata/md5-cache/dev-tex/harvard-2.0.5 b/metadata/md5-cache/dev-tex/harvard-2.0.5
index 57543554657f..5f4f5e174ae5 100644
--- a/metadata/md5-cache/dev-tex/harvard-2.0.5
+++ b/metadata/md5-cache/dev-tex/harvard-2.0.5
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=The harvard family of bibliographic styles
 EAPI=7
 HOMEPAGE=https://www.ctan.org/pkg/harvard
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/harvard-2.0.5.tar.bz2
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=858c5bde8aa579d6eac1bd78038a751c
diff --git a/metadata/md5-cache/dev-tex/herm-pic-1.0.2 b/metadata/md5-cache/dev-tex/herm-pic-1.0.2
index 5086bb5c6704..56b22ceb02a2 100644
--- a/metadata/md5-cache/dev-tex/herm-pic-1.0.2
+++ b/metadata/md5-cache/dev-tex/herm-pic-1.0.2
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX class for creating ERM and HER diagramms
 EAPI=7
 HOMEPAGE=http://www.svenies-welt.de/?page_id=26
@@ -8,5 +8,5 @@ LICENSE=LPPL-1.3
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=http://my.dex.de/~sven/downloads/hermpic_1.0.2.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=81a6f625fed7bcc5c24cfadeff8ed8b9
diff --git a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1 b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
index f7ff94042703..b12825c0860c 100644
--- a/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
+++ b/metadata/md5-cache/dev-tex/hlatex-1.0.1-r1
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm unpack
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=HLaTeX is a LaTeX package to use Hangul with LaTeX
 EAPI=7
 HOMEPAGE=http://project.ktug.or.kr/hlatex/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=ftp://ftp.ktug.or.kr/pub/ktug/hlatex/HLaTeX-1.0.1.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-fonts-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-myoungjo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gothic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-taza-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-graphic-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-gungseo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-shinmun-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgi-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pen-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-bom-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-yetgul-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-jamo-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-vada-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-pilgia-1.0.tar.gz ftp://ftp.ktug.or.kr/pub/ktug/hlatex/fonts/uhc-dinaru-1.0.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=854010d111e9744d9fc314cf0ea0cdef
diff --git a/metadata/md5-cache/dev-tex/ivritex-1.1.2 b/metadata/md5-cache/dev-tex/ivritex-1.1.2
index f9277dd1749b..aba0275a0ea8 100644
--- a/metadata/md5-cache/dev-tex/ivritex-1.1.2
+++ b/metadata/md5-cache/dev-tex/ivritex-1.1.2
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Hebrew support for TeX
 EAPI=7
 HOMEPAGE=http://ivritex.sourceforge.net/
@@ -9,5 +9,5 @@ RDEPEND=virtual/latex-base
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/ivritex/ivritex-1.1.2.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=14f6669b0878f7ff474dc194701c46da
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.56-r1 b/metadata/md5-cache/dev-tex/latex-beamer-3.56-r1
index 7f358ccc07ef..f198de58fe2d 100644
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.56-r1
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.56-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-texlive/texlive-latex
+DEPEND=dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX class for creating presentations using a video projector
 EAPI=7
 HOMEPAGE=https://github.com/josephwright/beamer
@@ -10,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
 RDEPEND=>=dev-tex/pgf-1.10 dev-texlive/texlive-latexrecommended !dev-tex/translator virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/josephwright/beamer/archive/v3.56.tar.gz -> latex-beamer-3.56.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=c40b79ce73e102fc42663e2becad0345
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.57 b/metadata/md5-cache/dev-tex/latex-beamer-3.57
index c8c1c939a6f0..bb28baee8da8 100644
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.57
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.57
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-texlive/texlive-latex
+DEPEND=dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX class for creating presentations using a video projector
 EAPI=7
 HOMEPAGE=https://github.com/josephwright/beamer
@@ -10,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
 RDEPEND=>=dev-tex/pgf-1.10 dev-texlive/texlive-latexrecommended !dev-tex/translator virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/josephwright/beamer/archive/v3.57.tar.gz -> latex-beamer-3.57.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=01792fc3b2df498c6e21885ced5b33f8
diff --git a/metadata/md5-cache/dev-tex/latex-calendar-3.1 b/metadata/md5-cache/dev-tex/latex-calendar-3.1
index 26b6b0b464c7..08bd575a3a0f 100644
--- a/metadata/md5-cache/dev-tex/latex-calendar-3.1
+++ b/metadata/md5-cache/dev-tex/latex-calendar-3.1
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to create Calendars. Very flexible and robust
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/macros/latex/contrib/calendar/
@@ -8,5 +8,5 @@ LICENSE=LaTeX-Calendar
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/latex-calendar-3.1.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=bc10069fd587263199e4d8ea7c0276a3
diff --git a/metadata/md5-cache/dev-tex/lazylist-1.0a-r1 b/metadata/md5-cache/dev-tex/lazylist-1.0a-r1
index 906dc1e0957c..539c3d78ceaa 100644
--- a/metadata/md5-cache/dev-tex/lazylist-1.0a-r1
+++ b/metadata/md5-cache/dev-tex/lazylist-1.0a-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-publishers
+DEPEND=dev-texlive/texlive-publishers virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Lists in TeX's mouth - lambda-calculus and list-handling macros
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/lazylist/
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/lazylist-1.0a.tar.bz2
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=07673f9524bed50a2945b2710012e73a
diff --git a/metadata/md5-cache/dev-tex/leaflet-20041222 b/metadata/md5-cache/dev-tex/leaflet-20041222
index 70d55802d572..b75ce1c353b8 100644
--- a/metadata/md5-cache/dev-tex/leaflet-20041222
+++ b/metadata/md5-cache/dev-tex/leaflet-20041222
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-fontsrecommended app-arch/unzip
+DEPEND=dev-texlive/texlive-fontsrecommended app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX package used to create leaflet-type brochures
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/macros/latex/contrib/leaflet/
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.3
 RDEPEND=dev-texlive/texlive-fontsrecommended virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/leaflet-20041222.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=219d9a515fa2667cdf584f66dcaa225e
diff --git a/metadata/md5-cache/dev-tex/lgrind-3.67-r3 b/metadata/md5-cache/dev-tex/lgrind-3.67-r3
index 6b20b3159108..d817198c3b6b 100644
--- a/metadata/md5-cache/dev-tex/lgrind-3.67-r3
+++ b/metadata/md5-cache/dev-tex/lgrind-3.67-r3
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A pretty printer for various programming languages with tex output.
 EAPI=7
 HOMEPAGE=http://www.tug.org/
@@ -9,5 +9,5 @@ LICENSE=BSD LGrind-Jacobson
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/lgrind-3.67.tgz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b31af23f289c083ce0af97ffcbec55b5
diff --git a/metadata/md5-cache/dev-tex/newlfm-8.3-r1 b/metadata/md5-cache/dev-tex/newlfm-8.3-r1
index 61fc181a6543..e812a7c29296 100644
--- a/metadata/md5-cache/dev-tex/newlfm-8.3-r1
+++ b/metadata/md5-cache/dev-tex/newlfm-8.3-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-texlive/texlive-latexextra
+DEPEND=dev-texlive/texlive-latexextra virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Extensive LaTeX class for writing letters
 EAPI=7
 HOMEPAGE=https://www.ctan.org/tex-archive/help/Catalogue/entries/newlfm.html
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=dev-texlive/texlive-latexextra virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/newlfm-8.3.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=b368647d98d1a6e1e85c98c7f68fcf2d
diff --git a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1 b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
index 6e3d7b9faae6..bae59a328cc6 100644
--- a/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
+++ b/metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
@@ -1,6 +1,6 @@
-BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=virtual/latex-base dev-java/pdfbox:1.8 dev-java/fontbox:1.7 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=virtual/latex-base dev-java/pdfbox:1.8 dev-java/fontbox:1.7 >=virtual/jdk-1.6 virtual/latex-base >=sys-apps/texinfo-4.2-r5 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Extract annotations from pdf files
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/pax/
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-Getopt-Long dev-perl/File-Which >=virtual/jre-1.6 virtual/latex-base >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://gentoo/pdfannotextractor-0.1l.zip
-_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4091bc1782dbf2bb19a38504e9ed7928
+_eclasses_=java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	latex-package	663b0e5f0410bc8e8d51f11346f0258a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=152f7c636e29cdec3c34bc7717f26d94
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.4b-r2 b/metadata/md5-cache/dev-tex/pgf-3.1.4b-r2
index 7637277abf7f..cd29be72ee88 100644
--- a/metadata/md5-cache/dev-tex/pgf-3.1.4b-r2
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.4b-r2
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=The TeX Portable Graphic Format
 EAPI=7
 HOMEPAGE=https://github.com/pgf-tikz/pgf
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LPPL-1.3c FDL-1.2
 RDEPEND=dev-texlive/texlive-latexrecommended virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.4b.tar.gz -> pgf-3.1.4b.tar.gz https://dev.gentoo.org/~zlogene/distfiles/dev-tex/pgf/pgf-3.1.4b-revisioned.xz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.4b/pgfmanual.pdf -> pgf-3.1.4b-pgfmanual.pdf )
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=b2c85833a5d84f131dbeefc2afd8cb90
diff --git a/metadata/md5-cache/dev-tex/pgf-3.1.5b b/metadata/md5-cache/dev-tex/pgf-3.1.5b
index 0b9318807177..2c3db7c87ade 100644
--- a/metadata/md5-cache/dev-tex/pgf-3.1.5b
+++ b/metadata/md5-cache/dev-tex/pgf-3.1.5b
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=The TeX Portable Graphic Format
 EAPI=7
 HOMEPAGE=https://github.com/pgf-tikz/pgf
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LPPL-1.3c FDL-1.2
 RDEPEND=dev-texlive/texlive-latexrecommended virtual/latex-base
 SLOT=0
 SRC_URI=https://github.com/pgf-tikz/pgf/archive/3.1.5b.tar.gz -> pgf-3.1.5b.tar.gz https://dev.gentoo.org/~zlogene/distfiles/dev-tex/pgf/pgf-3.1.5b-revisioned.xz doc? ( https://github.com/pgf-tikz/pgf/releases/download/3.1.5b/pgfmanual.pdf -> pgf-3.1.5b-pgfmanual.pdf )
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=4708f1c6ca41915f6372f88eac89b298
diff --git a/metadata/md5-cache/dev-tex/polytable-0.8.2-r1 b/metadata/md5-cache/dev-tex/polytable-0.8.2-r1
index 45389730d56e..c792e7fd69a3 100644
--- a/metadata/md5-cache/dev-tex/polytable-0.8.2-r1
+++ b/metadata/md5-cache/dev-tex/polytable-0.8.2-r1
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=>=dev-tex/lazylist-1.0a
+DEPEND=>=dev-tex/lazylist-1.0a virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=tabular-like environments with named columns
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/macros/latex/contrib/polytable/
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=>=dev-tex/lazylist-1.0a virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/polytable-0.8.2.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=8aa5780fddd7dd826f6b86cea1e9d62f
diff --git a/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9 b/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
index ed318db3a7c4..d3ee2170c8eb 100644
--- a/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
+++ b/metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Type1 cyrillic fonts collection
 EAPI=7
 HOMEPAGE=ftp://scon155.phys.msu.su/pub/russian/psfonts/
@@ -8,5 +8,5 @@ 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_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=d59e37d3b4a8c077d79d8c868539292e
diff --git a/metadata/md5-cache/dev-tex/pythontex-0.16 b/metadata/md5-cache/dev-tex/pythontex-0.16
index c8bd09c1253c..070f34e5075f 100644
--- a/metadata/md5-cache/dev-tex/pythontex-0.16
+++ b/metadata/md5-cache/dev-tex/pythontex-0.16
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-texlive/texlive-latexextra-2016 dev-tex/pgf
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-texlive/texlive-latexextra-2016 dev-tex/pgf virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Fast Access to Python from within LaTeX
 EAPI=7
 HOMEPAGE=https://github.com/gpoore/pythontex
@@ -11,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/gpoore/pythontex/archive/v0.16.tar.gz -> pythontex-0.16.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=798fa073199e5fbb568dccc9255aefa0
diff --git a/metadata/md5-cache/dev-tex/rail-1.2_p1-r1 b/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
index ebf24313fad2..1787d8d69b46 100644
--- a/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
+++ b/metadata/md5-cache/dev-tex/rail-1.2_p1-r1
@@ -1,5 +1,6 @@
-BDEPEND=app-arch/unzip sys-devel/bison sys-devel/flex virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=app-arch/unzip sys-devel/bison sys-devel/flex
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=Offers syntax/railroad diagrams
 EAPI=7
 HOMEPAGE=http://www.ctan.org/tex-archive/support/rail/
@@ -8,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=http://mirror.ctan.org/support/rail.zip -> rail-1.2_p1.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b6f42f84c82eb5040565f66ee5744af7
diff --git a/metadata/md5-cache/dev-tex/rcsinfo-1.11 b/metadata/md5-cache/dev-tex/rcsinfo-1.11
index 700d25c5f47b..e6e61a06d490 100644
--- a/metadata/md5-cache/dev-tex/rcsinfo-1.11
+++ b/metadata/md5-cache/dev-tex/rcsinfo-1.11
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=dev-tex/latex2html app-arch/unzip
+DEPEND=dev-tex/latex2html app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A LaTeX module to acces RCS/CVS version info
 EAPI=7
 HOMEPAGE=https://www.ctan.org/pkg/rcsinfo
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/rcsinfo-1.11.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=257dcd5857f785e32d1f1affba4be9cb
diff --git a/metadata/md5-cache/dev-tex/revtex-4.2c b/metadata/md5-cache/dev-tex/revtex-4.2c
index 001096d87aee..14ea53683a5e 100644
--- a/metadata/md5-cache/dev-tex/revtex-4.2c
+++ b/metadata/md5-cache/dev-tex/revtex-4.2c
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=>=dev-texlive/texlive-latex-2012 app-arch/unzip
+DEPEND=>=dev-texlive/texlive-latex-2012 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=LaTeX2e macros to prepare manuscripts for the journals of the APS and AIP
 EAPI=7
 HOMEPAGE=https://journals.aps.org/revtex
@@ -10,5 +9,5 @@ LICENSE=LPPL-1.3c
 RDEPEND=>=dev-texlive/texlive-latex-2012 virtual/latex-base
 SLOT=0
 SRC_URI=http://mirrors.ctan.org/macros/latex/contrib/revtex.zip -> revtex-4.2c.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=9285ab34a413dd959ffb67bcf50f8cf0
diff --git a/metadata/md5-cache/dev-tex/rubber-1.4 b/metadata/md5-cache/dev-tex/rubber-1.4
index d57a4affede2..0487e49b2642 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1831ddfb9e06fa32afbccc5f2aaac95e
diff --git a/metadata/md5-cache/dev-tex/rubber-1.5.1 b/metadata/md5-cache/dev-tex/rubber-1.5.1
new file mode 100644
index 000000000000..870556271cd8
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/rubber-1.5.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/latex-base virtual/texi2dvi python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A LaTeX wrapper for automatically building documents
+EAPI=7
+HOMEPAGE=https://launchpad.net/rubber/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/latex-base python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://launchpad.net/rubber/trunk/1.5.1/+download/rubber-1.5.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9bb970d58c3b537b55c635caf8287cd8
diff --git a/metadata/md5-cache/dev-tex/slatex-20090928_p20180415 b/metadata/md5-cache/dev-tex/slatex-20090928_p20180415
index d654bb33f9db..36db3a86b7ec 100644
--- a/metadata/md5-cache/dev-tex/slatex-20090928_p20180415
+++ b/metadata/md5-cache/dev-tex/slatex-20090928_p20180415
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=dev-scheme/guile dev-scheme/scmxlate
+DEPEND=dev-scheme/guile dev-scheme/scmxlate virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A Scheme program allowing you to write Scheme in your (La)TeX source
 EAPI=7
 HOMEPAGE=http://www.ccs.neu.edu/home/dorai/slatex/slatxdoc.html
@@ -9,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-scheme/guile virtual/latex-base
 SLOT=0
 SRC_URI=http://www.ccs.neu.edu/home/dorai/slatex/slatex.tar.bz2 -> slatex-20090928_p20180415.tar.bz2
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=b9fd4d9f794acb0deb7eca115e48c6e6
diff --git a/metadata/md5-cache/dev-tex/svninfo-0.7.4 b/metadata/md5-cache/dev-tex/svninfo-0.7.4
index 1e901b5e02a6..6a5eec0ac76d 100644
--- a/metadata/md5-cache/dev-tex/svninfo-0.7.4
+++ b/metadata/md5-cache/dev-tex/svninfo-0.7.4
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A LaTeX module to access SVN version info
 EAPI=7
 HOMEPAGE=https://www.brucker.ch/projects/svninfo/index.en.html
@@ -8,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=https://www.brucker.ch/projects/svninfo/download/svninfo-0.7.4.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=94b4df36654e30b3eff6e89210d1129b
diff --git a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8 b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8
index d4e80b1b6b64..a9540aefad4f 100644
--- a/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8
+++ b/metadata/md5-cache/dev-tex/tex4ht-20090611_p1038-r8
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.5 ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=virtual/pkgconfig java? ( >=virtual/jdk-1.5 )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-libs/kpathsea java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=dev-libs/kpathsea virtual/latex-base >=sys-apps/texinfo-4.2-r5 java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Converts (La)TeX to (X)HTML, XML and OO.org
 EAPI=7
 HOMEPAGE=http://www.cse.ohio-state.edu/~gurari/TeX4ht/ http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html
@@ -10,5 +10,5 @@ LICENSE=LPPL-1.2
 RDEPEND=app-text/ghostscript-gpl media-gfx/imagemagick dev-libs/kpathsea java? ( >=virtual/jre-1.5 ) virtual/latex-base java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/tex4ht-1.0.2009_06_11_1038.tar.gz mirror://gentoo/tex4ht-texlive-2019-03-22.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	latex-package	17f13abe0de88340745e52e6b627aee7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	latex-package	663b0e5f0410bc8e8d51f11346f0258a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d155bdee37593784ab41ceeaf064f975
diff --git a/metadata/md5-cache/dev-tex/texpower-0.2 b/metadata/md5-cache/dev-tex/texpower-0.2
index bf4e0fe4ff89..3f4be124a3a8 100644
--- a/metadata/md5-cache/dev-tex/texpower-0.2
+++ b/metadata/md5-cache/dev-tex/texpower-0.2
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A bundle of style and class files for creating dynamic online presentations
 EAPI=7
 HOMEPAGE=http://texpower.sourceforge.net/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/texpower/texpower-0-2.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=e569f986c895de651a9f8a26de760e30
diff --git a/metadata/md5-cache/dev-tex/translator-1.00 b/metadata/md5-cache/dev-tex/translator-1.00
index 7d6a01fa9087..60b48cbd90cf 100644
--- a/metadata/md5-cache/dev-tex/translator-1.00
+++ b/metadata/md5-cache/dev-tex/translator-1.00
@@ -1,5 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A package for translating words in TeX
 EAPI=7
 HOMEPAGE=https://bitbucket.org/rivanvx/beamer/src
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LPPL-1.3c
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=mirror://sourceforge/latex-beamer/translator-1.00.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=0a44ae66e0b3660782409bd76436a52c
diff --git a/metadata/md5-cache/dev-tex/vc-0.6 b/metadata/md5-cache/dev-tex/vc-0.6
index 00d36342c9bb..7f5ea7d71952 100644
--- a/metadata/md5-cache/dev-tex/vc-0.6
+++ b/metadata/md5-cache/dev-tex/vc-0.6
@@ -1,5 +1,6 @@
-BDEPEND=app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
+BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install postinst postrm
+DEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=The vc (version control) bundle
 EAPI=7
 HOMEPAGE=https://www.ctan.org/pkg/vc
@@ -8,5 +9,5 @@ LICENSE=CC0-1.0
 RDEPEND=virtual/latex-base
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/vc-0.6.zip
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a
 _md5_=588a8565e15aa7ee609a4430f5494e63
diff --git a/metadata/md5-cache/dev-tex/xmltex-1.9-r3 b/metadata/md5-cache/dev-tex/xmltex-1.9-r3
index db11b02f907a..bf7199ed6685 100644
--- a/metadata/md5-cache/dev-tex/xmltex-1.9-r3
+++ b/metadata/md5-cache/dev-tex/xmltex-1.9-r3
@@ -1,6 +1,5 @@
-BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DEFINED_PHASES=compile install postinst postrm
-DEPEND=virtual/latex-base
+DEPEND=virtual/latex-base virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A non validating namespace aware XML parser implemented in TeX
 EAPI=7
 HOMEPAGE=http://www.dcarlisle.demon.co.uk/xmltex/manual.html
@@ -9,5 +8,5 @@ LICENSE=LPPL-1.2
 RDEPEND=virtual/latex-base virtual/latex-base
 SLOT=0
 SRC_URI=mirror://gentoo/xmltex-1.9.tar.gz
-_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc
+_eclasses_=latex-package	663b0e5f0410bc8e8d51f11346f0258a	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c
 _md5_=680b90a36a2921ef096586fcba4576df
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 662661f50d1b..e24233372194 100644
--- a/metadata/md5-cache/dev-texlive/Manifest.gz
+++ b/metadata/md5-cache/dev-texlive/Manifest.gz
diff --git a/metadata/md5-cache/dev-texlive/texlive-basic-2019-r1 b/metadata/md5-cache/dev-texlive/texlive-basic-2019-r1
index 4b66f8bfc267..5a6228fbc0b0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-basic-2019-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-basic-2019-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OFL public-domain TeX TeX-other-free
 RDEPEND=!<app-text/dvipsk-5.996_p20160523 >=app-text/texlive-core-2019[luajittex?] >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsfonts-2019.tar.xz mirror://gentoo/texlive-module-bibtex-2019.tar.xz mirror://gentoo/texlive-module-cm-2019.tar.xz mirror://gentoo/texlive-module-colorprofiles-2019.tar.xz mirror://gentoo/texlive-module-enctex-2019.tar.xz mirror://gentoo/texlive-module-etex-2019.tar.xz mirror://gentoo/texlive-module-etex-pkg-2019.tar.xz mirror://gentoo/texlive-module-graphics-def-2019.tar.xz mirror://gentoo/texlive-module-hyph-utf8-2019.tar.xz mirror://gentoo/texlive-module-ifluatex-2019.tar.xz mirror://gentoo/texlive-module-ifxetex-2019.tar.xz mirror://gentoo/texlive-module-knuth-lib-2019.tar.xz mirror://gentoo/texlive-module-knuth-local-2019.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt-2019.tar.xz mirror://gentoo/texlive-module-luatex-2019.tar.xz mirror://gentoo/texlive-module-makeindex-2019.tar.xz mirror://gentoo/texlive-module-metafont-2019.tar.xz mirror://gentoo/texlive-module-mflogo-2019.tar.xz mirror://gentoo/texlive-module-mfware-2019.tar.xz mirror://gentoo/texlive-module-pdftex-2019.tar.xz mirror://gentoo/texlive-module-plain-2019.tar.xz mirror://gentoo/texlive-module-tex-2019.tar.xz mirror://gentoo/texlive-module-tex-ini-files-2019.tar.xz mirror://gentoo/texlive-module-texlive-common-2019.tar.xz mirror://gentoo/texlive-module-texlive-docindex-2019.tar.xz mirror://gentoo/texlive-module-texlive-en-2019.tar.xz mirror://gentoo/texlive-module-texlive-msg-translations-2019.tar.xz mirror://gentoo/texlive-module-texlive-scripts-2019.tar.xz mirror://gentoo/texlive-module-tlshell-2019.tar.xz mirror://gentoo/texlive-module-unicode-data-2019.tar.xz mirror://gentoo/texlive-module-updmap-map-2019.tar.xz mirror://gentoo/texlive-module-collection-basic-2019.tar.xz doc? ( mirror://gentoo/texlive-module-amsfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-bibtex.doc-2019.tar.xz mirror://gentoo/texlive-module-cm.doc-2019.tar.xz mirror://gentoo/texlive-module-colorprofiles.doc-2019.tar.xz mirror://gentoo/texlive-module-enctex.doc-2019.tar.xz mirror://gentoo/texlive-module-etex.doc-2019.tar.xz mirror://gentoo/texlive-module-etex-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-graphics-def.doc-2019.tar.xz mirror://gentoo/texlive-module-hyph-utf8.doc-2019.tar.xz mirror://gentoo/texlive-module-ifluatex.doc-2019.tar.xz mirror://gentoo/texlive-module-ifxetex.doc-2019.tar.xz mirror://gentoo/texlive-module-lua-alt-getopt.doc-2019.tar.xz mirror://gentoo/texlive-module-luatex.doc-2019.tar.xz mirror://gentoo/texlive-module-makeindex.doc-2019.tar.xz mirror://gentoo/texlive-module-metafont.doc-2019.tar.xz mirror://gentoo/texlive-module-mflogo.doc-2019.tar.xz mirror://gentoo/texlive-module-mfware.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-ini-files.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-common.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-docindex.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-en.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-scripts.doc-2019.tar.xz mirror://gentoo/texlive-module-tlshell.doc-2019.tar.xz mirror://gentoo/texlive-module-unicode-data.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-amsfonts.source-2019.tar.xz mirror://gentoo/texlive-module-hyph-utf8.source-2019.tar.xz mirror://gentoo/texlive-module-ifluatex.source-2019.tar.xz mirror://gentoo/texlive-module-ifxetex.source-2019.tar.xz mirror://gentoo/texlive-module-mflogo.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=1af05c616abede4990c49d6d1f5f9a25
diff --git a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2019 b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2019
index 4694a3ecf5ec..8da6e27cefb0 100644
--- a/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-bibtexextra-2019
@@ -10,5 +10,5 @@ LICENSE=Artistic GPL-1 GPL-2 GPL-3 BSD-4 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-doma
 RDEPEND=>=dev-texlive/texlive-latex-2019 !=app-text/texlive-core-2017* !=dev-texlive/texlive-luatex-2017* >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aichej-2019.tar.xz mirror://gentoo/texlive-module-ajl-2019.tar.xz mirror://gentoo/texlive-module-amsrefs-2019.tar.xz mirror://gentoo/texlive-module-apacite-2019.tar.xz mirror://gentoo/texlive-module-apalike2-2019.tar.xz mirror://gentoo/texlive-module-archaeologie-2019.tar.xz mirror://gentoo/texlive-module-beebe-2019.tar.xz mirror://gentoo/texlive-module-besjournals-2019.tar.xz mirror://gentoo/texlive-module-bestpapers-2019.tar.xz mirror://gentoo/texlive-module-bib2gls-2019.tar.xz mirror://gentoo/texlive-module-bibarts-2019.tar.xz mirror://gentoo/texlive-module-biber-2019.tar.xz mirror://gentoo/texlive-module-bibexport-2019.tar.xz mirror://gentoo/texlive-module-bibhtml-2019.tar.xz mirror://gentoo/texlive-module-biblatex-abnt-2019.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous-2019.tar.xz mirror://gentoo/texlive-module-biblatex-apa-2019.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology-2019.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bath-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bwl-2019.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector-2019.tar.xz mirror://gentoo/texlive-module-biblatex-chem-2019.tar.xz mirror://gentoo/texlive-module-biblatex-chicago-2019.tar.xz mirror://gentoo/texlive-module-biblatex-claves-2019.tar.xz mirror://gentoo/texlive-module-biblatex-dw-2019.tar.xz mirror://gentoo/texlive-module-biblatex-enc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-ext-2019.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi-2019.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015-2019.tar.xz mirror://gentoo/texlive-module-biblatex-gost-2019.tar.xz mirror://gentoo/texlive-module-biblatex-historian-2019.tar.xz mirror://gentoo/texlive-module-biblatex-ieee-2019.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra-2019.tar.xz mirror://gentoo/texlive-module-biblatex-iso690-2019.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss-2019.tar.xz mirror://gentoo/texlive-module-biblatex-lni-2019.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw-2019.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology-2019.tar.xz mirror://gentoo/texlive-module-biblatex-mla-2019.tar.xz mirror://gentoo/texlive-module-biblatex-morenames-2019.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm-2019.tar.xz mirror://gentoo/texlive-module-biblatex-musuos-2019.tar.xz mirror://gentoo/texlive-module-biblatex-nature-2019.tar.xz mirror://gentoo/texlive-module-biblatex-nejm-2019.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic-2019.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle-2019.tar.xz mirror://gentoo/texlive-module-biblatex-oxref-2019.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy-2019.tar.xz mirror://gentoo/texlive-module-biblatex-phys-2019.tar.xz mirror://gentoo/texlive-module-biblatex-publist-2019.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor-2019.tar.xz mirror://gentoo/texlive-module-biblatex-sbl-2019.tar.xz mirror://gentoo/texlive-module-biblatex-science-2019.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields-2019.tar.xz mirror://gentoo/texlive-module-biblatex-socialscienceshuberlin-2019.tar.xz mirror://gentoo/texlive-module-biblatex-source-division-2019.tar.xz mirror://gentoo/texlive-module-biblatex-subseries-2019.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal-2019.tar.xz mirror://gentoo/texlive-module-biblatex-trad-2019.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit-2019.tar.xz mirror://gentoo/texlive-module-biblist-2019.tar.xz mirror://gentoo/texlive-module-bibtexperllibs-2019.tar.xz mirror://gentoo/texlive-module-bibtopic-2019.tar.xz mirror://gentoo/texlive-module-bibtopicprefix-2019.tar.xz mirror://gentoo/texlive-module-bibunits-2019.tar.xz mirror://gentoo/texlive-module-biolett-bst-2019.tar.xz mirror://gentoo/texlive-module-bookdb-2019.tar.xz mirror://gentoo/texlive-module-breakcites-2019.tar.xz mirror://gentoo/texlive-module-cell-2019.tar.xz mirror://gentoo/texlive-module-chbibref-2019.tar.xz mirror://gentoo/texlive-module-chicago-2019.tar.xz mirror://gentoo/texlive-module-chicago-annote-2019.tar.xz mirror://gentoo/texlive-module-chembst-2019.tar.xz mirror://gentoo/texlive-module-chscite-2019.tar.xz mirror://gentoo/texlive-module-citeall-2019.tar.xz mirror://gentoo/texlive-module-citeref-2019.tar.xz mirror://gentoo/texlive-module-collref-2019.tar.xz mirror://gentoo/texlive-module-compactbib-2019.tar.xz mirror://gentoo/texlive-module-crossrefware-2019.tar.xz mirror://gentoo/texlive-module-custom-bib-2019.tar.xz mirror://gentoo/texlive-module-din1505-2019.tar.xz mirror://gentoo/texlive-module-dk-bib-2019.tar.xz mirror://gentoo/texlive-module-doipubmed-2019.tar.xz mirror://gentoo/texlive-module-ecobiblatex-2019.tar.xz mirror://gentoo/texlive-module-econ-bst-2019.tar.xz mirror://gentoo/texlive-module-economic-2019.tar.xz mirror://gentoo/texlive-module-fbs-2019.tar.xz mirror://gentoo/texlive-module-figbib-2019.tar.xz mirror://gentoo/texlive-module-footbib-2019.tar.xz mirror://gentoo/texlive-module-francais-bst-2019.tar.xz mirror://gentoo/texlive-module-gbt7714-2019.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl-2019.tar.xz mirror://gentoo/texlive-module-harvard-2019.tar.xz mirror://gentoo/texlive-module-harvmac-2019.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift-2019.tar.xz mirror://gentoo/texlive-module-icite-2019.tar.xz mirror://gentoo/texlive-module-ietfbibs-2019.tar.xz mirror://gentoo/texlive-module-ijqc-2019.tar.xz mirror://gentoo/texlive-module-inlinebib-2019.tar.xz mirror://gentoo/texlive-module-iopart-num-2019.tar.xz mirror://gentoo/texlive-module-jneurosci-2019.tar.xz mirror://gentoo/texlive-module-jurabib-2019.tar.xz mirror://gentoo/texlive-module-ksfh_nat-2019.tar.xz mirror://gentoo/texlive-module-ltb2bib-2019.tar.xz mirror://gentoo/texlive-module-listbib-2019.tar.xz mirror://gentoo/texlive-module-logreq-2019.tar.xz mirror://gentoo/texlive-module-luabibentry-2019.tar.xz mirror://gentoo/texlive-module-margbib-2019.tar.xz mirror://gentoo/texlive-module-multibib-2019.tar.xz mirror://gentoo/texlive-module-multibibliography-2019.tar.xz mirror://gentoo/texlive-module-munich-2019.tar.xz mirror://gentoo/texlive-module-nar-2019.tar.xz mirror://gentoo/texlive-module-nmbib-2019.tar.xz mirror://gentoo/texlive-module-notes2bib-2019.tar.xz mirror://gentoo/texlive-module-notex-bst-2019.tar.xz mirror://gentoo/texlive-module-oscola-2019.tar.xz mirror://gentoo/texlive-module-perception-2019.tar.xz mirror://gentoo/texlive-module-pnas2009-2019.tar.xz mirror://gentoo/texlive-module-rsc-2019.tar.xz mirror://gentoo/texlive-module-showtags-2019.tar.xz mirror://gentoo/texlive-module-sort-by-letters-2019.tar.xz mirror://gentoo/texlive-module-splitbib-2019.tar.xz mirror://gentoo/texlive-module-turabian-formatting-2019.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger-2019.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin-2019.tar.xz mirror://gentoo/texlive-module-urlbst-2019.tar.xz mirror://gentoo/texlive-module-usebib-2019.tar.xz mirror://gentoo/texlive-module-vak-2019.tar.xz mirror://gentoo/texlive-module-windycity-2019.tar.xz mirror://gentoo/texlive-module-xcite-2019.tar.xz mirror://gentoo/texlive-module-zootaxa-bst-2019.tar.xz mirror://gentoo/texlive-module-collection-bibtexextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-amsrefs.doc-2019.tar.xz mirror://gentoo/texlive-module-apacite.doc-2019.tar.xz mirror://gentoo/texlive-module-archaeologie.doc-2019.tar.xz mirror://gentoo/texlive-module-besjournals.doc-2019.tar.xz mirror://gentoo/texlive-module-bestpapers.doc-2019.tar.xz mirror://gentoo/texlive-module-bib2gls.doc-2019.tar.xz mirror://gentoo/texlive-module-bibarts.doc-2019.tar.xz mirror://gentoo/texlive-module-biber.doc-2019.tar.xz mirror://gentoo/texlive-module-bibexport.doc-2019.tar.xz mirror://gentoo/texlive-module-bibhtml.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-abnt.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-anonymous.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-apa.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-arthistory-bonn.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bath.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bookinarticle.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bookinother.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bwl.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-caspervector.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-chem.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-chicago.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-claves.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-dw.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-enc.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-ext.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-fiwi.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-gb7714-2015.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-gost.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-historian.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-ieee.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-ijsra.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-iso690.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-juradiss.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-lni.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-luh-ipw.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-manuscripts-philology.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-mla.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-morenames.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-multiple-dm.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-musuos.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-nature.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-nejm.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-nottsclassic.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-opcit-booktitle.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-phys.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-publist.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-realauthor.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-sbl.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-science.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-shortfields.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-socialscienceshuberlin.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-source-division.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-subseries.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-swiss-legal.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-trad.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-true-citepages-omit.doc-2019.tar.xz mirror://gentoo/texlive-module-biblist.doc-2019.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.doc-2019.tar.xz mirror://gentoo/texlive-module-bibtopic.doc-2019.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.doc-2019.tar.xz mirror://gentoo/texlive-module-bibunits.doc-2019.tar.xz mirror://gentoo/texlive-module-biolett-bst.doc-2019.tar.xz mirror://gentoo/texlive-module-bookdb.doc-2019.tar.xz mirror://gentoo/texlive-module-breakcites.doc-2019.tar.xz mirror://gentoo/texlive-module-cell.doc-2019.tar.xz mirror://gentoo/texlive-module-chbibref.doc-2019.tar.xz mirror://gentoo/texlive-module-chicago-annote.doc-2019.tar.xz mirror://gentoo/texlive-module-chembst.doc-2019.tar.xz mirror://gentoo/texlive-module-chscite.doc-2019.tar.xz mirror://gentoo/texlive-module-citeall.doc-2019.tar.xz mirror://gentoo/texlive-module-citeref.doc-2019.tar.xz mirror://gentoo/texlive-module-collref.doc-2019.tar.xz mirror://gentoo/texlive-module-crossrefware.doc-2019.tar.xz mirror://gentoo/texlive-module-custom-bib.doc-2019.tar.xz mirror://gentoo/texlive-module-din1505.doc-2019.tar.xz mirror://gentoo/texlive-module-dk-bib.doc-2019.tar.xz mirror://gentoo/texlive-module-doipubmed.doc-2019.tar.xz mirror://gentoo/texlive-module-ecobiblatex.doc-2019.tar.xz mirror://gentoo/texlive-module-econ-bst.doc-2019.tar.xz mirror://gentoo/texlive-module-economic.doc-2019.tar.xz mirror://gentoo/texlive-module-figbib.doc-2019.tar.xz mirror://gentoo/texlive-module-footbib.doc-2019.tar.xz mirror://gentoo/texlive-module-francais-bst.doc-2019.tar.xz mirror://gentoo/texlive-module-gbt7714.doc-2019.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.doc-2019.tar.xz mirror://gentoo/texlive-module-harvard.doc-2019.tar.xz mirror://gentoo/texlive-module-harvmac.doc-2019.tar.xz mirror://gentoo/texlive-module-historische-zeitschrift.doc-2019.tar.xz mirror://gentoo/texlive-module-icite.doc-2019.tar.xz mirror://gentoo/texlive-module-ietfbibs.doc-2019.tar.xz mirror://gentoo/texlive-module-ijqc.doc-2019.tar.xz mirror://gentoo/texlive-module-inlinebib.doc-2019.tar.xz mirror://gentoo/texlive-module-iopart-num.doc-2019.tar.xz mirror://gentoo/texlive-module-jneurosci.doc-2019.tar.xz mirror://gentoo/texlive-module-jurabib.doc-2019.tar.xz mirror://gentoo/texlive-module-ltb2bib.doc-2019.tar.xz mirror://gentoo/texlive-module-listbib.doc-2019.tar.xz mirror://gentoo/texlive-module-logreq.doc-2019.tar.xz mirror://gentoo/texlive-module-luabibentry.doc-2019.tar.xz mirror://gentoo/texlive-module-margbib.doc-2019.tar.xz mirror://gentoo/texlive-module-multibib.doc-2019.tar.xz mirror://gentoo/texlive-module-multibibliography.doc-2019.tar.xz mirror://gentoo/texlive-module-munich.doc-2019.tar.xz mirror://gentoo/texlive-module-nmbib.doc-2019.tar.xz mirror://gentoo/texlive-module-notes2bib.doc-2019.tar.xz mirror://gentoo/texlive-module-oscola.doc-2019.tar.xz mirror://gentoo/texlive-module-perception.doc-2019.tar.xz mirror://gentoo/texlive-module-rsc.doc-2019.tar.xz mirror://gentoo/texlive-module-showtags.doc-2019.tar.xz mirror://gentoo/texlive-module-sort-by-letters.doc-2019.tar.xz mirror://gentoo/texlive-module-splitbib.doc-2019.tar.xz mirror://gentoo/texlive-module-turabian-formatting.doc-2019.tar.xz mirror://gentoo/texlive-module-uni-wtal-ger.doc-2019.tar.xz mirror://gentoo/texlive-module-uni-wtal-lin.doc-2019.tar.xz mirror://gentoo/texlive-module-urlbst.doc-2019.tar.xz mirror://gentoo/texlive-module-usebib.doc-2019.tar.xz mirror://gentoo/texlive-module-vak.doc-2019.tar.xz mirror://gentoo/texlive-module-windycity.doc-2019.tar.xz mirror://gentoo/texlive-module-xcite.doc-2019.tar.xz mirror://gentoo/texlive-module-zootaxa-bst.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-amsrefs.source-2019.tar.xz mirror://gentoo/texlive-module-apacite.source-2019.tar.xz mirror://gentoo/texlive-module-archaeologie.source-2019.tar.xz mirror://gentoo/texlive-module-bib2gls.source-2019.tar.xz mirror://gentoo/texlive-module-bibarts.source-2019.tar.xz mirror://gentoo/texlive-module-biber.source-2019.tar.xz mirror://gentoo/texlive-module-bibexport.source-2019.tar.xz mirror://gentoo/texlive-module-biblatex-archaeology.source-2019.tar.xz mirror://gentoo/texlive-module-biblatex-bath.source-2019.tar.xz mirror://gentoo/texlive-module-biblatex-nejm.source-2019.tar.xz mirror://gentoo/texlive-module-biblatex-oxref.source-2019.tar.xz mirror://gentoo/texlive-module-biblatex-philosophy.source-2019.tar.xz mirror://gentoo/texlive-module-bibtexperllibs.source-2019.tar.xz mirror://gentoo/texlive-module-bibtopic.source-2019.tar.xz mirror://gentoo/texlive-module-bibtopicprefix.source-2019.tar.xz mirror://gentoo/texlive-module-bibunits.source-2019.tar.xz mirror://gentoo/texlive-module-chembst.source-2019.tar.xz mirror://gentoo/texlive-module-chscite.source-2019.tar.xz mirror://gentoo/texlive-module-collref.source-2019.tar.xz mirror://gentoo/texlive-module-custom-bib.source-2019.tar.xz mirror://gentoo/texlive-module-dk-bib.source-2019.tar.xz mirror://gentoo/texlive-module-doipubmed.source-2019.tar.xz mirror://gentoo/texlive-module-footbib.source-2019.tar.xz mirror://gentoo/texlive-module-gbt7714.source-2019.tar.xz mirror://gentoo/texlive-module-geschichtsfrkl.source-2019.tar.xz mirror://gentoo/texlive-module-harvard.source-2019.tar.xz mirror://gentoo/texlive-module-icite.source-2019.tar.xz mirror://gentoo/texlive-module-jurabib.source-2019.tar.xz mirror://gentoo/texlive-module-ltb2bib.source-2019.tar.xz mirror://gentoo/texlive-module-listbib.source-2019.tar.xz mirror://gentoo/texlive-module-luabibentry.source-2019.tar.xz mirror://gentoo/texlive-module-margbib.source-2019.tar.xz mirror://gentoo/texlive-module-multibib.source-2019.tar.xz mirror://gentoo/texlive-module-multibibliography.source-2019.tar.xz mirror://gentoo/texlive-module-nmbib.source-2019.tar.xz mirror://gentoo/texlive-module-notes2bib.source-2019.tar.xz mirror://gentoo/texlive-module-rsc.source-2019.tar.xz mirror://gentoo/texlive-module-splitbib.source-2019.tar.xz mirror://gentoo/texlive-module-urlbst.source-2019.tar.xz mirror://gentoo/texlive-module-usebib.source-2019.tar.xz mirror://gentoo/texlive-module-xcite.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=cd2685cf5c9b452cdb4c40860a73d717
diff --git a/metadata/md5-cache/dev-texlive/texlive-context-2019 b/metadata/md5-cache/dev-texlive/texlive-context-2019
index 3090762f454b..954e5c3ebd42 100644
--- a/metadata/md5-cache/dev-texlive/texlive-context-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-context-2019
@@ -10,5 +10,5 @@ LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-latex-2010 >=app-text/texlive-core-2010[xetex] >=dev-texlive/texlive-metapost-2010 dev-lang/ruby >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-context-2019.tar.xz mirror://gentoo/texlive-module-jmn-2019.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn-2019.tar.xz mirror://gentoo/texlive-module-npp-for-context-2019.tar.xz mirror://gentoo/texlive-module-context-account-2019.tar.xz mirror://gentoo/texlive-module-context-algorithmic-2019.tar.xz mirror://gentoo/texlive-module-context-animation-2019.tar.xz mirror://gentoo/texlive-module-context-annotation-2019.tar.xz mirror://gentoo/texlive-module-context-bnf-2019.tar.xz mirror://gentoo/texlive-module-context-chromato-2019.tar.xz mirror://gentoo/texlive-module-context-cmscbf-2019.tar.xz mirror://gentoo/texlive-module-context-cmttbf-2019.tar.xz mirror://gentoo/texlive-module-context-construction-plan-2019.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers-2019.tar.xz mirror://gentoo/texlive-module-context-degrade-2019.tar.xz mirror://gentoo/texlive-module-context-fancybreak-2019.tar.xz mirror://gentoo/texlive-module-context-filter-2019.tar.xz mirror://gentoo/texlive-module-context-french-2019.tar.xz mirror://gentoo/texlive-module-context-fullpage-2019.tar.xz mirror://gentoo/texlive-module-context-gantt-2019.tar.xz mirror://gentoo/texlive-module-context-gnuplot-2019.tar.xz mirror://gentoo/texlive-module-context-handlecsv-2019.tar.xz mirror://gentoo/texlive-module-context-inifile-2019.tar.xz mirror://gentoo/texlive-module-context-layout-2019.tar.xz mirror://gentoo/texlive-module-context-letter-2019.tar.xz mirror://gentoo/texlive-module-context-lettrine-2019.tar.xz mirror://gentoo/texlive-module-context-mathsets-2019.tar.xz mirror://gentoo/texlive-module-context-rst-2019.tar.xz mirror://gentoo/texlive-module-context-ruby-2019.tar.xz mirror://gentoo/texlive-module-context-simplefonts-2019.tar.xz mirror://gentoo/texlive-module-context-simpleslides-2019.tar.xz mirror://gentoo/texlive-module-context-title-2019.tar.xz mirror://gentoo/texlive-module-context-transliterator-2019.tar.xz mirror://gentoo/texlive-module-context-typearea-2019.tar.xz mirror://gentoo/texlive-module-context-typescripts-2019.tar.xz mirror://gentoo/texlive-module-context-vim-2019.tar.xz mirror://gentoo/texlive-module-context-visualcounter-2019.tar.xz mirror://gentoo/texlive-module-collection-context-2019.tar.xz doc? ( mirror://gentoo/texlive-module-context.doc-2019.tar.xz mirror://gentoo/texlive-module-context-notes-zh-cn.doc-2019.tar.xz mirror://gentoo/texlive-module-npp-for-context.doc-2019.tar.xz mirror://gentoo/texlive-module-context-account.doc-2019.tar.xz mirror://gentoo/texlive-module-context-algorithmic.doc-2019.tar.xz mirror://gentoo/texlive-module-context-animation.doc-2019.tar.xz mirror://gentoo/texlive-module-context-annotation.doc-2019.tar.xz mirror://gentoo/texlive-module-context-bnf.doc-2019.tar.xz mirror://gentoo/texlive-module-context-chromato.doc-2019.tar.xz mirror://gentoo/texlive-module-context-cmscbf.doc-2019.tar.xz mirror://gentoo/texlive-module-context-cmttbf.doc-2019.tar.xz mirror://gentoo/texlive-module-context-construction-plan.doc-2019.tar.xz mirror://gentoo/texlive-module-context-cyrillicnumbers.doc-2019.tar.xz mirror://gentoo/texlive-module-context-degrade.doc-2019.tar.xz mirror://gentoo/texlive-module-context-fancybreak.doc-2019.tar.xz mirror://gentoo/texlive-module-context-filter.doc-2019.tar.xz mirror://gentoo/texlive-module-context-french.doc-2019.tar.xz mirror://gentoo/texlive-module-context-fullpage.doc-2019.tar.xz mirror://gentoo/texlive-module-context-gantt.doc-2019.tar.xz mirror://gentoo/texlive-module-context-gnuplot.doc-2019.tar.xz mirror://gentoo/texlive-module-context-handlecsv.doc-2019.tar.xz mirror://gentoo/texlive-module-context-inifile.doc-2019.tar.xz mirror://gentoo/texlive-module-context-layout.doc-2019.tar.xz mirror://gentoo/texlive-module-context-letter.doc-2019.tar.xz mirror://gentoo/texlive-module-context-lettrine.doc-2019.tar.xz mirror://gentoo/texlive-module-context-mathsets.doc-2019.tar.xz mirror://gentoo/texlive-module-context-rst.doc-2019.tar.xz mirror://gentoo/texlive-module-context-ruby.doc-2019.tar.xz mirror://gentoo/texlive-module-context-simplefonts.doc-2019.tar.xz mirror://gentoo/texlive-module-context-simpleslides.doc-2019.tar.xz mirror://gentoo/texlive-module-context-title.doc-2019.tar.xz mirror://gentoo/texlive-module-context-transliterator.doc-2019.tar.xz mirror://gentoo/texlive-module-context-typearea.doc-2019.tar.xz mirror://gentoo/texlive-module-context-typescripts.doc-2019.tar.xz mirror://gentoo/texlive-module-context-vim.doc-2019.tar.xz mirror://gentoo/texlive-module-context-visualcounter.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-context-visualcounter.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=fbad81fb1a2fa9e504c26acebc6b199f
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2019 b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2019
index f419183e0e2b..b06998ebd713 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsextra-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsextra-2019
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD GPL-1 GPL-2 GPL-3 LPPL-1.2 LPPL-1.3 MIT OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-latexextra-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-Asana-Math-2019.tar.xz mirror://gentoo/texlive-module-academicons-2019.tar.xz mirror://gentoo/texlive-module-accanthis-2019.tar.xz mirror://gentoo/texlive-module-adforn-2019.tar.xz mirror://gentoo/texlive-module-adfsymbols-2019.tar.xz mirror://gentoo/texlive-module-aecc-2019.tar.xz mirror://gentoo/texlive-module-alegreya-2019.tar.xz mirror://gentoo/texlive-module-algolrevived-2019.tar.xz mirror://gentoo/texlive-module-allrunes-2019.tar.xz mirror://gentoo/texlive-module-almendra-2019.tar.xz mirror://gentoo/texlive-module-almfixed-2019.tar.xz mirror://gentoo/texlive-module-anonymouspro-2019.tar.xz mirror://gentoo/texlive-module-antiqua-2019.tar.xz mirror://gentoo/texlive-module-antt-2019.tar.xz mirror://gentoo/texlive-module-archaic-2019.tar.xz mirror://gentoo/texlive-module-arev-2019.tar.xz mirror://gentoo/texlive-module-arimo-2019.tar.xz mirror://gentoo/texlive-module-asapsym-2019.tar.xz mirror://gentoo/texlive-module-ascii-font-2019.tar.xz mirror://gentoo/texlive-module-aspectratio-2019.tar.xz mirror://gentoo/texlive-module-astro-2019.tar.xz mirror://gentoo/texlive-module-augie-2019.tar.xz mirror://gentoo/texlive-module-auncial-new-2019.tar.xz mirror://gentoo/texlive-module-aurical-2019.tar.xz mirror://gentoo/texlive-module-b1encoding-2019.tar.xz mirror://gentoo/texlive-module-barcodes-2019.tar.xz mirror://gentoo/texlive-module-baskervald-2019.tar.xz mirror://gentoo/texlive-module-baskervaldx-2019.tar.xz mirror://gentoo/texlive-module-baskervillef-2019.tar.xz mirror://gentoo/texlive-module-bbding-2019.tar.xz mirror://gentoo/texlive-module-bbm-2019.tar.xz mirror://gentoo/texlive-module-bbm-macros-2019.tar.xz mirror://gentoo/texlive-module-bbold-2019.tar.xz mirror://gentoo/texlive-module-bbold-type1-2019.tar.xz mirror://gentoo/texlive-module-belleek-2019.tar.xz mirror://gentoo/texlive-module-bera-2019.tar.xz mirror://gentoo/texlive-module-berenisadf-2019.tar.xz mirror://gentoo/texlive-module-beuron-2019.tar.xz mirror://gentoo/texlive-module-bguq-2019.tar.xz mirror://gentoo/texlive-module-bitter-2019.tar.xz mirror://gentoo/texlive-module-blacklettert1-2019.tar.xz mirror://gentoo/texlive-module-boisik-2019.tar.xz mirror://gentoo/texlive-module-bookhands-2019.tar.xz mirror://gentoo/texlive-module-boondox-2019.tar.xz mirror://gentoo/texlive-module-braille-2019.tar.xz mirror://gentoo/texlive-module-brushscr-2019.tar.xz mirror://gentoo/texlive-module-cabin-2019.tar.xz mirror://gentoo/texlive-module-caladea-2019.tar.xz mirror://gentoo/texlive-module-calligra-2019.tar.xz mirror://gentoo/texlive-module-calligra-type1-2019.tar.xz mirror://gentoo/texlive-module-cantarell-2019.tar.xz mirror://gentoo/texlive-module-carlito-2019.tar.xz mirror://gentoo/texlive-module-carolmin-ps-2019.tar.xz mirror://gentoo/texlive-module-ccicons-2019.tar.xz mirror://gentoo/texlive-module-cfr-initials-2019.tar.xz mirror://gentoo/texlive-module-cfr-lm-2019.tar.xz mirror://gentoo/texlive-module-cherokee-2019.tar.xz mirror://gentoo/texlive-module-chivo-2019.tar.xz mirror://gentoo/texlive-module-cinzel-2019.tar.xz mirror://gentoo/texlive-module-clearsans-2019.tar.xz mirror://gentoo/texlive-module-cm-lgc-2019.tar.xz mirror://gentoo/texlive-module-cm-mf-extra-bold-2019.tar.xz mirror://gentoo/texlive-module-cm-unicode-2019.tar.xz mirror://gentoo/texlive-module-cmbright-2019.tar.xz mirror://gentoo/texlive-module-cmexb-2019.tar.xz mirror://gentoo/texlive-module-cmll-2019.tar.xz mirror://gentoo/texlive-module-cmpica-2019.tar.xz mirror://gentoo/texlive-module-cmsrb-2019.tar.xz mirror://gentoo/texlive-module-cmtiup-2019.tar.xz mirror://gentoo/texlive-module-cochineal-2019.tar.xz mirror://gentoo/texlive-module-coelacanth-2019.tar.xz mirror://gentoo/texlive-module-comfortaa-2019.tar.xz mirror://gentoo/texlive-module-comicneue-2019.tar.xz mirror://gentoo/texlive-module-concmath-fonts-2019.tar.xz mirror://gentoo/texlive-module-cookingsymbols-2019.tar.xz mirror://gentoo/texlive-module-cormorantgaramond-2019.tar.xz mirror://gentoo/texlive-module-countriesofeurope-2019.tar.xz mirror://gentoo/texlive-module-courier-scaled-2019.tar.xz mirror://gentoo/texlive-module-crimson-2019.tar.xz mirror://gentoo/texlive-module-crimsonpro-2019.tar.xz mirror://gentoo/texlive-module-cryst-2019.tar.xz mirror://gentoo/texlive-module-cuprum-2019.tar.xz mirror://gentoo/texlive-module-cyklop-2019.tar.xz mirror://gentoo/texlive-module-dancers-2019.tar.xz mirror://gentoo/texlive-module-dantelogo-2019.tar.xz mirror://gentoo/texlive-module-dejavu-2019.tar.xz mirror://gentoo/texlive-module-dejavu-otf-2019.tar.xz mirror://gentoo/texlive-module-dice-2019.tar.xz mirror://gentoo/texlive-module-dictsym-2019.tar.xz mirror://gentoo/texlive-module-dingbat-2019.tar.xz mirror://gentoo/texlive-module-doublestroke-2019.tar.xz mirror://gentoo/texlive-module-dozenal-2019.tar.xz mirror://gentoo/texlive-module-drm-2019.tar.xz mirror://gentoo/texlive-module-droid-2019.tar.xz mirror://gentoo/texlive-module-dsserif-2019.tar.xz mirror://gentoo/texlive-module-duerer-2019.tar.xz mirror://gentoo/texlive-module-duerer-latex-2019.tar.xz mirror://gentoo/texlive-module-dutchcal-2019.tar.xz mirror://gentoo/texlive-module-ean-2019.tar.xz mirror://gentoo/texlive-module-ebgaramond-2019.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths-2019.tar.xz mirror://gentoo/texlive-module-ecc-2019.tar.xz mirror://gentoo/texlive-module-eco-2019.tar.xz mirror://gentoo/texlive-module-eiad-2019.tar.xz mirror://gentoo/texlive-module-eiad-ltx-2019.tar.xz mirror://gentoo/texlive-module-electrum-2019.tar.xz mirror://gentoo/texlive-module-elvish-2019.tar.xz mirror://gentoo/texlive-module-epigrafica-2019.tar.xz mirror://gentoo/texlive-module-epsdice-2019.tar.xz mirror://gentoo/texlive-module-erewhon-2019.tar.xz mirror://gentoo/texlive-module-esrelation-2019.tar.xz mirror://gentoo/texlive-module-esstix-2019.tar.xz mirror://gentoo/texlive-module-esvect-2019.tar.xz mirror://gentoo/texlive-module-eulervm-2019.tar.xz mirror://gentoo/texlive-module-euxm-2019.tar.xz mirror://gentoo/texlive-module-fbb-2019.tar.xz mirror://gentoo/texlive-module-fdsymbol-2019.tar.xz mirror://gentoo/texlive-module-fetamont-2019.tar.xz mirror://gentoo/texlive-module-feyn-2019.tar.xz mirror://gentoo/texlive-module-fge-2019.tar.xz mirror://gentoo/texlive-module-fira-2019.tar.xz mirror://gentoo/texlive-module-firamath-2019.tar.xz mirror://gentoo/texlive-module-firamath-otf-2019.tar.xz mirror://gentoo/texlive-module-foekfont-2019.tar.xz mirror://gentoo/texlive-module-fonetika-2019.tar.xz mirror://gentoo/texlive-module-fontawesome-2019.tar.xz mirror://gentoo/texlive-module-fontawesome5-2019.tar.xz mirror://gentoo/texlive-module-fontmfizz-2019.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic-2019.tar.xz mirror://gentoo/texlive-module-fourier-2019.tar.xz mirror://gentoo/texlive-module-fouriernc-2019.tar.xz mirror://gentoo/texlive-module-frcursive-2019.tar.xz mirror://gentoo/texlive-module-frederika2016-2019.tar.xz mirror://gentoo/texlive-module-garamond-math-2019.tar.xz mirror://gentoo/texlive-module-genealogy-2019.tar.xz mirror://gentoo/texlive-module-gentium-tug-2019.tar.xz mirror://gentoo/texlive-module-gfsartemisia-2019.tar.xz mirror://gentoo/texlive-module-gfsbodoni-2019.tar.xz mirror://gentoo/texlive-module-gfscomplutum-2019.tar.xz mirror://gentoo/texlive-module-gfsdidot-2019.tar.xz mirror://gentoo/texlive-module-gfsneohellenic-2019.tar.xz mirror://gentoo/texlive-module-gfsneohellenicmath-2019.tar.xz mirror://gentoo/texlive-module-gfssolomos-2019.tar.xz mirror://gentoo/texlive-module-gillcm-2019.tar.xz mirror://gentoo/texlive-module-gillius-2019.tar.xz mirror://gentoo/texlive-module-gnu-freefont-2019.tar.xz mirror://gentoo/texlive-module-gofonts-2019.tar.xz mirror://gentoo/texlive-module-gothic-2019.tar.xz mirror://gentoo/texlive-module-greenpoint-2019.tar.xz mirror://gentoo/texlive-module-grotesq-2019.tar.xz mirror://gentoo/texlive-module-hacm-2019.tar.xz mirror://gentoo/texlive-module-hands-2019.tar.xz mirror://gentoo/texlive-module-heuristica-2019.tar.xz mirror://gentoo/texlive-module-hfbright-2019.tar.xz mirror://gentoo/texlive-module-hfoldsty-2019.tar.xz mirror://gentoo/texlive-module-ifsym-2019.tar.xz mirror://gentoo/texlive-module-imfellenglish-2019.tar.xz mirror://gentoo/texlive-module-inconsolata-2019.tar.xz mirror://gentoo/texlive-module-initials-2019.tar.xz mirror://gentoo/texlive-module-inriafonts-2019.tar.xz mirror://gentoo/texlive-module-ipaex-type1-2019.tar.xz mirror://gentoo/texlive-module-iwona-2019.tar.xz mirror://gentoo/texlive-module-jablantile-2019.tar.xz mirror://gentoo/texlive-module-jamtimes-2019.tar.xz mirror://gentoo/texlive-module-junicode-2019.tar.xz mirror://gentoo/texlive-module-kixfont-2019.tar.xz mirror://gentoo/texlive-module-kpfonts-2019.tar.xz mirror://gentoo/texlive-module-kurier-2019.tar.xz mirror://gentoo/texlive-module-lato-2019.tar.xz mirror://gentoo/texlive-module-lfb-2019.tar.xz mirror://gentoo/texlive-module-libertine-2019.tar.xz mirror://gentoo/texlive-module-libertinegc-2019.tar.xz mirror://gentoo/texlive-module-libertinus-2019.tar.xz mirror://gentoo/texlive-module-libertinus-fonts-2019.tar.xz mirror://gentoo/texlive-module-libertinus-otf-2019.tar.xz mirror://gentoo/texlive-module-libertinus-type1-2019.tar.xz mirror://gentoo/texlive-module-libertinust1math-2019.tar.xz mirror://gentoo/texlive-module-librebaskerville-2019.tar.xz mirror://gentoo/texlive-module-librebodoni-2019.tar.xz mirror://gentoo/texlive-module-librecaslon-2019.tar.xz mirror://gentoo/texlive-module-librefranklin-2019.tar.xz mirror://gentoo/texlive-module-libris-2019.tar.xz mirror://gentoo/texlive-module-linearA-2019.tar.xz mirror://gentoo/texlive-module-linguisticspro-2019.tar.xz mirror://gentoo/texlive-module-lobster2-2019.tar.xz mirror://gentoo/texlive-module-lxfonts-2019.tar.xz mirror://gentoo/texlive-module-ly1-2019.tar.xz mirror://gentoo/texlive-module-marcellus-2019.tar.xz mirror://gentoo/texlive-module-mathabx-2019.tar.xz mirror://gentoo/texlive-module-mathabx-type1-2019.tar.xz mirror://gentoo/texlive-module-mathdesign-2019.tar.xz mirror://gentoo/texlive-module-mdputu-2019.tar.xz mirror://gentoo/texlive-module-mdsymbol-2019.tar.xz mirror://gentoo/texlive-module-merriweather-2019.tar.xz mirror://gentoo/texlive-module-miama-2019.tar.xz mirror://gentoo/texlive-module-mintspirit-2019.tar.xz mirror://gentoo/texlive-module-missaali-2019.tar.xz mirror://gentoo/texlive-module-mnsymbol-2019.tar.xz mirror://gentoo/texlive-module-montserrat-2019.tar.xz mirror://gentoo/texlive-module-mweights-2019.tar.xz mirror://gentoo/texlive-module-newpx-2019.tar.xz mirror://gentoo/texlive-module-newtx-2019.tar.xz mirror://gentoo/texlive-module-newtxsf-2019.tar.xz mirror://gentoo/texlive-module-newtxtt-2019.tar.xz mirror://gentoo/texlive-module-niceframe-type1-2019.tar.xz mirror://gentoo/texlive-module-nimbus15-2019.tar.xz mirror://gentoo/texlive-module-nkarta-2019.tar.xz mirror://gentoo/texlive-module-noto-2019.tar.xz mirror://gentoo/texlive-module-obnov-2019.tar.xz mirror://gentoo/texlive-module-ocherokee-2019.tar.xz mirror://gentoo/texlive-module-ocr-b-2019.tar.xz mirror://gentoo/texlive-module-ocr-b-outline-2019.tar.xz mirror://gentoo/texlive-module-ogham-2019.tar.xz mirror://gentoo/texlive-module-oinuit-2019.tar.xz mirror://gentoo/texlive-module-old-arrows-2019.tar.xz mirror://gentoo/texlive-module-oldlatin-2019.tar.xz mirror://gentoo/texlive-module-oldstandard-2019.tar.xz mirror://gentoo/texlive-module-opensans-2019.tar.xz mirror://gentoo/texlive-module-orkhun-2019.tar.xz mirror://gentoo/texlive-module-overlock-2019.tar.xz mirror://gentoo/texlive-module-pacioli-2019.tar.xz mirror://gentoo/texlive-module-paratype-2019.tar.xz mirror://gentoo/texlive-module-phaistos-2019.tar.xz mirror://gentoo/texlive-module-phonetic-2019.tar.xz mirror://gentoo/texlive-module-pigpen-2019.tar.xz mirror://gentoo/texlive-module-playfair-2019.tar.xz mirror://gentoo/texlive-module-plex-2019.tar.xz mirror://gentoo/texlive-module-plex-otf-2019.tar.xz mirror://gentoo/texlive-module-poltawski-2019.tar.xz mirror://gentoo/texlive-module-prodint-2019.tar.xz mirror://gentoo/texlive-module-punk-2019.tar.xz mirror://gentoo/texlive-module-punk-latex-2019.tar.xz mirror://gentoo/texlive-module-punknova-2019.tar.xz mirror://gentoo/texlive-module-pxtxalfa-2019.tar.xz mirror://gentoo/texlive-module-quattrocento-2019.tar.xz mirror://gentoo/texlive-module-raleway-2019.tar.xz mirror://gentoo/texlive-module-recycle-2019.tar.xz mirror://gentoo/texlive-module-roboto-2019.tar.xz mirror://gentoo/texlive-module-romande-2019.tar.xz mirror://gentoo/texlive-module-rosario-2019.tar.xz mirror://gentoo/texlive-module-rsfso-2019.tar.xz mirror://gentoo/texlive-module-sansmathaccent-2019.tar.xz mirror://gentoo/texlive-module-sansmathfonts-2019.tar.xz mirror://gentoo/texlive-module-sauter-2019.tar.xz mirror://gentoo/texlive-module-sauterfonts-2019.tar.xz mirror://gentoo/texlive-module-schulschriften-2019.tar.xz mirror://gentoo/texlive-module-semaphor-2019.tar.xz mirror://gentoo/texlive-module-shobhika-2019.tar.xz mirror://gentoo/texlive-module-skull-2019.tar.xz mirror://gentoo/texlive-module-sourcecodepro-2019.tar.xz mirror://gentoo/texlive-module-sourcesanspro-2019.tar.xz mirror://gentoo/texlive-module-sourceserifpro-2019.tar.xz mirror://gentoo/texlive-module-starfont-2019.tar.xz mirror://gentoo/texlive-module-staves-2019.tar.xz mirror://gentoo/texlive-module-stickstoo-2019.tar.xz mirror://gentoo/texlive-module-stix-2019.tar.xz mirror://gentoo/texlive-module-stix2-otf-2019.tar.xz mirror://gentoo/texlive-module-stix2-type1-2019.tar.xz mirror://gentoo/texlive-module-superiors-2019.tar.xz mirror://gentoo/texlive-module-svrsymbols-2019.tar.xz mirror://gentoo/texlive-module-tapir-2019.tar.xz mirror://gentoo/texlive-module-tempora-2019.tar.xz mirror://gentoo/texlive-module-tengwarscript-2019.tar.xz mirror://gentoo/texlive-module-tfrupee-2019.tar.xz mirror://gentoo/texlive-module-tinos-2019.tar.xz mirror://gentoo/texlive-module-tpslifonts-2019.tar.xz mirror://gentoo/texlive-module-trajan-2019.tar.xz mirror://gentoo/texlive-module-txfontsb-2019.tar.xz mirror://gentoo/texlive-module-txuprcal-2019.tar.xz mirror://gentoo/texlive-module-typicons-2019.tar.xz mirror://gentoo/texlive-module-umtypewriter-2019.tar.xz mirror://gentoo/texlive-module-universa-2019.tar.xz mirror://gentoo/texlive-module-universalis-2019.tar.xz mirror://gentoo/texlive-module-uppunctlm-2019.tar.xz mirror://gentoo/texlive-module-urwchancal-2019.tar.xz mirror://gentoo/texlive-module-venturisadf-2019.tar.xz mirror://gentoo/texlive-module-wsuipa-2019.tar.xz mirror://gentoo/texlive-module-xcharter-2019.tar.xz mirror://gentoo/texlive-module-xits-2019.tar.xz mirror://gentoo/texlive-module-yfonts-2019.tar.xz mirror://gentoo/texlive-module-yfonts-t1-2019.tar.xz mirror://gentoo/texlive-module-yinit-otf-2019.tar.xz mirror://gentoo/texlive-module-zlmtt-2019.tar.xz mirror://gentoo/texlive-module-collection-fontsextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-Asana-Math.doc-2019.tar.xz mirror://gentoo/texlive-module-academicons.doc-2019.tar.xz mirror://gentoo/texlive-module-accanthis.doc-2019.tar.xz mirror://gentoo/texlive-module-adforn.doc-2019.tar.xz mirror://gentoo/texlive-module-adfsymbols.doc-2019.tar.xz mirror://gentoo/texlive-module-aecc.doc-2019.tar.xz mirror://gentoo/texlive-module-alegreya.doc-2019.tar.xz mirror://gentoo/texlive-module-algolrevived.doc-2019.tar.xz mirror://gentoo/texlive-module-allrunes.doc-2019.tar.xz mirror://gentoo/texlive-module-almendra.doc-2019.tar.xz mirror://gentoo/texlive-module-almfixed.doc-2019.tar.xz mirror://gentoo/texlive-module-anonymouspro.doc-2019.tar.xz mirror://gentoo/texlive-module-antiqua.doc-2019.tar.xz mirror://gentoo/texlive-module-antt.doc-2019.tar.xz mirror://gentoo/texlive-module-archaic.doc-2019.tar.xz mirror://gentoo/texlive-module-arev.doc-2019.tar.xz mirror://gentoo/texlive-module-arimo.doc-2019.tar.xz mirror://gentoo/texlive-module-asapsym.doc-2019.tar.xz mirror://gentoo/texlive-module-ascii-font.doc-2019.tar.xz mirror://gentoo/texlive-module-aspectratio.doc-2019.tar.xz mirror://gentoo/texlive-module-astro.doc-2019.tar.xz mirror://gentoo/texlive-module-augie.doc-2019.tar.xz mirror://gentoo/texlive-module-auncial-new.doc-2019.tar.xz mirror://gentoo/texlive-module-aurical.doc-2019.tar.xz mirror://gentoo/texlive-module-b1encoding.doc-2019.tar.xz mirror://gentoo/texlive-module-barcodes.doc-2019.tar.xz mirror://gentoo/texlive-module-baskervald.doc-2019.tar.xz mirror://gentoo/texlive-module-baskervaldx.doc-2019.tar.xz mirror://gentoo/texlive-module-baskervillef.doc-2019.tar.xz mirror://gentoo/texlive-module-bbding.doc-2019.tar.xz mirror://gentoo/texlive-module-bbm.doc-2019.tar.xz mirror://gentoo/texlive-module-bbm-macros.doc-2019.tar.xz mirror://gentoo/texlive-module-bbold.doc-2019.tar.xz mirror://gentoo/texlive-module-bbold-type1.doc-2019.tar.xz mirror://gentoo/texlive-module-belleek.doc-2019.tar.xz mirror://gentoo/texlive-module-bera.doc-2019.tar.xz mirror://gentoo/texlive-module-berenisadf.doc-2019.tar.xz mirror://gentoo/texlive-module-beuron.doc-2019.tar.xz mirror://gentoo/texlive-module-bguq.doc-2019.tar.xz mirror://gentoo/texlive-module-bitter.doc-2019.tar.xz mirror://gentoo/texlive-module-blacklettert1.doc-2019.tar.xz mirror://gentoo/texlive-module-boisik.doc-2019.tar.xz mirror://gentoo/texlive-module-bookhands.doc-2019.tar.xz mirror://gentoo/texlive-module-boondox.doc-2019.tar.xz mirror://gentoo/texlive-module-braille.doc-2019.tar.xz mirror://gentoo/texlive-module-brushscr.doc-2019.tar.xz mirror://gentoo/texlive-module-cabin.doc-2019.tar.xz mirror://gentoo/texlive-module-caladea.doc-2019.tar.xz mirror://gentoo/texlive-module-calligra.doc-2019.tar.xz mirror://gentoo/texlive-module-calligra-type1.doc-2019.tar.xz mirror://gentoo/texlive-module-cantarell.doc-2019.tar.xz mirror://gentoo/texlive-module-carlito.doc-2019.tar.xz mirror://gentoo/texlive-module-carolmin-ps.doc-2019.tar.xz mirror://gentoo/texlive-module-ccicons.doc-2019.tar.xz mirror://gentoo/texlive-module-cfr-initials.doc-2019.tar.xz mirror://gentoo/texlive-module-cfr-lm.doc-2019.tar.xz mirror://gentoo/texlive-module-cherokee.doc-2019.tar.xz mirror://gentoo/texlive-module-chivo.doc-2019.tar.xz mirror://gentoo/texlive-module-cinzel.doc-2019.tar.xz mirror://gentoo/texlive-module-clearsans.doc-2019.tar.xz mirror://gentoo/texlive-module-cm-lgc.doc-2019.tar.xz mirror://gentoo/texlive-module-cm-unicode.doc-2019.tar.xz mirror://gentoo/texlive-module-cmbright.doc-2019.tar.xz mirror://gentoo/texlive-module-cmexb.doc-2019.tar.xz mirror://gentoo/texlive-module-cmll.doc-2019.tar.xz mirror://gentoo/texlive-module-cmpica.doc-2019.tar.xz mirror://gentoo/texlive-module-cmsrb.doc-2019.tar.xz mirror://gentoo/texlive-module-cmtiup.doc-2019.tar.xz mirror://gentoo/texlive-module-cochineal.doc-2019.tar.xz mirror://gentoo/texlive-module-coelacanth.doc-2019.tar.xz mirror://gentoo/texlive-module-comfortaa.doc-2019.tar.xz mirror://gentoo/texlive-module-comicneue.doc-2019.tar.xz mirror://gentoo/texlive-module-concmath-fonts.doc-2019.tar.xz mirror://gentoo/texlive-module-cookingsymbols.doc-2019.tar.xz mirror://gentoo/texlive-module-cormorantgaramond.doc-2019.tar.xz mirror://gentoo/texlive-module-countriesofeurope.doc-2019.tar.xz mirror://gentoo/texlive-module-courier-scaled.doc-2019.tar.xz mirror://gentoo/texlive-module-crimson.doc-2019.tar.xz mirror://gentoo/texlive-module-crimsonpro.doc-2019.tar.xz mirror://gentoo/texlive-module-cryst.doc-2019.tar.xz mirror://gentoo/texlive-module-cuprum.doc-2019.tar.xz mirror://gentoo/texlive-module-cyklop.doc-2019.tar.xz mirror://gentoo/texlive-module-dantelogo.doc-2019.tar.xz mirror://gentoo/texlive-module-dejavu.doc-2019.tar.xz mirror://gentoo/texlive-module-dejavu-otf.doc-2019.tar.xz mirror://gentoo/texlive-module-dice.doc-2019.tar.xz mirror://gentoo/texlive-module-dictsym.doc-2019.tar.xz mirror://gentoo/texlive-module-dingbat.doc-2019.tar.xz mirror://gentoo/texlive-module-doublestroke.doc-2019.tar.xz mirror://gentoo/texlive-module-dozenal.doc-2019.tar.xz mirror://gentoo/texlive-module-drm.doc-2019.tar.xz mirror://gentoo/texlive-module-droid.doc-2019.tar.xz mirror://gentoo/texlive-module-dsserif.doc-2019.tar.xz mirror://gentoo/texlive-module-duerer.doc-2019.tar.xz mirror://gentoo/texlive-module-duerer-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-dutchcal.doc-2019.tar.xz mirror://gentoo/texlive-module-ean.doc-2019.tar.xz mirror://gentoo/texlive-module-ebgaramond.doc-2019.tar.xz mirror://gentoo/texlive-module-ebgaramond-maths.doc-2019.tar.xz mirror://gentoo/texlive-module-ecc.doc-2019.tar.xz mirror://gentoo/texlive-module-eco.doc-2019.tar.xz mirror://gentoo/texlive-module-eiad.doc-2019.tar.xz mirror://gentoo/texlive-module-eiad-ltx.doc-2019.tar.xz mirror://gentoo/texlive-module-electrum.doc-2019.tar.xz mirror://gentoo/texlive-module-elvish.doc-2019.tar.xz mirror://gentoo/texlive-module-epigrafica.doc-2019.tar.xz mirror://gentoo/texlive-module-epsdice.doc-2019.tar.xz mirror://gentoo/texlive-module-erewhon.doc-2019.tar.xz mirror://gentoo/texlive-module-esrelation.doc-2019.tar.xz mirror://gentoo/texlive-module-esstix.doc-2019.tar.xz mirror://gentoo/texlive-module-esvect.doc-2019.tar.xz mirror://gentoo/texlive-module-eulervm.doc-2019.tar.xz mirror://gentoo/texlive-module-fbb.doc-2019.tar.xz mirror://gentoo/texlive-module-fdsymbol.doc-2019.tar.xz mirror://gentoo/texlive-module-fetamont.doc-2019.tar.xz mirror://gentoo/texlive-module-feyn.doc-2019.tar.xz mirror://gentoo/texlive-module-fge.doc-2019.tar.xz mirror://gentoo/texlive-module-fira.doc-2019.tar.xz mirror://gentoo/texlive-module-firamath.doc-2019.tar.xz mirror://gentoo/texlive-module-firamath-otf.doc-2019.tar.xz mirror://gentoo/texlive-module-foekfont.doc-2019.tar.xz mirror://gentoo/texlive-module-fonetika.doc-2019.tar.xz mirror://gentoo/texlive-module-fontawesome.doc-2019.tar.xz mirror://gentoo/texlive-module-fontawesome5.doc-2019.tar.xz mirror://gentoo/texlive-module-fontmfizz.doc-2019.tar.xz mirror://gentoo/texlive-module-fonts-churchslavonic.doc-2019.tar.xz mirror://gentoo/texlive-module-fourier.doc-2019.tar.xz mirror://gentoo/texlive-module-fouriernc.doc-2019.tar.xz mirror://gentoo/texlive-module-frcursive.doc-2019.tar.xz mirror://gentoo/texlive-module-frederika2016.doc-2019.tar.xz mirror://gentoo/texlive-module-garamond-math.doc-2019.tar.xz mirror://gentoo/texlive-module-genealogy.doc-2019.tar.xz mirror://gentoo/texlive-module-gentium-tug.doc-2019.tar.xz mirror://gentoo/texlive-module-gfsartemisia.doc-2019.tar.xz mirror://gentoo/texlive-module-gfsbodoni.doc-2019.tar.xz mirror://gentoo/texlive-module-gfscomplutum.doc-2019.tar.xz mirror://gentoo/texlive-module-gfsdidot.doc-2019.tar.xz mirror://gentoo/texlive-module-gfsneohellenic.doc-2019.tar.xz mirror://gentoo/texlive-module-gfsneohellenicmath.doc-2019.tar.xz mirror://gentoo/texlive-module-gfssolomos.doc-2019.tar.xz mirror://gentoo/texlive-module-gillcm.doc-2019.tar.xz mirror://gentoo/texlive-module-gillius.doc-2019.tar.xz mirror://gentoo/texlive-module-gnu-freefont.doc-2019.tar.xz mirror://gentoo/texlive-module-gofonts.doc-2019.tar.xz mirror://gentoo/texlive-module-gothic.doc-2019.tar.xz mirror://gentoo/texlive-module-greenpoint.doc-2019.tar.xz mirror://gentoo/texlive-module-grotesq.doc-2019.tar.xz mirror://gentoo/texlive-module-hacm.doc-2019.tar.xz mirror://gentoo/texlive-module-heuristica.doc-2019.tar.xz mirror://gentoo/texlive-module-hfbright.doc-2019.tar.xz mirror://gentoo/texlive-module-hfoldsty.doc-2019.tar.xz mirror://gentoo/texlive-module-ifsym.doc-2019.tar.xz mirror://gentoo/texlive-module-imfellenglish.doc-2019.tar.xz mirror://gentoo/texlive-module-inconsolata.doc-2019.tar.xz mirror://gentoo/texlive-module-initials.doc-2019.tar.xz mirror://gentoo/texlive-module-inriafonts.doc-2019.tar.xz mirror://gentoo/texlive-module-ipaex-type1.doc-2019.tar.xz mirror://gentoo/texlive-module-iwona.doc-2019.tar.xz mirror://gentoo/texlive-module-jablantile.doc-2019.tar.xz mirror://gentoo/texlive-module-jamtimes.doc-2019.tar.xz mirror://gentoo/texlive-module-junicode.doc-2019.tar.xz mirror://gentoo/texlive-module-kixfont.doc-2019.tar.xz mirror://gentoo/texlive-module-kpfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-kurier.doc-2019.tar.xz mirror://gentoo/texlive-module-lato.doc-2019.tar.xz mirror://gentoo/texlive-module-lfb.doc-2019.tar.xz mirror://gentoo/texlive-module-libertine.doc-2019.tar.xz mirror://gentoo/texlive-module-libertinegc.doc-2019.tar.xz mirror://gentoo/texlive-module-libertinus.doc-2019.tar.xz mirror://gentoo/texlive-module-libertinus-fonts.doc-2019.tar.xz mirror://gentoo/texlive-module-libertinus-otf.doc-2019.tar.xz mirror://gentoo/texlive-module-libertinus-type1.doc-2019.tar.xz mirror://gentoo/texlive-module-libertinust1math.doc-2019.tar.xz mirror://gentoo/texlive-module-librebaskerville.doc-2019.tar.xz mirror://gentoo/texlive-module-librebodoni.doc-2019.tar.xz mirror://gentoo/texlive-module-librecaslon.doc-2019.tar.xz mirror://gentoo/texlive-module-librefranklin.doc-2019.tar.xz mirror://gentoo/texlive-module-libris.doc-2019.tar.xz mirror://gentoo/texlive-module-linearA.doc-2019.tar.xz mirror://gentoo/texlive-module-linguisticspro.doc-2019.tar.xz mirror://gentoo/texlive-module-lobster2.doc-2019.tar.xz mirror://gentoo/texlive-module-lxfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-ly1.doc-2019.tar.xz mirror://gentoo/texlive-module-marcellus.doc-2019.tar.xz mirror://gentoo/texlive-module-mathabx.doc-2019.tar.xz mirror://gentoo/texlive-module-mathabx-type1.doc-2019.tar.xz mirror://gentoo/texlive-module-mathdesign.doc-2019.tar.xz mirror://gentoo/texlive-module-mdputu.doc-2019.tar.xz mirror://gentoo/texlive-module-mdsymbol.doc-2019.tar.xz mirror://gentoo/texlive-module-merriweather.doc-2019.tar.xz mirror://gentoo/texlive-module-miama.doc-2019.tar.xz mirror://gentoo/texlive-module-mintspirit.doc-2019.tar.xz mirror://gentoo/texlive-module-missaali.doc-2019.tar.xz mirror://gentoo/texlive-module-mnsymbol.doc-2019.tar.xz mirror://gentoo/texlive-module-montserrat.doc-2019.tar.xz mirror://gentoo/texlive-module-mweights.doc-2019.tar.xz mirror://gentoo/texlive-module-newpx.doc-2019.tar.xz mirror://gentoo/texlive-module-newtx.doc-2019.tar.xz mirror://gentoo/texlive-module-newtxsf.doc-2019.tar.xz mirror://gentoo/texlive-module-newtxtt.doc-2019.tar.xz mirror://gentoo/texlive-module-niceframe-type1.doc-2019.tar.xz mirror://gentoo/texlive-module-nimbus15.doc-2019.tar.xz mirror://gentoo/texlive-module-nkarta.doc-2019.tar.xz mirror://gentoo/texlive-module-noto.doc-2019.tar.xz mirror://gentoo/texlive-module-obnov.doc-2019.tar.xz mirror://gentoo/texlive-module-ocherokee.doc-2019.tar.xz mirror://gentoo/texlive-module-ocr-b.doc-2019.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.doc-2019.tar.xz mirror://gentoo/texlive-module-ogham.doc-2019.tar.xz mirror://gentoo/texlive-module-oinuit.doc-2019.tar.xz mirror://gentoo/texlive-module-old-arrows.doc-2019.tar.xz mirror://gentoo/texlive-module-oldlatin.doc-2019.tar.xz mirror://gentoo/texlive-module-oldstandard.doc-2019.tar.xz mirror://gentoo/texlive-module-opensans.doc-2019.tar.xz mirror://gentoo/texlive-module-orkhun.doc-2019.tar.xz mirror://gentoo/texlive-module-overlock.doc-2019.tar.xz mirror://gentoo/texlive-module-pacioli.doc-2019.tar.xz mirror://gentoo/texlive-module-paratype.doc-2019.tar.xz mirror://gentoo/texlive-module-phaistos.doc-2019.tar.xz mirror://gentoo/texlive-module-phonetic.doc-2019.tar.xz mirror://gentoo/texlive-module-pigpen.doc-2019.tar.xz mirror://gentoo/texlive-module-playfair.doc-2019.tar.xz mirror://gentoo/texlive-module-plex.doc-2019.tar.xz mirror://gentoo/texlive-module-plex-otf.doc-2019.tar.xz mirror://gentoo/texlive-module-poltawski.doc-2019.tar.xz mirror://gentoo/texlive-module-prodint.doc-2019.tar.xz mirror://gentoo/texlive-module-punk.doc-2019.tar.xz mirror://gentoo/texlive-module-punk-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-punknova.doc-2019.tar.xz mirror://gentoo/texlive-module-pxtxalfa.doc-2019.tar.xz mirror://gentoo/texlive-module-quattrocento.doc-2019.tar.xz mirror://gentoo/texlive-module-raleway.doc-2019.tar.xz mirror://gentoo/texlive-module-recycle.doc-2019.tar.xz mirror://gentoo/texlive-module-roboto.doc-2019.tar.xz mirror://gentoo/texlive-module-romande.doc-2019.tar.xz mirror://gentoo/texlive-module-rosario.doc-2019.tar.xz mirror://gentoo/texlive-module-rsfso.doc-2019.tar.xz mirror://gentoo/texlive-module-sansmathaccent.doc-2019.tar.xz mirror://gentoo/texlive-module-sansmathfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-sauterfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-schulschriften.doc-2019.tar.xz mirror://gentoo/texlive-module-semaphor.doc-2019.tar.xz mirror://gentoo/texlive-module-shobhika.doc-2019.tar.xz mirror://gentoo/texlive-module-sourcecodepro.doc-2019.tar.xz mirror://gentoo/texlive-module-sourcesanspro.doc-2019.tar.xz mirror://gentoo/texlive-module-sourceserifpro.doc-2019.tar.xz mirror://gentoo/texlive-module-starfont.doc-2019.tar.xz mirror://gentoo/texlive-module-staves.doc-2019.tar.xz mirror://gentoo/texlive-module-stickstoo.doc-2019.tar.xz mirror://gentoo/texlive-module-stix.doc-2019.tar.xz mirror://gentoo/texlive-module-stix2-otf.doc-2019.tar.xz mirror://gentoo/texlive-module-stix2-type1.doc-2019.tar.xz mirror://gentoo/texlive-module-superiors.doc-2019.tar.xz mirror://gentoo/texlive-module-svrsymbols.doc-2019.tar.xz mirror://gentoo/texlive-module-tapir.doc-2019.tar.xz mirror://gentoo/texlive-module-tempora.doc-2019.tar.xz mirror://gentoo/texlive-module-tengwarscript.doc-2019.tar.xz mirror://gentoo/texlive-module-tfrupee.doc-2019.tar.xz mirror://gentoo/texlive-module-tinos.doc-2019.tar.xz mirror://gentoo/texlive-module-tpslifonts.doc-2019.tar.xz mirror://gentoo/texlive-module-trajan.doc-2019.tar.xz mirror://gentoo/texlive-module-txfontsb.doc-2019.tar.xz mirror://gentoo/texlive-module-txuprcal.doc-2019.tar.xz mirror://gentoo/texlive-module-typicons.doc-2019.tar.xz mirror://gentoo/texlive-module-universa.doc-2019.tar.xz mirror://gentoo/texlive-module-universalis.doc-2019.tar.xz mirror://gentoo/texlive-module-uppunctlm.doc-2019.tar.xz mirror://gentoo/texlive-module-urwchancal.doc-2019.tar.xz mirror://gentoo/texlive-module-venturisadf.doc-2019.tar.xz mirror://gentoo/texlive-module-wsuipa.doc-2019.tar.xz mirror://gentoo/texlive-module-xcharter.doc-2019.tar.xz mirror://gentoo/texlive-module-xits.doc-2019.tar.xz mirror://gentoo/texlive-module-yfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-yfonts-t1.doc-2019.tar.xz mirror://gentoo/texlive-module-yinit-otf.doc-2019.tar.xz mirror://gentoo/texlive-module-zlmtt.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-allrunes.source-2019.tar.xz mirror://gentoo/texlive-module-anonymouspro.source-2019.tar.xz mirror://gentoo/texlive-module-archaic.source-2019.tar.xz mirror://gentoo/texlive-module-arev.source-2019.tar.xz mirror://gentoo/texlive-module-asapsym.source-2019.tar.xz mirror://gentoo/texlive-module-ascii-font.source-2019.tar.xz mirror://gentoo/texlive-module-auncial-new.source-2019.tar.xz mirror://gentoo/texlive-module-b1encoding.source-2019.tar.xz mirror://gentoo/texlive-module-barcodes.source-2019.tar.xz mirror://gentoo/texlive-module-baskervald.source-2019.tar.xz mirror://gentoo/texlive-module-bbding.source-2019.tar.xz mirror://gentoo/texlive-module-bbm-macros.source-2019.tar.xz mirror://gentoo/texlive-module-bbold.source-2019.tar.xz mirror://gentoo/texlive-module-belleek.source-2019.tar.xz mirror://gentoo/texlive-module-bguq.source-2019.tar.xz mirror://gentoo/texlive-module-blacklettert1.source-2019.tar.xz mirror://gentoo/texlive-module-bookhands.source-2019.tar.xz mirror://gentoo/texlive-module-cantarell.source-2019.tar.xz mirror://gentoo/texlive-module-ccicons.source-2019.tar.xz mirror://gentoo/texlive-module-cfr-lm.source-2019.tar.xz mirror://gentoo/texlive-module-chivo.source-2019.tar.xz mirror://gentoo/texlive-module-cmbright.source-2019.tar.xz mirror://gentoo/texlive-module-cmll.source-2019.tar.xz mirror://gentoo/texlive-module-comfortaa.source-2019.tar.xz mirror://gentoo/texlive-module-cookingsymbols.source-2019.tar.xz mirror://gentoo/texlive-module-dingbat.source-2019.tar.xz mirror://gentoo/texlive-module-dozenal.source-2019.tar.xz mirror://gentoo/texlive-module-drm.source-2019.tar.xz mirror://gentoo/texlive-module-droid.source-2019.tar.xz mirror://gentoo/texlive-module-dsserif.source-2019.tar.xz mirror://gentoo/texlive-module-eco.source-2019.tar.xz mirror://gentoo/texlive-module-eiad-ltx.source-2019.tar.xz mirror://gentoo/texlive-module-electrum.source-2019.tar.xz mirror://gentoo/texlive-module-epsdice.source-2019.tar.xz mirror://gentoo/texlive-module-esrelation.source-2019.tar.xz mirror://gentoo/texlive-module-esvect.source-2019.tar.xz mirror://gentoo/texlive-module-eulervm.source-2019.tar.xz mirror://gentoo/texlive-module-fdsymbol.source-2019.tar.xz mirror://gentoo/texlive-module-fetamont.source-2019.tar.xz mirror://gentoo/texlive-module-feyn.source-2019.tar.xz mirror://gentoo/texlive-module-fge.source-2019.tar.xz mirror://gentoo/texlive-module-fourier.source-2019.tar.xz mirror://gentoo/texlive-module-gentium-tug.source-2019.tar.xz mirror://gentoo/texlive-module-gnu-freefont.source-2019.tar.xz mirror://gentoo/texlive-module-gothic.source-2019.tar.xz mirror://gentoo/texlive-module-hfoldsty.source-2019.tar.xz mirror://gentoo/texlive-module-kpfonts.source-2019.tar.xz mirror://gentoo/texlive-module-libris.source-2019.tar.xz mirror://gentoo/texlive-module-linearA.source-2019.tar.xz mirror://gentoo/texlive-module-lxfonts.source-2019.tar.xz mirror://gentoo/texlive-module-mdsymbol.source-2019.tar.xz mirror://gentoo/texlive-module-miama.source-2019.tar.xz mirror://gentoo/texlive-module-mnsymbol.source-2019.tar.xz mirror://gentoo/texlive-module-nkarta.source-2019.tar.xz mirror://gentoo/texlive-module-ocr-b-outline.source-2019.tar.xz mirror://gentoo/texlive-module-oinuit.source-2019.tar.xz mirror://gentoo/texlive-module-opensans.source-2019.tar.xz mirror://gentoo/texlive-module-pacioli.source-2019.tar.xz mirror://gentoo/texlive-module-phaistos.source-2019.tar.xz mirror://gentoo/texlive-module-romande.source-2019.tar.xz mirror://gentoo/texlive-module-rosario.source-2019.tar.xz mirror://gentoo/texlive-module-sauterfonts.source-2019.tar.xz mirror://gentoo/texlive-module-skull.source-2019.tar.xz mirror://gentoo/texlive-module-staves.source-2019.tar.xz mirror://gentoo/texlive-module-stix.source-2019.tar.xz mirror://gentoo/texlive-module-stix2-type1.source-2019.tar.xz mirror://gentoo/texlive-module-svrsymbols.source-2019.tar.xz mirror://gentoo/texlive-module-tengwarscript.source-2019.tar.xz mirror://gentoo/texlive-module-tfrupee.source-2019.tar.xz mirror://gentoo/texlive-module-tpslifonts.source-2019.tar.xz mirror://gentoo/texlive-module-trajan.source-2019.tar.xz mirror://gentoo/texlive-module-txfontsb.source-2019.tar.xz mirror://gentoo/texlive-module-universa.source-2019.tar.xz mirror://gentoo/texlive-module-venturisadf.source-2019.tar.xz mirror://gentoo/texlive-module-yfonts.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=ad4c688db7f827f6ca5dc68510f3a5d2
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2019 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2019
index 6e79d9a83d20..1377e5dd481b 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2019
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-latexrecommended-2014 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-avantgar-2019.tar.xz mirror://gentoo/texlive-module-bookman-2019.tar.xz mirror://gentoo/texlive-module-charter-2019.tar.xz mirror://gentoo/texlive-module-cm-super-2019.tar.xz mirror://gentoo/texlive-module-cmextra-2019.tar.xz mirror://gentoo/texlive-module-courier-2019.tar.xz mirror://gentoo/texlive-module-ec-2019.tar.xz mirror://gentoo/texlive-module-euro-2019.tar.xz mirror://gentoo/texlive-module-euro-ce-2019.tar.xz mirror://gentoo/texlive-module-eurosym-2019.tar.xz mirror://gentoo/texlive-module-fpl-2019.tar.xz mirror://gentoo/texlive-module-helvetic-2019.tar.xz mirror://gentoo/texlive-module-lm-2019.tar.xz mirror://gentoo/texlive-module-lm-math-2019.tar.xz mirror://gentoo/texlive-module-marvosym-2019.tar.xz mirror://gentoo/texlive-module-mathpazo-2019.tar.xz mirror://gentoo/texlive-module-manfnt-font-2019.tar.xz mirror://gentoo/texlive-module-mflogo-font-2019.tar.xz mirror://gentoo/texlive-module-ncntrsbk-2019.tar.xz mirror://gentoo/texlive-module-palatino-2019.tar.xz mirror://gentoo/texlive-module-pxfonts-2019.tar.xz mirror://gentoo/texlive-module-rsfs-2019.tar.xz mirror://gentoo/texlive-module-symbol-2019.tar.xz mirror://gentoo/texlive-module-tex-gyre-2019.tar.xz mirror://gentoo/texlive-module-tex-gyre-math-2019.tar.xz mirror://gentoo/texlive-module-times-2019.tar.xz mirror://gentoo/texlive-module-tipa-2019.tar.xz mirror://gentoo/texlive-module-txfonts-2019.tar.xz mirror://gentoo/texlive-module-utopia-2019.tar.xz mirror://gentoo/texlive-module-wasy-2019.tar.xz mirror://gentoo/texlive-module-wasy2-ps-2019.tar.xz mirror://gentoo/texlive-module-wasysym-2019.tar.xz mirror://gentoo/texlive-module-zapfchan-2019.tar.xz mirror://gentoo/texlive-module-zapfding-2019.tar.xz mirror://gentoo/texlive-module-collection-fontsrecommended-2019.tar.xz doc? ( mirror://gentoo/texlive-module-charter.doc-2019.tar.xz mirror://gentoo/texlive-module-cm-super.doc-2019.tar.xz mirror://gentoo/texlive-module-ec.doc-2019.tar.xz mirror://gentoo/texlive-module-euro.doc-2019.tar.xz mirror://gentoo/texlive-module-euro-ce.doc-2019.tar.xz mirror://gentoo/texlive-module-eurosym.doc-2019.tar.xz mirror://gentoo/texlive-module-fpl.doc-2019.tar.xz mirror://gentoo/texlive-module-lm.doc-2019.tar.xz mirror://gentoo/texlive-module-lm-math.doc-2019.tar.xz mirror://gentoo/texlive-module-marvosym.doc-2019.tar.xz mirror://gentoo/texlive-module-mathpazo.doc-2019.tar.xz mirror://gentoo/texlive-module-mflogo-font.doc-2019.tar.xz mirror://gentoo/texlive-module-pxfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-rsfs.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-gyre.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.doc-2019.tar.xz mirror://gentoo/texlive-module-tipa.doc-2019.tar.xz mirror://gentoo/texlive-module-txfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-utopia.doc-2019.tar.xz mirror://gentoo/texlive-module-wasy.doc-2019.tar.xz mirror://gentoo/texlive-module-wasy2-ps.doc-2019.tar.xz mirror://gentoo/texlive-module-wasysym.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-euro.source-2019.tar.xz mirror://gentoo/texlive-module-fpl.source-2019.tar.xz mirror://gentoo/texlive-module-lm.source-2019.tar.xz mirror://gentoo/texlive-module-marvosym.source-2019.tar.xz mirror://gentoo/texlive-module-mathpazo.source-2019.tar.xz mirror://gentoo/texlive-module-tex-gyre.source-2019.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.source-2019.tar.xz mirror://gentoo/texlive-module-wasysym.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=38f4bc58d6b4bef5ff7d25459bb5cc9f
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontutils-2019 b/metadata/md5-cache/dev-texlive/texlive-fontutils-2019
index 59a0520c1f8b..0bdaf9af1fb5 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontutils-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-fontutils-2019
@@ -10,5 +10,5 @@ LICENSE=Artistic GPL-1 GPL-2 LPPL-1.3 public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<app-text/texlive-core-2013 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-accfonts-2019.tar.xz mirror://gentoo/texlive-module-afm2pl-2019.tar.xz mirror://gentoo/texlive-module-dosepsbin-2019.tar.xz mirror://gentoo/texlive-module-epstopdf-2019.tar.xz mirror://gentoo/texlive-module-fontware-2019.tar.xz mirror://gentoo/texlive-module-lcdftypetools-2019.tar.xz mirror://gentoo/texlive-module-metatype1-2019.tar.xz mirror://gentoo/texlive-module-ps2pk-2019.tar.xz mirror://gentoo/texlive-module-pstools-2019.tar.xz mirror://gentoo/texlive-module-psutils-2019.tar.xz mirror://gentoo/texlive-module-dvipsconfig-2019.tar.xz mirror://gentoo/texlive-module-fontinst-2019.tar.xz mirror://gentoo/texlive-module-fontools-2019.tar.xz mirror://gentoo/texlive-module-mf2pt1-2019.tar.xz mirror://gentoo/texlive-module-t1utils-2019.tar.xz mirror://gentoo/texlive-module-collection-fontutils-2019.tar.xz doc? ( mirror://gentoo/texlive-module-accfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-afm2pl.doc-2019.tar.xz mirror://gentoo/texlive-module-dosepsbin.doc-2019.tar.xz mirror://gentoo/texlive-module-epstopdf.doc-2019.tar.xz mirror://gentoo/texlive-module-fontware.doc-2019.tar.xz mirror://gentoo/texlive-module-lcdftypetools.doc-2019.tar.xz mirror://gentoo/texlive-module-ps2pk.doc-2019.tar.xz mirror://gentoo/texlive-module-pstools.doc-2019.tar.xz mirror://gentoo/texlive-module-psutils.doc-2019.tar.xz mirror://gentoo/texlive-module-fontinst.doc-2019.tar.xz mirror://gentoo/texlive-module-fontools.doc-2019.tar.xz mirror://gentoo/texlive-module-mf2pt1.doc-2019.tar.xz mirror://gentoo/texlive-module-t1utils.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-dosepsbin.source-2019.tar.xz mirror://gentoo/texlive-module-metatype1.source-2019.tar.xz mirror://gentoo/texlive-module-fontinst.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=cc0a0a0f26ea7a1ac41d63e8328820af
diff --git a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2019 b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2019
index 38184b9f455d..f068057ea2cd 100644
--- a/metadata/md5-cache/dev-texlive/texlive-formatsextra-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-formatsextra-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 public-domain TeX
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-latex-2019 dev-texlive/texlive-xetex !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2014 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-edmac-2019.tar.xz mirror://gentoo/texlive-module-eplain-2019.tar.xz mirror://gentoo/texlive-module-lollipop-2019.tar.xz mirror://gentoo/texlive-module-mltex-2019.tar.xz mirror://gentoo/texlive-module-psizzl-2019.tar.xz mirror://gentoo/texlive-module-startex-2019.tar.xz mirror://gentoo/texlive-module-texsis-2019.tar.xz mirror://gentoo/texlive-module-xmltexconfig-2019.tar.xz mirror://gentoo/texlive-module-aleph-2019.tar.xz mirror://gentoo/texlive-module-antomega-2019.tar.xz mirror://gentoo/texlive-module-lambda-2019.tar.xz mirror://gentoo/texlive-module-mxedruli-2019.tar.xz mirror://gentoo/texlive-module-omega-2019.tar.xz mirror://gentoo/texlive-module-omegaware-2019.tar.xz mirror://gentoo/texlive-module-otibet-2019.tar.xz mirror://gentoo/texlive-module-collection-formatsextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-edmac.doc-2019.tar.xz mirror://gentoo/texlive-module-eplain.doc-2019.tar.xz mirror://gentoo/texlive-module-lollipop.doc-2019.tar.xz mirror://gentoo/texlive-module-mltex.doc-2019.tar.xz mirror://gentoo/texlive-module-psizzl.doc-2019.tar.xz mirror://gentoo/texlive-module-startex.doc-2019.tar.xz mirror://gentoo/texlive-module-texsis.doc-2019.tar.xz mirror://gentoo/texlive-module-aleph.doc-2019.tar.xz mirror://gentoo/texlive-module-antomega.doc-2019.tar.xz mirror://gentoo/texlive-module-mxedruli.doc-2019.tar.xz mirror://gentoo/texlive-module-omega.doc-2019.tar.xz mirror://gentoo/texlive-module-omegaware.doc-2019.tar.xz mirror://gentoo/texlive-module-otibet.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-edmac.source-2019.tar.xz mirror://gentoo/texlive-module-eplain.source-2019.tar.xz mirror://gentoo/texlive-module-psizzl.source-2019.tar.xz mirror://gentoo/texlive-module-startex.source-2019.tar.xz mirror://gentoo/texlive-module-antomega.source-2019.tar.xz mirror://gentoo/texlive-module-otibet.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=0f3eb272d39f2379b936b8b65d869c93
diff --git a/metadata/md5-cache/dev-texlive/texlive-games-2019 b/metadata/md5-cache/dev-texlive/texlive-games-2019
index 06bd3528091b..f548383091ff 100644
--- a/metadata/md5-cache/dev-texlive/texlive-games-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-games-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2019 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-bartel-chess-fonts-2019.tar.xz mirror://gentoo/texlive-module-chess-2019.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams-2019.tar.xz mirror://gentoo/texlive-module-chessboard-2019.tar.xz mirror://gentoo/texlive-module-chessfss-2019.tar.xz mirror://gentoo/texlive-module-crossword-2019.tar.xz mirror://gentoo/texlive-module-crosswrd-2019.tar.xz mirror://gentoo/texlive-module-egameps-2019.tar.xz mirror://gentoo/texlive-module-gamebook-2019.tar.xz mirror://gentoo/texlive-module-go-2019.tar.xz mirror://gentoo/texlive-module-hanoi-2019.tar.xz mirror://gentoo/texlive-module-havannah-2019.tar.xz mirror://gentoo/texlive-module-hexgame-2019.tar.xz mirror://gentoo/texlive-module-hmtrump-2019.tar.xz mirror://gentoo/texlive-module-horoscop-2019.tar.xz mirror://gentoo/texlive-module-jigsaw-2019.tar.xz mirror://gentoo/texlive-module-labyrinth-2019.tar.xz mirror://gentoo/texlive-module-logicpuzzle-2019.tar.xz mirror://gentoo/texlive-module-musikui-2019.tar.xz mirror://gentoo/texlive-module-onedown-2019.tar.xz mirror://gentoo/texlive-module-othello-2019.tar.xz mirror://gentoo/texlive-module-othelloboard-2019.tar.xz mirror://gentoo/texlive-module-pas-crosswords-2019.tar.xz mirror://gentoo/texlive-module-psgo-2019.tar.xz mirror://gentoo/texlive-module-reverxii-2019.tar.xz mirror://gentoo/texlive-module-rubik-2019.tar.xz mirror://gentoo/texlive-module-schwalbe-chess-2019.tar.xz mirror://gentoo/texlive-module-sgame-2019.tar.xz mirror://gentoo/texlive-module-skak-2019.tar.xz mirror://gentoo/texlive-module-skaknew-2019.tar.xz mirror://gentoo/texlive-module-soup-2019.tar.xz mirror://gentoo/texlive-module-sudoku-2019.tar.xz mirror://gentoo/texlive-module-sudokubundle-2019.tar.xz mirror://gentoo/texlive-module-xq-2019.tar.xz mirror://gentoo/texlive-module-xskak-2019.tar.xz mirror://gentoo/texlive-module-collection-games-2019.tar.xz doc? ( mirror://gentoo/texlive-module-bartel-chess-fonts.doc-2019.tar.xz mirror://gentoo/texlive-module-chess.doc-2019.tar.xz mirror://gentoo/texlive-module-chess-problem-diagrams.doc-2019.tar.xz mirror://gentoo/texlive-module-chessboard.doc-2019.tar.xz mirror://gentoo/texlive-module-chessfss.doc-2019.tar.xz mirror://gentoo/texlive-module-crossword.doc-2019.tar.xz mirror://gentoo/texlive-module-crosswrd.doc-2019.tar.xz mirror://gentoo/texlive-module-egameps.doc-2019.tar.xz mirror://gentoo/texlive-module-gamebook.doc-2019.tar.xz mirror://gentoo/texlive-module-go.doc-2019.tar.xz mirror://gentoo/texlive-module-havannah.doc-2019.tar.xz mirror://gentoo/texlive-module-hexgame.doc-2019.tar.xz mirror://gentoo/texlive-module-hmtrump.doc-2019.tar.xz mirror://gentoo/texlive-module-horoscop.doc-2019.tar.xz mirror://gentoo/texlive-module-jigsaw.doc-2019.tar.xz mirror://gentoo/texlive-module-labyrinth.doc-2019.tar.xz mirror://gentoo/texlive-module-logicpuzzle.doc-2019.tar.xz mirror://gentoo/texlive-module-musikui.doc-2019.tar.xz mirror://gentoo/texlive-module-onedown.doc-2019.tar.xz mirror://gentoo/texlive-module-othello.doc-2019.tar.xz mirror://gentoo/texlive-module-othelloboard.doc-2019.tar.xz mirror://gentoo/texlive-module-pas-crosswords.doc-2019.tar.xz mirror://gentoo/texlive-module-psgo.doc-2019.tar.xz mirror://gentoo/texlive-module-reverxii.doc-2019.tar.xz mirror://gentoo/texlive-module-rubik.doc-2019.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.doc-2019.tar.xz mirror://gentoo/texlive-module-sgame.doc-2019.tar.xz mirror://gentoo/texlive-module-skak.doc-2019.tar.xz mirror://gentoo/texlive-module-skaknew.doc-2019.tar.xz mirror://gentoo/texlive-module-soup.doc-2019.tar.xz mirror://gentoo/texlive-module-sudoku.doc-2019.tar.xz mirror://gentoo/texlive-module-sudokubundle.doc-2019.tar.xz mirror://gentoo/texlive-module-xq.doc-2019.tar.xz mirror://gentoo/texlive-module-xskak.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-chess-problem-diagrams.source-2019.tar.xz mirror://gentoo/texlive-module-chessboard.source-2019.tar.xz mirror://gentoo/texlive-module-chessfss.source-2019.tar.xz mirror://gentoo/texlive-module-crossword.source-2019.tar.xz mirror://gentoo/texlive-module-crosswrd.source-2019.tar.xz mirror://gentoo/texlive-module-gamebook.source-2019.tar.xz mirror://gentoo/texlive-module-go.source-2019.tar.xz mirror://gentoo/texlive-module-havannah.source-2019.tar.xz mirror://gentoo/texlive-module-horoscop.source-2019.tar.xz mirror://gentoo/texlive-module-onedown.source-2019.tar.xz mirror://gentoo/texlive-module-rubik.source-2019.tar.xz mirror://gentoo/texlive-module-schwalbe-chess.source-2019.tar.xz mirror://gentoo/texlive-module-soup.source-2019.tar.xz mirror://gentoo/texlive-module-sudoku.source-2019.tar.xz mirror://gentoo/texlive-module-sudokubundle.source-2019.tar.xz mirror://gentoo/texlive-module-xskak.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=16688aff9586b417922ed5ed04a01745
diff --git a/metadata/md5-cache/dev-texlive/texlive-humanities-2019 b/metadata/md5-cache/dev-texlive/texlive-humanities-2019
index 7168100dc4ac..6ba567f472ee 100644
--- a/metadata/md5-cache/dev-texlive/texlive-humanities-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-humanities-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c
 RDEPEND=>=dev-texlive/texlive-latex-2019 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adtrees-2019.tar.xz mirror://gentoo/texlive-module-bibleref-2019.tar.xz mirror://gentoo/texlive-module-bibleref-lds-2019.tar.xz mirror://gentoo/texlive-module-bibleref-mouth-2019.tar.xz mirror://gentoo/texlive-module-bibleref-parse-2019.tar.xz mirror://gentoo/texlive-module-covington-2019.tar.xz mirror://gentoo/texlive-module-diadia-2019.tar.xz mirror://gentoo/texlive-module-dramatist-2019.tar.xz mirror://gentoo/texlive-module-dvgloss-2019.tar.xz mirror://gentoo/texlive-module-ecltree-2019.tar.xz mirror://gentoo/texlive-module-edfnotes-2019.tar.xz mirror://gentoo/texlive-module-ednotes-2019.tar.xz mirror://gentoo/texlive-module-eledform-2019.tar.xz mirror://gentoo/texlive-module-eledmac-2019.tar.xz mirror://gentoo/texlive-module-expex-2019.tar.xz mirror://gentoo/texlive-module-gb4e-2019.tar.xz mirror://gentoo/texlive-module-gmverse-2019.tar.xz mirror://gentoo/texlive-module-jura-2019.tar.xz mirror://gentoo/texlive-module-juraabbrev-2019.tar.xz mirror://gentoo/texlive-module-juramisc-2019.tar.xz mirror://gentoo/texlive-module-jurarsp-2019.tar.xz mirror://gentoo/texlive-module-ledmac-2019.tar.xz mirror://gentoo/texlive-module-lexikon-2019.tar.xz mirror://gentoo/texlive-module-lexref-2019.tar.xz mirror://gentoo/texlive-module-ling-macros-2019.tar.xz mirror://gentoo/texlive-module-linguex-2019.tar.xz mirror://gentoo/texlive-module-liturg-2019.tar.xz mirror://gentoo/texlive-module-metrix-2019.tar.xz mirror://gentoo/texlive-module-parallel-2019.tar.xz mirror://gentoo/texlive-module-parrun-2019.tar.xz mirror://gentoo/texlive-module-phonrule-2019.tar.xz mirror://gentoo/texlive-module-plari-2019.tar.xz mirror://gentoo/texlive-module-play-2019.tar.xz mirror://gentoo/texlive-module-poemscol-2019.tar.xz mirror://gentoo/texlive-module-poetry-2019.tar.xz mirror://gentoo/texlive-module-poetrytex-2019.tar.xz mirror://gentoo/texlive-module-qobitree-2019.tar.xz mirror://gentoo/texlive-module-qtree-2019.tar.xz mirror://gentoo/texlive-module-reledmac-2019.tar.xz mirror://gentoo/texlive-module-rrgtrees-2019.tar.xz mirror://gentoo/texlive-module-rtklage-2019.tar.xz mirror://gentoo/texlive-module-screenplay-2019.tar.xz mirror://gentoo/texlive-module-screenplay-pkg-2019.tar.xz mirror://gentoo/texlive-module-sides-2019.tar.xz mirror://gentoo/texlive-module-stage-2019.tar.xz mirror://gentoo/texlive-module-textglos-2019.tar.xz mirror://gentoo/texlive-module-theatre-2019.tar.xz mirror://gentoo/texlive-module-thalie-2019.tar.xz mirror://gentoo/texlive-module-tree-dvips-2019.tar.xz mirror://gentoo/texlive-module-verse-2019.tar.xz mirror://gentoo/texlive-module-xyling-2019.tar.xz mirror://gentoo/texlive-module-collection-humanities-2019.tar.xz doc? ( mirror://gentoo/texlive-module-adtrees.doc-2019.tar.xz mirror://gentoo/texlive-module-bibleref.doc-2019.tar.xz mirror://gentoo/texlive-module-bibleref-lds.doc-2019.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.doc-2019.tar.xz mirror://gentoo/texlive-module-bibleref-parse.doc-2019.tar.xz mirror://gentoo/texlive-module-covington.doc-2019.tar.xz mirror://gentoo/texlive-module-diadia.doc-2019.tar.xz mirror://gentoo/texlive-module-dramatist.doc-2019.tar.xz mirror://gentoo/texlive-module-dvgloss.doc-2019.tar.xz mirror://gentoo/texlive-module-ecltree.doc-2019.tar.xz mirror://gentoo/texlive-module-edfnotes.doc-2019.tar.xz mirror://gentoo/texlive-module-ednotes.doc-2019.tar.xz mirror://gentoo/texlive-module-eledform.doc-2019.tar.xz mirror://gentoo/texlive-module-eledmac.doc-2019.tar.xz mirror://gentoo/texlive-module-expex.doc-2019.tar.xz mirror://gentoo/texlive-module-gb4e.doc-2019.tar.xz mirror://gentoo/texlive-module-gmverse.doc-2019.tar.xz mirror://gentoo/texlive-module-jura.doc-2019.tar.xz mirror://gentoo/texlive-module-juraabbrev.doc-2019.tar.xz mirror://gentoo/texlive-module-juramisc.doc-2019.tar.xz mirror://gentoo/texlive-module-jurarsp.doc-2019.tar.xz mirror://gentoo/texlive-module-ledmac.doc-2019.tar.xz mirror://gentoo/texlive-module-lexikon.doc-2019.tar.xz mirror://gentoo/texlive-module-lexref.doc-2019.tar.xz mirror://gentoo/texlive-module-ling-macros.doc-2019.tar.xz mirror://gentoo/texlive-module-linguex.doc-2019.tar.xz mirror://gentoo/texlive-module-liturg.doc-2019.tar.xz mirror://gentoo/texlive-module-metrix.doc-2019.tar.xz mirror://gentoo/texlive-module-parallel.doc-2019.tar.xz mirror://gentoo/texlive-module-parrun.doc-2019.tar.xz mirror://gentoo/texlive-module-phonrule.doc-2019.tar.xz mirror://gentoo/texlive-module-plari.doc-2019.tar.xz mirror://gentoo/texlive-module-play.doc-2019.tar.xz mirror://gentoo/texlive-module-poemscol.doc-2019.tar.xz mirror://gentoo/texlive-module-poetry.doc-2019.tar.xz mirror://gentoo/texlive-module-poetrytex.doc-2019.tar.xz mirror://gentoo/texlive-module-qobitree.doc-2019.tar.xz mirror://gentoo/texlive-module-qtree.doc-2019.tar.xz mirror://gentoo/texlive-module-reledmac.doc-2019.tar.xz mirror://gentoo/texlive-module-rrgtrees.doc-2019.tar.xz mirror://gentoo/texlive-module-rtklage.doc-2019.tar.xz mirror://gentoo/texlive-module-screenplay.doc-2019.tar.xz mirror://gentoo/texlive-module-screenplay-pkg.doc-2019.tar.xz mirror://gentoo/texlive-module-sides.doc-2019.tar.xz mirror://gentoo/texlive-module-stage.doc-2019.tar.xz mirror://gentoo/texlive-module-textglos.doc-2019.tar.xz mirror://gentoo/texlive-module-theatre.doc-2019.tar.xz mirror://gentoo/texlive-module-thalie.doc-2019.tar.xz mirror://gentoo/texlive-module-tree-dvips.doc-2019.tar.xz mirror://gentoo/texlive-module-verse.doc-2019.tar.xz mirror://gentoo/texlive-module-xyling.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-bibleref.source-2019.tar.xz mirror://gentoo/texlive-module-bibleref-lds.source-2019.tar.xz mirror://gentoo/texlive-module-bibleref-mouth.source-2019.tar.xz mirror://gentoo/texlive-module-dramatist.source-2019.tar.xz mirror://gentoo/texlive-module-dvgloss.source-2019.tar.xz mirror://gentoo/texlive-module-edfnotes.source-2019.tar.xz mirror://gentoo/texlive-module-eledform.source-2019.tar.xz mirror://gentoo/texlive-module-eledmac.source-2019.tar.xz mirror://gentoo/texlive-module-jura.source-2019.tar.xz mirror://gentoo/texlive-module-juraabbrev.source-2019.tar.xz mirror://gentoo/texlive-module-jurarsp.source-2019.tar.xz mirror://gentoo/texlive-module-ledmac.source-2019.tar.xz mirror://gentoo/texlive-module-liturg.source-2019.tar.xz mirror://gentoo/texlive-module-metrix.source-2019.tar.xz mirror://gentoo/texlive-module-parallel.source-2019.tar.xz mirror://gentoo/texlive-module-parrun.source-2019.tar.xz mirror://gentoo/texlive-module-plari.source-2019.tar.xz mirror://gentoo/texlive-module-play.source-2019.tar.xz mirror://gentoo/texlive-module-poemscol.source-2019.tar.xz mirror://gentoo/texlive-module-poetry.source-2019.tar.xz mirror://gentoo/texlive-module-poetrytex.source-2019.tar.xz mirror://gentoo/texlive-module-reledmac.source-2019.tar.xz mirror://gentoo/texlive-module-rrgtrees.source-2019.tar.xz mirror://gentoo/texlive-module-screenplay.source-2019.tar.xz mirror://gentoo/texlive-module-textglos.source-2019.tar.xz mirror://gentoo/texlive-module-thalie.source-2019.tar.xz mirror://gentoo/texlive-module-verse.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=307b983cb1fccd1b017258339701a690
diff --git a/metadata/md5-cache/dev-texlive/texlive-langarabic-2019 b/metadata/md5-cache/dev-texlive/texlive-langarabic-2019
index 902fe016976b..276c9276c827 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langarabic-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langarabic-2019
@@ -10,5 +10,5 @@ LICENSE=CC-BY-SA-4.0 GPL-2 GPL-3+ LPPL-1.3 LPPL-1.3c OFL public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-xetex-2016 !<dev-texlive/texlive-basic-2016 !=dev-texlive/texlive-luatex-2017* >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-alkalami-2019.tar.xz mirror://gentoo/texlive-module-alpha-persian-2019.tar.xz mirror://gentoo/texlive-module-amiri-2019.tar.xz mirror://gentoo/texlive-module-arabi-2019.tar.xz mirror://gentoo/texlive-module-arabi-add-2019.tar.xz mirror://gentoo/texlive-module-arabluatex-2019.tar.xz mirror://gentoo/texlive-module-arabtex-2019.tar.xz mirror://gentoo/texlive-module-bidi-2019.tar.xz mirror://gentoo/texlive-module-bidihl-2019.tar.xz mirror://gentoo/texlive-module-dad-2019.tar.xz mirror://gentoo/texlive-module-ghab-2019.tar.xz mirror://gentoo/texlive-module-hyphen-arabic-2019.tar.xz mirror://gentoo/texlive-module-hyphen-farsi-2019.tar.xz mirror://gentoo/texlive-module-imsproc-2019.tar.xz mirror://gentoo/texlive-module-kurdishlipsum-2019.tar.xz mirror://gentoo/texlive-module-lshort-persian-2019.tar.xz mirror://gentoo/texlive-module-luabidi-2019.tar.xz mirror://gentoo/texlive-module-na-box-2019.tar.xz mirror://gentoo/texlive-module-persian-bib-2019.tar.xz mirror://gentoo/texlive-module-sexam-2019.tar.xz mirror://gentoo/texlive-module-simurgh-2019.tar.xz mirror://gentoo/texlive-module-tram-2019.tar.xz mirror://gentoo/texlive-module-xepersian-2019.tar.xz mirror://gentoo/texlive-module-collection-langarabic-2019.tar.xz doc? ( mirror://gentoo/texlive-module-alkalami.doc-2019.tar.xz mirror://gentoo/texlive-module-alpha-persian.doc-2019.tar.xz mirror://gentoo/texlive-module-amiri.doc-2019.tar.xz mirror://gentoo/texlive-module-arabi.doc-2019.tar.xz mirror://gentoo/texlive-module-arabi-add.doc-2019.tar.xz mirror://gentoo/texlive-module-arabluatex.doc-2019.tar.xz mirror://gentoo/texlive-module-arabtex.doc-2019.tar.xz mirror://gentoo/texlive-module-bidi.doc-2019.tar.xz mirror://gentoo/texlive-module-bidihl.doc-2019.tar.xz mirror://gentoo/texlive-module-dad.doc-2019.tar.xz mirror://gentoo/texlive-module-ghab.doc-2019.tar.xz mirror://gentoo/texlive-module-imsproc.doc-2019.tar.xz mirror://gentoo/texlive-module-kurdishlipsum.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-persian.doc-2019.tar.xz mirror://gentoo/texlive-module-luabidi.doc-2019.tar.xz mirror://gentoo/texlive-module-na-box.doc-2019.tar.xz mirror://gentoo/texlive-module-persian-bib.doc-2019.tar.xz mirror://gentoo/texlive-module-sexam.doc-2019.tar.xz mirror://gentoo/texlive-module-simurgh.doc-2019.tar.xz mirror://gentoo/texlive-module-tram.doc-2019.tar.xz mirror://gentoo/texlive-module-xepersian.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-arabluatex.source-2019.tar.xz mirror://gentoo/texlive-module-bidi.source-2019.tar.xz mirror://gentoo/texlive-module-xepersian.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=f711741b4aadb1095aa4e4735aac3abd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langchinese-2019 b/metadata/md5-cache/dev-texlive/texlive-langchinese-2019
index 14f40f5c242a..0e47cf2f1763 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langchinese-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langchinese-2019
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-othe
 RDEPEND=>=dev-texlive/texlive-langcjk-2019 !<dev-texlive/texlive-langcjk-2014 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arphic-2019.tar.xz mirror://gentoo/texlive-module-arphic-ttf-2019.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn-2019.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn-2019.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn-2019.tar.xz mirror://gentoo/texlive-module-cns-2019.tar.xz mirror://gentoo/texlive-module-ctex-2019.tar.xz mirror://gentoo/texlive-module-ctex-faq-2019.tar.xz mirror://gentoo/texlive-module-fandol-2019.tar.xz mirror://gentoo/texlive-module-fduthesis-2019.tar.xz mirror://gentoo/texlive-module-hyphen-chinese-2019.tar.xz mirror://gentoo/texlive-module-impatient-cn-2019.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn-2019.tar.xz mirror://gentoo/texlive-module-lshort-chinese-2019.tar.xz mirror://gentoo/texlive-module-nanicolle-2019.tar.xz mirror://gentoo/texlive-module-njurepo-2019.tar.xz mirror://gentoo/texlive-module-pgfornament-han-2019.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn-2019.tar.xz mirror://gentoo/texlive-module-texproposal-2019.tar.xz mirror://gentoo/texlive-module-xtuthesis-2019.tar.xz mirror://gentoo/texlive-module-upzhkinsoku-2019.tar.xz mirror://gentoo/texlive-module-xpinyin-2019.tar.xz mirror://gentoo/texlive-module-zhlineskip-2019.tar.xz mirror://gentoo/texlive-module-zhlipsum-2019.tar.xz mirror://gentoo/texlive-module-zhmetrics-2019.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex-2019.tar.xz mirror://gentoo/texlive-module-zhnumber-2019.tar.xz mirror://gentoo/texlive-module-zhspacing-2019.tar.xz mirror://gentoo/texlive-module-collection-langchinese-2019.tar.xz doc? ( mirror://gentoo/texlive-module-arphic.doc-2019.tar.xz mirror://gentoo/texlive-module-arphic-ttf.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote-by-example-zh-cn.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote-faq-zh-cn.doc-2019.tar.xz mirror://gentoo/texlive-module-asymptote-manual-zh-cn.doc-2019.tar.xz mirror://gentoo/texlive-module-cns.doc-2019.tar.xz mirror://gentoo/texlive-module-ctex.doc-2019.tar.xz mirror://gentoo/texlive-module-ctex-faq.doc-2019.tar.xz mirror://gentoo/texlive-module-fandol.doc-2019.tar.xz mirror://gentoo/texlive-module-fduthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-impatient-cn.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-notes-zh-cn.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-chinese.doc-2019.tar.xz mirror://gentoo/texlive-module-nanicolle.doc-2019.tar.xz mirror://gentoo/texlive-module-njurepo.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfornament-han.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-zh-cn.doc-2019.tar.xz mirror://gentoo/texlive-module-texproposal.doc-2019.tar.xz mirror://gentoo/texlive-module-xtuthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-upzhkinsoku.doc-2019.tar.xz mirror://gentoo/texlive-module-xpinyin.doc-2019.tar.xz mirror://gentoo/texlive-module-zhlineskip.doc-2019.tar.xz mirror://gentoo/texlive-module-zhlipsum.doc-2019.tar.xz mirror://gentoo/texlive-module-zhmetrics.doc-2019.tar.xz mirror://gentoo/texlive-module-zhmetrics-uptex.doc-2019.tar.xz mirror://gentoo/texlive-module-zhnumber.doc-2019.tar.xz mirror://gentoo/texlive-module-zhspacing.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-ctex.source-2019.tar.xz mirror://gentoo/texlive-module-fduthesis.source-2019.tar.xz mirror://gentoo/texlive-module-njurepo.source-2019.tar.xz mirror://gentoo/texlive-module-xpinyin.source-2019.tar.xz mirror://gentoo/texlive-module-zhlipsum.source-2019.tar.xz mirror://gentoo/texlive-module-zhmetrics.source-2019.tar.xz mirror://gentoo/texlive-module-zhnumber.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=c2618e6ec703d2730b39fc85c867c516
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcjk-2019 b/metadata/md5-cache/dev-texlive/texlive-langcjk-2019
index 7d79659c3094..a3a458480b3a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcjk-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langcjk-2019
@@ -10,5 +10,5 @@ LICENSE=BSD GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c MIT TeX
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=app-text/texlive-core-2010[cjk] >=dev-texlive/texlive-latex-2011 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adobemapping-2019.tar.xz mirror://gentoo/texlive-module-c90-2019.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate-2019.tar.xz mirror://gentoo/texlive-module-cjkpunct-2019.tar.xz mirror://gentoo/texlive-module-dnp-2019.tar.xz mirror://gentoo/texlive-module-garuda-c90-2019.tar.xz mirror://gentoo/texlive-module-fixjfm-2019.tar.xz mirror://gentoo/texlive-module-jfmutil-2019.tar.xz mirror://gentoo/texlive-module-norasi-c90-2019.tar.xz mirror://gentoo/texlive-module-pxtatescale-2019.tar.xz mirror://gentoo/texlive-module-xcjk2uni-2019.tar.xz mirror://gentoo/texlive-module-zxjafont-2019.tar.xz mirror://gentoo/texlive-module-collection-langcjk-2019.tar.xz doc? ( mirror://gentoo/texlive-module-c90.doc-2019.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate.doc-2019.tar.xz mirror://gentoo/texlive-module-cjkpunct.doc-2019.tar.xz mirror://gentoo/texlive-module-fixjfm.doc-2019.tar.xz mirror://gentoo/texlive-module-jfmutil.doc-2019.tar.xz mirror://gentoo/texlive-module-pxtatescale.doc-2019.tar.xz mirror://gentoo/texlive-module-xcjk2uni.doc-2019.tar.xz mirror://gentoo/texlive-module-zxjafont.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-c90.source-2019.tar.xz mirror://gentoo/texlive-module-cjk-gs-integrate.source-2019.tar.xz mirror://gentoo/texlive-module-cjkpunct.source-2019.tar.xz mirror://gentoo/texlive-module-garuda-c90.source-2019.tar.xz mirror://gentoo/texlive-module-norasi-c90.source-2019.tar.xz mirror://gentoo/texlive-module-xcjk2uni.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=4f89979f662701a9f843728ff22ef7fe
diff --git a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2019 b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2019
index ce7b5931b1fb..7c05d18d445c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langcyrillic-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-latex-2019 !<dev-texlive/texlive-langother-2013 !<app-text/texlive-core-2013 !<dev-texlive/texlive-latexextra-2013 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-belarusian-2019.tar.xz mirror://gentoo/texlive-module-babel-bulgarian-2019.tar.xz mirror://gentoo/texlive-module-babel-russian-2019.tar.xz mirror://gentoo/texlive-module-babel-serbian-2019.tar.xz mirror://gentoo/texlive-module-babel-serbianc-2019.tar.xz mirror://gentoo/texlive-module-babel-ukrainian-2019.tar.xz mirror://gentoo/texlive-module-churchslavonic-2019.tar.xz mirror://gentoo/texlive-module-cmcyr-2019.tar.xz mirror://gentoo/texlive-module-cyrillic-2019.tar.xz mirror://gentoo/texlive-module-cyrillic-bin-2019.tar.xz mirror://gentoo/texlive-module-cyrplain-2019.tar.xz mirror://gentoo/texlive-module-disser-2019.tar.xz mirror://gentoo/texlive-module-eskd-2019.tar.xz mirror://gentoo/texlive-module-eskdx-2019.tar.xz mirror://gentoo/texlive-module-gost-2019.tar.xz mirror://gentoo/texlive-module-hyphen-belarusian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-bulgarian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-churchslavonic-2019.tar.xz mirror://gentoo/texlive-module-hyphen-mongolian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-russian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-serbian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-ukrainian-2019.tar.xz mirror://gentoo/texlive-module-lcyw-2019.tar.xz mirror://gentoo/texlive-module-lh-2019.tar.xz mirror://gentoo/texlive-module-lhcyr-2019.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian-2019.tar.xz mirror://gentoo/texlive-module-lshort-mongol-2019.tar.xz mirror://gentoo/texlive-module-lshort-russian-2019.tar.xz mirror://gentoo/texlive-module-lshort-ukr-2019.tar.xz mirror://gentoo/texlive-module-mongolian-babel-2019.tar.xz mirror://gentoo/texlive-module-montex-2019.tar.xz mirror://gentoo/texlive-module-mpman-ru-2019.tar.xz mirror://gentoo/texlive-module-numnameru-2019.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg-2019.tar.xz mirror://gentoo/texlive-module-ruhyphen-2019.tar.xz mirror://gentoo/texlive-module-russ-2019.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe-2019.tar.xz mirror://gentoo/texlive-module-serbian-date-lat-2019.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr-2019.tar.xz mirror://gentoo/texlive-module-serbian-lig-2019.tar.xz mirror://gentoo/texlive-module-t2-2019.tar.xz mirror://gentoo/texlive-module-texlive-ru-2019.tar.xz mirror://gentoo/texlive-module-texlive-sr-2019.tar.xz mirror://gentoo/texlive-module-ukrhyph-2019.tar.xz mirror://gentoo/texlive-module-collection-langcyrillic-2019.tar.xz doc? ( mirror://gentoo/texlive-module-babel-belarusian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-russian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-serbian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-serbianc.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.doc-2019.tar.xz mirror://gentoo/texlive-module-churchslavonic.doc-2019.tar.xz mirror://gentoo/texlive-module-cmcyr.doc-2019.tar.xz mirror://gentoo/texlive-module-cyrillic.doc-2019.tar.xz mirror://gentoo/texlive-module-cyrillic-bin.doc-2019.tar.xz mirror://gentoo/texlive-module-disser.doc-2019.tar.xz mirror://gentoo/texlive-module-eskd.doc-2019.tar.xz mirror://gentoo/texlive-module-eskdx.doc-2019.tar.xz mirror://gentoo/texlive-module-gost.doc-2019.tar.xz mirror://gentoo/texlive-module-lcyw.doc-2019.tar.xz mirror://gentoo/texlive-module-lh.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-bulgarian.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-mongol.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-russian.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-ukr.doc-2019.tar.xz mirror://gentoo/texlive-module-mongolian-babel.doc-2019.tar.xz mirror://gentoo/texlive-module-montex.doc-2019.tar.xz mirror://gentoo/texlive-module-mpman-ru.doc-2019.tar.xz mirror://gentoo/texlive-module-numnameru.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-eucl-translation-bg.doc-2019.tar.xz mirror://gentoo/texlive-module-russ.doc-2019.tar.xz mirror://gentoo/texlive-module-serbian-apostrophe.doc-2019.tar.xz mirror://gentoo/texlive-module-serbian-date-lat.doc-2019.tar.xz mirror://gentoo/texlive-module-serbian-def-cyr.doc-2019.tar.xz mirror://gentoo/texlive-module-serbian-lig.doc-2019.tar.xz mirror://gentoo/texlive-module-t2.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-ru.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-sr.doc-2019.tar.xz mirror://gentoo/texlive-module-ukrhyph.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-belarusian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-bulgarian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-russian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-serbian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-serbianc.source-2019.tar.xz mirror://gentoo/texlive-module-babel-ukrainian.source-2019.tar.xz mirror://gentoo/texlive-module-cyrillic.source-2019.tar.xz mirror://gentoo/texlive-module-disser.source-2019.tar.xz mirror://gentoo/texlive-module-eskd.source-2019.tar.xz mirror://gentoo/texlive-module-gost.source-2019.tar.xz mirror://gentoo/texlive-module-lcyw.source-2019.tar.xz mirror://gentoo/texlive-module-lh.source-2019.tar.xz mirror://gentoo/texlive-module-lhcyr.source-2019.tar.xz mirror://gentoo/texlive-module-mongolian-babel.source-2019.tar.xz mirror://gentoo/texlive-module-ruhyphen.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=d9929461390bf76f3c0d3ff008a5d556
diff --git a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2019-r1 b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2019-r1
index 1faff92e2665..6a57da1d7310 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2019-r1
+++ b/metadata/md5-cache/dev-texlive/texlive-langczechslovak-2019-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.3 TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-latex-2019 !dev-texlive/texlive-documentation-czechslovak >=app-text/texlive-core-2014[xetex] !<dev-texlive/texlive-basic-2016 >=dev-texlive/texlive-luatex-2016 >=dev-texlive/texlive-langenglish-2019 >=dev-texlive/texlive-langeuropean-2019 >=dev-texlive/texlive-langfrench-2019 >=dev-texlive/texlive-langgerman-2019 >=dev-texlive/texlive-langpolish-2019 >=dev-texlive/texlive-langspanish-2019 >=dev-texlive/texlive-langitalian-2019 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-czech-2019.tar.xz mirror://gentoo/texlive-module-babel-slovak-2019.tar.xz mirror://gentoo/texlive-module-cnbwp-2019.tar.xz mirror://gentoo/texlive-module-cs-2019.tar.xz mirror://gentoo/texlive-module-csbulletin-2019.tar.xz mirror://gentoo/texlive-module-cslatex-2019.tar.xz mirror://gentoo/texlive-module-csplain-2019.tar.xz mirror://gentoo/texlive-module-cstex-2019.tar.xz mirror://gentoo/texlive-module-hyphen-czech-2019.tar.xz mirror://gentoo/texlive-module-hyphen-slovak-2019.tar.xz mirror://gentoo/texlive-module-lshort-czech-2019.tar.xz mirror://gentoo/texlive-module-lshort-slovak-2019.tar.xz mirror://gentoo/texlive-module-texlive-cz-2019.tar.xz mirror://gentoo/texlive-module-collection-langczechslovak-2019.tar.xz doc? ( mirror://gentoo/texlive-module-babel-czech.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-slovak.doc-2019.tar.xz mirror://gentoo/texlive-module-cnbwp.doc-2019.tar.xz mirror://gentoo/texlive-module-csbulletin.doc-2019.tar.xz mirror://gentoo/texlive-module-cslatex.doc-2019.tar.xz mirror://gentoo/texlive-module-cstex.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-czech.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-slovak.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-cz.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-czech.source-2019.tar.xz mirror://gentoo/texlive-module-babel-slovak.source-2019.tar.xz mirror://gentoo/texlive-module-cslatex.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=dbe74c2d226cdb719dbec40a4c6c45ae
diff --git a/metadata/md5-cache/dev-texlive/texlive-langenglish-2019 b/metadata/md5-cache/dev-texlive/texlive-langenglish-2019
index dbc7abf97b32..8c98e7cf3bdd 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langenglish-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langenglish-2019
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-ot
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-hyphen-english-2019.tar.xz mirror://gentoo/texlive-module-FAQ-en-2019.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles-2019.tar.xz mirror://gentoo/texlive-module-Type1fonts-2019.tar.xz mirror://gentoo/texlive-module-amscls-doc-2019.tar.xz mirror://gentoo/texlive-module-amslatex-primer-2019.tar.xz mirror://gentoo/texlive-module-around-the-bend-2019.tar.xz mirror://gentoo/texlive-module-ascii-chart-2019.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet-2019.tar.xz mirror://gentoo/texlive-module-components-of-TeX-2019.tar.xz mirror://gentoo/texlive-module-comprehensive-2019.tar.xz mirror://gentoo/texlive-module-dickimaw-2019.tar.xz mirror://gentoo/texlive-module-docsurvey-2019.tar.xz mirror://gentoo/texlive-module-dtxtut-2019.tar.xz mirror://gentoo/texlive-module-first-latex-doc-2019.tar.xz mirror://gentoo/texlive-module-forest-quickstart-2019.tar.xz mirror://gentoo/texlive-module-gentle-2019.tar.xz mirror://gentoo/texlive-module-guide-to-latex-2019.tar.xz mirror://gentoo/texlive-module-happy4th-2019.tar.xz mirror://gentoo/texlive-module-impatient-2019.tar.xz mirror://gentoo/texlive-module-intro-scientific-2019.tar.xz mirror://gentoo/texlive-module-knuth-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-english-2019.tar.xz mirror://gentoo/texlive-module-latex-brochure-2019.tar.xz mirror://gentoo/texlive-module-latex-course-2019.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr-2019.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion-2019.tar.xz mirror://gentoo/texlive-module-latex-refsheet-2019.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide-2019.tar.xz mirror://gentoo/texlive-module-latex-web-companion-2019.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-2019.tar.xz mirror://gentoo/texlive-module-latex4wp-2019.tar.xz mirror://gentoo/texlive-module-latexcheat-2019.tar.xz mirror://gentoo/texlive-module-latexcourse-rug-2019.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs-2019.tar.xz mirror://gentoo/texlive-module-lshort-english-2019.tar.xz mirror://gentoo/texlive-module-macros2e-2019.tar.xz mirror://gentoo/texlive-module-math-e-2019.tar.xz mirror://gentoo/texlive-module-math-into-latex-4-2019.tar.xz mirror://gentoo/texlive-module-maths-symbols-2019.tar.xz mirror://gentoo/texlive-module-memdesign-2019.tar.xz mirror://gentoo/texlive-module-metafont-beginners-2019.tar.xz mirror://gentoo/texlive-module-metapost-examples-2019.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial-2019.tar.xz mirror://gentoo/texlive-module-pictexsum-2019.tar.xz mirror://gentoo/texlive-module-plain-doc-2019.tar.xz mirror://gentoo/texlive-module-presentations-en-2019.tar.xz mirror://gentoo/texlive-module-short-math-guide-2019.tar.xz mirror://gentoo/texlive-module-simplified-latex-2019.tar.xz mirror://gentoo/texlive-module-svg-inkscape-2019.tar.xz mirror://gentoo/texlive-module-tabulars-e-2019.tar.xz mirror://gentoo/texlive-module-tamethebeast-2019.tar.xz mirror://gentoo/texlive-module-tds-2019.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet-2019.tar.xz mirror://gentoo/texlive-module-tex-overview-2019.tar.xz mirror://gentoo/texlive-module-tex-refs-2019.tar.xz mirror://gentoo/texlive-module-texbytopic-2019.tar.xz mirror://gentoo/texlive-module-texonly-2019.tar.xz mirror://gentoo/texlive-module-titlepages-2019.tar.xz mirror://gentoo/texlive-module-tlc2-2019.tar.xz mirror://gentoo/texlive-module-undergradmath-2019.tar.xz mirror://gentoo/texlive-module-visualfaq-2019.tar.xz mirror://gentoo/texlive-module-webguide-2019.tar.xz mirror://gentoo/texlive-module-xetexref-2019.tar.xz mirror://gentoo/texlive-module-collection-langenglish-2019.tar.xz doc? ( mirror://gentoo/texlive-module-FAQ-en.doc-2019.tar.xz mirror://gentoo/texlive-module-MemoirChapStyles.doc-2019.tar.xz mirror://gentoo/texlive-module-Type1fonts.doc-2019.tar.xz mirror://gentoo/texlive-module-amscls-doc.doc-2019.tar.xz mirror://gentoo/texlive-module-amslatex-primer.doc-2019.tar.xz mirror://gentoo/texlive-module-around-the-bend.doc-2019.tar.xz mirror://gentoo/texlive-module-ascii-chart.doc-2019.tar.xz mirror://gentoo/texlive-module-biblatex-cheatsheet.doc-2019.tar.xz mirror://gentoo/texlive-module-components-of-TeX.doc-2019.tar.xz mirror://gentoo/texlive-module-comprehensive.doc-2019.tar.xz mirror://gentoo/texlive-module-dickimaw.doc-2019.tar.xz mirror://gentoo/texlive-module-docsurvey.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxtut.doc-2019.tar.xz mirror://gentoo/texlive-module-first-latex-doc.doc-2019.tar.xz mirror://gentoo/texlive-module-forest-quickstart.doc-2019.tar.xz mirror://gentoo/texlive-module-gentle.doc-2019.tar.xz mirror://gentoo/texlive-module-guide-to-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-happy4th.doc-2019.tar.xz mirror://gentoo/texlive-module-impatient.doc-2019.tar.xz mirror://gentoo/texlive-module-intro-scientific.doc-2019.tar.xz mirror://gentoo/texlive-module-knuth.doc-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-english.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-brochure.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-course.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-doc-ptr.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-graphics-companion.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-refsheet.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-veryshortguide.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-web-companion.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-latex4wp.doc-2019.tar.xz mirror://gentoo/texlive-module-latexcheat.doc-2019.tar.xz mirror://gentoo/texlive-module-latexcourse-rug.doc-2019.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-english.doc-2019.tar.xz mirror://gentoo/texlive-module-macros2e.doc-2019.tar.xz mirror://gentoo/texlive-module-math-e.doc-2019.tar.xz mirror://gentoo/texlive-module-math-into-latex-4.doc-2019.tar.xz mirror://gentoo/texlive-module-maths-symbols.doc-2019.tar.xz mirror://gentoo/texlive-module-memdesign.doc-2019.tar.xz mirror://gentoo/texlive-module-metafont-beginners.doc-2019.tar.xz mirror://gentoo/texlive-module-metapost-examples.doc-2019.tar.xz mirror://gentoo/texlive-module-patgen2-tutorial.doc-2019.tar.xz mirror://gentoo/texlive-module-pictexsum.doc-2019.tar.xz mirror://gentoo/texlive-module-plain-doc.doc-2019.tar.xz mirror://gentoo/texlive-module-presentations-en.doc-2019.tar.xz mirror://gentoo/texlive-module-short-math-guide.doc-2019.tar.xz mirror://gentoo/texlive-module-simplified-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-svg-inkscape.doc-2019.tar.xz mirror://gentoo/texlive-module-tabulars-e.doc-2019.tar.xz mirror://gentoo/texlive-module-tamethebeast.doc-2019.tar.xz mirror://gentoo/texlive-module-tds.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-font-errors-cheatsheet.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-overview.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-refs.doc-2019.tar.xz mirror://gentoo/texlive-module-texbytopic.doc-2019.tar.xz mirror://gentoo/texlive-module-texonly.doc-2019.tar.xz mirror://gentoo/texlive-module-titlepages.doc-2019.tar.xz mirror://gentoo/texlive-module-tlc2.doc-2019.tar.xz mirror://gentoo/texlive-module-undergradmath.doc-2019.tar.xz mirror://gentoo/texlive-module-visualfaq.doc-2019.tar.xz mirror://gentoo/texlive-module-webguide.doc-2019.tar.xz mirror://gentoo/texlive-module-xetexref.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-knuth.source-2019.tar.xz mirror://gentoo/texlive-module-latexfileinfo-pkgs.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=a88841725201b39c52eab4cf838713a6
diff --git a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2019 b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2019
index 7afeffcc35c5..b190df7f774f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langeuropean-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langeuropean-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !dev-texlive/texlive-langarmenian !dev-texlive/texlive-langcroatian !dev-texlive/texlive-langdanish !dev-texlive/texlive-langdutch !dev-texlive/texlive-langfinnish !dev-texlive/texlive-langhungarian !dev-texlive/texlive-langnorwegia !dev-texlive/texlive-langturkmen !<dev-texlive/texlive-langother-2013 !dev-texlive/texlive-langswedish !dev-texlive/texlive-langlithuanian !dev-texlive/texlive-langlatvian !dev-texlive/texlive-langlatin !dev-texlive/texlive-langnorwegian !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-armtex-2019.tar.xz mirror://gentoo/texlive-module-babel-albanian-2019.tar.xz mirror://gentoo/texlive-module-babel-bosnian-2019.tar.xz mirror://gentoo/texlive-module-babel-breton-2019.tar.xz mirror://gentoo/texlive-module-babel-croatian-2019.tar.xz mirror://gentoo/texlive-module-babel-danish-2019.tar.xz mirror://gentoo/texlive-module-babel-dutch-2019.tar.xz mirror://gentoo/texlive-module-babel-estonian-2019.tar.xz mirror://gentoo/texlive-module-babel-finnish-2019.tar.xz mirror://gentoo/texlive-module-babel-friulan-2019.tar.xz mirror://gentoo/texlive-module-babel-hungarian-2019.tar.xz mirror://gentoo/texlive-module-babel-icelandic-2019.tar.xz mirror://gentoo/texlive-module-babel-irish-2019.tar.xz mirror://gentoo/texlive-module-babel-kurmanji-2019.tar.xz mirror://gentoo/texlive-module-babel-latin-2019.tar.xz mirror://gentoo/texlive-module-babel-latvian-2019.tar.xz mirror://gentoo/texlive-module-babel-macedonian-2019.tar.xz mirror://gentoo/texlive-module-babel-norsk-2019.tar.xz mirror://gentoo/texlive-module-babel-occitan-2019.tar.xz mirror://gentoo/texlive-module-babel-piedmontese-2019.tar.xz mirror://gentoo/texlive-module-babel-romanian-2019.tar.xz mirror://gentoo/texlive-module-babel-romansh-2019.tar.xz mirror://gentoo/texlive-module-babel-samin-2019.tar.xz mirror://gentoo/texlive-module-babel-scottish-2019.tar.xz mirror://gentoo/texlive-module-babel-slovenian-2019.tar.xz mirror://gentoo/texlive-module-babel-swedish-2019.tar.xz mirror://gentoo/texlive-module-babel-turkish-2019.tar.xz mirror://gentoo/texlive-module-babel-welsh-2019.tar.xz mirror://gentoo/texlive-module-finbib-2019.tar.xz mirror://gentoo/texlive-module-gloss-occitan-2019.tar.xz mirror://gentoo/texlive-module-hrlatex-2019.tar.xz mirror://gentoo/texlive-module-hulipsum-2019.tar.xz mirror://gentoo/texlive-module-hyphen-croatian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-danish-2019.tar.xz mirror://gentoo/texlive-module-hyphen-dutch-2019.tar.xz mirror://gentoo/texlive-module-hyphen-estonian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-finnish-2019.tar.xz mirror://gentoo/texlive-module-hyphen-friulan-2019.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-icelandic-2019.tar.xz mirror://gentoo/texlive-module-hyphen-irish-2019.tar.xz mirror://gentoo/texlive-module-hyphen-kurmanji-2019.tar.xz mirror://gentoo/texlive-module-hyphen-latin-2019.tar.xz mirror://gentoo/texlive-module-hyphen-latvian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-lithuanian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-norwegian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-occitan-2019.tar.xz mirror://gentoo/texlive-module-hyphen-piedmontese-2019.tar.xz mirror://gentoo/texlive-module-hyphen-romanian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-romansh-2019.tar.xz mirror://gentoo/texlive-module-hyphen-slovenian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-swedish-2019.tar.xz mirror://gentoo/texlive-module-hyphen-turkish-2019.tar.xz mirror://gentoo/texlive-module-hyphen-uppersorbian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-welsh-2019.tar.xz mirror://gentoo/texlive-module-lithuanian-2019.tar.xz mirror://gentoo/texlive-module-lshort-dutch-2019.tar.xz mirror://gentoo/texlive-module-lshort-estonian-2019.tar.xz mirror://gentoo/texlive-module-lshort-finnish-2019.tar.xz mirror://gentoo/texlive-module-lshort-slovenian-2019.tar.xz mirror://gentoo/texlive-module-lshort-turkish-2019.tar.xz mirror://gentoo/texlive-module-nevelok-2019.tar.xz mirror://gentoo/texlive-module-swebib-2019.tar.xz mirror://gentoo/texlive-module-turkmen-2019.tar.xz mirror://gentoo/texlive-module-collection-langeuropean-2019.tar.xz doc? ( mirror://gentoo/texlive-module-armtex.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-albanian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-bosnian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-breton.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-croatian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-danish.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-dutch.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-estonian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-finnish.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-friulan.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-hungarian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-icelandic.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-irish.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-latin.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-latvian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-macedonian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-norsk.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-occitan.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-romanian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-romansh.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-samin.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-scottish.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-slovenian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-swedish.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-turkish.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-welsh.doc-2019.tar.xz mirror://gentoo/texlive-module-gloss-occitan.doc-2019.tar.xz mirror://gentoo/texlive-module-hrlatex.doc-2019.tar.xz mirror://gentoo/texlive-module-hulipsum.doc-2019.tar.xz mirror://gentoo/texlive-module-hyphen-hungarian.doc-2019.tar.xz mirror://gentoo/texlive-module-lithuanian.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-dutch.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-estonian.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-finnish.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-slovenian.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-turkish.doc-2019.tar.xz mirror://gentoo/texlive-module-nevelok.doc-2019.tar.xz mirror://gentoo/texlive-module-swebib.doc-2019.tar.xz mirror://gentoo/texlive-module-turkmen.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-albanian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-bosnian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-breton.source-2019.tar.xz mirror://gentoo/texlive-module-babel-croatian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-danish.source-2019.tar.xz mirror://gentoo/texlive-module-babel-dutch.source-2019.tar.xz mirror://gentoo/texlive-module-babel-estonian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-finnish.source-2019.tar.xz mirror://gentoo/texlive-module-babel-friulan.source-2019.tar.xz mirror://gentoo/texlive-module-babel-icelandic.source-2019.tar.xz mirror://gentoo/texlive-module-babel-irish.source-2019.tar.xz mirror://gentoo/texlive-module-babel-kurmanji.source-2019.tar.xz mirror://gentoo/texlive-module-babel-latin.source-2019.tar.xz mirror://gentoo/texlive-module-babel-latvian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-macedonian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-norsk.source-2019.tar.xz mirror://gentoo/texlive-module-babel-occitan.source-2019.tar.xz mirror://gentoo/texlive-module-babel-piedmontese.source-2019.tar.xz mirror://gentoo/texlive-module-babel-romanian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-romansh.source-2019.tar.xz mirror://gentoo/texlive-module-babel-samin.source-2019.tar.xz mirror://gentoo/texlive-module-babel-scottish.source-2019.tar.xz mirror://gentoo/texlive-module-babel-slovenian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-swedish.source-2019.tar.xz mirror://gentoo/texlive-module-babel-turkish.source-2019.tar.xz mirror://gentoo/texlive-module-babel-welsh.source-2019.tar.xz mirror://gentoo/texlive-module-gloss-occitan.source-2019.tar.xz mirror://gentoo/texlive-module-hrlatex.source-2019.tar.xz mirror://gentoo/texlive-module-hulipsum.source-2019.tar.xz mirror://gentoo/texlive-module-hyphen-turkish.source-2019.tar.xz mirror://gentoo/texlive-module-nevelok.source-2019.tar.xz mirror://gentoo/texlive-module-turkmen.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=141e692bb247422fed39bfb45ee7bb15
diff --git a/metadata/md5-cache/dev-texlive/texlive-langfrench-2019 b/metadata/md5-cache/dev-texlive/texlive-langfrench-2019
index 92da6798e14d..8dbbda716af2 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langfrench-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langfrench-2019
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-aeguill-2019.tar.xz mirror://gentoo/texlive-module-apprendre-a-programmer-en-tex-2019.tar.xz mirror://gentoo/texlive-module-apprends-latex-2019.tar.xz mirror://gentoo/texlive-module-babel-basque-2019.tar.xz mirror://gentoo/texlive-module-babel-french-2019.tar.xz mirror://gentoo/texlive-module-basque-book-2019.tar.xz mirror://gentoo/texlive-module-basque-date-2019.tar.xz mirror://gentoo/texlive-module-bib-fr-2019.tar.xz mirror://gentoo/texlive-module-bibleref-french-2019.tar.xz mirror://gentoo/texlive-module-booktabs-fr-2019.tar.xz mirror://gentoo/texlive-module-droit-fr-2019.tar.xz mirror://gentoo/texlive-module-e-french-2019.tar.xz mirror://gentoo/texlive-module-epslatex-fr-2019.tar.xz mirror://gentoo/texlive-module-facture-2019.tar.xz mirror://gentoo/texlive-module-formation-latex-ul-2019.tar.xz mirror://gentoo/texlive-module-frenchmath-2019.tar.xz mirror://gentoo/texlive-module-frletter-2019.tar.xz mirror://gentoo/texlive-module-guide-latex-fr-2019.tar.xz mirror://gentoo/texlive-module-hyphen-basque-2019.tar.xz mirror://gentoo/texlive-module-hyphen-french-2019.tar.xz mirror://gentoo/texlive-module-impatient-fr-2019.tar.xz mirror://gentoo/texlive-module-impnattypo-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-french-2019.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr-2019.tar.xz mirror://gentoo/texlive-module-lshort-french-2019.tar.xz mirror://gentoo/texlive-module-mafr-2019.tar.xz mirror://gentoo/texlive-module-tabvar-2019.tar.xz mirror://gentoo/texlive-module-tdsfrmath-2019.tar.xz mirror://gentoo/texlive-module-texlive-fr-2019.tar.xz mirror://gentoo/texlive-module-translation-array-fr-2019.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr-2019.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr-2019.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr-2019.tar.xz mirror://gentoo/texlive-module-variations-2019.tar.xz mirror://gentoo/texlive-module-visualtikz-2019.tar.xz mirror://gentoo/texlive-module-collection-langfrench-2019.tar.xz doc? ( mirror://gentoo/texlive-module-aeguill.doc-2019.tar.xz mirror://gentoo/texlive-module-apprendre-a-programmer-en-tex.doc-2019.tar.xz mirror://gentoo/texlive-module-apprends-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-basque.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-french.doc-2019.tar.xz mirror://gentoo/texlive-module-basque-book.doc-2019.tar.xz mirror://gentoo/texlive-module-basque-date.doc-2019.tar.xz mirror://gentoo/texlive-module-bib-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-bibleref-french.doc-2019.tar.xz mirror://gentoo/texlive-module-booktabs-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-droit-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-e-french.doc-2019.tar.xz mirror://gentoo/texlive-module-epslatex-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-facture.doc-2019.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.doc-2019.tar.xz mirror://gentoo/texlive-module-frenchmath.doc-2019.tar.xz mirror://gentoo/texlive-module-frletter.doc-2019.tar.xz mirror://gentoo/texlive-module-guide-latex-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-impatient-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-impnattypo.doc-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-french.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-french.doc-2019.tar.xz mirror://gentoo/texlive-module-mafr.doc-2019.tar.xz mirror://gentoo/texlive-module-tabvar.doc-2019.tar.xz mirror://gentoo/texlive-module-tdsfrmath.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-array-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-dcolumn-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-natbib-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-tabbing-fr.doc-2019.tar.xz mirror://gentoo/texlive-module-variations.doc-2019.tar.xz mirror://gentoo/texlive-module-visualtikz.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-basque.source-2019.tar.xz mirror://gentoo/texlive-module-babel-french.source-2019.tar.xz mirror://gentoo/texlive-module-basque-book.source-2019.tar.xz mirror://gentoo/texlive-module-basque-date.source-2019.tar.xz mirror://gentoo/texlive-module-bibleref-french.source-2019.tar.xz mirror://gentoo/texlive-module-facture.source-2019.tar.xz mirror://gentoo/texlive-module-formation-latex-ul.source-2019.tar.xz mirror://gentoo/texlive-module-frenchmath.source-2019.tar.xz mirror://gentoo/texlive-module-hyphen-basque.source-2019.tar.xz mirror://gentoo/texlive-module-impnattypo.source-2019.tar.xz mirror://gentoo/texlive-module-tabvar.source-2019.tar.xz mirror://gentoo/texlive-module-tdsfrmath.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=293fc657066c6e6c4dbec18690a3c211
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2019 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2019
index 1d6053293c94..490fe2a383da 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2019
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 LPPL-1.3c MIT OPL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-apalike-german-2019.tar.xz mirror://gentoo/texlive-module-babel-german-2019.tar.xz mirror://gentoo/texlive-module-bibleref-german-2019.tar.xz mirror://gentoo/texlive-module-booktabs-de-2019.tar.xz mirror://gentoo/texlive-module-csquotes-de-2019.tar.xz mirror://gentoo/texlive-module-dehyph-2019.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2019.tar.xz mirror://gentoo/texlive-module-dhua-2019.tar.xz mirror://gentoo/texlive-module-einfuehrung-2019.tar.xz mirror://gentoo/texlive-module-einfuehrung2-2019.tar.xz mirror://gentoo/texlive-module-etdipa-2019.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2019.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2019.tar.xz mirror://gentoo/texlive-module-geometry-de-2019.tar.xz mirror://gentoo/texlive-module-german-2019.tar.xz mirror://gentoo/texlive-module-germbib-2019.tar.xz mirror://gentoo/texlive-module-germkorr-2019.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2019.tar.xz mirror://gentoo/texlive-module-hyphen-german-2019.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2019.tar.xz mirror://gentoo/texlive-module-l2picfaq-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-2019.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2019.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex-2019.tar.xz mirror://gentoo/texlive-module-latex-referenz-2019.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2019.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2019.tar.xz mirror://gentoo/texlive-module-lshort-german-2019.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2019.tar.xz mirror://gentoo/texlive-module-microtype-de-2019.tar.xz mirror://gentoo/texlive-module-milog-2019.tar.xz mirror://gentoo/texlive-module-presentations-2019.tar.xz mirror://gentoo/texlive-module-r_und_s-2019.tar.xz mirror://gentoo/texlive-module-templates-fenn-2019.tar.xz mirror://gentoo/texlive-module-templates-sommer-2019.tar.xz mirror://gentoo/texlive-module-termcal-de-2019.tar.xz mirror://gentoo/texlive-module-texlive-de-2019.tar.xz mirror://gentoo/texlive-module-tipa-de-2019.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2019.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2019.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2019.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2019.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2019.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2019.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2019.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2019.tar.xz mirror://gentoo/texlive-module-udesoftec-2019.tar.xz mirror://gentoo/texlive-module-uhrzeit-2019.tar.xz mirror://gentoo/texlive-module-umlaute-2019.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2019.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2019.tar.xz doc? ( mirror://gentoo/texlive-module-apalike-german.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-german.doc-2019.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2019.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2019.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2019.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2019.tar.xz mirror://gentoo/texlive-module-dhua.doc-2019.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2019.tar.xz mirror://gentoo/texlive-module-einfuehrung2.doc-2019.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2019.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2019.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2019.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2019.tar.xz mirror://gentoo/texlive-module-german.doc-2019.tar.xz mirror://gentoo/texlive-module-germbib.doc-2019.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2019.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2019.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2019.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2019.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2019.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2019.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2019.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2019.tar.xz mirror://gentoo/texlive-module-milog.doc-2019.tar.xz mirror://gentoo/texlive-module-presentations.doc-2019.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2019.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2019.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2019.tar.xz mirror://gentoo/texlive-module-termcal-de.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2019.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2019.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2019.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2019.tar.xz mirror://gentoo/texlive-module-uhrzeit.doc-2019.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2019.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2019.tar.xz mirror://gentoo/texlive-module-dhua.source-2019.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2019.tar.xz mirror://gentoo/texlive-module-german.source-2019.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2019.tar.xz mirror://gentoo/texlive-module-termcal-de.source-2019.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2019.tar.xz mirror://gentoo/texlive-module-umlaute.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=a183b87cff91fd68f83b4bd463c6477c
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgreek-2019 b/metadata/md5-cache/dev-texlive/texlive-langgreek-2019
index 689d18aa6b88..3fb0c2a31b64 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgreek-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langgreek-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LGPL-3 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-greek-2019.tar.xz mirror://gentoo/texlive-module-begingreek-2019.tar.xz mirror://gentoo/texlive-module-betababel-2019.tar.xz mirror://gentoo/texlive-module-bgreek-2019.tar.xz mirror://gentoo/texlive-module-cbfonts-2019.tar.xz mirror://gentoo/texlive-module-cbfonts-fd-2019.tar.xz mirror://gentoo/texlive-module-gfsbaskerville-2019.tar.xz mirror://gentoo/texlive-module-gfsporson-2019.tar.xz mirror://gentoo/texlive-module-greek-fontenc-2019.tar.xz mirror://gentoo/texlive-module-greek-inputenc-2019.tar.xz mirror://gentoo/texlive-module-greekdates-2019.tar.xz mirror://gentoo/texlive-module-greektex-2019.tar.xz mirror://gentoo/texlive-module-greektonoi-2019.tar.xz mirror://gentoo/texlive-module-hyphen-greek-2019.tar.xz mirror://gentoo/texlive-module-hyphen-ancientgreek-2019.tar.xz mirror://gentoo/texlive-module-ibycus-babel-2019.tar.xz mirror://gentoo/texlive-module-ibygrk-2019.tar.xz mirror://gentoo/texlive-module-kerkis-2019.tar.xz mirror://gentoo/texlive-module-levy-2019.tar.xz mirror://gentoo/texlive-module-lgreek-2019.tar.xz mirror://gentoo/texlive-module-mkgrkindex-2019.tar.xz mirror://gentoo/texlive-module-teubner-2019.tar.xz mirror://gentoo/texlive-module-xgreek-2019.tar.xz mirror://gentoo/texlive-module-yannisgr-2019.tar.xz mirror://gentoo/texlive-module-collection-langgreek-2019.tar.xz doc? ( mirror://gentoo/texlive-module-babel-greek.doc-2019.tar.xz mirror://gentoo/texlive-module-begingreek.doc-2019.tar.xz mirror://gentoo/texlive-module-betababel.doc-2019.tar.xz mirror://gentoo/texlive-module-bgreek.doc-2019.tar.xz mirror://gentoo/texlive-module-cbfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.doc-2019.tar.xz mirror://gentoo/texlive-module-gfsbaskerville.doc-2019.tar.xz mirror://gentoo/texlive-module-gfsporson.doc-2019.tar.xz mirror://gentoo/texlive-module-greek-fontenc.doc-2019.tar.xz mirror://gentoo/texlive-module-greek-inputenc.doc-2019.tar.xz mirror://gentoo/texlive-module-greekdates.doc-2019.tar.xz mirror://gentoo/texlive-module-greektex.doc-2019.tar.xz mirror://gentoo/texlive-module-greektonoi.doc-2019.tar.xz mirror://gentoo/texlive-module-hyphen-greek.doc-2019.tar.xz mirror://gentoo/texlive-module-ibycus-babel.doc-2019.tar.xz mirror://gentoo/texlive-module-ibygrk.doc-2019.tar.xz mirror://gentoo/texlive-module-kerkis.doc-2019.tar.xz mirror://gentoo/texlive-module-levy.doc-2019.tar.xz mirror://gentoo/texlive-module-lgreek.doc-2019.tar.xz mirror://gentoo/texlive-module-mkgrkindex.doc-2019.tar.xz mirror://gentoo/texlive-module-teubner.doc-2019.tar.xz mirror://gentoo/texlive-module-xgreek.doc-2019.tar.xz mirror://gentoo/texlive-module-yannisgr.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-greek.source-2019.tar.xz mirror://gentoo/texlive-module-begingreek.source-2019.tar.xz mirror://gentoo/texlive-module-cbfonts-fd.source-2019.tar.xz mirror://gentoo/texlive-module-greekdates.source-2019.tar.xz mirror://gentoo/texlive-module-ibycus-babel.source-2019.tar.xz mirror://gentoo/texlive-module-teubner.source-2019.tar.xz mirror://gentoo/texlive-module-xgreek.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=e8e713a1a0862bc5171416d43b3916c9
diff --git a/metadata/md5-cache/dev-texlive/texlive-langitalian-2019 b/metadata/md5-cache/dev-texlive/texlive-langitalian-2019
index dbdb776a4335..718481359b11 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langitalian-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langitalian-2019
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-1 GPL-2 LGPL-2 LPPL-1.3 LPPL-1.3c TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-it-2019.tar.xz mirror://gentoo/texlive-module-amsmath-it-2019.tar.xz mirror://gentoo/texlive-module-amsthdoc-it-2019.tar.xz mirror://gentoo/texlive-module-babel-italian-2019.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano-2019.tar.xz mirror://gentoo/texlive-module-fancyhdr-it-2019.tar.xz mirror://gentoo/texlive-module-fixltxhyph-2019.tar.xz mirror://gentoo/texlive-module-frontespizio-2019.tar.xz mirror://gentoo/texlive-module-hyphen-italian-2019.tar.xz mirror://gentoo/texlive-module-itnumpar-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-italian-2019.tar.xz mirror://gentoo/texlive-module-latex4wp-it-2019.tar.xz mirror://gentoo/texlive-module-layaureo-2019.tar.xz mirror://gentoo/texlive-module-lshort-italian-2019.tar.xz mirror://gentoo/texlive-module-psfrag-italian-2019.tar.xz mirror://gentoo/texlive-module-texlive-it-2019.tar.xz mirror://gentoo/texlive-module-collection-langitalian-2019.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-it.doc-2019.tar.xz mirror://gentoo/texlive-module-amsmath-it.doc-2019.tar.xz mirror://gentoo/texlive-module-amsthdoc-it.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-italian.doc-2019.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.doc-2019.tar.xz mirror://gentoo/texlive-module-fancyhdr-it.doc-2019.tar.xz mirror://gentoo/texlive-module-fixltxhyph.doc-2019.tar.xz mirror://gentoo/texlive-module-frontespizio.doc-2019.tar.xz mirror://gentoo/texlive-module-itnumpar.doc-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-italian.doc-2019.tar.xz mirror://gentoo/texlive-module-latex4wp-it.doc-2019.tar.xz mirror://gentoo/texlive-module-layaureo.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-italian.doc-2019.tar.xz mirror://gentoo/texlive-module-psfrag-italian.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-it.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-italian.source-2019.tar.xz mirror://gentoo/texlive-module-codicefiscaleitaliano.source-2019.tar.xz mirror://gentoo/texlive-module-fixltxhyph.source-2019.tar.xz mirror://gentoo/texlive-module-frontespizio.source-2019.tar.xz mirror://gentoo/texlive-module-itnumpar.source-2019.tar.xz mirror://gentoo/texlive-module-layaureo.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=31482d839e6d7b6529c674fd7cf36eb9
diff --git a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2019 b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2019
index 2bedfbe1a06a..8e547afc4aeb 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langjapanese-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langjapanese-2019
@@ -10,5 +10,5 @@ LICENSE=BSD BSD-2 GPL-1 GPL-2 GPL-3 LPPL-1.3 MIT public-domain TeX TeX-other-fre
 RDEPEND=>=dev-texlive/texlive-langcjk-2019 !<dev-texlive/texlive-basic-2016 dev-lang/ruby >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-ascmac-2019.tar.xz mirror://gentoo/texlive-module-babel-japanese-2019.tar.xz mirror://gentoo/texlive-module-bxbase-2019.tar.xz mirror://gentoo/texlive-module-bxcjkjatype-2019.tar.xz mirror://gentoo/texlive-module-bxjaholiday-2019.tar.xz mirror://gentoo/texlive-module-bxjalipsum-2019.tar.xz mirror://gentoo/texlive-module-bxjaprnind-2019.tar.xz mirror://gentoo/texlive-module-bxjscls-2019.tar.xz mirror://gentoo/texlive-module-bxorigcapt-2019.tar.xz mirror://gentoo/texlive-module-bxwareki-2019.tar.xz mirror://gentoo/texlive-module-convbkmk-2019.tar.xz mirror://gentoo/texlive-module-endnotesj-2019.tar.xz mirror://gentoo/texlive-module-gentombow-2019.tar.xz mirror://gentoo/texlive-module-ifptex-2019.tar.xz mirror://gentoo/texlive-module-ifxptex-2019.tar.xz mirror://gentoo/texlive-module-ipaex-2019.tar.xz mirror://gentoo/texlive-module-japanese-otf-2019.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex-2019.tar.xz mirror://gentoo/texlive-module-jlreq-2019.tar.xz mirror://gentoo/texlive-module-jsclasses-2019.tar.xz mirror://gentoo/texlive-module-lshort-japanese-2019.tar.xz mirror://gentoo/texlive-module-luatexja-2019.tar.xz mirror://gentoo/texlive-module-mendex-doc-2019.tar.xz mirror://gentoo/texlive-module-morisawa-2019.tar.xz mirror://gentoo/texlive-module-pbibtex-base-2019.tar.xz mirror://gentoo/texlive-module-platex-2019.tar.xz mirror://gentoo/texlive-module-platex-tools-2019.tar.xz mirror://gentoo/texlive-module-platexcheat-2019.tar.xz mirror://gentoo/texlive-module-plautopatch-2019.tar.xz mirror://gentoo/texlive-module-ptex-2019.tar.xz mirror://gentoo/texlive-module-ptex-base-2019.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps-2019.tar.xz mirror://gentoo/texlive-module-ptex-fonts-2019.tar.xz mirror://gentoo/texlive-module-ptex-manual-2019.tar.xz mirror://gentoo/texlive-module-ptex2pdf-2019.tar.xz mirror://gentoo/texlive-module-pxbase-2019.tar.xz mirror://gentoo/texlive-module-pxchfon-2019.tar.xz mirror://gentoo/texlive-module-pxcjkcat-2019.tar.xz mirror://gentoo/texlive-module-pxjahyper-2019.tar.xz mirror://gentoo/texlive-module-pxjodel-2019.tar.xz mirror://gentoo/texlive-module-pxrubrica-2019.tar.xz mirror://gentoo/texlive-module-pxufont-2019.tar.xz mirror://gentoo/texlive-module-uplatex-2019.tar.xz mirror://gentoo/texlive-module-uptex-2019.tar.xz mirror://gentoo/texlive-module-uptex-base-2019.tar.xz mirror://gentoo/texlive-module-uptex-fonts-2019.tar.xz mirror://gentoo/texlive-module-wadalab-2019.tar.xz mirror://gentoo/texlive-module-zxjafbfont-2019.tar.xz mirror://gentoo/texlive-module-zxjatype-2019.tar.xz mirror://gentoo/texlive-module-collection-langjapanese-2019.tar.xz doc? ( mirror://gentoo/texlive-module-ascmac.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-japanese.doc-2019.tar.xz mirror://gentoo/texlive-module-bxbase.doc-2019.tar.xz mirror://gentoo/texlive-module-bxcjkjatype.doc-2019.tar.xz mirror://gentoo/texlive-module-bxjaholiday.doc-2019.tar.xz mirror://gentoo/texlive-module-bxjalipsum.doc-2019.tar.xz mirror://gentoo/texlive-module-bxjaprnind.doc-2019.tar.xz mirror://gentoo/texlive-module-bxjscls.doc-2019.tar.xz mirror://gentoo/texlive-module-bxorigcapt.doc-2019.tar.xz mirror://gentoo/texlive-module-bxwareki.doc-2019.tar.xz mirror://gentoo/texlive-module-convbkmk.doc-2019.tar.xz mirror://gentoo/texlive-module-endnotesj.doc-2019.tar.xz mirror://gentoo/texlive-module-gentombow.doc-2019.tar.xz mirror://gentoo/texlive-module-ifptex.doc-2019.tar.xz mirror://gentoo/texlive-module-ifxptex.doc-2019.tar.xz mirror://gentoo/texlive-module-ipaex.doc-2019.tar.xz mirror://gentoo/texlive-module-japanese-otf.doc-2019.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.doc-2019.tar.xz mirror://gentoo/texlive-module-jlreq.doc-2019.tar.xz mirror://gentoo/texlive-module-jsclasses.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-japanese.doc-2019.tar.xz mirror://gentoo/texlive-module-luatexja.doc-2019.tar.xz mirror://gentoo/texlive-module-mendex-doc.doc-2019.tar.xz mirror://gentoo/texlive-module-morisawa.doc-2019.tar.xz mirror://gentoo/texlive-module-pbibtex-base.doc-2019.tar.xz mirror://gentoo/texlive-module-platex.doc-2019.tar.xz mirror://gentoo/texlive-module-platex-tools.doc-2019.tar.xz mirror://gentoo/texlive-module-platexcheat.doc-2019.tar.xz mirror://gentoo/texlive-module-plautopatch.doc-2019.tar.xz mirror://gentoo/texlive-module-ptex.doc-2019.tar.xz mirror://gentoo/texlive-module-ptex-base.doc-2019.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.doc-2019.tar.xz mirror://gentoo/texlive-module-ptex-fonts.doc-2019.tar.xz mirror://gentoo/texlive-module-ptex-manual.doc-2019.tar.xz mirror://gentoo/texlive-module-ptex2pdf.doc-2019.tar.xz mirror://gentoo/texlive-module-pxbase.doc-2019.tar.xz mirror://gentoo/texlive-module-pxchfon.doc-2019.tar.xz mirror://gentoo/texlive-module-pxcjkcat.doc-2019.tar.xz mirror://gentoo/texlive-module-pxjahyper.doc-2019.tar.xz mirror://gentoo/texlive-module-pxjodel.doc-2019.tar.xz mirror://gentoo/texlive-module-pxrubrica.doc-2019.tar.xz mirror://gentoo/texlive-module-pxufont.doc-2019.tar.xz mirror://gentoo/texlive-module-uplatex.doc-2019.tar.xz mirror://gentoo/texlive-module-uptex.doc-2019.tar.xz mirror://gentoo/texlive-module-uptex-base.doc-2019.tar.xz mirror://gentoo/texlive-module-uptex-fonts.doc-2019.tar.xz mirror://gentoo/texlive-module-wadalab.doc-2019.tar.xz mirror://gentoo/texlive-module-zxjafbfont.doc-2019.tar.xz mirror://gentoo/texlive-module-zxjatype.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-ascmac.source-2019.tar.xz mirror://gentoo/texlive-module-babel-japanese.source-2019.tar.xz mirror://gentoo/texlive-module-bxjscls.source-2019.tar.xz mirror://gentoo/texlive-module-japanese-otf.source-2019.tar.xz mirror://gentoo/texlive-module-japanese-otf-uptex.source-2019.tar.xz mirror://gentoo/texlive-module-jsclasses.source-2019.tar.xz mirror://gentoo/texlive-module-luatexja.source-2019.tar.xz mirror://gentoo/texlive-module-mendex-doc.source-2019.tar.xz mirror://gentoo/texlive-module-morisawa.source-2019.tar.xz mirror://gentoo/texlive-module-platex.source-2019.tar.xz mirror://gentoo/texlive-module-ptex-base.source-2019.tar.xz mirror://gentoo/texlive-module-ptex-fontmaps.source-2019.tar.xz mirror://gentoo/texlive-module-ptex-manual.source-2019.tar.xz mirror://gentoo/texlive-module-pxrubrica.source-2019.tar.xz mirror://gentoo/texlive-module-uplatex.source-2019.tar.xz mirror://gentoo/texlive-module-uptex-base.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=0a5bdd90504c237aaa73d7198a85ddcd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langkorean-2019 b/metadata/md5-cache/dev-texlive/texlive-langkorean-2019
index d26f632a5df4..d534f9768dee 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langkorean-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langkorean-2019
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-2 LPPL-1.3 OFL TeX-other-free
 RDEPEND=>=dev-texlive/texlive-langcjk-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-baekmuk-2019.tar.xz mirror://gentoo/texlive-module-cjk-ko-2019.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir-2019.tar.xz mirror://gentoo/texlive-module-kotex-plain-2019.tar.xz mirror://gentoo/texlive-module-kotex-utf-2019.tar.xz mirror://gentoo/texlive-module-kotex-utils-2019.tar.xz mirror://gentoo/texlive-module-lshort-korean-2019.tar.xz mirror://gentoo/texlive-module-nanumtype1-2019.tar.xz mirror://gentoo/texlive-module-uhc-2019.tar.xz mirror://gentoo/texlive-module-unfonts-core-2019.tar.xz mirror://gentoo/texlive-module-unfonts-extra-2019.tar.xz mirror://gentoo/texlive-module-collection-langkorean-2019.tar.xz doc? ( mirror://gentoo/texlive-module-baekmuk.doc-2019.tar.xz mirror://gentoo/texlive-module-cjk-ko.doc-2019.tar.xz mirror://gentoo/texlive-module-kotex-oblivoir.doc-2019.tar.xz mirror://gentoo/texlive-module-kotex-plain.doc-2019.tar.xz mirror://gentoo/texlive-module-kotex-utf.doc-2019.tar.xz mirror://gentoo/texlive-module-kotex-utils.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-korean.doc-2019.tar.xz mirror://gentoo/texlive-module-nanumtype1.doc-2019.tar.xz mirror://gentoo/texlive-module-uhc.doc-2019.tar.xz mirror://gentoo/texlive-module-unfonts-core.doc-2019.tar.xz mirror://gentoo/texlive-module-unfonts-extra.doc-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=f5d870324584c902c9175d0694fdd2ce
diff --git a/metadata/md5-cache/dev-texlive/texlive-langother-2019 b/metadata/md5-cache/dev-texlive/texlive-langother-2019
index 606026efff32..2c971dcb0ddb 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langother-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langother-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LGPL-2 LPPL-1.3 OFL public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !dev-texlive/texlive-documentation-vietnamese !dev-texlive/texlive-langvietnamese !<dev-texlive/texlive-langcjk-2013 !dev-texlive/texlive-langhebrew !dev-texlive/texlive-documentation-thai !dev-texlive/texlive-langturkmen !dev-texlive/texlive-langtibetan !<dev-texlive/texlive-basic-2016 !<dev-texlive/texlive-langafrican-2017 !<dev-texlive/texlive-langindic-2017 !<dev-texlive/texlive-langeuropean-2017 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-amsldoc-vn-2019.tar.xz mirror://gentoo/texlive-module-aramaic-serto-2019.tar.xz mirror://gentoo/texlive-module-hyphen-armenian-2019.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani-2019.tar.xz mirror://gentoo/texlive-module-babel-esperanto-2019.tar.xz mirror://gentoo/texlive-module-babel-georgian-2019.tar.xz mirror://gentoo/texlive-module-babel-hebrew-2019.tar.xz mirror://gentoo/texlive-module-babel-indonesian-2019.tar.xz mirror://gentoo/texlive-module-babel-interlingua-2019.tar.xz mirror://gentoo/texlive-module-babel-malay-2019.tar.xz mirror://gentoo/texlive-module-babel-sorbian-2019.tar.xz mirror://gentoo/texlive-module-babel-thai-2019.tar.xz mirror://gentoo/texlive-module-babel-vietnamese-2019.tar.xz mirror://gentoo/texlive-module-bangtex-2019.tar.xz mirror://gentoo/texlive-module-bengali-2019.tar.xz mirror://gentoo/texlive-module-burmese-2019.tar.xz mirror://gentoo/texlive-module-cjhebrew-2019.tar.xz mirror://gentoo/texlive-module-ctib-2019.tar.xz mirror://gentoo/texlive-module-ebong-2019.tar.xz mirror://gentoo/texlive-module-ethiop-2019.tar.xz mirror://gentoo/texlive-module-ethiop-t1-2019.tar.xz mirror://gentoo/texlive-module-fc-2019.tar.xz mirror://gentoo/texlive-module-fonts-tlwg-2019.tar.xz mirror://gentoo/texlive-module-hyphen-afrikaans-2019.tar.xz mirror://gentoo/texlive-module-hyphen-coptic-2019.tar.xz mirror://gentoo/texlive-module-hyphen-esperanto-2019.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic-2019.tar.xz mirror://gentoo/texlive-module-hyphen-georgian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-indic-2019.tar.xz mirror://gentoo/texlive-module-hyphen-indonesian-2019.tar.xz mirror://gentoo/texlive-module-hyphen-interlingua-2019.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit-2019.tar.xz mirror://gentoo/texlive-module-hyphen-thai-2019.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen-2019.tar.xz mirror://gentoo/texlive-module-latex-mr-2019.tar.xz mirror://gentoo/texlive-module-latexbangla-2019.tar.xz mirror://gentoo/texlive-module-lshort-thai-2019.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese-2019.tar.xz mirror://gentoo/texlive-module-ntheorem-vn-2019.tar.xz mirror://gentoo/texlive-module-padauk-2019.tar.xz mirror://gentoo/texlive-module-quran-ur-2019.tar.xz mirror://gentoo/texlive-module-sanskrit-2019.tar.xz mirror://gentoo/texlive-module-sanskrit-t1-2019.tar.xz mirror://gentoo/texlive-module-thaienum-2019.tar.xz mirror://gentoo/texlive-module-thaispec-2019.tar.xz mirror://gentoo/texlive-module-velthuis-2019.tar.xz mirror://gentoo/texlive-module-vntex-2019.tar.xz mirror://gentoo/texlive-module-wnri-2019.tar.xz mirror://gentoo/texlive-module-wnri-latex-2019.tar.xz mirror://gentoo/texlive-module-xetex-devanagari-2019.tar.xz mirror://gentoo/texlive-module-collection-langother-2019.tar.xz doc? ( mirror://gentoo/texlive-module-amsldoc-vn.doc-2019.tar.xz mirror://gentoo/texlive-module-aramaic-serto.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-esperanto.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-georgian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-hebrew.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-indonesian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-interlingua.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-malay.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-sorbian.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-thai.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.doc-2019.tar.xz mirror://gentoo/texlive-module-bangtex.doc-2019.tar.xz mirror://gentoo/texlive-module-bengali.doc-2019.tar.xz mirror://gentoo/texlive-module-burmese.doc-2019.tar.xz mirror://gentoo/texlive-module-cjhebrew.doc-2019.tar.xz mirror://gentoo/texlive-module-ctib.doc-2019.tar.xz mirror://gentoo/texlive-module-ebong.doc-2019.tar.xz mirror://gentoo/texlive-module-ethiop.doc-2019.tar.xz mirror://gentoo/texlive-module-ethiop-t1.doc-2019.tar.xz mirror://gentoo/texlive-module-fc.doc-2019.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.doc-2019.tar.xz mirror://gentoo/texlive-module-hyphen-sanskrit.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-mr.doc-2019.tar.xz mirror://gentoo/texlive-module-latexbangla.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-thai.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-vietnamese.doc-2019.tar.xz mirror://gentoo/texlive-module-ntheorem-vn.doc-2019.tar.xz mirror://gentoo/texlive-module-padauk.doc-2019.tar.xz mirror://gentoo/texlive-module-quran-ur.doc-2019.tar.xz mirror://gentoo/texlive-module-sanskrit.doc-2019.tar.xz mirror://gentoo/texlive-module-sanskrit-t1.doc-2019.tar.xz mirror://gentoo/texlive-module-thaienum.doc-2019.tar.xz mirror://gentoo/texlive-module-thaispec.doc-2019.tar.xz mirror://gentoo/texlive-module-velthuis.doc-2019.tar.xz mirror://gentoo/texlive-module-vntex.doc-2019.tar.xz mirror://gentoo/texlive-module-wnri.doc-2019.tar.xz mirror://gentoo/texlive-module-wnri-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex-devanagari.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-hyphen-armenian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-azerbaijani.source-2019.tar.xz mirror://gentoo/texlive-module-babel-esperanto.source-2019.tar.xz mirror://gentoo/texlive-module-babel-hebrew.source-2019.tar.xz mirror://gentoo/texlive-module-babel-indonesian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-interlingua.source-2019.tar.xz mirror://gentoo/texlive-module-babel-malay.source-2019.tar.xz mirror://gentoo/texlive-module-babel-sorbian.source-2019.tar.xz mirror://gentoo/texlive-module-babel-thai.source-2019.tar.xz mirror://gentoo/texlive-module-babel-vietnamese.source-2019.tar.xz mirror://gentoo/texlive-module-bengali.source-2019.tar.xz mirror://gentoo/texlive-module-burmese.source-2019.tar.xz mirror://gentoo/texlive-module-ctib.source-2019.tar.xz mirror://gentoo/texlive-module-ethiop.source-2019.tar.xz mirror://gentoo/texlive-module-fonts-tlwg.source-2019.tar.xz mirror://gentoo/texlive-module-hyphen-ethiopic.source-2019.tar.xz mirror://gentoo/texlive-module-hyphen-turkmen.source-2019.tar.xz mirror://gentoo/texlive-module-sanskrit.source-2019.tar.xz mirror://gentoo/texlive-module-thaispec.source-2019.tar.xz mirror://gentoo/texlive-module-vntex.source-2019.tar.xz mirror://gentoo/texlive-module-wnri-latex.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=ce5ac70994c9739cf3f5be9b7af13893
diff --git a/metadata/md5-cache/dev-texlive/texlive-langpolish-2019 b/metadata/md5-cache/dev-texlive/texlive-langpolish-2019
index 1216bf0674d8..c8782b60d900 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langpolish-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langpolish-2019
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX
 RDEPEND=>=dev-texlive/texlive-latex-2019 >=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-polish-2019.tar.xz mirror://gentoo/texlive-module-bredzenie-2019.tar.xz mirror://gentoo/texlive-module-cc-pl-2019.tar.xz mirror://gentoo/texlive-module-gustlib-2019.tar.xz mirror://gentoo/texlive-module-gustprog-2019.tar.xz mirror://gentoo/texlive-module-hyphen-polish-2019.tar.xz mirror://gentoo/texlive-module-lshort-polish-2019.tar.xz mirror://gentoo/texlive-module-mex-2019.tar.xz mirror://gentoo/texlive-module-mwcls-2019.tar.xz mirror://gentoo/texlive-module-pl-2019.tar.xz mirror://gentoo/texlive-module-polski-2019.tar.xz mirror://gentoo/texlive-module-przechlewski-book-2019.tar.xz mirror://gentoo/texlive-module-qpxqtx-2019.tar.xz mirror://gentoo/texlive-module-tap-2019.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl-2019.tar.xz mirror://gentoo/texlive-module-texlive-pl-2019.tar.xz mirror://gentoo/texlive-module-utf8mex-2019.tar.xz mirror://gentoo/texlive-module-collection-langpolish-2019.tar.xz doc? ( mirror://gentoo/texlive-module-babel-polish.doc-2019.tar.xz mirror://gentoo/texlive-module-bredzenie.doc-2019.tar.xz mirror://gentoo/texlive-module-cc-pl.doc-2019.tar.xz mirror://gentoo/texlive-module-gustlib.doc-2019.tar.xz mirror://gentoo/texlive-module-gustprog.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-polish.doc-2019.tar.xz mirror://gentoo/texlive-module-mex.doc-2019.tar.xz mirror://gentoo/texlive-module-mwcls.doc-2019.tar.xz mirror://gentoo/texlive-module-pl.doc-2019.tar.xz mirror://gentoo/texlive-module-polski.doc-2019.tar.xz mirror://gentoo/texlive-module-przechlewski-book.doc-2019.tar.xz mirror://gentoo/texlive-module-qpxqtx.doc-2019.tar.xz mirror://gentoo/texlive-module-tap.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-virtual-academy-pl.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-pl.doc-2019.tar.xz mirror://gentoo/texlive-module-utf8mex.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-polish.source-2019.tar.xz mirror://gentoo/texlive-module-mex.source-2019.tar.xz mirror://gentoo/texlive-module-mwcls.source-2019.tar.xz mirror://gentoo/texlive-module-polski.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=11b46e83b3b25a9f508ce422a52103bd
diff --git a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2019 b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2019
index 9f317583a57b..bebc96af45e4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langportuguese-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langportuguese-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2+ LPPL-1.3 public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-portuges-2019.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt-2019.tar.xz mirror://gentoo/texlive-module-cursolatex-2019.tar.xz mirror://gentoo/texlive-module-feupphdteses-2019.tar.xz mirror://gentoo/texlive-module-hyphen-portuguese-2019.tar.xz mirror://gentoo/texlive-module-latex-via-exemplos-2019.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr-2019.tar.xz mirror://gentoo/texlive-module-lshort-portuguese-2019.tar.xz mirror://gentoo/texlive-module-ordinalpt-2019.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt-2019.tar.xz mirror://gentoo/texlive-module-collection-langportuguese-2019.tar.xz doc? ( mirror://gentoo/texlive-module-babel-portuges.doc-2019.tar.xz mirror://gentoo/texlive-module-beamer-tut-pt.doc-2019.tar.xz mirror://gentoo/texlive-module-cursolatex.doc-2019.tar.xz mirror://gentoo/texlive-module-feupphdteses.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-via-exemplos.doc-2019.tar.xz mirror://gentoo/texlive-module-latexcheat-ptbr.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-portuguese.doc-2019.tar.xz mirror://gentoo/texlive-module-ordinalpt.doc-2019.tar.xz mirror://gentoo/texlive-module-xypic-tut-pt.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-portuges.source-2019.tar.xz mirror://gentoo/texlive-module-ordinalpt.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=8a0872de11ce10d3ccdd256872966d5f
diff --git a/metadata/md5-cache/dev-texlive/texlive-langspanish-2019 b/metadata/md5-cache/dev-texlive/texlive-langspanish-2019
index 6b0e6d2fc14d..63f76fc1b572 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langspanish-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-langspanish-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LPPL-1.3 public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !<dev-texlive/texlive-basic-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-babel-catalan-2019.tar.xz mirror://gentoo/texlive-module-babel-galician-2019.tar.xz mirror://gentoo/texlive-module-babel-spanglish-2019.tar.xz mirror://gentoo/texlive-module-babel-spanish-2019.tar.xz mirror://gentoo/texlive-module-es-tex-faq-2019.tar.xz mirror://gentoo/texlive-module-hyphen-catalan-2019.tar.xz mirror://gentoo/texlive-module-hyphen-galician-2019.tar.xz mirror://gentoo/texlive-module-hyphen-spanish-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish-2019.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish-2019.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx-2019.tar.xz mirror://gentoo/texlive-module-lshort-spanish-2019.tar.xz mirror://gentoo/texlive-module-spanish-mx-2019.tar.xz mirror://gentoo/texlive-module-texlive-es-2019.tar.xz mirror://gentoo/texlive-module-collection-langspanish-2019.tar.xz doc? ( mirror://gentoo/texlive-module-babel-catalan.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-galician.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-spanglish.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-spanish.doc-2019.tar.xz mirror://gentoo/texlive-module-es-tex-faq.doc-2019.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.doc-2019.tar.xz mirror://gentoo/texlive-module-l2tabu-spanish.doc-2019.tar.xz mirror://gentoo/texlive-module-latex2e-help-texinfo-spanish.doc-2019.tar.xz mirror://gentoo/texlive-module-latexcheat-esmx.doc-2019.tar.xz mirror://gentoo/texlive-module-lshort-spanish.doc-2019.tar.xz mirror://gentoo/texlive-module-spanish-mx.doc-2019.tar.xz mirror://gentoo/texlive-module-texlive-es.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-catalan.source-2019.tar.xz mirror://gentoo/texlive-module-babel-galician.source-2019.tar.xz mirror://gentoo/texlive-module-babel-spanish.source-2019.tar.xz mirror://gentoo/texlive-module-hyphen-galician.source-2019.tar.xz mirror://gentoo/texlive-module-hyphen-spanish.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=2a33aaf85706e994a6133c48bb104a24
diff --git a/metadata/md5-cache/dev-texlive/texlive-latex-2019 b/metadata/md5-cache/dev-texlive/texlive-latex-2019
index 76a9c60f3cc9..24f0a46995d1 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latex-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-latex-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LPPL-1.3 LPPL-1.3c public-domain
 RDEPEND=>=dev-texlive/texlive-basic-2019 !!<dev-texlive/texlive-latex-2016 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-ae-2019.tar.xz mirror://gentoo/texlive-module-amscls-2019.tar.xz mirror://gentoo/texlive-module-amsmath-2019.tar.xz mirror://gentoo/texlive-module-babel-2019.tar.xz mirror://gentoo/texlive-module-babel-english-2019.tar.xz mirror://gentoo/texlive-module-babelbib-2019.tar.xz mirror://gentoo/texlive-module-carlisle-2019.tar.xz mirror://gentoo/texlive-module-colortbl-2019.tar.xz mirror://gentoo/texlive-module-fancyhdr-2019.tar.xz mirror://gentoo/texlive-module-fix2col-2019.tar.xz mirror://gentoo/texlive-module-geometry-2019.tar.xz mirror://gentoo/texlive-module-graphics-2019.tar.xz mirror://gentoo/texlive-module-graphics-cfg-2019.tar.xz mirror://gentoo/texlive-module-hyperref-2019.tar.xz mirror://gentoo/texlive-module-latex-2019.tar.xz mirror://gentoo/texlive-module-latex-bin-2019.tar.xz mirror://gentoo/texlive-module-latex-fonts-2019.tar.xz mirror://gentoo/texlive-module-latexconfig-2019.tar.xz mirror://gentoo/texlive-module-ltxmisc-2019.tar.xz mirror://gentoo/texlive-module-mfnfss-2019.tar.xz mirror://gentoo/texlive-module-mptopdf-2019.tar.xz mirror://gentoo/texlive-module-natbib-2019.tar.xz mirror://gentoo/texlive-module-oberdiek-2019.tar.xz mirror://gentoo/texlive-module-pslatex-2019.tar.xz mirror://gentoo/texlive-module-psnfss-2019.tar.xz mirror://gentoo/texlive-module-pspicture-2019.tar.xz mirror://gentoo/texlive-module-tools-2019.tar.xz mirror://gentoo/texlive-module-url-2019.tar.xz mirror://gentoo/texlive-module-collection-latex-2019.tar.xz doc? ( mirror://gentoo/texlive-module-ae.doc-2019.tar.xz mirror://gentoo/texlive-module-amscls.doc-2019.tar.xz mirror://gentoo/texlive-module-amsmath.doc-2019.tar.xz mirror://gentoo/texlive-module-babel.doc-2019.tar.xz mirror://gentoo/texlive-module-babel-english.doc-2019.tar.xz mirror://gentoo/texlive-module-babelbib.doc-2019.tar.xz mirror://gentoo/texlive-module-carlisle.doc-2019.tar.xz mirror://gentoo/texlive-module-colortbl.doc-2019.tar.xz mirror://gentoo/texlive-module-fancyhdr.doc-2019.tar.xz mirror://gentoo/texlive-module-fix2col.doc-2019.tar.xz mirror://gentoo/texlive-module-geometry.doc-2019.tar.xz mirror://gentoo/texlive-module-graphics.doc-2019.tar.xz mirror://gentoo/texlive-module-graphics-cfg.doc-2019.tar.xz mirror://gentoo/texlive-module-hyperref.doc-2019.tar.xz mirror://gentoo/texlive-module-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-bin.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-fonts.doc-2019.tar.xz mirror://gentoo/texlive-module-mfnfss.doc-2019.tar.xz mirror://gentoo/texlive-module-mptopdf.doc-2019.tar.xz mirror://gentoo/texlive-module-natbib.doc-2019.tar.xz mirror://gentoo/texlive-module-oberdiek.doc-2019.tar.xz mirror://gentoo/texlive-module-psnfss.doc-2019.tar.xz mirror://gentoo/texlive-module-pspicture.doc-2019.tar.xz mirror://gentoo/texlive-module-tools.doc-2019.tar.xz mirror://gentoo/texlive-module-url.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-ae.source-2019.tar.xz mirror://gentoo/texlive-module-amscls.source-2019.tar.xz mirror://gentoo/texlive-module-amsmath.source-2019.tar.xz mirror://gentoo/texlive-module-babel.source-2019.tar.xz mirror://gentoo/texlive-module-babel-english.source-2019.tar.xz mirror://gentoo/texlive-module-carlisle.source-2019.tar.xz mirror://gentoo/texlive-module-colortbl.source-2019.tar.xz mirror://gentoo/texlive-module-fancyhdr.source-2019.tar.xz mirror://gentoo/texlive-module-fix2col.source-2019.tar.xz mirror://gentoo/texlive-module-geometry.source-2019.tar.xz mirror://gentoo/texlive-module-graphics.source-2019.tar.xz mirror://gentoo/texlive-module-hyperref.source-2019.tar.xz mirror://gentoo/texlive-module-latex.source-2019.tar.xz mirror://gentoo/texlive-module-mfnfss.source-2019.tar.xz mirror://gentoo/texlive-module-natbib.source-2019.tar.xz mirror://gentoo/texlive-module-oberdiek.source-2019.tar.xz mirror://gentoo/texlive-module-pslatex.source-2019.tar.xz mirror://gentoo/texlive-module-psnfss.source-2019.tar.xz mirror://gentoo/texlive-module-pspicture.source-2019.tar.xz mirror://gentoo/texlive-module-tools.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=a0c3e14a51f1322d602aa01bffe9f91e
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexextra-2019-r2 b/metadata/md5-cache/dev-texlive/texlive-latexextra-2019-r2
index 762f4eb4ca02..0c6fb0b5976f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexextra-2019-r2
+++ b/metadata/md5-cache/dev-texlive/texlive-latexextra-2019-r2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 Artistic BSD CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+ LGPL-2 LGP
 RDEPEND=>=dev-texlive/texlive-latexrecommended-2019 >=dev-texlive/texlive-pictures-2019 >=dev-texlive/texlive-fontsrecommended-2014 !=dev-texlive/texlive-humanities-2017* !=dev-texlive/texlive-pstricks-2017* !=dev-texlive/texlive-mathscience-2017* dev-perl/Spreadsheet-ParseExcel >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-2up-2019.tar.xz mirror://gentoo/texlive-module-ESIEEcv-2019.tar.xz mirror://gentoo/texlive-module-GS1-2019.tar.xz mirror://gentoo/texlive-module-HA-prosper-2019.tar.xz mirror://gentoo/texlive-module-Tabbing-2019.tar.xz mirror://gentoo/texlive-module-a0poster-2019.tar.xz mirror://gentoo/texlive-module-a4wide-2019.tar.xz mirror://gentoo/texlive-module-a5comb-2019.tar.xz mirror://gentoo/texlive-module-abraces-2019.tar.xz mirror://gentoo/texlive-module-abstract-2019.tar.xz mirror://gentoo/texlive-module-achemso-2019.tar.xz mirror://gentoo/texlive-module-acro-2019.tar.xz mirror://gentoo/texlive-module-acronym-2019.tar.xz mirror://gentoo/texlive-module-acroterm-2019.tar.xz mirror://gentoo/texlive-module-actuarialangle-2019.tar.xz mirror://gentoo/texlive-module-actuarialsymbol-2019.tar.xz mirror://gentoo/texlive-module-addfont-2019.tar.xz mirror://gentoo/texlive-module-addlines-2019.tar.xz mirror://gentoo/texlive-module-adjmulticol-2019.tar.xz mirror://gentoo/texlive-module-adjustbox-2019.tar.xz mirror://gentoo/texlive-module-adrconv-2019.tar.xz mirror://gentoo/texlive-module-advdate-2019.tar.xz mirror://gentoo/texlive-module-akktex-2019.tar.xz mirror://gentoo/texlive-module-akletter-2019.tar.xz mirror://gentoo/texlive-module-alertmessage-2019.tar.xz mirror://gentoo/texlive-module-alnumsec-2019.tar.xz mirror://gentoo/texlive-module-alterqcm-2019.tar.xz mirror://gentoo/texlive-module-altfont-2019.tar.xz mirror://gentoo/texlive-module-amsaddr-2019.tar.xz mirror://gentoo/texlive-module-animate-2019.tar.xz mirror://gentoo/texlive-module-anonchap-2019.tar.xz mirror://gentoo/texlive-module-answers-2019.tar.xz mirror://gentoo/texlive-module-anyfontsize-2019.tar.xz mirror://gentoo/texlive-module-appendix-2019.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer-2019.tar.xz mirror://gentoo/texlive-module-apptools-2019.tar.xz mirror://gentoo/texlive-module-arcs-2019.tar.xz mirror://gentoo/texlive-module-arrayjobx-2019.tar.xz mirror://gentoo/texlive-module-arraysort-2019.tar.xz mirror://gentoo/texlive-module-arydshln-2019.tar.xz mirror://gentoo/texlive-module-asciilist-2019.tar.xz mirror://gentoo/texlive-module-assignment-2019.tar.xz mirror://gentoo/texlive-module-assoccnt-2019.tar.xz mirror://gentoo/texlive-module-attachfile-2019.tar.xz mirror://gentoo/texlive-module-aurl-2019.tar.xz mirror://gentoo/texlive-module-authoraftertitle-2019.tar.xz mirror://gentoo/texlive-module-authorarchive-2019.tar.xz mirror://gentoo/texlive-module-authorindex-2019.tar.xz mirror://gentoo/texlive-module-autonum-2019.tar.xz mirror://gentoo/texlive-module-autopdf-2019.tar.xz mirror://gentoo/texlive-module-avremu-2019.tar.xz mirror://gentoo/texlive-module-background-2019.tar.xz mirror://gentoo/texlive-module-bankstatement-2019.tar.xz mirror://gentoo/texlive-module-bashful-2019.tar.xz mirror://gentoo/texlive-module-basicarith-2019.tar.xz mirror://gentoo/texlive-module-bchart-2019.tar.xz mirror://gentoo/texlive-module-beamer2thesis-2019.tar.xz mirror://gentoo/texlive-module-beamer-rl-2019.tar.xz mirror://gentoo/texlive-module-beameraudience-2019.tar.xz mirror://gentoo/texlive-module-beamerauxtheme-2019.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl-2019.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes-2019.tar.xz mirror://gentoo/texlive-module-beamerposter-2019.tar.xz mirror://gentoo/texlive-module-beamersubframe-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-focus-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-light-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-npbt-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-saintpetersburg-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc-2019.tar.xz mirror://gentoo/texlive-module-beamerthemejltree-2019.tar.xz mirror://gentoo/texlive-module-beamerthemenirma-2019.tar.xz mirror://gentoo/texlive-module-beton-2019.tar.xz mirror://gentoo/texlive-module-bewerbung-2019.tar.xz mirror://gentoo/texlive-module-bez123-2019.tar.xz mirror://gentoo/texlive-module-bezos-2019.tar.xz mirror://gentoo/texlive-module-bhcexam-2019.tar.xz mirror://gentoo/texlive-module-bibletext-2019.tar.xz mirror://gentoo/texlive-module-bigfoot-2019.tar.xz mirror://gentoo/texlive-module-bigints-2019.tar.xz mirror://gentoo/texlive-module-biochemistry-colors-2019.tar.xz mirror://gentoo/texlive-module-bizcard-2019.tar.xz mirror://gentoo/texlive-module-blindtext-2019.tar.xz mirror://gentoo/texlive-module-blkarray-2019.tar.xz mirror://gentoo/texlive-module-block-2019.tar.xz mirror://gentoo/texlive-module-blowup-2019.tar.xz mirror://gentoo/texlive-module-bnumexpr-2019.tar.xz mirror://gentoo/texlive-module-boites-2019.tar.xz mirror://gentoo/texlive-module-bold-extra-2019.tar.xz mirror://gentoo/texlive-module-bookcover-2019.tar.xz mirror://gentoo/texlive-module-bookest-2019.tar.xz mirror://gentoo/texlive-module-booklet-2019.tar.xz mirror://gentoo/texlive-module-boolexpr-2019.tar.xz mirror://gentoo/texlive-module-bophook-2019.tar.xz mirror://gentoo/texlive-module-boxedminipage-2019.tar.xz mirror://gentoo/texlive-module-boxedminipage2e-2019.tar.xz mirror://gentoo/texlive-module-boxhandler-2019.tar.xz mirror://gentoo/texlive-module-bracketkey-2019.tar.xz mirror://gentoo/texlive-module-braket-2019.tar.xz mirror://gentoo/texlive-module-breakurl-2019.tar.xz mirror://gentoo/texlive-module-bullcntr-2019.tar.xz mirror://gentoo/texlive-module-bxcalc-2019.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer-2019.tar.xz mirror://gentoo/texlive-module-bxdvidriver-2019.tar.xz mirror://gentoo/texlive-module-bxenclose-2019.tar.xz mirror://gentoo/texlive-module-bxnewfont-2019.tar.xz mirror://gentoo/texlive-module-bxpapersize-2019.tar.xz mirror://gentoo/texlive-module-bxpdfver-2019.tar.xz mirror://gentoo/texlive-module-bxtexlogo-2019.tar.xz mirror://gentoo/texlive-module-calcage-2019.tar.xz mirror://gentoo/texlive-module-calctab-2019.tar.xz mirror://gentoo/texlive-module-calculator-2019.tar.xz mirror://gentoo/texlive-module-calrsfs-2019.tar.xz mirror://gentoo/texlive-module-cals-2019.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy-2019.tar.xz mirror://gentoo/texlive-module-cancel-2019.tar.xz mirror://gentoo/texlive-module-canoniclayout-2019.tar.xz mirror://gentoo/texlive-module-capt-of-2019.tar.xz mirror://gentoo/texlive-module-captcont-2019.tar.xz mirror://gentoo/texlive-module-captdef-2019.tar.xz mirror://gentoo/texlive-module-carbohydrates-2019.tar.xz mirror://gentoo/texlive-module-cases-2019.tar.xz mirror://gentoo/texlive-module-casyl-2019.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags-2019.tar.xz mirror://gentoo/texlive-module-catechis-2019.tar.xz mirror://gentoo/texlive-module-catoptions-2019.tar.xz mirror://gentoo/texlive-module-cbcoptic-2019.tar.xz mirror://gentoo/texlive-module-ccaption-2019.tar.xz mirror://gentoo/texlive-module-cclicenses-2019.tar.xz mirror://gentoo/texlive-module-cd-2019.tar.xz mirror://gentoo/texlive-module-cd-cover-2019.tar.xz mirror://gentoo/texlive-module-cdpbundl-2019.tar.xz mirror://gentoo/texlive-module-cellprops-2019.tar.xz mirror://gentoo/texlive-module-cellspace-2019.tar.xz mirror://gentoo/texlive-module-censor-2019.tar.xz mirror://gentoo/texlive-module-centeredline-2019.tar.xz mirror://gentoo/texlive-module-changebar-2019.tar.xz mirror://gentoo/texlive-module-changelayout-2019.tar.xz mirror://gentoo/texlive-module-changelog-2019.tar.xz mirror://gentoo/texlive-module-changepage-2019.tar.xz mirror://gentoo/texlive-module-changes-2019.tar.xz mirror://gentoo/texlive-module-chappg-2019.tar.xz mirror://gentoo/texlive-module-chapterfolder-2019.tar.xz mirror://gentoo/texlive-module-cheatsheet-2019.tar.xz mirror://gentoo/texlive-module-chet-2019.tar.xz mirror://gentoo/texlive-module-chextras-2019.tar.xz mirror://gentoo/texlive-module-childdoc-2019.tar.xz mirror://gentoo/texlive-module-chkfloat-2019.tar.xz mirror://gentoo/texlive-module-chletter-2019.tar.xz mirror://gentoo/texlive-module-chngcntr-2019.tar.xz mirror://gentoo/texlive-module-chronology-2019.tar.xz mirror://gentoo/texlive-module-circ-2019.tar.xz mirror://gentoo/texlive-module-classics-2019.tar.xz mirror://gentoo/texlive-module-classpack-2019.tar.xz mirror://gentoo/texlive-module-clefval-2019.tar.xz mirror://gentoo/texlive-module-cleveref-2019.tar.xz mirror://gentoo/texlive-module-clipboard-2019.tar.xz mirror://gentoo/texlive-module-clock-2019.tar.xz mirror://gentoo/texlive-module-cloze-2019.tar.xz mirror://gentoo/texlive-module-clrdblpg-2019.tar.xz mirror://gentoo/texlive-module-clrstrip-2019.tar.xz mirror://gentoo/texlive-module-cmdstring-2019.tar.xz mirror://gentoo/texlive-module-cmdtrack-2019.tar.xz mirror://gentoo/texlive-module-cmsd-2019.tar.xz mirror://gentoo/texlive-module-cnltx-2019.tar.xz mirror://gentoo/texlive-module-cntformats-2019.tar.xz mirror://gentoo/texlive-module-cntperchap-2019.tar.xz mirror://gentoo/texlive-module-codedoc-2019.tar.xz mirror://gentoo/texlive-module-codepage-2019.tar.xz mirror://gentoo/texlive-module-codesection-2019.tar.xz mirror://gentoo/texlive-module-collcell-2019.tar.xz mirror://gentoo/texlive-module-collectbox-2019.tar.xz mirror://gentoo/texlive-module-colophon-2019.tar.xz mirror://gentoo/texlive-module-colordoc-2019.tar.xz mirror://gentoo/texlive-module-colorinfo-2019.tar.xz mirror://gentoo/texlive-module-coloring-2019.tar.xz mirror://gentoo/texlive-module-colorspace-2019.tar.xz mirror://gentoo/texlive-module-colortab-2019.tar.xz mirror://gentoo/texlive-module-colorwav-2019.tar.xz mirror://gentoo/texlive-module-colorweb-2019.tar.xz mirror://gentoo/texlive-module-colourchange-2019.tar.xz mirror://gentoo/texlive-module-combelow-2019.tar.xz mirror://gentoo/texlive-module-combine-2019.tar.xz mirror://gentoo/texlive-module-comma-2019.tar.xz mirror://gentoo/texlive-module-commado-2019.tar.xz mirror://gentoo/texlive-module-commedit-2019.tar.xz mirror://gentoo/texlive-module-comment-2019.tar.xz mirror://gentoo/texlive-module-competences-2019.tar.xz mirror://gentoo/texlive-module-concepts-2019.tar.xz mirror://gentoo/texlive-module-concprog-2019.tar.xz mirror://gentoo/texlive-module-constants-2019.tar.xz mirror://gentoo/texlive-module-continue-2019.tar.xz mirror://gentoo/texlive-module-contour-2019.tar.xz mirror://gentoo/texlive-module-contracard-2019.tar.xz mirror://gentoo/texlive-module-conv-xkv-2019.tar.xz mirror://gentoo/texlive-module-cooking-2019.tar.xz mirror://gentoo/texlive-module-cooking-units-2019.tar.xz mirror://gentoo/texlive-module-cool-2019.tar.xz mirror://gentoo/texlive-module-coollist-2019.tar.xz mirror://gentoo/texlive-module-coolstr-2019.tar.xz mirror://gentoo/texlive-module-coolthms-2019.tar.xz mirror://gentoo/texlive-module-cooltooltips-2019.tar.xz mirror://gentoo/texlive-module-coordsys-2019.tar.xz mirror://gentoo/texlive-module-copyedit-2019.tar.xz mirror://gentoo/texlive-module-copyrightbox-2019.tar.xz mirror://gentoo/texlive-module-coseoul-2019.tar.xz mirror://gentoo/texlive-module-counttexruns-2019.tar.xz mirror://gentoo/texlive-module-courseoutline-2019.tar.xz mirror://gentoo/texlive-module-coursepaper-2019.tar.xz mirror://gentoo/texlive-module-coverpage-2019.tar.xz mirror://gentoo/texlive-module-cprotect-2019.tar.xz mirror://gentoo/texlive-module-crbox-2019.tar.xz mirror://gentoo/texlive-module-crossreference-2019.tar.xz mirror://gentoo/texlive-module-crossreftools-2019.tar.xz mirror://gentoo/texlive-module-csquotes-2019.tar.xz mirror://gentoo/texlive-module-css-colors-2019.tar.xz mirror://gentoo/texlive-module-csvsimple-2019.tar.xz mirror://gentoo/texlive-module-cuisine-2019.tar.xz mirror://gentoo/texlive-module-currency-2019.tar.xz mirror://gentoo/texlive-module-currfile-2019.tar.xz mirror://gentoo/texlive-module-cutwin-2019.tar.xz mirror://gentoo/texlive-module-cv-2019.tar.xz mirror://gentoo/texlive-module-cv4tw-2019.tar.xz mirror://gentoo/texlive-module-cweb-latex-2019.tar.xz mirror://gentoo/texlive-module-cyber-2019.tar.xz mirror://gentoo/texlive-module-cybercic-2019.tar.xz mirror://gentoo/texlive-module-dashbox-2019.tar.xz mirror://gentoo/texlive-module-dashrule-2019.tar.xz mirror://gentoo/texlive-module-dashundergaps-2019.tar.xz mirror://gentoo/texlive-module-dataref-2019.tar.xz mirror://gentoo/texlive-module-datatool-2019.tar.xz mirror://gentoo/texlive-module-dateiliste-2019.tar.xz mirror://gentoo/texlive-module-datenumber-2019.tar.xz mirror://gentoo/texlive-module-datetime-2019.tar.xz mirror://gentoo/texlive-module-datetime2-2019.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai-2019.tar.xz mirror://gentoo/texlive-module-datetime2-basque-2019.tar.xz mirror://gentoo/texlive-module-datetime2-breton-2019.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-catalan-2019.tar.xz mirror://gentoo/texlive-module-datetime2-croatian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-czech-2019.tar.xz mirror://gentoo/texlive-module-datetime2-danish-2019.tar.xz mirror://gentoo/texlive-module-datetime2-dutch-2019.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext-2019.tar.xz mirror://gentoo/texlive-module-datetime2-english-2019.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto-2019.tar.xz mirror://gentoo/texlive-module-datetime2-estonian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-finnish-2019.tar.xz mirror://gentoo/texlive-module-datetime2-french-2019.tar.xz mirror://gentoo/texlive-module-datetime2-galician-2019.tar.xz mirror://gentoo/texlive-module-datetime2-german-2019.tar.xz mirror://gentoo/texlive-module-datetime2-greek-2019.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew-2019.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic-2019.tar.xz mirror://gentoo/texlive-module-datetime2-irish-2019.tar.xz mirror://gentoo/texlive-module-datetime2-italian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext-2019.tar.xz mirror://gentoo/texlive-module-datetime2-latin-2019.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-magyar-2019.tar.xz mirror://gentoo/texlive-module-datetime2-norsk-2019.tar.xz mirror://gentoo/texlive-module-datetime2-polish-2019.tar.xz mirror://gentoo/texlive-module-datetime2-portuges-2019.tar.xz mirror://gentoo/texlive-module-datetime2-romanian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-russian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-samin-2019.tar.xz mirror://gentoo/texlive-module-datetime2-scottish-2019.tar.xz mirror://gentoo/texlive-module-datetime2-serbian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-slovak-2019.tar.xz mirror://gentoo/texlive-module-datetime2-slovene-2019.tar.xz mirror://gentoo/texlive-module-datetime2-spanish-2019.tar.xz mirror://gentoo/texlive-module-datetime2-swedish-2019.tar.xz mirror://gentoo/texlive-module-datetime2-turkish-2019.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian-2019.tar.xz mirror://gentoo/texlive-module-datetime2-welsh-2019.tar.xz mirror://gentoo/texlive-module-dblfloatfix-2019.tar.xz mirror://gentoo/texlive-module-decimal-2019.tar.xz mirror://gentoo/texlive-module-decorule-2019.tar.xz mirror://gentoo/texlive-module-delimtxt-2019.tar.xz mirror://gentoo/texlive-module-denisbdoc-2019.tar.xz mirror://gentoo/texlive-module-diagbox-2019.tar.xz mirror://gentoo/texlive-module-diagnose-2019.tar.xz mirror://gentoo/texlive-module-dialogl-2019.tar.xz mirror://gentoo/texlive-module-dichokey-2019.tar.xz mirror://gentoo/texlive-module-dinbrief-2019.tar.xz mirror://gentoo/texlive-module-directory-2019.tar.xz mirror://gentoo/texlive-module-dirtytalk-2019.tar.xz mirror://gentoo/texlive-module-dlfltxb-2019.tar.xz mirror://gentoo/texlive-module-dnaseq-2019.tar.xz mirror://gentoo/texlive-module-doclicense-2019.tar.xz mirror://gentoo/texlive-module-docmfp-2019.tar.xz mirror://gentoo/texlive-module-docmute-2019.tar.xz mirror://gentoo/texlive-module-doctools-2019.tar.xz mirror://gentoo/texlive-module-documentation-2019.tar.xz mirror://gentoo/texlive-module-doi-2019.tar.xz mirror://gentoo/texlive-module-dotarrow-2019.tar.xz mirror://gentoo/texlive-module-dotseqn-2019.tar.xz mirror://gentoo/texlive-module-download-2019.tar.xz mirror://gentoo/texlive-module-dox-2019.tar.xz mirror://gentoo/texlive-module-dpfloat-2019.tar.xz mirror://gentoo/texlive-module-dprogress-2019.tar.xz mirror://gentoo/texlive-module-drac-2019.tar.xz mirror://gentoo/texlive-module-draftcopy-2019.tar.xz mirror://gentoo/texlive-module-draftfigure-2019.tar.xz mirror://gentoo/texlive-module-draftwatermark-2019.tar.xz mirror://gentoo/texlive-module-dtk-2019.tar.xz mirror://gentoo/texlive-module-dtxdescribe-2019.tar.xz mirror://gentoo/texlive-module-dtxgallery-2019.tar.xz mirror://gentoo/texlive-module-duckuments-2019.tar.xz mirror://gentoo/texlive-module-ducksay-2019.tar.xz mirror://gentoo/texlive-module-dvdcoll-2019.tar.xz mirror://gentoo/texlive-module-dynamicnumber-2019.tar.xz mirror://gentoo/texlive-module-dynblocks-2019.tar.xz mirror://gentoo/texlive-module-ean13isbn-2019.tar.xz mirror://gentoo/texlive-module-easy-2019.tar.xz mirror://gentoo/texlive-module-easy-todo-2019.tar.xz mirror://gentoo/texlive-module-easyfig-2019.tar.xz mirror://gentoo/texlive-module-easyformat-2019.tar.xz mirror://gentoo/texlive-module-easylist-2019.tar.xz mirror://gentoo/texlive-module-easyreview-2019.tar.xz mirror://gentoo/texlive-module-ebezier-2019.tar.xz mirror://gentoo/texlive-module-ecclesiastic-2019.tar.xz mirror://gentoo/texlive-module-ecv-2019.tar.xz mirror://gentoo/texlive-module-ed-2019.tar.xz mirror://gentoo/texlive-module-edmargin-2019.tar.xz mirror://gentoo/texlive-module-eemeir-2019.tar.xz mirror://gentoo/texlive-module-efbox-2019.tar.xz mirror://gentoo/texlive-module-egplot-2019.tar.xz mirror://gentoo/texlive-module-ehhline-2019.tar.xz mirror://gentoo/texlive-module-elegantbook-2019.tar.xz mirror://gentoo/texlive-module-elegantnote-2019.tar.xz mirror://gentoo/texlive-module-elegantpaper-2019.tar.xz mirror://gentoo/texlive-module-elements-2019.tar.xz mirror://gentoo/texlive-module-ellipsis-2019.tar.xz mirror://gentoo/texlive-module-elmath-2019.tar.xz mirror://gentoo/texlive-module-elocalloc-2019.tar.xz mirror://gentoo/texlive-module-elpres-2019.tar.xz mirror://gentoo/texlive-module-elzcards-2019.tar.xz mirror://gentoo/texlive-module-emarks-2019.tar.xz mirror://gentoo/texlive-module-embedall-2019.tar.xz mirror://gentoo/texlive-module-embrac-2019.tar.xz mirror://gentoo/texlive-module-emptypage-2019.tar.xz mirror://gentoo/texlive-module-emulateapj-2019.tar.xz mirror://gentoo/texlive-module-endfloat-2019.tar.xz mirror://gentoo/texlive-module-endheads-2019.tar.xz mirror://gentoo/texlive-module-endnotes-2019.tar.xz mirror://gentoo/texlive-module-engpron-2019.tar.xz mirror://gentoo/texlive-module-engrec-2019.tar.xz mirror://gentoo/texlive-module-enotez-2019.tar.xz mirror://gentoo/texlive-module-enumitem-2019.tar.xz mirror://gentoo/texlive-module-enumitem-zref-2019.tar.xz mirror://gentoo/texlive-module-envbig-2019.tar.xz mirror://gentoo/texlive-module-environ-2019.tar.xz mirror://gentoo/texlive-module-epigraph-2019.tar.xz mirror://gentoo/texlive-module-epiolmec-2019.tar.xz mirror://gentoo/texlive-module-eqell-2019.tar.xz mirror://gentoo/texlive-module-eqlist-2019.tar.xz mirror://gentoo/texlive-module-eqnalign-2019.tar.xz mirror://gentoo/texlive-module-eqname-2019.tar.xz mirror://gentoo/texlive-module-eqparbox-2019.tar.xz mirror://gentoo/texlive-module-errata-2019.tar.xz mirror://gentoo/texlive-module-erw-l3-2019.tar.xz mirror://gentoo/texlive-module-esami-2019.tar.xz mirror://gentoo/texlive-module-esdiff-2019.tar.xz mirror://gentoo/texlive-module-esint-2019.tar.xz mirror://gentoo/texlive-module-esint-type1-2019.tar.xz mirror://gentoo/texlive-module-etaremune-2019.tar.xz mirror://gentoo/texlive-module-etextools-2019.tar.xz mirror://gentoo/texlive-module-etoc-2019.tar.xz mirror://gentoo/texlive-module-eukdate-2019.tar.xz mirror://gentoo/texlive-module-eulerpx-2019.tar.xz mirror://gentoo/texlive-module-europasscv-2019.tar.xz mirror://gentoo/texlive-module-everyhook-2019.tar.xz mirror://gentoo/texlive-module-everypage-2019.tar.xz mirror://gentoo/texlive-module-exam-2019.tar.xz mirror://gentoo/texlive-module-exam-n-2019.tar.xz mirror://gentoo/texlive-module-exam-randomizechoices-2019.tar.xz mirror://gentoo/texlive-module-examdesign-2019.tar.xz mirror://gentoo/texlive-module-exframe-2019.tar.xz mirror://gentoo/texlive-module-example-2019.tar.xz mirror://gentoo/texlive-module-examplep-2019.tar.xz mirror://gentoo/texlive-module-exceltex-2019.tar.xz mirror://gentoo/texlive-module-excludeonly-2019.tar.xz mirror://gentoo/texlive-module-exercise-2019.tar.xz mirror://gentoo/texlive-module-exercisebank-2019.tar.xz mirror://gentoo/texlive-module-exercisepoints-2019.tar.xz mirror://gentoo/texlive-module-exercises-2019.tar.xz mirror://gentoo/texlive-module-exp-testopt-2019.tar.xz mirror://gentoo/texlive-module-expdlist-2019.tar.xz mirror://gentoo/texlive-module-export-2019.tar.xz mirror://gentoo/texlive-module-exsheets-2019.tar.xz mirror://gentoo/texlive-module-exsol-2019.tar.xz mirror://gentoo/texlive-module-extract-2019.tar.xz mirror://gentoo/texlive-module-facsimile-2019.tar.xz mirror://gentoo/texlive-module-factura-2019.tar.xz mirror://gentoo/texlive-module-fancyhandout-2019.tar.xz mirror://gentoo/texlive-module-fancylabel-2019.tar.xz mirror://gentoo/texlive-module-fancynum-2019.tar.xz mirror://gentoo/texlive-module-fancypar-2019.tar.xz mirror://gentoo/texlive-module-fancyslides-2019.tar.xz mirror://gentoo/texlive-module-fancytabs-2019.tar.xz mirror://gentoo/texlive-module-fancytooltips-2019.tar.xz mirror://gentoo/texlive-module-fbox-2019.tar.xz mirror://gentoo/texlive-module-fcolumn-2019.tar.xz mirror://gentoo/texlive-module-fetchcls-2019.tar.xz mirror://gentoo/texlive-module-ffslides-2019.tar.xz mirror://gentoo/texlive-module-fgruler-2019.tar.xz mirror://gentoo/texlive-module-fibeamer-2019.tar.xz mirror://gentoo/texlive-module-fifo-stack-2019.tar.xz mirror://gentoo/texlive-module-figsize-2019.tar.xz mirror://gentoo/texlive-module-filecontents-2019.tar.xz mirror://gentoo/texlive-module-filecontentsdef-2019.tar.xz mirror://gentoo/texlive-module-filedate-2019.tar.xz mirror://gentoo/texlive-module-fileinfo-2019.tar.xz mirror://gentoo/texlive-module-filemod-2019.tar.xz mirror://gentoo/texlive-module-fink-2019.tar.xz mirror://gentoo/texlive-module-finstrut-2019.tar.xz mirror://gentoo/texlive-module-fithesis-2019.tar.xz mirror://gentoo/texlive-module-fixcmex-2019.tar.xz mirror://gentoo/texlive-module-fixfoot-2019.tar.xz mirror://gentoo/texlive-module-fixme-2019.tar.xz mirror://gentoo/texlive-module-fixmetodonotes-2019.tar.xz mirror://gentoo/texlive-module-fjodor-2019.tar.xz mirror://gentoo/texlive-module-flabels-2019.tar.xz mirror://gentoo/texlive-module-flacards-2019.tar.xz mirror://gentoo/texlive-module-flagderiv-2019.tar.xz mirror://gentoo/texlive-module-flashcards-2019.tar.xz mirror://gentoo/texlive-module-flashmovie-2019.tar.xz mirror://gentoo/texlive-module-flipbook-2019.tar.xz mirror://gentoo/texlive-module-flippdf-2019.tar.xz mirror://gentoo/texlive-module-floatflt-2019.tar.xz mirror://gentoo/texlive-module-floatrow-2019.tar.xz mirror://gentoo/texlive-module-flowfram-2019.tar.xz mirror://gentoo/texlive-module-fmp-2019.tar.xz mirror://gentoo/texlive-module-fmtcount-2019.tar.xz mirror://gentoo/texlive-module-fn2end-2019.tar.xz mirror://gentoo/texlive-module-fnbreak-2019.tar.xz mirror://gentoo/texlive-module-fncychap-2019.tar.xz mirror://gentoo/texlive-module-fncylab-2019.tar.xz mirror://gentoo/texlive-module-fnpara-2019.tar.xz mirror://gentoo/texlive-module-fnpct-2019.tar.xz mirror://gentoo/texlive-module-fnumprint-2019.tar.xz mirror://gentoo/texlive-module-foilhtml-2019.tar.xz mirror://gentoo/texlive-module-fontaxes-2019.tar.xz mirror://gentoo/texlive-module-fonttable-2019.tar.xz mirror://gentoo/texlive-module-footmisc-2019.tar.xz mirror://gentoo/texlive-module-footmisx-2019.tar.xz mirror://gentoo/texlive-module-footnotebackref-2019.tar.xz mirror://gentoo/texlive-module-footnoterange-2019.tar.xz mirror://gentoo/texlive-module-footnpag-2019.tar.xz mirror://gentoo/texlive-module-forarray-2019.tar.xz mirror://gentoo/texlive-module-foreign-2019.tar.xz mirror://gentoo/texlive-module-forloop-2019.tar.xz mirror://gentoo/texlive-module-formlett-2019.tar.xz mirror://gentoo/texlive-module-forms16be-2019.tar.xz mirror://gentoo/texlive-module-formular-2019.tar.xz mirror://gentoo/texlive-module-fragments-2019.tar.xz mirror://gentoo/texlive-module-frame-2019.tar.xz mirror://gentoo/texlive-module-framed-2019.tar.xz mirror://gentoo/texlive-module-frankenstein-2019.tar.xz mirror://gentoo/texlive-module-frege-2019.tar.xz mirror://gentoo/texlive-module-ftcap-2019.tar.xz mirror://gentoo/texlive-module-ftnxtra-2019.tar.xz mirror://gentoo/texlive-module-fullblck-2019.tar.xz mirror://gentoo/texlive-module-fullminipage-2019.tar.xz mirror://gentoo/texlive-module-fullwidth-2019.tar.xz mirror://gentoo/texlive-module-fundus-calligra-2019.tar.xz mirror://gentoo/texlive-module-fundus-cyr-2019.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin-2019.tar.xz mirror://gentoo/texlive-module-fvextra-2019.tar.xz mirror://gentoo/texlive-module-fwlw-2019.tar.xz mirror://gentoo/texlive-module-gatherenum-2019.tar.xz mirror://gentoo/texlive-module-gauss-2019.tar.xz mirror://gentoo/texlive-module-gcard-2019.tar.xz mirror://gentoo/texlive-module-gcite-2019.tar.xz mirror://gentoo/texlive-module-gender-2019.tar.xz mirror://gentoo/texlive-module-genmpage-2019.tar.xz mirror://gentoo/texlive-module-getfiledate-2019.tar.xz mirror://gentoo/texlive-module-getitems-2019.tar.xz mirror://gentoo/texlive-module-ginpenc-2019.tar.xz mirror://gentoo/texlive-module-gitfile-info-2019.tar.xz mirror://gentoo/texlive-module-gitinfo-2019.tar.xz mirror://gentoo/texlive-module-gitinfo2-2019.tar.xz mirror://gentoo/texlive-module-gitlog-2019.tar.xz mirror://gentoo/texlive-module-gitver-2019.tar.xz mirror://gentoo/texlive-module-globalvals-2019.tar.xz mirror://gentoo/texlive-module-gloss-2019.tar.xz mirror://gentoo/texlive-module-glossaries-danish-2019.tar.xz mirror://gentoo/texlive-module-glossaries-dutch-2019.tar.xz mirror://gentoo/texlive-module-glossaries-english-2019.tar.xz mirror://gentoo/texlive-module-glossaries-estonian-2019.tar.xz mirror://gentoo/texlive-module-glossaries-extra-2019.tar.xz mirror://gentoo/texlive-module-glossaries-finnish-2019.tar.xz mirror://gentoo/texlive-module-glossaries-french-2019.tar.xz mirror://gentoo/texlive-module-glossaries-german-2019.tar.xz mirror://gentoo/texlive-module-glossaries-irish-2019.tar.xz mirror://gentoo/texlive-module-glossaries-italian-2019.tar.xz mirror://gentoo/texlive-module-glossaries-magyar-2019.tar.xz mirror://gentoo/texlive-module-glossaries-polish-2019.tar.xz mirror://gentoo/texlive-module-glossaries-portuges-2019.tar.xz mirror://gentoo/texlive-module-glossaries-serbian-2019.tar.xz mirror://gentoo/texlive-module-glossaries-slovene-2019.tar.xz mirror://gentoo/texlive-module-glossaries-spanish-2019.tar.xz mirror://gentoo/texlive-module-gmdoc-2019.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance-2019.tar.xz mirror://gentoo/texlive-module-gmiflink-2019.tar.xz mirror://gentoo/texlive-module-gmutils-2019.tar.xz mirror://gentoo/texlive-module-gmverb-2019.tar.xz mirror://gentoo/texlive-module-grabbox-2019.tar.xz mirror://gentoo/texlive-module-graphbox-2019.tar.xz mirror://gentoo/texlive-module-graphicx-psmin-2019.tar.xz mirror://gentoo/texlive-module-graphicxbox-2019.tar.xz mirror://gentoo/texlive-module-grayhints-2019.tar.xz mirror://gentoo/texlive-module-grfpaste-2019.tar.xz mirror://gentoo/texlive-module-grid-2019.tar.xz mirror://gentoo/texlive-module-grid-system-2019.tar.xz mirror://gentoo/texlive-module-gridset-2019.tar.xz mirror://gentoo/texlive-module-gridslides-2019.tar.xz mirror://gentoo/texlive-module-guitlogo-2019.tar.xz mirror://gentoo/texlive-module-halloweenmath-2019.tar.xz mirror://gentoo/texlive-module-hackthefootline-2019.tar.xz mirror://gentoo/texlive-module-handin-2019.tar.xz mirror://gentoo/texlive-module-handout-2019.tar.xz mirror://gentoo/texlive-module-hang-2019.tar.xz mirror://gentoo/texlive-module-hanging-2019.tar.xz mirror://gentoo/texlive-module-hardwrap-2019.tar.xz mirror://gentoo/texlive-module-harnon-cv-2019.tar.xz mirror://gentoo/texlive-module-harpoon-2019.tar.xz mirror://gentoo/texlive-module-hc-2019.tar.xz mirror://gentoo/texlive-module-he-she-2019.tar.xz mirror://gentoo/texlive-module-hhtensor-2019.tar.xz mirror://gentoo/texlive-module-histogr-2019.tar.xz mirror://gentoo/texlive-module-hitec-2019.tar.xz mirror://gentoo/texlive-module-hletter-2019.tar.xz mirror://gentoo/texlive-module-hpsdiss-2019.tar.xz mirror://gentoo/texlive-module-hrefhide-2019.tar.xz mirror://gentoo/texlive-module-hvindex-2019.tar.xz mirror://gentoo/texlive-module-hypdvips-2019.tar.xz mirror://gentoo/texlive-module-hyper-2019.tar.xz mirror://gentoo/texlive-module-hyperbar-2019.tar.xz mirror://gentoo/texlive-module-hypernat-2019.tar.xz mirror://gentoo/texlive-module-hyperxmp-2019.tar.xz mirror://gentoo/texlive-module-hyphenat-2019.tar.xz mirror://gentoo/texlive-module-identkey-2019.tar.xz mirror://gentoo/texlive-module-idxcmds-2019.tar.xz mirror://gentoo/texlive-module-idxlayout-2019.tar.xz mirror://gentoo/texlive-module-iffont-2019.tar.xz mirror://gentoo/texlive-module-ifmslide-2019.tar.xz mirror://gentoo/texlive-module-ifmtarg-2019.tar.xz mirror://gentoo/texlive-module-ifnextok-2019.tar.xz mirror://gentoo/texlive-module-ifoddpage-2019.tar.xz mirror://gentoo/texlive-module-ifplatform-2019.tar.xz mirror://gentoo/texlive-module-ifthenx-2019.tar.xz mirror://gentoo/texlive-module-iitem-2019.tar.xz mirror://gentoo/texlive-module-image-gallery-2019.tar.xz mirror://gentoo/texlive-module-imakeidx-2019.tar.xz mirror://gentoo/texlive-module-import-2019.tar.xz mirror://gentoo/texlive-module-incgraph-2019.tar.xz mirror://gentoo/texlive-module-indextools-2019.tar.xz mirror://gentoo/texlive-module-inline-images-2019.tar.xz mirror://gentoo/texlive-module-inlinedef-2019.tar.xz mirror://gentoo/texlive-module-inputtrc-2019.tar.xz mirror://gentoo/texlive-module-interactiveworkbook-2019.tar.xz mirror://gentoo/texlive-module-interfaces-2019.tar.xz mirror://gentoo/texlive-module-intopdf-2019.tar.xz mirror://gentoo/texlive-module-inversepath-2019.tar.xz mirror://gentoo/texlive-module-invoice-2019.tar.xz mirror://gentoo/texlive-module-invoice-class-2019.tar.xz mirror://gentoo/texlive-module-invoice2-2019.tar.xz mirror://gentoo/texlive-module-iso-2019.tar.xz mirror://gentoo/texlive-module-iso10303-2019.tar.xz mirror://gentoo/texlive-module-isodate-2019.tar.xz mirror://gentoo/texlive-module-isodoc-2019.tar.xz mirror://gentoo/texlive-module-isonums-2019.tar.xz mirror://gentoo/texlive-module-isopt-2019.tar.xz mirror://gentoo/texlive-module-isorot-2019.tar.xz mirror://gentoo/texlive-module-isotope-2019.tar.xz mirror://gentoo/texlive-module-issuulinks-2019.tar.xz mirror://gentoo/texlive-module-iwhdp-2019.tar.xz mirror://gentoo/texlive-module-jlabels-2019.tar.xz mirror://gentoo/texlive-module-jslectureplanner-2019.tar.xz mirror://gentoo/texlive-module-jumplines-2019.tar.xz mirror://gentoo/texlive-module-jvlisting-2019.tar.xz mirror://gentoo/texlive-module-kalendarium-2019.tar.xz mirror://gentoo/texlive-module-kantlipsum-2019.tar.xz mirror://gentoo/texlive-module-kerntest-2019.tar.xz mirror://gentoo/texlive-module-keycommand-2019.tar.xz mirror://gentoo/texlive-module-keyfloat-2019.tar.xz mirror://gentoo/texlive-module-keyreader-2019.tar.xz mirror://gentoo/texlive-module-keyindex-2019.tar.xz mirror://gentoo/texlive-module-keystroke-2019.tar.xz mirror://gentoo/texlive-module-keyval2e-2019.tar.xz mirror://gentoo/texlive-module-keyvaltable-2019.tar.xz mirror://gentoo/texlive-module-kix-2019.tar.xz mirror://gentoo/texlive-module-knowledge-2019.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic-2019.tar.xz mirror://gentoo/texlive-module-koma-script-sfs-2019.tar.xz mirror://gentoo/texlive-module-komacv-2019.tar.xz mirror://gentoo/texlive-module-komacv-rg-2019.tar.xz mirror://gentoo/texlive-module-ktv-texdata-2019.tar.xz mirror://gentoo/texlive-module-l3build-2019.tar.xz mirror://gentoo/texlive-module-labbook-2019.tar.xz mirror://gentoo/texlive-module-labels-2019.tar.xz mirror://gentoo/texlive-module-labels4easylist-2019.tar.xz mirror://gentoo/texlive-module-labelschanged-2019.tar.xz mirror://gentoo/texlive-module-lastpackage-2019.tar.xz mirror://gentoo/texlive-module-lastpage-2019.tar.xz mirror://gentoo/texlive-module-latex-tds-2019.tar.xz mirror://gentoo/texlive-module-latex-uni8-2019.tar.xz mirror://gentoo/texlive-module-latexcolors-2019.tar.xz mirror://gentoo/texlive-module-latexdemo-2019.tar.xz mirror://gentoo/texlive-module-latexgit-2019.tar.xz mirror://gentoo/texlive-module-layouts-2019.tar.xz mirror://gentoo/texlive-module-lazylist-2019.tar.xz mirror://gentoo/texlive-module-lccaps-2019.tar.xz mirror://gentoo/texlive-module-lcd-2019.tar.xz mirror://gentoo/texlive-module-lcg-2019.tar.xz mirror://gentoo/texlive-module-leading-2019.tar.xz mirror://gentoo/texlive-module-lectures-2019.tar.xz mirror://gentoo/texlive-module-leftidx-2019.tar.xz mirror://gentoo/texlive-module-leipzig-2019.tar.xz mirror://gentoo/texlive-module-lengthconvert-2019.tar.xz mirror://gentoo/texlive-module-lettre-2019.tar.xz mirror://gentoo/texlive-module-lettrine-2019.tar.xz mirror://gentoo/texlive-module-lewis-2019.tar.xz mirror://gentoo/texlive-module-lhelp-2019.tar.xz mirror://gentoo/texlive-module-libgreek-2019.tar.xz mirror://gentoo/texlive-module-limap-2019.tar.xz mirror://gentoo/texlive-module-linegoal-2019.tar.xz mirror://gentoo/texlive-module-linop-2019.tar.xz mirror://gentoo/texlive-module-lipsum-2019.tar.xz mirror://gentoo/texlive-module-lisp-on-tex-2019.tar.xz mirror://gentoo/texlive-module-listing-2019.tar.xz mirror://gentoo/texlive-module-listlbls-2019.tar.xz mirror://gentoo/texlive-module-listliketab-2019.tar.xz mirror://gentoo/texlive-module-listofsymbols-2019.tar.xz mirror://gentoo/texlive-module-lkproof-2019.tar.xz mirror://gentoo/texlive-module-lmake-2019.tar.xz mirror://gentoo/texlive-module-locality-2019.tar.xz mirror://gentoo/texlive-module-localloc-2019.tar.xz mirror://gentoo/texlive-module-logbox-2019.tar.xz mirror://gentoo/texlive-module-logical-markup-utils-2019.tar.xz mirror://gentoo/texlive-module-logpap-2019.tar.xz mirror://gentoo/texlive-module-longfbox-2019.tar.xz mirror://gentoo/texlive-module-longfigure-2019.tar.xz mirror://gentoo/texlive-module-longnamefilelist-2019.tar.xz mirror://gentoo/texlive-module-loops-2019.tar.xz mirror://gentoo/texlive-module-lsc-2019.tar.xz mirror://gentoo/texlive-module-lstaddons-2019.tar.xz mirror://gentoo/texlive-module-lstfiracode-2019.tar.xz mirror://gentoo/texlive-module-lt3graph-2019.tar.xz mirror://gentoo/texlive-module-ltablex-2019.tar.xz mirror://gentoo/texlive-module-ltabptch-2019.tar.xz mirror://gentoo/texlive-module-ltxdockit-2019.tar.xz mirror://gentoo/texlive-module-ltxguidex-2019.tar.xz mirror://gentoo/texlive-module-ltxindex-2019.tar.xz mirror://gentoo/texlive-module-ltxkeys-2019.tar.xz mirror://gentoo/texlive-module-ltxnew-2019.tar.xz mirror://gentoo/texlive-module-ltxtools-2019.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen-2019.tar.xz mirror://gentoo/texlive-module-luatodonotes-2019.tar.xz mirror://gentoo/texlive-module-macroswap-2019.tar.xz mirror://gentoo/texlive-module-magaz-2019.tar.xz mirror://gentoo/texlive-module-makecookbook-2019.tar.xz mirror://gentoo/texlive-module-mailing-2019.tar.xz mirror://gentoo/texlive-module-mailmerge-2019.tar.xz mirror://gentoo/texlive-module-makebarcode-2019.tar.xz mirror://gentoo/texlive-module-makebase-2019.tar.xz mirror://gentoo/texlive-module-makebox-2019.tar.xz mirror://gentoo/texlive-module-makecell-2019.tar.xz mirror://gentoo/texlive-module-makecirc-2019.tar.xz mirror://gentoo/texlive-module-makecmds-2019.tar.xz mirror://gentoo/texlive-module-makedtx-2019.tar.xz mirror://gentoo/texlive-module-makeglos-2019.tar.xz mirror://gentoo/texlive-module-mandi-2019.tar.xz mirror://gentoo/texlive-module-manfnt-2019.tar.xz mirror://gentoo/texlive-module-manuscript-2019.tar.xz mirror://gentoo/texlive-module-manyind-2019.tar.xz mirror://gentoo/texlive-module-marginfit-2019.tar.xz mirror://gentoo/texlive-module-marginfix-2019.tar.xz mirror://gentoo/texlive-module-marginnote-2019.tar.xz mirror://gentoo/texlive-module-markdown-2019.tar.xz mirror://gentoo/texlive-module-mathalpha-2019.tar.xz mirror://gentoo/texlive-module-mathastext-2019.tar.xz mirror://gentoo/texlive-module-mathexam-2019.tar.xz mirror://gentoo/texlive-module-mathfam256-2019.tar.xz mirror://gentoo/texlive-module-mathfont-2019.tar.xz mirror://gentoo/texlive-module-maybemath-2019.tar.xz mirror://gentoo/texlive-module-mcaption-2019.tar.xz mirror://gentoo/texlive-module-mceinleger-2019.tar.xz mirror://gentoo/texlive-module-mcexam-2019.tar.xz mirror://gentoo/texlive-module-mcite-2019.tar.xz mirror://gentoo/texlive-module-mciteplus-2019.tar.xz mirror://gentoo/texlive-module-mdframed-2019.tar.xz mirror://gentoo/texlive-module-media9-2019.tar.xz mirror://gentoo/texlive-module-medstarbeamer-2019.tar.xz mirror://gentoo/texlive-module-meetingmins-2019.tar.xz mirror://gentoo/texlive-module-memexsupp-2019.tar.xz mirror://gentoo/texlive-module-memory-2019.tar.xz mirror://gentoo/texlive-module-mensa-tex-2019.tar.xz mirror://gentoo/texlive-module-menu-2019.tar.xz mirror://gentoo/texlive-module-menukeys-2019.tar.xz mirror://gentoo/texlive-module-metalogox-2019.tar.xz mirror://gentoo/texlive-module-method-2019.tar.xz mirror://gentoo/texlive-module-metre-2019.tar.xz mirror://gentoo/texlive-module-mfirstuc-2019.tar.xz mirror://gentoo/texlive-module-mftinc-2019.tar.xz mirror://gentoo/texlive-module-mi-solns-2019.tar.xz mirror://gentoo/texlive-module-midpage-2019.tar.xz mirror://gentoo/texlive-module-minibox-2019.tar.xz mirror://gentoo/texlive-module-minidocument-2019.tar.xz mirror://gentoo/texlive-module-minifp-2019.tar.xz mirror://gentoo/texlive-module-minipage-marginpar-2019.tar.xz mirror://gentoo/texlive-module-minitoc-2019.tar.xz mirror://gentoo/texlive-module-minorrevision-2019.tar.xz mirror://gentoo/texlive-module-minted-2019.tar.xz mirror://gentoo/texlive-module-minutes-2019.tar.xz mirror://gentoo/texlive-module-mla-paper-2019.tar.xz mirror://gentoo/texlive-module-mlist-2019.tar.xz mirror://gentoo/texlive-module-mmap-2019.tar.xz mirror://gentoo/texlive-module-mnotes-2019.tar.xz mirror://gentoo/texlive-module-moderncv-2019.tar.xz mirror://gentoo/texlive-module-modernposter-2019.tar.xz mirror://gentoo/texlive-module-moderntimeline-2019.tar.xz mirror://gentoo/texlive-module-modref-2019.tar.xz mirror://gentoo/texlive-module-modroman-2019.tar.xz mirror://gentoo/texlive-module-modular-2019.tar.xz mirror://gentoo/texlive-module-monofill-2019.tar.xz mirror://gentoo/texlive-module-moodle-2019.tar.xz mirror://gentoo/texlive-module-moreenum-2019.tar.xz mirror://gentoo/texlive-module-morefloats-2019.tar.xz mirror://gentoo/texlive-module-morehype-2019.tar.xz mirror://gentoo/texlive-module-moresize-2019.tar.xz mirror://gentoo/texlive-module-moreverb-2019.tar.xz mirror://gentoo/texlive-module-morewrites-2019.tar.xz mirror://gentoo/texlive-module-movie15-2019.tar.xz mirror://gentoo/texlive-module-mparhack-2019.tar.xz mirror://gentoo/texlive-module-mpostinl-2019.tar.xz mirror://gentoo/texlive-module-msc-2019.tar.xz mirror://gentoo/texlive-module-msg-2019.tar.xz mirror://gentoo/texlive-module-mslapa-2019.tar.xz mirror://gentoo/texlive-module-mtgreek-2019.tar.xz mirror://gentoo/texlive-module-multenum-2019.tar.xz mirror://gentoo/texlive-module-multiaudience-2019.tar.xz mirror://gentoo/texlive-module-multibbl-2019.tar.xz mirror://gentoo/texlive-module-multicap-2019.tar.xz mirror://gentoo/texlive-module-multicolrule-2019.tar.xz mirror://gentoo/texlive-module-multidef-2019.tar.xz mirror://gentoo/texlive-module-multienv-2019.tar.xz mirror://gentoo/texlive-module-multiexpand-2019.tar.xz mirror://gentoo/texlive-module-multilang-2019.tar.xz mirror://gentoo/texlive-module-multirow-2019.tar.xz mirror://gentoo/texlive-module-mversion-2019.tar.xz mirror://gentoo/texlive-module-mwe-2019.tar.xz mirror://gentoo/texlive-module-mycv-2019.tar.xz mirror://gentoo/texlive-module-mylatexformat-2019.tar.xz mirror://gentoo/texlive-module-nag-2019.tar.xz mirror://gentoo/texlive-module-nameauth-2019.tar.xz mirror://gentoo/texlive-module-namespc-2019.tar.xz mirror://gentoo/texlive-module-ncclatex-2019.tar.xz mirror://gentoo/texlive-module-ncctools-2019.tar.xz mirror://gentoo/texlive-module-needspace-2019.tar.xz mirror://gentoo/texlive-module-nestquot-2019.tar.xz mirror://gentoo/texlive-module-newcommand-2019.tar.xz mirror://gentoo/texlive-module-newenviron-2019.tar.xz mirror://gentoo/texlive-module-newfile-2019.tar.xz mirror://gentoo/texlive-module-newlfm-2019.tar.xz mirror://gentoo/texlive-module-newspaper-2019.tar.xz mirror://gentoo/texlive-module-newunicodechar-2019.tar.xz mirror://gentoo/texlive-module-newvbtm-2019.tar.xz mirror://gentoo/texlive-module-newverbs-2019.tar.xz mirror://gentoo/texlive-module-nextpage-2019.tar.xz mirror://gentoo/texlive-module-nfssext-cfr-2019.tar.xz mirror://gentoo/texlive-module-nicefilelist-2019.tar.xz mirror://gentoo/texlive-module-niceframe-2019.tar.xz mirror://gentoo/texlive-module-nicetext-2019.tar.xz mirror://gentoo/texlive-module-nidanfloat-2019.tar.xz mirror://gentoo/texlive-module-nlctdoc-2019.tar.xz mirror://gentoo/texlive-module-noconflict-2019.tar.xz mirror://gentoo/texlive-module-noindentafter-2019.tar.xz mirror://gentoo/texlive-module-noitcrul-2019.tar.xz mirror://gentoo/texlive-module-nolbreaks-2019.tar.xz mirror://gentoo/texlive-module-nomencl-2019.tar.xz mirror://gentoo/texlive-module-nomentbl-2019.tar.xz mirror://gentoo/texlive-module-nonfloat-2019.tar.xz mirror://gentoo/texlive-module-nonumonpart-2019.tar.xz mirror://gentoo/texlive-module-nopageno-2019.tar.xz mirror://gentoo/texlive-module-normalcolor-2019.tar.xz mirror://gentoo/texlive-module-notes-2019.tar.xz mirror://gentoo/texlive-module-notespages-2019.tar.xz mirror://gentoo/texlive-module-notestex-2019.tar.xz mirror://gentoo/texlive-module-notoccite-2019.tar.xz mirror://gentoo/texlive-module-nowidow-2019.tar.xz mirror://gentoo/texlive-module-nox-2019.tar.xz mirror://gentoo/texlive-module-ntheorem-2019.tar.xz mirror://gentoo/texlive-module-numberedblock-2019.tar.xz mirror://gentoo/texlive-module-numname-2019.tar.xz mirror://gentoo/texlive-module-numprint-2019.tar.xz mirror://gentoo/texlive-module-numspell-2019.tar.xz mirror://gentoo/texlive-module-ocg-p-2019.tar.xz mirror://gentoo/texlive-module-ocgx-2019.tar.xz mirror://gentoo/texlive-module-ocgx2-2019.tar.xz mirror://gentoo/texlive-module-ocr-latex-2019.tar.xz mirror://gentoo/texlive-module-octavo-2019.tar.xz mirror://gentoo/texlive-module-oldstyle-2019.tar.xz mirror://gentoo/texlive-module-onlyamsmath-2019.tar.xz mirror://gentoo/texlive-module-opcit-2019.tar.xz mirror://gentoo/texlive-module-optidef-2019.tar.xz mirror://gentoo/texlive-module-optional-2019.tar.xz mirror://gentoo/texlive-module-options-2019.tar.xz mirror://gentoo/texlive-module-outline-2019.tar.xz mirror://gentoo/texlive-module-outliner-2019.tar.xz mirror://gentoo/texlive-module-outlines-2019.tar.xz mirror://gentoo/texlive-module-outlining-2019.tar.xz mirror://gentoo/texlive-module-overlays-2019.tar.xz mirror://gentoo/texlive-module-overpic-2019.tar.xz mirror://gentoo/texlive-module-padcount-2019.tar.xz mirror://gentoo/texlive-module-pagecolor-2019.tar.xz mirror://gentoo/texlive-module-pagecont-2019.tar.xz mirror://gentoo/texlive-module-pagenote-2019.tar.xz mirror://gentoo/texlive-module-pagerange-2019.tar.xz mirror://gentoo/texlive-module-pageslts-2019.tar.xz mirror://gentoo/texlive-module-paper-2019.tar.xz mirror://gentoo/texlive-module-papercdcase-2019.tar.xz mirror://gentoo/texlive-module-papermas-2019.tar.xz mirror://gentoo/texlive-module-papertex-2019.tar.xz mirror://gentoo/texlive-module-paracol-2019.tar.xz mirror://gentoo/texlive-module-parades-2019.tar.xz mirror://gentoo/texlive-module-paralist-2019.tar.xz mirror://gentoo/texlive-module-paresse-2019.tar.xz mirror://gentoo/texlive-module-parnotes-2019.tar.xz mirror://gentoo/texlive-module-parselines-2019.tar.xz mirror://gentoo/texlive-module-pas-cours-2019.tar.xz mirror://gentoo/texlive-module-pas-cv-2019.tar.xz mirror://gentoo/texlive-module-pas-tableur-2019.tar.xz mirror://gentoo/texlive-module-patch-2019.tar.xz mirror://gentoo/texlive-module-patchcmd-2019.tar.xz mirror://gentoo/texlive-module-pauldoc-2019.tar.xz mirror://gentoo/texlive-module-pawpict-2019.tar.xz mirror://gentoo/texlive-module-pbox-2019.tar.xz mirror://gentoo/texlive-module-pbsheet-2019.tar.xz mirror://gentoo/texlive-module-pdf14-2019.tar.xz mirror://gentoo/texlive-module-pdfcomment-2019.tar.xz mirror://gentoo/texlive-module-pdfcprot-2019.tar.xz mirror://gentoo/texlive-module-pdfmarginpar-2019.tar.xz mirror://gentoo/texlive-module-pdfoverlay-2019.tar.xz mirror://gentoo/texlive-module-pdfpagediff-2019.tar.xz mirror://gentoo/texlive-module-pdfpc-movie-2019.tar.xz mirror://gentoo/texlive-module-pdfprivacy-2019.tar.xz mirror://gentoo/texlive-module-pdfreview-2019.tar.xz mirror://gentoo/texlive-module-pdfscreen-2019.tar.xz mirror://gentoo/texlive-module-pdfslide-2019.tar.xz mirror://gentoo/texlive-module-pdfsync-2019.tar.xz mirror://gentoo/texlive-module-pdfwin-2019.tar.xz mirror://gentoo/texlive-module-pdfx-2019.tar.xz mirror://gentoo/texlive-module-pecha-2019.tar.xz mirror://gentoo/texlive-module-perltex-2019.tar.xz mirror://gentoo/texlive-module-permute-2019.tar.xz mirror://gentoo/texlive-module-petiteannonce-2019.tar.xz mirror://gentoo/texlive-module-phffullpagefigure-2019.tar.xz mirror://gentoo/texlive-module-phfnote-2019.tar.xz mirror://gentoo/texlive-module-phfparen-2019.tar.xz mirror://gentoo/texlive-module-phfqit-2019.tar.xz mirror://gentoo/texlive-module-phfquotetext-2019.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark-2019.tar.xz mirror://gentoo/texlive-module-phfthm-2019.tar.xz mirror://gentoo/texlive-module-philex-2019.tar.xz mirror://gentoo/texlive-module-phonenumbers-2019.tar.xz mirror://gentoo/texlive-module-photo-2019.tar.xz mirror://gentoo/texlive-module-piff-2019.tar.xz mirror://gentoo/texlive-module-pkgloader-2019.tar.xz mirror://gentoo/texlive-module-placeins-2019.tar.xz mirror://gentoo/texlive-module-plantslabels-2019.tar.xz mirror://gentoo/texlive-module-plates-2019.tar.xz mirror://gentoo/texlive-module-plweb-2019.tar.xz mirror://gentoo/texlive-module-polynom-2019.tar.xz mirror://gentoo/texlive-module-polynomial-2019.tar.xz mirror://gentoo/texlive-module-polytable-2019.tar.xz mirror://gentoo/texlive-module-postcards-2019.tar.xz mirror://gentoo/texlive-module-poster-mac-2019.tar.xz mirror://gentoo/texlive-module-ppr-prv-2019.tar.xz mirror://gentoo/texlive-module-preprint-2019.tar.xz mirror://gentoo/texlive-module-pressrelease-2019.tar.xz mirror://gentoo/texlive-module-prettyref-2019.tar.xz mirror://gentoo/texlive-module-preview-2019.tar.xz mirror://gentoo/texlive-module-printlen-2019.tar.xz mirror://gentoo/texlive-module-probsoln-2019.tar.xz mirror://gentoo/texlive-module-program-2019.tar.xz mirror://gentoo/texlive-module-progress-2019.tar.xz mirror://gentoo/texlive-module-progressbar-2019.tar.xz mirror://gentoo/texlive-module-proofread-2019.tar.xz mirror://gentoo/texlive-module-properties-2019.tar.xz mirror://gentoo/texlive-module-prosper-2019.tar.xz mirror://gentoo/texlive-module-protex-2019.tar.xz mirror://gentoo/texlive-module-protocol-2019.tar.xz mirror://gentoo/texlive-module-psfragx-2019.tar.xz mirror://gentoo/texlive-module-pstool-2019.tar.xz mirror://gentoo/texlive-module-pstring-2019.tar.xz mirror://gentoo/texlive-module-pxgreeks-2019.tar.xz mirror://gentoo/texlive-module-pygmentex-2019.tar.xz mirror://gentoo/texlive-module-python-2019.tar.xz mirror://gentoo/texlive-module-qcm-2019.tar.xz mirror://gentoo/texlive-module-qstest-2019.tar.xz mirror://gentoo/texlive-module-qsymbols-2019.tar.xz mirror://gentoo/texlive-module-quicktype-2019.tar.xz mirror://gentoo/texlive-module-quotchap-2019.tar.xz mirror://gentoo/texlive-module-quoting-2019.tar.xz mirror://gentoo/texlive-module-quotmark-2019.tar.xz mirror://gentoo/texlive-module-ran_toks-2019.tar.xz mirror://gentoo/texlive-module-randtext-2019.tar.xz mirror://gentoo/texlive-module-rccol-2019.tar.xz mirror://gentoo/texlive-module-rcs-multi-2019.tar.xz mirror://gentoo/texlive-module-rcsinfo-2019.tar.xz mirror://gentoo/texlive-module-readarray-2019.tar.xz mirror://gentoo/texlive-module-realboxes-2019.tar.xz mirror://gentoo/texlive-module-recipe-2019.tar.xz mirror://gentoo/texlive-module-recipebook-2019.tar.xz mirror://gentoo/texlive-module-recipecard-2019.tar.xz mirror://gentoo/texlive-module-rectopma-2019.tar.xz mirror://gentoo/texlive-module-refcheck-2019.tar.xz mirror://gentoo/texlive-module-refenums-2019.tar.xz mirror://gentoo/texlive-module-reflectgraphics-2019.tar.xz mirror://gentoo/texlive-module-refman-2019.tar.xz mirror://gentoo/texlive-module-refstyle-2019.tar.xz mirror://gentoo/texlive-module-regcount-2019.tar.xz mirror://gentoo/texlive-module-regexpatch-2019.tar.xz mirror://gentoo/texlive-module-register-2019.tar.xz mirror://gentoo/texlive-module-regstats-2019.tar.xz mirror://gentoo/texlive-module-relenc-2019.tar.xz mirror://gentoo/texlive-module-relsize-2019.tar.xz mirror://gentoo/texlive-module-repeatindex-2019.tar.xz mirror://gentoo/texlive-module-repltext-2019.tar.xz mirror://gentoo/texlive-module-returntogrid-2019.tar.xz mirror://gentoo/texlive-module-rgltxdoc-2019.tar.xz mirror://gentoo/texlive-module-rjlparshap-2019.tar.xz mirror://gentoo/texlive-module-rlepsf-2019.tar.xz mirror://gentoo/texlive-module-rmpage-2019.tar.xz mirror://gentoo/texlive-module-robustcommand-2019.tar.xz mirror://gentoo/texlive-module-robustindex-2019.tar.xz mirror://gentoo/texlive-module-romanbar-2019.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber-2019.tar.xz mirror://gentoo/texlive-module-romanneg-2019.tar.xz mirror://gentoo/texlive-module-romannum-2019.tar.xz mirror://gentoo/texlive-module-rotfloat-2019.tar.xz mirror://gentoo/texlive-module-rotpages-2019.tar.xz mirror://gentoo/texlive-module-roundbox-2019.tar.xz mirror://gentoo/texlive-module-rterface-2019.tar.xz mirror://gentoo/texlive-module-rtkinenc-2019.tar.xz mirror://gentoo/texlive-module-rulerbox-2019.tar.xz mirror://gentoo/texlive-module-rulercompass-2019.tar.xz mirror://gentoo/texlive-module-rvwrite-2019.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut-2019.tar.xz mirror://gentoo/texlive-module-sauerj-2019.tar.xz mirror://gentoo/texlive-module-savefnmark-2019.tar.xz mirror://gentoo/texlive-module-savesym-2019.tar.xz mirror://gentoo/texlive-module-savetrees-2019.tar.xz mirror://gentoo/texlive-module-scale-2019.tar.xz mirror://gentoo/texlive-module-scalebar-2019.tar.xz mirror://gentoo/texlive-module-scalerel-2019.tar.xz mirror://gentoo/texlive-module-scanpages-2019.tar.xz mirror://gentoo/texlive-module-scrlttr2copy-2019.tar.xz mirror://gentoo/texlive-module-sdrt-2019.tar.xz mirror://gentoo/texlive-module-secdot-2019.tar.xz mirror://gentoo/texlive-module-sectionbox-2019.tar.xz mirror://gentoo/texlive-module-sectionbreak-2019.tar.xz mirror://gentoo/texlive-module-sectsty-2019.tar.xz mirror://gentoo/texlive-module-seealso-2019.tar.xz mirror://gentoo/texlive-module-selectp-2019.tar.xz mirror://gentoo/texlive-module-semantic-2019.tar.xz mirror://gentoo/texlive-module-semantic-markup-2019.tar.xz mirror://gentoo/texlive-module-semioneside-2019.tar.xz mirror://gentoo/texlive-module-semproc-2019.tar.xz mirror://gentoo/texlive-module-sepfootnotes-2019.tar.xz mirror://gentoo/texlive-module-seqsplit-2019.tar.xz mirror://gentoo/texlive-module-sesstime-2019.tar.xz mirror://gentoo/texlive-module-sf298-2019.tar.xz mirror://gentoo/texlive-module-sffms-2019.tar.xz mirror://gentoo/texlive-module-sfmath-2019.tar.xz mirror://gentoo/texlive-module-shadethm-2019.tar.xz mirror://gentoo/texlive-module-shadow-2019.tar.xz mirror://gentoo/texlive-module-shadowtext-2019.tar.xz mirror://gentoo/texlive-module-shapepar-2019.tar.xz mirror://gentoo/texlive-module-shdoc-2019.tar.xz mirror://gentoo/texlive-module-shipunov-2019.tar.xz mirror://gentoo/texlive-module-shorttoc-2019.tar.xz mirror://gentoo/texlive-module-show2e-2019.tar.xz mirror://gentoo/texlive-module-showcharinbox-2019.tar.xz mirror://gentoo/texlive-module-showdim-2019.tar.xz mirror://gentoo/texlive-module-showexpl-2019.tar.xz mirror://gentoo/texlive-module-showhyphens-2019.tar.xz mirror://gentoo/texlive-module-showlabels-2019.tar.xz mirror://gentoo/texlive-module-sidecap-2019.tar.xz mirror://gentoo/texlive-module-sidenotes-2019.tar.xz mirror://gentoo/texlive-module-silence-2019.tar.xz mirror://gentoo/texlive-module-simplecd-2019.tar.xz mirror://gentoo/texlive-module-simplecv-2019.tar.xz mirror://gentoo/texlive-module-simpleinvoice-2019.tar.xz mirror://gentoo/texlive-module-sitem-2019.tar.xz mirror://gentoo/texlive-module-skb-2019.tar.xz mirror://gentoo/texlive-module-skdoc-2019.tar.xz mirror://gentoo/texlive-module-skeycommand-2019.tar.xz mirror://gentoo/texlive-module-skeyval-2019.tar.xz mirror://gentoo/texlive-module-skrapport-2019.tar.xz mirror://gentoo/texlive-module-slantsc-2019.tar.xz mirror://gentoo/texlive-module-smalltableof-2019.tar.xz mirror://gentoo/texlive-module-smartunits-2019.tar.xz mirror://gentoo/texlive-module-smartref-2019.tar.xz mirror://gentoo/texlive-module-snapshot-2019.tar.xz mirror://gentoo/texlive-module-snotez-2019.tar.xz mirror://gentoo/texlive-module-soul-2019.tar.xz mirror://gentoo/texlive-module-spark-otf-2019.tar.xz mirror://gentoo/texlive-module-sparklines-2019.tar.xz mirror://gentoo/texlive-module-sphack-2019.tar.xz mirror://gentoo/texlive-module-splitindex-2019.tar.xz mirror://gentoo/texlive-module-spot-2019.tar.xz mirror://gentoo/texlive-module-spotcolor-2019.tar.xz mirror://gentoo/texlive-module-spreadtab-2019.tar.xz mirror://gentoo/texlive-module-spverbatim-2019.tar.xz mirror://gentoo/texlive-module-srbook-mem-2019.tar.xz mirror://gentoo/texlive-module-srcltx-2019.tar.xz mirror://gentoo/texlive-module-sseq-2019.tar.xz mirror://gentoo/texlive-module-sslides-2019.tar.xz mirror://gentoo/texlive-module-stack-2019.tar.xz mirror://gentoo/texlive-module-stackengine-2019.tar.xz mirror://gentoo/texlive-module-standalone-2019.tar.xz mirror://gentoo/texlive-module-stdclsdv-2019.tar.xz mirror://gentoo/texlive-module-stealcaps-2019.tar.xz mirror://gentoo/texlive-module-stdpage-2019.tar.xz mirror://gentoo/texlive-module-stex-2019.tar.xz mirror://gentoo/texlive-module-storebox-2019.tar.xz mirror://gentoo/texlive-module-storecmd-2019.tar.xz mirror://gentoo/texlive-module-stringstrings-2019.tar.xz mirror://gentoo/texlive-module-sttools-2019.tar.xz mirror://gentoo/texlive-module-stubs-2019.tar.xz mirror://gentoo/texlive-module-studenthandouts-2019.tar.xz mirror://gentoo/texlive-module-subdepth-2019.tar.xz mirror://gentoo/texlive-module-subeqn-2019.tar.xz mirror://gentoo/texlive-module-subeqnarray-2019.tar.xz mirror://gentoo/texlive-module-subfigmat-2019.tar.xz mirror://gentoo/texlive-module-subfigure-2019.tar.xz mirror://gentoo/texlive-module-subfiles-2019.tar.xz mirror://gentoo/texlive-module-subfloat-2019.tar.xz mirror://gentoo/texlive-module-substitutefont-2019.tar.xz mirror://gentoo/texlive-module-substr-2019.tar.xz mirror://gentoo/texlive-module-supertabular-2019.tar.xz mirror://gentoo/texlive-module-svg-2019.tar.xz mirror://gentoo/texlive-module-svgcolor-2019.tar.xz mirror://gentoo/texlive-module-svn-2019.tar.xz mirror://gentoo/texlive-module-svn-multi-2019.tar.xz mirror://gentoo/texlive-module-svn-prov-2019.tar.xz mirror://gentoo/texlive-module-syntax-2019.tar.xz mirror://gentoo/texlive-module-syntrace-2019.tar.xz mirror://gentoo/texlive-module-synttree-2019.tar.xz mirror://gentoo/texlive-module-tabfigures-2019.tar.xz mirror://gentoo/texlive-module-tableaux-2019.tar.xz mirror://gentoo/texlive-module-tablefootnote-2019.tar.xz mirror://gentoo/texlive-module-tableof-2019.tar.xz mirror://gentoo/texlive-module-tablestyles-2019.tar.xz mirror://gentoo/texlive-module-tablists-2019.tar.xz mirror://gentoo/texlive-module-tabls-2019.tar.xz mirror://gentoo/texlive-module-tablvar-2019.tar.xz mirror://gentoo/texlive-module-tabstackengine-2019.tar.xz mirror://gentoo/texlive-module-tabto-ltx-2019.tar.xz mirror://gentoo/texlive-module-tabu-2019.tar.xz mirror://gentoo/texlive-module-tabularborder-2019.tar.xz mirror://gentoo/texlive-module-tabularcalc-2019.tar.xz mirror://gentoo/texlive-module-tabularew-2019.tar.xz mirror://gentoo/texlive-module-tabulary-2019.tar.xz mirror://gentoo/texlive-module-tagging-2019.tar.xz mirror://gentoo/texlive-module-tagpair-2019.tar.xz mirror://gentoo/texlive-module-tagpdf-2019.tar.xz mirror://gentoo/texlive-module-talk-2019.tar.xz mirror://gentoo/texlive-module-tamefloats-2019.tar.xz mirror://gentoo/texlive-module-tasks-2019.tar.xz mirror://gentoo/texlive-module-tcldoc-2019.tar.xz mirror://gentoo/texlive-module-tcolorbox-2019.tar.xz mirror://gentoo/texlive-module-tdclock-2019.tar.xz mirror://gentoo/texlive-module-technics-2019.tar.xz mirror://gentoo/texlive-module-ted-2019.tar.xz mirror://gentoo/texlive-module-templatetools-2019.tar.xz mirror://gentoo/texlive-module-termcal-2019.tar.xz mirror://gentoo/texlive-module-termlist-2019.tar.xz mirror://gentoo/texlive-module-testhyphens-2019.tar.xz mirror://gentoo/texlive-module-testidx-2019.tar.xz mirror://gentoo/texlive-module-tex-label-2019.tar.xz mirror://gentoo/texlive-module-tex-locale-2019.tar.xz mirror://gentoo/texlive-module-texlogos-2019.tar.xz mirror://gentoo/texlive-module-texmate-2019.tar.xz mirror://gentoo/texlive-module-texments-2019.tar.xz mirror://gentoo/texlive-module-texpower-2019.tar.xz mirror://gentoo/texlive-module-texshade-2019.tar.xz mirror://gentoo/texlive-module-texvc-2019.tar.xz mirror://gentoo/texlive-module-textfit-2019.tar.xz mirror://gentoo/texlive-module-textmerg-2019.tar.xz mirror://gentoo/texlive-module-textpos-2019.tar.xz mirror://gentoo/texlive-module-textualicomma-2019.tar.xz mirror://gentoo/texlive-module-theoremref-2019.tar.xz mirror://gentoo/texlive-module-thinsp-2019.tar.xz mirror://gentoo/texlive-module-thmtools-2019.tar.xz mirror://gentoo/texlive-module-threadcol-2019.tar.xz mirror://gentoo/texlive-module-threeparttable-2019.tar.xz mirror://gentoo/texlive-module-threeparttablex-2019.tar.xz mirror://gentoo/texlive-module-thumb-2019.tar.xz mirror://gentoo/texlive-module-thumbs-2019.tar.xz mirror://gentoo/texlive-module-thumby-2019.tar.xz mirror://gentoo/texlive-module-ticket-2019.tar.xz mirror://gentoo/texlive-module-titlecaps-2019.tar.xz mirror://gentoo/texlive-module-titlefoot-2019.tar.xz mirror://gentoo/texlive-module-titlepic-2019.tar.xz mirror://gentoo/texlive-module-titleref-2019.tar.xz mirror://gentoo/texlive-module-titlesec-2019.tar.xz mirror://gentoo/texlive-module-titling-2019.tar.xz mirror://gentoo/texlive-module-tocbibind-2019.tar.xz mirror://gentoo/texlive-module-tocdata-2019.tar.xz mirror://gentoo/texlive-module-tocloft-2019.tar.xz mirror://gentoo/texlive-module-tocvsec2-2019.tar.xz mirror://gentoo/texlive-module-todo-2019.tar.xz mirror://gentoo/texlive-module-todonotes-2019.tar.xz mirror://gentoo/texlive-module-tokenizer-2019.tar.xz mirror://gentoo/texlive-module-toolbox-2019.tar.xz mirror://gentoo/texlive-module-topfloat-2019.tar.xz mirror://gentoo/texlive-module-topiclongtable-2019.tar.xz mirror://gentoo/texlive-module-totcount-2019.tar.xz mirror://gentoo/texlive-module-totpages-2019.tar.xz mirror://gentoo/texlive-module-translations-2019.tar.xz mirror://gentoo/texlive-module-trfsigns-2019.tar.xz mirror://gentoo/texlive-module-trimspaces-2019.tar.xz mirror://gentoo/texlive-module-trivfloat-2019.tar.xz mirror://gentoo/texlive-module-trsym-2019.tar.xz mirror://gentoo/texlive-module-truncate-2019.tar.xz mirror://gentoo/texlive-module-tucv-2019.tar.xz mirror://gentoo/texlive-module-turnthepage-2019.tar.xz mirror://gentoo/texlive-module-twoinone-2019.tar.xz mirror://gentoo/texlive-module-twoup-2019.tar.xz mirror://gentoo/texlive-module-txgreeks-2019.tar.xz mirror://gentoo/texlive-module-type1cm-2019.tar.xz mirror://gentoo/texlive-module-typed-checklist-2019.tar.xz mirror://gentoo/texlive-module-typeface-2019.tar.xz mirror://gentoo/texlive-module-typoaid-2019.tar.xz mirror://gentoo/texlive-module-typogrid-2019.tar.xz mirror://gentoo/texlive-module-uassign-2019.tar.xz mirror://gentoo/texlive-module-ucs-2019.tar.xz mirror://gentoo/texlive-module-uebungsblatt-2019.tar.xz mirror://gentoo/texlive-module-umoline-2019.tar.xz mirror://gentoo/texlive-module-underlin-2019.tar.xz mirror://gentoo/texlive-module-underoverlap-2019.tar.xz mirror://gentoo/texlive-module-undolabl-2019.tar.xz mirror://gentoo/texlive-module-units-2019.tar.xz mirror://gentoo/texlive-module-unravel-2019.tar.xz mirror://gentoo/texlive-module-upmethodology-2019.tar.xz mirror://gentoo/texlive-module-upquote-2019.tar.xz mirror://gentoo/texlive-module-uri-2019.tar.xz mirror://gentoo/texlive-module-ushort-2019.tar.xz mirror://gentoo/texlive-module-uspace-2019.tar.xz mirror://gentoo/texlive-module-uwmslide-2019.tar.xz mirror://gentoo/texlive-module-variablelm-2019.tar.xz mirror://gentoo/texlive-module-varindex-2019.tar.xz mirror://gentoo/texlive-module-varsfromjobname-2019.tar.xz mirror://gentoo/texlive-module-varwidth-2019.tar.xz mirror://gentoo/texlive-module-vdmlisting-2019.tar.xz mirror://gentoo/texlive-module-verbasef-2019.tar.xz mirror://gentoo/texlive-module-verbatimbox-2019.tar.xz mirror://gentoo/texlive-module-verbatimcopy-2019.tar.xz mirror://gentoo/texlive-module-verbdef-2019.tar.xz mirror://gentoo/texlive-module-verbments-2019.tar.xz mirror://gentoo/texlive-module-version-2019.tar.xz mirror://gentoo/texlive-module-versions-2019.tar.xz mirror://gentoo/texlive-module-versonotes-2019.tar.xz mirror://gentoo/texlive-module-vertbars-2019.tar.xz mirror://gentoo/texlive-module-vgrid-2019.tar.xz mirror://gentoo/texlive-module-vhistory-2019.tar.xz mirror://gentoo/texlive-module-vmargin-2019.tar.xz mirror://gentoo/texlive-module-volumes-2019.tar.xz mirror://gentoo/texlive-module-vpe-2019.tar.xz mirror://gentoo/texlive-module-vruler-2019.tar.xz mirror://gentoo/texlive-module-vtable-2019.tar.xz mirror://gentoo/texlive-module-vwcol-2019.tar.xz mirror://gentoo/texlive-module-wallcalendar-2019.tar.xz mirror://gentoo/texlive-module-wallpaper-2019.tar.xz mirror://gentoo/texlive-module-warning-2019.tar.xz mirror://gentoo/texlive-module-warpcol-2019.tar.xz mirror://gentoo/texlive-module-was-2019.tar.xz mirror://gentoo/texlive-module-webquiz-2019.tar.xz mirror://gentoo/texlive-module-widetable-2019.tar.xz mirror://gentoo/texlive-module-widows-and-orphans-2019.tar.xz mirror://gentoo/texlive-module-williams-2019.tar.xz mirror://gentoo/texlive-module-withargs-2019.tar.xz mirror://gentoo/texlive-module-wordcount-2019.tar.xz mirror://gentoo/texlive-module-wordlike-2019.tar.xz mirror://gentoo/texlive-module-worksheet-2019.tar.xz mirror://gentoo/texlive-module-wrapfig-2019.tar.xz mirror://gentoo/texlive-module-wtref-2019.tar.xz mirror://gentoo/texlive-module-xargs-2019.tar.xz mirror://gentoo/texlive-module-xassoccnt-2019.tar.xz mirror://gentoo/texlive-module-xbmks-2019.tar.xz mirror://gentoo/texlive-module-xcntperchap-2019.tar.xz mirror://gentoo/texlive-module-xcolor-material-2019.tar.xz mirror://gentoo/texlive-module-xcolor-solarized-2019.tar.xz mirror://gentoo/texlive-module-xcomment-2019.tar.xz mirror://gentoo/texlive-module-xcookybooky-2019.tar.xz mirror://gentoo/texlive-module-xcpdftips-2019.tar.xz mirror://gentoo/texlive-module-xdoc-2019.tar.xz mirror://gentoo/texlive-module-xellipsis-2019.tar.xz mirror://gentoo/texlive-module-xfakebold-2019.tar.xz mirror://gentoo/texlive-module-xfor-2019.tar.xz mirror://gentoo/texlive-module-xhfill-2019.tar.xz mirror://gentoo/texlive-module-xifthen-2019.tar.xz mirror://gentoo/texlive-module-xint-2019.tar.xz mirror://gentoo/texlive-module-xltabular-2019.tar.xz mirror://gentoo/texlive-module-xmpincl-2019.tar.xz mirror://gentoo/texlive-module-xnewcommand-2019.tar.xz mirror://gentoo/texlive-module-xoptarg-2019.tar.xz mirror://gentoo/texlive-module-xpatch-2019.tar.xz mirror://gentoo/texlive-module-xpeek-2019.tar.xz mirror://gentoo/texlive-module-xprintlen-2019.tar.xz mirror://gentoo/texlive-module-xpunctuate-2019.tar.xz mirror://gentoo/texlive-module-xsavebox-2019.tar.xz mirror://gentoo/texlive-module-xsim-2019.tar.xz mirror://gentoo/texlive-module-xstring-2019.tar.xz mirror://gentoo/texlive-module-xtab-2019.tar.xz mirror://gentoo/texlive-module-xurl-2019.tar.xz mirror://gentoo/texlive-module-xwatermark-2019.tar.xz mirror://gentoo/texlive-module-xytree-2019.tar.xz mirror://gentoo/texlive-module-yafoot-2019.tar.xz mirror://gentoo/texlive-module-yaletter-2019.tar.xz mirror://gentoo/texlive-module-yagusylo-2019.tar.xz mirror://gentoo/texlive-module-ycbook-2019.tar.xz mirror://gentoo/texlive-module-ydoc-2019.tar.xz mirror://gentoo/texlive-module-yplan-2019.tar.xz mirror://gentoo/texlive-module-zebra-goodies-2019.tar.xz mirror://gentoo/texlive-module-zed-csp-2019.tar.xz mirror://gentoo/texlive-module-ziffer-2019.tar.xz mirror://gentoo/texlive-module-zwgetfdate-2019.tar.xz mirror://gentoo/texlive-module-zwpagelayout-2019.tar.xz mirror://gentoo/texlive-module-collection-latexextra-2019.tar.xz doc? ( mirror://gentoo/texlive-module-2up.doc-2019.tar.xz mirror://gentoo/texlive-module-ESIEEcv.doc-2019.tar.xz mirror://gentoo/texlive-module-GS1.doc-2019.tar.xz mirror://gentoo/texlive-module-HA-prosper.doc-2019.tar.xz mirror://gentoo/texlive-module-Tabbing.doc-2019.tar.xz mirror://gentoo/texlive-module-a0poster.doc-2019.tar.xz mirror://gentoo/texlive-module-a4wide.doc-2019.tar.xz mirror://gentoo/texlive-module-a5comb.doc-2019.tar.xz mirror://gentoo/texlive-module-abraces.doc-2019.tar.xz mirror://gentoo/texlive-module-abstract.doc-2019.tar.xz mirror://gentoo/texlive-module-achemso.doc-2019.tar.xz mirror://gentoo/texlive-module-acro.doc-2019.tar.xz mirror://gentoo/texlive-module-acronym.doc-2019.tar.xz mirror://gentoo/texlive-module-acroterm.doc-2019.tar.xz mirror://gentoo/texlive-module-actuarialangle.doc-2019.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.doc-2019.tar.xz mirror://gentoo/texlive-module-addfont.doc-2019.tar.xz mirror://gentoo/texlive-module-addlines.doc-2019.tar.xz mirror://gentoo/texlive-module-adjmulticol.doc-2019.tar.xz mirror://gentoo/texlive-module-adjustbox.doc-2019.tar.xz mirror://gentoo/texlive-module-adrconv.doc-2019.tar.xz mirror://gentoo/texlive-module-advdate.doc-2019.tar.xz mirror://gentoo/texlive-module-akktex.doc-2019.tar.xz mirror://gentoo/texlive-module-akletter.doc-2019.tar.xz mirror://gentoo/texlive-module-alertmessage.doc-2019.tar.xz mirror://gentoo/texlive-module-alnumsec.doc-2019.tar.xz mirror://gentoo/texlive-module-alterqcm.doc-2019.tar.xz mirror://gentoo/texlive-module-altfont.doc-2019.tar.xz mirror://gentoo/texlive-module-amsaddr.doc-2019.tar.xz mirror://gentoo/texlive-module-animate.doc-2019.tar.xz mirror://gentoo/texlive-module-anonchap.doc-2019.tar.xz mirror://gentoo/texlive-module-answers.doc-2019.tar.xz mirror://gentoo/texlive-module-anyfontsize.doc-2019.tar.xz mirror://gentoo/texlive-module-appendix.doc-2019.tar.xz mirror://gentoo/texlive-module-appendixnumberbeamer.doc-2019.tar.xz mirror://gentoo/texlive-module-apptools.doc-2019.tar.xz mirror://gentoo/texlive-module-arcs.doc-2019.tar.xz mirror://gentoo/texlive-module-arrayjobx.doc-2019.tar.xz mirror://gentoo/texlive-module-arraysort.doc-2019.tar.xz mirror://gentoo/texlive-module-arydshln.doc-2019.tar.xz mirror://gentoo/texlive-module-asciilist.doc-2019.tar.xz mirror://gentoo/texlive-module-assignment.doc-2019.tar.xz mirror://gentoo/texlive-module-assoccnt.doc-2019.tar.xz mirror://gentoo/texlive-module-attachfile.doc-2019.tar.xz mirror://gentoo/texlive-module-aurl.doc-2019.tar.xz mirror://gentoo/texlive-module-authoraftertitle.doc-2019.tar.xz mirror://gentoo/texlive-module-authorarchive.doc-2019.tar.xz mirror://gentoo/texlive-module-authorindex.doc-2019.tar.xz mirror://gentoo/texlive-module-autonum.doc-2019.tar.xz mirror://gentoo/texlive-module-autopdf.doc-2019.tar.xz mirror://gentoo/texlive-module-avremu.doc-2019.tar.xz mirror://gentoo/texlive-module-background.doc-2019.tar.xz mirror://gentoo/texlive-module-bankstatement.doc-2019.tar.xz mirror://gentoo/texlive-module-bashful.doc-2019.tar.xz mirror://gentoo/texlive-module-basicarith.doc-2019.tar.xz mirror://gentoo/texlive-module-bchart.doc-2019.tar.xz mirror://gentoo/texlive-module-beamer2thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-beamer-rl.doc-2019.tar.xz mirror://gentoo/texlive-module-beameraudience.doc-2019.tar.xz mirror://gentoo/texlive-module-beamerauxtheme.doc-2019.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.doc-2019.tar.xz mirror://gentoo/texlive-module-beamerdarkthemes.doc-2019.tar.xz mirror://gentoo/texlive-module-beamerposter.doc-2019.tar.xz mirror://gentoo/texlive-module-beamersubframe.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-detlevcm.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-epyt.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-focus.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-light.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-npbt.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-phnompenh.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-saintpetersburg.doc-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-upenn-bc.doc-2019.tar.xz mirror://gentoo/texlive-module-beamerthemenirma.doc-2019.tar.xz mirror://gentoo/texlive-module-beton.doc-2019.tar.xz mirror://gentoo/texlive-module-bewerbung.doc-2019.tar.xz mirror://gentoo/texlive-module-bez123.doc-2019.tar.xz mirror://gentoo/texlive-module-bezos.doc-2019.tar.xz mirror://gentoo/texlive-module-bhcexam.doc-2019.tar.xz mirror://gentoo/texlive-module-bibletext.doc-2019.tar.xz mirror://gentoo/texlive-module-bigfoot.doc-2019.tar.xz mirror://gentoo/texlive-module-bigints.doc-2019.tar.xz mirror://gentoo/texlive-module-biochemistry-colors.doc-2019.tar.xz mirror://gentoo/texlive-module-bizcard.doc-2019.tar.xz mirror://gentoo/texlive-module-blindtext.doc-2019.tar.xz mirror://gentoo/texlive-module-blkarray.doc-2019.tar.xz mirror://gentoo/texlive-module-block.doc-2019.tar.xz mirror://gentoo/texlive-module-blowup.doc-2019.tar.xz mirror://gentoo/texlive-module-bnumexpr.doc-2019.tar.xz mirror://gentoo/texlive-module-boites.doc-2019.tar.xz mirror://gentoo/texlive-module-bold-extra.doc-2019.tar.xz mirror://gentoo/texlive-module-bookcover.doc-2019.tar.xz mirror://gentoo/texlive-module-bookest.doc-2019.tar.xz mirror://gentoo/texlive-module-booklet.doc-2019.tar.xz mirror://gentoo/texlive-module-boolexpr.doc-2019.tar.xz mirror://gentoo/texlive-module-bophook.doc-2019.tar.xz mirror://gentoo/texlive-module-boxedminipage.doc-2019.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.doc-2019.tar.xz mirror://gentoo/texlive-module-boxhandler.doc-2019.tar.xz mirror://gentoo/texlive-module-bracketkey.doc-2019.tar.xz mirror://gentoo/texlive-module-braket.doc-2019.tar.xz mirror://gentoo/texlive-module-breakurl.doc-2019.tar.xz mirror://gentoo/texlive-module-bullcntr.doc-2019.tar.xz mirror://gentoo/texlive-module-bxcalc.doc-2019.tar.xz mirror://gentoo/texlive-module-bxdpx-beamer.doc-2019.tar.xz mirror://gentoo/texlive-module-bxdvidriver.doc-2019.tar.xz mirror://gentoo/texlive-module-bxenclose.doc-2019.tar.xz mirror://gentoo/texlive-module-bxnewfont.doc-2019.tar.xz mirror://gentoo/texlive-module-bxpapersize.doc-2019.tar.xz mirror://gentoo/texlive-module-bxpdfver.doc-2019.tar.xz mirror://gentoo/texlive-module-bxtexlogo.doc-2019.tar.xz mirror://gentoo/texlive-module-calcage.doc-2019.tar.xz mirror://gentoo/texlive-module-calctab.doc-2019.tar.xz mirror://gentoo/texlive-module-calculator.doc-2019.tar.xz mirror://gentoo/texlive-module-calrsfs.doc-2019.tar.xz mirror://gentoo/texlive-module-cals.doc-2019.tar.xz mirror://gentoo/texlive-module-calxxxx-yyyy.doc-2019.tar.xz mirror://gentoo/texlive-module-cancel.doc-2019.tar.xz mirror://gentoo/texlive-module-canoniclayout.doc-2019.tar.xz mirror://gentoo/texlive-module-capt-of.doc-2019.tar.xz mirror://gentoo/texlive-module-captcont.doc-2019.tar.xz mirror://gentoo/texlive-module-captdef.doc-2019.tar.xz mirror://gentoo/texlive-module-carbohydrates.doc-2019.tar.xz mirror://gentoo/texlive-module-cases.doc-2019.tar.xz mirror://gentoo/texlive-module-casyl.doc-2019.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.doc-2019.tar.xz mirror://gentoo/texlive-module-catechis.doc-2019.tar.xz mirror://gentoo/texlive-module-catoptions.doc-2019.tar.xz mirror://gentoo/texlive-module-cbcoptic.doc-2019.tar.xz mirror://gentoo/texlive-module-ccaption.doc-2019.tar.xz mirror://gentoo/texlive-module-cclicenses.doc-2019.tar.xz mirror://gentoo/texlive-module-cd.doc-2019.tar.xz mirror://gentoo/texlive-module-cd-cover.doc-2019.tar.xz mirror://gentoo/texlive-module-cdpbundl.doc-2019.tar.xz mirror://gentoo/texlive-module-cellprops.doc-2019.tar.xz mirror://gentoo/texlive-module-cellspace.doc-2019.tar.xz mirror://gentoo/texlive-module-censor.doc-2019.tar.xz mirror://gentoo/texlive-module-centeredline.doc-2019.tar.xz mirror://gentoo/texlive-module-changebar.doc-2019.tar.xz mirror://gentoo/texlive-module-changelayout.doc-2019.tar.xz mirror://gentoo/texlive-module-changelog.doc-2019.tar.xz mirror://gentoo/texlive-module-changepage.doc-2019.tar.xz mirror://gentoo/texlive-module-changes.doc-2019.tar.xz mirror://gentoo/texlive-module-chappg.doc-2019.tar.xz mirror://gentoo/texlive-module-chapterfolder.doc-2019.tar.xz mirror://gentoo/texlive-module-cheatsheet.doc-2019.tar.xz mirror://gentoo/texlive-module-chet.doc-2019.tar.xz mirror://gentoo/texlive-module-chextras.doc-2019.tar.xz mirror://gentoo/texlive-module-childdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-chkfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-chletter.doc-2019.tar.xz mirror://gentoo/texlive-module-chngcntr.doc-2019.tar.xz mirror://gentoo/texlive-module-chronology.doc-2019.tar.xz mirror://gentoo/texlive-module-circ.doc-2019.tar.xz mirror://gentoo/texlive-module-classics.doc-2019.tar.xz mirror://gentoo/texlive-module-classpack.doc-2019.tar.xz mirror://gentoo/texlive-module-clefval.doc-2019.tar.xz mirror://gentoo/texlive-module-cleveref.doc-2019.tar.xz mirror://gentoo/texlive-module-clipboard.doc-2019.tar.xz mirror://gentoo/texlive-module-clock.doc-2019.tar.xz mirror://gentoo/texlive-module-cloze.doc-2019.tar.xz mirror://gentoo/texlive-module-clrdblpg.doc-2019.tar.xz mirror://gentoo/texlive-module-clrstrip.doc-2019.tar.xz mirror://gentoo/texlive-module-cmdstring.doc-2019.tar.xz mirror://gentoo/texlive-module-cmdtrack.doc-2019.tar.xz mirror://gentoo/texlive-module-cmsd.doc-2019.tar.xz mirror://gentoo/texlive-module-cnltx.doc-2019.tar.xz mirror://gentoo/texlive-module-cntformats.doc-2019.tar.xz mirror://gentoo/texlive-module-cntperchap.doc-2019.tar.xz mirror://gentoo/texlive-module-codedoc.doc-2019.tar.xz mirror://gentoo/texlive-module-codepage.doc-2019.tar.xz mirror://gentoo/texlive-module-codesection.doc-2019.tar.xz mirror://gentoo/texlive-module-collcell.doc-2019.tar.xz mirror://gentoo/texlive-module-collectbox.doc-2019.tar.xz mirror://gentoo/texlive-module-colophon.doc-2019.tar.xz mirror://gentoo/texlive-module-colordoc.doc-2019.tar.xz mirror://gentoo/texlive-module-colorinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-coloring.doc-2019.tar.xz mirror://gentoo/texlive-module-colorspace.doc-2019.tar.xz mirror://gentoo/texlive-module-colortab.doc-2019.tar.xz mirror://gentoo/texlive-module-colorwav.doc-2019.tar.xz mirror://gentoo/texlive-module-colorweb.doc-2019.tar.xz mirror://gentoo/texlive-module-colourchange.doc-2019.tar.xz mirror://gentoo/texlive-module-combelow.doc-2019.tar.xz mirror://gentoo/texlive-module-combine.doc-2019.tar.xz mirror://gentoo/texlive-module-comma.doc-2019.tar.xz mirror://gentoo/texlive-module-commado.doc-2019.tar.xz mirror://gentoo/texlive-module-commedit.doc-2019.tar.xz mirror://gentoo/texlive-module-comment.doc-2019.tar.xz mirror://gentoo/texlive-module-competences.doc-2019.tar.xz mirror://gentoo/texlive-module-concepts.doc-2019.tar.xz mirror://gentoo/texlive-module-concprog.doc-2019.tar.xz mirror://gentoo/texlive-module-constants.doc-2019.tar.xz mirror://gentoo/texlive-module-continue.doc-2019.tar.xz mirror://gentoo/texlive-module-contour.doc-2019.tar.xz mirror://gentoo/texlive-module-contracard.doc-2019.tar.xz mirror://gentoo/texlive-module-conv-xkv.doc-2019.tar.xz mirror://gentoo/texlive-module-cooking.doc-2019.tar.xz mirror://gentoo/texlive-module-cooking-units.doc-2019.tar.xz mirror://gentoo/texlive-module-cool.doc-2019.tar.xz mirror://gentoo/texlive-module-coollist.doc-2019.tar.xz mirror://gentoo/texlive-module-coolstr.doc-2019.tar.xz mirror://gentoo/texlive-module-coolthms.doc-2019.tar.xz mirror://gentoo/texlive-module-cooltooltips.doc-2019.tar.xz mirror://gentoo/texlive-module-coordsys.doc-2019.tar.xz mirror://gentoo/texlive-module-copyedit.doc-2019.tar.xz mirror://gentoo/texlive-module-copyrightbox.doc-2019.tar.xz mirror://gentoo/texlive-module-coseoul.doc-2019.tar.xz mirror://gentoo/texlive-module-counttexruns.doc-2019.tar.xz mirror://gentoo/texlive-module-courseoutline.doc-2019.tar.xz mirror://gentoo/texlive-module-coursepaper.doc-2019.tar.xz mirror://gentoo/texlive-module-coverpage.doc-2019.tar.xz mirror://gentoo/texlive-module-cprotect.doc-2019.tar.xz mirror://gentoo/texlive-module-crbox.doc-2019.tar.xz mirror://gentoo/texlive-module-crossreference.doc-2019.tar.xz mirror://gentoo/texlive-module-crossreftools.doc-2019.tar.xz mirror://gentoo/texlive-module-csquotes.doc-2019.tar.xz mirror://gentoo/texlive-module-css-colors.doc-2019.tar.xz mirror://gentoo/texlive-module-csvsimple.doc-2019.tar.xz mirror://gentoo/texlive-module-cuisine.doc-2019.tar.xz mirror://gentoo/texlive-module-currency.doc-2019.tar.xz mirror://gentoo/texlive-module-currfile.doc-2019.tar.xz mirror://gentoo/texlive-module-cutwin.doc-2019.tar.xz mirror://gentoo/texlive-module-cv.doc-2019.tar.xz mirror://gentoo/texlive-module-cv4tw.doc-2019.tar.xz mirror://gentoo/texlive-module-cweb-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-cyber.doc-2019.tar.xz mirror://gentoo/texlive-module-cybercic.doc-2019.tar.xz mirror://gentoo/texlive-module-dashbox.doc-2019.tar.xz mirror://gentoo/texlive-module-dashrule.doc-2019.tar.xz mirror://gentoo/texlive-module-dashundergaps.doc-2019.tar.xz mirror://gentoo/texlive-module-dataref.doc-2019.tar.xz mirror://gentoo/texlive-module-datatool.doc-2019.tar.xz mirror://gentoo/texlive-module-dateiliste.doc-2019.tar.xz mirror://gentoo/texlive-module-datenumber.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-basque.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-breton.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-czech.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-danish.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-english.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-french.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-galician.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-german.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-greek.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-irish.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-italian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-latin.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-polish.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-russian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-samin.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.doc-2019.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.doc-2019.tar.xz mirror://gentoo/texlive-module-dblfloatfix.doc-2019.tar.xz mirror://gentoo/texlive-module-decimal.doc-2019.tar.xz mirror://gentoo/texlive-module-decorule.doc-2019.tar.xz mirror://gentoo/texlive-module-delimtxt.doc-2019.tar.xz mirror://gentoo/texlive-module-denisbdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-diagbox.doc-2019.tar.xz mirror://gentoo/texlive-module-diagnose.doc-2019.tar.xz mirror://gentoo/texlive-module-dialogl.doc-2019.tar.xz mirror://gentoo/texlive-module-dichokey.doc-2019.tar.xz mirror://gentoo/texlive-module-dinbrief.doc-2019.tar.xz mirror://gentoo/texlive-module-directory.doc-2019.tar.xz mirror://gentoo/texlive-module-dirtytalk.doc-2019.tar.xz mirror://gentoo/texlive-module-dlfltxb.doc-2019.tar.xz mirror://gentoo/texlive-module-dnaseq.doc-2019.tar.xz mirror://gentoo/texlive-module-doclicense.doc-2019.tar.xz mirror://gentoo/texlive-module-docmfp.doc-2019.tar.xz mirror://gentoo/texlive-module-docmute.doc-2019.tar.xz mirror://gentoo/texlive-module-doctools.doc-2019.tar.xz mirror://gentoo/texlive-module-documentation.doc-2019.tar.xz mirror://gentoo/texlive-module-doi.doc-2019.tar.xz mirror://gentoo/texlive-module-dotarrow.doc-2019.tar.xz mirror://gentoo/texlive-module-dotseqn.doc-2019.tar.xz mirror://gentoo/texlive-module-download.doc-2019.tar.xz mirror://gentoo/texlive-module-dox.doc-2019.tar.xz mirror://gentoo/texlive-module-dpfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-dprogress.doc-2019.tar.xz mirror://gentoo/texlive-module-drac.doc-2019.tar.xz mirror://gentoo/texlive-module-draftcopy.doc-2019.tar.xz mirror://gentoo/texlive-module-draftfigure.doc-2019.tar.xz mirror://gentoo/texlive-module-draftwatermark.doc-2019.tar.xz mirror://gentoo/texlive-module-dtk.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxdescribe.doc-2019.tar.xz mirror://gentoo/texlive-module-dtxgallery.doc-2019.tar.xz mirror://gentoo/texlive-module-duckuments.doc-2019.tar.xz mirror://gentoo/texlive-module-ducksay.doc-2019.tar.xz mirror://gentoo/texlive-module-dvdcoll.doc-2019.tar.xz mirror://gentoo/texlive-module-dynamicnumber.doc-2019.tar.xz mirror://gentoo/texlive-module-dynblocks.doc-2019.tar.xz mirror://gentoo/texlive-module-ean13isbn.doc-2019.tar.xz mirror://gentoo/texlive-module-easy.doc-2019.tar.xz mirror://gentoo/texlive-module-easy-todo.doc-2019.tar.xz mirror://gentoo/texlive-module-easyfig.doc-2019.tar.xz mirror://gentoo/texlive-module-easyformat.doc-2019.tar.xz mirror://gentoo/texlive-module-easylist.doc-2019.tar.xz mirror://gentoo/texlive-module-easyreview.doc-2019.tar.xz mirror://gentoo/texlive-module-ebezier.doc-2019.tar.xz mirror://gentoo/texlive-module-ecclesiastic.doc-2019.tar.xz mirror://gentoo/texlive-module-ecv.doc-2019.tar.xz mirror://gentoo/texlive-module-ed.doc-2019.tar.xz mirror://gentoo/texlive-module-edmargin.doc-2019.tar.xz mirror://gentoo/texlive-module-eemeir.doc-2019.tar.xz mirror://gentoo/texlive-module-efbox.doc-2019.tar.xz mirror://gentoo/texlive-module-egplot.doc-2019.tar.xz mirror://gentoo/texlive-module-ehhline.doc-2019.tar.xz mirror://gentoo/texlive-module-elegantbook.doc-2019.tar.xz mirror://gentoo/texlive-module-elegantnote.doc-2019.tar.xz mirror://gentoo/texlive-module-elegantpaper.doc-2019.tar.xz mirror://gentoo/texlive-module-elements.doc-2019.tar.xz mirror://gentoo/texlive-module-ellipsis.doc-2019.tar.xz mirror://gentoo/texlive-module-elmath.doc-2019.tar.xz mirror://gentoo/texlive-module-elocalloc.doc-2019.tar.xz mirror://gentoo/texlive-module-elpres.doc-2019.tar.xz mirror://gentoo/texlive-module-elzcards.doc-2019.tar.xz mirror://gentoo/texlive-module-emarks.doc-2019.tar.xz mirror://gentoo/texlive-module-embedall.doc-2019.tar.xz mirror://gentoo/texlive-module-embrac.doc-2019.tar.xz mirror://gentoo/texlive-module-emptypage.doc-2019.tar.xz mirror://gentoo/texlive-module-emulateapj.doc-2019.tar.xz mirror://gentoo/texlive-module-endfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-endheads.doc-2019.tar.xz mirror://gentoo/texlive-module-endnotes.doc-2019.tar.xz mirror://gentoo/texlive-module-engpron.doc-2019.tar.xz mirror://gentoo/texlive-module-engrec.doc-2019.tar.xz mirror://gentoo/texlive-module-enotez.doc-2019.tar.xz mirror://gentoo/texlive-module-enumitem.doc-2019.tar.xz mirror://gentoo/texlive-module-enumitem-zref.doc-2019.tar.xz mirror://gentoo/texlive-module-envbig.doc-2019.tar.xz mirror://gentoo/texlive-module-environ.doc-2019.tar.xz mirror://gentoo/texlive-module-epigraph.doc-2019.tar.xz mirror://gentoo/texlive-module-epiolmec.doc-2019.tar.xz mirror://gentoo/texlive-module-eqell.doc-2019.tar.xz mirror://gentoo/texlive-module-eqlist.doc-2019.tar.xz mirror://gentoo/texlive-module-eqnalign.doc-2019.tar.xz mirror://gentoo/texlive-module-eqparbox.doc-2019.tar.xz mirror://gentoo/texlive-module-errata.doc-2019.tar.xz mirror://gentoo/texlive-module-erw-l3.doc-2019.tar.xz mirror://gentoo/texlive-module-esami.doc-2019.tar.xz mirror://gentoo/texlive-module-esdiff.doc-2019.tar.xz mirror://gentoo/texlive-module-esint.doc-2019.tar.xz mirror://gentoo/texlive-module-esint-type1.doc-2019.tar.xz mirror://gentoo/texlive-module-etaremune.doc-2019.tar.xz mirror://gentoo/texlive-module-etextools.doc-2019.tar.xz mirror://gentoo/texlive-module-etoc.doc-2019.tar.xz mirror://gentoo/texlive-module-eukdate.doc-2019.tar.xz mirror://gentoo/texlive-module-eulerpx.doc-2019.tar.xz mirror://gentoo/texlive-module-europasscv.doc-2019.tar.xz mirror://gentoo/texlive-module-everyhook.doc-2019.tar.xz mirror://gentoo/texlive-module-everypage.doc-2019.tar.xz mirror://gentoo/texlive-module-exam.doc-2019.tar.xz mirror://gentoo/texlive-module-exam-n.doc-2019.tar.xz mirror://gentoo/texlive-module-exam-randomizechoices.doc-2019.tar.xz mirror://gentoo/texlive-module-examdesign.doc-2019.tar.xz mirror://gentoo/texlive-module-exframe.doc-2019.tar.xz mirror://gentoo/texlive-module-examplep.doc-2019.tar.xz mirror://gentoo/texlive-module-exceltex.doc-2019.tar.xz mirror://gentoo/texlive-module-excludeonly.doc-2019.tar.xz mirror://gentoo/texlive-module-exercise.doc-2019.tar.xz mirror://gentoo/texlive-module-exercisebank.doc-2019.tar.xz mirror://gentoo/texlive-module-exercisepoints.doc-2019.tar.xz mirror://gentoo/texlive-module-exercises.doc-2019.tar.xz mirror://gentoo/texlive-module-exp-testopt.doc-2019.tar.xz mirror://gentoo/texlive-module-expdlist.doc-2019.tar.xz mirror://gentoo/texlive-module-export.doc-2019.tar.xz mirror://gentoo/texlive-module-exsheets.doc-2019.tar.xz mirror://gentoo/texlive-module-exsol.doc-2019.tar.xz mirror://gentoo/texlive-module-extract.doc-2019.tar.xz mirror://gentoo/texlive-module-facsimile.doc-2019.tar.xz mirror://gentoo/texlive-module-factura.doc-2019.tar.xz mirror://gentoo/texlive-module-fancyhandout.doc-2019.tar.xz mirror://gentoo/texlive-module-fancylabel.doc-2019.tar.xz mirror://gentoo/texlive-module-fancynum.doc-2019.tar.xz mirror://gentoo/texlive-module-fancypar.doc-2019.tar.xz mirror://gentoo/texlive-module-fancyslides.doc-2019.tar.xz mirror://gentoo/texlive-module-fancytabs.doc-2019.tar.xz mirror://gentoo/texlive-module-fancytooltips.doc-2019.tar.xz mirror://gentoo/texlive-module-fbox.doc-2019.tar.xz mirror://gentoo/texlive-module-fcolumn.doc-2019.tar.xz mirror://gentoo/texlive-module-fetchcls.doc-2019.tar.xz mirror://gentoo/texlive-module-ffslides.doc-2019.tar.xz mirror://gentoo/texlive-module-fgruler.doc-2019.tar.xz mirror://gentoo/texlive-module-fibeamer.doc-2019.tar.xz mirror://gentoo/texlive-module-fifo-stack.doc-2019.tar.xz mirror://gentoo/texlive-module-figsize.doc-2019.tar.xz mirror://gentoo/texlive-module-filecontents.doc-2019.tar.xz mirror://gentoo/texlive-module-filecontentsdef.doc-2019.tar.xz mirror://gentoo/texlive-module-filedate.doc-2019.tar.xz mirror://gentoo/texlive-module-fileinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-filemod.doc-2019.tar.xz mirror://gentoo/texlive-module-fink.doc-2019.tar.xz mirror://gentoo/texlive-module-finstrut.doc-2019.tar.xz mirror://gentoo/texlive-module-fithesis.doc-2019.tar.xz mirror://gentoo/texlive-module-fixcmex.doc-2019.tar.xz mirror://gentoo/texlive-module-fixfoot.doc-2019.tar.xz mirror://gentoo/texlive-module-fixme.doc-2019.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.doc-2019.tar.xz mirror://gentoo/texlive-module-fjodor.doc-2019.tar.xz mirror://gentoo/texlive-module-flabels.doc-2019.tar.xz mirror://gentoo/texlive-module-flacards.doc-2019.tar.xz mirror://gentoo/texlive-module-flagderiv.doc-2019.tar.xz mirror://gentoo/texlive-module-flashcards.doc-2019.tar.xz mirror://gentoo/texlive-module-flashmovie.doc-2019.tar.xz mirror://gentoo/texlive-module-flipbook.doc-2019.tar.xz mirror://gentoo/texlive-module-flippdf.doc-2019.tar.xz mirror://gentoo/texlive-module-floatflt.doc-2019.tar.xz mirror://gentoo/texlive-module-floatrow.doc-2019.tar.xz mirror://gentoo/texlive-module-flowfram.doc-2019.tar.xz mirror://gentoo/texlive-module-fmp.doc-2019.tar.xz mirror://gentoo/texlive-module-fmtcount.doc-2019.tar.xz mirror://gentoo/texlive-module-fn2end.doc-2019.tar.xz mirror://gentoo/texlive-module-fnbreak.doc-2019.tar.xz mirror://gentoo/texlive-module-fncychap.doc-2019.tar.xz mirror://gentoo/texlive-module-fncylab.doc-2019.tar.xz mirror://gentoo/texlive-module-fnpara.doc-2019.tar.xz mirror://gentoo/texlive-module-fnpct.doc-2019.tar.xz mirror://gentoo/texlive-module-fnumprint.doc-2019.tar.xz mirror://gentoo/texlive-module-foilhtml.doc-2019.tar.xz mirror://gentoo/texlive-module-fontaxes.doc-2019.tar.xz mirror://gentoo/texlive-module-fonttable.doc-2019.tar.xz mirror://gentoo/texlive-module-footmisc.doc-2019.tar.xz mirror://gentoo/texlive-module-footmisx.doc-2019.tar.xz mirror://gentoo/texlive-module-footnotebackref.doc-2019.tar.xz mirror://gentoo/texlive-module-footnoterange.doc-2019.tar.xz mirror://gentoo/texlive-module-footnpag.doc-2019.tar.xz mirror://gentoo/texlive-module-forarray.doc-2019.tar.xz mirror://gentoo/texlive-module-foreign.doc-2019.tar.xz mirror://gentoo/texlive-module-forloop.doc-2019.tar.xz mirror://gentoo/texlive-module-formlett.doc-2019.tar.xz mirror://gentoo/texlive-module-forms16be.doc-2019.tar.xz mirror://gentoo/texlive-module-formular.doc-2019.tar.xz mirror://gentoo/texlive-module-fragments.doc-2019.tar.xz mirror://gentoo/texlive-module-frame.doc-2019.tar.xz mirror://gentoo/texlive-module-framed.doc-2019.tar.xz mirror://gentoo/texlive-module-frankenstein.doc-2019.tar.xz mirror://gentoo/texlive-module-frege.doc-2019.tar.xz mirror://gentoo/texlive-module-ftcap.doc-2019.tar.xz mirror://gentoo/texlive-module-ftnxtra.doc-2019.tar.xz mirror://gentoo/texlive-module-fullblck.doc-2019.tar.xz mirror://gentoo/texlive-module-fullminipage.doc-2019.tar.xz mirror://gentoo/texlive-module-fullwidth.doc-2019.tar.xz mirror://gentoo/texlive-module-fundus-calligra.doc-2019.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.doc-2019.tar.xz mirror://gentoo/texlive-module-fvextra.doc-2019.tar.xz mirror://gentoo/texlive-module-fwlw.doc-2019.tar.xz mirror://gentoo/texlive-module-gatherenum.doc-2019.tar.xz mirror://gentoo/texlive-module-gauss.doc-2019.tar.xz mirror://gentoo/texlive-module-gcard.doc-2019.tar.xz mirror://gentoo/texlive-module-gcite.doc-2019.tar.xz mirror://gentoo/texlive-module-gender.doc-2019.tar.xz mirror://gentoo/texlive-module-genmpage.doc-2019.tar.xz mirror://gentoo/texlive-module-getfiledate.doc-2019.tar.xz mirror://gentoo/texlive-module-getitems.doc-2019.tar.xz mirror://gentoo/texlive-module-ginpenc.doc-2019.tar.xz mirror://gentoo/texlive-module-gitfile-info.doc-2019.tar.xz mirror://gentoo/texlive-module-gitinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-gitinfo2.doc-2019.tar.xz mirror://gentoo/texlive-module-gitlog.doc-2019.tar.xz mirror://gentoo/texlive-module-gitver.doc-2019.tar.xz mirror://gentoo/texlive-module-globalvals.doc-2019.tar.xz mirror://gentoo/texlive-module-gloss.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-danish.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-english.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-estonian.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-extra.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-finnish.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-french.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-german.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-irish.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-italian.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-polish.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-slovene.doc-2019.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.doc-2019.tar.xz mirror://gentoo/texlive-module-gmdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.doc-2019.tar.xz mirror://gentoo/texlive-module-gmiflink.doc-2019.tar.xz mirror://gentoo/texlive-module-gmutils.doc-2019.tar.xz mirror://gentoo/texlive-module-gmverb.doc-2019.tar.xz mirror://gentoo/texlive-module-grabbox.doc-2019.tar.xz mirror://gentoo/texlive-module-graphbox.doc-2019.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.doc-2019.tar.xz mirror://gentoo/texlive-module-graphicxbox.doc-2019.tar.xz mirror://gentoo/texlive-module-grayhints.doc-2019.tar.xz mirror://gentoo/texlive-module-grfpaste.doc-2019.tar.xz mirror://gentoo/texlive-module-grid.doc-2019.tar.xz mirror://gentoo/texlive-module-grid-system.doc-2019.tar.xz mirror://gentoo/texlive-module-gridset.doc-2019.tar.xz mirror://gentoo/texlive-module-gridslides.doc-2019.tar.xz mirror://gentoo/texlive-module-guitlogo.doc-2019.tar.xz mirror://gentoo/texlive-module-halloweenmath.doc-2019.tar.xz mirror://gentoo/texlive-module-hackthefootline.doc-2019.tar.xz mirror://gentoo/texlive-module-handin.doc-2019.tar.xz mirror://gentoo/texlive-module-handout.doc-2019.tar.xz mirror://gentoo/texlive-module-hang.doc-2019.tar.xz mirror://gentoo/texlive-module-hanging.doc-2019.tar.xz mirror://gentoo/texlive-module-hardwrap.doc-2019.tar.xz mirror://gentoo/texlive-module-harnon-cv.doc-2019.tar.xz mirror://gentoo/texlive-module-harpoon.doc-2019.tar.xz mirror://gentoo/texlive-module-hc.doc-2019.tar.xz mirror://gentoo/texlive-module-he-she.doc-2019.tar.xz mirror://gentoo/texlive-module-hhtensor.doc-2019.tar.xz mirror://gentoo/texlive-module-histogr.doc-2019.tar.xz mirror://gentoo/texlive-module-hitec.doc-2019.tar.xz mirror://gentoo/texlive-module-hletter.doc-2019.tar.xz mirror://gentoo/texlive-module-hpsdiss.doc-2019.tar.xz mirror://gentoo/texlive-module-hrefhide.doc-2019.tar.xz mirror://gentoo/texlive-module-hvindex.doc-2019.tar.xz mirror://gentoo/texlive-module-hypdvips.doc-2019.tar.xz mirror://gentoo/texlive-module-hyper.doc-2019.tar.xz mirror://gentoo/texlive-module-hyperbar.doc-2019.tar.xz mirror://gentoo/texlive-module-hypernat.doc-2019.tar.xz mirror://gentoo/texlive-module-hyperxmp.doc-2019.tar.xz mirror://gentoo/texlive-module-hyphenat.doc-2019.tar.xz mirror://gentoo/texlive-module-identkey.doc-2019.tar.xz mirror://gentoo/texlive-module-idxcmds.doc-2019.tar.xz mirror://gentoo/texlive-module-idxlayout.doc-2019.tar.xz mirror://gentoo/texlive-module-iffont.doc-2019.tar.xz mirror://gentoo/texlive-module-ifmslide.doc-2019.tar.xz mirror://gentoo/texlive-module-ifmtarg.doc-2019.tar.xz mirror://gentoo/texlive-module-ifnextok.doc-2019.tar.xz mirror://gentoo/texlive-module-ifoddpage.doc-2019.tar.xz mirror://gentoo/texlive-module-ifplatform.doc-2019.tar.xz mirror://gentoo/texlive-module-ifthenx.doc-2019.tar.xz mirror://gentoo/texlive-module-iitem.doc-2019.tar.xz mirror://gentoo/texlive-module-image-gallery.doc-2019.tar.xz mirror://gentoo/texlive-module-imakeidx.doc-2019.tar.xz mirror://gentoo/texlive-module-import.doc-2019.tar.xz mirror://gentoo/texlive-module-incgraph.doc-2019.tar.xz mirror://gentoo/texlive-module-indextools.doc-2019.tar.xz mirror://gentoo/texlive-module-inline-images.doc-2019.tar.xz mirror://gentoo/texlive-module-inlinedef.doc-2019.tar.xz mirror://gentoo/texlive-module-inputtrc.doc-2019.tar.xz mirror://gentoo/texlive-module-interactiveworkbook.doc-2019.tar.xz mirror://gentoo/texlive-module-interfaces.doc-2019.tar.xz mirror://gentoo/texlive-module-intopdf.doc-2019.tar.xz mirror://gentoo/texlive-module-inversepath.doc-2019.tar.xz mirror://gentoo/texlive-module-invoice.doc-2019.tar.xz mirror://gentoo/texlive-module-invoice-class.doc-2019.tar.xz mirror://gentoo/texlive-module-invoice2.doc-2019.tar.xz mirror://gentoo/texlive-module-iso.doc-2019.tar.xz mirror://gentoo/texlive-module-iso10303.doc-2019.tar.xz mirror://gentoo/texlive-module-isodate.doc-2019.tar.xz mirror://gentoo/texlive-module-isodoc.doc-2019.tar.xz mirror://gentoo/texlive-module-isonums.doc-2019.tar.xz mirror://gentoo/texlive-module-isopt.doc-2019.tar.xz mirror://gentoo/texlive-module-isorot.doc-2019.tar.xz mirror://gentoo/texlive-module-isotope.doc-2019.tar.xz mirror://gentoo/texlive-module-issuulinks.doc-2019.tar.xz mirror://gentoo/texlive-module-iwhdp.doc-2019.tar.xz mirror://gentoo/texlive-module-jlabels.doc-2019.tar.xz mirror://gentoo/texlive-module-jslectureplanner.doc-2019.tar.xz mirror://gentoo/texlive-module-jumplines.doc-2019.tar.xz mirror://gentoo/texlive-module-jvlisting.doc-2019.tar.xz mirror://gentoo/texlive-module-kalendarium.doc-2019.tar.xz mirror://gentoo/texlive-module-kantlipsum.doc-2019.tar.xz mirror://gentoo/texlive-module-kerntest.doc-2019.tar.xz mirror://gentoo/texlive-module-keycommand.doc-2019.tar.xz mirror://gentoo/texlive-module-keyfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-keyreader.doc-2019.tar.xz mirror://gentoo/texlive-module-keyindex.doc-2019.tar.xz mirror://gentoo/texlive-module-keystroke.doc-2019.tar.xz mirror://gentoo/texlive-module-keyval2e.doc-2019.tar.xz mirror://gentoo/texlive-module-keyvaltable.doc-2019.tar.xz mirror://gentoo/texlive-module-kix.doc-2019.tar.xz mirror://gentoo/texlive-module-knowledge.doc-2019.tar.xz mirror://gentoo/texlive-module-koma-moderncvclassic.doc-2019.tar.xz mirror://gentoo/texlive-module-koma-script-sfs.doc-2019.tar.xz mirror://gentoo/texlive-module-komacv.doc-2019.tar.xz mirror://gentoo/texlive-module-komacv-rg.doc-2019.tar.xz mirror://gentoo/texlive-module-ktv-texdata.doc-2019.tar.xz mirror://gentoo/texlive-module-l3build.doc-2019.tar.xz mirror://gentoo/texlive-module-labbook.doc-2019.tar.xz mirror://gentoo/texlive-module-labels.doc-2019.tar.xz mirror://gentoo/texlive-module-labels4easylist.doc-2019.tar.xz mirror://gentoo/texlive-module-labelschanged.doc-2019.tar.xz mirror://gentoo/texlive-module-lastpackage.doc-2019.tar.xz mirror://gentoo/texlive-module-lastpage.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-tds.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-uni8.doc-2019.tar.xz mirror://gentoo/texlive-module-latexcolors.doc-2019.tar.xz mirror://gentoo/texlive-module-latexdemo.doc-2019.tar.xz mirror://gentoo/texlive-module-latexgit.doc-2019.tar.xz mirror://gentoo/texlive-module-layouts.doc-2019.tar.xz mirror://gentoo/texlive-module-lazylist.doc-2019.tar.xz mirror://gentoo/texlive-module-lccaps.doc-2019.tar.xz mirror://gentoo/texlive-module-lcd.doc-2019.tar.xz mirror://gentoo/texlive-module-lcg.doc-2019.tar.xz mirror://gentoo/texlive-module-leading.doc-2019.tar.xz mirror://gentoo/texlive-module-lectures.doc-2019.tar.xz mirror://gentoo/texlive-module-leftidx.doc-2019.tar.xz mirror://gentoo/texlive-module-leipzig.doc-2019.tar.xz mirror://gentoo/texlive-module-lengthconvert.doc-2019.tar.xz mirror://gentoo/texlive-module-lettre.doc-2019.tar.xz mirror://gentoo/texlive-module-lettrine.doc-2019.tar.xz mirror://gentoo/texlive-module-lewis.doc-2019.tar.xz mirror://gentoo/texlive-module-lhelp.doc-2019.tar.xz mirror://gentoo/texlive-module-libgreek.doc-2019.tar.xz mirror://gentoo/texlive-module-limap.doc-2019.tar.xz mirror://gentoo/texlive-module-linegoal.doc-2019.tar.xz mirror://gentoo/texlive-module-linop.doc-2019.tar.xz mirror://gentoo/texlive-module-lipsum.doc-2019.tar.xz mirror://gentoo/texlive-module-lisp-on-tex.doc-2019.tar.xz mirror://gentoo/texlive-module-listing.doc-2019.tar.xz mirror://gentoo/texlive-module-listlbls.doc-2019.tar.xz mirror://gentoo/texlive-module-listliketab.doc-2019.tar.xz mirror://gentoo/texlive-module-listofsymbols.doc-2019.tar.xz mirror://gentoo/texlive-module-lkproof.doc-2019.tar.xz mirror://gentoo/texlive-module-lmake.doc-2019.tar.xz mirror://gentoo/texlive-module-locality.doc-2019.tar.xz mirror://gentoo/texlive-module-localloc.doc-2019.tar.xz mirror://gentoo/texlive-module-logbox.doc-2019.tar.xz mirror://gentoo/texlive-module-logical-markup-utils.doc-2019.tar.xz mirror://gentoo/texlive-module-logpap.doc-2019.tar.xz mirror://gentoo/texlive-module-longfbox.doc-2019.tar.xz mirror://gentoo/texlive-module-longfigure.doc-2019.tar.xz mirror://gentoo/texlive-module-longnamefilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-loops.doc-2019.tar.xz mirror://gentoo/texlive-module-lsc.doc-2019.tar.xz mirror://gentoo/texlive-module-lstaddons.doc-2019.tar.xz mirror://gentoo/texlive-module-lstfiracode.doc-2019.tar.xz mirror://gentoo/texlive-module-lt3graph.doc-2019.tar.xz mirror://gentoo/texlive-module-ltablex.doc-2019.tar.xz mirror://gentoo/texlive-module-ltabptch.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxdockit.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxguidex.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxindex.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxkeys.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxnew.doc-2019.tar.xz mirror://gentoo/texlive-module-ltxtools.doc-2019.tar.xz mirror://gentoo/texlive-module-lua-check-hyphen.doc-2019.tar.xz mirror://gentoo/texlive-module-luatodonotes.doc-2019.tar.xz mirror://gentoo/texlive-module-macroswap.doc-2019.tar.xz mirror://gentoo/texlive-module-magaz.doc-2019.tar.xz mirror://gentoo/texlive-module-makecookbook.doc-2019.tar.xz mirror://gentoo/texlive-module-mailing.doc-2019.tar.xz mirror://gentoo/texlive-module-mailmerge.doc-2019.tar.xz mirror://gentoo/texlive-module-makebarcode.doc-2019.tar.xz mirror://gentoo/texlive-module-makebase.doc-2019.tar.xz mirror://gentoo/texlive-module-makebox.doc-2019.tar.xz mirror://gentoo/texlive-module-makecell.doc-2019.tar.xz mirror://gentoo/texlive-module-makecirc.doc-2019.tar.xz mirror://gentoo/texlive-module-makecmds.doc-2019.tar.xz mirror://gentoo/texlive-module-makedtx.doc-2019.tar.xz mirror://gentoo/texlive-module-makeglos.doc-2019.tar.xz mirror://gentoo/texlive-module-mandi.doc-2019.tar.xz mirror://gentoo/texlive-module-manuscript.doc-2019.tar.xz mirror://gentoo/texlive-module-manyind.doc-2019.tar.xz mirror://gentoo/texlive-module-marginfit.doc-2019.tar.xz mirror://gentoo/texlive-module-marginfix.doc-2019.tar.xz mirror://gentoo/texlive-module-marginnote.doc-2019.tar.xz mirror://gentoo/texlive-module-markdown.doc-2019.tar.xz mirror://gentoo/texlive-module-mathalpha.doc-2019.tar.xz mirror://gentoo/texlive-module-mathastext.doc-2019.tar.xz mirror://gentoo/texlive-module-mathexam.doc-2019.tar.xz mirror://gentoo/texlive-module-mathfam256.doc-2019.tar.xz mirror://gentoo/texlive-module-mathfont.doc-2019.tar.xz mirror://gentoo/texlive-module-maybemath.doc-2019.tar.xz mirror://gentoo/texlive-module-mcaption.doc-2019.tar.xz mirror://gentoo/texlive-module-mceinleger.doc-2019.tar.xz mirror://gentoo/texlive-module-mcexam.doc-2019.tar.xz mirror://gentoo/texlive-module-mcite.doc-2019.tar.xz mirror://gentoo/texlive-module-mciteplus.doc-2019.tar.xz mirror://gentoo/texlive-module-mdframed.doc-2019.tar.xz mirror://gentoo/texlive-module-media9.doc-2019.tar.xz mirror://gentoo/texlive-module-medstarbeamer.doc-2019.tar.xz mirror://gentoo/texlive-module-meetingmins.doc-2019.tar.xz mirror://gentoo/texlive-module-memexsupp.doc-2019.tar.xz mirror://gentoo/texlive-module-memory.doc-2019.tar.xz mirror://gentoo/texlive-module-mensa-tex.doc-2019.tar.xz mirror://gentoo/texlive-module-menu.doc-2019.tar.xz mirror://gentoo/texlive-module-menukeys.doc-2019.tar.xz mirror://gentoo/texlive-module-metalogox.doc-2019.tar.xz mirror://gentoo/texlive-module-method.doc-2019.tar.xz mirror://gentoo/texlive-module-metre.doc-2019.tar.xz mirror://gentoo/texlive-module-mfirstuc.doc-2019.tar.xz mirror://gentoo/texlive-module-mftinc.doc-2019.tar.xz mirror://gentoo/texlive-module-mi-solns.doc-2019.tar.xz mirror://gentoo/texlive-module-midpage.doc-2019.tar.xz mirror://gentoo/texlive-module-minibox.doc-2019.tar.xz mirror://gentoo/texlive-module-minidocument.doc-2019.tar.xz mirror://gentoo/texlive-module-minifp.doc-2019.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.doc-2019.tar.xz mirror://gentoo/texlive-module-minitoc.doc-2019.tar.xz mirror://gentoo/texlive-module-minorrevision.doc-2019.tar.xz mirror://gentoo/texlive-module-minted.doc-2019.tar.xz mirror://gentoo/texlive-module-minutes.doc-2019.tar.xz mirror://gentoo/texlive-module-mla-paper.doc-2019.tar.xz mirror://gentoo/texlive-module-mlist.doc-2019.tar.xz mirror://gentoo/texlive-module-mmap.doc-2019.tar.xz mirror://gentoo/texlive-module-mnotes.doc-2019.tar.xz mirror://gentoo/texlive-module-moderncv.doc-2019.tar.xz mirror://gentoo/texlive-module-modernposter.doc-2019.tar.xz mirror://gentoo/texlive-module-moderntimeline.doc-2019.tar.xz mirror://gentoo/texlive-module-modref.doc-2019.tar.xz mirror://gentoo/texlive-module-modroman.doc-2019.tar.xz mirror://gentoo/texlive-module-modular.doc-2019.tar.xz mirror://gentoo/texlive-module-monofill.doc-2019.tar.xz mirror://gentoo/texlive-module-moodle.doc-2019.tar.xz mirror://gentoo/texlive-module-moreenum.doc-2019.tar.xz mirror://gentoo/texlive-module-morefloats.doc-2019.tar.xz mirror://gentoo/texlive-module-morehype.doc-2019.tar.xz mirror://gentoo/texlive-module-moresize.doc-2019.tar.xz mirror://gentoo/texlive-module-moreverb.doc-2019.tar.xz mirror://gentoo/texlive-module-morewrites.doc-2019.tar.xz mirror://gentoo/texlive-module-movie15.doc-2019.tar.xz mirror://gentoo/texlive-module-mparhack.doc-2019.tar.xz mirror://gentoo/texlive-module-mpostinl.doc-2019.tar.xz mirror://gentoo/texlive-module-msc.doc-2019.tar.xz mirror://gentoo/texlive-module-msg.doc-2019.tar.xz mirror://gentoo/texlive-module-mslapa.doc-2019.tar.xz mirror://gentoo/texlive-module-mtgreek.doc-2019.tar.xz mirror://gentoo/texlive-module-multenum.doc-2019.tar.xz mirror://gentoo/texlive-module-multiaudience.doc-2019.tar.xz mirror://gentoo/texlive-module-multibbl.doc-2019.tar.xz mirror://gentoo/texlive-module-multicap.doc-2019.tar.xz mirror://gentoo/texlive-module-multicolrule.doc-2019.tar.xz mirror://gentoo/texlive-module-multidef.doc-2019.tar.xz mirror://gentoo/texlive-module-multienv.doc-2019.tar.xz mirror://gentoo/texlive-module-multiexpand.doc-2019.tar.xz mirror://gentoo/texlive-module-multilang.doc-2019.tar.xz mirror://gentoo/texlive-module-multirow.doc-2019.tar.xz mirror://gentoo/texlive-module-mversion.doc-2019.tar.xz mirror://gentoo/texlive-module-mwe.doc-2019.tar.xz mirror://gentoo/texlive-module-mycv.doc-2019.tar.xz mirror://gentoo/texlive-module-mylatexformat.doc-2019.tar.xz mirror://gentoo/texlive-module-nag.doc-2019.tar.xz mirror://gentoo/texlive-module-nameauth.doc-2019.tar.xz mirror://gentoo/texlive-module-namespc.doc-2019.tar.xz mirror://gentoo/texlive-module-ncclatex.doc-2019.tar.xz mirror://gentoo/texlive-module-ncctools.doc-2019.tar.xz mirror://gentoo/texlive-module-needspace.doc-2019.tar.xz mirror://gentoo/texlive-module-newcommand.doc-2019.tar.xz mirror://gentoo/texlive-module-newenviron.doc-2019.tar.xz mirror://gentoo/texlive-module-newfile.doc-2019.tar.xz mirror://gentoo/texlive-module-newlfm.doc-2019.tar.xz mirror://gentoo/texlive-module-newspaper.doc-2019.tar.xz mirror://gentoo/texlive-module-newunicodechar.doc-2019.tar.xz mirror://gentoo/texlive-module-newvbtm.doc-2019.tar.xz mirror://gentoo/texlive-module-newverbs.doc-2019.tar.xz mirror://gentoo/texlive-module-nfssext-cfr.doc-2019.tar.xz mirror://gentoo/texlive-module-nicefilelist.doc-2019.tar.xz mirror://gentoo/texlive-module-niceframe.doc-2019.tar.xz mirror://gentoo/texlive-module-nicetext.doc-2019.tar.xz mirror://gentoo/texlive-module-nidanfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-nlctdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-noconflict.doc-2019.tar.xz mirror://gentoo/texlive-module-noindentafter.doc-2019.tar.xz mirror://gentoo/texlive-module-noitcrul.doc-2019.tar.xz mirror://gentoo/texlive-module-nolbreaks.doc-2019.tar.xz mirror://gentoo/texlive-module-nomencl.doc-2019.tar.xz mirror://gentoo/texlive-module-nomentbl.doc-2019.tar.xz mirror://gentoo/texlive-module-nonfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-nonumonpart.doc-2019.tar.xz mirror://gentoo/texlive-module-nopageno.doc-2019.tar.xz mirror://gentoo/texlive-module-normalcolor.doc-2019.tar.xz mirror://gentoo/texlive-module-notes.doc-2019.tar.xz mirror://gentoo/texlive-module-notespages.doc-2019.tar.xz mirror://gentoo/texlive-module-notestex.doc-2019.tar.xz mirror://gentoo/texlive-module-notoccite.doc-2019.tar.xz mirror://gentoo/texlive-module-nowidow.doc-2019.tar.xz mirror://gentoo/texlive-module-nox.doc-2019.tar.xz mirror://gentoo/texlive-module-ntheorem.doc-2019.tar.xz mirror://gentoo/texlive-module-numberedblock.doc-2019.tar.xz mirror://gentoo/texlive-module-numname.doc-2019.tar.xz mirror://gentoo/texlive-module-numprint.doc-2019.tar.xz mirror://gentoo/texlive-module-numspell.doc-2019.tar.xz mirror://gentoo/texlive-module-ocg-p.doc-2019.tar.xz mirror://gentoo/texlive-module-ocgx.doc-2019.tar.xz mirror://gentoo/texlive-module-ocgx2.doc-2019.tar.xz mirror://gentoo/texlive-module-ocr-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-octavo.doc-2019.tar.xz mirror://gentoo/texlive-module-oldstyle.doc-2019.tar.xz mirror://gentoo/texlive-module-onlyamsmath.doc-2019.tar.xz mirror://gentoo/texlive-module-opcit.doc-2019.tar.xz mirror://gentoo/texlive-module-optidef.doc-2019.tar.xz mirror://gentoo/texlive-module-optional.doc-2019.tar.xz mirror://gentoo/texlive-module-options.doc-2019.tar.xz mirror://gentoo/texlive-module-outline.doc-2019.tar.xz mirror://gentoo/texlive-module-outliner.doc-2019.tar.xz mirror://gentoo/texlive-module-outlines.doc-2019.tar.xz mirror://gentoo/texlive-module-outlining.doc-2019.tar.xz mirror://gentoo/texlive-module-overlays.doc-2019.tar.xz mirror://gentoo/texlive-module-overpic.doc-2019.tar.xz mirror://gentoo/texlive-module-padcount.doc-2019.tar.xz mirror://gentoo/texlive-module-pagecolor.doc-2019.tar.xz mirror://gentoo/texlive-module-pagecont.doc-2019.tar.xz mirror://gentoo/texlive-module-pagenote.doc-2019.tar.xz mirror://gentoo/texlive-module-pagerange.doc-2019.tar.xz mirror://gentoo/texlive-module-pageslts.doc-2019.tar.xz mirror://gentoo/texlive-module-paper.doc-2019.tar.xz mirror://gentoo/texlive-module-papercdcase.doc-2019.tar.xz mirror://gentoo/texlive-module-papermas.doc-2019.tar.xz mirror://gentoo/texlive-module-papertex.doc-2019.tar.xz mirror://gentoo/texlive-module-paracol.doc-2019.tar.xz mirror://gentoo/texlive-module-parades.doc-2019.tar.xz mirror://gentoo/texlive-module-paralist.doc-2019.tar.xz mirror://gentoo/texlive-module-paresse.doc-2019.tar.xz mirror://gentoo/texlive-module-parnotes.doc-2019.tar.xz mirror://gentoo/texlive-module-parselines.doc-2019.tar.xz mirror://gentoo/texlive-module-pas-cours.doc-2019.tar.xz mirror://gentoo/texlive-module-pas-cv.doc-2019.tar.xz mirror://gentoo/texlive-module-pas-tableur.doc-2019.tar.xz mirror://gentoo/texlive-module-patchcmd.doc-2019.tar.xz mirror://gentoo/texlive-module-pauldoc.doc-2019.tar.xz mirror://gentoo/texlive-module-pawpict.doc-2019.tar.xz mirror://gentoo/texlive-module-pbox.doc-2019.tar.xz mirror://gentoo/texlive-module-pbsheet.doc-2019.tar.xz mirror://gentoo/texlive-module-pdf14.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcomment.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfcprot.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfmarginpar.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfoverlay.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfpagediff.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfpc-movie.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfprivacy.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfreview.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfscreen.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfslide.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfsync.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfwin.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfx.doc-2019.tar.xz mirror://gentoo/texlive-module-pecha.doc-2019.tar.xz mirror://gentoo/texlive-module-perltex.doc-2019.tar.xz mirror://gentoo/texlive-module-permute.doc-2019.tar.xz mirror://gentoo/texlive-module-petiteannonce.doc-2019.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.doc-2019.tar.xz mirror://gentoo/texlive-module-phfnote.doc-2019.tar.xz mirror://gentoo/texlive-module-phfparen.doc-2019.tar.xz mirror://gentoo/texlive-module-phfqit.doc-2019.tar.xz mirror://gentoo/texlive-module-phfquotetext.doc-2019.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.doc-2019.tar.xz mirror://gentoo/texlive-module-phfthm.doc-2019.tar.xz mirror://gentoo/texlive-module-philex.doc-2019.tar.xz mirror://gentoo/texlive-module-phonenumbers.doc-2019.tar.xz mirror://gentoo/texlive-module-photo.doc-2019.tar.xz mirror://gentoo/texlive-module-piff.doc-2019.tar.xz mirror://gentoo/texlive-module-pkgloader.doc-2019.tar.xz mirror://gentoo/texlive-module-placeins.doc-2019.tar.xz mirror://gentoo/texlive-module-plantslabels.doc-2019.tar.xz mirror://gentoo/texlive-module-plates.doc-2019.tar.xz mirror://gentoo/texlive-module-plweb.doc-2019.tar.xz mirror://gentoo/texlive-module-polynom.doc-2019.tar.xz mirror://gentoo/texlive-module-polynomial.doc-2019.tar.xz mirror://gentoo/texlive-module-polytable.doc-2019.tar.xz mirror://gentoo/texlive-module-postcards.doc-2019.tar.xz mirror://gentoo/texlive-module-poster-mac.doc-2019.tar.xz mirror://gentoo/texlive-module-ppr-prv.doc-2019.tar.xz mirror://gentoo/texlive-module-preprint.doc-2019.tar.xz mirror://gentoo/texlive-module-pressrelease.doc-2019.tar.xz mirror://gentoo/texlive-module-prettyref.doc-2019.tar.xz mirror://gentoo/texlive-module-preview.doc-2019.tar.xz mirror://gentoo/texlive-module-printlen.doc-2019.tar.xz mirror://gentoo/texlive-module-probsoln.doc-2019.tar.xz mirror://gentoo/texlive-module-program.doc-2019.tar.xz mirror://gentoo/texlive-module-progress.doc-2019.tar.xz mirror://gentoo/texlive-module-progressbar.doc-2019.tar.xz mirror://gentoo/texlive-module-proofread.doc-2019.tar.xz mirror://gentoo/texlive-module-properties.doc-2019.tar.xz mirror://gentoo/texlive-module-prosper.doc-2019.tar.xz mirror://gentoo/texlive-module-protex.doc-2019.tar.xz mirror://gentoo/texlive-module-protocol.doc-2019.tar.xz mirror://gentoo/texlive-module-psfragx.doc-2019.tar.xz mirror://gentoo/texlive-module-pstool.doc-2019.tar.xz mirror://gentoo/texlive-module-pstring.doc-2019.tar.xz mirror://gentoo/texlive-module-pxgreeks.doc-2019.tar.xz mirror://gentoo/texlive-module-pygmentex.doc-2019.tar.xz mirror://gentoo/texlive-module-python.doc-2019.tar.xz mirror://gentoo/texlive-module-qcm.doc-2019.tar.xz mirror://gentoo/texlive-module-qstest.doc-2019.tar.xz mirror://gentoo/texlive-module-qsymbols.doc-2019.tar.xz mirror://gentoo/texlive-module-quicktype.doc-2019.tar.xz mirror://gentoo/texlive-module-quotchap.doc-2019.tar.xz mirror://gentoo/texlive-module-quoting.doc-2019.tar.xz mirror://gentoo/texlive-module-quotmark.doc-2019.tar.xz mirror://gentoo/texlive-module-ran_toks.doc-2019.tar.xz mirror://gentoo/texlive-module-randtext.doc-2019.tar.xz mirror://gentoo/texlive-module-rccol.doc-2019.tar.xz mirror://gentoo/texlive-module-rcs-multi.doc-2019.tar.xz mirror://gentoo/texlive-module-rcsinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-readarray.doc-2019.tar.xz mirror://gentoo/texlive-module-realboxes.doc-2019.tar.xz mirror://gentoo/texlive-module-recipe.doc-2019.tar.xz mirror://gentoo/texlive-module-recipebook.doc-2019.tar.xz mirror://gentoo/texlive-module-recipecard.doc-2019.tar.xz mirror://gentoo/texlive-module-rectopma.doc-2019.tar.xz mirror://gentoo/texlive-module-refcheck.doc-2019.tar.xz mirror://gentoo/texlive-module-refenums.doc-2019.tar.xz mirror://gentoo/texlive-module-reflectgraphics.doc-2019.tar.xz mirror://gentoo/texlive-module-refman.doc-2019.tar.xz mirror://gentoo/texlive-module-refstyle.doc-2019.tar.xz mirror://gentoo/texlive-module-regcount.doc-2019.tar.xz mirror://gentoo/texlive-module-regexpatch.doc-2019.tar.xz mirror://gentoo/texlive-module-register.doc-2019.tar.xz mirror://gentoo/texlive-module-regstats.doc-2019.tar.xz mirror://gentoo/texlive-module-relenc.doc-2019.tar.xz mirror://gentoo/texlive-module-relsize.doc-2019.tar.xz mirror://gentoo/texlive-module-repeatindex.doc-2019.tar.xz mirror://gentoo/texlive-module-repltext.doc-2019.tar.xz mirror://gentoo/texlive-module-returntogrid.doc-2019.tar.xz mirror://gentoo/texlive-module-rgltxdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-rjlparshap.doc-2019.tar.xz mirror://gentoo/texlive-module-rlepsf.doc-2019.tar.xz mirror://gentoo/texlive-module-rmpage.doc-2019.tar.xz mirror://gentoo/texlive-module-robustcommand.doc-2019.tar.xz mirror://gentoo/texlive-module-robustindex.doc-2019.tar.xz mirror://gentoo/texlive-module-romanbar.doc-2019.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.doc-2019.tar.xz mirror://gentoo/texlive-module-romanneg.doc-2019.tar.xz mirror://gentoo/texlive-module-romannum.doc-2019.tar.xz mirror://gentoo/texlive-module-rotfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-rotpages.doc-2019.tar.xz mirror://gentoo/texlive-module-roundbox.doc-2019.tar.xz mirror://gentoo/texlive-module-rterface.doc-2019.tar.xz mirror://gentoo/texlive-module-rtkinenc.doc-2019.tar.xz mirror://gentoo/texlive-module-rulerbox.doc-2019.tar.xz mirror://gentoo/texlive-module-rulercompass.doc-2019.tar.xz mirror://gentoo/texlive-module-rvwrite.doc-2019.tar.xz mirror://gentoo/texlive-module-sanitize-umlaut.doc-2019.tar.xz mirror://gentoo/texlive-module-sauerj.doc-2019.tar.xz mirror://gentoo/texlive-module-savefnmark.doc-2019.tar.xz mirror://gentoo/texlive-module-savetrees.doc-2019.tar.xz mirror://gentoo/texlive-module-scale.doc-2019.tar.xz mirror://gentoo/texlive-module-scalebar.doc-2019.tar.xz mirror://gentoo/texlive-module-scalerel.doc-2019.tar.xz mirror://gentoo/texlive-module-scanpages.doc-2019.tar.xz mirror://gentoo/texlive-module-scrlttr2copy.doc-2019.tar.xz mirror://gentoo/texlive-module-sdrt.doc-2019.tar.xz mirror://gentoo/texlive-module-secdot.doc-2019.tar.xz mirror://gentoo/texlive-module-sectionbox.doc-2019.tar.xz mirror://gentoo/texlive-module-sectionbreak.doc-2019.tar.xz mirror://gentoo/texlive-module-sectsty.doc-2019.tar.xz mirror://gentoo/texlive-module-seealso.doc-2019.tar.xz mirror://gentoo/texlive-module-selectp.doc-2019.tar.xz mirror://gentoo/texlive-module-semantic.doc-2019.tar.xz mirror://gentoo/texlive-module-semantic-markup.doc-2019.tar.xz mirror://gentoo/texlive-module-semioneside.doc-2019.tar.xz mirror://gentoo/texlive-module-semproc.doc-2019.tar.xz mirror://gentoo/texlive-module-sepfootnotes.doc-2019.tar.xz mirror://gentoo/texlive-module-seqsplit.doc-2019.tar.xz mirror://gentoo/texlive-module-sesstime.doc-2019.tar.xz mirror://gentoo/texlive-module-sf298.doc-2019.tar.xz mirror://gentoo/texlive-module-sffms.doc-2019.tar.xz mirror://gentoo/texlive-module-shadethm.doc-2019.tar.xz mirror://gentoo/texlive-module-shadow.doc-2019.tar.xz mirror://gentoo/texlive-module-shadowtext.doc-2019.tar.xz mirror://gentoo/texlive-module-shapepar.doc-2019.tar.xz mirror://gentoo/texlive-module-shdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-shipunov.doc-2019.tar.xz mirror://gentoo/texlive-module-shorttoc.doc-2019.tar.xz mirror://gentoo/texlive-module-show2e.doc-2019.tar.xz mirror://gentoo/texlive-module-showcharinbox.doc-2019.tar.xz mirror://gentoo/texlive-module-showdim.doc-2019.tar.xz mirror://gentoo/texlive-module-showexpl.doc-2019.tar.xz mirror://gentoo/texlive-module-showhyphens.doc-2019.tar.xz mirror://gentoo/texlive-module-showlabels.doc-2019.tar.xz mirror://gentoo/texlive-module-sidecap.doc-2019.tar.xz mirror://gentoo/texlive-module-sidenotes.doc-2019.tar.xz mirror://gentoo/texlive-module-silence.doc-2019.tar.xz mirror://gentoo/texlive-module-simplecd.doc-2019.tar.xz mirror://gentoo/texlive-module-simplecv.doc-2019.tar.xz mirror://gentoo/texlive-module-simpleinvoice.doc-2019.tar.xz mirror://gentoo/texlive-module-sitem.doc-2019.tar.xz mirror://gentoo/texlive-module-skb.doc-2019.tar.xz mirror://gentoo/texlive-module-skdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-skeycommand.doc-2019.tar.xz mirror://gentoo/texlive-module-skeyval.doc-2019.tar.xz mirror://gentoo/texlive-module-skrapport.doc-2019.tar.xz mirror://gentoo/texlive-module-slantsc.doc-2019.tar.xz mirror://gentoo/texlive-module-smalltableof.doc-2019.tar.xz mirror://gentoo/texlive-module-smartunits.doc-2019.tar.xz mirror://gentoo/texlive-module-smartref.doc-2019.tar.xz mirror://gentoo/texlive-module-snapshot.doc-2019.tar.xz mirror://gentoo/texlive-module-snotez.doc-2019.tar.xz mirror://gentoo/texlive-module-soul.doc-2019.tar.xz mirror://gentoo/texlive-module-spark-otf.doc-2019.tar.xz mirror://gentoo/texlive-module-sparklines.doc-2019.tar.xz mirror://gentoo/texlive-module-sphack.doc-2019.tar.xz mirror://gentoo/texlive-module-splitindex.doc-2019.tar.xz mirror://gentoo/texlive-module-spot.doc-2019.tar.xz mirror://gentoo/texlive-module-spotcolor.doc-2019.tar.xz mirror://gentoo/texlive-module-spreadtab.doc-2019.tar.xz mirror://gentoo/texlive-module-spverbatim.doc-2019.tar.xz mirror://gentoo/texlive-module-srbook-mem.doc-2019.tar.xz mirror://gentoo/texlive-module-srcltx.doc-2019.tar.xz mirror://gentoo/texlive-module-sseq.doc-2019.tar.xz mirror://gentoo/texlive-module-sslides.doc-2019.tar.xz mirror://gentoo/texlive-module-stackengine.doc-2019.tar.xz mirror://gentoo/texlive-module-standalone.doc-2019.tar.xz mirror://gentoo/texlive-module-stdclsdv.doc-2019.tar.xz mirror://gentoo/texlive-module-stealcaps.doc-2019.tar.xz mirror://gentoo/texlive-module-stdpage.doc-2019.tar.xz mirror://gentoo/texlive-module-stex.doc-2019.tar.xz mirror://gentoo/texlive-module-storebox.doc-2019.tar.xz mirror://gentoo/texlive-module-storecmd.doc-2019.tar.xz mirror://gentoo/texlive-module-stringstrings.doc-2019.tar.xz mirror://gentoo/texlive-module-sttools.doc-2019.tar.xz mirror://gentoo/texlive-module-stubs.doc-2019.tar.xz mirror://gentoo/texlive-module-studenthandouts.doc-2019.tar.xz mirror://gentoo/texlive-module-subdepth.doc-2019.tar.xz mirror://gentoo/texlive-module-subeqn.doc-2019.tar.xz mirror://gentoo/texlive-module-subeqnarray.doc-2019.tar.xz mirror://gentoo/texlive-module-subfigmat.doc-2019.tar.xz mirror://gentoo/texlive-module-subfigure.doc-2019.tar.xz mirror://gentoo/texlive-module-subfiles.doc-2019.tar.xz mirror://gentoo/texlive-module-subfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-substitutefont.doc-2019.tar.xz mirror://gentoo/texlive-module-substr.doc-2019.tar.xz mirror://gentoo/texlive-module-supertabular.doc-2019.tar.xz mirror://gentoo/texlive-module-svg.doc-2019.tar.xz mirror://gentoo/texlive-module-svgcolor.doc-2019.tar.xz mirror://gentoo/texlive-module-svn.doc-2019.tar.xz mirror://gentoo/texlive-module-svn-multi.doc-2019.tar.xz mirror://gentoo/texlive-module-svn-prov.doc-2019.tar.xz mirror://gentoo/texlive-module-syntax.doc-2019.tar.xz mirror://gentoo/texlive-module-syntrace.doc-2019.tar.xz mirror://gentoo/texlive-module-synttree.doc-2019.tar.xz mirror://gentoo/texlive-module-tabfigures.doc-2019.tar.xz mirror://gentoo/texlive-module-tableaux.doc-2019.tar.xz mirror://gentoo/texlive-module-tablefootnote.doc-2019.tar.xz mirror://gentoo/texlive-module-tableof.doc-2019.tar.xz mirror://gentoo/texlive-module-tablestyles.doc-2019.tar.xz mirror://gentoo/texlive-module-tablists.doc-2019.tar.xz mirror://gentoo/texlive-module-tabls.doc-2019.tar.xz mirror://gentoo/texlive-module-tablvar.doc-2019.tar.xz mirror://gentoo/texlive-module-tabstackengine.doc-2019.tar.xz mirror://gentoo/texlive-module-tabto-ltx.doc-2019.tar.xz mirror://gentoo/texlive-module-tabu.doc-2019.tar.xz mirror://gentoo/texlive-module-tabularborder.doc-2019.tar.xz mirror://gentoo/texlive-module-tabularcalc.doc-2019.tar.xz mirror://gentoo/texlive-module-tabularew.doc-2019.tar.xz mirror://gentoo/texlive-module-tabulary.doc-2019.tar.xz mirror://gentoo/texlive-module-tagging.doc-2019.tar.xz mirror://gentoo/texlive-module-tagpair.doc-2019.tar.xz mirror://gentoo/texlive-module-tagpdf.doc-2019.tar.xz mirror://gentoo/texlive-module-talk.doc-2019.tar.xz mirror://gentoo/texlive-module-tamefloats.doc-2019.tar.xz mirror://gentoo/texlive-module-tasks.doc-2019.tar.xz mirror://gentoo/texlive-module-tcldoc.doc-2019.tar.xz mirror://gentoo/texlive-module-tcolorbox.doc-2019.tar.xz mirror://gentoo/texlive-module-tdclock.doc-2019.tar.xz mirror://gentoo/texlive-module-technics.doc-2019.tar.xz mirror://gentoo/texlive-module-ted.doc-2019.tar.xz mirror://gentoo/texlive-module-templatetools.doc-2019.tar.xz mirror://gentoo/texlive-module-termcal.doc-2019.tar.xz mirror://gentoo/texlive-module-termlist.doc-2019.tar.xz mirror://gentoo/texlive-module-testhyphens.doc-2019.tar.xz mirror://gentoo/texlive-module-testidx.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-label.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-locale.doc-2019.tar.xz mirror://gentoo/texlive-module-texmate.doc-2019.tar.xz mirror://gentoo/texlive-module-texments.doc-2019.tar.xz mirror://gentoo/texlive-module-texpower.doc-2019.tar.xz mirror://gentoo/texlive-module-texshade.doc-2019.tar.xz mirror://gentoo/texlive-module-texvc.doc-2019.tar.xz mirror://gentoo/texlive-module-textfit.doc-2019.tar.xz mirror://gentoo/texlive-module-textmerg.doc-2019.tar.xz mirror://gentoo/texlive-module-textpos.doc-2019.tar.xz mirror://gentoo/texlive-module-textualicomma.doc-2019.tar.xz mirror://gentoo/texlive-module-theoremref.doc-2019.tar.xz mirror://gentoo/texlive-module-thinsp.doc-2019.tar.xz mirror://gentoo/texlive-module-thmtools.doc-2019.tar.xz mirror://gentoo/texlive-module-threadcol.doc-2019.tar.xz mirror://gentoo/texlive-module-threeparttable.doc-2019.tar.xz mirror://gentoo/texlive-module-threeparttablex.doc-2019.tar.xz mirror://gentoo/texlive-module-thumb.doc-2019.tar.xz mirror://gentoo/texlive-module-thumbs.doc-2019.tar.xz mirror://gentoo/texlive-module-thumby.doc-2019.tar.xz mirror://gentoo/texlive-module-ticket.doc-2019.tar.xz mirror://gentoo/texlive-module-titlecaps.doc-2019.tar.xz mirror://gentoo/texlive-module-titlepic.doc-2019.tar.xz mirror://gentoo/texlive-module-titleref.doc-2019.tar.xz mirror://gentoo/texlive-module-titlesec.doc-2019.tar.xz mirror://gentoo/texlive-module-titling.doc-2019.tar.xz mirror://gentoo/texlive-module-tocbibind.doc-2019.tar.xz mirror://gentoo/texlive-module-tocdata.doc-2019.tar.xz mirror://gentoo/texlive-module-tocloft.doc-2019.tar.xz mirror://gentoo/texlive-module-tocvsec2.doc-2019.tar.xz mirror://gentoo/texlive-module-todo.doc-2019.tar.xz mirror://gentoo/texlive-module-todonotes.doc-2019.tar.xz mirror://gentoo/texlive-module-tokenizer.doc-2019.tar.xz mirror://gentoo/texlive-module-toolbox.doc-2019.tar.xz mirror://gentoo/texlive-module-topfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-topiclongtable.doc-2019.tar.xz mirror://gentoo/texlive-module-totcount.doc-2019.tar.xz mirror://gentoo/texlive-module-totpages.doc-2019.tar.xz mirror://gentoo/texlive-module-translations.doc-2019.tar.xz mirror://gentoo/texlive-module-trfsigns.doc-2019.tar.xz mirror://gentoo/texlive-module-trimspaces.doc-2019.tar.xz mirror://gentoo/texlive-module-trivfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-trsym.doc-2019.tar.xz mirror://gentoo/texlive-module-truncate.doc-2019.tar.xz mirror://gentoo/texlive-module-tucv.doc-2019.tar.xz mirror://gentoo/texlive-module-turnthepage.doc-2019.tar.xz mirror://gentoo/texlive-module-twoinone.doc-2019.tar.xz mirror://gentoo/texlive-module-twoup.doc-2019.tar.xz mirror://gentoo/texlive-module-txgreeks.doc-2019.tar.xz mirror://gentoo/texlive-module-type1cm.doc-2019.tar.xz mirror://gentoo/texlive-module-typed-checklist.doc-2019.tar.xz mirror://gentoo/texlive-module-typeface.doc-2019.tar.xz mirror://gentoo/texlive-module-typoaid.doc-2019.tar.xz mirror://gentoo/texlive-module-typogrid.doc-2019.tar.xz mirror://gentoo/texlive-module-uassign.doc-2019.tar.xz mirror://gentoo/texlive-module-ucs.doc-2019.tar.xz mirror://gentoo/texlive-module-uebungsblatt.doc-2019.tar.xz mirror://gentoo/texlive-module-umoline.doc-2019.tar.xz mirror://gentoo/texlive-module-underlin.doc-2019.tar.xz mirror://gentoo/texlive-module-underoverlap.doc-2019.tar.xz mirror://gentoo/texlive-module-undolabl.doc-2019.tar.xz mirror://gentoo/texlive-module-units.doc-2019.tar.xz mirror://gentoo/texlive-module-unravel.doc-2019.tar.xz mirror://gentoo/texlive-module-upmethodology.doc-2019.tar.xz mirror://gentoo/texlive-module-upquote.doc-2019.tar.xz mirror://gentoo/texlive-module-uri.doc-2019.tar.xz mirror://gentoo/texlive-module-ushort.doc-2019.tar.xz mirror://gentoo/texlive-module-uspace.doc-2019.tar.xz mirror://gentoo/texlive-module-uwmslide.doc-2019.tar.xz mirror://gentoo/texlive-module-variablelm.doc-2019.tar.xz mirror://gentoo/texlive-module-varindex.doc-2019.tar.xz mirror://gentoo/texlive-module-varsfromjobname.doc-2019.tar.xz mirror://gentoo/texlive-module-varwidth.doc-2019.tar.xz mirror://gentoo/texlive-module-vdmlisting.doc-2019.tar.xz mirror://gentoo/texlive-module-verbasef.doc-2019.tar.xz mirror://gentoo/texlive-module-verbatimbox.doc-2019.tar.xz mirror://gentoo/texlive-module-verbatimcopy.doc-2019.tar.xz mirror://gentoo/texlive-module-verbdef.doc-2019.tar.xz mirror://gentoo/texlive-module-verbments.doc-2019.tar.xz mirror://gentoo/texlive-module-version.doc-2019.tar.xz mirror://gentoo/texlive-module-versions.doc-2019.tar.xz mirror://gentoo/texlive-module-versonotes.doc-2019.tar.xz mirror://gentoo/texlive-module-vertbars.doc-2019.tar.xz mirror://gentoo/texlive-module-vgrid.doc-2019.tar.xz mirror://gentoo/texlive-module-vhistory.doc-2019.tar.xz mirror://gentoo/texlive-module-vmargin.doc-2019.tar.xz mirror://gentoo/texlive-module-volumes.doc-2019.tar.xz mirror://gentoo/texlive-module-vpe.doc-2019.tar.xz mirror://gentoo/texlive-module-vruler.doc-2019.tar.xz mirror://gentoo/texlive-module-vtable.doc-2019.tar.xz mirror://gentoo/texlive-module-vwcol.doc-2019.tar.xz mirror://gentoo/texlive-module-wallcalendar.doc-2019.tar.xz mirror://gentoo/texlive-module-wallpaper.doc-2019.tar.xz mirror://gentoo/texlive-module-warning.doc-2019.tar.xz mirror://gentoo/texlive-module-warpcol.doc-2019.tar.xz mirror://gentoo/texlive-module-was.doc-2019.tar.xz mirror://gentoo/texlive-module-webquiz.doc-2019.tar.xz mirror://gentoo/texlive-module-widetable.doc-2019.tar.xz mirror://gentoo/texlive-module-widows-and-orphans.doc-2019.tar.xz mirror://gentoo/texlive-module-williams.doc-2019.tar.xz mirror://gentoo/texlive-module-withargs.doc-2019.tar.xz mirror://gentoo/texlive-module-wordcount.doc-2019.tar.xz mirror://gentoo/texlive-module-wordlike.doc-2019.tar.xz mirror://gentoo/texlive-module-worksheet.doc-2019.tar.xz mirror://gentoo/texlive-module-wrapfig.doc-2019.tar.xz mirror://gentoo/texlive-module-wtref.doc-2019.tar.xz mirror://gentoo/texlive-module-xargs.doc-2019.tar.xz mirror://gentoo/texlive-module-xassoccnt.doc-2019.tar.xz mirror://gentoo/texlive-module-xbmks.doc-2019.tar.xz mirror://gentoo/texlive-module-xcntperchap.doc-2019.tar.xz mirror://gentoo/texlive-module-xcolor-material.doc-2019.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.doc-2019.tar.xz mirror://gentoo/texlive-module-xcomment.doc-2019.tar.xz mirror://gentoo/texlive-module-xcookybooky.doc-2019.tar.xz mirror://gentoo/texlive-module-xcpdftips.doc-2019.tar.xz mirror://gentoo/texlive-module-xdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-xellipsis.doc-2019.tar.xz mirror://gentoo/texlive-module-xfakebold.doc-2019.tar.xz mirror://gentoo/texlive-module-xfor.doc-2019.tar.xz mirror://gentoo/texlive-module-xhfill.doc-2019.tar.xz mirror://gentoo/texlive-module-xifthen.doc-2019.tar.xz mirror://gentoo/texlive-module-xint.doc-2019.tar.xz mirror://gentoo/texlive-module-xltabular.doc-2019.tar.xz mirror://gentoo/texlive-module-xmpincl.doc-2019.tar.xz mirror://gentoo/texlive-module-xnewcommand.doc-2019.tar.xz mirror://gentoo/texlive-module-xoptarg.doc-2019.tar.xz mirror://gentoo/texlive-module-xpatch.doc-2019.tar.xz mirror://gentoo/texlive-module-xpeek.doc-2019.tar.xz mirror://gentoo/texlive-module-xprintlen.doc-2019.tar.xz mirror://gentoo/texlive-module-xpunctuate.doc-2019.tar.xz mirror://gentoo/texlive-module-xsavebox.doc-2019.tar.xz mirror://gentoo/texlive-module-xsim.doc-2019.tar.xz mirror://gentoo/texlive-module-xstring.doc-2019.tar.xz mirror://gentoo/texlive-module-xtab.doc-2019.tar.xz mirror://gentoo/texlive-module-xurl.doc-2019.tar.xz mirror://gentoo/texlive-module-xwatermark.doc-2019.tar.xz mirror://gentoo/texlive-module-xytree.doc-2019.tar.xz mirror://gentoo/texlive-module-yafoot.doc-2019.tar.xz mirror://gentoo/texlive-module-yaletter.doc-2019.tar.xz mirror://gentoo/texlive-module-yagusylo.doc-2019.tar.xz mirror://gentoo/texlive-module-ycbook.doc-2019.tar.xz mirror://gentoo/texlive-module-ydoc.doc-2019.tar.xz mirror://gentoo/texlive-module-yplan.doc-2019.tar.xz mirror://gentoo/texlive-module-zebra-goodies.doc-2019.tar.xz mirror://gentoo/texlive-module-zed-csp.doc-2019.tar.xz mirror://gentoo/texlive-module-ziffer.doc-2019.tar.xz mirror://gentoo/texlive-module-zwgetfdate.doc-2019.tar.xz mirror://gentoo/texlive-module-zwpagelayout.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-ESIEEcv.source-2019.tar.xz mirror://gentoo/texlive-module-GS1.source-2019.tar.xz mirror://gentoo/texlive-module-HA-prosper.source-2019.tar.xz mirror://gentoo/texlive-module-Tabbing.source-2019.tar.xz mirror://gentoo/texlive-module-abstract.source-2019.tar.xz mirror://gentoo/texlive-module-achemso.source-2019.tar.xz mirror://gentoo/texlive-module-acronym.source-2019.tar.xz mirror://gentoo/texlive-module-acroterm.source-2019.tar.xz mirror://gentoo/texlive-module-actuarialangle.source-2019.tar.xz mirror://gentoo/texlive-module-actuarialsymbol.source-2019.tar.xz mirror://gentoo/texlive-module-addlines.source-2019.tar.xz mirror://gentoo/texlive-module-adjmulticol.source-2019.tar.xz mirror://gentoo/texlive-module-adjustbox.source-2019.tar.xz mirror://gentoo/texlive-module-adrconv.source-2019.tar.xz mirror://gentoo/texlive-module-alertmessage.source-2019.tar.xz mirror://gentoo/texlive-module-alnumsec.source-2019.tar.xz mirror://gentoo/texlive-module-altfont.source-2019.tar.xz mirror://gentoo/texlive-module-amsaddr.source-2019.tar.xz mirror://gentoo/texlive-module-animate.source-2019.tar.xz mirror://gentoo/texlive-module-answers.source-2019.tar.xz mirror://gentoo/texlive-module-appendix.source-2019.tar.xz mirror://gentoo/texlive-module-apptools.source-2019.tar.xz mirror://gentoo/texlive-module-arcs.source-2019.tar.xz mirror://gentoo/texlive-module-arraysort.source-2019.tar.xz mirror://gentoo/texlive-module-arydshln.source-2019.tar.xz mirror://gentoo/texlive-module-asciilist.source-2019.tar.xz mirror://gentoo/texlive-module-attachfile.source-2019.tar.xz mirror://gentoo/texlive-module-autonum.source-2019.tar.xz mirror://gentoo/texlive-module-autopdf.source-2019.tar.xz mirror://gentoo/texlive-module-avremu.source-2019.tar.xz mirror://gentoo/texlive-module-background.source-2019.tar.xz mirror://gentoo/texlive-module-basicarith.source-2019.tar.xz mirror://gentoo/texlive-module-beamercolorthemeowl.source-2019.tar.xz mirror://gentoo/texlive-module-beamersubframe.source-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-cuerna.source-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-metropolis.source-2019.tar.xz mirror://gentoo/texlive-module-beamertheme-saintpetersburg.source-2019.tar.xz mirror://gentoo/texlive-module-beton.source-2019.tar.xz mirror://gentoo/texlive-module-bewerbung.source-2019.tar.xz mirror://gentoo/texlive-module-bez123.source-2019.tar.xz mirror://gentoo/texlive-module-bhcexam.source-2019.tar.xz mirror://gentoo/texlive-module-bigfoot.source-2019.tar.xz mirror://gentoo/texlive-module-bizcard.source-2019.tar.xz mirror://gentoo/texlive-module-blindtext.source-2019.tar.xz mirror://gentoo/texlive-module-blowup.source-2019.tar.xz mirror://gentoo/texlive-module-bnumexpr.source-2019.tar.xz mirror://gentoo/texlive-module-boites.source-2019.tar.xz mirror://gentoo/texlive-module-bookcover.source-2019.tar.xz mirror://gentoo/texlive-module-booklet.source-2019.tar.xz mirror://gentoo/texlive-module-boolexpr.source-2019.tar.xz mirror://gentoo/texlive-module-bophook.source-2019.tar.xz mirror://gentoo/texlive-module-boxedminipage2e.source-2019.tar.xz mirror://gentoo/texlive-module-boxhandler.source-2019.tar.xz mirror://gentoo/texlive-module-breakurl.source-2019.tar.xz mirror://gentoo/texlive-module-bullcntr.source-2019.tar.xz mirror://gentoo/texlive-module-calcage.source-2019.tar.xz mirror://gentoo/texlive-module-calculator.source-2019.tar.xz mirror://gentoo/texlive-module-cals.source-2019.tar.xz mirror://gentoo/texlive-module-canoniclayout.source-2019.tar.xz mirror://gentoo/texlive-module-capt-of.source-2019.tar.xz mirror://gentoo/texlive-module-captcont.source-2019.tar.xz mirror://gentoo/texlive-module-catchfilebetweentags.source-2019.tar.xz mirror://gentoo/texlive-module-catechis.source-2019.tar.xz mirror://gentoo/texlive-module-ccaption.source-2019.tar.xz mirror://gentoo/texlive-module-cclicenses.source-2019.tar.xz mirror://gentoo/texlive-module-cd.source-2019.tar.xz mirror://gentoo/texlive-module-cd-cover.source-2019.tar.xz mirror://gentoo/texlive-module-cdpbundl.source-2019.tar.xz mirror://gentoo/texlive-module-cellprops.source-2019.tar.xz mirror://gentoo/texlive-module-changebar.source-2019.tar.xz mirror://gentoo/texlive-module-changepage.source-2019.tar.xz mirror://gentoo/texlive-module-changes.source-2019.tar.xz mirror://gentoo/texlive-module-chappg.source-2019.tar.xz mirror://gentoo/texlive-module-chapterfolder.source-2019.tar.xz mirror://gentoo/texlive-module-cheatsheet.source-2019.tar.xz mirror://gentoo/texlive-module-chextras.source-2019.tar.xz mirror://gentoo/texlive-module-childdoc.source-2019.tar.xz mirror://gentoo/texlive-module-chletter.source-2019.tar.xz mirror://gentoo/texlive-module-circ.source-2019.tar.xz mirror://gentoo/texlive-module-classpack.source-2019.tar.xz mirror://gentoo/texlive-module-clefval.source-2019.tar.xz mirror://gentoo/texlive-module-cleveref.source-2019.tar.xz mirror://gentoo/texlive-module-cloze.source-2019.tar.xz mirror://gentoo/texlive-module-clrdblpg.source-2019.tar.xz mirror://gentoo/texlive-module-clrstrip.source-2019.tar.xz mirror://gentoo/texlive-module-cmdtrack.source-2019.tar.xz mirror://gentoo/texlive-module-codepage.source-2019.tar.xz mirror://gentoo/texlive-module-codesection.source-2019.tar.xz mirror://gentoo/texlive-module-collcell.source-2019.tar.xz mirror://gentoo/texlive-module-collectbox.source-2019.tar.xz mirror://gentoo/texlive-module-colophon.source-2019.tar.xz mirror://gentoo/texlive-module-colordoc.source-2019.tar.xz mirror://gentoo/texlive-module-colorwav.source-2019.tar.xz mirror://gentoo/texlive-module-colorweb.source-2019.tar.xz mirror://gentoo/texlive-module-combine.source-2019.tar.xz mirror://gentoo/texlive-module-commado.source-2019.tar.xz mirror://gentoo/texlive-module-commedit.source-2019.tar.xz mirror://gentoo/texlive-module-competences.source-2019.tar.xz mirror://gentoo/texlive-module-constants.source-2019.tar.xz mirror://gentoo/texlive-module-continue.source-2019.tar.xz mirror://gentoo/texlive-module-contour.source-2019.tar.xz mirror://gentoo/texlive-module-contracard.source-2019.tar.xz mirror://gentoo/texlive-module-conv-xkv.source-2019.tar.xz mirror://gentoo/texlive-module-cooking.source-2019.tar.xz mirror://gentoo/texlive-module-cooking-units.source-2019.tar.xz mirror://gentoo/texlive-module-cool.source-2019.tar.xz mirror://gentoo/texlive-module-coollist.source-2019.tar.xz mirror://gentoo/texlive-module-coolstr.source-2019.tar.xz mirror://gentoo/texlive-module-coolthms.source-2019.tar.xz mirror://gentoo/texlive-module-cooltooltips.source-2019.tar.xz mirror://gentoo/texlive-module-coordsys.source-2019.tar.xz mirror://gentoo/texlive-module-copyedit.source-2019.tar.xz mirror://gentoo/texlive-module-counttexruns.source-2019.tar.xz mirror://gentoo/texlive-module-coverpage.source-2019.tar.xz mirror://gentoo/texlive-module-cprotect.source-2019.tar.xz mirror://gentoo/texlive-module-crossreference.source-2019.tar.xz mirror://gentoo/texlive-module-cuisine.source-2019.tar.xz mirror://gentoo/texlive-module-currency.source-2019.tar.xz mirror://gentoo/texlive-module-currfile.source-2019.tar.xz mirror://gentoo/texlive-module-cutwin.source-2019.tar.xz mirror://gentoo/texlive-module-cyber.source-2019.tar.xz mirror://gentoo/texlive-module-cybercic.source-2019.tar.xz mirror://gentoo/texlive-module-dashbox.source-2019.tar.xz mirror://gentoo/texlive-module-dashrule.source-2019.tar.xz mirror://gentoo/texlive-module-dashundergaps.source-2019.tar.xz mirror://gentoo/texlive-module-datatool.source-2019.tar.xz mirror://gentoo/texlive-module-dateiliste.source-2019.tar.xz mirror://gentoo/texlive-module-datenumber.source-2019.tar.xz mirror://gentoo/texlive-module-datetime.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-bahasai.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-basque.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-breton.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-bulgarian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-catalan.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-croatian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-czech.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-danish.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-dutch.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-en-fulltext.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-english.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-esperanto.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-estonian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-finnish.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-french.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-galician.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-german.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-greek.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-hebrew.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-icelandic.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-irish.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-italian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-it-fulltext.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-latin.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-lsorbian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-magyar.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-norsk.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-polish.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-portuges.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-romanian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-russian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-samin.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-scottish.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-serbian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-slovak.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-slovene.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-spanish.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-swedish.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-turkish.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-ukrainian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-usorbian.source-2019.tar.xz mirror://gentoo/texlive-module-datetime2-welsh.source-2019.tar.xz mirror://gentoo/texlive-module-decimal.source-2019.tar.xz mirror://gentoo/texlive-module-decorule.source-2019.tar.xz mirror://gentoo/texlive-module-delimtxt.source-2019.tar.xz mirror://gentoo/texlive-module-denisbdoc.source-2019.tar.xz mirror://gentoo/texlive-module-diagbox.source-2019.tar.xz mirror://gentoo/texlive-module-dialogl.source-2019.tar.xz mirror://gentoo/texlive-module-dinbrief.source-2019.tar.xz mirror://gentoo/texlive-module-dirtytalk.source-2019.tar.xz mirror://gentoo/texlive-module-dnaseq.source-2019.tar.xz mirror://gentoo/texlive-module-doclicense.source-2019.tar.xz mirror://gentoo/texlive-module-docmfp.source-2019.tar.xz mirror://gentoo/texlive-module-docmute.source-2019.tar.xz mirror://gentoo/texlive-module-doctools.source-2019.tar.xz mirror://gentoo/texlive-module-documentation.source-2019.tar.xz mirror://gentoo/texlive-module-dotarrow.source-2019.tar.xz mirror://gentoo/texlive-module-dotseqn.source-2019.tar.xz mirror://gentoo/texlive-module-download.source-2019.tar.xz mirror://gentoo/texlive-module-dox.source-2019.tar.xz mirror://gentoo/texlive-module-dprogress.source-2019.tar.xz mirror://gentoo/texlive-module-drac.source-2019.tar.xz mirror://gentoo/texlive-module-draftcopy.source-2019.tar.xz mirror://gentoo/texlive-module-draftwatermark.source-2019.tar.xz mirror://gentoo/texlive-module-dtxdescribe.source-2019.tar.xz mirror://gentoo/texlive-module-duckuments.source-2019.tar.xz mirror://gentoo/texlive-module-ducksay.source-2019.tar.xz mirror://gentoo/texlive-module-dynamicnumber.source-2019.tar.xz mirror://gentoo/texlive-module-easyfig.source-2019.tar.xz mirror://gentoo/texlive-module-easyreview.source-2019.tar.xz mirror://gentoo/texlive-module-ebezier.source-2019.tar.xz mirror://gentoo/texlive-module-ecclesiastic.source-2019.tar.xz mirror://gentoo/texlive-module-ecv.source-2019.tar.xz mirror://gentoo/texlive-module-ed.source-2019.tar.xz mirror://gentoo/texlive-module-edmargin.source-2019.tar.xz mirror://gentoo/texlive-module-eemeir.source-2019.tar.xz mirror://gentoo/texlive-module-efbox.source-2019.tar.xz mirror://gentoo/texlive-module-egplot.source-2019.tar.xz mirror://gentoo/texlive-module-ellipsis.source-2019.tar.xz mirror://gentoo/texlive-module-elmath.source-2019.tar.xz mirror://gentoo/texlive-module-elocalloc.source-2019.tar.xz mirror://gentoo/texlive-module-elzcards.source-2019.tar.xz mirror://gentoo/texlive-module-emarks.source-2019.tar.xz mirror://gentoo/texlive-module-embedall.source-2019.tar.xz mirror://gentoo/texlive-module-emptypage.source-2019.tar.xz mirror://gentoo/texlive-module-endfloat.source-2019.tar.xz mirror://gentoo/texlive-module-endheads.source-2019.tar.xz mirror://gentoo/texlive-module-engpron.source-2019.tar.xz mirror://gentoo/texlive-module-engrec.source-2019.tar.xz mirror://gentoo/texlive-module-enumitem-zref.source-2019.tar.xz mirror://gentoo/texlive-module-environ.source-2019.tar.xz mirror://gentoo/texlive-module-epigraph.source-2019.tar.xz mirror://gentoo/texlive-module-epiolmec.source-2019.tar.xz mirror://gentoo/texlive-module-eqlist.source-2019.tar.xz mirror://gentoo/texlive-module-eqnalign.source-2019.tar.xz mirror://gentoo/texlive-module-eqparbox.source-2019.tar.xz mirror://gentoo/texlive-module-errata.source-2019.tar.xz mirror://gentoo/texlive-module-erw-l3.source-2019.tar.xz mirror://gentoo/texlive-module-esdiff.source-2019.tar.xz mirror://gentoo/texlive-module-esint.source-2019.tar.xz mirror://gentoo/texlive-module-etaremune.source-2019.tar.xz mirror://gentoo/texlive-module-etextools.source-2019.tar.xz mirror://gentoo/texlive-module-etoc.source-2019.tar.xz mirror://gentoo/texlive-module-eukdate.source-2019.tar.xz mirror://gentoo/texlive-module-everyhook.source-2019.tar.xz mirror://gentoo/texlive-module-everypage.source-2019.tar.xz mirror://gentoo/texlive-module-exam-n.source-2019.tar.xz mirror://gentoo/texlive-module-examdesign.source-2019.tar.xz mirror://gentoo/texlive-module-exframe.source-2019.tar.xz mirror://gentoo/texlive-module-exercise.source-2019.tar.xz mirror://gentoo/texlive-module-exercises.source-2019.tar.xz mirror://gentoo/texlive-module-exp-testopt.source-2019.tar.xz mirror://gentoo/texlive-module-expdlist.source-2019.tar.xz mirror://gentoo/texlive-module-export.source-2019.tar.xz mirror://gentoo/texlive-module-exsol.source-2019.tar.xz mirror://gentoo/texlive-module-extract.source-2019.tar.xz mirror://gentoo/texlive-module-facsimile.source-2019.tar.xz mirror://gentoo/texlive-module-factura.source-2019.tar.xz mirror://gentoo/texlive-module-fancylabel.source-2019.tar.xz mirror://gentoo/texlive-module-fancynum.source-2019.tar.xz mirror://gentoo/texlive-module-fancypar.source-2019.tar.xz mirror://gentoo/texlive-module-fancytabs.source-2019.tar.xz mirror://gentoo/texlive-module-fancytooltips.source-2019.tar.xz mirror://gentoo/texlive-module-fcolumn.source-2019.tar.xz mirror://gentoo/texlive-module-fetchcls.source-2019.tar.xz mirror://gentoo/texlive-module-fgruler.source-2019.tar.xz mirror://gentoo/texlive-module-fibeamer.source-2019.tar.xz mirror://gentoo/texlive-module-fifo-stack.source-2019.tar.xz mirror://gentoo/texlive-module-filecontents.source-2019.tar.xz mirror://gentoo/texlive-module-filecontentsdef.source-2019.tar.xz mirror://gentoo/texlive-module-filedate.source-2019.tar.xz mirror://gentoo/texlive-module-fileinfo.source-2019.tar.xz mirror://gentoo/texlive-module-fink.source-2019.tar.xz mirror://gentoo/texlive-module-finstrut.source-2019.tar.xz mirror://gentoo/texlive-module-fithesis.source-2019.tar.xz mirror://gentoo/texlive-module-fixcmex.source-2019.tar.xz mirror://gentoo/texlive-module-fixme.source-2019.tar.xz mirror://gentoo/texlive-module-fixmetodonotes.source-2019.tar.xz mirror://gentoo/texlive-module-flabels.source-2019.tar.xz mirror://gentoo/texlive-module-flagderiv.source-2019.tar.xz mirror://gentoo/texlive-module-flashcards.source-2019.tar.xz mirror://gentoo/texlive-module-flippdf.source-2019.tar.xz mirror://gentoo/texlive-module-floatflt.source-2019.tar.xz mirror://gentoo/texlive-module-floatrow.source-2019.tar.xz mirror://gentoo/texlive-module-flowfram.source-2019.tar.xz mirror://gentoo/texlive-module-fmp.source-2019.tar.xz mirror://gentoo/texlive-module-fmtcount.source-2019.tar.xz mirror://gentoo/texlive-module-fnbreak.source-2019.tar.xz mirror://gentoo/texlive-module-fnumprint.source-2019.tar.xz mirror://gentoo/texlive-module-foilhtml.source-2019.tar.xz mirror://gentoo/texlive-module-fontaxes.source-2019.tar.xz mirror://gentoo/texlive-module-fonttable.source-2019.tar.xz mirror://gentoo/texlive-module-footmisc.source-2019.tar.xz mirror://gentoo/texlive-module-footmisx.source-2019.tar.xz mirror://gentoo/texlive-module-footnoterange.source-2019.tar.xz mirror://gentoo/texlive-module-footnpag.source-2019.tar.xz mirror://gentoo/texlive-module-forarray.source-2019.tar.xz mirror://gentoo/texlive-module-foreign.source-2019.tar.xz mirror://gentoo/texlive-module-forloop.source-2019.tar.xz mirror://gentoo/texlive-module-forms16be.source-2019.tar.xz mirror://gentoo/texlive-module-formular.source-2019.tar.xz mirror://gentoo/texlive-module-frankenstein.source-2019.tar.xz mirror://gentoo/texlive-module-ftnxtra.source-2019.tar.xz mirror://gentoo/texlive-module-fullblck.source-2019.tar.xz mirror://gentoo/texlive-module-fullminipage.source-2019.tar.xz mirror://gentoo/texlive-module-fundus-calligra.source-2019.tar.xz mirror://gentoo/texlive-module-fundus-sueterlin.source-2019.tar.xz mirror://gentoo/texlive-module-fvextra.source-2019.tar.xz mirror://gentoo/texlive-module-gatherenum.source-2019.tar.xz mirror://gentoo/texlive-module-gcite.source-2019.tar.xz mirror://gentoo/texlive-module-gender.source-2019.tar.xz mirror://gentoo/texlive-module-genmpage.source-2019.tar.xz mirror://gentoo/texlive-module-getitems.source-2019.tar.xz mirror://gentoo/texlive-module-ginpenc.source-2019.tar.xz mirror://gentoo/texlive-module-gitfile-info.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-danish.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-dutch.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-english.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-estonian.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-extra.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-finnish.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-french.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-german.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-irish.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-italian.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-magyar.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-polish.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-portuges.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-serbian.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-slovene.source-2019.tar.xz mirror://gentoo/texlive-module-glossaries-spanish.source-2019.tar.xz mirror://gentoo/texlive-module-gmdoc-enhance.source-2019.tar.xz mirror://gentoo/texlive-module-grabbox.source-2019.tar.xz mirror://gentoo/texlive-module-graphbox.source-2019.tar.xz mirror://gentoo/texlive-module-graphicx-psmin.source-2019.tar.xz mirror://gentoo/texlive-module-graphicxbox.source-2019.tar.xz mirror://gentoo/texlive-module-grayhints.source-2019.tar.xz mirror://gentoo/texlive-module-grid.source-2019.tar.xz mirror://gentoo/texlive-module-gridset.source-2019.tar.xz mirror://gentoo/texlive-module-guitlogo.source-2019.tar.xz mirror://gentoo/texlive-module-halloweenmath.source-2019.tar.xz mirror://gentoo/texlive-module-hanging.source-2019.tar.xz mirror://gentoo/texlive-module-hardwrap.source-2019.tar.xz mirror://gentoo/texlive-module-hc.source-2019.tar.xz mirror://gentoo/texlive-module-hhtensor.source-2019.tar.xz mirror://gentoo/texlive-module-histogr.source-2019.tar.xz mirror://gentoo/texlive-module-hpsdiss.source-2019.tar.xz mirror://gentoo/texlive-module-hrefhide.source-2019.tar.xz mirror://gentoo/texlive-module-hyper.source-2019.tar.xz mirror://gentoo/texlive-module-hyperbar.source-2019.tar.xz mirror://gentoo/texlive-module-hyperxmp.source-2019.tar.xz mirror://gentoo/texlive-module-hyphenat.source-2019.tar.xz mirror://gentoo/texlive-module-idxlayout.source-2019.tar.xz mirror://gentoo/texlive-module-iffont.source-2019.tar.xz mirror://gentoo/texlive-module-ifmtarg.source-2019.tar.xz mirror://gentoo/texlive-module-ifnextok.source-2019.tar.xz mirror://gentoo/texlive-module-ifoddpage.source-2019.tar.xz mirror://gentoo/texlive-module-ifplatform.source-2019.tar.xz mirror://gentoo/texlive-module-iitem.source-2019.tar.xz mirror://gentoo/texlive-module-imakeidx.source-2019.tar.xz mirror://gentoo/texlive-module-indextools.source-2019.tar.xz mirror://gentoo/texlive-module-inlinedef.source-2019.tar.xz mirror://gentoo/texlive-module-inputtrc.source-2019.tar.xz mirror://gentoo/texlive-module-interfaces.source-2019.tar.xz mirror://gentoo/texlive-module-intopdf.source-2019.tar.xz mirror://gentoo/texlive-module-inversepath.source-2019.tar.xz mirror://gentoo/texlive-module-invoice2.source-2019.tar.xz mirror://gentoo/texlive-module-iso.source-2019.tar.xz mirror://gentoo/texlive-module-iso10303.source-2019.tar.xz mirror://gentoo/texlive-module-isodate.source-2019.tar.xz mirror://gentoo/texlive-module-isodoc.source-2019.tar.xz mirror://gentoo/texlive-module-isorot.source-2019.tar.xz mirror://gentoo/texlive-module-isotope.source-2019.tar.xz mirror://gentoo/texlive-module-issuulinks.source-2019.tar.xz mirror://gentoo/texlive-module-jvlisting.source-2019.tar.xz mirror://gentoo/texlive-module-kalendarium.source-2019.tar.xz mirror://gentoo/texlive-module-kantlipsum.source-2019.tar.xz mirror://gentoo/texlive-module-kerntest.source-2019.tar.xz mirror://gentoo/texlive-module-keycommand.source-2019.tar.xz mirror://gentoo/texlive-module-keyfloat.source-2019.tar.xz mirror://gentoo/texlive-module-keyindex.source-2019.tar.xz mirror://gentoo/texlive-module-keyvaltable.source-2019.tar.xz mirror://gentoo/texlive-module-knowledge.source-2019.tar.xz mirror://gentoo/texlive-module-komacv.source-2019.tar.xz mirror://gentoo/texlive-module-komacv-rg.source-2019.tar.xz mirror://gentoo/texlive-module-ktv-texdata.source-2019.tar.xz mirror://gentoo/texlive-module-l3build.source-2019.tar.xz mirror://gentoo/texlive-module-labbook.source-2019.tar.xz mirror://gentoo/texlive-module-labels.source-2019.tar.xz mirror://gentoo/texlive-module-labelschanged.source-2019.tar.xz mirror://gentoo/texlive-module-lastpackage.source-2019.tar.xz mirror://gentoo/texlive-module-lastpage.source-2019.tar.xz mirror://gentoo/texlive-module-latex-tds.source-2019.tar.xz mirror://gentoo/texlive-module-latexcolors.source-2019.tar.xz mirror://gentoo/texlive-module-latexdemo.source-2019.tar.xz mirror://gentoo/texlive-module-latexgit.source-2019.tar.xz mirror://gentoo/texlive-module-layouts.source-2019.tar.xz mirror://gentoo/texlive-module-lccaps.source-2019.tar.xz mirror://gentoo/texlive-module-lcd.source-2019.tar.xz mirror://gentoo/texlive-module-lcg.source-2019.tar.xz mirror://gentoo/texlive-module-leading.source-2019.tar.xz mirror://gentoo/texlive-module-leftidx.source-2019.tar.xz mirror://gentoo/texlive-module-leipzig.source-2019.tar.xz mirror://gentoo/texlive-module-lengthconvert.source-2019.tar.xz mirror://gentoo/texlive-module-lettrine.source-2019.tar.xz mirror://gentoo/texlive-module-lhelp.source-2019.tar.xz mirror://gentoo/texlive-module-libgreek.source-2019.tar.xz mirror://gentoo/texlive-module-limap.source-2019.tar.xz mirror://gentoo/texlive-module-linegoal.source-2019.tar.xz mirror://gentoo/texlive-module-lipsum.source-2019.tar.xz mirror://gentoo/texlive-module-listlbls.source-2019.tar.xz mirror://gentoo/texlive-module-listliketab.source-2019.tar.xz mirror://gentoo/texlive-module-listofsymbols.source-2019.tar.xz mirror://gentoo/texlive-module-lmake.source-2019.tar.xz mirror://gentoo/texlive-module-locality.source-2019.tar.xz mirror://gentoo/texlive-module-localloc.source-2019.tar.xz mirror://gentoo/texlive-module-logbox.source-2019.tar.xz mirror://gentoo/texlive-module-logpap.source-2019.tar.xz mirror://gentoo/texlive-module-longfigure.source-2019.tar.xz mirror://gentoo/texlive-module-longnamefilelist.source-2019.tar.xz mirror://gentoo/texlive-module-lstaddons.source-2019.tar.xz mirror://gentoo/texlive-module-ltxindex.source-2019.tar.xz mirror://gentoo/texlive-module-ltxnew.source-2019.tar.xz mirror://gentoo/texlive-module-luatodonotes.source-2019.tar.xz mirror://gentoo/texlive-module-macroswap.source-2019.tar.xz mirror://gentoo/texlive-module-mailing.source-2019.tar.xz mirror://gentoo/texlive-module-mailmerge.source-2019.tar.xz mirror://gentoo/texlive-module-makebase.source-2019.tar.xz mirror://gentoo/texlive-module-makebox.source-2019.tar.xz mirror://gentoo/texlive-module-makecell.source-2019.tar.xz mirror://gentoo/texlive-module-makecmds.source-2019.tar.xz mirror://gentoo/texlive-module-makedtx.source-2019.tar.xz mirror://gentoo/texlive-module-mandi.source-2019.tar.xz mirror://gentoo/texlive-module-manfnt.source-2019.tar.xz mirror://gentoo/texlive-module-manuscript.source-2019.tar.xz mirror://gentoo/texlive-module-marginfit.source-2019.tar.xz mirror://gentoo/texlive-module-marginfix.source-2019.tar.xz mirror://gentoo/texlive-module-marginnote.source-2019.tar.xz mirror://gentoo/texlive-module-markdown.source-2019.tar.xz mirror://gentoo/texlive-module-mathastext.source-2019.tar.xz mirror://gentoo/texlive-module-mathexam.source-2019.tar.xz mirror://gentoo/texlive-module-mathfont.source-2019.tar.xz mirror://gentoo/texlive-module-mcaption.source-2019.tar.xz mirror://gentoo/texlive-module-mcite.source-2019.tar.xz mirror://gentoo/texlive-module-mdframed.source-2019.tar.xz mirror://gentoo/texlive-module-media9.source-2019.tar.xz mirror://gentoo/texlive-module-meetingmins.source-2019.tar.xz mirror://gentoo/texlive-module-memory.source-2019.tar.xz mirror://gentoo/texlive-module-menu.source-2019.tar.xz mirror://gentoo/texlive-module-menukeys.source-2019.tar.xz mirror://gentoo/texlive-module-metalogox.source-2019.tar.xz mirror://gentoo/texlive-module-method.source-2019.tar.xz mirror://gentoo/texlive-module-metre.source-2019.tar.xz mirror://gentoo/texlive-module-mfirstuc.source-2019.tar.xz mirror://gentoo/texlive-module-mftinc.source-2019.tar.xz mirror://gentoo/texlive-module-mi-solns.source-2019.tar.xz mirror://gentoo/texlive-module-minibox.source-2019.tar.xz mirror://gentoo/texlive-module-minidocument.source-2019.tar.xz mirror://gentoo/texlive-module-minifp.source-2019.tar.xz mirror://gentoo/texlive-module-minipage-marginpar.source-2019.tar.xz mirror://gentoo/texlive-module-minted.source-2019.tar.xz mirror://gentoo/texlive-module-minutes.source-2019.tar.xz mirror://gentoo/texlive-module-mlist.source-2019.tar.xz mirror://gentoo/texlive-module-mnotes.source-2019.tar.xz mirror://gentoo/texlive-module-moderntimeline.source-2019.tar.xz mirror://gentoo/texlive-module-modref.source-2019.tar.xz mirror://gentoo/texlive-module-modroman.source-2019.tar.xz mirror://gentoo/texlive-module-monofill.source-2019.tar.xz mirror://gentoo/texlive-module-moodle.source-2019.tar.xz mirror://gentoo/texlive-module-morefloats.source-2019.tar.xz mirror://gentoo/texlive-module-morehype.source-2019.tar.xz mirror://gentoo/texlive-module-moresize.source-2019.tar.xz mirror://gentoo/texlive-module-moreverb.source-2019.tar.xz mirror://gentoo/texlive-module-morewrites.source-2019.tar.xz mirror://gentoo/texlive-module-mparhack.source-2019.tar.xz mirror://gentoo/texlive-module-mpostinl.source-2019.tar.xz mirror://gentoo/texlive-module-msg.source-2019.tar.xz mirror://gentoo/texlive-module-mtgreek.source-2019.tar.xz mirror://gentoo/texlive-module-multiaudience.source-2019.tar.xz mirror://gentoo/texlive-module-multibbl.source-2019.tar.xz mirror://gentoo/texlive-module-multicap.source-2019.tar.xz mirror://gentoo/texlive-module-multicolrule.source-2019.tar.xz mirror://gentoo/texlive-module-multidef.source-2019.tar.xz mirror://gentoo/texlive-module-multienv.source-2019.tar.xz mirror://gentoo/texlive-module-multiexpand.source-2019.tar.xz mirror://gentoo/texlive-module-multilang.source-2019.tar.xz mirror://gentoo/texlive-module-multirow.source-2019.tar.xz mirror://gentoo/texlive-module-mversion.source-2019.tar.xz mirror://gentoo/texlive-module-mwe.source-2019.tar.xz mirror://gentoo/texlive-module-mycv.source-2019.tar.xz mirror://gentoo/texlive-module-mylatexformat.source-2019.tar.xz mirror://gentoo/texlive-module-nag.source-2019.tar.xz mirror://gentoo/texlive-module-nameauth.source-2019.tar.xz mirror://gentoo/texlive-module-namespc.source-2019.tar.xz mirror://gentoo/texlive-module-ncctools.source-2019.tar.xz mirror://gentoo/texlive-module-needspace.source-2019.tar.xz mirror://gentoo/texlive-module-newfile.source-2019.tar.xz mirror://gentoo/texlive-module-newlfm.source-2019.tar.xz mirror://gentoo/texlive-module-newspaper.source-2019.tar.xz mirror://gentoo/texlive-module-newunicodechar.source-2019.tar.xz mirror://gentoo/texlive-module-newvbtm.source-2019.tar.xz mirror://gentoo/texlive-module-newverbs.source-2019.tar.xz mirror://gentoo/texlive-module-nicefilelist.source-2019.tar.xz mirror://gentoo/texlive-module-niceframe.source-2019.tar.xz mirror://gentoo/texlive-module-nicetext.source-2019.tar.xz mirror://gentoo/texlive-module-nidanfloat.source-2019.tar.xz mirror://gentoo/texlive-module-noitcrul.source-2019.tar.xz mirror://gentoo/texlive-module-nomencl.source-2019.tar.xz mirror://gentoo/texlive-module-nomentbl.source-2019.tar.xz mirror://gentoo/texlive-module-nonfloat.source-2019.tar.xz mirror://gentoo/texlive-module-nonumonpart.source-2019.tar.xz mirror://gentoo/texlive-module-normalcolor.source-2019.tar.xz mirror://gentoo/texlive-module-notes.source-2019.tar.xz mirror://gentoo/texlive-module-notespages.source-2019.tar.xz mirror://gentoo/texlive-module-nowidow.source-2019.tar.xz mirror://gentoo/texlive-module-ntheorem.source-2019.tar.xz mirror://gentoo/texlive-module-numprint.source-2019.tar.xz mirror://gentoo/texlive-module-ocgx.source-2019.tar.xz mirror://gentoo/texlive-module-octavo.source-2019.tar.xz mirror://gentoo/texlive-module-oldstyle.source-2019.tar.xz mirror://gentoo/texlive-module-onlyamsmath.source-2019.tar.xz mirror://gentoo/texlive-module-opcit.source-2019.tar.xz mirror://gentoo/texlive-module-outlining.source-2019.tar.xz mirror://gentoo/texlive-module-overpic.source-2019.tar.xz mirror://gentoo/texlive-module-padcount.source-2019.tar.xz mirror://gentoo/texlive-module-pagecolor.source-2019.tar.xz mirror://gentoo/texlive-module-pagecont.source-2019.tar.xz mirror://gentoo/texlive-module-pagenote.source-2019.tar.xz mirror://gentoo/texlive-module-pageslts.source-2019.tar.xz mirror://gentoo/texlive-module-paper.source-2019.tar.xz mirror://gentoo/texlive-module-papercdcase.source-2019.tar.xz mirror://gentoo/texlive-module-papermas.source-2019.tar.xz mirror://gentoo/texlive-module-papertex.source-2019.tar.xz mirror://gentoo/texlive-module-paracol.source-2019.tar.xz mirror://gentoo/texlive-module-paralist.source-2019.tar.xz mirror://gentoo/texlive-module-paresse.source-2019.tar.xz mirror://gentoo/texlive-module-parselines.source-2019.tar.xz mirror://gentoo/texlive-module-patch.source-2019.tar.xz mirror://gentoo/texlive-module-patchcmd.source-2019.tar.xz mirror://gentoo/texlive-module-pauldoc.source-2019.tar.xz mirror://gentoo/texlive-module-pawpict.source-2019.tar.xz mirror://gentoo/texlive-module-pbox.source-2019.tar.xz mirror://gentoo/texlive-module-pbsheet.source-2019.tar.xz mirror://gentoo/texlive-module-pdf14.source-2019.tar.xz mirror://gentoo/texlive-module-pdfcprot.source-2019.tar.xz mirror://gentoo/texlive-module-pdfoverlay.source-2019.tar.xz mirror://gentoo/texlive-module-pdfpc-movie.source-2019.tar.xz mirror://gentoo/texlive-module-pdfprivacy.source-2019.tar.xz mirror://gentoo/texlive-module-pdfx.source-2019.tar.xz mirror://gentoo/texlive-module-perltex.source-2019.tar.xz mirror://gentoo/texlive-module-permute.source-2019.tar.xz mirror://gentoo/texlive-module-phffullpagefigure.source-2019.tar.xz mirror://gentoo/texlive-module-phfnote.source-2019.tar.xz mirror://gentoo/texlive-module-phfparen.source-2019.tar.xz mirror://gentoo/texlive-module-phfqit.source-2019.tar.xz mirror://gentoo/texlive-module-phfquotetext.source-2019.tar.xz mirror://gentoo/texlive-module-phfsvnwatermark.source-2019.tar.xz mirror://gentoo/texlive-module-phfthm.source-2019.tar.xz mirror://gentoo/texlive-module-photo.source-2019.tar.xz mirror://gentoo/texlive-module-plweb.source-2019.tar.xz mirror://gentoo/texlive-module-polynom.source-2019.tar.xz mirror://gentoo/texlive-module-polynomial.source-2019.tar.xz mirror://gentoo/texlive-module-polytable.source-2019.tar.xz mirror://gentoo/texlive-module-ppr-prv.source-2019.tar.xz mirror://gentoo/texlive-module-preprint.source-2019.tar.xz mirror://gentoo/texlive-module-pressrelease.source-2019.tar.xz mirror://gentoo/texlive-module-prettyref.source-2019.tar.xz mirror://gentoo/texlive-module-preview.source-2019.tar.xz mirror://gentoo/texlive-module-probsoln.source-2019.tar.xz mirror://gentoo/texlive-module-proofread.source-2019.tar.xz mirror://gentoo/texlive-module-protocol.source-2019.tar.xz mirror://gentoo/texlive-module-psfragx.source-2019.tar.xz mirror://gentoo/texlive-module-pxgreeks.source-2019.tar.xz mirror://gentoo/texlive-module-qcm.source-2019.tar.xz mirror://gentoo/texlive-module-qstest.source-2019.tar.xz mirror://gentoo/texlive-module-qsymbols.source-2019.tar.xz mirror://gentoo/texlive-module-quotchap.source-2019.tar.xz mirror://gentoo/texlive-module-quoting.source-2019.tar.xz mirror://gentoo/texlive-module-quotmark.source-2019.tar.xz mirror://gentoo/texlive-module-ran_toks.source-2019.tar.xz mirror://gentoo/texlive-module-rccol.source-2019.tar.xz mirror://gentoo/texlive-module-rcs-multi.source-2019.tar.xz mirror://gentoo/texlive-module-rcsinfo.source-2019.tar.xz mirror://gentoo/texlive-module-realboxes.source-2019.tar.xz mirror://gentoo/texlive-module-recipecard.source-2019.tar.xz mirror://gentoo/texlive-module-reflectgraphics.source-2019.tar.xz mirror://gentoo/texlive-module-refman.source-2019.tar.xz mirror://gentoo/texlive-module-refstyle.source-2019.tar.xz mirror://gentoo/texlive-module-regcount.source-2019.tar.xz mirror://gentoo/texlive-module-regexpatch.source-2019.tar.xz mirror://gentoo/texlive-module-register.source-2019.tar.xz mirror://gentoo/texlive-module-regstats.source-2019.tar.xz mirror://gentoo/texlive-module-relenc.source-2019.tar.xz mirror://gentoo/texlive-module-repltext.source-2019.tar.xz mirror://gentoo/texlive-module-rgltxdoc.source-2019.tar.xz mirror://gentoo/texlive-module-rjlparshap.source-2019.tar.xz mirror://gentoo/texlive-module-robustcommand.source-2019.tar.xz mirror://gentoo/texlive-module-romanbar.source-2019.tar.xz mirror://gentoo/texlive-module-romanbarpagenumber.source-2019.tar.xz mirror://gentoo/texlive-module-romannum.source-2019.tar.xz mirror://gentoo/texlive-module-rotfloat.source-2019.tar.xz mirror://gentoo/texlive-module-rtkinenc.source-2019.tar.xz mirror://gentoo/texlive-module-rulercompass.source-2019.tar.xz mirror://gentoo/texlive-module-sauerj.source-2019.tar.xz mirror://gentoo/texlive-module-savefnmark.source-2019.tar.xz mirror://gentoo/texlive-module-savetrees.source-2019.tar.xz mirror://gentoo/texlive-module-scale.source-2019.tar.xz mirror://gentoo/texlive-module-scalebar.source-2019.tar.xz mirror://gentoo/texlive-module-sectsty.source-2019.tar.xz mirror://gentoo/texlive-module-seealso.source-2019.tar.xz mirror://gentoo/texlive-module-semantic.source-2019.tar.xz mirror://gentoo/texlive-module-semioneside.source-2019.tar.xz mirror://gentoo/texlive-module-semproc.source-2019.tar.xz mirror://gentoo/texlive-module-seqsplit.source-2019.tar.xz mirror://gentoo/texlive-module-sesstime.source-2019.tar.xz mirror://gentoo/texlive-module-sf298.source-2019.tar.xz mirror://gentoo/texlive-module-sffms.source-2019.tar.xz mirror://gentoo/texlive-module-shdoc.source-2019.tar.xz mirror://gentoo/texlive-module-shorttoc.source-2019.tar.xz mirror://gentoo/texlive-module-show2e.source-2019.tar.xz mirror://gentoo/texlive-module-showcharinbox.source-2019.tar.xz mirror://gentoo/texlive-module-showexpl.source-2019.tar.xz mirror://gentoo/texlive-module-showlabels.source-2019.tar.xz mirror://gentoo/texlive-module-sidecap.source-2019.tar.xz mirror://gentoo/texlive-module-sidenotes.source-2019.tar.xz mirror://gentoo/texlive-module-silence.source-2019.tar.xz mirror://gentoo/texlive-module-simplecd.source-2019.tar.xz mirror://gentoo/texlive-module-simplecv.source-2019.tar.xz mirror://gentoo/texlive-module-sitem.source-2019.tar.xz mirror://gentoo/texlive-module-skb.source-2019.tar.xz mirror://gentoo/texlive-module-skdoc.source-2019.tar.xz mirror://gentoo/texlive-module-skrapport.source-2019.tar.xz mirror://gentoo/texlive-module-slantsc.source-2019.tar.xz mirror://gentoo/texlive-module-snapshot.source-2019.tar.xz mirror://gentoo/texlive-module-soul.source-2019.tar.xz mirror://gentoo/texlive-module-splitindex.source-2019.tar.xz mirror://gentoo/texlive-module-spot.source-2019.tar.xz mirror://gentoo/texlive-module-spverbatim.source-2019.tar.xz mirror://gentoo/texlive-module-srcltx.source-2019.tar.xz mirror://gentoo/texlive-module-sseq.source-2019.tar.xz mirror://gentoo/texlive-module-stack.source-2019.tar.xz mirror://gentoo/texlive-module-standalone.source-2019.tar.xz mirror://gentoo/texlive-module-stdclsdv.source-2019.tar.xz mirror://gentoo/texlive-module-stealcaps.source-2019.tar.xz mirror://gentoo/texlive-module-stdpage.source-2019.tar.xz mirror://gentoo/texlive-module-stex.source-2019.tar.xz mirror://gentoo/texlive-module-storebox.source-2019.tar.xz mirror://gentoo/texlive-module-stringstrings.source-2019.tar.xz mirror://gentoo/texlive-module-sttools.source-2019.tar.xz mirror://gentoo/texlive-module-subdepth.source-2019.tar.xz mirror://gentoo/texlive-module-subeqn.source-2019.tar.xz mirror://gentoo/texlive-module-subeqnarray.source-2019.tar.xz mirror://gentoo/texlive-module-subfigure.source-2019.tar.xz mirror://gentoo/texlive-module-subfiles.source-2019.tar.xz mirror://gentoo/texlive-module-subfloat.source-2019.tar.xz mirror://gentoo/texlive-module-supertabular.source-2019.tar.xz mirror://gentoo/texlive-module-svg.source-2019.tar.xz mirror://gentoo/texlive-module-svn.source-2019.tar.xz mirror://gentoo/texlive-module-svn-multi.source-2019.tar.xz mirror://gentoo/texlive-module-svn-prov.source-2019.tar.xz mirror://gentoo/texlive-module-syntrace.source-2019.tar.xz mirror://gentoo/texlive-module-synttree.source-2019.tar.xz mirror://gentoo/texlive-module-tabfigures.source-2019.tar.xz mirror://gentoo/texlive-module-tablefootnote.source-2019.tar.xz mirror://gentoo/texlive-module-tableof.source-2019.tar.xz mirror://gentoo/texlive-module-tablestyles.source-2019.tar.xz mirror://gentoo/texlive-module-tablists.source-2019.tar.xz mirror://gentoo/texlive-module-tablvar.source-2019.tar.xz mirror://gentoo/texlive-module-tabu.source-2019.tar.xz mirror://gentoo/texlive-module-tabularborder.source-2019.tar.xz mirror://gentoo/texlive-module-tabularew.source-2019.tar.xz mirror://gentoo/texlive-module-tabulary.source-2019.tar.xz mirror://gentoo/texlive-module-talk.source-2019.tar.xz mirror://gentoo/texlive-module-tcldoc.source-2019.tar.xz mirror://gentoo/texlive-module-ted.source-2019.tar.xz mirror://gentoo/texlive-module-templatetools.source-2019.tar.xz mirror://gentoo/texlive-module-termcal.source-2019.tar.xz mirror://gentoo/texlive-module-termlist.source-2019.tar.xz mirror://gentoo/texlive-module-testhyphens.source-2019.tar.xz mirror://gentoo/texlive-module-testidx.source-2019.tar.xz mirror://gentoo/texlive-module-tex-label.source-2019.tar.xz mirror://gentoo/texlive-module-tex-locale.source-2019.tar.xz mirror://gentoo/texlive-module-texmate.source-2019.tar.xz mirror://gentoo/texlive-module-texments.source-2019.tar.xz mirror://gentoo/texlive-module-texpower.source-2019.tar.xz mirror://gentoo/texlive-module-texshade.source-2019.tar.xz mirror://gentoo/texlive-module-texvc.source-2019.tar.xz mirror://gentoo/texlive-module-textfit.source-2019.tar.xz mirror://gentoo/texlive-module-textmerg.source-2019.tar.xz mirror://gentoo/texlive-module-textpos.source-2019.tar.xz mirror://gentoo/texlive-module-textualicomma.source-2019.tar.xz mirror://gentoo/texlive-module-thmtools.source-2019.tar.xz mirror://gentoo/texlive-module-threadcol.source-2019.tar.xz mirror://gentoo/texlive-module-thumb.source-2019.tar.xz mirror://gentoo/texlive-module-thumbs.source-2019.tar.xz mirror://gentoo/texlive-module-titling.source-2019.tar.xz mirror://gentoo/texlive-module-tocbibind.source-2019.tar.xz mirror://gentoo/texlive-module-tocdata.source-2019.tar.xz mirror://gentoo/texlive-module-tocloft.source-2019.tar.xz mirror://gentoo/texlive-module-tocvsec2.source-2019.tar.xz mirror://gentoo/texlive-module-todo.source-2019.tar.xz mirror://gentoo/texlive-module-todonotes.source-2019.tar.xz mirror://gentoo/texlive-module-toolbox.source-2019.tar.xz mirror://gentoo/texlive-module-totcount.source-2019.tar.xz mirror://gentoo/texlive-module-totpages.source-2019.tar.xz mirror://gentoo/texlive-module-trfsigns.source-2019.tar.xz mirror://gentoo/texlive-module-trimspaces.source-2019.tar.xz mirror://gentoo/texlive-module-trivfloat.source-2019.tar.xz mirror://gentoo/texlive-module-trsym.source-2019.tar.xz mirror://gentoo/texlive-module-tucv.source-2019.tar.xz mirror://gentoo/texlive-module-twoup.source-2019.tar.xz mirror://gentoo/texlive-module-txgreeks.source-2019.tar.xz mirror://gentoo/texlive-module-type1cm.source-2019.tar.xz mirror://gentoo/texlive-module-typed-checklist.source-2019.tar.xz mirror://gentoo/texlive-module-typeface.source-2019.tar.xz mirror://gentoo/texlive-module-typogrid.source-2019.tar.xz mirror://gentoo/texlive-module-umoline.source-2019.tar.xz mirror://gentoo/texlive-module-underlin.source-2019.tar.xz mirror://gentoo/texlive-module-undolabl.source-2019.tar.xz mirror://gentoo/texlive-module-units.source-2019.tar.xz mirror://gentoo/texlive-module-unravel.source-2019.tar.xz mirror://gentoo/texlive-module-upquote.source-2019.tar.xz mirror://gentoo/texlive-module-uri.source-2019.tar.xz mirror://gentoo/texlive-module-ushort.source-2019.tar.xz mirror://gentoo/texlive-module-varindex.source-2019.tar.xz mirror://gentoo/texlive-module-versonotes.source-2019.tar.xz mirror://gentoo/texlive-module-vgrid.source-2019.tar.xz mirror://gentoo/texlive-module-vmargin.source-2019.tar.xz mirror://gentoo/texlive-module-volumes.source-2019.tar.xz mirror://gentoo/texlive-module-vwcol.source-2019.tar.xz mirror://gentoo/texlive-module-warpcol.source-2019.tar.xz mirror://gentoo/texlive-module-was.source-2019.tar.xz mirror://gentoo/texlive-module-widetable.source-2019.tar.xz mirror://gentoo/texlive-module-widows-and-orphans.source-2019.tar.xz mirror://gentoo/texlive-module-wordlike.source-2019.tar.xz mirror://gentoo/texlive-module-xargs.source-2019.tar.xz mirror://gentoo/texlive-module-xbmks.source-2019.tar.xz mirror://gentoo/texlive-module-xcolor-material.source-2019.tar.xz mirror://gentoo/texlive-module-xcolor-solarized.source-2019.tar.xz mirror://gentoo/texlive-module-xcookybooky.source-2019.tar.xz mirror://gentoo/texlive-module-xcpdftips.source-2019.tar.xz mirror://gentoo/texlive-module-xdoc.source-2019.tar.xz mirror://gentoo/texlive-module-xellipsis.source-2019.tar.xz mirror://gentoo/texlive-module-xfor.source-2019.tar.xz mirror://gentoo/texlive-module-xint.source-2019.tar.xz mirror://gentoo/texlive-module-xmpincl.source-2019.tar.xz mirror://gentoo/texlive-module-xpatch.source-2019.tar.xz mirror://gentoo/texlive-module-xpeek.source-2019.tar.xz mirror://gentoo/texlive-module-xpunctuate.source-2019.tar.xz mirror://gentoo/texlive-module-xsavebox.source-2019.tar.xz mirror://gentoo/texlive-module-xtab.source-2019.tar.xz mirror://gentoo/texlive-module-yafoot.source-2019.tar.xz mirror://gentoo/texlive-module-yaletter.source-2019.tar.xz mirror://gentoo/texlive-module-yagusylo.source-2019.tar.xz mirror://gentoo/texlive-module-ydoc.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=99690fba4c53934166fd6878bd19ca47
diff --git a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2019-r2 b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2019-r2
index 1984124e26b5..673b3cfc8839 100644
--- a/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2019-r2
+++ b/metadata/md5-cache/dev-texlive/texlive-latexrecommended-2019-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-latex-2019 !<dev-texlive/texlive-latexextra-2017 !<dev-texlive/texlive-xetex-2016 !<dev-texlive/texlive-humanities-2014 !dev-texlive/texlive-mathextra !=dev-texlive/texlive-luatex-2017* !=dev-texlive/texlive-latexextra-2017* !dev-tex/xcolor >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-anysize-2019.tar.xz mirror://gentoo/texlive-module-booktabs-2019.tar.xz mirror://gentoo/texlive-module-breqn-2019.tar.xz mirror://gentoo/texlive-module-caption-2019.tar.xz mirror://gentoo/texlive-module-cite-2019.tar.xz mirror://gentoo/texlive-module-cmap-2019.tar.xz mirror://gentoo/texlive-module-crop-2019.tar.xz mirror://gentoo/texlive-module-ctable-2019.tar.xz mirror://gentoo/texlive-module-eso-pic-2019.tar.xz mirror://gentoo/texlive-module-euenc-2019.tar.xz mirror://gentoo/texlive-module-euler-2019.tar.xz mirror://gentoo/texlive-module-etoolbox-2019.tar.xz mirror://gentoo/texlive-module-extsizes-2019.tar.xz mirror://gentoo/texlive-module-fancybox-2019.tar.xz mirror://gentoo/texlive-module-fancyref-2019.tar.xz mirror://gentoo/texlive-module-fancyvrb-2019.tar.xz mirror://gentoo/texlive-module-filehook-2019.tar.xz mirror://gentoo/texlive-module-float-2019.tar.xz mirror://gentoo/texlive-module-fontspec-2019.tar.xz mirror://gentoo/texlive-module-footnotehyper-2019.tar.xz mirror://gentoo/texlive-module-fp-2019.tar.xz mirror://gentoo/texlive-module-index-2019.tar.xz mirror://gentoo/texlive-module-jknapltx-2019.tar.xz mirror://gentoo/texlive-module-koma-script-2019.tar.xz mirror://gentoo/texlive-module-latexbug-2019.tar.xz mirror://gentoo/texlive-module-l3experimental-2019.tar.xz mirror://gentoo/texlive-module-l3kernel-2019.tar.xz mirror://gentoo/texlive-module-l3packages-2019.tar.xz mirror://gentoo/texlive-module-lineno-2019.tar.xz mirror://gentoo/texlive-module-listings-2019.tar.xz mirror://gentoo/texlive-module-lwarp-2019.tar.xz mirror://gentoo/texlive-module-mathspec-2019.tar.xz mirror://gentoo/texlive-module-mathtools-2019.tar.xz mirror://gentoo/texlive-module-mdwtools-2019.tar.xz mirror://gentoo/texlive-module-memoir-2019.tar.xz mirror://gentoo/texlive-module-metalogo-2019.tar.xz mirror://gentoo/texlive-module-microtype-2019.tar.xz mirror://gentoo/texlive-module-ms-2019.tar.xz mirror://gentoo/texlive-module-ntgclass-2019.tar.xz mirror://gentoo/texlive-module-parskip-2019.tar.xz mirror://gentoo/texlive-module-pdfpages-2019.tar.xz mirror://gentoo/texlive-module-polyglossia-2019.tar.xz mirror://gentoo/texlive-module-powerdot-2019.tar.xz mirror://gentoo/texlive-module-psfrag-2019.tar.xz mirror://gentoo/texlive-module-rcs-2019.tar.xz mirror://gentoo/texlive-module-sansmath-2019.tar.xz mirror://gentoo/texlive-module-section-2019.tar.xz mirror://gentoo/texlive-module-seminar-2019.tar.xz mirror://gentoo/texlive-module-sepnum-2019.tar.xz mirror://gentoo/texlive-module-setspace-2019.tar.xz mirror://gentoo/texlive-module-subfig-2019.tar.xz mirror://gentoo/texlive-module-textcase-2019.tar.xz mirror://gentoo/texlive-module-thumbpdf-2019.tar.xz mirror://gentoo/texlive-module-translator-2019.tar.xz mirror://gentoo/texlive-module-typehtml-2019.tar.xz mirror://gentoo/texlive-module-ucharcat-2019.tar.xz mirror://gentoo/texlive-module-underscore-2019.tar.xz mirror://gentoo/texlive-module-unicode-math-2019.tar.xz mirror://gentoo/texlive-module-xcolor-2019.tar.xz mirror://gentoo/texlive-module-xkeyval-2019.tar.xz mirror://gentoo/texlive-module-xltxtra-2019.tar.xz mirror://gentoo/texlive-module-xunicode-2019.tar.xz mirror://gentoo/texlive-module-collection-latexrecommended-2019.tar.xz doc? ( mirror://gentoo/texlive-module-anysize.doc-2019.tar.xz mirror://gentoo/texlive-module-booktabs.doc-2019.tar.xz mirror://gentoo/texlive-module-breqn.doc-2019.tar.xz mirror://gentoo/texlive-module-caption.doc-2019.tar.xz mirror://gentoo/texlive-module-cite.doc-2019.tar.xz mirror://gentoo/texlive-module-cmap.doc-2019.tar.xz mirror://gentoo/texlive-module-crop.doc-2019.tar.xz mirror://gentoo/texlive-module-ctable.doc-2019.tar.xz mirror://gentoo/texlive-module-eso-pic.doc-2019.tar.xz mirror://gentoo/texlive-module-euenc.doc-2019.tar.xz mirror://gentoo/texlive-module-euler.doc-2019.tar.xz mirror://gentoo/texlive-module-etoolbox.doc-2019.tar.xz mirror://gentoo/texlive-module-extsizes.doc-2019.tar.xz mirror://gentoo/texlive-module-fancybox.doc-2019.tar.xz mirror://gentoo/texlive-module-fancyref.doc-2019.tar.xz mirror://gentoo/texlive-module-fancyvrb.doc-2019.tar.xz mirror://gentoo/texlive-module-filehook.doc-2019.tar.xz mirror://gentoo/texlive-module-float.doc-2019.tar.xz mirror://gentoo/texlive-module-fontspec.doc-2019.tar.xz mirror://gentoo/texlive-module-footnotehyper.doc-2019.tar.xz mirror://gentoo/texlive-module-fp.doc-2019.tar.xz mirror://gentoo/texlive-module-index.doc-2019.tar.xz mirror://gentoo/texlive-module-jknapltx.doc-2019.tar.xz mirror://gentoo/texlive-module-latexbug.doc-2019.tar.xz mirror://gentoo/texlive-module-l3experimental.doc-2019.tar.xz mirror://gentoo/texlive-module-l3kernel.doc-2019.tar.xz mirror://gentoo/texlive-module-l3packages.doc-2019.tar.xz mirror://gentoo/texlive-module-lineno.doc-2019.tar.xz mirror://gentoo/texlive-module-listings.doc-2019.tar.xz mirror://gentoo/texlive-module-lwarp.doc-2019.tar.xz mirror://gentoo/texlive-module-mathspec.doc-2019.tar.xz mirror://gentoo/texlive-module-mathtools.doc-2019.tar.xz mirror://gentoo/texlive-module-mdwtools.doc-2019.tar.xz mirror://gentoo/texlive-module-memoir.doc-2019.tar.xz mirror://gentoo/texlive-module-metalogo.doc-2019.tar.xz mirror://gentoo/texlive-module-microtype.doc-2019.tar.xz mirror://gentoo/texlive-module-ms.doc-2019.tar.xz mirror://gentoo/texlive-module-ntgclass.doc-2019.tar.xz mirror://gentoo/texlive-module-parskip.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfpages.doc-2019.tar.xz mirror://gentoo/texlive-module-polyglossia.doc-2019.tar.xz mirror://gentoo/texlive-module-powerdot.doc-2019.tar.xz mirror://gentoo/texlive-module-psfrag.doc-2019.tar.xz mirror://gentoo/texlive-module-rcs.doc-2019.tar.xz mirror://gentoo/texlive-module-sansmath.doc-2019.tar.xz mirror://gentoo/texlive-module-section.doc-2019.tar.xz mirror://gentoo/texlive-module-seminar.doc-2019.tar.xz mirror://gentoo/texlive-module-sepnum.doc-2019.tar.xz mirror://gentoo/texlive-module-setspace.doc-2019.tar.xz mirror://gentoo/texlive-module-subfig.doc-2019.tar.xz mirror://gentoo/texlive-module-textcase.doc-2019.tar.xz mirror://gentoo/texlive-module-thumbpdf.doc-2019.tar.xz mirror://gentoo/texlive-module-translator.doc-2019.tar.xz mirror://gentoo/texlive-module-typehtml.doc-2019.tar.xz mirror://gentoo/texlive-module-ucharcat.doc-2019.tar.xz mirror://gentoo/texlive-module-underscore.doc-2019.tar.xz mirror://gentoo/texlive-module-unicode-math.doc-2019.tar.xz mirror://gentoo/texlive-module-xcolor.doc-2019.tar.xz mirror://gentoo/texlive-module-xkeyval.doc-2019.tar.xz mirror://gentoo/texlive-module-xltxtra.doc-2019.tar.xz mirror://gentoo/texlive-module-xunicode.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-booktabs.source-2019.tar.xz mirror://gentoo/texlive-module-breqn.source-2019.tar.xz mirror://gentoo/texlive-module-caption.source-2019.tar.xz mirror://gentoo/texlive-module-crop.source-2019.tar.xz mirror://gentoo/texlive-module-ctable.source-2019.tar.xz mirror://gentoo/texlive-module-eso-pic.source-2019.tar.xz mirror://gentoo/texlive-module-euenc.source-2019.tar.xz mirror://gentoo/texlive-module-euler.source-2019.tar.xz mirror://gentoo/texlive-module-fancyref.source-2019.tar.xz mirror://gentoo/texlive-module-filehook.source-2019.tar.xz mirror://gentoo/texlive-module-float.source-2019.tar.xz mirror://gentoo/texlive-module-fontspec.source-2019.tar.xz mirror://gentoo/texlive-module-footnotehyper.source-2019.tar.xz mirror://gentoo/texlive-module-index.source-2019.tar.xz mirror://gentoo/texlive-module-latexbug.source-2019.tar.xz mirror://gentoo/texlive-module-l3experimental.source-2019.tar.xz mirror://gentoo/texlive-module-l3kernel.source-2019.tar.xz mirror://gentoo/texlive-module-l3packages.source-2019.tar.xz mirror://gentoo/texlive-module-lineno.source-2019.tar.xz mirror://gentoo/texlive-module-listings.source-2019.tar.xz mirror://gentoo/texlive-module-lwarp.source-2019.tar.xz mirror://gentoo/texlive-module-mathtools.source-2019.tar.xz mirror://gentoo/texlive-module-mdwtools.source-2019.tar.xz mirror://gentoo/texlive-module-memoir.source-2019.tar.xz mirror://gentoo/texlive-module-metalogo.source-2019.tar.xz mirror://gentoo/texlive-module-microtype.source-2019.tar.xz mirror://gentoo/texlive-module-ms.source-2019.tar.xz mirror://gentoo/texlive-module-ntgclass.source-2019.tar.xz mirror://gentoo/texlive-module-parskip.source-2019.tar.xz mirror://gentoo/texlive-module-pdfpages.source-2019.tar.xz mirror://gentoo/texlive-module-polyglossia.source-2019.tar.xz mirror://gentoo/texlive-module-powerdot.source-2019.tar.xz mirror://gentoo/texlive-module-psfrag.source-2019.tar.xz mirror://gentoo/texlive-module-rcs.source-2019.tar.xz mirror://gentoo/texlive-module-subfig.source-2019.tar.xz mirror://gentoo/texlive-module-textcase.source-2019.tar.xz mirror://gentoo/texlive-module-typehtml.source-2019.tar.xz mirror://gentoo/texlive-module-ucharcat.source-2019.tar.xz mirror://gentoo/texlive-module-unicode-math.source-2019.tar.xz mirror://gentoo/texlive-module-xcolor.source-2019.tar.xz mirror://gentoo/texlive-module-xkeyval.source-2019.tar.xz mirror://gentoo/texlive-module-xltxtra.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=a06f18d38dcd7e70a0adf57e01c8aa05
diff --git a/metadata/md5-cache/dev-texlive/texlive-luatex-2019 b/metadata/md5-cache/dev-texlive/texlive-luatex-2019
index ad2db7da4f2f..77d6e96cb09a 100644
--- a/metadata/md5-cache/dev-texlive/texlive-luatex-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-luatex-2019
@@ -10,5 +10,5 @@ LICENSE=BSD FDL-1.1 GPL-2 LPPL-1.3 LPPL-1.3c MIT public-domain TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 dev-texlive/texlive-latexrecommended >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-addliga-2019.tar.xz mirror://gentoo/texlive-module-auto-pst-pdf-lua-2019.tar.xz mirror://gentoo/texlive-module-bezierplot-2019.tar.xz mirror://gentoo/texlive-module-checkcites-2019.tar.xz mirror://gentoo/texlive-module-chickenize-2019.tar.xz mirror://gentoo/texlive-module-combofont-2019.tar.xz mirror://gentoo/texlive-module-cstypo-2019.tar.xz mirror://gentoo/texlive-module-ctablestack-2019.tar.xz mirror://gentoo/texlive-module-enigma-2019.tar.xz mirror://gentoo/texlive-module-interpreter-2019.tar.xz mirror://gentoo/texlive-module-kanaparser-2019.tar.xz mirror://gentoo/texlive-module-lua-visual-debug-2019.tar.xz mirror://gentoo/texlive-module-lua2dox-2019.tar.xz mirror://gentoo/texlive-module-luacode-2019.tar.xz mirror://gentoo/texlive-module-luahyphenrules-2019.tar.xz mirror://gentoo/texlive-module-luaimageembed-2019.tar.xz mirror://gentoo/texlive-module-luaindex-2019.tar.xz mirror://gentoo/texlive-module-luainputenc-2019.tar.xz mirror://gentoo/texlive-module-luaintro-2019.tar.xz mirror://gentoo/texlive-module-lualatex-doc-2019.tar.xz mirror://gentoo/texlive-module-lualatex-math-2019.tar.xz mirror://gentoo/texlive-module-lualatex-truncate-2019.tar.xz mirror://gentoo/texlive-module-lualibs-2019.tar.xz mirror://gentoo/texlive-module-luamplib-2019.tar.xz mirror://gentoo/texlive-module-luaotfload-2019.tar.xz mirror://gentoo/texlive-module-luapackageloader-2019.tar.xz mirror://gentoo/texlive-module-luarandom-2019.tar.xz mirror://gentoo/texlive-module-luatex85-2019.tar.xz mirror://gentoo/texlive-module-luatexbase-2019.tar.xz mirror://gentoo/texlive-module-luatexko-2019.tar.xz mirror://gentoo/texlive-module-luatextra-2019.tar.xz mirror://gentoo/texlive-module-luavlna-2019.tar.xz mirror://gentoo/texlive-module-luaxml-2019.tar.xz mirror://gentoo/texlive-module-nodetree-2019.tar.xz mirror://gentoo/texlive-module-odsfile-2019.tar.xz mirror://gentoo/texlive-module-pdfarticle-2019.tar.xz mirror://gentoo/texlive-module-placeat-2019.tar.xz mirror://gentoo/texlive-module-plantuml-2019.tar.xz mirror://gentoo/texlive-module-selnolig-2019.tar.xz mirror://gentoo/texlive-module-spelling-2019.tar.xz mirror://gentoo/texlive-module-typewriter-2019.tar.xz mirror://gentoo/texlive-module-collection-luatex-2019.tar.xz doc? ( mirror://gentoo/texlive-module-addliga.doc-2019.tar.xz mirror://gentoo/texlive-module-auto-pst-pdf-lua.doc-2019.tar.xz mirror://gentoo/texlive-module-bezierplot.doc-2019.tar.xz mirror://gentoo/texlive-module-checkcites.doc-2019.tar.xz mirror://gentoo/texlive-module-chickenize.doc-2019.tar.xz mirror://gentoo/texlive-module-combofont.doc-2019.tar.xz mirror://gentoo/texlive-module-cstypo.doc-2019.tar.xz mirror://gentoo/texlive-module-ctablestack.doc-2019.tar.xz mirror://gentoo/texlive-module-enigma.doc-2019.tar.xz mirror://gentoo/texlive-module-interpreter.doc-2019.tar.xz mirror://gentoo/texlive-module-kanaparser.doc-2019.tar.xz mirror://gentoo/texlive-module-lua-visual-debug.doc-2019.tar.xz mirror://gentoo/texlive-module-lua2dox.doc-2019.tar.xz mirror://gentoo/texlive-module-luacode.doc-2019.tar.xz mirror://gentoo/texlive-module-luahyphenrules.doc-2019.tar.xz mirror://gentoo/texlive-module-luaimageembed.doc-2019.tar.xz mirror://gentoo/texlive-module-luaindex.doc-2019.tar.xz mirror://gentoo/texlive-module-luainputenc.doc-2019.tar.xz mirror://gentoo/texlive-module-luaintro.doc-2019.tar.xz mirror://gentoo/texlive-module-lualatex-doc.doc-2019.tar.xz mirror://gentoo/texlive-module-lualatex-math.doc-2019.tar.xz mirror://gentoo/texlive-module-lualatex-truncate.doc-2019.tar.xz mirror://gentoo/texlive-module-lualibs.doc-2019.tar.xz mirror://gentoo/texlive-module-luamplib.doc-2019.tar.xz mirror://gentoo/texlive-module-luaotfload.doc-2019.tar.xz mirror://gentoo/texlive-module-luapackageloader.doc-2019.tar.xz mirror://gentoo/texlive-module-luarandom.doc-2019.tar.xz mirror://gentoo/texlive-module-luatex85.doc-2019.tar.xz mirror://gentoo/texlive-module-luatexbase.doc-2019.tar.xz mirror://gentoo/texlive-module-luatexko.doc-2019.tar.xz mirror://gentoo/texlive-module-luatextra.doc-2019.tar.xz mirror://gentoo/texlive-module-luavlna.doc-2019.tar.xz mirror://gentoo/texlive-module-luaxml.doc-2019.tar.xz mirror://gentoo/texlive-module-nodetree.doc-2019.tar.xz mirror://gentoo/texlive-module-odsfile.doc-2019.tar.xz mirror://gentoo/texlive-module-pdfarticle.doc-2019.tar.xz mirror://gentoo/texlive-module-placeat.doc-2019.tar.xz mirror://gentoo/texlive-module-plantuml.doc-2019.tar.xz mirror://gentoo/texlive-module-selnolig.doc-2019.tar.xz mirror://gentoo/texlive-module-spelling.doc-2019.tar.xz mirror://gentoo/texlive-module-typewriter.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-chickenize.source-2019.tar.xz mirror://gentoo/texlive-module-ctablestack.source-2019.tar.xz mirror://gentoo/texlive-module-luacode.source-2019.tar.xz mirror://gentoo/texlive-module-luaindex.source-2019.tar.xz mirror://gentoo/texlive-module-luainputenc.source-2019.tar.xz mirror://gentoo/texlive-module-lualatex-doc.source-2019.tar.xz mirror://gentoo/texlive-module-lualatex-math.source-2019.tar.xz mirror://gentoo/texlive-module-lualatex-truncate.source-2019.tar.xz mirror://gentoo/texlive-module-lualibs.source-2019.tar.xz mirror://gentoo/texlive-module-luamplib.source-2019.tar.xz mirror://gentoo/texlive-module-luaotfload.source-2019.tar.xz mirror://gentoo/texlive-module-luatex85.source-2019.tar.xz mirror://gentoo/texlive-module-luatexbase.source-2019.tar.xz mirror://gentoo/texlive-module-luatextra.source-2019.tar.xz mirror://gentoo/texlive-module-nodetree.source-2019.tar.xz mirror://gentoo/texlive-module-placeat.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=de194a5815b816736449627d4b24a24e
diff --git a/metadata/md5-cache/dev-texlive/texlive-mathscience-2019 b/metadata/md5-cache/dev-texlive/texlive-mathscience-2019
index 84a099f58118..294490e1ef0f 100644
--- a/metadata/md5-cache/dev-texlive/texlive-mathscience-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-mathscience-2019
@@ -10,5 +10,5 @@ LICENSE=BSD BSD-2 CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3 GPL-3+
 RDEPEND=>=dev-texlive/texlive-fontsrecommended-2019 >=dev-texlive/texlive-latex-2019 !<dev-texlive/texlive-latexextra-2017 !dev-texlive/texlive-mathextra !dev-texlive/texlive-science !=dev-texlive/texlive-latexextra-2017* dev-texlive/texlive-pstricks >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-12many-2019.tar.xz mirror://gentoo/texlive-module-SIstyle-2019.tar.xz mirror://gentoo/texlive-module-SIunits-2019.tar.xz mirror://gentoo/texlive-module-alg-2019.tar.xz mirror://gentoo/texlive-module-algobox-2019.tar.xz mirror://gentoo/texlive-module-algorithm2e-2019.tar.xz mirror://gentoo/texlive-module-algorithmicx-2019.tar.xz mirror://gentoo/texlive-module-algorithms-2019.tar.xz mirror://gentoo/texlive-module-aligned-overset-2019.tar.xz mirror://gentoo/texlive-module-amstex-2019.tar.xz mirror://gentoo/texlive-module-apxproof-2019.tar.xz mirror://gentoo/texlive-module-autobreak-2019.tar.xz mirror://gentoo/texlive-module-axodraw2-2019.tar.xz mirror://gentoo/texlive-module-backnaur-2019.tar.xz mirror://gentoo/texlive-module-begriff-2019.tar.xz mirror://gentoo/texlive-module-binomexp-2019.tar.xz mirror://gentoo/texlive-module-biocon-2019.tar.xz mirror://gentoo/texlive-module-bitpattern-2019.tar.xz mirror://gentoo/texlive-module-bohr-2019.tar.xz mirror://gentoo/texlive-module-boldtensors-2019.tar.xz mirror://gentoo/texlive-module-bosisio-2019.tar.xz mirror://gentoo/texlive-module-bpchem-2019.tar.xz mirror://gentoo/texlive-module-bropd-2019.tar.xz mirror://gentoo/texlive-module-bussproofs-2019.tar.xz mirror://gentoo/texlive-module-bussproofs-extra-2019.tar.xz mirror://gentoo/texlive-module-bytefield-2019.tar.xz mirror://gentoo/texlive-module-calculation-2019.tar.xz mirror://gentoo/texlive-module-cascade-2019.tar.xz mirror://gentoo/texlive-module-ccfonts-2019.tar.xz mirror://gentoo/texlive-module-chemarrow-2019.tar.xz mirror://gentoo/texlive-module-chemcompounds-2019.tar.xz mirror://gentoo/texlive-module-chemcono-2019.tar.xz mirror://gentoo/texlive-module-chemexec-2019.tar.xz mirror://gentoo/texlive-module-chemformula-2019.tar.xz mirror://gentoo/texlive-module-chemgreek-2019.tar.xz mirror://gentoo/texlive-module-chemmacros-2019.tar.xz mirror://gentoo/texlive-module-chemnum-2019.tar.xz mirror://gentoo/texlive-module-chemschemex-2019.tar.xz mirror://gentoo/texlive-module-chemsec-2019.tar.xz mirror://gentoo/texlive-module-chemstyle-2019.tar.xz mirror://gentoo/texlive-module-clrscode-2019.tar.xz mirror://gentoo/texlive-module-clrscode3e-2019.tar.xz mirror://gentoo/texlive-module-commath-2019.tar.xz mirror://gentoo/texlive-module-complexity-2019.tar.xz mirror://gentoo/texlive-module-computational-complexity-2019.tar.xz mirror://gentoo/texlive-module-concmath-2019.tar.xz mirror://gentoo/texlive-module-concrete-2019.tar.xz mirror://gentoo/texlive-module-conteq-2019.tar.xz mirror://gentoo/texlive-module-correctmathalign-2019.tar.xz mirror://gentoo/texlive-module-cryptocode-2019.tar.xz mirror://gentoo/texlive-module-delim-2019.tar.xz mirror://gentoo/texlive-module-delimseasy-2019.tar.xz mirror://gentoo/texlive-module-delimset-2019.tar.xz mirror://gentoo/texlive-module-diffcoeff-2019.tar.xz mirror://gentoo/texlive-module-digiconfigs-2019.tar.xz mirror://gentoo/texlive-module-dijkstra-2019.tar.xz mirror://gentoo/texlive-module-drawmatrix-2019.tar.xz mirror://gentoo/texlive-module-drawstack-2019.tar.xz mirror://gentoo/texlive-module-dyntree-2019.tar.xz mirror://gentoo/texlive-module-ebproof-2019.tar.xz mirror://gentoo/texlive-module-econometrics-2019.tar.xz mirror://gentoo/texlive-module-eltex-2019.tar.xz mirror://gentoo/texlive-module-emf-2019.tar.xz mirror://gentoo/texlive-module-endiagram-2019.tar.xz mirror://gentoo/texlive-module-engtlc-2019.tar.xz mirror://gentoo/texlive-module-eqexpl-2019.tar.xz mirror://gentoo/texlive-module-eqnarray-2019.tar.xz mirror://gentoo/texlive-module-eqnnumwarn-2019.tar.xz mirror://gentoo/texlive-module-extarrows-2019.tar.xz mirror://gentoo/texlive-module-extpfeil-2019.tar.xz mirror://gentoo/texlive-module-faktor-2019.tar.xz mirror://gentoo/texlive-module-fascicules-2019.tar.xz mirror://gentoo/texlive-module-fnspe-2019.tar.xz mirror://gentoo/texlive-module-fouridx-2019.tar.xz mirror://gentoo/texlive-module-functan-2019.tar.xz mirror://gentoo/texlive-module-galois-2019.tar.xz mirror://gentoo/texlive-module-gastex-2019.tar.xz mirror://gentoo/texlive-module-gene-logic-2019.tar.xz mirror://gentoo/texlive-module-ghsystem-2019.tar.xz mirror://gentoo/texlive-module-gotoh-2019.tar.xz mirror://gentoo/texlive-module-grundgesetze-2019.tar.xz mirror://gentoo/texlive-module-gu-2019.tar.xz mirror://gentoo/texlive-module-hep-2019.tar.xz mirror://gentoo/texlive-module-hepnames-2019.tar.xz mirror://gentoo/texlive-module-hepparticles-2019.tar.xz mirror://gentoo/texlive-module-hepthesis-2019.tar.xz mirror://gentoo/texlive-module-hepunits-2019.tar.xz mirror://gentoo/texlive-module-includernw-2019.tar.xz mirror://gentoo/texlive-module-interval-2019.tar.xz mirror://gentoo/texlive-module-ionumbers-2019.tar.xz mirror://gentoo/texlive-module-isomath-2019.tar.xz mirror://gentoo/texlive-module-jkmath-2019.tar.xz mirror://gentoo/texlive-module-karnaugh-2019.tar.xz mirror://gentoo/texlive-module-karnaugh-map-2019.tar.xz mirror://gentoo/texlive-module-karnaughmap-2019.tar.xz mirror://gentoo/texlive-module-kvmap-2019.tar.xz mirror://gentoo/texlive-module-logicproof-2019.tar.xz mirror://gentoo/texlive-module-longdivision-2019.tar.xz mirror://gentoo/texlive-module-lpform-2019.tar.xz mirror://gentoo/texlive-module-lplfitch-2019.tar.xz mirror://gentoo/texlive-module-lstbayes-2019.tar.xz mirror://gentoo/texlive-module-mathcommand-2019.tar.xz mirror://gentoo/texlive-module-mathcomp-2019.tar.xz mirror://gentoo/texlive-module-mathfixs-2019.tar.xz mirror://gentoo/texlive-module-mathpartir-2019.tar.xz mirror://gentoo/texlive-module-mathpunctspace-2019.tar.xz mirror://gentoo/texlive-module-matlab-prettifier-2019.tar.xz mirror://gentoo/texlive-module-mattens-2019.tar.xz mirror://gentoo/texlive-module-memorygraphs-2019.tar.xz mirror://gentoo/texlive-module-mgltex-2019.tar.xz mirror://gentoo/texlive-module-mhchem-2019.tar.xz mirror://gentoo/texlive-module-mhequ-2019.tar.xz mirror://gentoo/texlive-module-miller-2019.tar.xz mirror://gentoo/texlive-module-mismath-2019.tar.xz mirror://gentoo/texlive-module-multiobjective-2019.tar.xz mirror://gentoo/texlive-module-mychemistry-2019.tar.xz mirror://gentoo/texlive-module-natded-2019.tar.xz mirror://gentoo/texlive-module-nath-2019.tar.xz mirror://gentoo/texlive-module-nicematrix-2019.tar.xz mirror://gentoo/texlive-module-nuc-2019.tar.xz mirror://gentoo/texlive-module-nucleardata-2019.tar.xz mirror://gentoo/texlive-module-objectz-2019.tar.xz mirror://gentoo/texlive-module-oplotsymbl-2019.tar.xz mirror://gentoo/texlive-module-ot-tableau-2019.tar.xz mirror://gentoo/texlive-module-oubraces-2019.tar.xz mirror://gentoo/texlive-module-perfectcut-2019.tar.xz mirror://gentoo/texlive-module-physics-2019.tar.xz mirror://gentoo/texlive-module-pm-isomath-2019.tar.xz mirror://gentoo/texlive-module-polexpr-2019.tar.xz mirror://gentoo/texlive-module-prftree-2019.tar.xz mirror://gentoo/texlive-module-proba-2019.tar.xz mirror://gentoo/texlive-module-proof-at-the-end-2019.tar.xz mirror://gentoo/texlive-module-prooftrees-2019.tar.xz mirror://gentoo/texlive-module-pseudocode-2019.tar.xz mirror://gentoo/texlive-module-pythonhighlight-2019.tar.xz mirror://gentoo/texlive-module-qsharp-2019.tar.xz mirror://gentoo/texlive-module-rank-2-roots-2019.tar.xz mirror://gentoo/texlive-module-rec-thy-2019.tar.xz mirror://gentoo/texlive-module-revquantum-2019.tar.xz mirror://gentoo/texlive-module-ribbonproofs-2019.tar.xz mirror://gentoo/texlive-module-rmathbr-2019.tar.xz mirror://gentoo/texlive-module-sasnrdisplay-2019.tar.xz mirror://gentoo/texlive-module-sciposter-2019.tar.xz mirror://gentoo/texlive-module-sclang-prettifier-2019.tar.xz mirror://gentoo/texlive-module-scratchx-2019.tar.xz mirror://gentoo/texlive-module-sesamanuel-2019.tar.xz mirror://gentoo/texlive-module-sfg-2019.tar.xz mirror://gentoo/texlive-module-shuffle-2019.tar.xz mirror://gentoo/texlive-module-simpler-wick-2019.tar.xz mirror://gentoo/texlive-module-simplewick-2019.tar.xz mirror://gentoo/texlive-module-siunitx-2019.tar.xz mirror://gentoo/texlive-module-skmath-2019.tar.xz mirror://gentoo/texlive-module-spalign-2019.tar.xz mirror://gentoo/texlive-module-stanli-2019.tar.xz mirror://gentoo/texlive-module-statex-2019.tar.xz mirror://gentoo/texlive-module-statex2-2019.tar.xz mirror://gentoo/texlive-module-statistics-2019.tar.xz mirror://gentoo/texlive-module-statistik-2019.tar.xz mirror://gentoo/texlive-module-statmath-2019.tar.xz mirror://gentoo/texlive-module-steinmetz-2019.tar.xz mirror://gentoo/texlive-module-stmaryrd-2019.tar.xz mirror://gentoo/texlive-module-structmech-2019.tar.xz mirror://gentoo/texlive-module-struktex-2019.tar.xz mirror://gentoo/texlive-module-substances-2019.tar.xz mirror://gentoo/texlive-module-subsupscripts-2019.tar.xz mirror://gentoo/texlive-module-subtext-2019.tar.xz mirror://gentoo/texlive-module-susy-2019.tar.xz mirror://gentoo/texlive-module-syllogism-2019.tar.xz mirror://gentoo/texlive-module-sympytexpackage-2019.tar.xz mirror://gentoo/texlive-module-synproof-2019.tar.xz mirror://gentoo/texlive-module-t-angles-2019.tar.xz mirror://gentoo/texlive-module-tablor-2019.tar.xz mirror://gentoo/texlive-module-tensor-2019.tar.xz mirror://gentoo/texlive-module-tex-ewd-2019.tar.xz mirror://gentoo/texlive-module-textgreek-2019.tar.xz mirror://gentoo/texlive-module-textopo-2019.tar.xz mirror://gentoo/texlive-module-thmbox-2019.tar.xz mirror://gentoo/texlive-module-turnstile-2019.tar.xz mirror://gentoo/texlive-module-ulqda-2019.tar.xz mirror://gentoo/texlive-module-unitsdef-2019.tar.xz mirror://gentoo/texlive-module-venn-2019.tar.xz mirror://gentoo/texlive-module-witharrows-2019.tar.xz mirror://gentoo/texlive-module-xymtex-2019.tar.xz mirror://gentoo/texlive-module-yhmath-2019.tar.xz mirror://gentoo/texlive-module-youngtab-2019.tar.xz mirror://gentoo/texlive-module-ytableau-2019.tar.xz mirror://gentoo/texlive-module-collection-mathscience-2019.tar.xz doc? ( mirror://gentoo/texlive-module-12many.doc-2019.tar.xz mirror://gentoo/texlive-module-SIstyle.doc-2019.tar.xz mirror://gentoo/texlive-module-SIunits.doc-2019.tar.xz mirror://gentoo/texlive-module-alg.doc-2019.tar.xz mirror://gentoo/texlive-module-algobox.doc-2019.tar.xz mirror://gentoo/texlive-module-algorithm2e.doc-2019.tar.xz mirror://gentoo/texlive-module-algorithmicx.doc-2019.tar.xz mirror://gentoo/texlive-module-algorithms.doc-2019.tar.xz mirror://gentoo/texlive-module-aligned-overset.doc-2019.tar.xz mirror://gentoo/texlive-module-amstex.doc-2019.tar.xz mirror://gentoo/texlive-module-apxproof.doc-2019.tar.xz mirror://gentoo/texlive-module-autobreak.doc-2019.tar.xz mirror://gentoo/texlive-module-axodraw2.doc-2019.tar.xz mirror://gentoo/texlive-module-backnaur.doc-2019.tar.xz mirror://gentoo/texlive-module-begriff.doc-2019.tar.xz mirror://gentoo/texlive-module-binomexp.doc-2019.tar.xz mirror://gentoo/texlive-module-biocon.doc-2019.tar.xz mirror://gentoo/texlive-module-bitpattern.doc-2019.tar.xz mirror://gentoo/texlive-module-bohr.doc-2019.tar.xz mirror://gentoo/texlive-module-boldtensors.doc-2019.tar.xz mirror://gentoo/texlive-module-bosisio.doc-2019.tar.xz mirror://gentoo/texlive-module-bpchem.doc-2019.tar.xz mirror://gentoo/texlive-module-bropd.doc-2019.tar.xz mirror://gentoo/texlive-module-bussproofs.doc-2019.tar.xz mirror://gentoo/texlive-module-bussproofs-extra.doc-2019.tar.xz mirror://gentoo/texlive-module-bytefield.doc-2019.tar.xz mirror://gentoo/texlive-module-calculation.doc-2019.tar.xz mirror://gentoo/texlive-module-cascade.doc-2019.tar.xz mirror://gentoo/texlive-module-ccfonts.doc-2019.tar.xz mirror://gentoo/texlive-module-chemarrow.doc-2019.tar.xz mirror://gentoo/texlive-module-chemcompounds.doc-2019.tar.xz mirror://gentoo/texlive-module-chemcono.doc-2019.tar.xz mirror://gentoo/texlive-module-chemexec.doc-2019.tar.xz mirror://gentoo/texlive-module-chemformula.doc-2019.tar.xz mirror://gentoo/texlive-module-chemgreek.doc-2019.tar.xz mirror://gentoo/texlive-module-chemmacros.doc-2019.tar.xz mirror://gentoo/texlive-module-chemnum.doc-2019.tar.xz mirror://gentoo/texlive-module-chemschemex.doc-2019.tar.xz mirror://gentoo/texlive-module-chemsec.doc-2019.tar.xz mirror://gentoo/texlive-module-chemstyle.doc-2019.tar.xz mirror://gentoo/texlive-module-clrscode.doc-2019.tar.xz mirror://gentoo/texlive-module-clrscode3e.doc-2019.tar.xz mirror://gentoo/texlive-module-commath.doc-2019.tar.xz mirror://gentoo/texlive-module-complexity.doc-2019.tar.xz mirror://gentoo/texlive-module-computational-complexity.doc-2019.tar.xz mirror://gentoo/texlive-module-concmath.doc-2019.tar.xz mirror://gentoo/texlive-module-concrete.doc-2019.tar.xz mirror://gentoo/texlive-module-conteq.doc-2019.tar.xz mirror://gentoo/texlive-module-correctmathalign.doc-2019.tar.xz mirror://gentoo/texlive-module-cryptocode.doc-2019.tar.xz mirror://gentoo/texlive-module-delim.doc-2019.tar.xz mirror://gentoo/texlive-module-delimseasy.doc-2019.tar.xz mirror://gentoo/texlive-module-delimset.doc-2019.tar.xz mirror://gentoo/texlive-module-diffcoeff.doc-2019.tar.xz mirror://gentoo/texlive-module-digiconfigs.doc-2019.tar.xz mirror://gentoo/texlive-module-dijkstra.doc-2019.tar.xz mirror://gentoo/texlive-module-drawmatrix.doc-2019.tar.xz mirror://gentoo/texlive-module-drawstack.doc-2019.tar.xz mirror://gentoo/texlive-module-dyntree.doc-2019.tar.xz mirror://gentoo/texlive-module-ebproof.doc-2019.tar.xz mirror://gentoo/texlive-module-econometrics.doc-2019.tar.xz mirror://gentoo/texlive-module-eltex.doc-2019.tar.xz mirror://gentoo/texlive-module-emf.doc-2019.tar.xz mirror://gentoo/texlive-module-endiagram.doc-2019.tar.xz mirror://gentoo/texlive-module-engtlc.doc-2019.tar.xz mirror://gentoo/texlive-module-eqexpl.doc-2019.tar.xz mirror://gentoo/texlive-module-eqnarray.doc-2019.tar.xz mirror://gentoo/texlive-module-eqnnumwarn.doc-2019.tar.xz mirror://gentoo/texlive-module-extarrows.doc-2019.tar.xz mirror://gentoo/texlive-module-extpfeil.doc-2019.tar.xz mirror://gentoo/texlive-module-faktor.doc-2019.tar.xz mirror://gentoo/texlive-module-fascicules.doc-2019.tar.xz mirror://gentoo/texlive-module-fnspe.doc-2019.tar.xz mirror://gentoo/texlive-module-fouridx.doc-2019.tar.xz mirror://gentoo/texlive-module-functan.doc-2019.tar.xz mirror://gentoo/texlive-module-galois.doc-2019.tar.xz mirror://gentoo/texlive-module-gastex.doc-2019.tar.xz mirror://gentoo/texlive-module-gene-logic.doc-2019.tar.xz mirror://gentoo/texlive-module-ghsystem.doc-2019.tar.xz mirror://gentoo/texlive-module-gotoh.doc-2019.tar.xz mirror://gentoo/texlive-module-grundgesetze.doc-2019.tar.xz mirror://gentoo/texlive-module-gu.doc-2019.tar.xz mirror://gentoo/texlive-module-hep.doc-2019.tar.xz mirror://gentoo/texlive-module-hepnames.doc-2019.tar.xz mirror://gentoo/texlive-module-hepparticles.doc-2019.tar.xz mirror://gentoo/texlive-module-hepthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-hepunits.doc-2019.tar.xz mirror://gentoo/texlive-module-includernw.doc-2019.tar.xz mirror://gentoo/texlive-module-interval.doc-2019.tar.xz mirror://gentoo/texlive-module-ionumbers.doc-2019.tar.xz mirror://gentoo/texlive-module-isomath.doc-2019.tar.xz mirror://gentoo/texlive-module-jkmath.doc-2019.tar.xz mirror://gentoo/texlive-module-karnaugh.doc-2019.tar.xz mirror://gentoo/texlive-module-karnaugh-map.doc-2019.tar.xz mirror://gentoo/texlive-module-karnaughmap.doc-2019.tar.xz mirror://gentoo/texlive-module-kvmap.doc-2019.tar.xz mirror://gentoo/texlive-module-logicproof.doc-2019.tar.xz mirror://gentoo/texlive-module-longdivision.doc-2019.tar.xz mirror://gentoo/texlive-module-lpform.doc-2019.tar.xz mirror://gentoo/texlive-module-lplfitch.doc-2019.tar.xz mirror://gentoo/texlive-module-lstbayes.doc-2019.tar.xz mirror://gentoo/texlive-module-mathcommand.doc-2019.tar.xz mirror://gentoo/texlive-module-mathcomp.doc-2019.tar.xz mirror://gentoo/texlive-module-mathfixs.doc-2019.tar.xz mirror://gentoo/texlive-module-mathpartir.doc-2019.tar.xz mirror://gentoo/texlive-module-mathpunctspace.doc-2019.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.doc-2019.tar.xz mirror://gentoo/texlive-module-mattens.doc-2019.tar.xz mirror://gentoo/texlive-module-memorygraphs.doc-2019.tar.xz mirror://gentoo/texlive-module-mgltex.doc-2019.tar.xz mirror://gentoo/texlive-module-mhchem.doc-2019.tar.xz mirror://gentoo/texlive-module-mhequ.doc-2019.tar.xz mirror://gentoo/texlive-module-miller.doc-2019.tar.xz mirror://gentoo/texlive-module-mismath.doc-2019.tar.xz mirror://gentoo/texlive-module-multiobjective.doc-2019.tar.xz mirror://gentoo/texlive-module-mychemistry.doc-2019.tar.xz mirror://gentoo/texlive-module-natded.doc-2019.tar.xz mirror://gentoo/texlive-module-nath.doc-2019.tar.xz mirror://gentoo/texlive-module-nicematrix.doc-2019.tar.xz mirror://gentoo/texlive-module-nuc.doc-2019.tar.xz mirror://gentoo/texlive-module-nucleardata.doc-2019.tar.xz mirror://gentoo/texlive-module-objectz.doc-2019.tar.xz mirror://gentoo/texlive-module-oplotsymbl.doc-2019.tar.xz mirror://gentoo/texlive-module-ot-tableau.doc-2019.tar.xz mirror://gentoo/texlive-module-oubraces.doc-2019.tar.xz mirror://gentoo/texlive-module-perfectcut.doc-2019.tar.xz mirror://gentoo/texlive-module-physics.doc-2019.tar.xz mirror://gentoo/texlive-module-pm-isomath.doc-2019.tar.xz mirror://gentoo/texlive-module-polexpr.doc-2019.tar.xz mirror://gentoo/texlive-module-prftree.doc-2019.tar.xz mirror://gentoo/texlive-module-proba.doc-2019.tar.xz mirror://gentoo/texlive-module-proof-at-the-end.doc-2019.tar.xz mirror://gentoo/texlive-module-prooftrees.doc-2019.tar.xz mirror://gentoo/texlive-module-pseudocode.doc-2019.tar.xz mirror://gentoo/texlive-module-pythonhighlight.doc-2019.tar.xz mirror://gentoo/texlive-module-qsharp.doc-2019.tar.xz mirror://gentoo/texlive-module-rank-2-roots.doc-2019.tar.xz mirror://gentoo/texlive-module-rec-thy.doc-2019.tar.xz mirror://gentoo/texlive-module-revquantum.doc-2019.tar.xz mirror://gentoo/texlive-module-ribbonproofs.doc-2019.tar.xz mirror://gentoo/texlive-module-rmathbr.doc-2019.tar.xz mirror://gentoo/texlive-module-sasnrdisplay.doc-2019.tar.xz mirror://gentoo/texlive-module-sciposter.doc-2019.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.doc-2019.tar.xz mirror://gentoo/texlive-module-scratchx.doc-2019.tar.xz mirror://gentoo/texlive-module-sesamanuel.doc-2019.tar.xz mirror://gentoo/texlive-module-sfg.doc-2019.tar.xz mirror://gentoo/texlive-module-shuffle.doc-2019.tar.xz mirror://gentoo/texlive-module-simpler-wick.doc-2019.tar.xz mirror://gentoo/texlive-module-simplewick.doc-2019.tar.xz mirror://gentoo/texlive-module-siunitx.doc-2019.tar.xz mirror://gentoo/texlive-module-skmath.doc-2019.tar.xz mirror://gentoo/texlive-module-spalign.doc-2019.tar.xz mirror://gentoo/texlive-module-stanli.doc-2019.tar.xz mirror://gentoo/texlive-module-statex.doc-2019.tar.xz mirror://gentoo/texlive-module-statex2.doc-2019.tar.xz mirror://gentoo/texlive-module-statistics.doc-2019.tar.xz mirror://gentoo/texlive-module-statistik.doc-2019.tar.xz mirror://gentoo/texlive-module-statmath.doc-2019.tar.xz mirror://gentoo/texlive-module-steinmetz.doc-2019.tar.xz mirror://gentoo/texlive-module-stmaryrd.doc-2019.tar.xz mirror://gentoo/texlive-module-structmech.doc-2019.tar.xz mirror://gentoo/texlive-module-struktex.doc-2019.tar.xz mirror://gentoo/texlive-module-substances.doc-2019.tar.xz mirror://gentoo/texlive-module-subsupscripts.doc-2019.tar.xz mirror://gentoo/texlive-module-subtext.doc-2019.tar.xz mirror://gentoo/texlive-module-susy.doc-2019.tar.xz mirror://gentoo/texlive-module-syllogism.doc-2019.tar.xz mirror://gentoo/texlive-module-sympytexpackage.doc-2019.tar.xz mirror://gentoo/texlive-module-synproof.doc-2019.tar.xz mirror://gentoo/texlive-module-t-angles.doc-2019.tar.xz mirror://gentoo/texlive-module-tablor.doc-2019.tar.xz mirror://gentoo/texlive-module-tensor.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-ewd.doc-2019.tar.xz mirror://gentoo/texlive-module-textgreek.doc-2019.tar.xz mirror://gentoo/texlive-module-textopo.doc-2019.tar.xz mirror://gentoo/texlive-module-thmbox.doc-2019.tar.xz mirror://gentoo/texlive-module-turnstile.doc-2019.tar.xz mirror://gentoo/texlive-module-ulqda.doc-2019.tar.xz mirror://gentoo/texlive-module-unitsdef.doc-2019.tar.xz mirror://gentoo/texlive-module-venn.doc-2019.tar.xz mirror://gentoo/texlive-module-witharrows.doc-2019.tar.xz mirror://gentoo/texlive-module-xymtex.doc-2019.tar.xz mirror://gentoo/texlive-module-yhmath.doc-2019.tar.xz mirror://gentoo/texlive-module-youngtab.doc-2019.tar.xz mirror://gentoo/texlive-module-ytableau.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-12many.source-2019.tar.xz mirror://gentoo/texlive-module-SIstyle.source-2019.tar.xz mirror://gentoo/texlive-module-SIunits.source-2019.tar.xz mirror://gentoo/texlive-module-alg.source-2019.tar.xz mirror://gentoo/texlive-module-algobox.source-2019.tar.xz mirror://gentoo/texlive-module-algorithms.source-2019.tar.xz mirror://gentoo/texlive-module-aligned-overset.source-2019.tar.xz mirror://gentoo/texlive-module-apxproof.source-2019.tar.xz mirror://gentoo/texlive-module-autobreak.source-2019.tar.xz mirror://gentoo/texlive-module-axodraw2.source-2019.tar.xz mirror://gentoo/texlive-module-backnaur.source-2019.tar.xz mirror://gentoo/texlive-module-binomexp.source-2019.tar.xz mirror://gentoo/texlive-module-bitpattern.source-2019.tar.xz mirror://gentoo/texlive-module-bosisio.source-2019.tar.xz mirror://gentoo/texlive-module-bpchem.source-2019.tar.xz mirror://gentoo/texlive-module-bropd.source-2019.tar.xz mirror://gentoo/texlive-module-bussproofs-extra.source-2019.tar.xz mirror://gentoo/texlive-module-bytefield.source-2019.tar.xz mirror://gentoo/texlive-module-calculation.source-2019.tar.xz mirror://gentoo/texlive-module-cascade.source-2019.tar.xz mirror://gentoo/texlive-module-ccfonts.source-2019.tar.xz mirror://gentoo/texlive-module-chemarrow.source-2019.tar.xz mirror://gentoo/texlive-module-chemcompounds.source-2019.tar.xz mirror://gentoo/texlive-module-chemschemex.source-2019.tar.xz mirror://gentoo/texlive-module-chemsec.source-2019.tar.xz mirror://gentoo/texlive-module-chemstyle.source-2019.tar.xz mirror://gentoo/texlive-module-computational-complexity.source-2019.tar.xz mirror://gentoo/texlive-module-concmath.source-2019.tar.xz mirror://gentoo/texlive-module-conteq.source-2019.tar.xz mirror://gentoo/texlive-module-delim.source-2019.tar.xz mirror://gentoo/texlive-module-delimset.source-2019.tar.xz mirror://gentoo/texlive-module-drawmatrix.source-2019.tar.xz mirror://gentoo/texlive-module-dyntree.source-2019.tar.xz mirror://gentoo/texlive-module-eqnarray.source-2019.tar.xz mirror://gentoo/texlive-module-extpfeil.source-2019.tar.xz mirror://gentoo/texlive-module-faktor.source-2019.tar.xz mirror://gentoo/texlive-module-fascicules.source-2019.tar.xz mirror://gentoo/texlive-module-fouridx.source-2019.tar.xz mirror://gentoo/texlive-module-functan.source-2019.tar.xz mirror://gentoo/texlive-module-galois.source-2019.tar.xz mirror://gentoo/texlive-module-gotoh.source-2019.tar.xz mirror://gentoo/texlive-module-grundgesetze.source-2019.tar.xz mirror://gentoo/texlive-module-ionumbers.source-2019.tar.xz mirror://gentoo/texlive-module-karnaugh-map.source-2019.tar.xz mirror://gentoo/texlive-module-karnaughmap.source-2019.tar.xz mirror://gentoo/texlive-module-kvmap.source-2019.tar.xz mirror://gentoo/texlive-module-logicproof.source-2019.tar.xz mirror://gentoo/texlive-module-lplfitch.source-2019.tar.xz mirror://gentoo/texlive-module-lstbayes.source-2019.tar.xz mirror://gentoo/texlive-module-mathcommand.source-2019.tar.xz mirror://gentoo/texlive-module-mathcomp.source-2019.tar.xz mirror://gentoo/texlive-module-mathfixs.source-2019.tar.xz mirror://gentoo/texlive-module-mathpartir.source-2019.tar.xz mirror://gentoo/texlive-module-matlab-prettifier.source-2019.tar.xz mirror://gentoo/texlive-module-mattens.source-2019.tar.xz mirror://gentoo/texlive-module-mgltex.source-2019.tar.xz mirror://gentoo/texlive-module-miller.source-2019.tar.xz mirror://gentoo/texlive-module-mismath.source-2019.tar.xz mirror://gentoo/texlive-module-multiobjective.source-2019.tar.xz mirror://gentoo/texlive-module-nicematrix.source-2019.tar.xz mirror://gentoo/texlive-module-nucleardata.source-2019.tar.xz mirror://gentoo/texlive-module-objectz.source-2019.tar.xz mirror://gentoo/texlive-module-pm-isomath.source-2019.tar.xz mirror://gentoo/texlive-module-proba.source-2019.tar.xz mirror://gentoo/texlive-module-proof-at-the-end.source-2019.tar.xz mirror://gentoo/texlive-module-qsharp.source-2019.tar.xz mirror://gentoo/texlive-module-revquantum.source-2019.tar.xz mirror://gentoo/texlive-module-rmathbr.source-2019.tar.xz mirror://gentoo/texlive-module-sclang-prettifier.source-2019.tar.xz mirror://gentoo/texlive-module-sesamanuel.source-2019.tar.xz mirror://gentoo/texlive-module-shuffle.source-2019.tar.xz mirror://gentoo/texlive-module-simplewick.source-2019.tar.xz mirror://gentoo/texlive-module-siunitx.source-2019.tar.xz mirror://gentoo/texlive-module-skmath.source-2019.tar.xz mirror://gentoo/texlive-module-spalign.source-2019.tar.xz mirror://gentoo/texlive-module-statistics.source-2019.tar.xz mirror://gentoo/texlive-module-statistik.source-2019.tar.xz mirror://gentoo/texlive-module-statmath.source-2019.tar.xz mirror://gentoo/texlive-module-steinmetz.source-2019.tar.xz mirror://gentoo/texlive-module-stmaryrd.source-2019.tar.xz mirror://gentoo/texlive-module-struktex.source-2019.tar.xz mirror://gentoo/texlive-module-sympytexpackage.source-2019.tar.xz mirror://gentoo/texlive-module-tensor.source-2019.tar.xz mirror://gentoo/texlive-module-textgreek.source-2019.tar.xz mirror://gentoo/texlive-module-textopo.source-2019.tar.xz mirror://gentoo/texlive-module-thmbox.source-2019.tar.xz mirror://gentoo/texlive-module-turnstile.source-2019.tar.xz mirror://gentoo/texlive-module-ulqda.source-2019.tar.xz mirror://gentoo/texlive-module-unitsdef.source-2019.tar.xz mirror://gentoo/texlive-module-witharrows.source-2019.tar.xz mirror://gentoo/texlive-module-xymtex.source-2019.tar.xz mirror://gentoo/texlive-module-yhmath.source-2019.tar.xz mirror://gentoo/texlive-module-youngtab.source-2019.tar.xz mirror://gentoo/texlive-module-ytableau.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=cf3f3f6e9cbda5ae4bf996f259db9062
diff --git a/metadata/md5-cache/dev-texlive/texlive-metapost-2019 b/metadata/md5-cache/dev-texlive/texlive-metapost-2019
index e01095f6a0e1..4ba49f20bc06 100644
--- a/metadata/md5-cache/dev-texlive/texlive-metapost-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-metapost-2019
@@ -10,5 +10,5 @@ LICENSE=CC-BY-SA-4.0 GPL-1 GPL-2 GPL-3+ LGPL-2 LPPL-1.3 MIT public-domain TeX-ot
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-automata-2019.tar.xz mirror://gentoo/texlive-module-bbcard-2019.tar.xz mirror://gentoo/texlive-module-blockdraw_mp-2019.tar.xz mirror://gentoo/texlive-module-bpolynomial-2019.tar.xz mirror://gentoo/texlive-module-cmarrows-2019.tar.xz mirror://gentoo/texlive-module-drv-2019.tar.xz mirror://gentoo/texlive-module-dviincl-2019.tar.xz mirror://gentoo/texlive-module-emp-2019.tar.xz mirror://gentoo/texlive-module-epsincl-2019.tar.xz mirror://gentoo/texlive-module-expressg-2019.tar.xz mirror://gentoo/texlive-module-exteps-2019.tar.xz mirror://gentoo/texlive-module-featpost-2019.tar.xz mirror://gentoo/texlive-module-feynmp-auto-2019.tar.xz mirror://gentoo/texlive-module-fiziko-2019.tar.xz mirror://gentoo/texlive-module-garrigues-2019.tar.xz mirror://gentoo/texlive-module-gmp-2019.tar.xz mirror://gentoo/texlive-module-hatching-2019.tar.xz mirror://gentoo/texlive-module-latexmp-2019.tar.xz mirror://gentoo/texlive-module-mcf2graph-2019.tar.xz mirror://gentoo/texlive-module-metago-2019.tar.xz mirror://gentoo/texlive-module-metaobj-2019.tar.xz mirror://gentoo/texlive-module-metaplot-2019.tar.xz mirror://gentoo/texlive-module-metapost-2019.tar.xz mirror://gentoo/texlive-module-metapost-colorbrewer-2019.tar.xz mirror://gentoo/texlive-module-metauml-2019.tar.xz mirror://gentoo/texlive-module-mfpic-2019.tar.xz mirror://gentoo/texlive-module-mfpic4ode-2019.tar.xz mirror://gentoo/texlive-module-mp3d-2019.tar.xz mirror://gentoo/texlive-module-mparrows-2019.tar.xz mirror://gentoo/texlive-module-mpattern-2019.tar.xz mirror://gentoo/texlive-module-mpcolornames-2019.tar.xz mirror://gentoo/texlive-module-mpgraphics-2019.tar.xz mirror://gentoo/texlive-module-mptrees-2019.tar.xz mirror://gentoo/texlive-module-piechartmp-2019.tar.xz mirror://gentoo/texlive-module-repere-2019.tar.xz mirror://gentoo/texlive-module-roex-2019.tar.xz mirror://gentoo/texlive-module-roundrect-2019.tar.xz mirror://gentoo/texlive-module-shapes-2019.tar.xz mirror://gentoo/texlive-module-slideshow-2019.tar.xz mirror://gentoo/texlive-module-splines-2019.tar.xz mirror://gentoo/texlive-module-suanpan-2019.tar.xz mirror://gentoo/texlive-module-textpath-2019.tar.xz mirror://gentoo/texlive-module-threeddice-2019.tar.xz mirror://gentoo/texlive-module-collection-metapost-2019.tar.xz doc? ( mirror://gentoo/texlive-module-automata.doc-2019.tar.xz mirror://gentoo/texlive-module-bbcard.doc-2019.tar.xz mirror://gentoo/texlive-module-blockdraw_mp.doc-2019.tar.xz mirror://gentoo/texlive-module-bpolynomial.doc-2019.tar.xz mirror://gentoo/texlive-module-cmarrows.doc-2019.tar.xz mirror://gentoo/texlive-module-drv.doc-2019.tar.xz mirror://gentoo/texlive-module-dviincl.doc-2019.tar.xz mirror://gentoo/texlive-module-emp.doc-2019.tar.xz mirror://gentoo/texlive-module-epsincl.doc-2019.tar.xz mirror://gentoo/texlive-module-expressg.doc-2019.tar.xz mirror://gentoo/texlive-module-exteps.doc-2019.tar.xz mirror://gentoo/texlive-module-featpost.doc-2019.tar.xz mirror://gentoo/texlive-module-feynmp-auto.doc-2019.tar.xz mirror://gentoo/texlive-module-fiziko.doc-2019.tar.xz mirror://gentoo/texlive-module-garrigues.doc-2019.tar.xz mirror://gentoo/texlive-module-gmp.doc-2019.tar.xz mirror://gentoo/texlive-module-hatching.doc-2019.tar.xz mirror://gentoo/texlive-module-latexmp.doc-2019.tar.xz mirror://gentoo/texlive-module-mcf2graph.doc-2019.tar.xz mirror://gentoo/texlive-module-metago.doc-2019.tar.xz mirror://gentoo/texlive-module-metaobj.doc-2019.tar.xz mirror://gentoo/texlive-module-metaplot.doc-2019.tar.xz mirror://gentoo/texlive-module-metapost.doc-2019.tar.xz mirror://gentoo/texlive-module-metapost-colorbrewer.doc-2019.tar.xz mirror://gentoo/texlive-module-metauml.doc-2019.tar.xz mirror://gentoo/texlive-module-mfpic.doc-2019.tar.xz mirror://gentoo/texlive-module-mfpic4ode.doc-2019.tar.xz mirror://gentoo/texlive-module-mp3d.doc-2019.tar.xz mirror://gentoo/texlive-module-mparrows.doc-2019.tar.xz mirror://gentoo/texlive-module-mpattern.doc-2019.tar.xz mirror://gentoo/texlive-module-mpcolornames.doc-2019.tar.xz mirror://gentoo/texlive-module-mpgraphics.doc-2019.tar.xz mirror://gentoo/texlive-module-mptrees.doc-2019.tar.xz mirror://gentoo/texlive-module-piechartmp.doc-2019.tar.xz mirror://gentoo/texlive-module-repere.doc-2019.tar.xz mirror://gentoo/texlive-module-roundrect.doc-2019.tar.xz mirror://gentoo/texlive-module-shapes.doc-2019.tar.xz mirror://gentoo/texlive-module-slideshow.doc-2019.tar.xz mirror://gentoo/texlive-module-splines.doc-2019.tar.xz mirror://gentoo/texlive-module-suanpan.doc-2019.tar.xz mirror://gentoo/texlive-module-textpath.doc-2019.tar.xz mirror://gentoo/texlive-module-threeddice.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-emp.source-2019.tar.xz mirror://gentoo/texlive-module-expressg.source-2019.tar.xz mirror://gentoo/texlive-module-feynmp-auto.source-2019.tar.xz mirror://gentoo/texlive-module-gmp.source-2019.tar.xz mirror://gentoo/texlive-module-mfpic.source-2019.tar.xz mirror://gentoo/texlive-module-mfpic4ode.source-2019.tar.xz mirror://gentoo/texlive-module-mpcolornames.source-2019.tar.xz mirror://gentoo/texlive-module-mpgraphics.source-2019.tar.xz mirror://gentoo/texlive-module-roex.source-2019.tar.xz mirror://gentoo/texlive-module-roundrect.source-2019.tar.xz mirror://gentoo/texlive-module-shapes.source-2019.tar.xz mirror://gentoo/texlive-module-splines.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
-_md5_=097145489c024579f99beeca6a4dc83b
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
+_md5_=fc97ad73fdb8f56894c1d3bed9377004
diff --git a/metadata/md5-cache/dev-texlive/texlive-music-2019 b/metadata/md5-cache/dev-texlive/texlive-music-2019
index c4105bbf57c5..d0a43e025e70 100644
--- a/metadata/md5-cache/dev-texlive/texlive-music-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-music-2019
@@ -10,5 +10,5 @@ LICENSE=FDL-1.1 GPL-1 GPL-2 GPL-2+
 RDEPEND=>=dev-texlive/texlive-latex-2019 !<dev-texlive/texlive-pictures-2015 !<dev-texlive/texlive-genericextra-2015 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abc-2019.tar.xz mirror://gentoo/texlive-module-autosp-2019.tar.xz mirror://gentoo/texlive-module-bagpipe-2019.tar.xz mirror://gentoo/texlive-module-chordbars-2019.tar.xz mirror://gentoo/texlive-module-chordbox-2019.tar.xz mirror://gentoo/texlive-module-figbas-2019.tar.xz mirror://gentoo/texlive-module-gchords-2019.tar.xz mirror://gentoo/texlive-module-gregoriotex-2019.tar.xz mirror://gentoo/texlive-module-gtrcrd-2019.tar.xz mirror://gentoo/texlive-module-guitar-2019.tar.xz mirror://gentoo/texlive-module-guitarchordschemes-2019.tar.xz mirror://gentoo/texlive-module-guitartabs-2019.tar.xz mirror://gentoo/texlive-module-harmony-2019.tar.xz mirror://gentoo/texlive-module-leadsheets-2019.tar.xz mirror://gentoo/texlive-module-latex4musicians-2019.tar.xz mirror://gentoo/texlive-module-lilyglyphs-2019.tar.xz mirror://gentoo/texlive-module-lyluatex-2019.tar.xz mirror://gentoo/texlive-module-m-tx-2019.tar.xz mirror://gentoo/texlive-module-musicography-2019.tar.xz mirror://gentoo/texlive-module-musixguit-2019.tar.xz mirror://gentoo/texlive-module-musixtex-2019.tar.xz mirror://gentoo/texlive-module-musixtex-fonts-2019.tar.xz mirror://gentoo/texlive-module-musixtnt-2019.tar.xz mirror://gentoo/texlive-module-octave-2019.tar.xz mirror://gentoo/texlive-module-piano-2019.tar.xz mirror://gentoo/texlive-module-pmx-2019.tar.xz mirror://gentoo/texlive-module-pmxchords-2019.tar.xz mirror://gentoo/texlive-module-songbook-2019.tar.xz mirror://gentoo/texlive-module-songs-2019.tar.xz mirror://gentoo/texlive-module-xpiano-2019.tar.xz mirror://gentoo/texlive-module-collection-music-2019.tar.xz doc? ( mirror://gentoo/texlive-module-abc.doc-2019.tar.xz mirror://gentoo/texlive-module-autosp.doc-2019.tar.xz mirror://gentoo/texlive-module-bagpipe.doc-2019.tar.xz mirror://gentoo/texlive-module-chordbars.doc-2019.tar.xz mirror://gentoo/texlive-module-chordbox.doc-2019.tar.xz mirror://gentoo/texlive-module-figbas.doc-2019.tar.xz mirror://gentoo/texlive-module-gchords.doc-2019.tar.xz mirror://gentoo/texlive-module-gregoriotex.doc-2019.tar.xz mirror://gentoo/texlive-module-gtrcrd.doc-2019.tar.xz mirror://gentoo/texlive-module-guitar.doc-2019.tar.xz mirror://gentoo/texlive-module-guitarchordschemes.doc-2019.tar.xz mirror://gentoo/texlive-module-guitartabs.doc-2019.tar.xz mirror://gentoo/texlive-module-harmony.doc-2019.tar.xz mirror://gentoo/texlive-module-leadsheets.doc-2019.tar.xz mirror://gentoo/texlive-module-latex4musicians.doc-2019.tar.xz mirror://gentoo/texlive-module-lilyglyphs.doc-2019.tar.xz mirror://gentoo/texlive-module-lyluatex.doc-2019.tar.xz mirror://gentoo/texlive-module-m-tx.doc-2019.tar.xz mirror://gentoo/texlive-module-musicography.doc-2019.tar.xz mirror://gentoo/texlive-module-musixguit.doc-2019.tar.xz mirror://gentoo/texlive-module-musixtex.doc-2019.tar.xz mirror://gentoo/texlive-module-musixtex-fonts.doc-2019.tar.xz mirror://gentoo/texlive-module-musixtnt.doc-2019.tar.xz mirror://gentoo/texlive-module-octave.doc-2019.tar.xz mirror://gentoo/texlive-module-piano.doc-2019.tar.xz mirror://gentoo/texlive-module-pmx.doc-2019.tar.xz mirror://gentoo/texlive-module-pmxchords.doc-2019.tar.xz mirror://gentoo/texlive-module-songbook.doc-2019.tar.xz mirror://gentoo/texlive-module-songs.doc-2019.tar.xz mirror://gentoo/texlive-module-xpiano.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-abc.source-2019.tar.xz mirror://gentoo/texlive-module-guitar.source-2019.tar.xz mirror://gentoo/texlive-module-lilyglyphs.source-2019.tar.xz mirror://gentoo/texlive-module-musixtex.source-2019.tar.xz mirror://gentoo/texlive-module-songbook.source-2019.tar.xz mirror://gentoo/texlive-module-songs.source-2019.tar.xz mirror://gentoo/texlive-module-xpiano.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=5095ebbcfed31587dd66d3e32c3afbbf
diff --git a/metadata/md5-cache/dev-texlive/texlive-pictures-2019 b/metadata/md5-cache/dev-texlive/texlive-pictures-2019
index a6b52930e6d1..f2235eea1259 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pictures-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-pictures-2019
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD-2 GPL-2 CC-BY-SA-4.0
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-tex/pgf-3.0.1 !=dev-texlive/texlive-luatex-2017* >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-adigraph-2019.tar.xz mirror://gentoo/texlive-module-aobs-tikz-2019.tar.xz mirror://gentoo/texlive-module-askmaps-2019.tar.xz mirror://gentoo/texlive-module-asyfig-2019.tar.xz mirror://gentoo/texlive-module-asypictureb-2019.tar.xz mirror://gentoo/texlive-module-autoarea-2019.tar.xz mirror://gentoo/texlive-module-bardiag-2019.tar.xz mirror://gentoo/texlive-module-beamerswitch-2019.tar.xz mirror://gentoo/texlive-module-binarytree-2019.tar.xz mirror://gentoo/texlive-module-blochsphere-2019.tar.xz mirror://gentoo/texlive-module-bloques-2019.tar.xz mirror://gentoo/texlive-module-blox-2019.tar.xz mirror://gentoo/texlive-module-bodegraph-2019.tar.xz mirror://gentoo/texlive-module-bondgraph-2019.tar.xz mirror://gentoo/texlive-module-bondgraphs-2019.tar.xz mirror://gentoo/texlive-module-braids-2019.tar.xz mirror://gentoo/texlive-module-bxeepic-2019.tar.xz mirror://gentoo/texlive-module-cachepic-2019.tar.xz mirror://gentoo/texlive-module-callouts-2019.tar.xz mirror://gentoo/texlive-module-celtic-2019.tar.xz mirror://gentoo/texlive-module-chemfig-2019.tar.xz mirror://gentoo/texlive-module-combinedgraphics-2019.tar.xz mirror://gentoo/texlive-module-circuitikz-2019.tar.xz mirror://gentoo/texlive-module-curve-2019.tar.xz mirror://gentoo/texlive-module-curve2e-2019.tar.xz mirror://gentoo/texlive-module-curves-2019.tar.xz mirror://gentoo/texlive-module-dcpic-2019.tar.xz mirror://gentoo/texlive-module-diagmac2-2019.tar.xz mirror://gentoo/texlive-module-ditaa-2019.tar.xz mirror://gentoo/texlive-module-doc-pictex-2019.tar.xz mirror://gentoo/texlive-module-dottex-2019.tar.xz mirror://gentoo/texlive-module-dratex-2019.tar.xz mirror://gentoo/texlive-module-drs-2019.tar.xz mirror://gentoo/texlive-module-duotenzor-2019.tar.xz mirror://gentoo/texlive-module-dynkin-diagrams-2019.tar.xz mirror://gentoo/texlive-module-ecgdraw-2019.tar.xz mirror://gentoo/texlive-module-eepic-2019.tar.xz mirror://gentoo/texlive-module-ellipse-2019.tar.xz mirror://gentoo/texlive-module-endofproofwd-2019.tar.xz mirror://gentoo/texlive-module-epspdfconversion-2019.tar.xz mirror://gentoo/texlive-module-esk-2019.tar.xz mirror://gentoo/texlive-module-euflag-2019.tar.xz mirror://gentoo/texlive-module-fast-diagram-2019.tar.xz mirror://gentoo/texlive-module-fig4latex-2019.tar.xz mirror://gentoo/texlive-module-fitbox-2019.tar.xz mirror://gentoo/texlive-module-flowchart-2019.tar.xz mirror://gentoo/texlive-module-forest-2019.tar.xz mirror://gentoo/texlive-module-genealogytree-2019.tar.xz mirror://gentoo/texlive-module-getmap-2019.tar.xz mirror://gentoo/texlive-module-gincltex-2019.tar.xz mirror://gentoo/texlive-module-gnuplottex-2019.tar.xz mirror://gentoo/texlive-module-gradientframe-2019.tar.xz mirror://gentoo/texlive-module-grafcet-2019.tar.xz mirror://gentoo/texlive-module-graph35-2019.tar.xz mirror://gentoo/texlive-module-graphicxpsd-2019.tar.xz mirror://gentoo/texlive-module-graphviz-2019.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees-2019.tar.xz mirror://gentoo/texlive-module-harveyballs-2019.tar.xz mirror://gentoo/texlive-module-here-2019.tar.xz mirror://gentoo/texlive-module-hf-tikz-2019.tar.xz mirror://gentoo/texlive-module-hobby-2019.tar.xz mirror://gentoo/texlive-module-hvfloat-2019.tar.xz mirror://gentoo/texlive-module-istgame-2019.tar.xz mirror://gentoo/texlive-module-knitting-2019.tar.xz mirror://gentoo/texlive-module-knittingpattern-2019.tar.xz mirror://gentoo/texlive-module-ladder-2019.tar.xz mirror://gentoo/texlive-module-lapdf-2019.tar.xz mirror://gentoo/texlive-module-latex-make-2019.tar.xz mirror://gentoo/texlive-module-lpic-2019.tar.xz mirror://gentoo/texlive-module-lroundrect-2019.tar.xz mirror://gentoo/texlive-module-luamesh-2019.tar.xz mirror://gentoo/texlive-module-luasseq-2019.tar.xz mirror://gentoo/texlive-module-maker-2019.tar.xz mirror://gentoo/texlive-module-makeshape-2019.tar.xz mirror://gentoo/texlive-module-mathspic-2019.tar.xz mirror://gentoo/texlive-module-milsymb-2019.tar.xz mirror://gentoo/texlive-module-miniplot-2019.tar.xz mirror://gentoo/texlive-module-mkpic-2019.tar.xz mirror://gentoo/texlive-module-modiagram-2019.tar.xz mirror://gentoo/texlive-module-neuralnetwork-2019.tar.xz mirror://gentoo/texlive-module-numericplots-2019.tar.xz mirror://gentoo/texlive-module-pb-diagram-2019.tar.xz mirror://gentoo/texlive-module-penrose-2019.tar.xz mirror://gentoo/texlive-module-petri-nets-2019.tar.xz mirror://gentoo/texlive-module-pgf-blur-2019.tar.xz mirror://gentoo/texlive-module-pgf-cmykshadings-2019.tar.xz mirror://gentoo/texlive-module-pgf-soroban-2019.tar.xz mirror://gentoo/texlive-module-pgf-spectra-2019.tar.xz mirror://gentoo/texlive-module-pgf-umlcd-2019.tar.xz mirror://gentoo/texlive-module-pgf-umlsd-2019.tar.xz mirror://gentoo/texlive-module-pgfgantt-2019.tar.xz mirror://gentoo/texlive-module-pgfkeyx-2019.tar.xz mirror://gentoo/texlive-module-pgfmolbio-2019.tar.xz mirror://gentoo/texlive-module-pgfmorepages-2019.tar.xz mirror://gentoo/texlive-module-pgfopts-2019.tar.xz mirror://gentoo/texlive-module-pgfornament-2019.tar.xz mirror://gentoo/texlive-module-pgfplots-2019.tar.xz mirror://gentoo/texlive-module-picinpar-2019.tar.xz mirror://gentoo/texlive-module-pict2e-2019.tar.xz mirror://gentoo/texlive-module-pictex-2019.tar.xz mirror://gentoo/texlive-module-pictex2-2019.tar.xz mirror://gentoo/texlive-module-pinlabel-2019.tar.xz mirror://gentoo/texlive-module-pixelart-2019.tar.xz mirror://gentoo/texlive-module-pmgraph-2019.tar.xz mirror://gentoo/texlive-module-postage-2019.tar.xz mirror://gentoo/texlive-module-prerex-2019.tar.xz mirror://gentoo/texlive-module-productbox-2019.tar.xz mirror://gentoo/texlive-module-ptolemaicastronomy-2019.tar.xz mirror://gentoo/texlive-module-pxpgfmark-2019.tar.xz mirror://gentoo/texlive-module-qcircuit-2019.tar.xz mirror://gentoo/texlive-module-quantikz-2019.tar.xz mirror://gentoo/texlive-module-qrcode-2019.tar.xz mirror://gentoo/texlive-module-randbild-2019.tar.xz mirror://gentoo/texlive-module-randomwalk-2019.tar.xz mirror://gentoo/texlive-module-realhats-2019.tar.xz mirror://gentoo/texlive-module-reotex-2019.tar.xz mirror://gentoo/texlive-module-rviewport-2019.tar.xz mirror://gentoo/texlive-module-sa-tikz-2019.tar.xz mirror://gentoo/texlive-module-schemabloc-2019.tar.xz mirror://gentoo/texlive-module-scsnowman-2019.tar.xz mirror://gentoo/texlive-module-scratch-2019.tar.xz mirror://gentoo/texlive-module-scratch3-2019.tar.xz mirror://gentoo/texlive-module-setdeck-2019.tar.xz mirror://gentoo/texlive-module-signchart-2019.tar.xz mirror://gentoo/texlive-module-smartdiagram-2019.tar.xz mirror://gentoo/texlive-module-spath3-2019.tar.xz mirror://gentoo/texlive-module-spectralsequences-2019.tar.xz mirror://gentoo/texlive-module-swimgraf-2019.tar.xz mirror://gentoo/texlive-module-table-fct-2019.tar.xz mirror://gentoo/texlive-module-texdraw-2019.tar.xz mirror://gentoo/texlive-module-ticollege-2019.tar.xz mirror://gentoo/texlive-module-tipfr-2019.tar.xz mirror://gentoo/texlive-module-tikz-3dplot-2019.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet-2019.tar.xz mirror://gentoo/texlive-module-tikz-cd-2019.tar.xz mirror://gentoo/texlive-module-tikz-dependency-2019.tar.xz mirror://gentoo/texlive-module-tikz-dimline-2019.tar.xz mirror://gentoo/texlive-module-tikz-feynhand-2019.tar.xz mirror://gentoo/texlive-module-tikz-feynman-2019.tar.xz mirror://gentoo/texlive-module-tikz-imagelabels-2019.tar.xz mirror://gentoo/texlive-module-tikz-inet-2019.tar.xz mirror://gentoo/texlive-module-tikz-kalender-2019.tar.xz mirror://gentoo/texlive-module-tikz-karnaugh-2019.tar.xz mirror://gentoo/texlive-module-tikz-ladder-2019.tar.xz mirror://gentoo/texlive-module-tikz-layers-2019.tar.xz mirror://gentoo/texlive-module-tikz-nef-2019.tar.xz mirror://gentoo/texlive-module-tikz-network-2019.tar.xz mirror://gentoo/texlive-module-tikz-opm-2019.tar.xz mirror://gentoo/texlive-module-tikz-optics-2019.tar.xz mirror://gentoo/texlive-module-tikz-page-2019.tar.xz mirror://gentoo/texlive-module-tikz-palattice-2019.tar.xz mirror://gentoo/texlive-module-tikz-qtree-2019.tar.xz mirror://gentoo/texlive-module-tikz-relay-2019.tar.xz mirror://gentoo/texlive-module-tikz-sfc-2019.tar.xz mirror://gentoo/texlive-module-tikz-timing-2019.tar.xz mirror://gentoo/texlive-module-tikz-truchet-2019.tar.xz mirror://gentoo/texlive-module-tikzcodeblocks-2019.tar.xz mirror://gentoo/texlive-module-tikzducks-2019.tar.xz mirror://gentoo/texlive-module-tikzinclude-2019.tar.xz mirror://gentoo/texlive-module-tikzlings-2019.tar.xz mirror://gentoo/texlive-module-tikzmark-2019.tar.xz mirror://gentoo/texlive-module-tikzmarmots-2019.tar.xz mirror://gentoo/texlive-module-tikzorbital-2019.tar.xz mirror://gentoo/texlive-module-tikzpagenodes-2019.tar.xz mirror://gentoo/texlive-module-tikzpfeile-2019.tar.xz mirror://gentoo/texlive-module-tikzpeople-2019.tar.xz mirror://gentoo/texlive-module-tikzposter-2019.tar.xz mirror://gentoo/texlive-module-tikzscale-2019.tar.xz mirror://gentoo/texlive-module-tikzsymbols-2019.tar.xz mirror://gentoo/texlive-module-timing-diagrams-2019.tar.xz mirror://gentoo/texlive-module-tqft-2019.tar.xz mirror://gentoo/texlive-module-tkz-base-2019.tar.xz mirror://gentoo/texlive-module-tkz-berge-2019.tar.xz mirror://gentoo/texlive-module-tkz-doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-euclide-2019.tar.xz mirror://gentoo/texlive-module-tkz-fct-2019.tar.xz mirror://gentoo/texlive-module-tkz-graph-2019.tar.xz mirror://gentoo/texlive-module-tkz-kiviat-2019.tar.xz mirror://gentoo/texlive-module-tkz-linknodes-2019.tar.xz mirror://gentoo/texlive-module-tkz-orm-2019.tar.xz mirror://gentoo/texlive-module-tkz-tab-2019.tar.xz mirror://gentoo/texlive-module-tsemlines-2019.tar.xz mirror://gentoo/texlive-module-tufte-latex-2019.tar.xz mirror://gentoo/texlive-module-venndiagram-2019.tar.xz mirror://gentoo/texlive-module-visualpstricks-2019.tar.xz mirror://gentoo/texlive-module-xpicture-2019.tar.xz mirror://gentoo/texlive-module-xypic-2019.tar.xz mirror://gentoo/texlive-module-collection-pictures-2019.tar.xz doc? ( mirror://gentoo/texlive-module-adigraph.doc-2019.tar.xz mirror://gentoo/texlive-module-aobs-tikz.doc-2019.tar.xz mirror://gentoo/texlive-module-askmaps.doc-2019.tar.xz mirror://gentoo/texlive-module-asyfig.doc-2019.tar.xz mirror://gentoo/texlive-module-asypictureb.doc-2019.tar.xz mirror://gentoo/texlive-module-autoarea.doc-2019.tar.xz mirror://gentoo/texlive-module-bardiag.doc-2019.tar.xz mirror://gentoo/texlive-module-beamerswitch.doc-2019.tar.xz mirror://gentoo/texlive-module-binarytree.doc-2019.tar.xz mirror://gentoo/texlive-module-blochsphere.doc-2019.tar.xz mirror://gentoo/texlive-module-bloques.doc-2019.tar.xz mirror://gentoo/texlive-module-blox.doc-2019.tar.xz mirror://gentoo/texlive-module-bodegraph.doc-2019.tar.xz mirror://gentoo/texlive-module-bondgraph.doc-2019.tar.xz mirror://gentoo/texlive-module-bondgraphs.doc-2019.tar.xz mirror://gentoo/texlive-module-braids.doc-2019.tar.xz mirror://gentoo/texlive-module-bxeepic.doc-2019.tar.xz mirror://gentoo/texlive-module-cachepic.doc-2019.tar.xz mirror://gentoo/texlive-module-callouts.doc-2019.tar.xz mirror://gentoo/texlive-module-celtic.doc-2019.tar.xz mirror://gentoo/texlive-module-chemfig.doc-2019.tar.xz mirror://gentoo/texlive-module-combinedgraphics.doc-2019.tar.xz mirror://gentoo/texlive-module-circuitikz.doc-2019.tar.xz mirror://gentoo/texlive-module-curve.doc-2019.tar.xz mirror://gentoo/texlive-module-curve2e.doc-2019.tar.xz mirror://gentoo/texlive-module-curves.doc-2019.tar.xz mirror://gentoo/texlive-module-dcpic.doc-2019.tar.xz mirror://gentoo/texlive-module-diagmac2.doc-2019.tar.xz mirror://gentoo/texlive-module-ditaa.doc-2019.tar.xz mirror://gentoo/texlive-module-doc-pictex.doc-2019.tar.xz mirror://gentoo/texlive-module-dottex.doc-2019.tar.xz mirror://gentoo/texlive-module-dratex.doc-2019.tar.xz mirror://gentoo/texlive-module-drs.doc-2019.tar.xz mirror://gentoo/texlive-module-duotenzor.doc-2019.tar.xz mirror://gentoo/texlive-module-dynkin-diagrams.doc-2019.tar.xz mirror://gentoo/texlive-module-ecgdraw.doc-2019.tar.xz mirror://gentoo/texlive-module-eepic.doc-2019.tar.xz mirror://gentoo/texlive-module-ellipse.doc-2019.tar.xz mirror://gentoo/texlive-module-endofproofwd.doc-2019.tar.xz mirror://gentoo/texlive-module-epspdfconversion.doc-2019.tar.xz mirror://gentoo/texlive-module-esk.doc-2019.tar.xz mirror://gentoo/texlive-module-euflag.doc-2019.tar.xz mirror://gentoo/texlive-module-fast-diagram.doc-2019.tar.xz mirror://gentoo/texlive-module-fig4latex.doc-2019.tar.xz mirror://gentoo/texlive-module-fitbox.doc-2019.tar.xz mirror://gentoo/texlive-module-flowchart.doc-2019.tar.xz mirror://gentoo/texlive-module-forest.doc-2019.tar.xz mirror://gentoo/texlive-module-genealogytree.doc-2019.tar.xz mirror://gentoo/texlive-module-getmap.doc-2019.tar.xz mirror://gentoo/texlive-module-gincltex.doc-2019.tar.xz mirror://gentoo/texlive-module-gnuplottex.doc-2019.tar.xz mirror://gentoo/texlive-module-gradientframe.doc-2019.tar.xz mirror://gentoo/texlive-module-grafcet.doc-2019.tar.xz mirror://gentoo/texlive-module-graph35.doc-2019.tar.xz mirror://gentoo/texlive-module-graphicxpsd.doc-2019.tar.xz mirror://gentoo/texlive-module-graphviz.doc-2019.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.doc-2019.tar.xz mirror://gentoo/texlive-module-harveyballs.doc-2019.tar.xz mirror://gentoo/texlive-module-here.doc-2019.tar.xz mirror://gentoo/texlive-module-hf-tikz.doc-2019.tar.xz mirror://gentoo/texlive-module-hobby.doc-2019.tar.xz mirror://gentoo/texlive-module-hvfloat.doc-2019.tar.xz mirror://gentoo/texlive-module-istgame.doc-2019.tar.xz mirror://gentoo/texlive-module-knitting.doc-2019.tar.xz mirror://gentoo/texlive-module-knittingpattern.doc-2019.tar.xz mirror://gentoo/texlive-module-ladder.doc-2019.tar.xz mirror://gentoo/texlive-module-lapdf.doc-2019.tar.xz mirror://gentoo/texlive-module-latex-make.doc-2019.tar.xz mirror://gentoo/texlive-module-lpic.doc-2019.tar.xz mirror://gentoo/texlive-module-lroundrect.doc-2019.tar.xz mirror://gentoo/texlive-module-luamesh.doc-2019.tar.xz mirror://gentoo/texlive-module-luasseq.doc-2019.tar.xz mirror://gentoo/texlive-module-maker.doc-2019.tar.xz mirror://gentoo/texlive-module-makeshape.doc-2019.tar.xz mirror://gentoo/texlive-module-mathspic.doc-2019.tar.xz mirror://gentoo/texlive-module-milsymb.doc-2019.tar.xz mirror://gentoo/texlive-module-miniplot.doc-2019.tar.xz mirror://gentoo/texlive-module-mkpic.doc-2019.tar.xz mirror://gentoo/texlive-module-modiagram.doc-2019.tar.xz mirror://gentoo/texlive-module-neuralnetwork.doc-2019.tar.xz mirror://gentoo/texlive-module-numericplots.doc-2019.tar.xz mirror://gentoo/texlive-module-pb-diagram.doc-2019.tar.xz mirror://gentoo/texlive-module-penrose.doc-2019.tar.xz mirror://gentoo/texlive-module-petri-nets.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-blur.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-cmykshadings.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-soroban.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-spectra.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-umlcd.doc-2019.tar.xz mirror://gentoo/texlive-module-pgf-umlsd.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfgantt.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfkeyx.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfmolbio.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfmorepages.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfopts.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfornament.doc-2019.tar.xz mirror://gentoo/texlive-module-pgfplots.doc-2019.tar.xz mirror://gentoo/texlive-module-picinpar.doc-2019.tar.xz mirror://gentoo/texlive-module-pict2e.doc-2019.tar.xz mirror://gentoo/texlive-module-pictex.doc-2019.tar.xz mirror://gentoo/texlive-module-pinlabel.doc-2019.tar.xz mirror://gentoo/texlive-module-pixelart.doc-2019.tar.xz mirror://gentoo/texlive-module-pmgraph.doc-2019.tar.xz mirror://gentoo/texlive-module-postage.doc-2019.tar.xz mirror://gentoo/texlive-module-prerex.doc-2019.tar.xz mirror://gentoo/texlive-module-productbox.doc-2019.tar.xz mirror://gentoo/texlive-module-ptolemaicastronomy.doc-2019.tar.xz mirror://gentoo/texlive-module-pxpgfmark.doc-2019.tar.xz mirror://gentoo/texlive-module-qcircuit.doc-2019.tar.xz mirror://gentoo/texlive-module-quantikz.doc-2019.tar.xz mirror://gentoo/texlive-module-qrcode.doc-2019.tar.xz mirror://gentoo/texlive-module-randbild.doc-2019.tar.xz mirror://gentoo/texlive-module-randomwalk.doc-2019.tar.xz mirror://gentoo/texlive-module-realhats.doc-2019.tar.xz mirror://gentoo/texlive-module-reotex.doc-2019.tar.xz mirror://gentoo/texlive-module-rviewport.doc-2019.tar.xz mirror://gentoo/texlive-module-sa-tikz.doc-2019.tar.xz mirror://gentoo/texlive-module-schemabloc.doc-2019.tar.xz mirror://gentoo/texlive-module-scsnowman.doc-2019.tar.xz mirror://gentoo/texlive-module-scratch.doc-2019.tar.xz mirror://gentoo/texlive-module-scratch3.doc-2019.tar.xz mirror://gentoo/texlive-module-setdeck.doc-2019.tar.xz mirror://gentoo/texlive-module-signchart.doc-2019.tar.xz mirror://gentoo/texlive-module-smartdiagram.doc-2019.tar.xz mirror://gentoo/texlive-module-spath3.doc-2019.tar.xz mirror://gentoo/texlive-module-spectralsequences.doc-2019.tar.xz mirror://gentoo/texlive-module-swimgraf.doc-2019.tar.xz mirror://gentoo/texlive-module-table-fct.doc-2019.tar.xz mirror://gentoo/texlive-module-texdraw.doc-2019.tar.xz mirror://gentoo/texlive-module-ticollege.doc-2019.tar.xz mirror://gentoo/texlive-module-tipfr.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-3dplot.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-bayesnet.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-cd.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-dependency.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-dimline.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-feynhand.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-feynman.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-imagelabels.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-inet.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-kalender.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-karnaugh.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-ladder.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-layers.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-nef.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-network.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-opm.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-optics.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-page.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-palattice.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-qtree.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-relay.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-sfc.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-timing.doc-2019.tar.xz mirror://gentoo/texlive-module-tikz-truchet.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzcodeblocks.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzducks.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzinclude.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzlings.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzmark.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzmarmots.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzorbital.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzpfeile.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzpeople.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzposter.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzscale.doc-2019.tar.xz mirror://gentoo/texlive-module-tikzsymbols.doc-2019.tar.xz mirror://gentoo/texlive-module-timing-diagrams.doc-2019.tar.xz mirror://gentoo/texlive-module-tqft.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-base.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-berge.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-doc.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-euclide.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-fct.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-graph.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-kiviat.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-linknodes.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-orm.doc-2019.tar.xz mirror://gentoo/texlive-module-tkz-tab.doc-2019.tar.xz mirror://gentoo/texlive-module-tufte-latex.doc-2019.tar.xz mirror://gentoo/texlive-module-venndiagram.doc-2019.tar.xz mirror://gentoo/texlive-module-visualpstricks.doc-2019.tar.xz mirror://gentoo/texlive-module-xpicture.doc-2019.tar.xz mirror://gentoo/texlive-module-xypic.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-aobs-tikz.source-2019.tar.xz mirror://gentoo/texlive-module-asyfig.source-2019.tar.xz mirror://gentoo/texlive-module-asypictureb.source-2019.tar.xz mirror://gentoo/texlive-module-beamerswitch.source-2019.tar.xz mirror://gentoo/texlive-module-binarytree.source-2019.tar.xz mirror://gentoo/texlive-module-blochsphere.source-2019.tar.xz mirror://gentoo/texlive-module-blox.source-2019.tar.xz mirror://gentoo/texlive-module-bondgraphs.source-2019.tar.xz mirror://gentoo/texlive-module-braids.source-2019.tar.xz mirror://gentoo/texlive-module-celtic.source-2019.tar.xz mirror://gentoo/texlive-module-combinedgraphics.source-2019.tar.xz mirror://gentoo/texlive-module-curve.source-2019.tar.xz mirror://gentoo/texlive-module-curve2e.source-2019.tar.xz mirror://gentoo/texlive-module-curves.source-2019.tar.xz mirror://gentoo/texlive-module-dottex.source-2019.tar.xz mirror://gentoo/texlive-module-ecgdraw.source-2019.tar.xz mirror://gentoo/texlive-module-ellipse.source-2019.tar.xz mirror://gentoo/texlive-module-esk.source-2019.tar.xz mirror://gentoo/texlive-module-euflag.source-2019.tar.xz mirror://gentoo/texlive-module-fitbox.source-2019.tar.xz mirror://gentoo/texlive-module-flowchart.source-2019.tar.xz mirror://gentoo/texlive-module-forest.source-2019.tar.xz mirror://gentoo/texlive-module-gincltex.source-2019.tar.xz mirror://gentoo/texlive-module-gnuplottex.source-2019.tar.xz mirror://gentoo/texlive-module-gradientframe.source-2019.tar.xz mirror://gentoo/texlive-module-graph35.source-2019.tar.xz mirror://gentoo/texlive-module-graphviz.source-2019.tar.xz mirror://gentoo/texlive-module-gtrlib-largetrees.source-2019.tar.xz mirror://gentoo/texlive-module-hf-tikz.source-2019.tar.xz mirror://gentoo/texlive-module-hobby.source-2019.tar.xz mirror://gentoo/texlive-module-latex-make.source-2019.tar.xz mirror://gentoo/texlive-module-lroundrect.source-2019.tar.xz mirror://gentoo/texlive-module-luasseq.source-2019.tar.xz mirror://gentoo/texlive-module-makeshape.source-2019.tar.xz mirror://gentoo/texlive-module-penrose.source-2019.tar.xz mirror://gentoo/texlive-module-pgf-blur.source-2019.tar.xz mirror://gentoo/texlive-module-pgf-cmykshadings.source-2019.tar.xz mirror://gentoo/texlive-module-pgfgantt.source-2019.tar.xz mirror://gentoo/texlive-module-pgfmolbio.source-2019.tar.xz mirror://gentoo/texlive-module-pgfopts.source-2019.tar.xz mirror://gentoo/texlive-module-pgfplots.source-2019.tar.xz mirror://gentoo/texlive-module-pict2e.source-2019.tar.xz mirror://gentoo/texlive-module-pixelart.source-2019.tar.xz mirror://gentoo/texlive-module-postage.source-2019.tar.xz mirror://gentoo/texlive-module-productbox.source-2019.tar.xz mirror://gentoo/texlive-module-ptolemaicastronomy.source-2019.tar.xz mirror://gentoo/texlive-module-qrcode.source-2019.tar.xz mirror://gentoo/texlive-module-randbild.source-2019.tar.xz mirror://gentoo/texlive-module-randomwalk.source-2019.tar.xz mirror://gentoo/texlive-module-realhats.source-2019.tar.xz mirror://gentoo/texlive-module-rviewport.source-2019.tar.xz mirror://gentoo/texlive-module-signchart.source-2019.tar.xz mirror://gentoo/texlive-module-smartdiagram.source-2019.tar.xz mirror://gentoo/texlive-module-spath3.source-2019.tar.xz mirror://gentoo/texlive-module-tikz-imagelabels.source-2019.tar.xz mirror://gentoo/texlive-module-tikz-page.source-2019.tar.xz mirror://gentoo/texlive-module-tikz-timing.source-2019.tar.xz mirror://gentoo/texlive-module-tikz-truchet.source-2019.tar.xz mirror://gentoo/texlive-module-tikzinclude.source-2019.tar.xz mirror://gentoo/texlive-module-tikzmark.source-2019.tar.xz mirror://gentoo/texlive-module-tikzpagenodes.source-2019.tar.xz mirror://gentoo/texlive-module-tikzpfeile.source-2019.tar.xz mirror://gentoo/texlive-module-tikzposter.source-2019.tar.xz mirror://gentoo/texlive-module-tikzscale.source-2019.tar.xz mirror://gentoo/texlive-module-tikzsymbols.source-2019.tar.xz mirror://gentoo/texlive-module-tqft.source-2019.tar.xz mirror://gentoo/texlive-module-venndiagram.source-2019.tar.xz mirror://gentoo/texlive-module-xpicture.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=bb4ba4a8103ead80ca45ad9671bb63ef
diff --git a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2019 b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2019
index 229c7c068757..2671e2dfb4d9 100644
--- a/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-plaingeneric-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 GPL-3 LPPL-1.3 LPPL-1.3c public-domain TeX TeX-other-free
 RDEPEND=>=dev-texlive/texlive-basic-2019 !dev-texlive/texlive-genericextra !dev-texlive/texlive-genericrecommended !dev-texlive/texlive-plainextra >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-abbr-2019.tar.xz mirror://gentoo/texlive-module-abstyles-2019.tar.xz mirror://gentoo/texlive-module-apnum-2019.tar.xz mirror://gentoo/texlive-module-autoaligne-2019.tar.xz mirror://gentoo/texlive-module-barr-2019.tar.xz mirror://gentoo/texlive-module-bitelist-2019.tar.xz mirror://gentoo/texlive-module-borceux-2019.tar.xz mirror://gentoo/texlive-module-c-pascal-2019.tar.xz mirror://gentoo/texlive-module-catcodes-2019.tar.xz mirror://gentoo/texlive-module-chronosys-2019.tar.xz mirror://gentoo/texlive-module-colorsep-2019.tar.xz mirror://gentoo/texlive-module-cweb-old-2019.tar.xz mirror://gentoo/texlive-module-dinat-2019.tar.xz mirror://gentoo/texlive-module-dirtree-2019.tar.xz mirror://gentoo/texlive-module-docbytex-2019.tar.xz mirror://gentoo/texlive-module-dowith-2019.tar.xz mirror://gentoo/texlive-module-eijkhout-2019.tar.xz mirror://gentoo/texlive-module-encxvlna-2019.tar.xz mirror://gentoo/texlive-module-epigram-2019.tar.xz mirror://gentoo/texlive-module-epsf-2019.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx-2019.tar.xz mirror://gentoo/texlive-module-fenixpar-2019.tar.xz mirror://gentoo/texlive-module-figflow-2019.tar.xz mirror://gentoo/texlive-module-fixpdfmag-2019.tar.xz mirror://gentoo/texlive-module-fltpoint-2019.tar.xz mirror://gentoo/texlive-module-fntproof-2019.tar.xz mirror://gentoo/texlive-module-font-change-2019.tar.xz mirror://gentoo/texlive-module-fontch-2019.tar.xz mirror://gentoo/texlive-module-fontname-2019.tar.xz mirror://gentoo/texlive-module-gates-2019.tar.xz mirror://gentoo/texlive-module-genmisc-2019.tar.xz mirror://gentoo/texlive-module-getoptk-2019.tar.xz mirror://gentoo/texlive-module-gfnotation-2019.tar.xz mirror://gentoo/texlive-module-gobble-2019.tar.xz mirror://gentoo/texlive-module-graphics-pln-2019.tar.xz mirror://gentoo/texlive-module-gtl-2019.tar.xz mirror://gentoo/texlive-module-hlist-2019.tar.xz mirror://gentoo/texlive-module-hyplain-2019.tar.xz mirror://gentoo/texlive-module-ifetex-2019.tar.xz mirror://gentoo/texlive-module-iftex-2019.tar.xz mirror://gentoo/texlive-module-insbox-2019.tar.xz mirror://gentoo/texlive-module-js-misc-2019.tar.xz mirror://gentoo/texlive-module-kastrup-2019.tar.xz mirror://gentoo/texlive-module-lambda-lists-2019.tar.xz mirror://gentoo/texlive-module-langcode-2019.tar.xz mirror://gentoo/texlive-module-lecturer-2019.tar.xz mirror://gentoo/texlive-module-librarian-2019.tar.xz mirror://gentoo/texlive-module-listofitems-2019.tar.xz mirror://gentoo/texlive-module-mathdots-2019.tar.xz mirror://gentoo/texlive-module-metatex-2019.tar.xz mirror://gentoo/texlive-module-midnight-2019.tar.xz mirror://gentoo/texlive-module-mkpattern-2019.tar.xz mirror://gentoo/texlive-module-modulus-2019.tar.xz mirror://gentoo/texlive-module-multido-2019.tar.xz mirror://gentoo/texlive-module-navigator-2019.tar.xz mirror://gentoo/texlive-module-newsletr-2019.tar.xz mirror://gentoo/texlive-module-ofs-2019.tar.xz mirror://gentoo/texlive-module-olsak-misc-2019.tar.xz mirror://gentoo/texlive-module-path-2019.tar.xz mirror://gentoo/texlive-module-pdf-trans-2019.tar.xz mirror://gentoo/texlive-module-pitex-2019.tar.xz mirror://gentoo/texlive-module-placeins-plain-2019.tar.xz mirror://gentoo/texlive-module-plainpkg-2019.tar.xz mirror://gentoo/texlive-module-plipsum-2019.tar.xz mirror://gentoo/texlive-module-plnfss-2019.tar.xz mirror://gentoo/texlive-module-plstmary-2019.tar.xz mirror://gentoo/texlive-module-poormanlog-2019.tar.xz mirror://gentoo/texlive-module-present-2019.tar.xz mirror://gentoo/texlive-module-randomlist-2019.tar.xz mirror://gentoo/texlive-module-resumemac-2019.tar.xz mirror://gentoo/texlive-module-schemata-2019.tar.xz mirror://gentoo/texlive-module-shade-2019.tar.xz mirror://gentoo/texlive-module-simplekv-2019.tar.xz mirror://gentoo/texlive-module-systeme-2019.tar.xz mirror://gentoo/texlive-module-tabto-generic-2019.tar.xz mirror://gentoo/texlive-module-termmenu-2019.tar.xz mirror://gentoo/texlive-module-tex-ps-2019.tar.xz mirror://gentoo/texlive-module-tex4ht-2019.tar.xz mirror://gentoo/texlive-module-texapi-2019.tar.xz mirror://gentoo/texlive-module-texdate-2019.tar.xz mirror://gentoo/texlive-module-texinfo-2019.tar.xz mirror://gentoo/texlive-module-timetable-2019.tar.xz mirror://gentoo/texlive-module-tracklang-2019.tar.xz mirror://gentoo/texlive-module-treetex-2019.tar.xz mirror://gentoo/texlive-module-trigonometry-2019.tar.xz mirror://gentoo/texlive-module-ulem-2019.tar.xz mirror://gentoo/texlive-module-upca-2019.tar.xz mirror://gentoo/texlive-module-varisize-2019.tar.xz mirror://gentoo/texlive-module-xii-2019.tar.xz mirror://gentoo/texlive-module-xii-lat-2019.tar.xz mirror://gentoo/texlive-module-xlop-2019.tar.xz mirror://gentoo/texlive-module-yax-2019.tar.xz mirror://gentoo/texlive-module-collection-plaingeneric-2019.tar.xz doc? ( mirror://gentoo/texlive-module-abbr.doc-2019.tar.xz mirror://gentoo/texlive-module-abstyles.doc-2019.tar.xz mirror://gentoo/texlive-module-apnum.doc-2019.tar.xz mirror://gentoo/texlive-module-autoaligne.doc-2019.tar.xz mirror://gentoo/texlive-module-barr.doc-2019.tar.xz mirror://gentoo/texlive-module-bitelist.doc-2019.tar.xz mirror://gentoo/texlive-module-borceux.doc-2019.tar.xz mirror://gentoo/texlive-module-c-pascal.doc-2019.tar.xz mirror://gentoo/texlive-module-catcodes.doc-2019.tar.xz mirror://gentoo/texlive-module-chronosys.doc-2019.tar.xz mirror://gentoo/texlive-module-dinat.doc-2019.tar.xz mirror://gentoo/texlive-module-dirtree.doc-2019.tar.xz mirror://gentoo/texlive-module-docbytex.doc-2019.tar.xz mirror://gentoo/texlive-module-dowith.doc-2019.tar.xz mirror://gentoo/texlive-module-encxvlna.doc-2019.tar.xz mirror://gentoo/texlive-module-epsf.doc-2019.tar.xz mirror://gentoo/texlive-module-epsf-dvipdfmx.doc-2019.tar.xz mirror://gentoo/texlive-module-fenixpar.doc-2019.tar.xz mirror://gentoo/texlive-module-figflow.doc-2019.tar.xz mirror://gentoo/texlive-module-fltpoint.doc-2019.tar.xz mirror://gentoo/texlive-module-fntproof.doc-2019.tar.xz mirror://gentoo/texlive-module-font-change.doc-2019.tar.xz mirror://gentoo/texlive-module-fontch.doc-2019.tar.xz mirror://gentoo/texlive-module-fontname.doc-2019.tar.xz mirror://gentoo/texlive-module-gates.doc-2019.tar.xz mirror://gentoo/texlive-module-getoptk.doc-2019.tar.xz mirror://gentoo/texlive-module-gfnotation.doc-2019.tar.xz mirror://gentoo/texlive-module-gobble.doc-2019.tar.xz mirror://gentoo/texlive-module-graphics-pln.doc-2019.tar.xz mirror://gentoo/texlive-module-gtl.doc-2019.tar.xz mirror://gentoo/texlive-module-hlist.doc-2019.tar.xz mirror://gentoo/texlive-module-hyplain.doc-2019.tar.xz mirror://gentoo/texlive-module-ifetex.doc-2019.tar.xz mirror://gentoo/texlive-module-iftex.doc-2019.tar.xz mirror://gentoo/texlive-module-insbox.doc-2019.tar.xz mirror://gentoo/texlive-module-js-misc.doc-2019.tar.xz mirror://gentoo/texlive-module-kastrup.doc-2019.tar.xz mirror://gentoo/texlive-module-lambda-lists.doc-2019.tar.xz mirror://gentoo/texlive-module-langcode.doc-2019.tar.xz mirror://gentoo/texlive-module-lecturer.doc-2019.tar.xz mirror://gentoo/texlive-module-librarian.doc-2019.tar.xz mirror://gentoo/texlive-module-listofitems.doc-2019.tar.xz mirror://gentoo/texlive-module-mathdots.doc-2019.tar.xz mirror://gentoo/texlive-module-metatex.doc-2019.tar.xz mirror://gentoo/texlive-module-midnight.doc-2019.tar.xz mirror://gentoo/texlive-module-mkpattern.doc-2019.tar.xz mirror://gentoo/texlive-module-modulus.doc-2019.tar.xz mirror://gentoo/texlive-module-multido.doc-2019.tar.xz mirror://gentoo/texlive-module-navigator.doc-2019.tar.xz mirror://gentoo/texlive-module-newsletr.doc-2019.tar.xz mirror://gentoo/texlive-module-ofs.doc-2019.tar.xz mirror://gentoo/texlive-module-olsak-misc.doc-2019.tar.xz mirror://gentoo/texlive-module-path.doc-2019.tar.xz mirror://gentoo/texlive-module-pdf-trans.doc-2019.tar.xz mirror://gentoo/texlive-module-pitex.doc-2019.tar.xz mirror://gentoo/texlive-module-plainpkg.doc-2019.tar.xz mirror://gentoo/texlive-module-plipsum.doc-2019.tar.xz mirror://gentoo/texlive-module-plnfss.doc-2019.tar.xz mirror://gentoo/texlive-module-plstmary.doc-2019.tar.xz mirror://gentoo/texlive-module-poormanlog.doc-2019.tar.xz mirror://gentoo/texlive-module-present.doc-2019.tar.xz mirror://gentoo/texlive-module-randomlist.doc-2019.tar.xz mirror://gentoo/texlive-module-resumemac.doc-2019.tar.xz mirror://gentoo/texlive-module-schemata.doc-2019.tar.xz mirror://gentoo/texlive-module-shade.doc-2019.tar.xz mirror://gentoo/texlive-module-simplekv.doc-2019.tar.xz mirror://gentoo/texlive-module-systeme.doc-2019.tar.xz mirror://gentoo/texlive-module-termmenu.doc-2019.tar.xz mirror://gentoo/texlive-module-tex-ps.doc-2019.tar.xz mirror://gentoo/texlive-module-tex4ht.doc-2019.tar.xz mirror://gentoo/texlive-module-texapi.doc-2019.tar.xz mirror://gentoo/texlive-module-texdate.doc-2019.tar.xz mirror://gentoo/texlive-module-tracklang.doc-2019.tar.xz mirror://gentoo/texlive-module-treetex.doc-2019.tar.xz mirror://gentoo/texlive-module-trigonometry.doc-2019.tar.xz mirror://gentoo/texlive-module-ulem.doc-2019.tar.xz mirror://gentoo/texlive-module-upca.doc-2019.tar.xz mirror://gentoo/texlive-module-varisize.doc-2019.tar.xz mirror://gentoo/texlive-module-xii.doc-2019.tar.xz mirror://gentoo/texlive-module-xii-lat.doc-2019.tar.xz mirror://gentoo/texlive-module-xlop.doc-2019.tar.xz mirror://gentoo/texlive-module-yax.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-bitelist.source-2019.tar.xz mirror://gentoo/texlive-module-catcodes.source-2019.tar.xz mirror://gentoo/texlive-module-dirtree.source-2019.tar.xz mirror://gentoo/texlive-module-dowith.source-2019.tar.xz mirror://gentoo/texlive-module-fltpoint.source-2019.tar.xz mirror://gentoo/texlive-module-gobble.source-2019.tar.xz mirror://gentoo/texlive-module-gtl.source-2019.tar.xz mirror://gentoo/texlive-module-ifetex.source-2019.tar.xz mirror://gentoo/texlive-module-kastrup.source-2019.tar.xz mirror://gentoo/texlive-module-langcode.source-2019.tar.xz mirror://gentoo/texlive-module-mathdots.source-2019.tar.xz mirror://gentoo/texlive-module-modulus.source-2019.tar.xz mirror://gentoo/texlive-module-multido.source-2019.tar.xz mirror://gentoo/texlive-module-plainpkg.source-2019.tar.xz mirror://gentoo/texlive-module-randomlist.source-2019.tar.xz mirror://gentoo/texlive-module-schemata.source-2019.tar.xz mirror://gentoo/texlive-module-termmenu.source-2019.tar.xz mirror://gentoo/texlive-module-texdate.source-2019.tar.xz mirror://gentoo/texlive-module-tracklang.source-2019.tar.xz mirror://gentoo/texlive-module-xlop.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=fb82797cd2613017fcbfa1e97af15316
diff --git a/metadata/md5-cache/dev-texlive/texlive-pstricks-2019 b/metadata/md5-cache/dev-texlive/texlive-pstricks-2019
index 425cf845c775..78613e89677d 100644
--- a/metadata/md5-cache/dev-texlive/texlive-pstricks-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-pstricks-2019
@@ -10,5 +10,5 @@ LICENSE=GPL-1 GPL-2 LGPL-2 LGPL-3 LPPL-1.2 LPPL-1.3 LPPL-1.3c
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-plaingeneric-2019 !=dev-texlive/texlive-latexextra-2017* dev-tex/pgf >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-auto-pst-pdf-2019.tar.xz mirror://gentoo/texlive-module-bclogo-2019.tar.xz mirror://gentoo/texlive-module-dsptricks-2019.tar.xz mirror://gentoo/texlive-module-makeplot-2019.tar.xz mirror://gentoo/texlive-module-pdftricks-2019.tar.xz mirror://gentoo/texlive-module-pdftricks2-2019.tar.xz mirror://gentoo/texlive-module-pedigree-perl-2019.tar.xz mirror://gentoo/texlive-module-psbao-2019.tar.xz mirror://gentoo/texlive-module-pst-2dplot-2019.tar.xz mirror://gentoo/texlive-module-pst-3d-2019.tar.xz mirror://gentoo/texlive-module-pst-3dplot-2019.tar.xz mirror://gentoo/texlive-module-pst-abspos-2019.tar.xz mirror://gentoo/texlive-module-pst-arrow-2019.tar.xz mirror://gentoo/texlive-module-pst-am-2019.tar.xz mirror://gentoo/texlive-module-pst-antiprism-2019.tar.xz mirror://gentoo/texlive-module-pst-asr-2019.tar.xz mirror://gentoo/texlive-module-pst-bar-2019.tar.xz mirror://gentoo/texlive-module-pst-barcode-2019.tar.xz mirror://gentoo/texlive-module-pst-bezier-2019.tar.xz mirror://gentoo/texlive-module-pst-blur-2019.tar.xz mirror://gentoo/texlive-module-pst-bspline-2019.tar.xz mirror://gentoo/texlive-module-pst-calculate-2019.tar.xz mirror://gentoo/texlive-module-pst-calendar-2019.tar.xz mirror://gentoo/texlive-module-pst-cie-2019.tar.xz mirror://gentoo/texlive-module-pst-circ-2019.tar.xz mirror://gentoo/texlive-module-pst-coil-2019.tar.xz mirror://gentoo/texlive-module-pst-contourplot-2019.tar.xz mirror://gentoo/texlive-module-pst-cox-2019.tar.xz mirror://gentoo/texlive-module-pst-dart-2019.tar.xz mirror://gentoo/texlive-module-pst-dbicons-2019.tar.xz mirror://gentoo/texlive-module-pst-diffraction-2019.tar.xz mirror://gentoo/texlive-module-pst-electricfield-2019.tar.xz mirror://gentoo/texlive-module-pst-eps-2019.tar.xz mirror://gentoo/texlive-module-pst-eucl-2019.tar.xz mirror://gentoo/texlive-module-pst-exa-2019.tar.xz mirror://gentoo/texlive-module-pst-feyn-2019.tar.xz mirror://gentoo/texlive-module-pst-fill-2019.tar.xz mirror://gentoo/texlive-module-pst-fit-2019.tar.xz mirror://gentoo/texlive-module-pst-fr3d-2019.tar.xz mirror://gentoo/texlive-module-pst-fractal-2019.tar.xz mirror://gentoo/texlive-module-pst-fun-2019.tar.xz mirror://gentoo/texlive-module-pst-func-2019.tar.xz mirror://gentoo/texlive-module-pst-gantt-2019.tar.xz mirror://gentoo/texlive-module-pst-geo-2019.tar.xz mirror://gentoo/texlive-module-pst-geometrictools-2019.tar.xz mirror://gentoo/texlive-module-pst-ghsb-2019.tar.xz mirror://gentoo/texlive-module-pst-gr3d-2019.tar.xz mirror://gentoo/texlive-module-pst-grad-2019.tar.xz mirror://gentoo/texlive-module-pst-graphicx-2019.tar.xz mirror://gentoo/texlive-module-pst-infixplot-2019.tar.xz mirror://gentoo/texlive-module-pst-intersect-2019.tar.xz mirror://gentoo/texlive-module-pst-jtree-2019.tar.xz mirror://gentoo/texlive-module-pst-knot-2019.tar.xz mirror://gentoo/texlive-module-pst-labo-2019.tar.xz mirror://gentoo/texlive-module-pst-layout-2019.tar.xz mirror://gentoo/texlive-module-pst-lens-2019.tar.xz mirror://gentoo/texlive-module-pst-light3d-2019.tar.xz mirror://gentoo/texlive-module-pst-lsystem-2019.tar.xz mirror://gentoo/texlive-module-pst-magneticfield-2019.tar.xz mirror://gentoo/texlive-module-pst-marble-2019.tar.xz mirror://gentoo/texlive-module-pst-math-2019.tar.xz mirror://gentoo/texlive-module-pst-mirror-2019.tar.xz mirror://gentoo/texlive-module-pst-moire-2019.tar.xz mirror://gentoo/texlive-module-pst-node-2019.tar.xz mirror://gentoo/texlive-module-pst-ob3d-2019.tar.xz mirror://gentoo/texlive-module-pst-ode-2019.tar.xz mirror://gentoo/texlive-module-pst-optexp-2019.tar.xz mirror://gentoo/texlive-module-pst-optic-2019.tar.xz mirror://gentoo/texlive-module-pst-osci-2019.tar.xz mirror://gentoo/texlive-module-pst-ovl-2019.tar.xz mirror://gentoo/texlive-module-pst-pad-2019.tar.xz mirror://gentoo/texlive-module-pst-pdgr-2019.tar.xz mirror://gentoo/texlive-module-pst-pdf-2019.tar.xz mirror://gentoo/texlive-module-pst-perspective-2019.tar.xz mirror://gentoo/texlive-module-pst-platon-2019.tar.xz mirror://gentoo/texlive-module-pst-plot-2019.tar.xz mirror://gentoo/texlive-module-pst-poker-2019.tar.xz mirror://gentoo/texlive-module-pst-poly-2019.tar.xz mirror://gentoo/texlive-module-pst-pulley-2019.tar.xz mirror://gentoo/texlive-module-pst-qtree-2019.tar.xz mirror://gentoo/texlive-module-pst-rputover-2019.tar.xz mirror://gentoo/texlive-module-pst-rubans-2019.tar.xz mirror://gentoo/texlive-module-pst-shell-2019.tar.xz mirror://gentoo/texlive-module-pst-sigsys-2019.tar.xz mirror://gentoo/texlive-module-pst-slpe-2019.tar.xz mirror://gentoo/texlive-module-pst-solarsystem-2019.tar.xz mirror://gentoo/texlive-module-pst-solides3d-2019.tar.xz mirror://gentoo/texlive-module-pst-soroban-2019.tar.xz mirror://gentoo/texlive-module-pst-spectra-2019.tar.xz mirror://gentoo/texlive-module-pst-spinner-2019.tar.xz mirror://gentoo/texlive-module-pst-spirograph-2019.tar.xz mirror://gentoo/texlive-module-pst-stru-2019.tar.xz mirror://gentoo/texlive-module-pst-support-2019.tar.xz mirror://gentoo/texlive-module-pst-text-2019.tar.xz mirror://gentoo/texlive-module-pst-thick-2019.tar.xz mirror://gentoo/texlive-module-pst-tools-2019.tar.xz mirror://gentoo/texlive-module-pst-tree-2019.tar.xz mirror://gentoo/texlive-module-pst-tvz-2019.tar.xz mirror://gentoo/texlive-module-pst-uml-2019.tar.xz mirror://gentoo/texlive-module-pst-vectorian-2019.tar.xz mirror://gentoo/texlive-module-pst-vehicle-2019.tar.xz mirror://gentoo/texlive-module-pst-venn-2019.tar.xz mirror://gentoo/texlive-module-pst-vowel-2019.tar.xz mirror://gentoo/texlive-module-pst-vue3d-2019.tar.xz mirror://gentoo/texlive-module-pst2pdf-2019.tar.xz mirror://gentoo/texlive-module-pstricks-2019.tar.xz mirror://gentoo/texlive-module-pstricks-add-2019.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes-2019.tar.xz mirror://gentoo/texlive-module-uml-2019.tar.xz mirror://gentoo/texlive-module-vaucanson-g-2019.tar.xz mirror://gentoo/texlive-module-vocaltract-2019.tar.xz mirror://gentoo/texlive-module-collection-pstricks-2019.tar.xz doc? ( mirror://gentoo/texlive-module-auto-pst-pdf.doc-2019.tar.xz mirror://gentoo/texlive-module-bclogo.doc-2019.tar.xz mirror://gentoo/texlive-module-dsptricks.doc-2019.tar.xz mirror://gentoo/texlive-module-makeplot.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftricks.doc-2019.tar.xz mirror://gentoo/texlive-module-pdftricks2.doc-2019.tar.xz mirror://gentoo/texlive-module-pedigree-perl.doc-2019.tar.xz mirror://gentoo/texlive-module-psbao.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-2dplot.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-3d.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-3dplot.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-abspos.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-arrow.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-am.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-antiprism.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-asr.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-bar.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-barcode.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-bezier.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-blur.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-bspline.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-calculate.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-calendar.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-cie.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-circ.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-coil.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-contourplot.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-cox.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-dart.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-dbicons.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-diffraction.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-electricfield.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-eps.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-eucl.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-exa.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-feyn.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-fill.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-fit.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-fr3d.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-fractal.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-fun.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-func.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-gantt.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-geo.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-geometrictools.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-ghsb.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-gr3d.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-grad.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-graphicx.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-infixplot.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-intersect.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-jtree.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-knot.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-labo.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-layout.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-lens.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-light3d.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-lsystem.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-magneticfield.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-marble.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-math.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-mirror.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-moire.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-node.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-ob3d.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-ode.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-optexp.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-optic.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-osci.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-ovl.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-pad.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-pdgr.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-pdf.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-perspective.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-platon.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-plot.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-poker.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-poly.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-pulley.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-qtree.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-rputover.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-rubans.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-shell.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-sigsys.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-slpe.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-solarsystem.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-solides3d.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-soroban.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-spectra.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-spinner.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-spirograph.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-stru.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-support.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-text.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-thick.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-tools.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-tree.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-tvz.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-uml.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-vectorian.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-vehicle.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-venn.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-vowel.doc-2019.tar.xz mirror://gentoo/texlive-module-pst-vue3d.doc-2019.tar.xz mirror://gentoo/texlive-module-pst2pdf.doc-2019.tar.xz mirror://gentoo/texlive-module-pstricks.doc-2019.tar.xz mirror://gentoo/texlive-module-pstricks-add.doc-2019.tar.xz mirror://gentoo/texlive-module-pstricks_calcnotes.doc-2019.tar.xz mirror://gentoo/texlive-module-uml.doc-2019.tar.xz mirror://gentoo/texlive-module-vaucanson-g.doc-2019.tar.xz mirror://gentoo/texlive-module-vocaltract.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-auto-pst-pdf.source-2019.tar.xz mirror://gentoo/texlive-module-makeplot.source-2019.tar.xz mirror://gentoo/texlive-module-pst-3d.source-2019.tar.xz mirror://gentoo/texlive-module-pst-abspos.source-2019.tar.xz mirror://gentoo/texlive-module-pst-am.source-2019.tar.xz mirror://gentoo/texlive-module-pst-bar.source-2019.tar.xz mirror://gentoo/texlive-module-pst-blur.source-2019.tar.xz mirror://gentoo/texlive-module-pst-dbicons.source-2019.tar.xz mirror://gentoo/texlive-module-pst-diffraction.source-2019.tar.xz mirror://gentoo/texlive-module-pst-electricfield.source-2019.tar.xz mirror://gentoo/texlive-module-pst-eps.source-2019.tar.xz mirror://gentoo/texlive-module-pst-fill.source-2019.tar.xz mirror://gentoo/texlive-module-pst-fr3d.source-2019.tar.xz mirror://gentoo/texlive-module-pst-fun.source-2019.tar.xz mirror://gentoo/texlive-module-pst-gr3d.source-2019.tar.xz mirror://gentoo/texlive-module-pst-intersect.source-2019.tar.xz mirror://gentoo/texlive-module-pst-lens.source-2019.tar.xz mirror://gentoo/texlive-module-pst-light3d.source-2019.tar.xz mirror://gentoo/texlive-module-pst-ob3d.source-2019.tar.xz mirror://gentoo/texlive-module-pst-optexp.source-2019.tar.xz mirror://gentoo/texlive-module-pst-pad.source-2019.tar.xz mirror://gentoo/texlive-module-pst-pdgr.source-2019.tar.xz mirror://gentoo/texlive-module-pst-pdf.source-2019.tar.xz mirror://gentoo/texlive-module-pst-platon.source-2019.tar.xz mirror://gentoo/texlive-module-pst-rubans.source-2019.tar.xz mirror://gentoo/texlive-module-pst-shell.source-2019.tar.xz mirror://gentoo/texlive-module-pst-slpe.source-2019.tar.xz mirror://gentoo/texlive-module-pst-soroban.source-2019.tar.xz mirror://gentoo/texlive-module-pst-thick.source-2019.tar.xz mirror://gentoo/texlive-module-pst-tvz.source-2019.tar.xz mirror://gentoo/texlive-module-pst-uml.source-2019.tar.xz mirror://gentoo/texlive-module-pst-vue3d.source-2019.tar.xz mirror://gentoo/texlive-module-uml.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=c9e9f82444715da29043532fed1ed41c
diff --git a/metadata/md5-cache/dev-texlive/texlive-publishers-2019 b/metadata/md5-cache/dev-texlive/texlive-publishers-2019
index 50fd0d01a1fc..45110ca011dd 100644
--- a/metadata/md5-cache/dev-texlive/texlive-publishers-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-publishers-2019
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD GPL-2 CC0-1.0
 RDEPEND=>=dev-texlive/texlive-latex-2019 >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-IEEEconf-2019.tar.xz mirror://gentoo/texlive-module-IEEEtran-2019.tar.xz mirror://gentoo/texlive-module-aastex-2019.tar.xz mirror://gentoo/texlive-module-abnt-2019.tar.xz mirror://gentoo/texlive-module-abntex2-2019.tar.xz mirror://gentoo/texlive-module-acmart-2019.tar.xz mirror://gentoo/texlive-module-acmconf-2019.tar.xz mirror://gentoo/texlive-module-active-conf-2019.tar.xz mirror://gentoo/texlive-module-adfathesis-2019.tar.xz mirror://gentoo/texlive-module-afparticle-2019.tar.xz mirror://gentoo/texlive-module-afthesis-2019.tar.xz mirror://gentoo/texlive-module-aguplus-2019.tar.xz mirror://gentoo/texlive-module-aiaa-2019.tar.xz mirror://gentoo/texlive-module-ametsoc-2019.tar.xz mirror://gentoo/texlive-module-anufinalexam-2019.tar.xz mirror://gentoo/texlive-module-aomart-2019.tar.xz mirror://gentoo/texlive-module-apa-2019.tar.xz mirror://gentoo/texlive-module-apa6-2019.tar.xz mirror://gentoo/texlive-module-apa6e-2019.tar.xz mirror://gentoo/texlive-module-arsclassica-2019.tar.xz mirror://gentoo/texlive-module-articleingud-2019.tar.xz mirror://gentoo/texlive-module-asaetr-2019.tar.xz mirror://gentoo/texlive-module-ascelike-2019.tar.xz mirror://gentoo/texlive-module-asmeconf-2019.tar.xz mirror://gentoo/texlive-module-asmejour-2019.tar.xz mirror://gentoo/texlive-module-aucklandthesis-2019.tar.xz mirror://gentoo/texlive-module-bangorcsthesis-2019.tar.xz mirror://gentoo/texlive-module-bangorexam-2019.tar.xz mirror://gentoo/texlive-module-bath-bst-2019.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin-2019.tar.xz mirror://gentoo/texlive-module-beamer-verona-2019.tar.xz mirror://gentoo/texlive-module-beilstein-2019.tar.xz mirror://gentoo/texlive-module-bgteubner-2019.tar.xz mirror://gentoo/texlive-module-br-lex-2019.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation-2019.tar.xz mirror://gentoo/texlive-module-brandeis-problemset-2019.tar.xz mirror://gentoo/texlive-module-cascadilla-2019.tar.xz mirror://gentoo/texlive-module-cesenaexam-2019.tar.xz mirror://gentoo/texlive-module-chem-journal-2019.tar.xz mirror://gentoo/texlive-module-chs-physics-report-2019.tar.xz mirror://gentoo/texlive-module-cje-2019.tar.xz mirror://gentoo/texlive-module-classicthesis-2019.tar.xz mirror://gentoo/texlive-module-cleanthesis-2019.tar.xz mirror://gentoo/texlive-module-cmpj-2019.tar.xz mirror://gentoo/texlive-module-confproc-2019.tar.xz mirror://gentoo/texlive-module-cquthesis-2019.tar.xz mirror://gentoo/texlive-module-dccpaper-2019.tar.xz mirror://gentoo/texlive-module-dithesis-2019.tar.xz mirror://gentoo/texlive-module-ebook-2019.tar.xz mirror://gentoo/texlive-module-ebsthesis-2019.tar.xz mirror://gentoo/texlive-module-ecothesis-2019.tar.xz mirror://gentoo/texlive-module-ejpecp-2019.tar.xz mirror://gentoo/texlive-module-ekaia-2019.tar.xz mirror://gentoo/texlive-module-elbioimp-2019.tar.xz mirror://gentoo/texlive-module-els-cas-templates-2019.tar.xz mirror://gentoo/texlive-module-elsarticle-2019.tar.xz mirror://gentoo/texlive-module-elteikthesis-2019.tar.xz mirror://gentoo/texlive-module-emisa-2019.tar.xz mirror://gentoo/texlive-module-erdc-2019.tar.xz mirror://gentoo/texlive-module-estcpmm-2019.tar.xz mirror://gentoo/texlive-module-etsvthor-2019.tar.xz mirror://gentoo/texlive-module-facture-belge-simple-sans-tva-2019.tar.xz mirror://gentoo/texlive-module-fbithesis-2019.tar.xz mirror://gentoo/texlive-module-fcavtex-2019.tar.xz mirror://gentoo/texlive-module-fcltxdoc-2019.tar.xz mirror://gentoo/texlive-module-fei-2019.tar.xz mirror://gentoo/texlive-module-ftc-notebook-2019.tar.xz mirror://gentoo/texlive-module-gaceta-2019.tar.xz mirror://gentoo/texlive-module-gammas-2019.tar.xz mirror://gentoo/texlive-module-gatech-thesis-2019.tar.xz mirror://gentoo/texlive-module-gradstudentresume-2019.tar.xz mirror://gentoo/texlive-module-grant-2019.tar.xz mirror://gentoo/texlive-module-gsemthesis-2019.tar.xz mirror://gentoo/texlive-module-gzt-2019.tar.xz mirror://gentoo/texlive-module-h2020proposal-2019.tar.xz mirror://gentoo/texlive-module-hagenberg-thesis-2019.tar.xz mirror://gentoo/texlive-module-har2nat-2019.tar.xz mirror://gentoo/texlive-module-hecthese-2019.tar.xz mirror://gentoo/texlive-module-hithesis-2019.tar.xz mirror://gentoo/texlive-module-hobete-2019.tar.xz mirror://gentoo/texlive-module-hustthesis-2019.tar.xz mirror://gentoo/texlive-module-icsv-2019.tar.xz mirror://gentoo/texlive-module-ieeepes-2019.tar.xz mirror://gentoo/texlive-module-ijmart-2019.tar.xz mirror://gentoo/texlive-module-ijsra-2019.tar.xz mirror://gentoo/texlive-module-imac-2019.tar.xz mirror://gentoo/texlive-module-imtekda-2019.tar.xz mirror://gentoo/texlive-module-iodhbwm-2019.tar.xz mirror://gentoo/texlive-module-iscram-2019.tar.xz mirror://gentoo/texlive-module-jacow-2019.tar.xz mirror://gentoo/texlive-module-jmlr-2019.tar.xz mirror://gentoo/texlive-module-jnuexam-2019.tar.xz mirror://gentoo/texlive-module-jpsj-2019.tar.xz mirror://gentoo/texlive-module-kdgdocs-2019.tar.xz mirror://gentoo/texlive-module-kluwer-2019.tar.xz mirror://gentoo/texlive-module-ksp-thesis-2019.tar.xz mirror://gentoo/texlive-module-ku-template-2019.tar.xz mirror://gentoo/texlive-module-langsci-2019.tar.xz mirror://gentoo/texlive-module-limecv-2019.tar.xz mirror://gentoo/texlive-module-lion-msc-2019.tar.xz mirror://gentoo/texlive-module-llncsconf-2019.tar.xz mirror://gentoo/texlive-module-lni-2019.tar.xz mirror://gentoo/texlive-module-lps-2019.tar.xz mirror://gentoo/texlive-module-matc3-2019.tar.xz mirror://gentoo/texlive-module-matc3mem-2019.tar.xz mirror://gentoo/texlive-module-mcmthesis-2019.tar.xz mirror://gentoo/texlive-module-mentis-2019.tar.xz mirror://gentoo/texlive-module-mlacls-2019.tar.xz mirror://gentoo/texlive-module-mnras-2019.tar.xz mirror://gentoo/texlive-module-modeles-factures-belges-assocs-2019.tar.xz mirror://gentoo/texlive-module-msu-thesis-2019.tar.xz mirror://gentoo/texlive-module-mucproc-2019.tar.xz mirror://gentoo/texlive-module-mugsthesis-2019.tar.xz mirror://gentoo/texlive-module-musuos-2019.tar.xz mirror://gentoo/texlive-module-muthesis-2019.tar.xz mirror://gentoo/texlive-module-mynsfc-2019.tar.xz mirror://gentoo/texlive-module-nature-2019.tar.xz mirror://gentoo/texlive-module-navydocs-2019.tar.xz mirror://gentoo/texlive-module-nddiss-2019.tar.xz mirror://gentoo/texlive-module-ndsu-thesis-2019.tar.xz mirror://gentoo/texlive-module-novel-2019.tar.xz mirror://gentoo/texlive-module-nwejm-2019.tar.xz mirror://gentoo/texlive-module-nih-2019.tar.xz mirror://gentoo/texlive-module-nihbiosketch-2019.tar.xz mirror://gentoo/texlive-module-nostarch-2019.tar.xz mirror://gentoo/texlive-module-nrc-2019.tar.xz mirror://gentoo/texlive-module-onrannual-2019.tar.xz mirror://gentoo/texlive-module-opteng-2019.tar.xz mirror://gentoo/texlive-module-philosophersimprint-2019.tar.xz mirror://gentoo/texlive-module-pittetd-2019.tar.xz mirror://gentoo/texlive-module-pkuthss-2019.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin-2019.tar.xz mirror://gentoo/texlive-module-powerdot-tuliplab-2019.tar.xz mirror://gentoo/texlive-module-pracjourn-2019.tar.xz mirror://gentoo/texlive-module-procIAGssymp-2019.tar.xz mirror://gentoo/texlive-module-proposal-2019.tar.xz mirror://gentoo/texlive-module-prtec-2019.tar.xz mirror://gentoo/texlive-module-ptptex-2019.tar.xz mirror://gentoo/texlive-module-resphilosophica-2019.tar.xz mirror://gentoo/texlive-module-resumecls-2019.tar.xz mirror://gentoo/texlive-module-revtex-2019.tar.xz mirror://gentoo/texlive-module-revtex4-2019.tar.xz mirror://gentoo/texlive-module-rutitlepage-2019.tar.xz mirror://gentoo/texlive-module-ryersonsgsthesis-2019.tar.xz mirror://gentoo/texlive-module-ryethesis-2019.tar.xz mirror://gentoo/texlive-module-sageep-2019.tar.xz mirror://gentoo/texlive-module-sapthesis-2019.tar.xz mirror://gentoo/texlive-module-schule-2019.tar.xz mirror://gentoo/texlive-module-scrjrnl-2019.tar.xz mirror://gentoo/texlive-module-scientific-thesis-cover-2019.tar.xz mirror://gentoo/texlive-module-sduthesis-2019.tar.xz mirror://gentoo/texlive-module-seuthesis-2019.tar.xz mirror://gentoo/texlive-module-seuthesix-2019.tar.xz mirror://gentoo/texlive-module-soton-2019.tar.xz mirror://gentoo/texlive-module-sphdthesis-2019.tar.xz mirror://gentoo/texlive-module-spie-2019.tar.xz mirror://gentoo/texlive-module-sr-vorl-2019.tar.xz mirror://gentoo/texlive-module-srdp-mathematik-2019.tar.xz mirror://gentoo/texlive-module-stellenbosch-2019.tar.xz mirror://gentoo/texlive-module-suftesi-2019.tar.xz mirror://gentoo/texlive-module-sugconf-2019.tar.xz mirror://gentoo/texlive-module-tabriz-thesis-2019.tar.xz mirror://gentoo/texlive-module-technion-thesis-template-2019.tar.xz mirror://gentoo/texlive-module-texilikechaps-2019.tar.xz mirror://gentoo/texlive-module-texilikecover-2019.tar.xz mirror://gentoo/texlive-module-thesis-ekf-2019.tar.xz mirror://gentoo/texlive-module-thesis-gwu-2019.tar.xz mirror://gentoo/texlive-module-thesis-qom-2019.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac-2019.tar.xz mirror://gentoo/texlive-module-thucoursework-2019.tar.xz mirror://gentoo/texlive-module-thuthesis-2019.tar.xz mirror://gentoo/texlive-module-timbreicmc-2019.tar.xz mirror://gentoo/texlive-module-tlc-article-2019.tar.xz mirror://gentoo/texlive-module-topletter-2019.tar.xz mirror://gentoo/texlive-module-toptesi-2019.tar.xz mirror://gentoo/texlive-module-tudscr-2019.tar.xz mirror://gentoo/texlive-module-tugboat-2019.tar.xz mirror://gentoo/texlive-module-tugboat-plain-2019.tar.xz mirror://gentoo/texlive-module-turabian-2019.tar.xz mirror://gentoo/texlive-module-tui-2019.tar.xz mirror://gentoo/texlive-module-uaclasses-2019.tar.xz mirror://gentoo/texlive-module-uafthesis-2019.tar.xz mirror://gentoo/texlive-module-uantwerpendocs-2019.tar.xz mirror://gentoo/texlive-module-ucalgmthesis-2019.tar.xz mirror://gentoo/texlive-module-ucbthesis-2019.tar.xz mirror://gentoo/texlive-module-ucdavisthesis-2019.tar.xz mirror://gentoo/texlive-module-ucsmonograph-2019.tar.xz mirror://gentoo/texlive-module-ucthesis-2019.tar.xz mirror://gentoo/texlive-module-uestcthesis-2019.tar.xz mirror://gentoo/texlive-module-uhhassignment-2019.tar.xz mirror://gentoo/texlive-module-uiucredborder-2019.tar.xz mirror://gentoo/texlive-module-uiucthesis-2019.tar.xz mirror://gentoo/texlive-module-ulthese-2019.tar.xz mirror://gentoo/texlive-module-umbclegislation-2019.tar.xz mirror://gentoo/texlive-module-umthesis-2019.tar.xz mirror://gentoo/texlive-module-umich-thesis-2019.tar.xz mirror://gentoo/texlive-module-unam-thesis-2019.tar.xz mirror://gentoo/texlive-module-unamth-template-2019.tar.xz mirror://gentoo/texlive-module-unamthesis-2019.tar.xz mirror://gentoo/texlive-module-unitn-bimrep-2019.tar.xz mirror://gentoo/texlive-module-univie-ling-2019.tar.xz mirror://gentoo/texlive-module-unswcover-2019.tar.xz mirror://gentoo/texlive-module-uothesis-2019.tar.xz mirror://gentoo/texlive-module-urcls-2019.tar.xz mirror://gentoo/texlive-module-uowthesis-2019.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage-2019.tar.xz mirror://gentoo/texlive-module-uspatent-2019.tar.xz mirror://gentoo/texlive-module-ut-thesis-2019.tar.xz mirror://gentoo/texlive-module-utexasthesis-2019.tar.xz mirror://gentoo/texlive-module-uwthesis-2019.tar.xz mirror://gentoo/texlive-module-vancouver-2019.tar.xz mirror://gentoo/texlive-module-xduthesis-2019.tar.xz mirror://gentoo/texlive-module-wsemclassic-2019.tar.xz mirror://gentoo/texlive-module-yathesis-2019.tar.xz mirror://gentoo/texlive-module-york-thesis-2019.tar.xz mirror://gentoo/texlive-module-collection-publishers-2019.tar.xz doc? ( mirror://gentoo/texlive-module-IEEEconf.doc-2019.tar.xz mirror://gentoo/texlive-module-IEEEtran.doc-2019.tar.xz mirror://gentoo/texlive-module-aastex.doc-2019.tar.xz mirror://gentoo/texlive-module-abnt.doc-2019.tar.xz mirror://gentoo/texlive-module-abntex2.doc-2019.tar.xz mirror://gentoo/texlive-module-acmart.doc-2019.tar.xz mirror://gentoo/texlive-module-acmconf.doc-2019.tar.xz mirror://gentoo/texlive-module-active-conf.doc-2019.tar.xz mirror://gentoo/texlive-module-adfathesis.doc-2019.tar.xz mirror://gentoo/texlive-module-afparticle.doc-2019.tar.xz mirror://gentoo/texlive-module-afthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-aguplus.doc-2019.tar.xz mirror://gentoo/texlive-module-aiaa.doc-2019.tar.xz mirror://gentoo/texlive-module-ametsoc.doc-2019.tar.xz mirror://gentoo/texlive-module-anufinalexam.doc-2019.tar.xz mirror://gentoo/texlive-module-aomart.doc-2019.tar.xz mirror://gentoo/texlive-module-apa.doc-2019.tar.xz mirror://gentoo/texlive-module-apa6.doc-2019.tar.xz mirror://gentoo/texlive-module-apa6e.doc-2019.tar.xz mirror://gentoo/texlive-module-arsclassica.doc-2019.tar.xz mirror://gentoo/texlive-module-articleingud.doc-2019.tar.xz mirror://gentoo/texlive-module-asaetr.doc-2019.tar.xz mirror://gentoo/texlive-module-ascelike.doc-2019.tar.xz mirror://gentoo/texlive-module-asmeconf.doc-2019.tar.xz mirror://gentoo/texlive-module-asmejour.doc-2019.tar.xz mirror://gentoo/texlive-module-aucklandthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-bangorexam.doc-2019.tar.xz mirror://gentoo/texlive-module-bath-bst.doc-2019.tar.xz mirror://gentoo/texlive-module-beamer-FUBerlin.doc-2019.tar.xz mirror://gentoo/texlive-module-beamer-verona.doc-2019.tar.xz mirror://gentoo/texlive-module-beilstein.doc-2019.tar.xz mirror://gentoo/texlive-module-bgteubner.doc-2019.tar.xz mirror://gentoo/texlive-module-br-lex.doc-2019.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.doc-2019.tar.xz mirror://gentoo/texlive-module-brandeis-problemset.doc-2019.tar.xz mirror://gentoo/texlive-module-cascadilla.doc-2019.tar.xz mirror://gentoo/texlive-module-cesenaexam.doc-2019.tar.xz mirror://gentoo/texlive-module-chs-physics-report.doc-2019.tar.xz mirror://gentoo/texlive-module-cje.doc-2019.tar.xz mirror://gentoo/texlive-module-classicthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-cleanthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-cmpj.doc-2019.tar.xz mirror://gentoo/texlive-module-confproc.doc-2019.tar.xz mirror://gentoo/texlive-module-cquthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-dccpaper.doc-2019.tar.xz mirror://gentoo/texlive-module-dithesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ebook.doc-2019.tar.xz mirror://gentoo/texlive-module-ebsthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ecothesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ejpecp.doc-2019.tar.xz mirror://gentoo/texlive-module-ekaia.doc-2019.tar.xz mirror://gentoo/texlive-module-elbioimp.doc-2019.tar.xz mirror://gentoo/texlive-module-els-cas-templates.doc-2019.tar.xz mirror://gentoo/texlive-module-elsarticle.doc-2019.tar.xz mirror://gentoo/texlive-module-elteikthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-emisa.doc-2019.tar.xz mirror://gentoo/texlive-module-erdc.doc-2019.tar.xz mirror://gentoo/texlive-module-estcpmm.doc-2019.tar.xz mirror://gentoo/texlive-module-etsvthor.doc-2019.tar.xz mirror://gentoo/texlive-module-facture-belge-simple-sans-tva.doc-2019.tar.xz mirror://gentoo/texlive-module-fbithesis.doc-2019.tar.xz mirror://gentoo/texlive-module-fcavtex.doc-2019.tar.xz mirror://gentoo/texlive-module-fcltxdoc.doc-2019.tar.xz mirror://gentoo/texlive-module-fei.doc-2019.tar.xz mirror://gentoo/texlive-module-ftc-notebook.doc-2019.tar.xz mirror://gentoo/texlive-module-gaceta.doc-2019.tar.xz mirror://gentoo/texlive-module-gammas.doc-2019.tar.xz mirror://gentoo/texlive-module-gatech-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-gradstudentresume.doc-2019.tar.xz mirror://gentoo/texlive-module-grant.doc-2019.tar.xz mirror://gentoo/texlive-module-gsemthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-gzt.doc-2019.tar.xz mirror://gentoo/texlive-module-h2020proposal.doc-2019.tar.xz mirror://gentoo/texlive-module-hagenberg-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-har2nat.doc-2019.tar.xz mirror://gentoo/texlive-module-hecthese.doc-2019.tar.xz mirror://gentoo/texlive-module-hithesis.doc-2019.tar.xz mirror://gentoo/texlive-module-hobete.doc-2019.tar.xz mirror://gentoo/texlive-module-hustthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-icsv.doc-2019.tar.xz mirror://gentoo/texlive-module-ieeepes.doc-2019.tar.xz mirror://gentoo/texlive-module-ijmart.doc-2019.tar.xz mirror://gentoo/texlive-module-ijsra.doc-2019.tar.xz mirror://gentoo/texlive-module-imac.doc-2019.tar.xz mirror://gentoo/texlive-module-imtekda.doc-2019.tar.xz mirror://gentoo/texlive-module-iodhbwm.doc-2019.tar.xz mirror://gentoo/texlive-module-iscram.doc-2019.tar.xz mirror://gentoo/texlive-module-jacow.doc-2019.tar.xz mirror://gentoo/texlive-module-jmlr.doc-2019.tar.xz mirror://gentoo/texlive-module-jnuexam.doc-2019.tar.xz mirror://gentoo/texlive-module-jpsj.doc-2019.tar.xz mirror://gentoo/texlive-module-kdgdocs.doc-2019.tar.xz mirror://gentoo/texlive-module-kluwer.doc-2019.tar.xz mirror://gentoo/texlive-module-ksp-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ku-template.doc-2019.tar.xz mirror://gentoo/texlive-module-langsci.doc-2019.tar.xz mirror://gentoo/texlive-module-limecv.doc-2019.tar.xz mirror://gentoo/texlive-module-lion-msc.doc-2019.tar.xz mirror://gentoo/texlive-module-llncsconf.doc-2019.tar.xz mirror://gentoo/texlive-module-lni.doc-2019.tar.xz mirror://gentoo/texlive-module-lps.doc-2019.tar.xz mirror://gentoo/texlive-module-matc3.doc-2019.tar.xz mirror://gentoo/texlive-module-matc3mem.doc-2019.tar.xz mirror://gentoo/texlive-module-mcmthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-mentis.doc-2019.tar.xz mirror://gentoo/texlive-module-mlacls.doc-2019.tar.xz mirror://gentoo/texlive-module-mnras.doc-2019.tar.xz mirror://gentoo/texlive-module-modeles-factures-belges-assocs.doc-2019.tar.xz mirror://gentoo/texlive-module-msu-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-mucproc.doc-2019.tar.xz mirror://gentoo/texlive-module-mugsthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-musuos.doc-2019.tar.xz mirror://gentoo/texlive-module-muthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-mynsfc.doc-2019.tar.xz mirror://gentoo/texlive-module-nature.doc-2019.tar.xz mirror://gentoo/texlive-module-navydocs.doc-2019.tar.xz mirror://gentoo/texlive-module-nddiss.doc-2019.tar.xz mirror://gentoo/texlive-module-ndsu-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-novel.doc-2019.tar.xz mirror://gentoo/texlive-module-nwejm.doc-2019.tar.xz mirror://gentoo/texlive-module-nih.doc-2019.tar.xz mirror://gentoo/texlive-module-nihbiosketch.doc-2019.tar.xz mirror://gentoo/texlive-module-nostarch.doc-2019.tar.xz mirror://gentoo/texlive-module-nrc.doc-2019.tar.xz mirror://gentoo/texlive-module-onrannual.doc-2019.tar.xz mirror://gentoo/texlive-module-opteng.doc-2019.tar.xz mirror://gentoo/texlive-module-philosophersimprint.doc-2019.tar.xz mirror://gentoo/texlive-module-pittetd.doc-2019.tar.xz mirror://gentoo/texlive-module-pkuthss.doc-2019.tar.xz mirror://gentoo/texlive-module-powerdot-FUBerlin.doc-2019.tar.xz mirror://gentoo/texlive-module-powerdot-tuliplab.doc-2019.tar.xz mirror://gentoo/texlive-module-pracjourn.doc-2019.tar.xz mirror://gentoo/texlive-module-procIAGssymp.doc-2019.tar.xz mirror://gentoo/texlive-module-proposal.doc-2019.tar.xz mirror://gentoo/texlive-module-prtec.doc-2019.tar.xz mirror://gentoo/texlive-module-ptptex.doc-2019.tar.xz mirror://gentoo/texlive-module-resphilosophica.doc-2019.tar.xz mirror://gentoo/texlive-module-resumecls.doc-2019.tar.xz mirror://gentoo/texlive-module-revtex.doc-2019.tar.xz mirror://gentoo/texlive-module-revtex4.doc-2019.tar.xz mirror://gentoo/texlive-module-rutitlepage.doc-2019.tar.xz mirror://gentoo/texlive-module-ryersonsgsthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ryethesis.doc-2019.tar.xz mirror://gentoo/texlive-module-sageep.doc-2019.tar.xz mirror://gentoo/texlive-module-sapthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-schule.doc-2019.tar.xz mirror://gentoo/texlive-module-scrjrnl.doc-2019.tar.xz mirror://gentoo/texlive-module-scientific-thesis-cover.doc-2019.tar.xz mirror://gentoo/texlive-module-sduthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-seuthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-seuthesix.doc-2019.tar.xz mirror://gentoo/texlive-module-soton.doc-2019.tar.xz mirror://gentoo/texlive-module-sphdthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-spie.doc-2019.tar.xz mirror://gentoo/texlive-module-sr-vorl.doc-2019.tar.xz mirror://gentoo/texlive-module-srdp-mathematik.doc-2019.tar.xz mirror://gentoo/texlive-module-stellenbosch.doc-2019.tar.xz mirror://gentoo/texlive-module-suftesi.doc-2019.tar.xz mirror://gentoo/texlive-module-sugconf.doc-2019.tar.xz mirror://gentoo/texlive-module-tabriz-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-technion-thesis-template.doc-2019.tar.xz mirror://gentoo/texlive-module-thesis-ekf.doc-2019.tar.xz mirror://gentoo/texlive-module-thesis-gwu.doc-2019.tar.xz mirror://gentoo/texlive-module-thesis-qom.doc-2019.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.doc-2019.tar.xz mirror://gentoo/texlive-module-thucoursework.doc-2019.tar.xz mirror://gentoo/texlive-module-thuthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-timbreicmc.doc-2019.tar.xz mirror://gentoo/texlive-module-tlc-article.doc-2019.tar.xz mirror://gentoo/texlive-module-topletter.doc-2019.tar.xz mirror://gentoo/texlive-module-toptesi.doc-2019.tar.xz mirror://gentoo/texlive-module-tudscr.doc-2019.tar.xz mirror://gentoo/texlive-module-tugboat.doc-2019.tar.xz mirror://gentoo/texlive-module-tugboat-plain.doc-2019.tar.xz mirror://gentoo/texlive-module-turabian.doc-2019.tar.xz mirror://gentoo/texlive-module-tui.doc-2019.tar.xz mirror://gentoo/texlive-module-uaclasses.doc-2019.tar.xz mirror://gentoo/texlive-module-uafthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.doc-2019.tar.xz mirror://gentoo/texlive-module-ucalgmthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ucbthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ucsmonograph.doc-2019.tar.xz mirror://gentoo/texlive-module-ucthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-uestcthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-uhhassignment.doc-2019.tar.xz mirror://gentoo/texlive-module-uiucredborder.doc-2019.tar.xz mirror://gentoo/texlive-module-uiucthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-ulthese.doc-2019.tar.xz mirror://gentoo/texlive-module-umbclegislation.doc-2019.tar.xz mirror://gentoo/texlive-module-umthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-umich-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-unam-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-unamth-template.doc-2019.tar.xz mirror://gentoo/texlive-module-unamthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-unitn-bimrep.doc-2019.tar.xz mirror://gentoo/texlive-module-univie-ling.doc-2019.tar.xz mirror://gentoo/texlive-module-unswcover.doc-2019.tar.xz mirror://gentoo/texlive-module-uothesis.doc-2019.tar.xz mirror://gentoo/texlive-module-urcls.doc-2019.tar.xz mirror://gentoo/texlive-module-uowthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-uowthesistitlepage.doc-2019.tar.xz mirror://gentoo/texlive-module-uspatent.doc-2019.tar.xz mirror://gentoo/texlive-module-ut-thesis.doc-2019.tar.xz mirror://gentoo/texlive-module-utexasthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-uwthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-vancouver.doc-2019.tar.xz mirror://gentoo/texlive-module-xduthesis.doc-2019.tar.xz mirror://gentoo/texlive-module-wsemclassic.doc-2019.tar.xz mirror://gentoo/texlive-module-yathesis.doc-2019.tar.xz mirror://gentoo/texlive-module-york-thesis.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-IEEEconf.source-2019.tar.xz mirror://gentoo/texlive-module-acmart.source-2019.tar.xz mirror://gentoo/texlive-module-acmconf.source-2019.tar.xz mirror://gentoo/texlive-module-active-conf.source-2019.tar.xz mirror://gentoo/texlive-module-adfathesis.source-2019.tar.xz mirror://gentoo/texlive-module-afparticle.source-2019.tar.xz mirror://gentoo/texlive-module-aiaa.source-2019.tar.xz mirror://gentoo/texlive-module-aomart.source-2019.tar.xz mirror://gentoo/texlive-module-apa6.source-2019.tar.xz mirror://gentoo/texlive-module-apa6e.source-2019.tar.xz mirror://gentoo/texlive-module-articleingud.source-2019.tar.xz mirror://gentoo/texlive-module-bangorcsthesis.source-2019.tar.xz mirror://gentoo/texlive-module-bangorexam.source-2019.tar.xz mirror://gentoo/texlive-module-bath-bst.source-2019.tar.xz mirror://gentoo/texlive-module-beilstein.source-2019.tar.xz mirror://gentoo/texlive-module-bgteubner.source-2019.tar.xz mirror://gentoo/texlive-module-brandeis-dissertation.source-2019.tar.xz mirror://gentoo/texlive-module-cesenaexam.source-2019.tar.xz mirror://gentoo/texlive-module-confproc.source-2019.tar.xz mirror://gentoo/texlive-module-cquthesis.source-2019.tar.xz mirror://gentoo/texlive-module-dccpaper.source-2019.tar.xz mirror://gentoo/texlive-module-ebsthesis.source-2019.tar.xz mirror://gentoo/texlive-module-ejpecp.source-2019.tar.xz mirror://gentoo/texlive-module-ekaia.source-2019.tar.xz mirror://gentoo/texlive-module-elbioimp.source-2019.tar.xz mirror://gentoo/texlive-module-elsarticle.source-2019.tar.xz mirror://gentoo/texlive-module-elteikthesis.source-2019.tar.xz mirror://gentoo/texlive-module-emisa.source-2019.tar.xz mirror://gentoo/texlive-module-erdc.source-2019.tar.xz mirror://gentoo/texlive-module-estcpmm.source-2019.tar.xz mirror://gentoo/texlive-module-fbithesis.source-2019.tar.xz mirror://gentoo/texlive-module-fcltxdoc.source-2019.tar.xz mirror://gentoo/texlive-module-fei.source-2019.tar.xz mirror://gentoo/texlive-module-grant.source-2019.tar.xz mirror://gentoo/texlive-module-gsemthesis.source-2019.tar.xz mirror://gentoo/texlive-module-gzt.source-2019.tar.xz mirror://gentoo/texlive-module-hecthese.source-2019.tar.xz mirror://gentoo/texlive-module-hithesis.source-2019.tar.xz mirror://gentoo/texlive-module-hustthesis.source-2019.tar.xz mirror://gentoo/texlive-module-icsv.source-2019.tar.xz mirror://gentoo/texlive-module-ijmart.source-2019.tar.xz mirror://gentoo/texlive-module-imtekda.source-2019.tar.xz mirror://gentoo/texlive-module-jmlr.source-2019.tar.xz mirror://gentoo/texlive-module-kdgdocs.source-2019.tar.xz mirror://gentoo/texlive-module-kluwer.source-2019.tar.xz mirror://gentoo/texlive-module-limecv.source-2019.tar.xz mirror://gentoo/texlive-module-lni.source-2019.tar.xz mirror://gentoo/texlive-module-lps.source-2019.tar.xz mirror://gentoo/texlive-module-matc3.source-2019.tar.xz mirror://gentoo/texlive-module-matc3mem.source-2019.tar.xz mirror://gentoo/texlive-module-mcmthesis.source-2019.tar.xz mirror://gentoo/texlive-module-mentis.source-2019.tar.xz mirror://gentoo/texlive-module-mlacls.source-2019.tar.xz mirror://gentoo/texlive-module-mucproc.source-2019.tar.xz mirror://gentoo/texlive-module-mugsthesis.source-2019.tar.xz mirror://gentoo/texlive-module-musuos.source-2019.tar.xz mirror://gentoo/texlive-module-mynsfc.source-2019.tar.xz mirror://gentoo/texlive-module-navydocs.source-2019.tar.xz mirror://gentoo/texlive-module-nddiss.source-2019.tar.xz mirror://gentoo/texlive-module-nwejm.source-2019.tar.xz mirror://gentoo/texlive-module-nostarch.source-2019.tar.xz mirror://gentoo/texlive-module-nrc.source-2019.tar.xz mirror://gentoo/texlive-module-philosophersimprint.source-2019.tar.xz mirror://gentoo/texlive-module-pittetd.source-2019.tar.xz mirror://gentoo/texlive-module-pracjourn.source-2019.tar.xz mirror://gentoo/texlive-module-proposal.source-2019.tar.xz mirror://gentoo/texlive-module-resphilosophica.source-2019.tar.xz mirror://gentoo/texlive-module-resumecls.source-2019.tar.xz mirror://gentoo/texlive-module-revtex.source-2019.tar.xz mirror://gentoo/texlive-module-revtex4.source-2019.tar.xz mirror://gentoo/texlive-module-rutitlepage.source-2019.tar.xz mirror://gentoo/texlive-module-ryethesis.source-2019.tar.xz mirror://gentoo/texlive-module-sageep.source-2019.tar.xz mirror://gentoo/texlive-module-scrjrnl.source-2019.tar.xz mirror://gentoo/texlive-module-scientific-thesis-cover.source-2019.tar.xz mirror://gentoo/texlive-module-sduthesis.source-2019.tar.xz mirror://gentoo/texlive-module-seuthesis.source-2019.tar.xz mirror://gentoo/texlive-module-seuthesix.source-2019.tar.xz mirror://gentoo/texlive-module-sr-vorl.source-2019.tar.xz mirror://gentoo/texlive-module-stellenbosch.source-2019.tar.xz mirror://gentoo/texlive-module-suftesi.source-2019.tar.xz mirror://gentoo/texlive-module-thesis-ekf.source-2019.tar.xz mirror://gentoo/texlive-module-thesis-titlepage-fhac.source-2019.tar.xz mirror://gentoo/texlive-module-thucoursework.source-2019.tar.xz mirror://gentoo/texlive-module-thuthesis.source-2019.tar.xz mirror://gentoo/texlive-module-timbreicmc.source-2019.tar.xz mirror://gentoo/texlive-module-topletter.source-2019.tar.xz mirror://gentoo/texlive-module-toptesi.source-2019.tar.xz mirror://gentoo/texlive-module-tudscr.source-2019.tar.xz mirror://gentoo/texlive-module-tugboat.source-2019.tar.xz mirror://gentoo/texlive-module-uaclasses.source-2019.tar.xz mirror://gentoo/texlive-module-uantwerpendocs.source-2019.tar.xz mirror://gentoo/texlive-module-ucdavisthesis.source-2019.tar.xz mirror://gentoo/texlive-module-ucsmonograph.source-2019.tar.xz mirror://gentoo/texlive-module-uhhassignment.source-2019.tar.xz mirror://gentoo/texlive-module-uiucredborder.source-2019.tar.xz mirror://gentoo/texlive-module-uiucthesis.source-2019.tar.xz mirror://gentoo/texlive-module-ulthese.source-2019.tar.xz mirror://gentoo/texlive-module-uothesis.source-2019.tar.xz mirror://gentoo/texlive-module-xduthesis.source-2019.tar.xz mirror://gentoo/texlive-module-wsemclassic.source-2019.tar.xz mirror://gentoo/texlive-module-yathesis.source-2019.tar.xz mirror://gentoo/texlive-module-york-thesis.source-2019.tar.xz )
-_eclasses_=texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=c38aa2824e66fc88bab3b293878e2fe2
diff --git a/metadata/md5-cache/dev-texlive/texlive-xetex-2019 b/metadata/md5-cache/dev-texlive/texlive-xetex-2019
index d4fb7a1a601a..a6447d2b8c00 100644
--- a/metadata/md5-cache/dev-texlive/texlive-xetex-2019
+++ b/metadata/md5-cache/dev-texlive/texlive-xetex-2019
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 GPL-1 GPL-2 LGPL-2 LPPL-1.2 LPPL-1.3 LPPL-1.3c
 RDEPEND=>=dev-texlive/texlive-basic-2019 >=dev-texlive/texlive-latexextra-2010 >=app-text/texlive-core-2010[xetex] dev-texlive/texlive-mathscience dev-texlive/texlive-luatex >=app-text/texlive-core-2019
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-module-arabxetex-2019.tar.xz mirror://gentoo/texlive-module-awesomebox-2019.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi-2019.tar.xz mirror://gentoo/texlive-module-bidicontour-2019.tar.xz mirror://gentoo/texlive-module-bidipagegrid-2019.tar.xz mirror://gentoo/texlive-module-bidishadowtext-2019.tar.xz mirror://gentoo/texlive-module-bidipresentation-2019.tar.xz mirror://gentoo/texlive-module-businesscard-qrcode-2019.tar.xz mirror://gentoo/texlive-module-cqubeamer-2019.tar.xz mirror://gentoo/texlive-module-fixlatvian-2019.tar.xz mirror://gentoo/texlive-module-font-change-xetex-2019.tar.xz mirror://gentoo/texlive-module-fontbook-2019.tar.xz mirror://gentoo/texlive-module-fontwrap-2019.tar.xz mirror://gentoo/texlive-module-interchar-2019.tar.xz mirror://gentoo/texlive-module-na-position-2019.tar.xz mirror://gentoo/texlive-module-philokalia-2019.tar.xz mirror://gentoo/texlive-module-ptext-2019.tar.xz mirror://gentoo/texlive-module-quran-2019.tar.xz mirror://gentoo/texlive-module-quran-de-2019.tar.xz mirror://gentoo/texlive-module-realscripts-2019.tar.xz mirror://gentoo/texlive-module-simple-resume-cv-2019.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation-2019.tar.xz mirror://gentoo/texlive-module-tetragonos-2019.tar.xz mirror://gentoo/texlive-module-ucharclasses-2019.tar.xz mirror://gentoo/texlive-module-unicode-bidi-2019.tar.xz mirror://gentoo/texlive-module-unisugar-2019.tar.xz mirror://gentoo/texlive-module-xebaposter-2019.tar.xz mirror://gentoo/texlive-module-xechangebar-2019.tar.xz mirror://gentoo/texlive-module-xecjk-2019.tar.xz mirror://gentoo/texlive-module-xecolor-2019.tar.xz mirror://gentoo/texlive-module-xecyr-2019.tar.xz mirror://gentoo/texlive-module-xeindex-2019.tar.xz mirror://gentoo/texlive-module-xesearch-2019.tar.xz mirror://gentoo/texlive-module-xespotcolor-2019.tar.xz mirror://gentoo/texlive-module-xetex-2019.tar.xz mirror://gentoo/texlive-module-xetex-itrans-2019.tar.xz mirror://gentoo/texlive-module-xetex-pstricks-2019.tar.xz mirror://gentoo/texlive-module-xetex-tibetan-2019.tar.xz mirror://gentoo/texlive-module-xetexconfig-2019.tar.xz mirror://gentoo/texlive-module-xetexfontinfo-2019.tar.xz mirror://gentoo/texlive-module-xetexko-2019.tar.xz mirror://gentoo/texlive-module-xevlna-2019.tar.xz mirror://gentoo/texlive-module-collection-xetex-2019.tar.xz doc? ( mirror://gentoo/texlive-module-arabxetex.doc-2019.tar.xz mirror://gentoo/texlive-module-awesomebox.doc-2019.tar.xz mirror://gentoo/texlive-module-bidi-atbegshi.doc-2019.tar.xz mirror://gentoo/texlive-module-bidicontour.doc-2019.tar.xz mirror://gentoo/texlive-module-bidipagegrid.doc-2019.tar.xz mirror://gentoo/texlive-module-bidishadowtext.doc-2019.tar.xz mirror://gentoo/texlive-module-bidipresentation.doc-2019.tar.xz mirror://gentoo/texlive-module-businesscard-qrcode.doc-2019.tar.xz mirror://gentoo/texlive-module-cqubeamer.doc-2019.tar.xz mirror://gentoo/texlive-module-fixlatvian.doc-2019.tar.xz mirror://gentoo/texlive-module-font-change-xetex.doc-2019.tar.xz mirror://gentoo/texlive-module-fontbook.doc-2019.tar.xz mirror://gentoo/texlive-module-fontwrap.doc-2019.tar.xz mirror://gentoo/texlive-module-interchar.doc-2019.tar.xz mirror://gentoo/texlive-module-na-position.doc-2019.tar.xz mirror://gentoo/texlive-module-philokalia.doc-2019.tar.xz mirror://gentoo/texlive-module-ptext.doc-2019.tar.xz mirror://gentoo/texlive-module-quran.doc-2019.tar.xz mirror://gentoo/texlive-module-quran-de.doc-2019.tar.xz mirror://gentoo/texlive-module-realscripts.doc-2019.tar.xz mirror://gentoo/texlive-module-simple-resume-cv.doc-2019.tar.xz mirror://gentoo/texlive-module-simple-thesis-dissertation.doc-2019.tar.xz mirror://gentoo/texlive-module-tetragonos.doc-2019.tar.xz mirror://gentoo/texlive-module-ucharclasses.doc-2019.tar.xz mirror://gentoo/texlive-module-unicode-bidi.doc-2019.tar.xz mirror://gentoo/texlive-module-unisugar.doc-2019.tar.xz mirror://gentoo/texlive-module-xebaposter.doc-2019.tar.xz mirror://gentoo/texlive-module-xechangebar.doc-2019.tar.xz mirror://gentoo/texlive-module-xecjk.doc-2019.tar.xz mirror://gentoo/texlive-module-xecolor.doc-2019.tar.xz mirror://gentoo/texlive-module-xecyr.doc-2019.tar.xz mirror://gentoo/texlive-module-xeindex.doc-2019.tar.xz mirror://gentoo/texlive-module-xesearch.doc-2019.tar.xz mirror://gentoo/texlive-module-xespotcolor.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex-itrans.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex-pstricks.doc-2019.tar.xz mirror://gentoo/texlive-module-xetex-tibetan.doc-2019.tar.xz mirror://gentoo/texlive-module-xetexfontinfo.doc-2019.tar.xz mirror://gentoo/texlive-module-xetexko.doc-2019.tar.xz mirror://gentoo/texlive-module-xevlna.doc-2019.tar.xz ) source? ( mirror://gentoo/texlive-module-arabxetex.source-2019.tar.xz mirror://gentoo/texlive-module-fixlatvian.source-2019.tar.xz mirror://gentoo/texlive-module-fontbook.source-2019.tar.xz mirror://gentoo/texlive-module-philokalia.source-2019.tar.xz mirror://gentoo/texlive-module-realscripts.source-2019.tar.xz mirror://gentoo/texlive-module-xecjk.source-2019.tar.xz mirror://gentoo/texlive-module-xespotcolor.source-2019.tar.xz )
-_eclasses_=font	af70de9a23b2f34d4fe4dcb222be0346	texlive-common	e8bb3f5910e0aab6c580a1dc62bc57cc	texlive-module	505551d589b992ff06e836b98cf615af
+_eclasses_=font	af70de9a23b2f34d4fe4dcb222be0346	texlive-common	930a8063ad61a83cd5b9b186a1f75f9c	texlive-module	e9c12c894a631c67aa05a2d71e7df0f8
 _md5_=be85a06939dbda53a411bb028584971b
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 98de37b34459..0789b96b5908 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-21 b/metadata/md5-cache/dev-util/android-sdk-update-manager-21
index 95de14da5148..565d55b6eb2e 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-21
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-21
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r21-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=314a32f377df97eac082dd6d3e5425ab
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
index 1300a58d80d2..016bda4da316 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-21.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r21.1-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=824fc58981d0d1461a4e7299d29488e4
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22
index fa5ae659b5fc..5cae7c357fd5 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99c20d34c8af0c2282827d68957594d7
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
index efa550f12a42..17353601a5be 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 >=dev-java/swt-3.5[cairo] >=
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.0.1-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99c20d34c8af0c2282827d68957594d7
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1
index 91fcdda2cd84..0593b9eb28ce 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.0.1-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=83da6bd159f0bb6eb3c73c02dd51cc5a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
index 60d4ab2fb0bc..243a8132ae43 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.4
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.0.4-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=83da6bd159f0bb6eb3c73c02dd51cc5a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
index 39e337540665..f2e988ff28b4 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=83da6bd159f0bb6eb3c73c02dd51cc5a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1
index 91db0be84e0a..74110ccde902 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.5-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.0.5-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ea4155a3b5c8bccc07642c4e93c349f
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
index 46bcd9d3ae6c..8c600ec1f54e 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.2.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.2.1-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4ea4155a3b5c8bccc07642c4e93c349f
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
index 6bbc7c549c32..87543c237563 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.3
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.3-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b64d4ce8691e198b8cb1c020e11f362a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
index 5cb01b8abcb4..59f7f7bc5dc9 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.6-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b64d4ce8691e198b8cb1c020e11f362a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
index 77ccf214f949..bcbe2e561464 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-22.6.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] >=x1
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r22.6.1-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b64d4ce8691e198b8cb1c020e11f362a
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-23 b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
index fcc02030b9c1..57a7c7a5db2d 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-23
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] sys-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d34453b5cd0ed5dcc24078f83161efba
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
index 887b707aad49..0bd5521b38b2 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-23-r1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] sys-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r23-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f8d6476b3c2442607eb761e4af7b6594
diff --git a/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1 b/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
index f1182e57cb10..d97b49286adf 100644
--- a/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
+++ b/metadata/md5-cache/dev-util/android-sdk-update-manager-24.4.1
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/jdk-1.5 >=dev-java/ant-core-1.6.5 dev-java/swt:3.7[cairo] sys-
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f410b1c945d680b3711c56e6a942f3da
diff --git a/metadata/md5-cache/dev-util/android-studio-3.4.1.0.183.5522156 b/metadata/md5-cache/dev-util/android-studio-3.4.1.0.183.5522156
index 81deee6ebc4d..562dc0025eaf 100644
--- a/metadata/md5-cache/dev-util/android-studio-3.4.1.0.183.5522156
+++ b/metadata/md5-cache/dev-util/android-studio-3.4.1.0.183.5522156
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.4.1.0/android-studio-ide-183.5522156-linux.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5
-_md5_=e27bc55b3821c9e477896496ee0be7c1
+_md5_=661c44ebd991979de1226f43a483ec8b
diff --git a/metadata/md5-cache/dev-util/anjuta-3.28.0-r1 b/metadata/md5-cache/dev-util/anjuta-3.28.0-r1
index d8179d480dd3..a077a8dcd558 100644
--- a/metadata/md5-cache/dev-util/anjuta-3.28.0-r1
+++ b/metadata/md5-cache/dev-util/anjuta-3.28.0-r1
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3
 DESCRIPTION=A versatile IDE for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Anjuta
-IUSE=debug devhelp glade +introspection packagekit subversion terminal test vala +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug devhelp glade +introspection packagekit subversion terminal test vala +python_single_target_python2_7
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.34:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libxml2-2.4.23 >=dev-libs/gdl-3.5.5:3= >=x11-libs/gtksourceview-3:3.0 sys-devel/autogen >=gnome-extra/libgda-5:5= dev-util/ctags x11-libs/libXext x11-libs/libXrender python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) devhelp? ( >=dev-util/devhelp-3.7.4:= ) glade? ( >=dev-util/glade-3.12:3.10= ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) subversion? ( >=dev-vcs/subversion-1.8:= >=net-libs/serf-1.2:1= >=dev-libs/apr-1:= >=dev-libs/apr-util-1:= ) terminal? ( >=x11-libs/vte-0.27.6:2.91 ) vala? ( || ( dev-lang/vala:0.40 ) ) gnome-base/gsettings-desktop-schemas packagekit? ( app-admin/packagekit-base )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/anjuta/3.28/anjuta-3.28.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c79a8cfdcfc9f11986a48af031b457c9
diff --git a/metadata/md5-cache/dev-util/apitrace-8.0 b/metadata/md5-cache/dev-util/apitrace-8.0
index 65d13f295ac8..2d3da25c9fff 100644
--- a/metadata/md5-cache/dev-util/apitrace-8.0
+++ b/metadata/md5-cache/dev-util/apitrace-8.0
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Tool for tracing, analyzing, and debugging graphics APIs
 EAPI=7
 HOMEPAGE=https://github.com/apitrace/apitrace
-IUSE=+cli egl qt5 system-snappy abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+cli egl qt5 system-snappy abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT !system-snappy? ( BSD CC-BY-3.0 CC-BY-4.0 public-domain )
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/brotli:= media-libs/libpng:0= media-libs/mesa[egl?,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-process/procps:= x11-libs/libX11 egl? ( >=media-libs/mesa-8.0[gles1,gles2] media-libs/waffle[egl] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5[-gles2] ) system-snappy? ( >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/archive/8.0.tar.gz -> apitrace-8.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a96db2e7f234fe993e5bf1f50b6ffdca
diff --git a/metadata/md5-cache/dev-util/apitrace-9.0 b/metadata/md5-cache/dev-util/apitrace-9.0
new file mode 100644
index 000000000000..b022d643a5fb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/apitrace-9.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0= media-libs/mesa[egl,gles1,gles2,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/waffle-1.6.0-r1[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-process/procps:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5[-gles2] )
+DESCRIPTION=Tool for tracing, analyzing, and debugging graphics APIs
+EAPI=7
+HOMEPAGE=https://github.com/apitrace/apitrace
+IUSE=qt5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/snappy-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0= media-libs/mesa[egl,gles1,gles2,X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/waffle-1.6.0-r1[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-process/procps:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtwidgets:5[-gles2] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/apitrace/apitrace/archive/9.0.tar.gz -> apitrace-9.0.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3263fcd92863bf974c42296a829c718a
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-6.3.3 b/metadata/md5-cache/dev-util/artifactory-bin-6.3.3
index b87f53602fc5..5386fdc31f0b 100644
--- a/metadata/md5-cache/dev-util/artifactory-bin-6.3.3
+++ b/metadata/md5-cache/dev-util/artifactory-bin-6.3.3
@@ -9,5 +9,5 @@ LICENSE=AGPL-3+
 RDEPEND=>=virtual/jre-1.8
 SLOT=0
 SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-6.3.3.zip -> artifactory-6.3.3.zip
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7e0c1025c3cc30e1b9d930cfc91d9cc7
diff --git a/metadata/md5-cache/dev-util/autodia-2.140.0-r2 b/metadata/md5-cache/dev-util/autodia-2.140.0-r2
index 91006f0c79b8..c72d97b6db6e 100644
--- a/metadata/md5-cache/dev-util/autodia-2.140.0-r2
+++ b/metadata/md5-cache/dev-util/autodia-2.140.0-r2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz mirror://gentoo/Autodia-2.14-dbi.patch.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=5fceaa12a4d4af0fd4af31455bf5b5ca
+_md5_=23448c904ed8133204086f8600c6609f
diff --git a/metadata/md5-cache/dev-util/bakefile-0.2.9-r1 b/metadata/md5-cache/dev-util/bakefile-0.2.9-r1
index 491c195d80b0..357575ef5908 100644
--- a/metadata/md5-cache/dev-util/bakefile-0.2.9-r1
+++ b/metadata/md5-cache/dev-util/bakefile-0.2.9-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install setup
 DESCRIPTION=Native makefiles generator
 EAPI=5
 HOMEPAGE=http://bakefile.sourceforge.net
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bakefile/bakefile-0.2.9.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=89bf4ae3bfdb88103cce32b929e953f6
diff --git a/metadata/md5-cache/dev-util/bcc-0.10.0 b/metadata/md5-cache/dev-util/bcc-0.10.0
index 57d3dcdf1ca7..10fc59bf5650 100644
--- a/metadata/md5-cache/dev-util/bcc-0.10.0
+++ b/metadata/md5-cache/dev-util/bcc-0.10.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/cmake virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* )
+DEPEND=>=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* )
 DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
 EAPI=7
 HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=+luajit test kernel_linux 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
+IUSE=+luajit test kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=>=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.10.0.tar.gz -> bcc-0.10.0.tar.gz https://github.com/libbpf/libbpf/archive/0.0.3.tar.gz -> libbpf-0.0.3.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7eea9855fbbe24574f870105c74c56d
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ccfaeb2e4af11a05f7175fcaa28439c9
diff --git a/metadata/md5-cache/dev-util/bcc-0.11.0 b/metadata/md5-cache/dev-util/bcc-0.11.0
index 1c8f23229ed1..5a137eb32b17 100644
--- a/metadata/md5-cache/dev-util/bcc-0.11.0
+++ b/metadata/md5-cache/dev-util/bcc-0.11.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/cmake virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* )
+DEPEND=>=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* )
 DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
 EAPI=7
 HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=+luajit test kernel_linux 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
+IUSE=+luajit test kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=>=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.11.0.tar.gz -> bcc-0.11.0.tar.gz https://github.com/libbpf/libbpf/archive/v0.0.5.tar.gz -> libbpf-0.0.5.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73fa7916bb58710a622d5677a1c5bf1a
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=adbde29b71ee0a96801585abf6bb4f5a
diff --git a/metadata/md5-cache/dev-util/bcc-0.12.0-r1 b/metadata/md5-cache/dev-util/bcc-0.12.0-r1
index 8d4eb9ffb7d8..a97da34b99d0 100644
--- a/metadata/md5-cache/dev-util/bcc-0.12.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.12.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/cmake virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=sys-kernel/linux-headers-4.14 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* )
+DEPEND=>=sys-kernel/linux-headers-4.14 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* )
 DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
 EAPI=7
 HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=+luajit test kernel_linux 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
+IUSE=+luajit test kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=sys-kernel/linux-headers-4.14 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=>=sys-kernel/linux-headers-4.14 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.12.0.tar.gz -> bcc-0.12.0.tar.gz https://github.com/libbpf/libbpf/archive/v0.0.6.tar.gz -> libbpf-0.0.6.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05742e12a2ff6f494257a266ec836d6d
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5acf188ca779bb0547972e7aeaf1b42f
diff --git a/metadata/md5-cache/dev-util/bcc-0.6.0 b/metadata/md5-cache/dev-util/bcc-0.6.0
index f9aeca79ef59..af0138575f0d 100644
--- a/metadata/md5-cache/dev-util/bcc-0.6.0
+++ b/metadata/md5-cache/dev-util/bcc-0.6.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
 EAPI=6
 HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=kernel_linux +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=432b3140f1bf188bc615efceae14fc7b
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0339733e9be75f7bd8ed4df97d12390d
diff --git a/metadata/md5-cache/dev-util/bcc-0.7.0 b/metadata/md5-cache/dev-util/bcc-0.7.0
index 41091ff21eaf..50536d809dc8 100644
--- a/metadata/md5-cache/dev-util/bcc-0.7.0
+++ b/metadata/md5-cache/dev-util/bcc-0.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
 EAPI=6
 HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=kernel_linux 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
+IUSE=kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=>=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.7.0.tar.gz -> bcc-0.7.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a0a6f6edf4af9b41ea55bf140cd9bc4
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=410b748deb1fe532f2617aedbb4f3034
diff --git a/metadata/md5-cache/dev-util/bcc-0.9.0-r1 b/metadata/md5-cache/dev-util/bcc-0.9.0-r1
index 70b29e77642c..265b163b0dff 100644
--- a/metadata/md5-cache/dev-util/bcc-0.9.0-r1
+++ b/metadata/md5-cache/dev-util/bcc-0.9.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/cmake virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/libbpf:= >=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+DEPEND=dev-libs/libbpf:= >=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
 EAPI=7
 HOMEPAGE=https://iovisor.github.io/bcc/
-IUSE=+luajit kernel_linux 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
+IUSE=+luajit kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/libbpf:= >=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=dev-libs/libbpf:= >=sys-kernel/linux-headers-4.18 >=dev-libs/elfutils-0.166:= sys-devel/clang:= >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)] luajit? ( dev-lang/luajit ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.9.0.tar.gz -> bcc-0.9.0.tar.gz mirror://gentoo/bcc-0.9.0-linux-5-bpf.patch.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fe5e791b9fb38927f69e138282cb517
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f40ad4727a9d014c408c545d0dce3f32
diff --git a/metadata/md5-cache/dev-util/bite-9999 b/metadata/md5-cache/dev-util/bite-9999
index 97e9b08bb4f3..974797dcb54d 100644
--- a/metadata/md5-cache/dev-util/bite-9999
+++ b/metadata/md5-cache/dev-util/bite-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/requests-2[python_targets_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37ba9ea2a2a8863fed5dfc2533db8fa4
diff --git a/metadata/md5-cache/dev-util/boost-build-1.71.0 b/metadata/md5-cache/dev-util/boost-build-1.71.0
deleted file mode 100644
index 208d5c58e51b..000000000000
--- a/metadata/md5-cache/dev-util/boost-build-1.71.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !<dev-libs/boost-1.35.0 !<=dev-util/boost-build-1.35.0-r1 test? ( sys-apps/diffutils python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-DESCRIPTION=A system for large project software construction, simple to use and powerful
-EAPI=7
-HOMEPAGE=https://boostorg.github.io/build/
-IUSE=examples python test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Boost-1.0
-RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !<dev-libs/boost-1.35.0 !<=dev-util/boost-build-1.35.0-r1
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) test? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2a7ef7df7698401b0cb702f4da1ee86b
diff --git a/metadata/md5-cache/dev-util/boost-build-1.72.0 b/metadata/md5-cache/dev-util/boost-build-1.72.0
index dad76afa2c67..5c64e1a4d174 100644
--- a/metadata/md5-cache/dev-util/boost-build-1.72.0
+++ b/metadata/md5-cache/dev-util/boost-build-1.72.0
@@ -3,10 +3,10 @@ DESCRIPTION=A system for large project software construction, simple to use and
 EAPI=7
 HOMEPAGE=https://boostorg.github.io/build/
 IUSE=examples
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Boost-1.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=67971d9f87a416b8e8990d81abbef861
+_md5_=0a71473965cfdbca56d2cdd8ff25ea53
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 10ed14ff6fb5..8422bfb5d218 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
+++ b/metadata/md5-cache/dev-util/buildbot-0.9.12-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-0.9.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8b36df8a961debce0bc920ad5fba1a08
diff --git a/metadata/md5-cache/dev-util/buildbot-1.1.2 b/metadata/md5-cache/dev-util/buildbot-1.1.2
index 5a9005870594..d4c404502931 100644
--- a/metadata/md5-cache/dev-util/buildbot-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d60fc87c70b12b409b4f0c47f6e69f9d
diff --git a/metadata/md5-cache/dev-util/buildbot-1.3.0 b/metadata/md5-cache/dev-util/buildbot-1.3.0
index d70a86f40f44..32bd02d9932a 100644
--- a/metadata/md5-cache/dev-util/buildbot-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c40675031b8b8087342b6b979e6921f3
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index 579e1d1bf7c3..ab76859fb51a 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/jinja-2.1[python_targets_python3_6(-)?,-python_single_targe
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c40675031b8b8087342b6b979e6921f3
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 86e9f2940ce6..57ac168bc691 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-0.9.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa8d874c6a5b2586ae12221ef5a7cf75
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 49ebd001c6d2..ceb955dfbdc3 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa8d874c6a5b2586ae12221ef5a7cf75
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 9e01009677b7..daf28f8a0e77 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa8d874c6a5b2586ae12221ef5a7cf75
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 ffac24ea9799..d95dfaada39d 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-0.9.12.post1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3b913a9126ae612d8107f6715670b2e5
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 98febadada19..a53a755dae78 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f69ecf454c7565ec8326da892b7c9f2
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 b6f085ea8462..828a1951bdb0 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9f69ecf454c7565ec8326da892b7c9f2
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 37ba7f75c55a..e963f47029e3 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-0.9.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=35ce00528be8974e54a008053b5a7051
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 9d5720f0bab7..88df2f36205f 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_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1fc8a2d60d5465dd0d2b5b71a80fd598
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 b96d86c2aed7..5b6eeef9779b 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_python3_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1fc8a2d60d5465dd0d2b5b71a80fd598
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 3d0627ccb2a0..1cb8829e5de0 100644
--- a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
+++ b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-slave/buildbot-slave-0.8.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=092d573b942756c848e99a0914cd76bf
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 fd61cdac51a7..89721a18ad40 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbc0ea9b84993858fb08ee400030f775
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 8eacfee2b208..a057b6767fc6 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbc0ea9b84993858fb08ee400030f775
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 334d71d4be98..da056a71dfba 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dbc0ea9b84993858fb08ee400030f775
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 ed8a2aa45c23..761b8a5c5a3c 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-worker-0.9.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-0.9.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a28edab50db7ea2ad791d718a86b7374
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 dc1cd103c564..39191558c145 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-worker-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43f186def7ac371e2565c250508ccfa9
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 4ee17ee53b65..c8914ee0c602 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43f186def7ac371e2565c250508ccfa9
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 0f43ac74e497..6631e0e5edf7 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/setuptools-21.2.1[python_targets_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43f186def7ac371e2565c250508ccfa9
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 31c4687240c2..fde581ed6b20 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2dc5a40a2c81c8427ae5e96945f62127
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 8f206a1c3007..b55feb9614ed 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b49700aa9cb7c45617cba122ff3b9e56
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 811e024d9724..3ead0a3a9bf7 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b49700aa9cb7c45617cba122ff3b9e56
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 0b10270de11a..6f8155ab9776 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-0.9.12
+++ b/metadata/md5-cache/dev-util/buildbot-www-0.9.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-0.9.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ea22c824ba1fac2267a3dbf434c2555
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 7864be9d2987..3757d1224af7 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-1.1.2
+++ b/metadata/md5-cache/dev-util/buildbot-www-1.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-1.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ea22c824ba1fac2267a3dbf434c2555
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 ebd5ca9c5a86..9624caa1f904 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-1.3.0
+++ b/metadata/md5-cache/dev-util/buildbot-www-1.3.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ea22c824ba1fac2267a3dbf434c2555
diff --git a/metadata/md5-cache/dev-util/bumpversion-0.5.3 b/metadata/md5-cache/dev-util/bumpversion-0.5.3
index c6ba4fbb83b6..ba67c581676a 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_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/bumpversion/bumpversion-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1381c1b317a44578a3a6397c5813b22
diff --git a/metadata/md5-cache/dev-util/catalyst-3.0.8 b/metadata/md5-cache/dev-util/catalyst-3.0.8
index f4a8b2893e70..08829fe86548 100644
--- a/metadata/md5-cache/dev-util/catalyst-3.0.8
+++ b/metadata/md5-cache/dev-util/catalyst-3.0.8
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/catalyst.git/snapshot/catalyst-3.0.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6d4fc412bc92f83ba5649f157d96d16
diff --git a/metadata/md5-cache/dev-util/catalyst-9999 b/metadata/md5-cache/dev-util/catalyst-9999
index 69c3879c3b35..8f3792297ab1 100644
--- a/metadata/md5-cache/dev-util/catalyst-9999
+++ b/metadata/md5-cache/dev-util/catalyst-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/snakeoil-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pydecomp-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] 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] ) amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) iso? ( virtual/cdrtools ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4c6774f0e996eed6be19213686bc4004
diff --git a/metadata/md5-cache/dev-util/catfish-1.4.10 b/metadata/md5-cache/dev-util/catfish-1.4.10
index 61f6e72559d0..486db59070f3 100644
--- a/metadata/md5-cache/dev-util/catfish-1.4.10
+++ b/metadata/md5-cache/dev-util/catfish-1.4.10
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/catfish/1.4/catfish-1.4.10.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61097db40c784d6c7a1610025289ed76
diff --git a/metadata/md5-cache/dev-util/catfish-1.4.12 b/metadata/md5-cache/dev-util/catfish-1.4.12
index 9191a1aa0e62..520da804a314 100644
--- a/metadata/md5-cache/dev-util/catfish-1.4.12
+++ b/metadata/md5-cache/dev-util/catfish-1.4.12
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/catfish/1.4/catfish-1.4.12.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c9518c63257a8f51632c71d7c37bbce6
diff --git a/metadata/md5-cache/dev-util/catfish-1.4.13 b/metadata/md5-cache/dev-util/catfish-1.4.13
index 0095fe859254..a3bef6ca4b6e 100644
--- a/metadata/md5-cache/dev-util/catfish-1.4.13
+++ b/metadata/md5-cache/dev-util/catfish-1.4.13
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/catfish/1.4/catfish-1.4.13.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1431193be6b30dd8b68f1723a80a3f83
diff --git a/metadata/md5-cache/dev-util/cccc-3.1.5-r1 b/metadata/md5-cache/dev-util/cccc-3.1.5-r1
index eac303b46da4..6c9cd78eae3c 100644
--- a/metadata/md5-cache/dev-util/cccc-3.1.5-r1
+++ b/metadata/md5-cache/dev-util/cccc-3.1.5-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/sarnold/cccc/archive/3.1.5.tar.gz -> cccc-3.1.5.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=43384426b6c98b99ef383521f1daabe7
+_md5_=669f3668c428ea1d50cf0a20b99b2c94
diff --git a/metadata/md5-cache/dev-util/cdiff-1.0 b/metadata/md5-cache/dev-util/cdiff-1.0
index d3d9e48b6617..eb6f3e7c2d99 100644
--- a/metadata/md5-cache/dev-util/cdiff-1.0
+++ b/metadata/md5-cache/dev-util/cdiff-1.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/less 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/less 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Colored, side-by-side diff terminal viewer
 EAPI=6
 HOMEPAGE=https://github.com/ymattw/cdiff
 IUSE=python_targets_python2_7 python_targets_python3_6
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/less 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(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/less python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/c/cdiff/cdiff-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=831c43fcc4dc7b42a753caf48c2bef73
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd5f57786a6105fda5dfa85022a498fc
diff --git a/metadata/md5-cache/dev-util/cdiff-9999 b/metadata/md5-cache/dev-util/cdiff-9999
index 05f2119e7a9a..9e50b165c6e4 100644
--- a/metadata/md5-cache/dev-util/cdiff-9999
+++ b/metadata/md5-cache/dev-util/cdiff-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/less 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/less 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Colored, side-by-side diff terminal viewer
 EAPI=5
 HOMEPAGE=https://github.com/ymattw/cdiff
 IUSE=python_targets_python2_7 python_targets_python3_6
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=!<app-misc/colordiff-1.0.13-r1 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/less 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(-)]
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] sys-apps/less python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a199feb41bf041fe0fd791e701fa48a7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72425ac71e206d02e7bc286be25a4c5b
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.19.6 b/metadata/md5-cache/dev-util/checkbashisms-2.19.6
deleted file mode 100644
index fca7453d6501..000000000000
--- a/metadata/md5-cache/dev-util/checkbashisms-2.19.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
-EAPI=7
-HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.19.6.tar.xz
-_md5_=270ca65a03e8190bf65018cb29dc5e73
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.19.7 b/metadata/md5-cache/dev-util/checkbashisms-2.19.7
index 7811ab98b47c..f7d0a1d27799 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.19.7
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.19.7
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
 EAPI=7
 HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.19.7.tar.xz
-_md5_=47a162006d9013616488b3c1d6373ff0
+_md5_=6b122d3405e4798047517575e3588e92
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.20.1 b/metadata/md5-cache/dev-util/checkbashisms-2.20.1
new file mode 100644
index 000000000000..ada1f996890c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.20.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
+EAPI=7
+HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.20.1.tar.xz
+_md5_=a7fedde4fa2ab9f6cd1c808a7a549744
diff --git a/metadata/md5-cache/dev-util/clair-2.0.8 b/metadata/md5-cache/dev-util/clair-2.0.8
index efe1dfe78dd3..4557981edce2 100644
--- a/metadata/md5-cache/dev-util/clair-2.0.8
+++ b/metadata/md5-cache/dev-util/clair-2.0.8
@@ -9,5 +9,5 @@ RDEPEND=app-arch/rpm app-arch/xz-utils dev-vcs/git !!sci-visualization/xd3d
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/coreos/clair/archive/v2.0.8.tar.gz -> clair-2.0.8.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a4047a97709e46783f7797d095df0a95
diff --git a/metadata/md5-cache/dev-util/cligh-0.1_p20120630 b/metadata/md5-cache/dev-util/cligh-0.1_p20120630
index 7713f24efc2a..6d262a765d7e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=812d4bcacc2fb19d15223737a09ee469
diff --git a/metadata/md5-cache/dev-util/cligh-0.2 b/metadata/md5-cache/dev-util/cligh-0.2
index f83befd7705f..acc0d6fca6cc 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3387997b9334b669b8b7eba61e8fc1f8
diff --git a/metadata/md5-cache/dev-util/cligh-9999 b/metadata/md5-cache/dev-util/cligh-9999
index f059073947f8..2569fe64aecc 100644
--- a/metadata/md5-cache/dev-util/cligh-9999
+++ b/metadata/md5-cache/dev-util/cligh-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/PyGithub[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyxdg[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f2409142bc2bae23bba51de8ba39301e
diff --git a/metadata/md5-cache/dev-util/clion-2019.3.2 b/metadata/md5-cache/dev-util/clion-2019.3.2
deleted file mode 100644
index 72b1b7a6b03e..000000000000
--- a/metadata/md5-cache/dev-util/clion-2019.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A complete toolset for C and C++ development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/clion
-IUSE=custom-jdk
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB
-RDEPEND=dev-util/cmake sys-devel/gdb !custom-jdk? ( virtual/jdk )
-RESTRICT=bindist mirror splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/cpp/CLion-2019.3.2.tar.gz -> clion-2019.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5
-_md5_=26aac014b25bb8f32b8164e737bbbe13
diff --git a/metadata/md5-cache/dev-util/clion-2019.3.3 b/metadata/md5-cache/dev-util/clion-2019.3.3
new file mode 100644
index 000000000000..6eabe8ca69b4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/clion-2019.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A complete toolset for C and C++ development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/clion
+IUSE=custom-jdk
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal ) Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB
+RDEPEND=dev-libs/libdbusmenu dev-util/cmake sys-devel/gdb !custom-jdk? ( virtual/jdk )
+RESTRICT=bindist mirror splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/cpp/CLion-2019.3.3.tar.gz -> clion-2019.3.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5
+_md5_=7fc85b2c0f164b23f6f9e924d1c13b39
diff --git a/metadata/md5-cache/dev-util/cmake-3.13.5 b/metadata/md5-cache/dev-util/cmake-3.13.5
index 8d5cf6274637..3d8043ae8d28 100644
--- a/metadata/md5-cache/dev-util/cmake-3.13.5
+++ b/metadata/md5-cache/dev-util/cmake-3.13.5
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.13/cmake-3.13.5.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7135be3a75667ec0cb960e409b11f328
+_md5_=d57502a1fa5e8bd498d3333175d1e2df
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.6 b/metadata/md5-cache/dev-util/cmake-3.14.6
index 726553185c38..5801e238084c 100644
--- a/metadata/md5-cache/dev-util/cmake-3.14.6
+++ b/metadata/md5-cache/dev-util/cmake-3.14.6
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.14/cmake-3.14.6.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=880921757ffb546b9f38d2fb3421b4f6
+_md5_=bcde964ad66969997cbfea9c5d8b06c9
diff --git a/metadata/md5-cache/dev-util/cmake-3.16.2-r1 b/metadata/md5-cache/dev-util/cmake-3.16.2-r1
deleted file mode 100644
index c5aa52a61691..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.16.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cross platform Make
-EAPI=7
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs ncurses qt5 test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.16/cmake-3.16.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=935bffd515247f8f2f863753bc533982
diff --git a/metadata/md5-cache/dev-util/cmake-3.16.3 b/metadata/md5-cache/dev-util/cmake-3.16.3
index 859b4a35db77..909690b3c580 100644
--- a/metadata/md5-cache/dev-util/cmake-3.16.3
+++ b/metadata/md5-cache/dev-util/cmake-3.16.3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.16/cmake-3.16.3.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a36ef1f2045bec2bb21b46f2aa78ee0c
+_md5_=52b6dabce956dbf1447474d259b61817
diff --git a/metadata/md5-cache/dev-util/cmake-3.16.4 b/metadata/md5-cache/dev-util/cmake-3.16.4
new file mode 100644
index 000000000000..c96571e2b805
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.16.4
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cross platform Make
+EAPI=7
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs ncurses qt5 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.16/cmake-3.16.4.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake	7b250250bd1c3cc90800ed668fb87825	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=52b6dabce956dbf1447474d259b61817
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.30 b/metadata/md5-cache/dev-util/cmdtest-0.30
index 948059fb5e3a..94da9abf318e 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe9f189be7ddb8e27699b04008516151
diff --git a/metadata/md5-cache/dev-util/cmdtest-0.32 b/metadata/md5-cache/dev-util/cmdtest-0.32
index 5064b0bb9cda..de75cc3095e4 100644
--- a/metadata/md5-cache/dev-util/cmdtest-0.32
+++ b/metadata/md5-cache/dev-util/cmdtest-0.32
@@ -11,5 +11,5 @@ RDEPEND=dev-python/cliapp[python_targets_python2_7(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://git.liw.fi/cmdtest/snapshot/cmdtest-0.32.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=15cc92bb880ee2ae4efc932cb19d34e8
diff --git a/metadata/md5-cache/dev-util/coccigrep-1.13 b/metadata/md5-cache/dev-util/coccigrep-1.13
index e2acc37ac16e..23f42f6aff62 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? ( >=app-editors/emacs-23.1:* ) vim? (
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f7f0bf7fb032f0d755d42790f9d59b7
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.5 b/metadata/md5-cache/dev-util/coccinelle-1.0.5
index 425a215ee263..252e21d7aa0a 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.5
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.5
@@ -3,13 +3,13 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/
 DESCRIPTION=Program matching and transformation engine
 EAPI=5
 HOMEPAGE=http://coccinelle.lip6.fr/
-IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.5.tgz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da85d3b15a709c50b3691b868746c1ab
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.6 b/metadata/md5-cache/dev-util/coccinelle-1.0.6
index 93545dfe4964..accdae507148 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.6
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.6
@@ -3,13 +3,13 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/
 DESCRIPTION=Program matching and transformation engine
 EAPI=6
 HOMEPAGE=http://coccinelle.lip6.fr/
-IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.6.tgz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ccc5b2c55632807abc2337f78c3cb888
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.8 b/metadata/md5-cache/dev-util/coccinelle-1.0.8
index 984586940dff..c7efc456b0bc 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.8
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.8
@@ -3,13 +3,13 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/
 DESCRIPTION=Program matching and transformation engine
 EAPI=6
 HOMEPAGE=http://coccinelle.lip6.fr/
-IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc emacs ocaml +ocamlopt pcre python test vim-syntax +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( >=app-editors/emacs-23.1:* ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=strip !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/coccinelle/coccinelle/archive/1.0.8.tar.gz -> coccinelle-1.0.8.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b9a5c5dc2c732ac9a734889bc68fe95d
diff --git a/metadata/md5-cache/dev-util/colorgcc-1.3.2-r7 b/metadata/md5-cache/dev-util/colorgcc-1.3.2-r7
index 7289f6192af7..c6a50005acbf 100644
--- a/metadata/md5-cache/dev-util/colorgcc-1.3.2-r7
+++ b/metadata/md5-cache/dev-util/colorgcc-1.3.2-r7
@@ -1,12 +1,11 @@
-DEFINED_PHASES=install postinst prepare
+DEFINED_PHASES=install postinst
 DEPEND=dev-lang/perl
 DESCRIPTION=Perl script to colorise the gcc output.
-EAPI=5
+EAPI=7
 HOMEPAGE=http://schlueters.de/colorgcc.html
 KEYWORDS=~alpha amd64 hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl
 SLOT=0
 SRC_URI=mirror://gentoo/colorgcc-1.3.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=413090b5b75bfc99210b65df92d968ed
+_md5_=faf8b1ddfdf6e5f196d785959be08eae
diff --git a/metadata/md5-cache/dev-util/comparator-2.10 b/metadata/md5-cache/dev-util/comparator-2.10
index 01444a430cd7..628c1ca42a75 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef6ff131cddabc7fa752cda633c97498
diff --git a/metadata/md5-cache/dev-util/comparator-2.12 b/metadata/md5-cache/dev-util/comparator-2.12
index 45b34fd23d36..051305854fa1 100644
--- a/metadata/md5-cache/dev-util/comparator-2.12
+++ b/metadata/md5-cache/dev-util/comparator-2.12
@@ -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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/comparator/comparator-2.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c73f3630fa482c584d83983e1e1b1ec2
diff --git a/metadata/md5-cache/dev-util/conan-1.19.2 b/metadata/md5-cache/dev-util/conan-1.19.2
index 783df6357b78..1c9ae4c97e0f 100644
--- a/metadata/md5-cache/dev-util/conan-1.19.2
+++ b/metadata/md5-cache/dev-util/conan-1.19.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conan-io/conan/archive/1.19.2.tar.gz -> conan-1.19.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cfb6f1edda755eaa4ce1100caa0f9478
diff --git a/metadata/md5-cache/dev-util/conan-1.21.1-r1 b/metadata/md5-cache/dev-util/conan-1.21.1-r1
index 94ef8b8fbddc..ba21e1734267 100644
--- a/metadata/md5-cache/dev-util/conan-1.21.1-r1
+++ b/metadata/md5-cache/dev-util/conan-1.21.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/conan-io/conan/archive/1.21.1.tar.gz -> conan-1.21.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6e4c4db51d70e279f58b5ee5c6c6bb6
diff --git a/metadata/md5-cache/dev-util/conf2struct-1.0 b/metadata/md5-cache/dev-util/conf2struct-1.0
index d83a02a223e9..ae8def83b9d8 100644
--- a/metadata/md5-cache/dev-util/conf2struct-1.0
+++ b/metadata/md5-cache/dev-util/conf2struct-1.0
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libconfig dev-perl/Conf-Libconfig
 SLOT=0
 SRC_URI=https://github.com/yrutschle/conf2struct/archive/v1.0.tar.gz -> conf2struct-1.0.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2929c8e9ad4010c4cda6073c656bdfba
+_md5_=2bc4f8c0a5d4d675821dba3631b046d7
diff --git a/metadata/md5-cache/dev-util/conf2struct-9999 b/metadata/md5-cache/dev-util/conf2struct-9999
index 36194a3eacb4..20c025ecd779 100644
--- a/metadata/md5-cache/dev-util/conf2struct-9999
+++ b/metadata/md5-cache/dev-util/conf2struct-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/libconfig dev-perl/Conf-Libconfig
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=53008fc4556692b3df6c595baa4e5a5e
+_md5_=180ea5cf69232174a9bf1e6d01fe7746
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 1d53e2741cf6..78365ccd33ff 100644
--- a/metadata/md5-cache/dev-util/confix-2.3.5-r2
+++ b/metadata/md5-cache/dev-util/confix-2.3.5-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Confix: A Build Tool on Top of GNU Automake
 EAPI=5
 HOMEPAGE=http://confix.sourceforge.net
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=2
 SRC_URI=mirror://sourceforge/confix/Confix-2.3.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 fc1092589885..d9feee004dcf 100644
--- a/metadata/md5-cache/dev-util/confix-2.3.5-r3
+++ b/metadata/md5-cache/dev-util/confix-2.3.5-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Confix: A Build Tool on Top of GNU Automake
 EAPI=5
 HOMEPAGE=http://confix.sourceforge.net
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=2
 SRC_URI=mirror://sourceforge/confix/Confix-2.3.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7dc0c92812a40c25015ab1a5cd52ec45
diff --git a/metadata/md5-cache/dev-util/confix-9999 b/metadata/md5-cache/dev-util/confix-9999
index 413e763b7e35..6af0104bfa35 100644
--- a/metadata/md5-cache/dev-util/confix-9999
+++ b/metadata/md5-cache/dev-util/confix-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Confix: A Build Tool on Top of GNU Automake
 EAPI=5
 HOMEPAGE=http://confix.sourceforge.net
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-util/confix-wrapper sys-devel/autoconf-archive sys-devel/automake sys-devel/libtool python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f4893265ab4a..d482428a07f2 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.6.0
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/audreyr/cookiecutter/archive/1.6.0.tar.gz -> cookiecutter-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5480bb49aa856316ee5992ba7e909062
diff --git a/metadata/md5-cache/dev-util/cookiecutter-1.7.0 b/metadata/md5-cache/dev-util/cookiecutter-1.7.0
index 3a9af0e5b6d4..84715f9b5711 100644
--- a/metadata/md5-cache/dev-util/cookiecutter-1.7.0
+++ b/metadata/md5-cache/dev-util/cookiecutter-1.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/audreyr/cookiecutter/archive/1.7.0.tar.gz -> cookiecutter-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=578d7b6da484a972c2b2a2dfccf3702e
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.86 b/metadata/md5-cache/dev-util/cppcheck-1.86
index 179d953d2d1d..88708eb0cf70 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.86
+++ b/metadata/md5-cache/dev-util/cppcheck-1.86
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.86.tar.gz -> cppcheck-1.86.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=614950633a118b9676b93a8fa7cbd614
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.87 b/metadata/md5-cache/dev-util/cppcheck-1.87
index 8e364872c926..e5a9eb6dc5a7 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.87
+++ b/metadata/md5-cache/dev-util/cppcheck-1.87
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.87.tar.gz -> cppcheck-1.87.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4759f362ba53570c77f1322ec079891e
diff --git a/metadata/md5-cache/dev-util/cppcheck-1.88 b/metadata/md5-cache/dev-util/cppcheck-1.88
index 67f062bd458d..4b9dd93b1141 100644
--- a/metadata/md5-cache/dev-util/cppcheck-1.88
+++ b/metadata/md5-cache/dev-util/cppcheck-1.88
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[python_targets_pyt
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/danmar/cppcheck/archive/1.88.tar.gz -> cppcheck-1.88.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f96e1996db0776dc4e7ed00842729fa4
diff --git a/metadata/md5-cache/dev-util/cppcheck-9999 b/metadata/md5-cache/dev-util/cppcheck-9999
index 64e1e49f2573..dc671c93d28d 100644
--- a/metadata/md5-cache/dev-util/cppcheck-9999
+++ b/metadata/md5-cache/dev-util/cppcheck-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/tinyxml2:= htmlreport? ( dev-python/pygments[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(-)] ) 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_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	estack	686eaab303305a908fd57b2fd7617800	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	estack	686eaab303305a908fd57b2fd7617800	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=715ddd684738973e0c473d7f45b56f2a
diff --git a/metadata/md5-cache/dev-util/cram-0.7 b/metadata/md5-cache/dev-util/cram-0.7
index 495aeb215bf7..3856b0a4ebda 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cram/cram-0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=63be5031441905dc18d5da1257e2363a
diff --git a/metadata/md5-cache/dev-util/cutter-1.8.0 b/metadata/md5-cache/dev-util/cutter-1.8.0
index c6b8922df03d..927d5242c11a 100644
--- a/metadata/md5-cache/dev-util/cutter-1.8.0
+++ b/metadata/md5-cache/dev-util/cutter-1.8.0
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A Qt and C++ GUI for radare2 reverse engineering framework
 EAPI=6
 HOMEPAGE=https://www.radare.org
-IUSE=jupyter webengine python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=jupyter webengine 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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-qt/qtnetwork:5 >=dev-util/radare2-3.0.0 jupyter? ( dev-python/jupyter ) webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
-REQUIRED_USE=webengine? ( jupyter ) ^^ ( 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 )
+REQUIRED_USE=webengine? ( jupyter ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/radareorg/cutter/archive/v1.8.0.tar.gz -> cutter-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2381681422c2d0996f358a5589f7f65d
diff --git a/metadata/md5-cache/dev-util/cutter-1.8.2 b/metadata/md5-cache/dev-util/cutter-1.8.2
index 409c14e2e2f1..9ea4d350fd55 100644
--- a/metadata/md5-cache/dev-util/cutter-1.8.2
+++ b/metadata/md5-cache/dev-util/cutter-1.8.2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A Qt and C++ GUI for radare2 reverse engineering framework
 EAPI=7
 HOMEPAGE=https://www.radare.org
-IUSE=jupyter webengine python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=jupyter webengine 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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-qt/qtnetwork:5 >=dev-util/radare2-3.5.1 jupyter? ( dev-python/jupyter ) webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
-REQUIRED_USE=webengine? ( jupyter ) ^^ ( 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 )
+REQUIRED_USE=webengine? ( jupyter ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/radareorg/cutter/archive/v1.8.2.tar.gz -> cutter-1.8.2.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f5bdbcb1b1719ee457bc37bbb8d88868
diff --git a/metadata/md5-cache/dev-util/cutter-1.9.0 b/metadata/md5-cache/dev-util/cutter-1.9.0
index d8e8a30d6943..af9cb98edb69 100644
--- a/metadata/md5-cache/dev-util/cutter-1.9.0
+++ b/metadata/md5-cache/dev-util/cutter-1.9.0
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A Qt and C++ GUI for radare2 reverse engineering framework
 EAPI=7
 HOMEPAGE=https://www.radare.org
-IUSE=jupyter webengine python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=jupyter webengine 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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-qt/qtnetwork:5 >=dev-util/radare2-3.8.0 jupyter? ( dev-python/jupyter ) webengine? ( >=dev-qt/qtwebengine-5.9.1:5[widgets] )
-REQUIRED_USE=webengine? ( jupyter ) ^^ ( 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 )
+REQUIRED_USE=webengine? ( jupyter ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/radareorg/cutter/archive/v1.9.0.tar.gz -> cutter-1.9.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0de067d767b473c884adcbedc22359c9
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.14 b/metadata/md5-cache/dev-util/d-feet-0.3.14
deleted file mode 100644
index 095243b4f794..000000000000
--- a/metadata/md5-cache/dev-util/d-feet-0.3.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= dev-util/itstool >=dev-util/intltool-0.40.0 test? ( dev-python/pycodestyle ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=D-Feet is a powerful D-Bus debugger
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/DFeet
-IUSE=test +X python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6 test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/glib-2.34:2 >=dev-python/pygobject-3.3.91:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=sys-apps/dbus-1 X? ( x11-libs/libwnck:3[introspection] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.14.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20ea3f5e1283d98b41dbdcfd1bf4e779
diff --git a/metadata/md5-cache/dev-util/d-feet-0.3.14-r1 b/metadata/md5-cache/dev-util/d-feet-0.3.14-r1
new file mode 100644
index 000000000000..5e9d4e7e40bd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/d-feet-0.3.14-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= dev-util/itstool >=dev-util/intltool-0.40.0 test? ( dev-python/pycodestyle ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=D-Feet is a powerful D-Bus debugger
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/DFeet
+IUSE=test +X +python_single_target_python3_6 test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=x11-libs/gtk+-3.9.4:3[introspection] >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/glib-2.34:2 python_single_target_python3_6? ( >=dev-python/pygobject-3.3.91:3[python_targets_python3_6(-)] ) >=sys-apps/dbus-1 X? ( x11-libs/libwnck:3[introspection] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/d-feet/0.3/d-feet-0.3.14.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bcc56a9f735b8b5d48bc713baba14aea
diff --git a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0 b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0
deleted file mode 100644
index 88516963dedd..000000000000
--- a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/intltool
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/dbus-glib dev-libs/glib:2 test? ( dev-python/dbusmock[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-DESCRIPTION=Run executables under a new DBus session for testing
-EAPI=7
-HOMEPAGE=https://launchpad.net/dbus-test-runner
-IUSE=test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/dbus-glib dev-libs/glib:2 dev-python/dbusmock[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://launchpad.net/dbus-test-runner/19.04/19.04.0/+download/dbus-test-runner-19.04.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5b281dcd5ae4b11d856a09093073b35a
diff --git a/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1 b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
new file mode 100644
index 000000000000..c04c35f73fa5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dbus-test-runner-19.04.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/intltool
+DEFINED_PHASES=configure install prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/dbus-glib dev-libs/glib:2 test? ( python_single_target_python3_6? ( dev-python/dbusmock[python_targets_python3_6(-)] ) )
+DESCRIPTION=Run executables under a new DBus session for testing
+EAPI=7
+HOMEPAGE=https://launchpad.net/dbus-test-runner
+IUSE=test +python_single_target_python3_6
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/dbus-glib dev-libs/glib:2 python_single_target_python3_6? ( dev-python/dbusmock[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://launchpad.net/dbus-test-runner/19.04/19.04.0/+download/dbus-test-runner-19.04.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4ebc11e2f3a7cd8228e0bc8a59267ccb
diff --git a/metadata/md5-cache/dev-util/devhelp-3.30.1 b/metadata/md5-cache/dev-util/devhelp-3.30.1
index ef679ffcf348..3005e5df90f7 100644
--- a/metadata/md5-cache/dev-util/devhelp-3.30.1
+++ b/metadata/md5-cache/dev-util/devhelp-3.30.1
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/
 DESCRIPTION=An API documentation browser for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
-IUSE=gedit gtk-doc +introspection python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=gedit gtk-doc +introspection python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.20:4[introspection?] >=gui-libs/amtk-5.0:5 gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( app-editors/gedit[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( app-editors/gedit[introspection,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] dev-python/pygobject:3[python_targets_python3_7(-)] ) )
-REQUIRED_USE=gedit? ( ^^ ( 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 ) )
+REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0/3-6
 SRC_URI=mirror://gnome/sources/devhelp/3.30/devhelp-3.30.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed5c3d4963b4189c95918ae7032a35b0
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20170131 b/metadata/md5-cache/dev-util/dialog-1.3.20170131
index 20e939a2e2a5..bda22a9366d6 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20170131
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20170131
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool )
 DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=6
 HOMEPAGE=http://invisible-island.net/dialog/dialog.html
@@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0/14
 SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20170131.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=63107fc45a1587c28d6ac383e3685421
+_md5_=96791052e3df18d269151b5768d68506
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20191110 b/metadata/md5-cache/dev-util/dialog-1.3.20191110
index ed2a85827f13..96787259637d 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20191110
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20191110
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool )
 DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=7
 HOMEPAGE=https://invisible-island.net/dialog/
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0/15
 SRC_URI=https://dev.gentoo.org/~jer/dialog-1.3-20191110.tar.gz
-_md5_=fcd9fe5befcce6a79ef32be333d3d1a1
+_md5_=f507397843429defd43b01ac2dd5a956
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20191210 b/metadata/md5-cache/dev-util/dialog-1.3.20191210
index a967d0c201c6..4ef8221beba0 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20191210
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20191210
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool )
 DESCRIPTION=tool to display dialog boxes from a shell
 EAPI=7
 HOMEPAGE=https://invisible-island.net/dialog/
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
 SLOT=0/15
 SRC_URI=https://dev.gentoo.org/~jer/dialog-1.3-20191210.tar.gz
-_md5_=fcd9fe5befcce6a79ef32be333d3d1a1
+_md5_=f507397843429defd43b01ac2dd5a956
diff --git a/metadata/md5-cache/dev-util/diffoscope-129 b/metadata/md5-cache/dev-util/diffoscope-129
index c60018273b2a..29c6e65b556a 100644
--- a/metadata/md5-cache/dev-util/diffoscope-129
+++ b/metadata/md5-cache/dev-util/diffoscope-129
@@ -11,5 +11,5 @@ RDEPEND=dev-python/python-magic[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-129.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4ce8c8538c26b5fddac45598a0eee347
diff --git a/metadata/md5-cache/dev-util/diffoscope-87 b/metadata/md5-cache/dev-util/diffoscope-87
index 9058a9b8b662..f8be42f3e758 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_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-87.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb5e366dcc68bf7f06e295da34f6a36a
diff --git a/metadata/md5-cache/dev-util/diffoscope-88 b/metadata/md5-cache/dev-util/diffoscope-88
index de6b21d685cb..255f9224806d 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_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diffoscope/diffoscope-88.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=508d830c5f4aec1530d8f497a41d5f72
diff --git a/metadata/md5-cache/dev-util/diffuse-0.4.8 b/metadata/md5-cache/dev-util/diffuse-0.4.8
deleted file mode 100644
index f92554c212ad..000000000000
--- a/metadata/md5-cache/dev-util/diffuse-0.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !sci-chemistry/tinker
-DESCRIPTION=A graphical tool to compare and merge text files
-EAPI=5
-HOMEPAGE=http://diffuse.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86 ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/diffuse/diffuse-0.4.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cfc7180397f132b1634402b128058d94
diff --git a/metadata/md5-cache/dev-util/diffuse-0.4.8-r1 b/metadata/md5-cache/dev-util/diffuse-0.4.8-r1
new file mode 100644
index 000000000000..af5e9af28e85
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffuse-0.4.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !sci-chemistry/tinker
+DESCRIPTION=A graphical tool to compare and merge text files
+EAPI=5
+HOMEPAGE=http://diffuse.sourceforge.net/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86 ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/pygtk[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/diffuse/diffuse-0.4.8.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a7b41b5037ed7f06eff8b58bfe1a605c
diff --git a/metadata/md5-cache/dev-util/diffuse-0.5.0_alpha7-r1 b/metadata/md5-cache/dev-util/diffuse-0.5.0_alpha7-r1
new file mode 100644
index 000000000000..e3d17e32f09a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffuse-0.5.0_alpha7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !sci-chemistry/tinker
+DESCRIPTION=A graphical tool to compare and merge text files
+EAPI=7
+HOMEPAGE=http://diffuse.sourceforge.net/ https://github.com/MightyCreak/diffuse/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-),cairo] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-),cairo] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-),cairo] ) x11-libs/gtk+:3[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grozin/diffuse-0.5.0_alpha7.tar.xz
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d4dc2313f639c87586cb1d8ba28cd635
diff --git a/metadata/md5-cache/dev-util/distro-info-0.14 b/metadata/md5-cache/dev-util/distro-info-0.14
index 93dd8f7a4903..7d73b6381bc0 100644
--- a/metadata/md5-cache/dev-util/distro-info-0.14
+++ b/metadata/md5-cache/dev-util/distro-info-0.14
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_0.14.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d70143e4ad34d8af73fd2051b7ed959
diff --git a/metadata/md5-cache/dev-util/distro-info-0.22 b/metadata/md5-cache/dev-util/distro-info-0.22
index 4b235f12e8d3..6401b3836455 100644
--- a/metadata/md5-cache/dev-util/distro-info-0.22
+++ b/metadata/md5-cache/dev-util/distro-info-0.22
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/distro-info/distro-info_0.22.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=70984072fad11e111cbfe422309933d9
diff --git a/metadata/md5-cache/dev-util/dogtail-0.9.10 b/metadata/md5-cache/dev-util/dogtail-0.9.10
index 80c6a16b975f..a91bd89711a5 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_6 )
 SLOT=0
 SRC_URI=https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59cdbcee6e9ff4dd31a0f06a7f0b6631
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.10 b/metadata/md5-cache/dev-util/dput-ng-1.10
deleted file mode 100644
index 5e2cf8088c58..000000000000
--- a/metadata/md5-cache/dev-util/dput-ng-1.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/python-debian[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/distro-info[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/asciidoc test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/python-debian[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Next generation Debian package upload tool
-EAPI=6
-HOMEPAGE=https://people.debian.org/~paultag/dput-ng/
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/python-debian[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/distro-info[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69fae0cfd5cb975a30572f996549ff34
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.10-r1 b/metadata/md5-cache/dev-util/dput-ng-1.10-r1
new file mode 100644
index 000000000000..018e9631bb77
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dput-ng-1.10-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-python/python-debian[python_targets_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)] dev-util/distro-info[python,python_targets_python2_7(-)] ) app-text/asciidoc test? ( python_single_target_python2_7? ( dev-python/nose[python_targets_python2_7(-)] dev-python/python-debian[python_targets_python2_7(-)] ) ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=Next generation Debian package upload tool
+EAPI=6
+HOMEPAGE=https://people.debian.org/~paultag/dput-ng/
+IUSE=test +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( dev-python/python-debian[python_targets_python2_7(-)] dev-python/paramiko[python_targets_python2_7(-)] dev-util/distro-info[python,python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=239efcd73dd4f2104cf3a5b6f62d6369
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.28 b/metadata/md5-cache/dev-util/dput-ng-1.28
deleted file mode 100644
index 9e6f24c3fefd..000000000000
--- a/metadata/md5-cache/dev-util/dput-ng-1.28
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/python-debian[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/distro-info[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] app-text/asciidoc test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-debian[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/debhelper )
-DESCRIPTION=Next generation Debian package upload tool
-EAPI=7
-HOMEPAGE=https://people.debian.org/~paultag/dput-ng/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/python-debian[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/paramiko[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/distro-info[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.28.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=15ce3b5564b6504e00ade82e8e01a1a0
diff --git a/metadata/md5-cache/dev-util/dput-ng-1.28-r1 b/metadata/md5-cache/dev-util/dput-ng-1.28-r1
new file mode 100644
index 000000000000..28691d763b48
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dput-ng-1.28-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/python-debian[python_targets_python3_6(-)] dev-python/paramiko[python_targets_python3_6(-)] dev-util/distro-info[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/python-debian[python_targets_python3_7(-)] dev-python/paramiko[python_targets_python3_7(-)] dev-util/distro-info[python,python_targets_python3_7(-)] ) app-text/asciidoc test? ( python_single_target_python3_6? ( dev-python/nose[python_targets_python3_6(-)] dev-python/python-debian[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] dev-python/python-debian[python_targets_python3_7(-)] ) dev-util/debhelper )
+DESCRIPTION=Next generation Debian package upload tool
+EAPI=7
+HOMEPAGE=https://people.debian.org/~paultag/dput-ng/
+IUSE=test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-python/python-debian[python_targets_python3_6(-)] dev-python/paramiko[python_targets_python3_6(-)] dev-util/distro-info[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/python-debian[python_targets_python3_7(-)] dev-python/paramiko[python_targets_python3_7(-)] dev-util/distro-info[python,python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/dput-ng/dput-ng_1.28.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c8808b12e8c0c3fc58235bd7cc6a7c6a
diff --git a/metadata/md5-cache/dev-util/drone-0.8.9 b/metadata/md5-cache/dev-util/drone-0.8.9
index dbe3ce9d9e4d..6d7c9dfc3ba6 100644
--- a/metadata/md5-cache/dev-util/drone-0.8.9
+++ b/metadata/md5-cache/dev-util/drone-0.8.9
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone/archive/768ed784bd74b0e0c2d8d49c4c8b6dca99b25e96.tar.gz -> drone-0.8.9.tar.gz https://github.com/drone/drone-ui/archive/e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz -> github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz https://github.com/golang/protobuf/archive/aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz -> github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz https://github.com/golang/net/archive/9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz -> github.com-golang-net-9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=94183e3ec9697b4c8314409292fd10c2
diff --git a/metadata/md5-cache/dev-util/drone-cli-0.8.6 b/metadata/md5-cache/dev-util/drone-cli-0.8.6
index c74a9f70161e..2a409bdbb02f 100644
--- a/metadata/md5-cache/dev-util/drone-cli-0.8.6
+++ b/metadata/md5-cache/dev-util/drone-cli-0.8.6
@@ -5,9 +5,8 @@ EAPI=6
 HOMEPAGE=https://github.com/drone/drone-cli
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=!!<dev-util/drone-0.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone-cli/archive/v0.8.6.tar.gz -> drone-cli-0.8.6.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=2f650b5537815bcddd9d02a3a8279719
+_md5_=8c72f826bb9d46a521e4fec63735c289
diff --git a/metadata/md5-cache/dev-util/drone-cli-1.1.4 b/metadata/md5-cache/dev-util/drone-cli-1.1.4
index 9f7c2735c473..a11c65c2bda3 100644
--- a/metadata/md5-cache/dev-util/drone-cli-1.1.4
+++ b/metadata/md5-cache/dev-util/drone-cli-1.1.4
@@ -5,9 +5,8 @@ EAPI=6
 HOMEPAGE=https://github.com/drone/drone-cli
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=!!<dev-util/drone-0.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/drone/drone-cli/archive/v1.1.4.tar.gz -> drone-cli-1.1.4.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=68036157c37cd25758b11c642b13703c
+_md5_=c97278f82d6526f39235f1a31d1e0476
diff --git a/metadata/md5-cache/dev-util/duma-2.5.15-r2 b/metadata/md5-cache/dev-util/duma-2.5.15-r2
index 07807bd61c29..e86daf75c33a 100644
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r2
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r2
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6534ccc00b846f96600be69fc0b7d463
+_md5_=4337254cc8ec9972cbf947c8c81756f5
diff --git a/metadata/md5-cache/dev-util/dwarves-1.12 b/metadata/md5-cache/dev-util/dwarves-1.12
index 83ee38479c21..49afb45fd74c 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.12
+++ b/metadata/md5-cache/dev-util/dwarves-1.12
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.12.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ceac71dd3d81320f4bb2a8ab84f9bb8
diff --git a/metadata/md5-cache/dev-util/dwarves-1.13 b/metadata/md5-cache/dev-util/dwarves-1.13
index c3485281b763..ee4d929fa3f4 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.13
+++ b/metadata/md5-cache/dev-util/dwarves-1.13
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.13.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a47a32116dc0c5f9448524198acbc795
diff --git a/metadata/md5-cache/dev-util/dwarves-1.15 b/metadata/md5-cache/dev-util/dwarves-1.15
index d58f62d773fb..842cb361ae20 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.15
+++ b/metadata/md5-cache/dev-util/dwarves-1.15
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_targets_python3_6 +python_single_target_python3_6
+IUSE=debug +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.15.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8786cb20c8ececc7b7ae5d11aa30ac1
diff --git a/metadata/md5-cache/dev-util/dwarves-1.16 b/metadata/md5-cache/dev-util/dwarves-1.16
index fb67a91f0f60..6996d41f790a 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.16
+++ b/metadata/md5-cache/dev-util/dwarves-1.16
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_targets_python3_6 +python_single_target_python3_6
+IUSE=debug +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.131 <=dev-libs/elfutils-0.177 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.16.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d8786cb20c8ececc7b7ae5d11aa30ac1
diff --git a/metadata/md5-cache/dev-util/dwarves-1.16-r1 b/metadata/md5-cache/dev-util/dwarves-1.16-r1
index e977b7ca7bd9..0bc656c2b806 100644
--- a/metadata/md5-cache/dev-util/dwarves-1.16-r1
+++ b/metadata/md5-cache/dev-util/dwarves-1.16-r1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_targets_python3_6 +python_single_target_python3_6
+IUSE=debug +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.16.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=132a8e785e8f8e0e279f6c41ec9cb6d6
diff --git a/metadata/md5-cache/dev-util/dwarves-9999 b/metadata/md5-cache/dev-util/dwarves-9999
index 9693fb0b1dab..cf0ea43301ec 100644
--- a/metadata/md5-cache/dev-util/dwarves-9999
+++ b/metadata/md5-cache/dev-util/dwarves-9999
@@ -3,11 +3,11 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
 EAPI=6
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
-IUSE=debug +python_targets_python3_6 +python_single_target_python3_6
+IUSE=debug +python_single_target_python3_6
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/elfutils-0.178 sys-libs/zlib
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9fcbf347b7138be65822a8ea9323d123
diff --git a/metadata/md5-cache/dev-util/electron-2.0.17-r2 b/metadata/md5-cache/dev-util/electron-2.0.17-r2
index 1c5ed163605d..bab1bbff7c0b 100644
--- a/metadata/md5-cache/dev-util/electron-2.0.17-r2
+++ b/metadata/md5-cache/dev-util/electron-2.0.17-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= system-ssl? ( <dev-libs/openssl-1.1:= ) >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) 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.4.2:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( =media-libs/libvpx-1.7*:=[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:= ) >=net-dns/c-ares-1.13.0:= >=net-libs/nghttp2-1.32.0:= sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libnotify:= 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-0.1583 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-4.6.1 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= system-ssl? ( <dev-libs/openssl-1.1:= ) >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) 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.4.2:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( =media-libs/libvpx-1.7*:=[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(-)] ) media-libs/opus:= ) >=net-dns/c-ares-1.13.0:= >=net-libs/nghttp2-1.32.0:= sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libnotify:= 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-0.1583 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-4.6.1 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Cross platform application development framework based on web technologies
 EAPI=6
 HOMEPAGE=https://electronjs.org/
 IUSE=cups custom-cflags gconf gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +system-libvpx +system-ssl +tcmalloc 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 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= system-ssl? ( <dev-libs/openssl-1.1:= ) >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) 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.4.2:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( =media-libs/libvpx-1.7*:=[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:= ) >=net-dns/c-ares-1.13.0:= >=net-libs/nghttp2-1.32.0:= sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libnotify:= 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 ) !<dev-util/electron-0.36.12-r4 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+RDEPEND=app-arch/bzip2:= >=app-eselect/eselect-electron-2.0 cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/icu-58:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= system-ssl? ( <dev-libs/openssl-1.1:= ) >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) 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.4.2:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( =media-libs/libvpx-1.7*:=[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(-)] ) media-libs/opus:= ) >=net-dns/c-ares-1.13.0:= >=net-libs/nghttp2-1.32.0:= sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libnotify:= 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 ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) ) !test? ( test )
 SLOT=2.0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-61.0.3163.100.tar.xz https://github.com/electron/electron/archive/v2.0.17.tar.gz -> electron-2.0.17.tar.gz https://github.com/electron/chromium-breakpad/archive/82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz -> electron-chromium-breakpad-82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz https://github.com/google/breakpad/archive/67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz -> electron-breakpad-67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz https://github.com/electron/node/archive/51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz -> electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz https://github.com/zcbenz/native-mate/archive/6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz -> electron-native-mate-6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz https://github.com/electron/pdf-viewer/archive/a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz -> electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz https://github.com/elprans/grit/archive/9536fb6429147d27ef1563088341825db0a893cd.tar.gz -> electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz https://github.com/electron/libchromiumcontent/archive/daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987.tar.gz -> electron-libchromiumcontent-daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987.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/26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz -> electron-patches-26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=72b102efe3eeada6e24b45358f9ed116
+_md5_=0bb08e8c942883dbc16127ee1dbe42e1
diff --git a/metadata/md5-cache/dev-util/eric-18.03 b/metadata/md5-cache/dev-util/eric-18.03
index ccd8e53cc087..e77bf4967a4f 100644
--- a/metadata/md5-cache/dev-util/eric-18.03
+++ b/metadata/md5-cache/dev-util/eric-18.03
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/sip-4.14.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=dev-python/qscintilla-python-2.10[qt5(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python2_7? ( >=dev-python/sip-4.14.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,python_targets_python2_7(-)] >=dev-python/qscintilla-python-2.10[qt5(+),python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/sip-4.14.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10[qt5(+),python_targets_python3_6(-)] )
 DESCRIPTION=A full featured Python IDE using PyQt and QScintilla
 EAPI=6
 HOMEPAGE=https://eric-ide.python-projects.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/sip-4.14.3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=dev-python/qscintilla-python-2.10[qt5(+),python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] || ( dev-python/PyQt5[help,webengine,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[help,webkit,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) >=dev-python/chardet-3.0.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=dev-python/coverage-4.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] !dev-util/eric:4 !dev-util/eric:5
-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 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python2_7? ( >=dev-python/sip-4.14.3[python_targets_python2_7(-)] >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,python_targets_python2_7(-)] >=dev-python/qscintilla-python-2.10[qt5(+),python_targets_python2_7(-)] ) python_single_target_python3_6? ( >=dev-python/sip-4.14.3[python_targets_python3_6(-)] >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10[qt5(+),python_targets_python3_6(-)] ) python_single_target_python2_7? ( || ( dev-python/PyQt5[help,webengine,python_targets_python2_7(-)] dev-python/PyQt5[help,webkit,python_targets_python2_7(-)] ) >=dev-python/chardet-3.0.4[python_targets_python2_7(-)] >=dev-python/coverage-4.1.0[python_targets_python2_7(-)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)] ) python_single_target_python3_6? ( || ( dev-python/PyQt5[help,webengine,python_targets_python3_6(-)] dev-python/PyQt5[help,webkit,python_targets_python3_6(-)] ) >=dev-python/chardet-3.0.4[python_targets_python3_6(-)] >=dev-python/coverage-4.1.0[python_targets_python3_6(-)] >=dev-python/pygments-2.2.0[python_targets_python3_6(-)] ) !dev-util/eric:4 !dev-util/eric:5
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=6
 SRC_URI=mirror://sourceforge/eric-ide/eric6/stable/18.03/eric6-18.03.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48a9f834f72f54bf589a6bdf4ef5b2c0
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=76877c65b147c229787bc5206bdb690f
diff --git a/metadata/md5-cache/dev-util/eric-19.11 b/metadata/md5-cache/dev-util/eric-19.11
deleted file mode 100644
index 27626db0eb48..000000000000
--- a/metadata/md5-cache/dev-util/eric-19.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/PyQtWebEngine[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/qscintilla-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A full featured Python IDE using PyQt and QScintilla
-EAPI=7
-HOMEPAGE=https://eric-ide.python-projects.org/
-IUSE=spell 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[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/PyQtWebEngine[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/qscintilla-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/chardet-3.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] spell? ( dev-python/pyenchant[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-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=6
-SRC_URI=mirror://sourceforge/eric-ide/eric6/stable/19.11/eric6-19.11.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86a6e45b97bd5cc17732089de0a6d8ad
diff --git a/metadata/md5-cache/dev-util/eric-19.11-r1 b/metadata/md5-cache/dev-util/eric-19.11-r1
new file mode 100644
index 000000000000..d088cd3b8ac1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/eric-19.11-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,python_targets_python3_6(-)] dev-python/PyQtWebEngine[python_targets_python3_6(-)] dev-python/qscintilla-python[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,python_targets_python3_7(-)] dev-python/PyQtWebEngine[python_targets_python3_7(-)] dev-python/qscintilla-python[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A full featured Python IDE using PyQt and QScintilla
+EAPI=7
+HOMEPAGE=https://eric-ide.python-projects.org/
+IUSE=spell 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[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,python_targets_python3_6(-)] dev-python/PyQtWebEngine[python_targets_python3_6(-)] dev-python/qscintilla-python[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,python_targets_python3_7(-)] dev-python/PyQtWebEngine[python_targets_python3_7(-)] dev-python/qscintilla-python[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) python_single_target_python3_6? ( >=dev-python/chardet-3.0.4[python_targets_python3_6(-)] >=dev-python/pygments-2.3.1[python_targets_python3_6(-)] spell? ( dev-python/pyenchant[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( >=dev-python/chardet-3.0.4[python_targets_python3_7(-)] >=dev-python/pygments-2.3.1[python_targets_python3_7(-)] spell? ( dev-python/pyenchant[python_targets_python3_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=6
+SRC_URI=mirror://sourceforge/eric-ide/eric6/stable/19.11/eric6-19.11.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=94a22d88913aa2f56555627f0d439c6b
diff --git a/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1 b/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
index c4885f404ef0..a5fe7d79379a 100644
--- a/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
+++ b/metadata/md5-cache/dev-util/fix-la-relink-command-0.1.1
@@ -8,4 +8,4 @@ LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tetromino/distfiles/fix-la-relink-command/fix-la-relink-command-0.1.1.tar.xz
-_md5_=2144817cb112c1b91e52ccac6f585df5
+_md5_=5feffa2db66f87a71119e67c049fc9ba
diff --git a/metadata/md5-cache/dev-util/flawfinder-1.31 b/metadata/md5-cache/dev-util/flawfinder-1.31
index aa3bd6eb5c9c..0931019f9d17 100644
--- a/metadata/md5-cache/dev-util/flawfinder-1.31
+++ b/metadata/md5-cache/dev-util/flawfinder-1.31
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Examines C/C++ source code for security flaws
 EAPI=5
 HOMEPAGE=https://www.dwheeler.com/flawfinder/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.dwheeler.com/flawfinder/flawfinder-1.31.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=31be0ab998b3da2f8c3b4e5e32290c92
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.10 b/metadata/md5-cache/dev-util/flawfinder-2.0.10
index 7689a01e2564..9220e0fd3b3e 100644
--- a/metadata/md5-cache/dev-util/flawfinder-2.0.10
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.10
@@ -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_6 python_targets_python3_7 ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://www.dwheeler.com/flawfinder/flawfinder-2.0.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d655ae36b6d5ca9a6b027af59d162035
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.7 b/metadata/md5-cache/dev-util/flawfinder-2.0.7
index 2c6d795a6e90..f211dc597020 100644
--- a/metadata/md5-cache/dev-util/flawfinder-2.0.7
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.7
@@ -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_6 python_targets_python3_7 ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://www.dwheeler.com/flawfinder/flawfinder-2.0.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d655ae36b6d5ca9a6b027af59d162035
diff --git a/metadata/md5-cache/dev-util/flawfinder-2.0.8 b/metadata/md5-cache/dev-util/flawfinder-2.0.8
index 3fb2f2a8faf1..bc7ed754f542 100644
--- a/metadata/md5-cache/dev-util/flawfinder-2.0.8
+++ b/metadata/md5-cache/dev-util/flawfinder-2.0.8
@@ -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_6 python_targets_python3_7 ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://www.dwheeler.com/flawfinder/flawfinder-2.0.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d655ae36b6d5ca9a6b027af59d162035
diff --git a/metadata/md5-cache/dev-util/gcovr-3.3 b/metadata/md5-cache/dev-util/gcovr-3.3
index bceb8ea74f74..9225f42cb3c9 100644
--- a/metadata/md5-cache/dev-util/gcovr-3.3
+++ b/metadata/md5-cache/dev-util/gcovr-3.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A Python script for summarizing gcov data
 EAPI=6
 HOMEPAGE=https://github.com/gcovr/gcovr
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=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
 SRC_URI=https://github.com/gcovr/gcovr/archive/3.3.tar.gz -> gcovr-3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d19af53f27adf8de7670415523cf6124
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=adf703159a3f87058e47a5b9d2ad092d
diff --git a/metadata/md5-cache/dev-util/gcovr-4.1 b/metadata/md5-cache/dev-util/gcovr-4.1
index ac0819a88dd9..f0d8a1849fa2 100644
--- a/metadata/md5-cache/dev-util/gcovr-4.1
+++ b/metadata/md5-cache/dev-util/gcovr-4.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/gcovr/gcovr/archive/4.1.tar.gz -> gcovr-4.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=22c678a13265987d738eeeb7f3c85e2b
diff --git a/metadata/md5-cache/dev-util/gcovr-4.2 b/metadata/md5-cache/dev-util/gcovr-4.2
index 860427454fd3..f6929632ebc7 100644
--- a/metadata/md5-cache/dev-util/gcovr-4.2
+++ b/metadata/md5-cache/dev-util/gcovr-4.2
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/PyUtilib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/PyUtilib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/python-typing[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) test? ( dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A Python script for summarizing gcov data
 EAPI=7
 HOMEPAGE=https://github.com/gcovr/gcovr
-IUSE=test test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gcovr/gcovr/archive/4.2.tar.gz -> gcovr-4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7f8414412f3ae58581547044551cf6bf
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=290648ac31cc39db3d07b622618d1f44
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.60.7 b/metadata/md5-cache/dev-util/gdbus-codegen-2.60.7
index 6b087b7117bb..fc330657658e 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.60.7
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.60.7
@@ -1,15 +1,15 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 DESCRIPTION=GDBus code and documentation generator
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.7.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a47b34d0fe02726103269af572d9f41d
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.30 b/metadata/md5-cache/dev-util/geany-plugins-1.30
index bbb77fef41de..069bc1e2ffbd 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.30
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.30
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-util/geany-1.26[gtk3=] dev-libs/glib:2 dev-libs/libxml2:2 autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) enchant? ( app-text/enchant:0 ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DEPEND=>=dev-util/geany-1.26[gtk3=] dev-libs/glib:2 dev-libs/libxml2:2 autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) enchant? ( app-text/enchant:0 ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=A collection of different plugins for Geany
 EAPI=6
 HOMEPAGE=https://plugins.geany.org
-IUSE=gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell lua multiterm nls +overview python scope soup +python_targets_python2_7 +python_single_target_python2_7
+IUSE=gtk3 +autoclose +automark +commander ctags debugger +defineformat enchant git gpg gtkspell lua multiterm nls +overview python scope soup +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-util/geany-1.26[gtk3=] dev-libs/glib:2 dev-libs/libxml2:2 autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) enchant? ( app-text/enchant:0 ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
-REQUIRED_USE=gtk3? ( !debugger !multiterm !python !scope ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RDEPEND=>=dev-util/geany-1.26[gtk3=] dev-libs/glib:2 dev-libs/libxml2:2 autoclose? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) commander? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) defineformat? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) enchant? ( app-text/enchant:0 ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) x11-libs/gtk+:2 >=x11-libs/vte-0.28:0 ) python? ( python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( x11-libs/vte:0 ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
+REQUIRED_USE=gtk3? ( !debugger !multiterm !python !scope ) python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.30.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bfff1c7cf6a698b8ba9bc21a346bea73
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5e2113853abf31fe377c7edaa0c0c085
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.34 b/metadata/md5-cache/dev-util/geany-plugins-1.34
deleted file mode 100644
index 4dfe25a96057..000000000000
--- a/metadata/md5-cache/dev-util/geany-plugins-1.34
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 >=dev-util/geany-1.34[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 )
-DESCRIPTION=A collection of different plugins for Geany
-EAPI=7
-HOMEPAGE=https://plugins.geany.org
-IUSE=+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.34[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
-REQUIRED_USE=gtk3? ( !debugger !multiterm !python ) !gtk3? ( !markdown ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.34.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
-_md5_=8ae1c0b1be159df5bfeecc56848edb5a
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.34-r1 b/metadata/md5-cache/dev-util/geany-plugins-1.34-r1
new file mode 100644
index 000000000000..af473e161faa
--- /dev/null
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.34-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 >=dev-util/geany-1.34[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 )
+DESCRIPTION=A collection of different plugins for Geany
+EAPI=7
+HOMEPAGE=https://plugins.geany.org
+IUSE=+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup +python_single_target_python2_7
+KEYWORDS=~alpha amd64 arm ia64 ppc ppc64 sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.34[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
+REQUIRED_USE=gtk3? ( !debugger !multiterm !python ) !gtk3? ( !markdown ) python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.34.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
+_md5_=c9d18a534cabeabbca45bab352eb9d05
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.35 b/metadata/md5-cache/dev-util/geany-plugins-1.35
index aa65f49d8cd1..4ed4fd2f0f78 100644
--- a/metadata/md5-cache/dev-util/geany-plugins-1.35
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.35
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 )
+DEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 )
 DESCRIPTION=A collection of different plugins for Geany
 EAPI=7
 HOMEPAGE=https://plugins.geany.org
-IUSE=+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup +python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
-REQUIRED_USE=gtk3? ( !debugger !multiterm !python ) !gtk3? ( !markdown ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( x11-libs/vte:0 ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) scope? ( sys-devel/gdb )
+REQUIRED_USE=gtk3? ( !debugger !multiterm !python ) !gtk3? ( !markdown ) python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.35.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
-_md5_=aec70cd813a01095f733acecd2334ef9
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
+_md5_=158c799ce04e6b0c8ecf8f9c614d6706
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.36 b/metadata/md5-cache/dev-util/geany-plugins-1.36
deleted file mode 100644
index 3f00fec985fb..000000000000
--- a/metadata/md5-cache/dev-util/geany-plugins-1.36
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= )
-DESCRIPTION=A collection of different plugins for Geany
-EAPI=7
-HOMEPAGE=https://plugins.geany.org
-IUSE=+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup workbench +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
-REQUIRED_USE=gtk3? ( !multiterm !python ) !gtk3? ( !markdown ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.36.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
-_md5_=b79cc4dc9bd472dea04f6ada82d621a2
diff --git a/metadata/md5-cache/dev-util/geany-plugins-1.36-r1 b/metadata/md5-cache/dev-util/geany-plugins-1.36-r1
new file mode 100644
index 000000000000..51b9cf73511b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/geany-plugins-1.36-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= )
+DESCRIPTION=A collection of different plugins for Geany
+EAPI=7
+HOMEPAGE=https://plugins.geany.org
+IUSE=+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup workbench +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-util/geany-1.35[gtk3=] gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ctags? ( dev-util/ctags ) debugger? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) enchant? ( app-text/enchant:= ) git? ( dev-libs/libgit2:= ) gpg? ( app-crypt/gpgme:1= ) gtkspell? ( gtk3? ( app-text/gtkspell:3= ) !gtk3? ( app-text/gtkspell:2 ) ) lua? ( dev-lang/lua:0= ) markdown? ( app-text/discount net-libs/webkit-gtk:4 ) multiterm? ( || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=x11-libs/vte-0.28:0 ) pretty-printer? ( dev-libs/libxml2:2 ) python? ( python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) scope? ( gtk3? ( x11-libs/vte:2.91 ) !gtk3? ( x11-libs/vte:0 ) ) soup? ( net-libs/libsoup:2.4 ) workbench? ( dev-libs/libgit2:= ) scope? ( sys-devel/gdb )
+REQUIRED_USE=gtk3? ( !multiterm !python ) !gtk3? ( !markdown ) python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=https://plugins.geany.org/geany-plugins/geany-plugins-1.36.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
+_md5_=5ca769b22d4a818ba41fc58566748a92
diff --git a/metadata/md5-cache/dev-util/gertty-1.6.0-r1 b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
index f6e5c058e3d2..295bbb09c20e 100644
--- a/metadata/md5-cache/dev-util/gertty-1.6.0-r1
+++ b/metadata/md5-cache/dev-util/gertty-1.6.0-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://pypi.org/project/gertty/
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/urwid-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/git-python-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ply-3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/git-python-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ply-3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gertty/gertty-1.6.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6190d4aae3caa9deea192ddbc343f973
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=03d401cd2aa461cad96418654be83742
diff --git a/metadata/md5-cache/dev-util/gertty-9999 b/metadata/md5-cache/dev-util/gertty-9999
index 5b6ff1bb9f33..b20f42c94467 100644
--- a/metadata/md5-cache/dev-util/gertty-9999
+++ b/metadata/md5-cache/dev-util/gertty-9999
@@ -7,8 +7,8 @@ HOMEPAGE=https://pypi.org/project/gertty/
 IUSE=python_targets_python3_6 python_targets_python3_7
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/urwid-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/git-python-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ply-3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=>=dev-python/pbr-0.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/urwid-1.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/git-python-0.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/requests-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/alembic-0.6.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/voluptuous-0.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ply-3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4123557a68f9fa90452ef201d4230baa
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=63e0813e7ad3b8e20fd6d192689295e8
diff --git a/metadata/md5-cache/dev-util/glade-3.22.1 b/metadata/md5-cache/dev-util/glade-3.22.1
deleted file mode 100644
index ca236639654d..000000000000
--- a/metadata/md5-cache/dev-util/glade-3.22.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.53.2:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) webkit? ( >=net-libs/webkit-gtk-2.12.0:4 ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A user interface designer for GTK+ and GNOME
-EAPI=6
-HOMEPAGE=https://glade.gnome.org/
-IUSE=debug +introspection python webkit +python_targets_python2_7 +python_single_target_python2_7 test
-KEYWORDS=~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.53.2:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=3.10/6
-SRC_URI=mirror://gnome/sources/glade/3.22/glade-3.22.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce23e8949a6613de4f11fb8c0a33557b
diff --git a/metadata/md5-cache/dev-util/glade-3.22.1-r1 b/metadata/md5-cache/dev-util/glade-3.22.1-r1
new file mode 100644
index 000000000000..52794cf26e40
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glade-3.22.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.53.2:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_single_target_python2_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-3.8:3[python_targets_python2_7(-)] ) ) webkit? ( >=net-libs/webkit-gtk-2.12.0:4 ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools dev-libs/libxslt >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A user interface designer for GTK+ and GNOME
+EAPI=6
+HOMEPAGE=https://glade.gnome.org/
+IUSE=debug +introspection python webkit +python_single_target_python2_7 test
+KEYWORDS=~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.53.2:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_single_target_python2_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-3.8:3[python_targets_python2_7(-)] ) ) webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=test
+SLOT=3.10/6
+SRC_URI=mirror://gnome/sources/glade/3.22/glade-3.22.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82fda2acc7f4514091afec6dbd0f81d1
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.60.7 b/metadata/md5-cache/dev-util/glib-utils-2.60.7
index 4bdcfb0b91fb..ed5805c98b08 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.60.7
+++ b/metadata/md5-cache/dev-util/glib-utils-2.60.7
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Build utilities for GLib using projects
 EAPI=7
 HOMEPAGE=https://www.gtk.org/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv 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 ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !<dev-libs/glib-2.56.2:2
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.60/glib-2.60.7.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=03966de06bcd9107134fd2e7d457c879
diff --git a/metadata/md5-cache/dev-util/gn-0.1616 b/metadata/md5-cache/dev-util/gn-0.1616
index 2a1b73b8de29..3a7c01aebea7 100644
--- a/metadata/md5-cache/dev-util/gn-0.1616
+++ b/metadata/md5-cache/dev-util/gn-0.1616
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja
 DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=GN is a meta-build system that generates build files for Ninja
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/gn-0.1616.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6350440c934ff4c4c39b9dd7fc97e619
+_md5_=8db18fcfa729c58114504968d4517d84
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.30.3 b/metadata/md5-cache/dev-util/gnome-builder-3.30.3
deleted file mode 100644
index 8be4434157cc..000000000000
--- a/metadata/md5-cache/dev-util/gnome-builder-3.30.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/libdazzle-3.30.2[introspection,vala?] >=dev-libs/glib-2.58.0:2 >=x11-libs/gtk+-3.24.0:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.30.1[vala?] >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[vala?] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.25.0[ssh] ) dev-libs/libpcre:3 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) >=dev-libs/gobject-introspection-1.48.0:= >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) sysprof? ( >=dev-util/sysprof-3.30.2[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=dev-util/meson-0.47.1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An IDE for writing GNOME-based software
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Builder
-IUSE=clang +devhelp doc +git gtk-doc sysprof test vala webkit +python_targets_python3_6 +python_single_target_python3_6 test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
-RDEPEND=>=dev-libs/libdazzle-3.30.2[introspection,vala?] >=dev-libs/glib-2.58.0:2 >=x11-libs/gtk+-3.24.0:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.30.1[vala?] >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[vala?] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.25.0[ssh] ) dev-libs/libpcre:3 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) >=dev-libs/gobject-introspection-1.48.0:= >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) sysprof? ( >=dev-util/sysprof-3.30.2[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-builder/3.30/gnome-builder-3.30.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf682a0279926065c0da902b00ec2415
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.30.3-r1 b/metadata/md5-cache/dev-util/gnome-builder-3.30.3-r1
new file mode 100644
index 000000000000..886af192f4cc
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.30.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libdazzle-3.30.2[introspection,vala?] >=dev-libs/glib-2.58.0:2 >=x11-libs/gtk+-3.24.0:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.30.1[vala?] >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?] >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[vala?] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.25.0[ssh] ) dev-libs/libpcre:3 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) >=dev-libs/gobject-introspection-1.48.0:= python_single_target_python3_6? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) sysprof? ( >=dev-util/sysprof-3.30.2[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=dev-util/meson-0.47.1 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An IDE for writing GNOME-based software
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder
+IUSE=clang +devhelp doc +git gtk-doc sysprof test vala webkit +python_single_target_python3_6 test
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=dev-libs/libdazzle-3.30.2[introspection,vala?] >=dev-libs/glib-2.58.0:2 >=x11-libs/gtk+-3.24.0:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.30.1[vala?] >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?] >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[vala?] >=dev-libs/libxml2-2.9.0 git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.25.0[ssh] ) dev-libs/libpcre:3 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) >=dev-libs/gobject-introspection-1.48.0:= python_single_target_python3_6? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) sysprof? ( >=dev-util/sysprof-3.30.2[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/3.30/gnome-builder-3.30.3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d5fc0212d325667bf921567941189b5
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.32.4 b/metadata/md5-cache/dev-util/gnome-builder-3.32.4
deleted file mode 100644
index 7f7bcf9fb4ee..000000000000
--- a/metadata/md5-cache/dev-util/gnome-builder-3.32.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=dev-util/meson-0.49.2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/libdazzle-3.31.90[introspection,vala?] >=dev-libs/glib-2.59.0:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91[vala?] >=x11-libs/pango-1.38.0 python_single_target_python3_6? ( >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] ) >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[introspection,vala?] >=net-libs/webkit-gtk-2.12.0:4=[introspection] >=dev-libs/libxml2-2.9.0 dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.28[ssh] dev-libs/libpcre:3 >=dev-libs/gobject-introspection-1.54.0:= >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10 ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.31.90[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An IDE for writing GNOME-based software
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Builder
-IUSE=clang +devhelp doc +glade gtk-doc spell sysprof test vala python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
-RDEPEND=>=dev-libs/libdazzle-3.31.90[introspection,vala?] >=dev-libs/glib-2.59.0:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91[vala?] >=x11-libs/pango-1.38.0 python_single_target_python3_6? ( >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] ) >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[introspection,vala?] >=net-libs/webkit-gtk-2.12.0:4=[introspection] >=dev-libs/libxml2-2.9.0 dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.28[ssh] dev-libs/libpcre:3 >=dev-libs/gobject-introspection-1.54.0:= >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10 ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.31.90[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-builder/3.32/gnome-builder-3.32.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-builder-3.32.4-patchset.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	c74f1124c627537c3be86281b81e10dc	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afbb73a00158c248e2cacc228e7bccde
diff --git a/metadata/md5-cache/dev-util/gnome-builder-3.32.4-r1 b/metadata/md5-cache/dev-util/gnome-builder-3.32.4-r1
new file mode 100644
index 000000000000..4eb663612a20
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-builder-3.32.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/sphinx ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils dev-util/glib-utils >=dev-util/meson-0.49.2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libdazzle-3.31.90[introspection,vala?] >=dev-libs/glib-2.59.0:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91[vala?] >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[introspection,vala?] >=net-libs/webkit-gtk-2.12.0:4=[introspection] >=dev-libs/libxml2-2.9.0 dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.28[ssh] dev-libs/libpcre:3 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_6? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10 ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.31.90[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An IDE for writing GNOME-based software
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder
+IUSE=clang +devhelp doc +glade gtk-doc spell sysprof test vala python_single_target_python3_6 python_single_target_python3_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=dev-libs/libdazzle-3.31.90[introspection,vala?] >=dev-libs/glib-2.59.0:2 >=x11-libs/gtk+-3.22.26:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.19.91[vala?] >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] >=dev-libs/template-glib-3.28.0[introspection,vala?] >=x11-libs/vte-0.40.2:2.91[introspection,vala?] >=net-libs/webkit-gtk-2.12.0:4=[introspection] >=dev-libs/libxml2-2.9.0 dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.28[ssh] dev-libs/libpcre:3 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_6? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10 ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) sysprof? ( >=dev-util/sysprof-3.31.90[gtk] ) vala? ( dev-lang/vala:= || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/3.32/gnome-builder-3.32.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-builder-3.32.4-patchset.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	llvm	c74f1124c627537c3be86281b81e10dc	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2d1963878d896c0c51b28298fc7970e
diff --git a/metadata/md5-cache/dev-util/gnome-devel-docs-3.32.1 b/metadata/md5-cache/dev-util/gnome-devel-docs-3.32.1
new file mode 100644
index 000000000000..3114a53eeada
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gnome-devel-docs-3.32.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Documentation for developing for the GNOME desktop environment
+EAPI=6
+HOMEPAGE=https://developer.gnome.org/
+KEYWORDS=~amd64 ~ppc ~x86
+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.32/gnome-devel-docs-3.32.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f43643f88974b0f595ee8255b55499dc
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.6.2 b/metadata/md5-cache/dev-util/google-perftools-2.6.2
index d132b8262a50..c7a2a76f9eab 100644
--- a/metadata/md5-cache/dev-util/google-perftools-2.6.2
+++ b/metadata/md5-cache/dev-util/google-perftools-2.6.2
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0/4
-SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.6.2 -> gperftools-2.6.2.tar.gz
+SRC_URI=https://github.com/gperftools/gperftools/archive/gperftools-2.6.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7762f163f9df9380be2c1c21ae9aba09
+_md5_=f55b531d135d23934aadd6ae9c8fb49a
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.7 b/metadata/md5-cache/dev-util/google-perftools-2.7
index 02fe14aa1d2a..a33658cf2907 100644
--- a/metadata/md5-cache/dev-util/google-perftools-2.7
+++ b/metadata/md5-cache/dev-util/google-perftools-2.7
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0/4
-SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.7 -> gperftools-2.7.tar.gz
+SRC_URI=https://github.com/gperftools/gperftools/archive/gperftools-2.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=be15e1b4ad410044311f9edeeaa9c0cd
+_md5_=ba89f6f7a22719ae44c342cea6a9f441
diff --git a/metadata/md5-cache/dev-util/google-perftools-2.7-r1 b/metadata/md5-cache/dev-util/google-perftools-2.7-r1
index 77dff3bf43ea..6841fb1283b7 100644
--- a/metadata/md5-cache/dev-util/google-perftools-2.7-r1
+++ b/metadata/md5-cache/dev-util/google-perftools-2.7-r1
@@ -9,6 +9,6 @@ LICENSE=MIT
 RDEPEND=!ppc64? ( sys-libs/libunwind )
 RESTRICT=!test? ( test )
 SLOT=0/4
-SRC_URI=https://github.com/gperftools/gperftools/tarball/gperftools-2.7 -> gperftools-2.7.tar.gz
+SRC_URI=https://github.com/gperftools/gperftools/archive/gperftools-2.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=53b885f553ac578917f85af38e6a0cca
+_md5_=673c169c92bbcfdf3370c5cfc0851f77
diff --git a/metadata/md5-cache/dev-util/gource-0.49 b/metadata/md5-cache/dev-util/gource-0.49
deleted file mode 100644
index d6cde0243e8e..000000000000
--- a/metadata/md5-cache/dev-util/gource-0.49
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa[X(+)] virtual/glu:0 virtual/pkgconfig >=media-libs/glm-0.9.3
-DESCRIPTION=A software version control visualization tool
-EAPI=6
-HOMEPAGE=https://gource.io/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa[X(+)] virtual/glu:0 media-fonts/freefont
-SLOT=0
-SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.49/gource-0.49.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f63fd3fa0f8bb41100a449afab496e4
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2016.10.13 b/metadata/md5-cache/dev-util/gprof2dot-2016.10.13
index 02aa7a196c6f..3bed70d399cd 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_6 ) || ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2016.10.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4f1fc64b8833ec89d0cef20a1b735c1
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2017.09.19 b/metadata/md5-cache/dev-util/gprof2dot-2017.09.19
index 69fd6a06888e..1af292c604c3 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_6 ) || ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2017.9.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d0f38350d2164eb8a82ac49348ab565
diff --git a/metadata/md5-cache/dev-util/gprof2dot-2019.11.30 b/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
index f22c4ecce7a7..ee7eed2db3dd 100644
--- a/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
+++ b/metadata/md5-cache/dev-util/gprof2dot-2019.11.30
@@ -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_6 python_targets_python3_7 python_targets_python3_8 ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gprof2dot/gprof2dot-2019.11.30.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e005e9e69f0d25619d9a1b5a3b83cdb5
diff --git a/metadata/md5-cache/dev-util/gquilt-0.25-r1 b/metadata/md5-cache/dev-util/gquilt-0.25-r1
deleted file mode 100644
index ea19da95a2f2..000000000000
--- a/metadata/md5-cache/dev-util/gquilt-0.25-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-util/quilt dev-vcs/mercurial ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A Python/GTK wrapper for quilt
-EAPI=5
-HOMEPAGE=http://gquilt.sourceforge.net/ https://sourceforge.net/projects/gquilt/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-util/quilt dev-vcs/mercurial ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gquilt/gquilt-0.25.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eaa8473bf86e6d7d8f504275b1f20bf0
diff --git a/metadata/md5-cache/dev-util/gquilt-0.25-r2 b/metadata/md5-cache/dev-util/gquilt-0.25-r2
new file mode 100644
index 000000000000..c6ab0e9ce920
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gquilt-0.25-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) || ( dev-util/quilt dev-vcs/mercurial ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A Python/GTK wrapper for quilt
+EAPI=5
+HOMEPAGE=http://gquilt.sourceforge.net/ https://sourceforge.net/projects/gquilt/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) || ( dev-util/quilt dev-vcs/mercurial ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/gquilt/gquilt-0.25.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f0a4c66d65d9649fffbe928467629dad
diff --git a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32 b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
index 1805fd807627..b08881e80c00 100644
--- a/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
+++ b/metadata/md5-cache/dev-util/gtk-builder-convert-2.24.32
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=d
 DESCRIPTION=Converts Glade files to GtkBuilder XML format
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !<x11-libs/gtk+-2.24.31-r1:2
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.32.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aa1c86c013dafa741589fe288030bb6d
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 a02b562d1df2..e9e5cc99eeba 100644
--- a/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.25-r1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=GTK+ Documentation Generator
 EAPI=6
 HOMEPAGE=https://www.gtk.org/gtk-doc/
-IUSE=debug doc emacs highlight test vim +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug doc emacs highlight test vim +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2 FDL-1.1
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/glib-2.6:2 >=dev-lang/perl-5.18 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) highlight? ( vim? ( || ( app-editors/vim app-editors/gvim ) ) !vim? ( dev-util/source-highlight ) ) test? ( sys-devel/bc )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-doc/1.25/gtk-doc-1.25.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=222ae7cd803cb99950c6601876ad450f
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32 b/metadata/md5-cache/dev-util/gtk-doc-1.32
deleted file mode 100644
index 1aa2f775cbf8..000000000000
--- a/metadata/md5-cache/dev-util/gtk-doc-1.32
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ~dev-util/gtk-doc-am-1.32 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK+ Documentation Generator
-EAPI=6
-HOMEPAGE=https://www.gtk.org/gtk-doc/
-IUSE=debug doc emacs python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=GPL-2 FDL-1.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f80d563e7a1b89e20392e27ca6f1b7e4
diff --git a/metadata/md5-cache/dev-util/gtk-doc-1.32-r1 b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
new file mode 100644
index 000000000000..bdbaeb2545be
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gtk-doc-1.32-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] ) ~dev-util/gtk-doc-am-1.32 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK+ Documentation Generator
+EAPI=6
+HOMEPAGE=https://www.gtk.org/gtk-doc/
+IUSE=debug doc emacs python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-2 FDL-1.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.6:2 dev-libs/libxslt >=dev-libs/libxml2-2.3.6:2 ~app-text/docbook-xml-dtd-4.3 app-text/docbook-xsl-stylesheets ~app-text/docbook-sgml-dtd-3.0 >=app-text/docbook-dsssl-stylesheets-1.40 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python3_6? ( dev-python/pygments[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygments[python_targets_python3_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gtk-doc/1.32/gtk-doc-1.32.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c802eee6601f404e81f4b9b185527db
diff --git a/metadata/md5-cache/dev-util/gyp-20170904022846 b/metadata/md5-cache/dev-util/gyp-20170904022846
deleted file mode 100644
index 3729fde95882..000000000000
--- a/metadata/md5-cache/dev-util/gyp-20170904022846
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=GYP (Generate Your Projects) meta-build system
-EAPI=7
-HOMEPAGE=https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://home.apache.org/~arfrever/distfiles/gyp-20170904022846.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b3edaaf7676d93248b867dba5c890652
diff --git a/metadata/md5-cache/dev-util/gyp-20170904022846-r1 b/metadata/md5-cache/dev-util/gyp-20170904022846-r1
new file mode 100644
index 000000000000..e5c6954a2f8c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gyp-20170904022846-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=GYP (Generate Your Projects) meta-build system
+EAPI=7
+HOMEPAGE=https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://home.apache.org/~arfrever/distfiles/gyp-20170904022846.tar.xz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0b6d4f906bc0dc676fbd72b8abdf91ed
diff --git a/metadata/md5-cache/dev-util/gyp-99999999999999 b/metadata/md5-cache/dev-util/gyp-99999999999999
index 75c276b9ea86..8ea924f2fcee 100644
--- a/metadata/md5-cache/dev-util/gyp-99999999999999
+++ b/metadata/md5-cache/dev-util/gyp-99999999999999
@@ -1,13 +1,13 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DESCRIPTION=GYP (Generate Your Projects) meta-build system
 EAPI=7
 HOMEPAGE=https://gyp.gsrc.io/ https://chromium.googlesource.com/external/gyp
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8c40dc3e3abe211c0b21e4c24e48ef29
diff --git a/metadata/md5-cache/dev-util/howdoi-1.2.1 b/metadata/md5-cache/dev-util/howdoi-1.2.1
index c5ec7f9564a4..9a5af3b740ee 100644
--- a/metadata/md5-cache/dev-util/howdoi-1.2.1
+++ b/metadata/md5-cache/dev-util/howdoi-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/howdoi/howdoi-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2c427f8b0959653eb84dbd48174b08b3
diff --git a/metadata/md5-cache/dev-util/hxtools-20190428 b/metadata/md5-cache/dev-util/hxtools-20190428
index 260870c3e98d..f7f6662a70ba 100644
--- a/metadata/md5-cache/dev-util/hxtools-20190428
+++ b/metadata/md5-cache/dev-util/hxtools-20190428
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=>=sys-apps/pciutils-3 >=sys-apps/util-linux-2.19 >=sys-libs/libhx-3.12.1 dev-lang/perl sys-libs/libcap x11-libs/libxcb:0=
 SLOT=0
 SRC_URI=http://jftp.inai.de/hxtools/hxtools-20190428.tar.xz
-_md5_=f4a0b42309bc341e219e1adb7be57370
+_md5_=71f0c62a1d24b8af6a5037e5ea8fa811
diff --git a/metadata/md5-cache/dev-util/imediff2-1.1.2-r5 b/metadata/md5-cache/dev-util/imediff2-1.1.2-r5
index 8747f1bf60c2..53b7c490d26d 100644
--- a/metadata/md5-cache/dev-util/imediff2-1.1.2-r5
+++ b/metadata/md5-cache/dev-util/imediff2-1.1.2-r5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 DESCRIPTION=An interactive, user friendly 2-way merge tool in text mode
 EAPI=6
 HOMEPAGE=https://elonen.iki.fi/code/imediff/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+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[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] >=dev-lang/python-exec-2:=[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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[ncurses] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/i/imediff2/imediff2_1.1.2.orig.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4e1be15f459741df4bdf85622c84b503
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=081cf85e9f20b2d8ad23f8208976db45
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-7.0 b/metadata/md5-cache/dev-util/include-what-you-use-7.0
index 7735045ee8f2..ec6f126af314 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-7.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:7 sys-devel/clang:7 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=sys-devel/llvm:7 sys-devel/clang:7 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Find unused include directives in C/C++ programs
 EAPI=6
 HOMEPAGE=https://include-what-you-use.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-devel/llvm:7 sys-devel/clang:7 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+RDEPEND=sys-devel/llvm:7 sys-devel/clang:7 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_7.0.tar.gz -> include-what-you-use-7.0.src.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2bfca9f3b7ca59ac1b517a2e34f551f
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4a8cf4049f22c75d49cfa19c86682825
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-8.0 b/metadata/md5-cache/dev-util/include-what-you-use-8.0
index fb4ccf0297bb..7d70ff4140c2 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-8.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:8 sys-devel/clang:8 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=sys-devel/llvm:8 sys-devel/clang:8 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Find unused include directives in C/C++ programs
 EAPI=6
 HOMEPAGE=https://include-what-you-use.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-devel/llvm:8 sys-devel/clang:8 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+RDEPEND=sys-devel/llvm:8 sys-devel/clang:8 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_8.0.tar.gz -> include-what-you-use-8.0.src.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=637d26da2aef04289ee3e48ea3650c23
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42fd3b4b1d2e9f43bbcc7d3b4183b5dd
diff --git a/metadata/md5-cache/dev-util/include-what-you-use-9.0 b/metadata/md5-cache/dev-util/include-what-you-use-9.0
index 027587989f98..9abaca2d3548 100644
--- a/metadata/md5-cache/dev-util/include-what-you-use-9.0
+++ b/metadata/md5-cache/dev-util/include-what-you-use-9.0
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-devel/llvm:9 sys-devel/clang:9 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+DEPEND=sys-devel/llvm:9 sys-devel/clang:9 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 DESCRIPTION=Find unused include directives in C/C++ programs
 EAPI=7
 HOMEPAGE=https://include-what-you-use.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-devel/llvm:9 sys-devel/clang:9 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+RDEPEND=sys-devel/llvm:9 sys-devel/clang:9 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/include-what-you-use/include-what-you-use/archive/clang_9.0.tar.gz -> include-what-you-use-9.0.src.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=825e65e16ec2aa973a6b37d43979bec5
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1ffc0097e92e6d35508767df90c7b46f
diff --git a/metadata/md5-cache/dev-util/indent-2.2.11-r1 b/metadata/md5-cache/dev-util/indent-2.2.11-r1
index 0d3694eb9ca8..ea7050c8a849 100644
--- a/metadata/md5-cache/dev-util/indent-2.2.11-r1
+++ b/metadata/md5-cache/dev-util/indent-2.2.11-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=nls? ( sys-devel/gettext ) app-text/texi2html >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Indent program source files
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=nls
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -10,4 +10,4 @@ RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/indent-2.2.11.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5430f17fdcdae551f69d9ee6c0ab26a
+_md5_=8eab61f25acc9bdd84322bd980f2d6bd
diff --git a/metadata/md5-cache/dev-util/indent-2.2.11_p5 b/metadata/md5-cache/dev-util/indent-2.2.11_p5
index 89a51d3b3e92..e1c83028c063 100644
--- a/metadata/md5-cache/dev-util/indent-2.2.11_p5
+++ b/metadata/md5-cache/dev-util/indent-2.2.11_p5
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare test
 DEPEND=nls? ( sys-devel/gettext ) app-text/texi2html >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Indent program source files
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=nls
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
@@ -10,4 +10,4 @@ RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/indent-2.2.11.tar.gz http://http.debian.net/debian/pool/main/i/indent/indent_2.2.11-5.debian.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e6c4d81999b12ea61dbadb039c0cd8e
+_md5_=68d12bbc4fc97630fd923a49c72c4811
diff --git a/metadata/md5-cache/dev-util/intel-ocl-sdk-2.0.31360 b/metadata/md5-cache/dev-util/intel-ocl-sdk-2.0.31360
index a32a6c12c6b6..f6fda6301c79 100644
--- a/metadata/md5-cache/dev-util/intel-ocl-sdk-2.0.31360
+++ b/metadata/md5-cache/dev-util/intel-ocl-sdk-2.0.31360
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencl dev-cpp/tbb sys-process/numactl tools? ( sys-
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://registrationcenter.intel.com/irc_nas/2563/intel_sdk_for_ocl_applications_2012_x64.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=60b9bafbb0b5e2c78ffff51c6c688962
diff --git a/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r1 b/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r1
index cba008abf189..d413f2140704 100644
--- a/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r1
+++ b/metadata/md5-cache/dev-util/intel-ocl-sdk-4.4.0.117-r1
@@ -10,5 +10,5 @@ RDEPEND=app-eselect/eselect-opencl sys-process/numactl system-tbb? ( >=dev-cpp/t
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b52cc481591f111b7ed812d814e865a0
diff --git a/metadata/md5-cache/dev-util/itstool-2.0.2 b/metadata/md5-cache/dev-util/itstool-2.0.2
index 66a91ab3e338..20ec44a9df26 100644
--- a/metadata/md5-cache/dev-util/itstool-2.0.2
+++ b/metadata/md5-cache/dev-util/itstool-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_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/libxml2[python,python_targets_python2_7(-)] )
 DESCRIPTION=Translation tool for XML documents that uses gettext files and ITS rules
 EAPI=5
 HOMEPAGE=http://itstool.org/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux
 LICENSE=GPL-3+ || ( HPND GPL-3+ )
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_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/libxml2[python,python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://files.itstool.org/itstool/itstool-2.0.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=84a9eab23412fe5c88599c524c8714f5
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e7eecdda260e9ec3bcbadea8f84e4c0a
diff --git a/metadata/md5-cache/dev-util/itstool-2.0.6 b/metadata/md5-cache/dev-util/itstool-2.0.6
deleted file mode 100644
index b377dc826533..000000000000
--- a/metadata/md5-cache/dev-util/itstool-2.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-DESCRIPTION=Translation tool for XML documents that uses gettext files and ITS rules
-EAPI=7
-HOMEPAGE=http://itstool.org/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/libxml2[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=http://files.itstool.org/itstool/itstool-2.0.6.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a938b25af4c9a8e383afd32810805f39
diff --git a/metadata/md5-cache/dev-util/itstool-2.0.6-r1 b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
new file mode 100644
index 000000000000..6603d5ebec7d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/itstool-2.0.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] )
+DESCRIPTION=Translation tool for XML documents that uses gettext files and ITS rules
+EAPI=7
+HOMEPAGE=http://itstool.org/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-libs/libxml2[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/libxml2[python,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-libs/libxml2[python,python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=http://files.itstool.org/itstool/itstool-2.0.6.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0118c39495bdd9bde85f593e58535cac
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.190.3 b/metadata/md5-cache/dev-util/jenkins-bin-2.190.3
index 2f6f46878934..93b02e63bfcf 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.190.3
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.190.3
@@ -9,5 +9,5 @@ RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual
 RESTRICT=mirror
 SLOT=lts
 SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.190.3/jenkins.war -> jenkins-bin-2.190.3.war
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4452adb3375232a273bdea0aa5f43d64
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.204.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.204.2
index 0076e41c3186..ace917ab0d80 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.204.2
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.204.2
@@ -9,5 +9,5 @@ RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual
 RESTRICT=mirror
 SLOT=lts
 SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.204.2/jenkins.war -> jenkins-bin-2.204.2.war
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0935a84615a963df9606323f353012d9
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.205 b/metadata/md5-cache/dev-util/jenkins-bin-2.205
index 725f266415d2..96e4167cb020 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.205
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.205
@@ -9,5 +9,5 @@ RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtu
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://mirrors.jenkins-ci.org/war/2.205/jenkins.war -> jenkins-bin-2.205.war
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9473c1ab94afe7c3b6ce520b05bfad41
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.219 b/metadata/md5-cache/dev-util/jenkins-bin-2.219
index 4ca5e26780d4..3fcd2926edbe 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.219
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.219
@@ -9,5 +9,5 @@ RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtu
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://mirrors.jenkins-ci.org/war/2.219/jenkins.war -> jenkins-bin-2.219.war
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9c350e4ed166eee45fa5b1064c361f57
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.4.5 b/metadata/md5-cache/dev-util/kdevelop-5.4.5
index 5fcdd0acb60a..f9b3eb9571a6 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.4.5
+++ b/metadata/md5-cache/dev-util/kdevelop-5.4.5
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kdevelop.org/
 IUSE=+gdbui hex +plasma +qmake reviewboard subversion webkit test debug +handbook test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 >=dev-util/astyle-3.1:= >=sys-devel/clang-3.8.0:= gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=kde-apps/kapptemplate-19.04.3:5 >=kde-apps/kio-extras-19.04.3:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] reviewboard? ( >=kde-apps/ktp-accounts-kcm-19.04.3:5 ) !dev-util/kdevelop-clang-tidy !dev-util/kdevplatform || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 >=dev-util/astyle-3.1:= >=sys-devel/clang-3.8.0:= gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=kde-apps/kapptemplate-19.04.3:5 >=kde-apps/kio-extras-19.04.3:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] reviewboard? ( >=kde-apps/ktp-accounts-kcm-19.04.3:5 ) !dev-util/kdevelop-clang-tidy || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/54
 SRC_URI=mirror://kde/stable/kdevelop/5.4.5/src/kdevelop-5.4.5.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76fd85889aec9ec94748fcf24e29e57e
+_md5_=3c120e3abb12102304342df97ad3a921
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.4.6 b/metadata/md5-cache/dev-util/kdevelop-5.4.6
index dfddc76d9773..dfb846b11dba 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.4.6
+++ b/metadata/md5-cache/dev-util/kdevelop-5.4.6
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kdevelop.org/
 IUSE=+gdbui hex +plasma +qmake reviewboard subversion webkit test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 >=dev-util/astyle-3.1:= >=sys-devel/clang-3.8.0:= gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=kde-apps/kapptemplate-19.04.3:5 >=kde-apps/kio-extras-19.04.3:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] reviewboard? ( >=kde-apps/ktp-accounts-kcm-19.04.3:5 ) !dev-util/kdevelop-clang-tidy !dev-util/kdevplatform || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 >=dev-util/astyle-3.1:= >=sys-devel/clang-3.8.0:= gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=kde-apps/kapptemplate-19.04.3:5 >=kde-apps/kio-extras-19.04.3:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] reviewboard? ( >=kde-apps/ktp-accounts-kcm-19.04.3:5 ) !dev-util/kdevelop-clang-tidy || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/54
 SRC_URI=mirror://kde/stable/kdevelop/5.4.6/src/kdevelop-5.4.6.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0501cec24f04462ba50030e6a6f3484c
+_md5_=c960c8428ce25d4d015c6f465edcc048
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.5.0 b/metadata/md5-cache/dev-util/kdevelop-5.5.0
index ddf0db39d165..80b4752c4387 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.5.0
+++ b/metadata/md5-cache/dev-util/kdevelop-5.5.0
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.kdevelop.org/
 IUSE=+gdbui hex +plasma +qmake reviewboard subversion webkit test debug +handbook test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 >=dev-util/astyle-3.1:= >=sys-devel/clang-3.8.0:= gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=kde-apps/kapptemplate-19.04.3:5 >=kde-apps/kio-extras-19.04.3:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] reviewboard? ( >=kde-apps/ktp-accounts-kcm-19.04.3:5 ) !dev-util/kdevelop-clang-tidy !dev-util/kdevplatform || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=kde-apps/libkomparediff2-19.04.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 >=dev-util/astyle-3.1:= >=sys-devel/clang-3.8.0:= gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=kde-apps/kapptemplate-19.04.3:5 >=kde-apps/kio-extras-19.04.3:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] reviewboard? ( >=kde-apps/ktp-accounts-kcm-19.04.3:5 ) !dev-util/kdevelop-clang-tidy || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=5/55
 SRC_URI=mirror://kde/stable/kdevelop/5.5.0/src/kdevelop-5.5.0.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b5a5ae9fd8b8df0a2551ee78dd661e6
+_md5_=ccc972f9477a258cb2c15dbe6d0262ad
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.4.5 b/metadata/md5-cache/dev-util/kdevelop-python-5.4.5
deleted file mode 100644
index ac710c8869ee..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.4.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Python plugin for KDevelop
-EAPI=7
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=debug test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-python/pycodestyle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdevelop/5.4.5/src/kdev-python-5.4.5.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6dacc364a6a86396c06f21c7927b2fbc
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.4.5-r1 b/metadata/md5-cache/dev-util/kdevelop-python-5.4.5-r1
new file mode 100644
index 000000000000..86f78cce8025
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.4.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Python plugin for KDevelop
+EAPI=7
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= python_single_target_python3_6? ( dev-python/pycodestyle[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycodestyle[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycodestyle[python_targets_python3_8(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.4.5/src/kdev-python-5.4.5.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8abcb558fd5561e5ed079aa6aae79c9a
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.4.6 b/metadata/md5-cache/dev-util/kdevelop-python-5.4.6
index 299c621e00d3..0ea9fe38f950 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.4.6
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.4.6
@@ -4,13 +4,13 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Python plugin for KDevelop
 EAPI=7
 HOMEPAGE=https://www.kdevelop.org/
-IUSE=debug test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-python/pycodestyle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= python_single_target_python3_6? ( dev-python/pycodestyle[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycodestyle[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycodestyle[python_targets_python3_8(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.4.6/src/kdev-python-5.4.6.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc340f89bc89fbafd5875988022dc85a
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a92c1c6d87363078e9702c32b5b61d93
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.5.0 b/metadata/md5-cache/dev-util/kdevelop-python-5.5.0
deleted file mode 100644
index 0e0671fa253c..000000000000
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Python plugin for KDevelop
-EAPI=7
-HOMEPAGE=https://www.kdevelop.org/
-IUSE=debug test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-python/pycodestyle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/kdevelop/5.5.0/src/kdev-python-5.5.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc340f89bc89fbafd5875988022dc85a
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.5.0-r1 b/metadata/md5-cache/dev-util/kdevelop-python-5.5.0-r1
new file mode 100644
index 000000000000..027d17dda410
--- /dev/null
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Python plugin for KDevelop
+EAPI=7
+HOMEPAGE=https://www.kdevelop.org/
+IUSE=debug test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= python_single_target_python3_6? ( dev-python/pycodestyle[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycodestyle[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycodestyle[python_targets_python3_8(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/kdevelop/5.5.0/src/kdev-python-5.5.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a92c1c6d87363078e9702c32b5b61d93
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.0.9999 b/metadata/md5-cache/dev-util/lldb-10.0.0.9999
index e03c75d2e8e6..2dee46332839 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-10.0.0.9999
@@ -1,15 +1,15 @@
-BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-10.0.0.9999[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-devel/lld ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python2_7? ( ~dev-python/lit-10.0.0.9999[python_targets_python2_7(-)] ) python_single_target_python3_6? ( ~dev-python/lit-10.0.0.9999[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-10.0.0.9999[python_targets_python3_7(-)] ) sys-devel/lld ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-10.0.0.9999[xml] ~sys-devel/llvm-10.0.0.9999 !<sys-devel/llvm-4.0
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-10.0.0.9999[xml] ~sys-devel/llvm-10.0.0.9999 !<sys-devel/llvm-4.0
 DESCRIPTION=The LLVM debugger
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=libedit lzma ncurses +python test 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
+IUSE=libedit lzma ncurses +python test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-10.0.0.9999[xml] ~sys-devel/llvm-10.0.0.9999 !<sys-devel/llvm-4.0
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-10.0.0.9999[xml] ~sys-devel/llvm-10.0.0.9999 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47fe509c9001f247d35cc23e1572de01
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bbdc9470ecbbf100911b3886c56f1240
diff --git a/metadata/md5-cache/dev-util/lldb-10.0.0_rc1 b/metadata/md5-cache/dev-util/lldb-10.0.0_rc1
index c7f3b4fc2415..87438bb634b0 100644
--- a/metadata/md5-cache/dev-util/lldb-10.0.0_rc1
+++ b/metadata/md5-cache/dev-util/lldb-10.0.0_rc1
@@ -1,15 +1,15 @@
-BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-10.0.0_rc1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-devel/lld ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python2_7? ( ~dev-python/lit-10.0.0_rc1[python_targets_python2_7(-)] ) python_single_target_python3_6? ( ~dev-python/lit-10.0.0_rc1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-10.0.0_rc1[python_targets_python3_7(-)] ) sys-devel/lld ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-10.0.0_rc1[xml] ~sys-devel/llvm-10.0.0_rc1 !<sys-devel/llvm-4.0
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-10.0.0_rc1[xml] ~sys-devel/llvm-10.0.0_rc1 !<sys-devel/llvm-4.0
 DESCRIPTION=The LLVM debugger
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=libedit lzma ncurses +python test 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
+IUSE=libedit lzma ncurses +python test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-10.0.0_rc1[xml] ~sys-devel/llvm-10.0.0_rc1 !<sys-devel/llvm-4.0
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-10.0.0_rc1[xml] ~sys-devel/llvm-10.0.0_rc1 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47fe509c9001f247d35cc23e1572de01
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bbdc9470ecbbf100911b3886c56f1240
diff --git a/metadata/md5-cache/dev-util/lldb-11.0.0.9999 b/metadata/md5-cache/dev-util/lldb-11.0.0.9999
index a30da0e9a63b..b4a5bf560ddc 100644
--- a/metadata/md5-cache/dev-util/lldb-11.0.0.9999
+++ b/metadata/md5-cache/dev-util/lldb-11.0.0.9999
@@ -1,15 +1,15 @@
-BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-11.0.0.9999[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-devel/lld ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python2_7? ( ~dev-python/lit-11.0.0.9999[python_targets_python2_7(-)] ) python_single_target_python3_6? ( ~dev-python/lit-11.0.0.9999[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-11.0.0.9999[python_targets_python3_7(-)] ) sys-devel/lld ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-11.0.0.9999[xml] ~sys-devel/llvm-11.0.0.9999 !<sys-devel/llvm-4.0
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-11.0.0.9999[xml] ~sys-devel/llvm-11.0.0.9999 !<sys-devel/llvm-4.0
 DESCRIPTION=The LLVM debugger
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=libedit lzma ncurses +python test 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
+IUSE=libedit lzma ncurses +python test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PROPERTIES=live
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-11.0.0.9999[xml] ~sys-devel/llvm-11.0.0.9999 !<sys-devel/llvm-4.0
-REQUIRED_USE=^^ ( 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 )
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-11.0.0.9999[xml] ~sys-devel/llvm-11.0.0.9999 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47fe509c9001f247d35cc23e1572de01
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bbdc9470ecbbf100911b3886c56f1240
diff --git a/metadata/md5-cache/dev-util/lldb-7.1.0 b/metadata/md5-cache/dev-util/lldb-7.1.0
deleted file mode 100644
index fda7a625d1e6..000000000000
--- a/metadata/md5-cache/dev-util/lldb-7.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ~sys-devel/clang-7.1.0[xml] ~sys-devel/llvm-7.1.0 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-7.1.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=The LLVM debugger
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=libedit ncurses +python test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 arm64 x86
-LICENSE=UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ~sys-devel/clang-7.1.0[xml] ~sys-devel/llvm-7.1.0 !<sys-devel/llvm-4.0
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://releases.llvm.org/7.1.0/lldb-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1d9711795a0c4ceaa7ce946f8b1ceda
diff --git a/metadata/md5-cache/dev-util/lldb-7.1.0-r1 b/metadata/md5-cache/dev-util/lldb-7.1.0-r1
new file mode 100644
index 000000000000..baf4677af2a5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-7.1.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ~sys-devel/clang-7.1.0[xml] ~sys-devel/llvm-7.1.0 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python2_7? ( ~dev-python/lit-7.1.0[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses +python test +python_single_target_python2_7
+KEYWORDS=amd64 arm64 x86
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ~sys-devel/clang-7.1.0[xml] ~sys-devel/llvm-7.1.0 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.llvm.org/7.1.0/lldb-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz )
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01c679fbfec91f8171e67b56aee9e8d2
diff --git a/metadata/md5-cache/dev-util/lldb-8.0.1 b/metadata/md5-cache/dev-util/lldb-8.0.1
deleted file mode 100644
index 6350afe1929a..000000000000
--- a/metadata/md5-cache/dev-util/lldb-8.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ~sys-devel/clang-8.0.1[xml] ~sys-devel/llvm-8.0.1 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-8.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
-DESCRIPTION=The LLVM debugger
-EAPI=6
-HOMEPAGE=https://llvm.org/
-IUSE=libedit ncurses +python test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ~sys-devel/clang-8.0.1[xml] ~sys-devel/llvm-8.0.1 !<sys-devel/llvm-4.0
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/lldb-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87eda0b5a2306bc0af17a442969e4964
diff --git a/metadata/md5-cache/dev-util/lldb-8.0.1-r1 b/metadata/md5-cache/dev-util/lldb-8.0.1-r1
new file mode 100644
index 000000000000..e86d76d6a3c0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-8.0.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ~sys-devel/clang-8.0.1[xml] ~sys-devel/llvm-8.0.1 !<sys-devel/llvm-4.0 python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python2_7? ( ~dev-python/lit-8.0.1[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DESCRIPTION=The LLVM debugger
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses +python test +python_single_target_python2_7
+KEYWORDS=amd64 arm arm64 x86
+LICENSE=UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ~sys-devel/clang-8.0.1[xml] ~sys-devel/llvm-8.0.1 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/lldb-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz )
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6b1244ae57a68c028ba3b8cd79317cb5
diff --git a/metadata/md5-cache/dev-util/lldb-9.0.1 b/metadata/md5-cache/dev-util/lldb-9.0.1
deleted file mode 100644
index fcc9c64baf95..000000000000
--- a/metadata/md5-cache/dev-util/lldb-9.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( ~dev-python/lit-9.0.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-devel/lld ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-9.0.1[xml] ~sys-devel/llvm-9.0.1 !<sys-devel/llvm-4.0
-DESCRIPTION=The LLVM debugger
-EAPI=7
-HOMEPAGE=https://llvm.org/
-IUSE=libedit ncurses +python test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-9.0.1[xml] ~sys-devel/llvm-9.0.1 !<sys-devel/llvm-4.0
-REQUIRED_USE=^^ ( 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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc8ec227401de876f864274dfd0ceaed
diff --git a/metadata/md5-cache/dev-util/lldb-9.0.1-r1 b/metadata/md5-cache/dev-util/lldb-9.0.1-r1
new file mode 100644
index 000000000000..df7aea7e4e90
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-9.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=python? ( >=dev-lang/swig-3.0.11 ) test? ( python_single_target_python2_7? ( ~dev-python/lit-9.0.1[python_targets_python2_7(-)] ) python_single_target_python3_6? ( ~dev-python/lit-9.0.1[python_targets_python3_6(-)] ) python_single_target_python3_7? ( ~dev-python/lit-9.0.1[python_targets_python3_7(-)] ) sys-devel/lld ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-9.0.1[xml] ~sys-devel/llvm-9.0.1 !<sys-devel/llvm-4.0
+DESCRIPTION=The LLVM debugger
+EAPI=7
+HOMEPAGE=https://llvm.org/
+IUSE=libedit ncurses +python test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 arm ~arm64 x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) python? ( python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/six[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ~sys-devel/clang-9.0.1[xml] ~sys-devel/llvm-9.0.1 !<sys-devel/llvm-4.0
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=90a7d0fb1b5a985896f0f5c5ccd0f587
diff --git a/metadata/md5-cache/dev-util/meld-3.20.1 b/metadata/md5-cache/dev-util/meld-3.20.1
deleted file mode 100644
index 73a00d9340ee..000000000000
--- a/metadata/md5-cache/dev-util/meld-3.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.50:2[dbus] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme dev-util/intltool dev-util/itstool sys-devel/gettext >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=A graphical diff and merge tool
-EAPI=6
-HOMEPAGE=http://meldmerge.org/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.50:2[dbus] >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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=mirror://gnome/sources/meld/3.20/meld-3.20.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8797aa92989dca9d8692d9b73f062429
diff --git a/metadata/md5-cache/dev-util/meld-3.20.1-r1 b/metadata/md5-cache/dev-util/meld-3.20.1-r1
new file mode 100644
index 000000000000..8c545ba404ea
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meld-3.20.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.50:2[dbus] python_single_target_python3_6? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_7(-)] ) gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme dev-util/intltool dev-util/itstool sys-devel/gettext >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DESCRIPTION=A graphical diff and merge tool
+EAPI=6
+HOMEPAGE=http://meldmerge.org/
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.50:2[dbus] python_single_target_python3_6? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.12:3[cairo,python_targets_python3_7(-)] ) gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/gtksourceview-3.20.0:3.0[introspection] >=x11-libs/pango-1.34[introspection] x11-themes/hicolor-icon-theme python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/meld/3.20/meld-3.20.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5cb4f7706e39e1dbb9ebb11c37ceafe8
diff --git a/metadata/md5-cache/dev-util/meson-0.52.1 b/metadata/md5-cache/dev-util/meson-0.52.1
index daa040f42d1f..b98e9ed62a1a 100644
--- a/metadata/md5-cache/dev-util/meson-0.52.1
+++ b/metadata/md5-cache/dev-util/meson-0.52.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.52.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a27dee0ba2a8be800f18398edb02e654
diff --git a/metadata/md5-cache/dev-util/meson-0.53.0 b/metadata/md5-cache/dev-util/meson-0.53.0
index c9af141e9638..8d217acee9fb 100644
--- a/metadata/md5-cache/dev-util/meson-0.53.0
+++ b/metadata/md5-cache/dev-util/meson-0.53.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.53.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=114d8f9ca1ac7b0fb4e40145df0fd7c7
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index 832a72b859f8..bd111399b2da 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d08c3fdbd8cc0135305e8f2953772e6b
diff --git a/metadata/md5-cache/dev-util/molecule-core-1.0.2-r1 b/metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
index bf48422db728..eef9badc37c0 100644
--- a/metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
+++ b/metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.sabayon.org
 IUSE=python_targets_python2_7 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=!<dev-util/molecule-1 sys-process/lsof 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(-)]
+RDEPEND=sys-process/lsof python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sabayon/dev-util/molecule-core-1.0.2.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=df730f6e5d76aa75817cef094510b459
+_md5_=4a16b6e1f321f36f6fa8bcf8084d4084
diff --git a/metadata/md5-cache/dev-util/molecule-plugins-1.0.3 b/metadata/md5-cache/dev-util/molecule-plugins-1.0.3
index 81855f88ac33..ed5e7688c832 100644
--- a/metadata/md5-cache/dev-util/molecule-plugins-1.0.3
+++ b/metadata/md5-cache/dev-util/molecule-plugins-1.0.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install
-DEPEND=>=dev-util/molecule-core-1.0.1 !<dev-util/molecule-1
+DEPEND=>=dev-util/molecule-core-1.0.1
 DESCRIPTION=A set of base plugins for Molecule
 EAPI=6
 HOMEPAGE=http://www.sabayon.org
 IUSE=python_targets_python2_7 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-util/molecule-core-1.0.1 !<dev-util/molecule-1 net-misc/rsync sys-fs/squashfs-tools sys-process/lsof virtual/cdrtools 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(-)]
+RDEPEND=>=dev-util/molecule-core-1.0.1 net-misc/rsync sys-fs/squashfs-tools sys-process/lsof virtual/cdrtools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sabayon/dev-util/molecule-plugins-1.0.3.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=28cf4f940e9040408f7ead0df5f54bb8
+_md5_=519a330bec67fc32100944ffced979c5
diff --git a/metadata/md5-cache/dev-util/mpatch-0.8-r1 b/metadata/md5-cache/dev-util/mpatch-0.8-r1
index e8a2ec3d053e..37d39534e3ac 100644
--- a/metadata/md5-cache/dev-util/mpatch-0.8-r1
+++ b/metadata/md5-cache/dev-util/mpatch-0.8-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Patch-like tool which can resolve common causes of patch rejects when applying
 EAPI=5
 HOMEPAGE=http://oss.oracle.com/~mason/mpatch/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://oss.oracle.com/~mason/mpatch/mpatch-0.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8fa6986df90e8b99c431d282cbec3a9f
diff --git a/metadata/md5-cache/dev-util/netsurf-buildsystem-1.8 b/metadata/md5-cache/dev-util/netsurf-buildsystem-1.8
index 14ea7583e0c5..dc803f9dfa43 100644
--- a/metadata/md5-cache/dev-util/netsurf-buildsystem-1.8
+++ b/metadata/md5-cache/dev-util/netsurf-buildsystem-1.8
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Build system used for netsurf and its libs
 EAPI=7
 HOMEPAGE=https://www.netsurf-browser.org
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~m68k-mint
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86 ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://download.netsurf-browser.org/libs/releases/buildsystem-1.8.tar.gz
-_md5_=f9f95274da1276d4d07374a730784007
+_md5_=24ac2bef36ddce76e49fa5b1bd7ad7c7
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2 b/metadata/md5-cache/dev-util/ninja-1.8.2
index 467872b5144f..8477b0bdae20 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=|| ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DEPEND=|| ( dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
 DESCRIPTION=A small build system similar to make
 EAPI=6
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) !<net-irc/ninja-1.5.9_pre14-r1
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=aaf78ec55f4efce06a7face75e2f608c
+_md5_=49abb296b5bd592fda2f0591a243f462
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r1 b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
index 81708c9a8edc..bb68a880ca23 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2-r1
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=|| ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DEPEND=|| ( dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
 DESCRIPTION=A small build system similar to make
 EAPI=6
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) !<net-irc/ninja-1.5.9_pre14-r1
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kitware/ninja/archive/v1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2e43e9424e10df2c1c3134459527243d
+_md5_=aab4af72ae41206296cfb804f71dc2cb
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2-r2 b/metadata/md5-cache/dev-util/ninja-1.8.2-r2
index a5ae7847cf84..c39e26dcc1c1 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2-r2
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst postrm setup test
-DEPEND=|| ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+DEPEND=|| ( dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
 DESCRIPTION=A small build system similar to make
 EAPI=6
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Apache-2.0
-RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) !<net-irc/ninja-1.5.9_pre14-r1
+RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kitware/ninja/archive/v1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=95c85ae19807be667abcd1eac84b05b9
+_md5_=5cd0b3526af2920f9e71756d82b8769e
diff --git a/metadata/md5-cache/dev-util/ninja-1.9.0 b/metadata/md5-cache/dev-util/ninja-1.9.0
index 96903c2d394e..1fd0a1d10e28 100644
--- a/metadata/md5-cache/dev-util/ninja-1.9.0
+++ b/metadata/md5-cache/dev-util/ninja-1.9.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest )
 DEFINED_PHASES=compile install postinst postrm setup test
 DESCRIPTION=A small build system similar to make
 EAPI=7
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kitware/ninja/archive/v1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz -> ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dd39eabccf0f8a0c052a91e89252ec62
+_md5_=b6ce34a3440ed999bbe58b58ce263464
diff --git a/metadata/md5-cache/dev-util/ninja-9999 b/metadata/md5-cache/dev-util/ninja-9999
index 1e3f558251d7..fd7c26327f9c 100644
--- a/metadata/md5-cache/dev-util/ninja-9999
+++ b/metadata/md5-cache/dev-util/ninja-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/re2c doc? ( app-text/asciidoc app-doc/doxygen dev-libs/libxslt ) test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm setup test unpack
 DESCRIPTION=A small build system similar to make
 EAPI=7
@@ -10,4 +10,4 @@ RDEPEND=emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=925dcd30d93481d641aa0ce8da0cd277
+_md5_=a17e010673636ec0f10a2f07ad384c99
diff --git a/metadata/md5-cache/dev-util/numdiff-5.9.0 b/metadata/md5-cache/dev-util/numdiff-5.9.0
index dbb67d607539..781c9f5fcb70 100644
--- a/metadata/md5-cache/dev-util/numdiff-5.9.0
+++ b/metadata/md5-cache/dev-util/numdiff-5.9.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=gmp? ( dev-libs/gmp:0= ) nls? ( sys-devel/gettext ) !dev-util/ndiff >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=gmp? ( dev-libs/gmp:0= ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=File comparision, ignoring small numeric differences and formats
 EAPI=6
-HOMEPAGE=http://www.nongnu.org/numdiff/
+HOMEPAGE=https://www.nongnu.org/numdiff/
 IUSE=+nls +gmp
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=gmp? ( dev-libs/gmp:0= ) nls? ( sys-devel/gettext ) !dev-util/ndiff
+RDEPEND=gmp? ( dev-libs/gmp:0= ) nls? ( sys-devel/gettext )
 SLOT=0
-SRC_URI=http://savannah.nongnu.org/download/numdiff/numdiff-5.9.0.tar.gz
+SRC_URI=https://savannah.nongnu.org/download/numdiff/numdiff-5.9.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6ba2ac19b9299e3735e4b1aa4c1b17d2
+_md5_=c73e5e320ca86c490c8803a28f5e8beb
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r1
index 42067514ec2b..dc3b59948a60 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r1
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.105-r1
@@ -9,4 +9,4 @@ RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugge
 SLOT=0/10.1.105
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.105_418.39_linux.run -> cuda_10.1.105_418.39_linux.run
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=722508023fb9e6b2ec507d208fec3cd0
+_md5_=3fc69c13c1402819fead34f45778c508
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168
index cc83f23c9c8b..16d3d9e4e4e0 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-10.1.168
@@ -9,4 +9,4 @@ RDEPEND=<sys-devel/gcc-9[cxx] >=x11-drivers/nvidia-drivers-396.24[X,uvm] debugge
 SLOT=0/10.1.168
 SRC_URI=https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.168_418.67_linux.run -> cuda_10.1.168_418.67_linux.run
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=0e00c4e90a3d1f4bbd46559483a8fe16
+_md5_=773229af05107f09138f1d445664d0e3
diff --git a/metadata/md5-cache/dev-util/oprofile-1.3.0 b/metadata/md5-cache/dev-util/oprofile-1.3.0
index 5bcbc8194283..037bb67b9a36 100644
--- a/metadata/md5-cache/dev-util/oprofile-1.3.0
+++ b/metadata/md5-cache/dev-util/oprofile-1.3.0
@@ -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.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8529282d8262f09b0f6603e25e38f703
diff --git a/metadata/md5-cache/dev-util/patchbin-20160208 b/metadata/md5-cache/dev-util/patchbin-20160208
index a97a3723b5b4..33a9f98b804f 100644
--- a/metadata/md5-cache/dev-util/patchbin-20160208
+++ b/metadata/md5-cache/dev-util/patchbin-20160208
@@ -5,7 +5,7 @@ HOMEPAGE=https://github.com/wine-compholio/wine-staging
 IUSE=userland_BSD userland_GNU
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
-RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep userland_BSD? ( sys-freebsd/freebsd-bin sys-freebsd/freebsd-ubin ) userland_GNU? ( sys-apps/util-linux sys-devel/patch )
+RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep sys-apps/util-linux sys-devel/patch
 SLOT=0
 SRC_URI=https://github.com/wine-compholio/wine-staging/archive/4ffcf184bb71c6c3512b3a8c144dcf4a3a76d23c.tar.gz -> patchbin-20160208.tar.gz
-_md5_=b740c822764a57ada22e3c5fc8929181
+_md5_=684cfe7faa5210e71ecf12b51affced9
diff --git a/metadata/md5-cache/dev-util/patchbin-99999999 b/metadata/md5-cache/dev-util/patchbin-99999999
index bc06350e5206..971f9ec41b11 100644
--- a/metadata/md5-cache/dev-util/patchbin-99999999
+++ b/metadata/md5-cache/dev-util/patchbin-99999999
@@ -6,7 +6,7 @@ HOMEPAGE=https://github.com/wine-compholio/wine-staging
 IUSE=userland_BSD userland_GNU
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep userland_BSD? ( sys-freebsd/freebsd-bin sys-freebsd/freebsd-ubin ) userland_GNU? ( sys-apps/util-linux sys-devel/patch )
+RDEPEND=app-shells/bash sys-apps/coreutils sys-apps/gawk sys-apps/grep sys-apps/util-linux sys-devel/patch
 SLOT=0
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33
-_md5_=70185229e35bce00d55dc2d9a6791b22
+_md5_=91bbda965fb3ba0a78ff57ecd494255c
diff --git a/metadata/md5-cache/dev-util/perf-4.14.33-r1 b/metadata/md5-cache/dev-util/perf-4.14.33-r1
index 0567ad312d24..a06b1df645f7 100644
--- a/metadata/md5-cache/dev-util/perf-4.14.33-r1
+++ b/metadata/md5-cache/dev-util/perf-4.14.33-r1
@@ -3,12 +3,12 @@ DEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk?
 DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
-IUSE=audit debug +demangle +doc gtk numa perl python slang unwind +python_targets_python2_7 +python_single_target_python2_7 kernel_linux
+IUSE=audit debug +demangle +doc gtk numa perl python slang unwind +python_single_target_python2_7 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.33.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6bd1e158c7ec3e2d2ebb48d389050069
diff --git a/metadata/md5-cache/dev-util/perf-4.20.3 b/metadata/md5-cache/dev-util/perf-4.20.3
index 25cffa69c8b9..10a9ddc18441 100644
--- a/metadata/md5-cache/dev-util/perf-4.20.3
+++ b/metadata/md5-cache/dev-util/perf-4.20.3
@@ -3,12 +3,12 @@ DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( sys-
 DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
-IUSE=audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib +python_targets_python2_7 +python_single_target_python2_7 kernel_linux
+IUSE=audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib +python_single_target_python2_7 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( sys-devel/clang:* sys-devel/llvm:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.20.3.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=64a7cec99bcadeae842e157a748982f2
diff --git a/metadata/md5-cache/dev-util/perf-5.3.7 b/metadata/md5-cache/dev-util/perf-5.3.7
index 0d8ff23ecd1d..a3acc04ef2b4 100644
--- a/metadata/md5-cache/dev-util/perf-5.3.7
+++ b/metadata/md5-cache/dev-util/perf-5.3.7
@@ -3,12 +3,12 @@ DEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( sys-
 DESCRIPTION=Userland tools for Linux Performance Counters
 EAPI=7
 HOMEPAGE=https://perf.wiki.kernel.org/
-IUSE=audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib +python_targets_python2_7 +python_single_target_python2_7 kernel_linux
+IUSE=audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib +python_single_target_python2_7 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) crypt? ( dev-libs/openssl:0= ) clang? ( sys-devel/clang:* sys-devel/llvm:* ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) java? ( virtual/jre:* ) lzma? ( app-arch/xz-utils ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) slang? ( sys-libs/slang ) systemtap? ( dev-util/systemtap ) unwind? ( sys-libs/libunwind ) zlib? ( sys-libs/zlib ) dev-libs/elfutils
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.3.7.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.3.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21fabb34949831957d705710d2931526
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.7.4 b/metadata/md5-cache/dev-util/pkgcheck-0.7.4
deleted file mode 100644
index 4e18f94b36d6..000000000000
--- a/metadata/md5-cache/dev-util/pkgcheck-0.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/snakeoil-0.8.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sys-apps/pkgcore-0.10.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] network? ( dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) perl? ( dev-perl/Gentoo-PerlMod-Version ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=pkgcore-based QA utility
-EAPI=6
-HOMEPAGE=https://github.com/pkgcore/pkgcheck
-IUSE=network perl test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/snakeoil-0.8.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sys-apps/pkgcore-0.10.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] network? ( dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) perl? ( dev-perl/Gentoo-PerlMod-Version ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.7.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5efd9613aaf5785e2e5f1f03eb7caab9
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.7.5 b/metadata/md5-cache/dev-util/pkgcheck-0.7.5
index 20a6883a7c49..42ffcc2502a9 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.7.5
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.7.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=62bcd3f66940229586062e7c57133e42
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.7.6 b/metadata/md5-cache/dev-util/pkgcheck-0.7.6
new file mode 100644
index 000000000000..840097165e9b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.7.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/snakeoil-0.8.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sys-apps/pkgcore-0.10.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] network? ( dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) perl? ( dev-perl/Gentoo-PerlMod-Version ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=pkgcore-based QA utility for ebuild repos
+EAPI=6
+HOMEPAGE=https://github.com/pkgcore/pkgcheck
+IUSE=network perl test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/snakeoil-0.8.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=sys-apps/pkgcore-0.10.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] network? ( dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) perl? ( dev-perl/Gentoo-PerlMod-Version ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.7.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=584d624d280f2258d81a7d29ca6a8243
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index 05b5f1d41c69..fcbb10f0fcac 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -10,5 +10,5 @@ RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62bcd3f66940229586062e7c57133e42
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=584d624d280f2258d81a7d29ca6a8243
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2019.3.3 b/metadata/md5-cache/dev-util/pycharm-community-2019.3.3
new file mode 100644
index 000000000000..821aadc82fb5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-community-2019.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
+RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2019.3.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5822d1ad46c53ad9bb2222b42cc1180b
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2019.3.3 b/metadata/md5-cache/dev-util/pycharm-professional-2019.3.3
new file mode 100644
index 000000000000..3d0ccb0767a0
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2019.3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-libs/libdbusmenu dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2019.3.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=99f4373dbf0d0d637f8347d89eeece88
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 6d31285ea21d..00c5525d2a7a 100644
--- a/metadata/md5-cache/dev-util/qmtest-2.4.1-r1
+++ b/metadata/md5-cache/dev-util/qmtest-2.4.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=CodeSourcery's test harness system
 EAPI=6
 HOMEPAGE=http://www.codesourcery.com/qmtest/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ~mips x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://www.codesourcery.com/public/qmtest/qmtest-2.4.1/qmtest-2.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=909ff4d6edac7a36102c8f7c2d785e2e
diff --git a/metadata/md5-cache/dev-util/rbtools-0.7.11 b/metadata/md5-cache/dev-util/rbtools-0.7.11
deleted file mode 100644
index 0300ebe30d87..000000000000
--- a/metadata/md5-cache/dev-util/rbtools-0.7.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tqdm[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Command line tools for use with Review Board
-EAPI=6
-HOMEPAGE=https://www.reviewboard.org/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tqdm[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d2f40001daa8ecaea96c60de361846b
diff --git a/metadata/md5-cache/dev-util/rbtools-1.0.2 b/metadata/md5-cache/dev-util/rbtools-1.0.2
index 00729e491c19..aa31b7548910 100644
--- a/metadata/md5-cache/dev-util/rbtools-1.0.2
+++ b/metadata/md5-cache/dev-util/rbtools-1.0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Command line tools for use with Review Board
 EAPI=7
 HOMEPAGE=https://www.reviewboard.org/
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/six-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/tqdm[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/texttable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/colorama[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://downloads.reviewboard.org/releases/RBTools/1.0/RBTools-1.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7c21247a908fb6153cc00fb9bcd3e2f8
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=29d4b6338a00a6739d42a658519d71aa
diff --git a/metadata/md5-cache/dev-util/re2c-1.3 b/metadata/md5-cache/dev-util/re2c-1.3
index 963f74fa1538..e5e1b5acf138 100644
--- a/metadata/md5-cache/dev-util/re2c-1.3
+++ b/metadata/md5-cache/dev-util/re2c-1.3
@@ -3,8 +3,8 @@ DESCRIPTION=tool for generating C-based recognizers from regular expressions
 EAPI=7
 HOMEPAGE=http://re2c.org/
 IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://github.com/skvadrik/re2c/releases/download/1.3/re2c-1.3.tar.xz
-_md5_=d2b65f9491400b264f14f888dfad3458
+_md5_=cee5ced3b24c095c18610031c5caea28
diff --git a/metadata/md5-cache/dev-util/redo-0.42 b/metadata/md5-cache/dev-util/redo-0.42
deleted file mode 100644
index aa03ea742580..000000000000
--- a/metadata/md5-cache/dev-util/redo-0.42
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/beautifulsoup[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DEFINED_PHASES=compile install setup test
-DESCRIPTION=Smaller, easier, more powerful, and more reliable than make
-EAPI=7
-HOMEPAGE=https://github.com/apenwarr/redo
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-python/beautifulsoup[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/apenwarr/redo/archive/redo-0.42.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=20352a39159a6a0d1177bb7f95d89491
diff --git a/metadata/md5-cache/dev-util/redo-0.42-r1 b/metadata/md5-cache/dev-util/redo-0.42-r1
new file mode 100644
index 000000000000..dbcf1ce636b8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/redo-0.42-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python2_7? ( dev-python/beautifulsoup[python_targets_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DEFINED_PHASES=compile install setup test
+DESCRIPTION=Smaller, easier, more powerful, and more reliable than make
+EAPI=7
+HOMEPAGE=https://github.com/apenwarr/redo
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=LGPL-2
+RDEPEND=python_single_target_python2_7? ( dev-python/beautifulsoup[python_targets_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/apenwarr/redo/archive/redo-0.42.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7b88df252fb8b85ce356caa405b3cb5c
diff --git a/metadata/md5-cache/dev-util/redo-99999 b/metadata/md5-cache/dev-util/redo-99999
index f6b1351dec3c..0441b2a4b9e9 100644
--- a/metadata/md5-cache/dev-util/redo-99999
+++ b/metadata/md5-cache/dev-util/redo-99999
@@ -1,13 +1,13 @@
-BDEPEND=dev-python/beautifulsoup[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python2_7? ( dev-python/beautifulsoup[python_targets_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install setup test unpack
 DESCRIPTION=Smaller, easier, more powerful, and more reliable than make
 EAPI=7
 HOMEPAGE=https://github.com/apenwarr/redo
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=LGPL-2
 PROPERTIES=live
-RDEPEND=dev-python/beautifulsoup[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( dev-python/beautifulsoup[python_targets_python2_7(-)] dev-python/markdown[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cd1469944412ca5976326eae814b0a5c
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4c5b9e8a7ea91baeb8150dfca548f3ed
diff --git a/metadata/md5-cache/dev-util/rosdep-0.13.0 b/metadata/md5-cache/dev-util/rosdep-0.13.0
index ebf7adc95179..3e7cf7013b07 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.13.0
+++ b/metadata/md5-cache/dev-util/rosdep-0.13.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Command-line tool for installing ROS system dependencies
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rosdep
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.13.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.13.0.tar.gz -> rosdep-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66d74b8baeb9848893e56b0ab1287a51
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=db77c7cf7a2c96e03474c3f39725829b
diff --git a/metadata/md5-cache/dev-util/rosdep-0.14.0 b/metadata/md5-cache/dev-util/rosdep-0.14.0
index d7ba58788c9c..1d69023ef6de 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.14.0
+++ b/metadata/md5-cache/dev-util/rosdep-0.14.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Command-line tool for installing ROS system dependencies
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rosdep
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.14.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.14.0.tar.gz -> rosdep-0.14.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66d74b8baeb9848893e56b0ab1287a51
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=db77c7cf7a2c96e03474c3f39725829b
diff --git a/metadata/md5-cache/dev-util/rosdep-0.15.0 b/metadata/md5-cache/dev-util/rosdep-0.15.0
index 8ad8ae7d3cd4..9cf142bfcfef 100644
--- a/metadata/md5-cache/dev-util/rosdep-0.15.0
+++ b/metadata/md5-cache/dev-util/rosdep-0.15.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Command-line tool for installing ROS system dependencies
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rosdep
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/rosdep/rosdep-0.15.0.tar.gz https://github.com/ros-infrastructure/rosdep/archive/0.15.0.tar.gz -> rosdep-0.15.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66d74b8baeb9848893e56b0ab1287a51
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=db77c7cf7a2c96e03474c3f39725829b
diff --git a/metadata/md5-cache/dev-util/rosdep-9999 b/metadata/md5-cache/dev-util/rosdep-9999
index 108af94aa2d1..4f2cbf4d4579 100644
--- a/metadata/md5-cache/dev-util/rosdep-9999
+++ b/metadata/md5-cache/dev-util/rosdep-9999
@@ -1,15 +1,15 @@
-BDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/coverage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/flake8[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Command-line tool for installing ROS system dependencies
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/rosdep
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/catkin_pkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=66d74b8baeb9848893e56b0ab1287a51
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=db77c7cf7a2c96e03474c3f39725829b
diff --git a/metadata/md5-cache/dev-util/rosinstall-0.7.8 b/metadata/md5-cache/dev-util/rosinstall-0.7.8
index e5aba9ee43f8..dda44f531bef 100644
--- a/metadata/md5-cache/dev-util/rosinstall-0.7.8
+++ b/metadata/md5-cache/dev-util/rosinstall-0.7.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/catkin_pkg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial app-shells/zsh ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/catkin_pkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial app-shells/zsh ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Command-line tools for maintaining a workspace of projects for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/catkin_pkg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/catkin_pkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6088d60d2c41047186d0f898ac0b0db4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6aebc4f64b227e86f52b5838065fc17f
diff --git a/metadata/md5-cache/dev-util/rosinstall-9999 b/metadata/md5-cache/dev-util/rosinstall-9999
index 86e2a602a0a1..ad6873317eac 100644
--- a/metadata/md5-cache/dev-util/rosinstall-9999
+++ b/metadata/md5-cache/dev-util/rosinstall-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/catkin_pkg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial app-shells/zsh ) >=dev-vcs/git-1.8.2.1[curl] 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/catkin_pkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial app-shells/zsh ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Command-line tools for maintaining a workspace of projects for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall http://wiki.ros.org/roslocate
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/catkin_pkg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/catkin_pkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/vcstools-0.1.38[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rosdistro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-util/wstool-0.1.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6088d60d2c41047186d0f898ac0b0db4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6aebc4f64b227e86f52b5838065fc17f
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 7836f01d96fb..37a92492e46b 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall_generator
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[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
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a66251821d9fa60b45d8f9a547306446
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=22df8d01d6b86cdd47f715e144724f9b
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 c096cbf9f2f1..21a454052bc4 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-0.1.14
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall_generator
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed3d30143045f6ad967bf9d666cbc7c1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70a04a42bcc78d5d6a27a0d0effd5ac5
diff --git a/metadata/md5-cache/dev-util/rosinstall_generator-9999 b/metadata/md5-cache/dev-util/rosinstall_generator-9999
index 3bbb59cecc0e..aaf91f16d37f 100644
--- a/metadata/md5-cache/dev-util/rosinstall_generator-9999
+++ b/metadata/md5-cache/dev-util/rosinstall_generator-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Generates rosinstall metadata about repositories with ROS packages/stacks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosinstall_generator
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_pypy3 python_targets_python3_6
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/catkin_pkg-0.1.28[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/rosdistro-0.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed3d30143045f6ad967bf9d666cbc7c1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70a04a42bcc78d5d6a27a0d0effd5ac5
diff --git a/metadata/md5-cache/dev-util/rpmdevtools-8.10 b/metadata/md5-cache/dev-util/rpmdevtools-8.10
deleted file mode 100644
index a65a7df8f276..000000000000
--- a/metadata/md5-cache/dev-util/rpmdevtools-8.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-lang/perl:* sys-apps/help2man
-DESCRIPTION=Collection of rpm packaging related utilities
-EAPI=6
-HOMEPAGE=https://pagure.io/rpmdevtools
-IUSE=emacs +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-lang/perl:* net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/rpmdevtools/rpmdevtools-8.10.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=041e89d2186d51fbc212354d12cd20f9
diff --git a/metadata/md5-cache/dev-util/rpmdevtools-8.10-r1 b/metadata/md5-cache/dev-util/rpmdevtools-8.10-r1
new file mode 100644
index 000000000000..8a925ce37f46
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rpmdevtools-8.10-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/rpm[python,python_single_target_python2_7(-)?] dev-lang/perl:* sys-apps/help2man
+DESCRIPTION=Collection of rpm packaging related utilities
+EAPI=6
+HOMEPAGE=https://pagure.io/rpmdevtools
+IUSE=emacs +python_single_target_python2_7
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-arch/rpm[python,python_single_target_python2_7(-)?] dev-lang/perl:* net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://releases.pagure.org/rpmdevtools/rpmdevtools-8.10.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7e65b65df590386fde6f63186bb8aa5c
diff --git a/metadata/md5-cache/dev-util/rpmdevtools-8.10-r2 b/metadata/md5-cache/dev-util/rpmdevtools-8.10-r2
new file mode 100644
index 000000000000..a41ceaa92e08
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rpmdevtools-8.10-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-arch/rpm[python,python_single_target_python3_6(-)?] dev-lang/perl:* sys-apps/help2man
+DESCRIPTION=Collection of rpm packaging related utilities
+EAPI=7
+HOMEPAGE=https://pagure.io/rpmdevtools
+IUSE=emacs +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-arch/rpm[python,python_single_target_python3_6(-)?] dev-lang/perl:* net-misc/curl emacs? ( app-emacs/rpm-spec-mode )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://releases.pagure.org/rpmdevtools/rpmdevtools-8.10.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3f81b895bc7f3a4efe0f0df5b625a2b7
diff --git a/metadata/md5-cache/dev-util/rr-5.2.0-r1 b/metadata/md5-cache/dev-util/rr-5.2.0-r1
index 73e916f9f2ea..cb42b3363c87 100644
--- a/metadata/md5-cache/dev-util/rr-5.2.0-r1
+++ b/metadata/md5-cache/dev-util/rr-5.2.0-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib dev-libs/capnproto python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) test? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-devel/gdb[xml] )
+DEPEND=sys-libs/zlib dev-libs/capnproto python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) test? ( python_single_target_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)] ) sys-devel/gdb[xml] )
 DESCRIPTION=Record and Replay Framework
 EAPI=7
 HOMEPAGE=https://rr-project.org/
-IUSE=multilib test kernel_linux +python_targets_python2_7 +python_single_target_python2_7
+IUSE=multilib test kernel_linux +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT BSD-2
 RDEPEND=sys-libs/zlib dev-libs/capnproto python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/gdb[xml]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 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	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8c9c4519ce4569b69052772aefbd92a
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f5cd714c91cbfcfd30c2683212721fe8
diff --git a/metadata/md5-cache/dev-util/rr-5.3.0 b/metadata/md5-cache/dev-util/rr-5.3.0
deleted file mode 100644
index 6383cfa07ba6..000000000000
--- a/metadata/md5-cache/dev-util/rr-5.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/zlib dev-libs/capnproto python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) test? ( dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] sys-devel/gdb[xml] )
-DESCRIPTION=Record and Replay Framework
-EAPI=7
-HOMEPAGE=https://rr-project.org/
-IUSE=multilib test kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT BSD-2
-RDEPEND=sys-libs/zlib dev-libs/capnproto python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-devel/gdb[xml]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mozilla/rr/archive/5.3.0.tar.gz -> mozilla-rr-5.3.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=011a7b80ed1c7d2a780b22becb7d86ca
diff --git a/metadata/md5-cache/dev-util/rr-5.3.0-r1 b/metadata/md5-cache/dev-util/rr-5.3.0-r1
new file mode 100644
index 000000000000..aa3a7516a8de
--- /dev/null
+++ b/metadata/md5-cache/dev-util/rr-5.3.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib dev-libs/capnproto python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) test? ( python_single_target_python3_6? ( dev-python/pexpect[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pexpect[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pexpect[python_targets_python3_8(-)] ) sys-devel/gdb[xml] )
+DESCRIPTION=Record and Replay Framework
+EAPI=7
+HOMEPAGE=https://rr-project.org/
+IUSE=multilib test kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT BSD-2
+RDEPEND=sys-libs/zlib dev-libs/capnproto python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-devel/gdb[xml]
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mozilla/rr/archive/5.3.0.tar.gz -> mozilla-rr-5.3.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=faa16ec433c6b19ed9a4cc32dfdf6511
diff --git a/metadata/md5-cache/dev-util/rt-tests-1.6 b/metadata/md5-cache/dev-util/rt-tests-1.6
index dc72411cd527..d0ffb4d37937 100644
--- a/metadata/md5-cache/dev-util/rt-tests-1.6
+++ b/metadata/md5-cache/dev-util/rt-tests-1.6
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A collection of latency testing tools for the linux(-rt) kernel
 EAPI=7
 HOMEPAGE=https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/
-IUSE=numa python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=numa python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 GPL-2+ LGPL-2.1+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) numa? ( sys-process/numactl )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://kernel.org/pub/linux/utils/rt-tests/rt-tests-1.6.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=61eb6ae5a4d418b36cdd4cd2b2003c3c
diff --git a/metadata/md5-cache/dev-util/scanmem-0.17 b/metadata/md5-cache/dev-util/scanmem-0.17
index 830bbb7daf83..0f6fc18f0d26 100644
--- a/metadata/md5-cache/dev-util/scanmem-0.17
+++ b/metadata/md5-cache/dev-util/scanmem-0.17
@@ -4,12 +4,12 @@ DEPEND=sys-libs/readline:0=
 DESCRIPTION=Locate and modify variables in executing processes
 EAPI=7
 HOMEPAGE=https://github.com/scanmem/scanmem
-IUSE=gui static-libs 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
+IUSE=gui static-libs python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=sys-libs/readline:0= gui? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/pygobject:3 sys-auth/polkit )
-REQUIRED_USE=gui? ( ^^ ( 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 ) )
+RDEPEND=sys-libs/readline:0= gui? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/pygobject:3 sys-auth/polkit )
+REQUIRED_USE=gui? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/scanmem/scanmem/archive/v0.17.tar.gz -> scanmem-0.17.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=800bc0756a23d058bcdcd930a49864ee
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=26e577628a98eecae2a1a69eae6fa19f
diff --git a/metadata/md5-cache/dev-util/scons-3.1.1 b/metadata/md5-cache/dev-util/scons-3.1.1
index fe9ceed13c01..e3539de69555 100644
--- a/metadata/md5-cache/dev-util/scons-3.1.1
+++ b/metadata/md5-cache/dev-util/scons-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/scons/scons-3.1.1.tar.gz doc? ( http://www.scons.org/doc/3.1.1/PDF/scons-user.pdf -> scons-3.1.1-user.pdf http://www.scons.org/doc/3.1.1/HTML/scons-user.html -> scons-3.1.1-user.html ) test? ( https://github.com/scons/scons/archive/3.1.1.tar.gz -> scons-3.1.1.gh.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=37bd5fe0409e88706d985eea753732d2
diff --git a/metadata/md5-cache/dev-util/scons-3.1.2 b/metadata/md5-cache/dev-util/scons-3.1.2
index cc234fb112fc..78d6edca2cf8 100644
--- a/metadata/md5-cache/dev-util/scons-3.1.2
+++ b/metadata/md5-cache/dev-util/scons-3.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/scons/scons/3.1.2/scons-3.1.2.tar.gz doc? ( https://www.scons.org/doc/3.1.2/PDF/scons-user.pdf -> scons-3.1.2-user.pdf https://www.scons.org/doc/3.1.2/HTML/scons-user.html -> scons-3.1.2-user.html ) test? ( https://github.com/scons/scons/archive/3.1.2.tar.gz -> scons-3.1.2.gh.tar.gz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21a18c45e70bc6b43c30148abdb3589a
diff --git a/metadata/md5-cache/dev-util/setconf-0.6.6 b/metadata/md5-cache/dev-util/setconf-0.6.6
index 406bd2772cd7..5daee76c2539 100644
--- a/metadata/md5-cache/dev-util/setconf-0.6.6
+++ b/metadata/md5-cache/dev-util/setconf-0.6.6
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup unpack
 DESCRIPTION=A small python based utility used to change configuration files
 EAPI=5
 HOMEPAGE=http://setconf.roboticoverlords.org/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://setconf.roboticoverlords.org/setconf-0.6.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd037fe8bc85f6ba3a586f2dd85840f3
diff --git a/metadata/md5-cache/dev-util/setconf-0.6.7 b/metadata/md5-cache/dev-util/setconf-0.6.7
index 14e69d47828e..7970dff5690d 100644
--- a/metadata/md5-cache/dev-util/setconf-0.6.7
+++ b/metadata/md5-cache/dev-util/setconf-0.6.7
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup unpack
 DESCRIPTION=A small python based utility used to change configuration files
 EAPI=5
 HOMEPAGE=http://setconf.roboticoverlords.org/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python_single_target_python2_7 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=http://setconf.roboticoverlords.org/setconf-0.6.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=03581a1fd06d6fd45ae94d1bad498abb
diff --git a/metadata/md5-cache/dev-util/smem-1.4 b/metadata/md5-cache/dev-util/smem-1.4
index 646505ea2f6d..87f58583c41b 100644
--- a/metadata/md5-cache/dev-util/smem-1.4
+++ b/metadata/md5-cache/dev-util/smem-1.4
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile install postinst prepare setup
 DESCRIPTION=A tool that can give numerous reports on memory usage on Linux systems
 EAPI=7
 HOMEPAGE=https://www.selenic.com/smem/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.selenic.com/smem/download/smem-1.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=72f745b227ac5397e1db5a787a4895c5
diff --git a/metadata/md5-cache/dev-util/smem-1.5 b/metadata/md5-cache/dev-util/smem-1.5
index 3f9fdd966350..93d25b323e7d 100644
--- a/metadata/md5-cache/dev-util/smem-1.5
+++ b/metadata/md5-cache/dev-util/smem-1.5
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile install postinst setup
 DESCRIPTION=A tool that can give numerous reports on memory usage on Linux systems
 EAPI=7
 HOMEPAGE=https://www.selenic.com/smem/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~conikost/files/smem-1.5.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=54b5e9f124f26420553e4e31a5cfccb0
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 58c4ded891da..0792708753dc 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-1.0.7
+++ b/metadata/md5-cache/dev-util/spec-cleaner-1.0.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/openSUSE/spec-cleaner/archive/spec-cleaner-1.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80f894c8da528177683ff7d9c44d4f3b
diff --git a/metadata/md5-cache/dev-util/spec-cleaner-9999 b/metadata/md5-cache/dev-util/spec-cleaner-9999
index c163f78469dc..a47393e3ef14 100644
--- a/metadata/md5-cache/dev-util/spec-cleaner-9999
+++ b/metadata/md5-cache/dev-util/spec-cleaner-9999
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80f894c8da528177683ff7d9c44d4f3b
diff --git a/metadata/md5-cache/dev-util/strace-5.2 b/metadata/md5-cache/dev-util/strace-5.2
deleted file mode 100644
index 113508124e7d..000000000000
--- a/metadata/md5-cache/dev-util/strace-5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
-DESCRIPTION=A useful diagnostic, instructional, and debugging tool
-EAPI=7
-HOMEPAGE=https://strace.io/
-IUSE=aio perl static unwind elfutils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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/v5.2/strace-5.2.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a314b229f63cb12876eca72eb3068677
diff --git a/metadata/md5-cache/dev-util/strace-5.5 b/metadata/md5-cache/dev-util/strace-5.5
new file mode 100644
index 000000000000..17e1aeccc20d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-5.5
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=7
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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/v5.5/strace-5.5.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2d0cd4c3e88df8a7bfb4a53ae908105e
diff --git a/metadata/md5-cache/dev-util/systemtap-2.4-r1 b/metadata/md5-cache/dev-util/systemtap-2.4-r1
index 50d35874e03f..bb7809d1eaea 100644
--- a/metadata/md5-cache/dev-util/systemtap-2.4-r1
+++ b/metadata/md5-cache/dev-util/systemtap-2.4-r1
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap python_single_target_python2_7?
 DESCRIPTION=A linux trace/probe tool
 EAPI=5
 HOMEPAGE=https://www.sourceware.org/systemtap/
-IUSE=sqlite kernel_linux +python_targets_python2_7 +python_single_target_python2_7
+IUSE=sqlite kernel_linux +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-2.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a505aae857540f3fa5071d377580ea30
diff --git a/metadata/md5-cache/dev-util/systemtap-3.1-r1 b/metadata/md5-cache/dev-util/systemtap-3.1-r1
index ff1ca2833292..7f8cedcf7615 100644
--- a/metadata/md5-cache/dev-util/systemtap-3.1-r1
+++ b/metadata/md5-cache/dev-util/systemtap-3.1-r1
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= dev-libs/nspr dev-libs/nss sy
 DESCRIPTION=A linux trace/probe tool
 EAPI=6
 HOMEPAGE=https://www.sourceware.org/systemtap/
-IUSE=libvirt sqlite kernel_linux +python_targets_python2_7 +python_single_target_python2_7
+IUSE=libvirt sqlite kernel_linux +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= dev-libs/nspr dev-libs/nss sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) sqlite? ( dev-db/sqlite:3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56f2b4578c4f3cec3d9025ba4be6da96
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r1 b/metadata/md5-cache/dev-util/systemtap-4.0-r1
index 00565aced2a1..b244dc9d3f3e 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r1
+++ b/metadata/md5-cache/dev-util/systemtap-4.0-r1
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/
 DESCRIPTION=A linux trace/probe tool
 EAPI=7
 HOMEPAGE=https://www.sourceware.org/systemtap/
-IUSE=libvirt selinux sqlite +ssl zeroconf kernel_linux python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=libvirt selinux sqlite +ssl zeroconf kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cefbbbe6ceab65139bed7ada92ceea9b
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 02c96777ff6a..f5ff70aab19f 100644
--- a/metadata/md5-cache/dev-util/tailor-0.9.35-r1
+++ b/metadata/md5-cache/dev-util/tailor-0.9.35-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=A tool to migrate changesets between version control systems
 EAPI=5
 HOMEPAGE=http://wiki.darcs.net/index.html/Tailor
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://darcs.arstecnica.it/tailor-0.9.35.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06f978c1bc4c9057477233fac0f5cb0c
diff --git a/metadata/md5-cache/dev-util/uftrace-0.9.3 b/metadata/md5-cache/dev-util/uftrace-0.9.3
index c076d3803f65..3f95a729aeef 100644
--- a/metadata/md5-cache/dev-util/uftrace-0.9.3
+++ b/metadata/md5-cache/dev-util/uftrace-0.9.3
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Function (graph) tracer for user-space
 EAPI=7
 HOMEPAGE=https://github.com/namhyung/uftrace
-IUSE=capstone +python_targets_python2_7 +python_single_target_python2_7
+IUSE=capstone +python_single_target_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/gcc:*[cxx] sys-libs/ncurses:= virtual/libelf:= capstone? ( dev-libs/capstone:0= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/namhyung/uftrace/archive/v0.9.3.tar.gz -> uftrace-0.9.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d4d8941ee844db5f2464c9470c32de46
diff --git a/metadata/md5-cache/dev-util/umockdev-0.11.3 b/metadata/md5-cache/dev-util/umockdev-0.11.3
index 4d46987ab4f7..210aa05da647 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.11.3
+++ b/metadata/md5-cache/dev-util/umockdev-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install setup test
-DEPEND=virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-arch/xz-utils >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( || ( dev-lang/python:3.6 ) ) app-arch/xz-utils >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Mock hardware devices for creating unit tests
 EAPI=6
 HOMEPAGE=https://github.com/martinpitt/umockdev/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.11.3/umockdev-0.11.3.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=838fe9e1cb838ef2e3ef3919e8acaef1
+_md5_=8eb8c49b8e374bb642437840daca005e
diff --git a/metadata/md5-cache/dev-util/umockdev-0.12.1 b/metadata/md5-cache/dev-util/umockdev-0.12.1
index bbd79e9a4b3c..af2433842ec2 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.12.1
+++ b/metadata/md5-cache/dev-util/umockdev-0.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install setup test
-DEPEND=virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) test? ( || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-arch/xz-utils >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) test? ( || ( dev-lang/python:3.6 ) dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-arch/xz-utils >=dev-util/gtk-doc-am-1.14 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Mock hardware devices for creating unit tests
 EAPI=6
 HOMEPAGE=https://github.com/martinpitt/umockdev/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.12.1/umockdev-0.12.1.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=028e9d8aa5138728d320057f171ba15b
+_md5_=ddf8d3a1fcf8e2ddb2a337226da09909
diff --git a/metadata/md5-cache/dev-util/umockdev-0.9.4 b/metadata/md5-cache/dev-util/umockdev-0.9.4
index 0d51aca4ba71..9d3c4327cb03 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.9.4
+++ b/metadata/md5-cache/dev-util/umockdev-0.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure setup
-DEPEND=dev-libs/libgudev:= virtual/libudev:= >=dev-libs/glib-2.32:2 test? ( || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) app-arch/xz-utils virtual/pkgconfig
+DEPEND=dev-libs/libgudev:= virtual/libudev:= >=dev-libs/glib-2.32:2 test? ( || ( dev-lang/python:3.6 ) ) app-arch/xz-utils virtual/pkgconfig
 DESCRIPTION=Mock hardware devices for creating unit tests
 EAPI=6
 HOMEPAGE=https://github.com/martinpitt/umockdev/
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/umockdev/trunk/0.9.4/+download/umockdev-0.9.4.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=880779c8f34cb709b698c45c85e7fde3
+_md5_=639de0f24b56f281b6aeea1f7c9cf20c
diff --git a/metadata/md5-cache/dev-util/vint-0.3.18 b/metadata/md5-cache/dev-util/vint-0.3.18
index 855340a4655a..3ad6a85eaf35 100644
--- a/metadata/md5-cache/dev-util/vint-0.3.18
+++ b/metadata/md5-cache/dev-util/vint-0.3.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kuniwak/vint/archive/v0.3.18.tar.gz -> vint-0.3.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1d3233ada363f0bbf65c2dff39e81a1
diff --git a/metadata/md5-cache/dev-util/vint-0.3.19 b/metadata/md5-cache/dev-util/vint-0.3.19
index f4c75e1c2ac8..9a4f8c87705b 100644
--- a/metadata/md5-cache/dev-util/vint-0.3.19
+++ b/metadata/md5-cache/dev-util/vint-0.3.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Kuniwak/vint/archive/v0.3.19.tar.gz -> vint-0.3.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dda5bb3efe4ab9458021ea4b01a3b64d
diff --git a/metadata/md5-cache/dev-util/waf-1.9.14 b/metadata/md5-cache/dev-util/waf-1.9.14
index d04493494796..c9a9310b0d47 100644
--- a/metadata/md5-cache/dev-util/waf-1.9.14
+++ b/metadata/md5-cache/dev-util/waf-1.9.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=|| ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] )
+DEPEND=|| ( dev-lang/python:3.6[threads(+)] )
 DESCRIPTION=piece of software used to help building software projects
 EAPI=6
 HOMEPAGE=https://waf.io/
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=https://waf.io/waf-1.9.14.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=968d434de1bb8191c72f5a02d65f9dad
+_md5_=3f4d8a35e8befad26af6614d19074bb5
diff --git a/metadata/md5-cache/dev-util/wstool-0.1.18 b/metadata/md5-cache/dev-util/wstool-0.1.18
index d6671692365d..7931ae3a57b8 100644
--- a/metadata/md5-cache/dev-util/wstool-0.1.18
+++ b/metadata/md5-cache/dev-util/wstool-0.1.18
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vcstools-0.1.38[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Commands to manage several local SCM repositories for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/wstool
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vcstools-0.1.38[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.ros.org/downloads/wstool/wstool-0.1.18.tar.gz https://github.com/vcstools/wstool/archive/0.1.18.tar.gz -> wstool-0.1.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44b87b4abb6fb463f727ac5cad6590dc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64ad4d60c6bcf5a2ae50d9b1c1af37b5
diff --git a/metadata/md5-cache/dev-util/wstool-9999 b/metadata/md5-cache/dev-util/wstool-9999
index 809a38c9fc2b..bee32f1a4bd3 100644
--- a/metadata/md5-cache/dev-util/wstool-9999
+++ b/metadata/md5-cache/dev-util/wstool-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vcstools-0.1.38[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx test? ( dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) >=dev-vcs/git-1.8.2.1[curl] 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Commands to manage several local SCM repositories for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/wstool
-IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/vcstools-0.1.38[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44b87b4abb6fb463f727ac5cad6590dc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64ad4d60c6bcf5a2ae50d9b1c1af37b5
diff --git a/metadata/md5-cache/dev-util/wxglade-0.8.2 b/metadata/md5-cache/dev-util/wxglade-0.8.2
deleted file mode 100644
index ecc9103ba7d3..000000000000
--- a/metadata/md5-cache/dev-util/wxglade-0.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-arch/unzip
-DESCRIPTION=Glade-like GUI designer which can generate Python, Perl, C++ or XRC code
-EAPI=6
-HOMEPAGE=http://wxglade.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=MIT
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/wxglade/wxGlade-0.8.2.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=891d0e4dae0b6ea069fcd1b281a9683f
diff --git a/metadata/md5-cache/dev-util/wxglade-0.8.2-r1 b/metadata/md5-cache/dev-util/wxglade-0.8.2-r1
new file mode 100644
index 000000000000..9f70af5048e2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/wxglade-0.8.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python2_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/wxpython:3.0[python_targets_python2_7(-)] ) app-arch/unzip
+DESCRIPTION=Glade-like GUI designer which can generate Python, Perl, C++ or XRC code
+EAPI=6
+HOMEPAGE=http://wxglade.sourceforge.net/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ~ppc sparc x86
+LICENSE=MIT
+RDEPEND=python_single_target_python2_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/wxpython:3.0[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/wxglade/wxGlade-0.8.2.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1e62a70e539929d21759e1bf60c92677
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
deleted file mode 100644
index aa3b0b7bd06e..000000000000
--- a/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Development tools and examples for the Xesam desktop search API
-EAPI=5
-HOMEPAGE=http://xesam.org/people/kamstrup/xesam-tools
-IUSE=examples +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=357f1df342869b8409a179e0efe6b38b
diff --git a/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r2 b/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r2
new file mode 100644
index 000000000000..3b539c35198e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/xesam-tools-0.7.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=Development tools and examples for the Xesam desktop search API
+EAPI=5
+HOMEPAGE=http://xesam.org/people/kamstrup/xesam-tools
+IUSE=examples +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3495b3e2f5417b462200974f7ca6dbe6
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 8fa942344862..2332ab9cf241 100644
--- a/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622
+++ b/metadata/md5-cache/dev-util/xxdiff-4.0.1_p20170622
@@ -11,5 +11,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	c576838cd67e384002a18edd54be710e	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	estack	686eaab303305a908fd57b2fd7617800	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=265836913b4c1f7000f9ce48c8b859ec
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index b31fa4483427..591150b79bfd 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.7.0 b/metadata/md5-cache/dev-vcs/bzr-2.7.0
index 7e4cba67a7be..3d140fc4287b 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb094c36a89b2b8f8f0ed435722a2d5f
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 12d9413af52b..d16dee8014ef 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e5c9714d8db61e294663fc5e0235dc6
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 4b5f7a9c1c1e..716d0616fc7e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=872065278f4e3905ec365c30a296a6e7
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
deleted file mode 100644
index da4aeedb59f4..000000000000
--- a/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Bazaar plugin providing an option to generate XML output for builtin commands
-EAPI=5
-HOMEPAGE=http://bazaar-vcs.org/XMLOutput
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca1bc678baf7e7a6dc959f3703778c85
diff --git a/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r3 b/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r3
new file mode 100644
index 000000000000..f42d14443d03
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/bzr-xmloutput-0.8.8-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=Bazaar plugin providing an option to generate XML output for builtin commands
+EAPI=5
+HOMEPAGE=http://bazaar-vcs.org/XMLOutput
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( dev-vcs/bzr[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a725114258af490ce9848ff6c2f89911
diff --git a/metadata/md5-cache/dev-vcs/bzrtools-2.5 b/metadata/md5-cache/dev-vcs/bzrtools-2.5
index 0237da3b1996..89422d3aae54 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=312302e0f3dd269037198f8740e00cef
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
index 890964414788..56289d71bc2b 100644
--- a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r12
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e1bdd89224f3929e954ff3b230c50ad4
+_md5_=f75d34df672350fe920c9aaff6b17f1a
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 c24edd7aaea2..2bdf7c81ee98 100644
--- a/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
+++ b/metadata/md5-cache/dev-vcs/cvs2svn-2.4.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-vcs/subversion-1.0.9 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=>=dev-vcs/subversion-1.0.9 python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Convert a CVS repository to a Subversion repository
 EAPI=6
 HOMEPAGE=http://cvs2svn.tigris.org/
-IUSE=bazaar git test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=bazaar git test +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13 ) git? ( >=dev-vcs/git-1.5.4.4 ) dev-vcs/rcs python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49237/cvs2svn-2.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4164378ec0dab7ccfe9ef035f461d2ab
diff --git a/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0 b/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
index a4e3527f4446..c14305d30cd9 100644
--- a/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
+++ b/metadata/md5-cache/dev-vcs/cvs2svn-2.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-vcs/subversion-1.0.9 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=>=dev-vcs/subversion-1.0.9 python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Convert a CVS repository to a Subversion repository
 EAPI=6
 HOMEPAGE=http://cvs2svn.tigris.org/
-IUSE=bazaar git test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=bazaar git test +python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/subversion-1.0.9 bazaar? ( >=dev-vcs/bzr-1.13 ) git? ( >=dev-vcs/git-1.5.4.4 ) dev-vcs/rcs python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://cvs2svn.tigris.org/files/documents/1462/49543/cvs2svn-2.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=65337311c51e6ec65d592b60ce1221c2
diff --git a/metadata/md5-cache/dev-vcs/cvsps-3.13-r2 b/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
index ccecdd6b2e82..c3a4e2fe72fe 100644
--- a/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
+++ b/metadata/md5-cache/dev-vcs/cvsps-3.13-r2
@@ -3,11 +3,11 @@ DEPEND=sys-libs/zlib app-text/asciidoc
 DESCRIPTION=Generates patchset information from a CVS repository (supports fast-import)
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/cvsps/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 RESTRICT=test
 SLOT=3
 SRC_URI=http://www.catb.org/~esr/cvsps/cvsps-3.13.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=01a03a9f9c12d72a9e8f0e3e2fc66045
+_md5_=cc975a46c235aea832c3a2dd5890ba2d
diff --git a/metadata/md5-cache/dev-vcs/git-2.21.1 b/metadata/md5-cache/dev-vcs/git-2.21.1
index 596250632a1e..ca5f93197015 100644
--- a/metadata/md5-cache/dev-vcs/git-2.21.1
+++ b/metadata/md5-cache/dev-vcs/git-2.21.1
@@ -3,13 +3,13 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 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 +python_single_target_python2_7
+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_single_target_python2_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.21.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.21.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.21.1.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=545fd510d61a87224db4e554b703c446
diff --git a/metadata/md5-cache/dev-vcs/git-2.23.1-r1 b/metadata/md5-cache/dev-vcs/git-2.23.1-r1
index db4783a9c76c..9b1efedc8029 100644
--- a/metadata/md5-cache/dev-vcs/git-2.23.1-r1
+++ b/metadata/md5-cache/dev-vcs/git-2.23.1-r1
@@ -3,13 +3,13 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test 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
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~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? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( 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 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.23.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.23.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.23.1.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=33028367f616ebee910ad58ec75f570a
diff --git a/metadata/md5-cache/dev-vcs/git-2.24.1 b/metadata/md5-cache/dev-vcs/git-2.24.1
index 5e8c9115990c..2f729bb7b528 100644
--- a/metadata/md5-cache/dev-vcs/git-2.24.1
+++ b/metadata/md5-cache/dev-vcs/git-2.24.1
@@ -4,13 +4,13 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test 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
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( 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 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.24.1.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.24.1.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.24.1.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8f10a0527b5e0634249f1fe2936b16fa
diff --git a/metadata/md5-cache/dev-vcs/git-2.25.0 b/metadata/md5-cache/dev-vcs/git-2.25.0
index bfc7cb23fa1f..067a8ef05e98 100644
--- a/metadata/md5-cache/dev-vcs/git-2.25.0
+++ b/metadata/md5-cache/dev-vcs/git-2.25.0
@@ -4,13 +4,13 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test 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
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( 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 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.25.0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.25.0.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d0a6bf1b27bd420d751ecb40e37e6d52
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index 3513a47f491d..55780604d4aa 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -4,12 +4,12 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test 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
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
 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? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( 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 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d0a6bf1b27bd420d751ecb40e37e6d52
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 3513a47f491d..55780604d4aa 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -4,12 +4,12 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test 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
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
 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? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( 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 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d0a6bf1b27bd420d751ecb40e37e6d52
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 3513a47f491d..55780604d4aa 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -4,12 +4,12 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test 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
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
 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? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( 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 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d0a6bf1b27bd420d751ecb40e37e6d52
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index 3513a47f491d..55780604d4aa 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -4,12 +4,12 @@ DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= )
 DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
 EAPI=7
 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 perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test 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
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 tk +threads +webdav xinetd cvs subversion test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
 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? ( >=app-editors/emacs-23.1:* ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools 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 ) ) perforce? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( 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 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) perforce? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d0a6bf1b27bd420d751ecb40e37e6d52
diff --git a/metadata/md5-cache/dev-vcs/git-bz-0.2015.09.08 b/metadata/md5-cache/dev-vcs/git-bz-0.2015.09.08
index 63abbc648580..30110bc5982f 100644
--- a/metadata/md5-cache/dev-vcs/git-bz-0.2015.09.08
+++ b/metadata/md5-cache/dev-vcs/git-bz-0.2015.09.08
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst setup
 DESCRIPTION=Bugzilla subcommand for git
 EAPI=6
 HOMEPAGE=http://www.fishsoup.net/software/git-bz/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-vcs/git python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/git-bz-0.2015.09.08.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7d5996bc1a0a3823f522da70dd1727f2
diff --git a/metadata/md5-cache/dev-vcs/git-cola-2.11 b/metadata/md5-cache/dev-vcs/git-cola-2.11
deleted file mode 100644
index c206de744fea..000000000000
--- a/metadata/md5-cache/dev-vcs/git-cola-2.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pyinotify[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/QtPy[gui,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[gui,network,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-vcs/git sys-devel/gettext doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The highly caffeinated git GUI
-EAPI=6
-HOMEPAGE=https://git-cola.github.io/
-IUSE=doc test +python_targets_python3_6 +python_single_target_python3_6 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/pyinotify[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/QtPy[gui,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[gui,network,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-vcs/git python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/git-cola/git-cola/archive/v2.11.tar.gz -> git-cola-2.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3a18d0165582b6cb1bfb33d8e91cac7
diff --git a/metadata/md5-cache/dev-vcs/git-cola-2.11-r1 b/metadata/md5-cache/dev-vcs/git-cola-2.11-r1
new file mode 100644
index 000000000000..9aa835a76408
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-cola-2.11-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/pyinotify[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] dev-python/PyQt5[gui,network,widgets,python_targets_python3_6(-)] ) dev-vcs/git sys-devel/gettext python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] ) test? ( dev-python/nose[python_targets_python3_6(-)] !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=The highly caffeinated git GUI
+EAPI=6
+HOMEPAGE=https://git-cola.github.io/
+IUSE=doc test +python_single_target_python3_6 test
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-python/pyinotify[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] dev-python/PyQt5[gui,network,widgets,python_targets_python3_6(-)] ) dev-vcs/git python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/git-cola/git-cola/archive/v2.11.tar.gz -> git-cola-2.11.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2cbe6cf25ec7aa07a9b5b9f5d8600343
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.2 b/metadata/md5-cache/dev-vcs/git-cola-3.2
index e6c95749259a..e0a3a3b2c0b9 100644
--- a/metadata/md5-cache/dev-vcs/git-cola-3.2
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.2
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/QtPy[gui,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-vcs/git sys-devel/gettext doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/nose[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/mock[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
+DEPEND=python_single_target_python3_6? ( dev-python/QtPy[gui,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] ) dev-vcs/git sys-devel/gettext python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/nose[python_targets_python3_6(-)] dev-python/mock[python_targets_python3_6(-)] ) )
 DESCRIPTION=The highly caffeinated git GUI
 EAPI=7
 HOMEPAGE=https://git-cola.github.io/
-IUSE=doc test +python_targets_python3_6 +python_single_target_python3_6 test
+IUSE=doc test +python_single_target_python3_6 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-python/QtPy[gui,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/send2trash[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-vcs/git python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-python/QtPy[gui,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] ) dev-vcs/git python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/git-cola/git-cola/archive/v3.2.tar.gz -> git-cola-3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=4406088efb34a3cd0433074490439119
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=213d17c66893920797228c75a1738d0b
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.5 b/metadata/md5-cache/dev-vcs/git-cola-3.5
deleted file mode 100644
index fc0412f49744..000000000000
--- a/metadata/md5-cache/dev-vcs/git-cola-3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/nose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),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 postinst postrm prepare setup test
-DESCRIPTION=The highly caffeinated git GUI
-EAPI=7
-HOMEPAGE=https://git-cola.github.io/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/QtPy[gui,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/send2trash[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-vcs/git python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/git-cola/git-cola/archive/v3.5.tar.gz -> git-cola-3.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f9f0935daf5b151cecd8b906487d4e9
diff --git a/metadata/md5-cache/dev-vcs/git-cola-3.5-r1 b/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
new file mode 100644
index 000000000000..b49c0d2fa901
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-cola-3.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/mock[python_targets_python3_6(-)] dev-python/nose[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( doc? ( dev-python/sphinx[python_targets_python3_7(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/mock[python_targets_python3_7(-)] dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=The highly caffeinated git GUI
+EAPI=7
+HOMEPAGE=https://git-cola.github.io/
+IUSE=doc test python_single_target_python3_6 python_single_target_python3_7 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] dev-python/send2trash[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/QtPy[gui,python_targets_python3_7(-)] dev-python/send2trash[python_targets_python3_7(-)] ) dev-vcs/git python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/git-cola/git-cola/archive/v3.5.tar.gz -> git-cola-3.5.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a9d25f82d7f011d9bb6af3e5ebcd38a
diff --git a/metadata/md5-cache/dev-vcs/git-deps-9999 b/metadata/md5-cache/dev-vcs/git-deps-9999
index 62c50a6c2887..837e62bf06da 100644
--- a/metadata/md5-cache/dev-vcs/git-deps-9999
+++ b/metadata/md5-cache/dev-vcs/git-deps-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install postinst setup unpack
-DEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygit2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-libs/nodejs python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_single_target_python2_7? ( dev-python/flask[python_targets_python2_7(-)] dev-python/pygit2[python_targets_python2_7(-)] ) net-libs/nodejs python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=git commit dependency analysis tool
 EAPI=6
 HOMEPAGE=https://github.com/aspiers/git-deps
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-python/flask[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygit2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-libs/nodejs python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( dev-python/flask[python_targets_python2_7(-)] dev-python/pygit2[python_targets_python2_7(-)] ) net-libs/nodejs python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c962c90f6e10c4448feafdb5c70110b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=50acbd23a6f60bea0414c4b7d7ff5a9d
diff --git a/metadata/md5-cache/dev-vcs/git-remote-hg-1.0.1 b/metadata/md5-cache/dev-vcs/git-remote-hg-1.0.1
index cb2cb61866ae..11ec09a521ad 100644
--- a/metadata/md5-cache/dev-vcs/git-remote-hg-1.0.1
+++ b/metadata/md5-cache/dev-vcs/git-remote-hg-1.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/mnauw/git-remote-hg/archive/v1.0.1.tar.gz -> git-remote-hg-1.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=39bd20a664e7f74dfe6f642bc6da80eb
diff --git a/metadata/md5-cache/dev-vcs/git-spindle-3.3 b/metadata/md5-cache/dev-vcs/git-spindle-3.3
deleted file mode 100644
index f26f9addb27d..000000000000
--- a/metadata/md5-cache/dev-vcs/git-spindle-3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Git subcommands for interacting with central services
-EAPI=6
-HOMEPAGE=http://seveas.github.io/git-spindle/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/git python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.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
-SRC_URI=https://github.com/seveas/git-spindle/archive/3.3.tar.gz -> git-spindle-3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ccc4b217f92a132c75eb1668f6ad29b
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 60834ed96121..8d21847f0db9 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_python3_6(-)?,-python_sing
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2acaca033880d782a0754b0b6de63f3d
diff --git a/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3 b/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
index 038862f0a233..af83087f907c 100644
--- a/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
+++ b/metadata/md5-cache/dev-vcs/github-pages-publish-0.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pygit2-0.20.0 python_targets_python3_6? ( dev-lang/python:3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/g/github-pages-publish/github-pages-publish-0.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2cfc5d72bf46c2e4c384b761f28b2721
diff --git a/metadata/md5-cache/dev-vcs/gitinspector-0.4.4 b/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
index 01aa99bdb16b..4b7d7063d46e 100644
--- a/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
+++ b/metadata/md5-cache/dev-vcs/gitinspector-0.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ejwa/gitinspector/archive/v0.4.4.tar.gz -> gitinspector-0.4.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6ed5f98abb0110f714857d499adf3e7
diff --git a/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
index 5dac6c563c16..76a12d645144 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite-gentoo vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://milki.github.com/gitolite/gitolite-2.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a26731990e7bfe74f203d1f42fa16efc
diff --git a/metadata/md5-cache/dev-vcs/gitolite-3.6.11 b/metadata/md5-cache/dev-vcs/gitolite-3.6.11
index aa99bbfa655e..6082ae9dc329 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-3.6.11
+++ b/metadata/md5-cache/dev-vcs/gitolite-3.6.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !app-vim/gitolite-syntax !dev-vcs/gitolite-gentoo selinux? ( sec-policy/selinux-gitosis ) dev-perl/JSON dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/sitaramc/gitolite/archive/v3.6.11.tar.gz -> gitolite-3.6.11.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=91d0042ac9628db1f2583fc593d5371e
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
index d284e0f1e022..acc5bc458495 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2fca5436d7f89f421f35edbebbeb5adf
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
index a4561906ce9c..441132a9cd6c 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-2.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-2.3.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=779302a6682158b719b9bcab816a0d84
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
index c35d9911911c..1632ff247571 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.5.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.5.3.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=77192b097e5c5611604709e8b9f8a211
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
index 23617552c46f..b002f59661de 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite dev-perl/Net-SSH-AuthorizedKeysFile vim-syntax? ( app-vim/gitolite-syntax ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=77192b097e5c5611604709e8b9f8a211
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
index 7a787134bb50..8d2695919418 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
index b805939baf15..6083759eb039 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2
index d068d70ab6a3..8d6eae83a22f 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) dev-perl/Net-SSH-AuthorizedKeysFile dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c3dd1f4c10d5accd8fcbdd33856b0e28
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3
index 56e41113529b..4aed0e5c9ae2 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
index 853c6d9e97c5..48b5d0c8adf9 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.2.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
index f146a4ee0abd..d7d03d0fa7f8 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8ce8faa2ca3d3fcd0ea645686f502b8a
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
index 3cc1b979a0a4..9feabce71687 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.3.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4
index 357916aa7139..6a100c2c8ba0 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1
index fd36034ca660..eadbb0b275a6 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a58c4eeecd27cc98527e213efc13618d
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
index beea7ed56e23..1b76120cd8e0 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.4.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5
index e896bfdf597a..5566c8ef83f5 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=70185dd5b0f8398dfe1464f12e29d9d9
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
index f9790ae43078..c2fd8d058b4e 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1
index e9e98a6bf0e6..16dbc792d638 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5db7324a31716239a8d2db5fdff0ddfc
diff --git a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r1 b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r1
index 4b682ae80756..3ed53cc6b52e 100644
--- a/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r1
+++ b/metadata/md5-cache/dev-vcs/gitolite-gentoo-3.6.6.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-File-Path virtual/perl-File-Temp >=dev-vcs/git-1.6.6 !dev-vcs/gitolite vim-syntax? ( app-vim/gitolite-syntax ) selinux? ( sec-policy/selinux-gitosis ) >=dev-perl/Net-SSH-AuthorizedKeysFile-0.17 dev-perl/JSON dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-gentoo-3.6.6.1.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4fd6b189b4ea933b053995046cb7897b
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-8.5.1 b/metadata/md5-cache/dev-vcs/hg-evolve-8.5.1
index c4121d8ca24a..c1b931e6c595 100644
--- a/metadata/md5-cache/dev-vcs/hg-evolve-8.5.1
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-8.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.4[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-8.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0651a00b5142a46aa31876984982d805
diff --git a/metadata/md5-cache/dev-vcs/hg-evolve-9.2.1 b/metadata/md5-cache/dev-vcs/hg-evolve-9.2.1
index b5583c9ffdc6..8b33c4fd1698 100644
--- a/metadata/md5-cache/dev-vcs/hg-evolve-9.2.1
+++ b/metadata/md5-cache/dev-vcs/hg-evolve-9.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.5[python_targets_python2_7(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-evolve/hg-evolve-9.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=02325a678607402b9bf8681668175bfb
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.12-r1 b/metadata/md5-cache/dev-vcs/hg-git-0.8.12-r1
index 44a6d88b0744..a1f107a776c2 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.12-r1
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.12-r1
@@ -11,5 +11,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.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ddf015ab5d39f9da63228778618665a0
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.13 b/metadata/md5-cache/dev-vcs/hg-git-0.8.13
index 0ba83c24e189..859ae3c15e5c 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.13
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.13
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-3.6[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hg-git/hg-git-0.8.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=408e5b0dc2459774ad61d346d648f5ae
diff --git a/metadata/md5-cache/dev-vcs/hg-git-0.8.13_pre20190808 b/metadata/md5-cache/dev-vcs/hg-git-0.8.13_pre20190808
index 5764311b1de1..78ecff83c727 100644
--- a/metadata/md5-cache/dev-vcs/hg-git-0.8.13_pre20190808
+++ b/metadata/md5-cache/dev-vcs/hg-git-0.8.13_pre20190808
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-3.6[python_targets_python2_7(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://bitbucket.org/durin42/hg-git/get/aa15905ca87f.zip -> hg-git-0.8.13_pre20190808.zip
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=78c1d8bbf39c398f226339cfa134ec6e
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 6afa22d80d75..869086a6c974 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=328c7bbf2fa988b70cdfcf0dedc6feb9
diff --git a/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2 b/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2
index 92b96cc728c9..db4d84cd0cca 100644
--- a/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2
+++ b/metadata/md5-cache/dev-vcs/hgsubversion-1.9.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgsubversion/hgsubversion-1.9.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e710ce63210dba2bb8847c2276c848ab
diff --git a/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r1 b/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r1
deleted file mode 100644
index 464a934169d2..000000000000
--- a/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-vcs/mercurial python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A set of scripts to work locally on Subversion checkouts using Mercurial
-EAPI=5
-HOMEPAGE=https://pypi.org/project/hgsvn/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~x86-macos
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-vcs/mercurial dev-vcs/subversion[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/h/hgsvn/hgsvn-0.2.3.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30e96114a14868a35d98c53c5abb541a
diff --git a/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r2 b/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r2
new file mode 100644
index 000000000000..e1d5aa9b5921
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/unzip dev-vcs/mercurial python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A set of scripts to work locally on Subversion checkouts using Mercurial
+EAPI=5
+HOMEPAGE=https://pypi.org/project/hgsvn/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~x86-macos
+LICENSE=GPL-3
+RDEPEND=app-arch/unzip dev-vcs/mercurial python_single_target_python2_7? ( dev-vcs/subversion[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/h/hgsvn/hgsvn-0.2.3.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=66f7355b552bab5fd8e4a9d49180f8ad
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 36cc96967f3c..8a7cbf7cfb63 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0616f1b16d9887747938e90de7c86e11
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.6.2 b/metadata/md5-cache/dev-vcs/mercurial-4.6.2
index 3a2de6d9ce6f..b79a08d32fd3 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.6.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08418a518c79d44da5f3bc48a3d4169d
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.9-r2 b/metadata/md5-cache/dev-vcs/mercurial-4.9-r2
index 1d1fdab5f4f3..fd6454224efd 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.9-r2
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.9-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.9.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2d24ba2fdb56c3037690f064e3699865
diff --git a/metadata/md5-cache/dev-vcs/mercurial-4.9.1 b/metadata/md5-cache/dev-vcs/mercurial-4.9.1
index 69e7a8a53a81..ffd016c7300a 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-4.9.1
+++ b/metadata/md5-cache/dev-vcs/mercurial-4.9.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-4.9.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a5b709391d6f4ddbeb0857d4610b3cb6
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.0.2 b/metadata/md5-cache/dev-vcs/mercurial-5.0.2
index 617d139594f4..9f802858ab8b 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.0.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.0.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=76740a6a7e1833cd3ca204fa38e4597f
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.1.2 b/metadata/md5-cache/dev-vcs/mercurial-5.1.2
index 8da03ae7d308..28bb9512a4fe 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.1.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.1.2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.1.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=55cd2392247f7b2e60096466ea925c0a
diff --git a/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r1 b/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r1
index 65f717c043f8..d322e5a7d9bb 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-5.2.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mercurial-scm.org/release/mercurial-5.2.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bb718aeee46a25bb12665d2103d099e6
diff --git a/metadata/md5-cache/dev-vcs/mercurial-9999 b/metadata/md5-cache/dev-vcs/mercurial-9999
index fbe57557a71a..5b20827d3ed8 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-9999
@@ -11,5 +11,5 @@ RDEPEND=!~dev-python/python-3.5.0 !~dev-python/python-3.5.1 !~dev-python/python-
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f2f1079e1b5e94bbaafbd482fca44be3
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 10372a96f8d2..2035bf28ccea 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1
+++ b/metadata/md5-cache/dev-vcs/mercurial-server-1.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Mercurial authentication and authorization tools
 EAPI=6
 HOMEPAGE=http://www.lshift.net/mercurial-server.html
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-vcs/mercurial python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://dev.lshift.net/paul/mercurial-server/mercurial-server_1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c42baffe8660a11beef6c531d77768a8
diff --git a/metadata/md5-cache/dev-vcs/mercurial-server-9999 b/metadata/md5-cache/dev-vcs/mercurial-server-9999
index 16d68678861d..af8d4aef5e10 100644
--- a/metadata/md5-cache/dev-vcs/mercurial-server-9999
+++ b/metadata/md5-cache/dev-vcs/mercurial-server-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-vcs/mercurial
+DEPEND=dev-vcs/mercurial doc? ( app-text/docbook-xsl-stylesheets dev-libs/libxslt ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] ) dev-vcs/mercurial
 DESCRIPTION=Mercurial authentication and authorization tools
 EAPI=6
 HOMEPAGE=http://www.lshift.net/mercurial-server.html
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc +python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-vcs/mercurial python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f396b55db02dfcac53999ad3c076362
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
index dbdb9523face..31566c2e2384 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ca5b7e40ed0f34dbd0c581e9bcffe2e
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
index c3461308eb5f..1a8d00ebe55f 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ca5b7e40ed0f34dbd0c581e9bcffe2e
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
index 12a49a81c1a2..6aa80cbbb1a1 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ca5b7e40ed0f34dbd0c581e9bcffe2e
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0 b/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
index 033f72ea7907..45ecc9060191 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-1.9.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-1.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ca5b7e40ed0f34dbd0c581e9bcffe2e
diff --git a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3 b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3
index 3773ce471c55..a67b794d1eaf 100644
--- a/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3
+++ b/metadata/md5-cache/dev-vcs/rapidsvn-0.12.1-r3
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Cross-platform GUI front-end for the Subversion revision system
 EAPI=5
 HOMEPAGE=http://rapidsvn.tigris.org/
-IUSE=doc static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc static-libs +python_single_target_python2_7
 KEYWORDS=amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 FDL-1.2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/apr dev-libs/apr-util dev-vcs/subversion x11-libs/wxGTK:3.0[X]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://www.rapidsvn.org/download/release/0.12.1/rapidsvn-0.12.1.tar.gz doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=8e48a8d7264d6eb0083d9dbe81868761
diff --git a/metadata/md5-cache/dev-vcs/repo-1.26 b/metadata/md5-cache/dev-vcs/repo-1.26
index a844b2b2cb5b..fd83150a0338 100644
--- a/metadata/md5-cache/dev-vcs/repo-1.26
+++ b/metadata/md5-cache/dev-vcs/repo-1.26
@@ -3,11 +3,11 @@ DESCRIPTION=Google tool for managing git, particularly multiple repos
 EAPI=7
 HOMEPAGE=https://gerrit.googlesource.com/git-repo
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !app-admin/radmind !dev-util/repo
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-1.26
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2d42a2aeedecab0f96654a21e44b542e
+_md5_=27052be2263ffdfcd21f480017b50fb5
diff --git a/metadata/md5-cache/dev-vcs/repo-2.0 b/metadata/md5-cache/dev-vcs/repo-2.0
new file mode 100644
index 000000000000..2b4ac270584a
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/repo-2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DESCRIPTION=Google tool for managing git, particularly multiple repos
+EAPI=7
+HOMEPAGE=https://gerrit.googlesource.com/git-repo
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !app-admin/radmind !dev-util/repo
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://storage.googleapis.com/git-repo-downloads/repo-2.0
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5aa40def1a4624c89b8bb34d08a13e15
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.19 b/metadata/md5-cache/dev-vcs/stgit-0.19
index e277c7abe961..88577da6e627 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.19
+++ b/metadata/md5-cache/dev-vcs/stgit-0.19
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python2_7? ( >=dev-lang/python-2.7.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v0.19.tar.gz -> stgit-0.19.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=903ceb1dc82143dbaf2639beccec0e99
diff --git a/metadata/md5-cache/dev-vcs/stgit-0.20 b/metadata/md5-cache/dev-vcs/stgit-0.20
index b5909a0343c3..d421eff2aaf8 100644
--- a/metadata/md5-cache/dev-vcs/stgit-0.20
+++ b/metadata/md5-cache/dev-vcs/stgit-0.20
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python2_7? ( >=dev-lang/python-2.7.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v0.20.tar.gz -> stgit-0.20.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5d5e9737583181024127fe997bed74c6
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.12.2 b/metadata/md5-cache/dev-vcs/subversion-1.12.2
index 27db35bdb0b6..a4cdb23ea8db 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.12.2
+++ b/metadata/md5-cache/dev-vcs/subversion-1.12.2
@@ -11,5 +11,5 @@ REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.12.2.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd41d85e50e634be68efa1931cd26bc3
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=22fedb5e976650af138a7499260d171a
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.13.0 b/metadata/md5-cache/dev-vcs/subversion-1.13.0
index b3f3f9d88de6..e806da815107 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.13.0
+++ b/metadata/md5-cache/dev-vcs/subversion-1.13.0
@@ -11,5 +11,5 @@ REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/subversion/subversion-1.13.0.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c97f860e1fafcf94ebe6a655d02cf99c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4f0087a79157cd40919d0f03f1db44f
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.17 b/metadata/md5-cache/dev-vcs/svn2git-1.0.17
new file mode 100644
index 000000000000..d0dd411d51af
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/svn2git-1.0.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
+DESCRIPTION=Tool for one-time conversion from svn to git
+EAPI=7
+HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.17.tar.gz -> svn2git-1.0.17.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c40c53aa1d819be9f05c3151f793af31
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.3.2 b/metadata/md5-cache/dev-vcs/svneverever-1.3.2
index 33b92ec1b679..f147656e1147 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.3.2
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.3.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/svneverever/svneverever-1.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4419e9ce2304f7d312e3d159d901f93
diff --git a/metadata/md5-cache/dev-vcs/svneverever-1.4.2 b/metadata/md5-cache/dev-vcs/svneverever-1.4.2
index e75f6109cd36..b288d5d494e9 100644
--- a/metadata/md5-cache/dev-vcs/svneverever-1.4.2
+++ b/metadata/md5-cache/dev-vcs/svneverever-1.4.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pysvn[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/svneverever/svneverever-1.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4419e9ce2304f7d312e3d159d901f93
diff --git a/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r1 b/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r1
deleted file mode 100644
index 0fbb41a3ae16..000000000000
--- a/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A subversion commit notifier written in Python
-EAPI=5
-HOMEPAGE=http://opensource.perlig.de/svnmailer/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://storage.perlig.de/svnmailer/svnmailer-1.0.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1671f77b009b1d2278d18601cb9f80e
diff --git a/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r2 b/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r2
new file mode 100644
index 000000000000..7c7321b27605
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/svnmailer-1.0.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-vcs/subversion[python,python_targets_python2_7(-)] ) virtual/mta python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A subversion commit notifier written in Python
+EAPI=5
+HOMEPAGE=http://opensource.perlig.de/svnmailer/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_single_target_python2_7? ( dev-vcs/subversion[python,python_targets_python2_7(-)] ) virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://storage.perlig.de/svnmailer/svnmailer-1.0.9.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6783dc8dc0f8b96c8c0a461f6556505
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.9 b/metadata/md5-cache/dev-vcs/tortoisehg-4.9
index a83bc7245a90..f813d6a1d712 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.9
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.9
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.8 <dev-vcs/mercurial-4.10 dev-python/iniparse[pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8999af8d36ceb47e14fb446c9e8b6543
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.9.1 b/metadata/md5-cache/dev-vcs/tortoisehg-4.9.1
index 8cb7ad7272c2..c030e0ad78e6 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-4.9.1
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.9.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-4.8 <dev-vcs/mercurial-4.10 dev-python/iniparse[pyth
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7dc8841d0c0453b6832274d8aa38802d
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-5.0.2 b/metadata/md5-cache/dev-vcs/tortoisehg-5.0.2
index d1f42e9256f1..64d827d14f40 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-5.0.2
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-vcs/mercurial-5.0 <dev-vcs/mercurial-5.1 dev-python/iniparse[pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-5.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0679f66fad7dc08b2a5991547b6754cb
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-9999 b/metadata/md5-cache/dev-vcs/tortoisehg-9999
index 3ec7f16b3e0d..cdcb04199fab 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-9999
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79c2dfc27a82a845bd779a1943e1650b
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 2b40161778b3..c73f2bd2fe7e 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/btanks-0.9.8083 b/metadata/md5-cache/games-action/btanks-0.9.8083
index b9bdb039b37e..b91420f61db1 100644
--- a/metadata/md5-cache/games-action/btanks-0.9.8083
+++ b/metadata/md5-cache/games-action/btanks-0.9.8083
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/lua-5.1:0 media-libs/libsdl[joystick,video] media-libs/libvorbis virtual/opengl dev-libs/expat media-libs/smpeg media-libs/sdl-image[jpeg,png] media-libs/sdl-gfx games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/btanks/btanks-0.9.8083.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0be0face3b53169c6094bc47fb7f3e87
diff --git a/metadata/md5-cache/games-action/d1x-rebirth-0.58.1 b/metadata/md5-cache/games-action/d1x-rebirth-0.58.1
index ed3c2ae3b27d..36d445e80504 100644
--- a/metadata/md5-cache/games-action/d1x-rebirth-0.58.1
+++ b/metadata/md5-cache/games-action/d1x-rebirth-0.58.1
@@ -12,5 +12,5 @@ RDEPEND=dev-games/physfs[hog,zip] media-libs/libsdl[X,sound,joystick,opengl?,vid
 REQUIRED_USE=?? ( cdinstall demo ) ?? ( opl3-musicpack sc55-musicpack ) opl3-musicpack? ( music ) sc55-musicpack? ( music )
 SLOT=0
 SRC_URI=https://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz https://www.dxx-rebirth.com/download/dxx/res/d1xrdata.zip https://www.dxx-rebirth.com/download/dxx/res/dxx-rebirth_icons.zip opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.zip ) sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.zip ) cdinstall? ( https://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip ) l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.zip )
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0309c659cee14354d79ae02e80b43a4a
diff --git a/metadata/md5-cache/games-action/descent3-1.4.0b-r2 b/metadata/md5-cache/games-action/descent3-1.4.0b-r2
index 6b3a818d4cf5..d07d99fb459c 100644
--- a/metadata/md5-cache/games-action/descent3-1.4.0b-r2
+++ b/metadata/md5-cache/games-action/descent3-1.4.0b-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc media-libs/libsdl[abi_x86_32(-)] media-libs/smpeg[abi_x86
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/descent3/descent3-1.4.0a-x86.run mirror://lokigames/descent3/descent3-1.4.0b-x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a3f882e02e0c3d4a31f0345c1c2bd61
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 e8702132fed8..1df97563fb5e 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0c4cd34e5dee10f48bc7b1b4fed014c
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.7.5 b/metadata/md5-cache/games-action/extreme-tuxracer-0.7.5
new file mode 100644
index 000000000000..33d4b005ba28
--- /dev/null
+++ b/metadata/md5-cache/games-action/extreme-tuxracer-0.7.5
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=media-libs/libsfml:0= virtual/glu virtual/opengl
+DESCRIPTION=High speed arctic racing game based on Tux Racer
+EAPI=7
+HOMEPAGE=https://extremetuxracer.sourceforge.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsfml:0= virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=https://download.sourceforge.net/extremetuxracer/etr-0.7.5.tar.xz -> extreme-tuxracer-0.7.5.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b22fe00ba7165198dfda566ca3dabf9e
diff --git a/metadata/md5-cache/games-action/heretic2-1.06c-r1 b/metadata/md5-cache/games-action/heretic2-1.06c-r1
index 9b5702950fb2..a0547b33a753 100644
--- a/metadata/md5-cache/games-action/heretic2-1.06c-r1
+++ b/metadata/md5-cache/games-action/heretic2-1.06c-r1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl amd64? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-lib
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/heretic2/heretic2-1.06b-unified-x86.run mirror://lokigames/heretic2/heretic2-1.06c-unified-x86.run mirror://lokigames/heretic2/heretic2-maps-1.0.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f1f8ec0176672c97b287cfedf4baf03f
diff --git a/metadata/md5-cache/games-action/heretic2-demo-1.06a b/metadata/md5-cache/games-action/heretic2-demo-1.06a
index d30fd454bb89..3b97619bcf59 100644
--- a/metadata/md5-cache/games-action/heretic2-demo-1.06a
+++ b/metadata/md5-cache/games-action/heretic2-demo-1.06a
@@ -9,5 +9,5 @@ RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-mis
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/loki_demos/heretic2-demo.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a81997323ddb2da815f17ddba67c93b1
diff --git a/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r1 b/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r1
index 3693a96d4a38..f89235be23c6 100644
--- a/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r1
+++ b/metadata/md5-cache/games-action/hotline-miami-1.0.9a_p20140221-r1
@@ -9,5 +9,5 @@ RDEPEND=amd64? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] !bundled-libs? ( >=media
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=HotlineMiami_linux_1392944501.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=60bf3173e222c46823551b4c6c2b3524
diff --git a/metadata/md5-cache/games-action/intrusion2-1.024 b/metadata/md5-cache/games-action/intrusion2-1.024
index 5407a20b14ea..8677471492f9 100644
--- a/metadata/md5-cache/games-action/intrusion2-1.024
+++ b/metadata/md5-cache/games-action/intrusion2-1.024
@@ -8,5 +8,5 @@ RDEPEND=amd64? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/atk-2.10.0[a
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=intrusion2-1370288626-bin
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=083b3dd1938c6b2e1fe4a29dd18c2383
diff --git a/metadata/md5-cache/games-action/noiz2sa-0.51a-r1 b/metadata/md5-cache/games-action/noiz2sa-0.51a-r1
index ee149e1b7345..b2c1701910d8 100644
--- a/metadata/md5-cache/games-action/noiz2sa-0.51a-r1
+++ b/metadata/md5-cache/games-action/noiz2sa-0.51a-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/sdl-mixer[vorbis] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/noiz2sa/noiz2sa-0.51a.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=43dab2e490e64cd49e21e2bdad03abeb
diff --git a/metadata/md5-cache/games-action/openclonk-7.0 b/metadata/md5-cache/games-action/openclonk-7.0
index cf0b7db3b878..3d92341129b6 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d4f1f5db5d9b1dc2735dd9c90667f2d
diff --git a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1 b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
index 169b6e816d20..d0741ea54d69 100644
--- a/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
+++ b/metadata/md5-cache/games-action/shadowgrounds-bin-0_p1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/glibc-2.4 >=sys-devel/gcc-4.3.0 !amd64? ( gnome-base/libglade
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=shadowgroundsUpdate1.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d14977c0a1f03388129186d3c494c0e7
diff --git a/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1 b/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
index eec285428ba5..4e4d01955783 100644
--- a/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
+++ b/metadata/md5-cache/games-action/shadowgrounds-survivor-bin-0_p1
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/glibc-2.4 >=sys-devel/gcc-4.3.0 !amd64? ( gnome-base/libglade
 RESTRICT=fetch strip
 SLOT=0
 SRC_URI=survivorUpdate1.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=301ea84d794019a8b67ddf2d7842ac12
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 ba2e0706a495..3d3342568fc6 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e16de49cb6d086a2999502cdaa7c168
diff --git a/metadata/md5-cache/games-action/solar2-1.10 b/metadata/md5-cache/games-action/solar2-1.10
index b01d6b416082..288f7a390477 100644
--- a/metadata/md5-cache/games-action/solar2-1.10
+++ b/metadata/md5-cache/games-action/solar2-1.10
@@ -9,5 +9,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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d99222fdb99181f959cd00238241d9d3
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 751458691c0a..f892031cf5f6 100644
--- a/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
+++ b/metadata/md5-cache/games-action/supermariowar-2.0_beta1-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib:= dev-cpp/yaml-cpp net-libs/enet:1.3= media-libs/sdl-mixer
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7080edb26c5dfaffbd0b0c1d2f20fc72
+_md5_=b002b18eba0bdc5e3e294f1befdab7ae
diff --git a/metadata/md5-cache/games-action/swordandsworcery-1.02 b/metadata/md5-cache/games-action/swordandsworcery-1.02
index 6d2c9c8e7fdb..7c1f2b5ff804 100644
--- a/metadata/md5-cache/games-action/swordandsworcery-1.02
+++ b/metadata/md5-cache/games-action/swordandsworcery-1.02
@@ -9,5 +9,5 @@ RDEPEND=virtual/opengl amd64? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)] >
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=swordandsworcery_1.02.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=248a9ebd601b54ce8ccafcb5d3d9c662
diff --git a/metadata/md5-cache/games-action/towbowl-tactics-0.5 b/metadata/md5-cache/games-action/towbowl-tactics-0.5
index 50c3b66e0768..8be836472fda 100644
--- a/metadata/md5-cache/games-action/towbowl-tactics-0.5
+++ b/metadata/md5-cache/games-action/towbowl-tactics-0.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 media-libs/smpeg media-libs/libsdl[sound,video] media-libs/sdl-net media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.towbowltactics.com/download/tbt.0.5.src.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e2746b0fe435d327ed8055b605dbefb9
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index ef596eb6d695..9e70fbf8165d 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/aquaria-1.1.3-r1 b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
index 0445e57c1174..764f78bdb5a0 100644
--- a/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
+++ b/metadata/md5-cache/games-arcade/aquaria-1.1.3-r1
@@ -9,5 +9,5 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=media-libs/openal-1.15.1[
 RESTRICT=strip fetch bindist
 SLOT=0
 SRC_URI=aquaria-lnx-humble-bundle.mojo.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb5af0371671120fe9957f6929ca1b7d
diff --git a/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r1 b/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r1
index 6d7607ad8bf2..517144b0f14b 100644
--- a/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r1
+++ b/metadata/md5-cache/games-arcade/barbarian-bin-1.01-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/libstdc++-v3:5 amd64? ( sys-libs/libstdc++-v3:5[multilib] ) >=m
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.pcpages.com/tomberrr/downloads/barbarian101_linux.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=18ee40e9cf5abc19def1e7303c33dc9f
diff --git a/metadata/md5-cache/games-arcade/betna-0.9.7 b/metadata/md5-cache/games-arcade/betna-0.9.7
index 7b990be2d739..2b83bfce7b85 100644
--- a/metadata/md5-cache/games-arcade/betna-0.9.7
+++ b/metadata/md5-cache/games-arcade/betna-0.9.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] games-misc/games-envd
 SLOT=0
 SRC_URI=http://koti.mbnet.fi/makegho/c/betna/betna-0.9.7.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3b17e6112f8d71fb0f6dfc91668bd6df
diff --git a/metadata/md5-cache/games-arcade/blockrage-0.2.3 b/metadata/md5-cache/games-arcade/blockrage-0.2.3
index 11fb51de23c9..0daa1bd03f3e 100644
--- a/metadata/md5-cache/games-arcade/blockrage-0.2.3
+++ b/metadata/md5-cache/games-arcade/blockrage-0.2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/blockrage/blockrage-0.2.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26afc8aeb4a500fde8771c2fcdeaba58
diff --git a/metadata/md5-cache/games-arcade/bomns-0.99.2 b/metadata/md5-cache/games-arcade/bomns-0.99.2
index c30276b45f0e..0d0a806f7a2f 100644
--- a/metadata/md5-cache/games-arcade/bomns-0.99.2
+++ b/metadata/md5-cache/games-arcade/bomns-0.99.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/greenridge/bomns-0.99.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72881db6e6f6546ca2afa46dbd24487f
diff --git a/metadata/md5-cache/games-arcade/briquolo-0.5.7 b/metadata/md5-cache/games-arcade/briquolo-0.5.7
index 65a7d9f6a853..6c1dd542ee47 100644
--- a/metadata/md5-cache/games-arcade/briquolo-0.5.7
+++ b/metadata/md5-cache/games-arcade/briquolo-0.5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/libpng:0 nls? ( virtual/libintl ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://briquolo.free.fr/download/briquolo-0.5.7.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fbd21c55a80c6c4fe4e05b7e95b590d7
diff --git a/metadata/md5-cache/games-arcade/bumprace-1.5.3 b/metadata/md5-cache/games-arcade/bumprace-1.5.3
index 7e616d9909c1..35734bb600b5 100644
--- a/metadata/md5-cache/games-arcade/bumprace-1.5.3
+++ b/metadata/md5-cache/games-arcade/bumprace-1.5.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[mod] virtual/jpeg:0 sys-libs/zlib media-libs/sdl-image[gif,jpeg,png] games-misc/games-envd
 SLOT=0
 SRC_URI=http://user.cs.tu-berlin.de/~karlb/bumprace/bumprace-1.5.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=032a36e4c64b7aa08e7ff4be5052da63
diff --git a/metadata/md5-cache/games-arcade/burgerspace-1.9.2 b/metadata/md5-cache/games-arcade/burgerspace-1.9.2
index 58a9d2f3f64b..52f2bf65c5d5 100644
--- a/metadata/md5-cache/games-arcade/burgerspace-1.9.2
+++ b/metadata/md5-cache/games-arcade/burgerspace-1.9.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-games/flatzebra-0.1.6 games-misc/games-envd
 RESTRICT=test
 SLOT=0
 SRC_URI=https://perso.b2b2c.ca/~sarrazip/dev/burgerspace-1.9.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=26a03cbff6dcb7ca7d21d1e0e1ca89f1
diff --git a/metadata/md5-cache/games-arcade/cavezofphear-0.5.1 b/metadata/md5-cache/games-arcade/cavezofphear-0.5.1
index 0eef60626b44..2661f728ce3c 100644
--- a/metadata/md5-cache/games-arcade/cavezofphear-0.5.1
+++ b/metadata/md5-cache/games-arcade/cavezofphear-0.5.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5:0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/phear-0.5.1.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed0c882fb19aa1f45cb193aa60a7d0d9
diff --git a/metadata/md5-cache/games-arcade/cdogs-sdl-0.4-r1 b/metadata/md5-cache/games-arcade/cdogs-sdl-0.4-r1
index 795dbae36dc8..356b2550b3f5 100644
--- a/metadata/md5-cache/games-arcade/cdogs-sdl-0.4-r1
+++ b/metadata/md5-cache/games-arcade/cdogs-sdl-0.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
 SLOT=0
 SRC_URI=http://icculus.org/cdogs-sdl/files/src/cdogs-sdl-0.4.tar.bz2 http://icculus.org/cdogs-sdl/files/data/cdogs-data-2007-07-06.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae9f617e33e30044fd81b6bde2e34280
diff --git a/metadata/md5-cache/games-arcade/commandergenius-2.3.3 b/metadata/md5-cache/games-arcade/commandergenius-2.3.3
index caebe571aa0b..f0cbd9d0d7e8 100644
--- a/metadata/md5-cache/games-arcade/commandergenius-2.3.3
+++ b/metadata/md5-cache/games-arcade/commandergenius-2.3.3
@@ -4,13 +4,13 @@ DEPEND=media-libs/libsdl2[opengl?,video] media-libs/sdl2-image media-libs/sdl2-m
 DESCRIPTION=Open Source Commander Keen clone (needs original game files)
 EAPI=7
 HOMEPAGE=http://clonekeenplus.sourceforge.net
-IUSE=+downloader opengl +python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+downloader opengl +python python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl2[opengl?,video] media-libs/sdl2-image media-libs/sdl2-mixer[vorbis] sys-libs/zlib[minizip] downloader? ( net-misc/curl ) opengl? ( virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v2.3.3/Commander-Genius-v2.3.3.tar.bz2
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cbc1423185632c4cd2d50f78ab199ca
diff --git a/metadata/md5-cache/games-arcade/diameter-0.4.0.3-r2 b/metadata/md5-cache/games-arcade/diameter-0.4.0.3-r2
index 95155f1389d8..a4f0f95e117c 100644
--- a/metadata/md5-cache/games-arcade/diameter-0.4.0.3-r2
+++ b/metadata/md5-cache/games-arcade/diameter-0.4.0.3-r2
@@ -3,12 +3,12 @@ DEPEND=>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng:0= media-libs/libsd
 DESCRIPTION=Arcade game with elements of economy and adventure
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/gamediameter/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[mod] virtual/opengl virtual/glu python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gamediameter/diameter-0.4.0.3.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa46aa4071e38e9259cfc92d07924d9d
diff --git a/metadata/md5-cache/games-arcade/dynamitejack-1.0.23-r1 b/metadata/md5-cache/games-arcade/dynamitejack-1.0.23-r1
index 265b4bfd7741..ed2f4db3bf68 100644
--- a/metadata/md5-cache/games-arcade/dynamitejack-1.0.23-r1
+++ b/metadata/md5-cache/games-arcade/dynamitejack-1.0.23-r1
@@ -8,5 +8,5 @@ RDEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[ab
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=dynamitejack-1.0.23.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4566e607fea5f4a7f9ac9149fc1f25a1
diff --git a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1 b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
index 9259727e98a0..41b90658efb6 100644
--- a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
+++ b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] dev-libs/libltdl:0 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pinball/pinball-0.3.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b737ae2804b21f5d8f2092b66ebb9ca
diff --git a/metadata/md5-cache/games-arcade/epiar-0.5-r1 b/metadata/md5-cache/games-arcade/epiar-0.5-r1
index eb3c30682e82..86fc363b2df8 100644
--- a/metadata/md5-cache/games-arcade/epiar-0.5-r1
+++ b/metadata/md5-cache/games-arcade/epiar-0.5-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/epiar/epiar-0.5.0-src.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=235f9b2c0583e7b4fac3523bfad92336
diff --git a/metadata/md5-cache/games-arcade/funnyboat-1.5_p11 b/metadata/md5-cache/games-arcade/funnyboat-1.5_p11
deleted file mode 100644
index bef8e5b1f43c..000000000000
--- a/metadata/md5-cache/games-arcade/funnyboat-1.5_p11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install postinst postrm preinst prepare setup
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A side scrolling shooter game starring a steamboat on the sea
-EAPI=7
-HOMEPAGE=http://funnyboat.sourceforge.net/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 MIT
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygame-1.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://sourceforge/funnyboat/funnyboat-1.5-src.zip mirror://debian/pool/main/f/funnyboat/funnyboat_1.5-11.debian.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f15714546e35c4d2c827221bb51f0e0f
diff --git a/metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r1 b/metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r1
new file mode 100644
index 000000000000..6ec0e2c0ba4d
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/funnyboat-1.5_p11-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A side scrolling shooter game starring a steamboat on the sea
+EAPI=7
+HOMEPAGE=http://funnyboat.sourceforge.net/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygame-1.6.2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygame-1.6.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygame-1.6.2[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://sourceforge/funnyboat/funnyboat-1.5-src.zip mirror://debian/pool/main/f/funnyboat/funnyboat_1.5-11.debian.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36218b7ec88f4e83de36ea1815e9d7a7
diff --git a/metadata/md5-cache/games-arcade/gunocide2ex-1.0 b/metadata/md5-cache/games-arcade/gunocide2ex-1.0
index 744b6273285e..5d471676e270 100644
--- a/metadata/md5-cache/games-arcade/gunocide2ex-1.0
+++ b/metadata/md5-cache/games-arcade/gunocide2ex-1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/g2ex/g2ex-setup.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d9ae98fc4f3d1bc6b68583ff84931772
diff --git a/metadata/md5-cache/games-arcade/jardinains-2.0-r1 b/metadata/md5-cache/games-arcade/jardinains-2.0-r1
index 846140f2b349..619dfde2c14a 100644
--- a/metadata/md5-cache/games-arcade/jardinains-2.0-r1
+++ b/metadata/md5-cache/games-arcade/jardinains-2.0-r1
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/libstdc++-v3:5 amd64? ( sys-libs/libstdc++-v3:5[multilib] ) >=v
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/JN2_1_FREE_LIN.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6d00f5de8c2c3f9a2a48a43741db8b5f
diff --git a/metadata/md5-cache/games-arcade/pachi-1.0 b/metadata/md5-cache/games-arcade/pachi-1.0
index b79c432a5c20..bd08d7af9912 100644
--- a/metadata/md5-cache/games-arcade/pachi-1.0
+++ b/metadata/md5-cache/games-arcade/pachi-1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/pachi-1.0.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0f3a82c624b14ca33f6c1008a882abab
diff --git a/metadata/md5-cache/games-arcade/rockdodger-0.6.0a-r1 b/metadata/md5-cache/games-arcade/rockdodger-0.6.0a-r1
index f3340f5e2108..71926f0880f8 100644
--- a/metadata/md5-cache/games-arcade/rockdodger-0.6.0a-r1
+++ b/metadata/md5-cache/games-arcade/rockdodger-0.6.0a-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/spacerocks/rockdodger-0.6.0a.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fe8d45cd52949bc7fa1fb02efd55f366
diff --git a/metadata/md5-cache/games-arcade/tecnoballz-0.92 b/metadata/md5-cache/games-arcade/tecnoballz-0.92
index d6236f7f28b9..e7f2de342ffd 100644
--- a/metadata/md5-cache/games-arcade/tecnoballz-0.92
+++ b/metadata/md5-cache/games-arcade/tecnoballz-0.92
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0 games-misc/games-envd
 SLOT=0
 SRC_URI=http://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-0.92.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fac7e5efdfbe7205f6827f4077847f41
diff --git a/metadata/md5-cache/games-arcade/tomatoes-1.55-r2 b/metadata/md5-cache/games-arcade/tomatoes-1.55-r2
index 341e9c1f17e3..f16fa0dacede 100644
--- a/metadata/md5-cache/games-arcade/tomatoes-1.55-r2
+++ b/metadata/md5-cache/games-arcade/tomatoes-1.55-r2
@@ -8,5 +8,5 @@ LICENSE=ZLIB
 RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/tomatoes/tomatoes-linux-src-1.55.tar.bz2 mirror://sourceforge/tomatoes/tomatoes-linux-1.5.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=170747b34b3a011637e3faf890c35b6e
diff --git a/metadata/md5-cache/games-arcade/trailblazer-0.9 b/metadata/md5-cache/games-arcade/trailblazer-0.9
index 2a490792f081..00621f3f85f0 100644
--- a/metadata/md5-cache/games-arcade/trailblazer-0.9
+++ b/metadata/md5-cache/games-arcade/trailblazer-0.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2.7[video] games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.autismuk.freeserve.co.uk/trailblazer-0.9.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9498de2ceaf1186c93daffd1d731ea3
diff --git a/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0 b/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0
index 1965d5468759..119cb20aee2d 100644
--- a/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0
+++ b/metadata/md5-cache/games-arcade/xgalaga-2.1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXext x11-libs/libXt games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/xgalaga/xgalaga-2.1.1.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e8a887a439e1a5d84bb1e083574aeeab
diff --git a/metadata/md5-cache/games-arcade/xjump-2.7.5 b/metadata/md5-cache/games-arcade/xjump-2.7.5
index 51ec94897a23..51c017c67358 100644
--- a/metadata/md5-cache/games-arcade/xjump-2.7.5
+++ b/metadata/md5-cache/games-arcade/xjump-2.7.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXpm x11-libs/libXt games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xjump/xjump_2.7.5.orig.tar.gz mirror://debian/pool/main/x/xjump/xjump_2.7.5-6.1.debian.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=db3a05facddd0dcd308463ac965eb51c
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index e6a223aae5c6..af772b81fe75 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/gnome-hearts-0.3.1-r2 b/metadata/md5-cache/games-board/gnome-hearts-0.3.1-r2
index 981eb9defd10..dbac2cd80a80 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
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A clone of classic hearts card game
 EAPI=6
 HOMEPAGE=http://www.gnome-hearts.org
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) x11-libs/gtk+:2 >=gnome-base/libglade-2
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://www.jejik.com/files/gnome-hearts/gnome-hearts-0.3.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f4b794fe15ad8dd693d605ffbab1e651
diff --git a/metadata/md5-cache/games-board/gnubg-1.06.002-r1 b/metadata/md5-cache/games-board/gnubg-1.06.002-r1
index c9df356986c5..e4acb49d1d9c 100644
--- a/metadata/md5-cache/games-board/gnubg-1.06.002-r1
+++ b/metadata/md5-cache/games-board/gnubg-1.06.002-r1
@@ -4,12 +4,12 @@ DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmp:0= dev-libs/libxml2 media-fo
 DESCRIPTION=GNU BackGammon
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gnubg/
-IUSE=cpu_flags_x86_avx gtk python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=cpu_flags_x86_avx gtk python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmp:0= dev-libs/libxml2 media-fonts/dejavu media-libs/freetype:2 media-libs/libcanberra media-libs/libpng:0= sys-libs/readline:0= x11-libs/cairo x11-libs/pango gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/libintl
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=ftp://ftp.gnu.org/gnu/gnubg/gnubg-release-1.06.002-sources.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=086a77c3bc674cdf525e8e9b9b67c7ef
diff --git a/metadata/md5-cache/games-board/gnugo-3.9.1-r1 b/metadata/md5-cache/games-board/gnugo-3.9.1-r1
index aebc2d2b29e5..57b2c40aecb8 100644
--- a/metadata/md5-cache/games-board/gnugo-3.9.1-r1
+++ b/metadata/md5-cache/games-board/gnugo-3.9.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0= games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/gnugo-3.9.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a3536715666102f081b551cdf59fccfb
diff --git a/metadata/md5-cache/games-board/pouetchess-0.2.0-r2 b/metadata/md5-cache/games-board/pouetchess-0.2.0-r2
index 5a5c907ae484..b26248ecc4ca 100644
--- a/metadata/md5-cache/games-board/pouetchess-0.2.0-r2
+++ b/metadata/md5-cache/games-board/pouetchess-0.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl:0[opengl,video] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/pouetchess/pouetchess_src_0.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c28ed0e218f1b1094f20bb9462fbd46b
diff --git a/metadata/md5-cache/games-board/pychess-0.99.4-r1 b/metadata/md5-cache/games-board/pychess-0.99.4-r1
index 31c0b3e82cc3..e7aca67c1443 100644
--- a/metadata/md5-cache/games-board/pychess-0.99.4-r1
+++ b/metadata/md5-cache/games-board/pychess-0.99.4-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pexpect[python_targets_python3_6(-)?,-python_single_target_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pychess/pychess/releases/download/0.99.4/pychess-0.99.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eee23622213447c4fe66a74d8071b6ad
diff --git a/metadata/md5-cache/games-board/pysolfc-2.6.4 b/metadata/md5-cache/games-board/pysolfc-2.6.4
deleted file mode 100644
index 83b4870aa275..000000000000
--- a/metadata/md5-cache/games-board/pysolfc-2.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=An exciting collection of more than 1000 solitaire card games
-EAPI=7
-HOMEPAGE=https://pysolfc.sourceforge.net/
-IUSE=extra-cardsets minimal +sound 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=dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] !minimal? ( dev-python/pillow[tk,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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/shlomif/PySolFC/archive/pysolfc-2.6.4.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2 ) !extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.1.tar.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f94482312cd7db149fd2ccc39f2d631e
diff --git a/metadata/md5-cache/games-board/pysolfc-2.6.4-r1 b/metadata/md5-cache/games-board/pysolfc-2.6.4-r1
new file mode 100644
index 000000000000..ff9b43e111fe
--- /dev/null
+++ b/metadata/md5-cache/games-board/pysolfc-2.6.4-r1
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=An exciting collection of more than 1000 solitaire card games
+EAPI=7
+HOMEPAGE=https://pysolfc.sourceforge.net/
+IUSE=extra-cardsets minimal +sound python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-python/random2[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] !minimal? ( dev-python/pillow[tk,python_targets_python3_6(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/random2[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] !minimal? ( dev-python/pillow[tk,python_targets_python3_7(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[tk] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[tk] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/shlomif/PySolFC/archive/pysolfc-2.6.4.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.0/PySolFC-Cardsets-2.0.tar.bz2 ) !extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-2.0.1.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=53a1cc8339013806a569322ea494a3a2
diff --git a/metadata/md5-cache/games-board/xscrabble-2.10-r2 b/metadata/md5-cache/games-board/xscrabble-2.10-r2
index 9f7c99771c05..96557db8d053 100644
--- a/metadata/md5-cache/games-board/xscrabble-2.10-r2
+++ b/metadata/md5-cache/games-board/xscrabble-2.10-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/libXaw games-misc/games-envd
 SLOT=0
 SRC_URI=ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble-2.10.tgz l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz ) ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=957e06468ad7daec37dbe50e160f0f5c
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 7374d13e165b..8ad94349c5e3 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/fceux-2.2.3 b/metadata/md5-cache/games-emulation/fceux-2.2.3
index 9e1beb4b7bf8..df2fc59a808d 100644
--- a/metadata/md5-cache/games-emulation/fceux-2.2.3
+++ b/metadata/md5-cache/games-emulation/fceux-2.2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=lua? ( dev-lang/lua:0 ) media-libs/libsdl[opengl?,video] logo? ( media-libs/gd[png] ) opengl? ( virtual/opengl ) gtk? ( x11-libs/gtk+:3 ) sys-libs/zlib[minizip]
 SLOT=0
 SRC_URI=mirror://sourceforge/fceultra/fceux-2.2.3.src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	741000d14c0b59263aac3f3cf6e39909
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023
 _md5_=25c7f2802fd46a71d1acdca0754a8f7f
diff --git a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r2 b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r2
index 51e66b2b9fb6..57fad3540a34 100644
--- a/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r2
+++ b/metadata/md5-cache/games-emulation/gambatte-0.5.0_p20131102-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,sound,joystick,video] sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/gambatte-0.5.0_p20131102.tar.xz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	741000d14c0b59263aac3f3cf6e39909
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023
 _md5_=12675c7e7c10deaeff9a28623a866254
diff --git a/metadata/md5-cache/games-emulation/hatari-2.2.1 b/metadata/md5-cache/games-emulation/hatari-2.2.1
deleted file mode 100644
index ba9c1b1f2b28..000000000000
--- a/metadata/md5-cache/games-emulation/hatari-2.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) capsimage? ( >=dev-libs/spsdeclib-5.1-r1 ) microphone? ( media-libs/portaudio ) png? ( media-libs/libpng:0= ) portmidi? ( media-libs/portmidi ) readline? ( sys-libs/readline:0= ) sdl2? ( media-libs/libsdl2[sound,video,X] ) !sdl2? ( media-libs/libsdl[sound,video,X] ) udev? ( virtual/udev ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Atari ST emulator
-EAPI=7
-HOMEPAGE=https://hatari.tuxfamily.org/
-IUSE=capsimage microphone png portmidi readline +sdl2 udev zlib python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) capsimage? ( >=dev-libs/spsdeclib-5.1-r1 ) microphone? ( media-libs/portaudio ) png? ( media-libs/libpng:0= ) portmidi? ( media-libs/portmidi ) readline? ( sys-libs/readline:0= ) sdl2? ( media-libs/libsdl2[sound,video,X] ) !sdl2? ( media-libs/libsdl[sound,video,X] ) udev? ( virtual/udev ) zlib? ( sys-libs/zlib ) dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=games-emulation/emutos-0.9.9.1
-REQUIRED_USE=^^ ( 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=https://download.tuxfamily.org/hatari/2.2.1/hatari-2.2.1.tar.bz2
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ceb5ac05b82becb5cb6bb9cc43c18ef8
diff --git a/metadata/md5-cache/games-emulation/hatari-2.2.1-r1 b/metadata/md5-cache/games-emulation/hatari-2.2.1-r1
new file mode 100644
index 000000000000..c7394f14ac81
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/hatari-2.2.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) capsimage? ( >=dev-libs/spsdeclib-5.1-r1 ) microphone? ( media-libs/portaudio ) png? ( media-libs/libpng:0= ) portmidi? ( media-libs/portmidi ) readline? ( sys-libs/readline:0= ) sdl2? ( media-libs/libsdl2[sound,video,X] ) !sdl2? ( media-libs/libsdl[sound,video,X] ) udev? ( virtual/udev ) zlib? ( sys-libs/zlib ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Atari ST emulator
+EAPI=7
+HOMEPAGE=https://hatari.tuxfamily.org/
+IUSE=capsimage microphone png portmidi readline +sdl2 udev zlib python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) capsimage? ( >=dev-libs/spsdeclib-5.1-r1 ) microphone? ( media-libs/portaudio ) png? ( media-libs/libpng:0= ) portmidi? ( media-libs/portmidi ) readline? ( sys-libs/readline:0= ) sdl2? ( media-libs/libsdl2[sound,video,X] ) !sdl2? ( media-libs/libsdl[sound,video,X] ) udev? ( virtual/udev ) zlib? ( sys-libs/zlib ) python_single_target_python2_7? ( dev-python/pygobject:3[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) >=games-emulation/emutos-0.9.9.1
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://download.tuxfamily.org/hatari/2.2.1/hatari-2.2.1.tar.bz2
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2819102c97519068f8494e56aa1d00a0
diff --git a/metadata/md5-cache/games-emulation/m64py-0.2.4 b/metadata/md5-cache/games-emulation/m64py-0.2.4
index 60ff31dec83d..fad27485f2d8 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_6(-)?,python_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/m64py/m64py-0.2.4/m64py-0.2.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e5e875f6746d96129a721f7eb4e38135
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r1 b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r1
index 158534540390..a416ab13dad6 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r1
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r1
@@ -9,4 +9,4 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.4.0.tar.gz -> pcsx2-1.4.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5c5534a0eb86f81e4218c4a179e97d3
+_md5_=9864f2088c21cf84debf42da596299d3
diff --git a/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2 b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2
index 14cef19399d3..e965c229bbc3 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.4.0-r2
@@ -10,4 +10,4 @@ RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/
 SLOT=0
 SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.4.0.tar.gz -> pcsx2-1.4.0.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f9b85c0862e0702424ec68e3a762bcc
+_md5_=f335d1297d0d7b54a59fffe640583e6c
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index 55d8bac65bbe..df3af35d414e 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] dev-libs/libxml2:2[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(-)] net-libs/libpcap[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] virtual/libudev[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:3[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.4-r301:3.0-gtk3[abi_x86_32(-),X]
 SLOT=0
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=115cbcc8bd3497cc1946ad3046bbff07
+_md5_=c51efb7d728818f2f1179a8314a0b3ee
diff --git a/metadata/md5-cache/games-emulation/vbam-2.1.0 b/metadata/md5-cache/games-emulation/vbam-2.1.0
deleted file mode 100644
index 93b0ccceee2f..000000000000
--- a/metadata/md5-cache/games-emulation/vbam-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=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] ) app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
-EAPI=6
-HOMEPAGE=https://github.com/visualboyadvance-m/visualboyadvance-m
-IUSE=ffmpeg link lirc nls openal +sdl wxwidgets
-KEYWORDS=~amd64 ~x86
-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
-SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.1.0.tar.gz -> vbam-2.1.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0b20bfab2bdbbf2a501770b31899084
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 08257bb7d0a9..1f03f34ad649 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/gemrb-0.8.3-r1 b/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
index 0b51c86e89fc..a34a77100866 100644
--- a/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
+++ b/metadata/md5-cache/games-engines/gemrb-0.8.3-r1
@@ -3,12 +3,12 @@ DEPEND=media-libs/freetype media-libs/libpng:0= >=media-libs/libsdl-1.2[video] m
 DESCRIPTION=Reimplementation of the Infinity engine
 EAPI=6
 HOMEPAGE=http://gemrb.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freetype media-libs/libpng:0= >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/gemrb/gemrb-0.8.3.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec08f2856962681f8bfb6088ff2ae3b7
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 e58e77e1eb92..3b85fadab85a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e302fd2c4b82ccccc3d82951a6dcff8f
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index f3788bee02e9..97ff8d9dc8a4 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/doomsday-2.1.1 b/metadata/md5-cache/games-fps/doomsday-2.1.1
index 3fee894b70c6..448f46ab52ae 100644
--- a/metadata/md5-cache/games-fps/doomsday-2.1.1
+++ b/metadata/md5-cache/games-fps/doomsday-2.1.1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[-gles2] dev-qt/qtnetwork:5= dev-qt/qtopengl:5= dev-qt/qtwidgets:5= dev-qt/qtx11extras:5= media-libs/assimp net-misc/curl sys-libs/zlib fmod? ( media-libs/fmod:1 ) fluidsynth? ( media-sound/fluidsynth:= ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0= )
 DESCRIPTION=A modern gaming engine for Doom, Heretic, and Hexen
@@ -12,4 +12,4 @@ RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[-gles2] dev-qt/qtnetwork:5= dev-qt/qtop
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/2.1.1/doomsday-2.1.1.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=226619d54c397f5a6aae6c72e101aca4
+_md5_=d1e7f67e2dde5430cc65d7b6e4eb4828
diff --git a/metadata/md5-cache/games-fps/duke3d-demodata-1.3 b/metadata/md5-cache/games-fps/duke3d-demodata-1.3
index bedc8dd534cf..a40f41445914 100644
--- a/metadata/md5-cache/games-fps/duke3d-demodata-1.3
+++ b/metadata/md5-cache/games-fps/duke3d-demodata-1.3
@@ -8,5 +8,5 @@ LICENSE=DUKE3D
 RDEPEND=games-fps/eduke32 games-misc/games-envd
 SLOT=0
 SRC_URI=ftp://ftp.3drealms.com/share/3dduke13.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cdfd792e188cb9edc6b6b553ce5be127
diff --git a/metadata/md5-cache/games-fps/etqw-bin-1.5-r2 b/metadata/md5-cache/games-fps/etqw-bin-1.5-r2
index 7cb488f3485b..3c3003c40168 100644
--- a/metadata/md5-cache/games-fps/etqw-bin-1.5-r2
+++ b/metadata/md5-cache/games-fps/etqw-bin-1.5-r2
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) >=sys-libs/zlib-1.2.8
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://ftp.jeuxlinux.fr/files/ETQW-client-1.5-full.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e6f3b8768e5cda24e38525ac12c4186
diff --git a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2 b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
index 736006a39c75..435f3e1c247b 100644
--- a/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
+++ b/metadata/md5-cache/games-fps/etqw-demo-2.0_p1-r2
@@ -9,5 +9,5 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] virtual/jpeg-compat:62[abi_x86_3
 RESTRICT=bindist strip mirror
 SLOT=0
 SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fcf0e051b9e00b4ca8053eb7f8a2ccfa
diff --git a/metadata/md5-cache/games-fps/ezquake-bin-2.2 b/metadata/md5-cache/games-fps/ezquake-bin-2.2
index a43cdb633f10..25d03de0d8ca 100644
--- a/metadata/md5-cache/games-fps/ezquake-bin-2.2
+++ b/metadata/md5-cache/games-fps/ezquake-bin-2.2
@@ -10,5 +10,5 @@ RDEPEND=cdinstall? ( games-fps/quake1-data ) virtual/opengl x11-libs/libXxf86dga
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=amd64? ( mirror://sourceforge/ezquake/ezquake_linux-x86_64.1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux64_2.2.tar.gz ) x86? ( mirror://sourceforge/ezquake/ezquake_linux-x86_1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux32_2.2.tar.gz )
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d80fd4804e5779995cc4eb782e61adda
diff --git a/metadata/md5-cache/games-fps/glxquake-bin-0-r2 b/metadata/md5-cache/games-fps/glxquake-bin-0-r2
index f059b33f9c6d..c496b1e0e048 100644
--- a/metadata/md5-cache/games-fps/glxquake-bin-0-r2
+++ b/metadata/md5-cache/games-fps/glxquake-bin-0-r2
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x8
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=42875a9f9b5043a8ef7456eded0670f6
diff --git a/metadata/md5-cache/games-fps/industri-1.01 b/metadata/md5-cache/games-fps/industri-1.01
index 620936d855a5..070426ea3cca 100644
--- a/metadata/md5-cache/games-fps/industri-1.01
+++ b/metadata/md5-cache/games-fps/industri-1.01
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/opengl x11-libs/libXxf86dga x11-libs/libXext x11-libs/libX11 x11-libs/libXxf86vm media-libs/libpng:0 cdinstall? ( games-fps/quake1-data ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/industri/industri_BIN-1.01-src.tar.gz mirror://sourceforge/industri/industri-1.00.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80d16facd1918497fae106085eaea34b
diff --git a/metadata/md5-cache/games-fps/quake1-data-2.40 b/metadata/md5-cache/games-fps/quake1-data-2.40
index 45be9e76663c..e843f5494cc8 100644
--- a/metadata/md5-cache/games-fps/quake1-data-2.40
+++ b/metadata/md5-cache/games-fps/quake1-data-2.40
@@ -8,5 +8,5 @@ LICENSE=all-rights-reserved
 PROPERTIES=interactive
 RDEPEND=!games-fps/quake1-demodata[symlink] games-misc/games-envd
 SLOT=0
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9b9674c382b70b781aaf3ce7a8978d4
diff --git a/metadata/md5-cache/games-fps/quake1-demodata-1.06 b/metadata/md5-cache/games-fps/quake1-demodata-1.06
index 0651aee954ee..f1c41e647a7c 100644
--- a/metadata/md5-cache/games-fps/quake1-demodata-1.06
+++ b/metadata/md5-cache/games-fps/quake1-demodata-1.06
@@ -9,5 +9,5 @@ LICENSE=quake1-demodata
 RDEPEND=symlink? ( !games-fps/quake1-data ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake/quake106.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=36762de91cacfef65eec39a2f011d5f8
diff --git a/metadata/md5-cache/games-fps/quake1-killer-2.2z b/metadata/md5-cache/games-fps/quake1-killer-2.2z
index 66dd340606e2..1f55bb0a5b41 100644
--- a/metadata/md5-cache/games-fps/quake1-killer-2.2z
+++ b/metadata/md5-cache/games-fps/quake1-killer-2.2z
@@ -8,5 +8,5 @@ LICENSE=quake1-killer
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.gamers.org/pub/idgames2/quakec/compilations/kqp220z.zip mirror://gentoo/kqp220z.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d1a9d275ca56b48f0181efb1794355d2
diff --git a/metadata/md5-cache/games-fps/quake1-rally-1.2 b/metadata/md5-cache/games-fps/quake1-rally-1.2
index 88f1d8489ae7..054c8f7b00ff 100644
--- a/metadata/md5-cache/games-fps/quake1-rally-1.2
+++ b/metadata/md5-cache/games-fps/quake1-rally-1.2
@@ -9,5 +9,5 @@ RDEPEND=games-misc/games-envd
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://ehall.freeshell.org/quake/qr12.zip http://ehall.freeshell.org/quake/qrlo1.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d6dae53a2bacb17e41261ea10382a7a
diff --git a/metadata/md5-cache/games-fps/quake1-teamfortress-2.9 b/metadata/md5-cache/games-fps/quake1-teamfortress-2.9
index 8ce14a148538..af08ce70ba02 100644
--- a/metadata/md5-cache/games-fps/quake1-teamfortress-2.9
+++ b/metadata/md5-cache/games-fps/quake1-teamfortress-2.9
@@ -8,5 +8,5 @@ LICENSE=quake1-teamfortress
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/tf28.zip mirror://gentoo/tf29qw.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4a54fc04c928eb271148fdb7318dfc79
diff --git a/metadata/md5-cache/games-fps/quake1-textures-20050820 b/metadata/md5-cache/games-fps/quake1-textures-20050820
index 0a7179e60ece..635d77a967c3 100644
--- a/metadata/md5-cache/games-fps/quake1-textures-20050820
+++ b/metadata/md5-cache/games-fps/quake1-textures-20050820
@@ -8,5 +8,5 @@ LICENSE=quake1-textures
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=http://facelift.quakedev.com/download/SKINSbmodels-48files-4-23-05.zip http://facelift.quakedev.com/download/textures-486files-8-20-05.rar
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c8cb85ae0e5fc20acd93b9a5094e242d
diff --git a/metadata/md5-cache/games-fps/quake2-data-3.20 b/metadata/md5-cache/games-fps/quake2-data-3.20
index cb4855afb8ea..1c5997ac9050 100644
--- a/metadata/md5-cache/games-fps/quake2-data-3.20
+++ b/metadata/md5-cache/games-fps/quake2-data-3.20
@@ -10,5 +10,5 @@ PROPERTIES=interactive
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake2/q2-3.20-x86-full-ctf.exe
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbcfee390589321b51987698cde9dfae
diff --git a/metadata/md5-cache/games-fps/quake2-demodata-3.14 b/metadata/md5-cache/games-fps/quake2-demodata-3.14
index 548216f31421..cfa9dfcd9480 100644
--- a/metadata/md5-cache/games-fps/quake2-demodata-3.14
+++ b/metadata/md5-cache/games-fps/quake2-demodata-3.14
@@ -9,5 +9,5 @@ LICENSE=quake2-demodata
 RDEPEND=games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/quake2/q2-314-demo-x86.exe
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bdd64c6ec20dbd537a8a6d13208a6059
diff --git a/metadata/md5-cache/games-fps/quake2-icculus-0.16.1-r1 b/metadata/md5-cache/games-fps/quake2-icculus-0.16.1-r1
index 55eac4945798..7114e916e3e7 100644
--- a/metadata/md5-cache/games-fps/quake2-icculus-0.16.1-r1
+++ b/metadata/md5-cache/games-fps/quake2-icculus-0.16.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[sound,joystick?,video] ) X? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://icculus.org/quake2/files/quake2-r0.16.1.tar.gz qmax? ( http://icculus.org/quake2/files/maxpak.pak ) rogue? ( mirror://idsoftware/quake2/source/roguesrc320.shar.Z ) xatrix? ( mirror://idsoftware/quake2/source/xatrixsrc320.shar.Z )
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c8df97938432f3062a6fa84960ba344f
diff --git a/metadata/md5-cache/games-fps/quake2-textures-0_beta8 b/metadata/md5-cache/games-fps/quake2-textures-0_beta8
index 8338a339cf12..989ac7ca4813 100644
--- a/metadata/md5-cache/games-fps/quake2-textures-0_beta8
+++ b/metadata/md5-cache/games-fps/quake2-textures-0_beta8
@@ -9,5 +9,5 @@ RDEPEND=games-misc/games-envd
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://jdolan.tastyspleen.net/pak8.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6ff988b0f7fef663efa81cfe414b0dba
diff --git a/metadata/md5-cache/games-fps/qudos-0.40.1 b/metadata/md5-cache/games-fps/qudos-0.40.1
index 788d90b12239..0deb43d236d8 100644
--- a/metadata/md5-cache/games-fps/qudos-0.40.1
+++ b/metadata/md5-cache/games-fps/qudos-0.40.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata[symlink] ) textures? ( games-fps/quake2-textures ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://gentoo/QuDos-0.40.1-src.tar.bz2 https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> QuDos-0.40.1.pk3
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ea1e992cfd3eb9fe4d4cc114e8cd082
diff --git a/metadata/md5-cache/games-fps/red-blue-quake2-0.1 b/metadata/md5-cache/games-fps/red-blue-quake2-0.1
index 39ba35bb72e6..c6aaed2aacab 100644
--- a/metadata/md5-cache/games-fps/red-blue-quake2-0.1
+++ b/metadata/md5-cache/games-fps/red-blue-quake2-0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://idsoftware/source/q2source-3.21.zip https://www.jfedor.org/red-blue-quake2/red-blue-quake2-0.1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3092c647792987afc2b1734012a4776d
diff --git a/metadata/md5-cache/games-fps/sauerbraten-2013.02.03 b/metadata/md5-cache/games-fps/sauerbraten-2013.02.03
index 2ae2e90fa483..cf5dc9b936e5 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=454db34f44c4fc929701ac79abaa4690
diff --git a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1 b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
index 649583b69185..4811798bcaf6 100644
--- a/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
+++ b/metadata/md5-cache/games-fps/soldieroffortune-1.06a-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x8
 RESTRICT=strip mirror bindist
 SLOT=0
 SRC_URI=mirror://lokigames/sof/sof-1.06a-cdrom-x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56b641b177d29569c14d33e869d3081d
diff --git a/metadata/md5-cache/games-fps/tribes2-25034 b/metadata/md5-cache/games-fps/tribes2-25034
index a64ef394e64f..59b97657924a 100644
--- a/metadata/md5-cache/games-fps/tribes2-25034
+++ b/metadata/md5-cache/games-fps/tribes2-25034
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/glibc games-util/loki_patch virtual/opengl games-misc/games-env
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/tribes2/release/tribes2-25034-cdrom-x86.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b4355aac59e82c87bb1895b4c16a4ede
diff --git a/metadata/md5-cache/games-fps/ut2003-2225-r4 b/metadata/md5-cache/games-fps/ut2003-2225-r4
index 1a0260056a5d..2e4a9fcea30e 100644
--- a/metadata/md5-cache/games-fps/ut2003-2225-r4
+++ b/metadata/md5-cache/games-fps/ut2003-2225-r4
@@ -9,5 +9,5 @@ RDEPEND=games-fps/ut2003-data dedicated? ( games-server/ut2003-ded ) !dedicated?
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7066446e586e7fd86b37a20a02afeef7
diff --git a/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1 b/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
index 403f1543ddc8..72182f76a752 100644
--- a/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
+++ b/metadata/md5-cache/games-fps/ut2003-bonuspack-cm-1
@@ -9,5 +9,5 @@ RDEPEND=games-fps/ut2003 games-misc/games-envd
 RESTRICT=bindist mirror strip
 SLOT=1
 SRC_URI=https://downloads.unrealadmin.org/UT2003/BonusPack/cbp2003.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d6cb24473e3f257048f9e906b2ef7202
diff --git a/metadata/md5-cache/games-fps/ut2003-bonuspack-de-1 b/metadata/md5-cache/games-fps/ut2003-bonuspack-de-1
index e573ee3578ef..472c59bd2d89 100644
--- a/metadata/md5-cache/games-fps/ut2003-bonuspack-de-1
+++ b/metadata/md5-cache/games-fps/ut2003-bonuspack-de-1
@@ -9,5 +9,5 @@ RDEPEND=games-fps/ut2003 games-misc/games-envd
 RESTRICT=bindist mirror strip
 SLOT=1
 SRC_URI=http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/debonus.ut2mod.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e1b0355f3791a6e67b90664c629dc95
diff --git a/metadata/md5-cache/games-fps/ut2003-bonuspack-epic-1 b/metadata/md5-cache/games-fps/ut2003-bonuspack-epic-1
index 33d3cffd0dc3..e7acd8b62b83 100644
--- a/metadata/md5-cache/games-fps/ut2003-bonuspack-epic-1
+++ b/metadata/md5-cache/games-fps/ut2003-bonuspack-epic-1
@@ -9,5 +9,5 @@ RDEPEND=games-fps/ut2003 games-misc/games-envd
 RESTRICT=strip
 SLOT=1
 SRC_URI=http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/UT2003-epicbonuspackone.exe
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=57b8ff35c90a286f0cb316d8fd6656f1
diff --git a/metadata/md5-cache/games-fps/ut2003-data-2107 b/metadata/md5-cache/games-fps/ut2003-data-2107
index 4cbdcaba6198..05b8f7ee4e84 100644
--- a/metadata/md5-cache/games-fps/ut2003-data-2107
+++ b/metadata/md5-cache/games-fps/ut2003-data-2107
@@ -10,5 +10,5 @@ RDEPEND=games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=80ffcdc13e81c10ba0a1a88a167fcb7f
diff --git a/metadata/md5-cache/games-fps/ut2003-demo-2206-r3 b/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
index cd4cd0793837..f507dc543ac3 100644
--- a/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
+++ b/metadata/md5-cache/games-fps/ut2003-demo-2206-r3
@@ -9,5 +9,5 @@ RDEPEND=sys-devel/bc virtual/libstdc++:3.3 virtual/opengl[abi_x86_32(-)] x11-lib
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-2206.sh.bin http://download.factoryunreal.com/mirror/UT2003CrashFix.zip https://dev.gentoo.org/~wolf31o2/sources/ut2003-demo/ut2003-demo-misc.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=08e87ed02db549ad455172c0b896f12d
diff --git a/metadata/md5-cache/games-fps/ut2004-demo-3334 b/metadata/md5-cache/games-fps/ut2004-demo-3334
index b43a650e0770..2a7b9203a3cd 100644
--- a/metadata/md5-cache/games-fps/ut2004-demo-3334
+++ b/metadata/md5-cache/games-fps/ut2004-demo-3334
@@ -8,5 +8,5 @@ RDEPEND=virtual/libstdc++:3.3 x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[ab
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://gentoo/ut2004-lnx-demo3334.run
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c15c31e344aaf6bafb95565e084377bf
diff --git a/metadata/md5-cache/games-kids/Manifest.gz b/metadata/md5-cache/games-kids/Manifest.gz
index ffbc87328f50..8a5bb51b58e3 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/childsplay-0.90.2-r1 b/metadata/md5-cache/games-kids/childsplay-0.90.2-r1
deleted file mode 100644
index 2ff725dbc418..000000000000
--- a/metadata/md5-cache/games-kids/childsplay-0.90.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libogg
-DESCRIPTION=A suite of educational games for young children
-EAPI=5
-HOMEPAGE=http://childsplay.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libogg games-misc/games-envd
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/childsplay/childsplay-0.90.2.tgz mirror://sourceforge/childsplay/childsplay_plugins-0.90.tgz mirror://sourceforge/childsplay/childsplay_plugins_lfc-0.90.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fca0498da10bbfefe527dc59f71ac51b
diff --git a/metadata/md5-cache/games-kids/childsplay-0.90.2-r2 b/metadata/md5-cache/games-kids/childsplay-0.90.2-r2
new file mode 100644
index 000000000000..cf60ec20c88c
--- /dev/null
+++ b/metadata/md5-cache/games-kids/childsplay-0.90.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=python_single_target_python2_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/pygame[python_targets_python2_7(-)] ) media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libogg
+DESCRIPTION=A suite of educational games for young children
+EAPI=5
+HOMEPAGE=http://childsplay.sourceforge.net/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_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/pygame[python_targets_python2_7(-)] ) media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libogg games-misc/games-envd
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/childsplay/childsplay-0.90.2.tgz mirror://sourceforge/childsplay/childsplay_plugins-0.90.tgz mirror://sourceforge/childsplay/childsplay_plugins_lfc-0.90.tgz
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=579f1b7bc38d0f321e2892c0c688ebdf
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 68ad22443349..7df3bd7a2197 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/bsd-games-2.17-r5 b/metadata/md5-cache/games-misc/bsd-games-2.17-r5
index 55fe0c6e9cc7..68a00455cc14 100644
--- a/metadata/md5-cache/games-misc/bsd-games-2.17-r5
+++ b/metadata/md5-cache/games-misc/bsd-games-2.17-r5
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=!games-misc/wtf !app-misc/banner !games-puzzle/hangman sys-libs/ncurses:0 sys-apps/miscfiles games-misc/games-envd
 SLOT=0
 SRC_URI=https://www.polyomino.org.uk/computer/software/bsd-games/bsd-games-2.17.tar.gz mirror://debian/pool/main/b/bsdgames/bsdgames_2.17-22.debian.tar.xz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f3a6b50c45af7e1bd66be8862b71845f
diff --git a/metadata/md5-cache/games-misc/doge-3.5.0 b/metadata/md5-cache/games-misc/doge-3.5.0
index 8bcfdf74e550..d5ad645881fd 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/d/doge/doge-3.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1eb865fb88a2b01d47b6bc9656ebd421
diff --git a/metadata/md5-cache/games-misc/games-envd-0 b/metadata/md5-cache/games-misc/games-envd-0
index 5cb3f7ab4a9b..2e1419e8d70b 100644
--- a/metadata/md5-cache/games-misc/games-envd-0
+++ b/metadata/md5-cache/games-misc/games-envd-0
@@ -5,5 +5,5 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Games
 KEYWORDS=~alpha amd64 arm arm64 hppa m68k ~mips ppc64 s390 sh x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a96a63164bddd4a0e4114a6aaa4a4e68
diff --git a/metadata/md5-cache/games-misc/little-inferno-20130509 b/metadata/md5-cache/games-misc/little-inferno-20130509
index a9e5430d8994..7652465b9c50 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a8c20f1ad3f3b1e373e303234fe70229
diff --git a/metadata/md5-cache/games-misc/openmsx-0.3.1-r3 b/metadata/md5-cache/games-misc/openmsx-0.3.1-r3
new file mode 100644
index 000000000000..fad060794c20
--- /dev/null
+++ b/metadata/md5-cache/games-misc/openmsx-0.3.1-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install setup
+DEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=Open source music base set for OpenTTD
+EAPI=7
+HOMEPAGE=https://wiki.openttd.org/OpenMSX https://github.com/OpenTTD/OpenMSX
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://cdn.openttd.org/openmsx-releases/0.3.1/openmsx-0.3.1-source.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a9ad79d4942d800efdd02e84ca483a6e
diff --git a/metadata/md5-cache/games-misc/papers-please-1.1.65 b/metadata/md5-cache/games-misc/papers-please-1.1.65
index 2554064b0aca..997cb2dc0a49 100644
--- a/metadata/md5-cache/games-misc/papers-please-1.1.65
+++ b/metadata/md5-cache/games-misc/papers-please-1.1.65
@@ -8,5 +8,5 @@ RDEPEND=amd64? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXau-1.0.7-r1[
 RESTRICT=fetch bindist
 SLOT=0
 SRC_URI=papers-please_1.1.65_i386.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=81ebca036b0e7d554b2c158080557562
diff --git a/metadata/md5-cache/games-misc/ponysay-3.0.3 b/metadata/md5-cache/games-misc/ponysay-3.0.3
index cdb7097e8f0f..94a153b01c8b 100644
--- a/metadata/md5-cache/games-misc/ponysay-3.0.3
+++ b/metadata/md5-cache/games-misc/ponysay-3.0.3
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile install setup
 DESCRIPTION=cowsay reimplemention for ponies
 EAPI=7
 HOMEPAGE=https://github.com/erkin/ponysay
-IUSE=doc +non-free bash-completion fish-completion zsh-completion python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc +non-free bash-completion fish-completion zsh-completion python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/erkin/ponysay/archive/3.0.3.tar.gz -> ponysay-3.0.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0f0fbdd1537468bc11157b4858d0d86f
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index 105163caa3df..d8e94384db44 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/circlemud-3.1 b/metadata/md5-cache/games-mud/circlemud-3.1
index 6e370ad79f05..f9784cb9213c 100644
--- a/metadata/md5-cache/games-mud/circlemud-3.1
+++ b/metadata/md5-cache/games-mud/circlemud-3.1
@@ -8,5 +8,5 @@ LICENSE=circlemud
 RDEPEND=dev-libs/openssl:0= games-misc/games-envd
 SLOT=0
 SRC_URI=https://www.circlemud.org/pub/CircleMUD/3.x/circle-3.1.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=093769693975eb61a498d6513ca32ba0
diff --git a/metadata/md5-cache/games-mud/lyntin-4.2-r2 b/metadata/md5-cache/games-mud/lyntin-4.2-r2
index 8f63d9856d1d..45d62ccd88cb 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ddffe93159aa7fedf8a7434d3b10985
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 550062b504a2..eee961cde3ad 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/angrydd-1.0.1_p13 b/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13
deleted file mode 100644
index 21058eba0bce..000000000000
--- a/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-DESCRIPTION=Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter
-EAPI=7
-HOMEPAGE=https://www.sacredchao.net/~piman/angrydd/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz mirror://debian/pool/main/a/angrydd/angrydd_1.0.1-13.debian.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ab8d38d1d85ac78250f014262521f766
diff --git a/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r1 b/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r1
new file mode 100644
index 000000000000..5c2906e7605e
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygame[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygame[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygame[python_targets_python3_8(-)] )
+DESCRIPTION=Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter
+EAPI=7
+HOMEPAGE=https://www.sacredchao.net/~piman/angrydd/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygame[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygame[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygame[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz mirror://debian/pool/main/a/angrydd/angrydd_1.0.1-13.debian.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a2c8809b88ebc7a8bde460746dd823ff
diff --git a/metadata/md5-cache/games-puzzle/greedy-0.2.0-r1 b/metadata/md5-cache/games-puzzle/greedy-0.2.0-r1
index 259e1e6f706b..a27fc1603a29 100644
--- a/metadata/md5-cache/games-puzzle/greedy-0.2.0-r1
+++ b/metadata/md5-cache/games-puzzle/greedy-0.2.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.kotinet.com/juhamattin/linux/download/greedy-0.2.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=342d575934ead774452e71d146639c7f
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8
index 7791b833a9b9..d391a4a0cb24 100644
--- a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8
+++ b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/lmarbles-1.0.8.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=64ee62039f2cdf38a00db38da312751b
diff --git a/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1 b/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
index e8ce22517210..9305ffcc6735 100644
--- a/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
+++ b/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
@@ -10,4 +10,4 @@ RDEPEND=app-arch/libarchive dev-libs/openssl:0= media-libs/libsdl[sound,video,X]
 SLOT=0
 SRC_URI=mirror://sourceforge/meandmyshadow/0.4/meandmyshadow-0.4-src.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48d3316aaf9c363763022effb3a8cf9b
+_md5_=7eb6f443c2447e2e700a7e45848f6706
diff --git a/metadata/md5-cache/games-puzzle/nightsky-20111222 b/metadata/md5-cache/games-puzzle/nightsky-20111222
index ba9932b207f9..0901e9c72544 100644
--- a/metadata/md5-cache/games-puzzle/nightsky-20111222
+++ b/metadata/md5-cache/games-puzzle/nightsky-20111222
@@ -9,5 +9,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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=913dcb79f779359fefcfde1d1d3f9520
diff --git a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16 b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16
deleted file mode 100644
index b8505aac310d..000000000000
--- a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) doc? ( media-libs/netpbm )
-DEFINED_PHASES=install postinst prepare setup unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygame-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-DESCRIPTION=An enriched clone of the game 'Logical' by Rainbow Arts
-EAPI=7
-HOMEPAGE=http://pathological.sourceforge.net/
-IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygame-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pathological/pathological-1.1.3.tar.gz mirror://debian/pool/main/p/pathological/pathological_1.1.3-16.debian.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=83757e570664aacb7c63628b065f90ad
diff --git a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r1 b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r1
new file mode 100644
index 000000000000..8ef4933fc888
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) doc? ( media-libs/netpbm )
+DEFINED_PHASES=install postinst prepare setup unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygame-1.5.5[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygame-1.5.5[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygame-1.5.5[python_targets_python3_8(-)] )
+DESCRIPTION=An enriched clone of the game 'Logical' by Rainbow Arts
+EAPI=7
+HOMEPAGE=http://pathological.sourceforge.net/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygame-1.5.5[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygame-1.5.5[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygame-1.5.5[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://sourceforge/pathological/pathological-1.1.3.tar.gz mirror://debian/pool/main/p/pathological/pathological_1.1.3-16.debian.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5e437fbd6f8e0af28d9921725c79c1b2
diff --git a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r2 b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r2
index 2cd08fc5817d..42f58b37afd6 100644
--- a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r2
+++ b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r2
@@ -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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6f245dff8bee814bd274931213f28ea7
diff --git a/metadata/md5-cache/games-puzzle/seatris-0.0.14 b/metadata/md5-cache/games-puzzle/seatris-0.0.14
index 74d82f9fd309..406bb900383d 100644
--- a/metadata/md5-cache/games-puzzle/seatris-0.0.14
+++ b/metadata/md5-cache/games-puzzle/seatris-0.0.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.earth.li/projectpurple/files/seatris-0.0.14.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=65abdf2ad1381b147940bb8deacb163d
diff --git a/metadata/md5-cache/games-puzzle/splice-20121120 b/metadata/md5-cache/games-puzzle/splice-20121120
index 07b6f6ae8683..8740684b745d 100644
--- a/metadata/md5-cache/games-puzzle/splice-20121120
+++ b/metadata/md5-cache/games-puzzle/splice-20121120
@@ -8,5 +8,5 @@ RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=splice-linux-1353389454.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eb9a5270e1a48e98df3bfa81f1bd2457
diff --git a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1 b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1
index f8d404b138ad..3a2c41db7d4d 100644
--- a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1
+++ b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/opengl media-libs/openal x11-libs/libX11 !bundled-libs? ( media-
 RESTRICT=bindist fetch bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=725f13227d4e56b670f4c2da36201147
diff --git a/metadata/md5-cache/games-puzzle/twindistress-1.1.0 b/metadata/md5-cache/games-puzzle/twindistress-1.1.0
index 7daf9d7351f0..f173ce2e31a1 100644
--- a/metadata/md5-cache/games-puzzle/twindistress-1.1.0
+++ b/metadata/md5-cache/games-puzzle/twindistress-1.1.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[png] games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/twind/twind-1.1.0.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e5753c2aaa1124a7dd1bf5db060b5651
diff --git a/metadata/md5-cache/games-puzzle/xbomb-2.2b b/metadata/md5-cache/games-puzzle/xbomb-2.2b
index f6e7f45b2e7e..3e21cf84585f 100644
--- a/metadata/md5-cache/games-puzzle/xbomb-2.2b
+++ b/metadata/md5-cache/games-puzzle/xbomb-2.2b
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=x11-libs/libXaw games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.gedanken.org.uk/software/xbomb/download/xbomb-2.2b.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af32cb52e8d92475e8b6d15fd12c5459
diff --git a/metadata/md5-cache/games-puzzle/xlogical-1.0.7 b/metadata/md5-cache/games-puzzle/xlogical-1.0.7
index b85b3490ce3e..656780b5aa25 100644
--- a/metadata/md5-cache/games-puzzle/xlogical-1.0.7
+++ b/metadata/md5-cache/games-puzzle/xlogical-1.0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] games-misc/games-envd
 SLOT=0
 SRC_URI=http://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-7.tar.bz2 alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=718fa8c0171fb160d415ea4000fac010
diff --git a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1 b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1
index b0afc53df6f0..d791ffe4c6ff 100644
--- a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1
+++ b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif] games-misc/games-envd
 SLOT=0
 SRC_URI=http://xnc.jinr.ru/xwelltris/src/xwelltris-1.0.1.src.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d1d06beb0fa232ed7b760c7d6376c816
diff --git a/metadata/md5-cache/games-roguelike/FTL-1.5.13 b/metadata/md5-cache/games-roguelike/FTL-1.5.13
index f0cdb5562dc3..1bb019da877b 100644
--- a/metadata/md5-cache/games-roguelike/FTL-1.5.13
+++ b/metadata/md5-cache/games-roguelike/FTL-1.5.13
@@ -9,5 +9,5 @@ RDEPEND=sys-devel/gcc[cxx] virtual/opengl !bundled-libs? ( media-libs/devil[png]
 RESTRICT=fetch bindist splitdebug
 SLOT=0
 SRC_URI=FTL.1.5.13.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=221977a1f098dbf84a9b773aee96d67b
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index ccbd1ff014d5..1b44f623c2f1 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/adom-1.1.1-r1 b/metadata/md5-cache/games-roguelike/adom-1.1.1-r1
index 71dc6017c202..026273119a57 100644
--- a/metadata/md5-cache/games-roguelike/adom-1.1.1-r1
+++ b/metadata/md5-cache/games-roguelike/adom-1.1.1-r1
@@ -8,5 +8,5 @@ RDEPEND=sys-libs/ncurses-compat:5[abi_x86_32(-)] games-misc/games-envd
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://www.adom.de/adom/download/linux/adom-111-elf.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=338e5fab0e7d5ebed35c15cf956ca879
diff --git a/metadata/md5-cache/games-roguelike/hengband-1.6.2-r1 b/metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
index 318f1585ec3b..0fbd801b316d 100644
--- a/metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
+++ b/metadata/md5-cache/games-roguelike/hengband-1.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=Moria
 RDEPEND=>=sys-libs/ncurses-5:0 X? ( x11-libs/libX11 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/hengband/10331/hengband-1.6.2.tar.bz2 mirror://gentoo/hengband-1.6.2-mispellings.patch.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5f40e8b2b40312056049eb9c138e11ed
diff --git a/metadata/md5-cache/games-roguelike/tome-2.3.5 b/metadata/md5-cache/games-roguelike/tome-2.3.5
index 92b789abae66..30f2f1b390eb 100644
--- a/metadata/md5-cache/games-roguelike/tome-2.3.5
+++ b/metadata/md5-cache/games-roguelike/tome-2.3.5
@@ -9,5 +9,5 @@ LICENSE=Moria
 RDEPEND=>=sys-libs/ncurses-5:0 X? ( x11-libs/libX11 ) Xaw3d? ( x11-libs/libXaw ) sdl? ( media-libs/sdl-ttf media-libs/sdl-image media-libs/libsdl ) gtk? ( >=x11-libs/gtk+-2.12.8:2 ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://t-o-m-e.net/dl/src/tome-235-src.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13cd9b49f2c9b7303795d99d3cadb70d
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.6.1a b/metadata/md5-cache/games-roguelike/tomenet-4.6.1a
index f32c4040a22a..a231547bf653 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f8388de6589771553614df081f22df9
diff --git a/metadata/md5-cache/games-roguelike/zangband-2.7.4c b/metadata/md5-cache/games-roguelike/zangband-2.7.4c
index a58b97d84efb..84a900878c0b 100644
--- a/metadata/md5-cache/games-roguelike/zangband-2.7.4c
+++ b/metadata/md5-cache/games-roguelike/zangband-2.7.4c
@@ -9,5 +9,5 @@ LICENSE=Moria
 RDEPEND=tk? ( dev-lang/tcl:0= dev-lang/tk:0= ) x11-libs/libXaw games-misc/games-envd
 SLOT=0
 SRC_URI=ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-2.7.4c.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8172e2b114cd417c907ef40fa1844845
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 913b71339588..840598a56005 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/adonthell-0.3.5-r2 b/metadata/md5-cache/games-rpg/adonthell-0.3.5-r2
index 7702ba96e762..59936e222dfb 100644
--- a/metadata/md5-cache/games-rpg/adonthell-0.3.5-r2
+++ b/metadata/md5-cache/games-rpg/adonthell-0.3.5-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=roleplaying game engine
 EAPI=6
 HOMEPAGE=http://adonthell.nongnu.org/
-IUSE=doc nls +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc nls +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) media-libs/freetype media-libs/libogg media-libs/libsdl:0[X,video,sound] media-libs/libvorbis media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/adonthell/adonthell-src-0.3.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=09f13c61477b8cdf7b1c4017559d55dc
diff --git a/metadata/md5-cache/games-rpg/bastion-20120620-r1 b/metadata/md5-cache/games-rpg/bastion-20120620-r1
index 7d4ac8da7d4e..255cb6d1c90f 100644
--- a/metadata/md5-cache/games-rpg/bastion-20120620-r1
+++ b/metadata/md5-cache/games-rpg/bastion-20120620-r1
@@ -8,5 +8,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	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc50abe73edec72ec06215d7f908e2e7
diff --git a/metadata/md5-cache/games-rpg/coe2-2007-r1 b/metadata/md5-cache/games-rpg/coe2-2007-r1
index 8da55c80ad51..d7c542361870 100644
--- a/metadata/md5-cache/games-rpg/coe2-2007-r1
+++ b/metadata/md5-cache/games-rpg/coe2-2007-r1
@@ -9,5 +9,5 @@ RDEPEND=media-libs/libsdl[sound,video] games-misc/games-envd
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://download.shrapnelgames.com/downloads/coe2_2007.zip
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f1fff936f10bd1671fb04ddb2a8a0936
diff --git a/metadata/md5-cache/games-rpg/dear-esther-20130608 b/metadata/md5-cache/games-rpg/dear-esther-20130608
index 5ebc97100d5c..37b419dd899a 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=084f7f23b5d0c53c7935efcb6c5721ac
diff --git a/metadata/md5-cache/games-rpg/dungeon-defenders-20130305 b/metadata/md5-cache/games-rpg/dungeon-defenders-20130305
index 4a6eecb2a5af..1fd339339b4d 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	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c8ddf39a8fdfb58565bd40972d0faba6
diff --git a/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2 b/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2
index dbb1f61894b1..141391240997 100644
--- a/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2
+++ b/metadata/md5-cache/games-rpg/freedroidrpg-1.0_rc2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) nls? ( sys-devel/gettext ) sanitize? ( || ( sys-devel/gcc[sanitize] sys-devel/clang-runtime[sanitize] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) nls? ( sys-devel/gettext ) sanitize? ( || ( sys-devel/gcc[sanitize] sys-devel/clang-runtime[sanitize] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
 DEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[opengl?,sound?,video] media-libs/sdl-image[jpeg,png] >=media-libs/sdl-gfx-2.0.21 nls? ( virtual/libintl ) opengl? ( virtual/opengl ) sound? ( media-libs/libogg media-libs/libvorbis media-libs/sdl-mixer[vorbis] ) devtools? ( media-libs/sdl-ttf ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A modification of the classical Freedroid engine into an RPG
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[openg
 SLOT=0
 SRC_URI=ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-1.0/freedroidRPG-1.0rc2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e783549f20ad9426cf2fe602085da709
+_md5_=0743108de17e56a1758198a0a1350083
diff --git a/metadata/md5-cache/games-rpg/to-the-moon-0 b/metadata/md5-cache/games-rpg/to-the-moon-0
index db948ad3d427..faa03fb011bf 100644
--- a/metadata/md5-cache/games-rpg/to-the-moon-0
+++ b/metadata/md5-cache/games-rpg/to-the-moon-0
@@ -9,5 +9,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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d796de3135b68c4476d2dd1126a87fa2
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 bf7fa83a7253..456bab767748 100644
--- a/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
+++ b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
@@ -8,5 +8,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	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=103e8f0e6d36582c1edb3c7b47f86a4d
diff --git a/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r1 b/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r1
deleted file mode 100644
index c8b2c960bf50..000000000000
--- a/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=games-rpg/adonthell-0.3.5-r2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=role playing game to showcase the adonthell engine
-EAPI=6
-HOMEPAGE=http://adonthell.nongnu.org/download/
-IUSE=nls +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=games-rpg/adonthell-0.3.5-r2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] nls? ( virtual/libintl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=userpriv
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/adonthell/wastesedge-src-0.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a3390aec220ecadebb29bf7bb19d6280
diff --git a/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r2 b/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r2
new file mode 100644
index 000000000000..033c8bc3f141
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=games-rpg/adonthell-0.3.5-r2[python_single_target_python2_7(-)?] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=role playing game to showcase the adonthell engine
+EAPI=6
+HOMEPAGE=http://adonthell.nongnu.org/download/
+IUSE=nls +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=games-rpg/adonthell-0.3.5-r2[python_single_target_python2_7(-)?] nls? ( virtual/libintl )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/adonthell/wastesedge-src-0.3.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0de4ff3a644d3c27f8756ecb564c1f8c
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index f575b350efe1..692d3e5bf394 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/pvpgn-1.8.5-r2 b/metadata/md5-cache/games-server/pvpgn-1.8.5-r2
index 6e0f97abf790..92b7a9164df6 100644
--- a/metadata/md5-cache/games-server/pvpgn-1.8.5-r2
+++ b/metadata/md5-cache/games-server/pvpgn-1.8.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pvpgn.berlios/pvpgn-1.8.5.tar.bz2 mirror://sourceforge/pvpgn.berlios/pvpgn-support-1.3.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=02da0a83833a05379ea097beec58b666
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index f98da869bcbe..c0a6f03a1ddd 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/crrcsim-0.9.13 b/metadata/md5-cache/games-simulation/crrcsim-0.9.13
index 71c269dc77be..3ca70fd17650 100644
--- a/metadata/md5-cache/games-simulation/crrcsim-0.9.13
+++ b/metadata/md5-cache/games-simulation/crrcsim-0.9.13
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mat
 SLOT=0
 SRC_URI=mirror://sourceforge/crrcsim/crrcsim-0.9.13.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5964a64131daf3656cf66684f75addca
+_md5_=9089891f6c91161fb993c45ec1d7e777
diff --git a/metadata/md5-cache/games-simulation/flightgear-2019.1.1 b/metadata/md5-cache/games-simulation/flightgear-2019.1.1
index 0ead7da7938b..164ca76097f7 100644
--- a/metadata/md5-cache/games-simulation/flightgear-2019.1.1
+++ b/metadata/md5-cache/games-simulation/flightgear-2019.1.1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/flightgear/flightgear-2019.1.1.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47e52beb0a52d927cc09af2879d1833e
+_md5_=70628277bdaf8afc333425d17f64ca63
diff --git a/metadata/md5-cache/games-simulation/flightgear-9999 b/metadata/md5-cache/games-simulation/flightgear-9999
index fd662aba87c0..2d5c4eb82b6c 100644
--- a/metadata/md5-cache/games-simulation/flightgear-9999
+++ b/metadata/md5-cache/games-simulation/flightgear-9999
@@ -3,11 +3,11 @@ DEPEND=dev-db/sqlite:3 dev-games/openscenegraph[jpeg,png] ~dev-games/simgear-999
 DESCRIPTION=Open Source Flight Simulator
 EAPI=6
 HOMEPAGE=https://www.flightgear.org/
-IUSE=dbus debug examples gdal openmp qt5 +udev +utils vim-syntax
+IUSE=cpu_flags_x86_sse2 dbus debug examples gdal openmp qt5 +udev +utils vim-syntax
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-db/sqlite:3 dev-games/openscenegraph[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
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f2259f5b5b4a9dfe2db22599702f379
+_md5_=90fb915c7ec65c38f9f0cee6b78b0003
diff --git a/metadata/md5-cache/games-simulation/singularity-1.0_alpha1 b/metadata/md5-cache/games-simulation/singularity-1.0_alpha1
deleted file mode 100644
index a8f4cf102cc0..000000000000
--- a/metadata/md5-cache/games-simulation/singularity-1.0_alpha1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/polib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-DESCRIPTION=Simulation of a true AI. Go from computer to computer, chased by the whole world
-EAPI=7
-HOMEPAGE=http://www.emhsoft.com/singularity/ https://github.com/singularity/singularity
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 CC-BY-SA-2.5
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/polib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/singularity/singularity/releases/download/singularity-1.0a1/singularity-1.0a1.tar.gz http://emhsoft.com/singularity/endgame-singularity-music-007.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6c76377970f3823bdf0932f62995fa3b
diff --git a/metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r1 b/metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r1
new file mode 100644
index 000000000000..ae877690a2cc
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/singularity-1.0_alpha1-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] dev-python/pygame[python_targets_python3_6(-)] dev-python/polib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/pygame[python_targets_python3_7(-)] dev-python/polib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pygame[python_targets_python3_8(-)] dev-python/polib[python_targets_python3_8(-)] )
+DESCRIPTION=Simulation of a true AI. Go from computer to computer, chased by the whole world
+EAPI=7
+HOMEPAGE=http://www.emhsoft.com/singularity/ https://github.com/singularity/singularity
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-SA-2.5
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] dev-python/pygame[python_targets_python3_6(-)] dev-python/polib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] dev-python/pygame[python_targets_python3_7(-)] dev-python/polib[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] dev-python/pygame[python_targets_python3_8(-)] dev-python/polib[python_targets_python3_8(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/singularity/singularity/releases/download/singularity-1.0a1/singularity-1.0a1.tar.gz http://emhsoft.com/singularity/endgame-singularity-music-007.zip
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2dce1a60aeef04640aa40143b8d09a18
diff --git a/metadata/md5-cache/games-sports/Manifest.gz b/metadata/md5-cache/games-sports/Manifest.gz
index f7107915d319..5978c7b91885 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/ski-6.9-r1 b/metadata/md5-cache/games-sports/ski-6.9-r1
index e92f2a33d4b8..05888a049485 100644
--- a/metadata/md5-cache/games-sports/ski-6.9-r1
+++ b/metadata/md5-cache/games-sports/ski-6.9-r1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A simple text-mode skiing game
 EAPI=6
 HOMEPAGE=http://www.catb.org/~esr/ski/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !!app-emulation/ski
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/ski/ski-6.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3eefdd3639dcada7c926ced1d150777e
diff --git a/metadata/md5-cache/games-sports/vdrift-20120722 b/metadata/md5-cache/games-sports/vdrift-20120722
index 845028fc106a..39ff38f55656 100644
--- a/metadata/md5-cache/games-sports/vdrift-20120722
+++ b/metadata/md5-cache/games-sports/vdrift-20120722
@@ -8,5 +8,5 @@ LICENSE=GPL-3 ZLIB LGPL-2.1+
 RDEPEND=app-arch/libarchive media-libs/glew media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/libvorbis net-misc/curl sci-physics/bullet[-double-precision] virtual/opengl virtual/glu games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/vdrift/vdrift-2012-07-22.tar.bz2 mirror://sourceforge/vdrift/vdrift-2012-07-22c_patch.diff
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e6038213dfb8ff5feea4c4fd3015815d
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 4138dff926a9..c5419aeda814 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/boswars-2.7-r2 b/metadata/md5-cache/games-strategy/boswars-2.7-r2
index 299417c4cca4..ab5a8ae89ed2 100644
--- a/metadata/md5-cache/games-strategy/boswars-2.7-r2
+++ b/metadata/md5-cache/games-strategy/boswars-2.7-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/lua:0 media-libs/libogg media-libs/libpng:0 media-libs/libsdl[opengl,sound,video] media-libs/libtheora media-libs/libvorbis virtual/opengl x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.boswars.org/dist/releases/boswars-2.7-src.tar.gz https://dev.gentoo.org/~hasufell/distfiles/boswars-2.7-fixed-images-for-libpng-1.6.tar.xz mirror://gentoo/bos.png
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1ece430fbc1b56f37ed465b02f58727d
diff --git a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9 b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9
index d0f620a30737..133d111a601a 100644
--- a/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9
+++ b/metadata/md5-cache/games-strategy/darwinia-1.4.0_beta9
@@ -10,5 +10,5 @@ RDEPEND=~virtual/libstdc++-3.3 media-libs/libsdl[abi_x86_32(-)] media-libs/libvo
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-full-1.4.0b9.sh
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b1b8ff4be478deeeed2f24006947e3b6
diff --git a/metadata/md5-cache/games-strategy/dominions2-2.16 b/metadata/md5-cache/games-strategy/dominions2-2.16
index 64e422bb833b..8705dc60464b 100644
--- a/metadata/md5-cache/games-strategy/dominions2-2.16
+++ b/metadata/md5-cache/games-strategy/dominions2-2.16
@@ -10,5 +10,5 @@ RDEPEND=|| ( ppc? ( media-libs/libsdl virtual/opengl virtual/glu ) !ppc? ( media
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=x86? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_x86.tgz ) amd64? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_x86.tgz ) ppc? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_ppc.tgz ) doc? ( http://www.shrapnelgames.com/downloads/DOM2_Walkthrough.pdf http://www.shrapnelgames.com/downloads/manual_addenda.pdf ) mirror://gentoo/dominions2.png
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=adcb6d0af6e0d8ad73a0e105f203a923
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 30a0a1c26841..f47df83c422a 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cbc46f41e551853f1f792f26da8c1a5
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 08bc8763a227..50a0755b6967 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
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !dev-games/gigi virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python2_7? ( >=dev-libs/boost-1.56:=[python,threads,python_targets_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 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !dev-games/gigi virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A free turn-based space empire and galactic conquest game
 EAPI=6
 HOMEPAGE=http://www.freeorion.org
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64
 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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !dev-games/gigi
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-libs/boost-1.56:=[python,threads,python_targets_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 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !dev-games/gigi
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db68afb62445b639105c2a3b7da111ff
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d933c201e956e3dedcafa82a9c5f526e
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.8_p20190501 b/metadata/md5-cache/games-strategy/freeorion-0.4.8_p20190501
deleted file mode 100644
index c20df6e0db72..000000000000
--- a/metadata/md5-cache/games-strategy/freeorion-0.4.8_p20190501
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/boost-1.58:=[python,threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=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 virtual/opengl ) sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free turn-based space empire and galactic conquest game
-EAPI=7
-HOMEPAGE=https://www.freeorion.org
-IUSE=dedicated +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/boost-1.58:=[python,threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=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 virtual/opengl ) sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/freeorion/freeorion/archive/2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77.tar.gz -> freeorion-0.4.8_p20190501.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33f87abcd57b8e47c80dd4689b357e9a
diff --git a/metadata/md5-cache/games-strategy/freeorion-0.4.8_p20190501-r1 b/metadata/md5-cache/games-strategy/freeorion-0.4.8_p20190501-r1
new file mode 100644
index 000000000000..980ff74663ba
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/freeorion-0.4.8_p20190501-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-libs/boost-1.58:=[python,threads,python_targets_python2_7(-)] ) !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=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 virtual/opengl ) sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free turn-based space empire and galactic conquest game
+EAPI=7
+HOMEPAGE=https://www.freeorion.org
+IUSE=dedicated +python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
+RDEPEND=python_single_target_python2_7? ( >=dev-libs/boost-1.58:=[python,threads,python_targets_python2_7(-)] ) !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=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 virtual/opengl ) sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/freeorion/freeorion/archive/2a49c05796f1c92b96ce9b2aeaf0124fc8be7a77.tar.gz -> freeorion-0.4.8_p20190501.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2dd44452790903e572e263d267a404e8
diff --git a/metadata/md5-cache/games-strategy/freeorion-9999 b/metadata/md5-cache/games-strategy/freeorion-9999
index 10ad58c2a856..ce071d6de189 100644
--- a/metadata/md5-cache/games-strategy/freeorion-9999
+++ b/metadata/md5-cache/games-strategy/freeorion-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.58:=[python,threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=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 virtual/opengl ) sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python2_7? ( >=dev-libs/boost-1.58:=[python,threads,python_targets_python2_7(-)] ) !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=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 virtual/opengl ) sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free turn-based space empire and galactic conquest game
 EAPI=7
 HOMEPAGE=https://www.freeorion.org
-IUSE=dedicated +python_targets_python2_7 +python_single_target_python2_7
+IUSE=dedicated +python_single_target_python2_7
 LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
 PROPERTIES=live
-RDEPEND=>=dev-libs/boost-1.58:=[python,threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=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 virtual/opengl ) sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-libs/boost-1.58:=[python,threads,python_targets_python2_7(-)] ) !dedicated? ( media-libs/freealut >=media-libs/freetype-2.5.5 media-libs/glew:= >=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 virtual/opengl ) sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33f87abcd57b8e47c80dd4689b357e9a
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2dd44452790903e572e263d267a404e8
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 da63c7a05b22..12a3549cfe10 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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
deleted file mode 100644
index 3c5fb0353b57..000000000000
--- a/metadata/md5-cache/games-strategy/gwp-0.4.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/rarian dev-libs/libpcre nls? ( virtual/libintl ) opengl? ( x11-libs/gtkglext ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME client for the classic PBEM strategy game VGA Planets 3
-EAPI=5
-HOMEPAGE=http://gwp.lunix.com.ar/
-IUSE=nls opengl python debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/rarian dev-libs/libpcre nls? ( virtual/libintl ) opengl? ( x11-libs/gtkglext ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=http://gwp.lunix.com.ar/releases/gwp-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5217357bd04fef53dc924b1f2f69427b
diff --git a/metadata/md5-cache/games-strategy/gwp-0.4.0-r4 b/metadata/md5-cache/games-strategy/gwp-0.4.0-r4
new file mode 100644
index 000000000000..3e6c8bda6799
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/gwp-0.4.0-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/rarian dev-libs/libpcre nls? ( virtual/libintl ) opengl? ( x11-libs/gtkglext ) python? ( python_single_target_python2_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/pygtk[python_targets_python2_7(-)] ) ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME client for the classic PBEM strategy game VGA Planets 3
+EAPI=5
+HOMEPAGE=http://gwp.lunix.com.ar/
+IUSE=nls opengl python debug +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/rarian dev-libs/libpcre nls? ( virtual/libintl ) opengl? ( x11-libs/gtkglext ) python? ( python_single_target_python2_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/pygtk[python_targets_python2_7(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=http://gwp.lunix.com.ar/releases/gwp-0.4.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e85d424460d0e2f2543933a62934e11c
diff --git a/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072 b/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
index e36087c800ae..f64b34fee5ed 100644
--- a/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
+++ b/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
@@ -10,5 +10,5 @@ RDEPEND=media-libs/libsdl[X,sound,video] zlib? ( sys-libs/zlib ) cdinstall? ( ga
 REQUIRED_USE=^^ ( l10n_de l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/ja2-stracciatella-0.12.1_p7072.tar.xz http://tron.homeunix.org/ja2/editor.slf.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=086b7aaf5ca83848d553811f45b09f84
diff --git a/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1 b/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
index ab9c6235672d..9160f6e69fdd 100644
--- a/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
+++ b/metadata/md5-cache/games-strategy/ja2-stracciatella-data-1
@@ -8,5 +8,5 @@ LICENSE=SIR-TECH
 PROPERTIES=interactive
 RDEPEND=games-misc/games-envd
 SLOT=0
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cdrom	6ffe90ac67bc6ac95249cae335323907	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a78ea64451dfed10553aef455e664bb1
diff --git a/metadata/md5-cache/games-strategy/lightyears-1.4-r3 b/metadata/md5-cache/games-strategy/lightyears-1.4-r3
index 1c889db044c3..9e9bcd9c1043 100644
--- a/metadata/md5-cache/games-strategy/lightyears-1.4-r3
+++ b/metadata/md5-cache/games-strategy/lightyears-1.4-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/pygame[python_targets_python2_7(-)] )
 DESCRIPTION=A single-player game with a science-fiction theme
 EAPI=7
 HOMEPAGE=https://www.jwhitham.org/20kly/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/pygame[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.jwhitham.org/20kly/lightyears-1.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ac19602872e549e7d07dfef27e72b98
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=23f65bf582d8fc87ae595a232a503f53
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 c5205abeb14c..9bbe22a728a8 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 5585cbad5086..230fa4ddbf0f 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	games	be6b136152d095d3e15031e2c725eb3f	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=63917303de23782c56b645fd7128c9a8
diff --git a/metadata/md5-cache/games-strategy/openra-20190314 b/metadata/md5-cache/games-strategy/openra-20190314
index 0484f1160112..fa0d14b4b01d 100644
--- a/metadata/md5-cache/games-strategy/openra-20190314
+++ b/metadata/md5-cache/games-strategy/openra-20190314
@@ -12,4 +12,4 @@ RESTRICT=mirror test
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/archive/release-20190314.tar.gz -> openra-20190314.tar.gz https://github.com/OpenRA/Eluant/releases/download/20160124/Eluant.dll -> Eluant-20160124.dll https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll.config -> OpenAL-CS-20151227.dll.config https://github.com/OpenRA/OpenAL-CS/releases/download/20151227/OpenAL-CS.dll -> OpenAL-CS-20151227.dll https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll.config -> SDL2-CS-20161223.dll.config https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll -> SDL2-CS-20161223.dll https://www.nuget.org/api/v2/package/FuzzyLogicLibrary/1.2.0 -> FuzzyLogicLibrary-1.2.0.zip https://www.nuget.org/api/v2/package/MaxMind.Db/2.0.0 -> MaxMind.Db-2.0.0.zip https://www.nuget.org/api/v2/package/Open.Nat/2.1.0 -> Open.Nat-2.1.0.zip https://www.nuget.org/api/v2/package/rix0rrr.BeaconLib/1.0.1 -> rix0rrr.BeaconLib-1.0.1.zip https://www.nuget.org/api/v2/package/SharpFont/4.0.1 -> SharpFont-4.0.1.zip https://www.nuget.org/api/v2/package/SharpZipLib/0.86.0 -> SharpZipLib-0.86.0.zip
 _eclasses_=mono-env	1f24c032c78290b0d9a07d5b343051a7	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=995c68bc49b5a3a85918fa92ab3ea496
+_md5_=4d1608d8efe0d3518b160ed913acf1d9
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 cb9a409983bd..954f32d19226 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0436e99b817c1ea5bdc9ae6cf08c84c1
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.7 b/metadata/md5-cache/games-strategy/wesnoth-1.14.7
index e8fa314f6e2b..aa493ce81d02 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.7
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.7
@@ -10,5 +10,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.7.tar.gz -> wesnoth-1.14.7.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f568cac6472c0ed58c61eb6e2c76244f
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.9 b/metadata/md5-cache/games-strategy/wesnoth-1.14.9
index 4560cdd22910..8f25fb4e6227 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.9
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.14.9
@@ -10,5 +10,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.9.tar.gz -> wesnoth-1.14.9.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7fe7c5906215d0ecbd553231aa91acef
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.15.2 b/metadata/md5-cache/games-strategy/wesnoth-1.15.2
index cbf639d7a51f..09496a8dd913 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.15.2
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.15.2
@@ -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.15.2.tar.gz -> wesnoth-1.15.2.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7fe7c5906215d0ecbd553231aa91acef
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index c7e688433571..fca67197b91d 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/gamemode-1.2 b/metadata/md5-cache/games-util/gamemode-1.2
index 19fbf34214dd..37e0822a1d8f 100644
--- a/metadata/md5-cache/games-util/gamemode-1.2
+++ b/metadata/md5-cache/games-util/gamemode-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/FeralInteractive/gamemode/releases/download/1.2/gamemode-1.2.tar.xz
-_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/games-util/gamemode-9999 b/metadata/md5-cache/games-util/gamemode-9999
index f82b6f953b34..231c8a5c40e6 100644
--- a/metadata/md5-cache/games-util/gamemode-9999
+++ b/metadata/md5-cache/games-util/gamemode-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/systemd-236[abi_x86_32(-)?,abi_x86_64(-)?] sys-auth/polkit
 REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5f90faf8204f60e1c27e14533d03a2a0
diff --git a/metadata/md5-cache/games-util/lutris-0.5.3 b/metadata/md5-cache/games-util/lutris-0.5.3
index 760dadb02ab7..c48ea661163c 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.3
+++ b/metadata/md5-cache/games-util/lutris-0.5.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lutris.net/releases/lutris_0.5.3.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb49b89eb6b686131c29fa5587aacfcd
diff --git a/metadata/md5-cache/games-util/lutris-0.5.4-r1 b/metadata/md5-cache/games-util/lutris-0.5.4-r1
index 6b8540fa6ac1..493b25fef8b2 100644
--- a/metadata/md5-cache/games-util/lutris-0.5.4-r1
+++ b/metadata/md5-cache/games-util/lutris-0.5.4-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://lutris.net/releases/lutris_0.5.4.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a3e682b60986a41289eb2c5c11040f0
diff --git a/metadata/md5-cache/games-util/lutris-9999 b/metadata/md5-cache/games-util/lutris-9999
index b30c321d1f71..4e7a99955263 100644
--- a/metadata/md5-cache/games-util/lutris-9999
+++ b/metadata/md5-cache/games-util/lutris-9999
@@ -11,5 +11,5 @@ RDEPEND=app-arch/cabextract app-arch/p7zip app-arch/unrar app-arch/unzip dev-pyt
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb49b89eb6b686131c29fa5587aacfcd
diff --git a/metadata/md5-cache/games-util/nml-0.4.5-r2 b/metadata/md5-cache/games-util/nml-0.4.5-r2
index 7b3ee0899601..bf82dd6eed4b 100644
--- a/metadata/md5-cache/games-util/nml-0.4.5-r2
+++ b/metadata/md5-cache/games-util/nml-0.4.5-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pillow[zlib,python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://bundles.openttdcoop.org/nml/releases/0.4.5/nml-0.4.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f9d92a2321859822a148319bc0fb285c
diff --git a/metadata/md5-cache/games-util/pyfa-2.14.1 b/metadata/md5-cache/games-util/pyfa-2.14.1
index 5fb4eddb623c..17ab7da0721f 100644
--- a/metadata/md5-cache/games-util/pyfa-2.14.1
+++ b/metadata/md5-cache/games-util/pyfa-2.14.1
@@ -1,16 +1,16 @@
 BDEPEND=app-arch/zip
 DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=dev-python/cryptography-2.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
+DEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)] )
 DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
 EAPI=7
 HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+graph +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+graph +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/beautifulsoup-4.6.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown2-2.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/packaging-16.8[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/requests-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/roman-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] graph? ( >=dev-python/matplotlib-2.0.0[wxwidgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)] ) python_single_target_python3_6? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_6(-)] >=dev-python/markdown2-2.3.0[python_targets_python3_6(-)] >=dev-python/packaging-16.8[python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_python3_6(-)] >=dev-python/roman-2.0.0[python_targets_python3_6(-)] graph? ( >=dev-python/matplotlib-2.0.0[wxwidgets,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.14.1.tar.gz -> pyfa-2.14.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b13a62f2ac5f83e368f86562d7a9d5e7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c6921da4524e28c9ba3b9b4d110efbb5
diff --git a/metadata/md5-cache/games-util/pyfa-2.15.1 b/metadata/md5-cache/games-util/pyfa-2.15.1
deleted file mode 100644
index 6f3abae2f7e3..000000000000
--- a/metadata/md5-cache/games-util/pyfa-2.15.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/zip
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=>=dev-python/cryptography-2.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=7
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/beautifulsoup-4.6.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown2-2.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/packaging-16.8[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/requests-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/roman-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/matplotlib-2.0.0[wxwidgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.15.1.tar.gz -> pyfa-2.15.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c78eaa4ca08c8b6ffdcce47cd4379ae
diff --git a/metadata/md5-cache/games-util/pyfa-2.15.1-r1 b/metadata/md5-cache/games-util/pyfa-2.15.1-r1
new file mode 100644
index 000000000000..14f3fac1f1ac
--- /dev/null
+++ b/metadata/md5-cache/games-util/pyfa-2.15.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/zip
+DEFINED_PHASES=install postinst postrm prepare setup
+DEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=7
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=+python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ all-rights-reserved
+RDEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_6(-)] >=dev-python/markdown2-2.3.0[python_targets_python3_6(-)] >=dev-python/packaging-16.8[python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_python3_6(-)] >=dev-python/roman-2.0.0[python_targets_python3_6(-)] >=dev-python/matplotlib-2.0.0[wxwidgets,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v2.15.1.tar.gz -> pyfa-2.15.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06efbbbc4c9a10e62d55ffa8ce252fa0
diff --git a/metadata/md5-cache/games-util/pyfa-9999 b/metadata/md5-cache/games-util/pyfa-9999
index 654f2c0c8051..ef9d4177ee8b 100644
--- a/metadata/md5-cache/games-util/pyfa-9999
+++ b/metadata/md5-cache/games-util/pyfa-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/zip >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=>=dev-python/cryptography-2.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+DEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
 EAPI=7
 HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 LICENSE=GPL-3+ all-rights-reserved
 PROPERTIES=live
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/beautifulsoup-4.6.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown2-2.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/packaging-16.8[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/requests-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/roman-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/matplotlib-2.0.0[wxwidgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( >=dev-python/cryptography-2.3[python_targets_python3_6(-)] >=dev-python/logbook-1.0.0[python_targets_python3_6(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_6(-)] >=dev-python/wxpython-4.0.4[webkit,python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/beautifulsoup-4.6.0[python_targets_python3_6(-)] >=dev-python/markdown2-2.3.0[python_targets_python3_6(-)] >=dev-python/packaging-16.8[python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] >=dev-python/requests-2.0.0[python_targets_python3_6(-)] >=dev-python/roman-2.0.0[python_targets_python3_6(-)] >=dev-python/matplotlib-2.0.0[wxwidgets,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=mirror bindist
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c78eaa4ca08c8b6ffdcce47cd4379ae
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06efbbbc4c9a10e62d55ffa8ce252fa0
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118 b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
index 260b1633f8bf..6afd08d97616 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig virtual/pkgconfig
+BDEPEND=dev-util/glib-utils virtual/pkgconfig || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare setup
 DEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
 DESCRIPTION=Userspace Xbox 360 Controller driver
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/chewi/xboxdrv/archive/6e5e8a57628095d8d0c8bbb38187afb0f3a42112.tar.gz -> xboxdrv-0.8.8_p20190118.tar.gz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=2562adf195fd83bb61d3f9ec7247fb7e
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=5276ca6e4e6fe1c2b1414bcad75067ba
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index b346fbab4d99..b10bb2006a71 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
deleted file mode 100644
index ea5af48b82fd..000000000000
--- a/metadata/md5-cache/gnome-base/dconf-0.26.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.15 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Simple low-level configuration system
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/dconf
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/dconf/0.26/dconf-0.26.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8682d76ea98bbc0daa25d8456051b92
diff --git a/metadata/md5-cache/gnome-base/gdm-3.32.0 b/metadata/md5-cache/gnome-base/gdm-3.32.0
index df013e5166ed..d33a9ed4a368 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.32.0
+++ b/metadata/md5-cache/gnome-base/gdm-3.32.0
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.32/gdm-3.32.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7631b387de43aa942145174da23accc7
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 c4a5eb9b0112..76d0fa4a3872 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
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.53.0:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.47.0 <dev-libs/gjs-1.53 >=x11-libs/gtk+-3.15.0:3[introspection] nsplugin? ( >=dev-libs/json-glib-0.13.2 ) >=x11-wm/mutter-3.24.0:0/1[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=x11-libs/startup-notification-0.11 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 networkmanager? ( >=gnome-extra/nm-applet-0.9.8[introspection] >=net-misc/networkmanager-0.9.8:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 media-libs/libcanberra[gtk3] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-libs/mesa[X(+)] dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.53.0:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.47.0 <dev-libs/gjs-1.53 >=x11-libs/gtk+-3.15.0:3[introspection] nsplugin? ( >=dev-libs/json-glib-0.13.2 ) >=x11-wm/mutter-3.24.0:0/1[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=x11-libs/startup-notification-0.11 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 networkmanager? ( >=gnome-extra/nm-applet-0.9.8[introspection] >=net-misc/networkmanager-0.9.8:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 media-libs/libcanberra[gtk3] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) media-libs/mesa[X(+)] dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
-IUSE=+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy +python_targets_python3_6 +python_single_target_python3_6 test
+IUSE=+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy +python_single_target_python3_6 test
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
-RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.53.0:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.47.0 <dev-libs/gjs-1.53 >=x11-libs/gtk+-3.15.0:3[introspection] nsplugin? ( >=dev-libs/json-glib-0.13.2 ) >=x11-wm/mutter-3.24.0:0/1[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=x11-libs/startup-notification-0.11 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 networkmanager? ( >=gnome-extra/nm-applet-0.9.8[introspection] >=net-misc/networkmanager-0.9.8:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 media-libs/libcanberra[gtk3] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) ?? ( elogind systemd )
+RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.53.0:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.47.0 <dev-libs/gjs-1.53 >=x11-libs/gtk+-3.15.0:3[introspection] nsplugin? ( >=dev-libs/json-glib-0.13.2 ) >=x11-wm/mutter-3.24.0:0/1[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=x11-libs/startup-notification-0.11 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 networkmanager? ( >=gnome-extra/nm-applet-0.9.8[introspection] >=net-misc/networkmanager-0.9.8:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 media-libs/libcanberra[gtk3] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) ?? ( elogind systemd )
 RESTRICT=!test? ( test )
 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81697a68a302671e5da8430f4a76809e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26cb34514eef1af228e7fc9e9bb9ac94
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.32.2 b/metadata/md5-cache/gnome-base/gnome-shell-3.32.2
deleted file mode 100644
index 61e949bf46be..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.32.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/sassc dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.54.0 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.32.0:0/4[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.27.90 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/mesa[X(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
-IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
-RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.54.0 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.32.0:0/4[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.27.90 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
-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 ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell/3.32/gnome-shell-3.32.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.32.2-patchset.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f57b84a8bd7e09e628ce97918d460f6
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.32.2-r1 b/metadata/md5-cache/gnome-base/gnome-shell-3.32.2-r1
new file mode 100644
index 000000000000..5a0d8f78f698
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.32.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/sassc dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.54.0 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.32.0:0/4[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.27.90 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) media-libs/mesa[X(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_6 python_single_target_python3_7 test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=dev-libs/libcroco-0.6.8:0.6 >=gnome-extra/evolution-data-server-3.17.2:= >=app-crypt/gcr-3.7.5[introspection] >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.54.0 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.32.0:0/4[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.27.90 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 ) elogind? ( >=sys-auth/elogind-237 ) >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/3.32/gnome-shell-3.32.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.32.2-patchset.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9485fccabb3f349039c266ed3f651d35
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 d19e881c2b99..343020db7a58 100644
--- a/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
+++ b/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=Library to construct graphical interfaces at runtime
 EAPI=5
 HOMEPAGE=https://library.gnome.org/devel/libglade/stable/
-IUSE=static-libs test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+IUSE=static-libs test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7 test
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.10.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=tools? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=tools? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2aeb38bb8a92344846ecd998ae3d72d4
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=05758fceca8f769cfd1a06422bf8ff01
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index b5f48d782c5a..96bc47edf963 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r1 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r1
deleted file mode 100644
index a209fb887bd0..000000000000
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-misc/jq sys-apps/coreutils sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] gnome-base/gnome-shell
-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://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f96db43750f172503f2ae4009ce36e9
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r2 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r2
deleted file mode 100644
index 9a17f59cdd7a..000000000000
--- a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-misc/jq sys-apps/coreutils
-DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] gnome-base/gnome-shell
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb3d17830b44fe79e64a7b904db20976
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r3 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r3
new file mode 100644
index 000000000000..f1c18c2b0793
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) app-misc/jq sys-apps/coreutils sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+IUSE=+python_single_target_python3_6
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) gnome-base/gnome-shell
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff07f4d61d5becb865f9e7e8668a2342
diff --git a/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4 b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
new file mode 100644
index 000000000000..177ef58d11c9
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-misc/jq sys-apps/coreutils
+DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) gnome-base/gnome-shell
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8fd919f06d128a219f149d74c57aa869
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 c8079f3f9922..4a79aefbec73 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.6.2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=6
 HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
-IUSE=+introspection systemd +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+introspection systemd +python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9f5b29596f4f4e791730e0bd551c9e3
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2d423d618a59f0aaf3d4e1617ae53d29
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 9ce50daf7f61..1dd280f1044f 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-3.8.1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A collection of libraries and utilites used by Cinnamon
 EAPI=6
 HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
-IUSE=+introspection systemd +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+introspection systemd +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b12a40d17b1657de7805dedab5af73f8
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=259358be8528e4915f90ff700bcda333
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1
deleted file mode 100644
index f34ba8fab699..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A collection of libraries and utilites used by Cinnamon
-EAPI=6
-HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
-IUSE=+introspection systemd +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0/4
-SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/4.0.1.tar.gz -> cinnamon-desktop-4.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3146ffc0c4eddd285094b1920809973c
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1-r1 b/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1-r1
new file mode 100644
index 000000000000..5becbd6f2352
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-desktop-4.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A collection of libraries and utilites used by Cinnamon
+EAPI=6
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
+IUSE=+introspection systemd +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0/4
+SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/4.0.1.tar.gz -> cinnamon-desktop-4.0.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c461124e09607c958bbbdcdcb4a0ff6c
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 dc64392245d8..6ef9f5a9ea27 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
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=g
 DESCRIPTION=Screensaver for Cinnamon
 EAPI=6
 HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
-IUSE=debug doc pam systemd xinerama +python_targets_python3_6 +python_single_target_python3_6
+IUSE=debug doc pam systemd xinerama +python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/xapp[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/xapp[python_targets_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b968cd5b0c44096f8d9cfc14fbe1791
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2239fcaad0736f4ba46125522f41782d
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 92e43d8fc2d0..afc05469f91b 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-3.8.0
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=g
 DESCRIPTION=Screensaver for Cinnamon
 EAPI=6
 HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
-IUSE=debug doc pam systemd xinerama +python_targets_python3_6 +python_single_target_python3_6
+IUSE=debug doc pam systemd xinerama +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/xapp[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/xapp[python_targets_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fb66a1d78ea1213208b1597b1aa3ee9
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b45fd338fa820671eeb19dc79cacdaef
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1
deleted file mode 100644
index 68f29479efa6..000000000000
--- a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Screensaver for Cinnamon
-EAPI=6
-HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
-IUSE=debug doc pam systemd xinerama +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/xapp[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/4.0.1.tar.gz -> cinnamon-screensaver-4.0.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea0892cd47e2f179e30fec991351f73a
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1-r1 b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1-r1
new file mode 100644
index 000000000000..ced7d9b34af9
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cinnamon-screensaver-4.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Screensaver for Cinnamon
+EAPI=6
+HOMEPAGE=http://developer.linuxmint.com/projects/cinnamon-projects.html
+IUSE=debug doc pam systemd xinerama +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/xapp[python_targets_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/4.0.1.tar.gz -> cinnamon-screensaver-4.0.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95517589717cff2f26c42e88951ea0b4
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.32.5 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.32.5
index 2018f0bcfd8f..77cf40dc0712 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.32.5
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.32.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.2:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-3.0.2:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) || ( dev-lang/python:3.6 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Evolution groupware backend
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
@@ -12,4 +12,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/62-24
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.32/evolution-data-server-3.32.5.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a94bbced963cd775b409b25e48b724b6
+_md5_=d2e96e8d8a490f59122012f16fdbba6a
diff --git a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90-r1 b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90-r1
index b186247bf6e7..61c125811a3c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90-r1
+++ b/metadata/md5-cache/gnome-extra/gnome-dvb-daemon-0.2.90-r1
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.32.0:2 dev-libs/libgudev:0 >=media-libs/gstreamer-1.4.0
 DESCRIPTION=Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/DVBDaemon
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.32.0:2 dev-libs/libgudev:0 >=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:= x11-libs/pango[introspection] x11-libs/gtk+:3[introspection] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-dvb-daemon/0.2/gnome-dvb-daemon-0.2.90.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fdb624d8ab3324e0c428a93563e3e6c7
diff --git a/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0 b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0
new file mode 100644
index 000000000000..101437ca36c3
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils >=sys-devel/gettext-0.19.7 x11-base/xorg-proto virtual/pkgconfig test? ( sys-apps/dbus ) app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME power statistics
+EAPI=6
+HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
+IUSE=test test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+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
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-power-manager/3.32/gnome-power-manager-3.32.0.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9b064eaced7b34532700dd86359edb6b
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0 b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0
deleted file mode 100644
index 9cd51d111a86..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19.8 app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Customize advanced GNOME 3 options
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
-LICENSE=GPL-3+ CC0-1.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/pygobject-3.10.2:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-3.28 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
-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=mirror://gnome/sources/gnome-tweaks/3.32/gnome-tweaks-3.32.0.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06b8b57e23de716d6a69ab3959d8743e
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0-r1 b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0-r1
new file mode 100644
index 000000000000..76398d8045f1
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-3.32.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Customize advanced GNOME 3 options
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-3+ CC0-1.0
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_7(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-3.28 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tweaks/3.32/gnome-tweaks-3.32.0.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1fbd053d7817bdcadd19bada54095cc
diff --git a/metadata/md5-cache/gnome-extra/libgda-5.2.8-r1 b/metadata/md5-cache/gnome-extra/libgda-5.2.8-r1
index 076ae68149e7..59e011c27512 100644
--- a/metadata/md5-cache/gnome-extra/libgda-5.2.8-r1
+++ b/metadata/md5-cache/gnome-extra/libgda-5.2.8-r1
@@ -3,13 +3,13 @@ DEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/l
 DESCRIPTION=GNOME database access library
 EAPI=6
 HOMEPAGE=http://www.gnome-db.org/
-IUSE=berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala elibc_FreeBSD java +python_targets_python2_7 +python_single_target_python2_7
+IUSE=berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala elibc_FreeBSD java +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:= ) reports? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:0= ) >=dev-db/sqlite-3.10.2:3= vala? ( dev-libs/libgee:0.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=reports? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( introspection )
+REQUIRED_USE=reports? ( ^^ ( python_single_target_python2_7 ) ) canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( introspection )
 RESTRICT=test firebird? ( bindist )
 SLOT=5/4
 SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.8.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ecd0c91a2dfe420a9f95741b31187dfa
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 3228d4bd6124..c1f2d03cbed2 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fd4d2c726b9f861b5a09ef7c4f78a19f
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index 0e92bddfcb25..b24cc0337fd3 100644
--- a/metadata/md5-cache/gnustep-apps/Manifest.gz
+++ b/metadata/md5-cache/gnustep-apps/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-apps/sogo-4.1.1 b/metadata/md5-cache/gnustep-apps/sogo-4.1.1
index cd0029309fc0..b2ece9c7dd9b 100644
--- a/metadata/md5-cache/gnustep-apps/sogo-4.1.1
+++ b/metadata/md5-cache/gnustep-apps/sogo-4.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-4.1.1[ldap] activesync? ( dev-libs/libwbxml ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 SLOT=0
 SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-4.1.1.tar.gz -> sogo-4.1.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnustep-2	ee5949e86bfb23d662a64e952ecbb07a	gnustep-base	49f1b9591be3a4bf8eeb1f3a07605a2a	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=7ad26e1210b3156a7d40441a86bfc7de
diff --git a/metadata/md5-cache/gnustep-base/Manifest.gz b/metadata/md5-cache/gnustep-base/Manifest.gz
index 85c6691fc954..2aa00ae2935f 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/gnustep-updater-0.3 b/metadata/md5-cache/gnustep-base/gnustep-updater-0.3
deleted file mode 100644
index 30e107f33abf..000000000000
--- a/metadata/md5-cache/gnustep-base/gnustep-updater-0.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-shells/bash
-DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
-EAPI=4
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:GNUstep
-KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.3.tar.bz2
-_md5_=501fdd768ef9403ad1b22ab45981c9c8
diff --git a/metadata/md5-cache/gnustep-base/gnustep-updater-0.3-r1 b/metadata/md5-cache/gnustep-base/gnustep-updater-0.3-r1
index 8533cf5f022f..7e0781201f66 100644
--- a/metadata/md5-cache/gnustep-base/gnustep-updater-0.3-r1
+++ b/metadata/md5-cache/gnustep-base/gnustep-updater-0.3-r1
@@ -3,9 +3,9 @@ DEPEND=app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
 DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:GNUstep
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.3.tar.bz2
-_md5_=6fe09e5c5ab413e394e1773bede5ab91
+_md5_=547398a099bb2dda72d975bf8ca9b968
diff --git a/metadata/md5-cache/java-virtuals/Manifest.gz b/metadata/md5-cache/java-virtuals/Manifest.gz
index 3cec8a2b39c2..d440ffd484e5 100644
--- a/metadata/md5-cache/java-virtuals/Manifest.gz
+++ b/metadata/md5-cache/java-virtuals/Manifest.gz
diff --git a/metadata/md5-cache/java-virtuals/ejb-api-0 b/metadata/md5-cache/java-virtuals/ejb-api-0
index 0156e40da5e2..ec4138f9e139 100644
--- a/metadata/md5-cache/java-virtuals/ejb-api-0
+++ b/metadata/md5-cache/java-virtuals/ejb-api-0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for Enterprise JavaBeans API (javax.ejb)
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-ejb-api:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=f91203c03770dc6c8b45ea5a444ad2b0
+_md5_=f28adc6698c59c291193f7c3a17c58a9
diff --git a/metadata/md5-cache/java-virtuals/interceptor-api-0 b/metadata/md5-cache/java-virtuals/interceptor-api-0
index 33e590c29fe6..2d2db89d962f 100644
--- a/metadata/md5-cache/java-virtuals/interceptor-api-0
+++ b/metadata/md5-cache/java-virtuals/interceptor-api-0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for Interceptor API (javax.interceptor)
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-interceptor-api:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=de0a400c3bcaebb5e6d255bedc1710d6
+_md5_=7d866d31c3cbc4dc9673122fc81b7085
diff --git a/metadata/md5-cache/java-virtuals/jms-1.1 b/metadata/md5-cache/java-virtuals/jms-1.1
index 1818655bd4fa..7deace33f8c0 100644
--- a/metadata/md5-cache/java-virtuals/jms-1.1
+++ b/metadata/md5-cache/java-virtuals/jms-1.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for Java Message Service (JMS) API
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/glassfish-jms-api:0 dev-java/sun-jms:0 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5de8fed856b3fd36d193f2a07313a399
+_md5_=a0fc57d8bf14b2c6f313e638bbccab2b
diff --git a/metadata/md5-cache/java-virtuals/jmx-1.0-r4 b/metadata/md5-cache/java-virtuals/jmx-1.0-r4
index 56b1f2ff8d80..8ae666821819 100644
--- a/metadata/md5-cache/java-virtuals/jmx-1.0-r4
+++ b/metadata/md5-cache/java-virtuals/jmx-1.0-r4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for Java Management Extensions (JMX)
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=public-domain
 RDEPEND=|| ( virtual/jre:1.8 virtual/jre:1.7 virtual/jre:1.6 virtual/jre:1.5 dev-java/sun-jmx:0 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8af53e24ca45b372d3686ea9affe2000
+_md5_=b4b996d2a2203c429bb7fd58c82e0d92
diff --git a/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3 b/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
index 2576418d586f..482aa5bdb75e 100644
--- a/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
+++ b/metadata/md5-cache/java-virtuals/saaj-api-1.3-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for SAAJ 1.3 (AKA JSR-67 MR3) API
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr67:0 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=632495b4ef52d861178654a49c30cf7f
+_md5_=f668a956cb4d1938d9e9d76550116f7f
diff --git a/metadata/md5-cache/java-virtuals/script-api-1.0-r1 b/metadata/md5-cache/java-virtuals/script-api-1.0-r1
index bad5cecd3968..ef0d8b744a2c 100644
--- a/metadata/md5-cache/java-virtuals/script-api-1.0-r1
+++ b/metadata/md5-cache/java-virtuals/script-api-1.0-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for Java Scripting API (jsr223)
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr223:0 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=7e756f8878d1dcf673d30af310f59a28
+_md5_=a14da7feb4004b18d341619a46903bc0
diff --git a/metadata/md5-cache/java-virtuals/stax-api-1-r4 b/metadata/md5-cache/java-virtuals/stax-api-1-r4
index fd12fb780c73..a35ac1e99801 100644
--- a/metadata/md5-cache/java-virtuals/stax-api-1-r4
+++ b/metadata/md5-cache/java-virtuals/stax-api-1-r4
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for Streaming API for XML (StAX)
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr173 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ad0585a22e1e97579596a122129a82fe
+_md5_=110997cb61541dcca99c201ec89e00cc
diff --git a/metadata/md5-cache/java-virtuals/transaction-api-1.1 b/metadata/md5-cache/java-virtuals/transaction-api-1.1
index 5f38b3779461..4ee775fe8d82 100644
--- a/metadata/md5-cache/java-virtuals/transaction-api-1.1
+++ b/metadata/md5-cache/java-virtuals/transaction-api-1.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for Transaction API (javax.transaction)
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 ppc64 x86
 LICENSE=public-domain
 RDEPEND=|| ( dev-java/glassfish-transaction-api:0 dev-java/jta:0 ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=20f204bd89b50b692b952913d1fe6200
+_md5_=a1c361e898ff389314eeefb4746ed0eb
diff --git a/metadata/md5-cache/java-virtuals/xmlrpc-api-0 b/metadata/md5-cache/java-virtuals/xmlrpc-api-0
index 65c0be457980..f150138775ba 100644
--- a/metadata/md5-cache/java-virtuals/xmlrpc-api-0
+++ b/metadata/md5-cache/java-virtuals/xmlrpc-api-0
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=>=dev-java/java-config-2.2.0-r3
 DESCRIPTION=Virtual for XML RPC API (javax.xml.rpc)
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=dev-java/glassfish-xmlrpc-api:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=973746f5812601fa3a7226e1302494db
+_md5_=9ca0273d9a8258da1b83d1ce80d3df40
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index bdcc7b7cd14c..1820e75d91fe 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-19.12.1 b/metadata/md5-cache/kde-apps/akonadi-19.12.1
deleted file mode 100644
index 787f3b07c855..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-19.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.12.1:5 net-libs/accounts-qt ) sqlite? ( >=dev-qt/qtsql-5.12.3:5=[sqlite] dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Storage service for PIM data and libraries for PIM apps
-EAPI=7
-HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
-IUSE=+kaccounts +mysql postgres sqlite tools xml test debug designer test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.12.1:5 net-libs/accounts-qt ) sqlite? ( >=dev-qt/qtsql-5.12.3:5=[sqlite] dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a16b430ceb7225f209ac6d9be7deecd
diff --git a/metadata/md5-cache/kde-apps/akonadi-19.12.2 b/metadata/md5-cache/kde-apps/akonadi-19.12.2
new file mode 100644
index 000000000000..5c129ee214d6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-19.12.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.12.2:5 net-libs/accounts-qt ) sqlite? ( >=dev-qt/qtsql-5.12.3:5=[sqlite] dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) dev-libs/boost dev-libs/libxslt test? ( sys-apps/dbus ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Storage service for PIM data and libraries for PIM apps
+EAPI=7
+HOMEPAGE=https://community.kde.org/KDE_PIM/akonadi
+IUSE=+kaccounts +mysql postgres sqlite tools xml test debug designer test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?,postgres?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 kaccounts? ( >=kde-apps/kaccounts-integration-19.12.2:5 net-libs/accounts-qt ) sqlite? ( >=dev-qt/qtsql-5.12.3:5=[sqlite] dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) !<kde-apps/kapptemplate-17.11.80 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6da438a1fae6587c7c92106ed83f59f0
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-19.12.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-19.12.1
deleted file mode 100644
index 10a0972c5b93..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi calendar integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-calendar-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cf8f8f45786619b407e8d88b80698b6
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-19.12.2 b/metadata/md5-cache/kde-apps/akonadi-calendar-19.12.2
new file mode 100644
index 000000000000..266ed1ca43cd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for akonadi calendar integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !<kde-apps/kdepim-runtime-18.03.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-calendar-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34faae486d393d0f9bf8857ac20919f7
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-19.12.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-19.12.1
deleted file mode 100644
index 62feb398b2a2..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi contact integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-contacts-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=721f1a21d6ccf9c4e3b950ae63f892c7
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-19.12.2 b/metadata/md5-cache/kde-apps/akonadi-contacts-19.12.2
new file mode 100644
index 000000000000..f7bc5887b58e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for akonadi contact integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !<kde-apps/kdepim-runtime-18.03.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-contacts-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f35e0a2dc297e8d76782bfaf4a6ed9e8
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.12.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.12.1
deleted file mode 100644
index 05f7af1630a1..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/mailimporter-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/Kmail/Import_Options
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/mailimporter-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-import-wizard-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b6c4532d2881dcd7365801dbef82463b
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.12.2 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.12.2
new file mode 100644
index 000000000000..114d932524b6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/mailimporter-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Assistant to import PIM data from other applications into Akonadi
+EAPI=7
+HOMEPAGE=https://kde.org/ https://userbase.kde.org/Kmail/Import_Options
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/mailimporter-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-import-wizard-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dee93bddb91e324bf7ade70d8d57cc90
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-19.12.1 b/metadata/md5-cache/kde-apps/akonadi-mime-19.12.1
deleted file mode 100644
index 7b12914c1ccc..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-mime-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libxslt dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi mime types
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libxslt !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 !kde-apps/kdepimlibs:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-mime-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f68731342c66eb749b07e6b6a7309914
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-19.12.2 b/metadata/md5-cache/kde-apps/akonadi-mime-19.12.2
new file mode 100644
index 000000000000..bfd65c8933c3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libxslt dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for akonadi mime types
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libxslt !<kde-apps/kdepim-runtime-18.03.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-mime-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d495c753b63f6daaddb8e8664046ab4
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-19.12.1 b/metadata/md5-cache/kde-apps/akonadi-notes-19.12.1
deleted file mode 100644
index bfd593f5fb43..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-notes-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for akonadi notes integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-notes-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71eacdc38f885eef3ab08f806cb6eb24
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-19.12.2 b/metadata/md5-cache/kde-apps/akonadi-notes-19.12.2
new file mode 100644
index 000000000000..de2e2dea0ccf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/kmime-19.12.2:5 >=kde-frameworks/ki18n-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for akonadi notes integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/kmime-19.12.2:5 >=kde-frameworks/ki18n-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-notes-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=debc8ea9a77cf1d127b1d00e161673e8
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-19.12.1 b/metadata/md5-cache/kde-apps/akonadi-search-19.12.1
deleted file mode 100644
index 90a3a055e833..000000000000
--- a/metadata/md5-cache/kde-apps/akonadi-search-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-apps/akonadi-19.12.1:5[tools] ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/xapian-1.3:=[chert(+)] dev-libs/boost test? ( >=kde-apps/akonadi-19.12.1:5[mysql,postgres,sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries and daemons to implement searching in Akonadi
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/akonadi-search.git
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/xapian-1.3:=[chert(+)] !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-search-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c715e24a20a1958e520ca19bff4c6bf1
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-19.12.2 b/metadata/md5-cache/kde-apps/akonadi-search-19.12.2
new file mode 100644
index 000000000000..2587c37953a5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadi-search-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-apps/akonadi-19.12.2:5[tools] ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 dev-libs/boost test? ( >=kde-apps/akonadi-19.12.2:5[mysql,postgres,sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Libraries and daemons to implement searching in Akonadi
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/akonadi-search.git
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/xapian-1.3:=[chert(+)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-search-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4126606166d61630392dba9ed7f8ab7
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-19.12.1 b/metadata/md5-cache/kde-apps/akonadiconsole-19.12.1
deleted file mode 100644
index 1a14957addd2..000000000000
--- a/metadata/md5-cache/kde-apps/akonadiconsole-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/xapian:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application for debugging Akonadi Resources
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/xapian:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadiconsole-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d33e98bcc4d27d9541cc399def576ad
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-19.12.2 b/metadata/md5-cache/kde-apps/akonadiconsole-19.12.2
new file mode 100644
index 000000000000..719a776ae341
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/xapian:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Application for debugging Akonadi Resources
+EAPI=7
+HOMEPAGE=https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/xapian:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadiconsole-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6d33e98bcc4d27d9541cc399def576ad
diff --git a/metadata/md5-cache/kde-apps/akregator-19.12.1 b/metadata/md5-cache/kde-apps/akregator-19.12.1
deleted file mode 100644
index e46047d1d5b3..000000000000
--- a/metadata/md5-cache/kde-apps/akregator-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syndication-5.63.0:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=News feed aggregator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.akregator
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syndication-5.63.0:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akregator-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36d1db28c758f2e28d28011959ac201d
diff --git a/metadata/md5-cache/kde-apps/akregator-19.12.2 b/metadata/md5-cache/kde-apps/akregator-19.12.2
new file mode 100644
index 000000000000..1641abcb44a8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/akregator-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syndication-5.63.0:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=News feed aggregator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.akregator
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syndication-5.63.0:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akregator-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b31c471372033268598cd10724f7a68c
diff --git a/metadata/md5-cache/kde-apps/analitza-19.12.1 b/metadata/md5-cache/kde-apps/analitza-19.12.1
deleted file mode 100644
index 6001adfe6a75..000000000000
--- a/metadata/md5-cache/kde-apps/analitza-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 eigen? ( dev-cpp/eigen:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library for mathematical features
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=eigen nls test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 eigen? ( dev-cpp/eigen:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/analitza-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afa836cf93acc2a66e695fcf9b230a1c
diff --git a/metadata/md5-cache/kde-apps/analitza-19.12.2 b/metadata/md5-cache/kde-apps/analitza-19.12.2
new file mode 100644
index 000000000000..4e2f9137c737
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/analitza-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 eigen? ( dev-cpp/eigen:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE library for mathematical features
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=eigen nls test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 eigen? ( dev-cpp/eigen:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/analitza-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=afa836cf93acc2a66e695fcf9b230a1c
diff --git a/metadata/md5-cache/kde-apps/ark-19.12.1 b/metadata/md5-cache/kde-apps/ark-19.12.1
deleted file mode 100644
index e610d5776ef6..000000000000
--- a/metadata/md5-cache/kde-apps/ark-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Archiving tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.ark https://utils.kde.org/projects/ark/
-IUSE=bzip2 lzma zip test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ark-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c8ae5fae8a2dedbf84e06ce142f0755
diff --git a/metadata/md5-cache/kde-apps/ark-19.12.2 b/metadata/md5-cache/kde-apps/ark-19.12.2
new file mode 100644
index 000000000000..903f624443ce
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ark-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Archiving tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.ark https://utils.kde.org/projects/ark/
+IUSE=bzip2 lzma zip test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-arch/libarchive:=[bzip2?,lzma?,zlib] sys-libs/zlib zip? ( >=dev-libs/libzip-1.2.0:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ark-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1c8ae5fae8a2dedbf84e06ce142f0755
diff --git a/metadata/md5-cache/kde-apps/artikulate-19.12.1 b/metadata/md5-cache/kde-apps/artikulate-19.12.1
deleted file mode 100644
index 6f74528d3bd7..000000000000
--- a/metadata/md5-cache/kde-apps/artikulate-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Language learning application that helps improving pronunciation skills
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.artikulate
-IUSE=+gstreamer qtmedia debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( gstreamer qtmedia )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/artikulate-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c67151761bcfc0273ac54b1e1f099a0
diff --git a/metadata/md5-cache/kde-apps/artikulate-19.12.2 b/metadata/md5-cache/kde-apps/artikulate-19.12.2
new file mode 100644
index 000000000000..7e8948c42b4d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/artikulate-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Language learning application that helps improving pronunciation skills
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.artikulate
+IUSE=+gstreamer qtmedia debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] ) qtmedia? ( >=dev-qt/qtmultimedia-5.12.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=|| ( gstreamer qtmedia )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/artikulate-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c67151761bcfc0273ac54b1e1f099a0
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-19.12.1 b/metadata/md5-cache/kde-apps/audiocd-kio-19.12.1
deleted file mode 100644
index 21e06cb31cab..000000000000
--- a/metadata/md5-cache/kde-apps/audiocd-kio-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/libkcddb-19.12.1:5 >=kde-apps/libkcompactdisc-19.12.1:5 >=dev-qt/qtwidgets-5.12.3:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=kioslave for accessing audio CDs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=flac vorbis debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/libkcddb-19.12.1:5 >=kde-apps/libkcompactdisc-19.12.1:5 >=dev-qt/qtwidgets-5.12.3:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/audiocd-kio-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8b3333bf830da6d8667875dde72ab407
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-19.12.2 b/metadata/md5-cache/kde-apps/audiocd-kio-19.12.2
new file mode 100644
index 000000000000..4a75364d1ac5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/libkcddb-19.12.2:5 >=kde-apps/libkcompactdisc-19.12.2:5 >=dev-qt/qtwidgets-5.12.3:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=kioslave for accessing audio CDs
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=flac vorbis debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/libkcddb-19.12.2:5 >=kde-apps/libkcompactdisc-19.12.2:5 >=dev-qt/qtwidgets-5.12.3:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/audiocd-kio-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b3333bf830da6d8667875dde72ab407
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-19.12.1 b/metadata/md5-cache/kde-apps/baloo-widgets-19.12.1
deleted file mode 100644
index 6cdbc770b8dd..000000000000
--- a/metadata/md5-cache/kde-apps/baloo-widgets-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Widget library for baloo
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/baloo-widgets-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb472828640cc1064839f5e81e005019
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-19.12.2 b/metadata/md5-cache/kde-apps/baloo-widgets-19.12.2
new file mode 100644
index 000000000000..df69b27abd25
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Widget library for baloo
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/baloo-widgets-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb472828640cc1064839f5e81e005019
diff --git a/metadata/md5-cache/kde-apps/blinken-19.12.1 b/metadata/md5-cache/kde-apps/blinken-19.12.1
deleted file mode 100644
index ce1bd41ca91f..000000000000
--- a/metadata/md5-cache/kde-apps/blinken-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Memory enhancement game based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.blinken https://edu.kde.org/blinken/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/blinken-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc37976be2f01a15b871c65f8b4e1412
diff --git a/metadata/md5-cache/kde-apps/blinken-19.12.2 b/metadata/md5-cache/kde-apps/blinken-19.12.2
new file mode 100644
index 000000000000..ece30735fb41
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/blinken-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Memory enhancement game based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.blinken https://edu.kde.org/blinken/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/blinken-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc37976be2f01a15b871c65f8b4e1412
diff --git a/metadata/md5-cache/kde-apps/bomber-19.12.1 b/metadata/md5-cache/kde-apps/bomber-19.12.1
deleted file mode 100644
index f262a8d82c23..000000000000
--- a/metadata/md5-cache/kde-apps/bomber-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Single player arcade bombing game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.bomber
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !games-action/xbomber || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/bomber-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba3c9d7c1e5a5a3b35d643fae5f682f9
diff --git a/metadata/md5-cache/kde-apps/bomber-19.12.2 b/metadata/md5-cache/kde-apps/bomber-19.12.2
new file mode 100644
index 000000000000..ff46f0cd0b7a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bomber-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Single player arcade bombing game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.bomber
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !games-action/xbomber || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/bomber-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba3c9d7c1e5a5a3b35d643fae5f682f9
diff --git a/metadata/md5-cache/kde-apps/bovo-19.12.1 b/metadata/md5-cache/kde-apps/bovo-19.12.1
deleted file mode 100644
index 83ead3388c58..000000000000
--- a/metadata/md5-cache/kde-apps/bovo-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Five-in-a-row Board Game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.bovo
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/bovo-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f87efd9f7c0d7d1b0bf3358d45b8ece
diff --git a/metadata/md5-cache/kde-apps/bovo-19.12.2 b/metadata/md5-cache/kde-apps/bovo-19.12.2
new file mode 100644
index 000000000000..04a1c29f92a3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/bovo-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Five-in-a-row Board Game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.bovo
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/bovo-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f87efd9f7c0d7d1b0bf3358d45b8ece
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-19.12.1 b/metadata/md5-cache/kde-apps/calendarjanitor-19.12.1
deleted file mode 100644
index 19e9864a207e..000000000000
--- a/metadata/md5-cache/kde-apps/calendarjanitor-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tool to scan calendar data for buggy instances
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-calendar-tools-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=484402a498ec8860d5b622f1e65532e1
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-19.12.2 b/metadata/md5-cache/kde-apps/calendarjanitor-19.12.2
new file mode 100644
index 000000000000..dd7e73ffedee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Tool to scan calendar data for buggy instances
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-calendar-tools-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f312c7913b6aeed7cb9bed4e8ce114d4
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-19.12.1 b/metadata/md5-cache/kde-apps/calendarsupport-19.12.1
deleted file mode 100644
index f2268767bbc6..000000000000
--- a/metadata/md5-cache/kde-apps/calendarsupport-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libical dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Calendar support library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libical !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/calendarsupport-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=706e4f841fe5b2ec94414a65ef371243
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-19.12.2 b/metadata/md5-cache/kde-apps/calendarsupport-19.12.2
new file mode 100644
index 000000000000..9ab21ac42543
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/calendarsupport-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libical dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Calendar support library
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libical || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/calendarsupport-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5390569f0b674c3205272b5809af6624
diff --git a/metadata/md5-cache/kde-apps/cantor-19.08.3 b/metadata/md5-cache/kde-apps/cantor-19.08.3
index de25b732f3bc..4bdf5014deca 100644
--- a/metadata/md5-cache/kde-apps/cantor-19.08.3
+++ b/metadata/md5-cache/kde-apps/cantor-19.08.3
@@ -4,13 +4,13 @@ DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5
 DESCRIPTION=Interface for doing mathematics and scientific computing
 EAPI=7
 HOMEPAGE=https://kde.org/applications/education/cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua markdown postscript python qalculate R debug +handbook test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+analitza julia lua markdown postscript python qalculate R debug +handbook test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/syntax-highlighting-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 analitza? ( >=kde-apps/analitza-19.08.3:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) markdown? ( >=app-text/discount-2.2.2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtdbus-5.12.3:5 ) R? ( dev-lang/R ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/19.08.3/src/cantor-19.08.3.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0deb107f71a531263584b9999e75c460
diff --git a/metadata/md5-cache/kde-apps/cantor-19.12.1 b/metadata/md5-cache/kde-apps/cantor-19.12.1
deleted file mode 100644
index 5a4d7e9f8546..000000000000
--- a/metadata/md5-cache/kde-apps/cantor-19.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/make dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 analitza? ( >=kde-apps/analitza-19.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/qtdbus-5.12.3:5 ) R? ( dev-lang/R ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interface for doing mathematics and scientific computing
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.cantor https://edu.kde.org/cantor/
-IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 analitza? ( >=kde-apps/analitza-19.12.1:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/qtdbus-5.12.3:5 ) R? ( dev-lang/R ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/cantor-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f4f1243e90bd63c513271e68c260106b
diff --git a/metadata/md5-cache/kde-apps/cantor-19.12.2 b/metadata/md5-cache/kde-apps/cantor-19.12.2
new file mode 100644
index 000000000000..f1ee860bfae1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cantor-19.12.2
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/make dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 analitza? ( >=kde-apps/analitza-19.12.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/qtdbus-5.12.3:5 ) R? ( dev-lang/R ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Interface for doing mathematics and scientific computing
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.cantor https://edu.kde.org/cantor/
+IUSE=+analitza julia lua postscript python qalculate R debug +handbook test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 analitza? ( >=kde-apps/analitza-19.12.2:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/qtdbus-5.12.3:5 ) R? ( dev-lang/R ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/cantor-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4f1243e90bd63c513271e68c260106b
diff --git a/metadata/md5-cache/kde-apps/cervisia-19.12.1 b/metadata/md5-cache/kde-apps/cervisia-19.12.1
deleted file mode 100644
index f3ff658c3edb..000000000000
--- a/metadata/md5-cache/kde-apps/cervisia-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdesu-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=CVS frontend by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.cervisia
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdesu-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-vcs/cvs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/cervisia-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb5288cc6b3c0be760167e1df3a9c8db
diff --git a/metadata/md5-cache/kde-apps/cervisia-19.12.2 b/metadata/md5-cache/kde-apps/cervisia-19.12.2
new file mode 100644
index 000000000000..1bb75d657d06
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/cervisia-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdesu-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=CVS frontend by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.cervisia
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdesu-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-vcs/cvs || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/cervisia-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb5288cc6b3c0be760167e1df3a9c8db
diff --git a/metadata/md5-cache/kde-apps/dolphin-19.12.1 b/metadata/md5-cache/kde-apps/dolphin-19.12.1
deleted file mode 100644
index 4103b8d6ef27..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-apps/baloo-widgets-19.12.1:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma filemanager focusing on usability
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin https://userbase.kde.org/Dolphin
-IUSE=activities semantic-desktop test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-apps/baloo-widgets-19.12.1:5 ) >=kde-apps/kio-extras-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/dolphin-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17cef7b065e1cb758b66d7721d601e40
diff --git a/metadata/md5-cache/kde-apps/dolphin-19.12.2 b/metadata/md5-cache/kde-apps/dolphin-19.12.2
new file mode 100644
index 000000000000..2f3ebe1a5f2b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-apps/baloo-widgets-19.12.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma filemanager focusing on usability
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin https://userbase.kde.org/Dolphin
+IUSE=activities semantic-desktop test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-apps/baloo-widgets-19.12.2:5 ) >=kde-apps/kio-extras-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/dolphin-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=17cef7b065e1cb758b66d7721d601e40
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.12.1
deleted file mode 100644
index b71c85a0f290..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Bazaar integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/bzr || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8455c09106f9fb0cd89e8745e09414b6
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.12.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.12.2
new file mode 100644
index 000000000000..deee1d0d9fbe
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-bazaar-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Bazaar integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/bzr || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/dolphin-plugins-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8455c09106f9fb0cd89e8745e09414b6
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.12.1
deleted file mode 100644
index 253cbd032c13..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Dropbox service integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 net-misc/dropbox-cli || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81a3894a27fce9fc547bcc13f2616563
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.12.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.12.2
new file mode 100644
index 000000000000..26a888a7cf55
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-dropbox-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Dropbox service integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 net-misc/dropbox-cli || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/dolphin-plugins-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=81a3894a27fce9fc547bcc13f2616563
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.12.1
deleted file mode 100644
index 0aaa930c15a3..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Git integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/git || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc872a4a35a57caf9d193b6215b593a7
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.12.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.12.2
new file mode 100644
index 000000000000..76230ddf6ea5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-git-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Git integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/git || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/dolphin-plugins-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc872a4a35a57caf9d193b6215b593a7
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.12.1
deleted file mode 100644
index ef3066b82482..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Mercurial integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/mercurial || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37e4b9a6c33624a83841fac7391eca13
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.12.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.12.2
new file mode 100644
index 000000000000..c1cc52cb0ee0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-mercurial-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Mercurial integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 dev-vcs/mercurial || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/dolphin-plugins-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=37e4b9a6c33624a83841fac7391eca13
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.12.1
deleted file mode 100644
index 4ac84752d9af..000000000000
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Dolphin plugin for Subversion integration
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 >=kde-apps/kompare-19.12.1:5 dev-vcs/subversion || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97d00c7deab24e95b1e33b6760d2fd8b
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.12.2 b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.12.2
new file mode 100644
index 000000000000..a6f1978921c9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-subversion-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Dolphin plugin for Subversion integration
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.dolphin_plugins
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-apps/dolphin-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/dolphin-plugins:5 >=kde-apps/kompare-19.12.2:5 dev-vcs/subversion || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/dolphin-plugins-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97d00c7deab24e95b1e33b6760d2fd8b
diff --git a/metadata/md5-cache/kde-apps/dragon-19.12.1 b/metadata/md5-cache/kde-apps/dragon-19.12.1
deleted file mode 100644
index bec75e63745f..000000000000
--- a/metadata/md5-cache/kde-apps/dragon-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple video player
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.dragonplayer
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/dragon-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d38830796e2a62ef65d12da1d35ac689
diff --git a/metadata/md5-cache/kde-apps/dragon-19.12.2 b/metadata/md5-cache/kde-apps/dragon-19.12.2
new file mode 100644
index 000000000000..5c8444e7e834
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/dragon-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple video player
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.dragonplayer
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/dragon-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d38830796e2a62ef65d12da1d35ac689
diff --git a/metadata/md5-cache/kde-apps/eventviews-19.12.1 b/metadata/md5-cache/kde-apps/eventviews-19.12.1
deleted file mode 100644
index 644c95cc5e51..000000000000
--- a/metadata/md5-cache/kde-apps/eventviews-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 dev-libs/libical dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Calendar viewer for KDE PIM
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/eventviews-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4b6d443d4a135060aa2242ad37d402c
diff --git a/metadata/md5-cache/kde-apps/eventviews-19.12.2 b/metadata/md5-cache/kde-apps/eventviews-19.12.2
new file mode 100644
index 000000000000..f8440e5e9f9d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/eventviews-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 dev-libs/libical dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Calendar viewer for KDE PIM
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 dev-libs/libical || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/eventviews-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e9c0717202a803154ea39396bf786e5e
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-19.12.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-19.12.1
deleted file mode 100644
index a1b52a325a01..000000000000
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=FFmpeg based thumbnail generator for video files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=libav debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ffmpegthumbs-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c7f83a1f97e9bb60e661da56f1e2454
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-19.12.2 b/metadata/md5-cache/kde-apps/ffmpegthumbs-19.12.2
new file mode 100644
index 000000000000..9c709021d797
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=FFmpeg based thumbnail generator for video files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=libav debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ffmpegthumbs-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c7f83a1f97e9bb60e661da56f1e2454
diff --git a/metadata/md5-cache/kde-apps/filelight-19.12.1 b/metadata/md5-cache/kde-apps/filelight-19.12.1
deleted file mode 100644
index c1cda707f8b9..000000000000
--- a/metadata/md5-cache/kde-apps/filelight-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.filelight https://utils.kde.org/projects/filelight/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/filelight-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=590a1fb6685669e11a1fe542c7978761
diff --git a/metadata/md5-cache/kde-apps/filelight-19.12.2 b/metadata/md5-cache/kde-apps/filelight-19.12.2
new file mode 100644
index 000000000000..05c41a9de7e8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/filelight-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Visualise disk usage with interactive map of concentric, segmented rings
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.filelight https://utils.kde.org/projects/filelight/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/filelight-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=590a1fb6685669e11a1fe542c7978761
diff --git a/metadata/md5-cache/kde-apps/granatier-19.12.1 b/metadata/md5-cache/kde-apps/granatier-19.12.1
deleted file mode 100644
index a5130c9f6b23..000000000000
--- a/metadata/md5-cache/kde-apps/granatier-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Bomberman game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.granatier
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/granatier-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9148ab234ce93b381c721a4c6ea89491
diff --git a/metadata/md5-cache/kde-apps/granatier-19.12.2 b/metadata/md5-cache/kde-apps/granatier-19.12.2
new file mode 100644
index 000000000000..555e7b788348
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/granatier-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Bomberman game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.granatier
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/granatier-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9148ab234ce93b381c721a4c6ea89491
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-19.12.1 b/metadata/md5-cache/kde-apps/grantlee-editor-19.12.1
deleted file mode 100644
index 9ed25889f2e7..000000000000
--- a/metadata/md5-cache/kde-apps/grantlee-editor-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/grantlee-editor-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53ca902cb788edcb93c1706954cd74c8
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-19.12.2 b/metadata/md5-cache/kde-apps/grantlee-editor-19.12.2
new file mode 100644
index 000000000000..64f7c2dd398c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Utilities and tools to manage themes in KDE PIM applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/grantlee-editor-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b06211e058aa192a9ec3778e141c47c
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-19.12.1 b/metadata/md5-cache/kde-apps/grantleetheme-19.12.1
deleted file mode 100644
index b97bd0f8d014..000000000000
--- a/metadata/md5-cache/kde-apps/grantleetheme-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for Grantlee plugins
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/grantleetheme-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=52055b0ced78c95131314be26417b761
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-19.12.2 b/metadata/md5-cache/kde-apps/grantleetheme-19.12.2
new file mode 100644
index 000000000000..617556264a3d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/grantleetheme-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/grantlee:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for Grantlee plugins
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/grantleetheme-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd5eb58daacb9cfad9a63a1848a00a4d
diff --git a/metadata/md5-cache/kde-apps/gwenview-19.12.1 b/metadata/md5-cache/kde-apps/gwenview-19.12.1
deleted file mode 100644
index 66366b4c5dc2..000000000000
--- a/metadata/md5-cache/kde-apps/gwenview-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-19.12.1:5= ) mpris? ( >=dev-qt/qtdbus-5.12.3:5 ) raw? ( >=kde-apps/libkdcraw-19.12.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Image viewer by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.gwenview https://userbase.kde.org/Gwenview
-IUSE=activities fits kipi +mpris raw semantic-desktop share X debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-19.12.1:5= ) mpris? ( >=dev-qt/qtdbus-5.12.3:5 ) raw? ( >=kde-apps/libkdcraw-19.12.1:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.63.0:5 >=dev-qt/qtimageformats-5.12.3:5 kipi? ( >=kde-apps/kipi-plugins-19.12.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/gwenview-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f034c554ecca31725f589670d7745ef3
diff --git a/metadata/md5-cache/kde-apps/gwenview-19.12.2 b/metadata/md5-cache/kde-apps/gwenview-19.12.2
new file mode 100644
index 000000000000..a7c2b2cedc77
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/gwenview-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-19.12.2:5= ) mpris? ( >=dev-qt/qtdbus-5.12.3:5 ) raw? ( >=kde-apps/libkdcraw-19.12.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Image viewer by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/org.kde.gwenview https://userbase.kde.org/Gwenview
+IUSE=activities fits kipi +mpris raw semantic-desktop share X debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/exiv2:= media-libs/lcms:2 media-libs/libpng:0= media-libs/phonon[qt5(+)] virtual/jpeg:0 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) fits? ( sci-libs/cfitsio ) kipi? ( >=kde-apps/libkipi-19.12.2:5= ) mpris? ( >=dev-qt/qtdbus-5.12.3:5 ) raw? ( >=kde-apps/libkdcraw-19.12.2:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kimageformats-5.63.0:5 >=dev-qt/qtimageformats-5.12.3:5 kipi? ( >=kde-apps/kipi-plugins-19.12.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/gwenview-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f034c554ecca31725f589670d7745ef3
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-19.12.1 b/metadata/md5-cache/kde-apps/incidenceeditor-19.12.1
deleted file mode 100644
index d81e7e48bbdb..000000000000
--- a/metadata/md5-cache/kde-apps/incidenceeditor-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/eventviews-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Incidence editor for korganizer
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/eventviews-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/incidenceeditor-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a5b1aed8e03518ff4660d403743e2da
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-19.12.2 b/metadata/md5-cache/kde-apps/incidenceeditor-19.12.2
new file mode 100644
index 000000000000..39592df4fde3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/eventviews-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Incidence editor for korganizer
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/eventviews-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/kdiagram:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/incidenceeditor-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c23a0638ab30bfb169a63ba771ec079
diff --git a/metadata/md5-cache/kde-apps/juk-19.12.1 b/metadata/md5-cache/kde-apps/juk-19.12.1
deleted file mode 100644
index 2b95b5033bff..000000000000
--- a/metadata/md5-cache/kde-apps/juk-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Jukebox and music manager by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.juk
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/juk-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=97dbf2f517594e3ab628fc95978587be
diff --git a/metadata/md5-cache/kde-apps/juk-19.12.2 b/metadata/md5-cache/kde-apps/juk-19.12.2
new file mode 100644
index 000000000000..9e4a021fa79b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/juk-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Jukebox and music manager by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.juk
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/juk-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97dbf2f517594e3ab628fc95978587be
diff --git a/metadata/md5-cache/kde-apps/k3b-19.12.1 b/metadata/md5-cache/kde-apps/k3b-19.12.1
deleted file mode 100644
index f05ff9dd1a90..000000000000
--- a/metadata/md5-cache/kde-apps/k3b-19.12.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5[taglib?] >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=kde-apps/libkcddb-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.k3b https://userbase.kde.org/K3b
-IUSE=dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5[taglib?] >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=kde-apps/libkcddb-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/k3b-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d136f0f39de00e41a091a353c358e6e
diff --git a/metadata/md5-cache/kde-apps/k3b-19.12.2 b/metadata/md5-cache/kde-apps/k3b-19.12.2
new file mode 100644
index 000000000000..6987d58f8420
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/k3b-19.12.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5[taglib?] >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=kde-apps/libkcddb-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Full-featured burning and ripping application based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.k3b https://userbase.kde.org/K3b
+IUSE=dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 FDL-1.2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5[taglib?] >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=kde-apps/libkcddb-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) app-cdr/cdrdao dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/k3b-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d136f0f39de00e41a091a353c358e6e
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-19.12.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-19.12.1
deleted file mode 100644
index 99bf62e90b54..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21:= net-libs/signond >=kde-frameworks/kcmutils-5.63.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21:= net-libs/signond dev-util/intltool || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kaccounts-integration-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9740ceff0e28d92ab9a01130f961dfd0
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-19.12.2 b/metadata/md5-cache/kde-apps/kaccounts-integration-19.12.2
new file mode 100644
index 000000000000..3a80841daaad
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21:= net-libs/signond >=kde-frameworks/kcmutils-5.63.0:5 >=kde-plasma/kde-cli-tools-5.16.5:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Administer web accounts for the sites and services across the Plasma desktop
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/accounts-qt >=net-libs/libaccounts-glib-1.21:= net-libs/signond dev-util/intltool || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kaccounts-integration-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9740ceff0e28d92ab9a01130f961dfd0
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-19.12.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-19.12.1
deleted file mode 100644
index ee04b989090b..000000000000
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kpackage-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE accounts providers
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kpackage-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/signon-ui net-libs/signon-oauth2 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kaccounts-providers-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=420a82bcfd4e8637ab15d062481bfe3d
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-19.12.2 b/metadata/md5-cache/kde-apps/kaccounts-providers-19.12.2
new file mode 100644
index 000000000000..df2584ef7edf
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kpackage-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE accounts providers
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kpackage-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/signon-ui net-libs/signon-oauth2 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kaccounts-providers-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=420a82bcfd4e8637ab15d062481bfe3d
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-19.12.1 b/metadata/md5-cache/kde-apps/kaddressbook-19.12.1
deleted file mode 100644
index 51d24b30f6a4..000000000000
--- a/metadata/md5-cache/kde-apps/kaddressbook-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/libgravatar-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book application based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kaddressbook
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/libgravatar-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kaddressbook-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a2a826ec87f7f35b011ac7dfa1a5afd
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-19.12.2 b/metadata/md5-cache/kde-apps/kaddressbook-19.12.2
new file mode 100644
index 000000000000..24b6e543eba0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kaddressbook-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/libgravatar-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Address book application based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kaddressbook
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/libgravatar-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/grantlee:5 >=kde-apps/kdepim-runtime-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kaddressbook-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6f8fca78abc2d2fa873ab6330fd820f
diff --git a/metadata/md5-cache/kde-apps/kajongg-19.08.3 b/metadata/md5-cache/kde-apps/kajongg-19.08.3
deleted file mode 100644
index cc2df602d398..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-19.08.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/libkdegames-19.08.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/kajongg/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 debug +handbook
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/libkdegames-19.08.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-apps/libkmahjongg-19.08.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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=5
-SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kajongg-19.08.3.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=983d15c3cb0d737fc72cbb710a8c9aeb
diff --git a/metadata/md5-cache/kde-apps/kajongg-19.08.3-r1 b/metadata/md5-cache/kde-apps/kajongg-19.08.3-r1
new file mode 100644
index 000000000000..02d50ffa49f4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-19.08.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/libkdegames-19.08.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-db/sqlite:3 python_single_target_python3_6? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_6(-)] >=dev-python/twisted-16.6.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_7(-)] >=dev-python/twisted-16.6.0[python_targets_python3_7(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Classical Mah Jongg for four players
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/kajongg/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 debug +handbook
+KEYWORDS=amd64 arm64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-apps/libkdegames-19.08.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-db/sqlite:3 python_single_target_python3_6? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_6(-)] >=dev-python/twisted-16.6.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_7(-)] >=dev-python/twisted-16.6.0[python_targets_python3_7(-)] ) >=kde-apps/libkmahjongg-19.08.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kajongg-19.08.3.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ee5d977f0e809a352c4eaa086186391c
diff --git a/metadata/md5-cache/kde-apps/kajongg-19.12.1 b/metadata/md5-cache/kde-apps/kajongg-19.12.1
deleted file mode 100644
index 3d727ec396bf..000000000000
--- a/metadata/md5-cache/kde-apps/kajongg-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classical Mah Jongg for four players
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kajongg
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-db/sqlite:3 dev-python/PyQt5[gui,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/twisted-16.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=kde-apps/libkmahjongg-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kajongg-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c8802df7baaafc02f88a4d341f3c49d
diff --git a/metadata/md5-cache/kde-apps/kajongg-19.12.2-r1 b/metadata/md5-cache/kde-apps/kajongg-19.12.2-r1
new file mode 100644
index 000000000000..84c7bfd41092
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kajongg-19.12.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-db/sqlite:3 python_single_target_python3_6? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_6(-)] >=dev-python/twisted-16.6.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_7(-)] >=dev-python/twisted-16.6.0[python_targets_python3_7(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Classical Mah Jongg for four players
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kajongg
+IUSE=python_single_target_python3_6 python_single_target_python3_7 debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-db/sqlite:3 python_single_target_python3_6? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_6(-)] >=dev-python/twisted-16.6.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[gui,svg,widgets,python_targets_python3_7(-)] >=dev-python/twisted-16.6.0[python_targets_python3_7(-)] ) >=kde-apps/libkmahjongg-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kajongg-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3972c4ed948774490aabde19ee9a46a7
diff --git a/metadata/md5-cache/kde-apps/kalarm-19.12.1 b/metadata/md5-cache/kde-apps/kalarm-19.12.1
deleted file mode 100644
index 7c3690f712c5..000000000000
--- a/metadata/md5-cache/kde-apps/kalarm-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kalarmcal-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kalarm https://userbase.kde.org/KAlarm
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kauth-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kalarmcal-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kalarm-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23dac51c682ff37c33f5aac1938fd03b
diff --git a/metadata/md5-cache/kde-apps/kalarm-19.12.2 b/metadata/md5-cache/kde-apps/kalarm-19.12.2
new file mode 100644
index 000000000000..5b6c1feaa73e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarm-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kalarmcal-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Application to manage alarms and other timer based alerts for the desktop
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kalarm https://userbase.kde.org/KAlarm
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kauth-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kalarmcal-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kalarm-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8bdad49646404c6797d5dd87707d06b9
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-19.12.1 b/metadata/md5-cache/kde-apps/kalarmcal-19.12.1
deleted file mode 100644
index 89093e36a886..000000000000
--- a/metadata/md5-cache/kde-apps/kalarmcal-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 test? ( >=dev-qt/qtdbus-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Client library to access and handling of KAlarm calendar data
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.03.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kalarmcal-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1e937b890170b33be6f45f87031cb1f
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-19.12.2 b/metadata/md5-cache/kde-apps/kalarmcal-19.12.2
new file mode 100644
index 000000000000..5ccac04c2171
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalarmcal-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 test? ( >=dev-qt/qtdbus-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Client library to access and handling of KAlarm calendar data
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 !<kde-apps/kdepim-runtime-18.03.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kalarmcal-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=38ba7b3bc8ed69f3610a7ede404ddf8c
diff --git a/metadata/md5-cache/kde-apps/kalgebra-19.12.1 b/metadata/md5-cache/kde-apps/kalgebra-19.12.1
deleted file mode 100644
index 665541d4bc17..000000000000
--- a/metadata/md5-cache/kde-apps/kalgebra-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/analitza-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 readline? ( sys-libs/readline:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=MathML-based 2D and 3D graph calculator by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kalgebra https://edu.kde.org/kalgebra/
-IUSE=readline debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/analitza-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.63.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kalgebra-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c29ed658409b60d6867c7405b7f252fc
diff --git a/metadata/md5-cache/kde-apps/kalgebra-19.12.2 b/metadata/md5-cache/kde-apps/kalgebra-19.12.2
new file mode 100644
index 000000000000..9c398b2107ee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalgebra-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/analitza-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 readline? ( sys-libs/readline:0= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=MathML-based 2D and 3D graph calculator by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kalgebra https://edu.kde.org/kalgebra/
+IUSE=readline debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/analitza-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.63.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kalgebra-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c29ed658409b60d6867c7405b7f252fc
diff --git a/metadata/md5-cache/kde-apps/kalzium-19.12.1 b/metadata/md5-cache/kde-apps/kalzium-19.12.1
deleted file mode 100644
index a7a4cc0b896e..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kunitconversion-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editor? ( >=kde-frameworks/knewstuff-5.63.0:5 >=dev-qt/qtopengl-5.12.3:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Periodic table of the elements
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kunitconversion-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editor? ( >=kde-frameworks/knewstuff-5.63.0:5 >=dev-qt/qtopengl-5.12.3:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kalzium-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ac55b252d0a3bad2743e752fb4db635
diff --git a/metadata/md5-cache/kde-apps/kalzium-19.12.2 b/metadata/md5-cache/kde-apps/kalzium-19.12.2
new file mode 100644
index 000000000000..e08aba4251fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kunitconversion-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editor? ( >=kde-frameworks/knewstuff-5.63.0:5 >=dev-qt/qtopengl-5.12.3:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Periodic table of the elements
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kalzium https://edu.kde.org/kalzium/
+IUSE=editor solver debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kunitconversion-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 editor? ( >=kde-frameworks/knewstuff-5.63.0:5 >=dev-qt/qtopengl-5.12.3:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs[qt5] ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kalzium-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ac55b252d0a3bad2743e752fb4db635
diff --git a/metadata/md5-cache/kde-apps/kamera-19.12.1 b/metadata/md5-cache/kde-apps/kamera-19.12.1
deleted file mode 100644
index 4a74c5c042f2..000000000000
--- a/metadata/md5-cache/kde-apps/kamera-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libgphoto2:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for gphoto2 cameras
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kamera
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libgphoto2:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kamera-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c21eec8a0d4b35e7414940264296d50
diff --git a/metadata/md5-cache/kde-apps/kamera-19.12.2 b/metadata/md5-cache/kde-apps/kamera-19.12.2
new file mode 100644
index 000000000000..ba472638fbb5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamera-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libgphoto2:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Plasma integration for gphoto2 cameras
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kamera
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libgphoto2:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kamera-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c21eec8a0d4b35e7414940264296d50
diff --git a/metadata/md5-cache/kde-apps/kamoso-19.12.1 b/metadata/md5-cache/kde-apps/kamoso-19.12.1
deleted file mode 100644
index a127d8380709..000000000000
--- a/metadata/md5-cache/kde-apps/kamoso-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/purpose-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to take pictures and videos from your webcam by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kamoso https://userbase.kde.org/Kamoso
-IUSE=test debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/purpose-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.63.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kamoso-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5462dfafd3e19a6edb866940ca643b9c
diff --git a/metadata/md5-cache/kde-apps/kamoso-19.12.2 b/metadata/md5-cache/kde-apps/kamoso-19.12.2
new file mode 100644
index 000000000000..c7ec43e2999b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kamoso-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/purpose-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Application to take pictures and videos from your webcam by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kamoso https://userbase.kde.org/Kamoso
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/purpose-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/gst-plugins-base:1.0 virtual/opengl >=kde-frameworks/kirigami-5.63.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-plugins/gst-plugins-jpeg:1.0 media-plugins/gst-plugins-libpng:1.0 media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kamoso-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5462dfafd3e19a6edb866940ca643b9c
diff --git a/metadata/md5-cache/kde-apps/kanagram-19.12.1 b/metadata/md5-cache/kde-apps/kanagram-19.12.1
deleted file mode 100644
index eceb09ccd26b..000000000000
--- a/metadata/md5-cache/kde-apps/kanagram-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game based on anagrams of words
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kanagram https://edu.kde.org/kanagram/
-IUSE=speech debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-apps/kdeedu-data-19.12.1:5 >=dev-qt/qtmultimedia-5.12.3:5[qml] >=dev-qt/qtquickcontrols-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kanagram-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2844f246145c823316b3b62c0632adaf
diff --git a/metadata/md5-cache/kde-apps/kanagram-19.12.2 b/metadata/md5-cache/kde-apps/kanagram-19.12.2
new file mode 100644
index 000000000000..6cfca48952d3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kanagram-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Game based on anagrams of words
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kanagram https://edu.kde.org/kanagram/
+IUSE=speech debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-apps/kdeedu-data-19.12.2:5 >=dev-qt/qtmultimedia-5.12.3:5[qml] >=dev-qt/qtquickcontrols-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kanagram-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2844f246145c823316b3b62c0632adaf
diff --git a/metadata/md5-cache/kde-apps/kapman-19.12.1 b/metadata/md5-cache/kde-apps/kapman-19.12.1
deleted file mode 100644
index bed948e35968..000000000000
--- a/metadata/md5-cache/kde-apps/kapman-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Pac-Man clone by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kapman
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kapman-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cd769a46932af87abb90c4aa2f7a5ca
diff --git a/metadata/md5-cache/kde-apps/kapman-19.12.2 b/metadata/md5-cache/kde-apps/kapman-19.12.2
new file mode 100644
index 000000000000..2e52dd5c66b7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapman-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Pac-Man clone by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kapman
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kapman-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0cd769a46932af87abb90c4aa2f7a5ca
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-19.12.1 b/metadata/md5-cache/kde-apps/kapptemplate-19.12.1
deleted file mode 100644
index 7e0ed2c8910d..000000000000
--- a/metadata/md5-cache/kde-apps/kapptemplate-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Shell script to create the necessary framework to develop KDE applications
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kapptemplate
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kapptemplate-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9aa9c12b125bec3709dd389c4056a43
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-19.12.2 b/metadata/md5-cache/kde-apps/kapptemplate-19.12.2
new file mode 100644
index 000000000000..99ec305624f1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kapptemplate-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Shell script to create the necessary framework to develop KDE applications
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kapptemplate
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kapptemplate-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e9aa9c12b125bec3709dd389c4056a43
diff --git a/metadata/md5-cache/kde-apps/kate-19.12.1 b/metadata/md5-cache/kde-apps/kate-19.12.1
deleted file mode 100644
index 4e9104d75b9e..000000000000
--- a/metadata/md5-cache/kde-apps/kate-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.63.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.63.0:5 ) plasma? ( >=kde-frameworks/plasma-5.63.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/threadweaver-5.63.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.63.0:5 ) sql? ( >=kde-frameworks/kwallet-5.63.0:5 >=dev-qt/qtsql-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Multi-document editor with network transparency, Plasma integration and more
-EAPI=7
-HOMEPAGE=https://kate-editor.org/ https://kde.org/applications/utilities/org.kde.kate
-IUSE=activities +filebrowser lspclient +projects plasma +snippets sql test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.63.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.63.0:5 ) plasma? ( >=kde-frameworks/plasma-5.63.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/threadweaver-5.63.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.63.0:5 ) sql? ( >=kde-frameworks/kwallet-5.63.0:5 >=dev-qt/qtsql-5.12.3:5 ) !kde-misc/ktexteditorpreviewplugin || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kate-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2116f2886f751751b91eefd41ec1da6b
diff --git a/metadata/md5-cache/kde-apps/kate-19.12.2 b/metadata/md5-cache/kde-apps/kate-19.12.2
new file mode 100644
index 000000000000..83e5ae381e1c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kate-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.63.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.63.0:5 ) plasma? ( >=kde-frameworks/plasma-5.63.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/threadweaver-5.63.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.63.0:5 ) sql? ( >=kde-frameworks/kwallet-5.63.0:5 >=dev-qt/qtsql-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Multi-document editor with network transparency, Plasma integration and more
+EAPI=7
+HOMEPAGE=https://kate-editor.org/ https://kde.org/applications/utilities/org.kde.kate
+IUSE=activities +filebrowser lspclient +projects plasma +snippets sql test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) filebrowser? ( >=kde-frameworks/kbookmarks-5.63.0:5 ) lspclient? ( >=kde-frameworks/kitemmodels-5.63.0:5 ) plasma? ( >=kde-frameworks/plasma-5.63.0:5 ) projects? ( >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/threadweaver-5.63.0:5 ) snippets? ( >=kde-frameworks/knewstuff-5.63.0:5 ) sql? ( >=kde-frameworks/kwallet-5.63.0:5 >=dev-qt/qtsql-5.12.3:5 ) !kde-misc/ktexteditorpreviewplugin || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kate-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2116f2886f751751b91eefd41ec1da6b
diff --git a/metadata/md5-cache/kde-apps/katomic-19.12.1 b/metadata/md5-cache/kde-apps/katomic-19.12.1
deleted file mode 100644
index eb0a183b86ba..000000000000
--- a/metadata/md5-cache/kde-apps/katomic-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Atomic Entertainment Game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.katomic https://games.kde.org/game.php?game=katomic
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/katomic-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc78f2e6d0ed1c5c56fde6d1854341fe
diff --git a/metadata/md5-cache/kde-apps/katomic-19.12.2 b/metadata/md5-cache/kde-apps/katomic-19.12.2
new file mode 100644
index 000000000000..5dfa4ae45cae
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/katomic-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Atomic Entertainment Game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.katomic https://games.kde.org/game.php?game=katomic
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/katomic-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc78f2e6d0ed1c5c56fde6d1854341fe
diff --git a/metadata/md5-cache/kde-apps/kbackup-19.12.1 b/metadata/md5-cache/kde-apps/kbackup-19.12.1
deleted file mode 100644
index ad094946425e..000000000000
--- a/metadata/md5-cache/kde-apps/kbackup-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Program that lets you back up any directories or files
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kbackup
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kbackup-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c7aebf888a31cb907296f0721c7f175
diff --git a/metadata/md5-cache/kde-apps/kbackup-19.12.2 b/metadata/md5-cache/kde-apps/kbackup-19.12.2
new file mode 100644
index 000000000000..027008bfa0c0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbackup-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Program that lets you back up any directories or files
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kbackup
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kbackup-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8c7aebf888a31cb907296f0721c7f175
diff --git a/metadata/md5-cache/kde-apps/kblackbox-19.12.1 b/metadata/md5-cache/kde-apps/kblackbox-19.12.1
deleted file mode 100644
index fb696f1aedf8..000000000000
--- a/metadata/md5-cache/kde-apps/kblackbox-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game of hide and seek played on a grid of boxes
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kblackbox
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kblackbox-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=27d3eee4bcfd24a964d904d57e53fa1c
diff --git a/metadata/md5-cache/kde-apps/kblackbox-19.12.2 b/metadata/md5-cache/kde-apps/kblackbox-19.12.2
new file mode 100644
index 000000000000..24a81325c26f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblackbox-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Game of hide and seek played on a grid of boxes
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kblackbox
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kblackbox-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=27d3eee4bcfd24a964d904d57e53fa1c
diff --git a/metadata/md5-cache/kde-apps/kblocks-19.12.1 b/metadata/md5-cache/kde-apps/kblocks-19.12.1
deleted file mode 100644
index 1c9ae3632e3a..000000000000
--- a/metadata/md5-cache/kde-apps/kblocks-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Single-player Tetris-like KDE game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kblocks
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kblocks-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22635dcb447941efae8f5a1db60298b7
diff --git a/metadata/md5-cache/kde-apps/kblocks-19.12.2 b/metadata/md5-cache/kde-apps/kblocks-19.12.2
new file mode 100644
index 000000000000..546e60ca8104
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblocks-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Single-player Tetris-like KDE game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kblocks
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kblocks-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=22635dcb447941efae8f5a1db60298b7
diff --git a/metadata/md5-cache/kde-apps/kblog-19.12.1 b/metadata/md5-cache/kde-apps/kblog-19.12.1
deleted file mode 100644
index 42790c27dc14..000000000000
--- a/metadata/md5-cache/kde-apps/kblog-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kxmlrpcclient-5.63.0:5 >=kde-frameworks/syndication-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library providing client-side support for web application remote blogging APIs
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kblog/html/index.html
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kxmlrpcclient-5.63.0:5 >=kde-frameworks/syndication-5.63.0:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kblog-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad67d3dd3e68d216656751d07d8248e1
diff --git a/metadata/md5-cache/kde-apps/kblog-19.12.2 b/metadata/md5-cache/kde-apps/kblog-19.12.2
new file mode 100644
index 000000000000..d2d6d4d84773
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kblog-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kxmlrpcclient-5.63.0:5 >=kde-frameworks/syndication-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library providing client-side support for web application remote blogging APIs
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kblog/html/index.html
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kxmlrpcclient-5.63.0:5 >=kde-frameworks/syndication-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kblog-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b8d2cdcb0c8eb7bc0d6515a449df3d6f
diff --git a/metadata/md5-cache/kde-apps/kbounce-19.12.1 b/metadata/md5-cache/kde-apps/kbounce-19.12.1
deleted file mode 100644
index 6b44d9f48fd3..000000000000
--- a/metadata/md5-cache/kde-apps/kbounce-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Bounce Ball Game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kbounce https://games.kde.org/game.php?game=kbounce
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kbounce-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d695f62d45f54cc42e382b6c36a02778
diff --git a/metadata/md5-cache/kde-apps/kbounce-19.12.2 b/metadata/md5-cache/kde-apps/kbounce-19.12.2
new file mode 100644
index 000000000000..f17eba2e2634
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbounce-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Bounce Ball Game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kbounce https://games.kde.org/game.php?game=kbounce
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kbounce-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d695f62d45f54cc42e382b6c36a02778
diff --git a/metadata/md5-cache/kde-apps/kbreakout-19.12.1 b/metadata/md5-cache/kde-apps/kbreakout-19.12.1
deleted file mode 100644
index 00d395c500ae..000000000000
--- a/metadata/md5-cache/kde-apps/kbreakout-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Breakout-like game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kbreakout https://games.kde.org/game.php?game=kbreakout
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kbreakout-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d71eb4803edd5a358a9639af8d380412
diff --git a/metadata/md5-cache/kde-apps/kbreakout-19.12.2 b/metadata/md5-cache/kde-apps/kbreakout-19.12.2
new file mode 100644
index 000000000000..5797704d5ec5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbreakout-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Breakout-like game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kbreakout https://games.kde.org/game.php?game=kbreakout
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kbreakout-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d71eb4803edd5a358a9639af8d380412
diff --git a/metadata/md5-cache/kde-apps/kbruch-19.12.1 b/metadata/md5-cache/kde-apps/kbruch-19.12.1
deleted file mode 100644
index 9e2cc778ad0c..000000000000
--- a/metadata/md5-cache/kde-apps/kbruch-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Educational application to learn calculating with fractions
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kbruch https://edu.kde.org/kbruch/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kbruch-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b2f91f544086e8c13960c5b6be8f42f
diff --git a/metadata/md5-cache/kde-apps/kbruch-19.12.2 b/metadata/md5-cache/kde-apps/kbruch-19.12.2
new file mode 100644
index 000000000000..c99314e341f9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kbruch-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Educational application to learn calculating with fractions
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kbruch https://edu.kde.org/kbruch/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kbruch-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b2f91f544086e8c13960c5b6be8f42f
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-19.12.1 b/metadata/md5-cache/kde-apps/kcachegrind-19.12.1
deleted file mode 100644
index 29c855e950c7..000000000000
--- a/metadata/md5-cache/kde-apps/kcachegrind-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend for Cachegrind by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kcachegrind https://kcachegrind.github.io/html/Home.html
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/graphviz || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kcachegrind-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9ff387ea56acd4bb837b7ba4d11b9745
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-19.12.2 b/metadata/md5-cache/kde-apps/kcachegrind-19.12.2
new file mode 100644
index 000000000000..8556462b45b3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcachegrind-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Frontend for Cachegrind by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kcachegrind https://kcachegrind.github.io/html/Home.html
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/graphviz || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kcachegrind-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ff387ea56acd4bb837b7ba4d11b9745
diff --git a/metadata/md5-cache/kde-apps/kcalc-19.12.1 b/metadata/md5-cache/kde-apps/kcalc-19.12.1
deleted file mode 100644
index f97c69bbaeba..000000000000
--- a/metadata/md5-cache/kde-apps/kcalc-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/gmp:0= dev-libs/mpfr:0= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE calculator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcalc https://utils.kde.org/projects/kcalc/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/gmp:0= dev-libs/mpfr:0= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kcalc-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af99ba364bb096f51efac163715c3395
diff --git a/metadata/md5-cache/kde-apps/kcalc-19.12.2 b/metadata/md5-cache/kde-apps/kcalc-19.12.2
new file mode 100644
index 000000000000..23e9b9fd2082
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalc-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/gmp:0= dev-libs/mpfr:0= dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE calculator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcalc https://utils.kde.org/projects/kcalc/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/gmp:0= dev-libs/mpfr:0= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kcalc-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af99ba364bb096f51efac163715c3395
diff --git a/metadata/md5-cache/kde-apps/kcalutils-19.12.1 b/metadata/md5-cache/kde-apps/kcalutils-19.12.1
deleted file mode 100644
index eaa3e41b3ff0..000000000000
--- a/metadata/md5-cache/kde-apps/kcalutils-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library providing utility functions for the handling of calendar data
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kcalutils/html/index.html
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kcalutils-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71d9689904d4cdc15b8155ec8a934a33
diff --git a/metadata/md5-cache/kde-apps/kcalutils-19.12.2 b/metadata/md5-cache/kde-apps/kcalutils-19.12.2
new file mode 100644
index 000000000000..959a62f1cd45
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcalutils-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library providing utility functions for the handling of calendar data
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kcalutils/html/index.html
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kcalutils-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=48cc519ae2c2732df57030ac97734357
diff --git a/metadata/md5-cache/kde-apps/kcharselect-19.12.1 b/metadata/md5-cache/kde-apps/kcharselect-19.12.1
deleted file mode 100644
index bfb6150956ed..000000000000
--- a/metadata/md5-cache/kde-apps/kcharselect-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE character selection utility
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcharselect https://utils.kde.org/projects/kcharselect/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kcharselect-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5333f06198797d6faf2f4848e7dbe23a
diff --git a/metadata/md5-cache/kde-apps/kcharselect-19.12.2 b/metadata/md5-cache/kde-apps/kcharselect-19.12.2
new file mode 100644
index 000000000000..5d92749bffb9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcharselect-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE character selection utility
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcharselect https://utils.kde.org/projects/kcharselect/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kcharselect-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5333f06198797d6faf2f4848e7dbe23a
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-19.12.1 b/metadata/md5-cache/kde-apps/kcolorchooser-19.12.1
deleted file mode 100644
index b2998470facd..000000000000
--- a/metadata/md5-cache/kde-apps/kcolorchooser-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE color selector/editor
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.kcolorchooser
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kcolorchooser-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71e4bc0e482ff75590c76d2bdd8435fc
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-19.12.2 b/metadata/md5-cache/kde-apps/kcolorchooser-19.12.2
new file mode 100644
index 000000000000..89a1fc00a6d7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE color selector/editor
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/org.kde.kcolorchooser
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kcolorchooser-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=71e4bc0e482ff75590c76d2bdd8435fc
diff --git a/metadata/md5-cache/kde-apps/kcron-19.12.1 b/metadata/md5-cache/kde-apps/kcron-19.12.1
deleted file mode 100644
index f88996677c9d..000000000000
--- a/metadata/md5-cache/kde-apps/kcron-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Task Scheduler
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcron
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/cron || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kcron-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b3bdc1b2bcacdaec763888fac7b986e
diff --git a/metadata/md5-cache/kde-apps/kcron-19.12.2 b/metadata/md5-cache/kde-apps/kcron-19.12.2
new file mode 100644
index 000000000000..a4b1db275227
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kcron-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Task Scheduler
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kcron
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/cron || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kcron-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b3bdc1b2bcacdaec763888fac7b986e
diff --git a/metadata/md5-cache/kde-apps/kdav-19.12.1 b/metadata/md5-cache/kde-apps/kdav-19.12.1
deleted file mode 100644
index 4bf17f4f76cd..000000000000
--- a/metadata/md5-cache/kde-apps/kdav-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=DAV protocol implemention with KJobs
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kdav/html/index.html
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdav-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=93877e45c7e4d3720d062633bcfc8e47
diff --git a/metadata/md5-cache/kde-apps/kdav-19.12.2 b/metadata/md5-cache/kde-apps/kdav-19.12.2
new file mode 100644
index 000000000000..d011f72c93ae
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdav-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=DAV protocol implemention with KJobs
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kdav/html/index.html
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdav-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=09ca93b9063de0140df2d08dd966062d
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-19.12.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-19.12.1
deleted file mode 100644
index e9567145fb06..000000000000
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for the KDE Applications collection
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=accessibility pim sdk
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdeadmin-meta-19.12.1:5 >=kde-apps/kdecore-meta-19.12.1:5 >=kde-apps/kdeedu-meta-19.12.1:5 >=kde-apps/kdegames-meta-19.12.1:5 >=kde-apps/kdegraphics-meta-19.12.1:5 >=kde-apps/kdemultimedia-meta-19.12.1:5 >=kde-apps/kdenetwork-meta-19.12.1:5 >=kde-apps/kdeutils-meta-19.12.1:5 accessibility? ( >=kde-apps/kdeaccessibility-meta-19.12.1:5 ) pim? ( >=kde-apps/kdepim-meta-19.12.1:5 ) sdk? ( >=kde-apps/kdesdk-meta-19.12.1:5 )
-SLOT=5
-_md5_=273fa38a70218b09e2f117bf0c2267e9
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-19.12.2 b/metadata/md5-cache/kde-apps/kde-apps-meta-19.12.2
new file mode 100644
index 000000000000..402fe6c600ea
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for the KDE Applications collection
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=accessibility pim sdk
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdeadmin-meta-19.12.2:5 >=kde-apps/kdecore-meta-19.12.2:5 >=kde-apps/kdeedu-meta-19.12.2:5 >=kde-apps/kdegames-meta-19.12.2:5 >=kde-apps/kdegraphics-meta-19.12.2:5 >=kde-apps/kdemultimedia-meta-19.12.2:5 >=kde-apps/kdenetwork-meta-19.12.2:5 >=kde-apps/kdeutils-meta-19.12.2:5 accessibility? ( >=kde-apps/kdeaccessibility-meta-19.12.2:5 ) pim? ( >=kde-apps/kdepim-meta-19.12.2:5 ) sdk? ( >=kde-apps/kdesdk-meta-19.12.2:5 )
+SLOT=5
+_md5_=273fa38a70218b09e2f117bf0c2267e9
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-19.12.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-19.12.1
deleted file mode 100644
index 70e7b32a5002..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kdoctools-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Development Scripts
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kde-dev-scripts-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e135e9f98a949fd6b28bcdfc469c5273
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-19.12.2 b/metadata/md5-cache/kde-apps/kde-dev-scripts-19.12.2
new file mode 100644
index 000000000000..4dc752cfc51c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kdoctools-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Development Scripts
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kde-dev-scripts-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e135e9f98a949fd6b28bcdfc469c5273
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-19.12.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-19.12.1
deleted file mode 100644
index 23edab1666be..000000000000
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Development Utilities
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kde-dev-utils-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73315a8ffbe4191427a886e72216c752
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-19.12.2 b/metadata/md5-cache/kde-apps/kde-dev-utils-19.12.2
new file mode 100644
index 000000000000..2466adb4d50c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Development Utilities
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/designer-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kde-dev-utils-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=73315a8ffbe4191427a886e72216c752
diff --git a/metadata/md5-cache/kde-apps/kde-meta-19.12.1 b/metadata/md5-cache/kde-apps/kde-meta-19.12.1
deleted file mode 100644
index e8ec7a4a5127..000000000000
--- a/metadata/md5-cache/kde-apps/kde-meta-19.12.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kde-apps-meta-19.12.1:5 kde-plasma/plasma-meta:5
-SLOT=5
-_md5_=08772390993209074781ebe8b8ddc33e
diff --git a/metadata/md5-cache/kde-apps/kde-meta-19.12.2 b/metadata/md5-cache/kde-apps/kde-meta-19.12.2
new file mode 100644
index 000000000000..be49c7e43e60
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kde-meta-19.12.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all KDE Plasma and Applications packages
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kde-apps-meta-19.12.2:5 kde-plasma/plasma-meta:5
+SLOT=5
+_md5_=08772390993209074781ebe8b8ddc33e
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-19.12.1
deleted file mode 100644
index 6bee9a1bb3dc..000000000000
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-19.12.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kmag-19.12.1:5 >=kde-apps/kmousetool-19.12.1:5 >=kde-apps/kmouth-19.12.1:5
-SLOT=5
-_md5_=763771959cbd518b51694c3518f6f1f9
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-19.12.2
new file mode 100644
index 000000000000..519da9086219
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-19.12.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kmag-19.12.2:5 >=kde-apps/kmousetool-19.12.2:5 >=kde-apps/kmouth-19.12.2:5
+SLOT=5
+_md5_=763771959cbd518b51694c3518f6f1f9
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-19.12.1
deleted file mode 100644
index b6607bbfc261..000000000000
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+cron
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ksystemlog-19.12.1:5 cron? ( >=kde-apps/kcron-19.12.1:5 )
-SLOT=5
-_md5_=5e265c8beb044db24ac09bfe8049048a
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdeadmin-meta-19.12.2
new file mode 100644
index 000000000000..098e0b4d1e22
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE administration tools - merge this to pull in all kdeadmin-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+cron
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ksystemlog-19.12.2:5 cron? ( >=kde-apps/kcron-19.12.2:5 )
+SLOT=5
+_md5_=5e265c8beb044db24ac09bfe8049048a
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdebase-meta-19.12.1
deleted file mode 100644
index 9d5e06a382e1..000000000000
--- a/metadata/md5-cache/kde-apps/kdebase-meta-19.12.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdecore-meta-19.12.1:5 kde-plasma/plasma-meta
-SLOT=5
-_md5_=d04f6be9d9a899c0f8766f2e07c3799a
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdebase-meta-19.12.2
new file mode 100644
index 000000000000..894b59d5595c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-19.12.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Transitional package to pull in plasma-meta plus basic applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdecore-meta-19.12.2:5 kde-plasma/plasma-meta
+SLOT=5
+_md5_=7e9b050374c95c5a5843861be971ade4
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-19.12.1 b/metadata/md5-cache/kde-apps/kdebugsettings-19.12.1
deleted file mode 100644
index 6350291bfeca..000000000000
--- a/metadata/md5-cache/kde-apps/kdebugsettings-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Application to enable/disable qCDebug
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kdebugsettings
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdebugsettings-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7f0ba20ddbe77f2deab5585bfb2dff0
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-19.12.2 b/metadata/md5-cache/kde-apps/kdebugsettings-19.12.2
new file mode 100644
index 000000000000..f4eb14534156
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Application to enable/disable qCDebug
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kdebugsettings
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdebugsettings-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a7f0ba20ddbe77f2deab5585bfb2dff0
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdecore-meta-19.12.1
deleted file mode 100644
index acd20064bd2b..000000000000
--- a/metadata/md5-cache/kde-apps/kdecore-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdecore - merge this to pull in the most basic applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+handbook +share +thumbnail +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dolphin-19.12.1:5 >=kde-apps/kdialog-19.12.1:5 >=kde-apps/keditbookmarks-19.12.1:5 >=kde-apps/kfind-19.12.1:5 >=kde-apps/konsole-19.12.1:5 >=kde-apps/kwrite-19.12.1:5 handbook? ( >=kde-apps/khelpcenter-19.12.1:5 ) webengine? ( || ( www-client/falkon >=kde-apps/konqueror-19.12.1:5 ) ) share? ( kde-frameworks/purpose:5 ) thumbnail? ( >=kde-apps/ffmpegthumbs-19.12.1:5 >=kde-apps/thumbnailers-19.12.1:5 )
-SLOT=5
-_md5_=6b7cacd6fdb5ffc4dc0300a084654f5e
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdecore-meta-19.12.2
new file mode 100644
index 000000000000..2cfa55293ed2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdecore - merge this to pull in the most basic applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+handbook +share +thumbnail +webengine
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dolphin-19.12.2:5 >=kde-apps/kdialog-19.12.2:5 >=kde-apps/keditbookmarks-19.12.2:5 >=kde-apps/kfind-19.12.2:5 >=kde-apps/konsole-19.12.2:5 >=kde-apps/kwrite-19.12.2:5 handbook? ( >=kde-apps/khelpcenter-19.12.2:5 ) webengine? ( || ( www-client/falkon >=kde-apps/konqueror-19.12.2:5 ) ) share? ( kde-frameworks/purpose:5 ) thumbnail? ( >=kde-apps/ffmpegthumbs-19.12.2:5 >=kde-apps/thumbnailers-19.12.2:5 )
+SLOT=5
+_md5_=6b7cacd6fdb5ffc4dc0300a084654f5e
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-19.08.3 b/metadata/md5-cache/kde-apps/kdeedu-data-19.08.3
deleted file mode 100644
index 8d2a0f8e543c..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-19.08.3
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5
-DEFINED_PHASES=nofetch unpack
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kdeedu-data-19.08.3.tar.xz
-_eclasses_=kde.org	12c2d7da2a75330ff5de0154686dbf4b
-_md5_=e0549fa81b2e536990867d0d64033dd2
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-19.08.3-r1 b/metadata/md5-cache/kde-apps/kdeedu-data-19.08.3-r1
new file mode 100644
index 000000000000..051fc96273c0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-19.08.3-r1
@@ -0,0 +1,11 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Shared icons, artwork and data files for educational applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=amd64 arm64 x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kdeedu-data-19.08.3.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f77eac57cf162dc94b85f1cd9649f5e0
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-19.12.1 b/metadata/md5-cache/kde-apps/kdeedu-data-19.12.1
deleted file mode 100644
index 4b88ed9e4282..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-data-19.12.1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5
-DEFINED_PHASES=nofetch unpack
-DESCRIPTION=Shared icons, artwork and data files for educational applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdeedu-data-19.12.1.tar.xz
-_eclasses_=kde.org	12c2d7da2a75330ff5de0154686dbf4b
-_md5_=aa60c7eb4a34fb292f1defd4f109ff9f
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-19.12.2-r1 b/metadata/md5-cache/kde-apps/kdeedu-data-19.12.2-r1
new file mode 100644
index 000000000000..10c513fcc776
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-19.12.2-r1
@@ -0,0 +1,11 @@
+BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DESCRIPTION=Shared icons, artwork and data files for educational applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdeedu-data-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85e6a3aa3db4f36da9fba6caa825e54d
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-19.12.1
deleted file mode 100644
index 90750f6c1bde..000000000000
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
-EAPI=7
-HOMEPAGE=https://edu.kde.org
-IUSE=+webengine +webkit
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/analitza-19.12.1:5 >=kde-apps/artikulate-19.12.1:5 >=kde-apps/blinken-19.12.1:5 >=kde-apps/cantor-19.12.1:5 >=kde-apps/kalzium-19.12.1:5 >=kde-apps/kanagram-19.12.1:5 >=kde-apps/kbruch-19.12.1:5 >=kde-apps/kdeedu-data-19.12.1:5 >=kde-apps/kgeography-19.12.1:5 >=kde-apps/khangman-19.12.1:5 >=kde-apps/kig-19.12.1:5 >=kde-apps/kiten-19.12.1:5 >=kde-apps/klettres-19.12.1:5 >=kde-apps/kmplot-19.12.1:5 >=kde-apps/kqtquickcharts-19.12.1:5 >=kde-apps/ktouch-19.12.1:5 >=kde-apps/kturtle-19.12.1:5 >=kde-apps/kwordquiz-19.12.1:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=kde-apps/marble-19.12.1:5 >=kde-apps/minuet-19.12.1:5 >=kde-apps/step-19.12.1:5 webengine? ( >=kde-apps/kalgebra-19.12.1:5 >=kde-apps/parley-19.12.1:5 ) webkit? ( >=kde-apps/rocs-19.12.1:5 )
-SLOT=5
-_md5_=c5eeeb2b045d239ec1c4ae75ce153094
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdeedu-meta-19.12.2
new file mode 100644
index 000000000000..51bb19543988
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE educational apps - merge this to pull in all kdeedu-derived packages
+EAPI=7
+HOMEPAGE=https://edu.kde.org
+IUSE=+webengine +webkit
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/analitza-19.12.2:5 >=kde-apps/artikulate-19.12.2:5 >=kde-apps/blinken-19.12.2:5 >=kde-apps/cantor-19.12.2:5 >=kde-apps/kalzium-19.12.2:5 >=kde-apps/kanagram-19.12.2:5 >=kde-apps/kbruch-19.12.2:5 >=kde-apps/kdeedu-data-19.12.2:5 >=kde-apps/kgeography-19.12.2:5 >=kde-apps/khangman-19.12.2:5 >=kde-apps/kig-19.12.2:5 >=kde-apps/kiten-19.12.2:5 >=kde-apps/klettres-19.12.2:5 >=kde-apps/kmplot-19.12.2:5 >=kde-apps/kqtquickcharts-19.12.2:5 >=kde-apps/ktouch-19.12.2:5 >=kde-apps/kturtle-19.12.2:5 >=kde-apps/kwordquiz-19.12.2:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=kde-apps/marble-19.12.2:5 >=kde-apps/minuet-19.12.2:5 >=kde-apps/step-19.12.2:5 webengine? ( >=kde-apps/kalgebra-19.12.2:5 >=kde-apps/parley-19.12.2:5 ) webkit? ( >=kde-apps/rocs-19.12.2:5 )
+SLOT=5
+_md5_=c5eeeb2b045d239ec1c4ae75ce153094
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdegames-meta-19.12.1
deleted file mode 100644
index f0b99b9c23cc..000000000000
--- a/metadata/md5-cache/kde-apps/kdegames-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
-EAPI=7
-HOMEPAGE=https://games.kde.org/
-IUSE=opengl python
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/bomber-19.12.1:5 >=kde-apps/bovo-19.12.1:5 >=kde-apps/granatier-19.12.1:5 >=kde-apps/kapman-19.12.1:5 >=kde-apps/katomic-19.12.1:5 >=kde-apps/kblackbox-19.12.1:5 >=kde-apps/kblocks-19.12.1:5 >=kde-apps/kbounce-19.12.1:5 >=kde-apps/kbreakout-19.12.1:5 >=kde-apps/kdiamond-19.12.1:5 >=kde-apps/kfourinline-19.12.1:5 >=kde-apps/kgoldrunner-19.12.1:5 >=kde-apps/kigo-19.12.1:5 >=kde-apps/killbots-19.12.1:5 >=kde-apps/kiriki-19.12.1:5 >=kde-apps/kjumpingcube-19.12.1:5 >=kde-apps/klickety-19.12.1:5 >=kde-apps/klines-19.12.1:5 >=kde-apps/kmahjongg-19.12.1:5 >=kde-apps/kmines-19.12.1:5 >=kde-apps/knavalbattle-19.12.1:5 >=kde-apps/knetwalk-19.12.1:5 >=kde-apps/knights-19.12.1:5 >=kde-apps/kolf-19.12.1:5 >=kde-apps/kollision-19.12.1:5 >=kde-apps/konquest-19.12.1:5 >=kde-apps/kpat-19.12.1:5 >=kde-apps/kreversi-19.12.1:5 >=kde-apps/kshisen-19.12.1:5 >=kde-apps/ksirk-19.12.1:5 >=kde-apps/ksnakeduel-19.12.1:5 >=kde-apps/kspaceduel-19.12.1:5 >=kde-apps/ksquares-19.12.1:5 >=kde-apps/ktuberling-19.12.1:5 >=kde-apps/libkdegames-19.12.1:5 >=kde-apps/libkmahjongg-19.12.1:5 >=kde-apps/lskat-19.12.1:5 >=kde-apps/palapeli-19.12.1:5 >=kde-apps/picmi-19.12.1:5 opengl? ( >=kde-apps/ksudoku-19.12.1:5 >=kde-apps/kubrick-19.12.1:5 ) python? ( >=kde-apps/kajongg-19.12.1:5 )
-SLOT=5
-_md5_=11a9b133139c04a40596bba31adc2dc9
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdegames-meta-19.12.2
new file mode 100644
index 000000000000..bdcd36b3cc65
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegames - merge this to pull in all kdegames-derived packages
+EAPI=7
+HOMEPAGE=https://games.kde.org/
+IUSE=opengl python
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/bomber-19.12.2:5 >=kde-apps/bovo-19.12.2:5 >=kde-apps/granatier-19.12.2:5 >=kde-apps/kapman-19.12.2:5 >=kde-apps/katomic-19.12.2:5 >=kde-apps/kblackbox-19.12.2:5 >=kde-apps/kblocks-19.12.2:5 >=kde-apps/kbounce-19.12.2:5 >=kde-apps/kbreakout-19.12.2:5 >=kde-apps/kdiamond-19.12.2:5 >=kde-apps/kfourinline-19.12.2:5 >=kde-apps/kgoldrunner-19.12.2:5 >=kde-apps/kigo-19.12.2:5 >=kde-apps/killbots-19.12.2:5 >=kde-apps/kiriki-19.12.2:5 >=kde-apps/kjumpingcube-19.12.2:5 >=kde-apps/klickety-19.12.2:5 >=kde-apps/klines-19.12.2:5 >=kde-apps/kmahjongg-19.12.2:5 >=kde-apps/kmines-19.12.2:5 >=kde-apps/knavalbattle-19.12.2:5 >=kde-apps/knetwalk-19.12.2:5 >=kde-apps/knights-19.12.2:5 >=kde-apps/kolf-19.12.2:5 >=kde-apps/kollision-19.12.2:5 >=kde-apps/konquest-19.12.2:5 >=kde-apps/kpat-19.12.2:5 >=kde-apps/kreversi-19.12.2:5 >=kde-apps/kshisen-19.12.2:5 >=kde-apps/ksirk-19.12.2:5 >=kde-apps/ksnakeduel-19.12.2:5 >=kde-apps/kspaceduel-19.12.2:5 >=kde-apps/ksquares-19.12.2:5 >=kde-apps/ktuberling-19.12.2:5 >=kde-apps/libkdegames-19.12.2:5 >=kde-apps/libkmahjongg-19.12.2:5 >=kde-apps/lskat-19.12.2:5 >=kde-apps/palapeli-19.12.2:5 >=kde-apps/picmi-19.12.2:5 opengl? ( >=kde-apps/ksudoku-19.12.2:5 >=kde-apps/kubrick-19.12.2:5 ) python? ( >=kde-apps/kajongg-19.12.2:5 )
+SLOT=5
+_md5_=11a9b133139c04a40596bba31adc2dc9
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-19.12.1
deleted file mode 100644
index 8c5db4e11af4..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/
-IUSE=scanner
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/gwenview-19.12.1:5 >=kde-apps/kamera-19.12.1:5 >=kde-apps/kcolorchooser-19.12.1:5 >=kde-apps/kdegraphics-mobipocket-19.12.1:5 >=kde-apps/kipi-plugins-19.12.1:5 >=kde-apps/kolourpaint-19.12.1:5 >=kde-apps/kruler-19.12.1:5 >=kde-apps/libkdcraw-19.12.1:5 >=kde-apps/libkexiv2-19.12.1:5 >=kde-apps/libkipi-19.12.1:5 >=kde-apps/okular-19.12.1:5 >=kde-apps/spectacle-19.12.1:5 >=kde-apps/svgpart-19.12.1:5 >=kde-apps/thumbnailers-19.12.1:5 scanner? ( >=kde-apps/libksane-19.12.1:5 )
-SLOT=5
-_md5_=a9a9bcab8aa18516f54e9a4fb0de87ff
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdegraphics-meta-19.12.2
new file mode 100644
index 000000000000..ddc50b467e87
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdegraphics - merge this to pull in all kdegraphics-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/
+IUSE=scanner
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/gwenview-19.12.2:5 >=kde-apps/kamera-19.12.2:5 >=kde-apps/kcolorchooser-19.12.2:5 >=kde-apps/kdegraphics-mobipocket-19.12.2:5 >=kde-apps/kipi-plugins-19.12.2:5 >=kde-apps/kolourpaint-19.12.2:5 >=kde-apps/kruler-19.12.2:5 >=kde-apps/libkdcraw-19.12.2:5 >=kde-apps/libkexiv2-19.12.2:5 >=kde-apps/libkipi-19.12.2:5 >=kde-apps/okular-19.12.2:5 >=kde-apps/spectacle-19.12.2:5 >=kde-apps/svgpart-19.12.2:5 >=kde-apps/thumbnailers-19.12.2:5 scanner? ( >=kde-apps/libksane-19.12.2:5 )
+SLOT=5
+_md5_=a9a9bcab8aa18516f54e9a4fb0de87ff
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.12.1
deleted file mode 100644
index f56c12b00b0a..000000000000
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 thumbnail? ( >=kde-frameworks/kio-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library to support mobipocket ebooks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+thumbnail debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 thumbnail? ( >=kde-frameworks/kio-5.63.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdegraphics-mobipocket-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7cab863f2df5dd4bc4c7462351139f69
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.12.2 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.12.2
new file mode 100644
index 000000000000..bf48e8a5e8c9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 thumbnail? ( >=kde-frameworks/kio-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Library to support mobipocket ebooks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+thumbnail debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 thumbnail? ( >=kde-frameworks/kio-5.63.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdegraphics-mobipocket-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7cab863f2df5dd4bc4c7462351139f69
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-19.12.1
deleted file mode 100644
index be4cc080747f..000000000000
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/ https://multimedia.kde.org/
-IUSE=+cdrom +ffmpeg gstreamer
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/dragon-19.12.1:5 >=kde-apps/juk-19.12.1:5 >=kde-apps/kdenlive-19.12.1:5 >=kde-apps/kmix-19.12.1:5 >=kde-apps/kwave-19.12.1:5 cdrom? ( >=kde-apps/audiocd-kio-19.12.1:5 >=kde-apps/k3b-19.12.1:5 >=kde-apps/libkcddb-19.12.1:5 >=kde-apps/libkcompactdisc-19.12.1:5 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-19.12.1:5 ) gstreamer? ( >=kde-apps/kamoso-19.12.1:5 )
-SLOT=5
-_md5_=4da9cc6a77a2891a10869ce3c7193dcb
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-19.12.2
new file mode 100644
index 000000000000..b3644b67e96d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdemultimedia - merge this to pull in all kdemultimedia-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/ https://multimedia.kde.org/
+IUSE=+cdrom +ffmpeg gstreamer
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/dragon-19.12.2:5 >=kde-apps/juk-19.12.2:5 >=kde-apps/kdenlive-19.12.2:5 >=kde-apps/kmix-19.12.2:5 >=kde-apps/kwave-19.12.2:5 >=media-sound/elisa-19.12.2:5 cdrom? ( >=kde-apps/audiocd-kio-19.12.2:5 >=kde-apps/k3b-19.12.2:5 >=kde-apps/libkcddb-19.12.2:5 >=kde-apps/libkcompactdisc-19.12.2:5 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-19.12.2:5 ) gstreamer? ( >=kde-apps/kamoso-19.12.2:5 )
+SLOT=5
+_md5_=c7c385b4f19cc700e6831789264ceaab
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.12.1
deleted file mode 100644
index fdcf847844f7..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=SMB filesharing config module for systemsettings
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.kdenetwork_filesharing
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdenetwork-filesharing-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bfa008e0f4e9055081c398f37e1ce9d6
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.12.2 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.12.2
new file mode 100644
index 000000000000..ea84b3db5ebd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=SMB filesharing config module for systemsettings
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.kdenetwork_filesharing
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdenetwork-filesharing-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bfa008e0f4e9055081c398f37e1ce9d6
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-19.12.1
deleted file mode 100644
index 4cc1e9720bab..000000000000
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=dropbox +telepathy
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kdenetwork-filesharing-19.12.1:5 >=kde-apps/kget-19.12.1:5 >=kde-apps/krdc-19.12.1:5 >=kde-apps/kopete-19.12.1:5 >=kde-apps/krfb-19.12.1:5 >=kde-apps/zeroconf-ioslave-19.12.1:5 dropbox? ( >=kde-apps/dolphin-plugins-dropbox-19.12.1:5 ) telepathy? ( >=kde-apps/plasma-telepathy-meta-19.12.1:5 )
-SLOT=5
-_md5_=496ab963c834895545fbc6fc6d3bffb9
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdenetwork-meta-19.12.2
new file mode 100644
index 000000000000..96acd5ddfc52
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdenetwork - merge this to pull in all kdenetwork-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=dropbox +telepathy
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kdenetwork-filesharing-19.12.2:5 >=kde-apps/kget-19.12.2:5 >=kde-apps/krdc-19.12.2:5 >=kde-apps/kopete-19.12.2:5 >=kde-apps/krfb-19.12.2:5 >=kde-apps/zeroconf-ioslave-19.12.2:5 dropbox? ( >=kde-apps/dolphin-plugins-dropbox-19.12.2:5 ) telepathy? ( >=kde-apps/plasma-telepathy-meta-19.12.2:5 )
+SLOT=5
+_md5_=496ab963c834895545fbc6fc6d3bffb9
diff --git a/metadata/md5-cache/kde-apps/kdenlive-19.12.1-r1 b/metadata/md5-cache/kde-apps/kdenlive-19.12.1-r1
deleted file mode 100644
index 9d685b048b16..000000000000
--- a/metadata/md5-cache/kde-apps/kdenlive-19.12.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/rttr >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=media-libs/mlt-6.18.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.63.0:5 ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) v4l? ( media-libs/libv4l ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Non-linear video editing suite by KDE
-EAPI=7
-HOMEPAGE=https://kdenlive.org/en/
-IUSE=freesound gles2 semantic-desktop share v4l test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-cpp/rttr >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=media-libs/mlt-6.18.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.63.0:5 ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.12.3:5 virtual/ffmpeg[encode,sdl,X] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdenlive-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eab59070f5a62ce3fc1ae86d621d0bb6
diff --git a/metadata/md5-cache/kde-apps/kdenlive-19.12.2 b/metadata/md5-cache/kde-apps/kdenlive-19.12.2
new file mode 100644
index 000000000000..1ce0d741ee26
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdenlive-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-cpp/rttr >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=media-libs/mlt-6.18.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.63.0:5 ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) v4l? ( media-libs/libv4l ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Non-linear video editing suite by KDE
+EAPI=7
+HOMEPAGE=https://kdenlive.org/en/
+IUSE=freesound gles2 semantic-desktop share v4l test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/rttr >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[gles2=] >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=media-libs/mlt-6.18.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml] freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.63.0:5 ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) v4l? ( media-libs/libv4l ) >=dev-qt/qtquickcontrols-5.12.3:5 virtual/ffmpeg[encode,sdl,X] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdenlive-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b3502ad11a46ba77b502a5a41d17537c
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-19.12.1 b/metadata/md5-cache/kde-apps/kdepim-addons-19.12.1
deleted file mode 100644
index 5c4a08f4fe55..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-addons-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= >=dev-qt/qtxml-5.12.3:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/eventviews-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/incidenceeditor-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kimap-19.12.1:5 >=kde-apps/kitinerary-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpkpass-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/libksieve-19.12.1:5 >=kde-apps/libktnef-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-19.12.1:5 ) markdown? ( app-text/discount ) >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugins for KDE Personal Information Management Suite
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=importwizard markdown test debug examples test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= >=dev-qt/qtxml-5.12.3:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/eventviews-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/incidenceeditor-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kimap-19.12.1:5 >=kde-apps/kitinerary-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpkpass-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/libksieve-19.12.1:5 >=kde-apps/libktnef-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-19.12.1:5 ) markdown? ( app-text/discount ) !kde-apps/kaddressbook:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdepim-addons-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=215613a8d1f4043940da2ee6612c9813
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-19.12.2 b/metadata/md5-cache/kde-apps/kdepim-addons-19.12.2
new file mode 100644
index 000000000000..3cd9427bc8fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= >=dev-qt/qtxml-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/eventviews-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/incidenceeditor-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kimap-19.12.2:5 >=kde-apps/kitinerary-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpkpass-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/libksieve-19.12.2:5 >=kde-apps/libktnef-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-19.12.2:5 ) markdown? ( app-text/discount ) >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugins for KDE Personal Information Management Suite
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=importwizard markdown test debug examples test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= >=dev-qt/qtxml-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/eventviews-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/incidenceeditor-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kimap-19.12.2:5 >=kde-apps/kitinerary-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpkpass-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/libksieve-19.12.2:5 >=kde-apps/libktnef-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 importwizard? ( >=kde-apps/akonadi-import-wizard-19.12.2:5 ) markdown? ( app-text/discount ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdepim-addons-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=52a74de77564b5e6d8bc80ba52d315e5
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.12.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.12.1
deleted file mode 100644
index 7a3f04bd11ae..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/grantlee-5.1.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries for KDE PIM applications
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdepim-apps-libs-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a1c5c64bfa6abee36e46be76af17df6
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.12.2 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.12.2
new file mode 100644
index 000000000000..11e195292576
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/grantlee-5.1.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Libraries for KDE PIM applications
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/prison-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/grantlee-5.1.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdepim-apps-libs-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8670121209fb27f1dde024bc5499d9f9
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdepim-meta-19.12.1
deleted file mode 100644
index bdeeba02471b..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=bogofilter clamav spamassassin
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadiconsole-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-import-wizard-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/akregator-19.12.1:5 >=kde-apps/calendarjanitor-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/eventviews-19.12.1:5 >=kde-apps/grantlee-editor-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/incidenceeditor-19.12.1:5 >=kde-apps/kaddressbook-19.12.1:5 >=kde-apps/kalarm-19.12.1:5 >=kde-apps/kalarmcal-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-addons-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kdepim-runtime-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kimap-19.12.1:5 >=kde-apps/kitinerary-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=kde-apps/kleopatra-19.12.1:5 >=kde-apps/kmail-19.12.1:5 >=kde-apps/kmail-account-wizard-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmbox-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/knotes-19.12.1:5 >=kde-apps/konsolekalendar-19.12.1:5 >=kde-apps/kontact-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/korganizer-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/kpkpass-19.12.1:5 >=kde-apps/ksmtp-19.12.1:5 >=kde-apps/libgravatar-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkgapi-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/libksieve-19.12.1:5 >=kde-apps/libktnef-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/mailimporter-19.12.1:5 >=kde-apps/mbox-importer-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pim-data-exporter-19.12.1:5 >=kde-apps/pim-sieve-editor-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 !kde-apps/kdepim-meta:4 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
-SLOT=5
-_md5_=2a6f38c7888c92e95598cb12add77318
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdepim-meta-19.12.2
new file mode 100644
index 000000000000..7127d14c7c00
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE PIM - merge this to pull in all kdepim-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=bogofilter clamav spamassassin
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadiconsole-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-import-wizard-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/akregator-19.12.2:5 >=kde-apps/calendarjanitor-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/eventviews-19.12.2:5 >=kde-apps/grantlee-editor-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/incidenceeditor-19.12.2:5 >=kde-apps/kaddressbook-19.12.2:5 >=kde-apps/kalarm-19.12.2:5 >=kde-apps/kalarmcal-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-addons-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kdepim-runtime-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kimap-19.12.2:5 >=kde-apps/kitinerary-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-apps/kleopatra-19.12.2:5 >=kde-apps/kmail-19.12.2:5 >=kde-apps/kmail-account-wizard-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmbox-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/knotes-19.12.2:5 >=kde-apps/konsolekalendar-19.12.2:5 >=kde-apps/kontact-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/korganizer-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/kpkpass-19.12.2:5 >=kde-apps/ksmtp-19.12.2:5 >=kde-apps/libgravatar-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkgapi-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/libksieve-19.12.2:5 >=kde-apps/libktnef-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/mailimporter-19.12.2:5 >=kde-apps/mbox-importer-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pim-data-exporter-19.12.2:5 >=kde-apps/pim-sieve-editor-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 bogofilter? ( mail-filter/bogofilter ) clamav? ( app-antivirus/clamav ) spamassassin? ( mail-filter/spamassassin )
+SLOT=5
+_md5_=2bafaf99d8496e54ec2f0bb0b37e662f
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-19.12.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-19.12.1
deleted file mode 100644
index 1b8e465d4120..000000000000
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/kalarmcal-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdav-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kimap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmbox-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkgapi-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtnetworkauth-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtxmlpatterns-5.12.3:5 test? ( >=kde-apps/kimap-19.12.1:5[test] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/kalarmcal-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdav-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kimap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmbox-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkgapi-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtnetworkauth-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= !kde-apps/kdepim-l10n !kde-misc/akonadi-ews || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdepim-runtime-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d49d233129794744d911787e08bd3c3
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-19.12.2 b/metadata/md5-cache/kde-apps/kdepim-runtime-19.12.2
new file mode 100644
index 000000000000..c68af88b4f6f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/kalarmcal-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdav-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kimap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmbox-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkgapi-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtnetworkauth-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= >=dev-qt/qtxmlpatterns-5.12.3:5 test? ( >=kde-apps/kimap-19.12.2:5[test] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Runtime plugin collection to extend the functionality of KDE PIM
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/kalarmcal-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdav-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kimap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmbox-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkgapi-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtnetworkauth-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 dev-libs/libical:= !kde-misc/akonadi-ews || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdepim-runtime-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a42b0d293a97ba5dcdcd590c6601f5c4
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.12.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.12.1
deleted file mode 100644
index 24a37910842d..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 dev-lang/perl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=kioslaves from kdesdk package
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 dev-lang/perl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdesdk-kioslaves-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c018f982c6b451433f33b07091bac319
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.12.2 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.12.2
new file mode 100644
index 000000000000..45358249194f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 dev-lang/perl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=kioslaves from kdesdk package
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 dev-lang/perl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdesdk-kioslaves-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c018f982c6b451433f33b07091bac319
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-19.12.1
deleted file mode 100644
index 84157b83f8ba..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development
-IUSE=bazaar cvs git mercurial subversion +webkit
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/kapptemplate-19.12.1:5 >=kde-apps/kcachegrind-19.12.1:5 >=kde-apps/kde-dev-scripts-19.12.1:5 >=kde-apps/kde-dev-utils-19.12.1:5 >=kde-apps/kdesdk-kioslaves-19.12.1:5 >=kde-apps/kdesdk-thumbnailers-19.12.1:5 >=kde-apps/kompare-19.12.1:5 >=kde-apps/kross-interpreters-19.12.1:5 >=kde-apps/libkomparediff2-19.12.1:5 >=kde-apps/lokalize-19.12.1:5 >=kde-apps/poxml-19.12.1:5 bazaar? ( >=kde-apps/dolphin-plugins-bazaar-19.12.1:5 ) cvs? ( >=kde-apps/cervisia-19.12.1:5 ) git? ( >=kde-apps/dolphin-plugins-git-19.12.1:5 ) mercurial? ( >=kde-apps/dolphin-plugins-mercurial-19.12.1:5 ) subversion? ( >=kde-apps/dolphin-plugins-subversion-19.12.1:5 ) webkit? ( >=kde-apps/umbrello-19.12.1:5 )
-SLOT=5
-_md5_=7fa6678372a5a7eb320dfe57cfb31b1b
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdesdk-meta-19.12.2
new file mode 100644
index 000000000000..43e89a42ecae
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=KDE SDK - merge this to pull in all kdesdk-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development
+IUSE=bazaar cvs git mercurial subversion +webkit
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/kapptemplate-19.12.2:5 >=kde-apps/kcachegrind-19.12.2:5 >=kde-apps/kde-dev-scripts-19.12.2:5 >=kde-apps/kde-dev-utils-19.12.2:5 >=kde-apps/kdesdk-kioslaves-19.12.2:5 >=kde-apps/kdesdk-thumbnailers-19.12.2:5 >=kde-apps/kompare-19.12.2:5 >=kde-apps/kross-interpreters-19.12.2:5 >=kde-apps/libkomparediff2-19.12.2:5 >=kde-apps/lokalize-19.12.2:5 >=kde-apps/poxml-19.12.2:5 bazaar? ( >=kde-apps/dolphin-plugins-bazaar-19.12.2:5 ) cvs? ( >=kde-apps/cervisia-19.12.2:5 ) git? ( >=kde-apps/dolphin-plugins-git-19.12.2:5 ) mercurial? ( >=kde-apps/dolphin-plugins-mercurial-19.12.2:5 ) subversion? ( >=kde-apps/dolphin-plugins-subversion-19.12.2:5 ) webkit? ( >=kde-apps/umbrello-19.12.2:5 )
+SLOT=5
+_md5_=7fa6678372a5a7eb320dfe57cfb31b1b
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.12.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.12.1
deleted file mode 100644
index 705d3432e14b..000000000000
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Thumbnail generator for PO files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdesdk-thumbnailers-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a876c970ae081dc5f7a08d86d187eba8
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.12.2 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.12.2
new file mode 100644
index 000000000000..2eeed20afec1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Thumbnail generator for PO files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdesdk-thumbnailers-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a876c970ae081dc5f7a08d86d187eba8
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-19.12.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-19.12.1
deleted file mode 100644
index 0c0117dbcf7c..000000000000
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities https://utils.kde.org
-IUSE=7zip cups floppy gpg lrz rar +webengine
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ark-19.12.1:5 >=kde-apps/filelight-19.12.1:5 >=kde-apps/kate-19.12.1:5 >=kde-apps/kbackup-19.12.1:5 >=kde-apps/kcalc-19.12.1:5 >=kde-apps/kcharselect-19.12.1:5 >=kde-apps/kdebugsettings-19.12.1:5 >=kde-apps/kdf-19.12.1:5 >=kde-apps/kteatime-19.12.1:5 >=kde-apps/ktimer-19.12.1:5 >=kde-apps/kwalletmanager-19.12.1:5 >=kde-apps/sweeper-19.12.1:5 >=kde-apps/yakuake-19.12.1:5 cups? ( >=kde-apps/print-manager-19.12.1:5 ) floppy? ( >=kde-apps/kfloppy-19.12.1:5 ) gpg? ( >=kde-apps/kgpg-19.12.1:5 ) webengine? ( >=kde-apps/kimagemapeditor-19.12.1:5 ) 7zip? ( app-arch/p7zip ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar app-arch/unrar app-arch/unar ) )
-SLOT=5
-_md5_=d8682fd4fc5ab1ebb69140365e1aff79
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-19.12.2 b/metadata/md5-cache/kde-apps/kdeutils-meta-19.12.2
new file mode 100644
index 000000000000..a7d9e2ec5948
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=kdeutils - merge this to pull in all kdeutils-derived packages
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities https://utils.kde.org
+IUSE=7zip cups floppy gpg lrz rar +webengine
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ark-19.12.2:5 >=kde-apps/filelight-19.12.2:5 >=kde-apps/kate-19.12.2:5 >=kde-apps/kbackup-19.12.2:5 >=kde-apps/kcalc-19.12.2:5 >=kde-apps/kcharselect-19.12.2:5 >=kde-apps/kdebugsettings-19.12.2:5 >=kde-apps/kdf-19.12.2:5 >=kde-apps/kteatime-19.12.2:5 >=kde-apps/ktimer-19.12.2:5 >=kde-apps/kwalletmanager-19.12.2:5 >=kde-apps/sweeper-19.12.2:5 >=kde-apps/yakuake-19.12.2:5 cups? ( >=kde-apps/print-manager-19.12.2:5 ) floppy? ( >=kde-apps/kfloppy-19.12.2:5 ) gpg? ( >=kde-apps/kgpg-19.12.2:5 ) webengine? ( >=kde-apps/kimagemapeditor-19.12.2:5 ) 7zip? ( app-arch/p7zip ) lrz? ( app-arch/lrzip ) rar? ( || ( app-arch/rar app-arch/unrar app-arch/unar ) )
+SLOT=5
+_md5_=d8682fd4fc5ab1ebb69140365e1aff79
diff --git a/metadata/md5-cache/kde-apps/kdf-19.12.1 b/metadata/md5-cache/kde-apps/kdf-19.12.1
deleted file mode 100644
index db3154371680..000000000000
--- a/metadata/md5-cache/kde-apps/kdf-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE free disk space utility
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.kdf https://utils.kde.org/projects/kdf/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdf-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32e8200c06f617f1a717f2b449e28675
diff --git a/metadata/md5-cache/kde-apps/kdf-19.12.2 b/metadata/md5-cache/kde-apps/kdf-19.12.2
new file mode 100644
index 000000000000..da24f71712e8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdf-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE free disk space utility
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.kdf https://utils.kde.org/projects/kdf/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdf-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=32e8200c06f617f1a717f2b449e28675
diff --git a/metadata/md5-cache/kde-apps/kdialog-19.12.1 b/metadata/md5-cache/kde-apps/kdialog-19.12.1
deleted file mode 100644
index 32e0fb7cab33..000000000000
--- a/metadata/md5-cache/kde-apps/kdialog-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kdialog
-IUSE=X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdialog-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ae4ef69901402eba4ecf13b949f66cbf
diff --git a/metadata/md5-cache/kde-apps/kdialog-19.12.2 b/metadata/md5-cache/kde-apps/kdialog-19.12.2
new file mode 100644
index 000000000000..80b0961e0b40
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdialog-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Can be used to show nice dialog boxes from shell scripts
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kdialog
+IUSE=X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdialog-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae4ef69901402eba4ecf13b949f66cbf
diff --git a/metadata/md5-cache/kde-apps/kdiamond-19.12.1 b/metadata/md5-cache/kde-apps/kdiamond-19.12.1
deleted file mode 100644
index 41b1645aac44..000000000000
--- a/metadata/md5-cache/kde-apps/kdiamond-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Single player three-in-a-row game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kdiamond https://games.kde.org/game.php?game=kdiamond
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdiamond-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5489f36dd4dd713ac9257a4dbeb9a96e
diff --git a/metadata/md5-cache/kde-apps/kdiamond-19.12.2 b/metadata/md5-cache/kde-apps/kdiamond-19.12.2
new file mode 100644
index 000000000000..0f2ce764f8c2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdiamond-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Single player three-in-a-row game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kdiamond https://games.kde.org/game.php?game=kdiamond
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdiamond-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5489f36dd4dd713ac9257a4dbeb9a96e
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-19.12.1 b/metadata/md5-cache/kde-apps/keditbookmarks-19.12.1
deleted file mode 100644
index 1c975e7a2808..000000000000
--- a/metadata/md5-cache/kde-apps/keditbookmarks-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Bookmarks editor based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+man test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/keditbookmarks-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6eba2c6c3511358d93c319f60e97ec90
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-19.12.2 b/metadata/md5-cache/kde-apps/keditbookmarks-19.12.2
new file mode 100644
index 000000000000..c8e23887749c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Bookmarks editor based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+man test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/keditbookmarks-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6eba2c6c3511358d93c319f60e97ec90
diff --git a/metadata/md5-cache/kde-apps/kfind-19.12.1 b/metadata/md5-cache/kde-apps/kfind-19.12.1
deleted file mode 100644
index 05496977100e..000000000000
--- a/metadata/md5-cache/kde-apps/kfind-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=File finder utility based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kfind
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kfind-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=08a86b5ae41917de768f801e883e787c
diff --git a/metadata/md5-cache/kde-apps/kfind-19.12.2 b/metadata/md5-cache/kde-apps/kfind-19.12.2
new file mode 100644
index 000000000000..bd05d58dd48b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfind-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=File finder utility based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kfind
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kfilemetadata-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kfind-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08a86b5ae41917de768f801e883e787c
diff --git a/metadata/md5-cache/kde-apps/kfloppy-19.12.1 b/metadata/md5-cache/kde-apps/kfloppy-19.12.1
deleted file mode 100644
index 4cc756380f36..000000000000
--- a/metadata/md5-cache/kde-apps/kfloppy-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Straightforward graphical means to format 3.5" and 5.25" floppy disks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kfloppy https://utils.kde.org/projects/kfloppy/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kfloppy-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb143b43ecd9e7b7e418654bfd8bf07b
diff --git a/metadata/md5-cache/kde-apps/kfloppy-19.12.2 b/metadata/md5-cache/kde-apps/kfloppy-19.12.2
new file mode 100644
index 000000000000..cf7283724357
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfloppy-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Straightforward graphical means to format 3.5" and 5.25" floppy disks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kfloppy https://utils.kde.org/projects/kfloppy/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kfloppy-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb143b43ecd9e7b7e418654bfd8bf07b
diff --git a/metadata/md5-cache/kde-apps/kfourinline-19.12.1 b/metadata/md5-cache/kde-apps/kfourinline-19.12.1
deleted file mode 100644
index f2e080f87bbd..000000000000
--- a/metadata/md5-cache/kde-apps/kfourinline-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE four-in-a-row game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kfourinline https://games.kde.org/game.php?game=kfourinline
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kfourinline-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7eb7ef70dc20d4c3952d6e42cb2163d
diff --git a/metadata/md5-cache/kde-apps/kfourinline-19.12.2 b/metadata/md5-cache/kde-apps/kfourinline-19.12.2
new file mode 100644
index 000000000000..ac417ec7b21e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kfourinline-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE four-in-a-row game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kfourinline https://games.kde.org/game.php?game=kfourinline
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kfourinline-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e7eb7ef70dc20d4c3952d6e42cb2163d
diff --git a/metadata/md5-cache/kde-apps/kgeography-19.12.1 b/metadata/md5-cache/kde-apps/kgeography-19.12.1
deleted file mode 100644
index cfb617491b78..000000000000
--- a/metadata/md5-cache/kde-apps/kgeography-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Geography learning tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kgeography
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kgeography-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3396666d04a74bbd58cdf416bea92da7
diff --git a/metadata/md5-cache/kde-apps/kgeography-19.12.2 b/metadata/md5-cache/kde-apps/kgeography-19.12.2
new file mode 100644
index 000000000000..df2460c24983
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgeography-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Geography learning tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kgeography
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kgeography-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3396666d04a74bbd58cdf416bea92da7
diff --git a/metadata/md5-cache/kde-apps/kget-19.12.1 b/metadata/md5-cache/kde-apps/kget-19.12.1
deleted file mode 100644
index 5646cd611e8e..000000000000
--- a/metadata/md5-cache/kde-apps/kget-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.16.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced download manager by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.kget
-IUSE=bittorrent gpg kde mms sqlite debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.16.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kget-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0951e8d566115d8afddaee97fb1c642
diff --git a/metadata/md5-cache/kde-apps/kget-19.12.2 b/metadata/md5-cache/kde-apps/kget-19.12.2
new file mode 100644
index 000000000000..b59cf216b746
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kget-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.16.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Advanced download manager by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.kget
+IUSE=bittorrent gpg kde mms sqlite debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) kde? ( >=kde-plasma/libkworkspace-5.16.5:5 ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kget-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0951e8d566115d8afddaee97fb1c642
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-19.12.1 b/metadata/md5-cache/kde-apps/kgoldrunner-19.12.1
deleted file mode 100644
index f2a6bad8ba73..000000000000
--- a/metadata/md5-cache/kde-apps/kgoldrunner-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game of action and puzzle solving by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kgoldrunner https://games.kde.org/game.php?game=kgoldrunner
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libsndfile media-libs/openal >=dev-qt/qtsvg-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kgoldrunner-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=946d854dc2c35eed60f967f9d59d0a88
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-19.12.2 b/metadata/md5-cache/kde-apps/kgoldrunner-19.12.2
new file mode 100644
index 000000000000..ef92f3dce85a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Game of action and puzzle solving by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kgoldrunner https://games.kde.org/game.php?game=kgoldrunner
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libsndfile media-libs/openal >=dev-qt/qtsvg-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kgoldrunner-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=946d854dc2c35eed60f967f9d59d0a88
diff --git a/metadata/md5-cache/kde-apps/kgpg-19.12.1 b/metadata/md5-cache/kde-apps/kgpg-19.12.1
deleted file mode 100644
index ead4e265ec9f..000000000000
--- a/metadata/md5-cache/kde-apps/kgpg-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gpgme dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kgpg https://utils.kde.org/projects/kgpg/
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gnupg || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-gpg )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kgpg-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=588f01c4a0be21c588e0e14244d5a6e1
diff --git a/metadata/md5-cache/kde-apps/kgpg-19.12.2 b/metadata/md5-cache/kde-apps/kgpg-19.12.2
new file mode 100644
index 000000000000..6bc585779666
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kgpg-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gpgme dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Frontend for GnuPG, a powerful encryption utility by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kgpg https://utils.kde.org/projects/kgpg/
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/gnupg || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-gpg )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kgpg-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=588f01c4a0be21c588e0e14244d5a6e1
diff --git a/metadata/md5-cache/kde-apps/khangman-19.12.1 b/metadata/md5-cache/kde-apps/khangman-19.12.1
deleted file mode 100644
index 233d68f3ebfb..000000000000
--- a/metadata/md5-cache/kde-apps/khangman-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classical hangman game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.khangman https://edu.kde.org/khangman/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-19.12.1:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/khangman-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3bae6cdbb24159763505cb9a949a4f56
diff --git a/metadata/md5-cache/kde-apps/khangman-19.12.2 b/metadata/md5-cache/kde-apps/khangman-19.12.2
new file mode 100644
index 000000000000..a03808eb7243
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khangman-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Classical hangman game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.khangman https://edu.kde.org/khangman/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-19.12.2:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/khangman-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3bae6cdbb24159763505cb9a949a4f56
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-19.12.1 b/metadata/md5-cache/kde-apps/khelpcenter-19.12.1
deleted file mode 100644
index 972b21030d7a..000000000000
--- a/metadata/md5-cache/kde-apps/khelpcenter-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdoctools-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Application to read documentation for KDE Plasma, Applications, Utilities
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.Help https://userbase.kde.org/KHelpCenter
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdoctools-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/khelpcenter-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88f67e4bbd24f18b8440d522c1fb87cd
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-19.12.2 b/metadata/md5-cache/kde-apps/khelpcenter-19.12.2
new file mode 100644
index 000000000000..df87b3ed5914
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/khelpcenter-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdoctools-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Application to read documentation for KDE Plasma, Applications, Utilities
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.Help https://userbase.kde.org/KHelpCenter
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdoctools-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/khelpcenter-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=88f67e4bbd24f18b8440d522c1fb87cd
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-19.12.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-19.12.1
deleted file mode 100644
index 14de67713bbc..000000000000
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/kpimtextedit-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for managing identitites
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/kpimtextedit-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kidentitymanagement-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58e2a67e269b9c58f74c8b30200febd3
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-19.12.2 b/metadata/md5-cache/kde-apps/kidentitymanagement-19.12.2
new file mode 100644
index 000000000000..47b8c25296f8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for managing identitites
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kidentitymanagement-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=22d32c8ecaf28d0c863ff96613c3c144
diff --git a/metadata/md5-cache/kde-apps/kig-19.08.3-r3 b/metadata/md5-cache/kde-apps/kig-19.08.3-r3
deleted file mode 100644
index ef7a9b4474a2..000000000000
--- a/metadata/md5-cache/kde-apps/kig-19.08.3-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) >=kde-frameworks/ktexteditor-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kig https://edu.kde.org/kig/
-IUSE=geogebra scripting python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 debug +handbook test
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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 )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kig-19.08.3.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4532a832e2a80b27f53fc14454e17c1e
diff --git a/metadata/md5-cache/kde-apps/kig-19.08.3-r4 b/metadata/md5-cache/kde-apps/kig-19.08.3-r4
deleted file mode 100644
index a9023f992c86..000000000000
--- a/metadata/md5-cache/kde-apps/kig-19.08.3-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) >=kde-frameworks/ktexteditor-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kig https://edu.kde.org/kig/
-IUSE=geogebra scripting python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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 )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kig-19.08.3.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=49199af8d2f1d809b4c5ab4e50b318ba
diff --git a/metadata/md5-cache/kde-apps/kig-19.08.3-r5 b/metadata/md5-cache/kde-apps/kig-19.08.3-r5
new file mode 100644
index 000000000000..9ce3186a739b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-19.08.3-r5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( python_single_target_python3_6? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_7(-)] ) ) >=kde-frameworks/ktexteditor-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kig https://edu.kde.org/kig/
+IUSE=geogebra scripting python_single_target_python3_6 python_single_target_python3_7 debug +handbook test
+KEYWORDS=amd64 arm64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( python_single_target_python3_6? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_7(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kig-19.08.3.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7d18b14e8311e665c00243537b7a361
diff --git a/metadata/md5-cache/kde-apps/kig-19.08.3-r6 b/metadata/md5-cache/kde-apps/kig-19.08.3-r6
new file mode 100644
index 000000000000..79480edd299c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-19.08.3-r6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( python_single_target_python3_6? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_7(-)] ) ) >=kde-frameworks/ktexteditor-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kig https://edu.kde.org/kig/
+IUSE=geogebra scripting python_single_target_python3_6 python_single_target_python3_7 debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( python_single_target_python3_6? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_7(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kig-19.08.3.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=306c71ed42965bbd4c73212739fd8c3c
diff --git a/metadata/md5-cache/kde-apps/kig-19.12.1-r3 b/metadata/md5-cache/kde-apps/kig-19.12.1-r3
deleted file mode 100644
index 6804801c0d14..000000000000
--- a/metadata/md5-cache/kde-apps/kig-19.12.1-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) >=kde-frameworks/ktexteditor-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Interactive Geometry tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kig https://edu.kde.org/kig/
-IUSE=geogebra scripting python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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 )
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kig-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87bbad4f2cbdb66885eee3c51b1e52f1
diff --git a/metadata/md5-cache/kde-apps/kig-19.12.2-r1 b/metadata/md5-cache/kde-apps/kig-19.12.2-r1
new file mode 100644
index 000000000000..c06f92512169
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kig-19.12.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( python_single_target_python3_6? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_7(-)] ) ) >=kde-frameworks/ktexteditor-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Interactive Geometry tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kig https://edu.kde.org/kig/
+IUSE=geogebra scripting python_single_target_python3_6 python_single_target_python3_7 debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 geogebra? ( >=dev-qt/qtxmlpatterns-5.12.3:5 ) scripting? ( python_single_target_python3_6? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.48:=[python,python_targets_python3_7(-)] ) ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kig-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb16669c145d3303e581c1cc31081a5f
diff --git a/metadata/md5-cache/kde-apps/kigo-19.12.1 b/metadata/md5-cache/kde-apps/kigo-19.12.1
deleted file mode 100644
index 006ffbad9f5d..000000000000
--- a/metadata/md5-cache/kde-apps/kigo-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Go game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kigo
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 games-board/gnugo || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kigo-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cceea23b65c8ef00c24c0682a9818e74
diff --git a/metadata/md5-cache/kde-apps/kigo-19.12.2 b/metadata/md5-cache/kde-apps/kigo-19.12.2
new file mode 100644
index 000000000000..8cb1b895bd71
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kigo-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Go game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kigo
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 games-board/gnugo || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kigo-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cceea23b65c8ef00c24c0682a9818e74
diff --git a/metadata/md5-cache/kde-apps/killbots-19.12.1 b/metadata/md5-cache/kde-apps/killbots-19.12.1
deleted file mode 100644
index 3baf3d97b505..000000000000
--- a/metadata/md5-cache/kde-apps/killbots-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kill the bots or they kill you!
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.killbots
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/killbots-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30c35f5467347afae54f5460c69e30f4
diff --git a/metadata/md5-cache/kde-apps/killbots-19.12.2 b/metadata/md5-cache/kde-apps/killbots-19.12.2
new file mode 100644
index 000000000000..d8f647a64be4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/killbots-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Kill the bots or they kill you!
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.killbots
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/killbots-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=30c35f5467347afae54f5460c69e30f4
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-19.12.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-19.12.1
deleted file mode 100644
index de93888f73d5..000000000000
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Generator of HTML image maps
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kimagemapeditor
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kimagemapeditor-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c7ddd8ab8c73c4bfea37eeb5d3fd96e
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-19.12.2 b/metadata/md5-cache/kde-apps/kimagemapeditor-19.12.2
new file mode 100644
index 000000000000..89af04a3718b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Generator of HTML image maps
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kimagemapeditor
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kimagemapeditor-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4c7ddd8ab8c73c4bfea37eeb5d3fd96e
diff --git a/metadata/md5-cache/kde-apps/kimap-19.12.1 b/metadata/md5-cache/kde-apps/kimap-19.12.1
deleted file mode 100644
index 40c6e047b33f..000000000000
--- a/metadata/md5-cache/kde-apps/kimap-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 dev-libs/cyrus-sasl test? ( >=dev-qt/qtnetwork-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interacting with IMAP servers
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kimap/html/index.html
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kimap-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b57d795887318482e53c0d87718cdfe3
diff --git a/metadata/md5-cache/kde-apps/kimap-19.12.2 b/metadata/md5-cache/kde-apps/kimap-19.12.2
new file mode 100644
index 000000000000..447ac43da556
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kimap-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.12.3:5 >=kde-apps/kmime-19.12.2:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 test? ( >=dev-qt/qtnetwork-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interacting with IMAP servers
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kimap/html/index.html
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.12.3:5 >=kde-apps/kmime-19.12.2:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kimap-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=09540a7942b0335dddac82c40d9ca9e3
diff --git a/metadata/md5-cache/kde-apps/kio-extras-19.12.1 b/metadata/md5-cache/kde-apps/kio-extras-19.12.1
deleted file mode 100644
index b2fcdf323df8..000000000000
--- a/metadata/md5-cache/kde-apps/kio-extras-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( dev-util/gperf ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 >=kde-frameworks/kactivities-stats-5.63.0:5 >=dev-qt/qtsql-5.12.3:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kio-extras.git
-IUSE=activities +man mtp openexr phonon samba +sftp taglib test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 >=kde-frameworks/kactivities-stats-5.63.0:5 >=dev-qt/qtsql-5.12.3:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kio-extras-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2cfbea9c9929dcb17b4c5877275cdd35
diff --git a/metadata/md5-cache/kde-apps/kio-extras-19.12.2 b/metadata/md5-cache/kde-apps/kio-extras-19.12.2
new file mode 100644
index 000000000000..cba617211c92
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kio-extras-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=man? ( dev-util/gperf ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 >=kde-frameworks/kactivities-stats-5.63.0:5 >=dev-qt/qtsql-5.12.3:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kio-extras.git
+IUSE=activities +man mtp openexr phonon samba +sftp taglib test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 >=kde-frameworks/kactivities-stats-5.63.0:5 >=dev-qt/qtsql-5.12.3:5 ) mtp? ( >=media-libs/libmtp-1.1.16:= ) openexr? ( media-libs/openexr:= ) phonon? ( media-libs/phonon[qt5(+)] ) samba? ( net-fs/samba[client] ) sftp? ( net-libs/libssh:=[sftp] ) taglib? ( >=media-libs/taglib-1.11.1 ) >=kde-frameworks/kded-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kio-extras-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2cfbea9c9929dcb17b4c5877275cdd35
diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-19.12.1 b/metadata/md5-cache/kde-apps/kipi-plugins-19.12.1
deleted file mode 100644
index e3996af9ab64..000000000000
--- a/metadata/md5-cache/kde-apps/kipi-plugins-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkipi-19.12.1:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 flashexport? ( >=kde-frameworks/karchive-5.63.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.63.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugins for the KDE Image Plugin Interface
-EAPI=7
-HOMEPAGE=https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/
-IUSE=flashexport mediawiki +remotestorage vkontakte debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkipi-19.12.1:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 flashexport? ( >=kde-frameworks/karchive-5.63.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.63.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kipi-plugins-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=213d366d4ee656d1f37e243c5befca46
diff --git a/metadata/md5-cache/kde-apps/kipi-plugins-19.12.2 b/metadata/md5-cache/kde-apps/kipi-plugins-19.12.2
new file mode 100644
index 000000000000..79bc235cfe57
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kipi-plugins-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkipi-19.12.2:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 flashexport? ( >=kde-frameworks/karchive-5.63.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.63.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plugins for the KDE Image Plugin Interface
+EAPI=7
+HOMEPAGE=https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/
+IUSE=flashexport mediawiki +remotestorage vkontakte debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkipi-19.12.2:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 flashexport? ( >=kde-frameworks/karchive-5.63.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.63.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kipi-plugins-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=213d366d4ee656d1f37e243c5befca46
diff --git a/metadata/md5-cache/kde-apps/kiriki-19.12.1 b/metadata/md5-cache/kde-apps/kiriki-19.12.1
deleted file mode 100644
index 9b575497a4b6..000000000000
--- a/metadata/md5-cache/kde-apps/kiriki-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=An addictive and fun dice game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kiriki https://games.kde.org/game.php?game=kiriki
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kiriki-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44332f8f739ecc54897f11bc3792823f
diff --git a/metadata/md5-cache/kde-apps/kiriki-19.12.2 b/metadata/md5-cache/kde-apps/kiriki-19.12.2
new file mode 100644
index 000000000000..d2452de1aacb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiriki-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=An addictive and fun dice game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kiriki https://games.kde.org/game.php?game=kiriki
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kiriki-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=44332f8f739ecc54897f11bc3792823f
diff --git a/metadata/md5-cache/kde-apps/kiten-19.12.1 b/metadata/md5-cache/kde-apps/kiten-19.12.1
deleted file mode 100644
index 92e393e406fb..000000000000
--- a/metadata/md5-cache/kde-apps/kiten-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Japanese dictionary and reference
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kiten https://edu.kde.org/kiten/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 media-fonts/kanjistrokeorders || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kiten-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d335f09265348f288030a41814cde603
diff --git a/metadata/md5-cache/kde-apps/kiten-19.12.2 b/metadata/md5-cache/kde-apps/kiten-19.12.2
new file mode 100644
index 000000000000..a38d97fb145d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kiten-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Japanese dictionary and reference
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kiten https://edu.kde.org/kiten/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 media-fonts/kanjistrokeorders || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kiten-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d335f09265348f288030a41814cde603
diff --git a/metadata/md5-cache/kde-apps/kitinerary-19.12.1 b/metadata/md5-cache/kde-apps/kitinerary-19.12.1
deleted file mode 100644
index ae384053e947..000000000000
--- a/metadata/md5-cache/kde-apps/kitinerary-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpkpass-19.12.1:5 app-text/poppler:=[qt5] sys-libs/zlib barcode? ( media-libs/zxing-cpp ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Data Model and Extraction System for Travel Reservation information
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
-IUSE=+barcode test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpkpass-19.12.1:5 app-text/poppler:=[qt5] sys-libs/zlib barcode? ( media-libs/zxing-cpp ) !<kde-apps/kdepim-addons-18.07.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kitinerary-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5877ed2b5cbff5ccbe5e7bc374f40be6
diff --git a/metadata/md5-cache/kde-apps/kitinerary-19.12.2 b/metadata/md5-cache/kde-apps/kitinerary-19.12.2
new file mode 100644
index 000000000000..d718677edc71
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kitinerary-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpkpass-19.12.2:5 sys-libs/zlib barcode? ( media-libs/zxing-cpp ) pdf? ( app-text/poppler:=[qt5] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Data Model and Extraction System for Travel Reservation information
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kontact
+IUSE=+barcode pdf test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpkpass-19.12.2:5 sys-libs/zlib barcode? ( media-libs/zxing-cpp ) pdf? ( app-text/poppler:=[qt5] ) !<kde-apps/kdepim-addons-18.07.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kitinerary-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a0d3e1d77ee2842904cfb83261a00d6b
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-19.12.1 b/metadata/md5-cache/kde-apps/kjumpingcube-19.12.1
deleted file mode 100644
index 168da3a85d5b..000000000000
--- a/metadata/md5-cache/kde-apps/kjumpingcube-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tactical one or two player game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kjumpingcube https://games.kde.org/game.php?game=kjumpingcube
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kjumpingcube-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e6f072332374ddeb3b9097ad07eedd2
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-19.12.2 b/metadata/md5-cache/kde-apps/kjumpingcube-19.12.2
new file mode 100644
index 000000000000..627171899da0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Tactical one or two player game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kjumpingcube https://games.kde.org/game.php?game=kjumpingcube
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kjumpingcube-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8e6f072332374ddeb3b9097ad07eedd2
diff --git a/metadata/md5-cache/kde-apps/kldap-19.12.1 b/metadata/md5-cache/kde-apps/kldap-19.12.1
deleted file mode 100644
index 41d7d47f7d64..000000000000
--- a/metadata/md5-cache/kde-apps/kldap-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/cyrus-sasl net-nds/openldap dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interacting with LDAP servers
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kldap/html/index.html
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kldap-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7eca2e7e877e271b99831cd675373f6b
diff --git a/metadata/md5-cache/kde-apps/kldap-19.12.2 b/metadata/md5-cache/kde-apps/kldap-19.12.2
new file mode 100644
index 000000000000..7cd414b9061b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kldap-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 net-nds/openldap dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interacting with LDAP servers
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kldap/html/index.html
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 net-nds/openldap || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kldap-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4464ec0bf98d344d87e341a27b062795
diff --git a/metadata/md5-cache/kde-apps/kleopatra-19.12.1 b/metadata/md5-cache/kde-apps/kleopatra-19.12.1
deleted file mode 100644
index ac70148f6d9e..000000000000
--- a/metadata/md5-cache/kde-apps/kleopatra-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kleopatra
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kleopatra-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0cff7431ed1f99feae3d7c0d67460ac
diff --git a/metadata/md5-cache/kde-apps/kleopatra-19.12.2 b/metadata/md5-cache/kde-apps/kleopatra-19.12.2
new file mode 100644
index 000000000000..10693162551b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kleopatra-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Certificate manager and GUI for OpenPGP and CMS cryptography
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kleopatra
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error >=app-crypt/gnupg-2.1 app-crypt/paperkey || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kleopatra-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7b86f77fa10af45ffd222e56559fc151
diff --git a/metadata/md5-cache/kde-apps/klettres-19.12.1 b/metadata/md5-cache/kde-apps/klettres-19.12.1
deleted file mode 100644
index 5fe03a908277..000000000000
--- a/metadata/md5-cache/kde-apps/klettres-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Alphabet learning application
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.klettres https://edu.kde.org/klettres/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/klettres-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e39caf7955efcdea4e974ea96fb59c2
diff --git a/metadata/md5-cache/kde-apps/klettres-19.12.2 b/metadata/md5-cache/kde-apps/klettres-19.12.2
new file mode 100644
index 000000000000..078c8c27caee
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klettres-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Alphabet learning application
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.klettres https://edu.kde.org/klettres/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/klettres-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9e39caf7955efcdea4e974ea96fb59c2
diff --git a/metadata/md5-cache/kde-apps/klickety-19.12.1 b/metadata/md5-cache/kde-apps/klickety-19.12.1
deleted file mode 100644
index 75f6f68d2af2..000000000000
--- a/metadata/md5-cache/kde-apps/klickety-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=An adaptation of the Clickomania game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.klickety https://games.kde.org/game.php?game=klickety
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/klickety-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a750a7ded75dd3142bfd6be570d78030
diff --git a/metadata/md5-cache/kde-apps/klickety-19.12.2 b/metadata/md5-cache/kde-apps/klickety-19.12.2
new file mode 100644
index 000000000000..ed9eb52876c8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klickety-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=An adaptation of the Clickomania game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.klickety https://games.kde.org/game.php?game=klickety
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/klickety-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a750a7ded75dd3142bfd6be570d78030
diff --git a/metadata/md5-cache/kde-apps/klines-19.12.1 b/metadata/md5-cache/kde-apps/klines-19.12.1
deleted file mode 100644
index b502d80e9de4..000000000000
--- a/metadata/md5-cache/kde-apps/klines-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A little KDE game about balls and how to get rid of them
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.klines https://games.kde.org/game.php?game=klines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/klines-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eaf89f851dcb005d01125902941951f6
diff --git a/metadata/md5-cache/kde-apps/klines-19.12.2 b/metadata/md5-cache/kde-apps/klines-19.12.2
new file mode 100644
index 000000000000..10352a2af2cb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/klines-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A little KDE game about balls and how to get rid of them
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.klines https://games.kde.org/game.php?game=klines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/klines-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eaf89f851dcb005d01125902941951f6
diff --git a/metadata/md5-cache/kde-apps/kmag-19.12.1 b/metadata/md5-cache/kde-apps/kmag-19.12.1
deleted file mode 100644
index 6ba8fb687323..000000000000
--- a/metadata/md5-cache/kde-apps/kmag-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE screen magnifier
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmag
-IUSE=keyboardfocus debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmag-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eef262115aba6e0e4338407f32f12298
diff --git a/metadata/md5-cache/kde-apps/kmag-19.12.2 b/metadata/md5-cache/kde-apps/kmag-19.12.2
new file mode 100644
index 000000000000..1125ca794d4c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmag-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE screen magnifier
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmag
+IUSE=keyboardfocus debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmag-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eef262115aba6e0e4338407f32f12298
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-19.12.1 b/metadata/md5-cache/kde-apps/kmahjongg-19.12.1
deleted file mode 100644
index 7cdd9a4763c8..000000000000
--- a/metadata/md5-cache/kde-apps/kmahjongg-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=kde-apps/libkmahjongg-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A tile matching game for one or two players
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kmahjongg https://games.kde.org/game.php?game=kmahjongg
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=kde-apps/libkmahjongg-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmahjongg-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=975b9a97457655fe4859cc6c91211e3d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-19.12.2 b/metadata/md5-cache/kde-apps/kmahjongg-19.12.2
new file mode 100644
index 000000000000..6229f1cc3628
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmahjongg-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=kde-apps/libkmahjongg-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A tile matching game for one or two players
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kmahjongg https://games.kde.org/game.php?game=kmahjongg
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=kde-apps/libkmahjongg-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmahjongg-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=975b9a97457655fe4859cc6c91211e3d
diff --git a/metadata/md5-cache/kde-apps/kmail-19.12.1 b/metadata/md5-cache/kde-apps/kmail-19.12.1
deleted file mode 100644
index 73c5bd39e21e..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt test? ( >=kde-apps/akonadi-19.12.1:5[tools] ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libgravatar-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/libksieve-19.12.1:5 >=kde-apps/libktnef-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kldap-19.12.1:5 test? ( >=kde-apps/akonadi-19.12.1:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.kmail2 https://kontact.kde.org/components/kmail.html
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libgravatar-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/libksieve-19.12.1:5 >=kde-apps/libktnef-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.12.1:5 >=kde-apps/kmail-account-wizard-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmail-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01f5a6754b05ccd9bcaba1d6984cab64
diff --git a/metadata/md5-cache/kde-apps/kmail-19.12.2 b/metadata/md5-cache/kde-apps/kmail-19.12.2
new file mode 100644
index 000000000000..31f5e262fa9b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt test? ( >=kde-apps/akonadi-19.12.2:5[tools] ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libgravatar-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/libksieve-19.12.2:5 >=kde-apps/libktnef-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kldap-19.12.2:5 test? ( >=kde-apps/akonadi-19.12.2:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.kmail2 https://kontact.kde.org/components/kmail.html
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libgravatar-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/libksieve-19.12.2:5 >=kde-apps/libktnef-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] >=kde-apps/kdepim-runtime-19.12.2:5 >=kde-apps/kmail-account-wizard-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmail-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fed8e0602fb585cb700c30aefee35ea6
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-19.12.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-19.12.1
deleted file mode 100644
index 344aeb710876..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant for KMail accounts configuration
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmail-account-wizard-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afc0887713fc48d9147708756d5d4c6f
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-19.12.2 b/metadata/md5-cache/kde-apps/kmail-account-wizard-19.12.2
new file mode 100644
index 000000000000..f4952a40e3e3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Assistant for KMail accounts configuration
+EAPI=7
+HOMEPAGE=https://kde.org/ https://userbase.kde.org/Kmail/Account_Wizard
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmail-account-wizard-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9998de444d66b5d78b6372af8a7459be
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-19.12.1 b/metadata/md5-cache/kde-apps/kmailtransport-19.12.1
deleted file mode 100644
index e82656f4aaa9..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/ksmtp-19.12.1:5 >=kde-apps/libkgapi-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( >=kde-frameworks/ktextwidgets-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Mail transport service
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/ksmtp-19.12.1:5 >=kde-apps/libkgapi-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmailtransport-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=17cbe7d798a1f2f552c910a4e4543d97
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-19.12.2 b/metadata/md5-cache/kde-apps/kmailtransport-19.12.2
new file mode 100644
index 000000000000..c8e134cc0a48
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/ksmtp-19.12.2:5 >=kde-apps/libkgapi-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( >=kde-frameworks/ktextwidgets-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Mail transport service
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/ksmtp-19.12.2:5 >=kde-apps/libkgapi-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmailtransport-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=383cbff080dd3cf06f2792ab4177c4a3
diff --git a/metadata/md5-cache/kde-apps/kmbox-19.12.1 b/metadata/md5-cache/kde-apps/kmbox-19.12.1
deleted file mode 100644
index 8dbcd6439f6b..000000000000
--- a/metadata/md5-cache/kde-apps/kmbox-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-apps/kmime-19.12.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for accessing MBox format mail storages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-apps/kmime-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmbox-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c81e97d34c5eed3e592c4f0a0048d5c
diff --git a/metadata/md5-cache/kde-apps/kmbox-19.12.2 b/metadata/md5-cache/kde-apps/kmbox-19.12.2
new file mode 100644
index 000000000000..aed797cb3357
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmbox-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-apps/kmime-19.12.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for accessing MBox format mail storages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-apps/kmime-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmbox-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c81e97d34c5eed3e592c4f0a0048d5c
diff --git a/metadata/md5-cache/kde-apps/kmime-19.12.1 b/metadata/md5-cache/kde-apps/kmime-19.12.1
deleted file mode 100644
index 31d0f18f133f..000000000000
--- a/metadata/md5-cache/kde-apps/kmime-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libary for handling mail messages and newsgroup articles
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmime-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0bbc3d8e76e27e3bc230a87dca8f5a83
diff --git a/metadata/md5-cache/kde-apps/kmime-19.12.2 b/metadata/md5-cache/kde-apps/kmime-19.12.2
new file mode 100644
index 000000000000..731785962ae6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmime-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Libary for handling mail messages and newsgroup articles
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmime-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cf2daa0961324e72d4b5be95594bc042
diff --git a/metadata/md5-cache/kde-apps/kmines-19.12.1 b/metadata/md5-cache/kde-apps/kmines-19.12.1
deleted file mode 100644
index ada7de97a848..000000000000
--- a/metadata/md5-cache/kde-apps/kmines-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Classic mine sweeper game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kmines https://games.kde.org/game.php?game=kmines
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmines-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9fbe2a94b56ad93e333db3e4a0e6795c
diff --git a/metadata/md5-cache/kde-apps/kmines-19.12.2 b/metadata/md5-cache/kde-apps/kmines-19.12.2
new file mode 100644
index 000000000000..f80279518ab2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmines-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Classic mine sweeper game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kmines https://games.kde.org/game.php?game=kmines
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmines-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9fbe2a94b56ad93e333db3e4a0e6795c
diff --git a/metadata/md5-cache/kde-apps/kmix-19.12.1 b/metadata/md5-cache/kde-apps/kmix-19.12.1
deleted file mode 100644
index 8418daffdeb6..000000000000
--- a/metadata/md5-cache/kde-apps/kmix-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.63.0:5 ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Volume control gui based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kmix
-IUSE=alsa plasma pulseaudio debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.63.0:5 ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmix-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c562fcd3dbca96bde41f7c81ddc9c57
diff --git a/metadata/md5-cache/kde-apps/kmix-19.12.2 b/metadata/md5-cache/kde-apps/kmix-19.12.2
new file mode 100644
index 000000000000..06ddd5d6f271
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmix-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.63.0:5 ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Volume control gui based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kmix
+IUSE=alsa plasma pulseaudio debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) plasma? ( >=kde-frameworks/plasma-5.63.0:5 ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.16.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmix-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c562fcd3dbca96bde41f7c81ddc9c57
diff --git a/metadata/md5-cache/kde-apps/kmousetool-19.12.1 b/metadata/md5-cache/kde-apps/kmousetool-19.12.1
deleted file mode 100644
index eb5bf9a42be7..000000000000
--- a/metadata/md5-cache/kde-apps/kmousetool-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE program that clicks the mouse for you
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmousetool
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmousetool-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c96ab5b2cbbafa382b0205bc9f085eff
diff --git a/metadata/md5-cache/kde-apps/kmousetool-19.12.2 b/metadata/md5-cache/kde-apps/kmousetool-19.12.2
new file mode 100644
index 000000000000..a448826518f7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmousetool-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libXext x11-libs/libXt dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE program that clicks the mouse for you
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmousetool
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmousetool-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c96ab5b2cbbafa382b0205bc9f085eff
diff --git a/metadata/md5-cache/kde-apps/kmouth-19.12.1 b/metadata/md5-cache/kde-apps/kmouth-19.12.1
deleted file mode 100644
index f49830b0c841..000000000000
--- a/metadata/md5-cache/kde-apps/kmouth-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Text-to-speech synthesizer front end
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmouth
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmouth-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=922efe8bcac9c7dbffd5ee59b5bb2627
diff --git a/metadata/md5-cache/kde-apps/kmouth-19.12.2 b/metadata/md5-cache/kde-apps/kmouth-19.12.2
new file mode 100644
index 000000000000..0ec674bc2487
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmouth-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Text-to-speech synthesizer front end
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kmouth
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmouth-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=922efe8bcac9c7dbffd5ee59b5bb2627
diff --git a/metadata/md5-cache/kde-apps/kmplot-19.12.1 b/metadata/md5-cache/kde-apps/kmplot-19.12.1
deleted file mode 100644
index 3e86cf75a11a..000000000000
--- a/metadata/md5-cache/kde-apps/kmplot-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Mathematical function plotter
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kmplot https://edu.kde.org/kmplot/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kmplot-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f34f1820d7450e65061defbd9d5fca6
diff --git a/metadata/md5-cache/kde-apps/kmplot-19.12.2 b/metadata/md5-cache/kde-apps/kmplot-19.12.2
new file mode 100644
index 000000000000..a005dc00d005
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmplot-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Mathematical function plotter
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kmplot https://edu.kde.org/kmplot/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kmplot-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f34f1820d7450e65061defbd9d5fca6
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-19.12.1 b/metadata/md5-cache/kde-apps/knavalbattle-19.12.1
deleted file mode 100644
index 628899ed20d6..000000000000
--- a/metadata/md5-cache/kde-apps/knavalbattle-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Battleship clone by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.knavalbattle https://games.kde.org/game.php?game=kbattleship
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/knavalbattle-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2330eb6a1600afcca1fe0e7d72747fa8
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-19.12.2 b/metadata/md5-cache/kde-apps/knavalbattle-19.12.2
new file mode 100644
index 000000000000..969ba38e286c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knavalbattle-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Battleship clone by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.knavalbattle https://games.kde.org/game.php?game=kbattleship
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/knavalbattle-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2330eb6a1600afcca1fe0e7d72747fa8
diff --git a/metadata/md5-cache/kde-apps/knetwalk-19.12.1 b/metadata/md5-cache/kde-apps/knetwalk-19.12.1
deleted file mode 100644
index d4d0ac5dabb6..000000000000
--- a/metadata/md5-cache/kde-apps/knetwalk-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE version of the popular NetWalk game for system administrators
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.knetwalk https://games.kde.org/game.php?game=knetwalk
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/knetwalk-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d73e61f3b2e1d4ebff7053074ff64e5b
diff --git a/metadata/md5-cache/kde-apps/knetwalk-19.12.2 b/metadata/md5-cache/kde-apps/knetwalk-19.12.2
new file mode 100644
index 000000000000..04e415491c0b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knetwalk-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE version of the popular NetWalk game for system administrators
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.knetwalk https://games.kde.org/game.php?game=knetwalk
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/knetwalk-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d73e61f3b2e1d4ebff7053074ff64e5b
diff --git a/metadata/md5-cache/kde-apps/knights-19.12.1 b/metadata/md5-cache/kde-apps/knights-19.12.1
deleted file mode 100644
index 30df7f39c05f..000000000000
--- a/metadata/md5-cache/kde-apps/knights-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple chess board based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.knights
-IUSE=speech debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/knights-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10c7da52c6e0ea0f852e19347b412da4
diff --git a/metadata/md5-cache/kde-apps/knights-19.12.2 b/metadata/md5-cache/kde-apps/knights-19.12.2
new file mode 100644
index 000000000000..9e20225b6373
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knights-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple chess board based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.knights
+IUSE=speech debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) || ( games-board/gnuchess games-board/crafty games-board/stockfish games-board/sjeng ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/knights-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10c7da52c6e0ea0f852e19347b412da4
diff --git a/metadata/md5-cache/kde-apps/knotes-19.12.1 b/metadata/md5-cache/kde-apps/knotes-19.12.1
deleted file mode 100644
index 1386af222747..000000000000
--- a/metadata/md5-cache/kde-apps/knotes-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Note taking application
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.knotes https://kontact.kde.org/components/knotes.html
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/knotes-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47c49f4a9843de457d30ba4635865714
diff --git a/metadata/md5-cache/kde-apps/knotes-19.12.2 b/metadata/md5-cache/kde-apps/knotes-19.12.2
new file mode 100644
index 000000000000..51d3ed3ee7ed
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/knotes-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Note taking application
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.knotes https://kontact.kde.org/components/knotes.html
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 >=kde-apps/kdepim-runtime-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/knotes-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1ca037387e241b253f583554027675f
diff --git a/metadata/md5-cache/kde-apps/kolf-19.12.1 b/metadata/md5-cache/kde-apps/kolf-19.12.1
deleted file mode 100644
index 87eb7a27d009..000000000000
--- a/metadata/md5-cache/kde-apps/kolf-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Minigolf game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kolf https://games.kde.org/game.php?game=kolf
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kolf-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c9ec1bed570d6c79720afadde9ceb3d
diff --git a/metadata/md5-cache/kde-apps/kolf-19.12.2 b/metadata/md5-cache/kde-apps/kolf-19.12.2
new file mode 100644
index 000000000000..ab44e66af536
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolf-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Minigolf game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kolf https://games.kde.org/game.php?game=kolf
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kolf-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c9ec1bed570d6c79720afadde9ceb3d
diff --git a/metadata/md5-cache/kde-apps/kollision-19.12.1 b/metadata/md5-cache/kde-apps/kollision-19.12.1
deleted file mode 100644
index f9152a1305bf..000000000000
--- a/metadata/md5-cache/kde-apps/kollision-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple ball dodging game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kollision https://games.kde.org/game.php?game=kollision
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kollision-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3a4fc24fd23b13e05d31860f4ac539e
diff --git a/metadata/md5-cache/kde-apps/kollision-19.12.2 b/metadata/md5-cache/kde-apps/kollision-19.12.2
new file mode 100644
index 000000000000..649ebd419a10
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kollision-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple ball dodging game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kollision https://games.kde.org/game.php?game=kollision
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kollision-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3a4fc24fd23b13e05d31860f4ac539e
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-19.12.1 b/metadata/md5-cache/kde-apps/kolourpaint-19.12.1
deleted file mode 100644
index 90e90c9e703d..000000000000
--- a/metadata/md5-cache/kde-apps/kolourpaint-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 scanner? ( >=kde-apps/libksane-19.12.1:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Paint Program by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.kolourpaint
-IUSE=scanner debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 scanner? ( >=kde-apps/libksane-19.12.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kolourpaint-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=310d2ece49b70cc0ca9747fc283c3763
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-19.12.2 b/metadata/md5-cache/kde-apps/kolourpaint-19.12.2
new file mode 100644
index 000000000000..971bf6c4da08
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kolourpaint-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 scanner? ( >=kde-apps/libksane-19.12.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Paint Program by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/org.kde.kolourpaint
+IUSE=scanner debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 scanner? ( >=kde-apps/libksane-19.12.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kolourpaint-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=310d2ece49b70cc0ca9747fc283c3763
diff --git a/metadata/md5-cache/kde-apps/kompare-19.12.1 b/metadata/md5-cache/kde-apps/kompare-19.12.1
deleted file mode 100644
index 7982a20d26bf..000000000000
--- a/metadata/md5-cache/kde-apps/kompare-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkomparediff2-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A program to view the differences between files
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.kompare
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkomparediff2-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kompare-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db1e1d090d8d6667a0d08e22f176b599
diff --git a/metadata/md5-cache/kde-apps/kompare-19.12.2 b/metadata/md5-cache/kde-apps/kompare-19.12.2
new file mode 100644
index 000000000000..77cfdd286af7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kompare-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkomparediff2-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A program to view the differences between files
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.kompare
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkomparediff2-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kompare-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=db1e1d090d8d6667a0d08e22f176b599
diff --git a/metadata/md5-cache/kde-apps/konqueror-19.12.1 b/metadata/md5-cache/kde-apps/konqueror-19.12.1
deleted file mode 100644
index b90ed7a46fd4..000000000000
--- a/metadata/md5-cache/kde-apps/konqueror-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kdesu-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Web browser and file manager based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.konqueror
-IUSE=activities speech X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kdesu-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) kde-apps/kfind:5 kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/konqueror-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95d16db56f3e8618f3485ad974f0e38b
diff --git a/metadata/md5-cache/kde-apps/konqueror-19.12.2 b/metadata/md5-cache/kde-apps/konqueror-19.12.2
new file mode 100644
index 000000000000..f4fd01e704f6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konqueror-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kdesu-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Web browser and file manager based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.konqueror
+IUSE=activities speech X test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kdesu-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 sys-libs/zlib speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) kde-apps/kfind:5 kde-plasma/kde-cli-tools:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/konqueror-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95d16db56f3e8618f3485ad974f0e38b
diff --git a/metadata/md5-cache/kde-apps/konquest-19.12.1 b/metadata/md5-cache/kde-apps/konquest-19.12.1
deleted file mode 100644
index c8347ef2884f..000000000000
--- a/metadata/md5-cache/kde-apps/konquest-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Galactic Strategy KDE Game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.konquest https://games.kde.org/game.php?game=konquest
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/konquest-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a38005c789ea05bda552d00a8bf8bc23
diff --git a/metadata/md5-cache/kde-apps/konquest-19.12.2 b/metadata/md5-cache/kde-apps/konquest-19.12.2
new file mode 100644
index 000000000000..60ecf2c1a2d8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konquest-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Galactic Strategy KDE Game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.konquest https://games.kde.org/game.php?game=konquest
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/konquest-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a38005c789ea05bda552d00a8bf8bc23
diff --git a/metadata/md5-cache/kde-apps/konsole-19.12.1 b/metadata/md5-cache/kde-apps/konsole-19.12.1
deleted file mode 100644
index b03c4431d578..000000000000
--- a/metadata/md5-cache/kde-apps/konsole-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE's terminal emulator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.konsole https://konsole.kde.org
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/konsole-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14935e64c54ae8c8175cf5b15e6d5985
diff --git a/metadata/md5-cache/kde-apps/konsole-19.12.2 b/metadata/md5-cache/kde-apps/konsole-19.12.2
new file mode 100644
index 000000000000..98a21e8d4b99
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsole-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE's terminal emulator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.konsole https://konsole.kde.org
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kinit-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/konsole-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=14935e64c54ae8c8175cf5b15e6d5985
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-19.12.1 b/metadata/md5-cache/kde-apps/konsolekalendar-19.12.1
deleted file mode 100644
index 990f978dc1d4..000000000000
--- a/metadata/md5-cache/kde-apps/konsolekalendar-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Command line interface to KDE calendars
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/KonsoleKalendar
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/akonadi-calendar-tools-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3e7183d5bc0f5e0953a5f60b6cc4d6d
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-19.12.2 b/metadata/md5-cache/kde-apps/konsolekalendar-19.12.2
new file mode 100644
index 000000000000..f203fa2784da
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Command line interface to KDE calendars
+EAPI=7
+HOMEPAGE=https://kde.org/ https://userbase.kde.org/KonsoleKalendar
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/akonadi-calendar-tools-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e0a8ac1006840575747d462573f03e67
diff --git a/metadata/md5-cache/kde-apps/kontact-19.12.1 b/metadata/md5-cache/kde-apps/kontact-19.12.1
deleted file mode 100644
index 4b3df62104e1..000000000000
--- a/metadata/md5-cache/kde-apps/kontact-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Container application to unify several major PIM applications within one
-EAPI=7
-HOMEPAGE=https://kontact.kde.org/ https://kde.org/applications/office/org.kde.kontact
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kontact-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9aee68c18cb9078fa64bc2b0a9b05c43
diff --git a/metadata/md5-cache/kde-apps/kontact-19.12.2 b/metadata/md5-cache/kde-apps/kontact-19.12.2
new file mode 100644
index 000000000000..7198df36a7b6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontact-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Container application to unify several major PIM applications within one
+EAPI=7
+HOMEPAGE=https://kontact.kde.org/ https://kde.org/applications/office/org.kde.kontact
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kontact-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f1c638e91e105cc7df219b770dfb9847
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-19.12.1 b/metadata/md5-cache/kde-apps/kontactinterface-19.12.1
deleted file mode 100644
index c70b05e1e578..000000000000
--- a/metadata/md5-cache/kde-apps/kontactinterface-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library for embedding KParts in a Kontact component
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/kontactinterface/html/index.html
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kontactinterface-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d21968fd1c659a080b08a4dad80bd033
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-19.12.2 b/metadata/md5-cache/kde-apps/kontactinterface-19.12.2
new file mode 100644
index 000000000000..e3d60dc1549b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kontactinterface-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Library for embedding KParts in a Kontact component
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/kontactinterface/html/index.html
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kontactinterface-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f666b380f227420d3355ad0fe217c0a
diff --git a/metadata/md5-cache/kde-apps/kopete-19.12.1 b/metadata/md5-cache/kde-apps/kopete-19.12.1
deleted file mode 100644
index 8d6e47ba5eba..000000000000
--- a/metadata/md5-cache/kde-apps/kopete-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kemoticons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-frameworks/kdnssd-5.63.0:5 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.kopete https://userbase.kde.org/Kopete
-IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kemoticons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-frameworks/kdnssd-5.63.0:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kopete-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c51593d0cff9d1c7c0df7fcc3f21ee1e
diff --git a/metadata/md5-cache/kde-apps/kopete-19.12.2 b/metadata/md5-cache/kde-apps/kopete-19.12.2
new file mode 100644
index 000000000000..4cbd5d8ef946
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kopete-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kemoticons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-frameworks/kdnssd-5.63.0:5 ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Multi-protocol IM client based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.kopete https://userbase.kde.org/Kopete
+IUSE=ssl v4l +addbookmarks +autoreplace +contactnotes +highlight history latex nowlistening otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence gadu groupwise meanwhile oscar testbed winpopup +xmpp zeroconf debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/gpgme[cxx,qt5] dev-libs/libpcre >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdelibs4support-5.63.0:5 >=kde-frameworks/kemoticons-5.63.0:5 >=kde-frameworks/khtml-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.8.0[threads] ) groupwise? ( app-crypt/qca:2[qt5(+)] ) meanwhile? ( net-libs/meanwhile ) otr? ( >=net-libs/libotr-4.0.0 ) statistics? ( dev-db/sqlite:3 ) v4l? ( media-libs/libv4l ) webpresence? ( dev-libs/libxml2 dev-libs/libxslt ) xmpp? ( app-crypt/qca:2[qt5(+)] net-dns/libidn:0= sys-libs/zlib ) zeroconf? ( >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-frameworks/kdnssd-5.63.0:5 ) latex? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) virtual/latex-base ) ssl? ( app-crypt/qca:2[ssl] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kopete-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c51593d0cff9d1c7c0df7fcc3f21ee1e
diff --git a/metadata/md5-cache/kde-apps/korganizer-19.12.1 b/metadata/md5-cache/kde-apps/korganizer-19.12.1
deleted file mode 100644
index 8266672f2726..000000000000
--- a/metadata/md5-cache/kde-apps/korganizer-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-apps/akonadi-19.12.1:5[tools] ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/eventviews-19.12.1:5 >=kde-apps/incidenceeditor-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-apps/kldap-19.12.1:5 >=dev-qt/designer-5.12.3:5 test? ( >=kde-apps/akonadi-19.12.1:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.korganizer
-IUSE=X test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-calendar-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/akonadi-notes-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/eventviews-19.12.1:5 >=kde-apps/incidenceeditor-19.12.1:5 >=kde-apps/kcalutils-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kontactinterface-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/korganizer-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e444761f6db424c237e85d1c4c3cdd96
diff --git a/metadata/md5-cache/kde-apps/korganizer-19.12.2 b/metadata/md5-cache/kde-apps/korganizer-19.12.2
new file mode 100644
index 000000000000..d30bd00a7240
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/korganizer-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-apps/akonadi-19.12.2:5[tools] ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/eventviews-19.12.2:5 >=kde-apps/incidenceeditor-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-apps/kldap-19.12.2:5 >=dev-qt/designer-5.12.3:5 test? ( >=kde-apps/akonadi-19.12.2:5[sqlite] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Organizational assistant, providing calendars and other similar functionality
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.korganizer
+IUSE=X test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kholidays-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-calendar-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/akonadi-notes-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/eventviews-19.12.2:5 >=kde-apps/incidenceeditor-19.12.2:5 >=kde-apps/kcalutils-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kontactinterface-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) >=kde-apps/kdepim-runtime-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/korganizer-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6a7e173e6062816e3fac02e7fae0c218
diff --git a/metadata/md5-cache/kde-apps/kpat-19.12.1 b/metadata/md5-cache/kde-apps/kpat-19.12.1
deleted file mode 100644
index 253bccc9aa52..000000000000
--- a/metadata/md5-cache/kde-apps/kpat-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-games/freecell-solver dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE patience game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kpat https://games.kde.org/game.php?game=kpat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-games/freecell-solver || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kpat-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60d12fb28df7b08ff1ec644897b936d8
diff --git a/metadata/md5-cache/kde-apps/kpat-19.12.2 b/metadata/md5-cache/kde-apps/kpat-19.12.2
new file mode 100644
index 000000000000..6e486f8d0959
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpat-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-games/freecell-solver dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE patience game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kpat https://games.kde.org/game.php?game=kpat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-games/freecell-solver || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kpat-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=60d12fb28df7b08ff1ec644897b936d8
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-19.12.1 b/metadata/md5-cache/kde-apps/kpimtextedit-19.12.1
deleted file mode 100644
index 36934dfc4122..000000000000
--- a/metadata/md5-cache/kde-apps/kpimtextedit-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 test? ( >=kde-frameworks/ktextwidgets-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=A textedit with PIM-specific features
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kpimtextedit-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a04fcb506fc4e999634889260d9835d
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-19.12.2 b/metadata/md5-cache/kde-apps/kpimtextedit-19.12.2
new file mode 100644
index 000000000000..4afb67a046f7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 test? ( >=kde-frameworks/ktextwidgets-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=A textedit with PIM-specific features
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtspeech-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/grantlee:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kpimtextedit-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=71cc136f7940361a779a2b8517690c0f
diff --git a/metadata/md5-cache/kde-apps/kpkpass-19.12.1 b/metadata/md5-cache/kde-apps/kpkpass-19.12.1
deleted file mode 100644
index b40c10e9f25e..000000000000
--- a/metadata/md5-cache/kde-apps/kpkpass-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to deal with Apple Wallet pass files
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/kontact/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 !<kde-apps/kdepim-addons-18.07.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kpkpass-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e8e401f206ac206cca957f3e9aa87a1
diff --git a/metadata/md5-cache/kde-apps/kpkpass-19.12.2 b/metadata/md5-cache/kde-apps/kpkpass-19.12.2
new file mode 100644
index 000000000000..ccfed05d7af9
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kpkpass-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to deal with Apple Wallet pass files
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/kontact/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/karchive-5.63.0:5 !<kde-apps/kdepim-addons-18.07.80 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kpkpass-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3e8e401f206ac206cca957f3e9aa87a1
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-19.12.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-19.12.1
deleted file mode 100644
index df284b78705f..000000000000
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kqtquickcharts-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b429a7340a91c0d5630de87364ed7e99
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-19.12.2 b/metadata/md5-cache/kde-apps/kqtquickcharts-19.12.2
new file mode 100644
index 000000000000..c2d60d11e97a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Qt Quick plugin for beautiful and interactive charts
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kqtquickcharts-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b429a7340a91c0d5630de87364ed7e99
diff --git a/metadata/md5-cache/kde-apps/krdc-19.12.1 b/metadata/md5-cache/kde-apps/krdc-19.12.1
deleted file mode 100644
index 0ce43a9edf11..000000000000
--- a/metadata/md5-cache/kde-apps/krdc-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 vnc? ( >=net-libs/libvncserver-0.9 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Remote desktop connection (RDP and VNC) client
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.krdc
-IUSE=+rdp vnc debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/krdc-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d31f3986c6b8d558c556eb7a98ed474
diff --git a/metadata/md5-cache/kde-apps/krdc-19.12.2 b/metadata/md5-cache/kde-apps/krdc-19.12.2
new file mode 100644
index 000000000000..03afb5a32dd0
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krdc-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 vnc? ( >=net-libs/libvncserver-0.9 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Remote desktop connection (RDP and VNC) client
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.krdc
+IUSE=+rdp vnc debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/krdc-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d31f3986c6b8d558c556eb7a98ed474
diff --git a/metadata/md5-cache/kde-apps/kreversi-19.12.1 b/metadata/md5-cache/kde-apps/kreversi-19.12.1
deleted file mode 100644
index ef67c815a950..000000000000
--- a/metadata/md5-cache/kde-apps/kreversi-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Board game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kreversi https://games.kde.org/game.php?game=kreversi
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kreversi-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=26768a64b51a9fcae37ee2d1a319216e
diff --git a/metadata/md5-cache/kde-apps/kreversi-19.12.2 b/metadata/md5-cache/kde-apps/kreversi-19.12.2
new file mode 100644
index 000000000000..045c9fab5e77
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kreversi-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Board game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kreversi https://games.kde.org/game.php?game=kreversi
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kreversi-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26768a64b51a9fcae37ee2d1a319216e
diff --git a/metadata/md5-cache/kde-apps/krfb-19.12.1 b/metadata/md5-cache/kde-apps/krfb-19.12.1
deleted file mode 100644
index f572560c1cd6..000000000000
--- a/metadata/md5-cache/kde-apps/krfb-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=VNC-compatible server to share Plasma desktops
-EAPI=7
-HOMEPAGE=https://kde.org/applications/internet/org.kde.krfb
-IUSE=wayland debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) wayland? ( sys-apps/xdg-desktop-portal[screencast] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/krfb-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7b45982668c9eba0b74883bc1e221f4
diff --git a/metadata/md5-cache/kde-apps/krfb-19.12.2 b/metadata/md5-cache/kde-apps/krfb-19.12.2
new file mode 100644
index 000000000000..ae9f958a028d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/krfb-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=VNC-compatible server to share Plasma desktops
+EAPI=7
+HOMEPAGE=https://kde.org/applications/internet/org.kde.krfb
+IUSE=wayland debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image wayland? ( media-video/pipewire:= ) wayland? ( sys-apps/xdg-desktop-portal[screencast] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/krfb-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b7b45982668c9eba0b74883bc1e221f4
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-19.08.3 b/metadata/md5-cache/kde-apps/kross-interpreters-19.08.3
index e51fc6b38ff8..08717371cd3d 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-19.08.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-19.08.3
@@ -4,12 +4,12 @@ DEPEND=>=kde-frameworks/kross-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidget
 DESCRIPTION=Kross interpreter plugins for programming languages
 EAPI=7
 HOMEPAGE=https://kde.org/
-IUSE=+python ruby debug +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python ruby debug +python_single_target_python2_7
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kross-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( python ruby ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=|| ( python ruby ) python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/19.08.3/src/kross-interpreters-19.08.3.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff78b6e526c98973761317f3af220849
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-19.12.1 b/metadata/md5-cache/kde-apps/kross-interpreters-19.12.1
deleted file mode 100644
index 1f5f96af7d03..000000000000
--- a/metadata/md5-cache/kde-apps/kross-interpreters-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kross-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kross interpreter plugins for programming languages
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+python ruby debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kross-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=|| ( python ruby ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kross-interpreters-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40f52e39da87c1e5147f61c07ee3e827
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-19.12.2 b/metadata/md5-cache/kde-apps/kross-interpreters-19.12.2
new file mode 100644
index 000000000000..9f63bfcec5fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+python ruby debug +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kross-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=|| ( python ruby ) python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kross-interpreters-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7303ab8423a775334986e35c1682d6e2
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-19.12.2-r1 b/metadata/md5-cache/kde-apps/kross-interpreters-19.12.2-r1
new file mode 100644
index 000000000000..9f63bfcec5fa
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-19.12.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kross-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Kross interpreter plugins for programming languages
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+python ruby debug +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kross-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=|| ( python ruby ) python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kross-interpreters-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7303ab8423a775334986e35c1682d6e2
diff --git a/metadata/md5-cache/kde-apps/kruler-19.12.1 b/metadata/md5-cache/kde-apps/kruler-19.12.1
deleted file mode 100644
index 7c00b36902c7..000000000000
--- a/metadata/md5-cache/kde-apps/kruler-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Screen ruler for Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/applications/graphics/org.kde.kruler
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kruler-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c63d79b74b05676de3957736e8228a5e
diff --git a/metadata/md5-cache/kde-apps/kruler-19.12.2 b/metadata/md5-cache/kde-apps/kruler-19.12.2
new file mode 100644
index 000000000000..5e6aa6baf4a7
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kruler-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Screen ruler for Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/applications/graphics/org.kde.kruler
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kruler-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c63d79b74b05676de3957736e8228a5e
diff --git a/metadata/md5-cache/kde-apps/kshisen-19.12.1 b/metadata/md5-cache/kde-apps/kshisen-19.12.1
deleted file mode 100644
index 882fa6e64bd6..000000000000
--- a/metadata/md5-cache/kde-apps/kshisen-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=kde-apps/libkmahjongg-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Solitaire-like game played using the standard set of Mahjong tiles
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kshisen https://games.kde.org/game.php?game=kshisen
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=kde-apps/libkmahjongg-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kshisen-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01a8096df7bbd651aa5d1ff86f4d5281
diff --git a/metadata/md5-cache/kde-apps/kshisen-19.12.2 b/metadata/md5-cache/kde-apps/kshisen-19.12.2
new file mode 100644
index 000000000000..cae1de361294
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kshisen-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=kde-apps/libkmahjongg-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Solitaire-like game played using the standard set of Mahjong tiles
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kshisen https://games.kde.org/game.php?game=kshisen
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=kde-apps/libkmahjongg-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kshisen-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01a8096df7bbd651aa5d1ff86f4d5281
diff --git a/metadata/md5-cache/kde-apps/ksirk-19.12.1 b/metadata/md5-cache/kde-apps/ksirk-19.12.1
deleted file mode 100644
index 0e9ed6a45889..000000000000
--- a/metadata/md5-cache/kde-apps/ksirk-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Port of the board game risk
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ksirk https://games.kde.org/game.php?game=ksirk
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ksirk-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=911bec047079cac1f61df796d37e5321
diff --git a/metadata/md5-cache/kde-apps/ksirk-19.12.2 b/metadata/md5-cache/kde-apps/ksirk-19.12.2
new file mode 100644
index 000000000000..a1054d4c9a51
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksirk-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Port of the board game risk
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ksirk https://games.kde.org/game.php?game=ksirk
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 app-crypt/qca:2[qt5(+)] media-libs/phonon[qt5(+)] sys-libs/zlib || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ksirk-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=911bec047079cac1f61df796d37e5321
diff --git a/metadata/md5-cache/kde-apps/ksmtp-19.12.1 b/metadata/md5-cache/kde-apps/ksmtp-19.12.1
deleted file mode 100644
index 72b764e4bad3..000000000000
--- a/metadata/md5-cache/kde-apps/ksmtp-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtnetwork-5.12.3:5 dev-libs/cyrus-sasl dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Job-based library to send email through an SMTP server
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/ksmtp/html/index.html
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtnetwork-5.12.3:5 dev-libs/cyrus-sasl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ksmtp-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8d1de7610d1c23b98c5f3b8c08e3de7
diff --git a/metadata/md5-cache/kde-apps/ksmtp-19.12.2 b/metadata/md5-cache/kde-apps/ksmtp-19.12.2
new file mode 100644
index 000000000000..fb18e8d8f457
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksmtp-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtnetwork-5.12.3:5 dev-libs/cyrus-sasl dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Job-based library to send email through an SMTP server
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/ksmtp/html/index.html
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtnetwork-5.12.3:5 dev-libs/cyrus-sasl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ksmtp-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c8d1de7610d1c23b98c5f3b8c08e3de7
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-19.12.1 b/metadata/md5-cache/kde-apps/ksnakeduel-19.12.1
deleted file mode 100644
index 4aa0d64d3dfa..000000000000
--- a/metadata/md5-cache/kde-apps/ksnakeduel-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Tron game
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ksnakeduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ksnakeduel-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81235e26ef85c21105ae9fec65eda3f2
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-19.12.2 b/metadata/md5-cache/kde-apps/ksnakeduel-19.12.2
new file mode 100644
index 000000000000..d79040164d6c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Tron game
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ksnakeduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ksnakeduel-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=81235e26ef85c21105ae9fec65eda3f2
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-19.12.1 b/metadata/md5-cache/kde-apps/kspaceduel-19.12.1
deleted file mode 100644
index 1683183f22e6..000000000000
--- a/metadata/md5-cache/kde-apps/kspaceduel-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Space Game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kspaceduel https://games.kde.org/game.php?game=kspaceduel
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kspaceduel-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f99f77041f5e56209a1bc199483b6303
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-19.12.2 b/metadata/md5-cache/kde-apps/kspaceduel-19.12.2
new file mode 100644
index 000000000000..1f5ac4395aae
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kspaceduel-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Space Game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kspaceduel https://games.kde.org/game.php?game=kspaceduel
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kspaceduel-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f99f77041f5e56209a1bc199483b6303
diff --git a/metadata/md5-cache/kde-apps/ksquares-19.12.1 b/metadata/md5-cache/kde-apps/ksquares-19.12.1
deleted file mode 100644
index 3ac1f59dc396..000000000000
--- a/metadata/md5-cache/kde-apps/ksquares-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE clone of the game squares
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ksquares https://games.kde.org/game.php?game=ksquares
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ksquares-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c13d501b075d4165ecb5fb81b3da132
diff --git a/metadata/md5-cache/kde-apps/ksquares-19.12.2 b/metadata/md5-cache/kde-apps/ksquares-19.12.2
new file mode 100644
index 000000000000..33a8db8c1938
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksquares-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE clone of the game squares
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ksquares https://games.kde.org/game.php?game=ksquares
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ksquares-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c13d501b075d4165ecb5fb81b3da132
diff --git a/metadata/md5-cache/kde-apps/ksudoku-19.12.1 b/metadata/md5-cache/kde-apps/ksudoku-19.12.1
deleted file mode 100644
index e974b632fcbd..000000000000
--- a/metadata/md5-cache/kde-apps/ksudoku-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/glu ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Logic-based symbol placement puzzle by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ksudoku https://games.kde.org/game.php?game=ksudoku
-IUSE=opengl debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/glu ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ksudoku-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff18d6089965bf6be944277e57e6c168
diff --git a/metadata/md5-cache/kde-apps/ksudoku-19.12.2 b/metadata/md5-cache/kde-apps/ksudoku-19.12.2
new file mode 100644
index 000000000000..1435f1224c46
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksudoku-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/glu ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Logic-based symbol placement puzzle by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ksudoku https://games.kde.org/game.php?game=ksudoku
+IUSE=opengl debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/glu ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ksudoku-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff18d6089965bf6be944277e57e6c168
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-19.12.1 b/metadata/md5-cache/kde-apps/ksystemlog-19.12.1
deleted file mode 100644
index db2be7f4c95a..000000000000
--- a/metadata/md5-cache/kde-apps/ksystemlog-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 systemd? ( sys-apps/systemd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=System log viewer by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.ksystemlog
-IUSE=systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 systemd? ( sys-apps/systemd ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ksystemlog-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed0110ce178e61376550f11a84594739
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-19.12.2 b/metadata/md5-cache/kde-apps/ksystemlog-19.12.2
new file mode 100644
index 000000000000..f755c743879d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ksystemlog-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 systemd? ( sys-apps/systemd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=System log viewer by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.ksystemlog
+IUSE=systemd test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 systemd? ( sys-apps/systemd ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ksystemlog-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed0110ce178e61376550f11a84594739
diff --git a/metadata/md5-cache/kde-apps/kteatime-19.12.1 b/metadata/md5-cache/kde-apps/kteatime-19.12.1
deleted file mode 100644
index 8ccbe730f456..000000000000
--- a/metadata/md5-cache/kde-apps/kteatime-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE timer for making a fine cup of tea
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kteatime
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kteatime-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34353b070d2cd974637a0a390932d171
diff --git a/metadata/md5-cache/kde-apps/kteatime-19.12.2 b/metadata/md5-cache/kde-apps/kteatime-19.12.2
new file mode 100644
index 000000000000..b25ed4fb03be
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kteatime-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE timer for making a fine cup of tea
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kteatime
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kteatime-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=34353b070d2cd974637a0a390932d171
diff --git a/metadata/md5-cache/kde-apps/ktimer-19.12.1 b/metadata/md5-cache/kde-apps/ktimer-19.12.1
deleted file mode 100644
index 101f38a99521..000000000000
--- a/metadata/md5-cache/kde-apps/ktimer-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Little tool to execute programs after some time
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.ktimer https://utils.kde.org/projects/ktimer/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktimer-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=868c4767a8bac77e487a90ecf25c004e
diff --git a/metadata/md5-cache/kde-apps/ktimer-19.12.2 b/metadata/md5-cache/kde-apps/ktimer-19.12.2
new file mode 100644
index 000000000000..869b0cb87c00
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktimer-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Little tool to execute programs after some time
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.ktimer https://utils.kde.org/projects/ktimer/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktimer-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=868c4767a8bac77e487a90ecf25c004e
diff --git a/metadata/md5-cache/kde-apps/ktouch-19.12.1 b/metadata/md5-cache/kde-apps/ktouch-19.12.1
deleted file mode 100644
index 084701acf5de..000000000000
--- a/metadata/md5-cache/kde-apps/ktouch-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=kde-frameworks/kwindowsystem-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Program that helps to learn and practice touch typing
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.ktouch
-IUSE=X debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=kde-apps/kqtquickcharts-19.12.1:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktouch-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b671059f977fd2194dfff82b25e2f066
diff --git a/metadata/md5-cache/kde-apps/ktouch-19.12.2 b/metadata/md5-cache/kde-apps/ktouch-19.12.2
new file mode 100644
index 000000000000..98d716eb7433
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktouch-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=kde-frameworks/kwindowsystem-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Program that helps to learn and practice touch typing
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.ktouch
+IUSE=X debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb[xkb] x11-libs/libxkbfile ) >=kde-apps/kqtquickcharts-19.12.2:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktouch-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b671059f977fd2194dfff82b25e2f066
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.12.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.12.1
deleted file mode 100644
index c154003d6690..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 net-libs/libaccounts-glib dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy account management kcm
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=experimental debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-19.12.1:5 net-im/telepathy-connection-managers || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-accounts-kcm-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06c2744501d83f3601c9cb415cdf6dc1
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.12.2 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.12.2
new file mode 100644
index 000000000000..25d24c127fff
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.2:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 net-libs/libaccounts-glib dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy account management kcm
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=experimental debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.2:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-19.12.2:5 net-im/telepathy-connection-managers || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-accounts-kcm-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06c2744501d83f3601c9cb415cdf6dc1
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-19.12.1 b/metadata/md5-cache/kde-apps/ktp-approver-19.12.1
deleted file mode 100644
index 0e7819173838..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-approver-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy notification handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-approver-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=77871e32dfbe9a01d0f95243bc296c2a
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-19.12.2 b/metadata/md5-cache/kde-apps/ktp-approver-19.12.2
new file mode 100644
index 000000000000..6adc7e640d76
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-approver-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy notification handler
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-approver-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=77871e32dfbe9a01d0f95243bc296c2a
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-19.12.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-19.12.1
deleted file mode 100644
index c566c81038d4..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.1:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy authentication handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.1:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-auth-handler-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dda49dd4ccf790820a6c5561c7ca2035
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-19.12.2 b/metadata/md5-cache/kde-apps/ktp-auth-handler-19.12.2
new file mode 100644
index 000000000000..79de1f17062f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.2:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 app-crypt/qca:2[qt5(+)] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy authentication handler
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/kaccounts-integration-19.12.2:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-auth-handler-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dda49dd4ccf790820a6c5561c7ca2035
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-19.12.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-19.12.1
deleted file mode 100644
index 34e13d3d277f..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy audio/video conferencing UI
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-call-ui-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d82bc331c6b842688d6b50578fe7fe0
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-19.12.2 b/metadata/md5-cache/kde-apps/ktp-call-ui-19.12.2
new file mode 100644
index 000000000000..851c77ff73f5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy audio/video conferencing UI
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 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/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-call-ui-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8d82bc331c6b842688d6b50578fe7fe0
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-19.12.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-19.12.1
deleted file mode 100644
index 2b84463c69b7..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3: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-19.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy common library
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=otr +sso debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3: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-19.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-common-internals-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f079fa10b2c6134ae4678eb8bec591f0
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-19.12.2 b/metadata/md5-cache/kde-apps/ktp-common-internals-19.12.2
new file mode 100644
index 000000000000..1134df91652e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3: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-19.12.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtnetwork-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy common library
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=otr +sso debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3: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-19.12.2:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-common-internals-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f079fa10b2c6134ae4678eb8bec591f0
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-19.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-19.12.1
deleted file mode 100644
index 81e35845a820..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy contact list
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-contact-list-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c89a39738027055ec86643221ff7b35
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-19.12.2 b/metadata/md5-cache/kde-apps/ktp-contact-list-19.12.2
new file mode 100644
index 000000000000..bcada1944880
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy contact list
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-contact-list-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c89a39738027055ec86643221ff7b35
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-19.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-19.12.1
deleted file mode 100644
index 39861a0e0613..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy krunner plugin
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-contact-runner-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7140de37e63eec79a1433fc694f684db
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-19.12.2 b/metadata/md5-cache/kde-apps/ktp-contact-runner-19.12.2
new file mode 100644
index 000000000000..5507fc6e2068
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kservice-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy krunner plugin
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-contact-runner-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7140de37e63eec79a1433fc694f684db
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.12.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.12.1
deleted file mode 100644
index fb793f38165b..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=kde-frameworks/ki18n-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-desktop-applets-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4661e1a861766ac69bafa0b1b9533b00
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.12.2 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.12.2
new file mode 100644
index 000000000000..b7dab6611177
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=kde-frameworks/ki18n-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy contact, presence and chat Plasma applets
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-desktop-applets-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4661e1a861766ac69bafa0b1b9533b00
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.12.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.12.1
deleted file mode 100644
index 39d4d79de4a3..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy file transfer handler
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-filetransfer-handler-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3a5d3696779b81531bf47adfaccb4cc4
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.12.2 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.12.2
new file mode 100644
index 000000000000..d1fb6612030c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy file transfer handler
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-filetransfer-handler-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3a5d3696779b81531bf47adfaccb4cc4
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-19.12.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-19.12.1
deleted file mode 100644
index 6c75f950d02e..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kidletime-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy workspace integration
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kidletime-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-kded-module-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09770bd0addf86cf4ceb1c0c90d8c630
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-19.12.2 b/metadata/md5-cache/kde-apps/ktp-kded-module-19.12.2
new file mode 100644
index 000000000000..10eb39496a55
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kidletime-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy workspace integration
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kidletime-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-kded-module-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=09770bd0addf86cf4ceb1c0c90d8c630
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-19.12.1 b/metadata/md5-cache/kde-apps/ktp-send-file-19.12.1
deleted file mode 100644
index edf1bb66b183..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-send-file-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-19.12.1:5 >=kde-apps/ktp-filetransfer-handler-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-send-file-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9b35e6cd2a38857b3214860bd3ad061
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-19.12.2 b/metadata/md5-cache/kde-apps/ktp-send-file-19.12.2
new file mode 100644
index 000000000000..5cbbd59c0609
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kcmutils-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy file manager plugin to send files to contacts
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-19.12.2:5 >=kde-apps/ktp-filetransfer-handler-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-send-file-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f9b35e6cd2a38857b3214860bd3ad061
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-19.12.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-19.12.1
deleted file mode 100644
index 07c3916d55bd..000000000000
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kemoticons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5[otr] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Telepathy text chat window
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=speech debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kemoticons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.1:5[otr] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-apps/ktp-contact-list-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktp-text-ui-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33caaef59f8c5c0fd881037d51dc65d6
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-19.12.2 b/metadata/md5-cache/kde-apps/ktp-text-ui-19.12.2
new file mode 100644
index 000000000000..e49d776e4ca2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kemoticons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5[otr] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Telepathy text chat window
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=speech debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kemoticons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kpeople-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/ktp-common-internals-19.12.2:5[otr] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-apps/ktp-contact-list-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktp-text-ui-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=33caaef59f8c5c0fd881037d51dc65d6
diff --git a/metadata/md5-cache/kde-apps/ktuberling-19.12.1 b/metadata/md5-cache/kde-apps/ktuberling-19.12.1
deleted file mode 100644
index 7142d4bad3cb..000000000000
--- a/metadata/md5-cache/kde-apps/ktuberling-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Potato game for kids by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.ktuberling https://games.kde.org/game.php?game=ktuberling
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktuberling-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9be2eb8c42585dd6e1a319ecb12233f
diff --git a/metadata/md5-cache/kde-apps/ktuberling-19.12.2 b/metadata/md5-cache/kde-apps/ktuberling-19.12.2
new file mode 100644
index 000000000000..00c36d2b8c1b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/ktuberling-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Potato game for kids by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.ktuberling https://games.kde.org/game.php?game=ktuberling
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktuberling-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9be2eb8c42585dd6e1a319ecb12233f
diff --git a/metadata/md5-cache/kde-apps/kturtle-19.12.1 b/metadata/md5-cache/kde-apps/kturtle-19.12.1
deleted file mode 100644
index 203de2811db1..000000000000
--- a/metadata/md5-cache/kde-apps/kturtle-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Educational programming environment using the Logo programming language
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kturtle https://edu.kde.org/kturtle/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kturtle-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25ebcc576bab0813aaa0ff0293a99ad5
diff --git a/metadata/md5-cache/kde-apps/kturtle-19.12.2 b/metadata/md5-cache/kde-apps/kturtle-19.12.2
new file mode 100644
index 000000000000..23626b1cc1fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kturtle-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Educational programming environment using the Logo programming language
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kturtle https://edu.kde.org/kturtle/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kturtle-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=25ebcc576bab0813aaa0ff0293a99ad5
diff --git a/metadata/md5-cache/kde-apps/kubrick-19.12.1 b/metadata/md5-cache/kde-apps/kubrick-19.12.1
deleted file mode 100644
index 7cb39e038fa2..000000000000
--- a/metadata/md5-cache/kde-apps/kubrick-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/glu virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.kubrick
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/glu virtual/opengl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kubrick-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d994151bb84b12b0b3f1cec22d6e6f75
diff --git a/metadata/md5-cache/kde-apps/kubrick-19.12.2 b/metadata/md5-cache/kde-apps/kubrick-19.12.2
new file mode 100644
index 000000000000..53ac35e86bdd
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kubrick-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/glu virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Game based on the "Rubik's Cube" puzzle by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.kubrick
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 virtual/glu virtual/opengl || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kubrick-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d994151bb84b12b0b3f1cec22d6e6f75
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-19.12.1 b/metadata/md5-cache/kde-apps/kwalletmanager-19.12.1
deleted file mode 100644
index 4c6fd75f8ebd..000000000000
--- a/metadata/md5-cache/kde-apps/kwalletmanager-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kauth-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Tool to manage the passwords on your system using KDE Wallet
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kauth-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kwalletmanager-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71782ddceeb31a76cfe03ea34f420117
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-19.12.2 b/metadata/md5-cache/kde-apps/kwalletmanager-19.12.2
new file mode 100644
index 000000000000..ed2b9379479f
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kauth-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Tool to manage the passwords on your system using KDE Wallet
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kauth-5.63.0:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kwalletmanager-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=71782ddceeb31a76cfe03ea34f420117
diff --git a/metadata/md5-cache/kde-apps/kwave-19.12.1 b/metadata/md5-cache/kde-apps/kwave-19.12.1
deleted file mode 100644
index c6951aea2994..000000000000
--- a/metadata/md5-cache/kde-apps/kwave-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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.12.3:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-19.12.1:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
-EAPI=7
-HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kwave
-IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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.12.3:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kwave-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7c5432be07f6a805b90ad1a05549e2e
diff --git a/metadata/md5-cache/kde-apps/kwave-19.12.2 b/metadata/md5-cache/kde-apps/kwave-19.12.2
new file mode 100644
index 000000000000..0270dce7d856
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwave-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gettext handbook? ( || ( gnome-base/librsvg virtual/imagemagick-tools[png,svg] ) ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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.12.3:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-apps/poxml-19.12.2:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Sound editor built on KDE Frameworks 5 that can edit many types of audio files
+EAPI=7
+HOMEPAGE=https://kde.org/applications/multimedia/org.kde.kwave
+IUSE=alsa flac mp3 opus oss pulseaudio +qtmedia vorbis debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3: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.12.3:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kwave-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a7c5432be07f6a805b90ad1a05549e2e
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-19.12.1 b/metadata/md5-cache/kde-apps/kwordquiz-19.12.1
deleted file mode 100644
index defc84ed61d3..000000000000
--- a/metadata/md5-cache/kde-apps/kwordquiz-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Powerful flashcard and vocabulary learning program
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.kwordquiz https://edu.kde.org/kwordquiz/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kwordquiz-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d067b3b69194408534a79abbd9ff925
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-19.12.2 b/metadata/md5-cache/kde-apps/kwordquiz-19.12.2
new file mode 100644
index 000000000000..c337193248cb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwordquiz-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Powerful flashcard and vocabulary learning program
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.kwordquiz https://edu.kde.org/kwordquiz/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/phonon[qt5(+)] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kwordquiz-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d067b3b69194408534a79abbd9ff925
diff --git a/metadata/md5-cache/kde-apps/kwrite-19.12.1 b/metadata/md5-cache/kde-apps/kwrite-19.12.1
deleted file mode 100644
index dff1d2dc78dc..000000000000
--- a/metadata/md5-cache/kde-apps/kwrite-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Simple text editor based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.kwrite
-IUSE=activities debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kate-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36f4f28c2389dae61a2ee362b234c824
diff --git a/metadata/md5-cache/kde-apps/kwrite-19.12.2 b/metadata/md5-cache/kde-apps/kwrite-19.12.2
new file mode 100644
index 000000000000..e74aec879885
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kwrite-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Simple text editor based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.kwrite
+IUSE=activities debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 activities? ( >=kde-frameworks/kactivities-5.63.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kate-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36f4f28c2389dae61a2ee362b234c824
diff --git a/metadata/md5-cache/kde-apps/libgravatar-19.12.1 b/metadata/md5-cache/kde-apps/libgravatar-19.12.1
deleted file mode 100644
index c8ee61fe1f24..000000000000
--- a/metadata/md5-cache/kde-apps/libgravatar-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for gravatar integration
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libgravatar-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2eeb683412d5a6c6ee502a73bf72b0c
diff --git a/metadata/md5-cache/kde-apps/libgravatar-19.12.2 b/metadata/md5-cache/kde-apps/libgravatar-19.12.2
new file mode 100644
index 000000000000..ee27da55f76c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libgravatar-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for gravatar integration
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libgravatar-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78c41dc361d01869a39242102a9feb54
diff --git a/metadata/md5-cache/kde-apps/libkcddb-19.12.1 b/metadata/md5-cache/kde-apps/libkcddb-19.12.1
deleted file mode 100644
index 9c242873fd67..000000000000
--- a/metadata/md5-cache/kde-apps/libkcddb-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 musicbrainz? ( media-libs/musicbrainz:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library for CDDB
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=musicbrainz debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 musicbrainz? ( media-libs/musicbrainz:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkcddb-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=787c354687cd6d4d581e12735f354d98
diff --git a/metadata/md5-cache/kde-apps/libkcddb-19.12.2 b/metadata/md5-cache/kde-apps/libkcddb-19.12.2
new file mode 100644
index 000000000000..b16e294652a6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcddb-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 musicbrainz? ( media-libs/musicbrainz:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE library for CDDB
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=musicbrainz debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2 )
+RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 musicbrainz? ( media-libs/musicbrainz:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkcddb-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=787c354687cd6d4d581e12735f354d98
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-19.12.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-19.12.1
deleted file mode 100644
index 7fb709fda843..000000000000
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library for playing & ripping CDs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=alsa debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkcompactdisc-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=710eb39173d2d7b32e14d634d8bc9ab0
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-19.12.2 b/metadata/md5-cache/kde-apps/libkcompactdisc-19.12.2
new file mode 100644
index 000000000000..83ce595ffacc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Library for playing & ripping CDs
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=alsa debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/solid-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkcompactdisc-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=710eb39173d2d7b32e14d634d8bc9ab0
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-19.12.1 b/metadata/md5-cache/kde-apps/libkdcraw-19.12.1
deleted file mode 100644
index 8dbfad8b9945..000000000000
--- a/metadata/md5-cache/kde-apps/libkdcraw-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-libs/libraw-0.16:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Digital camera raw image library wrapper
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-libs/libraw-0.16:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkdcraw-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c0b5cbf4bd25cd3acc7c2c36d63b159
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-19.12.2 b/metadata/md5-cache/kde-apps/libkdcraw-19.12.2
new file mode 100644
index 000000000000..4e1f8c618bec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdcraw-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-libs/libraw-0.16:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Digital camera raw image library wrapper
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-libs/libraw-0.16:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkdcraw-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c0b5cbf4bd25cd3acc7c2c36d63b159
diff --git a/metadata/md5-cache/kde-apps/libkdegames-19.12.1 b/metadata/md5-cache/kde-apps/libkdegames-19.12.1
deleted file mode 100644
index b351107fc507..000000000000
--- a/metadata/md5-cache/kde-apps/libkdegames-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Base library common to many KDE games
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsndfile media-libs/openal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkdegames-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acc6e1978941bfc36fd93df0439ffb3e
diff --git a/metadata/md5-cache/kde-apps/libkdegames-19.12.2 b/metadata/md5-cache/kde-apps/libkdegames-19.12.2
new file mode 100644
index 000000000000..f3db64727474
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdegames-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsndfile media-libs/openal dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Base library common to many KDE games
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/libsndfile media-libs/openal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkdegames-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=acc6e1978941bfc36fd93df0439ffb3e
diff --git a/metadata/md5-cache/kde-apps/libkdepim-19.12.1 b/metadata/md5-cache/kde-apps/libkdepim-19.12.1
deleted file mode 100644
index 80e8e06e6c71..000000000000
--- a/metadata/md5-cache/kde-apps/libkdepim-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-search-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkdepim-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e7386b7093c8d2ada11cebfcaecbb0f
diff --git a/metadata/md5-cache/kde-apps/libkdepim-19.12.2 b/metadata/md5-cache/kde-apps/libkdepim-19.12.2
new file mode 100644
index 000000000000..422b89cd90c8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkdepim-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Common PIM libraries
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-search-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkdepim-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c936758506727636a5b2cc63673aaf5
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-19.12.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-19.12.1
deleted file mode 100644
index 9b0c9e301c76..000000000000
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for reading/writing KVTML
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkeduvocdocument-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d6c63df138062ac27c9ef72dd269e70f
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-19.12.2 b/metadata/md5-cache/kde-apps/libkeduvocdocument-19.12.2
new file mode 100644
index 000000000000..710562d86ae3
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for reading/writing KVTML
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkeduvocdocument-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6c63df138062ac27c9ef72dd269e70f
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-19.12.1 b/metadata/md5-cache/kde-apps/libkexiv2-19.12.1
deleted file mode 100644
index a709f45d108d..000000000000
--- a/metadata/md5-cache/kde-apps/libkexiv2-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-gfx/exiv2-0.25:=[xmp=] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Wrapper around exiv2 library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+xmp debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-gfx/exiv2-0.25:=[xmp=] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkexiv2-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a3cfd8ae8d8a0ee9013a42b44dcdd71
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-19.12.2 b/metadata/md5-cache/kde-apps/libkexiv2-19.12.2
new file mode 100644
index 000000000000..ff9353326331
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkexiv2-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-gfx/exiv2-0.25:=[xmp=] dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Wrapper around exiv2 library
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+xmp debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=media-gfx/exiv2-0.25:=[xmp=] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkexiv2-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a3cfd8ae8d8a0ee9013a42b44dcdd71
diff --git a/metadata/md5-cache/kde-apps/libkgapi-19.12.1 b/metadata/md5-cache/kde-apps/libkgapi-19.12.1
deleted file mode 100644
index 5e910932a49c..000000000000
--- a/metadata/md5-cache/kde-apps/libkgapi-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for accessing Google calendar and contact resources
-EAPI=7
-HOMEPAGE=https://api.kde.org/kdepim/libkgapi/html/index.html
-IUSE=nls test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 !kde-apps/kdepim-l10n !<kde-apps/kdepim-runtime-18.07.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkgapi-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18a394a1bbf404f8a3427a1bc063cb86
diff --git a/metadata/md5-cache/kde-apps/libkgapi-19.12.2 b/metadata/md5-cache/kde-apps/libkgapi-19.12.2
new file mode 100644
index 000000000000..cf6ba63eee10
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgapi-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for accessing Google calendar and contact resources
+EAPI=7
+HOMEPAGE=https://api.kde.org/kdepim/libkgapi/html/index.html
+IUSE=nls test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/cyrus-sasl:2 !<kde-apps/kdepim-runtime-18.07.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkgapi-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fc544e47a443d5acde0253a3dfc4065d
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-19.12.1 b/metadata/md5-cache/kde-apps/libkgeomap-19.12.1
deleted file mode 100644
index f11720c91ca9..000000000000
--- a/metadata/md5-cache/kde-apps/libkgeomap-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/marble-19.12.1:5=[kde] >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
-EAPI=7
-HOMEPAGE=https://www.digikam.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/marble-19.12.1:5=[kde] >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkgeomap-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62dec7da8d01a10b41a28ee76a420c8e
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-19.12.2 b/metadata/md5-cache/kde-apps/libkgeomap-19.12.2
new file mode 100644
index 000000000000..0216c015f41d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkgeomap-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/marble-19.12.2:5=[kde] >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Wrapper library for world map components as marble, openstreetmap and googlemap
+EAPI=7
+HOMEPAGE=https://www.digikam.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-apps/marble-19.12.2:5=[kde] >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkgeomap-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62dec7da8d01a10b41a28ee76a420c8e
diff --git a/metadata/md5-cache/kde-apps/libkipi-19.12.1 b/metadata/md5-cache/kde-apps/libkipi-19.12.1
deleted file mode 100644
index 1d66fa238425..000000000000
--- a/metadata/md5-cache/kde-apps/libkipi-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A library for image plugins accross KDE applications
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/32
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkipi-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f7ebaa544971853ebbd69467cd714d8
diff --git a/metadata/md5-cache/kde-apps/libkipi-19.12.2 b/metadata/md5-cache/kde-apps/libkipi-19.12.2
new file mode 100644
index 000000000000..5dfd12804b9d
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkipi-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A library for image plugins accross KDE applications
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/32
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkipi-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8f7ebaa544971853ebbd69467cd714d8
diff --git a/metadata/md5-cache/kde-apps/libkleo-19.12.1 b/metadata/md5-cache/kde-apps/libkleo-19.12.1
deleted file mode 100644
index 3fd65a6e54d2..000000000000
--- a/metadata/md5-cache/kde-apps/libkleo-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] fancyviewer? ( >=kde-apps/kpimtextedit-19.12.1:5 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Library for encryption handling
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+fancyviewer debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] fancyviewer? ( >=kde-apps/kpimtextedit-19.12.1:5 ) !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkleo-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=36f10bb07360e639e47ca7c622202d19
diff --git a/metadata/md5-cache/kde-apps/libkleo-19.12.2 b/metadata/md5-cache/kde-apps/libkleo-19.12.2
new file mode 100644
index 000000000000..409632aaa0fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkleo-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] fancyviewer? ( >=kde-apps/kpimtextedit-19.12.2:5 ) dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Library for encryption handling
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+fancyviewer debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.11.1[cxx,qt5] fancyviewer? ( >=kde-apps/kpimtextedit-19.12.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkleo-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c2c7d8199bf5c41ee3b695ec892e582f
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-19.12.1 b/metadata/md5-cache/kde-apps/libkmahjongg-19.12.1
deleted file mode 100644
index 62039bfa1370..000000000000
--- a/metadata/md5-cache/kde-apps/libkmahjongg-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkmahjongg-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95068bc8d2c12333d98ceae88ade1a16
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-19.12.2 b/metadata/md5-cache/kde-apps/libkmahjongg-19.12.2
new file mode 100644
index 000000000000..c9158533cf77
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Mahjongg library based on Qt/KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkmahjongg-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95068bc8d2c12333d98ceae88ade1a16
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-19.12.1 b/metadata/md5-cache/kde-apps/libkomparediff2-19.12.1
deleted file mode 100644
index 06f6270950b7..000000000000
--- a/metadata/md5-cache/kde-apps/libkomparediff2-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE library to compare files and strings
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libkomparediff2-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6db8df46d95a80996c2ed3e5d555f7d6
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-19.12.2 b/metadata/md5-cache/kde-apps/libkomparediff2-19.12.2
new file mode 100644
index 000000000000..ef52c4487ee8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE library to compare files and strings
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libkomparediff2-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6db8df46d95a80996c2ed3e5d555f7d6
diff --git a/metadata/md5-cache/kde-apps/libksane-19.12.1 b/metadata/md5-cache/kde-apps/libksane-19.12.1
deleted file mode 100644
index 080e1b5cc494..000000000000
--- a/metadata/md5-cache/kde-apps/libksane-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=SANE Library interface based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=kwallet debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.63.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libksane-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b08b7a47499e24d634b13bb775bcccb
diff --git a/metadata/md5-cache/kde-apps/libksane-19.12.2 b/metadata/md5-cache/kde-apps/libksane-19.12.2
new file mode 100644
index 000000000000..5ee606899bc2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksane-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=SANE Library interface based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=kwallet debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-gfx/sane-backends kwallet? ( >=kde-frameworks/kwallet-5.63.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libksane-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6b08b7a47499e24d634b13bb775bcccb
diff --git a/metadata/md5-cache/kde-apps/libksieve-19.12.1 b/metadata/md5-cache/kde-apps/libksieve-19.12.1
deleted file mode 100644
index 29b7e7995dd9..000000000000
--- a/metadata/md5-cache/kde-apps/libksieve-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5= dev-libs/cyrus-sasl >=kde-apps/kimap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5= dev-libs/cyrus-sasl !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/libksieve-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5e337d52c8cc64e048d16eaff1c979e
diff --git a/metadata/md5-cache/kde-apps/libksieve-19.12.2 b/metadata/md5-cache/kde-apps/libksieve-19.12.2
new file mode 100644
index 000000000000..bf7a1ad6cce2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libksieve-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/cyrus-sasl >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5= >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/kimap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Common PIM libraries
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=dev-libs/cyrus-sasl >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5= >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/libksieve-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a407b11e9025ecec993cc0ca28f08058
diff --git a/metadata/md5-cache/kde-apps/libktnef-19.12.1 b/metadata/md5-cache/kde-apps/libktnef-19.12.1
deleted file mode 100644
index 3785cea3588f..000000000000
--- a/metadata/md5-cache/kde-apps/libktnef-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kcalutils-19.12.1:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for handling TNEF data
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kcalutils-19.12.1:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/ktnef-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55a3ad18e13b3e0a8aa216d2759fd26e
diff --git a/metadata/md5-cache/kde-apps/libktnef-19.12.2 b/metadata/md5-cache/kde-apps/libktnef-19.12.2
new file mode 100644
index 000000000000..811203b5b0da
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/libktnef-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kcalutils-19.12.2:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for handling TNEF data
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/kcalutils-19.12.2:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/ktnef-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c18fd48bcb605b039a95f3e53277ca6c
diff --git a/metadata/md5-cache/kde-apps/lokalize-19.08.3 b/metadata/md5-cache/kde-apps/lokalize-19.08.3
deleted file mode 100644
index abd44cba2f16..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-19.08.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=app-text/hunspell-1.2.8:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/lokalize https://l10n.kde.org/tools/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 debug +handbook
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=app-text/hunspell-1.2.8:= dev-python/translate-toolkit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-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=5
-SRC_URI=mirror://kde/stable/release-service/19.08.3/src/lokalize-19.08.3.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d51e586d9e08e19ff3ba21cd200b7286
diff --git a/metadata/md5-cache/kde-apps/lokalize-19.08.3-r1 b/metadata/md5-cache/kde-apps/lokalize-19.08.3-r1
new file mode 100644
index 000000000000..4adf63ba67fc
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-19.08.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=app-text/hunspell-1.2.8:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Applications 5 translation tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/lokalize https://l10n.kde.org/tools/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 debug +handbook
+KEYWORDS=amd64 arm64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=app-text/hunspell-1.2.8:= python_single_target_python3_6? ( dev-python/translate-toolkit[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/translate-toolkit[python_targets_python3_7(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.08.3/src/lokalize-19.08.3.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9e4141d456a7a7061277a540ea7f0256
diff --git a/metadata/md5-cache/kde-apps/lokalize-19.12.1 b/metadata/md5-cache/kde-apps/lokalize-19.12.1
deleted file mode 100644
index 8cfb178592a4..000000000000
--- a/metadata/md5-cache/kde-apps/lokalize-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE Applications 5 translation tool
-EAPI=7
-HOMEPAGE=https://kde.org/applications/office/org.kde.lokalize https://l10n.kde.org/tools/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 dev-python/translate-toolkit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/lokalize-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75a2ffc9d81b789965970fcb311ea08f
diff --git a/metadata/md5-cache/kde-apps/lokalize-19.12.2-r1 b/metadata/md5-cache/kde-apps/lokalize-19.12.2-r1
new file mode 100644
index 000000000000..d4eb9caf9ec6
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lokalize-19.12.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE Applications 5 translation tool
+EAPI=7
+HOMEPAGE=https://kde.org/applications/office/org.kde.lokalize https://l10n.kde.org/tools/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-text/hunspell-1.2.8:= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 python_single_target_python3_6? ( dev-python/translate-toolkit[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/translate-toolkit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/translate-toolkit[python_targets_python3_8(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/lokalize-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0f49182de8374a4ec3e8c7537e1e771a
diff --git a/metadata/md5-cache/kde-apps/lskat-19.12.1 b/metadata/md5-cache/kde-apps/lskat-19.12.1
deleted file mode 100644
index ffaa70c7a52a..000000000000
--- a/metadata/md5-cache/kde-apps/lskat-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Skat game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.lskat https://games.kde.org/game.php?game=lskat
-IUSE=debug +handbook selinux
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/lskat-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbd2535f8971423dd7205bfd3a5be9a5
diff --git a/metadata/md5-cache/kde-apps/lskat-19.12.2 b/metadata/md5-cache/kde-apps/lskat-19.12.2
new file mode 100644
index 000000000000..e0352b1a3910
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/lskat-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Skat game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.lskat https://games.kde.org/game.php?game=lskat
+IUSE=debug +handbook selinux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kguiaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5 selinux? ( sec-policy/selinux-games )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/lskat-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dbd2535f8971423dd7205bfd3a5be9a5
diff --git a/metadata/md5-cache/kde-apps/mailcommon-19.12.1 b/metadata/md5-cache/kde-apps/mailcommon-19.12.1
deleted file mode 100644
index e44e34ac065a..000000000000
--- a/metadata/md5-cache/kde-apps/mailcommon-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailimporter-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= >=dev-qt/qtxml-5.12.3:5 >=media-libs/phonon-4.10.90 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common mail library
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailimporter-19.12.1:5 >=kde-apps/messagelib-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= >=dev-qt/qtxml-5.12.3:5 >=media-libs/phonon-4.10.90 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/mailcommon-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e88eec12cacd68620c78396b1d51977f
diff --git a/metadata/md5-cache/kde-apps/mailcommon-19.12.2 b/metadata/md5-cache/kde-apps/mailcommon-19.12.2
new file mode 100644
index 000000000000..ef0b3391fab4
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailcommon-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailimporter-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= >=dev-qt/qtxml-5.12.3:5 >=media-libs/phonon-4.10.90 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Common mail library
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailimporter-19.12.2:5 >=kde-apps/messagelib-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= >=dev-qt/qtxml-5.12.3:5 >=media-libs/phonon-4.10.90 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/mailcommon-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=73a75cc4ab269f6bf082c243099cea89
diff --git a/metadata/md5-cache/kde-apps/mailimporter-19.12.1 b/metadata/md5-cache/kde-apps/mailimporter-19.12.1
deleted file mode 100644
index 69065aef2f10..000000000000
--- a/metadata/md5-cache/kde-apps/mailimporter-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to import mail from various sources
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/mailimporter-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=834c1b330e23806f71aca775cb4b445e
diff --git a/metadata/md5-cache/kde-apps/mailimporter-19.12.2 b/metadata/md5-cache/kde-apps/mailimporter-19.12.2
new file mode 100644
index 000000000000..4e68d82ffddb
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mailimporter-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to import mail from various sources
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/mailimporter-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=801db605e73279a44c1417a1557b8061
diff --git a/metadata/md5-cache/kde-apps/marble-19.12.1 b/metadata/md5-cache/kde-apps/marble-19.12.1
deleted file mode 100644
index 440b494f7e70..000000000000
--- a/metadata/md5-cache/kde-apps/marble-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.12.3:5 ) dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) designer? ( >=dev-qt/designer-5.12.3:5 ) geolocation? ( >=dev-qt/qtpositioning-5.12.3:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
-EAPI=7
-HOMEPAGE=https://marble.kde.org/
-IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.12.3:5 ) dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) designer? ( >=dev-qt/designer-5.12.3:5 ) geolocation? ( >=dev-qt/qtpositioning-5.12.3:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/19.12
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/marble-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ce7de31e7141bd978c38ae012855f20f
diff --git a/metadata/md5-cache/kde-apps/marble-19.12.2 b/metadata/md5-cache/kde-apps/marble-19.12.2
new file mode 100644
index 000000000000..79c64fbb5572
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/marble-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=aprs? ( dev-lang/perl ) nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.12.3:5 ) dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) designer? ( >=dev-qt/designer-5.12.3:5 ) geolocation? ( >=dev-qt/qtpositioning-5.12.3:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Virtual Globe and World Atlas to learn more about Earth
+EAPI=7
+HOMEPAGE=https://marble.kde.org/
+IUSE=aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-libs/zlib aprs? ( >=dev-qt/qtserialport-5.12.3:5 ) dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) designer? ( >=dev-qt/designer-5.12.3:5 ) geolocation? ( >=dev-qt/qtpositioning-5.12.3:5 ) gps? ( sci-geosciences/gpsd ) kde? ( >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/krunner-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 ) phonon? ( media-libs/phonon[qt5(+)] ) shapefile? ( sci-libs/shapelib:= ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/19.12
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/marble-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce7de31e7141bd978c38ae012855f20f
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-19.12.1 b/metadata/md5-cache/kde-apps/mbox-importer-19.12.1
deleted file mode 100644
index c0c08d632ad6..000000000000
--- a/metadata/md5-cache/kde-apps/mbox-importer-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/mailimporter-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Import mbox email archives from various sources into Akonadi
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/mailimporter-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/mbox-importer-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58a4e088cca5e8f377d26e84fbcc3117
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-19.12.2 b/metadata/md5-cache/kde-apps/mbox-importer-19.12.2
new file mode 100644
index 000000000000..540594627064
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/mbox-importer-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/mailimporter-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Import mbox email archives from various sources into Akonadi
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/mailimporter-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/mbox-importer-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=402cce9eac2881d83b1f172b8edf5e61
diff --git a/metadata/md5-cache/kde-apps/messagelib-19.12.1 b/metadata/md5-cache/kde-apps/messagelib-19.12.1
deleted file mode 100644
index 0acd7e6ea11f..000000000000
--- a/metadata/md5-cache/kde-apps/messagelib-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/incidenceeditor-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmbox-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libgravatar-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] app-crypt/qca:2 >=dev-libs/grantlee-5.1.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Libraries for messaging functions
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/grantleetheme-19.12.1:5 >=kde-apps/incidenceeditor-19.12.1:5 >=kde-apps/kdepim-apps-libs-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kldap-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmbox-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libgravatar-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/libkleo-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] app-crypt/qca:2 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/messagelib-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb069f59453b439f85580fc894f92229
diff --git a/metadata/md5-cache/kde-apps/messagelib-19.12.2 b/metadata/md5-cache/kde-apps/messagelib-19.12.2
new file mode 100644
index 000000000000..3a35d34eef48
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/messagelib-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/incidenceeditor-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmbox-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libgravatar-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] app-crypt/qca:2 >=dev-libs/grantlee-5.1.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Libraries for messaging functions
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-frameworks/syntax-highlighting-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/grantleetheme-19.12.2:5 >=kde-apps/incidenceeditor-19.12.2:5 >=kde-apps/kdepim-apps-libs-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kldap-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmbox-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libgravatar-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/libkleo-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/gpgme-1.8.0-r1[cxx,qt5] app-crypt/qca:2 >=dev-libs/grantlee-5.1.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/messagelib-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c74170f1ed3fc155f87622b6995e61fc
diff --git a/metadata/md5-cache/kde-apps/minuet-19.12.1-r1 b/metadata/md5-cache/kde-apps/minuet-19.12.1-r1
deleted file mode 100644
index 701eb0593185..000000000000
--- a/metadata/md5-cache/kde-apps/minuet-19.12.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-sound/fluidsynth:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Music Education software by KDE
-EAPI=7
-HOMEPAGE=https://minuet.kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-sound/fluidsynth:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/minuet-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=740a10384297df1390be9c2e6f64b19e
diff --git a/metadata/md5-cache/kde-apps/minuet-19.12.2 b/metadata/md5-cache/kde-apps/minuet-19.12.2
new file mode 100644
index 000000000000..a63007d22837
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/minuet-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-sound/fluidsynth:= dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Music Education software by KDE
+EAPI=7
+HOMEPAGE=https://minuet.kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-sound/fluidsynth:= || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/minuet-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=740a10384297df1390be9c2e6f64b19e
diff --git a/metadata/md5-cache/kde-apps/okular-19.12.1 b/metadata/md5-cache/kde-apps/okular-19.12.1
deleted file mode 100644
index afe17e039c6e..000000000000
--- a/metadata/md5-cache/kde-apps/okular-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.63.0:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjs-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/threadweaver-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.63.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-19.12.1:5 >=dev-qt/qtgui-5.12.3:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-19.12.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) tiff? ( media-libs/tiff:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Universal document viewer based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://okular.kde.org https://kde.org/applications/office/org.kde.okular
-IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.63.0:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjs-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/threadweaver-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.63.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-19.12.1:5 >=dev-qt/qtgui-5.12.3:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-19.12.1:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.63.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.63.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/okular-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d07b7893b5b52ab74d27ce72fcb8e28
diff --git a/metadata/md5-cache/kde-apps/okular-19.12.2 b/metadata/md5-cache/kde-apps/okular-19.12.2
new file mode 100644
index 000000000000..0de7fa5ee143
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/okular-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.63.0:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjs-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/threadweaver-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.63.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-19.12.2:5 >=dev-qt/qtgui-5.12.3:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-19.12.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) tiff? ( media-libs/tiff:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Universal document viewer based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://okular.kde.org https://kde.org/applications/office/org.kde.okular
+IUSE=chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.63.0:5 >=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjs-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kpty-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/threadweaver-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.63.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-19.12.2:5 >=dev-qt/qtgui-5.12.3:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-19.12.2:5 ) pdf? ( app-text/poppler[qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.63.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.63.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/okular-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6d07b7893b5b52ab74d27ce72fcb8e28
diff --git a/metadata/md5-cache/kde-apps/palapeli-19.12.1 b/metadata/md5-cache/kde-apps/palapeli-19.12.1
deleted file mode 100644
index 481333ea48af..000000000000
--- a/metadata/md5-cache/kde-apps/palapeli-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Jigsaw puzzle game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.palapeli
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/palapeli-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7a1f4e314c98eda8ad0d90e375521ec
diff --git a/metadata/md5-cache/kde-apps/palapeli-19.12.2 b/metadata/md5-cache/kde-apps/palapeli-19.12.2
new file mode 100644
index 000000000000..6179bbc15aac
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/palapeli-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Jigsaw puzzle game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.palapeli
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/palapeli-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7a1f4e314c98eda8ad0d90e375521ec
diff --git a/metadata/md5-cache/kde-apps/parley-19.12.1 b/metadata/md5-cache/kde-apps/parley-19.12.1
deleted file mode 100644
index ca2d2fde9f2b..000000000000
--- a/metadata/md5-cache/kde-apps/parley-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=A vocabulary trainer to help you memorize things
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.parley
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-19.12.1:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/parley-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63c33073507dba9c60b48699b67ba19a
diff --git a/metadata/md5-cache/kde-apps/parley-19.12.2 b/metadata/md5-cache/kde-apps/parley-19.12.2
new file mode 100644
index 000000000000..ac343208f724
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/parley-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=A vocabulary trainer to help you memorize things
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.parley
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kross-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/sonnet-5.63.0:5 >=kde-apps/libkeduvocdocument-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebengine-5.12.3:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-19.12.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/parley-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63c33073507dba9c60b48699b67ba19a
diff --git a/metadata/md5-cache/kde-apps/picmi-19.12.1 b/metadata/md5-cache/kde-apps/picmi-19.12.1
deleted file mode 100644
index d8abb692189b..000000000000
--- a/metadata/md5-cache/kde-apps/picmi-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Nonogram logic game by KDE
-EAPI=7
-HOMEPAGE=https://kde.org/applications/games/org.kde.picmi https://games.kde.org/game.php?game=picmi
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.1:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/picmi-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f0d9b163ad389229c2a58f2f7ed92b7
diff --git a/metadata/md5-cache/kde-apps/picmi-19.12.2 b/metadata/md5-cache/kde-apps/picmi-19.12.2
new file mode 100644
index 000000000000..a91ce62c3761
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/picmi-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Nonogram logic game by KDE
+EAPI=7
+HOMEPAGE=https://kde.org/applications/games/org.kde.picmi https://games.kde.org/game.php?game=picmi
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/libkdegames-19.12.2:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/picmi-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f0d9b163ad389229c2a58f2f7ed92b7
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-19.12.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-19.12.1
deleted file mode 100644
index f11f593ae370..000000000000
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant to backup and archive PIM data and configuration
-EAPI=7
-HOMEPAGE=https://kde.org/ https://userbase.kde.org/Kmail/Backup_Options
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/kidentitymanagement-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/kmime-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=kde-apps/mailcommon-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/pim-data-exporter-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ab8dc4a7b04653873bff1b314857a70
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-19.12.2 b/metadata/md5-cache/kde-apps/pim-data-exporter-19.12.2
new file mode 100644
index 000000000000..b989161ea696
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Assistant to backup and archive PIM data and configuration
+EAPI=7
+HOMEPAGE=https://kde.org/ https://userbase.kde.org/Kmail/Backup_Options
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/kidentitymanagement-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/kmime-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=kde-apps/mailcommon-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/pim-data-exporter-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9b82a74f6f938c211479a0bc8d48825
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-19.12.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-19.12.1
deleted file mode 100644
index 0676383731e4..000000000000
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/libksieve-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Assistant for editing IMAP Sieve filters
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/akonadi-mime-19.12.1:5 >=kde-apps/calendarsupport-19.12.1:5 >=kde-apps/kmailtransport-19.12.1:5 >=kde-apps/libksieve-19.12.1:5 >=kde-apps/pimcommon-19.12.1:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/pim-sieve-editor-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61927f28d32841a6ade6d6b37763a1f9
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-19.12.2 b/metadata/md5-cache/kde-apps/pim-sieve-editor-19.12.2
new file mode 100644
index 000000000000..bf32f3c628ce
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/libksieve-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Assistant for editing IMAP Sieve filters
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kcalendarcore-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kwallet-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/akonadi-mime-19.12.2:5 >=kde-apps/calendarsupport-19.12.2:5 >=kde-apps/kmailtransport-19.12.2:5 >=kde-apps/libksieve-19.12.2:5 >=kde-apps/pimcommon-19.12.2:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/pim-sieve-editor-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8117423da4768a98fc044fe5ed9bfbf
diff --git a/metadata/md5-cache/kde-apps/pimcommon-19.12.1 b/metadata/md5-cache/kde-apps/pimcommon-19.12.1
deleted file mode 100644
index 492bd5eb59b8..000000000000
--- a/metadata/md5-cache/kde-apps/pimcommon-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/purpose-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/kimap-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=kde-apps/kmime-19.12.1:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Common PIM libraries
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug designer test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/purpose-5.63.0:5 >=kde-apps/akonadi-19.12.1:5 >=kde-apps/akonadi-contacts-19.12.1:5 >=kde-apps/kimap-19.12.1:5 >=kde-apps/kpimtextedit-19.12.1:5 >=kde-apps/libkdepim-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/pimcommon-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c03c1b24d0e6a5e29c7807c3c1c30f8f
diff --git a/metadata/md5-cache/kde-apps/pimcommon-19.12.2 b/metadata/md5-cache/kde-apps/pimcommon-19.12.2
new file mode 100644
index 000000000000..5c4e0fdf061b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/pimcommon-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxslt dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/purpose-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/kimap-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=kde-apps/kmime-19.12.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Common PIM libraries
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug designer test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcodecs-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcontacts-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kitemmodels-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-frameworks/purpose-5.63.0:5 >=kde-apps/akonadi-19.12.2:5 >=kde-apps/akonadi-contacts-19.12.2:5 >=kde-apps/kimap-19.12.2:5 >=kde-apps/kpimtextedit-19.12.2:5 >=kde-apps/libkdepim-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/pimcommon-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cefb2cd6da46af5748fb22b843d49390
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-19.12.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-19.12.1
deleted file mode 100644
index b18acbdadf69..000000000000
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-19.12.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Plasma Telepathy client
-EAPI=7
-HOMEPAGE=https://community.kde.org/KTp
-IUSE=gstreamer
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-apps/ktp-accounts-kcm-19.12.1:5 >=kde-apps/ktp-approver-19.12.1:5 >=kde-apps/ktp-auth-handler-19.12.1:5 >=kde-apps/ktp-common-internals-19.12.1:5 >=kde-apps/ktp-contact-list-19.12.1:5 >=kde-apps/ktp-contact-runner-19.12.1:5 >=kde-apps/ktp-desktop-applets-19.12.1:5 >=kde-apps/ktp-filetransfer-handler-19.12.1:5 >=kde-apps/ktp-kded-module-19.12.1:5 >=kde-apps/ktp-send-file-19.12.1:5 >=kde-apps/ktp-text-ui-19.12.1:5 gstreamer? ( >=kde-apps/ktp-call-ui-19.12.1:5 )
-SLOT=5
-_md5_=131acc51a33795bedc92f869d819df46
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-19.12.2 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-19.12.2
new file mode 100644
index 000000000000..98160cf1dd4c
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-19.12.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Plasma Telepathy client
+EAPI=7
+HOMEPAGE=https://community.kde.org/KTp
+IUSE=gstreamer
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-apps/ktp-accounts-kcm-19.12.2:5 >=kde-apps/ktp-approver-19.12.2:5 >=kde-apps/ktp-auth-handler-19.12.2:5 >=kde-apps/ktp-common-internals-19.12.2:5 >=kde-apps/ktp-contact-list-19.12.2:5 >=kde-apps/ktp-contact-runner-19.12.2:5 >=kde-apps/ktp-desktop-applets-19.12.2:5 >=kde-apps/ktp-filetransfer-handler-19.12.2:5 >=kde-apps/ktp-kded-module-19.12.2:5 >=kde-apps/ktp-send-file-19.12.2:5 >=kde-apps/ktp-text-ui-19.12.2:5 gstreamer? ( >=kde-apps/ktp-call-ui-19.12.2:5 )
+SLOT=5
+_md5_=131acc51a33795bedc92f869d819df46
diff --git a/metadata/md5-cache/kde-apps/poxml-19.12.1 b/metadata/md5-cache/kde-apps/poxml-19.12.1
deleted file mode 100644
index eb6b1e81008b..000000000000
--- a/metadata/md5-cache/kde-apps/poxml-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.64.0:5 ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtxml-5.12.3:5 sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtxml-5.12.3:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/poxml-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=536ffe12fb31fc33aed71425760c09aa
diff --git a/metadata/md5-cache/kde-apps/poxml-19.12.2 b/metadata/md5-cache/kde-apps/poxml-19.12.2
new file mode 100644
index 000000000000..eec42fd3c657
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/poxml-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.64.0:5 ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtxml-5.12.3:5 sys-devel/gettext dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KDE utility to translate DocBook XML files using gettext po files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtxml-5.12.3:5 sys-devel/gettext || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/poxml-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=536ffe12fb31fc33aed71425760c09aa
diff --git a/metadata/md5-cache/kde-apps/print-manager-19.12.1 b/metadata/md5-cache/kde-apps/print-manager-19.12.1
deleted file mode 100644
index 96a809fef65e..000000000000
--- a/metadata/md5-cache/kde-apps/print-manager-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-print/cups dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Manage print jobs and printers in Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=+gtk debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-print/cups >=kde-plasma/kde-cli-tools-5.16.5:5 gtk? ( app-admin/system-config-printer ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/print-manager-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47787f2c169417af1e1deda73563d600
diff --git a/metadata/md5-cache/kde-apps/print-manager-19.12.2 b/metadata/md5-cache/kde-apps/print-manager-19.12.2
new file mode 100644
index 000000000000..4da7424796a1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/print-manager-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-print/cups dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Manage print jobs and printers in Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=+gtk debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/plasma-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 net-print/cups >=kde-plasma/kde-cli-tools-5.16.5:5 gtk? ( app-admin/system-config-printer ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/print-manager-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47787f2c169417af1e1deda73563d600
diff --git a/metadata/md5-cache/kde-apps/rocs-19.12.1 b/metadata/md5-cache/kde-apps/rocs-19.12.1
deleted file mode 100644
index 99880d9c1b1c..000000000000
--- a/metadata/md5-cache/kde-apps/rocs-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5[scripttools] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interface to work with Graph Theory
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.rocs
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5[scripttools] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/grantlee:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/rocs-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=642d645978c5d780080065957b90b671
diff --git a/metadata/md5-cache/kde-apps/rocs-19.12.2 b/metadata/md5-cache/kde-apps/rocs-19.12.2
new file mode 100644
index 000000000000..6df6a806652e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/rocs-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5[scripttools] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/grantlee:5 >=dev-libs/boost-1.49 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Interface to work with Graph Theory
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.rocs
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdeclarative-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kitemviews-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5[scripttools] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 dev-libs/grantlee:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/rocs-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=642d645978c5d780080065957b90b671
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.12.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.12.1
deleted file mode 100644
index 601088f6d87c..000000000000
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.63.0:5 net-libs/signond dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=KWallet extension for signond
-EAPI=7
-HOMEPAGE=https://01.org/gsso/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kwallet-5.63.0:5 net-libs/signond || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/signon-kwallet-extension-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eb91f9a5de715a644c227915aeb2de20
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.12.2 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.12.2
new file mode 100644
index 000000000000..fcdadca045f8
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kwallet-5.63.0:5 net-libs/signond dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=KWallet extension for signond
+EAPI=7
+HOMEPAGE=https://01.org/gsso/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kwallet-5.63.0:5 net-libs/signond || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/signon-kwallet-extension-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eb91f9a5de715a644c227915aeb2de20
diff --git a/metadata/md5-cache/kde-apps/spectacle-19.12.1 b/metadata/md5-cache/kde-apps/spectacle-19.12.1
deleted file mode 100644
index 1a18ce0a77e8..000000000000
--- a/metadata/md5-cache/kde-apps/spectacle-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwayland-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-19.12.1:5= ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Screenshot capture utility
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.spectacle
-IUSE=kipi share debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
-RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwayland-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-19.12.1:5= ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) kipi? ( >=kde-apps/kipi-plugins-19.12.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/spectacle-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9102cb4041181ae480df6a4ff08a463f
diff --git a/metadata/md5-cache/kde-apps/spectacle-19.12.2 b/metadata/md5-cache/kde-apps/spectacle-19.12.2
new file mode 100644
index 000000000000..a23132c48b72
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/spectacle-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwayland-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-19.12.2:5= ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Screenshot capture utility
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.spectacle
+IUSE=kipi share debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
+RDEPEND=>=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwayland-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-19.12.2:5= ) share? ( >=kde-frameworks/purpose-5.63.0:5 ) kipi? ( >=kde-apps/kipi-plugins-19.12.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/spectacle-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9102cb4041181ae480df6a4ff08a463f
diff --git a/metadata/md5-cache/kde-apps/step-19.12.1 b/metadata/md5-cache/kde-apps/step-19.12.1
deleted file mode 100644
index a3559c615ab3..000000000000
--- a/metadata/md5-cache/kde-apps/step-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Interactive physics simulator
-EAPI=7
-HOMEPAGE=https://kde.org/applications/education/org.kde.step https://edu.kde.org/step/
-IUSE=+gsl nls +qalculate debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/step-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b88aad594e3e6e8e87e9c9372f26b135
diff --git a/metadata/md5-cache/kde-apps/step-19.12.2 b/metadata/md5-cache/kde-apps/step-19.12.2
new file mode 100644
index 000000000000..d0d75c245a48
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/step-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Interactive physics simulator
+EAPI=7
+HOMEPAGE=https://kde.org/applications/education/org.kde.step https://edu.kde.org/step/
+IUSE=+gsl nls +qalculate debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kplotting-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtopengl-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/step-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b88aad594e3e6e8e87e9c9372f26b135
diff --git a/metadata/md5-cache/kde-apps/svgpart-19.12.1 b/metadata/md5-cache/kde-apps/svgpart-19.12.1
deleted file mode 100644
index d49dac0e37bd..000000000000
--- a/metadata/md5-cache/kde-apps/svgpart-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Kpart for viewing SVGs
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/svgpart-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42dd34993b2e5d2b39972591b68c01b7
diff --git a/metadata/md5-cache/kde-apps/svgpart-19.12.2 b/metadata/md5-cache/kde-apps/svgpart-19.12.2
new file mode 100644
index 000000000000..69b0093b7ed1
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/svgpart-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Kpart for viewing SVGs
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/svgpart-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42dd34993b2e5d2b39972591b68c01b7
diff --git a/metadata/md5-cache/kde-apps/sweeper-19.12.1 b/metadata/md5-cache/kde-apps/sweeper-19.12.1
deleted file mode 100644
index b5c33078eb03..000000000000
--- a/metadata/md5-cache/kde-apps/sweeper-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-stats-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
-EAPI=7
-HOMEPAGE=https://kde.org/applications/utilities/org.kde.sweeper https://utils.kde.org/projects/sweeper/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-stats-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/sweeper-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e55a30dc68d74b87428bcb545ced2ec7
diff --git a/metadata/md5-cache/kde-apps/sweeper-19.12.2 b/metadata/md5-cache/kde-apps/sweeper-19.12.2
new file mode 100644
index 000000000000..1aeb3a627979
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/sweeper-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-stats-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Privacy settings widget to clean unwanted traces on the system
+EAPI=7
+HOMEPAGE=https://kde.org/applications/utilities/org.kde.sweeper https://utils.kde.org/projects/sweeper/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-stats-5.63.0:5 >=kde-frameworks/kbookmarks-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/sweeper-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e55a30dc68d74b87428bcb545ced2ec7
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-19.12.1 b/metadata/md5-cache/kde-apps/thumbnailers-19.12.1
deleted file mode 100644
index 53854ea0b110..000000000000
--- a/metadata/md5-cache/kde-apps/thumbnailers-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 raw? ( >=kde-apps/libkdcraw-19.12.1:5 >=kde-apps/libkexiv2-19.12.1:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=raw debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 raw? ( >=kde-apps/libkdcraw-19.12.1:5 >=kde-apps/libkexiv2-19.12.1:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/kdegraphics-thumbnailers-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3368bf76f72551d7e49ca4b952dc87b7
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-19.12.2 b/metadata/md5-cache/kde-apps/thumbnailers-19.12.2
new file mode 100644
index 000000000000..52d99955ba0a
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/thumbnailers-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 raw? ( >=kde-apps/libkdcraw-19.12.2:5 >=kde-apps/libkexiv2-19.12.2:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Thumbnail generators for PDF/PS and RAW files
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=raw debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 raw? ( >=kde-apps/libkdcraw-19.12.2:5 >=kde-apps/libkexiv2-19.12.2:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/kdegraphics-thumbnailers-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3368bf76f72551d7e49ca4b952dc87b7
diff --git a/metadata/md5-cache/kde-apps/umbrello-19.12.1 b/metadata/md5-cache/kde-apps/umbrello-19.12.1
deleted file mode 100644
index 2448aa136443..000000000000
--- a/metadata/md5-cache/kde-apps/umbrello-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kdelibs4support-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE UML Modeller
-EAPI=7
-HOMEPAGE=https://kde.org/applications/development/org.kde.umbrello https://umbrello.kde.org
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtwebkit-5.212.0_pre20180120:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/umbrello-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6349c1cf6729f8bb777b9ac0224d36ca
diff --git a/metadata/md5-cache/kde-apps/umbrello-19.12.2 b/metadata/md5-cache/kde-apps/umbrello-19.12.2
new file mode 100644
index 000000000000..0de8515af5b2
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/umbrello-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.63.0:5 ) >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kdelibs4support-5.63.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE UML Modeller
+EAPI=7
+HOMEPAGE=https://kde.org/applications/development/org.kde.umbrello https://umbrello.kde.org
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kcompletion-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/kjobwidgets-5.63.0:5 >=kde-frameworks/ktexteditor-5.63.0:5 >=kde-frameworks/ktextwidgets-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtwebkit-5.212.0_pre20180120:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/umbrello-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6349c1cf6729f8bb777b9ac0224d36ca
diff --git a/metadata/md5-cache/kde-apps/yakuake-19.12.1 b/metadata/md5-cache/kde-apps/yakuake-19.12.1
deleted file mode 100644
index 356f1c48f193..000000000000
--- a/metadata/md5-cache/kde-apps/yakuake-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/konsole-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 absolute-position? ( >=kde-frameworks/kwayland-5.63.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=Quake-style terminal emulator based on konsole
-EAPI=7
-HOMEPAGE=https://kde.org/applications/system/org.kde.yakuake
-IUSE=absolute-position X debug
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/konsole-19.12.1:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 absolute-position? ( >=kde-frameworks/kwayland-5.63.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/yakuake-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51159732a1848797923d9f61c9ab0cc1
diff --git a/metadata/md5-cache/kde-apps/yakuake-19.12.2 b/metadata/md5-cache/kde-apps/yakuake-19.12.2
new file mode 100644
index 000000000000..d2068e83a753
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/yakuake-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/konsole-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 absolute-position? ( >=kde-frameworks/kwayland-5.63.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Quake-style terminal emulator based on konsole
+EAPI=7
+HOMEPAGE=https://kde.org/applications/system/org.kde.yakuake
+IUSE=absolute-position X debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.63.0:5 >=kde-frameworks/kconfig-5.63.0:5 >=kde-frameworks/kconfigwidgets-5.63.0:5 >=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kcrash-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kglobalaccel-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kiconthemes-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=kde-frameworks/knewstuff-5.63.0:5 >=kde-frameworks/knotifications-5.63.0:5 >=kde-frameworks/knotifyconfig-5.63.0:5 >=kde-frameworks/kparts-5.63.0:5 >=kde-frameworks/kservice-5.63.0:5 >=kde-frameworks/kwidgetsaddons-5.63.0:5 >=kde-frameworks/kwindowsystem-5.63.0:5 >=kde-frameworks/kxmlgui-5.63.0:5 >=kde-apps/konsole-19.12.2:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 absolute-position? ( >=kde-frameworks/kwayland-5.63.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/yakuake-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=51159732a1848797923d9f61c9ab0cc1
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.12.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.12.1
deleted file mode 100644
index 23544df38c06..000000000000
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
-DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/zeroconf-ioslave-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8987c4f2a6c3522b3afbd1d1e2106bb5
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.12.2 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.12.2
new file mode 100644
index 000000000000..cafb481ce308
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-19.12.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.63.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.63.0:5 >=kde-frameworks/kdbusaddons-5.63.0:5 >=kde-frameworks/kdnssd-5.63.0:5 >=kde-frameworks/ki18n-5.63.0:5 >=kde-frameworks/kio-5.63.0:5 >=dev-qt/qtdbus-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/zeroconf-ioslave-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8987c4f2a6c3522b3afbd1d1e2106bb5
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 9af8ed6b72b2..3d5e35cc09e2 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.66.0 b/metadata/md5-cache/kde-frameworks/attica-5.66.0
deleted file mode 100644
index 0be7104513f7..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/attica-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6c1ece35fe72088fbda3b093054bab48
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.67.0 b/metadata/md5-cache/kde-frameworks/attica-5.67.0
new file mode 100644
index 000000000000..d1d40a746990
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/attica-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c1ece35fe72088fbda3b093054bab48
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.66.0 b/metadata/md5-cache/kde-frameworks/baloo-5.66.0
deleted file mode 100644
index 0fa32f8d4576..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/kfilemetadata-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kidletime-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/solid-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-db/lmdb-0.9.17 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/kfilemetadata-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kidletime-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/solid-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/baloo-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=76f00d36172ffa6b260d586e6209b2ac
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.67.0 b/metadata/md5-cache/kde-frameworks/baloo-5.67.0
new file mode 100644
index 000000000000..614bd1759356
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/kfilemetadata-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kidletime-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/solid-5.67*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-db/lmdb-0.9.17 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/kfilemetadata-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kidletime-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/solid-5.67*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/baloo-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0f533333b816dbc3c5e68d556c221b05
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.66.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.66.0
deleted file mode 100644
index c08aaad7b776..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/bluez-qt-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b29d85ab709aaa37151f8be87b031b8
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.67.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.67.0
new file mode 100644
index 000000000000..f5e46b06dbf3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/bluez-qt-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3b29d85ab709aaa37151f8be87b031b8
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.66.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.66.0
deleted file mode 100644
index ebcb3739eb6b..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.66:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/breeze-icons-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ebf9866c8881ba81f6b45b61cf350a54
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.67.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.67.0
new file mode 100644
index 000000000000..5ed66ea18c7e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.67:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/breeze-icons-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ebf9866c8881ba81f6b45b61cf350a54
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.66.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.66.0
deleted file mode 100644
index 4797cfa934d0..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.66:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=test? ( dev-qt/qttest:5 )
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/breeze-icons-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd6bab7a81ba331a6dff02c93d137906
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.67.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.67.0
new file mode 100644
index 000000000000..268905dd56ef
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/qtcore:5 >=kde-frameworks/extra-cmake-modules-5.67:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=test? ( dev-qt/qttest:5 )
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/breeze-icons-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd6bab7a81ba331a6dff02c93d137906
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.66.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.66.0
deleted file mode 100644
index 712725846abd..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-qt/qthelp-5.12.3:5 ) test? ( >=dev-qt/linguist-tools-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/extra-cmake-modules-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f484b4bd8ce76faae28b37090827e5c3
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.67.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.67.0
new file mode 100644
index 000000000000..9abf05f93a9d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-qt/qthelp-5.12.3:5 ) test? ( >=dev-qt/linguist-tools-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/extra-cmake-modules-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f484b4bd8ce76faae28b37090827e5c3
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.66.0-r1 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.66.0-r1
deleted file mode 100644
index 5d2fcb58ad15..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.66.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/knewstuff-5.66*:5 =kde-frameworks/knotifications-5.66*:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) =kde-frameworks/kpackage-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=appstream test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/knewstuff-5.66*:5 =kde-frameworks/knotifications-5.66*:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/frameworkintegration-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23d5f9c6685a20772c9a56f82dc0f1e1
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.67.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.67.0
new file mode 100644
index 000000000000..624ca1d4b41d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/knewstuff-5.67*:5 =kde-frameworks/knotifications-5.67*:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) =kde-frameworks/kpackage-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=appstream test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5= =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/knewstuff-5.67*:5 =kde-frameworks/knotifications-5.67*:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/frameworkintegration-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c08ed9ceb603048677633115629cec7c
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.66.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.66.0
deleted file mode 100644
index 0ea76ebb4e74..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for working with KDE activities
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kactivities-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e86b8e5b8c1eff04dfdb31070e75f17
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.67.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.67.0
new file mode 100644
index 000000000000..e9166e0a4a51
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for working with KDE activities
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=kde-plasma/kactivitymanagerd-5.16.5:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kactivities-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e86b8e5b8c1eff04dfdb31070e75f17
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.66.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.66.0
deleted file mode 100644
index 557ce529a722..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 =kde-frameworks/kactivities-5.66*:5 =kde-frameworks/kconfig-5.66*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 =kde-frameworks/kactivities-5.66*:5 =kde-frameworks/kconfig-5.66*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kactivities-stats-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3801ceb3956d61457e37f2b616188020
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.67.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.67.0
new file mode 100644
index 000000000000..c480c46650be
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 =kde-frameworks/kactivities-5.67*:5 =kde-frameworks/kconfig-5.67*:5 >=dev-libs/boost-1.54 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 =kde-frameworks/kactivities-5.67*:5 =kde-frameworks/kconfig-5.67*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kactivities-stats-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3801ceb3956d61457e37f2b616188020
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.64.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.64.0
deleted file mode 100644
index e7b51abc3659..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.64.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/graphviz[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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=5/5.64
-SRC_URI=mirror://kde/stable/frameworks/5.64/kapidox-5.64.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c485e0d231a234baec472587a8298a4c
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.64.0-r1 b/metadata/md5-cache/kde-frameworks/kapidox-5.64.0-r1
new file mode 100644
index 000000000000..cd81581002ca
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.64.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~arm arm64 x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen python_single_target_python3_6? ( dev-python/jinja[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/jinja[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) media-gfx/graphviz[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=5/5.64
+SRC_URI=mirror://kde/stable/frameworks/5.64/kapidox-5.64.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=daa0d39ee056a8871b2a7bd570cbfa0d
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.66.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.66.0
deleted file mode 100644
index d4b48c790969..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?]
-DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] media-gfx/graphviz[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kapidox-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4d45dc2bf14e029a88e33b5786fcf1f
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.67.0-r1 b/metadata/md5-cache/kde-frameworks/kapidox-5.67.0-r1
new file mode 100644
index 000000000000..ca06d7c4d509
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.67.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] )
+DEFINED_PHASES=compile configure install nofetch prepare setup test unpack
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen python_single_target_python3_6? ( dev-python/jinja[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/jinja[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/jinja[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) media-gfx/graphviz[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kapidox-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f019465626ee59a7d0ed0308fc49d85e
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.66.0 b/metadata/md5-cache/kde-frameworks/karchive-5.66.0
deleted file mode 100644
index e1ac69582c90..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+bzip2 +lzma debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/karchive-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=095cb94b40352faa1cd0cfed4ebb399f
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.67.0 b/metadata/md5-cache/kde-frameworks/karchive-5.67.0
new file mode 100644
index 000000000000..679d2a613436
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+bzip2 +lzma debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/karchive-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=095cb94b40352faa1cd0cfed4ebb399f
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.66.0 b/metadata/md5-cache/kde-frameworks/kauth-5.66.0
deleted file mode 100644
index 7c81ea58b54e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.66.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND==kde-frameworks/kcoreaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kauth-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7833aabf8bf6d3d2f4912bc9a4f9f114
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.67.0 b/metadata/md5-cache/kde-frameworks/kauth-5.67.0
new file mode 100644
index 000000000000..fdca823a481a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.67.0
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND==kde-frameworks/kcoreaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kauth-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7833aabf8bf6d3d2f4912bc9a4f9f114
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.66.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.66.0
deleted file mode 100644
index bd89455ada64..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=kde-frameworks/kconfigwidgets-5.66:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kbookmarks-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0586915d94d4559bfa78e22d04726a2a
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.67.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.67.0
new file mode 100644
index 000000000000..4f2c1d0cc033
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=kde-frameworks/kconfigwidgets-5.67:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kbookmarks-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0586915d94d4559bfa78e22d04726a2a
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.66.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.66.0
deleted file mode 100644
index 4d34ebc9fa3c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for interfacing with calendars
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ test? ( LGPL-3+ )
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kcalendarcore-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b3599a74be2de43883a3cfe7d0f0dac
diff --git a/metadata/md5-cache/kde-frameworks/kcalendarcore-5.67.0 b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.67.0
new file mode 100644
index 000000000000..ba1412b279b2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcalendarcore-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for interfacing with calendars
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ test? ( LGPL-3+ )
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 dev-libs/libical:= !kde-apps/kcalcore:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kcalendarcore-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b3599a74be2de43883a3cfe7d0f0dac
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.66.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.66.0
deleted file mode 100644
index 722c8ffcd9d3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kauth-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kdeclarative-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/kauth-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kdeclarative-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kcmutils-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42ac4a9d985a867b9efffef250676eb4
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.67.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.67.0
new file mode 100644
index 000000000000..2f4f9471d5c5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kauth-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kdeclarative-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND==kde-frameworks/kauth-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kdeclarative-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kcmutils-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42ac4a9d985a867b9efffef250676eb4
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.66.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.66.0
deleted file mode 100644
index 7dfc184dd9b7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kcodecs-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b698c915f0b420388796710bee6dfbba
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.67.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.67.0
new file mode 100644
index 000000000000..863841969a1d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gperf nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kcodecs-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b698c915f0b420388796710bee6dfbba
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.66.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.66.0
deleted file mode 100644
index f639ed0b0d2a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kcompletion-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea5da19230519c45f46c453f04db21d9
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.67.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.67.0
new file mode 100644
index 000000000000..bbd9b16a35b9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kcompletion-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea5da19230519c45f46c453f04db21d9
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.66.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.66.0
deleted file mode 100644
index f17515673f99..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kconfig-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0c84fbc6de09c9d204256f2f815ad8e
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.67.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.67.0
new file mode 100644
index 000000000000..2ab85faa8716
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dbus? ( >=dev-qt/qtdbus-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kconfig-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f0c84fbc6de09c9d204256f2f815ad8e
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.66.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.66.0
deleted file mode 100644
index f7edceceae7b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.66:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kauth-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kauth-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kconfigwidgets-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ddeef12bc78edd2d123da07170b572cc
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.67.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.67.0
new file mode 100644
index 000000000000..4f76ca0235a1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.67:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kauth-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kauth-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kconfigwidgets-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ddeef12bc78edd2d123da07170b572cc
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.66.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.66.0
deleted file mode 100644
index d3d684906be1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcontacts-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 >=dev-qt/qtgui-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Address book API based on KDE Frameworks
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND==kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kcontacts:5 !kde-apps/kdepim-l10n app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kcontacts-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b50a5503bca7acc2e324728700ea8bbd
diff --git a/metadata/md5-cache/kde-frameworks/kcontacts-5.67.0 b/metadata/md5-cache/kde-frameworks/kcontacts-5.67.0
new file mode 100644
index 000000000000..9777da62af37
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcontacts-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 >=dev-qt/qtgui-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Address book API based on KDE Frameworks
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND==kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 >=dev-qt/qtgui-5.12.3:5 !kde-apps/kcontacts:5 app-text/iso-codes >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kcontacts-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=00f7dc2a018f70f049d9e8d714e4d4ee
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.66.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.66.0
deleted file mode 100644
index 7ce0fe6badb3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kcoreaddons-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2bef838096c16abb5d24396fcffeb251
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.67.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.67.0
new file mode 100644
index 000000000000..d318394cb838
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.12.3:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kcoreaddons-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2bef838096c16abb5d24396fcffeb251
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.66.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.66.0
deleted file mode 100644
index 36649eb34f5a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kcrash-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=562dda3e2f90849506fcf5b627124a3c
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.67.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.67.0
new file mode 100644
index 000000000000..5d506f63a368
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto test? ( >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kcrash-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=562dda3e2f90849506fcf5b627124a3c
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.66.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.66.0
deleted file mode 100644
index 3bea6da377fc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kdbusaddons-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c54373cda753838058cbf1195ccebff4
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.67.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.67.0
new file mode 100644
index 000000000000..05d083dc2480
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kdbusaddons-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c54373cda753838058cbf1195ccebff4
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.66.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.66.0
deleted file mode 100644
index 4e80d5320644..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kpackage-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kpackage-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kdeclarative-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb0456f16db205b46f6c8cfb1082b3be
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.67.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.67.0
new file mode 100644
index 000000000000..3e0cf90a3cdb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kpackage-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kpackage-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kdeclarative-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb0456f16db205b46f6c8cfb1082b3be
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.66.0 b/metadata/md5-cache/kde-frameworks/kded-5.66.0
deleted file mode 100644
index dd49bab51e79..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.66:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/kinit-5.66*:5 =kde-frameworks/kservice-5.66*:5 dev-qt/qtcore:5
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/kinit-5.66*:5 =kde-frameworks/kservice-5.66*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kded-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=334b2e9f5790ae22653e948862bc178f
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.67.0 b/metadata/md5-cache/kde-frameworks/kded-5.67.0
new file mode 100644
index 000000000000..bcc0da42fbbe
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.67:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/kinit-5.67*:5 =kde-frameworks/kservice-5.67*:5 dev-qt/qtcore:5
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/kinit-5.67*:5 =kde-frameworks/kservice-5.67*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kded-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=334b2e9f5790ae22653e948862bc178f
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.66.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.66.0
deleted file mode 100644
index 15318a7fbc4f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66:5 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kauth-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 >=kde-frameworks/kded-5.66:5 =kde-frameworks/kdesignerplugin-5.66*:5 =kde-frameworks/kdoctools-5.66*:5 =kde-frameworks/kemoticons-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kunitconversion-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 =kde-frameworks/solid-5.66*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/designer-5.12.3:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=libressl X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kauth-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 >=kde-frameworks/kded-5.66:5 =kde-frameworks/kdesignerplugin-5.66*:5 =kde-frameworks/kdoctools-5.66*:5 =kde-frameworks/kemoticons-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kunitconversion-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 =kde-frameworks/solid-5.66*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) =kde-frameworks/kinit-5.66*:5 =kde-frameworks/kitemmodels-5.66*:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/portingAids/kdelibs4support-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2fd65ebacd42cce3fc39f5e51d4f702e
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.67.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.67.0
new file mode 100644
index 000000000000..de54a17033c4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.67:5 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kauth-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 >=kde-frameworks/kded-5.67:5 =kde-frameworks/kdesignerplugin-5.67*:5 =kde-frameworks/kdoctools-5.67*:5 =kde-frameworks/kemoticons-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kunitconversion-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 =kde-frameworks/solid-5.67*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) >=dev-qt/designer-5.12.3:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=libressl X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kauth-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 >=kde-frameworks/kded-5.67:5 =kde-frameworks/kdesignerplugin-5.67*:5 =kde-frameworks/kdoctools-5.67*:5 =kde-frameworks/kemoticons-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kunitconversion-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 =kde-frameworks/solid-5.67*:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb ) =kde-frameworks/kinit-5.67*:5 =kde-frameworks/kitemmodels-5.67*:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/portingAids/kdelibs4support-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2fd65ebacd42cce3fc39f5e51d4f702e
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.66.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.66.0
deleted file mode 100644
index a505af8f5797..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66:5 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 dev-qt/qtcore:5
-DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/portingAids/kdesignerplugin-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff24474d73c01bf99f79c81304361859
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.67.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.67.0
new file mode 100644
index 000000000000..481c9766b845
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.67:5 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 dev-qt/qtcore:5
+DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/portingAids/kdesignerplugin-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff24474d73c01bf99f79c81304361859
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.66.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.66.0
deleted file mode 100644
index bdfd37f55965..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kpty-5.66*:5 =kde-frameworks/kservice-5.66*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle super user actions
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kpty-5.66*:5 =kde-frameworks/kservice-5.66*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kdesu-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16a5d3fb8479c5e61ad00452446733c2
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.67.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.67.0
new file mode 100644
index 000000000000..07159e6d8c0f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kpty-5.67*:5 =kde-frameworks/kservice-5.67*:5 X? ( x11-libs/libX11 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle super user actions
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kpty-5.67*:5 =kde-frameworks/kservice-5.67*:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kdesu-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16a5d3fb8479c5e61ad00452446733c2
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.66.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.66.0
deleted file mode 100644
index bff1a44213e7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwallet-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( =kde-frameworks/kdesignerplugin-5.66*:5 ) >=dev-qt/qtnetwork-5.12.3:5 dev-qt/qtcore:5
-DESCRIPTION=Framework providing KDE integration of QtWebKit
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=designer debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwallet-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( =kde-frameworks/kdesignerplugin-5.66*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/portingAids/kdewebkit-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1552d4d37b1418150c042e30b4692255
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.67.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.67.0
new file mode 100644
index 000000000000..48d42a2a20c1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwallet-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( =kde-frameworks/kdesignerplugin-5.67*:5 ) >=dev-qt/qtnetwork-5.12.3:5 dev-qt/qtcore:5
+DESCRIPTION=Framework providing KDE integration of QtWebKit
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=designer debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwallet-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtwebkit-5.212.0_pre20180120:5 designer? ( =kde-frameworks/kdesignerplugin-5.67*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/portingAids/kdewebkit-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1552d4d37b1418150c042e30b4692255
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.66.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.66.0
deleted file mode 100644
index d15f829ab215..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kdnssd-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5424c1bf981b9f53e2892ec2f55ba070
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.67.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.67.0
new file mode 100644
index 000000000000..6ffeda0691ee
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.12.3:5 zeroconf? ( >=dev-qt/qtdbus-5.12.3:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kdnssd-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5424c1bf981b9f53e2892ec2f55ba070
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.66.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.66.0
deleted file mode 100644
index b24b64ef3f00..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.66:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=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/karchive-5.66*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools to generate documentation in various formats from DocBook files
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=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/karchive-5.66*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kdoctools-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cfb5daf7cea5bf029d934ae540536d6
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.67.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.67.0
new file mode 100644
index 000000000000..e803034a3923
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-perl/URI nls? ( >=kde-frameworks/ki18n-5.67:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=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/karchive-5.67*:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Tools to generate documentation in various formats from DocBook files
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=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/karchive-5.67*:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kdoctools-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0cfb5daf7cea5bf029d934ae540536d6
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.66.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.66.0
deleted file mode 100644
index abcb37d8d3df..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kservice-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND==kde-frameworks/karchive-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kservice-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kemoticons-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42ff21d985869b70ec0fa8ca54a0a896
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.67.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.67.0
new file mode 100644
index 000000000000..f7ec60f7dabc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/karchive-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kservice-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND==kde-frameworks/karchive-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kservice-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kemoticons-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42ff21d985869b70ec0fa8ca54a0a896
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.66.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.66.0
deleted file mode 100644
index 49749acdea20..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 >=dev-qt/qtxml-5.12.3: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.66*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for extracting file metadata
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=epub exif ffmpeg kernel_linux libav office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 >=dev-qt/qtxml-5.12.3: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.66*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kfilemetadata-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c61c8ab9806a5beaca2ca337ea359777
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.67.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.67.0
new file mode 100644
index 000000000000..1d2c3bb8c371
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 >=dev-qt/qtxml-5.12.3: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.67*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for extracting file metadata
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=epub exif ffmpeg kernel_linux libav office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 >=dev-qt/qtxml-5.12.3: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.67*:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kfilemetadata-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c61c8ab9806a5beaca2ca337ea359777
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.66.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.66.0
deleted file mode 100644
index 97d4fd485ecb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kglobalaccel-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7225c2da9d50a6d9667619b06ef06b89
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.67.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.67.0
new file mode 100644
index 000000000000..98eaa1dbf9a1
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5[X] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kglobalaccel-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7225c2da9d50a6d9667619b06ef06b89
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.66.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.66.0
deleted file mode 100644
index 2a1a8417d815..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kguiaddons-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67b6893123d474c68670f0b9e53738f7
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.67.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.67.0
new file mode 100644
index 000000000000..e5e0eee56bf7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-base/xorg-proto x11-libs/libxcb test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kguiaddons-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67b6893123d474c68670f0b9e53738f7
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.66.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.66.0
deleted file mode 100644
index f0da4d0eacdd..000000000000
--- a/metadata/md5-cache/kde-frameworks/kholidays-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library to determine holidays and other special events for a geographical region
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kholidays-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b3a56889dbc1a4ece62a8a35c089445
diff --git a/metadata/md5-cache/kde-frameworks/kholidays-5.67.0 b/metadata/md5-cache/kde-frameworks/kholidays-5.67.0
new file mode 100644
index 000000000000..0e397acb285a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kholidays-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library to determine holidays and other special events for a geographical region
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 !kde-apps/kholidays:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kholidays-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b3a56889dbc1a4ece62a8a35c089445
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.66.0 b/metadata/md5-cache/kde-frameworks/khtml-5.66.0
deleted file mode 100644
index 8ef22d9db433..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/kjs-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kwallet-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 =kde-frameworks/sonnet-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3: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.12.3:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KHTML web rendering engine
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND==kde-frameworks/karchive-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/kjs-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kwallet-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 =kde-frameworks/sonnet-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3: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.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/portingAids/khtml-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10596af125f1b7d0406dd9f428c6819f
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.67.0 b/metadata/md5-cache/kde-frameworks/khtml-5.67.0
new file mode 100644
index 000000000000..2d6548a6163c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/gperf dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/karchive-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/kjs-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kwallet-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 =kde-frameworks/sonnet-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3: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.12.3:5 x11-libs/libX11 ) test? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=KHTML web rendering engine
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND==kde-frameworks/karchive-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/kjs-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kwallet-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 =kde-frameworks/sonnet-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3: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.12.3:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/portingAids/khtml-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10596af125f1b7d0406dd9f428c6819f
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.64.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.64.0
index db11bb15511a..72f949c29783 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.64.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.64.0
@@ -4,13 +4,13 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Framework based on Gettext for internationalizing user interface text
 EAPI=7
 HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug doc test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=5/5.64
 SRC_URI=mirror://kde/stable/frameworks/5.64/ki18n-5.64.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53f808681cf03101d554a8d22a2cf81b
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.66.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.66.0
deleted file mode 100644
index 9252fa4b5167..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.66.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/ki18n-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10b3f751319522551d9628d1fec445bc
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.67.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.67.0
new file mode 100644
index 000000000000..bb3746a5d570
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.67.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/qtdeclarative-5.12.3:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/ki18n-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10b3f751319522551d9628d1fec445bc
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.66.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.66.0
deleted file mode 100644
index 75acc74cf416..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/karchive-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kiconthemes-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b6bc18d16c8f9a79c524819b83dddf4
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.67.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.67.0
new file mode 100644
index 000000000000..d85286a6df67
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/karchive-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/karchive-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kiconthemes-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6b6bc18d16c8f9a79c524819b83dddf4
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.66.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.66.0
deleted file mode 100644
index 97132be2367b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kidletime-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61d0e1df5eb9962d0626238568110a56
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.67.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.67.0
new file mode 100644
index 000000000000..c0fa22989177
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.12.3:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kidletime-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=61d0e1df5eb9962d0626238568110a56
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.66.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.66.0
deleted file mode 100644
index bec4755650d0..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.66*:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=eps openexr test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/karchive-5.66*:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kimageformats-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5636e1703b61d344ca6961570cc8f986
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.67.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.67.0
new file mode 100644
index 000000000000..38f4fcadc11d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/karchive-5.67*:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=eps openexr test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/karchive-5.67*:5 >=dev-qt/qtgui-5.12.3:5 eps? ( >=dev-qt/qtprintsupport-5.12.3:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kimageformats-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5636e1703b61d344ca6961570cc8f986
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.66.0 b/metadata/md5-cache/kde-frameworks/kinit-5.66.0
deleted file mode 100644
index c8b1a211a642..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.66:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kinit-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=01063f33c3a0d7fc66709c1f5b68b5cb
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.67.0 b/metadata/md5-cache/kde-frameworks/kinit-5.67.0
new file mode 100644
index 000000000000..9b1f1c0a5a18
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.67:5 ) dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) dev-qt/qtcore:5
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kinit-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01063f33c3a0d7fc66709c1f5b68b5cb
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.66.0 b/metadata/md5-cache/kde-frameworks/kio-5.66.0
deleted file mode 100644
index db776af1ac75..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.66.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kauth-5.66*:5 =kde-frameworks/karchive-5.66*:5 =kde-frameworks/kbookmarks-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 =kde-frameworks/solid-5.66*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.66*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.66*:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.66:5
-RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kauth-5.66*:5 =kde-frameworks/karchive-5.66*:5 =kde-frameworks/kbookmarks-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 =kde-frameworks/solid-5.66*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.66*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.66*:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kio-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=949040c14bf6c2c6b9e2f762a6b2282c
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.67.0-r1 b/metadata/md5-cache/kde-frameworks/kio-5.67.0-r1
new file mode 100644
index 000000000000..e8fd495c6728
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.67.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kauth-5.67*:5 =kde-frameworks/karchive-5.67*:5 =kde-frameworks/kbookmarks-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 =kde-frameworks/solid-5.67*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.67*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.67*:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 test? ( sys-libs/zlib ) X? ( x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=acl +handbook kerberos +kwallet X test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.67:5
+RDEPEND=dev-libs/libxml2 dev-libs/libxslt >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5=[ssl] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kauth-5.67*:5 =kde-frameworks/karchive-5.67*:5 =kde-frameworks/kbookmarks-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 =kde-frameworks/solid-5.67*:5 acl? ( sys-apps/attr virtual/acl ) handbook? ( =kde-frameworks/kdoctools-5.67*:5 ) kerberos? ( virtual/krb5 ) kwallet? ( =kde-frameworks/kwallet-5.67*:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kio-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7463982ff2ed8ee67c2736556a5849e3
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.66.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.66.0
deleted file mode 100644
index 9eff500eea42..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=7
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=debug examples test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kirigami2-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67afaf7b8cd532d229b7577f7843318a
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.67.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.67.0
new file mode 100644
index 000000000000..5b1d93cb4f32
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=7
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kirigami2-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=67afaf7b8cd532d229b7577f7843318a
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.66.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.66.0
deleted file mode 100644
index 7fbd75e4e0bd..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) test? ( >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=qml test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kitemmodels-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e093db7a2a4a4a4104f070c68c7865f
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.67.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.67.0
new file mode 100644
index 000000000000..df73a05b4eca
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) test? ( >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=qml test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kitemmodels-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e093db7a2a4a4a4104f070c68c7865f
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.66.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.66.0
deleted file mode 100644
index 9058c4bbdfe1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kitemviews-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa99a16a958af168bb305e65bbf6300f
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.67.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.67.0
new file mode 100644
index 000000000000..9a0a97dd47fb
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kitemviews-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa99a16a958af168bb305e65bbf6300f
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.66.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.66.0
deleted file mode 100644
index 99477b427572..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kjobwidgets-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f19d9c2971b9d949822906731d18f492
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.67.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.67.0
new file mode 100644
index 000000000000..6e2bc7c3b002
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) X? ( x11-base/xorg-proto x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kjobwidgets-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f19d9c2971b9d949822906731d18f492
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.66.0 b/metadata/md5-cache/kde-frameworks/kjs-5.66.0
deleted file mode 100644
index 4d7f8a740b49..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66:5 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=ECMAScipt compatible parser and engine
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/portingAids/kjs-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0467c69afa4b5c03f525a5412bbe0a0c
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.67.0 b/metadata/md5-cache/kde-frameworks/kjs-5.67.0
new file mode 100644
index 000000000000..f4d1e7585b93
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.67:5 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=ECMAScipt compatible parser and engine
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/portingAids/kjs-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0467c69afa4b5c03f525a5412bbe0a0c
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.66.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.66.0
deleted file mode 100644
index a15380796b09..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.66:5 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kjs-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 dev-qt/qtcore:5
-DESCRIPTION=Framework binding JavaScript objects to QObjects
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kjs-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/portingAids/kjsembed-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba3e3e5c03a865731164cbb9749827c0
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.67.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.67.0
new file mode 100644
index 000000000000..e96dbdc30653
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.67:5 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kjs-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 dev-qt/qtcore:5
+DESCRIPTION=Framework binding JavaScript objects to QObjects
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kjs-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/portingAids/kjsembed-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba3e3e5c03a865731164cbb9749827c0
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.66.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.66.0
deleted file mode 100644
index 44c90d06f491..000000000000
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kparts-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing a common interface for KParts that can play media files
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND==kde-frameworks/kparts-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/portingAids/kmediaplayer-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=804be2cf5dda7d51fe1f77ab73512894
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.67.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.67.0
new file mode 100644
index 000000000000..911fb48296b3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kparts-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a common interface for KParts that can play media files
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND==kde-frameworks/kparts-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/portingAids/kmediaplayer-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=804be2cf5dda7d51fe1f77ab73512894
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.66.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.66.0
deleted file mode 100644
index fc04bdebbd30..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/attica-5.66*:5 =kde-frameworks/karchive-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/attica-5.66*:5 =kde-frameworks/karchive-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=kde-frameworks/kirigami-5.66:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/knewstuff-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa031377e5167af9b2d23480fc9abc85
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.67.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.67.0
new file mode 100644
index 000000000000..44e2bad99ade
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/attica-5.67*:5 =kde-frameworks/karchive-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/attica-5.67*:5 =kde-frameworks/karchive-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=kde-frameworks/kirigami-5.67:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/knewstuff-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa031377e5167af9b2d23480fc9abc85
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.66.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.66.0
deleted file mode 100644
index b7444e01209d..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=dbus nls phonon speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND==kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/knotifications-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=689cd5532cd1ab03d981db818031251a
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.67.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.67.0
new file mode 100644
index 000000000000..410c87ecfb74
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) X? ( x11-base/xorg-proto ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=dbus nls phonon speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) !phonon? ( media-libs/libcanberra ) phonon? ( media-libs/phonon[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/knotifications-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cadd819b3a55b0bc501b423a165d2fb6
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.66.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.66.0
deleted file mode 100644
index 154a65334716..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/knotifyconfig-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9b7bfd92243f24904978d641651e9af
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.67.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.67.0
new file mode 100644
index 000000000000..3a2410cfd3fc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/knotifyconfig-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b9b7bfd92243f24904978d641651e9af
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.66.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.66.0
deleted file mode 100644
index e1b2c9038c73..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.66:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/karchive-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/karchive-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kpackage-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=390c03741f140a09b28d96efcf64fc01
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.67.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.67.0
new file mode 100644
index 000000000000..62e1bf401d72
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.67:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/karchive-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/karchive-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kpackage-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=390c03741f140a09b28d96efcf64fc01
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.66.0 b/metadata/md5-cache/kde-frameworks/kparts-5.66.0
deleted file mode 100644
index c3e284d2af96..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=kde-frameworks/ktextwidgets-5.66:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kparts-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d72bca775c12f2e2e7dece21ca4f4e53
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.67.0 b/metadata/md5-cache/kde-frameworks/kparts-5.67.0
new file mode 100644
index 000000000000..6948e9fe22e4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=kde-frameworks/ktextwidgets-5.67:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kparts-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d72bca775c12f2e2e7dece21ca4f4e53
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.66.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.66.0
deleted file mode 100644
index 481fa0cdec6b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE contact person abstraction library
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kpeople.git
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kpeople-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a57665fc11dab92347c3b54c89786412
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.67.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.67.0
new file mode 100644
index 000000000000..c6475d314720
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=KDE contact person abstraction library
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kpeople.git
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kpeople-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f11c28fa24b2bd7105aafdb15277149c
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.66.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.66.0
deleted file mode 100644
index 0aff00f49294..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kplotting-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e45be2138e317c4bac957478e4f8cea
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.67.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.67.0
new file mode 100644
index 000000000000..516938403b9b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kplotting-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9e45be2138e317c4bac957478e4f8cea
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.66.0 b/metadata/md5-cache/kde-frameworks/kpty-5.66.0
deleted file mode 100644
index e88cb7ea19a3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kpty-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e14301dcad55434b5757aea21c4a2d2
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.67.0 b/metadata/md5-cache/kde-frameworks/kpty-5.67.0
new file mode 100644
index 000000000000..9164c015a451
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 sys-libs/libutempter test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kpty-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4e14301dcad55434b5757aea21c4a2d2
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.66.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.66.0
deleted file mode 100644
index 150a7c4a2d9b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kquickcharts-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 examples? ( >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kdeclarative-5.66*:5 =kde-frameworks/kirigami-5.66*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=QtQuick plugin providing high-performance charts
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kquickcharts.git
-IUSE=test debug examples test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 examples? ( >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kdeclarative-5.66*:5 =kde-frameworks/kirigami-5.66*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kquickcharts-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04f4eb84bd629f3f3698d201dfcc77ab
diff --git a/metadata/md5-cache/kde-frameworks/kquickcharts-5.67.0 b/metadata/md5-cache/kde-frameworks/kquickcharts-5.67.0
new file mode 100644
index 000000000000..a41b463d38de
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kquickcharts-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 examples? ( >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kdeclarative-5.67*:5 =kde-frameworks/kirigami-5.67*:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=QtQuick plugin providing high-performance charts
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kquickcharts.git
+IUSE=test debug examples test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 examples? ( >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kdeclarative-5.67*:5 =kde-frameworks/kirigami-5.67*:5 ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kquickcharts-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=04f4eb84bd629f3f3698d201dfcc77ab
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.66.0 b/metadata/md5-cache/kde-frameworks/kross-5.66.0
deleted file mode 100644
index 1d7d1c0086cf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.66:5 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/portingAids/kross-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f62e958a2b328e03cf76f20e6bcdfc0
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.67.0 b/metadata/md5-cache/kde-frameworks/kross-5.67.0
new file mode 100644
index 000000000000..e43df6c3c695
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.67:5 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/designer-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/portingAids/kross-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6f62e958a2b328e03cf76f20e6bcdfc0
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.66.0 b/metadata/md5-cache/kde-frameworks/krunner-5.66.0
deleted file mode 100644
index f20e6b89625a..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/plasma-5.66*:5 =kde-frameworks/solid-5.66*:5 =kde-frameworks/threadweaver-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/plasma-5.66*:5 =kde-frameworks/solid-5.66*:5 =kde-frameworks/threadweaver-5.66*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/krunner-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=388da2396ad57ec0988c840a695aa7f5
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.67.0 b/metadata/md5-cache/kde-frameworks/krunner-5.67.0
new file mode 100644
index 000000000000..b2d0bad995c2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/plasma-5.67*:5 =kde-frameworks/solid-5.67*:5 =kde-frameworks/threadweaver-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/plasma-5.67*:5 =kde-frameworks/solid-5.67*:5 =kde-frameworks/threadweaver-5.67*:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/krunner-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=388da2396ad57ec0988c840a695aa7f5
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.66.0 b/metadata/md5-cache/kde-frameworks/kservice-5.66.0
deleted file mode 100644
index edfb5234021b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.66:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kcrash-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kservice-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7be77252e3aca8db760e48907c38d41
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.67.0 b/metadata/md5-cache/kde-frameworks/kservice-5.67.0
new file mode 100644
index 000000000000..e4f1465f9941
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.67:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kcrash-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kservice-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7be77252e3aca8db760e48907c38d41
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.66.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.66.0
deleted file mode 100644
index b754935acbb4..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( >=kde-frameworks/kservice-5.66:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/karchive-5.66*:5 =kde-frameworks/kauth-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 =kde-frameworks/sonnet-5.66*:5 =kde-frameworks/syntax-highlighting-5.66*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing a full text editor component
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/karchive-5.66*:5 =kde-frameworks/kauth-5.66*:5 =kde-frameworks/kcodecs-5.66*:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kjobwidgets-5.66*:5 =kde-frameworks/kparts-5.66*:5 =kde-frameworks/ktextwidgets-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 =kde-frameworks/sonnet-5.66*:5 =kde-frameworks/syntax-highlighting-5.66*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/ktexteditor-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3691d83b13f2ff5dad9b709c0d79845
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.67.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.67.0
new file mode 100644
index 000000000000..dea227f82fe4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=kde-frameworks/kservice-5.67:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/karchive-5.67*:5 =kde-frameworks/kauth-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 =kde-frameworks/sonnet-5.67*:5 =kde-frameworks/syntax-highlighting-5.67*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing a full text editor component
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/karchive-5.67*:5 =kde-frameworks/kauth-5.67*:5 =kde-frameworks/kcodecs-5.67*:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kjobwidgets-5.67*:5 =kde-frameworks/kparts-5.67*:5 =kde-frameworks/ktextwidgets-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 =kde-frameworks/sonnet-5.67*:5 =kde-frameworks/syntax-highlighting-5.67*:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/ktexteditor-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e3691d83b13f2ff5dad9b709c0d79845
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.66.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.66.0
deleted file mode 100644
index 3419bd4398ce..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/sonnet-5.66*:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=speech test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcompletion-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/sonnet-5.66*:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/ktextwidgets-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06b9a8e59a7ceecf47fedcd28141e569
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.67.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.67.0
new file mode 100644
index 000000000000..882ec2ae84c2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/sonnet-5.67*:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=speech test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcompletion-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/sonnet-5.67*:5 speech? ( >=dev-qt/qtspeech-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/ktextwidgets-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c06235c7445814a2cc340aed44b9001
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.66.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.66.0
deleted file mode 100644
index 88f0be4b2c86..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/ki18n-5.66*:5 >=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for converting units
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/ki18n-5.66*:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kunitconversion-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e6486feb0270e0dd3fb6573631a1c535
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.67.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.67.0
new file mode 100644
index 000000000000..9af1b2c74898
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/ki18n-5.67*:5 >=dev-qt/qtnetwork-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for converting units
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/ki18n-5.67*:5 >=dev-qt/qtnetwork-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kunitconversion-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e6486feb0270e0dd3fb6573631a1c535
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.66.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.66.0
deleted file mode 100644
index 8bdc47d9e80e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=man? ( >=kde-frameworks/kdoctools-5.66:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kdbusaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kwallet-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46b27b4cba813fa47d4fc80be031f32c
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.67.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.67.0
new file mode 100644
index 000000000000..cdc0878c7edc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=man? ( >=kde-frameworks/kdoctools-5.67:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=dev-libs/libgcrypt:0= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kdbusaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kwallet-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=46b27b4cba813fa47d4fc80be031f32c
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.66.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.66.0
deleted file mode 100644
index c9b31eb99701..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/wayland-1.15.0 media-libs/mesa[egl] >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kwayland.git
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/wayland-1.15.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kwayland-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=897f5ca3d896665edc07fdd9efe3195c
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.67.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.67.0
new file mode 100644
index 000000000000..bc89e7e31319
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/wayland-1.15.0 media-libs/mesa[egl] >=dev-libs/wayland-protocols-1.15 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kwayland.git
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[egl] >=dev-libs/wayland-1.15.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kwayland-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=897f5ca3d896665edc07fdd9efe3195c
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.66.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.66.0
deleted file mode 100644
index b9118a92cc68..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kwidgetsaddons-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=221d8d371af91a65de905ad7c9126ec9
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.67.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.67.0
new file mode 100644
index 000000000000..c9ed752e9f35
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5= >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kwidgetsaddons-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=221d8d371af91a65de905ad7c9126ec9
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.66.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.66.0
deleted file mode 100644
index dcedf78d9190..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kwindowsystem-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=813aa3c8ec263b7a8646338381544451
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.67.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.67.0
new file mode 100644
index 000000000000..ae045e57bd7d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kwindowsystem-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=813aa3c8ec263b7a8646338381544451
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.66.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.66.0
deleted file mode 100644
index d7cd7c69929d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kitemviews-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kxmlgui-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d2e01c3b7c9af5cbbe12836646dfbcf5
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.67.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.67.0
new file mode 100644
index 000000000000..4ce0c215f9b3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.12.3:5= >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kitemviews-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kxmlgui-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2e01c3b7c9af5cbbe12836646dfbcf5
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.66.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.66.0
deleted file mode 100644
index 67f28f04298a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 >=dev-qt/qtxml-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND==kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/kxmlrpcclient-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16a167a768490c16e19adbb135f9916a
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.67.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.67.0
new file mode 100644
index 000000000000..63f6c10c08fd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 >=dev-qt/qtxml-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND==kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/kxmlrpcclient-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16a167a768490c16e19adbb135f9916a
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.66.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.66.0
deleted file mode 100644
index fb633aca959f..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/modemmanager-qt-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee900c6f776e09665d0f7f50c09345e2
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.67.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.67.0
new file mode 100644
index 000000000000..cca68845cc10
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/modemmanager-qt-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ee900c6f776e09665d0f7f50c09345e2
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.66.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.66.0
deleted file mode 100644
index fde0e1e82bee..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/networkmanager-qt-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=050aaf6094861acd50b0dae0a404a822
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.67.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.67.0
new file mode 100644
index 000000000000..9574ad11e062
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=net-misc/networkmanager-1.4.0-r1[teamd=] || ( >=net-misc/networkmanager-1.4.0-r1[consolekit] >=net-misc/networkmanager-1.4.0-r1[elogind] >=net-misc/networkmanager-1.4.0-r1[systemd] ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/networkmanager-qt-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=050aaf6094861acd50b0dae0a404a822
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.66.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.66.0
deleted file mode 100644
index c6393f0c1b4d..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-qt/qtcore-5.12.3:5 >=kde-frameworks/extra-cmake-modules-5.66:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=test? ( >=dev-qt/qttest-5.12.3:5 )
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/oxygen-icons5-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa67f40e5cdad115c76fb48030e317be
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.67.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.67.0
new file mode 100644
index 000000000000..1382227c35ba
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.67.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-qt/qtcore-5.12.3:5 >=kde-frameworks/extra-cmake-modules-5.67:5 test? ( app-misc/fdupes ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install nofetch prepare test unpack
+DEPEND=test? ( >=dev-qt/qttest-5.12.3:5 )
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-3
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/oxygen-icons5-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa67f40e5cdad115c76fb48030e317be
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.66.0 b/metadata/md5-cache/kde-frameworks/plasma-5.66.0
deleted file mode 100644
index 2bd1562554ec..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=kde-frameworks/kdoctools-5.66:5 dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kactivities-5.66*:5 =kde-frameworks/karchive-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kdeclarative-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kirigami-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kpackage-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 !gles2? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.66*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma framework
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=gles2 wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kactivities-5.66*:5 =kde-frameworks/karchive-5.66*:5 =kde-frameworks/kconfig-5.66*:5 =kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/kdeclarative-5.66*:5 =kde-frameworks/kglobalaccel-5.66*:5 =kde-frameworks/kguiaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kirigami-5.66*:5 =kde-frameworks/knotifications-5.66*:5 =kde-frameworks/kpackage-5.66*:5 =kde-frameworks/kservice-5.66*:5 =kde-frameworks/kwidgetsaddons-5.66*:5 =kde-frameworks/kwindowsystem-5.66*:5 =kde-frameworks/kxmlgui-5.66*:5 !gles2? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.66*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/plasma-framework-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8595c0376352741fb7834f00202a567e
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.67.0 b/metadata/md5-cache/kde-frameworks/plasma-5.67.0
new file mode 100644
index 000000000000..ce09955b3979
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=>=kde-frameworks/kdoctools-5.67:5 dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kactivities-5.67*:5 =kde-frameworks/karchive-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kdeclarative-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kirigami-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kpackage-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 !gles2? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.67*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Plasma framework
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=gles2 wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kactivities-5.67*:5 =kde-frameworks/karchive-5.67*:5 =kde-frameworks/kconfig-5.67*:5 =kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/kdeclarative-5.67*:5 =kde-frameworks/kglobalaccel-5.67*:5 =kde-frameworks/kguiaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kirigami-5.67*:5 =kde-frameworks/knotifications-5.67*:5 =kde-frameworks/kpackage-5.67*:5 =kde-frameworks/kservice-5.67*:5 =kde-frameworks/kwidgetsaddons-5.67*:5 =kde-frameworks/kwindowsystem-5.67*:5 =kde-frameworks/kxmlgui-5.67*:5 !gles2? ( virtual/opengl ) wayland? ( =kde-frameworks/kwayland-5.67*:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/plasma-framework-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8595c0376352741fb7834f00202a567e
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.66.0 b/metadata/md5-cache/kde-frameworks/prison-5.66.0
deleted file mode 100644
index 1b5344219d16..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/prison.git
-IUSE=qml debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/prison-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d83e8e1b0fb0d2134b92dc87d195a1d7
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.67.0 b/metadata/md5-cache/kde-frameworks/prison-5.67.0
new file mode 100644
index 000000000000..a72a3d7df33a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/prison.git
+IUSE=qml debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 media-gfx/qrencode:= media-libs/libdmtx qml? ( >=dev-qt/qtdeclarative-5.12.3:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/prison-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d83e8e1b0fb0d2134b92dc87d195a1d7
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.66.0 b/metadata/md5-cache/kde-frameworks/purpose-5.66.0
deleted file mode 100644
index 513cbffe63a6..000000000000
--- a/metadata/md5-cache/kde-frameworks/purpose-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kirigami-5.66*:5 dolphin? ( =kde-frameworks/knotifications-5.66*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=+dolphin +kaccounts debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcoreaddons-5.66*:5 =kde-frameworks/ki18n-5.66*:5 =kde-frameworks/kio-5.66*:5 =kde-frameworks/kirigami-5.66*:5 dolphin? ( =kde-frameworks/knotifications-5.66*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kdeclarative-5.66:5 kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/purpose-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=98aa33b3bec479958c1639064f594cd0
diff --git a/metadata/md5-cache/kde-frameworks/purpose-5.67.0 b/metadata/md5-cache/kde-frameworks/purpose-5.67.0
new file mode 100644
index 000000000000..beb90926f5bd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/purpose-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kirigami-5.67*:5 dolphin? ( =kde-frameworks/knotifications-5.67*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for providing abstractions to get the developer's purposes fulfilled
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=+dolphin +kaccounts debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 =kde-frameworks/kcoreaddons-5.67*:5 =kde-frameworks/ki18n-5.67*:5 =kde-frameworks/kio-5.67*:5 =kde-frameworks/kirigami-5.67*:5 dolphin? ( =kde-frameworks/knotifications-5.67*:5 ) kaccounts? ( >=kde-apps/kaccounts-integration-19.04.3:5 net-libs/accounts-qt ) >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kdeclarative-5.67:5 kaccounts? ( net-libs/accounts-qml ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/purpose-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=98aa33b3bec479958c1639064f594cd0
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.66.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.66.0
deleted file mode 100644
index 683fd98d1475..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kirigami-5.66*:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND==kde-frameworks/kconfigwidgets-5.66*:5 =kde-frameworks/kiconthemes-5.66*:5 =kde-frameworks/kirigami-5.66*:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/qqc2-desktop-style-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f125b6805ba4edf1fb3c0e958d4e7b6b
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.67.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.67.0
new file mode 100644
index 000000000000..52a21e43e2cf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kirigami-5.67*:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND==kde-frameworks/kconfigwidgets-5.67*:5 =kde-frameworks/kiconthemes-5.67*:5 =kde-frameworks/kirigami-5.67*:5 >=dev-qt/qtdeclarative-5.12.3:5= >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/qqc2-desktop-style-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f125b6805ba4edf1fb3c0e958d4e7b6b
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.66.0 b/metadata/md5-cache/kde-frameworks/solid-5.66.0
deleted file mode 100644
index 896fdedbc9e2..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/solid-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39a255d5484b15358b28d1ec8aac1979
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.67.0 b/metadata/md5-cache/kde-frameworks/solid-5.67.0
new file mode 100644
index 000000000000..f60da74d8c47
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= test? ( >=dev-qt/qtconcurrent-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 sys-fs/udisks:2 virtual/libudev:= >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/solid-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=39a255d5484b15358b28d1ec8aac1979
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.66.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.66.0
deleted file mode 100644
index ad4729e67311..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=aspell +hunspell nls test debug designer doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/sonnet-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07e24863d80a29c08f104a31e67f7d6c
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.67.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.67.0
new file mode 100644
index 000000000000..5fde16dc5562
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) designer? ( dev-qt/designer:5 ) doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=aspell +hunspell nls test debug designer doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/sonnet-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07e24863d80a29c08f104a31e67f7d6c
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.66.0 b/metadata/md5-cache/kde-frameworks/syndication-5.66.0
deleted file mode 100644
index 325554bb0e56..000000000000
--- a/metadata/md5-cache/kde-frameworks/syndication-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND==kde-frameworks/kcodecs-5.66*:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library for parsing RSS and Atom feeds
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND==kde-frameworks/kcodecs-5.66*:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/syndication-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4039f3f7000d7b7100867a748554929c
diff --git a/metadata/md5-cache/kde-frameworks/syndication-5.67.0 b/metadata/md5-cache/kde-frameworks/syndication-5.67.0
new file mode 100644
index 000000000000..528b55f3d8f6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syndication-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND==kde-frameworks/kcodecs-5.67*:5 >=dev-qt/qtxml-5.12.3:5 test? ( >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Library for parsing RSS and Atom feeds
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND==kde-frameworks/kcodecs-5.67*:5 >=dev-qt/qtxml-5.12.3:5 !kde-apps/syndication >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/syndication-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4039f3f7000d7b7100867a748554929c
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.66.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.66.0
deleted file mode 100644
index 7261fe36d7d1..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for syntax highlighting
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/syntax-highlighting-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62ea3bd89adb2a8006294724bc993ef0
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.67.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.67.0
new file mode 100644
index 000000000000..2b1349f40f10
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.12.3:5 ) dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for syntax highlighting
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/syntax-highlighting-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=62ea3bd89adb2a8006294724bc993ef0
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.66.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.66.0
deleted file mode 100644
index c1b81991bfc2..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.66.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.66:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=7
-HOMEPAGE=https://kde.org/products/frameworks/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5/5.66
-SRC_URI=mirror://kde/stable/frameworks/5.66/threadweaver-5.66.0.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fa770c88e844f70617ab2e9463ea3b68
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.67.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.67.0
new file mode 100644
index 000000000000..ce555d6a3315
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.67.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake doc? ( dev-qt/qthelp:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) >=kde-frameworks/extra-cmake-modules-5.67:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=7
+HOMEPAGE=https://kde.org/products/frameworks/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5/5.67
+SRC_URI=mirror://kde/stable/frameworks/5.67/threadweaver-5.67.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa770c88e844f70617ab2e9463ea3b68
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 474db91271ad..2e1fc0381fa3 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/kshutdown-5.2 b/metadata/md5-cache/kde-misc/kshutdown-5.2
index 48da2e4b4174..fcb37601d460 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-5.2
+++ b/metadata/md5-cache/kde-misc/kshutdown-5.2
@@ -5,10 +5,10 @@ DESCRIPTION=Shutdown manager for desktop environments like KDE Plasma
 EAPI=7
 HOMEPAGE=https://kshutdown.sourceforge.io
 IUSE=+kde
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 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/kcrash: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-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* )
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-5.2.zip
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=983f3b8a69879584d44102ae2408c834
+_md5_=448020fc2c2bf4c14ed419e870b56356
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index c5d8cfd601df..8ba16c2a915c 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/ksysguard-5.17.4 b/metadata/md5-cache/kde-plasma/ksysguard-5.17.4
index 2d4e2c45dd5a..23b91f08a8e7 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.17.4
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.17.4
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.64.0:5 ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kconfigwidgets-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/kinit-5.64.0:5 >=kde-frameworks/kio-5.64.0:5 >=kde-frameworks/kitemviews-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kwidgetsaddons-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-plasma/libksysguard-5.17.4:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 caps? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=kde-frameworks/kcompletion-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kconfigwidgets-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/kinit-5.64.0:5 >=kde-frameworks/kio-5.64.0:5 >=kde-frameworks/kitemviews-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kwidgetsaddons-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-plasma/libksysguard-5.17.4:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 pcap? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=caps lm-sensors debug +handbook
+IUSE=lm-sensors pcap debug +handbook
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kconfigwidgets-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/kinit-5.64.0:5 >=kde-frameworks/kio-5.64.0:5 >=kde-frameworks/kitemviews-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kwidgetsaddons-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-plasma/libksysguard-5.17.4:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 caps? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=kde-frameworks/kcompletion-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kconfigwidgets-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/kinit-5.64.0:5 >=kde-frameworks/kio-5.64.0:5 >=kde-frameworks/kitemviews-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kwidgetsaddons-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-plasma/libksysguard-5.17.4:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 pcap? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.17.4/ksysguard-5.17.4.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee7ad3e692ce7543796d4b0262a0cc9e
+_md5_=af39174bbe0c0fc6d0675a3c086d14b9
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.17.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.17.5
index e5621d6dcacd..0b6fd0bd5310 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.17.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.17.5
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.64.0:5 ) >=kde-frameworks/extra-cmake-modules-5.64.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kconfigwidgets-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/kinit-5.64.0:5 >=kde-frameworks/kio-5.64.0:5 >=kde-frameworks/kitemviews-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kwidgetsaddons-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-plasma/libksysguard-5.17.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 caps? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DEPEND=>=kde-frameworks/kcompletion-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kconfigwidgets-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/kinit-5.64.0:5 >=kde-frameworks/kio-5.64.0:5 >=kde-frameworks/kitemviews-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kwidgetsaddons-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-plasma/libksysguard-5.17.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 pcap? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=7
 HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=caps lm-sensors debug +handbook
+IUSE=lm-sensors pcap debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kconfigwidgets-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/kinit-5.64.0:5 >=kde-frameworks/kio-5.64.0:5 >=kde-frameworks/kitemviews-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kwidgetsaddons-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-plasma/libksysguard-5.17.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 caps? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=kde-frameworks/kcompletion-5.64.0:5 >=kde-frameworks/kconfig-5.64.0:5 >=kde-frameworks/kconfigwidgets-5.64.0:5 >=kde-frameworks/kcoreaddons-5.64.0:5 >=kde-frameworks/kdbusaddons-5.64.0:5 >=kde-frameworks/ki18n-5.64.0:5 >=kde-frameworks/kiconthemes-5.64.0:5 >=kde-frameworks/kinit-5.64.0:5 >=kde-frameworks/kio-5.64.0:5 >=kde-frameworks/kitemviews-5.64.0:5 >=kde-frameworks/knewstuff-5.64.0:5 >=kde-frameworks/knotifications-5.64.0:5 >=kde-frameworks/kwidgetsaddons-5.64.0:5 >=kde-frameworks/kwindowsystem-5.64.0:5 >=kde-frameworks/kxmlgui-5.64.0:5 >=kde-plasma/libksysguard-5.17.5:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 pcap? ( net-libs/libpcap sys-libs/libcap ) lm-sensors? ( sys-apps/lm-sensors:= ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.17.5/ksysguard-5.17.5.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80f71abe2152048c8019e19bd1f9b62f
+_md5_=d32b001317786ef95f970266cb4eb589
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index f33b5327b3bc..de85dc1e0554 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.8.1 b/metadata/md5-cache/mail-client/alot-0.8.1
index 89d53f72e2f7..94d87c87efdb 100644
--- a/metadata/md5-cache/mail-client/alot-0.8.1
+++ b/metadata/md5-cache/mail-client/alot-0.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pazz/alot/archive/0.8.1.tar.gz -> alot-0.8.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=580d703fe61ecef0e7790e4e9415cfed
diff --git a/metadata/md5-cache/mail-client/alot-9999 b/metadata/md5-cache/mail-client/alot-9999
index 81913084281c..a2d2578de541 100644
--- a/metadata/md5-cache/mail-client/alot-9999
+++ b/metadata/md5-cache/mail-client/alot-9999
@@ -11,5 +11,5 @@ RDEPEND=>=app-crypt/gpgme-1.9.0[python,python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=192d33162ec219d51a04bccf71caedc8
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.17.3-r1 b/metadata/md5-cache/mail-client/claws-mail-3.17.3-r1
index 07b3c8572298..a98a35d6aeae 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.17.3-r1
+++ b/metadata/md5-cache/mail-client/claws-mail-3.17.3-r1
@@ -4,12 +4,12 @@ DEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/
 DESCRIPTION=An email client (and news reader) based on GTK+
 EAPI=7
 HOMEPAGE=https://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface +python_targets_python2_7 +python_single_target_python2_7
+IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] >=x11-libs/gtk+-2.24:2 x11-libs/libX11 x11-libs/pango 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 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) 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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) smime? ( pgp )
+REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python2_7 ) ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.17.3.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca9016d05845ed041a7fd165980be2f3
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c4bfbee64d16404a1815cd2d6bc6ea9d
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.17.4 b/metadata/md5-cache/mail-client/claws-mail-3.17.4
index 20f10537a25f..b299fdd4b0a0 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.17.4
+++ b/metadata/md5-cache/mail-client/claws-mail-3.17.4
@@ -4,12 +4,12 @@ DEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/
 DESCRIPTION=An email client (and news reader) based on GTK+
 EAPI=7
 HOMEPAGE=https://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface +python_targets_python2_7 +python_single_target_python2_7
+IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface +python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] >=x11-libs/gtk+-2.24:2 x11-libs/libX11 x11-libs/pango 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 sys-apps/dbus ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) 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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) smime? ( pgp )
+REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python2_7 ) ) smime? ( pgp )
 SLOT=0
 SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.17.4.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08518dbb5a77dd2626ab71ec30c732ef
diff --git a/metadata/md5-cache/mail-client/claws-mail-9999 b/metadata/md5-cache/mail-client/claws-mail-9999
index cb2573a93630..2b95d34f5a35 100644
--- a/metadata/md5-cache/mail-client/claws-mail-9999
+++ b/metadata/md5-cache/mail-client/claws-mail-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/
 DESCRIPTION=An email client (and news reader) based on GTK+
 EAPI=7
 HOMEPAGE=https://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface +python_targets_python2_7 +python_single_target_python2_7
+IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=dev-libs/nettle:= net-mail/ytnef sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] x11-libs/libX11 x11-libs/pango 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 sys-apps/dbus ) 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 ) litehtml? ( >=dev-libs/glib-2.36:2 >=dev-libs/gumbo-0.10 net-misc/curl media-libs/fontconfig ) 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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) smime? ( pgp )
+REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python2_7 ) ) smime? ( pgp )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=501aec71a08e7596e72413059ccee5f7
diff --git a/metadata/md5-cache/mail-client/hap-3.7-r1 b/metadata/md5-cache/mail-client/hap-3.7-r1
index 158b851f5174..c4dbb38c7383 100644
--- a/metadata/md5-cache/mail-client/hap-3.7-r1
+++ b/metadata/md5-cache/mail-client/hap-3.7-r1
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=A terminal mail notification program (replacement for biff)
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.transbay.net/~enf/sw.html
 KEYWORDS=~alpha ~amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
+RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.transbay.net/~enf/hap-3.7.tar
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=16a251bffed59402cb894e6a1df02ef0
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=74ae50913d964ca92b1a4c7dc89f62c7
diff --git a/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1 b/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
index fd1e0e5bdbd6..b028270f3a9d 100644
--- a/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
+++ b/metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/libstdc++-v3 >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/
 RESTRICT=fetch mirror strip
 SLOT=0
 SRC_URI=gw802_hp3_client_linux_multi.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=270594b73e7c7c2b391cb3e420ad95fb
diff --git a/metadata/md5-cache/mail-client/roundcube-1.4.2 b/metadata/md5-cache/mail-client/roundcube-1.4.2
new file mode 100644
index 000000000000..070438c8452e
--- /dev/null
+++ b/metadata/md5-cache/mail-client/roundcube-1.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A browser-based multilingual IMAP client with an application-like user interface
+EAPI=6
+HOMEPAGE=https://roundcube.net
+IUSE=change-password enigma ldap mysql postgres sqlite ssl spell vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain
+RDEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] virtual/httpd-php change-password? ( dev-lang/php[sockets] ) enigma? ( app-crypt/gnupg ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) spell? ( dev-lang/php[curl,spell] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=1.4.2
+SRC_URI=https://github.com/roundcube/roundcubemail/releases/download/1.4.2/roundcubemail-1.4.2-complete.tar.gz
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=30d8e4e246ef7cb6fb1a7f21a74f34ff
diff --git a/metadata/md5-cache/mail-client/sylpheed-3.6.0 b/metadata/md5-cache/mail-client/sylpheed-3.6.0
deleted file mode 100644
index 72d51b622661..000000000000
--- a/metadata/md5-cache/mail-client/sylpheed-3.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/liblockfile x11-libs/gtk+:2 crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) oniguruma? ( dev-libs/oniguruma:= ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 dev-libs/dbus-glib ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig xface? ( media-libs/compface )
-DESCRIPTION=A lightweight email client and newsreader
-EAPI=6
-HOMEPAGE=http://sylpheed.sraoss.jp/
-IUSE=crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=net-libs/liblockfile x11-libs/gtk+:2 crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) oniguruma? ( dev-libs/oniguruma:= ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 dev-libs/dbus-glib ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) app-misc/mime-types net-misc/curl
-SLOT=0
-SRC_URI=http://sylpheed.sraoss.jp/sylpheed/v3.6/sylpheed-3.6.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=59b09b43d0c2d01d190e1e97fc9a4fd4
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 6d969fe75a32..ba72d30ae170 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.2.0 b/metadata/md5-cache/mail-filter/afew-1.2.0
index b75899481f22..f72f55d19237 100644
--- a/metadata/md5-cache/mail-filter/afew-1.2.0
+++ b/metadata/md5-cache/mail-filter/afew-1.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
 DESCRIPTION=Initial tagging script for Notmuch
 EAPI=6
 HOMEPAGE=https://github.com/afewmail/afew
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
-RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] net-mail/notmuch[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/a/afew/afew-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=668a1310f732421100dbbade9f6e2138
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7a05823071df807b3cf1ffae60de46e3
diff --git a/metadata/md5-cache/mail-filter/afew-1.3.0 b/metadata/md5-cache/mail-filter/afew-1.3.0
deleted file mode 100644
index 570f1946051e..000000000000
--- a/metadata/md5-cache/mail-filter/afew-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=Initial tagging script for Notmuch
-EAPI=6
-HOMEPAGE=https://github.com/afewmail/afew
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/dkimpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-mail/notmuch[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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=mirror://pypi/a/afew/afew-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f25e3abda78df21d5e1e4d41a013b469
diff --git a/metadata/md5-cache/mail-filter/afew-1.3.0-r1 b/metadata/md5-cache/mail-filter/afew-1.3.0-r1
new file mode 100644
index 000000000000..d5802f77ce91
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/afew-1.3.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DESCRIPTION=Initial tagging script for Notmuch
+EAPI=6
+HOMEPAGE=https://github.com/afewmail/afew
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/dkimpy[python_targets_python3_6(-)] net-mail/notmuch[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/dkimpy[python_targets_python3_7(-)] net-mail/notmuch[python,python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/a/afew/afew-1.3.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3bc9b33318597215f337ff9498ea4f90
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3 b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
index 1cbe77b094bb..54e186d4627f 100644
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
@@ -9,5 +9,5 @@ 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/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 dev-perl/File-LibMagic >=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://gitlab.com/amavis/amavis/-/archive/amavisd-new-2.11.1/amavis-amavisd-new-2.11.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6d2a1487284703240197997c5f8c3353
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.12.0 b/metadata/md5-cache/mail-filter/amavisd-new-2.12.0
index efa97958d620..74fd111316ec 100644
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.12.0
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.12.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 BSD-2
 RDEPEND=>=dev-lang/perl-5.10.0 app-arch/arc app-arch/bzip2 app-arch/cabextract app-arch/cpio app-arch/gzip 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 clamav? ( app-antivirus/clamav ) >=dev-perl/Archive-Zip-1.14 dev-perl/BerkeleyDB dev-perl/Convert-BinHex dev-perl/File-LibMagic dev-perl/IO-Socket-SSL dev-perl/IO-stringy >=dev-perl/Mail-DKIM-0.31 >=dev-perl/MailTools-1.58 >=dev-perl/MIME-tools-5.415 dev-perl/Net-LibIDN >=dev-perl/Net-Server-0.91 dev-perl/Net-SSLeay dev-perl/Unix-Syslog ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) net-mail/ripole net-mail/tnef postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) rspamd? ( ( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined ) ) rspamd-https? ( ( dev-perl/JSON dev-perl/HTTP-Message dev-perl/LWP-UserAgent-Determined ) dev-perl/LWP-Protocol-https dev-perl/Net-SSLeay ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) >=sys-apps/coreutils-5.0-r3 >=sys-libs/db-4.4.20 virtual/mta >=virtual/perl-Compress-Raw-Zlib-2.017 virtual/perl-Digest-MD5 virtual/perl-File-Temp >=virtual/perl-IO-Compress-1.35 virtual/perl-IO-Socket-IP virtual/perl-MIME-Base64 >=virtual/perl-Time-HiRes-1.49 zmq? ( dev-perl/ZMQ-LibZMQ3 )
 SLOT=0
 SRC_URI=https://gitlab.com/amavis/amavis/-/archive/v2.12.0/amavis-v2.12.0.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=782d140623942392c14d43ffbe9fa4dc
diff --git a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2 b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2
index 12690d88fbaa..68362b28a310 100644
--- a/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2
+++ b/metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2
@@ -11,5 +11,5 @@ RDEPEND=mail-mta/courier python_targets_python3_6? ( dev-lang/python:3.6 ) pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/c/courier-pythonfilter/courier-pythonfilter-3.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c0dd1c6c2ea3ae6f35381c3c9fbb475d
diff --git a/metadata/md5-cache/mail-filter/dspam-3.10.2-r2 b/metadata/md5-cache/mail-filter/dspam-3.10.2-r2
index 4cac25e4e216..6fca6d880d16 100644
--- a/metadata/md5-cache/mail-filter/dspam-3.10.2-r2
+++ b/metadata/md5-cache/mail-filter/dspam-3.10.2-r2
@@ -10,5 +10,5 @@ RDEPEND=net-mail/mailbase ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-conne
 REQUIRED_USE=|| ( hash mysql postgres sqlite ) static-libs? ( ^^ ( hash mysql postgres sqlite ) ) ^^ ( small-scale domain-scale large-scale ) virtual-users? ( !user-homedirs )
 SLOT=0
 SRC_URI=mirror://sourceforge/dspam/dspam-3.10.2.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=abf3497e7b14508385d84f42701c6056
diff --git a/metadata/md5-cache/mail-filter/milter-regex-2.6 b/metadata/md5-cache/mail-filter/milter-regex-2.6
index 05fff45fb498..21731bd180d1 100644
--- a/metadata/md5-cache/mail-filter/milter-regex-2.6
+++ b/metadata/md5-cache/mail-filter/milter-regex-2.6
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail )
 SLOT=0
 SRC_URI=https://www.benzedrine.ch/milter-regex-2.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=02880236c9ec6f9ca0decd7103c581f7
diff --git a/metadata/md5-cache/mail-filter/mimedefang-2.84 b/metadata/md5-cache/mail-filter/mimedefang-2.84
index 323e5e8fe7ea..04c112e7637b 100644
--- a/metadata/md5-cache/mail-filter/mimedefang-2.84
+++ b/metadata/md5-cache/mail-filter/mimedefang-2.84
@@ -10,5 +10,5 @@ RDEPEND=>=dev-perl/MIME-tools-5.412 dev-perl/IO-stringy virtual/perl-MIME-Base64
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.mimedefang.org/static/mimedefang-2.84.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2f2c4cbc0032c65a98088664d425a085
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r1 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r1
index dff3c5b35103..a9daef435404 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r1
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8394f54c9e332dee3028df09368f350b
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
index 1a17aebf4de3..59213f10fead 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=afb4e9b37b8b3915fe905040053f2549
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
index 4a383170b0ef..12f4c44647e5 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4c1b09d81d2f1c1cee6fd1ae74058573
diff --git a/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2 b/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
index 5527f4261e4b..31799e4b4af6 100644
--- a/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
+++ b/metadata/md5-cache/mail-filter/policyd-weight-0.1.15.2-r2
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/perl-File-Spec virtual/perl-Sys-Syslog dev-perl/Net-DNS dev-perl/Net-IP >=mail-mta/postfix-2.1 virtual/tmpfiles
 SLOT=0
 SRC_URI=http://www.policyd-weight.org/releases/policyd-weight-0.1.15.2.tar.gz mirror://gentoo/policyd-weight-0.1.15.2-patches-1.0.tar.xz https://dev.gentoo.org/~whissi/dist/policyd-weight/policyd-weight-0.1.15.2-patches-1.0.tar.xz
-_eclasses_=tmpfiles	6170dc7770585fb3f16efdee789a3218	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=tmpfiles	6170dc7770585fb3f16efdee789a3218	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=20eefce102d70a133d336d3ce5d8043e
diff --git a/metadata/md5-cache/mail-filter/postfwd-1.35-r3 b/metadata/md5-cache/mail-filter/postfwd-1.35-r3
index 634e3b84711b..319eb966bb60 100644
--- a/metadata/md5-cache/mail-filter/postfwd-1.35-r3
+++ b/metadata/md5-cache/mail-filter/postfwd-1.35-r3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/perl-5.16.3 virtual/perl-Sys-Syslog dev-perl/Net-DNS dev-perl/Net-Server
 SLOT=0
 SRC_URI=http://www.postfwd.org/postfwd-1.35.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0662748ff7f921a6e6226ceb1090ab58
diff --git a/metadata/md5-cache/mail-filter/postfwd-2.00-r1 b/metadata/md5-cache/mail-filter/postfwd-2.00-r1
index 79a97f16e0cc..e4c1c44ffe55 100644
--- a/metadata/md5-cache/mail-filter/postfwd-2.00-r1
+++ b/metadata/md5-cache/mail-filter/postfwd-2.00-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/perl-5.16.3 dev-perl/Net-CIDR-Lite dev-perl/Net-DNS dev-perl/Net-Server dev-perl/NetAddr-IP virtual/perl-Digest-MD5 virtual/perl-Storable virtual/perl-Sys-Syslog virtual/perl-Time-HiRes
 SLOT=0
 SRC_URI=https://www.postfwd.org/postfwd-2.00.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0034452284c972a10f35cadbeb813cf0
diff --git a/metadata/md5-cache/mail-filter/postfwd-2.02 b/metadata/md5-cache/mail-filter/postfwd-2.02
index ce7231d93952..de585452223c 100644
--- a/metadata/md5-cache/mail-filter/postfwd-2.02
+++ b/metadata/md5-cache/mail-filter/postfwd-2.02
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/perl-5.16.3 dev-perl/Net-CIDR-Lite dev-perl/Net-DNS dev-perl/Net-Server dev-perl/NetAddr-IP virtual/perl-Digest-MD5 virtual/perl-Storable virtual/perl-Sys-Syslog virtual/perl-Time-HiRes
 SLOT=0
 SRC_URI=https://www.postfwd.org/postfwd-2.02.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0034452284c972a10f35cadbeb813cf0
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.34-r3 b/metadata/md5-cache/mail-filter/postgrey-1.34-r3
index 42c4358592ef..2ae67808443a 100644
--- a/metadata/md5-cache/mail-filter/postgrey-1.34-r3
+++ b/metadata/md5-cache/mail-filter/postgrey-1.34-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/Net-Server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/Parse-Syslog dev-perl/Net-RBLClient >=sys-libs/db-4.1
 SLOT=0
 SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.34.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.34.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8912d5da404378e19bb5f56e76e1d888
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.35-r2 b/metadata/md5-cache/mail-filter/postgrey-1.35-r2
index a90a3fc4c5b5..2cec27b70a23 100644
--- a/metadata/md5-cache/mail-filter/postgrey-1.35-r2
+++ b/metadata/md5-cache/mail-filter/postgrey-1.35-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/Net-Server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/Parse-Syslog dev-perl/Net-RBLClient virtual/perl-Digest-SHA >=sys-libs/db-4.1
 SLOT=0
 SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.35.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.35.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f72b563f99f4e4e6f1238ff9b6af050a
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.36-r1 b/metadata/md5-cache/mail-filter/postgrey-1.36-r1
index 87e560a6ac20..83d51318f34b 100644
--- a/metadata/md5-cache/mail-filter/postgrey-1.36-r1
+++ b/metadata/md5-cache/mail-filter/postgrey-1.36-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/Net-Server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/NetAddr-IP dev-perl/Net-RBLClient dev-perl/Parse-Syslog virtual/perl-Digest-SHA >=sys-libs/db-4.1
 SLOT=0
 SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.36.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.36.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f564df1c800a88af2db9dd14e38d6c7c
diff --git a/metadata/md5-cache/mail-filter/postgrey-1.37 b/metadata/md5-cache/mail-filter/postgrey-1.37
index d61d760a07a4..fdae009552f4 100644
--- a/metadata/md5-cache/mail-filter/postgrey-1.37
+++ b/metadata/md5-cache/mail-filter/postgrey-1.37
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.6.0 dev-perl/Net-Server dev-perl/IO-Multiplex dev-perl/BerkeleyDB dev-perl/Net-DNS dev-perl/NetAddr-IP dev-perl/Net-RBLClient dev-perl/Parse-Syslog virtual/perl-Digest-SHA >=sys-libs/db-4.1
 SLOT=0
 SRC_URI=http://postgrey.schweikert.ch/pub/postgrey-1.37.tar.gz http://postgrey.schweikert.ch/pub/old/postgrey-1.37.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=56a5650fadab0859384c534a21d238ae
diff --git a/metadata/md5-cache/mail-filter/postsrsd-1.4 b/metadata/md5-cache/mail-filter/postsrsd-1.4
index e3e565c300e5..f2acc2700fe7 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 399083bad7fa..b420ddd060e7 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d7f2cf5aadda7064bc640c0406d8ad04
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 d5ff4420f9e8..2d01fb67e895 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_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pypolicyd-spf/pypolicyd-spf-2.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=09b79e2aebe081a47e128c731634ed88
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=96b9d582ef0d3b6f488ce7b7eece85b6
diff --git a/metadata/md5-cache/mail-filter/rmilter-1.10.0 b/metadata/md5-cache/mail-filter/rmilter-1.10.0
index f9a08dd194f8..4b21a4078285 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 c82f79be2e59..b9d8046bcd13 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 479cb225a542..44e7b2828210 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 8c0e30fa5148..13fdbf9fb7e2 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b9cde667bc7a2368e4c161240b18859
diff --git a/metadata/md5-cache/mail-filter/rmilter-9999 b/metadata/md5-cache/mail-filter/rmilter-9999
index a7c7ed4d10e3..ca62c3fc3ec3 100644
--- a/metadata/md5-cache/mail-filter/rmilter-9999
+++ b/metadata/md5-cache/mail-filter/rmilter-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 PROPERTIES=live
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5eec32a180374a7ab900bf1cfdff2942
diff --git a/metadata/md5-cache/mail-filter/rspamd-2.3 b/metadata/md5-cache/mail-filter/rspamd-2.3
new file mode 100644
index 000000000000..ed245c7c2883
--- /dev/null
+++ b/metadata/md5-cache/mail-filter/rspamd-2.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=acct-group/rspamd acct-user/rspamd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-util/ragel net-libs/libnsl sys-apps/file blas? ( sci-libs/openblas ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 ) !jit? ( dev-lang/lua:* ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] )
+DESCRIPTION=Rapid spam filtering system
+EAPI=7
+HOMEPAGE=https://github.com/vstakhov/rspamd
+IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit libressl pcre2
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/rspamd acct-user/rspamd dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libsodium dev-util/ragel net-libs/libnsl sys-apps/file blas? ( sci-libs/openblas ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc ) jit? ( dev-lang/luajit:2 ) !jit? ( dev-lang/lua:* ) !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) pcre2? ( dev-libs/libpcre2[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
+SLOT=0
+SRC_URI=https://github.com/vstakhov/rspamd/archive/2.3.tar.gz -> rspamd-2.3.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e528bab43062aaf4aa3d3ace5f76b460
diff --git a/metadata/md5-cache/mail-filter/sigh-1607.1.2 b/metadata/md5-cache/mail-filter/sigh-1607.1.2
index 996bb16ac2ac..0d462059d9d1 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 5da9c0c85ad5..59f27f54693c 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=089aac3fb5ab0112e7037998ff5e1560
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2 b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
index be9879df199c..444700648162 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-I
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.2.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d4e97a839a079272304c814a718aed66
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r6 b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r6
index 9e8fb0d0fd8e..52a59d849805 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r6
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.2-r6
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-I
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.2.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6223419ece251c6304964b9f2a4e8f9e
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.3 b/metadata/md5-cache/mail-filter/spamassassin-3.4.3
index 90ca78df20b9..774cfa33dd83 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.3
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.3
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-I
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.3.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fc922080ad6c852163d32037a96327ef
diff --git a/metadata/md5-cache/mail-filter/spamassassin-3.4.4 b/metadata/md5-cache/mail-filter/spamassassin-3.4.4
index d0728dd3f59b..1c8af0891bb6 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.4
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.4
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-I
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.4.tar.bz2
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ca16ef17c20d39f20a7ec5819012491a
diff --git a/metadata/md5-cache/mail-filter/spambayes-1.1_beta2 b/metadata/md5-cache/mail-filter/spambayes-1.1_beta2
index 46fbb6095ecb..8e996d12ee90 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=908e9ee169ef6d19c0876d73451be06d
diff --git a/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2 b/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2
index aeae3cd662db..19bce0ed473e 100644
--- a/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2
+++ b/metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl dev-perl/DBI dev-perl/Date-Calc dev-perl/Net-Server virtua
 REQUIRED_USE=|| ( mysql postgres sqlite )
 SLOT=0
 SRC_URI=mirror://sourceforge/sqlgrey/sqlgrey-1.7.6.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b467cfd830bb3b1cbe74e949a8c047b5
diff --git a/metadata/md5-cache/mail-filter/tmda-1.1.12-r2 b/metadata/md5-cache/mail-filter/tmda-1.1.12-r2
index 8df3d1504bd0..5310e3c14716 100644
--- a/metadata/md5-cache/mail-filter/tmda-1.1.12-r2
+++ b/metadata/md5-cache/mail-filter/tmda-1.1.12-r2
@@ -3,12 +3,12 @@ DEPEND=virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:
 DESCRIPTION=Python-based SPAM reduction system
 EAPI=6
 HOMEPAGE=http://www.tmda.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/mta python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tmda/tmda-1.1.12.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fa1a896fa6bf1480a30282bdfee175c9
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index c67e6a5f103c..93b27821321a 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/msmtp-1.8.3 b/metadata/md5-cache/mail-mta/msmtp-1.8.3
index dbe5cb1da2c5..b126ebe4b329 100644
--- a/metadata/md5-cache/mail-mta/msmtp-1.8.3
+++ b/metadata/md5-cache/mail-mta/msmtp-1.8.3
@@ -11,5 +11,5 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? (
 REQUIRED_USE=daemon? ( filecaps )
 SLOT=0
 SRC_URI=https://marlam.de/msmtp/releases/msmtp-1.8.3.tar.xz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f586b16327dfe0b122b0d9b4d2158ef5
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=06009f00961f942ec4e253cf456bf522
diff --git a/metadata/md5-cache/mail-mta/nullmailer-1.13-r5 b/metadata/md5-cache/mail-mta/nullmailer-1.13-r5
index 63c6316d3b76..0f726353430a 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-1.13-r5
+++ b/metadata/md5-cache/mail-mta/nullmailer-1.13-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-1.13.tar.gz https://dev.gentoo.org/~jlec/distfiles/nullmailer-patches-1.13.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae37b8583e1210cda1ace987638d8e97
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.0 b/metadata/md5-cache/mail-mta/nullmailer-2.0
index 9b54b70567e3..877dee851e7d 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.0
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=567c95b63e0932f9f6734f12bbcceb60
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.0-r1 b/metadata/md5-cache/mail-mta/nullmailer-2.0-r1
index 9d9ff8d66a81..ff502f367220 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.0-r1
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=72229f160bbdd5b196c8af2e5202c9e3
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.0-r2 b/metadata/md5-cache/mail-mta/nullmailer-2.0-r2
index 7af7074f8690..339c13295dc4 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.0-r2
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.0-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/cour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=250391566946cdad3ccbeed52eb35f5e
diff --git a/metadata/md5-cache/mail-mta/nullmailer-2.2 b/metadata/md5-cache/mail-mta/nullmailer-2.2
index 465e0507ac81..281ce279f09d 100644
--- a/metadata/md5-cache/mail-mta/nullmailer-2.2
+++ b/metadata/md5-cache/mail-mta/nullmailer-2.2
@@ -11,5 +11,5 @@ RDEPEND=virtual/logger virtual/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/cour
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://untroubled.org/nullmailer/archive/nullmailer-2.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=be6cfd3248204319b7a2cf337b6502e1
diff --git a/metadata/md5-cache/mail-mta/opensmtpd-6.6.2_p1 b/metadata/md5-cache/mail-mta/opensmtpd-6.6.2_p1
index b192181a1d0c..1c83abaa0f3e 100644
--- a/metadata/md5-cache/mail-mta/opensmtpd-6.6.2_p1
+++ b/metadata/md5-cache/mail-mta/opensmtpd-6.6.2_p1
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight but featured SMTP daemon from OpenBSD
 EAPI=7
 HOMEPAGE=https://www.opensmtpd.org
 IUSE=libressl pam +mta
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 RDEPEND=acct-user/smtpd acct-user/smtpq !libressl? ( >=dev-libs/openssl-1.1:0= ) libressl? ( dev-libs/libressl:0= ) elibc_musl? ( sys-libs/fts-standalone ) sys-libs/zlib pam? ( sys-libs/pam ) sys-libs/db:= dev-libs/libevent app-misc/ca-certificates net-mail/mailbase net-libs/libasr !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp[mta]
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/opensmtpd-6.6.2p1.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=808cd2014ae2451e7fa8feec3587942e
+_md5_=359b7299e8bbb366ab2236cd39df00a2
diff --git a/metadata/md5-cache/mail-mta/postfix-3.4.5-r1 b/metadata/md5-cache/mail-mta/postfix-3.4.5-r1
index 120dd2af0bbe..4d2660214833 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.4.5-r1
+++ b/metadata/md5-cache/mail-mta/postfix-3.4.5-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.4.5.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5b867825d8cbe3ab4c553e9b9272b9c7
diff --git a/metadata/md5-cache/mail-mta/postfix-3.4.6 b/metadata/md5-cache/mail-mta/postfix-3.4.6
index 946688d5bd7a..5ec36c96692d 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.4.6
+++ b/metadata/md5-cache/mail-mta/postfix-3.4.6
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.4.6.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7163b374ca41424953a93af1a6e2ad79
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.6 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.6
index ac06b3aef0e3..8f6797e84bd3 100644
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.6
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.6
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-app
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://protonmail.com/download/protonmail-bridge-1.1.6-1.x86_64.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	b03b38188e1e83766244d2046785d562
 _md5_=4a6f767dd1173f194cf3962648fbda0f
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2
index 222924cc9d8c..f70bd97a13de 100644
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.2
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-app
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://protonmail.com/download/protonmail-bridge-1.2.2-1.x86_64.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	b03b38188e1e83766244d2046785d562
 _md5_=4a6f767dd1173f194cf3962648fbda0f
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.3 b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.3
index c05c6878ae4f..d63feeb2d10b 100644
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.3
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.2.3
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/libsecret dev-libs/glib:2 media-sound/pulseaudio[glib] sys-app
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://protonmail.com/download/protonmail-bridge-1.2.3-1.x86_64.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	b03b38188e1e83766244d2046785d562
 _md5_=4a6f767dd1173f194cf3962648fbda0f
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2 b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
index 058bd2bcf6ab..9946deeda949 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.84.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3477be92730bd08ae9cea64f3c6f8fb0
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.95 b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
index 244fa7f65104..2b09758174a0 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.95
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=https://github.com/smtpd/qpsmtpd/archive/v0.95.tar.gz -> qpsmtpd-0.95.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8abfbeb1f459c66958a9e7ac8f5568f8
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-9999 b/metadata/md5-cache/mail-mta/qpsmtpd-9999
index 0ed42527e2bf..d0731eb233cf 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-9999
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=eeabca5b63ade4cfffa14292f4c6fc2a
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.14.9 b/metadata/md5-cache/mail-mta/sendmail-8.14.9
index ff5ed2d5cb0d..3b075cb605d2 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.14.9
+++ b/metadata/md5-cache/mail-mta/sendmail-8.14.9
@@ -10,5 +10,5 @@ PDEPEND=!mbox? ( mail-filter/procmail )
 RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl:0= ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c76b0383083c16e312833cc17b6bc992
diff --git a/metadata/md5-cache/mail-mta/sendmail-8.15.2-r2 b/metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
index 9a74b0a5f496..804f9d20a4d7 100644
--- a/metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
+++ b/metadata/md5-cache/mail-mta/sendmail-8.15.2-r2
@@ -10,5 +10,5 @@ PDEPEND=!mbox? ( mail-filter/procmail )
 RDEPEND=net-mail/mailbase sys-devel/m4 sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ldap? ( net-nds/openldap ) >=sys-libs/db-3.2 !net-mail/vacation >=net-mail/mailbase-0.00 !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/opensmtpd !mail-mta/qmail-ldap !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta]
 SLOT=0
 SRC_URI=ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.15.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=88a6df4c915ac2bfa4150c2806f767d1
diff --git a/metadata/md5-cache/mail-mta/ssmtp-2.64-r2 b/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
index 77cd605ce109..73deeddc92bf 100644
--- a/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
+++ b/metadata/md5-cache/mail-mta/ssmtp-2.64-r2
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( !gnutls? ( dev-libs/openssl:0 ) gnutls? ( net-libs/gnutls[openssl
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2 https://dev.gentoo.org/~flameeyes/ssmtp/ssmtp-2.64-patches-3.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2ba439370b736dad858bcb686e6e95e2
diff --git a/metadata/md5-cache/mail-mta/ssmtp-2.64-r3 b/metadata/md5-cache/mail-mta/ssmtp-2.64-r3
index ddefeafe9e1e..0619dd36f155 100644
--- a/metadata/md5-cache/mail-mta/ssmtp-2.64-r3
+++ b/metadata/md5-cache/mail-mta/ssmtp-2.64-r3
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( gnutls? ( net-libs/gnutls[openssl] ) !gnutls? ( !libressl? ( dev-
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2 https://dev.gentoo.org/~pinkbyte/distfiles/patches/ssmtp-2.64-patches-4.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a9135923d8340d9fee602b8ba10c1a91
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 1d91e8237829..3b9b07d6f0ea 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.22.1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.22.1
deleted file mode 100644
index 5f2c75c6be44..000000000000
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.22.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=mate-base/caja-1.19.1 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/docutils virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/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.22
-DESCRIPTION=Store, Sync and Share Files Online
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=mate-base/caja-1.19.1 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) net-misc/dropbox
-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://pub.mate-desktop.org/releases/1.22/caja-dropbox-1.22.1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc868c166fcc421ce380bf425cea8c85
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.22.1-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.22.1-r1
new file mode 100644
index 000000000000..bd6d211f9db3
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.22.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) >=mate-base/caja-1.19.1 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/docutils virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info || ( >=sys-devel/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.22
+DESCRIPTION=Store, Sync and Share Files Online
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=debug python_single_target_python3_6 python_single_target_python3_7 kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) >=mate-base/caja-1.19.1 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) net-misc/dropbox
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.22/caja-dropbox-1.22.1.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	mate	1d1847564eac8e0da804d51adea0a01d	mate-desktop.org	e10ab79a4595873541dc4897c7b19724	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1104a187aaea039de278a2e2756a1ddc
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 3ad699084cbe..262c7498447b 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/arkpandora-2.04 b/metadata/md5-cache/media-fonts/arkpandora-2.04
index bb4c3a85586d..665bd488f05a 100644
--- a/metadata/md5-cache/media-fonts/arkpandora-2.04
+++ b/metadata/md5-cache/media-fonts/arkpandora-2.04
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm setup
 DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
 DESCRIPTION=Arkpandora MS-TTF replacement font pack
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=X
 KEYWORDS=~alpha amd64 arm hppa ia64 ~ppc ppc64 s390 sh sparc x86
 LICENSE=BitstreamVera
 SLOT=0
 SRC_URI=mirror://gentoo/ttf-arkpandora-2.04.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	font	af70de9a23b2f34d4fe4dcb222be0346	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eda53c364fa9d85fc305ccbda4452ce9
+_md5_=a9ce1ba38f9f7aae9185514b7b50ad80
diff --git a/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1 b/metadata/md5-cache/media-fonts/infinality-ultimate-meta-1
index e8b76c21a5fa..bfec9275fd07 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=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 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_=7921a1f77f10248844e76694b29939ab
+_md5_=cd411a000f436a6902e3f79c25592550
diff --git a/metadata/md5-cache/media-fonts/nepali-fonts-1-r1 b/metadata/md5-cache/media-fonts/nepali-fonts-1-r1
deleted file mode 100644
index 0c761a494db2..000000000000
--- a/metadata/md5-cache/media-fonts/nepali-fonts-1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=a collection of fonts for Nepali users
-EAPI=7
-HOMEPAGE=http://www.mpp.org.np/ http://www.nepali.info/ http://www.nepalipost.com/ http://www.moics.gov.np/download/fonts.html
-IUSE=X
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc s390 sh sparc x86
-LICENSE=freedist
-SLOT=0
-SRC_URI=mirror://gentoo/nepali-fonts-1.tar.bz2
-_eclasses_=font	af70de9a23b2f34d4fe4dcb222be0346
-_md5_=286d1698757f7c91cfb94682ed67fb92
diff --git a/metadata/md5-cache/media-fonts/open-sans-1-r1 b/metadata/md5-cache/media-fonts/open-sans-1-r1
index d47e34027e58..b74eb546cf5d 100644
--- a/metadata/md5-cache/media-fonts/open-sans-1-r1
+++ b/metadata/md5-cache/media-fonts/open-sans-1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across
 EAPI=6
 HOMEPAGE=http://www.opensans.com/
 IUSE=X
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	font	af70de9a23b2f34d4fe4dcb222be0346	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1f68496ebae73e33d6eeac86a78fed63
+_md5_=2315a7870c018b0a4c015fcb3849ff93
diff --git a/metadata/md5-cache/media-fonts/sgi-fonts-1.0 b/metadata/md5-cache/media-fonts/sgi-fonts-1.0
index cb8f4d1af75b..cfd4b6f84eae 100644
--- a/metadata/md5-cache/media-fonts/sgi-fonts-1.0
+++ b/metadata/md5-cache/media-fonts/sgi-fonts-1.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ia64 ~ppc ppc64 s390 sh sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/suse/i386/9.1/suse/noarch/sgi-fonts-1.0-705.noarch.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	font	af70de9a23b2f34d4fe4dcb222be0346	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	font	af70de9a23b2f34d4fe4dcb222be0346	rpm	b03b38188e1e83766244d2046785d562
 _md5_=9da044d97b9751ed66a26f0deb4fa453
diff --git a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9 b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
index c5784dac3ead..dfa4245fd94f 100644
--- a/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
+++ b/metadata/md5-cache/media-fonts/urw-fonts-2.4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!media-fonts/gnu-gs-fonts-std !media-fonts/gnu-gs-fonts-other
 SLOT=0
 SRC_URI=mirror://gentoo/urw-fonts-2.4-9.fc13.src.rpm
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	font	af70de9a23b2f34d4fe4dcb222be0346	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	font	af70de9a23b2f34d4fe4dcb222be0346	rpm	b03b38188e1e83766244d2046785d562
 _md5_=5e5d56d45a9f478cd75b44b133650bf2
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index cd70de3a3586..f5af1e8b2ba9 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.11 b/metadata/md5-cache/media-gfx/alembic-1.7.11
deleted file mode 100644
index eaa83dfc2938..000000000000
--- a/metadata/md5-cache/media-gfx/alembic-1.7.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.3.0:= boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 ) doc? ( >=app-doc/doxygen-1.8.14-r1 )
-DESCRIPTION=Open framework for storing and sharing scene data
-EAPI=7
-HOMEPAGE=https://www.alembic.io/
-IUSE=arnold +boost doc examples hdf5 maya prman python test zlib +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.3.0:= boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) hdf5? ( zlib ) python? ( boost )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/alembic/alembic/archive/1.7.11.tar.gz -> alembic-1.7.11.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=142c24ea08b9bd0df244ac636a05d720
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.11-r1 b/metadata/md5-cache/media-gfx/alembic-1.7.11-r1
new file mode 100644
index 000000000000..b1e7893f34ae
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.11-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.3.0:= hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.3.0[python_single_target_python2_7(-)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 ) python_single_target_python2_7? ( boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)] ) ) doc? ( >=app-doc/doxygen-1.8.14-r1 )
+DESCRIPTION=Open framework for storing and sharing scene data
+EAPI=7
+HOMEPAGE=https://www.alembic.io/
+IUSE=arnold +boost doc examples hdf5 maya prman python test zlib +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.3.0:= hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.3.0[python_single_target_python2_7(-)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 ) python_single_target_python2_7? ( boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) hdf5? ( zlib ) python? ( boost )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/alembic/alembic/archive/1.7.11.tar.gz -> alembic-1.7.11.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d956a4172c6ae6ccd2d43a2965b4d990
diff --git a/metadata/md5-cache/media-gfx/alembic-1.7.9 b/metadata/md5-cache/media-gfx/alembic-1.7.9
index 0822973b6679..0424e31eb62c 100644
--- a/metadata/md5-cache/media-gfx/alembic-1.7.9
+++ b/metadata/md5-cache/media-gfx/alembic-1.7.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.2.0-r2:= boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.2.0-r2:= hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.2.0[python_single_target_python2_7(-)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 ) python_single_target_python2_7? ( boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)] ) ) >=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 +python_single_target_python2_7
+IUSE=arnold +boost doc examples hdf5 maya prman python test zlib +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.2.0-r2:= boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) hdf5? ( zlib ) python? ( boost )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/openexr-2.2.0-r2:= hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] ) python? ( >=dev-python/pyilmbase-2.2.0[python_single_target_python2_7(-)?] ) zlib? ( >=sys-libs/zlib-1.2.11-r1 ) python_single_target_python2_7? ( boost? ( >=dev-libs/boost-1.65.0:=[python,python_targets_python2_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) hdf5? ( zlib ) python? ( boost )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/alembic/alembic/archive/1.7.9.tar.gz -> alembic-1.7.9.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b698c0f14d90406a4639206e24b109f
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40bfb74a12a379b4004db5cdea472885
diff --git a/metadata/md5-cache/media-gfx/apngasm-2.7 b/metadata/md5-cache/media-gfx/apngasm-2.7
deleted file mode 100644
index 6eb6110f5088..000000000000
--- a/metadata/md5-cache/media-gfx/apngasm-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libpng:0=[apng] sys-libs/zlib:= app-arch/unzip virtual/pkgconfig
-DESCRIPTION=create an APNG from multiple PNG files
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/apngasm/
-KEYWORDS=amd64 x86
-LICENSE=ZLIB
-RDEPEND=media-libs/libpng:0=[apng] sys-libs/zlib:=
-SLOT=0
-SRC_URI=mirror://sourceforge/apngasm/2.7/apngasm-2.7-src.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c0c100c180642b58cc7baa12847e0a2
diff --git a/metadata/md5-cache/media-gfx/asymptote-2.61 b/metadata/md5-cache/media-gfx/asymptote-2.61
index 64b819a6776c..c5f90834a417 100644
--- a/metadata/md5-cache/media-gfx/asymptote-2.61
+++ b/metadata/md5-cache/media-gfx/asymptote-2.61
@@ -1,6 +1,6 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
-DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl )
+DEPEND=>=sys-libs/ncurses-5.4-r5:0= >=sys-libs/readline-4.3-r5:0= imagemagick? ( media-gfx/imagemagick[png] ) opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) offscreen? ( media-libs/mesa[osmesa] ) svg? ( app-text/dvisvgm ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) python? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) X? ( 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),gui,widgets,svg] dev-python/numpy dev-python/pycson >=gnome-base/librsvg-2.40 ) latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 ) emacs? ( >=app-editors/emacs-23.1:* ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl media-gfx/imagemagick[png] virtual/texi2dvi virtual/latex-base app-text/ghostscript-gpl ) test? ( app-text/ghostscript-gpl ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
 DESCRIPTION=A vector graphics language that provides a framework for technical drawing
 EAPI=7
 HOMEPAGE=http://asymptote.sourceforge.net/
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) offscreen?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/asymptote/asymptote-2.61.src.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	latex-package	17f13abe0de88340745e52e6b627aee7	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	latex-package	663b0e5f0410bc8e8d51f11346f0258a	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5225a1db2b357d4ac186b96ac1ed25f3
diff --git a/metadata/md5-cache/media-gfx/birdfont-2.18.3 b/metadata/md5-cache/media-gfx/birdfont-2.18.3
index 154ae4dfe337..c238f30f9130 100644
--- a/metadata/md5-cache/media-gfx/birdfont-2.18.3
+++ b/metadata/md5-cache/media-gfx/birdfont-2.18.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-db/sqlite:3 dev-libs/libgee:0.8= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/libxmlbird x11-libs/gdk-pixbuf:2 gtk? ( net-libs/libsoup:2.4 net-libs/webkit-gtk:4= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/doit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/doit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) nls? ( sys-devel/gettext )
+DEPEND=dev-db/sqlite:3 dev-libs/libgee:0.8= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/libxmlbird x11-libs/gdk-pixbuf:2 gtk? ( net-libs/libsoup:2.4 net-libs/webkit-gtk:4= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) || ( dev-lang/python:3.6 ) || ( ( dev-lang/python:3.6 dev-python/doit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) nls? ( sys-devel/gettext )
 DESCRIPTION=Font editor for the creation of vector graphics and export TTF, EOT & SVG fonts
 EAPI=6
 HOMEPAGE=https://birdfont.org/
@@ -10,4 +10,4 @@ RDEPEND=dev-db/sqlite:3 dev-libs/libgee:0.8= dev-libs/glib:2 media-libs/fontconf
 SLOT=0
 SRC_URI=https://birdfont.org/releases/birdfont-2.18.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e96889f84803e595e9da4da3d75fbd6
+_md5_=6e2d354661484adaffa3c9ee3340fe53
diff --git a/metadata/md5-cache/media-gfx/blender-2.79b-r1 b/metadata/md5-cache/media-gfx/blender-2.79b-r1
deleted file mode 100644
index 0bd1a2f4627f..000000000000
--- a/metadata/md5-cache/media-gfx/blender-2.79b-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 >=dev-python/numpy-1.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( media-gfx/openvdb[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,-abi3-compat(-),abi4-compat(+)] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind ) >=dev-cpp/eigen-3.2.8:3 virtual/pkgconfig doc? ( app-doc/doxygen[-nodot(-),dot(+),latex] dev-python/sphinx[latex] ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=3D Creation/Animation/Publishing System
-EAPI=6
-HOMEPAGE=https://www.blender.org
-IUSE=+bullet +dds +elbeem +game-engine +openexr collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl player sdl sndfile test tiff valgrind +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( GPL-2 BL )
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 >=dev-python/numpy-1.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( media-gfx/openvdb[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,-abi3-compat(-),abi4-compat(+)] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm ) player? ( game-engine !headless )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.blender.org/source/blender-2.79b.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=45b8d2f9511adbc25504e4ed389b8fe7
diff --git a/metadata/md5-cache/media-gfx/blender-2.79b-r2 b/metadata/md5-cache/media-gfx/blender-2.79b-r2
new file mode 100644
index 000000000000..41815bac163e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/blender-2.79b-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 python_single_target_python3_6? ( >=dev-python/numpy-1.10.1[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( media-gfx/openvdb[python_single_target_python3_6(-)?,-abi3-compat(-),abi4-compat(+)] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind ) >=dev-cpp/eigen-3.2.8:3 virtual/pkgconfig doc? ( app-doc/doxygen[-nodot(-),dot(+),latex] dev-python/sphinx[latex] ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=3D Creation/Animation/Publishing System
+EAPI=6
+HOMEPAGE=https://www.blender.org
+IUSE=+bullet +dds +elbeem +game-engine +openexr collada color-management cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb osl player sdl sndfile test tiff valgrind +python_single_target_python3_6
+KEYWORDS=amd64 ~x86
+LICENSE=|| ( GPL-2 BL )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/boost-1.62:=[nls?,threads(+)] dev-libs/lzo:2 python_single_target_python3_6? ( >=dev-python/numpy-1.10.1[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) media-libs/freetype media-libs/glew:* media-libs/libpng:0= media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0= virtual/libintl virtual/opengl collada? ( >=media-libs/opencollada-1.6.18:= ) color-management? ( media-libs/opencolorio ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:0 ) llvm? ( sys-devel/llvm:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( media-libs/openal ) opencl? ( virtual/opencl ) openimageio? ( >=media-libs/openimageio-1.7.0 ) openexr? ( >=media-libs/ilmbase-2.2.0:= >=media-libs/openexr-2.2.0:= ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( media-gfx/openvdb[python_single_target_python3_6(-)?,-abi3-compat(-),abi4-compat(+)] dev-cpp/tbb >=dev-libs/c-blosc-1.5.2 ) osl? ( media-libs/osl:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) valgrind? ( dev-util/valgrind )
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) cuda? ( cycles ) cycles? ( openexr tiff openimageio ) opencl? ( cycles ) osl? ( cycles llvm ) player? ( game-engine !headless )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.blender.org/source/blender-2.79b.tar.gz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=302453661ea1947bd1febe17ca8e8668
diff --git a/metadata/md5-cache/media-gfx/cairosvg-1.0.22 b/metadata/md5-cache/media-gfx/cairosvg-1.0.22
index c48b155d2c45..94f1100d2dad 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_6(-)
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CairoSVG/CairoSVG-1.0.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f4d688aa383d326e7f3c2aa6266ae022
diff --git a/metadata/md5-cache/media-gfx/cairosvg-2.0.3 b/metadata/md5-cache/media-gfx/cairosvg-2.0.3
index a0890aafae5c..82870ee51452 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_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/CairoSVG/CairoSVG-2.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2c56b69744bbaf523ad2a8feb38e510
diff --git a/metadata/md5-cache/media-gfx/comix-4.0.4-r1 b/metadata/md5-cache/media-gfx/comix-4.0.4-r1
deleted file mode 100644
index f0ad34849d82..000000000000
--- a/metadata/md5-cache/media-gfx/comix-4.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A GTK image viewer specifically designed to handle comic books
-EAPI=5
-HOMEPAGE=http://comix.sourceforge.net
-IUSE=rar +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] rar? ( || ( app-arch/unrar app-arch/rar ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/comix/comix-4.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62227cf22c77d914508fe3ed1c8fb3db
diff --git a/metadata/md5-cache/media-gfx/comix-4.0.4-r2 b/metadata/md5-cache/media-gfx/comix-4.0.4-r2
new file mode 100644
index 000000000000..58bae5751524
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/comix-4.0.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_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/pillow[python_targets_python2_7(-)] >=dev-python/pygtk-2.12[python_targets_python2_7(-)] )
+DESCRIPTION=A GTK image viewer specifically designed to handle comic books
+EAPI=5
+HOMEPAGE=http://comix.sourceforge.net
+IUSE=rar +python_single_target_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/pillow[python_targets_python2_7(-)] >=dev-python/pygtk-2.12[python_targets_python2_7(-)] ) rar? ( || ( app-arch/unrar app-arch/rar ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/comix/comix-4.0.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=75a5792f2f918fff53c18822e31f664e
diff --git a/metadata/md5-cache/media-gfx/cptutils-1.72 b/metadata/md5-cache/media-gfx/cptutils-1.72
index b055b6f9337c..20648370df50 100644
--- a/metadata/md5-cache/media-gfx/cptutils-1.72
+++ b/metadata/md5-cache/media-gfx/cptutils-1.72
@@ -3,13 +3,13 @@ DEPEND=dev-libs/libxml2:2 media-libs/libpng:0= test? ( app-text/xml2 app-text/xm
 DESCRIPTION=A number of utilities for the manipulation of color gradient files
 EAPI=7
 HOMEPAGE=http://soliton.vm.bytemark.co.uk/pub/jjg/en/code/cptutils/
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 media-libs/libpng:0= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://soliton.vm.bytemark.co.uk/pub/jjg/src/cptutils-1.72.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe6e698d767b15d29b89280124a92245
diff --git a/metadata/md5-cache/media-gfx/cura-3.4.1 b/metadata/md5-cache/media-gfx/cura-3.4.1
index 89bac78826b2..f7c0ee9da116 100644
--- a/metadata/md5-cache/media-gfx/cura-3.4.1
+++ b/metadata/md5-cache/media-gfx/cura-3.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/uranium-3.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-gfx/curaengine-3.4 >=media-gfx/fdm-materials-3.4 >=dev-libs/libsavitar-3.4:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/libcharon-3.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-3.4 >=media-gfx/fdm-materials-3.4 >=dev-libs/libsavitar-3.4:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-3.4[python_single_target_python3_6(-)?] >=dev-python/uranium-3.4[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A 3D model slicing application for 3D printing
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+usb zeroconf +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/uranium-3.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-gfx/curaengine-3.4 >=media-gfx/fdm-materials-3.4 >=dev-libs/libsavitar-3.4:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/libcharon-3.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-3.4 >=media-gfx/fdm-materials-3.4 >=dev-libs/libsavitar-3.4:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-3.4[python_single_target_python3_6(-)?] >=dev-python/uranium-3.4[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d57a6ebe11b7b8bfbbfae936a8b943c
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=367ea32459e520c863b4746da8c5a96f
diff --git a/metadata/md5-cache/media-gfx/cura-3.6.0 b/metadata/md5-cache/media-gfx/cura-3.6.0
index f4d041d1936a..90fc4bc2e0e6 100644
--- a/metadata/md5-cache/media-gfx/cura-3.6.0
+++ b/metadata/md5-cache/media-gfx/cura-3.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/uranium-3.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-gfx/curaengine-3.6 >=media-gfx/fdm-materials-3.6 >=dev-libs/libsavitar-3.6:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/libcharon-3.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-3.6 >=media-gfx/fdm-materials-3.6 >=dev-libs/libsavitar-3.6:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-3.6[python_single_target_python3_6(-)?] >=dev-python/uranium-3.6[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A 3D model slicing application for 3D printing
 EAPI=6
 HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+usb zeroconf +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/uranium-3.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-gfx/curaengine-3.6 >=media-gfx/fdm-materials-3.6 >=dev-libs/libsavitar-3.6:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/libcharon-3.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-3.6 >=media-gfx/fdm-materials-3.6 >=dev-libs/libsavitar-3.6:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-3.6[python_single_target_python3_6(-)?] >=dev-python/uranium-3.6[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Cura/archive/3.6.0.tar.gz -> cura-3.6.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d57a6ebe11b7b8bfbbfae936a8b943c
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=367ea32459e520c863b4746da8c5a96f
diff --git a/metadata/md5-cache/media-gfx/cura-4.2.1 b/metadata/md5-cache/media-gfx/cura-4.2.1
index f8f7ee9a4741..a5ef44a34dcc 100644
--- a/metadata/md5-cache/media-gfx/cura-4.2.1
+++ b/metadata/md5-cache/media-gfx/cura-4.2.1
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/uranium-4.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-gfx/curaengine-4.2 >=media-gfx/fdm-materials-4.2 >=dev-libs/libsavitar-4.2:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/libcharon-4.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-4.2 >=media-gfx/fdm-materials-4.2 >=dev-libs/libsavitar-4.2:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-4.2[python_single_target_python3_6(-)?] >=dev-python/uranium-4.2[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A 3D model slicing application for 3D printing
 EAPI=7
 HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+usb zeroconf +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/uranium-4.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-gfx/curaengine-4.2 >=media-gfx/fdm-materials-4.2 >=dev-libs/libsavitar-4.2:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/libcharon-4.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-4.2 >=media-gfx/fdm-materials-4.2 >=dev-libs/libsavitar-4.2:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-4.2[python_single_target_python3_6(-)?] >=dev-python/uranium-4.2[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/Ultimaker/Cura/archive/4.2.1.tar.gz -> cura-4.2.1.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a14eb0e9bd06d7277519958695ce82a5
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18bb3688a0139ea0faff5f7b303b4016
diff --git a/metadata/md5-cache/media-gfx/cura-4.3.0 b/metadata/md5-cache/media-gfx/cura-4.3.0
deleted file mode 100644
index f24511cd1c5d..000000000000
--- a/metadata/md5-cache/media-gfx/cura-4.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/uranium-4.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-gfx/curaengine-4.3 >=media-gfx/fdm-materials-4.3 >=dev-libs/libsavitar-4.3:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/libcharon-4.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A 3D model slicing application for 3D printing
-EAPI=7
-HOMEPAGE=https://github.com/Ultimaker/Cura
-IUSE=+usb zeroconf +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/uranium-4.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-gfx/curaengine-4.3 >=media-gfx/fdm-materials-4.3 >=dev-libs/libsavitar-4.3:=[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/libcharon-4.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] usb? ( dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Ultimaker/Cura/archive/4.3.0.tar.gz -> cura-4.3.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a14eb0e9bd06d7277519958695ce82a5
diff --git a/metadata/md5-cache/media-gfx/cura-4.3.0-r1 b/metadata/md5-cache/media-gfx/cura-4.3.0-r1
new file mode 100644
index 000000000000..59011a2cc1ca
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/cura-4.3.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-4.3 >=media-gfx/fdm-materials-4.3 >=dev-libs/libsavitar-4.3:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-4.3[python_single_target_python3_6(-)?] >=dev-python/uranium-4.3[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A 3D model slicing application for 3D printing
+EAPI=7
+HOMEPAGE=https://github.com/Ultimaker/Cura
+IUSE=+usb zeroconf +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=media-gfx/curaengine-4.3 >=media-gfx/fdm-materials-4.3 >=dev-libs/libsavitar-4.3:=[python,python_single_target_python3_6(-)?] >=dev-libs/libcharon-4.3[python_single_target_python3_6(-)?] >=dev-python/uranium-4.3[python_single_target_python3_6(-)?] python_single_target_python3_6? ( usb? ( dev-python/pyserial[python_targets_python3_6(-)] ) zeroconf? ( dev-python/zeroconf[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Ultimaker/Cura/archive/4.3.0.tar.gz -> cura-4.3.0.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18bb3688a0139ea0faff5f7b303b4016
diff --git a/metadata/md5-cache/media-gfx/digikam-6.4.0 b/metadata/md5-cache/media-gfx/digikam-6.4.0
index ecfb3a209115..3b8e02fbd9cc 100644
--- a/metadata/md5-cache/media-gfx/digikam-6.4.0
+++ b/metadata/md5-cache/media-gfx/digikam-6.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=Digital photo management application
 EAPI=7
 HOMEPAGE=https://www.digikam.org/
 IUSE=addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/expat >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[mysql?] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=media-gfx/exiv2-0.27:= media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= >=media-libs/opencv-3.1.0:= media-libs/tiff:0 virtual/jpeg:0 addressbook? ( >=kde-apps/akonadi-contacts-19.04.3:5 >=kde-frameworks/kcontacts-5.60.0:5 ) calendar? ( >=kde-frameworks/kcalendarcore-5.60.0:5 ) dnn? ( >=media-libs/opencv-3.1.0:=[contrib,contribdnn] ) gphoto2? ( media-libs/libgphoto2:= ) heif? ( media-libs/x265:= ) imagemagick? ( media-gfx/imagemagick:= ) lensfun? ( media-libs/lensfun ) marble? ( >=dev-qt/qtconcurrent-5.12.3:5 >=kde-apps/marble-19.04.3:5 >=kde-frameworks/kbookmarks-5.60.0:5 ) mediaplayer? ( media-libs/qtav[opengl] !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) opengl? ( >=dev-qt/qtopengl-5.12.3:5 virtual/opengl ) panorama? ( >=kde-frameworks/threadweaver-5.60.0:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.60.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) mysql? ( virtual/mysql[server] ) panorama? ( media-gfx/hugin ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/6.4.0/digikam-6.4.0.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c2f3f60c5c57ae191e92dd61a3de4150
+_md5_=b447d45d5fa2076f07cba32b0400dc82
diff --git a/metadata/md5-cache/media-gfx/displaycal-3.8.8.1-r1 b/metadata/md5-cache/media-gfx/displaycal-3.8.8.1-r1
index 1e9c76f7fe0e..cde89d002d03 100644
--- a/metadata/md5-cache/media-gfx/displaycal-3.8.8.1-r1
+++ b/metadata/md5-cache/media-gfx/displaycal-3.8.8.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-gfx/argyllcms-1.1.0 dev-python/wxpython:3.0[python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dispcalgui/DisplayCAL-3.8.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7171f28e9ca4e885746c46c824f100bc
diff --git a/metadata/md5-cache/media-gfx/engauge-10.6 b/metadata/md5-cache/media-gfx/engauge-10.6
index 135e11e73fd4..a9f764e929dc 100644
--- a/metadata/md5-cache/media-gfx/engauge-10.6
+++ b/metadata/md5-cache/media-gfx/engauge-10.6
@@ -10,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:
 SLOT=0
 SRC_URI=https://github.com/markummitchell/engauge-digitizer/archive/v10.6.tar.gz -> engauge-digitizer-10.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=19582c58fe43f2c9217d0c75a93b5773
+_md5_=cd9d4513e5ef131002786ab420e71e79
diff --git a/metadata/md5-cache/media-gfx/entangle-2.0 b/metadata/md5-cache/media-gfx/entangle-2.0
index 28330d3c2414..28dc7e3be990 100644
--- a/metadata/md5-cache/media-gfx/entangle-2.0
+++ b/metadata/md5-cache/media-gfx/entangle-2.0
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Tethered Camera Control & Capture
 EAPI=7
 HOMEPAGE=https://entangle-photo.org/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.36:2 >=dev-libs/gobject-introspection-1.54.0 dev-libs/libgudev:= >=dev-libs/libpeas-1.2.0[gtk,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] >=media-libs/gexiv2-0.10[introspection] >=media-libs/libgphoto2-2.5.0:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/lcms:2 >=media-libs/libraw-0.9.0 >=x11-libs/gdk-pixbuf-2.12.0:2 >=x11-libs/gtk+-3.22:3[introspection] >=x11-libs/libXext-1.3.0 x11-themes/adwaita-icon-theme
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://entangle-photo.org/download/sources/entangle-2.0.tar.xz
-_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c46846784ed40a3d0a43d0ed64b6e00
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.26.4 b/metadata/md5-cache/media-gfx/eog-plugins-3.26.4
deleted file mode 100644
index 974ef9f7ce87..000000000000
--- a/metadata/md5-cache/media-gfx/eog-plugins-3.26.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) dev-libs/libxml2:2 >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Eye of GNOME plugins
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome/Plugins
-IUSE=+exif map picasa +python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
-REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/eog-plugins/3.26/eog-plugins-3.26.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=39c0fa7bc0a308ddc63b73eb1ba4de6f
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-3.26.4-r1 b/metadata/md5-cache/media-gfx/eog-plugins-3.26.4-r1
new file mode 100644
index 000000000000..a80458a2f22d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-plugins-3.26.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) dev-libs/libxml2:2 >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Eye of GNOME plugins
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome/Plugins
+IUSE=+exif map picasa +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libpeas-0.7.4:= >=media-gfx/eog-3.15.90 >=x11-libs/gtk+-3.14:3 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-libs/glib-2.32:2[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
+REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/eog-plugins/3.26/eog-plugins-3.26.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=88f09a1fd98e6e91ee2859ca7d2e5028
diff --git a/metadata/md5-cache/media-gfx/esci-interpreter-gt-s80-0.2.1.1 b/metadata/md5-cache/media-gfx/esci-interpreter-gt-s80-0.2.1.1
index 00720c4ffaf0..023dc4fc3c53 100644
--- a/metadata/md5-cache/media-gfx/esci-interpreter-gt-s80-0.2.1.1
+++ b/metadata/md5-cache/media-gfx/esci-interpreter-gt-s80-0.2.1.1
@@ -8,5 +8,5 @@ LICENSE=AVASYS
 RDEPEND=>=media-gfx/iscan-2.28.0
 SLOT=0
 SRC_URI=amd64? ( https://dev.gentoo.org/~flameeyes/avasys/esci-interpreter-gt-s80-0.2.1-1.x86_64.rpm ) x86? ( https://dev.gentoo.org/~flameeyes/avasys/esci-interpreter-gt-s80-0.2.1-1.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=120a686114113d533477aa4771ad6e46
diff --git a/metadata/md5-cache/media-gfx/evoluspencil-3.0.4 b/metadata/md5-cache/media-gfx/evoluspencil-3.0.4
index e27609fa0df7..ad8cb2ea9ab1 100644
--- a/metadata/md5-cache/media-gfx/evoluspencil-3.0.4
+++ b/metadata/md5-cache/media-gfx/evoluspencil-3.0.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib dev-libs/nspr dev-libs/nss gnome-base/gconf media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango
 SLOT=0
 SRC_URI=https://pencil.evolus.vn/dl/V3.0.4/Pencil-3.0.4-49.x86_64.rpm -> evoluspencil-3.0.4-49.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	f52cfa3a435468d86d3b49c357b9cb35	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	b03b38188e1e83766244d2046785d562	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68b4e9c2b138875f1daebcbce80254ac
diff --git a/metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r1 b/metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r1
index e5fe056e7a4b..a0957473431f 100644
--- a/metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r1
+++ b/metadata/md5-cache/media-gfx/evoluspencil-3.1.0-r1
@@ -9,5 +9,5 @@ RDEPEND=app-accessibility/at-spi2-atk app-accessibility/at-spi2-core dev-libs/at
 RESTRICT=splitdebug
 SLOT=0
 SRC_URI=https://pencil.evolus.vn/dl/V3.1.0.ga/pencil-3.1.0.ga-1.x86_64.rpm -> evoluspencil-3.1.0-1.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	f52cfa3a435468d86d3b49c357b9cb35	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	rpm	b03b38188e1e83766244d2046785d562	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9007b508c3ecb366f98c0f1c70a623f3
diff --git a/metadata/md5-cache/media-gfx/exact-image-0.8.1-r3 b/metadata/md5-cache/media-gfx/exact-image-0.8.1-r3
index 67a20ad3aabd..f4dfad02ef7c 100644
--- a/metadata/md5-cache/media-gfx/exact-image-0.8.1-r3
+++ b/metadata/md5-cache/media-gfx/exact-image-0.8.1-r3
@@ -3,12 +3,12 @@ DEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( vi
 DESCRIPTION=A fast, modern and generic image processing library
 EAPI=6
 HOMEPAGE=http://www.exactcode.de/site/open_source/exactimage/
-IUSE=expat jpeg lua openexr php perl png python ruby swig tiff truetype X +python_targets_python2_7 +python_single_target_python2_7
+IUSE=expat jpeg lua openexr php perl png python ruby swig tiff truetype X +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/agg[truetype] sys-libs/zlib expat? ( dev-libs/expat ) jpeg? ( virtual/jpeg ) lua? ( dev-lang/lua ) openexr? ( media-libs/openexr ) php? ( dev-lang/php ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.2.43 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( dev-lang/ruby ) tiff? ( media-libs/tiff ) truetype? ( >=media-libs/freetype-2 ) X? ( x11-libs/libXext x11-libs/libXt x11-libs/libICE x11-libs/libSM )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://dl.exactcode.de/oss/exact-image/exact-image-0.8.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f9218075b3e8c28796ef371245e36d1d
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.27.2 b/metadata/md5-cache/media-gfx/exiv2-0.27.2
index 4e1a177bdaa8..1398be2da968 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.27.2
+++ b/metadata/md5-cache/media-gfx/exiv2-0.27.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
+BDEPEND=doc? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) dev-util/ninja dev-util/cmake
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/27
 SRC_URI=https://exiv2.org/builds/exiv2-0.27.2-Source.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62e5286e84c8a0317ec13bd789560bf5
+_md5_=48da4094ab1ed339ecac47f1e6d766e6
diff --git a/metadata/md5-cache/media-gfx/feh-3.3 b/metadata/md5-cache/media-gfx/feh-3.3
index 4a3ccfc1798e..fe68cd361968 100644
--- a/metadata/md5-cache/media-gfx/feh-3.3
+++ b/metadata/md5-cache/media-gfx/feh-3.3
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile install postinst postrm preinst setup
+DEFINED_PHASES=compile install postinst postrm setup
 DEPEND=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 ) x11-base/xorg-proto x11-libs/libXt test? ( >=dev-lang/perl-5.10 dev-perl/Test-Command media-libs/imlib2[gif,jpeg,png] )
 DESCRIPTION=A fast, lightweight imageviewer using imlib2
-EAPI=6
+EAPI=7
 HOMEPAGE=https://feh.finalrewind.org/
 IUSE=debug curl exif test xinerama
 KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
@@ -10,5 +10,5 @@ RDEPEND=media-libs/imlib2[X] >=media-libs/libpng-1.2:0= x11-libs/libX11 curl? (
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://feh.finalrewind.org/feh-3.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be794cbac6925f4c3eb7b9243af64c37
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ca6cf1d81bbf99bb49bda17da702026b
diff --git a/metadata/md5-cache/media-gfx/fontforge-20170731-r5 b/metadata/md5-cache/media-gfx/fontforge-20170731-r5
index 223023277fe0..d546c12c38e1 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20170731-r5
+++ b/metadata/md5-cache/media-gfx/fontforge-20170731-r5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm setup
-DEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit sys-devel/gettext virtual/pkgconfig X? ( x11-base/xorg-proto )
+DEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit sys-devel/gettext virtual/pkgconfig X? ( x11-base/xorg-proto )
 DESCRIPTION=postscript font editor and converter
 EAPI=6
 HOMEPAGE=http://fontforge.github.io/
-IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X +python_single_target_python3_6
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD GPL-3+
-RDEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
-REQUIRED_USE=cairo? ( png ) python? ( ^^ ( 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 ) ) test? ( png python )
+RDEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
+REQUIRED_USE=cairo? ( png ) python? ( ^^ ( python_single_target_python3_6 ) ) test? ( png 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7979a17397d9d30ef90b6482bd26108b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ced9b5c96f54067b7ad17e6cdb507d2
diff --git a/metadata/md5-cache/media-gfx/fontforge-20190317-r3 b/metadata/md5-cache/media-gfx/fontforge-20190317-r3
index e0a75cac014f..317e2d337bf5 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20190317-r3
+++ b/metadata/md5-cache/media-gfx/fontforge-20190317-r3
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=postscript font editor and converter
 EAPI=7
 HOMEPAGE=http://fontforge.github.io/
-IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X 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
+IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD GPL-3+
-RDEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
-REQUIRED_USE=cairo? ( png ) gtk? ( cairo ) 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 ) ) test? ( png python )
+RDEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
+REQUIRED_USE=cairo? ( png ) gtk? ( cairo ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) test? ( png python )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20190317/fontforge-20190317.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ca1734515ab5328a55ca19380a18ba3c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aee40794e3365d40ea25f27204306fb1
diff --git a/metadata/md5-cache/media-gfx/fontforge-20190801 b/metadata/md5-cache/media-gfx/fontforge-20190801
index 6e978a7998d1..36e6d388f71f 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20190801
+++ b/metadata/md5-cache/media-gfx/fontforge-20190801
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=postscript font editor and converter
 EAPI=7
 HOMEPAGE=http://fontforge.github.io/
-IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X 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
+IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD GPL-3+
-RDEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
-REQUIRED_USE=cairo? ( png ) gtk? ( cairo ) 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 ) ) test? ( png python )
+RDEPEND=dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( >=x11-libs/gtk+-3.10:3 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
+REQUIRED_USE=cairo? ( png ) gtk? ( cairo ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) test? ( png python )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20190801/fontforge-20190801.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03d628be6c45cb8e08383b4f541d4c57
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e5e6e04fea89f1efb91b17eb97063a41
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 f0cd8e8ab394..f78deee0d4f7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00091d0198d57f6ad0577c6702314e01
diff --git a/metadata/md5-cache/media-gfx/fr0st-1.4-r2 b/metadata/md5-cache/media-gfx/fr0st-1.4-r2
index 77d2ea289b09..f259294eba6c 100644
--- a/metadata/md5-cache/media-gfx/fr0st-1.4-r2
+++ b/metadata/md5-cache/media-gfx/fr0st-1.4-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A fractal flame editor
 EAPI=5
 HOMEPAGE=http://fr0st.wordpress.com/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:3.0 >=media-gfx/flam3-3.0.1
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://launchpad.net/fr0st/trunk/1.4.0/+download/fr0st-1.4-src.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=e4ee8186d595d2bd46fa06fc6298666c
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.14 b/metadata/md5-cache/media-gfx/gimp-2.10.14
deleted file mode 100644
index 8e06ddf04132..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.10.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.0:2 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.72 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.18:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/automake-1.11 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=6
-HOMEPAGE=https://www.gimp.org/
-IUSE=aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse +python_targets_python2_7 +python_single_target_python2_7 test
-KEYWORDS=amd64 ~ia64 ~ppc64 x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.0:2 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.72 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.18:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gimp/v2.10/gimp-2.10.14.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67f13c971ef6ccca4c7ccd032235708b
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.14-r1 b/metadata/md5-cache/media-gfx/gimp-2.10.14-r1
new file mode 100644
index 000000000000..9946a75e5486
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.14-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.0:2 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.72 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.18:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python2_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/pycairo-1.0.2[python_targets_python2_7(-)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)] ) ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/automake-1.11 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=6
+HOMEPAGE=https://www.gimp.org/
+IUSE=aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse +python_single_target_python2_7 test
+KEYWORDS=amd64 ~ia64 ~ppc64 x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.0:2 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.72 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.18:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python2_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/pycairo-1.0.2[python_targets_python2_7(-)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)] ) ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.14.tar.bz2
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6a47f4ebf467796bf4873cb578ca8e9a
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.8-r1 b/metadata/md5-cache/media-gfx/gimp-2.10.8-r1
deleted file mode 100644
index d9e543b933db..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.10.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0 >=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.58 >=media-libs/gegl-0.4.12: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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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? ( dev-libs/libgudev:= ) unwind? ( sys-libs/libunwind:= ) heif? ( >=media-libs/libheif-1.1.0:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=6
-HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0 >=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.58 >=media-libs/gegl-0.4.12: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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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? ( dev-libs/libgudev:= ) unwind? ( sys-libs/libunwind:= ) heif? ( >=media-libs/libheif-1.1.0:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gimp/v2.10/gimp-2.10.8.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bb4ff9a67e52842f420174ff5a24022
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.8-r2 b/metadata/md5-cache/media-gfx/gimp-2.10.8-r2
new file mode 100644
index 000000000000..0ee2eb9d96aa
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.8-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0 >=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.58 >=media-libs/gegl-0.4.12: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_single_target_python2_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/pygtk-2.10.4:2[python_targets_python2_7(-)] >=dev-python/pycairo-1.0.2[python_targets_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? ( dev-libs/libgudev:= ) unwind? ( sys-libs/libunwind:= ) heif? ( >=media-libs/libheif-1.1.0:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib dev-util/gtk-update-icon-cache sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=6
+HOMEPAGE=https://www.gimp.org/
+IUSE=alsa aalib altivec aqua debug doc openexr gnome heif postscript jpeg2k cpu_flags_x86_mmx mng python cpu_flags_x86_sse udev unwind vector-icons webp wmf xpm test +python_single_target_python2_7
+KEYWORDS=amd64 arm64 x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/cairo-1.12.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/harfbuzz-0.9.19 >=media-libs/gexiv2-0.10.6 >=media-libs/libmypaint-1.3.0 >=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.58 >=media-libs/gegl-0.4.12: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_single_target_python2_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/pygtk-2.10.4:2[python_targets_python2_7(-)] >=dev-python/pycairo-1.0.2[python_targets_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? ( dev-libs/libgudev:= ) unwind? ( sys-libs/libunwind:= ) heif? ( >=media-libs/libheif-1.1.0:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gimp/v2.10/gimp-2.10.8.tar.bz2
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07b9fb6d55457008a7b83aeb02fdc50b
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1 b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
deleted file mode 100644
index b97b6df9748f..000000000000
--- a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNU Image Manipulation Program
-EAPI=5
-HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm test debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d9852cda6ce1469dd0ee4bb1797bfbc
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.22-r2 b/metadata/md5-cache/media-gfx/gimp-2.8.22-r2
new file mode 100644
index 000000000000..48f7f4bf9ea4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.22-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_single_target_python2_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/pygtk-2.10.4:2[python_targets_python2_7(-)] ) ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= ) sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNU Image Manipulation Program
+EAPI=5
+HOMEPAGE=https://www.gimp.org/
+IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm test debug +python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_single_target_python2_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/pygtk-2.10.4:2[python_targets_python2_7(-)] ) ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( dev-libs/libgudev:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5a9d6d7d1ecf0d325f7ee333fd7bfaf1
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 d1da1707a916..84e80ddbb8b2 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.9.8-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=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-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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? ( dev-libs/libgudev:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=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-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_single_target_python2_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/pygtk-2.10.4:2[python_targets_python2_7(-)] >=dev-python/pycairo-1.0.2[python_targets_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? ( dev-libs/libgudev:= ) >=dev-lang/perl-5.10.0 dev-libs/appstream-glib sys-apps/findutils virtual/pkgconfig >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.19 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=6
 HOMEPAGE=https://www.gimp.org/
-IUSE=alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa aalib altivec aqua debug doc openexr gnome postscript cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm test +python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=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-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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? ( dev-libs/libgudev:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 dev-util/gtk-update-icon-cache >=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-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.38 >=media-libs/gegl-0.3.24:0.3[cairo] aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) gnome? ( gnome-base/gvfs ) virtual/jpeg:0 >=media-libs/lcms-2.8:2 mng? ( media-libs/libmng ) openexr? ( >=media-libs/openexr-1.6.1 ) pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) >=media-libs/libpng-1.6.25:0 python? ( python_single_target_python2_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/pygtk-2.10.4:2[python_targets_python2_7(-)] >=dev-python/pycairo-1.0.2[python_targets_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? ( dev-libs/libgudev:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gimp/v2.9/gimp-2.9.8.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c360e8742976e8b962fd11e27ae6224
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c95868037093e05160b129b03d25a2b
diff --git a/metadata/md5-cache/media-gfx/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index 02162ff6f3ef..6f365c80b385 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 >=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.74[introspection] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.20:0.4[cairo,introspection] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36:2 >=x11-libs/gtk+-3.22.29:3 x11-libs/libXcursor >=x11-libs/pango-1.42.0 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) lua? ( dev-lang/luajit ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 >=dev-libs/appstream-glib-0.7.7 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.0 dev-util/gtk-doc-am ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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] app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 >=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.74[introspection] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.20:0.4[cairo,introspection] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36:2 >=x11-libs/gtk+-3.22.29:3 x11-libs/libXcursor >=x11-libs/pango-1.42.0 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) lua? ( dev-lang/luajit ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 >=dev-libs/appstream-glib-0.7.7 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.0 dev-util/gtk-doc-am ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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] app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GNU Image Manipulation Program
 EAPI=6
 HOMEPAGE=https://www.gimp.org/
-IUSE=aalib alsa altivec aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+IUSE=aalib alsa altivec aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx cpu_flags_x86_sse python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
 LICENSE=GPL-3 LGPL-3
 PROPERTIES=live
-RDEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 >=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.74[introspection] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.20:0.4[cairo,introspection] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36:2 >=x11-libs/gtk+-3.22.29:3 x11-libs/libXcursor >=x11-libs/pango-1.42.0 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) lua? ( dev-lang/luajit ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+RDEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 >=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.74[introspection] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.20:0.4[cairo,introspection] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36:2 >=x11-libs/gtk+-3.22.29:3 x11-libs/libXcursor >=x11-libs/pango-1.42.0 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) lua? ( dev-lang/luajit ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ae29cc9a1e393163d3708196939c3a5
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff2c5af12b71c63130bc8b1d363ef4b3
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1 b/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1
deleted file mode 100644
index 162226285cfd..000000000000
--- a/metadata/md5-cache/media-gfx/gnofract4d-3.14-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=x11-libs/gtk+:2 >=media-libs/libpng-1.4 virtual/jpeg >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gconf-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig python_targets_python2_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/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A program for drawing beautiful mathematically-based images known as fractals
-EAPI=5
-HOMEPAGE=http://gnofract4d.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=x11-libs/gtk+:2 >=media-libs/libpng-1.4 virtual/jpeg >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gconf-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_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gnofract4d/gnofract4d-3.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d12079bf362cb55da10ccfb14a6a2954
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-3.14.1 b/metadata/md5-cache/media-gfx/gnofract4d-3.14.1
deleted file mode 100644
index 249024ef5917..000000000000
--- a/metadata/md5-cache/media-gfx/gnofract4d-3.14.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=x11-libs/gtk+:2 media-libs/libpng:0= virtual/jpeg:0 >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A program for drawing beautiful mathematically-based images known as fractals
-EAPI=6
-HOMEPAGE=http://edyoung.github.io/gnofract4d/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=x11-libs/gtk+:2 media-libs/libpng:0= virtual/jpeg:0 >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aee3fa7414cba648d0aa50167702dfab
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1 b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1
deleted file mode 100644
index 865ee36e3eb4..000000000000
--- a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] media-libs/libpng:0= virtual/jpeg:0 dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] x11-libs/gtk+:3[introspection] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=media-libs/libpng:0= virtual/jpeg:0 doc? ( app-text/docbook-xsl-stylesheets dev-python/pygobject[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-libs/libxslt x11-libs/gtk+:3[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A program for drawing beautiful mathematically-based images known as fractals
-EAPI=7
-HOMEPAGE=http://edyoung.github.io/gnofract4d/
-IUSE=+doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=media-libs/libpng:0= virtual/jpeg:0 dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] x11-libs/gtk+:3[introspection] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=test? ( doc ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/edyoung/gnofract4d/archive/bd600c20921afff7b02fc0a76ab79242ebd0896d.tar.gz -> gnofract4d-4.0.1_p1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ece3c681bfeae3dac8269ceebb517bb0
diff --git a/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1 b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
new file mode 100644
index 000000000000..46ef235194cb
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gnofract4d-4.0.1_p1-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( media-libs/libpng:0= virtual/jpeg:0 python_single_target_python3_6? ( dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] python_single_target_python3_6? ( dev-python/pytest[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pytest[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/libpng:0= virtual/jpeg:0 doc? ( app-text/docbook-xsl-stylesheets python_single_target_python3_6? ( dev-python/pygobject[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) dev-libs/libxslt x11-libs/gtk+:3[introspection] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A program for drawing beautiful mathematically-based images known as fractals
+EAPI=7
+HOMEPAGE=http://edyoung.github.io/gnofract4d/
+IUSE=+doc test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=media-libs/libpng:0= virtual/jpeg:0 python_single_target_python3_6? ( dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=test? ( doc ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/edyoung/gnofract4d/archive/bd600c20921afff7b02fc0a76ab79242ebd0896d.tar.gz -> gnofract4d-4.0.1_p1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef0a9a79de30f15804197fa2ee562ab0
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.42.3 b/metadata/md5-cache/media-gfx/graphviz-2.42.3
index b9e7fef6b6b8..46de109d9c43 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.42.3
+++ b/metadata/md5-cache/media-gfx/graphviz-2.42.3
@@ -1,16 +1,16 @@
 BDEPEND=sys-devel/flex sys-devel/libtool virtual/pkgconfig nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) guile? ( dev-lang/swig dev-scheme/guile ) java? ( dev-lang/swig >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) guile? ( dev-lang/swig dev-scheme/guile ) java? ( dev-lang/swig >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Open Source Graph Visualization Software
 EAPI=7
 HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
-IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=CPL-1.0
-RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0= sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www2.graphviz.org/Packages/stable/portable_source/graphviz-2.42.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0cee396ceaf32f3876bbf270f4dfd9aa
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c60e616a8309f1fe28e1d2ef9d126ce6
diff --git a/metadata/md5-cache/media-gfx/gtkimageview-1.6.4 b/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
index 6cf13d46f277..eb2f966d01b5 100644
--- a/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
+++ b/metadata/md5-cache/media-gfx/gtkimageview-1.6.4
@@ -4,11 +4,11 @@ DESCRIPTION=A simple image viewer widget for GTK
 EAPI=6
 HOMEPAGE=https://projects.gnome.org/gtkimageview/
 IUSE=examples static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=x11-libs/gtk+:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/gtkimageview-1.6.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5520a58e37edd2bfc8a51edfa27b8860
+_md5_=f047b920f01ffef696bc5c60d54b178a
diff --git a/metadata/md5-cache/media-gfx/hugin-2019.0.0 b/metadata/md5-cache/media-gfx/hugin-2019.0.0
index 0965c6d6f568..7fd76efe6b50 100644
--- a/metadata/md5-cache/media-gfx/hugin-2019.0.0
+++ b/metadata/md5-cache/media-gfx/hugin-2019.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=!!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= sci-libs/flann 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=!!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= sci-libs/flann 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=6
 HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
-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= sci-libs/flann 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+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= sci-libs/flann 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2019.0.0.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa35cb7a9433567debab67c27ae58249
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e609de286b5dc77487d59c463be73e44
diff --git a/metadata/md5-cache/media-gfx/hugin-2019.2.0 b/metadata/md5-cache/media-gfx/hugin-2019.2.0
index 955cff7c5a67..199493f8ea2f 100644
--- a/metadata/md5-cache/media-gfx/hugin-2019.2.0
+++ b/metadata/md5-cache/media-gfx/hugin-2019.2.0
@@ -3,12 +3,12 @@ DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=medi
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=6
 HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug lapack python raw sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
 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= sci-libs/flann 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool raw? ( media-gfx/dcraw )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hugin/hugin-2019.2.0.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89e9eeff98ffe35624cec4c6ed6e3118
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index d1faa23ba94a..9e10a88b7fcb 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=!!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= sci-libs/flann 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=!!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= sci-libs/flann 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GUI for the creation & processing of panoramic images
 EAPI=6
 HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2
 PROPERTIES=live
-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= sci-libs/flann 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+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= sci-libs/flann 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_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20e5a76d58cab21660e5dc1e12188160
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35e43fe866a1d9465adc1086d0bbe839
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.3.1 b/metadata/md5-cache/media-gfx/img2pdf-0.3.1
index f4775c96c62b..e2cdfb9ca110 100644
--- a/metadata/md5-cache/media-gfx/img2pdf-0.3.1
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fae8bc7ccbe2140a8148b0b75904915d
diff --git a/metadata/md5-cache/media-gfx/img2pdf-0.3.3 b/metadata/md5-cache/media-gfx/img2pdf-0.3.3
index c4689375de77..2d82b7380830 100644
--- a/metadata/md5-cache/media-gfx/img2pdf-0.3.3
+++ b/metadata/md5-cache/media-gfx/img2pdf-0.3.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/img2pdf/img2pdf-0.3.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6fbe01b8d411c3b7fc2059365a62d55
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.4-r1 b/metadata/md5-cache/media-gfx/inkscape-0.92.4-r1
deleted file mode 100644
index 2365cb0bf8dc..000000000000
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.54.1 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= >=dev-libs/glib-2.28 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-gfx/potrace media-gfx/scour[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sci-libs/gsl:= x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) >=dev-libs/boost-1.36 dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=SVG based generic vector-drawing program
-EAPI=6
-HOMEPAGE=https://inkscape.org/
-IUSE=cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex lcms nls spell static-libs visio wpg +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.54.1 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= >=dev-libs/glib-2.28 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-gfx/potrace media-gfx/scour[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sci-libs/gsl:= x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) media-gfx/uniconvertor dia? ( app-office/dia ) latex? ( media-gfx/pstoedit[plotutils] app-text/dvipsk app-text/texlive-core ) postscript? ( app-text/ghostscript-gpl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.4.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b5108b120a0f6aec94374b8e041ca285
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.4-r2 b/metadata/md5-cache/media-gfx/inkscape-0.92.4-r2
new file mode 100644
index 000000000000..969ac2efe498
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.4-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.54.1 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= >=dev-libs/glib-2.28 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sci-libs/gsl:= x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) >=dev-libs/boost-1.36 dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=SVG based generic vector-drawing program
+EAPI=6
+HOMEPAGE=https://inkscape.org/
+IUSE=cdr dia dbus exif gnome imagemagick openmp postscript inkjar jpeg latex lcms nls spell static-libs visio wpg +python_single_target_python2_7
+KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-text/poppler-0.26.0:=[cairo] >=dev-cpp/glibmm-2.54.1 >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-cpp/cairomm-1.9.8 >=dev-libs/boehm-gc-7.1:= >=dev-libs/glib-2.28 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= sci-libs/gsl:= x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.24 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) imagemagick? ( <media-gfx/imagemagick-7:=[cxx] ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) media-gfx/uniconvertor dia? ( app-office/dia ) latex? ( media-gfx/pstoedit[plotutils] app-text/dvipsk app-text/texlive-core ) postscript? ( app-text/ghostscript-gpl )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.4.tar.bz2
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=622af988bb3f44f9162584a6c7b7ea6f
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0_beta2 b/metadata/md5-cache/media-gfx/inkscape-1.0_beta2
deleted file mode 100644
index 86c0edfb7974..000000000000
--- a/metadata/md5-cache/media-gfx/inkscape-1.0_beta2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/potrace media-gfx/scour[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) >=dev-libs/boost-1.65 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=SVG based generic vector-drawing program
-EAPI=7
-HOMEPAGE=https://inkscape.org/
-IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls openmp postscript spell static-libs svg2 visio wpg python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/potrace media-gfx/scour[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://inkscape.org/gallery/item/16197/inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47abd680d7d9f7ff8b4535d64b9b81ab
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.0_beta2-r1 b/metadata/md5-cache/media-gfx/inkscape-1.0_beta2-r1
new file mode 100644
index 000000000000..dd12d4d2890a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/inkscape-1.0_beta2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] media-gfx/scour[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) >=dev-libs/boost-1.65 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=SVG based generic vector-drawing program
+EAPI=7
+HOMEPAGE=https://inkscape.org/
+IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls openmp postscript spell static-libs svg2 visio wpg python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] media-gfx/scour[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://inkscape.org/gallery/item/16197/inkscape-1.0beta2_2019-12-03_2b71d25d45.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8631d6e5c9b8bb1257227ede1bf161bc
diff --git a/metadata/md5-cache/media-gfx/inkscape-9999 b/metadata/md5-cache/media-gfx/inkscape-9999
index 18ef5de02656..a0a2dbc491b0 100644
--- a/metadata/md5-cache/media-gfx/inkscape-9999
+++ b/metadata/md5-cache/media-gfx/inkscape-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/potrace media-gfx/scour[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) >=dev-libs/boost-1.65 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] media-gfx/scour[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) >=dev-libs/boost-1.65 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=SVG based generic vector-drawing program
 EAPI=7
 HOMEPAGE=https://inkscape.org/
-IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls openmp postscript spell static-libs svg2 visio wpg python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg lcms nls openmp postscript spell static-libs svg2 visio wpg python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/potrace media-gfx/scour[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12 >=dev-cpp/glibmm-2.54.1 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40 >=dev-libs/boehm-gc-7.1:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0= net-libs/libsoup sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] media-gfx/scour[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] media-gfx/scour[python_targets_python3_7(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( <media-gfx/imagemagick-7:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:3 ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89c2d7ff34743ab4e2cbc278fde5aa4b
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd7f793e34f5bc2d518409742f60e0a7
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1 b/metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1
index 07b8cdee25a2..e1f956514c8d 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1
@@ -8,5 +8,5 @@ LICENSE=AVASYS
 RDEPEND=>=media-gfx/iscan-2.28.0
 SLOT=0
 SRC_URI=amd64? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-esdip-1.0.0-5.ltdl7.x86_64.rpm ) x86? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-esdip-1.0.0-5.ltdl7.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3ddd0113802f40c08b077b4f4e0dbf2c
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
index d0c6f658837a..822c347643d8 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=EPSON EAPL
 RDEPEND=minimal? ( >=media-gfx/iscan-2.21.0 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-f500-1.0.0-1.c2.i386.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ab7994eaa1c5e35027b38675bb04f358
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
index aa88e239c5a8..e083a16fa01b 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
@@ -8,5 +8,5 @@ LICENSE=AVASYS
 RDEPEND=>=media-gfx/iscan-2.21.0
 SLOT=0
 SRC_URI=amd64? ( https://dev.gentoo.org/~flameeyes/avasys/esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm ) x86? ( https://dev.gentoo.org/~flameeyes/avasys/esci-interpreter-gt-f720-0.0.1-2.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aa24bf4186df7925959673de34c237e7
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r3 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r3
index 7928e669703f..ef27c2f8d16a 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r3
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-x770-2.1.2.1-r3
@@ -8,5 +8,5 @@ LICENSE=AVASYS
 RDEPEND=>=media-gfx/iscan-2.21.0 !!<media-gfx/iscan-plugin-gt-x770-2.1.2.1-r2
 SLOT=0
 SRC_URI=x86? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-x770/2.1.2/iscan-plugin-gt-x770-2.1.2-1.i386.rpm ) amd64? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-x770/2.1.2/iscan-plugin-gt-x770-2.1.2-1.x86_64.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dbe9bb5714b75bff991fafc1e5aaaac1
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.1 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.1
index a97097ef3e02..d8f0a7e9aa9d 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.1
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-x820-2.2.0.1
@@ -8,5 +8,5 @@ LICENSE=AVASYS
 RDEPEND=>=media-gfx/iscan-2.21.0
 SLOT=0
 SRC_URI=amd64? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-x820-2.2.0-1.x86_64.rpm ) x86? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-gt-x820-2.2.0-1.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=699ba3fb1b334d40a873ecc258a21d79
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-perfection-v370-1.0.0.2 b/metadata/md5-cache/media-gfx/iscan-plugin-perfection-v370-1.0.0.2
index b3fe0cc8276e..407bb8f51f8e 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-perfection-v370-1.0.0.2
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-perfection-v370-1.0.0.2
@@ -8,5 +8,5 @@ LICENSE=AVASYS
 RDEPEND=>=media-gfx/iscan-2.21.0
 SLOT=0
 SRC_URI=amd64? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-perfection-v370-1.0.0-2.x86_64.rpm ) x86? ( https://dev.gentoo.org/~flameeyes/avasys/iscan-plugin-perfection-v370-1.0.0-2.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=dfc5a85109fe78cf2c0795d6b6b9e5f5
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.6-r1 b/metadata/md5-cache/media-gfx/kphotoalbum-5.6-r1
new file mode 100644
index 000000000000..44c7a79c69ca
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.6-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( kde-apps/libkipi:5= ) map? ( kde-apps/libkgeomap:5 ) raw? ( kde-apps/libkdcraw:5 ) share? ( >=kde-frameworks/kxmlgui-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Tool for indexing, searching, and viewing images
+EAPI=7
+HOMEPAGE=https://www.kphotoalbum.org/
+IUSE=+kipi map +raw share debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.2
+RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( kde-apps/libkipi:5= ) map? ( kde-apps/libkgeomap:5 ) raw? ( kde-apps/libkdcraw:5 ) share? ( >=kde-frameworks/kxmlgui-5.60.0:5 ) media-video/ffmpeg kipi? ( kde-apps/kipi-plugins:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kphotoalbum/5.6/kphotoalbum-5.6.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=313d310f36148d5bc0d0f0f332fceadc
diff --git a/metadata/md5-cache/media-gfx/krita-4.2.7.1 b/metadata/md5-cache/media-gfx/krita-4.2.7.1
deleted file mode 100644
index 7d61e539d73c..000000000000
--- a/metadata/md5-cache/media-gfx/krita-4.2.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/boost:= dev-libs/quazip dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 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.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=7
-HOMEPAGE=https://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_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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/boost:= dev-libs/quazip dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 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.12.3: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/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.12.3:5
-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 )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/4.2.7.1/krita-4.2.7.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	kde5	43b81ba8315f22f13c8461215eb0e6dd	kde5-functions	7f1ffe0e976f19abc8fc9ffe0fbccafa	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=488a4cb2c4900f7ef554ec31424aaf8e
diff --git a/metadata/md5-cache/media-gfx/krita-4.2.7.1-r1 b/metadata/md5-cache/media-gfx/krita-4.2.7.1-r1
new file mode 100644
index 000000000000..64dbb00491b9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.2.7.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/boost:= dev-libs/quazip python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 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.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=7
+HOMEPAGE=https://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_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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-libs/boost:= dev-libs/quazip python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 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.12.3: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/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.2.7.1/krita-4.2.7.1.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	kde5	43b81ba8315f22f13c8461215eb0e6dd	kde5-functions	7f1ffe0e976f19abc8fc9ffe0fbccafa	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2fe4d12b27b42e9fdb8d32af45b7cf77
diff --git a/metadata/md5-cache/media-gfx/krita-4.2.8.2 b/metadata/md5-cache/media-gfx/krita-4.2.8.2
deleted file mode 100644
index e0702a9bc74d..000000000000
--- a/metadata/md5-cache/media-gfx/krita-4.2.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= dev-libs/quazip dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 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.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
-EAPI=7
-HOMEPAGE=https://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_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= dev-libs/quazip dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/sip[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 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.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-RESTRICT=!test? ( test ) !test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/krita/4.2.8/krita-4.2.8.2.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c31d35eed239d105938dead85cfacee5
diff --git a/metadata/md5-cache/media-gfx/krita-4.2.8.2-r1 b/metadata/md5-cache/media-gfx/krita-4.2.8.2-r1
new file mode 100644
index 000000000000..61e1736cf98d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/krita-4.2.8.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-cpp/eigen:3 dev-lang/perl sys-devel/gettext dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= dev-libs/quazip python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip[python_targets_python3_8(-)] ) >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 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.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? ( >=dev-libs/vc-1.1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Free digital painting application. Digital Painting, Creative Freedom!
+EAPI=7
+HOMEPAGE=https://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_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/boost:= dev-libs/quazip python_single_target_python3_6? ( dev-python/PyQt5[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[python_targets_python3_7(-)] dev-python/sip[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/PyQt5[python_targets_python3_8(-)] dev-python/sip[python_targets_python3_8(-)] ) >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[-gles2] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= sys-libs/zlib virtual/opengl x11-libs/libX11 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.12.3:5 ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test ) !test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/krita/4.2.8/krita-4.2.8.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b75f0d926037b95ca1835e945b98e7a4
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.2 b/metadata/md5-cache/media-gfx/libimagequant-2.12.2
index d983f32a6d7c..4dd5ce3235fc 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.12.2
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.12.2
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.2.tar.gz -> libimagequant-2.12.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f2e14b8c253593467029b1c010bd91b5
+_md5_=6a46cca22e7900bbcb03c92d3b9fb97d
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.3 b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
index 9e019a4aed0e..93339fecba3b 100644
--- a/metadata/md5-cache/media-gfx/libimagequant-2.12.3
+++ b/metadata/md5-cache/media-gfx/libimagequant-2.12.3
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 SLOT=0/0
 SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.3.tar.gz -> libimagequant-2.12.3.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=316d420156c5ac054b62836f51e380a5
+_md5_=a912c938c304ea620aaa2b4f4c54b79d
diff --git a/metadata/md5-cache/media-gfx/mcomix-1.2.1 b/metadata/md5-cache/media-gfx/mcomix-1.2.1
index 0b8ca35bf9ef..76023a7c3660 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 04802fd27891..799306ffeb4e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fae0686111fec968a78885a2a4e58f29
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r4 b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r4
deleted file mode 100644
index 77281ec711d8..000000000000
--- a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) >=dev-python/pycairo-1.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/json-c-0.11:= media-libs/lcms:2 >=media-libs/libmypaint-1.3.0 media-libs/libpng:0= gnome-base/librsvg sys-libs/libomp x11-libs/gtk+:3 dev-lang/swig virtual/pkgconfig dev-util/scons[python_targets_python2_7] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=fast and easy graphics application for digital painters
-EAPI=6
-HOMEPAGE=http://mypaint.org/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) >=dev-python/pycairo-1.4[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/protobuf-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/json-c-0.11:= media-libs/lcms:2 >=media-libs/libmypaint-1.3.0 media-libs/libpng:0= gnome-base/librsvg sys-libs/libomp x11-libs/gtk+:3
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fc601f88bd00dc3231a393d16fcd325
diff --git a/metadata/md5-cache/media-gfx/mypaint-1.2.1-r5 b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r5
new file mode 100644
index 000000000000..8d13f328a67e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/mypaint-1.2.1-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_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:3[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) >=dev-python/pycairo-1.4[python_targets_python2_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)] ) >=dev-libs/json-c-0.11:= media-libs/lcms:2 >=media-libs/libmypaint-1.3.0 media-libs/libpng:0= gnome-base/librsvg sys-libs/libomp x11-libs/gtk+:3 dev-lang/swig virtual/pkgconfig dev-util/scons[python_targets_python2_7] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=fast and easy graphics application for digital painters
+EAPI=6
+HOMEPAGE=http://mypaint.org/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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:3[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) >=dev-python/pycairo-1.4[python_targets_python2_7(-)] dev-python/protobuf-python[python_targets_python2_7(-)] ) >=dev-libs/json-c-0.11:= media-libs/lcms:2 >=media-libs/libmypaint-1.3.0 media-libs/libpng:0= gnome-base/librsvg sys-libs/libomp x11-libs/gtk+:3
+REQUIRED_USE=^^ ( python_single_target_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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f89619c91194c35529eef70aaf99af4b
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.1.2 b/metadata/md5-cache/media-gfx/opentoonz-1.1.2
index 3d163f0e3af1..b21bda513aad 100644
--- a/metadata/md5-cache/media-gfx/opentoonz-1.1.2
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.1.2
@@ -9,4 +9,4 @@ RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.1.2.tar.gz -> opentoonz-1.1.2.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53d23204f7e8d72e3f9e4d107d706d87
+_md5_=72ff78054b54bfe778450b3d3f6ddc1a
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 2b8cebaa1ca1..d7590537346b 100644
--- a/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.2.1-r1
@@ -9,4 +9,4 @@ RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2= >=dev-qt/qtcore
 SLOT=0
 SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.2.1.tar.gz -> opentoonz-1.2.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a69f7c6dc18788ff37a9c25ea787147
+_md5_=ca750015e50b710064b154d3cc5524fc
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.3.0 b/metadata/md5-cache/media-gfx/opentoonz-1.3.0
index f640e64c8a04..ec3ca88516a4 100644
--- a/metadata/md5-cache/media-gfx/opentoonz-1.3.0
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.3.0
@@ -9,4 +9,4 @@ RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-
 SLOT=0
 SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.3.0.tar.gz -> opentoonz-1.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=288ab5fd944428300ec5f0e9a9261a42
+_md5_=893a44c6b5ab7b2116d0d401fd53f201
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.3.0-r1 b/metadata/md5-cache/media-gfx/opentoonz-1.3.0-r1
index 38a573733b9d..e29d4cdec9b8 100644
--- a/metadata/md5-cache/media-gfx/opentoonz-1.3.0-r1
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.3.0-r1
@@ -9,4 +9,4 @@ RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-
 SLOT=0
 SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.3.0.tar.gz -> opentoonz-1.3.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=108f423e3976cc9e9740c2ba3be753f8
+_md5_=9824d2a005ee3f7ae749e2b1cb4ca27f
diff --git a/metadata/md5-cache/media-gfx/opentoonz-1.4.0 b/metadata/md5-cache/media-gfx/opentoonz-1.4.0
new file mode 100644
index 000000000000..fa601ebab906
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/opentoonz-1.4.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl
+DESCRIPTION=An open-source full-featured 2D animation creation software
+EAPI=7
+HOMEPAGE=https://github.com/opentoonz/opentoonz
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD libtiff
+RDEPEND=app-arch/lz4:= >=dev-libs/boost-1.55.0:= dev-libs/lzo:2 >=dev-qt/qtcore-5.9:5 >=dev-qt/qtgui-5.9:5 >=dev-qt/qtmultimedia-5.9:5[widgets] >=dev-qt/qtnetwork-5.9:5 >=dev-qt/qtopengl-5.9:5 >=dev-qt/qtprintsupport-5.9:5 >=dev-qt/qtscript-5.9:5 >=dev-qt/qtsvg-5.9:5 >=dev-qt/qtwidgets-5.9:5 >=dev-qt/qtxml-5.9:5 media-libs/freeglut media-libs/freetype:2 media-libs/glew:= media-libs/libjpeg-turbo >=media-libs/libmypaint-1.3.0:= media-libs/libpng:= >=sci-libs/superlu-4.1:= sys-libs/zlib virtual/cblas virtual/libusb:1 virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/opentoonz/opentoonz/archive/v1.4.0.tar.gz -> opentoonz-1.4.0.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=924f5f00dd783d3c07bda533be14fc92
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2 b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
deleted file mode 100644
index df086f3e0f73..000000000000
--- a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-cpp/tbb virtual/pkgconfig doc? ( app-doc/doxygen[latex] ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Libs for the efficient manipulation of volumetric data
-EAPI=6
-HOMEPAGE=https://www.openvdb.org
-IUSE=+abi3-compat doc python test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-RESTRICT=!test? ( test )
-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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0d5782a8bbb019f28c472a3644f505bc
diff --git a/metadata/md5-cache/media-gfx/openvdb-4.0.2-r3 b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r3
new file mode 100644
index 000000000000..2ad3f3a1d7f4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/openvdb-4.0.2-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.62:= >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-libs/boost-1.62:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) ) dev-cpp/tbb virtual/pkgconfig doc? ( app-doc/doxygen[latex] ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Libs for the efficient manipulation of volumetric data
+EAPI=6
+HOMEPAGE=https://www.openvdb.org
+IUSE=+abi3-compat doc python test +python_single_target_python3_6
+KEYWORDS=amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/boost-1.62:= >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-libs/boost-1.62:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
+RESTRICT=!test? ( test )
+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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=925487e3ed92dfca9d56844b18e57f19
diff --git a/metadata/md5-cache/media-gfx/openvdb-5.2.0 b/metadata/md5-cache/media-gfx/openvdb-5.2.0
deleted file mode 100644
index 6296e48547d6..000000000000
--- a/metadata/md5-cache/media-gfx/openvdb-5.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-cpp/tbb virtual/pkgconfig doc? ( app-doc/doxygen[latex] ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Libs for the efficient manipulation of volumetric data
-EAPI=6
-HOMEPAGE=https://www.openvdb.org
-IUSE=+abi4-compat doc python test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=>=dev-libs/boost-1.62:=[python?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v5.2.0.tar.gz -> openvdb-5.2.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8dba6eb419c12c6294226dec681155cc
diff --git a/metadata/md5-cache/media-gfx/openvdb-5.2.0-r1 b/metadata/md5-cache/media-gfx/openvdb-5.2.0-r1
new file mode 100644
index 000000000000..7b9f0778bb2e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/openvdb-5.2.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.62:= >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-libs/boost-1.62:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) ) dev-cpp/tbb virtual/pkgconfig doc? ( app-doc/doxygen[latex] ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Libs for the efficient manipulation of volumetric data
+EAPI=6
+HOMEPAGE=https://www.openvdb.org
+IUSE=+abi4-compat doc python test +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-libs/boost-1.62:= >=dev-libs/c-blosc-1.5.0 dev-libs/jemalloc dev-libs/log4cplus media-libs/glfw:= media-libs/openexr:= sys-libs/zlib:= x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-libs/boost-1.62:=[python,python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dreamworksanimation/openvdb/archive/v5.2.0.tar.gz -> openvdb-5.2.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1cfb07bcf2e46f8daa4384ac334deefb
diff --git a/metadata/md5-cache/media-gfx/printrun-20150310-r4 b/metadata/md5-cache/media-gfx/printrun-20150310-r4
index a923a317fc23..c1d12d78d95f 100644
--- a/metadata/md5-cache/media-gfx/printrun-20150310-r4
+++ b/metadata/md5-cache/media-gfx/printrun-20150310-r4
@@ -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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2abf9610fbb85fbb7a02b33888cb7cf1
diff --git a/metadata/md5-cache/media-gfx/printrun-99999999 b/metadata/md5-cache/media-gfx/printrun-99999999
index c3aea4c2c708..b847f16e02fc 100644
--- a/metadata/md5-cache/media-gfx/printrun-99999999
+++ b/metadata/md5-cache/media-gfx/printrun-99999999
@@ -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://dev.gentoo.org/~amynka/snap/printrun-gtk3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba37f8fd4c5eb264e92dcdf0e58bba8b
diff --git a/metadata/md5-cache/media-gfx/pycam-0.6.4 b/metadata/md5-cache/media-gfx/pycam-0.6.4
index e755d54aa138..1ce91bd3e259 100644
--- a/metadata/md5-cache/media-gfx/pycam-0.6.4
+++ b/metadata/md5-cache/media-gfx/pycam-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 )
 SLOT=0
 SRC_URI=https://github.com/SebKuzminsky/pycam/archive/v0.6.4.tar.gz -> pycam-0.6.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c97679a5e2ecdac7c297898acf3b3b64
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 a57f4bfcc513..c1a863f6fa32 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_6(
 REQUIRED_USE=|| ( python_targets_python2_7 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18e970b05ff24a84ce3d9bb512b1b863
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3 b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
index 7dd7a8d2052d..fd14f22ff9a4 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.27-r3
@@ -11,5 +11,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_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=62b376a8f3e6dbbf901cfd1341b51876
diff --git a/metadata/md5-cache/media-gfx/scour-0.37 b/metadata/md5-cache/media-gfx/scour-0.37
index 5c38cfa8d6cb..d273b4ff97f7 100644
--- a/metadata/md5-cache/media-gfx/scour-0.37
+++ b/metadata/md5-cache/media-gfx/scour-0.37
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/scour-project/scour/archive/v0.37.tar.gz -> scour-0.37.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe401c56e753236a87a81c2c2d7b3cc4
diff --git a/metadata/md5-cache/media-gfx/sigal-1.3.0 b/metadata/md5-cache/media-gfx/sigal-1.3.0
index 471e5b59fe90..04d9eb432697 100644
--- a/metadata/md5-cache/media-gfx/sigal-1.3.0
+++ b/metadata/md5-cache/media-gfx/sigal-1.3.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pilkit[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] s3? ( dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) test? ( dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) 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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/blinker[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pilkit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] s3? ( dev-python/boto[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) test? ( dev-python/boto[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Simple static web gallery generator
 EAPI=6
 HOMEPAGE=http://sigal.saimon.org/
-IUSE=s3 test python_targets_python2_7 python_targets_python3_6
+IUSE=s3 test python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pilkit[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/blinker[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/click[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pilkit[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saimn/sigal/archive/1.3.0.tar.gz -> sigal-1.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3e1fc1050e1ff8c8d6c1232ba7f32a0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b65557ccc9a60189124924a6e1b56bd9
diff --git a/metadata/md5-cache/media-gfx/svg2rlg-0.3 b/metadata/md5-cache/media-gfx/svg2rlg-0.3
index 0cb6f7a58ba3..9ad746d5fb19 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5dd841c0970fc541653ecc7c4502bd53
diff --git a/metadata/md5-cache/media-gfx/sxiv-26 b/metadata/md5-cache/media-gfx/sxiv-26
index a02d9db1bc53..e312b1ba9e3a 100644
--- a/metadata/md5-cache/media-gfx/sxiv-26
+++ b/metadata/md5-cache/media-gfx/sxiv-26
@@ -10,4 +10,4 @@ RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/im
 SLOT=0
 SRC_URI=https://github.com/muennich/sxiv/archive/v26.tar.gz -> sxiv-26.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81fe4bd90aa4f53151d651a1c6fa89fe
+_md5_=e8e8b21fa736e800d10f774370775661
diff --git a/metadata/md5-cache/media-gfx/sxiv-9999 b/metadata/md5-cache/media-gfx/sxiv-9999
index f77aad5e2783..34ce85266565 100644
--- a/metadata/md5-cache/media-gfx/sxiv-9999
+++ b/metadata/md5-cache/media-gfx/sxiv-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81fe4bd90aa4f53151d651a1c6fa89fe
+_md5_=e8e8b21fa736e800d10f774370775661
diff --git a/metadata/md5-cache/media-gfx/termtosvg-0.7.0 b/metadata/md5-cache/media-gfx/termtosvg-0.7.0
index 9f5f2c953047..6fc93292cefa 100644
--- a/metadata/md5-cache/media-gfx/termtosvg-0.7.0
+++ b/metadata/md5-cache/media-gfx/termtosvg-0.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pyte-0.8.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/nbedos/termtosvg/archive/0.7.0.tar.gz -> termtosvg-0.7.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0a284f81e2e8789f2108bd3b15490a02
diff --git a/metadata/md5-cache/media-gfx/termtosvg-0.8.0 b/metadata/md5-cache/media-gfx/termtosvg-0.8.0
index faed2757a752..bf4db36cd43f 100644
--- a/metadata/md5-cache/media-gfx/termtosvg-0.8.0
+++ b/metadata/md5-cache/media-gfx/termtosvg-0.8.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pyte-0.8.0[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/nbedos/termtosvg/archive/0.8.0.tar.gz -> termtosvg-0.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0a284f81e2e8789f2108bd3b15490a02
diff --git a/metadata/md5-cache/media-gfx/termtosvg-1.1.0 b/metadata/md5-cache/media-gfx/termtosvg-1.1.0
index 72f64a3dbeb8..7dac470941d1 100644
--- a/metadata/md5-cache/media-gfx/termtosvg-1.1.0
+++ b/metadata/md5-cache/media-gfx/termtosvg-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nbedos/termtosvg/archive/1.1.0.tar.gz -> termtosvg-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a56c6daebc98acedbfb4551de669ecfc
diff --git a/metadata/md5-cache/media-gfx/transfig-3.2.5e b/metadata/md5-cache/media-gfx/transfig-3.2.5e
index 1aba6525d3ae..3653ed112206 100644
--- a/metadata/md5-cache/media-gfx/transfig-3.2.5e
+++ b/metadata/md5-cache/media-gfx/transfig-3.2.5e
@@ -9,4 +9,4 @@ RDEPEND=x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/transfig.3.2.5e.tar.gz mirror://gentoo/fig2mpdf-1.1.2.tar.bz2 https://dev.gentoo.org/~mgorny/dist/transfig-3.2.5e-gentoo-patchset.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8ca8c56a346d3e806d682c623099666a
+_md5_=4a2ae4d17d54d0fd467f9e9c4408e903
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 2ca71bcd6470..2ea9b525c288 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 d0ae46e7ab9a..c2a779bf5170 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc71c70e788410272bb0d10643dfd9cf
diff --git a/metadata/md5-cache/media-gfx/valentina-0.6.1-r1 b/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
index a199040e8c07..0370f20b0840 100644
--- a/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
+++ b/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Cloth patternmaking software
 EAPI=7
 HOMEPAGE=https://valentinaproject.bitbucket.io/
 IUSE=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
+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.1.zip -> valentina-0.6.1.zip https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=049d453f82289008e4db19e73961289e
+_md5_=9c7e50de56c12b7b80418f858d4cf8cb
diff --git a/metadata/md5-cache/media-gfx/xdot-1.1 b/metadata/md5-cache/media-gfx/xdot-1.1
index 4b02dce6b22d..4b14f9f913f2 100644
--- a/metadata/md5-cache/media-gfx/xdot-1.1
+++ b/metadata/md5-cache/media-gfx/xdot-1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/jrfonseca/xdot.py/archive/1.1.tar.gz -> xdot-1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ef312fd9d307cd969cc19a411450aa53
diff --git a/metadata/md5-cache/media-gfx/xdot-9999 b/metadata/md5-cache/media-gfx/xdot-9999
index 273c57d43fa5..f00396b5c3d7 100644
--- a/metadata/md5-cache/media-gfx/xdot-9999
+++ b/metadata/md5-cache/media-gfx/xdot-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] media-gfx/graphviz 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bb2f2b108acccad61c600c93b498097f
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.3.0-r2 b/metadata/md5-cache/media-gfx/yafaray-3.3.0-r2
index f9c3ddfd656e..77b050b0ed80 100644
--- a/metadata/md5-cache/media-gfx/yafaray-3.3.0-r2
+++ b/metadata/md5-cache/media-gfx/yafaray-3.3.0-r2
@@ -4,12 +4,12 @@ DEPEND=dev-libs/boost:= dev-libs/libxml2:2 sys-libs/zlib blender? ( media-gfx/bl
 DESCRIPTION=A free open-source montecarlo raytracing engine
 EAPI=7
 HOMEPAGE=http://www.yafaray.org
-IUSE=+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:= dev-libs/libxml2:2 sys-libs/zlib blender? ( media-gfx/blender ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) openexr? ( >=media-libs/openexr-2.2.0:= ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/YafaRay/Core/archive/v3.3.0.tar.gz -> yafaray-core-3.3.0.tar.gz https://github.com/YafaRay/Blender-Exporter/archive/v3.3.0.tar.gz -> yafaray-blender-exporter-3.3.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72e74e9b869aebbb93f52583a0843f7a
diff --git a/metadata/md5-cache/media-gfx/zbar-0.20.1-r1 b/metadata/md5-cache/media-gfx/zbar-0.20.1-r1
deleted file mode 100644
index bce840d72cd4..000000000000
--- a/metadata/md5-cache/media-gfx/zbar-0.20.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-devel/gettext virtual/pkgconfig gtk? ( dev-util/glib-utils ) java? ( >=virtual/jdk-1.8 test? ( dev-java/junit:4 dev-java/hamcrest-core:1.3 ) ) test? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Library and tools for reading barcodes from images or video
-EAPI=6
-HOMEPAGE=https://github.com/mchehab/zbar
-IUSE=graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7 test
-KEYWORDS=amd64 ~arm x86
-LICENSE=LGPL-2.1
-RDEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gtk? ( >=dev-python/pygtk-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) test? ( X ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://linuxtv.org/downloads/zbar/zbar-0.20.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=4177a848fa373436c771fc20c84c78cd
diff --git a/metadata/md5-cache/media-gfx/zbar-0.20.1-r2 b/metadata/md5-cache/media-gfx/zbar-0.20.1-r2
new file mode 100644
index 000000000000..53635533dc73
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/zbar-0.20.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gtk? ( python_single_target_python2_7? ( >=dev-python/pygtk-2[python_targets_python2_7(-)] ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-devel/gettext virtual/pkgconfig gtk? ( dev-util/glib-utils ) java? ( >=virtual/jdk-1.8 test? ( dev-java/junit:4 dev-java/hamcrest-core:1.3 ) ) test? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Library and tools for reading barcodes from images or video
+EAPI=6
+HOMEPAGE=https://github.com/mchehab/zbar
+IUSE=graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7 test
+KEYWORDS=amd64 ~arm x86
+LICENSE=LGPL-2.1
+RDEPEND=gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gtk? ( python_single_target_python2_7? ( >=dev-python/pygtk-2[python_targets_python2_7(-)] ) ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) test? ( X ^^ ( python_single_target_python2_7 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://linuxtv.org/downloads/zbar/zbar-0.20.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=0768aaf2b892f9387330a72e70f20956
diff --git a/metadata/md5-cache/media-gfx/zbar-0.23 b/metadata/md5-cache/media-gfx/zbar-0.23
deleted file mode 100644
index 4944638ad956..000000000000
--- a/metadata/md5-cache/media-gfx/zbar-0.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig gtk? ( dev-util/glib-utils ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection ) ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.8 test? ( dev-java/hamcrest-core:1.3 dev-java/junit:4 ) ) test? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Library and tools for reading barcodes from images or video
-EAPI=7
-HOMEPAGE=https://github.com/mchehab/zbar
-IUSE=dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection ) ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=introspection? ( gtk ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) test? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) X? ( imagemagick ) ) xv? ( X )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://linuxtv.org/downloads/zbar/zbar-0.23.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=64be05ee448b7269de94f7d08411817e
diff --git a/metadata/md5-cache/media-gfx/zbar-0.23-r1 b/metadata/md5-cache/media-gfx/zbar-0.23-r1
new file mode 100644
index 000000000000..f822e7380698
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/zbar-0.23-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig gtk? ( dev-util/glib-utils ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection ) ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jdk-1.8 test? ( dev-java/hamcrest-core:1.3 dev-java/junit:4 ) ) test? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Library and tools for reading barcodes from images or video
+EAPI=7
+HOMEPAGE=https://github.com/mchehab/zbar
+IUSE=dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection ) ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] ) graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] ) ) jpeg? ( virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) v4l? ( media-libs/libv4l:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xv? ( x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) java? ( >=virtual/jre-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=introspection? ( gtk ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) test? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) X? ( imagemagick ) ) xv? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://linuxtv.org/downloads/zbar/zbar-0.23.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_md5_=5af5b642da9c62ddfb9aa10c6ba1b8ba
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 38a2aed19c81..64d9ed4f9020 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/alsa-lib-1.1.2 b/metadata/md5-cache/media-libs/alsa-lib-1.1.2
index fb2d7604bfda..8d055dc3dac0 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.1.2
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.1.2
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=6
 HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alisp debug doc elibc_uclibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.1.2.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4b9d4ff926a2d0b5609504e44bb673df
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.1.8 b/metadata/md5-cache/media-libs/alsa-lib-1.1.8
index 2fb2633d80cd..10144ee63906 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.1.8
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.1.8
@@ -4,12 +4,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.1.8.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6d52150137838515a2e3fc18df59885d
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.1.9 b/metadata/md5-cache/media-libs/alsa-lib-1.1.9
index aacc42f01e85..6885392dc8b9 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.1.9
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.1.9
@@ -4,12 +4,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.1.9.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=75769c3ae9750a369391ca40508f5a7a
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.1.1-r1 b/metadata/md5-cache/media-libs/alsa-lib-1.2.1.1-r1
index 3c47274b2b60..eeab509abc21 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.1.1-r1
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.1.1-r1
@@ -4,12 +4,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.1.1.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b64887b2a0ca8e87c84a2d1bf878708a
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2 b/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2
index e404255e5aa0..29b1da6884c6 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.2.1.2
@@ -4,12 +4,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Advanced Linux Sound Architecture Library
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
-IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
+IUSE=alisp debug doc elibc_uclibc python +thread-safety abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/lib/alsa-lib-1.2.1.2.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=105d1ff4d5fa42e333f0088dc19f9a52
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f09d66c93edd912aa352cfba06606716
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.1.8 b/metadata/md5-cache/media-libs/alsa-oss-1.1.8
index 9cd57df3d641..75653caf25e4 100644
--- a/metadata/md5-cache/media-libs/alsa-oss-1.1.8
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.1.8
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/alsa-lib-1.1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 SLOT=0
 SRC_URI=https://www.alsa-project.org/files/pub/oss-lib/alsa-oss-1.1.8.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c4076e8e53fc7c9cdc4e1762873401b3
+_md5_=e9688f744fa75eeeb7ee33619fb2cdeb
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.7-r1 b/metadata/md5-cache/media-libs/aubio-0.4.7-r1
index 19b288c73183..21e91d7dde0d 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.7-r1
+++ b/metadata/md5-cache/media-libs/aubio-0.4.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( double-precision libsamplerate
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=683d114f7e2b6a14caf2cc0679ded26c
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.8 b/metadata/md5-cache/media-libs/aubio-0.4.8
index 2a95c7b4ebb6..10fef0acdacc 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.8
+++ b/metadata/md5-cache/media-libs/aubio-0.4.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) ?? ( doubl
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=08d86cc36c8d239596da628d2ca5e793
diff --git a/metadata/md5-cache/media-libs/aubio-0.4.9 b/metadata/md5-cache/media-libs/aubio-0.4.9
index 17fa29ba29e9..e4e86ba103bf 100644
--- a/metadata/md5-cache/media-libs/aubio-0.4.9
+++ b/metadata/md5-cache/media-libs/aubio-0.4.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) ?? ( doubl
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://aubio.org/pub/aubio-0.4.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94c8e9885fda4aa10cb5fd83bcf1efb9
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.3 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.3
index fa3dad9effaa..a93a85e5ebb7 100644
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.3
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.3
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.3:2.7[vdpau?] ~media-video/avidemux-2.7.3: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 ) oss? ( virtual/os-headers:0 )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.3:2.7[vdpau?] ~media-video/avidemux-2.7.3: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 ) oss? ( virtual/os-headers:0 )
 DESCRIPTION=Plugins for the video editor media-video/avidemux
 EAPI=7
 HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.3:2.7[vdpau?] ~media-video/avidemux-2.7.3: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-2.7.3
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.3:2.7[vdpau?] ~media-video/avidemux-2.7.3: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-2.7.3
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.3.tar.gz -> avidemux-2.7.3.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ce59717e6d279e987c115005221447c
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a2a662d51b8547c5db84ba645c88af36
diff --git a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4 b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4
index 05d3e08cf495..e516dc29f7d1 100644
--- a/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4
+++ b/metadata/md5-cache/media-libs/avidemux-plugins-2.7.4
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.4:2.7[vdpau?] ~media-video/avidemux-2.7.4:2.7[opengl?,qt5?] dev-lang/spidermonkey:0= dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) oss? ( virtual/os-headers )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.4:2.7[vdpau?] ~media-video/avidemux-2.7.4:2.7[opengl?,qt5?] dev-lang/spidermonkey:0= dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) oss? ( virtual/os-headers )
 DESCRIPTION=Plugins for the video editor media-video/avidemux
 EAPI=7
 HOMEPAGE=http://fixounet.free.fr/avidemux
-IUSE=a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-1 GPL-2 MIT PSF-2 public-domain
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.4:2.7[vdpau?] ~media-video/avidemux-2.7.4:2.7[opengl?,qt5?] dev-lang/spidermonkey:0= dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) !<media-libs/avidemux-plugins-2.7.4
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ~media-libs/avidemux-core-2.7.4:2.7[vdpau?] ~media-video/avidemux-2.7.4:2.7[opengl?,qt5?] dev-lang/spidermonkey:0= dev-libs/libxml2:2 media-libs/a52dec media-libs/libass:0= media-libs/libmad media-libs/libmp4v2 media-libs/libpng:0= virtual/libiconv aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dcaenc? ( media-sound/dcaenc ) dts? ( media-libs/libdca ) fdk? ( media-libs/fdk-aac:0= ) fontconfig? ( media-libs/fontconfig:1.0 ) fribidi? ( dev-libs/fribidi ) jack? ( media-sound/jack-audio-connection-kit libsamplerate? ( media-libs/libsamplerate ) ) lame? ( media-sound/lame ) nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) truetype? ( media-libs/freetype:2 ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) !<media-libs/avidemux-plugins-2.7.4
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=2.7
 SRC_URI=https://github.com/mean00/avidemux2/archive/2.7.4.tar.gz -> avidemux-2.7.4.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aebe64a46320771908597a42b72167d5
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d813132ea368976f8ef63b07b59b6b0f
diff --git a/metadata/md5-cache/media-libs/cimg-2.7.2 b/metadata/md5-cache/media-libs/cimg-2.7.2
deleted file mode 100644
index eb1f5253f81e..000000000000
--- a/metadata/md5-cache/media-libs/cimg-2.7.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=C++ template image processing toolkit
-EAPI=7
-HOMEPAGE=https://cimg.eu/ https://github.com/dtschump/CImg
-IUSE=doc examples
-KEYWORDS=~amd64 ~x86
-LICENSE=CeCILL-2 CeCILL-C
-SLOT=0
-SRC_URI=https://github.com/dtschump/CImg/archive/v.2.7.2.tar.gz -> cimg-2.7.2.tar.gz
-_md5_=8e1c6df4cbdafa43ff73c1ac715f3e46
diff --git a/metadata/md5-cache/media-libs/cimg-2.8.3 b/metadata/md5-cache/media-libs/cimg-2.8.3
new file mode 100644
index 000000000000..2574715d19d4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/cimg-2.8.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=C++ template image processing toolkit
+EAPI=7
+HOMEPAGE=https://cimg.eu/ https://github.com/dtschump/CImg
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-2 CeCILL-C
+SLOT=0
+SRC_URI=https://github.com/dtschump/CImg/archive/v.2.8.3.tar.gz -> cimg-2.8.3.tar.gz
+_md5_=0ba7735851fa43ee6aba12c7a84d332e
diff --git a/metadata/md5-cache/media-libs/clutter-gst-3.0.27-r1 b/metadata/md5-cache/media-libs/clutter-gst-3.0.27-r1
new file mode 100644
index 000000000000..2e6ff09fbf67
--- /dev/null
+++ b/metadata/md5-cache/media-libs/clutter-gst-3.0.27-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=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? ( dev-libs/libgudev ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GStreamer integration library for Clutter
+EAPI=6
+HOMEPAGE=https://blogs.gnome.org/clutter/
+IUSE=X debug examples +introspection udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+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? ( dev-libs/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.27.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3bf87a948b819e343b9f548e92c2ea36
diff --git a/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04 b/metadata/md5-cache/media-libs/fontconfig-ultimate-2015.04
index 434112063f50..e24fe8dd0cad 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=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d8b94382273b98aa32552d2a5b2dfa6
+_md5_=f895d39a7373d3232226e471136ecd9b
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 d7ac27702fdd..c92fe4b5c682 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=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=9d8b94382273b98aa32552d2a5b2dfa6
+_md5_=f895d39a7373d3232226e471136ecd9b
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r1 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
index 40a65e82152c..03c5868545c2 100644
--- a/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r1
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2=
 SLOT=0
 SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7be4f3613bc605c1493e43096db6f4ef
+_md5_=31c2355244cc82d0af003a6fc311785b
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.18 b/metadata/md5-cache/media-libs/gegl-0.4.18
index 2c9095060693..a90cb70fcaef 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.18
+++ b/metadata/md5-cache/media-libs/gegl-0.4.18
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.72[introspection?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 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:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) 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:= )
 DESCRIPTION=A graph based image processing framework
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0.4
 SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.18.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41e7e9a247a6873a00fe59008e1423ea
+_md5_=90be303c469c9fe77dedff0c464e0f0b
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.20 b/metadata/md5-cache/media-libs/gegl-0.4.20
index ec06775d70e9..65691fa4de48 100644
--- a/metadata/md5-cache/media-libs/gegl-0.4.20
+++ b/metadata/md5-cache/media-libs/gegl-0.4.20
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.8 >=dev-python/pygobject-3.2:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.8 >=dev-python/pygobject-3.2:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.74[introspection?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 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:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) 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:= )
 DESCRIPTION=A graph based image processing framework
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0.4
 SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.20.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38e764bb1ab03c14c22dc2f7b9f422aa
+_md5_=ee776290b64b6a9fb74e3e15216a3b86
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index 786df2517f38..4b7ec16590a8 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.8 >=dev-python/pygobject-3.2:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.8 >=dev-python/pygobject-3.2:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.74[introspection?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 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:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) 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:= )
 DESCRIPTION=A graph based image processing framework
@@ -12,4 +12,4 @@ REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
 RESTRICT=!test? ( test )
 SLOT=0.4
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05f8275523a00cab6daf4845a911b0be
+_md5_=f66321019a8eb24a08bd242bb5e56496
diff --git a/metadata/md5-cache/media-libs/grilo-0.3.11 b/metadata/md5-cache/media-libs/grilo-0.3.11
index d7c62889e7ed..7b71517d145b 100644
--- a/metadata/md5-cache/media-libs/grilo-0.3.11
+++ b/metadata/md5-cache/media-libs/grilo-0.3.11
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.3 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) test? ( sys-apps/dbus ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.3 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( sys-apps/dbus ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=dev-libs/glib-2.44:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] ) playlist? ( >=dev-libs/totem-pl-parser-3.4.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gtk? ( net-libs/liboauth >=x11-libs/gtk+-3.14:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A framework for easy media discovery and browsing
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0.3/0
 SRC_URI=mirror://gnome/sources/grilo/0.3/grilo-0.3.11.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d3fc8df29d1474719eec37175569e3b
+_md5_=9f1e058b8c231a6ca0ebd341b16531d4
diff --git a/metadata/md5-cache/media-libs/hamlib-3.1 b/metadata/md5-cache/media-libs/hamlib-3.1
index 3e8311230356..134a7b0421b2 100644
--- a/metadata/md5-cache/media-libs/hamlib-3.1
+++ b/metadata/md5-cache/media-libs/hamlib-3.1
@@ -3,13 +3,13 @@ DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang
 DESCRIPTION=Ham radio backend rig control libraries
 EAPI=5
 HOMEPAGE=https://sourceforge.net/apps/mediawiki/hamlib
-IUSE=doc perl python tcl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc perl python tcl +python_single_target_python2_7
 KEYWORDS=amd64 x86
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/hamlib/hamlib-3.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=52071dbd67c1d02fccb1dc0e1aca1921
diff --git a/metadata/md5-cache/media-libs/hamlib-3.2 b/metadata/md5-cache/media-libs/hamlib-3.2
index 2cf183470ffa..a4641bb9443f 100644
--- a/metadata/md5-cache/media-libs/hamlib-3.2
+++ b/metadata/md5-cache/media-libs/hamlib-3.2
@@ -3,13 +3,13 @@ DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang
 DESCRIPTION=Ham radio backend rig control libraries
 EAPI=5
 HOMEPAGE=https://www.hamlib.org
-IUSE=doc perl python tcl python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc perl python tcl python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=amd64 x86
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tcl? ( dev-lang/tcl:0= )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.github.com/hamlib/hamlib/releases/download/3.2/hamlib-3.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a061bed2805772c0b81a0e1d67468087
diff --git a/metadata/md5-cache/media-libs/hamlib-3.3 b/metadata/md5-cache/media-libs/hamlib-3.3
index 9e82e33f338c..eb55d84de6a9 100644
--- a/metadata/md5-cache/media-libs/hamlib-3.3
+++ b/metadata/md5-cache/media-libs/hamlib-3.3
@@ -3,13 +3,13 @@ DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang
 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_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc perl python tcl python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=amd64 x86
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) tcl? ( dev-lang/tcl:0= )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d401502326f71a0246eef31d8c91c8b1
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.6.4 b/metadata/md5-cache/media-libs/harfbuzz-2.6.4
index 5f27e4c2efba..a0fa98f2b2a4 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.6.4
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.6.4
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) )
+DEPEND=cairo? ( x11-libs/cairo:= ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) )
 DESCRIPTION=An OpenType text shaping engine
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd049964e454deeda34bebb9ad80bc6f
+_md5_=22b6291b906a45db7872cfe3b95422ba
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index 5e03b04fe63f..439c8cffebfc 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=cairo? ( x11-libs/cairo:= ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=dev-libs/gobject-introspection-common-1.34 dev-util/ragel
+DEPEND=cairo? ( x11-libs/cairo:= ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=dev-libs/gobject-introspection-common-1.34 dev-util/ragel
 DESCRIPTION=An OpenType text shaping engine
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
@@ -12,4 +12,4 @@ REQUIRED_USE=introspection? ( glib )
 RESTRICT=!test? ( test )
 SLOT=0/0.9.18
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d42aa204fdd60ad17e78151f2b4919ba
+_md5_=ca6d6ffd58235066fe5156e32fd5484d
diff --git a/metadata/md5-cache/media-libs/imlib2-1.5.1-r1 b/metadata/md5-cache/media-libs/imlib2-1.5.1-r1
deleted file mode 100644
index 2a3d11a358df..000000000000
--- a/metadata/md5-cache/media-libs/imlib2-1.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gif? ( media-libs/giflib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( ~virtual/jpeg-0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( media-libs/libid3tag[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-base/xorg-proto )
-DESCRIPTION=Version 2 of an advanced replacement library for libraries like libXpm
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=bzip2 cpu_flags_x86_mmx cpu_flags_x86_sse2 doc gif jpeg mp3 nls png +shm static-libs tiff +X zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=media-libs/freetype:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gif? ( media-libs/giflib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( ~virtual/jpeg-0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( media-libs/libid3tag[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-4.0.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=shm? ( X )
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/enlightenment/imlib2-1.5.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9bfa6a552ca7bdf2eedd7fbaea4a9e22
diff --git a/metadata/md5-cache/media-libs/jbig2dec-0.17-r1 b/metadata/md5-cache/media-libs/jbig2dec-0.17-r1
index 9348f1e7a784..8659f0d6e2cf 100644
--- a/metadata/md5-cache/media-libs/jbig2dec-0.17-r1
+++ b/metadata/md5-cache/media-libs/jbig2dec-0.17-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( app-arch/unzip || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=test? ( app-arch/unzip || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
 DEPEND=png? ( media-libs/libpng:0= )
 DESCRIPTION=A decoder implementation of the JBIG2 image compression format
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.17
 SRC_URI=https://github.com/ArtifexSoftware/jbig2dec/archive/0.17.tar.gz -> jbig2dec-0.17.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b693679558f2ece580ab5dc40136a5a2
+_md5_=db26d5b13bfa88ad41597494ac25aa1a
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 e9b019dd4c81..bfaff675eb48 100644
--- a/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.2-r1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Library for rectifying and simulating photographic lens distortions
 EAPI=6
 HOMEPAGE=https://lensfun.github.io
-IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3 CC-BY-SA-3.0
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/glib-2.40 media-libs/libpng:0= sys-libs/zlib:=
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lensfun/lensfun/archive/v0.3.2.tar.gz -> lensfun-0.3.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1688cd637cb2e318e9d96b3403114514
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r1 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r1
index e00f9c4a5108..62933f5aaf47 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r1
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19-r1
@@ -3,13 +3,13 @@ DEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 DESCRIPTION=A library that creates colored ASCII-art graphics
 EAPI=5
 HOMEPAGE=http://libcaca.zoy.org/
-IUSE=cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X elibc_FreeBSD java +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X elibc_FreeBSD java +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=GPL-2 ISC LGPL-2.1 WTFPL-2
 RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mono? ( dev-lang/mono ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freeglut-2.8.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) slang? ( >=sys-libs/slang-2.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4fd0113e761522227c280d1e23d43cec
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.4 b/metadata/md5-cache/media-libs/libepoxy-1.5.4
index db2b58b0cdc5..3fd1b9178598 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.4
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7[xml(+)] dev-lang/python:3.6[xml(+)] >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=|| ( dev-lang/python:3.7[xml(+)] dev-lang/python:3.6[xml(+)] ) virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install setup test unpack
 DEPEND=X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management for you
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.4.tar.gz -> libepoxy-1.5.4.tar.gz
 _eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bed6630119751ddc641bbbb2fe504d0d
+_md5_=ce1ce5168fa72d3ddb2a7632a1114118
diff --git a/metadata/md5-cache/media-libs/libepoxy-9999 b/metadata/md5-cache/media-libs/libepoxy-9999
index 6595ecca4548..10735b953b94 100644
--- a/metadata/md5-cache/media-libs/libepoxy-9999
+++ b/metadata/md5-cache/media-libs/libepoxy-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7[xml(+)] dev-lang/python:3.6[xml(+)] >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+BDEPEND=|| ( dev-lang/python:3.7[xml(+)] dev-lang/python:3.6[xml(+)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install setup test unpack
 DEPEND=X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) egl? ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management for you
@@ -11,4 +11,4 @@ RDEPEND=egl? ( media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8038410becea4e83008f158c8f39fab4
+_md5_=0e5bc5466c29db07bb12c8f1a98dc1d8
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.1 b/metadata/md5-cache/media-libs/libffado-2.4.1
deleted file mode 100644
index f319c7d013a0..000000000000
--- a/metadata/md5-cache/media-libs/libffado-2.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[dbus,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] x11-misc/xdg-utils ) virtual/pkgconfig dev-util/scons[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) virtual/pkgconfig
-DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
-EAPI=6
-HOMEPAGE=http://www.ffado.org
-IUSE=debug qt5 test-programs python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[dbus,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] x11-misc/xdg-utils ) !<media-sound/jack-audio-connection-kit-0.122.0:0 !<media-sound/jack-audio-connection-kit-1.9.9:2
-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=http://www.ffado.org/files/libffado-2.4.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=d976a1fc193f51461d89879b5147ea9a
diff --git a/metadata/md5-cache/media-libs/libffado-2.4.1-r1 b/metadata/md5-cache/media-libs/libffado-2.4.1-r1
new file mode 100644
index 000000000000..98f3e8160b41
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libffado-2.4.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,python_targets_python3_6(-)] ) x11-misc/xdg-utils ) virtual/pkgconfig python_single_target_python3_6? ( dev-util/scons[python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) virtual/pkgconfig
+DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
+EAPI=6
+HOMEPAGE=http://www.ffado.org
+IUSE=debug qt5 test-programs +python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,python_targets_python3_6(-)] ) x11-misc/xdg-utils ) !<media-sound/jack-audio-connection-kit-0.122.0:0 !<media-sound/jack-audio-connection-kit-1.9.9:2
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=http://www.ffado.org/files/libffado-2.4.1.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=532afc3e7c5a5a239a26e1d3a391c0e6
diff --git a/metadata/md5-cache/media-libs/libgpod-0.8.3-r2 b/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
index 2bf5bc3efd4d..e6cb16993376 100644
--- a/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
+++ b/metadata/md5-cache/media-libs/libgpod-0.8.3-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=app-pda/libplist-1.0:= >=dev-db/sqlite-3:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 sys-apps/sg3_utils gtk? ( x11-libs/gdk-pixbuf:2 ) ios? ( app-pda/libimobiledevice:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/mutagen-1.8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygobject-2.8:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) udev? ( virtual/udev ) mono? ( >=dev-lang/mono-1.9.1 >=dev-dotnet/gtk-sharp-2.12 ) python? ( >=dev-lang/swig-1.3.24:0 ) dev-libs/libxslt dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=>=app-pda/libplist-1.0:= >=dev-db/sqlite-3:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 sys-apps/sg3_utils gtk? ( x11-libs/gdk-pixbuf:2 ) ios? ( app-pda/libimobiledevice:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( >=media-libs/mutagen-1.8[python_targets_python2_7(-)] >=dev-python/pygobject-2.8:2[python_targets_python2_7(-)] ) ) udev? ( virtual/udev ) mono? ( >=dev-lang/mono-1.9.1 >=dev-dotnet/gtk-sharp-2.12 ) python? ( >=dev-lang/swig-1.3.24:0 ) dev-libs/libxslt dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Shared library to access the contents of an iPod
 EAPI=6
 HOMEPAGE=http://www.gtkpod.org/libgpod/
-IUSE=+gtk python +udev ios mono static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+gtk python +udev ios mono static-libs +python_single_target_python2_7
 KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2
-RDEPEND=>=app-pda/libplist-1.0:= >=dev-db/sqlite-3:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 sys-apps/sg3_utils gtk? ( x11-libs/gdk-pixbuf:2 ) ios? ( app-pda/libimobiledevice:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/mutagen-1.8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygobject-2.8:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) udev? ( virtual/udev ) mono? ( >=dev-lang/mono-1.9.1 >=dev-dotnet/gtk-sharp-2.12 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RDEPEND=>=app-pda/libplist-1.0:= >=dev-db/sqlite-3:3 >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 sys-apps/sg3_utils gtk? ( x11-libs/gdk-pixbuf:2 ) ios? ( app-pda/libimobiledevice:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( >=media-libs/mutagen-1.8[python_targets_python2_7(-)] >=dev-python/pygobject-2.8:2[python_targets_python2_7(-)] ) ) udev? ( virtual/udev ) mono? ( >=dev-lang/mono-1.9.1 >=dev-dotnet/gtk-sharp-2.12 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkpod/libgpod-0.8.3.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5c0a9cf1238cadd5f41e841904d67fc
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=845d090974f3988a8acd55dd88a18693
diff --git a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1 b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
index 58c0b12e3bc3..934e90ffbc2a 100644
--- a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
+++ b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=library for manipulating the International Press Telecommunications Council (IPTC) metadata
 EAPI=5
 HOMEPAGE=http://libiptcdata.sourceforge.net
-IUSE=doc examples nls python +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc examples nls python +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/libiptcdata/libiptcdata-1.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a735e67e06cb87400abf2f48607fe69e
diff --git a/metadata/md5-cache/media-libs/libkate-0.4.1-r3 b/metadata/md5-cache/media-libs/libkate-0.4.1-r3
deleted file mode 100644
index 4bedb956b300..000000000000
--- a/metadata/md5-cache/media-libs/libkate-0.4.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=media-libs/libogg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/flex[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/bison doc? ( app-doc/doxygen )
-DESCRIPTION=Codec for karaoke and text encapsulation for Ogg
-EAPI=6
-HOMEPAGE=https://code.google.com/p/libkate/
-IUSE=debug doc wxwidgets abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=media-libs/libogg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wxwidgets? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/liboggz )
-REQUIRED_USE=wxwidgets? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=759435096ac1d8d2fa87d3c0d46c1de5
diff --git a/metadata/md5-cache/media-libs/libkate-0.4.1-r4 b/metadata/md5-cache/media-libs/libkate-0.4.1-r4
new file mode 100644
index 000000000000..c7e1dd0f5b97
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libkate-0.4.1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup test
+DEPEND=media-libs/libogg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/flex[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/bison doc? ( app-doc/doxygen )
+DESCRIPTION=Codec for karaoke and text encapsulation for Ogg
+EAPI=6
+HOMEPAGE=https://code.google.com/p/libkate/
+IUSE=debug doc wxwidgets abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86
+LICENSE=BSD
+RDEPEND=media-libs/libogg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wxwidgets? ( python_single_target_python2_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/wxpython:3.0[python_targets_python2_7(-)] ) media-libs/liboggz )
+REQUIRED_USE=wxwidgets? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f01e702aeabcf91ea2ea6bc6e6ea67e6
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.2 b/metadata/md5-cache/media-libs/libopenshot-0.2.2
index 2f4f227a6227..39d099984245 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.2.2
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.2
@@ -3,13 +3,13 @@ DEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widg
 DESCRIPTION=Video editing library used by OpenShot
 EAPI=6
 HOMEPAGE=http://www.openshotvideo.com/
-IUSE=+imagemagick libav +python test +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+imagemagick libav +python test +python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.4 imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) libav? ( media-video/libav:=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.2.2.tar.gz -> libopenshot-0.2.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7cc6be03b29efc3273184f4216400a6e
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.4 b/metadata/md5-cache/media-libs/libopenshot-0.2.4
new file mode 100644
index 000000000000..68ccfd6a55ed
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.4
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) test? ( dev-libs/unittest++ ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/jsoncpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.9:0= net-libs/cppzmq net-libs/zeromq imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
+DESCRIPTION=Video editing library used by OpenShot
+EAPI=7
+HOMEPAGE=https://www.openshot.org/
+IUSE=doc examples +imagemagick libav +python test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-libs/jsoncpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.9:0= net-libs/cppzmq net-libs/zeromq imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RESTRICT=!test? ( test )
+SLOT=0/18
+SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.2.4.tar.gz -> libopenshot-0.2.4.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3ce062f2a90ef69a15609ad9a2c7a36e
diff --git a/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609 b/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
index 86673685ac8b..c1da3bf7b385 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
@@ -4,13 +4,13 @@ DEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widg
 DESCRIPTION=Video editing library used by OpenShot
 EAPI=7
 HOMEPAGE=https://www.openshot.org/
-IUSE=doc examples +imagemagick libav +python test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc examples +imagemagick libav +python test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=net-libs/cppzmq dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.1.9_pre20190502:0= imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) libav? ( media-video/libav:0=[encode,x264,xvid,vpx,mp3,theora] ) !libav? ( media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0/17
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/0d4ea7fe71e88bcee4a7fd1404bd52c8e2169997.tar.gz -> libopenshot-0.2.4_pre20190609.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=48e970d18995bd6c5c74ce1f8f1f83d8
diff --git a/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9 b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9
new file mode 100644
index 000000000000..b077b0b6f733
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenshot-audio-0.1.9
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/alsa-lib media-libs/freetype sys-libs/zlib x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
+DESCRIPTION=Library for audio editing and playback used by OpenShot
+EAPI=7
+HOMEPAGE=https://www.openshot.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/alsa-lib media-libs/freetype sys-libs/zlib x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr
+SLOT=0/7
+SRC_URI=https://github.com/OpenShot/libopenshot-audio/archive/v0.1.9.tar.gz -> libopenshot-audio-0.1.9.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1360f620d7db9fa2d31deedd346ff20
diff --git a/metadata/md5-cache/media-libs/libpagemaker-0.0.4 b/metadata/md5-cache/media-libs/libpagemaker-0.0.4
index 162ce48a4f5f..0e77ced4cfae 100644
--- a/metadata/md5-cache/media-libs/libpagemaker-0.0.4
+++ b/metadata/md5-cache/media-libs/libpagemaker-0.0.4
@@ -9,4 +9,4 @@ LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-0.0.4.tar.xz
-_md5_=31ac8414a1a79700fd867636ac5c146c
+_md5_=5156bd3fac01049c624cc57e0567231e
diff --git a/metadata/md5-cache/media-libs/libpagemaker-9999 b/metadata/md5-cache/media-libs/libpagemaker-9999
index 793b94244b75..ec6d8dab2f7f 100644
--- a/metadata/md5-cache/media-libs/libpagemaker-9999
+++ b/metadata/md5-cache/media-libs/libpagemaker-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/librevenge
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4971011a4da3a140535efe1b6821becf
+_md5_=abe64c9a81de70c4683f57867099257c
diff --git a/metadata/md5-cache/media-libs/libprojectm-3.1.2 b/metadata/md5-cache/media-libs/libprojectm-3.1.2
new file mode 100644
index 000000000000..bbf0d2737b90
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libprojectm-3.1.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtopengl:5 media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.5 ) sys-libs/zlib
+DESCRIPTION=A graphical music visualization plugin similar to milkdrop
+EAPI=7
+HOMEPAGE=https://github.com/projectM-visualizer/projectm
+IUSE=gles2 qt5 sdl
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=gles2? ( media-libs/mesa[gles2] ) media-libs/glm media-libs/mesa[X(+)] qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtopengl:5 media-sound/pulseaudio ) sdl? ( >=media-libs/libsdl2-2.0.5 ) sys-libs/zlib
+SLOT=0/2
+SRC_URI=https://github.com/projectM-visualizer/projectm/archive/v3.1.2.tar.gz -> libprojectm-3.1.2.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a98facbd8af1f52d04ab7f904d4c1bff
diff --git a/metadata/md5-cache/media-libs/libshout-2.4.1-r2 b/metadata/md5-cache/media-libs/libshout-2.4.1-r2
index 1d045f6ccdfc..bb42542ddc11 100644
--- a/metadata/md5-cache/media-libs/libshout-2.4.1-r2
+++ b/metadata/md5-cache/media-libs/libshout-2.4.1-r2
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/libshout/libshout-2.4.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b6beaa0ec68db87dbb57def226e7eb5e
+_md5_=8551398fce4784a311f4480b7049f584
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4 b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
index 8b58e565c3d1..1d2cf6bb04b4 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pypy3-5:0 ) )
+BDEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.6 >=dev-python/pypy3-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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.28.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=055a5b441aac2c04ac69267ecea04b82
+_md5_=1cc7d784404d6dea28aca3d5dc6e95d9
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.29_pre2_p20191024 b/metadata/md5-cache/media-libs/libsndfile-1.0.29_pre2_p20191024
index 86f3bc097e95..abbd58c1bf91 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.29_pre2_p20191024
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.29_pre2_p20191024
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pypy3-5:0 ) sys-devel/autogen >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-python/pypy3-5:0 ) sys-devel/autogen >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=!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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/erikd/libsndfile/archive/97a361afc24202b16489d8c06910277c06b18b53.tar.gz -> libsndfile-1.0.29_pre2_p20191024.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=22ab7943f3c32cf3ae3fef8160c234dc
+_md5_=b0355de199b3d994ac274d25688391e9
diff --git a/metadata/md5-cache/media-libs/libsndfile-9999 b/metadata/md5-cache/media-libs/libsndfile-9999
index 85b29f519a79..4d0ab7e78ac6 100644
--- a/metadata/md5-cache/media-libs/libsndfile-9999
+++ b/metadata/md5-cache/media-libs/libsndfile-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pypy3-5:0 ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pypy3-5:0 ) sys-devel/autogen >=app-portage/elt-patches-20170815 || ( >=sys-devel/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]
+BDEPEND=virtual/pkgconfig test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-python/pypy3-5:0 ) ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-python/pypy3-5:0 ) sys-devel/autogen >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=!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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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
@@ -11,4 +11,4 @@ RDEPEND=!minimal? ( >=media-libs/flac-1.2.1-r5:=[abi_x86_32(-)?,abi_x86_64(-)?,a
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=09bb7678d844baa16988601987b3ca7b
+_md5_=018eeb16d6bf758752394f8dfbafb523
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200123 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200123
new file mode 100644
index 000000000000..b48e3c46bc76
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20200123
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/opus alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+DESCRIPTION=VoIP library for Telegram clients
+EAPI=7
+HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
+IUSE=alsa +dsp libressl pulseaudio
+KEYWORDS=~amd64 ~ppc64
+LICENSE=Unlicense
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/opus alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+REQUIRED_USE=|| ( alsa pulseaudio )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/c5651ffc728336e56d8567f5c6c179e8a5d4fe55.tar.gz -> libtgvoip-2.4.4_p20200123.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8c9331acf8a5fcadfc846c792ecf33f7
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 97b5b462e4ff..7fd021fb3bed 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
@@ -10,4 +10,4 @@ RDEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts media-libs/freetype:2= me
 SLOT=0
 SRC_URI=mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f8ee46a02e1368f7c28485a95a9b084
+_md5_=14d0c21fc0a475791f14d94115e78ba1
diff --git a/metadata/md5-cache/media-libs/libxmlbird-1.2.0 b/metadata/md5-cache/media-libs/libxmlbird-1.2.0
index ecf1870efed1..e0e53b4ff9b2 100644
--- a/metadata/md5-cache/media-libs/libxmlbird-1.2.0
+++ b/metadata/md5-cache/media-libs/libxmlbird-1.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=|| ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/doit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/doit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DEPEND=|| ( dev-lang/python:3.6 ) || ( ( dev-lang/python:3.6 dev-python/doit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DESCRIPTION=XML parser written in Vala
 EAPI=5
 HOMEPAGE=https://birdfont.org/xmlbird.php
@@ -9,4 +9,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://birdfont.org/xmlbird-releases/libxmlbird-1.2.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3642f29646eb44f34cc3d288e3144250
+_md5_=085bd910d9a99055866517d376de24e5
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.4-r1 b/metadata/md5-cache/media-libs/lilv-0.24.4-r1
index 5081fee4b43a..5224deb080c0 100644
--- a/metadata/md5-cache/media-libs/lilv-0.24.4-r1
+++ b/metadata/md5-cache/media-libs/lilv-0.24.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile >=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=>=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile >=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/lilv/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/lilv-0.24.4.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=1eafdbaad9579a75759e1c1ab9703e9f
+_md5_=ca0b92792209de0bf0e9efaa014164aa
diff --git a/metadata/md5-cache/media-libs/lv2-1.14.0-r1 b/metadata/md5-cache/media-libs/lv2-1.14.0-r1
deleted file mode 100644
index ea69c9bee8ca..000000000000
--- a/metadata/md5-cache/media-libs/lv2-1.14.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) plugins? ( virtual/pkgconfig ) doc? ( app-doc/doxygen dev-python/rdflib )
-DESCRIPTION=A simple but extensible successor of LADSPA
-EAPI=6
-HOMEPAGE=http://lv2plug.in/
-IUSE=doc plugins python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/rdflib[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] !<media-libs/slv2-0.4.2 !media-libs/lv2core !media-libs/lv2-ui
-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=http://lv2plug.in/spec/lv2-1.14.0.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=668f40cb6c4d3f01936c5d4437b0aca4
diff --git a/metadata/md5-cache/media-libs/lv2-1.14.0-r2 b/metadata/md5-cache/media-libs/lv2-1.14.0-r2
new file mode 100644
index 000000000000..09c11d84b3e5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lv2-1.14.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) plugins? ( virtual/pkgconfig ) doc? ( app-doc/doxygen dev-python/rdflib )
+DESCRIPTION=A simple but extensible successor of LADSPA
+EAPI=6
+HOMEPAGE=http://lv2plug.in/
+IUSE=doc plugins +python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/rdflib[python_targets_python3_6(-)] ) !<media-libs/slv2-0.4.2 !media-libs/lv2core !media-libs/lv2-ui
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=http://lv2plug.in/spec/lv2-1.14.0.tar.bz2
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=6ca8972b9a08fe65691c90db28d37b4c
diff --git a/metadata/md5-cache/media-libs/lv2-1.16.0 b/metadata/md5-cache/media-libs/lv2-1.16.0
deleted file mode 100644
index 737375f9b27a..000000000000
--- a/metadata/md5-cache/media-libs/lv2-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
-DESCRIPTION=A simple but extensible successor of LADSPA
-EAPI=6
-HOMEPAGE=http://lv2plug.in/
-IUSE=doc plugins python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/rdflib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-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=http://lv2plug.in/spec/lv2-1.16.0.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=4d073680b16a303850554ed84e5d09e5
diff --git a/metadata/md5-cache/media-libs/lv2-1.16.0-r1 b/metadata/md5-cache/media-libs/lv2-1.16.0-r1
new file mode 100644
index 000000000000..4913bf180573
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lv2-1.16.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
+DESCRIPTION=A simple but extensible successor of LADSPA
+EAPI=6
+HOMEPAGE=http://lv2plug.in/
+IUSE=doc plugins python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) python_single_target_python3_6? ( dev-python/lxml[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/rdflib[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/lxml[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/rdflib[python_targets_python3_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=http://lv2plug.in/spec/lv2-1.16.0.tar.bz2
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=b97d5c032796493304f26e5dfbbb4c9c
diff --git a/metadata/md5-cache/media-libs/lvtk-1.2.0 b/metadata/md5-cache/media-libs/lvtk-1.2.0
index 08df565405b1..adcd6ebd225c 100644
--- a/metadata/md5-cache/media-libs/lvtk-1.2.0
+++ b/metadata/md5-cache/media-libs/lvtk-1.2.0
@@ -3,12 +3,12 @@ DEPEND=media-libs/lv2 >=dev-libs/boost-1.40.0 python_single_target_python2_7? (
 DESCRIPTION=A set of C++ wrappers around the LV2 C API
 EAPI=6
 HOMEPAGE=http://lvtoolkit.org/
-IUSE=debug doc examples +gtk2 +tools +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug doc examples +gtk2 +tools +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/lv2 >=dev-libs/boost-1.40.0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gtk2? ( dev-cpp/gtkmm:2.4 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/lvtk/lvtk/archive/1.2.0.tar.gz -> lvtk-1.2.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=fb0de1af5a6764eb256e853a3e726130
diff --git a/metadata/md5-cache/media-libs/mesa-20.0.0_rc1 b/metadata/md5-cache/media-libs/mesa-20.0.0_rc1
deleted file mode 100644
index f71b8c81af6d..000000000000
--- a/metadata/md5-cache/media-libs/mesa-20.0.0_rc1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=7
-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_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
-REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( 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 ) xa? ( X ) xvmc? ( X )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mesa.freedesktop.org/archive/mesa-20.0.0-rc1.tar.xz
-_eclasses_=llvm	c74f1124c627537c3be86281b81e10dc	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=83cfca24c1c35104531b3057777e474c
diff --git a/metadata/md5-cache/media-libs/mesa-20.0.0_rc2 b/metadata/md5-cache/media-libs/mesa-20.0.0_rc2
new file mode 100644
index 000000000000..26afcabe5751
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-20.0.0_rc2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst pretend setup test
+DEPEND=!app-eselect/eselect-mesa >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto )
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=7
+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_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!app-eselect/eselect-mesa >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
+REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( 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 ) xa? ( X ) xvmc? ( X )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/mesa-20.0.0-rc2.tar.xz
+_eclasses_=llvm	c74f1124c627537c3be86281b81e10dc	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=83cfca24c1c35104531b3057777e474c
diff --git a/metadata/md5-cache/media-libs/mlt-6.16.0-r1 b/metadata/md5-cache/media-libs/mlt-6.16.0-r1
index 2cff2b49fbde..cf8dcc5ba16b 100644
--- a/metadata/md5-cache/media-libs/mlt-6.16.0-r1
+++ b/metadata/md5-cache/media-libs/mlt-6.16.0-r1
@@ -4,12 +4,12 @@ DEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12
 DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=7
 HOMEPAGE=https://www.mltframework.org/
-IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?,-flite] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.4 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.16.0/mlt-6.16.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8a37101ec208f888d65ce54d0971813a
diff --git a/metadata/md5-cache/media-libs/mlt-6.16.0-r2 b/metadata/md5-cache/media-libs/mlt-6.16.0-r2
index acb7fac47cd2..eac9b607a1f3 100644
--- a/metadata/md5-cache/media-libs/mlt-6.16.0-r2
+++ b/metadata/md5-cache/media-libs/mlt-6.16.0-r2
@@ -4,12 +4,12 @@ DEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12
 DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=7
 HOMEPAGE=https://www.mltframework.org/
-IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?,-flite] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.16.0/mlt-6.16.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=cf247ce0dd9e2fcf255dc86a7d22ea2e
diff --git a/metadata/md5-cache/media-libs/mlt-6.18.0 b/metadata/md5-cache/media-libs/mlt-6.18.0
index 865974690d64..ab5d6061034e 100644
--- a/metadata/md5-cache/media-libs/mlt-6.18.0
+++ b/metadata/md5-cache/media-libs/mlt-6.18.0
@@ -4,12 +4,12 @@ DEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12
 DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=7
 HOMEPAGE=https://www.mltframework.org/
-IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?,-flite] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.5 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.18.0/mlt-6.18.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7626083c93cb5d714ed0c75ad0a9f430
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9d3cf6c30f769e66f0ba90b7923892f1
diff --git a/metadata/md5-cache/media-libs/mlt-6.18.0-r1 b/metadata/md5-cache/media-libs/mlt-6.18.0-r1
index a2f89f2ef2b4..b3b5312d31b4 100644
--- a/metadata/md5-cache/media-libs/mlt-6.18.0-r1
+++ b/metadata/md5-cache/media-libs/mlt-6.18.0-r1
@@ -4,12 +4,12 @@ DEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12
 DESCRIPTION=Open source multimedia framework for television broadcasting
 EAPI=7
 HOMEPAGE=https://www.mltframework.org/
-IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=media-libs/libebur128-1.2.2:= ffmpeg? ( libav? ( >=media-video/libav-12:0=[vdpau?] ) !libav? ( media-video/ffmpeg:0=[vdpau?,-flite] ) ) fftw? ( sci-libs/fftw:3.0= ) frei0r? ( media-plugins/frei0r-plugins ) gtk? ( media-libs/libexif x11-libs/gtk+:2 x11-libs/pango ) jack? ( >=dev-libs/libxml2-2.5 media-libs/ladspa-sdk virtual/jack ) libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) lua? ( >=dev-lang/lua-5.1.4-r4:= ) opencv? ( >=media-libs/opencv-3.2.0:= ) opengl? ( media-video/movit ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libexif x11-libs/libX11 ) rtaudio? ( >=media-libs/rtaudio-4.1.2 kernel_linux? ( media-libs/alsa-lib ) ) ruby? ( || ( dev-lang/ruby:2.6 ) virtual/rubygems ) sdl? ( media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image ) vidstab? ( media-libs/vidstab ) xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 ) xml? ( >=dev-libs/libxml2-2.5 )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/mltframework/mlt/releases/download/v6.18.0/mlt-6.18.0.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3d7a38e4b312963dc8a73b1775961153
diff --git a/metadata/md5-cache/media-libs/mutagen-1.43.0 b/metadata/md5-cache/media-libs/mutagen-1.43.0
index 5839bbb937be..19fbc51b69d9 100644
--- a/metadata/md5-cache/media-libs/mutagen-1.43.0
+++ b/metadata/md5-cache/media-libs/mutagen-1.43.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/mutagen/releases/download/release-1.43.0/mutagen-1.43.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=afc60e3c507b0765cfabb61f72276a98
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1 b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1
deleted file mode 100644
index c4f7214a5fba..000000000000
--- a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A color management framework for visual effects and animation
-EAPI=6
-HOMEPAGE=http://opencolorio.org/
-IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
-REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aaa5bb78140d35652a2e91b1c4df8909
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r2 b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r2
deleted file mode 100644
index 003b19ea4d01..000000000000
--- a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
-DESCRIPTION=A color management framework for visual effects and animation
-EAPI=7
-HOMEPAGE=http://opencolorio.org/
-IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
-REQUIRED_USE=doc? ( python ) python? ( ^^ ( 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 ) )
-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	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d2689820db1003de131eae43d63bfa0
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r3 b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r3
new file mode 100644
index 000000000000..62872d344356
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml virtual/pkgconfig doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A color management framework for visual effects and animation
+EAPI=6
+HOMEPAGE=http://opencolorio.org/
+IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=BSD
+RDEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
+REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python3_6 ) )
+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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3d1b5d64abec0865a90d950139697043
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.0-r4 b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r4
new file mode 100644
index 000000000000..ea1dcd7e6451
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.0-r4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
+DESCRIPTION=A color management framework for visual effects and animation
+EAPI=7
+HOMEPAGE=http://opencolorio.org/
+IUSE=cpu_flags_x86_sse2 doc opengl python static-libs test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
+REQUIRED_USE=doc? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+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	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=60db1fa75f35e6e614b7ffee45a1052d
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.13-r3 b/metadata/md5-cache/media-libs/opencv-2.4.13-r3
deleted file mode 100644
index 6d59529951d1..000000000000
--- a/metadata/md5-cache/media-libs/opencv-2.4.13-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
-DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
-EAPI=6
-HOMEPAGE=https://opencv.org
-IUSE=cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine +python_targets_python2_7 +python_single_target_python2_7 elibc_FreeBSD java elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=128d879346161598ebf8931b77cc369c
diff --git a/metadata/md5-cache/media-libs/opencv-2.4.13-r4 b/metadata/md5-cache/media-libs/opencv-2.4.13-r4
new file mode 100644
index 000000000000..11f6ba1a982c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencv-2.4.13-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-3.9.6 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
+DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
+EAPI=6
+HOMEPAGE=https://opencv.org
+IUSE=cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine +python_single_target_python2_7 elibc_FreeBSD java elibc_FreeBSD
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux
+LICENSE=BSD
+RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qttest:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f94040e3a4ae061280d90c071267ce49
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.17-r1 b/metadata/md5-cache/media-libs/openimageio-1.8.17-r1
deleted file mode 100644
index 4cdfde926dfd..000000000000
--- a/metadata/md5-cache/media-libs/openimageio-1.8.17-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen[latex] ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 color-management? ( media-libs/opencolorio:= ) dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
-DESCRIPTION=A library for reading and writing images
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
-IUSE=color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype 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_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 color-management? ( media-libs/opencolorio:= ) dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/boost:=[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.17.tar.gz -> openimageio-1.8.17.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e7d531678f72d5c2511380587af6803
diff --git a/metadata/md5-cache/media-libs/openimageio-1.8.17-r2 b/metadata/md5-cache/media-libs/openimageio-1.8.17-r2
new file mode 100644
index 000000000000..71babf236cc5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openimageio-1.8.17-r2
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[latex] ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 color-management? ( media-libs/opencolorio:= ) dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
+DESCRIPTION=A library for reading and writing images
+EAPI=7
+HOMEPAGE=https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO
+IUSE=color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype 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_avx2 cpu_flags_x86_avx512f cpu_flags_x86_f16c python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~ppc64 x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.2.1:= >=media-libs/openexr-2.2.0-r2:= media-libs/tiff:0= sys-libs/zlib:= virtual/jpeg:0 color-management? ( media-libs/opencolorio:= ) dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( media-libs/glew:= virtual/glu virtual/opengl ) ptex? ( media-libs/ptex:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-libs/boost:=[python,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) raw? ( media-libs/libraw:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) truetype? ( media-libs/freetype:2= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/OpenImageIO/oiio/archive/Release-1.8.17.tar.gz -> openimageio-1.8.17.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1673209b3ab71a9e9d723cd842feb1d9
diff --git a/metadata/md5-cache/media-libs/opus-1.3 b/metadata/md5-cache/media-libs/opus-1.3
deleted file mode 100644
index 3604ba5ac220..000000000000
--- a/metadata/md5-cache/media-libs/opus-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=doc? ( app-doc/doxygen media-gfx/graphviz )
-DESCRIPTION=Open codec designed for internet transmission of interactive speech and audio
-EAPI=7
-HOMEPAGE=https://opus-codec.org/
-IUSE=custom-modes doc static-libs cpu_flags_x86_sse cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/opus/opus-1.3.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=00162d845e7ebc7c473a79d4a26f993d
diff --git a/metadata/md5-cache/media-libs/opus-1.3.1 b/metadata/md5-cache/media-libs/opus-1.3.1
deleted file mode 100644
index 73b474288631..000000000000
--- a/metadata/md5-cache/media-libs/opus-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=doc? ( app-doc/doxygen media-gfx/graphviz )
-DESCRIPTION=Open codec for interactive speech and music transmission over the Internet
-EAPI=7
-HOMEPAGE=https://opus-codec.org/
-IUSE=custom-modes doc static-libs cpu_flags_x86_sse cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ee05a0430357609c5c13807ae04e0dac
diff --git a/metadata/md5-cache/media-libs/opus-1.3.1-r1 b/metadata/md5-cache/media-libs/opus-1.3.1-r1
index 79e889bbf100..6dbb5b413724 100644
--- a/metadata/md5-cache/media-libs/opus-1.3.1-r1
+++ b/metadata/md5-cache/media-libs/opus-1.3.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Open codec for interactive speech and music transmission over the In
 EAPI=7
 HOMEPAGE=https://opus-codec.org/
 IUSE=custom-modes doc static-libs cpu_flags_x86_sse cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=190384817827885f9d551ddfb70cfe50
+_md5_=3b348a69ca512dac57ac1e10b4cb04ba
diff --git a/metadata/md5-cache/media-libs/oyranos-0.9.6-r1 b/metadata/md5-cache/media-libs/oyranos-0.9.6-r1
index b7460f6e012f..1586ba76c4a4 100644
--- a/metadata/md5-cache/media-libs/oyranos-0.9.6-r1
+++ b/metadata/md5-cache/media-libs/oyranos-0.9.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-admin/elektra dev-libs/libxml2 >=dev-libs/yajl-2.0.4-r1 media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libXcm-0.5.4 media-libs/openicc cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr x11-libs/libXxf86vm ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-admin/elektra dev-libs/libxml2 >=dev-libs/yajl-2.0.4-r1 media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libXcm-0.5.4 media-libs/openicc cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr x11-libs/libXxf86vm ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Colour management system allowing to share settings across apps and services
 EAPI=6
 HOMEPAGE=https://www.oyranos.org/
-IUSE=cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X
+IUSE=cairo cups doc examples exif fltk jpeg raw scanner static-libs test tiff X
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=app-admin/elektra dev-libs/libxml2 >=dev-libs/yajl-2.0.4-r1 media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libXcm-0.5.4 media-libs/openicc cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr x11-libs/libXxf86vm ) media-libs/icc-profiles-basiccolor-printing2009 media-libs/icc-profiles-openicc
-REQUIRED_USE=qt5? ( X ) test? ( static-libs )
+RDEPEND=app-admin/elektra dev-libs/libxml2 >=dev-libs/yajl-2.0.4-r1 media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libXcm-0.5.4 media-libs/openicc cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr x11-libs/libXxf86vm ) media-libs/icc-profiles-basiccolor-printing2009 media-libs/icc-profiles-openicc
+REQUIRED_USE=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-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=814d956ab09832fb4b45a784377c35fe
+_md5_=39697dc1ff099f8a74114ac588443bcf
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 c3ba5ba20eb1..c884c3aff555 100644
--- a/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
+++ b/metadata/md5-cache/media-libs/partio-1.1.0_p20170829
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut virtual/opengl sys-libs/zlib:= doc? ( app-doc/doxygen[latex] ) dev-lang/swig:* sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut virtual/opengl sys-libs/zlib:= doc? ( app-doc/doxygen[latex] ) dev-lang/swig:* sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A library for particle IO and manipulation
 EAPI=6
 HOMEPAGE=https://www.disneyanimation.com/technology/partio.html
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc +python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut virtual/opengl sys-libs/zlib:=
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut virtual/opengl sys-libs/zlib:=
+REQUIRED_USE=^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0fadfc22d5356acf9b66c6f1e0569f3
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=be38b5f863ca507a209ada5e236d3408
diff --git a/metadata/md5-cache/media-libs/partio-1.5.4 b/metadata/md5-cache/media-libs/partio-1.5.4
index dcf2114351fe..7be96012e541 100644
--- a/metadata/md5-cache/media-libs/partio-1.5.4
+++ b/metadata/md5-cache/media-libs/partio-1.5.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/swig doc? ( app-doc/doxygen[latex] ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut sys-libs/zlib virtual/opengl
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut sys-libs/zlib virtual/opengl
 DESCRIPTION=Library for particle IO and manipulation
 EAPI=7
 HOMEPAGE=https://www.disneyanimation.com/technology/partio.html
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc +python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut sys-libs/zlib virtual/opengl
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut sys-libs/zlib virtual/opengl
+REQUIRED_USE=^^ ( python_single_target_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	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=663dfcb3b678950575842427aa94040b
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06b0d226a151bfe4fe172dbc4b08adaa
diff --git a/metadata/md5-cache/media-libs/partio-9999 b/metadata/md5-cache/media-libs/partio-9999
index 74674255a7f9..98d98ea18d29 100644
--- a/metadata/md5-cache/media-libs/partio-9999
+++ b/metadata/md5-cache/media-libs/partio-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-lang/swig doc? ( app-doc/doxygen[latex] ) dev-util/ninja dev-util/cmake >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut sys-libs/zlib virtual/opengl
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut sys-libs/zlib virtual/opengl
 DESCRIPTION=Library for particle IO and manipulation
 EAPI=7
 HOMEPAGE=https://www.disneyanimation.com/technology/partio.html
-IUSE=doc python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc +python_single_target_python3_6
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut sys-libs/zlib virtual/opengl
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) media-libs/freeglut sys-libs/zlib virtual/opengl
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1147de24aca720912548597d7e0f4257
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=753ec503cf9a106bb43c7865b9d69cf7
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r2 b/metadata/md5-cache/media-libs/portmidi-217-r2
index 8bfee4f5b920..64912f1c7753 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r2
+++ b/metadata/md5-cache/media-libs/portmidi-217-r2
@@ -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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ad79189f6613333d219d53bae1eb048
diff --git a/metadata/md5-cache/media-libs/portmidi-217-r3 b/metadata/md5-cache/media-libs/portmidi-217-r3
index 66ccab666c0b..f8e8cea03835 100644
--- a/metadata/md5-cache/media-libs/portmidi-217-r3
+++ b/metadata/md5-cache/media-libs/portmidi-217-r3
@@ -11,5 +11,5 @@ RDEPEND=media-libs/alsa-lib python? ( python_targets_python3_6? ( dev-lang/pytho
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/portmedia/portmidi-src-217.zip
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=372b3d4b005f5bc2c4ca74aa56381afe
diff --git a/metadata/md5-cache/media-libs/pyliblo-0.10.0-r1 b/metadata/md5-cache/media-libs/pyliblo-0.10.0-r1
index 32934448e707..50fba67f7f1e 100644
--- a/metadata/md5-cache/media-libs/pyliblo-0.10.0-r1
+++ b/metadata/md5-cache/media-libs/pyliblo-0.10.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=media-libs/liblo-0.27 python_targets_python2_7? ( >=dev-lang/python-2.
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://das.nasophon.de/download/pyliblo-0.10.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a2911926f7993832086c54e4be2aab16
diff --git a/metadata/md5-cache/media-libs/pymemphis-0.2.1-r2 b/metadata/md5-cache/media-libs/pymemphis-0.2.1-r2
deleted file mode 100644
index 145fc6316fe3..000000000000
--- a/metadata/md5-cache/media-libs/pymemphis-0.2.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/memphis >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Python bindings for the libmemphis library
-EAPI=6
-HOMEPAGE=http://gitorious.net/pymemphis
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/memphis
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/pymemphis-0.2.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2f8ba2f3040661308e97dede54d7cd38
diff --git a/metadata/md5-cache/media-libs/pymemphis-0.2.1-r3 b/metadata/md5-cache/media-libs/pymemphis-0.2.1-r3
new file mode 100644
index 000000000000..3de0043320d5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/pymemphis-0.2.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python2_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/pycairo[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] ) media-libs/memphis >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Python bindings for the libmemphis library
+EAPI=6
+HOMEPAGE=http://gitorious.net/pymemphis
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_single_target_python2_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/pycairo[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] ) media-libs/memphis
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/pymemphis-0.2.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=519ba15a2b595e23c2821c46257e9255
diff --git a/metadata/md5-cache/media-libs/sg-1.5 b/metadata/md5-cache/media-libs/sg-1.5
index 4261b7aab17d..7b222f394d84 100644
--- a/metadata/md5-cache/media-libs/sg-1.5
+++ b/metadata/md5-cache/media-libs/sg-1.5
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/maloc virtual/glu x11-libs/libXaw x11-libs/motif || ( ( media-libs/mesa[X(+)] x11-libs/libGLw ) media-libs/opengl-apple ) doc? ( media-gfx/graphviz app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/maloc media-libs/mesa[X(+)] virtual/glu x11-libs/libGLw x11-libs/libXaw x11-libs/motif
 DESCRIPTION=Socket Graphics tool for displaying polygons
-EAPI=5
+EAPI=7
 HOMEPAGE=http://fetk.org/codes/sg/index.html
-IUSE=doc static-libs
+IUSE=doc
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-libs/maloc virtual/glu x11-libs/libXaw x11-libs/motif || ( ( media-libs/mesa[X(+)] x11-libs/libGLw ) media-libs/opengl-apple )
+RDEPEND=dev-libs/maloc media-libs/mesa[X(+)] virtual/glu x11-libs/libGLw x11-libs/libXaw x11-libs/motif
 SLOT=0
 SRC_URI=http://www.fetk.org/codes/download/sg-1.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2c877eb3c2f3e18723948b9028f1675
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f0a34892f7de98b8caf4fbaef7164a3d
diff --git a/metadata/md5-cache/media-libs/shaderc-2018.0 b/metadata/md5-cache/media-libs/shaderc-2018.0
index d218a2ce5bbd..53a8866dbbef 100644
--- a/metadata/md5-cache/media-libs/shaderc-2018.0
+++ b/metadata/md5-cache/media-libs/shaderc-2018.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-util/glslang-7.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-tools[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/spirv-headers doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( dev-lang/python:3.6 dev-python/nose[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/nose[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-util/glslang-7.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/spirv-tools[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.6 ) dev-util/spirv-headers doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( dev-lang/python:3.6 dev-python/nose[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Collection of tools, libraries and tests for shader compilation
 EAPI=6
 HOMEPAGE=https://github.com/google/shaderc
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/shaderc/archive/v2018.0.tar.gz -> shaderc-2018.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=caef5db8d1d8999509e3b4458e50eaed
+_md5_=ef0fdaedcea72c0734c6a0e406c48749
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.0-r1 b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
index b3770cbd9a61..9ae5d0a1d405 100644
--- a/metadata/md5-cache/media-libs/sratom-0.6.0-r1
+++ b/metadata/md5-cache/media-libs/sratom-0.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=media-libs/lv2-1.14.0-r1 >=dev-libs/serd-0.28.0-r1 >=dev-libs/sord-0.16.0-r1 || ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEPEND=>=media-libs/lv2-1.14.0-r1 >=dev-libs/serd-0.28.0-r1 >=dev-libs/sord-0.16.0-r1 || ( dev-lang/python:3.6[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
 DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax
 EAPI=6
 HOMEPAGE=http://drobilla.net/software/sratom/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://download.drobilla.net/sratom-0.6.0.tar.bz2
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=0447b60bd252db10cdd83aca651b9e65
+_md5_=247c8e67938584311b1dbf5f5a3e4c7b
diff --git a/metadata/md5-cache/media-libs/stk-4.5.1-r1 b/metadata/md5-cache/media-libs/stk-4.5.1-r1
deleted file mode 100644
index f6f423e5051b..000000000000
--- a/metadata/md5-cache/media-libs/stk-4.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) virtual/pkgconfig dev-lang/perl >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Synthesis ToolKit in C++
-EAPI=6
-HOMEPAGE=https://ccrma.stanford.edu/software/stk/
-IUSE=alsa debug doc jack oss static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
-SLOT=0
-SRC_URI=https://ccrma.stanford.edu/software/stk/release/stk-4.5.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=31d24c369f77ea03c2f7e4b8a16c1325
diff --git a/metadata/md5-cache/media-libs/stk-4.6.1 b/metadata/md5-cache/media-libs/stk-4.6.1
new file mode 100644
index 000000000000..854a5909bcad
--- /dev/null
+++ b/metadata/md5-cache/media-libs/stk-4.6.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) dev-lang/perl
+DESCRIPTION=Synthesis ToolKit in C++
+EAPI=7
+HOMEPAGE=https://ccrma.stanford.edu/software/stk/
+IUSE=alsa debug doc jack oss static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
+SLOT=0
+SRC_URI=https://ccrma.stanford.edu/software/stk/release/stk-4.6.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=75517c14e4c976e546852c72207052ee
diff --git a/metadata/md5-cache/media-libs/waffle-1.6.0-r1 b/metadata/md5-cache/media-libs/waffle-1.6.0-r1
new file mode 100644
index 000000000000..0887324a3946
--- /dev/null
+++ b/metadata/md5-cache/media-libs/waffle-1.6.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-base/xcb-proto-1.8-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( dev-libs/libxslt app-text/docbook-xml-dtd:4.2 )
+DESCRIPTION=Library that allows selection of GL API and of window system at runtime
+EAPI=7
+HOMEPAGE=http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle
+IUSE=doc egl gbm test wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.waffle-gl.org/files/release/waffle-1.6.0/waffle-1.6.0.tar.xz
+_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bdc67f16e12ed7f834f2580e3fc4a380
diff --git a/metadata/md5-cache/media-libs/waffle-9999 b/metadata/md5-cache/media-libs/waffle-9999
index 7799a2e917f0..88f0c9b1de49 100644
--- a/metadata/md5-cache/media-libs/waffle-9999
+++ b/metadata/md5-cache/media-libs/waffle-9999
@@ -11,4 +11,4 @@ RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c46935b730debea4f50cde23166a8fc8
+_md5_=0d9720d3ebc6856a52075828a41f351b
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 370df51ed6fb..fc09957fec45 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/gimp-resynthesizer-2.0.3-r1 b/metadata/md5-cache/media-plugins/gimp-resynthesizer-2.0.3-r1
deleted file mode 100644
index afa77fbafce9..000000000000
--- a/metadata/md5-cache/media-plugins/gimp-resynthesizer-2.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=media-gfx/gimp virtual/pkgconfig python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Suite of GIMP plugins for texture synthesis
-EAPI=6
-HOMEPAGE=https://github.com/bootchk/resynthesizer
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-gfx/gimp[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/bootchk/resynthesizer/archive/v2.0.3.tar.gz -> gimp-resynthesizer-2.0.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a1d2fc006876304d927a82a7ec375512
diff --git a/metadata/md5-cache/media-plugins/gimp-resynthesizer-2.0.3-r2 b/metadata/md5-cache/media-plugins/gimp-resynthesizer-2.0.3-r2
new file mode 100644
index 000000000000..1cea6c1afbfe
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gimp-resynthesizer-2.0.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+DEPEND=media-gfx/gimp virtual/pkgconfig python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Suite of GIMP plugins for texture synthesis
+EAPI=6
+HOMEPAGE=https://github.com/bootchk/resynthesizer
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-gfx/gimp[python,python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/bootchk/resynthesizer/archive/v2.0.3.tar.gz -> gimp-resynthesizer-2.0.3.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=09ce9be23ee80143f5766cc3a5c8ad64
diff --git a/metadata/md5-cache/media-plugins/imlib2_loaders-1.5.1 b/metadata/md5-cache/media-plugins/imlib2_loaders-1.5.1
deleted file mode 100644
index 3db09c562ded..000000000000
--- a/metadata/md5-cache/media-plugins/imlib2_loaders-1.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=media-libs/imlib2-1.5.1 eet? ( dev-libs/efl[eet] ) virtual/pkgconfig
-DESCRIPTION=Additional image loaders for Imlib2
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=eet xcf
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=media-libs/imlib2-1.5.1 eet? ( dev-libs/efl[eet] )
-SLOT=0
-SRC_URI=https://downloads.sourceforge.net/enlightenment/imlib2_loaders-1.5.1.tar.gz
-_md5_=d06c44c08481f38a5404d6d7a1178b60
diff --git a/metadata/md5-cache/media-plugins/imlib2_loaders-1.6.0 b/metadata/md5-cache/media-plugins/imlib2_loaders-1.6.0
index a71fbe61d2e8..21001a660e6d 100644
--- a/metadata/md5-cache/media-plugins/imlib2_loaders-1.6.0
+++ b/metadata/md5-cache/media-plugins/imlib2_loaders-1.6.0
@@ -5,9 +5,9 @@ DESCRIPTION=Additional image loaders for Imlib2
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org/ https://sourceforge.net/projects/enlightenment/files/imlib2-src/
 IUSE=eet xcf
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=media-libs/imlib2-1.6.0 eet? ( dev-libs/efl[eet] )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/enlightenment/imlib2_loaders-1.6.0.tar.gz
-_md5_=fab4808d2cc935d0f59d54d795e87645
+_md5_=63db946b19bdd5d7ece410738a57df1a
diff --git a/metadata/md5-cache/media-plugins/ir_lv2-1.2.4 b/metadata/md5-cache/media-plugins/ir_lv2-1.2.4
index 6bacbfb0e04f..23a772e7c336 100644
--- a/metadata/md5-cache/media-plugins/ir_lv2-1.2.4
+++ b/metadata/md5-cache/media-plugins/ir_lv2-1.2.4
@@ -5,10 +5,10 @@ DESCRIPTION=LV2 convolver plugin especially for creating reverb effects
 EAPI=7
 HOMEPAGE=https://tomszilagyi.github.io/plugins/ir.lv2/
 IUSE=tools
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 >=media-libs/zita-convolver-3:= >=x11-libs/gtk+-2.16:2
 SLOT=0
 SRC_URI=https://github.com/tomszilagyi/ir.lv2/archive/1.2.4.tar.gz -> ir_lv2-1.2.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1d861026255479ba1239593c633766cb
+_md5_=5cfc10cfa2e840f68d72bf50dcdfcea0
diff --git a/metadata/md5-cache/media-plugins/ir_lv2-1.3.4 b/metadata/md5-cache/media-plugins/ir_lv2-1.3.4
index 5de5dba15f16..6cce658891ac 100644
--- a/metadata/md5-cache/media-plugins/ir_lv2-1.3.4
+++ b/metadata/md5-cache/media-plugins/ir_lv2-1.3.4
@@ -5,10 +5,10 @@ DESCRIPTION=LV2 convolver plugin especially for creating reverb effects
 EAPI=7
 HOMEPAGE=https://tomszilagyi.github.io/plugins/ir.lv2/
 IUSE=tools
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2+
 RDEPEND=media-libs/libsamplerate media-libs/libsndfile media-libs/lv2 >=media-libs/zita-convolver-3:= >=x11-libs/gtk+-2.16:2
 SLOT=0
 SRC_URI=https://github.com/tomszilagyi/ir.lv2/archive/1.3.4.tar.gz -> ir_lv2-1.3.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fe95216bae8ce4c2d97d3477ed4e8816
+_md5_=9db729c5a83bde49e1ca8d7a38dc986c
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.0
deleted file mode 100644
index 418907962108..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* media-libs/libmodplug sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Modplug decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.modplug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* media-libs/libmodplug
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/2.0.0-Leia.tar.gz -> kodi-audiodecoder-modplug-2.0.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0c9663994c19c3f07524670921d0369
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.1
deleted file mode 100644
index 631dc4b7e6d6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* media-libs/libmodplug sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Modplug decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.modplug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* media-libs/libmodplug
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/2.0.1-Leia.tar.gz -> kodi-audiodecoder-modplug-2.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25e2ce4b11576e118d92b115d9423639
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.2
deleted file mode 100644
index a79a8e166b16..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* >=media-libs/libmodplug-0.8.9.0
-DESCRIPTION=Modplug decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/notspiff/audiodecoder.modplug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* >=media-libs/libmodplug-0.8.9.0
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/2.0.2-Leia.tar.gz -> kodi-audiodecoder-modplug-2.0.2.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d81b63b2a7858491b0c62b0bf9f5b327
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.3
new file mode 100644
index 000000000000..922aa6316ffb
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-modplug-2.0.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* >=media-libs/libmodplug-0.8.9.0
+DESCRIPTION=Modplug decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.modplug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* >=media-libs/libmodplug-0.8.9.0
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.modplug/archive/2.0.3-Leia.tar.gz -> kodi-audiodecoder-modplug-2.0.3.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa061a3adae5ae4f1cc979b5b7bd3575
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.2
new file mode 100644
index 000000000000..222703d21d68
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-nosefart-2.0.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18*
+DESCRIPTION=Nosefart decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.nosefart
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.nosefart/archive/2.0.2-Leia.tar.gz -> kodi-audiodecoder-nosefart-2.0.2.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=334528c99c1a263aec742f1ce7e46747
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.3 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.3
deleted file mode 100644
index cdca94007cfc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* media-libs/libsidplay:2 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=SidPlay decoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* =media-libs/kodi-platform-18* media-libs/libsidplay:2
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.sidplay/archive/1.1.3-Leia.tar.gz -> kodi-audiodecoder-sidplay-1.1.3.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3baf48ffd1b49e4a15010f649f768030
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.0 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.0
deleted file mode 100644
index d35ce8d41390..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* media-libs/libsidplay:2
-DESCRIPTION=SidPlay decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* media-libs/libsidplay:2
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.sidplay/archive/1.2.0-Leia.tar.gz -> kodi-audiodecoder-sidplay-1.2.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dc6fda63f5a7646c4effb21974ac03e
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.1 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.1
deleted file mode 100644
index 29aa3e2f642b..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* media-libs/libsidplay:2
-DESCRIPTION=SidPlay decoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* media-libs/libsidplay:2
-SLOT=0
-SRC_URI=https://github.com/notspiff/audiodecoder.sidplay/archive/1.2.1-Leia.tar.gz -> kodi-audiodecoder-sidplay-1.2.1.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dc6fda63f5a7646c4effb21974ac03e
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.2
new file mode 100644
index 000000000000..607ee5cd0e2b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-sidplay-1.2.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* media-libs/libsidplay:2
+DESCRIPTION=SidPlay decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.sidplay
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* media-libs/libsidplay:2
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.sidplay/archive/1.2.2-Leia.tar.gz -> kodi-audiodecoder-sidplay-1.2.2.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae462a86f9a3aade02c181b5e5a08ffb
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.2
new file mode 100644
index 000000000000..719d7813b45e
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-snesapu-2.0.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18*
+DESCRIPTION=SPC decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.snesapu
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.snesapu/archive/2.0.2-Leia.tar.gz -> kodi-audiodecoder-snesapu-2.0.2.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ebccb2b3178585d06b99a3c5d761e66
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.2
new file mode 100644
index 000000000000..65d8f9690b76
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-stsound-2.0.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18*
+DESCRIPTION=SPC decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.stsound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.stsound/archive/2.0.2-Leia.tar.gz -> kodi-audiodecoder-stsound-2.0.2.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=83075dbe3ec7fbc49da9cb5c67ec8d0d
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.4 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.4
new file mode 100644
index 000000000000..85c42a05e615
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-timidity-2.0.4
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18*
+DESCRIPTION=Timidity decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.timidity
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.timidity/archive/2.0.4-Leia.tar.gz -> kodi-audiodecoder-timidity-2.0.4-Leia.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a797b695acd2e15df834e10785f3bcbf
diff --git a/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.5 b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.5
new file mode 100644
index 000000000000..07bd9b30e489
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audiodecoder-vgmstream-1.1.5
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18*
+DESCRIPTION=vgmstream decoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/notspiff/audiodecoder.vgmstream
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/notspiff/audiodecoder.vgmstream/archive/1.1.5-Leia.tar.gz -> kodi-audiodecoder-vgmstream-1.1.5.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cea769a4ad2c298df9ebbd4b2cdb3a38
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.1
deleted file mode 100644
index e83496eecff6..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* media-libs/libogg media-libs/flac sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Flac encoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/audioencoder.flac
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* media-libs/libogg media-libs/flac
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/v2.0.1.tar.gz -> kodi-audioencoder-flac-2.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4af0b3e94144a34ae6744789ac61985d
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.2
deleted file mode 100644
index 067a19e9c007..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
-DESCRIPTION=Flac encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.flac
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/2.0.2-Leia.tar.gz -> kodi-audioencoder-flac-2.0.2.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2857dd4d8ab829751f9e7c4138c0e845
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.3 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.3
deleted file mode 100644
index 5d9fce8eedf3..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
-DESCRIPTION=Flac encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.flac
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/2.0.3-Leia.tar.gz -> kodi-audioencoder-flac-2.0.3.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2857dd4d8ab829751f9e7c4138c0e845
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.4 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.4
deleted file mode 100644
index d85fec7b170e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
-DESCRIPTION=Flac encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.flac
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/2.0.4-Leia.tar.gz -> kodi-audioencoder-flac-2.0.4.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2857dd4d8ab829751f9e7c4138c0e845
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.5 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.5
deleted file mode 100644
index e5c4f2f5e2ff..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
-DESCRIPTION=Flac encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.flac
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/2.0.5-Leia.tar.gz -> kodi-audioencoder-flac-2.0.5.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2857dd4d8ab829751f9e7c4138c0e845
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.6 b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.6
new file mode 100644
index 000000000000..a0cfc01fbd42
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-flac-2.0.6
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
+DESCRIPTION=Flac encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.flac
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 media-libs/flac
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.flac/archive/2.0.6-Leia.tar.gz -> kodi-audioencoder-flac-2.0.6.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3817358c679366a100fccaae7b577532
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.4 b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.4
new file mode 100644
index 000000000000..3a0bc31d4360
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-lame-2.0.4
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* >=media-sound/lame-3.100
+DESCRIPTION=Lame MP3 encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.lame
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* >=media-sound/lame-3.100
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.lame/archive/2.0.4-Leia.tar.gz -> kodi-audioencoder-lame-2.0.4.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4cf24cc6d3d4b4ae745b5c374d5561b6
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.1 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.1
deleted file mode 100644
index 9b003cf8912e..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* media-libs/libogg media-libs/libvorbis sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Vorbis encoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* media-libs/libogg media-libs/libvorbis
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/v2.0.1.tar.gz -> kodi-audioencoder-vorbis-2.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a713ce3f4809ac3eff9e0a8686112d24
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.2 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.2
deleted file mode 100644
index 9ac4a3b14023..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* media-libs/libogg media-libs/libvorbis sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Vorbis encoder addon for Kodi
-EAPI=6
-HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* media-libs/libogg media-libs/libvorbis
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/v2.0.2-Leia.tar.gz -> kodi-audioencoder-vorbis-2.0.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a262e6000d6b3bd7eb2ce01d59837099
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.3 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.3
deleted file mode 100644
index a3ae28424ca2..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
-DESCRIPTION=Vorbis encoder addon for Kodi
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
-SLOT=0
-SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/2.0.3-Leia.tar.gz -> kodi-audioencoder-vorbis-2.0.3.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c1c083e3b5645ac1901d9081f92b511
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.4 b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.4
new file mode 100644
index 000000000000..c82708fabb98
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-vorbis-2.0.4
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
+DESCRIPTION=Vorbis encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* >=media-libs/libogg-1.3.4 >=media-libs/libvorbis-1.3.6
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.vorbis/archive/2.0.4-Leia.tar.gz -> kodi-audioencoder-vorbis-2.0.4.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e706358c8246405daf4d9f5610ff9f6c
diff --git a/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.3 b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.3
new file mode 100644
index 000000000000..b3096930baeb
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-audioencoder-wav-2.0.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18*
+DESCRIPTION=WAV encoder addon for Kodi
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/audioencoder.wav
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18*
+SLOT=0
+SRC_URI=https://github.com/xbmc/audioencoder.wav/archive/2.0.3-Leia.tar.gz -> kodi-audioencoder-wav-2.0.3.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ffad2233eebc6b3f2949163cce7de692
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.7 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.7
deleted file mode 100644
index 06c6f0340df8..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* media-video/rtmpdump
-DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/inputstream.rtmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* media-video/rtmpdump
-SLOT=0
-SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/2.0.7-Leia.tar.gz -> kodi-inputstream-rtmp-2.0.7.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0026ede7d389a699021421283c764e74
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.8 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.8
deleted file mode 100644
index 225130ccd5cc..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-18* media-video/rtmpdump
-DESCRIPTION=Kodi's RTMP inputstream addon
-EAPI=7
-HOMEPAGE=https://github.com/xbmc/inputstream.rtmp
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-18* media-video/rtmpdump
-SLOT=0
-SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/2.0.8-Leia.tar.gz -> kodi-inputstream-rtmp-2.0.8.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0026ede7d389a699021421283c764e74
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9 b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9
new file mode 100644
index 000000000000..c10a19a0119a
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-rtmp-2.0.9
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==media-tv/kodi-18* media-video/rtmpdump
+DESCRIPTION=Kodi's RTMP inputstream addon
+EAPI=7
+HOMEPAGE=https://github.com/xbmc/inputstream.rtmp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==media-tv/kodi-18* media-video/rtmpdump
+SLOT=0
+SRC_URI=https://github.com/xbmc/inputstream.rtmp/archive/2.0.9-Leia.tar.gz -> kodi-inputstream-rtmp-2.0.9.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kodi-addon	b6d89dbf1a556c3d0377684754249dd1	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0026ede7d389a699021421283c764e74
diff --git a/metadata/md5-cache/media-plugins/mythplugins-30.0 b/metadata/md5-cache/media-plugins/mythplugins-30.0
deleted file mode 100644
index d32405632d13..000000000000
--- a/metadata/md5-cache/media-plugins/mythplugins-30.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/glib:2 dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:0= sys-apps/util-linux virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( >=media-libs/alsa-lib-1.0.24 ) hls? ( media-libs/faac media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) libass? ( >=media-libs/libass-0.9.11:= ) =media-tv/mythtv-30.0*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgallery? ( media-libs/tiff:0 opengl? ( virtual/opengl:= ) exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythgame? ( sys-libs/zlib[minizip] ) mythmusic? ( >=media-libs/flac-1.1.2 media-libs/libogg >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.6 >=media-sound/lame-3.93.1 fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/oauth[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON ) mythzmserver? ( dev-db/mysql-connector-c:0/18 ) theora? ( media-libs/libtheora ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0 )
-DESCRIPTION=Official WMythTV plugins
-EAPI=7
-HOMEPAGE=https://www.mythtv.org
-IUSE=mytharchive +mythbrowser +mythgallery mythgame mythmusic +mythnetvision +mythnews +mythweather mythzmserver mythzoneminder alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/glib:2 dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:0= sys-apps/util-linux virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( >=media-libs/alsa-lib-1.0.24 ) hls? ( media-libs/faac media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) libass? ( >=media-libs/libass-0.9.11:= ) =media-tv/mythtv-30.0*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid] mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgallery? ( media-libs/tiff:0 opengl? ( virtual/opengl:= ) exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythgame? ( sys-libs/zlib[minizip] ) mythmusic? ( >=media-libs/flac-1.1.2 media-libs/libogg >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.6 >=media-sound/lame-3.93.1 fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/oauth[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON ) mythzmserver? ( dev-db/mysql-connector-c:0/18 ) theora? ( media-libs/libtheora ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0 ) !media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather !media-plugins/mythzmserver !media-plugins/mythzoneminder
-REQUIRED_USE=mythmusic? ( vorbis ) mythnetvision? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) mythnews? ( mythbrowser )
-SLOT=0
-SRC_URI=https://github.com/MythTV/mythtv/archive/v30.0.tar.gz -> mythplugins-30.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=88e06cf6f3249ebb388cd585ae6e916c
diff --git a/metadata/md5-cache/media-plugins/mythplugins-30.0-r1 b/metadata/md5-cache/media-plugins/mythplugins-30.0-r1
new file mode 100644
index 000000000000..99c8351137f4
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/mythplugins-30.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/glib:2 dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:0= sys-apps/util-linux virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( >=media-libs/alsa-lib-1.0.24 ) hls? ( media-libs/faac media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) libass? ( >=media-libs/libass-0.9.11:= ) =media-tv/mythtv-30.0*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid] mytharchive? ( app-cdr/dvd+rw-tools python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] ) media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgallery? ( media-libs/tiff:0 opengl? ( virtual/opengl:= ) exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythgame? ( sys-libs/zlib[minizip] ) mythmusic? ( >=media-libs/flac-1.1.2 media-libs/libogg >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.6 >=media-sound/lame-3.93.1 fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( python_single_target_python2_7? ( dev-python/pycurl[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] dev-python/mysql-python[python_targets_python2_7(-)] dev-python/oauth[python_targets_python2_7(-)] ) ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON ) mythzmserver? ( dev-db/mysql-connector-c:0/18 ) theora? ( media-libs/libtheora ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0 )
+DESCRIPTION=Official WMythTV plugins
+EAPI=7
+HOMEPAGE=https://www.mythtv.org
+IUSE=mytharchive +mythbrowser +mythgallery mythgame mythmusic +mythnetvision +mythnews +mythweather mythzmserver mythzoneminder alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/glib:2 dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 media-libs/freetype:2 media-libs/libpng:0= sys-apps/util-linux virtual/libudev:= x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm alsa? ( >=media-libs/alsa-lib-1.0.24 ) hls? ( media-libs/faac media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) libass? ( >=media-libs/libass-0.9.11:= ) =media-tv/mythtv-30.0*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid] mytharchive? ( app-cdr/dvd+rw-tools python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] ) media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythbrowser? ( dev-qt/qtwebkit:5 ) mythgallery? ( media-libs/tiff:0 opengl? ( virtual/opengl:= ) exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythgame? ( sys-libs/zlib[minizip] ) mythmusic? ( >=media-libs/flac-1.1.2 media-libs/libogg >=media-libs/libvorbis-1.0 >=media-libs/taglib-1.6 >=media-sound/lame-3.93.1 fftw? ( sci-libs/fftw:3.0= ) opengl? ( virtual/opengl ) cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( python_single_target_python2_7? ( dev-python/pycurl[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] dev-python/mysql-python[python_targets_python2_7(-)] dev-python/oauth[python_targets_python2_7(-)] ) ) mythweather? ( dev-perl/Date-Manip dev-perl/XML-Simple dev-perl/XML-XPath dev-perl/DateTime dev-perl/Image-Size dev-perl/DateTime-Format-ISO8601 dev-perl/SOAP-Lite dev-perl/JSON ) mythzmserver? ( dev-db/mysql-connector-c:0/18 ) theora? ( media-libs/libtheora ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0 ) !media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather !media-plugins/mythzmserver !media-plugins/mythzoneminder
+REQUIRED_USE=mythmusic? ( vorbis ) mythnetvision? ( ^^ ( python_single_target_python2_7 ) ) mythnews? ( mythbrowser )
+SLOT=0
+SRC_URI=https://github.com/MythTV/mythtv/archive/v30.0.tar.gz -> mythplugins-30.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9f9e7daef0e1537649c597e491f466d0
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 5f6d7f997fb4..5d5e3a9516e2 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/ax25-apps-0.0.8_rc4 b/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc4
index 0fc3cf409b41..d927e0b8d3de 100644
--- a/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc4
+++ b/metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc4
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/libax25-0.0.12_rc2 sys-libs/ncurses:=
 SLOT=0
 SRC_URI=http://www.linux-ax25.org/pub/ax25-apps/ax25-apps-0.0.8-rc4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10490b0e15a3de29edb118617b6540a9
+_md5_=b08e051af2ab12a02489171754a35b84
diff --git a/metadata/md5-cache/media-radio/ibp-0.21-r1 b/metadata/md5-cache/media-radio/ibp-0.21-r1
index a6cfd8c84d46..7e2a4898a64b 100644
--- a/metadata/md5-cache/media-radio/ibp-0.21-r1
+++ b/metadata/md5-cache/media-radio/ibp-0.21-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0 X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://wwwhome.cs.utwente.nl/~ptdeboer/ham/ibp-0.21.tgz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=de2e328e87d5b4f00ebf30cd18161919
+_md5_=716382f5b2cd2ac9fa06ce772d763196
diff --git a/metadata/md5-cache/media-radio/js8call-2.1.1 b/metadata/md5-cache/media-radio/js8call-2.1.1
new file mode 100644
index 000000000000..76a0b952a778
--- /dev/null
+++ b/metadata/md5-cache/media-radio/js8call-2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc <media-libs/hamlib-3.4 doc? ( dev-ruby/asciidoctor ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Weak signal ham radio communication
+EAPI=6
+HOMEPAGE=https://groups.io/g/js8call
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtserialport:5 dev-qt/qtprintsupport:5 virtual/libusb:1 media-libs/portaudio sci-libs/fftw:3.0[threads,fortran] virtual/fortran app-text/asciidoc <media-libs/hamlib-3.4 doc? ( dev-ruby/asciidoctor )
+SLOT=0
+SRC_URI=https://bitbucket.org/widefido/js8call/get/v2.1.1-ga.tar.bz2 -> js8call-2.1.1.tar.bz2
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4c4a91a84a7655e71e2e296c0ff66b16
diff --git a/metadata/md5-cache/media-radio/svxlink-17.12.1 b/metadata/md5-cache/media-radio/svxlink-17.12.1
index 14c4a6a869ae..2df8f662724b 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 0f8f7295fde8..4c4e532eae42 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=56157c1ef1c3552895ec473c0f5bbacc
diff --git a/metadata/md5-cache/media-radio/xastir-2.0.8-r1 b/metadata/md5-cache/media-radio/xastir-2.0.8-r1
deleted file mode 100644
index 8521ecf76368..000000000000
--- a/metadata/md5-cache/media-radio/xastir-2.0.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=X Amateur Station Tracking and Information Reporting
-EAPI=5
-HOMEPAGE=http://xastir.org/
-IUSE=gdal geotiff +graphicsmagick
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( <media-gfx/imagemagick-7:0=[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick:=[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal )
-SLOT=0
-SRC_URI=mirror://sourceforge/xastir/xastir-2.0.8.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c5b73fc7cbf722a0abd40290f074878e
diff --git a/metadata/md5-cache/media-radio/xastir-2.1.4 b/metadata/md5-cache/media-radio/xastir-2.1.4
index f100f2b5c66b..76f6fb36e213 100644
--- a/metadata/md5-cache/media-radio/xastir-2.1.4
+++ b/metadata/md5-cache/media-radio/xastir-2.1.4
@@ -11,4 +11,4 @@ RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x1
 SLOT=0
 SRC_URI=https://github.com/Xastir/Xastir/archive/Release-2.1.4.tar.gz -> xastir-2.1.4.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5575e9e953c1e5386ea75755a8d6758e
+_md5_=8128a5f17cd92491cebcff75d695dc99
diff --git a/metadata/md5-cache/media-radio/xdx-2.5.0 b/metadata/md5-cache/media-radio/xdx-2.5.0
index aa6ee28f04da..6c1387226f0c 100644
--- a/metadata/md5-cache/media-radio/xdx-2.5.0
+++ b/metadata/md5-cache/media-radio/xdx-2.5.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install postinst
 DEPEND=>=x11-libs/gtk+-2.12:2 virtual/pkgconfig nls? ( sys-devel/gettext )
 DESCRIPTION=a GTK+ TCP/IP DX-cluster and ON4KST chat client
-EAPI=5
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/xdxclusterclient
 IUSE=nls
 KEYWORDS=amd64 x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2
 SLOT=0
 SRC_URI=mirror://sourceforge/xdxclusterclient/xdx-2.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a4f750bb73e8beeb31142401c477da7
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5
+_md5_=64539d0057ded299a59b1b5adee5b501
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index fce4c449ad9e..c1fd6eb7c801 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/abcmidi-2019.05.08 b/metadata/md5-cache/media-sound/abcmidi-2019.05.08
deleted file mode 100644
index db1d3769203c..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2019.05.08
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=7
-HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2019.05.08.zip
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=97430406684a6979e5574473f8b974ce
diff --git a/metadata/md5-cache/media-sound/abcmidi-2019.06.30 b/metadata/md5-cache/media-sound/abcmidi-2019.06.30
deleted file mode 100644
index 1ab6d76d909c..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2019.06.30
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=7
-HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2019.06.30.zip
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=97430406684a6979e5574473f8b974ce
diff --git a/metadata/md5-cache/media-sound/abcmidi-2019.07.12 b/metadata/md5-cache/media-sound/abcmidi-2019.07.12
deleted file mode 100644
index 2d732e8a4bc8..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2019.07.12
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=7
-HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2019.07.12.zip
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=97430406684a6979e5574473f8b974ce
diff --git a/metadata/md5-cache/media-sound/abcmidi-2020.01.22 b/metadata/md5-cache/media-sound/abcmidi-2020.01.22
new file mode 100644
index 000000000000..f2e6a6cc1915
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2020.01.22
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=Programs for processing ABC music notation files
+EAPI=7
+HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2020.01.22.zip
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a0247c92f5ed6553a8e721a1a2e92137
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.2.1 b/metadata/md5-cache/media-sound/alsa-utils-1.2.1
index f3f54b7c1c0d..6ceb8c800932 100644
--- a/metadata/md5-cache/media-sound/alsa-utils-1.2.1
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.2.1
@@ -5,10 +5,10 @@ DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
 EAPI=7
 HOMEPAGE=https://alsa-project.org/
 IUSE=bat doc +libsamplerate +ncurses nls selinux
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.2.1 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7:0= ) bat? ( sci-libs/fftw:= ) selinux? ( sec-policy/selinux-alsa )
 SLOT=0.9
 SRC_URI=https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.1.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=aa2c75fd7cc313492abd69cc090b75a0
+_md5_=5229ca92efea9eeda7ea9677779185b7
diff --git a/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4 b/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
index a3b5a2e311b2..9925360af668 100644
--- a/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
+++ b/metadata/md5-cache/media-sound/alsamixergui-0.9.0.1.2-r4
@@ -3,11 +3,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=media-libs/alsa-lib:= media-sound/alsa-utils x11-libs/fltk:1
 DESCRIPTION=FLTK based amixer Frontend
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 arm ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/alsa-lib:= media-sound/alsa-utils x11-libs/fltk:1
 SLOT=0
 SRC_URI=mirror://gentoo/alsamixergui-0.9.0rc1-2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c858c7218d7a98d6a215e86983f109d8
+_md5_=829f4857cb7082dd21684aae823f974c
diff --git a/metadata/md5-cache/media-sound/apetag-1.12-r2 b/metadata/md5-cache/media-sound/apetag-1.12-r2
index 66e4f49f5536..09d4bf27be27 100644
--- a/metadata/md5-cache/media-sound/apetag-1.12-r2
+++ b/metadata/md5-cache/media-sound/apetag-1.12-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Command-line ape 2.0 tagger
 EAPI=6
 HOMEPAGE=http://muth.org/Robert/Apetag/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://muth.org/Robert/Apetag/apetag.1.12.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a7cd7702490a4135ec5cd4570a118d2f
diff --git a/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1 b/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
index abaabfc3d5d7..5fac282541b3 100644
--- a/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
+++ b/metadata/md5-cache/media-sound/aucdtect-0.8.2-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=http://en.true-audio.com/ftp/aucdtect-0.8-2.i586.rpm -> aucdtect-0.8.2.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6afa5caaead50d406eca712f42da3acc
diff --git a/metadata/md5-cache/media-sound/audacity-2.3.3 b/metadata/md5-cache/media-sound/audacity-2.3.3
new file mode 100644
index 000000000000..c2e8e1b17c51
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audacity-2.3.3
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/expat >=media-libs/libsndfile-1.0.0 >=media-libs/portaudio-19.06.00-r2[alsa?] <media-libs/portaudio-20 media-libs/soxr x11-libs/wxGTK:3.0-gtk3[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-1.2:= ) ) flac? ( >=media-libs/flac-1.3.1[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lilv media-libs/lv2 media-libs/suil ) mad? ( >=media-libs/libmad-0.14.2b ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free crossplatform audio editor
+EAPI=7
+HOMEPAGE=https://web.audacityteam.org/
+IUSE=alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat >=media-libs/libsndfile-1.0.0 >=media-libs/portaudio-19.06.00-r2[alsa?] <media-libs/portaudio-20 media-libs/soxr x11-libs/wxGTK:3.0-gtk3[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-1.2:= ) ) flac? ( >=media-libs/flac-1.3.1[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lilv media-libs/lv2 media-libs/suil ) mad? ( >=media-libs/libmad-0.14.2b ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/audacity/audacity/archive/Audacity-2.3.3.tar.gz doc? ( https://dev.gentoo.org/~polynomial-c/dist/audacity-manual-2.3.3.zip )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=926614de70f8f82eb4937b54ff77ca94
diff --git a/metadata/md5-cache/media-sound/audiotools-3.1.1 b/metadata/md5-cache/media-sound/audiotools-3.1.1
index b632ef7721e0..7b6bc062b6a4 100644
--- a/metadata/md5-cache/media-sound/audiotools-3.1.1
+++ b/metadata/md5-cache/media-sound/audiotools-3.1.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/audiotools/audiotools-3.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e6f3df4d39d36b3f71bac04fbcaae5a8
diff --git a/metadata/md5-cache/media-sound/beets-1.4.9-r1 b/metadata/md5-cache/media-sound/beets-1.4.9-r1
index eb100e474493..1ee981c330cd 100644
--- a/metadata/md5-cache/media-sound/beets-1.4.9-r1
+++ b/metadata/md5-cache/media-sound/beets-1.4.9-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/beets/beets-1.4.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5fed370250ec9e18545fd09016e909f3
diff --git a/metadata/md5-cache/media-sound/cadence-0.9.0-r3 b/metadata/md5-cache/media-sound/cadence-0.9.0-r3
deleted file mode 100644
index 543e911bc398..000000000000
--- a/metadata/md5-cache/media-sound/cadence-0.9.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-sound/jack2[dbus] media-sound/jack_capture a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( media-sound/pulseaudio[jack] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Collection of tools useful for audio production
-EAPI=7
-HOMEPAGE=http://kxstudio.linuxaudio.org/Applications:Cadence
-IUSE=a2jmidid -pulseaudio opengl python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-sound/jack2[dbus] media-sound/jack_capture a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( media-sound/pulseaudio[jack] )
-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/falkTX/Cadence/archive/v0.9.0.tar.gz -> cadence-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b433f0f146d5ffa86f66706d51c2699
diff --git a/metadata/md5-cache/media-sound/cadence-0.9.0-r4 b/metadata/md5-cache/media-sound/cadence-0.9.0-r4
new file mode 100644
index 000000000000..5b21b0ae1c0f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/cadence-0.9.0-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_7(-)] ) media-sound/jack2[dbus] media-sound/jack_capture a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( media-sound/pulseaudio[jack] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of tools useful for audio production
+EAPI=7
+HOMEPAGE=http://kxstudio.linuxaudio.org/Applications:Cadence
+IUSE=a2jmidid -pulseaudio opengl python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_7(-)] ) media-sound/jack2[dbus] media-sound/jack_capture a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( media-sound/pulseaudio[jack] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/falkTX/Cadence/archive/v0.9.0.tar.gz -> cadence-0.9.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=69005d2f792aad787de60925f815a1d8
diff --git a/metadata/md5-cache/media-sound/cadence-9999 b/metadata/md5-cache/media-sound/cadence-9999
index 64239d6e3ff7..1e2276f66278 100644
--- a/metadata/md5-cache/media-sound/cadence-9999
+++ b/metadata/md5-cache/media-sound/cadence-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-sound/jack2[dbus] media-sound/jack_capture a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( media-sound/pulseaudio[jack] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_7(-)] ) media-sound/jack2[dbus] media-sound/jack_capture a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( media-sound/pulseaudio[jack] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Collection of tools useful for audio production
 EAPI=7
 HOMEPAGE=http://kxstudio.linuxaudio.org/Applications:Cadence
-IUSE=a2jmidid -pulseaudio opengl python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=a2jmidid -pulseaudio opengl python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-sound/jack2[dbus] media-sound/jack_capture a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( media-sound/pulseaudio[jack] )
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/PyQt5[dbus,gui,opengl?,svg,widgets,python_targets_python3_7(-)] ) media-sound/jack2[dbus] media-sound/jack_capture a2jmidid? ( media-sound/a2jmidid[dbus] ) pulseaudio? ( media-sound/pulseaudio[jack] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=616a492c27949f4eb0205dfc701eed44
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=971af50b7048d1aa372f6d4837ca10dd
diff --git a/metadata/md5-cache/media-sound/cmus-2.8.0 b/metadata/md5-cache/media-sound/cmus-2.8.0
index 12de071658f0..2f4bc576537e 100644
--- a/metadata/md5-cache/media-sound/cmus-2.8.0
+++ b/metadata/md5-cache/media-sound/cmus-2.8.0
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack )
+DEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack )
 DESCRIPTION=Ncurses based music player with plugin support for many formats
 EAPI=7
 HOMEPAGE=https://cmus.github.io/
-IUSE=aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack
+IUSE=aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack
 KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) pidgin? ( dev-python/dbus-python net-im/pidgin )
+RDEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) pidgin? ( dev-python/dbus-python net-im/pidgin )
 REQUIRED_USE=tremor? ( vorbis ) mp4? ( aac )
 SLOT=0
 SRC_URI=https://github.com/cmus/cmus/archive/v2.8.0.tar.gz -> cmus-2.8.0.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=55e93b2fec56c21fe59d7ef6e18554ba
+_md5_=76d89069a859af58c480956d8add930e
diff --git a/metadata/md5-cache/media-sound/cmus-9999 b/metadata/md5-cache/media-sound/cmus-9999
index edb98feef742..f216767a09d0 100644
--- a/metadata/md5-cache/media-sound/cmus-9999
+++ b/metadata/md5-cache/media-sound/cmus-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install unpack
-DEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack )
+DEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack )
 DESCRIPTION=Ncurses based music player with plugin support for many formats
 EAPI=7
 HOMEPAGE=https://cmus.github.io/
-IUSE=aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack
+IUSE=aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) pidgin? ( dev-python/dbus-python net-im/pidgin )
+RDEPEND=sys-libs/ncurses:0=[unicode?] aac? ( media-libs/faad2 ) alsa? ( >=media-libs/alsa-lib-1.0.11 ) ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mad? ( >=media-libs/libmad-0.14 ) mikmod? ( media-libs/libmikmod:0 ) modplug? ( >=media-libs/libmodplug-0.7 ) mp4? ( >=media-libs/libmp4v2-1.9:0 ) musepack? ( >=media-sound/musepack-tools-444 ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd ) tremor? ( media-libs/tremor ) !tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) ) wavpack? ( media-sound/wavpack ) pidgin? ( dev-python/dbus-python net-im/pidgin )
 REQUIRED_USE=tremor? ( vorbis ) mp4? ( aac )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e3d25555c0356c8a291f0c5d7cc8af2c
+_md5_=f839dd801275aedfa5a5c86706b8e8b4
diff --git a/metadata/md5-cache/media-sound/codecgraph-20120114-r2 b/metadata/md5-cache/media-sound/codecgraph-20120114-r2
index 3e6b1cfceadf..895141e8ed32 100644
--- a/metadata/md5-cache/media-sound/codecgraph-20120114-r2
+++ b/metadata/md5-cache/media-sound/codecgraph-20120114-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Generates a graph based on the ALSA description of an HD Audio codec
 EAPI=6
 HOMEPAGE=http://helllabs.org/codecgraph/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) media-gfx/graphviz
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://helllabs.org/codecgraph/codecgraph-20120114.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5b6636968b972ea439f3320dba99d647
diff --git a/metadata/md5-cache/media-sound/cplay-1.50 b/metadata/md5-cache/media-sound/cplay-1.50
index 1dd0d3b00c8c..7685169f5485 100644
--- a/metadata/md5-cache/media-sound/cplay-1.50
+++ b/metadata/md5-cache/media-sound/cplay-1.50
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A Curses front-end for various audio players
 EAPI=6
 HOMEPAGE=https://github.com/hukka/cplay/
-IUSE=mp3 vorbis +python_targets_python2_7 +python_single_target_python2_7
+IUSE=mp3 vorbis +python_single_target_python2_7
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) vorbis? ( media-sound/vorbis-tools ) mp3? ( || ( media-sound/mpg123 media-sound/mpg321 media-sound/madplay media-sound/splay ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/hukka/cplay/archive/v1.50.tar.gz -> cplay-1.50.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9ae5bd27701e4373b858515418629efc
diff --git a/metadata/md5-cache/media-sound/csound-6.13.0 b/metadata/md5-cache/media-sound/csound-6.13.0
index 773133d83e18..a7acedfdc114 100644
--- a/metadata/md5-cache/media-sound/csound-6.13.0
+++ b/metadata/md5-cache/media-sound/csound-6.13.0
@@ -4,13 +4,13 @@ DEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate s
 DESCRIPTION=Sound design and signal processing system for composition and performance
 EAPI=7
 HOMEPAGE=https://csound.github.io/
-IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
 RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) 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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
-REQUIRED_USE=linear? ( double-precision ) lua? ( cxx ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) cxx )
+REQUIRED_USE=linear? ( double-precision ) lua? ( cxx ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) cxx )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.13.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.13.0/Csound6.13.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.13.0/Csound6.13.0_manual_html.zip )
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=04d5a800c63254951a74cd0e7132ae3c
diff --git a/metadata/md5-cache/media-sound/csound-6.14.0 b/metadata/md5-cache/media-sound/csound-6.14.0
new file mode 100644
index 000000000000..c561413016f4
--- /dev/null
+++ b/metadata/md5-cache/media-sound/csound-6.14.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) python? ( dev-lang/swig ) nls? ( sys-devel/gettext ) test? ( dev-util/cunit python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) 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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= ) dev-libs/boost doc? ( app-arch/unzip )
+DESCRIPTION=Sound design and signal processing system for composition and performance
+EAPI=7
+HOMEPAGE=https://csound.github.io/
+IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
+RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) 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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
+REQUIRED_USE=linear? ( double-precision ) lua? ( cxx ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) cxx )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/csound-6.14.0-distributable.tar.xz doc? ( https://github.com/csound/csound/releases/download/6.14.0/Csound6.14.0_manual_pdf.zip https://github.com/csound/csound/releases/download/6.14.0/Csound6.14.0_manual_html.zip )
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a2ce039bc8d739426c18d9ac64ba8641
diff --git a/metadata/md5-cache/media-sound/csound-9999 b/metadata/md5-cache/media-sound/csound-9999
index f81adf13b11c..0e9dba56a275 100644
--- a/metadata/md5-cache/media-sound/csound-9999
+++ b/metadata/md5-cache/media-sound/csound-9999
@@ -4,12 +4,12 @@ DEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate s
 DESCRIPTION=Sound design and signal processing system for composition and performance
 EAPI=7
 HOMEPAGE=https://csound.github.io/
-IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=+alsa beats chua curl +cxx debug doc double-precision dssi examples fltk +fluidsynth hdf5 +image jack keyboard linear lua luajit nls osc portaudio portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils vim-syntax websocket python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=LGPL-2.1 doc? ( FDL-1.2+ )
 PROPERTIES=live
 RDEPEND=dev-cpp/eigen:3 >=media-libs/libsndfile-1.0.16 media-libs/libsamplerate sys-libs/zlib alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth:= ) fltk? ( x11-libs/fltk:1[threads?] ) hdf5? ( sci-libs/hdf5 ) image? ( media-libs/libpng:0= ) jack? ( virtual/jack ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( =sci-mathematics/gmm-5.1* ) 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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) stk? ( media-libs/stk ) utils? ( !media-sound/snd ) websocket? ( net-libs/libwebsockets:= )
-REQUIRED_USE=linear? ( double-precision ) lua? ( cxx ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) cxx )
+REQUIRED_USE=linear? ( double-precision ) lua? ( cxx ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) cxx )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=57759f15bdc87117de1ed65abdc68d08
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a2ce039bc8d739426c18d9ac64ba8641
diff --git a/metadata/md5-cache/media-sound/din-43.0.1 b/metadata/md5-cache/media-sound/din-43.0.1
index 64227e7cc5c2..4c6a039e38ee 100644
--- a/metadata/md5-cache/media-sound/din-43.0.1
+++ b/metadata/md5-cache/media-sound/din-43.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=a software musical instrument and audio synthesizer
 EAPI=7
 HOMEPAGE=http://dinisnoise.org/
 IUSE=+alsa jack
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/tcl:0= media-libs/libsdl:= virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
 REQUIRED_USE=|| ( alsa jack )
 SLOT=0
 SRC_URI=https://archive.org/download/dinisnoise_source_code/din-43.0.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e46d604b21188954f6cae451d2b10a63
+_md5_=4d36a84237190d90d216a931b284bf37
diff --git a/metadata/md5-cache/media-sound/dir2ogg-0.12 b/metadata/md5-cache/media-sound/dir2ogg-0.12
deleted file mode 100644
index 4f2f242fe1e1..000000000000
--- a/metadata/md5-cache/media-sound/dir2ogg-0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DESCRIPTION=Converts mp3, m4a, wma, and wav files to Ogg Vorbis format
-EAPI=7
-HOMEPAGE=https://jak-linux.org/projects/dir2ogg/
-IUSE=aac flac mac mp3 musepack wavpack wma +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/mutagen-1.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-sound/vorbis-tools[ogg123] aac? ( || ( media-libs/faad2 media-video/mplayer ) ) flac? ( || ( media-libs/flac media-video/mplayer ) ) mac? ( || ( media-sound/mac media-video/mplayer ) ) mp3? ( || ( media-sound/mpg123 media-sound/lame media-video/mplayer media-sound/mpg321 ) ) musepack? ( || ( >=media-sound/musepack-tools-444 media-video/mplayer ) ) wavpack? ( || ( media-sound/wavpack media-video/mplayer ) ) wma? ( media-video/mplayer )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://jak-linux.org/projects/dir2ogg/0.12/dir2ogg-0.12.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=10f945ce2de75685ea3527fa80766c18
diff --git a/metadata/md5-cache/media-sound/dir2ogg-0.12-r1 b/metadata/md5-cache/media-sound/dir2ogg-0.12-r1
new file mode 100644
index 000000000000..fa5c517cdebe
--- /dev/null
+++ b/metadata/md5-cache/media-sound/dir2ogg-0.12-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DESCRIPTION=Converts mp3, m4a, wma, and wav files to Ogg Vorbis format
+EAPI=7
+HOMEPAGE=https://jak-linux.org/projects/dir2ogg/
+IUSE=aac flac mac mp3 musepack wavpack wma +python_single_target_python2_7
+KEYWORDS=amd64 ~ppc sparc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( >=media-libs/mutagen-1.11[python_targets_python2_7(-)] ) media-sound/vorbis-tools[ogg123] aac? ( || ( media-libs/faad2 media-video/mplayer ) ) flac? ( || ( media-libs/flac media-video/mplayer ) ) mac? ( || ( media-sound/mac media-video/mplayer ) ) mp3? ( || ( media-sound/mpg123 media-sound/lame media-video/mplayer media-sound/mpg321 ) ) musepack? ( || ( >=media-sound/musepack-tools-444 media-video/mplayer ) ) wavpack? ( || ( media-sound/wavpack media-video/mplayer ) ) wma? ( media-video/mplayer )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://jak-linux.org/projects/dir2ogg/0.12/dir2ogg-0.12.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8d206142274d6d25a49ea2920c428989
diff --git a/metadata/md5-cache/media-sound/dir2ogg-0.13-r1 b/metadata/md5-cache/media-sound/dir2ogg-0.13-r1
new file mode 100644
index 000000000000..ccff8c50fde2
--- /dev/null
+++ b/metadata/md5-cache/media-sound/dir2ogg-0.13-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DESCRIPTION=Converts mp3, m4a, wma, and wav files to Ogg Vorbis format
+EAPI=7
+HOMEPAGE=https://jak-linux.org/projects/dir2ogg/
+IUSE=aac flac mac mp3 musepack wavpack wma python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=media-libs/mutagen-1.11[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=media-libs/mutagen-1.11[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=media-libs/mutagen-1.11[python_targets_python3_8(-)] ) media-sound/vorbis-tools[ogg123] aac? ( || ( media-libs/faad2 media-video/mplayer ) ) flac? ( || ( media-libs/flac media-video/mplayer ) ) mac? ( || ( media-sound/mac media-video/mplayer ) ) mp3? ( || ( media-sound/mpg123 media-sound/lame media-video/mplayer media-sound/mpg321 ) ) musepack? ( || ( >=media-sound/musepack-tools-444 media-video/mplayer ) ) wavpack? ( || ( media-sound/wavpack media-video/mplayer ) ) wma? ( media-video/mplayer )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://jak-linux.org/projects/dir2ogg/0.13/dir2ogg-0.13.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4409b75826cc5fc47c44f4a06fdf6a35
diff --git a/metadata/md5-cache/media-sound/easytag-2.4.3-r1 b/metadata/md5-cache/media-sound/easytag-2.4.3-r1
index 9753cf4535cd..359fa8b4d12e 100644
--- a/metadata/md5-cache/media-sound/easytag-2.4.3-r1
+++ b/metadata/md5-cache/media-sound/easytag-2.4.3-r1
@@ -4,7 +4,7 @@ DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media ta
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/EasyTAG
 IUSE=flac mp3 mp4 nautilus opus speex test vorbis wavpack
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2 media-libs/libcanberra[gtk3] >=x11-libs/gtk+-3.10:3 flac? ( >=media-libs/flac-1.3 ) mp3? ( >=media-libs/id3lib-3.8.3-r8 >=media-libs/libid3tag-0.15.1b-r4 ) mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] ) nautilus? ( gnome-base/nautilus ) opus? ( >=media-libs/opus-1.1 >=media-libs/opusfile-0.4 ) speex? ( >=media-libs/speex-1.2_rc1 ) vorbis? ( >=media-libs/libogg-1.3.1 >=media-libs/libvorbis-1.3.4 ) wavpack? ( >=media-sound/wavpack-4.70 )
 REQUIRED_USE=opus? ( vorbis ) speex? ( vorbis )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/easytag/2.4/easytag-2.4.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba19df5217b211fc7c509c40d5b6c88f
+_md5_=34d93accb731e92f1c463281df428299
diff --git a/metadata/md5-cache/media-sound/ecasound-2.6.0-r1 b/metadata/md5-cache/media-sound/ecasound-2.6.0-r1
index 852e0739cff0..b0ed833b2f07 100644
--- a/metadata/md5-cache/media-sound/ecasound-2.6.0-r1
+++ b/metadata/md5-cache/media-sound/ecasound-2.6.0-r1
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=a package for multitrack audio processing
 EAPI=6
 HOMEPAGE=https://ecasound.seul.org/ecasound/
-IUSE=alsa audiofile debug doc jack libsamplerate mikmod ncurses vorbis oss python ruby sndfile +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa audiofile debug doc jack libsamplerate mikmod ncurses vorbis oss python ruby sndfile +python_single_target_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) jack? ( media-sound/jack-audio-connection-kit ) media-libs/ladspa-sdk audiofile? ( media-libs/audiofile ) alsa? ( media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) libsamplerate? ( media-libs/libsamplerate ) mikmod? ( media-libs/libmikmod:0 ) ruby? ( dev-lang/ruby ) python? ( dev-lang/python ) ncurses? ( sys-libs/ncurses ) sndfile? ( media-libs/libsndfile ) sys-libs/readline
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=1
 SRC_URI=https://ecasound.seul.org/download/ecasound-2.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ccb02058d72ca369735487aa0dc7523
diff --git a/metadata/md5-cache/media-sound/ecasound-2.9.1-r1 b/metadata/md5-cache/media-sound/ecasound-2.9.1-r1
index 7bc5683e58b0..97915345c9c2 100644
--- a/metadata/md5-cache/media-sound/ecasound-2.9.1-r1
+++ b/metadata/md5-cache/media-sound/ecasound-2.9.1-r1
@@ -3,13 +3,13 @@ DEPEND=sys-libs/readline:0= alsa? ( media-libs/alsa-lib:= ) audiofile? ( media-l
 DESCRIPTION=a package for multitrack audio processing
 EAPI=6
 HOMEPAGE=https://ecasound.seul.org/ecasound/
-IUSE=alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss python ruby sndfile static-libs test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss python ruby sndfile static-libs test +python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:0= alsa? ( media-libs/alsa-lib:= ) audiofile? ( media-libs/audiofile:= ) jack? ( virtual/jack:= ) libsamplerate? ( media-libs/libsamplerate:= ) lv2? ( >=media-libs/lilv-0.5.0:= ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0= ) ncurses? ( sys-libs/ncurses:0= ) oil? ( dev-libs/liboil:= ) osc? ( media-libs/liblo:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile:= )
-REQUIRED_USE=test? ( lv2 ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=test? ( lv2 ) python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://ecasound.seul.org/download/ecasound-2.9.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e08e2b81d659bba4d5c3a122b2fdf843
diff --git a/metadata/md5-cache/media-sound/edna-0.6 b/metadata/md5-cache/media-sound/edna-0.6
index 9e1608d7824b..851f3289b997 100644
--- a/metadata/md5-cache/media-sound/edna-0.6
+++ b/metadata/md5-cache/media-sound/edna-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://sourceforge/edna/edna-0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2f925092d83d8817a6aa596375fcd96
diff --git a/metadata/md5-cache/media-sound/elisa-19.12.1 b/metadata/md5-cache/media-sound/elisa-19.12.1
deleted file mode 100644
index 5e2bb8b47a16..000000000000
--- a/metadata/md5-cache/media-sound/elisa-19.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kfilemetadata-5.60.0:5[taglib] >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 mpris? ( >=dev-qt/qtdbus-5.12.3:5 >=kde-frameworks/kdbusaddons-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Simple music player by KDE
-EAPI=7
-HOMEPAGE=https://community.kde.org/Elisa
-IUSE=mpris semantic-desktop vlc debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kfilemetadata-5.60.0:5[taglib] >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 mpris? ( >=dev-qt/qtdbus-5.12.3:5 >=kde-frameworks/kdbusaddons-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer] ) >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) test
-SLOT=5
-SRC_URI=mirror://kde/stable/release-service/19.12.1/src/elisa-19.12.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32929e9a3ebf3e780cdf9f3f54b95009
diff --git a/metadata/md5-cache/media-sound/elisa-19.12.2 b/metadata/md5-cache/media-sound/elisa-19.12.2
new file mode 100644
index 000000000000..294b72361edf
--- /dev/null
+++ b/metadata/md5-cache/media-sound/elisa-19.12.2
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kfilemetadata-5.60.0:5[taglib] >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 mpris? ( >=dev-qt/qtdbus-5.12.3:5 >=kde-frameworks/kdbusaddons-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer] ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Simple music player by KDE
+EAPI=7
+HOMEPAGE=https://community.kde.org/Elisa
+IUSE=mpris semantic-desktop vlc debug +handbook test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtmultimedia-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kfilemetadata-5.60.0:5[taglib] >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 mpris? ( >=dev-qt/qtdbus-5.12.3:5 >=kde-frameworks/kdbusaddons-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) vlc? ( media-video/vlc:= ) !vlc? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer] ) >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test ) test
+SLOT=5
+SRC_URI=mirror://kde/stable/release-service/19.12.2/src/elisa-19.12.2.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=32929e9a3ebf3e780cdf9f3f54b95009
diff --git a/metadata/md5-cache/media-sound/exaile-4.0.0 b/metadata/md5-cache/media-sound/exaile-4.0.0
deleted file mode 100644
index 7d59e8ac17a8..000000000000
--- a/metadata/md5-cache/media-sound/exaile-4.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( dev-util/intltool sys-devel/gettext )
-DEFINED_PHASES=compile install postinst postrm setup
-DESCRIPTION=GTK+ based media player aiming to be similar to Amarok
-EAPI=7
-HOMEPAGE=https://www.exaile.org/
-IUSE=cddb libnotify nls scrobbler +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2 GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/gst-python:1.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygobject-3.13.2:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=media-libs/gst-plugins-base-1.6:1.0 >=media-libs/gst-plugins-good-1.4:1.0 >=media-libs/mutagen-1.10[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-plugins/gst-plugins-meta:1.0 >=x11-libs/gtk+-3.10:3[introspection] cddb? ( dev-python/cddb-py ) libnotify? ( >=x11-libs/libnotify-0.7[introspection] ) scrobbler? ( dev-python/pylast[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/exaile/exaile/releases/download/4.0.0/exaile-4.0.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5c11b650d00e57371c21df2a5c08a08
diff --git a/metadata/md5-cache/media-sound/exaile-4.0.0-r1 b/metadata/md5-cache/media-sound/exaile-4.0.0-r1
new file mode 100644
index 000000000000..77e0532a27a3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/exaile-4.0.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( dev-util/intltool sys-devel/gettext )
+DEFINED_PHASES=compile install postinst postrm setup
+DESCRIPTION=GTK+ based media player aiming to be similar to Amarok
+EAPI=7
+HOMEPAGE=https://www.exaile.org/
+IUSE=cddb libnotify nls scrobbler +python_single_target_python2_7
+KEYWORDS=amd64 ~sparc x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=media-libs/gst-plugins-base-1.6:1.0 >=media-libs/gst-plugins-good-1.4:1.0 media-plugins/gst-plugins-meta:1.0 >=x11-libs/gtk+-3.10:3[introspection] cddb? ( dev-python/cddb-py ) libnotify? ( >=x11-libs/libnotify-0.7[introspection] ) python_single_target_python2_7? ( dev-python/bsddb3[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] dev-python/gst-python:1.0[python_targets_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)] >=dev-python/pygobject-3.13.2:3[python_targets_python2_7(-)] >=media-libs/mutagen-1.10[python_targets_python2_7(-)] scrobbler? ( dev-python/pylast[python_targets_python2_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/exaile/exaile/releases/download/4.0.0/exaile-4.0.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a27f37a895f7539b2acb4113ee312cb
diff --git a/metadata/md5-cache/media-sound/frescobaldi-3.0.0 b/metadata/md5-cache/media-sound/frescobaldi-3.0.0
index 5f284dce21f4..af547592030e 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aea0be6bfc7c9d3cb171419ea6655be0
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.32.2 b/metadata/md5-cache/media-sound/gnome-music-3.32.2
deleted file mode 100644
index 566d412e063e..000000000000
--- a/metadata/md5-cache/media-sound/gnome-music-3.32.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) net-libs/gnome-online-accounts[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.23.1:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] >=app-misc/tracker-1.99.1:=[introspection(+)] >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pycairo-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/grilo-0.3.4:0.3[introspection] >=media-plugins/grilo-plugins-0.3.8:0.3 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music management for Gnome
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Music
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) net-libs/gnome-online-accounts[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.23.1:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] >=app-misc/tracker-1.99.1:=[introspection(+)] >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pycairo-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/grilo-0.3.4:0.3[introspection] >=media-plugins/grilo-plugins-0.3.8:0.3 || ( >=app-misc/tracker-miners-1.99.1[gstreamer] >=app-misc/tracker-miners-1.99.1[ffmpeg] ) x11-libs/libnotify[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-music/3.32/gnome-music-3.32.2.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37da6ed59a4d5bffa7fb59311ae176d3
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.32.2-r1 b/metadata/md5-cache/media-sound/gnome-music-3.32.2-r1
new file mode 100644
index 000000000000..28886516d13b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gnome-music-3.32.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) net-libs/gnome-online-accounts[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.23.1:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] >=app-misc/tracker-1.99.1:=[introspection(+)] python_single_target_python3_6? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_6(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_7(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_7(-)] ) >=media-libs/grilo-0.3.4:0.3[introspection] >=media-plugins/grilo-plugins-0.3.8:0.3 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Music management for Gnome
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Music
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) net-libs/gnome-online-accounts[introspection] >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.23.1:3[introspection] >=dev-libs/libdazzle-3.28.0[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] >=app-misc/tracker-1.99.1:=[introspection(+)] python_single_target_python3_6? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_6(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.29.1:3[cairo,python_targets_python3_7(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_7(-)] ) >=media-libs/grilo-0.3.4:0.3[introspection] >=media-plugins/grilo-plugins-0.3.8:0.3 || ( >=app-misc/tracker-miners-1.99.1[gstreamer] >=app-misc/tracker-miners-1.99.1[ffmpeg] ) x11-libs/libnotify[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-music/3.32/gnome-music-3.32.2.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=771ca18545ab0303bd5a568e71070eda
diff --git a/metadata/md5-cache/media-sound/gnump3d-3.0-r2 b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
index 153d278c1dd5..8ebfae52dcf6 100644
--- a/metadata/md5-cache/media-sound/gnump3d-3.0-r2
+++ b/metadata/md5-cache/media-sound/gnump3d-3.0-r2
@@ -10,5 +10,5 @@ RDEPEND=sox? ( media-sound/sox ) dev-lang/perl:=[-build(-)]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://savannah.gnu.org/download/gnump3d/gnump3d-3.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=71a45cd955a20a7b88b747f8767cacce
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.5 b/metadata/md5-cache/media-sound/gpodder-3.10.5
deleted file mode 100644
index 3d900e17bcdc..000000000000
--- a/metadata/md5-cache/media-sound/gpodder-3.10.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/isort[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/podcastparser-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/mygpoclient-1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) dev-util/desktop-file-utils dev-util/intltool sys-apps/help2man test? ( dev-python/minimock dev-python/coverage ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=A free cross-platform podcast aggregator
-EAPI=6
-HOMEPAGE=https://gpodder.github.io/
-IUSE=+dbus bluetooth kernel_linux mtp test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=dev-python/html5lib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/isort[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/podcastparser-0.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/mygpoclient-1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.5.tar.gz -> gpodder-3.10.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b85ff78b2563a9fb77e615dd2d50c4fa
diff --git a/metadata/md5-cache/media-sound/gpodder-3.10.5-r1 b/metadata/md5-cache/media-sound/gpodder-3.10.5-r1
new file mode 100644
index 000000000000..3e2d76276eef
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gpodder-3.10.5-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/html5lib[python_targets_python3_6(-)] dev-python/isort[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_6(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_6(-)] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/html5lib[python_targets_python3_7(-)] dev-python/isort[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_7(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_7(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_7(-)] dbus? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) dev-util/desktop-file-utils dev-util/intltool sys-apps/help2man test? ( dev-python/minimock dev-python/coverage ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DESCRIPTION=A free cross-platform podcast aggregator
+EAPI=6
+HOMEPAGE=https://gpodder.github.io/
+IUSE=+dbus bluetooth kernel_linux mtp test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-python/html5lib[python_targets_python3_6(-)] dev-python/isort[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_6(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_6(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_6(-)] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/html5lib[python_targets_python3_7(-)] dev-python/isort[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] >=dev-python/pygobject-3.22.0:3[python_targets_python3_7(-)] >=dev-python/podcastparser-0.6.0[python_targets_python3_7(-)] >=dev-python/mygpoclient-1.8[python_targets_python3_7(-)] dbus? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) bluetooth? ( net-wireless/bluez ) mtp? ( >=media-libs/libmtp-1.0.0:= ) kernel_linux? ( sys-apps/iproute2 ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/gpodder/gpodder/archive/3.10.5.tar.gz -> gpodder-3.10.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a41c3366a69af7134933cea81b71f2e8
diff --git a/metadata/md5-cache/media-sound/grip-3.9.0-r1 b/metadata/md5-cache/media-sound/grip-3.9.0-r1
deleted file mode 100644
index 0411a53bb658..000000000000
--- a/metadata/md5-cache/media-sound/grip-3.9.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure
-DEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext virtual/pkgconfig
-DESCRIPTION=GTK+ based Audio CD Player/Ripper
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/grip/
-IUSE=vorbis
-KEYWORDS=~alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango x11-libs/vte:0 vorbis? ( media-sound/vorbis-tools )
-SLOT=0
-SRC_URI=mirror://sourceforge/grip/grip-3.9.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8f4dab97a38f79cb164681f9f8f9ea1a
diff --git a/metadata/md5-cache/media-sound/grip-4.0.1-r1 b/metadata/md5-cache/media-sound/grip-4.0.1-r1
index 80cac5b982e4..88527fa0cb8c 100644
--- a/metadata/md5-cache/media-sound/grip-4.0.1-r1
+++ b/metadata/md5-cache/media-sound/grip-4.0.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=GTK+ based Audio CD Player/Ripper
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/grip/
 IUSE=vorbis
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gnome-base/libgnome >=gnome-base/libgnomeui-2.2.0 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools )
 SLOT=0
 SRC_URI=mirror://sourceforge/grip/grip-4.0.1.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=08a7465216dca2afb2b0ddc9b495a6ac
+_md5_=8715cae54cd81d3bacb2a49a91e80184
diff --git a/metadata/md5-cache/media-sound/grip-4.1.0 b/metadata/md5-cache/media-sound/grip-4.1.0
new file mode 100644
index 000000000000..136b423ed99b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/grip-4.1.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools ) sys-devel/gettext
+DESCRIPTION=GTK+ based Audio CD Player/Ripper
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/grip/
+IUSE=vorbis
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=media-libs/id3lib-3.8.3 media-sound/cdparanoia media-sound/lame net-misc/curl >=x11-libs/gtk+-2.2:2 x11-libs/libX11 x11-libs/pango vorbis? ( media-sound/vorbis-tools )
+SLOT=0
+SRC_URI=mirror://sourceforge/grip/grip-4.1.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1b16b99ed2ce20b9fdf8d0bfe3cf599c
diff --git a/metadata/md5-cache/media-sound/gst123-0.3.4 b/metadata/md5-cache/media-sound/gst123-0.3.4
deleted file mode 100644
index 7ae67634adb7..000000000000
--- a/metadata/md5-cache/media-sound/gst123-0.3.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/glib:2 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 sys-libs/ncurses:0= x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
-DESCRIPTION=A GStreamer based command line media player
-EAPI=6
-HOMEPAGE=http://space.twc.de/~stefan/gst123.php
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 media-libs/gst-plugins-base:1.0 media-libs/gstreamer:1.0 sys-libs/ncurses:0= x11-libs/gtk+:2 x11-libs/libX11 media-plugins/gst-plugins-meta:1.0
-SLOT=0
-SRC_URI=http://space.twc.de/~stefan/gst123/gst123-0.3.4.tar.bz2
-_md5_=aa848caa83c1c1d09a1a8343ce37d3de
diff --git a/metadata/md5-cache/media-sound/gtkguitune-0.8 b/metadata/md5-cache/media-sound/gtkguitune-0.8
index ef6d4b73b1dd..b1663757e572 100644
--- a/metadata/md5-cache/media-sound/gtkguitune-0.8
+++ b/metadata/md5-cache/media-sound/gtkguitune-0.8
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm preinst prepare
 DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/libsigc++:2 virtual/pkgconfig
 DESCRIPTION=A guitar tuning program that uses Schmitt-triggering for quick feedback
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bba2c616b9295c148ab0a9dd61befe02
+_md5_=4298e7b81f1b6f8f18642b23fe9432a2
diff --git a/metadata/md5-cache/media-sound/gtklick-0.6.4-r1 b/metadata/md5-cache/media-sound/gtklick-0.6.4-r1
index feb50d3ef3f0..d22b2fa0d2ff 100644
--- a/metadata/md5-cache/media-sound/gtklick-0.6.4-r1
+++ b/metadata/md5-cache/media-sound/gtklick-0.6.4-r1
@@ -11,5 +11,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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=377d1b75657f03395ef7f16dfdaabb9e
diff --git a/metadata/md5-cache/media-sound/jack-3.1.1-r2 b/metadata/md5-cache/media-sound/jack-3.1.1-r2
deleted file mode 100644
index 2c6fab2920da..000000000000
--- a/metadata/md5-cache/media-sound/jack-3.1.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A frontend for several cd-rippers and mp3 encoders
-EAPI=6
-HOMEPAGE=http://www.home.unix-ag.org/arne/jack/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/cddb-py[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/id3-py[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyid3lib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyvorbis[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/flac media-sound/lame media-sound/cdparanoia python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.home.unix-ag.org/arne/jack/jack-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=71eff5b2834df4110b6e92ee861c9375
diff --git a/metadata/md5-cache/media-sound/jack-3.1.1-r3 b/metadata/md5-cache/media-sound/jack-3.1.1-r3
new file mode 100644
index 000000000000..e79d9c474448
--- /dev/null
+++ b/metadata/md5-cache/media-sound/jack-3.1.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A frontend for several cd-rippers and mp3 encoders
+EAPI=6
+HOMEPAGE=http://www.home.unix-ag.org/arne/jack/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( dev-python/cddb-py[python_targets_python2_7(-)] dev-python/id3-py[python_targets_python2_7(-)] dev-python/pyid3lib[python_targets_python2_7(-)] dev-python/pyvorbis[python_targets_python2_7(-)] ) media-libs/flac media-sound/lame media-sound/cdparanoia python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://www.home.unix-ag.org/arne/jack/jack-3.1.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3e9ad5d4dea42d03b2506e82c6a8279
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.13-r1 b/metadata/md5-cache/media-sound/jack2-1.9.13-r1
deleted file mode 100644
index 67b4a7f0e256..000000000000
--- a/metadata/md5-cache/media-sound/jack2-1.9.13-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Jackdmp jack implemention for multi-processor machine
-EAPI=6
-HOMEPAGE=http://jackaudio.org/
-IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
-REQUIRED_USE=^^ ( 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 ) || ( classic dbus )
-SLOT=2
-SRC_URI=https://github.com/jackaudio/jack2/releases/download/v1.9.13/jack2-1.9.13.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=19a3a635ec547a1fff4bb3e65f845304
diff --git a/metadata/md5-cache/media-sound/jack2-1.9.13-r2 b/metadata/md5-cache/media-sound/jack2-1.9.13-r2
new file mode 100644
index 000000000000..88e3ace6dec5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/jack2-1.9.13-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Jackdmp jack implemention for multi-processor machine
+EAPI=6
+HOMEPAGE=http://jackaudio.org/
+IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) || ( classic dbus )
+SLOT=2
+SRC_URI=https://github.com/jackaudio/jack2/releases/download/v1.9.13/jack2-1.9.13.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=b3de115a89375061b4fa6e8bce6b1777
diff --git a/metadata/md5-cache/media-sound/jack2-9999 b/metadata/md5-cache/media-sound/jack2-9999
index b9ea0bbc7cf9..b5738648ec53 100644
--- a/metadata/md5-cache/media-sound/jack2-9999
+++ b/metadata/md5-cache/media-sound/jack2-9999
@@ -3,11 +3,11 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-l
 DESCRIPTION=Jackdmp jack implemention for multi-processor machine
 EAPI=6
 HOMEPAGE=http://jackaudio.org/
-IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam readline sndfile python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
-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 ) || ( classic dbus )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) media-libs/libsamplerate media-libs/libsndfile sys-libs/readline:0= alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( media-libs/libffado:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metadata? ( sys-libs/db:* ) opus? ( media-libs/opus[custom-modes,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) pam? ( sys-auth/realtime-base ) !media-sound/jack-audio-connection-kit:0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) || ( classic dbus )
 SLOT=2
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=a57fe710094afe8db62475152b799281
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=90dc93af423c9e90d1a1d4c1a55b0374
diff --git a/metadata/md5-cache/media-sound/klick-0.12.2-r2 b/metadata/md5-cache/media-sound/klick-0.12.2-r2
index 85cb1501aa34..e9957a3ec47f 100644
--- a/metadata/md5-cache/media-sound/klick-0.12.2-r2
+++ b/metadata/md5-cache/media-sound/klick-0.12.2-r2
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+BDEPEND=virtual/pkgconfig || ( ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DEFINED_PHASES=compile configure install setup
 DEPEND=media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) dev-libs/boost
 DESCRIPTION=An advanced command-line based metronome for JACK
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband )
 SLOT=0
 SRC_URI=http://das.nasophon.de/download/klick-0.12.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8e0c4aaa8fd6af8f52b5022cecc36f0c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=03e93940d64b420236044d7a75339425
diff --git a/metadata/md5-cache/media-sound/lash-0.5.4-r3 b/metadata/md5-cache/media-sound/lash-0.5.4-r3
index 63351764eede..e86af6f59e80 100644
--- a/metadata/md5-cache/media-sound/lash-0.5.4-r3
+++ b/metadata/md5-cache/media-sound/lash-0.5.4-r3
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxml2 virtual/jack >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(
 DESCRIPTION=LASH Audio Session Handler
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/lash/
-IUSE=alsa debug gtk python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa debug gtk python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 virtual/jack >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) || ( sys-libs/readline dev-libs/libedit )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://nongnu/lash/lash-0.5.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4c2da613f3d2df8d81e2d80041676f66
diff --git a/metadata/md5-cache/media-sound/lilycomp-1.0.2-r2 b/metadata/md5-cache/media-sound/lilycomp-1.0.2-r2
index 38e8cd3175e0..688deb59f6b6 100644
--- a/metadata/md5-cache/media-sound/lilycomp-1.0.2-r2
+++ b/metadata/md5-cache/media-sound/lilycomp-1.0.2-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=de
 DESCRIPTION=graphical note entry program for use with LilyPond
 EAPI=6
 HOMEPAGE=http://lilycomp.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/lilycomp/lilycomp.1.0.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=804f908c430afd94cff1ec07d3e1d405
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 6e432c8e6ad8..fbf1322a5d5c 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.18.2-r3
+++ b/metadata/md5-cache/media-sound/lilypond-2.18.2-r3
@@ -3,13 +3,13 @@ DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,re
 DESCRIPTION=GNU Music Typesetter
 EAPI=6
 HOMEPAGE=http://lilypond.org/
-IUSE=debug emacs profile vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug emacs profile vim-syntax +python_single_target_python2_7
 KEYWORDS=amd64 ~arm ~hppa x86
 LICENSE=GPL-3 FDL-1.3
 RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] <dev-scheme/guile-2.0:12 media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( >=app-editors/emacs-23.1:* ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6db0531a2e896e91e2d04de685b42fb
diff --git a/metadata/md5-cache/media-sound/lilypond-2.19.83 b/metadata/md5-cache/media-sound/lilypond-2.19.83
index 9be2fb9424e3..92cad3371de6 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.19.83
+++ b/metadata/md5-cache/media-sound/lilypond-2.19.83
@@ -4,13 +4,13 @@ DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12=[deprecated,r
 DESCRIPTION=GNU Music Typesetter
 EAPI=7
 HOMEPAGE=http://lilypond.org/
-IUSE=debug emacs guile2 profile vim-syntax +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug emacs guile2 profile vim-syntax +python_single_target_python2_7
 KEYWORDS=amd64 ~arm arm64 ~hppa x86
 LICENSE=GPL-3 FDL-1.3
 RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( >=app-editors/emacs-23.1:* ) guile2? ( >=dev-scheme/guile-2:12 ) !guile2? ( >=dev-scheme/guile-1.8.2:12=[deprecated,regex] <dev-scheme/guile-2.0:12 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://lilypond.org/download/sources/v2.19/lilypond-2.19.83.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=18fcab7a12516ed8d72ea2633db92835
diff --git a/metadata/md5-cache/media-sound/lilypond-9999 b/metadata/md5-cache/media-sound/lilypond-9999
index 080582cbcfa8..967d69ea8d76 100644
--- a/metadata/md5-cache/media-sound/lilypond-9999
+++ b/metadata/md5-cache/media-sound/lilypond-9999
@@ -4,12 +4,12 @@ DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,re
 DESCRIPTION=GNU Music Typesetter
 EAPI=7
 HOMEPAGE=http://lilypond.org/
-IUSE=debug emacs guile2 profile vim-syntax python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug emacs guile2 profile vim-syntax python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3 FDL-1.3
 PROPERTIES=live
 RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( >=app-editors/emacs-23.1:* ) guile2? ( >=dev-scheme/guile-2:12 ) !guile2? ( >=dev-scheme/guile-1.8.2:12[deprecated,regex] <dev-scheme/guile-2.0:12 ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dd65be0ab1c4bd8ae215c1ad8a10a4ca
diff --git a/metadata/md5-cache/media-sound/lyvi-2.0.0 b/metadata/md5-cache/media-sound/lyvi-2.0.0
index 6f37d1d4a14c..6a1ebe387aba 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_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12261eee5afe802fd40b72e8b2b33ff7
diff --git a/metadata/md5-cache/media-sound/marrie-0.4 b/metadata/md5-cache/media-sound/marrie-0.4
index 0388b81e377a..9b88dd3d7776 100644
--- a/metadata/md5-cache/media-sound/marrie-0.4
+++ b/metadata/md5-cache/media-sound/marrie-0.4
@@ -11,5 +11,5 @@ RDEPEND=dev-python/feedparser[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/m/marrie/marrie-0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec7525130d1c1dc9f999a36c4ab9319c
diff --git a/metadata/md5-cache/media-sound/marrie-9999 b/metadata/md5-cache/media-sound/marrie-9999
index 46031fadb29e..fd9d41cf34b7 100644
--- a/metadata/md5-cache/media-sound/marrie-9999
+++ b/metadata/md5-cache/media-sound/marrie-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/feedparser[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec7525130d1c1dc9f999a36c4ab9319c
diff --git a/metadata/md5-cache/media-sound/mixxx-2.1.8 b/metadata/md5-cache/media-sound/mixxx-2.1.8
index a59574c1e3dd..6460b38e23b0 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.1.8
+++ b/metadata/md5-cache/media-sound/mixxx-2.1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/release-2.1.8.tar.gz -> mixxx-2.1.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=88b1b88871d94ad02f44af2f511b845b
diff --git a/metadata/md5-cache/media-sound/mixxx-2.2.2 b/metadata/md5-cache/media-sound/mixxx-2.2.2
index 4a592456f743..6f2d20d2a6de 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.2.2
+++ b/metadata/md5-cache/media-sound/mixxx-2.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/release-2.2.2.tar.gz -> mixxx-2.2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=acab917263878db98fae608fcf8d9d52
diff --git a/metadata/md5-cache/media-sound/mixxx-2.2.3-r1 b/metadata/md5-cache/media-sound/mixxx-2.2.3-r1
index cc72fb35b84c..04bef851c2c9 100644
--- a/metadata/md5-cache/media-sound/mixxx-2.2.3-r1
+++ b/metadata/md5-cache/media-sound/mixxx-2.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
 SLOT=0
 SRC_URI=https://github.com/mixxxdj/mixxx/archive/release-2.2.3.tar.gz -> mixxx-2.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9665877ac0d2bf340eb3486018e02134
diff --git a/metadata/md5-cache/media-sound/mixxx-9999 b/metadata/md5-cache/media-sound/mixxx-9999
index 1f9e7e482930..3e6f075c6931 100644
--- a/metadata/md5-cache/media-sound/mixxx-9999
+++ b/metadata/md5-cache/media-sound/mixxx-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-db/sqlite dev-libs/glib:2 dev-libs/protobuf:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtscript:5[scripttools] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint media-libs/flac media-libs/libid3tag media-libs/libogg media-libs/libsndfile >=media-libs/libsoundtouch-1.5 media-libs/libvorbis >=media-libs/portaudio-19_pre media-libs/portmidi media-libs/rubberband media-libs/taglib media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower virtual/libusb:1 virtual/opengl x11-libs/libX11 aac? ( media-libs/faad2 media-libs/libmp4v2:0 ) hid? ( dev-libs/hidapi ) lv2? ( >=media-libs/lilv-0.24.2-r3 ) mp3? ( media-libs/libmad ) mp4? ( media-libs/libmp4v2:= ) opus? ( media-libs/opusfile ) shout? ( media-libs/libshout ) wavpack? ( media-sound/wavpack ) ffmpeg? ( media-video/ffmpeg:0= )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d706aed7b76bc9d76b390df9ec5e0871
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 27a4f719a246..6e724632df2a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1cfac9be09beebc38461e9b39a03119b
diff --git a/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r1 b/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r1
index c7b0eb052371..ab23a6fabe08 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r1
+++ b/metadata/md5-cache/media-sound/mps-youtube-0.2.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pafy[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mps-youtube/mps-youtube-0.2.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe4bd76f5e9f352e24218c7b2e96820d
diff --git a/metadata/md5-cache/media-sound/mps-youtube-9999 b/metadata/md5-cache/media-sound/mps-youtube-9999
index ce94b24a1206..5a0d78c3b029 100644
--- a/metadata/md5-cache/media-sound/mps-youtube-9999
+++ b/metadata/md5-cache/media-sound/mps-youtube-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pafy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/ffmpeg || ( media-video/mpv media-video/mplayer ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe4bd76f5e9f352e24218c7b2e96820d
diff --git a/metadata/md5-cache/media-sound/musescore-3.3 b/metadata/md5-cache/media-sound/musescore-3.3
deleted file mode 100644
index 688352dd3705..000000000000
--- a/metadata/md5-cache/media-sound/musescore-3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=WYSIWYG Music Score Typesetter
-EAPI=7
-HOMEPAGE=https://musescore.org/
-IUSE=alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-REQUIRED_USE=portmidi? ( portaudio )
-SLOT=0
-SRC_URI=https://github.com/musescore/MuseScore/archive/v3.3.tar.gz -> musescore-3.3.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=af433292478b9a3e509ecb14aa8e5376
diff --git a/metadata/md5-cache/media-sound/musescore-3.3.4 b/metadata/md5-cache/media-sound/musescore-3.3.4
index a6341e4c8ad0..884bb99ba350 100644
--- a/metadata/md5-cache/media-sound/musescore-3.3.4
+++ b/metadata/md5-cache/media-sound/musescore-3.3.4
@@ -1,15 +1,15 @@
 BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=WYSIWYG Music Score Typesetter
 EAPI=7
 HOMEPAGE=https://musescore.org/
-IUSE=alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine
-KEYWORDS=~amd64 ~x86
+IUSE=alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
 REQUIRED_USE=portmidi? ( portaudio )
 SLOT=0
 SRC_URI=https://github.com/musescore/MuseScore/archive/v3.3.4.tar.gz -> musescore-3.3.4.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bd97ac964af2da589c24b8ed5626237
+_md5_=b2a393bb74ff0fe52b3bb8bd00aebd14
diff --git a/metadata/md5-cache/media-sound/musescore-3.4.2 b/metadata/md5-cache/media-sound/musescore-3.4.2
new file mode 100644
index 000000000000..eb657e43d10f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/musescore-3.4.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=WYSIWYG Music Score Typesetter
+EAPI=7
+HOMEPAGE=https://musescore.org/
+IUSE=alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtquickcontrols2:5 >=dev-qt/qtsingleapplication-2.6.1_p20171024 dev-qt/qtsvg:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 >=media-libs/freetype-2.5.2 media-libs/libsndfile sys-libs/zlib:= alsa? ( >=media-libs/alsa-lib-1.0.0 ) jack? ( virtual/jack ) mp3? ( media-sound/lame ) omr? ( app-text/poppler ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) sf3? ( media-libs/libvorbis ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+REQUIRED_USE=portmidi? ( portaudio )
+SLOT=0
+SRC_URI=https://github.com/musescore/MuseScore/archive/v3.4.2.tar.gz -> musescore-3.4.2.tar.gz https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=810791ff3a40a2cf7b57db8d490b076d
diff --git a/metadata/md5-cache/media-sound/picard-2.1.3 b/metadata/md5-cache/media-sound/picard-2.1.3
deleted file mode 100644
index 941f87fd5e24..000000000000
--- a/metadata/md5-cache/media-sound/picard-2.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=nls? ( dev-qt/linguist-tools:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Cross-platform music tagger
-EAPI=7
-HOMEPAGE=https://picard.musicbrainz.org
-IUSE=nls python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-qt/qtgui:5 >=media-libs/mutagen-1.38 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ff3e3562b34b66340f64d5556535a48
diff --git a/metadata/md5-cache/media-sound/picard-2.1.3-r1 b/metadata/md5-cache/media-sound/picard-2.1.3-r1
new file mode 100644
index 000000000000..be3deb9f7d9f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/picard-2.1.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=nls? ( dev-qt/linguist-tools:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cross-platform music tagger
+EAPI=7
+HOMEPAGE=https://picard.musicbrainz.org
+IUSE=nls python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_7(-)] ) dev-qt/qtgui:5 >=media-libs/mutagen-1.38 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.1.3.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=536f5ddc5b13265a6619371e8bd6e0ec
diff --git a/metadata/md5-cache/media-sound/picard-9999 b/metadata/md5-cache/media-sound/picard-9999
index 28bc445737cb..7a1f64b9c989 100644
--- a/metadata/md5-cache/media-sound/picard-9999
+++ b/metadata/md5-cache/media-sound/picard-9999
@@ -1,15 +1,15 @@
-BDEPEND=nls? ( dev-qt/linguist-tools:5 ) >=dev-vcs/git-1.8.2.1[curl] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+BDEPEND=nls? ( dev-qt/linguist-tools:5 ) >=dev-vcs/git-1.8.2.1[curl] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A cross-platform music tagger
 EAPI=7
 HOMEPAGE=https://picard.musicbrainz.org
-IUSE=nls python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=nls python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-qt/qtgui:5[accessibility] >=media-libs/mutagen-1.38 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_7(-)] ) dev-qt/qtgui:5[accessibility] >=media-libs/mutagen-1.38 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=31f5a912f52a9f0c392156c5b290bf4e
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9ccbe57296f3769d60c6c1a2a75fe7ab
diff --git a/metadata/md5-cache/media-sound/positron-1.1-r1 b/metadata/md5-cache/media-sound/positron-1.1-r1
index d3de23baf3c4..69d0517181a0 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4ca00c76add2adff13f2ca8f87818ae
diff --git a/metadata/md5-cache/media-sound/pulseaudio-13.0 b/metadata/md5-cache/media-sound/pulseaudio-13.0
index 10081b996e01..1f7d7b8b290f 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-13.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-13.0
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( elogind systemd ) bluetooth? ( dbus ) equalizer? ( dbus ) ofon
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-13.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c91d93cb0270e623443fb801111656ff
diff --git a/metadata/md5-cache/media-sound/pulsemixer-1.5.0 b/metadata/md5-cache/media-sound/pulsemixer-1.5.0
index fa698fd244cd..1cbbb73f1432 100644
--- a/metadata/md5-cache/media-sound/pulsemixer-1.5.0
+++ b/metadata/md5-cache/media-sound/pulsemixer-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=media-sound/pulseaudio python_targets_python3_6? ( dev-lang/python:3.6[n
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/GeorgeFilipkin/pulsemixer/archive/1.5.0.tar.gz -> pulsemixer-1.5.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d3dd0934aece42a7a12b22767a6fe83d
diff --git a/metadata/md5-cache/media-sound/pulsemixer-9999 b/metadata/md5-cache/media-sound/pulsemixer-9999
index 45e5eefd671e..d7adfac19257 100644
--- a/metadata/md5-cache/media-sound/pulsemixer-9999
+++ b/metadata/md5-cache/media-sound/pulsemixer-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=media-sound/pulseaudio python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) python_targets_python3_7? ( dev-lang/python:3.7[ncurses] ) python_targets_python3_8? ( dev-lang/python:3.8[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d3dd0934aece42a7a12b22767a6fe83d
diff --git a/metadata/md5-cache/media-sound/pympd-0.08.1-r1 b/metadata/md5-cache/media-sound/pympd-0.08.1-r1
deleted file mode 100644
index b129ca6fae40..000000000000
--- a/metadata/md5-cache/media-sound/pympd-0.08.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.6:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2[jpeg] x11-themes/adwaita-icon-theme virtual/pkgconfig
-DESCRIPTION=a Rhythmbox-like PyGTK+ client for Music Player Daemon
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/pympd
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.6:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2[jpeg] x11-themes/adwaita-icon-theme
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pympd/pympd-0.08.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8114b90ecb3d184687dc47e9ff6b06af
diff --git a/metadata/md5-cache/media-sound/pympd-0.08.1-r2 b/metadata/md5-cache/media-sound/pympd-0.08.1-r2
new file mode 100644
index 000000000000..648b740214b8
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pympd-0.08.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_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/pygtk-2.6:2[python_targets_python2_7(-)] ) gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2[jpeg] x11-themes/adwaita-icon-theme virtual/pkgconfig
+DESCRIPTION=a Rhythmbox-like PyGTK+ client for Music Player Daemon
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/pympd
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ~ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/pygtk-2.6:2[python_targets_python2_7(-)] ) gnome-base/libglade:2.0 x11-libs/gdk-pixbuf:2[jpeg] x11-themes/adwaita-icon-theme
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/pympd/pympd-0.08.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7dc73f90bef55719ce7f16360198a056
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.1.0 b/metadata/md5-cache/media-sound/quodlibet-4.1.0
index 2b6d356f9542..54d7d226a4e2 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aa14116ef8c5e604a1f7ecc6b8084e57
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.2.0 b/metadata/md5-cache/media-sound/quodlibet-4.2.0
index 8cd0b2d6ec6c..4998ccdde371 100644
--- a/metadata/md5-cache/media-sound/quodlibet-4.2.0
+++ b/metadata/md5-cache/media-sound/quodlibet-4.2.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.2.0.tar.gz -> quodlibet-4.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b91c6d21d110b93deca5bff1cd9dc59e
diff --git a/metadata/md5-cache/media-sound/quodlibet-4.2.1 b/metadata/md5-cache/media-sound/quodlibet-4.2.1
index d554a856d942..cd5ee64e63cc 100644
--- a/metadata/md5-cache/media-sound/quodlibet-4.2.1
+++ b/metadata/md5-cache/media-sound/quodlibet-4.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/keybinder:3[introspection] dev-python/feedparser[python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/quodlibet/quodlibet/archive/release-4.2.1.tar.gz -> quodlibet-4.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dee20d428661f6bb23cb9a90bffbd0fc
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 88c6fa230564..6a891b75b67e 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d439f84314d6fa1fb94deaad67eb0d7
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.3 b/metadata/md5-cache/media-sound/rhythmbox-3.4.3
deleted file mode 100644
index 1aa3de18ea6c..000000000000
--- a/metadata/md5-cache/media-sound/rhythmbox-3.4.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Music management and playback software for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
-IUSE=cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-0.7.3[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] net-libs/libsoup:2.4[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) ) upnp-av? ( >=media-libs/grilo-0.3:0.3 >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
-REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.3.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=418f9b9a92cc2d2cabdf4c15f4777a60
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.3-r1 b/metadata/md5-cache/media-sound/rhythmbox-3.4.3-r1
new file mode 100644
index 000000000000..c857a6d65ec5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig test? ( dev-libs/check ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Music management and playback software for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
+IUSE=cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.7.8:2 >=x11-libs/gtk+-3.20.0:3[X,introspection] >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/gobject-introspection-0.10:= >=dev-libs/libpeas-0.7.3[gtk] >=dev-libs/totem-pl-parser-3.2 >=net-libs/libsoup-2.42:2.4 >=media-libs/gst-plugins-base-1.4:1.0[introspection] >=media-libs/gstreamer-1.4:1.0[introspection] >=sys-libs/tdb-1.2.6 dev-libs/json-glib cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-2.9.19:3.0 >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-0.7.3[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] net-libs/libsoup:2.4[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) ) upnp-av? ( >=media-libs/grilo-0.3:0.3 >=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3feb2370361dbcad01b8505925a628d4
diff --git a/metadata/md5-cache/media-sound/rplay-3.3.2-r3 b/metadata/md5-cache/media-sound/rplay-3.3.2-r3
index 13ee9f1855c2..82e8c1d484b8 100644
--- a/metadata/md5-cache/media-sound/rplay-3.3.2-r3
+++ b/metadata/md5-cache/media-sound/rplay-3.3.2-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-sound/gsm
 SLOT=0
 SRC_URI=http://rplay.doit.org/dist/rplay-3.3.2.tar.gz mirror://debian/pool/main/r/rplay/rplay_3.3.2-16.debian.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6a7b93142872657f9f67fee2b5348819
diff --git a/metadata/md5-cache/media-sound/snapcast-0.15.0-r1 b/metadata/md5-cache/media-sound/snapcast-0.15.0-r1
index 07348f1e5ea7..f5c46fc55de0 100644
--- a/metadata/md5-cache/media-sound/snapcast-0.15.0-r1
+++ b/metadata/md5-cache/media-sound/snapcast-0.15.0-r1
@@ -10,5 +10,5 @@ RDEPEND=client? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) tremor? ( medi
 REQUIRED_USE=|| ( server client )
 SLOT=0
 SRC_URI=https://github.com/badaix/snapcast/archive/v0.15.0.tar.gz -> snapcast-0.15.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f616357f1e9c79dba49c713a71ea65b1
diff --git a/metadata/md5-cache/media-sound/snapcast-9999 b/metadata/md5-cache/media-sound/snapcast-9999
index d51d39374753..08dc3f51b480 100644
--- a/metadata/md5-cache/media-sound/snapcast-9999
+++ b/metadata/md5-cache/media-sound/snapcast-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=client? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) tremor? ( media-libs/tremor ) vorbis? ( media-libs/libvorbis ) zeroconf? ( net-dns/avahi[dbus] )
 REQUIRED_USE=|| ( server client )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61385581428b897ce6be1b4526dad008
diff --git a/metadata/md5-cache/media-sound/solfege-3.22.2 b/metadata/md5-cache/media-sound/solfege-3.22.2
index 480c3eded8fc..ee5004591450 100644
--- a/metadata/md5-cache/media-sound/solfege-3.22.2
+++ b/metadata/md5-cache/media-sound/solfege-3.22.2
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite]
 DESCRIPTION=GNU Solfege is a program written to help you practice ear training
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/solfege/
-IUSE=alsa oss +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa oss +python_single_target_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/pygtk-2.12 gnome-base/librsvg alsa? ( dev-python/pyalsa ) !oss? ( media-sound/timidity++ )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/solfege/solfege-3.22.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ef4d9da321ed1eee705ea5d6cc822ca4
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 931e44f68d1e..561e3ed175b2 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
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+BDEPEND=virtual/pkgconfig python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-python/pygtk-2.12:2 x11-libs/gdk-pixbuf:2[jpeg] >=dev-python/python-mpd-0.2.1 dbus? ( dev-python/dbus-python ) lyrics? ( dev-python/zsi ) taglib? ( >=dev-python/tagpy-0.93 )
 DESCRIPTION=Elegant GTK+ music client for the Music Player Daemon (MPD)
 EAPI=7
 HOMEPAGE=https://www.nongnu.org/sonata/
-IUSE=dbus lyrics taglib +python_targets_python2_7 +python_single_target_python2_7
+IUSE=dbus lyrics taglib +python_single_target_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=>=dev-python/pygtk-2.12:2 x11-libs/gdk-pixbuf:2[jpeg] >=dev-python/python-mpd-0.2.1 dbus? ( dev-python/dbus-python ) lyrics? ( dev-python/zsi ) taglib? ( >=dev-python/tagpy-0.93 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/sonata-1.6.2.1.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6864cbd5587aeeea5cfb066db7c85aae
diff --git a/metadata/md5-cache/media-sound/soundconverter-3.0.2 b/metadata/md5-cache/media-sound/soundconverter-3.0.2
deleted file mode 100644
index 18339cb032b5..000000000000
--- a/metadata/md5-cache/media-sound/soundconverter-3.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/gobject-introspection:= x11-libs/gtk+:3[introspection] media-libs/gstreamer:1.0[introspection] dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A simple audiofile converter application for the GNOME environment
-EAPI=6
-HOMEPAGE=https://soundconverter.org/
-IUSE=aac flac libnotify mp3 ogg opus vorbis +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/gobject-introspection:= x11-libs/gtk+:3[introspection] media-libs/gstreamer:1.0[introspection] x11-libs/pango[introspection] dev-python/gst-python:1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] libnotify? ( x11-libs/libnotify[introspection] ) media-libs/gst-plugins-base:1.0[vorbis?,ogg?] media-plugins/gst-plugins-meta:1.0 flac? ( media-plugins/gst-plugins-flac:1.0 ) media-libs/gst-plugins-good:1.0 mp3? ( media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-lame:1.0 ) aac? ( media-plugins/gst-plugins-faac:1.0 ) opus? ( media-plugins/gst-plugins-opus:1.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/soundconverter/trunk/3.0.2/+download/soundconverter-3.0.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a47c8b6da5cc5e838f1836c8c305ce5
diff --git a/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1 b/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
new file mode 100644
index 000000000000..15bc63ea43f1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/soundconverter-3.0.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/gobject-introspection:= x11-libs/gtk+:3[introspection] media-libs/gstreamer:1.0[introspection] dev-util/intltool sys-devel/gettext >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A simple audiofile converter application for the GNOME environment
+EAPI=6
+HOMEPAGE=https://soundconverter.org/
+IUSE=aac flac libnotify mp3 ogg opus vorbis +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/gobject-introspection:= x11-libs/gtk+:3[introspection] media-libs/gstreamer:1.0[introspection] x11-libs/pango[introspection] python_single_target_python3_6? ( dev-python/gst-python:1.0[python_targets_python3_6(-)] ) libnotify? ( x11-libs/libnotify[introspection] ) media-libs/gst-plugins-base:1.0[vorbis?,ogg?] media-plugins/gst-plugins-meta:1.0 flac? ( media-plugins/gst-plugins-flac:1.0 ) media-libs/gst-plugins-good:1.0 mp3? ( media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-lame:1.0 ) aac? ( media-plugins/gst-plugins-faac:1.0 ) opus? ( media-plugins/gst-plugins-opus:1.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://launchpad.net/soundconverter/trunk/3.0.2/+download/soundconverter-3.0.2.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a9bc465ce06762ecb2834651294fb42e
diff --git a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r1 b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r1
index 20af626dd455..0725931a0480 100644
--- a/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r1
+++ b/metadata/md5-cache/media-sound/subsonic-bin-5.2.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/jre lame? ( media-sound/lame ) ffmpeg? ( virtual/ffmpeg ) selinux? ( sec-policy/selinux-subsonic )
 SLOT=0
 SRC_URI=mirror://sourceforge/subsonic/5.2.1/subsonic-5.2.1-standalone.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=362375aed4e31924d2d90ed79331590a
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 a26109d838ed..8f00fa0278a4 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cab6fbeff718cbe465cee6fd456b83c
diff --git a/metadata/md5-cache/media-sound/timidity++-2.15.0 b/metadata/md5-cache/media-sound/timidity++-2.15.0
index 1f6f2eeda76a..86b7752292a4 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.15.0
+++ b/metadata/md5-cache/media-sound/timidity++-2.15.0
@@ -12,5 +12,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.15.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=675deff0d2f1fe52fa2bc8f3fe9d55bd
diff --git a/metadata/md5-cache/media-sound/tunapie-2.1.17-r1 b/metadata/md5-cache/media-sound/tunapie-2.1.17-r1
index 66af0ee0f94b..244dca13945a 100644
--- a/metadata/md5-cache/media-sound/tunapie-2.1.17-r1
+++ b/metadata/md5-cache/media-sound/tunapie-2.1.17-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install prepare setup
-DEPEND=>=dev-python/wxpython-2.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DEPEND=python_single_target_python2_7? ( >=dev-python/wxpython-2.6[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
 DESCRIPTION=Directory browser for Radio and TV streams
 EAPI=6
 HOMEPAGE=http://tunapie.sourceforge.net
-IUSE=offensive +python_targets_python2_7 +python_single_target_python2_7
+IUSE=offensive +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-python/wxpython-2.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-python/wxpython-2.6[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tunapie/tunapie-2.1.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2566f14e02d4f3fc4708d0a63ac6ea42
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=767b0a7670ebb05dc667546b6e240c6c
diff --git a/metadata/md5-cache/media-sound/tunapie-2.1.19 b/metadata/md5-cache/media-sound/tunapie-2.1.19
deleted file mode 100644
index eb5cc64bf82c..000000000000
--- a/metadata/md5-cache/media-sound/tunapie-2.1.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=dev-python/wxpython-2.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DESCRIPTION=Directory browser for Radio and TV streams
-EAPI=6
-HOMEPAGE=http://tunapie.sourceforge.net
-IUSE=offensive +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/wxpython-2.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/tunapie/tunapie-2.1.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2566f14e02d4f3fc4708d0a63ac6ea42
diff --git a/metadata/md5-cache/media-sound/tunapie-2.1.19-r1 b/metadata/md5-cache/media-sound/tunapie-2.1.19-r1
new file mode 100644
index 000000000000..cbf983cf5926
--- /dev/null
+++ b/metadata/md5-cache/media-sound/tunapie-2.1.19-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-python/wxpython-2.6[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DESCRIPTION=Directory browser for Radio and TV streams
+EAPI=6
+HOMEPAGE=http://tunapie.sourceforge.net
+IUSE=offensive +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-python/wxpython-2.6[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/tunapie/tunapie-2.1.19.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=767b0a7670ebb05dc667546b6e240c6c
diff --git a/metadata/md5-cache/media-sound/upmpdcli-1.4.0 b/metadata/md5-cache/media-sound/upmpdcli-1.4.0
index afa8f3026297..86f8e94eea9b 100644
--- a/metadata/md5-cache/media-sound/upmpdcli-1.4.0
+++ b/metadata/md5-cache/media-sound/upmpdcli-1.4.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd >=net-libs/libupnpp-0.17.0 thirdparty? ( dev-python/requests )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6f8e8f11c28eaa3c85c853a9628c360b
diff --git a/metadata/md5-cache/media-sound/upmpdcli-1.4.2 b/metadata/md5-cache/media-sound/upmpdcli-1.4.2
index 1ff5fe2bdee7..e3c9424d051a 100644
--- a/metadata/md5-cache/media-sound/upmpdcli-1.4.2
+++ b/metadata/md5-cache/media-sound/upmpdcli-1.4.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/jsoncpp media-libs/libmpdclient net-libs/libmicrohttpd >=net-libs/libupnpp-0.17.0 thirdparty? ( dev-python/requests )
 SLOT=0
 SRC_URI=https://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=440ee9086dafef86c445e802a52858c8
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 0ee5177fa0c7..aa8ced9e6739 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=58647f869e092a858d0c86296f72f560
diff --git a/metadata/md5-cache/media-sound/whipper-0.9.0 b/metadata/md5-cache/media-sound/whipper-0.9.0
index ed035e01eda5..8c8c0bace2ef 100644
--- a/metadata/md5-cache/media-sound/whipper-0.9.0
+++ b/metadata/md5-cache/media-sound/whipper-0.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/whipper-team/whipper/archive/v0.9.0.tar.gz -> whipper-0.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6484593b7b59cf62ecb139071776c053
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r4 b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r4
index af38e6ffaa21..b087896b59f9 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r4
+++ b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 dev-python/pyrex ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
+DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 dev-python/pyrex ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
 DESCRIPTION=X(cross)platform Music Multiplexing System. Next generation of the XMMS player
 EAPI=6
 HOMEPAGE=https://xmms2.org/wiki/Main_Page
-IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf +python_single_target_python3_6
 KEYWORDS=~alpha amd64 ~arm ppc x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems )
-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 )
+RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xmms2-0.8DrO_o-949-gca15e830.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3108da126847a8a17bad432772be0917
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f9e10b29f85ea1022470ec6db6763b94
diff --git a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r5 b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r5
index d27ccc31e168..909a2d1470a6 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r5
+++ b/metadata/md5-cache/media-sound/xmms2-0.8_p20161122-r5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 dev-python/pyrex ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
+DEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems ) dev-lang/python virtual/pkgconfig perl? ( dev-perl/Module-Build virtual/perl-Module-Metadata ) python? ( >=dev-python/cython-0.15.1 dev-python/pyrex ) test? ( dev-util/cunit valgrind? ( dev-util/valgrind ) )
 DESCRIPTION=X(cross)platform Music Multiplexing System. Next generation of the XMMS player
 EAPI=6
 HOMEPAGE=https://xmms2.org/wiki/Main_Page
-IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss perl phonehome pulseaudio python ruby samba +server sid sndfile speex test valgrind +vorbis vocoder wavpack xml zeroconf +python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems )
-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 )
+RDEPEND=server? ( >=dev-db/sqlite-3.3.4 aac? ( >=media-libs/faad2-2.0 ) airplay? ( dev-libs/openssl:0= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia >=media-libs/libdiscid-0.1.1 >=media-sound/cdparanoia-3.9.8 ) curl? ( >=net-misc/curl-7.15.1 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mms? ( virtual/ffmpeg >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mad? ( media-libs/libmad ) mp3? ( >=media-sound/mpg123-1.5.1 ) musepack? ( media-sound/musepack-tools ) ofa? ( media-libs/libofa ) opus? ( media-libs/opus media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-4.2 ) sid? ( media-sound/sidplay media-libs/resid ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/libogg ) vorbis? ( media-libs/libvorbis ) vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) ) >=dev-libs/glib-2.12.9 cxx? ( >=dev-libs/boost-1.32 ) perl? ( >=dev-lang/perl-5.8.8 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) virtual/rubygems )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/xmms2-0.8DrO_o-949-gca15e830.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6c95fa602a74183c6ed470ec74c7995
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b765f9909f7dc95348aca42f82a12f0a
diff --git a/metadata/md5-cache/media-sound/xwax-1.6 b/metadata/md5-cache/media-sound/xwax-1.6
index 049f428ccc3a..679559611e2f 100644
--- a/metadata/md5-cache/media-sound/xwax-1.6
+++ b/metadata/md5-cache/media-sound/xwax-1.6
@@ -10,5 +10,5 @@ RDEPEND=media-fonts/dejavu media-libs/libsdl media-libs/sdl-ttf sys-libs/glibc s
 REQUIRED_USE=|| ( cdda mp3 fallback ) || ( alsa jack oss )
 SLOT=0
 SRC_URI=https://xwax.org/releases/xwax-1.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=625b4eadb3e056abef7d9f5349899cc8
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 24acc35950dc..e1582a29842b 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/gentoo-vdr-scripts-2.7.3 b/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.7.3
index ececa85f25e5..0c1dd03975b7 100644
--- a/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.7.3
+++ b/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.7.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=nvram? ( sys-power/nvram-wakeup ) app-admin/sudo sys-process/wait_on_pid
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-vdr-scripts-2.7.3.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/gentoo-vdr-scripts-2.7.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ab3570ffc771cf21b1b45fa273cb0d3c
diff --git a/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.8 b/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.8
index 2e389a6492ed..17870958dfdd 100644
--- a/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.8
+++ b/metadata/md5-cache/media-tv/gentoo-vdr-scripts-2.8
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/sudo sys-process/wait_on_pid
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/snapshot/gentoo-vdr-scripts-3ef03483b825a032d2618c2f3fb61865b0fc2f1e.tar.bz2 -> gentoo-vdr-scripts-2.8.tar.bz2
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1bbd3074613c729643c60e7c73dce29b
diff --git a/metadata/md5-cache/media-tv/kodi-18.3-r1 b/metadata/md5-cache/media-tv/kodi-18.3-r1
index d2db61f39d06..d97ed5cb6195 100644
--- a/metadata/md5-cache/media-tv/kodi-18.3-r1
+++ b/metadata/md5-cache/media-tv/kodi-18.3-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.3:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.3:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm )
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux +python_targets_python2_7 +python_single_target_python2_7
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.3:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.3:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.3-Leia-18.2.tar.gz -> ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz ) https://github.com/xbmc/xbmc/archive/18.3-Leia.tar.gz -> kodi-18.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3dffe1ce3c2658088ed4e07ac4d6f97b
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0614193d3f336f4d5a37303bbf208235
diff --git a/metadata/md5-cache/media-tv/kodi-18.4 b/metadata/md5-cache/media-tv/kodi-18.4
deleted file mode 100644
index ab3f60c0a59a..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=7
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz ) https://github.com/xbmc/xbmc/archive/18.4-Leia.tar.gz -> kodi-18.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c6ed88dcb8d96511ba368975bf129e40
diff --git a/metadata/md5-cache/media-tv/kodi-18.4-r1 b/metadata/md5-cache/media-tv/kodi-18.4-r1
new file mode 100644
index 000000000000..22480a8983f6
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-18.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=7
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz ) https://github.com/xbmc/xbmc/archive/18.4-Leia.tar.gz -> kodi-18.4.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=19755e8d47239b098326cff47c642c66
diff --git a/metadata/md5-cache/media-tv/kodi-18.5-r1 b/metadata/md5-cache/media-tv/kodi-18.5-r1
deleted file mode 100644
index 460110c4a9de..000000000000
--- a/metadata/md5-cache/media-tv/kodi-18.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=7
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz ) https://github.com/xbmc/xbmc/archive/18.5-Leia.tar.gz -> kodi-18.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81f18b3502d343a9de9f4f7511b21957
diff --git a/metadata/md5-cache/media-tv/kodi-18.5-r2 b/metadata/md5-cache/media-tv/kodi-18.5-r2
new file mode 100644
index 000000000000..5edeac2b326b
--- /dev/null
+++ b/metadata/md5-cache/media-tv/kodi-18.5-r2
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free and open source media-player and entertainment hub
+EAPI=7
+HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.0.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/flatbuffers >=dev-libs/fribidi-0.19.7 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.8 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz ) https://github.com/xbmc/xbmc/archive/18.5-Leia.tar.gz -> kodi-18.5.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1913068f17a9aa4a6508f9d79df38e87
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 7123d35fc425..56c1d74bdf18 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/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/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycryptodome[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/xz-utils dev-lang/swig dev-libs/crossguid dev-libs/rapidjson dev-util/cmake dev-util/gperf media-libs/giflib >=media-libs/libjpeg-turbo-1.5.1:= >=media-libs/libpng-1.6.26:0= test? ( dev-cpp/gtest ) virtual/pkgconfig virtual/jre x86? ( dev-lang/nasm ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[libressl?,sqlite,ssl] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat >=dev-libs/flatbuffers-1.11.0 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/libinput-1.10.5 >=dev-libs/libxml2-2.9.4 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycryptodome[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) >=dev-libs/libcdio-0.94 >=dev-libs/libfmt-3.0.1 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.0.4:=[encode,postproc] libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.56.1[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= opengl? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) X? ( x11-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm >=x11-libs/libxkbcommon-0.4.1 xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) !media-tv/xbmc udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) || ( gles opengl ) ^^ ( gbm raspberry-pi wayland X ) ?? ( mariadb mysql ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.0.4-Leia-18.4.tar.gz -> ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65475a8624aebb5a25d84d2b3c7baeca
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d63156dedadc3fb96eaafb2108135e5f
diff --git a/metadata/md5-cache/media-tv/mythtv-29.1-r2 b/metadata/md5-cache/media-tv/mythtv-29.1-r2
index 795fb30e1d6b..4a050081ff8e 100644
--- a/metadata/md5-cache/media-tv/mythtv-29.1-r2
+++ b/metadata/md5-cache/media-tv/mythtv-29.1-r2
@@ -3,12 +3,12 @@ DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtn
 DESCRIPTION=Homebrew PVR project
 EAPI=6
 HOMEPAGE=https://www.mythtv.org
-IUSE=alsa altivec autostart bluray cec debug dvb dvd egl fftw +hls ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa altivec autostart bluray cec debug dvb dvd egl fftw +hls ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf input_devices_joystick +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtopengl:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/taglib >=media-sound/lame-3.93.1 sys-libs/zlib virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXv x11-libs/libXrandr x11-libs/libXxf86vm x11-misc/wmctrl alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( <media-libs/libvpx-1.8.0:= >=media-libs/x264-0.0.20111220:= ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/lxml dev-python/mysql-python dev-python/urlgrabber dev-python/future dev-python/requests-cache ) systemd? ( sys-apps/systemd:= ) theora? ( media-libs/libtheora media-libs/libogg ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) bluray? ( xml ) theora? ( vorbis )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) bluray? ( xml ) theora? ( vorbis )
 SLOT=0/29.1
 SRC_URI=https://github.com/MythTV/mythtv/archive/d8a2db77f5731cf32c6d31127452391c6cf7f91f.tar.gz -> mythtv-29.1-r1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=f0143c0aec77a3d3fd0b475b475f3b6a
diff --git a/metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r1 b/metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r1
index 938b71e22ee5..b7b53b30a1a2 100644
--- a/metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r1
+++ b/metadata/md5-cache/media-tv/mythtv-30.0_p20190808-r1
@@ -4,13 +4,13 @@ DEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdb
 DESCRIPTION=Open Source DVR and media center hub
 EAPI=7
 HOMEPAGE=https://www.mythtv.org
-IUSE=alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb egl exif fftw jack java +lame lcd libass lirc +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv xnvctrl +xvid +X zeroconf input_devices_joystick v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb egl exif fftw jack java +lame lcd libass lirc +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv xnvctrl +xvid +X zeroconf input_devices_joystick v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 opengl? ( dev-qt/qtopengl:5 ) dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-gfx/exiv2:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib lame? ( >=media-sound/lame-3.93.1 ) sys-libs/zlib opengl? ( virtual/opengl ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) bluray? ( media-libs/libbluray:= dev-libs/libcdio:= sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( >=media-libs/libiec61883-1.0.0 >=sys-libs/libavc1394-0.5.3 >=sys-libs/libraw1394-1.2.0 ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( >=dev-perl/libwww-perl-5 dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/lxml dev-python/mysql-python dev-python/urlgrabber dev-python/future dev-python/requests-cache ) systemd? ( sys-apps/systemd:= ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( <media-libs/libvpx-1.8.0:= ) xnvctrl? ( x11-drivers/nvidia-drivers:=[tools,static-libs] ) x264? ( >=media-libs/x264-0.0.20111220:= ) x265? ( media-libs/x265 ) xml? ( >=dev-libs/libxml2-2.6.0 ) xvid? ( >=media-libs/xvid-1.1.0 ) zeroconf? ( dev-libs/openssl:0= net-dns/avahi[mdnsresponder-compat] ) media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) dvd? ( media-libs/libdvdcss ) xmltv? ( >=media-tv/xmltv-0.5.43 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) bluray? ( xml ) cdr? ( cdda )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) bluray? ( xml ) cdr? ( cdda )
 RESTRICT=test
 SLOT=0/30.0_p20190808
 SRC_URI=https://github.com/MythTV/mythtv/archive/5cde0578d84926171b20c8f7e95a101e9b0b9457.tar.gz -> mythtv-30.0_p20190808.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=fecbf21bc569449e8da163ef20d019f9
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1 b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
deleted file mode 100644
index 4099695c8d0d..000000000000
--- a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=sys-apps/fix-gnustack dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig
-DESCRIPTION=A free media library that is intended for use with a plex client.
-EAPI=6
-HOMEPAGE=https://www.plex.tv/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=-* amd64
-LICENSE=Plex
-RDEPEND=net-dns/avahi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=bindist strip
-SLOT=0
-SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.13.2.5154-fd05be322/plexmediaserver_1.13.2.5154-fd05be322_amd64.deb )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c28822917b502ed2d6a9af1cee89aa7f
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r2 b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r2
new file mode 100644
index 000000000000..48755839d71a
--- /dev/null
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst setup unpack
+DEPEND=sys-apps/fix-gnustack python_single_target_python2_7? ( dev-python/virtualenv[python_targets_python2_7(-)] ) virtual/pkgconfig
+DESCRIPTION=A free media library that is intended for use with a plex client.
+EAPI=6
+HOMEPAGE=https://www.plex.tv/
+IUSE=+python_single_target_python2_7
+KEYWORDS=-* amd64
+LICENSE=Plex
+RDEPEND=net-dns/avahi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=bindist strip
+SLOT=0
+SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.13.2.5154-fd05be322/plexmediaserver_1.13.2.5154-fd05be322_amd64.deb )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3bda132306eb1fcf40a2ebd12520c7c9
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.14.1 b/metadata/md5-cache/media-tv/plex-media-server-1.14.1
index 10f342ee4f6a..9b09bd4be111 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.14.1
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.14.1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install postinst setup unpack
-DEPEND=sys-apps/fix-gnustack dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=sys-apps/fix-gnustack python_single_target_python2_7? ( dev-python/virtualenv[python_targets_python2_7(-)] )
 DESCRIPTION=A free media library that is intended for use with a plex client.
 EAPI=7
 HOMEPAGE=https://www.plex.tv/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=-* ~amd64
 LICENSE=Plex
 RDEPEND=net-dns/avahi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.14.1.5488-cc260c476/plexmediaserver_1.14.1.5488-cc260c476_amd64.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=56ba0ba0dd9eb5c1b62aaa3bb6443f55
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d4379b2612469116712150f062f206b3
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.16.4 b/metadata/md5-cache/media-tv/plex-media-server-1.16.4
index 52defa5f2830..e65d6755f908 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.16.4
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.16.4
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install postinst setup unpack
-DEPEND=dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( dev-python/virtualenv[python_targets_python2_7(-)] )
 DESCRIPTION=A free media library that is intended for use with a plex client
 EAPI=7
 HOMEPAGE=https://www.plex.tv/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=-* ~amd64
 LICENSE=Plex
 RDEPEND=net-dns/avahi acct-user/plex acct-group/plex python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.16.4.1469-6d5612c2f/debian/plexmediaserver_1.16.4.1469-6d5612c2f_amd64.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=82d3721981f5e31a4277dd6087edfeb9
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=9abf5d0038773db6ddd957aab1aa0105
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.18.3 b/metadata/md5-cache/media-tv/plex-media-server-1.18.3
index 66378402fc63..5b2796dda27e 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.18.3
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.18.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/patchelf virtual/pkgconfig
 DEFINED_PHASES=install postinst setup unpack
-DEPEND=dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( dev-python/virtualenv[python_targets_python2_7(-)] )
 DESCRIPTION=A free media library that is intended for use with a plex client
 EAPI=7
 HOMEPAGE=https://www.plex.tv/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=Plex
 RDEPEND=acct-group/plex acct-user/plex net-dns/avahi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.18.3.2156-349e9837e/debian/plexmediaserver_1.18.3.2156-349e9837e_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.18.3.2156-349e9837e/debian/plexmediaserver_1.18.3.2156-349e9837e_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=d385563852de13dabfa0509b59d00f07
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=0f829bfdf778212b99f687d62a114284
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.18.4 b/metadata/md5-cache/media-tv/plex-media-server-1.18.4
deleted file mode 100644
index 5828eede01b4..000000000000
--- a/metadata/md5-cache/media-tv/plex-media-server-1.18.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/patchelf virtual/pkgconfig
-DEFINED_PHASES=install postinst setup unpack
-DEPEND=dev-python/virtualenv[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A free media library that is intended for use with a plex client
-EAPI=7
-HOMEPAGE=https://www.plex.tv/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=Plex
-RDEPEND=acct-group/plex acct-user/plex net-dns/avahi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=bindist strip
-SLOT=0
-SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.18.4.2171-ac2afe5f8/debian/plexmediaserver_1.18.4.2171-ac2afe5f8_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.18.4.2171-ac2afe5f8/debian/plexmediaserver_1.18.4.2171-ac2afe5f8_i386.deb )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=b32df2f500ad8f91bf91f74e91a42447
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1 b/metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1
new file mode 100644
index 000000000000..13def4153dd6
--- /dev/null
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst setup unpack
+DEPEND=python_single_target_python2_7? ( dev-python/virtualenv[python_targets_python2_7(-)] )
+DESCRIPTION=A free media library that is intended for use with a plex client
+EAPI=7
+HOMEPAGE=https://www.plex.tv/
+IUSE=+python_single_target_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Plex
+RDEPEND=acct-group/plex acct-user/plex net-dns/avahi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=bindist strip
+SLOT=0
+SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.18.4.2171-ac2afe5f8/debian/plexmediaserver_1.18.4.2171-ac2afe5f8_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.18.4.2171-ac2afe5f8/debian/plexmediaserver_1.18.4.2171-ac2afe5f8_i386.deb )
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
+_md5_=adbfc5e5b404f873ca3a738bcca16138
diff --git a/metadata/md5-cache/media-tv/tvheadend-4.2.8 b/metadata/md5-cache/media-tv/tvheadend-4.2.8
index 56f5c2d894f8..d3068c9e6270 100644
--- a/metadata/md5-cache/media-tv/tvheadend-4.2.8
+++ b/metadata/md5-cache/media-tv/tvheadend-4.2.8
@@ -11,5 +11,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.8.tar.gz -> tvheadend-4.2.8.tar.gz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1e43714c10525a61eb83a2e7e0d2bf5a
diff --git a/metadata/md5-cache/media-tv/tvheadend-9999 b/metadata/md5-cache/media-tv/tvheadend-9999
index 0f4b7e6b8e95..0d3b621b144b 100644
--- a/metadata/md5-cache/media-tv/tvheadend-9999
+++ b/metadata/md5-cache/media-tv/tvheadend-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=virtual/libiconv dbus? ( sys-apps/dbus ) dvbcsa? ( media-libs/libdvbcsa ) ffmpeg? ( media-video/ffmpeg:0=[opus?,vpx?,x264?,x265?] ) hdhomerun? ( media-libs/libhdhomerun ) !libressl? ( dev-libs/openssl:0= ) 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_=git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8a2389223f028dcfe263f8972f8e3325
diff --git a/metadata/md5-cache/media-tv/tvnamer-2.4 b/metadata/md5-cache/media-tv/tvnamer-2.4
index ddf6514dbabb..62136acee691 100644
--- a/metadata/md5-cache/media-tv/tvnamer-2.4
+++ b/metadata/md5-cache/media-tv/tvnamer-2.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Automatic TV episode file renamer, data from thetvdb.com
 EAPI=6
 HOMEPAGE=https://github.com/dbr/tvnamer
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=public-domain
-RDEPEND=>=dev-python/tvdb_api-1.10_pre[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/tvdb_api-1.10_pre[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
 SRC_URI=mirror://pypi/t/tvnamer/tvnamer-2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3be5c26723f07a22ff4135fdff59285
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d41637c4dc45cfaf266014c3cc4546da
diff --git a/metadata/md5-cache/media-tv/tvnamer-2.5 b/metadata/md5-cache/media-tv/tvnamer-2.5
index 0a402ae21a5e..b25e7dffd4d4 100644
--- a/metadata/md5-cache/media-tv/tvnamer-2.5
+++ b/metadata/md5-cache/media-tv/tvnamer-2.5
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Automatic TV episode file renamer, data from thetvdb.com
 EAPI=7
 HOMEPAGE=https://github.com/dbr/tvnamer
-IUSE=python_targets_python2_7 python_targets_python3_6
+IUSE=python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
-RDEPEND=>=dev-python/tvdb_api-1.10_pre[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/tvdb_api-1.10_pre[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
 SRC_URI=mirror://pypi/t/tvnamer/tvnamer-2.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=74ca1a74fafc0f085303a641f3402839
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5859deb26576d2572ef7c381d326a55b
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 2ff9b911dd4d..a08ab5348c2b 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/devedeng-4.15.0 b/metadata/md5-cache/media-video/devedeng-4.15.0
index 0bddbce84fe5..7fb6691c342c 100644
--- a/metadata/md5-cache/media-video/devedeng-4.15.0
+++ b/metadata/md5-cache/media-video/devedeng-4.15.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.15.0/devedeng-4.15.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b715b667687fb701bfab041f01434e5b
diff --git a/metadata/md5-cache/media-video/devedeng-4.16.0 b/metadata/md5-cache/media-video/devedeng-4.16.0
index b81ab534f3c1..2b0a87555ff4 100644
--- a/metadata/md5-cache/media-video/devedeng-4.16.0
+++ b/metadata/md5-cache/media-video/devedeng-4.16.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.16.0/devedeng-4.16.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b715b667687fb701bfab041f01434e5b
diff --git a/metadata/md5-cache/media-video/ffmpeg2theora-0.30 b/metadata/md5-cache/media-video/ffmpeg2theora-0.30
index 8ce4b00acd38..1c92f2851d92 100644
--- a/metadata/md5-cache/media-video/ffmpeg2theora-0.30
+++ b/metadata/md5-cache/media-video/ffmpeg2theora-0.30
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!libav? ( media-video/ffmpeg:0=[postproc] ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
 SLOT=0
 SRC_URI=http://www.v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fd611abd5061d113d6ddcb071637858b
diff --git a/metadata/md5-cache/media-video/gaupol-1.5 b/metadata/md5-cache/media-video/gaupol-1.5
index c36de327940e..635cda2d1c15 100644
--- a/metadata/md5-cache/media-video/gaupol-1.5
+++ b/metadata/md5-cache/media-video/gaupol-1.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/gaupol/archive/1.5.tar.gz -> gaupol-1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=058463a3dfa161bbb9769430361041bd
diff --git a/metadata/md5-cache/media-video/gaupol-1.6 b/metadata/md5-cache/media-video/gaupol-1.6
index 0f4fe14b37b4..f9c4db5c65fb 100644
--- a/metadata/md5-cache/media-video/gaupol-1.6
+++ b/metadata/md5-cache/media-video/gaupol-1.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/gaupol/archive/1.6.tar.gz -> gaupol-1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ac982b2e6c8201e9df1e8f14a4d30d9
diff --git a/metadata/md5-cache/media-video/gaupol-1.7 b/metadata/md5-cache/media-video/gaupol-1.7
index 0adba260651d..f2700ac7eb1d 100644
--- a/metadata/md5-cache/media-video/gaupol-1.7
+++ b/metadata/md5-cache/media-video/gaupol-1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/otsaloma/gaupol/archive/1.7.tar.gz -> gaupol-1.7.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43eddcb4ae1ba2ebe18aa61c959c186a
diff --git a/metadata/md5-cache/media-video/griffith-0.13-r2 b/metadata/md5-cache/media-video/griffith-0.13-r2
deleted file mode 100644
index 2c29cf4e4fe0..000000000000
--- a/metadata/md5-cache/media-video/griffith-0.13-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/libglade[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.6.1:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/sqlalchemy-0.5.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/reportlab-1.19[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] doc? ( app-text/docbook2X )
-DESCRIPTION=Movie collection manager
-EAPI=7
-HOMEPAGE=http://www.griffith.cc/
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/libglade[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.6.1:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/sqlalchemy-0.5.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/reportlab-1.19[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://launchpad.net/griffith/trunk/0.13/+download/griffith-0.13.tar.gz https://dev.gentoo.org/~hwoarang/distfiles/griffith-extra-artwork-0.9.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d9281f81dff1c8ed7eb7f88ec349ed1a
diff --git a/metadata/md5-cache/media-video/griffith-0.13-r3 b/metadata/md5-cache/media-video/griffith-0.13-r3
new file mode 100644
index 000000000000..7264bae05317
--- /dev/null
+++ b/metadata/md5-cache/media-video/griffith-0.13-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gnome-base/libglade[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] >=dev-python/pygtk-2.6.1:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/sqlalchemy-0.5.2[python_targets_python2_7(-)] >=dev-python/reportlab-1.19[python_targets_python2_7(-)] ) doc? ( app-text/docbook2X )
+DESCRIPTION=Movie collection manager
+EAPI=7
+HOMEPAGE=http://www.griffith.cc/
+IUSE=doc +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) gnome-base/libglade[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-python/pillow[python_targets_python2_7(-)] >=dev-python/pygtk-2.6.1:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/sqlalchemy-0.5.2[python_targets_python2_7(-)] >=dev-python/reportlab-1.19[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://launchpad.net/griffith/trunk/0.13/+download/griffith-0.13.tar.gz https://dev.gentoo.org/~hwoarang/distfiles/griffith-extra-artwork-0.9.4.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=efc9ebf85093dc29efe3363d67cf730f
diff --git a/metadata/md5-cache/media-video/gtk-recordmydesktop-0.3.8-r3 b/metadata/md5-cache/media-video/gtk-recordmydesktop-0.3.8-r3
index 24bc060b7fb7..17c26221108f 100644
--- a/metadata/md5-cache/media-video/gtk-recordmydesktop-0.3.8-r3
+++ b/metadata/md5-cache/media-video/gtk-recordmydesktop-0.3.8-r3
@@ -3,13 +3,13 @@ DEPEND=>=x11-libs/gtk+-2.10.0:2 dev-python/pygtk:2 >=media-video/recordmydesktop
 DESCRIPTION=GTK+ interface for RecordMyDesktop
 EAPI=5
 HOMEPAGE=http://recordmydesktop.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gtk+-2.10.0:2 dev-python/pygtk:2 >=media-video/recordmydesktop-0.3.5 x11-apps/xwininfo python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/recordmydesktop/gtk-recordmydesktop-0.3.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=94b230078ba18082d856a27f6388bbfc
diff --git a/metadata/md5-cache/media-video/handbrake-1.3.0-r2 b/metadata/md5-cache/media-video/handbrake-1.3.0-r2
index 4574ffbccfa1..3ccf2bdfdc28 100644
--- a/metadata/md5-cache/media-video/handbrake-1.3.0-r2
+++ b/metadata/md5-cache/media-video/handbrake-1.3.0-r2
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare setup
-DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib libav? ( >=media-video/libav-12.2:0=[fdk?] ) !libav? ( >=media-video/ffmpeg-4.2.1: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 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/yasm dev-util/intltool sys-devel/automake
+DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib libav? ( >=media-video/libav-12.2:0=[fdk?] ) !libav? ( >=media-video/ffmpeg-4.2.1: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 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/yasm dev-util/intltool sys-devel/automake
 DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
 EAPI=7
 HOMEPAGE=http://handbrake.fr/
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( fdk libav-aac )
 SLOT=0
 SRC_URI=https://download2.handbrake.fr/1.3.0/HandBrake-1.3.0-source.tar.bz2 -> handbrake-1.3.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2901051e1efb88ff5d13c2f314d8889a
+_md5_=dc9ff14d36cb57131893c8a1e042417e
diff --git a/metadata/md5-cache/media-video/handbrake-9999 b/metadata/md5-cache/media-video/handbrake-9999
index ba6b4e237978..0bdbbdf1f530 100644
--- a/metadata/md5-cache/media-video/handbrake-9999
+++ b/metadata/md5-cache/media-video/handbrake-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 postrm preinst prepare setup unpack
-DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib libav? ( >=media-video/libav-12.2:0=[fdk?] ) !libav? ( >=media-video/ffmpeg-4.2.1: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 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/yasm dev-util/intltool sys-devel/automake
+DEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 media-libs/a52dec media-libs/libass:= >=media-libs/libbluray-1.0 >=media-libs/dav1d-0.5.1 media-libs/libdvdnav media-libs/libdvdread:= media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis >=media-libs/libvpx-1.8 nvenc? ( media-libs/nv-codec-headers ) media-libs/opus media-libs/x264:= media-sound/lame sys-libs/zlib libav? ( >=media-video/libav-12.2:0=[fdk?] ) !libav? ( >=media-video/ffmpeg-4.2.1: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 media-plugins/gst-plugins-gdkpixbuf:1.0 ) gtk? ( >=x11-libs/gtk+-3.10 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libgudev:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango ) fdk? ( media-libs/fdk-aac ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-lang/yasm dev-util/intltool sys-devel/automake
 DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder
 EAPI=7
 HOMEPAGE=http://handbrake.fr/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/xz-utils media-libs/speex dev-libs/jansson dev-libs/libxml2 med
 REQUIRED_USE=^^ ( fdk libav-aac )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b228a51c2188bf9d64d53232629379c
+_md5_=a2411f05d83d9e63ebeb21f69bd10648
diff --git a/metadata/md5-cache/media-video/motion-4.1.1-r1 b/metadata/md5-cache/media-video/motion-4.1.1-r1
index 1cfec495228a..c45c3fbdd350 100644
--- a/metadata/md5-cache/media-video/motion-4.1.1-r1
+++ b/metadata/md5-cache/media-video/motion-4.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/jpeg:= ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) mmal? ( media-libs/raspberrypi-userland ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= )
 SLOT=0
 SRC_URI=https://github.com/Motion-Project/motion/archive/release-4.1.1.tar.gz -> motion-release-4.1.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=76cf9f702bc0de65446315e847a5c487
diff --git a/metadata/md5-cache/media-video/obs-studio-24.0.3 b/metadata/md5-cache/media-video/obs-studio-24.0.3
index b25a05f0333c..8d8284037f70 100644
--- a/metadata/md5-cache/media-video/obs-studio-24.0.3
+++ b/metadata/md5-cache/media-video/obs-studio-24.0.3
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgu
 DESCRIPTION=Software for Recording and Streaming Live Video Content
 EAPI=7
 HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc python_single_target_python3_6 python_single_target_python3_7
 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/qtsvg: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-4[nvenc] >=media-video/ffmpeg-4[video_cards_nvidia] ) ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/obsproject/obs-studio/archive/24.0.3.tar.gz -> obs-studio-24.0.3.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a86ab9a40aceef79358865a975c718e
diff --git a/metadata/md5-cache/media-video/obs-studio-24.0.5 b/metadata/md5-cache/media-video/obs-studio-24.0.5
index a4f95cb3a79e..e089e5fc1532 100644
--- a/metadata/md5-cache/media-video/obs-studio-24.0.5
+++ b/metadata/md5-cache/media-video/obs-studio-24.0.5
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgu
 DESCRIPTION=Software for Recording and Streaming Live Video Content
 EAPI=7
 HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc python_single_target_python3_6 python_single_target_python3_7
 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/qtsvg: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-4[nvenc] >=media-video/ffmpeg-4[video_cards_nvidia] ) ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/obsproject/obs-studio/archive/24.0.5.tar.gz -> obs-studio-24.0.5.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a86ab9a40aceef79358865a975c718e
diff --git a/metadata/md5-cache/media-video/obs-studio-9999 b/metadata/md5-cache/media-video/obs-studio-9999
index d0d563439905..65eb8012b4d0 100644
--- a/metadata/md5-cache/media-video/obs-studio-9999
+++ b/metadata/md5-cache/media-video/obs-studio-9999
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/jansson-2.5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgu
 DESCRIPTION=Software for Recording and Streaming Live Video Content
 EAPI=7
 HOMEPAGE=https://obsproject.com
-IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
 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/qtsvg: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-4[nvenc] >=media-video/ffmpeg-4[video_cards_nvidia] ) ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) speex? ( media-libs/speexdsp ) ssl? ( net-libs/mbedtls ) truetype? ( media-libs/fontconfig media-libs/freetype ) v4l? ( media-libs/libv4l ) vlc? ( media-video/vlc:= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3c2582ebfcf56dfbd79d42b856e42dd7
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 398950e1b54e..b13fcb3ca6b9 100644
--- a/metadata/md5-cache/media-video/openshot-2.4.0-r1
+++ b/metadata/md5-cache/media-video/openshot-2.4.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
 DESCRIPTION=Free, open-source, non-linear video editor to create and edit videos and movies
 EAPI=6
 HOMEPAGE=https://www.openshot.org/ https://launchpad.net/openshot
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
+IUSE=+python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=dev-python/httplib2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,svg,webkit] dev-python/pyzmq[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=media-libs/libopenshot-0.1.8[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-python/httplib2[python_targets_python3_6(-)] dev-python/PyQt5[python_targets_python3_6(-),svg,webkit] dev-python/pyzmq[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) >=media-libs/libopenshot-0.1.8[python,python_single_target_python3_6(-)?] python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8a986af3980de0399f00e29e98f624b0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=160f8bf846c51eb68d2b9e9d240f25c0
diff --git a/metadata/md5-cache/media-video/openshot-2.4.4 b/metadata/md5-cache/media-video/openshot-2.4.4
deleted file mode 100644
index 1df5e7b90e36..000000000000
--- a/metadata/md5-cache/media-video/openshot-2.4.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Free, open-source, non-linear video editor to create and edit videos and movies
-EAPI=7
-HOMEPAGE=https://www.openshot.org/
-IUSE=doc 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=dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,gui,svg,webkit,widgets] dev-python/pyzmq[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=media-libs/libopenshot-0.2.3[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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=1
-SRC_URI=https://github.com/OpenShot/openshot-qt/archive/v2.4.4.tar.gz -> openshot-2.4.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=589c4cd6f82e6ebbcba3e6e96d9d20b7
diff --git a/metadata/md5-cache/media-video/openshot-2.4.4-r1 b/metadata/md5-cache/media-video/openshot-2.4.4-r1
new file mode 100644
index 000000000000..ef40d027f117
--- /dev/null
+++ b/metadata/md5-cache/media-video/openshot-2.4.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( doc? ( dev-python/sphinx[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free, open-source, non-linear video editor to create and edit videos and movies
+EAPI=7
+HOMEPAGE=https://www.openshot.org/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-python/httplib2[python_targets_python3_6(-)] dev-python/PyQt5[python_targets_python3_6(-),gui,svg,webkit,widgets] dev-python/pyzmq[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-),gui,svg,webkit,widgets] dev-python/pyzmq[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=media-libs/libopenshot-0.2.3[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=1
+SRC_URI=https://github.com/OpenShot/openshot-qt/archive/v2.4.4.tar.gz -> openshot-2.4.4.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=421e1b0c91f23b9b04e8b8d37e42dc4d
diff --git a/metadata/md5-cache/media-video/openshot-2.5.0 b/metadata/md5-cache/media-video/openshot-2.5.0
new file mode 100644
index 000000000000..02a9217512ed
--- /dev/null
+++ b/metadata/md5-cache/media-video/openshot-2.5.0
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( doc? ( dev-python/sphinx[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An award-winning free and open-source video editor
+EAPI=7
+HOMEPAGE=https://www.openshot.org/
+IUSE=doc python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python3_6? ( dev-python/httplib2[python_targets_python3_6(-)] dev-python/PyQt5[python_targets_python3_6(-),gui,svg,webkit,widgets] dev-python/pyzmq[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/httplib2[python_targets_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-),gui,svg,webkit,widgets] dev-python/pyzmq[python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] ) >=media-libs/libopenshot-0.2.4[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=1
+SRC_URI=https://github.com/OpenShot/openshot-qt/archive/v2.5.0.tar.gz -> openshot-2.5.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f96247b7f2b51fd465ed6acdeac2d703
diff --git a/metadata/md5-cache/media-video/photofilmstrip-3.7.1 b/metadata/md5-cache/media-video/photofilmstrip-3.7.1
deleted file mode 100644
index fb056a52399a..000000000000
--- a/metadata/md5-cache/media-video/photofilmstrip-3.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-DESCRIPTION=Movie slideshow creator using Ken Burns effect
-EAPI=7
-HOMEPAGE=https://www.photofilmstrip.org/en/ https://github.com/PhotoFilmStrip
-IUSE=doc +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/gst-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/wxpython:4.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] media-plugins/gst-plugins-jpeg:1.0 x11-libs/wxGTK:*[X] python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/PhotoFilmStrip/PFS/releases/download/v3.7.1/photofilmstrip-3.7.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ff444b83b8e1d9b8ca1065b3b4dd280
diff --git a/metadata/md5-cache/media-video/photofilmstrip-3.7.1-r1 b/metadata/md5-cache/media-video/photofilmstrip-3.7.1-r1
new file mode 100644
index 000000000000..89afb907fcf7
--- /dev/null
+++ b/metadata/md5-cache/media-video/photofilmstrip-3.7.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] ) )
+DESCRIPTION=Movie slideshow creator using Ken Burns effect
+EAPI=7
+HOMEPAGE=https://www.photofilmstrip.org/en/ https://github.com/PhotoFilmStrip
+IUSE=doc +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-python/gst-python[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) media-plugins/gst-plugins-jpeg:1.0 x11-libs/wxGTK:*[X] python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/PhotoFilmStrip/PFS/releases/download/v3.7.1/photofilmstrip-3.7.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=513f2b3905a2ce51951b790e04e24762
diff --git a/metadata/md5-cache/media-video/pitivi-0.999 b/metadata/md5-cache/media-video/pitivi-0.999
deleted file mode 100644
index 9fa5c7940f85..000000000000
--- a/metadata/md5-cache/media-video/pitivi-0.999
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/yelp-tools dev-python/setuptools >=dev-util/intltool-0.35.5 dev-util/itstool sys-devel/gettext virtual/pkgconfig test? ( dev-python/nose2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pycairo-1.10[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] >=media-plugins/gst-transcoder-1.8.2-r1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/gst-python-1.4:1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pygobject-3.8:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection] >=media-libs/gst-plugins-bad-1.14.2:1.0[gtk] >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A non-linear video editor using the GStreamer multimedia framework
-EAPI=7
-HOMEPAGE=http://www.pitivi.org
-IUSE=v4l test +python_targets_python3_6 +python_single_target_python3_6 test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pycairo-1.10[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] >=media-plugins/gst-transcoder-1.8.2-r1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/gst-python-1.4:1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pygobject-3.8:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection] >=media-libs/gst-plugins-bad-1.14.2:1.0[gtk] >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/pitivi/0.999/pitivi-0.999.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24d2cc4e91c56176b578ee1b3ec91770
diff --git a/metadata/md5-cache/media-video/pitivi-0.999-r1 b/metadata/md5-cache/media-video/pitivi-0.999-r1
new file mode 100644
index 000000000000..6adc1494c46e
--- /dev/null
+++ b/metadata/md5-cache/media-video/pitivi-0.999-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/yelp-tools dev-python/setuptools >=dev-util/intltool-0.35.5 dev-util/itstool sys-devel/gettext virtual/pkgconfig test? ( python_single_target_python3_6? ( dev-python/nose2[python_targets_python3_6(-)] ) ) app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/pycairo-1.10[python_targets_python3_6(-)] ) >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] >=media-plugins/gst-transcoder-1.8.2-r1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_6(-)] ) gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection] >=media-libs/gst-plugins-bad-1.14.2:1.0[gtk] >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A non-linear video editor using the GStreamer multimedia framework
+EAPI=7
+HOMEPAGE=http://www.pitivi.org
+IUSE=v4l test +python_single_target_python3_6 test
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/pycairo-1.10[python_targets_python3_6(-)] ) >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] >=media-plugins/gst-transcoder-1.8.2-r1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_6(-)] ) gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection] >=media-libs/gst-plugins-bad-1.14.2:1.0[gtk] >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/pitivi/0.999/pitivi-0.999.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef406c47d1cb195b1ff56e77d4966252
diff --git a/metadata/md5-cache/media-video/pymp-1.1-r1 b/metadata/md5-cache/media-video/pymp-1.1-r1
deleted file mode 100644
index be73511a570b..000000000000
--- a/metadata/md5-cache/media-video/pymp-1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=sys-apps/sed
-DESCRIPTION=a lean, flexible frontend to mplayer written in python
-EAPI=6
-HOMEPAGE=http://jdolan.dyndns.org/trac/wiki/Pymp
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=media-video/mplayer dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://jdolan.dyndns.org/jaydolan/files/pymp-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85113f7815318f26fbf035a599d4e22c
diff --git a/metadata/md5-cache/media-video/pymp-1.1-r2 b/metadata/md5-cache/media-video/pymp-1.1-r2
new file mode 100644
index 000000000000..1a570c05d320
--- /dev/null
+++ b/metadata/md5-cache/media-video/pymp-1.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=sys-apps/sed
+DESCRIPTION=a lean, flexible frontend to mplayer written in python
+EAPI=6
+HOMEPAGE=http://jdolan.dyndns.org/trac/wiki/Pymp
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=media-video/mplayer python_single_target_python2_7? ( dev-python/pygtk[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://jdolan.dyndns.org/jaydolan/files/pymp-1.1.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ce9ff8268a2a1366266ad4b7ca7f08e6
diff --git a/metadata/md5-cache/media-video/subdl-1.0.3 b/metadata/md5-cache/media-video/subdl-1.0.3
index 3dd01a7a5457..bf4a4f7ca99b 100644
--- a/metadata/md5-cache/media-video/subdl-1.0.3
+++ b/metadata/md5-cache/media-video/subdl-1.0.3
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A command-line tool for downloading subs from opensubtitles.org
 EAPI=5
 HOMEPAGE=https://github.com/akexakex/subdl
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://subdl.googlecode.com/files/subdl-1.0.3.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ac986d1c9671089b198ac10e09ac0e80
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 1f4d60b84301..401cb1015cec 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_python3_6 )
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8c39a880130a045504c51ea6926e7a67
diff --git a/metadata/md5-cache/media-video/subliminal-2.0.5-r3 b/metadata/md5-cache/media-video/subliminal-2.0.5-r3
index f9d0aef3a77b..eda6686829c4 100644
--- a/metadata/md5-cache/media-video/subliminal-2.0.5-r3
+++ b/metadata/md5-cache/media-video/subliminal-2.0.5-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bea67093758cab0e0fd69b4f206e0481
diff --git a/metadata/md5-cache/media-video/subliminal-9999 b/metadata/md5-cache/media-video/subliminal-9999
index f39b73e50509..252392bfdf58 100644
--- a/metadata/md5-cache/media-video/subliminal-9999
+++ b/metadata/md5-cache/media-video/subliminal-9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fb70b5f0f6b36efb60a8fea0046debc8
diff --git a/metadata/md5-cache/media-video/totem-3.32.1-r1 b/metadata/md5-cache/media-video/totem-3.32.1-r1
deleted file mode 100644
index f0ec36b4f880..000000000000
--- a/metadata/md5-cache/media-video/totem-3.32.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.5 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[introspection?] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) cdr? ( >=dev-libs/libxml2-2.6:2 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Media player for GNOME
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Videos
-IUSE=cdr gtk-doc +introspection lirc +python test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[introspection?] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) cdr? ( >=dev-libs/libxml2-2.6:2 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-1.1.0[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] )
-REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/totem/3.32/totem-3.32.1.tar.xz
-_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eff57f78d1a2b60fc632785acc3a18e8
diff --git a/metadata/md5-cache/media-video/totem-3.32.1-r2 b/metadata/md5-cache/media-video/totem-3.32.1-r2
new file mode 100644
index 000000000000..50867193ecb6
--- /dev/null
+++ b/metadata/md5-cache/media-video/totem-3.32.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.5 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[introspection?] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) cdr? ( >=dev-libs/libxml2-2.6:2 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player for GNOME
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Apps/Videos
+IUSE=cdr gtk-doc +introspection lirc +python test test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[introspection?] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) cdr? ( >=dev-libs/libxml2-2.6:2 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-1.1.0[python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) )
+REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/totem/3.32/totem-3.32.1.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a409c2eb8ccfd8bd798680a0ad3cc672
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 ab26a962239d..41684ab8395e 100644
--- a/metadata/md5-cache/media-video/tovid-0.35.2-r1
+++ b/metadata/md5-cache/media-video/tovid-0.35.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-text/txt2tags python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=app-text/txt2tags python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=A collection of DVD authoring tools
 EAPI=5
 HOMEPAGE=http://tovid.wikia.com/wiki/Tovid_Wiki
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-cdr/dvd+rw-tools dev-tcltk/tix media-sound/normalize >=media-sound/sox-14.3.2 media-video/dvdauthor >=media-video/mjpegtools-2.0.0 || ( >=media-video/mplayer-1.0_rc4_p20110101[dvdnav] media-video/mpv[libmpv,dvdnav] ) sys-devel/bc virtual/ffmpeg virtual/imagemagick-tools[png] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52949729fb9dc89d02d0fddcd591d481
diff --git a/metadata/md5-cache/media-video/unifi-video-3.10.10 b/metadata/md5-cache/media-video/unifi-video-3.10.10
index 448a890c8582..dd07d27e052c 100644
--- a/metadata/md5-cache/media-video/unifi-video-3.10.10
+++ b/metadata/md5-cache/media-video/unifi-video-3.10.10
@@ -9,5 +9,5 @@ RDEPEND=dev-db/mongodb dev-java/commons-daemon sys-apps/lsb-release sys-apps/uti
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.ubnt.com/firmwares/ufv/v3.10.10/unifi-video.Ubuntu18.04_amd64.v3.10.10.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=08c2908b8c3afdcf44a7e293d3ef10cd
diff --git a/metadata/md5-cache/media-video/unifi-video-3.10.5 b/metadata/md5-cache/media-video/unifi-video-3.10.5
index 05f78a79703c..bcc55c3a5679 100644
--- a/metadata/md5-cache/media-video/unifi-video-3.10.5
+++ b/metadata/md5-cache/media-video/unifi-video-3.10.5
@@ -9,5 +9,5 @@ RDEPEND=dev-db/mongodb dev-java/commons-daemon sys-apps/lsb-release sys-libs/lib
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dl.ubnt.com/firmwares/ufv/v3.10.5/unifi-video.Ubuntu16.04_amd64.v3.10.5.deb
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=79e34ecacbf1db40e3e1d7fdd40082df
diff --git a/metadata/md5-cache/media-video/ushare-1.1a-r9 b/metadata/md5-cache/media-video/ushare-1.1a-r9
index 0518f66a973f..7b22db2d9cd4 100644
--- a/metadata/md5-cache/media-video/ushare-1.1a-r9
+++ b/metadata/md5-cache/media-video/ushare-1.1a-r9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND==net-libs/libupnp-1.6*:0
 SLOT=0
 SRC_URI=http://ushare.geexbox.org/releases/ushare-1.1a.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4e6ffbad3647820841f2a472fb6022fa
diff --git a/metadata/md5-cache/media-video/vcsi-7 b/metadata/md5-cache/media-video/vcsi-7
index 1f5c3823a54a..f431bfdaf48f 100644
--- a/metadata/md5-cache/media-video/vcsi-7
+++ b/metadata/md5-cache/media-video/vcsi-7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/amietn/vcsi/archive/v7.tar.gz -> vcsi-7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ca9ecb2ac56fbdde44bf74f7d28bfa1
diff --git a/metadata/md5-cache/media-video/vlc-3.0.8 b/metadata/md5-cache/media-video/vlc-3.0.8
index 73663221a622..561f7f3c71de 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.8
+++ b/metadata/md5-cache/media-video/vlc-3.0.8
@@ -1,16 +1,16 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( <media-libs/opencv-4:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse test
 KEYWORDS=amd64 ~arm arm64 ppc ppc64 -sparc x86
 LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( <media-libs/opencv-4:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[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 )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.8/vlc-3.0.8.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=321af43b4485668fa94b32bf054aa9fd
+_md5_=a1b213cdae3665f56d50c74a140c2241
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index 750f38dd0624..a464867cf99a 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare test unpack
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( <media-libs/opencv-4:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( <media-libs/opencv-4:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[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 )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c162b628a9351d2747963bce90828535
+_md5_=5049c83fa65c31f1f8f6efc6627fa2c2
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 36fbe5e1a178..0f3d18d1c252 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=configure install postinst postrm preinst prepare test unpack
-DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( <media-libs/opencv-4:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Media player and framework with support for most multimedia files and streaming
 EAPI=7
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx wayland +X x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse test
 LICENSE=LGPL-2.1 GPL-2
 PROPERTIES=live
-RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( media-libs/opencv:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[dbus] ) zvbi? ( media-libs/zvbi )
+RDEPEND=net-dns/libidn:= sys-libs/zlib[minizip] virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) alsa? ( media-libs/alsa-lib ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) aribsub? ( media-libs/aribb24 ) bidi? ( dev-libs/fribidi media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts ) bluray? ( media-libs/libbluray:= ) cddb? ( media-libs/libcddb ) chromaprint? ( media-libs/chromaprint:= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= >=net-libs/libmicrodns-0.0.9:= ) dav1d? ( media-libs/dav1d:= ) dbus? ( sys-apps/dbus ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394 ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) dvd? ( >=media-libs/libdvdnav-4.9:0= >=media-libs/libdvdread-4.9:0= ) faad? ( media-libs/faad2 ) fdk? ( media-libs/fdk-aac:= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac media-libs/libogg ) fluidsynth? ( media-sound/fluidsynth:= ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gme? ( media-libs/game-music-emu ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:= ) libcaca? ( media-libs/libcaca ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify ) libplacebo? ( media-libs/libplacebo ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( dev-libs/libtar ) libtiger? ( media-libs/libtiger ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= media-libs/libmatroska:= ) modplug? ( >=media-libs/libmodplug-0.8.9.0 ) mp3? ( media-sound/mpg123 ) mpeg? ( media-libs/libmpeg2 ) mtp? ( media-libs/libmtp:= ) musepack? ( media-sound/musepack-tools ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg ) opencv? ( <media-libs/opencv-4:= ) opus? ( >=media-libs/opus-1.0.3 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc ) ) projectm? ( media-fonts/dejavu media-libs/libprojectm ) pulseaudio? ( media-sound/pulseaudio ) 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:=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) sdl-image? ( media-libs/sdl-image ) sftp? ( net-libs/libssh2 ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXinerama x11-libs/libXpm ) soxr? ( >=media-libs/soxr-0.1.2 ) speex? ( >=media-libs/speex-1.2.0 media-libs/speexdsp ) srt? ( >=net-libs/srt-1.3.0 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) taglib? ( >=media-libs/taglib-1.9 ) theora? ( media-libs/libtheora ) tremor? ( media-libs/tremor ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( virtual/udev ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:= ) vaapi? ( x11-libs/libva:=[drm,wayland?,X?] ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) 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.0.20190214:= ) x265? ( media-libs/x265:= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi[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 )
 RESTRICT=!test? ( test )
 SLOT=0/12-9
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0500571b0f21f00d272cad3686904681
+_md5_=df6006df132e83c3808949ee230d8c96
diff --git a/metadata/md5-cache/media-video/yle-dl-20191022-r1 b/metadata/md5-cache/media-video/yle-dl-20191022-r1
index 3a928c560418..2dd0a8a34d4d 100644
--- a/metadata/md5-cache/media-video/yle-dl-20191022-r1
+++ b/metadata/md5-cache/media-video/yle-dl-20191022-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aajanki/yle-dl/archive/20191022.tar.gz -> yle-dl-20191022.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0b748a0eb857eec423411684d9cd59f5
diff --git a/metadata/md5-cache/media-video/yle-dl-20191231 b/metadata/md5-cache/media-video/yle-dl-20191231
index a303f3096bcb..533398a20f02 100644
--- a/metadata/md5-cache/media-video/yle-dl-20191231
+++ b/metadata/md5-cache/media-video/yle-dl-20191231
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/aajanki/yle-dl/archive/20191231.tar.gz -> yle-dl-20191231.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c9741850f16cb85355170fdb2520f342
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.2 b/metadata/md5-cache/net-analyzer/2ping-4.2
index a6bdc4a01ec4..249da2f66db7 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.finnie.org/software/2ping/2ping-4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=771f119ffce4ff7e6af895caf4010816
diff --git a/metadata/md5-cache/net-analyzer/2ping-4.3 b/metadata/md5-cache/net-analyzer/2ping-4.3
index 7df6c9990405..b5e0d183010e 100644
--- a/metadata/md5-cache/net-analyzer/2ping-4.3
+++ b/metadata/md5-cache/net-analyzer/2ping-4.3
@@ -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://www.finnie.org/software/2ping/2ping-4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1fab3a06bac8188cba296d7b8fdba90f
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4230eaea6b26..58eb33e6cfdb 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/argus-3.0.8.2-r1 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r1
index 02e9b28fc216..aa6266ead583 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r1
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ee4027b6603513d68c9447682670ab3
diff --git a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r2 b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r2
index 5dbb0915d1a3..6e266fd4793a 100644
--- a/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r2
+++ b/metadata/md5-cache/net-analyzer/argus-3.0.8.2-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=net-libs/libnsl:= net-libs/libpcap sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 SLOT=0
 SRC_URI=https://www.qosient.com/argus/dev/argus-3.0.8.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0754b39d03103d0f6cb570a6b54068bd
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11 b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
index cd24ea535358..b1cbe002351d 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
+++ b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r11
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch )
 SLOT=0
 SRC_URI=ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz https://dev.gentoo.org/~jer/arpwatch-patchset-0.8.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=e681f264c7f2ddbffbb7347338b5854a
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8 b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8
index b941a59aaf85..ffe7ba74ec27 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8
+++ b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r8
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch )
 SLOT=0
 SRC_URI=ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz https://dev.gentoo.org/~jer/arpwatch-patchset-0.7.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ee7d415cd1f32c0ae09ce9a276f63f4f
diff --git a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r9 b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r9
index 4a86266e63da..7f7ab058a187 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r9
+++ b/metadata/md5-cache/net-analyzer/arpwatch-2.1.15-r9
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch )
 SLOT=0
 SRC_URI=ftp://ftp.ee.lbl.gov/arpwatch-2.1a15.tar.gz https://dev.gentoo.org/~jer/arpwatch-patchset-0.8.tar.xz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6b669d5371351ae49b84cf02fd591726
diff --git a/metadata/md5-cache/net-analyzer/authforce-0.9.9-r3 b/metadata/md5-cache/net-analyzer/authforce-0.9.9-r3
new file mode 100644
index 000000000000..6aed09570e49
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/authforce-0.9.9-r3
@@ -0,0 +1,13 @@
+BDEPEND=nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/readline:0= curl? ( net-misc/curl )
+DESCRIPTION=An HTTP authentication brute forcer
+EAPI=7
+HOMEPAGE=http://www.divineinvasion.net/authforce/
+IUSE=curl nls
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:0= curl? ( net-misc/curl )
+SLOT=0
+SRC_URI=http://www.divineinvasion.net/authforce/authforce-0.9.9.tar.gz
+_md5_=9cab18e2e15eeebc84f0f84b80772108
diff --git a/metadata/md5-cache/net-analyzer/bigeye-0.3-r4 b/metadata/md5-cache/net-analyzer/bigeye-0.3-r4
index 3b38decda4d4..e6fe6e479e25 100644
--- a/metadata/md5-cache/net-analyzer/bigeye-0.3-r4
+++ b/metadata/md5-cache/net-analyzer/bigeye-0.3-r4
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://violating.us/projects/bigeye/download/bigeye-0.3.tgz https://dev.gentoo.org/~jer/bigeye-0.3-gcc34.patch.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=05f89a8e52755f3b5dcdcffd881f018e
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a55fd9608026b5e9130bfd624c9f6132
diff --git a/metadata/md5-cache/net-analyzer/cacti-1.2.9 b/metadata/md5-cache/net-analyzer/cacti-1.2.9
new file mode 100644
index 000000000000..89a477b578df
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-1.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prerm setup
+DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Cacti is a complete frontend to rrdtool
+EAPI=7
+HOMEPAGE=https://www.cacti.net/
+IUSE=snmp doc vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[cli,mysql,pdo,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
+SLOT=1.2.9
+SRC_URI=https://www.cacti.net/downloads/cacti-1.2.9.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=14c32a0c877e1ecda3b3e585d02ac6fe
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-1.2.9 b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.9
new file mode 100644
index 000000000000..69c8a2ef5479
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/cacti-spine-1.2.9
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= sys-apps/help2man
+DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
+EAPI=7
+HOMEPAGE=https://cacti.net/spine_info.php
+IUSE=libressl
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-analyzer/net-snmp:= dev-db/mysql-connector-c:0= >net-analyzer/cacti-0.8.8
+SLOT=0
+SRC_URI=https://www.cacti.net/downloads/spine/cacti-spine-1.2.9.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ef6efeb26d2d116cc32b2c1c4ce71190
diff --git a/metadata/md5-cache/net-analyzer/carl-0.9-r2 b/metadata/md5-cache/net-analyzer/carl-0.9-r2
index 6f4f53784020..9b1d2a1d9457 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_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://www.schwarzvogel.de/pkgs/carl-0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0032651a0e2fff6307ee5fee7f8507a0
diff --git a/metadata/md5-cache/net-analyzer/chronograf-1.4.3.0 b/metadata/md5-cache/net-analyzer/chronograf-1.4.3.0
index c99387361219..8cbe109661bb 100644
--- a/metadata/md5-cache/net-analyzer/chronograf-1.4.3.0
+++ b/metadata/md5-cache/net-analyzer/chronograf-1.4.3.0
@@ -8,5 +8,5 @@ LICENSE=AGPL-3+
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/chronograf/archive/1.4.3.0.tar.gz -> chronograf-1.4.3.0.tar.gz https://dev.gentoo.org/~williamh/dist/chronograf-gen-1.4.3.0.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=dddc507158aed15cd4f215da94554887
diff --git a/metadata/md5-cache/net-analyzer/chronograf-1.6.2 b/metadata/md5-cache/net-analyzer/chronograf-1.6.2
index b3986c21b2fb..0f5b8ef1c875 100644
--- a/metadata/md5-cache/net-analyzer/chronograf-1.6.2
+++ b/metadata/md5-cache/net-analyzer/chronograf-1.6.2
@@ -8,5 +8,5 @@ LICENSE=AGPL-3+
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/chronograf/archive/1.6.2.tar.gz -> chronograf-1.6.2.tar.gz https://dev.gentoo.org/~williamh/dist/chronograf-gen-1.6.2.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e79853a9d7554c8cbafc63bbb0122422
diff --git a/metadata/md5-cache/net-analyzer/chronograf-1.7.3 b/metadata/md5-cache/net-analyzer/chronograf-1.7.3
index 71940c97da71..fc37a40d8632 100644
--- a/metadata/md5-cache/net-analyzer/chronograf-1.7.3
+++ b/metadata/md5-cache/net-analyzer/chronograf-1.7.3
@@ -8,5 +8,5 @@ LICENSE=AGPL-3+
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/chronograf/archive/1.7.3.tar.gz -> chronograf-1.7.3.tar.gz https://dev.gentoo.org/~williamh/dist/chronograf-gen-1.7.3.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a7e53fa9e6cf78edcf6e0fa781c4f66f
diff --git a/metadata/md5-cache/net-analyzer/darkstat-3.0.719 b/metadata/md5-cache/net-analyzer/darkstat-3.0.719
index 0efe2bc82e45..eba777c00fc4 100644
--- a/metadata/md5-cache/net-analyzer/darkstat-3.0.719
+++ b/metadata/md5-cache/net-analyzer/darkstat-3.0.719
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libbsd net-libs/libpcap sys-libs/zlib
 SLOT=0
 SRC_URI=https://unix4lyfe.org/darkstat/darkstat-3.0.719.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=434210452a0efc34cc94d03ca50dc709
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.10.4 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.4
deleted file mode 100644
index b3d99e7996e8..000000000000
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.10.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] virtual/pkgconfig
-DESCRIPTION=scans log files and bans IPs that show malicious signs
-EAPI=6
-HOMEPAGE=https://www.fail2ban.org/
-IUSE=selinux systemd python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=~alpha amd64 arm hppa ppc ppc64 sparc x86
-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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.4 -> fail2ban-0.10.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e6265caa04ac5eab36fdd522982f0b0
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.10.4-r1 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.4-r1
new file mode 100644
index 000000000000..1bddc985348d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.10.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) virtual/pkgconfig
+DESCRIPTION=scans log files and bans IPs that show malicious signs
+EAPI=6
+HOMEPAGE=https://www.fail2ban.org/
+IUSE=selinux systemd +python_single_target_python3_6
+KEYWORDS=~alpha amd64 arm hppa ppc ppc64 sparc x86
+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_python3_6? ( || ( dev-python/python-systemd[python_targets_python3_6(-)] sys-apps/systemd[python(-),python_targets_python3_6(-)] ) ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.4 -> fail2ban-0.10.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b1ddafb099bbf2f81ab425251bd9afc
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.10.4-r2 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.4-r2
index 3975b952698a..d41c33877a4e 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.10.4-r2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.10.4-r2
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] virtual/pkgconfig
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DESCRIPTION=scans log files and bans IPs that show malicious signs
 EAPI=7
 HOMEPAGE=https://www.fail2ban.org/
-IUSE=selinux systemd python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=selinux systemd +python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python3_6(-)] sys-apps/systemd[python(-),python_targets_python3_6(-)] ) ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.4 -> fail2ban-0.10.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5e8ef426869f968d05b93d57995d6dc8
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bc2d3d59f3e66970bf8ef414dfc28a7e
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.10.5-r1 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.5-r1
index ad60245a4315..9c863cec11ab 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.10.5-r1
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.10.5-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] virtual/pkgconfig
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DESCRIPTION=scans log files and bans IPs that show malicious signs
 EAPI=7
 HOMEPAGE=https://www.fail2ban.org/
-IUSE=selinux systemd python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=selinux systemd +python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python3_6(-)] sys-apps/systemd[python(-),python_targets_python3_6(-)] ) ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.5 -> fail2ban-0.10.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=25148bf93a71da77c4ad8b4629e8c796
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2e0359bfb3681c6adc5670ccfa354957
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r1 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r1
deleted file mode 100644
index 8936824bcf37..000000000000
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DESCRIPTION=scans log files and bans IPs that show malicious signs
-EAPI=7
-HOMEPAGE=https://www.fail2ban.org/
-IUSE=selinux systemd python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.1.tar.gz -> fail2ban-0.11.1.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=914e6d8f870d52e2e92ee0db7c6968d4
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2
new file mode 100644
index 000000000000..5b319a9a960f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.11.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DESCRIPTION=scans log files and bans IPs that show malicious signs
+EAPI=7
+HOMEPAGE=https://www.fail2ban.org/
+IUSE=selinux systemd +python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python3_6(-)] sys-apps/systemd[python(-),python_targets_python3_6(-)] ) ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.1.tar.gz -> fail2ban-0.11.1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=74ef8a6a5a9ce8e2d8e36e4ba067488a
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-99999999 b/metadata/md5-cache/net-analyzer/fail2ban-99999999
index 7d6167b58b7d..b0d66818213f 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-99999999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-99999999
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
 DESCRIPTION=scans log files and bans IPs that show malicious signs
 EAPI=7
 HOMEPAGE=https://www.fail2ban.org/
-IUSE=selinux systemd python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=selinux systemd +python_single_target_python3_6
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,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_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[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 )
+RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python3_6(-)] sys-apps/systemd[python(-),python_targets_python3_6(-)] ) ) ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=89553252aa5ab283e12c3333460b0168
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c4ab808b054bb6e7ae5a5ab055ad6d31
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 91bf1c3f231a..64939377b4e8 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_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a42cb17d91c8d485bddd3371884e71d6
diff --git a/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r10 b/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r10
index 7718fd7990ae..901e03c0fde3 100644
--- a/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r10
+++ b/metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r10
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://flow-tools.googlecode.com/files/flow-tools-0.68.5.1.tar.bz2
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0da3d4cbf8bcfeb5cecdb18b5041a55a
diff --git a/metadata/md5-cache/net-analyzer/goaccess-1.3 b/metadata/md5-cache/net-analyzer/goaccess-1.3
index d25241e56f53..e712fa030c0c 100644
--- a/metadata/md5-cache/net-analyzer/goaccess-1.3
+++ b/metadata/md5-cache/net-analyzer/goaccess-1.3
@@ -11,4 +11,4 @@ RDEPEND=sys-libs/ncurses:0=[unicode?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoi
 REQUIRED_USE=btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )
 SLOT=0
 SRC_URI=https://tar.goaccess.io/goaccess-1.3.tar.gz
-_md5_=b7118cc05d3c419a658770225dc79600
+_md5_=34b83afa33f749d3c3ea647a753c6bbc
diff --git a/metadata/md5-cache/net-analyzer/gr-fosphor-9999 b/metadata/md5-cache/net-analyzer/gr-fosphor-9999
index 546f8fd54102..77d93cb49be2 100644
--- a/metadata/md5-cache/net-analyzer/gr-fosphor-9999
+++ b/metadata/md5-cache/net-analyzer/gr-fosphor-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) >=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 dev-util/cppunit
+DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) >=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,python_single_target_python2_7(-)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 dev-util/cppunit
 DESCRIPTION=gnuradio fosphor block (GPU spectrum display)
 EAPI=7
 HOMEPAGE=https://sdr.osmocom.org/trac/wiki/fosphor
-IUSE=glfw qt5 wxwidgets +python_targets_python2_7 +python_single_target_python2_7
+IUSE=glfw qt5 wxwidgets +python_single_target_python2_7
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) >=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) >=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,python_single_target_python2_7(-)?] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b06e5205925a742437b405c22bb30f94
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40e44a457920f1546eedb2fa61297509
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.3-r1 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.3-r1
index 6a0eb349c42a..52513202edb2 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.3-r1
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.3-r1
@@ -10,5 +10,5 @@ RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3e4955f57424b634719529fdeaa6a8b3
diff --git a/metadata/md5-cache/net-analyzer/graphite-web-1.1.5 b/metadata/md5-cache/net-analyzer/graphite-web-1.1.5
index bbd0eec1c802..d5691582830f 100644
--- a/metadata/md5-cache/net-analyzer/graphite-web-1.1.5
+++ b/metadata/md5-cache/net-analyzer/graphite-web-1.1.5
@@ -10,5 +10,5 @@ RDEPEND=carbon? ( dev-python/carbon[python_targets_python3_6(-)?,-python_single_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/g/graphite-web/graphite-web-1.1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=793cafd2ffa34385c371926032e9a6b0
diff --git a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1 b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
index bbc2180d6934..dd2fd2eba58a 100644
--- a/metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
+++ b/metadata/md5-cache/net-analyzer/greenbone-security-assistant-8.0.1-r1
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libgcrypt:0= dev-libs/libxslt >=net-analyzer/gvm-libs-10.0.1 ne
 SLOT=0
 SRC_URI=https://github.com/greenbone/gsa/archive/v8.0.1.tar.gz -> greenbone-security-assistant-8.0.1.tar.gz https://github.com/greenbone/gsa/releases/download/v8.0.1/gsa-node-modules-8.0.1.tar.gz -> greenbone-security-assistant-8.0.1-node_modules.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bcfca54463461f4e867cfa6859f00f32
+_md5_=dfae771be0aee74f5a8f5f4436dfeacc
diff --git a/metadata/md5-cache/net-analyzer/gvm-libs-10.0.1 b/metadata/md5-cache/net-analyzer/gvm-libs-10.0.1
index 87f8876d9bec..b905f83b1059 100644
--- a/metadata/md5-cache/net-analyzer/gvm-libs-10.0.1
+++ b/metadata/md5-cache/net-analyzer/gvm-libs-10.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-crypt/gpgme:= dev-libs/hiredis dev-libs/libgcrypt:= dev-perl/UUID net-libs/gnutls:= net-libs/libssh:= sys-libs/zlib ldap? ( net-nds/openldap ) radius? ( net-dialup/freeradius-client )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-libs/archive/v10.0.1.tar.gz -> gvm-libs-10.0.1.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c49a6c9bd1aaed3d6160653625c835f3
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4bcba10dbc933121aabb493e282414fc
diff --git a/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0 b/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0
index 0b4923e26d6e..1f14630b7d8d 100644
--- a/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0
+++ b/metadata/md5-cache/net-analyzer/gvm-tools-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/defusedxml[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvm-tools/archive/v2.0.0.tar.gz -> gvm-tools-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ff8db7a02f38f38c8f889b47064e4a97
diff --git a/metadata/md5-cache/net-analyzer/gvmd-8.0.1 b/metadata/md5-cache/net-analyzer/gvmd-8.0.1
index 2c15b916d713..a78dcd620eb4 100644
--- a/metadata/md5-cache/net-analyzer/gvmd-8.0.1
+++ b/metadata/md5-cache/net-analyzer/gvmd-8.0.1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=https://github.com/greenbone/gvmd/archive/v8.0.1.tar.gz -> gvmd-8.0.1.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e11ab06f0457445b39d2554ccc3b7ec
+_md5_=67ab31042a77efaccfa8801f77b144f5
diff --git a/metadata/md5-cache/net-analyzer/icinga-1.14.2 b/metadata/md5-cache/net-analyzer/icinga-1.14.2
index 92a8a675b6c6..ae313e8e7a64 100644
--- a/metadata/md5-cache/net-analyzer/icinga-1.14.2
+++ b/metadata/md5-cache/net-analyzer/icinga-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) perl? ( dev-lang/p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/icinga/icinga-core/archive/v1.14.2/icinga-1.14.2.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0f3dc0dd05f9dd25a984a8e5a41ef491
diff --git a/metadata/md5-cache/net-analyzer/icinga-web-1.14.1 b/metadata/md5-cache/net-analyzer/icinga-web-1.14.1
index e50c644f3ec9..c7c03fda0ad1 100644
--- a/metadata/md5-cache/net-analyzer/icinga-web-1.14.1
+++ b/metadata/md5-cache/net-analyzer/icinga-web-1.14.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-php/phing dev-db/libdbi-drivers[mysql?,postgres?] || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 ) dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml] pnp? ( net-analyzer/pnp4nagios ) apache2? ( =www-servers/apache-2* )
 SLOT=0
 SRC_URI=https://github.com/icinga/icinga-web/archive/v1.14.1/icinga-web-1.14.1.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d484a7a26645919ec50d2cef3b387f48
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.10.5 b/metadata/md5-cache/net-analyzer/icinga2-2.10.5
index 30cd1cf00ce5..fc567da139b9 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.10.5
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.10.5
@@ -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.10.5.tar.gz -> icinga2-2.10.5.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5951754df8b2909dec18e7552724e19
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a19894d4084ff6726854185ddecbcf4a
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.10.6 b/metadata/md5-cache/net-analyzer/icinga2-2.10.6
index 1e8af12204ca..fec5c0d65aca 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.10.6
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.10.6
@@ -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.10.6.tar.gz -> icinga2-2.10.6.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7c184d11212948e88f2a2085c30f352
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f77a45f475418c7c40587262160cdbad
diff --git a/metadata/md5-cache/net-analyzer/icinga2-2.11.2 b/metadata/md5-cache/net-analyzer/icinga2-2.11.2
index 309cc83b27aa..8a45287ddf3c 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-2.11.2
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.11.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.11.2.tar.gz -> icinga2-2.11.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6774308de84f52ce2e3899c8d4e064d7
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a7937fd8071a58132c390ad037988818
diff --git a/metadata/md5-cache/net-analyzer/icinga2-9999 b/metadata/md5-cache/net-analyzer/icinga2-9999
index d35b240f9a3c..307d9fc21126 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-9999
+++ b/metadata/md5-cache/net-analyzer/icinga2-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.66:=[context] 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	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=525343176eac445b1e0eb72b589fa48f
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd962c5b51daeb2429fa2f10073fc632
diff --git a/metadata/md5-cache/net-analyzer/jffnms-0.9.4-r1 b/metadata/md5-cache/net-analyzer/jffnms-0.9.4-r1
index f90a9e4e5157..f39074cd1ca9 100644
--- a/metadata/md5-cache/net-analyzer/jffnms-0.9.4-r1
+++ b/metadata/md5-cache/net-analyzer/jffnms-0.9.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/php[apache2,cli,gd,mysql?,postgres?,session,snmp,sockets,wddx] dev-php/PEAR-PEAR media-gfx/graphviz media-libs/gd net-analyzer/fping net-analyzer/net-snmp net-analyzer/nmap net-analyzer/rrdtool[graph] sys-apps/diffutils
 SLOT=0
 SRC_URI=mirror://sourceforge/jffnms/jffnms-0.9.4.tgz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3f090697390bb1a24cf052459ac921e1
diff --git a/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1 b/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
index c9f9271c8d88..09697c84b15e 100644
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
+++ b/metadata/md5-cache/net-analyzer/kapacitor-1.4.1-r1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/kapacitor/archive/v1.4.1.tar.gz -> kapacitor-1.4.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/net-analyzer/kapacitor-1.5.1 b/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
index 88b4fb096071..3264c6db300e 100644
--- a/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
+++ b/metadata/md5-cache/net-analyzer/kapacitor-1.5.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/kapacitor/archive/v1.5.1.tar.gz -> kapacitor-1.5.1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fabc11f51ec713f1faba37b2c0415fdb
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9.4.0-r1 b/metadata/md5-cache/net-analyzer/linkchecker-9.4.0-r1
index b9d3911475aa..2511ef8b6859 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9.4.0-r1
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9.4.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linkcheck/linkchecker/archive/v9.4.0.tar.gz -> linkchecker-9.4.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1507502d6722c16be74f6c78ccae5f40
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9999 b/metadata/md5-cache/net-analyzer/linkchecker-9999
index d22e8b5ab6e0..086f4236195c 100644
--- a/metadata/md5-cache/net-analyzer/linkchecker-9999
+++ b/metadata/md5-cache/net-analyzer/linkchecker-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=13e361bfa6f61b190d862affa34666cb
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
index 3634e5e66ce3..703e6f10c357 100644
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
+++ b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p16
@@ -3,13 +3,13 @@ DEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0
 DESCRIPTION=Nagios/Icinga event broker that allows quick/direct access to your status data
 EAPI=6
 HOMEPAGE=http://mathias-kettner.de/checkmk_livestatus.html
-IUSE=examples nagios4 perl python test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=examples nagios4 perl python test +python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.8p16.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b85602cf4968bf25f09753a8fd649de1
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=adec0b9b8511b1919bea0bda224d3de6
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26-r1 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26-r1
index b81ee832b8cc..1c453c72c33e 100644
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26-r1
+++ b/metadata/md5-cache/net-analyzer/mk-livestatus-1.2.8_p26-r1
@@ -3,13 +3,13 @@ DEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0
 DESCRIPTION=Nagios/Icinga event broker that allows quick/direct access to your status data
 EAPI=6
 HOMEPAGE=http://mathias-kettner.de/checkmk_livestatus.html
-IUSE=examples nagios4 perl python test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=examples nagios4 perl python test +python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/ucspi-unix:0 perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://mathias-kettner.de/download/mk-livestatus-1.2.8p26.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c3333de6956aa10b33a4c0c1590fe6dc
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=cf960eed3b59fb5a3251c34a4889fd48
diff --git a/metadata/md5-cache/net-analyzer/mk-livestatus-1.5.0_p22-r1 b/metadata/md5-cache/net-analyzer/mk-livestatus-1.5.0_p22-r1
index cf771c279487..4d523b4a3247 100644
--- a/metadata/md5-cache/net-analyzer/mk-livestatus-1.5.0_p22-r1
+++ b/metadata/md5-cache/net-analyzer/mk-livestatus-1.5.0_p22-r1
@@ -4,13 +4,13 @@ DEPEND=!sys-apps/ucspi-unix:0 net-analyzer/rrdtool:= boost? ( dev-libs/boost ) p
 DESCRIPTION=Nagios/Icinga event broker that allows quick/direct access to your status data
 EAPI=7
 HOMEPAGE=https://checkmk.com/
-IUSE=boost examples nagios4 perl python re2 test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=boost examples nagios4 perl python re2 test +python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=!sys-apps/ucspi-unix:0 net-analyzer/rrdtool:= boost? ( dev-libs/boost ) perl? ( dev-lang/perl:0 virtual/perl-Digest-MD5:0 virtual/perl-Scalar-List-Utils:0 >=virtual/perl-Thread-Queue-2.11:0 virtual/perl-Encode:0 dev-perl/JSON-XS:0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) re2? ( dev-libs/re2:= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://checkmk.com/support/1.5.0p22/mk-livestatus-1.5.0p22.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=623bf4f6df73794142bed2fc782a0b8f
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
index d5a987e20ef4..da74c49f6ce2 100644
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgr
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9052d19236b382c8922219f19ce34d9e
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r3 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r3
index 2d01ba5541ca..1b956237179a 100644
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r3
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9d283be7b3163505c33bea7efa66b5f9
diff --git a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r4 b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r4
index 0e224c7a914a..9b0861e98692 100644
--- a/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r4
+++ b/metadata/md5-cache/net-analyzer/monitoring-plugins-2.2-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.monitoring-plugins.org/download/monitoring-plugins-2.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a1c583daa2e683b24034ad2c7db92cd9
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.49 b/metadata/md5-cache/net-analyzer/munin-2.0.49
index 4b8d14c4938c..f07b85b4ba27 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.49
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.49
@@ -11,5 +11,5 @@ REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.49.tar.gz -> munin-2.0.49.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.49-gentoo-1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=c2f0d0fda95532efa7c9bbf3adcbea80
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.52 b/metadata/md5-cache/net-analyzer/munin-2.0.52
index 272814e9dcc0..a1e47bf652e3 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.52
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.52
@@ -12,5 +12,5 @@ REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.52.tar.gz -> munin-2.0.52.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.52-gentoo-1.tar.xz
-_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9c4fb9d28f5b19951a9e2c7804743329
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.56 b/metadata/md5-cache/net-analyzer/munin-2.0.56
new file mode 100644
index 000000000000..13d421820d12
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.56
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) dev-perl/Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=7
+HOMEPAGE=http://munin-monitoring.org/
+IUSE=asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2 elibc_FreeBSD java
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/munin acct-user/munin-async acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-DNS dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/Net-Server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) asterisk? ( dev-perl/Net-Telnet ) cgi? ( dev-perl/FCGI dev-perl/CGI-Fast ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) doc? ( dev-python/sphinx ) http? ( dev-perl/libwww-perl ) irc? ( dev-perl/Net-IRC ) ldap? ( dev-perl/perl-ldap ) kernel_linux? ( sys-process/procps ) memcached? ( dev-perl/Cache-Memcached ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) ssl? ( dev-perl/Net-SSLeay ) syslog? ( virtual/perl-Sys-Syslog ) !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[graph,perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) selinux? ( sec-policy/selinux-munin ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=cgi? ( !minimal ) apache2? ( cgi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/munin-monitoring/munin/archive/2.0.56.tar.gz -> munin-2.0.56.tar.gz https://dev.gentoo.org/~graaff/munin/munin-2.0.56-gentoo-1.tar.xz
+_eclasses_=java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e2159b82b98616e41de050684cd548e8
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_glsa2-20120930-r1 b/metadata/md5-cache/net-analyzer/nagios-check_glsa2-20120930-r1
index fd4999612ac4..ccda2e4e233a 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_glsa2-20120930-r1
+++ b/metadata/md5-cache/net-analyzer/nagios-check_glsa2-20120930-r1
@@ -7,5 +7,5 @@ LICENSE=GPL-2 BSD-2
 RDEPEND=app-portage/gentoolkit
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~flameeyes/check_glsa2/check_glsa2-20120930.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cd042ec4bbd6b8395b8c1de5c926c24f
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1 b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
index 131ec9a8f62b..b208d3fac892 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
+++ b/metadata/md5-cache/net-analyzer/nagios-check_multiple-0.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clarkbox/check_multiple/archive/v0.0.1.tar.gz -> nagios-check_multiple-0.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f0ee81cea6fc5c00c118528047018188
diff --git a/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.2.2 b/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.2.2
index c5490d102c4c..252b3a8a3284 100644
--- a/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.2.2
+++ b/metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.2.2
@@ -7,4 +7,4 @@ LICENSE=BSD
 RDEPEND=dev-perl/DBD-mysql dev-perl/DBI virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-Net-Ping virtual/perl-Time-HiRes
 SLOT=0
 SRC_URI=https://labs.consol.de/assets/downloads/nagios/check_mysql_health-2.2.2.tar.gz
-_md5_=1f3cf276ab66b6a14531d15cc82f3594
+_md5_=3d81aca8a80e003be02f203e2656ca44
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.3.4 b/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
index 7217f9135c6a..efc98bace9f5 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.3.4
@@ -10,5 +10,5 @@ RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arc
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.3.4.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=75d3797ed1a344a21e09f72797eeafba
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.5-r3 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.5-r3
index 191e58eb2673..9755880b16c1 100644
--- a/metadata/md5-cache/net-analyzer/nagios-core-4.4.5-r3
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.5-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libltdl:0 virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-ar
 REQUIRED_USE=apache2? ( !lighttpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nagios-4.4.5.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e12c6c163539ed0131c42109753edaa5
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 226ae65083b2..7b16808ef069 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_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=20b0933cb45b716ab29fe8166d328ae0
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=03f76de48882be29c46966094d0d5b2c
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r3 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r3
index f418a44dd8ac..1027f2a10aba 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r3
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nagios-plugins.org/download/nagios-plugins-2.2.1.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5eb2d24040aadef4e0c15ef619a0e584
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r4 b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r4
index 730c97fa3e95..abadd981c6c3 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r4
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-2.2.1-r4
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nagios-plugins.org/download/nagios-plugins-2.2.1.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ff4ce3910dd61e07c9f22dc4e8e1aa13
diff --git a/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2 b/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
index 0860c0cfc272..c9cb1fd3e52c 100644
--- a/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
+++ b/metadata/md5-cache/net-analyzer/nagios-plugins-snmp-0.6.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=net-analyzer/net-snmp
 SLOT=0
 SRC_URI=http://nagios.manubulon.com/nagios-plugins-snmp-0.6.0.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=90c2f72facaa3f195ce810b944c7701c
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-2.0.1 b/metadata/md5-cache/net-analyzer/nagstamon-2.0.1
index 4de33555cd81..d1125491a0aa 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/nagstamon/Nagstamon-2.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=be863e7e601606559ed3bd2ae3f4c136
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 26aab39cbec2..80b122070dba 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=875c428b8ae7ec32ac596b6fe6d27252
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.2.1 b/metadata/md5-cache/net-analyzer/nagstamon-3.2.1
index 249f2d643796..1d8fdfeb8496 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.2.1
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e79e151c74a48a932f4ca5ab468a1447
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1 b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1
index cb3e3ea8e3ef..649b3235a2f4 100644
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e79e151c74a48a932f4ca5ab468a1447
diff --git a/metadata/md5-cache/net-analyzer/nast-0.2.0-r2 b/metadata/md5-cache/net-analyzer/nast-0.2.0-r2
index 9bc1b716fe55..478906f664c2 100644
--- a/metadata/md5-cache/net-analyzer/nast-0.2.0-r2
+++ b/metadata/md5-cache/net-analyzer/nast-0.2.0-r2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile configure install prepare
 DEPEND=>=net-libs/libnet-1.1.1 net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4:= ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=NAST - Network Analyzer Sniffer Tool
 EAPI=6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnet-1.1.1 net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/nast.berlios/nast-0.2.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=21d383e00cc1ea7adbd8e31b20fdc4dc
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=27ee8144747fb16eb10a0af8bddf7141
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.4.2 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.4.2
index d9e5e2cff07b..cb527e264485 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.4.2
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=NessusAgent-7.4.2-es7.x86_64.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2847f191b13948d192ad9f21aff17d17
diff --git a/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.5.0 b/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.5.0
index b9e967672de3..19fec4778d54 100644
--- a/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.5.0
+++ b/metadata/md5-cache/net-analyzer/nessus-agent-bin-7.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=NessusAgent-7.5.0-es7.x86_64.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2847f191b13948d192ad9f21aff17d17
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-8.5.2 b/metadata/md5-cache/net-analyzer/nessus-bin-8.5.2
index 6a3874df6bf8..7111ad70bf52 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-8.5.2
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-8.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=Nessus-8.5.2-es7.x86_64.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7fba47929bad3d4e7225b9214540b68c
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-8.8.0 b/metadata/md5-cache/net-analyzer/nessus-bin-8.8.0
index 8b5707261c71..493063e1b4f8 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-8.8.0
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-8.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=Nessus-8.8.0-es7.x86_64.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7fba47929bad3d4e7225b9214540b68c
diff --git a/metadata/md5-cache/net-analyzer/nessus-bin-8.9.0 b/metadata/md5-cache/net-analyzer/nessus-bin-8.9.0
index 0b5f87186ced..25104279cd9a 100644
--- a/metadata/md5-cache/net-analyzer/nessus-bin-8.9.0
+++ b/metadata/md5-cache/net-analyzer/nessus-bin-8.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 Nessus-EULA
 RESTRICT=mirror fetch strip
 SLOT=0
 SRC_URI=Nessus-8.9.0-es7.x86_64.rpm
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c8529ca6fd36814c17df9424a5700fb8
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
deleted file mode 100644
index 4e6d450c669f..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=6
-HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=124e13b6494e1b2ab31b8a5b7ea0e334
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2
deleted file mode 100644
index 394ec88486a8..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=6
-HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10514305875e5fe7f38c8bc7ed5d3f6b
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r3 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r3
new file mode 100644
index 000000000000..4771c3ebe614
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=6
+HOMEPAGE=http://www.net-snmp.org/
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_single_target_python2_7
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5fd106816713ba8bddacdfff4fa64a1d
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r4 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r4
new file mode 100644
index 000000000000..4682253ef338
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=6
+HOMEPAGE=http://www.net-snmp.org/
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) pci? ( sys-apps/pciutils ) lm-sensors? ( sys-apps/lm-sensors ) netlink? ( dev-libs/libnl:3 ) mysql? ( dev-db/mysql-connector-c:0= ) perl? ( dev-lang/perl:= ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a6f5353595ded106c1bfde8ebc6c4c96
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r5 b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r5
index 30a57f6f7c2b..99dc136bdb22 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8-r5
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8-r5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=6
 HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_targets_python2_7 +python_single_target_python2_7
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=HPND BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) rpm? ( bzip2 zlib )
+RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a757711470acf0e861a59521f413ad5c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bfa2d456f52954fb0ec67f1f288548cb
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1 b/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1
deleted file mode 100644
index 4b8bb70341b3..000000000000
--- a/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen )
-DESCRIPTION=Software for generating and retrieving SNMP data
-EAPI=7
-HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=HPND BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) rpm? ( bzip2 zlib )
-RESTRICT=test
-SLOT=0/35
-SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8.1-pre-releases/net-snmp-5.8.1.pre1.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5c787c3deb288e0a27bbb2eddbdfbbb2
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1 b/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
new file mode 100644
index 000000000000..5a2e12d0723d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen )
+DESCRIPTION=Software for generating and retrieving SNMP data
+EAPI=7
+HOMEPAGE=http://www.net-snmp.org/
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=HPND BSD GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) rpm? ( bzip2 zlib )
+RESTRICT=test
+SLOT=0/35
+SRC_URI=mirror://sourceforge/project/net-snmp/net-snmp/5.8.1-pre-releases/net-snmp-5.8.1.pre1.tar.gz https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f1832d1a2140234ab5e31f3be3ea95fd
diff --git a/metadata/md5-cache/net-analyzer/net-snmp-99999999 b/metadata/md5-cache/net-analyzer/net-snmp-99999999
index e07d26f3a596..f43ed9c55f5a 100644
--- a/metadata/md5-cache/net-analyzer/net-snmp-99999999
+++ b/metadata/md5-cache/net-analyzer/net-snmp-99999999
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen )
+DEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) doc? ( app-doc/doxygen )
 DESCRIPTION=Software for generating and retrieving SNMP data
 EAPI=7
 HOMEPAGE=http://www.net-snmp.org/
-IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_targets_python2_7 +python_single_target_python2_7
+IUSE=X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib +python_single_target_python2_7
 LICENSE=HPND BSD GPL-2
 PROPERTIES=live
-RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) rpm? ( bzip2 zlib )
+RDEPEND=bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) mysql? ( dev-db/mysql-connector-c:0= ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rpm? ( app-arch/rpm dev-libs/popt ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) libressl? ( dev-libs/libressl:= ) ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) perl? ( X? ( dev-perl/Tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmp )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) rpm? ( bzip2 zlib )
 RESTRICT=test
 SLOT=0/35
 SRC_URI=https://dev.gentoo.org/~jer/net-snmp-5.7.3-patches-3.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b3f03fdfc03255c0c792fc725e2f2e86
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ef52645bd3b8e204550d45a70a6e9797
diff --git a/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2 b/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
index 6d181996b718..ede73f7d026d 100644
--- a/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
+++ b/metadata/md5-cache/net-analyzer/netperf-2.7.0-r2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=netperf
 SLOT=0
 SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.7.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fb8fb63db9ad9040739e61df62a2c52
diff --git a/metadata/md5-cache/net-analyzer/ngrep-1.45-r3 b/metadata/md5-cache/net-analyzer/ngrep-1.45-r3
index d84bddfa2f0d..b04fb4e257b9 100644
--- a/metadata/md5-cache/net-analyzer/ngrep-1.45-r3
+++ b/metadata/md5-cache/net-analyzer/ngrep-1.45-r3
@@ -9,5 +9,5 @@ LICENSE=ngrep
 RDEPEND=dev-libs/libpcre net-libs/libpcap
 SLOT=0
 SRC_URI=mirror://sourceforge/ngrep/ngrep-1.45.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8c6fbb24c1cd284b7a5463cf6b90dccc
diff --git a/metadata/md5-cache/net-analyzer/ngrep-1.47 b/metadata/md5-cache/net-analyzer/ngrep-1.47
index bed8279feb40..606df1204f82 100644
--- a/metadata/md5-cache/net-analyzer/ngrep-1.47
+++ b/metadata/md5-cache/net-analyzer/ngrep-1.47
@@ -10,5 +10,5 @@ LICENSE=ngrep
 RDEPEND=dev-libs/libpcre net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/jpr5/ngrep/archive/V1_47.tar.gz -> ngrep-1.47.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fdf696fac8f84036a33e35edca73be1d
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.70 b/metadata/md5-cache/net-analyzer/nmap-7.70
deleted file mode 100644
index 4999352363b3..000000000000
--- a/metadata/md5-cache/net-analyzer/nmap-7.70
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 utility for network discovery and security auditing
-EAPI=6
-HOMEPAGE=https://nmap.org/
-IUSE=ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua zenmap +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=system-lua? ( nse ) ndiff? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) zenmap? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://nmap.org/dist/nmap-7.70.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=880fb8a752ce91797e571f7a47be9dd7
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.70-r1 b/metadata/md5-cache/net-analyzer/nmap-7.70-r1
new file mode 100644
index 000000000000..3a888221a383
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nmap-7.70-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 utility for network discovery and security auditing
+EAPI=6
+HOMEPAGE=https://nmap.org/
+IUSE=ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua zenmap +python_single_target_python2_7
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+REQUIRED_USE=system-lua? ( nse ) ndiff? ( ^^ ( python_single_target_python2_7 ) ) zenmap? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=https://nmap.org/dist/nmap-7.70.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8c080c64ae2a7f46644b992538dceaba
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.80 b/metadata/md5-cache/net-analyzer/nmap-7.80
deleted file mode 100644
index 05e557b2d748..000000000000
--- a/metadata/md5-cache/net-analyzer/nmap-7.80
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
-DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( sys-devel/gettext )
-DESCRIPTION=A utility for network discovery and security auditing
-EAPI=7
-HOMEPAGE=https://nmap.org/
-IUSE=ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua zenmap +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=system-lua? ( nse ) ndiff? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) zenmap? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://nmap.org/dist/nmap-7.80.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=5a9dce97b33ce3a8b3f86c6eba4d28e7
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.80-r1 b/metadata/md5-cache/net-analyzer/nmap-7.80-r1
new file mode 100644
index 000000000000..266a31123d41
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nmap-7.80-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( sys-devel/gettext )
+DESCRIPTION=A utility for network discovery and security auditing
+EAPI=7
+HOMEPAGE=https://nmap.org/
+IUSE=ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua zenmap +python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+REQUIRED_USE=system-lua? ( nse ) ndiff? ( ^^ ( python_single_target_python2_7 ) ) zenmap? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=https://nmap.org/dist/nmap-7.80.tar.bz2 https://dev.gentoo.org/~jer/nmap-logo-64.png
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=5cd359a2a67bc26c51001132a43ee687
diff --git a/metadata/md5-cache/net-analyzer/nmap-9999 b/metadata/md5-cache/net-analyzer/nmap-9999
index 1a52f26cd6d1..2b81c9d9b78e 100644
--- a/metadata/md5-cache/net-analyzer/nmap-9999
+++ b/metadata/md5-cache/net-analyzer/nmap-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 unpack
-DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( sys-devel/gettext )
+DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( sys-devel/gettext )
 DESCRIPTION=A utility for network discovery and security auditing
 EAPI=7
 HOMEPAGE=https://nmap.org/
-IUSE=ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua zenmap +python_targets_python2_7 +python_single_target_python2_7
+IUSE=ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua zenmap +python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=system-lua? ( nse ) ndiff? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) zenmap? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) ndiff? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) nls? ( virtual/libintl ) nmap-update? ( dev-libs/apr dev-vcs/subversion ) nse? ( sys-libs/zlib ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+REQUIRED_USE=system-lua? ( nse ) ndiff? ( ^^ ( python_single_target_python2_7 ) ) zenmap? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/nmap-logo-64.png
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c57dcc7953c863c35d92144dc027e855
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=492d5e577f2bca2a8b4578a05319930a
diff --git a/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r1 b/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r1
index cab9e5434275..89fd42c60026 100644
--- a/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r1
+++ b/metadata/md5-cache/net-analyzer/nrpe-3.2.1-r1
@@ -9,5 +9,5 @@ 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	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=58dc4166c5fbff57184cf6145dcbf01e
diff --git a/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103 b/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103
index 0e89999762c2..e5061c90010d 100644
--- a/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103
+++ b/metadata/md5-cache/net-analyzer/nsca-2.7.2-r103
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) ) !minimal? ( || ( net-analyzer/icinga net-analyzer/nagios ) ) sys-apps/openrc
 SLOT=0
 SRC_URI=mirror://sourceforge/nagios/nsca-2.7.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6afbd10201d7daa769082262454c41c6
diff --git a/metadata/md5-cache/net-analyzer/ntopng-3.8-r1 b/metadata/md5-cache/net-analyzer/ntopng-3.8-r1
index a61553652a39..029f6d044e99 100644
--- a/metadata/md5-cache/net-analyzer/ntopng-3.8-r1
+++ b/metadata/md5-cache/net-analyzer/ntopng-3.8-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-db/sqlite:3 dev-python/pyzmq dev-lang/luajit:2 dev-libs/json-c:= dev-libs/geoip dev-libs/glib:2 dev-libs/hiredis dev-libs/libsodium:= dev-libs/libxml2 dev-libs/libmaxminddb net-analyzer/rrdtool net-libs/libpcap >=net-libs/nDPI-2.4:= net-misc/curl sys-libs/binutils-libs dev-db/mysql-connector-c:= dev-db/redis
 SLOT=0
 SRC_URI=https://github.com/ntop/ntopng/archive/3.8.tar.gz -> ntopng-3.8.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a1c7fdebfadaf7959176aef7c1dc817a
diff --git a/metadata/md5-cache/net-analyzer/ntopng-3.8.1-r3 b/metadata/md5-cache/net-analyzer/ntopng-3.8.1-r3
index 7d1ec42cfc40..970266cff31e 100644
--- a/metadata/md5-cache/net-analyzer/ntopng-3.8.1-r3
+++ b/metadata/md5-cache/net-analyzer/ntopng-3.8.1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/nDPI-3.0:= dev-db/mysql-connector-c:= dev-db/sqlite:3 dev-lib
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ntop/ntopng/archive/3.8.1.tar.gz -> ntopng-3.8.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1f47277df8d5209f1f8dcd556e213f35
diff --git a/metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1 b/metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
index 3be4ed56d7b1..80776c2472ed 100644
--- a/metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
+++ b/metadata/md5-cache/net-analyzer/openvas-scanner-6.0.1
@@ -11,4 +11,4 @@ RDEPEND=app-crypt/gpgme:= dev-db/redis dev-libs/libgcrypt:= dev-libs/libksba >=n
 SLOT=0
 SRC_URI=https://github.com/greenbone/openvas-scanner/archive/v6.0.1.tar.gz -> openvas-scanner-6.0.1.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3542cf63fb79f66ccfff6f835d2202f
+_md5_=ffbef8ae22d02b8a8dd2ece3b7a23f1a
diff --git a/metadata/md5-cache/net-analyzer/ospd-2.0.0 b/metadata/md5-cache/net-analyzer/ospd-2.0.0
index baf65f86a797..c2f72e5d2f9f 100644
--- a/metadata/md5-cache/net-analyzer/ospd-2.0.0
+++ b/metadata/md5-cache/net-analyzer/ospd-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/defusedxml[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/greenbone/ospd/archive/v2.0.0.tar.gz -> ospd-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1b757fd4c13802f7cd144b76bd855507
diff --git a/metadata/md5-cache/net-analyzer/ossec-hids-3.1.0 b/metadata/md5-cache/net-analyzer/ossec-hids-3.1.0
index 2686bbe1c79d..4e3ca2cf9b42 100644
--- a/metadata/md5-cache/net-analyzer/ossec-hids-3.1.0
+++ b/metadata/md5-cache/net-analyzer/ossec-hids-3.1.0
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/
 REQUIRED_USE=^^ ( agent hybrid local server ) ?? ( mysql postgres )
 SLOT=0
 SRC_URI=https://github.com/ossec/ossec-hids/archive/3.1.0.tar.gz -> ossec-hids-3.1.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3ba86b7b5295f24419e8454ac5fa9216
diff --git a/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0 b/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0
index 803da4abb2fe..f897f1045c76 100644
--- a/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0
+++ b/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/
 REQUIRED_USE=^^ ( agent hybrid local server ) ?? ( mysql postgres )
 SLOT=0
 SRC_URI=https://github.com/ossec/ossec-hids/archive/3.2.0.tar.gz -> ossec-hids-3.2.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0e94c57689e323884cf8d9b12938e8be
diff --git a/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0-r1 b/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0-r1
index 7411c9c84d90..19d81c999f5c 100644
--- a/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0-r1
+++ b/metadata/md5-cache/net-analyzer/ossec-hids-3.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/
 REQUIRED_USE=^^ ( agent hybrid local server ) ?? ( mysql postgres )
 SLOT=0
 SRC_URI=https://github.com/ossec/ossec-hids/archive/3.2.0.tar.gz -> ossec-hids-3.2.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e7139498b4902f3d8f4e8e0ae33d51f8
diff --git a/metadata/md5-cache/net-analyzer/ossec-hids-3.3.0 b/metadata/md5-cache/net-analyzer/ossec-hids-3.3.0
index 5451746ff7af..ed750387faea 100644
--- a/metadata/md5-cache/net-analyzer/ossec-hids-3.3.0
+++ b/metadata/md5-cache/net-analyzer/ossec-hids-3.3.0
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre2 mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) p
 REQUIRED_USE=^^ ( agent hybrid local server ) ?? ( mysql postgres )
 SLOT=0
 SRC_URI=https://github.com/ossec/ossec-hids/archive/3.3.0.tar.gz -> ossec-hids-3.3.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=25506857447cc49af3e64b30d6824700
diff --git a/metadata/md5-cache/net-analyzer/packit-1.6.1 b/metadata/md5-cache/net-analyzer/packit-1.6.1
index 621f1da99f46..7468c829b5ef 100644
--- a/metadata/md5-cache/net-analyzer/packit-1.6.1
+++ b/metadata/md5-cache/net-analyzer/packit-1.6.1
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/packit/archive/1.6.1.tar.gz -> packit-1.6.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c67f8d85dc57510d1e11a71d9ee399aa
+_md5_=6bf18000a94c71be10cef9961f6711be
diff --git a/metadata/md5-cache/net-analyzer/packit-1.7 b/metadata/md5-cache/net-analyzer/packit-1.7
new file mode 100644
index 000000000000..717d796f797e
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/packit-1.7
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=net-libs/libnet:1.1 net-libs/libpcap
+DESCRIPTION=network packet generator and capture tool
+EAPI=7
+HOMEPAGE=https://github.com/resurrecting-open-source-projects/packit
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=net-libs/libnet:1.1 net-libs/libpcap
+SLOT=0
+SRC_URI=https://github.com/resurrecting-open-source-projects/packit/archive/1.7.tar.gz -> packit-1.7.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f75e49dfb999ae52e42ae52c70be951b
diff --git a/metadata/md5-cache/net-analyzer/pbgpp-0.2.10 b/metadata/md5-cache/net-analyzer/pbgpp-0.2.10
index 14c2d9d89987..c3c2e31167ac 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc3c9b1b290f9d35de41970ef99b94f6
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 a22faeb2abb6..855c5bfef371 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_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae223742b36b0dcb7659043c423be011
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 ed360827bd33..35ea34b0ae3b 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_python3_6(-)?,-python_s
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d11bf89d062cb4a183bb9a5dab1afdc
diff --git a/metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0 b/metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0
index dc9965eedd1b..f31fec187183 100644
--- a/metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0
+++ b/metadata/md5-cache/net-analyzer/prelude-correlator-5.1.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libprelude-5.1.0[python,python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/prelude-correlator-5.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f59aef24c633a02830299c8c23ad71e2
diff --git a/metadata/md5-cache/net-analyzer/pypacker-2.9 b/metadata/md5-cache/net-analyzer/pypacker-2.9
index 5562007cabc1..56f05fe5e899 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=25757834cbe3a08b79490fdc7c8a4be3
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.6 b/metadata/md5-cache/net-analyzer/pypacker-4.6
index d96d601d212e..8f90ae633f4b 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=79aed89e7e9d4326a4fdd93c0ea80042
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.7 b/metadata/md5-cache/net-analyzer/pypacker-4.7
index 74f0b4e2defa..f67e2e82d6e7 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-4.7
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.7
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.7/pypacker-v4.7.tar.gz -> pypacker-4.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a04ca62dbe62825975ae6deb4b93b453
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.8 b/metadata/md5-cache/net-analyzer/pypacker-4.8
index 005ae57c58f6..bb500c2d9f1c 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-4.8
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.8
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.8/pypacker-v4.8.tar.gz -> pypacker-4.8.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=46d0bf6a0546228958e07855ce9648a1
diff --git a/metadata/md5-cache/net-analyzer/pypacker-4.9 b/metadata/md5-cache/net-analyzer/pypacker-4.9
index 04ba503af01a..ee5082bda8fa 100644
--- a/metadata/md5-cache/net-analyzer/pypacker-4.9
+++ b/metadata/md5-cache/net-analyzer/pypacker-4.9
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/mike01/pypacker/-/archive/v4.9/pypacker-v4.9.tar.gz -> pypacker-4.9.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=46d0bf6a0546228958e07855ce9648a1
diff --git a/metadata/md5-cache/net-analyzer/python-gvm-1.1.0 b/metadata/md5-cache/net-analyzer/python-gvm-1.1.0
index f23161f1b28e..9b62d3847cd9 100644
--- a/metadata/md5-cache/net-analyzer/python-gvm-1.1.0
+++ b/metadata/md5-cache/net-analyzer/python-gvm-1.1.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/greenbone/python-gvm/archive/v1.1.0.tar.gz -> python-gvm-1.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c7d823c7332963521d12da58b71d2d27
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 2a9f1f9a36a4..d9fb013c290d 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=net-libs/ripe-atlas-sagan-1.1.10[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-client/ripe-atlas-cousteau-1.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] 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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=net-libs/ripe-atlas-sagan-1.1.10[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-client/ripe-atlas-cousteau-1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/tzlocal[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=The official command-line client for RIPE Atlas
 EAPI=6
 HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.10[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=www-client/ripe-atlas-cousteau-1.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/tzlocal[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=net-libs/ripe-atlas-sagan-1.1.10[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=www-client/ripe-atlas-cousteau-1.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyopenssl-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/tzlocal[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ujson[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.tools/ripe.atlas.tools-1.2.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ff8bef21958ca1d743c5b37ce929676
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0ac09b9f851e0c5d95b28f8b809c89f9
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 812d03e47ef5..96b9e2427646 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.6.0-r1
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[stat
 DESCRIPTION=A system to store and display time-series data
 EAPI=5
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd +python_targets_python2_7 +python_single_target_python2_7
+IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.6.0 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.6.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0341f10296d57d9a4f07854ea2c15689
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.1 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.1
index c4c3e939fe4e..4a2776671c7d 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.1
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.1
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[stat
 DESCRIPTION=A system to store and display time-series data
 EAPI=6
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.1 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8a2f129f653c5011e27d7e31adb9e209
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
index 73a832d1d471..a4d5f2e535a5 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2
@@ -3,13 +3,13 @@ DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[stat
 DESCRIPTION=A system to store and display time-series data
 EAPI=6
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 )
 RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) )
 SLOT=0/8.0.0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14705743c446d3a28dac7fd6de3b3b23
diff --git a/metadata/md5-cache/net-analyzer/sancp-1.6.1-r4 b/metadata/md5-cache/net-analyzer/sancp-1.6.1-r4
index ae9383d8bf9c..a70ff3bcfc0b 100644
--- a/metadata/md5-cache/net-analyzer/sancp-1.6.1-r4
+++ b/metadata/md5-cache/net-analyzer/sancp-1.6.1-r4
@@ -9,5 +9,5 @@ LICENSE=QPL GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=http://www.metre.net/files/sancp-1.6.1.tar.gz http://sancp.sourceforge.net/sancp-1.6.1.fix200511.a.patch http://sancp.sourceforge.net/sancp-1.6.1.fix200511.b.patch http://sancp.sourceforge.net/sancp-1.6.1.fix200601.c.patch http://sancp.sourceforge.net/sancp-1.6.1.fix200606.d.patch
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7ed064c68539407c90c2cabcc15e3d07
diff --git a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7 b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
index 5d1cdefe5cf3..469dd9b1ddc0 100644
--- a/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
+++ b/metadata/md5-cache/net-analyzer/scanlogd-2.2.7
@@ -10,5 +10,5 @@ RDEPEND=nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap )
 REQUIRED_USE=?? ( nids pcap )
 SLOT=0
 SRC_URI=http://www.openwall.com/scanlogd/scanlogd-2.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ab082d1aada0bf4a19f8131612862c31
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 22d550bbf814..36072d2af382 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4b8f21cd592dad8ce3b483279cd5cc53
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.2 b/metadata/md5-cache/net-analyzer/scapy-2.4.2
index c0e9324da10c..e005210d56a8 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.2
+++ b/metadata/md5-cache/net-analyzer/scapy-2.4.2
@@ -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_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/secdev/scapy/archive/v2.4.2.tar.gz -> scapy-2.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=851b7bfd1160c19c770d17e9f03bfe74
diff --git a/metadata/md5-cache/net-analyzer/scapy-2.4.3 b/metadata/md5-cache/net-analyzer/scapy-2.4.3
index e16080af9ddc..41ad8e070c41 100644
--- a/metadata/md5-cache/net-analyzer/scapy-2.4.3
+++ b/metadata/md5-cache/net-analyzer/scapy-2.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=A Python interactive packet manipulation program for mastering the n
 EAPI=7
 HOMEPAGE=https://scapy.net/ https://github.com/secdev/scapy
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=net-analyzer/tcpdump 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/secdev/scapy/archive/v2.4.3.tar.gz -> scapy-2.4.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=caa9f111efd1dfde384a7ef0c4b3ff18
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f360f1ac84a4d5d8dc601448dde957ee
diff --git a/metadata/md5-cache/net-analyzer/scapy-9999 b/metadata/md5-cache/net-analyzer/scapy-9999
index 302162211c1e..d94b967c308a 100644
--- a/metadata/md5-cache/net-analyzer/scapy-9999
+++ b/metadata/md5-cache/net-analyzer/scapy-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=net-analyzer/tcpdump 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7b9b02dc414fb96ca821691080dd926a
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-0.8.0 b/metadata/md5-cache/net-analyzer/sguil-sensor-0.8.0
index ed753101c206..529337aa5d42 100644
--- a/metadata/md5-cache/net-analyzer/sguil-sensor-0.8.0
+++ b/metadata/md5-cache/net-analyzer/sguil-sensor-0.8.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
 SLOT=0
 SRC_URI=mirror://sourceforge/sguil/sguil-sensor-0.8.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7e9baa9d8c186fa33c6b7e0dde61d2f9
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-0.9.0 b/metadata/md5-cache/net-analyzer/sguil-sensor-0.9.0
index 0f44be96bf83..7d326634adf4 100644
--- a/metadata/md5-cache/net-analyzer/sguil-sensor-0.9.0
+++ b/metadata/md5-cache/net-analyzer/sguil-sensor-0.9.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
 SLOT=0
 SRC_URI=https://github.com/bammv/sguil/archive/v0.9.0.tar.gz -> sguil-0.9.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=48b10d1835f218d0c4d1443129d1e1e9
diff --git a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0 b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0
index aa788073258e..2b91f055e88f 100644
--- a/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0
+++ b/metadata/md5-cache/net-analyzer/sguil-sensor-1.0.0
@@ -7,5 +7,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 >=net-analyzer/barnyard-0.2.0-r1 >=net-analyzer/snort-2.4.1-r1 dev-ml/pcre-ocaml net-analyzer/sancp
 SLOT=0
 SRC_URI=https://github.com/bammv/sguil/archive/v1.0.0.tar.gz -> sguil-1.0.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e203ffa7fee0715d08bc589792e99ce0
diff --git a/metadata/md5-cache/net-analyzer/sguil-server-0.8.0 b/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
index 9eb83a4c1103..2c67f09824d7 100644
--- a/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
+++ b/metadata/md5-cache/net-analyzer/sguil-server-0.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) net-analyzer/p0f net-analyzer/tcpflow net-misc/openssh
 SLOT=0
 SRC_URI=mirror://sourceforge/sguil/sguil-server-0.8.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5c45310bddef668385dad0e9ddc25d9f
diff --git a/metadata/md5-cache/net-analyzer/sguil-server-0.9.0 b/metadata/md5-cache/net-analyzer/sguil-server-0.9.0
index b740a3dbb35e..d37dae4f2252 100644
--- a/metadata/md5-cache/net-analyzer/sguil-server-0.9.0
+++ b/metadata/md5-cache/net-analyzer/sguil-server-0.9.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) net-analyzer/p0f net-analyzer/tcpflow net-misc/openssh
 SLOT=0
 SRC_URI=https://github.com/bammv/sguil/archive/v0.9.0.tar.gz -> sguil-0.9.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8c39529fb73afbb0907145afd7be12b9
diff --git a/metadata/md5-cache/net-analyzer/sguil-server-1.0.0 b/metadata/md5-cache/net-analyzer/sguil-server-1.0.0
index e83ae941a61e..cf3a9d698e2d 100644
--- a/metadata/md5-cache/net-analyzer/sguil-server-1.0.0
+++ b/metadata/md5-cache/net-analyzer/sguil-server-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 QPL
 RDEPEND=>=dev-lang/tcl-8.3:0=[-threads] >=dev-tcltk/tclx-8.3 dev-tcltk/tcllib dev-tcltk/mysqltcl ssl? ( >=dev-tcltk/tls-1.4.1 ) net-analyzer/p0f net-analyzer/tcpflow net-misc/openssh
 SLOT=0
 SRC_URI=https://github.com/bammv/sguil/archive/v1.0.0.tar.gz -> sguil-1.0.0.tar.gz
-_eclasses_=ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d30af1e9a72b923b5ff27289c02a1702
diff --git a/metadata/md5-cache/net-analyzer/siphon-666-r2 b/metadata/md5-cache/net-analyzer/siphon-666-r2
new file mode 100644
index 000000000000..d94c27f4f83a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/siphon-666-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=net-libs/libpcap
+DESCRIPTION=A portable passive network mapping suite
+EAPI=7
+HOMEPAGE=http://siphon.datanerds.net/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=http://siphon.datanerds.net/siphon-v.666.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5b0a851e11ace1e5194e0024eaa1897a
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.6.9-r1 b/metadata/md5-cache/net-analyzer/smokeping-2.6.9-r1
index fba5edf29b21..d833d6ff85ce 100644
--- a/metadata/md5-cache/net-analyzer/smokeping-2.6.9-r1
+++ b/metadata/md5-cache/net-analyzer/smokeping-2.6.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) ldap? ( dev-perl/perl-ldap ) radius? ( dev-perl/Authen-Radius ) ssh? ( dev-perl/Net-OpenSSH ) telnet? ( dev-perl/Net-Telnet ) dev-perl/CGI-Fast >=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/Net-DNS dev-perl/libwww-perl virtual/perl-libnet
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/smokeping/pub/smokeping-2.6.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c25532d8da09a3ea8a1e87f511674850
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.7.2 b/metadata/md5-cache/net-analyzer/smokeping-2.7.2
index 6056434b9d38..fa8e1de71d18 100644
--- a/metadata/md5-cache/net-analyzer/smokeping-2.7.2
+++ b/metadata/md5-cache/net-analyzer/smokeping-2.7.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/smokeping/pub/smokeping-2.7.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c9934e1d36a601eaf1ef18ec2d0080fb
diff --git a/metadata/md5-cache/net-analyzer/smokeping-2.7.3 b/metadata/md5-cache/net-analyzer/smokeping-2.7.3
index a24888783605..e4b092ce46d8 100644
--- a/metadata/md5-cache/net-analyzer/smokeping-2.7.3
+++ b/metadata/md5-cache/net-analyzer/smokeping-2.7.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5.8.8-r8 >=dev-perl/SNMP_Session-1.13 >=net-analyzer/fping-2.4_beta2-r2[suid] >=net-analyzer/rrdtool-1.2[graph,perl] dev-perl/CGI dev-perl/CGI-Session dev-perl/Config-Grammar dev-perl/Digest-HMAC dev-perl/FCGI dev-perl/IO-Socket-SSL dev-perl/IO-Tty dev-perl/Net-DNS dev-perl/Net-OpenSSH dev-perl/Net-SNMP dev-perl/Net-Telnet dev-perl/libwww-perl dev-perl/perl-ldap virtual/perl-libnet dev-perl/CGI-Fast !apache2? ( virtual/httpd-cgi ) apache2? ( >=www-apache/mod_perl-2.0.1 www-apache/mod_fcgid ) curl? ( >=net-misc/curl-7.21.4 ) dig? ( net-dns/bind-tools ) echoping? ( >=net-analyzer/echoping-6.0.2 ) ipv6? ( >=dev-perl/Socket6-0.20 ) radius? ( dev-perl/Authen-Radius )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/smokeping/pub/smokeping-2.7.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=241d892c1501392f6047be9890e56d06
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.12 b/metadata/md5-cache/net-analyzer/snort-2.9.12
index d698977bf553..2253b09230b4 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.12
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.12
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 de
 REQUIRED_USE=!kernel_linux? ( !shared-rep )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.12.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4815930ad5b16d4399779044d03699a8
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.15 b/metadata/md5-cache/net-analyzer/snort-2.9.15
index 3346a3e5bb99..9280a6045532 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.15
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.15
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 de
 REQUIRED_USE=!kernel_linux? ( !shared-rep )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.15.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=d0ac5d1ebd121082c3cffed2f83bec25
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=6ef7cd27dd4a860fb74207ec1f7fab6a
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.15.1 b/metadata/md5-cache/net-analyzer/snort-2.9.15.1
index ef13b2dd0c4c..0b6515b081fd 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.15.1
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.15.1
@@ -11,5 +11,5 @@ RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 de
 REQUIRED_USE=!kernel_linux? ( !shared-rep )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.15.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=58bbfb93e4aa19520ca129933a68bc8f
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=89ef2b06add892f1def8349103f06186
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.8.3-r2 b/metadata/md5-cache/net-analyzer/snort-2.9.8.3-r2
index cbae9c7fd523..9e6333684e0c 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.8.3-r2
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.8.3-r2
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libpcap-1.3.0 >=net-libs/daq-2.0.2 >=dev-libs/libpcre-8.33 de
 REQUIRED_USE=!kernel_linux? ( !shared-rep )
 SLOT=0
 SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.8.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c1fb0ebf819574c11866e51f2bb8437c
diff --git a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2 b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
index dca8944cc708..acab48f6191a 100644
--- a/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
+++ b/metadata/md5-cache/net-analyzer/speedtest-cli-2.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/sivel/speedtest-cli/archive/v2.1.2.tar.gz -> speedtest-cli-2.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1bf41f46657eb9cab8c6b9f9e6ad97b3
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.1 b/metadata/md5-cache/net-analyzer/suricata-5.0.1
deleted file mode 100644
index ebf531bf0b5c..000000000000
--- a/metadata/md5-cache/net-analyzer/suricata-5.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=config configure install postinst prepare pretend setup
-DEPEND=acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=net-libs/libhtp-0.5.32 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.0.6 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
-DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
-EAPI=7
-HOMEPAGE=https://suricata-ids.org/
-IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=net-libs/libhtp-0.5.32 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.0.6 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ?? ( lua luajit ) bpf? ( af-packet )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d49821cc40d8a9d0a01329e3d2643fcf
diff --git a/metadata/md5-cache/net-analyzer/suricata-5.0.1-r1 b/metadata/md5-cache/net-analyzer/suricata-5.0.1-r1
new file mode 100644
index 000000000000..d8a57e6a91e5
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/suricata-5.0.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=config configure install postinst prepare pretend setup
+DEPEND=acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) >=net-libs/libhtp-0.5.32 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.0.6 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) >=sys-devel/autoconf-2.69-r5 virtual/rust
+DESCRIPTION=High performance Network IDS, IPS and Network Security Monitoring engine
+EAPI=7
+HOMEPAGE=https://suricata-ids.org/
+IUSE=+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/suricata acct-user/suricata dev-libs/jansson dev-libs/libpcre dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) >=net-libs/libhtp-0.5.32 net-libs/libpcap sys-apps/file sys-libs/libcap-ng bpf? ( >=dev-libs/libbpf-0.0.6 ) cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/libmaxminddb ) logrotate? ( app-admin/logrotate ) lua? ( dev-lang/lua:* ) luajit? ( dev-lang/luajit:* ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ?? ( lua luajit ) bpf? ( af-packet )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.openinfosecfoundation.org/download/suricata-5.0.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=41776b2c042e4acf509bfcc4f5f0e603
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
index f4badae61f2b..63ac160c08ad 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3
@@ -10,5 +10,5 @@ RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5f0f4374a9996bbe2aa7777078977ec1
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r1 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r1
index 2feb1a08337e..bf448941cd6d 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r1
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r1
@@ -10,5 +10,5 @@ RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsm
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=591715cfa953435e3f75c33a8be8c696
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-9999 b/metadata/md5-cache/net-analyzer/tcpdump-9999
index 6dcc93950757..77213608255e 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-9999
+++ b/metadata/md5-cache/net-analyzer/tcpdump-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=c66deb9e9bb8e7e148a1978b31f4b387
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=206ff20175e41a6b53e3d3bbe331fddb
diff --git a/metadata/md5-cache/net-analyzer/tcpflow-1.5.2-r1 b/metadata/md5-cache/net-analyzer/tcpflow-1.5.2-r1
index 8d7dc4fbcb62..f1f78101ddca 100644
--- a/metadata/md5-cache/net-analyzer/tcpflow-1.5.2-r1
+++ b/metadata/md5-cache/net-analyzer/tcpflow-1.5.2-r1
@@ -4,13 +4,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A tool for monitoring, capturing and storing TCP connections flows
 EAPI=7
 HOMEPAGE=https://github.com/simsong/tcpflow
-IUSE=cairo test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=cairo test +python_single_target_python2_7
 KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-db/sqlite dev-libs/boost:= dev-libs/openssl:= net-libs/http-parser:= net-libs/libpcap sys-libs/libcap-ng sys-libs/zlib:= cairo? ( x11-libs/cairo )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz https://github.com/simsong/tcpflow/archive/tcpflow-1.5.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8f85a043d75e66a82ca7c493586592f2
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.10.4 b/metadata/md5-cache/net-analyzer/telegraf-1.10.4
index 0c43c0921566..fe6ce0ce9eb9 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.10.4
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.10.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/telegraf/archive/1.10.4.tar.gz -> telegraf-1.10.4.tar.gz https://dev.gentoo.org/~williamh/dist/telegraf-1.10.4-vendor.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5fd0f2befd1b3c8c4ab4975a734a49f1
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.11.5 b/metadata/md5-cache/net-analyzer/telegraf-1.11.5
index 3434a2d26b18..b11f6d3c9a77 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.11.5
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.11.5
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/telegraf/archive/1.11.5.tar.gz -> telegraf-1.11.5.tar.gz https://dev.gentoo.org/~williamh/dist/telegraf-1.11.5-vendor.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8a9c0ea2f3aa8cf3b61b1778e52ede69
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.12.1 b/metadata/md5-cache/net-analyzer/telegraf-1.12.1
index 2a486425e661..ce582834217d 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.12.1
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.12.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/telegraf/archive/1.12.1.tar.gz -> telegraf-1.12.1.tar.gz https://dev.gentoo.org/~williamh/dist/telegraf-1.12.1-vendor.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f73e4a0d87a3e9c57707ae4a023393be
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.13.3 b/metadata/md5-cache/net-analyzer/telegraf-1.13.3
new file mode 100644
index 000000000000..bfc91ff8b94d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.13.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/go virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=acct-group/telegraf acct-user/telegraf
+DESCRIPTION=The plugin-driven server agent for collecting & reporting metrics.
+EAPI=7
+HOMEPAGE=https://github.com/influxdata/telegraf
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=acct-group/telegraf acct-user/telegraf
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/influxdata/telegraf/archive/1.13.3.tar.gz -> telegraf-1.13.3.tar.gz https://dev.gentoo.org/~williamh/dist/telegraf-1.13.3-vendor.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e50cc474ac0b12495420ba7da03b9dcb
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.5.3 b/metadata/md5-cache/net-analyzer/telegraf-1.5.3
index bbad8dd28bdb..26616bacf37a 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.5.3
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.5.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/telegraf/archive/1.5.3.tar.gz -> telegraf-1.5.3.tar.gz https://github.com/collectd/go-collectd/archive/2ce144541b8903101fb8f1483cc0497a68798122.tar.gz -> github.com-collectd-go-collectd-2ce144541b8903101fb8f1483cc0497a68798122.tar.gz https://github.com/aerospike/aerospike-client-go/archive/95e1ad7791bdbca44707fedbb29be42024900d9c.tar.gz -> github.com-aerospike-aerospike-client-go-95e1ad7791bdbca44707fedbb29be42024900d9c.tar.gz https://github.com/amir/raidman/archive/c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985.tar.gz -> github.com-amir-raidman-c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985.tar.gz https://github.com/apache/thrift/archive/4aaa92ece8503a6da9bc6701604f69acf2b99d07.tar.gz -> github.com-apache-thrift-4aaa92ece8503a6da9bc6701604f69acf2b99d07.tar.gz https://github.com/aws/aws-sdk-go/archive/c861d27d0304a79f727e9a8a4e2ac1e74602fdc0.tar.gz -> github.com-aws-aws-sdk-go-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0.tar.gz https://github.com/beorn7/perks/archive/4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz -> github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz https://github.com/bsm/sarama-cluster/archive/abf039439f66c1ce78017f560b490612552f6472.tar.gz -> github.com-bsm-sarama-cluster-abf039439f66c1ce78017f560b490612552f6472.tar.gz https://github.com/cenkalti/backoff/archive/b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3.tar.gz -> github.com-cenkalti-backoff-b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3.tar.gz https://github.com/couchbase/go-couchbase/archive/bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28.tar.gz -> github.com-couchbase-go-couchbase-bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28.tar.gz https://github.com/couchbase/gomemcached/archive/4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29.tar.gz -> github.com-couchbase-gomemcached-4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29.tar.gz https://github.com/couchbase/goutils/archive/5823a0cbaaa9008406021dc5daf80125ea30bba6.tar.gz -> github.com-couchbase-goutils-5823a0cbaaa9008406021dc5daf80125ea30bba6.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/dgrijalva/jwt-go/archive/dbeaa9332f19a944acb5736b4456cfcc02140e29.tar.gz -> github.com-dgrijalva-jwt-go-dbeaa9332f19a944acb5736b4456cfcc02140e29.tar.gz https://github.com/docker/docker/archive/f5ec1e2936dcbe7b5001c2b817188b095c700c27.tar.gz -> github.com-docker-docker-f5ec1e2936dcbe7b5001c2b817188b095c700c27.tar.gz https://github.com/docker/go-connections/archive/990a1a1a70b0da4c4cb70e117971a4f0babfbf1a.tar.gz -> github.com-docker-go-connections-990a1a1a70b0da4c4cb70e117971a4f0babfbf1a.tar.gz https://github.com/eapache/go-resiliency/archive/b86b1ec0dd4209a588dc1285cdd471e73525c0b3.tar.gz -> github.com-eapache-go-resiliency-b86b1ec0dd4209a588dc1285cdd471e73525c0b3.tar.gz https://github.com/eapache/go-xerial-snappy/archive/bb955e01b9346ac19dc29eb16586c90ded99a98c.tar.gz -> github.com-eapache-go-xerial-snappy-bb955e01b9346ac19dc29eb16586c90ded99a98c.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/eclipse/paho.mqtt.golang/archive/d4f545eb108a2d19f9b1a735689dbfb719bc21fb.tar.gz -> github.com-eclipse-paho.mqtt.golang-d4f545eb108a2d19f9b1a735689dbfb719bc21fb.tar.gz https://github.com/go-logfmt/logfmt/archive/390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz -> github.com-go-logfmt-logfmt-390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz https://github.com/go-sql-driver/mysql/archive/2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz -> github.com-go-sql-driver-mysql-2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz https://github.com/gobwas/glob/archive/bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz -> github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz https://github.com/go-ini/ini/archive/9144852efba7c4daf409943ee90767da62d55438.tar.gz -> github.com-go-ini-ini-9144852efba7c4daf409943ee90767da62d55438.tar.gz https://github.com/gogo/protobuf/archive/7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8.tar.gz -> github.com-gogo-protobuf-7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8.tar.gz https://github.com/golang/protobuf/archive/8ee79997227bf9b34611aee7946ae64735e6fd93.tar.gz -> github.com-golang-protobuf-8ee79997227bf9b34611aee7946ae64735e6fd93.tar.gz https://github.com/golang/snappy/archive/7db9049039a047d955fe8c19b83c8ff5abd765c7.tar.gz -> github.com-golang-snappy-7db9049039a047d955fe8c19b83c8ff5abd765c7.tar.gz https://github.com/go-ole/go-ole/archive/be49f7c07711fcb603cff39e1de7c67926dc0ba7.tar.gz -> github.com-go-ole-go-ole-be49f7c07711fcb603cff39e1de7c67926dc0ba7.tar.gz https://github.com/google/go-cmp/archive/f94e52cad91c65a63acc1e75d4be223ea22e99bc.tar.gz -> github.com-google-go-cmp-f94e52cad91c65a63acc1e75d4be223ea22e99bc.tar.gz https://github.com/gorilla/mux/archive/392c28fe23e1c45ddba891b0320b3b5df220beea.tar.gz -> github.com-gorilla-mux-392c28fe23e1c45ddba891b0320b3b5df220beea.tar.gz https://github.com/go-sql-driver/mysql/archive/2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz -> github.com-go-sql-driver-mysql-2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz https://github.com/hailocab/go-hostpool/archive/e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz -> github.com-hailocab-go-hostpool-e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz https://github.com/hashicorp/consul/archive/63d2fc68239b996096a1c55a0d4b400ea4c2583f.tar.gz -> github.com-hashicorp-consul-63d2fc68239b996096a1c55a0d4b400ea4c2583f.tar.gz https://github.com/influxdata/tail/archive/a395bf99fe07c233f41fba0735fa2b13b58588ea.tar.gz -> github.com-influxdata-tail-a395bf99fe07c233f41fba0735fa2b13b58588ea.tar.gz https://github.com/influxdata/toml/archive/5d1d907f22ead1cd47adde17ceec5bda9cacaf8f.tar.gz -> github.com-influxdata-toml-5d1d907f22ead1cd47adde17ceec5bda9cacaf8f.tar.gz https://github.com/influxdata/wlog/archive/7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz -> github.com-influxdata-wlog-7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz https://github.com/jackc/pgx/archive/63f58fd32edb5684b9e9f4cfaac847c6b42b3917.tar.gz -> github.com-jackc-pgx-63f58fd32edb5684b9e9f4cfaac847c6b42b3917.tar.gz https://github.com/jmespath/go-jmespath/archive/bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d.tar.gz -> github.com-jmespath-go-jmespath-bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d.tar.gz https://github.com/kardianos/osext/archive/c2c54e542fb797ad986b31721e1baedf214ca413.tar.gz -> github.com-kardianos-osext-c2c54e542fb797ad986b31721e1baedf214ca413.tar.gz https://github.com/kardianos/service/archive/6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893.tar.gz -> github.com-kardianos-service-6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893.tar.gz https://github.com/kballard/go-shellquote/archive/d8ec1a69a250a17bb0e419c386eac1f3711dc142.tar.gz -> github.com-kballard-go-shellquote-d8ec1a69a250a17bb0e419c386eac1f3711dc142.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/Microsoft/go-winio/archive/ce2922f643c8fd76b46cadc7f404a06282678b34.tar.gz -> github.com-Microsoft-go-winio-ce2922f643c8fd76b46cadc7f404a06282678b34.tar.gz https://github.com/miekg/dns/archive/99f84ae56e75126dd77e5de4fae2ea034a468ca1.tar.gz -> github.com-miekg-dns-99f84ae56e75126dd77e5de4fae2ea034a468ca1.tar.gz https://github.com/mitchellh/mapstructure/archive/d0303fe809921458f417bcf828397a65db30a7e4.tar.gz -> github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz https://github.com/multiplay/go-ts3/archive/07477f49b8dfa3ada231afc7b7b17617d42afe8e.tar.gz -> github.com-multiplay-go-ts3-07477f49b8dfa3ada231afc7b7b17617d42afe8e.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/nats-io/go-nats/archive/ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz -> github.com-nats-io-go-nats-ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz https://github.com/nats-io/nats/archive/ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz -> github.com-nats-io-nats-ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz https://github.com/nats-io/nuid/archive/289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz -> github.com-nats-io-nuid-289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz https://github.com/nsqio/go-nsq/archive/eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz -> github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz https://github.com/opencontainers/runc/archive/89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8.tar.gz -> github.com-opencontainers-runc-89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8.tar.gz https://github.com/opentracing-contrib/go-observer/archive/a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz -> github.com-opentracing-contrib-go-observer-a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz https://github.com/opentracing/opentracing-go/archive/06f47b42c792fef2796e9681353e1d908c417827.tar.gz -> github.com-opentracing-opentracing-go-06f47b42c792fef2796e9681353e1d908c417827.tar.gz https://github.com/openzipkin/zipkin-go-opentracing/archive/1cafbdfde94fbf2b373534764e0863aa3bd0bf7b.tar.gz -> github.com-openzipkin-zipkin-go-opentracing-1cafbdfde94fbf2b373534764e0863aa3bd0bf7b.tar.gz https://github.com/pierrec/lz4/archive/5c9560bfa9ace2bf86080bf40d46b34ae44604df.tar.gz -> github.com-pierrec-lz4-5c9560bfa9ace2bf86080bf40d46b34ae44604df.tar.gz https://github.com/pierrec/xxHash/archive/5a004441f897722c627870a981d02b29924215fa.tar.gz -> github.com-pierrec-xxHash-5a004441f897722c627870a981d02b29924215fa.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/prometheus/client_golang/archive/c317fb74746eac4fc65fe3909195f4cf67c5562a.tar.gz -> github.com-prometheus-client_golang-c317fb74746eac4fc65fe3909195f4cf67c5562a.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/dd2f054febf4a6c00f2343686efb775948a8bff4.tar.gz -> github.com-prometheus-common-dd2f054febf4a6c00f2343686efb775948a8bff4.tar.gz https://github.com/prometheus/procfs/archive/1878d9fbb537119d24b21ca07effd591627cd160.tar.gz -> github.com-prometheus-procfs-1878d9fbb537119d24b21ca07effd591627cd160.tar.gz https://github.com/rcrowley/go-metrics/archive/1f30fe9094a513ce4c700b9a54458bbb0c96996c.tar.gz -> github.com-rcrowley-go-metrics-1f30fe9094a513ce4c700b9a54458bbb0c96996c.tar.gz https://github.com/samuel/go-zookeeper/archive/1d7be4effb13d2d908342d349d71a284a7542693.tar.gz -> github.com-samuel-go-zookeeper-1d7be4effb13d2d908342d349d71a284a7542693.tar.gz https://github.com/satori/go.uuid/archive/5bf94b69c6b68ee1b541973bb8e1144db23a194b.tar.gz -> github.com-satori-go.uuid-5bf94b69c6b68ee1b541973bb8e1144db23a194b.tar.gz https://github.com/shirou/gopsutil/archive/384a55110aa5ae052eb93ea94940548c1e305a99.tar.gz -> github.com-shirou-gopsutil-384a55110aa5ae052eb93ea94940548c1e305a99.tar.gz https://github.com/shirou/w32/archive/3c9377fc6748f222729a8270fe2775d149a249ad.tar.gz -> github.com-shirou-w32-3c9377fc6748f222729a8270fe2775d149a249ad.tar.gz https://github.com/Shopify/sarama/archive/3b1b38866a79f06deddf0487d5c27ba0697ccd65.tar.gz -> github.com-Shopify-sarama-3b1b38866a79f06deddf0487d5c27ba0697ccd65.tar.gz https://github.com/Sirupsen/logrus/archive/61e43dc76f7ee59a82bdf3d71033dc12bea4c77d.tar.gz -> github.com-Sirupsen-logrus-61e43dc76f7ee59a82bdf3d71033dc12bea4c77d.tar.gz https://github.com/soniah/gosnmp/archive/5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15.tar.gz -> github.com-soniah-gosnmp-5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15.tar.gz https://github.com/StackExchange/wmi/archive/f3e2bae1e0cb5aef83e319133eabfee30013a4a5.tar.gz -> github.com-StackExchange-wmi-f3e2bae1e0cb5aef83e319133eabfee30013a4a5.tar.gz https://github.com/streadway/amqp/archive/63795daa9a446c920826655f26ba31c81c860fd6.tar.gz -> github.com-streadway-amqp-63795daa9a446c920826655f26ba31c81c860fd6.tar.gz https://github.com/stretchr/objx/archive/1a9d0bb9f541897e62256577b352fdbc1fb4fd94.tar.gz -> github.com-stretchr-objx-1a9d0bb9f541897e62256577b352fdbc1fb4fd94.tar.gz https://github.com/stretchr/testify/archive/4d4bfba8f1d1027c4fdbe371823030df51419987.tar.gz -> github.com-stretchr-testify-4d4bfba8f1d1027c4fdbe371823030df51419987.tar.gz https://github.com/vjeantet/grok/archive/d73e972b60935c7fec0b4ffbc904ed39ecaf7efe.tar.gz -> github.com-vjeantet-grok-d73e972b60935c7fec0b4ffbc904ed39ecaf7efe.tar.gz https://github.com/wvanbergen/kafka/archive/bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee.tar.gz -> github.com-wvanbergen-kafka-bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee.tar.gz https://github.com/wvanbergen/kazoo-go/archive/968957352185472eacb69215fa3dbfcfdbac1096.tar.gz -> github.com-wvanbergen-kazoo-go-968957352185472eacb69215fa3dbfcfdbac1096.tar.gz https://github.com/yuin/gopher-lua/archive/66c871e454fcf10251c61bf8eff02d0978cae75a.tar.gz -> github.com-yuin-gopher-lua-66c871e454fcf10251c61bf8eff02d0978cae75a.tar.gz https://github.com/zensqlmonitor/go-mssqldb/archive/ffe5510c6fa5e15e6d983210ab501c815b56b363.tar.gz -> github.com-zensqlmonitor-go-mssqldb-ffe5510c6fa5e15e6d983210ab501c815b56b363.tar.gz https://github.com/golang/crypto/archive/dc137beb6cce2043eb6b5f223ab8bf51c32459f4.tar.gz -> github.com-golang-crypto-dc137beb6cce2043eb6b5f223ab8bf51c32459f4.tar.gz https://github.com/golang/net/archive/f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz -> github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz https://github.com/golang/sys/archive/739734461d1c916b6c72a63d7efda2b27edb369f.tar.gz -> github.com-golang-sys-739734461d1c916b6c72a63d7efda2b27edb369f.tar.gz https://github.com/golang/text/archive/506f9d5c962f284575e88337e7d9296d27e729d3.tar.gz -> github.com-golang-text-506f9d5c962f284575e88337e7d9296d27e729d3.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz -> github.com-go-asn1-ber-asn1-ber-4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz https://github.com/fatih/pool/archive/6e328e67893eb46323ad06f0e92cb9536babbabc.tar.gz -> github.com-fatih-pool-6e328e67893eb46323ad06f0e92cb9536babbabc.tar.gz https://github.com/fsnotify/fsnotify/archive/a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb.tar.gz -> github.com-fsnotify-fsnotify-a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb.tar.gz https://github.com/gorethink/gorethink/archive/7ab832f7b65573104a555d84a27992ae9ea1f659.tar.gz -> github.com-gorethink-gorethink-7ab832f7b65573104a555d84a27992ae9ea1f659.tar.gz https://github.com/go-ldap/ldap/archive/8168ee085ee43257585e50c6441aadf54ecb2c9f.tar.gz -> github.com-go-ldap-ldap-8168ee085ee43257585e50c6441aadf54ecb2c9f.tar.gz https://github.com/go-mgo/mgo/archive/3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz -> github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz https://github.com/olivere/elastic/archive/3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26.tar.gz -> github.com-olivere-elastic-3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26.tar.gz https://github.com/go-tomb/tomb/archive/dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz -> github.com-go-tomb-tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz https://github.com/go-yaml/yaml/archive/4c78c975fe7c825c6d1466c42be594d1d6f3aba6.tar.gz -> github.com-go-yaml-yaml-4c78c975fe7c825c6d1466c42be594d1d6f3aba6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b54b7f17f9595169a36370f714fdae7f
diff --git a/metadata/md5-cache/net-analyzer/telegraf-1.8.3 b/metadata/md5-cache/net-analyzer/telegraf-1.8.3
index c813bbf2bba6..3c626dcda6cf 100644
--- a/metadata/md5-cache/net-analyzer/telegraf-1.8.3
+++ b/metadata/md5-cache/net-analyzer/telegraf-1.8.3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/influxdata/telegraf/archive/1.8.3.tar.gz -> telegraf-1.8.3.tar.gz https://github.com/GoogleCloudPlatform/google-cloud-go/archive/c728a003b238b26cef9ab6753a5dc424b331c3ad.tar.gz -> github.com-GoogleCloudPlatform-google-cloud-go-c728a003b238b26cef9ab6753a5dc424b331c3ad.tar.gz https://github.com/cloudfoundry/clock/archive/02e53af36e6c978af692887ed449b74026d76fec.tar.gz -> github.com-cloudfoundry-clock-02e53af36e6c978af692887ed449b74026d76fec.tar.gz https://github.com/collectd/go-collectd/archive/2ce144541b8903101fb8f1483cc0497a68798122.tar.gz -> github.com-collectd-go-collectd-2ce144541b8903101fb8f1483cc0497a68798122.tar.gz https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver/archive/2b93072101d466aa4120b3c23c2e1b08af01541c.tar.gz -> github.com-census-ecosystem-opencensus-go-exporter-stackdriver-2b93072101d466aa4120b3c23c2e1b08af01541c.tar.gz https://github.com/aerospike/aerospike-client-go/archive/1dc8cf203d24cd454e71ce40ab4cd0bf3112df90.tar.gz -> github.com-aerospike-aerospike-client-go-1dc8cf203d24cd454e71ce40ab4cd0bf3112df90.tar.gz https://github.com/alecthomas/template/archive/a0175ee3bccc567396460bf5acd36800cb10c49c.tar.gz -> github.com-alecthomas-template-a0175ee3bccc567396460bf5acd36800cb10c49c.tar.gz https://github.com/alecthomas/units/archive/2efee857e7cfd4f3d0138cc3cbb1b4966962b93a.tar.gz -> github.com-alecthomas-units-2efee857e7cfd4f3d0138cc3cbb1b4966962b93a.tar.gz https://github.com/amir/raidman/archive/1ccc43bfb9c93cb401a4025e49c64ba71e5e668b.tar.gz -> github.com-amir-raidman-1ccc43bfb9c93cb401a4025e49c64ba71e5e668b.tar.gz https://github.com/apache/thrift/archive/f2867c24984aa53edec54a138c03db934221bdea.tar.gz -> github.com-apache-thrift-f2867c24984aa53edec54a138c03db934221bdea.tar.gz https://github.com/aws/aws-sdk-go/archive/bf8067ceb6e7f51e150c218972dccfeeed892b85.tar.gz -> github.com-aws-aws-sdk-go-bf8067ceb6e7f51e150c218972dccfeeed892b85.tar.gz https://github.com/Azure/go-autorest/archive/1f7cd6cfe0adea687ad44a512dfe76140f804318.tar.gz -> github.com-Azure-go-autorest-1f7cd6cfe0adea687ad44a512dfe76140f804318.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/bsm/sarama-cluster/archive/cf455bc755fe41ac9bb2861e7a961833d9c2ecc3.tar.gz -> github.com-bsm-sarama-cluster-cf455bc755fe41ac9bb2861e7a961833d9c2ecc3.tar.gz https://github.com/cenkalti/backoff/archive/2ea60e5f094469f9e65adb9cd103795b73ae743e.tar.gz -> github.com-cenkalti-backoff-2ea60e5f094469f9e65adb9cd103795b73ae743e.tar.gz https://github.com/couchbase/go-couchbase/archive/16db1f1fe037412f12738fa4d8448c549c4edd77.tar.gz -> github.com-couchbase-go-couchbase-16db1f1fe037412f12738fa4d8448c549c4edd77.tar.gz https://github.com/couchbase/gomemcached/archive/0da75df145308b9a4e6704d762ca9d9b77752efc.tar.gz -> github.com-couchbase-gomemcached-0da75df145308b9a4e6704d762ca9d9b77752efc.tar.gz https://github.com/couchbase/goutils/archive/e865a1461c8ac0032bd37e2d4dab3289faea3873.tar.gz -> github.com-couchbase-goutils-e865a1461c8ac0032bd37e2d4dab3289faea3873.tar.gz https://github.com/davecgh/go-spew/archive/346938d642f2ec3594ed81d874461961cd0faa76.tar.gz -> github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz https://github.com/denisenkom/go-mssqldb/archive/1eb28afdf9b6e56cf673badd47545f844fe81103.tar.gz -> github.com-denisenkom-go-mssqldb-1eb28afdf9b6e56cf673badd47545f844fe81103.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/dimchansky/utfbom/archive/6c6132ff69f0f6c088739067407b5d32c52e1d0f.tar.gz -> github.com-dimchansky-utfbom-6c6132ff69f0f6c088739067407b5d32c52e1d0f.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/ed7b6428c133e7c59404251a09b7d6b02fa83cc2.tar.gz -> github.com-docker-docker-ed7b6428c133e7c59404251a09b7d6b02fa83cc2.tar.gz https://github.com/docker/go-connections/archive/3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz -> github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz https://github.com/docker/go-units/archive/47565b4f722fb6ceae66b95f853feed578a4a51c.tar.gz -> github.com-docker-go-units-47565b4f722fb6ceae66b95f853feed578a4a51c.tar.gz https://github.com/docker/libnetwork/archive/d7b61745d16675c9f548b19f06fda80d422a74f0.tar.gz -> github.com-docker-libnetwork-d7b61745d16675c9f548b19f06fda80d422a74f0.tar.gz https://github.com/eapache/go-resiliency/archive/ea41b0fad31007accc7f806884dcdf3da98b79ce.tar.gz -> github.com-eapache-go-resiliency-ea41b0fad31007accc7f806884dcdf3da98b79ce.tar.gz https://github.com/eapache/go-xerial-snappy/archive/040cc1a32f578808623071247fdbd5cc43f37f5f.tar.gz -> github.com-eapache-go-xerial-snappy-040cc1a32f578808623071247fdbd5cc43f37f5f.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/eclipse/paho.mqtt.golang/archive/36d01c2b4cbeb3d2a12063e4880ce30800af9560.tar.gz -> github.com-eclipse-paho.mqtt.golang-36d01c2b4cbeb3d2a12063e4880ce30800af9560.tar.gz https://github.com/gobwas/glob/archive/5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz -> github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz https://github.com/gogo/protobuf/archive/636bf0302bc95575d69441b25a2603156ffdddf1.tar.gz -> github.com-gogo-protobuf-636bf0302bc95575d69441b25a2603156ffdddf1.tar.gz https://github.com/go-ini/ini/archive/358ee7663966325963d4e8b2e1fbd570c5195153.tar.gz -> github.com-go-ini-ini-358ee7663966325963d4e8b2e1fbd570c5195153.tar.gz https://github.com/golang/protobuf/archive/b4deda0973fb4c70b50d226b1af49f3da59f5265.tar.gz -> github.com-golang-protobuf-b4deda0973fb4c70b50d226b1af49f3da59f5265.tar.gz https://github.com/golang/snappy/archive/2e65f85255dbc3072edf28d6b5b8efc472979f5a.tar.gz -> github.com-golang-snappy-2e65f85255dbc3072edf28d6b5b8efc472979f5a.tar.gz https://github.com/go-logfmt/logfmt/archive/390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz -> github.com-go-logfmt-logfmt-390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz https://github.com/googleapis/gax-go/archive/317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz -> github.com-googleapis-gax-go-317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz https://github.com/google/go-cmp/archive/3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz -> github.com-google-go-cmp-3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz https://github.com/google/uuid/archive/064e2069ce9c359c118179501254f67d7d37ba24.tar.gz -> github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz https://github.com/go-ole/go-ole/archive/a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506.tar.gz -> github.com-go-ole-go-ole-a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506.tar.gz https://github.com/go-redis/redis/archive/83fb42932f6145ce52df09860384a4653d2d332a.tar.gz -> github.com-go-redis-redis-83fb42932f6145ce52df09860384a4653d2d332a.tar.gz https://github.com/gorilla/context/archive/08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz -> github.com-gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz https://github.com/gorilla/mux/archive/e3702bed27f0d39777b0b37b664b6280e8ef8fbf.tar.gz -> github.com-gorilla-mux-e3702bed27f0d39777b0b37b664b6280e8ef8fbf.tar.gz https://github.com/go-sql-driver/mysql/archive/d523deb1b23d913de5bdada721a6071e71283618.tar.gz -> github.com-go-sql-driver-mysql-d523deb1b23d913de5bdada721a6071e71283618.tar.gz https://github.com/hailocab/go-hostpool/archive/e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz -> github.com-hailocab-go-hostpool-e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz https://github.com/hashicorp/consul/archive/39f93f011e591c842acc8053a7f5972aa6e592fd.tar.gz -> github.com-hashicorp-consul-39f93f011e591c842acc8053a7f5972aa6e592fd.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/d5fe4b57a186c716b0e00b8c301cbd9b4182694d.tar.gz -> github.com-hashicorp-go-cleanhttp-d5fe4b57a186c716b0e00b8c301cbd9b4182694d.tar.gz https://github.com/hashicorp/go-rootcerts/archive/6bb64b370b90e7ef1fa532be9e591a81c3493e00.tar.gz -> github.com-hashicorp-go-rootcerts-6bb64b370b90e7ef1fa532be9e591a81c3493e00.tar.gz https://github.com/hashicorp/serf/archive/d6574a5bb1226678d7010325fb6c985db20ee458.tar.gz -> github.com-hashicorp-serf-d6574a5bb1226678d7010325fb6c985db20ee458.tar.gz https://github.com/influxdata/go-syslog/archive/eecd51df3ad85464a2bab9b7d3a45bc1e299059e.tar.gz -> github.com-influxdata-go-syslog-eecd51df3ad85464a2bab9b7d3a45bc1e299059e.tar.gz https://github.com/influxdata/tail/archive/c43482518d410361b6c383d7aebce33d0471d7bc.tar.gz -> github.com-influxdata-tail-c43482518d410361b6c383d7aebce33d0471d7bc.tar.gz https://github.com/influxdata/toml/archive/2a2e3012f7cfbef64091cc79776311e65dfa211b.tar.gz -> github.com-influxdata-toml-2a2e3012f7cfbef64091cc79776311e65dfa211b.tar.gz https://github.com/influxdata/wlog/archive/7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz -> github.com-influxdata-wlog-7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz https://github.com/jackc/pgx/archive/da3231b0b66e2e74cdb779f1d46c5e958ba8be27.tar.gz -> github.com-jackc-pgx-da3231b0b66e2e74cdb779f1d46c5e958ba8be27.tar.gz https://github.com/jmespath/go-jmespath/archive/0b12d6b5.tar.gz -> github.com-jmespath-go-jmespath-0b12d6b5.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kardianos/service/archive/615a14ed75099c9eaac6949e22ac2341bf9d3197.tar.gz -> github.com-kardianos-service-615a14ed75099c9eaac6949e22ac2341bf9d3197.tar.gz https://github.com/kballard/go-shellquote/archive/95032a82bc518f77982ea72343cc1ade730072f0.tar.gz -> github.com-kballard-go-shellquote-95032a82bc518f77982ea72343cc1ade730072f0.tar.gz https://github.com/kr/logfmt/archive/b84e30acd515aadc4b783ad4ff83aff3299bdfe0.tar.gz -> github.com-kr-logfmt-b84e30acd515aadc4b783ad4ff83aff3299bdfe0.tar.gz https://github.com/mailru/easyjson/archive/efc7eb8984d6655c26b5c9d2e65c024e5767c37c.tar.gz -> github.com-mailru-easyjson-efc7eb8984d6655c26b5c9d2e65c024e5767c37c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz https://github.com/Microsoft/ApplicationInsights-Go/archive/d2df5d440eda5372f24fcac03839a64d6cb5f7e5.tar.gz -> github.com-Microsoft-ApplicationInsights-Go-d2df5d440eda5372f24fcac03839a64d6cb5f7e5.tar.gz https://github.com/Microsoft/go-winio/archive/a6d595ae73cf27a1b8fc32930668708f45ce1c85.tar.gz -> github.com-Microsoft-go-winio-a6d595ae73cf27a1b8fc32930668708f45ce1c85.tar.gz https://github.com/miekg/dns/archive/5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1.tar.gz -> github.com-miekg-dns-5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1.tar.gz https://github.com/mitchellh/go-homedir/archive/3864e76763d94a6df2f9960b16a20a33da9f9a66.tar.gz -> github.com-mitchellh-go-homedir-3864e76763d94a6df2f9960b16a20a33da9f9a66.tar.gz https://github.com/mitchellh/mapstructure/archive/f15292f7a699fcc1a38a80977f80a046874ba8ac.tar.gz -> github.com-mitchellh-mapstructure-f15292f7a699fcc1a38a80977f80a046874ba8ac.tar.gz https://github.com/multiplay/go-ts3/archive/d0d44555495c8776880a17e439399e715a4ef319.tar.gz -> github.com-multiplay-go-ts3-d0d44555495c8776880a17e439399e715a4ef319.tar.gz https://github.com/naoina/go-stringutil/archive/6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz -> github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz https://github.com/nats-io/gnatsd/archive/6608e9ac3be979dcb0614b772cc86a87b71acaa3.tar.gz -> github.com-nats-io-gnatsd-6608e9ac3be979dcb0614b772cc86a87b71acaa3.tar.gz https://github.com/nats-io/go-nats/archive/062418ea1c2181f52dc0f954f6204370519a868b.tar.gz -> github.com-nats-io-go-nats-062418ea1c2181f52dc0f954f6204370519a868b.tar.gz https://github.com/nats-io/nuid/archive/289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz -> github.com-nats-io-nuid-289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz https://github.com/nsqio/go-nsq/archive/eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz -> github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz https://github.com/opencontainers/go-digest/archive/279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz -> github.com-opencontainers-go-digest-279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz https://github.com/opencontainers/image-spec/archive/d60099175f88c47cd379c4738d158884749ed235.tar.gz -> github.com-opencontainers-image-spec-d60099175f88c47cd379c4738d158884749ed235.tar.gz https://github.com/opentracing-contrib/go-observer/archive/a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz -> github.com-opentracing-contrib-go-observer-a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz https://github.com/opentracing/opentracing-go/archive/1949ddbfd147afd4d964a9f00b24eb291e0e7c38.tar.gz -> github.com-opentracing-opentracing-go-1949ddbfd147afd4d964a9f00b24eb291e0e7c38.tar.gz https://github.com/openzipkin/zipkin-go-opentracing/archive/26cf9707480e6b90e5eff22cf0bbf05319154232.tar.gz -> github.com-openzipkin-zipkin-go-opentracing-26cf9707480e6b90e5eff22cf0bbf05319154232.tar.gz https://github.com/pierrec/lz4/archive/1958fd8fff7f115e79725b1288e0b878b3e06b00.tar.gz -> github.com-pierrec-lz4-1958fd8fff7f115e79725b1288e0b878b3e06b00.tar.gz https://github.com/pkg/errors/archive/645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz -> github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz https://github.com/pmezard/go-difflib/archive/792786c7400a136282c1664665ae0a8db921c6c2.tar.gz -> github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz https://github.com/prometheus/client_golang/archive/c5b7fccd204277076155f10851dad72b76a49317.tar.gz -> github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz https://github.com/prometheus/client_model/archive/5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz -> github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/ae68e2d4c00fed4943b5f6698d504a5fe083da8a.tar.gz -> github.com-prometheus-procfs-ae68e2d4c00fed4943b5f6698d504a5fe083da8a.tar.gz https://github.com/rcrowley/go-metrics/archive/e2704e165165ec55d062f5919b4b29494e9fa790.tar.gz -> github.com-rcrowley-go-metrics-e2704e165165ec55d062f5919b4b29494e9fa790.tar.gz https://github.com/samuel/go-zookeeper/archive/c4fab1ac1bec58281ad0667dc3f0907a9476ac47.tar.gz -> github.com-samuel-go-zookeeper-c4fab1ac1bec58281ad0667dc3f0907a9476ac47.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/shirou/gopsutil/archive/8048a2e9c5773235122027dd585cf821b2af1249.tar.gz -> github.com-shirou-gopsutil-8048a2e9c5773235122027dd585cf821b2af1249.tar.gz https://github.com/shirou/w32/archive/bb4de0191aa41b5507caa14b0650cdbddcd9280b.tar.gz -> github.com-shirou-w32-bb4de0191aa41b5507caa14b0650cdbddcd9280b.tar.gz https://github.com/Shopify/sarama/archive/a6144ae922fd99dd0ea5046c8137acfb7fab0914.tar.gz -> github.com-Shopify-sarama-a6144ae922fd99dd0ea5046c8137acfb7fab0914.tar.gz https://github.com/sirupsen/logrus/archive/c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz -> github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz https://github.com/soniah/gosnmp/archive/96b86229e9b3ffb4b954144cdc7f98fe3ee1003f.tar.gz -> github.com-soniah-gosnmp-96b86229e9b3ffb4b954144cdc7f98fe3ee1003f.tar.gz https://github.com/StackExchange/wmi/archive/5d049714c4a64225c3c79a7cf7d02f7fb5b96338.tar.gz -> github.com-StackExchange-wmi-5d049714c4a64225c3c79a7cf7d02f7fb5b96338.tar.gz https://github.com/streadway/amqp/archive/e5adc2ada8b8efff032bf61173a233d143e9318e.tar.gz -> github.com-streadway-amqp-e5adc2ada8b8efff032bf61173a233d143e9318e.tar.gz https://github.com/stretchr/objx/archive/477a77ecc69700c7cdeb1fa9e129548e1c1c393c.tar.gz -> github.com-stretchr-objx-477a77ecc69700c7cdeb1fa9e129548e1c1c393c.tar.gz https://github.com/stretchr/testify/archive/f35b8ab0b5a2cef36673838d662e249dd9c94686.tar.gz -> github.com-stretchr-testify-f35b8ab0b5a2cef36673838d662e249dd9c94686.tar.gz https://github.com/tidwall/gjson/archive/f123b340873a0084cb27267eddd8ff615115fbff.tar.gz -> github.com-tidwall-gjson-f123b340873a0084cb27267eddd8ff615115fbff.tar.gz https://github.com/tidwall/match/archive/1731857f09b1f38450e2c12409748407822dc6be.tar.gz -> github.com-tidwall-match-1731857f09b1f38450e2c12409748407822dc6be.tar.gz https://github.com/vishvananda/netlink/archive/b2de5d10e38ecce8607e6b438b6d174f389a004e.tar.gz -> github.com-vishvananda-netlink-b2de5d10e38ecce8607e6b438b6d174f389a004e.tar.gz https://github.com/vishvananda/netns/archive/13995c7128ccc8e51e9a6bd2b551020a27180abd.tar.gz -> github.com-vishvananda-netns-13995c7128ccc8e51e9a6bd2b551020a27180abd.tar.gz https://github.com/vjeantet/grok/archive/ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53.tar.gz -> github.com-vjeantet-grok-ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53.tar.gz https://github.com/vmware/govmomi/archive/e3a01f9611c32b2362366434bcd671516e78955d.tar.gz -> github.com-vmware-govmomi-e3a01f9611c32b2362366434bcd671516e78955d.tar.gz https://github.com/wvanbergen/kafka/archive/e2edea948ddfee841ea9a263b32ccca15f7d6c2f.tar.gz -> github.com-wvanbergen-kafka-e2edea948ddfee841ea9a263b32ccca15f7d6c2f.tar.gz https://github.com/wvanbergen/kazoo-go/archive/f72d8611297a7cf105da904c04198ad701a60101.tar.gz -> github.com-wvanbergen-kazoo-go-f72d8611297a7cf105da904c04198ad701a60101.tar.gz https://github.com/yuin/gopher-lua/archive/46796da1b0b4794e1e341883a399f12cc7574b55.tar.gz -> github.com-yuin-gopher-lua-46796da1b0b4794e1e341883a399f12cc7574b55.tar.gz https://github.com/golang/crypto/archive/a2144134853fc9a27a7b1e3eb4f19f1a76df13c9.tar.gz -> github.com-golang-crypto-a2144134853fc9a27a7b1e3eb4f19f1a76df13c9.tar.gz https://github.com/golang/net/archive/a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1.tar.gz -> github.com-golang-net-a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1.tar.gz https://github.com/golang/oauth2/archive/d2e6202438beef2727060aa7cabdd924d92ebfd9.tar.gz -> github.com-golang-oauth2-d2e6202438beef2727060aa7cabdd924d92ebfd9.tar.gz https://github.com/golang/sys/archive/ac767d655b305d4e9612f5f6e33120b9176c4ad4.tar.gz -> github.com-golang-sys-ac767d655b305d4e9612f5f6e33120b9176c4ad4.tar.gz https://github.com/golang/text/archive/f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz -> github.com-golang-text-f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz https://github.com/googleapis/google-api-go-client/archive/19ff8768a5c0b8e46ea281065664787eefc24121.tar.gz -> github.com-googleapis-google-api-go-client-19ff8768a5c0b8e46ea281065664787eefc24121.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/fedd2861243fd1a8152376292b921b394c7bef7e.tar.gz -> github.com-google-go-genproto-fedd2861243fd1a8152376292b921b394c7bef7e.tar.gz https://github.com/grpc/grpc-go/archive/168a6198bcb0ef175f7dacec0b8691fc141dc9b8.tar.gz -> github.com-grpc-grpc-go-168a6198bcb0ef175f7dacec0b8691fc141dc9b8.tar.gz https://github.com/census-instrumentation/opencensus-go/archive/79993219becaa7e29e3b60cb67f5b8e82dee11d6.tar.gz -> github.com-census-instrumentation-opencensus-go-79993219becaa7e29e3b60cb67f5b8e82dee11d6.tar.gz https://github.com/alecthomas/kingpin/archive/947dcec5ba9c011838740e680966fd7087a71d0d.tar.gz -> github.com-alecthomas-kingpin-947dcec5ba9c011838740e680966fd7087a71d0d.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/379148ca0225df7a432012b8df0355c2a2063ac0.tar.gz -> github.com-go-asn1-ber-asn1-ber-379148ca0225df7a432012b8df0355c2a2063ac0.tar.gz https://github.com/fatih/pool/archive/010e0b745d12eaf8426c95f9c3924d81dd0b668f.tar.gz -> github.com-fatih-pool-010e0b745d12eaf8426c95f9c3924d81dd0b668f.tar.gz https://github.com/fsnotify/fsnotify/archive/c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz -> github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz https://github.com/gorethink/gorethink/archive/7f5bdfd858bb064d80559b2a32b86669c5de5d3b.tar.gz -> github.com-gorethink-gorethink-7f5bdfd858bb064d80559b2a32b86669c5de5d3b.tar.gz https://github.com/go-ldap/ldap/archive/bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9.tar.gz -> github.com-go-ldap-ldap-bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9.tar.gz https://github.com/go-mgo/mgo/archive/9856a29383ce1c59f308dd1cf0363a79b5bef6b5.tar.gz -> github.com-go-mgo-mgo-9856a29383ce1c59f308dd1cf0363a79b5bef6b5.tar.gz https://github.com/olivere/elastic/archive/52741dc2ce53629cbe1e673869040d886cba2cd5.tar.gz -> github.com-olivere-elastic-52741dc2ce53629cbe1e673869040d886cba2cd5.tar.gz https://github.com/go-tomb/tomb/archive/dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz -> github.com-go-tomb-tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz https://github.com/go-yaml/yaml/archive/5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz -> github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6209ce920f6c15dee68662de76658b37
diff --git a/metadata/md5-cache/net-analyzer/testssl-2.9.5_p7 b/metadata/md5-cache/net-analyzer/testssl-2.9.5_p7
deleted file mode 100644
index a52455f1ade2..000000000000
--- a/metadata/md5-cache/net-analyzer/testssl-2.9.5_p7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Tool to check TLS/SSL cipher support
-EAPI=7
-HOMEPAGE=https://testssl.sh/
-IUSE=bundled-openssl kerberos
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 bundled-openssl? ( openssl )
-RDEPEND=app-shells/bash[net] net-dns/bind-tools sys-apps/util-linux sys-libs/ncurses:0 sys-process/procps bundled-openssl? ( kerberos? ( sys-libs/zlib virtual/krb5 ) ) !bundled-openssl? ( dev-libs/openssl:0 )
-SLOT=0
-SRC_URI=https://github.com/drwetter/testssl.sh/archive/v2.9.5-7.tar.gz -> testssl-2.9.5_p7.tar.gz
-_md5_=eb54a688f7d7753b06fa20bd330ceaa7
diff --git a/metadata/md5-cache/net-analyzer/testssl-3.0 b/metadata/md5-cache/net-analyzer/testssl-3.0
new file mode 100644
index 000000000000..fba920ba72c4
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/testssl-3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Tool to check TLS/SSL cipher support
+EAPI=7
+HOMEPAGE=https://testssl.sh/
+IUSE=bundled-openssl kerberos
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 bundled-openssl? ( openssl )
+RDEPEND=app-shells/bash[net] net-dns/bind-tools sys-apps/util-linux sys-libs/ncurses:0 sys-process/procps bundled-openssl? ( kerberos? ( sys-libs/zlib virtual/krb5 ) ) !bundled-openssl? ( dev-libs/openssl:0 )
+SLOT=0
+SRC_URI=https://github.com/drwetter/testssl.sh/archive/3.0.tar.gz -> testssl-3.0.tar.gz
+_md5_=8ed68ba95a2b5ed895d5dd27e5c7cf9f
diff --git a/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1 b/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
index caabef12b2c8..f0dc82cd40a4 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
+++ b/metadata/md5-cache/net-analyzer/traceroute-nanog-6.4.2_p1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Traceroute with AS lookup, TOS support, MTU discovery and other features
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/traceroute-nanog_6.4.2.orig.tar.gz https://dev.gentoo.org/~jer/traceroute-nanog_6.4.2-1.diff.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0b9ba232f69fbe5a047e946aa271b768
+_md5_=b28d72c3ddab88f1fdd7d3384e17b07d
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.17 b/metadata/md5-cache/net-analyzer/vnstat-1.17
index e20f47675ba8..a806bf69495c 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.17
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.17
@@ -10,5 +10,5 @@ RDEPEND=gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-1.17.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d0f283051261fa364afedc933628d68e
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.4 b/metadata/md5-cache/net-analyzer/vnstat-2.4
index 10a3b1a1a026..9970a86c4175 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.4
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.4
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-v
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cc003a32f3c081c6aeaca231b663e0d0
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.5 b/metadata/md5-cache/net-analyzer/vnstat-2.5
index 3be8c3172154..c34b736323ad 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.5
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.5
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-v
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4c5b0e8494abedd45f1f136ca8083e3b
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.6 b/metadata/md5-cache/net-analyzer/vnstat-2.6
index a93b3f1a58dd..4858d863f894 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.6
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.6
@@ -11,5 +11,5 @@ RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-v
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4c5b0e8494abedd45f1f136ca8083e3b
diff --git a/metadata/md5-cache/net-analyzer/vnstat-9999 b/metadata/md5-cache/net-analyzer/vnstat-9999
index a548b532cb50..53f21d89359b 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-9999
+++ b/metadata/md5-cache/net-analyzer/vnstat-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2c89889442866b6ff7eb07b666fff484
diff --git a/metadata/md5-cache/net-analyzer/wapiti-3.0.2 b/metadata/md5-cache/net-analyzer/wapiti-3.0.2
index 152e6e83ea9c..2a6dacf24c9c 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-3.0.2
+++ b/metadata/md5-cache/net-analyzer/wapiti-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/wapiti/wapiti3-3.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68730e1a4a52620350047310bf5e2335
diff --git a/metadata/md5-cache/net-analyzer/wapiti-9999 b/metadata/md5-cache/net-analyzer/wapiti-9999
index 500f60c7bb0d..ea356c99a24a 100644
--- a/metadata/md5-cache/net-analyzer/wapiti-9999
+++ b/metadata/md5-cache/net-analyzer/wapiti-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/beautifulsoup:4[python_targets_python3_6(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=548ac0fe8dd3790e043d55fdddbfc0a6
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.2.1 b/metadata/md5-cache/net-analyzer/wireshark-3.2.1
index 0b11444a2ad2..8c35e77a7ddf 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.2.1
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729?
 REQUIRED_USE=plugin-ifdemo? ( plugins )
 SLOT=0/3.2.1
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.2.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5c5de105d8c56c689b3c1cfe3134c39b
diff --git a/metadata/md5-cache/net-analyzer/wireshark-99999999 b/metadata/md5-cache/net-analyzer/wireshark-99999999
index 453eeb71ea01..e0a5082c8dca 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-99999999
+++ b/metadata/md5-cache/net-analyzer/wireshark-99999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5 dev-libs/libgcrypt:0 bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2 ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=plugin-ifdemo? ( plugins )
 SLOT=0/99999999
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c62ebff41eed19e0b9340be2465f19ac
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.16-r1 b/metadata/md5-cache/net-analyzer/zabbix-2.2.16-r1
index 2785b6438617..5806dfcd7e8b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-2.2.16-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.16-r1
@@ -10,5 +10,5 @@ RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-2.2.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=e58b4f5357ac2ec2b861924ef5232f02
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.28 b/metadata/md5-cache/net-analyzer/zabbix-3.0.28
index d6870f9ead79..877ca91bcc09 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.28
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.0.28
@@ -10,5 +10,5 @@ RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.0.28.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=d390043c5ebec21244ca30313039a9a3
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.15 b/metadata/md5-cache/net-analyzer/zabbix-3.4.15
index bf16751c0a05..538dbb101c53 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-3.4.15
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.4.15
@@ -10,5 +10,5 @@ RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://prdownloads.sourceforge.net/zabbix/zabbix-3.4.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=cd2452a62dbe5b3133fd2c0101fc1a9b
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.13 b/metadata/md5-cache/net-analyzer/zabbix-4.0.13
index cfe3c201eca9..538a7cef165c 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.13
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.13
@@ -10,5 +10,5 @@ RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/4.0.13/zabbix-4.0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=68f8b50650cd156e92f2a212b97d92b2
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.2.7 b/metadata/md5-cache/net-analyzer/zabbix-4.2.7
index c1bd2ba927e3..c1e73ae2079b 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.2.7
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.2.7
@@ -10,5 +10,5 @@ RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/4.2.7/zabbix-4.2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=19fb1f580877857965b14285cfda440a
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.4.0-r1 b/metadata/md5-cache/net-analyzer/zabbix-4.4.0-r1
index b485f6430b03..449974ae6ad3 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.4.0-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.4.0-r1
@@ -10,5 +10,5 @@ RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus
 REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/4.4.0/zabbix-4.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=12342c14fa2459e95a03887f29b45990
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.4.5 b/metadata/md5-cache/net-analyzer/zabbix-4.4.5
new file mode 100644
index 000000000000..69309e4b7896
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.4.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-8.1:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2 ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( >=dev-db/postgresql-8.1:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) server? ( sys-libs/zlib ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libpcre ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/4.4.5/zabbix-4.4.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=813703a4c8476e41289e3c8b12e4590a
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 3fa032ff3753..1865793ece4d 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/freeradius-3.0.15 b/metadata/md5-cache/net-dialup/freeradius-3.0.15
index 57f3cc75c429..7eb41bd917a2 100644
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.15
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.15
@@ -3,13 +3,13 @@ DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lan
 DESCRIPTION=Highly configurable free RADIUS server
 EAPI=6
 HOMEPAGE=http://www.freeradius.org/
-IUSE=debug firebird iodbc kerberos ldap libressl mysql odbc oracle pam pcap postgres python readline sqlite ssl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug firebird iodbc kerberos ldap libressl mysql odbc oracle pam pcap postgres python readline sqlite ssl +python_single_target_python2_7
 KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius sys-devel/libtool dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) readline? ( sys-libs/readline:0= ) pcap? ( net-libs/libpcap ) mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) firebird? ( dev-db/firebird ) pam? ( sys-libs/pam ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test firebird? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.15.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.15.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=87ce764611710a31f15051c4750e72ad
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.17 b/metadata/md5-cache/net-dialup/freeradius-3.0.17
index 3fbaf593f998..440b148433c6 100644
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.17
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.17
@@ -3,13 +3,13 @@ DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius dev-lang/perl:= sys-libs/
 DESCRIPTION=Highly configurable free RADIUS server
 EAPI=6
 HOMEPAGE=http://www.freeradius.org/
-IUSE=debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam pcap postgres python readline rest samba sqlite ssl redis python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam pcap postgres python readline rest samba sqlite ssl redis python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) readline? ( sys-libs/readline:0= ) pcap? ( net-libs/libpcap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) firebird? ( dev-db/firebird ) pam? ( sys-libs/pam ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) redis? ( dev-libs/hiredis:= ) ssl? ( !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 ) )
 RESTRICT=test firebird? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.17.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.17.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b6c90416dc4cf1b1340fd0c93113d69c
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.18-r1 b/metadata/md5-cache/net-dialup/freeradius-3.0.18-r1
index 1bffcb9df4c6..f65005df3789 100644
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.18-r1
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.18-r1
@@ -4,13 +4,13 @@ DEPEND=!net-dialup/cistronradius !net-dialup/gnuradius dev-lang/perl:= sys-libs/
 DESCRIPTION=Highly configurable free RADIUS server
 EAPI=7
 HOMEPAGE=http://www.freeradius.org/
-IUSE=debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam pcap postgres python readline rest samba sqlite ssl redis 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
+IUSE=debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam pcap postgres python readline rest samba sqlite ssl redis python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=!net-dialup/cistronradius !net-dialup/gnuradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) pcap? ( net-libs/libpcap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) firebird? ( dev-db/firebird ) pam? ( sys-libs/pam ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) redis? ( dev-libs/hiredis:= ) ssl? ( !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test firebird? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.18.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.18.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=86cf51d05c659edbd13b6ca9b76c60a8
diff --git a/metadata/md5-cache/net-dialup/freeradius-3.0.19 b/metadata/md5-cache/net-dialup/freeradius-3.0.19
index 50ac94e8e76a..c29ece52e776 100644
--- a/metadata/md5-cache/net-dialup/freeradius-3.0.19
+++ b/metadata/md5-cache/net-dialup/freeradius-3.0.19
@@ -4,13 +4,13 @@ DEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/per
 DESCRIPTION=Highly configurable free RADIUS server
 EAPI=7
 HOMEPAGE=http://www.freeradius.org/
-IUSE=debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam pcap postgres python readline rest samba sqlite ssl redis +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam pcap postgres python readline rest samba sqlite ssl redis +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/radius acct-user/radius !net-dialup/cistronradius dev-lang/perl:= sys-libs/gdbm:= sys-libs/talloc python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) readline? ( sys-libs/readline:0= ) pcap? ( net-libs/libpcap ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c ) postgres? ( dev-db/postgresql:= ) firebird? ( dev-db/firebird ) pam? ( sys-libs/pam ) rest? ( dev-libs/json-c:= ) samba? ( net-fs/samba ) redis? ( dev-libs/hiredis:= ) ssl? ( !libressl? ( dev-libs/openssl:0=[-bindist] ) libressl? ( dev-libs/libressl:0= ) ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) oracle? ( dev-db/oracle-instantclient-basic )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test firebird? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freeradius.org/pub/radius/freeradius-server-3.0.19.tar.gz ftp://ftp.freeradius.org/pub/radius/old/freeradius-server-3.0.19.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ebea245e3141a0b17703e314d58ad4a3
diff --git a/metadata/md5-cache/net-dialup/isdn-firmware-2005.8.15.2 b/metadata/md5-cache/net-dialup/isdn-firmware-2005.8.15.2
index 24db7475b44e..09799bcce50c 100644
--- a/metadata/md5-cache/net-dialup/isdn-firmware-2005.8.15.2
+++ b/metadata/md5-cache/net-dialup/isdn-firmware-2005.8.15.2
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ppc x86
 LICENSE=freedist
 SLOT=0
 SRC_URI=ftp://ftp.man.poznan.pl/pub/linux/opensuse/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/i586/i4lfirm-2005.8.15-2.i586.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f5de0d8e5ec550bf65e50b8ef9eef2a3
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.2.1 b/metadata/md5-cache/net-dialup/mgetty-1.2.1
index 02a0b68a35ce..31ad3e1f3c8d 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4 sys-apps/groff dev-lang/perl sys-apps/texinfo virtual/awk fax? ( !net-misc/efax !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6afbd7ae2c28f1deb9e0884642cd8b2f
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r1 b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r1
index 9ca301759d79..15444ff0ea8f 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1-r1
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl sys-apps/groff sys-apps/texinfo virtual/awk fax? ( !net-misc/efax !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=411413f94eeb12038ec972bee53904a7
diff --git a/metadata/md5-cache/net-dialup/ppp-scripts-0 b/metadata/md5-cache/net-dialup/ppp-scripts-0
index 34fed8425e8c..cf09f1a6d063 100644
--- a/metadata/md5-cache/net-dialup/ppp-scripts-0
+++ b/metadata/md5-cache/net-dialup/ppp-scripts-0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DEPEND=!<net-dialup/ppp-2.4.7-r1
 DESCRIPTION=Common set of scripts for various PPP implementations
 EAPI=5
-HOMEPAGE=https://gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=!<net-dialup/ppp-2.4.7-r1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/ppp-scripts-0.tar.xz
-_md5_=f8f1567bd4123acce5283a7f2478338a
+_md5_=a1ad34ad014724d0e5093269becf4975
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.13 b/metadata/md5-cache/net-dialup/rp-pppoe-3.13
index 5135bda3b5b3..46fe941b9d42 100644
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.13
+++ b/metadata/md5-cache/net-dialup/rp-pppoe-3.13
@@ -11,4 +11,4 @@ RDEPEND=net-dialup/ppp:= tk? ( dev-lang/tk:= )
 SLOT=0
 SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-3.13.tar.gz https://www.samba.org/ftp/pub/ppp/ppp-2.4.7.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2bcffec719b78f63af530d85f08fdfa2
+_md5_=821926193ccb3b30bdbe04eea05a6537
diff --git a/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3 b/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
index d011825fe271..d55a85605228 100644
--- a/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
+++ b/metadata/md5-cache/net-dialup/sendpage-1.1.0-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!net-misc/hylafax >=dev-perl/Device-SerialPort-0.13 >=dev-perl/MailTools-1.44 >=virtual/perl-libnet-1.11 >=dev-perl/Net-SNPP-1.13 dev-perl/DBI dev-lang/perl:=
 SLOT=0
 SRC_URI=http://www.sendpage.org/download/sendpage-1.001.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8b7c018852f86c61501c8aac1a57e94a
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index c4fd151b8b42..b76f1115a3cf 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/avahi-0.7-r2 b/metadata/md5-cache/net-dns/avahi-0.7-r2
index ef0cf512800a..15c3ff975741 100644
--- a/metadata/md5-cache/net-dns/avahi-0.7-r2
+++ b/metadata/md5-cache/net-dns/avahi-0.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( dbus gdbm || ( python_targets_python2_7 ) ) mono? ( dbus
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lathiat/avahi/archive/v0.7.tar.gz -> avahi-0.7.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bf06cf1fe36510ff48819830aa8691be
diff --git a/metadata/md5-cache/net-dns/bind-9.14.8 b/metadata/md5-cache/net-dns/bind-9.14.8
index 92762b522ae5..929df556b962 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.8
+++ b/metadata/md5-cache/net-dns/bind-9.14.8
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.8/bind-9.14.8.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=98e3847a14d53c72d06e03a218567f83
diff --git a/metadata/md5-cache/net-dns/bind-9.14.9 b/metadata/md5-cache/net-dns/bind-9.14.9
index 215cd13ea4ec..df661b339293 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.9
+++ b/metadata/md5-cache/net-dns/bind-9.14.9
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.14.9/bind-9.14.9.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6082e14cce675e42736bd379a81ea9bd
diff --git a/metadata/md5-cache/net-dns/bind-9.15.6 b/metadata/md5-cache/net-dns/bind-9.15.6
index b427106c6c27..5c1d36530204 100644
--- a/metadata/md5-cache/net-dns/bind-9.15.6
+++ b/metadata/md5-cache/net-dns/bind-9.15.6
@@ -11,5 +11,5 @@ REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap
 RESTRICT=test
 SLOT=0
 SRC_URI=https://downloads.isc.org/isc/bind9/9.15.6/bind-9.15.6.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cb7cfd7511e784ce575528fee3d86812
diff --git a/metadata/md5-cache/net-dns/djbdns-1.05-r33 b/metadata/md5-cache/net-dns/djbdns-1.05-r33
index ec163cd95de5..d8f6ec1de9e8 100644
--- a/metadata/md5-cache/net-dns/djbdns-1.05-r33
+++ b/metadata/md5-cache/net-dns/djbdns-1.05-r33
@@ -8,5 +8,5 @@ LICENSE=public-domain
 RDEPEND=sys-apps/ucspi-tcp virtual/daemontools selinux? ( sec-policy/selinux-djbdns )
 SLOT=0
 SRC_URI=http://cr.yp.to/djbdns/djbdns-1.05.tar.gz http://smarden.org/pape/djb/manpages/djbdns-1.05-man.tar.gz ipv6? ( http://www.fefe.de/dns/djbdns-1.05-test28.diff.xz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da1735cddfe4651a34bbd7866bba1e7d
diff --git a/metadata/md5-cache/net-dns/dnrd-2.20.3-r2 b/metadata/md5-cache/net-dns/dnrd-2.20.3-r2
index da81503915d9..a86a04e95071 100644
--- a/metadata/md5-cache/net-dns/dnrd-2.20.3-r2
+++ b/metadata/md5-cache/net-dns/dnrd-2.20.3-r2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://sourceforge/dnrd/dnrd-2.20.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8352b27c046b440d79ec151967b7d690
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.3.3-r1 b/metadata/md5-cache/net-dns/dnsdist-1.3.3-r1
index cfd8ddf18ad8..0e9e4dc7d2be 100644
--- a/metadata/md5-cache/net-dns/dnsdist-1.3.3-r1
+++ b/metadata/md5-cache/net-dns/dnsdist-1.3.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=dnscrypt? ( ssl ) gnutls? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.3.3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7791b28039147cf362809898a3b7401d
diff --git a/metadata/md5-cache/net-dns/dnsdist-1.4.0 b/metadata/md5-cache/net-dns/dnsdist-1.4.0
index 043bcd743030..f6322a07003b 100644
--- a/metadata/md5-cache/net-dns/dnsdist-1.4.0
+++ b/metadata/md5-cache/net-dns/dnsdist-1.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=dnscrypt? ( ssl ) gnutls? ( ssl ) doh? ( ssl !gnutls )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/dnsdist-1.4.0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1399b683a26e609b7ac423089c411003
diff --git a/metadata/md5-cache/net-dns/dnsimple-dyndns-0.1 b/metadata/md5-cache/net-dns/dnsimple-dyndns-0.1
index f3dcd7a73bdc..85199d2c54d4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f7c3136738f9262e8c330f1d3892877
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
index 6139963f28f9..9a23a629ba8d 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
@@ -11,5 +11,5 @@ RDEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2
 REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.80.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=89c8a9631e1a93575d1c8da582a64bfa
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.8.2 b/metadata/md5-cache/net-dns/dnsviz-0.8.2
index 0a1b4664be08..eb7b5d26d665 100644
--- a/metadata/md5-cache/net-dns/dnsviz-0.8.2
+++ b/metadata/md5-cache/net-dns/dnsviz-0.8.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.8.2.tar.gz -> dnsviz-0.8.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=beffcf6a43218bf59029795145755781
diff --git a/metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3 b/metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
index cddd4ea6095c..9026ce19e4fc 100644
--- a/metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
+++ b/metadata/md5-cache/net-dns/ez-ipupdate-3.0.11.13.3_beta8-r3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8.orig.tar.gz mirror://debian/pool/main/e/ez-ipupdate/ez-ipupdate_3.0.11b8-13.3.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b9e435095a6780a1f8af30f43b783f4a
diff --git a/metadata/md5-cache/net-dns/getdns-1.5.1 b/metadata/md5-cache/net-dns/getdns-1.5.1
index 70716e904f05..0f82d72f3ce9 100644
--- a/metadata/md5-cache/net-dns/getdns-1.5.1
+++ b/metadata/md5-cache/net-dns/getdns-1.5.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libbsd:= dev-libs/libyaml:= idn? ( net-dns/libidn2:= ) !libress
 RESTRICT=test
 SLOT=0
 SRC_URI=https://getdnsapi.net/releases/getdns-1-5-1/getdns-1.5.1.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=56644769bdbb3dd478ceb065a6d709b3
diff --git a/metadata/md5-cache/net-dns/getdns-1.5.2-r2 b/metadata/md5-cache/net-dns/getdns-1.5.2-r2
index 10ecc6212ebe..b7bda74bde98 100644
--- a/metadata/md5-cache/net-dns/getdns-1.5.2-r2
+++ b/metadata/md5-cache/net-dns/getdns-1.5.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( nettle )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://getdnsapi.net/releases/getdns-1-5-2/getdns-1.5.2.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=56ccb9534e68be278d7ed867fa7ec199
diff --git a/metadata/md5-cache/net-dns/hash-slinger-2.6-r1 b/metadata/md5-cache/net-dns/hash-slinger-2.6-r1
index e9f3c52a0de8..02d66f901c82 100644
--- a/metadata/md5-cache/net-dns/hash-slinger-2.6-r1
+++ b/metadata/md5-cache/net-dns/hash-slinger-2.6-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install setup
 DESCRIPTION=Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY
 EAPI=5
 HOMEPAGE=https://people.redhat.com/pwouters/hash-slinger/
-IUSE=ipsec +openpgp +ssh python_targets_python2_7
+IUSE=ipsec +openpgp +ssh +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/unbound[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ipsec? ( net-vpn/libreswan[dnssec] ) openpgp? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ssh? ( net-misc/openssh )
-REQUIRED_USE=|| ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-dns/unbound[python,python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-python/dnspython[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)] openpgp? ( dev-python/python-gnupg[python_targets_python2_7(-)] ) ) ipsec? ( net-vpn/libreswan[dnssec] ) ssh? ( net-misc/openssh )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdb237aff090430869ca9697bdc0e5c1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5b989225398d5c516fb72f8112c2426f
diff --git a/metadata/md5-cache/net-dns/hash-slinger-2.7-r1 b/metadata/md5-cache/net-dns/hash-slinger-2.7-r1
deleted file mode 100644
index 20fdf816d210..000000000000
--- a/metadata/md5-cache/net-dns/hash-slinger-2.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY
-EAPI=5
-HOMEPAGE=https://people.redhat.com/pwouters/hash-slinger/
-IUSE=ipsec +openpgp +ssh 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_python2_7(-)] dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-dns/unbound[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ipsec? ( net-vpn/libreswan[dnssec] ) openpgp? ( dev-python/python-gnupg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ssh? ( net-misc/openssh )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7652d9b536947ebab974b12fc8a57744
diff --git a/metadata/md5-cache/net-dns/hash-slinger-2.7-r2 b/metadata/md5-cache/net-dns/hash-slinger-2.7-r2
new file mode 100644
index 000000000000..2b8d5ee5f3e1
--- /dev/null
+++ b/metadata/md5-cache/net-dns/hash-slinger-2.7-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY
+EAPI=5
+HOMEPAGE=https://people.redhat.com/pwouters/hash-slinger/
+IUSE=ipsec +openpgp +ssh +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-dns/unbound[python,python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-python/dnspython[python_targets_python2_7(-)] dev-python/ipaddr[python_targets_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)] openpgp? ( dev-python/python-gnupg[python_targets_python2_7(-)] ) ) ipsec? ( net-vpn/libreswan[dnssec] ) ssh? ( net-misc/openssh )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://people.redhat.com/pwouters/hash-slinger/hash-slinger-2.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d7dee492c6af0c5216a894f2af15e911
diff --git a/metadata/md5-cache/net-dns/maradns-2.0.09-r2 b/metadata/md5-cache/net-dns/maradns-2.0.09-r2
index f7b6167f9e1c..a570c077e948 100644
--- a/metadata/md5-cache/net-dns/maradns-2.0.09-r2
+++ b/metadata/md5-cache/net-dns/maradns-2.0.09-r2
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~mips ppc x86
 LICENSE=BSD-2 GPL-2
 SLOT=0
 SRC_URI=http://www.maradns.org/download/2.0/2.0.09/maradns-2.0.09.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=71d3304af097f4f44688844b8e13d9c5
diff --git a/metadata/md5-cache/net-dns/maradns-2.0.14 b/metadata/md5-cache/net-dns/maradns-2.0.14
index 2ffae4a36c01..4159fe7b4299 100644
--- a/metadata/md5-cache/net-dns/maradns-2.0.14
+++ b/metadata/md5-cache/net-dns/maradns-2.0.14
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A security-aware DNS server
 EAPI=6
 HOMEPAGE=http://www.maradns.org/
-IUSE=authonly examples ipv6 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=authonly examples ipv6 +python_single_target_python2_7
 KEYWORDS=~amd64 ~mips ~ppc ~x86
 LICENSE=BSD-2 GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/perl
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://www.maradns.org/download/2.0/2.0.14/maradns-2.0.14.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f6a5a7d1eef29e5dbe866ce66256565f
diff --git a/metadata/md5-cache/net-dns/maradns-2.0.16 b/metadata/md5-cache/net-dns/maradns-2.0.16
index b965b6936b9c..94ba06dd0c9d 100644
--- a/metadata/md5-cache/net-dns/maradns-2.0.16
+++ b/metadata/md5-cache/net-dns/maradns-2.0.16
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A security-aware DNS server
 EAPI=7
 HOMEPAGE=http://www.maradns.org/
-IUSE=authonly examples ipv6 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=authonly examples ipv6 +python_single_target_python2_7
 KEYWORDS=amd64 ~mips ~ppc x86
 LICENSE=BSD-2 GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/perl
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://www.maradns.org/download/2.0/2.0.16/maradns-2.0.16.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d7e214251d9c8ceed95a88691cf100b2
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1 b/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
index d3e989393c1e..33d76fdcbb6e 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-1.3.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm ) eppclient? (
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.3.18.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b6aaf0adc83e8fc03acb0a60f3493540
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1 b/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
index add53cfe13cf..492e45fa4d39 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-1.4.12-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.4.12.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d4ddcab9b5367cd289038b2eb2283cbb
diff --git a/metadata/md5-cache/net-dns/opendnssec-1.4.8.2 b/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
index dc42d4a61658..b5ecdcbbb9f1 100644
--- a/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
+++ b/metadata/md5-cache/net-dns/opendnssec-1.4.8.2
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-1.4.8.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=078d9a9d67fd3215d5d365dc337b8139
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1 b/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
index 6695a4c37fd6..0a1eccce3057 100644
--- a/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-2.0.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-2.0.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=df94060f5c8512858807f440a28932bd
diff --git a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1 b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
index a40c441af082..073b170590e7 100644
--- a/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
+++ b/metadata/md5-cache/net-dns/opendnssec-2.0.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( mysql sqlite ) ^^ ( softhsm opensc external-hsm )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.opendnssec.org/files/source/opendnssec-2.0.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6977db72737cfa8146c471658c4b1319
diff --git a/metadata/md5-cache/net-dns/pdns-4.1.13 b/metadata/md5-cache/net-dns/pdns-4.1.13
index 787d829c71bb..e42cf06ff462 100644
--- a/metadata/md5-cache/net-dns/pdns-4.1.13
+++ b/metadata/md5-cache/net-dns/pdns-4.1.13
@@ -12,5 +12,5 @@ REQUIRED_USE=mydns? ( mysql )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.1.13.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5c9d89aa136fc02e4e9c1be311d72e82
diff --git a/metadata/md5-cache/net-dns/pdns-4.2.0 b/metadata/md5-cache/net-dns/pdns-4.2.0
index d05afc133cde..08d962d9b8ea 100644
--- a/metadata/md5-cache/net-dns/pdns-4.2.0
+++ b/metadata/md5-cache/net-dns/pdns-4.2.0
@@ -12,5 +12,5 @@ REQUIRED_USE=lua-records? ( lua ) mydns? ( mysql )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.2.0.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=842a53b181d49cab6bdf9860b92ae7f6
diff --git a/metadata/md5-cache/net-dns/pdns-4.2.1 b/metadata/md5-cache/net-dns/pdns-4.2.1
index 738b31fce41c..b8ebb5055dd2 100644
--- a/metadata/md5-cache/net-dns/pdns-4.2.1
+++ b/metadata/md5-cache/net-dns/pdns-4.2.1
@@ -12,5 +12,5 @@ REQUIRED_USE=lua-records? ( lua ) mydns? ( mysql )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.powerdns.com/releases/pdns-4.2.1.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=842a53b181d49cab6bdf9860b92ae7f6
diff --git a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1 b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
index fd3ea1af25fd..3f6adea59532 100644
--- a/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
+++ b/metadata/md5-cache/net-dns/pdnsd-1.2.9a-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f9e1be0e46600dbcc9c88b3d77e7ea53
diff --git a/metadata/md5-cache/net-dns/rbldnsd-0.998b b/metadata/md5-cache/net-dns/rbldnsd-0.998b
index 37c0fa7c8b55..473ed3af6a91 100644
--- a/metadata/md5-cache/net-dns/rbldnsd-0.998b
+++ b/metadata/md5-cache/net-dns/rbldnsd-0.998b
@@ -11,5 +11,5 @@ RDEPEND=zlib? ( sys-libs/zlib )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spamhaus/rbldnsd/archive/0.998b.tar.gz -> rbldnsd-0.998b.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8a488fdc095c7b328c9f9df80d04df6b
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.4 b/metadata/md5-cache/net-dns/unbound-1.9.4
index 0dfcfd7480c8..13a8afc3d7ac 100644
--- a/metadata/md5-cache/net-dns/unbound-1.9.4
+++ b/metadata/md5-cache/net-dns/unbound-1.9.4
@@ -4,13 +4,13 @@ DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3e5026d38aad06239cf4cab66146c975
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d73c999dca3fa5952f50fc2efe90b0ec
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.5 b/metadata/md5-cache/net-dns/unbound-1.9.5
index b8c28a23a7f1..77e67e2d64ad 100644
--- a/metadata/md5-cache/net-dns/unbound-1.9.5
+++ b/metadata/md5-cache/net-dns/unbound-1.9.5
@@ -4,13 +4,13 @@ DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=354d26a42ec32c352e3cd0dcc2d6da45
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.6 b/metadata/md5-cache/net-dns/unbound-1.9.6
index fac9cd92f20a..e2224d48bc5b 100644
--- a/metadata/md5-cache/net-dns/unbound-1.9.6
+++ b/metadata/md5-cache/net-dns/unbound-1.9.6
@@ -4,13 +4,13 @@ DEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.6.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=354d26a42ec32c352e3cd0dcc2d6da45
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 660fab38d126..2791fc26ad61 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/dshieldpy-3.2-r2 b/metadata/md5-cache/net-firewall/dshieldpy-3.2-r2
index 68daa2e12cf3..60c65f9ec6be 100644
--- a/metadata/md5-cache/net-firewall/dshieldpy-3.2-r2
+++ b/metadata/md5-cache/net-firewall/dshieldpy-3.2-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Python script to submit firewall logs to dshield.org
 EAPI=6
 HOMEPAGE=http://dshieldpy.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/dshieldpy/dshieldpy-3.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=56e7ac2ba2bfc8cf9369bfd4364a31bd
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.6.3 b/metadata/md5-cache/net-firewall/firewalld-0.6.3
deleted file mode 100644
index 24a3cdeaf101..000000000000
--- a/metadata/md5-cache/net-firewall/firewalld-0.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] || ( net-firewall/ebtables net-firewall/iptables[nftables] ) net-firewall/iptables[ipv6] net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
-EAPI=6
-HOMEPAGE=http://www.firewalld.org/
-IUSE=gui kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] || ( net-firewall/ebtables net-firewall/iptables[nftables] ) net-firewall/iptables[ipv6] net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-REQUIRED_USE=^^ ( 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/firewalld/firewalld/archive/v0.6.3.tar.gz -> firewalld-0.6.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=296ad1dcd6c63df92b50f23a15cb3e9b
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.6.3-r1 b/metadata/md5-cache/net-firewall/firewalld-0.6.3-r1
new file mode 100644
index 000000000000..ada53d279d46
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/firewalld-0.6.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield || ( net-firewall/ebtables net-firewall/iptables[nftables] ) net-firewall/iptables[ipv6] net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)] ) ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
+EAPI=6
+HOMEPAGE=http://www.firewalld.org/
+IUSE=gui kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield || ( net-firewall/ebtables net-firewall/iptables[nftables] ) net-firewall/iptables[ipv6] net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)] ) ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/firewalld/firewalld/archive/v0.6.3.tar.gz -> firewalld-0.6.3.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=add25e20729744cdb7eae65b37f483d8
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.7.1 b/metadata/md5-cache/net-firewall/firewalld-0.7.1
deleted file mode 100644
index e8221cf4378c..000000000000
--- a/metadata/md5-cache/net-firewall/firewalld-0.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-firewall/iptables[ipv6] || ( net-firewall/iptables[nftables] net-firewall/ebtables ) net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext
-DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
-EAPI=7
-HOMEPAGE=http://www.firewalld.org/
-IUSE=gui kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-firewall/iptables[ipv6] || ( net-firewall/iptables[nftables] net-firewall/ebtables ) net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-REQUIRED_USE=^^ ( 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/firewalld/firewalld/archive/v0.7.1.tar.gz -> firewalld-0.7.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48001ff99662de0a800e9fccaf5307cb
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.7.1-r1 b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r1
new file mode 100644
index 000000000000..5d732fbc67d4
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/firewalld-0.7.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield net-firewall/iptables[ipv6] || ( net-firewall/iptables[nftables] net-firewall/ebtables ) net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)] ) ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext
+DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
+EAPI=7
+HOMEPAGE=http://www.firewalld.org/
+IUSE=gui kernel_linux python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !!net-firewall/gshield net-firewall/iptables[ipv6] || ( net-firewall/iptables[nftables] net-firewall/ebtables ) net-firewall/ipset net-firewall/nftables || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/decorator[python_targets_python2_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)] ) ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/firewalld/firewalld/archive/v0.7.1.tar.gz -> firewalld-0.7.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ddfae5d9262315231bfb53a41af53cff
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.10 b/metadata/md5-cache/net-firewall/fwknop-2.6.10
deleted file mode 100644
index 7c2e27f56656..000000000000
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) 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(-)] ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-DESCRIPTION=Single Packet Authorization and Port Knocking application
-EAPI=7
-HOMEPAGE=https://www.cipherdyne.org/fwknop/
-IUSE=+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server python_targets_python2_7 kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) 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(-)] ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-REQUIRED_USE=nfqueue? ( server ) python? ( || ( python_targets_python2_7 ) ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
-SLOT=0
-SRC_URI=https://www.cipherdyne.org/fwknop/download/fwknop-2.6.10.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2e11637de6960b1505e2a9c14279a074
diff --git a/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1 b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1
new file mode 100644
index 000000000000..230f563bc92e
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.10-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_single_target_python2_7(-)?] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+DESCRIPTION=Single Packet Authorization and Port Knocking application
+EAPI=7
+HOMEPAGE=https://www.cipherdyne.org/fwknop/
+IUSE=+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server +python_single_target_python2_7 kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_single_target_python2_7(-)?] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+REQUIRED_USE=nfqueue? ( server ) python? ( ^^ ( python_single_target_python2_7 ) ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
+SLOT=0
+SRC_URI=https://www.cipherdyne.org/fwknop/download/fwknop-2.6.10.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1947918e4e4072d15810042109a36fc4
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 b1a1aa179355..0a50761a44d2 100644
--- a/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
+++ b/metadata/md5-cache/net-firewall/fwknop-2.6.9-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) 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(-)] ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_single_target_python2_7(-)?] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Single Packet Authorization and Port Knocking application
 EAPI=6
 HOMEPAGE=https://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop
-IUSE=+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server python_targets_python2_7 kernel_linux
+IUSE=+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server +python_single_target_python2_7 kernel_linux
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) 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(-)] ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-REQUIRED_USE=nfqueue? ( server ) python? ( || ( python_targets_python2_7 ) ) server? ( ^^ ( firewalld iptables ) ) udp-server? ( server )
+RDEPEND=client? ( net-misc/wget[ssl] ) firewalld? ( net-firewall/firewalld[python_single_target_python2_7(-)?] ) gdbm? ( sys-libs/gdbm ) gpg? ( app-crypt/gpgme dev-libs/libassuan dev-libs/libgpg-error ) iptables? ( net-firewall/iptables ) nfqueue? ( net-libs/libnetfilter_queue ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+REQUIRED_USE=nfqueue? ( server ) python? ( ^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d9e83c155161ee8f12af2545ca8230e
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f73d7ad1b977e0f309dffec09be3fa34
diff --git a/metadata/md5-cache/net-firewall/ufw-0.35-r1 b/metadata/md5-cache/net-firewall/ufw-0.35-r1
index c62a7cca5ae8..3de30b689ace 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_6 )
 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cadb88f224a70d64112002d794631f53
diff --git a/metadata/md5-cache/net-firewall/ufw-0.36 b/metadata/md5-cache/net-firewall/ufw-0.36
index e4e978b6922c..6fd7712ca216 100644
--- a/metadata/md5-cache/net-firewall/ufw-0.36
+++ b/metadata/md5-cache/net-firewall/ufw-0.36
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/ufw/0.36/0.36/+download/ufw-0.36.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=537e974bdb7300deec79338d5161cf6a
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 b9308ea745da..dead9ba6b7d3 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=664c85986c2e4803dfd7cf791cb4f147
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 33a33155e501..82087b4c9488 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/davfs2-1.5.4 b/metadata/md5-cache/net-fs/davfs2-1.5.4
index 8ec25e7ec887..8ec274b4cf61 100644
--- a/metadata/md5-cache/net-fs/davfs2-1.5.4
+++ b/metadata/md5-cache/net-fs/davfs2-1.5.4
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib nls? ( virtual/libintl virt
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://nongnu/davfs2/davfs2-1.5.4.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c07100e73300b837f9823533858dd4c8
diff --git a/metadata/md5-cache/net-fs/davfs2-1.5.5 b/metadata/md5-cache/net-fs/davfs2-1.5.5
index e006efd5a3c9..3054493f7864 100644
--- a/metadata/md5-cache/net-fs/davfs2-1.5.5
+++ b/metadata/md5-cache/net-fs/davfs2-1.5.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 net-libs/neon sys-libs/zlib nls? ( virtual/libintl virt
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://nongnu/davfs2/davfs2-1.5.5.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7eff28942c9a00f2a4fbf1b4b3275294
diff --git a/metadata/md5-cache/net-fs/docker-volume-netshare-0.35 b/metadata/md5-cache/net-fs/docker-volume-netshare-0.35
index 48b7b5dde473..a27988fde90f 100644
--- a/metadata/md5-cache/net-fs/docker-volume-netshare-0.35
+++ b/metadata/md5-cache/net-fs/docker-volume-netshare-0.35
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/ContainX/docker-volume-netshare/archive/v0.35.tar.gz -> docker-volume-netshare-0.35.tar.gz https://github.com/Sirupsen/logrus/archive/8c0189d9f6bbf301e5d055d34268156b317016af.tar.gz -> github.com-Sirupsen-logrus-8c0189d9f6bbf301e5d055d34268156b317016af.tar.gz https://github.com/dickeyxxx/netrc/archive/e1a19c977509b96a5c76996dec63ab5aac67c38c.tar.gz -> github.com-dickeyxxx-netrc-e1a19c977509b96a5c76996dec63ab5aac67c38c.tar.gz https://github.com/docker/go-plugins-helpers/archive/61cb8e2334204460162c8bd2417cd43cb71da66f.tar.gz -> github.com-docker-go-plugins-helpers-61cb8e2334204460162c8bd2417cd43cb71da66f.tar.gz https://github.com/coreos/go-systemd/archive/25fe332a900022d06a189ce01108392854c59df1.tar.gz -> github.com-coreos-go-systemd-25fe332a900022d06a189ce01108392854c59df1.tar.gz https://github.com/docker/go-connections/archive/7beb39f0b969b075d1325fecb092faf27fd357b6.tar.gz -> github.com-docker-go-connections-7beb39f0b969b075d1325fecb092faf27fd357b6.tar.gz https://github.com/miekg/dns/archive/5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz -> github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz https://github.com/spf13/cobra/archive/be77323fc05148ef091e83b3866c0d47c8e74a8b.tar.gz -> github.com-spf13-cobra-be77323fc05148ef091e83b3866c0d47c8e74a8b.tar.gz https://github.com/spf13/pflag/archive/ee5fd03fd6acfd43e44aea0b4135958546ed8e73.tar.gz -> github.com-spf13-pflag-ee5fd03fd6acfd43e44aea0b4135958546ed8e73.tar.gz https://github.com/golang/net/archive/cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz -> github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz https://github.com/golang/crypto/archive/432090b8f568c018896cd8a0fb0345872bbac6ce.tar.gz -> github.com-golang-crypto-432090b8f568c018896cd8a0fb0345872bbac6ce.tar.gz https://github.com/golang/sys/archive/37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz -> github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1b275fa2f7fa851d687a0f26ecac67dd
diff --git a/metadata/md5-cache/net-fs/minio-2019.09.11.19.53.16 b/metadata/md5-cache/net-fs/minio-2019.09.11.19.53.16
index 8b955eb663a2..6520cab96f81 100644
--- a/metadata/md5-cache/net-fs/minio-2019.09.11.19.53.16
+++ b/metadata/md5-cache/net-fs/minio-2019.09.11.19.53.16
@@ -9,5 +9,5 @@ RDEPEND=>=dev-lang/go-1.13
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/minio/minio/archive/RELEASE.2019-09-11T19-53-16Z.tar.gz -> minio-2019.09.11.19.53.16.tar.gz https://github.com/go-yaml/yaml/archive/51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz -> github.com-go-yaml-yaml-51d6538a90f86fe93ac480b35f37b2be17fef232.tar.gz https://github.com/olivere/elastic/archive/f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz -> github.com-olivere-elastic-f72acaba629a7ec879103d17b7426a31bc38e199.tar.gz https://github.com/Shopify/sarama/archive/879f631812a30a580659e8035e7cda9994bb99ac.tar.gz -> github.com-Shopify-sarama-879f631812a30a580659e8035e7cda9994bb99ac.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/golang/time/archive/9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz -> github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz https://github.com/golang/sys/archive/81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz -> github.com-golang-sys-81d4e9dc473e5e8c933f2aaeba2a3d81efb9aed2.tar.gz https://github.com/golang/net/archive/eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz -> github.com-golang-net-eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz https://github.com/golang/text/archive/e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz -> github.com-golang-text-e3703dcdd614d2d7488fff034c75c551ea25da95.tar.gz https://github.com/golang/crypto/archive/38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz -> github.com-golang-crypto-38d8ce5564a5b71b2e3a00553993f1b9a7ae852f.tar.gz https://github.com/uber-go/atomic/archive/1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz -> github.com-uber-go-atomic-1ea20fb1cbb1cc08cbd0d913a96dead89aa18289.tar.gz https://github.com/valyala/tcplisten/archive/ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz -> github.com-valyala-tcplisten-ceec8f93295a060cdb565ec25e4ccf17941dbd55.tar.gz https://github.com/googleapis/google-cloud-go/archive/a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz -> github.com-googleapis-google-cloud-go-a4ed3b9f8c7419c692a60bbf780ab0f1c4af5ce4.tar.gz https://github.com/tidwall/sjson/archive/25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz -> github.com-tidwall-sjson-25fb082a20e29e83fb7b7ef5f5919166aad1f084.tar.gz https://github.com/tidwall/gjson/archive/eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz -> github.com-tidwall-gjson-eee0b6226f0d1db2675a176fdfaa8419bcad4ca8.tar.gz https://github.com/tidwall/pretty/archive/1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz -> github.com-tidwall-pretty-1166b9ac2b65e46a43d8618d30d1554f4652d49b.tar.gz https://github.com/tidwall/match/archive/33827db735fff6510490d69a8622612558a557ed.tar.gz -> github.com-tidwall-match-33827db735fff6510490d69a8622612558a557ed.tar.gz https://github.com/streadway/amqp/archive/14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz -> github.com-streadway-amqp-14f78b41ce6da3d698c2ef2cc8c0ea7ce9e26688.tar.gz https://github.com/skyrings/skyring-common/archive/d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz -> github.com-skyrings-skyring-common-d1c0bb1cbd5ed8438be1385c85c4f494608cde1e.tar.gz https://github.com/segmentio/go-prompt/archive/f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz -> github.com-segmentio-go-prompt-f0d19b6901ade831d5a3204edc0d6a7d6457fbb2.tar.gz https://github.com/rs/cors/archive/9a47f48565a795472d43519dd49aac781f3034fb.tar.gz -> github.com-rs-cors-9a47f48565a795472d43519dd49aac781f3034fb.tar.gz https://github.com/rjeczalik/notify/archive/69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz -> github.com-rjeczalik-notify-69d839f37b13a8cb7a78366f7633a4071cb43be7.tar.gz https://github.com/rcrowley/go-metrics/archive/3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz -> github.com-rcrowley-go-metrics-3113b8401b8a98917cde58f8bbd42a1b1c03b1fd.tar.gz https://github.com/prometheus/client_golang/archive/505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz -> github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz https://github.com/prometheus/procfs/archive/55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz -> github.com-prometheus-procfs-55ae3d9d557340b5bc24cd8aa5f6fa2c2ab31352.tar.gz https://github.com/prometheus/common/archive/5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz -> github.com-prometheus-common-5df5c82edb7502fd6cbe093223a19b6e1231494f.tar.gz https://github.com/prometheus/client_model/archive/fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz -> github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz https://github.com/pkg/profile/archive/f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz -> github.com-pkg-profile-f6fe06335df110bcf1ed6d4e852b760bfc15beee.tar.gz https://github.com/pkg/errors/archive/ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz -> github.com-pkg-errors-ba968bfe8b2f7e042a574c888954fccecfa385b4.tar.gz https://github.com/pierrec/lz4/archive/315a67e90e415bcdaff33057da191569bf4d8479.tar.gz -> github.com-pierrec-lz4-315a67e90e415bcdaff33057da191569bf4d8479.tar.gz https://github.com/nsqio/go-nsq/archive/eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz -> github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz https://github.com/nats-io/nats/archive/70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz -> github.com-nats-io-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz https://github.com/nats-io/nuid/archive/3024a71c3cbe30667286099921591e6fcc328230.tar.gz -> github.com-nats-io-nuid-3024a71c3cbe30667286099921591e6fcc328230.tar.gz https://github.com/nats-io/nkeys/archive/1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz -> github.com-nats-io-nkeys-1546a3320a8f195a5b5c84aef8309377c2e411d5.tar.gz https://github.com/nats-io/go-nats/archive/70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz -> github.com-nats-io-go-nats-70fe06cee50d4b6f98248d9675fb55f2a3aa7228.tar.gz https://github.com/nats-io/go-nats-streaming/archive/4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz -> github.com-nats-io-go-nats-streaming-4366d43a0648b4997ed32080f937e8702ab86c48.tar.gz https://github.com/Azure/azure-sdk-for-go/archive/d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz -> github.com-Azure-azure-sdk-for-go-d659f2a91175cac99aa5627d09b83026eacc978d.tar.gz https://github.com/Azure/go-autorest/archive/3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz -> github.com-Azure-go-autorest-3b1641ed03046f2ee28d73f7a51e5b884d55b92a.tar.gz https://github.com/DataDog/zstd/archive/c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz -> github.com-DataDog-zstd-c7161f8c63c045cbc7ca051dcc969dd0e4054de2.tar.gz https://github.com/mailru/easyjson/archive/1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz -> github.com-mailru-easyjson-1ea4449da9834f4d333f1cc461c374aea217d249.tar.gz https://github.com/gorilla/mux/archive/a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz -> github.com-gorilla-mux-a7962380ca08b5a188038c69871b8d3fbdf31e89.tar.gz https://github.com/coredns/coredns/archive/8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz -> github.com-coredns-coredns-8dcc7fccd74454134b33c8bc9f780ed6d7f076cf.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz -> github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz https://github.com/eapache/go-resiliency/archive/842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz -> github.com-eapache-go-resiliency-842e16ec2c98ef0c59eebfe60d2d3500a793ba19.tar.gz https://github.com/minio/minio-go/archive/5325257a208fc630aaaac31bc00789acbc998c14.tar.gz -> github.com-minio-minio-go-5325257a208fc630aaaac31bc00789acbc998c14.tar.gz https://github.com/alecthomas/participle/archive/98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz -> github.com-alecthomas-participle-98cb121381c371cf1542c7ae145e485d703aec0b.tar.gz https://github.com/aliyun/aliyun-oss-go-sdk/archive/86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz -> github.com-aliyun-aliyun-oss-go-sdk-86c17b95fcd5db33628a61e492fb4a1a937d5906.tar.gz https://github.com/bcicen/jstream/archive/16c1f8af81c2a9967b30d365a29472126274f998.tar.gz -> github.com-bcicen-jstream-16c1f8af81c2a9967b30d365a29472126274f998.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/cheggaaa/pb/archive/f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz -> github.com-cheggaaa-pb-f907f6f5dd81f77c2bbc1cde92e4c5a04720cb11.tar.gz https://github.com/gogo/protobuf/archive/382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz -> github.com-gogo-protobuf-382325bbbb4d1c850eec1f3ec92a1a16f502d68b.tar.gz https://github.com/davecgh/go-spew/archive/d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz -> github.com-davecgh-go-spew-d8f796af33cc11cb798c1aaeb27a4ebc5099927d.tar.gz https://github.com/inconshreveable/go-update/archive/8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz -> github.com-inconshreveable-go-update-8152e7eb6ccf8679a64582a66b78519688d156ad.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/mitchellh/go-homedir/archive/af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz -> github.com-mitchellh-go-homedir-af06845cf3004701891bf4fdb884bfe4920b3727.tar.gz https://github.com/klauspost/pgzip/archive/083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz -> github.com-klauspost-pgzip-083b1c3f84dd6486588802e5ce295de3a7f41a8b.tar.gz https://github.com/marstr/guid/archive/8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz -> github.com-marstr-guid-8bd9a64bf37eb297b492a4101fb28e80ac0b290f.tar.gz https://github.com/coreos/etcd/archive/d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz -> github.com-coreos-etcd-d57e8b8d97adfc4a6c224fe116714bf1a1f3beb9.tar.gz https://github.com/dgrijalva/jwt-go/archive/06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz -> github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz https://github.com/gorilla/rpc/archive/bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz -> github.com-gorilla-rpc-bffcfa752ad4e523cc8f720afeb5b985ed41ae16.tar.gz https://github.com/djherbis/atime/archive/8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz -> github.com-djherbis-atime-8e47e0e01d08df8b9f840d74299c8ab70a024a30.tar.gz https://github.com/dustin/go-humanize/archive/9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz -> github.com-dustin-go-humanize-9f541cc9db5d55bce703bd99987c9d5cb8eea45e.tar.gz https://github.com/eapache/go-xerial-snappy/archive/776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz -> github.com-eapache-go-xerial-snappy-776d5712da21bc4762676d614db1d8a64f4238b0.tar.gz https://github.com/eapache/queue/archive/093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz -> github.com-eapache-queue-093482f3f8ce946c05bcba64badd2c82369e084d.tar.gz https://github.com/golang/protobuf/archive/d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz -> github.com-golang-protobuf-d3c38a4eb4970272b87a425ae00ccc4548e2f9bb.tar.gz https://github.com/fatih/structs/archive/4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz -> github.com-fatih-structs-4966fc68f5b7593aafa6cbbba2d65ec6e1416047.tar.gz https://github.com/minio/parquet-go/archive/9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz -> github.com-minio-parquet-go-9d767baf16793cc4b7fd55d642474c36c077ef77.tar.gz https://github.com/go-ini/ini/archive/c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz -> github.com-go-ini-ini-c85607071cf08ca1adaf48319cd1aa322e81d8c1.tar.gz https://github.com/grpc/grpc-go/archive/3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz -> github.com-grpc-grpc-go-3507fb8e1a5ad030303c106fef3a47c9fdad16ad.tar.gz https://github.com/google/go-genproto/archive/64821d5d210748c883cd2b809589555ae4654203.tar.gz -> github.com-google-go-genproto-64821d5d210748c883cd2b809589555ae4654203.tar.gz https://github.com/census-instrumentation/opencensus-go/archive/43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz -> github.com-census-instrumentation-opencensus-go-43463a80402d8447b7fce0d2c58edf1687ff0b58.tar.gz https://github.com/apache/thrift/archive/c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz -> github.com-apache-thrift-c9b1e29bc9e0702d7441383358d565e1e76ccea7.tar.gz https://github.com/elazarl/go-bindata-assetfs/archive/30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz -> github.com-elazarl-go-bindata-assetfs-30f82fa23fd844bd5bb1e5f216db87fd77b5eb43.tar.gz https://github.com/eclipse/paho.mqtt.golang/archive/20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz -> github.com-eclipse-paho.mqtt.golang-20337d8c394721c308cc6ec096990ee451a7cd7f.tar.gz https://github.com/klauspost/compress/archive/30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz -> github.com-klauspost-compress-30be6041bed523c18e269a700ebd9c2ea9328574.tar.gz https://github.com/hashicorp/vault/archive/36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz -> github.com-hashicorp-vault-36aa8c8dd1936e10ebd7a4c1d412ae0e6f7900bd.tar.gz https://github.com/fatih/color/archive/5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz -> github.com-fatih-color-5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4.tar.gz https://github.com/miekg/dns/archive/73601d4aed9d844322611759d7f3619110b7c88e.tar.gz -> github.com-miekg-dns-73601d4aed9d844322611759d7f3619110b7c88e.tar.gz https://github.com/klauspost/reedsolomon/archive/a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz -> github.com-klauspost-reedsolomon-a9588190c00b0ccd742218388f6ff68bbad83e5c.tar.gz https://github.com/gomodule/redigo/archive/9c11da706d9b7902c6da69c592f75637793fe121.tar.gz -> github.com-gomodule-redigo-9c11da706d9b7902c6da69c592f75637793fe121.tar.gz https://github.com/go-sql-driver/mysql/archive/72cd26f257d44c1114970e19afddcd812016007e.tar.gz -> github.com-go-sql-driver-mysql-72cd26f257d44c1114970e19afddcd812016007e.tar.gz https://github.com/gorilla/handlers/archive/7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz -> github.com-gorilla-handlers-7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce.tar.gz https://github.com/mattn/go-isatty/archive/c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz -> github.com-mattn-go-isatty-c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/golang/snappy/archive/2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz -> github.com-golang-snappy-2a8bb927dd31d8daada140a5d09578521ce5c36a.tar.gz https://github.com/klauspost/cpuid/archive/e7e905edc00ea8827e58662220139109efea09db.tar.gz -> github.com-klauspost-cpuid-e7e905edc00ea8827e58662220139109efea09db.tar.gz https://github.com/census-ecosystem/opencensus-go-exporter-ocagent/archive/902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz -> github.com-census-ecosystem-opencensus-go-exporter-ocagent-902c0ccba68df93f7fefbe7e7c6f16be33108b40.tar.gz https://github.com/lib/pq/archive/4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz -> github.com-lib-pq-4ded0e9383f75c197b3a2aaa6d590ac52df6fd79.tar.gz https://github.com/mattn/go-runewidth/archive/3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz -> github.com-mattn-go-runewidth-3ee7d812e62a0804a7d0a324e0249ca2db3476d3.tar.gz https://github.com/census-instrumentation/opencensus-proto/archive/a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz -> github.com-census-instrumentation-opencensus-proto-a105b96453fe85139acc07b68de48f2cbdd71249.tar.gz https://github.com/minio/cli/archive/8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz -> github.com-minio-cli-8683fa7fef37cc8cb092f47bdb6b403e0049f9ee.tar.gz https://github.com/minio/mc/archive/a1355e50e2e8984d645cc7745230c42b27396341.tar.gz -> github.com-minio-mc-a1355e50e2e8984d645cc7745230c42b27396341.tar.gz https://github.com/googleapis/google-api-go-client/archive/bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz -> github.com-googleapis-google-api-go-client-bce707a4d0ea3488942724b3bcc1c8338f38f991.tar.gz https://github.com/grpc-ecosystem/grpc-gateway/archive/20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz -> github.com-grpc-ecosystem-grpc-gateway-20f268a412e5b342ebfb1a0eef7c3b7bd6c260ea.tar.gz https://github.com/mattn/go-colorable/archive/3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz -> github.com-mattn-go-colorable-3a70a971f94a22f2fa562ffcc7a0eb45f5daf045.tar.gz https://github.com/minio/blazer/archive/2081f5bf046503f576d8712253724fbf2950fffe.tar.gz -> github.com-minio-blazer-2081f5bf046503f576d8712253724fbf2950fffe.tar.gz https://github.com/minio/highwayhash/archive/02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz -> github.com-minio-highwayhash-02ca4b43caa3297fbb615700d8800acc7933be98.tar.gz https://github.com/minio/lsync/archive/v1.0.1.tar.gz -> github.com-minio-lsync-v1.0.1.tar.gz https://github.com/minio/sha256-simd/archive/05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz -> github.com-minio-sha256-simd-05b4dd3047e5d6e86cb4e0477164b850cd896261.tar.gz https://github.com/minio/sio/archive/035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz -> github.com-minio-sio-035b4ef8c449ba2ba21ec143c91964e76a1fb68c.tar.gz https://github.com/golang/sync/archive/e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz -> github.com-golang-sync-e225da77a7e68af35c70ccbf71af2b83e6acac3c.tar.gz https://github.com/golang/oauth2/archive/9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz -> github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz https://github.com/googleapis/google-cloud-go/archive/458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz -> github.com-googleapis-google-cloud-go-458e1f376a2b44413160b5d301183b65debaa3f6.tar.gz https://github.com/googleapis/gax-go/archive/beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz -> github.com-googleapis-gax-go-beaecbbdd8af86aa3acf14180d53828ce69400b2.tar.gz https://github.com/hashicorp/golang-lru/archive/7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz -> github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz https://github.com/json-iterator/go/archive/0ff49de124c6f76f8494e194af75bde0f1a49a29.tar.gz -> github.com-json-iterator-go-0ff49de124c6f76f8494e194af75bde0f1a49a29.tar.gz https://github.com/colinmarc/hdfs/archive/fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50.tar.gz -> github.com-colinmarc-hdfs-fd1e410ff7bf76b870f625dc0aa3eb4e44f5bc50.tar.gz https://github.com/hashicorp/go-uuid/archive/4f571afc59f3043a65f8fe6bf46d887b10a01d43.tar.gz -> github.com-hashicorp-go-uuid-4f571afc59f3043a65f8fe6bf46d887b10a01d43.tar.gz https://github.com/jcmturner/gofork/archive/dc7c13fece037a4a36e2b3c69db4991498d30692.tar.gz -> github.com-jcmturner-gofork-dc7c13fece037a4a36e2b3c69db4991498d30692.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz -> github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz https://github.com/jcmturner/aescts/archive/f6abebb3171c4c1b1fea279cb7c7325020a26290.tar.gz -> github.com-jcmturner-aescts-f6abebb3171c4c1b1fea279cb7c7325020a26290.tar.gz https://github.com/jcmturner/dnsutils/archive/13eeb8d49ffb74d7a75784c35e4d900607a3943c.tar.gz -> github.com-jcmturner-dnsutils-13eeb8d49ffb74d7a75784c35e4d900607a3943c.tar.gz https://github.com/klauspost/readahead/archive/v1.3.0.tar.gz -> github.com-klauspost-readahead-v1.3.0.tar.gz https://github.com/kurin/blazer/archive/v0.5.3.tar.gz -> github.com-kurin-blazer-v0.5.3.tar.gz https://github.com/minio/dsync/archive/fedfb5c974fa2ab238e45a6e6b19d38774e0326f.tar.gz -> github.com-minio-dsync-fedfb5c974fa2ab238e45a6e6b19d38774e0326f.tar.gz https://github.com/ncw/directio/archive/v1.0.5.tar.gz -> github.com-ncw-directio-v1.0.5.tar.gz https://github.com/nats-io/stan.go/archive/v0.4.5.tar.gz -> github.com-nats-io-stan.go-v0.4.5.tar.gz https://github.com/nats-io/nats.go/archive/v1.8.0.tar.gz -> github.com-nats-io-nats.go-v1.8.0.tar.gz https://github.com/minio/minio-go/archive/v6.0.29.tar.gz -> github.com-minio-minio-go-v6.0.29.tar.gz https://github.com/minio/hdfs/archive/v3.0.1.tar.gz -> github.com-minio-hdfs-v3.0.1.tar.gz https://github.com/minio/gokrb5/archive/v7.2.5.tar.gz -> github.com-minio-gokrb5-v7.2.5.tar.gz https://github.com/minio/minio-go/archive/v6.0.29.tar.gz -> github.com-minio-minio-go-v6.0.29.tar.gz https://github.com/jcmturner/goidentity/archive/v5.0.0.tar.gz -> github.com-jcmturner-goidentity-v5.0.0.tar.gz https://github.com/jcmturner/rpc/archive/99a8ce2fbf8b8087b6ed12a37c61b10f04070043.tar.gz -> github.com-jcmturner-rpc-99a8ce2fbf8b8087b6ed12a37c61b10f04070043.tar.gz https://github.com/jcmturner/goidentity/archive/v2.0.0.tar.gz -> github.com-jcmturner-goidentity-v2.0.0.tar.gz https://github.com/jcmturner/goidentity/archive/v3.0.0.tar.gz -> github.com-jcmturner-goidentity-v3.0.0.tar.gz https://github.com/kurin/blazer/archive/cf2f27cc0be3dac3c1a94c3c8b76834ce741439e.tar.gz -> github.com-kurin-blazer-cf2f27cc0be3dac3c1a94c3c8b76834ce741439e.tar.gz https://github.com/go-ldap/ldap/archive/v3.0.3.tar.gz -> github.com-go-ldap-ldap-v3.0.3.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/f715ec2f112d1e4195b827ad68cf44017a3ef2b1.tar.gz -> github.com-go-asn1-ber-asn1-ber-f715ec2f112d1e4195b827ad68cf44017a3ef2b1.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=63248d6f7c52e27a28844ea0be55e1ba
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.3.4 b/metadata/md5-cache/net-fs/nfs-utils-2.3.4
index 47fa7b16799d..04971d133a5b 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.3.4
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.3.4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.3.4.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1cf1208e074a689d9d47f692cd9c7584
+_md5_=ebdeb590f081f9a4a2120cca39351439
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r4 b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r4
index cf6b9ebf4f43..ccb4019ef9ec 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r4
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.1-r4
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.1.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=59dd1c86f7045cc5507e302538c34431
+_md5_=9200a6792f080b023a963c46a0bda7a4
diff --git a/metadata/md5-cache/net-fs/nfs-utils-2.4.2-r1 b/metadata/md5-cache/net-fs/nfs-utils-2.4.2-r1
index 5cdab000c162..179335caa574 100644
--- a/metadata/md5-cache/net-fs/nfs-utils-2.4.2-r1
+++ b/metadata/md5-cache/net-fs/nfs-utils-2.4.2-r1
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.4.2.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b579897337afb2eb60b361b0209e08aa
+_md5_=9eff75ee0041cd885e22c2a496dfd661
diff --git a/metadata/md5-cache/net-fs/nfstest-1.0.2 b/metadata/md5-cache/net-fs/nfstest-1.0.2
index f735a809b641..8a13651fe309 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 453a68efc416..bc2ef736a069 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a07e9b596f119de146e7d5ea60e7f81c
diff --git a/metadata/md5-cache/net-fs/s3fs-1.86 b/metadata/md5-cache/net-fs/s3fs-1.86
new file mode 100644
index 000000000000..d05a590bc40c
--- /dev/null
+++ b/metadata/md5-cache/net-fs/s3fs-1.86
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/libxml2:2 net-misc/curl sys-fs/fuse:0 gnutls? ( net-libs/gnutls:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) openssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Amazon S3 mounting via fuse
+EAPI=7
+HOMEPAGE=https://github.com/s3fs-fuse/s3fs-fuse/
+IUSE=gnutls nettle nss +openssl test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libxml2:2 net-misc/curl sys-fs/fuse:0 gnutls? ( net-libs/gnutls:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss ) openssl? ( dev-libs/openssl:0= ) app-misc/mime-types
+REQUIRED_USE=^^ ( gnutls nss openssl ) nettle? ( gnutls )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.86.tar.gz -> s3fs-1.86.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1ee35b916a2ab30622e68d8003ff548c
diff --git a/metadata/md5-cache/net-fs/s3ql-2.24 b/metadata/md5-cache/net-fs/s3ql-2.24
index 4d1ed3eebd4f..2066f9205937 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.24.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bfc5be0e333340525fac6c80f383df9
diff --git a/metadata/md5-cache/net-fs/s3ql-2.25 b/metadata/md5-cache/net-fs/s3ql-2.25
index 6069cc49e58e..f61beab51f86 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.25.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bfc5be0e333340525fac6c80f383df9
diff --git a/metadata/md5-cache/net-fs/s3ql-2.26 b/metadata/md5-cache/net-fs/s3ql-2.26
index 8d1a595a2565..3b1fd409e839 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.26.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bfc5be0e333340525fac6c80f383df9
diff --git a/metadata/md5-cache/net-fs/s3ql-2.28 b/metadata/md5-cache/net-fs/s3ql-2.28
index 3597c3cf035c..829bc6186d7f 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.28.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bfc5be0e333340525fac6c80f383df9
diff --git a/metadata/md5-cache/net-fs/s3ql-2.32 b/metadata/md5-cache/net-fs/s3ql-2.32
index 6af3486828e7..5666233fc8f5 100644
--- a/metadata/md5-cache/net-fs/s3ql-2.32
+++ b/metadata/md5-cache/net-fs/s3ql-2.32
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.bitbucket.org/nikratio/s3ql/downloads/s3ql-2.32.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c23d2cb753d8e6559388ca376770ca8a
diff --git a/metadata/md5-cache/net-fs/s3ql-2.33 b/metadata/md5-cache/net-fs/s3ql-2.33
index 65c352c4df10..d9195f434a59 100644
--- a/metadata/md5-cache/net-fs/s3ql-2.33
+++ b/metadata/md5-cache/net-fs/s3ql-2.33
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/s3ql/s3ql/releases/download/release-2.33/s3ql-2.33.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=bafec5b96b76da8195e94fc39d20dd5f
diff --git a/metadata/md5-cache/net-fs/samba-4.10.11 b/metadata/md5-cache/net-fs/samba-4.10.11
index 9980b2f5cf20..9cbe7b904a90 100644
--- a/metadata/md5-cache/net-fs/samba-4.10.11
+++ b/metadata/md5-cache/net-fs/samba-4.10.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.6[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.6[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.6[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_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_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 )
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.6[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_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_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.10.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=60fed245554af80802cd11b43ff803d4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=a1b1bf7594f13d76ee57bc920247f2ee
diff --git a/metadata/md5-cache/net-fs/samba-4.10.13 b/metadata/md5-cache/net-fs/samba-4.10.13
index cb594b8ba6b3..1408e1556744 100644
--- a/metadata/md5-cache/net-fs/samba-4.10.13
+++ b/metadata/md5-cache/net-fs/samba-4.10.13
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.6[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.6[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.6[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_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_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 )
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.6[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_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_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.10.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=60fed245554af80802cd11b43ff803d4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=a1b1bf7594f13d76ee57bc920247f2ee
diff --git a/metadata/md5-cache/net-fs/samba-4.10.2 b/metadata/md5-cache/net-fs/samba-4.10.2
deleted file mode 100644
index 421d52e167e8..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_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_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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.10.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=c57c0a86cadd54f23c36cbedb6532c5e
diff --git a/metadata/md5-cache/net-fs/samba-4.10.2-r1 b/metadata/md5-cache/net-fs/samba-4.10.2-r1
new file mode 100644
index 000000000000..c29613003e57
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.10.2-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.5.4[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.6.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.16[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_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_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.10.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=6eaae8e2fd313eb93d1fb25605699de8
diff --git a/metadata/md5-cache/net-fs/samba-4.11.4 b/metadata/md5-cache/net-fs/samba-4.11.4
index d37e0d0ae42e..33c39012c945 100644
--- a/metadata/md5-cache/net-fs/samba-4.11.4
+++ b/metadata/md5-cache/net-fs/samba-4.11.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( 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 )
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.11.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=a972bf128cd6bdeace3a11621c9bb32b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=58b7a9a6f682270b703ff5c0832e777f
diff --git a/metadata/md5-cache/net-fs/samba-4.11.6 b/metadata/md5-cache/net-fs/samba-4.11.6
index cd52f553b843..dd3a686dd97a 100644
--- a/metadata/md5-cache/net-fs/samba-4.11.6
+++ b/metadata/md5-cache/net-fs/samba-4.11.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( 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 )
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.11.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=a972bf128cd6bdeace3a11621c9bb32b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=58b7a9a6f682270b703ff5c0832e777f
diff --git a/metadata/md5-cache/net-fs/samba-4.11.6-r2 b/metadata/md5-cache/net-fs/samba-4.11.6-r2
new file mode 100644
index 000000000000..8f9f3406d3ae
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.11.6-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) 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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) 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 ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.11.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=556899de0bb756afecdf8db5b81b131f
diff --git a/metadata/md5-cache/net-fs/samba-4.5.16 b/metadata/md5-cache/net-fs/samba-4.5.16
deleted file mode 100644
index 049a757605b6..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.5.16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.1.30[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_targets_python2_7 +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.1.30[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) cluster? ( ads ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=3707dcbd2646553847fe617bfb64104f
diff --git a/metadata/md5-cache/net-fs/samba-4.5.16-r1 b/metadata/md5-cache/net-fs/samba-4.5.16-r1
new file mode 100644
index 000000000000..099e2d88673b
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.5.16-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.1.30[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.1.30[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.8[python,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.10[python,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) cluster? ( ads ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python2_7 )
+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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=291c9bc862c980f987c2aea78e06a265
diff --git a/metadata/md5-cache/net-fs/samba-4.8.12 b/metadata/md5-cache/net-fs/samba-4.8.12
index 977edf24f2b1..2e5806a6605a 100644
--- a/metadata/md5-cache/net-fs/samba-4.8.12
+++ b/metadata/md5-cache/net-fs/samba-4.8.12
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.8[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.8[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.8[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.8[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.8.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=78e10969bc31eeb8dd5d8cd075778fed
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=356344d34d9cbfa0903e610e51a15294
diff --git a/metadata/md5-cache/net-fs/samba-4.8.6-r2 b/metadata/md5-cache/net-fs/samba-4.8.6-r2
deleted file mode 100644
index 905a533f9459..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.8.6-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_targets_python2_7 +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.8.6.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=0cc51852c69057b35c574670646370f8
diff --git a/metadata/md5-cache/net-fs/samba-4.8.6-r3 b/metadata/md5-cache/net-fs/samba-4.8.6-r3
deleted file mode 100644
index 6899eb9a0fbe..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.8.6-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_targets_python2_7 +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.8.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=d3c3a3f3b1f7246ce9d32e74a1a7de8b
diff --git a/metadata/md5-cache/net-fs/samba-4.8.6-r4 b/metadata/md5-cache/net-fs/samba-4.8.6-r4
new file mode 100644
index 000000000000..fc94f107a360
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.8.6-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.8.6.tar.gz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=6a1d436a79fbafa964e8677d3df5a870
diff --git a/metadata/md5-cache/net-fs/samba-4.8.6-r5 b/metadata/md5-cache/net-fs/samba-4.8.6-r5
new file mode 100644
index 000000000000..5664caa6fce7
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.8.6-r5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=https://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.6[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.4.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/stable/samba-4.8.6.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=0aca0e6d70b82b7a1f96afddb02e4259
diff --git a/metadata/md5-cache/net-fs/samba-4.9.17 b/metadata/md5-cache/net-fs/samba-4.9.17
index 27dbb00d6385..1feb4732cb6a 100644
--- a/metadata/md5-cache/net-fs/samba-4.9.17
+++ b/metadata/md5-cache/net-fs/samba-4.9.17
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.8[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.8[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.8[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.8[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.9.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=f43a6b967dd87c475231790a49b65d67
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=a68172ff51f9790cc979ded50f4e7b7b
diff --git a/metadata/md5-cache/net-fs/samba-4.9.18 b/metadata/md5-cache/net-fs/samba-4.9.18
index 89491ff015ca..fe5e31b4c495 100644
--- a/metadata/md5-cache/net-fs/samba-4.9.18
+++ b/metadata/md5-cache/net-fs/samba-4.9.18
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.8[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.8[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
 KEYWORDS=~alpha ~amd64 ~arm ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.8[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.4.8[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-1.5.0[ldap(+)?,python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.14[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python?,python_single_target_python2_7(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python2_7? ( dev-python/subunit[python_targets_python2_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_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_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.9.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=f43a6b967dd87c475231790a49b65d67
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=a68172ff51f9790cc979ded50f4e7b7b
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 2d0a8a8af3ad..5d7de5b92c5b 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/frox-0.7.18-r5 b/metadata/md5-cache/net-ftp/frox-0.7.18-r5
index e9416c52eb3a..52eed9ecd877 100644
--- a/metadata/md5-cache/net-ftp/frox-0.7.18-r5
+++ b/metadata/md5-cache/net-ftp/frox-0.7.18-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( dev-libs/openssl ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 )
 SLOT=0
 SRC_URI=http://frox.sourceforge.net/download/frox-0.7.18.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d889e9c5eade5b79ec297e30a31db3ba
diff --git a/metadata/md5-cache/net-ftp/frox-0.7.18-r6 b/metadata/md5-cache/net-ftp/frox-0.7.18-r6
index d9bf1142b566..ce319940d4a0 100644
--- a/metadata/md5-cache/net-ftp/frox-0.7.18-r6
+++ b/metadata/md5-cache/net-ftp/frox-0.7.18-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:0= ) ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 )
 SLOT=0
 SRC_URI=http://frox.sourceforge.net/download/frox-0.7.18.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e343bc10365d7b245ab2aac96a17cb83
diff --git a/metadata/md5-cache/net-ftp/ftpbase-0.01-r3 b/metadata/md5-cache/net-ftp/ftpbase-0.01-r3
index 8bb78464807a..574fa0e69842 100644
--- a/metadata/md5-cache/net-ftp/ftpbase-0.01-r3
+++ b/metadata/md5-cache/net-ftp/ftpbase-0.01-r3
@@ -2,11 +2,11 @@ DEFINED_PHASES=install
 DEPEND=pam? ( sys-libs/pam ) !<net-ftp/proftpd-1.2.10-r6 !<net-ftp/pure-ftpd-1.0.20-r2 !<net-ftp/vsftpd-2.0.3-r1
 DESCRIPTION=FTP layout package
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=pam
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/ftp acct-user/ftp
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=6fcdf8a9096241a0ebfb2cb81df27962
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f394ec73e27e80e097a9ce83c4d78d0d
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.6b-r1 b/metadata/md5-cache/net-ftp/proftpd-1.3.6b-r1
index 94aca8bda8f2..c4a8153a442f 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.6b-r1
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.6b-r1
@@ -5,7 +5,7 @@ DESCRIPTION=An advanced and very configurable FTP server
 EAPI=7
 HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ https://github.com/jbenden/mod_clamav http://gssmod.sourceforge.net/
 IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pam? ( sys-libs/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
 REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls ) mysql? ( ssl ) postgres? ( ssl ) sqlite? ( ssl )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6b.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://github.com/jbenden/mod_clamav/archive/v0.14rc2.tar.gz -> proftpd-mod_clamav-0.14rc2.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.9.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2627353130cbf4996c832f39ee972190
+_md5_=abdecdb1894b42d7ccf5b2210eb8b9ef
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 d3e65be5afa5..0a58300fa7fe 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4fc49e9f85aada7896a2b66354d14bc6
diff --git a/metadata/md5-cache/net-ftp/vsftpd-3.0.3-r2 b/metadata/md5-cache/net-ftp/vsftpd-3.0.3-r2
deleted file mode 100644
index 3a6699273dcd..000000000000
--- a/metadata/md5-cache/net-ftp/vsftpd-3.0.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=caps? ( >=sys-libs/libcap-2 ) pam? ( sys-libs/pam ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
-DESCRIPTION=Very Secure FTP Daemon written with speed, size and security in mind
-EAPI=6
-HOMEPAGE=http://vsftpd.beasts.org/
-IUSE=caps libressl pam tcpd ssl selinux xinetd
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2 ) pam? ( sys-libs/pam ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) xinetd? ( sys-apps/xinetd )
-SLOT=0
-SRC_URI=http://security.appspot.com/downloads/vsftpd-3.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab705a56b38506753ef2e9f29dc2bbfe
diff --git a/metadata/md5-cache/net-ftp/vsftpd-3.0.3-r3 b/metadata/md5-cache/net-ftp/vsftpd-3.0.3-r3
new file mode 100644
index 000000000000..ed45ce594ad0
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/vsftpd-3.0.3-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=caps? ( >=sys-libs/libcap-2 ) pam? ( sys-libs/pam ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig
+DESCRIPTION=Very Secure FTP Daemon written with speed, size and security in mind
+EAPI=6
+HOMEPAGE=http://vsftpd.beasts.org/
+IUSE=caps libressl pam tcpd ssl selinux xinetd
+KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
+LICENSE=GPL-2
+RDEPEND=caps? ( >=sys-libs/libcap-2 ) pam? ( sys-libs/pam ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) xinetd? ( sys-apps/xinetd )
+SLOT=0
+SRC_URI=http://security.appspot.com/downloads/vsftpd-3.0.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=906434e9eec3bc2f36cc17c32e835540
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 6af95f022f9d..701668bdeef5 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/bitlbee-3.5.1 b/metadata/md5-cache/net-im/bitlbee-3.5.1
index 1f5ca1ee0b36..52cfefc23dff 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.5.1
+++ b/metadata/md5-cache/net-im/bitlbee-3.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://get.bitlbee.org/src/bitlbee-3.5.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=edaec85380b9eb331261664aa90143d5
diff --git a/metadata/md5-cache/net-im/bitlbee-3.6 b/metadata/md5-cache/net-im/bitlbee-3.6
index f7ac6a5aa7ed..4f5420959274 100644
--- a/metadata/md5-cache/net-im/bitlbee-3.6
+++ b/metadata/md5-cache/net-im/bitlbee-3.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://get.bitlbee.org/src/bitlbee-3.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f799535e19a940e9e2cf6a2e25084620
diff --git a/metadata/md5-cache/net-im/bitlbee-9999 b/metadata/md5-cache/net-im/bitlbee-9999
index a417a8597339..1ca510ac5de3 100644
--- a/metadata/md5-cache/net-im/bitlbee-9999
+++ b/metadata/md5-cache/net-im/bitlbee-9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libe
 REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f799535e19a940e9e2cf6a2e25084620
diff --git a/metadata/md5-cache/net-im/choqok-1.7.0 b/metadata/md5-cache/net-im/choqok-1.7.0
new file mode 100644
index 000000000000..d1f7f8bc66e4
--- /dev/null
+++ b/metadata/md5-cache/net-im/choqok-1.7.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=app-crypt/qca[qt5(+)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetworkauth-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 attica? ( >=kde-frameworks/attica-5.60.0:5 ) konqueror? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 ) share? ( >=kde-frameworks/purpose-5.60.0:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info dev-qt/qtcore:5
+DESCRIPTION=Free/Open Source micro-blogging client by KDE
+EAPI=7
+HOMEPAGE=https://choqok.kde.org/ https://kde.org/applications/internet/org.kde.choqok
+IUSE=attica konqueror share telepathy debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/qca[qt5(+)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetworkauth-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 attica? ( >=kde-frameworks/attica-5.60.0:5 ) konqueror? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kdewebkit-5.60.0:5 ) share? ( >=kde-frameworks/purpose-5.60.0:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+SLOT=5
+SRC_URI=mirror://kde/stable/choqok/1.7/src/choqok-1.7.0.tar.xz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=11e39ec14808c2f8b6e15382bbe2dae1
diff --git a/metadata/md5-cache/net-im/ekg2-0.4_pre20190315 b/metadata/md5-cache/net-im/ekg2-0.4_pre20190315
index ef6dc29696c0..8694f8d23958 100644
--- a/metadata/md5-cache/net-im/ekg2-0.4_pre20190315
+++ b/metadata/md5-cache/net-im/ekg2-0.4_pre20190315
@@ -4,12 +4,12 @@ DEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgm
 DESCRIPTION=Text-based, multi-protocol instant messenger
 EAPI=7
 HOMEPAGE=https://github.com/ekg2/ekg2/
-IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl python readline rss spell sqlite ssl xmpp unicode zlib +python_targets_python2_7 +python_single_target_python2_7
+IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl python readline rss spell sqlite ssl xmpp unicode zlib +python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:0=[unicode=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://github.com/ekg2/ekg2/archive/f427d083ee899d42532c046100490a915b0e8a82.tar.gz -> ekg2-f427d083ee899d42532c046100490a915b0e8a82.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e8689fdf9216f750de32a972fc12f88
diff --git a/metadata/md5-cache/net-im/ekg2-9999 b/metadata/md5-cache/net-im/ekg2-9999
index 51c8cd10a72e..ad2dccf58c8c 100644
--- a/metadata/md5-cache/net-im/ekg2-9999
+++ b/metadata/md5-cache/net-im/ekg2-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgm
 DESCRIPTION=Text-based, multi-protocol instant messenger
 EAPI=7
 HOMEPAGE=https://github.com/ekg2/ekg2/
-IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl python readline rss spell sqlite ssl xmpp unicode zlib +python_targets_python2_7 +python_single_target_python2_7
+IUSE=gadu gpm gpg gtk minimal ncurses nls nntp openssl perl python readline rss spell sqlite ssl xmpp unicode zlib +python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 gadu? ( <net-libs/libgadu-1.12:0= ) gpg? ( app-crypt/gpgme:1= ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl:0= ) openssl? ( dev-libs/openssl:0= ) perl? ( dev-lang/perl:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) readline? ( sys-libs/readline:0= ) rss? ( dev-libs/expat:0= ) ssl? ( net-libs/gnutls:0= ) xmpp? ( dev-libs/expat:0= ) zlib? ( sys-libs/zlib:0= ) ncurses? ( sys-libs/ncurses:0=[unicode=] gpm? ( sys-libs/gpm:0= ) spell? ( app-text/aspell:0= ) ) sqlite? ( dev-db/sqlite:3= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=91fe276035753708c9f2853f17892816
diff --git a/metadata/md5-cache/net-im/empathy-3.12.14 b/metadata/md5-cache/net-im/empathy-3.12.14
index 6eb3c87aa2c1..0dcb8fbb457e 100644
--- a/metadata/md5-cache/net-im/empathy-3.12.14
+++ b/metadata/md5-cache/net-im/empathy-3.12.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=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:0 >=app-text/iso-codes-0.35 ) v4l? ( dev-libs/libgudev:= media-plugins/gst-plugins-v4l2:1.0 >=media-video/cheese-3.4:= ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.50.0 dev-util/itstool virtual/pkgconfig test? ( sys-apps/grep >=dev-libs/check-0.9.4 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils 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.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:0 >=app-text/iso-codes-0.35 ) v4l? ( dev-libs/libgudev:= media-plugins/gst-plugins-v4l2:1.0 >=media-video/cheese-3.4:= ) || ( dev-lang/python:3.6 ) dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.50.0 dev-util/itstool virtual/pkgconfig test? ( sys-apps/grep >=dev-libs/check-0.9.4 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Telepathy instant messaging and video/audio call client for GNOME
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Empathy
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/empathy/3.12/empathy-3.12.14.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d08711d211ae704444c1b48945b92700
+_md5_=88ccb1569ccbc2a9c58bdf2ec3b3d57a
diff --git a/metadata/md5-cache/net-im/err-5.2.0-r1 b/metadata/md5-cache/net-im/err-5.2.0-r1
index 36273793d1ff..5afe644cd4c8 100644
--- a/metadata/md5-cache/net-im/err-5.2.0-r1
+++ b/metadata/md5-cache/net-im/err-5.2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/ansi[python_targets_python3_6(-)?,-python_single_target_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/e/errbot/errbot-5.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a373dc60c74e3aa7f42b774e1b8ceb68
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3 b/metadata/md5-cache/net-im/gajim-1.0.3
deleted file mode 100644
index 714b996f41c3..000000000000
--- a/metadata/md5-cache/net-im/gajim-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=6
-HOMEPAGE=https://www.gajim.org/
-IUSE=+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83759f1a421ae0ee1e4c80dce854ae8d
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3-r1 b/metadata/md5-cache/net-im/gajim-1.0.3-r1
deleted file mode 100644
index 350ead91bf78..000000000000
--- a/metadata/md5-cache/net-im/gajim-1.0.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=6
-HOMEPAGE=https://www.gajim.org/
-IUSE=+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/precis-i18n[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyasn1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycurl[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject[cairo,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a8cda03a9709489069c32e96e86a977
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3-r2 b/metadata/md5-cache/net-im/gajim-1.0.3-r2
new file mode 100644
index 000000000000..8f52110345f6
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.0.3-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=6
+HOMEPAGE=https://www.gajim.org/
+IUSE=+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp +python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_6(-)] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b2fdad21b887d7a76d99eeeb56942787
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3-r3 b/metadata/md5-cache/net-im/gajim-1.0.3-r3
new file mode 100644
index 000000000000..5bd5145cd222
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.0.3-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1 python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=6
+HOMEPAGE=https://www.gajim.org/
+IUSE=+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_6(-)] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1238707d8ba5da458d727f3a9c65b3c
diff --git a/metadata/md5-cache/net-im/gajim-1.1.3 b/metadata/md5-cache/net-im/gajim-1.1.3
deleted file mode 100644
index de2a77f101d8..000000000000
--- a/metadata/md5-cache/net-im/gajim-1.1.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=7
-HOMEPAGE=https://www.gajim.org/
-IUSE=+crypt geolocation jingle networkmanager remote rst +spell upnp +webp 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=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] dev-python/idna[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/precis-i18n[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyasn1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycurl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/secretstorage-3.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/cssutils-1.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.gajim.org/downloads/1.1/gajim-1.1.3.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d44e8808d7a229725f4c643b5a16698c
diff --git a/metadata/md5-cache/net-im/gajim-1.1.3-r1 b/metadata/md5-cache/net-im/gajim-1.1.3-r1
new file mode 100644
index 000000000000..d9ac35fc2ddd
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.1.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] app-arch/unzip >=dev-util/intltool-0.40.1 virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=7
+HOMEPAGE=https://www.gajim.org/
+IUSE=+crypt geolocation jingle networkmanager remote rst +spell upnp +webp python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_6(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_6(-)] >=dev-python/cssutils-1.0.2[python_targets_python3_6(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/idna[python_targets_python3_7(-)] dev-python/precis-i18n[python_targets_python3_7(-)] dev-python/pyasn1[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycurl[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_7(-)] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_7(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_7(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_7(-)] >=dev-python/cssutils-1.0.2[python_targets_python3_7(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_7(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_7(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_7(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_7(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.gajim.org/downloads/1.1/gajim-1.1.3.tar.bz2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13af4a537494eaa8613f04366abf4534
diff --git a/metadata/md5-cache/net-im/jabber-base-0.01-r1 b/metadata/md5-cache/net-im/jabber-base-0.01-r1
index 5486ced9ce10..41a839fefaec 100644
--- a/metadata/md5-cache/net-im/jabber-base-0.01-r1
+++ b/metadata/md5-cache/net-im/jabber-base-0.01-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Jabber servers and transports layout package
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=910ed048a3f78db043558ae221a704d2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=38b9b80a88d5fcdde627b3eacbdffbcb
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 229a943736d3..94bcf1483c90 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ea72208dc3b86d3f919a62c36e38409
diff --git a/metadata/md5-cache/net-im/pidgin-2.13.0-r4 b/metadata/md5-cache/net-im/pidgin-2.13.0-r4
deleted file mode 100644
index 78e13cdf484f..000000000000
--- a/metadata/md5-cache/net-im/pidgin-2.13.0-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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 ) 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 dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK Instant Messenger client
-EAPI=6
-HOMEPAGE=http://pidgin.im/
-IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_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[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) 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 ) 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_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 ) ) networkmanager? ( dbus ) python? ( ^^ ( 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/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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b72e91f7d68df66712bf8e815e165448
diff --git a/metadata/md5-cache/net-im/pidgin-2.13.0-r5 b/metadata/md5-cache/net-im/pidgin-2.13.0-r5
new file mode 100644
index 000000000000..9a634a2bddff
--- /dev/null
+++ b/metadata/md5-cache/net-im/pidgin-2.13.0-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_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 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) 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 ) 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 dev-lang/perl dev-perl/XML-Parser virtual/pkgconfig gtk? ( x11-base/xorg-proto >=dev-util/intltool-0.41.1 sys-devel/gettext ) dbus? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) doc? ( app-doc/doxygen ) !gtk? ( nls? ( >=dev-util/intltool-0.41.1 sys-devel/gettext ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GTK Instant Messenger client
+EAPI=6
+HOMEPAGE=http://pidgin.im/
+IUSE=aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl tk +xscreensaver zephyr zeroconf python_single_target_python3_6 python_single_target_python3_7
+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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_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 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] ) ) 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 ) 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_single_target_python3_6 python_single_target_python3_7 ) ) networkmanager? ( dbus ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=12dc507382f1733306a38de541aa382c
diff --git a/metadata/md5-cache/net-im/poezio-0.12 b/metadata/md5-cache/net-im/poezio-0.12
index b76281e3ff2f..372f74756f86 100644
--- a/metadata/md5-cache/net-im/poezio-0.12
+++ b/metadata/md5-cache/net-im/poezio-0.12
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/poezio/poezio-0.12.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=581225f6ed93eb65d734907213f2a758
diff --git a/metadata/md5-cache/net-im/poezio-9999 b/metadata/md5-cache/net-im/poezio-9999
index 162673f6a357..b1d361c27e53 100644
--- a/metadata/md5-cache/net-im/poezio-9999
+++ b/metadata/md5-cache/net-im/poezio-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/aiodns[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=47c286fa48ee06b919a77c3ab9e173fe
diff --git a/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r6 b/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r6
deleted file mode 100644
index b7a8262fa2f9..000000000000
--- a/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-im/jabber-base virtual/pkgconfig
-DESCRIPTION=Python based jabber transport for ICQ
-EAPI=6
-HOMEPAGE=https://code.google.com/p/pyicqt/
-IUSE=webinterface +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-im/jabber-base || ( ( dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/twisted-words[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/twisted[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) webinterface? ( >=dev-python/nevow-0.4.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pyicqt.googlecode.com/files/pyicqt-0.8.1.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=20a6b66937aa81d397b83fc177ca3bce
diff --git a/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r7 b/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r7
new file mode 100644
index 000000000000..82a76a937d5e
--- /dev/null
+++ b/metadata/md5-cache/net-im/pyicq-t-0.8.1.5-r7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-im/jabber-base virtual/pkgconfig
+DESCRIPTION=Python based jabber transport for ICQ
+EAPI=6
+HOMEPAGE=https://code.google.com/p/pyicqt/
+IUSE=webinterface +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-im/jabber-base python_single_target_python2_7? ( || ( ( dev-python/twisted-core[python_targets_python2_7(-)] dev-python/twisted-words[python_targets_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)] ) dev-python/twisted[python_targets_python2_7(-)] ) webinterface? ( >=dev-python/nevow-0.4.1[python_targets_python2_7(-)] ) dev-python/pillow[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://pyicqt.googlecode.com/files/pyicqt-0.8.1.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c3835415244c7a399a9ef82ed4463dd5
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.55.0.123 b/metadata/md5-cache/net-im/skypeforlinux-8.55.0.123
index a47490c5e9f3..2bcfc0019c8c 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.55.0.123
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.55.0.123
@@ -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.55.0.123-1.x86_64.rpm
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de7c9273deec46a31f9bbd0c8c473f11
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.55.0.141 b/metadata/md5-cache/net-im/skypeforlinux-8.55.0.141
index 03a7f3ebc12f..5d89b15d4eb6 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.55.0.141
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.55.0.141
@@ -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.55.0.141-1.x86_64.rpm
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8292f2831cba5c159bfcf4b8bb0af4e2
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.56.0.103-r2 b/metadata/md5-cache/net-im/skypeforlinux-8.56.0.103-r2
index 840a2b4fc3de..6e596a4446ea 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.56.0.103-r2
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.56.0.103-r2
@@ -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.56.0.103-1.x86_64.rpm
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aaec4b47647f97126edddf3682e10461
diff --git a/metadata/md5-cache/net-im/slack-bin-2.1.2 b/metadata/md5-cache/net-im/slack-bin-2.1.2
deleted file mode 100644
index 0f73b84702ca..000000000000
--- a/metadata/md5-cache/net-im/slack-bin-2.1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DESCRIPTION=Team collaboration tool
-EAPI=6
-HOMEPAGE=http://www.slack.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=dev-libs/atk:0 dev-libs/expat:0 dev-libs/glib:2 dev-libs/nspr:0 dev-libs/nss:0 gnome-base/gconf:2 gnome-base/libgnome-keyring:0 media-libs/alsa-lib:0 media-libs/fontconfig:1.0 media-libs/freetype:2 net-misc/curl:0 net-print/cups:0 sys-apps/dbus:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11:0 x11-libs/libXcomposite:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXi:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXScrnSaver:0 x11-libs/libXtst:0 x11-libs/pango:0
-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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_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
deleted file mode 100644
index dc03d82498d6..000000000000
--- a/metadata/md5-cache/net-im/slack-bin-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DESCRIPTION=Team collaboration tool
-EAPI=6
-HOMEPAGE=http://www.slack.com/
-IUSE=ayatana gnome-keyring pax_kernel abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] net-misc/curl:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:2[abi_x86_64(-)?] ) gnome-keyring? ( app-crypt/libsecret:0[abi_x86_64(-)?] )
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.1.1-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3c82f2608e3625910d28e77f4d24e132
diff --git a/metadata/md5-cache/net-im/slack-bin-4.1.1 b/metadata/md5-cache/net-im/slack-bin-4.1.1
index 02ffbced2126..fa5ddb9a550e 100644
--- a/metadata/md5-cache/net-im/slack-bin-4.1.1
+++ b/metadata/md5-cache/net-im/slack-bin-4.1.1
@@ -11,4 +11,4 @@ RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.1.1-amd64.deb
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=857858516897e80838fc7f7f760ec068
+_md5_=42334bf45e2c743e49d46afd8731596c
diff --git a/metadata/md5-cache/net-im/slack-bin-4.3.2 b/metadata/md5-cache/net-im/slack-bin-4.3.2
deleted file mode 100644
index 7bc0870bddab..000000000000
--- a/metadata/md5-cache/net-im/slack-bin-4.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DESCRIPTION=Team collaboration tool
-EAPI=7
-HOMEPAGE=https://www.slack.com/
-IUSE=ayatana gnome-keyring abi_x86_64
-KEYWORDS=-* ~amd64
-LICENSE=all-rights-reserved
-RDEPEND=app-accessibility/at-spi2-atk:2[abi_x86_64(-)?] dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/mesa:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] sys-apps/util-linux:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:3[abi_x86_64(-)?] ) gnome-keyring? ( app-crypt/libsecret:0[abi_x86_64(-)?] )
-REQUIRED_USE=|| ( abi_x86_64 )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.3.2-amd64.deb
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f5f65268acb155e9c047584c9f607b1
diff --git a/metadata/md5-cache/net-im/slack-bin-4.3.2-r1 b/metadata/md5-cache/net-im/slack-bin-4.3.2-r1
new file mode 100644
index 000000000000..61e4d3773579
--- /dev/null
+++ b/metadata/md5-cache/net-im/slack-bin-4.3.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DESCRIPTION=Team collaboration tool
+EAPI=7
+HOMEPAGE=https://www.slack.com/
+IUSE=ayatana abi_x86_64
+KEYWORDS=-* ~amd64
+LICENSE=all-rights-reserved
+RDEPEND=app-accessibility/at-spi2-atk:2[abi_x86_64(-)?] app-accessibility/at-spi2-core:2[abi_x86_64(-)?] dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/mesa:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] sys-apps/util-linux:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:3[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?] ayatana? ( dev-libs/libappindicator:3[abi_x86_64(-)?] )
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-4.3.2-amd64.deb
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07e400e899a059fcc82ca5af81b4e0a4
diff --git a/metadata/md5-cache/net-im/swift-4.0.2-r1 b/metadata/md5-cache/net-im/swift-4.0.2-r1
index 8966e856945a..7a3d0a72b2e9 100644
--- a/metadata/md5-cache/net-im/swift-4.0.2-r1
+++ b/metadata/md5-cache/net-im/swift-4.0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( icu idn ) gconf? ( client ) spell? ( client )
 RESTRICT=test
 SLOT=4/0
 SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f2fbd639a570ed4d379b3aa90c2f4fa6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=231635e0db2cb74715a566775ac3d1e0
diff --git a/metadata/md5-cache/net-im/telegram-desktop-1.9.10 b/metadata/md5-cache/net-im/telegram-desktop-1.9.10
new file mode 100644
index 000000000000..3fb4abbb1cbe
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-1.9.10
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4 app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-cpp/ms-gsl-2.1.0 dev-cpp/range-v3 dev-libs/libdbusmenu-qt[qt5(+)] dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 media-libs/fontconfig:= media-libs/openal[pulseaudio] media-libs/opus media-sound/pulseaudio sys-libs/zlib[minizip] virtual/ffmpeg x11-libs/libva[X,drm] x11-libs/libX11 || ( dev-qt/qtgui:5[png,X(-)] dev-qt/qtgui:5[png,xcb(-)] ) || ( dev-qt/qtwidgets:5[png,X(-)] dev-qt/qtwidgets:5[png,xcb(-)] ) dbus? ( dev-qt/qtdbus:5 ) gtk3? ( dev-libs/libappindicator:3 x11-libs/gtk+:3 sys-apps/xdg-desktop-portal ) spell? ( app-text/enchant:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=dbus gtk3 libressl spell
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-3-with-openssl-exception Unlicense
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4 app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-cpp/ms-gsl-2.1.0 dev-cpp/range-v3 dev-libs/libdbusmenu-qt[qt5(+)] dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 media-libs/fontconfig:= media-libs/openal[pulseaudio] media-libs/opus media-sound/pulseaudio sys-libs/zlib[minizip] virtual/ffmpeg x11-libs/libva[X,drm] x11-libs/libX11 || ( dev-qt/qtgui:5[png,X(-)] dev-qt/qtgui:5[png,xcb(-)] ) || ( dev-qt/qtwidgets:5[png,X(-)] dev-qt/qtwidgets:5[png,xcb(-)] ) dbus? ( dev-qt/qtdbus:5 ) gtk3? ( dev-libs/libappindicator:3 x11-libs/gtk+:3 sys-apps/xdg-desktop-portal ) spell? ( app-text/enchant:= )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v1.9.10/tdesktop-1.9.10-full.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6dbb4b963aee58bd60453c9e0b0ca537
diff --git a/metadata/md5-cache/net-im/telegram-desktop-1.9.10-r1 b/metadata/md5-cache/net-im/telegram-desktop-1.9.10-r1
new file mode 100644
index 000000000000..e292d3bb70b0
--- /dev/null
+++ b/metadata/md5-cache/net-im/telegram-desktop-1.9.10-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=!net-im/telegram-desktop-bin app-arch/lz4 app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-cpp/ms-gsl-2.1.0 dev-cpp/range-v3 dev-libs/libdbusmenu-qt[qt5(+)] dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 media-libs/fontconfig:= media-libs/libtgvoip[alsa?,pulseaudio?] media-libs/openal[alsa?,pulseaudio?] sys-libs/zlib[minizip] virtual/ffmpeg virtual/libiconv x11-libs/libva[X,drm] x11-libs/libX11 || ( dev-qt/qtgui:5[png,X(-)] dev-qt/qtgui:5[png,xcb(-)] ) || ( dev-qt/qtwidgets:5[png,X(-)] dev-qt/qtwidgets:5[png,xcb(-)] ) gtk3? ( dev-libs/libappindicator:3 x11-libs/gtk+:3 ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/enchant:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 )
+DESCRIPTION=Official desktop client for Telegram
+EAPI=7
+HOMEPAGE=https://desktop.telegram.org
+IUSE=alsa dbus gtk3 libressl pulseaudio spell
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4 app-arch/xz-utils !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-cpp/ms-gsl-2.1.0 dev-cpp/range-v3 dev-libs/libdbusmenu-qt[qt5(+)] dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 media-libs/fontconfig:= media-libs/libtgvoip[alsa?,pulseaudio?] media-libs/openal[alsa?,pulseaudio?] sys-libs/zlib[minizip] virtual/ffmpeg virtual/libiconv x11-libs/libva[X,drm] x11-libs/libX11 || ( dev-qt/qtgui:5[png,X(-)] dev-qt/qtgui:5[png,xcb(-)] ) || ( dev-qt/qtwidgets:5[png,X(-)] dev-qt/qtwidgets:5[png,xcb(-)] ) gtk3? ( dev-libs/libappindicator:3 x11-libs/gtk+:3 ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/enchant:= )
+REQUIRED_USE=|| ( alsa pulseaudio )
+SLOT=0
+SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v1.9.10/tdesktop-1.9.10-full.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=debc9e6c0712b985d63a5242b9a99e25
diff --git a/metadata/md5-cache/net-im/telepathy-mission-control-5.16.5 b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.5
new file mode 100644
index 000000000000..302f0dfd1440
--- /dev/null
+++ b/metadata/md5-cache/net-im/telepathy-mission-control-5.16.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=net-libs/telepathy-glib-0.20 networkmanager? ( >=net-misc/networkmanager-1:= ) || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An account manager and channel dispatcher for the Telepathy framework
+EAPI=6
+HOMEPAGE=https://cgit.freedesktop.org/telepathy/telepathy-mission-control/
+IUSE=debug networkmanager
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/dbus-glib-0.82 >=dev-libs/glib-2.46:2 >=sys-apps/dbus-0.95 >=net-libs/telepathy-glib-0.20 networkmanager? ( >=net-misc/networkmanager-1:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.16.5.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f7731d951f74b208532ab085679071fe
diff --git a/metadata/md5-cache/net-im/toxic-0.8.2 b/metadata/md5-cache/net-im/toxic-0.8.2
index 39065e6c1c7b..631208b167b2 100644
--- a/metadata/md5-cache/net-im/toxic-0.8.2
+++ b/metadata/md5-cache/net-im/toxic-0.8.2
@@ -3,12 +3,12 @@ DEPEND=virtual/pkgconfig net-libs/tox:0/0.2 dev-libs/libconfig net-misc/curl:0=
 DESCRIPTION=A curses-based client for Tox
 EAPI=6
 HOMEPAGE=https://github.com/JFreegman/toxic
-IUSE=+X +sound notification +python +qrcode +video +python_targets_python3_6 +python_single_target_python3_6
+IUSE=+X +sound notification +python +qrcode +video +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=net-libs/tox:0/0.2 dev-libs/libconfig net-misc/curl:0= sys-libs/ncurses:0= notification? ( x11-libs/libnotify ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) qrcode? ( media-gfx/qrencode:= ) sound? ( media-libs/openal media-libs/freealut net-libs/tox:0/0.2[av] ) video? ( media-libs/libvpx:= net-libs/tox:0/0.2[av] x11-libs/libX11 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a394e98df935c5fb88c0d27ef6fd726c
diff --git a/metadata/md5-cache/net-im/toxic-0.8.3 b/metadata/md5-cache/net-im/toxic-0.8.3
index 00e0cbe82f8c..43aed548a717 100644
--- a/metadata/md5-cache/net-im/toxic-0.8.3
+++ b/metadata/md5-cache/net-im/toxic-0.8.3
@@ -3,12 +3,12 @@ DEPEND=virtual/pkgconfig dev-libs/libconfig >=net-libs/tox-0.2.8:* net-misc/curl
 DESCRIPTION=A curses-based client for Tox
 EAPI=6
 HOMEPAGE=https://github.com/JFreegman/toxic
-IUSE=notification python qrcode +sound +video +X +python_targets_python3_6 +python_single_target_python3_6
+IUSE=notification python qrcode +sound +video +X +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/libconfig >=net-libs/tox-0.2.8:* net-misc/curl sys-libs/ncurses:* notification? ( x11-libs/libnotify ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) qrcode? ( media-gfx/qrencode ) sound? ( media-libs/freealut media-libs/openal net-libs/tox[av] ) video? ( media-libs/libvpx net-libs/tox[av] x11-libs/libX11 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/JFreegman/toxic/archive/v0.8.3.tar.gz -> toxic-0.8.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad971bc1b09aaec028a78e9e617b527a
diff --git a/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426 b/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426
index 89bc67610d7e..570779a6ab2c 100644
--- a/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426
+++ b/metadata/md5-cache/net-im/transwhat-0.2.2_p20190426
@@ -11,5 +11,5 @@ RDEPEND=dev-python/protobuf-python[python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/stv0g/transwhat/archive/d022243f6c7b23674d3c87a09819f00b10df1165.tar.gz -> transwhat-0.2.2_p20190426.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5c7dd7de6cb01ef4057d4737bb55bfc7
diff --git a/metadata/md5-cache/net-im/turses-0.2.23 b/metadata/md5-cache/net-im/turses-0.2.23
index a3f956b62a61..556adce47fe3 100644
--- a/metadata/md5-cache/net-im/turses-0.2.23
+++ b/metadata/md5-cache/net-im/turses-0.2.23
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=44c75b3c50b99a69345f2e3902f937ca
diff --git a/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905 b/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
index e3dbc9775b41..80d50d142315 100644
--- a/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
+++ b/metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
@@ -11,5 +11,5 @@ RDEPEND=dev-python/appdirs[python_targets_python3_6(-)?,python_targets_python3_7
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/tgalal/yowsup/archive/2adc067f306d9e7d8b634f66e96c52d80a42e1ff.tar.gz -> yowsup-3.2.3_p20190905.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1e78557d94d0f8ef808421ed531691ea
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 77a5b836a2a9..708f3667fadd 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/anope-2.0.6 b/metadata/md5-cache/net-irc/anope-2.0.6
index d0030b58fea3..067e522ea5a7 100644
--- a/metadata/md5-cache/net-irc/anope-2.0.6
+++ b/metadata/md5-cache/net-irc/anope-2.0.6
@@ -11,5 +11,5 @@ RDEPEND=sys-devel/gettext mysql? ( dev-db/mysql-connector-c:0= ) ssl? ( dev-libs
 REQUIRED_USE=chanstats? ( mysql ) cs-fantasy-stats? ( chanstats mysql ) cs-fantasy-top? ( chanstats mysql ) irc2sql? ( mysql ) ldap-auth? ( ldap ) ldap-oper? ( ldap ) sql-auth? ( || ( mysql sqlite ) ) sql-log? ( mysql ) sql-oper? ( mysql )
 SLOT=0
 SRC_URI=https://github.com/anope/anope/releases/download/2.0.6/anope-2.0.6-source.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b8ed21b9d31f2ae92cf241b3086b8ee5
diff --git a/metadata/md5-cache/net-irc/atheme-services-7.2.10_p2 b/metadata/md5-cache/net-irc/atheme-services-7.2.10_p2
index fc305c0e16db..c9880e5c6ee7 100644
--- a/metadata/md5-cache/net-irc/atheme-services-7.2.10_p2
+++ b/metadata/md5-cache/net-irc/atheme-services-7.2.10_p2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=dev-libs/libmowgli-2.1.0:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/atheme/atheme/releases/download/v7.2.10-r2/atheme-v7.2.10-r2.tar.xz -> atheme-services-7.2.10_p2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f1d4ee89b8c78be309d709e674335708
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 51368d7ba81d..78bc9b6c121d 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.12.4-r2
+++ b/metadata/md5-cache/net-irc/hexchat-2.12.4-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-arch/xz-utils virtual/pkgconfig dev-util/intltool sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-arch/xz-utils virtual/pkgconfig dev-util/intltool sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Graphical IRC client based on XChat
 EAPI=6
 HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl +python_single_target_python3_6
 KEYWORDS=~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux
 LICENSE=GPL-2 plugin-fishlim? ( MIT )
-RDEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) spell? ( app-text/enchant:0 )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) spell? ( app-text/enchant:0 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.12.4.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33b33b59f49f4b52bd15c4870757ce7f
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd4d851ab9bfc7dbfc3ec882b85de124
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.1 b/metadata/md5-cache/net-irc/hexchat-2.14.1
index 078f885a3883..efecd3fc216f 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.1
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=6
 HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager +python_targets_python3_6 +python_single_target_python3_6
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager +python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) 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_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=832035f00e3721503364b11f52c7ba93
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.2 b/metadata/md5-cache/net-irc/hexchat-2.14.2
index e87b2478b1ee..7ae962580bfa 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.2
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.2
@@ -3,12 +3,12 @@ DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=6
 HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac88dedaac877d3076ea94f8ad0029f6
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.3 b/metadata/md5-cache/net-irc/hexchat-2.14.3
index bf60afccbdfd..263b2d550b25 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.14.3
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.3
@@ -4,12 +4,12 @@ DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=7
 HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) 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_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.3.tar.xz
-_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c32e8b4ca69322d233b7d52483ab9df1
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 4c3ad03639c2..2954804d27fb 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -4,11 +4,11 @@ DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=7
 HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2 plugin-fishlim? ( MIT )
 PROPERTIES=live
 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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) 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_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	meson	10d1eb1da93c5fc17e3814e6923beb57	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	meson	10d1eb1da93c5fc17e3814e6923beb57	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c32e8b4ca69322d233b7d52483ab9df1
diff --git a/metadata/md5-cache/net-irc/inspircd-2.0.28 b/metadata/md5-cache/net-irc/inspircd-2.0.28
index b83dc8f996f7..da40c0d6d46f 100644
--- a/metadata/md5-cache/net-irc/inspircd-2.0.28
+++ b/metadata/md5-cache/net-irc/inspircd-2.0.28
@@ -10,4 +10,4 @@ RDEPEND=acct-group/inspircd acct-user/inspircd dev-lang/perl ssl? ( dev-libs/ope
 SLOT=0
 SRC_URI=https://github.com/inspircd/inspircd/archive/v2.0.28.tar.gz -> inspircd-2.0.28.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b79d7f43d6cade752a45b0a477c389eb
+_md5_=f14d24c9c75176ae29acbb833efdfbe1
diff --git a/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r4 b/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r4
index d2ee52c4270c..9d24d413bf5a 100644
--- a/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r4
+++ b/metadata/md5-cache/net-irc/irc-server-2.11.1_p1-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-1 GPL-2
 RDEPEND=sys-libs/ncurses:0 zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=ftp://ftp.irc.org/irc/server/irc2.11.1p1.tgz ftp://ftp.irc.org/irc/server/Old/irc2.11/irc2.11.1p1.tgz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4b1884fa8459f54a4f950a85a5faff19
diff --git a/metadata/md5-cache/net-irc/irker-2.18-r1 b/metadata/md5-cache/net-irc/irker-2.18-r1
deleted file mode 100644
index f1a9e3b85366..000000000000
--- a/metadata/md5-cache/net-irc/irker-2.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto socks5? ( dev-python/PySocks[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) virtual/pkgconfig
-DESCRIPTION=Submission tools for IRC notifications
-EAPI=6
-HOMEPAGE=http://www.catb.org/esr/irker/
-IUSE=socks5 +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.catb.org/esr/irker/irker-2.18.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8382dbe75a8d7e83e0ba870bd311b616
diff --git a/metadata/md5-cache/net-irc/irker-2.18-r2 b/metadata/md5-cache/net-irc/irker-2.18-r2
new file mode 100644
index 000000000000..2d08904c26df
--- /dev/null
+++ b/metadata/md5-cache/net-irc/irker-2.18-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xml-dtd:4.1.2 app-text/xmlto socks5? ( python_single_target_python2_7? ( dev-python/PySocks[python_targets_python2_7(-)] ) ) virtual/pkgconfig
+DESCRIPTION=Submission tools for IRC notifications
+EAPI=6
+HOMEPAGE=http://www.catb.org/esr/irker/
+IUSE=socks5 +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://www.catb.org/esr/irker/irker-2.18.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=371d74665d97c94bf815cab2a957e89d
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
index 0f2a0e6e6507..1e7e19697836 100644
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.30-r1
@@ -10,5 +10,5 @@ RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/
 REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.30.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.30.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=56f4417cbf3e761698c52be9782336d4
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.31 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.31
index aa46d435a6ac..26f42825e7b4 100644
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.31
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.31
@@ -10,5 +10,5 @@ RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/
 REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.31.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.31.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=671b0c6771f0cdf3fb2d8689052b4851
diff --git a/metadata/md5-cache/net-irc/iroffer-dinoex-3.32 b/metadata/md5-cache/net-irc/iroffer-dinoex-3.32
index 5337eb8a02b8..af26ac2ba6e6 100644
--- a/metadata/md5-cache/net-irc/iroffer-dinoex-3.32
+++ b/metadata/md5-cache/net-irc/iroffer-dinoex-3.32
@@ -10,5 +10,5 @@ RDEPEND=chroot? ( dev-libs/nss ) curl? ( net-misc/curl[ssl?] gnutls? ( net-misc/
 REQUIRED_USE=admin? ( http ) gnutls? ( ssl )
 SLOT=0
 SRC_URI=http://iroffer.dinoex.net/iroffer-dinoex-3.32.tar.gz http://iroffer.dinoex.net/HISTORY/iroffer-dinoex-3.32.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=21799e35152b4dc671702313a39979a6
diff --git a/metadata/md5-cache/net-irc/kvirc-5.2_pre20190628041642 b/metadata/md5-cache/net-irc/kvirc-5.2_pre20190628041642
index 17801351ca6a..b4602a71aca9 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.2_pre20190628041642
+++ b/metadata/md5-cache/net-irc/kvirc-5.2_pre20190628041642
@@ -1,15 +1,15 @@
 BDEPEND=dev-lang/perl:0 virtual/pkgconfig doc? ( app-doc/doxygen ) kde? ( kde-frameworks/extra-cmake-modules:5 ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_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 )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-libs/zlib:0= x11-libs/libX11 x11-libs/libXScrnSaver audiofile? ( media-libs/audiofile ) dbus? ( dev-qt/qtdbus:5 ) dcc_video? ( dev-qt/qtmultimedia:5[widgets] ) kde? ( kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/knotifications:5 kde-frameworks/kservice:5 kde-frameworks/kwindowsystem:5 kde-frameworks/kxmlgui:5 ) perl? ( dev-lang/perl:0= ) phonon? ( media-libs/phonon[qt5(+)] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_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 )
 DESCRIPTION=Advanced IRC Client
 EAPI=7
 HOMEPAGE=http://www.kvirc.net/ https://github.com/kvirc/KVIrc
-IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+
-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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_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_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 ) )
+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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_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_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/kvirc/KVIrc/archive/2fe1a3bcac42349967e27b3f7098c25f34efca1d.tar.gz -> kvirc-5.2_pre20190628041642.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e73b83d194048386f64ccd0c0170314
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1a89ed3a8907265b68f6ea173879ff8e
diff --git a/metadata/md5-cache/net-irc/kvirc-5.2_pre20191202122540 b/metadata/md5-cache/net-irc/kvirc-5.2_pre20191202122540
index 887b8d306826..29bb2210bcad 100644
--- a/metadata/md5-cache/net-irc/kvirc-5.2_pre20191202122540
+++ b/metadata/md5-cache/net-irc/kvirc-5.2_pre20191202122540
@@ -4,12 +4,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 d
 DESCRIPTION=Advanced IRC Client
 EAPI=7
 HOMEPAGE=https://www.kvirc.net/ https://github.com/kvirc/KVIrc
-IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2+
 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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) 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_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=audiofile? ( oss ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/kvirc/KVIrc/archive/0df9f22f2f4d013b91d5a8905cbd47c32e8fb9e5.tar.gz -> kvirc-5.2_pre20191202122540.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f097628c1a3be1d88d0ad798b08d9c70
diff --git a/metadata/md5-cache/net-irc/kvirc-9999 b/metadata/md5-cache/net-irc/kvirc-9999
index 40354f488975..d47913416d59 100644
--- a/metadata/md5-cache/net-irc/kvirc-9999
+++ b/metadata/md5-cache/net-irc/kvirc-9999
@@ -4,11 +4,11 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 d
 DESCRIPTION=Advanced IRC Client
 EAPI=7
 HOMEPAGE=https://www.kvirc.net/ https://github.com/kvirc/KVIrc
-IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2+
 PROPERTIES=live
 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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) 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_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=audiofile? ( oss ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=15861377bd2bf4ddfec92fd3cd23eebb
diff --git a/metadata/md5-cache/net-irc/limnoria-20191123 b/metadata/md5-cache/net-irc/limnoria-20191123
index 66835205157c..96ef3702bf99 100644
--- a/metadata/md5-cache/net-irc/limnoria-20191123
+++ b/metadata/md5-cache/net-irc/limnoria-20191123
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ProgVal/Limnoria/archive/master-2019-11-23.tar.gz -> limnoria-20191123.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8ddbbb474157b7c5890b360871b1bc9a
diff --git a/metadata/md5-cache/net-irc/limnoria-99999999 b/metadata/md5-cache/net-irc/limnoria-99999999
index 5fd82650e5f8..05c731c64f14 100644
--- a/metadata/md5-cache/net-irc/limnoria-99999999
+++ b/metadata/md5-cache/net-irc/limnoria-99999999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/chardet[python_targets_python2_7(-)?,python_targets_python3_6
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8ddbbb474157b7c5890b360871b1bc9a
diff --git a/metadata/md5-cache/net-irc/ngircd-23-r1 b/metadata/md5-cache/net-irc/ngircd-23-r1
index 89080a4789e8..cadab7f2c8a0 100644
--- a/metadata/md5-cache/net-irc/ngircd-23-r1
+++ b/metadata/md5-cache/net-irc/ngircd-23-r1
@@ -10,5 +10,5 @@ RDEPEND=iconv? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ngircd.barton.de/pub/ngircd/ngircd-23.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=433b410176dfd8d2075465f0ab286ebd
diff --git a/metadata/md5-cache/net-irc/ngircd-24 b/metadata/md5-cache/net-irc/ngircd-24
index b16d588a796b..b226a6abdab6 100644
--- a/metadata/md5-cache/net-irc/ngircd-24
+++ b/metadata/md5-cache/net-irc/ngircd-24
@@ -10,5 +10,5 @@ RDEPEND=iconv? ( virtual/libiconv ) ident? ( net-libs/libident ) pam? ( sys-libs
 RESTRICT=test
 SLOT=0
 SRC_URI=https://arthur.barton.de/pub/ngircd/ngircd-24.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6a2a6ed32560c6ad300bf92f70cf942c
diff --git a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3 b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3
index a4c04ffb35a6..e2848305a9c0 100644
--- a/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3
+++ b/metadata/md5-cache/net-irc/psybnc-2.3.2.9-r3
@@ -9,5 +9,5 @@ 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_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bcd0b15aee5ff1f60c74611621461441
diff --git a/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r3 b/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r3
index 0cf09730a1e9..8db970601018 100644
--- a/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r3
+++ b/metadata/md5-cache/net-irc/ptlink-ircd-6.19.6-r3
@@ -8,5 +8,5 @@ KEYWORDS=~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.sunsite.dk/projects/ptlink/ircd/PTlink6.19.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c3092a101e1a889eda4d1a7cc71a9942
diff --git a/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1 b/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1
index 6ee06f955670..3ab4c7619143 100644
--- a/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1
+++ b/metadata/md5-cache/net-irc/ptlink-opm-1.3.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.sunsite.dk/projects/ptlink/ptopm/PTlink.OPM1.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e35ed00019916f4822796e05a00df44b
diff --git a/metadata/md5-cache/net-irc/quassel-0.13.1 b/metadata/md5-cache/net-irc/quassel-0.13.1
index cf2737d2d05b..7c3d5740c4bb 100644
--- a/metadata/md5-cache/net-irc/quassel-0.13.1
+++ b/metadata/md5-cache/net-irc/quassel-0.13.1
@@ -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=https://quassel-irc.org/pub/quassel-0.13.1.tar.bz2
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=193a76750c08db00712cb5359b4d7519
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20170411 b/metadata/md5-cache/net-irc/quasselgrep-0_p20170411
index 7854b03bd3e7..3ab57214af0d 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f21c1a0c5933f8439b39034dbe869ecf
diff --git a/metadata/md5-cache/net-irc/quasselgrep-0_p20190211 b/metadata/md5-cache/net-irc/quasselgrep-0_p20190211
index cf42623f492f..ecde69eccc6e 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-0_p20190211
+++ b/metadata/md5-cache/net-irc/quasselgrep-0_p20190211
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/fish-face/quasselgrep/tarball/9b6b0bc1252daa6e574363d87d04eebd981215a5 -> quasselgrep-0_p20190211.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7689b53abf67e245f0779697ebee5921
diff --git a/metadata/md5-cache/net-irc/quasselgrep-9999 b/metadata/md5-cache/net-irc/quasselgrep-9999
index cef615f6096c..03098bc24872 100644
--- a/metadata/md5-cache/net-irc/quasselgrep-9999
+++ b/metadata/md5-cache/net-irc/quasselgrep-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f21c1a0c5933f8439b39034dbe869ecf
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
index 779ac65e4c54..2e54aeeb356d 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=58b7d16384ae2b8beff8608cce9a64b0
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 27c39429eb18..090ccb19c2d8 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=746f208b0bf31cbc46366e3877b288b0
diff --git a/metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r2 b/metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r2
index 613516a90bab..6a2935e46642 100644
--- a/metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r2
+++ b/metadata/md5-cache/net-irc/telepathy-idle-0.2.0-r2
@@ -4,13 +4,13 @@ DEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.32:2 >=net-libs/telepathy-gli
 DESCRIPTION=Full-featured IRC connection manager for Telepathy
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/telepathy/telepathy-idle
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/dbus-glib-0.51 >=dev-libs/glib-2.32:2 >=net-libs/telepathy-glib-0.21 sys-apps/dbus python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.2.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=85729782a87d981a7d1c411950532656
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.0 b/metadata/md5-cache/net-irc/unrealircd-5.0.0
deleted file mode 100644
index 82742fc1883b..000000000000
--- a/metadata/md5-cache/net-irc/unrealircd-5.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 )
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
-DESCRIPTION=An advanced Internet Relay Chat daemon
-EAPI=7
-HOMEPAGE=https://www.unrealircd.org/
-IUSE=class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
-SLOT=0
-SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.0.0.tar.gz
-_eclasses_=ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350
-_md5_=47d83ecf1eb4f5882529aab7ee277bd7
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.3 b/metadata/md5-cache/net-irc/unrealircd-5.0.3
new file mode 100644
index 000000000000..244a1eef721c
--- /dev/null
+++ b/metadata/md5-cache/net-irc/unrealircd-5.0.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 )
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
+DESCRIPTION=An advanced Internet Relay Chat daemon
+EAPI=7
+HOMEPAGE=https://www.unrealircd.org/
+IUSE=class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
+SLOT=0
+SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.0.3.tar.gz
+_eclasses_=ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350
+_md5_=68bb8e2d091874656832a700f191b36c
diff --git a/metadata/md5-cache/net-irc/weechat-2.6-r1 b/metadata/md5-cache/net-irc/weechat-2.6-r1
index 8389b7217bbb..f43d6b41ed74 100644
--- a/metadata/md5-cache/net-irc/weechat-2.6-r1
+++ b/metadata/md5-cache/net-irc/weechat-2.6-r1
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=7
 HOMEPAGE=https://weechat.org/
-IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc 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
+IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm ~ppc64 x86 ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-2.6.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c86bfa1b81a988e59d1d12b8eceac3c3
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d00ecc0a530327f75b039fa5a70027cd
diff --git a/metadata/md5-cache/net-irc/weechat-2.7-r1 b/metadata/md5-cache/net-irc/weechat-2.7-r1
index 9aed8256c0d6..e9a8741a8190 100644
--- a/metadata/md5-cache/net-irc/weechat-2.7-r1
+++ b/metadata/md5-cache/net-irc/weechat-2.7-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=7
 HOMEPAGE=https://weechat.org/
-IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-2.7.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3628b228bab503b54b3a3e1d9d8fec9
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=549a3f9fd180c44f533e617827bdb2dd
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index e07b2b831b04..34f72396ca22 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig doc? ( >=dev-ruby/asciidoctor-1.5.4 ) man? ( >=dev-ruby/asciidoctor-1.5.4 ) nls? ( >=sys-devel/gettext-0.15 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
+DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) test? ( dev-util/cpputest )
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=7
 HOMEPAGE=https://weechat.org/
-IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc man nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer +irc python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:*[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b3628b228bab503b54b3a3e1d9d8fec9
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=549a3f9fd180c44f533e617827bdb2dd
diff --git a/metadata/md5-cache/net-irc/znc-1.7.4 b/metadata/md5-cache/net-irc/znc-1.7.4
index 02088504a8ee..2da8f176df14 100644
--- a/metadata/md5-cache/net-irc/znc-1.7.4
+++ b/metadata/md5-cache/net-irc/znc-1.7.4
@@ -4,13 +4,13 @@ DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang
 DESCRIPTION=An advanced IRC Bouncer
 EAPI=7
 HOMEPAGE=https://znc.in
-IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 arm x86
 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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) 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_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) icu )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) icu )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://znc.in/releases/archive/znc-1.7.4.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51b073aa139be432f4f6cab38c383dca
diff --git a/metadata/md5-cache/net-irc/znc-1.7.5 b/metadata/md5-cache/net-irc/znc-1.7.5
index 76d2e8415c25..aad75a575806 100644
--- a/metadata/md5-cache/net-irc/znc-1.7.5
+++ b/metadata/md5-cache/net-irc/znc-1.7.5
@@ -4,13 +4,13 @@ DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang
 DESCRIPTION=An advanced IRC Bouncer
 EAPI=7
 HOMEPAGE=https://znc.in
-IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 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_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) 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_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) icu )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) icu )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://znc.in/releases/archive/znc-1.7.5.tar.gz test? ( https://github.com/google/googletest/archive/1.8.1.tar.gz -> gtest-1.8.1.tar.gz )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e97d9c956c288b37163af389a1dafbf
diff --git a/metadata/md5-cache/net-irc/znc-9999 b/metadata/md5-cache/net-irc/znc-9999
index 9d349886cfa4..3c15e783cf5c 100644
--- a/metadata/md5-cache/net-irc/znc-9999
+++ b/metadata/md5-cache/net-irc/znc-9999
@@ -4,12 +4,12 @@ DEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang
 DESCRIPTION=An advanced IRC Bouncer
 EAPI=7
 HOMEPAGE=https://znc.in
-IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=icu? ( dev-libs/icu:= ) nls? ( dev-libs/boost:=[nls] ) perl? ( >=dev-lang/perl-5.10:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) 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_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) icu )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) icu )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e97d9c956c288b37163af389a1dafbf
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 85ef48728a13..c5212c3a8237 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/aqbanking-6.0.1 b/metadata/md5-cache/net-libs/aqbanking-6.0.1
index 0787f5e347a7..20a0d54c10ce 100644
--- a/metadata/md5-cache/net-libs/aqbanking-6.0.1
+++ b/metadata/md5-cache/net-libs/aqbanking-6.0.1
@@ -5,9 +5,9 @@ DESCRIPTION=Generic Online Banking Interface
 EAPI=7
 HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
 IUSE=debug doc ebics examples ofx
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= >=sys-libs/gwenhywfar-5.1.1:= virtual/libintl ebics? ( dev-libs/xmlsec[gcrypt,gnutls] ) ofx? ( >=dev-libs/libofx-0.9.5 )
 SLOT=0
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/238/aqbanking-6.0.1.tar.gz
-_md5_=1a9ae9ef2826aa3d8adf7807ad3c9bca
+_md5_=d13b3d312eff2e9aeef6be80159cd517
diff --git a/metadata/md5-cache/net-libs/axtls-1.5.3 b/metadata/md5-cache/net-libs/axtls-1.5.3
index dc6c27ad78e8..7c5fa0772825 100644
--- a/metadata/md5-cache/net-libs/axtls-1.5.3
+++ b/metadata/md5-cache/net-libs/axtls-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/axtls/axTLS-1.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=61c24a70137d754537f27061e9135819
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.3 b/metadata/md5-cache/net-libs/axtls-2.1.3
index cbc3fe68ed4b..c31ba204717c 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.3
+++ b/metadata/md5-cache/net-libs/axtls-2.1.3
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.3.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d4e1403df07cfbeedae2cfa8017a745b
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.4 b/metadata/md5-cache/net-libs/axtls-2.1.4
index aa1b0b19c510..0607f8980a00 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.4
+++ b/metadata/md5-cache/net-libs/axtls-2.1.4
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.4.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c80168411487f56c7b9c6ddae8b53ba4
diff --git a/metadata/md5-cache/net-libs/axtls-2.1.5 b/metadata/md5-cache/net-libs/axtls-2.1.5
index ff5f7c54bc56..534797175b34 100644
--- a/metadata/md5-cache/net-libs/axtls-2.1.5
+++ b/metadata/md5-cache/net-libs/axtls-2.1.5
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0/1
 SRC_URI=mirror://sourceforge/axtls/axTLS-2.1.5.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f5839f92173f3e3c690c58ddfadd39f1
diff --git a/metadata/md5-cache/net-libs/canlock-2b b/metadata/md5-cache/net-libs/canlock-2b
index a79239a43bc5..b770b39d0fd3 100644
--- a/metadata/md5-cache/net-libs/canlock-2b
+++ b/metadata/md5-cache/net-libs/canlock-2b
@@ -1,11 +1,10 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=A library for creating and verifying Usenet cancel locks
-EAPI=4
+EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/c/canlock.html
-IUSE=static-libs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD MIT
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/canlock/canlock_2b.orig.tar.gz mirror://debian/pool/main/c/canlock/canlock_2b-6.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70c6eb72f8cfabc6c2a2ee896da8281f
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b15d9189a51066d8222a599f379a0330
diff --git a/metadata/md5-cache/net-libs/courier-authlib-0.66.4 b/metadata/md5-cache/net-libs/courier-authlib-0.66.4
index 4f01214c1b8e..f144ae8bb4ff 100644
--- a/metadata/md5-cache/net-libs/courier-authlib-0.66.4
+++ b/metadata/md5-cache/net-libs/courier-authlib-0.66.4
@@ -10,5 +10,5 @@ RDEPEND=net-mail/mailbase =net-libs/courier-unicode-1.3 gdbm? ( sys-libs/gdbm )
 RESTRICT=!berkdb? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/courier/courier-authlib-0.66.4.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9ddf0ac75d5ac0dc1140e63459dbdb9b
diff --git a/metadata/md5-cache/net-libs/davix-0.6.7 b/metadata/md5-cache/net-libs/davix-0.6.7
index bf5a3876e17f..4d9fd626aa73 100644
--- a/metadata/md5-cache/net-libs/davix-0.6.7
+++ b/metadata/md5-cache/net-libs/davix-0.6.7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a695f11222cf9a5e34e75b1afe7aae97
+_md5_=09c4e3c2303207ba2c8f907e5e38cd99
diff --git a/metadata/md5-cache/net-libs/davix-0.7.3 b/metadata/md5-cache/net-libs/davix-0.7.3
index 28454f1d5a4b..153802789961 100644
--- a/metadata/md5-cache/net-libs/davix-0.7.3
+++ b/metadata/md5-cache/net-libs/davix-0.7.3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.7.3/davix-0.7.3.tar.gz -> davix-0.7.3.tar
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c5f1ea2ef17e392e353d7f182f6c12f8
+_md5_=8ca5479afb04480772787c2c5d91c8de
diff --git a/metadata/md5-cache/net-libs/davix-0.7.4 b/metadata/md5-cache/net-libs/davix-0.7.4
index 59045fcf9aea..1f16b7287f81 100644
--- a/metadata/md5-cache/net-libs/davix-0.7.4
+++ b/metadata/md5-cache/net-libs/davix-0.7.4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.7.4/davix-0.7.4.tar.gz -> davix-0.7.4.tar
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c979c466ba1c18712ef2795a576ae22d
+_md5_=f94dbb3b557518399212790bce4815dd
diff --git a/metadata/md5-cache/net-libs/davix-0.7.5 b/metadata/md5-cache/net-libs/davix-0.7.5
index 6f926fc99f5e..218c2c45c3fe 100644
--- a/metadata/md5-cache/net-libs/davix-0.7.5
+++ b/metadata/md5-cache/net-libs/davix-0.7.5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/0.7.5/davix-0.7.5.tar.gz -> davix-0.7.5.tar
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c979c466ba1c18712ef2795a576ae22d
+_md5_=f94dbb3b557518399212790bce4815dd
diff --git a/metadata/md5-cache/net-libs/grpc-1.16.1 b/metadata/md5-cache/net-libs/grpc-1.16.1
deleted file mode 100644
index 560522b9524d..000000000000
--- a/metadata/md5-cache/net-libs/grpc-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
-DESCRIPTION=Modern open source high performance RPC framework
-EAPI=7
-HOMEPAGE=https://www.grpc.io
-IUSE=examples doc perftools systemtap static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-SLOT=0
-SRC_URI=https://github.com/grpc/grpc/archive/v1.16.1.tar.gz -> grpc-1.16.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=91bb1b69e03b623dce60a7bb15a3e9c3
diff --git a/metadata/md5-cache/net-libs/grpc-1.17.1 b/metadata/md5-cache/net-libs/grpc-1.17.1
deleted file mode 100644
index f4cb1b11682d..000000000000
--- a/metadata/md5-cache/net-libs/grpc-1.17.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
-DESCRIPTION=Modern open source high performance RPC framework
-EAPI=7
-HOMEPAGE=https://www.grpc.io
-IUSE=examples doc perftools systemtap static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/grpc/grpc/archive/v1.17.1.tar.gz -> grpc-1.17.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c91442627195e7b3b1893505fad2352d
diff --git a/metadata/md5-cache/net-libs/grpc-1.18.0 b/metadata/md5-cache/net-libs/grpc-1.18.0
deleted file mode 100644
index 4fcfedf634fe..000000000000
--- a/metadata/md5-cache/net-libs/grpc-1.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
-DESCRIPTION=Modern open source high performance RPC framework
-EAPI=7
-HOMEPAGE=https://www.grpc.io
-IUSE=examples doc perftools systemtap static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/grpc/grpc/archive/v1.18.0.tar.gz -> grpc-1.18.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c91442627195e7b3b1893505fad2352d
diff --git a/metadata/md5-cache/net-libs/grpc-1.19.0 b/metadata/md5-cache/net-libs/grpc-1.19.0
deleted file mode 100644
index f2dacd4a72c8..000000000000
--- a/metadata/md5-cache/net-libs/grpc-1.19.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
-DESCRIPTION=Modern open source high performance RPC framework
-EAPI=7
-HOMEPAGE=https://www.grpc.io
-IUSE=examples doc perftools systemtap static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] dev-libs/protobuf:= net-dns/c-ares:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/grpc/grpc/archive/v1.19.0.tar.gz -> grpc-1.19.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1711b3494d82db7557537951c68a3b89
diff --git a/metadata/md5-cache/net-libs/grpc-1.20.1-r1 b/metadata/md5-cache/net-libs/grpc-1.20.1-r1
deleted file mode 100644
index 4e0ea9dcd749..000000000000
--- a/metadata/md5-cache/net-libs/grpc-1.20.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.7.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap ) virtual/pkgconfig
-DESCRIPTION=Modern open source high performance RPC framework
-EAPI=7
-HOMEPAGE=https://www.grpc.io
-IUSE=examples doc perftools systemtap static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.7.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/grpc/grpc/archive/v1.20.1.tar.gz -> grpc-1.20.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6fad9676c193f18423a942aa313230bb
diff --git a/metadata/md5-cache/net-libs/grpc-1.21.1-r1 b/metadata/md5-cache/net-libs/grpc-1.21.1-r1
deleted file mode 100644
index 5aa29da3aeab..000000000000
--- a/metadata/md5-cache/net-libs/grpc-1.21.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.7.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=Modern open source high performance RPC framework
-EAPI=7
-HOMEPAGE=https://www.grpc.io
-IUSE=examples doc perftools systemtap static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/openssl-1.0.2:0=[-bindist] >=dev-libs/protobuf-3.7.0:= >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= perftools? ( dev-util/google-perftools:= ) systemtap? ( dev-util/systemtap )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/grpc/grpc/archive/v1.21.1.tar.gz -> grpc-1.21.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3d7d3bec2af3d4f14804448a1bf96004
diff --git a/metadata/md5-cache/net-libs/gupnp-1.0.4 b/metadata/md5-cache/net-libs/gupnp-1.0.4
index b22b1953b503..459c68a36826 100644
--- a/metadata/md5-cache/net-libs/gupnp-1.0.4
+++ b/metadata/md5-cache/net-libs/gupnp-1.0.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=net-libs/gssdp-0.14.15:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.36:= || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) connman? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.14 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=net-libs/gssdp-0.14.15:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.36:= || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) connman? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !net-libs/gupnp-vala >=dev-util/gtk-doc-am-1.14 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An object-oriented framework for creating UPnP devs and control points
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
-IUSE=connman +introspection kernel_linux networkmanager abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=connman +introspection kernel_linux networkmanager abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=LGPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=net-libs/gssdp-0.14.15:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.36:= || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) connman? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !net-libs/gupnp-vala
-REQUIRED_USE=^^ ( 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 ) ?? ( connman networkmanager )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=net-libs/gssdp-0.14.15:0=[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/libsoup-2.48.0:2.4[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.36:= || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) connman? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) networkmanager? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !net-libs/gupnp-vala
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ?? ( connman networkmanager )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/1.0/gupnp-1.0.4.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f086e26561df40d268cc0ede35068aa7
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f0d3b680974defa3db4f0f97f7c47564
diff --git a/metadata/md5-cache/net-libs/http-parser-2.9.3 b/metadata/md5-cache/net-libs/http-parser-2.9.3
new file mode 100644
index 000000000000..a72f76023204
--- /dev/null
+++ b/metadata/md5-cache/net-libs/http-parser-2.9.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP request/response parser for C
+EAPI=7
+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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris
+LICENSE=MIT
+SLOT=0/2.9.0
+SRC_URI=https://github.com/nodejs/http-parser/archive/v2.9.3.tar.gz -> http-parser-2.9.3.tar.gz
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b8c5acd6f211ea841dd76fc3b9a48a1f
diff --git a/metadata/md5-cache/net-libs/ldns-1.7.0-r2 b/metadata/md5-cache/net-libs/ldns-1.7.0-r2
index 9f8619143b5d..2498f6318fbe 100644
--- a/metadata/md5-cache/net-libs/ldns-1.7.0-r2
+++ b/metadata/md5-cache/net-libs/ldns-1.7.0-r2
@@ -3,13 +3,13 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=a library with the aim to simplify DNS programming in C
 EAPI=5
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-IUSE=+dane doc +ecdsa gost libressl python static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+dane doc +ecdsa gost libressl python static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ecdsa? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( >=dev-libs/openssl-1.0.1e:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7a53ddd7ff18aee770883279f77bcab4
diff --git a/metadata/md5-cache/net-libs/ldns-1.7.1-r1 b/metadata/md5-cache/net-libs/ldns-1.7.1-r1
index 69586b3d3eed..8e217f5f9d68 100644
--- a/metadata/md5-cache/net-libs/ldns-1.7.1-r1
+++ b/metadata/md5-cache/net-libs/ldns-1.7.1-r1
@@ -3,13 +3,13 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=a library with the aim to simplify DNS programming in C
 EAPI=6
 HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
-IUSE=+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ecdsa? ( !libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ed25519? ( !libressl? ( >=dev-libs/openssl-1.1.0:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ed448? ( !libressl? ( >=dev-libs/openssl-1.1.1:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( >=dev-libs/openssl-1.0.1e:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0/3
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8e2210cdd5339345373d2d2d6830f982
diff --git a/metadata/md5-cache/net-libs/libasr-1.0.4 b/metadata/md5-cache/net-libs/libasr-1.0.4
index 58d944b7a3c5..4233746855a0 100644
--- a/metadata/md5-cache/net-libs/libasr-1.0.4
+++ b/metadata/md5-cache/net-libs/libasr-1.0.4
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Async Resolver Library from OpenBSD/OpenSMTPD
 EAPI=7
 HOMEPAGE=https://github.com/OpenSMTPD/libasr
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=ISC BSD BSD-1 BSD-2 BSD-4
 SLOT=0
 SRC_URI=https://www.opensmtpd.org/archives/libasr-1.0.4.tar.gz
-_md5_=750f4ff6706c5cba2c3334e3cad2807e
+_md5_=a9f202d5975d2af2bc695b687aecf950
diff --git a/metadata/md5-cache/net-libs/libbtbb-2018.08.1 b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
index 619fa9520af6..4a64e9e09a96 100644
--- a/metadata/md5-cache/net-libs/libbtbb-2018.08.1
+++ b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
@@ -3,12 +3,12 @@ DEPEND=extras? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=A library to decode Bluetooth baseband packets
 EAPI=6
 HOMEPAGE=http://libbtbb.sourceforge.net/
-IUSE=extras static-libs wireshark-plugins +python_targets_python2_7 +python_single_target_python2_7
+IUSE=extras static-libs wireshark-plugins +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=extras? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
-REQUIRED_USE=extras? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=extras? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ced908451f909b4b247da7573d383481
diff --git a/metadata/md5-cache/net-libs/libbtbb-2018.12.1 b/metadata/md5-cache/net-libs/libbtbb-2018.12.1
index 2ae1272ff222..9c604a9d8878 100644
--- a/metadata/md5-cache/net-libs/libbtbb-2018.12.1
+++ b/metadata/md5-cache/net-libs/libbtbb-2018.12.1
@@ -3,12 +3,12 @@ DEPEND=extras? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=A library to decode Bluetooth baseband packets
 EAPI=6
 HOMEPAGE=http://libbtbb.sourceforge.net/
-IUSE=extras static-libs wireshark-plugins +python_targets_python2_7 +python_single_target_python2_7
+IUSE=extras static-libs wireshark-plugins +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=extras? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
-REQUIRED_USE=extras? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=extras? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/2018.12.1
 SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2018-12-R1.tar.gz -> libbtbb-2018-12-R1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ced908451f909b4b247da7573d383481
diff --git a/metadata/md5-cache/net-libs/libbtbb-9999 b/metadata/md5-cache/net-libs/libbtbb-9999
index e18fe38c2a01..61148c45a7d5 100644
--- a/metadata/md5-cache/net-libs/libbtbb-9999
+++ b/metadata/md5-cache/net-libs/libbtbb-9999
@@ -3,11 +3,11 @@ DEPEND=extras? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=A library to decode Bluetooth baseband packets
 EAPI=6
 HOMEPAGE=http://libbtbb.sourceforge.net/
-IUSE=extras static-libs wireshark-plugins +python_targets_python2_7 +python_single_target_python2_7
+IUSE=extras static-libs wireshark-plugins +python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=extras? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
-REQUIRED_USE=extras? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=extras? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ced908451f909b4b247da7573d383481
diff --git a/metadata/md5-cache/net-libs/libgadu-1.12.2-r1 b/metadata/md5-cache/net-libs/libgadu-1.12.2-r1
index b6f16dfbb1cf..778133384664 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.12.2-r1
+++ b/metadata/md5-cache/net-libs/libgadu-1.12.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Client-side library for the Gadu-Gadu protocol
 EAPI=7
 HOMEPAGE=https://libgadu.net/
 IUSE=doc ssl test threads
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/protobuf-c:= sys-libs/zlib ssl? ( net-libs/gnutls:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libgadu/releases/download/1.12.2/libgadu-1.12.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f34fa5b47d0030bafe9a54f389b72b0e
+_md5_=a4848005de77013664b18fe5a679b8eb
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.09 b/metadata/md5-cache/net-libs/liblockfile-1.09
deleted file mode 100644
index 22950a748dea..000000000000
--- a/metadata/md5-cache/net-libs/liblockfile-1.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Implements functions designed to lock the standard mailboxes
-EAPI=4
-HOMEPAGE=http://www.debian.org/
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e64bac7f42a8d117c3370e7901d9aa12
diff --git a/metadata/md5-cache/net-libs/liblockfile-1.16 b/metadata/md5-cache/net-libs/liblockfile-1.16
index 015f122e1396..843feeb499e8 100644
--- a/metadata/md5-cache/net-libs/liblockfile-1.16
+++ b/metadata/md5-cache/net-libs/liblockfile-1.16
@@ -11,4 +11,4 @@ RDEPEND=acct-group/mail
 SLOT=0
 SRC_URI=https://github.com/miquels/liblockfile/archive/v1.16.tar.gz -> liblockfile-1.16.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=175d1aaeacdeff00122c97bfef4a6010
+_md5_=5d165f455df8ff9c595964810bf2a233
diff --git a/metadata/md5-cache/net-libs/libmrss-0.19.2 b/metadata/md5-cache/net-libs/libmrss-0.19.2
index 21b639dd1dec..c5571b753596 100644
--- a/metadata/md5-cache/net-libs/libmrss-0.19.2
+++ b/metadata/md5-cache/net-libs/libmrss-0.19.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
-DEPEND=>=net-libs/libnxml-0.18.0 net-misc/curl virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=net-libs/libnxml net-misc/curl
 DESCRIPTION=A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.autistici.org/bakunin/libmrss/doc/
-IUSE=doc examples static-libs
+IUSE=doc examples
 KEYWORDS=amd64 ~arm ~mips ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=net-libs/libnxml-0.18.0 net-misc/curl
+RDEPEND=net-libs/libnxml net-misc/curl
 SLOT=0
 SRC_URI=http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz
-_md5_=2dbf893954ec5995313fa2c3de1cf4a0
+_md5_=f4bce901d633bb19b2e25af669e4c351
diff --git a/metadata/md5-cache/net-libs/libnatpmp-20150609 b/metadata/md5-cache/net-libs/libnatpmp-20150609
index 2af7370f937c..132a078b1ae1 100644
--- a/metadata/md5-cache/net-libs/libnatpmp-20150609
+++ b/metadata/md5-cache/net-libs/libnatpmp-20150609
@@ -1,11 +1,10 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=An alternative protocol to UPnP IGD specification
-EAPI=5
+EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/libnatpmp.html
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/download.php?file=libnatpmp-20150609.tar.gz -> libnatpmp-20150609.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a25c1de3fe0f77d2ef2a81ae150599f
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=86ac35fb92fd93cb4c577097daa557e7
diff --git a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1 b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
index d34d990b686c..b49a95243e84 100644
--- a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
+++ b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install prepare setup
+DEFINED_PHASES=configure install setup
 DESCRIPTION=the low-level library for netfilter related kernel/userspace communication
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.netfilter.org/projects/libnfnetlink/
-IUSE=static-libs kernel_linux
+IUSE=kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=609ecd09819b01182055eed0bdcedef1
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4d5f4897c93675db28e9df87dff58034
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1 b/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
deleted file mode 100644
index 13c02652b6ae..000000000000
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=NFSv4 ID <-> name mapping library
-EAPI=4
-HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
-IUSE=ldap static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=BSD
-RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
-SLOT=0
-SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.25.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=881e6a8f99e46a5d2e21cee0bc842231
diff --git a/metadata/md5-cache/net-libs/libnxml-0.18.3 b/metadata/md5-cache/net-libs/libnxml-0.18.3
index 86651b73afb5..c94c78bad470 100644
--- a/metadata/md5-cache/net-libs/libnxml-0.18.3
+++ b/metadata/md5-cache/net-libs/libnxml-0.18.3
@@ -1,12 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
-DEPEND=net-misc/curl doc? ( app-doc/doxygen )
+DEPEND=net-misc/curl
 DESCRIPTION=A C-library for parsing and writing XML 1.0/1.1 files or streams
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.autistici.org/bakunin/libnxml/doc/
-IUSE=doc examples static-libs
+IUSE=doc examples
 KEYWORDS=amd64 ~arm ~mips ppc ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz
-_md5_=862abe736335f2724b6a5c5a6a6f92d5
+_md5_=7b4eebc41ea90bf9617e3468720c3996
diff --git a/metadata/md5-cache/net-libs/libpcap-1.9.1-r3 b/metadata/md5-cache/net-libs/libpcap-1.9.1-r3
index 76c5290be1d2..d59c0a9eada8 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.9.1-r3
+++ b/metadata/md5-cache/net-libs/libpcap-1.9.1-r3
@@ -5,10 +5,10 @@ DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=7
 HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
 IUSE=bluetooth dbus netlink rdma -remote static-libs usb -yydebug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~hppa ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://github.com/the-tcpdump-group/libpcap/archive/libpcap-1.9.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b1707c5b7d884ba9a100d0bd6f0fdd4d
+_md5_=793642a975c8bb244a5ea1ae15b78e58
diff --git a/metadata/md5-cache/net-libs/libpcap-9999 b/metadata/md5-cache/net-libs/libpcap-9999
index a9ae014bc920..abb3336544ae 100644
--- a/metadata/md5-cache/net-libs/libpcap-9999
+++ b/metadata/md5-cache/net-libs/libpcap-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=47c02eb32c06582938ec9970593e8f3a
+_md5_=7677407cb750b935f817f0d52f0be0d2
diff --git a/metadata/md5-cache/net-libs/libpri-1.4.12-r2 b/metadata/md5-cache/net-libs/libpri-1.4.12-r2
deleted file mode 100644
index 4f4979acde2f..000000000000
--- a/metadata/md5-cache/net-libs/libpri-1.4.12-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Primary Rate ISDN (PRI) library
-EAPI=4
-HOMEPAGE=http://www.asterisk.org/
-IUSE=static-libs
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/libpri/releases/libpri-1.4.12.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7b953b1e0cf0d3266c724242b22e4d9
diff --git a/metadata/md5-cache/net-libs/libpri-1.4.15 b/metadata/md5-cache/net-libs/libpri-1.4.15
deleted file mode 100644
index 65dd68a08ff7..000000000000
--- a/metadata/md5-cache/net-libs/libpri-1.4.15
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Primary Rate ISDN (PRI) library
-EAPI=5
-HOMEPAGE=http://www.asterisk.org/
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/libpri/releases/libpri-1.4.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5b34a00d33c423f2c30fd7b0792fb83
diff --git a/metadata/md5-cache/net-libs/libpri-1.5.0 b/metadata/md5-cache/net-libs/libpri-1.5.0
deleted file mode 100644
index 68feb33b163e..000000000000
--- a/metadata/md5-cache/net-libs/libpri-1.5.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Primary Rate ISDN (PRI) library
-EAPI=6
-HOMEPAGE=http://www.asterisk.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/libpri/releases/libpri-1.5.0.tar.gz
-_md5_=7cb84c93a1fbfbf249497cdc5f8c84fa
diff --git a/metadata/md5-cache/net-libs/libpsl-0.20.2 b/metadata/md5-cache/net-libs/libpsl-0.20.2
index ca721d76f88e..a569b04dcd17 100644
--- a/metadata/md5-cache/net-libs/libpsl-0.20.2
+++ b/metadata/md5-cache/net-libs/libpsl-0.20.2
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig man? ( dev-libs/libxslt )
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig man? ( dev-libs/libxslt )
 DEFINED_PHASES=compile configure install pretend setup test
 DEPEND=icu? ( !idn? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) idn? ( dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/libidn2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=C library for the Public Suffix List
@@ -11,4 +11,4 @@ RDEPEND=icu? ( !idn? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 SLOT=0
 SRC_URI=https://github.com/rockdaboot/libpsl/releases/download/libpsl-0.20.2/libpsl-0.20.2.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e2be60c5f82c2672e4cab0b7296575a0
+_md5_=4ec336a80c52ec789f297bbc80286171
diff --git a/metadata/md5-cache/net-libs/libpsl-0.21.0 b/metadata/md5-cache/net-libs/libpsl-0.21.0
index b17c81de6a4b..e505a7fec2b4 100644
--- a/metadata/md5-cache/net-libs/libpsl-0.21.0
+++ b/metadata/md5-cache/net-libs/libpsl-0.21.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig man? ( dev-libs/libxslt )
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig man? ( dev-libs/libxslt )
 DEFINED_PHASES=compile configure install pretend setup test
 DEPEND=icu? ( !idn? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) idn? ( dev-libs/libunistring[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-dns/libidn2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=C library for the Public Suffix List
@@ -11,4 +11,4 @@ RDEPEND=icu? ( !idn? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 SLOT=0
 SRC_URI=https://github.com/rockdaboot/libpsl/releases/download/libpsl-0.21.0/libpsl-0.21.0.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=11377aa27c397a540bd553e6e0906d36
+_md5_=9f02959780cc1f2ba74cf8d822886435
diff --git a/metadata/md5-cache/net-libs/librouteros-1.1.2 b/metadata/md5-cache/net-libs/librouteros-1.1.2
index 240840b4857c..54cb715b31ff 100644
--- a/metadata/md5-cache/net-libs/librouteros-1.1.2
+++ b/metadata/md5-cache/net-libs/librouteros-1.1.2
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libgcrypt:0 >=app-portage/elt-patches-20170815
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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/libgcrypt:0=
 DESCRIPTION=Library for accessing MikroTik's RouterOS via its API
-EAPI=4
+EAPI=7
 HOMEPAGE=http://verplant.org/librouteros/
-IUSE=debug static-libs
+IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0
+RDEPEND=dev-libs/libgcrypt:0=
 SLOT=0
 SRC_URI=http://verplant.org/librouteros/files/librouteros-1.1.2.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cdc89b95fde49faca1a5aa17e07b2109
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c51d7192d0121791e48f099f282a0d17
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.0.8-r3 b/metadata/md5-cache/net-libs/libsearpc-3.0.8-r3
index ae6acac99921..0ac825c10dab 100644
--- a/metadata/md5-cache/net-libs/libsearpc-3.0.8-r3
+++ b/metadata/md5-cache/net-libs/libsearpc-3.0.8-r3
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A simple C language RPC framework
 EAPI=6
 HOMEPAGE=https://github.com/haiwen/libsearpc/ http://seafile.com/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1 dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1 python_single_target_python2_7? ( dev-python/simplejson[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/libsearpc/archive/v3.1-latest.tar.gz -> libsearpc-3.0.8.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=217f8effcfb987b098a6bd45aedf2547
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=614b607454c2b440a3a653e03aaeae67
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.2.0 b/metadata/md5-cache/net-libs/libsearpc-3.2.0
deleted file mode 100644
index e425a90bcd7b..000000000000
--- a/metadata/md5-cache/net-libs/libsearpc-3.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1
-DESCRIPTION=A simple C language RPC framework
-EAPI=7
-HOMEPAGE=https://github.com/haiwen/libsearpc/ http://seafile.com/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1 dev-python/simplejson[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_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=https://github.com/haiwen/libsearpc/archive/v3.2.0.tar.gz -> libsearpc-3.2.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=13c48c4ef21f8d207cb0b0b69e8a8fe3
diff --git a/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1 b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
new file mode 100644
index 000000000000..81396474697e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libsearpc-3.2.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1
+DESCRIPTION=A simple C language RPC framework
+EAPI=7
+HOMEPAGE=https://github.com/haiwen/libsearpc/ http://seafile.com/
+IUSE=python_single_target_python2_7 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-libs/glib-2.26.0 >=dev-libs/jansson-2.2.1 python_single_target_python2_7? ( dev-python/simplejson[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/simplejson[python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/haiwen/libsearpc/archive/v3.2.0.tar.gz -> libsearpc-3.2.0.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e6be0df53127d35fc43b095e3c5319d3
diff --git a/metadata/md5-cache/net-libs/libsoup-2.58.2 b/metadata/md5-cache/net-libs/libsoup-2.58.2
index f0e504f54f43..3c3ca5f6d66b 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.58.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.58.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=dev-util/intltool-0.35 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/glib-networking-2.38.2[ssl?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) samba? ( net-fs/samba ) || ( dev-lang/python:3.6 ) dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=dev-util/intltool-0.35 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=An HTTP library implementation in C
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libsoup
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.58/libsoup-2.58.2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7f7432f7c348217a5c8707dd468911e
+_md5_=9ab21a4d416ae78f4f170cf356719109
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.13-r1 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.13-r1
index 74afe60dfaca..a3fc7ab92cac 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.13-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.13-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1_13/libtorrent-rasterbar-1.1.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=29aa9340d3844e5deaa87e7032a23d2f
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
index ef5281ed3753..6c1bfdae7dd6 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.1.14
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1_14/libtorrent-rasterbar-1.1.14.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=badba62fff4028e00c322880fcc1e148
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.3 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.3
index c0e55a315c19..bf457d3e504a 100644
--- a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.3
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.3
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 py
 RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1_2_3.tar.gz -> libtorrent-rasterbar-1.2.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe53a131574300ba07afea458dcd8c5c
diff --git a/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.4 b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.4
new file mode 100644
index 000000000000..6b5e431a1e95
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libtorrent-rasterbar-1.2.4
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=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_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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/boost:=[python,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(-)] ) 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=https://libtorrent.org https://github.com/arvidn/libtorrent
+IUSE=debug +dht doc examples libressl python +ssl static-libs test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+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_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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-libs/boost:=[python,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(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) )
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1_2_4.tar.gz -> libtorrent-rasterbar-1.2.4.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=52cb1020929cd8be2c621272dde7b37e
diff --git a/metadata/md5-cache/net-libs/meanwhile-1.0.2-r1 b/metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
index 0c57fc3446e1..b81d8f4f7ab6 100644
--- a/metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
+++ b/metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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:2 dev-libs/gmp virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=dev-libs/glib:2 dev-libs/gmp
 DESCRIPTION=Meanwhile (Sametime protocol) library
-EAPI=4
+EAPI=7
 HOMEPAGE=http://meanwhile.sourceforge.net/
 IUSE=doc debug
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2:2
+RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://sourceforge/meanwhile/meanwhile-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a266e82b2e23dbecfc8291a0908f060
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5ddde384e2f43fd2203029974bc2df5e
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.5 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
index 69940f838f7b..4e4bf16613b5 100644
--- a/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
+++ b/metadata/md5-cache/net-libs/nfqueue-bindings-0.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) perl? ( dev-lang/perl ) net-libs/libnetfilter_queue dev-lang/swig sys-devel/make >=dev-util/cmake-3.9.6 dev-lang/perl:=[-build(-)]
+DEPEND=python? ( python_single_target_python2_7? ( dev-python/dpkt[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) perl? ( dev-lang/perl ) net-libs/libnetfilter_queue dev-lang/swig sys-devel/make >=dev-util/cmake-3.9.6 dev-lang/perl:=[-build(-)]
 DESCRIPTION=High-level language bindings for libnetfilter_queue
 EAPI=5
 HOMEPAGE=https://github.com/chifflier/nfqueue-bindings
-IUSE=perl python examples kernel_linux +python_targets_python2_7 +python_single_target_python2_7
+IUSE=perl python examples kernel_linux +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) dev-lang/perl:=[-build(-)]
-REQUIRED_USE=|| ( perl python ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RDEPEND=python? ( python_single_target_python2_7? ( dev-python/dpkt[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) dev-lang/perl:=[-build(-)]
+REQUIRED_USE=|| ( perl python ) python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://github.com/chifflier/nfqueue-bindings/archive/nfqueue-bindings-0.5.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=230c73c9682ebcfd0b939ba70932dcc3
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=355f6bae6eaaa4bc4791d69aebc28377
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
deleted file mode 100644
index 3d2b88ff5525..000000000000
--- a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) perl? ( dev-lang/perl ) net-libs/libnetfilter_queue dev-lang/swig sys-devel/make >=dev-util/cmake-3.9.6 dev-lang/perl:=[-build(-)]
-DESCRIPTION=High-level language bindings for libnetfilter_queue
-EAPI=5
-HOMEPAGE=https://github.com/chifflier/nfqueue-bindings
-IUSE=perl python examples kernel_linux +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python? ( dev-python/dpkt[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) dev-lang/perl:=[-build(-)]
-REQUIRED_USE=|| ( perl python ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2fcf64bf00b9f35f4e00c69ac8b5a43c
diff --git a/metadata/md5-cache/net-libs/nfqueue-bindings-0.6-r1 b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6-r1
new file mode 100644
index 000000000000..57d03365b4b1
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nfqueue-bindings-0.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( python_single_target_python2_7? ( dev-python/dpkt[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) perl? ( dev-lang/perl ) net-libs/libnetfilter_queue dev-lang/swig sys-devel/make >=dev-util/cmake-3.9.6 dev-lang/perl:=[-build(-)]
+DESCRIPTION=High-level language bindings for libnetfilter_queue
+EAPI=5
+HOMEPAGE=https://github.com/chifflier/nfqueue-bindings
+IUSE=perl python examples kernel_linux +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python? ( python_single_target_python2_7? ( dev-python/dpkt[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) dev-lang/perl:=[-build(-)]
+REQUIRED_USE=|| ( perl python ) python? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a13119749c6e9ad6458c8606f3385631
diff --git a/metadata/md5-cache/net-libs/nodejs-10.18.1 b/metadata/md5-cache/net-libs/nodejs-10.18.1
deleted file mode 100644
index 8839f45ed5f6..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-10.18.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v10.18.1/node-v10.18.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d787604d0c2a1cf4740877dfc69fe35
diff --git a/metadata/md5-cache/net-libs/nodejs-10.19.0 b/metadata/md5-cache/net-libs/nodejs-10.19.0
new file mode 100644
index 000000000000..f111e47fff1f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-10.19.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.28.0:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v10.19.0/node-v10.19.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b6a2d29229bb33c2e7d41c46bd156823
diff --git a/metadata/md5-cache/net-libs/nodejs-12.14.0 b/metadata/md5-cache/net-libs/nodejs-12.14.0
index 8195b69fa915..739046d0335c 100644
--- a/metadata/md5-cache/net-libs/nodejs-12.14.0
+++ b/metadata/md5-cache/net-libs/nodejs-12.14.0
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
 DEPEND=>=dev-libs/libuv-1.33.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v12.14.0/node-v12.14.0.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c709ec092a76e8bec5e5fddca11d4d5c
+_md5_=f6f4256aa67d9f548f2371ecea510f68
diff --git a/metadata/md5-cache/net-libs/nodejs-12.14.1-r1 b/metadata/md5-cache/net-libs/nodejs-12.14.1-r1
deleted file mode 100644
index 29b1476ba8b8..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-12.14.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.33.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.33.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v12.14.1/node-v12.14.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a5b0cc90db131b075624432507d83a05
diff --git a/metadata/md5-cache/net-libs/nodejs-12.15.0 b/metadata/md5-cache/net-libs/nodejs-12.15.0
new file mode 100644
index 000000000000..2cf229ce0f6f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-12.15.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.33.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.33.1:= >=net-dns/c-ares-1.15.0 >=net-libs/http-parser-2.9.3:= >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v12.15.0/node-v12.15.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d37f1729b9c8c03cb0e8ae0205ddd4f7
diff --git a/metadata/md5-cache/net-libs/nodejs-13.6.0-r1 b/metadata/md5-cache/net-libs/nodejs-13.6.0-r1
deleted file mode 100644
index 8d77798dc58e..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-13.6.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.34.0:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.34.0:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v13.6.0/node-v13.6.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fd492c8b90738f78cd7f7bd575690b53
diff --git a/metadata/md5-cache/net-libs/nodejs-13.7.0-r1 b/metadata/md5-cache/net-libs/nodejs-13.7.0-r1
deleted file mode 100644
index b8e720308b2d..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-13.7.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.34.1:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.34.1:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v13.7.0/node-v13.7.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a6e0b6d8f24583cfb50f29b090e93b1
diff --git a/metadata/md5-cache/net-libs/nodejs-13.8.0 b/metadata/md5-cache/net-libs/nodejs-13.8.0
new file mode 100644
index 000000000000..b1c11b3cdc24
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-13.8.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.34.1:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=7
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=>=dev-libs/libuv-1.34.1:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.40.0 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
+REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v13.8.0/node-v13.8.0.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7a396bf24c5a0da4b0481d30394d9b53
diff --git a/metadata/md5-cache/net-libs/nodejs-8.17.0 b/metadata/md5-cache/net-libs/nodejs-8.17.0
deleted file mode 100644
index 37a14c6dcdbf..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-8.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=7
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=>=dev-libs/libuv-1.23.2:= >=net-dns/c-ares-1.10.1 >=net-libs/http-parser-2.9.0:= >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
-REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v8.17.0/node-v8.17.0.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7e0c5027436dd9dd9fd863add7d8762
diff --git a/metadata/md5-cache/net-libs/nodejs-99999999 b/metadata/md5-cache/net-libs/nodejs-99999999
index a5497f5c475b..b18095ce8a4e 100644
--- a/metadata/md5-cache/net-libs/nodejs-99999999
+++ b/metadata/md5-cache/net-libs/nodejs-99999999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) systemtap? ( dev-util/systemtap ) test? ( net-misc/curl ) pax_kernel? ( sys-apps/elfix ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DEPEND=>=dev-libs/libuv-1.34.1:= >=net-dns/c-ares-1.15.0 >=net-libs/nghttp2-1.39.2 sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) ssl? ( >=dev-libs/openssl-1.1.1:0= )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
@@ -12,4 +12,4 @@ REQUIRED_USE=inspector? ( icu ssl ) npm? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b796601c0c76320a40c4b0d02c20df95
+_md5_=ab315c75852c5cc84f3a7545282a8dc3
diff --git a/metadata/md5-cache/net-libs/rest-0.8.1 b/metadata/md5-cache/net-libs/rest-0.8.1
index afad9c183d42..7124e00fbeef 100644
--- a/metadata/md5-cache/net-libs/rest-0.8.1
+++ b/metadata/md5-cache/net-libs/rest-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Helper library for RESTful services
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Librest
 IUSE=+introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 RESTRICT=!test? ( test )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.8/rest-0.8.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7625aa640d124f7f3c35f87801b354ca
+_md5_=b8a7252bf7a90b6839f7c360e5f7e176
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 c141c65ce918..5f46092431c2 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
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A parsing library for RIPE Atlas result strings
 EAPI=6
 HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/ujson[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ujson[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.sagan/ripe.atlas.sagan-1.1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=783f52161643e022ceb5e8487f421d25
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=812a1f91df613c94f6115bd88a2bd90e
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8 b/metadata/md5-cache/net-libs/serf-1.3.8
index bcbba349a12d..722dc9291d6a 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.8
+++ b/metadata/md5-cache/net-libs/serf-1.3.8
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fa7ebcdd84a52fb35e041b393c0df7da
diff --git a/metadata/md5-cache/net-libs/serf-1.3.8-r1 b/metadata/md5-cache/net-libs/serf-1.3.8-r1
index be53a999065c..ee5f55bf47e3 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.8-r1
+++ b/metadata/md5-cache/net-libs/serf-1.3.8-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.8.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1870bc5f4ca622a98eb01ab62011d7c4
diff --git a/metadata/md5-cache/net-libs/serf-1.3.9 b/metadata/md5-cache/net-libs/serf-1.3.9
index 0fdac5f467be..579477e7837d 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.9
+++ b/metadata/md5-cache/net-libs/serf-1.3.9
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b7105b35b99c348d708cb6fa66956825
diff --git a/metadata/md5-cache/net-libs/serf-1.3.9-r1 b/metadata/md5-cache/net-libs/serf-1.3.9-r1
index 3f0c0e1b6d2c..aab16bb04441 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.9-r1
+++ b/metadata/md5-cache/net-libs/serf-1.3.9-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= !libressl? ( dev-libs/openssl:0= )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.9.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d37ff7a5d0bb0c011587d90f819cb288
diff --git a/metadata/md5-cache/net-libs/sofia-sip-1.12.11 b/metadata/md5-cache/net-libs/sofia-sip-1.12.11
index 1e0517c359f1..0632457a1443 100644
--- a/metadata/md5-cache/net-libs/sofia-sip-1.12.11
+++ b/metadata/md5-cache/net-libs/sofia-sip-1.12.11
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 ssl? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
+DEPEND=dev-libs/glib:2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 DESCRIPTION=RFC3261 compliant SIP User-Agent library
-EAPI=4
+EAPI=7
 HOMEPAGE=http://sofia-sip.sourceforge.net/
-IUSE=libressl ssl static-libs
+IUSE=libressl ssl
 KEYWORDS=~alpha amd64 ~arm arm64 ia64 ppc ~ppc64 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+ BSD public-domain
-RDEPEND=dev-libs/glib:2 ssl? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) )
+RDEPEND=dev-libs/glib:2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/sofia-sip/sofia-sip-1.12.11.tar.gz
-_md5_=0ff2c72951a134d1847d3a14fb6cca39
+_md5_=92a4b4f9fadde565c0dd76af6c158560
diff --git a/metadata/md5-cache/net-libs/stem-1.5.4 b/metadata/md5-cache/net-libs/stem-1.5.4
index 27c0528c7dab..356739cfe659 100644
--- a/metadata/md5-cache/net-libs/stem-1.5.4
+++ b/metadata/md5-cache/net-libs/stem-1.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd196395207f143afdc8a06b68d46eb6
diff --git a/metadata/md5-cache/net-libs/stem-1.6.0 b/metadata/md5-cache/net-libs/stem-1.6.0
index c04fc3ca91cc..3b68bc0d896e 100644
--- a/metadata/md5-cache/net-libs/stem-1.6.0
+++ b/metadata/md5-cache/net-libs/stem-1.6.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd196395207f143afdc8a06b68d46eb6
diff --git a/metadata/md5-cache/net-libs/stem-1.7.0 b/metadata/md5-cache/net-libs/stem-1.7.0
index 6ad37afd497a..44636b88dd01 100644
--- a/metadata/md5-cache/net-libs/stem-1.7.0
+++ b/metadata/md5-cache/net-libs/stem-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.7.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=332ae98164036b60dfc7c4d2d218d203
diff --git a/metadata/md5-cache/net-libs/stem-1.7.1 b/metadata/md5-cache/net-libs/stem-1.7.1
index 8f3818925975..5ed08b5ef243 100644
--- a/metadata/md5-cache/net-libs/stem-1.7.1
+++ b/metadata/md5-cache/net-libs/stem-1.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=332ae98164036b60dfc7c4d2d218d203
diff --git a/metadata/md5-cache/net-libs/stem-1.8.0 b/metadata/md5-cache/net-libs/stem-1.8.0
index 0b2888cff4f9..24053bf2101c 100644
--- a/metadata/md5-cache/net-libs/stem-1.8.0
+++ b/metadata/md5-cache/net-libs/stem-1.8.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stem/stem-1.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=332ae98164036b60dfc7c4d2d218d203
diff --git a/metadata/md5-cache/net-libs/telepathy-glib-0.24.1-r1 b/metadata/md5-cache/net-libs/telepathy-glib-0.24.1-r1
index bb44995ea0bd..4d841bbb9167 100644
--- a/metadata/md5-cache/net-libs/telepathy-glib-0.24.1-r1
+++ b/metadata/md5-cache/net-libs/telepathy-glib-0.24.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxslt dev-util/glib-utils dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils 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/dbus-glib-0.90 introspection? ( >=dev-libs/gobject-introspection-1.30 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-libs/libxslt dev-util/glib-utils dev-util/gtk-doc-am virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils 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=6
 HOMEPAGE=https://telepathy.freedesktop.org/
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63c31b1882e6180475228122d402f5ef
+_md5_=e0ee637aa19206f7017880fdfaa9f84b
diff --git a/metadata/md5-cache/net-libs/udns-0.4 b/metadata/md5-cache/net-libs/udns-0.4
index 75d6d7bd73b9..6e402683abb3 100644
--- a/metadata/md5-cache/net-libs/udns-0.4
+++ b/metadata/md5-cache/net-libs/udns-0.4
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install
 DESCRIPTION=Async-capable DNS stub resolver library
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.corpit.ru/mjt/udns.html
 IUSE=ipv6 static +tools
 KEYWORDS=amd64 ~hppa ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.corpit.ru/mjt/udns/udns-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b136cad22dc333605b44a0056f4384e7
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6d914de2bffa9ff7670d690de1dd2d78
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.24.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.24.4
index ebbca53df600..87dd47da055f 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.24.4
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.24.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[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:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 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-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[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:= nsplugin? ( >=x11-libs/gtk+-2.24.10:2 ) spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,gles2?,opengl?] >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) webgl? ( x11-libs/libXcomposite x11-libs/libXdamage ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 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-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815 app-arch/xz-utils 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
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.24.4.tar.xz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5418a4ff7f96326f555f1fdcb1be3f1b
+_md5_=dbf84ec2beb27a43e3ac9d6bbecc3982
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.26.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.26.3
index 91853b59f997..1d6ef6eecec6 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.26.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.26.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54: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.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.10 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54: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.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:= ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.10 >=app-portage/elt-patches-20170815 app-arch/xz-utils 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
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.26.3.tar.xz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6415344a1403252e0df44dd6704d5aed
+_md5_=3d2d551cbfb584a2934ba2994ca1f7ea
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.26.3-r1 b/metadata/md5-cache/net-libs/webkit-gtk-2.26.3-r1
index 4ed100c548bf..be76a863917f 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.26.3-r1
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.26.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54: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.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.10 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-3.8.1-r1:= virtual/jpeg:0= >=net-libs/libsoup-2.54: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.16.0 media-libs/libwebp:= >=dev-libs/glib-2.44.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.32.0:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.14:1.0 >=media-libs/gst-plugins-base-1.14:1.0[egl?,opengl?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) >=media-plugins/gst-plugins-opus-1.14.4-r1:1.0 >=media-libs/gst-plugins-bad-1.14:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) egl? ( media-libs/mesa[egl] ) gles2-only? ( media-libs/mesa[gles2] ) opengl? ( virtual/opengl ) wayland? ( opengl? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) gles2-only? ( >=gui-libs/libwpe-1.3.0:1.0 >=gui-libs/wpebackend-fdo-1.3.1:1.0 ) ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) dev-util/ninja >=dev-util/cmake-3.10 >=app-portage/elt-patches-20170815 app-arch/xz-utils 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
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.26.3.tar.xz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1dc79a07767825a910512ac33db3d6e9
+_md5_=a203c5e4d300ced0ac288ef8bd279c86
diff --git a/metadata/md5-cache/net-libs/xrootd-4.10.1 b/metadata/md5-cache/net-libs/xrootd-4.10.1
index f35ae03839a5..ee4ca0c0e946 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.10.1
+++ b/metadata/md5-cache/net-libs/xrootd-4.10.1
@@ -3,13 +3,13 @@ DEPEND=sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python?
 DESCRIPTION=Extended ROOT remote file server
 EAPI=6
 HOMEPAGE=http://xrootd.org/
-IUSE=doc examples fuse http kerberos python readline ssl test 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
+IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ssl ) 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 ) )
+REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.10.1/xrootd-4.10.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23eed7f7acb2f773ad7695a22558bd4a
diff --git a/metadata/md5-cache/net-libs/xrootd-4.11.1 b/metadata/md5-cache/net-libs/xrootd-4.11.1
index df5a6df36c39..29a0aa6b257b 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.11.1
+++ b/metadata/md5-cache/net-libs/xrootd-4.11.1
@@ -4,13 +4,13 @@ DEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= )
 DESCRIPTION=Extended ROOT remote file server
 EAPI=7
 HOMEPAGE=http://xrootd.org/
-IUSE=doc examples fuse http kerberos python readline ssl test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.11.1/xrootd-4.11.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0a552101984d3cad248df287e4fd67b6
diff --git a/metadata/md5-cache/net-libs/xrootd-4.8.3 b/metadata/md5-cache/net-libs/xrootd-4.8.3
index 8caf49f39955..b91b83c42144 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.8.3
+++ b/metadata/md5-cache/net-libs/xrootd-4.8.3
@@ -3,13 +3,13 @@ DEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:= ) ker
 DESCRIPTION=Extended ROOT remote file server
 EAPI=6
 HOMEPAGE=http://xrootd.org/
-IUSE=doc examples fuse http kerberos python readline rbd ssl test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc examples fuse http kerberos python readline rbd ssl test +python_single_target_python2_7
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rbd? ( sys-cluster/ceph ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.8.3/xrootd-4.8.3.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2d9566e6e5f0041d028d6e622df860d
diff --git a/metadata/md5-cache/net-libs/xrootd-4.9.0 b/metadata/md5-cache/net-libs/xrootd-4.9.0
index eecca4ba7910..bc6b222d4541 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.9.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.9.0
@@ -3,13 +3,13 @@ DEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:= ) ker
 DESCRIPTION=Extended ROOT remote file server
 EAPI=6
 HOMEPAGE=http://xrootd.org/
-IUSE=doc examples fuse http kerberos python readline rbd ssl test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc examples fuse http kerberos python readline rbd ssl test +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-3
 RDEPEND=!<sci-physics/root-5.32[xrootd] sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) rbd? ( sys-cluster/ceph ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
-REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xrootd.org/download/v4.9.0/xrootd-4.9.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3940101c94a4ec87e90de25187ed1f10
diff --git a/metadata/md5-cache/net-libs/zeromq-4.3.2 b/metadata/md5-cache/net-libs/zeromq-4.3.2
index bb4450969cc5..f9c5f75bc017 100644
--- a/metadata/md5-cache/net-libs/zeromq-4.3.2
+++ b/metadata/md5-cache/net-libs/zeromq-4.3.2
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( =net-libs/openpgm-5.2.122 ) !elibc_Darwin? ( sys-apps/util-linux ) doc? ( app-text/asciidoc app-text/xmlto ) pgm? ( virtual/pkgconfig )
+DEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( ~net-libs/openpgm-5.2.122 ) !elibc_Darwin? ( sys-apps/util-linux ) doc? ( app-text/asciidoc app-text/xmlto ) pgm? ( virtual/pkgconfig )
 DESCRIPTION=A brokerless kernel
 EAPI=7
 HOMEPAGE=http://www.zeromq.org/
 IUSE=doc drafts pgm +sodium static-libs test unwind elibc_Darwin
 KEYWORDS=amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-3
-RDEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( =net-libs/openpgm-5.2.122 )
+RDEPEND=!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) pgm? ( ~net-libs/openpgm-5.2.122 )
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://github.com/zeromq/libzmq/releases/download/v4.3.2/zeromq-4.3.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=997d75f80755cdea3a16ce124edcbb95
+_md5_=eb737e01c954e12306dfe067ca5d1a9e
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 050a6cd13beb..f6354ac6324e 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 11c8f9a3f92e..d4968ffbaf43 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f679d5ac74e6..1ba2a6306e38 100644
--- a/metadata/md5-cache/net-mail/automx-0.10.2-r1
+++ b/metadata/md5-cache/net-mail/automx-0.10.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( www-apache/mod_wsgi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] www-servers/uwsgi ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) memcached? ( dev-python/python-memcached[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sql? ( dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) tools? ( net-dns/bind-tools net-misc/wget ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_7? ( dev-python/ipaddr[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)] || ( www-apache/mod_wsgi[python_targets_python2_7(-)] www-servers/uwsgi ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)] ) memcached? ( dev-python/python-memcached[python_targets_python2_7(-)] ) sql? ( dev-python/sqlalchemy[python_targets_python2_7(-)] ) ) tools? ( net-dns/bind-tools net-misc/wget ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=A mail user agent auto configuration service
 EAPI=5
 HOMEPAGE=http://www.automx.org
-IUSE=ldap memcached sql +tools +python_targets_python2_7 +python_single_target_python2_7
+IUSE=ldap memcached sql +tools +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( www-apache/mod_wsgi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] www-servers/uwsgi ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) memcached? ( dev-python/python-memcached[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sql? ( dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) tools? ( net-dns/bind-tools net-misc/wget ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( dev-python/ipaddr[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)] || ( www-apache/mod_wsgi[python_targets_python2_7(-)] www-servers/uwsgi ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)] ) memcached? ( dev-python/python-memcached[python_targets_python2_7(-)] ) sql? ( dev-python/sqlalchemy[python_targets_python2_7(-)] ) ) tools? ( net-dns/bind-tools net-misc/wget ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8714808c58db7f705a0b727e3d16621
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b8fecf5a9b9f9f9cbc7118673730d702
diff --git a/metadata/md5-cache/net-mail/automx-0.10.2-r2 b/metadata/md5-cache/net-mail/automx-0.10.2-r2
deleted file mode 100644
index b91af6de74d2..000000000000
--- a/metadata/md5-cache/net-mail/automx-0.10.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( www-apache/mod_wsgi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] www-servers/uwsgi ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) memcached? ( dev-python/python-memcached[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sql? ( dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) tools? ( net-dns/bind-tools net-misc/wget ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A mail user agent auto configuration service
-EAPI=5
-HOMEPAGE=http://www.automx.org
-IUSE=ldap memcached sql +tools +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/m2crypto[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( www-apache/mod_wsgi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] www-servers/uwsgi ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) memcached? ( dev-python/python-memcached[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sql? ( dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) tools? ( net-dns/bind-tools net-misc/wget ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d676895d7c5fff03c7ea7a1f0ff9205a
diff --git a/metadata/md5-cache/net-mail/automx-0.10.2-r3 b/metadata/md5-cache/net-mail/automx-0.10.2-r3
new file mode 100644
index 000000000000..6e0717730f18
--- /dev/null
+++ b/metadata/md5-cache/net-mail/automx-0.10.2-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-python/ipaddr[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)] || ( www-apache/mod_wsgi[python_targets_python2_7(-)] www-servers/uwsgi ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)] ) memcached? ( dev-python/python-memcached[python_targets_python2_7(-)] ) sql? ( dev-python/sqlalchemy[python_targets_python2_7(-)] ) ) tools? ( net-dns/bind-tools net-misc/wget ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A mail user agent auto configuration service
+EAPI=5
+HOMEPAGE=http://www.automx.org
+IUSE=ldap memcached sql +tools +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( dev-python/ipaddr[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] dev-python/m2crypto[python_targets_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)] || ( www-apache/mod_wsgi[python_targets_python2_7(-)] www-servers/uwsgi ) ldap? ( dev-python/python-ldap[python_targets_python2_7(-)] ) memcached? ( dev-python/python-memcached[python_targets_python2_7(-)] ) sql? ( dev-python/sqlalchemy[python_targets_python2_7(-)] ) ) tools? ( net-dns/bind-tools net-misc/wget ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4c047fb89f5d91633e481fc9c6668634
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
index d6a5a8aa352f..f2eead6d98c6 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.10-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sql
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.10/cyrus-imapd-3.0.10.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9911d2773c5d0f5ecee43908ef3404cd
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11 b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
index 43a31aa5b702..3ba5ff9c2966 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-3.0.11
@@ -11,5 +11,5 @@ REQUIRED_USE=afs? ( kerberos ) backup? ( sqlite ) calalarm? ( http ) http? ( sql
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.0.11/cyrus-imapd-3.0.11.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=60243c5ddb60ce05418e843aca5e6518
diff --git a/metadata/md5-cache/net-mail/dbmail-3.2.3-r1 b/metadata/md5-cache/net-mail/dbmail-3.2.3-r1
index f4fd98e29588..d111d2c62af5 100644
--- a/metadata/md5-cache/net-mail/dbmail-3.2.3-r1
+++ b/metadata/md5-cache/net-mail/dbmail-3.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33 ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www.dbmail.org/download/3.2/dbmail-3.2.3.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=818b4705c7769abca6739ddbe6e28e4d
diff --git a/metadata/md5-cache/net-mail/dbmail-3.2.3-r2 b/metadata/md5-cache/net-mail/dbmail-3.2.3-r2
index 7c4f6f812ae9..3fbe15b89022 100644
--- a/metadata/md5-cache/net-mail/dbmail-3.2.3-r2
+++ b/metadata/md5-cache/net-mail/dbmail-3.2.3-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33 ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib dev-libs/gmime:2.6 >=dev-libs/glib-2.16 dev-libs/libevent ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://www.dbmail.org/download/3.2/dbmail-3.2.3.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=0120d313af2590d538d6e9cb13d7e07a
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.36.4 b/metadata/md5-cache/net-mail/dovecot-2.2.36.4
index 0ebbfb9d8403..fca5fd64b790 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.36.4
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.36.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=bzip2? ( app-arch/bzip2 ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/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:0= ) tcpd? ( sys-apps/tcp-wrappers ) textcat? ( app-text/libexttextcat ) vpopmail? ( net-mail/vpopmail ) zlib? ( sys-libs/zlib ) virtual/libiconv dev-libs/icu:= net-mail/mailbase
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.2/dovecot-2.2.36.4.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.2.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.24.2.tar.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=894a7bbd115e06ee2ab0d78629bd1a11
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.7.2 b/metadata/md5-cache/net-mail/dovecot-2.3.7.2
index dee35f41bc89..b5d2586d4392 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.7.2
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.7.2
@@ -9,5 +9,5 @@ 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? ( dev-db/mysql-connector-c:0= ) pam? ( sys-libs/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:0= ) suid? ( acct-group/mail ) 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.7.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.2.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.7.2.tar.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0cad9ae60ba35f7f372b3567a4c71130
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=d25fd90d00b7d4ff74524ca796a2ae4e
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.8 b/metadata/md5-cache/net-mail/dovecot-2.3.8
index 850ef4657826..3bbba15106ab 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.8
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.8
@@ -11,4 +11,4 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.8.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.8.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.8.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6e6fcdba43de519876f7353edd9940c1
+_md5_=6112d45884895f3ae7e49274d7072f9c
diff --git a/metadata/md5-cache/net-mail/dovecot-2.3.9.2 b/metadata/md5-cache/net-mail/dovecot-2.3.9.2
index 319eb4b5fe34..b54332b9ec11 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.3.9.2
+++ b/metadata/md5-cache/net-mail/dovecot-2.3.9.2
@@ -11,4 +11,4 @@ RDEPEND=argon2? ( dev-libs/libsodium ) bzip2? ( app-arch/bzip2 ) caps? ( sys-lib
 SLOT=0
 SRC_URI=https://dovecot.org/releases/2.3/dovecot-2.3.9.2.tar.gz sieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.9.tar.gz ) managesieve? ( https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.9.tar.gz )
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2f1fc34d7e223286e6f4a665d3c2e728
+_md5_=a9c24419bcefb068bda10017ce535d06
diff --git a/metadata/md5-cache/net-mail/fdm-1.9 b/metadata/md5-cache/net-mail/fdm-1.9
index 315656d84ea3..95653f7a4cad 100644
--- a/metadata/md5-cache/net-mail/fdm-1.9
+++ b/metadata/md5-cache/net-mail/fdm-1.9
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/tdb courierauth? ( net-libs/courier-authlib ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=https://github.com/nicm/fdm/releases/download/1.9/fdm-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=33471946bd616ecca67653417dff941b
diff --git a/metadata/md5-cache/net-mail/fdm-2.0 b/metadata/md5-cache/net-mail/fdm-2.0
index 64ede3ad803d..7345530c5822 100644
--- a/metadata/md5-cache/net-mail/fdm-2.0
+++ b/metadata/md5-cache/net-mail/fdm-2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/tdb pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=https://github.com/nicm/fdm/releases/download/2.0/fdm-2.0.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c466a1b0f160d2aa8dea1341608f195a
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.3.26-r4 b/metadata/md5-cache/net-mail/fetchmail-6.3.26-r4
index 6c279ff0e99b..943b77b131d8 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.3.26-r4
+++ b/metadata/md5-cache/net-mail/fetchmail-6.3.26-r4
@@ -3,12 +3,12 @@ DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:= ) libressl? ( dev-libs/lib
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=6
 HOMEPAGE=http://www.fetchmail.info/
-IUSE=ssl nls kerberos tk socks libressl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=ssl nls kerberos tk socks libressl +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:= ) libressl? ( dev-libs/libressl:= ) ) kerberos? ( virtual/krb5 !libressl? ( >=dev-libs/openssl-0.9.6:= ) libressl? ( dev-libs/libressl:= ) ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=tk? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=tk? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.3.26.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b46d1056315555bee4a24412602253c7
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.1 b/metadata/md5-cache/net-mail/fetchmail-6.4.1
index 663d78df65de..117449e3741f 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.1
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.1
@@ -4,12 +4,12 @@ DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/lib
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
 HOMEPAGE=http://www.fetchmail.info/
-IUSE=ssl nls kerberos tk socks libressl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=ssl nls kerberos tk socks libressl +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
 RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/libressl:= ) ) kerberos? ( virtual/krb5 !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/libressl:= ) ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=tk? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=tk? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=06fed5ba426e6cbb0227ff5f211a3817
diff --git a/metadata/md5-cache/net-mail/fetchmail-6.4.1-r3 b/metadata/md5-cache/net-mail/fetchmail-6.4.1-r3
index 3c116f2a574e..2827326132f2 100644
--- a/metadata/md5-cache/net-mail/fetchmail-6.4.1-r3
+++ b/metadata/md5-cache/net-mail/fetchmail-6.4.1-r3
@@ -4,12 +4,12 @@ DEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:= ) libr
 DESCRIPTION=the legendary remote-mail retrieval and forwarding utility
 EAPI=7
 HOMEPAGE=http://www.fetchmail.info/
-IUSE=ssl nls kerberos tk socks libressl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=ssl nls kerberos tk socks libressl +python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 public-domain
 RDEPEND=acct-user/fetchmail ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/libressl:= ) ) kerberos? ( virtual/krb5 !libressl? ( >=dev-libs/openssl-1.0.2:= ) libressl? ( dev-libs/libressl:= ) ) nls? ( virtual/libintl ) !elibc_glibc? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=tk? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=tk? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/fetchmail/fetchmail-6.4.1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c8c77bc42d0735f718df628d54318e3e
diff --git a/metadata/md5-cache/net-mail/getmail-5.14 b/metadata/md5-cache/net-mail/getmail-5.14
index 4bcb70cb47ff..502e921e3421 100644
--- a/metadata/md5-cache/net-mail/getmail-5.14
+++ b/metadata/md5-cache/net-mail/getmail-5.14
@@ -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.14.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=92010ced78ae8c18e6cbd285f36bc4c4
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.66-r2 b/metadata/md5-cache/net-mail/libpst-0.6.66-r2
deleted file mode 100644
index b38aa8d40c07..000000000000
--- a/metadata/md5-cache/net-mail/libpst-0.6.66-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
-DEPEND=gnome-extra/libgsf:= dii? ( media-gfx/imagemagick:=[png] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/boost-1.70:=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] )
-DESCRIPTION=Tools and library for reading Outlook files (.pst format)
-EAPI=7
-HOMEPAGE=https://www.five-ten-sg.com/libpst/
-IUSE=debug dii doc python static-libs +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=gnome-extra/libgsf:= dii? ( media-gfx/imagemagick:=[png] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/boost-1.70:=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://www.five-ten-sg.com/libpst/packages/libpst-0.6.66.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=04dcaca03342916f1246759e1a37ffb7
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.66-r3 b/metadata/md5-cache/net-mail/libpst-0.6.66-r3
new file mode 100644
index 000000000000..b770f1f66153
--- /dev/null
+++ b/metadata/md5-cache/net-mail/libpst-0.6.66-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
+DEPEND=gnome-extra/libgsf:= dii? ( media-gfx/imagemagick:=[png] ) python? ( python_single_target_python2_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/boost-1.70:=[python,python_targets_python2_7(-)] ) ) virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] )
+DESCRIPTION=Tools and library for reading Outlook files (.pst format)
+EAPI=7
+HOMEPAGE=https://www.five-ten-sg.com/libpst/
+IUSE=debug dii doc python static-libs +python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=gnome-extra/libgsf:= dii? ( media-gfx/imagemagick:=[png] ) python? ( python_single_target_python2_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/boost-1.70:=[python,python_targets_python2_7(-)] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=https://www.five-ten-sg.com/libpst/packages/libpst-0.6.66.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=669d9bd8107651dac29b85cb34f40b97
diff --git a/metadata/md5-cache/net-mail/mailbase-1.5-r1 b/metadata/md5-cache/net-mail/mailbase-1.5-r1
index dc5eec6f9577..ca9393b36664 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.5-r1
+++ b/metadata/md5-cache/net-mail/mailbase-1.5-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install
 DESCRIPTION=MTA layout package
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=pam
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/mail acct-user/mail acct-user/postmaster pam? ( sys-libs/pam )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e24f94c9257cea06a2752b103fad6c8e
+_md5_=b16d7e54a0b6fb4997553a45c7edb171
diff --git a/metadata/md5-cache/net-mail/mailgraph-1.14-r2 b/metadata/md5-cache/net-mail/mailgraph-1.14-r2
index d5a960ca5e2b..51a07bb075c7 100644
--- a/metadata/md5-cache/net-mail/mailgraph-1.14-r2
+++ b/metadata/md5-cache/net-mail/mailgraph-1.14-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl dev-perl/File-Tail >=net-analyzer/rrdtool-1.2.2[graph,perl]
 SLOT=1.14
 SRC_URI=http://mailgraph.schweikert.ch//pub/mailgraph-1.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1be6f74cb4297702908e4b3963664cb5
diff --git a/metadata/md5-cache/net-mail/mailman-2.1.29-r1 b/metadata/md5-cache/net-mail/mailman-2.1.29-r1
deleted file mode 100644
index ed11fab0d4ce..000000000000
--- a/metadata/md5-cache/net-mail/mailman-2.1.29-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/mta virtual/cron virtual/httpd-cgi virtual/pkgconfig
-DESCRIPTION=A python-based mailing list server with an extensive web interface
-EAPI=5
-HOMEPAGE=http://www.list.org/
-IUSE=selinux +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/mta virtual/cron virtual/httpd-cgi selinux? ( sec-policy/selinux-mailman )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/mailman/mailman-2.1.29.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b1fc463486f16503e461e58f01755c54
diff --git a/metadata/md5-cache/net-mail/mailman-2.1.29-r2 b/metadata/md5-cache/net-mail/mailman-2.1.29-r2
deleted file mode 100644
index eb62e0a728c3..000000000000
--- a/metadata/md5-cache/net-mail/mailman-2.1.29-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/mta virtual/cron virtual/httpd-cgi virtual/pkgconfig
-DESCRIPTION=A python-based mailing list server with an extensive web interface
-EAPI=5
-HOMEPAGE=http://www.list.org/
-IUSE=selinux +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/mta virtual/cron virtual/httpd-cgi selinux? ( sec-policy/selinux-mailman )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/mailman/mailman-2.1.29.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a2940067c188cbc428866b72e898d30
diff --git a/metadata/md5-cache/net-mail/mailman-2.1.29-r3 b/metadata/md5-cache/net-mail/mailman-2.1.29-r3
new file mode 100644
index 000000000000..5d9d68c33296
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailman-2.1.29-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=python_single_target_python2_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/dnspython[python_targets_python2_7(-)] ) virtual/mta virtual/cron virtual/httpd-cgi virtual/pkgconfig
+DESCRIPTION=A python-based mailing list server with an extensive web interface
+EAPI=5
+HOMEPAGE=http://www.list.org/
+IUSE=selinux +python_single_target_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/dnspython[python_targets_python2_7(-)] ) virtual/mta virtual/cron virtual/httpd-cgi selinux? ( sec-policy/selinux-mailman )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/mailman/mailman-2.1.29.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b4bc1ac1f04850668e73cf29a23be6ad
diff --git a/metadata/md5-cache/net-mail/mailman-2.1.29-r4 b/metadata/md5-cache/net-mail/mailman-2.1.29-r4
new file mode 100644
index 000000000000..0e03124ac41f
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailman-2.1.29-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=python_single_target_python2_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/dnspython[python_targets_python2_7(-)] ) virtual/mta virtual/cron virtual/httpd-cgi virtual/pkgconfig
+DESCRIPTION=A python-based mailing list server with an extensive web interface
+EAPI=5
+HOMEPAGE=http://www.list.org/
+IUSE=selinux +python_single_target_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/dnspython[python_targets_python2_7(-)] ) virtual/mta virtual/cron virtual/httpd-cgi selinux? ( sec-policy/selinux-mailman )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/mailman/mailman-2.1.29.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=194e54af4793bbb6b1f12a4b3901009d
diff --git a/metadata/md5-cache/net-mail/mailman-3.1.1 b/metadata/md5-cache/net-mail/mailman-3.1.1
index 098716d34204..b0337849bd05 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_6(-)?,-python_single_tar
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailman/mailman-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=459af58e5b93415fe6f216cd55916390
diff --git a/metadata/md5-cache/net-mail/mailman-3.2.1 b/metadata/md5-cache/net-mail/mailman-3.2.1
index 482283e1df5b..cfcceafba05a 100644
--- a/metadata/md5-cache/net-mail/mailman-3.2.1
+++ b/metadata/md5-cache/net-mail/mailman-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/aiosmtpd-1.1[python_targets_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/m/mailman/mailman-3.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5efbe9fcd6658710a2148ab20b917e7c
diff --git a/metadata/md5-cache/net-mail/mailutils-3.4-r3 b/metadata/md5-cache/net-mail/mailutils-3.4-r3
index f29825844f89..d9737944d1d1 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.4-r3
+++ b/metadata/md5-cache/net-mail/mailutils-3.4-r3
@@ -3,12 +3,12 @@ DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/na
 DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
-IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet +python_targets_python2_7 +python_single_target_python2_7
+IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet +python_single_target_python2_7
 KEYWORDS=amd64 arm arm64 ~hppa ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/22 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) servers? ( tcpd )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) servers? ( tcpd )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.4.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5787d2050486bd834dacf24660afcfbb
diff --git a/metadata/md5-cache/net-mail/mailutils-3.7 b/metadata/md5-cache/net-mail/mailutils-3.7
index c44dc3a371fa..cd2acd25112d 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.7
+++ b/metadata/md5-cache/net-mail/mailutils-3.7
@@ -4,12 +4,12 @@ DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/na
 DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
-IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet 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
+IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-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 ) ) servers? ( tcpd ldap )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.7.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=481f9b9a1e2ff55c55ffbc938754ce6d
diff --git a/metadata/md5-cache/net-mail/mailutils-3.8 b/metadata/md5-cache/net-mail/mailutils-3.8
index 606972006521..30f588c7c6cc 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.8
+++ b/metadata/md5-cache/net-mail/mailutils-3.8
@@ -4,12 +4,12 @@ DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/na
 DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
-IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet 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
+IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd tokyocabinet python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/2.2-1 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( dev-db/mysql-connector-c ) nls? ( sys-devel/gettext ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sasl? ( virtual/gsasl ) servers? ( virtual/libiconv dev-libs/libunistring ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
-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 ) ) servers? ( tcpd ldap )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) servers? ( tcpd ldap )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.8.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8824cd4c0ef58c33a9406a691b6f28cc
diff --git a/metadata/md5-cache/net-mail/mairix-0.23 b/metadata/md5-cache/net-mail/mairix-0.23
deleted file mode 100644
index 6ce5320f7a26..000000000000
--- a/metadata/md5-cache/net-mail/mairix-0.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) bzip2? ( app-arch/bzip2 ) sys-devel/flex sys-devel/bison
-DESCRIPTION=Indexes and searches Maildir/MH folders
-EAPI=4
-HOMEPAGE=http://www.rpcurnow.force9.co.uk/mairix/
-IUSE=zlib bzip2 gnus
-KEYWORDS=amd64 ppc x86 ~x86-macos
-LICENSE=GPL-2
-RDEPEND=zlib? ( sys-libs/zlib ) bzip2? ( app-arch/bzip2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/mairix/mairix-0.23.tar.gz gnus? ( mirror://gentoo/mairix-0.23-gnus-marks-propagation.patch.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e57fca1e40e5c5d791f6fa3197b6376
diff --git a/metadata/md5-cache/net-mail/mairix-0.24 b/metadata/md5-cache/net-mail/mairix-0.24
index 9bee1faa68b8..7db205a524b0 100644
--- a/metadata/md5-cache/net-mail/mairix-0.24
+++ b/metadata/md5-cache/net-mail/mairix-0.24
@@ -4,11 +4,11 @@ DESCRIPTION=Indexes and searches Maildir/MH folders
 EAPI=6
 HOMEPAGE=http://www.rpcurnow.force9.co.uk/mairix/
 IUSE=zlib bzip2
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-macos
+KEYWORDS=amd64 ppc x86 ~x86-macos
 LICENSE=GPL-2
 RDEPEND=zlib? ( sys-libs/zlib ) bzip2? ( app-arch/bzip2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mairix/mairix-0.24.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be923e355dd7f7ea23c2140aa7c7db93
+_md5_=ba097ae699507850695a5b990b34e99d
diff --git a/metadata/md5-cache/net-mail/mpop-1.4.7 b/metadata/md5-cache/net-mail/mpop-1.4.7
new file mode 100644
index 000000000000..54c711f71306
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mpop-1.4.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=idn? ( net-dns/libidn2 ) gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls:0=[idn?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=A small, fast, and portable POP3 client
+EAPI=7
+HOMEPAGE=https://marlam.de/mpop/
+IUSE=gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=idn? ( net-dns/libidn2 ) gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls:0=[idn?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+REQUIRED_USE=gnutls? ( ssl )
+SLOT=0
+SRC_URI=https://marlam.de/mpop/releases/mpop-1.4.7.tar.xz
+_md5_=4261cf3d73a4ad9c7c6f9f587840a073
diff --git a/metadata/md5-cache/net-mail/notmuch-0.29.3 b/metadata/md5-cache/net-mail/notmuch-0.29.3
index 9cc0671b3f45..4eccec4310ed 100644
--- a/metadata/md5-cache/net-mail/notmuch-0.29.3
+++ b/metadata/md5-cache/net-mail/notmuch-0.29.3
@@ -11,5 +11,5 @@ REQUIRED_USE=nmbug? ( python ) python? ( || ( python_targets_python2_7 python_ta
 RESTRICT=!test? ( test )
 SLOT=0/5
 SRC_URI=https://notmuchmail.org/releases/notmuch-0.29.3.tar.xz test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=07c89fcd7be73e5a601f394722157cd2
diff --git a/metadata/md5-cache/net-mail/offlineimap-6.5.6 b/metadata/md5-cache/net-mail/offlineimap-6.5.6
index ef00db702cdd..5a1a17ddeaad 100644
--- a/metadata/md5-cache/net-mail/offlineimap-6.5.6
+++ b/metadata/md5-cache/net-mail/offlineimap-6.5.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=doc? ( dev-python/docutils ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite?,ssl?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=doc? ( dev-python/docutils ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite?,ssl?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Powerful IMAP/Maildir synchronization and reader support
 EAPI=5
 HOMEPAGE=https://www.offlineimap.org/
-IUSE=doc ssl sqlite +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc ssl sqlite +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~ia64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite?,ssl?] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ffa7e1e4f5c4dd0640945fff12aca8d
diff --git a/metadata/md5-cache/net-mail/offlineimap-7.2.4 b/metadata/md5-cache/net-mail/offlineimap-7.2.4
deleted file mode 100644
index d4526ee21355..000000000000
--- a/metadata/md5-cache/net-mail/offlineimap-7.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=doc? ( app-text/asciidoc )
-DESCRIPTION=Powerful IMAP/Maildir synchronization and reader support
-EAPI=7
-HOMEPAGE=https://www.offlineimap.org/
-IUSE=doc ssl +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v7.2.4.tar.gz -> offlineimap-7.2.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1577b8f254ba14a057f4f53337691f9a
diff --git a/metadata/md5-cache/net-mail/offlineimap-7.2.4-r1 b/metadata/md5-cache/net-mail/offlineimap-7.2.4-r1
new file mode 100644
index 000000000000..fb5e0f4e0825
--- /dev/null
+++ b/metadata/md5-cache/net-mail/offlineimap-7.2.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=doc? ( app-text/asciidoc )
+DESCRIPTION=Powerful IMAP/Maildir synchronization and reader support
+EAPI=7
+HOMEPAGE=https://www.offlineimap.org/
+IUSE=doc ssl +python_single_target_python2_7
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( dev-python/six[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,sqlite,ssl?] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/OfflineIMAP/offlineimap/archive/v7.2.4.tar.gz -> offlineimap-7.2.4.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=aa010ddfb99061dd1519dad16281fdd9
diff --git a/metadata/md5-cache/net-mail/popa3d-1.0.2-r1 b/metadata/md5-cache/net-mail/popa3d-1.0.2-r1
index 1ac70704ab79..ad36d94af7b4 100644
--- a/metadata/md5-cache/net-mail/popa3d-1.0.2-r1
+++ b/metadata/md5-cache/net-mail/popa3d-1.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/sed-4 pam? ( >=sys-libs/pam-0.72 >=net-mail/mailbase-0.00-r8[
 REQUIRED_USE=^^ ( maildir mbox )
 SLOT=0
 SRC_URI=http://www.openwall.com/popa3d/popa3d-1.0.2.tar.gz mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9dea19f1fce81af7d7689151ecad3f65
diff --git a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1 b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
index 5bed70b5c0cb..1f107fcb80ac 100644
--- a/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
+++ b/metadata/md5-cache/net-mail/queue-repair-0.9.0-r1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A toolkit for dealing with the qmail queue directory structure
 EAPI=6
 HOMEPAGE=http://pyropus.ca/software/queue-repair/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://pyropus.ca/software/queue-repair/queue-repair-0.9.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e77b8fba43916cfd37562055d37f1c96
diff --git a/metadata/md5-cache/net-mail/rss2email-3.10 b/metadata/md5-cache/net-mail/rss2email-3.10
index 9c664257ec73..7b6c615b3d8a 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.10
+++ b/metadata/md5-cache/net-mail/rss2email-3.10
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/feedparser-5.0.1[python_targets_python3_6(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.10.tar.gz -> rss2email-3.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=df7072d7edc847738299436eb0c5596a
diff --git a/metadata/md5-cache/net-mail/rss2email-3.10_pre20171001 b/metadata/md5-cache/net-mail/rss2email-3.10_pre20171001
index c5eab8c19395..3fa1ca18bbbe 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/e21e803a158a90ed784ee61ce7226e5c3a593a28.tar.gz -> rss2email-3.10_pre20171001.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acbce1bf680726d0626c19ac60e4dba2
diff --git a/metadata/md5-cache/net-mail/rss2email-3.11 b/metadata/md5-cache/net-mail/rss2email-3.11
index 5546792e716b..e63b691d3343 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.11
+++ b/metadata/md5-cache/net-mail/rss2email-3.11
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/feedparser-5.0.1[python_targets_python3_6(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.11.tar.gz -> rss2email-3.11.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=82c7c22690214ff8136d6ced960f6ba5
diff --git a/metadata/md5-cache/net-mail/vpopmail-5.4.33 b/metadata/md5-cache/net-mail/vpopmail-5.4.33
index 7a6e036511e9..837c1c392cf4 100644
--- a/metadata/md5-cache/net-mail/vpopmail-5.4.33
+++ b/metadata/md5-cache/net-mail/vpopmail-5.4.33
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=acct-group/vpopmail acct-user/vpopmail virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 SLOT=0
 SRC_URI=mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	d84e9465a4b5bbfde81e1c29fbb24ce4	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24b5f60cb8ba99a7fb16e5a16089c946
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 1eada0c39d71..086443c36c95 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.3.1_p1 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p1
index 68fa1d8ffd57..3ec9c4e35b99 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p1
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p1
@@ -9,5 +9,5 @@ LICENSE=BSD-4 ZLIB public-domain
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:0= 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.3.1.orig.tar.xz mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.3.1-1.debian.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6768d66b812ac384de6dbe997c890c86
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=90c00268ccbb4d05c66fe21103ba7d25
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p2 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p2
index 347a0b8159c4..f48b69b04768 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p2
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.3.1_p2
@@ -9,5 +9,5 @@ LICENSE=BSD-4 ZLIB public-domain
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:0= 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.3.1.orig.tar.xz mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.3.1-2.debian.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=afc9587cc3af14537dda899bd594ba90
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8ef9835791169b63454bc372acee51b4
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-3.3_p2 b/metadata/md5-cache/net-misc/apt-cacher-ng-3.3_p2
index d1536f8089ee..8b7cc45962d4 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-3.3_p2
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-3.3_p2
@@ -9,5 +9,5 @@ LICENSE=BSD-4 ZLIB public-domain
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:0= 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.3.orig.tar.xz mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_3.3-2.debian.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=961d58e5d3c27f666b198be831e25961
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63f56a27082bb43bdb924e051eb3257f
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-9999999 b/metadata/md5-cache/net-misc/apt-cacher-ng-9999999
index 055c4a606521..854f83eb2421 100644
--- a/metadata/md5-cache/net-misc/apt-cacher-ng-9999999
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-9999999
@@ -8,5 +8,5 @@ LICENSE=BSD-4 ZLIB public-domain
 PROPERTIES=live
 RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/openssl:0= sys-libs/zlib systemd? ( sys-apps/systemd ) dev-lang/perl fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2bc016ca7f2b6be29cae46e16682d70
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=821ac36df28141c378b23ad1fc600341
diff --git a/metadata/md5-cache/net-misc/asterisk-11.25.3 b/metadata/md5-cache/net-misc/asterisk-11.25.3
index 2f80bb7eac67..32697dae3058 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2d2ccc6f74ebd6c4e8fead8c785cbe4b
diff --git a/metadata/md5-cache/net-misc/asterisk-13.23.1 b/metadata/md5-cache/net-misc/asterisk-13.23.1
index 0645940eaf2a..7577544cd9ef 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.23.1
+++ b/metadata/md5-cache/net-misc/asterisk-13.23.1
@@ -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.23.1.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=50f6177b55f5d7cf3cd76f4588e1af34
diff --git a/metadata/md5-cache/net-misc/bird-2.0.5 b/metadata/md5-cache/net-misc/bird-2.0.5
new file mode 100644
index 000000000000..68ca0f0c51fd
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-2.0.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.0.5.tar.gz
+_md5_=0fd2040594981c3cfeda99b4351123c6
diff --git a/metadata/md5-cache/net-misc/bird-2.0.6 b/metadata/md5-cache/net-misc/bird-2.0.6
new file mode 100644
index 000000000000..5514cf30816a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-2.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.0.6.tar.gz
+_md5_=0fd2040594981c3cfeda99b4351123c6
diff --git a/metadata/md5-cache/net-misc/bird-2.0.7 b/metadata/md5-cache/net-misc/bird-2.0.7
new file mode 100644
index 000000000000..e92cc6846263
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-2.0.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-devel/flex sys-devel/bison sys-devel/m4
+DESCRIPTION=A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6
+EAPI=7
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug
+KEYWORDS=~amd64 ~arm64 ~x86 ~x64-macos
+LICENSE=GPL-2
+RDEPEND=client? ( sys-libs/ncurses ) client? ( sys-libs/readline )
+SLOT=0
+SRC_URI=ftp://bird.network.cz/pub/bird/bird-2.0.7.tar.gz
+_md5_=0fd2040594981c3cfeda99b4351123c6
diff --git a/metadata/md5-cache/net-misc/bopm-3.1.3-r4 b/metadata/md5-cache/net-misc/bopm-3.1.3-r4
index 6b9623c31a4b..5f81efade680 100644
--- a/metadata/md5-cache/net-misc/bopm-3.1.3-r4
+++ b/metadata/md5-cache/net-misc/bopm-3.1.3-r4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://static.blitzed.org/www.blitzed.org/bopm/files/bopm-3.1.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=961e0fb8047978f5026b0944ce5c83c8
diff --git a/metadata/md5-cache/net-misc/charm-1.9.2-r1 b/metadata/md5-cache/net-misc/charm-1.9.2-r1
deleted file mode 100644
index c548b6128941..000000000000
--- a/metadata/md5-cache/net-misc/charm-1.9.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A text based livejournal client
-EAPI=5
-HOMEPAGE=http://ljcharm.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 sparc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/ljcharm/charm-1.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a86f940e368706f0373a499ecac654d7
diff --git a/metadata/md5-cache/net-misc/charm-1.9.2-r2 b/metadata/md5-cache/net-misc/charm-1.9.2-r2
new file mode 100644
index 000000000000..1404bdd18867
--- /dev/null
+++ b/metadata/md5-cache/net-misc/charm-1.9.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-python/feedparser[python_targets_python2_7(-)] ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A text based livejournal client
+EAPI=5
+HOMEPAGE=http://ljcharm.sourceforge.net/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 sparc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ljcharm/charm-1.9.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42ce5966e3ce304182a1317dc7a796cf
diff --git a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003 b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003
deleted file mode 100644
index f4d9c861f441..000000000000
--- a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DESCRIPTION=Desktop notification integration for connman
-EAPI=6
-HOMEPAGE=https://gitlab.com/wavexx/connman-notify/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] net-misc/connman virtual/notification-daemon
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-SLOT=0
-SRC_URI=https://gitlab.com/wavexx/connman-notify/repository/4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52/archive.tar.bz2 -> connman-notify-0_pre20191003.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=8ce88dddffb4074bb2642cbccfbe4170
diff --git a/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r1 b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r1
new file mode 100644
index 000000000000..885a5674a45a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/connman-notify-0_pre20191003-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup unpack
+DESCRIPTION=Desktop notification integration for connman
+EAPI=6
+HOMEPAGE=https://gitlab.com/wavexx/connman-notify/
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) net-misc/connman virtual/notification-daemon
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+SLOT=0
+SRC_URI=https://gitlab.com/wavexx/connman-notify/repository/4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52/archive.tar.bz2 -> connman-notify-0_pre20191003.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=f7adb5e7373c07cd06b5403b98591b0c
diff --git a/metadata/md5-cache/net-misc/crossbar-17.12.1 b/metadata/md5-cache/net-misc/crossbar-17.12.1
index c94446da42e4..97f7027ef147 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.12.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-17.12.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d343705acc0fb5621ce18dd4991d591
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 85a2fc3b7094..dcc9e456db27 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-17.6.1.post3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfa02f1bbd438e51f6d7dd4a876adc2e
diff --git a/metadata/md5-cache/net-misc/crossbar-17.8.1 b/metadata/md5-cache/net-misc/crossbar-17.8.1
index 7c2c7abfc1b3..a850c1329868 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.8.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/crossbario/crossbar/archive/v17.8.1.tar.gz -> crossbar-17.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=12d842154e8c1cd9a2545c48a07835c1
diff --git a/metadata/md5-cache/net-misc/crossbar-17.9.1 b/metadata/md5-cache/net-misc/crossbar-17.9.1
index 1dd78cb4dda9..eeb16b68d486 100644
--- a/metadata/md5-cache/net-misc/crossbar-17.9.1
+++ b/metadata/md5-cache/net-misc/crossbar-17.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-17.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed20454bff21a466b6e156a244a94cd7
diff --git a/metadata/md5-cache/net-misc/crossbar-18.3.1 b/metadata/md5-cache/net-misc/crossbar-18.3.1
index 427c33f71cbc..69e39d32d5fb 100644
--- a/metadata/md5-cache/net-misc/crossbar-18.3.1
+++ b/metadata/md5-cache/net-misc/crossbar-18.3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/crossbar/crossbar-18.3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d66cbe8f666ba71c3b578d1cad85bd8d
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.1 b/metadata/md5-cache/net-misc/dhcp-4.4.1
index 6539460969ff..a86fecf7981d 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.1
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.1
@@ -9,5 +9,5 @@ LICENSE=MPL-2.0 BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.1.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.1/dhcp-4.4.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=63e8f1754d829e2f6e7d0f4f9818dd72
diff --git a/metadata/md5-cache/net-misc/dhcp-4.4.2 b/metadata/md5-cache/net-misc/dhcp-4.4.2
index c4ce2d996c26..1cd89753d3c5 100644
--- a/metadata/md5-cache/net-misc/dhcp-4.4.2
+++ b/metadata/md5-cache/net-misc/dhcp-4.4.2
@@ -10,5 +10,5 @@ LICENSE=MPL-2.0 BSD SSLeay GPL-2
 RDEPEND=client? ( kernel_linux? ( ipv6? ( sys-apps/iproute2 ) sys-apps/net-tools ) ) ldap? ( net-nds/openldap ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) selinux? ( sec-policy/selinux-dhcp ) vim-syntax? ( app-vim/dhcpd-syntax )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/dhcp/dhcp-4.4.2.tar.gz ftp://ftp.isc.org/isc/dhcp/4.4.2/dhcp-4.4.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f2d9f10f84f9823532cc0e1009c53362
diff --git a/metadata/md5-cache/net-misc/dmr_utils-9999 b/metadata/md5-cache/net-misc/dmr_utils-9999
index e19ae8ddfa4d..18c5182aae94 100644
--- a/metadata/md5-cache/net-misc/dmr_utils-9999
+++ b/metadata/md5-cache/net-misc/dmr_utils-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=738e1627cd837e16be3c7ea92d0b366d
diff --git a/metadata/md5-cache/net-misc/dropbear-2017.75 b/metadata/md5-cache/net-misc/dropbear-2017.75
index 6e18a40e5c8f..68bce9b80b10 100644
--- a/metadata/md5-cache/net-misc/dropbear-2017.75
+++ b/metadata/md5-cache/net-misc/dropbear-2017.75
@@ -10,5 +10,5 @@ RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( sys-libs
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2017.75.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=48215a9e66a311e667f7b7107d9636be
diff --git a/metadata/md5-cache/net-misc/dropbear-2018.76 b/metadata/md5-cache/net-misc/dropbear-2018.76
index 5780c8dbf4f4..ca2285bccd77 100644
--- a/metadata/md5-cache/net-misc/dropbear-2018.76
+++ b/metadata/md5-cache/net-misc/dropbear-2018.76
@@ -10,5 +10,5 @@ RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( sys-libs
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2018.76.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2018.76.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=20ac0825eba78d155c28ff4b58bf862b
diff --git a/metadata/md5-cache/net-misc/dropbear-2019.78 b/metadata/md5-cache/net-misc/dropbear-2019.78
index bec7bc3947e3..cfdbd72ecbd1 100644
--- a/metadata/md5-cache/net-misc/dropbear-2019.78
+++ b/metadata/md5-cache/net-misc/dropbear-2019.78
@@ -10,5 +10,5 @@ RDEPEND=!static? ( zlib? ( sys-libs/zlib ) dev-libs/libtommath ) pam? ( sys-libs
 REQUIRED_USE=pam? ( !static )
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2019.78.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c773bc27ce80a860deed99beecbea5a5
diff --git a/metadata/md5-cache/net-misc/dropbox-90.4.307 b/metadata/md5-cache/net-misc/dropbox-90.4.307
new file mode 100644
index 000000000000..35dbfe130d00
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-90.4.307
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=librsync-bundled? ( dev-util/patchelf ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+IUSE=+librsync-bundled selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 || ( dev-qt/qtgui:5[-gles2,X(-)] dev-qt/qtgui:5[-gles2,xcb(-)] ) dev-qt/qtopengl:5[-gles2] dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5[-gles2] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5[-gles2] media-libs/fontconfig media-libs/freetype virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXinerama x11-libs/libXxf86vm x11-libs/pango[X] x11-misc/wmctrl x11-themes/hicolor-icon-theme ) !librsync-bundled? ( <net-libs/librsync-2 ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/libffi-compat:6 dev-libs/popt net-misc/wget >=sys-devel/gcc-4.2.0 sys-libs/zlib sys-libs/ncurses-compat:5
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-90.4.307.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-90.4.307.tar.gz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=79ff7f79e70b06ea621a5304724d8850
diff --git a/metadata/md5-cache/net-misc/dropbox-cli-19 b/metadata/md5-cache/net-misc/dropbox-cli-19
index e3ad108b73e5..1be1279c8907 100644
--- a/metadata/md5-cache/net-misc/dropbox-cli-19
+++ b/metadata/md5-cache/net-misc/dropbox-cli-19
@@ -3,11 +3,11 @@ DESCRIPTION=Cli interface for dropbox (python), part of nautilus-dropbox
 EAPI=6
 HOMEPAGE=https://www.dropbox.com/
 IUSE=python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=net-misc/dropbox python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygpgme[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/dropbox-cli-19.py.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4506f21cd16ec1ee0fbf5c3e908f28a5
+_md5_=d9ba71a1e802acf83dbb52e806396ef9
diff --git a/metadata/md5-cache/net-misc/econnman-1.1 b/metadata/md5-cache/net-misc/econnman-1.1
deleted file mode 100644
index 38113f9f9407..000000000000
--- a/metadata/md5-cache/net-misc/econnman-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/efl[X,connman] dev-python/python-efl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-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://download.enlightenment.org/rel/apps/econnman/econnman-1.1.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2b73465bf80b2d42a168c6d993d780a4
diff --git a/metadata/md5-cache/net-misc/econnman-1.1-r1 b/metadata/md5-cache/net-misc/econnman-1.1-r1
new file mode 100644
index 000000000000..92a06e1f5da7
--- /dev/null
+++ b/metadata/md5-cache/net-misc/econnman-1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_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_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/efl[X,connman] python_single_target_python3_6? ( dev-python/python-efl[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/python-efl[python_targets_python3_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/econnman/econnman-1.1.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=aa5b245f706bde0e2430d13cb9f588d4
diff --git a/metadata/md5-cache/net-misc/electron-cash-3.3.6-r1 b/metadata/md5-cache/net-misc/electron-cash-3.3.6-r1
index b180d2ea85ac..54580d57aa29 100644
--- a/metadata/md5-cache/net-misc/electron-cash-3.3.6-r1
+++ b/metadata/md5-cache/net-misc/electron-cash-3.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fyookball/electrum/archive/3.3.6.tar.gz -> electron-cash-3.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=32979bf48d9b8f6fb73b89707365ba47
diff --git a/metadata/md5-cache/net-misc/electron-cash-4.0.2-r1 b/metadata/md5-cache/net-misc/electron-cash-4.0.2-r1
index d7cbb1b20865..eb8e4b9ed1b8 100644
--- a/metadata/md5-cache/net-misc/electron-cash-4.0.2-r1
+++ b/metadata/md5-cache/net-misc/electron-cash-4.0.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-python/dnspython[python_targets_python3_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/fyookball/electrum/archive/4.0.2.tar.gz -> electron-cash-4.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf7a8b9edd75512e2ee0bc92679e3979
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.8 b/metadata/md5-cache/net-misc/electrum-3.3.8
index a4a0ad10d658..9567c6227152 100644
--- a/metadata/md5-cache/net-misc/electrum-3.3.8
+++ b/metadata/md5-cache/net-misc/electrum-3.3.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) python_targe
 REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://download.electrum.org/3.3.8/Electrum-3.3.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80fa733ca9772cf027c9789699c580fd
diff --git a/metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r1 b/metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r1
index d8cb65d02edb..621946c3343f 100644
--- a/metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r1
+++ b/metadata/md5-cache/net-misc/electrum-ltc-3.3.4.1-r1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/p
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/pooler/electrum-ltc/archive/3.3.4.1.tar.gz -> electrum-ltc-3.3.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb6ea2fff9ac54f9dea0645d507dec87
diff --git a/metadata/md5-cache/net-misc/exabgp-3.2.17 b/metadata/md5-cache/net-misc/exabgp-3.2.17
index 8b3ad287e637..2f018ea083dd 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f283085f08e50f5b5f34ff2a0d7507c
diff --git a/metadata/md5-cache/net-misc/exabgp-3.4.26-r1 b/metadata/md5-cache/net-misc/exabgp-3.4.26-r1
index 2a4c466ffed1..92b6f3636fdc 100644
--- a/metadata/md5-cache/net-misc/exabgp-3.4.26-r1
+++ b/metadata/md5-cache/net-misc/exabgp-3.4.26-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/Exa-Networks/exabgp/archive/3.4.26.tar.gz -> exabgp-3.4.26.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=93680416a7ee26d6713526a47fcb40d9
diff --git a/metadata/md5-cache/net-misc/exabgp-4.0.10 b/metadata/md5-cache/net-misc/exabgp-4.0.10
index 247c4cb622bb..8756fe363611 100644
--- a/metadata/md5-cache/net-misc/exabgp-4.0.10
+++ b/metadata/md5-cache/net-misc/exabgp-4.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_6 )
 SLOT=0
 SRC_URI=https://github.com/Exa-Networks/exabgp/archive/4.0.10.tar.gz -> exabgp-4.0.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d54a4a9d285512a808b2165e0b92f3be
diff --git a/metadata/md5-cache/net-misc/felix-3.1.3 b/metadata/md5-cache/net-misc/felix-3.1.3
index 826be23c2566..9b4765d2384d 100644
--- a/metadata/md5-cache/net-misc/felix-3.1.3
+++ b/metadata/md5-cache/net-misc/felix-3.1.3
@@ -10,5 +10,5 @@ RDEPEND=net-firewall/ipset bird? ( net-misc/bird )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectcalico/felix/archive/3.1.3.tar.gz -> felix-3.1.3.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz https://github.com/Azure/go-autorest/archive/58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz -> github.com-Azure-go-autorest-58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/containernetworking/cni/archive/137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz -> github.com-containernetworking-cni-137b4975ecab6e1f0c24c1e3c228a50a3cfba75e.tar.gz https://github.com/coreos/etcd/archive/c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz -> github.com-coreos-etcd-c23606781f63d09917a1e7abfcefeb337a9608ea.tar.gz https://github.com/davecgh/go-spew/archive/782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz -> github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz https://github.com/dgrijalva/jwt-go/archive/01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz -> github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/emicklei/go-restful/archive/777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz -> github.com-emicklei-go-restful-777bb3f19bcafe2575ffb2a3e46af92509ae9594.tar.gz https://github.com/emicklei/go-restful-swagger12/archive/dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz -> github.com-emicklei-go-restful-swagger12-dcef7f55730566d41eae5db10e7d6981829720f6.tar.gz https://github.com/ghodss/yaml/archive/0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz -> github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz https://github.com/go-ini/ini/archive/06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz -> github.com-go-ini-ini-06f5f3d67269ccec1fe5fe4134ba6e982984f7f5.tar.gz https://github.com/go-openapi/jsonpointer/archive/46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz -> github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz https://github.com/go-openapi/jsonreference/archive/13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz -> github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz https://github.com/go-openapi/spec/archive/6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz -> github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz https://github.com/go-openapi/swag/archive/1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz -> github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz https://github.com/gogo/protobuf/archive/342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz -> github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/btree/archive/7d79101e329e5a3adf994758c578dab82b90c017.tar.gz -> github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz https://github.com/google/gofuzz/archive/44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz -> github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/gophercloud/gophercloud/archive/2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz -> github.com-gophercloud-gophercloud-2bf16b94fdd9b01557c4d076e567fe5cbbe5a961.tar.gz https://github.com/gregjones/httpcache/archive/787624de3eb7bd915c329cba748687a3b22666a6.tar.gz -> github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz https://github.com/gxed/eventfd/archive/80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz -> github.com-gxed-eventfd-80a92cca79a8041496ccc9dd773fcb52a57ec6f9.tar.gz https://github.com/gxed/GoEndian/archive/0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz -> github.com-gxed-GoEndian-0f5c6873267e5abf306ffcdfcfa4bf77517ef4a7.tar.gz https://github.com/hashicorp/golang-lru/archive/a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz -> github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz https://github.com/howeyc/gopass/archive/bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz -> github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz https://github.com/imdario/mergo/archive/6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz -> github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz https://github.com/ipfs/go-log/archive/b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz -> github.com-ipfs-go-log-b9df188d0fae32d69c1a519fa81741668a12f55a.tar.gz https://github.com/jbenet/go-reuseport/archive/7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz -> github.com-jbenet-go-reuseport-7eed93a5b50b20c209baefe9fafa53c3d965a33c.tar.gz https://github.com/jbenet/go-sockaddr/archive/2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz -> github.com-jbenet-go-sockaddr-2e7ea655c10e4d4d73365f0f073b81b39cb08ee1.tar.gz https://github.com/json-iterator/go/archive/36b14963da70d11297d313183d7e6388c8510e1e.tar.gz -> github.com-json-iterator-go-36b14963da70d11297d313183d7e6388c8510e1e.tar.gz https://github.com/juju/ratelimit/archive/5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz -> github.com-juju-ratelimit-5b9ff866471762aa2ab2dced63c9fb6f53921342.tar.gz https://github.com/kardianos/osext/archive/ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz -> github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/mailru/easyjson/archive/d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz -> github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz -> github.com-mattn-go-isatty-6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz -> github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz https://github.com/Microsoft/go-winio/archive/78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz -> github.com-Microsoft-go-winio-78439966b38d69bf38227fbf57ac8a6fee70f69a.tar.gz https://github.com/Microsoft/hcsshim/archive/34a629f78a5d50f7de07727e41a948685c45e026.tar.gz -> github.com-Microsoft-hcsshim-34a629f78a5d50f7de07727e41a948685c45e026.tar.gz https://github.com/mipearson/rfw/archive/6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz -> github.com-mipearson-rfw-6f0a6f3266ba1058df9ef0c94cda1cecd2e62852.tar.gz https://github.com/onsi/ginkgo/archive/fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz -> github.com-onsi-ginkgo-fa5fabab2a1bfbd924faf4c067d07ae414e2aedf.tar.gz https://github.com/onsi/gomega/archive/62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz -> github.com-onsi-gomega-62bff4df71bdbc266561a0caee19f0594b17c240.tar.gz https://github.com/opentracing/opentracing-go/archive/6c572c00d1830223701e155de97408483dfcd14a.tar.gz -> github.com-opentracing-opentracing-go-6c572c00d1830223701e155de97408483dfcd14a.tar.gz https://github.com/pborman/uuid/archive/ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz -> github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz https://github.com/peterbourgon/diskv/archive/5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz -> github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz -> github.com-projectcalico-libcalico-go-0417ab6e1ea49be2abb978df365b25f20fdb3c6f.tar.gz https://github.com/projectcalico/typha/archive/5374e9f32bde159a4aa19c821618920f491004be.tar.gz -> github.com-projectcalico-typha-5374e9f32bde159a4aa19c821618920f491004be.tar.gz https://github.com/prometheus/client_golang/archive/967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz -> github.com-prometheus-client_golang-967789050ba94deca04a5e84cce8ad472ce313c1.tar.gz https://github.com/prometheus/client_model/archive/6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz -> github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz https://github.com/prometheus/common/archive/7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz -> github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz https://github.com/prometheus/procfs/archive/f98634e408857669d61064b283c4cde240622865.tar.gz -> github.com-prometheus-procfs-f98634e408857669d61064b283c4cde240622865.tar.gz https://github.com/PuerkitoBio/purell/archive/8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz -> github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz https://github.com/PuerkitoBio/urlesc/archive/5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz -> github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz https://github.com/satori/go.uuid/archive/f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz -> github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz https://github.com/sirupsen/logrus/archive/d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz -> github.com-sirupsen-logrus-d682213848ed68c0a260ca37d6dd5ace8423f5ba.tar.gz https://github.com/spf13/pflag/archive/9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz -> github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz https://github.com/vishvananda/netlink/archive/dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz -> github.com-vishvananda-netlink-dc00cf9d5c07f9a1e0ccb307443b2194ca1aaacb.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/whyrusleeping/go-logging/archive/0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz -> github.com-whyrusleeping-go-logging-0457bb6b88fc1973573aaf6b5145d8d3ae972390.tar.gz https://github.com/golang/crypto/archive/ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz -> github.com-golang-crypto-ab813273cd59e1333f7ae7bff5d027d4aadf528c.tar.gz https://github.com/golang/net/archive/66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz -> github.com-golang-net-66aacef3dd8a676686c7ae3716979581e8b03c47.tar.gz https://github.com/golang/oauth2/archive/a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz -> github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz https://github.com/golang/sys/archive/88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz -> github.com-golang-sys-88d2dcc510266da9f7f8c7f34e1940716cab5f5c.tar.gz https://github.com/golang/text/archive/4ee4af566555f5fbe026368b75596286a312663a.tar.gz -> github.com-golang-text-4ee4af566555f5fbe026368b75596286a312663a.tar.gz https://github.com/golang/appengine/archive/b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz -> github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz https://github.com/google/go-genproto/archive/09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz -> github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz https://github.com/grpc/grpc-go/archive/5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz -> github.com-grpc-grpc-go-5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/go-inf/inf/archive/3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz -> github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/api/archive/a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz -> github.com-kubernetes-api-a315a049e7a93e5455f7fefce1ba136d85054687.tar.gz https://github.com/kubernetes/apimachinery/archive/40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz -> github.com-kubernetes-apimachinery-40eaf68ee1889b1da1c528b1a075ecfe94e66837.tar.gz https://github.com/kubernetes/client-go/archive/82aa063804cf055e16e8911250f888bc216e8b61.tar.gz -> github.com-kubernetes-client-go-82aa063804cf055e16e8911250f888bc216e8b61.tar.gz https://github.com/kubernetes/kube-openapi/archive/0c329704159e3b051aafac400b15baacf2a94a04.tar.gz -> github.com-kubernetes-kube-openapi-0c329704159e3b051aafac400b15baacf2a94a04.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=38433d7e4c34ce525f37136a4086f717
diff --git a/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1 b/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1
index 02d8b16a5fb8..ac706bdc7ef6 100644
--- a/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1
+++ b/metadata/md5-cache/net-misc/geoipupdate-4.0.3-r1
@@ -9,4 +9,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/maxmind/geoipupdate/archive/v4.0.3.tar.gz -> geoipupdate-4.0.3.tar.gz https://files.adjust.com/geoipupdate-vendor-4.0.3.tar
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b
-_md5_=d1ad5381fb5f83ddd0ac8923b2a84c89
+_md5_=fe04e5a032493427cc5b260597cda85c
diff --git a/metadata/md5-cache/net-misc/geomyidae-0.32.2 b/metadata/md5-cache/net-misc/geomyidae-0.32.2
index 992c8e12ebee..3f3726e7cac3 100644
--- a/metadata/md5-cache/net-misc/geomyidae-0.32.2
+++ b/metadata/md5-cache/net-misc/geomyidae-0.32.2
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=ftp://bitreich.org/releases/geomyidae/geomyidae-v0.32.2.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=db5099a2d4e555784f6c7367a1ed2212
diff --git a/metadata/md5-cache/net-misc/geomyidae-0.34 b/metadata/md5-cache/net-misc/geomyidae-0.34
index f94cead50d11..ac0e3f28c248 100644
--- a/metadata/md5-cache/net-misc/geomyidae-0.34
+++ b/metadata/md5-cache/net-misc/geomyidae-0.34
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=ftp://bitreich.org/releases/geomyidae/geomyidae-v0.34.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=34cb232148180cb73e1346e3c2c037c1
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 c22e1324489c..c3717a9bdb2a 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_6(-)?,-python_single_target_
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=979ab61294470257608c817f21d257fd
diff --git a/metadata/md5-cache/net-misc/gns3-gui-2.1.21 b/metadata/md5-cache/net-misc/gns3-gui-2.1.21
index 2d1df03f66bb..1a430c759876 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-2.1.21
+++ b/metadata/md5-cache/net-misc/gns3-gui-2.1.21
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/jsonschema-2.6.0[python_targets_python3_6(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-gui/archive/v2.1.21.tar.gz -> gns3-gui-2.1.21.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ac64d147ecdde7ee5845dfc731982191
diff --git a/metadata/md5-cache/net-misc/gns3-server-2.1.21 b/metadata/md5-cache/net-misc/gns3-server-2.1.21
index 41f0152989ef..ddfd1d4d0242 100644
--- a/metadata/md5-cache/net-misc/gns3-server-2.1.21
+++ b/metadata/md5-cache/net-misc/gns3-server-2.1.21
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/aiohttp-2.3.3[python_targets_python3_6(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GNS3/gns3-server/archive/v2.1.21.tar.gz -> gns3-server-2.1.21.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2a0606fc2a1fc9973931a009375acb70
diff --git a/metadata/md5-cache/net-misc/gofish-1.2 b/metadata/md5-cache/net-misc/gofish-1.2
index 311eb68decbf..aa31dd8f95ca 100644
--- a/metadata/md5-cache/net-misc/gofish-1.2
+++ b/metadata/md5-cache/net-misc/gofish-1.2
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/gofish/gofish-1.2.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e52db77ce16c9735eb6c1275cc358e40
diff --git a/metadata/md5-cache/net-misc/gsutil-4.41 b/metadata/md5-cache/net-misc/gsutil-4.41
index 74e7bbd0afda..8702d3c2a5cf 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.41
+++ b/metadata/md5-cache/net-misc/gsutil-4.41
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.41.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4981bd6d3e59c52a3ec40f5ad231bfd1
diff --git a/metadata/md5-cache/net-misc/gsutil-4.45 b/metadata/md5-cache/net-misc/gsutil-4.45
index 72765fa6d99c..f066ef923186 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.45
+++ b/metadata/md5-cache/net-misc/gsutil-4.45
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.45.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4981bd6d3e59c52a3ec40f5ad231bfd1
diff --git a/metadata/md5-cache/net-misc/gsutil-4.47 b/metadata/md5-cache/net-misc/gsutil-4.47
index 7a3ae4bb26ed..df5136d186fb 100644
--- a/metadata/md5-cache/net-misc/gsutil-4.47
+++ b/metadata/md5-cache/net-misc/gsutil-4.47
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://commondatastorage.googleapis.com/pub/gsutil_4.47.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d68bb412c1dce9f2df9045c312ca6899
diff --git a/metadata/md5-cache/net-misc/httpie-1.0.3 b/metadata/md5-cache/net-misc/httpie-1.0.3
index 74c7a99c42a1..98a5e4b9a713 100644
--- a/metadata/md5-cache/net-misc/httpie-1.0.3
+++ b/metadata/md5-cache/net-misc/httpie-1.0.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jakubroztocil/httpie/archive/1.0.3.tar.gz -> httpie-1.0.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6b8ae1444ef73852e96e808ffd9b7e69
diff --git a/metadata/md5-cache/net-misc/icecast-2.4.4 b/metadata/md5-cache/net-misc/icecast-2.4.4
index 767ef9208d86..318ffbeb0fe5 100644
--- a/metadata/md5-cache/net-misc/icecast-2.4.4
+++ b/metadata/md5-cache/net-misc/icecast-2.4.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 dev-libs/libxslt media-libs/libogg media-libs/libvorbis kate? ( media-libs/libkate ) logrotate? ( app-admin/logrotate ) speex? ( media-libs/speex ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theora? ( media-libs/libtheora ) yp? ( net-misc/curl )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/icecast/icecast-2.4.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=68b74c011b14400d8ae3a183324316a7
diff --git a/metadata/md5-cache/net-misc/ices-2.0.2 b/metadata/md5-cache/net-misc/ices-2.0.2
index 7fb9fa574c38..33b28f427784 100644
--- a/metadata/md5-cache/net-misc/ices-2.0.2
+++ b/metadata/md5-cache/net-misc/ices-2.0.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2 >=media-libs/libshout-2 >=media-libs/libvorbis-1
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ices/ices-2.0.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2b0117a2c3924d41ade68cbb0135ed1b
diff --git a/metadata/md5-cache/net-misc/ip-sentinel-0.12 b/metadata/md5-cache/net-misc/ip-sentinel-0.12
index b2221e6e9925..41fa1d14227b 100644
--- a/metadata/md5-cache/net-misc/ip-sentinel-0.12
+++ b/metadata/md5-cache/net-misc/ip-sentinel-0.12
@@ -6,5 +6,5 @@ KEYWORDS=x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/ip-sentinel/ip-sentinel-0.12.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=207f1bc94d2af2fcc78c12881115e810
diff --git a/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2 b/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
index 7cfb25dd3cdc..af65bd0672bc 100644
--- a/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
+++ b/metadata/md5-cache/net-misc/ipsorcery-2.0.9-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install
 DEPEND=gtk? ( dev-libs/glib:2= x11-libs/gtk+:2= )
 DESCRIPTION=Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=gtk
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=gtk? ( dev-libs/glib:2= x11-libs/gtk+:2= )
 SLOT=0
 SRC_URI=mirror://gentoo/ipsorc-2.0.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ccd579c96399a2b9954d01a4c8d650d5
+_md5_=778ddfb7a9d0701c083492082a16556b
diff --git a/metadata/md5-cache/net-misc/iputils-20190709 b/metadata/md5-cache/net-misc/iputils-20190709
index 36614fb3f8b8..4a5fab021d2e 100644
--- a/metadata/md5-cache/net-misc/iputils-20190709
+++ b/metadata/md5-cache/net-misc/iputils-20190709
@@ -11,4 +11,4 @@ RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute6? ( !
 SLOT=0
 SRC_URI=https://github.com/iputils/iputils/archive/s20190709.tar.gz -> iputils-20190709.tar.gz https://dev.gentoo.org/~whissi/dist/iputils/iputils-manpages-20190709.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=158a8f9a383f001aaee4ece04fe3d57b
+_md5_=24ca62db34b95d19a0c564842bbe5bcd
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index 897d7f3fa356..125d26f8191e 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=arping? ( !net-misc/arping ) rarpd? ( !net-misc/rarpd ) traceroute6? ( !net-analyzer/traceroute ) !static? ( caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) ipv6? ( ssl? ( gcrypt? ( dev-libs/libgcrypt:0= ) !gcrypt? ( nettle? ( dev-libs/nettle ) !nettle? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) ) ) ) nls? ( sys-devel/gettext ) )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d9328066d6c38ad3f66168fcb6174c1c
+_md5_=a81bb353be4e69541c84e4372f0eda8e
diff --git a/metadata/md5-cache/net-misc/kafka-bin-1.1.1 b/metadata/md5-cache/net-misc/kafka-bin-1.1.1
index 0ce5d5e203c0..8b39d4d9fff1 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-1.1.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-1.1.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/1.1.1/kafka_2.12-1.1.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45cdfb11f0ada80396d57f7800f0684e
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.0.1 b/metadata/md5-cache/net-misc/kafka-bin-2.0.1
index 941708b18009..6578f2766b6e 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.0.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.0.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.0.1/kafka_2.12-2.0.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.1.0 b/metadata/md5-cache/net-misc/kafka-bin-2.1.0
index d88e00df0767..b1b39a523d6e 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.1.0
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.1.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.1.0/kafka_2.12-2.1.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.1.1 b/metadata/md5-cache/net-misc/kafka-bin-2.1.1
index 27f8aa9b7b5b..08a7d1db7081 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.1.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.1.1/kafka_2.12-2.1.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.2.0 b/metadata/md5-cache/net-misc/kafka-bin-2.2.0
index f7d73bf79b30..932f4bb9e71d 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.2.0
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.2.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.2.0/kafka_2.12-2.2.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.2.1 b/metadata/md5-cache/net-misc/kafka-bin-2.2.1
index c669845be1ab..7cb1e4a485cf 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.2.1
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.2.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.2.1/kafka_2.12-2.2.1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/kafka-bin-2.3.0 b/metadata/md5-cache/net-misc/kafka-bin-2.3.0
index 436aa8ceaa28..1fb2c1d7b092 100644
--- a/metadata/md5-cache/net-misc/kafka-bin-2.3.0
+++ b/metadata/md5-cache/net-misc/kafka-bin-2.3.0
@@ -10,5 +10,5 @@ RDEPEND=virtual/jre:1.8
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://apache/kafka/2.3.0/kafka_2.12-2.3.0.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=99ede0339b6a3cd0befc8ea54b042ee8
diff --git a/metadata/md5-cache/net-misc/kea-1.7.3 b/metadata/md5-cache/net-misc/kea-1.7.3
index e65d88a81ad9..fe4ff4ca69d0 100644
--- a/metadata/md5-cache/net-misc/kea-1.7.3
+++ b/metadata/md5-cache/net-misc/kea-1.7.3
@@ -10,5 +10,5 @@ LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.7.3.tar.gz ftp://ftp.isc.org/isc/kea/1.7.3/kea-1.7.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c925c22c25b00493b1de9763e308407c
diff --git a/metadata/md5-cache/net-misc/kea-1.7.4 b/metadata/md5-cache/net-misc/kea-1.7.4
index 4312604bbeb4..4b78a8274b3e 100644
--- a/metadata/md5-cache/net-misc/kea-1.7.4
+++ b/metadata/md5-cache/net-misc/kea-1.7.4
@@ -10,5 +10,5 @@ LICENSE=ISC BSD SSLeay GPL-2
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/kea/kea-1.7.4.tar.gz ftp://ftp.isc.org/isc/kea/1.7.4/kea-1.7.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=493fa7c5957a4a1e86244ae43e0d0168
diff --git a/metadata/md5-cache/net-misc/kea-9999 b/metadata/md5-cache/net-misc/kea-9999
index fb7907c2a49c..f1e3b0ae8c51 100644
--- a/metadata/md5-cache/net-misc/kea-9999
+++ b/metadata/md5-cache/net-misc/kea-9999
@@ -9,5 +9,5 @@ LICENSE=ISC BSD SSLeay GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/boost:= dev-cpp/gtest dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c925c22c25b00493b1de9763e308407c
diff --git a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1 b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
index 5783729fb196..ea1b9727867e 100644
--- a/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
+++ b/metadata/md5-cache/net-misc/lksctp-tools-1.0.18-r1
@@ -10,4 +10,4 @@ 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11fa0f5c0d6f76e5944c2cde4a91ff33
+_md5_=325e0f15330556daf4f648752eaf7cf7
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.3 b/metadata/md5-cache/net-misc/lldpd-1.0.3
index 3bc5756accc0..238ccbc0d0e5 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.3
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.3
@@ -11,5 +11,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b52e41c9457336d45f37eada34b5a03f
diff --git a/metadata/md5-cache/net-misc/lldpd-1.0.4 b/metadata/md5-cache/net-misc/lldpd-1.0.4
index 2da3fbba753b..9895296ab15b 100644
--- a/metadata/md5-cache/net-misc/lldpd-1.0.4
+++ b/metadata/md5-cache/net-misc/lldpd-1.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=graph? ( doc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://media.luffy.cx/files/lldpd/lldpd-1.0.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4351827c0714991718e7df230abfad57
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.14 b/metadata/md5-cache/net-misc/memcached-1.5.14
index 0a2c2f4b0d7b..3917886cbe17 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.14
+++ b/metadata/md5-cache/net-misc/memcached-1.5.14
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) se
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.14.tar.gz https://www.memcached.org/files/old/memcached-1.5.14.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e1f8ea62c0f4ef045e6677c0e1e06aa5
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.19 b/metadata/md5-cache/net-misc/memcached-1.5.19
index f3c1f22a2734..31be432925ad 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.19
+++ b/metadata/md5-cache/net-misc/memcached-1.5.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) se
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.19.tar.gz https://www.memcached.org/files/old/memcached-1.5.19.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b8d2501f0bdc5fc6ca2089b4c608f2ef
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.20 b/metadata/md5-cache/net-misc/memcached-1.5.20
index 870ef4367a4e..a7ba963afdfe 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.20
+++ b/metadata/md5-cache/net-misc/memcached-1.5.20
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) se
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.20.tar.gz https://www.memcached.org/files/old/memcached-1.5.20.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b8d2501f0bdc5fc6ca2089b4c608f2ef
diff --git a/metadata/md5-cache/net-misc/minidlna-1.2.1-r1 b/metadata/md5-cache/net-misc/minidlna-1.2.1-r1
index dacb0228c536..27e64b09f1df 100644
--- a/metadata/md5-cache/net-misc/minidlna-1.2.1-r1
+++ b/metadata/md5-cache/net-misc/minidlna-1.2.1-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/jpeg:0= libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) zeroconf? ( net-dns/avahi:= ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/minidlna/minidlna/1.2.1/minidlna-1.2.1.tar.gz https://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=beae1d8fcf0957663add390b1ba168d2
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r1 b/metadata/md5-cache/net-misc/networkmanager-1.18.4-r1
index e6480acaea3c..9081b9a11611 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r1
+++ b/metadata/md5-cache/net-misc/networkmanager-1.18.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.4.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=072d0f015dfce8b4161f2a5f8037362f
+_md5_=983eedf6685ff22d5dbcb289e4bb9cd9
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3 b/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3
index 365bbfb89822..0cbde7d6b26b 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3
+++ b/metadata/md5-cache/net-misc/networkmanager-1.18.4-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbus-python[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
+DEPEND=>=sys-apps/dbus-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) json? ( >=dev-libs/jansson-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=sys-kernel/linux-headers-3.18 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( || ( ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/pygobject:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/dbus-python[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) virtual/pkgconfig
 DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.18/NetworkManager-1.18.4.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f000e20961882ccc1b26b956c07f8b65
+_md5_=fffa0d8a13620151c4a62fd8444136ae
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p13 b/metadata/md5-cache/net-misc/ntp-4.2.8_p13
index fede4b984e6a..51c441a98f19 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p13
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p13
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p13-manpages.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a301344315bb5485c971fc3cc63e502f
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r1 b/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r1
index 88a6ea08d36d..ec515a3cabd9 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r1
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r1
@@ -10,5 +10,5 @@ PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p13-manpages.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=13a015198b6a3b523f58c26820bf7817
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r2 b/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r2
index 6afc5fff7a1c..3350c67d3758 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r2
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p13-r2
@@ -12,4 +12,4 @@ RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[thr
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p13-manpages.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cbbaaee546a951b87ddfa8ac8f9777b3
+_md5_=3cda8b395d88684cbae56bb007034778
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.4 b/metadata/md5-cache/net-misc/ntpsec-1.1.4
index cc1492a1e092..2cf079f0ad8c 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.4
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 ) nist? ( rc
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=58b400ca2afc75b529a63d93e596c5b3
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.6 b/metadata/md5-cache/net-misc/ntpsec-1.1.6
index b8f1a2d0b08f..b63c5b55325e 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.1.6
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 ) nist? ( rc
 RESTRICT=mirror
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=f7f06cd5ced976c0a330e3b455a4d099
diff --git a/metadata/md5-cache/net-misc/nyx-2.0.4 b/metadata/md5-cache/net-misc/nyx-2.0.4
index c4a3a269f9b9..78978ebca9b7 100644
--- a/metadata/md5-cache/net-misc/nyx-2.0.4
+++ b/metadata/md5-cache/net-misc/nyx-2.0.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nyx/nyx-2.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=245f04ec55aa7b0feaf28cbd7620db45
diff --git a/metadata/md5-cache/net-misc/nyx-2.1.0 b/metadata/md5-cache/net-misc/nyx-2.1.0
index d82c1f2a7425..961dc3f4f2ed 100644
--- a/metadata/md5-cache/net-misc/nyx-2.1.0
+++ b/metadata/md5-cache/net-misc/nyx-2.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/nyx/nyx-2.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae44562e058e6bca30c1a5f61013e32e
diff --git a/metadata/md5-cache/net-misc/omniORB-4.1.4-r2 b/metadata/md5-cache/net-misc/omniORB-4.1.4-r2
index 4784a17f5fc7..e341db2c19b4 100644
--- a/metadata/md5-cache/net-misc/omniORB-4.1.4-r2
+++ b/metadata/md5-cache/net-misc/omniORB-4.1.4-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A robust, high-performance CORBA 2 ORB
 EAPI=5
 HOMEPAGE=http://omniorb.sourceforge.net/
-IUSE=doc ssl static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc ssl static-libs +python_single_target_python2_7
 KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=LGPL-2 GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ssl? ( >=dev-libs/openssl-0.9.6b:0= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/omniorb/omniORB-4.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d2e82e617edf14ff9e36a573b9df1a29
diff --git a/metadata/md5-cache/net-misc/omniORB-4.2.2 b/metadata/md5-cache/net-misc/omniORB-4.2.2
index 7fefa9b4f10f..d1ec08fc8c77 100644
--- a/metadata/md5-cache/net-misc/omniORB-4.2.2
+++ b/metadata/md5-cache/net-misc/omniORB-4.2.2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A robust, high-performance CORBA 2 ORB
 EAPI=7
 HOMEPAGE=http://omniorb.sourceforge.net/
-IUSE=doc ipv6 ssl 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
+IUSE=doc ipv6 ssl python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2 GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ssl? ( dev-libs/openssl:0= )
-REQUIRED_USE=^^ ( 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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/omniorb/omniORB-4.2.2.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9c638563a24e2ace1274dcbabb68ae0e
diff --git a/metadata/md5-cache/net-misc/openntpd-6.0_p1 b/metadata/md5-cache/net-misc/openntpd-6.0_p1
index 2cedd54ce14d..6d83db6107b6 100644
--- a/metadata/md5-cache/net-misc/openntpd-6.0_p1
+++ b/metadata/md5-cache/net-misc/openntpd-6.0_p1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=!<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] libressl? ( >=dev-libs/libressl-2.3.2 ) selinux? ( sec-policy/selinux-ntp )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-6.0p1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=47b877d46ca19931c5cfff8470ca0961
diff --git a/metadata/md5-cache/net-misc/openntpd-6.2_p3 b/metadata/md5-cache/net-misc/openntpd-6.2_p3
index 5eab0ae55108..0d4e1c1a2dbd 100644
--- a/metadata/md5-cache/net-misc/openntpd-6.2_p3
+++ b/metadata/md5-cache/net-misc/openntpd-6.2_p3
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=!<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] libressl? ( dev-libs/libressl:0= ) selinux? ( sec-policy/selinux-ntp )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenNTPD/openntpd-6.2p3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=dc34692eedbd0fec0c2d0c82d97b76d2
diff --git a/metadata/md5-cache/net-misc/openssh-7.5_p1-r4 b/metadata/md5-cache/net-misc/openssh-7.5_p1-r4
index 06f814717fa7..d458cf732f54 100644
--- a/metadata/md5-cache/net-misc/openssh-7.5_p1-r4
+++ b/metadata/md5-cache/net-misc/openssh-7.5_p1-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.5p1.tar.gz mirror://gentoo/openssh-7.4_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.5p1-hpnssh14v12.tar.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.5p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-10.2/openssh-7.5p1+x509-10.2.diff.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c71774ecafe1dd774bc2d3a3441ea00c
diff --git a/metadata/md5-cache/net-misc/openssh-7.7_p1-r9 b/metadata/md5-cache/net-misc/openssh-7.7_p1-r9
index adef4f9c5baa..d22cb7e2cfa0 100644
--- a/metadata/md5-cache/net-misc/openssh-7.7_p1-r9
+++ b/metadata/md5-cache/net-misc/openssh-7.7_p1-r9
@@ -11,5 +11,5 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.7p1.tar.gz https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-patches-1.2.tar.xz sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-sctp-1.1.patch.xz ) hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-hpnssh14v15-gentoo2.patch.xz ) X509? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.7p1-x509-11.3.1.patch.xz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=678eccdbd5e6d8d021f7161c7812fa83
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b53777fe12ab64c1a1646fa9190a3aba
diff --git a/metadata/md5-cache/net-misc/openssh-7.9_p1-r4 b/metadata/md5-cache/net-misc/openssh-7.9_p1-r4
index bda8a9cb5250..18683b642eab 100644
--- a/metadata/md5-cache/net-misc/openssh-7.9_p1-r4
+++ b/metadata/md5-cache/net-misc/openssh-7.9_p1-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.9p1.tar.gz https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.9p1-patches-1.0.tar.xz sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-7.9p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/hpnssh/HPN-SSH%2014v16%207.8p1/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v16%207.8p1/openssh-7_8_P1-hpn-AES-CTR-14.16.diff ) X509? ( https://roumenpetrov.info/openssh/x509-11.6/openssh-7.9p1+x509-11.6.diff.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c9058a5382cdeae96eed469cbee04157
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ce5dba9c22faaba366ba0f3b20abdfcb
diff --git a/metadata/md5-cache/net-misc/openssh-8.0_p1-r4 b/metadata/md5-cache/net-misc/openssh-8.0_p1-r4
index f8e3b0f4815d..d48abdbe4dcb 100644
--- a/metadata/md5-cache/net-misc/openssh-8.0_p1-r4
+++ b/metadata/md5-cache/net-misc/openssh-8.0_p1-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.0p1.tar.gz sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-8.0p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/hpnssh/HPN-SSH%2014v16%207.8p1/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v16%207.8p1/openssh-7_8_P1-hpn-AES-CTR-14.16.diff ) X509? ( https://dev.gentoo.org/~whissi/dist/openssh/openssh-8.0p1+x509-12.1-gentoo.diff.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61bb167648cba01e8a1cfc3b6059be68
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=301dc2a37f43364c3100b88e4b7f7114
diff --git a/metadata/md5-cache/net-misc/openssh-8.1_p1-r2 b/metadata/md5-cache/net-misc/openssh-8.1_p1-r2
index dfe3a14485a4..0be30000f19b 100644
--- a/metadata/md5-cache/net-misc/openssh-8.1_p1-r2
+++ b/metadata/md5-cache/net-misc/openssh-8.1_p1-r2
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig sys-devel/autoconf >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare pretend test
-DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/os-headers
+DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] ) virtual/os-headers
 DESCRIPTION=Port of OpenBSD's free SSH release
 EAPI=7
 HOMEPAGE=https://www.openssh.com/
 IUSE=abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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=BSD GPL-2
-RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
+RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl(+)] ) bindist? ( net-libs/ldns[-ecdsa,ssl(+)] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( !libressl? ( || ( ( >=dev-libs/openssl-1.0.1:0[bindist=] <dev-libs/openssl-1.1.0:0[bindist=] ) >=dev-libs/openssl-1.1.0g:0[bindist=] ) dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl ) test? ( ssl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-8.1p1.tar.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.1_p1-glibc-2.31-patches.tar.xz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-8.1p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-AES-CTR-14.20.diff mirror://sourceforge/hpnssh/HPN-SSH%2014v20%208.1p1/openssh-8_1_P1-hpn-PeakTput-14.20.diff ) X509? ( https://roumenpetrov.info/openssh/x509-12.3/openssh-8.1p1+x509-12.3.diff.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=77b9b4ad7fca3f5efc29cebbf6bbc069
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1be83137fc5879038542ffc19c2df3df
diff --git a/metadata/md5-cache/net-misc/pimpd-0.8 b/metadata/md5-cache/net-misc/pimpd-0.8
index c4393e01e12f..6dc6d6160826 100644
--- a/metadata/md5-cache/net-misc/pimpd-0.8
+++ b/metadata/md5-cache/net-misc/pimpd-0.8
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=RFC1413-compliant identd server supporting masqueraded connections
 EAPI=4
-HOMEPAGE=https://gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://cats.meow.at/~peter/pimpd_0.8.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8f94b35981ae4355617f8dbed5a64f39
+_md5_=acb5b774372ad454ca454c00f722e8fc
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.1-r1 b/metadata/md5-cache/net-misc/pssh-2.3.1-r1
deleted file mode 100644
index 7eb68828c6d0..000000000000
--- a/metadata/md5-cache/net-misc/pssh-2.3.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=net-misc/openssh !net-misc/putty dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=PSSH provides parallel versions of OpenSSH and related tools
-EAPI=5
-HOMEPAGE=https://code.google.com/p/parallel-ssh/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=net-misc/openssh !net-misc/putty python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aaf9896fe64e675d7f3815ec71fd3d76
diff --git a/metadata/md5-cache/net-misc/pssh-2.3.1-r2 b/metadata/md5-cache/net-misc/pssh-2.3.1-r2
new file mode 100644
index 000000000000..2e79300b9877
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pssh-2.3.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=net-misc/openssh !net-misc/putty python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=PSSH provides parallel versions of OpenSSH and related tools
+EAPI=5
+HOMEPAGE=https://code.google.com/p/parallel-ssh/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=net-misc/openssh !net-misc/putty python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c7ad008d7abcdfa5291e43c6eac2be12
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2 b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2
deleted file mode 100644
index ff4e480f27c4..000000000000
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-2.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/librsvg-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/notify2-0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-1.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/requests-2.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/setproctitle-1.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/zeroconf-0.17[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( ( media-video/ffmpeg[encode,faac,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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-sound/pulseaudio python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio
-EAPI=5
-HOMEPAGE=https://github.com/masmu/pulseaudio-dlna
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-2.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/librsvg-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/notify2-0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-1.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/requests-2.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/setproctitle-1.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/zeroconf-0.17[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( ( media-video/ffmpeg[encode,faac,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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_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
deleted file mode 100644
index 56a824e01a0b..000000000000
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-2.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/librsvg-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/notify2-0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-1.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/requests-2.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/setproctitle-1.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/zeroconf-0.17[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-sound/pulseaudio python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio
-EAPI=6
-HOMEPAGE=https://github.com/masmu/pulseaudio-dlna
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/chardet-2.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/futures-2.1.6[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/librsvg-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/lxml-3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/netifaces-0.8[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/notify2-0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/psutil-1.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/requests-2.2.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/setproctitle-1.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/zeroconf-0.17[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89f1ccd9b221d187cc8a1e32eba06c65
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114 b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
index 8f29e4c00c49..8328dfdcbcb7 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-0.6.0_pre20200114
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_6(-)?,python_t
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/masmu/pulseaudio-dlna/archive/b0db8137224f5a293329a60187365168304c3768.tar.gz -> pulseaudio-dlna-0.6.0_pre20200114.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e3f67dc2017b7e0a1fc228a032ea243a
diff --git a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999 b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
index 9cf1eeeffa25..4ca4796bbd5a 100644
--- a/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
+++ b/metadata/md5-cache/net-misc/pulseaudio-dlna-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/protobuf-python-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/docopt-0.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setproctitle-1.1.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/notify2-0.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-5.4.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/chardet-3.0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyroute2-0.3.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pychromecast-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dbus-python-1.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zeroconf-0.17.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] gnome-base/librsvg[introspection] x11-libs/gtk+:3[introspection] || ( || ( 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 ) ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=344c3cdc2e2853433c3782f4528e6bb5
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
index f86d3ff34112..f8b9cf27e5f4 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.0.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setproctitle[python_targets_python3_6(-)?,-python_single_targ
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6dd3533db7186de0c2677412ef81fcfb
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1
index 2d1c1cb71ce4..6bdf029c18a6 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a089fb190cb006f270fa73e3ccb7c11c
diff --git a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2 b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
index 01e3a3b07015..71db5617dadd 100644
--- a/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
+++ b/metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-cli/pyhoca-cli-0.6.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a089fb190cb006f270fa73e3ccb7c11c
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0 b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0
index a02eed0a8e2d..cb5c595caf39 100644
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0
+++ b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.6.1.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=152aca8bd859cbbe54d39eec6e56feef
diff --git a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1 b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
index 1ccaa5fadc7d..65ef49b90e57 100644
--- a/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
+++ b/metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pycups[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=152aca8bd859cbbe54d39eec6e56feef
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.0.2 b/metadata/md5-cache/net-misc/python-x2go-0.6.0.2
index 764831e86816..5c442745a458 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.0.2
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.0.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fbfa81963499759435a1f89fe6c29626
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.1.1 b/metadata/md5-cache/net-misc/python-x2go-0.6.1.1
index abb152fd4983..9cf2377afe89 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.1.1
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f32b42b3dc94ed4af924da67228df860
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.1.2 b/metadata/md5-cache/net-misc/python-x2go-0.6.1.2
index 4404b4410687..3843036218d0 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.1.2
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.1.2
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f32b42b3dc94ed4af924da67228df860
diff --git a/metadata/md5-cache/net-misc/python-x2go-0.6.1.3 b/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
index 70a5f5619e0a..9b127f4ea2d6 100644
--- a/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
+++ b/metadata/md5-cache/net-misc/python-x2go-0.6.1.3
@@ -11,5 +11,5 @@ RDEPEND=dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/python-x2go/python-x2go-0.6.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f32b42b3dc94ed4af924da67228df860
diff --git a/metadata/md5-cache/net-misc/pytvshows-0.2-r3 b/metadata/md5-cache/net-misc/pytvshows-0.2-r3
deleted file mode 100644
index c8366f2a1eb4..000000000000
--- a/metadata/md5-cache/net-misc/pytvshows-0.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=downloads torrents for TV shows from RSS feeds provided by ezrss.it
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/pytvshows/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pytvshows/pytvshows-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9e6199b1e50bc1fff3fb8a9ff754227
diff --git a/metadata/md5-cache/net-misc/pytvshows-0.2-r4 b/metadata/md5-cache/net-misc/pytvshows-0.2-r4
new file mode 100644
index 000000000000..1f3eafac96bf
--- /dev/null
+++ b/metadata/md5-cache/net-misc/pytvshows-0.2-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=downloads torrents for TV shows from RSS feeds provided by ezrss.it
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/pytvshows/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( dev-python/feedparser[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/pytvshows/pytvshows-0.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=120b269c48615d49602364ac2b92415e
diff --git a/metadata/md5-cache/net-misc/quagga-1.2.4 b/metadata/md5-cache/net-misc/quagga-1.2.4
index 601f1727802e..01240c5b948f 100644
--- a/metadata/md5-cache/net-misc/quagga-1.2.4
+++ b/metadata/md5-cache/net-misc/quagga-1.2.4
@@ -10,5 +10,5 @@ RDEPEND=caps? ( sys-libs/libcap ) nhrpd? ( net-dns/c-ares:0= ) protobuf? ( dev-l
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.2.4.tar.gz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c6f674b57baff79dc14a72350e0f46ec
diff --git a/metadata/md5-cache/net-misc/r8168-8.047.05 b/metadata/md5-cache/net-misc/r8168-8.047.05
index 7b62beb5d805..c54ed9481bde 100644
--- a/metadata/md5-cache/net-misc/r8168-8.047.05
+++ b/metadata/md5-cache/net-misc/r8168-8.047.05
@@ -4,10 +4,10 @@ DESCRIPTION=r8168 driver for Realtek 8111/8168 PCI-E NICs
 EAPI=7
 HOMEPAGE=https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
 IUSE=kernel_linux kernel_linux kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pacho/r8168/r8168-8.047.05.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1b26cc9676db1f0a7716fb8227f7731d
+_md5_=750de2001fe867b1355d11284b4124fc
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.14 b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.14
index 0bd806faea7d..c3f0fa6c3491 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.14
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.14
@@ -8,5 +8,5 @@ LICENSE=GPL-2 MPL-1.1
 RDEPEND=>=dev-lang/erlang-18[ssl]
 SLOT=0
 SRC_URI=https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.14/rabbitmq-server-3.6.14.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1abdb035cc27241fe6f765cc905270b2
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9 b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
index 4664908529ad..4259f1076896 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
@@ -8,5 +8,5 @@ LICENSE=GPL-2 MPL-1.1
 RDEPEND=>=dev-lang/erlang-18[ssl]
 SLOT=0
 SRC_URI=https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.9/rabbitmq-server-3.6.9.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f0dc55398761fb08d46110acb504cb9a
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.13 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.13
index b8d49c6ad235..58fb1c0f76e3 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.13
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/erlang-21.0[ssl] <dev-lang/erlang-22.0[ssl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.13/rabbitmq-server-3.7.13.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4206b5b3ff1c3f831df7184db58289a1
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.17 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.17
index 8525a1127b84..7fe18624a4fa 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.17
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.17
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/erlang-21.0[ssl] <dev-lang/erlang-23.0[ssl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.17/rabbitmq-server-3.7.17.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cabab03e146e8fe0fe9585607bfd263a
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.21 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.21
index 6c0f17697200..1a87c58c3e82 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.21
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.21
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/erlang-21.3[ssl] <dev-lang/erlang-23.0[ssl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.21/rabbitmq-server-3.7.21.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e4e83adfdf8ccf9e69fbcfead9de0711
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.0 b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.0
index 3096153078b0..8e36930bee2c 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.0
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/erlang-21.3[ssl] <dev-lang/erlang-23.0[ssl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.0/rabbitmq-server-3.8.0.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e4e83adfdf8ccf9e69fbcfead9de0711
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.1 b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.1
index 0b91e3c8b208..e17d5f9e48af 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.8.1
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.8.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/erlang-21.3[ssl] <dev-lang/erlang-23.0[ssl]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.8.1/rabbitmq-server-3.8.1.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e4e83adfdf8ccf9e69fbcfead9de0711
diff --git a/metadata/md5-cache/net-misc/radvd-2.14 b/metadata/md5-cache/net-misc/radvd-2.14
index 7c1f62373fca..025641d0ca38 100644
--- a/metadata/md5-cache/net-misc/radvd-2.14
+++ b/metadata/md5-cache/net-misc/radvd-2.14
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.14.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=16489d3c5985be664461ce6097e7419a
diff --git a/metadata/md5-cache/net-misc/radvd-2.17-r1 b/metadata/md5-cache/net-misc/radvd-2.17-r1
index e9b9c6681936..d565ebbfb3fa 100644
--- a/metadata/md5-cache/net-misc/radvd-2.17-r1
+++ b/metadata/md5-cache/net-misc/radvd-2.17-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=437d5b197bd487eef5c0c5d476431649
diff --git a/metadata/md5-cache/net-misc/radvd-2.17-r2 b/metadata/md5-cache/net-misc/radvd-2.17-r2
index 87a6f423c536..308d7ef2baed 100644
--- a/metadata/md5-cache/net-misc/radvd-2.17-r2
+++ b/metadata/md5-cache/net-misc/radvd-2.17-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a2b4d149323b4407579f75c3ff3ecb0f
diff --git a/metadata/md5-cache/net-misc/radvd-2.18 b/metadata/md5-cache/net-misc/radvd-2.18
index b54d5ae16004..5a708ab4bfff 100644
--- a/metadata/md5-cache/net-misc/radvd-2.18
+++ b/metadata/md5-cache/net-misc/radvd-2.18
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4507b8de29f5c7a72290a5fb04c5a4e3
diff --git a/metadata/md5-cache/net-misc/remmina-1.3.10 b/metadata/md5-cache/net-misc/remmina-1.3.10
index 0ea010e8b0a6..2815f6defb8d 100644
--- a/metadata/md5-cache/net-misc/remmina-1.3.10
+++ b/metadata/md5-cache/net-misc/remmina-1.3.10
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/json-glib dev-libs/libsodium:= net-libs/libsoup
 SLOT=0
 SRC_URI=https://gitlab.com/Remmina/Remmina/-/archive/v1.3.10/Remmina-v1.3.10.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a4886df4dc5890a98a3b413f794cbd7
+_md5_=7d161d23fd985cf8dc9780c1a187b64b
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 a02363b4a5a1..f0de21712f3b 100644
--- a/metadata/md5-cache/net-misc/ris-linux-0.4-r1
+++ b/metadata/md5-cache/net-misc/ris-linux-0.4-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=BINL server to doing Windows(r) RIS
 EAPI=5
 HOMEPAGE=http://oss.netfarm.it/guides/pxe.php
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=|| ( net-ftp/atftp net-ftp/tftp-hpa ) net-misc/dhcp net-fs/samba sys-boot/syslinux python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://oss.netfarm.it/guides/ris-linux-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=96bd45e647192d188b7912b94c6b204d
diff --git a/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6 b/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6
index b76ac27cf0e3..d91f2ebdfa7a 100644
--- a/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6
+++ b/metadata/md5-cache/net-misc/rwhoisd-1.5.9.6
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/arineng/rwhoisd/archive/1.5.9.6.tar.gz -> rwhoisd-1.5.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2dcb2f65aa96069a82d68eb934d6c3c3
diff --git a/metadata/md5-cache/net-misc/s3cmd-1.6.1 b/metadata/md5-cache/net-misc/s3cmd-1.6.1
index c3b518e77c40..b3c6b4b745c5 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 72b95fe4953f..eddadbc36a57 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_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=84bb9dc97e328077c7ccbb814d05a285
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.0.2 b/metadata/md5-cache/net-misc/s3cmd-2.0.2
index d3c7c7eb2043..2f88c8dc0a87 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.0.2
+++ b/metadata/md5-cache/net-misc/s3cmd-2.0.2
@@ -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_6 )
 SLOT=0
 SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=844df566913e611a2e3e2f8807026677
diff --git a/metadata/md5-cache/net-misc/samplicator-1.3.6 b/metadata/md5-cache/net-misc/samplicator-1.3.6
index 879fc8779eab..6a6dcd84794c 100644
--- a/metadata/md5-cache/net-misc/samplicator-1.3.6
+++ b/metadata/md5-cache/net-misc/samplicator-1.3.6
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic GPL-2
 SLOT=0
 SRC_URI=https://github.com/sleinen/samplicator/releases/download/v1.3.6/samplicator-1.3.6.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=5c0fa5f4dce219f5f1be9a020f35a317
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=2c34b5ba586f09b80a9f35b73ea96c41
diff --git a/metadata/md5-cache/net-misc/samplicator-1.3.8_rc1 b/metadata/md5-cache/net-misc/samplicator-1.3.8_rc1
index 2fd5f05d5fd2..e273a51432df 100644
--- a/metadata/md5-cache/net-misc/samplicator-1.3.8_rc1
+++ b/metadata/md5-cache/net-misc/samplicator-1.3.8_rc1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic GPL-2
 SLOT=0
 SRC_URI=https://github.com/sleinen/samplicator/releases/download/1.3.8rc1/samplicator-1.3.8rc1.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=dba799e2d505762bc174f14d7922b88d
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=7e94ecff936fabe76a38f68e896d5aa8
diff --git a/metadata/md5-cache/net-misc/scponly-4.8-r6 b/metadata/md5-cache/net-misc/scponly-4.8-r6
index f3b0578408eb..34945ad17039 100644
--- a/metadata/md5-cache/net-misc/scponly-4.8-r6
+++ b/metadata/md5-cache/net-misc/scponly-4.8-r6
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/sed net-misc/openssh quota? ( sys-fs/quota ) rsync? ( net-misc/
 REQUIRED_USE=|| ( sftp scp winscp rsync unison subversion )
 SLOT=0
 SRC_URI=mirror://sourceforge/scponly/scponly-4.8.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=13e15c882b357fa3301414f84600338f
diff --git a/metadata/md5-cache/net-misc/seafile-6.2.11 b/metadata/md5-cache/net-misc/seafile-6.2.11
index 63f1534dadc2..7be6c96bb098 100644
--- a/metadata/md5-cache/net-misc/seafile-6.2.11
+++ b/metadata/md5-cache/net-misc/seafile-6.2.11
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-libs/libsearpc[python_single_target_python2_7(-)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
 DESCRIPTION=File syncing and sharing software with file encryption and group sharing
 EAPI=7
 HOMEPAGE=https://github.com/haiwen/seafile/ http://www.seafile.com/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-libs/libsearpc[python_single_target_python2_7(-)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/v6.2.11.tar.gz -> seafile-6.2.11.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
-_md5_=063c63e0293d115eb835964fe3ffada7
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
+_md5_=f1ff03a3578914cf4e10d9db60558c38
diff --git a/metadata/md5-cache/net-misc/seafile-7.0.2 b/metadata/md5-cache/net-misc/seafile-7.0.2
index 4c6d3d9e67fc..c6814df369c0 100644
--- a/metadata/md5-cache/net-misc/seafile-7.0.2
+++ b/metadata/md5-cache/net-misc/seafile-7.0.2
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-libs/libsearpc[python_single_target_python2_7(-)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
 DESCRIPTION=File syncing and sharing software with file encryption and group sharing
 EAPI=7
 HOMEPAGE=https://github.com/haiwen/seafile/ http://www.seafile.com/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-libs/libsearpc[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) net-libs/libsearpc[python_single_target_python2_7(-)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/v7.0.2.tar.gz -> seafile-7.0.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
-_md5_=dd8d3c7dbf0e96ee019a93eb01a77234
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
+_md5_=dd9fc262c88cc5996b6018fb5be8ae55
diff --git a/metadata/md5-cache/net-misc/seafile-7.0.4 b/metadata/md5-cache/net-misc/seafile-7.0.4
index adafcc3d9172..14c840ab9fbc 100644
--- a/metadata/md5-cache/net-misc/seafile-7.0.4
+++ b/metadata/md5-cache/net-misc/seafile-7.0.4
@@ -1,15 +1,15 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) net-libs/libsearpc[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 >=sys-devel/automake-1.16.1-r2:1.16 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) net-libs/libsearpc[python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 >=sys-devel/automake-1.16.1-r2:1.16 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
 DESCRIPTION=File syncing and sharing software with file encryption and group sharing
 EAPI=7
 HOMEPAGE=https://github.com/haiwen/seafile/ http://www.seafile.com/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+-with-openssl-exception
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) net-libs/libsearpc[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 >=sys-devel/automake-1.16.1-r2:1.16
-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 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) net-libs/libsearpc[python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] dev-libs/glib:2 dev-libs/libevent:0 dev-libs/jansson sys-libs/zlib:0 net-misc/curl dev-libs/openssl:0 dev-db/sqlite:3 >=sys-devel/automake-1.16.1-r2:1.16
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/haiwen/seafile/archive/v7.0.4.tar.gz -> seafile-7.0.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
-_md5_=cebd6db56f5a200ba8a0fff98104216c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
+_md5_=0dc70e396df8e294881c531605652964
diff --git a/metadata/md5-cache/net-misc/seafile-7.0.5-r1 b/metadata/md5-cache/net-misc/seafile-7.0.5-r1
new file mode 100644
index 000000000000..a1145ae866d3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-7.0.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 =sys-devel/automake-1.16* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) net-libs/libsearpc[python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] dev-libs/glib:2 dev-libs/libevent dev-libs/jansson sys-libs/zlib net-misc/curl dev-libs/openssl dev-db/sqlite:3 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 )
+DESCRIPTION=File syncing and sharing software with file encryption and group sharing
+EAPI=7
+HOMEPAGE=http://www.seafile.com/ https://github.com/haiwen/seafile/
+IUSE=python_single_target_python2_7 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) net-libs/libsearpc[python_single_target_python2_7(-)?,python_single_target_python3_6(-)?] dev-libs/glib:2 dev-libs/libevent dev-libs/jansson sys-libs/zlib net-misc/curl dev-libs/openssl dev-db/sqlite:3
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/haiwen/seafile/archive/v7.0.5.tar.gz -> seafile-7.0.5.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066
+_md5_=f50c3b29a6e81c069e18a220eeaf207b
diff --git a/metadata/md5-cache/net-misc/seafile-client-7.0.5 b/metadata/md5-cache/net-misc/seafile-client-7.0.5
new file mode 100644
index 000000000000..9145aa52559c
--- /dev/null
+++ b/metadata/md5-cache/net-misc/seafile-client-7.0.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=net-libs/libsearpc ~net-misc/seafile-7.0.5 dev-libs/libevent dev-libs/jansson dev-libs/openssl 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] ) test? ( dev-qt/qttest:5 )
+DESCRIPTION=Seafile desktop client
+EAPI=7
+HOMEPAGE=http://www.seafile.com/ https://github.com/haiwen/seafile-client/
+IUSE=shibboleth test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=net-libs/libsearpc ~net-misc/seafile-7.0.5 dev-libs/libevent dev-libs/jansson dev-libs/openssl 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] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/haiwen/seafile-client/archive/v7.0.5.tar.gz -> seafile-client-7.0.5.tar.gz
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=66a6473983bb2d5752d2c5fcc2795820
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r2 b/metadata/md5-cache/net-misc/sks-1.1.6-r2
index 6dc21a571222..e76b7aa1be48 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r2
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/findlib dev-ml/camlp4 dev-ml/cryptokit:0/1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d1cbed31a62fe92ca849f68356aa9477
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r4 b/metadata/md5-cache/net-misc/sks-1.1.6-r4
index b9e0b2e0aaeb..11673767b790 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r4
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=70246936965d6c0f1a90da5e56c49d15
diff --git a/metadata/md5-cache/net-misc/sks-1.1.6-r5 b/metadata/md5-cache/net-misc/sks-1.1.6-r5
index bd9271eaec60..8dd59954bcdf 100644
--- a/metadata/md5-cache/net-misc/sks-1.1.6-r5
+++ b/metadata/md5-cache/net-misc/sks-1.1.6-r5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= sys-libs/db:5.
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://bitbucket.org/skskeyserver/sks-keyserver/downloads/sks-1.1.6.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ccbfcb0138079802aa3f94f0b3326f63
diff --git a/metadata/md5-cache/net-misc/sobby-0.4.8-r1 b/metadata/md5-cache/net-misc/sobby-0.4.8-r1
index 4e5bcc5d3996..599c1cc61366 100644
--- a/metadata/md5-cache/net-misc/sobby-0.4.8-r1
+++ b/metadata/md5-cache/net-misc/sobby-0.4.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-cpp/glibmm-2.6 >=dev-libs/libsigc++-2.0 >=dev-libs/gmp-4.1.4:0 >=dev-cpp/libxmlpp-2.6:2.6 >=net-libs/net6-1.3.12 >=net-libs/obby-0.4.6[zeroconf=]
 SLOT=0
 SRC_URI=http://releases.0x539.de/sobby/sobby-0.4.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4fdfd7457f744965d3352785909a3daa
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 83c59c40966f..ea0b91ac7f2f 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_6(-)?,-python_single_target
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2918f0f92c5a9c2be7d1e52ac572067
diff --git a/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1 b/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
index 4578c5037b25..66f2cd427a4d 100644
--- a/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
+++ b/metadata/md5-cache/net-misc/socket-burst-dampener-1.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/zmedico/socket-burst-dampener/archive/v1.2.1.tar.gz -> socket-burst-dampener-1.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2bd7c084dea4a62972f633df6b8e50e6
diff --git a/metadata/md5-cache/net-misc/spread-4.4.1 b/metadata/md5-cache/net-misc/spread-4.4.1
index 8e439f0f883f..308a1bc1329d 100644
--- a/metadata/md5-cache/net-misc/spread-4.4.1
+++ b/metadata/md5-cache/net-misc/spread-4.4.1
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=Spread-1.0
 SLOT=0
 SRC_URI=mirror://gentoo/spread-src-4.4.1.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b72081808897c49b1782265c6ab4c87c
diff --git a/metadata/md5-cache/net-misc/spread-5.0.1 b/metadata/md5-cache/net-misc/spread-5.0.1
index 1cc52e1e82da..70c78bfda7be 100644
--- a/metadata/md5-cache/net-misc/spread-5.0.1
+++ b/metadata/md5-cache/net-misc/spread-5.0.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Spread-1.0
 SLOT=0
 SRC_URI=mirror://gentoo/spread-src-5.0.1.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4103e0c4137b00b45bf97bbed0a555d6
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 0c2f452af1a1..2094ced706ff 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	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b8e4ffe427d30f3679742850961e91d8
diff --git a/metadata/md5-cache/net-misc/sstp-client-1.0.12 b/metadata/md5-cache/net-misc/sstp-client-1.0.12
index e573ee3f4729..2da8bb82674e 100644
--- a/metadata/md5-cache/net-misc/sstp-client-1.0.12
+++ b/metadata/md5-cache/net-misc/sstp-client-1.0.12
@@ -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.12.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d08ee2d3c054162bdda266c5e69594fb
diff --git a/metadata/md5-cache/net-misc/stargazer-2.408-r1 b/metadata/md5-cache/net-misc/stargazer-2.408-r1
index 349b86ba4b92..c28c82df73ce 100644
--- a/metadata/md5-cache/net-misc/stargazer-2.408-r1
+++ b/metadata/md5-cache/net-misc/stargazer-2.408-r1
@@ -10,5 +10,5 @@ RDEPEND=module_config_rpcconfig? ( dev-libs/expat dev-libs/xmlrpc-c[abyss,cxx] )
 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_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=76bae4821d6f6ee109b1358e4ca49f2b
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=33bfddb344ba84bbabbfdd5cac341e45
diff --git a/metadata/md5-cache/net-misc/streamlink-1.3.0 b/metadata/md5-cache/net-misc/streamlink-1.3.0
deleted file mode 100644
index 5876171e9a31..000000000000
--- a/metadata/md5-cache/net-misc/streamlink-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/recommonmark[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/freezegun[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/python-singledispatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >dev-python/requests-2.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/urllib3-1.23[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/isodate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/websocket-client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycountry[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pycryptodome-3.4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
-EAPI=7
-HOMEPAGE=https://streamlink.github.io/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 Apache-2.0
-RDEPEND=virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/python-singledispatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >dev-python/requests-2.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/urllib3-1.23[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/isodate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/websocket-client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycountry[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pycryptodome-3.4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-video/rtmpdump virtual/ffmpeg python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/streamlink/streamlink/releases/download/1.3.0/streamlink-1.3.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ded5b1ae49465a3d6699547e5968aa86
diff --git a/metadata/md5-cache/net-misc/streamlink-1.3.0-r1 b/metadata/md5-cache/net-misc/streamlink-1.3.0-r1
new file mode 100644
index 000000000000..befa4596029e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/streamlink-1.3.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/docutils[python_targets_python3_6(-)] dev-python/recommonmark[python_targets_python3_6(-)] ) test? ( dev-python/mock[python_targets_python3_6(-)] dev-python/requests-mock[python_targets_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)] dev-python/freezegun[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( doc? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/docutils[python_targets_python3_7(-)] dev-python/recommonmark[python_targets_python3_7(-)] ) test? ( dev-python/mock[python_targets_python3_7(-)] dev-python/requests-mock[python_targets_python3_7(-)] dev-python/pytest[python_targets_python3_7(-)] dev-python/freezegun[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( virtual/python-futures[python_targets_python3_6(-)] virtual/python-singledispatch[python_targets_python3_6(-)] >dev-python/requests-2.21.0[python_targets_python3_6(-)] >=dev-python/urllib3-1.23[python_targets_python3_6(-)] dev-python/isodate[python_targets_python3_6(-)] dev-python/websocket-client[python_targets_python3_6(-)] dev-python/pycountry[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( virtual/python-futures[python_targets_python3_7(-)] virtual/python-singledispatch[python_targets_python3_7(-)] >dev-python/requests-2.21.0[python_targets_python3_7(-)] >=dev-python/urllib3-1.23[python_targets_python3_7(-)] dev-python/isodate[python_targets_python3_7(-)] dev-python/websocket-client[python_targets_python3_7(-)] dev-python/pycountry[python_targets_python3_7(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_7(-)] )
+DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
+EAPI=7
+HOMEPAGE=https://streamlink.github.io/
+IUSE=doc test python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2 Apache-2.0
+RDEPEND=python_single_target_python3_6? ( virtual/python-futures[python_targets_python3_6(-)] virtual/python-singledispatch[python_targets_python3_6(-)] >dev-python/requests-2.21.0[python_targets_python3_6(-)] >=dev-python/urllib3-1.23[python_targets_python3_6(-)] dev-python/isodate[python_targets_python3_6(-)] dev-python/websocket-client[python_targets_python3_6(-)] dev-python/pycountry[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( virtual/python-futures[python_targets_python3_7(-)] virtual/python-singledispatch[python_targets_python3_7(-)] >dev-python/requests-2.21.0[python_targets_python3_7(-)] >=dev-python/urllib3-1.23[python_targets_python3_7(-)] dev-python/isodate[python_targets_python3_7(-)] dev-python/websocket-client[python_targets_python3_7(-)] dev-python/pycountry[python_targets_python3_7(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_7(-)] ) media-video/rtmpdump virtual/ffmpeg python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/streamlink/streamlink/releases/download/1.3.0/streamlink-1.3.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d9892784fde04c8f1cb306c3ac66879d
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index 9805e2066749..a29f3ba407cb 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -1,15 +1,15 @@
-BDEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/docutils[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/recommonmark[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/requests-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/freezegun[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_6? ( doc? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/docutils[python_targets_python3_6(-)] dev-python/recommonmark[python_targets_python3_6(-)] ) test? ( dev-python/mock[python_targets_python3_6(-)] dev-python/requests-mock[python_targets_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)] dev-python/freezegun[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( doc? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/docutils[python_targets_python3_7(-)] dev-python/recommonmark[python_targets_python3_7(-)] ) test? ( dev-python/mock[python_targets_python3_7(-)] dev-python/requests-mock[python_targets_python3_7(-)] dev-python/pytest[python_targets_python3_7(-)] dev-python/freezegun[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/python-singledispatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >dev-python/requests-2.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/urllib3-1.23[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/isodate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/websocket-client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycountry[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pycryptodome-3.4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
+DEPEND=python_single_target_python3_6? ( virtual/python-futures[python_targets_python3_6(-)] virtual/python-singledispatch[python_targets_python3_6(-)] >dev-python/requests-2.21.0[python_targets_python3_6(-)] >=dev-python/urllib3-1.23[python_targets_python3_6(-)] dev-python/isodate[python_targets_python3_6(-)] dev-python/websocket-client[python_targets_python3_6(-)] dev-python/pycountry[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( virtual/python-futures[python_targets_python3_7(-)] virtual/python-singledispatch[python_targets_python3_7(-)] >dev-python/requests-2.21.0[python_targets_python3_7(-)] >=dev-python/urllib3-1.23[python_targets_python3_7(-)] dev-python/isodate[python_targets_python3_7(-)] dev-python/websocket-client[python_targets_python3_7(-)] dev-python/pycountry[python_targets_python3_7(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_7(-)] )
 DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
 EAPI=7
 HOMEPAGE=https://streamlink.github.io/
-IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc test python_single_target_python3_6 python_single_target_python3_7
 LICENSE=BSD-2 Apache-2.0
 PROPERTIES=live
-RDEPEND=virtual/python-futures[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/python-singledispatch[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >dev-python/requests-2.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/urllib3-1.23[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/isodate[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/websocket-client[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycountry[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pycryptodome-3.4.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-video/rtmpdump virtual/ffmpeg python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-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 )
+RDEPEND=python_single_target_python3_6? ( virtual/python-futures[python_targets_python3_6(-)] virtual/python-singledispatch[python_targets_python3_6(-)] >dev-python/requests-2.21.0[python_targets_python3_6(-)] >=dev-python/urllib3-1.23[python_targets_python3_6(-)] dev-python/isodate[python_targets_python3_6(-)] dev-python/websocket-client[python_targets_python3_6(-)] dev-python/pycountry[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( virtual/python-futures[python_targets_python3_7(-)] virtual/python-singledispatch[python_targets_python3_7(-)] >dev-python/requests-2.21.0[python_targets_python3_7(-)] >=dev-python/urllib3-1.23[python_targets_python3_7(-)] dev-python/isodate[python_targets_python3_7(-)] dev-python/websocket-client[python_targets_python3_7(-)] dev-python/pycountry[python_targets_python3_7(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_7(-)] ) media-video/rtmpdump virtual/ffmpeg python_single_target_python3_6? ( dev-lang/python:3.6[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[xml(+),threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ded5b1ae49465a3d6699547e5968aa86
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d9892784fde04c8f1cb306c3ac66879d
diff --git a/metadata/md5-cache/net-misc/stunnel-5.50-r1 b/metadata/md5-cache/net-misc/stunnel-5.50-r1
index 00417f206da7..192d23d54575 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.50-r1
+++ b/metadata/md5-cache/net-misc/stunnel-5.50-r1
@@ -10,5 +10,5 @@ RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0= ) libre
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.50.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.50.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.50.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.50.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.50.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.50.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.50.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6a5f05c6ccecfdeda738185ff08d1eee
diff --git a/metadata/md5-cache/net-misc/stunnel-5.55 b/metadata/md5-cache/net-misc/stunnel-5.55
index 946e6f1c51aa..258c46a641e1 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.55
+++ b/metadata/md5-cache/net-misc/stunnel-5.55
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/openssl:0= tcpd? ( sys-apps/tcp-wrappers ) stunnel3? ( dev-lang
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.55.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.55.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.55.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.55.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.55.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.55.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.55.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=36da165fbf359fd70fc4b9696b234408
diff --git a/metadata/md5-cache/net-misc/switzerland-0.1.0 b/metadata/md5-cache/net-misc/switzerland-0.1.0
index 8e5b0780cb59..a16483bfadd6 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94eb16a8bf40e653fa2f9ba32237f780
diff --git a/metadata/md5-cache/net-misc/teamviewer-15.2.2756 b/metadata/md5-cache/net-misc/teamviewer-15.2.2756
new file mode 100644
index 000000000000..6098926a2e1e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/teamviewer-15.2.2756
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=sys-apps/sed virtual/pkgconfig
+DESCRIPTION=All-In-One Solution for Remote Access and Support over the Internet
+EAPI=6
+HOMEPAGE=https://www.teamviewer.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=TeamViewer MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 sys-apps/dbus !sys-auth/consolekit
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.2.2756_amd64.tar.xz ) x86? ( https://dl.tvcdn.de/download/linux/version_15x/teamviewer_15.2.2756_i386.tar.xz )
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b417efcb1dbe72bb87b6a9604804308d
diff --git a/metadata/md5-cache/net-misc/throttle-1.2-r1 b/metadata/md5-cache/net-misc/throttle-1.2-r1
index f05c4eb97021..27bafb8f680b 100644
--- a/metadata/md5-cache/net-misc/throttle-1.2-r1
+++ b/metadata/md5-cache/net-misc/throttle-1.2-r1
@@ -2,10 +2,10 @@ BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16
 DEFINED_PHASES=prepare
 DESCRIPTION=Bandwidth limiting pipe
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grobian/throttle-1.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e21b7fa46fa8e6a8d0c635471512cefa
+_md5_=393568ba748a08013aeceedf292c5b46
diff --git a/metadata/md5-cache/net-misc/trackma-0.7.4-r1 b/metadata/md5-cache/net-misc/trackma-0.7.4-r1
index e791a1c9cd17..5183d1921b87 100644
--- a/metadata/md5-cache/net-misc/trackma-0.7.4-r1
+++ b/metadata/md5-cache/net-misc/trackma-0.7.4-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-process/lsof inotify? ( dev-python/pyinotify ) ncurses? ( dev-python
 REQUIRED_USE=|| ( cli gtk ncurses qt5 ) || ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23e340d15cfdaa605ee1bc16ce99a0bc
diff --git a/metadata/md5-cache/net-misc/trackma-0.8.2 b/metadata/md5-cache/net-misc/trackma-0.8.2
index 2f26248fd77e..b71d32585a6b 100644
--- a/metadata/md5-cache/net-misc/trackma-0.8.2
+++ b/metadata/md5-cache/net-misc/trackma-0.8.2
@@ -10,5 +10,5 @@ RDEPEND=sys-process/lsof inotify? ( dev-python/pyinotify ) ncurses? ( dev-python
 REQUIRED_USE=|| ( cli gtk ncurses qt5 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/z411/trackma/archive/v0.8.2.tar.gz -> trackma-0.8.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb4d2acc9f1dc0462819d8bf3b0efff2
diff --git a/metadata/md5-cache/net-misc/trackma-9999 b/metadata/md5-cache/net-misc/trackma-9999
index d9db939cde95..e09563a40245 100644
--- a/metadata/md5-cache/net-misc/trackma-9999
+++ b/metadata/md5-cache/net-misc/trackma-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-process/lsof inotify? ( dev-python/pyinotify ) ncurses? ( dev-python/urwid[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) gtk? ( dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),gui,widgets] dev-python/pillow[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=|| ( cli gtk ncurses qt5 ) || ( python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7ed27c886791e89795807a79f12941f9
diff --git a/metadata/md5-cache/net-misc/ubridge-0.9.14 b/metadata/md5-cache/net-misc/ubridge-0.9.14
index 713c148e7951..f26d231b51f1 100644
--- a/metadata/md5-cache/net-misc/ubridge-0.9.14
+++ b/metadata/md5-cache/net-misc/ubridge-0.9.14
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-libs/libpcap dev-libs/iniparser:=
 SLOT=0
 SRC_URI=https://github.com/GNS3/ubridge/archive/v0.9.14.tar.gz -> ubridge-0.9.14.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=88e911b792fbeb127a9d4e05a3dbae72
diff --git a/metadata/md5-cache/net-misc/ubridge-0.9.16 b/metadata/md5-cache/net-misc/ubridge-0.9.16
index e346ff707595..24837fc07313 100644
--- a/metadata/md5-cache/net-misc/ubridge-0.9.16
+++ b/metadata/md5-cache/net-misc/ubridge-0.9.16
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=net-libs/libpcap dev-libs/iniparser:4=
 SLOT=0
 SRC_URI=https://github.com/GNS3/ubridge/archive/v0.9.16.tar.gz -> ubridge-0.9.16.tar.gz
-_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=fcaps	9445d60c1eb084a91c38ef4c070b2f16	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8772e1e982ec82e131b097924195d069
diff --git a/metadata/md5-cache/net-misc/uftp-3.7.1 b/metadata/md5-cache/net-misc/uftp-3.7.1
deleted file mode 100644
index 87c3c39cd748..000000000000
--- a/metadata/md5-cache/net-misc/uftp-3.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Encrypted UDP based FTP with multicast
-EAPI=6
-HOMEPAGE=http://www.tcnj.edu/~bush/uftp.html
-IUSE=+server ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=http://www.tcnj.edu/~bush/downloads/uftp-3.7.1.tar
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=78e9f4b7dad8faae0641bfb721ae82e5
diff --git a/metadata/md5-cache/net-misc/uftp-4.10.1 b/metadata/md5-cache/net-misc/uftp-4.10.1
new file mode 100644
index 000000000000..c5986c99398b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/uftp-4.10.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
+DESCRIPTION=Encrypted UDP based FTP with multicast
+EAPI=7
+HOMEPAGE=http://uftp-multicast.sourceforge.net/
+IUSE=+server ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3-with-openssl-exception
+RDEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.sourceforge.net/uftp-multicast/source-tar/uftp-4.10.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=15d5cf4427208e41efc11442b74b079d
diff --git a/metadata/md5-cache/net-misc/uftp-4.9.4 b/metadata/md5-cache/net-misc/uftp-4.9.4
deleted file mode 100644
index 77ce636cb202..000000000000
--- a/metadata/md5-cache/net-misc/uftp-4.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=ssl? ( dev-libs/openssl:0= )
-DESCRIPTION=Encrypted UDP based FTP with multicast
-EAPI=6
-HOMEPAGE=http://uftp-multicast.sourceforge.net/
-IUSE=+server ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ssl? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=mirror://sourceforge/uftp-multicast/uftp-4.9.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=29e21cf551ad4eb7effeee6a4701bdbd
diff --git a/metadata/md5-cache/net-misc/uftp-4.9.5 b/metadata/md5-cache/net-misc/uftp-4.9.5
deleted file mode 100644
index 17d2465cebde..000000000000
--- a/metadata/md5-cache/net-misc/uftp-4.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
-DESCRIPTION=Encrypted UDP based FTP with multicast
-EAPI=6
-HOMEPAGE=http://uftp-multicast.sourceforge.net/
-IUSE=+server ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/uftp-multicast/uftp-4.9.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fadb404a3e479228d2c46f0d2509d3ab
diff --git a/metadata/md5-cache/net-misc/uftp-4.9.8 b/metadata/md5-cache/net-misc/uftp-4.9.8
deleted file mode 100644
index 417298b9c5df..000000000000
--- a/metadata/md5-cache/net-misc/uftp-4.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
-DESCRIPTION=Encrypted UDP based FTP with multicast
-EAPI=6
-HOMEPAGE=http://uftp-multicast.sourceforge.net/
-IUSE=+server ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ssl? ( dev-libs/openssl:0=[-bindist] )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/uftp-multicast/uftp-4.9.8.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fce2c9150be2e524af97c9e178e61e31
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2-r4 b/metadata/md5-cache/net-misc/vde-2.3.2-r4
index 5bb37db68345..e5b4e60ef149 100644
--- a/metadata/md5-cache/net-misc/vde-2.3.2-r4
+++ b/metadata/md5-cache/net-misc/vde-2.3.2-r4
@@ -3,12 +3,12 @@ DEPEND=pcap? ( net-libs/libpcap ) python? ( python_single_target_python2_7? ( >=
 DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
 EAPI=6
 HOMEPAGE=http://vde.sourceforge.net/
-IUSE=pcap python selinux ssl libressl static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=pcap python selinux ssl libressl static-libs +python_single_target_python2_7
 KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=pcap? ( net-libs/libpcap ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/vde/vde2-2.3.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5e30641b3dbca6e321823dd8044da1fb
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 bd11ec093560..481925180bca 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0572b3de827f6c0e8a4392b73fd32f53
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 02c3ee642cd0..1b95b4fb3b96 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-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/Fi
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76e965dfd154aca74c7f4d41ed32b60b
diff --git a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3 b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3
index 551522cfe336..e09329198448 100644
--- a/metadata/md5-cache/net-misc/x2goserver-4.1.0.3
+++ b/metadata/md5-cache/net-misc/x2goserver-4.1.0.3
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/perl:= dev-perl/Capture-Tiny dev-perl/Config-Simple dev-perl/Fi
 REQUIRED_USE=|| ( postgres sqlite )
 SLOT=0
 SRC_URI=http://code.x2go.org/releases/source/x2goserver/x2goserver-4.1.0.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0945365bd530affae0da4b6c45897484
diff --git a/metadata/md5-cache/net-misc/yandex-disk-0.1.5.978_p1 b/metadata/md5-cache/net-misc/yandex-disk-0.1.5.978_p1
index 0a2bb2dc2ca4..367d11da36af 100644
--- a/metadata/md5-cache/net-misc/yandex-disk-0.1.5.978_p1
+++ b/metadata/md5-cache/net-misc/yandex-disk-0.1.5.978_p1
@@ -8,5 +8,5 @@ LICENSE=YDSLA
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/yandex-disk-0.1.5.978-1.fedora.x86_64.rpm ) x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/yandex-disk-0.1.5.978-1.fedora.i386.rpm )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9697265928bdf1711d5154bd10111d82
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1270 b/metadata/md5-cache/net-misc/you-get-0.4.1270
index e16638cc73da..4a0efc0a1ff0 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1270
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1270
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/archive/v0.4.1270.tar.gz -> you-get-0.4.1270.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d51c6121f26326a823dff0cdf578f838
diff --git a/metadata/md5-cache/net-misc/you-get-0.4.1355 b/metadata/md5-cache/net-misc/you-get-0.4.1355
index 6602901de004..c90d3fa92831 100644
--- a/metadata/md5-cache/net-misc/you-get-0.4.1355
+++ b/metadata/md5-cache/net-misc/you-get-0.4.1355
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/soimort/you-get/archive/v0.4.1355.tar.gz -> you-get-0.4.1355.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fd5daa11a388d608b07167360e282179
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 c8b828e0a0fe..c6c095a2f64d 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=118637bc6d3c6c81ff1e005c643d6455
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2020.01.24 b/metadata/md5-cache/net-misc/youtube-dl-2020.01.24
index 34ba98d2e7ee..bc998f0b48b1 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2020.01.24
+++ b/metadata/md5-cache/net-misc/youtube-dl-2020.01.24
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://youtube-dl.org/downloads/2020.01.24/youtube-dl-2020.01.24.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ea2afd731d98934b88397b293ab2482c
diff --git a/metadata/md5-cache/net-misc/youtube-dl-99999999 b/metadata/md5-cache/net-misc/youtube-dl-99999999
index 3bd3414d934e..fe36dbda0c0c 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-99999999
+++ b/metadata/md5-cache/net-misc/youtube-dl-99999999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3bb0d065ec767c51835fda69ceb0a482
diff --git a/metadata/md5-cache/net-nds/389-ds-base-1.3.6.8-r1 b/metadata/md5-cache/net-nds/389-ds-base-1.3.6.8-r1
index b9058c8bef11..3ea5c5c0e580 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-1.3.6.8-r1
+++ b/metadata/md5-cache/net-nds/389-ds-base-1.3.6.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=sys-libs/db:4.8 >=dev-libs/cyrus-sasl-2.1.19 >=net-analyzer/net-snmp-5.1.2 >=dev-libs/icu-3.4:= >=dev-libs/nss-3.22[utils] dev-libs/nspr >=dev-libs/svrcore-4.1.2 dev-libs/openssl:0= dev-libs/libpcre:3 >=dev-perl/perl-mozldap-1.5.3 dev-perl/NetAddr-IP net-nds/openldap sys-libs/pam sys-libs/zlib kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( sec-policy/selinux-dirsrv ) virtual/perl-Time-Local virtual/perl-MIME-Base64
 SLOT=0
 SRC_URI=http://www.port389.org/sources/389-ds-base-1.3.6.8.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bbfe88d0845796f78fb756240ecc167e
diff --git a/metadata/md5-cache/net-nds/389-ds-base-9999 b/metadata/md5-cache/net-nds/389-ds-base-9999
index f611c666d3e9..af938e216ac0 100644
--- a/metadata/md5-cache/net-nds/389-ds-base-9999
+++ b/metadata/md5-cache/net-nds/389-ds-base-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=sys-libs/db:4.8 >=dev-libs/cyrus-sasl-2.1.19 >=net-analyzer/net-snmp-5.1.2 >=dev-libs/icu-3.4:= >=dev-libs/nss-3.22[utils] dev-libs/nspr >=dev-libs/svrcore-4.1.2 dev-libs/openssl:0= dev-libs/libpcre:3 >=dev-perl/perl-mozldap-1.5.3 dev-perl/NetAddr-IP net-nds/openldap sys-libs/pam sys-libs/zlib dev-libs/libevent dev-util/cmocka kerberos? ( >=app-crypt/mit-krb5-1.7-r100[openldap] ) selinux? ( sec-policy/selinux-dirsrv ) virtual/perl-Time-Local virtual/perl-MIME-Base64
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=305e1fa94319c0ab47ef4ec7d766649f
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index 0969907a877d..911ced701e34 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 7dae6c22f010..a103692f5770 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 2e2524aaf1ab..80c0f3be59bb 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0815b47f8b5d44946c5cb7ae79e24a31
diff --git a/metadata/md5-cache/net-nds/nsscache-0.31 b/metadata/md5-cache/net-nds/nsscache-0.31
index f3779a3de264..bf5aee2aaf7d 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb1099b749514b83ba2a41b209545033
diff --git a/metadata/md5-cache/net-nds/nsscache-0.32 b/metadata/md5-cache/net-nds/nsscache-0.32
index 594da27ba839..94e327dc57b3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb1099b749514b83ba2a41b209545033
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.45 b/metadata/md5-cache/net-nds/openldap-2.4.45
index 57b6d5a1fcf5..34925ae6150d 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.45
+++ b/metadata/md5-cache/net-nds/openldap-2.4.45
@@ -10,5 +10,5 @@ RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_3
 REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.45.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f78f02e8db938c891714a7cb1f79d670
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.48 b/metadata/md5-cache/net-nds/openldap-2.4.48
index fbc6489a1cbe..3ad599670888 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.48
+++ b/metadata/md5-cache/net-nds/openldap-2.4.48
@@ -11,5 +11,5 @@ REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.48.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c4e31cd915a691404a87bb35f57c7c38
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 5d8c264e274e..75da8206621c 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 68a2a45cc3c0..101530be81a2 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_6(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://codezen.org/static/canto-curses-0.9.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ed2a30c56c26f6c9ad46b31bf7776d24
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 39089f263819..b9d1b420c709 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_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://codezen.org/static/canto-daemon-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=219b3687663c2ab0d922b6213bcc2c25
diff --git a/metadata/md5-cache/net-news/liferea-1.12.3 b/metadata/md5-cache/net-news/liferea-1.12.3
index 8d9d60170b3e..cb0b018b641a 100644
--- a/metadata/md5-cache/net-news/liferea-1.12.3
+++ b/metadata/md5-cache/net-news/liferea-1.12.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-db/sqlite-3.7.0:3 >=dev-libs/glib-2.28.0:2 dev-libs/gobject-introspection dev-libs/json-glib >=dev-libs/libpeas-1.0.0[gtk,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.42:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 >=x11-libs/pango-1.4.0 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-db/sqlite-3.7.0:3 >=dev-libs/glib-2.28.0:2 dev-libs/gobject-introspection dev-libs/json-glib >=dev-libs/libpeas-1.0.0[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.42:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 >=x11-libs/pango-1.4.0 dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
 EAPI=6
 HOMEPAGE=https://lzone.de/liferea/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-db/sqlite-3.7.0:3 >=dev-libs/glib-2.28.0:2 dev-libs/gobject-introspection dev-libs/json-glib >=dev-libs/libpeas-1.0.0[gtk,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.42:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 >=x11-libs/pango-1.4.0
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-db/sqlite-3.7.0:3 >=dev-libs/glib-2.28.0:2 dev-libs/gobject-introspection dev-libs/json-glib >=dev-libs/libpeas-1.0.0[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 gnome-base/gsettings-desktop-schemas >=net-libs/libsoup-2.42:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 >=x11-libs/pango-1.4.0
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.3/liferea-1.12.3.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b7756a67e0481621f7126f2fcce7c58
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fafc232e4c08fba2875c02aed3c2c13d
diff --git a/metadata/md5-cache/net-news/liferea-1.12.7 b/metadata/md5-cache/net-news/liferea-1.12.7
deleted file mode 100644
index cf4f2a4e9b96..000000000000
--- a/metadata/md5-cache/net-news/liferea-1.12.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
-EAPI=6
-HOMEPAGE=https://lzone.de/liferea/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango
-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/lwindolf/liferea/releases/download/v1.12.7/liferea-1.12.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d8e36e15282dd0778fa8589384f63c9
diff --git a/metadata/md5-cache/net-news/liferea-1.12.7-r1 b/metadata/md5-cache/net-news/liferea-1.12.7-r1
new file mode 100644
index 000000000000..3ccdc723c706
--- /dev/null
+++ b/metadata/md5-cache/net-news/liferea-1.12.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=News Aggregator for RDF/RSS/CDF/Atom/Echo feeds
+EAPI=6
+HOMEPAGE=https://lzone.de/liferea/
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~arm ~ppc x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection dev-libs/json-glib dev-libs/libpeas[gtk,python,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] dev-libs/libxml2:2 dev-libs/libxslt gnome-base/gsettings-desktop-schemas net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/pango
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/lwindolf/liferea/releases/download/v1.12.7/liferea-1.12.7.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=438bf8b7307213d68e0e511cfb1cb3af
diff --git a/metadata/md5-cache/net-news/quiterss-0.18.12 b/metadata/md5-cache/net-news/quiterss-0.18.12
index 43a057ebeefa..96f2462cf402 100644
--- a/metadata/md5-cache/net-news/quiterss-0.18.12
+++ b/metadata/md5-cache/net-news/quiterss-0.18.12
@@ -9,4 +9,4 @@ RDEPEND=>=dev-db/sqlite-3.11.1:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultime
 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89265ded614a4cc75a74d07694da8319
+_md5_=d8b1f43712c67c04ffacdd87cc634a72
diff --git a/metadata/md5-cache/net-news/rawdog-2.22-r1 b/metadata/md5-cache/net-news/rawdog-2.22-r1
index 1b02b5a1418d..e6e57d9d57bb 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_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://offog.org/files/rawdog-2.22.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0aefb028d6b8189fd3bc1589c745c41
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 9c6851c902f2..3ebd52541d8e 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/nzbget-20.0 b/metadata/md5-cache/net-nntp/nzbget-20.0
index 1d41aaeb74af..341d6d984c24 100644
--- a/metadata/md5-cache/net-nntp/nzbget-20.0
+++ b/metadata/md5-cache/net-nntp/nzbget-20.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v20.0/nzbget-20.0-src.tar.gz -> nzbget-20.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=53b51df4d54578b564df04c5ed0b3785
diff --git a/metadata/md5-cache/net-nntp/nzbget-21.0 b/metadata/md5-cache/net-nntp/nzbget-21.0
index 14cf8850c309..ad96fce2c74c 100644
--- a/metadata/md5-cache/net-nntp/nzbget-21.0
+++ b/metadata/md5-cache/net-nntp/nzbget-21.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v21.0/nzbget-21.0-src.tar.gz -> nzbget-21.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9e0f62f8a55b0259bc90ce1201fac99a
diff --git a/metadata/md5-cache/net-nntp/nzbget-21.0_pre2302 b/metadata/md5-cache/net-nntp/nzbget-21.0_pre2302
index a4d4f8941036..0b9f429eaf30 100644
--- a/metadata/md5-cache/net-nntp/nzbget-21.0_pre2302
+++ b/metadata/md5-cache/net-nntp/nzbget-21.0_pre2302
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v21.0-r2302/nzbget-21.0-testing-r2302-src.tar.gz -> nzbget-21.0_pre2302.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9e0f62f8a55b0259bc90ce1201fac99a
diff --git a/metadata/md5-cache/net-nntp/pan-0.145 b/metadata/md5-cache/net-nntp/pan-0.145
index 973508447ee5..7930bbb8c72e 100644
--- a/metadata/md5-cache/net-nntp/pan-0.145
+++ b/metadata/md5-cache/net-nntp/pan-0.145
@@ -4,10 +4,10 @@ DESCRIPTION=A newsreader for GNOME
 EAPI=6
 HOMEPAGE=http://pan.rebelbase.com/
 IUSE=dbus gnome-keyring libnotify spell ssl
-KEYWORDS=~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
 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:0/0 >=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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0bd6128a93802c27b3ff3043f3acc00
+_md5_=497cb4422b34b87ef677979e1d85bb5a
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-2.3.9 b/metadata/md5-cache/net-nntp/sabnzbd-2.3.9
deleted file mode 100644
index 1d2537da89dc..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-2.3.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=6
-HOMEPAGE=https://sabnzbd.org/
-IUSE=+7za +rar unzip +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-arch/par2cmdline-0.4 >=dev-python/cheetah-2.0.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/cryptography[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/feedparser[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/gntp[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pythonutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/sabyenc-3.3.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-misc/wget 7za? ( app-arch/p7zip ) rar? ( || ( app-arch/unrar app-arch/rar ) ) unzip? ( >=app-arch/unzip-5.5.2 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/2.3.9/SABnzbd-2.3.9-src.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=31a3d6c9b17372cf44eaac4453d90d4b
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-2.3.9-r1 b/metadata/md5-cache/net-nntp/sabnzbd-2.3.9-r1
new file mode 100644
index 000000000000..68a8b4c4088c
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-2.3.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=6
+HOMEPAGE=https://sabnzbd.org/
+IUSE=+7za +rar unzip +python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-arch/par2cmdline-0.4 python_single_target_python2_7? ( >=dev-python/cheetah-2.0.1[python_targets_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)] dev-python/cryptography[python_targets_python2_7(-)] dev-python/feedparser[python_targets_python2_7(-)] dev-python/gntp[python_targets_python2_7(-)] dev-python/pythonutils[python_targets_python2_7(-)] >=dev-python/sabyenc-3.3.1[python_targets_python2_7(-)] ) net-misc/wget 7za? ( app-arch/p7zip ) rar? ( || ( app-arch/unrar app-arch/rar ) ) unzip? ( >=app-arch/unzip-5.5.2 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/2.3.9/SABnzbd-2.3.9-src.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=b56551f58638b3039c9cc3057039913e
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 6ec7b0da06cb..099680f939db 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.6.0 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.0
index b07e9a9e02c6..3ed14b2849b1 100644
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.0
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pypy3-5:0 ) 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:= )
+DEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-python/pypy3-5:0 ) 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:= )
 DESCRIPTION=Cross-platform Direct Connect client
 EAPI=7
 HOMEPAGE=https://airdcpp-web.github.io/
@@ -11,5 +11,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.6.0.tar.gz -> airdcpp-webclient-2.6.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b88ea31c1e664be7789f95431332956
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eb63bfbb91228181e84d4161e97de6d2
diff --git a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1 b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1
index d3d428709995..12800c173d57 100644
--- a/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1
+++ b/metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pypy3-5:0 ) 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:= )
+DEPEND=virtual/pkgconfig || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-python/pypy3-5:0 ) 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:= )
 DESCRIPTION=Cross-platform Direct Connect client
 EAPI=7
 HOMEPAGE=https://airdcpp-web.github.io/
@@ -11,5 +11,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.6.1.tar.gz -> airdcpp-webclient-2.6.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4b88ea31c1e664be7789f95431332956
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eb63bfbb91228181e84d4161e97de6d2
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 1d92127579fb..aad1d4b6c0d4 100644
--- a/metadata/md5-cache/net-p2p/amule-2.3.2-r2
+++ b/metadata/md5-cache/net-p2p/amule-2.3.2-r2
@@ -9,5 +9,5 @@ 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
 _md5_=ab3e1e9bf0ad916a691d4807977784aa
diff --git a/metadata/md5-cache/net-p2p/automatic-0.8.3 b/metadata/md5-cache/net-p2p/automatic-0.8.3
index a954f05ba128..3a5e0cae25d4 100644
--- a/metadata/md5-cache/net-p2p/automatic-0.8.3
+++ b/metadata/md5-cache/net-p2p/automatic-0.8.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libxml2:2 dev-libs/libpcre:3 net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/1100101/Automatic/archive/v0.8.3.tar.gz -> automatic-0.8.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=27baff7e3a5a297c124341444a0e26a6
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.16.3 b/metadata/md5-cache/net-p2p/bitcoind-0.16.3
index af2a5dab1b59..b872f4ce2257 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.16.3
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.16.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/lib
 RESTRICT=!test? ( test )
 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	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=348c9d16f7295d58210823dd632f509b
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.17.1 b/metadata/md5-cache/net-p2p/bitcoind-0.17.1
index 5c6f2c246cbd..3d3b1d033f0f 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.17.1
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.17.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/ef70f9b52b851c7997a9f1a0834714e3eebc1fd8.tar.gz -> bitcoin-v0.17.1.tar.gz https://bitcoinknots.org/files/0.17.x/0.17.1.knots20181229/bitcoin-0.17.1.knots20181229.patches.txz -> bitcoin-0.17.1.knots20181229.patches.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8e9908443c253d12af55a7eb49669968
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=9bcbfb2a3fccb8161d0aa78513208a77
diff --git a/metadata/md5-cache/net-p2p/bitcoind-0.18.0 b/metadata/md5-cache/net-p2p/bitcoind-0.18.0
index 94dd3579d330..7007bfe9d840 100644
--- a/metadata/md5-cache/net-p2p/bitcoind-0.18.0
+++ b/metadata/md5-cache/net-p2p/bitcoind-0.18.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/boost-1.52.0:=[threads(+)] dev-libs/libevent:= >=dev-libs/lib
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bitcoin/bitcoin/archive/2472733a24a9364e4c6233ccd04166a26a68cc65.tar.gz -> bitcoin-v0.18.0.tar.gz https://bitcoinknots.org/files/0.18.x/0.18.0.knots20190502/bitcoin-0.18.0.knots20190502.patches.txz -> bitcoin-0.18.0.knots20190502.patches.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1ca2eac2b05b066f7aac55276b5d592f
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=a2073bff63e16cb34d4982c961b50338
diff --git a/metadata/md5-cache/net-p2p/bitflu-1.50 b/metadata/md5-cache/net-p2p/bitflu-1.50
index 10254508c277..d5bc3c5e997c 100644
--- a/metadata/md5-cache/net-p2p/bitflu-1.50
+++ b/metadata/md5-cache/net-p2p/bitflu-1.50
@@ -8,5 +8,5 @@ LICENSE=Artistic-2 GPL-2
 RDEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.50.tgz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=889b9bfa262b576bd22a8e860768cc81
diff --git a/metadata/md5-cache/net-p2p/bitflu-1.51 b/metadata/md5-cache/net-p2p/bitflu-1.51
index 5f5ff6ae41cb..8f25460c9970 100644
--- a/metadata/md5-cache/net-p2p/bitflu-1.51
+++ b/metadata/md5-cache/net-p2p/bitflu-1.51
@@ -8,5 +8,5 @@ LICENSE=Artistic-2 GPL-2
 RDEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.51.tgz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cac47e55924492b44bde8bf874406c68
diff --git a/metadata/md5-cache/net-p2p/bitflu-1.52 b/metadata/md5-cache/net-p2p/bitflu-1.52
index b98e740d3ba2..1fc341177888 100644
--- a/metadata/md5-cache/net-p2p/bitflu-1.52
+++ b/metadata/md5-cache/net-p2p/bitflu-1.52
@@ -8,5 +8,5 @@ LICENSE=Artistic-2 GPL-2
 RDEPEND=dev-perl/Danga-Socket dev-perl/Sys-Syscall
 SLOT=0
 SRC_URI=http://bitflu.workaround.ch/bitflu/bitflu-1.52.tgz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cac47e55924492b44bde8bf874406c68
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 6a6c575239f6..d6d4ae333f6b 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=170855e08e82ad3b331b58501c472395
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 6d6f68033458..22ed3a327506 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
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/effigies/BitTornado/archive/ed327c4e1ebbe1fe949be81723527cfda87aeb8d.tar.gz -> BitTornado-0.4.1_p20160925.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ce1e25bbf5cf2f0cd5692e5c900451b
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.11.9 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.11.9
deleted file mode 100644
index 74c610d84d80..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.11.9.tar.gz -> cpuminer-opt-3.11.9.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4842ef9e2c2c4efb319799dbc4ec4ef1
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.12.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.12.1
new file mode 100644
index 000000000000..5c3bdf93d9cc
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.12.1
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.12.1.tar.gz -> cpuminer-opt-3.12.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4842ef9e2c2c4efb319799dbc4ec4ef1
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.12.2 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.12.2
new file mode 100644
index 000000000000..ea1c21c64ad7
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.12.2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DESCRIPTION=Optimized multi algo CPU miner
+EAPI=7
+HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
+IUSE=cpu_flags_x86_sse2 curl libressl
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=cpu_flags_x86_sse2
+SLOT=0
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.12.2.tar.gz -> cpuminer-opt-3.12.2.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4842ef9e2c2c4efb319799dbc4ec4ef1
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.15-r2 b/metadata/md5-cache/net-p2p/deluge-1.3.15-r2
deleted file mode 100644
index 553c790d1688..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-1.3.15-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=net-libs/libtorrent-rasterbar[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/intltool python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=6
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libtorrent-rasterbar[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/librsvg libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) sound? ( gtk ) libnotify? ( gtk ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ab7d0b19c1a612692a6a08b6248343a7
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.15-r3 b/metadata/md5-cache/net-p2p/deluge-1.3.15-r3
deleted file mode 100644
index 83e7c4b198a3..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-1.3.15-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=<net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/intltool
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=7
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=<net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/librsvg libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) sound? ( gtk ) libnotify? ( gtk ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9245e2e870807dd78471f9e2627326f6
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.15-r4 b/metadata/md5-cache/net-p2p/deluge-1.3.15-r4
deleted file mode 100644
index c6e25ba13661..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-1.3.15-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=<net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/intltool acct-group/deluge acct-user/deluge
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=7
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=<net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/librsvg libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) sound? ( gtk ) libnotify? ( gtk ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=47a3465d03942e53dae1d16b17e25ecd
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.15-r5 b/metadata/md5-cache/net-p2p/deluge-1.3.15-r5
new file mode 100644
index 000000000000..0f23679ff275
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.15-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python2_7(-)] ) dev-util/intltool python_single_target_python2_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/setuptools[python_targets_python2_7(-)] ) virtual/pkgconfig
+DESCRIPTION=BitTorrent client with a client/server model
+EAPI=6
+HOMEPAGE=https://deluge-torrent.org/
+IUSE=console geoip gtk libnotify sound webinterface +python_single_target_python2_7
+KEYWORDS=amd64 ~arm ~ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python2_7(-)] ) python_single_target_python2_7? ( dev-python/chardet[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)] dev-python/setproctitle[python_targets_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)] ) ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)] ) dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/pygtk-2.12[python_targets_python2_7(-)] gnome-base/librsvg libnotify? ( dev-python/notify-python[python_targets_python2_7(-)] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) sound? ( gtk ) libnotify? ( gtk ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1df772dc6cbdbe4e34c76e402c494902
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.15-r6 b/metadata/md5-cache/net-p2p/deluge-1.3.15-r6
new file mode 100644
index 000000000000..bd4be8eec559
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.15-r6
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( <net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)] ) dev-util/intltool
+DESCRIPTION=BitTorrent client with a client/server model
+EAPI=7
+HOMEPAGE=https://deluge-torrent.org/
+IUSE=console geoip gtk libnotify sound webinterface +python_single_target_python2_7
+KEYWORDS=amd64 ~arm ~ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( <net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)] dev-python/setproctitle[python_targets_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)] ) ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)] ) dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/pygtk-2.12[python_targets_python2_7(-)] gnome-base/librsvg libnotify? ( dev-python/notify-python[python_targets_python2_7(-)] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) sound? ( gtk ) libnotify? ( gtk ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=6dbe8260f1138a0113be3f48180d446e
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.15-r7 b/metadata/md5-cache/net-p2p/deluge-1.3.15-r7
new file mode 100644
index 000000000000..88d648c7926b
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.15-r7
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( <net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
+DESCRIPTION=BitTorrent client with a client/server model
+EAPI=7
+HOMEPAGE=https://deluge-torrent.org/
+IUSE=console geoip gtk libnotify sound webinterface +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( <net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)] dev-python/setproctitle[python_targets_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)] ) ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)] ) dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/pygtk-2.12[python_targets_python2_7(-)] gnome-base/librsvg libnotify? ( dev-python/notify-python[python_targets_python2_7(-)] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) sound? ( gtk ) libnotify? ( gtk ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://download.deluge-torrent.org/source/deluge-1.3.15.tar.bz2
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a37bd6e7cb59e6c5160c43360d053aa0
diff --git a/metadata/md5-cache/net-p2p/deluge-1.3.9999 b/metadata/md5-cache/net-p2p/deluge-1.3.9999
index 5167b2987516..6d3b3bbea3f3 100644
--- a/metadata/md5-cache/net-p2p/deluge-1.3.9999
+++ b/metadata/md5-cache/net-p2p/deluge-1.3.9999
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=<net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-util/intltool acct-group/deluge acct-user/deluge
+DEPEND=python_single_target_python2_7? ( <net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
 DESCRIPTION=BitTorrent client with a client/server model
 EAPI=7
 HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface +python_targets_python2_7 +python_single_target_python2_7
+IUSE=console geoip gtk libnotify sound webinterface +python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=<net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/setproctitle[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.12[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] gnome-base/librsvg libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) sound? ( gtk ) libnotify? ( gtk ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( <net-libs/libtorrent-rasterbar-1.2[python,python_targets_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)] dev-python/setproctitle[python_targets_python2_7(-)] || ( >=dev-python/twisted-16.0.0[python_targets_python2_7(-)] ( >=dev-python/twisted-core-13.0[python_targets_python2_7(-)] >=dev-python/twisted-web-13.0[python_targets_python2_7(-)] ) ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python2_7(-)] ) dev-python/pygobject:2[python_targets_python2_7(-)] >=dev-python/pygtk-2.12[python_targets_python2_7(-)] gnome-base/librsvg libnotify? ( dev-python/notify-python[python_targets_python2_7(-)] ) ) webinterface? ( dev-python/mako[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) sound? ( gtk ) libnotify? ( gtk ) ^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b30cfe3ee1fd99d63f14da1610301396
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e2e58f432def2a5816c17c5f33386da9
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r2 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r2
deleted file mode 100644
index fcbf2131fd9a..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/intltool dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] acct-group/deluge acct-user/deluge
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=7
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/rencode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] geoip? ( dev-python/geoip-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/mako[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( 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=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4bf75dbd0424b433b534f3b35a867d32
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r3 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r3
deleted file mode 100644
index 9c26db145554..000000000000
--- a/metadata/md5-cache/net-p2p/deluge-2.0.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/intltool dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] acct-group/deluge acct-user/deluge
-DESCRIPTION=BitTorrent client with a client/server model
-EAPI=7
-HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/rencode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] geoip? ( dev-python/geoip-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/mako[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( 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=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=111918df83398de6c2fc0b30582e88b3
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r4 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r4
new file mode 100644
index 000000000000..177b1a65f6eb
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r4
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_6? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/wheel[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/wheel[python_targets_python3_7(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
+DESCRIPTION=BitTorrent client with a client/server model
+EAPI=7
+HOMEPAGE=https://deluge-torrent.org/
+IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] dev-python/rencode[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)] geoip? ( dev-python/geoip-python[python_targets_python3_6(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_6(-)] ) dev-python/pygobject:3[python_targets_python3_6(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=30f39a1de3eb06ceeae303930c4ac76c
diff --git a/metadata/md5-cache/net-p2p/deluge-2.0.3-r5 b/metadata/md5-cache/net-p2p/deluge-2.0.3-r5
new file mode 100644
index 000000000000..fc7ecf837205
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/deluge-2.0.3-r5
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_6? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/wheel[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/wheel[python_targets_python3_7(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
+DESCRIPTION=BitTorrent client with a client/server model
+EAPI=7
+HOMEPAGE=https://deluge-torrent.org/
+IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] dev-python/rencode[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)] geoip? ( dev-python/geoip-python[python_targets_python3_6(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_6(-)] ) dev-python/pygobject:3[python_targets_python3_6(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=http://download.deluge-torrent.org/source/2.0/deluge-2.0.3.tar.xz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=943faa01b740b269bdafb7c8c8fc7d24
diff --git a/metadata/md5-cache/net-p2p/deluge-9999 b/metadata/md5-cache/net-p2p/deluge-9999
index 036acdbfa181..ba19dbbf152d 100644
--- a/metadata/md5-cache/net-p2p/deluge-9999
+++ b/metadata/md5-cache/net-p2p/deluge-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-util/intltool dev-python/wheel[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] acct-group/deluge acct-user/deluge
+DEPEND=python_single_target_python3_6? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/wheel[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/wheel[python_targets_python3_7(-)] ) dev-util/intltool acct-group/deluge acct-user/deluge
 DESCRIPTION=BitTorrent client with a client/server model
 EAPI=7
 HOMEPAGE=https://deluge-torrent.org/
-IUSE=console geoip gtk libnotify sound webinterface python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=console geoip gtk libnotify sound webinterface python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/distro[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/rencode[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] geoip? ( dev-python/geoip-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/mako[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( 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 )
+RDEPEND=python_single_target_python3_6? ( dev-python/chardet[python_targets_python3_6(-)] dev-python/distro[python_targets_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] dev-python/rencode[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_6(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_6(-)] geoip? ( dev-python/geoip-python[python_targets_python3_6(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_6(-)] ) dev-python/pygobject:3[python_targets_python3_6(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_6(-)] dev-python/mako[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)] dev-python/pyopenssl[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] dev-python/rencode[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=dev-python/twisted-17.1.0[crypt,python_targets_python3_7(-)] >=dev-python/zope-interface-4.4.2[python_targets_python3_7(-)] geoip? ( dev-python/geoip-python[python_targets_python3_7(-)] ) gtk? ( sound? ( dev-python/pygame[python_targets_python3_7(-)] ) dev-python/pygobject:3[python_targets_python3_7(-)] gnome-base/librsvg libnotify? ( x11-libs/libnotify ) ) net-libs/libtorrent-rasterbar[python,python_targets_python3_7(-)] dev-python/mako[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) libnotify? ( gtk ) sound? ( gtk ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=dab26f7a6f020edf578d9ccdeb5d3e98
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a6c9937b017375a5072e711162926123
diff --git a/metadata/md5-cache/net-p2p/fms-0.3.80 b/metadata/md5-cache/net-p2p/fms-0.3.80
index 3dbf4d003e49..46c58b098a1c 100644
--- a/metadata/md5-cache/net-p2p/fms-0.3.80
+++ b/metadata/md5-cache/net-p2p/fms-0.3.80
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libiconv frost? ( net-libs/mbedtls ) ssl? ( 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.80.zip
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=42502f063a6bd007652430d501c2b91b
diff --git a/metadata/md5-cache/net-p2p/fms-0.3.81 b/metadata/md5-cache/net-p2p/fms-0.3.81
index e226d0abf0b5..b91fc3096128 100644
--- a/metadata/md5-cache/net-p2p/fms-0.3.81
+++ b/metadata/md5-cache/net-p2p/fms-0.3.81
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libiconv frost? ( net-libs/mbedtls ) ssl? ( net-libs/mbedtls ) >=dev-libs/poco-1.4.3_p1 >=dev-db/sqlite-3.6.15 app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=virtual/libiconv frost? ( net-libs/mbedtls:0/12 ) ssl? ( net-libs/mbedtls:0/12 ) >=dev-libs/poco-1.4.3_p1 >=dev-db/sqlite-3.6.15 app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=A spam-resistant message board application for Freenet
 EAPI=6
-HOMEPAGE=http://freenetproject.org/tools.html
+HOMEPAGE=https://github.com/freenet/wiki/wiki/FMS
 IUSE=frost ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=virtual/libiconv frost? ( net-libs/mbedtls ) ssl? ( net-libs/mbedtls ) >=dev-libs/poco-1.4.3_p1 >=dev-db/sqlite-3.6.15
+RDEPEND=virtual/libiconv frost? ( net-libs/mbedtls:0/12 ) ssl? ( net-libs/mbedtls:0/12 ) >=dev-libs/poco-1.4.3_p1 >=dev-db/sqlite-3.6.15
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tommy/distfiles/fms-src-0.3.81.zip
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=04f596ccc40c629e1492f986907f998f
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=189a5f991674127a15054d50141ee99c
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
index 86a4be432f44..d9ecd7aa29c7 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01480.zip -> freenet-0.7.5_p1480.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f05b8f53e320fb902e318600c27c9852
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1483 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1483
index 8ce1762505b3..24910dfccf13 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1483
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1483
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01483.zip -> freenet-0.7.5_p1483.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ade8192db647ae9dc6c4a9fd8c304360
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1484 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1484
index e78b42e51789..f47f4aa0f96f 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1484
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1484
@@ -11,5 +11,5 @@ RDEPEND=>=virtual/jre-1.7 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-j
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/freenet/fred/archive/build01484.zip -> freenet-0.7.5_p1484.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=8bec7f6c38de73e04c75250ea1054aa2
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19
index e558557fae50..d2812a420088 100644
--- a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19
+++ b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-fs/fuse
 SLOT=0
 SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.19/go-ipfs_v0.4.19_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.19/go-ipfs_v0.4.19_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.19/go-ipfs_v0.4.19_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.4.19/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.4.19.bash
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ab17c9e9408a1d454c848078b07778d1
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20
index 555bf44fe0c7..b73830dafa1d 100644
--- a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20
+++ b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=sys-fs/fuse
 SLOT=0
 SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.20/go-ipfs_v0.4.20_linux-arm.tar.gz ) https://raw.githubusercontent.com/ipfs/go-ipfs/v0.4.20/misc/completion/ipfs-completion.bash -> go-ipfs-bin-0.4.20.bash
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ab17c9e9408a1d454c848078b07778d1
diff --git a/metadata/md5-cache/net-p2p/litecoind-0.10.4.0 b/metadata/md5-cache/net-p2p/litecoind-0.10.4.0
index 6590738d9c0a..089e37f69e3f 100644
--- a/metadata/md5-cache/net-p2p/litecoind-0.10.4.0
+++ b/metadata/md5-cache/net-p2p/litecoind-0.10.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT ISC GPL-2
 RDEPEND=dev-libs/boost:=[threads(+)] dev-libs/openssl:0[-bindist] logrotate? ( app-admin/logrotate ) upnp? ( net-libs/miniupnpc ) sys-libs/db:4.8[cxx] >=dev-libs/leveldb-1.18-r1:=
 SLOT=0
 SRC_URI=https://github.com/litecoin-project/litecoin/archive/v0.10.4.0.tar.gz -> litecoin-0.10.4.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ad0d078dcefb52f603b4a5fb46ed4c83
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.5-r1 b/metadata/md5-cache/net-p2p/mldonkey-3.1.5-r1
index a78cee96da91..b32e606c5f91 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.1.5-r1
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.5-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-ml/camlp4:= guionly? ( >=gnome-base/librsvg-2.4.0 >=de
 RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=mirror://sourceforge/mldonkey/mldonkey-3.1.5.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd8033318870f83709c334e8f9766ef9
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.6 b/metadata/md5-cache/net-p2p/mldonkey-3.1.6
index abcfef124748..1c84749832dc 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.1.6
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.6
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-ml/camlp4:= guionly? ( >=gnome-base/librsvg-2.4.0 >=de
 RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1595534098503cd4b74865e526779355
diff --git a/metadata/md5-cache/net-p2p/mldonkey-3.1.6-r1 b/metadata/md5-cache/net-p2p/mldonkey-3.1.6-r1
index 68460446f1ba..7b9bb9c33eb4 100644
--- a/metadata/md5-cache/net-p2p/mldonkey-3.1.6-r1
+++ b/metadata/md5-cache/net-p2p/mldonkey-3.1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/perl dev-ml/camlp4:= guionly? ( >=gnome-base/librsvg-2.4.0 >=de
 RESTRICT=!ocamlopt? ( strip )
 SLOT=0
 SRC_URI=https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=eba1ae116d045612823d836751cfe8c9
diff --git a/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r1 b/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r1
deleted file mode 100644
index 7f7f1ac48cb1..000000000000
--- a/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/mutagen[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A fork of nicotine, a Soulseek client in Python
-EAPI=7
-HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-python/pygtk-2.24[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-libs/mutagen[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fe2eb1f64d2b01ac229e41502941d668
diff --git a/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r2 b/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r2
new file mode 100644
index 000000000000..853de443c3c3
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/nicotine+-1.4.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-python/pygtk-2.24[python_targets_python2_7(-)] media-libs/mutagen[python_targets_python2_7(-)] )
+DESCRIPTION=A fork of nicotine, a Soulseek client in Python
+EAPI=7
+HOMEPAGE=https://github.com/Nicotine-Plus/nicotine-plus
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-python/pygtk-2.24[python_targets_python2_7(-)] media-libs/mutagen[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=40d6804b036260551e080cc99888f244
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
index 328e6412f11e..7d16bb36c358 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.1
@@ -10,5 +10,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_amd64.deb ) x86? ( http://linux-packages.resilio.com/resilio-sync/deb/pool/non-free/r/resilio-sync/resilio-sync_2.6.1-1_i386.deb )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c83c801efb884bbf6beec0f7c1b81713
diff --git a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3 b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
index 762be2618114..172011ef3c1a 100644
--- a/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
+++ b/metadata/md5-cache/net-p2p/resilio-sync-2.6.3
@@ -9,5 +9,5 @@ RDEPEND=virtual/tmpfiles
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_amd64.deb ) x86? ( http://download-cdn.resilio.com/2.6.3/Debian/resilio-sync_2.6.3-1_i386.deb )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=26a92518853c70500f7a8b4f650beae9
diff --git a/metadata/md5-cache/net-p2p/soulseek-qt-20160117 b/metadata/md5-cache/net-p2p/soulseek-qt-20160117
index 78b32bef3ea6..b0da6d7d5530 100644
--- a/metadata/md5-cache/net-p2p/soulseek-qt-20160117
+++ b/metadata/md5-cache/net-p2p/soulseek-qt-20160117
@@ -3,9 +3,9 @@ DESCRIPTION=Official binary Qt SoulSeek client
 EAPI=5
 HOMEPAGE=http://www.soulseekqt.net/
 KEYWORDS=~amd64 ~x86
-LICENSE=free-noncomm
+LICENSE=all-rights-reserved
 RDEPEND=media-libs/libpng x11-libs/libX11 x11-libs/libxcb media-libs/freetype x11-libs/libXau x11-libs/libXdmcp dev-libs/libbsd dev-libs/expat
-RESTRICT=mirror
+RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=x86? ( https://www.dropbox.com/s/kebk1b5ib1m3xxw/SoulseekQt-2016-1-17-32bit.tgz ) amd64? ( https://www.dropbox.com/s/7qh902qv2sxyp6p/SoulseekQt-2016-1-17-64bit.tgz )
-_md5_=3c55eeba944f9e2dce57a70b56318b3a
+_md5_=46cb8b2de80883656c747b44767b3e37
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.1.4 b/metadata/md5-cache/net-p2p/syncthing-1.1.4
index 3e13f2ad7ffb..b6b0b474c02c 100644
--- a/metadata/md5-cache/net-p2p/syncthing-1.1.4
+++ b/metadata/md5-cache/net-p2p/syncthing-1.1.4
@@ -10,5 +10,5 @@ RDEPEND=selinux? ( sec-policy/selinux-syncthing )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/syncthing/syncthing/archive/v1.1.4.tar.gz -> syncthing-1.1.4.tar.gz https://github.com/AudriusButkevicius/go-nat-pmp/archive/452c97607362b2ab5a7839b8d1704f0396b640ca.tar.gz -> github.com-AudriusButkevicius-go-nat-pmp-452c97607362b2ab5a7839b8d1704f0396b640ca.tar.gz https://github.com/AudriusButkevicius/recli/archive/v0.0.5.tar.gz -> github.com-AudriusButkevicius-recli-v0.0.5.tar.gz https://github.com/bkaradzic/go-lz4/archive/7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz -> github.com-bkaradzic-go-lz4-7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz https://github.com/calmh/du/archive/v1.0.1.tar.gz -> github.com-calmh-du-v1.0.1.tar.gz https://github.com/calmh/xdr/archive/v1.1.0.tar.gz -> github.com-calmh-xdr-v1.1.0.tar.gz https://github.com/chmduquesne/rollinghash/archive/a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz -> github.com-chmduquesne-rollinghash-a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz https://github.com/d4l3k/messagediff/archive/v1.2.1.tar.gz -> github.com-d4l3k-messagediff-v1.2.1.tar.gz https://github.com/davecgh/go-spew/archive/v1.1.1.tar.gz -> github.com-davecgh-go-spew-v1.1.1.tar.gz https://github.com/flynn-archive/go-shlex/archive/3f9db97f856818214da2e1057f8ad84803971cff.tar.gz -> github.com-flynn-archive-go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz https://github.com/gobwas/glob/archive/51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz -> github.com-gobwas-glob-51eb1ee00b6d931c66d229ceeb7c31b985563420.tar.gz https://github.com/gogo/protobuf/archive/v1.2.1.tar.gz -> github.com-gogo-protobuf-v1.2.1.tar.gz https://github.com/golang/groupcache/archive/84a468cf14b4376def5d68c722b139b881c450a4.tar.gz -> github.com-golang-groupcache-84a468cf14b4376def5d68c722b139b881c450a4.tar.gz https://github.com/golang/snappy/archive/553a641470496b2327abcac10b36396bd98e45c9.tar.gz -> github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz https://github.com/jackpal/gateway/archive/5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz -> github.com-jackpal-gateway-5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz https://github.com/kballard/go-shellquote/archive/cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz -> github.com-kballard-go-shellquote-cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz https://github.com/kr/pretty/archive/v0.1.0.tar.gz -> github.com-kr-pretty-v0.1.0.tar.gz https://github.com/lib/pq/archive/v1.1.1.tar.gz -> github.com-lib-pq-v1.1.1.tar.gz https://github.com/mattn/go-isatty/archive/v0.0.7.tar.gz -> github.com-mattn-go-isatty-v0.0.7.tar.gz https://github.com/minio/sha256-simd/archive/cc1980cb03383b1d46f518232672584432d7532d.tar.gz -> github.com-minio-sha256-simd-cc1980cb03383b1d46f518232672584432d7532d.tar.gz https://github.com/onsi/ginkgo/archive/6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz -> github.com-onsi-ginkgo-6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz https://github.com/onsi/gomega/archive/ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz -> github.com-onsi-gomega-ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz https://github.com/oschwald/geoip2-golang/archive/v1.3.0.tar.gz -> github.com-oschwald-geoip2-golang-v1.3.0.tar.gz https://github.com/oschwald/maxminddb-golang/archive/26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz -> github.com-oschwald-maxminddb-golang-26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz https://github.com/petermattis/goid/archive/3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz -> github.com-petermattis-goid-3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/pmezard/go-difflib/archive/v1.0.0.tar.gz -> github.com-pmezard-go-difflib-v1.0.0.tar.gz https://github.com/prometheus/client_golang/archive/v0.9.2.tar.gz -> github.com-prometheus-client_golang-v0.9.2.tar.gz https://github.com/rcrowley/go-metrics/archive/e181e095bae94582363434144c61a9653aff6e50.tar.gz -> github.com-rcrowley-go-metrics-e181e095bae94582363434144c61a9653aff6e50.tar.gz https://github.com/sasha-s/go-deadlock/archive/v0.2.0.tar.gz -> github.com-sasha-s-go-deadlock-v0.2.0.tar.gz https://github.com/stretchr/testify/archive/v1.2.2.tar.gz -> github.com-stretchr-testify-v1.2.2.tar.gz https://github.com/syncthing/notify/archive/4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz -> github.com-syncthing-notify-4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz https://github.com/syndtr/goleveldb/archive/34011bf325bce385408353a30b101fe5e923eb6e.tar.gz -> github.com-syndtr-goleveldb-34011bf325bce385408353a30b101fe5e923eb6e.tar.gz https://github.com/thejerf/suture/archive/v3.0.2.tar.gz -> github.com-thejerf-suture-v3.0.2.tar.gz https://github.com/urfave/cli/archive/v1.20.0.tar.gz -> github.com-urfave-cli-v1.20.0.tar.gz https://github.com/vitrun/qart/archive/bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz -> github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz https://github.com/golang/crypto/archive/0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz -> github.com-golang-crypto-0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8.tar.gz https://github.com/golang/net/archive/351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz -> github.com-golang-net-351d144fa1fc0bd934e2408202be0c29f25e35a0.tar.gz https://github.com/golang/sys/archive/4d1cda033e0619309c606fc686de3adcf599539e.tar.gz -> github.com-golang-sys-4d1cda033e0619309c606fc686de3adcf599539e.tar.gz https://github.com/golang/text/archive/e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz -> github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz https://github.com/golang/time/archive/6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz -> github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/v1.2.tar.gz -> github.com-go-asn1-ber-asn1-ber-v1.2.tar.gz https://github.com/go-check/check/archive/788fd78401277ebd861206a03c884797c6ec5541.tar.gz -> github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz https://github.com/go-ldap/ldap/archive/v2.5.1.tar.gz -> github.com-go-ldap-ldap-v2.5.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.0.0.tar.gz -> github.com-go-yaml-yaml-v2.0.0.tar.gz https://github.com/beorn7/perks/archive/3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz -> github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz https://github.com/golang/protobuf/archive/v1.2.0.tar.gz -> github.com-golang-protobuf-v1.2.0.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/v1.0.1.tar.gz -> github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz https://github.com/prometheus/client_model/archive/5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz -> github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz https://github.com/prometheus/common/archive/v0.1.0.tar.gz -> github.com-prometheus-common-v0.1.0.tar.gz https://github.com/prometheus/procfs/archive/1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz -> github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dad9fbe5378871db8078ad1daa163003
diff --git a/metadata/md5-cache/net-p2p/syncthing-1.3.4 b/metadata/md5-cache/net-p2p/syncthing-1.3.4
new file mode 100644
index 000000000000..cb80397bab4f
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/syncthing-1.3.4
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.12 virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare test unpack
+DESCRIPTION=Open Source Continuous File Synchronization
+EAPI=7
+HOMEPAGE=https://syncthing.net
+IUSE=selinux tools
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense
+RDEPEND=acct-group/syncthing acct-user/syncthing tools? ( acct-group/stdiscosrv acct-group/strelaysrv acct-user/stdiscosrv acct-user/strelaysrv ) selinux? ( sec-policy/selinux-syncthing )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/syncthing/syncthing/archive/v1.3.4.tar.gz -> syncthing-1.3.4.tar.gz https://github.com/AudriusButkevicius/pfilter/archive/0.0.5.tar.gz -> github.com-AudriusButkevicius-pfilter-0.0.5.tar.gz https://github.com/AudriusButkevicius/recli/archive/v0.0.5.tar.gz -> github.com-AudriusButkevicius-recli-v0.0.5.tar.gz https://github.com/beorn7/perks/archive/v1.0.1.tar.gz -> github.com-beorn7-perks-v1.0.1.tar.gz https://github.com/bkaradzic/go-lz4/archive/7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz -> github.com-bkaradzic-go-lz4-7224d8d8f27ef618c0a95f1ae69dbb0488abc33a.tar.gz https://github.com/calmh/xdr/archive/v1.1.0.tar.gz -> github.com-calmh-xdr-v1.1.0.tar.gz https://github.com/ccding/go-stun/archive/be486d185f3d.tar.gz -> github.com-ccding-go-stun-be486d185f3d.tar.gz https://github.com/cespare/xxhash/archive/v2.1.0.tar.gz -> github.com-cespare-xxhash-v2.1.0.tar.gz https://github.com/certifi/gocertifi/archive/a5e0173ced67.tar.gz -> github.com-certifi-gocertifi-a5e0173ced67.tar.gz https://github.com/cheekybits/genny/archive/v1.0.0.tar.gz -> github.com-cheekybits-genny-v1.0.0.tar.gz https://github.com/chmduquesne/rollinghash/archive/a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz -> github.com-chmduquesne-rollinghash-a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz https://github.com/cpuguy83/go-md2man/archive/v2.0.0.tar.gz -> github.com-cpuguy83-go-md2man-v2.0.0.tar.gz https://github.com/d4l3k/messagediff/archive/v1.2.1.tar.gz -> github.com-d4l3k-messagediff-v1.2.1.tar.gz https://github.com/flynn-archive/go-shlex/archive/3f9db97f856818214da2e1057f8ad84803971cff.tar.gz -> github.com-flynn-archive-go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz https://github.com/getsentry/raven-go/archive/v0.2.0.tar.gz -> github.com-getsentry-raven-go-v0.2.0.tar.gz https://github.com/gobwas/glob/archive/v0.2.3.tar.gz -> github.com-gobwas-glob-v0.2.3.tar.gz https://github.com/gogo/protobuf/archive/v1.3.1.tar.gz -> github.com-gogo-protobuf-v1.3.1.tar.gz https://github.com/golang/groupcache/archive/869f871628b6.tar.gz -> github.com-golang-groupcache-869f871628b6.tar.gz https://github.com/golang/protobuf/archive/v1.3.2.tar.gz -> github.com-golang-protobuf-v1.3.2.tar.gz https://github.com/golang/snappy/archive/v0.0.1.tar.gz -> github.com-golang-snappy-v0.0.1.tar.gz https://github.com/jackpal/gateway/archive/v1.0.5.tar.gz -> github.com-jackpal-gateway-v1.0.5.tar.gz https://github.com/jackpal/go-nat-pmp/archive/v1.0.2.tar.gz -> github.com-jackpal-go-nat-pmp-v1.0.2.tar.gz https://github.com/kballard/go-shellquote/archive/95032a82bc51.tar.gz -> github.com-kballard-go-shellquote-95032a82bc51.tar.gz https://github.com/lib/pq/archive/v1.2.0.tar.gz -> github.com-lib-pq-v1.2.0.tar.gz https://github.com/lucas-clemente/quic-go/archive/v0.12.1.tar.gz -> github.com-lucas-clemente-quic-go-v0.12.1.tar.gz https://github.com/marten-seemann/qtls/archive/v0.3.2.tar.gz -> github.com-marten-seemann-qtls-v0.3.2.tar.gz https://github.com/maruel/panicparse/archive/v1.3.0.tar.gz -> github.com-maruel-panicparse-v1.3.0.tar.gz https://github.com/mattn/go-isatty/archive/v0.0.11.tar.gz -> github.com-mattn-go-isatty-v0.0.11.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/v1.0.1.tar.gz -> github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz https://github.com/minio/sha256-simd/archive/v0.1.1.tar.gz -> github.com-minio-sha256-simd-v0.1.1.tar.gz https://github.com/oschwald/geoip2-golang/archive/v1.4.0.tar.gz -> github.com-oschwald-geoip2-golang-v1.4.0.tar.gz https://github.com/oschwald/maxminddb-golang/archive/v1.6.0.tar.gz -> github.com-oschwald-maxminddb-golang-v1.6.0.tar.gz https://github.com/petermattis/goid/archive/b0b1615b78e5.tar.gz -> github.com-petermattis-goid-b0b1615b78e5.tar.gz https://github.com/pkg/errors/archive/v0.9.0.tar.gz -> github.com-pkg-errors-v0.9.0.tar.gz https://github.com/prometheus/client_golang/archive/v1.2.1.tar.gz -> github.com-prometheus-client_golang-v1.2.1.tar.gz https://github.com/prometheus/client_model/archive/14fe0d1b01d4.tar.gz -> github.com-prometheus-client_model-14fe0d1b01d4.tar.gz https://github.com/prometheus/common/archive/v0.7.0.tar.gz -> github.com-prometheus-common-v0.7.0.tar.gz https://github.com/prometheus/procfs/archive/v0.0.5.tar.gz -> github.com-prometheus-procfs-v0.0.5.tar.gz https://github.com/rcrowley/go-metrics/archive/cac0b30c2563.tar.gz -> github.com-rcrowley-go-metrics-cac0b30c2563.tar.gz https://github.com/russross/blackfriday/archive/v2.0.1.tar.gz -> github.com-russross-blackfriday-v2.0.1.tar.gz https://github.com/sasha-s/go-deadlock/archive/v0.2.0.tar.gz -> github.com-sasha-s-go-deadlock-v0.2.0.tar.gz https://github.com/shirou/gopsutil/archive/47ef3260b6bf.tar.gz -> github.com-shirou-gopsutil-47ef3260b6bf.tar.gz https://github.com/shurcooL/sanitized_anchor_name/archive/v1.0.0.tar.gz -> github.com-shurcooL-sanitized_anchor_name-v1.0.0.tar.gz https://github.com/syncthing/notify/archive/69c7a957d3e2.tar.gz -> github.com-syncthing-notify-69c7a957d3e2.tar.gz https://github.com/syndtr/goleveldb/archive/758128399b1d.tar.gz -> github.com-syndtr-goleveldb-758128399b1d.tar.gz https://github.com/thejerf/suture/archive/v3.0.2.tar.gz -> github.com-thejerf-suture-v3.0.2.tar.gz https://github.com/urfave/cli/archive/v1.22.2.tar.gz -> github.com-urfave-cli-v1.22.2.tar.gz https://github.com/vitrun/qart/archive/bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz -> github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz https://github.com/golang/crypto/archive/9756ffdc2472.tar.gz -> github.com-golang-crypto-9756ffdc2472.tar.gz https://github.com/golang/net/archive/ba9fcec4b297.tar.gz -> github.com-golang-net-ba9fcec4b297.tar.gz https://github.com/golang/sys/archive/c709ea063b76.tar.gz -> github.com-golang-sys-c709ea063b76.tar.gz https://github.com/golang/text/archive/v0.3.2.tar.gz -> github.com-golang-text-v0.3.2.tar.gz https://github.com/golang/time/archive/9d24e82272b4.tar.gz -> github.com-golang-time-9d24e82272b4.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/v1.2.tar.gz -> github.com-go-asn1-ber-asn1-ber-v1.2.tar.gz https://github.com/go-ldap/ldap/archive/v2.5.1.tar.gz -> github.com-go-ldap-ldap-v2.5.1.tar.gz
+_eclasses_=go-module	c1d483897ed4807f97f20fb3b5a3cb7b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b30179ccf0458132fb395a5a414dde2a
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 6c37bc237df4..0c766bf9ec59 100644
--- a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ddcedde0583a3ec8c55766f2767cf610
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
index 0575e6e369bf..fcd49d725c20 100644
--- a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.6.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4220e10d91015392f891cd70e1a68264
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 77e33401386e..4b13d0e5bf24 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cups-2.2.12 b/metadata/md5-cache/net-print/cups-2.2.12
index 70a2f73e08c5..5b02fc268c85 100644
--- a/metadata/md5-cache/net-print/cups-2.2.12
+++ b/metadata/md5-cache/net-print/cups-2.2.12
@@ -4,14 +4,14 @@ DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-a
 DESCRIPTION=The Common Unix Printing System
 EAPI=7
 HOMEPAGE=https://www.cups.org/
-IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7 elibc_FreeBSD java
+IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7 elibc_FreeBSD java
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~m68k-mint
 LICENSE=GPL-2
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) usb? ( threads )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.2.12/cups-2.2.12-source.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=26007de1a77c57e77c792e79f01d0f42
diff --git a/metadata/md5-cache/net-print/cups-2.2.13 b/metadata/md5-cache/net-print/cups-2.2.13
index 14d5d8953bf3..cd5ca1d3c306 100644
--- a/metadata/md5-cache/net-print/cups-2.2.13
+++ b/metadata/md5-cache/net-print/cups-2.2.13
@@ -4,14 +4,14 @@ DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-a
 DESCRIPTION=The Common Unix Printing System
 EAPI=7
 HOMEPAGE=https://www.cups.org/
-IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7 elibc_FreeBSD java
+IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7 elibc_FreeBSD java
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~m68k-mint
 LICENSE=GPL-2
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) usb? ( threads )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.2.13/cups-2.2.13-source.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1d8a1ade346e0ee0577fcfb4a3f23d9
diff --git a/metadata/md5-cache/net-print/cups-2.3.0 b/metadata/md5-cache/net-print/cups-2.3.0
index e19f3914606a..54a31a2e9b2c 100644
--- a/metadata/md5-cache/net-print/cups-2.3.0
+++ b/metadata/md5-cache/net-print/cups-2.3.0
@@ -13,5 +13,5 @@ REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.3.0/cups-2.3.0-source.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23be45898327be49b9d8f9ee426bf19a
diff --git a/metadata/md5-cache/net-print/cups-2.3.1 b/metadata/md5-cache/net-print/cups-2.3.1
index 4c3e08c9f1ff..e4568fb1f503 100644
--- a/metadata/md5-cache/net-print/cups-2.3.1
+++ b/metadata/md5-cache/net-print/cups-2.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.3.1/cups-2.3.1-source.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23be45898327be49b9d8f9ee426bf19a
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index fa36dca29771..e5163e1bcfe9 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -12,5 +12,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	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=23be45898327be49b9d8f9ee426bf19a
diff --git a/metadata/md5-cache/net-print/hplip-3.18.12 b/metadata/md5-cache/net-print/hplip-3.18.12
deleted file mode 100644
index 7868f7055dcd..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.18.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
-DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) fax? ( dev-python/reportlab[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] libnotify? ( dev-python/notify2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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/hplip/hplip-3.18.12.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=4ea39f2c24e11308b1075e77e484517b
diff --git a/metadata/md5-cache/net-print/hplip-3.18.12-r1 b/metadata/md5-cache/net-print/hplip-3.18.12-r1
new file mode 100644
index 000000000000..4eea1e45aa0e
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.18.12-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=7
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux +python_single_target_python3_6
+KEYWORDS=amd64 arm ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] fax? ( dev-python/reportlab[python_targets_python3_6(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_6(-)] libnotify? ( dev-python/notify2[python_targets_python3_6(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_6(-)] >=dev-python/pillow-3.1.1[python_targets_python3_6(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.18.12.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=b10f45afd494ffc2a3294a899b9aa0a7
diff --git a/metadata/md5-cache/net-print/hplip-3.19.11 b/metadata/md5-cache/net-print/hplip-3.19.11
index 0d2676c46f8c..dd87a53ad20b 100644
--- a/metadata/md5-cache/net-print/hplip-3.19.11
+++ b/metadata/md5-cache/net-print/hplip-3.19.11
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
 DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
 EAPI=7
 HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,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_python2_7(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) fax? ( dev-python/reportlab[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] libnotify? ( dev-python/notify2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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 ) )
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] fax? ( dev-python/reportlab[python_targets_python3_6(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_6(-)] libnotify? ( dev-python/notify2[python_targets_python3_6(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_6(-)] >=dev-python/pillow-3.1.1[python_targets_python3_6(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.19.11.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=5395e7264c85753802612e31e5abf2d2
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=e6e0003b1fd2be9dc06fb56086e50570
diff --git a/metadata/md5-cache/net-print/hplip-3.19.12 b/metadata/md5-cache/net-print/hplip-3.19.12
deleted file mode 100644
index 98f7e001e648..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.19.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
-DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,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_python2_7(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_6(-)?,python_single_target_python3_6(+)?,python_targets_python3_7(-)?,python_single_target_python3_7(+)?] ) fax? ( dev-python/reportlab[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] libnotify? ( dev-python/notify2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_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/hplip/hplip-3.19.12.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=5395e7264c85753802612e31e5abf2d2
diff --git a/metadata/md5-cache/net-print/hplip-3.19.12-r1 b/metadata/md5-cache/net-print/hplip-3.19.12-r1
new file mode 100644
index 000000000000..5f55865735d8
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.19.12-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=7
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_6? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_6(-)] fax? ( dev-python/reportlab[python_targets_python3_6(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_6(-)] libnotify? ( dev-python/notify2[python_targets_python3_6(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_6(-)] >=dev-python/pillow-3.1.1[python_targets_python3_6(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.19.12.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.12-patches-1.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=e6e0003b1fd2be9dc06fb56086e50570
diff --git a/metadata/md5-cache/net-print/pkpgcounter-3.50-r2 b/metadata/md5-cache/net-print/pkpgcounter-3.50-r2
index 35e245ee5b54..d0aad1910d36 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfdbae69186d9edbb1ae9d9c1b94f893
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 9541ad0ba027..d890bb641ac3 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/cntlm-0.93_beta5-r2 b/metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2
index ce94dfa30fce..b792087abcaa 100644
--- a/metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2
+++ b/metadata/md5-cache/net-proxy/cntlm-0.93_beta5-r2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://ftp.awk.cz/pub/cntlm-0.93beta5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fba2802b30b93d5ac2804f1206c6a960
diff --git a/metadata/md5-cache/net-proxy/dante-1.4.1-r1 b/metadata/md5-cache/net-proxy/dante-1.4.1-r1
index 84d848b1b2b9..c36bc709d4da 100644
--- a/metadata/md5-cache/net-proxy/dante-1.4.1-r1
+++ b/metadata/md5-cache/net-proxy/dante-1.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD GPL-2
 RDEPEND=kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) upnp? ( net-libs/miniupnpc:= ) userland_GNU? ( virtual/shadow ) selinux? ( sec-policy/selinux-dante )
 SLOT=0
 SRC_URI=https://www.inet.no/dante/files/dante-1.4.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=43c2dac6c0dccb0f409491df8e6ccb0f
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.13 b/metadata/md5-cache/net-proxy/haproxy-1.8.13
index a440d1cffccd..ff0ad592601e 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a96f6a5458cd3a0e9b7709917a28e04b
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.23 b/metadata/md5-cache/net-proxy/haproxy-1.8.23
index 1c1b55417186..63c53d0dacab 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.8.23
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.23
@@ -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.23.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=1a4291c795ff060a87e3555f6ee29053
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.9 b/metadata/md5-cache/net-proxy/haproxy-1.8.9
index fe3db0b95e98..f62e89fe3f98 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4c6eccd379572eb9149e2747718cc5da
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.10 b/metadata/md5-cache/net-proxy/haproxy-1.9.10
index e672d107ae07..e539bb104a52 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.9.10
+++ b/metadata/md5-cache/net-proxy/haproxy-1.9.10
@@ -11,5 +11,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.9/src/haproxy-1.9.10.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=74e877176288f4540618cedc4e71b6f0
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.13 b/metadata/md5-cache/net-proxy/haproxy-1.9.13
index 409f456da04f..4bf37d181122 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.9.13
+++ b/metadata/md5-cache/net-proxy/haproxy-1.9.13
@@ -11,5 +11,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.9/src/haproxy-1.9.13.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=74e877176288f4540618cedc4e71b6f0
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.9.9999 b/metadata/md5-cache/net-proxy/haproxy-1.9.9999
index ed178786c4db..ba6bdae0aba3 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.9.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-1.9.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=74e877176288f4540618cedc4e71b6f0
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.10 b/metadata/md5-cache/net-proxy/haproxy-2.0.10
index ee4a94abb91b..5a8f754c9e2c 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.10
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.10
@@ -11,5 +11,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/2.0/src/haproxy-2.0.10.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=63507e889039cb2706f33b7f3fd48d53
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.12 b/metadata/md5-cache/net-proxy/haproxy-2.0.12
index b649ea1cccca..e910ccfc5ba6 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.12
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.12
@@ -11,5 +11,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/2.0/src/haproxy-2.0.12.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ba044f06a3db995f67ff3f37f9a41466
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.9999 b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
index cffcc7a6279e..601f5a55fa63 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.0.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=63507e889039cb2706f33b7f3fd48d53
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.1.2 b/metadata/md5-cache/net-proxy/haproxy-2.1.2
index b6dfa7e81886..82b0fe38612b 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.1.2
+++ b/metadata/md5-cache/net-proxy/haproxy-2.1.2
@@ -11,5 +11,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/2.1/src/haproxy-2.1.2.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ba044f06a3db995f67ff3f37f9a41466
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.1.9999 b/metadata/md5-cache/net-proxy/haproxy-2.1.9999
index cffcc7a6279e..601f5a55fa63 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.1.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.1.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=63507e889039cb2706f33b7f3fd48d53
diff --git a/metadata/md5-cache/net-proxy/havp-0.92a-r2 b/metadata/md5-cache/net-proxy/havp-0.92a-r2
index 1b4f57480d37..1c98813f115a 100644
--- a/metadata/md5-cache/net-proxy/havp-0.92a-r2
+++ b/metadata/md5-cache/net-proxy/havp-0.92a-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=clamav? ( >=app-antivirus/clamav-0.98.5 )
 SLOT=0
 SRC_URI=http://www.server-side.de/download/havp-0.92a.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af6668877b057eda0548cf442c5c1f75
diff --git a/metadata/md5-cache/net-proxy/mitmproxy-4.0.4 b/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
index ab4b67574f4b..9d5c3636bcf4 100644
--- a/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
+++ b/metadata/md5-cache/net-proxy/mitmproxy-4.0.4
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mitmproxy/mitmproxy/archive/v4.0.4.tar.gz -> mitmproxy-4.0.4.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2513faf7c8c7ca003a823c83e0972a92
diff --git a/metadata/md5-cache/net-proxy/polipo-1.1.1-r4 b/metadata/md5-cache/net-proxy/polipo-1.1.1-r4
index dbcaf5e47011..e64f4bb1e84e 100644
--- a/metadata/md5-cache/net-proxy/polipo-1.1.1-r4
+++ b/metadata/md5-cache/net-proxy/polipo-1.1.1-r4
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=MIT GPL-2
 SLOT=0
 SRC_URI=http://www.pps.jussieu.fr/~jch/software/files/polipo/polipo-1.1.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4bb7d6e1e474e7de9ad839dabd1c6bd4
diff --git a/metadata/md5-cache/net-proxy/polipo-9999 b/metadata/md5-cache/net-proxy/polipo-9999
index d9efc65c31bc..0a351c0a383c 100644
--- a/metadata/md5-cache/net-proxy/polipo-9999
+++ b/metadata/md5-cache/net-proxy/polipo-9999
@@ -7,5 +7,5 @@ IUSE=systemd
 LICENSE=MIT GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f5907d7c117dafa174b7be8af465dda8
diff --git a/metadata/md5-cache/net-proxy/privoxy-3.0.26 b/metadata/md5-cache/net-proxy/privoxy-3.0.26
index 42b6bea7b21e..a4adda670aed 100644
--- a/metadata/md5-cache/net-proxy/privoxy-3.0.26
+++ b/metadata/md5-cache/net-proxy/privoxy-3.0.26
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libpcre zlib? ( sys-libs/zlib ) extended-host-patterns? ( dev-l
 REQUIRED_USE=compression? ( zlib ) toggle? ( editor )
 SLOT=0
 SRC_URI=mirror://sourceforge/ijbswa/privoxy-3.0.26-stable-src.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0bc92591311609167ab3cd53eed8a210
diff --git a/metadata/md5-cache/net-proxy/privoxy-3.0.28 b/metadata/md5-cache/net-proxy/privoxy-3.0.28
index 35530b585a40..7c565bbe290f 100644
--- a/metadata/md5-cache/net-proxy/privoxy-3.0.28
+++ b/metadata/md5-cache/net-proxy/privoxy-3.0.28
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libpcre zlib? ( sys-libs/zlib ) extended-host-patterns? ( dev-l
 REQUIRED_USE=compression? ( zlib ) toggle? ( editor )
 SLOT=0
 SRC_URI=mirror://sourceforge/ijbswa/privoxy-3.0.28-stable-src.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0235755d684361122ebe477d54a51a0c
diff --git a/metadata/md5-cache/net-proxy/redsocks-0.5 b/metadata/md5-cache/net-proxy/redsocks-0.5
index 94caf1590224..e32b878b2a55 100644
--- a/metadata/md5-cache/net-proxy/redsocks-0.5
+++ b/metadata/md5-cache/net-proxy/redsocks-0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libevent:0= net-firewall/iptables
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/darkk/redsocks/archive/release-0.5.tar.gz -> redsocks-0.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bd97986950c8f96f57ceef8ac0f6e1dd
diff --git a/metadata/md5-cache/net-proxy/redsocks-0.5-r1 b/metadata/md5-cache/net-proxy/redsocks-0.5-r1
new file mode 100644
index 000000000000..be7fdb960e9f
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/redsocks-0.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=dev-libs/libevent:0= virtual/pkgconfig
+DESCRIPTION=Transparent redirector of any TCP connection to proxy
+EAPI=6
+HOMEPAGE=http://darkk.net.ru/redsocks/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 LGPL-2.1+ ZLIB
+RDEPEND=dev-libs/libevent:0= net-firewall/iptables
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/darkk/redsocks/archive/release-0.5.tar.gz -> redsocks-0.5.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=b9f18015f2e3bea3060dac08b6fc1a7e
diff --git a/metadata/md5-cache/net-proxy/redsocks-9999 b/metadata/md5-cache/net-proxy/redsocks-9999
index 790a23020440..f5a164013141 100644
--- a/metadata/md5-cache/net-proxy/redsocks-9999
+++ b/metadata/md5-cache/net-proxy/redsocks-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/libevent:0= net-firewall/iptables
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bd97986950c8f96f57ceef8ac0f6e1dd
diff --git a/metadata/md5-cache/net-proxy/squidguard-1.5_beta-r2 b/metadata/md5-cache/net-proxy/squidguard-1.5_beta-r2
index 384a5581aebc..4657eba3abef 100644
--- a/metadata/md5-cache/net-proxy/squidguard-1.5_beta-r2
+++ b/metadata/md5-cache/net-proxy/squidguard-1.5_beta-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( 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 ) ldap? ( net-nds/openldap:0 )
 SLOT=0
 SRC_URI=http://www.squidguard.org/Downloads/Devel/squidGuard-1.5-beta.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6e4837e93e608b8dc3067c42f9a7f438
diff --git a/metadata/md5-cache/net-proxy/squidguard-1.6.0 b/metadata/md5-cache/net-proxy/squidguard-1.6.0
index 6321c0ed8f89..8e841f0a7cf4 100644
--- a/metadata/md5-cache/net-proxy/squidguard-1.6.0
+++ b/metadata/md5-cache/net-proxy/squidguard-1.6.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=|| ( sys-libs/db:5.3 sys-libs/db:4.8 ) ldap? ( net-nds/openldap:0 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/squidguard/squidguard_1.6.0.orig.tar.gz -> squidguard-1.6.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	db-use	501a5d0963e0d17f30260023f292ae8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bf43844fb81dee4c077e820363d774c2
diff --git a/metadata/md5-cache/net-proxy/sshuttle-0.78.5 b/metadata/md5-cache/net-proxy/sshuttle-0.78.5
index 20b07b3b28c3..55ef432add56 100644
--- a/metadata/md5-cache/net-proxy/sshuttle-0.78.5
+++ b/metadata/md5-cache/net-proxy/sshuttle-0.78.5
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sshuttle/sshuttle-0.78.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1965db71cf6bef15fd18ec33fc8215cd
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1 b/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
index f515c44962a2..fe3e4dcde67f 100644
--- a/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.10.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( xtinyproxy-header )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tinyproxy/tinyproxy/releases/download/1.10.0/tinyproxy-1.10.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b31be8d52e79eeb6cf82bdb610c5bcf1
diff --git a/metadata/md5-cache/net-proxy/trojan-1.10.0 b/metadata/md5-cache/net-proxy/trojan-1.10.0
index 588a217e7199..18c154996a87 100644
--- a/metadata/md5-cache/net-proxy/trojan-1.10.0
+++ b/metadata/md5-cache/net-proxy/trojan-1.10.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.10.0.tar.gz -> trojan-1.10.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1087289330ade4d01e0d327624ee634
+_md5_=2b4b147559ad5bb9517447dc3a85577f
diff --git a/metadata/md5-cache/net-proxy/trojan-1.12.3 b/metadata/md5-cache/net-proxy/trojan-1.12.3
index 91f5c4edfd58..354b5b1c6816 100644
--- a/metadata/md5-cache/net-proxy/trojan-1.12.3
+++ b/metadata/md5-cache/net-proxy/trojan-1.12.3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/trojan-gfw/trojan/archive/v1.12.3.tar.gz -> trojan-1.12.3.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7fd441b5e7da053c530c7a511ab3d543
+_md5_=40a9106078b44054d8370e11b1d58b7a
diff --git a/metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1 b/metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
index 47dfb3e8232f..a48c50193891 100644
--- a/metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
+++ b/metadata/md5-cache/net-proxy/wwwoffle-2.9i-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=gnutls? ( net-libs/gnutls ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=https://www.gedanken.org.uk/software/wwwoffle/download/wwwoffle-2.9i.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8ab8a39dbf7564e67b40df7700ac9dca
diff --git a/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1 b/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
index 67f91153ddc8..720ab54bf7b5 100644
--- a/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
+++ b/metadata/md5-cache/net-proxy/ziproxy-3.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg:0 sys-libs/zlib sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd )
 SLOT=0
 SRC_URI=mirror://sourceforge/ziproxy/ziproxy-3.3.1.tar.xz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1d653a2bcaf9519f5e05e933ea77f550
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index d414fcefc1ed..b66bc5d750c9 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-rakia-0.8.0 b/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
index 11dbc9641b64..d46ba42226aa 100644
--- a/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
+++ b/metadata/md5-cache/net-voip/telepathy-rakia-0.8.0
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A SIP connection manager for Telepathy based around the Sofia-SIP library
 EAPI=5
 HOMEPAGE=https://telepathy.freedesktop.org/
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=test +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-libs/dbus-glib-0.60 >=dev-libs/glib-2.30:2 >=net-libs/sofia-sip-1.12.11 >=net-libs/telepathy-glib-0.17.6 >=sys-apps/dbus-0.60 !net-voip/telepathy-sofiasip
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://telepathy.freedesktop.org/releases/telepathy-rakia/telepathy-rakia-0.8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6b88d094110c7b81c9bc0f5456aae99c
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index fd8a43c7b472..a20d2eb88d8a 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/badvpn-1.999.126 b/metadata/md5-cache/net-vpn/badvpn-1.999.126
index 9be8b8e3261d..ed2bcf4679e1 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 35730b83cee6..cf8b9af1c65a 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f9613befea11..1fa2f1526524 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 bf15e5465dda..9daf5747e73d 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 8b10d3635ba0..566f3b13b563 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ffaf5900bc1a60af4463782c4c7630e3
diff --git a/metadata/md5-cache/net-vpn/freelan-2.2 b/metadata/md5-cache/net-vpn/freelan-2.2
index 55b1daf6e9e3..8b89babd575a 100644
--- a/metadata/md5-cache/net-vpn/freelan-2.2
+++ b/metadata/md5-cache/net-vpn/freelan-2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:=[threads] dev-libs/openssl:0= net-misc/curl:= virtual/libiconv net-libs/miniupnpc:=
 SLOT=0
 SRC_URI=https://github.com/freelan-developers/freelan/archive/2.2.tar.gz -> freelan-2.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e574ce41ec3b8507ac33877e023a5260
diff --git a/metadata/md5-cache/net-vpn/libreswan-3.29 b/metadata/md5-cache/net-vpn/libreswan-3.29
index 7c20f8d53bfb..1a81b2c04e63 100644
--- a/metadata/md5-cache/net-vpn/libreswan-3.29
+++ b/metadata/md5-cache/net-vpn/libreswan-3.29
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-3.29.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4bcfa5d190bbc71e8d8a989a2a131946
+_md5_=b2a9581ec9651b3a5cecd8a47aa0f88e
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6 b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6
index 534cc4e9a399..b87b2fbf9911 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6
+++ b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6
@@ -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/gcr-3.4:= >=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.6.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b32beec9807c913beedb06e6593063bf
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
index 36d70e7b088c..ea3e18bbd7a6 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.32:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openv
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.10.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1333bf89c69c3c7d097f402e44dfb391
diff --git a/metadata/md5-cache/net-vpn/openconnect-8.05 b/metadata/md5-cache/net-vpn/openconnect-8.05
index a6c789bd15c6..8a173708f5e5 100644
--- a/metadata/md5-cache/net-vpn/openconnect-8.05
+++ b/metadata/md5-cache/net-vpn/openconnect-8.05
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext )
+BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure install postinst prepare pretend setup unpack
 DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-crypt/trousers 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 )
 DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openss
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/openconnect/openconnect-8.05.tar.gz ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20190611.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a6c264b2ec3cbac678b4ed0cd1a6aaca
+_md5_=55ca052179c308ec514f83df43d914a8
diff --git a/metadata/md5-cache/net-vpn/openconnect-9999 b/metadata/md5-cache/net-vpn/openconnect-9999
index b53800824a7c..ca8de701bf32 100644
--- a/metadata/md5-cache/net-vpn/openconnect-9999
+++ b/metadata/md5-cache/net-vpn/openconnect-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] >=dev-lang/python-2.7.5-r2:2.7[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig doc? ( || ( dev-lang/python:3.7[xml] dev-lang/python:3.6[xml] ) sys-apps/groff ) nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 prepare pretend setup unpack
 DEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) ) gnutls? ( app-crypt/trousers 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 )
 DESCRIPTION=Free client for Cisco AnyConnect SSL VPN software
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/libxml2 sys-libs/zlib !gnutls? ( !libressl? ( >=dev-libs/openss
 SLOT=0/5
 SRC_URI=ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-20190611.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d638d90dfac96e936d7ca817b81458f0
+_md5_=c1f1fa95025643e1421c9e32f40ff5a1
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6 b/metadata/md5-cache/net-vpn/openvpn-2.4.6
index 49ccfa8a0596..5902a1d681c4 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.6
@@ -11,5 +11,5 @@ REQUIRED_USE=static? ( !plugins !pkcs11 ) pkcs11? ( ssl ) !plugins? ( !pam !down
 RESTRICT=!test? ( test )
 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=74a018f55f9f7c43772011b4441c5503
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1
index b4cff93bb590..37effcbaf071 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=static? ( !plugins !pkcs11 ) pkcs11? ( ssl ) !plugins? ( !pam !down
 RESTRICT=!test? ( test )
 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f5e797d96ace71bd2e672d4382d0f9d4
diff --git a/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1 b/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1
index f69419aed754..50bb6ddbb61c 100644
--- a/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1
+++ b/metadata/md5-cache/net-vpn/openvpn-2.4.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=static? ( !plugins !pkcs11 ) pkcs11? ( ssl ) !plugins? ( !pam !down
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/openvpn/archive/v2.4.7.tar.gz -> openvpn-2.4.7.tar.gz test? ( https://raw.githubusercontent.com/OpenVPN/openvpn/v2.4.7/tests/unit_tests/openvpn/mock_msg.h )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=03d207df4d48681f5f32ae0706998ff3
diff --git a/metadata/md5-cache/net-vpn/openvpn-9999 b/metadata/md5-cache/net-vpn/openvpn-9999
index d5b47d0c959e..c0d79ca0b12a 100644
--- a/metadata/md5-cache/net-vpn/openvpn-9999
+++ b/metadata/md5-cache/net-vpn/openvpn-9999
@@ -10,5 +10,5 @@ RDEPEND=kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( s
 REQUIRED_USE=static? ( !inotify !plugins !pkcs11 ) lzo? ( !lz4 ) !plugins? ( !pam !down-root ) inotify? ( plugins )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6615324124cadf7975b68fcf95c7f48b
diff --git a/metadata/md5-cache/net-vpn/peervpn-0.044-r4 b/metadata/md5-cache/net-vpn/peervpn-0.044-r4
index d1e3a76c4d32..dc626f93af7d 100644
--- a/metadata/md5-cache/net-vpn/peervpn-0.044-r4
+++ b/metadata/md5-cache/net-vpn/peervpn-0.044-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=libressl? ( dev-libs/libressl:0= ) !libressl? ( <dev-libs/openssl-1.1:0= )
 SLOT=0
 SRC_URI=https://github.com/peervpn/peervpn/archive/eb35174277fbf745c5ee0d5875d659dad819adfc.tar.gz -> peervpn-0.044.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=192ae30f8849554b1a80795fee3a6edb
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.8.1 b/metadata/md5-cache/net-vpn/strongswan-5.8.1
index 0e8f4f6cdc37..e77460027409 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.8.1
+++ b/metadata/md5-cache/net-vpn/strongswan-5.8.1
@@ -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? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.8.1.tar.bz2
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=8bbb3ce37649c9786e9a2cb53be0b3df
diff --git a/metadata/md5-cache/net-vpn/strongswan-5.8.2 b/metadata/md5-cache/net-vpn/strongswan-5.8.2
index d9bc33756aff..df8c0f40c236 100644
--- a/metadata/md5-cache/net-vpn/strongswan-5.8.2
+++ b/metadata/md5-cache/net-vpn/strongswan-5.8.2
@@ -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? ( dev-db/mysql-connector-c:= ) sqlite? ( >=dev-db/sqlite-3.3.1 ) systemd? ( sys-apps/systemd ) networkmanager? ( net-misc/networkmanager ) pam? ( sys-libs/pam ) strongswan_plugins_unbound? ( net-dns/unbound:= net-libs/ldns ) virtual/logger sys-apps/iproute2 !net-vpn/libreswan selinux? ( sec-policy/selinux-ipsec )
 SLOT=0
 SRC_URI=https://download.strongswan.org/strongswan-5.8.2.tar.bz2
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b1e4fedb5ed14c22b3b022c6e558f2ab
diff --git a/metadata/md5-cache/net-vpn/tinc-1.1_pre17 b/metadata/md5-cache/net-vpn/tinc-1.1_pre17
index a24452d4cba1..f81583730922 100644
--- a/metadata/md5-cache/net-vpn/tinc-1.1_pre17
+++ b/metadata/md5-cache/net-vpn/tinc-1.1_pre17
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=tinc is an easy to configure VPN implementation
 EAPI=7
 HOMEPAGE=http://www.tinc-vpn.org/
-IUSE=+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre17.tar.gz https://dev.gentoo.org/~dlan/distfiles/tinc-1.1-upstream-patches-2.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1d6a481a991fb0377ffe878eee97d13a
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200121 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200121
deleted file mode 100644
index 537b8d91d4e3..000000000000
--- a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200121
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=net-libs/libmnl
-DESCRIPTION=Required tools for WireGuard, such as wg(8) and wg-quick(8)
-EAPI=7
-HOMEPAGE=https://www.wireguard.com/
-IUSE=+wg-quick kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libmnl wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) !<virtual/wireguard-1
-SLOT=0
-SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200121.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=930e351845f47e6f51ec8b0d1892d075
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200206 b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200206
new file mode 100644
index 000000000000..8077b26f403b
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-tools-1.0.20200206
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DESCRIPTION=Required tools for WireGuard, such as wg(8) and wg-quick(8)
+EAPI=7
+HOMEPAGE=https://www.wireguard.com/
+IUSE=+wg-quick kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) !<virtual/wireguard-1
+SLOT=0
+SRC_URI=https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200206.tar.xz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8958d2d4d25feff2c9de64222aa0eae2
diff --git a/metadata/md5-cache/net-vpn/wireguard-tools-9999 b/metadata/md5-cache/net-vpn/wireguard-tools-9999
deleted file mode 100644
index 13c9fa63d13d..000000000000
--- a/metadata/md5-cache/net-vpn/wireguard-tools-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst setup unpack
-DEPEND=net-libs/libmnl
-DESCRIPTION=Required tools for WireGuard, such as wg(8) and wg-quick(8)
-EAPI=7
-HOMEPAGE=https://www.wireguard.com/
-IUSE=+wg-quick kernel_linux
-LICENSE=GPL-2
-PROPERTIES=live
-RDEPEND=net-libs/libmnl wg-quick? ( || ( net-firewall/nftables net-firewall/iptables ) virtual/resolvconf ) !<virtual/wireguard-1
-SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=90cb590293f4cd32998407f2b167ea3c
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 86ebd95c3460..bac9c4bce75f 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.5.2 b/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
index d624ba1f4e9a..7a5c5554a4e0 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.5.2
@@ -12,5 +12,5 @@ RDEPEND=net-libs/libpcap sys-apps/hwloc:0= !libressl? ( dev-libs/openssl:0= ) li
 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.5.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2921ce08345019d18bd91d29bb9cb8ea
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-1.6 b/metadata/md5-cache/net-wireless/aircrack-ng-1.6
index 01aeb248731d..671879705c74 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-1.6
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-1.6
@@ -12,5 +12,5 @@ RDEPEND=net-libs/libpcap sys-apps/hwloc:0= !libressl? ( dev-libs/openssl:0= ) li
 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.6.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d1c2bba8209439216de147373d9371b9
diff --git a/metadata/md5-cache/net-wireless/aircrack-ng-9999 b/metadata/md5-cache/net-wireless/aircrack-ng-9999
index 4307314e17b9..9e010fc04372 100644
--- a/metadata/md5-cache/net-wireless/aircrack-ng-9999
+++ b/metadata/md5-cache/net-wireless/aircrack-ng-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=net-libs/libpcap sys-apps/hwloc:0= !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	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=2b888d4e8dcbbe8ec33b0e16aec5912b
diff --git a/metadata/md5-cache/net-wireless/airpwn-1.4-r2 b/metadata/md5-cache/net-wireless/airpwn-1.4-r2
index e24df3497548..d0e30ebede2d 100644
--- a/metadata/md5-cache/net-wireless/airpwn-1.4-r2
+++ b/metadata/md5-cache/net-wireless/airpwn-1.4-r2
@@ -3,11 +3,11 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Tool for generic packet injection on 802.11
 EAPI=5
 HOMEPAGE=http://airpwn.sf.net
-IUSE=+examples +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+examples +python_single_target_python2_7
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/libpcre dev-libs/openssl:0= net-libs/libnet:1.1= net-libs/libpcap net-wireless/lorcon-old
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/airpwn/airpwn-1.4.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af2f40cf15642f6753e918f54f8e2df1
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.3.4 b/metadata/md5-cache/net-wireless/blueberry-1.3.4
deleted file mode 100644
index ec733fc3148c..000000000000
--- a/metadata/md5-cache/net-wireless/blueberry-1.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/xapp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
-DESCRIPTION=A Bluetooth configuration tool
-EAPI=7
-HOMEPAGE=https://github.com/linuxmint/blueberry
-IUSE=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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/setproctitle[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/xapp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
-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/linuxmint/blueberry/archive/1.3.4.tar.gz -> blueberry-1.3.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc873733703f7279da9fe7d6dafd9971
diff --git a/metadata/md5-cache/net-wireless/blueberry-1.3.4-r1 b/metadata/md5-cache/net-wireless/blueberry-1.3.4-r1
new file mode 100644
index 000000000000..d52fb74a4806
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/blueberry-1.3.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/xapp[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/xapp[python_targets_python3_7(-)] ) >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
+DESCRIPTION=A Bluetooth configuration tool
+EAPI=7
+HOMEPAGE=https://github.com/linuxmint/blueberry
+IUSE=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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/setproctitle[python_targets_python3_6(-)] dev-python/xapp[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/setproctitle[python_targets_python3_7(-)] dev-python/xapp[python_targets_python3_7(-)] ) >=net-wireless/gnome-bluetooth-3.14[introspection] net-wireless/bluez[obex] net-wireless/bluez-tools || ( >=sys-apps/util-linux-2.31_rc1 net-wireless/rfkill ) x11-libs/libnotify[introspection] x11-misc/wmctrl
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/blueberry/archive/1.3.4.tar.gz -> blueberry-1.3.4.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b61124447f4e3f5cadb3cc19e59cebe6
diff --git a/metadata/md5-cache/net-wireless/blueman-2.1.1-r1 b/metadata/md5-cache/net-wireless/blueman-2.1.1-r1
index 2f8cf7f3660c..ff8e2ac4d8ba 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.1.1-r1
+++ b/metadata/md5-cache/net-wireless/blueman-2.1.1-r1
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_p
 DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
 EAPI=7
 HOMEPAGE=https://github.com/blueman-project/blueman
-IUSE=appindicator network nls policykit pulseaudio kernel_linux python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3+ GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/pycairo[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_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 sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) ) !net-wireless/gnome-bluetooth
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.1.1/blueman-2.1.1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee6d11c02f3592101d30128863e0cbf4
diff --git a/metadata/md5-cache/net-wireless/blueman-2.1.2 b/metadata/md5-cache/net-wireless/blueman-2.1.2
index 2aab8d514617..a4e1668f2758 100644
--- a/metadata/md5-cache/net-wireless/blueman-2.1.2
+++ b/metadata/md5-cache/net-wireless/blueman-2.1.2
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_p
 DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
 EAPI=7
 HOMEPAGE=https://github.com/blueman-project/blueman
-IUSE=appindicator network nls policykit pulseaudio kernel_linux python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3+ GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/pycairo[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_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 sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) ) !net-wireless/gnome-bluetooth
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.1.2/blueman-2.1.2.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee6d11c02f3592101d30128863e0cbf4
diff --git a/metadata/md5-cache/net-wireless/blueman-9999 b/metadata/md5-cache/net-wireless/blueman-9999
index 33d7387cb6c9..c42098c967c1 100644
--- a/metadata/md5-cache/net-wireless/blueman-9999
+++ b/metadata/md5-cache/net-wireless/blueman-9999
@@ -4,11 +4,11 @@ DEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_p
 DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
 EAPI=7
 HOMEPAGE=https://github.com/blueman-project/blueman
-IUSE=appindicator network nls policykit pulseaudio kernel_linux python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=appindicator network nls policykit pulseaudio kernel_linux python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-3+ GPL-2
 PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/pycairo[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycairo[python_targets_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 sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio[bluetooth] media-sound/pulseaudio-modules-bt ) ) !net-wireless/gnome-bluetooth
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee6d11c02f3592101d30128863e0cbf4
diff --git a/metadata/md5-cache/net-wireless/bluez-5.51-r2 b/metadata/md5-cache/net-wireless/bluez-5.51-r2
index 7452e99dd6ca..e55ee32ea5f2 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.51-r2
+++ b/metadata/md5-cache/net-wireless/bluez-5.51-r2
@@ -1,16 +1,16 @@
-BDEPEND=virtual/pkgconfig test? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+BDEPEND=virtual/pkgconfig test? ( python_single_target_python2_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/dbus-python-1[python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.14 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.14 dev-libs/json-c:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 )
 DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=7
 HOMEPAGE=http://www.bluez.org
-IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~hppa ~mips ppc ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.14 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.14 dev-libs/json-c:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) test-programs? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.14 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.14 dev-libs/json-c:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python2_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/dbus-python-1[python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] ) )
+REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python2_7 ) ) test-programs? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.51.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=cfcf28cd614b7bc5c40ffd41c4e87328
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=41c94c66358fdb4935c4e02d9d306da7
diff --git a/metadata/md5-cache/net-wireless/bluez-5.52 b/metadata/md5-cache/net-wireless/bluez-5.52
deleted file mode 100644
index 15100d8fb675..000000000000
--- a/metadata/md5-cache/net-wireless/bluez-5.52
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.26 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.26 dev-libs/json-c:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 )
-DESCRIPTION=Bluetooth Tools and System Daemons for Linux
-EAPI=7
-HOMEPAGE=http://www.bluez.org
-IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.26 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.26 dev-libs/json-c:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) test-programs? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-RESTRICT=!test? ( test )
-SLOT=0/3
-SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.52.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=041f6854a28d39123950cd1a93d37edd
diff --git a/metadata/md5-cache/net-wireless/bluez-5.52-r1 b/metadata/md5-cache/net-wireless/bluez-5.52-r1
new file mode 100644
index 000000000000..bc3d37d126eb
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/bluez-5.52-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( python_single_target_python2_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/dbus-python-1[python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.26 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.26 dev-libs/json-c:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 )
+DESCRIPTION=Bluetooth Tools and System Daemons for Linux
+EAPI=7
+HOMEPAGE=http://www.bluez.org
+IUSE=btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwids-20121202.2 btpclient? ( >=dev-libs/ell-0.26 ) cups? ( net-print/cups:= ) mesh? ( >=dev-libs/ell-0.26 dev-libs/json-c:= sys-libs/readline:0= ) midi? ( media-libs/alsa-lib ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( >=sys-apps/dbus-1.6:=[user-session=] sys-apps/systemd ) !systemd? ( >=sys-apps/dbus-1.6:= ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_single_target_python2_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/dbus-python-1[python_targets_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)] ) )
+REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( ^^ ( python_single_target_python2_7 ) ) test-programs? ( ^^ ( python_single_target_python2_7 ) )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://www.kernel.org/pub/linux/bluetooth/bluez-5.52.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=3689ff9f3e4438291ee8d34cb0eede56
diff --git a/metadata/md5-cache/net-wireless/chirp-20190925 b/metadata/md5-cache/net-wireless/chirp-20190925
index 25fe14252b12..6dccaea312c2 100644
--- a/metadata/md5-cache/net-wireless/chirp-20190925
+++ b/metadata/md5-cache/net-wireless/chirp-20190925
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://trac.chirp.danplanet.com/chirp_daily/daily-20190925/chirp-daily-20190925.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=365c59c8b0d623d84a83528116281968
diff --git a/metadata/md5-cache/net-wireless/chirp-99999999 b/metadata/md5-cache/net-wireless/chirp-99999999
index df88b8d1e321..d0f7bf48364a 100644
--- a/metadata/md5-cache/net-wireless/chirp-99999999
+++ b/metadata/md5-cache/net-wireless/chirp-99999999
@@ -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 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=365c59c8b0d623d84a83528116281968
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 cc6960849a2a..732aa31af959 100644
--- a/metadata/md5-cache/net-wireless/cpyrit-cuda-0.5.0
+++ b/metadata/md5-cache/net-wireless/cpyrit-cuda-0.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/openssl:= net-libs/libpcap dev-util/nvidia-cuda-toolkit python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=dev-libs/openssl:= net-libs/libpcap dev-util/nvidia-cuda-toolkit python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=A sub-package that adds CUDA-capability to Pyrit
 EAPI=6
 HOMEPAGE=https://github.com/JPaulMora/Pyrit
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ GPL-3+-with-cuda-exception GPL-3+-with-cuda-openssl-exception
 PDEPEND=~net-wireless/pyrit-0.5.0
 RDEPEND=dev-libs/openssl:= net-libs/libpcap dev-util/nvidia-cuda-toolkit python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz -> pyrit-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 90d61f72bafa..2dc4378f2b88 100644
--- a/metadata/md5-cache/net-wireless/cpyrit-opencl-0.5.0
+++ b/metadata/md5-cache/net-wireless/cpyrit-opencl-0.5.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/openssl:= sys-libs/zlib virtual/opencl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=dev-libs/openssl:= sys-libs/zlib virtual/opencl python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=A sub-package that adds OpenCL-capability to Pyrit
 EAPI=6
 HOMEPAGE=https://github.com/JPaulMora/Pyrit
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+ GPL-3+-with-opencl-exception GPL-3+-with-opencl-openssl-exception
 PDEPEND=~net-wireless/pyrit-0.5.0
 RDEPEND=dev-libs/openssl:= sys-libs/zlib virtual/opencl python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz -> pyrit-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efa669a76c6c65b74295a1844099dfed
diff --git a/metadata/md5-cache/net-wireless/crda-4.14 b/metadata/md5-cache/net-wireless/crda-4.14
index 37a7d1dda20c..e4209ac063d5 100644
--- a/metadata/md5-cache/net-wireless/crda-4.14
+++ b/metadata/md5-cache/net-wireless/crda-4.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=!gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gcrypt? ( dev-libs/libgcrypt:0= ) dev-libs/libnl:3 net-wireless/wireless-regdb || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.8 dev-python/m2crypto[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/m2crypto[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/m2crypto[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/m2crypto[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig virtual/pkgconfig
+DEPEND=!gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) gcrypt? ( dev-libs/libgcrypt:0= ) dev-libs/libnl:3 net-wireless/wireless-regdb || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.8 dev-python/m2crypto[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/m2crypto[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/m2crypto[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Central Regulatory Domain Agent for wireless networks
 EAPI=6
 HOMEPAGE=https://wireless.wiki.kernel.org/en/developers/regulatory/crda
@@ -10,4 +10,4 @@ RDEPEND=!gcrypt? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libre
 SLOT=0
 SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/crda-4.14.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=553a848143b06662500a554576e0a4c6
+_md5_=20c72231f62b808fb25caa3ec7d45be3
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r3 b/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r3
index 433e5c8c2682..6e9aeacc7d88 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r3
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.6.5.1-r3
@@ -1,14 +1,14 @@
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-util/cppunit sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) grc? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) wavelet? ( sci-libs/gsl ) dev-lang/swig dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] ) !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-util/cppunit sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib[python_single_target_python2_7(-)?] ) grc? ( python_single_target_python2_7? ( dev-python/lxml[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/pygtk:2[python_targets_python2_7(-)] ) ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_single_target_python2_7(-)?] ) wavelet? ( sci-libs/gsl ) dev-lang/swig virtual/pkgconfig python_single_target_python2_7? ( dev-python/cheetah[python_targets_python2_7(-)] doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=5
 HOMEPAGE=https://www.gnuradio.org/
-IUSE=alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-util/cppunit sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) grc? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) wavelet? ( sci-libs/gsl )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) analog? ( filter ) digital? ( filter analog ) pager? ( filter analog ) uhd? ( filter analog ) fcd? ( || ( alsa oss ) ) wavelet? ( analog )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] ) !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-util/cppunit sci-libs/fftw:3.0= fcd? ( virtual/libusb:1 ) alsa? ( media-libs/alsa-lib[python_single_target_python2_7(-)?] ) grc? ( python_single_target_python2_7? ( dev-python/lxml[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/pygtk:2[python_targets_python2_7(-)] ) ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-19_pre ) sdl? ( media-libs/libsdl ) uhd? ( >=net-wireless/uhd-3.4.3-r1:=[python_single_target_python2_7(-)?] ) wavelet? ( sci-libs/gsl )
+REQUIRED_USE=^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83c844d2ff081a793b95d71c6bb1e698
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fa75f89b74838e42fd0dbe6046d878b
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r2 b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r2
deleted file mode 100644
index d09c6717cbe0..000000000000
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r2
+++ /dev/null
@@ -1,15 +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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
-EAPI=6
-HOMEPAGE=https://www.gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) sdl? ( >=media-libs/libsdl-1.2.0 ) uhd? ( >=net-wireless/uhd-3.9.6:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) zeromq? ( >=net-libs/zeromq-2.1.11 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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 )
-RESTRICT=!test? ( test )
-SLOT=0/3.7.13.5
-SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.7.13.5/gnuradio-3.7.13.5.tar.xz 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88732ac0532c362ff770145dbe2ba4b4
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r3 b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r3
new file mode 100644
index 000000000000..d5173e48e0f6
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.13.5-r3
@@ -0,0 +1,15 @@
+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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) 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_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python,python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig python_single_target_python2_7? ( dev-python/cheetah[python_targets_python2_7(-)] doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
+EAPI=6
+HOMEPAGE=https://www.gnuradio.org/
+IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) 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_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python,python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 x11-libs/qwt:6[qt5(+)] dev-qt/qtwidgets:5 ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_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 )
+RESTRICT=!test? ( test )
+SLOT=0/3.7.13.5
+SRC_URI=https://github.com/gnuradio/gnuradio/releases/download/v3.7.13.5/gnuradio-3.7.13.5.tar.xz 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1d8138c0388938fcf7ea1003d3cb4da5
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999 b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
index 9bce4d7be505..45c533b93abb 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.7.9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) zeromq? ( >=net-libs/zeromq-2.1.11 ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) 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_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=6
 HOMEPAGE=https://www.gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) zeromq? ( >=net-libs/zeromq-2.1.11 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) 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_single_target_python2_7(-)?] ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 ) python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[python_targets_python2_7(-)] dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/cheetah[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] >=dev-python/pygtk-2.10:2[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) wxwidgets? ( dev-python/wxpython:3.0[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_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 )
 RESTRICT=!test? ( test )
 SLOT=0/3.7.9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8433525c47a10985615978454c2682a2
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a290e62d102c6b1f4f8c3c03b909d341
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index 2623b37ad127..929f06542bf5 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !<=dev-libs/boost-1.52.0-r6:0/1.52 || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) grc? ( dev-python/pygobject:*[cairo(+),python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets: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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/log4cpp ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 dev-libs/gmp:= ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) 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_single_target_python2_7(-)?] dev-libs/log4cpp ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 dev-libs/gmp:= ) python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/pygobject:*[cairo(+),python_targets_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[qt5(+)] ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) ) app-text/docbook-xml-dtd:4.2 >=dev-lang/swig-3.0.5 virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.7.1 python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) ) grc? ( x11-misc/xdg-utils ) oss? ( virtual/os-headers ) test? ( >=dev-util/cppunit-1.9.14 ) zeromq? ( net-libs/cppzmq ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Toolkit that provides signal processing blocks to implement software radios
 EAPI=6
 HOMEPAGE=https://www.gnuradio.org/
-IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_targets_python2_7 +python_single_target_python2_7
+IUSE=+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 dev-libs/boost:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] !<=dev-libs/boost-1.52.0-r6:0/1.52 || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/six[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) grc? ( dev-python/pygobject:*[cairo(+),python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/mako[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets: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_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/log4cpp ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 dev-libs/gmp:= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=dev-lang/orc-0.4.12 !<=dev-libs/boost-1.52.0-r6:0/1.52 sci-libs/fftw:3.0= alsa? ( media-libs/alsa-lib:= ) fcd? ( virtual/libusb:1 ) 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_single_target_python2_7(-)?] dev-libs/log4cpp ) vocoder? ( media-sound/gsm >=media-libs/codec2-0.8.1 ) wavelet? ( >=sci-libs/gsl-1.10 ) zeromq? ( >=net-libs/zeromq-2.1.11 dev-libs/gmp:= ) python_single_target_python2_7? ( dev-libs/boost:0=[python_targets_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/six[python_targets_python2_7(-)] filter? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) grc? ( dev-python/pygobject:*[cairo(+),python_targets_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)] dev-python/mako[python_targets_python2_7(-)] ) qt5? ( dev-python/PyQt5[opengl,python_targets_python2_7(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[qt5(+)] ) utils? ( || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) )
+REQUIRED_USE=^^ ( python_single_target_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 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=931df9aab0a96cd7b04958522bb2b269
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=521cee5ee09c7334358f5e801a84abd2
diff --git a/metadata/md5-cache/net-wireless/gr-air-modes-9999 b/metadata/md5-cache/net-wireless/gr-air-modes-9999
index 5ed7beeb5b4e..c917e5f00249 100644
--- a/metadata/md5-cache/net-wireless/gr-air-modes-9999
+++ b/metadata/md5-cache/net-wireless/gr-air-modes-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pyzmq[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr fgfs? ( games-simulation/flightgear || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 )
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr python_single_target_python2_7? ( dev-python/pyzmq[python_targets_python2_7(-)] fgfs? ( games-simulation/flightgear || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 )
 DESCRIPTION=This module implements a complete Mode S and ADS-B receiver for Gnuradio
 EAPI=7
 HOMEPAGE=https://www.cgran.org/wiki/gr-air-modes
-IUSE=fgfs rtlsdr uhd +python_targets_python2_7 +python_single_target_python2_7
+IUSE=fgfs rtlsdr uhd +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pyzmq[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr fgfs? ( games-simulation/flightgear || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7.0:= net-wireless/gr-osmosdr python_single_target_python2_7? ( dev-python/pyzmq[python_targets_python2_7(-)] fgfs? ( games-simulation/flightgear || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) ) rtlsdr? ( net-wireless/rtl-sdr ) uhd? ( >=net-wireless/uhd-3.4.0 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=857865070105da8e8b0fd8e216c82eb1
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a7fba38482a1aed73fe22651f2e5a5cc
diff --git a/metadata/md5-cache/net-wireless/gr-baz-9999 b/metadata/md5-cache/net-wireless/gr-baz-9999
index b5bcd70b04d0..1f07876397f0 100644
--- a/metadata/md5-cache/net-wireless/gr-baz-9999
+++ b/metadata/md5-cache/net-wireless/gr-baz-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=python_single_target_python2_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/boost:=[threads,python_targets_python2_7(-)] ) >=net-wireless/gnuradio-3.7.0:=[python_single_target_python2_7(-)?] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_single_target_python2_7(-)?] ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=Gnuradio baz
 EAPI=7
 HOMEPAGE=https://wiki.spench.net/wiki/Gr-baz
-IUSE=armadillo doc rtlsdr uhd +python_targets_python2_7 +python_single_target_python2_7
+IUSE=armadillo doc rtlsdr uhd +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[threads,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/boost:=[threads,python_targets_python2_7(-)] ) >=net-wireless/gnuradio-3.7.0:=[python_single_target_python2_7(-)?] armadillo? ( sci-libs/armadillo ) rtlsdr? ( virtual/libusb:1 ) uhd? ( net-wireless/uhd[python_single_target_python2_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1647e8bda8d3f55335f8c57fc53d7db5
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d245a6ac667a16f24a697a717208b09e
diff --git a/metadata/md5-cache/net-wireless/gr-doa-9999 b/metadata/md5-cache/net-wireless/gr-doa-9999
index 2f45982667a1..9a12bea5d42d 100644
--- a/metadata/md5-cache/net-wireless/gr-doa-9999
+++ b/metadata/md5-cache/net-wireless/gr-doa-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=net-wireless/gnuradio-3.7.0:=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Gnuradio flowgraphs and modules for Direction of Arrival analysis
 EAPI=6
 HOMEPAGE=https://github.com/samwhiting/gnuradio-doa
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=net-wireless/gnuradio-3.7.0:=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b417ca79e689a9716903b3b832966eb1
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=15cb88ac45808d2f9936fcafa2bc35fb
diff --git a/metadata/md5-cache/net-wireless/gr-foo-9999 b/metadata/md5-cache/net-wireless/gr-foo-9999
index 94326e64be5b..28514f4b2bd2 100644
--- a/metadata/md5-cache/net-wireless/gr-foo-9999
+++ b/metadata/md5-cache/net-wireless/gr-foo-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-lang/swig:0
+DEPEND=python_single_target_python2_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/boost:=[python_targets_python2_7(-)] ) >=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-wireless/uhd:=[python_single_target_python2_7(-)?] dev-lang/swig:0
 DESCRIPTION=Some GNU Radio blocks that bastianbl uses
 EAPI=7
 HOMEPAGE=https://github.com/rftap/gr-rftap
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/boost:=[python_targets_python2_7(-)] ) >=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-wireless/uhd:=[python_single_target_python2_7(-)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf6892b6a6a2d344bbe2cefcc3f9df5f
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95c65d3bbc9f03c557547828ca8dcf05
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 fdc4e764fa53..9646fc65e59a 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20180402
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
 EAPI=6
 HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8fa4a660396d2da0dc0df1281972dce
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c6e5240573cb7314fa456535b087f37e
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-9999 b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
index 25faec21e564..fdb69406591b 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-9999
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=IEEE 802.15.4 ZigBee Transceiver
 EAPI=6
 HOMEPAGE=https://github.com/bastibl/gr-ieee802-15-4
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( dev-libs/boost:=[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8fa4a660396d2da0dc0df1281972dce
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c6e5240573cb7314fa456535b087f37e
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 be03b0027c83..e309e307e62a 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
+++ b/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=GNU Radio IIO Blocks
 EAPI=6
 HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/v0.3.tar.gz -> gr-iio-0.3.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1418038bffe19f7218505cf3515db84
diff --git a/metadata/md5-cache/net-wireless/gr-iio-9999 b/metadata/md5-cache/net-wireless/gr-iio-9999
index 4d1ab7253f60..4c1a27a7cb5e 100644
--- a/metadata/md5-cache/net-wireless/gr-iio-9999
+++ b/metadata/md5-cache/net-wireless/gr-iio-9999
@@ -3,11 +3,11 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=GNU Radio IIO Blocks
 EAPI=6
 HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a1418038bffe19f7218505cf3515db84
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 f08cd7880f88..9648cb1e2b84 100644
--- a/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-0.37.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=gnuradio I/Q balancing
 EAPI=6
 HOMEPAGE=http://git.osmocom.org/gr-iqbal/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86a03cc6741841791f1106795e762bb4
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47fb0dcf4dd13556fe63befb9a841928
diff --git a/metadata/md5-cache/net-wireless/gr-iqbal-9999 b/metadata/md5-cache/net-wireless/gr-iqbal-9999
index 7d64de1f2e5b..be9bfb3274e8 100644
--- a/metadata/md5-cache/net-wireless/gr-iqbal-9999
+++ b/metadata/md5-cache/net-wireless/gr-iqbal-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=gnuradio I/Q balancing
 EAPI=6
 HOMEPAGE=http://git.osmocom.org/gr-iqbal/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?] net-libs/libosmo-dsp:= dev-libs/boost:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86a03cc6741841791f1106795e762bb4
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47fb0dcf4dd13556fe63befb9a841928
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r5 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r5
index aced6524be77..2edbf1aac4b0 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r5
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r5
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iio? ( net-wireless/gr-iio ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/cheetah sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iio? ( net-wireless/gr-iio ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] ) dev-python/cheetah sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=6
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-IUSE=bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_targets_python2_7 +python_single_target_python2_7
+IUSE=bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_single_target_python2_7
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iio? ( net-wireless/gr-iio ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iio? ( net-wireless/gr-iio ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1b19852a7ff15a566c255d294efb170
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9eec6e087b4e00ffbef3cca75bc2f1e7
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5
index 653eb78d5223..de395f8eedb7 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.5
@@ -1,15 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/cheetah
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] ) dev-python/cheetah
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=7
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-IUSE=airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_targets_python2_7 +python_single_target_python2_7
+IUSE=airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0/0.1.5
 SRC_URI=https://github.com/osmocom/gr-osmosdr/archive/v0.1.5.tar.gz -> gr-osmosdr-0.1.5.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=300b8c046187fb7dc8a77952674c91be
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b0d986d79f807d9ef047a474f997700d
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-9999 b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
index 4dea09d3c4bf..70295752351f 100644
--- a/metadata/md5-cache/net-wireless/gr-osmosdr-9999
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/cheetah
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] ) dev-python/cheetah
 DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
 EAPI=7
 HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
-IUSE=airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_targets_python2_7 +python_single_target_python2_7
+IUSE=airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,python_single_target_python2_7(-)?] airspy? ( net-wireless/airspy ) bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iqbalance? ( net-wireless/gr-iqbal:=[python_single_target_python2_7(-)?] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[python_single_target_python2_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=300b8c046187fb7dc8a77952674c91be
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b0d986d79f807d9ef047a474f997700d
diff --git a/metadata/md5-cache/net-wireless/gr-paint-9999 b/metadata/md5-cache/net-wireless/gr-paint-9999
index 3a1142515246..01ceb334d7b9 100644
--- a/metadata/md5-cache/net-wireless/gr-paint-9999
+++ b/metadata/md5-cache/net-wireless/gr-paint-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-lang/swig dev-util/cppunit virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-wireless/gnuradio:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/boost:=[python_targets_python2_7(-)] ) net-wireless/gnuradio:=[python_single_target_python2_7(-)?]
 DESCRIPTION=Paints monochrome images into the waterfall of a receiver
 EAPI=7
 HOMEPAGE=https://github.com/drmpeg/gr-paint
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc +python_single_target_python2_7
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] net-wireless/gnuradio:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-gfx/imagemagick
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/boost:=[python_targets_python2_7(-)] ) net-wireless/gnuradio:=[python_single_target_python2_7(-)?] media-gfx/imagemagick
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41519c9793ce7cb8329de00f0061c5ec
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8db62cbf76c52604771f6015f2ea3490
diff --git a/metadata/md5-cache/net-wireless/gr-rds-9999 b/metadata/md5-cache/net-wireless/gr-rds-9999
index 5ae984962284..e3db819fcadb 100644
--- a/metadata/md5-cache/net-wireless/gr-rds-9999
+++ b/metadata/md5-cache/net-wireless/gr-rds-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-lang/swig:0 >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/boost:=[python_targets_python2_7(-)] ) >=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?]
 DESCRIPTION=GNU Radio FM RDS Receiver
 EAPI=7
 HOMEPAGE=https://github.com/bastibl/gr-rds
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/boost:=[python_targets_python2_7(-)] ) >=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35e220935e08ee41c95af9a857e8e56e
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfc44cf34a197f931ec45c7179f0e4d9
diff --git a/metadata/md5-cache/net-wireless/gr-rftap-9999 b/metadata/md5-cache/net-wireless/gr-rftap-9999
index bde65fe4d56a..d6ad17ae2799 100644
--- a/metadata/md5-cache/net-wireless/gr-rftap-9999
+++ b/metadata/md5-cache/net-wireless/gr-rftap-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-lang/swig:0 >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_python2_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/boost:=[python_targets_python2_7(-)] ) >=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?]
 DESCRIPTION=RFtap Module for GNU Radio
 EAPI=7
 HOMEPAGE=https://github.com/rftap/gr-rftap
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gnuradio-3.7_rc:0=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/boost:=[python_targets_python2_7(-)] ) >=net-wireless/gnuradio-3.7_rc:0=[python_single_target_python2_7(-)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0/9999
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=358048d658ea67199f5934b3d9daf399
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0782464bed779aa2ea9506c74a749df5
diff --git a/metadata/md5-cache/net-wireless/gr-specest-9999 b/metadata/md5-cache/net-wireless/gr-specest-9999
index 623eac566e2d..0e2ee6c85282 100644
--- a/metadata/md5-cache/net-wireless/gr-specest-9999
+++ b/metadata/md5-cache/net-wireless/gr-specest-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=net-wireless/gnuradio-3.7.0:=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=A module adding spectral estimation routines to GNU Radio
 EAPI=6
 HOMEPAGE=https://github.com/kit-cel/gr-specest
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc +python_single_target_python2_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=net-wireless/gnuradio-3.7.0:=[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=net-wireless/gnuradio-3.7.0:=[python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0821b550f11404e2b840108474873dfe
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c74b31d5f82b347dce816f53a5897741
diff --git a/metadata/md5-cache/net-wireless/iwd-1.5 b/metadata/md5-cache/net-wireless/iwd-1.5
new file mode 100644
index 000000000000..ee0fa50925ae
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/iwd-1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend setup unpack
+DEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.28 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Wireless daemon for linux
+EAPI=6
+HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
+IUSE=+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= ) ~dev-libs/ell-0.28 net-wireless/wireless-regdb crda? ( net-wireless/crda )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-1.5.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=df4114f5e565dc652f0398554c273f32
diff --git a/metadata/md5-cache/net-wireless/jackit-0.0_p20170918 b/metadata/md5-cache/net-wireless/jackit-0.0_p20170918
index a807eff8b55b..db9def379217 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/insecurityofthings/jackit/archive/1c057fad102af7daad537421d95e2695caeff2b7.tar.gz -> jackit-0.0_p20170918.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4ed8ea7d84e4c3350a3c59fb6138e832
diff --git a/metadata/md5-cache/net-wireless/kismet-2016.07.1-r2 b/metadata/md5-cache/net-wireless/kismet-2016.07.1-r2
index fdb4bfd0d754..a16638cec549 100644
--- a/metadata/md5-cache/net-wireless/kismet-2016.07.1-r2
+++ b/metadata/md5-cache/net-wireless/kismet-2016.07.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-wireless/wireless-tools kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) client? ( sys-libs/ncurses:0= ) !arm? ( speech? ( app-accessibility/flite ) ) plugin-btscan? ( net-wireless/bluez ) plugin-dot15d4? ( virtual/libusb:0 ) plugin-spectools? ( net-wireless/spectools ) plugin-ptw? ( dev-libs/openssl:= ) ruby? ( dev-lang/ruby:* ) selinux? ( sec-policy/selinux-kismet )
 SLOT=0/2016.07.1
 SRC_URI=https://www.kismetwireless.net/code/kismet-2016-07-R1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6fd70aae5cc47771581fbe58652ab5d2
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.09.1-r1 b/metadata/md5-cache/net-wireless/kismet-2019.09.1-r1
deleted file mode 100644
index ab9f0d8623d6..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2019.09.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer
-EAPI=7
-HOMEPAGE=https://www.kismetwireless.net
-IUSE=lm-sensors mousejack networkmanager +pcre selinux +suid +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 arm ~arm64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] selinux? ( sec-policy/selinux-kismet )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0/2019.09.1
-SRC_URI=https://www.kismetwireless.net/code/kismet-2019-09-R1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=56df2da4e6b311ac7795c6c19aaef537
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.09.1-r2 b/metadata/md5-cache/net-wireless/kismet-2019.09.1-r2
new file mode 100644
index 000000000000..52827eaa1e2a
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-2019.09.1-r2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) virtual/pkgconfig
+DESCRIPTION=IEEE 802.11 wireless LAN sniffer
+EAPI=7
+HOMEPAGE=https://www.kismetwireless.net
+IUSE=lm-sensors mousejack networkmanager +pcre selinux +suid +python_single_target_python3_6
+KEYWORDS=amd64 arm ~arm64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) mousejack? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) python_single_target_python3_6? ( dev-python/pyserial[python_targets_python3_6(-)] ) selinux? ( sec-policy/selinux-kismet )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0/2019.09.1
+SRC_URI=https://www.kismetwireless.net/code/kismet-2019-09-R1.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=c9440faad570d3763b085122df9299f6
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.12.2 b/metadata/md5-cache/net-wireless/kismet-2019.12.2
deleted file mode 100644
index 6c4e4678114a..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2019.12.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer
-EAPI=7
-HOMEPAGE=https://www.kismetwireless.net
-IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-PDEPEND=rtlsdr? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] net-wireless/rtl-sdr )
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] selinux? ( sec-policy/selinux-kismet )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0/2019.12.2
-SRC_URI=https://www.kismetwireless.net/code/kismet-2019-12-R2.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=af3f6459ddffaad4c8814c3352ee114d
diff --git a/metadata/md5-cache/net-wireless/kismet-2019.12.2-r1 b/metadata/md5-cache/net-wireless/kismet-2019.12.2-r1
new file mode 100644
index 000000000000..76cbf93232c2
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/kismet-2019.12.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) virtual/pkgconfig
+DESCRIPTION=IEEE 802.11 wireless LAN sniffer
+EAPI=7
+HOMEPAGE=https://www.kismetwireless.net
+IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth +python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+PDEPEND=rtlsdr? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) net-wireless/rtl-sdr )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) python_single_target_python3_6? ( dev-python/pyserial[python_targets_python3_6(-)] ) selinux? ( sec-policy/selinux-kismet )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0/2019.12.2
+SRC_URI=https://www.kismetwireless.net/code/kismet-2019-12-R2.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1a19b731c75ba6e68ef6e7741feffa8f
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index a652910b0ebc..62046f802873 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst preinst prepare setup unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) virtual/pkgconfig
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) virtual/pkgconfig
 DESCRIPTION=IEEE 802.11 wireless LAN sniffer
 EAPI=7
 HOMEPAGE=https://www.kismetwireless.net
-IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth +python_targets_python3_6 +python_single_target_python3_6
+IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth +python_single_target_python3_6
 LICENSE=GPL-2
-PDEPEND=rtlsdr? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] net-wireless/rtl-sdr )
+PDEPEND=rtlsdr? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) net-wireless/rtl-sdr )
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] selinux? ( sec-policy/selinux-kismet )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_6? ( dev-python/protobuf-python[python_targets_python3_6(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) python_single_target_python3_6? ( dev-python/pyserial[python_targets_python3_6(-)] ) selinux? ( sec-policy/selinux-kismet )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=strip
 SLOT=0/9999
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=af3f6459ddffaad4c8814c3352ee114d
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1a19b731c75ba6e68ef6e7741feffa8f
diff --git a/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02 b/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
index c40b77f3fa68..c32ef16476ac 100644
--- a/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
+++ b/metadata/md5-cache/net-wireless/kismet-rest-2019.05.02
@@ -11,5 +11,5 @@ RDEPEND=dev-python/requests !<net-wireless/kismet-2019.05.1 python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/python-kismet-rest/archive/2019.05.02.tar.gz -> kismet-rest-2019.05.02.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eb1b64177d43deb6ddec75ed6456ac50
diff --git a/metadata/md5-cache/net-wireless/kismet-rest-9999 b/metadata/md5-cache/net-wireless/kismet-rest-9999
index 73dc6b1434f1..f3f303497063 100644
--- a/metadata/md5-cache/net-wireless/kismet-rest-9999
+++ b/metadata/md5-cache/net-wireless/kismet-rest-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-python/requests !<net-wireless/kismet-2019.05.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eb1b64177d43deb6ddec75ed6456ac50
diff --git a/metadata/md5-cache/net-wireless/kismetdb-2019.05.05 b/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
index 7a21a62e87df..8bdc4b3e6c01 100644
--- a/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
+++ b/metadata/md5-cache/net-wireless/kismetdb-2019.05.05
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[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(-)]
+DEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Kismetdb database log helper library
 EAPI=7
 HOMEPAGE=https://kismetwireless.net/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/kismetwireless/python-kismet-db/archive/2019.05.05.tar.gz -> kismetdb-2019.05.05.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=513debc9228f6a5b083417bcb87d36cb
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9b6bd9b611e4141b6d0ca5bf55485263
diff --git a/metadata/md5-cache/net-wireless/kismetdb-9999 b/metadata/md5-cache/net-wireless/kismetdb-9999
index 654d0a0d100b..1dcff575a725 100644
--- a/metadata/md5-cache/net-wireless/kismetdb-9999
+++ b/metadata/md5-cache/net-wireless/kismetdb-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[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(-)]
+DEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Kismetdb database log helper library
 EAPI=7
 HOMEPAGE=https://kismetwireless.net/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplekml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=513debc9228f6a5b083417bcb87d36cb
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9b6bd9b611e4141b6d0ca5bf55485263
diff --git a/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109 b/metadata/md5-cache/net-wireless/lorcon-0.0_p20150109
index 2e32e810687d..8968de2b2170 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2a6f54c675a3a5b78dd8bac621c90be6
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 2728b6e93fcc..234e9217e0df 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fcb6546039e89ccf1dfd649e1e84c609
diff --git a/metadata/md5-cache/net-wireless/lorcon-9999 b/metadata/md5-cache/net-wireless/lorcon-9999
index 6192d176c077..9d41570d7b84 100644
--- a/metadata/md5-cache/net-wireless/lorcon-9999
+++ b/metadata/md5-cache/net-wireless/lorcon-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fcb6546039e89ccf1dfd649e1e84c609
diff --git a/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r1 b/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r1
deleted file mode 100644
index 51c1e07c449f..000000000000
--- a/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-embedded/sdcc[device-lib,mcs51,sdbinutils]
-DESCRIPTION=Firmware and research tools for nRF24LU1+ based USB dongles and breakout boards
-EAPI=6
-HOMEPAGE=https://www.mousejack.com/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-embedded/sdcc[device-lib,mcs51,sdbinutils] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pyusb[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/BastilleResearch/nrf-research-firmware/archive/02b84d1c4e59c0fb98263c83b2e7c7f9863a3b93.tar.gz -> mousejack-0.0_p20160726.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=748885b6f986fad9bd69551561768883
diff --git a/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r2 b/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r2
new file mode 100644
index 000000000000..7f6e072d24be
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/mousejack-0.0_p20160726-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=dev-embedded/sdcc[device-lib,mcs51,sdbinutils]
+DESCRIPTION=Firmware and research tools for nRF24LU1+ based USB dongles and breakout boards
+EAPI=6
+HOMEPAGE=https://www.mousejack.com/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-embedded/sdcc[device-lib,mcs51,sdbinutils] python_single_target_python2_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/pyusb[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/BastilleResearch/nrf-research-firmware/archive/02b84d1c4e59c0fb98263c83b2e7c7f9863a3b93.tar.gz -> mousejack-0.0_p20160726.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f6daccea96266dbabc9de9122723f511
diff --git a/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r1 b/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r1
deleted file mode 100644
index 068f5b613744..000000000000
--- a/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7:=[grc,utils,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gr-osmosdr-0.1.0:=
-DESCRIPTION=multimode radio decoder for rtl-sdr devices using gnuradio
-EAPI=5
-HOMEPAGE=https://www.cgran.org/browser/projects/multimode/trunk
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7:=[grc,utils,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/gr-osmosdr-0.1.0:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/multimode-1.4_p20140831.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fafbb0aad32135fd742419c9083187e8
diff --git a/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r2 b/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r2
new file mode 100644
index 000000000000..7f5fe45113fb
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/multimode-1.4_p20140831-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7:=[grc,utils,python_single_target_python2_7(-)?] >=net-wireless/gr-osmosdr-0.1.0:=
+DESCRIPTION=multimode radio decoder for rtl-sdr devices using gnuradio
+EAPI=5
+HOMEPAGE=https://www.cgran.org/browser/projects/multimode/trunk
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=net-wireless/gnuradio-3.7:=[grc,utils,python_single_target_python2_7(-)?] >=net-wireless/gr-osmosdr-0.1.0:=
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/multimode-1.4_p20140831.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1bb31a3fdf6be867aac10d89a7d807c2
diff --git a/metadata/md5-cache/net-wireless/multimode-9999 b/metadata/md5-cache/net-wireless/multimode-9999
index d0cfe37d2ca4..6cd170e1fa58 100644
--- a/metadata/md5-cache/net-wireless/multimode-9999
+++ b/metadata/md5-cache/net-wireless/multimode-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) =net-wireless/gnuradio-9999:=[grc,utils,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] =net-wireless/gr-osmosdr-9999:= || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) =net-wireless/gnuradio-9999:=[grc,utils,python_single_target_python2_7(-)?] =net-wireless/gr-osmosdr-9999:= || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=multimode radio decoder for rtl-sdr devices using gnuradio
 EAPI=5
 HOMEPAGE=https://www.cgran.org/browser/projects/multimode/trunk
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) =net-wireless/gnuradio-9999:=[grc,utils,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] =net-wireless/gr-osmosdr-9999:=
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) =net-wireless/gnuradio-9999:=[grc,utils,python_single_target_python2_7(-)?] =net-wireless/gr-osmosdr-9999:=
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a6ab6d55c0856e5b1f1860aec37df5e6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d33ba13afa12e55f726d8289eb0729cf
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-0.1.5 b/metadata/md5-cache/net-wireless/nanovna-saver-0.1.5
index 615edea8f535..b74d1a2a299d 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-0.1.5
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-0.1.5
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyserial[python_targets_python3_7(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/mihtjel/nanovna-saver/archive/v0.1.5.tar.gz -> nanovna-saver-0.1.5.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=43f13bb8dc1c8881bf0f8abc74b486e2
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-9999 b/metadata/md5-cache/net-wireless/nanovna-saver-9999
index 4e9512757217..483b9f746ef5 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-9999
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/pyserial[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/PyQt5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=43f13bb8dc1c8881bf0f8abc74b486e2
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 5b7e2978966e..7aa2073c2bf4 100644
--- a/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1
+++ b/metadata/md5-cache/net-wireless/pyrit-0.4.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/openssl net-libs/libpcap test? ( >=net-analyzer/scapy-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=dev-libs/openssl net-libs/libpcap test? ( python_single_target_python2_7? ( >=net-analyzer/scapy-2[python_targets_python2_7(-)] ) ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=GPU-accelerated attack against WPA-PSK authentication
 EAPI=5
 HOMEPAGE=https://github.com/JPaulMora/Pyrit
-IUSE=cuda opencl test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=cuda opencl test +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=net-analyzer/scapy-2 opencl? ( net-wireless/cpyrit-opencl ) cuda? ( net-wireless/cpyrit-cuda ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0e6ea682e59008ec7e36be881fb510b
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e4cc933221242b6a23aeb4301282b47a
diff --git a/metadata/md5-cache/net-wireless/pyrit-0.5.0 b/metadata/md5-cache/net-wireless/pyrit-0.5.0
deleted file mode 100644
index 48c8bd05552a..000000000000
--- a/metadata/md5-cache/net-wireless/pyrit-0.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/openssl net-libs/libpcap test? ( >=net-analyzer/scapy-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=GPU-accelerated attack against WPA-PSK authentication
-EAPI=6
-HOMEPAGE=https://github.com/JPaulMora/Pyrit
-IUSE=cuda opencl test +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=net-analyzer/scapy-2 opencl? ( net-wireless/cpyrit-opencl ) cuda? ( net-wireless/cpyrit-cuda ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz -> pyrit-0.5.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91f3cda0ffc1215bc9cffe62f71c1d59
diff --git a/metadata/md5-cache/net-wireless/pyrit-0.5.0-r1 b/metadata/md5-cache/net-wireless/pyrit-0.5.0-r1
new file mode 100644
index 000000000000..a49421715dea
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/pyrit-0.5.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/openssl net-libs/libpcap test? ( python_single_target_python2_7? ( >=net-analyzer/scapy-2[python_targets_python2_7(-)] ) ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=GPU-accelerated attack against WPA-PSK authentication
+EAPI=6
+HOMEPAGE=https://github.com/JPaulMora/Pyrit
+IUSE=cuda opencl test +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=net-analyzer/scapy-2 opencl? ( net-wireless/cpyrit-opencl ) cuda? ( net-wireless/cpyrit-cuda ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/JPaulMora/Pyrit/archive/v0.5.0.tar.gz -> pyrit-0.5.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=220cf14051e6488773acb150b3102018
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 fe5c56c700ab..420c5252657d 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2279e816e7c5eb6642af5888863f08e9
diff --git a/metadata/md5-cache/net-wireless/reaver-1.6.5 b/metadata/md5-cache/net-wireless/reaver-1.6.5
index 5e3627066558..59a5bea5f5e4 100644
--- a/metadata/md5-cache/net-wireless/reaver-1.6.5
+++ b/metadata/md5-cache/net-wireless/reaver-1.6.5
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=https://github.com/t6x/reaver-wps-fork-t6x/archive/v1.6.5.tar.gz -> reaver-1.6.5.tar.gz
-_md5_=de7bf704484ed6c2b9e4baf72e8e4cf4
+_md5_=8027778a1ad718bec86b903438439cf8
diff --git a/metadata/md5-cache/net-wireless/rfcat-0.0.170508 b/metadata/md5-cache/net-wireless/rfcat-0.0.170508
index 5531d955de85..cf85ebcf7b2d 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7053349cb32f2b873534aca77466961d
diff --git a/metadata/md5-cache/net-wireless/rfcat-0.0.190423 b/metadata/md5-cache/net-wireless/rfcat-0.0.190423
index 763b00181652..38377ec37a2f 100644
--- a/metadata/md5-cache/net-wireless/rfcat-0.0.190423
+++ b/metadata/md5-cache/net-wireless/rfcat-0.0.190423
@@ -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=https://github.com/atlas0fd00m/rfcat/archive/109f887fc816021a2cb2875dce62ab9cad02c5f3.tar.gz -> rfcat-0.0.190423.tar.gz 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=294ea5967bfbc934684636e712367677
diff --git a/metadata/md5-cache/net-wireless/rfcat-9999 b/metadata/md5-cache/net-wireless/rfcat-9999
index cabed08ec376..2b5d2985db09 100644
--- a/metadata/md5-cache/net-wireless/rfcat-9999
+++ b/metadata/md5-cache/net-wireless/rfcat-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b951a10991594128b6d3fdd2a25f745b
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 83ac5c0472e7..924db23c9986 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_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 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	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=499543989fb9553116df9337378686b2
diff --git a/metadata/md5-cache/net-wireless/soapy_power-9999 b/metadata/md5-cache/net-wireless/soapy_power-9999
index 0437be1aa5bf..00229cdfebb3 100644
--- a/metadata/md5-cache/net-wireless/soapy_power-9999
+++ b/metadata/md5-cache/net-wireless/soapy_power-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/simplespectral[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/simplesoapy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] faster? ( sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) fastest? ( dev-python/pyFFTW[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=499543989fb9553116df9337378686b2
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 b5b447895cf8..e603c34bfd85 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.10.3.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.10.3.0
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=6
 HOMEPAGE=http://code.ettus.com/redmine/ettus/projects/uhd/wiki
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/libusb:1 dev-lang/orc dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 2d0add1f2307..fd73c7b3e4e3 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.11.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.11.0.0
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=6
 HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e6fb3fab293e4558ea773546b5ea2ca
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 8694fb7b22df..d973627d953b 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.12.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.12.0.0
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=6
 HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb2d7bd36124f68aedcc234abf854bd5
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 e6452b550d00..2358c23b9089 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.13.0.1
+++ b/metadata/md5-cache/net-wireless/uhd-3.13.0.1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=6
 HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 RESTRICT=!test? ( test )
 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cb2d7bd36124f68aedcc234abf854bd5
diff --git a/metadata/md5-cache/net-wireless/uhd-3.13.1.0 b/metadata/md5-cache/net-wireless/uhd-3.13.1.0
index 22651cd820a2..006d413c220c 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.13.1.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.13.1.0
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=6
 HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 RESTRICT=!test? ( test )
 SLOT=0/3.13
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.13.1.0.tar.gz -> EttusResearch-UHD-3.13.1.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.13.1.0/uhd-images_3.13.1.0.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfc713c03b442c1483f1a9ccb13b311d
diff --git a/metadata/md5-cache/net-wireless/uhd-3.14.0.0 b/metadata/md5-cache/net-wireless/uhd-3.14.0.0
index a4f6e2c38cb7..d4b8949ff59d 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.14.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.14.0.0
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=6
 HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 RESTRICT=!test? ( test )
 SLOT=0/3.14
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.14.0.0.tar.gz -> EttusResearch-UHD-3.14.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.14.0.0/uhd-images_3.14.0.0.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bfc713c03b442c1483f1a9ccb13b311d
diff --git a/metadata/md5-cache/net-wireless/uhd-3.14.1.1 b/metadata/md5-cache/net-wireless/uhd-3.14.1.1
index 2fb317b7bc50..91d0b66979d1 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.14.1.1
+++ b/metadata/md5-cache/net-wireless/uhd-3.14.1.1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=6
 HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 RESTRICT=!test? ( test )
 SLOT=0/3.14.1
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.14.1.1.tar.gz -> EttusResearch-UHD-3.14.1.1.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.14.1.1/uhd-images_3.14.1.1.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1dedcd3e652f52833099017b2cfb4e1b
diff --git a/metadata/md5-cache/net-wireless/uhd-3.15.0.0 b/metadata/md5-cache/net-wireless/uhd-3.15.0.0
index d360f64731bb..4a1aec11ab25 100644
--- a/metadata/md5-cache/net-wireless/uhd-3.15.0.0
+++ b/metadata/md5-cache/net-wireless/uhd-3.15.0.0
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Universal Software Radio Peripheral (USRP) Hardware Driver
 EAPI=6
 HOMEPAGE=https://kb.ettus.com
-IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300 +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) e300? ( virtual/udev ) usb? ( virtual/libusb:1 ) dev-libs/boost:= sys-libs/ncurses:0[tinfo]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) b100? ( usb ) b200? ( usb ) usrp1? ( usb ) usrp2? ( usb ) || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )
 RESTRICT=!test? ( test )
 SLOT=0/3.15.0
 SRC_URI=https://github.com/EttusResearch/uhd/archive/v3.15.0.0.tar.gz -> EttusResearch-UHD-3.15.0.0.tar.gz https://github.com/EttusResearch/uhd/releases/download/v3.15.0.0/uhd-images_3.15.0.0.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e7168c91ae9991ab2de9affb55d7569
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 b05b0426061f..dfc113346f15 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=367778f1389439fd8e000c87dd193c43
diff --git a/metadata/md5-cache/net-wireless/urh-2.7.5 b/metadata/md5-cache/net-wireless/urh-2.7.5
index 074e654f6ed0..beccb8d938ee 100644
--- a/metadata/md5-cache/net-wireless/urh-2.7.5
+++ b/metadata/md5-cache/net-wireless/urh-2.7.5
@@ -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/jopohl/urh/archive/v2.7.5.tar.gz -> urh-2.7.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=237be5941cb325752f06abe5a7359ac0
diff --git a/metadata/md5-cache/net-wireless/urh-9999 b/metadata/md5-cache/net-wireless/urh-9999
index c792ff9e013e..5667816a9ef7 100644
--- a/metadata/md5-cache/net-wireless/urh-9999
+++ b/metadata/md5-cache/net-wireless/urh-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),testlib] net-wireless/gr-osmosdr 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=237be5941cb325752f06abe5a7359ac0
diff --git a/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2 b/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2
deleted file mode 100644
index f10cb83eee4b..000000000000
--- a/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles
-EAPI=5
-HOMEPAGE=http://wifi-radar.tuxfamily.org/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-admin/sudo >=dev-python/pygtk-2.16.0-r1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=net-wireless/wireless-tools-29 || ( net-misc/dhcpcd net-misc/dhcp net-misc/pump )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://wifi-radar.tuxfamily.org/pub/wifi-radar-2.0.s08.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=929129c21aa92047a53d51708ae872c4
diff --git a/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r3 b/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r3
new file mode 100644
index 000000000000..4d6f0a067316
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles
+EAPI=5
+HOMEPAGE=http://wifi-radar.tuxfamily.org/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-admin/sudo python_single_target_python2_7? ( >=dev-python/pygtk-2.16.0-r1[python_targets_python2_7(-)] ) >=net-wireless/wireless-tools-29 || ( net-misc/dhcpcd net-misc/dhcp net-misc/pump )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://wifi-radar.tuxfamily.org/pub/wifi-radar-2.0.s08.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo	566393c426fca4615a83df9a982bb9d9	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=e267c52c03aeef4e3f5a70bf4925336b
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 38b755cc025c..260840bf291e 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.2.3 b/metadata/md5-cache/sci-astronomy/kstars-3.2.3
index 52512e224e92..8f2c3cfdad1b 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.2.3
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.2.3
@@ -4,12 +4,12 @@ DEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-f
 DESCRIPTION=Desktop Planetarium
 EAPI=7
 HOMEPAGE=https://kde.org/applications/education/kstars https://edu.kde.org/kstars/
-IUSE=fits indi +password raw wcs debug +handbook +python_targets_python2_7 +python_single_target_python2_7
+IUSE=fits indi +password raw wcs debug +handbook +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kplotting-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdatavis3d-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebsockets-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.7.5 ) password? ( dev-libs/qtkeychain:= ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=indi? ( fits ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=indi? ( fits ) ^^ ( python_single_target_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.2.3.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	kde5	43b81ba8315f22f13c8461215eb0e6dd	kde5-functions	7f1ffe0e976f19abc8fc9ffe0fbccafa	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	kde5	43b81ba8315f22f13c8461215eb0e6dd	kde5-functions	7f1ffe0e976f19abc8fc9ffe0fbccafa	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=61da00c55cfb6f6059c88cc3b333ca68
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.3.9 b/metadata/md5-cache/sci-astronomy/kstars-3.3.9
index 178960fdc074..5e39feb8306d 100644
--- a/metadata/md5-cache/sci-astronomy/kstars-3.3.9
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.3.9
@@ -5,11 +5,11 @@ DESCRIPTION=Desktop Planetarium
 EAPI=7
 HOMEPAGE=https://kde.org/applications/education/org.kde.kstars https://edu.kde.org/kstars/
 IUSE=fits indi +password raw wcs debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=>=dev-qt/qtdatavis3d-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwebsockets-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kplotting-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 sys-libs/zlib fits? ( sci-libs/cfitsio ) indi? ( >=sci-libs/indilib-1.7.5 sci-libs/libnova ) password? ( dev-libs/qtkeychain:= ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib ) >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtpositioning-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=indi? ( fits )
 SLOT=5
 SRC_URI=mirror://kde/stable/kstars/kstars-3.3.9.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2e7dc65ec88c3a2285030c8e0fc0d9d7
+_md5_=df692330c081ce5db6c6d664a7b3715d
diff --git a/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1 b/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
index 94f44bf6a1db..febd95cfe8ae 100644
--- a/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
+++ b/metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyephem/pyephem-3.7.6.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cdf3ac423796db34467ab688f91cffde
diff --git a/metadata/md5-cache/sci-biology/HTSeq-0.9.1 b/metadata/md5-cache/sci-biology/HTSeq-0.9.1
index 5bda20184c26..eb54209ff7ce 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/H/HTSeq/HTSeq-0.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a7e20f6705425c8dc29ce2c240db0b2
diff --git a/metadata/md5-cache/sci-biology/HTSeq-9999 b/metadata/md5-cache/sci-biology/HTSeq-9999
index 17c9c8faa44e..bb2c8c831a35 100644
--- a/metadata/md5-cache/sci-biology/HTSeq-9999
+++ b/metadata/md5-cache/sci-biology/HTSeq-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-biology/pysam[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a7e20f6705425c8dc29ce2c240db0b2
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index b928e351b759..cbe4b5a1cd72 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/amos-3.1.0-r4 b/metadata/md5-cache/sci-biology/amos-3.1.0-r4
index cdc1848c8e15..ea3aa2c0d462 100644
--- a/metadata/md5-cache/sci-biology/amos-3.1.0-r4
+++ b/metadata/md5-cache/sci-biology/amos-3.1.0-r4
@@ -3,12 +3,12 @@ DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16
 DESCRIPTION=A Modular, Open-Source whole genome assembler
 EAPI=6
 HOMEPAGE=http://amos.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-perl/DBI dev-perl/Statistics-Descriptive sci-biology/mummer
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/amos/amos-3.1.0.tar.gz https://dev.gentoo.org/~soap/distfiles/amos-3.1.0-fix-c++14.patch.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=aec6d1c76d5ea621c66e803800e2b3c4
diff --git a/metadata/md5-cache/sci-biology/bcftools-1.9 b/metadata/md5-cache/sci-biology/bcftools-1.9
deleted file mode 100644
index 50012519e8be..000000000000
--- a/metadata/md5-cache/sci-biology/bcftools-1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=dev-lang/perl =sci-libs/htslib-1.9*:= sys-libs/zlib:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DESCRIPTION=Utilities for variant calling and manipulating VCF and BCF files
-EAPI=7
-HOMEPAGE=http://www.htslib.org
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/perl =sci-libs/htslib-1.9*:= sys-libs/zlib:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/samtools/bcftools/releases/download/1.9/bcftools-1.9.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=67c63191569c3370d6eca3ec783afbea
diff --git a/metadata/md5-cache/sci-biology/bcftools-1.9-r2 b/metadata/md5-cache/sci-biology/bcftools-1.9-r2
new file mode 100644
index 000000000000..fc51fe9deea3
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/bcftools-1.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=dev-lang/perl python_single_target_python3_6? ( dev-python/matplotlib[python_targets_python3_6(-)] ) =sci-libs/htslib-1.9*:= sys-libs/zlib:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+DESCRIPTION=Utilities for variant calling and manipulating VCF and BCF files
+EAPI=7
+HOMEPAGE=http://www.htslib.org
+IUSE=+python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-lang/perl python_single_target_python3_6? ( dev-python/matplotlib[python_targets_python3_6(-)] ) =sci-libs/htslib-1.9*:= sys-libs/zlib:= python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/samtools/bcftools/releases/download/1.9/bcftools-1.9.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=12e708ee9cbff94d9e05cdd879d1ed3a
diff --git a/metadata/md5-cache/sci-biology/bedtools-2.26.0 b/metadata/md5-cache/sci-biology/bedtools-2.26.0
index a391db0844e9..76195e3dee24 100644
--- a/metadata/md5-cache/sci-biology/bedtools-2.26.0
+++ b/metadata/md5-cache/sci-biology/bedtools-2.26.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install setup
-DEPEND=|| ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) test? ( sci-libs/htslib sci-biology/samtools:0 )
+DEPEND=|| ( dev-lang/python:3.6 ) test? ( sci-libs/htslib sci-biology/samtools:0 )
 DESCRIPTION=Tools for manipulation and analysis of BED, GFF/GTF, VCF, SAM/BAM file formats
 EAPI=6
 HOMEPAGE=https://bedtools.readthedocs.io/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/arq5x/bedtools2/releases/download/v2.26.0/bedtools-2.26.0.tar.gz https://dev.gentoo.org/~mgorny/dist/bedtools-2.26.0-fix-buildsystem.patch.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7823f0eb8a9e0d9782d2caf65208df9e
+_md5_=1b65bed58bf80baf59cb7772dbdb6023
diff --git a/metadata/md5-cache/sci-biology/biopandas-0.2.1 b/metadata/md5-cache/sci-biology/biopandas-0.2.1
index 389c4f8456bf..918f8356dcab 100644
--- a/metadata/md5-cache/sci-biology/biopandas-0.2.1
+++ b/metadata/md5-cache/sci-biology/biopandas-0.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/B/BioPandas/biopandas-0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9aa50282a8f020366a788665165393c5
diff --git a/metadata/md5-cache/sci-biology/biopython-1.73 b/metadata/md5-cache/sci-biology/biopython-1.73
index e24a94a5fc94..ea26c1149772 100644
--- a/metadata/md5-cache/sci-biology/biopython-1.73
+++ b/metadata/md5-cache/sci-biology/biopython-1.73
@@ -11,5 +11,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/b/biopython/biopython-1.73.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a7d43dcf81616b69a0167851abcbe227
diff --git a/metadata/md5-cache/sci-biology/foldingathome-7.5.1 b/metadata/md5-cache/sci-biology/foldingathome-7.5.1
index 6d182505c317..895557ad12b0 100644
--- a/metadata/md5-cache/sci-biology/foldingathome-7.5.1
+++ b/metadata/md5-cache/sci-biology/foldingathome-7.5.1
@@ -9,5 +9,5 @@ RDEPEND=app-arch/bzip2 || ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*
 RESTRICT=mirror bindist strip
 SLOT=0
 SRC_URI=https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.5/fahclient_7.5.1-64bit-release.tar.bz2
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a1c1420f8b9044694473f469d5e750af
diff --git a/metadata/md5-cache/sci-biology/last-299-r1 b/metadata/md5-cache/sci-biology/last-299-r1
index 9607479e3870..67b6754d1243 100644
--- a/metadata/md5-cache/sci-biology/last-299-r1
+++ b/metadata/md5-cache/sci-biology/last-299-r1
@@ -3,12 +3,12 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Genome-scale comparison of biological sequences
 EAPI=6
 HOMEPAGE=http://last.cbrc.jp/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://last.cbrc.jp/last-299.zip
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec5206661373a6ef6ad77450dfbdb915
diff --git a/metadata/md5-cache/sci-biology/meme-4.11.2_p2 b/metadata/md5-cache/sci-biology/meme-4.11.2_p2
index edb91025ba4b..eb38f3d1bcb3 100644
--- a/metadata/md5-cache/sci-biology/meme-4.11.2_p2
+++ b/metadata/md5-cache/sci-biology/meme-4.11.2_p2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=The MEME/MAST system - Motif discovery and search
 EAPI=6
 HOMEPAGE=http://meme-suite.org/tools/meme
-IUSE=debug doc examples mpi +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug doc examples mpi +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=meme
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-shells/tcsh dev-libs/libxml2:2 dev-libs/libxslt sys-libs/zlib app-text/ghostscript-gpl media-gfx/imagemagick dev-lang/perl:= dev-perl/HTML-Parser dev-perl/HTML-Template dev-perl/Log-Log4perl dev-perl/Math-CDF dev-perl/XML-Compile-SOAP dev-perl/XML-Compile-WSDL11 dev-perl/XML-Parser dev-perl/XML-Simple virtual/perl-Data-Dumper virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Getopt-Long virtual/perl-Scalar-List-Utils virtual/perl-Time-HiRes mpi? ( virtual/mpi )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://meme-suite.org/meme-software/4.11.2/meme_4.11.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=a4080439675628436c06de8db9f59c6e
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 7ee1800a9e63..8d3c6f517e56 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysam/pysam-0.12.0.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3982e194da0412a02dc76e2431b051de
diff --git a/metadata/md5-cache/sci-biology/samtools-0.1.20-r3 b/metadata/md5-cache/sci-biology/samtools-0.1.20-r3
index 6e19d460f95a..26c92999ebf8 100644
--- a/metadata/md5-cache/sci-biology/samtools-0.1.20-r3
+++ b/metadata/md5-cache/sci-biology/samtools-0.1.20-r3
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Utilities for analysing and manipulating the SAM/BAM alignment formats
 EAPI=6
 HOMEPAGE=http://samtools.sourceforge.net/
-IUSE=examples +python_targets_python2_7 +python_single_target_python2_7
+IUSE=examples +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) sys-libs/ncurses:0= dev-lang/perl
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0.1-legacy
 SRC_URI=https://github.com/samtools/samtools/archive/0.1.20.tar.gz -> samtools-0.1.20.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fa48f0b2be780a9264eb9d727ec53335
diff --git a/metadata/md5-cache/sci-biology/samtools-1.9 b/metadata/md5-cache/sci-biology/samtools-1.9
index 763cf4ac915a..efc21cb14b90 100644
--- a/metadata/md5-cache/sci-biology/samtools-1.9
+++ b/metadata/md5-cache/sci-biology/samtools-1.9
@@ -4,12 +4,12 @@ DEPEND=dev-lang/perl =sci-libs/htslib-1.9* sys-libs/ncurses:0= sys-libs/zlib:= p
 DESCRIPTION=Utilities for analysing and manipulating the SAM/BAM alignment formats
 EAPI=7
 HOMEPAGE=http://www.htslib.org/
-IUSE=examples +python_targets_python2_7 +python_single_target_python2_7
+IUSE=examples +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-lang/perl =sci-libs/htslib-1.9* sys-libs/ncurses:0= sys-libs/zlib:= python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/samtools/samtools-1.9.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7e8913a97cbbcf5ee0158a89a42fa92c
diff --git a/metadata/md5-cache/sci-biology/shrimp-2.2.3 b/metadata/md5-cache/sci-biology/shrimp-2.2.3
index 4241a49b91d8..ea88951aada0 100644
--- a/metadata/md5-cache/sci-biology/shrimp-2.2.3
+++ b/metadata/md5-cache/sci-biology/shrimp-2.2.3
@@ -3,12 +3,12 @@ DEPEND=!sci-mathematics/cado-nfs
 DESCRIPTION=SHort Read Mapping Package
 EAPI=5
 HOMEPAGE=http://compbio.cs.toronto.edu/shrimp/
-IUSE=custom-cflags +cpu_flags_x86_sse2 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=custom-cflags +cpu_flags_x86_sse2 +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=shrimp
 RDEPEND=!sci-mathematics/cado-nfs python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://compbio.cs.toronto.edu/shrimp/releases/SHRiMP_2_2_3.src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=98a7a2b9765ad5e245b1b7b9be67060b
diff --git a/metadata/md5-cache/sci-biology/tophat-2.1.1-r4 b/metadata/md5-cache/sci-biology/tophat-2.1.1-r4
deleted file mode 100644
index 8632aca8b94f..000000000000
--- a/metadata/md5-cache/sci-biology/tophat-2.1.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[threads] dev-python/intervaltree[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/sortedcontainers[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-biology/samtools:0.1-legacy sci-biology/bowtie:2 virtual/pkgconfig sci-biology/seqan:1.4 >=sys-devel/autoconf-archive-2016.09.16 >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Python-based splice junction mapper for RNA-Seq reads using bowtie2
-EAPI=6
-HOMEPAGE=https://ccb.jhu.edu/software/tophat/
-IUSE=debug +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[threads] dev-python/intervaltree[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/sortedcontainers[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-biology/samtools:0.1-legacy sci-biology/bowtie:2
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://ccb.jhu.edu/software/tophat/downloads/tophat-2.1.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=efee8069c83c578acac8e57b429ad985
diff --git a/metadata/md5-cache/sci-biology/tophat-2.1.1-r5 b/metadata/md5-cache/sci-biology/tophat-2.1.1-r5
new file mode 100644
index 000000000000..132c8260adab
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/tophat-2.1.1-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[threads] python_single_target_python2_7? ( dev-python/intervaltree[python_targets_python2_7(-)] dev-python/sortedcontainers[python_targets_python2_7(-)] ) sci-biology/samtools:0.1-legacy sci-biology/bowtie:2 virtual/pkgconfig sci-biology/seqan:1.4 >=sys-devel/autoconf-archive-2016.09.16 >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Python-based splice junction mapper for RNA-Seq reads using bowtie2
+EAPI=6
+HOMEPAGE=https://ccb.jhu.edu/software/tophat/
+IUSE=debug +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-libs/boost:=[threads] python_single_target_python2_7? ( dev-python/intervaltree[python_targets_python2_7(-)] dev-python/sortedcontainers[python_targets_python2_7(-)] ) sci-biology/samtools:0.1-legacy sci-biology/bowtie:2
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://ccb.jhu.edu/software/tophat/downloads/tophat-2.1.1.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c9fc6f9296f2363e8ed22fc512275f32
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 8279035b3268..fbee9c8a1e97 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	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b8cf7b3dad0f..2ae48d47423e 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	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b2a6486af275e75c6365ab7eeba1e0bd
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 9b12b47a5cdf..0bba3c263ad6 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/gonvert-0.2.39 b/metadata/md5-cache/sci-calculators/gonvert-0.2.39
deleted file mode 100644
index 6c6375bc1c61..000000000000
--- a/metadata/md5-cache/sci-calculators/gonvert-0.2.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Unit conversion utility written in PyGTK
-EAPI=6
-HOMEPAGE=http://unihedron.com/projects/gonvert/index.php
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://unihedron.com/projects/gonvert/downloads/gonvert-0.2.39.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e0691ac7de5b6b5eee7f8952dd55f049
diff --git a/metadata/md5-cache/sci-calculators/gonvert-0.2.39-r1 b/metadata/md5-cache/sci-calculators/gonvert-0.2.39-r1
new file mode 100644
index 000000000000..96ac711411fe
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/gonvert-0.2.39-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python2_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/pygtk:2[python_targets_python2_7(-)] )
+DESCRIPTION=Unit conversion utility written in PyGTK
+EAPI=6
+HOMEPAGE=http://unihedron.com/projects/gonvert/index.php
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/pygtk:2[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://unihedron.com/projects/gonvert/downloads/gonvert-0.2.39.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f04130034406ff6e1da17a93ec8d49b4
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 27d727eee8e1..bc6cca164196 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-0.9.9
@@ -4,10 +4,10 @@ DESCRIPTION=Modern multi-purpose calculator
 EAPI=6
 HOMEPAGE=https://qalculate.github.io/
 IUSE=gnome
-KEYWORDS=~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7b482af84187efc92425b92c12c6f17f
+_md5_=7675df954f22eb8f107f99156a4fda8e
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1 b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1
index e5d10286e2fb..1e9b73844892 100644
--- a/metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-3.2.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-2.8.1:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango app-text/rarian dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.2.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango app-text/rarian dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Modern multi-purpose calculator
 EAPI=6
 HOMEPAGE=https://qalculate.github.io/
 KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-2.8.1:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
+RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-3.2.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v3.2.0/qalculate-gtk-3.2.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9e0154bd940ee3043937a105e7170cc
+_md5_=d94b7666b1400fc0759c9f5946435ae6
diff --git a/metadata/md5-cache/sci-calculators/units-2.16 b/metadata/md5-cache/sci-calculators/units-2.16
deleted file mode 100644
index ccf5155e673e..000000000000
--- a/metadata/md5-cache/sci-calculators/units-2.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-libs/readline:= units--cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] )
-DESCRIPTION=Unit conversion program
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/units/units.html
-IUSE=+units--cur python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.3 GPL-3
-RDEPEND=sys-libs/readline:= units--cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] )
-REQUIRED_USE=units--cur? ( ^^ ( 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://gnu/units/units-2.16.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=04c24c1c1a08e04f170d6e4a4ed156ad
diff --git a/metadata/md5-cache/sci-calculators/units-2.16-r1 b/metadata/md5-cache/sci-calculators/units-2.16-r1
new file mode 100644
index 000000000000..36c6c0f5dd99
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/units-2.16-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=sys-libs/readline:= units--cur? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) )
+DESCRIPTION=Unit conversion program
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/units/units.html
+IUSE=+units--cur +python_single_target_python3_6
+KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3 GPL-3
+RDEPEND=sys-libs/readline:= units--cur? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) )
+REQUIRED_USE=units--cur? ( ^^ ( python_single_target_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://gnu/units/units-2.16.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=64813399940172824782dd1e16dd43ea
diff --git a/metadata/md5-cache/sci-calculators/units-2.18 b/metadata/md5-cache/sci-calculators/units-2.18
index 42b30190930e..34e492face43 100644
--- a/metadata/md5-cache/sci-calculators/units-2.18
+++ b/metadata/md5-cache/sci-calculators/units-2.18
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install setup
-DEPEND=sys-libs/readline:= units--cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] )
+DEPEND=sys-libs/readline:= units--cur? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) )
 DESCRIPTION=Unit conversion program
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/units/units.html
-IUSE=+units--cur python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+units--cur +python_single_target_python3_6
 KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3 GPL-3
-RDEPEND=sys-libs/readline:= units--cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] )
-REQUIRED_USE=units--cur? ( ^^ ( 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 ) )
+RDEPEND=sys-libs/readline:= units--cur? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) )
+REQUIRED_USE=units--cur? ( ^^ ( python_single_target_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://gnu/units/units-2.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b3a9774a8bcdcddb275123bae484bfa
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d5530273757ba874e84fe7d0024df3ed
diff --git a/metadata/md5-cache/sci-calculators/units-2.19 b/metadata/md5-cache/sci-calculators/units-2.19
deleted file mode 100644
index eaae5ce72b9a..000000000000
--- a/metadata/md5-cache/sci-calculators/units-2.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=sys-libs/readline:= units--cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] )
-DESCRIPTION=Unit conversion program
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/units/units.html
-IUSE=+units--cur python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=FDL-1.3 GPL-3
-RDEPEND=sys-libs/readline:= units--cur? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/future[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] )
-REQUIRED_USE=units--cur? ( ^^ ( 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://gnu/units/units-2.19.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e06d8905523d5ee06dc9ec7c8c3dd9f2
diff --git a/metadata/md5-cache/sci-calculators/units-2.19-r1 b/metadata/md5-cache/sci-calculators/units-2.19-r1
new file mode 100644
index 000000000000..eac4d76f87d9
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/units-2.19-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install setup
+DEPEND=sys-libs/readline:= units--cur? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) )
+DESCRIPTION=Unit conversion program
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/units/units.html
+IUSE=+units--cur +python_single_target_python3_6
+KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=FDL-1.3 GPL-3
+RDEPEND=sys-libs/readline:= units--cur? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] ) )
+REQUIRED_USE=units--cur? ( ^^ ( python_single_target_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://gnu/units/units-2.19.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=af7794fc18eb4fc494a6cb53b105612f
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
index bd81b20a01da..950c4e11b2d8 100644
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
+++ b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Becksteinlab/GromacsWrapper/archive/release-0.8.0.tar.gz -> GromacsWrapper-0.8.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=72c468e398bd8beabcabfe9521714c2c
diff --git a/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1 b/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
index bd630d2674bf..8e9dede377ba 100644
--- a/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
+++ b/metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/M/MDAnalysis/MDAnalysis-0.18.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f3070373659b2043aeeeeb07a35e203d
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 121cc9865a26..efbf9eeac218 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 992c007987d0..ac9b1fea7516 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cdbdaf38c7805dc4b608e00a021ba743
diff --git a/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3 b/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3
index bac087741316..24cf859eacf7 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_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1759a2d24533dcf7076abeec2c3b78f2
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 23925c730b55..2967abeae586 100644
--- a/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
+++ b/metadata/md5-cache/sci-chemistry/apbs-1.4.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-cpp/eigen:3 dev-libs/maloc[mpi=] sys-libs/readline virtual/blas fetk? ( sci-libs/amd sci-libs/fetk sci-libs/superlu sci-libs/umfpack ) mpi? ( virtual/mpi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=dev-cpp/eigen:3 dev-libs/maloc[mpi=] sys-libs/readline virtual/blas fetk? ( sci-libs/amd sci-libs/fetk sci-libs/superlu sci-libs/umfpack ) mpi? ( virtual/mpi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Evaluation of electrostatic properties of nanoscale biomolecular systems
 EAPI=6
 HOMEPAGE=https://www.poissonboltzmann.org/apbs/
-IUSE=debug doc examples fast +fetk iapbs mpi openmp python tools +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug doc examples fast +fetk iapbs mpi openmp python tools +python_single_target_python2_7
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 dev-libs/maloc[mpi=] sys-libs/readline virtual/blas fetk? ( sci-libs/amd sci-libs/fetk sci-libs/superlu sci-libs/umfpack ) mpi? ( virtual/mpi ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=iapbs? ( fetk ) mpi? ( !python ) python? ( tools fetk iapbs ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=iapbs? ( fetk ) mpi? ( !python ) python? ( tools fetk iapbs ^^ ( python_single_target_python2_7 ) ) ^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/archive/74fcb8676de69ed04ddab8976a8b05a6caaf4d65.zip -> apbs-1.4.1.zip
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aefcedd06fba75a8d81910bc966ee5b3
diff --git a/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2 b/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
index ad2c349cf0be..9a3b49e91071 100644
--- a/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
+++ b/metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/boost[threads]
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/boost:=[threads]
 DESCRIPTION=Program for drug discovery, molecular docking and virtual screening
-EAPI=5
+EAPI=7
 HOMEPAGE=http://vina.scripps.edu/
 IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/boost[threads]
+RDEPEND=dev-libs/boost:=[threads]
 SLOT=0
 SRC_URI=http://vina.scripps.edu/download/autodock_vina_1_1_2.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5cede7d56a643e731ae4d39e6f4cba3d
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7ccb7af5dc507fc659264761c8378f60
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 7f10abef1d4b..1b86516a5b08 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1633240a6e979c6aa07d3004b8f8a09
diff --git a/metadata/md5-cache/sci-chemistry/chemex-0.6.1-r2 b/metadata/md5-cache/sci-chemistry/chemex-0.6.1-r2
deleted file mode 100644
index 8de7e1d3a95c..000000000000
--- a/metadata/md5-cache/sci-chemistry/chemex-0.6.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=dev-python/matplotlib-python2-1.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/matplotlib-1.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( >=sci-libs/scipy-python2-0.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sci-libs/scipy-0.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
-EAPI=6
-HOMEPAGE=https://github.com/gbouvignies/chemex
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=|| ( >=dev-python/matplotlib-python2-1.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/matplotlib-1.1[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( >=sci-libs/scipy-python2-0.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sci-libs/scipy-0.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35fce8c063e1e003149a8f0e93adf171
diff --git a/metadata/md5-cache/sci-chemistry/chemex-0.6.1-r3 b/metadata/md5-cache/sci-chemistry/chemex-0.6.1-r3
new file mode 100644
index 000000000000..a689de7d969c
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemex-0.6.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( || ( >=dev-python/matplotlib-python2-1.1[python_targets_python2_7(-)] >=dev-python/matplotlib-1.1[python_targets_python2_7(-)] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) || ( >=sci-libs/scipy-python2-0.11[python_targets_python2_7(-)] >=sci-libs/scipy-0.11[python_targets_python2_7(-)] ) ) python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=Program to fit chemical exchange induced shift and relaxation data
+EAPI=6
+HOMEPAGE=https://github.com/gbouvignies/chemex
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( || ( >=dev-python/matplotlib-python2-1.1[python_targets_python2_7(-)] >=dev-python/matplotlib-1.1[python_targets_python2_7(-)] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) || ( >=sci-libs/scipy-python2-0.11[python_targets_python2_7(-)] >=sci-libs/scipy-0.11[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/gbouvignies/chemex/archive/0.6.1.tar.gz -> chemex-0.6.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8175331c954b599362e293b84ccf39c
diff --git a/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r4 b/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r4
new file mode 100644
index 000000000000..686871b944d5
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/chemical-mime-data-0.1.94-r4
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool dev-util/desktop-file-utils dev-libs/libxslt || ( gnome-base/librsvg media-gfx/imagemagick[xml,png,svg] ) media-gfx/imagemagick[png] virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 postinst postrm preinst prepare
+DEPEND=x11-misc/shared-mime-info dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A collection of data files to add support for chemical MIME types
+EAPI=7
+HOMEPAGE=https://github.com/dleidert/chemical-mime
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=x11-misc/shared-mime-info
+SLOT=0
+SRC_URI=mirror://sourceforge/chemical-mime/chemical-mime-data-0.1.94.tar.bz2
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c5290687e30875437d4262bc506b981
diff --git a/metadata/md5-cache/sci-chemistry/freeon-1.0.10 b/metadata/md5-cache/sci-chemistry/freeon-1.0.10
index 501e4d18d063..63c26f611493 100644
--- a/metadata/md5-cache/sci-chemistry/freeon-1.0.10
+++ b/metadata/md5-cache/sci-chemistry/freeon-1.0.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=prepare setup
-DEPEND=sci-libs/hdf5 virtual/blas virtual/lapack || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+DEPEND=sci-libs/hdf5 virtual/blas virtual/lapack || ( dev-lang/python:3.6 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=An experimental suite of programs for linear scaling quantum chemistry
 EAPI=6
 HOMEPAGE=http://www.freeon.org
@@ -9,4 +9,4 @@ RDEPEND=sci-libs/hdf5 virtual/blas virtual/lapack virtual/fortran
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/freeon/freeon-1.0.10.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91407d5a6f5a69b557a1545c8d9bafec
+_md5_=543485c2307080eeae76ca9260fb947b
diff --git a/metadata/md5-cache/sci-chemistry/gmxapi-0.0.7.1 b/metadata/md5-cache/sci-chemistry/gmxapi-0.0.7.1
index bf5e201dc765..1ef207baa898 100644
--- a/metadata/md5-cache/sci-chemistry/gmxapi-0.0.7.1
+++ b/metadata/md5-cache/sci-chemistry/gmxapi-0.0.7.1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/kassonlab/gmxapi/archive/v0.0.7.1.tar.gz -> gmxapi-0.0.7.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f69fbbd1f2d6722ccfa00c8d0af4bef0
+_md5_=f3cab1a66b71373c8f805ba35c74d750
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.5 b/metadata/md5-cache/sci-chemistry/gromacs-2019.5
deleted file mode 100644
index d32f1aa898e0..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=7
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0/2019.5
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.5.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2019.5.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7340d52537fddca4b5274593f23c028
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
new file mode 100644
index 000000000000..77ec3cc5ad0d
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=7
+HOMEPAGE=http://www.gromacs.org/
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 +python_single_target_python2_7
+KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0/2019.5
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.5.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2019.5.tar.gz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cb6b16f5dce43e3eb029b767e41aa242
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2019.9999
index 19d7dc5b593c..a34c3b3c5aff 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.9999
@@ -1,14 +1,14 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python2_7? ( dev-python/sphinx[python_targets_python2_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 +python_single_target_python2_7
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0/2019.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4a6627448855defe2f541e0074793e00
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=074cc86cc9733be5cadd37bc659b3ffe
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020 b/metadata/md5-cache/sci-chemistry/gromacs-2020
deleted file mode 100644
index 2dc8a4290852..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=7
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( 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 ) ^^ ( 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 )
-RESTRICT=!test? ( test )
-SLOT=0/2020
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16fb00acce4d5bdfbea2b67103cd3b76
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2020-r1
new file mode 100644
index 000000000000..5a765c297111
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020-r1
@@ -0,0 +1,15 @@
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DESCRIPTION=The ultimate molecular dynamics simulation package
+EAPI=7
+HOMEPAGE=http://www.gromacs.org/
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
+RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0/2020
+SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2020.tar.gz )
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08fcb4307b3e8090369aeb0809b6ab40
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
index 43eae901b937..e2bd23dc7c7a 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.9999
@@ -1,14 +1,14 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( 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 ) ^^ ( 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 )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/2020.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16fb00acce4d5bdfbea2b67103cd3b76
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08fcb4307b3e8090369aeb0809b6ab40
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index 93d7a940aa2f..54e061eb3cd2 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -1,14 +1,14 @@
-BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi virtual/pkgconfig doc? ( app-doc/doxygen python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] ) media-gfx/mscgen media-gfx/graphviz dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-util/ninja >=dev-util/cmake-3.9.6 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
 DESCRIPTION=The ultimate molecular dynamics simulation package
 EAPI=7
 HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
 PROPERTIES=live
 RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 ) opencl? ( virtual/opencl ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( sys-apps/hwloc ) lapack? ( virtual/lapack ) lmfit? ( sci-libs/lmfit ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !sci-chemistry/gmxapi python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( 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 ) ^^ ( 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 )
+REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) cuda? ( !opencl ) mkl? ( !blas !fftw !lapack ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=603d85156a6dc22dcf2485da11edabe6
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=96ba8d07d1e0f1fa70eda3210b3bdb04
diff --git a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1 b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
index 99053657ca98..db99626acb6b 100644
--- a/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
+++ b/metadata/md5-cache/sci-chemistry/mdtraj-1.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/mdtraj/mdtraj-1.9.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d5c2def55b907191790ccfb305372914
diff --git a/metadata/md5-cache/sci-chemistry/modeller-9.20 b/metadata/md5-cache/sci-chemistry/modeller-9.20
index 295f6595d452..db906ea039ca 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ee65458b50a4900e4aae940f90888ece
diff --git a/metadata/md5-cache/sci-chemistry/modeller-9.22 b/metadata/md5-cache/sci-chemistry/modeller-9.22
index c59c10bd4951..879a9df4da13 100644
--- a/metadata/md5-cache/sci-chemistry/modeller-9.22
+++ b/metadata/md5-cache/sci-chemistry/modeller-9.22
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://salilab.org/modeller/9.22/modeller-9.22.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d3fe4515218ae07e5b082055340d0019
diff --git a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0 b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
index 0661b3fa5b85..0fab5904f505 100644
--- a/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
+++ b/metadata/md5-cache/sci-chemistry/molequeue-0.9.0
@@ -4,13 +4,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Abstract, manage and coordinate execution of tasks
 EAPI=7
 HOMEPAGE=https://www.openchemistry.org/projects/molequeue/
-IUSE=+client doc server test +zeromq +python_targets_python2_7 +python_single_target_python2_7 test
+IUSE=+client doc server test +zeromq +python_single_target_python2_7 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( net-libs/cppzmq:0= )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) server? ( client ) test? ( server )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) server? ( client ) test? ( server )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/molequeue/archive/0.9.0.tar.gz -> molequeue-0.9.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ef65c2ea193f8263a6ea903ea0a4e0f
diff --git a/metadata/md5-cache/sci-chemistry/nmrdepaker-1.0-r2 b/metadata/md5-cache/sci-chemistry/nmrdepaker-1.0-r2
deleted file mode 100644
index 88ea6c56e3ff..000000000000
--- a/metadata/md5-cache/sci-chemistry/nmrdepaker-1.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( >=dev-python/matplotlib-python2-0.98.5[gtk2,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/matplotlib-0.98.5[gtk2,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/numpy-1.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Program to perform NMR spectra 'De-Pake-ing' and moment calculation
-EAPI=7
-HOMEPAGE=https://launchpad.net/nmrdepaker
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=|| ( >=dev-python/matplotlib-python2-0.98.5[gtk2,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/matplotlib-0.98.5[gtk2,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=dev-python/numpy-1.2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://launchpad.net/nmrdepaker/1.0/1.0/+download/nmrdepaker-1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=35346e37748880714d72048456584896
diff --git a/metadata/md5-cache/sci-chemistry/nmrdepaker-1.0-r3 b/metadata/md5-cache/sci-chemistry/nmrdepaker-1.0-r3
new file mode 100644
index 000000000000..49ce1522cd69
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/nmrdepaker-1.0-r3
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( || ( >=dev-python/matplotlib-python2-0.98.5[gtk2,python_targets_python2_7(-)] >=dev-python/matplotlib-0.98.5[gtk2,python_targets_python2_7(-)] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)] >=dev-python/numpy-1.2[python_targets_python2_7(-)] ) >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)] )
+DESCRIPTION=Program to perform NMR spectra 'De-Pake-ing' and moment calculation
+EAPI=7
+HOMEPAGE=https://launchpad.net/nmrdepaker
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python2_7? ( || ( >=dev-python/matplotlib-python2-0.98.5[gtk2,python_targets_python2_7(-)] >=dev-python/matplotlib-0.98.5[gtk2,python_targets_python2_7(-)] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)] >=dev-python/numpy-1.2[python_targets_python2_7(-)] ) >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://launchpad.net/nmrdepaker/1.0/1.0/+download/nmrdepaker-1.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=784aca4ac49a5fb71d51186de2b92bdb
diff --git a/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1 b/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
index 8dcc3898ddc3..6f143b6f03a8 100644
--- a/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
+++ b/metadata/md5-cache/sci-chemistry/nmrglue-0.5-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jjhelmus/nmrglue/releases/download/v0.5/nmrglue-0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ab2665c2ea9926fa516db763ec3d8fc1
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 2ec959766672..c21e1f609bd2 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e3832010a5347eb6c9e4bba5441e9a5
diff --git a/metadata/md5-cache/sci-chemistry/p3d-9999 b/metadata/md5-cache/sci-chemistry/p3d-9999
index 9babb6810380..8d35987ac36e 100644
--- a/metadata/md5-cache/sci-chemistry/p3d-9999
+++ b/metadata/md5-cache/sci-chemistry/p3d-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e56b17b18475e64f77cf90348444f4e4
diff --git a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1 b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
index f8c07b10979f..2391097840b0 100644
--- a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
+++ b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Tools for manipulating and calculations on wwPDB macromolecule structure files
 EAPI=5
 HOMEPAGE=https://github.com/harmslab/pdbtools
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/fortran
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://pdb-tools.googlecode.com/files/pdbTools_0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=79e0b84e8830f3f4b7f1624a58b3d7eb
diff --git a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2 b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
index de1f969b9e48..80318c4a3166 100644
--- a/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
+++ b/metadata/md5-cache/sci-chemistry/pdb-tools-0.2.1-r2
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Tools for manipulating and calculations on wwPDB macromolecule structure files
 EAPI=5
 HOMEPAGE=https://github.com/harmslab/pdbtools
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/fortran
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://pdb-tools.googlecode.com/files/pdbTools_0.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6829f5fae8d0bf0ffdef84abe46217bb
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r2 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r2
deleted file mode 100644
index 4974a892b1b2..000000000000
--- a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sci-chemistry/openbabel-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] opal? ( dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdb2pka? ( sci-chemistry/apbs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),-mpi] ) dev-lang/swig:0 dev-util/scons[python_targets_python2_7] virtual/fortran
-DESCRIPTION=Automated pipeline for performing Poisson-Boltzmann electrostatics calculations
-EAPI=5
-HOMEPAGE=https://www.poissonboltzmann.org/
-IUSE=doc examples opal +pdb2pka python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-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(-)] || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sci-chemistry/openbabel-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] opal? ( dev-python/zsi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pdb2pka? ( sci-chemistry/apbs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),-mpi] ) virtual/fortran
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/releases/download/pdb2pqr-1.9.0/pdb2pqr-src-1.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a88a1b88b3b0c683ceb9e27c9fb32711
diff --git a/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r3 b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r3
new file mode 100644
index 000000000000..b5ed4ece1875
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/pdb2pqr-1.9.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) sci-chemistry/openbabel-python[python_targets_python2_7(-)] opal? ( dev-python/zsi[python_targets_python2_7(-)] ) ) pdb2pka? ( sci-chemistry/apbs[python_single_target_python2_7(-)?,-mpi] ) dev-lang/swig:0 dev-util/scons[python_targets_python2_7] virtual/fortran
+DESCRIPTION=Automated pipeline for performing Poisson-Boltzmann electrostatics calculations
+EAPI=5
+HOMEPAGE=https://www.poissonboltzmann.org/
+IUSE=doc examples opal +pdb2pka +python_single_target_python2_7
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) sci-chemistry/openbabel-python[python_targets_python2_7(-)] opal? ( dev-python/zsi[python_targets_python2_7(-)] ) ) pdb2pka? ( sci-chemistry/apbs[python_single_target_python2_7(-)?,-mpi] ) virtual/fortran
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/Electrostatics/apbs-pdb2pqr/releases/download/pdb2pqr-1.9.0/pdb2pqr-src-1.9.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=164d685691a3a1181130afc0942f1d1e
diff --git a/metadata/md5-cache/sci-chemistry/prodecomp-3.0-r2 b/metadata/md5-cache/sci-chemistry/prodecomp-3.0-r2
deleted file mode 100644
index d27840827b2c..000000000000
--- a/metadata/md5-cache/sci-chemistry/prodecomp-3.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DESCRIPTION=Decomposition-based analysis of NMR projections
-EAPI=5
-HOMEPAGE=http://www.lundberg.gu.se/nmr/software.php?program=PRODECOMP
-IUSE=examples +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/prodecomp-3.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36abf51f5ac59fc898a8f21dcd0e6533
diff --git a/metadata/md5-cache/sci-chemistry/prodecomp-3.0-r3 b/metadata/md5-cache/sci-chemistry/prodecomp-3.0-r3
new file mode 100644
index 000000000000..a403b1397947
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/prodecomp-3.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DESCRIPTION=Decomposition-based analysis of NMR projections
+EAPI=5
+HOMEPAGE=http://www.lundberg.gu.se/nmr/software.php?program=PRODECOMP
+IUSE=examples +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/prodecomp-3.0.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=57631c851f12fa821ecb7db673eeb431
diff --git a/metadata/md5-cache/sci-chemistry/propka-3.1_p140511 b/metadata/md5-cache/sci-chemistry/propka-3.1_p140511
index c03c8ccc3a04..bba73067aa90 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=77a50416f48bdac3be53689262fbd770
diff --git a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2 b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2
index 21237b2484c4..cbfd92f9a9c5 100644
--- a/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2
+++ b/metadata/md5-cache/sci-chemistry/pymol-2.3.0-r2
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.pymol.org/
 IUSE=web python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=PSF-2.2
-RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pmw:py2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[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(-)]
+RDEPEND=dev-libs/msgpack[cxx] dev-libs/mmtf-cpp || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pmw:py2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 media-libs/glew:0= media-libs/glm media-libs/libpng:0= media-video/mpeg-tools sys-libs/zlib !sci-chemistry/pymol-apbs-plugin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] web? ( !dev-python/webpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sci-chemistry/chemical-mime-data python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/pymol-1.8.4.0.png.xz https://github.com/schrodinger/pymol-open-source/archive/v2.3.0.tar.gz -> pymol-2.3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cb84fa002a73c1c823ac3354f9f8894
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a6fca3893524a3d6b5f4a8144828f179
diff --git a/metadata/md5-cache/sci-chemistry/relax-4.0.0-r3 b/metadata/md5-cache/sci-chemistry/relax-4.0.0-r3
deleted file mode 100644
index fd467d29d52f..000000000000
--- a/metadata/md5-cache/sci-chemistry/relax-4.0.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/Numdifftools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-chemistry/molmol sci-chemistry/pymol[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-chemistry/vmd >=sci-libs/bmrblib-1.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sci-libs/minfx-1.0.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-visualization/grace sci-visualization/opendx x11-libs/wxGTK:3.0[X] media-gfx/pngcrush test? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/Numdifftools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-chemistry/molmol sci-chemistry/pymol[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-chemistry/vmd >=sci-libs/bmrblib-1.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sci-libs/minfx-1.0.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-visualization/grace sci-visualization/opendx x11-libs/wxGTK:3.0[X] ) dev-util/scons[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Molecular dynamics by NMR data analysis
-EAPI=5
-HOMEPAGE=https://www.nmr-relax.com/
-IUSE=test +python_targets_python2_7 +python_single_target_python2_7 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/Numdifftools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-chemistry/molmol sci-chemistry/pymol[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-chemistry/vmd >=sci-libs/bmrblib-1.0.3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=sci-libs/minfx-1.0.11[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-visualization/grace sci-visualization/opendx x11-libs/wxGTK:3.0[X]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.gna.org/relax/relax-4.0.0.src.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=048ab82d521a897d7e1993dceaad0ff0
diff --git a/metadata/md5-cache/sci-chemistry/relax-4.0.0-r4 b/metadata/md5-cache/sci-chemistry/relax-4.0.0-r4
new file mode 100644
index 000000000000..6659b454c9b2
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/relax-4.0.0-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare setup test
+DEPEND=python_single_target_python2_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/Numdifftools[python_targets_python2_7(-)] || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/wxpython:3.0[python_targets_python2_7(-)] sci-chemistry/pymol[python_targets_python2_7(-)] >=sci-libs/bmrblib-1.0.3[python_targets_python2_7(-)] >=sci-libs/minfx-1.0.11[python_targets_python2_7(-)] || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) sci-chemistry/molmol sci-chemistry/vmd sci-visualization/grace sci-visualization/opendx x11-libs/wxGTK:3.0[X] media-gfx/pngcrush test? ( python_single_target_python2_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/Numdifftools[python_targets_python2_7(-)] || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/wxpython:3.0[python_targets_python2_7(-)] sci-chemistry/pymol[python_targets_python2_7(-)] >=sci-libs/bmrblib-1.0.3[python_targets_python2_7(-)] >=sci-libs/minfx-1.0.11[python_targets_python2_7(-)] || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) sci-chemistry/molmol sci-chemistry/vmd sci-visualization/grace sci-visualization/opendx x11-libs/wxGTK:3.0[X] ) python_single_target_python2_7? ( dev-util/scons[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Molecular dynamics by NMR data analysis
+EAPI=5
+HOMEPAGE=https://www.nmr-relax.com/
+IUSE=test +python_single_target_python2_7 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/Numdifftools[python_targets_python2_7(-)] || ( dev-python/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) dev-python/wxpython:3.0[python_targets_python2_7(-)] sci-chemistry/pymol[python_targets_python2_7(-)] >=sci-libs/bmrblib-1.0.3[python_targets_python2_7(-)] >=sci-libs/minfx-1.0.11[python_targets_python2_7(-)] || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) sci-chemistry/molmol sci-chemistry/vmd sci-visualization/grace sci-visualization/opendx x11-libs/wxGTK:3.0[X]
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.gna.org/relax/relax-4.0.0.src.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=b7876134df68b1653736ddda3439b644
diff --git a/metadata/md5-cache/sci-chemistry/sparky-3.115-r2 b/metadata/md5-cache/sci-chemistry/sparky-3.115-r2
index 4a7a8e505f34..456c6c1e407d 100644
--- a/metadata/md5-cache/sci-chemistry/sparky-3.115-r2
+++ b/metadata/md5-cache/sci-chemistry/sparky-3.115-r2
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=de
 DESCRIPTION=Graphical NMR assignment and integration program for large polymers
 EAPI=6
 HOMEPAGE=http://www.cgl.ucsf.edu/home/sparky/
-IUSE=examples +python_targets_python2_7 +python_single_target_python2_7
+IUSE=examples +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=sparky
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-shells/tcsh dev-lang/tcl:0= dev-lang/tk:0=
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=mirror
 SLOT=0
 SRC_URI=http://www.cgl.ucsf.edu/home/sparky/distrib-3.115/sparky-source-3.115.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=602d930dbfabc45f0336eb464eeadbdb
diff --git a/metadata/md5-cache/sci-chemistry/viewmol-2.4.1-r3 b/metadata/md5-cache/sci-chemistry/viewmol-2.4.1-r3
index 770c2bf196c1..44e3b10b37da 100644
--- a/metadata/md5-cache/sci-chemistry/viewmol-2.4.1-r3
+++ b/metadata/md5-cache/sci-chemistry/viewmol-2.4.1-r3
@@ -3,12 +3,12 @@ DEPEND=media-libs/libpng:0= media-libs/tiff:0 virtual/glu virtual/opengl x11-lib
 DESCRIPTION=Open-source graphical front end for computational chemistry programs
 EAPI=6
 HOMEPAGE=http://viewmol.sourceforge.net/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libpng:0= media-libs/tiff:0 virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/motif:0 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk(-)] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/viewmol/viewmol-2.4.1.src.tgz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5c16e9f922010a805910e336d46f96ba
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.2 b/metadata/md5-cache/sci-chemistry/vmd-1.9.2
index 68d3eca5b39f..17365477b5ff 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.2
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install nofetch prepare setup
-DEPEND=>=dev-lang/tk-8.6.1 dev-lang/perl dev-libs/expat || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig dev-lang/swig
+DEPEND=>=dev-lang/tk-8.6.1 dev-lang/perl dev-libs/expat python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig dev-lang/swig
 DESCRIPTION=Visual Molecular Dynamics
 EAPI=5
 HOMEPAGE=http://www.ks.uiuc.edu/Research/vmd/
-IUSE=cuda gromacs msms povray sqlite tachyon xinerama +python_targets_python2_7 +python_single_target_python2_7
+IUSE=cuda gromacs msms povray sqlite tachyon xinerama +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=vmd
-RDEPEND=>=dev-lang/tk-8.6.1 dev-lang/perl dev-libs/expat || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=dev-lang/tk-8.6.1 dev-lang/perl dev-libs/expat python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.2-gentoo-patches.tar.xz vmd-1.9.2.src.tar.gz
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b0ea4f21d5cce0092c6b58ec9efe78f1
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=78ca0fb129629adce2f719ca792bec7e
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.3 b/metadata/md5-cache/sci-chemistry/vmd-1.9.3
index 6dd4bb926722..745535edba20 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.3
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install nofetch prepare setup
-DEPEND=>=dev-lang/tk-8.6.1 dev-lang/perl dev-libs/expat || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig dev-lang/swig
+DEPEND=>=dev-lang/tk-8.6.1 dev-lang/perl dev-libs/expat python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig dev-lang/swig
 DESCRIPTION=Visual Molecular Dynamics
 EAPI=5
 HOMEPAGE=http://www.ks.uiuc.edu/Research/vmd/
-IUSE=cuda gromacs msms povray sqlite tachyon xinerama +python_targets_python2_7 +python_single_target_python2_7
+IUSE=cuda gromacs msms povray sqlite tachyon xinerama +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=vmd
-RDEPEND=>=dev-lang/tk-8.6.1 dev-lang/perl dev-libs/expat || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=dev-lang/tk-8.6.1 dev-lang/perl dev-libs/expat python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz vmd-1.9.3.src.tar
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2dec26546b06c0257c6e0ab428d0ec00
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d1e10c8bfb0324736061234f5c5cba97
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1 b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1
index 8d01649831d5..4032c76a61e9 100644
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-lang/swig
 DEFINED_PHASES=compile configure install nofetch prepare setup
-DEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama )
+DEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama )
 DESCRIPTION=Visual Molecular Dynamics
 EAPI=7
 HOMEPAGE=http://www.ks.uiuc.edu/Research/vmd/
-IUSE=cuda gromacs msms povray sqlite tachyon xinerama +python_targets_python2_7 +python_single_target_python2_7
+IUSE=cuda gromacs msms povray sqlite tachyon xinerama +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=vmd
-RDEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=fetch
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz vmd-1.9.3.src.tar
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=05c631fcc7fb55978a8053d979b91154
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bf88bc8b1ce8870a84f794ca5b17274f
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r3 b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r3
deleted file mode 100644
index 1b06522b902c..000000000000
--- a/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-lang/swig
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup
-DEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Visual Molecular Dynamics
-EAPI=7
-HOMEPAGE=http://www.ks.uiuc.edu/Research/vmd/
-IUSE=cuda gromacs msms povray sqlite tachyon xinerama +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=vmd
-RDEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/chemical-mime-data sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=fetch
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz vmd-1.9.3.src.tar
-_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0f790c1e66cb6538d7075521e2942b68
diff --git a/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r4 b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r4
new file mode 100644
index 000000000000..f3c34ea08d55
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/vmd-1.9.3-r4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-lang/swig
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup
+DEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Visual Molecular Dynamics
+EAPI=7
+HOMEPAGE=http://www.ks.uiuc.edu/Research/vmd/
+IUSE=cuda gromacs msms povray sqlite tachyon xinerama +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=vmd
+RDEPEND=>=dev-lang/tk-8.6.1:0= dev-lang/perl dev-libs/expat python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) sci-libs/netcdf:0= virtual/opengl >=x11-libs/fltk-1.1.10-r2:1 x11-libs/libXft x11-libs/libXi python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] ) sqlite? ( dev-db/sqlite:3= ) tachyon? ( >=media-gfx/tachyon-0.99_beta6 ) xinerama? ( x11-libs/libXinerama ) sci-biology/stride sci-chemistry/chemical-mime-data sci-chemistry/surf x11-terms/xterm msms? ( sci-chemistry/msms-bin ) povray? ( media-gfx/povray )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=fetch
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jlec/distfiles/vmd-1.9.3-gentoo-patches.tar.xz vmd-1.9.3.src.tar
+_eclasses_=cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=59aeef3d458f760731a594367e214c61
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 04142c845a4a..7b53f9cd51da 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3 b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3
deleted file mode 100644
index d1bbcbb60607..000000000000
--- a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) dev-util/intltool dev-lang/perl nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 graphical front-end for the gschem -> pcb workflow
-EAPI=6
-HOMEPAGE=http://www.gpleda.org
-IUSE=gnome nls +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) sci-electronics/electronics-menu gnome? ( dev-python/gnome-vfs-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_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
deleted file mode 100644
index d5a0393611fa..000000000000
--- a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) dev-util/intltool dev-lang/perl nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 graphical front-end for the gschem -> pcb workflow
-EAPI=6
-HOMEPAGE=http://www.gpleda.org
-IUSE=nls +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) sci-electronics/electronics-menu
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db255f4120593cb3dcc3e7a09b11a565
diff --git a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r5 b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r5
new file mode 100644
index 000000000000..1f74296b9eae
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_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/pygtk:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) dev-util/intltool dev-lang/perl nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 graphical front-end for the gschem -> pcb workflow
+EAPI=6
+HOMEPAGE=http://www.gpleda.org
+IUSE=gnome nls +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/pygtk:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) sci-electronics/electronics-menu gnome? ( python_single_target_python2_7? ( dev-python/gnome-vfs-python[python_targets_python2_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a195a45e81a1df670d05dc75fc80af54
diff --git a/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r6 b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r6
new file mode 100644
index 000000000000..12e273173636
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/geda-xgsch2pcb-0.1.3-r6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_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/pygtk:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) dev-util/intltool dev-lang/perl nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 graphical front-end for the gschem -> pcb workflow
+EAPI=6
+HOMEPAGE=http://www.gpleda.org
+IUSE=nls +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/pygtk:2[python_targets_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] ) sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) sci-electronics/electronics-menu
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c182b5ffa17e9227c7351db5254871f3
diff --git a/metadata/md5-cache/sci-electronics/gerbv-2.6.0 b/metadata/md5-cache/sci-electronics/gerbv-2.6.0
deleted file mode 100644
index c6e1be4b3c9b..000000000000
--- a/metadata/md5-cache/sci-electronics/gerbv-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=x11-libs/gtk+:2 x11-libs/cairo virtual/pkgconfig
-DESCRIPTION=A RS-274X (Gerber) and NC drill (Excellon) file viewer
-EAPI=4
-HOMEPAGE=http://gerbv.geda-project.org/
-IUSE=doc examples static-libs unit-mm
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/cairo
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/gerbv/gerbv-2.6.0.tar.gz
-_eclasses_=fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7
-_md5_=b322ca6030de9fd6e6bcd453d240f3a8
diff --git a/metadata/md5-cache/sci-electronics/gerbv-2.6.1 b/metadata/md5-cache/sci-electronics/gerbv-2.6.1
deleted file mode 100644
index a635d300e952..000000000000
--- a/metadata/md5-cache/sci-electronics/gerbv-2.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=x11-libs/gtk+:2 x11-libs/cairo virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 RS-274X (Gerber) and NC drill (Excellon) file viewer
-EAPI=6
-HOMEPAGE=http://gerbv.geda-project.org/
-IUSE=doc examples static-libs unit-mm
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cb868533d8e14f4ad4d998798c2b5ec9
diff --git a/metadata/md5-cache/sci-electronics/gerbv-2.7.0 b/metadata/md5-cache/sci-electronics/gerbv-2.7.0
index 3415e0e080e2..4f54b63eb34c 100644
--- a/metadata/md5-cache/sci-electronics/gerbv-2.7.0
+++ b/metadata/md5-cache/sci-electronics/gerbv-2.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=A RS-274X (Gerber) and NC drill (Excellon) file viewer
 EAPI=7
 HOMEPAGE=http://gerbv.geda-project.org/
 IUSE=doc examples unit-mm
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 x11-libs/cairo
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/gerbv/gerbv-2.7.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f3fcda3d4559beb4fe2ca85a60728f5
+_md5_=8917805e63fb587d8246a109c7c57be4
diff --git a/metadata/md5-cache/sci-electronics/gresistor-0.0.2 b/metadata/md5-cache/sci-electronics/gresistor-0.0.2
deleted file mode 100644
index 88af643eac51..000000000000
--- a/metadata/md5-cache/sci-electronics/gresistor-0.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] x11-libs/gtk+:2 gnome-base/libglade:2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=Translate a resistor color codes into a readable value
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/gresistor/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] x11-libs/gtk+:2 gnome-base/libglade:2.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/gresistor/gresistor-0.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7dcd16c220dba384cf3b567744e16699
diff --git a/metadata/md5-cache/sci-electronics/gresistor-0.0.2-r1 b/metadata/md5-cache/sci-electronics/gresistor-0.0.2-r1
new file mode 100644
index 000000000000..fd687ad39f6b
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/gresistor-0.0.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) gnome-base/libglade:2.0[python_single_target_python2_7(-)?] x11-libs/gtk+:2 python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=Translate a resistor color codes into a readable value
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/gresistor/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] ) gnome-base/libglade:2.0[python_single_target_python2_7(-)?] x11-libs/gtk+:2 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/gresistor/gresistor-0.0.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eb267c53ffa07714e6db48977d5ba955
diff --git a/metadata/md5-cache/sci-electronics/kicad-4.0.7 b/metadata/md5-cache/sci-electronics/kicad-4.0.7
deleted file mode 100644
index e1e4547013b7..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-4.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] github? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) media-libs/glew:0= media-libs/freeglut media-libs/mesa[X(+)] sys-libs/zlib x11-libs/cairo doc? ( app-doc/doxygen ) i18n? ( virtual/libintl ) python? ( dev-lang/swig:0 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Electronic Schematic and PCB design tools.
-EAPI=6
-HOMEPAGE=http://www.kicad-pcb.org
-IUSE=debug doc examples github i18n libressl minimal +python l10n_bg l10n_ca l10n_cs l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_ko l10n_nl l10n_pl l10n_pt l10n_ru l10n_sk l10n_sl l10n_sv l10n_zh-CN +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] github? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) media-libs/glew:0= media-libs/freeglut media-libs/mesa[X(+)] sys-libs/zlib x11-libs/cairo sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=38eb981e42425278f7cf5c7eb64ea722
diff --git a/metadata/md5-cache/sci-electronics/kicad-4.0.7-r1 b/metadata/md5-cache/sci-electronics/kicad-4.0.7-r1
new file mode 100644
index 000000000000..6a010e2e6a0c
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-4.0.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) media-libs/glew:0= media-libs/freeglut media-libs/mesa[X(+)] sys-libs/zlib x11-libs/cairo doc? ( app-doc/doxygen ) i18n? ( virtual/libintl ) python? ( dev-lang/swig:0 ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Electronic Schematic and PCB design tools.
+EAPI=6
+HOMEPAGE=http://www.kicad-pcb.org
+IUSE=debug doc examples github i18n libressl minimal +python l10n_bg l10n_ca l10n_cs l10n_de l10n_el l10n_es l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_ko l10n_nl l10n_pl l10n_pt l10n_ru l10n_sk l10n_sl l10n_sv l10n_zh-CN +python_single_target_python2_7
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=GPL-2+ GPL-3+ Boost-1.0
+RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) media-libs/glew:0= media-libs/freeglut media-libs/mesa[X(+)] sys-libs/zlib x11-libs/cairo sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1809193ebc15661a61dd104daf74f334
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.0.1 b/metadata/md5-cache/sci-electronics/kicad-5.0.1
index d2318049e48e..c80d779e30ab 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.0.1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.0.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc examples github +ngspice occ +oce openmp +python +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ?? ( occ oce )
+RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.0.1/+download/kicad-5.0.1.tar.xz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ba450128325a0bbb94ebf9ba8d82359
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e8b60447c3addeb9739abb4fc05aea47
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
index 7169070cc7db..f5ff37d798fe 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc examples github +ngspice occ +oce openmp +python +python_single_target_python2_7
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ?? ( occ oce )
+RDEPEND=>=x11-libs/wxGTK-3.0.2:3.0[X,opengl] python_single_target_python2_7? ( python? ( dev-python/wxpython:3.0[opengl,python_targets_python2_7(-)] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python2_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.0/+download/kicad-5.1.0.tar.xz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ffc58a4028e5aca21e13880d84655ec
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4d4e25fc50e2a3679afc1fb3897e1a8
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
index 1b94c5dbe54a..b6896902516a 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( 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 ) ) ?? ( occ oce )
+RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.2/+download/kicad-5.1.2.tar.xz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ada9f4c8344079c668f3d842e396c873
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06bf269b27d80c6381248d2a1af1e567
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.4 b/metadata/md5-cache/sci-electronics/kicad-5.1.4
index 4bf127e5696a..b1bd152203a7 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.4
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( 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 ) ) ?? ( occ oce )
+RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python_single_target_python3_6? ( python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)] ) python_single_target_python3_7? ( python? ( dev-python/wxpython:4.0[python_targets_python3_7(-)] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) >=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_7(-)] ) github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/freeglut media-libs/mesa[X(+)] ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.4/+download/kicad-5.1.4.tar.xz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85e4a5111af067cf85ef95a3dedf47f0
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=262c232b84917afd8546542e94b9bb8a
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.5 b/metadata/md5-cache/sci-electronics/kicad-5.1.5
deleted file mode 100644
index e9e5c7e0da72..000000000000
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( >=dev-lang/swig-3.0:0 )
-DESCRIPTION=Electronic Schematic and PCB design tools
-EAPI=7
-HOMEPAGE=https://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads,python?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( dev-python/wxpython:4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( 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 ) ) ?? ( occ oce )
-SLOT=0
-SRC_URI=https://launchpad.net/kicad/5.0/5.1.5/+download/kicad-5.1.5.tar.xz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8995b697d3677a526b758ee1086649e8
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.5-r1 b/metadata/md5-cache/sci-electronics/kicad-5.1.5-r1
new file mode 100644
index 000000000000..ba6d4da83da1
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.5-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( >=dev-lang/swig-3.0:0 )
+DESCRIPTION=Electronic Schematic and PCB design tools
+EAPI=7
+HOMEPAGE=https://www.kicad-pcb.org
+IUSE=doc examples github +ngspice occ +oce openmp +python python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-3+ Boost-1.0
+RDEPEND=>=dev-libs/boost-1.61:=[context,nls,threads] media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 media-libs/mesa[X(+)] >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:3.0-gtk3[X,opengl] github? ( net-misc/curl:=[ssl] ) ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) python? ( python_single_target_python3_6? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_6(-)] dev-python/wxpython:4.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-libs/boost-1.61:=[context,nls,threads,python,python_targets_python3_7(-)] dev-python/wxpython:4.0[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) ?? ( occ oce )
+SLOT=0
+SRC_URI=https://launchpad.net/kicad/5.0/5.1.5/+download/kicad-5.1.5.tar.xz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6580467fbbbdab9a59a299a676fcb1c2
diff --git a/metadata/md5-cache/sci-electronics/klayout-0.25.6 b/metadata/md5-cache/sci-electronics/klayout-0.25.6
index 458ee9db687a..572836da528b 100644
--- a/metadata/md5-cache/sci-electronics/klayout-0.25.6
+++ b/metadata/md5-cache/sci-electronics/klayout-0.25.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=6
 HOMEPAGE=https://www.klayout.de/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6 ruby_targets_ruby24
+IUSE=+python_single_target_python3_6 ruby_targets_ruby24
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-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 ) || ( ruby_targets_ruby24 )
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) || ( ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://www.klayout.org/downloads/source/klayout-0.25.6.tar.gz
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e01ebe8d8a03ccc99510f49eba7404fb
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7d8c359fe12530d593df2f25a51e6699
diff --git a/metadata/md5-cache/sci-electronics/klayout-9999 b/metadata/md5-cache/sci-electronics/klayout-9999
index f078c2973d55..96623d44c27d 100644
--- a/metadata/md5-cache/sci-electronics/klayout-9999
+++ b/metadata/md5-cache/sci-electronics/klayout-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Viewer and editor for GDS and OASIS integrated circuit layouts
 EAPI=6
 HOMEPAGE=https://www.klayout.de/
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6 ruby_targets_ruby24
+IUSE=+python_single_target_python3_6 ruby_targets_ruby24
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-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 ) || ( ruby_targets_ruby24 )
+RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 sys-libs/zlib python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 ) || ( ruby_targets_ruby24 )
 SLOT=0
-_eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d30599ea2f8aee80f137419c52e315f5
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e8bec025fd84096fdc203713acc5c961
diff --git a/metadata/md5-cache/sci-electronics/pcb-0_p20140316 b/metadata/md5-cache/sci-electronics/pcb-0_p20140316
deleted file mode 100644
index d2c2b61b0fab..000000000000
--- a/metadata/md5-cache/sci-electronics/pcb-0_p20140316
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure postinst postrm preinst prepare setup
-DEPEND=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 ) test? ( sci-electronics/gerbv virtual/imagemagick-tools ) >=dev-util/intltool-0.35 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=GPL Electronic Design Automation: Printed Circuit Board editor
-EAPI=5
-HOMEPAGE=http://pcb.geda-project.org/
-IUSE=dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png test tk toporouter xrender
-KEYWORDS=amd64 ppc x86 ~x86-macos
-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
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/pcb/pcb/pcb-20140316/pcb-20140316.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ffa3083640c85d636ac2672fd7a01e34
diff --git a/metadata/md5-cache/sci-electronics/pcb-4.0.2 b/metadata/md5-cache/sci-electronics/pcb-4.0.2
deleted file mode 100644
index 357b390fc513..000000000000
--- a/metadata/md5-cache/sci-electronics/pcb-4.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure postinst postrm preinst prepare setup
-DEPEND=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 ) test? ( sci-electronics/gerbv virtual/imagemagick-tools ) >=dev-util/intltool-0.35 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=GPL Electronic Design Automation: Printed Circuit Board editor
-EAPI=5
-HOMEPAGE=http://pcb.geda-project.org/
-IUSE=dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png test tk toporouter xrender
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-macos
-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
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/pcb/pcb/pcb-4.0.2/pcb-4.0.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0784dcf2766493731e8af9a06227983
diff --git a/metadata/md5-cache/sci-electronics/pcb-4.2.2 b/metadata/md5-cache/sci-electronics/pcb-4.2.2
index 21ac3fdf03fa..0dd73b0338f7 100644
--- a/metadata/md5-cache/sci-electronics/pcb-4.2.2
+++ b/metadata/md5-cache/sci-electronics/pcb-4.2.2
@@ -5,11 +5,11 @@ DESCRIPTION=GPL Electronic Design Automation: Printed Circuit Board editor
 EAPI=7
 HOMEPAGE=http://pcb.geda-project.org/
 IUSE=dbus doc gcode gif gsvit gui jpeg m4lib-png nelma png test tk toporouter
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-macos
+KEYWORDS=amd64 ~ppc x86 ~x86-macos
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sci-electronics/electronics-menu gif? ( media-libs/gd ) gsvit? ( media-libs/gd[png] ) gui? ( x11-libs/gtk+:2 x11-libs/pango dbus? ( sys-apps/dbus ) ) jpeg? ( media-libs/gd[jpeg] ) nelma? ( media-libs/gd[png] ) gcode? ( media-libs/gd[png] ) virtual/libintl png? ( media-libs/gd[png] ) m4lib-png? ( media-libs/gd[png] ) tk? ( >=dev-lang/tk-8:0 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/pcb/pcb/pcb-4.2.2/pcb-4.2.2.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=137ae1e2992c653e0b0fa5900ab51a00
+_md5_=519d0cb8001ffc0dd66fd062da32d339
diff --git a/metadata/md5-cache/sci-electronics/pulseview-0.4.1 b/metadata/md5-cache/sci-electronics/pulseview-0.4.1
deleted file mode 100644
index 5524441108b2..000000000000
--- a/metadata/md5-cache/sci-electronics/pulseview-0.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-libs/boost-1.55:= >=dev-libs/glib-2.28.0:2 >=dev-cpp/glibmm-2.28.0:2 >=sci-libs/libsigrok-0.5.1:=[cxx] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 decode? ( >=sci-libs/libsigrokdecode-0.5.2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt based logic analyzer GUI for sigrok
-EAPI=6
-HOMEPAGE=https://sigrok.org/wiki/PulseView
-IUSE=+decode static 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=>=dev-libs/boost-1.55:= >=dev-libs/glib-2.28.0:2 >=dev-cpp/glibmm-2.28.0:2 >=sci-libs/libsigrok-0.5.1:=[cxx] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 decode? ( >=sci-libs/libsigrokdecode-0.5.2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=decode? ( ^^ ( 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://sigrok.org/download/source/pulseview/pulseview-0.4.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=890334d3fa2d2c801343239458dd4c40
diff --git a/metadata/md5-cache/sci-electronics/pulseview-0.4.1-r1 b/metadata/md5-cache/sci-electronics/pulseview-0.4.1-r1
new file mode 100644
index 000000000000..faaab7d84f42
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/pulseview-0.4.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/boost-1.55:= >=dev-libs/glib-2.28.0:2 >=dev-cpp/glibmm-2.28.0:2 >=sci-libs/libsigrok-0.5.1:=[cxx] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 decode? ( >=sci-libs/libsigrokdecode-0.5.2:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Qt based logic analyzer GUI for sigrok
+EAPI=6
+HOMEPAGE=https://sigrok.org/wiki/PulseView
+IUSE=+decode static python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+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.5.1:=[cxx] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtsvg:5 decode? ( >=sci-libs/libsigrokdecode-0.5.2:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
+REQUIRED_USE=decode? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=0
+SRC_URI=https://sigrok.org/download/source/pulseview/pulseview-0.4.1.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c9734aaee75446512e4bd9d90131b1b2
diff --git a/metadata/md5-cache/sci-electronics/pulseview-9999 b/metadata/md5-cache/sci-electronics/pulseview-9999
index 8b9f1f68a678..8bd63aea847d 100644
--- a/metadata/md5-cache/sci-electronics/pulseview-9999
+++ b/metadata/md5-cache/sci-electronics/pulseview-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=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_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Qt based logic analyzer GUI for sigrok
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/PulseView
-IUSE=+decode static python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+decode static python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-3
 PROPERTIES=live
-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_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=decode? ( ^^ ( 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 ) )
+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_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
+REQUIRED_USE=decode? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5725c2ca7d2fc4272b1e45a4132f8c51
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3deffa9272198d21214c73e454b15499
diff --git a/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1 b/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1
deleted file mode 100644
index 4616e6e50b0f..000000000000
--- a/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/pkgconfig
-DESCRIPTION=Command-line client for the sigrok logic analyzer software
-EAPI=6
-HOMEPAGE=https://sigrok.org/wiki/Sigrok-cli
-IUSE=+decode 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=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=decode? ( ^^ ( 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://sigrok.org/download/source/sigrok-cli/sigrok-cli-0.7.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e381a201bd6b2dfc544496780dd303e6
diff --git a/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1-r1 b/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1-r1
new file mode 100644
index 000000000000..b065d32073d0
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/sigrok-cli-0.7.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure postinst postrm prepare setup
+DEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/pkgconfig
+DESCRIPTION=Command-line client for the sigrok logic analyzer software
+EAPI=6
+HOMEPAGE=https://sigrok.org/wiki/Sigrok-cli
+IUSE=+decode python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
+REQUIRED_USE=decode? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=0
+SRC_URI=https://sigrok.org/download/source/sigrok-cli/sigrok-cli-0.7.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06749ad5ce34cb32f3b3fa63fbd9cc3d
diff --git a/metadata/md5-cache/sci-electronics/sigrok-cli-9999 b/metadata/md5-cache/sci-electronics/sigrok-cli-9999
index 16086f90b71c..3392fad6f23f 100644
--- a/metadata/md5-cache/sci-electronics/sigrok-cli-9999
+++ b/metadata/md5-cache/sci-electronics/sigrok-cli-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure postinst postrm prepare setup unpack
-DEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/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.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 client for the sigrok logic analyzer software
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Sigrok-cli
-IUSE=+decode python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+decode python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=decode? ( ^^ ( 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 ) )
+RDEPEND=>=dev-libs/glib-2.32.0 >=sci-libs/libsigrok-0.5.0:= decode? ( >=sci-libs/libsigrokdecode-0.5.0:=[python_single_target_python3_6(-)?,python_single_target_python3_7(-)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
+REQUIRED_USE=decode? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e381a201bd6b2dfc544496780dd303e6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06749ad5ce34cb32f3b3fa63fbd9cc3d
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index adca64df8790..74291ee9ef7d 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
index fe96c82770db..8cbe3aaece44 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) pyt
 RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6601760a9168d4fa9acfafdd7fd16c0
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
index abcae81d91f4..2ac1c2e09224 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r4
@@ -11,5 +11,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) pyt
 RESTRICT=!test? ( test )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=74db1790c84ed23008ec52d904aa3c46
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.18.1 b/metadata/md5-cache/sci-geosciences/gpsd-3.18.1
index fef9d9d03e57..98cb154811d1 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.18.1
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.18.1
@@ -11,5 +11,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.18.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3929eb8ee46d4faaa3b5fead1760b85
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.19 b/metadata/md5-cache/sci-geosciences/gpsd-3.19
index 8af8e7746a4c..e3041c66f683 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.19
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.19
@@ -11,5 +11,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/24
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.19.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3929eb8ee46d4faaa3b5fead1760b85
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index 589a10af5536..14f79593c020 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -10,5 +10,5 @@ RDEPEND=>=net-misc/pps-tools-0.0.20120407 bluetooth? ( net-wireless/bluez ) dbus
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python2_7 python_targets_python3_6 ) ) qt5? ( cxx )
 RESTRICT=!test? ( test )
 SLOT=0/24
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89ea9cfa15c20e5a0d59301ae8df8fd7
diff --git a/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6 b/metadata/md5-cache/sci-geosciences/gpxpy-0.8.6
index 6aab2ed95e54..6c6f2e66a4a3 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_6 )
 SLOT=0
 SRC_URI=https://github.com/tkrajina/gpxpy/tarball/85c3477b -> gpxpy-0.8.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ac0fd97682159fe75f7714765a1203ec
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.4.4 b/metadata/md5-cache/sci-geosciences/grass-7.4.4
index 6955bf18f553..161e3e3e1d0e 100644
--- a/metadata/md5-cache/sci-geosciences/grass-7.4.4
+++ b/metadata/md5-cache/sci-geosciences/grass-7.4.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/eselect-1.2 || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) media-libs/libprojectm sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( sci-libs/cblas-reference virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig X? ( dev-lang/swig x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/eselect-1.2 python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) media-libs/libprojectm sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( sci-libs/cblas-reference virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig X? ( dev-lang/swig x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
 EAPI=6
 HOMEPAGE=https://grass.osgeo.org/
-IUSE=blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X +python_targets_python2_7 +python_single_target_python2_7
+IUSE=blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X +python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/eselect-1.2 || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) media-libs/libprojectm sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( sci-libs/cblas-reference virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) opengl? ( X )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/eselect-1.2 python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) media-libs/libprojectm sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( sci-libs/cblas-reference virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) opengl? ( X )
 SLOT=0/7.4.0
 SRC_URI=https://grass.osgeo.org/grass74/source/grass-7.4.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea8b43b955b272bea81173098fcf23a9
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e63578b76342899f92b955cda320198
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.4.4-r2 b/metadata/md5-cache/sci-geosciences/grass-7.4.4-r2
deleted file mode 100644
index 567ac1834536..000000000000
--- a/metadata/md5-cache/sci-geosciences/grass-7.4.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/eselect-1.2 || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) media-libs/libprojectm sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( virtual/cblas virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig X? ( dev-lang/swig x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
-EAPI=6
-HOMEPAGE=https://grass.osgeo.org/
-IUSE=blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/eselect-1.2 || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) media-libs/libprojectm sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( virtual/cblas virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) opengl? ( X )
-SLOT=0/7.4.0
-SRC_URI=https://grass.osgeo.org/grass74/source/grass-7.4.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e427a753dc2120d63532e2b73287d5c
diff --git a/metadata/md5-cache/sci-geosciences/grass-7.4.4-r3 b/metadata/md5-cache/sci-geosciences/grass-7.4.4-r3
new file mode 100644
index 000000000000..32651748da53
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/grass-7.4.4-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/eselect-1.2 python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) media-libs/libprojectm sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( virtual/cblas virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig X? ( dev-lang/swig x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A free GIS with raster and vector functionality, as well as 3D vizualization
+EAPI=6
+HOMEPAGE=https://grass.osgeo.org/
+IUSE=blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X +python_single_target_python2_7
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/eselect-1.2 python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) media-libs/libprojectm sci-libs/gdal sys-libs/gdbm sys-libs/ncurses:0= sci-libs/proj sci-libs/xdrfile sys-libs/zlib blas? ( virtual/cblas virtual/blas ) fftw? ( sci-libs/fftw:3.0= ) geos? ( sci-libs/geos ) lapack? ( virtual/lapack ) liblas? ( sci-geosciences/liblas ) mysql? ( dev-db/mysql-connector-c:= ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) readline? ( sys-libs/readline:0= ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2 ) X? ( dev-python/wxpython:3.0[cairo,opengl?] x11-libs/cairo[X,opengl?] x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) opengl? ( X )
+SLOT=0/7.4.0
+SRC_URI=https://grass.osgeo.org/grass74/source/grass-7.4.4.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f62667d7122f4d27461198134db8c245
diff --git a/metadata/md5-cache/sci-geosciences/mapnik-3.0.18 b/metadata/md5-cache/sci-geosciences/mapnik-3.0.18
index 145cf6b01fd5..f88f63c28218 100644
--- a/metadata/md5-cache/sci-geosciences/mapnik-3.0.18
+++ b/metadata/md5-cache/sci-geosciences/mapnik-3.0.18
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/boost-1.48:=[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp:= sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) osmfonts? ( media-fonts/dejavu media-fonts/noto media-fonts/noto-cjk media-fonts/unifont ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/mapnik/mapnik/releases/download/v3.0.18/mapnik-v3.0.18.tar.bz2 -> mapnik-3.0.18.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e71388d57103cfe6c498c3e2973602c1
diff --git a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1 b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
index 9c554dd974b9..01deec3b3e53 100644
--- a/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
+++ b/metadata/md5-cache/sci-geosciences/mapnik-3.0.9-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/boost-1.48:=[threads] dev-libs/icu:= sys-libs/zlib media-libs/freetype media-libs/harfbuzz dev-libs/libxml2 media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= media-libs/libwebp:= sci-libs/proj media-fonts/dejavu x11-libs/agg[truetype] cairo? ( x11-libs/cairo dev-cpp/cairomm ) postgres? ( >=dev-db/postgresql-8.3:* ) gdal? ( sci-libs/gdal ) sqlite? ( dev-db/sqlite:3 )
 SLOT=0
 SRC_URI=https://github.com/mapnik/mapnik/archive/v3.0.9.tar.gz -> mapnik-3.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8a06fda3a71a976118707894efb48605
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.0.5 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.5
index 95ceefb54c8e..ff12dd06aa54 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=https://download.osgeo.org/mapserver/mapserver-7.0.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=efd4f4cce248546898bccc74285a9a0d
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.0.7 b/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
index 49f98d997179..3c1ae3b60e14 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs
 REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.0.7.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=14333728236270683a636ab99579ec5d
diff --git a/metadata/md5-cache/sci-geosciences/mapserver-7.2.2 b/metadata/md5-cache/sci-geosciences/mapserver-7.2.2
index b1e7b1a88ff9..eccd5cd1e779 100644
--- a/metadata/md5-cache/sci-geosciences/mapserver-7.2.2
+++ b/metadata/md5-cache/sci-geosciences/mapserver-7.2.2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/expat >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs
 REQUIRED_USE=php? ( php_targets_php5-6 ) xslt? ( xml ) || ( python_targets_python2_7 ) php? ( || ( php_targets_php5-6 ) )
 SLOT=0
 SRC_URI=https://download.osgeo.org/mapserver/mapserver-7.2.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	php-ext-source-r3	dd53cd94748f9e498bea0f9480ba8d77	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc70b40263894231ff609655b2384b55
diff --git a/metadata/md5-cache/sci-geosciences/opencpn-plugins-meta-4.2.0-r3 b/metadata/md5-cache/sci-geosciences/opencpn-plugins-meta-4.2.0-r3
index ce49742e6e76..1e24e18e6ef9 100644
--- a/metadata/md5-cache/sci-geosciences/opencpn-plugins-meta-4.2.0-r3
+++ b/metadata/md5-cache/sci-geosciences/opencpn-plugins-meta-4.2.0-r3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Meta ebuild to pull in opencpn plugins
 EAPI=6
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=sci-geosciences/opencpn-4.2.0 >=sci-geosciences/opencpn-plugin-br24radar-1.31 >=sci-geosciences/opencpn-plugin-dr-1.1 >=sci-geosciences/opencpn-plugin-findit-1.1007 >=sci-geosciences/opencpn-plugin-gxradar-1.1 >=sci-geosciences/opencpn-plugin-iacfleet-0.8 >=sci-geosciences/opencpn-plugin-launcher-1.1 >=sci-geosciences/opencpn-plugin-logbookkonni-1.3002 >=sci-geosciences/opencpn-plugin-objsearch-0.7 >=sci-geosciences/opencpn-plugin-ocpn_draw-1.0.12 >=sci-geosciences/opencpn-plugin-ocpndebugger-1.2 >=sci-geosciences/opencpn-plugin-oesenc-1.6.0 >=sci-geosciences/opencpn-plugin-otcurrent-1.2 >=sci-geosciences/opencpn-plugin-polar-1.1007 >=sci-geosciences/opencpn-plugin-radar-0.98 >=sci-geosciences/opencpn-plugin-route-1.2 >=sci-geosciences/opencpn-plugin-squiddio-0.7 >=sci-geosciences/opencpn-plugin-watchdog-1.9.051 >=sci-geosciences/opencpn-plugin-weather_routing-1.10.1 >=sci-geosciences/opencpn-plugin-climatology-1.0.20180316 >=sci-geosciences/opencpn-plugin-statusbar-0.5.20180316 >=sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
 SLOT=0
-_md5_=48ab099f8f538d4a50196733bfca19f0
+_md5_=70e85b3246036423dcd4ae169411d926
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.10.2 b/metadata/md5-cache/sci-geosciences/qgis-3.10.2
deleted file mode 100644
index 1f0bbb1f294d..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.10.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/linguist-tools-5.9.4:5 sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/markupsafe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/owslib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/sip:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/qttest-5.9.4:5 python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=User friendly Geographic Information System
-EAPI=7
-HOMEPAGE=https://www.qgis.org/
-IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/markupsafe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/owslib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/sip:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) mapserver? ( python )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.10.2.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=54b200f3434b9c87abf94693ad2f2484
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.10.2-r1 b/metadata/md5-cache/sci-geosciences/qgis-3.10.2-r1
new file mode 100644
index 000000000000..c2b6bda75e26
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qgis-3.10.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/linguist-tools-5.9.4:5 sys-devel/bison sys-devel/flex dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/qttest-5.9.4:5 python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=User friendly Geographic Information System
+EAPI=7
+HOMEPAGE=https://www.qgis.org/
+IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) mapserver? ( python )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://qgis.org/downloads/qgis-3.10.2.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b692e09848af2e9f702657c9160778b0
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.4.12 b/metadata/md5-cache/sci-geosciences/qgis-3.4.12
deleted file mode 100644
index 138423cad0bc..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.4.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.9.4:5 sys-devel/bison sys-devel/flex dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/future[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/httplib2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markupsafe[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/owslib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pytz[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/sip:=[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=User friendly Geographic Information System
-EAPI=7
-HOMEPAGE=https://www.qgis.org/
-IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/future[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/httplib2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/markupsafe[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/owslib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pytz[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/sip:=[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) mapserver? ( python )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.4.12.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d560bb40b5b278bd267c9c8d0528de59
diff --git a/metadata/md5-cache/sci-geosciences/qgis-9999 b/metadata/md5-cache/sci-geosciences/qgis-9999
index ad68ed8c51b5..118ca30ef268 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-9999
+++ b/metadata/md5-cache/sci-geosciences/qgis-9999
@@ -1,15 +1,15 @@
 BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=dev-qt/linguist-tools-5.9.4:5 sys-devel/bison sys-devel/flex >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/markupsafe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/owslib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/sip:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/qttest-5.9.4:5 python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/qttest-5.9.4:5 python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=User friendly Geographic Information System
 EAPI=7
 HOMEPAGE=https://www.qgis.org/
-IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-2+ GPL-3+
 PROPERTIES=live
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/future[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/httplib2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/markupsafe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/owslib[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygments[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/sip:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) mapserver? ( python )
+RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] dev-python/httplib2[python_targets_python3_7(-)] dev-python/jinja[python_targets_python3_7(-)] dev-python/markupsafe[python_targets_python3_7(-)] dev-python/owslib[python_targets_python3_7(-)] dev-python/pygments[python_targets_python3_7(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_7(-)] dev-python/python-dateutil[python_targets_python3_7(-)] dev-python/pytz[python_targets_python3_7(-)] dev-python/pyyaml[python_targets_python3_7(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_7(-)] dev-python/requests[python_targets_python3_7(-)] dev-python/sip:=[python_targets_python3_7(-)] dev-python/six[python_targets_python3_7(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_7(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/future[python_targets_python3_8(-)] dev-python/httplib2[python_targets_python3_8(-)] dev-python/jinja[python_targets_python3_8(-)] dev-python/markupsafe[python_targets_python3_8(-)] dev-python/owslib[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pytz[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] dev-python/sip:=[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_8(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) mapserver? ( python )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5fa29f4f3fee9e454a2beddd49b1d77d
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f4fcb115e33abde2ad220b3d89828582
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.12.0 b/metadata/md5-cache/sci-geosciences/qmapshack-1.12.0
deleted file mode 100644
index 992a583050c4..000000000000
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.12.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=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 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=GPS mapping utility
-EAPI=6
-HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
-KEYWORDS=amd64 x86
-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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=65f86065beb68ff0aadb2abaaf45d72e
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.13.2 b/metadata/md5-cache/sci-geosciences/qmapshack-1.13.2
deleted file mode 100644
index a0211fd78807..000000000000
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.13.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtpositioning: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-5.0.0 sci-libs/alglib dev-qt/linguist-tools:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GPS mapping utility
-EAPI=7
-HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtwebengine:5[widgets] dev-qt/qtdeclarative:5[widgets] dev-qt/qtprintsupport:5 dev-qt/qtpositioning: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-5.0.0 sci-libs/alglib
-SLOT=0
-SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.13.2.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=30352f4e0fe86b1c16f57ea148c38d77
diff --git a/metadata/md5-cache/sci-geosciences/seawater-3.3.4 b/metadata/md5-cache/sci-geosciences/seawater-3.3.4
index 229725975333..d76e6ae32088 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_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/s/seawater/seawater-3.3.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6edae09b392842473f787ffde6a7bd9a
diff --git a/metadata/md5-cache/sci-geosciences/tappy-0.9.0-r1 b/metadata/md5-cache/sci-geosciences/tappy-0.9.0-r1
index 75f69110c298..d1ae95eacdf8 100644
--- a/metadata/md5-cache/sci-geosciences/tappy-0.9.0-r1
+++ b/metadata/md5-cache/sci-geosciences/tappy-0.9.0-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/tappy/tappy-0.9.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b787d7aaa435813a4d2e78063eb37bb6
diff --git a/metadata/md5-cache/sci-geosciences/tilecache-2.11-r1 b/metadata/md5-cache/sci-geosciences/tilecache-2.11-r1
index 5225fe99c3e9..602c027727d4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3a7d2600d59dfe7ab5e46c6986438c73
diff --git a/metadata/md5-cache/sci-libs/Fiona-1.7.6 b/metadata/md5-cache/sci-libs/Fiona-1.7.6
index 3d9bb7278711..6b08c5278f0b 100644
--- a/metadata/md5-cache/sci-libs/Fiona-1.7.6
+++ b/metadata/md5-cache/sci-libs/Fiona-1.7.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fiona/Fiona-1.7.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc34af74cbf964732fb5e31edec87868
diff --git a/metadata/md5-cache/sci-libs/Fiona-9999 b/metadata/md5-cache/sci-libs/Fiona-9999
index fd77fbc02204..b8ca35a30199 100644
--- a/metadata/md5-cache/sci-libs/Fiona-9999
+++ b/metadata/md5-cache/sci-libs/Fiona-9999
@@ -10,5 +10,5 @@ RDEPEND=>=sci-libs/gdal-1.8 dev-python/click[python_targets_python3_6(-)?,-pytho
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc136fca635f8c57cbbbde88cb39358c
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 92c2b3efcd18..7a502a6ad325 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.3_p20180802 b/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
index 60019729dad5..510eaa897bec 100644
--- a/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
+++ b/metadata/md5-cache/sci-libs/Rtree-0.8.3_p20180802
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Toblerity/rtree/archive/c6437a8ae182cb58aef1d0a4465bfc0c6f75b273.tar.gz -> Rtree-0.8.3_p20180802.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=dd13d996d4836c229fef5f9a1bd5a031
diff --git a/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2-r1 b/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2-r1
index 08efd200fa11..c744c88586eb 100644
--- a/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2-r1
+++ b/metadata/md5-cache/sci-libs/Shapely-1.6.4_p2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/Shapely/Shapely-1.6.4.post2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=58c6fd2d97600cd6d84f1c7f2200ed01
diff --git a/metadata/md5-cache/sci-libs/blis-0.5.2 b/metadata/md5-cache/sci-libs/blis-0.5.2
index 1209dab05fc3..496203175afa 100644
--- a/metadata/md5-cache/sci-libs/blis-0.5.2
+++ b/metadata/md5-cache/sci-libs/blis-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 )
 DESCRIPTION=BLAS-like Library Instantiation Software Framework
 EAPI=7
 HOMEPAGE=https://github.com/flame/blis
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )
 SLOT=0
 SRC_URI=https://github.com/flame/blis/archive/0.5.2.tar.gz -> blis-0.5.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=2f5d75ccfff481854ed6737685dbea98
+_md5_=fb09b6c728ca9411f67e6eaf59e4e42f
diff --git a/metadata/md5-cache/sci-libs/blis-0.6.0 b/metadata/md5-cache/sci-libs/blis-0.6.0
index 9cfbc7022fe2..beaec03e9f70 100644
--- a/metadata/md5-cache/sci-libs/blis-0.6.0
+++ b/metadata/md5-cache/sci-libs/blis-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=eselect-ldso? ( !app-eselect/eselect-cblas >=app-eselect/eselect-blas-0.2 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 )
 DESCRIPTION=BLAS-like Library Instantiation Software Framework
 EAPI=7
 HOMEPAGE=https://github.com/flame/blis
@@ -11,4 +11,4 @@ REQUIRED_USE=?? ( openmp pthread serial ) ?? ( eselect-ldso 64bit-index )
 SLOT=0
 SRC_URI=https://github.com/flame/blis/archive/0.6.0.tar.gz -> blis-0.6.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=380ebdd856eedbfce44f26066e93b0c4
+_md5_=e0f905e8e83065f5c7fe1ec42b4daa19
diff --git a/metadata/md5-cache/sci-libs/bmrblib-1.0.3 b/metadata/md5-cache/sci-libs/bmrblib-1.0.3
index 47cf44056bf7..07979904da38 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_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=http://download.gna.org/bmrblib/bmrblib-1.0.3.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1a33fb262abc10b7f275bb862d1aa48
diff --git a/metadata/md5-cache/sci-libs/cantera-2.4.0-r1 b/metadata/md5-cache/sci-libs/cantera-2.4.0-r1
index be79d81d93ae..635f72094ceb 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.4.0-r1
+++ b/metadata/md5-cache/sci-libs/cantera-2.4.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/scons[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+BDEPEND=python_single_target_python3_6? ( dev-util/scons[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-util/scons[python_targets_python3_7(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) <sci-libs/sundials-4.0.0:0= dev-cpp/eigen dev-libs/boost dev-libs/libfmt python? ( dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) test? ( >=dev-cpp/gtest-1.8.0 ) fortran? ( virtual/fortran )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) ) <sci-libs/sundials-4.0.0:0= dev-cpp/eigen dev-libs/boost dev-libs/libfmt python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) ) test? ( >=dev-cpp/gtest-1.8.0 ) fortran? ( virtual/fortran )
 DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
 EAPI=7
 HOMEPAGE=http://www.cantera.org
-IUSE=+cti fortran pch +python test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+cti fortran pch +python test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) <sci-libs/sundials-4.0.0:0= fortran? ( virtual/fortran )
-REQUIRED_USE=python? ( cti ) ^^ ( 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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) ) <sci-libs/sundials-4.0.0:0= fortran? ( virtual/fortran )
+REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cantera/cantera/archive/v2.4.0.tar.gz -> cantera-2.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4be14d51f3b89ba1fb847c0a8f7faaf4
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b697ee62ef5cfe93c6c2c2e80864fc2b
diff --git a/metadata/md5-cache/sci-libs/cantera-2.4.0-r2 b/metadata/md5-cache/sci-libs/cantera-2.4.0-r2
deleted file mode 100644
index fa768887e752..000000000000
--- a/metadata/md5-cache/sci-libs/cantera-2.4.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/scons[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) <sci-libs/sundials-5.1.0:0= dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) test? ( >=dev-cpp/gtest-1.8.0 ) fortran? ( virtual/fortran )
-DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
-EAPI=7
-HOMEPAGE=https://www.cantera.org
-IUSE=+cti fortran pch +python test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~x86
-LICENSE=BSD
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python? ( dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) <sci-libs/sundials-5.1.0:0= fortran? ( virtual/fortran )
-REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Cantera/cantera/archive/v2.4.0.tar.gz -> cantera-2.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d2816cbf74f18133a27813c37003db87
diff --git a/metadata/md5-cache/sci-libs/cantera-2.4.0-r3 b/metadata/md5-cache/sci-libs/cantera-2.4.0-r3
new file mode 100644
index 000000000000..6d37efa668bf
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/cantera-2.4.0-r3
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-util/scons[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-util/scons[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) ) <sci-libs/sundials-5.1.0:0= dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) ) test? ( >=dev-cpp/gtest-1.8.0 ) fortran? ( virtual/fortran )
+DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
+EAPI=7
+HOMEPAGE=https://www.cantera.org
+IUSE=+cti fortran pch +python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python? ( python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) ) <sci-libs/sundials-5.1.0:0= fortran? ( virtual/fortran )
+REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Cantera/cantera/archive/v2.4.0.tar.gz -> cantera-2.4.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ed1f063b1f0afed8e0155c4a379ea2f1
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 f149198197cc..da3826d61ba7 100644
--- a/metadata/md5-cache/sci-libs/ceres-solver-1.12.0
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cxsparse? ( sci-libs/cxsparse:0= ) lapack? ( virtual/lapack ) sparse? ( sci-libs/amd:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0=[metis] sci-libs/colamd:0= sci-libs/spqr:0= ) dev-cpp/eigen:3 doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme ) lapack? ( virtual/pkgconfig ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-cpp/glog[gflags?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cxsparse? ( sci-libs/cxsparse:0= ) lapack? ( virtual/lapack ) sparse? ( sci-libs/amd:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0=[metis] sci-libs/colamd:0= sci-libs/spqr:0= ) dev-cpp/eigen:3 doc? ( dev-python/sphinx dev-python/sphinx_rtd_theme ) lapack? ( virtual/pkgconfig ) || ( dev-lang/python:3.6 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Nonlinear least-squares minimizer
 EAPI=6
 HOMEPAGE=http://ceres-solver.org/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=http://ceres-solver.org/ceres-solver-1.12.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3a04aa4fcf3effe111e0792085462fa
+_md5_=8fcab80127eb894fb3b01faf45bf66d2
diff --git a/metadata/md5-cache/sci-libs/chemkit-0.1-r2 b/metadata/md5-cache/sci-libs/chemkit-0.1-r2
index 124b1173a93b..6fb8257501eb 100644
--- a/metadata/md5-cache/sci-libs/chemkit-0.1-r2
+++ b/metadata/md5-cache/sci-libs/chemkit-0.1-r2
@@ -3,13 +3,13 @@ DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/rapidxml media-libs/glu sci-lib
 DESCRIPTION=Library for chemistry applications
 EAPI=6
 HOMEPAGE=https://github.com/kylelutz/chemkit
-IUSE=examples python test +python_targets_python2_7 +python_single_target_python2_7 test
+IUSE=examples python test +python_single_target_python2_7 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD PSF-2.2
 RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/chemkit/chemkit-0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=01cb1233fea53bbe4d0d1aade5ff7adc
diff --git a/metadata/md5-cache/sci-libs/clblas-2.10 b/metadata/md5-cache/sci-libs/clblas-2.10
index 4c7fe8a7b868..d63856e9aeaa 100644
--- a/metadata/md5-cache/sci-libs/clblas-2.10
+++ b/metadata/md5-cache/sci-libs/clblas-2.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/opencl doc? ( dev-libs/mathjax ) performance? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) doc? ( app-doc/doxygen ) test? ( dev-cpp/gtest dev-libs/boost virtual/pkgconfig virtual/blas ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( virtual/fortran )
+DEPEND=virtual/opencl doc? ( dev-libs/mathjax ) performance? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) doc? ( app-doc/doxygen ) test? ( dev-cpp/gtest dev-libs/boost virtual/pkgconfig virtual/blas ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( virtual/fortran )
 DESCRIPTION=Library containing BLAS routines for OpenCL
 EAPI=6
 HOMEPAGE=https://github.com/clMathLibraries/clBLAS
-IUSE=+client doc examples ktest performance test python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+client doc examples ktest performance test +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=virtual/opencl doc? ( dev-libs/mathjax ) performance? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
-REQUIRED_USE=performance? ( ^^ ( 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 ) )
+RDEPEND=virtual/opencl doc? ( dev-libs/mathjax ) performance? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
+REQUIRED_USE=performance? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/clMathLibraries/clBLAS/archive/v2.10.tar.gz -> clblas-2.10.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7b6f105e62ee977f10dc4ffad01f020
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57df1f16cf2ca4a3ba075de980515251
diff --git a/metadata/md5-cache/sci-libs/deap-0.9.1 b/metadata/md5-cache/sci-libs/deap-0.9.1
index 986dfd7eda45..18dfd2a148c3 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 0736fbddc159..c09b2e7f169f 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 ) >=dev-lang/
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/d/deap/deap-1.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6ebd7500341ca0846ba2a3256a91310e
diff --git a/metadata/md5-cache/sci-libs/deap-1.0.1 b/metadata/md5-cache/sci-libs/deap-1.0.1
index 55d5c0d362da..ffaf15fc545c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f87e896874972b7f93511d3c543cf53
diff --git a/metadata/md5-cache/sci-libs/dlib-19.16 b/metadata/md5-cache/sci-libs/dlib-19.16
index 73c76ffc2054..0798eb87ddb2 100644
--- a/metadata/md5-cache/sci-libs/dlib-19.16
+++ b/metadata/md5-cache/sci-libs/dlib-19.16
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/19.16
 SRC_URI=https://github.com/davisking/dlib/archive/v19.16.tar.gz -> dlib-19.16.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94f3c6e4bc955f6800ed7bcffc78cdff
diff --git a/metadata/md5-cache/sci-libs/gdal-2.4.1-r1 b/metadata/md5-cache/sci-libs/gdal-2.4.1-r1
index 09930c5cb4b6..34f6e828f85f 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.4.1-r1
+++ b/metadata/md5-cache/sci-libs/gdal-2.4.1-r1
@@ -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_python3_6 python_targets_python3_7 ) ) spatialite? ( sqlite )
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db2c61157cf8e2db5ebbc71aae8f8b5f
diff --git a/metadata/md5-cache/sci-libs/gdal-2.4.3 b/metadata/md5-cache/sci-libs/gdal-2.4.3
index 39100cc98182..62fdfefdf5b9 100644
--- a/metadata/md5-cache/sci-libs/gdal-2.4.3
+++ b/metadata/md5-cache/sci-libs/gdal-2.4.3
@@ -5,11 +5,11 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=7
 HOMEPAGE=https://gdal.org/
 IUSE=armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:= media-libs/tiff:0= sci-libs/libgeotiff:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.7:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) spatialite? ( sqlite )
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/2.4.3/gdal-2.4.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c6939eaf1d090aac395f90b81a938e53
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ef4708aecafcc14ce2916e2a1faf6508
diff --git a/metadata/md5-cache/sci-libs/gdal-3.0.4 b/metadata/md5-cache/sci-libs/gdal-3.0.4
index 64d1c32545cc..81672e050be6 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.0.4
+++ b/metadata/md5-cache/sci-libs/gdal-3.0.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 med
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) ) spatialite? ( sqlite )
 SLOT=0/2.3
 SRC_URI=https://download.osgeo.org/gdal/3.0.4/gdal-3.0.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fb91a1bcab120ecd6404867503b9f4a1
diff --git a/metadata/md5-cache/sci-libs/geos-3.7.2 b/metadata/md5-cache/sci-libs/geos-3.7.2
index 6ccb63afd528..11c19bad9359 100644
--- a/metadata/md5-cache/sci-libs/geos-3.7.2
+++ b/metadata/md5-cache/sci-libs/geos-3.7.2
@@ -3,13 +3,13 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Geometry engine library for Geographic Information Systems
 EAPI=6
 HOMEPAGE=http://trac.osgeo.org/geos/
-IUSE=doc python ruby static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc python ruby static-libs +python_single_target_python2_7
 KEYWORDS=amd64 arm arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ruby? ( dev-lang/ruby:* )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/geos/geos-3.7.2.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eefc513314e1f72d7768fe47123fd836
diff --git a/metadata/md5-cache/sci-libs/getdata-0.9.0-r2 b/metadata/md5-cache/sci-libs/getdata-0.9.0-r2
deleted file mode 100644
index 89995988990a..000000000000
--- a/metadata/md5-cache/sci-libs/getdata-0.9.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) python? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
-DESCRIPTION=Reference implementation of the Dirfile, format for time-ordered binary data
-EAPI=6
-HOMEPAGE=http://getdata.sourceforge.net/
-IUSE=bzip2 cxx debug flac fortran lzma perl python static-libs +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) python? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) fortran? ( virtual/fortran )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/getdata/getdata/0.9.0/getdata-0.9.0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c800cf2e9fe38704116915551249e5f
diff --git a/metadata/md5-cache/sci-libs/getdata-0.9.0-r3 b/metadata/md5-cache/sci-libs/getdata-0.9.0-r3
new file mode 100644
index 000000000000..158dda8d34bc
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/getdata-0.9.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 fortran? ( virtual/fortran )
+DESCRIPTION=Reference implementation of the Dirfile, format for time-ordered binary data
+EAPI=6
+HOMEPAGE=http://getdata.sourceforge.net/
+IUSE=bzip2 cxx debug flac fortran lzma perl python static-libs +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) fortran? ( virtual/fortran )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/getdata/getdata/0.9.0/getdata-0.9.0.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=467ba4054002ba9ee6e8d21cbdde696c
diff --git a/metadata/md5-cache/sci-libs/indilib-1.8.3 b/metadata/md5-cache/sci-libs/indilib-1.8.3
index 8d59965d24d7..4bf619a32a55 100644
--- a/metadata/md5-cache/sci-libs/indilib-1.8.3
+++ b/metadata/md5-cache/sci-libs/indilib-1.8.3
@@ -5,11 +5,11 @@ DESCRIPTION=INDI Astronomical Control Protocol library
 EAPI=7
 HOMEPAGE=https://www.indilib.org/
 IUSE=ogg test websocket
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=net-misc/curl sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= sci-libs/libnova:= sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 ogg? ( media-libs/libogg media-libs/libtheora ) websocket? ( dev-libs/boost:= )
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/indilib/indi/archive/v1.8.3.tar.gz -> indilib-1.8.3.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fbeae478102b16a25e951fb023516ebc
+_md5_=1a71f8079d53b15d78244f19d44f097a
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.7 b/metadata/md5-cache/sci-libs/keras-applications-1.0.7
index c607822a5033..c657759dfaa4 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.7
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.7.tar.gz -> keras-applications-1.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=51c47cf910d54be7306b5b1d2035ec44
diff --git a/metadata/md5-cache/sci-libs/keras-applications-1.0.8 b/metadata/md5-cache/sci-libs/keras-applications-1.0.8
index e56cce344391..748b45f2a5f7 100644
--- a/metadata/md5-cache/sci-libs/keras-applications-1.0.8
+++ b/metadata/md5-cache/sci-libs/keras-applications-1.0.8
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-applications/archive/1.0.8.tar.gz -> keras-applications-1.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e0765749013b337adfd5016e1fe5d74
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9
index 56353e1af302..481be3621589 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.0.9
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-preprocessing/archive/1.0.9.tar.gz -> keras-preprocessing-1.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2595d422a49212f1b1d91386cec0213
diff --git a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0 b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0
index 0288403d48ed..664665e990d1 100644
--- a/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0
+++ b/metadata/md5-cache/sci-libs/keras-preprocessing-1.1.0
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/keras-team/keras-preprocessing/archive/1.1.0.tar.gz -> keras-preprocessing-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3e83897637e376dac626a2183c5fc15c
diff --git a/metadata/md5-cache/sci-libs/lapack-3.8.0 b/metadata/md5-cache/sci-libs/lapack-3.8.0
index e74d2485cbe2..40dd1057bdb2 100644
--- a/metadata/md5-cache/sci-libs/lapack-3.8.0
+++ b/metadata/md5-cache/sci-libs/lapack-3.8.0
@@ -11,4 +11,4 @@ RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lap
 SLOT=0
 SRC_URI=http://www.netlib.org/lapack/lapack-3.8.0.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67cb5d22d93df4a1ef23ae546f40d6e5
+_md5_=38ae3651f51904750268725d43c96ee3
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.4.0 b/metadata/md5-cache/sci-libs/libsigrok-0.4.0
index 05f40ac7dc64..1bc56ec8dbe4 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.4.0
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.4.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) test? ( >=dev-libs/check-0.9.4 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.4 ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-lang/swig-3.0.6 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)] ) ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) test? ( >=dev-libs/check-0.9.4 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.4 ) python? ( python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) >=dev-lang/swig-3.0.6 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=basic hardware drivers for logic analyzers and input/output file format support
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrok
-IUSE=cxx ftdi java parport python serial static-libs test usb +python_targets_python3_6 +python_single_target_python3_6 elibc_FreeBSD java
+IUSE=cxx ftdi java parport python serial static-libs test usb +python_single_target_python3_6 elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)] ) ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)] ) ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=db8d1f4b18b1fabea50eef51c5f3ef1e
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=c3f2ee6348010ce6a2968540f11c9ee0
diff --git a/metadata/md5-cache/sci-libs/libsigrok-0.5.1 b/metadata/md5-cache/sci-libs/libsigrok-0.5.1
index fea4a41f5827..7e148d75ddaa 100644
--- a/metadata/md5-cache/sci-libs/libsigrok-0.5.1
+++ b/metadata/md5-cache/sci-libs/libsigrok-0.5.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) test? ( >=dev-libs/check-0.9.4 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.4 ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-lang/swig-3.0.6 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DEPEND=>=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0.0[python_targets_python3_7(-)] ) ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) test? ( >=dev-libs/check-0.9.4 ) cxx? ( app-doc/doxygen ) java? ( >=dev-lang/swig-3.0.6 >=virtual/jdk-1.4 ) python? ( python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)] ) >=dev-lang/swig-3.0.6 ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
 DESCRIPTION=basic hardware drivers for logic analyzers and input/output file format support
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrok
-IUSE=cxx ftdi java parport python serial static-libs test +udev usb python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 elibc_FreeBSD java
+IUSE=cxx ftdi java parport python serial static-libs test +udev usb python_single_target_python3_6 python_single_target_python3_7 elibc_FreeBSD java
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( python_single_target_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 ) )
+RDEPEND=!static-libs? ( >=dev-libs/glib-2.32.0 >=dev-libs/libzip-0.8:= cxx? ( dev-cpp/glibmm:2 ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0.0[python_targets_python3_7(-)] ) ) ftdi? ( >=dev-embedded/libftdi-0.16:= ) parport? ( sys-libs/libieee1284 ) serial? ( >=dev-libs/libserialport-0.1.1 ) usb? ( virtual/libusb:1 ) ) static-libs? ( >=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/pygobject-3.0.0[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0.0[python_targets_python3_7(-)] ) ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) usb? ( virtual/libusb:1[static-libs(+)] ) ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=java? ( cxx ) python? ( cxx ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrok/libsigrok-0.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d7ea2860ba1c36e2fa6bf36c9026e4c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f42be503ffea2eea42f11e1957eda7c4
diff --git a/metadata/md5-cache/sci-libs/libsigrokdecode-0.4.1 b/metadata/md5-cache/sci-libs/libsigrokdecode-0.4.1
index 2cdb05ec9aba..50946b08db72 100644
--- a/metadata/md5-cache/sci-libs/libsigrokdecode-0.4.1
+++ b/metadata/md5-cache/sci-libs/libsigrokdecode-0.4.1
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.28.0 python_single_target_python3_6? ( dev-lang/python:
 DESCRIPTION=provide (streaming) protocol decoding functionality
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrokdecode
-IUSE=static-libs +python_targets_python3_6 +python_single_target_python3_6
+IUSE=static-libs +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.28.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0/3
 SRC_URI=https://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=76e6d2a6900a6c2d7e2523e98232f759
diff --git a/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.2 b/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.2
index 7b4cd1b18001..1223eaecf64c 100644
--- a/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.2
+++ b/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.2
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.34.0 python_single_target_python3_6? ( dev-lang/python:
 DESCRIPTION=provide (streaming) protocol decoding functionality
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrokdecode
-IUSE=static-libs python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=static-libs python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.34.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-0.5.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3b9012dfee4f9a5e2d864a24342d8da2
diff --git a/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.3 b/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.3
index b4edcaa42995..f26eec469a9f 100644
--- a/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.3
+++ b/metadata/md5-cache/sci-libs/libsigrokdecode-0.5.3
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/glib-2.34.0 python_single_target_python3_6? ( dev-lang/python:
 DESCRIPTION=provide (streaming) protocol decoding functionality
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrokdecode
-IUSE=static-libs python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=static-libs python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.34.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0/4
 SRC_URI=https://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-0.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3b9012dfee4f9a5e2d864a24342d8da2
diff --git a/metadata/md5-cache/sci-libs/libsigrokdecode-9999 b/metadata/md5-cache/sci-libs/libsigrokdecode-9999
index 8e46bcbaa91a..67aa7f9cfeca 100644
--- a/metadata/md5-cache/sci-libs/libsigrokdecode-9999
+++ b/metadata/md5-cache/sci-libs/libsigrokdecode-9999
@@ -3,11 +3,11 @@ DEPEND=>=dev-libs/glib-2.34.0 python_single_target_python3_6? ( dev-lang/python:
 DESCRIPTION=provide (streaming) protocol decoding functionality
 EAPI=6
 HOMEPAGE=https://sigrok.org/wiki/Libsigrokdecode
-IUSE=static-libs python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=static-libs python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.34.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0/9999
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2cd8ceef8b1b10f8f288c7396f2a6a3a
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 247806181519..47521b38c440 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.1.0
@@ -3,12 +3,12 @@ DEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12
 DESCRIPTION=Kernel module and driver library for GPIB (IEEE 488.2) hardware
 EAPI=6
 HOMEPAGE=https://linux-gpib.sourceforge.io/
-IUSE=isa pcmcia static debug guile perl php python tcl doc firmware kernel_linux kernel_linux kernel_linux +python_targets_python2_7 +python_single_target_python2_7
+IUSE=isa pcmcia static debug guile perl php python tcl doc firmware kernel_linux kernel_linux kernel_linux +python_single_target_python2_7
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) firmware? ( sys-apps/fxload ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=55404a37ba2eb82c03f47dd08c0b565a
diff --git a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0 b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
index fdfe1027d182..fe059951d289 100644
--- a/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
+++ b/metadata/md5-cache/sci-libs/linux-gpib-4.2.0
@@ -3,12 +3,12 @@ DEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12
 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
+IUSE=pcmcia static guile perl php python tcl doc firmware python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/readline:= tcl? ( dev-lang/tcl:0= ) guile? ( dev-scheme/guile:12 ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) firmware? ( sys-apps/fxload ) ~sci-libs/linux-gpib-modules-4.2.0
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/linux-gpib/linux-gpib-4.2.0.tar.gz firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=750b00841fc6af5d2fa826754106864c
diff --git a/metadata/md5-cache/sci-libs/mathgl-2.4.1-r1 b/metadata/md5-cache/sci-libs/mathgl-2.4.1-r1
deleted file mode 100644
index 830667803ac3..000000000000
--- a/metadata/md5-cache/sci-libs/mathgl-2.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
-DEPEND=virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2 ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg:0 ) lua? ( >=dev-lang/lua-5.1:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) python? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) zlib? ( sys-libs/zlib ) doc? ( app-text/texi2html virtual/texi2dvi ) octave? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Math Graphics Library
-EAPI=6
-HOMEPAGE=http://mathgl.sourceforge.net/
-IUSE=doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf png python qt5 static-libs threads wxwidgets zlib l10n_ru +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2 ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg:0 ) lua? ( >=dev-lang/lua-5.1:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) python? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=mpi? ( hdf5 ) openmp? ( !threads ) png? ( zlib ) pdf? ( png ) python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ff7be78bf63252703d0ab7d992d37f2
diff --git a/metadata/md5-cache/sci-libs/mathgl-2.4.1-r2 b/metadata/md5-cache/sci-libs/mathgl-2.4.1-r2
new file mode 100644
index 000000000000..50f032a3838f
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/mathgl-2.4.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test unpack
+DEPEND=virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2 ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg:0 ) lua? ( >=dev-lang/lua-5.1:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) python? ( python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) zlib? ( sys-libs/zlib ) doc? ( app-text/texi2html virtual/texi2dvi ) octave? ( dev-lang/swig ) python? ( dev-lang/swig ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Math Graphics Library
+EAPI=6
+HOMEPAGE=http://mathgl.sourceforge.net/
+IUSE=doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf png python qt5 static-libs threads wxwidgets zlib l10n_ru +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2 ) hdf? ( sci-libs/hdf ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg:0 ) lua? ( >=dev-lang/lua-5.1:0 ) octave? ( >=sci-mathematics/octave-3.4.0 ) openmp? ( sys-cluster/openmpi ) pdf? ( media-libs/libharu ) png? ( media-libs/libpng:0 ) python? ( python_single_target_python2_7? ( || ( dev-python/numpy-python2[python_targets_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=mpi? ( hdf5 ) openmp? ( !threads ) png? ( zlib ) pdf? ( png ) python? ( ^^ ( python_single_target_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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b5ddd01ffccf7928a8fdb2397763d58
diff --git a/metadata/md5-cache/sci-libs/med-4.0.0-r1 b/metadata/md5-cache/sci-libs/med-4.0.0-r1
index 8d8fa7d7af36..886e80ad793a 100644
--- a/metadata/md5-cache/sci-libs/med-4.0.0-r1
+++ b/metadata/md5-cache/sci-libs/med-4.0.0-r1
@@ -4,13 +4,13 @@ DEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)]
 DESCRIPTION=Modeling and Exchange of Data library
 EAPI=7
 HOMEPAGE=https://www.salome-platform.org/user-section/about/med
-IUSE=doc fortran hdf5-16-api python test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc fortran hdf5-16-api python test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran=,mpi(+)] virtual/mpi[fortran=] python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) virtual/fortran
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://files.salome-platform.org/Salome/other/med-4.0.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=33f677cb7c0476724635cb54516aa3ec
diff --git a/metadata/md5-cache/sci-libs/med-4.0.0-r2 b/metadata/md5-cache/sci-libs/med-4.0.0-r2
index b11693ef1e1a..93ce23821135 100644
--- a/metadata/md5-cache/sci-libs/med-4.0.0-r2
+++ b/metadata/md5-cache/sci-libs/med-4.0.0-r2
@@ -4,13 +4,13 @@ DEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] m
 DESCRIPTION=A library to store and exchange meshed data or computation results
 EAPI=7
 HOMEPAGE=https://www.salome-platform.org/user-section/about/med
-IUSE=doc fortran mpi python test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc fortran mpi python test python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
 RDEPEND=!sci-libs/libmed dev-lang/tk:0= >=sci-libs/hdf5-1.10.2:=[fortran?,mpi?] mpi? ( virtual/mpi[fortran=] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) fortran? ( virtual/fortran )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=!test? ( test ) python? ( test )
 SLOT=0
 SRC_URI=https://files.salome-platform.org/Salome/other/med-4.0.0.tar.gz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e17da2d05c24c07e22054de4b9ede9a4
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.10 b/metadata/md5-cache/sci-libs/minfx-1.0.10
index 978cd4141fcf..4b9f6806798f 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_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/minfx/minfx-1.0.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.11 b/metadata/md5-cache/sci-libs/minfx-1.0.11
index 81814ba6f624..8402a7f8f791 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_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=http://download.gna.org/minfx/minfx-1.0.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f57e02b6a9a3ae24c47b3679c2e5daf8
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 63acde6b224f..eb5c71698523 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_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/minfx/minfx-1.0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.4 b/metadata/md5-cache/sci-libs/minfx-1.0.4
index fecc6d0fcbab..67f3e794a3ca 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_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/minfx/minfx-1.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1e007305492361e2fec82bc5ebe5510
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 aa5803dca387..15a679b0f85b 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_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/~jlec/distfiles/minfx-1.0.4_pre98.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d5138ae0e2a08cd39192b8a23bc747e4
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.5 b/metadata/md5-cache/sci-libs/minfx-1.0.5
index a558d20daa66..dba77cef00b6 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_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/minfx/minfx-1.0.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/minfx-1.0.6 b/metadata/md5-cache/sci-libs/minfx-1.0.6
index b5a39cb20497..fe5e4f6dcd98 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_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/minfx/minfx-1.0.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1e007305492361e2fec82bc5ebe5510
diff --git a/metadata/md5-cache/sci-libs/numkit-1.1.2 b/metadata/md5-cache/sci-libs/numkit-1.1.2
index 2a046e902ccd..11d618316d0d 100644
--- a/metadata/md5-cache/sci-libs/numkit-1.1.2
+++ b/metadata/md5-cache/sci-libs/numkit-1.1.2
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Becksteinlab/numkit/archive/release-1.1.2.tar.gz -> numkit-1.1.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=897e3a1ff3c8c38f98d762e38b26ef74
diff --git a/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1 b/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
index 2fbe77c7bdf4..c6bb25f8c889 100644
--- a/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.2.22-r1
@@ -10,4 +10,4 @@ RDEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( vi
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/35070/pastix_5.2.2.22.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=06d394baf4ca3a0c063e5dde53133ecb
+_md5_=718777549eb958d867fac147d0550e96
diff --git a/metadata/md5-cache/sci-libs/pastix-5.2.3 b/metadata/md5-cache/sci-libs/pastix-5.2.3
index 897740d28a10..1ce878a63826 100644
--- a/metadata/md5-cache/sci-libs/pastix-5.2.3
+++ b/metadata/md5-cache/sci-libs/pastix-5.2.3
@@ -10,4 +10,4 @@ RDEPEND=sci-libs/scotch:0=[int64?,mpi?] sys-apps/hwloc:0= virtual/blas mpi? ( vi
 SLOT=0
 SRC_URI=https://gforge.inria.fr/frs/download.php/latestfile/218/pastix_5.2.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e25ffece2f5f588269625e7dcf1a7d15
+_md5_=2e0854224f482c630a02cae604a8e455
diff --git a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7 b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
index 08de386b86fe..d1af2006fb3a 100644
--- a/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
+++ b/metadata/md5-cache/sci-libs/pgplot-5.2.2-r7
@@ -10,4 +10,4 @@ RDEPEND=media-libs/libpng:= x11-libs/libX11:= x11-libs/libXt:= motif? ( x11-libs
 SLOT=0
 SRC_URI=ftp://ftp.astro.caltech.edu/pub/pgplot/pgplot522.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bac117070ccdd6b0cc4b0bacdbf80052
+_md5_=9855ae916c8c9308fd628827fb98787d
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0 b/metadata/md5-cache/sci-libs/plplot-5.15.0
deleted file mode 100644
index f7de633e3830..000000000000
--- a/metadata/md5-cache/sci-libs/plplot-5.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.5:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( dev-lang/lua:0= ) ocaml? ( dev-lang/ocaml dev-ml/camlidl cairo? ( dev-ml/cairo-ocaml[gtk] ) ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.5 dev-lang/swig ) ocaml? ( dev-ml/findlib ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Multi-language scientific plotting library
-EAPI=6
-HOMEPAGE=http://plplot.sourceforge.net/
-IUSE=cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X elibc_FreeBSD java python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.5:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( dev-lang/lua:0= ) ocaml? ( dev-lang/ocaml dev-ml/camlidl cairo? ( dev-ml/cairo-ocaml[gtk] ) ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] qt5? ( dev-python/PyQt5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )
-RESTRICT=!test? ( test ) octave? ( test )
-SLOT=0/14
-SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c8322ab5a88ab76df5f11b1e56a3ceb
diff --git a/metadata/md5-cache/sci-libs/plplot-5.15.0-r1 b/metadata/md5-cache/sci-libs/plplot-5.15.0-r1
new file mode 100644
index 000000000000..125fca7104c2
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/plplot-5.15.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.5:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( dev-lang/lua:0= ) ocaml? ( dev-lang/ocaml dev-ml/camlidl cairo? ( dev-ml/cairo-ocaml[gtk] ) ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] qt5? ( dev-python/PyQt5[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] qt5? ( dev-python/PyQt5[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.5 dev-lang/swig ) ocaml? ( dev-ml/findlib ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( dev-lang/swig ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Multi-language scientific plotting library
+EAPI=6
+HOMEPAGE=http://plplot.sourceforge.net/
+IUSE=cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X elibc_FreeBSD java python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=cairo? ( x11-libs/cairo:0=[svg?,X] ) gd? ( media-libs/gd:2=[jpeg?,png?] ) java? ( >=virtual/jre-1.5:* ) latex? ( app-text/ghostscript-gpl virtual/latex-base ) lua? ( dev-lang/lua:0= ) ocaml? ( dev-lang/ocaml dev-ml/camlidl cairo? ( dev-ml/cairo-ocaml[gtk] ) ) octave? ( sci-mathematics/octave:0= ) pdf? ( media-libs/libharu:0= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] qt5? ( dev-python/PyQt5[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] qt5? ( dev-python/PyQt5[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] qt5? ( dev-python/PyQt5[python_targets_python3_8(-)] ) ) ) qhull? ( media-libs/qhull:0= ) qt5? ( dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtprintsupport:5 ) shapefile? ( sci-libs/shapelib:0= ) tcl? ( dev-lang/tcl:0= dev-tcltk/itcl:0= tk? ( dev-lang/tk:0= dev-tcltk/itk ) ) truetype? ( media-fonts/freefont media-libs/lasi:0= gd? ( media-libs/gd:2=[truetype] ) ) wxwidgets? ( x11-libs/wxGTK:3.0-gtk3=[X] x11-libs/agg:0=[truetype?] ) X? ( x11-libs/libX11:0= x11-libs/libXau:0= x11-libs/libXdmcp:0= ) fortran? ( virtual/fortran ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) qt5? ( dynamic ) test? ( latex ) tk? ( tcl )
+RESTRICT=!test? ( test ) octave? ( test )
+SLOT=0/14
+SRC_URI=mirror://sourceforge/plplot/plplot-5.15.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f6ab5de1fd959cd19bc19dcf9dfa1543
diff --git a/metadata/md5-cache/sci-libs/proj-5.2.0 b/metadata/md5-cache/sci-libs/proj-5.2.0
index fd5e50a215d6..95dae825c532 100644
--- a/metadata/md5-cache/sci-libs/proj-5.2.0
+++ b/metadata/md5-cache/sci-libs/proj-5.2.0
@@ -3,8 +3,8 @@ DESCRIPTION=PROJ coordinate transformation software
 EAPI=7
 HOMEPAGE=https://proj4.org/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
 SLOT=0/13
 SRC_URI=http://download.osgeo.org/proj/proj-5.2.0.tar.gz http://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz
-_md5_=cbc813fd5c284cf24a80adfca553133d
+_md5_=6068c3aaedbc81b056e542af672e3e0f
diff --git a/metadata/md5-cache/sci-libs/pycifrw-3.6.2 b/metadata/md5-cache/sci-libs/pycifrw-3.6.2
index f5bad140b68d..36d328cf1162 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 43e52fa76459..808710c7fdea 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3710b426267bc305b284d0b4b6ea05a
diff --git a/metadata/md5-cache/sci-libs/pymmlib-1.2.1-r1 b/metadata/md5-cache/sci-libs/pymmlib-1.2.1-r1
index 84923c39d315..4bc6ecb07478 100644
--- a/metadata/md5-cache/sci-libs/pymmlib-1.2.1-r1
+++ b/metadata/md5-cache/sci-libs/pymmlib-1.2.1-r1
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/numpy-python2[python_targets_python2_7(-)?,-python_singl
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/downloads/masci/mmLib/pymmlib-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=054cd76d2c0a962099f35e17b8ad1606
diff --git a/metadata/md5-cache/sci-libs/pyshp-1.2.0 b/metadata/md5-cache/sci-libs/pyshp-1.2.0
index 41fc99a03616..3bb4263e6a71 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyshp/pyshp-1.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb30db2361112fa4e014515f553a5121
diff --git a/metadata/md5-cache/sci-libs/pyshp-9999 b/metadata/md5-cache/sci-libs/pyshp-9999
index 3a8311a7dce1..757999c917e6 100644
--- a/metadata/md5-cache/sci-libs/pyshp-9999
+++ b/metadata/md5-cache/sci-libs/pyshp-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	subversion	1086a6c20b5a06e9f05f3128525fa694	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb30db2361112fa4e014515f553a5121
diff --git a/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1 b/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1
index 737ed7292d0e..9b6a3f0f9782 100644
--- a/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1
+++ b/metadata/md5-cache/sci-libs/scikits_image-0.13.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.13.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=9f8477a73badac5940d86830e5cfeda8
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.19.0-r1 b/metadata/md5-cache/sci-libs/scikits_learn-0.19.0-r1
index 65339b91ba94..fccbfb97b754 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.19.0-r1
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.19.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.19.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=755ae1773353b2b6dad79249d2086989
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.20.2 b/metadata/md5-cache/sci-libs/scikits_learn-0.20.2
index 9ba9433a28a0..9450b50455a7 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.20.2
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.20.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.20.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c97de0e9546fa296be11bbc6e42af149
diff --git a/metadata/md5-cache/sci-libs/scikits_learn-0.20.4 b/metadata/md5-cache/sci-libs/scikits_learn-0.20.4
index 9bb3c9c073f4..d967c7ae6970 100644
--- a/metadata/md5-cache/sci-libs/scikits_learn-0.20.4
+++ b/metadata/md5-cache/sci-libs/scikits_learn-0.20.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-learn/scikit-learn-0.20.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c97de0e9546fa296be11bbc6e42af149
diff --git a/metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1 b/metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
index 99f7e0509ad3..9e7c97f54f7a 100644
--- a/metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
+++ b/metadata/md5-cache/sci-libs/scikits_optimization-0.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikits.optimization/scikits.optimization-0.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e0814daa4bb28925dc1b5a9178de2e1a
diff --git a/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2 b/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
index fdad24e54114..86a99c8fb8c5 100644
--- a/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
+++ b/metadata/md5-cache/sci-libs/scikits_timeseries-0.91.3-r2
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/scipy[python_targets_python3_6(-)?,python_targets_python3_7(-)?
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_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_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0f784230c0f211d94398666afbc0b431
diff --git a/metadata/md5-cache/sci-libs/scipy-1.1.0 b/metadata/md5-cache/sci-libs/scipy-1.1.0
index cd44448bc0f1..4197ffc4400b 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.1.0
+++ b/metadata/md5-cache/sci-libs/scipy-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ed534e403ef517133a8643d32f6f374
diff --git a/metadata/md5-cache/sci-libs/scipy-1.4.1 b/metadata/md5-cache/sci-libs/scipy-1.4.1
index b0cbe8d2939d..7537ba1a278e 100644
--- a/metadata/md5-cache/sci-libs/scipy-1.4.1
+++ b/metadata/md5-cache/sci-libs/scipy-1.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.4.1.tar.gz doc? ( https://docs.scipy.org/doc/scipy-1.4.1/scipy-html-1.4.1.zip -> scipy-1.4.1-html.zip https://docs.scipy.org/doc/scipy-1.4.1/scipy-ref-1.4.1.pdf -> scipy-1.4.1-ref.pdf )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=59f5a8c5105d40d51fd82df409639bc1
diff --git a/metadata/md5-cache/sci-libs/scipy-9999 b/metadata/md5-cache/sci-libs/scipy-9999
index babe511af645..9e3df660b2e7 100644
--- a/metadata/md5-cache/sci-libs/scipy-9999
+++ b/metadata/md5-cache/sci-libs/scipy-9999
@@ -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_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=db79cf924d5b4f8080fab2b522ce7124
diff --git a/metadata/md5-cache/sci-libs/scipy-python2-1.1.0 b/metadata/md5-cache/sci-libs/scipy-python2-1.1.0
index 0f1a42511f51..f27b75242947 100644
--- a/metadata/md5-cache/sci-libs/scipy-python2-1.1.0
+++ b/metadata/md5-cache/sci-libs/scipy-python2-1.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scipy/scipy-1.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5fe2ce9fb1938190339d71a4ee83a13
diff --git a/metadata/md5-cache/sci-libs/shogun-5.0.0 b/metadata/md5-cache/sci-libs/shogun-5.0.0
deleted file mode 100644
index b84e52a4d304..000000000000
--- a/metadata/md5-cache/sci-libs/shogun-5.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/bzip2 app-arch/gzip app-arch/lzma app-arch/snappy dev-libs/lzo dev-cpp/eigen:3 dev-libs/json-c:= dev-libs/libxml2 dev-libs/protobuf:= net-misc/curl sci-libs/arpack sci-libs/arprec sci-libs/colpack sci-libs/hdf5:= sci-libs/nlopt sci-mathematics/glpk:= sci-mathematics/lpsolve:= sys-libs/readline:0= sys-libs/zlib virtual/blas virtual/cblas virtual/lapack lua? ( dev-lang/lua:0 ) octave? ( >=sci-mathematics/octave-4.2.0:=[hdf5] ) opencl? ( virtual/opencl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) ruby? ( dev-ruby/narray ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.8.13-r1[dot] dev-python/sphinx ) lua? ( >=dev-lang/swig-3.0.12 ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( >=dev-lang/swig-3.0.12 test? ( sci-libs/scipy ) ) R? ( >=dev-lang/swig-3.0.12 ) ruby? ( >=dev-lang/swig-3.0.12 ) test? ( dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-cpp/gtest-1.8.0 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Large Scale Machine Learning Toolbox
-EAPI=6
-HOMEPAGE=https://shogun-toolbox.org/
-IUSE=cpu_flags_x86_sse doc examples lua octave opencl python R ruby static-libs test +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3 free-noncomm
-RDEPEND=app-arch/bzip2 app-arch/gzip app-arch/lzma app-arch/snappy dev-libs/lzo dev-cpp/eigen:3 dev-libs/json-c:= dev-libs/libxml2 dev-libs/protobuf:= net-misc/curl sci-libs/arpack sci-libs/arprec sci-libs/colpack sci-libs/hdf5:= sci-libs/nlopt sci-mathematics/glpk:= sci-mathematics/lpsolve:= sys-libs/readline:0= sys-libs/zlib virtual/blas virtual/cblas virtual/lapack lua? ( dev-lang/lua:0 ) octave? ( >=sci-mathematics/octave-4.2.0:=[hdf5] ) opencl? ( virtual/opencl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) R? ( dev-lang/R ) ruby? ( dev-ruby/narray )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) test? ( python )
-RESTRICT=!test? ( test )
-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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=733ce105d94a4adc22ead92d64a7b332
diff --git a/metadata/md5-cache/sci-libs/shogun-5.0.0-r1 b/metadata/md5-cache/sci-libs/shogun-5.0.0-r1
new file mode 100644
index 000000000000..42a199130277
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/shogun-5.0.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/bzip2 app-arch/gzip app-arch/lzma app-arch/snappy dev-libs/lzo dev-cpp/eigen:3 dev-libs/json-c:= dev-libs/libxml2 dev-libs/protobuf:= net-misc/curl sci-libs/arpack sci-libs/arprec sci-libs/colpack sci-libs/hdf5:= sci-libs/nlopt sci-mathematics/glpk:= sci-mathematics/lpsolve:= sys-libs/readline:0= sys-libs/zlib virtual/blas virtual/cblas virtual/lapack lua? ( dev-lang/lua:0 ) octave? ( >=sci-mathematics/octave-4.2.0:=[hdf5] ) opencl? ( virtual/opencl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) ) R? ( dev-lang/R ) ruby? ( dev-ruby/narray ) virtual/pkgconfig doc? ( >=app-doc/doxygen-1.8.13-r1[dot] dev-python/sphinx ) lua? ( >=dev-lang/swig-3.0.12 ) octave? ( >=dev-lang/swig-3.0.12 ) python? ( >=dev-lang/swig-3.0.12 test? ( sci-libs/scipy ) ) R? ( >=dev-lang/swig-3.0.12 ) ruby? ( >=dev-lang/swig-3.0.12 ) test? ( python_single_target_python3_6? ( dev-python/jinja[python_targets_python3_6(-)] ) >=dev-cpp/gtest-1.8.0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Large Scale Machine Learning Toolbox
+EAPI=6
+HOMEPAGE=https://shogun-toolbox.org/
+IUSE=cpu_flags_x86_sse doc examples lua octave opencl python R ruby static-libs test +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3 free-noncomm
+RDEPEND=app-arch/bzip2 app-arch/gzip app-arch/lzma app-arch/snappy dev-libs/lzo dev-cpp/eigen:3 dev-libs/json-c:= dev-libs/libxml2 dev-libs/protobuf:= net-misc/curl sci-libs/arpack sci-libs/arprec sci-libs/colpack sci-libs/hdf5:= sci-libs/nlopt sci-mathematics/glpk:= sci-mathematics/lpsolve:= sys-libs/readline:0= sys-libs/zlib virtual/blas virtual/cblas virtual/lapack lua? ( dev-lang/lua:0 ) octave? ( >=sci-mathematics/octave-4.2.0:=[hdf5] ) opencl? ( virtual/opencl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) ) R? ( dev-lang/R ) ruby? ( dev-ruby/narray )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) ) test? ( python )
+RESTRICT=!test? ( test )
+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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a3f67aa131bed8bfd669c110d9d9ce1f
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.15.0 b/metadata/md5-cache/sci-libs/tensorflow-1.15.0
index 7fba540df1cc..bde771a7b9d7 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-1.15.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.15.0
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.15.0.tar.gz -> tensorflow-1.15.0.tar.gz http://www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://bitbucket.org/eigen/eigen/get/49177915a14a.tar.gz -> eigen-49177915a14a.tar.gz https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz https://github.com/llvm-mirror/llvm/archive/7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz -> llvm-7a7e03f906aada0cf4b749b51213fe5784eeff84.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.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/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0eb41bcb25f7c3ba1ba67e54e3ee65b7
+_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0379239b4138866417b8bafee25c501a
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.0.0 b/metadata/md5-cache/sci-libs/tensorflow-2.0.0
index 681bf44825b7..14deea17f431 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.0.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.0.0
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.0.0.tar.gz -> tensorflow-2.0.0.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://bitbucket.org/eigen/eigen/get/049af2f56331.tar.gz -> eigen-049af2f56331.tar.gz https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.11.1/rules_swift.0.11.1.tar.gz -> bazelbuild-rules_swift.0.11.1.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/nlopezgi/bazel-toolchains/archive/94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz -> bazel-toolchains-94d31935a2c94fe7e7c7379a0f3393e181928ff7.tar.gz https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz https://github.com/llvm-mirror/llvm/archive/b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz -> llvm-b7d166cebcf619a3691eed3f994384aab3d80fa6.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.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/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=293aef2b100cf5b9eb67851609d9dca5
+_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=23d691b00f616c320efd72cdde159659
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.1.0 b/metadata/md5-cache/sci-libs/tensorflow-2.1.0
index 5a94df86aa01..1a75883e5e00 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-2.1.0
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.1.0
@@ -12,5 +12,5 @@ RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev
 REQUIRED_USE=python? ( || ( python_targets_python3_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.1.0.tar.gz -> tensorflow-2.1.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.1.0.tar.bz2 https://storage.googleapis.com/mirror.tensorflow.org/www.kurims.kyoto-u.ac.jp/~ooura/fft2d.tgz -> oourafft2d-20061228.tgz https://gitlab.com/libeigen/eigen/-/archive/4e696901f873a2347f76d931cf2f701e31e15d05/eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz -> eigen-4e696901f873a2347f76d931cf2f701e31e15d05.tar.gz https://github.com/abseil/abseil-cpp/archive/43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz -> abseil-cpp-43ef2148c0936ebf7cb4be6b19927a9d9d145b8f.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz -> bazel-toolchains-92dd8a7a518a2fb7ba992d47c8b38299fe0be825.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz -> bazelbuild-rules_swift.0.12.1.tar.gz https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip -> gemmlowp-12fed0cd7cfcd9e169bf1925bc3a7a58725fdcc3.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/re2/archive/506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz -> re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz https://github.com/mborgerding/kissfft/archive/36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz -> kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz https://github.com/pybind/pybind11/archive/v2.3.0.tar.gz -> pybind11-v2.3.0.tar.gz https://github.com/llvm/llvm-project/archive/ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz -> llvm-ecc999101aadc8dc7d4af9fd88be10fe42674aa0.tar.gz cuda? ( https://github.com/nvidia/nccl/archive/0ceaec9cee96ae7658aa45686853286651f36384.tar.gz -> nvidia-nccl-0ceaec9cee96ae7658aa45686853286651f36384.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/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz )
-_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4834b6b3c9108b94da9934eca06c6b23
+_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	check-reqs	5e40a693d9c828e8f3655184116e8b73	cuda	bb861e5221b7272ac90c2f12791c1e66	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5432ed1a54db969157c72e08b86bcf9e
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.1 b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.1
index 1b01ac61ccd2..3e169e6889e0 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.1
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-1.15.1
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v1.15.1.tar.gz -> tensorflow-estimator-1.15.1.tar.gz
-_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=acb42508b59959f71015507c1b6d902f
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.0.1 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.0.1
index 4bd6a80cfb98..79bb842e5bb2 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.0.1
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.0.1
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.0.1.tar.gz -> tensorflow-estimator-2.0.1.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
-_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a239ab5e261a2234e6a52cc5d95e307f
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.1 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
index 710f61f1b9b1..461ebd0e937e 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.1
@@ -11,5 +11,5 @@ RDEPEND=sci-libs/tensorflow[python,python_targets_python3_6(-)?,python_targets_p
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/tensorflow/estimator/archive/v2.1.tar.gz -> tensorflow-estimator-2.1.tar.gz https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip -> bazelbuild-rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip
-_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=bazel	82574b64e68dfc7e351dd895f00d6ba3	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a239ab5e261a2234e6a52cc5d95e307f
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0-r3 b/metadata/md5-cache/sci-libs/vtk-8.1.0-r3
deleted file mode 100644
index aa7286693d97..000000000000
--- a/metadata/md5-cache/sci-libs/vtk-8.1.0-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
-DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/constantly[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/hyperlink[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/txaio[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) xdmf2? ( sci-libs/xdmf2 ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The Visualization Toolkit
-EAPI=6
-HOMEPAGE=https://www.vtk.org/
-IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java +python_targets_python3_6 +python_single_target_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD LGPL-2
-RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 dev-python/autobahn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/constantly[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/hyperlink[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/txaio[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) xdmf2? ( sci-libs/xdmf2 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e44c1169296fd4c7fb2a4f2fda6c8088
diff --git a/metadata/md5-cache/sci-libs/vtk-8.1.0-r4 b/metadata/md5-cache/sci-libs/vtk-8.1.0-r4
new file mode 100644
index 000000000000..c8a1548eccd6
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/vtk-8.1.0-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup test
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_6? ( dev-python/autobahn[python_targets_python3_6(-)] dev-python/constantly[python_targets_python3_6(-)] dev-python/hyperlink[python_targets_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)] dev-python/txaio[python_targets_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)] ) ) xdmf2? ( sci-libs/xdmf2 ) python_single_target_python3_6? ( mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python3_6(-)] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python3_6(-)] ) ) ) doc? ( app-doc/doxygen ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=The Visualization Toolkit
+EAPI=6
+HOMEPAGE=https://www.vtk.org/
+IUSE=all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl video_cards_nvidia views web R +X xdmf2 elibc_FreeBSD java +python_single_target_python3_6 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD LGPL-2
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 >=media-libs/freetype-2.5.4 >=media-libs/libharu-2.3.0-r2 media-libs/libpng:0= media-libs/libtheora media-libs/mesa media-libs/tiff:0 sci-libs/exodusii sci-libs/hdf5:= sci-libs/netcdf:0= sci-libs/netcdf-cxx:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXmu x11-libs/libXt boost? ( dev-libs/boost:=[mpi?] ) examples? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) ffmpeg? ( virtual/ffmpeg ) gdal? ( sci-libs/gdal ) java? ( >=virtual/jdk-1.7:* ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) offscreen? ( media-libs/mesa[osmesa] ) postgres? ( dev-db/postgresql:= ) R? ( dev-lang/R ) tbb? ( dev-cpp/tbb ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) web? ( >=app-admin/webapp-config-1.50.15 python_single_target_python3_6? ( dev-python/autobahn[python_targets_python3_6(-)] dev-python/constantly[python_targets_python3_6(-)] dev-python/hyperlink[python_targets_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)] dev-python/txaio[python_targets_python3_6(-)] dev-python/zope-interface[python_targets_python3_6(-)] ) ) xdmf2? ( sci-libs/xdmf2 ) python_single_target_python3_6? ( mpi? ( virtual/mpi[cxx,romio] python? ( dev-python/mpi4py[python_targets_python3_6(-)] ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/sip[python_targets_python3_6(-)] ) qt5? ( dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 python? ( dev-python/PyQt5[python_targets_python3_6(-)] ) ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=all-modules? ( python xdmf2 boost ) java? ( qt5 ) python? ( ^^ ( python_single_target_python3_6 ) ) tcl? ( rendering ) examples? ( python ) tk? ( tcl ) web? ( python ) ^^ ( X aqua offscreen )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.vtk.org/files/release/8.1/VTK-8.1.0.tar.gz doc? ( https://www.vtk.org/files/release/8.1/vtkDocHtml-8.1.0.tar.gz ) examples? ( https://www.vtk.org/files/release/8.1/VTKData-8.1.0.tar.gz https://www.vtk.org/files/release/8.1/VTKLargeData-8.1.0.tar.gz )
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56560674b03b2f516c9e5e7fac0a9496
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 186512097242..703ed38b6d45 100644
--- a/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
+++ b/metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
@@ -3,13 +3,13 @@ DEPEND=dev-libs/boost:= sci-libs/hdf5:= dev-libs/libxml2:2 python? ( python_sing
 DESCRIPTION=eXtensible Data Model and Format
 EAPI=6
 HOMEPAGE=http://xdmf.org/index.php/Main_Page
-IUSE=doc python test +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc python test +python_single_target_python2_7
 KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=VTK
 RDEPEND=dev-libs/boost:= sci-libs/hdf5:= dev-libs/libxml2:2 python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/xdmf2-1.0_p141226.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7028816224abc472754fc04c8f71ef52
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index d11d4b17aa8b..31c58c083bcd 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/dunshire-0.1.1 b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
index 64d7e39cb0f8..a7a964f506c1 100644
--- a/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
+++ b/metadata/md5-cache/sci-mathematics/dunshire-0.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dunshire/dunshire-0.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=109e1efa994259e05d48f02462022774
diff --git a/metadata/md5-cache/sci-mathematics/msieve-1.53-r1 b/metadata/md5-cache/sci-mathematics/msieve-1.53-r1
index b175b7ddf70e..9f2a237ad4cc 100644
--- a/metadata/md5-cache/sci-mathematics/msieve-1.53-r1
+++ b/metadata/md5-cache/sci-mathematics/msieve-1.53-r1
@@ -10,4 +10,4 @@ RDEPEND=ecm? ( sci-mathematics/gmp-ecm ) mpi? ( virtual/mpi ) zlib? ( sys-libs/z
 SLOT=0
 SRC_URI=mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz -> msieve-1.53.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7e6fe5fdefd30f86eba92083a86eff5b
+_md5_=2a94023d7ba22fb1c148f0125350d860
diff --git a/metadata/md5-cache/sci-mathematics/pymc3-3.1 b/metadata/md5-cache/sci-mathematics/pymc3-3.1
index 17c8da31aa96..b56cabf88fea 100644
--- a/metadata/md5-cache/sci-mathematics/pymc3-3.1
+++ b/metadata/md5-cache/sci-mathematics/pymc3-3.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymc3/pymc3-3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fec2c848d207b5ee176f8943641b10df
diff --git a/metadata/md5-cache/sci-mathematics/relational-2.5 b/metadata/md5-cache/sci-mathematics/relational-2.5
deleted file mode 100644
index 51a7135b006b..000000000000
--- a/metadata/md5-cache/sci-mathematics/relational-2.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/PyQt5[gui,webkit,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=Educational tool for relational algebra
-EAPI=6
-HOMEPAGE=https://ltworf.github.io/relational/
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/PyQt5[gui,webkit,widgets,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/ltworf/relational/releases/download/2.5/relational_2.5.orig.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7056f3e8a185c7b43d03145266476856
diff --git a/metadata/md5-cache/sci-mathematics/relational-2.5-r1 b/metadata/md5-cache/sci-mathematics/relational-2.5-r1
new file mode 100644
index 000000000000..41060264d3fe
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/relational-2.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,webkit,widgets,python_targets_python3_6(-)] )
+DESCRIPTION=Educational tool for relational algebra
+EAPI=6
+HOMEPAGE=https://ltworf.github.io/relational/
+IUSE=+python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/PyQt5[gui,webkit,widgets,python_targets_python3_6(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/ltworf/relational/releases/download/2.5/relational_2.5.orig.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=adeb6540e1f8fd6fb3e29a921a79780f
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1 b/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1
index 7a4c7f63ac7f..3917c286b136 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.1.463-r1
@@ -10,5 +10,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? ( sys-libs/pam ) ) dedicated? ( sys-libs/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.463.tar.gz -> rstudio-1.1.463.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	be72eac95bd029ad1d81d5d656c3c83b	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d657fc3ceaf6b037d00c1df717c01a74
diff --git a/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335 b/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335
index 80ddd729fd44..4cf776e9a2bd 100644
--- a/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335
+++ b/metadata/md5-cache/sci-mathematics/rstudio-1.2.1335
@@ -10,5 +10,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/qtwebengine-5.4:5[widgets] >=dev-qt/qtwidgets-5.4:5 >=dev-qt/qtxml-5.4:5 >=dev-qt/qtxmlpatterns-5.4:5 server? ( sys-libs/pam ) ) dedicated? ( sys-libs/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.2.1335.tar.gz -> rstudio-1.2.1335.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.1.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	be72eac95bd029ad1d81d5d656c3c83b	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=322d0b16a0a624b85aee20c70fa9473c
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.6 b/metadata/md5-cache/sci-mathematics/z3-4.8.6
index f37b333c15d6..55b3b7cd5574 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.6
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.6
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gmp? ( dev-libs/gmp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gmp? ( dev-libs/gmp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 )
 DESCRIPTION=An efficient theorem prover
 EAPI=7
 HOMEPAGE=https://github.com/Z3Prover/z3/
-IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=amd64 arm arm64 ppc64 x86
 LICENSE=MIT
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gmp? ( dev-libs/gmp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) gmp? ( dev-libs/gmp:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.6.tar.gz
-_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dfe04789fcbfed63175abf4d58400ab
+_eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=254fb2bfac585016d1f2dbfb48bde219
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index ba9c88bba2b7..334acb5ff510 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.14.2 b/metadata/md5-cache/sci-misc/boinc-7.14.2
index dc7fa336523d..53298928f883 100644
--- a/metadata/md5-cache/sci-misc/boinc-7.14.2
+++ b/metadata/md5-cache/sci-misc/boinc-7.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-misc/ca-certificates-20080809 cuda? ( >=dev-util/nvidia-cuda-toolk
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif ) https://github.com/BOINC/boinc/archive/client_release/7.14/7.14.2.tar.gz -> boinc-7.14.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5fdd6936e444ca060892f5369358017e
diff --git a/metadata/md5-cache/sci-misc/boinc-7.8.6 b/metadata/md5-cache/sci-misc/boinc-7.8.6
index 95c86387ea81..808f4e5d70bd 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 1c497bd5ca06..1ef09d762197 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54e41e1fd3294f98259cf0ed6d4462af
diff --git a/metadata/md5-cache/sci-misc/boinc-9999 b/metadata/md5-cache/sci-misc/boinc-9999
index 1721363ea3a8..66e44c2a611e 100644
--- a/metadata/md5-cache/sci-misc/boinc-9999
+++ b/metadata/md5-cache/sci-misc/boinc-9999
@@ -10,5 +10,5 @@ RDEPEND=>=app-misc/ca-certificates-20080809 cuda? ( >=dev-util/nvidia-cuda-toolk
 REQUIRED_USE=^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_openssl )
 SLOT=0
 SRC_URI=X? ( https://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5fdd6936e444ca060892f5369358017e
diff --git a/metadata/md5-cache/sci-misc/gato-1.2.2 b/metadata/md5-cache/sci-misc/gato-1.2.2
index 6f2202717091..b82afcd52f37 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=865641d9134cbd6df5dd7fc57db23e2b
diff --git a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4 b/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
index 5c29c2849e1c..0a2e700bb2b4 100644
--- a/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
+++ b/metadata/md5-cache/sci-misc/mendeleydesktop-1.19.4
@@ -3,13 +3,13 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Research management tool for desktop and web
 EAPI=7
 HOMEPAGE=https://www.mendeley.com/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Mendeley-terms
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtpositioning:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 dev-qt/qtxml:5 sys-libs/zlib virtual/opengl x11-libs/libX11
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=amd64? ( mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 ) x86? ( mendeleydesktop-1.19.4-linux-i486.tar.bz2 ) amd64-linux? ( mendeleydesktop-1.19.4-linux-x86_64.tar.bz2 ) x86-linux? ( mendeleydesktop-1.19.4-linux-i486.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8db27c167a8c0fbf3ac4b02bf46f9f64
diff --git a/metadata/md5-cache/sci-misc/pythoncad-1.37-r1 b/metadata/md5-cache/sci-misc/pythoncad-1.37-r1
index dde89b10a131..cbc7565a4461 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f4549142017145396fba2b754f283a5
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0 b/metadata/md5-cache/sci-misc/vitables-3.0.0
deleted file mode 100644
index bbf0d8ab1c0c..000000000000
--- a/metadata/md5-cache/sci-misc/vitables-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pytables[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/QtPy[gui,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=A graphical tool for browsing / editing files in both PyTables and HDF5 formats
-EAPI=6
-HOMEPAGE=http://vitables.org/
-IUSE=+python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pytables[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/QtPy[gui,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c7bb2f9d7bf9e3003cea86d98d8e333
diff --git a/metadata/md5-cache/sci-misc/vitables-3.0.0-r1 b/metadata/md5-cache/sci-misc/vitables-3.0.0-r1
new file mode 100644
index 000000000000..6eaceaa96b6a
--- /dev/null
+++ b/metadata/md5-cache/sci-misc/vitables-3.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] dev-python/pytables[python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DESCRIPTION=A graphical tool for browsing / editing files in both PyTables and HDF5 formats
+EAPI=6
+HOMEPAGE=http://vitables.org/
+IUSE=+python_single_target_python3_6
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] dev-python/pytables[python_targets_python3_6(-)] dev-python/QtPy[gui,python_targets_python3_6(-)] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/vitables/ViTables-3.0.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ffcb1527cfd9ac9cc505682ece89a996
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 525f753a0ef2..5e935dad7e32 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/espresso-4.0.0-r1 b/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
deleted file mode 100644
index 8f3ddbeaf00e..000000000000
--- a/metadata/md5-cache/sci-physics/espresso-4.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/cython-0.26.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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] ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latexextra virtual/latex-base ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=Extensible Simulation Package for Research on Soft matter
-EAPI=6
-HOMEPAGE=http://espressomd.org
-IUSE=cuda doc examples +fftw +hdf5 test +python_targets_python3_6 +python_single_target_python3_6 savedconfig
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
-LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/cython-0.26.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.0.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc264797c98552964a4cf048f6eac0f1
diff --git a/metadata/md5-cache/sci-physics/espresso-4.0.0-r2 b/metadata/md5-cache/sci-physics/espresso-4.0.0-r2
new file mode 100644
index 000000000000..06640fd883e2
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/espresso-4.0.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/cython-0.26.1[python_targets_python3_6(-)] dev-python/numpy[python_targets_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] ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latexextra virtual/latex-base ) dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=Extensible Simulation Package for Research on Soft matter
+EAPI=6
+HOMEPAGE=http://espressomd.org
+IUSE=cuda doc examples +fftw +hdf5 test +python_single_target_python3_6 savedconfig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/cython-0.26.1[python_targets_python3_6(-)] dev-python/numpy[python_targets_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_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.0.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cbfd72b0b29aa880bdfeae603d64f581
diff --git a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228 b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
index 80061c406d11..0e2c8d12df64 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
+++ b/metadata/md5-cache/sci-physics/espresso-4.0_pre20170228
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >dev-python/cython-0.22[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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:=[cxx] ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latexextra virtual/latex-base ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >dev-python/cython-0.22[python_targets_python3_6(-)] dev-python/numpy[python_targets_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:=[cxx] ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latexextra virtual/latex-base ) dev-util/ninja >=dev-util/cmake-3.9.6
 DESCRIPTION=Extensible Simulation Package for Research on Soft matter
 EAPI=6
 HOMEPAGE=http://espressomd.org
-IUSE=cuda doc examples +fftw +hdf5 test +python_targets_python3_6 +python_single_target_python3_6 savedconfig
+IUSE=cuda doc examples +fftw +hdf5 test +python_single_target_python3_6 savedconfig
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
 LICENSE=GPL-3
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >dev-python/cython-0.22[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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:=[cxx] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >dev-python/cython-0.22[python_targets_python3_6(-)] dev-python/numpy[python_targets_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:=[cxx] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/archive/8a021f5e8b1d508f356f4419d360bd9dfb7fec2c.tar.gz -> espresso-4.0_pre20170228.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a83e8668a0456b8a4c21b86308989ad
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b985499b42cdc115d0a7a5f2716952c4
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index 105df85e6cb4..b28f95e8dfb9 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/cython-0.26.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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] ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latexextra virtual/latex-base ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/cython-0.26.1[python_targets_python3_6(-)] dev-python/numpy[python_targets_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] ) doc? ( app-doc/doxygen[dot] dev-texlive/texlive-latexextra virtual/latex-base ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Extensible Simulation Package for Research on Soft matter
 EAPI=6
 HOMEPAGE=http://espressomd.org
-IUSE=cuda doc examples +fftw +hdf5 test +python_targets_python3_6 +python_single_target_python3_6 savedconfig
+IUSE=cuda doc examples +fftw +hdf5 test +python_single_target_python3_6 savedconfig
 LICENSE=GPL-3
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/cython-0.26.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/cython-0.26.1[python_targets_python3_6(-)] dev-python/numpy[python_targets_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_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9c90284327ffbe575b1f9bea4a71c4e
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6818a648e5bb4c8b44d7ced0cdfa2a3f
diff --git a/metadata/md5-cache/sci-physics/lhapdf-6.2.3 b/metadata/md5-cache/sci-physics/lhapdf-6.2.3
index c90e8a80e78d..fb63619a7aa0 100644
--- a/metadata/md5-cache/sci-physics/lhapdf-6.2.3
+++ b/metadata/md5-cache/sci-physics/lhapdf-6.2.3
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/boost:0= python? ( python_targets_python2_7? ( >=dev-lang/pytho
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=http://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5887439af929b46f86a2568492460d6b
diff --git a/metadata/md5-cache/sci-physics/qmeq-1.0 b/metadata/md5-cache/sci-physics/qmeq-1.0
index 2c6e97e88cae..a13bb578d2c5 100644
--- a/metadata/md5-cache/sci-physics/qmeq-1.0
+++ b/metadata/md5-cache/sci-physics/qmeq-1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/q/qmeq/qmeq-1.0.tar.gz examples? ( https://github.com/gedaskir/qmeq-examples/archive/1.0.tar.gz -> qmeq-examples-1.0.tgz )
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9efab615b788af4d4718c0ef2a61589f
diff --git a/metadata/md5-cache/sci-physics/qutip-4.2.0 b/metadata/md5-cache/sci-physics/qutip-4.2.0
index 0519a21549bb..07623f6be705 100644
--- a/metadata/md5-cache/sci-physics/qutip-4.2.0
+++ b/metadata/md5-cache/sci-physics/qutip-4.2.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/qutip/qutip/archive/v4.2.0.tar.gz -> qutip-4.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfe16acfeff256bc70b3722008d729c0
diff --git a/metadata/md5-cache/sci-physics/rivet-2.6.0-r1 b/metadata/md5-cache/sci-physics/rivet-2.6.0-r1
deleted file mode 100644
index 74d6cd861a20..000000000000
--- a/metadata/md5-cache/sci-physics/rivet-2.6.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-libs/boost:= sci-libs/gsl:= sci-physics/fastjet[plugins] sci-physics/hepmc sci-physics/yoda:=[python] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) doc? ( app-doc/doxygen[latex,dot] ) python? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Toolkit for validation of Monte Carlo HEP event generators
-EAPI=6
-HOMEPAGE=http://rivet.hepforge.org/
-IUSE=doc python static-libs +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= sci-libs/gsl:= sci-physics/fastjet[plugins] sci-physics/hepmc sci-physics/yoda:=[python] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=http://www.hepforge.org/archive/rivet/Rivet-2.6.0.tar.bz2 doc? ( https://rivet.hepforge.org/trac/export/8a05acecd26c18f368f4b748da2d5aa2db46be6c/doc/refs.bib )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=28e28f5807559f9ca9f679438a616bfc
diff --git a/metadata/md5-cache/sci-physics/rivet-2.6.0-r2 b/metadata/md5-cache/sci-physics/rivet-2.6.0-r2
new file mode 100644
index 000000000000..dfaee4e0e634
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/rivet-2.6.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup unpack
+DEPEND=dev-libs/boost:= sci-libs/gsl:= sci-physics/fastjet[plugins] sci-physics/hepmc sci-physics/yoda:=[python] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) doc? ( app-doc/doxygen[latex,dot] ) python? ( python_single_target_python2_7? ( dev-python/cython[python_targets_python2_7(-)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Toolkit for validation of Monte Carlo HEP event generators
+EAPI=6
+HOMEPAGE=http://rivet.hepforge.org/
+IUSE=doc python static-libs +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= sci-libs/gsl:= sci-physics/fastjet[plugins] sci-physics/hepmc sci-physics/yoda:=[python] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=http://www.hepforge.org/archive/rivet/Rivet-2.6.0.tar.bz2 doc? ( https://rivet.hepforge.org/trac/export/8a05acecd26c18f368f4b748da2d5aa2db46be6c/doc/refs.bib )
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=899813aa2f9805cfaf5471d42400689a
diff --git a/metadata/md5-cache/sci-physics/root-6.12.06-r11 b/metadata/md5-cache/sci-physics/root-6.12.06-r11
index 0036a51902a7..f70ba1c1bb03 100644
--- a/metadata/md5-cache/sci-physics/root-6.12.06-r11
+++ b/metadata/md5-cache/sci-physics/root-6.12.06-r11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) 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_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DEPEND=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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) ) vc? ( dev-libs/vc ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=6
 HOMEPAGE=https://root.cern
-IUSE=+X aqua +asimage +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=+X aqua +asimage +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) 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_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?] ) 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_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) qt5? ( root7 ) tmva? ( gsl )
+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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( dev-cpp/tbb ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) ) 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_6 ) ) qt5? ( root7 ) tmva? ( gsl )
 RESTRICT=!test? ( test )
 SLOT=6.12/06
 SRC_URI=https://root.cern/download/root_v6.12.06.source.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4aa6fcbfe1c23568426011c9a594d5a
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=12c969c5fb95bb69880d05ee8ffb35da
diff --git a/metadata/md5-cache/sci-physics/root-6.14.08-r4 b/metadata/md5-cache/sci-physics/root-6.14.08-r4
index 39f9e713671d..19cc624af69f 100644
--- a/metadata/md5-cache/sci-physics/root-6.14.08-r4
+++ b/metadata/md5-cache/sci-physics/root-6.14.08-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DEPEND=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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=6
 HOMEPAGE=https://root.cern
-IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf 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
+IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,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=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) 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 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
+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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_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=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 RESTRICT=!test? ( test )
 SLOT=6.14/08
 SRC_URI=https://root.cern/download/root_v6.14.08.source.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e086e9930be7db32ae301d91f33126e
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=74d1d6d9c44dada104fa3befeeb9c428
diff --git a/metadata/md5-cache/sci-physics/root-6.16.00-r4 b/metadata/md5-cache/sci-physics/root-6.16.00-r4
index 5dfe4b66a949..a9e85cad8f1d 100644
--- a/metadata/md5-cache/sci-physics/root-6.16.00-r4
+++ b/metadata/md5-cache/sci-physics/root-6.16.00-r4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DEPEND=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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=6
 HOMEPAGE=https://root.cern
-IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf 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
+IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc kerberos ldap libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl table +tbb test +threads +tiff +tmva +unuran vc xinetd +xml xrootd zeroconf python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,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=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) 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 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
+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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) 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? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_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=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 RESTRICT=!test? ( test )
 SLOT=6.16/00
 SRC_URI=https://root.cern/download/root_v6.16.00.source.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fb8e015c826e4cc0e9af238c4b72bdf
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dcf7e9145215121a5cff4de183e6f2ec
diff --git a/metadata/md5-cache/sci-physics/root-6.18.04 b/metadata/md5-cache/sci-physics/root-6.18.04
deleted file mode 100644
index ada24fce358b..000000000000
--- a/metadata/md5-cache/sci-physics/root-6.18.04
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
-DESCRIPTION=C++ data analysis framework and interpreter from CERN
-EAPI=6
-HOMEPAGE=https://root.cern
-IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86
-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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
-REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) 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 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
-RESTRICT=!test? ( test )
-SLOT=6.18/04
-SRC_URI=https://root.cern/download/root_v6.18.04.source.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=031460852a6b29d25aa1fb1b048e02b4
diff --git a/metadata/md5-cache/sci-physics/root-6.18.04-r1 b/metadata/md5-cache/sci-physics/root-6.18.04-r1
new file mode 100644
index 000000000000..0337ca7f9755
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/root-6.18.04-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
+DESCRIPTION=C++ data analysis framework and interpreter from CERN
+EAPI=6
+HOMEPAGE=https://root.cern
+IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http jemalloc libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) jemalloc? ( dev-libs/jemalloc ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 !tiff ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
+RESTRICT=!test? ( test )
+SLOT=6.18/04
+SRC_URI=https://root.cern/download/root_v6.18.04.source.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e94b3e3365fd1c402480b10986b55e44
diff --git a/metadata/md5-cache/sci-physics/root-9999 b/metadata/md5-cache/sci-physics/root-9999
index b74593df05cb..a4b27975ce47 100644
--- a/metadata/md5-cache/sci-physics/root-9999
+++ b/metadata/md5-cache/sci-physics/root-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=app-arch/lz4 app-arch/zstd 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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=app-arch/lz4 app-arch/zstd 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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=C++ data analysis framework and interpreter from CERN
 EAPI=6
 HOMEPAGE=https://root.cern
-IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd 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
+IUSE=+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs +examples fits fftw fortran +gdml graphviz +gsl http libcxx +minuit mysql odbc +opengl oracle postgres prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite +ssl +tbb test +tmva +unuran vc vmc +xml xrootd python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA
 PROPERTIES=live
-RDEPEND=app-arch/lz4 app-arch/zstd 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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
-REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) 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 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
+RDEPEND=app-arch/lz4 app-arch/zstd 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-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[widgets] ) ) asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 ) davix? ( net-libs/davix ) emacs? ( >=app-editors/emacs-23.1:* ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:0= ) graphviz? ( media-gfx/graphviz ) gsl? ( sci-libs/gsl:= ) http? ( dev-libs/fcgi:0= ) libcxx? ( sys-libs/libcxx ) unuran? ( sci-mathematics/unuran:0= ) minuit? ( !sci-libs/minuit ) mysql? ( dev-db/mysql-connector-c ) 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 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) R? ( dev-lang/R ) shadow? ( virtual/shadow ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl:0= ) tbb? ( >=dev-cpp/tbb-2018 ) tmva? ( python_single_target_python2_7? ( dev-python/numpy[python_targets_python2_7(-)] ) python_single_target_python3_6? ( dev-python/numpy[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) ) vc? ( dev-libs/vc:= ) xml? ( dev-libs/libxml2:2= ) xrootd? ( net-libs/xrootd:0= ) fortran? ( virtual/fortran )
+REQUIRED_USE=^^ ( c++11 c++14 c++17 ) cuda? ( tmva !c++17 ) !X? ( !asimage !opengl !qt5 ) davix? ( ssl xml ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) ) qt5? ( root7 ) root7? ( || ( c++14 c++17 ) ) tmva? ( gsl )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c0c00c89eb9bcdf36f451c26f2e48965
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	elisp-common	a1054cff648e1c6a806e17001d052176	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=575227552768c2e432b01df92d87e0cb
diff --git a/metadata/md5-cache/sci-physics/yoda-1.6.5 b/metadata/md5-cache/sci-physics/yoda-1.6.5
index 120f224cd106..f67170b5394d 100644
--- a/metadata/md5-cache/sci-physics/yoda-1.6.5
+++ b/metadata/md5-cache/sci-physics/yoda-1.6.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install setup
-DEPEND=dev-libs/boost:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) root? ( sci-physics/root:=[python=,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
+DEPEND=dev-libs/boost:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) root? ( sci-physics/root:=[python=,python_single_target_python2_7(-)?] ) python? ( python_single_target_python2_7? ( dev-python/cython[python_targets_python2_7(-)] ) )
 DESCRIPTION=Yet more Objects for (High Energy Physics) Data Analysis
 EAPI=6
 HOMEPAGE=http://yoda.hepforge.org/
-IUSE=python root static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=python root static-libs +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) root? ( sci-physics/root:=[python=,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+RDEPEND=dev-libs/boost:= python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) root? ( sci-physics/root:=[python=,python_single_target_python2_7(-)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://www.hepforge.org/archive/yoda/YODA-1.6.5.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e0579fc378ae8ca2d33efc0f68259286
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5d556e78454d3c99e9891824d3ac9b47
diff --git a/metadata/md5-cache/sci-physics/yoda-1.7.0 b/metadata/md5-cache/sci-physics/yoda-1.7.0
deleted file mode 100644
index a6965430bfb6..000000000000
--- a/metadata/md5-cache/sci-physics/yoda-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) root? ( sci-physics/root:=[python=,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-DESCRIPTION=Yet more Objects for (High Energy Physics) Data Analysis
-EAPI=6
-HOMEPAGE=http://yoda.hepforge.org/
-IUSE=python root static-libs +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) root? ( sci-physics/root:=[python=,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
-SLOT=0/1.7.0
-SRC_URI=http://www.hepforge.org/archive/yoda/YODA-1.7.0.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=294d6ea2c6efc9e20f7945e4c27c258a
diff --git a/metadata/md5-cache/sci-physics/yoda-1.7.0-r1 b/metadata/md5-cache/sci-physics/yoda-1.7.0-r1
new file mode 100644
index 000000000000..feb447470d61
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/yoda-1.7.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install setup
+DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) root? ( sci-physics/root:=[python=,python_single_target_python2_7(-)?] ) python? ( python_single_target_python2_7? ( dev-python/cython[python_targets_python2_7(-)] ) )
+DESCRIPTION=Yet more Objects for (High Energy Physics) Data Analysis
+EAPI=6
+HOMEPAGE=http://yoda.hepforge.org/
+IUSE=python root static-libs +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) root? ( sci-physics/root:=[python=,python_single_target_python2_7(-)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
+SLOT=0/1.7.0
+SRC_URI=http://www.hepforge.org/archive/yoda/YODA-1.7.0.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a9c44bb0412dd8359277acdb76ad98df
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index bd8b3c59274a..aaf1dbaafc3d 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/nonolith-connect-1.1 b/metadata/md5-cache/sci-visualization/nonolith-connect-1.1
index 42feebbabfd4..1da369a4834e 100644
--- a/metadata/md5-cache/sci-visualization/nonolith-connect-1.1
+++ b/metadata/md5-cache/sci-visualization/nonolith-connect-1.1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost virtual/udev
 SLOT=0
 SRC_URI=http://apps.nonolithlabs.com/download/source/nonolith-connect-1.1.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=e36236fb3fd5c14d4f2352810071ee64
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.6.1 b/metadata/md5-cache/sci-visualization/paraview-5.6.1
deleted file mode 100644
index f259db7a7938..000000000000
--- a/metadata/md5-cache/sci-visualization/paraview-5.6.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/protobuf:= dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5[-gles2] ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mysql-connector-c ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/constantly[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] || ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/twisted-core[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2] dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) boost? ( dev-libs/boost[mpi?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) doc? ( app-doc/doxygen )
-DESCRIPTION=Powerful scientific data visualization application
-EAPI=7
-HOMEPAGE=https://www.paraview.org
-IUSE=boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=paraview GPL-2
-RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/protobuf:= dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5[-gles2] ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mysql-connector-c ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/constantly[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/incremental[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/sip[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] || ( dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/twisted-core[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) dev-python/zope-interface[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2] dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
-REQUIRED_USE=python? ( mpi ^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) mysql? ( sqlite ) ?? ( offscreen qt5 )
-RESTRICT=mirror test
-SLOT=0
-SRC_URI=https://www.paraview.org/files/v5.6/ParaView-v5.6.1.tar.xz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6fdd421a8aec7942147e8bd9c0bb4377
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.6.1-r1 b/metadata/md5-cache/sci-visualization/paraview-5.6.1-r1
new file mode 100644
index 000000000000..9c1c239ea952
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/paraview-5.6.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/protobuf:= dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5[-gles2] ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mysql-connector-c ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/constantly[python_targets_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] || ( dev-python/twisted[python_targets_python3_6(-)] dev-python/twisted-core[python_targets_python3_6(-)] ) dev-python/zope-interface[python_targets_python3_6(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python3_6(-)] ) ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2] dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) boost? ( python_single_target_python3_6? ( dev-libs/boost[mpi?,python_targets_python3_6(-)] ) ) doc? ( app-doc/doxygen )
+DESCRIPTION=Powerful scientific data visualization application
+EAPI=7
+HOMEPAGE=https://www.paraview.org
+IUSE=boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=paraview GPL-2
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/protobuf:= dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu virtual/jpeg:0 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5[-gles2] ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( dev-db/mysql-connector-c ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/constantly[python_targets_python3_6(-)] dev-python/incremental[python_targets_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/sip[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] || ( dev-python/twisted[python_targets_python3_6(-)] dev-python/twisted-core[python_targets_python3_6(-)] ) dev-python/zope-interface[python_targets_python3_6(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python3_6(-)] ) ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2] dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
+REQUIRED_USE=python? ( mpi ^^ ( python_single_target_python3_6 ) ) mysql? ( sqlite ) ?? ( offscreen qt5 )
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=https://www.paraview.org/files/v5.6/ParaView-v5.6.1.tar.xz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=edce48e11ea04576ce016b93749b4061
diff --git a/metadata/md5-cache/sci-visualization/pythonprop-0.13 b/metadata/md5-cache/sci-visualization/pythonprop-0.13
index 71a5e8ccf218..298d21657b80 100644
--- a/metadata/md5-cache/sci-visualization/pythonprop-0.13
+++ b/metadata/md5-cache/sci-visualization/pythonprop-0.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( dev-python/matplotlib-python2[gtk2,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[gtk2,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/basemap[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-electronics/voacapl
+DEPEND=python_single_target_python2_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/matplotlib-python2[gtk2,python_targets_python2_7(-)] dev-python/matplotlib[gtk2,python_targets_python2_7(-)] ) ) dev-python/basemap[python_single_target_python2_7(-)?] sci-electronics/voacapl
 DESCRIPTION=Scripts to prepare and plot VOACAP propagation predictions
 EAPI=5
 HOMEPAGE=http://www.qsl.net/hz1jw/pythonprop
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( dev-python/matplotlib-python2[gtk2,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[gtk2,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/basemap[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-electronics/voacapl
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+RDEPEND=python_single_target_python2_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/matplotlib-python2[gtk2,python_targets_python2_7(-)] dev-python/matplotlib[gtk2,python_targets_python2_7(-)] ) ) dev-python/basemap[python_single_target_python2_7(-)?] sci-electronics/voacapl
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pythonprop/pythonprop-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ab6da7108f1a9e7eab2fea30d3222593
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6883a667c2e1cc33e1addb4ae4e094a3
diff --git a/metadata/md5-cache/sci-visualization/pythonprop-0.18-r1 b/metadata/md5-cache/sci-visualization/pythonprop-0.18-r1
deleted file mode 100644
index d4ede44e75e6..000000000000
--- a/metadata/md5-cache/sci-visualization/pythonprop-0.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/basemap[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-electronics/voacapl app-text/gnome-doc-utils app-text/rarian
-DESCRIPTION=Scripts to prepare and plot VOACAP propagation predictions
-EAPI=5
-HOMEPAGE=http://www.qsl.net/hz1jw/pythonprop
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) || ( dev-python/matplotlib-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) dev-python/basemap[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-electronics/voacapl
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.qsl.net/h/hz1jw/pythonprop/downloads/pythonprop-0.18.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2abe4eb4aa75bc1dc78ab91f524c2363
diff --git a/metadata/md5-cache/sci-visualization/pythonprop-0.18-r2 b/metadata/md5-cache/sci-visualization/pythonprop-0.18-r2
new file mode 100644
index 000000000000..1709d9dbb128
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/pythonprop-0.18-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+DEPEND=python_single_target_python2_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/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) dev-python/basemap[python_single_target_python2_7(-)?] sci-electronics/voacapl app-text/gnome-doc-utils app-text/rarian
+DESCRIPTION=Scripts to prepare and plot VOACAP propagation predictions
+EAPI=5
+HOMEPAGE=http://www.qsl.net/hz1jw/pythonprop
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_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/matplotlib-python2[python_targets_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)] ) ) dev-python/basemap[python_single_target_python2_7(-)?] sci-electronics/voacapl
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://www.qsl.net/h/hz1jw/pythonprop/downloads/pythonprop-0.18.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=33df12f25823125aa799ae5f0794925f
diff --git a/metadata/md5-cache/sci-visualization/pyxplot-0.9.2-r2 b/metadata/md5-cache/sci-visualization/pyxplot-0.9.2-r2
deleted file mode 100644
index 38ef72042699..000000000000
--- a/metadata/md5-cache/sci-visualization/pyxplot-0.9.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=app-text/gv dev-libs/libxml2:2 media-libs/libpng:0= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) virtual/latex-base virtual/imagemagick-tools python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig
-DESCRIPTION=Gnuplot like graphing program publication-quality figures
-EAPI=5
-HOMEPAGE=http://www.pyxplot.org.uk/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=app-text/gv dev-libs/libxml2:2 media-libs/libpng:0= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl || ( sci-libs/scipy-python2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) virtual/latex-base virtual/imagemagick-tools python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pyxplot/pyxplot_0.9.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4d5d2dec400c8953191f795aed310f7
diff --git a/metadata/md5-cache/sci-visualization/pyxplot-0.9.2-r3 b/metadata/md5-cache/sci-visualization/pyxplot-0.9.2-r3
new file mode 100644
index 000000000000..c85913c0563d
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/pyxplot-0.9.2-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=prepare setup
+DEPEND=app-text/gv dev-libs/libxml2:2 media-libs/libpng:0= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl python_single_target_python2_7? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) virtual/latex-base virtual/imagemagick-tools python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) virtual/pkgconfig
+DESCRIPTION=Gnuplot like graphing program publication-quality figures
+EAPI=5
+HOMEPAGE=http://www.pyxplot.org.uk/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=app-text/gv dev-libs/libxml2:2 media-libs/libpng:0= sci-libs/cfitsio sci-libs/fftw:3.0= sci-libs/gsl python_single_target_python2_7? ( || ( sci-libs/scipy-python2[python_targets_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)] ) ) virtual/latex-base virtual/imagemagick-tools python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/pyxplot/pyxplot_0.9.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c92114c6f9e5f9b999b99b7dec9bdac6
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.0 b/metadata/md5-cache/sci-visualization/veusz-3.0
deleted file mode 100644
index 5bf70b1e40a2..000000000000
--- a/metadata/md5-cache/sci-visualization/veusz-3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Qt scientific plotting package with good Postscript output
-EAPI=6
-HOMEPAGE=https://veusz.github.io/
-IUSE=dbus doc fits hdf5 minuit python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) fits? ( dev-python/astropy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) hdf5? ( dev-python/h5py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) minuit? ( || ( dev-python/iminuit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyminuit[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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.0/veusz-3.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c04e5c8bb59b3b172b5a02dbbfb60e6
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.0.1 b/metadata/md5-cache/sci-visualization/veusz-3.0.1
deleted file mode 100644
index e1c33ddd60c6..000000000000
--- a/metadata/md5-cache/sci-visualization/veusz-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sip[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Qt scientific plotting package with good Postscript output
-EAPI=6
-HOMEPAGE=https://veusz.github.io/
-IUSE=dbus doc fits hdf5 minuit python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) fits? ( dev-python/astropy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) hdf5? ( dev-python/h5py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) minuit? ( || ( dev-python/iminuit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyminuit[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 )
-RESTRICT=!test? ( test )
-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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=303cd20acfc43e8889d902dccfd0416e
diff --git a/metadata/md5-cache/sci-visualization/veusz-3.1 b/metadata/md5-cache/sci-visualization/veusz-3.1
index 02f648235811..01e82644a2c9 100644
--- a/metadata/md5-cache/sci-visualization/veusz-3.1
+++ b/metadata/md5-cache/sci-visualization/veusz-3.1
@@ -4,13 +4,13 @@ DEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,-p
 DESCRIPTION=Qt scientific plotting package with good Postscript output
 EAPI=7
 HOMEPAGE=https://veusz.github.io/
-IUSE=dbus doc fits hdf5 minuit python_targets_python3_6 test
+IUSE=dbus doc hdf5 minuit python_targets_python3_6 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) fits? ( dev-python/astropy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) hdf5? ( dev-python/h5py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) minuit? ( || ( dev-python/iminuit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyminuit[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(-)]
+RDEPEND=dev-python/PyQt5[widgets,svg,printsupport,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dbus? ( dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) hdf5? ( dev-python/h5py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) minuit? ( || ( dev-python/iminuit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyminuit[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-3.1/veusz-3.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1ba1562589dd17711baed9de76e56dc
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b4fa7c73b09913e6a21d8680174ded17
diff --git a/metadata/md5-cache/sci-visualization/yt-3.3.5 b/metadata/md5-cache/sci-visualization/yt-3.3.5
index ce3f07b2a5c6..cd219683a189 100644
--- a/metadata/md5-cache/sci-visualization/yt-3.3.5
+++ b/metadata/md5-cache/sci-visualization/yt-3.3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt/yt-3.3.5.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7448e867fd3b2d0dacc78f43f7bfe568
diff --git a/metadata/md5-cache/sci-visualization/yt-3.4.0 b/metadata/md5-cache/sci-visualization/yt-3.4.0
index 35c29103efb4..107f31aad1ce 100644
--- a/metadata/md5-cache/sci-visualization/yt-3.4.0
+++ b/metadata/md5-cache/sci-visualization/yt-3.4.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yt/yt-3.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eafd315cece647307f91a4881b6a2346
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 8a1f2203a80d..0609c01841a6 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/attr-2.4.48-r3 b/metadata/md5-cache/sys-apps/attr-2.4.48-r3
index 8eb3e0bff423..a775ca0be019 100644
--- a/metadata/md5-cache/sys-apps/attr-2.4.48-r3
+++ b/metadata/md5-cache/sys-apps/attr-2.4.48-r3
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://nongnu/attr/attr-2.4.48.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ca84f3dc39f2f75fc90b165e58953a7e
+_md5_=a2924189cbd599414f4e2dd169d7b30d
diff --git a/metadata/md5-cache/sys-apps/attr-9999 b/metadata/md5-cache/sys-apps/attr-9999
index 3a46adaa2ff5..e8e7d3aafbb8 100644
--- a/metadata/md5-cache/sys-apps/attr-9999
+++ b/metadata/md5-cache/sys-apps/attr-9999
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=000903ee87abcde83137321cb8d0a17d
+_md5_=c1aa73143dfa52e311d63bd712f0cc2c
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2 b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
index 39dd502e61d8..5c3159a9b1f9 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
+++ b/metadata/md5-cache/sys-apps/baselayout-2.4.1-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst preinst prepare setup
 DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=build kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.4.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a0a5fc5f7796b005d90d27c539d32b93
+_md5_=849a287520677f46744f0e7deba9a241
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.6-r1 b/metadata/md5-cache/sys-apps/baselayout-2.6-r1
index e04c8fd719d3..3c8a0a1e2ed3 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.6-r1
+++ b/metadata/md5-cache/sys-apps/baselayout-2.6-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst preinst prepare setup
 DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=build kernel_FreeBSD kernel_linux +split-usr
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.6.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fa8a62c71c0ef31420cfcb3e0c73a654
+_md5_=a535a6bfce202f11bccb86bf507e61a5
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.7 b/metadata/md5-cache/sys-apps/baselayout-2.7
new file mode 100644
index 000000000000..4a758bb37d11
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-2.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst preinst prepare setup
+DESCRIPTION=Filesystem baselayout and init scripts
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=build kernel_FreeBSD kernel_linux +split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.7.tar.bz2
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=12e2814aab4e4360729ed41ad6240895
diff --git a/metadata/md5-cache/sys-apps/baselayout-9999 b/metadata/md5-cache/sys-apps/baselayout-9999
index dabbb1e2cf41..8ffc1f98714d 100644
--- a/metadata/md5-cache/sys-apps/baselayout-9999
+++ b/metadata/md5-cache/sys-apps/baselayout-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=install postinst preinst prepare setup unpack
 DEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=build kernel_FreeBSD kernel_linux +split-usr
 LICENSE=GPL-2
 PROPERTIES=live
 SLOT=0
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=754097acbe1f528e2abc83a1aa1d155f
+_md5_=12e2814aab4e4360729ed41ad6240895
diff --git a/metadata/md5-cache/sys-apps/baselayout-prefix-2.2-r5 b/metadata/md5-cache/sys-apps/baselayout-prefix-2.2-r5
index 49698271198b..b45e428d3918 100644
--- a/metadata/md5-cache/sys-apps/baselayout-prefix-2.2-r5
+++ b/metadata/md5-cache/sys-apps/baselayout-prefix-2.2-r5
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst preinst
 DEPEND=sys-apps/gentoo-functions >=app-portage/elt-patches-20170815
 DESCRIPTION=Minimal baselayout for Gentoo Prefix installs
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=mirror://gentoo/baselayout-2.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/baselayout-2.2.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7709c470bcec2e8a57618fa24e040e74
+_md5_=ca55a72b5f13e6502543b117fdd01951
diff --git a/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r1 b/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r1
index e11d8208f00f..f366e41be336 100644
--- a/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r1
+++ b/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
 DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=build kernel_FreeBSD kernel_linux +split-usr
 KEYWORDS=~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.6.tar.bz2 https://github.com/haubi/gentoo-baselayout/commit/a054fcc408ad48f775f7379834385c6a707d7a53.patch -> baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch https://github.com/haubi/gentoo-baselayout/commit/5926fe447541607ed137d67ca84080326584b2fc.patch -> baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch https://github.com/haubi/gentoo-baselayout/commit/395424f90c8ca6969589905cbf86d74fae9d7ea6.patch -> baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch https://github.com/haubi/gentoo-baselayout/commit/95a8e95af948014d024842892be1405d656ab5fc.patch -> baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch https://github.com/haubi/gentoo-baselayout/commit/c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch -> baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch https://github.com/haubi/gentoo-baselayout/commit/c9338e89cdb603c1e08998bba28fbc977a62fc51.patch -> baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0a7268d70a98e5eb0a1e3fad499901f2
+_md5_=5cbeee8db2ea0d07edafd47fa3a7a62b
diff --git a/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r2 b/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r2
index 251979904f8c..92bac6c22366 100644
--- a/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r2
+++ b/metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r2
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
 DESCRIPTION=Filesystem baselayout and init scripts
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=build kernel_FreeBSD kernel_linux +split-usr
 KEYWORDS=~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.6.tar.bz2 https://github.com/haubi/gentoo-baselayout/commit/bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch -> baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch https://github.com/haubi/gentoo-baselayout/commit/a054fcc408ad48f775f7379834385c6a707d7a53.patch -> baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch https://github.com/haubi/gentoo-baselayout/commit/5926fe447541607ed137d67ca84080326584b2fc.patch -> baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch https://github.com/haubi/gentoo-baselayout/commit/395424f90c8ca6969589905cbf86d74fae9d7ea6.patch -> baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch https://github.com/haubi/gentoo-baselayout/commit/95a8e95af948014d024842892be1405d656ab5fc.patch -> baselayout-prefix-95a8e95af948014d024842892be1405d656ab5fc.patch https://github.com/haubi/gentoo-baselayout/commit/c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch -> baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch https://github.com/haubi/gentoo-baselayout/commit/c9338e89cdb603c1e08998bba28fbc977a62fc51.patch -> baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6e9a233eb26f8651f3ab95c55596f338
+_md5_=5f86f56a8d7ff04ff914fedeb4256343
diff --git a/metadata/md5-cache/sys-apps/biosdisk-0_p20171116 b/metadata/md5-cache/sys-apps/biosdisk-0_p20171116
index c9adda21b986..cb20f3b10ab6 100644
--- a/metadata/md5-cache/sys-apps/biosdisk-0_p20171116
+++ b/metadata/md5-cache/sys-apps/biosdisk-0_p20171116
@@ -2,12 +2,12 @@ DEFINED_PHASES=install setup
 DESCRIPTION=A script that creates floppy boot images to flash Dell BIOSes
 EAPI=6
 HOMEPAGE=https://github.com/dell/biosdisk
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/dos2unix-5.0 sys-boot/syslinux python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/dell/biosdisk/archive/f534dd22a795dca9c42f44b52f206bf02eadb682.tar.gz -> biosdisk-0_p20171116.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fb48b4a981605e9f53fd5c2f07dce73d
diff --git a/metadata/md5-cache/sys-apps/bleachbit-3.0 b/metadata/md5-cache/sys-apps/bleachbit-3.0
index 635ff197f636..fcb6b66b9d87 100644
--- a/metadata/md5-cache/sys-apps/bleachbit-3.0
+++ b/metadata/md5-cache/sys-apps/bleachbit-3.0
@@ -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=https://download.bleachbit.org/bleachbit-3.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5fbfe83c68c41597f98d358192594aac
diff --git a/metadata/md5-cache/sys-apps/busybox-1.31.1 b/metadata/md5-cache/sys-apps/busybox-1.31.1
deleted file mode 100644
index 70bd1096a196..000000000000
--- a/metadata/md5-cache/sys-apps/busybox-1.31.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
-DESCRIPTION=Utilities for rescue and embedded systems
-EAPI=6
-HOMEPAGE=https://www.busybox.net/
-IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev? ( !<sys-apps/openrc-0.13 )
-REQUIRED_USE=pam? ( !static )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df140ba8cc4987e66c4c9071066be11c
diff --git a/metadata/md5-cache/sys-apps/busybox-1.31.1-r2 b/metadata/md5-cache/sys-apps/busybox-1.31.1-r2
new file mode 100644
index 000000000000..b5afc870fb00
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/busybox-1.31.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare
+DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
+DESCRIPTION=Utilities for rescue and embedded systems
+EAPI=7
+HOMEPAGE=https://www.busybox.net/
+IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) virtual/libcrypt:= mdev? ( !<sys-apps/openrc-0.13 )
+REQUIRED_USE=pam? ( !static )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.busybox.net/downloads/busybox-1.31.1.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=445076b72e2aae0b04410da604afe4ee
diff --git a/metadata/md5-cache/sys-apps/cinit-0.2.1 b/metadata/md5-cache/sys-apps/cinit-0.2.1
index 26e02024ffa5..e1fb8b5b99d7 100644
--- a/metadata/md5-cache/sys-apps/cinit-0.2.1
+++ b/metadata/md5-cache/sys-apps/cinit-0.2.1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=a fast, small and simple init with support for profiles
-EAPI=4
+EAPI=7
 HOMEPAGE=http://linux.schottelius.org/cinit/
 IUSE=doc
 KEYWORDS=~amd64 ~hppa ~ppc ~x86
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linux.schottelius.org/cinit/archives/cinit-0.2.1.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cf14b77948ca8f48457693dfb6017c5a
+_md5_=3628bf7922a1d82c274ae70847d21fb3
diff --git a/metadata/md5-cache/sys-apps/collectl-3.7.4 b/metadata/md5-cache/sys-apps/collectl-3.7.4
deleted file mode 100644
index ad4939a05f9a..000000000000
--- a/metadata/md5-cache/sys-apps/collectl-3.7.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
-EAPI=4
-HOMEPAGE=http://collectl.sourceforge.net/
-KEYWORDS=~alpha amd64 ia64 x86
-LICENSE=GPL-2 Artistic
-RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
-SLOT=0
-SRC_URI=mirror://sourceforge/collectl/collectl-3.7.4.src.tar.gz
-_md5_=35bca4cbedbce1aaefc581ec9dc31a2d
diff --git a/metadata/md5-cache/sys-apps/collectl-4.0.5 b/metadata/md5-cache/sys-apps/collectl-4.0.5
deleted file mode 100644
index 459fa29f44af..000000000000
--- a/metadata/md5-cache/sys-apps/collectl-4.0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
-EAPI=5
-HOMEPAGE=http://collectl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ia64 ~x86
-LICENSE=GPL-2 Artistic
-RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
-SLOT=0
-SRC_URI=mirror://sourceforge/collectl/collectl-4.0.5.src.tar.gz
-_md5_=fb3267d29a5fcc48d1a40eeea264b26e
diff --git a/metadata/md5-cache/sys-apps/collectl-4.1.0 b/metadata/md5-cache/sys-apps/collectl-4.1.0
deleted file mode 100644
index 1838b319cfef..000000000000
--- a/metadata/md5-cache/sys-apps/collectl-4.1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
-EAPI=5
-HOMEPAGE=http://collectl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ia64 ~x86
-LICENSE=GPL-2 Artistic
-RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
-SLOT=0
-SRC_URI=mirror://sourceforge/collectl/collectl-4.1.0.src.tar.gz
-_md5_=fb3267d29a5fcc48d1a40eeea264b26e
diff --git a/metadata/md5-cache/sys-apps/collectl-4.1.3 b/metadata/md5-cache/sys-apps/collectl-4.1.3
deleted file mode 100644
index c6076cc865c2..000000000000
--- a/metadata/md5-cache/sys-apps/collectl-4.1.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
-EAPI=5
-HOMEPAGE=http://collectl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ia64 ~x86
-LICENSE=GPL-2 Artistic
-RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
-SLOT=0
-SRC_URI=mirror://sourceforge/collectl/collectl-4.1.3.src.tar.gz
-_md5_=e857a7a97f2ec207f5c6b7370af82f9a
diff --git a/metadata/md5-cache/sys-apps/collectl-4.2.0 b/metadata/md5-cache/sys-apps/collectl-4.2.0
deleted file mode 100644
index 4c9d1af3e1df..000000000000
--- a/metadata/md5-cache/sys-apps/collectl-4.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
-EAPI=6
-HOMEPAGE=http://collectl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ia64 ~x86
-LICENSE=GPL-2 Artistic
-RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
-SLOT=0
-SRC_URI=mirror://sourceforge/collectl/collectl-4.2.0.src.tar.gz
-_md5_=e2c661607154a2846864bb897feb786b
diff --git a/metadata/md5-cache/sys-apps/collectl-4.3.0 b/metadata/md5-cache/sys-apps/collectl-4.3.0
deleted file mode 100644
index 3da4273f1081..000000000000
--- a/metadata/md5-cache/sys-apps/collectl-4.3.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Performance monitoring tool capable of interactive reporting and logging to disk
-EAPI=6
-HOMEPAGE=http://collectl.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~ia64 ~x86
-LICENSE=GPL-2 Artistic
-RDEPEND=>=dev-lang/perl-5.8.8 virtual/perl-Time-HiRes >=dev-perl/Archive-Zip-1.20 sys-apps/ethtool sys-apps/pciutils
-SLOT=0
-SRC_URI=mirror://sourceforge/collectl/collectl-4.3.0.src.tar.gz
-_md5_=e2c661607154a2846864bb897feb786b
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.30 b/metadata/md5-cache/sys-apps/coreutils-8.30
index 66bd534c48d6..d5bc27e451f8 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.30
+++ b/metadata/md5-cache/sys-apps/coreutils-8.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect !userland_BSD? ( dev-util/strace ) || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/pyinotify[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pyinotify[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
+DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect !userland_BSD? ( dev-util/strace ) || ( dev-lang/python:3.6 ) || ( ( dev-lang/python:3.6 dev-python/pyinotify[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
 DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/coreutils/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.30.tar.xz mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a669ec2d937627410619984a7a898b8
+_md5_=362b2ee923e470878c69dcff2db18a4a
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.31 b/metadata/md5-cache/sys-apps/coreutils-8.31
index bc7ba8bc41a5..d5f803365a39 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.31
+++ b/metadata/md5-cache/sys-apps/coreutils-8.31
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect !userland_BSD? ( dev-util/strace ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.7 dev-python/pyinotify[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pyinotify[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pyinotify[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
+DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect !userland_BSD? ( dev-util/strace ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.7 dev-python/pyinotify[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pyinotify[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
 DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/coreutils/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.31.tar.xz mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5ebb2ae6ba5ea4156252d8ce3928271
+_md5_=fc45c11a6480f670bc227fdd33cdec68
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.31-r1 b/metadata/md5-cache/sys-apps/coreutils-8.31-r1
index 1d05ec3310d6..d908feaa1c7e 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.31-r1
+++ b/metadata/md5-cache/sys-apps/coreutils-8.31-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.7 dev-python/pyinotify[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pyinotify[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pyinotify[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
+DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) ) app-arch/xz-utils test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.7 dev-python/pyinotify[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pyinotify[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) )
 DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/coreutils/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.31.tar.xz mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d6b0ad7c4f86b9a307252351418a96b5
+_md5_=3eec9f2b1769ea3892afac222527500b
diff --git a/metadata/md5-cache/sys-apps/dbus-1.12.16 b/metadata/md5-cache/sys-apps/dbus-1.12.16
index 2bea12eaad4e..6f1a55d591d9 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.12.16
+++ b/metadata/md5-cache/sys-apps/dbus-1.12.16
@@ -1,6 +1,6 @@
 BDEPEND=acct-user/messagebus app-text/xmlto app-text/docbook-xml-dtd:4.4 sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-libs/glib-2.40:2 )
+DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) >=dev-libs/glib-2.40:2 )
 DESCRIPTION=A message bus system, a simple way for applications to talk to each other
 EAPI=7
 HOMEPAGE=https://dbus.freedesktop.org/
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=c7120eb0f68a22a5c647444f02ae710f
+_md5_=e605a161b825d84e0d9f66bf0623e1e5
diff --git a/metadata/md5-cache/sys-apps/edid-fixdim-1 b/metadata/md5-cache/sys-apps/edid-fixdim-1
index b5cccef40008..ded43944b456 100644
--- a/metadata/md5-cache/sys-apps/edid-fixdim-1
+++ b/metadata/md5-cache/sys-apps/edid-fixdim-1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install setup
 DESCRIPTION=Tool to fix screen dimensions in EDID data dumps
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/edid-fixdim
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64
 LICENSE=BSD-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/mgorny/edid-fixdim/archive/v1.tar.gz -> edid-fixdim-1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8dcd02420e0a51192f683506c13e295f
diff --git a/metadata/md5-cache/sys-apps/elivepatch-client-0.1 b/metadata/md5-cache/sys-apps/elivepatch-client-0.1
index 20d85e38e391..f14f896316ad 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_python3_6(-)?,-pytho
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c3686f08520c02c40365f2863d14c97f
diff --git a/metadata/md5-cache/sys-apps/elivepatch-client-9999 b/metadata/md5-cache/sys-apps/elivepatch-client-9999
index f6d1b514917b..600c0365d639 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-client-9999
+++ b/metadata/md5-cache/sys-apps/elivepatch-client-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=app-admin/sudo dev-python/git-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f32b5ad73927804f2d24be4957bb0891
diff --git a/metadata/md5-cache/sys-apps/elivepatch-server-0.1 b/metadata/md5-cache/sys-apps/elivepatch-server-0.1
index 20b27b58b4fc..c2e515f8ca0b 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_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bb723d459db85f0ba9d0a8695082fb9
diff --git a/metadata/md5-cache/sys-apps/elivepatch-server-0.2 b/metadata/md5-cache/sys-apps/elivepatch-server-0.2
index 479563cec05a..6168193706f2 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-server-0.2
+++ b/metadata/md5-cache/sys-apps/elivepatch-server-0.2
@@ -10,5 +10,5 @@ RDEPEND=dev-python/werkzeug[python_targets_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/aliceinwire/elivepatch-server/archive/v0.2.tar.gz -> elivepatch-server-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4bb723d459db85f0ba9d0a8695082fb9
diff --git a/metadata/md5-cache/sys-apps/elivepatch-server-9999 b/metadata/md5-cache/sys-apps/elivepatch-server-9999
index 02fcbc6ea63e..62270ff3037e 100644
--- a/metadata/md5-cache/sys-apps/elivepatch-server-9999
+++ b/metadata/md5-cache/sys-apps/elivepatch-server-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/werkzeug[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask-restful[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =sys-kernel/kpatch-9999 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=10572471a21ef79da65f2a7d68737f2e
diff --git a/metadata/md5-cache/sys-apps/entropy-302-r1 b/metadata/md5-cache/sys-apps/entropy-302-r1
deleted file mode 100644
index 1434d06e9a6a..000000000000
--- a/metadata/md5-cache/sys-apps/entropy-302-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=>=app-misc/pax-utils-0.7 dev-db/sqlite:3[soundex(+)] net-misc/rsync sys-apps/diffutils sys-apps/sandbox >=sys-apps/portage-2.1.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-devel/gettext python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/intltool
-DESCRIPTION=Entropy Package Manager foundation library
-EAPI=5
-HOMEPAGE=http://www.sabayon.org
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-misc/pax-utils-0.7 dev-db/sqlite:3[soundex(+)] net-misc/rsync sys-apps/diffutils sys-apps/sandbox >=sys-apps/portage-2.1.9[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-devel/gettext python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bdaa396fe8ac53da6c1267176054ce1e
diff --git a/metadata/md5-cache/sys-apps/entropy-302-r2 b/metadata/md5-cache/sys-apps/entropy-302-r2
new file mode 100644
index 000000000000..0c9f6ac58226
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/entropy-302-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst setup
+DEPEND=>=app-misc/pax-utils-0.7 dev-db/sqlite:3[soundex(+)] net-misc/rsync sys-apps/diffutils sys-apps/sandbox python_single_target_python2_7? ( >=sys-apps/portage-2.1.9[python_targets_python2_7(-)] ) sys-devel/gettext python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-util/intltool
+DESCRIPTION=Entropy Package Manager foundation library
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-misc/pax-utils-0.7 dev-db/sqlite:3[soundex(+)] net-misc/rsync sys-apps/diffutils sys-apps/sandbox python_single_target_python2_7? ( >=sys-apps/portage-2.1.9[python_targets_python2_7(-)] ) sys-devel/gettext python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6896057957bc27b631bdbbf923594767
diff --git a/metadata/md5-cache/sys-apps/entropy-server-302 b/metadata/md5-cache/sys-apps/entropy-server-302
deleted file mode 100644
index 058351f0484d..000000000000
--- a/metadata/md5-cache/sys-apps/entropy-server-302
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=app-text/asciidoc
-DESCRIPTION=Entropy Package Manager server-side tools
-EAPI=5
-HOMEPAGE=http://www.sabayon.org
-IUSE=+matter +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=~sys-apps/entropy-302[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] matter? ( ~app-admin/matter-302[entropy] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ae7eadaa41e97e3882d9b202bd12ff9
diff --git a/metadata/md5-cache/sys-apps/entropy-server-302-r1 b/metadata/md5-cache/sys-apps/entropy-server-302-r1
new file mode 100644
index 000000000000..2892d8289b39
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/entropy-server-302-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=app-text/asciidoc
+DESCRIPTION=Entropy Package Manager server-side tools
+EAPI=5
+HOMEPAGE=http://www.sabayon.org
+IUSE=+matter +python_single_target_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=~sys-apps/entropy-302[python_single_target_python2_7(-)?] matter? ( ~app-admin/matter-302[entropy] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sabayon/sys-apps/entropy-302.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f614b540377eac3e4639735d57efe5d7
diff --git a/metadata/md5-cache/sys-apps/file-5.36 b/metadata/md5-cache/sys-apps/file-5.36
index 8ae8df7ababe..9331cfbe134e 100644
--- a/metadata/md5-cache/sys-apps/file-5.36
+++ b/metadata/md5-cache/sys-apps/file-5.36
@@ -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_6 python_targets_python3_7 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.36.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11fc4905f29550e72538d75910ee0049
diff --git a/metadata/md5-cache/sys-apps/file-5.37-r1 b/metadata/md5-cache/sys-apps/file-5.37-r1
index bd626fed0067..0471932c835d 100644
--- a/metadata/md5-cache/sys-apps/file-5.37-r1
+++ b/metadata/md5-cache/sys-apps/file-5.37-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_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.37.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=01a11e0e82b8317753e199c6caeb1d0c
diff --git a/metadata/md5-cache/sys-apps/file-5.38 b/metadata/md5-cache/sys-apps/file-5.38
index 39d8d668f1be..6ad10d55c0cf 100644
--- a/metadata/md5-cache/sys-apps/file-5.38
+++ b/metadata/md5-cache/sys-apps/file-5.38
@@ -11,5 +11,5 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.38.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=98859b8cf8266ea87296b0a771680dab
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index c3ffbaf7ddde..93b8db8714a0 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fe46ea05794e277e9b6ee80a6ca1863c
diff --git a/metadata/md5-cache/sys-apps/findutils-4.6.0-r1 b/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
index 5ad306cfaf02..11d9ce199cbf 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
+++ b/metadata/md5-cache/sys-apps/findutils-4.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare setup
-DEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) nls? ( sys-devel/gettext )
+DEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) nls? ( sys-devel/gettext )
 DESCRIPTION=GNU utilities for finding files
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/findutils/
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.6.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=18833b5090da2f38f06804db564e62db
+_md5_=7235999ac4eb560a8f352c68d554e5e4
diff --git a/metadata/md5-cache/sys-apps/findutils-4.7.0 b/metadata/md5-cache/sys-apps/findutils-4.7.0
index 2f12d6ab611e..568bc52f8982 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.7.0
+++ b/metadata/md5-cache/sys-apps/findutils-4.7.0
@@ -1,6 +1,6 @@
 BDEPEND=nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure prepare setup
-DEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) )
+DEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) )
 DESCRIPTION=GNU utilities for finding files
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/findutils/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.7.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0416db62a12d80ee050856d0ffa9fabb
+_md5_=ce60c80da0b5cdd97ec1b12cff0888ea
diff --git a/metadata/md5-cache/sys-apps/fix-gnustack-0.1 b/metadata/md5-cache/sys-apps/fix-gnustack-0.1
index 37a579c1ab24..e9807774ffe8 100644
--- a/metadata/md5-cache/sys-apps/fix-gnustack-0.1
+++ b/metadata/md5-cache/sys-apps/fix-gnustack-0.1
@@ -8,4 +8,4 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/elfutils
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~blueness/fix-gnustack/fix-gnustack-0.1.tar.bz2
-_md5_=337418b7cf46e77597c206110da578a6
+_md5_=1a6453136b640450945dad4343c0deb9
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.2.11 b/metadata/md5-cache/sys-apps/fwupd-1.2.11
index 8917abb099bb..86e452ffcf89 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.2.11
+++ b/metadata/md5-cache/sys-apps/fwupd-1.2.11
@@ -1,17 +1,17 @@
 BDEPEND=>=dev-util/meson-0.47.0 virtual/pkgconfig doc? ( dev-util/gtk-doc ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.7 dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) x11-libs/pango[introspection] nvme? ( >=sys-kernel/linux-headers-4.4 ) test? ( net-libs/gnutls[tools] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.7 python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo ) || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) x11-libs/pango[introspection] nvme? ( >=sys-kernel/linux-headers-4.4 ) test? ( net-libs/gnutls[tools] )
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=7
 HOMEPAGE=https://fwupd.org
-IUSE=agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1+
 PDEPEND=sys-apps/dbus
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.7 dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-arch/gcab app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection] >=dev-libs/libxmlb-0.1.7 python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection] >=sys-auth/polkit-0.103 virtual/libelf:0= colorhug? ( >=x11-misc/colord-1.2.12:0= ) consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi >=sys-libs/efivar-33 x11-libs/cairo )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ^^ ( consolekit elogind systemd ) dell? ( uefi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.2.11.tar.gz -> fwupd-1.2.11.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84bd64a86f32732f5bbf3dbcacc4290f
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ed87c044cf267bac2ed825ac91c03814
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.3.6 b/metadata/md5-cache/sys-apps/fwupd-1.3.6
index b79f2efe58a4..b971f0d4b35b 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.3.6
+++ b/metadata/md5-cache/sys-apps/fwupd-1.3.6
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=7
 HOMEPAGE=https://fwupd.org
-IUSE=agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ^^ ( consolekit elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) sys-apps/dbus
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( consolekit elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.3.6.tar.gz -> fwupd-1.3.6.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0079933437d1d18e70055ebbb29b4d4c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9eebd97d52e2305c146bf453c3b9fd2e
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.3.7 b/metadata/md5-cache/sys-apps/fwupd-1.3.7
index 1f821e4d74a1..2f4879869c5b 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.3.7
+++ b/metadata/md5-cache/sys-apps/fwupd-1.3.7
@@ -1,16 +1,16 @@
 BDEPEND=|| ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
 EAPI=7
 HOMEPAGE=https://fwupd.org
-IUSE=agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi kernel_linux python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=!sci-chemistry/chemical-mime-data python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] dev-python/pygobject:3[cairo,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ^^ ( consolekit elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) thunderbolt? ( sys-apps/thunderbolt-software-user-space ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) sys-apps/dbus
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( consolekit elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.3.7.tar.gz -> fwupd-1.3.7.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8aa7ae0eca393157b167c9f04aa863a5
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=37915d1b84f0d90a270e01f564c44679
diff --git a/metadata/md5-cache/sys-apps/gcp-0.2.1 b/metadata/md5-cache/sys-apps/gcp-0.2.1
index 4b4fde705b3b..df669dddb48e 100644
--- a/metadata/md5-cache/sys-apps/gcp-0.2.1
+++ b/metadata/md5-cache/sys-apps/gcp-0.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/g/gcp/gcp-0.2.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4855ba20a9980d5c54b8bcd929680832
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.12 b/metadata/md5-cache/sys-apps/gentoo-functions-0.12
index 26b0ba185261..374a1942eca4 100644
--- a/metadata/md5-cache/sys-apps/gentoo-functions-0.12
+++ b/metadata/md5-cache/sys-apps/gentoo-functions-0.12
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=base functions required by all Gentoo systems
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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 ~x86-winnt
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-functions/archive/0.12.tar.gz -> gentoo-functions-0.12.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a64cbe3bb2704b9c172e59c88211a19
+_md5_=a550852596c8bdd6c4aeca3d168d2b59
diff --git a/metadata/md5-cache/sys-apps/gpet-0.4 b/metadata/md5-cache/sys-apps/gpet-0.4
index e43f8ac0c031..2006c07629fe 100644
--- a/metadata/md5-cache/sys-apps/gpet-0.4
+++ b/metadata/md5-cache/sys-apps/gpet-0.4
@@ -1,11 +1,12 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
 DEFINED_PHASES=-
-DEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango dev-util/intltool virtual/pkgconfig
+DEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
 DESCRIPTION=GTK+ based TOMOYO policy editor
-EAPI=4
+EAPI=7
 HOMEPAGE=http://en.sourceforge.jp/projects/gpet/
 KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/gpet/53178/gpet-0.4.tar.bz2
-_md5_=80c4181f6252eaf5839982e1312a2329
+_md5_=ab348ab7529deff00ad0671832fb2092
diff --git a/metadata/md5-cache/sys-apps/groff-1.22.4 b/metadata/md5-cache/sys-apps/groff-1.22.4
index 09a6834e7a30..3938292bdaae 100644
--- a/metadata/md5-cache/sys-apps/groff-1.22.4
+++ b/metadata/md5-cache/sys-apps/groff-1.22.4
@@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.4.tar.gz mirror://gnu-alpha/groff/groff-1.22.4.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=76a212ce6e897f17942425d89fa1c661
+_md5_=c4156e635e22d0513e6004b6d9111f12
diff --git a/metadata/md5-cache/sys-apps/gscanbus-0.8 b/metadata/md5-cache/sys-apps/gscanbus-0.8
index d8db93c83a82..ae7e68e7062a 100644
--- a/metadata/md5-cache/sys-apps/gscanbus-0.8
+++ b/metadata/md5-cache/sys-apps/gscanbus-0.8
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=-
-DEPEND=sys-libs/libraw1394 x11-libs/gtk+:2 virtual/pkgconfig
+DEPEND=sys-libs/libraw1394 x11-libs/gtk+:2
 DESCRIPTION=Bus scanning, testing and topology visualizing tool for Linux IEEE1394 subsystem
-EAPI=4
+EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/gscanbus.berlios/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/libraw1394 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gscanbus.berlios/gscanbus-0.8.tar.gz
-_md5_=ccf2a78344a733f5fd5b1d12ec661fce
+_md5_=460b6509add5f020a89acef9094dd798
diff --git a/metadata/md5-cache/sys-apps/hardened-shadow-0.9.2 b/metadata/md5-cache/sys-apps/hardened-shadow-0.9.2
index d8f009cae853..9082005a0acf 100644
--- a/metadata/md5-cache/sys-apps/hardened-shadow-0.9.2
+++ b/metadata/md5-cache/sys-apps/hardened-shadow-0.9.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=sys-libs/pam !sys-apps/shadow >=sys-auth/pambase-20120417
 SLOT=0
 SRC_URI=https://hardened-shadow.googlecode.com/files/hardened-shadow-0.9.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=450cbcef5910eb8cf6489b02f81d76ab
diff --git a/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0 b/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
index 9a5d7ff910a0..9fe05f5e1584 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-4.6.0.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hponcfg-4.6.0-0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hponcfg-4.6.0-0.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=6fa45d35789eadd1f05d0c6ed48b59b5
diff --git a/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0 b/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
index 4b5fe729216b..4d2187531f70 100644
--- a/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
+++ b/metadata/md5-cache/sys-apps/hponcfg-5.4.0.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 )
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/7/x86_64/current/hponcfg-5.4.0-0.x86_64.rpm )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	rpm	b03b38188e1e83766244d2046785d562
 _md5_=c882ad1cb96339931b4761d6aa377d99
diff --git a/metadata/md5-cache/sys-apps/hwinfo-21.23 b/metadata/md5-cache/sys-apps/hwinfo-21.23
index 785e8789f2c8..a2695c339344 100644
--- a/metadata/md5-cache/sys-apps/hwinfo-21.23
+++ b/metadata/md5-cache/sys-apps/hwinfo-21.23
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu )
 SLOT=0
 SRC_URI=http://download.opensuse.org/source/factory/repo/oss/suse/src/hwinfo-21.23-1.2.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb5431f4efc72dfa26164dc43584b963
diff --git a/metadata/md5-cache/sys-apps/hwinfo-21.4 b/metadata/md5-cache/sys-apps/hwinfo-21.4
index c645995372cd..6ddd0728a28c 100644
--- a/metadata/md5-cache/sys-apps/hwinfo-21.4
+++ b/metadata/md5-cache/sys-apps/hwinfo-21.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=amd64? ( dev-libs/libx86emu ) x86? ( dev-libs/libx86emu )
 SLOT=0
 SRC_URI=http://download.opensuse.org/source/factory/repo/oss/suse/src/hwinfo-21.4-1.1.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3691c4e0acdd276bae0ce2b4acf70a35
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.0 b/metadata/md5-cache/sys-apps/i2c-tools-4.0
index 6d1bceca23a0..3e5207c84704 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=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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=388ae8cfb68a6f733d9797d9ccdbf8e5
diff --git a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1 b/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
index e264db445410..a7a46cbb0ba2 100644
--- a/metadata/md5-cache/sys-apps/i2c-tools-4.1-r1
+++ b/metadata/md5-cache/sys-apps/i2c-tools-4.1-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_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/utils/i2c-tools/i2c-tools-4.1.tar.xz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7b1d2cad60d63a6c5f55c9ebbb23636f
diff --git a/metadata/md5-cache/sys-apps/iproute2-4.19.0-r1 b/metadata/md5-cache/sys-apps/iproute2-4.19.0-r1
index d3ba838df965..bf9edc82e269 100644
--- a/metadata/md5-cache/sys-apps/iproute2-4.19.0-r1
+++ b/metadata/md5-cache/sys-apps/iproute2-4.19.0-r1
@@ -10,4 +10,4 @@ RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl ) caps? ( sys-libs/libcap ) e
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-4.19.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=124a00797a1301dee7ee57db937fd797
+_md5_=1f079a8a36f55376cd36083dbe0f8fd7
diff --git a/metadata/md5-cache/sys-apps/kcheck-0.0.2 b/metadata/md5-cache/sys-apps/kcheck-0.0.2
index 3ce5ca96bcb8..8461c742e4ca 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_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=387c287998ff1d1fd5261825da165431
diff --git a/metadata/md5-cache/sys-apps/kcheck-9999 b/metadata/md5-cache/sys-apps/kcheck-9999
index c967c5f41dca..7f9fa8f32f61 100644
--- a/metadata/md5-cache/sys-apps/kcheck-9999
+++ b/metadata/md5-cache/sys-apps/kcheck-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/configargparse[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=387c287998ff1d1fd5261825da165431
diff --git a/metadata/md5-cache/sys-apps/lcdsplash-0.3 b/metadata/md5-cache/sys-apps/lcdsplash-0.3
index 89961940155b..4c2a836d7d2c 100644
--- a/metadata/md5-cache/sys-apps/lcdsplash-0.3
+++ b/metadata/md5-cache/sys-apps/lcdsplash-0.3
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=splash Gentoo boot information on LCD's
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=hppa ~mips x86
 LICENSE=GPL-2
 RDEPEND=mips? ( sys-apps/lcdutils )
 SLOT=0
 SRC_URI=mirror://gentoo/lcdsplash-0.3.tar.bz2 https://dev.gentoo.org/~vapier/dist/lcdsplash-0.3.tar.bz2
-_md5_=e4016a9d2433471f7308db6048287dd6
+_md5_=4b77f780e5a6e9efdaf2568e131d4c60
diff --git a/metadata/md5-cache/sys-apps/lcdtest-1.18 b/metadata/md5-cache/sys-apps/lcdtest-1.18
index 01d1423205e2..c576b2cf00ee 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2868fafe721490d7e4e45a8675d9580c
diff --git a/metadata/md5-cache/sys-apps/lm-sensors-3.5.0_p20190505 b/metadata/md5-cache/sys-apps/lm-sensors-3.5.0_p20190505
index c9e6727e6eb0..3d7c42ac0157 100644
--- a/metadata/md5-cache/sys-apps/lm-sensors-3.5.0_p20190505
+++ b/metadata/md5-cache/sys-apps/lm-sensors-3.5.0_p20190505
@@ -11,4 +11,4 @@ RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-app
 SLOT=0/5.0.0
 SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/2c8cca3d6cd60121b401734c1a24cfec7daed4fc.tar.gz -> lm-sensors-3.5.0_p20190505.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=38007c55f570c163d6be30e3504c0e0f
+_md5_=9263646af5cc5f9a26dcffe192e88bae
diff --git a/metadata/md5-cache/sys-apps/lm-sensors-3.6.0 b/metadata/md5-cache/sys-apps/lm-sensors-3.6.0
index 4b51cf495378..35d2b2641379 100644
--- a/metadata/md5-cache/sys-apps/lm-sensors-3.6.0
+++ b/metadata/md5-cache/sys-apps/lm-sensors-3.6.0
@@ -11,4 +11,4 @@ RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl !<sys-app
 SLOT=0/5.0.0
 SRC_URI=https://github.com/lm-sensors/lm-sensors/archive/V3-6-0.tar.gz -> lm-sensors-3.6.0.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=38007c55f570c163d6be30e3504c0e0f
+_md5_=9263646af5cc5f9a26dcffe192e88bae
diff --git a/metadata/md5-cache/sys-apps/man-1.6g-r1 b/metadata/md5-cache/sys-apps/man-1.6g-r1
index ccb20604fc51..f7b96efdcbde 100644
--- a/metadata/md5-cache/sys-apps/man-1.6g-r1
+++ b/metadata/md5-cache/sys-apps/man-1.6g-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/groff-1.19.2-r1 !sys-apps/man-db !<app-arch/lzma-4.63 lzma? ( app-arch/xz-utils ) selinux? ( sec-policy/selinux-makewhatis )
 SLOT=0
 SRC_URI=http://primates.ximian.com/~flucifredi/man/man-1.6g.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cb568626e0feaf660ddfeb004954bbac
diff --git a/metadata/md5-cache/sys-apps/man-db-2.7.6.1-r2 b/metadata/md5-cache/sys-apps/man-db-2.7.6.1-r2
index 90aeac3a2654..952304bcb61f 100644
--- a/metadata/md5-cache/sys-apps/man-db-2.7.6.1-r2
+++ b/metadata/md5-cache/sys-apps/man-db-2.7.6.1-r2
@@ -10,5 +10,5 @@ PDEPEND=manpager? ( app-text/manpager )
 RDEPEND=>=dev-libs/libpipeline-1.4.0 berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) sys-apps/groff zlib? ( sys-libs/zlib ) !sys-apps/man selinux? ( sec-policy/selinux-mandb )
 SLOT=0
 SRC_URI=mirror://nongnu/man-db/man-db-2.7.6.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=26154db94fe7a98908003b0c46983019
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.03 b/metadata/md5-cache/sys-apps/man-pages-5.03
deleted file mode 100644
index 6782ef0fceb9..000000000000
--- a/metadata/md5-cache/sys-apps/man-pages-5.03
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DESCRIPTION=A somewhat comprehensive collection of Linux man pages
-EAPI=7
-HOMEPAGE=https://www.kernel.org/doc/man-pages/
-IUSE=nls l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_zh-CN
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=man-pages GPL-2+ BSD
-PDEPEND=nls? ( l10n_de? ( app-i18n/man-pages-de ) l10n_fr? ( app-i18n/man-pages-fr ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-nl ) l10n_pl? ( app-i18n/man-pages-pl ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
-RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<sys-apps/attr-2.4.47-r2 !<dev-libs/libaio-0.3.109-r2 !<dev-libs/libbsd-0.8.3-r1
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.03.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.03.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=4f60af0a6d82abcd401807be0f2189a5
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.04 b/metadata/md5-cache/sys-apps/man-pages-5.04
index 52ddb4101b2c..90709e9f75e0 100644
--- a/metadata/md5-cache/sys-apps/man-pages-5.04
+++ b/metadata/md5-cache/sys-apps/man-pages-5.04
@@ -3,11 +3,11 @@ DESCRIPTION=A somewhat comprehensive collection of Linux man pages
 EAPI=7
 HOMEPAGE=https://www.kernel.org/doc/man-pages/
 IUSE=nls l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_zh-CN
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=man-pages GPL-2+ BSD
 PDEPEND=nls? ( l10n_de? ( app-i18n/man-pages-de ) l10n_fr? ( app-i18n/man-pages-fr ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-nl ) l10n_pl? ( app-i18n/man-pages-pl ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
 RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<sys-apps/attr-2.4.47-r2 !<dev-libs/libaio-0.3.109-r2 !<dev-libs/libbsd-0.8.3-r1
 RESTRICT=binchecks
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.04.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.04.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=79b9ba350a8db0c9c118e8b328e43cca
+_md5_=4f60af0a6d82abcd401807be0f2189a5
diff --git a/metadata/md5-cache/sys-apps/man-pages-5.05 b/metadata/md5-cache/sys-apps/man-pages-5.05
new file mode 100644
index 000000000000..640a4ea480d9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/man-pages-5.05
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=A somewhat comprehensive collection of Linux man pages
+EAPI=7
+HOMEPAGE=https://www.kernel.org/doc/man-pages/
+IUSE=nls l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_zh-CN
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=man-pages GPL-2+ BSD
+PDEPEND=nls? ( l10n_de? ( app-i18n/man-pages-de ) l10n_fr? ( app-i18n/man-pages-fr ) l10n_it? ( app-i18n/man-pages-it ) l10n_ja? ( app-i18n/man-pages-ja ) l10n_nl? ( app-i18n/man-pages-nl ) l10n_pl? ( app-i18n/man-pages-pl ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
+RDEPEND=virtual/man !<sys-apps/keyutils-1.5.9-r4 !<sys-apps/attr-2.4.47-r2 !<dev-libs/libaio-0.3.109-r2 !<dev-libs/libbsd-0.8.3-r1
+RESTRICT=binchecks
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/docs/man-pages/Archive/man-pages-5.05.tar.xz https://www.kernel.org/pub/linux/docs/man-pages/man-pages-5.05.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=79b9ba350a8db0c9c118e8b328e43cca
diff --git a/metadata/md5-cache/sys-apps/memtester-4.3.0 b/metadata/md5-cache/sys-apps/memtester-4.3.0
index e674d03ac27f..c49737d72b83 100644
--- a/metadata/md5-cache/sys-apps/memtester-4.3.0
+++ b/metadata/md5-cache/sys-apps/memtester-4.3.0
@@ -1,10 +1,10 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=userspace utility for testing the memory subsystem for faults
-EAPI=4
+EAPI=7
 HOMEPAGE=http://pyropus.ca/software/memtester/
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://pyropus.ca/software/memtester/memtester-4.3.0.tar.gz http://pyropus.ca/software/memtester/old-versions/memtester-4.3.0.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=983297c4b3316673b66a2c689daeb00f
+_md5_=1197ffe43eb83b2266aac61103314b5a
diff --git a/metadata/md5-cache/sys-apps/miscfiles-1.5-r3 b/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
index 62a1df544985..7b75212d126b 100644
--- a/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
+++ b/metadata/md5-cache/sys-apps/miscfiles-1.5-r3
@@ -8,4 +8,4 @@ LICENSE=GPL-2 unicode
 RDEPEND=!<sys-freebsd/freebsd-share-7.2-r1
 SLOT=0
 SRC_URI=mirror://gnu/miscfiles/miscfiles-1.5.tar.gz https://dev.gentoo.org/~whissi/dist/miscfiles/UnicodeData-10.0.0.txt.xz
-_md5_=ba07ee0d53681fe0ec5c2177154c6945
+_md5_=a5c4886e4f189b0c489ad89eed4cbd54
diff --git a/metadata/md5-cache/sys-apps/mlocate-0.26-r2 b/metadata/md5-cache/sys-apps/mlocate-0.26-r2
index 51b3b15bb542..e2be82852a9c 100644
--- a/metadata/md5-cache/sys-apps/mlocate-0.26-r2
+++ b/metadata/md5-cache/sys-apps/mlocate-0.26-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-apps/slocate !sys-apps/rlocate selinux? ( sec-policy/selinux-slocate )
 SLOT=0
 SRC_URI=http://releases.pagure.org/mlocate/mlocate-0.26.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d951bc6edad2d765643d8b498f9c4d7
diff --git a/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1 b/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
index 49eb42671d52..4056be110d2c 100644
--- a/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
+++ b/metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124-r1
@@ -7,5 +7,5 @@ LICENSE=newrelic Apache-2.0 MIT ISC openssl GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://download.newrelic.com/server_monitor/archive/1.1.2.124/newrelic-sysmond-1.1.2.124-linux.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0cb671061e919a743debd7f1cf6267e2
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.5 b/metadata/md5-cache/sys-apps/opal-utils-6.5
index a70ee79c196e..71797d5eeb4c 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.5
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.5
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) virtual/pkgconfig
+BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup
 DESCRIPTION=OPAL firmware utilities
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.5.tar.gz -> opal-utils-6.5.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9fa9067b4fd8cee1c23f49528b4d7bd0
+_md5_=bfc6369f9145c6fdc8c84eb2dfa2453f
diff --git a/metadata/md5-cache/sys-apps/opal-utils-6.5.2 b/metadata/md5-cache/sys-apps/opal-utils-6.5.2
index ec2695f38b31..dfbf0f10836f 100644
--- a/metadata/md5-cache/sys-apps/opal-utils-6.5.2
+++ b/metadata/md5-cache/sys-apps/opal-utils-6.5.2
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) virtual/pkgconfig
+BDEPEND=doc? ( || ( ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup
 DESCRIPTION=OPAL firmware utilities
 EAPI=7
@@ -9,4 +9,4 @@ LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/open-power/skiboot/archive/v6.5.2.tar.gz -> opal-utils-6.5.2.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9fa9067b4fd8cee1c23f49528b4d7bd0
+_md5_=bfc6369f9145c6fdc8c84eb2dfa2453f
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.5.6-r1 b/metadata/md5-cache/sys-apps/pciutils-3.5.6-r1
index 28028826c5e2..035cdcd6a50e 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.5.6-r1
+++ b/metadata/md5-cache/sys-apps/pciutils-3.5.6-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kmod? ( virtual/pkgconfig )
 DESCRIPTION=Various utilities dealing with the PCI bus
 EAPI=6
-HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
+HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
 IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwids
 SLOT=0
-SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.5.6.tar.gz
+SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.5.6.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f1c84e0546e994247cace88d51d78d3
+_md5_=ffd320068e8d6d13cb1fc208a80edfcf
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.6.2-r1 b/metadata/md5-cache/sys-apps/pciutils-3.6.2-r1
index 3e8ed97928ee..9c641f4f4574 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.6.2-r1
+++ b/metadata/md5-cache/sys-apps/pciutils-3.6.2-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kmod? ( virtual/pkgconfig )
 DESCRIPTION=Various utilities dealing with the PCI bus
 EAPI=6
-HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
+HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
 IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwids
 SLOT=0
-SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.6.2.tar.gz
+SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.6.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37b8ebdb78214e5ba6ed84d4348f2cc6
+_md5_=de2a8bfddeace87d6e05b30f870b96ba
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.6.3 b/metadata/md5-cache/sys-apps/pciutils-3.6.3
index e7eb3ccfea71..7559943cdade 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.6.3
+++ b/metadata/md5-cache/sys-apps/pciutils-3.6.3
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kmod? ( virtual/pkgconfig )
 DESCRIPTION=Various utilities dealing with the PCI bus
 EAPI=7
-HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
+HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
 IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwids
 SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/snapshot/pciutils-3.6.3.tar.gz
+SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.6.3.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8a46c612c8830b02f70bb1b43d59dc57
+_md5_=0df63dcbcb07f0b793e5145adfe2cfa7
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.6.4 b/metadata/md5-cache/sys-apps/pciutils-3.6.4
index dffd0098d033..d1a1acd3ea70 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.6.4
+++ b/metadata/md5-cache/sys-apps/pciutils-3.6.4
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) kmod? ( virtual/pkgconfig )
 DESCRIPTION=Various utilities dealing with the PCI bus
 EAPI=7
-HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
+HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
 IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=GPL-2
 RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[static-libs(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !static-libs? ( 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwids
 SLOT=0
-SRC_URI=https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/snapshot/pciutils-3.6.4.tar.gz
+SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.6.4.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8a46c612c8830b02f70bb1b43d59dc57
+_md5_=0df63dcbcb07f0b793e5145adfe2cfa7
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.25-r1 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.25-r1
index 5d961de2e0de..6d94b7bfa32c 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.25-r1
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.25-r1
@@ -4,12 +4,12 @@ DEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-au
 DESCRIPTION=PC/SC Architecture smartcard middleware library
 EAPI=7
 HOMEPAGE=https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC
-IUSE=libusb policykit selinux systemd +udev python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=libusb policykit selinux systemd +udev python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) selinux? ( sec-policy/selinux-pcscd )
-REQUIRED_USE=^^ ( udev libusb ) ^^ ( 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 )
+REQUIRED_USE=^^ ( udev libusb ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.8.25.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=575ef46818daebb1f7dc3d565a094966
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.26 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.26
index 458df3a814b1..af8c881bb271 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.26
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.26
@@ -4,12 +4,12 @@ DEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-au
 DESCRIPTION=PC/SC Architecture smartcard middleware library
 EAPI=7
 HOMEPAGE=https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC
-IUSE=doc embedded libusb policykit selinux systemd +udev python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc embedded libusb policykit selinux systemd +udev python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) selinux? ( sec-policy/selinux-pcscd )
-REQUIRED_USE=^^ ( udev libusb ) ^^ ( 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 )
+REQUIRED_USE=^^ ( udev libusb ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.8.26.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=038dc5596e1a7b767fad9e21f8fd189c
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.11 b/metadata/md5-cache/sys-apps/pkgcore-0.10.11
index 7fe020718885..3736e3a70355 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.11
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf71435535df0873c2d72eb443ea12dd
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.9 b/metadata/md5-cache/sys-apps/pkgcore-0.10.9
index 5054bb777e55..ad6b4084cf68 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.9
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c0b4de61641959eb254be2d423ae002e
diff --git a/metadata/md5-cache/sys-apps/pkgcore-9999 b/metadata/md5-cache/sys-apps/pkgcore-9999
index c87c35c265fc..29f31ec8851f 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-9999
+++ b/metadata/md5-cache/sys-apps/pkgcore-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bf71435535df0873c2d72eb443ea12dd
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.69 b/metadata/md5-cache/sys-apps/portage-2.3.69
index b28bc8479a27..975e6296b859 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.69
+++ b/metadata/md5-cache/sys-apps/portage-2.3.69
@@ -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_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.69.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.69.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3589c92b2117f7b383dc2246e05047ae
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.79 b/metadata/md5-cache/sys-apps/portage-2.3.79
index a870cffc2dbf..1325ac1b6931 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.79
+++ b/metadata/md5-cache/sys-apps/portage-2.3.79
@@ -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_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.79.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.79.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c2d2f747e153e4fecd683bb3f5ab4acb
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.84-r1 b/metadata/md5-cache/sys-apps/portage-2.3.84-r1
index a8d53eb3613f..6db037aa65fe 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.84-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.84-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_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.84.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.84.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8bd40698b91ed821d0d56ac19ab0bb9b
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.85-r1 b/metadata/md5-cache/sys-apps/portage-2.3.85-r1
index 02da10aac75b..9d1105b5d4a3 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.85-r1
+++ b/metadata/md5-cache/sys-apps/portage-2.3.85-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_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.85.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.85.tar.bz2 https://github.com/gentoo/portage/commit/27d653052549e5d1880ab68be12f3b82857506fe.patch -> portage-2.3.85-bug-706186.patch
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da015feb1eae76bd14491a43c72afdd2
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.86 b/metadata/md5-cache/sys-apps/portage-2.3.86
index 8de8f2ef3f14..7746748578ca 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.86
+++ b/metadata/md5-cache/sys-apps/portage-2.3.86
@@ -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_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.86.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.86.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a0fc1afe0383839ff304d2451a42dd80
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.87 b/metadata/md5-cache/sys-apps/portage-2.3.87
index 791f687777f9..913bf3b9f55a 100644
--- a/metadata/md5-cache/sys-apps/portage-2.3.87
+++ b/metadata/md5-cache/sys-apps/portage-2.3.87
@@ -11,5 +11,5 @@ RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://gentoo/portage-2.3.87.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.87.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6f1c17e886588c586982fdc4ee63818
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.88 b/metadata/md5-cache/sys-apps/portage-2.3.88
new file mode 100644
index 000000000000..2ef1fcbc93ba
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.88
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) apidoc? ( dev-python/sphinx dev-python/sphinx-epytext ) python_targets_pypy3? ( >=dev-python/pypy3-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+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_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=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 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_python2_7? ( dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 !<app-portage/gentoolkit-0.4.6 !<app-portage/repoman-2.3.10 python_targets_pypy3? ( >=dev-python/pypy3-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.88.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.88.tar.bz2
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=16ef50d277e02527cdc85f39c8e82b90
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 645b51f1aa8b..e9474d836dae 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 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_python2_7? ( dev-python/pyblake2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=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 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_python2_7? ( dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !<app-admin/logrotate-3.8.0 python_targets_pypy3? ( >=dev-python/pypy3-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e736e823baf6b79ab07245a27671b71a
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.39-r1 b/metadata/md5-cache/sys-apps/razercfg-0.39-r1
deleted file mode 100644
index 60776e91e668..000000000000
--- a/metadata/md5-cache/sys-apps/razercfg-0.39-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] virtual/libusb:1 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Utility for advanced configuration of Razer mice
-EAPI=6
-HOMEPAGE=https://bues.ch/cms/hacking/razercfg.html
-IUSE=+pm-utils +udev +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) virtual/libusb:1 pm-utils? ( sys-power/pm-utils ) udev? ( virtual/udev )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f5810b851521adefebccd4d24940fad
diff --git a/metadata/md5-cache/sys-apps/razercfg-0.39-r2 b/metadata/md5-cache/sys-apps/razercfg-0.39-r2
new file mode 100644
index 000000000000..91fe9120e0cd
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/razercfg-0.39-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) virtual/libusb:1 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Utility for advanced configuration of Razer mice
+EAPI=6
+HOMEPAGE=https://bues.ch/cms/hacking/razercfg.html
+IUSE=+pm-utils +udev +python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) virtual/libusb:1 pm-utils? ( sys-power/pm-utils ) udev? ( virtual/udev )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=https://bues.ch/razercfg/razercfg-0.39.tar.bz2
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d4f17fec76bf9009c0556726bda47d79
diff --git a/metadata/md5-cache/sys-apps/renameutils-0.12.0 b/metadata/md5-cache/sys-apps/renameutils-0.12.0
index 5b1487bd7a66..44b16265f125 100644
--- a/metadata/md5-cache/sys-apps/renameutils-0.12.0
+++ b/metadata/md5-cache/sys-apps/renameutils-0.12.0
@@ -1,13 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare
-DEPEND=>=sys-libs/readline-5.0-r2 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/readline:=
 DESCRIPTION=Use your favorite text editor to rename files
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.nongnu.org/renameutils/
 IUSE=nls
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3
-RDEPEND=>=sys-libs/readline-5.0-r2
+RDEPEND=sys-libs/readline:=
 SLOT=0
 SRC_URI=https://savannah.nongnu.org/download/renameutils/renameutils-0.12.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86b58899ebe7038b91bda842d409ed5c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c91cb2d78e88319e0823bb72ec2808ed
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 e0929fb457ac..67d36df0aadd 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 dev-libs/libgudev:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a6e61c664291f4df750fcc9b5ba835c
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0 b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0
index a0ff32f6a812..00972ed63c33 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=dev-libs/libgaminggear-0.15.1 dev-libs/libgudev:= sys-apps/dbus x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 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.9.0.tar.bz2
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6fb5b9482bac4b54fe6517c3b608aaa
diff --git a/metadata/md5-cache/sys-apps/shadow-4.8.1 b/metadata/md5-cache/sys-apps/shadow-4.8.1
deleted file mode 100644
index ce9e288550e8..000000000000
--- a/metadata/md5-cache/sys-apps/shadow-4.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare
-DEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= )
-DESCRIPTION=Utilities to deal with user accounts
-EAPI=7
-HOMEPAGE=https://github.com/shadow-maint/shadow
-IUSE=acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
-SLOT=0
-SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.8.1/shadow-4.8.1.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fc2f7f470f461b552487b9ba0458539d
diff --git a/metadata/md5-cache/sys-apps/shadow-4.8.1-r1 b/metadata/md5-cache/sys-apps/shadow-4.8.1-r1
new file mode 100644
index 000000000000..8aff6fa45a81
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/shadow-4.8.1-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 preinst prepare
+DEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= )
+DESCRIPTION=Utilities to deal with user accounts
+EAPI=7
+HOMEPAGE=https://github.com/shadow-maint/shadow
+IUSE=acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
+SLOT=0
+SRC_URI=https://github.com/shadow-maint/shadow/releases/download/4.8.1/shadow-4.8.1.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=11d384d54db64557ec0356f3f880a888
diff --git a/metadata/md5-cache/sys-apps/smartmontools-7.0-r1 b/metadata/md5-cache/sys-apps/smartmontools-7.0-r1
index 7193a2107f68..8de61ccf4a02 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-7.0-r1
+++ b/metadata/md5-cache/sys-apps/smartmontools-7.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=( caps? ( daemon ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-7.0.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ac7a0c745447a8333563548de722890f
+_md5_=8cdfc75fe38a8b9c928e98111ff2b0d2
diff --git a/metadata/md5-cache/sys-apps/smartmontools-7.1 b/metadata/md5-cache/sys-apps/smartmontools-7.1
index 69b853d92c56..94344d91ea5a 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-7.1
+++ b/metadata/md5-cache/sys-apps/smartmontools-7.1
@@ -11,4 +11,4 @@ REQUIRED_USE=( caps? ( daemon ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-7.1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d19681fb26eb5d2c2559beb67811f6a
+_md5_=74de2133040180ca9caa3c505ca30d53
diff --git a/metadata/md5-cache/sys-apps/smartmontools-9999 b/metadata/md5-cache/sys-apps/smartmontools-9999
index ac99a90a99af..439a48db29bd 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-9999
+++ b/metadata/md5-cache/sys-apps/smartmontools-9999
@@ -10,4 +10,4 @@ RDEPEND=caps? ( static? ( sys-libs/libcap-ng[static-libs] ) !static? ( sys-libs/
 REQUIRED_USE=( caps? ( daemon ) )
 SLOT=0
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	1086a6c20b5a06e9f05f3128525fa694	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d19681fb26eb5d2c2559beb67811f6a
+_md5_=74de2133040180ca9caa3c505ca30d53
diff --git a/metadata/md5-cache/sys-apps/systemd-243-r2 b/metadata/md5-cache/sys-apps/systemd-243-r2
index 28228f264a84..d89a8beb7227 100644
--- a/metadata/md5-cache/sys-apps/systemd-243-r2
+++ b/metadata/md5-cache/sys-apps/systemd-243-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v243/systemd-243.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=2e14af0765d899fa4ca96654b5040193
+_md5_=d1a7d07613dd08441dcf8b69f6461d83
diff --git a/metadata/md5-cache/sys-apps/systemd-244 b/metadata/md5-cache/sys-apps/systemd-244
index 80cb7c169c6b..6297bc116ff4 100644
--- a/metadata/md5-cache/sys-apps/systemd-244
+++ b/metadata/md5-cache/sys-apps/systemd-244
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v244/systemd-244.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=b04547e7a661340ae558008e3973c928
+_md5_=a501c4d4bfc443e3d83be3148df13783
diff --git a/metadata/md5-cache/sys-apps/systemd-244.2 b/metadata/md5-cache/sys-apps/systemd-244.2
new file mode 100644
index 000000000000..dcb0a8ce7551
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-244.2
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v244.2/systemd-stable-244.2.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=d1be4b2588d30224a8a461cb04515bde
diff --git a/metadata/md5-cache/sys-apps/systemd-245_rc1-r1 b/metadata/md5-cache/sys-apps/systemd-245_rc1-r1
new file mode 100644
index 000000000000..608e48ccae3c
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-245_rc1-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) acct-group/adm acct-group/wheel acct-group/kmem acct-group/tty acct-group/utmp acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kvm acct-group/render acct-group/tape acct-group/video acct-group/systemd-journal acct-user/systemd-journal-remote acct-user/systemd-coredump acct-user/systemd-network acct-user/systemd-resolve acct-user/systemd-timesync >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !<sys-kernel/dracut-044 !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd/archive/v245-rc1/systemd-245-rc1.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=88d29a22a957c7e685029f1c6a16c493
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index 035a16afc3de..c1d47126c8b1 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig virtual/pkgconfig
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 sys-devel/m4 virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.8 dev-python/lxml[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/lxml[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
 DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 DESCRIPTION=System and service manager for Linux
@@ -13,4 +13,4 @@ REQUIRED_USE=importd? ( curl gcrypt lzma )
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	10d1eb1da93c5fc17e3814e6923beb57	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	a1771fc1e5831c201eaf18451747d94b	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=317acbc3397901f044a96822b0ff6d27
+_md5_=6f485b7a0dd23fd4b677fb322460f182
diff --git a/metadata/md5-cache/sys-apps/tuned-2.10.0 b/metadata/md5-cache/sys-apps/tuned-2.10.0
deleted file mode 100644
index 3a6e64d849ae..000000000000
--- a/metadata/md5-cache/sys-apps/tuned-2.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/python-linux-procfs[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/pkgconfig
-DESCRIPTION=Daemon for monitoring and adaptive tuning of system devices
-EAPI=6
-HOMEPAGE=https://fedorahosted.org/tuned/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/decorator[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/python-linux-procfs[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-apps/dbus sys-apps/ethtool sys-power/powertop sys-process/procps dev-util/systemtap
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/redhat-performance/tuned/archive/v2.10.0.tar.gz -> tuned-2.10.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=37260753f1335792bf0d6ef841f12565
diff --git a/metadata/md5-cache/sys-apps/tuned-2.13.0 b/metadata/md5-cache/sys-apps/tuned-2.13.0
deleted file mode 100644
index 2433eddcbab3..000000000000
--- a/metadata/md5-cache/sys-apps/tuned-2.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyudev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-linux-procfs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?]
-DESCRIPTION=Daemon for monitoring and adaptive tuning of system devices
-EAPI=7
-HOMEPAGE=https://github.com/redhat-performance/tuned
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-python/configobj[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/decorator[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyudev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-linux-procfs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] sys-apps/dbus sys-apps/ethtool sys-power/powertop dev-util/systemtap
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/redhat-performance/tuned/archive/v2.13.0.tar.gz -> tuned-2.13.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d6f19b7ec790e902ced851a52f1e481
diff --git a/metadata/md5-cache/sys-apps/tuned-2.13.0-r1 b/metadata/md5-cache/sys-apps/tuned-2.13.0-r1
new file mode 100644
index 000000000000..6b48f69545c5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/tuned-2.13.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/configobj[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] dev-python/pyudev[python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/python-linux-procfs[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/configobj[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] dev-python/pyudev[python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/python-linux-procfs[python_targets_python3_7(-)] )
+DESCRIPTION=Daemon for monitoring and adaptive tuning of system devices
+EAPI=7
+HOMEPAGE=https://github.com/redhat-performance/tuned
+IUSE=python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( dev-python/configobj[python_targets_python3_6(-)] dev-python/decorator[python_targets_python3_6(-)] dev-python/pyudev[python_targets_python3_6(-)] dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/python-linux-procfs[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/configobj[python_targets_python3_7(-)] dev-python/decorator[python_targets_python3_7(-)] dev-python/pyudev[python_targets_python3_7(-)] dev-python/dbus-python[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/python-linux-procfs[python_targets_python3_7(-)] ) sys-apps/dbus sys-apps/ethtool sys-power/powertop dev-util/systemtap
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/redhat-performance/tuned/archive/v2.13.0.tar.gz -> tuned-2.13.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2204581f04c5ec30ecdbb1232641433
diff --git a/metadata/md5-cache/sys-apps/usbutils-009 b/metadata/md5-cache/sys-apps/usbutils-009
index 3e70dddc30ca..72050afbdb8e 100644
--- a/metadata/md5-cache/sys-apps/usbutils-009
+++ b/metadata/md5-cache/sys-apps/usbutils-009
@@ -3,12 +3,12 @@ DEPEND=virtual/libusb:1= virtual/libudev:= app-arch/xz-utils virtual/pkgconfig
 DESCRIPTION=USB enumeration utilities
 EAPI=6
 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 +python_single_target_python2_7
+IUSE=python +python_single_target_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_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-009.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9897270bc159d03f427939c53b0b7084
diff --git a/metadata/md5-cache/sys-apps/usbutils-010-r1 b/metadata/md5-cache/sys-apps/usbutils-010-r1
index ece0d4872c98..88ef0d8f26fe 100644
--- a/metadata/md5-cache/sys-apps/usbutils-010-r1
+++ b/metadata/md5-cache/sys-apps/usbutils-010-r1
@@ -3,12 +3,12 @@ DEPEND=virtual/libusb:1= virtual/libudev:= app-arch/xz-utils virtual/pkgconfig
 DESCRIPTION=USB enumeration utilities
 EAPI=6
 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_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python python_single_target_python3_6 python_single_target_python3_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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-010.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=125aecd02ca066706cb0efd3dbbe4dc0
diff --git a/metadata/md5-cache/sys-apps/usbutils-012 b/metadata/md5-cache/sys-apps/usbutils-012
index b0391556fd65..5da208c7a613 100644
--- a/metadata/md5-cache/sys-apps/usbutils-012
+++ b/metadata/md5-cache/sys-apps/usbutils-012
@@ -4,12 +4,12 @@ DEPEND=virtual/libusb:1= virtual/libudev:=
 DESCRIPTION=USB enumeration utilities
 EAPI=7
 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_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python python_single_target_python3_6 python_single_target_python3_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_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-012.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6bc4c3bca49d82085a4eacb2617cd7fa
diff --git a/metadata/md5-cache/sys-apps/utempter-0.5.5.6 b/metadata/md5-cache/sys-apps/utempter-0.5.5.6
index 506e4e615c45..f4c5994343f9 100644
--- a/metadata/md5-cache/sys-apps/utempter-0.5.5.6
+++ b/metadata/md5-cache/sys-apps/utempter-0.5.5.6
@@ -8,5 +8,5 @@ LICENSE=|| ( MIT LGPL-2 )
 RDEPEND=!sys-libs/libutempter !dev-python/utmp
 SLOT=0
 SRC_URI=mirror://gentoo/utempter-0.5.5-6.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1c7cf4ffebf85139525300f26056bf75
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index f659397c7d62..b9075e516da5 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.4 b/metadata/md5-cache/sys-auth/authenticator-0.2.4
deleted file mode 100644
index 56ff1abe6861..000000000000
--- a/metadata/md5-cache/sys-auth/authenticator-0.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyotp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-gnupg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyzbar[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/gd x11-libs/gtk+:3 test? ( x11-apps/xhost ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Two-factor authentication code generator for GNOME
-EAPI=6
-HOMEPAGE=https://gitlab.gnome.org/World/Authenticator
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyotp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-gnupg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyzbar[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/gd x11-libs/gtk+:3
-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 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/World/Authenticator/-/archive/0.2.4/Authenticator-0.2.4.tar.gz -> authenticator-0.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c57f8870dd99bf133943eabf03ce7d03
diff --git a/metadata/md5-cache/sys-auth/authenticator-0.2.4-r1 b/metadata/md5-cache/sys-auth/authenticator-0.2.4-r1
new file mode 100644
index 000000000000..c06deff9fb5b
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/authenticator-0.2.4-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyotp[python_targets_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)] dev-python/pyzbar[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyotp[python_targets_python3_7(-)] dev-python/python-gnupg[python_targets_python3_7(-)] dev-python/pyzbar[python_targets_python3_7(-)] ) media-libs/gd x11-libs/gtk+:3 test? ( x11-apps/xhost ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Two-factor authentication code generator for GNOME
+EAPI=6
+HOMEPAGE=https://gitlab.gnome.org/World/Authenticator
+IUSE=test python_single_target_python3_6 python_single_target_python3_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyotp[python_targets_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)] dev-python/pyzbar[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyotp[python_targets_python3_7(-)] dev-python/python-gnupg[python_targets_python3_7(-)] dev-python/pyzbar[python_targets_python3_7(-)] ) media-libs/gd x11-libs/gtk+:3
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://gitlab.gnome.org/World/Authenticator/-/archive/0.2.4/Authenticator-0.2.4.tar.gz -> authenticator-0.2.4.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d750c676887fa5ad115d8b9d1d5c68c3
diff --git a/metadata/md5-cache/sys-auth/authenticator-9999 b/metadata/md5-cache/sys-auth/authenticator-9999
index b43da6c7f453..e1e1dc2f7d8d 100644
--- a/metadata/md5-cache/sys-auth/authenticator-9999
+++ b/metadata/md5-cache/sys-auth/authenticator-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyotp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-gnupg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyzbar[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/gd x11-libs/gtk+:3 test? ( x11-apps/xhost ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyotp[python_targets_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)] dev-python/pyzbar[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyotp[python_targets_python3_7(-)] dev-python/python-gnupg[python_targets_python3_7(-)] dev-python/pyzbar[python_targets_python3_7(-)] ) media-libs/gd x11-libs/gtk+:3 test? ( x11-apps/xhost ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=Two-factor authentication code generator for GNOME
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/World/Authenticator
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 test
+IUSE=test python_single_target_python3_6 python_single_target_python3_7 test
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyotp[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/python-gnupg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/pyzbar[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] media-libs/gd x11-libs/gtk+:3
-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 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-crypt/libsecret python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyotp[python_targets_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)] dev-python/pyzbar[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyotp[python_targets_python3_7(-)] dev-python/python-gnupg[python_targets_python3_7(-)] dev-python/pyzbar[python_targets_python3_7(-)] ) media-libs/gd x11-libs/gtk+:3
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41913f91c7fc96dca0edc071579a384c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ddae64b17c7fa4bb69d5ccf317fcba51
diff --git a/metadata/md5-cache/sys-auth/docker_auth-1.3.1 b/metadata/md5-cache/sys-auth/docker_auth-1.3.1
index 8611c4ff6011..3859a05b0e3d 100644
--- a/metadata/md5-cache/sys-auth/docker_auth-1.3.1
+++ b/metadata/md5-cache/sys-auth/docker_auth-1.3.1
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT ZLIB
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cesanta/docker_auth/archive/1.3.1.tar.gz -> docker_auth-1.3.1.tar.gz https://github.com/dchest/uniuri/archive/8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz -> github.com-dchest-uniuri-8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz https://github.com/deckarep/golang-set/archive/fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz -> github.com-deckarep-golang-set-fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz https://github.com/docker/distribution/archive/0700fa570d7bcc1b3e46ee127c4489fd25f4daa3.tar.gz -> github.com-docker-distribution-0700fa570d7bcc1b3e46ee127c4489fd25f4daa3.tar.gz https://github.com/docker/libtrust/archive/aabc10ec26b754e797f9028f4589c5b7bd90dc20.tar.gz -> github.com-docker-libtrust-aabc10ec26b754e797f9028f4589c5b7bd90dc20.tar.gz https://github.com/facebookgo/httpdown/archive/a3b1354551a26449fbe05f5d855937f6e7acbd71.tar.gz -> github.com-facebookgo-httpdown-a3b1354551a26449fbe05f5d855937f6e7acbd71.tar.gz https://github.com/facebookgo/clock/archive/600d898af40aa09a7a93ecb9265d87b0504b6f03.tar.gz -> github.com-facebookgo-clock-600d898af40aa09a7a93ecb9265d87b0504b6f03.tar.gz https://github.com/facebookgo/stats/archive/1b76add642e42c6ffba7211ad7b3939ce654526e.tar.gz -> github.com-facebookgo-stats-1b76add642e42c6ffba7211ad7b3939ce654526e.tar.gz https://github.com/go-ldap/ldap/archive/13cedcf58a1ea124045dea529a66c849d3444c8e.tar.gz -> github.com-go-ldap-ldap-13cedcf58a1ea124045dea529a66c849d3444c8e.tar.gz https://github.com/cesanta/glog/archive/22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz -> github.com-cesanta-glog-22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz https://github.com/schwarmco/go-cartesian-product/archive/c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz -> github.com-schwarmco-go-cartesian-product-c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz https://github.com/syndtr/goleveldb/archive/3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz -> github.com-syndtr-goleveldb-3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz https://github.com/golang/snappy/archive/553a641470496b2327abcac10b36396bd98e45c9.tar.gz -> github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz -> github.com-go-asn1-ber-asn1-ber-4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/go-mgo/mgo/archive/3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz -> github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz https://github.com/go-yaml/yaml/archive/a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz -> github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz https://github.com/golang/crypto/archive/e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz -> github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz https://github.com/golang/sys/archive/493114f68206f85e7e333beccfabc11e98cba8dd.tar.gz -> github.com-golang-sys-493114f68206f85e7e333beccfabc11e98cba8dd.tar.gz https://github.com/golang/net/archive/859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz -> github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz https://github.com/google/google-api-go-client/archive/39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz -> github.com-google-google-api-go-client-39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz https://github.com/grpc/grpc-go/archive/35170916ff58e89ae03f52e778228e18207e0e02.tar.gz -> github.com-grpc-grpc-go-35170916ff58e89ae03f52e778228e18207e0e02.tar.gz https://github.com/golang/protobuf/archive/11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz -> github.com-golang-protobuf-11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz https://github.com/golang/oauth2/archive/13449ad91cb26cb47661c1b080790392170385fd.tar.gz -> github.com-golang-oauth2-13449ad91cb26cb47661c1b080790392170385fd.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/20d4028b8a750c2aca76bf9fefa8ed2d0109b573.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-20d4028b8a750c2aca76bf9fefa8ed2d0109b573.tar.gz https://github.com/golang/text/archive/ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49.tar.gz -> github.com-golang-text-ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49.tar.gz https://github.com/googleapis/gax-go/archive/8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.gz -> github.com-googleapis-gax-go-8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.gz https://github.com/google/go-genproto/archive/595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz -> github.com-google-go-genproto-595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=31ddcd299a15df6d1c5d171cc58bc14d
diff --git a/metadata/md5-cache/sys-auth/docker_auth-1.4.0 b/metadata/md5-cache/sys-auth/docker_auth-1.4.0
index 51d1f7caba84..18688fb2770c 100644
--- a/metadata/md5-cache/sys-auth/docker_auth-1.4.0
+++ b/metadata/md5-cache/sys-auth/docker_auth-1.4.0
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0 BSD BSD-2 LGPL-3 MIT ZLIB
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cesanta/docker_auth/archive/1.4.0.tar.gz -> docker_auth-1.4.0.tar.gz https://github.com/dchest/uniuri/archive/8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz -> github.com-dchest-uniuri-8902c56451e9b58ff940bbe5fec35d5f9c04584a.tar.gz https://github.com/deckarep/golang-set/archive/fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz -> github.com-deckarep-golang-set-fc8930a5e645572ee00bf66358ed3414f3c13b90.tar.gz https://github.com/docker/distribution/archive/0700fa570d7bcc1b3e46ee127c4489fd25f4daa3.tar.gz -> github.com-docker-distribution-0700fa570d7bcc1b3e46ee127c4489fd25f4daa3.tar.gz https://github.com/docker/libtrust/archive/aabc10ec26b754e797f9028f4589c5b7bd90dc20.tar.gz -> github.com-docker-libtrust-aabc10ec26b754e797f9028f4589c5b7bd90dc20.tar.gz https://github.com/facebookgo/httpdown/archive/a3b1354551a26449fbe05f5d855937f6e7acbd71.tar.gz -> github.com-facebookgo-httpdown-a3b1354551a26449fbe05f5d855937f6e7acbd71.tar.gz https://github.com/facebookgo/clock/archive/600d898af40aa09a7a93ecb9265d87b0504b6f03.tar.gz -> github.com-facebookgo-clock-600d898af40aa09a7a93ecb9265d87b0504b6f03.tar.gz https://github.com/facebookgo/stats/archive/1b76add642e42c6ffba7211ad7b3939ce654526e.tar.gz -> github.com-facebookgo-stats-1b76add642e42c6ffba7211ad7b3939ce654526e.tar.gz https://github.com/go-ldap/ldap/archive/13cedcf58a1ea124045dea529a66c849d3444c8e.tar.gz -> github.com-go-ldap-ldap-13cedcf58a1ea124045dea529a66c849d3444c8e.tar.gz https://github.com/cesanta/glog/archive/22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz -> github.com-cesanta-glog-22eb27a0ae192b290b25537b8e876556fc25129c.tar.gz https://github.com/schwarmco/go-cartesian-product/archive/c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz -> github.com-schwarmco-go-cartesian-product-c2c0aca869a6cbf51e017ce148b949d9dee09bc3.tar.gz https://github.com/syndtr/goleveldb/archive/3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz -> github.com-syndtr-goleveldb-3c5717caf1475fd25964109a0fc640bd150fce43.tar.gz https://github.com/golang/snappy/archive/553a641470496b2327abcac10b36396bd98e45c9.tar.gz -> github.com-golang-snappy-553a641470496b2327abcac10b36396bd98e45c9.tar.gz https://github.com/go-asn1-ber/asn1-ber/archive/4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz -> github.com-go-asn1-ber-asn1-ber-4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz https://github.com/fsnotify/fsnotify/archive/629574ca2a5df945712d3079857300b5e4da0236.tar.gz -> github.com-fsnotify-fsnotify-629574ca2a5df945712d3079857300b5e4da0236.tar.gz https://github.com/go-mgo/mgo/archive/3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz -> github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz https://github.com/go-yaml/yaml/archive/a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz -> github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz https://github.com/golang/crypto/archive/e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz -> github.com-golang-crypto-e1a4589e7d3ea14a3352255d04b6f1a418845e5e.tar.gz https://github.com/golang/sys/archive/493114f68206f85e7e333beccfabc11e98cba8dd.tar.gz -> github.com-golang-sys-493114f68206f85e7e333beccfabc11e98cba8dd.tar.gz https://github.com/golang/net/archive/859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz -> github.com-golang-net-859d1a86bb617c0c20d154590c3c5d3fcb670b07.tar.gz https://github.com/google/google-api-go-client/archive/39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz -> github.com-google-google-api-go-client-39c3dd417c5a443607650f18e829ad308da08dd2.tar.gz https://github.com/grpc/grpc-go/archive/35170916ff58e89ae03f52e778228e18207e0e02.tar.gz -> github.com-grpc-grpc-go-35170916ff58e89ae03f52e778228e18207e0e02.tar.gz https://github.com/golang/protobuf/archive/11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz -> github.com-golang-protobuf-11b8df160996e00fd4b55cbaafb3d84ec6d50fa8.tar.gz https://github.com/golang/oauth2/archive/13449ad91cb26cb47661c1b080790392170385fd.tar.gz -> github.com-golang-oauth2-13449ad91cb26cb47661c1b080790392170385fd.tar.gz https://github.com/GoogleCloudPlatform/gcloud-golang/archive/20d4028b8a750c2aca76bf9fefa8ed2d0109b573.tar.gz -> github.com-GoogleCloudPlatform-gcloud-golang-20d4028b8a750c2aca76bf9fefa8ed2d0109b573.tar.gz https://github.com/golang/text/archive/ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49.tar.gz -> github.com-golang-text-ab5ac5f9a8deb4855a60fab02bc61a4ec770bd49.tar.gz https://github.com/googleapis/gax-go/archive/8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.gz -> github.com-googleapis-gax-go-8c160ca1523d8eea3932fbaa494c8964b7724aa8.tar.gz https://github.com/google/go-genproto/archive/595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz -> github.com-google-go-genproto-595979c8a7bf586b2d293fb42246bf91a0b893d9.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c1c8e9621f7af020358ae2bc1108f05b
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 0f99a773bc89..e41f8451375e 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	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=850533891b3eb0d29c844c65f672f461
diff --git a/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3 b/metadata/md5-cache/sys-auth/google-authenticator-wrappers-3
index 55770fb0f338..b617dbb5c723 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a46811733c26aac5496b7c2ca7f2ad17
diff --git a/metadata/md5-cache/sys-auth/keystone-16.0.0 b/metadata/md5-cache/sys-auth/keystone-16.0.0
index 067e15d67cb1..5c2b5ccd72d7 100644
--- a/metadata/md5-cache/sys-auth/keystone-16.0.0
+++ b/metadata/md5-cache/sys-auth/keystone-16.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-16.0.0 https://tarballs.openstack.org/keystone/keystone-16.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ef53dfefed9e7508fa91a70dbe973ff1
diff --git a/metadata/md5-cache/sys-auth/keystone-2019.2.9999 b/metadata/md5-cache/sys-auth/keystone-2019.2.9999
index 6a3126830741..4c57c7a6f0b1 100644
--- a/metadata/md5-cache/sys-auth/keystone-2019.2.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2019.2.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/train/keystone.conf.sample -> keystone.conf.sample-2019.2.9999
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c67e9048225cbf9fe9639ef288354546
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.10-r2 b/metadata/md5-cache/sys-auth/munge-0.5.10-r2
deleted file mode 100644
index 6aa87c9ef442..000000000000
--- a/metadata/md5-cache/sys-auth/munge-0.5.10-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup test
-DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl )
-DESCRIPTION=An authentication service for creating and validating credentials
-EAPI=4
-HOMEPAGE=https://code.google.com/p/munge/
-IUSE=gcrypt
-KEYWORDS=~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=https://munge.googlecode.com/files/munge-0.5.10.tar.bz2
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0fb428a44ebc5fcad36946ba439568e9
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.13 b/metadata/md5-cache/sys-auth/munge-0.5.13
deleted file mode 100644
index 84d423e6f6d3..000000000000
--- a/metadata/md5-cache/sys-auth/munge-0.5.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An authentication service for creating and validating credentials
-EAPI=6
-HOMEPAGE=https://github.com/dun/munge
-IUSE=debug gcrypt static-libs
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
-SLOT=0
-SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=66ca964ec325f386ba856738b594d940
diff --git a/metadata/md5-cache/sys-auth/munge-0.5.13-r1 b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
index 743d836923e4..d6657f7ea8e9 100644
--- a/metadata/md5-cache/sys-auth/munge-0.5.13-r1
+++ b/metadata/md5-cache/sys-auth/munge-0.5.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/bzip2 sys-libs/zlib gcrypt? ( dev-libs/libgcrypt:0 ) !gcrypt? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/dun/munge/releases/download/munge-0.5.13/munge-0.5.13.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6de241967beb8b187c3fe4f010ac5ee1
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
index 11102c768fad..31d64dcac133 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.10
@@ -11,5 +11,5 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.10.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e6960bf6e3aaaf803ffa6db5f70d7006
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11
index 9287a84e420c..ac79d768ece9 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11
@@ -11,5 +11,5 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=39fa93ab05d4197427273864bb5442e0
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r1 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r1
index 7e034605fc21..7020f3180d5c 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r1
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 python_targets_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=848fdb1831a083b5245d1d77a5337f5f
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2
index 5c0a8494808c..b3cd47833a91 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.11-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 python_targets_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	s6	c00aae64382703efbfcef0c6425565d2	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=fee6e3c1384cc3c134f48260e8a42f0f
diff --git a/metadata/md5-cache/sys-auth/polkit-0.115-r3 b/metadata/md5-cache/sys-auth/polkit-0.115-r3
index 8ee644d44052..36b3f7d6c34a 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.115-r3
+++ b/metadata/md5-cache/sys-auth/polkit-0.115-r3
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( consolekit elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.115.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=190cb84d68bbdf63ccb74037bb226a40
diff --git a/metadata/md5-cache/sys-auth/polkit-0.115-r4 b/metadata/md5-cache/sys-auth/polkit-0.115-r4
index 3f2086961c80..9bb8962b1b27 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.115-r4
+++ b/metadata/md5-cache/sys-auth/polkit-0.115-r4
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( consolekit elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/polkit/releases/polkit-0.115.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eece7e934ff36b0fbfce3ce076b98887
diff --git a/metadata/md5-cache/sys-auth/realtime-base-0.1 b/metadata/md5-cache/sys-auth/realtime-base-0.1
index 3abf827eb55b..43cde8e351a1 100644
--- a/metadata/md5-cache/sys-auth/realtime-base-0.1
+++ b/metadata/md5-cache/sys-auth/realtime-base-0.1
@@ -6,5 +6,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sh sparc x86
 LICENSE=public-domain
 RDEPEND=sys-libs/pam
 SLOT=0
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=eb0d2425dbb687e642fb2795c39f2c8a
diff --git a/metadata/md5-cache/sys-auth/rtkit-0.11-r2 b/metadata/md5-cache/sys-auth/rtkit-0.11-r2
index b8b4fa94b61b..16ff171d5776 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9b039507bc6d0d0d67cb84fa4534e8fe
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2
index 2452cb992c3b..fa218f4e5d33 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.0-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/logger dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-describe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/logger dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-describe[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-mock[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Utility to manage SSH public keys stored in LDAP
 EAPI=6
 HOMEPAGE=https://github.com/jirutka/ssh-ldap-pubkey
-IUSE=schema test python_targets_python2_7 python_targets_python3_6
+IUSE=schema test python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/logger schema? ( !net-misc/openssh[ldap] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/logger schema? ( !net-misc/openssh[ldap] ) 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 )
 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 https://github.com/jirutka/ssh-ldap-pubkey/commit/130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch -> ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch https://github.com/jirutka/ssh-ldap-pubkey/commit/8d718357dfa5a62f919e61cf620a862cae87e833.patch -> ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e5dc076070d9a6eb11f789be9f829050
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bddd7617c5f9a4b82bb62d3f9f6e8c2d
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.1 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.1
index 5ea9a4d139b2..2357a47177fa 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.1
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/logger dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-describe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] )
+DEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/logger dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-describe[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Utility to manage SSH public keys stored in LDAP
 EAPI=7
 HOMEPAGE=https://github.com/jirutka/ssh-ldap-pubkey
-IUSE=schema test python_targets_python2_7 python_targets_python3_6
+IUSE=schema test python_targets_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] virtual/logger schema? ( !net-misc/openssh[ldap] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-ldap-3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/logger schema? ( !net-misc/openssh[ldap] ) 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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jirutka/ssh-ldap-pubkey/archive/v1.3.1.tar.gz -> ssh-ldap-pubkey-1.3.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=cf557d35ad5d6b514f8e8f3a088f5a00
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=344f4cf5831db02129ee3b03d8c01a17
diff --git a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2 b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
index bb97722af5e3..c3ec0e5eeca6 100644
--- a/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
+++ b/metadata/md5-cache/sys-auth/ssh-ldap-pubkey-1.3.2
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-ldap-3.0[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(-)] virtual/logger dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-describe[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-mock[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(-)] )
+DEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-ldap-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/logger dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-describe[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
 DESCRIPTION=Utility to manage SSH public keys stored in LDAP
 EAPI=7
 HOMEPAGE=https://github.com/jirutka/ssh-ldap-pubkey
-IUSE=schema test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
+IUSE=schema test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-ldap-3.0[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(-)] virtual/logger schema? ( !net-misc/openssh[ldap] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-ldap-3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/logger schema? ( !net-misc/openssh[ldap] ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jirutka/ssh-ldap-pubkey/archive/v1.3.2.tar.gz -> ssh-ldap-pubkey-1.3.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=05c7f67c3da9582aceff877faf1b2746
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=ea69df34effbafd59f676d18ffefd130
diff --git a/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3 b/metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
index 872bbd35be29..9fd44c492f30 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? ( sys-libs/pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/thinkfinger/thinkfinger-0.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c64a96fa372c6a4c061c096c7fa9faad
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 56813bd97885..a301e5f7d3c6 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/blocks-0.1.4_pre131210-r1 b/metadata/md5-cache/sys-block/blocks-0.1.4_pre131210-r1
index bb4c013ba8cc..f3a0a3a32255 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_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jlec/distfiles/blocks-0.1.4_pre131210.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=509730ae27b665b2b84235c524aa581d
diff --git a/metadata/md5-cache/sys-block/blocks-9999 b/metadata/md5-cache/sys-block/blocks-9999
index 51aa3c7407c6..57177819ae16 100644
--- a/metadata/md5-cache/sys-block/blocks-9999
+++ b/metadata/md5-cache/sys-block/blocks-9999
@@ -10,5 +10,5 @@ RDEPEND=dev-python/maintboot >=dev-python/pyparted-3.10[python_targets_python3_6
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb6f9548ac72b07625ba987a5b088390
diff --git a/metadata/md5-cache/sys-block/f3-7.2 b/metadata/md5-cache/sys-block/f3-7.2
index 1a3f9b58bd92..bb6bf1f8cfb1 100644
--- a/metadata/md5-cache/sys-block/f3-7.2
+++ b/metadata/md5-cache/sys-block/f3-7.2
@@ -9,4 +9,4 @@ LICENSE=GPL-3+
 SLOT=0
 SRC_URI=https://github.com/AltraMayor/f3/archive/v7.2.tar.gz -> f3-7.2.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=74624a924d5b1d31bfbd9e43e1fce280
+_md5_=828d05a68b5eede957a802623c336e45
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.30.15.0 b/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
index a3b8d116df46..922f151baf9b 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.30.15.0
@@ -8,5 +8,5 @@ LICENSE=hp-proliant-essentials
 RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v77370/hpacucli-9.30-15.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v77371/hpacucli-9.30-15.0.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=16e2666efaaffdca8ffa6e9bcdfda432
diff --git a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0 b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
index 9488601c7bbe..d345cceaedeb 100644
--- a/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
+++ b/metadata/md5-cache/sys-block/hpacucli-9.40.12.0
@@ -8,5 +8,5 @@ LICENSE=hp-proliant-essentials
 RDEPEND=sys-apps/coreutils sys-process/procps >=sys-apps/util-linux-2.20.1
 SLOT=0
 SRC_URI=amd64? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1257348637/v80070/hpacucli-9.40-12.0.x86_64.rpm ) x86? ( ftp://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p414707558/v80071/hpacucli-9.40-12.0.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=2eaf5c83ce7e781a71a3e76d877d41ef
diff --git a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1 b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
index ac803d6306a5..07fe385429c4 100644
--- a/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
+++ b/metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 ) >=sys-libs/libunwind-0.99 >=sys-process/procps-3.3.6
 SLOT=0
 SRC_URI=amd64? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/x86_64/current/hpssacli-2.40-13.0.x86_64.rpm ) x86? ( https://downloads.linux.hpe.com/SDR/repo/spp/RHEL/6/i686/current/hpssacli-2.40-13.0.i386.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d456bb38892284aa5efcbf5124872a28
diff --git a/metadata/md5-cache/sys-block/hpssacli-3.10.3.0 b/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
index 7bfb30b42ce2..2955086317d0 100644
--- a/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
+++ b/metadata/md5-cache/sys-block/hpssacli-3.10.3.0
@@ -8,5 +8,5 @@ LICENSE=hpe
 RDEPEND=elibc_glibc? ( >sys-libs/glibc-2.14 ) >=sys-libs/libunwind-0.99 >=sys-process/procps-3.3.6
 SLOT=0
 SRC_URI=https://downloads.linux.hpe.com/SDR/repo/spp/2017.10.1/packages/ssacli-3.10-3.0.x86_64.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=7952d95d2be8a71833dcf1e6aee5fdf6
diff --git a/metadata/md5-cache/sys-block/megacli-8.07.10 b/metadata/md5-cache/sys-block/megacli-8.07.10
index f0b4c0f6a6cc..4409f5eaff0a 100644
--- a/metadata/md5-cache/sys-block/megacli-8.07.10
+++ b/metadata/md5-cache/sys-block/megacli-8.07.10
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/ncurses-compat:5
 RESTRICT=mirror fetch
 SLOT=0
 SRC_URI=http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/8.07.10_MegaCLI_Linux.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4d407857292c1dff9525570a9adf4f6e
diff --git a/metadata/md5-cache/sys-block/megacli-8.07.14 b/metadata/md5-cache/sys-block/megacli-8.07.14
index f39be5b0d72e..0ef6601bd7e4 100644
--- a/metadata/md5-cache/sys-block/megacli-8.07.14
+++ b/metadata/md5-cache/sys-block/megacli-8.07.14
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/ncurses-compat:5
 RESTRICT=mirror fetch
 SLOT=0
 SRC_URI=http://www.lsi.com/downloads/Public/RAID%20Controllers/RAID%20Controllers%20Common%20Files/8.07.14_MegaCLI.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=131923c1457a53879fe185ffb534861a
diff --git a/metadata/md5-cache/sys-block/megacli-8.07.14-r1 b/metadata/md5-cache/sys-block/megacli-8.07.14-r1
index 5dcc23fd42f7..ab5cfcb41c7b 100644
--- a/metadata/md5-cache/sys-block/megacli-8.07.14-r1
+++ b/metadata/md5-cache/sys-block/megacli-8.07.14-r1
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/ncurses-compat:5
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://docs.avagotech.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/8-07-14_MegaCLI.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=da5d2828b6c46a0166f4a5be9b3e6a59
diff --git a/metadata/md5-cache/sys-block/megacli-8.07.14-r2 b/metadata/md5-cache/sys-block/megacli-8.07.14-r2
index 2c4f33f701f6..e06dad715a8c 100644
--- a/metadata/md5-cache/sys-block/megacli-8.07.14-r2
+++ b/metadata/md5-cache/sys-block/megacli-8.07.14-r2
@@ -9,5 +9,5 @@ RDEPEND=sys-libs/ncurses-compat:5
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/8-07-14_MegaCLI.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=346f15c8c5937cc264425bf21ab336f1
diff --git a/metadata/md5-cache/sys-block/partimage-0.6.9-r1 b/metadata/md5-cache/sys-block/partimage-0.6.9-r1
index 68a50f6ff2e3..194fd886e7fb 100644
--- a/metadata/md5-cache/sys-block/partimage-0.6.9-r1
+++ b/metadata/md5-cache/sys-block/partimage-0.6.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!static? ( pam? ( sys-libs/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= ssl? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad5bcbb8ef14f25b80d5147a6d9fa46f
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4871296c62dfd4e5c2eac17222481b3e
diff --git a/metadata/md5-cache/sys-block/perccli-7.5.007.0529 b/metadata/md5-cache/sys-block/perccli-7.5.007.0529
index f3ff85331e38..a2137591b36d 100644
--- a/metadata/md5-cache/sys-block/perccli-7.5.007.0529
+++ b/metadata/md5-cache/sys-block/perccli-7.5.007.0529
@@ -9,5 +9,5 @@ LICENSE=Avago BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz doc? ( https://topics-cdn.dell.com/pdf/dell-sas-hba-12gbps_reference-guide_en-us.pdf )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	mount-boot	e30bb691fbb26137f3d46438542bffe4	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	mount-boot	e30bb691fbb26137f3d46438542bffe4	rpm	b03b38188e1e83766244d2046785d562
 _md5_=4d013328b62ef4afa013f89fad967ada
diff --git a/metadata/md5-cache/sys-block/perccli-7.5.007.0529-r2 b/metadata/md5-cache/sys-block/perccli-7.5.007.0529-r2
index ff6ca0075b05..97bb79e4510e 100644
--- a/metadata/md5-cache/sys-block/perccli-7.5.007.0529-r2
+++ b/metadata/md5-cache/sys-block/perccli-7.5.007.0529-r2
@@ -9,5 +9,5 @@ LICENSE=Avago BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://downloads.dell.com/FOLDER05235308M/1/perccli_linux_NF8G9_A07_7.529.00.tar.gz doc? ( https://topics-cdn.dell.com/pdf/dell-sas-hba-12gbps_reference-guide_en-us.pdf )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	mount-boot	e30bb691fbb26137f3d46438542bffe4	rpm	f52cfa3a435468d86d3b49c357b9cb35
+_eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	mount-boot	e30bb691fbb26137f3d46438542bffe4	rpm	b03b38188e1e83766244d2046785d562
 _md5_=d3407748298518bf36a90bb5c5e5c697
diff --git a/metadata/md5-cache/sys-block/scsiadd-1.97-r1 b/metadata/md5-cache/sys-block/scsiadd-1.97-r1
index 939dc315a6c2..902706daf639 100644
--- a/metadata/md5-cache/sys-block/scsiadd-1.97-r1
+++ b/metadata/md5-cache/sys-block/scsiadd-1.97-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://llg.cubic.org/tools/scsiadd-1.97.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=823425fb8930fbe2742399c99be14103
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 6e8360857dce..20d06a19de9b 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-python2[python_targets_python2_7(-)?,-python_
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=43d9a209a6364f36bf6f7f3cdceb7025
diff --git a/metadata/md5-cache/sys-block/seekwatcher-0.13 b/metadata/md5-cache/sys-block/seekwatcher-0.13
index 869855348884..340b6cab6c5e 100644
--- a/metadata/md5-cache/sys-block/seekwatcher-0.13
+++ b/metadata/md5-cache/sys-block/seekwatcher-0.13
@@ -11,5 +11,5 @@ RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/trofi/seekwatcher/archive/v0.13.tar.gz -> seekwatcher-0.13.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=fc4a5c7f664ffba351b8a0b65d5dcda0
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 36c43207b756..5407ea9b2860 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_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bc49506e9a6882e2a9dcd34f79501a1
diff --git a/metadata/md5-cache/sys-block/targetcli-fb-2.1.49 b/metadata/md5-cache/sys-block/targetcli-fb-2.1.49
index 8995d73b510a..c9baada60ec8 100644
--- a/metadata/md5-cache/sys-block/targetcli-fb-2.1.49
+++ b/metadata/md5-cache/sys-block/targetcli-fb-2.1.49
@@ -10,5 +10,5 @@ RDEPEND=dev-python/configshell-fb[python_targets_python3_6(-)?,-python_single_ta
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/open-iscsi/targetcli-fb/archive/v2.1.fb49.tar.gz -> targetcli-fb-2.1.49.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e4b0b6769f0459710c1d687b79ec6d24
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 340432e13ed4..9f8fbc2106e5 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/gnu-efi-3.0.11 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.11
index 5e4d551e2197..5ead20177c6b 100644
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.11
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.11
@@ -3,10 +3,10 @@ DESCRIPTION=Library for build EFI Applications
 EAPI=7
 HOMEPAGE=http://gnu-efi.sourceforge.net/
 IUSE=abi_x86_32 abi_x86_64 custom-cflags
-KEYWORDS=-* amd64 ~arm ~arm64 ~ia64 ~x86
+KEYWORDS=-* amd64 arm ~arm64 ia64 x86
 LICENSE=GPL-2+ BSD BSD-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.11.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5a1e2c9a8bfad2429519c7ea8a84a5cb
+_md5_=6df1b28ca849dbd07be6d7ad54c2c51b
diff --git a/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201 b/metadata/md5-cache/sys-boot/raspberrypi-mkimage-0_p20120201
index 52ea04abe975..644a1d4215c1 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0285676e6cd70ddc175176794ec2b21f
diff --git a/metadata/md5-cache/sys-boot/shim-15.5-r1 b/metadata/md5-cache/sys-boot/shim-15.5-r1
index f2a3399c29b0..a1ddcb0e4bc4 100644
--- a/metadata/md5-cache/sys-boot/shim-15.5-r1
+++ b/metadata/md5-cache/sys-boot/shim-15.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm64 x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=amd64? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-15-5.x86_64.rpm https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-15-5.x86_64.rpm ) x86? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-x64-15-5.x86_64.rpm https://kojipkgs.fedoraproject.org//packages/shim/15/5/x86_64/shim-ia32-15-5.x86_64.rpm ) arm64? ( https://kojipkgs.fedoraproject.org//packages/shim/15/5/aarch64/shim-aa64-15-5.aarch64.rpm )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ae49e8432080fa6b80a3d421a5e64271
diff --git a/metadata/md5-cache/sys-boot/udk-2015-r1 b/metadata/md5-cache/sys-boot/udk-2015-r1
index e5bf5823fe63..999492347def 100644
--- a/metadata/md5-cache/sys-boot/udk-2015-r1
+++ b/metadata/md5-cache/sys-boot/udk-2015-r1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite]
 DESCRIPTION=Tianocore UEFI Development kit
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/tianocore.github.io/wiki/EDK-II
-IUSE=doc examples +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc examples +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tianocore/udk/releases/download/UDK2015/UDK2015.Complete.MyWorkSpace.zip
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c97be9095ab05701122ab7e779c7b11f
diff --git a/metadata/md5-cache/sys-boot/udk-2018 b/metadata/md5-cache/sys-boot/udk-2018
index 8a77f7e842d1..86318784c1ee 100644
--- a/metadata/md5-cache/sys-boot/udk-2018
+++ b/metadata/md5-cache/sys-boot/udk-2018
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite]
 DESCRIPTION=Tianocore UEFI Development kit
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/tianocore.github.io/wiki/EDK-II
-IUSE=doc examples +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc examples +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tianocore/edk2/archive/vUDK2018.tar.gz -> udk-2018.tar.gz doc? ( https://github.com/tianocore/edk2/releases/download/vUDK2018/UDK2018.Documents.zip -> udk-2018-docs.zip )
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=0be4cb0384f6542e6392189a01028ba2
diff --git a/metadata/md5-cache/sys-boot/udk-2018-r1 b/metadata/md5-cache/sys-boot/udk-2018-r1
index d8d0029aea2b..b7ea8d670d55 100644
--- a/metadata/md5-cache/sys-boot/udk-2018-r1
+++ b/metadata/md5-cache/sys-boot/udk-2018-r1
@@ -3,13 +3,13 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite]
 DESCRIPTION=Tianocore UEFI Development kit
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/tianocore.github.io/wiki/EDK-II
-IUSE=doc +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc +python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/tianocore/edk2/archive/vUDK2018.tar.gz -> udk-2018.tar.gz doc? ( https://github.com/tianocore/edk2/releases/download/vUDK2018/UDK2018.Documents.zip -> udk-2018-docs.zip )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9b294015950b2f1a5478fad9c077b35f
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index e1cf5d6837fe..769f2691baa7 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.11 b/metadata/md5-cache/sys-cluster/ceph-12.2.11
deleted file mode 100644
index 3f2d3bffea10..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) ssl? ( <dev-libs/openssl-1.1:0=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] <dev-libs/openssl-1.1:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-arch/cpio amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( dev-python/tox[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
-RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) ssl? ( <dev-libs/openssl-1.1:0=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] <dev-libs/openssl-1.1:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/e2fsprogs sys-fs/cryptsetup sys-fs/lvm2 !<sys-apps/openrc-0.26.3 dev-python/cherrypy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pecan[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/prettytable[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/werkzeug[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 ) ?? ( ssl nss ) ?? ( jemalloc tcmalloc )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.11.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ba25a858cef83bf5f79c472bc7d2c2a5
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2 b/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
index f54a4fc353f9..841f49653e8f 100644
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-12.2.12-r2
@@ -1,16 +1,15 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) ssl? ( dev-libs/openssl:0=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] <dev-libs/openssl-1.1:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-arch/cpio amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( dev-python/virtualenv[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
+DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) ssl? ( dev-libs/openssl:0=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] <dev-libs/openssl-1.1:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-arch/cpio amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( dev-python/virtualenv[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
 DESCRIPTION=Ceph distributed filesystem
 EAPI=7
 HOMEPAGE=https://ceph.com/
 IUSE=babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
-RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) ssl? ( dev-libs/openssl:0=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] <dev-libs/openssl-1.1:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/e2fsprogs sys-fs/cryptsetup sys-fs/lvm2 !<sys-apps/openrc-0.26.3 dev-python/cherrypy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pecan[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/prettytable[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/werkzeug[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) ssl? ( dev-libs/openssl:0=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] <dev-libs/openssl-1.1:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/e2fsprogs sys-fs/cryptsetup sys-fs/lvm2 !<sys-apps/openrc-0.26.3 dev-python/cherrypy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pecan[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/prettytable[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/werkzeug[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 ) ?? ( ssl nss ) ?? ( jemalloc tcmalloc )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.12.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d006574e132fde97b3b15f39a72bcdb2
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0fa8098c645804143d10250978558a09
diff --git a/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1 b/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
deleted file mode 100644
index d84aef34b04a..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-12.2.8-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) ssl? ( dev-libs/openssl:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] dev-libs/openssl:0=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-arch/cpio amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( dev-python/tox[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Ceph distributed filesystem
-EAPI=6
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
-RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] <dev-libs/crypto++-7.0:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) nss? ( dev-libs/nss:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) ssl? ( dev-libs/openssl:0=[static-libs?] ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] dev-libs/openssl:0=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) system-boost? ( =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2 !<sys-apps/openrc-0.26.3 dev-python/cherrypy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pecan[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/prettytable[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/werkzeug[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 ) ?? ( ssl nss ) ?? ( jemalloc tcmalloc )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-12.2.8.tar.gz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d63f906b25204e2d59a6e2ef36b3efdf
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4 b/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4
deleted file mode 100644
index f11e9678c2a1..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.5-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) numa? ( sys-process/numactl:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
-RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) numa? ( sys-process/numactl:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cherrypy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pecan[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/prettytable[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/werkzeug[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 ) ?? ( jemalloc tcmalloc )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9657ab2be60c2de2e1548f9f5be3ba12
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.6 b/metadata/md5-cache/sys-cluster/ceph-13.2.6
deleted file mode 100644
index 3c5cf1ee57a1..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-13.2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) numa? ( sys-process/numactl:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio dev-python/cython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/virtualenv[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
-RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) numa? ( sys-process/numactl:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cherrypy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/flask[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pecan[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/prettytable[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/werkzeug[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 ) || ( python_targets_python3_6 ) ?? ( jemalloc tcmalloc )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c1fdda5500bae2df67a533bfadad1dd
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.4-r1 b/metadata/md5-cache/sys-cluster/ceph-14.2.4-r1
deleted file mode 100644
index b5b2d4938205..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/cpio >=dev-util/cmake-3.5.0 dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx dev-util/cunit test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64
-LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain
-RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cherrypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 ) ?? ( jemalloc tcmalloc ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2ccbbd7aeeb6c0436d3f62a251502716
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.4-r2 b/metadata/md5-cache/sys-cluster/ceph-14.2.4-r2
deleted file mode 100644
index 3208b2770a3e..000000000000
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.4-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/cpio >=dev-util/cmake-3.5.0 dev-util/gperf dev-util/valgrind sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/sed sys-apps/which sys-devel/bc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-shells/bash:0 app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-apps/sed sys-apps/util-linux sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx dev-util/cunit test? ( dev-python/coverage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/virtualenv[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
-DESCRIPTION=Ceph distributed filesystem
-EAPI=7
-HOMEPAGE=https://ceph.com/
-IUSE=babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64
-LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-shells/bash:0 app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-apps/sed sys-apps/util-linux sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] sys-fs/lsscsi virtual/awk !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cherrypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 ) ?? ( jemalloc tcmalloc ) rabbitmq? ( radosgw )
-RESTRICT=test? ( userpriv ) test
-SLOT=0
-SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.4.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c761a982b5150acb2cbaa75a18a7487
diff --git a/metadata/md5-cache/sys-cluster/ceph-14.2.7 b/metadata/md5-cache/sys-cluster/ceph-14.2.7
index 7db372ff691e..8c1d167c7c28 100644
--- a/metadata/md5-cache/sys-cluster/ceph-14.2.7
+++ b/metadata/md5-cache/sys-cluster/ceph-14.2.7
@@ -5,12 +5,12 @@ DESCRIPTION=Ceph distributed filesystem
 EAPI=7
 HOMEPAGE=https://ceph.com/
 IUSE=babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain
 RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs(-)?] app-arch/zstd:=[static-libs?] app-shells/bash:0 app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?] dev-libs/libaio:=[static-libs?] dev-libs/libnl:3=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:=[static-libs?] sys-libs/ncurses:0=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) kerberos? ( virtual/krb5 ) rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( || ( =dev-libs/boost-1.71*[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-libs/boost-1.70*[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-libs/boost-1.67*[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-libs/boost:=[threads,context,python,static-libs?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] sys-fs/lsscsi virtual/awk dev-python/bcrypt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cherrypy[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/jinja[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pecan[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/prettytable[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( python_targets_python3_6 python_targets_python3_7 ) ?? ( jemalloc tcmalloc ) rabbitmq? ( radosgw )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-14.2.7.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4d707a2fdda2c733f43e9c609e2f7c00
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9f5df62d4a4eab7019dae5eda2d70c86
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.10 b/metadata/md5-cache/sys-cluster/charliecloud-0.10
deleted file mode 100644
index 35d21d94c548..000000000000
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/rsync )
-DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
-EAPI=7
-HOMEPAGE=https://hpc.github.io/charliecloud/
-IUSE=doc examples +pv squashfuse python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) pv? ( sys-apps/pv ) squashfuse? ( sys-fs/squashfuse )
-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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/hpc/charliecloud/archive/v0.10.tar.gz -> charliecloud-0.10.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ab20cb1182abb55289fe3f44cf486f19
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.10-r1 b/metadata/md5-cache/sys-cluster/charliecloud-0.10-r1
new file mode 100644
index 000000000000..008e57a956a1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.10-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install setup
+DEPEND=doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) net-misc/rsync )
+DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
+EAPI=7
+HOMEPAGE=https://hpc.github.io/charliecloud/
+IUSE=doc examples +pv squashfuse python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) pv? ( sys-apps/pv ) squashfuse? ( sys-fs/squashfuse )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/hpc/charliecloud/archive/v0.10.tar.gz -> charliecloud-0.10.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2ba7ed5c3c23bb589acafb4c1c790e1c
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-0.9.10 b/metadata/md5-cache/sys-cluster/charliecloud-0.9.10
index b54650f8c257..29be4d398578 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-0.9.10
+++ b/metadata/md5-cache/sys-cluster/charliecloud-0.9.10
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install setup
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/rsync )
+DEPEND=doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=7
 HOMEPAGE=https://hpc.github.io/charliecloud/
-IUSE=doc examples +pv python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc examples +pv python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) pv? ( sys-apps/pv )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/hpc/charliecloud/archive/v0.9.10.tar.gz -> charliecloud-0.9.10.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b6e14931065e73edba06e82feae14832
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=00d6f0dd749127806561212d5a505825
diff --git a/metadata/md5-cache/sys-cluster/charliecloud-9999 b/metadata/md5-cache/sys-cluster/charliecloud-9999
index 7af08f633637..54377508503c 100644
--- a/metadata/md5-cache/sys-cluster/charliecloud-9999
+++ b/metadata/md5-cache/sys-cluster/charliecloud-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install setup unpack
-DEPEND=doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] net-misc/rsync )
+DEPEND=doc? ( python_single_target_python3_6? ( dev-python/sphinx[python_targets_python3_6(-)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/sphinx[python_targets_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-)] ) net-misc/rsync )
 DESCRIPTION=Lightweight user-defined software stacks for high-performance computing
 EAPI=7
 HOMEPAGE=https://hpc.github.io/charliecloud/
-IUSE=doc examples +pv squashfuse python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=doc examples +pv squashfuse python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0
 PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) pv? ( sys-apps/pv ) squashfuse? ( sys-fs/squashfuse )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d82138c4d28aecd06d934421dc2b21c6
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f5f711bd0989e823a6ffdb28d61a5449
diff --git a/metadata/md5-cache/sys-cluster/cinder-15.0.0 b/metadata/md5-cache/sys-cluster/cinder-15.0.0
deleted file mode 100644
index 1c7f8eaa26a2..000000000000
--- a/metadata/md5-cache/sys-cluster/cinder-15.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 app-admin/sudo
-DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
-EAPI=7
-HOMEPAGE=https://launchpad.net/cinder
-IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-15.0.0 https://tarballs.openstack.org/cinder/cinder-15.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=13718e7a7bf6e6fdde18021e800d5c19
diff --git a/metadata/md5-cache/sys-cluster/cinder-15.0.1 b/metadata/md5-cache/sys-cluster/cinder-15.0.1
index 97627c8006c1..b93d96d0c3bc 100644
--- a/metadata/md5-cache/sys-cluster/cinder-15.0.1
+++ b/metadata/md5-cache/sys-cluster/cinder-15.0.1
@@ -5,12 +5,12 @@ DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-vo
 EAPI=7
 HOMEPAGE=https://launchpad.net/cinder
 IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python3_6 python_targets_python3_7 kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/decorator-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/defusedxml-0.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-ipaddress[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-3.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oauth2client-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.27.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-6.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.44.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.32.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.34.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.31.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-barbicanclient-4.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-keystoneclient-3.15.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-novaclient-9.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-swiftclient-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/requests-2.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.2.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/retrying-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rtslib-fb-2.1.65[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~dev-python/suds-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-vmware-2.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-15.0.1 https://tarballs.openstack.org/cinder/cinder-15.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9ccee01a7f76f24ea74e6a9cbbf3b336
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=13718e7a7bf6e6fdde18021e800d5c19
diff --git a/metadata/md5-cache/sys-cluster/cinder-2019.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2019.2.9999
index 870bc882990d..07928afa0d29 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2019.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2019.2.9999
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) ||
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-2019.2.9999
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=63a1c9868d9d4da2690a2d8591ed66eb
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
index 0e2467188180..ee027c8b10e7 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 !<sys-cluster/heartbeat-3.0
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.11.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=658b6d7441c2f9e10c0493b559048e59
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
index ada2347ce6d1..1831d50fb421 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-text/asciidoc app-arch/bzip2 app-text/docbook-xml-dtd:4.4 dev-libs/glib:2 dev-libs/libaio libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 !<sys-cluster/heartbeat-3.0
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/glue/archive/glue-1.0.12.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1c499a18a1d0b566cae01f64f9503ceb
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
index d7f39bb127af..ba3dc5f0bafb 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
@@ -9,5 +9,5 @@ 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/libltdl:= 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2f8f31033b5d9b34df3d0bc1eca5dd65
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.25 b/metadata/md5-cache/sys-cluster/galera-25.3.25
index e0a7a4e98f1d..c303a05d8254 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.25
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.25
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://releases.galeracluster.com/galera-3/source/galera-3-25.3.25.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=3ef70d72ee328d30fea33e1c5ac230ee
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=827bd88329bd4912e7583e8695eaa717
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.26 b/metadata/md5-cache/sys-cluster/galera-25.3.26
index 417fb3e4d3c8..0a61d0ee3fd9 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.26
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.26
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.14/galera-25.3.26/src/galera-25.3.26.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7a68887c33fe830feef1cc06ce749986
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f173d6604f84c8b3aa99aad5ae4aeb75
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.28 b/metadata/md5-cache/sys-cluster/galera-25.3.28
index a8214746827a..bf0732bd853a 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.28
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.28
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/galera-25.3.28/src/galera-25.3.28.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=acfc05a978f27395e40e0e70edeb320b
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=213391c3107a51d3dc7e4ea56ca744c5
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.28-r1 b/metadata/md5-cache/sys-cluster/galera-25.3.28-r1
index 4ebe4357b792..1dda2d772cbb 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.28-r1
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.28-r1
@@ -1,15 +1,15 @@
-BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
 EAPI=7
 HOMEPAGE=http://galeracluster.com
 IUSE=cpu_flags_x86_sse4_2 garbd test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2 BSD
 RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/galera-25.3.28/src/galera-25.3.28.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=82ac24c588da79f1a9b4a0b2adee1d1a
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=97cf805b03ad4103ceb02e29aa13767d
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.2 b/metadata/md5-cache/sys-cluster/galera-26.4.2
index 8c476cd9ae57..abb56be31b57 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.2
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.2
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.5/galera-26.4.2/src/galera-26.4.2.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=edb8a95ec3d1e8492ddbcbcde17bac71
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1573c88d8895cfb17ee6013f60d91a2e
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.3 b/metadata/md5-cache/sys-cluster/galera-26.4.3
index a3e13b402497..374c894f531f 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.3
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.3
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/scons[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( dev-lang/python:3.7 dev-util/scons[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-util/scons[python_targets_python3_6(-),python_single_target_python3_6(+)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.4.10/galera-26.4.3/src/galera-26.4.3.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b9d1b084bc409033d568738784d35cd3
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	scons-utils	7fa3bb47972ff4c5fa8004463ec6f023	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=832926e6c13fdc00fad64bd8fa4c44c6
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 8ae74fdf1c1c..cee0ca6466f5 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cde1b8ed850db3a95c17820396536211
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-4.1.8 b/metadata/md5-cache/sys-cluster/glusterfs-4.1.8
index 9b0f8dc18ada..e546f6a19427 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-4.1.8
+++ b/metadata/md5-cache/sys-cluster/glusterfs-4.1.8
@@ -4,13 +4,13 @@ DEPEND=bd-xlator? ( sys-fs/lvm2 ) !elibc_glibc? ( sys-libs/argp-standalone ) ema
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/
-IUSE=bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 libressl +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml +python_targets_python2_7 +python_single_target_python2_7
+IUSE=bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 libressl +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml +python_single_target_python2_7
 KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
 RDEPEND=bd-xlator? ( sys-fs/lvm2 ) !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) glupy? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ipv6? ( libtirpc )
+REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python2_7 ) ) glupy? ( ^^ ( python_single_target_python2_7 ) ) ipv6? ( libtirpc )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/4.1/4.1.8/glusterfs-4.1.8.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=bd2e19ae42e49bf8e7bd9ec157f3a9eb
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-6.5 b/metadata/md5-cache/sys-cluster/glusterfs-6.5
index 0c9de766854f..ef65c3227d9d 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-6.5
+++ b/metadata/md5-cache/sys-cluster/glusterfs-6.5
@@ -4,13 +4,13 @@ DEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-2
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( GPL-2 LGPL-3+ )
 RDEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
-REQUIRED_USE=georeplication? ( ^^ ( 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 ) ) ipv6? ( libtirpc )
+REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) ipv6? ( libtirpc )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/6/6.5/glusterfs-6.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c65396644746f4727af735906a38e319
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-6.7 b/metadata/md5-cache/sys-cluster/glusterfs-6.7
deleted file mode 100644
index 604cbf4d5b9c..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-6.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux virtual/acl virtual/pkgconfig sys-devel/bison sys-devel/flex test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) ipv6? ( libtirpc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/6/6.7/glusterfs-6.7.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=62dd98af0e438bbd02671c5ed72368f0
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-6.7-r1 b/metadata/md5-cache/sys-cluster/glusterfs-6.7-r1
new file mode 100644
index 000000000000..69f8bc8dafe7
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/glusterfs-6.7-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux virtual/acl virtual/pkgconfig sys-devel/bison sys-devel/flex test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
+DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
+EAPI=7
+HOMEPAGE=https://www.gluster.org/
+IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 LGPL-3+ )
+RDEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
+REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ipv6? ( libtirpc )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/6/6.7/glusterfs-6.7.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=16d733a347aacee6372bd984244b4633
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.2 b/metadata/md5-cache/sys-cluster/glusterfs-7.2
deleted file mode 100644
index bba220c92bbf..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux virtual/acl virtual/pkgconfig sys-devel/bison sys-devel/flex test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
-DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
-EAPI=7
-HOMEPAGE=https://www.gluster.org/
-IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) ) ipv6? ( libtirpc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.2/glusterfs-7.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=f15cd5d65dc41900c86ede881a93578c
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-7.2-r1 b/metadata/md5-cache/sys-cluster/glusterfs-7.2-r1
new file mode 100644
index 000000000000..8180bd4846c5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/glusterfs-7.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux virtual/acl virtual/pkgconfig sys-devel/bison sys-devel/flex test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
+DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
+EAPI=7
+HOMEPAGE=https://www.gluster.org/
+IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 LGPL-3+ )
+RDEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
+REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) ipv6? ( libtirpc )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/7/7.2/glusterfs-7.2.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1bddb1b1b7ccf7d6451b56ca3029571b
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-9999 b/metadata/md5-cache/sys-cluster/glusterfs-9999
index ff4027969022..dfe5df604fc7 100644
--- a/metadata/md5-cache/sys-cluster/glusterfs-9999
+++ b/metadata/md5-cache/sys-cluster/glusterfs-9999
@@ -4,12 +4,12 @@ DEPEND=bd-xlator? ( sys-fs/lvm2 ) !elibc_glibc? ( sys-libs/argp-standalone ) ema
 DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
 EAPI=7
 HOMEPAGE=https://www.gluster.org/
-IUSE=bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 libressl +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml +python_targets_python2_7 +python_single_target_python2_7
+IUSE=bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 libressl +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml +python_single_target_python2_7
 LICENSE=|| ( GPL-2 LGPL-3+ )
 PROPERTIES=live
 RDEPEND=bd-xlator? ( sys-fs/lvm2 ) !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
-REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) glupy? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ipv6? ( libtirpc )
+REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python2_7 ) ) glupy? ( ^^ ( python_single_target_python2_7 ) ) ipv6? ( libtirpc )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	elisp-common	a1054cff648e1c6a806e17001d052176	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=90419f7b00ab5c431db035edbe877ac5
diff --git a/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3 b/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
index 7d7516f2909a..2adfbc4537fa 100644
--- a/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
+++ b/metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r3
@@ -3,13 +3,13 @@ DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp
 DESCRIPTION=Heartbeat high availability cluster manager
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Heartbeat
-IUSE=doc snmp static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc snmp static-libs +python_single_target_python2_7
 KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2
 PDEPEND=sys-cluster/resource-agents
 RDEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.5.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ff0ecb2eae6e2622f60cd6833782bbc6
diff --git a/metadata/md5-cache/sys-cluster/heartbeat-3.0.6 b/metadata/md5-cache/sys-cluster/heartbeat-3.0.6
index 71d4e83626f7..fbbff31e4599 100644
--- a/metadata/md5-cache/sys-cluster/heartbeat-3.0.6
+++ b/metadata/md5-cache/sys-cluster/heartbeat-3.0.6
@@ -3,13 +3,13 @@ DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp
 DESCRIPTION=Heartbeat high availability cluster manager
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Heartbeat
-IUSE=doc snmp static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc snmp static-libs +python_single_target_python2_7
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
 PDEPEND=sys-cluster/resource-agents
 RDEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.6.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1a141078713a9a753ccd881a49c4165c
diff --git a/metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1 b/metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1
index 5bfecb3bb93f..5daca4df3972 100644
--- a/metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1
+++ b/metadata/md5-cache/sys-cluster/heartbeat-3.0.6-r1
@@ -3,13 +3,13 @@ DEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp
 DESCRIPTION=Heartbeat high availability cluster manager
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Heartbeat
-IUSE=doc snmp static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=doc snmp static-libs +python_single_target_python2_7
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
 PDEPEND=sys-cluster/resource-agents
 RDEPEND=sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.6.tar.bz2 -> heartbeat-3.0.6.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=48b569afa350d3d5fa145ce125eeaa9c
diff --git a/metadata/md5-cache/sys-cluster/heat-13.0.0 b/metadata/md5-cache/sys-cluster/heat-13.0.0
index b18e79f72061..5192cb9c9004 100644
--- a/metadata/md5-cache/sys-cluster/heat-13.0.0
+++ b/metadata/md5-cache/sys-cluster/heat-13.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-13.0.0 https://tarballs.openstack.org/heat/openstack-heat-13.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=776027fc75625ff2bc6ea4bf4d8f234b
diff --git a/metadata/md5-cache/sys-cluster/heat-2019.2.9999 b/metadata/md5-cache/sys-cluster/heat-2019.2.9999
index e7eeb5127f98..688a54901e2f 100644
--- a/metadata/md5-cache/sys-cluster/heat-2019.2.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2019.2.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.train -> heat.conf.sample-2019.2.9999
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=ef6cfe02c60e6107759e64e16523a45a
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.2.1 b/metadata/md5-cache/sys-cluster/hpx-1.2.1
index 9f0ee13bf75c..78867bed33f4 100644
--- a/metadata/md5-cache/sys-cluster/hpx-1.2.1
+++ b/metadata/md5-cache/sys-cluster/hpx-1.2.1
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( >=dev-libs/boost-1.56.0-r1[tools] ) dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.49:= >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) tbb? ( dev-cpp/tbb ) test? ( || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) virtual/fortran
+DEPEND=>=dev-libs/boost-1.49:= >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) tbb? ( dev-cpp/tbb ) test? ( || ( dev-lang/python:3.6 ) ) virtual/fortran
 DESCRIPTION=C++ runtime system for parallel and distributed applications
 EAPI=7
 HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://stellar.cct.lsu.edu/files/hpx_1.2.1.tar.gz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c738b9ccd24487b18c41046190b84cb7
+_md5_=adb2cf4d14f0a3090527e68db274f663
diff --git a/metadata/md5-cache/sys-cluster/hpx-9999 b/metadata/md5-cache/sys-cluster/hpx-9999
index e81185aa12ed..692600f858c0 100644
--- a/metadata/md5-cache/sys-cluster/hpx-9999
+++ b/metadata/md5-cache/sys-cluster/hpx-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( >=dev-libs/boost-1.56.0-r1[tools] ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/boost-1.49:= >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) tbb? ( dev-cpp/tbb ) test? ( || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) virtual/fortran
+DEPEND=>=dev-libs/boost-1.49:= >=sys-apps/hwloc-1.8 >=sys-libs/libunwind-1 sys-libs/zlib papi? ( dev-libs/papi ) perftools? ( >=dev-util/google-perftools-1.7.1 ) tbb? ( dev-cpp/tbb ) test? ( || ( dev-lang/python:3.6 ) ) virtual/fortran
 DESCRIPTION=C++ runtime system for parallel and distributed applications
 EAPI=7
 HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( jemalloc perftools tbb )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	fortran-2	216ce6fa0e81c0c91667aee598c792dd	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c738b9ccd24487b18c41046190b84cb7
+_md5_=adb2cf4d14f0a3090527e68db274f663
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.10 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.10
index 41983209742c..13c1499b3740 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.10
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.14.10
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.10.tar.gz -> kubernetes-1.14.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.7
index 87465b72c2eb..d4d653fb0e52 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.7
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.7.tar.gz -> kubernetes-1.15.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.9 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.9
index 20936009e450..e60d9675d1ce 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.9
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.15.9
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.9.tar.gz -> kubernetes-1.15.9.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=35711820f0c7ae9574ee850873c6cfff
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.4 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.4
index bd7eb7a85d7a..0d073e53228e 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.4
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.4.tar.gz -> kubernetes-1.16.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=583afa17241e835873c261c6cf362ffa
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.6 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.6
index 0adc65773452..43d853fc7aa3 100644
--- a/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.6
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.16.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.6.tar.gz -> kubernetes-1.16.6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=75726d0d851ee6ab594f8f69e38481eb
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.10 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.10
index 0c082e220242..ce6c0a163dd2 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.10
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.14.10
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.10.tar.gz -> kubernetes-1.14.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.7 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.7
index f4da6d3601da..ce9633e252f6 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.7
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.7.tar.gz -> kubernetes-1.15.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.9 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.9
index 9d81481a27e5..9c0441b18a24 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.9
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.15.9
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.9.tar.gz -> kubernetes-1.15.9.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.4 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.4
index 609dfb49b274..9a648a46a347 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.4
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.4.tar.gz -> kubernetes-1.16.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fa239f3ce983ed49bcbf4359fbd65afa
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.6 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.6
index f20fc9869e05..d75b5056b23c 100644
--- a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.6
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.6.tar.gz -> kubernetes-1.16.6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=41fd9d8390763a2bcfb2385bdbf1caaa
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.10 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.10
index 21cf7c76d45f..2dd9514c80aa 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.10
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.14.10
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.14.10.tar.gz -> kubernetes-1.14.10.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.7 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.7
index fb4ca771b656..3c09299509d9 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.7
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.7
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.7.tar.gz -> kubernetes-1.15.7.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.9 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.9
index 04d8b9640992..92c9703174b8 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.9
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.15.9
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.15.9.tar.gz -> kubernetes-1.15.9.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.4 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.4
index eecc814e41aa..d8dde98f0e53 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.4
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.4.tar.gz -> kubernetes-1.16.4.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=b902e1e2d71212f733fb50894e5e87ce
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.6 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.6
index 4bbc2e888de4..af36e289c8bf 100644
--- a/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.6
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.16.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.16.6.tar.gz -> kubernetes-1.16.6.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=abcf4161821648105506870f61cc8b50
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.0.1 b/metadata/md5-cache/sys-cluster/minikube-1.0.1
index dd4369c124c8..8b64a734b634 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.0.1
+++ b/metadata/md5-cache/sys-cluster/minikube-1.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup test unpack
-DEPEND=dev-go/go-bindata || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) libvirt? ( app-emulation/libvirt[qemu] ) >=dev-lang/go-1.10
+DEPEND=dev-go/go-bindata || ( dev-lang/python:3.6 ) libvirt? ( app-emulation/libvirt[qemu] ) >=dev-lang/go-1.10
 DESCRIPTION=Single Node Kubernetes Cluster
 EAPI=6
 HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v1.0.1.tar.gz -> minikube-1.0.1.tar.gz
 _eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=95e64229ec85901fcc456fdf18f5b27f
+_md5_=72b9db19e26211eeaa317450e4818575
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.6.1 b/metadata/md5-cache/sys-cluster/minikube-1.6.1
index aa353975a3ff..15c97ba1e34b 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.6.1
+++ b/metadata/md5-cache/sys-cluster/minikube-1.6.1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/go-1.12
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=sys-cluster/kubectl-1.14.0 libvirt? ( app-emulation/libvirt:=[qemu] ) dev-go/go-bindata || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=>=sys-cluster/kubectl-1.14.0 libvirt? ( app-emulation/libvirt:=[qemu] ) dev-go/go-bindata || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
 DESCRIPTION=Single Node Kubernetes Cluster
 EAPI=7
 HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v1.6.1.tar.gz -> minikube-1.6.1.tar.gz https://github.com/googleapis/google-cloud-go/archive/v0.49.0.tar.gz -> github.com-googleapis-google-cloud-go-v0.49.0.tar.gz https://github.com/aws/aws-sdk-go/archive/v1.16.26.tar.gz -> github.com-aws-aws-sdk-go-v1.16.26.tar.gz https://github.com/bgentry/go-netrc/archive/9fd32a8b3d3d3f9d43c341bfe098430e07609480.tar.gz -> github.com-bgentry-go-netrc-9fd32a8b3d3d3f9d43c341bfe098430e07609480.tar.gz https://github.com/blang/semver/archive/v3.5.0.tar.gz -> github.com-blang-semver-v3.5.0.tar.gz https://github.com/cenkalti/backoff/archive/v2.2.1.tar.gz -> github.com-cenkalti-backoff-v2.2.1.tar.gz https://github.com/cheggaaa/pb/archive/v3.0.1.tar.gz -> github.com-cheggaaa-pb-v3.0.1.tar.gz https://github.com/cloudfoundry-attic/jibber_jabber/archive/bcc4c8345a21301bf47c032ff42dd1aae2fe3027.tar.gz -> github.com-cloudfoundry-attic-jibber_jabber-bcc4c8345a21301bf47c032ff42dd1aae2fe3027.tar.gz https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz -> github.com-cpuguy83-go-md2man-v1.0.10.tar.gz https://github.com/davecgh/go-spew/archive/v1.1.1.tar.gz -> github.com-davecgh-go-spew-v1.1.1.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/v1.13.1.tar.gz -> github.com-docker-docker-v1.13.1.tar.gz https://github.com/docker/go-connections/archive/v0.3.0.tar.gz -> github.com-docker-go-connections-v0.3.0.tar.gz https://github.com/docker/go-units/archive/v0.3.3.tar.gz -> github.com-docker-go-units-v0.3.3.tar.gz https://github.com/docker/machine/archive/a555e4f7a8f518a8b1b174824c377e46cbfc4fe2.tar.gz -> github.com-docker-machine-a555e4f7a8f518a8b1b174824c377e46cbfc4fe2.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/fatih/color/archive/v1.7.0.tar.gz -> github.com-fatih-color-v1.7.0.tar.gz https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz -> github.com-fsnotify-fsnotify-v1.4.7.tar.gz https://github.com/gogo/protobuf/archive/v1.1.1.tar.gz -> github.com-gogo-protobuf-v1.1.1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/v1.3.2.tar.gz -> github.com-golang-protobuf-v1.3.2.tar.gz https://github.com/googleapis/gax-go/archive/v2.0.5.tar.gz -> github.com-googleapis-gax-go-v2.0.5.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/google/go-cmp/archive/v0.3.0.tar.gz -> github.com-google-go-cmp-v0.3.0.tar.gz https://github.com/google/go-containerregistry/archive/697ee0b3d46eff19ed2b30f86230377061203f79.tar.gz -> github.com-google-go-containerregistry-697ee0b3d46eff19ed2b30f86230377061203f79.tar.gz https://github.com/google/gofuzz/archive/v1.0.0.tar.gz -> github.com-google-gofuzz-v1.0.0.tar.gz https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> github.com-hashicorp-errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/v0.5.0.tar.gz -> github.com-hashicorp-go-cleanhttp-v0.5.0.tar.gz https://github.com/hashicorp/go-getter/archive/v1.4.0.tar.gz -> github.com-hashicorp-go-getter-v1.4.0.tar.gz https://github.com/hashicorp/golang-lru/archive/v0.5.1.tar.gz -> github.com-hashicorp-golang-lru-v0.5.1.tar.gz https://github.com/hashicorp/go-multierror/archive/8c5f0ad9360406a3807ce7de6bc73269a91a6e51.tar.gz -> github.com-hashicorp-go-multierror-8c5f0ad9360406a3807ce7de6bc73269a91a6e51.tar.gz https://github.com/hashicorp/go-safetemp/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-safetemp-v1.0.0.tar.gz https://github.com/hashicorp/go-version/archive/v1.1.0.tar.gz -> github.com-hashicorp-go-version-v1.1.0.tar.gz https://github.com/hashicorp/hcl/archive/v1.0.0.tar.gz -> github.com-hashicorp-hcl-v1.0.0.tar.gz https://github.com/imdario/mergo/archive/v0.3.5.tar.gz -> github.com-imdario-mergo-v0.3.5.tar.gz https://github.com/intel-go/cpuid/archive/1a4a6f06a1c643c8fbd339bd61d980960627d09e.tar.gz -> github.com-intel-go-cpuid-1a4a6f06a1c643c8fbd339bd61d980960627d09e.tar.gz https://github.com/jimmidyson/go-download/archive/7f9a90c8c95bee1bb7de9e72c682c67c8bf5546d.tar.gz -> github.com-jimmidyson-go-download-7f9a90c8c95bee1bb7de9e72c682c67c8bf5546d.tar.gz https://github.com/jmespath/go-jmespath/archive/c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5.tar.gz -> github.com-jmespath-go-jmespath-c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5.tar.gz https://github.com/json-iterator/go/archive/v1.1.6.tar.gz -> github.com-json-iterator-go-v1.1.6.tar.gz https://github.com/juju/clock/archive/9c5c9712527c7986f012361e7d13756b4d99543d.tar.gz -> github.com-juju-clock-9c5c9712527c7986f012361e7d13756b4d99543d.tar.gz https://github.com/juju/errors/archive/0232dcc7464d0c0037b619d6e10190301d01362f.tar.gz -> github.com-juju-errors-0232dcc7464d0c0037b619d6e10190301d01362f.tar.gz https://github.com/juju/mutex/archive/d21b13acf4bfd8a8b0482a3a78e44d98880b40d3.tar.gz -> github.com-juju-mutex-d21b13acf4bfd8a8b0482a3a78e44d98880b40d3.tar.gz https://github.com/kballard/go-shellquote/archive/95032a82bc518f77982ea72343cc1ade730072f0.tar.gz -> github.com-kballard-go-shellquote-95032a82bc518f77982ea72343cc1ade730072f0.tar.gz https://github.com/libvirt/libvirt-go/archive/v3.4.0.tar.gz -> github.com-libvirt-libvirt-go-v3.4.0.tar.gz https://github.com/machine-drivers/docker-machine-driver-vmware/archive/v0.1.1.tar.gz -> github.com-machine-drivers-docker-machine-driver-vmware-v0.1.1.tar.gz https://github.com/magiconair/properties/archive/v1.8.0.tar.gz -> github.com-magiconair-properties-v1.8.0.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/mattn/go-colorable/archive/v0.1.2.tar.gz -> github.com-mattn-go-colorable-v0.1.2.tar.gz https://github.com/mattn/go-isatty/archive/v0.0.8.tar.gz -> github.com-mattn-go-isatty-v0.0.8.tar.gz https://github.com/mattn/go-runewidth/archive/v0.0.4.tar.gz -> github.com-mattn-go-runewidth-v0.0.4.tar.gz https://github.com/mitchellh/go-homedir/archive/v1.1.0.tar.gz -> github.com-mitchellh-go-homedir-v1.1.0.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/go-testing-interface/archive/v1.0.0.tar.gz -> github.com-mitchellh-go-testing-interface-v1.0.0.tar.gz https://github.com/mitchellh/go-wordwrap/archive/v1.0.0.tar.gz -> github.com-mitchellh-go-wordwrap-v1.0.0.tar.gz https://github.com/mitchellh/mapstructure/archive/v1.1.2.tar.gz -> github.com-mitchellh-mapstructure-v1.1.2.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/v1.0.1.tar.gz -> github.com-modern-go-reflect2-v1.0.1.tar.gz https://github.com/olekukonko/tablewriter/archive/bdcc175572fd7abece6c831e643891b9331bc9e7.tar.gz -> github.com-olekukonko-tablewriter-bdcc175572fd7abece6c831e643891b9331bc9e7.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/pelletier/go-toml/archive/v1.2.0.tar.gz -> github.com-pelletier-go-toml-v1.2.0.tar.gz https://github.com/pkg/browser/archive/9302be274faad99162b9d48ec97b24306872ebb0.tar.gz -> github.com-pkg-browser-9302be274faad99162b9d48ec97b24306872ebb0.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/pkg/profile/archive/3a8809bd8a80f8ecfe4ee1b34b3f37194968617c.tar.gz -> github.com-pkg-profile-3a8809bd8a80f8ecfe4ee1b34b3f37194968617c.tar.gz https://github.com/russross/blackfriday/archive/v1.5.2.tar.gz -> github.com-russross-blackfriday-v1.5.2.tar.gz https://github.com/samalba/dockerclient/archive/91d7393ff85980ba3a8966405871a3d446ca28f2.tar.gz -> github.com-samalba-dockerclient-91d7393ff85980ba3a8966405871a3d446ca28f2.tar.gz https://github.com/shirou/gopsutil/archive/v2.18.12.tar.gz -> github.com-shirou-gopsutil-v2.18.12.tar.gz https://github.com/spf13/afero/archive/v1.1.2.tar.gz -> github.com-spf13-afero-v1.1.2.tar.gz https://github.com/spf13/cast/archive/v1.3.0.tar.gz -> github.com-spf13-cast-v1.3.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.5.tar.gz -> github.com-spf13-cobra-v0.0.5.tar.gz https://github.com/spf13/jwalterweatherman/archive/v1.0.0.tar.gz -> github.com-spf13-jwalterweatherman-v1.0.0.tar.gz https://github.com/spf13/pflag/archive/v1.0.3.tar.gz -> github.com-spf13-pflag-v1.0.3.tar.gz https://github.com/spf13/viper/archive/v1.3.2.tar.gz -> github.com-spf13-viper-v1.3.2.tar.gz https://github.com/ulikunitz/xz/archive/v0.5.5.tar.gz -> github.com-ulikunitz-xz-v0.5.5.tar.gz https://github.com/VividCortex/ewma/archive/v1.1.1.tar.gz -> github.com-VividCortex-ewma-v1.1.1.tar.gz https://github.com/golang/crypto/archive/5c40567a22f818bd14a1ea7245dad9f8ef0691aa.tar.gz -> github.com-golang-crypto-5c40567a22f818bd14a1ea7245dad9f8ef0691aa.tar.gz https://github.com/golang/net/archive/3b0461eec859c4b73bb64fdc8285971fd33e3938.tar.gz -> github.com-golang-net-3b0461eec859c4b73bb64fdc8285971fd33e3938.tar.gz https://github.com/golang/oauth2/archive/0f29369cfe4552d0e4bcddc57cc75f4d7e672a33.tar.gz -> github.com-golang-oauth2-0f29369cfe4552d0e4bcddc57cc75f4d7e672a33.tar.gz https://github.com/golang/sync/archive/112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz -> github.com-golang-sync-112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz https://github.com/golang/sys/archive/04f50cda93cbb67f2afa353c52f342100e80e625.tar.gz -> github.com-golang-sys-04f50cda93cbb67f2afa353c52f342100e80e625.tar.gz https://github.com/golang/text/archive/v0.3.2.tar.gz -> github.com-golang-text-v0.3.2.tar.gz https://github.com/golang/time/archive/9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz -> github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz https://github.com/googleapis/google-api-go-client/archive/v0.9.0.tar.gz -> github.com-googleapis-google-api-go-client-v0.9.0.tar.gz https://github.com/googleapis/go-genproto/archive/24fa4b261c55da65468f2abfdae2b024eef27dfb.tar.gz -> github.com-googleapis-go-genproto-24fa4b261c55da65468f2abfdae2b024eef27dfb.tar.gz https://github.com/grpc/grpc-go/archive/v1.21.1.tar.gz -> github.com-grpc-grpc-go-v1.21.1.tar.gz https://github.com/census-instrumentation/opencensus-go/archive/v0.22.2.tar.gz -> github.com-census-instrumentation-opencensus-go-v0.22.2.tar.gz https://github.com/cheggaaa/pb/archive/v1.0.27.tar.gz -> github.com-cheggaaa-pb-v1.0.27.tar.gz https://github.com/go-inf/inf/archive/v0.9.1.tar.gz -> github.com-go-inf-inf-v0.9.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.2.tar.gz -> github.com-go-yaml-yaml-v2.2.2.tar.gz https://github.com/kubernetes/klog/archive/v0.3.1.tar.gz -> github.com-kubernetes-klog-v0.3.1.tar.gz https://github.com/kubernetes/kubernetes/archive/8c3b7d7679ccf368cc4cedb352fac4cd1b82124e.tar.gz -> github.com-kubernetes-kubernetes-8c3b7d7679ccf368cc4cedb352fac4cd1b82124e.tar.gz https://github.com/kubernetes/utils/archive/c2654d5206da6b7b6ace12841e8f359bb89b443c.tar.gz -> github.com-kubernetes-utils-c2654d5206da6b7b6ace12841e8f359bb89b443c.tar.gz https://github.com/kubernetes-sigs/yaml/archive/v1.1.0.tar.gz -> github.com-kubernetes-sigs-yaml-v1.1.0.tar.gz
 _eclasses_=go-module	c1d483897ed4807f97f20fb3b5a3cb7b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6fba9722c22bdd55fc04f63aa1946a46
+_md5_=bfb67d9634ff6c27d47f3af5880b4c79
diff --git a/metadata/md5-cache/sys-cluster/minikube-1.6.2 b/metadata/md5-cache/sys-cluster/minikube-1.6.2
index 132c32239306..8a0c55102505 100644
--- a/metadata/md5-cache/sys-cluster/minikube-1.6.2
+++ b/metadata/md5-cache/sys-cluster/minikube-1.6.2
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/go-1.12
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=>=sys-cluster/kubectl-1.14.0 libvirt? ( app-emulation/libvirt:=[qemu] ) dev-go/go-bindata || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=>=sys-cluster/kubectl-1.14.0 libvirt? ( app-emulation/libvirt:=[qemu] ) dev-go/go-bindata || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 )
 DESCRIPTION=Single Node Kubernetes Cluster
 EAPI=7
 HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/kubernetes/minikube/archive/v1.6.2.tar.gz -> minikube-1.6.2.tar.gz https://github.com/googleapis/google-cloud-go/archive/v0.49.0.tar.gz -> github.com-googleapis-google-cloud-go-v0.49.0.tar.gz https://github.com/aws/aws-sdk-go/archive/v1.16.26.tar.gz -> github.com-aws-aws-sdk-go-v1.16.26.tar.gz https://github.com/bgentry/go-netrc/archive/9fd32a8b3d3d3f9d43c341bfe098430e07609480.tar.gz -> github.com-bgentry-go-netrc-9fd32a8b3d3d3f9d43c341bfe098430e07609480.tar.gz https://github.com/blang/semver/archive/v3.5.0.tar.gz -> github.com-blang-semver-v3.5.0.tar.gz https://github.com/cenkalti/backoff/archive/v2.2.1.tar.gz -> github.com-cenkalti-backoff-v2.2.1.tar.gz https://github.com/cheggaaa/pb/archive/v3.0.1.tar.gz -> github.com-cheggaaa-pb-v3.0.1.tar.gz https://github.com/cloudfoundry-attic/jibber_jabber/archive/bcc4c8345a21301bf47c032ff42dd1aae2fe3027.tar.gz -> github.com-cloudfoundry-attic-jibber_jabber-bcc4c8345a21301bf47c032ff42dd1aae2fe3027.tar.gz https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz -> github.com-cpuguy83-go-md2man-v1.0.10.tar.gz https://github.com/davecgh/go-spew/archive/v1.1.1.tar.gz -> github.com-davecgh-go-spew-v1.1.1.tar.gz https://github.com/docker/distribution/archive/edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz -> github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz https://github.com/docker/docker/archive/v1.13.1.tar.gz -> github.com-docker-docker-v1.13.1.tar.gz https://github.com/docker/go-connections/archive/v0.3.0.tar.gz -> github.com-docker-go-connections-v0.3.0.tar.gz https://github.com/docker/go-units/archive/v0.3.3.tar.gz -> github.com-docker-go-units-v0.3.3.tar.gz https://github.com/docker/machine/archive/a555e4f7a8f518a8b1b174824c377e46cbfc4fe2.tar.gz -> github.com-docker-machine-a555e4f7a8f518a8b1b174824c377e46cbfc4fe2.tar.gz https://github.com/docker/spdystream/archive/449fdfce4d962303d702fec724ef0ad181c92528.tar.gz -> github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz https://github.com/fatih/color/archive/v1.7.0.tar.gz -> github.com-fatih-color-v1.7.0.tar.gz https://github.com/fsnotify/fsnotify/archive/v1.4.7.tar.gz -> github.com-fsnotify-fsnotify-v1.4.7.tar.gz https://github.com/gogo/protobuf/archive/v1.1.1.tar.gz -> github.com-gogo-protobuf-v1.1.1.tar.gz https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz https://github.com/golang/groupcache/archive/02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz -> github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz https://github.com/golang/protobuf/archive/v1.3.2.tar.gz -> github.com-golang-protobuf-v1.3.2.tar.gz https://github.com/googleapis/gax-go/archive/v2.0.5.tar.gz -> github.com-googleapis-gax-go-v2.0.5.tar.gz https://github.com/googleapis/gnostic/archive/0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz -> github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz https://github.com/google/go-cmp/archive/v0.3.0.tar.gz -> github.com-google-go-cmp-v0.3.0.tar.gz https://github.com/google/go-containerregistry/archive/697ee0b3d46eff19ed2b30f86230377061203f79.tar.gz -> github.com-google-go-containerregistry-697ee0b3d46eff19ed2b30f86230377061203f79.tar.gz https://github.com/google/gofuzz/archive/v1.0.0.tar.gz -> github.com-google-gofuzz-v1.0.0.tar.gz https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> github.com-hashicorp-errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/v0.5.0.tar.gz -> github.com-hashicorp-go-cleanhttp-v0.5.0.tar.gz https://github.com/hashicorp/go-getter/archive/v1.4.0.tar.gz -> github.com-hashicorp-go-getter-v1.4.0.tar.gz https://github.com/hashicorp/golang-lru/archive/v0.5.1.tar.gz -> github.com-hashicorp-golang-lru-v0.5.1.tar.gz https://github.com/hashicorp/go-multierror/archive/8c5f0ad9360406a3807ce7de6bc73269a91a6e51.tar.gz -> github.com-hashicorp-go-multierror-8c5f0ad9360406a3807ce7de6bc73269a91a6e51.tar.gz https://github.com/hashicorp/go-safetemp/archive/v1.0.0.tar.gz -> github.com-hashicorp-go-safetemp-v1.0.0.tar.gz https://github.com/hashicorp/go-version/archive/v1.1.0.tar.gz -> github.com-hashicorp-go-version-v1.1.0.tar.gz https://github.com/hashicorp/hcl/archive/v1.0.0.tar.gz -> github.com-hashicorp-hcl-v1.0.0.tar.gz https://github.com/imdario/mergo/archive/v0.3.5.tar.gz -> github.com-imdario-mergo-v0.3.5.tar.gz https://github.com/intel-go/cpuid/archive/1a4a6f06a1c643c8fbd339bd61d980960627d09e.tar.gz -> github.com-intel-go-cpuid-1a4a6f06a1c643c8fbd339bd61d980960627d09e.tar.gz https://github.com/jimmidyson/go-download/archive/7f9a90c8c95bee1bb7de9e72c682c67c8bf5546d.tar.gz -> github.com-jimmidyson-go-download-7f9a90c8c95bee1bb7de9e72c682c67c8bf5546d.tar.gz https://github.com/jmespath/go-jmespath/archive/c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5.tar.gz -> github.com-jmespath-go-jmespath-c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5.tar.gz https://github.com/json-iterator/go/archive/v1.1.6.tar.gz -> github.com-json-iterator-go-v1.1.6.tar.gz https://github.com/juju/clock/archive/9c5c9712527c7986f012361e7d13756b4d99543d.tar.gz -> github.com-juju-clock-9c5c9712527c7986f012361e7d13756b4d99543d.tar.gz https://github.com/juju/errors/archive/0232dcc7464d0c0037b619d6e10190301d01362f.tar.gz -> github.com-juju-errors-0232dcc7464d0c0037b619d6e10190301d01362f.tar.gz https://github.com/juju/mutex/archive/d21b13acf4bfd8a8b0482a3a78e44d98880b40d3.tar.gz -> github.com-juju-mutex-d21b13acf4bfd8a8b0482a3a78e44d98880b40d3.tar.gz https://github.com/kballard/go-shellquote/archive/95032a82bc518f77982ea72343cc1ade730072f0.tar.gz -> github.com-kballard-go-shellquote-95032a82bc518f77982ea72343cc1ade730072f0.tar.gz https://github.com/libvirt/libvirt-go/archive/v3.4.0.tar.gz -> github.com-libvirt-libvirt-go-v3.4.0.tar.gz https://github.com/machine-drivers/docker-machine-driver-vmware/archive/v0.1.1.tar.gz -> github.com-machine-drivers-docker-machine-driver-vmware-v0.1.1.tar.gz https://github.com/magiconair/properties/archive/v1.8.0.tar.gz -> github.com-magiconair-properties-v1.8.0.tar.gz https://github.com/MakeNowJust/heredoc/archive/bb23615498cded5e105af4ce27de75b089cbe851.tar.gz -> github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz https://github.com/mattn/go-colorable/archive/v0.1.2.tar.gz -> github.com-mattn-go-colorable-v0.1.2.tar.gz https://github.com/mattn/go-isatty/archive/v0.0.8.tar.gz -> github.com-mattn-go-isatty-v0.0.8.tar.gz https://github.com/mattn/go-runewidth/archive/v0.0.4.tar.gz -> github.com-mattn-go-runewidth-v0.0.4.tar.gz https://github.com/mitchellh/go-homedir/archive/v1.1.0.tar.gz -> github.com-mitchellh-go-homedir-v1.1.0.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/mitchellh/go-testing-interface/archive/v1.0.0.tar.gz -> github.com-mitchellh-go-testing-interface-v1.0.0.tar.gz https://github.com/mitchellh/go-wordwrap/archive/v1.0.0.tar.gz -> github.com-mitchellh-go-wordwrap-v1.0.0.tar.gz https://github.com/mitchellh/mapstructure/archive/v1.1.2.tar.gz -> github.com-mitchellh-mapstructure-v1.1.2.tar.gz https://github.com/modern-go/concurrent/archive/bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz -> github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz https://github.com/modern-go/reflect2/archive/v1.0.1.tar.gz -> github.com-modern-go-reflect2-v1.0.1.tar.gz https://github.com/olekukonko/tablewriter/archive/bdcc175572fd7abece6c831e643891b9331bc9e7.tar.gz -> github.com-olekukonko-tablewriter-bdcc175572fd7abece6c831e643891b9331bc9e7.tar.gz https://github.com/opencontainers/go-digest/archive/a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz -> github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz https://github.com/pelletier/go-toml/archive/v1.2.0.tar.gz -> github.com-pelletier-go-toml-v1.2.0.tar.gz https://github.com/pkg/browser/archive/9302be274faad99162b9d48ec97b24306872ebb0.tar.gz -> github.com-pkg-browser-9302be274faad99162b9d48ec97b24306872ebb0.tar.gz https://github.com/pkg/errors/archive/v0.8.1.tar.gz -> github.com-pkg-errors-v0.8.1.tar.gz https://github.com/pkg/profile/archive/3a8809bd8a80f8ecfe4ee1b34b3f37194968617c.tar.gz -> github.com-pkg-profile-3a8809bd8a80f8ecfe4ee1b34b3f37194968617c.tar.gz https://github.com/russross/blackfriday/archive/v1.5.2.tar.gz -> github.com-russross-blackfriday-v1.5.2.tar.gz https://github.com/samalba/dockerclient/archive/91d7393ff85980ba3a8966405871a3d446ca28f2.tar.gz -> github.com-samalba-dockerclient-91d7393ff85980ba3a8966405871a3d446ca28f2.tar.gz https://github.com/shirou/gopsutil/archive/v2.18.12.tar.gz -> github.com-shirou-gopsutil-v2.18.12.tar.gz https://github.com/spf13/afero/archive/v1.1.2.tar.gz -> github.com-spf13-afero-v1.1.2.tar.gz https://github.com/spf13/cast/archive/v1.3.0.tar.gz -> github.com-spf13-cast-v1.3.0.tar.gz https://github.com/spf13/cobra/archive/v0.0.5.tar.gz -> github.com-spf13-cobra-v0.0.5.tar.gz https://github.com/spf13/jwalterweatherman/archive/v1.0.0.tar.gz -> github.com-spf13-jwalterweatherman-v1.0.0.tar.gz https://github.com/spf13/pflag/archive/v1.0.3.tar.gz -> github.com-spf13-pflag-v1.0.3.tar.gz https://github.com/spf13/viper/archive/v1.3.2.tar.gz -> github.com-spf13-viper-v1.3.2.tar.gz https://github.com/ulikunitz/xz/archive/v0.5.5.tar.gz -> github.com-ulikunitz-xz-v0.5.5.tar.gz https://github.com/VividCortex/ewma/archive/v1.1.1.tar.gz -> github.com-VividCortex-ewma-v1.1.1.tar.gz https://github.com/golang/crypto/archive/5c40567a22f818bd14a1ea7245dad9f8ef0691aa.tar.gz -> github.com-golang-crypto-5c40567a22f818bd14a1ea7245dad9f8ef0691aa.tar.gz https://github.com/golang/net/archive/3b0461eec859c4b73bb64fdc8285971fd33e3938.tar.gz -> github.com-golang-net-3b0461eec859c4b73bb64fdc8285971fd33e3938.tar.gz https://github.com/golang/oauth2/archive/0f29369cfe4552d0e4bcddc57cc75f4d7e672a33.tar.gz -> github.com-golang-oauth2-0f29369cfe4552d0e4bcddc57cc75f4d7e672a33.tar.gz https://github.com/golang/sync/archive/112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz -> github.com-golang-sync-112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz https://github.com/golang/sys/archive/04f50cda93cbb67f2afa353c52f342100e80e625.tar.gz -> github.com-golang-sys-04f50cda93cbb67f2afa353c52f342100e80e625.tar.gz https://github.com/golang/text/archive/v0.3.2.tar.gz -> github.com-golang-text-v0.3.2.tar.gz https://github.com/golang/time/archive/9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz -> github.com-golang-time-9d24e82272b4f38b78bc8cff74fa936d31ccd8ef.tar.gz https://github.com/googleapis/google-api-go-client/archive/v0.9.0.tar.gz -> github.com-googleapis-google-api-go-client-v0.9.0.tar.gz https://github.com/googleapis/go-genproto/archive/24fa4b261c55da65468f2abfdae2b024eef27dfb.tar.gz -> github.com-googleapis-go-genproto-24fa4b261c55da65468f2abfdae2b024eef27dfb.tar.gz https://github.com/grpc/grpc-go/archive/v1.21.1.tar.gz -> github.com-grpc-grpc-go-v1.21.1.tar.gz https://github.com/census-instrumentation/opencensus-go/archive/v0.22.2.tar.gz -> github.com-census-instrumentation-opencensus-go-v0.22.2.tar.gz https://github.com/cheggaaa/pb/archive/v1.0.27.tar.gz -> github.com-cheggaaa-pb-v1.0.27.tar.gz https://github.com/go-inf/inf/archive/v0.9.1.tar.gz -> github.com-go-inf-inf-v0.9.1.tar.gz https://github.com/go-yaml/yaml/archive/v2.2.2.tar.gz -> github.com-go-yaml-yaml-v2.2.2.tar.gz https://github.com/kubernetes/klog/archive/v0.3.1.tar.gz -> github.com-kubernetes-klog-v0.3.1.tar.gz https://github.com/kubernetes/kubernetes/archive/8c3b7d7679ccf368cc4cedb352fac4cd1b82124e.tar.gz -> github.com-kubernetes-kubernetes-8c3b7d7679ccf368cc4cedb352fac4cd1b82124e.tar.gz https://github.com/kubernetes/utils/archive/c2654d5206da6b7b6ace12841e8f359bb89b443c.tar.gz -> github.com-kubernetes-utils-c2654d5206da6b7b6ace12841e8f359bb89b443c.tar.gz https://github.com/kubernetes-sigs/yaml/archive/v1.1.0.tar.gz -> github.com-kubernetes-sigs-yaml-v1.1.0.tar.gz
 _eclasses_=go-module	c1d483897ed4807f97f20fb3b5a3cb7b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af7d21796e43fa13dbd8e0c6f0425e75
+_md5_=0074a4aaa0245afbef24d7e28a4a7e30
diff --git a/metadata/md5-cache/sys-cluster/neutron-15.0.0 b/metadata/md5-cache/sys-cluster/neutron-15.0.0
index b452c9150523..c35188f38fd6 100644
--- a/metadata/md5-cache/sys-cluster/neutron-15.0.0
+++ b/metadata/md5-cache/sys-cluster/neutron-15.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-15.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-15.0.0.tar.gz https://tarballs.openstack.org/neutron/neutron-15.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=51cf9f553edc80014c78303b9a4b92b3
diff --git a/metadata/md5-cache/sys-cluster/neutron-15.0.1 b/metadata/md5-cache/sys-cluster/neutron-15.0.1
index e1682f8464f3..a691fb8f81e5 100644
--- a/metadata/md5-cache/sys-cluster/neutron-15.0.1
+++ b/metadata/md5-cache/sys-cluster/neutron-15.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-15.0.1.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-15.0.1.tar.gz https://tarballs.openstack.org/neutron/neutron-15.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e469c5374149cfce6ec42f3916febb62
diff --git a/metadata/md5-cache/sys-cluster/neutron-2019.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2019.1.9999
index 199649d5bef9..c579251629de 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2019.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2019.1.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/configs.tar.gz -> neutron-configs-2019.1.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/stein/ml2_plugins.tar.gz -> neutron-ml2-plugins-2019.1.9999.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=669538afffd23a8086abec6883f5a0f4
diff --git a/metadata/md5-cache/sys-cluster/neutron-2019.2.9999 b/metadata/md5-cache/sys-cluster/neutron-2019.2.9999
index 632fb6b0f190..f28a8a5d9e8f 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2019.2.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2019.2.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-4.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-2019.2.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-2019.2.9999.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=682d15a3e68459fc25bd1d092bda1934
diff --git a/metadata/md5-cache/sys-cluster/nova-20.0.1 b/metadata/md5-cache/sys-cluster/nova-20.0.1
index 01b457bfbcb7..53b99fb7a7d4 100644
--- a/metadata/md5-cache/sys-cluster/nova-20.0.1
+++ b/metadata/md5-cache/sys-cluster/nova-20.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-20.0.1 https://tarballs.openstack.org/nova/nova-20.0.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2832771d35e616045fc1fcfe14ea1ac5
diff --git a/metadata/md5-cache/sys-cluster/nova-20.1.0 b/metadata/md5-cache/sys-cluster/nova-20.1.0
new file mode 100644
index 000000000000..4f26745f4346
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-20.1.0
@@ -0,0 +1,15 @@
+BDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-admin/sudo
+DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
+EAPI=7
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_6 python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.19[sqlite,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) >=dev-python/decorator-3.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/lxml-2.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.8.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.10[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/greenlet-0.4.14[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/python-cinderclient-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/websockify-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-6.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.19.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.40.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-7.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-policy-1.35.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.33.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.40.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-brick-2.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-resource-classes-0.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-traits-0.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-vif-1.14.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/microversion-parse-0.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pypowervm-1.1.15[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/retrying-1.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/zVMCloudConnector-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.35.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/libvirt-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] app-emulation/libvirt[iscsi?] app-emulation/spice-html5 novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) acct-user/nova acct-group/nova 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-20.1.0 https://tarballs.openstack.org/nova/nova-20.1.0.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=68d98bc4e14fd33a4904309090eb8809
diff --git a/metadata/md5-cache/sys-cluster/nova-2019.2.9999 b/metadata/md5-cache/sys-cluster/nova-2019.2.9999
index 47548359a304..93297c646ab6 100644
--- a/metadata/md5-cache/sys-cluster/nova-2019.2.9999
+++ b/metadata/md5-cache/sys-cluster/nova-2019.2.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-2019.2.9999
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=68d98bc4e14fd33a4904309090eb8809
diff --git a/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.1 b/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.1
deleted file mode 100644
index 8a523a1f7414..000000000000
--- a/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A openstack meta-package for installing the various openstack pieces
-EAPI=7
-HOMEPAGE=https://openstack.org
-IUSE=cinder glance heat keystone neutron nova placement swift
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=keystone? ( ~sys-auth/keystone-16.0.0 ) swift? ( ~sys-cluster/swift-2.23.1 ) neutron? ( ~sys-cluster/neutron-15.0.0 ) glance? ( ~app-admin/glance-19.0.0 ) cinder? ( ~sys-cluster/cinder-15.0.0 ) nova? ( ~sys-cluster/nova-20.0.1 ) heat? ( ~sys-cluster/heat-13.0.0 ) placement? ( ~sys-cluster/placement-2.0.0 )
-SLOT=0
-_md5_=7dc96662a6d349955486468d6398b98f
diff --git a/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.2 b/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.2
new file mode 100644
index 000000000000..ee7faa1775cb
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/openstack-meta-2019.2.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=A openstack meta-package for installing the various openstack pieces
+EAPI=7
+HOMEPAGE=https://openstack.org
+IUSE=cinder glance heat keystone neutron nova placement swift
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=Apache-2.0
+RDEPEND=keystone? ( ~sys-auth/keystone-16.0.0 ) swift? ( ~sys-cluster/swift-2.23.1 ) neutron? ( ~sys-cluster/neutron-15.0.0 ) glance? ( ~app-admin/glance-19.0.0 ) cinder? ( ~sys-cluster/cinder-15.0.1 ) nova? ( ~sys-cluster/nova-20.0.1 ) heat? ( ~sys-cluster/heat-13.0.0 ) placement? ( ~sys-cluster/placement-2.0.0 )
+SLOT=0
+_md5_=3b972c2e89b6369c1f5a22d3c74ccbd9
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.16 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
index 04d59b93726f..22c958f983a4 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.16
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Pacemaker CRM
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
-IUSE=acl heartbeat smtp snmp static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=acl heartbeat smtp snmp static-libs +python_single_target_python2_7
 KEYWORDS=amd64 hppa x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.16.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5767c3b16e78c4bcc46cf75bdcbd768d
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.19 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.19
index 69eaedd8454d..dbfaf639450b 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.19
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.19
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Pacemaker CRM
 EAPI=6
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
-IUSE=acl heartbeat smtp snmp static-libs +python_targets_python2_7 +python_single_target_python2_7
+IUSE=acl heartbeat smtp snmp static-libs +python_single_target_python2_7
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.19.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c52f1e610b791168d069c8cd5c5d16bf
diff --git a/metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1 b/metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1
index 3b78ffa86d86..242e996c04ff 100644
--- a/metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1
+++ b/metadata/md5-cache/sys-cluster/pacemaker-1.1.19-r1
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Pacemaker CRM
 EAPI=7
 HOMEPAGE=http://www.linux-ha.org/wiki/Pacemaker
-IUSE=acl heartbeat smtp snmp 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
+IUSE=acl heartbeat smtp snmp python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue >=sys-cluster/libqb-0.14.0 sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
-REQUIRED_USE=^^ ( 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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-1.1.19.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=63a92585f023fc5491ba333e13e1f4e6
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 f0c592d55a5d..bd94ef1ddbc4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d69f7b8c1fecf8ca7c2f2131c8e519e
diff --git a/metadata/md5-cache/sys-cluster/placement-2.0.0 b/metadata/md5-cache/sys-cluster/placement-2.0.0
index e04ef1dc359c..ee1bf742ffab 100644
--- a/metadata/md5-cache/sys-cluster/placement-2.0.0
+++ b/metadata/md5-cache/sys-cluster/placement-2.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/setuptools-21.0.0[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/train/placement.conf.sample -> placement.conf.sample-2.0.0 https://tarballs.openstack.org/placement/openstack-placement-2.0.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a7a544427c7c174647aa2e1ce2f0253c
diff --git a/metadata/md5-cache/sys-cluster/placement-2019.2.9999 b/metadata/md5-cache/sys-cluster/placement-2019.2.9999
index ca1c843c0feb..30705c4a3111 100644
--- a/metadata/md5-cache/sys-cluster/placement-2019.2.9999
+++ b/metadata/md5-cache/sys-cluster/placement-2019.2.9999
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/setuptools-21.0.0[python_targets_python3_6(-)?,python_targe
 REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/placement/train/placement.conf.sample -> placement.conf.sample-2019.2.9999
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c51cbddf33c5086e568e472667ae055d
diff --git a/metadata/md5-cache/sys-cluster/polysh-0.4-r1 b/metadata/md5-cache/sys-cluster/polysh-0.4-r1
index 03f0573983b2..388b3ae7f28c 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=873ab9b659627791a6eca69379dabac4
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-26.0 b/metadata/md5-cache/sys-cluster/rdma-core-26.0
deleted file mode 100644
index f1d4380648ad..000000000000
--- a/metadata/md5-cache/sys-cluster/rdma-core-26.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
-EAPI=7
-HOMEPAGE=https://github.com/linux-rdma/rdma-core
-IUSE=neigh python static-libs systemd valgrind python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=amd64 x86
-LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
-RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
-REQUIRED_USE=python? ( ^^ ( 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/linux-rdma/rdma-core/archive/v26.0.tar.gz -> rdma-core-26.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85be7c7cbc3ca3005f7cd09e5e688dfb
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-26.0-r1 b/metadata/md5-cache/sys-cluster/rdma-core-26.0-r1
new file mode 100644
index 000000000000..7f50b9379eba
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/rdma-core-26.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) )
+DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
+EAPI=7
+HOMEPAGE=https://github.com/linux-rdma/rdma-core
+IUSE=neigh python static-libs systemd valgrind python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=amd64 x86
+LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
+RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=0
+SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v26.0.tar.gz -> rdma-core-26.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=030d5f6053a7e9c24797d7aaa28c4b43
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-26.1 b/metadata/md5-cache/sys-cluster/rdma-core-26.1
index bc5506495f53..06239c10ec7a 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-26.1
+++ b/metadata/md5-cache/sys-cluster/rdma-core-26.1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) )
 DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
 EAPI=7
 HOMEPAGE=https://github.com/linux-rdma/rdma-core
-IUSE=neigh python static-libs systemd valgrind python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=neigh python static-libs systemd valgrind python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
 RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v26.1.tar.gz -> rdma-core-26.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb57c76bbb4c3f20d52be6ac2d230911
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2321d4d00865984bdc404836f7d5d870
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-27.0 b/metadata/md5-cache/sys-cluster/rdma-core-27.0
deleted file mode 100644
index 263e379ea79d..000000000000
--- a/metadata/md5-cache/sys-cluster/rdma-core-27.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
-EAPI=7
-HOMEPAGE=https://github.com/linux-rdma/rdma-core
-IUSE=neigh python static-libs systemd valgrind python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
-RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
-REQUIRED_USE=python? ( ^^ ( 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/linux-rdma/rdma-core/archive/v27.0.tar.gz -> rdma-core-27.0.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=69c65f26640ea30a858d16fe57863240
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-27.0-r1 b/metadata/md5-cache/sys-cluster/rdma-core-27.0-r1
new file mode 100644
index 000000000000..e206cb77c16f
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/rdma-core-27.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) )
+DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
+EAPI=7
+HOMEPAGE=https://github.com/linux-rdma/rdma-core
+IUSE=neigh python static-libs systemd valgrind python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
+RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
+SLOT=0
+SRC_URI=https://github.com/linux-rdma/rdma-core/archive/v27.0.tar.gz -> rdma-core-27.0.tar.gz
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=642e651acf9d1ce32547ff4d9611b7ea
diff --git a/metadata/md5-cache/sys-cluster/rdma-core-9999 b/metadata/md5-cache/sys-cluster/rdma-core-9999
index c5db3b750b68..7aac43336dff 100644
--- a/metadata/md5-cache/sys-cluster/rdma-core-9999
+++ b/metadata/md5-cache/sys-cluster/rdma-core-9999
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( dev-python/cython[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) python? ( python_single_target_python3_6? ( dev-python/cython[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/cython[python_targets_python3_7(-)] ) )
 DESCRIPTION=Userspace components for the Linux Kernel's drivers/infiniband subsystem
 EAPI=7
 HOMEPAGE=https://github.com/linux-rdma/rdma-core
-IUSE=neigh python static-libs systemd valgrind python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=neigh python static-libs systemd valgrind python_single_target_python3_6 python_single_target_python3_7
 LICENSE=|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )
 PROPERTIES=live
 RDEPEND=virtual/libudev:= neigh? ( dev-libs/libnl:3 ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !!sys-fabric/infiniband-diags !sys-fabric/libibverbs !sys-fabric/librdmacm !sys-fabric/libibumad !sys-fabric/ibacm !sys-fabric/libibmad !sys-fabric/srptools !sys-fabric/infinipath-psm !sys-fabric/libcxgb3 !sys-fabric/libcxgb4 !sys-fabric/libmthca !sys-fabric/libmlx4 !sys-fabric/libmlx5 !sys-fabric/libocrdma !sys-fabric/libnes
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51411c49b37c1dda1fdb4c5cf3b47def
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=38ead93d51d5c48febeecd04235af797
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.6.0 b/metadata/md5-cache/sys-cluster/sanlock-3.6.0
index 9aa5e0fc7a96..5e806e8b677d 100644
--- a/metadata/md5-cache/sys-cluster/sanlock-3.6.0
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.6.0
@@ -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_6 ) )
 SLOT=0
 SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.6.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9152fcce220752568269209a9068149c
diff --git a/metadata/md5-cache/sys-cluster/sanlock-3.8.0 b/metadata/md5-cache/sys-cluster/sanlock-3.8.0
index 8498d076d2ac..5f5960ffc0a1 100644
--- a/metadata/md5-cache/sys-cluster/sanlock-3.8.0
+++ b/metadata/md5-cache/sys-cluster/sanlock-3.8.0
@@ -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_6 ) )
 SLOT=0
 SRC_URI=https://releases.pagure.org/sanlock/sanlock-3.8.0.tar.gz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2eea1bc00dc96702224f579a521cfaba
diff --git a/metadata/md5-cache/sys-cluster/singularity-2.6.1 b/metadata/md5-cache/sys-cluster/singularity-2.6.1
index a123f2ffe2a7..adaea0ac2fa6 100644
--- a/metadata/md5-cache/sys-cluster/singularity-2.6.1
+++ b/metadata/md5-cache/sys-cluster/singularity-2.6.1
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=Application containers for Linux
 EAPI=7
 HOMEPAGE=https://sylabs.io
-IUSE=examples static-libs +suid python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=examples static-libs +suid python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-fs/squashfs-tools:0
-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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/singularityware/singularity/releases/download/2.6.1/singularity-2.6.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=28f26cf311f2867da8ae80d8eb248937
diff --git a/metadata/md5-cache/sys-cluster/swift-2.22.0 b/metadata/md5-cache/sys-cluster/swift-2.22.0
index 0d720207f839..64b791bb2911 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.22.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.22.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.22.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9e604c6f077b568df266bb0f45d4e30c
diff --git a/metadata/md5-cache/sys-cluster/swift-2.23.1 b/metadata/md5-cache/sys-cluster/swift-2.23.1
index e2ee63c640d6..70e07d3b20a2 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.23.1
+++ b/metadata/md5-cache/sys-cluster/swift-2.23.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.23.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64a5151613d7c96c949581a7c51eb83b
diff --git a/metadata/md5-cache/sys-cluster/swift-2.24.0 b/metadata/md5-cache/sys-cluster/swift-2.24.0
index 61f3a9b4b6c4..ae0d86c681f9 100644
--- a/metadata/md5-cache/sys-cluster/swift-2.24.0
+++ b/metadata/md5-cache/sys-cluster/swift-2.24.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_pytho
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/swift/swift-2.24.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=617e4e97f8fb07441309ee56ed43b432
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=86e0ece924437cf8d8dc7d9652ac45c6
diff --git a/metadata/md5-cache/sys-cluster/swift-2019.2.9999 b/metadata/md5-cache/sys-cluster/swift-2019.2.9999
index d6ab5697d253..9c887add7e7f 100644
--- a/metadata/md5-cache/sys-cluster/swift-2019.2.9999
+++ b/metadata/md5-cache/sys-cluster/swift-2019.2.9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=dev-python/pbr-1.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/eventlet-0.25.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/netifaces-0.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyxattr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyECLib-1.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ipaddress-1.0.16[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] memcached? ( net-misc/memcached ) net-misc/rsync[xattr] acct-user/swift acct-group/swift 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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=617e4e97f8fb07441309ee56ed43b432
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=86e0ece924437cf8d8dc7d9652ac45c6
diff --git a/metadata/md5-cache/sys-cluster/zetcd-0.0.4 b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
index 8d84b1c60ce5..a93eab449bde 100644
--- a/metadata/md5-cache/sys-cluster/zetcd-0.0.4
+++ b/metadata/md5-cache/sys-cluster/zetcd-0.0.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coreos/zetcd/archive/v0.0.4.tar.gz -> zetcd-0.0.4.tar.gz https://github.com/coreos/etcd/archive/714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz -> github.com-coreos-etcd-714e7ec8db7f8398880197be10771fe89c480ee5.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/google/go-genproto/archive/ee236bd376b077c7a89f260c026c4735b195e459.tar.gz -> github.com-google-go-genproto-ee236bd376b077c7a89f260c026c4735b195e459.tar.gz
-_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-build	dc25bafa8fc1305a4de66a0a448472e7	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c3dd77f41b8f3fefaabf253ce9656d62
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 53bb77dad22b..cdb7e9e3498c 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=370cf3bfe286000eda0d4096d7232fcb
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 604b1f80fd9e..8ecd552f51c3 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=370cf3bfe286000eda0d4096d7232fcb
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 cce1243267c1..567a92a344aa 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe29a789771efcba4323ae6d05e9c2ca
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 5f4981519f08..14fe0b569444 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	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=195eccef1e07bf2972438f821100f7a2
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index ab7467371e50..d8fa1b988f48 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/autoconf-wrapper-13-r1 b/metadata/md5-cache/sys-devel/autoconf-wrapper-13-r1
index c81790d2d823..18d827444292 100644
--- a/metadata/md5-cache/sys-devel/autoconf-wrapper-13-r1
+++ b/metadata/md5-cache/sys-devel/autoconf-wrapper-13-r1
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=wrapper for autoconf to manage multiple autoconf versions
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f6db47db11554748119ec8f5e015f690
+_md5_=dff90bc384a3b78f51afb308363b4b29
diff --git a/metadata/md5-cache/sys-devel/automake-1.16.1-r2 b/metadata/md5-cache/sys-devel/automake-1.16.1-r2
index 5a9f3c464789..8e771011c19b 100644
--- a/metadata/md5-cache/sys-devel/automake-1.16.1-r2
+++ b/metadata/md5-cache/sys-devel/automake-1.16.1-r2
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) )
+BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) )
 DEFINED_PHASES=install prepare setup
 DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=1.16
 SRC_URI=mirror://gnu/automake/automake-1.16.1.tar.xz https://alpha.gnu.org/pub/gnu/automake/automake-1.16.1.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=55ee1bbf9042c0e3543cea1586ebd629
+_md5_=4f570d233554b258be72a15e5ae303bb
diff --git a/metadata/md5-cache/sys-devel/automake-9999 b/metadata/md5-cache/sys-devel/automake-9999
index 4794d2b950e9..040961959b67 100644
--- a/metadata/md5-cache/sys-devel/automake-9999
+++ b/metadata/md5-cache/sys-devel/automake-9999
@@ -1,4 +1,4 @@
-BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=app-arch/gzip sys-apps/help2man test? ( || ( dev-lang/python:3.7 dev-lang/python:3.6 ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install prepare setup unpack
 DEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:* sys-devel/gnuconfig
 DESCRIPTION=Used to generate Makefile.in from Makefile.am
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/perl >=sys-devel/automake-wrapper-11 >=sys-devel/autoconf-2.69:
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=55ee1bbf9042c0e3543cea1586ebd629
+_md5_=4f570d233554b258be72a15e5ae303bb
diff --git a/metadata/md5-cache/sys-devel/automake-wrapper-10 b/metadata/md5-cache/sys-devel/automake-wrapper-10
index 3846f06cc032..8123b8fb347d 100644
--- a/metadata/md5-cache/sys-devel/automake-wrapper-10
+++ b/metadata/md5-cache/sys-devel/automake-wrapper-10
@@ -1,8 +1,8 @@
 DEFINED_PHASES=install prepare unpack
 DESCRIPTION=wrapper for automake to manage multiple automake versions
 EAPI=4
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_md5_=c48d8f2d6dc89cdaf69b2e01862171cf
+_md5_=cd0422139112ea8366a6ef6732a0b37b
diff --git a/metadata/md5-cache/sys-devel/automake-wrapper-11 b/metadata/md5-cache/sys-devel/automake-wrapper-11
index 28ea933b4b61..ee1ac2c276a4 100644
--- a/metadata/md5-cache/sys-devel/automake-wrapper-11
+++ b/metadata/md5-cache/sys-devel/automake-wrapper-11
@@ -1,8 +1,8 @@
 DEFINED_PHASES=install prepare unpack
 DESCRIPTION=wrapper for automake to manage multiple automake versions
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 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
 SLOT=0
-_md5_=f5b9ac5bb027bee6ed4f5707d57c1e91
+_md5_=08e914f27b77902b6903ff355db22634
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0.9999 b/metadata/md5-cache/sys-devel/clang-10.0.0.9999
index bd73c01a92b7..fbcde660ecbd 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-10.0.0.9999
@@ -4,13 +4,13 @@ DEPEND=~sys-devel/llvm-10.0.0.9999:10=[debug=,llvm_targets_AArch64?,llvm_targets
 DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-10.0.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-10.0.0.9999* ) default-libcxx? ( >=sys-libs/libcxx-10.0.0.9999 )
 PROPERTIES=live
 RDEPEND=~sys-devel/llvm-10.0.0.9999:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,llvm_targets_VE?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=^^ ( 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 ) || ( 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_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_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_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=10
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c02923c4c3543c67d2120b55edbac181
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0_rc1 b/metadata/md5-cache/sys-devel/clang-10.0.0_rc1
index 51d68b604785..8e50d8a7966c 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.0_rc1
+++ b/metadata/md5-cache/sys-devel/clang-10.0.0_rc1
@@ -4,13 +4,13 @@ DEPEND=~sys-devel/llvm-10.0.0_rc1:10=[debug=,llvm_targets_AArch64?,llvm_targets_
 DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-10.0.0_rc1 default-compiler-rt? ( =sys-libs/compiler-rt-10.0.0* ) default-libcxx? ( >=sys-libs/libcxx-10.0.0_rc1 )
 RDEPEND=~sys-devel/llvm-10.0.0_rc1:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,llvm_targets_VE?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=^^ ( 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 ) || ( 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_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_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_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c02923c4c3543c67d2120b55edbac181
diff --git a/metadata/md5-cache/sys-devel/clang-11.0.0.9999 b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
index 5d8b550a29d7..de4756bc19b3 100644
--- a/metadata/md5-cache/sys-devel/clang-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/clang-11.0.0.9999
@@ -4,13 +4,13 @@ DEPEND=~sys-devel/llvm-11.0.0.9999:11=[debug=,llvm_targets_AArch64?,llvm_targets
 DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-11.0.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-11.0.0.9999* ) default-libcxx? ( >=sys-libs/libcxx-11.0.0.9999 )
 PROPERTIES=live
 RDEPEND=~sys-devel/llvm-11.0.0.9999:11=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,llvm_targets_VE?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=^^ ( 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 ) || ( 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_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_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_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR llvm_targets_VE )
 RESTRICT=!test? ( test )
 SLOT=11
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c02923c4c3543c67d2120b55edbac181
diff --git a/metadata/md5-cache/sys-devel/clang-7.1.0 b/metadata/md5-cache/sys-devel/clang-7.1.0
index 91e730b29cf6..4304c19b5894 100644
--- a/metadata/md5-cache/sys-devel/clang-7.1.0
+++ b/metadata/md5-cache/sys-devel/clang-7.1.0
@@ -3,14 +3,14 @@ DEPEND=~sys-devel/llvm-7.1.0:7=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU
 DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-7.1.0 default-compiler-rt? ( =sys-libs/compiler-rt-7.1.0* ) default-libcxx? ( >=sys-libs/libcxx-7.1.0 )
 RDEPEND=~sys-devel/llvm-7.1.0:7=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( <sci-mathematics/z3-4.6:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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 )
+REQUIRED_USE=^^ ( python_single_target_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/7.1
 SRC_URI=https://releases.llvm.org/7.1.0/cfe-7.1.0.src.tar.xz https://releases.llvm.org/7.1.0/clang-tools-extra-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-7.1.0-manpages.tar.bz2 )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=86b67bcf1980b7fdf0035b7b0a6554da
diff --git a/metadata/md5-cache/sys-devel/clang-8.0.1 b/metadata/md5-cache/sys-devel/clang-8.0.1
index 353e6ffb45ab..e1c4e051eb19 100644
--- a/metadata/md5-cache/sys-devel/clang-8.0.1
+++ b/metadata/md5-cache/sys-devel/clang-8.0.1
@@ -3,14 +3,14 @@ DEPEND=~sys-devel/llvm-8.0.1:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU
 DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-8.0.1 default-compiler-rt? ( =sys-libs/compiler-rt-8.0.1* ) default-libcxx? ( >=sys-libs/libcxx-8.0.1 )
 RDEPEND=~sys-devel/llvm-8.0.1:8=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( 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_WebAssembly llvm_targets_X86 llvm_targets_XCore )
+REQUIRED_USE=^^ ( python_single_target_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_WebAssembly llvm_targets_X86 llvm_targets_XCore )
 RESTRICT=!test? ( test )
 SLOT=8
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/cfe-8.0.1.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/clang-tools-extra-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-8.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a9576b82fe42d57c06ff5bb1e9fda665
diff --git a/metadata/md5-cache/sys-devel/clang-9.0.1 b/metadata/md5-cache/sys-devel/clang-9.0.1
index 5c5e7fa69cfa..256e17bbe42d 100644
--- a/metadata/md5-cache/sys-devel/clang-9.0.1
+++ b/metadata/md5-cache/sys-devel/clang-9.0.1
@@ -4,14 +4,14 @@ DEPEND=~sys-devel/llvm-9.0.1:9=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU
 DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 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
+IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly 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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 arm ~arm64 ppc64 x86 ~amd64-linux
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-9.0.1 default-compiler-rt? ( =sys-libs/compiler-rt-9.0.1* ) default-libcxx? ( >=sys-libs/libcxx-9.0.1 )
 RDEPEND=~sys-devel/llvm-9.0.1:9=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
-REQUIRED_USE=^^ ( 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 ) || ( 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_WebAssembly llvm_targets_X86 llvm_targets_XCore )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_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_WebAssembly llvm_targets_X86 llvm_targets_XCore )
 RESTRICT=!test? ( test )
 SLOT=9
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-9.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=80a441270b0657da0b15503c36091755
diff --git a/metadata/md5-cache/sys-devel/ct-ng-1.24.0 b/metadata/md5-cache/sys-devel/ct-ng-1.24.0
index a32df8858cd0..744ff47c2bbf 100644
--- a/metadata/md5-cache/sys-devel/ct-ng-1.24.0
+++ b/metadata/md5-cache/sys-devel/ct-ng-1.24.0
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 SLOT=0
 SRC_URI=http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.24.0.tar.bz2
-_md5_=a368f82d2f47ab2085c6702703418e23
+_md5_=cd506307a18f4174bd8fa79af9f1ea37
diff --git a/metadata/md5-cache/sys-devel/distcc-3.3.3 b/metadata/md5-cache/sys-devel/distcc-3.3.3
deleted file mode 100644
index dd93eca8111c..000000000000
--- a/metadata/md5-cache/sys-devel/distcc-3.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare prerm setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) sys-devel/autoconf-archive sys-libs/binutils-libs virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Distribute compilation of C code across several machines on a network
-EAPI=6
-HOMEPAGE=https://github.com/distcc/distcc
-IUSE=gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3.3/distcc-3.3.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0748186e83247e8114952532b63d400b
diff --git a/metadata/md5-cache/sys-devel/distcc-3.3.3-r1 b/metadata/md5-cache/sys-devel/distcc-3.3.3-r1
new file mode 100644
index 000000000000..721468de3a9e
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/distcc-3.3.3-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm prepare prerm setup
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) sys-devel/autoconf-archive sys-libs/binutils-libs virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=Distribute compilation of C code across several machines on a network
+EAPI=6
+HOMEPAGE=https://github.com/distcc/distcc
+IUSE=gnome gssapi gtk hardened ipv6 selinux xinetd zeroconf +python_single_target_python3_6
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-libs/popt gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) !net-misc/pump dev-util/shadowman >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/distcc/distcc/releases/download/v3.3.3/distcc-3.3.3.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0748186e83247e8114952532b63d400b
diff --git a/metadata/md5-cache/sys-devel/gcc-10.0.1_pre9999 b/metadata/md5-cache/sys-devel/gcc-10.0.1_pre9999
index 4598af58f39c..ba56b9566e21 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.0.1_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-10.0.1_pre9999
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gentoo/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-4.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=c9abfccbb53e104d61065ccc1489c689
diff --git a/metadata/md5-cache/sys-devel/gcc-3.3.6-r5 b/metadata/md5-cache/sys-devel/gcc-3.3.6-r5
index 03c20c39d96b..51c88ada2366 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.3.6-r5
+++ b/metadata/md5-cache/sys-devel/gcc-3.3.6-r5
@@ -11,5 +11,5 @@ RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 sys-libs/zlib nls? ( virtual/libintl
 RESTRICT=!test? ( test ) 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.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-uclibc-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-uclibc-patches-1.1.tar.bz2 mirror://gentoo/gcc-3.3.6-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.3.6-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.3.6-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.3.6-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.3.6-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.3.6-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.3.6-patches-3.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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bedaeb43f8a7eda79d51cdca00596582
diff --git a/metadata/md5-cache/sys-devel/gcc-3.4.6-r5 b/metadata/md5-cache/sys-devel/gcc-3.4.6-r5
index ec5305d3a0b3..a20d182bef0b 100644
--- a/metadata/md5-cache/sys-devel/gcc-3.4.6-r5
+++ b/metadata/md5-cache/sys-devel/gcc-3.4.6-r5
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=!test? ( test ) 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-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-3.4.6-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-3.4.6-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-3.4.6-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-3.4.6-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-3.4.6-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-3.4.6-patches-3.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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4543682be5235d880838d7975711af80
diff --git a/metadata/md5-cache/sys-devel/gcc-4.0.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.0.4-r3
index 978071145b36..2d991c53fbb0 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.0.4-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.0.4-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=!test? ( test ) 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-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.0.4-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.0.4-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.0.4-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.0.4-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.0.4-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.0.4-patches-2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=354e86d9e7d47ac40f6269e318f1be87
diff --git a/metadata/md5-cache/sys-devel/gcc-4.1.2-r2 b/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
index 20d2ebc08077..bfd45474cd40 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
+++ b/metadata/md5-cache/sys-devel/gcc-4.1.2-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv
 RESTRICT=!test? ( test ) 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-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.1.2-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.1.2-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.1.2-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.1.2-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.1.2-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.1.2-patches-2.tar.bz2 d? ( mirror://sourceforge/dgcc/gdc-0.24-src.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=2a08ef859ea14073fab220ebf65315be
diff --git a/metadata/md5-cache/sys-devel/gcc-4.2.4-r4 b/metadata/md5-cache/sys-devel/gcc-4.2.4-r4
index ffcedc5fa94f..880e1778f117 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.2.4-r4
+++ b/metadata/md5-cache/sys-devel/gcc-4.2.4-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv fortran? ( >=dev
 RESTRICT=!test? ( test ) 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-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.2.4-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.2.4-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.2.4-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.2.4-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.2.4-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.2.4-patches-2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=303760f192fe6ff6f2d4d8af380073ef
diff --git a/metadata/md5-cache/sys-devel/gcc-4.3.6-r4 b/metadata/md5-cache/sys-devel/gcc-4.3.6-r4
index 527faa1c904a..ab7b55d63df1 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.3.6-r4
+++ b/metadata/md5-cache/sys-devel/gcc-4.3.6-r4
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) 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-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.3.6-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.3.6-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a68d7699c0f3c22db138228d4423f075
diff --git a/metadata/md5-cache/sys-devel/gcc-4.4.7-r3 b/metadata/md5-cache/sys-devel/gcc-4.4.7-r3
index 959066d5c04b..bc17ef8df9bc 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.4.7-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.4.7-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) 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-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.4.7-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.4.7-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.4.7-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.4.7-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.4.7-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.4.7-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=957995ac7f617c659759bd792067f88a
diff --git a/metadata/md5-cache/sys-devel/gcc-4.5.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.5.4-r3
index d79f714c2b3a..e3f217cc9583 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.5.4-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.5.4-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) 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-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.5.4-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.5.4-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.5.4-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.5.4-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.5.4-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.5.4-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cabc687e960527dd7875102e9c482348
diff --git a/metadata/md5-cache/sys-devel/gcc-4.6.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.6.4-r3
index 9dc1685bfc0d..78bca4b6900b 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.6.4-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.6.4-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) 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-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.6.4-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.6.4-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.6.4-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.6.4-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.6.4-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.6.4-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed8b404f4f21e54bf3f7e49b458e3f85
diff --git a/metadata/md5-cache/sys-devel/gcc-4.7.4-r3 b/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
index 0083523714e2..a150b209f230 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.7.4-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) 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.6.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.4-patches-1.6.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.4-patches-1.6.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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=dd8452e4a4146d1a20fe635b61be785f
diff --git a/metadata/md5-cache/sys-devel/gcc-4.8.5-r3 b/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
index fc7afdec6e17..0a7f9d7f2557 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
+++ b/metadata/md5-cache/sys-devel/gcc-4.8.5-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) 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.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.8.5-patches-1.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.8.5-patches-1.5.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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=261bfb58f4ff11b31ac9c5e7a7ef5f5b
diff --git a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1 b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
index 761f44ab008f..0d914d4cf9ed 100644
--- a/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
+++ b/metadata/md5-cache/sys-devel/gcc-4.9.4-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) 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.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.9.4-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.9.4-patches-1.4.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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=bd4757c3bf30580a60f25a00e7cc6415
diff --git a/metadata/md5-cache/sys-devel/gcc-5.5.0 b/metadata/md5-cache/sys-devel/gcc-5.5.0
index 04110384f060..eb2392d38a57 100644
--- a/metadata/md5-cache/sys-devel/gcc-5.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-5.5.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) strip
 SLOT=5.5.0
 SRC_URI=mirror://gnu/gcc/gcc-5.5.0/gcc-5.5.0.tar.xz mirror://gentoo/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-uclibc-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.0-patches-1.0.tar.bz2 mirror://gentoo/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-5.5.0-piepatches-v0.6.5.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-5.5.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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=23f43982dcf71513333c26f9b6250695
diff --git a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
index 447438c9f772..5f3a6a08d7b2 100644
--- a/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-6.5.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) strip
 SLOT=6.5.0
 SRC_URI=mirror://gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz mirror://gentoo/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-6.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-6.5.0-patches-2.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=521ed94afce969069630b174e012f4e6
diff --git a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2 b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
index f7360689d67d..4d22555e5a39 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-7.4.0-r2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) strip
 SLOT=7.4.0
 SRC_URI=mirror://gnu/gcc/gcc-7.4.0/gcc-7.4.0.tar.xz mirror://gentoo/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.4.0-patches-1.2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.4.0-patches-1.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7cc223f5fc4911f953d6b5bacead050b
diff --git a/metadata/md5-cache/sys-devel/gcc-7.5.0 b/metadata/md5-cache/sys-devel/gcc-7.5.0
index 13fd75161e6d..0a5f451d08b0 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.5.0
+++ b/metadata/md5-cache/sys-devel/gcc-7.5.0
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=7.5.0
 SRC_URI=mirror://gnu/gcc/gcc-7.5.0/gcc-7.5.0.tar.xz mirror://gentoo/gcc-7.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.5.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.5.0-patches-1.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e65c2a03a554fe5d5bf79ea6f76160f
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
index 8b19549d4613..8170cb4dda73 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.3.0-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1bfd058a613f793b4b56baa90eb66905
diff --git a/metadata/md5-cache/sys-devel/gcc-8.3.0-r3 b/metadata/md5-cache/sys-devel/gcc-8.3.0-r3
index f0f90b7cfd0b..5b2b67c2f4c3 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.3.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-8.3.0-r3
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eb64f6930755b98d1461af4aaa11d64c
diff --git a/metadata/md5-cache/sys-devel/gcc-9.2.0-r2 b/metadata/md5-cache/sys-devel/gcc-9.2.0-r2
index 8d5ee671a552..56394be75453 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.2.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-9.2.0-r2
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.2.0
 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-3.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=98ad22cfc048d398adf1e80e2a6f11f5
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f6d0a2e405881890de312d4134b8dce4
diff --git a/metadata/md5-cache/sys-devel/gcc-9.2.0-r3 b/metadata/md5-cache/sys-devel/gcc-9.2.0-r3
index 387f21b29722..e76a9b43e0f6 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.2.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-9.2.0-r3
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.2.0
 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-4.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=d2b17f98eb823aecf895aeb84379fc79
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=716eaa1ccc9d73890fd2899726d44832
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 966f38f5b2fe..d7f5f5fa11f1 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=!test? ( test ) 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1352f9e8edec74894f710381b4f65766
diff --git a/metadata/md5-cache/sys-devel/gdb-8.3 b/metadata/md5-cache/sys-devel/gdb-8.3
index 45f4c7238c0a..da35b8a73a0c 100644
--- a/metadata/md5-cache/sys-devel/gdb-8.3
+++ b/metadata/md5-cache/sys-devel/gdb-8.3
@@ -1,16 +1,16 @@
 BDEPEND=app-arch/xz-utils sys-apps/texinfo client? ( virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) )
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
 DESCRIPTION=GNU debugger
 EAPI=7
 HOMEPAGE=https://sourceware.org/gdb/
-IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml 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
+IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
-RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
-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 ) ) || ( client server )
+RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) || ( client server )
 RESTRICT=hppa? ( test ) ia64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-8.3.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-8.3.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c5dd3a6380bd542f0def5004ad230ed6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=459538f796239fa59201978049713ab3
diff --git a/metadata/md5-cache/sys-devel/gdb-8.3.1 b/metadata/md5-cache/sys-devel/gdb-8.3.1
index f38d7488b1fd..ae5f09fbd3cf 100644
--- a/metadata/md5-cache/sys-devel/gdb-8.3.1
+++ b/metadata/md5-cache/sys-devel/gdb-8.3.1
@@ -1,16 +1,16 @@
 BDEPEND=app-arch/xz-utils sys-apps/texinfo client? ( virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) )
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
 DESCRIPTION=GNU debugger
 EAPI=7
 HOMEPAGE=https://sourceware.org/gdb/
-IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml 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
+IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
-RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
-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 ) ) || ( client server )
+RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) || ( client server )
 RESTRICT=hppa? ( test ) ia64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-8.3.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-8.3.1.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9ec064922e0ea93c1d56e414caf1c52b
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=29b1ba5fa1f4c39c65af34b80e82bb9f
diff --git a/metadata/md5-cache/sys-devel/gdb-8.3.1-r1 b/metadata/md5-cache/sys-devel/gdb-8.3.1-r1
index 24043488ec9e..e3bb0f669d96 100644
--- a/metadata/md5-cache/sys-devel/gdb-8.3.1-r1
+++ b/metadata/md5-cache/sys-devel/gdb-8.3.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=app-arch/xz-utils sys-apps/texinfo client? ( virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) )
 DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
 DESCRIPTION=GNU debugger
 EAPI=7
 HOMEPAGE=https://sourceware.org/gdb/
-IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml 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
+IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2
-RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
-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 ) ) || ( client server )
+RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) || ( client server )
 RESTRICT=hppa? ( test ) ia64? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/gdb/gdb-8.3.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-8.3.1.tar.xz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=90b293d5dd2f725634941e3283eff5a0
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5f4113f8abd590d7e202e961c2bea133
diff --git a/metadata/md5-cache/sys-devel/gdb-9.1 b/metadata/md5-cache/sys-devel/gdb-9.1
new file mode 100644
index 000000000000..97bdf7534b43
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gdb-9.1
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/xz-utils sys-apps/texinfo client? ( virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) )
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+DESCRIPTION=GNU debugger
+EAPI=7
+HOMEPAGE=https://sourceware.org/gdb/
+IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) || ( client server )
+RESTRICT=hppa? ( test ) ia64? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnu/gdb/gdb-9.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-9.1.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=33801582a1df20f585bc3fe14fb32365
diff --git a/metadata/md5-cache/sys-devel/gdb-9999 b/metadata/md5-cache/sys-devel/gdb-9999
index 02e6c9549f41..3b8c79b58523 100644
--- a/metadata/md5-cache/sys-devel/gdb-9999
+++ b/metadata/md5-cache/sys-devel/gdb-9999
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/xz-utils sys-apps/texinfo client? ( virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst prepare setup unpack
-DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+DEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
 DESCRIPTION=GNU debugger
 EAPI=7
 HOMEPAGE=https://sourceware.org/gdb/
-IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml 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
+IUSE=+client lzma multitarget nls +python +server source-highlight test vanilla xml python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2 LGPL-2
 PROPERTIES=live
-RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
-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 ) ) || ( client server )
+RDEPEND=client? ( dev-libs/mpfr:0= >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) xml? ( dev-libs/expat ) sys-libs/zlib ) source-highlight? ( dev-util/source-highlight )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) ) || ( client server )
 RESTRICT=hppa? ( test ) ia64? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f829ddd1328d93a82b0f31a36bc8fcaf
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=90f72bbdb4a49293d1994b48ad03296a
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.8.1 b/metadata/md5-cache/sys-devel/gettext-0.19.8.1
deleted file mode 100644
index 9089e6c7f392..000000000000
--- a/metadata/md5-cache/sys-devel/gettext-0.19.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4:= ) >=app-portage/elt-patches-20170317 >=app-portage/elt-patches-20170815 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=GNU locale utilities
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gettext/
-IUSE=acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
-LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
-PDEPEND=emacs? ( app-emacs/po-mode )
-RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4:= ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=ec340c337a6741fe67965dfb595560f8
diff --git a/metadata/md5-cache/sys-devel/icecream-0.9.7-r1 b/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
index ff7aa5f6cb66..ad3da443ac17 100644
--- a/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
+++ b/metadata/md5-cache/sys-devel/icecream-0.9.7-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-0.9.7.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=23f719447d434b9b4f35e8c2551b1ba5
diff --git a/metadata/md5-cache/sys-devel/icecream-1.0.0-r1 b/metadata/md5-cache/sys-devel/icecream-1.0.0-r1
index 017be18b1414..cc7026985ce3 100644
--- a/metadata/md5-cache/sys-devel/icecream-1.0.0-r1
+++ b/metadata/md5-cache/sys-devel/icecream-1.0.0-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/libcap-ng
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-1.0.0.tar.bz2
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4087c7a567498849f15abf0d55074cc3
diff --git a/metadata/md5-cache/sys-devel/icecream-1.0.0-r2 b/metadata/md5-cache/sys-devel/icecream-1.0.0-r2
index 86a617d75ea3..c807acbcb6cb 100644
--- a/metadata/md5-cache/sys-devel/icecream-1.0.0-r2
+++ b/metadata/md5-cache/sys-devel/icecream-1.0.0-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/libcap-ng dev-util/shadowman
 SLOT=0
 SRC_URI=ftp://ftp.suse.com/pub/projects/icecream/icecc-1.0.0.tar.bz2
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=9671d6ba5c4e88e39a0ae1d220b83e18
diff --git a/metadata/md5-cache/sys-devel/kgcc64-4.1.2 b/metadata/md5-cache/sys-devel/kgcc64-4.1.2
index 1330a93eaf96..a92aed19f012 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 e32c2ab52629..3fadf121286c 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 745576c5b16d..8b77ff96e305 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 d2d638da17cd..908ac24ee0fc 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 7f9527b88be7..69d160497243 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 e03be48a5c84..20a385faab64 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 0b6bbf122814..3416d9a31563 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 7037d69a04d4..6692805449eb 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 17f52c4337c5..36098007d1c4 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 5a141f0a4ba6..9bb2fcca668c 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 a1e283a64a36..9e7f8ed7e02f 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 c29ef2ad3674..16b51cfd1e7d 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 608f668a6034..c29fe4595e38 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 91eee2a12c27..0cd080f5ac17 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 30c54a901c52..5414b27d41fa 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 4c64d5c9c9f3..6ea67f90772d 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 dc036d1cfd56..d8d35b61e503 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 e0918eec5822..02c29f5cfec1 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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _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 385ac9a0422e..2530c06e6622 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.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=!test? ( test ) 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7692942c28ca16a1a019705350e29088
diff --git a/metadata/md5-cache/sys-devel/kgcc64-8.3.0 b/metadata/md5-cache/sys-devel/kgcc64-8.3.0
index 126be0478d53..62c0c4523d04 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-8.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-8.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=!test? ( test ) strip
 SLOT=8.3.0
 SRC_URI=mirror://gnu/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz mirror://gentoo/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.3.0-patches-1.0.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.3.0-patches-1.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=7f85787023afacf25f97077d7f472118
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.1.0 b/metadata/md5-cache/sys-devel/kgcc64-9.1.0
index c2c0b0cfe6d3..c1d7d417d31d 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.1.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.1.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) strip
 SLOT=9.1.0
 SRC_URI=mirror://gnu/gcc/gcc-9.1.0/gcc-9.1.0.tar.xz mirror://gentoo/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.1.0-patches-1.1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.1.0-patches-1.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5756d668b26576277a3a1e42c7a29bae
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.2.0 b/metadata/md5-cache/sys-devel/kgcc64-9.2.0
index 856358f9d42e..b65f3046b07f 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.2.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.2.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4
 RESTRICT=!test? ( test ) strip
 SLOT=9.2.0
 SRC_URI=mirror://gnu/gcc/gcc-9.2.0/gcc-9.2.0.tar.xz mirror://gentoo/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.2.0-patches-1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	a06d2fa463e92ccb6188cf4dc8af594a	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	2d449eecceb8b4616b7d31678e2cafda	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=6ac0bb3df5183f456e274138a390689f
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.6-r3 b/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
deleted file mode 100644
index ee296a89ac6b..000000000000
--- a/metadata/md5-cache/sys-devel/libtool-2.4.6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test unpack
-DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4 app-arch/xz-utils >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=app-portage/elt-patches-20170317
-DESCRIPTION=A shared library tool for developers
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libtool/
-IUSE=vanilla
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69 >=sys-devel/automake-1.13 dev-libs/libltdl:0 !<sys-apps/sandbox-2.10-r4
-SLOT=2
-SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=99880aeef3a3ad8d64c442f49a7b362a
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.0.9999 b/metadata/md5-cache/sys-devel/lld-10.0.0.9999
index 056acb506b34..219e3d2cee7d 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( ( dev-lang/python:3.7 ~dev-python/lit-10.0.0.9999[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-10.0.0.9999[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-10.0.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( || ( ( dev-lang/python:3.7 ~dev-python/lit-10.0.0.9999[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-10.0.0.9999[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-10.0.0.9999
 DESCRIPTION=The LLVM linker (link editor)
@@ -11,4 +11,4 @@ RDEPEND=~sys-devel/llvm-10.0.0.9999
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cbea6de51429e8ee581e525d5b934ce
+_md5_=5c375e34dcee7bc881ec16027281d916
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.0_rc1 b/metadata/md5-cache/sys-devel/lld-10.0.0_rc1
index b92b86d7771e..3ff38cce9a54 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.0_rc1
+++ b/metadata/md5-cache/sys-devel/lld-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( ( dev-lang/python:3.7 ~dev-python/lit-10.0.0_rc1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-10.0.0_rc1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-10.0.0_rc1[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( || ( ( dev-lang/python:3.7 ~dev-python/lit-10.0.0_rc1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-10.0.0_rc1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-10.0.0_rc1
 DESCRIPTION=The LLVM linker (link editor)
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cbea6de51429e8ee581e525d5b934ce
+_md5_=5c375e34dcee7bc881ec16027281d916
diff --git a/metadata/md5-cache/sys-devel/lld-11.0.0.9999 b/metadata/md5-cache/sys-devel/lld-11.0.0.9999
index 8698fec42e0e..93d5185b1b66 100644
--- a/metadata/md5-cache/sys-devel/lld-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/lld-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( ( dev-lang/python:3.7 ~dev-python/lit-11.0.0.9999[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-11.0.0.9999[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-11.0.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( || ( ( dev-lang/python:3.7 ~dev-python/lit-11.0.0.9999[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-11.0.0.9999[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-11.0.0.9999
 DESCRIPTION=The LLVM linker (link editor)
@@ -11,4 +11,4 @@ RDEPEND=~sys-devel/llvm-11.0.0.9999
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0cbea6de51429e8ee581e525d5b934ce
+_md5_=5c375e34dcee7bc881ec16027281d916
diff --git a/metadata/md5-cache/sys-devel/lld-9.0.1 b/metadata/md5-cache/sys-devel/lld-9.0.1
index 615f2f108d82..6e7729e15e4e 100644
--- a/metadata/md5-cache/sys-devel/lld-9.0.1
+++ b/metadata/md5-cache/sys-devel/lld-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( || ( ( dev-lang/python:3.7 ~dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-9.0.1[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( || ( ( dev-lang/python:3.7 ~dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 ~dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=~sys-devel/llvm-9.0.1
 DESCRIPTION=The LLVM linker (link editor)
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8fbc6415c9085d7158137bb803f72641
+_md5_=abee4199f81cf2445bb53897668de78a
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-10.0.0.9999
index e8d19bdd8c88..f05963ca4d77 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl sys-devel/gnuconfig || ( >=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-10.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl sys-devel/gnuconfig || ( >=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-10.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=10
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9ebbb51edfb5df60b37b7ce4a94a66d
+_md5_=a078069eec21e0165682a17800e64de8
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.0_rc1 b/metadata/md5-cache/sys-devel/llvm-10.0.0_rc1
index ed748e54675f..109a66d866e6 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.0_rc1
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl sys-devel/gnuconfig || ( >=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-10.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-lang/perl sys-devel/gnuconfig || ( >=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-10.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9ebbb51edfb5df60b37b7ce4a94a66d
+_md5_=a078069eec21e0165682a17800e64de8
diff --git a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
index 12545cd5743c..2a1894f5453d 100644
--- a/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl sys-devel/gnuconfig || ( >=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-11.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl sys-devel/gnuconfig || ( >=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-11.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=11
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9ebbb51edfb5df60b37b7ce4a94a66d
+_md5_=a078069eec21e0165682a17800e64de8
diff --git a/metadata/md5-cache/sys-devel/llvm-9.0.1 b/metadata/md5-cache/sys-devel/llvm-9.0.1
index 28b91e2c6a54..7cfda7055db8 100644
--- a/metadata/md5-cache/sys-devel/llvm-9.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=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-9.0.1.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/recommonmark[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=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-9.0.1.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( dev-lang/python:3.7 dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) libffi? ( virtual/pkgconfig ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gold? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=9
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-9.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07cc4c3371545b07ead06aa4944cb589
+_md5_=7e3b72f25600e75534602e8d7f5c81a4
diff --git a/metadata/md5-cache/sys-fabric/Manifest.gz b/metadata/md5-cache/sys-fabric/Manifest.gz
index 1ccbd2bbec3e..c0f3a4c34b05 100644
--- a/metadata/md5-cache/sys-fabric/Manifest.gz
+++ b/metadata/md5-cache/sys-fabric/Manifest.gz
diff --git a/metadata/md5-cache/sys-fabric/dapl-2.0.40 b/metadata/md5-cache/sys-fabric/dapl-2.0.40
index 8e7fe3e8a258..1a99429f3b27 100644
--- a/metadata/md5-cache/sys-fabric/dapl-2.0.40
+++ b/metadata/md5-cache/sys-fabric/dapl-2.0.40
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 sys-fabric/librdmacm:3.12 !sys-fabric/openib-userspace !sys-fabric/dapl:0 !sys-fabric/dapl:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=85042c578c0bac73aba79502e6bd79df
diff --git a/metadata/md5-cache/sys-fabric/ibacm-1.0.8 b/metadata/md5-cache/sys-fabric/ibacm-1.0.8
index f236039e7932..5725e8378024 100644
--- a/metadata/md5-cache/sys-fabric/ibacm-1.0.8
+++ b/metadata/md5-cache/sys-fabric/ibacm-1.0.8
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibumad:3.12 sys-fabric/libibverbs:3.12 !sys-fabric/ibacm:0 !sys-fabric/ibacm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=186cdfbe3de9a28827ed26b38847055e
diff --git a/metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4 b/metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
index 1e10926fbce2..8cbd02c98563 100644
--- a/metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
+++ b/metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibumad:3.12 sys-fabric/libibmad:3.12 sys-fabric/opensm:3.12 !sys-fabric/infiniband-diags:0 !sys-fabric/infiniband-diags:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=92acbe519dd4ecb4ba953924768c0be0
diff --git a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2 b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
index 24582797a2ab..744d42439fa5 100644
--- a/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
+++ b/metadata/md5-cache/sys-fabric/infinipath-psm-3.2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/infinipath-psm:0 !sys-fabric/infinipath-psm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9635e09ab70f1fc2148f68c9ff4db65e
diff --git a/metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2 b/metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
index 2805ad313325..bbe4987305b1 100644
--- a/metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
+++ b/metadata/md5-cache/sys-fabric/libcxgb3-1.3.1-r2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libcxgb3:0 !sys-fabric/libcxgb3:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fa3cb8679e25310f4ee503908375c4c3
diff --git a/metadata/md5-cache/sys-fabric/libcxgb4-1.3.2 b/metadata/md5-cache/sys-fabric/libcxgb4-1.3.2
index 75fa8f80022e..9eed93e76933 100644
--- a/metadata/md5-cache/sys-fabric/libcxgb4-1.3.2
+++ b/metadata/md5-cache/sys-fabric/libcxgb4-1.3.2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libcxgb4:0 !sys-fabric/libcxgb4:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=621772fee1542a2c9762c477abbf9bb0
diff --git a/metadata/md5-cache/sys-fabric/libehca-1.2.2-r3 b/metadata/md5-cache/sys-fabric/libehca-1.2.2-r3
index 094e8265a2b3..037a9bf2c5e0 100644
--- a/metadata/md5-cache/sys-fabric/libehca-1.2.2-r3
+++ b/metadata/md5-cache/sys-fabric/libehca-1.2.2-r3
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libehca:0 !sys-fabric/libehca:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=922cfc17aab74f6b3cbd96ae6bdaff4f
diff --git a/metadata/md5-cache/sys-fabric/libibcm-1.0.5-r3 b/metadata/md5-cache/sys-fabric/libibcm-1.0.5-r3
index e2b7eccc1f74..fd2aa7451cf5 100644
--- a/metadata/md5-cache/sys-fabric/libibcm-1.0.5-r3
+++ b/metadata/md5-cache/sys-fabric/libibcm-1.0.5-r3
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libibcm:0 !sys-fabric/libibcm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=717b23a7fdb41edb8d96de79d20696e4
diff --git a/metadata/md5-cache/sys-fabric/libibmad-1.3.11 b/metadata/md5-cache/sys-fabric/libibmad-1.3.11
index 56bbfdb5a7fd..762ca47289d8 100644
--- a/metadata/md5-cache/sys-fabric/libibmad-1.3.11
+++ b/metadata/md5-cache/sys-fabric/libibmad-1.3.11
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibumad:3.12 !sys-fabric/libibmad:0 !sys-fabric/libibmad:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=d5389de184c4fea08179827ad8b1dd90
diff --git a/metadata/md5-cache/sys-fabric/libibumad-1.3.9 b/metadata/md5-cache/sys-fabric/libibumad-1.3.9
index 0dead6c892b3..a2d2337dd97e 100644
--- a/metadata/md5-cache/sys-fabric/libibumad-1.3.9
+++ b/metadata/md5-cache/sys-fabric/libibumad-1.3.9
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libibumad:0 !sys-fabric/libibumad:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ba04938ff993cdd4d00122280f8037ac
diff --git a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7 b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
index daf9df45b92c..ab62e7335c89 100644
--- a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
+++ b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libibverbs:0 !sys-fabric/libibverbs:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3a06fc8c31b2bf4a6ada9ef7ff0d0bc7
diff --git a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7-r1 b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7-r1
index 1285d74a7f68..28eb26f41675 100644
--- a/metadata/md5-cache/sys-fabric/libibverbs-1.1.7-r1
+++ b/metadata/md5-cache/sys-fabric/libibverbs-1.1.7-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libibverbs:0 !sys-fabric/libibverbs:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ae39d07242c2bfe641a9e1e30b656325
diff --git a/metadata/md5-cache/sys-fabric/libipathverbs-1.2.1 b/metadata/md5-cache/sys-fabric/libipathverbs-1.2.1
index ced337bf4f73..6a7527c7fbfa 100644
--- a/metadata/md5-cache/sys-fabric/libipathverbs-1.2.1
+++ b/metadata/md5-cache/sys-fabric/libipathverbs-1.2.1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/libipathverbs:0 !sys-fabric/libipathverbs:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=67d99b940226accf00e62c12d3173410
diff --git a/metadata/md5-cache/sys-fabric/libmlx4-1.0.5 b/metadata/md5-cache/sys-fabric/libmlx4-1.0.5
index 1ae9253f3c24..b107c62da22c 100644
--- a/metadata/md5-cache/sys-fabric/libmlx4-1.0.5
+++ b/metadata/md5-cache/sys-fabric/libmlx4-1.0.5
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libmlx4:0 !sys-fabric/libmlx4:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=73cf2f8f6adc101ee8dfedc307499c9d
diff --git a/metadata/md5-cache/sys-fabric/libmlx5-1.0.1 b/metadata/md5-cache/sys-fabric/libmlx5-1.0.1
index d102d777081a..95d36238cd6d 100644
--- a/metadata/md5-cache/sys-fabric/libmlx5-1.0.1
+++ b/metadata/md5-cache/sys-fabric/libmlx5-1.0.1
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libmlx5:0 !sys-fabric/libmlx5:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=902d942e19bb90a7008563b6b8c72c65
diff --git a/metadata/md5-cache/sys-fabric/libmthca-1.0.6 b/metadata/md5-cache/sys-fabric/libmthca-1.0.6
index e32e87047c4f..bfc0236da0a6 100644
--- a/metadata/md5-cache/sys-fabric/libmthca-1.0.6
+++ b/metadata/md5-cache/sys-fabric/libmthca-1.0.6
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/openib-userspace !sys-fabric/libmthca:0 !sys-fabric/libmthca:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=3987bfbd712f82a66ce0e6b2498baa81
diff --git a/metadata/md5-cache/sys-fabric/libnes-1.1.4 b/metadata/md5-cache/sys-fabric/libnes-1.1.4
index b4b716a3258f..8f1ba84c8b5c 100644
--- a/metadata/md5-cache/sys-fabric/libnes-1.1.4
+++ b/metadata/md5-cache/sys-fabric/libnes-1.1.4
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/openib-userspace !sys-fabric/libnes:0 !sys-fabric/libnes:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4e7b26bb71e0b888f4c13dd97f9738b5
diff --git a/metadata/md5-cache/sys-fabric/libocrdma-1.0.2 b/metadata/md5-cache/sys-fabric/libocrdma-1.0.2
index 6d8b2f49991e..834d860caf88 100644
--- a/metadata/md5-cache/sys-fabric/libocrdma-1.0.2
+++ b/metadata/md5-cache/sys-fabric/libocrdma-1.0.2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib-userspace !sys-fabric/libocrdma:0 !sys-fabric/libocrdma:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=bb059b01b4f2697685097193db47563e
diff --git a/metadata/md5-cache/sys-fabric/librdmacm-1.0.18 b/metadata/md5-cache/sys-fabric/librdmacm-1.0.18
index 949e8af953b6..f5c0d76b02c0 100644
--- a/metadata/md5-cache/sys-fabric/librdmacm-1.0.18
+++ b/metadata/md5-cache/sys-fabric/librdmacm-1.0.18
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/openib-userspace !sys-fabric/librdmacm:0 !sys-fabric/librdmacm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=faa9911a93ac37ab84c77f0fe23123f2
diff --git a/metadata/md5-cache/sys-fabric/librdmacm-1.0.18-r1 b/metadata/md5-cache/sys-fabric/librdmacm-1.0.18-r1
index b65c55323e25..09453cee9bea 100644
--- a/metadata/md5-cache/sys-fabric/librdmacm-1.0.18-r1
+++ b/metadata/md5-cache/sys-fabric/librdmacm-1.0.18-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !sys-fabric/openib-userspace !sys-fabric/librdmacm:0 !sys-fabric/librdmacm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=453de43782055bf31c8c5ddf87e376ca
diff --git a/metadata/md5-cache/sys-fabric/ofed-3.12_rc1 b/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
index a307f10efe78..76975dd7cec2 100644
--- a/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
+++ b/metadata/md5-cache/sys-fabric/ofed-3.12_rc1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib !sys-fabric/openib-files sys-fabric/libibcm:3.12 sys-fabric/libibmad:3.12 sys-fabric/libibumad:3.12 sys-fabric/librdmacm:3.12 dapl? ( sys-fabric/dapl:3.12 ) diags? ( sys-fabric/infiniband-diags:3.12 ) ibacm? ( sys-fabric/ibacm:3.12 ) opensm? ( sys-fabric/opensm:3.12 ) perftest? ( sys-fabric/perftest:3.12 ) qperf? ( sys-fabric/qperf:3.12 ) srp? ( sys-fabric/srptools:3.12 ) rds? ( sys-fabric/rds-tools:3.12 ) ofed_drivers_cxgb3? ( sys-fabric/libcxgb3:3.12 ) ofed_drivers_cxgb4? ( sys-fabric/libcxgb4:3.12 ) ofed_drivers_ehca? ( sys-fabric/libehca:3.12 ) ofed_drivers_ipath? ( sys-fabric/libipathverbs:3.12 ) ofed_drivers_mlx4? ( sys-fabric/libmlx4:3.12 ) ofed_drivers_mlx5? ( sys-fabric/libmlx5:3.12 ) ofed_drivers_mthca? ( sys-fabric/libmthca:3.12 ) ofed_drivers_nes? ( sys-fabric/libnes:3.12 ) ofed_drivers_ocrdma? ( sys-fabric/libocrdma:3.12 ) ofed_drivers_psm? ( sys-fabric/infinipath-psm:3.12 ) !sys-fabric/ofed:0 !sys-fabric/ofed:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=aef86e3f03d45fffbd5bc07fa82ea0ff
diff --git a/metadata/md5-cache/sys-fabric/opensm-3.3.17-r1 b/metadata/md5-cache/sys-fabric/opensm-3.3.17-r1
index b20bb2ec1cab..2b8ca9ca7786 100644
--- a/metadata/md5-cache/sys-fabric/opensm-3.3.17-r1
+++ b/metadata/md5-cache/sys-fabric/opensm-3.3.17-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibmad:3.12 sys-fabric/libibumad:3.12 tools? ( net-misc/iputils net-misc/openssh ) !sys-fabric/opensm:0 !sys-fabric/opensm:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=5b7c0a98a48832fe3431e49f03a2e54e
diff --git a/metadata/md5-cache/sys-fabric/perftest-2.0 b/metadata/md5-cache/sys-fabric/perftest-2.0
index df1815f1a18d..3934213dfa1f 100644
--- a/metadata/md5-cache/sys-fabric/perftest-2.0
+++ b/metadata/md5-cache/sys-fabric/perftest-2.0
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 sys-fabric/libibumad:3.12 sys-fabric/librdmacm:3.12 !sys-fabric/perftest:0 !sys-fabric/perftest:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=b4ddf6faf090e9f702ddb55a743418e9
diff --git a/metadata/md5-cache/sys-fabric/qperf-0.4.9 b/metadata/md5-cache/sys-fabric/qperf-0.4.9
index ee7392daef0b..2dcc6c5a6388 100644
--- a/metadata/md5-cache/sys-fabric/qperf-0.4.9
+++ b/metadata/md5-cache/sys-fabric/qperf-0.4.9
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=!sys-fabric/openib-userspace !sys-fabric/qperf:0 !sys-fabric/qperf:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=194aa05894fbf21d66bf479c7e54cfc3
diff --git a/metadata/md5-cache/sys-fabric/rds-tools-2.0.4-r3 b/metadata/md5-cache/sys-fabric/rds-tools-2.0.4-r3
index 030552264f27..f79afa2bfd50 100644
--- a/metadata/md5-cache/sys-fabric/rds-tools-2.0.4-r3
+++ b/metadata/md5-cache/sys-fabric/rds-tools-2.0.4-r3
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 !sys-fabric/openib-userspace !sys-fabric/rds-tools:0 !sys-fabric/rds-tools:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=eff35b759e88b448ed4d0583ff7058df
diff --git a/metadata/md5-cache/sys-fabric/srptools-1.0.2 b/metadata/md5-cache/sys-fabric/srptools-1.0.2
index 7603a1d8453a..a07a153b15fd 100644
--- a/metadata/md5-cache/sys-fabric/srptools-1.0.2
+++ b/metadata/md5-cache/sys-fabric/srptools-1.0.2
@@ -8,5 +8,5 @@ LICENSE=|| ( GPL-2 BSD-2 )
 RDEPEND=sys-fabric/libibverbs:3.12 sys-fabric/libibumad:3.12 !sys-fabric/srptools:0 !sys-fabric/srptools:3.5
 SLOT=3.12
 SRC_URI=https://www.openfabrics.org/downloads/OFED/ofed-3.12/OFED-3.12-rc1.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	openib	443c6b0f0a1051b711905cf473961cb2	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=9fb619762a89112091df133b29a45b10
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 0f82fb4847eb..141b42839f20 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/edk2-ovmf-201905 b/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
index e1f46a94849a..2086b25370b2 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-201905
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.7[sqlite] dev-lang/python:3.6[sqlite] >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) )
+DEPEND=!binary? ( amd64? ( app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.7[sqlite] dev-lang/python:3.6[sqlite] ) ) )
 DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/edk2
@@ -10,4 +10,4 @@ REQUIRED_USE=!amd64? ( binary )
 SLOT=0
 SRC_URI=!binary? ( https://github.com/tianocore/edk2/archive/edk2-stable201905.tar.gz -> edk2-ovmf-201905.tar.gz https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-201905-bundled.tar.xz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/edk2-ovmf-201905-bin.tar.xz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=be1002f100eeb072e0a9c006693959f1
+_md5_=eea5a2cfea6d246a2aab5992d39d1fe4
diff --git a/metadata/md5-cache/sys-firmware/edk2-ovmf-999999 b/metadata/md5-cache/sys-firmware/edk2-ovmf-999999
index c449d88a28f4..43aa198f9562 100644
--- a/metadata/md5-cache/sys-firmware/edk2-ovmf-999999
+++ b/metadata/md5-cache/sys-firmware/edk2-ovmf-999999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst prepare setup unpack
-DEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.7[sqlite] dev-lang/python:3.6[sqlite] >=dev-lang/python-2.7.5-r2:2.7[sqlite] )
+DEPEND=app-emulation/qemu >=dev-lang/nasm-2.0.7 >=sys-power/iasl-20160729 || ( dev-lang/python:3.7[sqlite] dev-lang/python:3.6[sqlite] )
 DESCRIPTION=UEFI firmware for 64-bit x86 virtual machines
 EAPI=7
 HOMEPAGE=https://github.com/tianocore/edk2
@@ -8,4 +8,4 @@ LICENSE=BSD-2 MIT
 PROPERTIES=live
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=22dc05c11ff6160cde7ccddd3641f7c7
+_md5_=1b4d9267e81e3b131d3692cd08dedb16
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20191115_p20191110 b/metadata/md5-cache/sys-firmware/intel-microcode-20191115_p20191110
deleted file mode 100644
index ef423d3a20bc..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20191115_p20191110
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/iucode_tool
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
-DESCRIPTION=Intel IA32/IA64 microcode update data
-EAPI=7
-HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
-IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=hostonly? ( sys-apps/iucode_tool )
-REQUIRED_USE=|| ( initramfs split-ucode )
-RESTRICT=binchecks bindist mirror strip
-SLOT=0
-SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20191115.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20191110.tar.xz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	e30bb691fbb26137f3d46438542bffe4	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=55de44db15781a26e736b7b99605ffd1
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20191115_p20200209 b/metadata/md5-cache/sys-firmware/intel-microcode-20191115_p20200209
new file mode 100644
index 000000000000..13ca0576f3fa
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20191115_p20200209
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/iucode_tool
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup
+DESCRIPTION=Intel IA32/IA64 microcode update data
+EAPI=7
+HOMEPAGE=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/
+IUSE=hostonly initramfs +split-ucode vanilla kernel_linux
+KEYWORDS=-* amd64 x86
+LICENSE=intel-ucode
+RDEPEND=hostonly? ( sys-apps/iucode_tool )
+REQUIRED_USE=|| ( initramfs split-ucode )
+RESTRICT=binchecks bindist mirror strip
+SLOT=0
+SRC_URI=https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-20191115.tar.gz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20200209.tar.xz
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	mount-boot	e30bb691fbb26137f3d46438542bffe4	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a59d353a58b037113bb23649974333d7
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.10.2 b/metadata/md5-cache/sys-firmware/seabios-1.10.2
index 365c4d8b321e..94468b9f1782 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.10.2
+++ b/metadata/md5-cache/sys-firmware/seabios-1.10.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install pretend setup unpack
-DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
+DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) )
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=6
 HOMEPAGE=https://www.seabios.org/
@@ -10,4 +10,4 @@ REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.2.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.10.2-bin.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=997801edf7a5c2861f969d24159223fd
+_md5_=4d34961b181d70ed2082fd95bbe824f2
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.11.0 b/metadata/md5-cache/sys-firmware/seabios-1.11.0
index 3568220e8729..da9dcd7f8547 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.11.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install pretend setup unpack
-DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
+DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) )
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=6
 HOMEPAGE=https://www.seabios.org/
@@ -10,4 +10,4 @@ REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.11.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.11.0-bin.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e49cd604552e970ec3bc14ffd19e1050
+_md5_=48b28725e86a414c0601a5698b51c62e
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.11.0-r1 b/metadata/md5-cache/sys-firmware/seabios-1.11.0-r1
index b17913c70360..344f9b87b8a6 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.11.0-r1
+++ b/metadata/md5-cache/sys-firmware/seabios-1.11.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) )
+DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) )
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=6
 HOMEPAGE=https://www.seabios.org/
@@ -10,4 +10,4 @@ REQUIRED_USE=debug? ( !binary )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.11.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.11.0-bin.tar.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc9e295829e9ee15ded13a872ade5b89
+_md5_=6d4f16a21b6a788b4975286c12c6013a
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.12.0 b/metadata/md5-cache/sys-firmware/seabios-1.12.0
index a8a4f04810d0..964f05e7dc13 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.12.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) ) )
+DEPEND=!binary? ( amd64? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) x86? ( >=sys-power/iasl-20060912 || ( dev-lang/python:3.6 ) ) )
 DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
 EAPI=7
 HOMEPAGE=https://www.seabios.org/
@@ -10,4 +10,4 @@ REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
 SLOT=0
 SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.12.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.12.0-bin.tar.xz )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9797ef243e9df8568d31c3557380a2f4
+_md5_=31dedbd98d593d41276fb622b273cc09
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 8da9df485233..62e4b78f667e 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/btrfs-progs-4.19 b/metadata/md5-cache/sys-fs/btrfs-progs-4.19
index e4c15f1bdf56..0ff5592670e7 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-4.19
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-4.19
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) >=app-text/asciidoc-8.6.0 app-text/docbook-xml-dtd:4.5 app-text/xmlto python? ( python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=6
 HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert python reiserfs static static-libs +zstd python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+convert python reiserfs static static-libs +zstd python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.19.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=6c5a8b32070dc4b5a1313f3eca418bc2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=7b2b3116d5efa1fe472eb7f548f30cad
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.4 b/metadata/md5-cache/sys-fs/btrfs-progs-5.4
index f57f7e3b6a5c..bb323da1d239 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.4
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.4
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.4.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=795890cc8d21b86e08e674aa9a9e789e
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=89b661eff4e88e09ced74f0074ae8449
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-5.4.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.4.1
index b2eac04059bf..f386e3921488 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-5.4.1
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.4.1
@@ -1,16 +1,16 @@
 BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto )
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0/0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.4.1.tar.xz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=98ff82bd62749dc5979157fbae94af28
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d2b8832727de829ebdddd1fc8607d687
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index f2c4805ab306..18c6287568af 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -1,15 +1,15 @@
 BDEPEND=doc? ( || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) app-text/docbook-xml-dtd:4.5 app-text/xmlto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) ) sys-devel/gnuconfig
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= ) convert? ( sys-apps/acl ) python? ( python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/setuptools[python_targets_python3_7(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs:0[static-libs(+)] sys-libs/e2fsprogs-libs:0[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd:0[static-libs(+)] ) ) sys-devel/gnuconfig
 DESCRIPTION=Btrfs filesystem utilities
 EAPI=7
 HOMEPAGE=https://btrfs.wiki.kernel.org
-IUSE=+convert doc python reiserfs static static-libs +zstd python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=+convert doc python reiserfs static static-libs +zstd python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:0=[static-libs(+)?] sys-libs/zlib:0= convert? ( sys-fs/e2fsprogs:0= sys-libs/e2fsprogs-libs:0= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0/0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=795890cc8d21b86e08e674aa9a9e789e
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=89b661eff4e88e09ced74f0074ae8449
diff --git a/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4.2 b/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4.2
index 1a7b42b5782f..8f8ed5d51f6b 100644
--- a/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4.2
+++ b/metadata/md5-cache/sys-fs/btrfsmaintenance-0.4.2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/btrfs-progs systemd? ( sys-apps/systemd ) !systemd? ( virtual/cro
 SLOT=0
 SRC_URI=https://github.com/kdave/btrfsmaintenance/archive/v0.4.2.tar.gz -> btrfsmaintenance-0.4.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ae31b717cad0a8314c1d53b7899def39
+_md5_=303b4dc433405c321fb741a3282890c9
diff --git a/metadata/md5-cache/sys-fs/cryfs-0.10.2 b/metadata/md5-cache/sys-fs/cryfs-0.10.2
index d776fb56dfdc..e2ac5e20e936 100644
--- a/metadata/md5-cache/sys-fs/cryfs-0.10.2
+++ b/metadata/md5-cache/sys-fs/cryfs-0.10.2
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.65.1:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) test? ( dev-cpp/gtest )
+DEPEND=>=dev-libs/boost-1.65.1:= >=dev-libs/crypto++-8.2.0:= net-misc/curl:= >=sys-fs/fuse-2.8.6:0 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) test? ( dev-cpp/gtest )
 DESCRIPTION=Encrypted FUSE filesystem that conceals metadata
 EAPI=7
 HOMEPAGE=https://www.cryfs.org/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cryfs/cryfs/releases/download/0.10.2/cryfs-0.10.2.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e6508dee031a015e4538454d3c734a0
+_md5_=ff502baf0f9ca5081eb1bc08046d9f9c
diff --git a/metadata/md5-cache/sys-fs/cryptmount-5.3.1 b/metadata/md5-cache/sys-fs/cryptmount-5.3.1
deleted file mode 100644
index 6112ebcc0030..000000000000
--- a/metadata/md5-cache/sys-fs/cryptmount-5.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure prepare setup
-DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) nls? ( sys-devel/gettext ) luks? ( sys-fs/cryptsetup ) openssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) virtual/libiconv virtual/libintl sys-kernel/linux-headers
-DESCRIPTION=A utility for management and user-mode mounting of encrypted filesystems
-EAPI=7
-HOMEPAGE=http://cryptmount.sourceforge.net/
-IUSE=argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) nls? ( sys-devel/gettext ) luks? ( sys-fs/cryptsetup ) openssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) virtual/libiconv virtual/libintl
-REQUIRED_USE=luks? ( gcrypt ) openssl? ( gcrypt )
-SLOT=0
-SRC_URI=mirror://sourceforge/cryptmount/cryptmount-5.3.1.tar.gz
-_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=01f171336be127ae41d27cf403b17cdf
diff --git a/metadata/md5-cache/sys-fs/cryptmount-5.3.2 b/metadata/md5-cache/sys-fs/cryptmount-5.3.2
index caa082ed5ec6..92ebd595f03c 100644
--- a/metadata/md5-cache/sys-fs/cryptmount-5.3.2
+++ b/metadata/md5-cache/sys-fs/cryptmount-5.3.2
@@ -5,11 +5,11 @@ DESCRIPTION=A utility for management and user-mode mounting of encrypted filesys
 EAPI=7
 HOMEPAGE=http://cryptmount.sourceforge.net/
 IUSE=argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev kernel_linux
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) luks? ( sys-fs/cryptsetup ) openssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) virtual/libiconv virtual/libintl
 REQUIRED_USE=luks? ( gcrypt ) openssl? ( gcrypt )
 SLOT=0
 SRC_URI=mirror://sourceforge/cryptmount/cryptmount-5.3.2.tar.gz
 _eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c97049c0cceb1b11970f3570e5c9ce94
+_md5_=3a036a60ae8ab48b3da9d6a2646c4bc3
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 c16e1cceca45..d9ee60519010 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_6 python_targets_python3_7 ) ) static? ( !gcrypt )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-1.7.5.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19b68aee8b3caee0b23386c2dbf96dd8
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.2.2 b/metadata/md5-cache/sys-fs/cryptsetup-2.2.2
index 5eaf5d107606..7381f3a901c4 100644
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.2.2
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.2.2
@@ -5,11 +5,11 @@ DESCRIPTION=Tool to setup encrypted devices with dm-crypt
 EAPI=7
 HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
 IUSE=gcrypt kernel nettle +openssl +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom 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+
 RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
 REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
 SLOT=0/12
 SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.2/cryptsetup-2.2.2.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1b0fb0a0f46e2b927ccd952c5d8923c9
+_md5_=54bd4ced7f3a85e9bc249bd207d0ab1b
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.0 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.0
new file mode 100644
index 000000000000..c49e5517a35a
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.3.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 pretend setup test
+DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=7
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=gcrypt kernel nettle +openssl +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.0.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e1c57ac819bf36720dc1999d47fe7e00
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.3.0_rc0 b/metadata/md5-cache/sys-fs/cryptsetup-2.3.0_rc0
deleted file mode 100644
index e3a17c60bf11..000000000000
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.3.0_rc0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 pretend setup test
-DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) )
-DESCRIPTION=Tool to setup encrypted devices with dm-crypt
-EAPI=7
-HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-IUSE=gcrypt kernel nettle +openssl +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom kernel_linux
-LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:0=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(-)] ) ) dev-libs/json-c:= dev-libs/libgpg-error dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev )
-REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) libressl? ( openssl ) static? ( !gcrypt )
-SLOT=0/12
-SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-2.3.0-rc0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e1c57ac819bf36720dc1999d47fe7e00
diff --git a/metadata/md5-cache/sys-fs/dd-rescue-1.99.8 b/metadata/md5-cache/sys-fs/dd-rescue-1.99.8
index 454baf96e8c9..a397e448bdcc 100644
--- a/metadata/md5-cache/sys-fs/dd-rescue-1.99.8
+++ b/metadata/md5-cache/sys-fs/dd-rescue-1.99.8
@@ -10,4 +10,4 @@ RDEPEND=lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr )
 SLOT=0
 SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.99.8.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce420926ee87cf15cefbd8cb718736e9
+_md5_=305c0feb2fff87501a49c91bc3daa23d
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-108-r3 b/metadata/md5-cache/sys-fs/ecryptfs-utils-108-r3
index e36e4ed23cec..e0a24ce6185d 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-108-r3
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-108-r3
@@ -3,12 +3,12 @@ DEPEND=>=sys-apps/keyutils-1.0:= >=dev-libs/libgcrypt-1.2.0:0 dev-libs/nss gpg?
 DESCRIPTION=eCryptfs userspace utilities
 EAPI=6
 HOMEPAGE=https://launchpad.net/ecryptfs
-IUSE=doc gpg gtk nls openssl pam pkcs11 python suid tpm +python_targets_python2_7 +python_single_target_python2_7 kernel_linux
+IUSE=doc gpg gtk nls openssl pam pkcs11 python suid tpm +python_single_target_python2_7 kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/keyutils-1.0:= >=dev-libs/libgcrypt-1.2.0:0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7:= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7:= >=dev-libs/pkcs11-helper-1.04 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) tpm? ( app-crypt/trousers )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://launchpad.net/ecryptfs/trunk/108/+download/ecryptfs-utils_108.orig.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=acdf1033bec28760cfc16525326790e0
diff --git a/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609 b/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609
index 95748eef2a8d..80b352f2c5e2 100644
--- a/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609
+++ b/metadata/md5-cache/sys-fs/ecryptfs-utils-111_p20170609
@@ -3,12 +3,12 @@ DEPEND=>=sys-apps/keyutils-1.5.11-r1:= >=dev-libs/libgcrypt-1.2.0:0 dev-libs/nss
 DESCRIPTION=eCryptfs userspace utilities
 EAPI=6
 HOMEPAGE=https://launchpad.net/ecryptfs
-IUSE=doc gpg gtk nls openssl pam pkcs11 python suid tpm +python_targets_python2_7 +python_single_target_python2_7 kernel_linux
+IUSE=doc gpg gtk nls openssl pam pkcs11 python suid tpm +python_single_target_python2_7 kernel_linux
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/keyutils-1.5.11-r1:= >=dev-libs/libgcrypt-1.2.0:0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7:= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7:= >=dev-libs/pkcs11-helper-1.04 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) tpm? ( app-crypt/trousers )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~bkohler/dist/ecryptfs-utils-111_p20170609.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5fd115dc2862e0598d2ad2de1c65c565
diff --git a/metadata/md5-cache/sys-fs/fatsort-1.6.2.605 b/metadata/md5-cache/sys-fs/fatsort-1.6.2.605
new file mode 100644
index 000000000000..2ea37a0b8e0b
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/fatsort-1.6.2.605
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile prepare test
+DESCRIPTION=Sorts files on FAT16/32 partitions, ideal for basic audio players
+EAPI=7
+HOMEPAGE=http://fatsort.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/fatsort/fatsort-1.6.2.605.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1c37ad0247000d42d7384bfae63cfb13
diff --git a/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r2 b/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r2
index d5bbea462b68..bf283f0b736e 100644
--- a/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r2
+++ b/metadata/md5-cache/sys-fs/hfsplusutils-1.0.4-r2
@@ -3,10 +3,9 @@ DEFINED_PHASES=configure install prepare
 DESCRIPTION=HFS+ Filesystem Access Utilities (a PPC filesystem)
 EAPI=7
 HOMEPAGE=http://penguinppc.org/historical/hfsplus/
-IUSE=static-libs
 KEYWORDS=~amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://penguinppc.org/historical/hfsplus/hfsplus_1.0.4.src.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=45dd1f5d8ec21b5b93a30e06bf82a152
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b728fe9b85b520b1e8f2b43064f36f64
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.22 b/metadata/md5-cache/sys-fs/mtools-4.0.22
index 8fa6011f4722..61029bab1dad 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.22
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.22
@@ -10,4 +10,4 @@ RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau
 SLOT=0
 SRC_URI=mirror://gnu/mtools/mtools-4.0.22.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b492aad765e86e6da318d96244fa3a17
+_md5_=c0d3da2474f1f3e7126a6978ef4ae6a7
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.23 b/metadata/md5-cache/sys-fs/mtools-4.0.23
index cbc53040b82e..7deebd0a3a81 100644
--- a/metadata/md5-cache/sys-fs/mtools-4.0.23
+++ b/metadata/md5-cache/sys-fs/mtools-4.0.23
@@ -10,4 +10,4 @@ RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau
 SLOT=0
 SRC_URI=mirror://gnu/mtools/mtools-4.0.23.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b492aad765e86e6da318d96244fa3a17
+_md5_=c0d3da2474f1f3e7126a6978ef4ae6a7
diff --git a/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2 b/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
index e0ecefe8d30b..27101380c6fa 100644
--- a/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
+++ b/metadata/md5-cache/sys-fs/owfs-3.2_p2-r2
@@ -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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5633734ec7af1a99ef8371a9c76f3c7d
diff --git a/metadata/md5-cache/sys-fs/pysize-0.2-r1 b/metadata/md5-cache/sys-fs/pysize-0.2-r1
index 8fb8ba39b5ce..2e4c1a3c8f2d 100644
--- a/metadata/md5-cache/sys-fs/pysize-0.2-r1
+++ b/metadata/md5-cache/sys-fs/pysize-0.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://guichaz.free.fr/pysize/files/pysize-0.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e57a5d2d79f16eebabcc4489d701656a
diff --git a/metadata/md5-cache/sys-fs/pysize-0.2-r2 b/metadata/md5-cache/sys-fs/pysize-0.2-r2
index b4d951bbfc56..646c0b2e867d 100644
--- a/metadata/md5-cache/sys-fs/pysize-0.2-r2
+++ b/metadata/md5-cache/sys-fs/pysize-0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 ) || ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://guichaz.free.fr/pysize/files/pysize-0.2.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9cc3fb67a1039ffd2f05a9c39a98ed28
diff --git a/metadata/md5-cache/sys-fs/squashfs-tools-9999 b/metadata/md5-cache/sys-fs/squashfs-tools-9999
index 7215a2226175..41124ee76190 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-9999
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 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_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=055873276c1db4a1dac8a718e5b43d45
+_md5_=6489d61d2ac03c54a07f8bde40ce58b7
diff --git a/metadata/md5-cache/sys-fs/traydevice-1.6.2-r1 b/metadata/md5-cache/sys-fs/traydevice-1.6.2-r1
deleted file mode 100644
index 5fcbe9ad3516..000000000000
--- a/metadata/md5-cache/sys-fs/traydevice-1.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-text/docbook2X python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-DESCRIPTION=A little desktop application displaying systray icon for UDisks
-EAPI=5
-HOMEPAGE=https://savannah.nongnu.org/projects/traydevice/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-fs/udisks:2 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://nongnu/traydevice/traydevice-1.6.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9eb962662fd301966826d326c50b2b16
diff --git a/metadata/md5-cache/sys-fs/traydevice-1.6.2-r2 b/metadata/md5-cache/sys-fs/traydevice-1.6.2-r2
new file mode 100644
index 000000000000..e7732f94de33
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/traydevice-1.6.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-text/docbook2X python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A little desktop application displaying systray icon for UDisks
+EAPI=5
+HOMEPAGE=https://savannah.nongnu.org/projects/traydevice/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( dev-python/dbus-python[python_targets_python2_7(-)] dev-python/lxml[python_targets_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)] ) sys-fs/udisks:2 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://nongnu/traydevice/traydevice-1.6.2.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=afaa8a56fe86711e042e8673ee05a41a
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-33 b/metadata/md5-cache/sys-fs/udev-init-scripts-33
index c393b5614df3..27ee9178c475 100644
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-33
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-33
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=udev startup scripts for openrc
 EAPI=7
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86
 LICENSE=GPL-2
 RDEPEND=>=virtual/udev-217 !<sys-apps/openrc-0.14
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/udev-gentoo-scripts.git/snapshot/udev-gentoo-scripts-33.tar.gz -> udev-init-scripts-33.tar.gz
-_md5_=5721bda553f9d98b3edee400c683d9c2
+_md5_=e51a1ef2f14f70c6feeca2dc15576de3
diff --git a/metadata/md5-cache/sys-fs/udev-init-scripts-9999 b/metadata/md5-cache/sys-fs/udev-init-scripts-9999
index 72392398a7fa..9e9d504ab2cf 100644
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-9999
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-9999
@@ -2,11 +2,11 @@ BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=install postinst unpack
 DESCRIPTION=udev startup scripts for openrc
 EAPI=7
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=virtual/udev-217 !<sys-apps/openrc-0.14
 RESTRICT=test
 SLOT=0
 _eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33
-_md5_=62e155a655a1ddf95e650427a726cb05
+_md5_=7f4e2f939e8731107c0bf0960958e61c
diff --git a/metadata/md5-cache/sys-fs/udiskie-1.7.7 b/metadata/md5-cache/sys-fs/udiskie-1.7.7
index 511952e86c0b..aa56dd761a7e 100644
--- a/metadata/md5-cache/sys-fs/udiskie-1.7.7
+++ b/metadata/md5-cache/sys-fs/udiskie-1.7.7
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/u/udiskie/udiskie-1.7.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ae5932b0cfa9c1b5143bf89247f0acb0
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.0.4 b/metadata/md5-cache/sys-fs/udiskie-2.0.4
index 1c0d96484102..af22018865bc 100644
--- a/metadata/md5-cache/sys-fs/udiskie-2.0.4
+++ b/metadata/md5-cache/sys-fs/udiskie-2.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/u/udiskie/udiskie-2.0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8edd61037973770fa0caacbd8f282852
diff --git a/metadata/md5-cache/sys-fs/udiskie-2.1.0 b/metadata/md5-cache/sys-fs/udiskie-2.1.0
new file mode 100644
index 000000000000..d6fabc6d0562
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udiskie-2.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-text/asciidoc dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=An automatic disk mounting service using udisks
+EAPI=6
+HOMEPAGE=https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=dev-python/docopt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-fs/udisks:2 python_targets_python3_6? ( dev-python/importlib_resources[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/u/udiskie/udiskie-2.1.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8edd61037973770fa0caacbd8f282852
diff --git a/metadata/md5-cache/sys-fs/udisks-2.8.4 b/metadata/md5-cache/sys-fs/udisks-2.8.4
index d72a01a5b9ca..1ef680103d34 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.4
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.4
@@ -12,4 +12,4 @@ REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.4/udisks-2.8.4.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c7ae8bae8dd001d15c1fa8a8ce00a374
+_md5_=ee7cf09bea8ffbf2829147c3ca6dd324
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.13-r1 b/metadata/md5-cache/sys-fs/zfs-0.7.13-r1
index ff1ccd443675..a814206f45d1 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.13-r1
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.13-r1
@@ -3,13 +3,13 @@ DEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=5
 HOMEPAGE=https://zfsonlinux.org/
-IUSE=custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6 split-usr
+IUSE=custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs kernel_linux +python_single_target_python3_6 split-usr
 KEYWORDS=amd64
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.13* ) !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 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) sys-fs/udev-init-scripts
-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 )
+RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.13* ) !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 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) sys-fs/udev-init-scripts
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/zfs-0.7.13.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f65e5fd9047254702323033b6c8c32e6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=301540c59449bba3dffea6baa1709086
diff --git a/metadata/md5-cache/sys-fs/zfs-0.7.13-r2 b/metadata/md5-cache/sys-fs/zfs-0.7.13-r2
index 59a8c5670062..9f043ea688c7 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.7.13-r2
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.13-r2
@@ -3,12 +3,12 @@ DEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=5
 HOMEPAGE=https://zfsonlinux.org/
-IUSE=custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6 split-usr
+IUSE=custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs kernel_linux +python_single_target_python3_6 split-usr
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.13* ) !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 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) sys-fs/udev-init-scripts
-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 )
+RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.13* ) !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 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) sys-fs/udev-init-scripts
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/zfs-0.7.13.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5179dc19cd461bd89696d8fde4b1156b
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=84be2a676d403705f6cd80f735959bdd
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.2-r2 b/metadata/md5-cache/sys-fs/zfs-0.8.2-r2
index ec3989f5ccb0..f4ce5ffdbf88 100644
--- a/metadata/md5-cache/sys-fs/zfs-0.8.2-r2
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.2-r2
@@ -1,16 +1,16 @@
-BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig
+BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[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(-)] ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://zfsonlinux.org/
-IUSE=custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 split-usr
+IUSE=custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs kernel_linux kernel_linux kernel_linux python_targets_python3_6 python_targets_python3_7 split-usr
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[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(-)] ) !=sys-apps/grep-2.13* !kernel-builtin? ( ~sys-fs/zfs-kmod-0.8.2 ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !=sys-apps/grep-2.13* !kernel-builtin? ( ~sys-fs/zfs-kmod-0.8.2 ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.2/zfs-0.8.2.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=f0c39b10112bbc56b3b72065fb93c8ed
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=d8105fdbbad11642108a108eb091b3e9
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.3 b/metadata/md5-cache/sys-fs/zfs-0.8.3
deleted file mode 100644
index 831ccf03dad8..000000000000
--- a/metadata/md5-cache/sys-fs/zfs-0.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[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(-)] ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Userland utilities for ZFS Linux kernel module
-EAPI=7
-HOMEPAGE=https://zfsonlinux.org/
-IUSE=custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 split-usr
-KEYWORDS=~amd64 ~arm64 ~ppc64
-LICENSE=BSD-2 CDDL MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[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(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-0.8.3 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=0d834d7235f90c13750a5dac4126baa1
diff --git a/metadata/md5-cache/sys-fs/zfs-0.8.3-r1 b/metadata/md5-cache/sys-fs/zfs-0.8.3-r1
new file mode 100644
index 000000000000..e1362b886923
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/zfs-0.8.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Userland utilities for ZFS Linux kernel module
+EAPI=7
+HOMEPAGE=https://zfsonlinux.org/
+IUSE=custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs kernel_linux python_targets_python3_6 python_targets_python3_7 split-usr
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=BSD-2 CDDL MIT
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-0.8.3 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=b606469126e3d5bc956c24502f00a53e
diff --git a/metadata/md5-cache/sys-fs/zfs-9999 b/metadata/md5-cache/sys-fs/zfs-9999
index ee533aca2abd..90a63c857912 100644
--- a/metadata/md5-cache/sys-fs/zfs-9999
+++ b/metadata/md5-cache/sys-fs/zfs-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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]
+BDEPEND=virtual/awk virtual/pkgconfig python? ( dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) virtual/pkgconfig virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 postrm preinst prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[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(-)] ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=7
 HOMEPAGE=https://zfsonlinux.org/
-IUSE=custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 split-usr
+IUSE=custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs kernel_linux python_targets_python3_6 python_targets_python3_7 split-usr kernel_linux kernel_linux
 LICENSE=BSD-2 CDDL MIT
 PROPERTIES=live
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[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(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=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_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-libs/libtirpc[static-libs?] sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk virtual/libudev[static-libs(-)?] libressl? ( dev-libs/libressl:0=[static-libs?] ) !libressl? ( dev-libs/openssl:0=[static-libs?] ) python? ( virtual/python-cffi[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) !kernel-builtin? ( ~sys-fs/zfs-kmod-9999 ) !prefix? ( virtual/udev ) sys-fs/udev-init-scripts rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-kernel/genkernel-3.5.1.1 ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=574c01a3ae39a8e0e6927b81728e584a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=d58d39a6465028bcf4569f975cd732f3
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 7a320341ee95..5114d4c53838 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/genkernel-3.4.52.3 b/metadata/md5-cache/sys-kernel/genkernel-3.4.52.3
index 18face45384a..83ce7213dd4f 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.4.52.3
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.52.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm selinux
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/genkernel-3.4.52.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sourceware.org/pub/lvm2/LVM2.2.02.88.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.88.tgz https://busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=a8714b1ff2c43c73fca6b740e40b22e8
+_md5_=7fa54366e62fe6c9504e3cc6d9e7dff1
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r1 b/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r1
index 9ae94a7ba2ff..eb19ba9eb415 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r1
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/genkernel-3.4.52.4.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sourceware.org/pub/lvm2/LVM2.2.02.88.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.88.tgz https://busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=edd5b9ec3944d7da03fa03d481ee31b1
+_md5_=d35cfbe20cb91189de289951c1134f09
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r2 b/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r2
index 4f1163c635ec..c03a9606d185 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r2
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm selinux
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/genkernel-3.4.52.4.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sourceware.org/pub/lvm2/LVM2.2.02.88.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.88.tgz https://busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=bf4f272e0e50d3a125349152bfb0b8a9
+_md5_=306e87c1fd75db65dbac47ad07c8368a
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r3 b/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r3
index 42fdb11c4ad4..567145789ded 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r3
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.52.4-r3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm selinux
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/genkernel-3.4.52.4.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sourceware.org/pub/lvm2/LVM2.2.02.88.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.88.tgz https://busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fc7456c85ff9b9056b83f746f9d0e1d0
+_md5_=f475a7f3bebe6e53a91e89df8ffae755
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.1.1 b/metadata/md5-cache/sys-kernel/genkernel-3.5.1.1
index 9cb9217c5518..ae811194fb53 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.1.1
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.1.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.1.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sourceware.org/pub/lvm2/LVM2.2.02.88.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.88.tgz https://busybox.net/downloads/busybox-1.26.0.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f7a168f243cb7af0b09f1a69f9988463
+_md5_=cfa003bcb2a13420674e9196c82f09a5
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.0-r1 b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.0-r1
index 7c563d98032b..6856c6f98fc2 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.0-r1
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.2.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=18dba4c7312929e4f258f976d143d3a6
+_md5_=c1fbf0de50f7f2c25b324f8de5d1db3c
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.1 b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.1
index 8056ded270e8..82f13fa7fd57 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.1
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.2.1.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=18dba4c7312929e4f258f976d143d3a6
+_md5_=c1fbf0de50f7f2c25b324f8de5d1db3c
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.2 b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.2
index 8f3848f6c148..0db9ef4fddea 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.2
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.2.2.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=18dba4c7312929e4f258f976d143d3a6
+_md5_=c1fbf0de50f7f2c25b324f8de5d1db3c
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.3 b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.3
index 0f44aa21d3fe..f15f55dc930d 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.3
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.2.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=18dba4c7312929e4f258f976d143d3a6
+_md5_=c1fbf0de50f7f2c25b324f8de5d1db3c
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.4 b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.4
index 66a28fe538b6..d3bd5c1f1da4 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.4
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.2.4.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=18dba4c7312929e4f258f976d143d3a6
+_md5_=c1fbf0de50f7f2c25b324f8de5d1db3c
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.5 b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.5
index a694d6e929cb..08569beaf6b2 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.2.5
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.2.5
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.2.5.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=18dba4c7312929e4f258f976d143d3a6
+_md5_=c1fbf0de50f7f2c25b324f8de5d1db3c
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.3.2 b/metadata/md5-cache/sys-kernel/genkernel-3.5.3.2
index 11f381f9c955..35784622e0c0 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.3.2
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.3.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.3.2.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=432ea8e4a8c4578b5dcc16d571b68a90
+_md5_=b746b27f42850f2b3cc844ab2a90f0fc
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3 b/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
index d1a5c54421c9..042d64525b9e 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.5.3.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst prepare pretend
 DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
 DESCRIPTION=Gentoo automatic kernel building scripts
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=cryptsetup ibm +firmware selinux
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=mirror://gentoo/genkernel-3.5.3.3.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.173.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.173.tgz https://busybox.net/downloads/busybox-1.27.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://gentoo/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gentoo/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.22.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=83298d15c091ddf27bf1f4ca5865afee
+_md5_=0424afdd7bb0eb71008c42ffb1718f73
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-4.19.102 b/metadata/md5-cache/sys-kernel/gentoo-kernel-4.19.102
new file mode 100644
index 000000000000..9a4bec6290ea
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-4.19.102
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:4.19.102 !sys-kernel/vanilla-kernel-bin:4.19.102 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=4.19.102
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.94.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-101.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-101.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=bf97de6a2e405659aaad4c251b7f0bb48d5ed3c9 -> linux-4.19.92-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=1f0345e2983d2edd55b401cb5a87fdf365a4192c -> linux-4.19.85-arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	e30bb691fbb26137f3d46438542bffe4	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=99500d2c26da8d9f4d302adcab6e1bf3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.18
new file mode 100644
index 000000000000..342a729b13ae
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.18
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.18 !sys-kernel/vanilla-kernel-bin:5.4.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.18
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-18.extras.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=9eed969590614a38d370a9fe04a4f5d38ba5e06e -> linux-5.4.13.arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=95f890a9f9131e7a0e01a4f3e9c5ee423756a233 -> linux-5.4.13-arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	e30bb691fbb26137f3d46438542bffe4	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=51e1681697ca554672a53551fa7637d3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-4.19.102 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-4.19.102
new file mode 100644
index 000000000000..cf0833809f4b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-4.19.102
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:4.19.102 !sys-kernel/vanilla-kernel:4.19.102 !sys-kernel/vanilla-kernel-bin:4.19.102 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=4.19.102
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.102-1.xpak -> gentoo-kernel-4.19.102-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.102-1.xpak -> gentoo-kernel-4.19.102-1.x86.xpak )
+_eclasses_=kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	e30bb691fbb26137f3d46438542bffe4
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.18
new file mode 100644
index 000000000000..80ac9a63bf7f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.18
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.18 !sys-kernel/vanilla-kernel:5.4.18 !sys-kernel/vanilla-kernel-bin:5.4.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.18
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.18-1.xpak -> gentoo-kernel-5.4.18-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.18-1.xpak -> gentoo-kernel-5.4.18-1.x86.xpak )
+_eclasses_=kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	e30bb691fbb26137f3d46438542bffe4
+_md5_=090591d3b01a83132e35a9ff23d3d8a6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.170 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.170
new file mode 100644
index 000000000000..0e25cb298a0e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.170
@@ -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
+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.170
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-180.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-180.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-180.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-180.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-180.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-180.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-180.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-180.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-180.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=08d47ae97494c7017429fd26de1f9a68
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.102 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.102
new file mode 100644
index 000000000000..9eb2aaba39c2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.102
@@ -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.19 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
+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.102
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-101.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-101.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-101.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-101.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-101.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-101.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-101.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-101.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-101.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c659a42cc6af12002df0fff59e56448b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.18 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.18
new file mode 100644
index 000000000000..7f07a9af6e09
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.18
@@ -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 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+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=5.4.18
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-18.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-18.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-18.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-18.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-18.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-18.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-18.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-18.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=05341480e18a692c2ce4be1e4d7855c7
diff --git a/metadata/md5-cache/sys-kernel/git-sources-5.6_rc1 b/metadata/md5-cache/sys-kernel/git-sources-5.6_rc1
new file mode 100644
index 000000000000..b79974a383d0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-5.6_rc1
@@ -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
+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=5.6_rc1
+SRC_URI=https://git.kernel.org/torvalds/p/v5.6-rc1/v5.5 -> patch-5.6-rc1.patch https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.5.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8b0c5584f8a09eb6bb2074122e95cf82
diff --git a/metadata/md5-cache/sys-kernel/kergen-0.1.4 b/metadata/md5-cache/sys-kernel/kergen-0.1.4
index 8b7f00a54bfd..8062ac40d6fe 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_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://whatishacking.org/kergen/downloads/kergen-0.1.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=37cdba17ac38b83eadfb89acc9c439e7
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.14.149 b/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
index b75a092e6266..20a3f4911b25 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.14.149
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
 DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20180128
 EAPI=6
-HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
+HOMEPAGE=https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage
 IUSE=experimental ip27 ip28 ip30 symlink build
 KEYWORDS=-* ~mips
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.14.149
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.149.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz mirror://gentoo/mipsgit-4.14.0-20180128.diff.xz mirror://gentoo/mips-sources-4.14.0-patches-v2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	161e65a1e185c10599fd2c5b258be436	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ec47017cf8ad3ac894f9e436164d0fb
+_md5_=fc5b2327b5c244d19d6c7016f31ecc6e
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20 b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
index ceb60c6d27b1..53177e0c2252 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.18.20
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
 DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20181112
 EAPI=6
-HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
+HOMEPAGE=https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage
 IUSE=experimental ip27 ip28 ip30 symlink build
 KEYWORDS=-* ~mips
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.18.20
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.18.20.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.18.tar.xz mirror://gentoo/mipsgit-4.18.0-20181112.diff.xz mirror://gentoo/mips-sources-4.18.0-patches-v2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	161e65a1e185c10599fd2c5b258be436	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5cc4451b3636a2e9f5f9c2943293530c
+_md5_=aa2d1608927e4cf371304c663605175f
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.19.79 b/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
index b8ca07ca9bd2..0b20df52adcc 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.19.79
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
 DESCRIPTION=Kernel.org sources for MIPS-based machines
 EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.linux-mips.org/ https://www.gentoo.org/
+HOMEPAGE=https://www.kernel.org/ https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage
 IUSE=experimental ip27 ip28 ip30 symlink build
 KEYWORDS=-* ~mips
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.19.79
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.79.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/mips-sources-4.19.0-patches-v2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	161e65a1e185c10599fd2c5b258be436	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61961fd555dfb30f56512eb4a8fc93d5
+_md5_=77999e24ee3388bf2e40e70acdb2066a
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.20.17 b/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
index 6ea19f457f3d..5d0767a7320e 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.20.17
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=>=sys-devel/gcc-6.5.0 >=sys-devel/patch-2.7.6 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
 DESCRIPTION=Kernel.org sources for MIPS-based machines
 EAPI=6
-HOMEPAGE=https://www.kernel.org/ https://www.linux-mips.org/ https://www.gentoo.org/
+HOMEPAGE=https://www.kernel.org/ https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage
 IUSE=experimental ip27 ip28 ip30 symlink build
 KEYWORDS=-* ~mips
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.20.17
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.20.17.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.20.tar.xz mirror://gentoo/mips-sources-4.20.0-patches-v1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	161e65a1e185c10599fd2c5b258be436	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91938acfee217d78b442af7f240739e0
+_md5_=1c77009f77f4bf43da545f3f5074e445
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.196 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
index 2f4de5040fc8..87bad9218ac2 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.4.196
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
 DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20160123
 EAPI=6
-HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
+HOMEPAGE=https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage
 IUSE=experimental ip27 ip28 ip30 symlink build
 KEYWORDS=-* ~mips
 LICENSE=GPL-2 linux-firmware
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.4.196
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.196.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	161e65a1e185c10599fd2c5b258be436	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e55592090868567992c7ac3eb34c952
+_md5_=9f183afa83a79a815b70d495d3af1232
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.196 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
index ac9dec8d4ad1..2f29c480918b 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.9.196
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
 DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20161216
 EAPI=6
-HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
+HOMEPAGE=https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage
 IUSE=experimental ip27 ip28 ip30 symlink build
 KEYWORDS=-* ~mips
 LICENSE=GPL-2 linux-firmware
@@ -11,4 +11,4 @@ RESTRICT=binchecks strip
 SLOT=4.9.196
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.196.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v2.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	kernel-2	161e65a1e185c10599fd2c5b258be436	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2de6104c23ad0708aaf3de76361348ee
+_md5_=401112083d2a0e2d1d1a22b9858513cc
diff --git a/metadata/md5-cache/sys-kernel/spl-0.7.13 b/metadata/md5-cache/sys-kernel/spl-0.7.13
index d732c670aa0a..089e463e44b8 100644
--- a/metadata/md5-cache/sys-kernel/spl-0.7.13
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.13
@@ -3,13 +3,13 @@ DEPEND=dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed
 DESCRIPTION=The Solaris Porting Layer provides many of the Solaris kernel APIs
 EAPI=5
 HOMEPAGE=https://zfsonlinux.org/
-IUSE=custom-cflags debug kernel_linux kernel_linux kernel_linux python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=custom-cflags debug kernel_linux kernel_linux kernel_linux +python_single_target_python3_6
 KEYWORDS=amd64
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/awk python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) !sys-devel/spl kernel_linux? ( virtual/modutils )
-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 )
+RDEPEND=dev-lang/perl virtual/awk python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) !sys-devel/spl kernel_linux? ( virtual/modutils )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=debug? ( strip ) test
 SLOT=0
 SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.13/spl-0.7.13.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36a105c1926e136490b385f996d542b7
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=058e1a77ef6e7bdb10c230d871043407
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-4.19.102 b/metadata/md5-cache/sys-kernel/vanilla-kernel-4.19.102
new file mode 100644
index 000000000000..6cedeb4f89b7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-4.19.102
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:4.19.102 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=4.19.102
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.19.102.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=bf97de6a2e405659aaad4c251b7f0bb48d5ed3c9 -> linux-4.19.92-arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=1f0345e2983d2edd55b401cb5a87fdf365a4192c -> linux-4.19.85-arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	e30bb691fbb26137f3d46438542bffe4	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=3d0f5c5631be95f8cc07bdf8c431f3ac
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.18
new file mode 100644
index 000000000000..810b693cab03
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.18
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc virtual/libelf
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.18
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.18.tar.xz amd64? ( https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=9eed969590614a38d370a9fe04a4f5d38ba5e06e -> linux-5.4.13.arch1.amd64.config ) x86? ( https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=95f890a9f9131e7a0e01a4f3e9c5ee423756a233 -> linux-5.4.13-arch1.i686.config )
+_eclasses_=kernel-build	62503a0a2c84409f29e0ffebd9756232	kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	e30bb691fbb26137f3d46438542bffe4	multilib	1d91b03d42ab6308b5f4f6b598ed110e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	a3c113056e77e36a1d78ff4eb475dfd1	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=230be47cf3964a546ee891a2c063b327
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-bin-4.19.102 b/metadata/md5-cache/sys-kernel/vanilla-kernel-bin-4.19.102
new file mode 100644
index 000000000000..083b7828d88f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-bin-4.19.102
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built vanilla Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:4.19.102 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=4.19.102
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/vanilla-kernel/vanilla-kernel-4.19.102-1.xpak -> vanilla-kernel-4.19.102-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/vanilla-kernel/vanilla-kernel-4.19.102-1.xpak -> vanilla-kernel-4.19.102-1.x86.xpak )
+_eclasses_=kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	e30bb691fbb26137f3d46438542bffe4
+_md5_=10bcd1a727853dbe670cb80232b91d75
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-bin-5.4.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-bin-5.4.18
new file mode 100644
index 000000000000..7c8c2c7dc19d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-bin-5.4.18
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built vanilla Linux kernel
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.18 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.18
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.18-1.xpak -> vanilla-kernel-5.4.18-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.18-1.xpak -> vanilla-kernel-5.4.18-1.x86.xpak )
+_eclasses_=kernel-install	8d71ac2b8604c81762590203a3959633	mount-boot	e30bb691fbb26137f3d46438542bffe4
+_md5_=10bcd1a727853dbe670cb80232b91d75
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.17 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.17
deleted file mode 100644
index ae4ccf0a2c45..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.17
+++ /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
-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=5.4.17
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.17.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
-_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=af62ceca6b46feac79b140ba555f8fb5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.18 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.18
new file mode 100644
index 000000000000..1f2e894888ef
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.18
@@ -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
+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=5.4.18
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.18.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	kernel-2	161e65a1e185c10599fd2c5b258be436	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=af62ceca6b46feac79b140ba555f8fb5
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 21aef1c60a7d..dfacc356086c 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/compiler-rt-10.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0.9999
index 45f874c9fbf9..6638ee66f647 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-9.0.1[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-10.0.0.9999*:10 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-10.0.0.9999*:10 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8254dd14cc3c5662290aab45d5e4dcf0
+_md5_=b195d2a3436f22c4a948dd53f2634cb5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0_rc1
index d2b53bcb9166..50247bb72fa0 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-9.0.1[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-10.0.0*:10 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-10.0.0*:10 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -10,4 +10,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8254dd14cc3c5662290aab45d5e4dcf0
+_md5_=b195d2a3436f22c4a948dd53f2634cb5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
index 34ccefa77c3e..0509fe575fb9 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-9.0.1[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-11.0.0.9999*:11 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-11.0.0.9999*:11 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -10,4 +10,4 @@ PROPERTIES=live
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8254dd14cc3c5662290aab45d5e4dcf0
+_md5_=b195d2a3436f22c4a948dd53f2634cb5
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-9.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-9.0.1
index 9cfd5f8b682b..75d425b13f8f 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-9.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-9.0.1[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9.0.1*:9 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=clang? ( sys-devel/clang ) test? ( || ( ( dev-lang/python:3.7 >=dev-python/lit-9.0.1[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-9.0.1[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-9.0.1*:9 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=Compiler runtime library for clang (built-in part)
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=9.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbff2681db89c751515d9dd73d0a98e0
+_md5_=2752b26325713b997b42300b0c1d7d5e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999
index dfc43fd051a4..fd11c24602c5 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-5[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-10.0.0.9999*:10 sys-libs/compiler-rt:10.0.0 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-10.0.0.9999*:10 sys-libs/compiler-rt:10.0.0 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -11,4 +11,4 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5292d00539497945c72228cb9624758f
+_md5_=7f3e044d43aaaaacf7ab2bc56e3ece13
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0_rc1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0_rc1
index 156ae0eb4787..7befe90d2010 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-5[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-10.0.0*:10 sys-libs/compiler-rt:10.0.0 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-10.0.0*:10 sys-libs/compiler-rt:10.0.0 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5292d00539497945c72228cb9624758f
+_md5_=7f3e044d43aaaaacf7ab2bc56e3ece13
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
index e3e53ab69827..74a32875cd16 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-5[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-11.0.0.9999*:11 sys-libs/compiler-rt:11.0.0 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-11.0.0.9999*:11 sys-libs/compiler-rt:11.0.0 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -11,4 +11,4 @@ REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=11.0.0
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5292d00539497945c72228cb9624758f
+_md5_=7f3e044d43aaaaacf7ab2bc56e3ece13
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.1 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.1
index 87d0931f4b8b..2591be1f7ba1 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/lit-5[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) =sys-devel/clang-9.0.1*:9 sys-libs/compiler-rt:9.0.1 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( dev-lang/python:3.7 >=dev-python/lit-5[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/lit-5[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) =sys-devel/clang-9.0.1*:9 sys-libs/compiler-rt:9.0.1 ) || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=9.0.1
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f0626ff021a7cb3353ddd8859cc56db7
+_md5_=9c322824c7173c49b41ef0912f5e17e5
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.6-r2 b/metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
index e77a7091b955..ff34ad5480b2 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.6-r2
@@ -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_6 ) )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/dist/cracklib-2.9.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b3000a05c13f6617a0d993a2b37a12a
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.7 b/metadata/md5-cache/sys-libs/cracklib-2.9.7
index a051206cd6df..939b7f7ffc1c 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.7
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.7
@@ -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_6 python_targets_python3_7 python_targets_python3_8 ) )
 SLOT=0
 SRC_URI=https://github.com/cracklib/cracklib/releases/download/v2.9.7/cracklib-2.9.7.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=99fbd1ab29597081a4f11b0c529ce40d
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2 b/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2
index 64588d43f449..4954b8235854 100644
--- a/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2
+++ b/metadata/md5-cache/sys-libs/gwenhywfar-5.1.2
@@ -5,7 +5,7 @@ DESCRIPTION=Multi-platform helper library for other libraries
 EAPI=7
 HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
 IUSE=debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl designer? ( dev-qt/designer:5 ) fox? ( x11-libs/fox:1.6 ) gtk? ( x11-libs/gtk+:3 ) qml? ( dev-qt/qtdeclarative:5 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5[widgets] dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) sensors? ( dev-qt/qtsensors:5 ) serialport? ( dev-qt/qtserialport:5 ) webkit? ( dev-qt/qtwebkit:5 ) gtk? ( !<app-office/gnucash-3.7[aqbanking] )
 REQUIRED_USE=designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/79
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/234/gwenhywfar-5.1.2.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=29a167a5b56f14533594f50d5f4ecaea
+_md5_=2fee0e4207d9b36603ba4bfbc4d8e6f7
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.29-r1 b/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
index f4d3214fe810..f583455638d8 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.29-r1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org/
-IUSE=doc +ldap python +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap python +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.8[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.12[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ldap? ( net-nds/openldap )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/1.1.29
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.1.29.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=c2e9fa823857d624833e0ceb013cb7ed
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.31 b/metadata/md5-cache/sys-libs/ldb-1.1.31
index 2a832322512f..15d79b66e155 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.1.31
+++ b/metadata/md5-cache/sys-libs/ldb-1.1.31
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org/
-IUSE=doc +ldap python +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap python +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.9[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.31[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.13[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !!<net-fs/samba-3.6.0[ldb] !!>=net-fs/samba-4.0.0[ldb] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ldap? ( net-nds/openldap )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/1.1.31
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.1.31.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=99bc21eb15b9148fd9ae4d78d76b2ba2
diff --git a/metadata/md5-cache/sys-libs/ldb-1.2.4 b/metadata/md5-cache/sys-libs/ldb-1.2.4
index 414b878be9a5..8fe2c53f6787 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.2.4
+++ b/metadata/md5-cache/sys-libs/ldb-1.2.4
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org/
-IUSE=doc +ldap python +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap python +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.10[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) ldap? ( net-nds/openldap )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/1.2.4
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.2.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=5aa71e650691037516bf3aa984d07203
diff --git a/metadata/md5-cache/sys-libs/ldb-1.3.6 b/metadata/md5-cache/sys-libs/ldb-1.3.6
index 68f4da38c723..36d09b131ad4 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.3.6
+++ b/metadata/md5-cache/sys-libs/ldb-1.3.6
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap python +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap python +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.11[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/1.3.6
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=c055e0c83a9ba4a71fe8323d9e2a13fc
diff --git a/metadata/md5-cache/sys-libs/ldb-1.3.8 b/metadata/md5-cache/sys-libs/ldb-1.3.8
index aaad1aef55c9..64088eb2538b 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.3.8
+++ b/metadata/md5-cache/sys-libs/ldb-1.3.8
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap python +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap python +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.11[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.36[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/1.3.8
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.3.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=2adcedb0c18ad299ec69e67e71fcf919
diff --git a/metadata/md5-cache/sys-libs/ldb-1.4.8 b/metadata/md5-cache/sys-libs/ldb-1.4.8
index 93633719221a..3e1f4652621c 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.4.8
+++ b/metadata/md5-cache/sys-libs/ldb-1.4.8
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb python +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap +lmdb python +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.14[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.37[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0/1.4.8
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.4.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=106cf9b6a572902a3d66a2112e9baa5c
diff --git a/metadata/md5-cache/sys-libs/ldb-1.5.4 b/metadata/md5-cache/sys-libs/ldb-1.5.4
index 8ecff7fbfc41..0eb1c87b860c 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.5.4
+++ b/metadata/md5-cache/sys-libs/ldb-1.5.4
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap +lmdb python python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0/1.5.4
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.5.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=6de9dec31d269f8705ced8a918b0437c
diff --git a/metadata/md5-cache/sys-libs/ldb-1.5.6 b/metadata/md5-cache/sys-libs/ldb-1.5.6
index 92b25855effe..de072932a466 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.5.6
+++ b/metadata/md5-cache/sys-libs/ldb-1.5.6
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap +lmdb python python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0/1.5.6
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.5.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=7eeeeef710a588b37b52a7ad56a7035b
diff --git a/metadata/md5-cache/sys-libs/ldb-1.6.3 b/metadata/md5-cache/sys-libs/ldb-1.6.3
index a33afa7efb50..e73c65edee2e 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.6.3
+++ b/metadata/md5-cache/sys-libs/ldb-1.6.3
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap +lmdb python python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.16[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.18[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.39[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0/1.6.3
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.6.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=7eeeeef710a588b37b52a7ad56a7035b
diff --git a/metadata/md5-cache/sys-libs/ldb-2.0.7 b/metadata/md5-cache/sys-libs/ldb-2.0.7
index 015a9338d524..3be486bf5973 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.0.7
+++ b/metadata/md5-cache/sys-libs/ldb-2.0.7
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap +lmdb python python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0/2.0.7
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.0.7.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=77e49614b5669c8d2186ae3fd1ad8560
diff --git a/metadata/md5-cache/sys-libs/ldb-2.0.8 b/metadata/md5-cache/sys-libs/ldb-2.0.8
index 47f89c787006..ccfe512fc60e 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.0.8
+++ b/metadata/md5-cache/sys-libs/ldb-2.0.8
@@ -3,12 +3,12 @@ DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_single
 DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
-IUSE=doc +ldap +lmdb python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc +ldap +lmdb python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0/2.0.8
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=77839404ae23e50ae049b820dd93984c
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.13.3 b/metadata/md5-cache/sys-libs/libapparmor-2.13.3
index f8e5d315cb6d..4cd1ee57d517 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-2.13.3
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.13.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/2.13/2.13.3/+download/apparmor-2.13.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=293749c60567817988d4165f0f12b214
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.13.3-r1 b/metadata/md5-cache/sys-libs/libapparmor-2.13.3-r1
index 590eb2379294..fb012b5189c3 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-2.13.3-r1
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.13.3-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/apparmor/2.13/2.13.3/+download/apparmor-2.13.3.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	c576838cd67e384002a18edd54be710e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	distutils-r1	24ad93542cf9d80a03d58784093b1d44	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a4e04fa3825c203309e9174587cda58f
diff --git a/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2 b/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2
index 3393ecf07c3d..c43d74cbc2cf 100644
--- a/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2
+++ b/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Library for the 1394 AV/C (Audio/Video Control) Digital Interface Co
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/libavc1394/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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=LGPL-2.1
 RDEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/libavc1394/libavc1394-0.5.4.tar.gz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=268aec3753c101c78a24e61f706505e3
+_md5_=ac88e4dc2133a8a01167c97c3e3ba345
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.20-r2 b/metadata/md5-cache/sys-libs/libblockdev-2.20-r2
index f6e074dac261..8dfbf620a04f 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.20-r2
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.20-r2
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-libs/gobject-introspection-1.3.0 sys-devel/autoconf-archive doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
-IUSE=bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test vdo 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
+IUSE=bcache +cryptsetup device-mapper dmraid doc escrow lvm kbd test vdo python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 ) escrow? ( cryptsetup )
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/archive/2.20-1.tar.gz -> libblockdev-2.20-1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=182d38c6cc3a90a8232b029f665b4ce6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=42ec9de70eeb392a3ea667c0de64af48
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.22 b/metadata/md5-cache/sys-libs/libblockdev-2.22
index 56f1aa8acdef..66e81001c000 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.22
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.22
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-libs/gobject-introspection-1.3.0 dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc )
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
-IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc lvm kbd test +tools vdo 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
+IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc lvm kbd test +tools vdo python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 ) escrow? ( cryptsetup )
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.22-1/libblockdev-2.22.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=582c46f02cd1f2046070c816672b6f8b
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ccef991e9f7a637691b60407fd46f415
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.23 b/metadata/md5-cache/sys-libs/libblockdev-2.23
index c78a03b3dc4e..2c0e186667c2 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-2.23
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.23
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 )
 DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
-IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo 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
+IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 ) escrow? ( cryptsetup )
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/storaged-project/libblockdev/releases/download/2.23-1/libblockdev-2.23.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=058fc4313a353b67cd594d06b5a6e12c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=042894500eaf756123f8cecf3ff3ba1e
diff --git a/metadata/md5-cache/sys-libs/libblockdev-9999 b/metadata/md5-cache/sys-libs/libblockdev-9999
index b3b370a1b028..bda5b5742530 100644
--- a/metadata/md5-cache/sys-libs/libblockdev-9999
+++ b/metadata/md5-cache/sys-libs/libblockdev-9999
@@ -1,15 +1,15 @@
 BDEPEND=sys-devel/autoconf-archive dev-util/gtk-doc-am gtk-doc? ( dev-util/gtk-doc ) introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup unpack
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 DESCRIPTION=A library for manipulating block devices
 EAPI=7
 HOMEPAGE=https://github.com/storaged-project/libblockdev
-IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo 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
+IUSE=bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo python_single_target_python3_6 python_single_target_python3_7
 LICENSE=LGPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-REQUIRED_USE=^^ ( 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 ) escrow? ( cryptsetup )
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) device-mapper? ( sys-fs/lvm2 ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) escrow? ( cryptsetup )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=058fc4313a353b67cd594d06b5a6e12c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=042894500eaf756123f8cecf3ff3ba1e
diff --git a/metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2 b/metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2
index b00cf95c6000..6b6779a7f6ba 100644
--- a/metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2
+++ b/metadata/md5-cache/sys-libs/libchipcard-5.1.5_rc2
@@ -5,9 +5,9 @@ DESCRIPTION=Library for accessing chip cards via chip card readers (terminals)
 EAPI=7
 HOMEPAGE=https://www.aquamaniac.de/rdm/projects/libchipcard
 IUSE=doc examples
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/pcsc-lite-1.6.2 >=sys-libs/gwenhywfar-4.99.22_rc6:= sys-libs/zlib virtual/libintl
 SLOT=0
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/229/libchipcard-5.1.5rc2.tar.gz
-_md5_=dab2311c61ec88f782318ae67279954c
+_md5_=574d58f3fa11d4671be40e08e3f9a12c
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-10.0.0.9999
index 6e5edecda3ab..29b2ac094e0a 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.0.9999[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) ) >=sys-devel/llvm-6
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
@@ -12,4 +12,4 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=164be582e8e0972caa4b2b8fed57b56a
+_md5_=16ec07689b2576f151da7b3785c8b4d7
diff --git a/metadata/md5-cache/sys-libs/libcxx-10.0.0_rc1 b/metadata/md5-cache/sys-libs/libcxx-10.0.0_rc1
index 92971adbb0b1..a13980abf352 100644
--- a/metadata/md5-cache/sys-libs/libcxx-10.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/libcxx-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-10.0.0_rc1[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) ) >=sys-devel/llvm-6
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=164be582e8e0972caa4b2b8fed57b56a
+_md5_=16ec07689b2576f151da7b3785c8b4d7
diff --git a/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999 b/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
index c20a3fff90da..545c409a8c32 100644
--- a/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxx-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-11.0.0.9999[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) ) >=sys-devel/llvm-6
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
@@ -12,4 +12,4 @@ REQUIRED_USE=libunwind? ( || ( libcxxabi libcxxrt ) ) ?? ( libcxxabi libcxxrt )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=164be582e8e0972caa4b2b8fed57b56a
+_md5_=16ec07689b2576f151da7b3785c8b4d7
diff --git a/metadata/md5-cache/sys-libs/libcxx-9.0.1 b/metadata/md5-cache/sys-libs/libcxx-9.0.1
index baa4088679d8..ba1994419ca4 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9.0.1
+++ b/metadata/md5-cache/sys-libs/libcxx-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
 DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-9.0.1[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) ) >=sys-devel/llvm-6
 DESCRIPTION=New implementation of the C++ standard library, targeting C++11
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5013e8c37a6be835305e810204e030e8
+_md5_=1ec3d0df24bbfa5580caf874d59561d0
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0.9999
index 90dbc6ff0935..926bcf6c87ad 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6
 DESCRIPTION=Low level support for a standard C++ library
@@ -11,4 +11,4 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac64d157932478333bec05821e6f9093
+_md5_=adbd6e7f9c5224b0abb2ebae7f33112e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0_rc1 b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0_rc1
index 692c22b6788f..0cb55e48a71f 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-10.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6
 DESCRIPTION=Low level support for a standard C++ library
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac64d157932478333bec05821e6f9093
+_md5_=adbd6e7f9c5224b0abb2ebae7f33112e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999 b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
index 90dbc6ff0935..926bcf6c87ad 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6
 DESCRIPTION=Low level support for a standard C++ library
@@ -11,4 +11,4 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac64d157932478333bec05821e6f9093
+_md5_=adbd6e7f9c5224b0abb2ebae7f33112e
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9.0.1 b/metadata/md5-cache/sys-libs/libcxxabi-9.0.1
index d3a419cfe8c2..244d31b2836d 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-9.0.1
+++ b/metadata/md5-cache/sys-libs/libcxxabi-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-6
 DESCRIPTION=Low level support for a standard C++ library
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61eafd95433c64dd352b96b565b5f60d
+_md5_=f374885d2e612811196ca2289d4f26ac
diff --git a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r4 b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r4
index a5602b1092ae..d68e666babc7 100644
--- a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r4
+++ b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r4
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Library to query devices using IEEE1284
 EAPI=6
 HOMEPAGE=http://cyberelk.net/tim/software/libieee1284/
-IUSE=doc python static-libs +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc python static-libs +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/libieee1284/libieee1284-0.2.11.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ec8c0b89520e1983b38cb6d9051b18b7
diff --git a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r5 b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r5
index bd45f9757b50..41dece27aad3 100644
--- a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r5
+++ b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r5
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Library to query devices using IEEE1284
 EAPI=6
 HOMEPAGE=http://cyberelk.net/tim/software/libieee1284/
-IUSE=doc python static-libs +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc python static-libs +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/libieee1284/libieee1284-0.2.11.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4555dc0e9757ac7beb208904f6cca703
diff --git a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r6 b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r6
index 9fb2ff2b6c68..2b12957051cb 100644
--- a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r6
+++ b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r6
@@ -3,12 +3,12 @@ DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.
 DESCRIPTION=Library to query devices using IEEE1284
 EAPI=6
 HOMEPAGE=http://cyberelk.net/tim/software/libieee1284/
-IUSE=doc python static-libs +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=doc python static-libs +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/libieee1284/libieee1284-0.2.11.tar.bz2
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=d3e763c895a3e7e06245820fada4c1aa
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-10.0.0.9999
index 38119a63c258..0ca67302f3ff 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
@@ -12,4 +12,4 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51c20016b893e37710166f348865e99b
+_md5_=adf65b26d3d165974bd184090250e1b8
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.0_rc1 b/metadata/md5-cache/sys-libs/libomp-10.0.0_rc1
index d81d64ccf66b..30a873adfefa 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51c20016b893e37710166f348865e99b
+_md5_=adf65b26d3d165974bd184090250e1b8
diff --git a/metadata/md5-cache/sys-libs/libomp-11.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
index 38119a63c258..0ca67302f3ff 100644
--- a/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
@@ -12,4 +12,4 @@ REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	linux-info	953c3b1c472dcadbf62098a9301327f2	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=51c20016b893e37710166f348865e99b
+_md5_=adf65b26d3d165974bd184090250e1b8
diff --git a/metadata/md5-cache/sys-libs/libomp-9.0.1 b/metadata/md5-cache/sys-libs/libomp-9.0.1
index e11fdcedef4a..6f5b7b32a2e6 100644
--- a/metadata/md5-cache/sys-libs/libomp-9.0.1
+++ b/metadata/md5-cache/sys-libs/libomp-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=dev-lang/perl offload? ( virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=sys-devel/clang-6 ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
 DEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e555a7749f61eaea7f9c6e1ce4804f15
+_md5_=1b221079cc1f7169c784fab0a5740ea0
diff --git a/metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1 b/metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1
index f0f7a826dbb9..aa9caf43ce48 100644
--- a/metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1
+++ b/metadata/md5-cache/sys-libs/libraw1394-2.1.2-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Library that provides direct access to the IEEE 1394 bus
 EAPI=7
 HOMEPAGE=https://ieee1394.wiki.kernel.org/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/libs/ieee1394/libraw1394-2.1.2.tar.xz
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7367b824ad75fabc5557a1fabf894a20
+_md5_=a50d482cc73153691d0d578d267c9384
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.4.2 b/metadata/md5-cache/sys-libs/libsmbios-2.4.2
index d835b1092a15..8d934bcfa77b 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.4.2
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.4.2
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
-DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 )
+DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 )
 DESCRIPTION=Provide access to (SM)BIOS information
 EAPI=7
 HOMEPAGE=http://linux.dell.com/files/libsmbios/
-IUSE=doc graphviz nls python static-libs test python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=doc graphviz nls python static-libs test +python_single_target_python3_6
 KEYWORDS=amd64 ia64 x86
 LICENSE=GPL-2 OSL-2.0
-RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dell/libsmbios/archive/v2.4.2.tar.gz -> libsmbios-2.4.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7b642af783771224486b94fa8f72f41c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=59ca60ea93327fc97b1a7f08bce421ff
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.4.2-r1 b/metadata/md5-cache/sys-libs/libsmbios-2.4.2-r1
index dae1c9e3e7d3..a04e87af0732 100644
--- a/metadata/md5-cache/sys-libs/libsmbios-2.4.2-r1
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.4.2-r1
@@ -1,16 +1,16 @@
 BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
-DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 )
+DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 )
 DESCRIPTION=Provide access to (SM)BIOS information
 EAPI=7
 HOMEPAGE=http://linux.dell.com/files/libsmbios/
-IUSE=doc graphviz nls python static-libs test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=doc graphviz nls python static-libs test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~ia64 ~x86
 LICENSE=GPL-2 OSL-2.0
-RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dell/libsmbios/archive/v2.4.2.tar.gz -> libsmbios-2.4.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1c0dfeac709d790c8ce980a160012dbd
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5eaed73e9fa33cb5d943c86dc627d925
diff --git a/metadata/md5-cache/sys-libs/libsmbios-2.4.3 b/metadata/md5-cache/sys-libs/libsmbios-2.4.3
new file mode 100644
index 000000000000..62ea66da0a8c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libsmbios-2.4.3
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
+DEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) virtual/pkgconfig doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 )
+DESCRIPTION=Provide access to (SM)BIOS information
+EAPI=7
+HOMEPAGE=http://linux.dell.com/files/libsmbios/
+IUSE=doc graphviz nls +python static-libs test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=GPL-2 OSL-2.0
+RDEPEND=dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dell/libsmbios/archive/v2.4.3.tar.gz -> libsmbios-2.4.3.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a75c4d001a1e015d741fde4320f50af2
diff --git a/metadata/md5-cache/sys-libs/libudev-compat-186-r1 b/metadata/md5-cache/sys-libs/libudev-compat-186-r1
index 2ea1b41373fa..891b9b9bd64d 100644
--- a/metadata/md5-cache/sys-libs/libudev-compat-186-r1
+++ b/metadata/md5-cache/sys-libs/libudev-compat-186-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install test unpack
 DEPEND=virtual/libudev:0/1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=Wrapper around libudev.so.1 for packages needing the old libudev.so.0
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=virtual/libudev:0/1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ce976b389c71585058ec0b8b98f7ba8e
+_md5_=a91252c5e89f926bcea915a621dc5880
diff --git a/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2 b/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
index 7a27a094f856..07e1416d7b62 100644
--- a/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
+++ b/metadata/md5-cache/sys-libs/libutempter-1.1.6-r2
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!sys-apps/utempter
 SLOT=0
 SRC_URI=ftp://ftp.altlinux.org/pub/people/ldv/libutempter/libutempter-1.1.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=9a21e3d8f2d3ce5072ab49f7e4733a4b
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.11 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.11
deleted file mode 100644
index 5c61b21e2642..000000000000
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/findutils test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) || ( ( dev-lang/python:3.8 dev-python/passlib[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/passlib[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/passlib[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
-DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
-EAPI=7
-HOMEPAGE=https://github.com/besser82/libxcrypt
-IUSE=+compat split-usr static-libs system test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+ public-domain BSD BSD-2
-RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/besser82/libxcrypt/archive/v4.4.11.tar.gz -> libxcrypt-4.4.11.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=34bea6c35b295380efa362ebf270a6c3
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.12-r3 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.12-r3
new file mode 100644
index 000000000000..0443a35be3c4
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libxcrypt-4.4.12-r3
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/findutils test? ( || ( ( dev-lang/python:3.8 dev-python/passlib[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/passlib[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/passlib[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
+DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
+EAPI=7
+HOMEPAGE=https://github.com/besser82/libxcrypt
+IUSE=+compat split-usr +static-libs system test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+ public-domain BSD BSD-2
+RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] ) !sys-libs/musl )
+REQUIRED_USE=split-usr? ( system )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/besser82/libxcrypt/archive/v4.4.12.tar.gz -> libxcrypt-4.4.12.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c51f355ca237c9e89605600e4f17d909
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0.9999
index aae514f2ea0c..690b39e742f3 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=C++ runtime stack unwinder from LLVM
@@ -11,4 +11,4 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc8e13489360a12327d7364eac52c83e
+_md5_=65aae5c504e6fc6eed1dc159634cca47
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0_rc1 b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0_rc1
index 08927982d25f..ab88e3f1cfb5 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0_rc1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-10.0.0_rc1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=C++ runtime stack unwinder from LLVM
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0-rc1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc8e13489360a12327d7364eac52c83e
+_md5_=65aae5c504e6fc6eed1dc159634cca47
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
index aae514f2ea0c..690b39e742f3 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-11.0.0.9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=C++ runtime stack unwinder from LLVM
@@ -11,4 +11,4 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc8e13489360a12327d7364eac52c83e
+_md5_=65aae5c504e6fc6eed1dc159634cca47
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-7.1.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-7.1.0
index cefc4f7758f7..20853011b062 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-7.1.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-7.1.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/llvm-6 test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DEPEND=>=sys-devel/llvm-6 test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
 DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=6
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.llvm.org/7.1.0/libunwind-7.1.0.src.tar.xz test? ( https://releases.llvm.org/7.1.0/libcxx-7.1.0.src.tar.xz https://releases.llvm.org/7.1.0/libcxxabi-7.1.0.src.tar.xz )
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3d1913431c36947c0ae4689b62a8fe36
+_md5_=bcf12240193fb29d13b523ba0d84b1e7
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1
index f56f4cc1af65..f35c6f58b0f6 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/llvm-6 test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
+DEPEND=>=sys-devel/llvm-6 test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1
 DESCRIPTION=C++ runtime stack unwinder from LLVM
 EAPI=6
 HOMEPAGE=https://github.com/llvm-mirror/libunwind
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libunwind-8.0.1.src.tar.xz test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxx-8.0.1.src.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/libcxxabi-8.0.1.src.tar.xz )
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b605c43c8426a3a50acfaf03c82b315
+_md5_=5fca5f9ed1904020b84f595348b4eced
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1 b/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
index f1cb17bd4247..b19c478e92d3 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=test? ( >=sys-devel/clang-3.9.0 || ( ( dev-lang/python:3.7 dev-python/lit[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/lit[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=sys-devel/llvm-6
 DESCRIPTION=C++ runtime stack unwinder from LLVM
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	llvm	c74f1124c627537c3be86281b81e10dc	llvm.org	4e92588f6138c82063258a2d303eaed8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4e3b9fd6fc480c34f10f591c25f28fa
+_md5_=c4af9e2863d47ed571ca21afce17d607
diff --git a/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1 b/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
index e1043aacb1b7..1ec799156f3c 100644
--- a/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
+++ b/metadata/md5-cache/sys-libs/nss-usrfiles-2.18.1
@@ -6,4 +6,4 @@ KEYWORDS=~amd64-linux
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=https://github.com/coreos/nss-altfiles/archive/v2.18.1.zip -> nss-altfiles-2.18.1.zip
-_md5_=4004af26f5e75adb944d79d744065112
+_md5_=317a3f28a3017ff9cdc7473a6ae8d074
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.22 b/metadata/md5-cache/sys-libs/openipmi-2.0.22
index 42f77c4669c4..62b047f9ee75 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.22
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.22
@@ -3,13 +3,13 @@ DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0=
 DESCRIPTION=Library interface to IPMI
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
-IUSE=crypt snmp perl python tcl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=crypt snmp perl python tcl +python_single_target_python2_7
 KEYWORDS=amd64 hppa ~ia64 ppc x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.22.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=317609a59fd49445452484a3f5a69651
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.26 b/metadata/md5-cache/sys-libs/openipmi-2.0.26
index df2285432608..934c81019237 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.26
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.26
@@ -4,13 +4,13 @@ DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0=
 DESCRIPTION=Library interface to IPMI
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
-IUSE=crypt snmp perl python tcl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=crypt snmp perl python tcl +python_single_target_python2_7
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.26.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=eba63401ea0f0893d595e7ee71c85404
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.27 b/metadata/md5-cache/sys-libs/openipmi-2.0.27
index d91d9c80c4ae..52ca791f1f3d 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.27
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.27
@@ -4,13 +4,13 @@ DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0=
 DESCRIPTION=Library interface to IPMI
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
-IUSE=crypt snmp perl python tcl +python_targets_python2_7 +python_single_target_python2_7
+IUSE=crypt snmp perl python tcl +python_single_target_python2_7
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.27.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=4be592db6a12d00d8bfc6c730cf913f2
diff --git a/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1 b/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
index 7462a62a1a17..a7baac78603d 100644
--- a/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
+++ b/metadata/md5-cache/sys-libs/openipmi-2.0.27-r1
@@ -4,13 +4,13 @@ DEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0=
 DESCRIPTION=Library interface to IPMI
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/openipmi/
-IUSE=crypt snmp perl python static-libs tcl 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
+IUSE=crypt snmp perl python static-libs tcl python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64 hppa ~ia64 ppc x86
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=dev-libs/glib:2 sys-libs/gdbm:= sys-libs/ncurses:0= sys-libs/readline:0= crypt? ( dev-libs/openssl:0= ) snmp? ( net-analyzer/net-snmp ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) tcl? ( dev-lang/tcl:0= )
-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 ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/openipmi/OpenIPMI-2.0.27.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=005273117c08cb10e9674a738a46ac73
diff --git a/metadata/md5-cache/sys-libs/readline-8.0 b/metadata/md5-cache/sys-libs/readline-8.0
deleted file mode 100644
index ec599cc15f3f..000000000000
--- a/metadata/md5-cache/sys-libs/readline-8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Another cute console display library
-EAPI=6
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/8
-SRC_URI=mirror://gnu/readline/readline-8.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4c4648ef6e7729cbefbe66becfd37683
diff --git a/metadata/md5-cache/sys-libs/readline-8.0_p1 b/metadata/md5-cache/sys-libs/readline-8.0_p1
deleted file mode 100644
index 0dcd9a7ba381..000000000000
--- a/metadata/md5-cache/sys-libs/readline-8.0_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Another cute console display library
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-IUSE=static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/8
-SRC_URI=mirror://gnu/readline/readline-8.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-001 mirror://gnu/readline/readline-8.0-patches/readline80-001
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
-_md5_=63f3b743a8803fefd00c24862a84928f
diff --git a/metadata/md5-cache/sys-libs/readline-8.0_p4 b/metadata/md5-cache/sys-libs/readline-8.0_p4
new file mode 100644
index 000000000000..69be8cabb267
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/readline-8.0_p4
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
+DEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Another cute console display library
+EAPI=7
+HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
+IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0/8
+SRC_URI=mirror://gnu/readline/readline-8.0.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-001 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-002 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-003 ftp://ftp.cwru.edu/pub/bash/readline-8.0-patches/readline80-004 mirror://gnu/readline/readline-8.0-patches/readline80-001 mirror://gnu/readline/readline-8.0-patches/readline80-002 mirror://gnu/readline/readline-8.0-patches/readline80-003 mirror://gnu/readline/readline-8.0-patches/readline80-004
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=ad2b11853ce041010c0f1331e512382f
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.14 b/metadata/md5-cache/sys-libs/talloc-2.1.14
index d537f2bcb695..8a8fb3474667 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.14
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.14
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=compat +python +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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 ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !!<sys-libs/talloc-2.0.5
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.14.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=d2c3649c5f9eecadb2dfa59755a8b5cf
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.16 b/metadata/md5-cache/sys-libs/talloc-2.1.16
index 02fd61c68d45..d1e2b6b17fcc 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.16
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.16
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=compat +python python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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 ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !!<sys-libs/talloc-2.0.5
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.16.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=070378dab4bb3e43a58f8a6780ba83d5
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.9 b/metadata/md5-cache/sys-libs/talloc-2.1.9
index f65b13a405a6..88c70492b60b 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.9
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.9
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python +python_targets_python2_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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=compat +python +python_single_target_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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 ~x64-macos ~sparc-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) !!<sys-libs/talloc-2.0.5
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.9.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=f360e4105b7aaf30f39a211bf08afead
diff --git a/metadata/md5-cache/sys-libs/talloc-2.2.0 b/metadata/md5-cache/sys-libs/talloc-2.2.0
index c0af3ce98aa6..13098808883d 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.2.0
+++ b/metadata/md5-cache/sys-libs/talloc-2.2.0
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x8
 DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=compat +python python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !!<sys-libs/talloc-2.0.5
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.2.0.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=6cf27f5a7cfe4d15e6efafd9dd7dd693
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.0 b/metadata/md5-cache/sys-libs/talloc-2.3.0
index 46d1cabc0f09..d6414a3cc787 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.3.0
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.0
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x8
 DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=compat +python python_single_target_python3_6 python_single_target_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) !!<sys-libs/talloc-2.0.5
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.0.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=eaefd3f451bae2fda2fede2ad973fa94
diff --git a/metadata/md5-cache/sys-libs/talloc-2.3.1 b/metadata/md5-cache/sys-libs/talloc-2.3.1
index 4c04eeee5055..3035eb65f5c1 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.3.1
+++ b/metadata/md5-cache/sys-libs/talloc-2.3.1
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x8
 DESCRIPTION=Samba talloc library
 EAPI=6
 HOMEPAGE=https://talloc.samba.org/
-IUSE=compat +python python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=compat +python python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-3 LGPL-3+ LGPL-2
 RDEPEND=!elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) !!<sys-libs/talloc-2.0.5
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.3.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=c811773736ee81b3c1ef139fa4c89ecb
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.13 b/metadata/md5-cache/sys-libs/tdb-1.3.13
index 8efc228bfe4d..d6f596efd96e 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.13
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.13
@@ -3,12 +3,12 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=A simple database API
 EAPI=6
 HOMEPAGE=https://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tdb/tdb-1.3.13.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=5eab8ed1d7f3b958519de37de2a708c8
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.16 b/metadata/md5-cache/sys-libs/tdb-1.3.16
index 68de99fc13c2..7871fdfe772c 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.16
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.16
@@ -3,12 +3,12 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=A simple database API
 EAPI=6
 HOMEPAGE=http://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.16.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=d651947037acb0f0fc1cccd1cd7900a0
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.18 b/metadata/md5-cache/sys-libs/tdb-1.3.18
index 38a78ea0af31..0fc63051e9a7 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.18
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.18
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=A simple database API
 EAPI=6
 HOMEPAGE=http://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.18.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=45d7ff8286b6278333db5a1c0d176042
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.0 b/metadata/md5-cache/sys-libs/tdb-1.4.0
index cfe645f5fda8..532afac5211f 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.4.0
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.0
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=A simple database API
 EAPI=6
 HOMEPAGE=http://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.4.0.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=69991dc3240a2a722069c1db5be8ae04
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.2 b/metadata/md5-cache/sys-libs/tdb-1.4.2
index dce49a64bd91..3b180c06199c 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.4.2
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.2
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=A simple database API
 EAPI=6
 HOMEPAGE=http://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.4.2.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=45d7ff8286b6278333db5a1c0d176042
diff --git a/metadata/md5-cache/sys-libs/tdb-1.4.3 b/metadata/md5-cache/sys-libs/tdb-1.4.3
index b309c0364c4a..ae75e34b40bc 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.4.3
+++ b/metadata/md5-cache/sys-libs/tdb-1.4.3
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=A simple database API
 EAPI=6
 HOMEPAGE=http://tdb.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.4.3.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=328983f90b0e7e94ff42e7c4e575c102
diff --git a/metadata/md5-cache/sys-libs/tevent-0.10.0 b/metadata/md5-cache/sys-libs/tevent-0.10.0
index 8d12272be0f8..e0f863afca93 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.10.0
+++ b/metadata/md5-cache/sys-libs/tevent-0.10.0
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba tevent library
 EAPI=6
 HOMEPAGE=https://tevent.samba.org/
-IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/talloc-2.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.10.0.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=cc1c64e008319dcb1d1453750ea35d47
diff --git a/metadata/md5-cache/sys-libs/tevent-0.10.1 b/metadata/md5-cache/sys-libs/tevent-0.10.1
index 13c8098c3155..9988dc73c0bc 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.10.1
+++ b/metadata/md5-cache/sys-libs/tevent-0.10.1
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba tevent library
 EAPI=6
 HOMEPAGE=https://tevent.samba.org/
-IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/talloc-2.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.10.1.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=88b7e111d8ff76c9a5bb4485168dd3cb
diff --git a/metadata/md5-cache/sys-libs/tevent-0.10.2 b/metadata/md5-cache/sys-libs/tevent-0.10.2
index b6ed5aaec5e9..c968d5babae4 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.10.2
+++ b/metadata/md5-cache/sys-libs/tevent-0.10.2
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba tevent library
 EAPI=6
 HOMEPAGE=https://tevent.samba.org/
-IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/talloc-2.3.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.10.2.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=1e5546d2d2bc369fed33717bc7154831
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.31-r1 b/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
index f02322ce88ed..d7f0bd85621e 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.31-r1
@@ -3,12 +3,12 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba tevent library
 EAPI=6
 HOMEPAGE=https://tevent.samba.org/
-IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/talloc-2.1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.9.31.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=a2833cc5172a8bb69d33c841c88da2b5
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.37 b/metadata/md5-cache/sys-libs/tevent-0.9.37
index 49dc9161ed4b..a1dd79c2f237 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.37
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.37
@@ -3,12 +3,12 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba tevent library
 EAPI=6
 HOMEPAGE=https://tevent.samba.org/
-IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_targets_python2_7 +python_single_target_python2_7
+IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 +python_single_target_python2_7
 KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/talloc-2.1.13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.9.37.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=3d0d74282c127aa7a9befb105bfb9b60
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.39 b/metadata/md5-cache/sys-libs/tevent-0.9.39
index 884faeb13e2c..a28e7794b53e 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.39
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.39
@@ -3,13 +3,13 @@ DEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 DESCRIPTION=Samba tevent library
 EAPI=6
 HOMEPAGE=https://tevent.samba.org/
-IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=elibc_glibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-libs/talloc-2.1.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) )
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.9.39.tar.gz
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	waf-utils	1fab5379519d4b71bff5790435a71986
 _md5_=bc661bc3bee6ef5ab5817dd63a538f05
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 645a121c409a..9e7f86efccc9 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/nut-2.7.4-r3 b/metadata/md5-cache/sys-power/nut-2.7.4-r3
deleted file mode 100644
index b984dad3395a..000000000000
--- a/metadata/md5-cache/sys-power/nut-2.7.4-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=dev-libs/libltdl:* net-libs/libnsl virtual/udev cgi? ( >=media-libs/gd-2[png] ) gui? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ipmi? ( sys-libs/freeipmi ) snmp? ( net-analyzer/net-snmp ) ssl? ( >=dev-libs/openssl-1:= ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:0= ) xml? ( >=net-libs/neon-0.25.0 ) zeroconf? ( net-dns/avahi ) >=sys-apps/sed-4
-DESCRIPTION=Network-UPS Tools
-EAPI=7
-HOMEPAGE=https://www.networkupstools.org/
-IUSE=cgi gui ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf +ups_drivers_al175 +ups_drivers_bcmxcp +ups_drivers_belkin +ups_drivers_belkinunv +ups_drivers_bestfcom +ups_drivers_bestfortress +ups_drivers_bestuferrups +ups_drivers_bestups +ups_drivers_dummy-ups +ups_drivers_etapro +ups_drivers_everups +ups_drivers_gamatronic +ups_drivers_genericups +ups_drivers_isbmex +ups_drivers_liebert +ups_drivers_liebert-esp2 +ups_drivers_masterguard +ups_drivers_metasys +ups_drivers_oldmge-shut +ups_drivers_mge-utalk +ups_drivers_microdowell +ups_drivers_mge-shut +ups_drivers_oneac +ups_drivers_optiups +ups_drivers_powercom +ups_drivers_rhino +ups_drivers_safenet +ups_drivers_solis +ups_drivers_tripplite +ups_drivers_tripplitesu +ups_drivers_upscode2 +ups_drivers_victronups +ups_drivers_powerpanel +ups_drivers_blazer_ser +ups_drivers_clone +ups_drivers_clone-outlet +ups_drivers_ivtscd +ups_drivers_apcsmart +ups_drivers_apcsmart-old +ups_drivers_apcupsd-ups +ups_drivers_riello_ser +ups_drivers_nutdrv_qx +ups_drivers_usbhid-ups +ups_drivers_bcmxcp_usb +ups_drivers_tripplite_usb +ups_drivers_blazer_usb +ups_drivers_richcomm_usb +ups_drivers_riello_usb +ups_drivers_nutdrv_qx ups_drivers_netxml-ups ups_drivers_snmp-ups ups_drivers_nut-ipmipsu +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 arm ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libltdl:* net-libs/libnsl virtual/udev cgi? ( >=media-libs/gd-2[png] ) gui? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) ipmi? ( sys-libs/freeipmi ) snmp? ( net-analyzer/net-snmp ) ssl? ( >=dev-libs/openssl-1:= ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:0= ) xml? ( >=net-libs/neon-0.25.0 ) zeroconf? ( net-dns/avahi ) selinux? ( sec-policy/selinux-nut )
-REQUIRED_USE=gui? ( ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) ) ups_drivers_usbhid-ups? ( usb ) ups_drivers_bcmxcp_usb? ( usb ) ups_drivers_tripplite_usb? ( usb ) ups_drivers_blazer_usb? ( usb ) ups_drivers_richcomm_usb? ( usb ) ups_drivers_riello_usb? ( usb ) ups_drivers_nutdrv_qx? ( usb ) ups_drivers_netxml-ups? ( xml ) ups_drivers_snmp-ups? ( snmp ) ups_drivers_nut-ipmipsu? ( ipmi )
-SLOT=0
-SRC_URI=https://networkupstools.org/source/2.7/nut-2.7.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=adaa7b0f46a755d10d46e17d6f0ee75c
diff --git a/metadata/md5-cache/sys-power/nut-2.7.4-r4 b/metadata/md5-cache/sys-power/nut-2.7.4-r4
new file mode 100644
index 000000000000..eed8113ae8d8
--- /dev/null
+++ b/metadata/md5-cache/sys-power/nut-2.7.4-r4
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/libltdl:* net-libs/libnsl virtual/udev cgi? ( >=media-libs/gd-2[png] ) gui? ( python_single_target_python2_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/pygtk[python_targets_python2_7(-)] ) ) ipmi? ( sys-libs/freeipmi ) snmp? ( net-analyzer/net-snmp ) ssl? ( >=dev-libs/openssl-1:= ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:0= ) xml? ( >=net-libs/neon-0.25.0 ) zeroconf? ( net-dns/avahi ) >=sys-apps/sed-4
+DESCRIPTION=Network-UPS Tools
+EAPI=7
+HOMEPAGE=https://www.networkupstools.org/
+IUSE=cgi gui ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf +ups_drivers_al175 +ups_drivers_bcmxcp +ups_drivers_belkin +ups_drivers_belkinunv +ups_drivers_bestfcom +ups_drivers_bestfortress +ups_drivers_bestuferrups +ups_drivers_bestups +ups_drivers_dummy-ups +ups_drivers_etapro +ups_drivers_everups +ups_drivers_gamatronic +ups_drivers_genericups +ups_drivers_isbmex +ups_drivers_liebert +ups_drivers_liebert-esp2 +ups_drivers_masterguard +ups_drivers_metasys +ups_drivers_oldmge-shut +ups_drivers_mge-utalk +ups_drivers_microdowell +ups_drivers_mge-shut +ups_drivers_oneac +ups_drivers_optiups +ups_drivers_powercom +ups_drivers_rhino +ups_drivers_safenet +ups_drivers_solis +ups_drivers_tripplite +ups_drivers_tripplitesu +ups_drivers_upscode2 +ups_drivers_victronups +ups_drivers_powerpanel +ups_drivers_blazer_ser +ups_drivers_clone +ups_drivers_clone-outlet +ups_drivers_ivtscd +ups_drivers_apcsmart +ups_drivers_apcsmart-old +ups_drivers_apcupsd-ups +ups_drivers_riello_ser +ups_drivers_nutdrv_qx +ups_drivers_usbhid-ups +ups_drivers_bcmxcp_usb +ups_drivers_tripplite_usb +ups_drivers_blazer_usb +ups_drivers_richcomm_usb +ups_drivers_riello_usb +ups_drivers_nutdrv_qx ups_drivers_netxml-ups ups_drivers_snmp-ups ups_drivers_nut-ipmipsu +python_single_target_python2_7
+KEYWORDS=amd64 arm ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libltdl:* net-libs/libnsl virtual/udev cgi? ( >=media-libs/gd-2[png] ) gui? ( python_single_target_python2_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/pygtk[python_targets_python2_7(-)] ) ) ipmi? ( sys-libs/freeipmi ) snmp? ( net-analyzer/net-snmp ) ssl? ( >=dev-libs/openssl-1:= ) tcpd? ( sys-apps/tcp-wrappers ) usb? ( virtual/libusb:0= ) xml? ( >=net-libs/neon-0.25.0 ) zeroconf? ( net-dns/avahi ) selinux? ( sec-policy/selinux-nut )
+REQUIRED_USE=gui? ( ^^ ( python_single_target_python2_7 ) ) ups_drivers_usbhid-ups? ( usb ) ups_drivers_bcmxcp_usb? ( usb ) ups_drivers_tripplite_usb? ( usb ) ups_drivers_blazer_usb? ( usb ) ups_drivers_richcomm_usb? ( usb ) ups_drivers_riello_usb? ( usb ) ups_drivers_nutdrv_qx? ( usb ) ups_drivers_netxml-ups? ( xml ) ups_drivers_snmp-ups? ( snmp ) ups_drivers_nut-ipmipsu? ( ipmi )
+SLOT=0
+SRC_URI=https://networkupstools.org/source/2.7/nut-2.7.4.tar.gz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=9ac6d74ac751230b4f3695cbe2ab890b
diff --git a/metadata/md5-cache/sys-power/sispmctl-4.0 b/metadata/md5-cache/sys-power/sispmctl-4.0
index f67e93a53c9d..d20d4985e46b 100644
--- a/metadata/md5-cache/sys-power/sispmctl-4.0
+++ b/metadata/md5-cache/sys-power/sispmctl-4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/libusb:0 gemplug? ( sys-process/at )
 SLOT=0
 SRC_URI=mirror://sourceforge/sispmctl/sispmctl-4.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=5d70c32efcbbe869cc10e7f1ae587e9a
diff --git a/metadata/md5-cache/sys-power/thermald-1.9 b/metadata/md5-cache/sys-power/thermald-1.9
index bba2bea35221..e5bb35e43d4a 100644
--- a/metadata/md5-cache/sys-power/thermald-1.9
+++ b/metadata/md5-cache/sys-power/thermald-1.9
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= sys-apps/dbus:=
 SLOT=0
 SRC_URI=https://github.com/01org/thermal_daemon/archive/v1.9.tar.gz -> thermald-1.9.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	out-of-source	15edba2977da53bbf4d1e5a60abc0e34	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9120f49b5045ad53ae6ae3bce197832c
+_md5_=1d763647b8fce67d3355244390e3b014
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index c35fdf68d142..1bcf7ea25810 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/at-3.1.23 b/metadata/md5-cache/sys-process/at-3.1.23
index 28546af59ddc..cf0292b02e36 100644
--- a/metadata/md5-cache/sys-process/at-3.1.23
+++ b/metadata/md5-cache/sys-process/at-3.1.23
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/a/at/at_3.1.23.orig.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=21ee3fe477fdb915c8d5408ea0f27abf
diff --git a/metadata/md5-cache/sys-process/at-3.2.1 b/metadata/md5-cache/sys-process/at-3.2.1
index 5f34c1cb562a..4f5553ddd9dc 100644
--- a/metadata/md5-cache/sys-process/at-3.2.1
+++ b/metadata/md5-cache/sys-process/at-3.2.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
 SLOT=0
 SRC_URI=http://software.calhariz.com/at/at_3.2.1.orig.tar.gz mirror://debian/pool/main/a/at/at_3.2.1.orig.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=36ef3f9dbe1fd30036561b12af1d5ece
diff --git a/metadata/md5-cache/sys-process/bcron-0.11 b/metadata/md5-cache/sys-process/bcron-0.11
index 05818593b29a..de1923672d88 100644
--- a/metadata/md5-cache/sys-process/bcron-0.11
+++ b/metadata/md5-cache/sys-process/bcron-0.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=config configure install postinst setup
-DEPEND=>=dev-libs/bglibs-2.04 sys-apps/ucspi-unix sys-process/cronbase virtual/daemontools virtual/mta || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) >=sys-apps/sed-4.0.5
+DEPEND=>=dev-libs/bglibs-2.04 sys-apps/ucspi-unix sys-process/cronbase virtual/daemontools virtual/mta || ( dev-lang/python:3.7 dev-lang/python:3.6 ) >=sys-apps/sed-4.0.5
 DESCRIPTION=A new cron system designed with secure operations in mind by Bruce Guenter
 EAPI=7
 HOMEPAGE=https://untroubled.org/bcron/
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/bglibs-2.04 sys-apps/ucspi-unix sys-process/cronbase virtual/
 SLOT=0
 SRC_URI=https://untroubled.org/bcron/archive/bcron-0.11.tar.gz
 _eclasses_=cron	7804080fdc06c5016bdac0cc054e4b19	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8d3ae1d73bd43dff23b0b368ad1403be
+_md5_=4bc82f3f6538a585d81b83b5c4f1cc1c
diff --git a/metadata/md5-cache/sys-process/cronbase-0.3.7-r6 b/metadata/md5-cache/sys-process/cronbase-0.3.7-r6
index 6e19fb0c3495..c33c39d7168e 100644
--- a/metadata/md5-cache/sys-process/cronbase-0.3.7-r6
+++ b/metadata/md5-cache/sys-process/cronbase-0.3.7-r6
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install setup
 DESCRIPTION=base for all cron ebuilds
 EAPI=5
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=7c33f8a7be8ed329aca6559252761b4a
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=8a17116e85e211363c3e090d8f09a0bf
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.4-r1 b/metadata/md5-cache/sys-process/cronie-1.5.4-r1
index 635dcd58b476..58fe2ddbfe2b 100644
--- a/metadata/md5-cache/sys-process/cronie-1.5.4-r1
+++ b/metadata/md5-cache/sys-process/cronie-1.5.4-r1
@@ -10,5 +10,5 @@ LICENSE=ISC BSD BSD-2 GPL-2
 RDEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3347ef4cecd17c06ef904829b9d23361
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.5 b/metadata/md5-cache/sys-process/cronie-1.5.5
index ea2461286d68..a4494d3b0b9e 100644
--- a/metadata/md5-cache/sys-process/cronie-1.5.5
+++ b/metadata/md5-cache/sys-process/cronie-1.5.5
@@ -10,5 +10,5 @@ LICENSE=ISC BSD BSD-2 GPL-2
 RDEPEND=pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.5.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=4207aaa732c498fec7fe28890bf83eb0
diff --git a/metadata/md5-cache/sys-process/fcron-3.2.1-r1 b/metadata/md5-cache/sys-process/fcron-3.2.1-r1
index c1c14b59422e..a5709d78d401 100644
--- a/metadata/md5-cache/sys-process/fcron-3.2.1-r1
+++ b/metadata/md5-cache/sys-process/fcron-3.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.2.1.src.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=405540fe88e9fe06347bf4a63a3f00d4
diff --git a/metadata/md5-cache/sys-process/fcron-3.2.1-r3 b/metadata/md5-cache/sys-process/fcron-3.2.1-r3
index 75e9aa3f3948..897c3fe3960f 100644
--- a/metadata/md5-cache/sys-process/fcron-3.2.1-r3
+++ b/metadata/md5-cache/sys-process/fcron-3.2.1-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.2.1.src.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=f4d0533318279a0333913b2185bb1efd
diff --git a/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r1 b/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r1
index 5f8b4e298ab1..37baf34989c8 100644
--- a/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r1
+++ b/metadata/md5-cache/sys-process/fcron-3.3.0_beta-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=audit? ( sys-process/audit ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline:= ) selinux? ( sys-libs/libselinux ) app-misc/editor-wrapper mta? ( virtual/mta ) pam? ( sys-auth/pambase ) >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/dcron
 SLOT=0
 SRC_URI=http://fcron.free.fr/archives/fcron-3.3.0.src.tar.gz -> fcron-3.3.0_beta.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	cron	7804080fdc06c5016bdac0cc054e4b19	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=974a33444b629ba66cb75bcd36b1e480
diff --git a/metadata/md5-cache/sys-process/glances-2.11.1 b/metadata/md5-cache/sys-process/glances-2.11.1
index e86a34aa16c6..5f211f749c53 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_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Glances/Glances-2.11.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=acf4973196fde817e422bde7f908f748
diff --git a/metadata/md5-cache/sys-process/glances-3.1.0 b/metadata/md5-cache/sys-process/glances-3.1.0
index 55dac9397e8d..9006f17d2036 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.0
+++ b/metadata/md5-cache/sys-process/glances-3.1.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.0.tar.gz -> glances-3.1.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff310a2a8e989e52b9af9aa526c7272f
diff --git a/metadata/md5-cache/sys-process/glances-3.1.1 b/metadata/md5-cache/sys-process/glances-3.1.1
index 89af83227464..728e21d465fa 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.1
+++ b/metadata/md5-cache/sys-process/glances-3.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.1.tar.gz -> glances-3.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9402776f82c3a66e9a625f63b3343a7f
diff --git a/metadata/md5-cache/sys-process/glances-3.1.2 b/metadata/md5-cache/sys-process/glances-3.1.2
index 8b8ccf0a9d92..2c96db8160cb 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.2
+++ b/metadata/md5-cache/sys-process/glances-3.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.2.tar.gz -> glances-3.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9052c01e0bae8c476f8dd26319605e27
diff --git a/metadata/md5-cache/sys-process/glances-3.1.3-r1 b/metadata/md5-cache/sys-process/glances-3.1.3-r1
index fd2e35f0564d..fd910466ac2a 100644
--- a/metadata/md5-cache/sys-process/glances-3.1.3-r1
+++ b/metadata/md5-cache/sys-process/glances-3.1.3-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nicolargo/glances/archive/v3.1.3.tar.gz -> glances-3.1.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e916c1b198156cca004988aa6cee6d15
diff --git a/metadata/md5-cache/sys-process/htop-2.2.0 b/metadata/md5-cache/sys-process/htop-2.2.0
index 026c0a39e0b8..0e817a45057d 100644
--- a/metadata/md5-cache/sys-process/htop-2.2.0
+++ b/metadata/md5-cache/sys-process/htop-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses:0=[unicode?] || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig
+DEPEND=sys-libs/ncurses:0=[unicode?] || ( dev-lang/python:3.7 dev-lang/python:3.6 ) virtual/pkgconfig
 DESCRIPTION=interactive process viewer
 EAPI=6
 HOMEPAGE=https://hisham.hm/htop/
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9f96493bf16b578b121ae3e352e4d3d3
+_md5_=0e8a31603629628fd0d09e5a2253469d
diff --git a/metadata/md5-cache/sys-process/htop-3.0.0_beta5 b/metadata/md5-cache/sys-process/htop-3.0.0_beta5
index 38dfe2ec36c7..520cfe5abdd5 100644
--- a/metadata/md5-cache/sys-process/htop-3.0.0_beta5
+++ b/metadata/md5-cache/sys-process/htop-3.0.0_beta5
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure prepare setup
-DEPEND=sys-libs/ncurses:0=[unicode?] || ( dev-lang/python:3.7 dev-lang/python:3.6 >=dev-lang/python-2.7.5-r2:2.7 )
+DEPEND=sys-libs/ncurses:0=[unicode?] || ( dev-lang/python:3.7 dev-lang/python:3.6 )
 DESCRIPTION=interactive process viewer
 EAPI=7
 HOMEPAGE=https://hisham.hm/htop/
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0=[unicode?]
 SLOT=0
 SRC_URI=https://github.com/hishamhm/htop/archive/3.0.0beta5.tar.gz -> htop-3.0.0_beta5.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=890641ad43db1170c1e99e566917d9c2
+_md5_=cdfb3d3506f0c2e2d4e638931cb36900
diff --git a/metadata/md5-cache/sys-process/iotop-0.6 b/metadata/md5-cache/sys-process/iotop-0.6
index 3cf5718cac76..42f45e667423 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_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=http://guichaz.free.fr/iotop/files/iotop-0.6.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f88b8d2d8066e261a8e35f6107335b11
diff --git a/metadata/md5-cache/sys-process/procps-3.3.16-r1 b/metadata/md5-cache/sys-process/procps-3.3.16-r1
new file mode 100644
index 000000000000..23935c7fc5c0
--- /dev/null
+++ b/metadata/md5-cache/sys-process/procps-3.3.16-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( virtual/pkgconfig ) ncurses? ( virtual/pkgconfig ) systemd? ( virtual/pkgconfig ) test? ( dev-util/dejagnu )
+DESCRIPTION=standard informational utilities and process-handling tools
+EAPI=7
+HOMEPAGE=http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps
+IUSE=elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=elogind? ( sys-auth/elogind ) ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kill? ( !sys-apps/coreutils[kill] !sys-apps/util-linux[kill] ) !<app-i18n/man-pages-de-2.12-r1 !<app-i18n/man-pages-pl-0.7-r1
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=mirror://sourceforge/procps-ng/procps-ng-3.3.16.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	usr-ldscript	766f0a506b45f02361ad1b8ca205b7e1
+_md5_=aa016a9009d772f09c7239f7780edbb0
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1 b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
index e832785365c4..7ae73972c906 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
@@ -3,13 +3,13 @@ DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes ) virtua
 DESCRIPTION=systemd units to create timers for cron directories and crontab
 EAPI=5
 HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
-IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_6 python_single_target_pypy3 python_single_target_python3_6
+IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_single_target_pypy3 python_single_target_python3_6
 KEYWORDS=amd64 sparc x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=dev-python/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) sys-process/cronbase
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_6? ( python_targets_python3_6 )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.12.tar.gz -> systemd-cron-1.5.12.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=78cc09ab670e07b7df1f1e94066690de
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.14 b/metadata/md5-cache/sys-process/systemd-cron-1.5.14
index 5955b06a95ba..3bada282accd 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.14
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.14
@@ -4,13 +4,13 @@ DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes )
 DESCRIPTION=systemd units to create timers for cron directories and crontab
 EAPI=7
 HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
-IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7
+IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=dev-python/pypy3-5:0= >=dev-lang/python-exec-2:=[python_targets_pypy3] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) sys-process/cronbase
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_6 python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.5.14.tar.gz -> systemd-cron-1.5.14.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e2caef8cb2a306b0ca79b27081b4ed83
diff --git a/metadata/md5-cache/sys-process/tini-0.18.0 b/metadata/md5-cache/sys-process/tini-0.18.0
index 3b45465a374c..e1f32e8f5587 100644
--- a/metadata/md5-cache/sys-process/tini-0.18.0
+++ b/metadata/md5-cache/sys-process/tini-0.18.0
@@ -9,4 +9,4 @@ 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	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=681f3e22e3311573a7d7f2e041c3377a
+_md5_=e09c1af3c983dc49399f6ec7a2b934e8
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index e78550be1002..01bb382bb87a 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/libcrypt-1 b/metadata/md5-cache/virtual/libcrypt-1
new file mode 100644
index 000000000000..000af1b5ccf2
--- /dev/null
+++ b/metadata/md5-cache/virtual/libcrypt-1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libcrypt.so
+EAPI=7
+IUSE=+static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=elibc_glibc? ( || ( >=sys-libs/glibc-2.30-r2[crypt(-),static-libs(+)?] <sys-libs/glibc-2.30-r2 ) ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc-ng ) elibc_Cygwin? ( sys-libs/cygwin-crypt )
+SLOT=0/1
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=e06f2b14f00b97462c17c457c1d5f21d
diff --git a/metadata/md5-cache/virtual/libcrypt-2 b/metadata/md5-cache/virtual/libcrypt-2
new file mode 100644
index 000000000000..71505f8a0919
--- /dev/null
+++ b/metadata/md5-cache/virtual/libcrypt-2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libcrypt.so
+EAPI=7
+IUSE=+static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=elibc_glibc? ( sys-libs/libxcrypt[system(-),static-libs(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc-ng ) elibc_Cygwin? ( sys-libs/cygwin-crypt )
+SLOT=0/2
+_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=aedab6c601849e6282f3075bc2fbe38a
diff --git a/metadata/md5-cache/virtual/python-pathlib-1.0 b/metadata/md5-cache/virtual/python-pathlib-1.0
index 8b2507fef08f..b99b2339adf1 100644
--- a/metadata/md5-cache/virtual/python-pathlib-1.0
+++ b/metadata/md5-cache/virtual/python-pathlib-1.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=A virtual for Python pathlib module
 EAPI=7
 IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( dev-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 _eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=26dbb01a7582b739a6934c1b725c3210
+_md5_=45fb1c6565fa1072ef9bfba398297704
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 20cb6b39d1d9..f8a9c484f83c 100644
--- a/metadata/md5-cache/www-apache/Manifest.gz
+++ b/metadata/md5-cache/www-apache/Manifest.gz
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.15.6 b/metadata/md5-cache/www-apache/mod_h2-1.15.6
new file mode 100644
index 000000000000..d64a9bc7a68d
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.15.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4* >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=HTTP/2 module for Apache
+EAPI=6
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/releases/download/v1.15.6/mod_http2-1.15.6.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f520cdcbfd0dc20f703daa1c6191175c
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.5.13 b/metadata/md5-cache/www-apache/mod_wsgi-4.5.13
index 61372e2e219b..b278198cc8e5 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.5.13
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.5.13
@@ -3,12 +3,12 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=5
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) =www-servers/apache-2*
-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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.5.13.tar.gz -> mod_wsgi-4.5.13.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=be54543866d6257da54d90c9b23580ce
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.6.5 b/metadata/md5-cache/www-apache/mod_wsgi-4.6.5
index e5ddc0285a14..b896b4dcb43a 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.6.5
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.6.5
@@ -3,12 +3,12 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=5
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
-IUSE=python_targets_python2_7 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_6
+IUSE=python_single_target_python2_7 python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) =www-servers/apache-2*
-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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.6.5.tar.gz -> mod_wsgi-4.6.5.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=24e5306718d62a7faa9d814af657587f
diff --git a/metadata/md5-cache/www-apache/mod_wsgi-4.7.0 b/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
index dff9b5d9bc0f..2decd07d2b07 100644
--- a/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
+++ b/metadata/md5-cache/www-apache/mod_wsgi-4.7.0
@@ -3,12 +3,12 @@ DEPEND==www-servers/apache-2*
 DESCRIPTION=An Apache2 module for running Python WSGI applications
 EAPI=5
 HOMEPAGE=https://github.com/GrahamDumpleton/mod_wsgi
-IUSE=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
+IUSE=python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) =www-servers/apache-2*
-REQUIRED_USE=^^ ( 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 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/GrahamDumpleton/mod_wsgi/archive/4.7.0.tar.gz -> mod_wsgi-4.7.0.tar.gz
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3743c29522a5033c353adc81cc6e2e49
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 64de2c26c387..bde8e9fa7f35 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 d0d99b4a168b..727b7a0df93b 100644
--- a/metadata/md5-cache/www-apps/blohg-0.13-r3
+++ b/metadata/md5-cache/www-apps/blohg-0.13-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( git mercurial ) test? ( git mercurial ) || ( python_targets_py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/blohg/blohg-0.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=da083a65e47b32125726913e2ccefb85
diff --git a/metadata/md5-cache/www-apps/blohg-9999 b/metadata/md5-cache/www-apps/blohg-9999
index f3d59fd5d77c..acb3192644b9 100644
--- a/metadata/md5-cache/www-apps/blohg-9999
+++ b/metadata/md5-cache/www-apps/blohg-9999
@@ -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 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ead9f9d050b24b3b115183263aba55cc
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.1 b/metadata/md5-cache/www-apps/cgit-1.2.1
index 8da2c17a5334..77396fe1b57c 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.1
+++ b/metadata/md5-cache/www-apps/cgit-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/git sys-libs/zlib virtual/httpd-cgi highlight? ( || ( dev-python/pygments app-text/highlight ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.18.0.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.1.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=00028759b9ab7df87cc6a2598599bdd9
diff --git a/metadata/md5-cache/www-apps/cgit-1.2.2 b/metadata/md5-cache/www-apps/cgit-1.2.2
index 41fe58645059..62b8b0f41c0a 100644
--- a/metadata/md5-cache/www-apps/cgit-1.2.2
+++ b/metadata/md5-cache/www-apps/cgit-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-vcs/git sys-libs/zlib virtual/httpd-cgi highlight? ( || ( dev-python/pygments app-text/highlight ) ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) ) >=app-admin/webapp-config-1.50.15
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.25.0.tar.xz https://git.zx2c4.com/cgit/snapshot/cgit-1.2.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=1b54885903376e7dd68d4a1cf67af81d
diff --git a/metadata/md5-cache/www-apps/cgit-9999 b/metadata/md5-cache/www-apps/cgit-9999
index ea48995b53f8..ec667ef1e83d 100644
--- a/metadata/md5-cache/www-apps/cgit-9999
+++ b/metadata/md5-cache/www-apps/cgit-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=dev-vcs/git sys-libs/zlib dev-libs/openssl:0 virtual/httpd-cgi highlight? ( || ( dev-python/pygments app-text/highlight ) ) lua? ( jit? ( dev-lang/luajit ) !jit? ( dev-lang/lua:0 ) ) >=app-admin/webapp-config-1.50.15
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=013b4fc8d6043505985e9683941b2563
diff --git a/metadata/md5-cache/www-apps/curator-3.0_p20110120-r2 b/metadata/md5-cache/www-apps/curator-3.0_p20110120-r2
deleted file mode 100644
index af883e68a4ad..000000000000
--- a/metadata/md5-cache/www-apps/curator-3.0_p20110120-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup
-DESCRIPTION=Gallery generator
-EAPI=6
-HOMEPAGE=http://furius.ca/curator/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ~hppa ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] virtual/imagemagick-tools
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gentoo/curator-3.0_pf078f1686a78.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1d15d601957061f1a009cb03bf6ba232
diff --git a/metadata/md5-cache/www-apps/curator-3.0_p20110120-r3 b/metadata/md5-cache/www-apps/curator-3.0_p20110120-r3
new file mode 100644
index 000000000000..6bdb9d3d181a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/curator-3.0_p20110120-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DESCRIPTION=Gallery generator
+EAPI=6
+HOMEPAGE=http://furius.ca/curator/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ~hppa ~mips ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/pillow[python_targets_python2_7(-)] ) virtual/imagemagick-tools
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/curator-3.0_pf078f1686a78.tar.xz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=97d0ef9b162b9adf2d58f500507abc89
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.3.6 b/metadata/md5-cache/www-apps/grafana-bin-6.3.6
index 675e70005e64..d3e79b24ce42 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-6.3.6
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.3.6
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/fontconfig
 SLOT=0
 SRC_URI=https://dl.grafana.com/oss/release/grafana-6.3.6.linux-amd64.tar.gz -> grafana-bin-6.3.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.4.3 b/metadata/md5-cache/www-apps/grafana-bin-6.4.3
index c8e565996e3d..5c4b687df600 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-6.4.3
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.4.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/fontconfig
 SLOT=0
 SRC_URI=https://dl.grafana.com/oss/release/grafana-6.4.3.linux-amd64.tar.gz -> grafana-bin-6.4.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.4.4 b/metadata/md5-cache/www-apps/grafana-bin-6.4.4
index c6017e974957..7f4d7d9796d8 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-6.4.4
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.4.4
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/fontconfig
 SLOT=0
 SRC_URI=https://dl.grafana.com/oss/release/grafana-6.4.4.linux-amd64.tar.gz -> grafana-bin-6.4.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1162edb714562148192c3848a89819c5
diff --git a/metadata/md5-cache/www-apps/grafana-bin-6.5.3 b/metadata/md5-cache/www-apps/grafana-bin-6.5.3
index 5c00467b8e93..263682e3b320 100644
--- a/metadata/md5-cache/www-apps/grafana-bin-6.5.3
+++ b/metadata/md5-cache/www-apps/grafana-bin-6.5.3
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=media-libs/fontconfig
 SLOT=0
 SRC_URI=https://dl.grafana.com/oss/release/grafana-6.5.3.linux-amd64.tar.gz -> grafana-bin-6.5.3.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=d92cd37affc4977689c7fff2eefdc7a0
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.7.1 b/metadata/md5-cache/www-apps/icingaweb2-2.7.1
index 896ea5c0abe5..65f583ee4885 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.7.1
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/image
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.7.1 -> icingaweb2-2.7.1.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed83b39862cfcf3eddf8b8bbae09a189
diff --git a/metadata/md5-cache/www-apps/icingaweb2-2.7.3 b/metadata/md5-cache/www-apps/icingaweb2-2.7.3
index b0d28fa7477b..27adb8b35a2d 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-2.7.3
+++ b/metadata/md5-cache/www-apps/icingaweb2-2.7.3
@@ -10,5 +10,5 @@ RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/image
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
 SRC_URI=https://codeload.github.com/Icinga/icingaweb2/tar.gz/v2.7.3 -> icingaweb2-2.7.3.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ed83b39862cfcf3eddf8b8bbae09a189
diff --git a/metadata/md5-cache/www-apps/icingaweb2-9999 b/metadata/md5-cache/www-apps/icingaweb2-9999
index 1fab6ad477cd..07e1cf79adc2 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-9999
+++ b/metadata/md5-cache/www-apps/icingaweb2-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=>=net-analyzer/icinga2-2.1.1 dev-php/pecl-imagick pdf? ( media-gfx/imagemagick[png] ) apache2-server? ( >=www-servers/apache-2.4.0 ) nginx? ( >=www-servers/nginx-1.7.0:* ) || ( dev-lang/php:5.6[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.1[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.2[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] dev-lang/php:7.3[apache2?,cli,fpm?,gd,json,intl,ldap?,mysql?,nls,pdo,postgres?,sockets,ssl,xslt,xml] ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=( ^^ ( apache2-server nginx ) ) apache2? ( apache2-server )
 SLOT=0
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d8281571b0cc310e442a29b8687bdd9a
diff --git a/metadata/md5-cache/www-apps/karma-bin-0.24 b/metadata/md5-cache/www-apps/karma-bin-0.24
index 767a6e91815e..fa86fb4af1cd 100644
--- a/metadata/md5-cache/www-apps/karma-bin-0.24
+++ b/metadata/md5-cache/www-apps/karma-bin-0.24
@@ -6,5 +6,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prymitive/karma/releases/download/v0.24/karma-linux-amd64.tar.gz -> karma-bin-0.24-amd64.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=30b95ac6a36dbfd699d900a7aedc7ca0
diff --git a/metadata/md5-cache/www-apps/karma-bin-0.27 b/metadata/md5-cache/www-apps/karma-bin-0.27
index 940c3c529efd..84d3ed31eec2 100644
--- a/metadata/md5-cache/www-apps/karma-bin-0.27
+++ b/metadata/md5-cache/www-apps/karma-bin-0.27
@@ -6,5 +6,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prymitive/karma/releases/download/v0.27/karma-linux-amd64.tar.gz -> karma-bin-0.27-amd64.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=584977c70703637b5d12ed6eb32cce56
diff --git a/metadata/md5-cache/www-apps/karma-bin-0.33 b/metadata/md5-cache/www-apps/karma-bin-0.33
index 3426ecbc67ec..efcb7c6ba25e 100644
--- a/metadata/md5-cache/www-apps/karma-bin-0.33
+++ b/metadata/md5-cache/www-apps/karma-bin-0.33
@@ -6,5 +6,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prymitive/karma/releases/download/v0.33/karma-linux-amd64.tar.gz -> karma-bin-0.33-amd64.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=584977c70703637b5d12ed6eb32cce56
diff --git a/metadata/md5-cache/www-apps/karma-bin-0.39 b/metadata/md5-cache/www-apps/karma-bin-0.39
index f9982f5ac71b..eb8d7e84ebe9 100644
--- a/metadata/md5-cache/www-apps/karma-bin-0.39
+++ b/metadata/md5-cache/www-apps/karma-bin-0.39
@@ -6,5 +6,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/prymitive/karma/releases/download/v0.39/karma-linux-amd64.tar.gz -> karma-bin-0.39-amd64.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=584977c70703637b5d12ed6eb32cce56
diff --git a/metadata/md5-cache/www-apps/karma-bin-0.40 b/metadata/md5-cache/www-apps/karma-bin-0.40
index cdb1f0afffb5..68db1fec0fd5 100644
--- a/metadata/md5-cache/www-apps/karma-bin-0.40
+++ b/metadata/md5-cache/www-apps/karma-bin-0.40
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prymitive/karma/releases/download/v0.40/karma-linux-amd64.tar.gz -> karma-bin-0.40-amd64.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1507946e3374b94519ac96ef38f33019
diff --git a/metadata/md5-cache/www-apps/karma-bin-0.41 b/metadata/md5-cache/www-apps/karma-bin-0.41
index a5f5ff8d8ea6..cec9757e3c07 100644
--- a/metadata/md5-cache/www-apps/karma-bin-0.41
+++ b/metadata/md5-cache/www-apps/karma-bin-0.41
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prymitive/karma/releases/download/v0.41/karma-linux-amd64.tar.gz -> karma-bin-0.41-amd64.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1507946e3374b94519ac96ef38f33019
diff --git a/metadata/md5-cache/www-apps/karma-bin-0.43 b/metadata/md5-cache/www-apps/karma-bin-0.43
index 51d97e4d9a63..f4786367e9d8 100644
--- a/metadata/md5-cache/www-apps/karma-bin-0.43
+++ b/metadata/md5-cache/www-apps/karma-bin-0.43
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/prymitive/karma/releases/download/v0.43/karma-linux-amd64.tar.gz -> karma-bin-0.43-amd64.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1507946e3374b94519ac96ef38f33019
diff --git a/metadata/md5-cache/www-apps/kibana-bin-5.6.16 b/metadata/md5-cache/www-apps/kibana-bin-5.6.16
index 74e431590b97..945991d8ba51 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-5.6.16
+++ b/metadata/md5-cache/www-apps/kibana-bin-5.6.16
@@ -7,5 +7,5 @@ LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0
 RDEPEND=>=net-libs/nodejs-6.17.0
 SLOT=0
 SRC_URI=https://artifacts.elastic.co/downloads/kibana/kibana-5.6.16-linux-x86_64.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c114588fe69367b0ea607a41fa806bc0
diff --git a/metadata/md5-cache/www-apps/kibana-bin-6.7.1 b/metadata/md5-cache/www-apps/kibana-bin-6.7.1
index 40902049966d..98fdeeba3aef 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-6.7.1
+++ b/metadata/md5-cache/www-apps/kibana-bin-6.7.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0
 RDEPEND=>=net-libs/nodejs-10.15.2
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-6.7.1-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-6.7.1-linux-x86_64.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=833e996f7573073d25b615b585c52bb4
diff --git a/metadata/md5-cache/www-apps/kibana-bin-7.2.0 b/metadata/md5-cache/www-apps/kibana-bin-7.2.0
index ce891465554e..7977c0a5902b 100644
--- a/metadata/md5-cache/www-apps/kibana-bin-7.2.0
+++ b/metadata/md5-cache/www-apps/kibana-bin-7.2.0
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0
 RDEPEND=>=net-libs/nodejs-10.15.2
 SLOT=0
 SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-7.2.0-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/kibana/kibana-oss-7.2.0-linux-x86_64.tar.gz )
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0f1a0b8d82a0313d35a43cbe766b5420
diff --git a/metadata/md5-cache/www-apps/klaus-1.4.0 b/metadata/md5-cache/www-apps/klaus-1.4.0
index 6165dd86506e..b92a88d77068 100644
--- a/metadata/md5-cache/www-apps/klaus-1.4.0
+++ b/metadata/md5-cache/www-apps/klaus-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/klaus/klaus-1.4.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=876944711fc7e59edeb1cbf170814b98
diff --git a/metadata/md5-cache/www-apps/klaus-1.5.1 b/metadata/md5-cache/www-apps/klaus-1.5.1
index 527799a91947..10c046621a42 100644
--- a/metadata/md5-cache/www-apps/klaus-1.5.1
+++ b/metadata/md5-cache/www-apps/klaus-1.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-python/dulwich-0.19.3[python_targets_python3_6(-)?,python_targets_
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/klaus/klaus-1.5.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=876944711fc7e59edeb1cbf170814b98
diff --git a/metadata/md5-cache/www-apps/netbox-2.5.11 b/metadata/md5-cache/www-apps/netbox-2.5.11
index d9f73ffcb7d7..c777d051f29e 100644
--- a/metadata/md5-cache/www-apps/netbox-2.5.11
+++ b/metadata/md5-cache/www-apps/netbox-2.5.11
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( dev-python/django-rq )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) webhooks? ( dev-python/django-rq )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/digitalocean/netbox
-IUSE=ldap webhooks +python_targets_python3_6 +python_single_target_python3_6
+IUSE=ldap webhooks +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( dev-python/django-rq )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) webhooks? ( dev-python/django-rq )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/digitalocean/netbox/archive/v2.5.11.tar.gz -> netbox-2.5.11.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=37dfc66f185144175f168911e61207c8
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f430af8cfeec0085183ca1bc3d238dd6
diff --git a/metadata/md5-cache/www-apps/netbox-2.5.12 b/metadata/md5-cache/www-apps/netbox-2.5.12
index ffd0c6010e7d..44c336e3129f 100644
--- a/metadata/md5-cache/www-apps/netbox-2.5.12
+++ b/metadata/md5-cache/www-apps/netbox-2.5.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( dev-python/django-rq )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) webhooks? ( dev-python/django-rq )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/digitalocean/netbox
-IUSE=ldap webhooks +python_targets_python3_6 +python_single_target_python3_6
+IUSE=ldap webhooks +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( dev-python/django-rq )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-2.4.0[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-1.11[python_targets_python3_6(-)] >=dev-python/django-filter-2.0.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.3[python_targets_python3_6(-)] >=dev-python/django-taggit-0.23.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.0[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.14.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-5.3.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.7.6.1[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.7.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) webhooks? ( dev-python/django-rq )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/digitalocean/netbox/archive/v2.5.12.tar.gz -> netbox-2.5.12.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=37dfc66f185144175f168911e61207c8
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=f430af8cfeec0085183ca1bc3d238dd6
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.1 b/metadata/md5-cache/www-apps/netbox-2.6.1
index 3892cb188720..086c53017c6b 100644
--- a/metadata/md5-cache/www-apps/netbox-2.6.1
+++ b/metadata/md5-cache/www-apps/netbox-2.6.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/digitalocean/netbox
-IUSE=ldap webhooks +python_targets_python3_6 +python_single_target_python3_6
+IUSE=ldap webhooks +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/digitalocean/netbox/archive/v2.6.1.tar.gz -> netbox-2.6.1.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=1934a0423f094d4459e45da7e8c4f3a8
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=c7afb9c65cb3403901795443f338654b
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.4 b/metadata/md5-cache/www-apps/netbox-2.6.4
index a93ced560791..4a5c53d7e2fd 100644
--- a/metadata/md5-cache/www-apps/netbox-2.6.4
+++ b/metadata/md5-cache/www-apps/netbox-2.6.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_targets_python3_6 +python_single_target_python3_6
+IUSE=ldap webhooks +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.4.tar.gz -> netbox-2.6.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=67c6cd971f517b505ce2f1fa5751cdf5
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=7be2685c2e506dc413f610a35630e842
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.5 b/metadata/md5-cache/www-apps/netbox-2.6.5
index 95f4e550f966..ba82c6193739 100644
--- a/metadata/md5-cache/www-apps/netbox-2.6.5
+++ b/metadata/md5-cache/www-apps/netbox-2.6.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_targets_python3_6 +python_single_target_python3_6
+IUSE=ldap webhooks +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.5.tar.gz -> netbox-2.6.5.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9f9f4ee666466faa6bdd418d6d8f8bd2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=9cf2e5725ee87cb5fac5773f4e5e599c
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.6 b/metadata/md5-cache/www-apps/netbox-2.6.6
index ba8025fdae67..43d0eeb7bbf6 100644
--- a/metadata/md5-cache/www-apps/netbox-2.6.6
+++ b/metadata/md5-cache/www-apps/netbox-2.6.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_targets_python3_6 +python_single_target_python3_6
+IUSE=ldap webhooks +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.6.tar.gz -> netbox-2.6.6.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=9f9f4ee666466faa6bdd418d6d8f8bd2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=9cf2e5725ee87cb5fac5773f4e5e599c
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.7 b/metadata/md5-cache/www-apps/netbox-2.6.7
index 45b0e57947c1..1c5bc8aaee18 100644
--- a/metadata/md5-cache/www-apps/netbox-2.6.7
+++ b/metadata/md5-cache/www-apps/netbox-2.6.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_targets_python3_6 +python_single_target_python3_6
+IUSE=ldap webhooks +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.7.tar.gz -> netbox-2.6.7.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=0064de695375c19efd2f9b745a63ff57
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=6f090da1c3d825a77347271c17b6a733
diff --git a/metadata/md5-cache/www-apps/netbox-2.6.8 b/metadata/md5-cache/www-apps/netbox-2.6.8
index fe18fa093dc5..2f2fa26d8013 100644
--- a/metadata/md5-cache/www-apps/netbox-2.6.8
+++ b/metadata/md5-cache/www-apps/netbox-2.6.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap webhooks +python_targets_python3_6 +python_single_target_python3_6
+IUSE=ldap webhooks +python_single_target_python3_6
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.1[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.0.2[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.0[python_targets_python3_6(-)] >=dev-python/django-filter-2.1.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.0.15[python_targets_python3_6(-)] >=dev-python/django-tables2-2.0.6[python_targets_python3_6(-)] >=dev-python/django-taggit-1.1.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-3.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.9.4[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.16.0[python_targets_python3_6(-),validation] >=dev-python/graphviz-0.10.1[python_targets_python3_6(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-6.2.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.3[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.8.2[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) webhooks? ( >=dev-python/django-rq-2.1.0[python_targets_python3_6(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/netbox-community/netbox/archive/v2.6.8.tar.gz -> netbox-2.6.8.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ee09e7c4e796d4f4e6da6ff71d103ce9
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=ca05fce9a3af9c6d927abad2cfca1c07
diff --git a/metadata/md5-cache/www-apps/netbox-2.7.2 b/metadata/md5-cache/www-apps/netbox-2.7.2
index 5ddfc6efad60..97f229c252ff 100644
--- a/metadata/md5-cache/www-apps/netbox-2.7.2
+++ b/metadata/md5-cache/www-apps/netbox-2.7.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=install postinst setup
-DEPEND=acct-group/netbox acct-user/netbox python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-cacheops-4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-cors-headers-3.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-debug-toolbar-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-filter-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-prometheus-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-rq-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-tables2-2.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-taggit-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-timezone-field-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/djangorestframework-3.10.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/drf-yasg-1.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,validation] >=dev-python/jinja-2.10.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-7.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/psycopg-2.8.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pycryptodome-3.9.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pyyaml-5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/redis-py-3.3.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+DEPEND=acct-group/netbox acct-user/netbox python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.2.1[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.1[python_targets_python3_6(-)] >=dev-python/django-filter-2.2.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.1.0[python_targets_python3_6(-)] >=dev-python/django-rq-2.2.0[python_targets_python3_6(-)] >=dev-python/django-tables2-2.2.1[python_targets_python3_6(-)] >=dev-python/django-taggit-1.2.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-4.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.10.3[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.17.0[python_targets_python3_6(-),validation] >=dev-python/jinja-2.10.3[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-7.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.4[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.9.4[python_targets_python3_6(-)] >=dev-python/pyyaml-5.3[python_targets_python3_6(-)] >=dev-python/redis-py-3.3.11[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( >=dev-python/django-2.2[python_targets_python3_7(-)] >=dev-python/django-cacheops-4.2[python_targets_python3_7(-)] >=dev-python/django-cors-headers-3.2.1[python_targets_python3_7(-)] >=dev-python/django-debug-toolbar-2.1[python_targets_python3_7(-)] >=dev-python/django-filter-2.2.0[python_targets_python3_7(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_7(-)] >=dev-python/django-prometheus-1.1.0[python_targets_python3_7(-)] >=dev-python/django-rq-2.2.0[python_targets_python3_7(-)] >=dev-python/django-tables2-2.2.1[python_targets_python3_7(-)] >=dev-python/django-taggit-1.2.0[python_targets_python3_7(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_7(-)] >=dev-python/django-timezone-field-4.0[python_targets_python3_7(-)] >=dev-python/djangorestframework-3.10.3[python_targets_python3_7(-)] >=dev-python/drf-yasg-1.17.0[python_targets_python3_7(-),validation] >=dev-python/jinja-2.10.3[python_targets_python3_7(-)] >=dev-python/markdown-2.6.11[python_targets_python3_7(-)] <dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_7(-)] >=dev-python/pillow-7.0.0[python_targets_python3_7(-)] >=dev-python/psycopg-2.8.4[python_targets_python3_7(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_7(-)] >=dev-python/pycryptodome-3.9.4[python_targets_python3_7(-)] >=dev-python/pyyaml-5.3[python_targets_python3_7(-)] >=dev-python/redis-py-3.3.11[python_targets_python3_7(-)] www-servers/gunicorn[python_targets_python3_7(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_7(-)] ) )
 DESCRIPTION=IP address and data center infrastructure management tool
 EAPI=7
 HOMEPAGE=https://github.com/netbox-community/netbox
-IUSE=ldap python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=ldap python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=acct-group/netbox acct-user/netbox python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-python/django-2.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-cacheops-4.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-cors-headers-3.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-debug-toolbar-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-filter-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-prometheus-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-rq-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-tables2-2.2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-taggit-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/django-timezone-field-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/djangorestframework-3.10.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/drf-yasg-1.17.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,validation] >=dev-python/jinja-2.10.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] <dev-python/markdown-3.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pillow-7.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/psycopg-2.8.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pycryptodome-3.9.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/pyyaml-5.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=dev-python/redis-py-3.3.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] www-servers/gunicorn[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
-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 )
+RDEPEND=acct-group/netbox acct-user/netbox python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_6? ( >=dev-python/django-2.2[python_targets_python3_6(-)] >=dev-python/django-cacheops-4.2[python_targets_python3_6(-)] >=dev-python/django-cors-headers-3.2.1[python_targets_python3_6(-)] >=dev-python/django-debug-toolbar-2.1[python_targets_python3_6(-)] >=dev-python/django-filter-2.2.0[python_targets_python3_6(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_6(-)] >=dev-python/django-prometheus-1.1.0[python_targets_python3_6(-)] >=dev-python/django-rq-2.2.0[python_targets_python3_6(-)] >=dev-python/django-tables2-2.2.1[python_targets_python3_6(-)] >=dev-python/django-taggit-1.2.0[python_targets_python3_6(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_6(-)] >=dev-python/django-timezone-field-4.0[python_targets_python3_6(-)] >=dev-python/djangorestframework-3.10.3[python_targets_python3_6(-)] >=dev-python/drf-yasg-1.17.0[python_targets_python3_6(-),validation] >=dev-python/jinja-2.10.3[python_targets_python3_6(-)] >=dev-python/markdown-2.6.11[python_targets_python3_6(-)] <dev-python/markdown-3.0.1[python_targets_python3_6(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_6(-)] >=dev-python/pillow-7.0.0[python_targets_python3_6(-)] >=dev-python/psycopg-2.8.4[python_targets_python3_6(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_6(-)] >=dev-python/pycryptodome-3.9.4[python_targets_python3_6(-)] >=dev-python/pyyaml-5.3[python_targets_python3_6(-)] >=dev-python/redis-py-3.3.11[python_targets_python3_6(-)] www-servers/gunicorn[python_targets_python3_6(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( >=dev-python/django-2.2[python_targets_python3_7(-)] >=dev-python/django-cacheops-4.2[python_targets_python3_7(-)] >=dev-python/django-cors-headers-3.2.1[python_targets_python3_7(-)] >=dev-python/django-debug-toolbar-2.1[python_targets_python3_7(-)] >=dev-python/django-filter-2.2.0[python_targets_python3_7(-)] >=dev-python/django-mptt-0.9.1[python_targets_python3_7(-)] >=dev-python/django-prometheus-1.1.0[python_targets_python3_7(-)] >=dev-python/django-rq-2.2.0[python_targets_python3_7(-)] >=dev-python/django-tables2-2.2.1[python_targets_python3_7(-)] >=dev-python/django-taggit-1.2.0[python_targets_python3_7(-)] >=dev-python/django-taggit-serializer-0.1.7[python_targets_python3_7(-)] >=dev-python/django-timezone-field-4.0[python_targets_python3_7(-)] >=dev-python/djangorestframework-3.10.3[python_targets_python3_7(-)] >=dev-python/drf-yasg-1.17.0[python_targets_python3_7(-),validation] >=dev-python/jinja-2.10.3[python_targets_python3_7(-)] >=dev-python/markdown-2.6.11[python_targets_python3_7(-)] <dev-python/markdown-3.0.1[python_targets_python3_7(-)] >=dev-python/netaddr-0.7.19[python_targets_python3_7(-)] >=dev-python/pillow-7.0.0[python_targets_python3_7(-)] >=dev-python/psycopg-2.8.4[python_targets_python3_7(-)] >=dev-python/py-gfm-0.1.4[python_targets_python3_7(-)] >=dev-python/pycryptodome-3.9.4[python_targets_python3_7(-)] >=dev-python/pyyaml-5.3[python_targets_python3_7(-)] >=dev-python/redis-py-3.3.11[python_targets_python3_7(-)] www-servers/gunicorn[python_targets_python3_7(-)] ldap? ( >=dev-python/django-auth-ldap-1.7[python_targets_python3_7(-)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/netbox-community/netbox/archive/v2.7.2.tar.gz -> netbox-2.7.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=e4e47e5e5b165acbd5d8661d6b42b2de
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2065d97df605de56192a2b1ed1c973c7
diff --git a/metadata/md5-cache/www-apps/nextcloud-15.0.12 b/metadata/md5-cache/www-apps/nextcloud-15.0.12
deleted file mode 100644
index 7702ec15bec9..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-15.0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=6
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=15.0.12
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-15.0.12.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9a3d17e7678ff064f19fb604b5a28781
diff --git a/metadata/md5-cache/www-apps/nextcloud-15.0.13 b/metadata/md5-cache/www-apps/nextcloud-15.0.13
deleted file mode 100644
index d8f8d985eebc..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-15.0.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=6
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=15.0.13
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-15.0.13.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9a3d17e7678ff064f19fb604b5a28781
diff --git a/metadata/md5-cache/www-apps/nextcloud-15.0.14 b/metadata/md5-cache/www-apps/nextcloud-15.0.14
deleted file mode 100644
index 06d0551fe61e..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-15.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=15.0.14
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-15.0.14.tar.bz2
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=a2d5862e22cfed7024dd32929f0a5e17
diff --git a/metadata/md5-cache/www-apps/nextcloud-16.0.5 b/metadata/md5-cache/www-apps/nextcloud-16.0.5
deleted file mode 100644
index ceae9d0c6f0d..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-16.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=6
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=16.0.5
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-16.0.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9a3d17e7678ff064f19fb604b5a28781
diff --git a/metadata/md5-cache/www-apps/nextcloud-16.0.6 b/metadata/md5-cache/www-apps/nextcloud-16.0.6
deleted file mode 100644
index 4ea2265587f5..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-16.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=6
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=16.0.6
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-16.0.6.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9a3d17e7678ff064f19fb604b5a28781
diff --git a/metadata/md5-cache/www-apps/nextcloud-16.0.7 b/metadata/md5-cache/www-apps/nextcloud-16.0.7
deleted file mode 100644
index 5a02bc34f63d..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-16.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=16.0.7
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-16.0.7.tar.bz2
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=a2d5862e22cfed7024dd32929f0a5e17
diff --git a/metadata/md5-cache/www-apps/nextcloud-16.0.8 b/metadata/md5-cache/www-apps/nextcloud-16.0.8
new file mode 100644
index 000000000000..274136f4e216
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-16.0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=7
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=16.0.8
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-16.0.8.tar.bz2
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=2654727695f27a55da13d3cc0f9108d0
diff --git a/metadata/md5-cache/www-apps/nextcloud-17.0.0 b/metadata/md5-cache/www-apps/nextcloud-17.0.0
deleted file mode 100644
index 0b04f76fbf49..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-17.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=6
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=17.0.0
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-17.0.0.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9a3d17e7678ff064f19fb604b5a28781
diff --git a/metadata/md5-cache/www-apps/nextcloud-17.0.1 b/metadata/md5-cache/www-apps/nextcloud-17.0.1
deleted file mode 100644
index a7de0b9e8f5a..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-17.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=6
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=17.0.1
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-17.0.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=9a3d17e7678ff064f19fb604b5a28781
diff --git a/metadata/md5-cache/www-apps/nextcloud-17.0.2 b/metadata/md5-cache/www-apps/nextcloud-17.0.2
deleted file mode 100644
index b102ee2ad94d..000000000000
--- a/metadata/md5-cache/www-apps/nextcloud-17.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Personal cloud that runs on your own server
-EAPI=7
-HOMEPAGE=http://nextcloud.com
-IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=AGPL-3
-RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=17.0.2
-SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-17.0.2.tar.bz2
-_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=a2d5862e22cfed7024dd32929f0a5e17
diff --git a/metadata/md5-cache/www-apps/nextcloud-17.0.3 b/metadata/md5-cache/www-apps/nextcloud-17.0.3
new file mode 100644
index 000000000000..d835a6a1a315
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-17.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=7
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl +imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] imagemagick? ( dev-php/pecl-imagick ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=17.0.3
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-17.0.3.tar.bz2
+_eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=2654727695f27a55da13d3cc0f9108d0
diff --git a/metadata/md5-cache/www-apps/nikola-7.8.15 b/metadata/md5-cache/www-apps/nikola-7.8.15
index 79e67fd0878c..ca911117b87f 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=ipython? ( || ( python_targets_python3_6 ) ) || ( python_targets_py
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fa9714bae510438f4c888404222728bf
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 7961d7b878bb..09052045959f 100644
--- a/metadata/md5-cache/www-apps/nikola-7.8.15-r1
+++ b/metadata/md5-cache/www-apps/nikola-7.8.15-r1
@@ -1,15 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/docutils-0.12[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=>=dev-python/docutils-0.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A static website and blog generator
-EAPI=6
+EAPI=7
 HOMEPAGE=https://getnikola.com/
 IUSE=assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket python_targets_python3_6
 KEYWORDS=~amd64
 LICENSE=MIT Apache-2.0 CC0-1.0 public-domain
-RDEPEND=>=dev-python/docutils-0.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/blinker-1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/doit-0.29.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/logbook-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/lxml-3.3.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mako-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/markdown-2.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/natsort-3.5.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/piexif-1.0.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pygments-1.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/PyRSS2Gen-1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-20.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/unidecode-0.04.16[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/yapsy-1.11.223[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] assets? ( >=dev-python/webassets-0.10.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) charts? ( >=dev-python/pygal-2.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ghpages? ( >=dev-python/ghp-import-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) hyphenation? ( >=dev-python/pyphen-0.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ipython? ( >=dev-python/ipython-2.0.0[notebook,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jinja? ( >=dev-python/jinja-2.7.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) watchdog? ( ~dev-python/watchdog-0.8.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) webmedia? ( >=dev-python/micawber-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) websocket? ( ~dev-python/ws4py-0.3.4[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(-)]
+RDEPEND=>=dev-python/docutils-0.12[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/blinker-1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/doit-0.29.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/logbook-1.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/lxml-3.3.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mako-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/markdown-2.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/natsort-3.5.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/piexif-1.0.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pygments-1.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/PyRSS2Gen-1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/unidecode-0.04.16[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/yapsy-1.11.223[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] assets? ( >=dev-python/webassets-0.10.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) charts? ( >=dev-python/pygal-2.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ghpages? ( >=dev-python/ghp-import-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) hyphenation? ( >=dev-python/pyphen-0.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ipython? ( >=dev-python/ipython-2.0.0[notebook,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jinja? ( >=dev-python/jinja-2.7.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) watchdog? ( ~dev-python/watchdog-0.8.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) webmedia? ( >=dev-python/micawber-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) websocket? ( ~dev-python/ws4py-0.3.4[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/N/Nikola/Nikola-7.8.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=13f1c1911406f01301217a56fd61ca7d
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d9bc0f21f446d4128591d7551661345c
diff --git a/metadata/md5-cache/www-apps/nikola-8.0.4 b/metadata/md5-cache/www-apps/nikola-8.0.4
new file mode 100644
index 000000000000..ce50b51384a8
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nikola-8.0.4
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/docutils-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=A static website and blog generator
+EAPI=7
+HOMEPAGE=https://getnikola.com/
+IUSE=assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 CC0-1.0 public-domain
+RDEPEND=>=dev-python/docutils-0.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/Babel-2.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/blinker-1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/doit-0.30.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/lxml-3.3.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/mako-1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/markdown-3.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/natsort-3.5.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/piexif-1.0.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pygments-1.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/PyRSS2Gen-1.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.6.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/unidecode-0.04.16[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/yapsy-1.11.223[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/cloudpickle[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] assets? ( >=dev-python/webassets-0.10.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) charts? ( >=dev-python/pygal-2.0.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ghpages? ( >=dev-python/ghp-import-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) hyphenation? ( >=dev-python/pyphen-0.9.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ipython? ( >=dev-python/ipython-2.0.0[notebook,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) jinja? ( >=dev-python/jinja-2.7.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) watchdog? ( ~dev-python/watchdog-0.8.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) webmedia? ( >=dev-python/micawber-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) websocket? ( ~dev-python/ws4py-0.3.4[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/N/Nikola/Nikola-8.0.4.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fdfebd1f50edd396874e9f27d73ec25f
diff --git a/metadata/md5-cache/www-apps/novnc-0.6.2 b/metadata/md5-cache/www-apps/novnc-0.6.2
index 0e9c6605ec80..16dafca44ecb 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5e9ebab92562b83b5d8ca42d3d5e1d52
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 b4a3bf00e470..fdd1b7f12546 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a5ea68452b256be1f7143d33092c5a4e
diff --git a/metadata/md5-cache/www-apps/novnc-1.0.0 b/metadata/md5-cache/www-apps/novnc-1.0.0
index 2dce07bfb277..5099d227fe21 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_python3_6(-)?,-python_single_target
 REQUIRED_USE=|| ( 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fcf0d4eae253dd60a119aec481dbe2e9
diff --git a/metadata/md5-cache/www-apps/novnc-9999 b/metadata/md5-cache/www-apps/novnc-9999
index 99d84652c647..f731a539d6b2 100644
--- a/metadata/md5-cache/www-apps/novnc-9999
+++ b/metadata/md5-cache/www-apps/novnc-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/websockify[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af3ba371da3126e6228893b720198d49
diff --git a/metadata/md5-cache/www-apps/otrs-5.0.25 b/metadata/md5-cache/www-apps/otrs-5.0.25
index 20eafb81a227..f0789e31dbdb 100644
--- a/metadata/md5-cache/www-apps/otrs-5.0.25
+++ b/metadata/md5-cache/www-apps/otrs-5.0.25
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Apache-Reload dev-perl/Archive-Zip dev-perl/DBI dev-perl/IO-Soc
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-5.0.25.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=8cc5abc4c34a6440a3ff0721dd0762a6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=4f0198e0a033d8a87a62e6caa837a111
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.3 b/metadata/md5-cache/www-apps/otrs-6.0.3
index 914621716eab..48deb53fea72 100644
--- a/metadata/md5-cache/www-apps/otrs-6.0.3
+++ b/metadata/md5-cache/www-apps/otrs-6.0.3
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Apache-Reload dev-perl/Archive-Zip dev-perl/DBI dev-perl/IO-Soc
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.3.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=23c8bc622480bd643e2bcfd9dc4624c6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=a21d5980d5ae8d4b6419bcd6d09f5c5b
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.4 b/metadata/md5-cache/www-apps/otrs-6.0.4
index e317c90d219c..6761d7ae4f26 100644
--- a/metadata/md5-cache/www-apps/otrs-6.0.4
+++ b/metadata/md5-cache/www-apps/otrs-6.0.4
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Apache-Reload dev-perl/Archive-Zip dev-perl/DBI dev-perl/IO-Soc
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.4.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=23c8bc622480bd643e2bcfd9dc4624c6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=a21d5980d5ae8d4b6419bcd6d09f5c5b
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.5 b/metadata/md5-cache/www-apps/otrs-6.0.5
index 25eaba8d2843..5b51a380fb81 100644
--- a/metadata/md5-cache/www-apps/otrs-6.0.5
+++ b/metadata/md5-cache/www-apps/otrs-6.0.5
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Apache-Reload dev-perl/Archive-Zip dev-perl/DBI dev-perl/IO-Soc
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.5.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=23c8bc622480bd643e2bcfd9dc4624c6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=a21d5980d5ae8d4b6419bcd6d09f5c5b
diff --git a/metadata/md5-cache/www-apps/otrs-6.0.7 b/metadata/md5-cache/www-apps/otrs-6.0.7
index 3a645f8afe9a..fe4c7ca20bf3 100644
--- a/metadata/md5-cache/www-apps/otrs-6.0.7
+++ b/metadata/md5-cache/www-apps/otrs-6.0.7
@@ -10,5 +10,5 @@ RDEPEND=dev-perl/Archive-Zip dev-perl/DBI dev-perl/IO-Socket-SSL dev-perl/JSON-X
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=0
 SRC_URI=https://ftp.otrs.org/pub/otrs/otrs-6.0.7.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=afdc3608ac9926a44303e11196336693
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=951d8ecc7eb4c8dfd788678cfb3104e1
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 17f214d73528..987eabb12c5a 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=471d1488f26dfc714c323d2f95cfa03d
diff --git a/metadata/md5-cache/www-apps/ownpaste-9999 b/metadata/md5-cache/www-apps/ownpaste-9999
index aa69dc961c46..3fa38591038a 100644
--- a/metadata/md5-cache/www-apps/ownpaste-9999
+++ b/metadata/md5-cache/www-apps/ownpaste-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=471d1488f26dfc714c323d2f95cfa03d
diff --git a/metadata/md5-cache/www-apps/postfixadmin-3.2.3 b/metadata/md5-cache/www-apps/postfixadmin-3.2.3
index 82ef204ec0d8..37670728b7af 100644
--- a/metadata/md5-cache/www-apps/postfixadmin-3.2.3
+++ b/metadata/md5-cache/www-apps/postfixadmin-3.2.3
@@ -10,5 +10,5 @@ RDEPEND=dev-lang/php:*[unicode,imap,postgres?] vacation? ( dev-perl/DBI dev-perl
 REQUIRED_USE=|| ( mysql postgres )
 SLOT=3.2.3
 SRC_URI=https://github.com/postfixadmin/postfixadmin/archive/postfixadmin-3.2.3.tar.gz
-_eclasses_=user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=efbe3de7bc398be60fd102b497a0b4ea
diff --git a/metadata/md5-cache/www-apps/prewikka-5.1.1 b/metadata/md5-cache/www-apps/prewikka-5.1.1
index 38c3130ed3fa..c2aaebba05a3 100644
--- a/metadata/md5-cache/www-apps/prewikka-5.1.1
+++ b/metadata/md5-cache/www-apps/prewikka-5.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libprelude-5.1.0[python,python_targets_python3_6(-)?,-python_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://www.prelude-siem.org/pkg/src/5.1.0/prewikka-5.1.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=784d41eea828b5b7e0146833d57ebf1b
diff --git a/metadata/md5-cache/www-apps/radicale-1.1.6 b/metadata/md5-cache/www-apps/radicale-1.1.6
index 9662ca48b37f..35b9affa50ad 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_6(-)?,-python_single_t
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Radicale/Radicale-1.1.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=237d3f02d4da47972ed842957f43dbb7
diff --git a/metadata/md5-cache/www-apps/radicale-2.1.11-r1 b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
index 02087800e78d..9bc7c9ef39a4 100644
--- a/metadata/md5-cache/www-apps/radicale-2.1.11-r1
+++ b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
@@ -10,5 +10,5 @@ RDEPEND=sys-apps/util-linux >=dev-python/vobject-0.9.6[python_targets_python3_6(
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/R/Radicale/Radicale-2.1.11.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=39ab33a10988d505849d8d3bc622976c
diff --git a/metadata/md5-cache/www-apps/roundup-1.5.1 b/metadata/md5-cache/www-apps/roundup-1.5.1
index dfe20727eff1..3cc6af0d13fa 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3f1ced4f85d21b1c3155354b9f21f702
diff --git a/metadata/md5-cache/www-apps/roundup-1.6.1-r1 b/metadata/md5-cache/www-apps/roundup-1.6.1-r1
index 3d2baae24ec8..6f4758ee716a 100644
--- a/metadata/md5-cache/www-apps/roundup-1.6.1-r1
+++ b/metadata/md5-cache/www-apps/roundup-1.6.1-r1
@@ -10,5 +10,5 @@ RDEPEND=tz? ( dev-python/pytz[python_targets_python2_7(-)?,-python_single_target
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/roundup/roundup-1.6.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=b529ea320985bd897c7364d2c97b023c
diff --git a/metadata/md5-cache/www-apps/rt-4.4.3 b/metadata/md5-cache/www-apps/rt-4.4.3
index 8a826d8b32cd..d9e48deef68b 100644
--- a/metadata/md5-cache/www-apps/rt-4.4.3
+++ b/metadata/md5-cache/www-apps/rt-4.4.3
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( mysql postgres )
 RESTRICT=test
 SLOT=4.4.3
 SRC_URI=http://download.bestpractical.com/pub/rt/release/rt-4.4.3.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=f3f0a899cd62c65f111caac4e5ed1e56
diff --git a/metadata/md5-cache/www-apps/rt-4.4.4 b/metadata/md5-cache/www-apps/rt-4.4.4
index c4e84733fc8d..5f9df3b40ce5 100644
--- a/metadata/md5-cache/www-apps/rt-4.4.4
+++ b/metadata/md5-cache/www-apps/rt-4.4.4
@@ -11,5 +11,5 @@ REQUIRED_USE=^^ ( mysql postgres )
 RESTRICT=test
 SLOT=4.4.4
 SRC_URI=https://download.bestpractical.com/pub/rt/release/rt-4.4.4.tar.gz
-_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=depend.apache	05ca915dc22ea60059f85d8d9a34d3de	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=98036bf9ee1ec2041daa9741afabd546
diff --git a/metadata/md5-cache/www-apps/scgi-1.14-r1 b/metadata/md5-cache/www-apps/scgi-1.14-r1
index 75d3389ff3c8..d39691cf2102 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b6cf242598dce9cd9a0d1f2eea03037c
diff --git a/metadata/md5-cache/www-apps/trac-1.0.9 b/metadata/md5-cache/www-apps/trac-1.0.9
deleted file mode 100644
index 634b9b020275..000000000000
--- a/metadata/md5-cache/www-apps/trac-1.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
-EAPI=5
-HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
-IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion +python_targets_python2_7 +python_single_target_python2_7 vhosts
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=701e63e580ce0f4f99b50f6ce045a990
diff --git a/metadata/md5-cache/www-apps/trac-1.0.9-r1 b/metadata/md5-cache/www-apps/trac-1.0.9-r1
new file mode 100644
index 000000000000..b2b0a3313fde
--- /dev/null
+++ b/metadata/md5-cache/www-apps/trac-1.0.9-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] dev-python/genshi[python_targets_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)] ) ) python_single_target_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? ( dev-python/setuptools[python_targets_python2_7(-)] ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
+EAPI=5
+HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
+IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion +python_single_target_python2_7 vhosts
+KEYWORDS=amd64 ppc ~ppc64 x86
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] dev-python/genshi[python_targets_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)] ) cgi? ( virtual/httpd-cgi ) fastcgi? ( virtual/httpd-fastcgi ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite ) ^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.0.9.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=45c3702b871aa9cc00c6709de1d81a7c
diff --git a/metadata/md5-cache/www-apps/trac-1.2.1 b/metadata/md5-cache/www-apps/trac-1.2.1
deleted file mode 100644
index b70f25b1a6b3..000000000000
--- a/metadata/md5-cache/www-apps/trac-1.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
-EAPI=5
-HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
-IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion +python_targets_python2_7 +python_single_target_python2_7 vhosts
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pytz[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysql postgres sqlite ) ^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=438c239d6d75a0c5dbb8b61c69d05e7d
diff --git a/metadata/md5-cache/www-apps/trac-1.2.1-r1 b/metadata/md5-cache/www-apps/trac-1.2.1-r1
new file mode 100644
index 000000000000..4ca268f7de0c
--- /dev/null
+++ b/metadata/md5-cache/www-apps/trac-1.2.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm setup test
+DEPEND=python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] dev-python/genshi[python_targets_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)] ) ) python_single_target_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? ( dev-python/setuptools[python_targets_python2_7(-)] ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Enhanced wiki and issue tracking system for software development projects
+EAPI=5
+HOMEPAGE=http://trac.edgewall.com/ https://pypi.org/project/Trac/
+IUSE=cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion +python_single_target_python2_7 vhosts
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] dev-python/genshi[python_targets_python2_7(-)] dev-python/pytz[python_targets_python2_7(-)] i18n? ( >=dev-python/Babel-0.9.5[python_targets_python2_7(-)] ) highlight? ( || ( dev-python/pygments[python_targets_python2_7(-)] app-text/silvercity app-text/pytextile app-text/enscript ) ) restructuredtext? ( dev-python/docutils[python_targets_python2_7(-)] ) mysql? ( dev-python/mysql-python[python_targets_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2[python_targets_python2_7(-)] ) sqlite? ( >=dev-db/sqlite-3.3.4:3 ) subversion? ( dev-vcs/subversion[python,python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite ) ^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://ftp.edgewall.com/pub/trac/Trac-1.2.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0fda5d84b0f05467c981a936bac0fd52
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 ee17357c15b2..4cad5ce78cbc 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 8438e11e3885..d1a2b12cbd19 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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
deleted file mode 100644
index da38be3259cb..000000000000
--- a/metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A Mercurial plugin for Trac
-EAPI=6
-HOMEPAGE=http://trac.edgewall.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=www-apps/trac-0.12[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
-SRC_URI=https://dev.gentoo.org/~rafaelmartins/distfiles/TracMercurial-0.12.0.29dev-r10899.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cc1dd660abf2b1768a60b654d91632eb
diff --git a/metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r2 b/metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r2
new file mode 100644
index 000000000000..057887d614f3
--- /dev/null
+++ b/metadata/md5-cache/www-apps/trac-mercurial-0.12.0.29_pre10899-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=A Mercurial plugin for Trac
+EAPI=6
+HOMEPAGE=http://trac.edgewall.org/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=www-apps/trac-0.12[python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-vcs/mercurial-1.1[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~rafaelmartins/distfiles/TracMercurial-0.12.0.29dev-r10899.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=04642a34ff81b2efb1f156c5afe6a87d
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 b1cf20be5dcb..09b4b151e958 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
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/mercurial
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python2_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/setuptools[python_targets_python2_7(-)] ) dev-vcs/mercurial
 DESCRIPTION=A Mercurial plugin for Trac
 EAPI=6
 HOMEPAGE=http://trac.edgewall.org/
-IUSE=python_targets_python2_7
+IUSE=+python_single_target_python2_7
 LICENSE=GPL-2
 PROPERTIES=live
-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 )
+RDEPEND=>=www-apps/trac-1.0[python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-vcs/mercurial-1.1[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25013b422ce0efb6417686f6f7b09b94
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7877d94ba3a1f4cffcf903ece0b68c9a
diff --git a/metadata/md5-cache/www-apps/trac-tags-0.6-r1 b/metadata/md5-cache/www-apps/trac-tags-0.6-r1
deleted file mode 100644
index 1b459e66d190..000000000000
--- a/metadata/md5-cache/www-apps/trac-tags-0.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/genshi-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Tags plugin for Trac
-EAPI=6
-HOMEPAGE=http://trac-hacks.org/wiki/TagsPlugin
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/genshi-0.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=www-apps/trac-0.11[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://trac-hacks.org/changeset/9901/tagsplugin/tags/0.6?old_path=%2F&format=zip -> trac-tags-0.6.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=be4a84c18cf9da8c20fe176905c8c7d6
diff --git a/metadata/md5-cache/www-apps/trac-tags-0.6-r2 b/metadata/md5-cache/www-apps/trac-tags-0.6-r2
new file mode 100644
index 000000000000..d3e6b11fb578
--- /dev/null
+++ b/metadata/md5-cache/www-apps/trac-tags-0.6-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-python/genshi-0.6[python_targets_python2_7(-)] ) app-arch/unzip python_single_target_python2_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/setuptools[python_targets_python2_7(-)] )
+DESCRIPTION=Tags plugin for Trac
+EAPI=6
+HOMEPAGE=http://trac-hacks.org/wiki/TagsPlugin
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_single_target_python2_7? ( >=dev-python/genshi-0.6[python_targets_python2_7(-)] ) >=www-apps/trac-0.11[python_single_target_python2_7(-)?] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+REQUIRED_USE=^^ ( python_single_target_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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=68d0bacc08c1495caf3b64afd1f8f6c4
diff --git a/metadata/md5-cache/www-apps/trickster-0.1.9 b/metadata/md5-cache/www-apps/trickster-0.1.9
index af8ce4506fc9..c532c6c08f03 100644
--- a/metadata/md5-cache/www-apps/trickster-0.1.9
+++ b/metadata/md5-cache/www-apps/trickster-0.1.9
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/Comcast/trickster/archive/v0.1.9.tar.gz -> trickster-0.1.9.tar.gz https://dev.gentoo.org/~williamh/dist/trickster-0.1.9-vendor.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5310327590d0b774f596663ab43ec317
diff --git a/metadata/md5-cache/www-apps/tt-rss-20180105 b/metadata/md5-cache/www-apps/tt-rss-20180105
index bd062f97b4d6..f876fcc85923 100644
--- a/metadata/md5-cache/www-apps/tt-rss-20180105
+++ b/metadata/md5-cache/www-apps/tt-rss-20180105
@@ -10,5 +10,5 @@ RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postg
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=20180105
 SRC_URI=https://git.tt-rss.org/git/tt-rss/archive/c30f5e18119d1935e8fe6d422053b127e8f4f1b3.tar.gz -> tt-rss-20180105.tar.gz
-_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=11f53d1c564f8684d7496f5d2bacf560
diff --git a/metadata/md5-cache/www-apps/tt-rss-20190523 b/metadata/md5-cache/www-apps/tt-rss-20190523
index c7f7a271e86c..34e2d525485e 100644
--- a/metadata/md5-cache/www-apps/tt-rss-20190523
+++ b/metadata/md5-cache/www-apps/tt-rss-20190523
@@ -10,5 +10,5 @@ RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postg
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=20190523
 SRC_URI=https://git.tt-rss.org/git/tt-rss/archive/4a2836ea90c4c471029d189a8c9fe5ec10a9521b.tar.gz -> tt-rss-20190523.tar.gz
-_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=prefix	c2993e4c430c1ee24f278983d6189501	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=4889666c45d4d5f540407bca1302e41f
diff --git a/metadata/md5-cache/www-apps/tt-rss-99999999 b/metadata/md5-cache/www-apps/tt-rss-99999999
index 7ee2c0afefe0..c2c541912a13 100644
--- a/metadata/md5-cache/www-apps/tt-rss-99999999
+++ b/metadata/md5-cache/www-apps/tt-rss-99999999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=daemon? ( acl? ( sys-apps/acl ) ) daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,cli,intl,pcntl,pdo] ) !daemon? ( dev-lang/php:*[mysqli?,postgres?,curl,intl,pdo] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysqli postgres )
 SLOT=99999999
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	prefix	c2993e4c430c1ee24f278983d6189501	user	00484e1be1aac73e24fca1c99557a7d6	webapp	16783e418aca3ffa461d68310bf7ab12
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	prefix	c2993e4c430c1ee24f278983d6189501	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	webapp	16783e418aca3ffa461d68310bf7ab12
 _md5_=15732b2927bbee0903215752c2191054
diff --git a/metadata/md5-cache/www-apps/venus-20100911-r1 b/metadata/md5-cache/www-apps/venus-20100911-r1
deleted file mode 100644
index 28ef7146d71f..000000000000
--- a/metadata/md5-cache/www-apps/venus-20100911-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup test
-DEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/utidylib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] django? ( dev-python/django[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A feed aggregator application
-EAPI=6
-HOMEPAGE=http://intertwingly.net/code/venus/
-IUSE=django genshi redland test vhosts +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=PSF-2.2
-RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/utidylib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] django? ( dev-python/django[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gentoo/venus-20100911.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=5dda6c1d74898d3f0d9cf93ea6178a78
diff --git a/metadata/md5-cache/www-apps/venus-20100911-r2 b/metadata/md5-cache/www-apps/venus-20100911-r2
deleted file mode 100644
index a0194b7bcb44..000000000000
--- a/metadata/md5-cache/www-apps/venus-20100911-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup test
-DEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/utidylib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] django? ( dev-python/django[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=A feed aggregator application
-EAPI=6
-HOMEPAGE=http://intertwingly.net/code/venus/
-IUSE=django genshi redland test vhosts +python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=PSF-2.2
-RDEPEND=dev-python/bsddb3[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/utidylib[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] django? ( dev-python/django[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gentoo/venus-20100911.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=95da7889b2e8757e432b0640c6170224
diff --git a/metadata/md5-cache/www-apps/venus-20100911-r3 b/metadata/md5-cache/www-apps/venus-20100911-r3
new file mode 100644
index 000000000000..758c30985963
--- /dev/null
+++ b/metadata/md5-cache/www-apps/venus-20100911-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prepare prerm setup test
+DEPEND=python_single_target_python2_7? ( dev-python/bsddb3[python_targets_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)] dev-python/utidylib[python_targets_python2_7(-)] django? ( dev-python/django[python_targets_python2_7(-)] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A feed aggregator application
+EAPI=6
+HOMEPAGE=http://intertwingly.net/code/venus/
+IUSE=django genshi redland test vhosts +python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=PSF-2.2
+RDEPEND=python_single_target_python2_7? ( dev-python/bsddb3[python_targets_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)] dev-python/utidylib[python_targets_python2_7(-)] django? ( dev-python/django[python_targets_python2_7(-)] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gentoo/venus-20100911.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=b69004874790ff7370834fd48d0deb4d
diff --git a/metadata/md5-cache/www-apps/venus-20100911-r4 b/metadata/md5-cache/www-apps/venus-20100911-r4
new file mode 100644
index 000000000000..3d0c3311da6d
--- /dev/null
+++ b/metadata/md5-cache/www-apps/venus-20100911-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prepare prerm setup test
+DEPEND=python_single_target_python2_7? ( dev-python/bsddb3[python_targets_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)] dev-python/utidylib[python_targets_python2_7(-)] django? ( dev-python/django[python_targets_python2_7(-)] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A feed aggregator application
+EAPI=6
+HOMEPAGE=http://intertwingly.net/code/venus/
+IUSE=django genshi redland test vhosts +python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=PSF-2.2
+RDEPEND=python_single_target_python2_7? ( dev-python/bsddb3[python_targets_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)] dev-python/httplib2[python_targets_python2_7(-)] dev-python/utidylib[python_targets_python2_7(-)] django? ( dev-python/django[python_targets_python2_7(-)] ) genshi? ( dev-python/genshi[python_targets_python2_7(-)] ) redland? ( dev-python/rdflib[redland,python_targets_python2_7(-)] ) ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gentoo/venus-20100911.tar.bz2
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=07a060abed4e3ba584ebdc5af00acac7
diff --git a/metadata/md5-cache/www-apps/viewvc-1.1.26 b/metadata/md5-cache/www-apps/viewvc-1.1.26
deleted file mode 100644
index 616602a368d3..000000000000
--- a/metadata/md5-cache/www-apps/viewvc-1.1.26
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=ViewVC, a web interface to CVS and Subversion
-EAPI=6
-HOMEPAGE=http://viewvc.org/
-IUSE=cvs cvsgraph mod_wsgi mysql pygments +subversion +python_targets_python2_7 +python_single_target_python2_7 vhosts
-KEYWORDS=amd64 ~ppc x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cvs? ( dev-vcs/rcs ) subversion? ( >=dev-vcs/subversion-1.3.1[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) mod_wsgi? ( www-apache/mod_wsgi[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) !mod_wsgi? ( virtual/httpd-cgi ) cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 ) mysql? ( >=dev-python/mysql-python-0.9.0[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] ) pygments? ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] app-misc/mime-types ) >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) || ( cvs subversion )
-SLOT=0
-SRC_URI=http://viewvc.org/downloads/viewvc-1.1.26.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=4834881139ba022f670ca5d63fdc6537
diff --git a/metadata/md5-cache/www-apps/viewvc-1.1.26-r1 b/metadata/md5-cache/www-apps/viewvc-1.1.26-r1
new file mode 100644
index 000000000000..bcfa56922d2a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/viewvc-1.1.26-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=ViewVC, a web interface to CVS and Subversion
+EAPI=6
+HOMEPAGE=http://viewvc.org/
+IUSE=cvs cvsgraph mod_wsgi mysql pygments +subversion +python_single_target_python2_7 vhosts
+KEYWORDS=amd64 ~ppc x86
+LICENSE=BSD-2
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) cvs? ( dev-vcs/rcs ) mod_wsgi? ( www-apache/mod_wsgi[python_single_target_python2_7(-)?] ) !mod_wsgi? ( virtual/httpd-cgi ) cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 ) python_single_target_python2_7? ( subversion? ( >=dev-vcs/subversion-1.3.1[python,python_targets_python2_7(-)] ) mysql? ( >=dev-python/mysql-python-0.9.0[python_targets_python2_7(-)] ) pygments? ( dev-python/pygments[python_targets_python2_7(-)] app-misc/mime-types ) ) >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( python_single_target_python2_7 ) || ( cvs subversion )
+SLOT=0
+SRC_URI=http://viewvc.org/downloads/viewvc-1.1.26.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	16783e418aca3ffa461d68310bf7ab12
+_md5_=226f4ae887367309f71cf7210e09eb73
diff --git a/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2 b/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2
index 970899f5d7af..234f719c62da 100644
--- a/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2
+++ b/metadata/md5-cache/www-apps/zeppelin-bin-0.8.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=mirror://apache/zeppelin/zeppelin-0.8.2/zeppelin-0.8.2-bin-all.tgz -> zeppelin-bin-0.8.2.tgz
-_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=cec6fa1a56bd7e322210e89da02ea17b
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 4c54333e55e8..0a88ea0944bf 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-79.0.3945.130 b/metadata/md5-cache/www-client/chromium-79.0.3945.130
deleted file mode 100644
index de416ade57f3..000000000000
--- a/metadata/md5-cache/www-client/chromium-79.0.3945.130
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=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 closure-compile? ( virtual/jre ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-65:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=http://chromium.org/
-IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos 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 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-65:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-79.0.3945.130.tar.xz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62ed243e92de620e90668b8239286daa
diff --git a/metadata/md5-cache/www-client/chromium-80.0.3987.87 b/metadata/md5-cache/www-client/chromium-80.0.3987.87
index 0e52247c769a..450197a986ad 100644
--- a/metadata/md5-cache/www-client/chromium-80.0.3987.87
+++ b/metadata/md5-cache/www-client/chromium-80.0.3987.87
@@ -5,7 +5,7 @@ DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=7
 HOMEPAGE=http://chromium.org/
 IUSE=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos 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 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-65:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2019.08.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 >=media-libs/opus-1.3.1:= ) 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 )
 REQUIRED_USE=component-build? ( !suid )
@@ -13,4 +13,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-80.0.3987.87.tar.xz
 _eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e51b30308c59864d185b0f5133f35813
+_md5_=7a0f194777078e0a971eb06879eb0456
diff --git a/metadata/md5-cache/www-client/chromium-81.0.4040.5 b/metadata/md5-cache/www-client/chromium-81.0.4040.5
deleted file mode 100644
index 24c1a656431b..000000000000
--- a/metadata/md5-cache/www-client/chromium-81.0.4040.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=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 closure-compile? ( virtual/jre ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-65:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2019.08.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 >=media-libs/opus-1.3.1:= ) 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=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos 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 ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-65:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2019.08.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 >=media-libs/opus-1.3.1:= ) 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 )
-REQUIRED_USE=component-build? ( !suid )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-81.0.4040.5.tar.xz
-_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=90a4bed976614078cee480b37500fc51
diff --git a/metadata/md5-cache/www-client/chromium-81.0.4044.9 b/metadata/md5-cache/www-client/chromium-81.0.4044.9
new file mode 100644
index 000000000000..927033498554
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-81.0.4044.9
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn dev-vcs/git >=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 closure-compile? ( virtual/jre ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-65:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2019.08.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 >=media-libs/opus-1.3.1:= ) 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=+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos 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 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-65:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2019.08.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 >=media-libs/opus-1.3.1:= ) 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 )
+REQUIRED_USE=component-build? ( !suid )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-81.0.4044.9.tar.xz
+_eclasses_=check-reqs	5e40a693d9c828e8f3655184116e8b73	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e21194190f9127c816ed3b251a5dd300
diff --git a/metadata/md5-cache/www-client/dillo-3.0.5-r1 b/metadata/md5-cache/www-client/dillo-3.0.5-r1
deleted file mode 100644
index 00b18b5a6360..000000000000
--- a/metadata/md5-cache/www-client/dillo-3.0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) doc? ( app-doc/doxygen )
-DESCRIPTION=Lean FLTK based web browser
-EAPI=5
-HOMEPAGE=https://www.dillo.org/
-IUSE=doc +gif ipv6 +jpeg libressl +png ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
-SLOT=0
-SRC_URI=https://www.dillo.org/download/dillo-3.0.5.tar.bz2 mirror://gentoo/dillo.png
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1b16f5bef652a3c2eb8ee5022be7709
diff --git a/metadata/md5-cache/www-client/dillo-3.0.5-r2 b/metadata/md5-cache/www-client/dillo-3.0.5-r2
deleted file mode 100644
index 4518c83c752f..000000000000
--- a/metadata/md5-cache/www-client/dillo-3.0.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) doc? ( app-doc/doxygen )
-DEFINED_PHASES=compile configure install
-DESCRIPTION=Lean FLTK based web browser
-EAPI=7
-HOMEPAGE=https://www.dillo.org/
-IUSE=doc +gif ipv6 +jpeg libressl +png ssl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
-SLOT=0
-SRC_URI=https://www.dillo.org/download/dillo-3.0.5.tar.bz2 mirror://gentoo/dillo.png
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5a544af7fa38db3f5c6b520108f02af4
diff --git a/metadata/md5-cache/www-client/dillo-3.0.5-r3 b/metadata/md5-cache/www-client/dillo-3.0.5-r3
new file mode 100644
index 000000000000..f736d9e3ee3d
--- /dev/null
+++ b/metadata/md5-cache/www-client/dillo-3.0.5-r3
@@ -0,0 +1,13 @@
+BDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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
+DESCRIPTION=Lean FLTK based web browser
+EAPI=7
+HOMEPAGE=https://www.dillo.org/
+IUSE=doc +gif ipv6 +jpeg libressl +png ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
+SLOT=0
+SRC_URI=https://www.dillo.org/download/dillo-3.0.5.tar.bz2 mirror://gentoo/dillo.png
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a4029af16947289c42ec46641c322f8d
diff --git a/metadata/md5-cache/www-client/dillo-3.1_p20181005 b/metadata/md5-cache/www-client/dillo-3.1_p20181005
new file mode 100644
index 000000000000..02671fecb85f
--- /dev/null
+++ b/metadata/md5-cache/www-client/dillo-3.1_p20181005
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( net-libs/mbedtls:= ) doc? ( app-doc/doxygen )
+DESCRIPTION=Lean FLTK based web browser
+EAPI=7
+HOMEPAGE=https://www.dillo.org/
+IUSE=doc +gif ipv6 +jpeg +png ssl +xembed
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( net-libs/mbedtls:= )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/dillo-3.1_p20181005.tar.xz mirror://gentoo/dillo.png
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=de85aca0fb1d72078914cfcae76320ea
diff --git a/metadata/md5-cache/www-client/dillo-9999 b/metadata/md5-cache/www-client/dillo-9999
index 48407af8d9c0..ad9381fd36f1 100644
--- a/metadata/md5-cache/www-client/dillo-9999
+++ b/metadata/md5-cache/www-client/dillo-9999
@@ -4,11 +4,11 @@ DEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media
 DESCRIPTION=Lean FLTK based web browser
 EAPI=7
 HOMEPAGE=https://www.dillo.org/
-IUSE=doc +gif ipv6 +jpeg +png ssl
+IUSE=doc +gif ipv6 +jpeg +png ssl +xembed
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=>=x11-libs/fltk-1.3 sys-libs/zlib jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.2:0 ) ssl? ( net-libs/mbedtls:= )
 SLOT=0
 SRC_URI=mirror://gentoo/dillo.png
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	mercurial	d22fe98ea362174612a57c233239102f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=4ea10642044f8e92ee63c23a62710391
+_md5_=fe55750a5f1a0f27d43f7b4b316db481
diff --git a/metadata/md5-cache/www-client/falkon-3.1.0-r1 b/metadata/md5-cache/www-client/falkon-3.1.0-r1
index 6bda388581b7..9fa1bd608d8f 100644
--- a/metadata/md5-cache/www-client/falkon-3.1.0-r1
+++ b/metadata/md5-cache/www-client/falkon-3.1.0-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) test
 SLOT=0
 SRC_URI=mirror://kde/stable/falkon/3.1/falkon-3.1.0.tar.xz
 _eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	ecm	879e666a2784e1ba491fdf89c982915d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	kde.org	12c2d7da2a75330ff5de0154686dbf4b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eca67296d775cd4dea68e1481c8328b1
+_md5_=5898f9f69806541affd0bd673dfaf9cb
diff --git a/metadata/md5-cache/www-client/firefox-52.9.0 b/metadata/md5-cache/www-client/firefox-52.9.0
index 8c6e8d70463a..0b92b3e982e8 100644
--- a/metadata/md5-cache/www-client/firefox-52.9.0
+++ b/metadata/md5-cache/www-client/firefox-52.9.0
@@ -11,4 +11,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 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	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	a561f803c85ceb062f6f8048de0b0455	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=faf2f29b8a1c48c63a1b6150872c0cb9
+_md5_=1ff6ed1bd81d617be45f1a13f8468d9f
diff --git a/metadata/md5-cache/www-client/firefox-71.0-r1 b/metadata/md5-cache/www-client/firefox-71.0-r1
deleted file mode 100644
index b43e561803ee..000000000000
--- a/metadata/md5-cache/www-client/firefox-71.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.47.1 >=dev-libs/nspr-4.23 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[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35: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 sys-apps/dbus dev-libs/dbus-glib 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-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.29.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.9.1 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ( sys-devel/clang:6 !clang? ( sys-devel/llvm:6 ) clang? ( =sys-devel/lld-6* sys-devel/llvm:6[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/rust-1.36.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 || ( >=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 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.47.1 >=dev-libs/nspr-4.23 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[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35: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 sys-apps/dbus dev-libs/dbus-glib 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-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.29.0:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( 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=pgo? ( lto )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ach.xpi -> firefox-71.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/af.xpi -> firefox-71.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/an.xpi -> firefox-71.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ar.xpi -> firefox-71.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ast.xpi -> firefox-71.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/az.xpi -> firefox-71.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/be.xpi -> firefox-71.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/bg.xpi -> firefox-71.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/bn.xpi -> firefox-71.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/br.xpi -> firefox-71.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/bs.xpi -> firefox-71.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ca.xpi -> firefox-71.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/cak.xpi -> firefox-71.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/cs.xpi -> firefox-71.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/cy.xpi -> firefox-71.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/da.xpi -> firefox-71.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/de.xpi -> firefox-71.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/dsb.xpi -> firefox-71.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/el.xpi -> firefox-71.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/en-CA.xpi -> firefox-71.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/en-GB.xpi -> firefox-71.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/eo.xpi -> firefox-71.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/es-AR.xpi -> firefox-71.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/es-CL.xpi -> firefox-71.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/es-ES.xpi -> firefox-71.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/es-MX.xpi -> firefox-71.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/et.xpi -> firefox-71.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/eu.xpi -> firefox-71.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/fa.xpi -> firefox-71.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ff.xpi -> firefox-71.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/fi.xpi -> firefox-71.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/fr.xpi -> firefox-71.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/fy-NL.xpi -> firefox-71.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ga-IE.xpi -> firefox-71.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/gd.xpi -> firefox-71.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/gl.xpi -> firefox-71.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/gn.xpi -> firefox-71.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/gu-IN.xpi -> firefox-71.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/he.xpi -> firefox-71.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/hi-IN.xpi -> firefox-71.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/hr.xpi -> firefox-71.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/hsb.xpi -> firefox-71.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/hu.xpi -> firefox-71.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/hy-AM.xpi -> firefox-71.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ia.xpi -> firefox-71.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/id.xpi -> firefox-71.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/is.xpi -> firefox-71.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/it.xpi -> firefox-71.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ja.xpi -> firefox-71.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ka.xpi -> firefox-71.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/kab.xpi -> firefox-71.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/kk.xpi -> firefox-71.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/km.xpi -> firefox-71.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/kn.xpi -> firefox-71.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ko.xpi -> firefox-71.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/lij.xpi -> firefox-71.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/lt.xpi -> firefox-71.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/lv.xpi -> firefox-71.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/mk.xpi -> firefox-71.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/mr.xpi -> firefox-71.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ms.xpi -> firefox-71.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/my.xpi -> firefox-71.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/nb-NO.xpi -> firefox-71.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/nl.xpi -> firefox-71.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/nn-NO.xpi -> firefox-71.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/oc.xpi -> firefox-71.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/pa-IN.xpi -> firefox-71.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/pl.xpi -> firefox-71.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/pt-BR.xpi -> firefox-71.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/pt-PT.xpi -> firefox-71.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/rm.xpi -> firefox-71.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ro.xpi -> firefox-71.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ru.xpi -> firefox-71.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/si.xpi -> firefox-71.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/sk.xpi -> firefox-71.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/sl.xpi -> firefox-71.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/son.xpi -> firefox-71.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/sq.xpi -> firefox-71.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/sr.xpi -> firefox-71.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/sv-SE.xpi -> firefox-71.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ta.xpi -> firefox-71.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/te.xpi -> firefox-71.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/th.xpi -> firefox-71.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/tr.xpi -> firefox-71.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/uk.xpi -> firefox-71.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/ur.xpi -> firefox-71.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/uz.xpi -> firefox-71.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/vi.xpi -> firefox-71.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/xh.xpi -> firefox-71.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/zh-CN.xpi -> firefox-71.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/71.0/linux-i686/xpi/zh-TW.xpi -> firefox-71.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/71.0/source/firefox-71.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-71.0-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-71.0-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-71.0-patches-04.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-71.0-patches-04.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	421fbfb443b64f7f1e2e3dd5bb739541	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=369c4b790d9402478c2fe348c5a4d13b
diff --git a/metadata/md5-cache/www-client/firefox-72.0.1 b/metadata/md5-cache/www-client/firefox-72.0.1
deleted file mode 100644
index af938dfc0fc1..000000000000
--- a/metadata/md5-cache/www-client/firefox-72.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.48 >=dev-libs/nspr-4.24 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[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35: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 sys-apps/dbus dev-libs/dbus-glib 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-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.10.1 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/rust-1.36.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 || ( >=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 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.48 >=dev-libs/nspr-4.24 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[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35: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 sys-apps/dbus dev-libs/dbus-glib 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-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( 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=pgo? ( lto )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ach.xpi -> firefox-72.0.1-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/af.xpi -> firefox-72.0.1-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/an.xpi -> firefox-72.0.1-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ar.xpi -> firefox-72.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ast.xpi -> firefox-72.0.1-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/az.xpi -> firefox-72.0.1-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/be.xpi -> firefox-72.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/bg.xpi -> firefox-72.0.1-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/bn.xpi -> firefox-72.0.1-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/br.xpi -> firefox-72.0.1-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/bs.xpi -> firefox-72.0.1-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ca.xpi -> firefox-72.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/cak.xpi -> firefox-72.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/cs.xpi -> firefox-72.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/cy.xpi -> firefox-72.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/da.xpi -> firefox-72.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/de.xpi -> firefox-72.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/dsb.xpi -> firefox-72.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/el.xpi -> firefox-72.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/en-CA.xpi -> firefox-72.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/en-GB.xpi -> firefox-72.0.1-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/eo.xpi -> firefox-72.0.1-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/es-AR.xpi -> firefox-72.0.1-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/es-CL.xpi -> firefox-72.0.1-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/es-ES.xpi -> firefox-72.0.1-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/es-MX.xpi -> firefox-72.0.1-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/et.xpi -> firefox-72.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/eu.xpi -> firefox-72.0.1-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/fa.xpi -> firefox-72.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ff.xpi -> firefox-72.0.1-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/fi.xpi -> firefox-72.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/fr.xpi -> firefox-72.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-72.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-72.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/gd.xpi -> firefox-72.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/gl.xpi -> firefox-72.0.1-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/gn.xpi -> firefox-72.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-72.0.1-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/he.xpi -> firefox-72.0.1-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-72.0.1-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/hr.xpi -> firefox-72.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/hsb.xpi -> firefox-72.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/hu.xpi -> firefox-72.0.1-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-72.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ia.xpi -> firefox-72.0.1-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/id.xpi -> firefox-72.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/is.xpi -> firefox-72.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/it.xpi -> firefox-72.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ja.xpi -> firefox-72.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ka.xpi -> firefox-72.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/kab.xpi -> firefox-72.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/kk.xpi -> firefox-72.0.1-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/km.xpi -> firefox-72.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/kn.xpi -> firefox-72.0.1-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ko.xpi -> firefox-72.0.1-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/lij.xpi -> firefox-72.0.1-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/lt.xpi -> firefox-72.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/lv.xpi -> firefox-72.0.1-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/mk.xpi -> firefox-72.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/mr.xpi -> firefox-72.0.1-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ms.xpi -> firefox-72.0.1-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/my.xpi -> firefox-72.0.1-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-72.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/nl.xpi -> firefox-72.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-72.0.1-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/oc.xpi -> firefox-72.0.1-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-72.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/pl.xpi -> firefox-72.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-72.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-72.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/rm.xpi -> firefox-72.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ro.xpi -> firefox-72.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ru.xpi -> firefox-72.0.1-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/si.xpi -> firefox-72.0.1-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/sk.xpi -> firefox-72.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/sl.xpi -> firefox-72.0.1-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/son.xpi -> firefox-72.0.1-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/sq.xpi -> firefox-72.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/sr.xpi -> firefox-72.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-72.0.1-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ta.xpi -> firefox-72.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/te.xpi -> firefox-72.0.1-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/th.xpi -> firefox-72.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/tr.xpi -> firefox-72.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/uk.xpi -> firefox-72.0.1-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/ur.xpi -> firefox-72.0.1-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/uz.xpi -> firefox-72.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/vi.xpi -> firefox-72.0.1-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/xh.xpi -> firefox-72.0.1-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-72.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/72.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-72.0.1-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/72.0.1/source/firefox-72.0.1.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-72.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-72.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-72.0-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-72.0-patches-02.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	421fbfb443b64f7f1e2e3dd5bb739541	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f255b319e189b6d791e430e3fa0f37f
diff --git a/metadata/md5-cache/www-client/firefox-72.0.2 b/metadata/md5-cache/www-client/firefox-72.0.2
deleted file mode 100644
index d79ef502e288..000000000000
--- a/metadata/md5-cache/www-client/firefox-72.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.48 >=dev-libs/nspr-4.24 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[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35: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 sys-apps/dbus dev-libs/dbus-glib 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-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.10.1 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/rust-1.36.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 || ( >=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 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Firefox Web Browser
-EAPI=6
-HOMEPAGE=https://www.mozilla.com/firefox
-IUSE=bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.48 >=dev-libs/nspr-4.24 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[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35: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 sys-apps/dbus dev-libs/dbus-glib 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-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( 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=pgo? ( lto )
-RESTRICT=!bindist? ( bindist ) !test? ( test )
-SLOT=0
-SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ach.xpi -> firefox-72.0.2-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/af.xpi -> firefox-72.0.2-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/an.xpi -> firefox-72.0.2-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ar.xpi -> firefox-72.0.2-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ast.xpi -> firefox-72.0.2-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/az.xpi -> firefox-72.0.2-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/be.xpi -> firefox-72.0.2-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/bg.xpi -> firefox-72.0.2-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/bn.xpi -> firefox-72.0.2-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/br.xpi -> firefox-72.0.2-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/bs.xpi -> firefox-72.0.2-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ca.xpi -> firefox-72.0.2-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/cak.xpi -> firefox-72.0.2-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/cs.xpi -> firefox-72.0.2-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/cy.xpi -> firefox-72.0.2-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/da.xpi -> firefox-72.0.2-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/de.xpi -> firefox-72.0.2-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/dsb.xpi -> firefox-72.0.2-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/el.xpi -> firefox-72.0.2-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/en-CA.xpi -> firefox-72.0.2-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/en-GB.xpi -> firefox-72.0.2-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/eo.xpi -> firefox-72.0.2-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/es-AR.xpi -> firefox-72.0.2-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/es-CL.xpi -> firefox-72.0.2-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/es-ES.xpi -> firefox-72.0.2-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/es-MX.xpi -> firefox-72.0.2-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/et.xpi -> firefox-72.0.2-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/eu.xpi -> firefox-72.0.2-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/fa.xpi -> firefox-72.0.2-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ff.xpi -> firefox-72.0.2-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/fi.xpi -> firefox-72.0.2-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/fr.xpi -> firefox-72.0.2-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/fy-NL.xpi -> firefox-72.0.2-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ga-IE.xpi -> firefox-72.0.2-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/gd.xpi -> firefox-72.0.2-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/gl.xpi -> firefox-72.0.2-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/gn.xpi -> firefox-72.0.2-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/gu-IN.xpi -> firefox-72.0.2-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/he.xpi -> firefox-72.0.2-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/hi-IN.xpi -> firefox-72.0.2-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/hr.xpi -> firefox-72.0.2-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/hsb.xpi -> firefox-72.0.2-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/hu.xpi -> firefox-72.0.2-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/hy-AM.xpi -> firefox-72.0.2-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ia.xpi -> firefox-72.0.2-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/id.xpi -> firefox-72.0.2-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/is.xpi -> firefox-72.0.2-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/it.xpi -> firefox-72.0.2-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ja.xpi -> firefox-72.0.2-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ka.xpi -> firefox-72.0.2-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/kab.xpi -> firefox-72.0.2-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/kk.xpi -> firefox-72.0.2-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/km.xpi -> firefox-72.0.2-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/kn.xpi -> firefox-72.0.2-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ko.xpi -> firefox-72.0.2-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/lij.xpi -> firefox-72.0.2-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/lt.xpi -> firefox-72.0.2-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/lv.xpi -> firefox-72.0.2-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/mk.xpi -> firefox-72.0.2-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/mr.xpi -> firefox-72.0.2-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ms.xpi -> firefox-72.0.2-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/my.xpi -> firefox-72.0.2-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/nb-NO.xpi -> firefox-72.0.2-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/nl.xpi -> firefox-72.0.2-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/nn-NO.xpi -> firefox-72.0.2-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/oc.xpi -> firefox-72.0.2-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/pa-IN.xpi -> firefox-72.0.2-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/pl.xpi -> firefox-72.0.2-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/pt-BR.xpi -> firefox-72.0.2-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/pt-PT.xpi -> firefox-72.0.2-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/rm.xpi -> firefox-72.0.2-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ro.xpi -> firefox-72.0.2-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ru.xpi -> firefox-72.0.2-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/si.xpi -> firefox-72.0.2-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/sk.xpi -> firefox-72.0.2-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/sl.xpi -> firefox-72.0.2-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/son.xpi -> firefox-72.0.2-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/sq.xpi -> firefox-72.0.2-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/sr.xpi -> firefox-72.0.2-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/sv-SE.xpi -> firefox-72.0.2-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ta.xpi -> firefox-72.0.2-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/te.xpi -> firefox-72.0.2-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/th.xpi -> firefox-72.0.2-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/tr.xpi -> firefox-72.0.2-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/uk.xpi -> firefox-72.0.2-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/ur.xpi -> firefox-72.0.2-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/uz.xpi -> firefox-72.0.2-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/vi.xpi -> firefox-72.0.2-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/xh.xpi -> firefox-72.0.2-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/zh-CN.xpi -> firefox-72.0.2-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/72.0.2/linux-i686/xpi/zh-TW.xpi -> firefox-72.0.2-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/72.0.2/source/firefox-72.0.2.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-72.0-patches-02.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-72.0-patches-02.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-72.0-patches-02.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-72.0-patches-02.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	421fbfb443b64f7f1e2e3dd5bb739541	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1f255b319e189b6d791e430e3fa0f37f
diff --git a/metadata/md5-cache/www-client/firefox-73.0 b/metadata/md5-cache/www-client/firefox-73.0
new file mode 100644
index 000000000000..ec387c08d746
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-73.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.49.2 >=dev-libs/nspr-4.24 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[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35: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 sys-apps/dbus dev-libs/dbus-glib 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-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.4:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) app-arch/zip app-arch/unzip >=dev-util/cbindgen-0.12.0 >=net-libs/nodejs-8.11.0 >=sys-devel/binutils-2.30 sys-apps/findutils || ( ( sys-devel/clang:9 !clang? ( sys-devel/llvm:9 ) clang? ( =sys-devel/lld-9* sys-devel/llvm:9[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ( sys-devel/clang:8 !clang? ( sys-devel/llvm:8 ) clang? ( =sys-devel/lld-8* sys-devel/llvm:8[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] ) ) ) ( sys-devel/clang:7 !clang? ( sys-devel/llvm:7 ) clang? ( =sys-devel/lld-7* sys-devel/llvm:7[gold] pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] ) ) ) ) pulseaudio? ( media-sound/pulseaudio ) >=virtual/rust-1.39.0 wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) virtual/pkgconfig dev-lang/python:2.7[ncurses,sqlite,ssl,threads(+)] || ( dev-lang/python:3.8[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.7[ncurses,sqlite,ssl,threads(+)] dev-lang/python:3.6[ncurses,sqlite,ssl,threads(+)] ) >=app-portage/elt-patches-20170815 || ( >=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 pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Firefox Web Browser
+EAPI=6
+HOMEPAGE=https://www.mozilla.com/firefox
+IUSE=bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver +gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo pulseaudio +screenshot selinux startup-notification +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx +system-webp test wayland wifi custom-cflags custom-optimization l10n_ach l10n_af l10n_an l10n_ar l10n_ast l10n_az l10n_be l10n_bg l10n_bn l10n_br l10n_bs l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB 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_ia 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_mk l10n_mr l10n_ms l10n_my l10n_nb l10n_nl l10n_nn l10n_oc 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_ur l10n_uz l10n_vi l10n_xh l10n_zh-CN l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.49.2 >=dev-libs/nspr-4.24 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[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35: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 sys-apps/dbus dev-libs/dbus-glib 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-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.4:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-64.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] ) system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] ) system-webp? ( >=media-libs/libwebp-1.0.2:0= ) wifi? ( kernel_linux? ( 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=pgo? ( lto )
+RESTRICT=!bindist? ( bindist ) !test? ( test )
+SLOT=0
+SRC_URI=l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ach.xpi -> firefox-73.0-ach.xpi ) l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/af.xpi -> firefox-73.0-af.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/an.xpi -> firefox-73.0-an.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ar.xpi -> firefox-73.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ast.xpi -> firefox-73.0-ast.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/az.xpi -> firefox-73.0-az.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/be.xpi -> firefox-73.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/bg.xpi -> firefox-73.0-bg.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/bn.xpi -> firefox-73.0-bn.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/br.xpi -> firefox-73.0-br.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/bs.xpi -> firefox-73.0-bs.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ca.xpi -> firefox-73.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/cak.xpi -> firefox-73.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/cs.xpi -> firefox-73.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/cy.xpi -> firefox-73.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/da.xpi -> firefox-73.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/de.xpi -> firefox-73.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/dsb.xpi -> firefox-73.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/el.xpi -> firefox-73.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/en-CA.xpi -> firefox-73.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/en-GB.xpi -> firefox-73.0-en-GB.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/eo.xpi -> firefox-73.0-eo.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/es-AR.xpi -> firefox-73.0-es-AR.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/es-CL.xpi -> firefox-73.0-es-CL.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/es-ES.xpi -> firefox-73.0-es-ES.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/es-MX.xpi -> firefox-73.0-es-MX.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/et.xpi -> firefox-73.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/eu.xpi -> firefox-73.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/fa.xpi -> firefox-73.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ff.xpi -> firefox-73.0-ff.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/fi.xpi -> firefox-73.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/fr.xpi -> firefox-73.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/fy-NL.xpi -> firefox-73.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ga-IE.xpi -> firefox-73.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/gd.xpi -> firefox-73.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/gl.xpi -> firefox-73.0-gl.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/gn.xpi -> firefox-73.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/gu-IN.xpi -> firefox-73.0-gu-IN.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/he.xpi -> firefox-73.0-he.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/hi-IN.xpi -> firefox-73.0-hi-IN.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/hr.xpi -> firefox-73.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/hsb.xpi -> firefox-73.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/hu.xpi -> firefox-73.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/hy-AM.xpi -> firefox-73.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ia.xpi -> firefox-73.0-ia.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/id.xpi -> firefox-73.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/is.xpi -> firefox-73.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/it.xpi -> firefox-73.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ja.xpi -> firefox-73.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ka.xpi -> firefox-73.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/kab.xpi -> firefox-73.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/kk.xpi -> firefox-73.0-kk.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/km.xpi -> firefox-73.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/kn.xpi -> firefox-73.0-kn.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ko.xpi -> firefox-73.0-ko.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/lij.xpi -> firefox-73.0-lij.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/lt.xpi -> firefox-73.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/lv.xpi -> firefox-73.0-lv.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/mk.xpi -> firefox-73.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/mr.xpi -> firefox-73.0-mr.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ms.xpi -> firefox-73.0-ms.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/my.xpi -> firefox-73.0-my.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/nb-NO.xpi -> firefox-73.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/nl.xpi -> firefox-73.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/nn-NO.xpi -> firefox-73.0-nn-NO.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/oc.xpi -> firefox-73.0-oc.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/pa-IN.xpi -> firefox-73.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/pl.xpi -> firefox-73.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/pt-BR.xpi -> firefox-73.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/pt-PT.xpi -> firefox-73.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/rm.xpi -> firefox-73.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ro.xpi -> firefox-73.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ru.xpi -> firefox-73.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/si.xpi -> firefox-73.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/sk.xpi -> firefox-73.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/sl.xpi -> firefox-73.0-sl.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/son.xpi -> firefox-73.0-son.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/sq.xpi -> firefox-73.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/sr.xpi -> firefox-73.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/sv-SE.xpi -> firefox-73.0-sv-SE.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ta.xpi -> firefox-73.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/te.xpi -> firefox-73.0-te.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/th.xpi -> firefox-73.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/tr.xpi -> firefox-73.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/uk.xpi -> firefox-73.0-uk.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/ur.xpi -> firefox-73.0-ur.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/uz.xpi -> firefox-73.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/vi.xpi -> firefox-73.0-vi.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/xh.xpi -> firefox-73.0-xh.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/zh-CN.xpi -> firefox-73.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/73.0/linux-i686/xpi/zh-TW.xpi -> firefox-73.0-zh-TW.xpi ) https://archive.mozilla.org/pub/firefox/releases/73.0/source/firefox-73.0.source.tar.xz https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-73.0-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-73.0-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-73.0-patches-04.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-73.0-patches-04.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	c74f1124c627537c3be86281b81e10dc	ltprune	2729691420b6deeda2a90b1f1183fb55	mozcoreconf-v6	421fbfb443b64f7f1e2e3dd5bb739541	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ec4c27a782188a6f0feac66aa389e0bb
diff --git a/metadata/md5-cache/www-client/opera-66.0.3515.44 b/metadata/md5-cache/www-client/opera-66.0.3515.44
deleted file mode 100644
index 5b116dce90ba..000000000000
--- a/metadata/md5-cache/www-client/opera-66.0.3515.44
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-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_en-US +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/66.0.3515.44/linux/opera-stable_66.0.3515.44_amd64.deb https://download2.operacdn.com/pub/opera/desktop/66.0.3515.44/linux/opera-stable_66.0.3515.44_amd64.deb https://download3.operacdn.com/pub/opera/desktop/66.0.3515.44/linux/opera-stable_66.0.3515.44_amd64.deb https://download4.operacdn.com/pub/opera/desktop/66.0.3515.44/linux/opera-stable_66.0.3515.44_amd64.deb
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2a52b350308a5a07770f6f59ee5b674
diff --git a/metadata/md5-cache/www-client/opera-66.0.3515.72 b/metadata/md5-cache/www-client/opera-66.0.3515.72
index c6aecbc8d8d1..ed1bf21eb85c 100644
--- a/metadata/md5-cache/www-client/opera-66.0.3515.72
+++ b/metadata/md5-cache/www-client/opera-66.0.3515.72
@@ -3,10 +3,10 @@ DESCRIPTION=A fast and secure web browser
 EAPI=7
 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_en-US +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
+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/66.0.3515.72/linux/opera-stable_66.0.3515.72_amd64.deb https://download2.operacdn.com/pub/opera/desktop/66.0.3515.72/linux/opera-stable_66.0.3515.72_amd64.deb https://download3.operacdn.com/pub/opera/desktop/66.0.3515.72/linux/opera-stable_66.0.3515.72_amd64.deb https://download4.operacdn.com/pub/opera/desktop/66.0.3515.72/linux/opera-stable_66.0.3515.72_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ff8ec1a271aeb694a68971441b78148
+_md5_=b2a52b350308a5a07770f6f59ee5b674
diff --git a/metadata/md5-cache/www-client/opera-beta-67.0.3575.13 b/metadata/md5-cache/www-client/opera-beta-67.0.3575.13
new file mode 100644
index 000000000000..57274b8f9f8c
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-67.0.3575.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/67.0.3575.13/linux/opera-beta_67.0.3575.13_amd64.deb https://download2.operacdn.com/pub/opera-beta/67.0.3575.13/linux/opera-beta_67.0.3575.13_amd64.deb https://download3.operacdn.com/pub/opera-beta/67.0.3575.13/linux/opera-beta_67.0.3575.13_amd64.deb https://download4.operacdn.com/pub/opera-beta/67.0.3575.13/linux/opera-beta_67.0.3575.13_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/opera-beta-67.0.3575.2 b/metadata/md5-cache/www-client/opera-beta-67.0.3575.2
deleted file mode 100644
index 4893d27e6368..000000000000
--- a/metadata/md5-cache/www-client/opera-beta-67.0.3575.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DESCRIPTION=A fast and secure web browser
-EAPI=7
-HOMEPAGE=https://www.opera.com/
-IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64
-LICENSE=OPERA-2014
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
-SLOT=0
-SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/67.0.3575.2/linux/opera-beta_67.0.3575.2_amd64.deb https://download2.operacdn.com/pub/opera-beta/67.0.3575.2/linux/opera-beta_67.0.3575.2_amd64.deb https://download3.operacdn.com/pub/opera-beta/67.0.3575.2/linux/opera-beta_67.0.3575.2_amd64.deb https://download4.operacdn.com/pub/opera-beta/67.0.3575.2/linux/opera-beta_67.0.3575.2_amd64.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-client/pybugz-0.13 b/metadata/md5-cache/www-client/pybugz-0.13
index 68d5bd302ca0..aa014f20d833 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_6(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3d1a18854df698030e6eeff67c99941
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index 17a293aa6fd3..74b8b5bc4bcb 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6[readline(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cf360bf7def13b085f8ba597e1fc3f2
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.8.1 b/metadata/md5-cache/www-client/qutebrowser-1.8.1
index 7410ed2c306f..1974a8e2c420 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.8.1
+++ b/metadata/md5-cache/www-client/qutebrowser-1.8.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.8.1/qutebrowser-1.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f732f990f357eb541474eac102fa6c36
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.8.3 b/metadata/md5-cache/www-client/qutebrowser-1.8.3
index 1f4ffa906f26..af9c708fb7ca 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.8.3
+++ b/metadata/md5-cache/www-client/qutebrowser-1.8.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.8.3/qutebrowser-1.8.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2970ff08019ce9b2f0dcfd5f631147f5
diff --git a/metadata/md5-cache/www-client/qutebrowser-9999 b/metadata/md5-cache/www-client/qutebrowser-9999
index d035784a64d9..f9d039d8ef8c 100644
--- a/metadata/md5-cache/www-client/qutebrowser-9999
+++ b/metadata/md5-cache/www-client/qutebrowser-9999
@@ -11,5 +11,5 @@ RDEPEND=dev-python/attrs[python_targets_python3_6(-)?,python_targets_python3_7(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f35a31bdd6e926ef176f5a2295a98ae
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 44e3b2649f21..d26eeb7144f3 100644
--- a/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
+++ b/metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] test? ( >=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/jsonschema[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] 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_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-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( >=dev-python/socketio-client-0.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jsonschema[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(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=A Python wrapper around the RIPE Atlas API
 EAPI=6
 HOMEPAGE=https://atlas.ripe.net/
-IUSE=test python_targets_python2_7 python_targets_python3_6
+IUSE=test python_targets_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
+RDEPEND=>=dev-python/socketio-client-0.6.5[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-dateutil[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 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/ripe.atlas.cousteau/ripe.atlas.cousteau-1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c024ba3b15f11e2a2477847ac525af1
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2013cdd51e634b6886bec02d5e47618c
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.5-r1 b/metadata/md5-cache/www-client/seamonkey-2.49.5-r1
index d8812e5c8145..673531431589 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.49.5-r1
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.5-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source.tar.xz -> seamonkey-2.49.5.source.tar.xz https://archive.mozilla.org/pub/seamonkey/releases/2.49.5/source/seamonkey-2.49.5.source-l10n.tar.xz -> seamonkey-2.49.5.source-l10n.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.49.5-patches-01.tar.xz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	a561f803c85ceb062f6f8048de0b0455	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d3d35bba69468aa8eac9af1f3e482ccd
+_md5_=ddc6febaadc5abcb7b9d4a24b820d155
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 215659bab267..6161b60b6967 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
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 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	ea7865c8fba1ea8d3639f355fffe1a3c	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mozconfig-v6.52	a561f803c85ceb062f6f8048de0b0455	mozcoreconf-v5	602c3c0a642bafeabb149c49a6df941f	mozextension	f47f008a138943f9e40e37c1fca10b24	mozlinguas-v2	7559b4e56a88d67da4e96e77296f723c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e90bdd81a0f4c72605f3080b4c74a34
+_md5_=deda558ccac837308dd094acd93b9f81
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.11.1805.3_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.11.1805.3_p1
deleted file mode 100644
index d348e6172b71..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-2.11.1805.3_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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+: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/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.11.1805.3-1_amd64.deb -> vivaldi-snapshot-2.11.1805.3_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.11.1805.3-1_arm64.deb -> vivaldi-snapshot-2.11.1805.3_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.11.1805.3-1_armhf.deb -> vivaldi-snapshot-2.11.1805.3_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.11.1805.3-1_i386.deb -> vivaldi-snapshot-2.11.1805.3_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cee4aa5a96353bc091d3850086ad253e
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-2.11.1811.23_p1 b/metadata/md5-cache/www-client/vivaldi-snapshot-2.11.1811.23_p1
new file mode 100644
index 000000000000..c95a442b18d5
--- /dev/null
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-2.11.1811.23_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=virtual/libiconv
+DESCRIPTION=A browser for our friends
+EAPI=7
+HOMEPAGE=https://vivaldi.com/
+IUSE=kernel_linux +l10n_af +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +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+: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/pango[X]
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.11.1811.23-1_amd64.deb -> vivaldi-snapshot-2.11.1811.23_p1-amd64.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.11.1811.23-1_arm64.deb -> vivaldi-snapshot-2.11.1811.23_p1-arm64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.11.1811.23-1_armhf.deb -> vivaldi-snapshot-2.11.1811.23_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_2.11.1811.23-1_i386.deb -> vivaldi-snapshot-2.11.1811.23_p1-i386.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cee4aa5a96353bc091d3850086ad253e
diff --git a/metadata/md5-cache/www-client/weboob-1.3 b/metadata/md5-cache/www-client/weboob-1.3
index 6f968cfc5ea0..862490a9f02d 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2e2bec9f9bfc117a3440b892a50aa42
diff --git a/metadata/md5-cache/www-client/weboob-9998 b/metadata/md5-cache/www-client/weboob-9998
index 51b775d95f45..9228da0810cf 100644
--- a/metadata/md5-cache/www-client/weboob-9998
+++ b/metadata/md5-cache/www-client/weboob-9998
@@ -9,5 +9,5 @@ PROPERTIES=live
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2e2bec9f9bfc117a3440b892a50aa42
diff --git a/metadata/md5-cache/www-client/weboob-9999 b/metadata/md5-cache/www-client/weboob-9999
index 51b775d95f45..9228da0810cf 100644
--- a/metadata/md5-cache/www-client/weboob-9999
+++ b/metadata/md5-cache/www-client/weboob-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a2e2bec9f9bfc117a3440b892a50aa42
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 26794918467a..9012abca813d 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 6937886636af..a4096e4b4e2a 100644
--- a/metadata/md5-cache/www-misc/buku-3.5
+++ b/metadata/md5-cache/www-misc/buku-3.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.5.tar.gz -> buku-3.5.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d93f5909bafed69e45f30fa4f5394dd
diff --git a/metadata/md5-cache/www-misc/buku-3.6 b/metadata/md5-cache/www-misc/buku-3.6
index 9b0e260df650..d9d033f986a3 100644
--- a/metadata/md5-cache/www-misc/buku-3.6
+++ b/metadata/md5-cache/www-misc/buku-3.6
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.6.tar.gz -> buku-3.6.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d93f5909bafed69e45f30fa4f5394dd
diff --git a/metadata/md5-cache/www-misc/buku-3.7 b/metadata/md5-cache/www-misc/buku-3.7
index 5a7caf20d0be..af4c2ae19a86 100644
--- a/metadata/md5-cache/www-misc/buku-3.7
+++ b/metadata/md5-cache/www-misc/buku-3.7
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buku/buku-3.7.tar.gz -> buku-3.7.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73cbb9addafec6bcfccb080b9ac6946c
diff --git a/metadata/md5-cache/www-misc/monitorix-3.11.0 b/metadata/md5-cache/www-misc/monitorix-3.11.0
index a92f6bfdf10d..5a5556100ae6 100644
--- a/metadata/md5-cache/www-misc/monitorix-3.11.0
+++ b/metadata/md5-cache/www-misc/monitorix-3.11.0
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-perl/Config-General dev-perl/DBI dev-perl/HTTP-Server-Simple dev-perl/IO-Socket-SSL dev-perl/libwww-perl dev-perl/MIME-Lite dev-perl/XML-Simple net-analyzer/rrdtool[graph,perl] dev-perl/CGI
 SLOT=0
 SRC_URI=https://www.monitorix.org/monitorix-3.11.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=afd94f93061273e743cbe90a99151ecb
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=0a1a1043edf22330458b9def26e21719
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 1d211d1fb95e..c66936ac94dc 100644
--- a/metadata/md5-cache/www-misc/nx_util-0.52.1
+++ b/metadata/md5-cache/www-misc/nx_util-0.52.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_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? ( dev-python/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)
 EAPI=5
 HOMEPAGE=https://github.com/nbs-system/naxsi
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-2+ Apache-2.0 CC-BY-NC-SA-3.0
 RDEPEND=www-servers/nginx[nginx_modules_http_naxsi] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 51f5ffb36645..868564b025b0 100644
--- a/metadata/md5-cache/www-misc/nx_util-0.53.1
+++ b/metadata/md5-cache/www-misc/nx_util-0.53.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
+DEPEND=python_single_target_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? ( dev-python/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=Whitelist & Reports generation for Naxsi (Web App Firewall module for Nginx)
 EAPI=5
 HOMEPAGE=https://github.com/nbs-system/naxsi
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64
 LICENSE=GPL-2+ Apache-2.0 CC-BY-NC-SA-3.0
 RDEPEND=www-servers/nginx[nginx_modules_http_naxsi] python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=304208a44f212eb3dfbb08cf901bf994
diff --git a/metadata/md5-cache/www-misc/shellinabox-2.20-r1 b/metadata/md5-cache/www-misc/shellinabox-2.20-r1
index eba6d05342ef..45edae041e10 100644
--- a/metadata/md5-cache/www-misc/shellinabox-2.20-r1
+++ b/metadata/md5-cache/www-misc/shellinabox-2.20-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/shellinabox/shellinabox/archive/v2.20.zip -> shellinabox-2.20.zip
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=f50686595468b736eac8ea9e28263c72
diff --git a/metadata/md5-cache/www-misc/shellinabox-2.20-r2 b/metadata/md5-cache/www-misc/shellinabox-2.20-r2
index bf9c69b792bd..86d53c93f004 100644
--- a/metadata/md5-cache/www-misc/shellinabox-2.20-r2
+++ b/metadata/md5-cache/www-misc/shellinabox-2.20-r2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/shellinabox/shellinabox/archive/v2.20.zip -> shellinabox-2.20.zip
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=369d615b07d054f0b421e8f4c167b6eb
diff --git a/metadata/md5-cache/www-misc/shellinabox-2.20-r3 b/metadata/md5-cache/www-misc/shellinabox-2.20-r3
index ec5f4de27512..8ada451bf789 100644
--- a/metadata/md5-cache/www-misc/shellinabox-2.20-r3
+++ b/metadata/md5-cache/www-misc/shellinabox-2.20-r3
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/shellinabox/shellinabox/archive/v2.20.tar.gz -> shellinabox-2.20.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=0662b32ef69cfb23c7102bda070e6b49
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 ac2af4ee8fb6..7f71024c00eb 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=95530f230bc651bb5a627b040b424bfe
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.13 b/metadata/md5-cache/www-misc/urlwatch-2.13
index 6910d0689fc8..db3b329409b5 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.13
+++ b/metadata/md5-cache/www-misc/urlwatch-2.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.13.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc226884bca43027822ce06d9825387c
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.16 b/metadata/md5-cache/www-misc/urlwatch-2.16
index f359992437f0..06752fdadc34 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.16
+++ b/metadata/md5-cache/www-misc/urlwatch-2.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.16.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f810f626b5cd4d69eff1a4c3d283774f
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.17 b/metadata/md5-cache/www-misc/urlwatch-2.17
index bec25a84a01f..b86389482231 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.17
+++ b/metadata/md5-cache/www-misc/urlwatch-2.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.17.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=21e6781babf35d674eb39955dada6d45
diff --git a/metadata/md5-cache/www-misc/vdradmin-am-3.6.10 b/metadata/md5-cache/www-misc/vdradmin-am-3.6.10
index 806857af71bd..ffee14ce1ed3 100644
--- a/metadata/md5-cache/www-misc/vdradmin-am-3.6.10
+++ b/metadata/md5-cache/www-misc/vdradmin-am-3.6.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/CGI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.10.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=7f9be0a94c478c8fa7f87e2d5e5515ac
diff --git a/metadata/md5-cache/www-misc/vdradmin-am-3.6.9 b/metadata/md5-cache/www-misc/vdradmin-am-3.6.9
index b692277870d8..1f81eddb0425 100644
--- a/metadata/md5-cache/www-misc/vdradmin-am-3.6.9
+++ b/metadata/md5-cache/www-misc/vdradmin-am-3.6.9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) vdr? ( media-video/vdr ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=af4cd0074689ed1ca60d67e39ec055eb
diff --git a/metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3 b/metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3
index a427780ffbe9..09452c34dd95 100644
--- a/metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3
+++ b/metadata/md5-cache/www-misc/vdradmin-am-3.6.9-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-lang/perl dev-perl/Template-Toolkit dev-perl/libwww-perl dev-perl/URI dev-perl/Locale-gettext virtual/perl-IO-Compress ipv6? ( dev-perl/IO-Socket-INET6 ) ssl? ( dev-perl/IO-Socket-SSL ) virtual/perl-libnet dev-perl/Authen-SASL dev-perl/Digest-HMAC
 SLOT=0
 SRC_URI=http://andreas.vdr-developer.org/vdradmin-am/download/vdradmin-am-3.6.9.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=45cd65bceccc68e1a6ab3434776631d5
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index f5d5a9e512f6..97fb7c658778 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/passff-host-1.2.1 b/metadata/md5-cache/www-plugins/passff-host-1.2.1
index e3c05e3d87e9..f7decf8edcdb 100644
--- a/metadata/md5-cache/www-plugins/passff-host-1.2.1
+++ b/metadata/md5-cache/www-plugins/passff-host-1.2.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare setup unpack
 DESCRIPTION=Host app for the PassFF WebExtension
 EAPI=7
 HOMEPAGE=https://github.com/passff/passff-host
-IUSE=chrome chromium firefox vivaldi python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=chrome chromium firefox vivaldi python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-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 ) || ( chrome chromium firefox vivaldi )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) || ( chrome chromium firefox vivaldi )
 SLOT=0
 SRC_URI=https://github.com/passff/passff-host/releases/download/1.2.1/passff.py -> passff-host-1.2.1.py https://github.com/passff/passff-host/releases/download/1.2.1/passff.json -> passff-host-1.2.1.json
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8e6db73475d5f34ec684538be34fc923
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 0fee0cb0c559..2a7ee6b01e7e 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/apache-2.4.41 b/metadata/md5-cache/www-servers/apache-2.4.41
index 9cc9562ca305..fdfb167fee1c 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.41
+++ b/metadata/md5-cache/www-servers/apache-2.4.41
@@ -11,5 +11,5 @@ RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_ht
 REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_substitute? ( apache2_modules_filter )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.41.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.39-20190402.tar.bz2
-_eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=apache-2	20ad1434bfafa6a0c06f7898cf4059ef	autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1aa213799294983c8950f3eba99e56e1
diff --git a/metadata/md5-cache/www-servers/automx2-2019.0 b/metadata/md5-cache/www-servers/automx2-2019.0
index f0e68516a112..c030c9e9e544 100644
--- a/metadata/md5-cache/www-servers/automx2-2019.0
+++ b/metadata/md5-cache/www-servers/automx2-2019.0
@@ -10,5 +10,5 @@ RDEPEND=acct-user/automx2 python_targets_python3_7? ( dev-lang/python:3.7 ) >=de
 REQUIRED_USE=|| ( python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://gitlab.com/automx/automx2/-/archive/2019.0/automx2-2019.0.tar.bz2
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=85217a21818cb95789299480cc921591
diff --git a/metadata/md5-cache/www-servers/cherokee-1.2.104-r1 b/metadata/md5-cache/www-servers/cherokee-1.2.104-r1
index 771e0c3a4130..893d5b25b72d 100644
--- a/metadata/md5-cache/www-servers/cherokee-1.2.104-r1
+++ b/metadata/md5-cache/www-servers/cherokee-1.2.104-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cherokee/webserver/archive/v1.2.104.zip -> cherokee-1.2.104.zip
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1b7da864074407d08c7fce2b49035671
diff --git a/metadata/md5-cache/www-servers/fnord-1.11-r1 b/metadata/md5-cache/www-servers/fnord-1.11-r1
index 01f75a7473f5..f946c1115984 100644
--- a/metadata/md5-cache/www-servers/fnord-1.11-r1
+++ b/metadata/md5-cache/www-servers/fnord-1.11-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/daemontools sys-apps/ucspi-tcp
 SLOT=0
 SRC_URI=http://www.fefe.de/fnord/fnord-1.11.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=234fc7596d378b6dc5f1b3808e1a61f0
diff --git a/metadata/md5-cache/www-servers/gatling-0.15 b/metadata/md5-cache/www-servers/gatling-0.15
index 1d738b3a92b3..1a7bebd9ab6f 100644
--- a/metadata/md5-cache/www-servers/gatling-0.15
+++ b/metadata/md5-cache/www-servers/gatling-0.15
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libowfat-0.25[diet=] diet? ( dev-libs/dietlibc ) ssl? ( !libr
 REQUIRED_USE=ssl? ( !diet )
 SLOT=0
 SRC_URI=https://www.fefe.de/gatling/gatling-0.15.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=4fcd0011bad0a9df686088ddc82d0385
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.8.1 b/metadata/md5-cache/www-servers/gunicorn-19.8.1
index d45efd3c6632..4c481e40ca52 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.8.1
+++ b/metadata/md5-cache/www-servers/gunicorn-19.8.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3b5cdf916bb109f6f96bad689362a83
diff --git a/metadata/md5-cache/www-servers/gunicorn-19.9.0 b/metadata/md5-cache/www-servers/gunicorn-19.9.0
index 38d7547098b1..cdc12b87176f 100644
--- a/metadata/md5-cache/www-servers/gunicorn-19.9.0
+++ b/metadata/md5-cache/www-servers/gunicorn-19.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/gunicorn/gunicorn-19.9.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6d8b2485459a39bb2774ea7f1df31022
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.5 b/metadata/md5-cache/www-servers/h2o-2.2.5
index 24ae28f77dab..da3805daa44b 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 libh2o? ( dev-libs/libuv ) !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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df2dcc150d6004a50d2955742d7772c5
diff --git a/metadata/md5-cache/www-servers/h2o-2.2.6 b/metadata/md5-cache/www-servers/h2o-2.2.6
index 24f0b7f72600..fff578b85702 100644
--- a/metadata/md5-cache/www-servers/h2o-2.2.6
+++ b/metadata/md5-cache/www-servers/h2o-2.2.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
 SRC_URI=https://github.com/h2o/h2o/archive/v2.2.6.tar.gz -> h2o-2.2.6.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=78e3e9e56f78e52a44aa21d207c356f6
diff --git a/metadata/md5-cache/www-servers/h2o-9999 b/metadata/md5-cache/www-servers/h2o-9999
index af03eb2fb7fd..fc5e46594538 100644
--- a/metadata/md5-cache/www-servers/h2o-9999
+++ b/metadata/md5-cache/www-servers/h2o-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-lang/perl sys-libs/zlib libh2o? ( dev-libs/libuv ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 SLOT=0
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-single	e6530f43a549f120f9396ccb852288f5	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9809b60875298e0032b9c699d2f48fec
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.53 b/metadata/md5-cache/www-servers/lighttpd-1.4.53
index e30183b7c1f4..ddaa25328fc9 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.53
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.53
@@ -1,16 +1,16 @@
 BDEPEND=dev-libs/libgamin virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
+DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
 DESCRIPTION=Lightweight high-performance web server
 EAPI=7
 HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
 IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
 LICENSE=BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
+RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.53.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=17925bcf90e49d63c06b0edf67203602
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2cd2eaf4e1b3389d458d8c1a661c572e
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.54 b/metadata/md5-cache/www-servers/lighttpd-1.4.54
index 3e00b73c34ed..55ada4116950 100644
--- a/metadata/md5-cache/www-servers/lighttpd-1.4.54
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.54
@@ -1,16 +1,16 @@
 BDEPEND=dev-libs/libgamin virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
+DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
 DESCRIPTION=Lightweight high-performance web server
 EAPI=7
 HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
 IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=BSD GPL-2
-RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
+RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd selinux? ( sec-policy/selinux-apache )
 REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.54.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
-_md5_=ad52375cea8d383798650d5c629f90b6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d82934e3c53b7f324e68e9a0805008ce
diff --git a/metadata/md5-cache/www-servers/lighttpd-1.4.55 b/metadata/md5-cache/www-servers/lighttpd-1.4.55
new file mode 100644
index 000000000000..ebd922a60746
--- /dev/null
+++ b/metadata/md5-cache/www-servers/lighttpd-1.4.55
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libgamin virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi )
+DESCRIPTION=Lightweight high-performance web server
+EAPI=7
+HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
+IUSE=bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=bzip2? ( app-arch/bzip2 ) dbi? ( dev-db/libdbi ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) geoip? ( dev-libs/geoip ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( dev-db/mysql-connector-c:= ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) sqlite? ( dev-db/sqlite:3 ) webdav? ( dev-libs/libxml2 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) acct-group/lighttpd acct-user/lighttpd selinux? ( sec-policy/selinux-apache )
+REQUIRED_USE=kerberos? ( ssl !libressl ) webdav? ( sqlite )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.55.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=d82934e3c53b7f324e68e9a0805008ce
diff --git a/metadata/md5-cache/www-servers/lighttpd-9999 b/metadata/md5-cache/www-servers/lighttpd-9999
deleted file mode 100644
index ddd98405590e..000000000000
--- a/metadata/md5-cache/www-servers/lighttpd-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) virtual/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Lightweight high-performance web server
-EAPI=6
-HOMEPAGE=https://www.lighttpd.net https://github.com/lighttpd
-IUSE=bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib
-LICENSE=BSD GPL-2
-PROPERTIES=live
-RDEPEND=bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1:= ) memcached? ( dev-libs/libmemcached ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php:*[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:= ) ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) selinux? ( sec-policy/selinux-apache )
-REQUIRED_USE=kerberos? ( ssl !libressl )
-RESTRICT=!test? ( test )
-SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=07d31880c76e45733ce8c528093e2c67
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1 b/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
index 7d6de71fb4aa..699b81d89a60 100644
--- a/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
+++ b/metadata/md5-cache/www-servers/monkeyd-1.6.9-r1
@@ -10,5 +10,5 @@ RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
 REQUIRED_USE=monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )
 SLOT=0
 SRC_URI=http://monkey-project.com/releases/1.6/monkey-1.6.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=a43ac92e840a32fc2742896633278f74
diff --git a/metadata/md5-cache/www-servers/monkeyd-9999 b/metadata/md5-cache/www-servers/monkeyd-9999
index 2f6b8cc0554d..1d8ec381e401 100644
--- a/metadata/md5-cache/www-servers/monkeyd-9999
+++ b/metadata/md5-cache/www-servers/monkeyd-9999
@@ -9,5 +9,5 @@ PROPERTIES=live
 RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
 REQUIRED_USE=monkeyd_plugins_tls? ( !static-plugins ) elibc_uclibc? ( !debug ) cgi? ( php )
 SLOT=0
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1a4096990ed20e0e991c7e0f2911576c
diff --git a/metadata/md5-cache/www-servers/nginx-1.16.1-r1 b/metadata/md5-cache/www-servers/nginx-1.16.1-r1
index 3fcd56d06653..b388c9c183c0 100644
--- a/metadata/md5-cache/www-servers/nginx-1.16.1-r1
+++ b/metadata/md5-cache/www-servers/nginx-1.16.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules
 RESTRICT=test
 SLOT=0
 SRC_URI=https://nginx.org/download/nginx-1.16.1.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.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/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.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/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.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/3.2.tar.gz -> ngx_http_geoip2_module-3.2.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.3.5.tar.gz -> njs-0.3.5.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.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.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.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/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.5.tar.gz -> njs-0.3.5.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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cb5be79703d4900247d5265663823425
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=ae8a6a1686042dd13c765872d6c2f68e
diff --git a/metadata/md5-cache/www-servers/nginx-1.17.7 b/metadata/md5-cache/www-servers/nginx-1.17.7
index 792134842977..818ca86dc9f6 100644
--- a/metadata/md5-cache/www-servers/nginx-1.17.7
+++ b/metadata/md5-cache/www-servers/nginx-1.17.7
@@ -12,5 +12,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules
 RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.17.7.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.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/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.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/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.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/3.2.tar.gz -> ngx_http_geoip2_module-3.2.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.3.7.tar.gz -> njs-0.3.7.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.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.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.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/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.7.tar.gz -> njs-0.3.7.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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=fc81578bc020b3f693de81c397b8f0ee
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=bf819edcdefdc10c03cebdef0ce52044
diff --git a/metadata/md5-cache/www-servers/nginx-1.17.8 b/metadata/md5-cache/www-servers/nginx-1.17.8
index 5db459b5cd09..c88a9f3aedff 100644
--- a/metadata/md5-cache/www-servers/nginx-1.17.8
+++ b/metadata/md5-cache/www-servers/nginx-1.17.8
@@ -12,5 +12,5 @@ REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules
 RESTRICT=test
 SLOT=mainline
 SRC_URI=https://nginx.org/download/nginx-1.17.8.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.1.tar.gz -> ngx_devel_kit-0.3.1.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/8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz -> ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.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/v3.0.0.tar.gz -> ngx_http_dav_ext-3.0.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/3.2.tar.gz -> ngx_http_geoip2_module-3.2.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.3.8.tar.gz -> njs-0.3.8.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -> ngx_http_lua-0.10.15.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.3/modsecurity-2.9.3.tar.gz -> modsecurity-2.9.3.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/3.2.tar.gz -> ngx_http_geoip2_module-3.2.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.3.8.tar.gz -> njs-0.3.8.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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=a690de14c4fbbebc335e17d6e1ea42ef
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	876f0e74ef1cc2e7c4edd9bca336d350	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=a64e5c3c39c0299a3117409516705271
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.12.0-r3 b/metadata/md5-cache/www-servers/nginx-unit-1.12.0-r3
index 4365de6d48d6..522879cbd16d 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.12.0-r3
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.12.0-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install setup
-DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Dynamic web and application server
 EAPI=7
 HOMEPAGE=https://unit.nginx.org
-IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 ssl 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
+IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 ssl python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
-REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ssl ) 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 ) )
+RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ssl ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.12.0.tar.gz -> nginx-unit-1.12.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7d70f8c474685dd749557f7ca820f879
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=2eec5140cccd3fb130dffbfdc8d8eae7
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.13.0 b/metadata/md5-cache/www-servers/nginx-unit-1.13.0
index e88cf7f74c4c..84aede0da88d 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.13.0
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.13.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Dynamic web and application server
 EAPI=7
 HOMEPAGE=https://unit.nginx.org
-IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 ssl 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
+IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 ssl python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
-REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ssl ) 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 ) )
+RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ssl ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.13.0.tar.gz -> nginx-unit-1.13.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c29ae36d8d7a4da356fac83ad26cca72
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=cec1b194e5225ae1650b4857ebc8f676
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.14.0 b/metadata/md5-cache/www-servers/nginx-unit-1.14.0
index a07d98149af7..a1458f8a48fc 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.14.0
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.14.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare setup
-DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
 DESCRIPTION=Dynamic web and application server
 EAPI=7
 HOMEPAGE=https://unit.nginx.org
-IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 ssl python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 ssl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
-REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) 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 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
+RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ssl ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.14.0.tar.gz -> nginx-unit-1.14.0.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b46d203aac7216c7b4403c2a80d87574
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4509c9777f71402e71b83fd52b3dbd56
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.15.0 b/metadata/md5-cache/www-servers/nginx-unit-1.15.0
new file mode 100644
index 000000000000..946d204da10d
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.15.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=perl? ( dev-lang/perl:= ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) php7-4? ( dev-lang/php:7.4[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+DESCRIPTION=Dynamic web and application server
+EAPI=7
+HOMEPAGE=https://unit.nginx.org
+IUSE=perl python ruby php7-2 php7-3 php7-4 ssl python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=perl? ( dev-lang/perl:= ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) php7-4? ( dev-lang/php:7.4[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) ruby? ( dev-lang/ruby:* ) ssl? ( dev-libs/openssl:0 )
+REQUIRED_USE=|| ( perl python ruby php7-2 php7-3 php7-4 ssl ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=0
+SRC_URI=https://unit.nginx.org/download/unit-1.15.0.tar.gz -> nginx-unit-1.15.0.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=88071418a5f2fdd5593face07da54e5f
diff --git a/metadata/md5-cache/www-servers/nginx-unit-1.8.0 b/metadata/md5-cache/www-servers/nginx-unit-1.8.0
index 70143741181b..608bbf8fd98c 100644
--- a/metadata/md5-cache/www-servers/nginx-unit-1.8.0
+++ b/metadata/md5-cache/www-servers/nginx-unit-1.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install setup
-DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:= )
+DEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:= )
 DESCRIPTION=A dynamic web and application server
 EAPI=7
 HOMEPAGE=https://unit.nginx.org
-IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 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
+IUSE=perl python ruby php5-6 php7-1 php7-2 php7-3 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=amd64
 LICENSE=Apache-2.0
-RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:= )
-REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ) 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 ) )
+RDEPEND=perl? ( dev-lang/perl:= ) php5-6? ( dev-lang/php:5.6[embed] ) php7-1? ( dev-lang/php:7.1[embed] ) php7-2? ( dev-lang/php:7.2[embed] ) php7-3? ( dev-lang/php:7.3[embed] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ) ruby? ( dev-lang/ruby:= )
+REQUIRED_USE=|| ( perl python ruby php5-6 php7-1 php7-2 php7-3 ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 ) )
 SLOT=0
 SRC_URI=https://unit.nginx.org/download/unit-1.8.0.tar.gz -> nginx-unit-1.8.0.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=db6853827bac03f58683b688c5425072
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0a1658478bc61a754cf09658f3e7e582
diff --git a/metadata/md5-cache/www-servers/ocsigenserver-2.8 b/metadata/md5-cache/www-servers/ocsigenserver-2.8
index eff727eaefd3..03df395a9e70 100644
--- a/metadata/md5-cache/www-servers/ocsigenserver-2.8
+++ b/metadata/md5-cache/www-servers/ocsigenserver-2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( sqlite dbm postgres )
 RESTRICT=strip installsources
 SLOT=0/2.8
 SRC_URI=https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz -> ocsigenserver-2.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e72b0569c9bbc0dfca706f36f87e3176
diff --git a/metadata/md5-cache/www-servers/ocsigenserver-9999 b/metadata/md5-cache/www-servers/ocsigenserver-9999
index f909d1c9f98a..3768c8d8208f 100644
--- a/metadata/md5-cache/www-servers/ocsigenserver-9999
+++ b/metadata/md5-cache/www-servers/ocsigenserver-9999
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ml/lwt-2.5.0:=[camlp4(+)] dev-ml/lwt_react:= dev-ml/lwt_ssl:= >=de
 REQUIRED_USE=|| ( sqlite dbm postgres )
 RESTRICT=strip installsources
 SLOT=0/9999
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	findlib	17c71a5d96323df925f9f6db1215668a	git-r3	809e27702c573cbba31c08ed00bbad33	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=e72b0569c9bbc0dfca706f36f87e3176
diff --git a/metadata/md5-cache/www-servers/resin-4.0.48-r1 b/metadata/md5-cache/www-servers/resin-4.0.48-r1
index 21a769ea74fa..4908d074f179 100644
--- a/metadata/md5-cache/www-servers/resin-4.0.48-r1
+++ b/metadata/md5-cache/www-servers/resin-4.0.48-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/jsr101:0 dev-java/mojarra:2.2 dev-java/oracle-javamail:0 dev-java/validation-api:1.0 dev-java/resin-servlet-api:3.1 dev-java/glassfish-xmlrpc-api:0 dev-java/glassfish-deployment-api:1.2 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://www.caucho.com/download/resin-4.0.48-src.zip
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ba7bd3256fbca927efc014a2d51d24f9
diff --git a/metadata/md5-cache/www-servers/servefile-0.4.4 b/metadata/md5-cache/www-servers/servefile-0.4.4
index ae04c1dc70e7..07d7c85840c6 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3bad429b5b2c5635ef458e07bac59aa6
diff --git a/metadata/md5-cache/www-servers/sniproxy-0.5.0 b/metadata/md5-cache/www-servers/sniproxy-0.5.0
index 7b9cafdea37c..2fd3d9d053a3 100644
--- a/metadata/md5-cache/www-servers/sniproxy-0.5.0
+++ b/metadata/md5-cache/www-servers/sniproxy-0.5.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=dev-libs/libev >=dev-libs/libpcre-3 dns? ( net-libs/udns )
 SLOT=0
 SRC_URI=https://github.com/dlundquist/sniproxy/archive/0.5.0.tar.gz -> sniproxy-0.5.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=3353a16ba09f36f75e981b7d0b2f32c3
diff --git a/metadata/md5-cache/www-servers/sniproxy-0.6.0 b/metadata/md5-cache/www-servers/sniproxy-0.6.0
index 5b55a735c2c0..05a31d2bddd7 100644
--- a/metadata/md5-cache/www-servers/sniproxy-0.6.0
+++ b/metadata/md5-cache/www-servers/sniproxy-0.6.0
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libev >=dev-libs/libpcre-3 dns? ( net-libs/udns )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dlundquist/sniproxy/archive/0.6.0.tar.gz -> sniproxy-0.6.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=893381be872fcd0d0d14a41dd90a272e
diff --git a/metadata/md5-cache/www-servers/thttpd-2.27.1 b/metadata/md5-cache/www-servers/thttpd-2.27.1
index cb3fae7ecb66..26e393b6ae37 100644
--- a/metadata/md5-cache/www-servers/thttpd-2.27.1
+++ b/metadata/md5-cache/www-servers/thttpd-2.27.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=https://github.com/blueness/sthttpd/archive/v2.27.1.tar.gz -> thttpd-2.27.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1870b75f6bdf7f8fa01377257d958b89
diff --git a/metadata/md5-cache/www-servers/thttpd-9999 b/metadata/md5-cache/www-servers/thttpd-9999
index 1e5a3a395bb3..736c640b4f3e 100644
--- a/metadata/md5-cache/www-servers/thttpd-9999
+++ b/metadata/md5-cache/www-servers/thttpd-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://opensource.dyc.edu/sthttpd
 LICENSE=BSD GPL-2
 PROPERTIES=live
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=91d3582ca17c141519784db853f5c1b8
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.96 b/metadata/md5-cache/www-servers/tomcat-7.0.96
index 4cc8ccfa7f8e..3760c1d5f14a 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.96
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.96
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre >=d
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.96/src/apache-tomcat-7.0.96-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=004bc30387ab3ead2a4f916bd7e29be0
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.99 b/metadata/md5-cache/www-servers/tomcat-7.0.99
new file mode 100644
index 000000000000..aec99035ec7d
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.99
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jdk:1.8 test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
+EAPI=7
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=7
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.99/src/apache-tomcat-7.0.99-src.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=bb79ef7852b1c0cb4a3f150643619072
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.47 b/metadata/md5-cache/www-servers/tomcat-8.5.47
index 17c41a431172..adbf2413171d 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.47
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.47
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 >=virtual
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.47/src/apache-tomcat-8.5.47-src.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fd23d4fe75cbca20f11e32076ace22f5
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.27 b/metadata/md5-cache/www-servers/tomcat-9.0.27
index 93df519de58b..6d5f95382291 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.27
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.27
@@ -10,5 +10,5 @@ RDEPEND=dev-java/eclipse-ecj:4.13 dev-java/glassfish-xmlrpc-api:0 dev-java/tomca
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.27/src/apache-tomcat-9.0.27-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/4.1.0/biz.aQute.bnd-4.1.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/4.1.0/biz.aQute.bndlib-4.1.0.jar
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=5dc979da2717f6921358b448dec42f7e
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.7 b/metadata/md5-cache/www-servers/tomcat-9.0.7
deleted file mode 100644
index 4c6a9d45f875..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-9.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-9.0.7:4.0 app-admin/pwgen >=virtual/jdk-1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-9.0.7:4.0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.7/src/apache-tomcat-9.0.7-src.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	a055407af6fd37cf3f692ba73d2d2ba5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=2ec96f4207d5e1aa700dc51abc6dc0a5
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 53bbde993e45..03771712646a 100644
--- a/metadata/md5-cache/www-servers/tornado-4.4.2-r1
+++ b/metadata/md5-cache/www-servers/tornado-4.4.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.4.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e4e248b0ba78ba72ec092433a3b021d4
diff --git a/metadata/md5-cache/www-servers/tornado-4.5.1 b/metadata/md5-cache/www-servers/tornado-4.5.1
index 3573ee50d568..4a34138dd502 100644
--- a/metadata/md5-cache/www-servers/tornado-4.5.1
+++ b/metadata/md5-cache/www-servers/tornado-4.5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de8e6ae2c5858ec178999412226cf2a1
diff --git a/metadata/md5-cache/www-servers/tornado-4.5.3 b/metadata/md5-cache/www-servers/tornado-4.5.3
index 3191c766d3d8..8d521c7868b4 100644
--- a/metadata/md5-cache/www-servers/tornado-4.5.3
+++ b/metadata/md5-cache/www-servers/tornado-4.5.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-4.5.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=481a58ded93dbb6f2d9745542f70df7c
diff --git a/metadata/md5-cache/www-servers/tornado-5.0.2 b/metadata/md5-cache/www-servers/tornado-5.0.2
index dca3f1874af0..da6e5d9b71ad 100644
--- a/metadata/md5-cache/www-servers/tornado-5.0.2
+++ b/metadata/md5-cache/www-servers/tornado-5.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-5.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0d5c9dda5ffe59b2ddb5b7a11a4f8dd4
diff --git a/metadata/md5-cache/www-servers/tornado-5.1 b/metadata/md5-cache/www-servers/tornado-5.1
index 53cb1370f46c..2153d644ffeb 100644
--- a/metadata/md5-cache/www-servers/tornado-5.1
+++ b/metadata/md5-cache/www-servers/tornado-5.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tornado/tornado-5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64034469c8cea400d46d8a01db54b79a
diff --git a/metadata/md5-cache/www-servers/varnish-4.0.5 b/metadata/md5-cache/www-servers/varnish-4.0.5
index 1bd181dc8009..9cd1f2971ddd 100644
--- a/metadata/md5-cache/www-servers/varnish-4.0.5
+++ b/metadata/md5-cache/www-servers/varnish-4.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://varnish-cache.org/_downloads/varnish-4.0.5.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2a78e5b31ba601887a0e78a9867ab85e
diff --git a/metadata/md5-cache/www-servers/varnish-4.1.8 b/metadata/md5-cache/www-servers/varnish-4.1.8
index a786f22aaa37..c2b11de20a37 100644
--- a/metadata/md5-cache/www-servers/varnish-4.1.8
+++ b/metadata/md5-cache/www-servers/varnish-4.1.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://varnish-cache.org/_downloads/varnish-4.1.8.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=c1b23f14ed1a0d7239b020f1ba654003
diff --git a/metadata/md5-cache/www-servers/varnish-5.1.3 b/metadata/md5-cache/www-servers/varnish-5.1.3
index 8cb50c179608..34c34347e87d 100644
--- a/metadata/md5-cache/www-servers/varnish-5.1.3
+++ b/metadata/md5-cache/www-servers/varnish-5.1.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://varnish-cache.org/_downloads/varnish-5.1.3.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=083846d7618cfd38558578cfcd13333c
diff --git a/metadata/md5-cache/www-servers/varnish-5.2.1 b/metadata/md5-cache/www-servers/varnish-5.2.1
index df2ae1684223..7e42c8494957 100644
--- a/metadata/md5-cache/www-servers/varnish-5.2.1
+++ b/metadata/md5-cache/www-servers/varnish-5.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://varnish-cache.org/_downloads/varnish-5.2.1.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=a836da78ca1e16a0a5b7a0e22b3f36dd
diff --git a/metadata/md5-cache/www-servers/varnish-6.0.1 b/metadata/md5-cache/www-servers/varnish-6.0.1
index 1b4b6085f5a8..0eba346eabdb 100644
--- a/metadata/md5-cache/www-servers/varnish-6.0.1
+++ b/metadata/md5-cache/www-servers/varnish-6.0.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0/1
 SRC_URI=http://varnish-cache.org/_downloads/varnish-6.0.1.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=fba747293db6c77e6ba9c6e2c6559647
diff --git a/metadata/md5-cache/www-servers/varnish-6.1.1 b/metadata/md5-cache/www-servers/varnish-6.1.1
index 74320a87c70c..535637a7a053 100644
--- a/metadata/md5-cache/www-servers/varnish-6.1.1
+++ b/metadata/md5-cache/www-servers/varnish-6.1.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=http://varnish-cache.org/_downloads/varnish-6.1.1.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=db0ec9f341e0cd32c04ea4f3f8e87ada
diff --git a/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900 b/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
index bf1e1a02f81e..d507ef47a23d 100644
--- a/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
+++ b/metadata/md5-cache/www-servers/xsp-2014.12-r2014120900
@@ -10,5 +10,5 @@ RDEPEND=dev-db/sqlite:3
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mono/xsp/archive/e272a2c006211b6b03be2ef5bbb9e3f8fefd0768.zip -> xsp-2014.12.zip
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	dotnet	02b07a2ea25a5f7ebf9059cbef40c56f	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	dotnet	02b07a2ea25a5f7ebf9059cbef40c56f	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=0c0f2d77f96c68404a7519b001f20e85
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index d65b00bba3ff..24efbb39b294 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/whyteboard-0.41.1 b/metadata/md5-cache/x11-apps/whyteboard-0.41.1
deleted file mode 100644
index d9ed99be5478..000000000000
--- a/metadata/md5-cache/x11-apps/whyteboard-0.41.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install preinst setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
-DESCRIPTION=A simple image, PDF and postscript file annotator
-EAPI=5
-HOMEPAGE=http://whyteboard.org/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] media-gfx/imagemagick
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/whyteboard/whyteboard-0.41.1.tar.gz https://dev.gentoo.org/~lxnay/whyteboard/whyteboard.png
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2af6b017b703acd3913442c6def172d4
diff --git a/metadata/md5-cache/x11-apps/whyteboard-0.41.1-r1 b/metadata/md5-cache/x11-apps/whyteboard-0.41.1-r1
new file mode 100644
index 000000000000..286c130902cf
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/whyteboard-0.41.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install preinst setup
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+DESCRIPTION=A simple image, PDF and postscript file annotator
+EAPI=5
+HOMEPAGE=http://whyteboard.org/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=python_single_target_python2_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/wxpython:*[python_targets_python2_7(-)] ) media-gfx/imagemagick
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/whyteboard/whyteboard-0.41.1.tar.gz https://dev.gentoo.org/~lxnay/whyteboard/whyteboard.png
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f0c7a9f6e192cbca74a32ff9e7bbe906
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 8ea38ffe544e..7b763521131f 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-340.108 b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
index 3f4687836e43..8fa19c13ad9f 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-340.108
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X )
 RESTRICT=bindist mirror test
 SLOT=0/340
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/340.108/NVIDIA-FreeBSD-x86_64-340.108.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/340.108/NVIDIA-Linux-x86_64-340.108.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/340.108/NVIDIA-FreeBSD-x86-340.108.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/340.108/NVIDIA-Linux-x86-340.108.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.108.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=2de3d13dd87f1a79d062566e37beb43e
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
index a905b45dbe47..efccef131b53 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.132-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/390
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.132/NVIDIA-FreeBSD-x86_64-390.132.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.132/NVIDIA-Linux-armv7l-gnueabihf-390.132.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.132/NVIDIA-FreeBSD-x86-390.132.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1b698778ea5684f551bc81a524249a5b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r1
index b611d79084cd..bc085dba66a1 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-430.64-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/430
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/430.64/NVIDIA-FreeBSD-x86_64-430.64.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/430.64/NVIDIA-Linux-x86_64-430.64.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.64.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=f7c5fddc9ab563c397e9a9717fb11df9
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r1
index 7d5bf7c561cd..c86ecfa89405 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-435.21-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/435
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/435.21/NVIDIA-FreeBSD-x86_64-435.21.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/435.21/NVIDIA-Linux-x86_64-435.21.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-435.21.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=1dfaa934ca6daa44964386c10060b8e8
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.44-r1 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.44-r1
index 5b615fe47698..34d223ee0fc3 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.44-r1
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.44-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/440
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/440.44/NVIDIA-FreeBSD-x86_64-440.44.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.44/NVIDIA-Linux-x86_64-440.44.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.44.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=86e39c526fe865063a90f34b10c53fd1
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.59 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.59
index 8efbd3095b2c..df9f7914ac05 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.59
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.59
@@ -12,5 +12,5 @@ REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror test
 SLOT=0/440
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/440.59/NVIDIA-FreeBSD-x86_64-440.59.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.59/NVIDIA-Linux-x86_64-440.59.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.59.tar.bz2 )
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	linux-info	953c3b1c472dcadbf62098a9301327f2	linux-mod	6c7b3e7b9d39bd049bf23a991c16315e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	8ed81ef0f6ce50f9712b1a11daa84328	portability	2b88d3ecc35035a3b8ab628b49cafb0e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=69e3c9e1a3e497136895264efe3b65d1
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
index 77d2bfd5bec4..d9ef70f24ced 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
@@ -3,12 +3,12 @@ DEPEND=xspice? ( app-emulation/spice python_single_target_python2_7? ( >=dev-lan
 DESCRIPTION=QEMU QXL paravirt video driver
 EAPI=5
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
-IUSE=xspice +python_targets_python2_7 +python_single_target_python2_7
+IUSE=xspice +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=xspice? ( app-emulation/spice python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= x11-base/xorg-server[xorg] x11-libs/libpciaccess
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
 _md5_=f2ee3effa490c7480c3641531de1c874
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index edc6840282a1..ee428dec2881 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/flowcanvas-0.7.1-r2 b/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2
index a03a225c3d91..3a098671e4df 100644
--- a/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2
+++ b/metadata/md5-cache/x11-libs/flowcanvas-0.7.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Gtkmm/Gnomecanvasmm widget for boxes and lines environments
 EAPI=5
 HOMEPAGE=http://wiki.drobilla.net/FlowCanvas
 IUSE=debug doc
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libgnomecanvasmm-2.6:2.6 media-gfx/graphviz
 SLOT=0
 SRC_URI=http://download.drobilla.net/flowcanvas-0.7.1.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=5907bbcbd897959c1562fe022149958c
+_md5_=9d6245aee7f7638e3ac136358f4244cb
diff --git a/metadata/md5-cache/x11-libs/fox-wrapper-2 b/metadata/md5-cache/x11-libs/fox-wrapper-2
index d970c364787a..b32c5d567daa 100644
--- a/metadata/md5-cache/x11-libs/fox-wrapper-2
+++ b/metadata/md5-cache/x11-libs/fox-wrapper-2
@@ -1,8 +1,8 @@
 DEFINED_PHASES=install
 DESCRIPTION=wrapper for fox-config to manage multiple versions
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
-_md5_=2ab49a51843ed94ed6c5e263fd0384d6
+_md5_=862bfada6b098d8faf99ff3328e2a511
diff --git a/metadata/md5-cache/x11-libs/fox-wrapper-3 b/metadata/md5-cache/x11-libs/fox-wrapper-3
index 4e3373b51cf5..aa2c85db3b04 100644
--- a/metadata/md5-cache/x11-libs/fox-wrapper-3
+++ b/metadata/md5-cache/x11-libs/fox-wrapper-3
@@ -1,8 +1,8 @@
 DEFINED_PHASES=install
 DESCRIPTION=wrapper for fox-config to manage multiple versions
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
-_md5_=265be43ef720eadd902d2e7fe24f4a96
+_md5_=9f8400c944486c8465d6337f9713541a
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 74a8e0af3a61..b2248fd4bb73 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.32-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua cups examples +introspection test vim-syntax xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=x11-themes/gtk-engines-adwaita gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) !aqua? ( >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-2 !<gnome-base/gail-1000 !<dev-util/gtk-builder-convert-2.24.32 !<x11-libs/vte-0.28.2-r201:0 >=x11-themes/adwaita-icon-theme-3.14 x11-themes/gnome-themes-standard
@@ -13,4 +13,4 @@ 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	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=05df091cd0d61ebdf491c8a1e0163017
+_md5_=eea89f9cfc4355ef3acedeb6e63407b4
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.10 b/metadata/md5-cache/x11-libs/gtk+-3.24.10
deleted file mode 100644
index a2130254623d..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.10
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.53.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.41.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-0.9:= 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 dev-libs/libxslt dev-libs/gobject-introspection-common >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Gimp ToolKit +
-EAPI=6
-HOMEPAGE=https://www.gtk.org/
-IUSE=aqua broadway cloudprint colord cups examples gtk-doc +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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.53.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.41.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-0.9:= 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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
-REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.10.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9326ab27f21afef20c878d1b8031e093
diff --git a/metadata/md5-cache/x11-libs/gtkdatabox-0.9.2.0 b/metadata/md5-cache/x11-libs/gtkdatabox-0.9.2.0
deleted file mode 100644
index ad13b5ae268c..000000000000
--- a/metadata/md5-cache/x11-libs/gtkdatabox-0.9.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=glade? ( gnome-base/libglade ) x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
-DESCRIPTION=Gtk+ Widgets for live display of large amounts of fluctuating numerical data
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/gtkdatabox/
-IUSE=doc examples +glade static-libs test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=glade? ( gnome-base/libglade ) x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkdatabox/gtkdatabox-0.9.2.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a49d01a6f3fd972c20731cc18756c89b
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 d023e97afa7f..e01ace737556 100644
--- a/metadata/md5-cache/x11-libs/gtkglarea-2.0.1-r1
+++ b/metadata/md5-cache/x11-libs/gtkglarea-2.0.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=OpenGL canvas and context provider for GTK+
 EAPI=5
 HOMEPAGE=https://www.mono-project.com/archived/gtkglarea/
 IUSE=examples
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux
 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db3a40a0d284656e95e2205c54eb8dbd
+_md5_=3f705b80ad85fb8d79b2aa6a9c53721a
diff --git a/metadata/md5-cache/x11-libs/gtkglarea-2.1.0 b/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
index 09afabb5457c..84bb8aa1f7a0 100644
--- a/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
+++ b/metadata/md5-cache/x11-libs/gtkglarea-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=OpenGL canvas and context provider for GTK+
 EAPI=5
 HOMEPAGE=https://www.mono-project.com/archived/gtkglarea/
 IUSE=examples
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+ 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=50d3d3367e16fd72180924a5ace50350
+_md5_=643acb3bcaba66f880c77fc3c93e603d
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 666d1f2e9799..f1a5a5ad85e4 100644
--- a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
+++ b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r4
@@ -4,10 +4,10 @@ DESCRIPTION=GL extensions for Gtk+ 2.0
 EAPI=6
 HOMEPAGE=http://gtkglext.sourceforge.net/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/gtkglext/gtkglext-1.2.0.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c8c41071f617c4050d8e0f38a00f260
+_md5_=10e65381023a36aeda9142629a2bc1cb
diff --git a/metadata/md5-cache/x11-libs/libGLw-8.0.0 b/metadata/md5-cache/x11-libs/libGLw-8.0.0
deleted file mode 100644
index 6b5c1492b942..000000000000
--- a/metadata/md5-cache/x11-libs/libGLw-8.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/motif:0 virtual/opengl
-DESCRIPTION=Mesa GLw library
-EAPI=7
-HOMEPAGE=http://mesa3d.sourceforge.net/
-IUSE=+motif
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/motif:0 virtual/opengl
-SLOT=0
-SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glw/glw-8.0.0.tar.bz2
-_md5_=79a30bbaf3f3d5b4523d1a7e1c9380f4
diff --git a/metadata/md5-cache/x11-libs/libGLw-8.0.0-r1 b/metadata/md5-cache/x11-libs/libGLw-8.0.0-r1
new file mode 100644
index 000000000000..3ccf85645de5
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libGLw-8.0.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/motif:0 virtual/opengl
+DESCRIPTION=Mesa GLw library
+EAPI=7
+HOMEPAGE=http://mesa3d.sourceforge.net/
+IUSE=+motif
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/motif:0 virtual/opengl
+SLOT=0
+SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glw/glw-8.0.0.tar.bz2
+_md5_=1892efc2085ae67d7afb01170911ba52
diff --git a/metadata/md5-cache/x11-libs/libwnck-2.31.0 b/metadata/md5-cache/x11-libs/libwnck-2.31.0
index c05dad88e147..9669b0b3cbe1 100644
--- a/metadata/md5-cache/x11-libs/libwnck-2.31.0
+++ b/metadata/md5-cache/x11-libs/libwnck-2.31.0
@@ -4,10 +4,10 @@ DESCRIPTION=A window navigation construction kit
 EAPI=5
 HOMEPAGE=https://www.gnome.org/
 IUSE=+introspection startup-notification
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7985d669a78c6818cfa0de4b1cc21352
+_md5_=41db25ade146e1b082aa00cc36836d66
diff --git a/metadata/md5-cache/x11-libs/libyui-3.3.3 b/metadata/md5-cache/x11-libs/libyui-3.3.3
index bcb85e812e68..96f17680adab 100644
--- a/metadata/md5-cache/x11-libs/libyui-3.3.3
+++ b/metadata/md5-cache/x11-libs/libyui-3.3.3
@@ -11,4 +11,4 @@ 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a67530c2371dc82fdedee53ae8025a06
+_md5_=2afb7dc0fd26c920e7ce38f83e2ba5e2
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 0f0759441527..80bcaa28b4d7 100644
--- a/metadata/md5-cache/x11-libs/vte-0.28.2-r208
+++ b/metadata/md5-cache/x11-libs/vte-0.28.2-r208
@@ -4,7 +4,7 @@ DESCRIPTION=GNOME terminal widget
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
 IUSE=debug +introspection python python_targets_python2_7
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=x11-libs/gnome-pty-helper
 RDEPEND=>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-2.20:2[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= x11-libs/libX11 x11-libs/libXft introspection? ( >=dev-libs/gobject-introspection-0.9.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_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
@@ -12,4 +12,4 @@ 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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f12cb31e68315348ef068e4abc9e4644
+_md5_=0692151f25ae68864e6fe60d3ec873d7
diff --git a/metadata/md5-cache/x11-libs/vte-0.56.4 b/metadata/md5-cache/x11-libs/vte-0.56.4
index fb285e7f90b1..8f1c01b582d9 100644
--- a/metadata/md5-cache/x11-libs/vte-0.56.4
+++ b/metadata/md5-cache/x11-libs/vte-0.56.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
 IUSE=+crypt debug glade +introspection vala vanilla
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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.56/vte-0.56.4.tar.xz !vanilla? ( https://dev.gentoo.org/~leio/distfiles/vte-0.54.1-command-notify.patch.xz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67ee38296b8bf477e8918bb06f56e5ee
+_md5_=fe7535613ac942e6f84e096bc80f4c07
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.3 b/metadata/md5-cache/x11-libs/wxGTK-3.0.3
deleted file mode 100644
index e8eb12ed1c0d..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-SLOT=3.0
-SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3-docs-html.tar.bz2 )
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f70e788bd8f8e944e656d70bce1bfe87
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.3-r300 b/metadata/md5-cache/x11-libs/wxGTK-3.0.3-r300
deleted file mode 100644
index f19509326919..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.3-r300
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-SLOT=3.0-gtk3
-SRC_URI=https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3.tar.bz2 https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v3.0.3/wxWidgets-3.0.3-docs-html.tar.bz2 )
-_eclasses_=multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=71e9a2509b3f8ad9defd0f4e0ee02f6d
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4
deleted file mode 100644
index 9acded728a90..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fb22629e20579325125bd6e30d36850a
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r1 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r1
deleted file mode 100644
index 80c8042ac7d8..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_p20181106.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	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9ed621b68d2679a1fdd682cd84f4a99d
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
index 36bcdd8f7e89..3d8138a2a91d 100644
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
+++ b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
@@ -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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_p20190713.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	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=41513c2b289cbef250b11ad912b56b6c
+_md5_=a1b34a78264e2b9d7d67ea41c539245e
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300
deleted file mode 100644
index 40c685cd143f..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r300
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=8b088ba63f1d826197860f4bee2ecd27
diff --git a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r301 b/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r301
deleted file mode 100644
index 8dd96608a45b..000000000000
--- a/metadata/md5-cache/x11-libs/wxGTK-3.0.4-r301
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-base/xorg-proto )
-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_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_p20181106.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	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1bbbc3b9d7b2db265f5a00ac02d20bb1
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index a907ac2d7c43..e09fc0bc7d42 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/arandr-0.1.10 b/metadata/md5-cache/x11-misc/arandr-0.1.10
index 87fc576f7d8a..512f2531518a 100644
--- a/metadata/md5-cache/x11-misc/arandr-0.1.10
+++ b/metadata/md5-cache/x11-misc/arandr-0.1.10
@@ -11,5 +11,5 @@ RDEPEND=dev-python/pygobject:3=[python_targets_python3_6(-)?,python_targets_pyth
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://christian.amsuess.com/tools/arandr/files/arandr-0.1.10.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7674093572d4e01a98bea17e48c23c17
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1
index e9aa2f72a95f..e9199f7cbe04 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libbsd virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
 SRC_URI=https://bumblebee-project.org/bumblebee-3.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	566393c426fca4615a83df9a982bb9d9	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=91ff6729d86abfc1e377ee89f7bd1e23
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170123 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170123
index a6683b707a64..cba08fb3d07e 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170123
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170123
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/op
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/Bumblebee/archive/c322bd849aabe6e48b4304b8d13cc4aadc36a30d.tar.gz -> bumblebee-3.2.1_p20170123.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=03092d8adb461eca5ec2f3b4fe793ca6
diff --git a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170130 b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170130
index 3052c5c3d477..e9d9eb358e4f 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170130
+++ b/metadata/md5-cache/x11-misc/bumblebee-3.2.1_p20170130
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/op
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/Bumblebee/archive/d469a32fc0dfef5b3725c7a5331be2d04b870594.tar.gz -> bumblebee-3.2.1_p20170130.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=6c2c57f66551e55d36f3119d091e54b9
diff --git a/metadata/md5-cache/x11-misc/bumblebee-9999 b/metadata/md5-cache/x11-misc/bumblebee-9999
index 0eef7ff8bcdb..ea3eb2b309e4 100644
--- a/metadata/md5-cache/x11-misc/bumblebee-9999
+++ b/metadata/md5-cache/x11-misc/bumblebee-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-libs/libbsd sys-apps/kmod x11-libs/libX11 virtual/opengl x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] bbswitch? ( sys-power/bbswitch )
 REQUIRED_USE=|| ( video_cards_nouveau video_cards_nvidia )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
 _md5_=03092d8adb461eca5ec2f3b4fe793ca6
diff --git a/metadata/md5-cache/x11-misc/colord-1.3.5 b/metadata/md5-cache/x11-misc/colord-1.3.5
index 4a07025033f2..1577e2c9141b 100644
--- a/metadata/md5-cache/x11-misc/colord-1.3.5
+++ b/metadata/md5-cache/x11-misc/colord-1.3.5
@@ -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.5.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	00484e1be1aac73e24fca1c99557a7d6	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	5e40a693d9c828e8f3655184116e8b73	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vala	cd46635fb3b81d6bc07830b4afe87066	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b0f053cadca41a24a9bb7fad182c6f8d
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 bca2622844ca..c14971309458 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4f7b84a24b60fcac3ee340b47ea09482
diff --git a/metadata/md5-cache/x11-misc/dsx-0.1-r1 b/metadata/md5-cache/x11-misc/dsx-0.1-r1
index 25ef4e0ba353..47130a599422 100644
--- a/metadata/md5-cache/x11-misc/dsx-0.1-r1
+++ b/metadata/md5-cache/x11-misc/dsx-0.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=install setup
 DESCRIPTION=Command line selection of your X desktop environment
 EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=+python_single_target_python2_7
 KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) x11-apps/xinit
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=02ddb534200dbd729123158da3fbe8f7
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=9ddfd097de6bf82b1e3984bfad359d08
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 f9d0a282e69b..9cb35cf65a51 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f51878598e26fd4fe2bf33dd3c43416d
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 40268c2a2068..5da2205580e4 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 44cc87a7ebea..1ec0420363b4 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b892d3c6c9ecfa2caa5178ee1cba8da0
diff --git a/metadata/md5-cache/x11-misc/icewmcp-3.2-r4 b/metadata/md5-cache/x11-misc/icewmcp-3.2-r4
index 7c3ee56ea2db..c9c867a62bf9 100644
--- a/metadata/md5-cache/x11-misc/icewmcp-3.2-r4
+++ b/metadata/md5-cache/x11-misc/icewmcp-3.2-r4
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A complete control panel for IceWM using gtk & python
 EAPI=5
 HOMEPAGE=http://icesoundmanager.sourceforge.net/index.php
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk:2 x11-libs/gtk+:2 x11-wm/icewm
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/icesoundmanager/IceWMControlPanel-3.2.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=ba2a3cc9134f1f7e203d14d22d157b26
diff --git a/metadata/md5-cache/x11-misc/idesk-0.7.5-r3 b/metadata/md5-cache/x11-misc/idesk-0.7.5-r3
index 1db4b95ff43e..cf4eacb5ff96 100644
--- a/metadata/md5-cache/x11-misc/idesk-0.7.5-r3
+++ b/metadata/md5-cache/x11-misc/idesk-0.7.5-r3
@@ -3,9 +3,9 @@ DEPEND=dev-libs/glib:2 dev-libs/libxml2 media-libs/freetype >=media-libs/imlib2-
 DESCRIPTION=Utility to place icons on the root window
 EAPI=6
 HOMEPAGE=http://idesk.sourceforge.net/
-KEYWORDS=~alpha amd64 hppa ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~hppa ppc ppc64 sparc x86
 LICENSE=BSD
 RDEPEND=dev-libs/glib:2 dev-libs/libxml2 media-libs/freetype >=media-libs/imlib2-1.4[X] media-libs/libart_lgpl x11-libs/gtk+:2 x11-libs/pango x11-libs/startup-notification
 SLOT=0
 SRC_URI=mirror://sourceforge/idesk/idesk-0.7.5.tar.bz2
-_md5_=0153416b0724b4a76dc733442d4eda09
+_md5_=1d05653d6c3677ff111f33abbde4ce70
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-2.48 b/metadata/md5-cache/x11-misc/libinput-gestures-2.48
index d6e2741bf79f..f72287aa3af4 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-2.48
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-2.48
@@ -3,12 +3,12 @@ DEPEND=>=dev-libs/libinput-1.8.0 dev-util/desktop-file-utils
 DESCRIPTION=Actions gestures on your touchpad using libinput
 EAPI=7
 HOMEPAGE=https://github.com/bulletmark/libinput-gestures
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/libinput-1.8.0 x11-misc/wmctrl x11-misc/xdotool
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/bulletmark/libinput-gestures/archive/2.48.tar.gz -> libinput-gestures-2.48.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3263b856255e21231edfbfb2141e2163
diff --git a/metadata/md5-cache/x11-misc/libinput-gestures-9999 b/metadata/md5-cache/x11-misc/libinput-gestures-9999
index cf6a53a75652..2eeadc022831 100644
--- a/metadata/md5-cache/x11-misc/libinput-gestures-9999
+++ b/metadata/md5-cache/x11-misc/libinput-gestures-9999
@@ -4,11 +4,11 @@ DEPEND=>=dev-libs/libinput-1.8.0 dev-util/desktop-file-utils
 DESCRIPTION=Actions gestures on your touchpad using libinput
 EAPI=7
 HOMEPAGE=https://github.com/bulletmark/libinput-gestures
-IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+IUSE=python_single_target_python3_6 python_single_target_python3_7
 LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) >=dev-libs/libinput-1.8.0 x11-misc/wmctrl x11-misc/xdotool
-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 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3263b856255e21231edfbfb2141e2163
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.30.0 b/metadata/md5-cache/x11-misc/lightdm-1.30.0
index b5857b060e38..8bae7c23f840 100644
--- a/metadata/md5-cache/x11-misc/lightdm-1.30.0
+++ b/metadata/md5-cache/x11-misc/lightdm-1.30.0
@@ -13,5 +13,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.30.0/lightdm-1.30.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vala	cd46635fb3b81d6bc07830b4afe87066	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vala	cd46635fb3b81d6bc07830b4afe87066	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=388a98c77458eae42c1747e8dae14b69
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.1.3 b/metadata/md5-cache/x11-misc/menulibre-2.1.3
index b4ba530b72e5..d69c3f901b93 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc3367eea437579da89935286c62ca5a
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.0 b/metadata/md5-cache/x11-misc/menulibre-2.2.0
index ccb6b9aa07bb..0f5c38f03089 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_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1ce6cfea8b127d546863ace014ef2c8b
diff --git a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r1 b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r1
index 39efc3c6ea5e..80230f26f650 100644
--- a/metadata/md5-cache/x11-misc/menulibre-2.2.1-r1
+++ b/metadata/md5-cache/x11-misc/menulibre-2.2.1-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/gobject-introspection dev-python/psutil[python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://launchpad.net/menulibre/2.2/2.2.1/+download/menulibre-2.2.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6c1d69a97e17cd7f662ec2ac30427076
diff --git a/metadata/md5-cache/x11-misc/mugshot-0.4.1 b/metadata/md5-cache/x11-misc/mugshot-0.4.1
deleted file mode 100644
index 471422bbc993..000000000000
--- a/metadata/md5-cache/x11-misc/mugshot-0.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/python-distutils-extra[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/intltool dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] sys-apps/accountsservice x11-libs/gtk+:3 gnome? ( gnome-base/gnome-control-center ) libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) ) webcam? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 gnome? ( media-libs/clutter-gtk[introspection] media-video/cheese[introspection] ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=A lightweight user-configuration application
-EAPI=6
-HOMEPAGE=https://launchpad.net/mugshot
-IUSE=gnome libreoffice webcam python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pexpect[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] sys-apps/accountsservice x11-libs/gtk+:3 gnome? ( gnome-base/gnome-control-center ) libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) ) webcam? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 gnome? ( media-libs/clutter-gtk[introspection] media-video/cheese[introspection] ) ) 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
-SRC_URI=https://launchpad.net/mugshot/0.4/0.4.1/+download/mugshot-0.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0706c382a39924fe2be34086662b24ba
diff --git a/metadata/md5-cache/x11-misc/mugshot-0.4.2-r1 b/metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
index 7e5371fc6757..1f03f75c5130 100644
--- a/metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
+++ b/metadata/md5-cache/x11-misc/mugshot-0.4.2-r1
@@ -5,11 +5,11 @@ DESCRIPTION=A lightweight user-configuration application
 EAPI=7
 HOMEPAGE=https://github.com/bluesabre/mugshot
 IUSE=gnome libreoffice webcam python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/gobject-introspection dev-python/dbus-python[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pexpect[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pycairo[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] sys-apps/accountsservice sys-apps/shadow gnome? ( gnome-base/gnome-control-center ) libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) ) webcam? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 gnome? ( media-libs/clutter-gtk[introspection] media-video/cheese[introspection] ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/bluesabre/mugshot/archive/mugshot-0.4.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4442555ee8f66bf13d3c72ce360b5150
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=832b4ebd6bca8d6173ae6d1222cb36df
diff --git a/metadata/md5-cache/x11-misc/nts-82-r1 b/metadata/md5-cache/x11-misc/nts-82-r1
index dc4d9b2ab4af..2c447e485e99 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=732d65b8c7087aaa48aef6ec597c5990
diff --git a/metadata/md5-cache/x11-misc/obconf-2.0.4 b/metadata/md5-cache/x11-misc/obconf-2.0.4
index dc3d40ab82ad..4d446230bf2c 100644
--- a/metadata/md5-cache/x11-misc/obconf-2.0.4
+++ b/metadata/md5-cache/x11-misc/obconf-2.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=ObConf is a tool for configuring the Openbox window manager
 EAPI=5
 HOMEPAGE=http://openbox.org/wiki/ObConf:About
 IUSE=nls
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux
 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	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5b26b380e3437c203abd56a4bc6ad7de
+_md5_=d1ce56a3337f5b7e05136dd07b2ec366
diff --git a/metadata/md5-cache/x11-misc/obmenu-1.0-r1 b/metadata/md5-cache/x11-misc/obmenu-1.0-r1
index 909d061e2c4b..3dc9855cdd18 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=454436fb177bdbcbfc74af903f1c993c
diff --git a/metadata/md5-cache/x11-misc/polybar-3.3.1-r1 b/metadata/md5-cache/x11-misc/polybar-3.3.1-r1
index e834b8bd37bb..5b017891a8bd 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.3.1-r1
+++ b/metadata/md5-cache/x11-misc/polybar-3.3.1-r1
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-la
 DESCRIPTION=A fast and easy-to-use tool for creating status bars
 EAPI=6
 HOMEPAGE=https://github.com/jaagr/polybar
-IUSE=alsa curl i3wm ipc mpd network pulseaudio +python_targets_python2_7 +python_single_target_python2_7
+IUSE=alsa curl i3wm ipc mpd network pulseaudio +python_single_target_python2_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) x11-base/xcb-proto x11-libs/cairo[X,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_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/jaagr/polybar/archive/3.3.1.tar.gz -> polybar-3.3.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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=41b6546a41362d991847ff259e9a6fb8
diff --git a/metadata/md5-cache/x11-misc/polybar-3.4.2-r1 b/metadata/md5-cache/x11-misc/polybar-3.4.2-r1
index b72b5c0737fa..1e0c26fbce75 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.4.2-r1
+++ b/metadata/md5-cache/x11-misc/polybar-3.4.2-r1
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A fast and easy-to-use tool for creating status bars
 EAPI=7
 HOMEPAGE=https://github.com/polybar/polybar
-IUSE=alsa curl i3wm ipc mpd network pulseaudio python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=alsa curl i3wm ipc mpd network pulseaudio python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) x11-base/xcb-proto x11-libs/cairo[X,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 || ( x11-wm/i3 x11-wm/i3-gaps ) ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/polybar/polybar/archive/3.4.2.tar.gz -> polybar-3.4.2.tar.gz https://github.com/polybar/xpp/archive/8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz -> xpp-8c019e6d7fefd2468791bc1cbf90d68ff7c1ba33.tar.gz https://github.com/polybar/i3ipcpp/archive/21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz -> i3ipcpp-21ce9060ac7c502225fdbd2f200b1cbdd8eca08d.tar.gz
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2540b18f3ba3be2665185267c8145984
diff --git a/metadata/md5-cache/x11-misc/py3status-3.24 b/metadata/md5-cache/x11-misc/py3status-3.24
deleted file mode 100644
index 543c741f35b9..000000000000
--- a/metadata/md5-cache/x11-misc/py3status-3.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-misc/i3status gevent? ( >=dev-python/gevent-1.2.0[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(-)] ) udev? ( >=dev-python/pyudev-0.21.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=py3status is an extensible i3status wrapper written in python
-EAPI=6
-HOMEPAGE=https://github.com/ultrabug/py3status
-IUSE=gevent +udev python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=x11-misc/i3status gevent? ( >=dev-python/gevent-1.2.0[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(-)] ) udev? ( >=dev-python/pyudev-0.21.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=https://github.com/ultrabug/py3status/archive/3.24.tar.gz -> py3status-3.24.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=988b23d28fbb333d50b766e47c3da1a1
diff --git a/metadata/md5-cache/x11-misc/py3status-3.25 b/metadata/md5-cache/x11-misc/py3status-3.25
new file mode 100644
index 000000000000..d3d8dd7ce4e2
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/py3status-3.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-misc/i3status gevent? ( >=dev-python/gevent-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) udev? ( >=dev-python/pyudev-0.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=py3status is an extensible i3status wrapper written in python
+EAPI=6
+HOMEPAGE=https://github.com/ultrabug/py3status
+IUSE=gevent +udev python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=x11-misc/i3status gevent? ( >=dev-python/gevent-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) udev? ( >=dev-python/pyudev-0.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/ultrabug/py3status/archive/3.25.tar.gz -> py3status-3.25.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b80b4d7bc60a600e438df31292cbdf73
diff --git a/metadata/md5-cache/x11-misc/pypanel-2.4-r2 b/metadata/md5-cache/x11-misc/pypanel-2.4-r2
index fc012a7bb6da..b7bc871285da 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_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54dd659467ebc995f2c0c8cd42e7983f
diff --git a/metadata/md5-cache/x11-misc/revelation-0.4.14-r3 b/metadata/md5-cache/x11-misc/revelation-0.4.14-r3
deleted file mode 100644
index 8591728633ed..000000000000
--- a/metadata/md5-cache/x11-misc/revelation-0.4.14-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-libs/cracklib[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A password manager for GNOME
-EAPI=6
-HOMEPAGE=https://revelation.olasagasti.info/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pycryptodome[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] sys-libs/cracklib[python,python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.bitbucket.org/erikg/revelation/downloads/revelation-0.4.14.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=29b3a40f6ac135b6f47839aa640e2baa
diff --git a/metadata/md5-cache/x11-misc/revelation-0.4.14-r4 b/metadata/md5-cache/x11-misc/revelation-0.4.14-r4
new file mode 100644
index 000000000000..3e07b3cb33a6
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/revelation-0.4.14-r4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python2_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/pygtk[python_targets_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)] dev-python/gconf-python[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] sys-libs/cracklib[python,python_targets_python2_7(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A password manager for GNOME
+EAPI=6
+HOMEPAGE=https://revelation.olasagasti.info/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python2_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/pygtk[python_targets_python2_7(-)] dev-python/pycryptodome[python_targets_python2_7(-)] dev-python/gconf-python[python_targets_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)] sys-libs/cracklib[python,python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.bitbucket.org/erikg/revelation/downloads/revelation-0.4.14.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2f9266610cbca7954e8da1af5234a859
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.8 b/metadata/md5-cache/x11-misc/safeeyes-2.0.8
index 07e531ffa543..4fbab31592b8 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.8
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.8
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.8.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b14e806d1d853521c33f6cd67f1af559
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.8.1 b/metadata/md5-cache/x11-misc/safeeyes-2.0.8.1
index 5d318897c463..e5610f3f2db7 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.8.1
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.8.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.8.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b14e806d1d853521c33f6cd67f1af559
diff --git a/metadata/md5-cache/x11-misc/safeeyes-2.0.9 b/metadata/md5-cache/x11-misc/safeeyes-2.0.9
index e74e40219517..e2f08c2486f8 100644
--- a/metadata/md5-cache/x11-misc/safeeyes-2.0.9
+++ b/metadata/md5-cache/x11-misc/safeeyes-2.0.9
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/s/safeeyes/safeeyes-2.0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b14e806d1d853521c33f6cd67f1af559
diff --git a/metadata/md5-cache/x11-misc/sddm-0.15.0 b/metadata/md5-cache/x11-misc/sddm-0.15.0
index c9a63844f307..51bead83f627 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	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc8affc071a210e835e8bf7d6e3b76bb
diff --git a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1 b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
index 1eff388d8efa..f800703c1b87 100644
--- a/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
+++ b/metadata/md5-cache/x11-misc/sddm-0.18.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sddm/sddm/releases/download/v0.18.1/sddm-0.18.1.tar.xz
-_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	7b250250bd1c3cc90800ed668fb87825	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dc86f96655114c183861dda97c4f6e10
diff --git a/metadata/md5-cache/x11-misc/tintwizard-0.3.4-r2 b/metadata/md5-cache/x11-misc/tintwizard-0.3.4-r2
deleted file mode 100644
index 6d5c703366ee..000000000000
--- a/metadata/md5-cache/x11-misc/tintwizard-0.3.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=GUI wizard which generates config files for tint2 panels
-EAPI=6
-HOMEPAGE=https://github.com/vanadey/tintwizard/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) x11-misc/tint2 dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://tintwizard.googlecode.com/files/tintwizard-0.3.4.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5c40b9840a88dbd8a2466d226efd3a9c
diff --git a/metadata/md5-cache/x11-misc/tintwizard-0.3.4-r3 b/metadata/md5-cache/x11-misc/tintwizard-0.3.4-r3
new file mode 100644
index 000000000000..f1503efbf31c
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/tintwizard-0.3.4-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install setup
+DESCRIPTION=GUI wizard which generates config files for tint2 panels
+EAPI=6
+HOMEPAGE=https://github.com/vanadey/tintwizard/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) x11-misc/tint2 python_single_target_python2_7? ( dev-python/pygtk:2[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=https://tintwizard.googlecode.com/files/tintwizard-0.3.4.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=561c77254fb93a872461293946aaf350
diff --git a/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r2 b/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r2
deleted file mode 100644
index 62e038248be4..000000000000
--- a/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=sys-devel/gettext
-DESCRIPTION=Configuration GUI for x11-misc/wbar
-EAPI=6
-HOMEPAGE=http://koti.kapsi.fi/ighea/wbarconf/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=x11-misc/wbar-1.3.3 dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://koti.kapsi.fi/ighea/wbarconf/wbarconf-0.7.2.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=37d13c78ee3fd2b3b04d631e2d1e055b
diff --git a/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r3 b/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r3
deleted file mode 100644
index acdb60588a04..000000000000
--- a/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=sys-devel/gettext
-DESCRIPTION=Configuration GUI for x11-misc/wbar
-EAPI=7
-HOMEPAGE=http://koti.kapsi.fi/ighea/wbarconf/
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=x11-misc/wbar-1.3.3 dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://koti.kapsi.fi/ighea/wbarconf/wbarconf-0.7.2.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=482d80b675ae94a01c9343b673449d61
diff --git a/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r4 b/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r4
new file mode 100644
index 000000000000..cde91ea95ef2
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=sys-devel/gettext
+DESCRIPTION=Configuration GUI for x11-misc/wbar
+EAPI=6
+HOMEPAGE=http://koti.kapsi.fi/ighea/wbarconf/
+IUSE=+python_single_target_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=x11-misc/wbar-1.3.3 python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://koti.kapsi.fi/ighea/wbarconf/wbarconf-0.7.2.2.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=07da0c64a3f044f6f4f32152f95965e9
diff --git a/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r5 b/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r5
new file mode 100644
index 000000000000..0ebc39c77fff
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/wbarconf-0.7.2.2-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=sys-devel/gettext
+DESCRIPTION=Configuration GUI for x11-misc/wbar
+EAPI=7
+HOMEPAGE=http://koti.kapsi.fi/ighea/wbarconf/
+IUSE=+python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) >=x11-misc/wbar-1.3.3 python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://koti.kapsi.fi/ighea/wbarconf/wbarconf-0.7.2.2.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b27161685d91a54a01ef42b00daaf836
diff --git a/metadata/md5-cache/x11-misc/wdm-1.28-r5 b/metadata/md5-cache/x11-misc/wdm-1.28-r5
index bbf2e370fc01..1abc5e60387e 100644
--- a/metadata/md5-cache/x11-misc/wdm-1.28-r5
+++ b/metadata/md5-cache/x11-misc/wdm-1.28-r5
@@ -11,4 +11,4 @@ RDEPEND=>=x11-wm/windowmaker-0.70.0 x11-libs/libXmu x11-libs/libXpm x11-libs/lib
 SLOT=0
 SRC_URI=http://voins.program.ru/wdm/wdm-1.28.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=18da177dab38f6fc898202a9a02d81ad
+_md5_=36f0c7073969581325017e14a2fc7a67
diff --git a/metadata/md5-cache/x11-misc/xbattbar-1.4.8 b/metadata/md5-cache/x11-misc/xbattbar-1.4.8
index 18cb16489708..5964789a3d28 100644
--- a/metadata/md5-cache/x11-misc/xbattbar-1.4.8
+++ b/metadata/md5-cache/x11-misc/xbattbar-1.4.8
@@ -3,12 +3,12 @@ DEPEND=dev-lang/perl x11-libs/libX11
 DESCRIPTION=Advanced Power Management battery status display for X
 EAPI=5
 HOMEPAGE=https://packages.qa.debian.org/x/xbattbar.html
-IUSE=+python_targets_python2_7 +python_single_target_python2_7
+IUSE=+python_single_target_python2_7
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl x11-libs/libX11 python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) !ppc? ( >=sys-power/acpi-1.5 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/x/xbattbar/xbattbar_1.4.8.orig.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=8eabe25b82b7599a86d093d95f0e3426
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
index 1ff97d97f7bf..8c22ac8b3f62 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3 dev-u
 DESCRIPTION=Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-user-dirs
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.10/xdg-user-dirs-gtk-0.10.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=38a01e6c95833ebe9578c287b11760eb
+_md5_=b20317902a1a591861bc7b01b04eb040
diff --git a/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1 b/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
index 2b00d1b6678e..fa1a03972200 100644
--- a/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
+++ b/metadata/md5-cache/x11-misc/xflux-gui-1.2.0-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libappindicator:3 dev-python/pexpect[python_targets_python3_6(-
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/xflux-gui/fluxgui/archive/v1.2.0.tar.gz -> xflux-gui-1.2.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=415e583ff099c356e10816fe49b98981
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.59 b/metadata/md5-cache/x11-misc/xlockmore-5.59
deleted file mode 100644
index e8d93e21c64c..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.59
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Just another screensaver application for X
-EAPI=7
-HOMEPAGE=https://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.59.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f393cadde37a42428d38630af17ddd36
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.62 b/metadata/md5-cache/x11-misc/xlockmore-5.62
new file mode 100644
index 000000000000..fa66c3729ca0
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.62
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=Just another screensaver application for X
+EAPI=7
+HOMEPAGE=https://www.sillycycle.com/xlockmore.html
+IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD GPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
+REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
+SLOT=0
+SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.62.tar.xz
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=f393cadde37a42428d38630af17ddd36
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.62_alpha0 b/metadata/md5-cache/x11-misc/xlockmore-5.62_alpha0
deleted file mode 100644
index 07e02da972ca..000000000000
--- a/metadata/md5-cache/x11-misc/xlockmore-5.62_alpha0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Just another screensaver application for X
-EAPI=7
-HOMEPAGE=https://www.sillycycle.com/xlockmore.html
-IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
-SLOT=0
-SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.62ALPHA0.tar.xz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f393cadde37a42428d38630af17ddd36
diff --git a/metadata/md5-cache/x11-misc/xosview-1.21 b/metadata/md5-cache/x11-misc/xosview-1.21
index 955d875fb586..d4b7c7e9615e 100644
--- a/metadata/md5-cache/x11-misc/xosview-1.21
+++ b/metadata/md5-cache/x11-misc/xosview-1.21
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-mis
 SLOT=0
 SRC_URI=http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.21.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d967ae5193f9a47a26963fca3f40c5ee
+_md5_=88295920e5a28f0ed22cf2630b15bc53
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.38 b/metadata/md5-cache/x11-misc/xscreensaver-5.38
index d95bff1f77f6..cd437d6b5c4c 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.38
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.38
@@ -4,10 +4,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=6
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.38.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7c69b9789442b541f10b928901a8b55e
+_md5_=e67d7239d12615d11bc2125dc9419d5e
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.42 b/metadata/md5-cache/x11-misc/xscreensaver-5.42
index 8c4c947e0808..6d22f3b1d6e6 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.42
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.42
@@ -5,10 +5,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.42.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=c32a0cce0769fdc94998a0e43d80d132
+_md5_=0d2c8cabf6cb4ded2f2e0da87f5daf3e
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1 b/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1
index 15f5852a5a05..acf3abc1ffd8 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.43-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm caps? ( sys-libs/libcap ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.43.tar.gz -> xscreensaver-5.43-r1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=645e34d8b73cf409325b17b54253b08b
+_md5_=2a65bb39fde9915c04461522d8f046d7
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.43-r2 b/metadata/md5-cache/x11-misc/xscreensaver-5.43-r2
index 4e215b816bd6..c6a12a1e2415 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.43-r2
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.43-r2
@@ -5,10 +5,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=7
 HOMEPAGE=https://www.jwz.org/xscreensaver/
 IUSE=caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=gnome-base/libglade-2 dev-libs/libxml2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gdk-pixbuf:2[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm caps? ( sys-libs/libcap ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
 SLOT=0
 SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-5.43.tar.gz -> xscreensaver-5.43-r1.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	a1771fc1e5831c201eaf18451747d94b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f49d59b8b360ef74825e48168bb6b944
+_md5_=fba1020ba84bb3c7226dda7ecd60fd5d
diff --git a/metadata/md5-cache/x11-misc/xsri-2.1.0-r3 b/metadata/md5-cache/x11-misc/xsri-2.1.0-r3
index 6fa9c0fb27f2..50d35bec745d 100644
--- a/metadata/md5-cache/x11-misc/xsri-2.1.0-r3
+++ b/metadata/md5-cache/x11-misc/xsri-2.1.0-r3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://download.fedoraproject.org/pub/fedora/linux/releases/15/Everything/source/SRPMS/xsri-2.1.0-17.fc12.src.rpm
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=012e7290f67901be8a306994c6957955
diff --git a/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12 b/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
index 3e263ddc8e89..fdfcfe304f66 100644
--- a/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
+++ b/metadata/md5-cache/x11-misc/xsri-2.1.0_p17_p12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://download.fedoraproject.org/pub/fedora/linux/releases/12/Everything/source/SRPMS/xsri-2.1.0-17.fc12.src.rpm
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=3831029cc81921911f43442b438c630e
diff --git a/metadata/md5-cache/x11-misc/zim-0.71.1 b/metadata/md5-cache/x11-misc/zim-0.71.1
deleted file mode 100644
index 2e6aa083687f..000000000000
--- a/metadata/md5-cache/x11-misc/zim-0.71.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
-DESCRIPTION=A desktop wiki
-EAPI=7
-HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
-IUSE=+python_targets_python3_6 +python_single_target_python3_6 test
-KEYWORDS=amd64 x86
-LICENSE=BSD GPL-2+
-RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.71.1.tar.gz -> zim-0.71.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55db1ff91318ac1f9516bd3c5a1bcc2e
diff --git a/metadata/md5-cache/x11-misc/zim-0.71.1-r1 b/metadata/md5-cache/x11-misc/zim-0.71.1-r1
new file mode 100644
index 000000000000..425b66401453
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.71.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
+DESCRIPTION=A desktop wiki
+EAPI=7
+HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
+IUSE=+python_single_target_python3_6 test
+KEYWORDS=amd64 x86
+LICENSE=BSD GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.71.1.tar.gz -> zim-0.71.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6cec09af2146af61c78edadf7048afa8
diff --git a/metadata/md5-cache/x11-misc/zim-0.72.0 b/metadata/md5-cache/x11-misc/zim-0.72.0
index 8c693bedbc6a..6f49f85c1ff2 100644
--- a/metadata/md5-cache/x11-misc/zim-0.72.0
+++ b/metadata/md5-cache/x11-misc/zim-0.72.0
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
+DEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
 DESCRIPTION=A desktop wiki
 EAPI=7
 HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
-IUSE=+python_targets_python3_6 +python_single_target_python3_6 test
+IUSE=+python_single_target_python3_6 test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD GPL-2+
-RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.72.0.tar.gz -> zim-0.72.0.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f0c86e353fc3a6f80ca49eacdcd91e6
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0089866118bbcfdfe2ce1950368984e5
diff --git a/metadata/md5-cache/x11-misc/zim-0.72.1 b/metadata/md5-cache/x11-misc/zim-0.72.1
deleted file mode 100644
index 452b7d93e9e3..000000000000
--- a/metadata/md5-cache/x11-misc/zim-0.72.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
-DESCRIPTION=A desktop wiki
-EAPI=7
-HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
-IUSE=+python_targets_python3_6 +python_single_target_python3_6 test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2+
-RDEPEND=dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pyxdg[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.72.1.tar.gz -> zim-0.72.1.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f0c86e353fc3a6f80ca49eacdcd91e6
diff --git a/metadata/md5-cache/x11-misc/zim-0.72.1-r1 b/metadata/md5-cache/x11-misc/zim-0.72.1-r1
new file mode 100644
index 000000000000..a8ee0316e47e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.72.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils
+DESCRIPTION=A desktop wiki
+EAPI=7
+HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
+IUSE=+python_single_target_python3_6 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.72.1.tar.gz -> zim-0.72.1.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0089866118bbcfdfe2ce1950368984e5
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 18ed6ff6442d..92a2b247bbb6 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/gkrellsun-1.0.0-r4 b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
index 907b01374532..79b2535aae51 100644
--- a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
+++ b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A GKrellM plugin that shows sunrise and sunset times
 EAPI=6
 HOMEPAGE=http://gkrellsun.sourceforge.net/
 IUSE=nls
-KEYWORDS=~alpha amd64 hppa ia64 ppc sparc x86
+KEYWORDS=~alpha amd64 ~hppa ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=1
 SRC_URI=mirror://sourceforge/gkrellsun/gkrellsun-1.0.0.tar.gz
 _eclasses_=gkrellm-plugin	c01023a3c28bc24f50c00ae019e8861e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=90ba9497f191371e85add0c011b5a96c
+_md5_=a64761c7d27826f3c979794e89e0faa6
diff --git a/metadata/md5-cache/x11-plugins/guifications-2.16 b/metadata/md5-cache/x11-plugins/guifications-2.16
index 97bef29de3d9..bd7de61450d4 100644
--- a/metadata/md5-cache/x11-plugins/guifications-2.16
+++ b/metadata/md5-cache/x11-plugins/guifications-2.16
@@ -4,9 +4,9 @@ DESCRIPTION=Guifications is a graphical notification plugin for pidgin
 EAPI=6
 HOMEPAGE=http://plugins.guifications.org/
 IUSE=debug nls
-KEYWORDS=amd64 hppa ppc sparc x86
+KEYWORDS=amd64 ~hppa ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=http://downloads.guifications.org/plugins//Guifications2/pidgin-guifications-2.16.tar.bz2
-_md5_=8ddb86438811cea36f8549f64dfdc5e9
+_md5_=d63ca47307d9010c753866b20b8ee06c
diff --git a/metadata/md5-cache/x11-plugins/pidgin-encryption-3.1 b/metadata/md5-cache/x11-plugins/pidgin-encryption-3.1
index a18045931e5b..15500f4a29c7 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-encryption-3.1
+++ b/metadata/md5-cache/x11-plugins/pidgin-encryption-3.1
@@ -4,10 +4,10 @@ DESCRIPTION=Pidgin IM Encryption PlugIn
 EAPI=4
 HOMEPAGE=http://pidgin-encrypt.sourceforge.net/
 IUSE=nls
-KEYWORDS=amd64 hppa ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~hppa ppc ~ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 >=dev-libs/nss-3.11
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin-encrypt/pidgin-encryption-3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce39b7767e35d9e594b638029a1cdc8d
+_md5_=ee9378a0346b42752634ea5e092cee36
diff --git a/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1 b/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
index 20b5cb6c379a..bd0dea6206ed 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
+++ b/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig net-im/pidgin[gtk]
 DESCRIPTION=Extra preferences that are desired but are not worthy for Pidgin
 EAPI=6
 HOMEPAGE=http://gaim-extprefs.sourceforge.net
-KEYWORDS=amd64 hppa ppc sparc x86
+KEYWORDS=amd64 ~hppa ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk]
 SLOT=0
 SRC_URI=mirror://sourceforge/gaim-extprefs/pidgin-extprefs-0.7.tar.gz
-_md5_=13bdffa945a1895edaa74ccef9b451bd
+_md5_=95f114e331779bce6625aff28dd898ed
diff --git a/metadata/md5-cache/x11-plugins/pidgin-gpg-0.9 b/metadata/md5-cache/x11-plugins/pidgin-gpg-0.9
deleted file mode 100644
index eea85d3ff01f..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-gpg-0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-crypt/gpgme net-im/pidgin virtual/pkgconfig
-DESCRIPTION=Pidgin GPG/OpenPGP (XEP-0027) plugin
-EAPI=4
-HOMEPAGE=https://github.com/segler-alex/Pidgin-GPG
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gpgme net-im/pidgin
-SLOT=0
-SRC_URI=https://github.com/downloads/segler-alex/Pidgin-GPG/pidgin-gpg-0.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a02a93efe49741a1a7140c29812ca1ec
diff --git a/metadata/md5-cache/x11-plugins/pidgin-hotkeys-0.2.4 b/metadata/md5-cache/x11-plugins/pidgin-hotkeys-0.2.4
index ff1b13537ef6..92d5332fb5f5 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-hotkeys-0.2.4
+++ b/metadata/md5-cache/x11-plugins/pidgin-hotkeys-0.2.4
@@ -3,9 +3,9 @@ DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=Pidgin plugin to define global hotkeys for various actions
 EAPI=6
 HOMEPAGE=http://pidgin-hotkeys.sourceforge.net/
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin-hotkeys/pidgin-hotkeys-0.2.4.tar.gz
-_md5_=a4a37a6b516c0f5a9451086c01c3fa0b
+_md5_=7f140567dbeaabdc6aa0c18803a48689
diff --git a/metadata/md5-cache/x11-plugins/purple-plugin_pack-2.7.0-r1 b/metadata/md5-cache/x11-plugins/purple-plugin_pack-2.7.0-r1
index d9079c82233b..1d6fdfb594cc 100644
--- a/metadata/md5-cache/x11-plugins/purple-plugin_pack-2.7.0-r1
+++ b/metadata/md5-cache/x11-plugins/purple-plugin_pack-2.7.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A package with many different plugins for pidgin and libpurple
 EAPI=6
 HOMEPAGE=https://bitbucket.org/rekkanoryo/purple-plugin-pack/
 IUSE=debug gtk ncurses spell talkfilters
-KEYWORDS=amd64 hppa ppc x86
+KEYWORDS=amd64 ~hppa ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/json-glib net-im/pidgin[gtk?,ncurses?] talkfilters? ( app-text/talkfilters ) spell? ( app-text/gtkspell:2 )
 SLOT=0
 SRC_URI=https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-2.7.0.tar.bz2
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b6db354660033efd06cd6d7f4905ccea	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=f4d324f635c0920828305df66201e224
+_md5_=276a56fcdd6e80a8c98fff3d9583fb30
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 5a8d7b6d5f0e..198bfe1ccfc1 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.1.1-r2 b/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
index 2b3dc3287893..83592041688a 100644
--- a/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
+++ b/metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtdeclarative:5[localstorage] dev-qt/qtgraphicaleffects:5 dev-qt/q
 DESCRIPTION=terminal emulator which mimics the look and feel of the old cathode tube screens
 EAPI=7
 HOMEPAGE=https://github.com/Swordfish90/cool-retro-term
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
 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.1.1.tar.gz -> cool-retro-term-1.1.1.tar.gz https://github.com/Swordfish90/qmltermwidget/archive/0.2.0.tar.gz -> qmltermwidget-0.2.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a8723d70f79aae2386a4fdb22fdc0898
+_md5_=28f6c242524b6c651d3c64351db25d03
diff --git a/metadata/md5-cache/x11-terms/guake-3.3.2 b/metadata/md5-cache/x11-terms/guake-3.3.2
deleted file mode 100644
index ddafaa58cee7..000000000000
--- a/metadata/md5-cache/x11-terms/guake-3.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/keybinder:3 dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify x11-libs/vte:2.91 utempter? ( sys-libs/libutempter ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DESCRIPTION=Drop-down terminal for GNOME
-EAPI=6
-HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
-IUSE=utempter +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/keybinder:3 dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify x11-libs/vte:2.91 utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15822bca3ba0013b65026ea6e8beb417
diff --git a/metadata/md5-cache/x11-terms/guake-3.3.2-r1 b/metadata/md5-cache/x11-terms/guake-3.3.2-r1
new file mode 100644
index 000000000000..4eb1108a1842
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/guake-3.3.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/keybinder:3 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify x11-libs/vte:2.91 utempter? ( sys-libs/libutempter ) gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DESCRIPTION=Drop-down terminal for GNOME
+EAPI=6
+HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
+IUSE=utempter +python_single_target_python3_6
+KEYWORDS=amd64 arm x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/keybinder:3 python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify x11-libs/vte:2.91 utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_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	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6c0a1ab09fe9e11076db4390689b90db
diff --git a/metadata/md5-cache/x11-terms/guake-3.4.0-r1 b/metadata/md5-cache/x11-terms/guake-3.4.0-r1
index 6a1ffbf821eb..55f2e65a2d0c 100644
--- a/metadata/md5-cache/x11-terms/guake-3.4.0-r1
+++ b/metadata/md5-cache/x11-terms/guake-3.4.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),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_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
+DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
 DESCRIPTION=Drop-down terminal for GNOME
 EAPI=6
 HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
-IUSE=utempter +python_targets_python3_6 +python_single_target_python3_6
+IUSE=utempter +python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9e39966f42e9a4bf28cef41415e4ada
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3e6bf2c081ccfa35387116c5f2c495a1
diff --git a/metadata/md5-cache/x11-terms/guake-3.6.1-r1 b/metadata/md5-cache/x11-terms/guake-3.6.1-r1
index c0b81a0db819..65ecfa08150b 100644
--- a/metadata/md5-cache/x11-terms/guake-3.6.1-r1
+++ b/metadata/md5-cache/x11-terms/guake-3.6.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
+DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
 DESCRIPTION=Drop-down terminal for GNOME
 EAPI=6
 HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
-IUSE=utempter +python_targets_python3_6 +python_single_target_python3_6
+IUSE=utempter +python_single_target_python3_6
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/G/Guake/Guake-3.6.1.tar.gz -> guake-3.6.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd459aa94a83f17cdee1c2c8f97e2f2c
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d5b7e51f321096358dd2586935a20106
diff --git a/metadata/md5-cache/x11-terms/guake-3.6.3 b/metadata/md5-cache/x11-terms/guake-3.6.3
deleted file mode 100644
index 4033affa13c1..000000000000
--- a/metadata/md5-cache/x11-terms/guake-3.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make
-DESCRIPTION=Drop-down terminal for GNOME
-EAPI=7
-HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
-IUSE=utempter +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/G/Guake/Guake-3.6.3.tar.gz -> guake-3.6.3.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=818ef0f3ff7daeac33e8ef8a87fdbc84
diff --git a/metadata/md5-cache/x11-terms/guake-3.6.3-r1 b/metadata/md5-cache/x11-terms/guake-3.6.3-r1
new file mode 100644
index 000000000000..7d6cf0cb473a
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/guake-3.6.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make
+DESCRIPTION=Drop-down terminal for GNOME
+EAPI=7
+HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
+IUSE=utempter +python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/G/Guake/Guake-3.6.3.tar.gz -> guake-3.6.3.tar.gz
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=78c65a7a9f4fd429b0e2e743b719fb6c
diff --git a/metadata/md5-cache/x11-terms/guake-9999 b/metadata/md5-cache/x11-terms/guake-9999
index a6ed72fef3ce..81a461f9208c 100644
--- a/metadata/md5-cache/x11-terms/guake-9999
+++ b/metadata/md5-cache/x11-terms/guake-9999
@@ -1,14 +1,14 @@
-BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/setuptools[python_targets_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make
+DEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) gnome-base/gsettings-desktop-schemas sys-devel/gettext sys-devel/make
 DESCRIPTION=Drop-down terminal for GNOME
 EAPI=7
 HOMEPAGE=https://github.com/Guake/guake https://pypi.org/project/Guake
-IUSE=utempter +python_targets_python3_6 +python_single_target_python3_6
+IUSE=utempter +python_single_target_python3_6
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] dev-python/dbus-python[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pbr[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?] x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RDEPEND=dev-libs/glib dev-libs/keybinder:3[introspection] python_single_target_python3_6? ( dev-python/dbus-python[python_targets_python3_6(-)] dev-python/pbr[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[python_targets_python3_6(-)] ) x11-libs/libnotify[introspection] x11-libs/libwnck:3[introspection] x11-libs/vte:2.91[introspection] utempter? ( sys-libs/libutempter ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+REQUIRED_USE=^^ ( python_single_target_python3_6 )
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cca73b1fe69da8eda429f1280fe81663
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cee62997a4776f6740422fb0479a0565
diff --git a/metadata/md5-cache/x11-terms/kitty-0.15.1 b/metadata/md5-cache/x11-terms/kitty-0.15.1
index 6dafafa36519..7602a2fb9cf0 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.15.1
+++ b/metadata/md5-cache/x11-terms/kitty-0.15.1
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
 EAPI=7
 HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug wayland python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug wayland python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr sys-apps/dbus sys-libs/zlib virtual/imagemagick-tools wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.15.1/kitty-0.15.1.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c4bb7cc7458dc9d74b9e845936454de4
diff --git a/metadata/md5-cache/x11-terms/kitty-0.16.0 b/metadata/md5-cache/x11-terms/kitty-0.16.0
index 7a99f9fcf7a9..05af9d1ad70b 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.16.0
+++ b/metadata/md5-cache/x11-terms/kitty-0.16.0
@@ -4,12 +4,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
 EAPI=7
 HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug wayland python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug wayland python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr sys-apps/dbus sys-libs/zlib virtual/imagemagick-tools wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.16.0/kitty-0.16.0.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a9b9abd870190c1d788f9bc8d3f7954
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index 08370b10bf6b..aba8c93650ea 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -4,11 +4,11 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=A modern, hackable, featureful, OpenGL-based terminal emulator
 EAPI=7
 HOMEPAGE=https://github.com/kovidgoyal/kitty
-IUSE=debug wayland python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=debug wayland python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-1.5.0:= media-libs/libcanberra media-libs/libpng:0= x11-libs/libxcb[xkb] x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libxkbcommon[X] x11-libs/libXrandr sys-apps/dbus sys-libs/zlib virtual/imagemagick-tools wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.17 )
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
-_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1a9b9abd870190c1d788f9bc8d3f7954
diff --git a/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r1 b/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r1
index e0a77cddf581..010abbfbd5be 100644
--- a/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r1
+++ b/metadata/md5-cache/x11-terms/rxvt-unicode-9.22-r1
@@ -4,11 +4,11 @@ DESCRIPTION=rxvt clone with xft and unicode support
 EAPI=6
 HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html
 IUSE=256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel +perl startup-notification unicode3 xft
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.7-r6:= kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl:= ) gdk-pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXrender xft? ( x11-libs/libXft )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.22.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1fbde6abee2a1514fb5a4e6a1fee44de
+_md5_=7526d94d75f84679b66dd0a6ac77a0ec
diff --git a/metadata/md5-cache/x11-terms/terminator-1.91 b/metadata/md5-cache/x11-terms/terminator-1.91
index 2f01ead04075..b0c4d826c5e0 100644
--- a/metadata/md5-cache/x11-terms/terminator-1.91
+++ b/metadata/md5-cache/x11-terms/terminator-1.91
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/terminator/gtk3/1.91/+download/terminator-1.91.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b5b1af3e13f6fa27e3251c203b6dac0b
diff --git a/metadata/md5-cache/x11-terms/xterm-352 b/metadata/md5-cache/x11-terms/xterm-352
deleted file mode 100644
index 37860a5cc686..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-352
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig x11-base/xorg-proto
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( 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 sixel toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-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-352.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1e1b09d58d0d7a9bed0f04a76ca387f6
diff --git a/metadata/md5-cache/x11-terms/xterm-353 b/metadata/md5-cache/x11-terms/xterm-353
new file mode 100644
index 000000000000..907f0ffa58af
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/xterm-353
@@ -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-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 sixel toolbar truetype unicode Xaw3d xinerama
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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-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-353.tgz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=1e1b09d58d0d7a9bed0f04a76ca387f6
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index bede65ce37e7..72509b5a0f01 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.32.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
index c7b719af4a7f..bea44b253f7d 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
@@ -4,11 +4,11 @@ DESCRIPTION=GNOME default icon theme
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/adwaita-icon-theme/
 IUSE=branding
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 gnome-base/librsvg:2 !<x11-themes/gnome-themes-standard-3.14
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/3.32/adwaita-icon-theme-3.32.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9474757848fda0599f344a9e61ab9b42
+_md5_=a2df9932dbd3f8c48982e27159a5d401
diff --git a/metadata/md5-cache/x11-themes/constantine-backgrounds-12.1.1.4-r1 b/metadata/md5-cache/x11-themes/constantine-backgrounds-12.1.1.4-r1
index 2453568d0755..4cdfab16e17c 100644
--- a/metadata/md5-cache/x11-themes/constantine-backgrounds-12.1.1.4-r1
+++ b/metadata/md5-cache/x11-themes/constantine-backgrounds-12.1.1.4-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-2.0
 SLOT=0
 SRC_URI=https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/constantine-backgrounds-12.1.1-4.fc15.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ab975d211467d478108ec426f414c80e
diff --git a/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r1 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r1
index 96af58a7cb97..5d8f099ec067 100644
--- a/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r1
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-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
 SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=d613ef0da119ce49687134447cbda88a
diff --git a/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r2 b/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r2
index dc4fa276235f..0096f93d6dc1 100644
--- a/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r2
+++ b/metadata/md5-cache/x11-themes/fvwm-crystal-3.4.1-r2
@@ -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
 SRC_URI=mirror://sourceforge/fvwm-crystal/fvwm-crystal-3.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=1958e243888dae7c79af8cffb38e7f78
diff --git a/metadata/md5-cache/x11-themes/gartoon-0.5-r2 b/metadata/md5-cache/x11-themes/gartoon-0.5-r2
index a1242137a0c1..b6c8017c32ba 100644
--- a/metadata/md5-cache/x11-themes/gartoon-0.5-r2
+++ b/metadata/md5-cache/x11-themes/gartoon-0.5-r2
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare setup
 DESCRIPTION=Gartoon SVG icon theme
 EAPI=5
-HOMEPAGE=https://www.gentoo.org
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=amd64 ~ppc sparc ~x86
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gartoon-0.5.tar.gz
-_md5_=785cb8185dfd272036ea2cf97d982e23
+_md5_=d977744bedc2acf2b7a57b011c5ff269
diff --git a/metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2006.1 b/metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2006.1
index ecde87a562c3..32eb2caa0647 100644
--- a/metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2006.1
+++ b/metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2006.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=A collection of Gentoo Linux wallpapers for the LiveCD
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 ia64 ppc x86
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~wolf31o2/sources/gentoo-artwork-livecd/gentoo-artwork-livecd-2006.1.tar.bz2
-_md5_=d106a81e2b9600840d622bb91c88c51e
+_md5_=2deeefd442459012595e2d8551ff7459
diff --git a/metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2007.0 b/metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2007.0
index 28563fef11d9..c9461249d5fa 100644
--- a/metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2007.0
+++ b/metadata/md5-cache/x11-themes/gentoo-artwork-livecd-2007.0
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=A collection of Gentoo Linux wallpapers for the LiveCD
 EAPI=7
-HOMEPAGE=https://www.gentoo.org/
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~alpha amd64 ia64 ppc x86
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~wolf31o2/sources/gentoo-artwork-livecd/gentoo-artwork-livecd-2007.0.tar.bz2
-_md5_=d106a81e2b9600840d622bb91c88c51e
+_md5_=2deeefd442459012595e2d8551ff7459
diff --git a/metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1 b/metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1
index ed0fb38b9364..3a4b03fe1f6a 100644
--- a/metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1
+++ b/metadata/md5-cache/x11-themes/goddard-backgrounds-13.0.0.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-2.0
 SLOT=0
 SRC_URI=https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/goddard-backgrounds-13.0.0-3.fc15.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=ef0e8dea514fe63a5ca0abf6b9e1c188
diff --git a/metadata/md5-cache/x11-themes/greybird-3.22.11 b/metadata/md5-cache/x11-themes/greybird-3.22.11
new file mode 100644
index 000000000000..82115678ece4
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/greybird-3.22.11
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 dev-lang/sassc dev-libs/glib:2 dev-ruby/sass:3.5
+DESCRIPTION=The default theme from Xubuntu
+EAPI=7
+HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird
+IUSE=ayatana gnome gtk2 gtk3 xfce
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=CC-BY-SA-3.0 GPL-2+
+RDEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90
+REQUIRED_USE=|| ( ayatana gnome gtk2 gtk3 xfce )
+SLOT=0
+SRC_URI=https://github.com/shimmerproject/Greybird/archive/v3.22.11.tar.gz -> greybird-3.22.11.tar.gz
+_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=eab7d534259cc62c6a5b8a5b1f664a5e
diff --git a/metadata/md5-cache/x11-themes/greybird-9999 b/metadata/md5-cache/x11-themes/greybird-9999
index 8e3cf4b3cfd7..808fd659ca52 100644
--- a/metadata/md5-cache/x11-themes/greybird-9999
+++ b/metadata/md5-cache/x11-themes/greybird-9999
@@ -1,13 +1,14 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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=install postinst prepare unpack
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst test unpack
 DEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90 dev-lang/sassc dev-libs/glib:2 dev-ruby/sass:3.5
 DESCRIPTION=The default theme from Xubuntu
 EAPI=7
 HOMEPAGE=http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird
-IUSE=ayatana gnome xfce
+IUSE=ayatana gnome gtk2 gtk3 xfce
 LICENSE=CC-BY-SA-3.0 GPL-2+
 PROPERTIES=live
 RDEPEND=>=x11-libs/gtk+-3.22:3 >=x11-themes/gtk-engines-murrine-0.90
+REQUIRED_USE=|| ( ayatana gnome gtk2 gtk3 xfce )
 SLOT=0
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	git-r3	809e27702c573cbba31c08ed00bbad33	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=991c00e6fe1ce24d6db294dd8d278bd3
+_eclasses_=git-r3	809e27702c573cbba31c08ed00bbad33	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=dc0c00d33ba254216d4d075ecdb2a1cd
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 1aa8cc62ccb3..b50f76b943e8 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
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+2 standard engines and themes
 EAPI=5
 HOMEPAGE=https://www.gtk.org/
 IUSE=accessibility lua abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
 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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=434233ab3b07763e15069162516c0107
+_md5_=126f8ac54abbf61de1f59d24df8a54cb
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28 b/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
index dbe5d8f20ba8..8612b69019b4 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
+++ b/metadata/md5-cache/x11-themes/gtk-engines-adwaita-3.28
@@ -4,10 +4,10 @@ DESCRIPTION=Adwaita GTK+2 theme engine
 EAPI=6
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-themes-extra/
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-themes/gnome-themes-standard-3.20.2-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-extra/3.28/gnome-themes-extra-3.28.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	686eaab303305a908fd57b2fd7617800	gnome.org	532d56d07b9eace4831aaa817d2b756a	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	02d2553a7a1865bb34733f40f54b9491	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=70391cf5ad819840e32ec817e348f8af
+_md5_=3054c88ca9c99c1e927d1c9e0883b484
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1 b/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1
index 60f54488d650..31cd793f4629 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1
+++ b/metadata/md5-cache/x11-themes/gtk-engines-rezlooks-0.6-r1
@@ -1,13 +1,13 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/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=>=x11-libs/gtk+-2.8:2 virtual/pkgconfig
+DEPEND=x11-libs/gtk+:2
 DESCRIPTION=Rezlooks GTK+ Engine
 EAPI=7
 HOMEPAGE=https://www.gnome-look.org/content/show.php?content=39179
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.8:2
+RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://www.gnome-look.org/content/files/39179-rezlooks-0.6.tar.gz
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=7aa7563d4ac1c6687062bdada0b2058b
+_md5_=d1eef779de94d5b3d980f8d047550392
diff --git a/metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1 b/metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1
index a7aa0de7c316..b152c6717497 100644
--- a/metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1
+++ b/metadata/md5-cache/x11-themes/gtk-theme-switch-2.1.0-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=Utility to switch and preview GTK+ theme
 EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/g/gtk-theme-switch.html
-KEYWORDS=~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/g/gtk-theme-switch/gtk-theme-switch_2.1.0.orig.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=b407aafbe3e32f4bbe4946351139b292
+_md5_=3a480be10f9c6ba14bb3492e699d657a
diff --git a/metadata/md5-cache/x11-themes/laughlin-backgrounds-14.1.0.3-r1 b/metadata/md5-cache/x11-themes/laughlin-backgrounds-14.1.0.3-r1
index 1b2f2a784096..761accc9cd4d 100644
--- a/metadata/md5-cache/x11-themes/laughlin-backgrounds-14.1.0.3-r1
+++ b/metadata/md5-cache/x11-themes/laughlin-backgrounds-14.1.0.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-2.0
 SLOT=0
 SRC_URI=https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/laughlin-backgrounds-14.1.0-3.fc15.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=4436d6e9bb1b23f77cebee63643a023a
diff --git a/metadata/md5-cache/x11-themes/leonidas-backgrounds-11.0.0.2-r1 b/metadata/md5-cache/x11-themes/leonidas-backgrounds-11.0.0.2-r1
index e0171f325dce..41e41e6b152e 100644
--- a/metadata/md5-cache/x11-themes/leonidas-backgrounds-11.0.0.2-r1
+++ b/metadata/md5-cache/x11-themes/leonidas-backgrounds-11.0.0.2-r1
@@ -8,5 +8,5 @@ LICENSE=CC-BY-SA-2.0
 RDEPEND=!x11-themes/fedora-backgrounds:11
 SLOT=0
 SRC_URI=https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/leonidas-backgrounds-11.0.0-2.fc12.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=976898ea4157444761301d06571d3acf
diff --git a/metadata/md5-cache/x11-themes/lovelock-backgrounds-14.91.1.1-r1 b/metadata/md5-cache/x11-themes/lovelock-backgrounds-14.91.1.1-r1
index 21c4cc926c3e..6c207b11f3e4 100644
--- a/metadata/md5-cache/x11-themes/lovelock-backgrounds-14.91.1.1-r1
+++ b/metadata/md5-cache/x11-themes/lovelock-backgrounds-14.91.1.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/15/Fedora/source/SRPMS/lovelock-backgrounds-14.91.1-1.fc15.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=726751edfc4575fe2ad425b69eb2565f
diff --git a/metadata/md5-cache/x11-themes/papirus-icon-theme-20200201 b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200201
new file mode 100644
index 000000000000..3d9fa718a35a
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/papirus-icon-theme-20200201
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DESCRIPTION=icon theme for Linux
+EAPI=7
+HOMEPAGE=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/20200201.tar.gz -> papirus-icon-theme-20200201.tar.gz
+_eclasses_=gnome2-utils	532371cfcba45b2ab0d2950547c97d95	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e5eb1a2fbb136c4d94e149fc1eedf96
diff --git a/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4 b/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
index 57a85aa63267..ff82f5c99f45 100644
--- a/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
+++ b/metadata/md5-cache/x11-themes/redhat-artwork-5.0.8-r4
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/gtk+:2
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/redhat-artwork-5.0.8-4.fc7.src.rpm
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=18a9add08c87eeb478ab6742714cf154
diff --git a/metadata/md5-cache/x11-themes/solar-backgrounds-0.92.0.5-r1 b/metadata/md5-cache/x11-themes/solar-backgrounds-0.92.0.5-r1
index 7241e114779f..18dd83945351 100644
--- a/metadata/md5-cache/x11-themes/solar-backgrounds-0.92.0.5-r1
+++ b/metadata/md5-cache/x11-themes/solar-backgrounds-0.92.0.5-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-2.0
 SLOT=0
 SRC_URI=https://archives.fedoraproject.org/pub/archive/fedora/linux/development/15/source/SRPMS/solar-backgrounds-0.92.0-5.fc15.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=97f15e75e9dc3fd0c045e705b1df4e43
diff --git a/metadata/md5-cache/x11-themes/verne-backgrounds-15.91.0.1-r1 b/metadata/md5-cache/x11-themes/verne-backgrounds-15.91.0.1-r1
index 6e535d55fd0a..6d0c11596426 100644
--- a/metadata/md5-cache/x11-themes/verne-backgrounds-15.91.0.1-r1
+++ b/metadata/md5-cache/x11-themes/verne-backgrounds-15.91.0.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=https://archives.fedoraproject.org/pub/archive/fedora/linux/development/16/source/SRPMS/verne-backgrounds-15.91.0-1.fc16.src.rpm
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	b03b38188e1e83766244d2046785d562	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
 _md5_=fe4f3c327c6ae4c26bcbd28daa9c307f
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 22d8f6a3390c..5f2765b39b16 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-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index 627898fbb35f..01f2317b1877 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -11,4 +11,4 @@ RDEPEND=>=dev-lang/lua-5.1:0 luajit? ( dev-lang/luajit:2 ) dev-libs/glib:2 >=dev
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4207451a42e5ef79ae2ae879dc45333e
+_md5_=0e6567c2481e00291b679f0b3be556af
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1 b/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1
deleted file mode 100644
index 4555a2dbe5a1..000000000000
--- a/metadata/md5-cache/x11-wm/enlightenment-0.22.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=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.22.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
-DESCRIPTION=Enlightenment window manager
-EAPI=7
-HOMEPAGE=https://www.enlightenment.org
-IUSE=acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
-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.22.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
-REQUIRED_USE=xwayland? ( wayland )
-SLOT=0.17/0.22.4
-SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.4.tar.xz
-_eclasses_=meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37e6797f40ea93a04bc0dd5be13dc07e
diff --git a/metadata/md5-cache/x11-wm/enlightenment-0.23.1 b/metadata/md5-cache/x11-wm/enlightenment-0.23.1
index 29cd64c9ec0e..7153099af601 100644
--- a/metadata/md5-cache/x11-wm/enlightenment-0.23.1
+++ b/metadata/md5-cache/x11-wm/enlightenment-0.23.1
@@ -5,11 +5,11 @@ DESCRIPTION=Enlightenment window manager
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
 IUSE=acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland
-KEYWORDS=amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/efl-1.22.3[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.22.0[drm,wayland] dev-libs/wayland x11-libs/libxkbcommon x11-libs/pixman ) xwayland? ( dev-libs/efl[X,wayland] x11-base/xorg-server[wayland] )
 REQUIRED_USE=xwayland? ( wayland )
 SLOT=0.17/0.23.1
 SRC_URI=https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.23.1.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	10d1eb1da93c5fc17e3814e6923beb57	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c04c103b8b8eaafd569b0de446423a3
+_md5_=18ac32b544679972946474c493661da7
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.7.2-r1 b/metadata/md5-cache/x11-wm/herbstluftwm-0.7.2-r1
index 955a9c31eaec..805e767eea43 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.7.2-r1
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.7.2-r1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.24:2 x11-libs/libX11 x11-libs/libXext xinerama? ( x11-
 SLOT=0
 SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.7.2.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ee17a8a6371b37fbddffb8354d3e9a6b
+_md5_=cb6d5f55039f794a9ae26e3e17e922c6
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index 4407d192855c..bccddadbb4ef 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/glib-2.24:2 x11-libs/libX11 x11-libs/libXext xinerama? ( x11-libs/libXinerama ) app-shells/bash zsh-completion? ( app-shells/zsh )
 SLOT=0
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	809e27702c573cbba31c08ed00bbad33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=1539d7b934f7841f3cbe373cd081379d
+_md5_=4576b2781ad3c8c3daab4d397f40abb1
diff --git a/metadata/md5-cache/x11-wm/openbox-3.6.1-r2 b/metadata/md5-cache/x11-wm/openbox-3.6.1-r2
deleted file mode 100644
index 95ff3203d05e..000000000000
--- a/metadata/md5-cache/x11-wm/openbox-3.6.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
-DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] ) sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
-EAPI=7
-HOMEPAGE=http://openbox.org/
-IUSE=branding debug imlib nls session startup-notification static-libs svg xdg python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-python/pyxdg[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] )
-REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 ) )
-SLOT=3
-SRC_URI=http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=19737e790494fa07397c96a420fca633
diff --git a/metadata/md5-cache/x11-wm/openbox-3.6.1-r3 b/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
new file mode 100644
index 000000000000..2eb5feb27d1e
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/openbox-3.6.1-r3
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/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 setup
+DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) ) sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto
+DESCRIPTION=A standards compliant, fast, light-weight, extensible window manager
+EAPI=7
+HOMEPAGE=http://openbox.org/
+IUSE=branding debug imlib nls session startup-notification static-libs svg xdg python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 x11-libs/cairo x11-libs/libXau x11-libs/libXcursor x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) svg? ( gnome-base/librsvg:2 ) xdg? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyxdg[python_targets_python3_8(-)] ) )
+REQUIRED_USE=xdg? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
+SLOT=3
+SRC_URI=http://openbox.org/dist/openbox/openbox-3.6.1.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=46c761fec26a7b06bb8d895750fa0cc0
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 5e85e46b6b58..f69684329a45 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	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bdb47c797dab178c22f9544c592c0dce
diff --git a/metadata/md5-cache/x11-wm/qtile-0.14.2-r1 b/metadata/md5-cache/x11-wm/qtile-0.14.2-r1
index 865cd565244e..bb584ea668a1 100644
--- a/metadata/md5-cache/x11-wm/qtile-0.14.2-r1
+++ b/metadata/md5-cache/x11-wm/qtile-0.14.2-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/qtile/qtile/archive/v0.14.2.tar.gz -> qtile-0.14.2.tar.gz
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=2ea4a4ba580fc94168715b98530737f1
diff --git a/metadata/md5-cache/x11-wm/qtile-9999 b/metadata/md5-cache/x11-wm/qtile-9999
index 8ea68ebf0b2d..69ffc5bdf1ea 100644
--- a/metadata/md5-cache/x11-wm/qtile-9999
+++ b/metadata/md5-cache/x11-wm/qtile-9999
@@ -10,5 +10,5 @@ RDEPEND=x11-libs/cairo[X,xcb(+)] x11-libs/pango dev-python/setuptools[python_tar
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=test
 SLOT=0
-_eclasses_=distutils-r1	c576838cd67e384002a18edd54be710e	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
+_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	git-r3	809e27702c573cbba31c08ed00bbad33	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
 _md5_=2ea4a4ba580fc94168715b98530737f1
diff --git a/metadata/md5-cache/x11-wm/xpra-3.0.2 b/metadata/md5-cache/x11-wm/xpra-3.0.2
index 43007b11c2a3..ee9131978049 100644
--- a/metadata/md5-cache/x11-wm/xpra-3.0.2
+++ b/metadata/md5-cache/x11-wm/xpra-3.0.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) clipboard?
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-3.0.2.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e6f4068b4ecc6d4556a262c354e705b7
diff --git a/metadata/md5-cache/x11-wm/xpra-3.0.5 b/metadata/md5-cache/x11-wm/xpra-3.0.5
index 7f21690e919d..ec23f6756f09 100644
--- a/metadata/md5-cache/x11-wm/xpra-3.0.5
+++ b/metadata/md5-cache/x11-wm/xpra-3.0.5
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 ) || ( clien
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-3.0.5.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	c576838cd67e384002a18edd54be710e	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	00484e1be1aac73e24fca1c99557a7d6	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	c2993e4c430c1ee24f278983d6189501	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=19072ee4bbc60c8234ab5bc22809d774
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 714e6a25f890..5f72b1d6383c 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.10 b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.10
index 667855d9a776..35ff9da41d0e 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.10
+++ b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.10
@@ -3,12 +3,12 @@ DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-e
 DESCRIPTION=Simple application to manage Xfce panel layouts
 EAPI=7
 HOMEPAGE=https://git.xfce.org/apps/xfce4-panel-profiles/about/
-IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
+IUSE=python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/gobject-introspection dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?,python_single_target_python3_8(+)?] x11-libs/gtk+:3[introspection] xfce-base/xfce4-panel
-REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) python_single_target_python3_8? ( python_targets_python3_8 )
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) dev-libs/gobject-introspection python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] xfce-base/xfce4-panel
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-panel-profiles/1.0/xfce4-panel-profiles-1.0.10.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3cee59da772b8eeb3d37e346e21676c9
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	fdfdbe462f245e931069310e892a8538	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=510a1a3e9ebc7819ef671ee580a7f5de
diff --git a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.9 b/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.9
deleted file mode 100644
index ce55f3edd6c6..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
-DESCRIPTION=Simple application to manage Xfce panel layouts
-EAPI=7
-HOMEPAGE=https://git.xfce.org/apps/xfce4-panel-profiles/about/
-IUSE=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 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) dev-libs/gobject-introspection dev-python/pygobject:3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_8(-),python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] x11-libs/gtk+:3[introspection] xfce-base/xfce4-panel
-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://archive.xfce.org/src/apps/xfce4-panel-profiles/1.0/xfce4-panel-profiles-1.0.9.tar.bz2
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=daa0c560880465d1bc618782d10b26be
diff --git a/metadata/news/2020-02-07-python-2-7-eol/2020-02-07-python-2-7-eol.en.txt b/metadata/news/2020-02-07-python-2-7-eol/2020-02-07-python-2-7-eol.en.txt
new file mode 100644
index 000000000000..fb9c16ed55f8
--- /dev/null
+++ b/metadata/news/2020-02-07-python-2-7-eol/2020-02-07-python-2-7-eol.en.txt
@@ -0,0 +1,51 @@
+Title: Python 2.7 went EOL
+Author: Michał Górny <mgorny@gentoo.org>
+Posted: 2020-02-07
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: dev-lang/python:2.7
+
+Python 2.7 has reached its end-of-life by 2019-12-31.  Python package
+upstreams have started removing Python 2 compatibility code from their
+packages more aggressively.  This includes common dependencies such as
+dev-python/pytest, dev-python/setuptools and dev-python/sphinx.  While
+we realize that many packages are still dependent on Python 2, providing
+full support for it exceeds our maintenance capabilities.
+
+Upstream is planning to make one more release of dev-lang/python:2.7
+in April 2020.  We are going to continue maintaining and patching
+the interpreter for as long as it is feasible, most likely even after
+all Python 2 packages are gone from Gentoo.
+
+At the same time, we are actively working towards switching
+the distribution to Python 3.  Whenever possible, we are removing
+Python 2 support from packages.  It will remain available for
+the packages missing Python 3 compatibility and their dependencies
+for some more time.  However, packages that have little chances of being
+ported will eventually be removed.
+
+If you are still using Python 2 for your projects, we strongly recommend
+you to migrate away.  For the time being, it is preferable to use
+dev-python/virtualenv or a similar solution rather than ebuilds,
+to install the dependencies for your projects locally.
+
+Regular Gentoo systems will be migrated off Python 2 gracefully.  It may
+be necessary to use --changed-deps or a similar option during system
+upgrades whenever they become blocked by Python 2 packages installed
+earlier.
+
+If you wish to remove Python 2.7 entirely sooner, you can try removing
+python2_7 from PYTHON_TARGETS.  However, this will require adding
+explicit package.use entries if some of the installed packages still
+require Python 2.  An example package.use entry follows:
+
+  # disable py2.7 without altering the other flags
+  */* PYTHON_TARGETS: -python2_7
+  # enable py2.7 for setuptools
+  dev-python/setuptools PYTHON_TARGETS: python2_7
+  # switch a single-impl package to 2.7
+  dev-embedded/libftdi PYTHON_TARGETS: python2_7
+  dev-embedded/libftdi PYTHON_SINGLE_TARGET: -* python2_7
+
+Note that package.use entries are not necessary for packages that
+support one implementation only (i.e. do not support Python 3 at all).
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 8ace0abd1714..ba86ee518f9b 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 12822 BLAKE2B 25e978ab1a0640a70d05ff94260cf7305dd59fb3ba256c0504271b22a88d8ef9a10f450812837a0e93078a59b20ab74a8e1111f487063ed13658e506a0c5e6ee SHA512 8e7f8e822b2dd138621b5b3ebaae613cb476c21f14e22bb24e9851dc77bd6b2064a1d95787173ce75ef39bb0850e0fa6a364201f76dbaa83ee08b46debd72f80
-TIMESTAMP 2020-02-05T17:38:58Z
+MANIFEST Manifest.files.gz 13002 BLAKE2B 47e7135a6a305185482ecd03c9679ad57a3a6b2c2960a15e2ff9bd1141ba078ea01d13d5bce936f860090db1a93d8226d869a2594d126db9ed34cf0ed5907801 SHA512 fdddccc915b4305e95506ac62eccf0d13e35b757d53e29ea36e8894697c26bdb906b011e6465bb8a6bec7f2dc0853d3e7b36336c72ab7a013b59fd2c277c7b98
+TIMESTAMP 2020-02-10T20:08:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl46/bJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl5BuFhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAVHw/+L9F7Uxf2pSfQ/cLMeOw22IQ8mfzimZGU8P1IakRFuotzJwbrnEZyzvyn
-V5nH/7WsfX1VqBmfeqfxAGaFu8VxVcuE0Kryw6rwoysH2uy5T6/FZdv59h5/qmHh
-s4P5KiWEUeTaqig0B3Q6Hjwf1nk8SZ3RMv96gvmKgC/G4P5efRUWZ5yvex0hTjMw
-wJDqwZ8m5DW8NFF0VWvazc8stbhQ8OxMzDk0Kab4+Up5CMEq8vbpYaCTFOAqx1DO
-QhfnCcg+sAXS5ZIwpVEUHk92Rn5FldV274clmuzXLoBS4XGBtlER39MKcR79YhY2
-eyJJkId9TDa3NqTb9J9tQhILeJ+XTbY/bOdiuryL+EGW00d3n5vtMQoQmeK3E2o9
-Yr++VAm7j+jrEndXkMUM6+gT6tJwOCYrxm5iRcZjmeaN8Esqr6dEugiQS9hlX49D
-RAmok9Z3oA8XsbsuA8FmS332FHmW2nhhObBgfTKkOlAVq6xFK6PqE+LUrplPuQQD
-Ig+xhk+G8D5OxjJZdhetX8s1jpl//84rn9Q+M/kD4vveDwu3EpnSXec8slOIjQpv
-fxKAhMvWlX12qS6Txtm/MGS8FDdWdd/e2La2UdYcOkEE15G5x6ELueY/kV34k8uz
-KENpfPSRgtSuMNOg4MfDCV7qj0+WwV7mxGsh0VxmMMwFLShktoQ=
-=ZDPn
+klCTMhAAlATRYXFyTWoc7q08LvnB5+OQA9z4PZY9H4w7gemTBWmxA+JeoCBcE5aW
+mv9uONeilJCAaxr6pZkI4aB8BMt/Z9KnJzLHnDbCqfapkHSbaX1YFfJSEjApndP2
+KfJ63Tms5IF2XE+PBEYK82CI4xUTDndrBbdm58DCjjdcCuIk7rLJ/ZveBZzoXbzm
+MhKHg2UVorRrkXwd57rjAMspDzLHLcT+w5tCtl8fWEaOLrEE8GxgHrBiLh7W6La6
+mqgoSBjNaDP+mYxaMvmoaQoNExNZ5sxyWlETcmwZAEvCAirAJtpelDHTEWa6DpXZ
+nU5xvMysvFqxLe9W0ZNRgTg1Co9iAYzryUEeeEUIQOUtSfklnntqytOZr9B61SO3
+QbM8eqxPBQJPsUx9Srg/zhfflh/fYqoKNyHAGNCPsFKsC2+vqEgBJYLm4TGJvpbi
+lUWeRyQRnzsHoeuPZgpD1Pu/Bp7uzzoQLPjXRX8lZBZMA0CSfr9RFUhQePWdFtX6
+EiNcM4pxLhHP7mKT2OxRbdF8otjNolrg8VhOPzavek9Y7qQ2wjG4/g4HymhgHz49
+QTEo03kxt8IzwXC6kh8NtTl6qoUevF2bNpXz771fOcA5pqJOQaB2wNRLR0qk6pXM
+79GtQfY1zPQDOqfKicvcFX8JA/Fg6OEtQRLOEVR2EXmvGYDeJvs=
+=daIp
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index addd6b936306..d9d1a60c8d10 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f997de2c7d66..be70808d571a 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Feb 2020 17:38:55 +0000
+Mon, 10 Feb 2020 20:08:53 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 6e80c4d926e4..a35a8357ed5f 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-b5869a4f4a80c5804d7abfbdfbbd8c9ee3ee2e53 1579814715 2020-01-23T21:25:15+00:00
+bb6ecae5a95bc13b2ec01a5bf3188d87df9a0c2c 1581078273 2020-02-07T12:24:33+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 3e70d51631e8..9646b9110757 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed 05 Feb 2020 05:38:55 PM UTC
+Mon 10 Feb 2020 08:08:53 PM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f8b21fd56d19..daf0102ec1ce 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Feb 2020 17:45:01 +0000
+Mon, 10 Feb 2020 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 42334f27805f..db1aaed89dd0 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-bfbe32b820eb09aa0d3cab234b55a6bdc848543d 1580924125 2020-02-05T17:35:25+00:00
+c0ac2dc88c96c416b7b14757c374849927146104 1581364718 2020-02-10T19:58:38+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 23520526d1f9..7410d5014f14 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1580924101 Wed 05 Feb 2020 05:35:01 PM UTC
+1581365101 Mon 10 Feb 2020 08:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f997de2c7d66..be70808d571a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 05 Feb 2020 17:38:55 +0000
+Mon, 10 Feb 2020 20:08:53 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b2c39895e38e..569a4f4a0003 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/authforce/Manifest b/net-analyzer/authforce/Manifest
index 84990f34b8f7..6bc37f12e06e 100644
--- a/net-analyzer/authforce/Manifest
+++ b/net-analyzer/authforce/Manifest
@@ -1,5 +1,9 @@
 AUX authforce-0.9.9-curl.patch 227 BLAKE2B e241e1ca54a51a39d8d57036467a892812c070609892fb2eaa44aec7c9ef4430f6f2b3fe59fb316fa2b3199375ea4f03299bae13ef38b23c3a088d4fb2ea83b5 SHA512 15467c0e12cf3739ef786ace9a8e83ee6e443681ecdc58c9c9258307036c66db35556400d8baaf44cb17e1c322db5bd52da8570a5a8c05506f2b7624e0ec3563
+AUX authforce-0.9.9-fix-parsing-of-sample-config-file.patch 1518 BLAKE2B 28216a6011065365bde5cb21b794181ef5da9592036190cad28e186feafd2fb61f98f1a7b489ef67aab4aca91ec177428d50db56df45aeef6752dc7a5d0ec96a SHA512 3e80da0fc91ad750d2c7ce1e97d42fb43bbdef018c366dc849206ac6327f643ba9208f8c97fe5823bf1ff265bcf11d30a905df23f49f6723796fc44a6919bfc3
+AUX authforce-0.9.9-fix-submit_dummy_list-re-declaration.patch 674 BLAKE2B fe773755eea616de618f748e0d917f5675a1b52cde43050ee0a4bd70abe50c22ed8a231eb65b1ce2c421e367963b40feb3f87f6b0ca4944c153b7254c233bd05 SHA512 a227bc06b34e2df5b82b884fedc99e205855a09c667ffdd2e4f6a3f455f470a9c22dde3ab355cf958165875411034327fb53ce0ad1c33da6ce15de6fe0af5be0
+AUX authforce-0.9.9-fixes-for-Wall-warnings.patch 2867 BLAKE2B 20289a3409c5aff4a58094039abdda48efd5d1af30c1ece802381295ddbd358a6b0b5998c69f80a89866cbd3739db143a504991cabd4cdf440f16993e83206de SHA512 bced2b7a28c5da2cb6615a791d258d786da66abc5d30e4a2be8cab63b2faa893eb63103122051ade275bad311944ff8c8595cd33f596625727167cf7a1f640cd
 AUX authforce-0.9.9-locale.patch 325 BLAKE2B 4379902c336744609ecd3a0a3d4039a10b83fe8ab3859d6e7faf9fd4aef3a74fc55f05f6c2fead2898bf112f1da774fa7c3ef54fae543d8af8bb9cd62e19e02d SHA512 0aa863400f54709a726fd2913d2d6039d3591221f9fcf60c843a3a24a2191f9eab70dd03cc574dc34cbc7e2824a58071b7167cc291f7e5cfad13da6e145f9206
 DIST authforce-0.9.9.tar.gz 424557 BLAKE2B 3b962f7c3d445525364b8e40e3b47d0c951e04b7b5d40077540b1dc34721aca5163f9328451f23b7f1891d3a5440d003568ca6eb5104a523bdccb33ade61546d SHA512 fd94c6ac5f98f480af4acba2de7c0ad81dbc4c759cce8f3f722dcf8870b0c16a9e7d462f4542784737e021f9c8d480b26895dddb4d5953f730ff8a181ad474b3
 EBUILD authforce-0.9.9-r2.ebuild 872 BLAKE2B 71560cdde0fa460b22953a85ea0f6a2b3d8c8d149acd4c31224c02c2fde9b8df903d01ed74dd1ec7aaeaa9cbf9ead9e7a8dfba688ad74e71a813332a97e6c2a4 SHA512 64920923498c8532fc64f8147a42383c0d60a1abbeb8cb3305fa36b14086fcd94103dfcadf3b63c1dde23e05c467e55163f3fae902dadff5f4372047b800a7e1
+EBUILD authforce-0.9.9-r3.ebuild 1047 BLAKE2B d52edda68977f6fee8a21fa7b61361d77afbde4dbe2f3651f72b404c86fdf0fc4ced3504666456ab9797dfb7ed23400246f0fc4ba2dbdb80df2ae952b248126d SHA512 a66f1c99632be37f3b5c189ede27130093effd6d05428f21c3f4210c104ce741f05f11fa778f7a002ba8d0f6d57550265e37c75847375d6f46a7db35da4dc865
 MISC metadata.xml 382 BLAKE2B 2a1952e7ba3806db62d8b3c6d1251af18707ddca296b137c786fb6713a75b472446f5b9f7746d51eedd58408cb429868886fba43bf78fbef5b33dc7a4897a069 SHA512 9db5772c5ccd05d53b3c6bb2fabe790348fa3933d95eae80e4347bb781b58bce870f4d3ea2fe9feccf7dccdffcaacca081231069774c345162d0d8219f8144d6
diff --git a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild
new file mode 100644
index 000000000000..183912b43cae
--- /dev/null
+++ b/net-analyzer/authforce/authforce-0.9.9-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An HTTP authentication brute forcer"
+HOMEPAGE="http://www.divineinvasion.net/authforce/"
+SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl nls"
+
+RDEPEND="sys-libs/readline:0=
+	curl? ( net-misc/curl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-curl.patch
+	"${FILESDIR}"/${P}-locale.patch
+	"${FILESDIR}"/${P}-fixes-for-Wall-warnings.patch
+	"${FILESDIR}"/${P}-fix-parsing-of-sample-config-file.patch
+	"${FILESDIR}"/${P}-fix-submit_dummy_list-re-declaration.patch
+)
+
+src_prepare() {
+	default
+	gunzip doc/${PN}.1.gz
+	sed -i -e "s/${PN}.1.gz/${PN}.1/g" \
+		-e "s/\/mang/\/man1/g" doc/Makefile* || die
+}
+
+src_configure() {
+	econf \
+		$(use_with curl) \
+		$(use_enable nls) \
+		--with-path=/usr/share/${PN}/data:.
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+}
diff --git a/net-analyzer/authforce/files/authforce-0.9.9-fix-parsing-of-sample-config-file.patch b/net-analyzer/authforce/files/authforce-0.9.9-fix-parsing-of-sample-config-file.patch
new file mode 100644
index 000000000000..902b2a086e0d
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.9-fix-parsing-of-sample-config-file.patch
@@ -0,0 +1,54 @@
+From 294ef3529016c29769d10dee9e5f639c2ce02b91 Mon Sep 17 00:00:00 2001
+From: "Zachary P. Landau" <zlandau@jellofund.net>
+Date: Wed, 5 Feb 2020 23:18:31 -0800
+Subject: [PATCH 3/4] Fix parsing of sample config file
+
+This code is horribly broken, but we should at least be able to parse
+the authforcerc.sample file, and report the right line number when
+failing.
+---
+ src/config.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index 4462fcc..66313d9 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -11,7 +11,7 @@
+ #endif /* MEMWATCH */
+ #include "extern.h"
+ 
+-#define BUFFER_LEN 82
++#define BUFFER_LEN 100
+ #define IS_BIT(x) (!strcmp(x, "0") || !strcmp(x, "1"))
+ 
+ static void process_boolean(char *option, char *value, int *variable) {
+@@ -30,7 +30,7 @@ void parse_config(char *config) {
+ 	char *option;								/* config file option */
+ 	char *value;								/* value for option */
+ 
+-	int line_number = 1;
++	int line_number = 0;
+ 	char *chop;
+ 
+ 	/* MEMWATCH: reports this isnt freed, why? */
+@@ -45,6 +45,7 @@ void parse_config(char *config) {
+ 	}
+ 
+ 	while (fgets(buffer, sizeof(buffer), fp)) {
++		line_number++;
+ 		if (buffer[0] == '#' || buffer[0] == ';' || buffer[0] == '\n')
+ 			continue;
+ 		remove_crud(buffer);
+@@ -123,8 +124,6 @@ void parse_config(char *config) {
+ 		else
+ 		if (!quiet)
+ 			printf("parse_config: option %s is not valid\n", option);
+-
+-		line_number++;
+ 	}
+ 
+ 	debug(3, "parse_config: read %s [%i]\n", config, line_number-1);
+-- 
+2.25.0
+
diff --git a/net-analyzer/authforce/files/authforce-0.9.9-fix-submit_dummy_list-re-declaration.patch b/net-analyzer/authforce/files/authforce-0.9.9-fix-submit_dummy_list-re-declaration.patch
new file mode 100644
index 000000000000..e6ca243fcad7
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.9-fix-submit_dummy_list-re-declaration.patch
@@ -0,0 +1,25 @@
+From d7f718e78444acef635acdd19e34dc4783e741fa Mon Sep 17 00:00:00 2001
+From: "Zachary P. Landau" <zlandau@jellofund.net>
+Date: Wed, 5 Feb 2020 23:00:06 -0800
+Subject: [PATCH 1/4] Fix submit_dummy_list re-declaration
+
+---
+ src/extern.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/extern.h b/src/extern.h
+index 6798bd7..cc08e0a 100644
+--- a/src/extern.h
++++ b/src/extern.h
+@@ -61,7 +61,7 @@ extern void initialize_submit(void);
+ extern int submit(char *username, char *password);
+ extern void shutdown_submit(void);
+ #ifdef USE_DUMMY
+-char **submit_dummy_list;
++extern char **submit_dummy_list;
+ #endif /* USE_DUMMY */
+ 
+ /* files.c */
+-- 
+2.25.0
+
diff --git a/net-analyzer/authforce/files/authforce-0.9.9-fixes-for-Wall-warnings.patch b/net-analyzer/authforce/files/authforce-0.9.9-fixes-for-Wall-warnings.patch
new file mode 100644
index 000000000000..083bb93d1296
--- /dev/null
+++ b/net-analyzer/authforce/files/authforce-0.9.9-fixes-for-Wall-warnings.patch
@@ -0,0 +1,111 @@
+From ef74da31208f1390bbc17d4c455c821f141ec78b Mon Sep 17 00:00:00 2001
+From: "Zachary P. Landau" <zlandau@jellofund.net>
+Date: Wed, 5 Feb 2020 23:17:50 -0800
+Subject: [PATCH 2/4] Fixes for -Wall warnings
+
+---
+ src/files.c   | 10 +++++-----
+ src/http.c    |  4 ----
+ src/methods.c |  4 ++--
+ 3 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/src/files.c b/src/files.c
+index 1068616..92d45ac 100644
+--- a/src/files.c
++++ b/src/files.c
+@@ -70,7 +70,7 @@ char **textlist(char *textfile) {
+ 
+ 	/* MEMWATCH: this isnt freed, why? */
+ 	wordlist[count] = malloc_w(sizeof(NULL));
+-	wordlist[count] = (char)NULL;
++	wordlist[count] = NULL;
+ 
+ 	fclose(fp);
+ 
+@@ -83,7 +83,7 @@ char **copy_list(char **list) {
+ 	char **n_list; /* new list */
+ 
+ 	/* find num of elements */
+-	while (list[i] != (char)NULL) 
++	while (list[i] != NULL)
+ 		i++;
+ 	/* plus one for NULL */
+ 	i++;
+@@ -91,12 +91,12 @@ char **copy_list(char **list) {
+ 	n_list = malloc_w(i*sizeof(char*));
+ 
+ 	i=0;
+-	while (list[i] != (char)NULL) {
++	while (list[i] != NULL) {
+ 		n_list[i] = (char*)strdup_w(list[i]);
+ 		i++;
+ 	}
+ 
+-	n_list[i] = (char)NULL;
++	n_list[i] = NULL;
+ 
+ 	return (n_list);
+ }
+@@ -104,7 +104,7 @@ char **copy_list(char **list) {
+ void free_list(char **list) {
+ 	int i=0;
+ 
+-	while (list[i] != (char)NULL) {
++	while (list[i] != NULL) {
+ 		free(list[i]);
+ 		i++;
+ 	}
+diff --git a/src/http.c b/src/http.c
+index 88acdfc..397ac1f 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -40,7 +40,6 @@ int submit(char *username, char *password) {
+ 	CURLcode result;
+ 	char error[CURL_ERROR_SIZE] = "";
+ 	char authstring[92];
+-	time_t before, after;
+ 
+ 	
+ 	num_connects++;
+@@ -59,8 +58,6 @@ int submit(char *username, char *password) {
+ 	} else
+ 		printf("trying %s->%s\n", username, password);
+ 
+-	before = time(0);
+-
+ 	if (curl) {
+ 		curl_easy_setopt(curl, CURLOPT_URL, url);
+ 		curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error);
+@@ -79,7 +76,6 @@ int submit(char *username, char *password) {
+ 		result = curl_easy_perform(curl);
+ 	}
+ 
+-	after = time(0);
+ 	/* num_connects jumps the gun earlier on */
+ //	acs = stats(acs, after-before, num_connects-1);
+ 
+diff --git a/src/methods.c b/src/methods.c
+index 3c74c65..bdb6efc 100644
+--- a/src/methods.c
++++ b/src/methods.c
+@@ -76,7 +76,7 @@ char *transform(char *username, char *password) {
+ 
+ 	strncpy(old_password, password, sizeof(char)*41);
+ 
+-	while ((cur_element = elements[i]) != (char)NULL) {
++	while ((cur_element = elements[i]) != NULL) {
+ 		if (!strcmp(password, "{username}"))
+ 			strncpy(insertion, username, sizeof(insertion));
+ 		else if (!strcmp(password, "{emanresu}"))
+@@ -120,7 +120,7 @@ void common_pairs(void) {
+ 	}
+ 
+ 	while (1) {
+-		if (common_pairs_list[i] == (char)NULL)
++		if (common_pairs_list[i] == NULL)
+ 			break;
+ 		strncpy(username, common_pairs_list[i], sizeof(char)*81);
+ 		password = extract(username, ':');
+-- 
+2.25.0
+
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
index c24b47de0e13..fdab36185a64 100644
--- a/net-analyzer/bigeye/Manifest
+++ b/net-analyzer/bigeye/Manifest
@@ -3,5 +3,5 @@ DIST bigeye-0.3-gcc34.diff.bz2 2774 BLAKE2B 51b1c4702b65b3e6b484d17e500b00d26bd1
 DIST bigeye-0.3-gcc34.patch.xz 2564 BLAKE2B 17508c780f339aa2409616aa2bd4e37c3e9f8ba48626e9a3782ea60da2989d4a8543c8a97cecef34554265385b13019d3bc04a05c8809870e0cba20c72a76bf8 SHA512 c7005975a7b798521f0d8f7b646f168ff215c1b5a760e303f7cad8bb78e2324e8303f77a724bc6902ef7ee525d7e6dd5ccfdf366c39abcc436fc6edf503205af
 DIST bigeye-0.3.tgz 32462 BLAKE2B 509e958852d958f5fbb7197e567f8ebd1d7004027e4d8f3fe868d3af6719f76e445890a241d4438609b12695bd403fa246cec03b382a2c339d23c1456aa198e0 SHA512 73a146fd2f5df86a3d16dec05cf3f278393347f341a5cc319feccf6d23e1f2fe9d29070ac154a5b2336ade146843ab163e3545e9aefad1a0fa8903928d9b1ed0
 EBUILD bigeye-0.3-r3.ebuild 826 BLAKE2B 256f3468799929d0d3d15a4502756bb3c867aaf4e7b43e36970b3b8e0a8acc4d7af3f21d1a27873af05a2df33b5c9c7fc69b6a4a9b022ab012231e9dc5ebd504 SHA512 5e55b334a0201118cf00363a29c86846573666bb01709858d1f8955473aba0526da6e52c7b59dcb34dabff0081946a262afca27c6fe0dd0f004aa8e9b15efaf7
-EBUILD bigeye-0.3-r4.ebuild 837 BLAKE2B 4cee36264c8cdb5054c699d76b659987779b6b3450338a5b5463b490190ab263da46886cf79671d3cf419ee53cc795943cd36121aa6999927cb4ee233f4b6585 SHA512 b26a4f59598031bfcbd2c8bd82ed7b86764059c5a3e817a765516c7cd750f8f42890204e3063fb151fe74a43f44c51b0f5fc3e17bc9cf623a7995377b9c1cf14
+EBUILD bigeye-0.3-r4.ebuild 874 BLAKE2B ecd30f594b2ad015732344e249776b964a7fea18afc2668581cf710e1a08393290e6aad5925bb44441ca3339cbbc220da3436c216ebc3ea9ae9c11d5c68c7c97 SHA512 86a3afa38971842b7765731931c107e460fffbc1df0fbc075e23028a83f343a1eaade1cd84df8ca15741ab97dd0d4f1e3931778ced23a9bb7ea28d17945bdf12
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
index e92408b8df42..b349042d1ded 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="network utility dump and simple honeypot utility"
 HOMEPAGE="http://violating.us/projects/bigeye/"
@@ -27,6 +27,7 @@ src_prepare() {
 }
 
 src_compile() {
+	append-cflags -fcommon
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} src/bigeye.c src/emulate.c -o src/bigeye || die
 }
 
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index de6b15f08f3d..a235a3fa2f5d 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,6 +1,8 @@
 AUX cacti-spine-0.8.8d-ping.patch 260 BLAKE2B 4c6ac12fcb0fd31f6e53e46e5de39f34c565ee8ae1dbc947949ded2cc65816f697b6f4de40e0441c710b092f30a3b1eadf292b1065a17f385327c70071ca9713 SHA512 5bd91a390e352930d2b89f580fb0c3e93dfa9d52c86b16a0b8c036452088757e2b739aae05b3f07301a3ed94dafe6f05cc593b28359261b6664d002c907cfb49
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
 DIST cacti-spine-1.2.8.tar.gz 106801 BLAKE2B 813d4b6d4a4a632cc6d59c5c4eeeb37df78995ca5952e77204a9b5f8b599b34fe043b9f8c1ae81ad20600c08403ff06c04119db53bb03e37788fc11e5e39be6a SHA512 7f9a90f5e41a8a72d0068321b119f5ed7768fd7939bf5a994627b2f199158440639e88d31da35444e28fb73f8dbb57c1012f01ae09d24f0478d8e75a21bb942a
+DIST cacti-spine-1.2.9.tar.gz 106572 BLAKE2B 803d16b6708e4cc5fc5ea9a5cb49bfd535fea421a873ce9baf74e1de75597a5a4941a909219d729e291ff3201c0f9c2a8304381144d935778ef331779395c688 SHA512 668b25cb89fad331ae4bc726b797bbeade74c90500af348748a995be0de2f699264cd24e98ea709214453328058e1dba6399dca2074bb6ce71e0d4b434b9dee4
 EBUILD cacti-spine-1.2.8.ebuild 932 BLAKE2B 3e2b4334458dcc925064bb077de3ca579f77c4ea9ca1e9f3be99d83ca588c55a83bd692fde51a1e72120e8bbf803cddbc1c01b08bc17545018267b876bb5fdd4 SHA512 8d15cdfd14fdd29e7ce8aa205e8ad0a44c9763c774582d161840cabb1655f9ebbd47fe3c1610c056e16b77d62e1ab1679289ff05b4cb070cbfffa8609586e689
+EBUILD cacti-spine-1.2.9.ebuild 897 BLAKE2B 758281b5f3c9e1449012bcc8448ef79e90bc8930d16348316845721e3e2fe9d6aea8ab3599c3999199d5cfa2bbc92d93d2e485b29f9d4fa1fcb6989dd597495e SHA512 3fa686c3532650697c71c6630200cfe142dc24e9c224e82f5dfb89f40f665dc319e01276a21374025ad9f3eeb2c4dc109e13e0b2883cb26cfb5099f5cee6c3dd
 EBUILD cacti-spine-99999.ebuild 884 BLAKE2B 5df3c6c34e5b6d1fdf833d49a5a4cd1e9c6137199bd54879f47f632059b8cfa1d836d68f3f0abf126f66a0f78e6c3166a322b86df6f1b8f2acd709691f1e22b1 SHA512 7d2dface1745bc2847de70b2b8067822438b4d51d0039e1e9a9e4599d2ff64cbdc2d2e431a7e6d81694c1c23158a2f1f99cada8f374eff60a31ef9da6e6c0566
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild
new file mode 100644
index 000000000000..a5c1da23c064
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="https://cacti.net/spine_info.php"
+SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="libressl"
+
+CDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-analyzer/net-snmp:=
+	dev-db/mysql-connector-c:0=
+"
+DEPEND="
+	${CDEPEND}
+	sys-apps/help2man
+"
+RDEPEND="
+	${CDEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin spine
+
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+
+	doman spine.1
+	dodoc CHANGELOG
+}
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 2a27bff4175d..2b5bb656e4b6 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,4 +1,6 @@
 AUX postinstall-en.txt 2249 BLAKE2B ec7a32177aca0ebec0194fc4dee825251a5ac71c1005c41f91ba7e7da690e8b3734312b7df5ef506aea771284264035517a73c12d37be1e9479dea7e6e5a99d4 SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623
 DIST cacti-1.2.8.tar.gz 24881361 BLAKE2B 181b2eebf43c81a221b65eb9391ad758c05bb5871a35766a1f5323f453a0a6a533a1120963e04f7a01d4ac444942e37bf50a3c6cebe5f7261558142baad2f282 SHA512 e24d9de47a06c1741c7bcfe5c5f68a5a0f0cc2eb859fc930ced28f797f84ad537ff1a0a703dc8c26735cc4b54ba09699e33a30ac666e1f8ec2ec26ae4ceccde3
+DIST cacti-1.2.9.tar.gz 24906227 BLAKE2B 65a4459f9f55c55db853f81bcac6c60f146ba50f6dfd0abde449a41847afdb8564452ede1a493291c19ee7732ccc4a76d485af078021c7e0fcb6d1b265994940 SHA512 e50eb5587dc0274788b35cb701383ba897ab7c45a65efc7a8d32963b492c1ff1b96b0271ab7b6f9b53ad7dff5dd66b3ce4bd4a91c3ecf8ccd8d4b19b3ac972e4
 EBUILD cacti-1.2.8.ebuild 1010 BLAKE2B 9c967abbc8ab2e20b2b4dc8c54b5ff933fde488f5321f5bcce7459a97786f70a35a1162b92194f77b9b886e714b6b3b9f2488476f753488f445290d89ec088aa SHA512 ddd995b9afc9f7c9c1a8f95b824ad56a498b8d210f71bf81deecc4b823e6e4b6c9a6142343bd06e70db202c3dd8bcd7e2d0cc06dfdfbdca0d6face2ed0fae424
+EBUILD cacti-1.2.9.ebuild 1014 BLAKE2B 6a411ccf50676e6fbe8f67144d445a7519318ccf83f7003ad9b322ff8cd0c4871c8b582e646041ca1920fda51f6c7dd96f9e598eb0195a4e22abd603c5bd4d3a SHA512 a564373a907200a00816b135240c10eb1dc8741dbcb88a2488e43a4794be0194b470b55e31c481ccc36b75d1b7dd6a2ed761bc48f02944562785db311b35fe8b
 MISC metadata.xml 834 BLAKE2B 964a66f49027e0190434a6fe4dfdabd9153cb9a44b8b23ee1a0331e9c38a9ca1480b35412a2088d2ffc7feba6232330e26c8156b4461d663cb8c3bebbdf0e250 SHA512 f74b807c0629400ad06ee2b03650be38524268b2590d455ab4b672bc2c6c13856f881226a7c1d6e74e1acb6f85abc3d5bd311abaa6571216aca7698e8368e616
diff --git a/net-analyzer/cacti/cacti-1.2.9.ebuild b/net-analyzer/cacti/cacti-1.2.9.ebuild
new file mode 100644
index 000000000000..66775efc3b40
--- /dev/null
+++ b/net-analyzer/cacti/cacti-1.2.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="https://www.cacti.net/"
+SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,pdo,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_compile() { :; }
+
+src_install() {
+	dodoc CHANGELOG
+	dodoc -r docs
+	mv docs .. || die
+
+	webapp_src_preinst
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index a40b72523f82..d0fd73d7e2e1 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,9 +1,9 @@
 DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f
 DIST fail2ban-0.10.5.tar.gz 520460 BLAKE2B 872b1b2d96d5c79b228cf7c38923161336e452c33fddce75d25004454a5b5d119d435aeb789d55576de4e24bbf8d8288d9fc2fb3f17323074a27857a08e3c6a4 SHA512 d2ad64999031537f2adfc01efd02d2db0718485e38745736339c2e3a1792cd82147fb6cf5a3d371d83dbe91d1afe34e741e038ed4d84d6f444ea1922dc4bb658
 DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3515290982de21c7b6c377508189fa53182fca84d62f61b231e250395992e8cf06cc61394dd41150f02d8a254f8b SHA512 019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6
-EBUILD fail2ban-0.10.4-r2.ebuild 3253 BLAKE2B b5c9029ea540ba99cff9a91b19ace9a94080092c0ad283f973c21a98c405ac59432d11b3353c1dee0afc562910957b215d22b76bce9ee2db2ff5aed71725dbcf SHA512 9c5d57795148503c6e3d94f9b120b9798f3b5f816bf0d508afc1eaee12d80c3c181d859f7061fd8e7145f3633a11bb4fb501baadc6d8eddf87fae6dbb5e06637
-EBUILD fail2ban-0.10.4.ebuild 3210 BLAKE2B 803d84132701b9f7b832322a8058a883751ba6a57cbd479470543c3743fb9e5628284eba1d930da0e4ffee56dcf541884c7f880827c5bf95c1512995d185b3b9 SHA512 7e25b8c1f8271e4d45cc39427255ce5b29a33140cfac31820b2bcc7493dc02cf5b31de3e0701a79d60af7baba52e0b35659b5865ff7b29013e17e218297caa9e
-EBUILD fail2ban-0.10.5-r1.ebuild 3375 BLAKE2B 2caf8bb71a3f8383545bd1a838cf97d8b251b663440c69910a7d4e2de293a5828072dfc499d5b151a2540a855e44aebba683adc0ff49f9e490abd2a74da765d3 SHA512 79b65d7c462988fad37a8d6a92d2e2904240ab1a52adb7601d1ceae0a22bf9f0f7c58ab1cc01dc45e4eb860cb41c01b10e5e766ade479f70b6407dbc13a895b9
-EBUILD fail2ban-0.11.1-r1.ebuild 3325 BLAKE2B e860b1f850a3a2b1e8b45ec1fdafd6847d6699c68d9c623f09f1292c33839c436f22fa80bdccad83b9d542fdd4ef7a89a0a3e8de456c3063a058ee510e751bf3 SHA512 413c0c0f67cf4fbcc4c91e79400b52dcf9a448bc7a5315e9089dec70f2cbfabe6256b436da7cda8557ec84a0abf42c4d6c0284b97a67b7ccaa09afaabb301ca3
-EBUILD fail2ban-99999999.ebuild 3254 BLAKE2B 88ae6054ad2c1bf962ad98f8f53d5bb11a01d21077712a5a6344312169adb6272afbb9a2fd1b44e0235f4752052bdf3e0e0cded86da48e9051953322049e6205 SHA512 162c2f7ab46427731c87bb12f07392e04bb9a8937540027adf725462bb236bcf54d07d3ddbade544768d7bf7023725edca6d7f452f31e15f1b5731b2681bede7
+EBUILD fail2ban-0.10.4-r1.ebuild 3216 BLAKE2B d807e5422811d4a703133ee2b435926d4f3aa17f94281ded5972374180203a7baa3045c7f3a306be8a3e9105250a06279e097544378c8e9ae82003470eed9de1 SHA512 1ffb020f2cfa7927553a6715be23681d6f7917273036af304b4e44bdab1342662824efbf3c9d5822bded8bf552eb4bfa1d439d972ff27f282b41ed052442a74f
+EBUILD fail2ban-0.10.4-r2.ebuild 3259 BLAKE2B 1f10e15e5baa979906974fdee8d6a3050f9570b2861dd72ea2b4a7282fa1492885590fc22e9d5445f79720f1f52f65544ce286c57e43ff73156af5b2d038fabf SHA512 606d8b0bb9f1b66a5b65dce012f19e3d90231d033bc72dab513af2179bad23b0cf96378f65b3437c73c6c38a69ea91a71e65d837a1afcead25312ffbd3abb8d9
+EBUILD fail2ban-0.10.5-r1.ebuild 3381 BLAKE2B 27c5f4a366091b2e64c8cf1b133bdba9739673a85613ef5130d42eee7296355796c2b9c862129c41e2b0a4e3881bd23ae7cf47781c08c4b91689f75ecd0f2bf3 SHA512 6021f943f4d5bf45b137df2631c73a16e4e38dd4a190d059b401179daaa4938ed94b55eb769fed0bb96eb2c9ca054768fd50a9ed74438730635f2ecf41bf453c
+EBUILD fail2ban-0.11.1-r2.ebuild 3331 BLAKE2B 2b9c142ff0c09146bc13f1fc948ce6ed4bf24c1f579c7eb4c37e427540b031a7ed9b110e4811ccc64274e4ff0d580e88968440f7f5b2217b278ff617df5387a5 SHA512 0e319a557b1defbd9ea3b21185e93f8aef6240d397478de3747392f10a7eb6b91bac9e6669512b63f08c6c749e2e9b76bda66b5b55eccc82dac29e35ec802d4b
+EBUILD fail2ban-99999999.ebuild 3260 BLAKE2B 1eb373ec59419250e94593453c2b3940c4cf6e6df0061b4c019d8df0b783a88a0ec4d36c29bc004105eb3f25f29989d25a11a00e9cb5b8b3ad9d770549fd8d0e SHA512 d85e54971603803631fac51ad5a65fbea837dbae3ce9bbab0a5f26af4e501261362aa71b7482933e6398727894fb5b99c6453779ec378a40f401fd9708cbd0aa
 MISC metadata.xml 372 BLAKE2B 7fca866187d9a128e6fb6787a4099d7a6442e0e51e558786773b91c3e2f06e67167d76f9bc96be0fe1baa1c44fc3f0e9e2105a327a10cb2720b3e3f9e4303a66 SHA512 4d5710e2fb4a7c353ca6bd3203bceef57d4d004367993dc1044800ee8713a3f4697fe8ba3472a73ecd015503656dfb7cd68d674c99188ce5702769cfeaf06b25
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild
new file mode 100644
index 000000000000..1db3b7bffdde
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils systemd vcs-snapshot
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://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"
+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_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
+	)' 'python*' ) )
+"
+
+RESTRICT="test"
+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_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}
+
+	keepdir /var/lib/${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.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
index 85730ff0b684..652d96b809db 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1 systemd
@@ -21,8 +21,8 @@ RDEPEND="
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
 	)' 'python*' ) )
 "
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
deleted file mode 100644
index 7acd5a03851b..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils systemd vcs-snapshot
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://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"
-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*' ) )
-"
-
-RESTRICT="test"
-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_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}
-
-	keepdir /var/lib/${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.10.5-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
index 56a0f3046d23..e00569c23f08 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 systemd
@@ -21,8 +21,8 @@ RDEPEND="
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
 	)' 'python*' ) )
 "
 
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild
deleted file mode 100644
index 8481a7ca53ff..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd
-
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux systemd"
-
-RDEPEND="
-	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*' ) )
-"
-
-RESTRICT="test"
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-python_prepare_all() {
-	default
-
-	# 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_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}
-
-	keepdir /var/lib/${PN}
-
-	newbashcomp files/bash-completion ${PN}-client
-	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
-}
-
-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. If you do not use the"
-		elog "persistent database feature, then you should set"
-		elog "dbfile = :memory: in fail2ban.conf accordingly."
-	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.11.1-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
new file mode 100644
index 000000000000..12997e0f764a
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 distutils-r1 systemd
+
+DESCRIPTION="scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://www.fail2ban.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux systemd"
+
+RDEPEND="
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? ( $(python_gen_cond_dep '|| (
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
+	)' 'python*' ) )
+"
+
+RESTRICT="test"
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
+
+python_prepare_all() {
+	default
+
+	# 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_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}
+
+	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
+}
+
+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. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
+	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-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index 1618b1f20e24..4bde96c6afe5 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1 git-r3 systemd
@@ -21,8 +21,8 @@ RDEPEND="
 	virtual/mta
 	selinux? ( sec-policy/selinux-fail2ban )
 	systemd? ( $(python_gen_cond_dep '|| (
-		dev-python/python-systemd[${PYTHON_USEDEP}]
-		sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+		dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
+		sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
 	)' 'python*' ) )
 "
 
diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest
index 8bdf9d522260..1a350d330bc4 100644
--- a/net-analyzer/goaccess/Manifest
+++ b/net-analyzer/goaccess/Manifest
@@ -1,6 +1,6 @@
 DIST goaccess-1.2.tar.gz 423103 BLAKE2B 87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14 SHA512 bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889
 DIST goaccess-1.3.tar.gz 541374 BLAKE2B 55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019 SHA512 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1
 EBUILD goaccess-1.2.ebuild 1398 BLAKE2B 8c819456c94145829b9509e8938790acd090831fb46efe02d32b6494eef9004f77fd264e36927cba70c2517a41e8fe6782b781d59643bda826fff747083a39ac SHA512 b08146d7354977cc33070b01807a5a0ce86a529bfe6002e2a900a4e263d562566477de61ca24ffcfaba9974deae93a525d2d930b0bf2725583440ab39fdc0d3e
-EBUILD goaccess-1.3.ebuild 1514 BLAKE2B a0c9c26a6300fa49c3b99778b2e2fc246939d9d21229cf61107a3ea2be381ff972b6d1eee28b09d09d40d84f25db3e02bcd0e250c8318d6fe5981b4209dc081f SHA512 d9f9425bad510a2c454cb717e6ecf35e6342513288b14e8a80bf11f0bfa7889381af95f5f84c486a7bab8f1e4257306bc0a24b636999e461a36e00eabeb4e14f
+EBUILD goaccess-1.3.ebuild 1512 BLAKE2B a97b3b51181914e8d410f05eae40dc74eeedfe1208da4b4482e8ed9e4666722edfa09fa78add572aabecb46a118996b8a2dab7cdd8f0ce50fa790e3df29159cc SHA512 76223212a4e7978f9648e4d15e58d6658b5427a4f25ce5280bc5e3037ad7df6a35179af4b47c6b7775dd3fa2c3089a0212bdf1f27794863c8155d8aee953f261
 EBUILD goaccess-9999.ebuild 1462 BLAKE2B fe2a895d73c2ee02481cfce7883cafff413eede2717428c98cf581c1854ed10529b6c910c7ae1c096e091845d73a204075d745fa51f7721d223d2a938f402456 SHA512 572eaf67fbfeaafd8d3783a75400f179fc2687f94d4410a2091d9f264b795273775af810e60309cb9e82618b20c70f8ac7502b3b5bb996c5af727d5d40368e55
 MISC metadata.xml 1111 BLAKE2B bb28688ec15c422d544dc1aabb460a855687dffad74938643efc545c6c99b2369ab19db620dbaa047f0644b65ba355f4f0e42822400478a5f7d5fcf8960abd7f SHA512 30623dd40bc45ab6bb29f2413a62dd17c66565f9261c3f8b764b97e3b300078897b573b5ebae7f021408792da6d518c294955b8a1fb1dd58d000c4c5cfd0fb4a
diff --git a/net-analyzer/goaccess/goaccess-1.3.ebuild b/net-analyzer/goaccess/goaccess-1.3.ebuild
index a38a46ce6f72..2a0e8b7a3841 100644
--- a/net-analyzer/goaccess/goaccess-1.3.ebuild
+++ b/net-analyzer/goaccess/goaccess-1.3.ebuild
@@ -47,7 +47,7 @@ src_configure() {
 
 pkg_preinst() {
 	# Change path to GeoIP bases in config
-	sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess/goaccess.conf || die "sed failed for goaccess.conf"
+	sed -e s':/usr/local:/usr:' -i "${ED}"/etc/goaccess/goaccess.conf || die "sed failed for goaccess.conf"
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest
index 05ab059883ef..9d7bec1013b1 100644
--- a/net-analyzer/gr-fosphor/Manifest
+++ b/net-analyzer/gr-fosphor/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-fosphor-9999.ebuild 1317 BLAKE2B 96e8537a914531ffe116cf98900e3db6354834240d888e7d0f3206fefa39a911dede7f19585fc09eed34b212a2eb22eb444eb981b5d05275c7d19c3f78202de7 SHA512 38ea427606c212df9cb458c58acfccbe6d7e832cfd3dbbbe3052918ed7fe57b40516bb8f6975d2b390ade664a8a05bee43513884c4f174754d134642f0eb902c
+EBUILD gr-fosphor-9999.ebuild 1324 BLAKE2B fb6e43ec50f469d9fe71b1f2ab3e275c94e3f552f9a034ac86fe8253c09ecca22efb54390dabcd2570ad9484132d482d8805a836886fe56dac45db5963913421 SHA512 eeacf7ccb39e22fdb31e3b6035b57d68b151455ce4219ffde6dcbfc11a7280fa6253ea0fde990395212a38dc09bfd8e39a2a3b690168cf3d76ddaf4c7107dee6
 MISC metadata.xml 308 BLAKE2B 365c82d2c544f94f613bee62f13ab91dcbefd1652fccfec5222a616443714400c686eb5d77c892b44ab0c1badd1877b4bd0dcb9040c98720c13934d567482857 SHA512 cca3e1ffd2ee31e64dbea0f66093f3295b9e1ce2161b9b71dbd1d518a6a0ff83843c684c1c958bffb80b4f4fda9d5a272be8d6ab2ecf6f0fe57202a65a218df9
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index ca6af0c3aa21..0eceaac74e02 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ RDEPEND="qt5? (
 		dev-qt/qtopengl:5
 		dev-qt/qtwidgets:5
 	)
-	>=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}]
 	media-libs/freetype
 	dev-libs/boost:=
 	glfw? ( >=media-libs/glfw-3 )
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index feeaeac3b0ec..bba222949119 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -11,5 +11,5 @@ AUX gsad.logrotate 325 BLAKE2B 00fb4953308bbfb47f328a88541778adb2f8523108b72058e
 AUX gsad.service 434 BLAKE2B 43ac179a66d1f4ddeecddae1804ff9bbb48ddce7e7cd18feff6c5ca681ecd5f6401e1a26b94b6f5d5e83a9e59bcccf2f773edca50d1d2f9abca0934ac813fd40 SHA512 d842531486d852b710b512a631ddde75bdfaee1db097e024f0de439d9c8c3ed699f7116a685650f1acf23b1be982987d38bc16a0c3bd4c6405b16c8cffc5a476
 DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2
 DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8
-EBUILD greenbone-security-assistant-8.0.1-r1.ebuild 3249 BLAKE2B 4b5d19930f9f1156961b4f9fb82e8393193d752aea82212f3f5c7ad3044bc9a1b6a7ac5cfe5f6f7bed174a7092caf28435ab74a2a4e994066d5cde73a9ab943d SHA512 50d53ec5df7ec44cf5ee483072903a0885b84a5c6c5fba1d8e1dd76450f14782479599096ab61bc7b4d70aa4ae95454fe088e731d94f04b71918cdf43d2ac892
+EBUILD greenbone-security-assistant-8.0.1-r1.ebuild 3207 BLAKE2B bdf238bcecce4d580eb95a199c0f219eead7b792d7f602e449ccb6da83dfab74faa748e4ca96df323ab70234c0b697074a962fb7e7c2c2f298bdd1e8d1676321 SHA512 f383fc91f3fe1c150274bd51536f0b8759bde9b3184bda8af3c6d3566c45a501f591bd823aa8b8fbb3180d35f05679cfcb342f1acdac7e823d3f0f7304b47ec0
 MISC metadata.xml 961 BLAKE2B cd5edd05b4ebc657f40a20a5edf6d33e065ecd5ae6971c36c1640999b1f4e05382363f288cf57dd56ad8c4cdebd307cbaf86fb80b31ef478e278e03293dfe72a SHA512 a5d74e05d38115b2741f5d4f8a781a07a434976dbad9c427701f50a38efc5db5d18f03bd6e2eaf617c7e6c05c2616249babb0bc5dc857f16a509fff85598d3e4
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
index ed0bcabf18ff..d616891de50b 100644
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild
@@ -85,7 +85,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 	)
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest
index 43039e828b22..66916b72ba5d 100644
--- a/net-analyzer/gvm-libs/Manifest
+++ b/net-analyzer/gvm-libs/Manifest
@@ -1,4 +1,4 @@
 AUX gvm-libs-10.0.1-pid.patch 312 BLAKE2B 805c21d61dfc6bf29cab6c6dd768fe6c9249aa7613ab18f21d347d1aeab58afc4bb75d17cc62687f3fa2270a05f16c883ba5293534e84e045f1d67dc527f8194 SHA512 dc42f495f2e45687ce221ba72fbdde4ca8fec11b4e55a46dd011e0d7169d5b20e1ba4473aa33180c698b655fce25fac2f8c6283fde04137b43c9c16af34eec43
 DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4dd07f17ab53957ac4a1452ecba595885abdf01402a78aa784163aaba60b5c452fb9c2b5a11d38c40706e820c22c2 SHA512 961570e8fa8f89f0b462991bff1bf4e512ed6419cff6871c7432899847fb9edcc9f0adb7c280d12ee69fbb5c8e306c9e4366e2cbbb05fc3bae06795dcfb42206
-EBUILD gvm-libs-10.0.1.ebuild 2316 BLAKE2B ed1550e7098886438d6523764907e9960577273d82e128013696b6870ce7cd26663ed41b092538223355424211990beb642de28a741fa9e05082d21a9f312ca4 SHA512 0b22bac05bfaceba7eb0526778c2ec9e2f7363e3bb7555a5261ad18e0708550654618a7098c2ac561f465add54a80963b811c3cc4c2926cd91f4ad11bcce2c0b
+EBUILD gvm-libs-10.0.1.ebuild 2274 BLAKE2B 59cf5e18a5a5cdb0fbcfed7ef8772abf9c33e86e1051c12dd3450993e6a4778967197e8bffdeaf7fdb8d4928bdb112889c7f7265cead065dea656e41113ca507 SHA512 0896c4be88d76dd7a08bfd79a5c5b185035779238545c8f0cdbb3ef207b8d537e0c086cba25c6c6a048696bdcb28d4c5362f3b312240c600ade1708436315428
 MISC metadata.xml 790 BLAKE2B c8eaf3364b9acd770faf586a9f1062da2efe28c42342a59ad60fc8d65f12c2f459d8f24e99f216fbf9c219b2444f72e4944a5c806cb1f5283d8965c258d7bb1e SHA512 267856946386f023fe1eaf42794652126891773f578bbe7c0a1d70bfc107f46e49bebfeae6e485def0104dd9ebcf17f890a4cfb59c3362f29badfd803d3eb06e
diff --git a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
index aa6cf0725a7c..ebcbd5996319 100644
--- a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
+++ b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild
@@ -70,7 +70,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 		$(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1)
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index fe36dc3d38de..a34ec514eac1 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -9,5 +9,5 @@ AUX gvmd.init 598 BLAKE2B 92533371b043ff4752869d44702601f214233e4eddf0ecac74555c
 AUX gvmd.logrotate 325 BLAKE2B 4df59e6d9484b9e60d54cb3633ffc9888ad8550bb1d1f23123da21b1269125cd7354426b97ce42e06bf547d23788cefaac5ef51f7aa83d6cc34076bce4ab7339 SHA512 e1eeef173bfab7c750efcc7faa42cf7a1cfb9e6b137716063f273bc709c1346f11262dadbdb0c49822d885dc00177d8ccb91c0491ddc33cfee0a3827f11908f6
 AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c56657ac61c0c55f81f8bf809c5d6508945972dcaf31b4e75729c7686409a2ebaea4b7a132d8d557d9 SHA512 ea9132367ee28814ed6e36c0b1fb1ce4700e5735d77e0889947618aba511c3adbc968167b4968d1fa28bd41959575a49b8b2ddb9b116957c729f51ece33dfd98
 DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8
-EBUILD gvmd-8.0.1.ebuild 2938 BLAKE2B 2987e33ba66d99eec4f77ceb49f4e8a214d7dc32bc3f5c937e78d73bed550e0fa19f746109c6543c1fc5b04a31c659254fe5b3d8099fdd853417fdd77e952802 SHA512 027af07c0b11c5a10cbb2fa6f9d1ffaedfce94c4aad51b4e0d38ea67614ea6503acc994425a5aaafe5d929862e337cf63fa9d9d283ee43beefb3c2c0542fb191
+EBUILD gvmd-8.0.1.ebuild 2896 BLAKE2B b882c80f53ac49d1ed63f9666a124dd16c2f391587de6b23256e4105cab6549973b97dc83f0afdd24506b139059dd0c9cebd943845bc8db895291f78889c681e SHA512 527c8838fed46ee3b851b6edfdf62243e2b64c99dea52e84f345391f124e783266ba21656295b5b9688c1f2cfa2b732fffc7c34c6fdd0a010cf7a39daa17b7b8
 MISC metadata.xml 1051 BLAKE2B f0773c3dbf8eabb4823bb5f3f9b70c6374db7af731ec828a2d295faed6c4c587a64683661a915d92ddf1bd3e5f623706a036d5a702d8271e5a310234ba22da08 SHA512 efcf5992b893f1e2f5b1a905e4f331ea3bc1446e5c1a5482b4dffdafd1b6f3daf9847a9164d74588463740f4c87925f4db47722fbf87e6beda2909c1981bd339
diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
index adb7ef65163d..7289dcd5f82a 100644
--- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
@@ -69,7 +69,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 	)
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 0b7aafb1f981..4beb158173b6 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -3,8 +3,8 @@ AUX icinga2.initd-3 2390 BLAKE2B 1ead1dd958d978324dfa043abcc58be7ed389207e2bf4dc
 DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38
 DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d
 DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16 SHA512 88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d
-EBUILD icinga2-2.10.5.ebuild 4739 BLAKE2B 285278c6205b785c143fdfe7ad894094f90d40d0fac34b006594138770fa27c62323ffc212beed6b142b8db6ce51eeb8b89b5026aa5f681a6cdb5d5d5fce4e57 SHA512 263ef5cc4ee4843d6b902ebd17022af7f73542d9a6f954b46cfc97f2f248e44e5316e8bf2694952934bf6772264577d9daf1039e0e516262f32eb85476ce2b99
-EBUILD icinga2-2.10.6.ebuild 4726 BLAKE2B b9b51cb8382f7239bd3ce502eab29273364d35352a84adb653dec8438fc0d94b5cbdaa52a0bad66927237e7f438b2a51ccaf44ea9851b14cbfc792dd1b1d9b71 SHA512 4a9b62fa84342c19ef4d470bdf1ab5482aa54eb052f2d514002c9e688f89629115d2a9fd3775326cd5b5c80b8a4ac0f987f95b73ce39413ec1d5ed16247a7702
-EBUILD icinga2-2.11.2.ebuild 4717 BLAKE2B 8e38d240efc835a3c86d0b6886beb2bd557843dbb80ad749d984c90a9bbbe21104c8fed0f78e20c263bc486bab84706552344e7c20daa768d7ff2313f8bb0a87 SHA512 7ff4110d5da9291d332e32499c0076612cac2362a62f0922095c79d4cced1ffe33c7c9ad94c6d359729b577f2a1faa4f599da5c6183d5166c08b2413999821a0
-EBUILD icinga2-9999.ebuild 4750 BLAKE2B 4595a0f48310eecc9c20b579634e9bf8a33660aae2aec1e13befb4c58a3d78a1cdd1555fe71e44ec9a39eac3db87a933c215acd83857e132c0e961bfda21ffae SHA512 858f889623bdec040645878b8d95aadbfb9883e9490c792041eb7489223cd098a45c8c1f830cfb086c3b4bde3c9171bcbe1003c1407deb7f4d31ea966f5d6f8e
+EBUILD icinga2-2.10.5.ebuild 4709 BLAKE2B d0845090fef35d3cf81199828feb99c77280992819b54ab8ceda416ee804d6aeb0d2a4bf5e12a3afa4ce4355f1effb6d76855d423dad21de51af01ddb1b52351 SHA512 5e809bb80f71c37e4907aba356af2d9fef39097ad6d3fc781053bedde7c1d0aa056a7a1ebbcb894fe8c49e5be9eb676bc498d7d42bf17466bb1152ff471d29cf
+EBUILD icinga2-2.10.6.ebuild 4696 BLAKE2B cec7ded142d745732fbbe580a1d43edd3264b810d2741f60740934e0049c210d96e2068deec04103ed042d5b4d6f60a3dba4dc07fb53f1a415698916bbddfa2b SHA512 62c88a11858d7c4cfa0f4fddb975e98381c2dd8a04193ca9c88657d886ef2548cdf57459dacd10078cba2c4ace4c823c48fa70edfeca768807364a32031ac394
+EBUILD icinga2-2.11.2.ebuild 4687 BLAKE2B b26cf544dc247130e9b41bfb581bee80ba2278ea52aeb497526779ed054b66421edeb7ecbd0f2a97f24210596de81878b4c59c259de3739afa48ba6cecdd54dd SHA512 c9b4ee74dd75fc7c0a794b8c0cc9adc7cd154ab93883af0d2f332cc5c440b0b75d04bf82f635eef43bbc4e5ef3b4167ad5733565dc2ecc4ce92bf24baca0929b
+EBUILD icinga2-9999.ebuild 4720 BLAKE2B 47eb8721d739b6d4e8eb409b16714f81565e570feec237e5d51497978be39184c83e9a07ed9bbcc921edca30634b910cac31f63f3323d85d9f0b9e44ff081187 SHA512 ea0e5404fe519c7548fe915d64d1a10a50ec0163e90c7542131394c36d4736fa705e4ef0faf13c5dc6bd2d986075b0bbd7e1904775cd7e221a272e605874bb40
 MISC metadata.xml 834 BLAKE2B 49da117c90fdfa30311744b471933f1de2d106b74704e4daef5c33fa71f7aa99c6f05d5ca1345baf607b8e18f4036a9582f95487587f50bff90d6ac2d6c1ad48 SHA512 2e28e73e56153235ce7a69ee3f320cd6a8b9117ed6633deaf1095051d75c2c2fb499ff3748fa74262e84b340082dd6c6f08489549486d2dcba6b944d4cf460f5
diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
index 688e1fd1f38e..7ac8f150a99c 100644
--- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild
@@ -63,7 +63,6 @@ src_configure() {
 		-DICINGA2_UNITY_BUILD=FALSE
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
 		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
index d287bf41cefe..366f6b20e82d 100644
--- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild
@@ -62,7 +62,6 @@ src_configure() {
 		-DICINGA2_UNITY_BUILD=FALSE
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
 		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
index c01fcf4d1cd5..65f6fb4f7fbb 100644
--- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild
@@ -62,7 +62,6 @@ src_configure() {
 		-DICINGA2_UNITY_BUILD=FALSE
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
 		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 39558b4834ec..1f48b8612c0c 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -62,7 +62,6 @@ src_configure() {
 		-DICINGA2_UNITY_BUILD=FALSE
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
 		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index 5f75ef3cde4d..c1250003b462 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -8,7 +8,7 @@ DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a387
 DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6f213bd3b58a32c0bd377a3c0c0ead34c75394539eaec08d40ee9ea16ca2534158ee4c6823387f3fc3648a02a22d86e0395 SHA512 8afeb6e750d7eb310380153af91f9c6f889f6e350e26dc97f923a49b2e3cc6c0b866f893664ad5d9fd9c0e8671b0a69e1267e464e4de9faf75a2eb24536ae014
 DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6
 EBUILD mk-livestatus-1.2.8_p10.ebuild 2680 BLAKE2B 728452886719f88780462c99d9f946028b5d19efeae9b9838bc4a65bc6b3d8237938cb7b6d7dd499c442ace03390aee0f93932409ab9f92afcf73c69abfa0bea SHA512 ccf4d955a9d2e250e4c6b2f1619ced6eb54486a45f4f19a47717eae2217d2372a177caa6e45b85de3711bd15c977700a2d6fc9860f1a640c1e3f049c07d78d8b
-EBUILD mk-livestatus-1.2.8_p16.ebuild 3422 BLAKE2B b74281fdd86bb819ead989d84c3feb3dbf3d7d24fdd4dd8ff723445dfe94e30b3cf3daf25acb8da3549d5c907524df1605cfe51679cf02d17fbc12b6552dfbc3 SHA512 af5de45ec84d07af5c10b47b74e2e4f752cb85a913981d3c4a0ed4202c781506148314959dc8e360d92c94d944dc956b5e5c2268f563d26e3432fc33c644edab
-EBUILD mk-livestatus-1.2.8_p26-r1.ebuild 3458 BLAKE2B 377a5248a9c79b7a5b372ca17fd3589c1a503c7bee8d0f6fd1c0fe7763be532d000aea495eecd9332db5000a220edb6f08997380b993fd8e59693d15ca381f2a SHA512 e4ebf2170393ca705be4defbd6a439b139bdde80e87bf357981b5cbef0283708f270b05f74e47bc6a42dd6bc385d4a4e6a7a09250d64d874280b497dc2a97126
+EBUILD mk-livestatus-1.2.8_p16.ebuild 3420 BLAKE2B 59775b2547e7ae149f6b7ae5dd67fe6605342be8d14aee7c4567c7126f474958e91f86fccc944fc293e49a75dc433618ac9b5705428317e043064b88ed083617 SHA512 8eb6c264497fa51c468056f5a9d18b8869f00e304613b44e23085473483c9e6da71f2dcb80f841e1a6ec501c396192235f2506bd2f2a97bb4b3c543afffb87f9
+EBUILD mk-livestatus-1.2.8_p26-r1.ebuild 3456 BLAKE2B 5aa345a5411a3fb01cc9a120f27bb19dd84c92f9c2ae26f4c11461baafdc86db14306b401bd44c2bf2dc5598afff21174ca84ed664c065020c485092ddad93bc SHA512 1af491259f2c8c6ad0cf1d2ad2414cab89a3df7dbb820ed2f80f61c1417fde1a099e4efd7cafd9b9c949fb9b20831e2f6d2bc9fe347bee2eb10b6131a709e2a5
 EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3562 BLAKE2B 26e5dbf7ab2d0fba9d357f55dbcf665d510f1a9f27aa2f2827711224d44524a462106b3e39aa091e8ab8009db1d404ed6a0a0e8e4fb8b526d182f8a5ce652d9c SHA512 0a7854b54d63c01473f07a01ab5888d3b0fa62288599ecb552142123a9154af15c5697deb7c36c7e13c8910f976e86f553f7bf65b19f9196965df4fce8dcc328
 MISC metadata.xml 764 BLAKE2B 6cdc02ae09a5f2ee8264648a31feaddce015eaa21824d2466462dc359ca4b9eff656d6714e6e7bed8b6312d10a8e89712287417fee55cd8bf1707f5837849298 SHA512 a113631d9036af5c65ecd6ab393ecd14af3c05511f8c99adac6106a7f54ec172c2bd86eaa5289021baebdb65c62d1f26e72a13ae47aab8245e4e4da8f19142e2
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
index 8c27e80b89bc..aa104dccbeaf 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
@@ -111,7 +111,7 @@ src_install() {
 	cat <<EOF >"${T}"/nagios.cfg
 # Ensure all data is set to event brokers
 event_broker_options=-1
-broker_module=${EPREFIX%/}/usr/$(get_libdir)/mk-livestatus/livestatus.o
+broker_module=${EPREFIX}/usr/$(get_libdir)/mk-livestatus/livestatus.o
 EOF
 	# same for icigna
 	cat <<EOF >"${T}"/icigna.cfg
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
index 481cb302ca67..071250a73b6b 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
@@ -113,7 +113,7 @@ src_install() {
 	cat <<EOF >"${T}"/nagios.cfg
 # Ensure all data is set to event brokers
 event_broker_options=-1
-broker_module=${EPREFIX%/}/usr/$(get_libdir)/${PN}/livestatus.o
+broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o
 EOF
 	# same for icigna
 	cat <<EOF >"${T}"/icigna.cfg
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 32ef375aee1f..d8e90e02f2f3 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -17,8 +17,11 @@ DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051
 DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c
 DIST munin-2.0.54-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
 DIST munin-2.0.54.tar.gz 2270295 BLAKE2B d0f573a46eedf9e9a7de61428de6c2261f6c9fddd3aa5696966c2ffdaa82a432dca72d60cd2e4b75601f312ad07918090a9dd45a10e3c9c81371b97200e28b12 SHA512 b9a8c7403b34d393115d833ee41e3b5c325e072729b66f6b8b7fd3546ab4660e59e59c6f192eabb706e2bc9c73aea9c50c880c2c36826c5f2962bca46098e732
+DIST munin-2.0.56-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.56.tar.gz 2271203 BLAKE2B f3df227b905ab794e2253637d367819eff2625f9e0f2355d23916b033b3b23d14bb64a78bf6a334f0c7a1859e60c227d1f754a2689bf291cc5f43a46986d35fe SHA512 111b9b8d88474f480eac1e304a92a52c2295d72a1c6709bb2942ff6ee0ba26a56d25dc5d0cf08ddb98a23d6d9693ad0cddb2185e10df83d553655d017d102b1d
 EBUILD munin-2.0.49.ebuild 12302 BLAKE2B f943778e48a625a0fc342ca5cc7d9323092ebbbd4d4fbce281d11d11f0d68425a734290ac2e63b3e221fed2fa6ce9b6a52dc99c4c0ac23c1fbecaaa599ce31f8 SHA512 fe270e67ff999c30c5f88b6b9ef4143de37b2f4e6708dac876ce35f44efd8cab7efec1fa08d49466e091e549020384676b2b6598d3a21f7811cb143fe3e89faf
 EBUILD munin-2.0.52-r1.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
 EBUILD munin-2.0.52.ebuild 12389 BLAKE2B 4e1046e310948f97ed2469cb58f67c4c7cc6b66ef2fc401a409f2069c2c3b717a1b76d5b9f51add689c00e7daa6a555e927b98f9290ee7e24aac81202f17c557 SHA512 3f1edf0c2c9a35f17794003e143fbde255f60527e0f595a40233b63c1cfaf3bb00416902f6f45941c597987eb292d6b507cc8eb3720d2a17793607f9099ed823
 EBUILD munin-2.0.54.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
+EBUILD munin-2.0.56.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446
 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083
diff --git a/net-analyzer/munin/munin-2.0.56.ebuild b/net-analyzer/munin/munin-2.0.56.ebuild
new file mode 100644
index 000000000000..80f46fab8967
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.56.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/"
+SRC_URI="
+	https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
+DEPEND_COM="
+	acct-user/munin
+	acct-user/munin-async
+	acct-group/munin
+	dev-lang/perl:=[berkdb]
+	dev-perl/DBI
+	dev-perl/Date-Manip
+	dev-perl/File-Copy-Recursive
+	dev-perl/List-MoreUtils
+	dev-perl/Log-Log4perl
+	dev-perl/Net-CIDR
+	dev-perl/Net-DNS
+	dev-perl/Net-Netmask
+	dev-perl/Net-SNMP
+	dev-perl/Net-Server[ipv6(-)?]
+	virtual/perl-Digest-MD5
+	virtual/perl-Getopt-Long
+	virtual/perl-MIME-Base64
+	virtual/perl-Storable
+	virtual/perl-Text-Balanced
+	virtual/perl-Time-HiRes
+	apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
+	asterisk? ( dev-perl/Net-Telnet )
+	cgi? (
+		dev-perl/FCGI
+		dev-perl/CGI-Fast
+		)
+	dhcpd? (
+		>=net-misc/dhcp-3[server]
+		dev-perl/Net-IP
+		dev-perl/HTTP-Date
+		)
+	doc? ( dev-python/sphinx )
+	http? ( dev-perl/libwww-perl )
+	irc? ( dev-perl/Net-IRC )
+	ldap? ( dev-perl/perl-ldap )
+	kernel_linux? ( sys-process/procps )
+	memcached? ( dev-perl/Cache-Memcached )
+	mysql? (
+		virtual/mysql
+		dev-perl/Cache-Cache
+		dev-perl/DBD-mysql
+		)
+	postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* )
+	ssl? ( dev-perl/Net-SSLeay )
+	syslog? ( virtual/perl-Sys-Syslog )
+	!minimal? (
+		dev-perl/HTML-Template
+		dev-perl/IO-Socket-INET6
+		dev-perl/URI
+		>=net-analyzer/rrdtool-1.3[graph,perl]
+		virtual/ssh
+		)
+	"
+
+# Keep this seperate, as previous versions have had other deps here
+DEPEND="${DEPEND_COM}
+	dev-perl/Module-Build
+	java? ( >=virtual/jdk-1.5 )
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-LongString
+		dev-perl/Test-Differences
+		dev-perl/Test-MockModule
+		dev-perl/Test-MockObject
+		dev-perl/File-Slurp
+		dev-perl/IO-stringy
+		dev-perl/IO-Socket-INET6
+	)"
+RDEPEND="${DEPEND_COM}
+		virtual/awk
+		ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
+		java? (
+			>=virtual/jre-1.5
+			|| ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+		)
+		!minimal? (
+			virtual/cron
+			media-fonts/dejavu
+		)
+		selinux? ( sec-policy/selinux-munin )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	echo ${PV} > RELEASE || die
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
+	use cgi || cgidir="${T}/useless/cgi-bin"
+
+	local cgiuser=$(usex apache2 apache munin)
+
+	cat >> "${S}"/Makefile.config <<- EOF
+	PREFIX=\$(DESTDIR)/usr
+	CONFDIR=\$(DESTDIR)/etc/munin
+	DOCDIR=${T}/useless/doc
+	MANDIR=\$(PREFIX)/share/man
+	LIBDIR=\$(PREFIX)/libexec/munin
+	HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin
+	CGIDIR=${cgidir}
+	CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi
+	CGIUSER=${cgiuser}
+	DBDIR=\$(DESTDIR)/var/lib/munin
+	DBDIRNODE=\$(DESTDIR)/var/lib/munin-node
+	SPOOLDIR=\$(DESTDIR)/var/spool/munin-async
+	LOGDIR=\$(DESTDIR)/var/log/munin
+	PERLLIB=\$(DESTDIR)$(perl -V:vendorlib | cut -d"'" -f2)
+	JCVALID=$(usex java yes no)
+	STATEDIR=\$(DESTDIR)/run/munin
+	EOF
+}
+
+# parallel make and install need to be fixed before, and I haven't
+# gotten around to do so yet.
+src_compile() {
+	emake -j1
+	use doc && emake -C doc html
+}
+
+src_test() {
+	if [[ ${EUID} == 0 ]]; then
+		eerror "You cannot run tests as root."
+		eerror "Please enable FEATURES=userpriv before proceeding."
+		return 1
+	fi
+
+	local testtargets="test-common test-node test-plugins"
+	use minimal || testtargets+=" test-master"
+
+	LC_ALL=C emake -j1 ${testtargets}
+}
+
+src_install() {
+	local dirs="
+		/var/log/munin
+		/var/lib/munin/plugin-state
+		/var/lib/munin-node/plugin-state
+		/var/www/localhost/htdocs/munin
+		/etc/munin/plugin-conf.d
+		/etc/munin/plugins"
+	use minimal || dirs+=" /etc/munin/munin-conf.d/"
+
+	keepdir ${dirs}
+	fowners munin:munin ${dirs}
+
+	# parallel install doesn't work and it's also pointless to have this
+	# run in parallel for now (because it uses internal loops).
+	emake -j1 CHOWN=true DESTDIR="${D}" $(usex minimal "install-minimal install-man" install)
+
+	# we remove /run from the install, as it's not the package's to deal
+	# with.
+	rm -rf "${D}"/run || die
+
+	# remove the plugins for non-Gentoo package managers; use -f so that
+	# it doesn't fail when installing on non-Linux platforms.
+	rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die
+
+	insinto /etc/munin/plugin-conf.d/
+	newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node
+
+	newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node
+	newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node
+
+	newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd
+
+	dodir /usr/lib/tmpfiles.d
+	cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF
+	d /run/munin 0700 munin munin - -
+	EOF
+
+	systemd_dounit "${FILESDIR}"/munin-async.service
+	systemd_dounit "${FILESDIR}"/munin-graph.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-html.{service,socket}
+	systemd_dounit "${FILESDIR}"/munin-node.service
+
+	cat >> "${T}"/munin.env <<- EOF
+	CONFIG_PROTECT=/var/spool/munin-async/.ssh
+	EOF
+	newenvd "${T}"/munin.env 50munin
+
+	dodoc README ChangeLog INSTALL
+	if use doc; then
+		cd "${S}"/doc/_build/html || die
+		docinto html
+		dodoc -r *
+		cd "${S}" || die
+	fi
+
+	dodir /etc/logrotate.d/
+	sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \
+		"${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin
+
+	dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
+
+	if use syslog; then
+		sed -i -e '/log_file/s| .*| Sys::Syslog|' \
+			"${D}"/etc/munin/munin-node.conf || die
+	fi
+
+	# Use a simpler pid file to avoid trouble with /run in tmpfs. The
+	# munin-node service is ran as user root, and only later drops
+	# privileges.
+	sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \
+		"${D}"/etc/munin/munin-node.conf || die
+
+	keepdir /var/spool/munin-async/.ssh
+	touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+	fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+	fperms 0750 /var/spool/munin-async{,/.ssh}
+	fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
+	if use minimal; then
+		# This requires the presence of munin-update, which is part of
+		# the non-minimal install...
+		rm "${D}"/usr/libexec/munin/plugins/munin_stats
+	else
+		# remove font files so that we don't have to keep them around
+		rm "${D}"/usr/libexec/${PN}/*.ttf || die
+
+		if use cgi; then
+			sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+			keepdir /var/cache/munin-cgi
+			touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+			fowners $(usex apache2 apache munin) \
+				/var/cache/munin-cgi \
+				/var/log/munin/munin-cgi-{graph,html}.log
+
+			if use apache2; then
+				insinto /etc/apache2/vhosts.d
+				newins "${FILESDIR}"/munin.apache.include munin.include
+				newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+			fi
+		else
+			sed \
+				-e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \
+				-i "${D}"/etc/munin/munin.conf || die
+		fi
+
+		keepdir /var/lib/munin/.ssh
+		cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF
+		IdentityFile /var/lib/munin/.ssh/id_ecdsa
+		IdentityFile /var/lib/munin/.ssh/id_rsa
+		EOF
+
+		fowners munin:munin /var/lib/munin/.ssh/{,config}
+		fperms go-rwx /var/lib/munin/.ssh/{,config}
+
+		dodir /usr/share/${PN}
+		cat >> "${D}"/usr/share/${PN}/crontab <<- EOF
+		# Force the shell to bash
+		SHELL=/bin/bash
+		# Mail reports to root@, not munin@
+		MAILTO=root
+
+		# This runs the munin task every 5 minutes.
+		*/5	* * * *		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#*/1 * * * *		/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#*/2 * * * *		/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#*/5 * * * *		nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#*/15 * * * *		nice /usr/libexec/munin/munin-html
+		EOF
+
+		cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF
+		# Mail reports to root@, not munin@, only execute one at a time
+		!mailto(root),serial(true)
+
+		# This runs the munin task every 5 minutes.
+		@ 5		/usr/bin/munin-cron
+
+		# Alternatively, this route works differently
+		# Update once a minute (for busy sites)
+		#@ 1	/usr/libexec/munin/munin-update
+		## Check for limit excess every 2 minutes
+		#@ 2	/usr/libexec/munin/munin-limits
+		## Update graphs every 5 minutes
+		#@ 5	nice /usr/libexec/munin/munin-graph
+		## Update HTML pages every 15 minutes
+		#@ 15	nice /usr/libexec/munin/munin-html
+		EOF
+
+		# remove .htaccess file
+		find "${D}" -name .htaccess -delete || die
+	fi
+}
+
+pkg_config() {
+	if use minimal; then
+		einfo "Nothing to do."
+		return 0
+	fi
+
+	einfo "Press enter to install the default crontab for the munin master"
+	einfo "installation from /usr/share/${PN}/f?crontab"
+	einfo "If you have a large site, you may wish to customize it."
+	read
+
+	ebegin "Setting up cron ..."
+	if has_version sys-process/fcron; then
+		fcrontab - -u munin < /usr/share/${PN}/fcrontab
+	else
+		# dcron is very fussy about syntax
+		# the following is the only form that works in BOTH dcron and vixie-cron
+		crontab - -u munin < /usr/share/${PN}/crontab
+	fi
+	eend $?
+
+	einfo "Press enter to set up the SSH keys used for SSH transport"
+	read
+
+	# generate one rsa (for legacy) and one ecdsa (for new systems)
+	ssh-keygen -t rsa \
+		-f /var/lib/munin/.ssh/id_rsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	ssh-keygen -t ecdsa \
+		-f /var/lib/munin/.ssh/id_ecdsa -N '' \
+		-C "created by portage for ${CATEGORY}/${PN}" || die
+	chown -R munin:munin /var/lib/munin/.ssh || die
+	chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die
+
+	einfo "Your public keys are available in "
+	einfo "  /var/lib/munin/.ssh/id_rsa.pub"
+	einfo "  /var/lib/munin/.ssh/id_ecdsa.pub"
+	einfo "and follows for convenience"
+	echo
+	cat /var/lib/munin/.ssh/id_*.pub
+}
+
+pkg_postinst() {
+	elog "Please follow the munin documentation to set up the plugins you"
+	elog "need, afterwards start munin-node."
+	elog ""
+	elog "To make use of munin-async, make sure to set up the corresponding"
+	elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys"
+	elog ""
+	if ! use minimal; then
+		elog "Please run"
+		elog "  emerge --config net-analyzer/munin"
+		elog "to automatically configure munin's cronjobs as well as generate"
+		elog "passwordless SSH keys to be used with munin-async."
+	fi
+	elog ""
+	elog "Further information about setting up Munin in Gentoo can be found"
+	elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin"
+
+	if use cgi; then
+		chown $(usex apache2 apache munin) \
+			"${ROOT}"/var/cache/munin-cgi \
+			"${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log
+
+		if use apache2; then
+			elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include"
+			elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual"
+			elog "host you want it to be served."
+			elog "If you want to enable CGI-based HTML as well, you have to add to"
+			elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI."
+		else
+			elog "Effective CGI support has just been added in 2.0.7-r6."
+			elog "Documentation on how to use it is still sparse."
+		fi
+	fi
+
+	# we create this here as we don't want Portage to check /run
+	# symlinks but we still need this to be present before the reboot.
+	if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then
+		mkdir "${ROOT}"/run/munin
+		chown munin:munin "${ROOT}"/run/munin
+		chmod 0700 "${ROOT}"/run/munin
+	fi
+}
diff --git a/net-analyzer/nagios-check_mysql_health/Manifest b/net-analyzer/nagios-check_mysql_health/Manifest
index 0ad164b56437..2a3bb5882c53 100644
--- a/net-analyzer/nagios-check_mysql_health/Manifest
+++ b/net-analyzer/nagios-check_mysql_health/Manifest
@@ -1,3 +1,3 @@
 DIST check_mysql_health-2.2.2.tar.gz 140250 BLAKE2B 7bdbf5398ed2219ec9a254906c2e0b38160fe8914c218388a4c9f06c401636e500290dea42b420da7881e6dd35116e0f5b54bb448b304c84714bdee610c74d92 SHA512 027e47747aba524d8c7d168f6c440271434db2e152e59821eff06449d98919ab343a7840ecf73a1fcbc864799d6d3094088bb06f6b36b16989a5184676ae2628
-EBUILD nagios-check_mysql_health-2.2.2.ebuild 1137 BLAKE2B e34369c0b08ad6cb83b2ee77593fc56be7d47ca8af359c092b4bd4dee790420d3e111810f2b94bfabaf5fb8f2c2847548efb79b22e866b3211666c5b117d932e SHA512 ab5a5482464904588c9eb57c056c36aeca02dd05088728f644bc46dc292fb4219bc3436846e94f5c0d2197b017506231749c52370b92661e01840548408331fd
+EBUILD nagios-check_mysql_health-2.2.2.ebuild 1147 BLAKE2B dfadbabb0493c094740588f814b805233ff4ab4515b7073883a8132e610dacb7b70902c979a97e30bb932a508e76aeaf364021fbc88753a6884d6025cea673e9 SHA512 bd58c23c5200f5dc43441b954e7a1cc0a0badc1c1e996c87637db5ab92fef0b3333675a85b5978641c17341896987b725489f434eb541fdeb62c1543f3bf7115
 MISC metadata.xml 256 BLAKE2B 0a1246bd85dce1cf03b4bbd67a011b248c44282442dd65e9c7f24aa4f4c146708fb0894054418a5e42588a0ceebc455eba9518903cf764c1c5f3563666e44e35 SHA512 2c63ddb5d1254a9c4c14b6a41b12a2152d2230fe5c79fe7e7e2351dd23037c7422dcff80e1731259c6a233020bbd5d438ec1c2ad0fba114ec33ea97a4dc5826e
diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
index 1cdf11b0c497..cc1b881283a6 100644
--- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
+++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
@@ -7,7 +7,7 @@ MY_PN="${PN#nagios-}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="A nagios plugin for checking MySQL server health"
-HOMEPAGE="https://labs.consol.de/nagios/${MY_PN}/"
+HOMEPAGE="https://labs.consol.de/nagios/check_mysql_health/"
 SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/net-analyzer/nagios-icinga-openvpn/Manifest b/net-analyzer/nagios-icinga-openvpn/Manifest
index cc6c463970d3..668ec907caa0 100644
--- a/net-analyzer/nagios-icinga-openvpn/Manifest
+++ b/net-analyzer/nagios-icinga-openvpn/Manifest
@@ -1,3 +1,3 @@
 DIST nagios-icinga-openvpn-0.0.1.tar.gz 4637 BLAKE2B 365b6450cccd5f7f25348583eae45c0b15932ec1e858d375171911e4108dd2b7fc133559a35399ece8d2a349f05b2f51897cf9e271f498b6bbaa2c6bba3551a9 SHA512 0dae6c2df71a20e287720767aa4ba41d0568f3cd4bd2a6eb252f86d810d3de265ddc38397df15bb1b115ba35ac68aa6e18345dc4432d4d13b08b500483ffbb11
-EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1152 BLAKE2B b72de1747493f07179be5b606c0f3a1ce1ca5ae861ad214a9cbf819b12fa91c824ddee0fd73485801f7060eb7e83783cbc7e812b995b44bd0bc372bd96c44098 SHA512 586c9ca186d75d2ebf6ab31b85caec3548029786c4eb15fbf92666ae1613651bff60966abd3b60055794106881941aeb1795d0f9a3efdfe37991a095072476d7
+EBUILD nagios-icinga-openvpn-0.0.1.ebuild 1168 BLAKE2B dd35d2ca317b19e750c56506d4b49082f7c6e6b61d176be0492d78abb0518658ce669f5db754fd36965cb6da4ea048f885daec50f6e332803597f67d666aabab SHA512 3c2e9bac65e33901ac4e1b3c1fcce21443c011cc6a701738ba5ca114f56140f19ccbbd8b1c322a724c341a69ba8d5e2be93ae828dab34fc55f276acb5b09d90f
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
index 3db3bf94712e..51d9e6928e57 100644
--- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
+++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild
@@ -8,7 +8,7 @@ inherit distutils-r1
 
 MY_PN="check_openvpn"
 DESCRIPTION="A Nagios plugin to check whether an OpenVPN server is alive"
-HOMEPAGE="https://github.com/liquidat/${PN}"
+HOMEPAGE="https://github.com/liquidat/nagios-icinga-openvpn"
 SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/net-analyzer/nast/Manifest b/net-analyzer/nast/Manifest
index f6e2c3c57fc3..2f301cb1406b 100644
--- a/net-analyzer/nast/Manifest
+++ b/net-analyzer/nast/Manifest
@@ -1,5 +1,5 @@
 AUX nast-0.2.0-gentoo.patch 3056 BLAKE2B e64a4e76fb4c9b0bb4e325f5addae07d740f8b4d6dc76a4011e16a9dddcff137f5a3fba013f8d29db342cd08b37228e2daf7e78b18607e385e71b9eb7b84a4c4 SHA512 9ce75c031dde2a8460d187ee082d182d9aa60524475ca1a5972dce5e4b20c68275c90dfc7a7fec5ae2585a5815ca4dc2a9e059ba31de64ad4f890f811cfea4c3
 DIST nast-0.2.0.tar.gz 147568 BLAKE2B f51a0b3cebfac04cb3aa57f627099aecf893722ca8552c0e6f7f67266e13729e5c54c533cd7599c6d7cfa50c89ad5181439d4c1bc5bba883438213b45b4221ee SHA512 fbf29f9c2ae783e38d40054577a697f631c6590075ef80aa970002f1133c681a4cc1fcd715bc6140cc361c609dcebe8c6bf74544e8710363d30649398b3e388c
 EBUILD nast-0.2.0-r1.ebuild 746 BLAKE2B 1ce039f23876bf15ca06f509a6ecfaa8fa60337f818b33074e2426b9fb27aaf337f3f8e787cffe6c47b09c8c0e884d367adffb2999c1942097a802c32d140d18 SHA512 a28997e6077a1fc61467289fbbd584a01343fb2ff7561b3c09941175bc7a8a84ad5812f382cc8b62283dcde0374913954cf7b1901b13efaf8bc9cb49e408aca8
-EBUILD nast-0.2.0-r2.ebuild 754 BLAKE2B 09ec474b2d1d620508804a6e8e2cdb970b8e8cfc0ea3ef8588165e97bb24b8d4419969f54a7f381a06043427de7af5440fa5eb40cec849aa1a09c5397391ff50 SHA512 29526619e81a3eaafd2dd618566abec177ab7aa12d9cc4a5313f719bb1b8bdd0b0963a02134c3f6311a2e079677e8d51d01a2c434d331abb9b1e60074b906785
+EBUILD nast-0.2.0-r2.ebuild 818 BLAKE2B 4e09a57133a58359fcbd250f512f98164b4df85eda000b8d0eaa047784446f16b33a8c2adafc0b4c784564145b14e2df113ee57eadcd314a96fb7ce4d2ce9202 SHA512 0d79ebdc8d3ab3f7e42d28e2177c07006ff47f963ff5d22463deb551a4899cccd6bdae354b8d20856f9e18d3fe2126891bd6ed5fdea004ca3e2db55cf03263f5
 MISC metadata.xml 362 BLAKE2B 71e940947887c3c558f6c84124909fef707dd02fd9fbaee18d58df8c0bcef64e01bb65731c64def6d619392b6ed35b2232054e31d63c3c3ab8a59e70c1a36276 SHA512 594d05be889c3a8d6019ee0762773f8abb71f4da276c3a546704ae4e073856fa404f5f9b466502b19423ac9e7f00ad8c2ef85d4adbfebf7fdd0184189e454148
diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r2.ebuild
index 493d47ee9f4b..b2e8f7dd0342 100644
--- a/net-analyzer/nast/nast-0.2.0-r2.ebuild
+++ b/net-analyzer/nast/nast-0.2.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
 HOMEPAGE="https://sourceforge.net/projects/nast.berlios/"
@@ -30,6 +30,11 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	append-cflags -fcommon
+	default
+}
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 68bdda192fa3..7d8474bb9658 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -14,9 +14,9 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c
 DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636
 DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd
 DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
-EBUILD net-snmp-5.8-r1.ebuild 5265 BLAKE2B 04d86f624987dd202722a37b61eb95a9fb0dbbf057ab116dbd1123f24c83051996a6f9f8bffad164134c5012bc935b27d40495bbba5493c64b3fb6e213973d8b SHA512 f321b8658d5d1ee8a0951b5588f9ad37c498676a1a839d4962c921d417a92026b21b795282f9f2ddc68219cfb75a6461224f3de1a8391d58b184ce5b59404a2e
-EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 6518dc5b01b36a4a231186bdee13c955b9df155d06e16c3561df12625b3f5637467dc8daaf27acac2694a1b22f54b8d29669ee779de54e25a1b17cc57c3efdb9 SHA512 c1de2dd6516e2230203d085090790ab566d500975ab94c14c07afafe8c1822b3458f60dae6bb2c55bb576d5c5c5ed73c697d51fa5d8ce947cca6b0198cfa3461
-EBUILD net-snmp-5.8-r5.ebuild 5525 BLAKE2B 78ebeb7d3c888a68f268571154fac87df9fd93b75323ca67c5b4ce99f75bd66be9b4e77e91c762cacfae59fd693168e705f45347adfcb8c1eab10c3cb2210fbc SHA512 ea563da2076f4e4bc8801f70edbbfba08143d54a0edb6a718e34b84a555cae4bec1c5a8ac6606c997be1e1966c593eba80aa27ff67fb4d47069feb446a235f33
-EBUILD net-snmp-5.8.1_pre1.ebuild 5537 BLAKE2B 39899e3b6a102411899a2aa6f97333b7089fe7b57efc52f0f73480d9ec68f14eabda144014df20f18b1e622a3941f80d973f26534d73b30ee47c6ef3adfc194d SHA512 5c7700d10594a526198834b3e8c3ce2386c788174cd559b3f77f6cda54cc7b709d8379520e8b32be7c5e4dd98f0f71f9f14307b4f1b47811e254b96e6ca3797b
-EBUILD net-snmp-99999999.ebuild 5472 BLAKE2B 920488b2dc8c41825d2cb449910572efbe68e88ec5f59483604a2acfe72f3af9d8ded922a1a053d143422f099729b99ecd520b4c4023c19e0143e32746d8da84 SHA512 67db92f7224cfc45805f73197dc779569c11aae8bfed8b394a1e669281e96bf5d1ad88b85188090660e6be688c337578e44f5c65c97c08a9e3836e1f0a928de7
+EBUILD net-snmp-5.8-r3.ebuild 5303 BLAKE2B 72930d1e7bd0139f1d1a27f09fa3eda4e3b184153ceae7fe25222d3bcfd31839ed175008185b555780bd944c01a08733adf9599a84b77fa1503f7ed3c2f6a1ef SHA512 2f53ed6409b466a3e132a29aafde1381c4f9ca617e4d0a48015d966670e1947f828598c815e0f1c25133b0785d38b4ec5b3717e3d71eabf203e1c37e07cf5729
+EBUILD net-snmp-5.8-r4.ebuild 5359 BLAKE2B d5744ee2ae1c68fe865d24201d31b4f39102e3b0b89a864be7cf927fa422291784e8305e9c3b9623fdede4ab0cb157a9ec57a0b725b29059ab5eebef69cb898c SHA512 4e9b41e0d7c156cbe6735bfc2a956fa810f781613fd8e3124599ce2af01e55d64766530323a7a0d1c09186e84612cef0b31fe24fa1d06e44f17703bb3b81e97b
+EBUILD net-snmp-5.8-r5.ebuild 5563 BLAKE2B 82d54a0d14d4387e87981e3f4d2056de351008a9e85b98d03a3481708277b0329300f7ea8f926d00f23cc330d259749c17442ffa9adac25534b43497808fb96b SHA512 d7128fcd4f96959983d7b8c16bd3526ffed6707c37a8f4816e6afc9f786d55151947e154a6d942dbdb4b2675926c83fac53d81b2540a358ae381c80f48e55735
+EBUILD net-snmp-5.8.1_pre1-r1.ebuild 5575 BLAKE2B 8e0504e321bde15ddc3c2c7c9c01d0cab63c1095cbe5884b8ba43bdd450dc1fcd594a488f0d8bb55a461fbcddd8c5158819a234b5f667b7e9bf8e0c6d86cf226 SHA512 7f51fafbfb50c24d7d39c011aa82fefe73fb052f0bb1e97a6ee17a131fe4fe90f148621d13acb6f16842393ba45d493630b1942f214b1ce15dd44fa9a224c136
+EBUILD net-snmp-99999999.ebuild 5510 BLAKE2B aa096796017ff6c8a7adb6af2ea9afd22c4f7d98e64dcdca88a9fb26b39e3f41c2faa5916adffb71ca9577f251c074b6668f8640118c37239ea6bad91e3c37ce SHA512 d92b29f36a951e4a30384dac03b1cb8e30488310a33b376dbb6968af88564e963b834e99ff335dbac12978ac22ac7701914177ca982d17ee7a5b892af9e89bef
 MISC metadata.xml 1296 BLAKE2B 76a0264baf629293eac4127e3dbaf167b5af236e53e0de9cb1c65869242d13e6d5f3c90d47856d5f8c63eba34661698637dd7da56b307d9e6e07403bf91df320 SHA512 ff45396992b1804f3774bd532438b8e64327dfa71c109cde9073f6a5a17f6c3dcc2ba1278359fa10d5eb00c3ead0368706d29178466e9b8586b66e0219d7e4b0
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
deleted file mode 100644
index 8c4fab7b6892..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/35"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
-
-COMMON_DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-S=${WORKDIR}/${P/_p*/}
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
deleted file mode 100644
index 119ec81687a2..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 eutils perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/35"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
-
-COMMON_DEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	bzip2? ( app-arch/bzip2 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	elf? ( dev-libs/elfutils )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	pci? ( sys-apps/pciutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	netlink? ( dev-libs/libnl:3 )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-S=${WORKDIR}/${P/_p*/}
-
-RESTRICT=test
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch
-	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	eapply_user
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	prune_libtool_files
-}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
new file mode 100644
index 000000000000..4906c15987c3
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=3
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/35"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+
+COMMON_DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	pci? ( sys-apps/pciutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	netlink? ( dev-libs/libnl:3 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+S=${WORKDIR}/${P/_p*/}
+
+RESTRICT=test
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	prune_libtool_files
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
new file mode 100644
index 000000000000..2470f8472276
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=3
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 eutils perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/35"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+
+COMMON_DEPEND="
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+	elf? ( dev-libs/elfutils )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	pci? ( sys-apps/pciutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	netlink? ( dev-libs/libnl:3 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+S=${WORKDIR}/${P/_p*/}
+
+RESTRICT=test
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch
+	eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	eapply_user
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	prune_libtool_files
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
index 2b3f66b5294d..e1fa13504cfd 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,7 +39,9 @@ COMMON_DEPEND="
 	pci? ( sys-apps/pciutils )
 	perl? ( dev-lang/perl:= )
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 	rpm? (
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
new file mode 100644
index 000000000000..d853e1f035cd
--- /dev/null
+++ b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+WANT_AUTOMAKE=none
+PATCHSET=3
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools distutils-r1 perl-module systemd
+
+DESCRIPTION="Software for generating and retrieving SNMP data"
+HOMEPAGE="http://www.net-snmp.org/"
+SRC_URI="
+	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}-pre-releases/${P/_pre/.pre}.tar.gz
+	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
+"
+
+S=${WORKDIR}/${P/_/.}
+
+# GPL-2 for the init scripts
+LICENSE="HPND BSD GPL-2"
+SLOT="0/35"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="
+	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
+	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
+"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rpm? ( bzip2 zlib )
+"
+
+COMMON_DEPEND="
+	bzip2? ( app-arch/bzip2 )
+	elf? ( dev-libs/elfutils )
+	lm-sensors? ( sys-apps/lm-sensors )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcap? ( net-libs/libpcap )
+	pci? ( sys-apps/pciutils )
+	perl? ( dev-lang/perl:= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	rpm? (
+		app-arch/rpm
+		dev-libs/popt
+	)
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	zlib? ( >=sys-libs/zlib-1.1.4 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		X? ( dev-perl/Tk )
+		!minimal? ( dev-perl/TermReadKey )
+	)
+	selinux? ( sec-policy/selinux-snmp )
+"
+S=${WORKDIR}/${P/_pre/.pre}
+RESTRICT=test
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
+	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
+	"${FILESDIR}"/${PN}-5.8-pcap.patch
+	"${FILESDIR}"/${PN}-5.8-tinfo.patch
+	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# snmpconf generates config files with proper selinux context
+	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
+
+	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
+	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
+	eapply "${WORKDIR}"/patches/*.patch
+
+	default
+
+	eautoconf
+}
+
+src_configure() {
+	# keep this in the same line, configure.ac arguments are passed down to config.h
+	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
+	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+	use smux && mibs="${mibs} smux"
+
+	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
+	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
+
+	econf \
+		$(use_enable !ssl internal-md5) \
+		$(use_enable ipv6) \
+		$(use_enable mfd-rewrites) \
+		$(use_enable perl embedded-perl) \
+		$(use_enable ucd-compat ucd-snmp-compatibility) \
+		$(use_with bzip2) \
+		$(use_with elf) \
+		$(use_with kmem kmem-usage) \
+		$(use_with mysql) \
+		$(use_with netlink nl) \
+		$(use_with pcap) \
+		$(use_with pci) \
+		$(use_with perl perl-modules INSTALLDIRS=vendor) \
+		$(use_with python python-modules) \
+		$(use_with rpm) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap) \
+		$(use_with zlib) \
+		--enable-shared --disable-static \
+		--with-default-snmp-version="3" \
+		--with-install-prefix="${D}" \
+		--with-ldflags="${LDFLAGS}" \
+		--with-logfile="/var/log/net-snmpd.log" \
+		--with-mib-modules="${mibs}" \
+		--with-persistent-directory="/var/lib/net-snmp" \
+		--with-sys-contact="root@Unknown" \
+		--with-sys-location="Unknown"
+}
+
+src_compile() {
+	for target in snmplib agent sedscript all; do
+		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
+	done
+
+	use doc && emake docsdox
+}
+
+src_install () {
+	# bug #317965
+	emake -j1 DESTDIR="${D}" install
+
+	use python && python_optimize
+
+	if use perl ; then
+		perl_delete_localpod
+		if ! use X; then
+			rm "${D}"/usr/bin/tkmib || die
+		fi
+	else
+		rm -f \
+			"${D}"/usr/bin/fixproc \
+			"${D}"/usr/bin/ipf-mod.pl \
+			"${D}"/usr/bin/mib2c \
+			"${D}"/usr/bin/net-snmp-cert \
+			"${D}"/usr/bin/snmp-bridge-mib \
+			"${D}"/usr/bin/snmpcheck \
+			"${D}"/usr/bin/snmpconf \
+			"${D}"/usr/bin/tkmib \
+			"${D}"/usr/bin/traptoemail \
+			"${D}"/usr/share/snmp/mib2c.perl.conf \
+			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
+			|| die
+	fi
+
+	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
+	newdoc EXAMPLE.conf.def EXAMPLE.conf
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/html/*
+	fi
+
+	keepdir /var/lib/net-snmp
+
+	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
+	newconfd "${FILESDIR}"/snmpd.conf snmpd
+
+	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
+	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
+
+	systemd_dounit "${FILESDIR}"/snmpd.service
+	systemd_dounit "${FILESDIR}"/snmptrapd.service
+
+	insinto /etc/snmp
+	newins "${S}"/EXAMPLE.conf snmpd.conf.example
+
+	# Remove everything not required for an agent.
+	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
+	if use minimal; then
+		rm -rf \
+			"${D}"/**/*.pl \
+			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
+			"${D}"/usr/share/snmp/*.conf \
+			"${D}"/usr/share/snmp/snmpconf-data \
+			|| die
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
deleted file mode 100644
index 0704a753212a..000000000000
--- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=yesplz
-DISTUTILS_OPTIONAL=yesplz
-WANT_AUTOMAKE=none
-PATCHSET=3
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 perl-module systemd
-
-DESCRIPTION="Software for generating and retrieving SNMP data"
-HOMEPAGE="http://www.net-snmp.org/"
-SRC_URI="
-	mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}-pre-releases/${P/_pre/.pre}.tar.gz
-	https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz
-"
-
-S=${WORKDIR}/${P/_/.}
-
-# GPL-2 for the init scripts
-LICENSE="HPND BSD GPL-2"
-SLOT="0/35"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="
-	X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
-	netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
-"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	rpm? ( bzip2 zlib )
-"
-
-COMMON_DEPEND="
-	bzip2? ( app-arch/bzip2 )
-	elf? ( dev-libs/elfutils )
-	lm-sensors? ( sys-apps/lm-sensors )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcap? ( net-libs/libpcap )
-	pci? ( sys-apps/pciutils )
-	perl? ( dev-lang/perl:= )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	rpm? (
-		app-arch/rpm
-		dev-libs/popt
-	)
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.6d:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		X? ( dev-perl/Tk )
-		!minimal? ( dev-perl/TermReadKey )
-	)
-	selinux? ( sec-policy/selinux-snmp )
-"
-S=${WORKDIR}/${P/_pre/.pre}
-RESTRICT=test
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.7.3-include-limits.patch
-	"${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch
-	"${FILESDIR}"/${PN}-5.8-pcap.patch
-	"${FILESDIR}"/${PN}-5.8-tinfo.patch
-	"${FILESDIR}"/${PN}-5.8.1-pkg-config.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# snmpconf generates config files with proper selinux context
-	use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch
-
-	mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die
-	mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die
-	eapply "${WORKDIR}"/patches/*.patch
-
-	default
-
-	eautoconf
-}
-
-src_configure() {
-	# keep this in the same line, configure.ac arguments are passed down to config.h
-	local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable"
-	use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
-	use smux && mibs="${mibs} smux"
-
-	# Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136)
-	use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab
-
-	econf \
-		$(use_enable !ssl internal-md5) \
-		$(use_enable ipv6) \
-		$(use_enable mfd-rewrites) \
-		$(use_enable perl embedded-perl) \
-		$(use_enable ucd-compat ucd-snmp-compatibility) \
-		$(use_with bzip2) \
-		$(use_with elf) \
-		$(use_with kmem kmem-usage) \
-		$(use_with mysql) \
-		$(use_with netlink nl) \
-		$(use_with pcap) \
-		$(use_with pci) \
-		$(use_with perl perl-modules INSTALLDIRS=vendor) \
-		$(use_with python python-modules) \
-		$(use_with rpm) \
-		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		$(use_with zlib) \
-		--enable-shared --disable-static \
-		--with-default-snmp-version="3" \
-		--with-install-prefix="${D}" \
-		--with-ldflags="${LDFLAGS}" \
-		--with-logfile="/var/log/net-snmpd.log" \
-		--with-mib-modules="${mibs}" \
-		--with-persistent-directory="/var/lib/net-snmp" \
-		--with-sys-contact="root@Unknown" \
-		--with-sys-location="Unknown"
-}
-
-src_compile() {
-	for target in snmplib agent sedscript all; do
-		emake OTHERLDFLAGS="${LDFLAGS}" ${target}
-	done
-
-	use doc && emake docsdox
-}
-
-src_install () {
-	# bug #317965
-	emake -j1 DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	if use perl ; then
-		perl_delete_localpod
-		if ! use X; then
-			rm "${D}"/usr/bin/tkmib || die
-		fi
-	else
-		rm -f \
-			"${D}"/usr/bin/fixproc \
-			"${D}"/usr/bin/ipf-mod.pl \
-			"${D}"/usr/bin/mib2c \
-			"${D}"/usr/bin/net-snmp-cert \
-			"${D}"/usr/bin/snmp-bridge-mib \
-			"${D}"/usr/bin/snmpcheck \
-			"${D}"/usr/bin/snmpconf \
-			"${D}"/usr/bin/tkmib \
-			"${D}"/usr/bin/traptoemail \
-			"${D}"/usr/share/snmp/mib2c.perl.conf \
-			"${D}"/usr/share/snmp/snmp_perl_trapd.pl \
-			|| die
-	fi
-
-	dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO
-	newdoc EXAMPLE.conf.def EXAMPLE.conf
-
-	if use doc; then
-		docinto html
-		dodoc -r docs/html/*
-	fi
-
-	keepdir /var/lib/net-snmp
-
-	newinitd "${FILESDIR}"/snmpd.init.2 snmpd
-	newconfd "${FILESDIR}"/snmpd.conf snmpd
-
-	newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd
-	newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd
-
-	systemd_dounit "${FILESDIR}"/snmpd.service
-	systemd_dounit "${FILESDIR}"/snmptrapd.service
-
-	insinto /etc/snmp
-	newins "${S}"/EXAMPLE.conf snmpd.conf.example
-
-	# Remove everything not required for an agent.
-	# Keep only the snmpd, snmptrapd, MIBs, headers and libraries.
-	if use minimal; then
-		rm -rf \
-			"${D}"/**/*.pl \
-			"${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \
-			"${D}"/usr/share/snmp/*.conf \
-			"${D}"/usr/share/snmp/snmpconf-data \
-			|| die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
index 901356c5a939..12ca0cc534b3 100644
--- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,7 +41,9 @@ COMMON_DEPEND="
 	pci? ( sys-apps/pciutils )
 	perl? ( dev-lang/perl:= )
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 	rpm? (
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 7edd9c67e2b9..bf1cc3c55489 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -13,7 +13,7 @@ AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475
 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5
 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.70.ebuild 4512 BLAKE2B 4fd051bb66fe938fa41a587ad79d68044cc9ee0b94f74030cab6c93f71c72a36ce4c4e15050517f8505823268fa8b92e8d119eb574fa1616630e068827b84d13 SHA512 9fddc38177a452869eb958577ed616a991d947578311d58d08db24ab35229e930724ef726f86e12e7178fe9bcaed019322e4e386d0da8db24476a8e0739d3720
-EBUILD nmap-7.80.ebuild 4404 BLAKE2B 5b14582a9f8ba7fb1872b18bc7e4f3a12f91cb46ec71a872947f004fc4b1cb018f65d0839cf06d5f153ccd0ab84c36b9ec549d2955cf5e90f5ef02a468f01c13 SHA512 0eadaa7891d91fe15355d0a24694eae1ef31c72899c841a436eb11e34a4200f61144e0916a05891e765fcee6120420b48378fff6e65407c94e00c5f33786baed
-EBUILD nmap-9999.ebuild 4314 BLAKE2B 17c2e9ce5472fbf6f0fae03648a6f4d95f6156e99844d8bebd913016a20b1a2fbfede0c4d4bb281f3b0204ae84df90cddb6772618c0ceeba9bb84f1f794bacdc SHA512 707c22d6849f3bb7c8fd7c46f88b3e6481613c714a00734279445a4608012a56ff3869b1131be70380410f46a2c5c5a2b4d077d59cad139018c301f09d6d0738
+EBUILD nmap-7.70-r1.ebuild 4550 BLAKE2B af45bdb8ada04592f4b8407110e7b5bebbe6e218035183f7557e1e9a7345901646f89be3a552577555915c91687c6bb5c2ec5e64bd4533f8b74d9a83a7853980 SHA512 669d93675f1d23264ad20e6044a3fe365121dc782da44b8e0b6f59354c45c7ad7306516fd59da6904aeba6086d82942a77451f5c56a2a8a3f5c86fc6a6d67b5d
+EBUILD nmap-7.80-r1.ebuild 4442 BLAKE2B d80731c4b11585f71c75df7ff637e360cbbd6aa77ce5a1d77e9805556ac20471865cdeb268a9307cd40e945cca566306bdbd7c6f01d82d29cf19c82a145d6ed4 SHA512 e098ef3d5e4d0847bc3c1dd1d1e562e0eead66d412b5185b73d5fd6c73c70431dea8ee5c8542efd5db75eb8bee831c2a5a4702216608b58fcd40efc600e8ad1f
+EBUILD nmap-9999.ebuild 4352 BLAKE2B 5301a8be69c471a295c719e41cc684c9f02d98264bdef33ac6b489b0c62fdbb6cd1b81a5ac2b0f415642550061bb3f60aad4a5d15c606a487b3d2cc5e9e3b4cd SHA512 26e536654f45be06d30a41b2f9ed858dec1ac3794d732bd1cf32cd693d683598929486fa6d38e3131f41521b84dfc067afd311073b724d7b277ecac0c7ce1e9e
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
diff --git a/net-analyzer/nmap/nmap-7.70-r1.ebuild b/net-analyzer/nmap/nmap-7.70-r1.ebuild
new file mode 100644
index 000000000000..f6b7e054ca37
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.70-r1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="https://nmap.org/"
+SRC_URI="
+	https://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	zenmap
+"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? ( net-libs/libssh2[zlib] )
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		$(python_gen_cond_dep '
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.70-time.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent unpacking the logo
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	rm -r libpcap/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	local lingua
+	if use nls; then
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	sed -i \
+		-e '/rm -f $@/d' \
+		$(find . -name Makefile.in) \
+		|| die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
+		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
+		configure.ac
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
deleted file mode 100644
index 4dd557296213..000000000000
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="
-	https://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="
-	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
-	zenmap
-"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? ( net-libs/libssh2[zlib] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.70-time.patch
-)
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	# prevent unpacking the logo
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	rm -r libpcap/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	sed -i \
-		-e '/rm -f $@/d' \
-		$(find . -name Makefile.in) \
-		|| die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	sed -i \
-		-e '/AC_CONFIG_SUBDIRS(libz)/d' \
-		-e '/AC_CONFIG_SUBDIRS(libssh2)/d' \
-		configure.ac
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with libssh2) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(use_with zenmap) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}
diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild
new file mode 100644
index 000000000000..a742c24a2323
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.80-r1.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs user
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network discovery and security auditing"
+HOMEPAGE="https://nmap.org/"
+SRC_URI="
+	https://nmap.org/dist/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="
+	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
+	zenmap
+"
+NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
+REQUIRED_USE="
+	system-lua? ( nse )
+	ndiff? ( ${PYTHON_REQUIRED_USE} )
+	zenmap? ( ${PYTHON_REQUIRED_USE} )
+"
+RDEPEND="
+	dev-libs/liblinear:=
+	dev-libs/libpcre
+	net-libs/libpcap
+	libssh2? (
+		net-libs/libssh2[zlib]
+		sys-libs/zlib
+	)
+	ndiff? ( ${PYTHON_DEPS} )
+	nls? ( virtual/libintl )
+	nmap-update? (
+		dev-libs/apr
+		dev-vcs/subversion
+	)
+	nse? ( sys-libs/zlib )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
+	zenmap? (
+		$(python_gen_cond_dep '
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	"${FILESDIR}"/${PN}-5.21-python.patch
+	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
+	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-7.25-libpcre.patch
+	"${FILESDIR}"/${PN}-7.31-libnl.patch
+	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
+)
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use ndiff || use zenmap; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+	default
+
+	local lingua
+	if use nls; then
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			if ! has ${lingua} ${LINGUAS-${lingua}}; then
+				rm -r zenmap/share/zenmap/locale/${lingua} || die
+				rm zenmap/share/zenmap/locale/${lingua}.po || die
+			fi
+		done
+	else
+		# configure/make ignores --disable-nls
+		for lingua in ${NMAP_LINGUAS[@]}; do
+			rm -r zenmap/share/zenmap/locale/${lingua} || die
+			rm zenmap/share/zenmap/locale/${lingua}.po || die
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# we need the original for a Darwin-specific fix, bug #604432
+		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+	fi
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with libssh2) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		$(use_with zenmap) \
+		$(usex libssh2 --with-zlib) \
+		$(usex nse --with-zlib) \
+		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
+		--cache-file="${S}"/config.cache \
+		--with-libdnet=included \
+		--with-pcre=/usr
+	#	Commented out because configure does weird things
+	#	--with-liblinear=/usr \
+}
+
+src_compile() {
+	local directory
+	for directory in . libnetutil nsock/src \
+		$(usex ncat ncat '') \
+		$(usex nmap-update nmap-update '') \
+		$(usex nping nping '')
+	do
+		emake -C "${directory}" makefile.dep
+	done
+
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	if use zenmap; then
+		doicon "${DISTDIR}/nmap-logo-64.png"
+		python_optimize
+	fi
+}
diff --git a/net-analyzer/nmap/nmap-7.80.ebuild b/net-analyzer/nmap/nmap-7.80.ebuild
deleted file mode 100644
index 3d1303bd82a8..000000000000
--- a/net-analyzer/nmap/nmap-7.80.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs user
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network discovery and security auditing"
-HOMEPAGE="https://nmap.org/"
-SRC_URI="
-	https://nmap.org/dist/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="
-	ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua
-	zenmap
-"
-NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-REQUIRED_USE="
-	system-lua? ( nse )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-	zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? (
-		dev-libs/apr
-		dev-vcs/subversion
-	)
-	nse? ( sys-libs/zlib )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
-	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-)
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use ndiff || use zenmap; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	local lingua
-	if use nls; then
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			if ! has ${lingua} ${LINGUAS-${lingua}}; then
-				rm -r zenmap/share/zenmap/locale/${lingua} || die
-				rm zenmap/share/zenmap/locale/${lingua}.po || die
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS[@]}; do
-			rm -r zenmap/share/zenmap/locale/${lingua} || die
-			rm zenmap/share/zenmap/locale/${lingua}.po || die
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with libssh2) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(use_with zenmap) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	Commented out because configure does weird things
-	#	--with-liblinear=/usr \
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nmap-update nmap-update '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use zenmap; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index e5440fa3e63e..7f9ceb695c1b 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -48,7 +48,9 @@ RDEPEND="
 	)
 	system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
 	zenmap? (
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 "
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 117009f24dda..1301ab87a059 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -8,5 +8,5 @@ AUX openvassd.logrotate 330 BLAKE2B faf900a6882bb23c29859080d0c140c9dde8dcab42f3
 AUX openvassd.service 472 BLAKE2B 528c25dbc32cd742753eb6b155a9221f0adde0e792b1e7af376b714831bcc210a228f5a87089f449f6f0e808f46f45d40fd68d9caed44530d57d99c37dbb8b0d SHA512 3497382e6540ddc341cf17e63f1c8d2250249bb51f8dbe379d48c1f90e81d00fdf03349a4dd08c6c6c2dc7336b385fa892b316ff2315a623952d8a2db33681bd
 AUX redis.conf.example 1351 BLAKE2B ad1a99404360b76144944793b2994554799bcc6624abce68524773b7f748075b8bcec79dcf94d2f400132a424a5147a3675d67f48d23a46e28a6afdca83e50a3 SHA512 b5024c26696f49e5d453cef7a0e3838a3fa557b2339a250f95d5367a30564b8a62733c86901ae000f62e916d73162188fbca1c56ed3a078dd99e8e8db1cc2c64
 DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147
-EBUILD openvas-scanner-6.0.1.ebuild 3200 BLAKE2B f6b5b723f4946e4ad05fcf18b5355c9e6b3c1c268ebad6f0bb6dbfa2f54ac979321cdb75e86688b3304a5879aa29b5ae126d26c8e9217b6fdbdf882a03464bbc SHA512 84d003b3a6f0fa44dae6a7cefa3d154d750b81bbff392d6df7f7df6ae5587f4bf964c3ac1331bedc7ade2e13255c58536f2a4ae1272f4a69025d6ee2bdbac606
+EBUILD openvas-scanner-6.0.1.ebuild 3158 BLAKE2B f5f2c45f60642ccbcec6aa7ba4c8bb6f2078f4112cfed12f797a3e9883dd150fe01ffcceed52aaa34ce261671b37f0f7bc5652d480b5e1023db8b7739f12f8ff SHA512 9de0594e29d9e0d73a18ddd06f3a7f5d7247f5a721d62bd01555dadb69a914f0a31aadec6f834e01446c21d76584865a8c5807afb61ae87e8ce5dc0929904b86
 MISC metadata.xml 951 BLAKE2B 195ec0e9becddea6e9c08103473e7d26670d9fa766ed470a37f85d25a79d771654ec0305fe242d240e1255636657d086eb908f12e94fe934c7b7c66a59af7e50 SHA512 577b533837640c4131ca305e047dd6bbfc5456d19afcd91a71a8fd6b4c6cb4a464f346ac140b7e9505b2a5a4302d281616d762bc11eb123993d507cd0129b8a1
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
index aeedaa6e04f9..a1e0d34ebf61 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
@@ -73,7 +73,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
 		"-DLOCALSTATEDIR=${EPREFIX}/var"
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 	)
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index d47fdf31ac49..be04304c7e92 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,6 +1,8 @@
-AUX packit-1.0-fno-common.patch 5729 BLAKE2B 6a7c516baf0bc455f493151268494ea6bc4f08ad577d1c2e4f904292345a8aee9182890c476d7749f75226be4c32d3030bdacddc467da5a4de9d81bb3a9ac81f SHA512 bbcb1dbb69a3b4cf31cc0533f2dacc0482e7ebd00cd157ee80430a3d085051fe2076e0208e7f64df1dfa216b9344c148624c687bcace6a4fe28faafdf76f000b
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
+AUX packit-1.6.1-fno-common.patch 5729 BLAKE2B 6a7c516baf0bc455f493151268494ea6bc4f08ad577d1c2e4f904292345a8aee9182890c476d7749f75226be4c32d3030bdacddc467da5a4de9d81bb3a9ac81f SHA512 bbcb1dbb69a3b4cf31cc0533f2dacc0482e7ebd00cd157ee80430a3d085051fe2076e0208e7f64df1dfa216b9344c148624c687bcace6a4fe28faafdf76f000b
 DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2
-EBUILD packit-1.6.1.ebuild 696 BLAKE2B cf233f44a417f2316df16e8a888be45d81ec6e4718f976ac4a49f1fdb9b996571a760ddf02c74e7143d8c9dbaa8c0a4df97975c94a11b57faf3aa515ab797e7f SHA512 9deb152b0682d2d2cbe6043ffdda2dbe79bac4d96b7f58fd67f4776d0660c3ffa540d665808ab28c2e3692f94895ed3c6f461c922e7d6ef45f7ff9e902fc4ca4
+DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
+EBUILD packit-1.6.1.ebuild 698 BLAKE2B 8faf26054fc9ed7274bb041c5670b8d032b11bdedbafc461e5bbb99b4a516bfd4df53b4c458422570ef0f2c9d135ea8870f45f798f335c0b60095a3ec72a04b5 SHA512 ac398634d37e1f9da624496574afe33d0fd0dc59a4a094106d91687355519aa929e694bade1d4681f57b52f98fb8f394b69db1a86d4011d62cf31cfdd769e754
+EBUILD packit-1.7.ebuild 656 BLAKE2B cfefd879b7e17b8d1b063c10681cece5f41a70504419db2cfddd6ddc87b4ee54388c98146862fa494bf6b4c6fdec1fd39f11165f6bd727bf08deee3ed3620665 SHA512 51d3649ad59e0f814c1d688966c8a09ca0647bafcc0a33c8dc015eb6277bb0071f506dcb7794fec45d6bee72e83b5ef2ecde94e75f16659ef57adf29e08742a6
 EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/packit/files/packit-1.0-fno-common.patch b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
index f4813d868ab1..f4813d868ab1 100644
--- a/net-analyzer/packit/files/packit-1.0-fno-common.patch
+++ b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild
index 9a88e995d225..48ba4aeab1c9 100644
--- a/net-analyzer/packit/packit-1.6.1.ebuild
+++ b/net-analyzer/packit/packit-1.6.1.ebuild
@@ -18,8 +18,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-fno-common.patch
 	"${FILESDIR}"/${PN}-1.0-noopt.patch
+	"${FILESDIR}"/${PN}-1.6.1-fno-common.patch
 )
 
 src_prepare() {
diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild
new file mode 100644
index 000000000000..5059d8e159a0
--- /dev/null
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="network packet generator and capture tool"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit"
+SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="
+	net-libs/libnet:1.1
+	net-libs/libpcap
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-noopt.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc docs/*
+}
diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest
index 19fc6240d997..c09bd59df9da 100644
--- a/net-analyzer/ripe-atlas-tools/Manifest
+++ b/net-analyzer/ripe-atlas-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66
-EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1321 BLAKE2B 5167fd2e1c7527a4b098311f7d5674186b5d4f489206d2ff1e82622ac82f51b94259011188f1f5c90daedb2a1b73d939a4025f3a82834eebd3762a33acbb398d SHA512 0a2dc507a9efcf02cde69690d4e788d8f528b325df13bd787cabb3923342159a069a25a8a17f3129ee608ed42ab51b1abe5f98125fac7366c66ee6fcd6178254
+EBUILD ripe-atlas-tools-1.2.3-r1.ebuild 1311 BLAKE2B 0f04b1356156fa581576459b0432cadffd86fbbbf4173bf67fb0185a4b6090cb5a60ccc07d95e359f3d9c16897bdf826a13802ebc64ad9959a8fe2c8aca650e0 SHA512 4c9021f9a2c97fff338da9eb70f15d324073d29e4519297c4804c3c79d3600457e8f6811f00f66fbd2a62c2e727675e2e2bee14c21f74d00d0e6886ec30fc3e0
 MISC metadata.xml 245 BLAKE2B b9eb390672e4258c0f413eba0dbed731d0f8b2b65275669505e6c5ccdb034944856c212e564f307bc5567203f4897164654f047a2355b9d6f493e0633dce8192 SHA512 d4e3e22b2dde06b42ba712b048c38c8809da125ad6eacb06823f2013d5c9c9b82a4a0b5ffc104f0b786ef048700980c72bed9cabb90a1003db929d2ead0db9d5
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
index fe1fedc35fa3..736af6b37ae0 100644
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index c283b54c9c7d..cd10a60df82f 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -3,6 +3,6 @@ DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06
 DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede
 EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5
 EBUILD scapy-2.4.2.ebuild 1013 BLAKE2B 4af428aa0b92bd5c174fc79d8d5a7ef010b220049d5a3db9b9b204235629ad9711c42d57635905be3f3f50965b215f539086d6fc5bf8be047c98075f90158208 SHA512 0655992680d112db6c7dc5b9c88c5effca5cb274eaaa2f6e055a52162b995f28a29a436279900c7bf1cfe21452b8a10fddc76a43d9b7014eddce0e8fcf946a23
-EBUILD scapy-2.4.3.ebuild 1007 BLAKE2B 3283551001272acd470c718de2bca0ec10089a6d28e4c8f746f10422f9c09ae0a6195bdda98f6e5b22affec7b6cb35e321da78cbfe745918a78629742fea6584 SHA512 4af0b1feb54fe45bb7cd009ec2dd8f26c5c8aa601b33ad1abc67a4df0573a7b200ec2aba72b5555b73d6b108f6e67a353f1bd975380710cbdcf87c2b485bb6a7
+EBUILD scapy-2.4.3.ebuild 1005 BLAKE2B 43241ada322289f7fb8a7f987241dd4115aa0b5a30c575a84b990f2931ea30ede71f4bf2052403e4da4136b6a0a89bd7f1e0c05a351f2714570ede8f0bdd9255 SHA512 429aaeddb0535f18904c064bbd4e08ffba1a8d6519813cae285ab4917fbb78bafc24337eeb30384be8e4da205d5c1a041fb8b30db9075ac09921f4d5a15a7c78
 EBUILD scapy-9999.ebuild 969 BLAKE2B dbf38248cce514847dc8b3dd735c7aefef4a283327db74af9cf39591f543936c5fc91e213d522edbd8aaa0708dee682523ef2fcced676e11a5d272f3f3f97f22 SHA512 b9d85c1dab47372522248772444fe8530ca16dd9ac1c1f4e4419b247c66b102d7236bb3d3c7b58902b55e8c42dadae6b3378e357f97cba30720d9b7fe94fcf6f
 MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf
diff --git a/net-analyzer/scapy/scapy-2.4.3.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild
index 01f3a461396c..2b9cea9f0d1f 100644
--- a/net-analyzer/scapy/scapy-2.4.3.ebuild
+++ b/net-analyzer/scapy/scapy-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RDEPEND="
 	net-analyzer/tcpdump
 "
diff --git a/net-analyzer/siphon/Manifest b/net-analyzer/siphon/Manifest
index 980df9edd8fd..302379c87319 100644
--- a/net-analyzer/siphon/Manifest
+++ b/net-analyzer/siphon/Manifest
@@ -1,5 +1,7 @@
+AUX siphon-666-fno-common.patch 363 BLAKE2B 7c81ccf4a524693fc567b5d36938b5b6047fe30b9edfe2be14c3faed2ecc5b7ca58e67d7345e67a5d975fd66d9b62db43db97aa7f290d65a6b263cbbcaff2501 SHA512 41eba6e4537b56b58810e6a666640aac90046afa75a25fe995a6d7fc90dc7e69ba05f338655635ed167928398af20867b929417e3caad9eb42b31d3a287dbd62
 AUX siphon-666-gentoo.patch 441 BLAKE2B 048df4192f94c80047c95154a8404dee991993219f59123b4c96822e108094ee52299607988ea1311e25e2dd96843c92c03d92e1ab2ce18fc3a58539352d9807 SHA512 66fa0bc1deaa44bdda3d456e79bfacbe5a620365f5cecdb6d18da127d62b3111770a097c6b63e8d83efeb206f3f6577953028dbe49090ffc22e597bc2bf5d4c5
 AUX siphon-666-log.patch 1177 BLAKE2B 7f4e7c9428143558a5ba362526c882f59fac61c4ac4868b3577f9a500aa9ee17c3c1c7d12212dd089c669af1854ecf93c278871cd6f9e5ee9bd8c2124d989251 SHA512 3f82b38442b29083b95475fe26327d2da852dfed172182903adb7cb1dbf9045158462f70239500301d3c1f88005fb6308cddbd8ff48dc885dbc3dcbf355ba4ce
 DIST siphon-v.666.tar.gz 6951 BLAKE2B 8a37897aa52a73819a92422384252cac4cfecfacb4aedbb91af20592b6b831cd78af1dfc9f6da6f5d555c4d742fc9babe04ec446a3b0d214eab9b4cd0ea64883 SHA512 d355e80e7f102af13be9663d8e7cb28d3f3dc823d79192c287a5800e1239e4f37720b449a879605e5df0da1bb8accc3c70a605d94fc925788fe4a2e7bead650a
 EBUILD siphon-666-r1.ebuild 654 BLAKE2B caca1c290089a463d214b53a7bce9828d200d6ad139fd478a5286efb35a252154c629f5bfbe56849f14afce56ca22a96ac81a7d8ee9062b5cecef2b036d07823 SHA512 40a8e9874bd3b9e561f4b43ec39964fa2727caada35603b883edce7c4b4e9184340408b6a0154b0bad81bfd45b7120a26ac54c392aa5464b4ed381bd9878777e
+EBUILD siphon-666-r2.ebuild 660 BLAKE2B ac58988f23b5504a4ad52ec78098a3777f3309617807ecb21637ee656be16e2d1b4350bbe216aba08456898fa836c7f8bbf54da3fe2a070eb8c1c98b022a140c SHA512 91b95433aa67cec74724a630a05d78613036492b7707c71bae691ddde8ea566dbe7e62b87182847f2d5776064e983cb5e564d8072a145755d434dce05b538017
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/siphon/files/siphon-666-fno-common.patch b/net-analyzer/siphon/files/siphon-666-fno-common.patch
new file mode 100644
index 000000000000..c3b1addf1b04
--- /dev/null
+++ b/net-analyzer/siphon/files/siphon-666-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/main.c
++++ b/main.c
+@@ -12,6 +12,9 @@
+ 
+ #include <siphon.h>
+ 
++char *device, *logfile;
++int verbose, back;
++
+ void usage (char *);
+ void title(void);
+ 
+--- a/siphon.h
++++ b/siphon.h
+@@ -51,5 +51,5 @@
+ void *parse (void *);
+ void *siphon_log(void *);
+ 
+-char *device, *logfile;
+-int verbose, back;
++extern char *device, *logfile;
++extern int verbose, back;
diff --git a/net-analyzer/siphon/siphon-666-r2.ebuild b/net-analyzer/siphon/siphon-666-r2.ebuild
new file mode 100644
index 000000000000..7921c66b9a14
--- /dev/null
+++ b/net-analyzer/siphon/siphon-666-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+MY_P=${PN}-v.${PV}
+
+DESCRIPTION="A portable passive network mapping suite"
+HOMEPAGE="http://siphon.datanerds.net/"
+SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-log.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc
+	doins osprints.conf
+	dodoc README
+}
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index cba9b38d69d6..66928bfe6b05 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -11,7 +11,7 @@ DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482
 DIST snort-2.9.15.tar.gz 6704763 BLAKE2B adef13e3368dbbb9e023d79ec4f75c9652af8d26642b83f1f413e39faf966281b09713854e3a8aa385647b375102a667b10ee96d6f1cebb2f92c9fc7f29a2eb5 SHA512 21830dc4c9ce7b5bc96defa800f78de6ad24c1ab96dbeab0d79a7bf4298a81d6bdb4be8fd3bbec3b28b33aa7bb27cdc48a2a00b33c494f68d1649bc609928eea
 DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127e4be207ba6cd3b7c7dff75f4537c86c6a88d744a924b99d0b4ac864add2c9111c63e51dc4c7dc23f8d19a6c792 SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687
 EBUILD snort-2.9.12.ebuild 8872 BLAKE2B 84895cf9afb5ddf3079773ff50d730c56af2b01fc912c9d1fa74bead53fe30332d4971dde35cd3091057fadb06f32c25971823904c8d00caf185d9547ec32a63 SHA512 26ed8dc6c1d020a1fb73d1f12a81700a3d18103038340d00eb44d9891391eb49b2e8a611a3f46bf4d8423cb0586e8449933e7863e0184030f152b246e6696070
-EBUILD snort-2.9.15.1.ebuild 8322 BLAKE2B a30af887835e0d9c4205c323c1227402c444d31ad7fdb6a663932e4b885722f6e25b7c24bc9074c4573fe84facbb95790daa877267901d4dc5aa9a45ea2d0c1c SHA512 26fdf6db522b842641d3fef0ed7e16f1c2a8c1f260277769c8ae12566fad88337236231df2e2015cf8a7efeb04ed953c5edbc9ab8bbd9fe970919b896b3dc6d2
-EBUILD snort-2.9.15.ebuild 8847 BLAKE2B 0103540218a24cceb191285c4dac236621c25f140a4842c7bf70cd3e438afcdebdacf66d9a23de6319028b7f7d8e891f3f2e1eaf0230bc8b034dc1b2e3b34ea5 SHA512 52e5f4bd4f68bb5a85ce4bd27e8067d6ed16b9586fd92f4dce18ccf4380232a78c8249967dc85a9e181c68b70ac3d3d92aa402bf24b146051f465d47e84e2e89
+EBUILD snort-2.9.15.1.ebuild 8290 BLAKE2B a736c8a9d301ffdfca34d9ce0d5b8c7e8ffe07214a9c82a9981699dc40ee5061356b64124a1506b31aca773ff330af25ea6885be166555df349afaacd46e68a7 SHA512 acfef7c2b52430d2965c6d0ebb34b38c3075a291c8c5679d03e01466bde8ffb09a61281ae8c549c4f5fe3577d47af6f581ce45c0820f9c5de63aa0574ba59b12
+EBUILD snort-2.9.15.ebuild 8815 BLAKE2B 4771541a6a443235902d4d4a5a987445ae7289b7e88df69267719952a4dee392be35dfb0c7831a18bbc0dccf6871415f9d77659dd3e21e9a40cc6974ca2fd649 SHA512 bbe56fc788d6494299622106897d5c6835f279aacfd0e6fa98b773ad2ec2fe2d0f86da87b66d84128c13b6aa0b5f76a80d05a40f642c0c0378c1f4afef6412b2
 EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390
 MISC metadata.xml 4042 BLAKE2B 931c99e6b1aee3727e47f32dff6399dc821624fc9cc3be496ba711d480edb04920d2ffcdc9ce4fe6a253be2bbcd4bb45f56a34da530c6dd60140c77b5cc45856 SHA512 2ade0995e40052f3be40a073458a19ea380bb2f75e24905c06b45e88d8956b118db73fbb0a1062e5c0ca837e04d1805a54785a84283e701534ec47c320833b1f
diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 21aba42de764..21bdbd512480 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.1.ebuild
@@ -150,42 +150,42 @@ src_install() {
 
 	# Sourcefire uses Makefiles to install docs causing Bug #297190.
 	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct rule location in the config
 	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct preprocessor/decoder rule location in the config
 	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Enable the preprocessor/decoder rules
 	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Just some clean up of trailing /'s in the config
 	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Make it clear in the config where these are...
 	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Disable all rule files by default.
 	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
@@ -205,17 +205,17 @@ src_install() {
 
 	# Set snort to run as snort:snort
 	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the default log dir
 	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct so_rule location in the config
 	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/snort/snort-2.9.15.ebuild b/net-analyzer/snort/snort-2.9.15.ebuild
index e9688b46d280..38037a16bb2c 100644
--- a/net-analyzer/snort/snort-2.9.15.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.ebuild
@@ -163,42 +163,42 @@ src_install() {
 
 	# Sourcefire uses Makefiles to install docs causing Bug #297190.
 	# This removes the unwanted doc directory and rogue Makefiles.
-	rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
-	rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
 
 	# Remove unneeded .la files (Bug #382863)
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
-	rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
 
 	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
 	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct rule location in the config
 	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct preprocessor/decoder rule location in the config
 	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Enable the preprocessor/decoder rules
 	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Just some clean up of trailing /'s in the config
 	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Make it clear in the config where these are...
 	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Disable all rule files by default.
 	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
@@ -218,17 +218,17 @@ src_install() {
 
 	# Set snort to run as snort:snort
 	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the default log dir
 	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 
 	# Set the correct so_rule location in the config
 	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
-		"${ED%/}/etc/snort/snort.conf.distrib" || die
+		"${ED}/etc/snort/snort.conf.distrib" || die
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest
index 76ca33084ccf..58619a802783 100644
--- a/net-analyzer/suricata/Manifest
+++ b/net-analyzer/suricata/Manifest
@@ -5,5 +5,5 @@ AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83
 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c
 AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd
 DIST suricata-5.0.1.tar.gz 23721536 BLAKE2B 529837e8e4d6c33d2093df8208bf03519e0d60deef92eadf9d0a44b7416eae2f900b2f72349815acb86d9bdd9d4253bbc5d7c4c1a34157f544982b0788291624 SHA512 db0797a7992abf0ddf170cb603fdac06b0ff92278bb91343860bccbbe029ea0e83131dfb9805ca44bcbbe3925502119259e350a17e94209b21d1f8b610d965a6
-EBUILD suricata-5.0.1.ebuild 6229 BLAKE2B 46d8b05dfb1d25c5efb6867872be88a2080b739805af87eac562c97613f01966179bdfacb78d0df59b945cebfafc5879830077478d077b29b77b781cf2f17ae1 SHA512 3d81c148662e8450676e4eaa481ba97003cd7db6b617e421b38828d4cacb371362d28f4177d2e9ce6faa19437feb05b5e11f83f26e9998ee78e21735619c52fd
+EBUILD suricata-5.0.1-r1.ebuild 6265 BLAKE2B e55ba367e62b811a2143a29f422b3f9562c491142887e72c6c336c8c28b8cb4835f9e0b836974ecd1fbcec7e8d6f5964ed107a3076487b510b5f35caa67964f6 SHA512 db261a8a1ee914f0e3708640023a13c53abc8b685c026652dac422cdaaa7c71f2676e53669bbc994f07f2fda4b78f6671dc332b8cdefacba170bd7e00cc1c5da
 MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5
diff --git a/net-analyzer/suricata/suricata-5.0.1-r1.ebuild b/net-analyzer/suricata/suricata-5.0.1-r1.ebuild
new file mode 100644
index 000000000000..e74f32fee51a
--- /dev/null
+++ b/net-analyzer/suricata/suricata-5.0.1-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools flag-o-matic linux-info python-single-r1 systemd
+
+DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
+HOMEPAGE="https://suricata-ids.org/"
+SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( lua luajit )
+	bpf? ( af-packet )"
+
+CDEPEND="acct-group/suricata
+	acct-user/suricata
+	dev-libs/jansson
+	dev-libs/libpcre
+	dev-libs/libyaml
+	net-libs/libnet:*
+	net-libs/libnfnetlink
+	dev-libs/nspr
+	dev-libs/nss
+	$(python_gen_cond_dep '
+		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-libs/libhtp-0.5.32
+	net-libs/libpcap
+	sys-apps/file
+	sys-libs/libcap-ng
+	bpf?        ( >=dev-libs/libbpf-0.0.6 )
+	cuda?       ( dev-util/nvidia-cuda-toolkit )
+	geoip?      ( dev-libs/libmaxminddb )
+	logrotate?  ( app-admin/logrotate )
+	lua?        ( dev-lang/lua:* )
+	luajit?     ( dev-lang/luajit:* )
+	lz4?        ( app-arch/lz4 )
+	nflog?      ( net-libs/libnetfilter_log )
+	nfqueue?    ( net-libs/libnetfilter_queue )
+	redis?      ( dev-libs/hiredis )"
+DEPEND="${CDEPEND}
+	>=sys-devel/autoconf-2.69-r5
+	virtual/rust"
+RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
+	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
+)
+
+pkg_pretend() {
+	if use bpf && use kernel_linux; then
+		if kernel_is -lt 4 15; then
+			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
+		fi
+
+		CONFIG_CHECK="~XDP_SOCKETS"
+		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata will to load XDP programs. "
+		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	# Bug #707204
+	append-cflags $(test-flags-CC -fcommon)
+
+	default
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--localstatedir=/var" \
+		"--runstatedir=/run" \
+		"--enable-non-bundled-htp" \
+		"--enable-gccmarch-native=no" \
+		"--enable-python" \
+		$(use_enable af-packet) \
+		$(use_enable bpf ebpf) \
+		$(use_enable control-socket unix-socket) \
+		$(use_enable cuda) \
+		$(use_enable detection) \
+		$(use_enable geoip) \
+		$(use_enable hardened gccprotect) \
+		$(use_enable hardened pie) \
+		$(use_enable lua) \
+		$(use_enable luajit) \
+		$(use_enable lz4) \
+		$(use_enable nflog) \
+		$(use_enable nfqueue) \
+		$(use_enable redis hiredis) \
+		$(use_enable test unittests) \
+		"--disable-coccinelle"
+	)
+
+	if use debug; then
+		myeconfargs+=( $(use_enable debug) )
+		# so we can get a backtrace according to "reporting bugs" on upstream web site
+		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
+	else
+		econf ${myeconfargs[@]}
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	python_optimize
+
+	if use bpf; then
+		rm -f ebpf/Makefile.{am,in}
+		dodoc -r ebpf/
+		keepdir /usr/libexec/suricata/ebpf
+	fi
+
+	insinto "/etc/${PN}"
+	doins etc/{classification,reference}.config threshold.config suricata.yaml
+
+	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+	keepdir "/var/log/${PN}"
+
+	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
+	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
+
+	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
+	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	if use logrotate; then
+		insopts -m0644
+		insinto /etc/logrotate.d
+		newins etc/${PN}.logrotate ${PN}
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	if use systemd; then
+		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
+		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
+		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
+		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
+		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
+		elog "For details, see the section on drop-in directories in systemd.unit(5)."
+	else
+		elog "The ${PN} init script expects to find the path to the configuration"
+		elog "file as well as extra options in /etc/conf.d."
+		elog ""
+		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
+		elog "then create a symlink to the init script from a link called"
+		elog "${PN}.foo - like so"
+		elog "   cd /etc/${PN}"
+		elog "   ${EDITOR##*/} suricata-foo.yaml"
+		elog "   cd /etc/init.d"
+		elog "   ln -s ${PN} ${PN}.foo"
+		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
+		elog ""
+		elog "You can create as many ${PN}.foo* services as you wish."
+	fi
+
+	if use bpf; then
+		elog ""
+		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
+		elog "because their configuration is hard-coded. You can find the default ones in"
+		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
+		elog "and the common location for eBPF bytecode is"
+		elog "    ${EPREFIX}/usr/libexec/${PN}"
+		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
+	fi
+
+	if use debug; then
+		elog ""
+		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
+		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
+		elog "You need to also ensure the FEATURES variable in make.conf contains the"
+		elog "'nostrip' option to produce useful core dumps or back traces."
+	fi
+
+	elog ""
+	elog "To download and install an initial set of rules, run:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+	elog ""
+}
+
+pkg_config() {
+	suricata-update
+}
diff --git a/net-analyzer/suricata/suricata-5.0.1.ebuild b/net-analyzer/suricata/suricata-5.0.1.ebuild
deleted file mode 100644
index d09d4b1a9847..000000000000
--- a/net-analyzer/suricata/suricata-5.0.1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools flag-o-matic linux-info python-single-r1 systemd
-
-DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine"
-HOMEPAGE="https://suricata-ids.org/"
-SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( lua luajit )
-	bpf? ( af-packet )"
-
-CDEPEND="acct-group/suricata
-	acct-user/suricata
-	dev-libs/jansson
-	dev-libs/libpcre
-	dev-libs/libyaml
-	net-libs/libnet:*
-	net-libs/libnfnetlink
-	dev-libs/nspr
-	dev-libs/nss
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=net-libs/libhtp-0.5.32
-	net-libs/libpcap
-	sys-apps/file
-	sys-libs/libcap-ng
-	bpf?        ( >=dev-libs/libbpf-0.0.6 )
-	cuda?       ( dev-util/nvidia-cuda-toolkit )
-	geoip?      ( dev-libs/libmaxminddb )
-	logrotate?  ( app-admin/logrotate )
-	lua?        ( dev-lang/lua:* )
-	luajit?     ( dev-lang/luajit:* )
-	lz4?        ( app-arch/lz4 )
-	nflog?      ( net-libs/libnetfilter_log )
-	nfqueue?    ( net-libs/libnetfilter_queue )
-	redis?      ( dev-libs/hiredis )"
-DEPEND="${CDEPEND}
-	>=sys-devel/autoconf-2.69-r5
-	virtual/rust"
-RDEPEND="${CDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
-	"${FILESDIR}/${PN}-5.0.1_default-config.patch"
-)
-
-pkg_pretend() {
-	if use bpf && use kernel_linux; then
-		if kernel_is -lt 4 15; then
-			ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map"
-		fi
-
-		CONFIG_CHECK="~XDP_SOCKETS"
-		ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata will to load XDP programs. "
-		ERROR_XDP_SOCKETS+="Other eBPF features should work normally."
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	# Bug #707204
-	append-cflags $(test-flags-CC -fcommon)
-
-	default
-	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am"
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		"--localstatedir=/var" \
-		"--runstatedir=/run" \
-		"--enable-non-bundled-htp" \
-		"--enable-gccmarch-native=no" \
-		"--enable-python" \
-		$(use_enable af-packet) \
-		$(use_enable bpf ebpf) \
-		$(use_enable control-socket unix-socket) \
-		$(use_enable cuda) \
-		$(use_enable detection) \
-		$(use_enable geoip) \
-		$(use_enable hardened gccprotect) \
-		$(use_enable hardened pie) \
-		$(use_enable lua) \
-		$(use_enable luajit) \
-		$(use_enable lz4) \
-		$(use_enable nflog) \
-		$(use_enable nfqueue) \
-		$(use_enable redis hiredis) \
-		$(use_enable test unittests) \
-		"--disable-coccinelle"
-	)
-
-	if use debug; then
-		myeconfargs+=( $(use_enable debug) )
-		# so we can get a backtrace according to "reporting bugs" on upstream web site
-		CFLAGS="-ggdb -O0" econf ${myeconfargs[@]}
-	else
-		econf ${myeconfargs[@]}
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	python_optimize
-
-	if use bpf; then
-		rm -f ebpf/Makefile.{am,in}
-		dodoc -r ebpf/
-		keepdir /usr/libexec/suricata/ebpf
-	fi
-
-	insinto "/etc/${PN}"
-	doins etc/{classification,reference}.config threshold.config suricata.yaml
-
-	keepdir "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-	keepdir "/var/log/${PN}"
-
-	fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}"
-	fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update"
-
-	newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN}
-	newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
-
-	if use logrotate; then
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins etc/${PN}.logrotate ${PN}
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	if use systemd; then
-		elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)"
-		elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies"
-		elog "on file configuration to specify interfaces, should you prefer to run it differently you will have to customise"
-		elog "said unit. The simplest way of doing it is to override the Environment=OPTIONS='...' line using a .conf file"
-		elog "placed in the directory ${EPREFIX}/etc/systemd/system/suricata.service.d/ ."
-		elog "For details, see the section on drop-in directories in systemd.unit(5)."
-	else
-		elog "The ${PN} init script expects to find the path to the configuration"
-		elog "file as well as extra options in /etc/conf.d."
-		elog ""
-		elog "To create more than one ${PN} service, simply create a new .yaml file for it"
-		elog "then create a symlink to the init script from a link called"
-		elog "${PN}.foo - like so"
-		elog "   cd /etc/${PN}"
-		elog "   ${EDITOR##*/} suricata-foo.yaml"
-		elog "   cd /etc/init.d"
-		elog "   ln -s ${PN} ${PN}.foo"
-		elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo."
-		elog ""
-		elog "You can create as many ${PN}.foo* services as you wish."
-	fi
-
-	if use bpf; then
-		elog ""
-		elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use"
-		elog "because their configuration is hard-coded. You can find the default ones in"
-		elog "    ${EPREFIX}/usr/share/doc/${PF}/ebpf"
-		elog "and the common location for eBPF bytecode is"
-		elog "    ${EPREFIX}/usr/libexec/${PN}"
-		elog "For more information, see https://${PN}.readthedocs.io/en/${P}/capture-hardware/ebpf-xdp.html"
-	fi
-
-	if use debug; then
-		elog ""
-		elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:"
-		elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs"
-		elog "You need to also ensure the FEATURES variable in make.conf contains the"
-		elog "'nostrip' option to produce useful core dumps or back traces."
-	fi
-
-	elog ""
-	elog "To download and install an initial set of rules, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog ""
-}
-
-pkg_config() {
-	suricata-update
-}
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 3096679c61d6..77c4909a5057 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -2,5 +2,5 @@ AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a
 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22
 EBUILD tcpdump-4.9.3-r1.ebuild 1930 BLAKE2B 27db7633b2afaf4d15024e1493d828a13a291ec94379a311173c2adef25f58b2dc207f3f665c4c7f7a54c006332bb94580f98d290d5508aafde63329e6b9ff78 SHA512 68c84a450281cfbcf079cc1b5087f8867632ae65754cf9d70d253ab2a68f45dfca2562edcb5f5e772dad0261644a1b2ae80e2531e10f3580109449688d910b1a
 EBUILD tcpdump-4.9.3.ebuild 1973 BLAKE2B 62eaae055f4efc70140710f2bf5a86aa7cca74f08da9fe2f2d8de0a555fee9a2ac16f0f1f13686157e05442ed704e98307958f1c26d8b9cad6f1aef4fb360379 SHA512 03c2b1f549fa25da311a19fef8a8deebb7a2fc378a75ccf0957dc0637dca581d4be65d53378b7413e81007e1b06c976cee1464498a2bfd711dce069dff922505
-EBUILD tcpdump-9999.ebuild 2243 BLAKE2B 2e86614481c991ecf8e087bfcdce3bf22f203589456a7279c38446d321efbd10bf3912845d0334175a296b762154d12ad510ce5b94c3facdf9778823e26e9cee SHA512 2a7dbdfdbb19b19e1f3d30da1f843a070a1d19f929a6509a99d843ebc8fd5c644cbb58f37b93c72e8ad8937938fddd1a893dfd3df526b5a1d0ad49a531746eb1
+EBUILD tcpdump-9999.ebuild 2271 BLAKE2B 6f81a6c411fdb6664110e6b4a0a5355c4d2e3dde6947cc65db3ed0ac999e22442debb58520390484a3541b69856eb515d1f126e491688384890a788734339578 SHA512 d51ca992cd8ec90db0dacf7516cb0d22b6299be304971ccfb95417ded360634910cff5ba8415e8588c87a6fdfa2f1ba47136fd17d43217e41fdf8f1924c728b5
 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 53e77a2204b0..cb1394377af7 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A Tool for network monitoring and data acquisition"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
 HOMEPAGE="
 	https://www.tcpdump.org/
-	${EGIT_REPO_URI}
+	https://github.com/the-tcpdump-group/tcpdump
 "
 
 LICENSE="BSD"
diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest
index aba83b513961..fe1240417117 100644
--- a/net-analyzer/telegraf/Manifest
+++ b/net-analyzer/telegraf/Manifest
@@ -208,11 +208,14 @@ DIST telegraf-1.11.5-vendor.tar.gz 70214304 BLAKE2B 64cfaa9f207835e043f5df002d14
 DIST telegraf-1.11.5.tar.gz 1471311 BLAKE2B 7c5b7c2b835ee8c943baf01bb3515fb724b10b04682254e0fd501c7f066fe67a4ef18c0d3442b676448ccb8cd0430099e56ad0cc3970eee3f9d80d540271f4df SHA512 1e6001981693e4612ba34a680f1c3349c2f203d8ba2983f3841fad08b68251a942beef6cc462cb64b95eba1412ea6a35a863ff9426270896c50c83e6f177ca5d
 DIST telegraf-1.12.1-vendor.tar.gz 128021524 BLAKE2B f4db3e4d2998959c850a82ea77c1c02c5195e6bd5eef4d55521bbaa0e3355b21554e1a179585d57d8fce1fd061d8f157fddb2dde5091c15062811902c014b835 SHA512 2a501d9456a3a130a4202e87e2c0b44c9b2d5fefca12601f0a3fea6073c97fb7b40dd86546fe291b740b38ecf57843fff18a6f4280482af915b3be9e7270b597
 DIST telegraf-1.12.1.tar.gz 1561005 BLAKE2B 997e3deddc13acb6c0af41d5f622353facfd1c09e76640965c8ebe447e06a7cf5bb25753b8c67b2c7c1af7c3d50f787acc23e5b5a45253db943031a130c33d39 SHA512 8018d48482ec1cdada9d57bb6b8068a0758d58908a4c88deb089645282fde662191bd356e0081178b0e7bc1be6bb19cb2c29bba0039398b7d64f53de9fbf87d6
+DIST telegraf-1.13.3-vendor.tar.gz 142151740 BLAKE2B 9068835a6b75721732998ed50f23a6e6e90d92eee32c3ff1bb07fb19942e6f808289b459b34a6b83920c323c00063a91d2bb2e38d457a7a512b43715bc7d7dc0 SHA512 db56f4ecf1802a21405ae7db80281b5155b6f4922dd8e49aa48b554ff3bf179810fae3de3f6ea0e6ee661683e0e9f0536919fd912ea3de827f7c85aa314fff36
+DIST telegraf-1.13.3.tar.gz 1640358 BLAKE2B eda968676b42ddfd1f447326463feaabe0860425ea1688ccf19a248f652ec4828c5cae1c302a7129a62a6557eb2c0a206476bfc7082a89d4bffcd3113bad0e81 SHA512 ac71f054ffccf5f1d27db6e68989a2440b975087f91cce487b58df2bd6984378d86fb992f7a7f11aabf7b20937258d05893b74fb5d6f83a8db8449e80cf1d2fd
 DIST telegraf-1.5.3.tar.gz 911976 BLAKE2B 3e67a037eb22be88de700131f15120faa13b7a9bd8404f76c29376e3e4da630d84767fd8cbff45b3e14e6ce836dcc68a2a87b462eb91d398d57370c1112879c0 SHA512 48e80a4f3f00b5c18f584e28836c36abd7b7f9bacb33dd90ff569dbdc0a5bf69e29d38ae2d74a9c14ee6dc3400dda91e586dd31bc11522257c2206efb3e93348
 DIST telegraf-1.8.3.tar.gz 1205303 BLAKE2B 60579cca57863362cb4003f8da4326cef0d1bc4986d07d38f4b594556736ad79e0363098df41c13a2d10bbeeccce20fabcd0b07c7e187cbeecb5c561008d587e SHA512 367069b3578529307d5fa6eb14eabf78a44743d75e5df7c3860b35de212b5809c54cd1a7c791076137f60096d227774b4d5206606cd3fad08594721b4b49de4e
 EBUILD telegraf-1.10.4.ebuild 1350 BLAKE2B 4cd393ebb9c9afb4c9b381b9f9cd44c5af5c746022de949777697e75d30c69fb1b0f10db2216f4e765a26b160dbe6f65b7d60f6f1a7bf84537b60640293751ea SHA512 9ec1991dde6f6a1f88576e582b5e96e094f524c4e9b90ed3e7ab2e02cef8382b3f9573fdc48520d29099f8d7592656f65dd83c163e0c5da9cc7761869688c1fc
 EBUILD telegraf-1.11.5.ebuild 1322 BLAKE2B 14008a83e185b981e8f6c88976bb60f9c729290f22c3487bf4203144eba978492f7182d1fa2c38cd8cef62c937b2c6c8a0255caf5a5ca0709f5a2c5054552b9c SHA512 c61ea226f0d8f7154a50df3678235a8af0bb56e2b5dbc40dee8449ff5798f655a8c4ca3f924858ab900eaf759959c2dbca19b6869eb18ee3ed0e272c7cc76674
 EBUILD telegraf-1.12.1.ebuild 1322 BLAKE2B 2ea627b1fc2a03232b9411bc11108554d1d3b2954943fb2e833513fa833b633e5935182fc8024654513b3fa4b5469f0a4c7766b2cb93cbede2ebdc3855148760 SHA512 e3983382e9e04d63a0edb11039b526ff8ff0f0ee939811a556682cb800a9d389809aeb46d38ffad49b5e4abff2e40dc28928d95703abdd728bbc7376e97d62cf
+EBUILD telegraf-1.13.3.ebuild 1315 BLAKE2B efd7dad84f51b913b3d11017853b2d7e5fdc521ea8b62bec10724a5479bc95c960a81f221ed9dab16321510530c2ee83c32c9d2a4a66efa3f5f0e5584ebcf107 SHA512 da001910a5469f3db57c03e5a1661adf112806f1ba2a20821cce6fdb13f2b8552055d4d3eb708891be63a993b8e1c0147eb211f00a76a79700d452b99dd6044e
 EBUILD telegraf-1.5.3.ebuild 8161 BLAKE2B 53f9c9b2fc23e06e2d8cea9d11198fa0b8b91cd8c5721a7baaac36a300473da2b2494399f0786d9dbf022fa92093f9bf1eeb234a314ed97bdb97a48c6d6df730 SHA512 ecd1b258a0932732f4a738ef4baae5e7b7ae97eb076cc2d3ff6e824429e75b64d3c70385e843fe27daa1a09d8bb80a9977291bc8808922ea46100ab99f09e779
 EBUILD telegraf-1.8.3.ebuild 10888 BLAKE2B 84331e20f7ada3e7e1882a6a0e34ba3f2d764350265dc199edefb21a247e3e89be1bb9ae216782bb8b7e0af7bb160972be8084341ef86d37c2a101d1e89d2a52 SHA512 ab279f166ad698c7547a8c26a155ac2566829a71d01654df7f8bc4a9ee5f4278e5fb79da39ffae7dac949ee1181f53eb6ba94e9e28272fd918b92ed40e60400a
 MISC metadata.xml 397 BLAKE2B 2a5052554a207a61b00ce3997cd42292b00aaa7a434aee3361abc24057d705c0ec82885550a0515439775fec013319c325b911684bc351f9478adf4a0b7c26d1 SHA512 e27b2a6ed4fe38df2a3ab0d70fe4e82bbe874987be1cfa26df2ff5cdfa93a1fd55b19fa6c901ea1adda058fafc703d15438bdd3119023f4da0e2fd5cc915a52e
diff --git a/net-analyzer/telegraf/telegraf-1.13.3.ebuild b/net-analyzer/telegraf/telegraf-1.13.3.ebuild
new file mode 100644
index 000000000000..264ae05a70d3
--- /dev/null
+++ b/net-analyzer/telegraf/telegraf-1.13.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/influxdata/telegraf
+
+inherit systemd
+
+MY_PV="${PV/_rc/-rc.}"
+COMMIT=da364558
+
+DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics."
+HOMEPAGE="https://github.com/influxdata/telegraf"
+SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+
+BDEPEND="dev-lang/go"
+DEPEND="acct-group/telegraf
+	acct-user/telegraf"
+	RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	mv ../vendor .
+}
+
+src_compile() {
+	echo module ${EGO_PN} > go.mod
+	set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \
+		-ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \
+		cmd/telegraf/telegraf.go
+	echo "$@"
+	"$@" || die
+}
+
+src_install() {
+	dobin telegraf
+	insinto /etc/telegraf
+	doins etc/telegraf.conf
+	keepdir /etc/telegraf/telegraf.d
+
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/telegraf
+
+systemd_dounit scripts/telegraf.service
+	newconfd "${FILESDIR}"/telegraf.confd telegraf
+	newinitd "${FILESDIR}"/telegraf.rc telegraf
+
+	dodoc -r docs/*
+
+	keepdir /var/log/telegraf
+	fowners telegraf:telegraf /var/log/telegraf
+}
diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest
index 21d0a8dce689..746ba58a445c 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1,5 +1,5 @@
-DIST testssl-2.9.5_p7.tar.gz 8955971 BLAKE2B 6ca3bc60445c9448c3dc24ee7262e57bc03a2c686bbeebcc1cc850edfa652538c1ba5365189c27e78f0cb977e68d2ea1a9f940d47cd0a53402d1fa9a31a33483 SHA512 35ab900b84db8a0a210cb9ce8bb794ff7e8cddd5c85a151083bc76eba834dce37597b29b6235fcf2ce37b004dd295b1756e01374a4943e1e2ed0d2a8cf8761f6
 DIST testssl-2.9.5_p8.tar.gz 8956035 BLAKE2B 692e08e6ff3dedf52dad5ba960291043740fa4e8e8f117b5dff93adfe1a620add3a34660fcbc1c68b53e23b0df5a0ff1862a33b12a50e78312c65791e0a55b42 SHA512 4c0fd1faa8978f85b46a6ae41471e16c8ab2d5651bdb6e009478aeed7b363a3648ff44e6e7689ccf421bd5e6374a2b5bfe9e5a13f7284c3a46371ed58ce4e5fb
-EBUILD testssl-2.9.5_p7.ebuild 1527 BLAKE2B 8dddf30b779034c519b25dc3c7b1951517ad2ed2623a3ba6b85d259521509032457206034735d80bc1f8475f80786594f9de11b3623c090bfcc1903afe497c1b SHA512 ae42c3b0397f7bbcb19dc1547c7d27cea64f4613482ed2b06df504533edc8b41d84ab2be9d486694d711d9c7019689cd28e1a7efa630aabb47cf3345bf0d752f
+DIST testssl-3.0.tar.gz 9207778 BLAKE2B 56f13cb58bc930e0c70ef1ff4734dd7e363f362397ebe354c446f1fd6e73a0774a6eb84326a405a5aab224b058754e03fcecda254617eee2fde4d9566ada4e15 SHA512 a5e65d3145bc422cf03b49087cc24cadca367206a06dda61d114b0a6afd7c4921204e23cdc3ade2f5d7e9ce4adf17b54691b9d33d46b75b296111663e9cf063a
 EBUILD testssl-2.9.5_p8.ebuild 1510 BLAKE2B 9103b39ff060c190ff809e9aa0023ef6a34afc41fe524f3473243b215bc3171d919fefcf3b1504952afe0413991694eb507f4df52b6a2b4367f14c462b1b3490 SHA512 15175ab1c822895d967e3ab186efcc93d423f50b6e201d80ae8235692cbbe89ebb0fa8135b442fcc2cb27eeefdd1e0d9841c8addbc6589198d3bf466b18155be
+EBUILD testssl-3.0.ebuild 1511 BLAKE2B 7bb402e6ecfa6ba7ec5a3b3f1411837c0fbbb35d014ce61fe80eb9eabf8fedd0375d1366019496ea4dd27bf7ee445d1e3c0203085e7dc912290f69246bf2b0fe SHA512 af622b997573b6b82392d4538dd1fb29dd0f72e05b5f1743b0b415d31638f72b73091216eb3b73f3010c5291a26af34aab57a9e28130896b11f6625ab87f4e17
 MISC metadata.xml 427 BLAKE2B 5504150e6ed2e079db47b71afd8826e0543162d259ffb690caab572f6f87cf358ec4216b7859c274047f4d880aed40ab6858633856e12f9d9d05683198b75fba SHA512 83dacfa2293a8f14bce97a01f732376e76f84c4eb4fffbed1049b08210850cc5b54381d83df15bec2ecc1c1a592148d538ac37053b36fa1022542e023a97d9ab
diff --git a/net-analyzer/testssl/testssl-2.9.5_p7.ebuild b/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
deleted file mode 100644
index 4398957f634b..000000000000
--- a/net-analyzer/testssl/testssl-2.9.5_p7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}.sh"
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Tool to check TLS/SSL cipher support"
-HOMEPAGE="https://testssl.sh/"
-SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 bundled-openssl? ( openssl )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bundled-openssl kerberos"
-
-RDEPEND="
-	app-shells/bash[net]
-	net-dns/bind-tools
-	sys-apps/util-linux
-	sys-libs/ncurses:0
-	sys-process/procps
-	bundled-openssl? (
-		kerberos? (
-			sys-libs/zlib
-			virtual/krb5
-		)
-	)
-	!bundled-openssl? ( dev-libs/openssl:0 )
-"
-
-S=${WORKDIR}/${MY_PN}-${MY_PV}
-
-QA_PREBUILT="opt/${PN}/*"
-
-pkg_setup() {
-	if use amd64; then
-		if use kerberos; then
-			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
-		else
-			BUNDLED_OPENSSL="openssl.Linux.x86_64"
-		fi
-	elif use x86; then
-		BUNDLED_OPENSSL="openssl.Linux.i686"
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i ${PN}.sh \
-		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
-		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
-
-	if use bundled-openssl; then
-		sed -i ${PN}.sh \
-			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
-	fi
-}
-
-src_install() {
-	dodoc CHANGELOG.stable-releases.txt CREDITS.md Readme.md
-	dodoc openssl-rfc.mappping.html
-
-	dobin ${PN}.sh
-
-	insinto /etc/${PN}
-	doins etc/*
-
-	if use bundled-openssl; then
-		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
-	fi
-}
diff --git a/net-analyzer/testssl/testssl-3.0.ebuild b/net-analyzer/testssl/testssl-3.0.ebuild
new file mode 100644
index 000000000000..8a2472e4e275
--- /dev/null
+++ b/net-analyzer/testssl/testssl-3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 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/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 bundled-openssl? ( openssl )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-openssl kerberos"
+
+RDEPEND="
+	app-shells/bash[net]
+	net-dns/bind-tools
+	sys-apps/util-linux
+	sys-libs/ncurses:0
+	sys-process/procps
+	bundled-openssl? (
+		kerberos? (
+			sys-libs/zlib
+			virtual/krb5
+		)
+	)
+	!bundled-openssl? ( dev-libs/openssl:0 )
+"
+
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+QA_PREBUILT="opt/${PN}/*"
+
+pkg_setup() {
+	if use amd64; then
+		if use kerberos; then
+			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5"
+		else
+			BUNDLED_OPENSSL="openssl.Linux.x86_64"
+		fi
+	elif use x86; then
+		BUNDLED_OPENSSL="openssl.Linux.i686"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i ${PN}.sh \
+		-e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \
+		-e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die
+
+	if use bundled-openssl; then
+		sed -i ${PN}.sh \
+			-e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die
+	fi
+}
+
+src_install() {
+	dodoc CHANGELOG.md CREDITS.md Readme.md
+	dodoc openssl-iana.mapping.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-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index 0adc21e4d8cb..bf23375592bf 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,5 +1,5 @@
 DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e
 DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304
 EBUILD traceroute-nanog-6.4.2-r1.ebuild 908 BLAKE2B 410763ccd772317187ba9bab3b8d75f0c796fb229796294e8f6442a3eefcf2e1fc6ab8973687821f750e91828c49edb74a49670e8624781bea716aaf927f0095 SHA512 8c390c84866ba38e150ce73d3ad126bca4a327064ad9507a12630c1e4de36ec5b453cbc569d368aa92b9e8abeb7a0395cde1149a6945178dfe5d02b553d6a838
-EBUILD traceroute-nanog-6.4.2_p1.ebuild 945 BLAKE2B 3795c0fd471664504c14ff5081a67cad311ca096f2fd45926e67c799a06db6edb41aad3e33009a8b722441e9e92fc3d4c127316c5a12c972de1a690339c06635 SHA512 ea5f8470fc6b4c79c16b76102f89197773b5d5b556d0e2bad6bb5a9cb943b413501478c461002b65e8097851fe10201749afb8d09d4a92a129ef661c67113e2a
+EBUILD traceroute-nanog-6.4.2_p1.ebuild 962 BLAKE2B c5b817c817ab0a817f09b9afc76312d501966e325c5f325b638d54291bda504ce005bf50b6bf97c95f75e0532a5e873d081c1ade938d8d43951c420cdda39921 SHA512 4faeb0aefade3ba7e0036f1f3f6aa784e9dd94d8ca3614ff4d0b566758e685b2f58e60fbc023554c71e0fba063c227bfa9786680b2873fc04757205e05d1cd2a
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
index 975f26afff90..a87291d431d1 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DEB_PL="1"
 DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}_${PV/_p*}.orig.tar.gz
 	https://dev.gentoo.org/~jer/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index fd19b5cc544e..287b907d063c 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -29,10 +29,12 @@ DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340c
 DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba
 DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9
 DIST zabbix-4.4.0.tar.gz 20689807 BLAKE2B 7be62a7b124a016a9f3ab5022b349452b1a99c9ef8cff8ba4b8278f7c48a7632d7f3e6677764fd778c44c05fdb86bbe2b066eb6a51f076274fffcbbd94202db4 SHA512 021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406
+DIST zabbix-4.4.5.tar.gz 19284769 BLAKE2B e0c7b99c48128a2379c46d2125497816d484afc1d0e2b8d6d7da5ca93a494346980af0dc90a7f63f7ea5719b7aec6baa658f060fbdfaaddf5102883c2590da1f SHA512 b7971f3c25270c5e35861a0db8e810d8ffe6c59ffc935fa2df5b1fd5d591d577db60e04673ca0a6f158dd126245a6ee4cd4e84a3637c447c9b6f68f77848f114
 EBUILD zabbix-2.2.16-r1.ebuild 9374 BLAKE2B 51863c24bd87b2227e5e6ef2ea6dfd82a4ed7c5724984b05f6a3f65fc7a698a4e4f28348342a28392113cf741691ccc2bb2c3fae3494ed4d43cd49e6736fe2aa SHA512 c6dc8f51a438e0254442c06005daca4788b3b37f2695aa4a43c545f56aa415069c53f1d399fb14f648f9710b716143c44627932401a4f7bb1cef7a4929582041
 EBUILD zabbix-3.0.28.ebuild 9212 BLAKE2B 01d604dbdcbdbb6494382aab59a5d7ab10142c035ee023ce377a21ce17077585b048cec5cb18e844ddb8f83ca0b41b5396826d274ad70eaea1f4cf315fb19c68 SHA512 e64d401cf73217c3845baf23d4f869ba96474a98ea76a00dcd486349e83e5a7a07e2c65ed58e03772f72fc1fe187db682c5f5d16735827a3f8c9e5b9605d356c
 EBUILD zabbix-3.4.15.ebuild 9190 BLAKE2B 34f7fdb2eabc1b821c0480d3e5d6b3faa6038799d980fb4167c1ef606bc4208ba976b4a556a25ef6e9150413b8eb6618d75100feaeb82e2d35b5d93aaed78491 SHA512 1d7d17f1dbe723459776da9ff2b5d0fbe11e9c8a02cb4bd472147614d2e3e8e81b1988a46957108dda65b7f81177ab5c45cbc6208b504b3facdf16c0817fb986
 EBUILD zabbix-4.0.13.ebuild 9378 BLAKE2B a9561575c6a3f270b92026fa7f6568eb4e6b3233adf33304d262a59f16385073b44bb8689828460c0ef1d5625fb98525add993f462ea3222af48fd1dd09adafd SHA512 2ee7c7bebb9cc5c22b1042fdd40bb7b3173a97da818d8b52c600b708f98b56a8ccaf5025efa47c7a5658daf0861de874ee6e319709490907327442a35bf384e2
 EBUILD zabbix-4.2.7.ebuild 9517 BLAKE2B 596a6172a49b60a8fe225cc3827917f759875fe2f40b58487cd6b2dcb9139950a16ead08af86283ca2e87b99df6d9a5f75de439add860c9da179f16cf2cb8a7c SHA512 7001461570d7d7022742b3e49d894f8d8be125b0a644bcbeeb5ce29f2df8572b3fedcca0e4daf9854a85576f0353d867c9ef654289d6991b2c7a2b31a640ddb2
 EBUILD zabbix-4.4.0-r1.ebuild 9460 BLAKE2B 7d5e689fac185731cd79ffd6c8feee7a78c7b02d49bc9e72191cb0daa3828bd9638337be9a7356967c85a788ac70fd0f4377904d9f13a83997aaaacb6c9701f4 SHA512 d3154d91a3fe4fe69e6f99a69ee255ab5f95360d19597031c382dff6ab76a5f3c8e6c25e4115c484bf39c1400afb74496405f9f5645da40513b9cd417506b8da
+EBUILD zabbix-4.4.5.ebuild 9462 BLAKE2B e5b41d8aed5455e1f4cc4aa07c27a7df3b6182567ca4fc3ded111a4034875e5047bab175d4178376dff7932c58d5686847955b9859519f8afc1a0478439a250f SHA512 ffd234f5a352fa96ac592ae4e39ed0e6746f85b4003e897ebda7178623ac8efeba1b4a63099dc4dcf34b96a4373ea22ade4463c8d0a64f0037060edee13a65ac
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-4.4.5.ebuild b/net-analyzer/zabbix/zabbix-4.4.5.ebuild
new file mode 100644
index 000000000000..2ff7b0830d7d
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.4.5.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( >=dev-db/postgresql-8.1:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	server? ( sys-libs/zlib )
+	proxy?  ( sys-libs/zlib )
+	server? ( dev-libs/libevent )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libpcre )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2 )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl)
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners root:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+		fperms 0640 /etc/zabbix/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 89f7f30896e8..27a762aaf744 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/ppp-scripts/Manifest b/net-dialup/ppp-scripts/Manifest
index 97df6244c75b..a5b2f3d4ee92 100644
--- a/net-dialup/ppp-scripts/Manifest
+++ b/net-dialup/ppp-scripts/Manifest
@@ -1,3 +1,3 @@
 DIST ppp-scripts-0.tar.xz 1824 BLAKE2B dc2fe1fa860ec9abe43466a270324f8ac39f08a8ed35f2dbd971a59a2e07a939049624802ae8b8c5a4bf11544c871d27517976f61486c4cdbad75f162a502c59 SHA512 a36e6180b0acc8081b192602a2a5dbe765f1ba26e2cca8dc80d1dbc0e405b86acd6fe0cf655fb520c9f45373528773e64545876fd3370ce3514ffd9858916971
-EBUILD ppp-scripts-0.ebuild 645 BLAKE2B 5b2d2681e0e52801f0ab1cafb0c667bfceee7fb7a98c13106cdaf5fe3e451065935a34ca14f05cb5c98b318f6efe4cf755280c63e656591f0b1ac23d31d85d7a SHA512 1d81372013fbca740681079255a6f58cf6451b2c10ef2b57768eb42cbf9027138f1f1754b69b1e3fb18d677aabed2bb4d5737e30c4d494da9c472c85a3b79049
+EBUILD ppp-scripts-0.ebuild 666 BLAKE2B 8ff652b2ea44e09a0c8a8f37609555c70f80776bb59ca37ec1f38ea335b6c9f0949ce79f4d90fb69ca22da0ee18298ade9f80e7587c93912fb8d9c821c76192b SHA512 614e397882db3995ce722120249dfa15de28719f0ff40ef1ec26e188b107824aafbe8949cd8901c20eebb57f8c9b8ea4a7c48fb077417dfcf0f99f3af9861c82
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
index e63538fa02ba..706162a982c8 100644
--- a/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
+++ b/net-dialup/ppp-scripts/ppp-scripts-0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Common set of scripts for various PPP implementations"
-HOMEPAGE="https://gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 5419e83092a0..ff04d1353615 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -16,5 +16,5 @@ DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c
 DIST rp-pppoe-3.12.tar.gz 224125 BLAKE2B 27fe75e794624acaeb81806d67a6f4e5601a6b6a466100898ae3cccc8acb5f72ad9275fecd28735df1b01162ff0e60b74ad0373a24a60c7a5731b0744b86e019 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1
 DIST rp-pppoe-3.13.tar.gz 224204 BLAKE2B 8ac3cd59c809f7f2e10fea580dfbda20fc99ae443851513cdc6d0ba8e8df848d7bd6f10d2b0ac6592bc4b48ee1945c299d3cbd73eb9dd6ddc23d0c1c39cd1b77 SHA512 e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36
 EBUILD rp-pppoe-3.12-r1.ebuild 2642 BLAKE2B 34975e0dbcab79f36c1673559aa8705e89c97b83450208611de5359f1040ace0ed5c29d369294870c394ece38ae4fe638b7783addef19f9ef9d6a2876987779f SHA512 b65bd800057d1e18312d1977364960148208c9dfab6ee5f1336a7973945129e9bf2f83198c45306442569b047a8a7ad236ffd41b06fdf79ceb3e0aac3fc04b25
-EBUILD rp-pppoe-3.13.ebuild 2910 BLAKE2B db087352752da095fd441851b7d1792fb4d9a1a8514c7a952e9de522189ba400afd0fcb98a2235bb174d8d0428a9b79c293acb64dba04dfa38c4bf0d724a1c4b SHA512 03d9b366e0a196587989c1d58e28c97cf2a677eb21b80ad44a792c13d8dff962dea1879a864825328bf9e43ae4b27c8eb04246c099c8841cf0a7e003485109a4
+EBUILD rp-pppoe-3.13.ebuild 2906 BLAKE2B 572bc5da4bdd62883c33a3dbd1d84c9ad9c6849ca0691e2a1e10dca665a3da57408826a102ab838c34e783c01fb860450f60cffe4aa55dbccc60b291b25e8545 SHA512 1aaf6b9b5a2fa185e8174cf68d1480c9a663ffce3b207d0846c2e3380d4932d00a8117b11e62ad730a72f700984f2662d2ccb645be493d2640c9f6a22c078501
 MISC metadata.xml 370 BLAKE2B 00e0195d903d9fe379c0c8662f4019dd55a53f7027ade12f314f8007f9edbb6b4a5e5bccef2897d97ee3d2164a169efcad607548dbf53d363b72a360b57444b3 SHA512 ebfae7addd585ee6f01b45921b1ba6a1c824c6e34f8f6a3c6d2fd917d7b17aceffca5f6a4ca1c7b135a34c679394417b73a23e067daed8a2c4b71fa63536c849
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
index 2f775fca64a2..ab0711a3d0de 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild
@@ -84,7 +84,7 @@ src_install () {
 	emake DESTDIR="${D}" install #docdir=/usr/share/doc/${PF} install
 
 	#Don't use compiled rp-pppoe plugin - see pkg_preinst below
-	local pppoe_plugin="${ED%/}/etc/ppp/plugins/rp-pppoe.so"
+	local pppoe_plugin="${ED}/etc/ppp/plugins/rp-pppoe.so"
 	if [ -f "${pppoe_plugin}" ] ; then
 		rm "${pppoe_plugin}" || die
 	fi
@@ -105,7 +105,7 @@ src_install () {
 
 pkg_preinst() {
 	# Use the rp-pppoe plugin that comes with net-dialup/pppd
-	if [ -n "${PPPD_VER}" ] && [ -f "${EROOT%/}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then
+	if [ -n "${PPPD_VER}" ] && [ -f "${EROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then
 		dosym ../../../usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so
 	fi
 }
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 0a21acac3142..99197c064cc5 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/hash-slinger/Manifest b/net-dns/hash-slinger/Manifest
index c0a6fee07706..b9cf1a12bdd9 100644
--- a/net-dns/hash-slinger/Manifest
+++ b/net-dns/hash-slinger/Manifest
@@ -1,5 +1,5 @@
 DIST hash-slinger-2.6.tar.gz 34864 BLAKE2B 4bd66a30ce0f6f57676d8c8691a38743b2b4263fc600b9a3756f1ff4676477bd61a4b20df082227a3437ca2bcbb1ad4e44643f8a87cda0a1123dab8fafa26140 SHA512 1e5d67ed2ef8eae910927fbd7419928d87ba31a91ca43a1c163b05f725da96a50d30e1539c4c55a68a22f0e2c9a2f7c7101fbdcfb5fc903e87fe4c22e20f33af
 DIST hash-slinger-2.7.tar.gz 37684 BLAKE2B e8758251c51139723778ca0db271cbc730e19bba25fad3f7f784f06774ce52038f520c11b526fffd30570854112f0e7b184f6d05e4d20847ac2c014bc66151f8 SHA512 b1b3e46c4cdd8b983b55156c9bcc58afc973c2503cde48283e98306e381753547f425bfaee68707ae10b2e31b71d01485b34e4a9841c9ce2048f9551f23d0976
-EBUILD hash-slinger-2.6-r1.ebuild 1076 BLAKE2B 6a5920d8930cdbc70d353d020bda6413ad51a51867c9b151e71f00088ddd78410bdf3313600805ede1992bd9fe217088d58aac5fdaa4e341db54f1690bd08b19 SHA512 b1e974bb72e667cae331fbe546a4309590611c06988d2eda4fdfc7d5c201d5e9c60b443dc52a23259451a8c958f6a6ff510c66e3511cd0b23fb95698e58f1548
-EBUILD hash-slinger-2.7-r1.ebuild 1078 BLAKE2B 9c6f75404afcb748586ea0f06741ed70723e8e08dd469deb10c9fd1741bf1188eb00a04a1ef24744955879f9c8e59464d4a3150af9cc9c4bba3c787716e17a77 SHA512 3b3a4755964193e8f63de1e0e8b6f577a6657585275ccf66d9576a9311a3d673eb65e257c35cf7849b64067f00352d079bffd78925c36315bafaa200f40688ca
+EBUILD hash-slinger-2.6-r1.ebuild 1134 BLAKE2B 847ed4050abe46205af470afa9dc1fa6f11992580a78db290e497a08295964400f4e2244a8ccd57acda2b809df3f1ae630898912a958bc18d266abfc3a107297 SHA512 f136b8a267c3b1ecc3d33a06cd654c8250bd2b32522bf396cb4194843f4177b9c5dba9b0736e4d6fec328c5078206141db88f104ed089fb15ed62ed17fdd3b7f
+EBUILD hash-slinger-2.7-r2.ebuild 1139 BLAKE2B 6ddb2733e7eda7bdf3306e7dcc98e1b2b5a4c4c856c93fe60956f9008f94106d04e9fb18b600daa86a6ffbe9d47f5080c1fbd87920b24b98510f5f3023eee6ef SHA512 487bec780b16892e676d8eb502e8d4bda59f07deb9d235c0d87b9f58a18d25d04a21171183f4ba1993b831b92eaa91d296f998500fd416577a565a0e7235f898
 MISC metadata.xml 488 BLAKE2B e51e5da837d62c1fefc50f59a31bc8464e1cfdaf770130562b20ad33c8f9b8b5bc604e508eaa5b9087fe59e25fdd3993f5fedc062f0a75ad6ad723234e7e5f6f SHA512 d7d812a2e7a32bd659135bddc88f74b3f882237eba39d96d67ef8a5a53656c64090bfa4535a104e0581c82f2d8e6c69357a314cf8750cb4dd1a5fb421cb3251e
diff --git a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
index a2ff821691bc..a5e14629412a 100644
--- a/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
+++ b/net-dns/hash-slinger/hash-slinger-2.6-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-r1
+inherit python-single-r1
 
 DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
 HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"
@@ -21,12 +21,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND=""
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-python/dnspython[$PYTHON_USEDEP]
-	dev-python/ipaddr[$PYTHON_USEDEP]
-	dev-python/m2crypto[$PYTHON_USEDEP]
-	net-dns/unbound[python,$PYTHON_USEDEP]
+	net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
+		openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] )
+	')
 	ipsec? ( net-vpn/libreswan[dnssec] )
-	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
 	ssh? ( net-misc/openssh )
 "
 
@@ -38,7 +40,7 @@ src_install() {
 	use ipsec && tools+=" ipseckey"
 	for tool in $tools ; do
 		doman ${tool}.1
-		python_foreach_impl python_doscript ${tool}
+		python_doscript ${tool}
 	done
 	dodoc BUGS CHANGES README
 }
diff --git a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild b/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild
deleted file mode 100644
index 161c87a31f2d..000000000000
--- a/net-dns/hash-slinger/hash-slinger-2.7-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
-HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"
-SRC_URI="https://people.redhat.com/pwouters/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipsec +openpgp +ssh"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/dnspython[$PYTHON_USEDEP]
-	dev-python/ipaddr[$PYTHON_USEDEP]
-	dev-python/m2crypto[$PYTHON_USEDEP]
-	net-dns/unbound[python,$PYTHON_USEDEP]
-	ipsec? ( net-vpn/libreswan[dnssec] )
-	openpgp? ( dev-python/python-gnupg[$PYTHON_USEDEP] )
-	ssh? ( net-misc/openssh )
-"
-
-src_install() {
-	local tools
-	tools="tlsa"
-	use ssh	&& tools+=" sshfp"
-	use openpgp && tools+=" openpgpkey"
-	use ipsec && tools+=" ipseckey"
-	for tool in $tools ; do
-		doman ${tool}.1
-		python_foreach_impl python_doscript ${tool}
-	done
-	dodoc BUGS CHANGES README
-}
diff --git a/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild
new file mode 100644
index 000000000000..e36c1758e267
--- /dev/null
+++ b/net-dns/hash-slinger/hash-slinger-2.7-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Various tools to generate special DNS records like SSHFP, TLSA, OPENPGPKEY, IPSECKEY"
+HOMEPAGE="https://people.redhat.com/pwouters/hash-slinger/"
+SRC_URI="https://people.redhat.com/pwouters/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipsec +openpgp +ssh"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="
+	${PYTHON_DEPS}
+	net-dns/unbound[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
+		openpgp? ( dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}] )
+	')
+	ipsec? ( net-vpn/libreswan[dnssec] )
+	ssh? ( net-misc/openssh )
+"
+
+src_install() {
+	local tools
+	tools="tlsa"
+	use ssh	&& tools+=" sshfp"
+	use openpgp && tools+=" openpgpkey"
+	use ipsec && tools+=" ipseckey"
+	for tool in $tools ; do
+		doman ${tool}.1
+		python_doscript ${tool}
+	done
+	dodoc BUGS CHANGES README
+}
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 9fd0ca5c4e89..fef331d8fabe 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,7 +9,7 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.9.4.tar.gz 5686242 BLAKE2B de9e553ba6e8c3839b41776052c3b0f83890b5bd9cbdb895fbf1e413169dd4740a9dc354ccc787fa018755acb73e831f1cb2742db65e151d1e01367b35a7b9e5 SHA512 44021014c944fc01a1f5f9afd77145f5554a3282cc2bfd54526fc4f88346f497c847ddb72bafa155d7e6e5dd02b6bb031836ead4408977d4e4b5b3290dffea9c
 DIST unbound-1.9.5.tar.gz 5686689 BLAKE2B a685d7f74bff5d76907694877a988346f233c202121b76f7fbd0d86edc200abe06d345e77fdca41e97d2a22329e6bbc1600fefeaac2abc1784f34367413593e3 SHA512 0b198b49165b25c93899ca41fead67c479e5b6fd255f7e2af6930f4b9898c73d8a72caf376fce9a2a33199d0764db58388371c3fdbd442999ddfdb0b8b5394ea
 DIST unbound-1.9.6.tar.gz 5680145 BLAKE2B 9aa047270694babed36395100bbfc4287c74e173abfbb6f33939a7bf1362f765b16a8d016d84d426a5c0014d244063b4c028d5b5dddb05f09ad4287d8a63f098 SHA512 39a60f51da912ed25d247bc1e882b1242d80a63b0c2b3f753d38ed558f3a24691267375136ff6d85e5945a98ca0c4ac87e43e131c97737a355374dde64259951
-EBUILD unbound-1.9.4.ebuild 5426 BLAKE2B a252b262ecf27479c65f2402c7b8f1521d3dc74276f11e9bb580fda54e35bff976b1b2f67b1dabaa684a8f1f1960f417ac3e2275ac76434b54b55630ee7f568f SHA512 84a52d942381bec1757cf995ade916753d4df520e52a6263e89206d656b39d93116d2e811ca575b16683c381bb9b2c22ebc7c0b99e1bfb37ab3a864fce1be91d
+EBUILD unbound-1.9.4.ebuild 5400 BLAKE2B 05b5b0711338d69f328e4cc5d76c59c8abc0ba18fd4e38751fcd2fef6649042d9b503590ef2a7daf8d078a05089f6d2825b2aa5add7939ff6389288a071b325c SHA512 22b28d955dead434f71ccb5a442dc54a130d17aa4bb94ac461f7f473ea361ba5d331d03d251da3a6981e5a11d93bb12b8f057e51f730fd634d22665ee1b598e8
 EBUILD unbound-1.9.5.ebuild 5400 BLAKE2B e7ff3b4b75d812085ab79c1101dcbec1f4d0a845c28254940b5990e087b9441bb91806dafc11e3a4e6d7ef83065fbd7e83818e5706b60a7bcf8523d18685febe SHA512 7d3a1751cf5387b0723d4727faf11ad4b5d9f92fc203754152e069168ed2857b750c8e647af5d28154635a82358deca355f04a5ef3129c069b2859b3cb6b958b
 EBUILD unbound-1.9.6.ebuild 5400 BLAKE2B e7ff3b4b75d812085ab79c1101dcbec1f4d0a845c28254940b5990e087b9441bb91806dafc11e3a4e6d7ef83065fbd7e83818e5706b60a7bcf8523d18685febe SHA512 7d3a1751cf5387b0723d4727faf11ad4b5d9f92fc203754152e069168ed2857b750c8e647af5d28154635a82358deca355f04a5ef3129c069b2859b3cb6b958b
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.4.ebuild b/net-dns/unbound/unbound-1.9.4.ebuild
index 840b23595d5c..e1f4177a4b64 100644
--- a/net-dns/unbound/unbound-1.9.4.ebuild
+++ b/net-dns/unbound/unbound-1.9.4.ebuild
@@ -110,12 +110,12 @@ multilib_src_configure() {
 		--enable-ipsecmod \
 		--enable-tfo-client \
 		--enable-tfo-server \
-		--with-libevent="${EPREFIX%/}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${EPREFIX%/}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX%/}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX%/}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${EPREFIX%/}"/usr \
-		--with-libexpat="${EPREFIX%/}"/usr
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
 
 		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
 		# $(use_enable debug lock-checks) \
@@ -151,7 +151,7 @@ multilib_src_install_all() {
 	# ... and point example config to it
 	sed -i \
 		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
-		"${ED%/}/etc/unbound/unbound.conf" || \
+		"${ED}/etc/unbound/unbound.conf" || \
 		die
 
 	# Used to store cache data
@@ -167,16 +167,16 @@ multilib_src_install_all() {
 
 pkg_postinst() {
 	# make var/ writable by unbound
-	if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
-		chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
+	if [[ -d "${EROOT}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT}/etc/unbound/var"
 	fi
 
 	einfo ""
 	einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
-	einfo "set 'auto-trust-anchor-file: ${EROOT%/}/etc/unbound/var/root-anchors.txt' in ${EROOT%/}/etc/unbound/unbound.conf"
+	einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
 	einfo "and run"
 	einfo ""
-	einfo "  su -s /bin/sh -c '${EROOT%/}/usr/sbin/unbound-anchor -a ${EROOT%/}/etc/unbound/var/root-anchors.txt' unbound"
+	einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
 	einfo ""
 	einfo "as root to create it initially before starting unbound for the first time after enabling this."
 	einfo ""
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 7d920559308f..1c788ba70605 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 1a2f91aefed7..1430feeceaf6 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,6 +1,6 @@
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 DIST firewalld-0.6.3.tar.gz 2294470 BLAKE2B 09bb971d8142e5d28b6a085527e7f5275090f15e5dc4ccf2b16b6ed837049ed75443b09a54db76e37c6f0c5db6524ba85cf34c5117c1139bba0e3b223f289d57 SHA512 ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
 DIST firewalld-0.7.1.tar.gz 2326020 BLAKE2B 1ab435bfd97608ce246657a24daebe6ca83f72560a627c702e940de64bf4fb34f26ebe9abf62468972fd8cd9394c5e885acd6882ec3cad112dfe62bca3905c7a SHA512 6be842d4c2849f56fc0e6c13219aed7d767635a3b190ef41f1516cecf51de71ad9af77ccc96b699d11bed56407abf9837cdbd0cfbf93ab716b5de5e4c2f94c68
-EBUILD firewalld-0.6.3.ebuild 2549 BLAKE2B 568f2cca76e45714bbc137d977ff626725200943c29efaafe45237a700af162c2fda6c58f582d6937b11c6ddd82cea0532f377b7b46943587ff801944735e00f SHA512 26904a7bfc9ce31d972466ad8e25bd8d8cd2cd4b3885c89e8b0fa77e1a6bc208fde6886102698ab3927f8793302b1b3bbf66b2dc0824f9eb179a6e46cd8fc0aa
-EBUILD firewalld-0.7.1.ebuild 2540 BLAKE2B 7ad7acc7c1f796603c21f33f5b2da9500d2ba19909f0f9758b51a3bdf3abb9d8eafc61a4e15b504df06a81d67a390969885040243d36b91544803ebc234a9124 SHA512 d5a2d14001a75af6808b53026aa10a4d418d0732df6874505c130550633865191e6c67d2c2ec1e8f0417c82a47397d585376ca9ca244d2d8dbe03a5c2c9ba205
+EBUILD firewalld-0.6.3-r1.ebuild 2616 BLAKE2B 598544370854bed198fbc79d45c2b8160cfc382174bb2554e4f451f2fee8208461b7163be17ec0b5badb65de9644e68bb7e8d07735fa718d5bbecee2d1a96ab1 SHA512 6ee2e5f1433bd6fe021528188eabf5fccc1db7ea14c076c8951f22be85aaad67ba22530386517632297cef2f799bbe7d47c225223cf7d20198c9259c644097f0
+EBUILD firewalld-0.7.1-r1.ebuild 2607 BLAKE2B d1d08d05aca74180e838722fd7470316d13f6d34fddc02c612a1f26efac66851609d5ffb5d10817a262beea99f3e67798e17696bcaab1c7dbd29d1b0d2712af3 SHA512 0daf8e834f117c67f2f900a42c48b037febb53eaa4e17e485843f0340343bd5983c0167b4968a39197e6f8a0321a1365dcce56d6f851311be4ab7bace33ce810
 MISC metadata.xml 271 BLAKE2B 0ac34325897226d2062f0b77cc069fcacd6026432b276adcdc2e7c9ef532cc1900855dd821d0b6314ac77488fd0695f916e821fc11148f3b9f2753bc97afbe2f SHA512 0cd444be2e9b4a1530671dc4fc88a2177541dceb453dca10a1778938d8f114caaa55a01551b662c29e0e775aa9e9df9389b4a5d5ab4fba643da447ac2e7aca32
diff --git a/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild b/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..3035cef8c28a
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.6.3-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	|| ( net-firewall/ebtables net-firewall/iptables[nftables] )
+	net-firewall/iptables[ipv6]
+	net-firewall/ipset
+	net-firewall/nftables
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EPREFIX}/sbin/iptables" \
+		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+		--with-ebtables="${EPREFIX}/sbin/ebtables" \
+		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-nft="${EPREFIX}/sbin/nft" \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/" || die
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-firewall/firewalld/firewalld-0.6.3.ebuild b/net-firewall/firewalld/firewalld-0.6.3.ebuild
deleted file mode 100644
index 1623b9983834..000000000000
--- a/net-firewall/firewalld/firewalld-0.6.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit autotools gnome2-utils linux-info python-single-r1 systemd bash-completion-r1
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	|| ( net-firewall/ebtables net-firewall/iptables[nftables] )
-	net-firewall/iptables[ipv6]
-	net-firewall/ipset
-	net-firewall/nftables
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		--with-nft="${EPREFIX}/sbin/nft" \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/" || die
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..af7ce3dfdc23
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-0.7.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+
+inherit autotools bash-completion-r1 gnome2-utils linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
+HOMEPAGE="http://www.firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gui"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	net-firewall/iptables[ipv6]
+	|| ( net-firewall/iptables[nftables] net-firewall/ebtables )
+	net-firewall/ipset
+	net-firewall/nftables
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-slip-0.2.7[dbus,${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2
+	>=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+pkg_setup() {
+	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	python_setup
+
+	econf \
+		--enable-systemd \
+		--with-iptables="${EPREFIX}/sbin/iptables" \
+		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
+		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
+		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
+		--with-ebtables="${EPREFIX}/sbin/ebtables" \
+		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
+		--with-nft="${EPREFIX}/sbin/nft" \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-bashcompletiondir="$(get_bashcompdir)"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/rc.d/" || die
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-firewall/firewalld/firewalld-0.7.1.ebuild b/net-firewall/firewalld/firewalld-0.7.1.ebuild
deleted file mode 100644
index 2e7f5223fef9..000000000000
--- a/net-firewall/firewalld/firewalld-0.7.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-inherit autotools bash-completion-r1 gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!!net-firewall/gshield
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-firewall/iptables[ipv6]
-	|| ( net-firewall/iptables[nftables] net-firewall/ebtables )
-	net-firewall/ipset
-	net-firewall/nftables
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-pkg_setup() {
-	local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		--with-nft="${EPREFIX}/sbin/nft" \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/" || die
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index e6f0abbc8143..e41549df490c 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -4,6 +4,6 @@ AUX fwknopd.service 235 BLAKE2B c46c01121a745ee46a5415654c0ba422531008ed52915833
 AUX fwknopd.tmpfiles.conf 31 BLAKE2B 81d88d9bb1fd826c242b2815e1a6c0e5a300f22e19dd65ad67e114d692731cb532162ac877f0239879ebfcf0432d61053adcddd2c234d85ed60bf33720b22dcc SHA512 73b56a42c7728c9dabd82cd81bd6ffa1b948fe80fa67feee348ad65f957f1f2ea53c6b5d74fa2784ea75c45c2c27b5d989da4a618f3a4cf67914c927e04b74ae
 DIST fwknop-2.6.10.tar.gz 1988197 BLAKE2B d4c2010c64ab160f0edc02e2b1530749ee47ff6ed16d6b556d366daef7ce5e22ef38fbbbf6e8cfaa14e0d9706ba2b65937b03c70b54b3429ff1732ae33c1852c SHA512 3b3e35eda574abd1759431c88677eea7078c54cb3252c0ee0e1019b5b8224ed8844d30760da70a952e1cd92b04715a547f6effabda54678f791fff9afa32cd80
 DIST fwknop-2.6.9.tar.gz 3043542 BLAKE2B 11440fa0fe5e990a269587fa9ee1da0242f3dc939d6dc185d6adff9e9c995a8ffe902a6351a057c619cb6ff056519caea38f7b865978fe5ac810a39281bb3fc3 SHA512 4706560d44c911c8604059d88dded9c1b8c333399d90ec7dc366c0fba96c79680bdbf1b8b5e76cc34aaf3a1e58fff80db8f5f20c96d57481bdb476a9b99f4d1b
-EBUILD fwknop-2.6.10.ebuild 3547 BLAKE2B 6e8fe513e25749fad0dde47ea4e28cdfb0c2f878684dc2b8c8adf74d88678afd4316ad63c60770044e33e584cc2a9844204ce4e2d1af5a3865959ae79caab06f SHA512 18ec5b1ce8632f81b3bbf13d08d2275120b9e364d2d764446393840b5ba7003842a2f3df74cc35d48b4a90167d2c7f56a3878af53e52cd0a704465fc180d6c7c
-EBUILD fwknop-2.6.9-r1.ebuild 3691 BLAKE2B babb21cf1329d59180d03fca97865bdee9d50cb3e10ab3e837784078ebbd4110791c7832f9db32ed9126518cae0c5d74a9bac13d0f0409ddce36aaa8e9bed62f SHA512 ee6a6065e916cf745dfa9e8903166ab0de571138720134568349767f9f63ea0b00d5991a2b29206279f17d0e2968fb573195d3191c89bd0d1b2ca34c21a18473
+EBUILD fwknop-2.6.10-r1.ebuild 3645 BLAKE2B e189a429bbd503641c4ea4ffe7c8f8069935952b1412e751106f73454df3ac5e8749066446634524160353820af1ee03989acc67a3f990b39b92a3694204084b SHA512 8811954807de2f3b050f19c184aceb5c56d339b1e2ea40d73a9edc65492c4b473db02b901b1d42c8d58b9203ab76e74545c260c1240bc916feabbaf0490b1a46
+EBUILD fwknop-2.6.9-r1.ebuild 3786 BLAKE2B 6bde6bb8b8920323552afe41f86e0ad6bb3854e39d141035667d471892cf50ec3d85e71833c15ed00224fe8675857658eddafba969af67c6bb286b122a4c87be SHA512 73a9c3165cdec867f3926c1c17e085df665a83659422c9442d2ab08ad1c1d7122d57feffc48c527aad9c8e101c6150335415e4d3d882d02a4b4bff0547760021
 MISC metadata.xml 1217 BLAKE2B 2b44d1d81f7d4bc625c3130cf29328fce6d85fbeedfb5376146dad93b020f03440f620e68187fa1ffd496fdff0cedaa6f02d015578ec0620070ea97029b9eec8 SHA512 b215b1ad55f6ba7e9f4ac316916241ec2084bcd2e3e5ca6a7d81c935df6affdbc36066914b1bb4d984333e005a57f54c6c8f07013a4e14e465f9dd6dbc6c93d2
diff --git a/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
new file mode 100644
index 000000000000..52c57d2312c0
--- /dev/null
+++ b/net-firewall/fwknop/fwknop-2.6.10-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python extension supports only Python 2.
+# See https://github.com/mrash/fwknop/issues/167
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd
+
+DESCRIPTION="Single Packet Authorization and Port Knocking application"
+HOMEPAGE="https://www.cipherdyne.org/fwknop/"
+SRC_URI="https://www.cipherdyne.org/fwknop/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server"
+
+DEPEND="
+	client? ( net-misc/wget[ssl] )
+	firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] )
+	gdbm? ( sys-libs/gdbm )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+	iptables? ( net-firewall/iptables )
+	nfqueue? ( net-libs/libnetfilter_queue )
+	python? ( ${PYTHON_DEPS} )
+	server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	nfqueue? ( server )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	server? ( ^^ ( firewalld iptables ) )
+	udp-server? ( server )
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+Example configuration files were installed to '${EPREFIX}/etc/fwknopd/'.
+Please edit them to suit your needs and then remove the .example suffix.
+
+fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
+You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
+instead of the default one chosen at compile time.
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default_src_prepare
+
+	# Install example configs with .example suffix.
+	if use server; then
+		sed -i -e 's|conf;|conf.example;|g' Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/run"
+		$(use_enable client)
+		$(use_enable !gdbm file-cache)
+		$(use_enable nfqueue nfq-capture)
+		$(use_enable server)
+		$(use_enable udp-server)
+		$(use_with gpg gpgme)
+	)
+	use firewalld && myeconfargs+=(--with-firewalld="${EPREFIX}/usr/sbin/firewalld")
+	use iptables && myeconfargs+=(--with-iptables="${EPREFIX}/sbin/iptables")
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default_src_install
+
+	if use extras; then
+		dodoc extras/apparmor/usr.sbin.fwknopd
+		dodoc extras/console-qr/console-qr.sh
+		dodoc extras/fwknop-launcher/*
+	fi
+
+	if use server; then
+		newinitd "${FILESDIR}/fwknopd.init" fwknopd
+		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
+		systemd_dounit "${FILESDIR}/fwknopd.service"
+		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
+		readme.gentoo_create_doc
+	fi
+
+	if use python; then
+		# Redefine DOCS, otherwise distutils-r1 eclass interferes.
+		local DOCS=()
+		cd python || die
+		distutils-r1_src_install
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if use server; then
+		readme.gentoo_print_elog
+
+		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
+			echo
+			ewarn "fwknopd daemon relies on the 'comment' match in order to expire"
+			ewarn "created firewall rules, which is an important security feature."
+			ewarn "Please enable NETFILTER_XT_MATCH_COMMENT support in your kernel."
+			echo
+		fi
+		if use nfqueue && \
+			! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE; then
+			echo
+			ewarn "fwknopd daemon relies on the 'NFQUEUE' target for NFQUEUE mode."
+			ewarn "Please enable NETFILTER_XT_TARGET_NFQUEUE support in your kernel."
+			echo
+		fi
+	fi
+}
diff --git a/net-firewall/fwknop/fwknop-2.6.10.ebuild b/net-firewall/fwknop/fwknop-2.6.10.ebuild
deleted file mode 100644
index 41a07f7c1a83..000000000000
--- a/net-firewall/fwknop/fwknop-2.6.10.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python extension supports only Python 2.
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="https://www.cipherdyne.org/fwknop/"
-SRC_URI="https://www.cipherdyne.org/fwknop/download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-server"
-
-DEPEND="
-	client? ( net-misc/wget[ssl] )
-	firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
-	gdbm? ( sys-libs/gdbm )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
-	iptables? ( net-firewall/iptables )
-	nfqueue? ( net-libs/libnetfilter_queue )
-	python? ( ${PYTHON_DEPS} )
-	server? ( !nfqueue? ( !udp-server? ( net-libs/libpcap ) ) )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
-	nfqueue? ( server )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	server? ( ^^ ( firewalld iptables ) )
-	udp-server? ( server )
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-Example configuration files were installed to '${EPREFIX}/etc/fwknopd/'.
-Please edit them to suit your needs and then remove the .example suffix.
-
-fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
-You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
-instead of the default one chosen at compile time.
-"
-
-src_prepare() {
-	default_src_prepare
-
-	# Install example configs with .example suffix.
-	if use server; then
-		sed -i -e 's|conf;|conf.example;|g' Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/run"
-		$(use_enable client)
-		$(use_enable !gdbm file-cache)
-		$(use_enable nfqueue nfq-capture)
-		$(use_enable server)
-		$(use_enable udp-server)
-		$(use_with gpg gpgme)
-	)
-	use firewalld && myeconfargs+=(--with-firewalld="${EPREFIX}/usr/sbin/firewalld")
-	use iptables && myeconfargs+=(--with-iptables="${EPREFIX}/sbin/iptables")
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default_src_install
-
-	if use extras; then
-		dodoc extras/apparmor/usr.sbin.fwknopd
-		dodoc extras/console-qr/console-qr.sh
-		dodoc extras/fwknop-launcher/*
-	fi
-
-	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init" fwknopd
-		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-		systemd_dounit "${FILESDIR}/fwknopd.service"
-		systemd_newtmpfilesd "${FILESDIR}/fwknopd.tmpfiles.conf" fwknopd.conf
-		readme.gentoo_create_doc
-	fi
-
-	if use python; then
-		# Redefine DOCS, otherwise distutils-r1 eclass interferes.
-		local DOCS=()
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	if use server; then
-		readme.gentoo_print_elog
-
-		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
-			echo
-			ewarn "fwknopd daemon relies on the 'comment' match in order to expire"
-			ewarn "created firewall rules, which is an important security feature."
-			ewarn "Please enable NETFILTER_XT_MATCH_COMMENT support in your kernel."
-			echo
-		fi
-		if use nfqueue && \
-			! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE; then
-			echo
-			ewarn "fwknopd daemon relies on the 'NFQUEUE' target for NFQUEUE mode."
-			ewarn "Please enable NETFILTER_XT_TARGET_NFQUEUE support in your kernel."
-			echo
-		fi
-	fi
-}
diff --git a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
index 5c86df5bfb0c..03699570bd46 100644
--- a/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,6 +7,7 @@ EAPI=6
 # See https://github.com/mrash/fwknop/issues/167
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
+DISTUTILS_SINGLE_IMPL=1
 
 inherit autotools distutils-r1 eutils linux-info readme.gentoo-r1 systemd
 
@@ -21,7 +22,7 @@ IUSE="+client extras firewalld gdbm gpg +iptables nfqueue python +server udp-ser
 
 DEPEND="
 	client? ( net-misc/wget[ssl] )
-	firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
+	firewalld? ( net-firewall/firewalld[${PYTHON_SINGLE_USEDEP}] )
 	gdbm? ( sys-libs/gdbm )
 	gpg? (
 		app-crypt/gpgme
@@ -54,6 +55,11 @@ You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
 instead of the default one chosen at compile time.
 "
 
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default_src_prepare
 
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 52c10ba2335a..8d46454729b6 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 36eabd2a36e0..d698c65b2242 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -22,7 +22,7 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea SHA512 25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
 DIST nfs-utils-2.4.2.tar.bz2 918576 BLAKE2B a1dba3ae2e58794509ea7907d80e40fc49a0c5e72019222ba16daa74aa757cab5e6fde9ed066f6b5f379b40dbd61622a05fcafc298a79231e417ab2086127278 SHA512 f9724ff2ac185e6c29afd577b33da38b1d11803af1ccb905cd615afa3383c6ac7a3fa4e0f43ea8d062e9aedcdbae90adc9b55ae9d0abe4731f69aa3a6f8d2534
-EBUILD nfs-utils-2.3.4.ebuild 5270 BLAKE2B 2478830995019c5a29aea7db6bca238b7f4422ba95d174a455eae1840631115c77b433be0859698921995fd9cb06208eb18eaeb8de58016928e39240d8d65f26 SHA512 04b9730fc5a2a960f9350bd8039373d151ca75d2df299ba0ace371607ad87c24fa4a785f2d3b7a123e51eef51a6f2ed12949f98220f1b6f09982a325c0ded4d9
-EBUILD nfs-utils-2.4.1-r4.ebuild 6212 BLAKE2B 9031813ca35e9e813510b948a0c9254f28f1bbd40aef26e0a42299462a5b1cde14058755c3622dd8ba5ff7355fc490012d37dc31b107f157a4c909ae3fbe14e1 SHA512 85a8fc1b07be07a68c3399d8e7351d3ca410865b2440fe5b6702fd4f8a5f0a5b68d674d5cf87f9909a0d081b698870472dae69b07a4cee5909802b855f28ad34
-EBUILD nfs-utils-2.4.2-r1.ebuild 6065 BLAKE2B 45f0c136d6ab0bc8ff79d2f7f7906c94288d0431a6189c0855970911341704921b96ec90d661c94aa6499e99d65fcb2105fab37ad47671f41ac7594ecbf06b40 SHA512 3e86d8a0083cd691ad91ed598290516ff93b2a2de2d5d654313b154d79e8db800f76fea20d2d18d4b35e64dfff1b71c15c76445620a69dd519bb09805125fcc0
+EBUILD nfs-utils-2.3.4.ebuild 5264 BLAKE2B ebada461707988e562cecbd499b83b9dd9851661f3b6b33bcd0a937ba42f55440b378c4999ccc8106e3fc488ca632bc4ef0dbb2f95a711390b03d13980634e35 SHA512 ad33529df00819da32392627255374bb8178f0b1f148ad530cb3c8fd6808a9dc6a96a7cdb5d65c9d2fe1fd398cde8c168f4f02685e77bf58a9fd9143a08a94b8
+EBUILD nfs-utils-2.4.1-r4.ebuild 6206 BLAKE2B 24e89bfd678dbfcd8eb2d90629116dff45e780851bf7e73850ac7284e3f7cb588d56aff72685824bdfbbce189f207dec42dc76732eff14612938d2c01f9257dd SHA512 aa11df1eafec02adf8e6424062ea964ad42cbbda12cb3fdd37fc126897a749af05aff8f7d1a31587fd8057d29cf472e7056071041f6b2622b2610c464c4767b2
+EBUILD nfs-utils-2.4.2-r1.ebuild 6059 BLAKE2B 93419e6a55f3a713bee5ddb3390f7fccc922ee5c8c6d943a1713ce9a5f90857e824f0a9a03388189f924b57e4b2d23404ee8efe4d0a5150a5f82cd883644ebc0 SHA512 e531d520f65a8e659c68edd6bdc1ae99e2db2ec7f6a98bb413aa125008035b0b3885a1083220de1980c61bca54009a995ead84a4bc715421e15506e4daf28ffc
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
index c180c1bc2011..28cfea1a2af2 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
@@ -83,10 +83,10 @@ src_configure() {
 	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
 	export ac_cv_header_keyutils_h=$(usex nfsidmap)
 	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
+		--with-statedir="${EPREFIX}"/var/lib/nfs
 		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
 		--with-rpcgen
 		--with-systemd="$(systemd_get_systemunitdir)"
 		--without-gssglue
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
index 270b62e3b6c2..75c61d648f7b 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
@@ -99,10 +99,10 @@ src_configure() {
 	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
 	export ac_cv_header_keyutils_h=$(usex nfsidmap)
 	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
+		--with-statedir="${EPREFIX}"/var/lib/nfs
 		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
 		--with-rpcgen
 		--with-systemd="$(systemd_get_systemunitdir)"
 		--without-gssglue
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
index 9bfa0765d646..74d7be342d76 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
@@ -97,10 +97,10 @@ src_configure() {
 	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
 	export ac_cv_header_keyutils_h=$(usex nfsidmap)
 	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
+		--with-statedir="${EPREFIX}"/var/lib/nfs
 		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
 		--with-rpcgen
 		--with-systemd="$(systemd_get_systemunitdir)"
 		--without-gssglue
diff --git a/net-fs/s3fs/Manifest b/net-fs/s3fs/Manifest
index e6908d3b7769..1d57653bfec5 100644
--- a/net-fs/s3fs/Manifest
+++ b/net-fs/s3fs/Manifest
@@ -1,7 +1,9 @@
 DIST s3fs-1.80.tar.gz 135891 BLAKE2B a2e38154e1721a88042e49db22bbd607ce0776758a351f5a54e76cb1654518a4d3e30cf9faf3d6d04f6d45d3224491f6e55cbae83ee5b88c27211044255d51d0 SHA512 c98c61198a6c2132f98ef5a8c8f600787cf359c6f79010366f786a3758281257cbf79b4bb47892fd1e9e50d8e46a389125ea67f3828c1c8131cbee5462c74141
 DIST s3fs-1.83.tar.gz 150816 BLAKE2B 1b567708ea6264a619b664c5be3186374dcd3f50f01ac7d9aa093a82520f4685b7adc49a2d9c5a30e64334439c4c2676ae6cc74079251b4e47fe4ff7ad1f5945 SHA512 a925fb09c5786f2ff7fcb458e3cc37cce0eb2bd431b24e582cf02e7656716bfd9b7ffa3647f6f3c56ccfa313d2238cd263f28c2321850c1de082c48ebd9af5cb
 DIST s3fs-1.85.tar.gz 170209 BLAKE2B 1f879948d243d36c99186a4b6a52cd1200472c7f792583e56cd82e4f00e79374e82ee033152dac2642e626acbf9e0523a45fa41aed0bcd9b1743df418387d610 SHA512 c99920bf1f1dc04a0ff89a71ad027a5b65d22d75a77f5c6dd4559eaa299af36c71d29b4bcf9fe7e473478e7da1d328c7cfcb1fb77d414b65a289f38456ce5d7a
+DIST s3fs-1.86.tar.gz 183636 BLAKE2B 78996960725699fee4c0c2b131c227acc073fca407f1057ae636167a7a2313e460f1e3a89c7d8a3741987d8ba46ab1827f8f7c882261ed78bb5c5148ce935d42 SHA512 a4f79d9ae526427d5d41b5cd1519e4aac605e8bbd97079aec2a67562f0322fa5664d770d565aed4fca83ae254ab3c0454d25f4b86ec4d148a57c7745e07f5e14
 EBUILD s3fs-1.80.ebuild 975 BLAKE2B f255a02ec6a4fa97aed20007878c474f1196b78f3148b7e7f77356a2051ace6910c63ffddab2682e32c6f03e611095e71b3db1b55bbb66ef4124be76118eb8be SHA512 78e40951c4766934f3a5da327889e9795f06fa37c1f6609991dda2b0f95971ec4fe3119845517fc11885965e4b85dbab1015c63850d5d8fd71c9e0315571469f
 EBUILD s3fs-1.83.ebuild 984 BLAKE2B a8d7b72e5ddc921813fed8dcde49fe24a9653ab58e785735bd0e00cbe10531dbdd5348300b0d44e760cb8c1ecdaba7c5d61553994cd47eafd1f36e2aa690cd8c SHA512 ea0b563bc9437d4ccdf44c58d4ba46ed740e234d0dcdc1de0b9caa603efd174bb893a3537f33fcccda5f2eafb54f017eede28492db5d13d20671788beef82821
 EBUILD s3fs-1.85.ebuild 1026 BLAKE2B 74e6710c0cee83a61b5038a8532183abfc76a5df879026f4a69a6474fc0eaf5dca6f6c053f022d61d481ecd27b213fa5d813f93323c0d7d57afb148be153e7fd SHA512 7028aa303c49074e12b8a7705bdf9e6c10a1f8f30e1ab10ebefff8a33433079a3070161475c1bf89d235d366ae05edee9c8169a15b05500f541c126d3273c589
+EBUILD s3fs-1.86.ebuild 1026 BLAKE2B cfcd85d74dfdd1aa138a090c3c4f6aa41bf5beadf1a6a5ad85ebed2ebccab7a92906bb549c3f7c26719ae618b6a260f883478ae5cf2270680ea2a0c75d3c47da SHA512 8a195d893fb8ec335bbb9a7bb25b3e6b5f052ec54e10c5c2bb23c1422ad00603782e3e1e3c36757e2279235267c1eb7a197a1b53655b65be1a1ae8a57a119b10
 MISC metadata.xml 781 BLAKE2B 97bacc52164bcc8f16df993523ae64d3d848b27649e99479b4910c4927a9bcf866dec9373ebc6293d55078b7d704c8182cdcc5d0c25dfbd9912adc8ec82daaad SHA512 c85a9298324825ece93ccb670708647d53234430aba6722af4e5eb8485d30a1c007a7d652c8cd455587204bff439cd455ad90a106eb46cf0645d16020a883e5d
diff --git a/net-fs/s3fs/s3fs-1.86.ebuild b/net-fs/s3fs/s3fs-1.86.ebuild
new file mode 100644
index 000000000000..15c85dedfe1f
--- /dev/null
+++ b/net-fs/s3fs/s3fs-1.86.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PN=${PN}-fuse
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Amazon S3 mounting via fuse"
+HOMEPAGE="https://github.com/s3fs-fuse/s3fs-fuse/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls nettle nss +openssl test"
+REQUIRED_USE="
+	^^ ( gnutls nss openssl )
+	nettle? ( gnutls )"
+
+# Requires active internet connection
+RESTRICT="test"
+
+DEPEND="
+	dev-libs/libxml2:2
+	net-misc/curl
+	sys-fs/fuse:0
+	gnutls? ( net-libs/gnutls:= )
+	nettle? ( dev-libs/nettle:= )
+	nss? ( dev-libs/nss )
+	openssl? ( dev-libs/openssl:0= )
+"
+
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with gnutls)
+		$(use_with nettle)
+		$(use_with nss)
+		$(use_with openssl)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 195c9e7a2257..9c5cfcb7161b 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -8,7 +8,7 @@ AUX samba-4.5.1-compile_et_fix.patch 762 BLAKE2B 432d8380e3511c3dbb408479d0152fb
 AUX samba-4.8.6-no-pydsdb-when-no-addc.patch 1493 BLAKE2B ce0de6426170645c15bdc4832fd35d8dcd6de9c1ce014846d3c8bbbb4d8f6c654c0e6a02252186f9de76d0735ac808d0326b1c57e9e98c00a357792430fbd4bf SHA512 f3e5c9ce1e75e8332e38ad33a637d7f687a77c8586511aad252db0176b4483e9e6a8ede09d7d448a0146d35f141d61a937561e16029606d08047974ee58dd982
 AUX samba-4.9.2-timespec.patch 701 BLAKE2B 8bb49dcc4a2e8219a66737e6211b1f597bba9f64622c750fbd5334c60f7d69fd61030422cc4259dd83068b820276a5ce873f59560e9a54a9891a1d7d213ce47a SHA512 9aeaa8a4359828f34cc66a92b88579592580435fd0992b9dfe5b541c9b08e103bef644a0049dfc29f305c1dd3ca3b87f378957f9afae95cfb2c72bfb6e44941c
 AUX samba-glibc-2.26-no_rpc.patch 631 BLAKE2B 22e414bcd329d7d32381c61ad4341de69a07235447dc4116855cca9ce99d32a5ffe111602fdf6ea02c6fe9c5b3331ecaec974faa5e22e009f15964296b53825a SHA512 18a466cbe42313f096ebeb635e5738b59672e96fd5c7db80cff5aa96c0edeb359b6833967bfac09eb5c010eec4309b3b73c0f941173b520918939974fa599541
-AUX samba.conf 61 BLAKE2B fff77908503f3718cdcf04b60eda6bf717fb37628107676ed66133da235af95ac91d6209f97830de7a5bfdee9e25f850334bb445ee22110d14eb82e1b399694c SHA512 4a75185762c90d110c399215fbfc939d30804b558ffdb11cc68dee6f87a94c86cadbcd63935884db1266cf40fe24fefb75f9067fe4751ad9838d7a43e8973b9e
+AUX samba.conf 88 BLAKE2B 5bf3391fdf31b284bfa68b904370776d2e5b14fe0ce5677b4982b54da379e504cf9a3c9563438ce262b9634140a1192ecf00f57a66da2e42d52c351ae9972d4e SHA512 b26251050e29571e6a567d8516aa0ea82fe7fdaa25726677b6cad20d0e25b9fec350d755d26c778855a1444d20852930a47c06340c213dac441375a2c424fdb2
 AUX samba.service 199 BLAKE2B 5949503c588684a48ab0a26f5811bb053d8527eb9da2ecc8b4bd911ea6d51969bc9607b14f3f72394127ff24967849d3e829a05b6584ba3f3de5e640d240c204 SHA512 eb277917f15de958f4a0404b66c6d2cc82ae4319b85f2f442489988d523bf92e2a9d23a6051ee693cd4bcfbc67947e8028c59906ad3e537578daf5caee8a6f16
 AUX smbd.service 250 BLAKE2B 70b1bf1dfb5f099ca9880d6eeee3996f6f69cc2744e07c577b396ac973326c60dd3874129c23fc0d53b7d3a50891a607d35781a8eda1702029c3602a212bb89a SHA512 a54e3c337f7c27766a81f68ad6d8f4eb6ddb1d1aec3303f274e419a49114755bc5dd711701d5e64954ae7153a8be4a7063371af286696c0b81d543b9276703c3
 AUX smbd.socket 121 BLAKE2B 1261742bb1cd586f376ccd1027a5c57754460bcaf7aed4b800ae8afeefb663a761cae38e89da56dfef06b9b82aaafa8d98f2f7d9fb45ca52652888ec92470618 SHA512 2db4a707fcc6ef1928ac010e5e92cdaf0f6ff3ffa8aef918e0db1ce910abfb481d6a19082337f9c8444cd780d1d442fa8df2bb65e6142fc109d29657532572ed
@@ -26,15 +26,16 @@ DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.9.17.tar.gz 18100548 BLAKE2B c0b9a869b67fafaaa09776c472d8a7fd56eed10577ea554d07a8ed1d591dcb783381ea3d2c026315bdeebb0b4a8d456d4193da65be1a88b246d235ecda70cac0 SHA512 658fd4a073e7f93ccb270d63d4a12fc29ec30d3928464f81c583c85706d3a559794dbde23c6dee17ac7c3333ce2c5afb965c152fdeb6b7bd643fe1bafcd35823
 DIST samba-4.9.18.tar.gz 18103049 BLAKE2B f1071f76924722294be545534c3462d12963073dade444d9aebbbcb56bb84f5ae608bf9a97583e1050713ea668ced6aaf13f0a180e7b682da8405d40600cace9 SHA512 c7161fdf90d5e2ee5fd28aca93b596f4dc4417d2f8519a586a2319e42a62107a026adc128b90f7c3ad71d4d21c0b782bc8eb79005714bf0ee93fba19ffeef624
-EBUILD samba-4.10.11.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
-EBUILD samba-4.10.13.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
-EBUILD samba-4.10.2.ebuild 9091 BLAKE2B 0bb02d822c1844b309024dc9baa3deec2c640d1b730d5e65ffafacb9699a6b99d3ee1e081e0c71ff4bcb13eb3fb35ed42c1a0e60ac744ebbbd812576f9e57dfb SHA512 581cdec2ecca48938e44234a3a304dac9812fe4a46fed1baa80c12761c20e2e396841e7b2d709b2b70958ace6f762b586286f582106ff4a33d78cc861e21f26d
-EBUILD samba-4.11.4.ebuild 9120 BLAKE2B 3fae352c31471f27cc0ee0b562823f3f2c73b4912855370d7b6c4c162aa605f5411a161861a8b84d0ec2a3976a82ff735c9dd920f036fa149265308caa075824 SHA512 9ff6eea2d8544012d2d5e9b39e0506e5453d5c3d344c2b84126631916b7184e993e198380c41e5a62116e3bf1a892570abb28a768cbc4081eaa58894d4ba78f0
-EBUILD samba-4.11.6.ebuild 9120 BLAKE2B 3fae352c31471f27cc0ee0b562823f3f2c73b4912855370d7b6c4c162aa605f5411a161861a8b84d0ec2a3976a82ff735c9dd920f036fa149265308caa075824 SHA512 9ff6eea2d8544012d2d5e9b39e0506e5453d5c3d344c2b84126631916b7184e993e198380c41e5a62116e3bf1a892570abb28a768cbc4081eaa58894d4ba78f0
-EBUILD samba-4.5.16.ebuild 8194 BLAKE2B 23e95a991215abdc79c68b1e24682a6fb5d2cff89916fe480adf4d4de91501d6fc4d3e39efab8cae8b3ec7e4c6b927feb66b715ed3c460ce39d6110ca50125f4 SHA512 f24289fa7576dfd647ddd2caf286ac2f0403c1cb9e1902cc5197394e063294199bfb57bc773494371f53a081434221432489d2b5aea1919aab002a8f09f8aadb
-EBUILD samba-4.8.12.ebuild 8924 BLAKE2B 4ea486ecca9964519c4739195d14ce22e013acb7a9a9308cb9ce43b3ed6aa9cf64ab2a4a3bff13983e13f217b511d12a8726a57bb97d19952f99bb53b15a2db1 SHA512 f795b98e9a0580c034247fe8f64f1b7158ed239630b92666686cf32945907ab9159acc93ac541b3f9f04d2132da9f820e72ea80e242c440d72605d5ccd500578
-EBUILD samba-4.8.6-r2.ebuild 8497 BLAKE2B 4db3c17b11ef2146db59131877014b44c136ba0b720c906a407f6f7b6c405a858fe3fb0e0b31a7e17df8af68f02d881849b270ca8141b47dd401beb5a6465e92 SHA512 063682dafc10fa9505be914e2986f8abde6eaab92bcbda68a06f0d2a153f0659e1c75f7eef63153862e9699be5bec56de73b74b41f8988aa8b06f09eaccf2ca6
-EBUILD samba-4.8.6-r3.ebuild 8885 BLAKE2B cc2ee57e0463f6daaaeecd0bd149538f838e39534589f2a94d7f331981563c544d27a2e94860b4a701f6ad1150f20891590af93a5cd9db229615033063251c10 SHA512 bed25be8178f0b2899fcca57bb577a86c917075d901abeb8ba46462c82629c2a832ebf5f7b36e95cffea7189eca082b3863a3b79ad29c972569826d3ac906ac9
-EBUILD samba-4.9.17.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
-EBUILD samba-4.9.18.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
+EBUILD samba-4.10.11.ebuild 9311 BLAKE2B 4be84e08601ec008a2f4fd3c00dab7b74e313175e3b444b831ef1f2ebee292532dca7ceeb95239deac1b30716d82b16527b7d220ee669559cacd0089e5bd9a4b SHA512 e1758cb0eb7713e8ad098d646e365eb72016058df7a9b86b1a5c378103370cf5f71948611eceb7007aa89f8ce15a3634f80f4eba7acf649604dc8c8a7eef1572
+EBUILD samba-4.10.13.ebuild 9311 BLAKE2B 4be84e08601ec008a2f4fd3c00dab7b74e313175e3b444b831ef1f2ebee292532dca7ceeb95239deac1b30716d82b16527b7d220ee669559cacd0089e5bd9a4b SHA512 e1758cb0eb7713e8ad098d646e365eb72016058df7a9b86b1a5c378103370cf5f71948611eceb7007aa89f8ce15a3634f80f4eba7acf649604dc8c8a7eef1572
+EBUILD samba-4.10.2-r1.ebuild 9174 BLAKE2B eb180ea72de902834376ae5ed94867f208d03c45ab75817ac7d9a726c5081d66714f14d6e268bdc2e008400883615a7935c5cbf0c2e14d9a923c9a76a01ca043 SHA512 2dc542237c1caafc9d2902850f9e312dfd7e78b313d385bdffd0a7206fd441163b06112f14bf96081e463d7d82cc228618a0921a88fdf49acc55f9248e37e71b
+EBUILD samba-4.11.4.ebuild 9203 BLAKE2B c8e019f9d1d6e205a7ae04dfb8a88b53cbf82bc6e35a74e713e237d78f5ea9c006bd7b860664ed31ee7bae9325c63def437c2f31356fcd110bca385acd176c1e SHA512 fdbafa2bf18b6ffb395c21151c37027f2a3994bb7a07cd0ae0955d7f7ad3eae270798c7fb1d8b71465266d177ddb5152eb40bcf10d209f7916c7c37ee5952a97
+EBUILD samba-4.11.6-r2.ebuild 9337 BLAKE2B 84988819d594a8a7fd949d6734c2a14ab020df9131307a4e097ac96799c3f5106adec505333a3667bb8bb6605434287b595a7a2d33ad20592418ba463f7b75c1 SHA512 23c1b54c173c9e5282b036e38550e61004e7c72284b6e7dd695da0ca95fda060ed4f40cd6d062c0eb156b2f5dba65b621fb296dc633b16f0d42d96dfd29cd9d5
+EBUILD samba-4.11.6.ebuild 9203 BLAKE2B c8e019f9d1d6e205a7ae04dfb8a88b53cbf82bc6e35a74e713e237d78f5ea9c006bd7b860664ed31ee7bae9325c63def437c2f31356fcd110bca385acd176c1e SHA512 fdbafa2bf18b6ffb395c21151c37027f2a3994bb7a07cd0ae0955d7f7ad3eae270798c7fb1d8b71465266d177ddb5152eb40bcf10d209f7916c7c37ee5952a97
+EBUILD samba-4.5.16-r1.ebuild 8245 BLAKE2B 9ab6043f813d9b086c0975645a2f513af870f558a1443d82a071eeb327439f8b8b2051bb6264cc5007a3e5b998acfaf3f1e41fc3f1bde6a92ce33281a00111c6 SHA512 31bdefd0054775050fba330030a9e885f60645627a380643aba84dadac4fb0381070a6f5e5a8e22bdcd1a315d9bc9ac941d25e918dcc3855ec746beb10366a4b
+EBUILD samba-4.8.12.ebuild 9007 BLAKE2B 0c142305855bf70cc6bb4d7a6c1d4eba10a31aa89b7d60a836d69a2e0c000867d1843c871c2c4b1e2acd4a99f326178b428b079e5f242c7671da06797b8bac3a SHA512 121e088b0a60af4692754b28482ce6ae9a06fdf36757b26fbdde71c10c5723b77057edf6a69311f1cf312a6f120c5d3482fd9b141748f385e159a2a4ec6bb889
+EBUILD samba-4.8.6-r4.ebuild 8580 BLAKE2B 8ec4fddc1f73759e047ff3d709a4552aecc498f48d2cf6b5e4bb88b56e143d37227d3f4530a4a8ba7a7526ac9459fb480c32a13d5a74ae6b1925b553d334cf3d SHA512 67e16e6b9b31299b72d52a5ef8c56e7bb649abd28e9545e8e93d8ffcfa5a5e124cd67cf083f9904e8f7ef3072ac730c78d94f2269a7ddf5832afe4ca2e23c33b
+EBUILD samba-4.8.6-r5.ebuild 8968 BLAKE2B 57f592bb11006adce6bbc0c748aee714c6e7ec22b4cab892a06afcfe897b6eea6fec8dc5111e2f11b6a7490963c68cf24e3468dfda6cf1c77ee36c2577b1b24d SHA512 c86c0755c845a441abaf6af11493ed3d33f08ef87e68b93c62598e15bb846cd46620f79817635f751395c526a58a005e3a49ae88ddbd8e0c2dfc06376db8b770
+EBUILD samba-4.9.17.ebuild 9166 BLAKE2B 36ddbf387d1d696cb4fde6550638677612df864dc353baf5875571df2263470ead19b78d37d83682691872c8e3447f2015fa5c2e55a06f6129803ff1859f80f0 SHA512 07afcec6d311b1ec32550a26f21bec34288e6fecc5ff785ac20801330b7f1d0f4a8a14f8eb69cdb5edf05a822af7b7897dc867bc5012002b554a5f533182e19b
+EBUILD samba-4.9.18.ebuild 9166 BLAKE2B 36ddbf387d1d696cb4fde6550638677612df864dc353baf5875571df2263470ead19b78d37d83682691872c8e3447f2015fa5c2e55a06f6129803ff1859f80f0 SHA512 07afcec6d311b1ec32550a26f21bec34288e6fecc5ff785ac20801330b7f1d0f4a8a14f8eb69cdb5edf05a822af7b7897dc867bc5012002b554a5f533182e19b
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/files/samba.conf b/net-fs/samba/files/samba.conf
index e0a6f325cf9a..a7f4946fb07c 100644
--- a/net-fs/samba/files/samba.conf
+++ b/net-fs/samba/files/samba.conf
@@ -1,2 +1,3 @@
 D /run/samba 0755 root root
+D /run/ctdb 0755 root root
 D /run/lock/samba 0755 root root
diff --git a/net-fs/samba/samba-4.10.11.ebuild b/net-fs/samba/samba-4.10.11.ebuild
index 329dc7c24129..e782b5089c52 100644
--- a/net-fs/samba/samba-4.10.11.ebuild
+++ b/net-fs/samba/samba-4.10.11.ebuild
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
 	ceph? ( sys-cluster/ceph )
 	cluster? (
 		net-libs/rpcsvc-proto
diff --git a/net-fs/samba/samba-4.10.13.ebuild b/net-fs/samba/samba-4.10.13.ebuild
index 329dc7c24129..e782b5089c52 100644
--- a/net-fs/samba/samba-4.10.13.ebuild
+++ b/net-fs/samba/samba-4.10.13.ebuild
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
 	ceph? ( sys-cluster/ceph )
 	cluster? (
 		net-libs/rpcsvc-proto
diff --git a/net-fs/samba/samba-4.10.2-r1.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild
new file mode 100644
index 000000000000..78940866cb22
--- /dev/null
+++ b/net-fs/samba/samba-4.10.2-r1.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
+pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+	"${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2.ebuild
deleted file mode 100644
index 8e78eb25717e..000000000000
--- a/net-fs/samba/samba-4.10.2.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint json ldap
-pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( sys-libs/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	json? ( dev-libs/jansson )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( python gnutls json winbind )
-	addns? ( python )
-	ads? ( acl gnutls ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
-	"${FILESDIR}/${PN}-4.10.0-disable_gnutls_build_fix.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	if ! use test ; then
-		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-	fi
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_with json)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-	)
-
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-	keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.11.4.ebuild b/net-fs/samba/samba-4.11.4.ebuild
index 56647c0a98fa..fb5e20da359d 100644
--- a/net-fs/samba/samba-4.11.4.ebuild
+++ b/net-fs/samba/samba-4.11.4.ebuild
@@ -47,27 +47,29 @@ CDEPEND="
 	dev-libs/libgcrypt:0
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	>=net-libs/gnutls-3.2.0
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
 	ceph? ( sys-cluster/ceph )
 	cluster? (
 		net-libs/rpcsvc-proto
diff --git a/net-fs/samba/samba-4.11.6-r2.ebuild b/net-fs/samba/samba-4.11.6-r2.ebuild
new file mode 100644
index 000000000000..9219eea8564a
--- /dev/null
+++ b/net-fs/samba/samba-4.11.6-r2.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+),xml(+)'
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
+json ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/libgcrypt:0
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	>=net-libs/gnutls-3.2.0
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python json winbind )
+	addns? ( python )
+	ads? ( acl ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		--systemd-install-services
+		--with-systemddir="$(systemd_get_systemunitdir)"
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+		# bug #683148
+		--jobs 1
+	)
+
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
+
+		# Preserve functionality for old gentoo-specific unit names
+		dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
+		dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
+		dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/log/samba
+}
+
+multilib_src_install_all() {
+	# Attempt to fix bug #673168
+	find "${ED}" -type d -name "Yapp" -print0 \
+		| xargs -0 --no-run-if-empty rm -r || die
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.11.6.ebuild b/net-fs/samba/samba-4.11.6.ebuild
index 56647c0a98fa..fb5e20da359d 100644
--- a/net-fs/samba/samba-4.11.6.ebuild
+++ b/net-fs/samba/samba-4.11.6.ebuild
@@ -47,27 +47,29 @@ CDEPEND="
 	dev-libs/libgcrypt:0
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	>=net-libs/gnutls-3.2.0
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.2.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.4.2[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
 	ceph? ( sys-cluster/ceph )
 	cluster? (
 		net-libs/rpcsvc-proto
diff --git a/net-fs/samba/samba-4.5.16-r1.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild
new file mode 100644
index 000000000000..c9c162895ae3
--- /dev/null
+++ b/net-fs/samba/samba-4.5.16-r1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="${PYTHON_DEPS}
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+	")
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.8[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.10[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	addns? ( net-dns/bind-tools[gssapi] )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${CDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? (
+		>=sys-libs/nss_wrapper-1.1.3
+		>=net-dns/resolv_wrapper-1.1.4
+		>=net-libs/socket_wrapper-1.1.7
+		>=sys-libs/uid_wrapper-1.2.1
+	)"
+RDEPEND="${CDEPEND}
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( gnutls !system-mitkrb5 )
+	ads? ( acl gnutls ldap )
+	cluster? ( ads )
+	gpg? ( addc )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# install the patches from tarball(s)
+	eapply "${WORKDIR}/patches"
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=()
+	myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--without-lttng
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		--disable-cephfs
+	)
+	if multilib_is_native_abi ; then
+		myconf+=(
+			$(use_with acl acl-support)
+			$(usex addc '' '--without-ad-dc')
+			$(use_with addns dnsupdate)
+			$(use_with ads)
+			$(use_with cluster cluster-support)
+			$(use_enable cups)
+			$(use_with dmapi)
+			$(use_with fam)
+			$(use_enable gnutls)
+			$(use_with gpg gpgme)
+			$(use_enable iprint)
+			$(use_with ldap)
+			$(use_with pam)
+			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+			$(use_with quota quotas)
+			$(use_with syslog)
+			$(use_with systemd)
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			$(use_with winbind)
+			$(usex test '--enable-selftest' '')
+			$(use_enable zeroconf avahi)
+			--with-shared-modules=${SHAREDMODS}
+		)
+	else
+		myconf+=(
+			--without-acl-support
+			--without-ad-dc
+			--without-dnsupdate
+			--without-ads
+			--disable-avahi
+			--without-cluster-support
+			--disable-cups
+			--without-dmapi
+			--without-fam
+			--disable-gnutls
+			--without-gpgme
+			--disable-iprint
+			$(use_with ldap)
+			--without-pam
+			--without-quotas
+			--without-syslog
+			--without-systemd
+			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+			--without-winbind
+			--disable-python
+		)
+	fi
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${D}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild
deleted file mode 100644
index 0a8cd5fdfec9..000000000000
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.1.30[ldap(+)?,python(+),${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( sys-libs/pam )
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${CDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	test? (
-		>=sys-libs/nss_wrapper-1.1.3
-		>=net-dns/resolv_wrapper-1.1.4
-		>=net-libs/socket_wrapper-1.1.7
-		>=sys-libs/uid_wrapper-1.2.1
-	)"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( gnutls !system-mitkrb5 )
-	ads? ( acl gnutls ldap )
-	cluster? ( ads )
-	gpg? ( addc )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# install the patches from tarball(s)
-	eapply "${WORKDIR}/patches"
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=()
-	myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--without-lttng
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		--disable-cephfs
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			$(use_with acl acl-support)
-			$(usex addc '' '--without-ad-dc')
-			$(use_with addns dnsupdate)
-			$(use_with ads)
-			$(use_with cluster cluster-support)
-			$(use_enable cups)
-			$(use_with dmapi)
-			$(use_with fam)
-			$(use_enable gnutls)
-			$(use_with gpg gpgme)
-			$(use_enable iprint)
-			$(use_with ldap)
-			$(use_with pam)
-			$(usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-			$(use_with quota quotas)
-			$(use_with syslog)
-			$(use_with systemd)
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			$(use_with winbind)
-			$(usex test '--enable-selftest' '')
-			$(use_enable zeroconf avahi)
-			--with-shared-modules=${SHAREDMODS}
-		)
-	else
-		myconf+=(
-			--without-acl-support
-			--without-ad-dc
-			--without-dnsupdate
-			--without-ads
-			--disable-avahi
-			--without-cluster-support
-			--disable-cups
-			--without-dmapi
-			--without-fam
-			--disable-gnutls
-			--without-gpgme
-			--disable-iprint
-			$(use_with ldap)
-			--without-pam
-			--without-quotas
-			--without-syslog
-			--without-systemd
-			$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-			--without-winbind
-			--disable-python
-		)
-	fi
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
index ad3cf03c2386..5ddbdf19249f 100644
--- a/net-fs/samba/samba-4.8.12.ebuild
+++ b/net-fs/samba/samba-4.8.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
 	ceph? ( sys-cluster/ceph )
 	cluster? (
 		net-libs/rpcsvc-proto
diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r2.ebuild
deleted file mode 100644
index 4461b2d6f1ce..000000000000
--- a/net-fs/samba/samba-4.8.6-r2.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( sys-libs/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.7
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( python gnutls winbind )
-	addns? ( python )
-	ads? ( acl gnutls ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild
deleted file mode 100644
index 9d93bd81c79e..000000000000
--- a/net-fs/samba/samba-4.8.6-r3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+),xml(+)'
-
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
-quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/samba-4.0/policy.h
-	/usr/include/samba-4.0/dcerpc_server.h
-	/usr/include/samba-4.0/ctdb.h
-	/usr/include/samba-4.0/ctdb_client.h
-	/usr/include/samba-4.0/ctdb_protocol.h
-	/usr/include/samba-4.0/ctdb_private.h
-	/usr/include/samba-4.0/ctdb_typesafe_cb.h
-	/usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
-	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
-	dev-lang/perl:=
-	dev-libs/libaio[${MULTILIB_USEDEP}]
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	dev-libs/iniparser:0
-	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
-	net-libs/libnsl:=[${MULTILIB_USEDEP}]
-	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/libcap
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	pam? ( sys-libs/pam )
-	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
-	ceph? ( sys-cluster/ceph )
-	cluster? (
-		net-libs/rpcsvc-proto
-		!dev-db/ctdb
-	)
-	cups? ( net-print/cups )
-	debug? ( dev-util/lttng-ust )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0
-	)
-	gpg? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
-	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
-	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
-	systemd? ( sys-apps/systemd:0= )
-	zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	net-libs/libtirpc[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	|| (
-		net-libs/rpcsvc-proto
-		<sys-libs/glibc-2.26[rpc(+)]
-	)
-	test? (
-		!system-mitkrb5? (
-			>=sys-libs/nss_wrapper-1.1.3
-			>=net-dns/resolv_wrapper-1.1.4
-			>=net-libs/socket_wrapper-1.1.9
-			>=sys-libs/uid_wrapper-1.2.1
-		)
-	)"
-RDEPEND="${CDEPEND}
-	python? ( ${PYTHON_DEPS} )
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-	!dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
-	addc? ( python gnutls winbind )
-	addns? ( python )
-	ads? ( acl gnutls ldap winbind )
-	cluster? ( ads )
-	gpg? ( addc )
-	test? ( python )
-	?? ( system-heimdal system-mitkrb5 )
-	${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.0-pam.patch"
-	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
-	"${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use cluster ; then
-		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
-	elif use ads ; then
-		SHAREDMODS="idmap_ad"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# un-bundle dnspython
-	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
-	# unbundle iso8601 unless tests are enabled
-	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
-
-	# ugly hackaround for bug #592502
-	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
-	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
-		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
-		|| die
-
-	# Friggin' WAF shit
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# when specifying libs for samba build you must append NONE to the end to
-	# stop it automatically including things
-	local bundled_libs="NONE"
-	if ! use system-heimdal && ! use system-mitkrb5 ; then
-		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
-	fi
-
-	local myconf=(
-		--enable-fhs
-		--sysconfdir="${EPREFIX}/etc"
-		--localstatedir="${EPREFIX}/var"
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
-		--with-piddir="${EPREFIX}/run/${PN}"
-		--bundled-libraries="${bundled_libs}"
-		--builtin-libraries=NONE
-		--disable-rpath
-		--disable-rpath-install
-		--nopyc
-		--nopyo
-		$(multilib_native_use_with acl acl-support)
-		$(multilib_native_usex addc '' '--without-ad-dc')
-		$(multilib_native_use_with addns dnsupdate)
-		$(multilib_native_use_with ads)
-		$(multilib_native_use_enable ceph cephfs)
-		$(multilib_native_use_with cluster cluster-support)
-		$(multilib_native_use_enable cups)
-		$(multilib_native_use_with dmapi)
-		$(multilib_native_use_with fam)
-		$(multilib_native_use_with gpg gpgme)
-		$(multilib_native_use_enable iprint)
-		$(multilib_native_use_with pam)
-		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
-		$(multilib_native_use_with quota quotas)
-		$(multilib_native_use_with syslog)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with winbind)
-		$(multilib_native_usex python '' '--disable-python')
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_usex test '--enable-selftest' '')
-		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
-		$(use_enable gnutls)
-		$(use_with debug lttng)
-		$(use_with ldap)
-	)
-	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
-	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
-
-	if multilib_is_native_abi ; then
-		# install ldap schema for server (bug #491002)
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins examples/LDAP/samba.schema
-		fi
-
-		# create symlink for cups (bug #552310)
-		if use cups ; then
-			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
-		fi
-
-		# install example config file
-		insinto /etc/samba
-		doins examples/smb.conf.default
-
-		# Fix paths in example file (#603964)
-		sed \
-			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
-			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
-			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
-			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
-			-i "${ED%/}"/etc/samba/smb.conf.default || die
-
-		# Install init script and conf.d file
-		newinitd "${CONFDIR}/samba4.initd-r1" samba
-		newconfd "${CONFDIR}/samba4.confd" samba
-
-		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-		systemd_dounit "${FILESDIR}"/nmbd.service
-		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-		systemd_dounit "${FILESDIR}"/winbindd.service
-		systemd_dounit "${FILESDIR}"/samba.service
-	fi
-
-	if use pam && use winbind ; then
-		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-		# bugs #376853 and #590374
-		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf
-	fi
-
-	keepdir /var/cache/samba
-	keepdir /var/lib/ctdb
-	keepdir /var/lib/samba/{bind-dns,private}
-	keepdir /var/lock/samba
-	keepdir /var/log/samba
-	keepdir /var/run/{ctdb,samba}
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		"${WAF_BINARY}" test || die "test failed"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "https://samba.org/samba/history/${P}.html "
-	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.8.6-r4.ebuild b/net-fs/samba/samba-4.8.6-r4.ebuild
new file mode 100644
index 000000000000..edd8d3088f6b
--- /dev/null
+++ b/net-fs/samba/samba-4.8.6-r4.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.7
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.8.6-r5.ebuild b/net-fs/samba/samba-4.8.6-r5.ebuild
new file mode 100644
index 000000000000..67b7b1eb3268
--- /dev/null
+++ b/net-fs/samba/samba-4.8.6-r5.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.8.6-no-pydsdb-when-no-addc.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/samba/samba-4.9.17.ebuild b/net-fs/samba/samba-4.9.17.ebuild
index 3ad0587ccb32..9d8f3c2110ea 100644
--- a/net-fs/samba/samba-4.9.17.ebuild
+++ b/net-fs/samba/samba-4.9.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
 	ceph? ( sys-cluster/ceph )
 	cluster? (
 		net-libs/rpcsvc-proto
diff --git a/net-fs/samba/samba-4.9.18.ebuild b/net-fs/samba/samba-4.9.18.ebuild
index 3ad0587ccb32..9d8f3c2110ea 100644
--- a/net-fs/samba/samba-4.9.18.ebuild
+++ b/net-fs/samba/samba-4.9.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -46,26 +46,28 @@ CDEPEND="
 	dev-libs/libbsd[${MULTILIB_USEDEP}]
 	dev-libs/iniparser:0
 	dev-libs/popt[${MULTILIB_USEDEP}]
-	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
-	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
 	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
-	addns? (
-		net-dns/bind-tools[gssapi]
-		dev-python/dnspython:=[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep "
+		dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
+		addns? (
+			net-dns/bind-tools[gssapi]
+			dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
 	ceph? ( sys-cluster/ceph )
 	cluster? (
 		net-libs/rpcsvc-proto
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 29f84cd48fcc..722d48b8fdee 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ftpbase/Manifest b/net-ftp/ftpbase/Manifest
index bb4a6b16843a..9702d9a3ad82 100644
--- a/net-ftp/ftpbase/Manifest
+++ b/net-ftp/ftpbase/Manifest
@@ -1,5 +1,5 @@
 AUX ftp-pamd 700 BLAKE2B c867c659cac367c51021504dd4da0a9dc90609564613f580a0a01a94d2a87d0df903f22486561f23722901df4df06a33d7d7b643ffa4562cf426f2058391d887 SHA512 61aceee28610cb7a6989fca0ee82702df1118dd2e964bb26fe5cfcb508250599e9e1cdb9aa5dfb61df9c5fef25af4334a87d5f1f4065f693193912dfe172bb68
 AUX ftp-pamd-include 632 BLAKE2B 28aa913499698f136e784e8ed420748fe1415d0ddeb64761b8ed71b869e4b9afb6b86df4b8a8a748ec3a740d99c000fcc4789ee45c3a302f81ffbaab07c7e106 SHA512 adc59c544b815bd88b7e91a43cb5620008d1f83d15a08620f56242d74991ba413e56b31bcca8e5fcfe71f05362bbad89b02d5289260f08649d38965c8951ec76
 AUX ftpusers 300 BLAKE2B 02489b8eed29bfd4cea148b1b4214ac5ba798faa44da1be68cea06c18680e44f0054c952107810e4a199398b6ba382c649a481cf9d7388cd5caa10ace50e06d3 SHA512 29a8bdca1a6bb516c5189e6c69969cba3c220ea878e352e78bb6ea5cb2ac7476306736240155dc6d3f7512aac48164354db68721ea952d1010639e8ae14635e0
-EBUILD ftpbase-0.01-r3.ebuild 910 BLAKE2B 8ab569029fa5acc0641f0e5bcb6036d8fba0bd64c30212c1a1d86c23910ebb5db8ab8fa1e2e7868dc54a7db5978c6c3123f5d8057eacf24e29f1377c4645b93a SHA512 6d81026bd86dba82a82e66ebf45922781b4b14b7e84e8d47a29a439d769716813d61cf85ec3fe69b81e580c25ebf4acc35cd779cccca8b074febb8e3379edf58
+EBUILD ftpbase-0.01-r3.ebuild 927 BLAKE2B 062c457b1b5a48a47fdd783b337e9ef9859af56561f80a26e7c9f49f51a46ca1202897b52c55f50d743d2f7cebfbc7fde82c2cfea1bae9bd5b63ebf2ca1a744f SHA512 9af9e72433e7346d57a8cd1457bb5454f9b5e0b6fc4c5c695ea8303a831a0b8d7f295da42b8ae22ea25304c174941f51d2a7db9ebd0ffb47f2e1550d6286364d
 MISC metadata.xml 235 BLAKE2B da947ee7650abf01b4eee1667349a14d2d8d496ec234acd60db66c1059d42d6e9a1d30403068b7977a397f4e0a2934fe4e7c2c04d356b2c23a5e8a87ac7266a1 SHA512 fa78af8197737bd5d9b44305bac24dacac9034fd96284af1e3c89428fc418e17a4bea91fa53f07dce02e6ab8afe6455343db364d031ab342225a26d0364c23da
diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
index b7c12a48f0a1..b285f0229656 100644
--- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
+++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit eutils pam user
 
 DESCRIPTION="FTP layout package"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 313b3e55d4fe..a6eb561c3a85 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -27,6 +27,6 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a5239
 DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
 EBUILD proftpd-1.3.6-r5.ebuild 8697 BLAKE2B 9ac05bd946c84bf0d6f7d30a3003b26e93ef1d625d7e8c1c7e990cb2213a2575f6ab5e47da5925c245d29bdf691103fc55d6cb904d0ca7468bd568d59b0adffa SHA512 a3d0703dea49561f0c7f1aa9456495d310f9093906da59e22ad33111e88644ed01ddfbdffd0062fff8f942e0f6f1b73be39cea69dc55025893b4e1de77d73734
 EBUILD proftpd-1.3.6-r6.ebuild 8756 BLAKE2B f38b4a1066f45b044497f72f4f7467e09c7fcec70cb68ac09095f65aa872f8d4c91124007c6f62bf04e88fec45e56b3a687936fef476ac5f8ca182a241cf7328 SHA512 6a7963148c4526cf8234ffc964165f290968d1164b140e4e85764248140c990efc58217f87b58f18c18cfb7998294347747d5dd884af92b3d4c216b694141898
-EBUILD proftpd-1.3.6b-r1.ebuild 8691 BLAKE2B 96bdc1b96d5c06657908d5dbd0731f979870adcee85ff9b251699202c113b063ce4eed5515e16ae5d55f721fa0c3d914cda392e1ff1795b012eda603a75fc00f SHA512 218c27a740f0cac46f41cd09b3b389bb28f29778af457c7dead39dcaba14452cae38016993143804ee33da6ec104dfed53d6221615a92d909c9ac5f2d6773722
+EBUILD proftpd-1.3.6b-r1.ebuild 8690 BLAKE2B c2e5fc8c82691cf4e01a32a6bae845b95cfe24c94595d0d66bc96e739fefe65605eabc5af8bfad22772558618ae60249b368ae4a7c883cf3ed9ff378478698b1 SHA512 578b5db73e1affd47ba0a1fd9b209f07cedc255d3ca3f773b7490bf5ce0569e7da05fcb539baedbe644cee6b969c4e0f82acb513a8a804d3725a03206cacf519
 EBUILD proftpd-1.3.6b.ebuild 8635 BLAKE2B c6493c2c8258c7fc836fd77e2da827a70bce2f57a596c9f13b9c8679ca5c0dcc3f31387fbc0c9d256502ba9279c432ba765df23035bc36009b7794ba77b9579d SHA512 c297d069ffbbb46ae354b11c8abb4d3d88350ad37dccfcf3ad77dc91bc8a831037969a027f88641e46cecb7fa78f084e5968a53185de6f6acc9f6148bd5a16b3
 MISC metadata.xml 2930 BLAKE2B f3f8218a737f50599ff687030bd8c84f1818b290d6d89bd6627ab8eb02598d196f1bae03d7b15e4eb02967fb7e0d826cdda10588c8bfe4f8a387a49d70d9cab0 SHA512 c90941671532512e4d085f3c6b4f56f3c2a252a613bf5c978d763fb0f8f9190431a41816f4fddde47e28eaeddcd17a7aef52064e5825499801bcdfbd72745be8
diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index a7cb7a64d240..27c9846e806a 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
 	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index e961e1ed7206..7e37eb1b0550 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -7,6 +7,7 @@ AUX vsftpd-3.0.2-alpha.patch 525 BLAKE2B 8d3e0ce8a6cd79862ae0071ab61f1bd9db5a694
 AUX vsftpd-3.0.2-remove-legacy-cap.patch 1739 BLAKE2B ee1d4461ec1ca783a2f704797f504f40f6fbde93707e27044031d03a67e105ecf02be524b1c60bc3ee5ec1624403adab4362637c120de6336aab76a3bf4397a8 SHA512 b0c2b91f0ba3b73706c352ac391e35b048b544fbab1ab3cd223be7f5ca33516143a775456871ded354a05bf74f0403436f4659d06ae9345e8d6a6d1b21addd42
 AUX vsftpd-3.0.3-sparc.patch 462 BLAKE2B bb63dab9f38ba46aa622a1cbacd4d42c1e24a6e413b57e2c47d98235f4fc99684b42ee2a729d12b4e11c14ca063aa51afae25fcbfa9c01b8ab8733801470d397 SHA512 6bbee5674969d6ea356722196cb54c4b8f5da5802b05af560595b0cc48b63af6666ecb58cff085f5a77a95eb8c03590e7406fadf5e38cbce8354e6df66c989cf
 AUX vsftpd-checkconfig.sh 785 BLAKE2B c856a268dbfbcda6bbae38fcf444b1c64986c32d426c890bd67da15c65ecb9082b76f4f8382534f519d6d1c34d50cd5d9bd917f41e5e393af68483b666eb4ebf SHA512 541702557231c79413ae77cf26c28398fea3cb332375f8d22e0c0a45706b04db954d268addd76fecbb8b0ab3109f1009c18b0599394ed33c4a6fc8dc647d889e
+AUX vsftpd-disable-seccomp-sandbox.patch 362 BLAKE2B 47aeb759113e6c6c401c6e135d742f06435490a51bad1a3b72778c60ed5a6ccbb4ea6ab3eeb87948b7658bcf539c277bc75674284474f05d0c4b76e9690c5cb7 SHA512 efa4529a30dc306c190840f47b0e7c4f99321e6d83254015a98018d287c7e624a2472effdd7e7fa1e11a25ca00e876539fd4bc63dc6b0d859c065a7c48e2b0ac
 AUX vsftpd.conf 3733 BLAKE2B 17b92df3ffebd556a9a8e6b7d5ee819528e29615c270afbac82694c31dc8ebb86e844780e49f84fdedfe84a70c6ace998969c026b9ff8aa1ddac27ecd60cd665 SHA512 417b2ebdffe41073d7ee8a1f414ba5bfe4b15411e37b99444443c240fa540c97b0c247f9151ef306f84775dd78370f5985121417267bf25a76f87d259d843719
 AUX vsftpd.init 1319 BLAKE2B 8fd753979e553aa88aefb80e20e65602c8d96fbfdd727a4b375e873315aa24da204900786966846105dc17166aff70f7a8a1b2f4dae8a9cb82897db00a1122c4 SHA512 b367c412f2aebdfa90fae912467ebf227b39be04b45f686c5ea5f66df6addc81a2f130dd616dae932a55108337169e19ef53012f27127eb1970852ed5ea697c0
 AUX vsftpd.logrotate 54 BLAKE2B fcf5395a656ce427c48f806c01d967af06e9f1f795f2af85c51951db59b4fa30209c2211bc1dd44f2cc8a45911531c87d45ea277b722a0c036ed3a99494fd285 SHA512 cee63caaf5e3db620e57132dc1a531cfd39ce790ac64e22b649cf3fac8b825cf188425bdf19cd376aa3f31ea114c8889ee307b6e7f9a2cbd155324f64084d5fc
@@ -15,5 +16,5 @@ AUX vsftpd.socket 104 BLAKE2B 093a6265694c177e724fa2880e8de2e0477347bda315937dba
 AUX vsftpd.xinetd 321 BLAKE2B 3a91c0e65a511ed5ca0feed429550b0ce6e1bd2cc133460e2642fe37aa122b59c0a3fe509d00a5435eaf4c300962c9cb5712b083e7d7d927ffbc148d0bd6a5b8 SHA512 30fb4ae07f55011b9b29625db072062a0f1df4f1c7578041231f35febfb90ad2d2dfe1deb964e34fde5c660f0e3ffc3df3d77af1b2f3a1f724176f691a53a182
 AUX vsftpd_at.service 328 BLAKE2B 826daeaa5b388273c6cefcfcee7415353773db5b9937b3ee714bcf76dd8b061c0693bc9d4b60742fcf5cc946543e69dbb7caacc4ba07b5503d8b66c7db4174df SHA512 5a39e853405bd5028f2c52183eb91ad559fb8edbaacfff5d5146e686417c208bb894bd86d5830a61720a1aaa9ba901160c75ed2bf47eec459b2a49ed217b9cb1
 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-EBUILD vsftpd-3.0.3-r2.ebuild 3624 BLAKE2B 237c08d04ebcf4e1c234288db81751fe438c1bfd30b4cabdf3f7105bdbbb02fcffb5e58403811ce158e0a2926c2fe0818390496c62b1ec69403484e8d2c7aa12 SHA512 1869c60ae51d221568140d35fc9a57770cb0fed26481f7e01d30bb21f31d3b227e7b77b94c3a4530616cf6408901f346337c9544fe5ce29b50307cc120b2c458
+EBUILD vsftpd-3.0.3-r3.ebuild 3694 BLAKE2B 10256812e1bdf9d455e69aef203c6e63afb3e0f67d15c6a1d1dd9e6e266552c55769098ee21d3dff23ba15f750a0bec6b5d29d1fc12e6345bd91cc7bb3afea26 SHA512 ed73641f99e079a41c282a109aa5f32687e3137e059e056c0ba64ffa1ec4f9db87de32f202ff011ca5ca6c906f2b5d16af3310016117b7eadf42ff21e36fd38a
 MISC metadata.xml 289 BLAKE2B 3792154c21dd99e4a6e68a711493e3086ddf124a40275c43d8d6aca47f01dd76e7992eea16b235302d83529483a13843c8fb254ae2e436e9c2bd398908d65bcf SHA512 89cacd404713612a2347edb25dccf6c25c565d2b18ecdceb8614b5b5c5a913cd5ac0fe0b2ca32918854a69817e7b43300612eb6248655b59cf147b6d03922360
diff --git a/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch b/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
new file mode 100644
index 000000000000..10266e36a87e
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
@@ -0,0 +1,15 @@
+Disable buggy seccomp sandbox code by default
+
+Bug: https://bugs.gentoo.org/443898
+
+--- a/tunables.c
++++ b/tunables.c
+@@ -226,7 +226,7 @@
+   tunable_isolate_network = 1;
+   tunable_ftp_enable = 1;
+   tunable_http_enable = 0;
+-  tunable_seccomp_sandbox = 1;
++  tunable_seccomp_sandbox = 0;
+   tunable_allow_writeable_chroot = 0;
+ 
+   tunable_accept_timeout = 60;
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
deleted file mode 100644
index 737cd124f08e..000000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
-HOMEPAGE="http://vsftpd.beasts.org/"
-SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="caps libressl pam tcpd ssl selinux xinetd"
-
-DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( sys-libs/pam )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )
-	xinetd? ( sys-apps/xinetd )"
-
-src_prepare() {
-	# kerberos patch. bug #335980
-	epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch"
-
-	# Patch the source, config and the manpage to use /etc/vsftpd/
-	epatch "${FILESDIR}/${PN}-2.3.5-gentoo.patch"
-
-	# Fix building without the libcap
-	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
-
-	# Fix building on alpha. Bug #405829
-	epatch "${FILESDIR}/${PN}-3.0.2-alpha.patch"
-
-	# Configure vsftpd build defaults
-	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
-	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
-	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
-
-	# Ensure that we don't link against libcap unless asked
-	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
-		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
-	fi
-
-	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
-
-	#Bug #335977
-	epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch
-
-	#Bug #450536
-	epatch "${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
-
-	#Bug #630704
-	epatch "${FILESDIR}"/${PN}-3.0.3-sparc.patch
-
-	eapply_user
-}
-
-src_compile() {
-	# Override LIBS variable. Bug #508192
-	LIBS=
-	use caps && LIBS+=" -lcap"
-	use pam && LIBS+=" -lpam"
-	use tcpd && LIBS+=" -lwrap"
-	use ssl && LIBS+=" -lssl -lcrypto"
-
-	CFLAGS="${CFLAGS}" \
-	CC="$(tc-getCC)" \
-	emake LIBS="${LIBS}"
-}
-
-src_install() {
-	into /usr
-	doman ${PN}.conf.5 ${PN}.8
-	dosbin ${PN}
-
-	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
-		README README.security REWARD SIZE \
-		SPEED TODO TUNING || die "dodoc failed"
-	newdoc ${PN}.conf ${PN}.conf.example
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/${PN}
-	newins ${PN}.conf{,.example}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/${PN}.xinetd" ${PN}
-	fi
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	keepdir /usr/share/${PN}/empty
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vsftpd-checkconfig.sh"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
-	systemd_dounit "${FILESDIR}/${PN}.socket"
-}
-
-pkg_preinst() {
-	# If we use xinetd, then we set listen=NO
-	# so that our default config works under xinetd - fixes #78347
-	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example
-	fi
-}
-
-pkg_postinst() {
-	einfo "vsftpd openRC init script can now be multiplexed."
-	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
-	einfo "If you symlink the init script to another one, say vsftpd.foo"
-	einfo "then that uses /etc/vsftpd/foo.conf instead."
-	einfo
-	einfo "Example:"
-	einfo "   cd /etc/init.d"
-	einfo "   ln -s vsftpd vsftpd.foo"
-	einfo "You can now treat vsftpd.foo like any other service"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
new file mode 100644
index 000000000000..b5dea09d6877
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+HOMEPAGE="http://vsftpd.beasts.org/"
+SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+IUSE="caps libressl pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( >=sys-libs/libcap-2 )
+	pam? ( sys-libs/pam )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )
+	xinetd? ( sys-apps/xinetd )"
+
+src_prepare() {
+	local PATCHES=(
+		# kerberos patch. bug #335980
+		"${FILESDIR}/${PN}-2.3.2-kerberos.patch"
+
+		# Patch the source, config and the manpage to use /etc/vsftpd/
+		"${FILESDIR}/${PN}-2.3.5-gentoo.patch"
+
+		# Fix building without the libcap
+		"${FILESDIR}/${PN}-2.1.0-caps.patch"
+
+		# Fix building on alpha. Bug #405829
+		"${FILESDIR}/${PN}-3.0.2-alpha.patch"
+
+		#Bug #335977
+		"${FILESDIR}"/${PN}-3.0.0-Makefile.patch
+
+		#Bug #450536
+		"${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
+
+		#Bug #630704
+		"${FILESDIR}"/${PN}-3.0.3-sparc.patch
+
+		# https://bugs.gentoo.org/443898
+		"${FILESDIR}"/vsftpd-disable-seccomp-sandbox.patch
+	)
+
+	# Configure vsftpd build defaults
+	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
+	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
+
+	# Ensure that we don't link against libcap unless asked
+	if ! use caps ; then
+		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
+		eapply "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
+
+	default
+}
+
+src_compile() {
+	# Override LIBS variable. Bug #508192
+	LIBS=
+	use caps && LIBS+=" -lcap"
+	use pam && LIBS+=" -lpam"
+	use tcpd && LIBS+=" -lwrap"
+	use ssl && LIBS+=" -lssl -lcrypto"
+
+	CFLAGS="${CFLAGS}" \
+	CC="$(tc-getCC)" \
+	emake LIBS="${LIBS}"
+}
+
+src_install() {
+	into /usr
+	doman ${PN}.conf.5 ${PN}.8
+	dosbin ${PN}
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING || die "dodoc failed"
+	newdoc ${PN}.conf ${PN}.conf.example
+
+	docinto security
+	dodoc SECURITY/*
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/*
+
+	insinto /etc/${PN}
+	newins ${PN}.conf{,.example}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd" ${PN}
+	fi
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /usr/share/${PN}/empty
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vsftpd-checkconfig.sh"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+	systemd_dounit "${FILESDIR}/${PN}.socket"
+}
+
+pkg_preinst() {
+	# If we use xinetd, then we set listen=NO
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example
+	fi
+}
+
+pkg_postinst() {
+	einfo "vsftpd openRC init script can now be multiplexed."
+	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
+	einfo "If you symlink the init script to another one, say vsftpd.foo"
+	einfo "then that uses /etc/vsftpd/foo.conf instead."
+	einfo
+	einfo "Example:"
+	einfo "   cd /etc/init.d"
+	einfo "   ln -s vsftpd vsftpd.foo"
+	einfo "You can now treat vsftpd.foo like any other service"
+}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 2b26898a87f8..17b5aeff3f9d 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index f7d89f000a11..acc45bfbf89e 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,4 +1,6 @@
 AUX choqok-1.6.0_p20190726-missing-header.patch 2633 BLAKE2B 337a69d5addaf10e55cda74d40f0ebf7e768be12cf9b9315a29b622fddb5e2ae0ade9107907b8be495ab285f8cc94bb556c1103191b884620e4469f9ec43c390 SHA512 31b87f27d697afabbc41516715e35b5c28a884db454275c22cc5014af965bcd8ba5faac7ef029754a9c706052972fac39df6e4320f346e450bb808a2f409932c
 DIST choqok-1.6.0_p20190726.tar.xz 1184148 BLAKE2B c0c0459de362aa58337ab2d0c4ea03ff516de87bded48f73c47aa48ed791cfeb82c4085c4d333bff4ac1489a27e038da29d5419569aacb17366dc119e776dd67 SHA512 6471d9b37cc78fd3a14cc970512db3a8d44b21d49efb503917a57332f229c34ed735edfea6a74d6c25d8ab8d153331226effd677405d447c4a2faea3e396decf
+DIST choqok-1.7.0.tar.xz 1202092 BLAKE2B 62e0c561579c36198f645bb550822d9bec583d8337b37e3336e4352199800b1807b80931f8c7c8141f74dfb91ade9f89b371723a8a3ea3e7bde97854634b82b2 SHA512 6f5998078e555f7b4a40270ad0a4defa2d15bb8440b810320fc4cfc38d78cb34bb9b2f6a38eb33eb3217b51a78a7fbc7f79224cd0ddb0fcbf8c9035d8e600e96
 EBUILD choqok-1.6.0_p20190726.ebuild 1983 BLAKE2B 9d5a949f3c6016c414b490ab99f44c27e5b3e4f1c0cf3beee786e652c0c20e0b249ccb7b96069bd3514e6beee748d0df322c1b1fdd8bf6ca33fb72ffe15c20ad SHA512 502c690d6408f2c5eca575f2dab37c7537248e536b686fead44c3b0b2ec5f7e625436e87b673e530728bcd58b44ea8edc974de9874993fa3966888d83cb95a48
-MISC metadata.xml 534 BLAKE2B 641e9a82e273a88f4ad7babec0ed86995e0a40a08a3b41207fb2139991857d6cb14392070cb7e81b89116b9e0cbc6a1fc7c2a4a4a9bd2e2a0d11489dc6ea03e9 SHA512 57e46f814444e2072218a78f3a668d50f8cc6f2e67a7c4560c9d06e03f6846c462186199b83dd008ca06c419e8c7b42654dec6cc782e19af188812b9020301bd
+EBUILD choqok-1.7.0.ebuild 2211 BLAKE2B 67536efba6f6d9b50e702a8ba67a9529355b823710865c7cde5559425d0a86d51aec3fab4810f6f8d53998ccfef3eea8929cf6f9af36ec020dd909fe1738aa6f SHA512 f91ed01d97b3bb62da2ea93a2fd068d6d34c1ff6c04cdf8906d3b416fe5faa46830d95b74f686d483ae36dda44da227c1b94b1f85032c3d8db7002f515645f9a
+MISC metadata.xml 634 BLAKE2B 30e3ee2973d1de819dba64ce8f5029627248786d73d13a6203d24c9714cd160481b7170c04a4d7e78c2e1d9a2061b4b952938be2df31b3883fabe2323a2a9154 SHA512 fae64251578632ac8f3f74f2a75b30b2e470aaab9103a5a92978681f8194ecd65f8d2162800ede82b7f2574bb1a5142de8bd68db2e383342ec1ac958e39dd599
diff --git a/net-im/choqok/choqok-1.7.0.ebuild b/net-im/choqok/choqok-1.7.0.ebuild
new file mode 100644
index 000000000000..a6a4bf140c46
--- /dev/null
+++ b/net-im/choqok/choqok-1.7.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Free/Open Source micro-blogging client by KDE"
+HOMEPAGE="https://choqok.kde.org/
+https://kde.org/applications/internet/org.kde.choqok"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.0}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="5"
+IUSE="attica konqueror share telepathy"
+
+DEPEND="
+	app-crypt/qca[qt5(+)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	attica? ( >=kde-frameworks/attica-${KFMIN}:5 )
+	konqueror? (
+		>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+		>=kde-frameworks/kparts-${KFMIN}:5
+		>=kde-frameworks/kdewebkit-${KFMIN}:5
+	)
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README changelog )
+
+src_prepare() {
+	ecm_src_prepare
+	# TODO: quick fix for bug #708464
+	sed -e "/find_package.*Purpose)/s/ COMPONENTS //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package attica KF5Attica)
+		$(cmake_use_find_package konqueror KF5Parts)
+		$(cmake_use_find_package konqueror KF5WebKit)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package telepathy TelepathyQt5)
+	)
+
+	ecm_src_configure
+}
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index fd48455d9707..7606fdaab74d 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="attica">Build Open Collaboration Services plugin using <pkg>kde-frameworks/attica</pkg></flag>
 		<flag name="konqueror">Build Konqueror Choqok plugin</flag>
+		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 11ffb6f12b05..623c27467f69 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,3 +1,3 @@
 DIST empathy-3.12.14.tar.xz 5017776 BLAKE2B 15f4c71a4f40988afd51d0665ee24164fb7e1d14994e577c23fa29a995503e78f8b784d26edd90503f9825c64dc814f07860aa6792eec6948c566dc3ff669dad SHA512 f467277278a9e8d330e4ab656b3edb2acac6efec211baa146a5ea0a6d0da299e68cdb83ceb1a27a1aa4744c2ce1a441fa287001003c523036ada517029a40123
-EBUILD empathy-3.12.14.ebuild 3021 BLAKE2B b8559474a42bcbe19c62d3291416608f218ecf7d0910503de57a65101fbdeb3dc536e62e102afa9f4e58967ccc49ab99622b733a0d946f193566ebcc61a830fc SHA512 f184726f6634126b5bcd2f8ccbb8f8a70b311d3bee44d4ef3f7aaa138b2d2569adca3d80402250ec0cee4f1f6c4a540866035665a1db94c373b038dfff56c747
+EBUILD empathy-3.12.14.ebuild 3015 BLAKE2B 886e723b2775df129cac768f6b69f26803638caacbe30a5d515c80270b04b3672a35b2c13a6fc51f7b3df03a887f3f9431476599ef4bad2cbe6ec1a47a262ca4 SHA512 91a79a5a2a7461d41ddee8c70624ffed7e70a76a49877af54902f467e34566f2a9587ab06c6f0fe85e4f2c39f037df9282be37d0eb6dbd6b73fa764ef12fd663
 MISC metadata.xml 946 BLAKE2B b31b1cd6a21a89f6b9250cbe68465ddb9abdc524ffa16d232813b4bca917edf03c2b4690dcfdedc5ea281738ceb638a3f975064527d53e3fe87a7ca190bf43bc SHA512 98f60d8d61b6fe772c334bd4a0890aefb105231b1ee6adb8dccc20962334fbf95c229aafba68a8ff500cf067bae20b7049fbe2c0023c4abdabcafeb86b130d83
diff --git a/net-im/empathy/empathy-3.12.14.ebuild b/net-im/empathy/empathy-3.12.14.ebuild
index 3d417c69b798..c17003cc09c7 100644
--- a/net-im/empathy/empathy-3.12.14.ebuild
+++ b/net-im/empathy/empathy-3.12.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome2 python-any-r1 virtualx
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 72af109b6290..dd9f0bebd211 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,6 +1,6 @@
 DIST gajim-1.0.3.tar.bz2 5964743 BLAKE2B af4bf2206a962eb68c4df09359fa3a0ccaca1e886d4fad67d9839f5fd4c1fd359c7ee7933d39d8c1ae7dcbde6b72548fef3564a467653064d4d37aa1db234c04 SHA512 a6d7f92a22a9dddc8a4b07eda0aae0b6fb4db57c73133ee19937f7e2a2a82c5351051d1f3627c94a44434276ed001b83d375f708f177962125af66cda8579ec8
 DIST gajim-1.1.3.tar.bz2 8013585 BLAKE2B 7be25380ecfe76ae5e2a7534665688dcca9ff850c12c7a450e8d1f6caab1820a1022750710df0a8a7ae259c5748f55582b272ad83fbdb0560f18e6ab8642bf78 SHA512 18062832f9b9295c7a844c347d5ece4a6db43126d5b58bbf362fdf2f8e082e2241c46dae6d1cbe66ebf2ef19f65618102c3c21fa0079a96fc21511e6e93420ac
-EBUILD gajim-1.0.3-r1.ebuild 2144 BLAKE2B 96526a872dfdf0da069d31714b3f3563ea7eb4fc82143e6484aba6ed2196c2b56027d75b81cbcff24b6e99404663c4e04e0a854731092649983063f9e836bea9 SHA512 80c3e7d67336edff836df80088122a06629fa6353421098888779622d03a11dcf834fb3d0ac4f1c43aa32181615bce4da4d704e44c29c2173ac3535df62e2a7b
-EBUILD gajim-1.0.3.ebuild 2142 BLAKE2B e9adbd2e1092742878059906d547cef5ccde6fea5ec1cf84b2b55392bc29925c570c1ebfafb5db6aada517365b916e9070dc9cbd5597f5b35df733a1929f181c SHA512 56727440e708e2f72fabc0b18ac57b25f117f448bb52a4e53d3ab597a4df96ee7a19f965d28043524e809bdae40962e43c10d976bbcc8196c7811904321a325f
-EBUILD gajim-1.1.3.ebuild 2294 BLAKE2B cdb31c76747fd9362a25e51c136c5a4b8d143d083f315e42fa4d43f4f8a4c9ce839743aa28a2ac5b9adb94ef3b658983dedfed653229829c01adf5b21916ae98 SHA512 03a81f04f9313574f984b4739eb1fff41449fd957ba187702ebe22c548a01212c7a84e7e94b4d8583252688323f0f6a5b4718b453a27aa7d40feb2dfed616cf1
+EBUILD gajim-1.0.3-r2.ebuild 2292 BLAKE2B 83dcdcbb109d40b63725336cd82607b05afa912e95b4a0a785022857b655aa61da11bdc77d4370c24c69601777183b791202a8b0fd6e72ea26c470dae1f385ac SHA512 223a08ff376af581392009b3df406250421a7d8d9e68cbf1a6f7cab6cea812e8d733df17e7c827bf5a4d1fd4780db7f60a74e08f0c352cb36aefc22b8bbbe4eb
+EBUILD gajim-1.0.3-r3.ebuild 2294 BLAKE2B 529ddf84890ccce47b78052242d1e5dc16c4ce7c4981b989a2b1616d88a3f14204864a36459b0def235601d6fdac1dc631c7accaf87f3e7247b3dc4a224124bc SHA512 c1006d95779082fcd88f0466a423fc9bd67897e3f2bf08cac610848e0993cc61ff297d263a5ba866a3f82d1af35ab68f3d911260c6617318cf636206288f461a
+EBUILD gajim-1.1.3-r1.ebuild 2456 BLAKE2B 969f60dd05c79e216452a23086268d37f190aabd854d50853633848f4623e27562b080e68e46a6c0955d5859347ad9ddf37ad812e50ba1a59b10efe25c08bbec SHA512 c744cce5c772f2fd144ced05be7dffeaf33b7a3c7a4a4e719335f5efeb1ab8c38a2dddfdaeb2bbea6cb0e8fa2e37476939b8a39cd14b0f0ac5cc04155d0eea25
 MISC metadata.xml 1061 BLAKE2B d7e37cec9e291addde0d1c18b155afdadee1225270c7f34f8a916f45ad828353f677f87e6de49994ba14af8cc4773689d7f629f991326e94a43ff36fa9c9b981 SHA512 f9eb4f8a033ca5cca7a2de4a43e98346cf446a20a9257ea95b37d9a6be6051224d55b32272167946c2cbef370cd3c1ddc3b27ce6b8794823d1e9ca9b5ebcac44
diff --git a/net-im/gajim/gajim-1.0.3-r1.ebuild b/net-im/gajim/gajim-1.0.3-r1.ebuild
deleted file mode 100644
index e8d7bd3df207..000000000000
--- a/net-im/gajim/gajim-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2-utils distutils-r1 versionator xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.6[${PYTHON_USEDEP}]
-	x11-libs/libXScrnSaver
-	crypt? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-	geolocation? ( app-misc/geoclue[introspection] )
-	jingle? (
-		net-libs/farstream:0.2[introspection]
-		media-libs/gstreamer:1.0[introspection]
-		media-libs/gst-plugins-base:1.0[introspection]
-		media-libs/gst-plugins-ugly:1.0
-	)
-	keyring? (
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-	)
-	networkmanager? ( net-misc/networkmanager[introspection] )
-	remote? (
-		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-		sys-apps/dbus[X]
-	)
-	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	spell? (
-		app-text/gspell[introspection]
-		app-text/hunspell
-	)
-	upnp? ( net-libs/gupnp-igd[introspection] )
-	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.0.3-r2.ebuild b/net-im/gajim/gajim-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..5fc452242c2e
--- /dev/null
+++ b/net-im/gajim/gajim-1.0.3-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2-utils distutils-r1 versionator xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 x86"
+IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
+	+webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_MULTI_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-nbxmpp-0.6.6[${PYTHON_MULTI_USEDEP}]
+		x11-libs/libXScrnSaver
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		keyring? (
+			app-crypt/libsecret[crypt,introspection]
+			dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+		)
+		networkmanager? ( net-misc/networkmanager[introspection] )
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+RESTRICT="test"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-1.0.3-r3.ebuild b/net-im/gajim/gajim-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..619619a80874
--- /dev/null
+++ b/net-im/gajim/gajim-1.0.3-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2-utils distutils-r1 versionator xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
+	+webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_MULTI_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-nbxmpp-0.6.6[${PYTHON_MULTI_USEDEP}]
+		x11-libs/libXScrnSaver
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		keyring? (
+			app-crypt/libsecret[crypt,introspection]
+			dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+		)
+		networkmanager? ( net-misc/networkmanager[introspection] )
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+RESTRICT="test"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild
deleted file mode 100644
index 373bb4d2f1ae..000000000000
--- a/net-im/gajim/gajim-1.0.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome2-utils distutils-r1 versionator xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="amd64 x86"
-IUSE="+crypt geolocation jingle keyring networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.6[${PYTHON_USEDEP}]
-	x11-libs/libXScrnSaver
-	crypt? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-	geolocation? ( app-misc/geoclue[introspection] )
-	jingle? (
-		net-libs/farstream:0.2[introspection]
-		media-libs/gstreamer:1.0[introspection]
-		media-libs/gst-plugins-base:1.0[introspection]
-		media-libs/gst-plugins-ugly:1.0
-	)
-	keyring? (
-		app-crypt/libsecret[crypt,introspection]
-		dev-python/keyring[${PYTHON_USEDEP}]
-	)
-	networkmanager? ( net-misc/networkmanager[introspection] )
-	remote? (
-		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-		sys-apps/dbus[X]
-	)
-	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	spell? (
-		app-text/gspell[introspection]
-		app-text/hunspell
-	)
-	upnp? ( net-libs/gupnp-igd[introspection] )
-	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/gajim/gajim-1.1.3-r1.ebuild b/net-im/gajim/gajim-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..60aa6556145d
--- /dev/null
+++ b/net-im/gajim/gajim-1.1.3-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://www.gajim.org/"
+SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
+IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
+	+webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo]
+	>=x11-libs/gtk+-3.22:3[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_MULTI_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyasn1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-nbxmpp-0.6.9[${PYTHON_MULTI_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssutils-1.0.2[${PYTHON_MULTI_USEDEP}]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_MULTI_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+		)
+		networkmanager? ( net-misc/networkmanager[introspection] )
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_MULTI_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+RESTRICT="test"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/gajim/gajim-1.1.3.ebuild b/net-im/gajim/gajim-1.1.3.ebuild
deleted file mode 100644
index e8d0781880c4..000000000000
--- a/net-im/gajim/gajim-1.1.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="https://www.gajim.org/"
-SRC_URI="https://www.gajim.org/downloads/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="+crypt geolocation jingle networkmanager remote rst +spell upnp
-	+webp"
-
-COMMON_DEPEND="
-	dev-libs/gobject-introspection[cairo]
-	>=x11-libs/gtk+-3.22:3[introspection]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/precis-i18n[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pygobject[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.6.9[${PYTHON_USEDEP}]
-	x11-libs/libXScrnSaver
-	app-crypt/libsecret[crypt,introspection]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
-	crypt? (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
-	geolocation? ( app-misc/geoclue[introspection] )
-	jingle? (
-		net-libs/farstream:0.2[introspection]
-		media-libs/gstreamer:1.0[introspection]
-		media-libs/gst-plugins-base:1.0[introspection]
-		media-libs/gst-plugins-ugly:1.0
-	)
-	networkmanager? ( net-misc/networkmanager[introspection] )
-	remote? (
-		>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-		sys-apps/dbus[X]
-	)
-	rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	spell? (
-		app-text/gspell[introspection]
-		app-text/hunspell
-	)
-	upnp? ( net-libs/gupnp-igd[introspection] )
-	webp? ( dev-python/pillow[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-src_install() {
-	distutils-r1_src_install
-
-	# avoid precompressed man pages
-	rm -r "${D}/usr/share/man"
-	doman data/*.1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
index ccc96fd0f348..9d7f6c172af8 100644
--- a/net-im/jabber-base/Manifest
+++ b/net-im/jabber-base/Manifest
@@ -1,2 +1,2 @@
-EBUILD jabber-base-0.01-r1.ebuild 1506 BLAKE2B 1c94506530ae4b7d8cd4c0b3a98c74c6c44504e1f5053472f742ac3561884dd91dddd8d8ab32660dc07023737b10b5de031c0a15df906a7cb5593b214ed176d3 SHA512 2678a39e9252662c4da114f931f74a881d54df36a310cad3724b53e61938151452067b247d7ede65f42a78409657f728930910e012299e9d6efaed74d25d2404
+EBUILD jabber-base-0.01-r1.ebuild 1523 BLAKE2B a49560bc75bad0fccd968e1291d48de852af5983ec7eaeba4d5d680c7358418d9d43383f87154d4d463c30169cea9e45e77d8715cbd3fd1ff6b070ae0da01cea SHA512 9dbc8ba9b57c21e739f1509e13a510bf9dd4043b53e9b5de5c8d1965b9881cbfb82510a7d70b18ec3223690e0c0e669d9a4894183122af2107ef35188d9d695a
 MISC metadata.xml 363 BLAKE2B d39b7cb71af89d54bcd663508abec175512058c81d0ecc11cbcf76455e40dbf36c5641bf943266e8f7ce0a7f6bb5807f0fbfe78a2d04054178bf99c15dc1060a SHA512 44bd244e6521f2132804357972d71f92e704471a42828f41b334966d02509c948674aaf20f7c61ff33c2432467cd6b021c30a27bcd851fdedcc7f353903f8462
diff --git a/net-im/jabber-base/jabber-base-0.01-r1.ebuild b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
index dd01753c31d9..274369f36c74 100644
--- a/net-im/jabber-base/jabber-base-0.01-r1.ebuild
+++ b/net-im/jabber-base/jabber-base-0.01-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils user
 
 DESCRIPTION="Jabber servers and transports layout package"
 SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index 6be5584bf9cd..b36360c10dea 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -7,5 +7,5 @@ AUX pidgin-2.13.0-python3_support.patch 1156 BLAKE2B be31ac0d0ab07588d2ae635f066
 DIST pidgin-2.10.9-irc_join_sleep.patch 534 BLAKE2B 0215cebb93993e19e700e4d4974351ab5e9a00ea094775076d8f439569b34c0ec2faaed360965867df58bc42677516983ce11a2601dd322c1bdf2f288253a5b8 SHA512 8de0d6f05e48cd5a3e894576e06c7fb82e4bfc778cce8bb179fa22e2a05f5c2390a0e4c5b626ee4b910a18eab170d8f4be200f435ce408a86575af99e51e3bdf
 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.13.0-r4.ebuild 7762 BLAKE2B e60e504340b162e250d7c819aca63fee1838683eedc7a1ece7d35c3cda9f5e76ceedaa0f7c564007152a9b759c7dd81034a8b996f3653cbf208f1de339378fca SHA512 7aab6dc7051728e12674cfa525a3aa2571a96a8ad609cc857c755bb3f41bb23d66efb02ff19941bde139628cf70ee2b506900d8e9b64e83165fd0dc7fa9c782c
+EBUILD pidgin-2.13.0-r5.ebuild 7801 BLAKE2B b4734f51179dcfb60b5faf5d1305317f43efcbd4e7ef699ca41a6cd6f627cda9ae3e80f397194e3b76488c967723b1666dac0da699ee82edb0423bb043109115 SHA512 b4119884ad72dd99af7eab62a15f576630662888f98327ae67c8e0e99ee9a1125d3e63bc7a263d1070712a6a1edc6545ea2d309ad180d0d4a570141d8f738ca8
 MISC metadata.xml 1418 BLAKE2B b484d6c252dfa5f4c2bd4ef21b718cb449e3248506dab7f1f0e017e648323653e61a0f37bf2bb562f6a9b97b3fb0fcbaff897e3f030ad36e2e0813e27dfcbadc SHA512 13ff337bab4cf2924f9b652ad73d11a6d6ce268cc4aea4f9f2435acfefc85597b290de5785601ed8ad0e220047f3eff47c85150b7d81bf6e7e7b8ca9173161f7
diff --git a/net-im/pidgin/pidgin-2.13.0-r4.ebuild b/net-im/pidgin/pidgin-2.13.0-r4.ebuild
deleted file mode 100644
index ce37abd415e1..000000000000
--- a/net-im/pidgin/pidgin-2.13.0-r4.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1 xdg-utils
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://pidgin.im/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
-	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
-
-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"
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
-meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
-tk +xscreensaver zephyr zeroconf" # mono
-
-# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
-# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
-# no way to build dbus and avoid libgnt linkage with python. If you want this
-# send patch upstream.
-# purple-url-handler and purple-remote require dbus-python thus in reality we
-# rdepend on python if dbus enabled. But it is possible to separate this dep.
-RDEPEND="
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2.6.18
-	ncurses? (
-		sys-libs/ncurses:0=[unicode]
-		dbus? ( ${PYTHON_DEPS} )
-		python? ( ${PYTHON_DEPS} )
-	)
-	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[${PYTHON_USEDEP}]
-	)
-	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 )
-	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"
-	# Mono support crashes pidgin
-	#mono? ( dev-lang/mono )"
-
-# We want nls in case gtk is enabled, bug #
-NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
-
-DEPEND="$RDEPEND
-	dev-lang/perl
-	dev-perl/XML-Parser
-	virtual/pkgconfig
-	gtk? (
-		x11-base/xorg-proto
-		${NLS_DEPEND}
-	)
-	dbus? ( ${PYTHON_DEPS} )
-	doc? ( app-doc/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
-
-DOCS=( AUTHORS HACKING NEWS README ChangeLog )
-
-REQUIRED_USE="
-	dbus? ( ${PYTHON_REQUIRED_USE} )
-	networkmanager? ( dbus )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,simple"
-
-# List of plugins
-#   app-accessibility/pidgin-festival
-#   net-im/librvp
-#   x11-plugins/guifications
-#	x11-plugins/msn-pecan
-#   x11-plugins/pidgin-encryption
-#   x11-plugins/pidgin-extprefs
-#   x11-plugins/pidgin-hotkeys
-#   x11-plugins/pidgin-latex
-#   x11-plugins/pidgintex
-#   x11-plugins/pidgin-libnotify
-#	x11-plugins/pidgin-mbpurple
-#	x11-plugins/pidgin-bot-sentry
-#   x11-plugins/pidgin-otr
-#   x11-plugins/pidgin-rhythmbox
-#   x11-plugins/purple-plugin_pack
-#   x11-themes/pidgin-smileys
-#	x11-plugins/pidgin-knotify
-# Plugins in Sunrise:
-#	x11-plugins/pidgin-audacious-remote
-#	x11-plugins/pidgin-autoanswer
-#	x11-plugins/pidgin-birthday-reminder
-#	x11-plugins/pidgin-blinklight
-#	x11-plugins/pidgin-convreverse
-#	x11-plugins/pidgin-embeddedvideo
-#	x11-plugins/pidgin-extended-blist-sort
-#	x11-plugins/pidgin-gfire
-#	x11-plugins/pidgin-lastfm
-#	x11-plugins/pidgin-sendscreenshot
-#	x11-plugins/pidgimpd
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10.0-gold.patch"
-	"${WORKDIR}/${PN}-eds-3.6.patch"
-	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
-	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
-	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
-	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
-	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
-	"${FILESDIR}/${PN}-2.13.0-python3_support.patch" #459996
-)
-
-pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
-		elog "will be built."
-	fi
-
-	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
-	fi
-	if use dbus && ! use python ; then
-		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
-	fi
-}
-
-pkg_setup() {
-	if use python || use dbus ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-	use pie && append-cflags -fPIE -pie
-
-	use gadu 	&& DYNAMIC_PRPLS+=",gg"
-	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
-	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
-	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
-	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
-
-	local myconf=(
-		--disable-mono
-		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
-		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
-		--x-includes="${EPREFIX}"/usr/include/X11
-		$(use_enable ncurses consoleui)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable xscreensaver screensaver)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable spell gtkspell)
-		$(use_enable perl)
-		$(use_enable tk)
-		$(use_enable tcl)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable meanwhile)
-		$(use_enable gstreamer)
-		$(use_with gstreamer gstreamer 1.0)
-		$(use_enable gstreamer farstream)
-		$(use_enable gstreamer vv)
-		$(use_enable sasl cyrus-sasl )
-		$(use_enable doc doxygen)
-		$(use_enable networkmanager nm)
-		$(use_enable zeroconf avahi)
-		$(use_enable idn)
-	)
-
-	if use gnutls; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf+=( --enable-nss=no --enable-gnutls=yes )
-		myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" )
-		myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" )
-	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf+=( --enable-gnutls=no --enable-nss=yes )
-	fi
-
-	if use dbus || { use ncurses && use python ; } ; then
-		myconf+=( --with-python=${PYTHON} )
-	else
-		myconf+=( --without-python )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use gtk ; then
-		# Fix tray paths for e16 (x11-wm/enlightenment) and other
-		# implementations that are not complient with new hicolor theme yet, #323355
-		local pixmapdir
-		for d in 16 22 32 48; do
-			pixmapdir=${ED%/}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
-			mkdir "${pixmapdir}" || die
-			pushd "${pixmapdir}" >/dev/null || die
-			for f in ../status/*; do
-				ln -s ${f} || die
-			done
-			popd >/dev/null || die
-		done
-	fi
-	use perl && perl_delete_localpod
-
-	if use python && use dbus ; then
-		python_fix_shebang "${ED}"
-		python_optimize
-	fi
-
-	dodoc ${DOCS} finch/plugins/pietray.py
-	docompress -x /usr/share/doc/${PF}/pietray.py
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-src_test() {
-	# make default build logs slightly more useful
-	emake check VERBOSE=1
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-im/pidgin/pidgin-2.13.0-r5.ebuild b/net-im/pidgin/pidgin-2.13.0-r5.ebuild
new file mode 100644
index 000000000000..b6fa6ecd0772
--- /dev/null
+++ b/net-im/pidgin/pidgin-2.13.0-r5.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools flag-o-matic gnome2 toolchain-funcs multilib perl-module python-single-r1 xdg-utils
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://pidgin.im/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}-eds-3.6.patch.bz2
+	https://gist.githubusercontent.com/imcleod/77f38d11af11b2413ada/raw/46e9d6cb4d2f839832dad2d697bb141a88028e04/pidgin-irc-join-sleep.patch -> ${PN}-2.10.9-irc_join_sleep.patch"
+
+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"
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk idn
+meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
+tk +xscreensaver zephyr zeroconf" # mono
+
+# dbus requires python to generate C code for dbus bindings (thus DEPEND only).
+# finch uses libgnt that links with libpython - {R,}DEPEND. But still there is
+# no way to build dbus and avoid libgnt linkage with python. If you want this
+# send patch upstream.
+# purple-url-handler and purple-remote require dbus-python thus in reality we
+# rdepend on python if dbus enabled. But it is possible to separate this dep.
+RDEPEND="
+	>=dev-libs/glib-2.16
+	>=dev-libs/libxml2-2.6.18
+	ncurses? (
+		sys-libs/ncurses:0=[unicode]
+		dbus? ( ${PYTHON_DEPS} )
+		python? ( ${PYTHON_DEPS} )
+	)
+	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
+		$(python_gen_cond_dep '
+			dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	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 )
+	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"
+	# Mono support crashes pidgin
+	#mono? ( dev-lang/mono )"
+
+# We want nls in case gtk is enabled, bug #
+NLS_DEPEND=">=dev-util/intltool-0.41.1 sys-devel/gettext"
+
+DEPEND="$RDEPEND
+	dev-lang/perl
+	dev-perl/XML-Parser
+	virtual/pkgconfig
+	gtk? (
+		x11-base/xorg-proto
+		${NLS_DEPEND}
+	)
+	dbus? ( ${PYTHON_DEPS} )
+	doc? ( app-doc/doxygen )
+	!gtk? ( nls? ( ${NLS_DEPEND} ) )"
+
+DOCS=( AUTHORS HACKING NEWS README ChangeLog )
+
+REQUIRED_USE="
+	dbus? ( ${PYTHON_REQUIRED_USE} )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Enable Default protocols
+DYNAMIC_PRPLS="irc,jabber,oscar,simple"
+
+# List of plugins
+#   app-accessibility/pidgin-festival
+#   net-im/librvp
+#   x11-plugins/guifications
+#	x11-plugins/msn-pecan
+#   x11-plugins/pidgin-encryption
+#   x11-plugins/pidgin-extprefs
+#   x11-plugins/pidgin-hotkeys
+#   x11-plugins/pidgin-latex
+#   x11-plugins/pidgintex
+#   x11-plugins/pidgin-libnotify
+#	x11-plugins/pidgin-mbpurple
+#	x11-plugins/pidgin-bot-sentry
+#   x11-plugins/pidgin-otr
+#   x11-plugins/pidgin-rhythmbox
+#   x11-plugins/purple-plugin_pack
+#   x11-themes/pidgin-smileys
+#	x11-plugins/pidgin-knotify
+# Plugins in Sunrise:
+#	x11-plugins/pidgin-audacious-remote
+#	x11-plugins/pidgin-autoanswer
+#	x11-plugins/pidgin-birthday-reminder
+#	x11-plugins/pidgin-blinklight
+#	x11-plugins/pidgin-convreverse
+#	x11-plugins/pidgin-embeddedvideo
+#	x11-plugins/pidgin-extended-blist-sort
+#	x11-plugins/pidgin-gfire
+#	x11-plugins/pidgin-lastfm
+#	x11-plugins/pidgin-sendscreenshot
+#	x11-plugins/pidgimpd
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10.0-gold.patch"
+	"${WORKDIR}/${PN}-eds-3.6.patch"
+	"${FILESDIR}/${PN}-2.10.9-fix-gtkmedia.patch"
+	"${FILESDIR}/${PN}-2.10.10-eds-3.6-configure.ac.patch"
+	"${FILESDIR}/${PN}-2.10.11-tinfo.patch"
+	"${DISTDIR}/${PN}-2.10.9-irc_join_sleep.patch" # 577286
+	"${FILESDIR}/${PN}-2.13.0-disable-one-jid-test.patch" # 593338
+	"${FILESDIR}/${PN}-2.13.0-python3_support.patch" #459996
+)
+
+pkg_pretend() {
+	if ! use gtk && ! use ncurses ; then
+		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+		elog "will be built."
+	fi
+
+	# dbus is enabled, no way to disable linkage with python => python is enabled
+	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
+	if use gtk && ! use nls ; then
+		ewarn "gtk build => nls is enabled!"
+	fi
+	if use dbus && ! use python ; then
+		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
+	fi
+}
+
+pkg_setup() {
+	if use python || use dbus ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+	use pie && append-cflags -fPIE -pie
+
+	use gadu 	&& DYNAMIC_PRPLS+=",gg"
+	use groupwise 	&& DYNAMIC_PRPLS+=",novell"
+	use meanwhile 	&& DYNAMIC_PRPLS+=",sametime"
+	use zephyr 	&& DYNAMIC_PRPLS+=",zephyr"
+	use zeroconf 	&& DYNAMIC_PRPLS+=",bonjour"
+
+	local myconf=(
+		--disable-mono
+		--with-dynamic-prpls="${DYNAMIC_PRPLS}"
+		--with-system-ssl-certs="${EPREFIX}/etc/ssl/certs/"
+		--x-includes="${EPREFIX}"/usr/include/X11
+		$(use_enable ncurses consoleui)
+		$(use_enable gtk gtkui)
+		$(use_enable gtk sm)
+		$(usex gtk '--enable-nls' "$(use_enable nls)")
+		$(use gtk && use_enable xscreensaver screensaver)
+		$(use gtk && use_enable prediction cap)
+		$(use gtk && use_enable eds gevolution)
+		$(use gtk && use_enable spell gtkspell)
+		$(use_enable perl)
+		$(use_enable tk)
+		$(use_enable tcl)
+		$(use_enable debug)
+		$(use_enable dbus)
+		$(use_enable meanwhile)
+		$(use_enable gstreamer)
+		$(use_with gstreamer gstreamer 1.0)
+		$(use_enable gstreamer farstream)
+		$(use_enable gstreamer vv)
+		$(use_enable sasl cyrus-sasl )
+		$(use_enable doc doxygen)
+		$(use_enable networkmanager nm)
+		$(use_enable zeroconf avahi)
+		$(use_enable idn)
+	)
+
+	if use gnutls; then
+		einfo "Disabling NSS, using GnuTLS"
+		myconf+=( --enable-nss=no --enable-gnutls=yes )
+		myconf+=( --with-gnutls-includes="${EPREFIX}/usr/include/gnutls" )
+		myconf+=( --with-gnutls-libs="${EPREFIX}/usr/$(get_libdir)" )
+	else
+		einfo "Disabling GnuTLS, using NSS"
+		myconf+=( --enable-gnutls=no --enable-nss=yes )
+	fi
+
+	if use dbus || { use ncurses && use python ; } ; then
+		myconf+=( --with-python=${PYTHON} )
+	else
+		myconf+=( --without-python )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use gtk ; then
+		# Fix tray paths for e16 (x11-wm/enlightenment) and other
+		# implementations that are not complient with new hicolor theme yet, #323355
+		local pixmapdir
+		for d in 16 22 32 48; do
+			pixmapdir=${ED%/}/usr/share/pixmaps/pidgin/tray/hicolor/${d}x${d}/actions
+			mkdir "${pixmapdir}" || die
+			pushd "${pixmapdir}" >/dev/null || die
+			for f in ../status/*; do
+				ln -s ${f} || die
+			done
+			popd >/dev/null || die
+		done
+	fi
+	use perl && perl_delete_localpod
+
+	if use python && use dbus ; then
+		python_fix_shebang "${ED}"
+		python_optimize
+	fi
+
+	dodoc ${DOCS} finch/plugins/pietray.py
+	docompress -x /usr/share/doc/${PF}/pietray.py
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+src_test() {
+	# make default build logs slightly more useful
+	emake check VERBOSE=1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
index 90402cadc096..4610d322e2b4 100644
--- a/net-im/pyicq-t/Manifest
+++ b/net-im/pyicq-t/Manifest
@@ -3,5 +3,5 @@ AUX pyicq-t-0.8.1.5-pillow-imaging.patch 1236 BLAKE2B f394b84f530fc01ddc87ec3e9f
 AUX pyicq-t-0.8.1.5-python26-warnings.diff 3485 BLAKE2B edf98d20ea41bed32b3c4952c24f133a6d02a073402d0032140195fc9772eb85421ed202a72813922f61001d4c56e34fee38cc49701e646e1992961cb8e0f3ed SHA512 8b7cb353ff2c6259525909b62a6d552116339fe8489d747f7310fa9013011b6028c0f0dc165307ff5b9fe9da9517852c3e4158eb6f05a51f987e9cf2a969b949
 AUX pyicq-t.service 223 BLAKE2B 3f323776d36115207e5bd81f16c7c47b438bab74772cbcc3cabb5acb7ab992b0cb8edc6b76def436a9d65685d232754d988cb2c7dcecdc8bc5a2152cfdd0ceb7 SHA512 e1df68340f54bc6568308fefcc723323358c27b143cd3258f451ebf06e5f6ac0a7b66d7567543212e5924144164e0d9a2121fb96fa2721b234399a19127850c6
 DIST pyicqt-0.8.1.5.tar.gz 183865 BLAKE2B 5f0cce6fd9d27cf60f6234870644c95e016bc979a167d48a331df47cb25eefca96ed0082d336c931a6af5f25babaa7fdffc0cafdb0374463c066d5c185b02059 SHA512 5b83adf86746c2af60bed2759c7d4e3a3839bea532e0882a6dc087aee5e0afa1320c6d2d2296a667ec45c5b36be879034f079fd30cef924e8db5f66a2f1d3fde
-EBUILD pyicq-t-0.8.1.5-r6.ebuild 1749 BLAKE2B 6b1fa86374cf440a0364a4330f10f995cbd290b9c223d5caf045d12931c21486da88d4833a7c65c316d31375bfb509b71fa971f01e8ed066303a0c338a934748 SHA512 1c28862d2d7ddc0a79b9379ea235621d49d304dc3a2feee7995980d01b683dbfb0eff19295b5142c5fb0e4aec584629b05baa5889afe866fdfe7a3f32d9ec229
+EBUILD pyicq-t-0.8.1.5-r7.ebuild 1821 BLAKE2B 994bc77aa62b5fd280b8218433b4350bc21447cf811953d985a63a5b606776130e62a463fcaabed1c92be4fb15335ff872f8dff8c3a3a7583a2796465eb0b89f SHA512 0bd681973b32c55b99bf1c6babedfd35eee11b72f4134cc6846da3ff54da76717ac805a3bd411cb963f614d73f821321121f861eca0b38500eb1eded2a49d84b
 MISC metadata.xml 419 BLAKE2B 89f7918635ee4ead843dee7a7b031eefc427b5df2c5edb25a3b891e21046ac346386a1270d69820594cd23957bab8690d0c55246696ffb204d8fe636ae097dfb SHA512 1f30a23054f9f867a94d7e899f5be0780b08cf070c9a2831a34f4fbafe03e19dc9fedb023d3825411104a7322e0d0c8b6928a4f30794511371dd9ec7ea2e339f
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild
deleted file mode 100644
index ec0c387fbfa9..000000000000
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5-r6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 systemd
-
-MY_P="${P/pyicq-t/pyicqt}"
-
-DESCRIPTION="Python based jabber transport for ICQ"
-HOMEPAGE="https://code.google.com/p/pyicqt/"
-SRC_URI="https://pyicqt.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="webinterface"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	net-im/jabber-base"
-RDEPEND="${DEPEND}
-	|| (
-		(
-			dev-python/twisted-core[${PYTHON_USEDEP}]
-			dev-python/twisted-words[${PYTHON_USEDEP}]
-			dev-python/twisted-web[${PYTHON_USEDEP}]
-		)
-		dev-python/twisted[${PYTHON_USEDEP}]
-	)
-	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-	"${FILESDIR}/${P}-python26-warnings.diff"
-	"${FILESDIR}/${P}-pillow-imaging.patch"
-)
-
-src_install() {
-	python_moduleinto ${PN}
-	cp PyICQt.py ${PN}.py || die
-	python_domodule ${PN}.py data tools src
-
-	insinto /etc/jabber
-	newins config_example.xml ${PN}.xml
-	fperms 600 /etc/jabber/${PN}.xml
-	fowners jabber:jabber /etc/jabber/${PN}.xml
-	chmod 755 "${D}$(python_get_sitedir)/${PN}/${PN}.py" || die
-	sed -i \
-		-e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
-		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-		"${ED}/etc/jabber/${PN}.xml" || die
-
-	newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" \
-		"${ED}/etc/init.d/${PN}" "${D%/}/$(systemd_get_systemunitdir)/${PN}.service" || die
-
-	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
-}
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
new file mode 100644
index 000000000000..12ace01e92dd
--- /dev/null
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5-r7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 systemd
+
+MY_P="${P/pyicq-t/pyicqt}"
+
+DESCRIPTION="Python based jabber transport for ICQ"
+HOMEPAGE="https://code.google.com/p/pyicqt/"
+SRC_URI="https://pyicqt.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="webinterface"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	net-im/jabber-base"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		|| (
+			(
+				dev-python/twisted-core[${PYTHON_MULTI_USEDEP}]
+				dev-python/twisted-words[${PYTHON_MULTI_USEDEP}]
+				dev-python/twisted-web[${PYTHON_MULTI_USEDEP}]
+			)
+			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+		)
+		webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_MULTI_USEDEP}] )
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+	')"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}/${P}-python26-warnings.diff"
+	"${FILESDIR}/${P}-pillow-imaging.patch"
+)
+
+src_install() {
+	python_moduleinto ${PN}
+	cp PyICQt.py ${PN}.py || die
+	python_domodule ${PN}.py data tools src
+
+	insinto /etc/jabber
+	newins config_example.xml ${PN}.xml
+	fperms 600 /etc/jabber/${PN}.xml
+	fowners jabber:jabber /etc/jabber/${PN}.xml
+	chmod 755 "${D}$(python_get_sitedir)/${PN}/${PN}.py" || die
+	sed -i \
+		-e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
+		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+		"${ED}/etc/jabber/${PN}.xml" || die
+
+	newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" \
+		"${ED}/etc/init.d/${PN}" "${D%/}/$(systemd_get_systemunitdir)/${PN}.service" || die
+
+	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
+}
diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index 262fa6a81a2a..67bd5bb27a1c 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -1,10 +1,5 @@
-DIST slack-desktop-2.1.2-amd64.deb 46460486 BLAKE2B c6478764d3bd49745f9626d85287489fd58345b1315e41fdb1bfa9b93e4201aeeb2a22678e79f584c3da26d090136c1b8b18e449b518a69a0291072b5fc05089 SHA512 b23ccee498c2c6d043bdb4632b1b2755b3f0a96a1d78338020fb4221c49b7feeb437cc358abcf285e0f0a0f7b57f4db6792b2baa8b339596a287f1272ed12284
-DIST slack-desktop-2.1.2-i386.deb 42997902 BLAKE2B e5b3375efbe00d31e34c900aedde4c6c19b0e6a550d9db6155d9f8333c9d6db241da60e9b711eee7dbf6cf89d5ac4b84050c9e89c490172b7db205f38981dca3 SHA512 6b68123d3c85687043e886974449fe424af267c326ffc869d03d911ae5d0f30f5081b611e136bc4f832da8d555b2851a4c093df9c8be2de98235ebcd03528d8c
-DIST slack-desktop-3.1.1-amd64.deb 60320286 BLAKE2B 3054e8283b41d5b8b45323131b2a85800ba8b8e24e0b80aa0eff0c0152c7cad0a2914bf64a6b83621cf6c9ad52b9bf26c0d113cf5867d4c3f2e7d6129d4d27ae SHA512 06f209b07d1bbbadede592f4e63da7c53436ecc821585448269d4eda16ad0bdf8355ac46e508741150fae6dc883c90563509361f47dd02fda2f15b2829dda309
 DIST slack-desktop-4.1.1-amd64.deb 57986912 BLAKE2B eb90dff156eb826f8f15c3ab7c7c7127a321cd73011a11c6e24bc75721f4fa981980ad5b65e4accdce2fb893ac5ad8ddba42133de8285d8a9e10ac08bdb3ed70 SHA512 57b3e7a5a81406047bb9f8f8bb8ac322d3c801fe21919a388ac1457ccc68e50dab961c86a0e36ba9bb308e1832dc2ad00a038cddbad8ea9cc70ac186b37fec7c
 DIST slack-desktop-4.3.2-amd64.deb 54914760 BLAKE2B 218d4ba6cc2057bb92b84bd8bbbf94e70022a9e65363c256190584f0a92e1615642583647af2813e02ec2eb243a3428016b1bff3bfbbc6a98f227aa63a94a967 SHA512 36536be0825e1803704304346ea9db2d1d03baddec954dea0c4560bec2b1800cf3e6d431796d1fcd3b9178e3eb070e9ae6da64e4d3949eff649050cab21d5cb2
-EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
-EBUILD slack-bin-3.1.1.ebuild 2731 BLAKE2B 6a74a81ee7c1c9734e1f0176f530b4068e1b3f8b506ce7b2ebecb76a3eacfffc11b6a5e1fa7c7ad03db15763b19010297508600a1269b368a871468b65e64b3c SHA512 5b67498636859305edeb88d9317c8836a04d00208861c041387e14222a303b095c85d2236dda7312fcdfb3e2ef01e8e037050a909d96ec71be1aaaa809a40ac0
-EBUILD slack-bin-4.1.1.ebuild 2928 BLAKE2B ba8c02c1e35ce1b759fbe47787c5ed60d26a12d24a9b2394e497e38804e3003dc03cb29520e42660d3752a1d2c46b4a072c8b07d63bf98d23739a720bb29d800 SHA512 47a641db9d39835b62d927fe8abaca3641435548b0556b1798a307f4906cf8ed02371113db2ab6338929714838d7d624058eaf0a2a2be9ffc3d02885d1fcbdbc
-EBUILD slack-bin-4.3.2.ebuild 2970 BLAKE2B 4c91170baf75aade85a99b8a874dd591c258c6e257662d40c5901ba6fe7a5b642a08511489048804f8bba387e902999e4a513db2f0de469f9bf2f7b28057fae8 SHA512 55923540730fd8a31448eec583293c2eb2cac1d5047d4a481f8c23a305db5cd017ed1ae26d5b87e19852b294979daffc46fc12663cf4347a55cf5a16a94bb9d3
-MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
+EBUILD slack-bin-4.1.1.ebuild 2926 BLAKE2B 8b95487523e3f3319326e65bffc528327bb9d9b795556b13352e5288592afe3ba258b47c36e2c6fb9baf7d9145f29bdd4dbf94ffe7b68694afee1a06b6d59260 SHA512 99752a6649649e834764b43f991a2a888cbdabd361beeeac09ddf858292ba946f9897b9a4b609990c0444a11e78ff1c5757df8d082f1ca598bbfc2af7fca5c08
+EBUILD slack-bin-4.3.2-r1.ebuild 3026 BLAKE2B 226854b9d37a1cce89e4dd7039816ee9c2a5f8f83914bd2698b9ab21eb806c31ebac359a0cad0eb82af730fd172993fc012aefab165631226f3432be221c9a3a SHA512 c7ced833f00d6f6a6a6a16b2e4e579b637043f14c030d9551ce16b5120ff6c0e8cbdc91461e5f5a3779a2ce16a1b2687cf9befe48615033e5e29a18cdeeaeb9c
+MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
diff --git a/net-im/slack-bin/metadata.xml b/net-im/slack-bin/metadata.xml
index 200d6a674a29..15eca405ed06 100644
--- a/net-im/slack-bin/metadata.xml
+++ b/net-im/slack-bin/metadata.xml
@@ -15,9 +15,6 @@
 	All content inside Slack is searchable, including files, conversations,
 	and people.
 	</longdescription>
-	<use>
-		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
-	</use>
 	<upstream>
 		<doc>https://get.slack.help/hc/en-us</doc>
 	</upstream>
diff --git a/net-im/slack-bin/slack-bin-2.1.2.ebuild b/net-im/slack-bin/slack-bin-2.1.2.ebuild
deleted file mode 100644
index 6a7b8f24e9b0..000000000000
--- a/net-im/slack-bin/slack-bin-2.1.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-BASE_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-_arch_.deb"
-
-inherit eutils gnome2-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="x86? ( ${BASE_URI/_arch_/i386} )
-	amd64? ( ${BASE_URI/_arch_/amd64} )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist mirror"
-
-RDEPEND="dev-libs/atk:0
-	dev-libs/expat:0
-	dev-libs/glib:2
-	dev-libs/nspr:0
-	dev-libs/nss:0
-	gnome-base/gconf:2
-	gnome-base/libgnome-keyring:0
-	media-libs/alsa-lib:0
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	net-misc/curl:0
-	net-print/cups:0
-	sys-apps/dbus:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11:0
-	x11-libs/libXcomposite:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXi:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXtst:0
-	x11-libs/pango:0"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/pixmaps
-	doins usr/share/pixmaps/${MY_PN}.png
-
-	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
-	domenu usr/share/applications/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/lib/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_PN}
-	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-3.1.1.ebuild b/net-im/slack-bin/slack-bin-3.1.1.ebuild
deleted file mode 100644
index 60d3a3890b84..000000000000
--- a/net-im/slack-bin/slack-bin-3.1.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop gnome2-utils multilib-build pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="http://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="ayatana gnome-keyring pax_kernel"
-RESTRICT="bindist mirror"
-
-RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	gnome-base/gconf:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
-	media-libs/freetype:2[${MULTILIB_USEDEP}]
-	net-misc/curl:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:2[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libnode.so
-	opt/slack/libffmpeg.so
-	opt/slack/libCallsCore.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	if use ayatana ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt/slack
-	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/slack
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	use pax_kernel && pax-mark -m "${ED%/}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/net-im/slack-bin/slack-bin-4.1.1.ebuild b/net-im/slack-bin/slack-bin-4.1.1.ebuild
index 158315e03e35..9441fc95cad4 100644
--- a/net-im/slack-bin/slack-bin-4.1.1.ebuild
+++ b/net-im/slack-bin/slack-bin-4.1.1.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	fperms +x /opt/slack/slack
 	dosym ../../opt/slack/slack usr/bin/slack
 
-	pax-mark -m "${ED%/}"/opt/slack/slack
+	pax-mark -m "${ED}"/opt/slack/slack
 }
 
 pkg_postinst() {
diff --git a/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild b/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
new file mode 100644
index 000000000000..701ae359224b
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-4.3.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-bin/}"
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop eutils multilib-build pax-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="https://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="ayatana"
+RESTRICT="bindist mirror"
+
+RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
+	app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+	dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	media-libs/mesa:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	sys-apps/util-linux:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+	x11-libs/libXi:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
+	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
+
+QA_PREBUILT="/opt/slack/chrome-sandbox
+	opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libffmpeg.so
+	opt/slack/libEGL.so
+	opt/slack/libGLESv2.so
+	opt/slack/swiftshader/libEGL.so
+	opt/slack/swiftshader/libGLESv2.so
+	opt/slack/swiftshader/libvk_swiftshader.so"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# remove hardcoded path (wrt 694058)
+	sed -i '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
+		usr/share/applications/slack.desktop \
+		|| die "sed failed in Icon for slack.desktop"
+
+	if use ayatana ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for slack.desktop"
+	fi
+}
+
+src_install() {
+	doicon usr/share/pixmaps/slack.png
+	doicon -s 512 usr/share/pixmaps/slack.png
+	domenu usr/share/applications/slack.desktop
+
+	insinto /opt/slack
+	doins -r usr/lib/slack/.
+	fperms +x /opt/slack/slack
+	dosym ../../opt/slack/slack usr/bin/slack
+
+	pax-mark -m "${ED}"/opt/slack/slack
+}
+
+pkg_postinst() {
+	optfeature "storing passwords via gnome-keyring" app-crypt/libsecret
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/slack-bin/slack-bin-4.3.2.ebuild b/net-im/slack-bin/slack-bin-4.3.2.ebuild
deleted file mode 100644
index 8211ca719da0..000000000000
--- a/net-im/slack-bin/slack-bin-4.3.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit desktop multilib-build pax-utils unpacker xdg-utils
-
-DESCRIPTION="Team collaboration tool"
-HOMEPAGE="https://www.slack.com/"
-SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="ayatana gnome-keyring"
-RESTRICT="bindist mirror"
-
-RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
-	dev-libs/atk:0[${MULTILIB_USEDEP}]
-	dev-libs/expat:0[${MULTILIB_USEDEP}]
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	dev-libs/nspr:0[${MULTILIB_USEDEP}]
-	dev-libs/nss:0[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
-	media-libs/mesa:0[${MULTILIB_USEDEP}]
-	net-print/cups:0[${MULTILIB_USEDEP}]
-	sys-apps/dbus:0[${MULTILIB_USEDEP}]
-	sys-apps/util-linux:0[${MULTILIB_USEDEP}]
-	x11-libs/cairo:0[${MULTILIB_USEDEP}]
-	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
-	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	x11-libs/libX11:0[${MULTILIB_USEDEP}]
-	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
-	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
-	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
-	x11-libs/libXext:0[${MULTILIB_USEDEP}]
-	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
-	x11-libs/libXi:0[${MULTILIB_USEDEP}]
-	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
-	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
-	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
-	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]
-	ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )
-	gnome-keyring? ( app-crypt/libsecret:0[${MULTILIB_USEDEP}] )"
-
-QA_PREBUILT="/opt/slack/chrome-sandbox
-	opt/slack/slack
-	opt/slack/resources/app.asar.unpacked/node_modules/*
-	opt/slack/libffmpeg.so
-	opt/slack/libEGL.so
-	opt/slack/libGLESv2.so
-	opt/slack/swiftshader/libEGL.so
-	opt/slack/swiftshader/libGLESv2.so
-	opt/slack/swiftshader/libvk_swiftshader.so"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# remove hardcoded path (wrt 694058)
-	sed -i '/Icon/s|/usr/share/pixmaps/slack.png|slack|' \
-		usr/share/applications/slack.desktop \
-		|| die "sed failed in Icon for slack.desktop"
-
-	if use ayatana ; then
-		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
-			usr/share/applications/slack.desktop \
-			|| die "sed failed for slack.desktop"
-	fi
-}
-
-src_install() {
-	doicon usr/share/pixmaps/slack.png
-	doicon -s 512 usr/share/pixmaps/slack.png
-	domenu usr/share/applications/slack.desktop
-
-	insinto /opt/slack
-	doins -r usr/lib/slack/.
-	fperms +x /opt/slack/slack
-	dosym ../../opt/slack/slack usr/bin/slack
-
-	pax-mark -m "${ED}"/opt/slack/slack
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 1f6747742328..8a1a39c84559 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -2,5 +2,5 @@ AUX swift-4.0.2-boost-1.69-compatibility.patch 2986 BLAKE2B e81cdaadaa7fe4972df1
 AUX swift-4.0.2-make-generated-files-handle-unicode-characters.patch 1517 BLAKE2B 78abb2fb27a796d2b0ba1c4d9ee2a5662a3a166b404f16ca67cb0b884db65d36a95b95a82827a7d2cfcf1b65204ebe23b11791b94fa4a88b85a72c1f1b12cf10 SHA512 57cb292b32365d7041a3d9b17488288e07eba5402bdc0db5ec3ff447a5ad7b3dfe7d13275d8783ddf6d338831a9bee93d481b74342d8d57a62486b3b7ca7689e
 AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8e71911ee87dc754f8d7dfe15f7fa3ff9d788f3d698a63cd90f6ff9b2cc4b013a14c92bd704ef0248ea71204645ea4ff90d828881 SHA512 a91d516f682b47573de8949ff5e364505b39d67e6a93441f66000519f8c6d910f7efb67ee510f709d03592446a4fbee0b1f17b0e1b7548ecaa2e3781e8406880
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r1.ebuild 4378 BLAKE2B 9c0b99f20778d91e9ff2acab0c2abf23aa7118b5ed3850ee3d6d54285de0dd482219ca082bac69475f3a36caf900ded6234a80e27e5bc1edf5fab90a18162f9c SHA512 973ea48101c7298d9d4ac6bce5950ad7400b2249842d7eda0bba519ecc18d1d58fdf6a11443c278dc1d4ec02b9befb90b7d91b020eceda369232953ea53ef343
+EBUILD swift-4.0.2-r1.ebuild 4372 BLAKE2B 01d07faee10b57d6c0d728f4ad2f44a6862997def4640ca4ee0ce845e97a15380a584b64c0495615324c61b09f50afdfa5fd03ed1ec1c08670d2edd36a218c46 SHA512 4aaf1fd54d20ecb6e6e402018fb47f2883d2a3ebd51e7958f313912d1f1090d8d16e777b601752cfb0e73545258ddab424fb510412fb9838a816085a60b48769
 MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
diff --git a/net-im/swift/swift-4.0.2-r1.ebuild b/net-im/swift/swift-4.0.2-r1.ebuild
index eac7d6fa9d5d..78727eb9aba8 100644
--- a/net-im/swift/swift-4.0.2-r1.ebuild
+++ b/net-im/swift/swift-4.0.2-r1.ebuild
@@ -74,9 +74,9 @@ src_prepare() {
 
 	# Hack for finding Qt system libs
 	mkdir "${T}"/qt || die
-	ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
-	ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
-	ln -s "${EPREFIX%/}"/usr/include/qt5 "${T}"/qt/include || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
+	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
+	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
 
 	# Remove parts of Swift, which a user don't want to compile
 	if ! use client; then rm -fr Swift Slimber || die; fi
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 7ba4aac712c8..2fc5bf3aa6eb 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,8 +1,11 @@
 AUX 0002-PPC-big-endian.patch 791 BLAKE2B f24d1f799eb23f4aa0ed3324996027014c790ef3ed249ef1b48748529b7e7af622d7db34fbe0cae06539913b5e20512f490e7a609b952273aa990baef20de374 SHA512 26aab35d254bdeb89aff05fa5ec84c405e2c939f300f923c0e7adb452e50442d140104fe74f6bd39ab533493314118de3bfed7f3a931c2c5442da6fccdb6e390
 AUX 0003-PPC-config.patch 907 BLAKE2B 3d7a74ea4ee52f3b07ec11bf6c30425bd6555e57c99de931e6e029f4dd70c1bf8a6c3a5678b671c5060a47c0ed44b3ce4d175ef0ef79b40aabbc902d8ddf9d62 SHA512 3f0b214ea6510609f2c312b057e926239fa404d4d834bce0688fa5756768e996fd6a89b03a8a11f106ea744daafcea71d35211761bb772400274084618d78e9a
 AUX musl.patch 493 BLAKE2B fa27c9442075c6adcc48a7d282c1ba1e143cb1da05dd8b9fbd4317a7a3fc485112a98db54ffe947366913c4e18c54208d29045f0660525f2c65d91caaa032436 SHA512 9b9a9b623edcce37339e52e3e306a7106b6289749fca1b2dc7450c299da1a6f8d3f3f12b4973ecfbf3797f75ba88cf7f644adee896b053a683df4e4754d5d057
+DIST tdesktop-1.9.10-full.tar.gz 25272713 BLAKE2B 26b2eb49b5b55dac21be46d37ff7ddd3b6ea4490e58d8a04aaada3237b81cfbb87f2422d179882407501db2a597718f4974629791c8d3f165673fe953bdecbf6 SHA512 128dc3fd42196ebf61853917914c3d33fb148d3e6b04847ffa6d4df5baa8d9e286e7d25317b0dd2a332f1475f60b5addd19bb6e25a0fa6bbca316c22235569c6
 DIST tdesktop-1.9.8-full.tar.gz 25225784 BLAKE2B d938dc5d82740f93c575f621697e4bae430dc045c18437957bead6cc949ad0643b0422d8fd2a1695af921ea7f259ca323094a4a7821855d842edfaf4f328c840 SHA512 5562eb99812a8faec74fe073323d6e04e36311c1e4ce984035212ecfed8bd5d12df92cd0f0022401201136315fb5556971b267b4bf47edf4eeddc9926c7969dc
 DIST tdesktop-1.9.9-full.tar.gz 25221934 BLAKE2B c8f6252fd6e72785a39c92f04e5dadf322775fc1a178f2c6dac9e38cb654b9eb924c16cffcf9dc47e2e309e4f27a13ea07235146e7d7960b6bd0a342a3645e03 SHA512 ba6400e6f5eec5bda6e8a54b43846e695b2cce731cb6b39f17407cc39e3e9b8078d977253d29962671f30e33dbe012f8e40f340f781fd8ca73487e5f2d42e3de
+EBUILD telegram-desktop-1.9.10-r1.ebuild 4147 BLAKE2B 9c56a92fba6fc18ccdfe43c9845b909e09d6e2ab79eba5ee62c3040951e614ba940a9799c4c2b91b87ad5a8979b69eb894793ca3dcd6ce6347b16978bcc21240 SHA512 707308a17b456de541ab9981709dba284639db06a3a6e623b4b64aea8d892def9646f82435d7bb2a9804d10bcb0d360b98da02067b5864ef7d6486b09c1cbfe6
+EBUILD telegram-desktop-1.9.10.ebuild 3973 BLAKE2B 92ffd553c7ec4663ec1c78e75dabdf02388629e0a4a8333146be1b9367ee345e546249cc78106068d4774b5397574f0e1b0e7f90607d350a30446536a26c71de SHA512 1b79cb84b54ab23ad14a32893e4191f6f6442b9fa0628cbc5a31d0e834b15fabacaa69c14c82f873e03bdb618b65ca8e1087628a1f7d9e8fde68ac7f1a0907cc
 EBUILD telegram-desktop-1.9.8.ebuild 3614 BLAKE2B f51b090718b6464e7edcab33f9768ac13ec8f230af4eeb119b51d50ab32d559262ac55a516408bb6587c7623d9c0486a6955158fc5a40cd0d0bbe9d14ca317a8 SHA512 6d006d0d48b46aa2813273ea77f886ba4b196625116741caf9e1cc50304a88e561c53ffdb65441292e11b651e9e60dd65928324a366eb7fd2392dae14f073839
 EBUILD telegram-desktop-1.9.9.ebuild 3637 BLAKE2B ebc32472e1fd13ef27eeab43a43da1ee0e035c5e8cd5b88168a542289dd8b7f4a4867f11e89ef42c962fe21cb15c903929e61c0b74b263f227afef928ab719fe SHA512 db8388a3930fc4693ed99728fd826cc94dff511c98fb9f413db8b7cd317705b7bfb5a664ec17ddd6cc5c8894f511a7569a09cd7be347b8f288753b2833709de8
 MISC metadata.xml 348 BLAKE2B 57a3aaf9f66d41173fffd5d7c40d1d25beda8eb6e46c3259c253c1d644fa2ec22fd2725ef61ca38a7338caba1da5e7abba73d363448c1c5f6e7b7767f1e8d897 SHA512 8d7efddbb9a62b78f4bac0b00a92e588b527d7914b84b7c8b73d654d35893f2c26f31b8d5ccbde2e0020f2e420816b691cf77cc902eefe9f4375b4a82c2a328d
diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild
new file mode 100644
index 000000000000..660977c09e08
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="alsa dbus gtk3 libressl pulseaudio spell"
+
+# dbus still required to build, but use flag disables dbus usage at runtime
+# pkg-config will pick up gtk2 first if found, needs a workaround
+RDEPEND="!net-im/telegram-desktop-bin
+	app-arch/lz4
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-cpp/ms-gsl-2.1.0
+	dev-cpp/range-v3
+	dev-libs/libdbusmenu-qt[qt5(+)]
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	media-libs/fontconfig:=
+	media-libs/libtgvoip[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
+	sys-libs/zlib[minizip]
+	virtual/ffmpeg
+	virtual/libiconv
+	x11-libs/libva[X,drm]
+	x11-libs/libX11
+	|| (
+		dev-qt/qtgui:5[png,X(-)]
+		dev-qt/qtgui:5[png,xcb(-)]
+	)
+	|| (
+		dev-qt/qtwidgets:5[png,X(-)]
+		dev-qt/qtwidgets:5[png,xcb(-)]
+	)
+	gtk3? (
+		dev-libs/libappindicator:3
+		x11-libs/gtk+:3
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	spell? ( app-text/enchant:= )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/0002-PPC-big-endian.patch"
+	"${FILESDIR}/musl.patch"
+)
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	local mycmakeargs=(
+		-Ddisable_autoupdate=1
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)"
+		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)"
+		-DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)"
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		mycmakeargs+=( -DTDESKTOP_API_TEST=ON )
+		ewarn
+		ewarn "Building ${PN} with test API credentials."
+		ewarn "Connectivity to API servers will be throttled."
+		ewarn "To build ${PN} custom API credentials cancel build now and obtain"
+		ewarn "credentials here: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md"
+		ewarn "After getting credentials you can export variables:"
+		ewarn "export MY_TDESKTOP_API_ID=\"17349\""
+		ewarn "export MY_TDESKTOP_API_HASH=\"344583e45741c457fe1862106095a5eb\""
+		ewarn "and restart the build"
+		ewarn "you can save variables in /etc/portage/env/${CATEGORY}/${PN}"
+		ewarn "portage will use the file every build automatically"
+		ewarn
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/bin/${PN}"
+
+	newmenu lib/xdg/telegramdesktop.desktop "${PN}.desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512
+	do
+		newicon -s ${icon_size} \
+			Telegram/Resources/art/icon${icon_size}.png telegram.png
+	done
+
+	insinto /usr/share/appdata
+	doins lib/xdg/telegramdesktop.appdata.xml
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
new file mode 100644
index 000000000000..9ef754c699fc
--- /dev/null
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
@@ -0,0 +1,155 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake desktop flag-o-matic python-any-r1 xdg-utils
+
+MY_P="tdesktop-${PV}-full"
+
+DESCRIPTION="Official desktop client for Telegram"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="dbus gtk3 libressl spell"
+
+RDEPEND="!net-im/telegram-desktop-bin
+	app-arch/lz4
+	app-arch/xz-utils
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	>=dev-cpp/ms-gsl-2.1.0
+	dev-cpp/range-v3
+	dev-libs/libdbusmenu-qt[qt5(+)]
+	dev-libs/xxhash
+	dev-qt/qtcore:5
+	dev-qt/qtimageformats:5
+	dev-qt/qtnetwork:5
+	media-libs/fontconfig:=
+	media-libs/openal[pulseaudio]
+	media-libs/opus
+	media-sound/pulseaudio
+	sys-libs/zlib[minizip]
+	virtual/ffmpeg
+	x11-libs/libva[X,drm]
+	x11-libs/libX11
+	|| (
+		dev-qt/qtgui:5[png,X(-)]
+		dev-qt/qtgui:5[png,xcb(-)]
+	)
+	|| (
+		dev-qt/qtwidgets:5[png,X(-)]
+		dev-qt/qtwidgets:5[png,xcb(-)]
+	)
+	dbus? ( dev-qt/qtdbus:5 )
+	gtk3? (
+		dev-libs/libappindicator:3
+		x11-libs/gtk+:3
+		sys-apps/xdg-desktop-portal
+	)
+	spell? ( app-text/enchant:= )
+"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
+
+BDEPEND="
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/0002-PPC-big-endian.patch"
+	"${FILESDIR}/musl.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycxxflags=(
+		-Wno-deprecated-declarations
+		-Wno-error=deprecated-declarations
+		-Wno-switch
+	)
+
+	append-cxxflags "${mycxxflags[@]}"
+
+	# TODO: unbundle header-only libs, ofc telegram uses git versions...
+	# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots
+	# EXPECTED VARIANT
+	local mycmakeargs=(
+		-Ddisable_autoupdate=1
+		-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
+		-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
+		-DDESKTOP_APP_USE_PACKAGED=ON
+		-DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
+		-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
+		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
+		-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
+		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
+		-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF
+		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)"
+		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)"
+		-DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"
+		-DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)"
+	)
+
+	if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
+		einfo "Found custom API credentials"
+		mycmakeargs+=(
+			-DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
+			-DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
+		)
+	else
+		mycmakeargs+=( -DTDESKTOP_API_TEST=ON )
+		ewarn
+		ewarn "Building ${PN} with test API credentials."
+		ewarn "Connectivity to API servers will be throttled."
+		ewarn "To build ${PN} custom API credentials cancel build now and obtain"
+		ewarn "credentials here: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md"
+		ewarn "After getting credentials you can export variables:"
+		ewarn "export MY_TDESKTOP_API_ID=\"17349\""
+		ewarn "export MY_TDESKTOP_API_HASH=\"344583e45741c457fe1862106095a5eb\""
+		ewarn "and restart the build"
+		ewarn "you can save variables in /etc/portage/env/${CATEGORY}/${PN}"
+		ewarn "portage will use the file every build automatically"
+		ewarn
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/bin/${PN}"
+
+	newmenu lib/xdg/telegramdesktop.desktop "${PN}.desktop"
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512
+	do
+		newicon -s ${icon_size} \
+			Telegram/Resources/art/icon${icon_size}.png telegram.png
+	done
+
+	insinto /usr/share/appdata
+	doins lib/xdg/telegramdesktop.appdata.xml
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index 9e13ef263f37..204fd90e4e31 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -1,3 +1,6 @@
+AUX 5.16.5-account-fix-property-name.patch 1053 BLAKE2B 283fde75d8eba3f8c4240e49298233930d270c48ead6b3a4651de7553c35e74fb3b72108f570bf6133acac38f1751e2355b260b28af0d6ef9c8cf5c5102ada80 SHA512 a0161ddf307f9a690b1c741c20aee8fa05f3378da880d1a850f80cde0fc83fe2a95c541d4cb641d1e70995cc6cc75d27b6c5a8c110ec7330ad2a9a75df297012
 DIST telepathy-mission-control-5.16.4.tar.gz 1102177 BLAKE2B 4c7ad46c472b6bc20b559de48602bcee971fda5ed2fb139d4a67793ac0f2871cfff6db5f9775a3626e1f1860fe41f8e4d520f00d05d7230064d30b21cb3397bc SHA512 5ed624df2d041554af074c22a18db2405fa5bd41bec40edc574382eb9d8b9f93ff6f4be3042d27f950694a353f4192670e200f5f8865419701ca520a973959ed
+DIST telepathy-mission-control-5.16.5.tar.gz 1125142 BLAKE2B 1f39336d8221ec9f297ba9eeaed39ffc30d5b2ecde3b02148343cfb9bf4ec15d949a36feb6b92cef17d70f786840b8df9cf159eb8eb00462c64bfb8b41437b57 SHA512 6adeb3033853bef5b732e7b85da49b75bffbdc57d968b1e4313fd1452eaf8db96c3f7f50d41ebb7bfcb084a7f093a9eaccdb28c23d2777e149a90dec6d4ef4e4
 EBUILD telepathy-mission-control-5.16.4.ebuild 1231 BLAKE2B 5d7de2122d8dfe734092ed3c71a18c23c3061f001fdb3076de324ac388f56182f3d83aff1e0dfebf9711eda078cf92a2b18024838ca56370c32a16be252e9e10 SHA512 ab53e2deefd8eaa08bb2d5801c575203bb62a523edf3dc085b04e2bea46f233b2ecdb4517e52eda0009456d3904bfcce79ea20cdf81ea133d931afab1e3d2509
+EBUILD telepathy-mission-control-5.16.5.ebuild 1311 BLAKE2B e45b9dcf47a8970a7e2b6989cdd0d256d83354ac762f9c5b8aca066fa73f90dacbe46994a31cb83e642fc03804326495c739e8b26d36f1a10818dedcdebac91e SHA512 f11db8194979ce1e7ebdfc02da89194f0115ed0f7513bf08681d9b51c738f758415051408b75518f6107b996d3580299209a14fda4bcdaa7bd17a67b0d1563bf
 MISC metadata.xml 599 BLAKE2B f96e565e553f14b0ab55f8b53ed520e9253611da9cf26b5f43ba35cceeb808a9be1dfc4968929ab62faf3af116d3c98c4e89b63260fb6779f397cfce4f06dee1 SHA512 fba9a9332501e7fce4d62efbbb643cde3579a393918cf6ecc59cb1aae6bd04adfb62d379d446805d01ebed51f9799ad453fdc7490268616e127ff128142f4868
diff --git a/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch b/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch
new file mode 100644
index 000000000000..17eb7f1f0415
--- /dev/null
+++ b/net-im/telepathy-mission-control/files/5.16.5-account-fix-property-name.patch
@@ -0,0 +1,25 @@
+From d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 19 Dec 2019 13:37:49 +0100
+Subject: [PATCH] account: Fix property name
+
+Spaces are not valid characters in property names, and never were.
+Until recently GLib silently fixed up the name by replacing the
+space with '-', but now tightened up the validation.
+---
+ src/mcd-account.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mcd-account.c b/src/mcd-account.c
+index 8009110e..de5c61cf 100644
+--- a/src/mcd-account.c
++++ b/src/mcd-account.c
+@@ -3442,7 +3442,7 @@ mcd_account_class_init (McdAccountClass * klass)
+ 
+     g_object_class_install_property
+         (object_class, PROP_CONNECTIVITY_MONITOR,
+-         g_param_spec_object ("connectivity monitor",
++         g_param_spec_object ("connectivity-monitor",
+                               "Connectivity monitor",
+                               "Connectivity monitor",
+                               MCD_TYPE_CONNECTIVITY_MONITOR,
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild
new file mode 100644
index 000000000000..f54b59cbc4d3
--- /dev/null
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+# Needed for tests and build #489466
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="An account manager and channel dispatcher for the Telepathy framework"
+HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug networkmanager" # test
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.82
+	>=dev-libs/glib-2.46:2
+	>=sys-apps/dbus-0.95
+	>=net-libs/telepathy-glib-0.20
+	networkmanager? ( >=net-misc/networkmanager-1:= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.17
+	virtual/pkgconfig
+"
+#	test? ( dev-python/twisted-words )"
+
+# Tests are broken, see upstream bug #29334 and #64212
+# upstream doesn't want it enabled everywhere (#29334#c12)
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/5.16.5-account-fix-property-name.patch" )
+
+src_configure() {
+	# creds is not available
+	gnome2_src_configure \
+		--disable-static \
+		--disable-upower \
+		$(use_enable debug) \
+		$(use_with networkmanager connectivity nm)
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index a852a55c5fa1..c30b6a9dde22 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 17282aeff2fe..16f782259df3 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -4,7 +4,7 @@ DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d
 DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
 DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a410ca202d1231657c9fb439ddd4a7515aacea0b0fff92365d477aa24c90d37aa61466495354dcdf5578d7accfa65 SHA512 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
-EBUILD hexchat-2.12.4-r2.ebuild 3394 BLAKE2B e550250ba3d264ab459b3bbd9efd137601ba21b651fd52724277b1a2588366cd2cea7f22f6b724c1cf332f1d0af35f8142db35f01ce35b096d889b9938e3a925 SHA512 248924b79a78050cb846c7253a081faad4c79dc648d8d84425e023c8f307906f873d68659d481592b6efa231d45a4b559f1750bbdd187a068b30d2ac6cdeaed1
+EBUILD hexchat-2.12.4-r2.ebuild 3388 BLAKE2B 999e485eb68ab62a3471065c5a97a64e88528fc1d5be4afbc7c2405fb1513139d7335ee8ae16a3e1b33c35b80455a8a689ac575dfc3e9bbb3c087243b0b79b7d SHA512 5c28e381e0c2d9a85788986978ede4a07cd76b15d1d2ba2fe0393a531c98be350fcfe2b18a83c0878ef7a3b234bb7ee82cd849b37f60c2a092e17e7e6e1af034
 EBUILD hexchat-2.14.1.ebuild 3428 BLAKE2B cbdb884528e0d618059d676f438dd2bfa8e30582640b8f7de41c76e2db535560f9cd97b315b2c62f75951d55593329e021934872ac3dfba0dbb0cfbf63367198 SHA512 1d0e7eaa0e2dfe8466673dd9fd3243d82146f547fb2379344e688dc42a4280617e350a017fc082c9126880b11ea013dbed2dc8e002141340b573c6a8802472bd
 EBUILD hexchat-2.14.2.ebuild 3497 BLAKE2B e3ad65500058c3115459628c6ad27d504c7b85d02719ad8febf58b4be5571d5d454ea7afd8fe3ccb85d9459a3fe3f4ce0ef3bd576dd7e4f8dc1622e06eac81d4 SHA512 d91c20a9595b120a22d1b1fc6be880428c98614f3569010cfd5c2976f5cb6794c0526742d80777a65680b0ce6d25bc76f4f64306475be46cf9a9720cc0c087d3
 EBUILD hexchat-2.14.3.ebuild 3305 BLAKE2B bc257f377203432fe4d387258f537469ce93a6352156064593bc4d90b7afa812ddccaac097e3be1e9876b46b41c8f81634c3de7567a501214c1655cd2edcf9f3 SHA512 1eabde97709ab477d3b5ff3a742feb069d04e0239927bae5cdda7c2b8e2642937dc4384ff94225bd5ab63dedf45e7e7783414c43742c13fb82031ba87a47af56
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
index 0e0cf8a73831..bd3dc882df4c 100644
--- a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
+++ b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit autotools fdo-mime flag-o-matic gnome2-utils python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 4a45f3ab00b3..08ab6969ab93 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -6,7 +6,7 @@ AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987f
 DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
 DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
 DIST inspircd-3.5.0.tar.gz 835283 BLAKE2B d070d8f299ea2460eb58062b345e9fdef04f1aa94cbedda15bc2ed9c32a7627af383a250359dc77ee6cf2c53dd1841c9a77ce0da236d0b9852c5e9d5a0964aae SHA512 64e7be4b013c418577362b33be73b8f7045f1071ccb2c4e83fdf1a96b98656a3541e20c005bc32532007da21d9ba963f534cd14d16c2e1cf8afcf34b22ffad8c
-EBUILD inspircd-2.0.28.ebuild 3144 BLAKE2B 1318ec1b16835ee703a3ae7b3de69a91d257eb50763a98ed2d1597a04660b14f3e3458e762477071657c33cbf3757a2007184b757e4abd8b5cb18719b38fdfa6 SHA512 27e9ba6c17d790d1b9a7d9f36dff44675537d6bc117e3b5d77a244548cfc4741be8cf70038b236e1e9533625117f94509cba30773ecbec5e6dbe1fbc7dc0043e
+EBUILD inspircd-2.0.28.ebuild 3142 BLAKE2B 0942f689c6b165b90f50d0748c95aacd4a47ab1d0b8a54b44768e1c99434ab8fd96706dcb75cbd6f149e45c98dd82be0ee740e9e2d1c41f7fc5d4430ac2e76c0 SHA512 ac9110c5cb9abe00dcb0d7fb88d72b98467a1cedcf223e01e430f10fbff609b807b9282bfe1f3cc0eaf6519b291b519bbc9bc3616212326f52c0c31734a23c4b
 EBUILD inspircd-3.4.0.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76
 EBUILD inspircd-3.5.0.ebuild 3622 BLAKE2B 4ed8b42b32fcdb354add43029533c45a5ae35300564d93699c5d114d167670593f6a23ae8bb212b8367ab611af7ca18c26ba547c410decf839d050aa7e401311 SHA512 2c940d423fd048d8857f07df0617071beb925bfc6d8684df41882ecb6d13f291d9435986f2c74a0fdd6c5b0fd49b910316a67b122e915f28b2ae66b2c2e062d7
 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
diff --git a/net-irc/inspircd/inspircd-2.0.28.ebuild b/net-irc/inspircd/inspircd-2.0.28.ebuild
index 86ef749f1222..5c6d7f361824 100644
--- a/net-irc/inspircd/inspircd-2.0.28.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.28.ebuild
@@ -79,7 +79,7 @@ src_compile() {
 }
 
 src_install() {
-	emake INSTUID=${PN} DESTDIR="${D%/}" install
+	emake INSTUID=${PN} DESTDIR="${D}" install
 
 	insinto "/usr/include/${PN}"
 	doins -r include/.
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index 114b1b7757e9..3302830320cc 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,5 +1,5 @@
 AUX irkerd.confd 474 BLAKE2B 150e953ff1db373cb2b9010d4136866156fac7b6816ea12041bbb7d49862e93288d329605da5e935ec92f809d8b9774b5086cb910d1e9741efff707d8fde0edb SHA512 62e2242cbacd6ed35419b6ef78b969602c2c091e0500bf00d989444d96551087a4eef80ec5b70b5a8f88ecfebb633eb628f7912678862fde8ce7bddb75c87010
 AUX irkerd.initd 1125 BLAKE2B 4675bb07c523414810432b22954629e80758745b3ebcd8d9b6e203a699d776066871819a505cc4c249425b01fe04b4e818365d78bb2161f92cac89f3e62fe592 SHA512 c22838ef63cd2165af958724b4306a260018104224969e612b7175d63619f12a18908c155e94210030f0ada6dcedaabaee6eb0690bd6e327a65ee9934b8d4368
 DIST irker-2.18.tar.gz 44284 BLAKE2B 355d9004c77c7635e5ee068d6521b2d1b8c3e0ae4b0d2fa39e71c16a4ecc2272c5a487dafd296a3d02aa5072c734f454875939b99f66c4321ab2970da78216ef SHA512 215f0ab3be03b615f2bb24e04a5e5f6688634c4fb994b5384106b7f3eae62967ac45b2a14d08eee8dbed886dbb0578e077fa19597db599ea9562a67797f75606
-EBUILD irker-2.18-r1.ebuild 1307 BLAKE2B 041e6a611d5b0afaad38f38a7a6f49b0d15b0b7cc2712c726c93460550aa6c9f7e5ce3265249e592bdd3943bf881f2284f0740031e21372126739f0a9e34b72c SHA512 5408c1fcbc4bdee662c61fdab9f0eb4cc8264770e4389d919c7b7d77f5887abb9dd4e421bf9e693639dcd8fa67528847ab3a4f99609e70962bd3121504907ba4
+EBUILD irker-2.18-r2.ebuild 1345 BLAKE2B 2b4f67d28725a42b7a0c57fe55d61c14495b8523d47863efb3135c05d3af9cd72725c048e55f44d828d3bc82a0d67a34afda40d5af956292873551e75eb2f9ab SHA512 ce50c953d64f3396e210722998bf7c90d4b5f1625af141d6a40578af6caade752ef385bfe3a51da30bf86296aafa2ff793b69ee07c6069f2f314f07235478287
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-irc/irker/irker-2.18-r1.ebuild b/net-irc/irker/irker-2.18-r1.ebuild
deleted file mode 100644
index 62f36d076cfc..000000000000
--- a/net-irc/irker/irker-2.18-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 ) # Doesn't work with python3 bug #619700
-PYTHON_REQ_USE="ssl"
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="socks5"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	socks5? ( dev-python/PySocks[${PYTHON_USEDEP}] )"
-
-DOCS=( NEWS README hacking.txt security.txt )
-HTML_DOCS=( irkerd.html irkerhook.html )
-
-src_prepare() {
-	default
-
-	# Rely on systemd eclass for systemd service install
-	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
-		|| die "sed failed"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-
-	python_doscript "${ED%/}/usr/bin/irkerd"
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}/irkerd.initd" irkerd
-	newconfd "${FILESDIR}/irkerd.confd" irkerd
-
-	systemd_dounit irkerd.service
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
diff --git a/net-irc/irker/irker-2.18-r2.ebuild b/net-irc/irker/irker-2.18-r2.ebuild
new file mode 100644
index 000000000000..df9f62a09166
--- /dev/null
+++ b/net-irc/irker/irker-2.18-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 ) # Doesn't work with python3 bug #619700
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 systemd
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="socks5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	socks5? (
+		$(python_gen_cond_dep '
+			dev-python/PySocks[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+DOCS=( NEWS README hacking.txt security.txt )
+HTML_DOCS=( irkerd.html irkerhook.html )
+
+src_prepare() {
+	default
+
+	# Rely on systemd eclass for systemd service install
+	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
+		|| die "sed failed"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	default
+
+	python_doscript "${ED%/}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	systemd_dounit irkerd.service
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index c6c725c1cc18..61c29c2dae69 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,7 +1,7 @@
 AUX kvirc-5.2_pre20190628041642-python-3.patch 2036 BLAKE2B 71de965fcd6d3ff6ec74c52662d894b60ff15d7b9dd895f18a6c31d4404291c227ae0f15362b0eebd86c377adce5ebd1a6a65975c40d2a391c928748dcb144d1 SHA512 3dcdf021f9c78df31031f25a86dea332996d489e482ba3da867856f262fd001c7858da51f5cb9dc0a3c208674a60105e484c3426d73816c61f0fbdca0a88b3cb
 DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f
 DIST kvirc-5.2_pre20191202122540.tar.gz 5967654 BLAKE2B 059e57f0b8a789388f351c536dc3b57a7fc119cc78206a6a42266a1296e1edc6410ab9f564959d77aabb98ca55c9d4ec63505b4c1d46ad27a7f0f2ee748eae55 SHA512 2e3b7683070446a80642ef07abbc69912e47af59966cbc95698f5b8b1a1726b85ae78890dcc85d3f546f32b3c5f2a6c64ec4049467c6b336798ad91542d48c42
-EBUILD kvirc-5.2_pre20190628041642.ebuild 4322 BLAKE2B 1ffc73c27abbcb7a101829cf4a8197713e48d5bb3bdba3584beee23ba57c5f4c8cde9df6da004b7885b617929d88cc04aa72e7ed94474ef691eea74a582741da SHA512 cbb66d43ce0c829f82edecd611f7fcdfa27863a67d89d053a53f4529985c3b822c663eb93df023ae59feab7339bdf71926f94a4c2fdf5b9a51a56fbc789d7340
+EBUILD kvirc-5.2_pre20190628041642.ebuild 4318 BLAKE2B 9aecce5a0b4016f9aef8090f070550412fece1df3edabffa15492a1bbded640ef877ca5eda57a04e0375d6cf691dc383e85aae83027aeefdc8815ae5d622be3c SHA512 0f3a40e50b82f352fe93c6faf474217f301f446ef5b0525ad9d23d52826c632c8f5031b29c5b7aefd28e09f6cb1e036a670a3d80ecaee70dbbe31e2e987ecc69
 EBUILD kvirc-5.2_pre20191202122540.ebuild 4325 BLAKE2B 7af23814810c6863700412b5307c4e6df818fd09ef859365ba1d8eae2172d896c408f4bcdbbfdca0e03c46c9445ea8154fe81877a17280a2ec042da6beaa5ce1 SHA512 b3dcb64f67dd31d4bdb80070c0de988c29855298e866c1d4c4e20752380b86440ff1d6e7fc451d2806cf75c9e0f31805d97152972046afb5c610b23f0c4667b0
 EBUILD kvirc-9999.ebuild 4403 BLAKE2B 1568a27b1fbef54ebae71cb8d4829e8bb5d49cc7275f4ae5abe4621fdd3e4fe8ca7665a8cf25dcda854449a2515fc8ab4cfa9b120370542256d3ab0c89da9f3f SHA512 632e450166c175f25c905790d643488b62f65da5298473877099b40b82e11f651bd944b0d0c2f45d637e26bb7b62f4ba8d15d43574084704ea7e23284f80323a
 MISC metadata.xml 643 BLAKE2B 820a98f07a4cfb58e857d5c7b863ed7adc174497a7ea05e66245a2c40c328ee0bdb644b98ba1d923834ccf05f23f8128abfe462d433fe2136078225b152a633f SHA512 3dd50caac7ff50679cabad216d4ec28b60351febc419f5d32f60b785043eba6f2f379c06e5af28af26355845ebcfe8439bca9d141bc3b9d0401fb0ee0a0c704c
diff --git a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
index 7e84f4e5ca9b..d48ce48903a9 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
 
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index e56cb955dac2..1fc464a344b8 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,9 +1,9 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
-DIST unrealircd-5.0.0.tar.gz 4891870 BLAKE2B f65156e83e2fbdbbf1f843199fded988cf3aa5304de877e1a1804ae2409308aa17ced6ed875f569313026f94fd0fb82d8f23f64b58661912a32de9f17ebadb81 SHA512 48fd93b0edcd3d9489fd9d1c7ea8b60ad3404383ec126df2840be587b087e2f9a6b267e08f616cdd63b3e33f498c552f4cfa5d6b9db820cb73da0fc6ba86e333
 DIST unrealircd-5.0.1.tar.gz 4892906 BLAKE2B bf3515dc962ead462b32dd3a2dd44b292306ea4c64f1405c54e89d835565506394b5dab9d244a9df316afc150808baddcb53c500ef026db50c570024295cc4e1 SHA512 5ca8a05f985d07ad9e676c39a8ba5e1409797a155a9df505f685ab4d6616af30ad3946b933df75bdea66ab3984578af77144f67bea7fd65b16ba6da250c09eed
+DIST unrealircd-5.0.3.tar.gz 4902148 BLAKE2B 954ee5a6953378809b0bfe793a698c3dd0f243af0dea651391fa953a13f4ea8b71925bfeecbf9cff4098d51bb6cb154559d6ea8608bfb0e98790c137bb4ac20b SHA512 7fdee09cecebc1c2ceb9456c1d49bef566f240ca03827aa35a16c875f7aa8e1fc1e520a5f922303de56bfe828e4fdb6bf9fc6513b4defe24f3b77678603f7a56
 EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98
-EBUILD unrealircd-5.0.0.ebuild 4884 BLAKE2B 9177549b30047dd8b13973cf3adfec87fff58e2bf70b489ee31697f14a97aac19acc7e0d0306e36baaae88600481991511e866a4648e541328b7928e177763a5 SHA512 b9c81784aa1c48f90b70b300366b4d5b8d0d54ec1f3583bb4e10bb0b97e88b21d04af61f0d63be889bca26a4d64a213104d5bd34fc568ecaf4db394a0b523c85
 EBUILD unrealircd-5.0.1.ebuild 5008 BLAKE2B ada6fca3216c0cbffcab8de82791d605bed4754e6bea55b9e8d1866ec771c987a019600ad073d9178c0e87265b55d45ad8143254bf710d520805f6e7d25285c9 SHA512 21c19a57e4cbf63f046d9bbeeee00e0400a63291329bd9d7765f9d790b3d065f8bae492c5703b927e9779f0481295153875a1655613b6c1445582d7adc0f176d
+EBUILD unrealircd-5.0.3.ebuild 5008 BLAKE2B ada6fca3216c0cbffcab8de82791d605bed4754e6bea55b9e8d1866ec771c987a019600ad073d9178c0e87265b55d45ad8143254bf710d520805f6e7d25285c9 SHA512 21c19a57e4cbf63f046d9bbeeee00e0400a63291329bd9d7765f9d790b3d065f8bae492c5703b927e9779f0481295153875a1655613b6c1445582d7adc0f176d
 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/unrealircd-5.0.0.ebuild b/net-irc/unrealircd/unrealircd-5.0.0.ebuild
deleted file mode 100644
index 6a996cec84fe..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.0.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SSL_CERT_MANDATORY=1
-inherit ssl-cert
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
-
-RDEPEND="
-	acct-group/unrealircd
-	acct-user/unrealircd
-	>=app-crypt/argon2-20171227-r1:=
-	dev-libs/libpcre2
-	>=net-dns/c-ares-1.7:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	curl? ( net-misc/curl[adns] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
-
-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
-
-	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-maxconnections=1024 \
-		--with-nick-history=2000 \
-		--with-permissions=0640 \
-		--with-system-argon2 \
-		--with-system-cares \
-		--with-system-pcre2 \
-		--enable-dynamic-linking \
-		--enable-ssl="${EPREFIX}"/usr \
-		$(use_enable curl libcurl "${EPREFIX}"/usr) \
-		$(use_enable prefixaq) \
-		$(use_with showlistmodes) \
-		$(use_with !operoverride no-operoverride) \
-		$(use_with operoverride-verify)
-}
-
-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}/tls
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
-
-	# config should be read-only
-	fperms -R 0640 /etc/${PN}
-	fperms 0750 /etc/${PN}{,/aliases,/help}
-	fperms 0750 /etc/${PN}/tls
-	# 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}
-
-	# 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
-	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
-}
-
-pkg_postinst() {
-	# Move docert call from src_install() to install_cert in pkg_postinst for
-	# bug #201682
-	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
-		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
-			ewarn "The location ${PN} looks for SSL certificates has changed"
-			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
-			ewarn "Please move your existing certificates."
-		else
-			(
-				umask 0037
-				install_cert /etc/${PN}/tls/server.cert
-				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
-				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
-			)
-		fi
-	fi
-
-	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
-	# Fix up the default cloak keys.
-	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
-		ebegin "Generating cloak-keys"
-		local keys=(
-			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
-		)
-		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
-		eend $?
-
-		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
-		sed -i \
-			-e '/cloak-keys/ {
-n
-s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
-n
-s/"and another one";/"'"${keys[1]}"'";/
-n
-s/"and another one";/"'"${keys[2]}"'";/
-}' \
-			"${unrealircd_conf}"
-		eend $?
-	fi
-
-	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
-	elog
-	elog "You can also configure ${PN} start at boot with rc-update(1)."
-	elog "It is recommended to run unrealircd as an unprivileged user."
-	elog "The provided init.d script does this for you."
-}
diff --git a/net-irc/unrealircd/unrealircd-5.0.3.ebuild b/net-irc/unrealircd/unrealircd-5.0.3.ebuild
new file mode 100644
index 000000000000..10fd8b753269
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.3.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.7:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	# building third-party modules (which we don't do) cause a sandbox violation
+	# bug 704444
+	echo "" > src/buildmod || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	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-maxconnections=1024 \
+		--with-nick-history=2000 \
+		--with-permissions=0640 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify)
+}
+
+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}/tls
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/tls
+	# 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}
+
+	# 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
+	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/tls/server.cert
+				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index a53df612d8ba..1a4d577ac343 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,6 +1,6 @@
 DIST weechat-2.6.tar.xz 2080092 BLAKE2B e54d8493de7783e18e0de3a7280088a27a70b270a2d7a504ad35c4091e03a0d3c2f3fd19260b700bb115e3804ab4d6d8963bea46faad1368f3dd0569c0595add SHA512 cf56692e12b2e034675d4c15a8822836b2fcf93d584948e338d263f5a7207edf4599cc72bfb940427146f5f75e7239207cf54f5ed07dd5b6119f68c445725a2d
 DIST weechat-2.7.tar.xz 2226876 BLAKE2B accb97f018c5405850df5ba7d1d8ad0b23ccfd478cedf29ebbd1f468f364efcfce7a7a34ef557ce7f64c2157392c1b281f8f74e57782ed69b4e0ada9f1b67b37 SHA512 5377cf9c37520cb2b7d1ba43251df3f33d814783ea4bd20d28cb08a2106c8db0e44a392a61929987b807a7d5e69a3c0ed1f3fec122a014b7ea7068e159341075
-EBUILD weechat-2.6-r1.ebuild 3809 BLAKE2B c784712973a63249ac9f70c0f0297c4cd1de4dd2be0a96ff52e950978b7257b8808118326f741ffa7f2ed316ffb380e5f845b5ca143c3c31d17f88d970ed5d8e SHA512 50de01e96d0fceb905d687cc8009cf92b1dd3448698b939cef8a9bdb7fe7e4fb66379abfc1bc0710b4f8c107a3e358db40233995f2fab3d1cb3d662a31a0cc7c
-EBUILD weechat-2.7-r1.ebuild 4038 BLAKE2B f4c7da14b1e5e512aca5f389aafe3bbceba565de3a4443990a32cf242f58a2ba8cbb23c95e5d2b1143344d13e6cb50e801d48ee111ed59729c527c7d2ce9d067 SHA512 6d942fb4083587555d7df58f76dadb30bffed387712506fd5824111e88f7672d8c3d3608711aa42f86045a003aba02387dd16cbb62a7ae1cca42e26748706763
-EBUILD weechat-9999.ebuild 4038 BLAKE2B f4c7da14b1e5e512aca5f389aafe3bbceba565de3a4443990a32cf242f58a2ba8cbb23c95e5d2b1143344d13e6cb50e801d48ee111ed59729c527c7d2ce9d067 SHA512 6d942fb4083587555d7df58f76dadb30bffed387712506fd5824111e88f7672d8c3d3608711aa42f86045a003aba02387dd16cbb62a7ae1cca42e26748706763
+EBUILD weechat-2.6-r1.ebuild 3805 BLAKE2B 2c9fb850906a064b7b48e3cfd34f5b8785a14b9c53533b51753db92336f2fa5ac0927de2fc5cc8a46defe9e75e7c34a79aa7b06177dc8e9de03dfa633f7ee918 SHA512 dfe35dfb97761d99a4eb819fc0ed957ecc69f42bef7cad92082d284350e4e91b0e68796bcd360ce6b2deb55977787b53b76e0243a7e0c76f80c6d51f68026a50
+EBUILD weechat-2.7-r1.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
+EBUILD weechat-9999.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/weechat-2.6-r1.ebuild b/net-irc/weechat/weechat-2.6-r1.ebuild
index ebc19139affa..80b28aea3253 100644
--- a/net-irc/weechat/weechat-2.6-r1.ebuild
+++ b/net-irc/weechat/weechat-2.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/net-irc/weechat/weechat-2.7-r1.ebuild b/net-irc/weechat/weechat-2.7-r1.ebuild
index 30697d7c964a..37b7a1e45182 100644
--- a/net-irc/weechat/weechat-2.7-r1.ebuild
+++ b/net-irc/weechat/weechat-2.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 30697d7c964a..37b7a1e45182 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 705950ea1b1b..d0bc06dcb99e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index cdee0b3236a7..561257cd66a6 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -5,5 +5,5 @@ DIST aqbanking-6.0.1.tar.gz 2551617 BLAKE2B 0f18e63f6fc695b4fb3c5b831d324cf039f0
 EBUILD aqbanking-5.7.8.ebuild 1597 BLAKE2B 23dfae67ac7874727307ac8bae890b804ff84cea65f1ec6f239cad33891541ab81e9ab80e6956dddeaf74fc365ceeba6fef5b71bc4eb159630a88f201c52f71b SHA512 5ff2f013a85766a9c292bbcfaaa51dfdad02871d98d7639444d72f02720a6ad616482738ed07064e037c42a64020fe50c586cee724c54027cb94db752eccfabd
 EBUILD aqbanking-5.8.2.ebuild 1454 BLAKE2B 9c008c308d7ba122076de9d94492619ab13fdbd0bda80ea46d17ef60bb8c5e712be92099e6db4b3a04d39022b39a88a250346dc9277e40623dae15059beb68f2 SHA512 5505c4150f5915cd349b6d6331c5025f9c996df59b377ecf0f441502a34f1c125620bf7824660ec4674d95028de724b11301c97b580a5e2084d823cd89d7b799
 EBUILD aqbanking-5.99.44_beta.ebuild 1407 BLAKE2B d9d6b5b1f773b13b30c86b02c04e5477137ac53b932d001dc27a9f833497e44aa8614148d54e78fb63aab54b3489e896daeb44b94161e55f16e40bd1d380c91a SHA512 49ff085ccffe5ffe1805cd7a96235c024c3493d9b496ff332090e377cf22eba8f3731ff2619e4cf7f0cff56d733eafbb684e6fa05bc32af05840dea99cb1a4ee
-EBUILD aqbanking-6.0.1.ebuild 1403 BLAKE2B fec653d12882516fb876e32c7ac67edd7369c43bde81c7be015906bef2bf3a970cb31dcd458a58df24c3beafe2dc2b5355e937e5ff1252ba62733f6034aa318d SHA512 1a32a1d19576b6cd140f401174c5a2c15d1ef768825695c53774d1fa10af81e95aabab93378213523500ec87d2d91ac8e5afde0fa4886c15597ec53a61dcd6f9
+EBUILD aqbanking-6.0.1.ebuild 1402 BLAKE2B 0b1ba38a730045154ee73cc71665a22b30e08c78d88e888bb55fdded0cbdc78b4e3bf8738e1f2cd16c3df0acb105a787b4afcb7e842229ac9cfa6aae3fc55f62 SHA512 4dd97971115c74c10795682dbfeee5ddea3df1d078024b4fdd96ce4d9b4479bc0a3c03d69841fea1b0e27fd2df0a886696a5295317a3c76d9546ef316fe3db99
 MISC metadata.xml 412 BLAKE2B 71c913459f7d3fc1d6bede5ee1e78fd189b840cff496c1e0da86434143be173cb7f00f8457174f9e9b6b22a3a9673a316e7a80649ab6ebaa7cb4c4f7c10270c2 SHA512 d32767c7a1c63a22e61318687c3591d86b2adaab9773d3330b451c099306412003bb07f449c3cbf0791b8d2370e742ecc3922076e9bc8e6c0a1ad7fc92d24999
diff --git a/net-libs/aqbanking/aqbanking-6.0.1.ebuild b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
index 82c1fc073a24..c50b81b94185 100644
--- a/net-libs/aqbanking/aqbanking-6.0.1.ebuild
+++ b/net-libs/aqbanking/aqbanking-6.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/238/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc ebics examples ofx"
 
 BDEPEND="
diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 35071f9c6cfe..9af9f423dea0 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -1,5 +1,5 @@
-AUX canlock-2b-make.patch 2986 BLAKE2B edaa828eedc85e6e4568403e107bbf42076b5b0a098dcb41e4352d5fd54f7bb631110164e53bc38aac27a4651431b7a7eee5fde392baa1fd13fe43732188a3e4 SHA512 4c41aedb6b26e9205726ad992354f57daef192d6c6ceaa9b1fe961839725a5b831f5c16dcd2bf2e451499539e22f1f1ed7b0ec113844d0c1306afa5e69dc4db5
+AUX canlock-2b-make.patch 3370 BLAKE2B be7d14d664284886b2f798e8a46df4b4d9fdd2e2f098487391b51291c87dcd7055b7b31f59fb5a62ff1ca7bf09acc5cc3b1c90834bf309e3f6c4b9779b49fd93 SHA512 3040988dde4d7a79d1a73ebd90f8c7eadcb01489129ce47641e49c08ee38ff94d055f3da936c6ef1bf19fbff4f6be5ea41dc80356cec141b278c502dcabdc7ba
 DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f
 DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
-EBUILD canlock-2b.ebuild 1109 BLAKE2B 2f398ca68b15bf49f52d60fa51215b7ff5d6c7b94009216730890ada940bd3bb4491d2c3bec4585da82552d6a2ac72eac4999da494442745a0795ce9344d8839 SHA512 41368cbc1d21ca9eafa48a1c38fa1dbc892543b508c4549fb5a4b4b8c30bcfd6e246a4f09082bf8d26a03692d789a3043bf1b4e76c658d62deb23f761d290455
+EBUILD canlock-2b.ebuild 848 BLAKE2B 68ee1efa0605d19ef8ad449bb8e57113b27d2b17c7e11cbf85789e6c9bf2de4a984143b3872737a76193d8463e90a592f2fa84948e24ed3f2f14c236ed205b65 SHA512 e7348d495c1b7bef6f786b82e71b8097300125cb45c0061a0d9a63f3657abc763f54856fe55de051a6d38dd40306ab9580c4c16d7a2cd2414e1cad6300eb93cc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild
index 9d58b0a2dc63..d54ed58f3701 100644
--- a/net-libs/canlock/canlock-2b.ebuild
+++ b/net-libs/canlock/canlock-2b.ebuild
@@ -1,43 +1,39 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${P/-/_}"
+
 DESCRIPTION="A library for creating and verifying Usenet cancel locks"
 HOMEPAGE="https://packages.qa.debian.org/c/canlock.html"
-SRC_URI="mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-S=${WORKDIR}/${P/-/}
 
-src_prepare() {
-	epatch "${WORKDIR}"/${MY_P}-6.diff \
-		"${FILESDIR}"/${P}-make.patch
-}
+S="${WORKDIR}/${P/-/}"
 
-src_compile() {
-	local targets="shared"
-	if use static-libs || use test ; then
-		targets+=" static"
-	fi
+PATCHES=(
+	"${WORKDIR}"/${MY_P}-6.diff
+	"${FILESDIR}"/${P}-make.patch
+)
 
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ${targets}
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	use static-libs && dolib.a src/libcanlock.a
 	dolib.so src/libcanlock.so.2.0.0
 	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2
 	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so
-	insinto /usr/include
-	doins include/canlock.h
+
+	doheader include/canlock.h
+
 	dodoc CHANGES README doc/HOWTO
 }
diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch
index 492b88bee143..da90c738af69 100644
--- a/net-libs/canlock/files/canlock-2b-make.patch
+++ b/net-libs/canlock/files/canlock-2b-make.patch
@@ -1,30 +1,30 @@
---- canlock2b/Makefile
-+++ canlock2b/Makefile
-@@ -1,33 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,38 +1,39 @@
 -CFLAGS = -Iinclude
 -LDFLAGS = -L. -lcanlock
-+CFLAGS += -Iinclude
-+LIBS = -L. -lcanlock
- CC = gcc
+-CC = gcc
 -STATIC_LIB = libcanlock.a
++CPPFLAGS += -Iinclude
++LDLIBS = -L./src -lcanlock
  
 -all: hmactest canlocktest $(STATIC_LIB)
-+all: shared static
++all: shared
  
 -sha1test: t/sha1test.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +sha1test: t/sha1test.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -hmactest: t/hmactest.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +hmactest: t/hmactest.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -canlocktest: t/canlocktest.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +canlocktest: t/canlocktest.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -$(STATIC_LIB):
 -	cd src && make
@@ -49,20 +49,25 @@
 -	
 -test: all
 +
-+test: hmactest canlocktest
++check: hmactest canlocktest
  	@echo "hmactest: "
- 	@./hmactest > t/hmactest.out || echo hmm
+-	@./hmactest > t/hmactest.out || echo hmm
++	@LD_LIBRARY_PATH=src/ ./hmactest > t/hmactest.out || echo hmm
  	@diff t/hmactest.shouldbe t/hmactest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
---- canlock2b/src/Makefile
-+++ canlock2b/src/Makefile
-@@ -1,9 +1,11 @@
+ 	@echo "=-=-=-="
+ 	@echo "canlocktest: "
+-	@./canlocktest > t/canlocktest.out
++	@LD_LIBRARY_PATH=src/ ./canlocktest > t/canlocktest.out
+ 	@diff t/canlocktest.shouldbe t/canlocktest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
+ 	@echo "=-=-=-="
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,32 +1,35 @@
 -LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo
- CC = gcc
-+AR = ar
-+RANLIB = ranlib
+-CC = gcc
  LIBTOOL = libtool
 -CFLAGS = -I../include
-+CFLAGS += -I../include
++CPPFLAGS += -I../include
  SOURCES = base64.c canlock.c hmac_sha1.c sha1.c
 -OBJS = base64.o canlock.o hmac_sha1.o sha1.o
 +OBJS := $(SOURCES:.c=.o)
@@ -70,8 +75,10 @@
  SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2
  SHAREDFLAGS = -fPIC -DPIC
  LIBS = libcanlock.a libcanlock.so.2.0.0
-@@ -11,22 +13,25 @@
+ INSTALL = install
  
++.SUFFIXES: .c .o .h .lo
++
  all: $(LIBS)
  
 -libcanlock.a:
@@ -83,11 +90,8 @@
 -libcanlock.so.2.0.0:
 -	$(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES)
 -	$(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
-+%.o: %.c
-+	$(CC) $(CFLAGS) -c -o $@ $<
-+
-+%.lo: %.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) -c -o $@ $<
++.c.lo:
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(SHAREDFLAGS) -c -o $@ $<
 +
 +libcanlock.a: $(OBJS)
 +	$(AR) cru libcanlock.a $(OBJS)
@@ -95,6 +99,8 @@
 +
 +libcanlock.so.2.0.0: $(LIBOBJS)
 +	$(CC) -shared $(LIBOBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
++	ln -s libcanlock.so.2.0.0 libcanlock.so
++	ln -s libcanlock.so.2.0.0 libcanlock.so.2
  
  install: all
  	$(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib
diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 26edd65b5aa9..39b0384e14c1 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -4,8 +4,8 @@ DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0
 DIST davix-0.7.3.tar 4341865 BLAKE2B 8ba2855f7170ca24f4a15edc32562e47711304f48eaeb1e2870e1325396ae2b664f8af7a482986da6883ab5c92ab6e61034e8840baf3f59c3bd691e7e483fc7e SHA512 b7e7814066ca53c44c2aa0a0d1d6a2d995ea44d3d122da1d19f12849d8c2d4e91eafb40c18d4d18d1736a7c5c5099972519c08a6c7ab5b32300fc8a1fcdc5bfd
 DIST davix-0.7.4.tar 4343614 BLAKE2B 0fd618a4575cfdcbb0142b26ed8bd5ea0b8d880706ec6ebcc8e9a8755a8f392c715e2bc3cb25dd316fa90f06e7223ecd3e8272a0e5867eb2f5d74eec3053ddf2 SHA512 835d49f1729be95b88c1c422723a2ac6fa9fa0c4a85089e67d68a365c482bf648471fea000b90e7797add0809a9262b5c7275a965fde437bb8206154266fd970
 DIST davix-0.7.5.tar 4343329 BLAKE2B dfb71e0524e47a2378cd8a49fa4c7d209b8b658e8515f4f0750c9c98cb03073e2ff82a5fbdb2f7fb563f31671789cd7e9cb1656a16dfd0811934730961695db4 SHA512 4be448d6d28f315c0d098d9cf2ddf95bbd818659821935571d83dad1b2724b8f90b87be298ca8a7984cb57a88b18b0253e23f6e8cb192cd1792472993da36bcc
-EBUILD davix-0.6.7.ebuild 1506 BLAKE2B aceba7478b91996bb52fe4b7970b7aeb8419a7fc3f29481975a76eeb9d30e31df2971ed439be84dc2e803f7d152eaf0375cf2a9f0b295cd817b8e713f04e976c SHA512 a6e47ef1da6ddc3baaefa77b0be97a52f8b294929e2dc732e92d60635fab76aa2eda95ec5acded889e254d037aad5698e2c2189dfcc8fddc816d34c3c55a505a
-EBUILD davix-0.7.3.ebuild 1622 BLAKE2B 4bf101451170858ea1005626d38a907ffd8719897eda2078d6f838538bd8a21f300adb45316e81c03572ad718c71c0fb748a4d715c7127b6d2847998653efe82 SHA512 b8fb905d9c08c0dfa09d45ddeffb198b9d1c934a7d892383ceb8403809156015384d032efbf330f477655743108ae50f778aa49345985422a8606dca4176156b
-EBUILD davix-0.7.4.ebuild 1624 BLAKE2B e073022e62620ea2926cba34fd321375a0adc482d9bb27c6201b7df3a452aed6dcdc187f5132ef9835aeacbf9421cf0a4f1393d49c2a966790ecc702c53ec1ef SHA512 a738d2b68b5ea10a259c52a984e3b540bd7d79cdd7cf5976dff256acd0841755a1c87822ea1aaf2246b5fea4329b566e9200f72f9d757613846c3c9a7345109d
-EBUILD davix-0.7.5.ebuild 1624 BLAKE2B e073022e62620ea2926cba34fd321375a0adc482d9bb27c6201b7df3a452aed6dcdc187f5132ef9835aeacbf9421cf0a4f1393d49c2a966790ecc702c53ec1ef SHA512 a738d2b68b5ea10a259c52a984e3b540bd7d79cdd7cf5976dff256acd0841755a1c87822ea1aaf2246b5fea4329b566e9200f72f9d757613846c3c9a7345109d
+EBUILD davix-0.6.7.ebuild 1464 BLAKE2B b32265029d69d507c5f77b9cb71eab458ba320c588db0eba975716d7532d60aa7835f67fe8514b26bce288cc38805945030ccfe8431e0d05a4cf57ec638aefa0 SHA512 0bb2a2b3f57b8ad525df4b56481c173b3a53521cdb31bddd0b452846ea5a3559efd42521368d90f2f751f790218588e00161d582abf1ae1467d0567ba50009ec
+EBUILD davix-0.7.3.ebuild 1580 BLAKE2B 6cd6b4a7659b97a2aae3bdf070b2fff9b2040d1036b7042e761d7a7c0b094fab20d749fae91a4f2414d7097c3c9b582825034be26721b3870fe046b3746d206a SHA512 76db6ac1c00cffa869101602e882727e418c9aa2bc038f63abc230816807460c7bfe5e03de644697d973b3cc5e3c32d07e835f98387b60489a3151e31530e0b4
+EBUILD davix-0.7.4.ebuild 1582 BLAKE2B 2c5813eb32e5ccf9baa17068b660a3bf9a91f5f030a785ab9c4df6538906cc718218d5c6d479bdc419f81f456685787f3a2d488120e58fced625855eb88d0fac SHA512 d298da378194e83fcfbe266b206466f2dbf10a1c504f5e38515d2765045db36148392ec6dfe805dd5dff25f5fffc6dc006bb907cebbfb923d6bab76bf5753839
+EBUILD davix-0.7.5.ebuild 1582 BLAKE2B 2c5813eb32e5ccf9baa17068b660a3bf9a91f5f030a785ab9c4df6538906cc718218d5c6d479bdc419f81f456685787f3a2d488120e58fced625855eb88d0fac SHA512 d298da378194e83fcfbe266b206466f2dbf10a1c504f5e38515d2765045db36148392ec6dfe805dd5dff25f5fffc6dc006bb907cebbfb923d6bab76bf5753839
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.6.7.ebuild b/net-libs/davix/davix-0.6.7.ebuild
index 7bebb2047181..4eb8ff364a23 100644
--- a/net-libs/davix/davix-0.6.7.ebuild
+++ b/net-libs/davix/davix-0.6.7.ebuild
@@ -40,7 +40,6 @@ REQUIRED_USE="test? ( tools )"
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
diff --git a/net-libs/davix/davix-0.7.3.ebuild b/net-libs/davix/davix-0.7.3.ebuild
index 325471ef2fb5..1d6ee68badbd 100644
--- a/net-libs/davix/davix-0.7.3.ebuild
+++ b/net-libs/davix/davix-0.7.3.ebuild
@@ -45,7 +45,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
diff --git a/net-libs/davix/davix-0.7.4.ebuild b/net-libs/davix/davix-0.7.4.ebuild
index 610959a3bbd9..9aed78284960 100644
--- a/net-libs/davix/davix-0.7.4.ebuild
+++ b/net-libs/davix/davix-0.7.4.ebuild
@@ -45,7 +45,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
diff --git a/net-libs/davix/davix-0.7.5.ebuild b/net-libs/davix/davix-0.7.5.ebuild
index 610959a3bbd9..9aed78284960 100644
--- a/net-libs/davix/davix-0.7.5.ebuild
+++ b/net-libs/davix/davix-0.7.5.ebuild
@@ -45,7 +45,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
 		-DENABLE_HTML_DOCS=$(usex doc)
 		-DENABLE_IPV6=$(usex ipv6)
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index eb0758897b5e..7dae621b57b7 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -1,30 +1,14 @@
 AUX grpc-1.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5
-AUX grpc-1.13.0-fix-host-ar-handling.patch 1654 BLAKE2B cb4172a31dbec91667661c1bbe4830a5485816f649f48637706de22502efc3f8d328a414e141b35c83b2b1f70b0b383d5e44caea8fc1de764d47671c064b8520 SHA512 67cd7832669b067e4acb85c01e46e9710a3e65523d84b5f932baed77c20c4bcf270bed77dd842610b7e0ceb36dbaa729912bd84e9496e172325714d9a55bc499
-AUX grpc-1.15.0-fix-cpp-so-version.patch 4772 BLAKE2B 96efd477c385c7a4714025081288576f8ef4fbba691257e3638e85b850c20b1db9a72de6fb9f85a8b6b3f4f990dd4456ada838ce6ccd01d4bb5043071926eec9 SHA512 49c5da5883a6e8aac6d37fb1920b6b8af23ec9f45c1dd9c337e1a9455adb1eded0ed3763003818ab261fd367e38b705af0dd409d01b97060b1e5020228acef2c
-AUX grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch 3039 BLAKE2B 1da27e75874229261115b174b168e0b478add3c844c58e81a84bf74b699447310decda09e0cad89056a3f5d7fcc8d0bb1835889438ee8efab89471c66a77b69a SHA512 a6f59a3b518310c6150439fba5ad058048540f0f84152406f607873248e3e0d95cc0077b634164f4bdf391427c847614dd88e2ddac9feded0aa23044ea58c051
-AUX grpc-1.16.0-gcc8-fixes.patch 2323 BLAKE2B ef938aee88c894314313749e070e443462005a0add69abf463e93f7d414360135d399dea3f7cbb282150f1e03a6e2df33ad9965327392aed32d76c2875f976c3 SHA512 ad46c4187604212d628004cc783a69d95e4378e83e2673fd99265f2929a000429a269abdb98936ad5611fe9d99df581ff5f122f51661227d13d9e7145ee0a40c
 AUX grpc-1.21.0-fix-host-ar-handling.patch 1827 BLAKE2B f85c3c291f6a62b1b8edd4995bd3870ff8f7aac309d72842ab0e8a3bada377b049422e00d95e420b466fe64d2fe6e6ec44d87d0878805111e87cb2d603e909bd SHA512 2c54890e7c167359c2ff40541d3d071edf0775bcc14594c0ad132d17715bc75d2f9e946751f082dab0e9ff0ee73a9650f6bbd850bd34b2162254bec524d10493
 AUX grpc-1.22.0-cxx_arg_list_too_long_forloop.patch 1850 BLAKE2B b0a681c79bb4ee7cdb686718b4a789ef9aa63d342d5c2ae97beb648da7e1c393c5085def5594ec3361b50e79cf158fe3c557c6da1d979fa42e07fc482e683133 SHA512 3149797334f06b79fccb11ab9c4b18a5c5c4263ba36b01d3edb29981f562937fd3b4cf90ecc34188798da5ea6ae564a34161819e499b665425aadcd3995209e5
 AUX grpc-1.22.1-glibc-2.30-compat.patch 3169 BLAKE2B 35e3631c607994ee8519c2794f75f3e2a33f6b65aefcea508f15ba5e22fbf4fe8e0d3df6f5eae4cf08357b5f231db926b525c38b714b3fb7f5916c3ccc262b87 SHA512 cd9f507d6101e356f1fa5d5f502f49ab3c3988acdaea68de5359cbb0de4f4d50983b084cd0612cb5f1a27319076a87252328fcafb0dc47160914be8833d28d9e
 AUX grpc-1.25.0-pkgconfig-libdir.patch 2199 BLAKE2B 4625e03eeeab9235fa1615bdfc485a5a0f0304ce4613b3f0ec0d0edf0d12d04d48a34fd30e680ff48bc1a7a7838d1b1b51ce58921a20472b5be0ad60dbce23e2 SHA512 93077a0cd6fd48694238b42fc60c2c986232ff863b09d068aac3f813733de5a7b4d3ac32929ad4e58e93e2990d5903cdf0b7491a0ea924402262d04b75fdb57a
 AUX grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
-DIST grpc-1.16.1.tar.gz 14442310 BLAKE2B 7ee9dc8f146a11009024786f3aa80205eb9a29576dd96fe719b7417eafcdacab703f0eaa73f009c98a54968c4d6079f612fa2b581e236d12fd55013c7c01fd5f SHA512 2bfc3aba316eac7d741944826a5cd4de6aa6ccf05e8023383cb9d8cd374ff1961c75b0371edf088d47c8a797ed64c35bd64b7b22f388a62ece9ecef55f4ea56d
-DIST grpc-1.17.1.tar.gz 14626262 BLAKE2B ce44f15bfb7f8cb9b7f0f2a1919d218a99dbc4c599d912459c2b5ca46b386b2446018f22d0d28886769dec16b5eadb8140b78e584ecfd5bb2cc6aa63dcb45ece SHA512 45ba731fd4d1bc3cf590511e53ea6a73de6970f4bb379eb0ef90d550cdc13358f673ead8c6877c02c71dccdba914ad4765c58e173e0dd7895b5d25ebbad38e8e
-DIST grpc-1.18.0.tar.gz 14690365 BLAKE2B ec2992e3b80ca10f9d0250510930d4f2b5f7a9593a8245927aafe77b29b028e4a4a2f32162af08fd4e2077d48b9e0e32e772901f5f524247f7d6910e74c2a120 SHA512 2489860a395b9f59d4eb81db5a8d873683e317145ad140b72fabb13693e166c122ce8526d34e2380a52d18493e8b2b49d6d28e53878af2c43523a5791da8fe52
-DIST grpc-1.19.0.tar.gz 14793251 BLAKE2B b3a3db91f6c54126a51e27bd474d05bc672c5f71f131581ddea60ded64b247d69bdc4edcc974cbce7af71e78c4579a7b6ad0c618ac3aeb9b0ff7743b039658f7 SHA512 6a61373e5c407ee147ea755b9992f96801695d0b94e6d34305fc09afe9987ae6d4a70a0757bd903734f549604bda26b41582e6938b1654598429abc4cc3a3b90
-DIST grpc-1.20.1.tar.gz 14930355 BLAKE2B 5b1bf2250d2b052498cfad9fc96134fd9b0065c98d73957427347aff4fe170f9a3d323c9f8797311c570a25bd9ff79f80da610e32b638c6409d2cd5dfbeb4eef SHA512 e0dd0318d2b4ec07e0eafffa218938d91b1440c5053a557460ea7fceaab3d76f0cccc1d595abe7de9fa79f068b71cfbc5a28a3b688bc9c1e2737086928149583
-DIST grpc-1.21.1.tar.gz 15043553 BLAKE2B bed23af6606a69eb02a033d5dd6d92e3e080cc68ddae3c700872b8036cab594fd79c2396eb4ac84df2c5ea9eaf5ec0401d820667a7de0e9e2b376c0df4d4e9c5 SHA512 b9ea81a97416d9c1ef4d49e5f222f309b00d383f643f3bf342b6ad97f88e08e212e19db75e4a74fc5c23799dbe76dd0a9d6d4c9310e8cb1e007622a78d7a7114
 DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b9e56f8012795000c30f20fa4d5c1bad37d117cf8ea54fb372b8b02702a866c027c6e0a467f276a752ee9d17c6 SHA512 086ceb7a4fc1439bd23a2cab8c90ba2542491d5a9c278a0ff6e1b3ad623cf7725b2a7310bb793d9b36882bd9394d02a3616331ac26c78d822e68b305c2ae27f6
 DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
 DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c
 DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61
 DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
-EBUILD grpc-1.16.1.ebuild 2405 BLAKE2B 1f3e8e9383fcb1f4eb371abde99377f653aeac44dba6e268dcf760b3e2cf20015d08965f9a8b3a2ed1fc31626326239634977d6ecfea893b9e2ca5de2e2d6034 SHA512 695ea5cbd96bb1b49cd562677911d43cfdc78f9ca95240b9103e09f8027f75eb1effbf755adb0487f8a833cbd41d4b1c0ec2de31fe9069be049198b9c526c2d0
-EBUILD grpc-1.17.1.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
-EBUILD grpc-1.18.0.ebuild 2429 BLAKE2B 93fe25019af590bda3d797f01bba8c0a30a8e525019fad3f8f663fff471b3225329021151231fe33693765423fbd33959cd571fa098e81b35a81c3b3f2324001 SHA512 62e3d01e1c7fd2bef09b48012be9ddcb4d0335e113ec35ef843e85a92d2a824b71a4669929e0510ff340cbd641a829b88472d33f09509399e4c562628a4def04
-EBUILD grpc-1.19.0.ebuild 2396 BLAKE2B 4a63200218f221390ec05f50699768c68110a460ae43d1b4122924a1c3ce1f16c0fdd0864592c45d423395cc5d4541692202aa05ea3341747eaea1cf5eb3ee2e SHA512 76dfe9ccb26eafcfa67fecf81d155fd35ccf390b46fa756a0475f3929c200d8a3e98af7e12d99f598f9a966505365194f6facb5cf38969d38dde307cb23e80f9
-EBUILD grpc-1.20.1-r1.ebuild 2413 BLAKE2B 283f25fd00b590bcf935841f3f8ebbb3d955dc7041e303b8ac45d9b9415bb2792e21086e6f8ea214498224f50b0f6aefc9dad75a3a8bba14fc502c1432f2e120 SHA512 8c43c88a01143466e5cdb11b224da94b544becf0d7b73e247554b371445a1fd8462af9889d7fe343a508e4a4cc2560828ebea02ca03b4c4781fcddd6a4401c96
-EBUILD grpc-1.21.1-r1.ebuild 2505 BLAKE2B 23b382c761d81822080ef873517dfece795056356a8da4218a7c82489525563caa5b660ac23d4a7b45b35648d7d6c0d8cc3a1d36454c2595fbd294802115ca61 SHA512 e162969923aa7c9e9ef27ce35b22a57d93f1cea297b4b4fe4667a912cbf9a953738da5beb223e36c041648ee809e3073e26b41a37b0242179cdc61fa0bf1e64e
 EBUILD grpc-1.22.1.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.23.0.ebuild 2639 BLAKE2B a915221d71d7290199f338ab2ab0d797dd9732890b16f38105e520fb1d6c6fbc11a8cea56e3d6bdd7d212bca80f7d6c6258f9e7b2d10e9a201663afbfd767a90 SHA512 61ea5fd71406acba3e8b7b2fabecbdecd2d9f03fe0a0562d5be8beb3c178f5e76a947821192943ba2b7568cf2ad1ff2bd2c0dfce8cf550ca727c3dfd3401dfe4
 EBUILD grpc-1.24.3.ebuild 2546 BLAKE2B e674d2495e07f5eb4f210dd1bcec87549987460a4340723160c5e04c8b8874b17b9a39d8c890c602eef96d82853e98c7effac8e9766cd196df6c6116145e81ae SHA512 94dab7dafaea4f86de5609d912616033ce9cee674e430af358b2c94d2415f8f008141b523039b8252c1864e72792b837c30782f1c874dbbbd9c5582e2e38bbb0
diff --git a/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch b/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
deleted file mode 100644
index 926952f47f2a..000000000000
--- a/net-libs/grpc/files/grpc-1.13.0-fix-host-ar-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7e2d98df390787797fa494b26c72896f16f6e2a6 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sat, 30 Jun 2018 00:21:53 -0700
-Subject: [PATCH] Makefile: fix host ar handling
-
-Cherry picked lines from
-https://github.com/grpc/grpc/pull/11476
----
- Makefile | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8333858588..b5a44b7096 100644
---- a/Makefile
-+++ b/Makefile
-@@ -328,6 +328,7 @@ HOST_CC ?= $(CC)
- HOST_CXX ?= $(CXX)
- HOST_LD ?= $(LD)
- HOST_LDXX ?= $(LDXX)
-+HOST_AR ?= $(AR)
- 
- CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
- CXXFLAGS += -std=c++11
-@@ -444,6 +445,7 @@ HOST_CFLAGS = $(CFLAGS)
- HOST_CXXFLAGS = $(CXXFLAGS)
- HOST_LDFLAGS = $(LDFLAGS)
- HOST_LDLIBS = $(LDLIBS)
-+HOST_AROPTS = $(AROPTS)
- 
- # These are automatically computed variables.
- # There shouldn't be any need to change anything from now on.
-@@ -6886,10 +6888,10 @@ $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: protobuf_dep_error
- else
- 
- $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP)  $(PROTOBUF_DEP) $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
--	$(E) "[AR]      Creating $@"
-+	$(E) "[HOSTAR]  Creating $@"
- 	$(Q) mkdir -p `dirname $@`
- 	$(Q) rm -f $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
--	$(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
-+	$(Q) $(HOST_AR) $(HOST_AROPTS) $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a $(LIBGRPC_PLUGIN_SUPPORT_OBJS) 
- ifeq ($(SYSTEM),Darwin)
- 	$(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libgrpc_plugin_support.a
- endif
--- 
-2.18.0
-
diff --git a/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch b/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
deleted file mode 100644
index ba2ca651f0c3..000000000000
--- a/net-libs/grpc/files/grpc-1.15.0-fix-cpp-so-version.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a443abbdbbd402951138bb8fcb2a4f159b920fcd Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 12 Sep 2018 11:22:48 -0700
-Subject: [PATCH] Fix cpp soname symlinks
-
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4e993782ee..09bd52e8ad 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3050,7 +3050,7 @@ install-shared_cxx: shared_cxx strip-shared_cxx install-shared_c install-pkg-con
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3059,7 +3059,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_cronet$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_cronet$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_cronet.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3068,7 +3068,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_error_details$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_error_details$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_error_details.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3077,7 +3077,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_reflection$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_reflection$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_reflection.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3086,7 +3086,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpc++_unsecure$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpc++_unsecure$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpc++_unsecure.so
- endif
- 	$(E) "[INSTALL] Installing $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP)"
-@@ -3095,7 +3095,7 @@ endif
- ifeq ($(SYSTEM),MINGW32)
- 	$(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/libgrpcpp_channelz$(SHARED_VERSION_CPP)-dll.a $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.a
- else ifneq ($(SYSTEM),Darwin)
--	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.6
-+	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so.1
- 	$(Q) ln -sf $(SHARED_PREFIX)grpcpp_channelz$(SHARED_VERSION_CPP).$(SHARED_EXT_CPP) $(prefix)/$(INSTALL_LIBDIR)/libgrpcpp_channelz.so
- endif
- ifneq ($(SYSTEM),MINGW32)
---
-2.18.0
-
diff --git a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch b/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
deleted file mode 100644
index fd9f91419542..000000000000
--- a/net-libs/grpc/files/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0892788776d60d92a0cddcd22078779166b736db Mon Sep 17 00:00:00 2001
-From: Dario Berzano <dario.berzano@cern.ch>
-Date: Thu, 5 Jul 2018 11:27:20 +0200
-Subject: [PATCH] Prevent shell calls longer than ARG_MAX
-
-This patch we breaks the relevant paths array into multiple shorter arrays in
-order to make the shell calls succeed.
-
-See grpc/grpc#14844.
----
- Makefile | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 54823a31167..25eb092d996 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2946,8 +2946,14 @@ install-headers_c:
-
- install-headers_cxx:
- 	$(E) "[INSTALL] Installing public C++ headers"
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
--	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX1), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX2), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX3), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) -d $(prefix)/$(dir $(h)) && ) exit 0 || exit 1
-+	$(Q) $(foreach h, $(PUBLIC_HEADERS_CXX4), $(INSTALL) $(h) $(prefix)/$(h) && ) exit 0 || exit 1
-
- install-static: install-static_c install-static_cxx
-
-@@ -5278,6 +5284,8 @@ PUBLIC_HEADERS_CXX += \
-     include/grpc++/support/stub_options.h \
-     include/grpc++/support/sync_stream.h \
-     include/grpc++/support/time.h \
-+
-+PUBLIC_HEADERS_CXX1 += \
-     include/grpcpp/alarm.h \
-     include/grpcpp/channel.h \
-     include/grpcpp/client_context.h \
-@@ -5325,6 +5333,8 @@ PUBLIC_HEADERS_CXX += \
-     include/grpcpp/support/stub_options.h \
-     include/grpcpp/support/sync_stream.h \
-     include/grpcpp/support/time.h \
-+
-+PUBLIC_HEADERS_CXX2 += \
-     include/grpc/support/alloc.h \
-     include/grpc/support/atm.h \
-     include/grpc/support/atm_gcc_atomic.h \
-@@ -5376,6 +5386,8 @@ PUBLIC_HEADERS_CXX += \
-     include/grpc/impl/codegen/propagation_bits.h \
-     include/grpc/impl/codegen/slice.h \
-     include/grpc/impl/codegen/status.h \
-+
-+PUBLIC_HEADERS_CXX3 += \
-     include/grpc++/impl/codegen/async_stream.h \
-     include/grpc++/impl/codegen/async_unary_call.h \
-     include/grpc++/impl/codegen/byte_buffer.h \
-@@ -5406,6 +5418,8 @@ PUBLIC_HEADERS_CXX += \
-     include/grpc++/impl/codegen/stub_options.h \
-     include/grpc++/impl/codegen/sync_stream.h \
-     include/grpc++/impl/codegen/time.h \
-+
-+PUBLIC_HEADERS_CXX4 += \
-     include/grpcpp/impl/codegen/async_generic_service.h \
-     include/grpcpp/impl/codegen/async_stream.h \
-     include/grpcpp/impl/codegen/async_unary_call.h \
diff --git a/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch b/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch
deleted file mode 100644
index 0afd8254dec0..000000000000
--- a/net-libs/grpc/files/grpc-1.16.0-gcc8-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 807a938a576ec52bc8c971100b2da26b059d9347 Mon Sep 17 00:00:00 2001
-From: Tobias Jungel <tobias.jungel@gmail.com>
-Date: Wed, 22 Aug 2018 21:14:46 +0200
-Subject: [PATCH 1/2] mitigate gcc8 -Werror=ignored-qualifiers
-
----
- src/core/ext/transport/chttp2/transport/flow_control.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
-index 53932bcb7f5..4b1862735d6 100644
---- a/src/core/ext/transport/chttp2/transport/flow_control.cc
-+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
-@@ -190,7 +190,7 @@ TransportFlowControl::TransportFlowControl(const grpc_chttp2_transport* t,
- uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) {
-   FlowControlTrace trace("t updt sent", this, nullptr);
-   const uint32_t target_announced_window =
--      static_cast<const uint32_t>(target_window());
-+      static_cast<uint32_t>(target_window());
-   if ((writing_anyway || announced_window_ <= target_announced_window / 2) &&
-       announced_window_ != target_announced_window) {
-     const uint32_t announce = static_cast<uint32_t> GPR_CLAMP(
-
-From 5a03e7f10145c6591f313055907a9cf26ccb9234 Mon Sep 17 00:00:00 2001
-From: Tobias Jungel <tobias.jungel@gmail.com>
-Date: Wed, 22 Aug 2018 21:17:01 +0200
-Subject: [PATCH 2/2] mitigate gcc8 -Werror=stringop-truncation
-
----
- .../client_channel/lb_policy/grpclb/load_balancer_api.cc       | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-index f24281a5bfb..8c064214729 100644
---- a/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc
-@@ -68,7 +68,8 @@ grpc_grpclb_request* grpc_grpclb_request_create(const char* lb_service_name) {
-   req->has_initial_request = true;
-   req->initial_request.has_name = true;
-   strncpy(req->initial_request.name, lb_service_name,
--          GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH);
-+          GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH - 1);
-+  req->initial_request.name[GRPC_GRPCLB_SERVICE_NAME_MAX_LENGTH - 1] = '\0';
-   return req;
- }
- 
diff --git a/net-libs/grpc/grpc-1.16.1.ebuild b/net-libs/grpc/grpc-1.16.1.ebuild
deleted file mode 100644
index 6ab28ceba67a..000000000000
--- a/net-libs/grpc/grpc-1.16.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.15.0-fix-cpp-so-version.patch"
-	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.17.1.ebuild b/net-libs/grpc/grpc-1.17.1.ebuild
deleted file mode 100644
index a5959280313b..000000000000
--- a/net-libs/grpc/grpc-1.17.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.18.0.ebuild b/net-libs/grpc/grpc-1.18.0.ebuild
deleted file mode 100644
index a5959280313b..000000000000
--- a/net-libs/grpc/grpc-1.18.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-gcc8-fixes.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.19.0.ebuild b/net-libs/grpc/grpc-1.19.0.ebuild
deleted file mode 100644
index a0877fb616b1..000000000000
--- a/net-libs/grpc/grpc-1.19.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	dev-libs/protobuf:=
-	net-dns/c-ares:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.20.1-r1.ebuild b/net-libs/grpc/grpc-1.20.1-r1.ebuild
deleted file mode 100644
index d8c812cd259b..000000000000
--- a/net-libs/grpc/grpc-1.20.1-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.7.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.13.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	emake \
-		V=1 \
-		prefix=/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		AR="$(tc-getAR)" \
-		AROPTS="rcs" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LD="${CC}" \
-		LDXX="${CXX}" \
-		STRIP=/bin/true \
-		HOST_CC="$(tc-getBUILD_CC)" \
-		HOST_CXX="$(tc-getBUILD_CXX)" \
-		HOST_LD="$(tc-getBUILD_CC)" \
-		HOST_LDXX="$(tc-getBUILD_CXX)" \
-		HOST_AR="$(tc-getBUILD_AR)" \
-		HAS_SYSTEMTAP="$(usex systemtap true false)" \
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-}
-
-src_install() {
-	emake \
-		prefix="${ED}"/usr \
-		INSTALL_LIBDIR="$(get_libdir)" \
-		STRIP=/bin/true \
-		install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/grpc/grpc-1.21.1-r1.ebuild b/net-libs/grpc/grpc-1.21.1-r1.ebuild
deleted file mode 100644
index bf11250c29cb..000000000000
--- a/net-libs/grpc/grpc-1.21.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_PV="${PV//_pre/-pre}"
-
-DESCRIPTION="Modern open source high performance RPC framework"
-HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc perftools systemtap static-libs"
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
-	>=dev-libs/protobuf-3.7.0:=
-	>=net-dns/c-ares-1.15.0:=
-	sys-libs/zlib:=
-	perftools? ( dev-util/google-perftools:= )
-	systemtap? ( dev-util/systemtap )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-# requires network
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
-	"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
-	"${FILESDIR}/grpc-1.11.0-pkgconfig-libdir.patch"
-	"${FILESDIR}/grpc-1.16.0-Prevent-shell-calls-longer-than-ARG_MAX.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	rm -r third_party/cares || die
-	sed -i 's:-Werror::g' Makefile || die
-	sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
-
-	default
-}
-
-src_compile() {
-	tc-export CC CXX PKG_CONFIG
-
-	local myemakeargs=(
-		V=1
-		prefix=/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		AR="$(tc-getAR)"
-		AROPTS="rcs"
-		CFLAGS="${CFLAGS}"
-		CXXFLAGS="${CXXFLAGS}"
-		LD="${CC}"
-		LDXX="${CXX}"
-		STRIP=/bin/true
-		HOST_AR="$(tc-getBUILD_AR)"
-		HOST_CC="$(tc-getBUILD_CC)"
-		HOST_CXX="$(tc-getBUILD_CXX)"
-		HOST_LD="$(tc-getBUILD_CC)"
-		HOST_LDXX="$(tc-getBUILD_CXX)"
-		HAS_SYSTEM_PERFTOOLS="$(usex perftools true false)"
-		HAS_SYSTEMTAP="$(usex systemtap true false)"
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myemakeargs=(
-		V=1
-		prefix="${ED}"/usr
-		INSTALL_LIBDIR="$(get_libdir)"
-		STRIP=/bin/true
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use examples; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		find doc -name '.gitignore' -delete || die
-		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 1.16.0; then
-			ewarn "python bindings and tools moved to separate independent packages"
-			ewarn "check dev-python/grpcio and dev-python/grpcio-tools"
-		fi
-	done
-
-}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index f955755cddc8..82ffc91f3703 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,3 @@
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
-EBUILD gupnp-1.0.4.ebuild 1944 BLAKE2B afe621fe5e42a61db2c38156adc1018c0171e95b0a25535f44f0afd3e7d7543eaf15e120c63d63cfbb410725eb30d1eb3cebe0c5dec3335a8174d52cba288ba6 SHA512 7298438379023f729d3d20bbdbb20aad25c159a08fe787bdde804f8ad9295708ebf8b336f1541860b10467f90787044b1e6b1910a77ce2657584f8f2457eb39b
+EBUILD gupnp-1.0.4.ebuild 1940 BLAKE2B 804a14ef78d457d699ba6df7ecc9a15ca80162aa3e9c41fa51e6f7991ad9c1f4effe819bcbf52728d9def24fd12db3a505a3216224e2f3c9198a18c3e8849e9e SHA512 4eaf6306c791b84e6c3bac9cb83892b12a44fab27c454763ae38fae4ed9012b0f03a7c42824677f427d0add0155c491ab370767faa24f368fe5f1fea763e7a4f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
index a559d480cc22..f1bcbce03df3 100644
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 multilib-minimal python-single-r1 vala
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index 29f6b8ec213f..74a1e2d3cb6d 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -1,8 +1,10 @@
 DIST http-parser-2.8.1.tar.gz 50731 BLAKE2B 1c4f3f61550f7f8e86d7b47e3986754a108dc979c6232d87ac418f9f8295b88ee43c4a5af150460f707e6ade01f5d435801f980ccbff93369ee0a9dc2eb60656 SHA512 6f52f543d979f39688ccefae236527a8183929b3d30f5370570107b01cf89d0338b448249a81102b78d31615d2e8f6e7c708f8961f55ece08e7d3a40e5ad0883
 DIST http-parser-2.9.1.tar.gz 51300 BLAKE2B f99c3e6a764ea0870359b43aac7f31691faef9cc6be3fb99426a3c1e3f24ae50689dfd8e46fa52a22d713780476130ee6fae6294b83cc3526bb5131cf16b98f2 SHA512 110a1861666cdd45857c3ab0e9bf8a3eb9d98f86fe001f7c620009e13186377de805d295f7751921cd5c9d4c2781807b3ae00f939af04d7365a3a45aa20b5052
 DIST http-parser-2.9.2.tar.gz 51298 BLAKE2B 5d37ea197acbac468de03081010fb3b755a093085e56c9fa5a3d4dbd70dd2903335a8113ec21664ca54a74aac4cbbb1cc64b861d021df944790453c2de9baaab SHA512 fe21ba46c9297b55a6382497b689da2af88999a9a5716ffef0731057ce1bb053056e4f20147284c78338e48ed1a793a0270fe0edfe3f4b589926e3ede603d023
+DIST http-parser-2.9.3.tar.gz 51973 BLAKE2B c46160e811874f3d4d2a7390e3b64520c7c01d51f74fb608ca8972ffe264cc389b744c1b6d8b5b6a7c9d7816eb95c179a9c210ba1a122ac4fa95996308d667af SHA512 d200c52f594192ba80a8d5b59d414404843f8601dac647f29c27845db75ac1f015789031e30e91aaab5b553af1ee6af50b90f9342a444c10c1027e10fdb9a31b
 EBUILD http-parser-2.8.1.ebuild 1009 BLAKE2B dab1aeac7fc07cabadc19ae29050975d5f7712b260f314e06115f9367287edd0a8b524706a6817ea0a90d2a29fa8bb2d5d132dedf21b1d7476a8635e963346bf SHA512 b764290864401b181216c761847f54903671c19f2ebbe45de9d736e2c8fb02758054364970f9b1f913081004495087049c282130679536b785a877951a036688
 EBUILD http-parser-2.9.1.ebuild 1014 BLAKE2B 303409bf197182a0a4afa540e5c522abb4ecbbb677a5d79b5419a94b44dfc10ef2e08a24518961aa425817751cdf2c207fe50721be016ce912af524a1b16f45f SHA512 ed2453a71d655e2b2f5ac9157d7d056a8ed73272f2ca8405a079782be1fd2ac92a640649ee2b078b20b375e5be512889fcbd5c56df3f067dae294f34c538b283
 EBUILD http-parser-2.9.2.ebuild 1011 BLAKE2B dfa48329f6c92622c5368b939fad36e1cc5eb1411a088eb3040e62bc6cfb2804a1a216ce8e12041b807068446aeaf6d7d3470f0cdaf4ddd66eb27a7b9729b100 SHA512 ff635a86de6ceaee6a71fc7b501ec9e133b9b46531db0b1fae4f424098570bb8f29c06a1bf5e9a47b458c810fc790dcbe64a79361f797418b4c2b808a85f4f39
+EBUILD http-parser-2.9.3.ebuild 1014 BLAKE2B 0e49d3893d32f53525a8e568706d57d1e65e32220cbaca91c52283e724b52f149fbe2263fb428431c9c1da61463899dba1e3454cbb47ab6803d14ac033e2dde4 SHA512 c85c7b57215496c937724f84f317ba21189aa04a9f41cbeeed5917fbb4ef9db3f77d34ea3f628166a023d3b1dbb453e2c4783b764c02e7f43b4b7532d7d5a410
 EBUILD http-parser-99999.ebuild 874 BLAKE2B 7ca6132687ff6da292034c94565f29c11ab2c32e2391daa1b984463828b7254fc3f3b9399063a2f37b344969520ba00fd3f8617c111a691e72eaff9731ef9c11 SHA512 9ff2b79fc825ffb0d5c047c02381a03ad8b42c24bb2e3c1bc5feace6f751f91910d66b259d2ad66b704d868e08086c6de2b1aa89f6508d99de7ee497d39832f9
 MISC metadata.xml 289 BLAKE2B 805f4cc8d1b3649e03fe78b6b9b54e24bb9fd20ce85ebfd26e0b3876a9694de33790fc36fcadb0776a3fffec46b9b9083b419e8db54f19d4f624b9892130e5e8 SHA512 099cab401d2a3b0f7ca10fdbb5d31a9cc1f14dc016d75cfdcce122b6c3250cf17ef0215ca92574b1e64d4dc9bb460b3286be1b6a6d123acd0511a3c25c34a022
diff --git a/net-libs/http-parser/http-parser-2.9.3.ebuild b/net-libs/http-parser/http-parser-2.9.3.ebuild
new file mode 100644
index 000000000000..28a3330d367a
--- /dev/null
+++ b/net-libs/http-parser/http-parser-2.9.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="HTTP request/response parser for C"
+HOMEPAGE="https://github.com/nodejs/http-parser"
+SRC_URI="https://github.com/nodejs/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/2.9.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+	default
+	tc-export CC AR
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS_FAST="${CFLAGS}" library
+	use static-libs && emake CFLAGS_FAST="${CFLAGS}" package
+}
+
+multilib_src_test() {
+	emake CFLAGS_DEBUG="${CFLAGS}" CFLAGS_FAST="${CFLAGS}" test
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	use static-libs && dolib.a libhttp_parser.a
+}
diff --git a/net-libs/libasr/Manifest b/net-libs/libasr/Manifest
index fd11141cf00c..aa989af051d3 100644
--- a/net-libs/libasr/Manifest
+++ b/net-libs/libasr/Manifest
@@ -1,3 +1,3 @@
 DIST libasr-1.0.4.tar.gz 413258 BLAKE2B 971dabb83e322808344c4b53622623556f662c6ada200862469dcfe4f0277ade438b39e0c0e19d372622dfd3c3bc69c2bf1ca22200e6318c062f280f72efc15e SHA512 6f189f9f492da8204396fe1246b4a0162751b2060a881469649ecf987b7ac1cc834193d2052e80a09bf94fedc8fc64123e9dfcfe3a2e4395f9e26d37afc84501
-EBUILD libasr-1.0.4.ebuild 397 BLAKE2B c54a538c3378209f7f69a97912d9dcbb6bbfea4f11ab22b983826d6d1f0bf34a07b691f993675e65580a42fb985b4d7f4ce86325a22020da11ab89b7370aa766 SHA512 6ca184cb4d5bc22ebdef9cad546336aaca5fec5812cdf10315e39d4a1e2d0af5ce7ff8eb0c3698f73ce815be663a6f94f298c7f55b4eb316dd367e90e9edc78f
+EBUILD libasr-1.0.4.ebuild 404 BLAKE2B d1fb56eb16ba3d9ab9472e7955abe62aad7e7e05e205ef73e117b25b28d6780ce17c3a0d17006b98490e78bff6b0a413ac6532e8721eda5337d7a1fa3cfda25d SHA512 b484bdc6d0c10187212eb81f5721a6ce205045fce4840d1d078a5f073d3fc7d9b1bcd4c0c93305bf06bafe823d3048943117fc3a61e1ed4bc617ca5e55c1a04a
 MISC metadata.xml 331 BLAKE2B fb0ff46381f7fa14f0fd15ffda08e378a5a88e9771ce464ad813e4c8cf7d2146ca45b2c2cc8c13756bdae2413758f7cba2c68cf4752405359f311eca700c7fbb SHA512 dedfef00a1e0f26438a1e0fbc9b53fc64566bd6def05260410d21aa3ff941ef0c5c9dbc205b3516052b0409943acbfb431e4702c87d1c94e9950ab9492f68850
diff --git a/net-libs/libasr/libasr-1.0.4.ebuild b/net-libs/libasr/libasr-1.0.4.ebuild
index 8c80ebc66324..87b8e9693bf9 100644
--- a/net-libs/libasr/libasr-1.0.4.ebuild
+++ b/net-libs/libasr/libasr-1.0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-libs/libgadu/Manifest b/net-libs/libgadu/Manifest
index e173f6527847..b80d4bb1bfa8 100644
--- a/net-libs/libgadu/Manifest
+++ b/net-libs/libgadu/Manifest
@@ -1,5 +1,6 @@
+AUX libgadu-1.12.2-fno-common.patch 907 BLAKE2B 22e147267c88ba1bd7fc1f289332517f7ea72f684fcaab1a74a0da0ee7ab8a1dc8e6e3fc5dd9853e22c11e326c65d08ff26a6f6fe85d44843398b6d574cbf629 SHA512 f4179768b86b80d71b6ede4608bbb598f7ec2d9d5e901d925436faea997ce23358707910a9b4f7adc1f290c369d2ae664f74f96b01de35e8220e96a79c5c26b7
 DIST libgadu-1.11.4.tar.gz 210937 BLAKE2B 05719b31f1d3ffd7df059d33597943787c1f10ac1dea89dce893050719394e1f2c7b5858b4ff3d0d2421bf68c977d4dfafd20689b3a7c0dc2c0593cb4d49599c SHA512 3fc8e414470864eb953d6d0d7dc6071679907c435d76e05a0b95a2e58365fc795427679f893d337dbf9896611a6bf68047c36806b977643cf4a773d930916639
 DIST libgadu-1.12.2.tar.gz 298884 BLAKE2B eee364204e9106b080a62ed4e180739b4dd9f2699fe3ddcb36493e3e29cc4e8074df17601900372c0a68da4b119f938521d4dd33baf730b279a13d80f74dbbee SHA512 d3b4fde94327ef312b1df668b8eb73fea9325c9258d85aa65e2746b73f00c2606ebe23f3330493a135a0fec1d0f24988f0cec607d4d899d880853ee8bf60e677
 EBUILD libgadu-1.11.4.ebuild 1292 BLAKE2B 40404179c96488fed718be19f910d1829a14b46faaf3450c65fcd42d7b590bc060bc772999d8153f67a61bcda31e413a934f599de47ba9aa767b84c307d3b3e4 SHA512 441fcacc738c922f50fae46c0b12baf43a5cbea937f401ad73978e248906ad48de4a0ddf8f5406bf97a13904919708070b602057fc1e06211ba64027483583e2
-EBUILD libgadu-1.12.2-r1.ebuild 1120 BLAKE2B dd5e351f16b7939df2ea3df069bce09c3753a70623740bfa91c1517e6ed2d56ae71841872ce6831a807e68727beae0dd343cff23f59273ea13e282769f84c21c SHA512 be04f5871e20b5d1bb2c05972e7f1e469a4a42c0b8afa2ab205424061e220df0d7baabaa27e3a809d012ba287c8b279e7fad0e599f0a611d9cf788ee20e02731
+EBUILD libgadu-1.12.2-r1.ebuild 1167 BLAKE2B 37e131e94ebd3160681005136154a834b2d70fa4bb35152bae5e44b299e8576ea539044445caf89ed017df2093cedb7ad44505fe43c5bf43381086e51779e9fa SHA512 59a72cd119e8c22091a8b7e7f728376e31f826291fefd3441955a84a625897659658ce199991e86d7989e2a3814f58c15ea87f684176efa04e2297346e99e98d
 MISC metadata.xml 332 BLAKE2B d29e6205dff565647900434cfab8660dcc980bdccec03dccd6b16070659bec0b36c7030de139e6d0d0179c1ff36186d386b16cbb878cb82f5821f04ca615e73f SHA512 1b4a93d0fce0c628f5e85500c8f325423c961cb755eac978627abbdb039cd56de08b48afcc443b0a52b84c1ea82fe75758770dcfa0efe7639a530ee80262135e
diff --git a/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch b/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch
new file mode 100644
index 000000000000..2eafd3748ee4
--- /dev/null
+++ b/net-libs/libgadu/files/libgadu-1.12.2-fno-common.patch
@@ -0,0 +1,30 @@
+diff -ruN libgadu-1.12.2/test/manual/userconfig.h my-libgadu/test/manual/userconfig.h
+--- libgadu-1.12.2/test/manual/userconfig.h	2017-01-21 18:57:03.000000000 +0100
++++ my-libgadu/test/manual/userconfig.h	2020-02-09 03:18:29.040560145 +0100
+@@ -19,16 +19,16 @@
+ #ifndef USERCONFIG_H
+ #define USERCONFIG_H
+ 
+-unsigned int config_uin;
+-char *config_password;
+-unsigned int config_peer;
+-char *config_file;
+-char *config_dir;
+-unsigned int config_size;
+-unsigned long config_ip;
+-unsigned int config_port;
+-char *config_server;
+-char *config_proxy;
++extern unsigned int config_uin;
++extern char *config_password;
++extern unsigned int config_peer;
++extern char *config_file;
++extern char *config_dir;
++extern unsigned int config_size;
++extern unsigned long config_ip;
++extern unsigned int config_port;
++extern char *config_server;
++extern char *config_proxy;
+ 
+ int config_read(void);
+ void config_free(void);
diff --git a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
index 6172f02348e2..87d39897c0d9 100644
--- a/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/wojtekka/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc ssl test threads"
 
 RESTRICT="!test? ( test )"
@@ -33,6 +33,10 @@ RDEPEND="${DEPEND}"
 
 BUILD_DIR="${S}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fno-common.patch"
+)
+
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_prepare() {
diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 8055e6c4f010..8421795edb77 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -3,7 +3,5 @@ AUX liblockfile-1.06-respectflags.patch 665 BLAKE2B db252cf9257548591e0171167ff0
 AUX liblockfile-1.16-makefile.patch 2851 BLAKE2B 52f6fcb117e6f49dc5c824766c067303c25d03095efb395e47d716b9bb0eb9a6affc7330d7537220f99afa64bb6ec14061de078f9313609d762bff066542c3ee SHA512 dd9cbf566ac8a933c4cee19a33cbe818904cf7be5aed05f2a17b87312267ac1716631c9fead4663b1979158363ff07218b0a486ee40c029fcd2a23142b59f275
 AUX liblockfile-orphan-file.patch 613 BLAKE2B fc1167d0daab5b561c6b148af7b0752ba8f6e4067802648212e7fb28bc59f55c4293bb319b6186251890c164739daf6076aa5bc4f8ba083c9f68c0115be8738d SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e
 DIST liblockfile-1.16.tar.gz 68591 BLAKE2B f41df23ee405425265dbf5ca66dacf8e5dac84f40c16d192f1afbb40399f2a68bb92f5e24bbf0d2fb7fc143a92f8fa2713ebccbab70ceb9e67d9c7ae21f42802 SHA512 ee75ecf0dd25744de4e3ce7d6b12483ead2deaf0cd6a527e8493100c5d714751fe97e057873c8c7b04a935f9b46a5ea502950f15d3ce54ecc63d997ab1cee33d
-DIST liblockfile_1.09.orig.tar.gz 32178 BLAKE2B b78f632e3bf1ed926596abf9fb0450cc325f888ba245d724f6c02800d939f2d5933b0f90bac92d543cdc5ee6b27f8c4fb70901742e83e8d5becbdbc60e20e5b3 SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a
-EBUILD liblockfile-1.09.ebuild 1214 BLAKE2B 6ff0fc868cd36467903bb332460d6eefc2f9f73a24e2d6ea9ce6ef170aefca91dbc7d3092253e700de26c3318de3223009e45f47603a121d72f35e1a341ab27d SHA512 47266158c92b618968d9bdca784e24eefc8666bcd34d5b8db11595ef4034097d4dd4f932a963222ed9e1209a9a85ca92ed38b1815ac5c16097ba4f872040d788
-EBUILD liblockfile-1.16.ebuild 1333 BLAKE2B 80ef3d0fd89374e8fc4d9f9655bf1dd20d440941881f865cd2fbad0ad05f930970a071ac38bffec0f1c8fbe80e496abc962b6581f45a8a1d2929853c026e8031 SHA512 c3d6a25d23b5315ff69caef8f7812ec8f7569157a27489fa63519e40beb354698cee5d1e042f628d1cc10de632d94f0a1cb443c8ffd58e7cd60c644f4e77c91b
+EBUILD liblockfile-1.16.ebuild 1324 BLAKE2B c17a0b473e0e17698e250dc00409b1982c59f0bc3f981950b420cfb8dfd343f82b5aa7ae8de2230d675669f726a852aaa4d18d644f868e2ee3a5baa815887bbe SHA512 f9824db2a7d500a3f98d98e8300f1bc4f389610d21a71a4faf159040a33d37614b847a69e4a04b0669e43b4241fc3b2610a6aee9dcd91d5e4a0ff59316a698c3
 MISC metadata.xml 251 BLAKE2B 40a09dc2a759fb83efc9e99d0165f78db9941c583d8063bfb4305a2f53e1fbe6a578bb333b488f82ff6d66c78d8816f8cc474350fb1adfb3caa4dccc3dc30de1 SHA512 45a605b4ec729f1fa1ef76330eb4b8427995af409786e0946ed79ef73f06e9c59ba89ddd34070db3cb600f113f05d5003a07bcc4e6ce70bfe699f0a10dbabe88
diff --git a/net-libs/liblockfile/liblockfile-1.09.ebuild b/net-libs/liblockfile/liblockfile-1.09.ebuild
deleted file mode 100644
index eeb84dd9633a..000000000000
--- a/net-libs/liblockfile/liblockfile-1.09.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib autotools user
-
-DESCRIPTION="Implements functions designed to lock the standard mailboxes"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-pkg_setup() {
-	enewgroup mail 12
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.06-respectflags.patch
-	epatch "${FILESDIR}"/${PN}-orphan-file.patch
-
-	# I don't feel like making the Makefile portable
-	[[ ${CHOST} == *-darwin* ]] \
-		&& cp "${FILESDIR}"/Makefile.Darwin.in Makefile.in
-
-	eautoreconf
-}
-
-src_configure() {
-	local grp=mail
-	if use prefix ; then
-		# we never want to use LDCONFIG
-		export LDCONFIG=${EPREFIX}/bin/true
-		# in unprivileged installs this is "mail"
-		grp=$(id -g)
-	fi
-	econf --with-mailgroup=${grp} --enable-shared
-}
-
-src_install() {
-	dodir /usr/{bin,include,$(get_libdir)} /usr/share/man/{man1,man3}
-	emake ROOT="${D}" install
-	dodoc README Changelog
-}
diff --git a/net-libs/liblockfile/liblockfile-1.16.ebuild b/net-libs/liblockfile/liblockfile-1.16.ebuild
index fa8d31db2fb9..148796e9abed 100644
--- a/net-libs/liblockfile/liblockfile-1.16.ebuild
+++ b/net-libs/liblockfile/liblockfile-1.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools toolchain-funcs multilib
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Implements functions designed to lock the standard mailboxes"
 HOMEPAGE="https://github.com/miquels/liblockfile"
diff --git a/net-libs/libmrss/Manifest b/net-libs/libmrss/Manifest
index 649831b6beda..ae128f1c507d 100644
--- a/net-libs/libmrss/Manifest
+++ b/net-libs/libmrss/Manifest
@@ -1,3 +1,3 @@
 DIST libmrss-0.19.2.tar.gz 375238 BLAKE2B e01682d9223d3f2cea444b5e6b5e9b6e476782ef0ae1c4a85d5ea8e8e5383d5317f2d35eff93347e6b5fde0778060c212b8e489915f50b20f098f7e94805e148 SHA512 0997ced472b767174977b7623484c57bfd0b901a9650cb7f7738ad7393153752ebfc1f717e2eacfb5f7eb319140599128d73de7e095327ee089cd1f85ab42b24
-EBUILD libmrss-0.19.2.ebuild 966 BLAKE2B 8007da172df5ac7162eafb5b74cc0813f20d90c457f46484f5237480565a3cf7b766143ee0c6f21c7d68d48e6411934ee71466c692b6134c77f9345a1ed62309 SHA512 512f9d4da1d84aefc3581a86e7b593f8a1b07c525d469b8c053c83c0f8e32555c8791717f906411f2fc45d477f8ef4f2fd1a3d96fc194ac4dafca0af0b033f2f
+EBUILD libmrss-0.19.2.ebuild 978 BLAKE2B 0556b62d1b1e86104b3181fc5b92d72ba9d3e60e1010e2cc654eb5e97475d8f72170578dff6c0030c68ed746ff92ee190d4738d416f57ea065e9a51138c733da SHA512 0fa630105a7f356ffb490147d6415a641f3df9416fd9dce29d483ed0586254341f7c38d06adee1a27a4871d93ce63561c20ce8e190a740011ff0701578ba29d9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libmrss/libmrss-0.19.2.ebuild b/net-libs/libmrss/libmrss-0.19.2.ebuild
index e57dc41abcab..f4ce0a9497b3 100644
--- a/net-libs/libmrss/libmrss-0.19.2.ebuild
+++ b/net-libs/libmrss/libmrss-0.19.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 DESCRIPTION="A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams"
 HOMEPAGE="http://www.autistici.org/bakunin/libmrss/doc/"
@@ -10,27 +10,31 @@ SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
-RDEPEND=">=net-libs/libnxml-0.18.0
+RDEPEND="
+	net-libs/libnxml
 	net-misc/curl"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 # TODO: php-bindings
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_compile() {
-	emake
+	default
 
 	if use doc; then
 		ebegin "Creating documentation"
 		doxygen doxy.conf || die "generating docs failed"
+		# clean out doxygen gunk
+		rm doc/html/*.{md5,map} || die
+		HTML_DOCS=( doc/html/. )
 		eend 0
 	fi
 }
@@ -38,14 +42,11 @@ src_compile() {
 src_install() {
 	default
 
-	if use doc; then
-		dohtml doc/html/*
-	fi
-
 	if use examples; then
-		insinto /usr/share/doc/${PF}/test
-		doins test/*.c
+		docinto test
+		dodoc test/*.c
 	fi
 
-	find "${D}" -name '*.la' -exec rm -f {} +
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index f5ade29a5e4e..70c014fd0061 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -12,5 +12,5 @@ DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42
 EBUILD libnatpmp-20110808-r1.ebuild 722 BLAKE2B bdace565e17460df38361f3b7e7bbe6c83be72d0a7b863b0f989108aa02196c175b2fcc7a454b08d21992924de6a458bd8ed750e407d8bfdb91c357e2e04a9e4 SHA512 00fc715e7b04c7ca32ec24bb6fdfb72592745edd2a4ad77c27248d908b567da26b91c108d655b996e24c10f3ed9d383cf72735ec245921683e3625aea3f9840c
 EBUILD libnatpmp-20130911.ebuild 776 BLAKE2B a82ac0c79c2825717d3e4003bcbe256dd177d05b6810606371745972a3c0ba1c75b9b7211f465df52ce1beb4d330beeaafb00dc52a330f75bfa1d8044f2181f1 SHA512 1e6d69662525d6336aecfc136a1b8a6960b15b656a8bb37fbbdf75d4a2f9ff482ec2ca09d1755902450f99cb01c4886d57306e3291f591b978fac2264d924a8c
 EBUILD libnatpmp-20140401-r1.ebuild 872 BLAKE2B 5819e67094a71aa5a6d83460a747e75d740e97bfd5a89e07c8cbb5c8ae19cd4ca8c50f01e9beb5dd49ead5aa6c8df31a7fd8134c3f820c05c9bd952dd74950b1 SHA512 3542090fefcb135a0aebfa289205cc6593a758bf34eeac8a4377dce424a5b5fd329ccc63d3699f11a7ba4608758d2371f0f33241d3f08ea85c615b00b1b810b2
-EBUILD libnatpmp-20150609.ebuild 885 BLAKE2B e247aa193608e3745ee8b24fbd8dfa493bb6d6e116a9288188dba45f791d63e8d6af5efacba6abcee60960ed4f9429cf03bd0082947b8233f68bca4cfb2c3657 SHA512 86ef08525d292d25a553e966f405247700a915ff1a454d7e2c75fd3d8bcb82a00af7958847370eff3dcda1a13f6131e3d263b831e95e22d76e8aec22ee416916
+EBUILD libnatpmp-20150609.ebuild 821 BLAKE2B 7ad1cd8505ff19aac6a04b534ef21bbc9360301b877186facb28dc8206a6dca818e4158b4faeb0e9aa76faa652ee31e7af1efeeccb57acdc38691f1d0091de0f SHA512 94f34a2b69d5964b047ad7262c9fa3daf05aed0444d703e66108a65838d54af7fb12fa6c06291f13ab62a9cfc73a9444f190328ab8ea92f88fbb14b414299a49
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
index 95c1b853efb5..dacd2137cb04 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils toolchain-funcs multilib
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="An alternative protocol to UPnP IGD specification"
 HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
@@ -10,19 +11,21 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/respect-FLAGS-20140401.patch
+	"${FILESDIR}"/respect-libdir-20120821.patch
+	"${FILESDIR}"/remove-static-lib-20130911.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS-20140401.patch
-	epatch "${FILESDIR}"/respect-libdir-20120821.patch
-	use static-libs || epatch "${FILESDIR}"/remove-static-lib-20130911.patch
+src_configure() {
 	tc-export CC
 }
 
 src_install() {
 	# Override HEADERS for missing declspec.h wrt #506832
-	emake HEADERS='declspec.h natpmp.h' PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
+	emake HEADERS='declspec.h natpmp.h' PREFIX="${ED}" GENTOO_LIBDIR="$(get_libdir)" install
 
 	dodoc Changelog.txt README
 	doman natpmpc.1
diff --git a/net-libs/libnfnetlink/Manifest b/net-libs/libnfnetlink/Manifest
index b1c2429ad278..c701d0ee3fb3 100644
--- a/net-libs/libnfnetlink/Manifest
+++ b/net-libs/libnfnetlink/Manifest
@@ -1,4 +1,4 @@
 DIST 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch 677 BLAKE2B 189c57ffc8eeb6a83e46fd1d53390e977294f7d3a269d3ffab07e1fce04083a7b4b956e93e02f4f81ce6db4ec5be785b16d1c75ed7e0b4fef9883154d9407e18 SHA512 fc452e2924fa4de66e104229bc05a663c253148fb1c0bd62e5454a907877ffb084ba6a04e38bf4ef71a4e58041f4a242001a8029aefbe97ccc00e3bfcb7bba41
 DIST libnfnetlink-1.0.1.tar.bz2 320641 BLAKE2B 18d6f702afffa1bf2cb6978426f4a1aeab8692a288686c099eb7dfabff23648b4b0f1ac14b4661f16e3d50b6e7d29090d58ce715dac107acb12648e93c5df4f3 SHA512 2ec2cd389c04e21c8a02fb3f6d6f326fc33ca9589577f1739c23d883fe2ee9feaa16e83b6ed09063ad886432e49565dc3256277d035260aca5aab17954b46104
-EBUILD libnfnetlink-1.0.1.ebuild 1491 BLAKE2B 4518555de24016fbdf500c799889ba3b4dd7b0db9f42e9175c159a80462803be49f2b603324b760f0ae7119af997a77be7e5bccaabaca4e18e98dd217793b8a8 SHA512 b50e44bcd24d5f6d0f5551242c2a6fca5ffcdeee022e94b9b218ba29ecc3974dacab7b1850b07bbfa3e57684fc0a33366baad1ce440ce674a56a4557d33a781c
+EBUILD libnfnetlink-1.0.1.ebuild 1435 BLAKE2B 391283df9b28513d35a3a96e1a6265aafcf05c1e689965a70c7d60778f1e704c0dc1195353bc1b1b00d21da797749e7c0585de9c21949b4ddb2d6740a84fe0e4 SHA512 e88cb62dcd0bfb487c5ce72d05cc7d688ab52508953d027be2be50200f7d0e6363a495eeac8d44cd8cb920e61bf2e69a515e0932289c381bd9fa9fdc21da9292
 MISC metadata.xml 364 BLAKE2B 688c9d5bb9c4fe16699fd7535d4201c069573e833f805a8321a30aed5d51cc988439d463d9b780387c641bdf477798673fdf3a92153b9f61760f5de79cad3843 SHA512 cde7260e5a76b9e921692fd265f3e5da028492bb920db58ef3b12dab29cfa402cab322b4f5f48f1949e37941a6d6065039f371861e5fa7fd1de56feff62c97bb
diff --git a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
index 7f4eb46d560e..26088b852aa0 100644
--- a/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
+++ b/net-libs/libnfnetlink/libnfnetlink-1.0.1.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit linux-info eutils
+EAPI=7
+
+inherit linux-info
 
-DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
-HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
 PATCH_BLOB=04aef8a4dedf267dd5744afb134ef8046e77f613
 PATCH_FN=${PATCH_BLOB}-musl-fix-includes.patch
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
-		 https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}"
+
+DESCRIPTION="the low-level library for netfilter related kernel/userspace communication"
+HOMEPAGE="http://www.netfilter.org/projects/libnfnetlink/"
+SRC_URI="
+	http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+	https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> ${PATCH_FN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE="static-libs"
 
-DOCS=( README )
 PATCHES=( "${DISTDIR}/${PATCH_FN}" )
 
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
 pkg_setup() {
 	linux-info_pkg_setup
 
@@ -44,10 +41,12 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
-	prune_libtool_files
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 57a2d2ef3811..8b248b19d90b 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,8 +1,5 @@
-AUX libnfsidmap-0.19-getgrouplist.patch 3459 BLAKE2B bf58f1234c9b306643698250c0d5cc9ad4290a22582e18af09b91d9c9d7b49cffc959c77758ab1c7d1af0be9401cef2c0f5c1127aceb9a175738236dfb6e0d58 SHA512 a778620b51158b07b7224ca010ba199feba85af7fc087bde65cfb8d2660bd7646c08d303a39d2af525b3a449694a60c3c35fe3b696cb0354b5d74423240a9e8d
 AUX libnfsidmap-0.21-headers.patch 438 BLAKE2B 0ef48276188f4142b2c85cb3cf326d37aee270f7a4b1442c41678792d071d528e83b41c4cc7ea253fa2e43efca788903c37a52540bffa0fc8199203954d62c1e SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926
 AUX libnfsidmap-0.27-getgrouplist.patch 3467 BLAKE2B 595045c93b897fd51a8ee4b039fe8b8732e78fc203cf6ab4ad138feaf35c408698ba4571477115ddf03d73ba20a9fa8623af43e6adf9c5a51a8577710e5a4c1d SHA512 3bf266ddeed306981cf7724032a59118ec93e34974b79fc93966f3494acef1855ce7bdf4e88ac12b0d435a5b2380e1570243c746bd05dc19a65d40517f6f2462
-DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
-EBUILD libnfsidmap-0.25-r1.ebuild 1223 BLAKE2B ae79a23338129b33a90dbfb413e7e79e7c7197ce49cdcbcab99d85e2fbedf3a3be6d554e599c1efd43c91554d21cd57da0d0f06762cd33737491100b3b2fc71b SHA512 6755869f3548ddc644923c8d0bb2fab4ddf49eff2132ee3947ee887e4453cb0d0fa4313c348082f8ad427d3103f8b4166768b423f278c607b969e0fb5452ab29
 EBUILD libnfsidmap-0.27.ebuild 1344 BLAKE2B 564b19b40ec929cf5935b4f7dab0b646df7f684096e1f67c404772f333fe8f73d45608d102605d1eacdc90cde1a9f97e75fa751e810cfe564286975d751c8e2f SHA512 571afccadb16609314c71ec1ee0bf1d6624d13f6215660910add92af96fa0c278d491b56cc3372376077639d3f6c60c9f7b573df89b9785c0a7ffe88b01d4de0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
deleted file mode 100644
index 0d5d367b95b4..000000000000
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-http://bugs.gentoo.org/169909
-
---- libnfsidmap-0.19/configure.in
-+++ libnfsidmap-0.19/configure.in
-@@ -38,7 +38,7 @@
- 
- # Checks for library functions.
- AC_FUNC_MALLOC
--AC_CHECK_FUNCS([strchr strdup])
-+AC_CHECK_FUNCS([strchr strdup getgrouplist])
- 
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT(libnfsidmap.pc)
---- libnfsidmap-0.19/nss.c
-+++ libnfsidmap-0.19/nss.c
-@@ -49,6 +49,8 @@
- #include "cfg.h"
- #include <syslog.h>
- 
-+#include "getgrouplist.c"
-+
- /*
-  * NSS Translation Methods
-  *
---- libnfsidmap-0.19/getgrouplist.c
-+++ libnfsidmap-0.19/getgrouplist.c
-@@ -0,0 +1,88 @@
-+/*
-+ *  getgrouplist.c
-+ *
-+ *  if system does not provide the non-standard getgrouplist, we will emulate
-+ *  it via POSIX standard functions
-+ *
-+ * Copyright (c) 1991, 1993
-+ *	The Regents of the University of California.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#include <sys/types.h>
-+#include <grp.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#ifndef HAVE_GETGROUPLIST
-+static
-+int
-+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-+{
-+	const struct group *grp;
-+	int i, maxgroups, ngroups, ret;
-+
-+	ret = 0;
-+	ngroups = 0;
-+	maxgroups = *grpcnt;
-+	/*
-+	 * When installing primary group, duplicate it;
-+	 * the first element of groups is the effective gid
-+	 * and will be overwritten when a setgid file is executed.
-+	 */
-+	groups[ngroups++] = agroup;
-+	if (maxgroups > 1)
-+		groups[ngroups++] = agroup;
-+	/*
-+	 * Scan the group file to find additional groups.
-+	 */
-+	setgrent();
-+	while ((grp = getgrent()) != NULL) {
-+		for (i = 0; i < ngroups; i++) {
-+			if (grp->gr_gid == groups[i])
-+				goto skip;
-+		}
-+		for (i = 0; grp->gr_mem[i]; i++) {
-+			if (!strcmp(grp->gr_mem[i], uname)) {
-+				if (ngroups >= maxgroups) {
-+					ret = -1;
-+					break;
-+				}
-+				groups[ngroups++] = grp->gr_gid;
-+				break;
-+			}
-+		}
-+skip:
-+		;
-+	}
-+	endgrent();
-+	*grpcnt = ngroups;
-+	return (ret);
-+}
-+#endif
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
deleted file mode 100644
index e069cf37e05a..000000000000
--- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils multilib
-
-DESCRIPTION="NFSv4 ID <-> name mapping library"
-HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="ldap static-libs"
-
-DEPEND="ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	!<net-fs/nfs-utils-1.2.2
-	!net-fs/idmapd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
-	epatch "${FILESDIR}"/${PN}-0.21-headers.patch
-	# Ideally the build would use -DLIBDIR=$(libdir) at build time.
-	sed -i \
-		-e "/PATH_PLUGINS/s:/usr/lib/libnfsidmap:${EPREFIX}/usr/$(get_libdir)/libnfsidmap:" \
-		libnfsidmap.c || die #504666
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable ldap)
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins idmapd.conf
-
-	# remove useless files
-	rm -f "${D}"/usr/$(get_libdir)/libnfsidmap/*.{a,la}
-	use static-libs || find "${D}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/libnxml/Manifest b/net-libs/libnxml/Manifest
index 558b7511b50d..da55bd199f9b 100644
--- a/net-libs/libnxml/Manifest
+++ b/net-libs/libnxml/Manifest
@@ -1,3 +1,3 @@
 DIST libnxml-0.18.3.tar.gz 361977 BLAKE2B babe5773f102889d52d0d63511984201e220205925b703221559cf73c8e380b78b3788ff48bdc2da382746bb95acf4c9a70c69d689c4fd7db3be4bd65f44000d SHA512 fc420a4b773eca68608ac1d509930a0528c3a41b53fc7cc340c09fd53f92a88afb4091e810d97d59e73a8beeaaeed52dd3c880273ef512a5305800b3ef46717a
-EBUILD libnxml-0.18.3.ebuild 884 BLAKE2B 3dadc1abbff63d0c3431337c585e7bb6df499feee1e2d27e5f30163f3777269c1aa1940e5476b6e1f95ad5057a8cda4dd97122464accf2729a17fcec7f15a068 SHA512 c3a311f4fc10e5842f867154bed23ea4ec495a29763cfd17f24a25981b520469256fe1e0ac63d5b75114394dda5bafdf4162668bbc60ffe66fdc7b28a96277fe
+EBUILD libnxml-0.18.3.ebuild 912 BLAKE2B 4d3729f8b862c08a2d6d06ed672379e0a30296548e881432fd536505f73040474faa5381fa7c6e9bf0fda6f25c9a0ebedb97335c7b684631694b3a8ddf7b3098 SHA512 934c9f1d41f0e1215b9f55a4953972234821c639e6ac3a09dfa2b2614153d5bdbf3d1f542e5ea6bf321812eed1045bc9a3d0d0f8bd5037171c7720b985ae05b8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libnxml/libnxml-0.18.3.ebuild b/net-libs/libnxml/libnxml-0.18.3.ebuild
index 259c8a928c03..8d4062c2bd02 100644
--- a/net-libs/libnxml/libnxml-0.18.3.ebuild
+++ b/net-libs/libnxml/libnxml-0.18.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 DESCRIPTION="A C-library for parsing and writing XML 1.0/1.1 files or streams"
 HOMEPAGE="http://www.autistici.org/bakunin/libnxml/doc/"
@@ -10,23 +10,25 @@ SRC_URI="http://www.autistici.org/bakunin/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86"
-IUSE="doc examples static-libs"
+IUSE="doc examples"
 
 RDEPEND="net-misc/curl"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_compile() {
-	emake
+	default
 
 	if use doc; then
 		ebegin "Creating documentation"
-		doxygen doxy.conf || die "creating docs failed"
+		doxygen doxy.conf || die "generating docs failed"
+		# clean out doxygen gunk
+		rm doc/html/*.{md5,map} || die
+		HTML_DOCS=( doc/html/. )
 		eend 0
 	fi
 }
@@ -34,14 +36,11 @@ src_compile() {
 src_install() {
 	default
 
-	if use doc; then
-		dohtml doc/html/*
-	fi
-
 	if use examples; then
-		insinto /usr/share/doc/${PF}/test
-		doins test/*.c
+		docinto test
+		dodoc test/*.c
 	fi
 
-	find "${D}" -name '*.la' -delete
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index ccc49f58f82b..33c2025dc1da 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -4,7 +4,7 @@ AUX libpcap-1.9.1-pcap-config.patch 1005 BLAKE2B 27f06af3f6634e25bc7eb017923a174
 AUX libpcap-9999-prefix-darwin.patch 358 BLAKE2B cd2d0dc64fa49fa91451fb668a85684770d43cea038cd59d6e6e6b6b59e29fe258741ecb2aa8bca5621a4042b786ac5944700df40d6d52cb25fdb7fff27f713f SHA512 c3b3d90ad0641bec86bbd8a07e4eb35dc49a6b9f99bf5cccdb6b9134b75e9e6b78649073e69291683de581d1b40ba8c3079a86ec7a621a1fcf33f8a1cf818f75
 DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f
 EBUILD libpcap-1.9.1-r2.ebuild 1891 BLAKE2B 17126e5f18ea988e73e2bd47643bbb419f783cfe0e6d59cd1f45b1ffc0a4a83abe24ddb2d5d0a9332c1a35a8531708271dec8b43a30efa5f2ba99ae9529f2eda SHA512 e7207fd3b6727973d6c3fa766fc140e3117cb5ee936abad08ee36b9557f1d8e8a43be677e47cc1cbd8a5c9b344f17d29725232418e7bbb1795c9f61bb6aab0fe
-EBUILD libpcap-1.9.1-r3.ebuild 1873 BLAKE2B cb06d4694a9bcba570ebddbb4426e86f1c6e8f56b85dd498408badfdddb7a44af901be602718bf8dd34f8072dcdb390fe8713d1c23bc922c428a30682c022418 SHA512 2141fced1a48f22288aa712cb69229d1fb5e5583c9bdf274c93bf48dca556f043b757d53d331195e75c6097153c46f210ae79f0a347d3a059eb562f733477614
+EBUILD libpcap-1.9.1-r3.ebuild 1891 BLAKE2B 73ecb606bb002f7fc47e79982d6017d6884fa08cbcb9ea9ab794a111627081e8203bfe679fdc111fbbcef56d49be7e94f44326d367f0241cc8faccbfa492a7e4 SHA512 88f9a0d18dd55f037068b26b5ce51ba5747dd3d1096bc32807cee6125e25c640f66174fef02dd3c543d1ba7d16c0e24df0c09babe00c09a7a7228733940dddff
 EBUILD libpcap-1.9.1.ebuild 1763 BLAKE2B 139c2018a2f15097971d814b0a85eff10fc24d9381472fbb0e1481bcefb789376dd74be86bc220e1461bb8351e86c66cf570e815c08e4997ec1da852fcfbacd1 SHA512 a24b353553930a591fb0aa78e08b161132a6fbab1e1c0b1b5038cf4c5762c8b22b157183000360826660addc40e6afc969be15ee254f78e736b4f8ee8cba1ccd
-EBUILD libpcap-9999.ebuild 1661 BLAKE2B 306757d0d320e1da01ded053903966f50375f46c14e8d2ea1b9c0fe9282f9b0bee25a8ce8fc9eb5fec2c0fe21d1b3b0d93a5176e71bbc700b7f00ea9f83845d8 SHA512 01caa0d110f040593bb54480ad8b2605105a5a9408571ac35a4ef66ab2cfaf0b3bb40f3777b87d0956895be61d412f87a97af2dcc3ffaba2d0d0c467fed88254
+EBUILD libpcap-9999.ebuild 1689 BLAKE2B fe3e9048f399aa9fccd6d70bc15522e103b59277a69bda73c72d106b9a5451d793d9bf4ebbefdf13071d3488ae0b715432f15958bda5f167b8da1587e7257766 SHA512 6e2c1bff6a7519578a17035b17460935bee69b3521141e2848a524b4af3d9e3dd02cc3afbf4f16096b5e9bbbb53f4d5cc6209a61713958af8d35e15d3e6d7e75
 MISC metadata.xml 829 BLAKE2B e5d6efa30353d6468e2900a2e3b5eb9fad0f1037c5757b791a787d7db88d48261b8237cee5b8d8e9b327c2bc24697d2456216e4a2aa76601d540e3203d7e6515 SHA512 0bfc965079e819a9cb84f3d8eebea92e975dbfabb751979b1c64edd61b07e6508fd52ac64abea5d10305864afcc7c581a29d6f4e6fe8cfb77940ea326ba2f4b2
diff --git a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index 0e379a44fc38..c3c84c594222 100644
--- a/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index b8aa26910221..6ff5bf8f081d 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="A system-independent library for user-level network packet capture"
 EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
 HOMEPAGE="
 	https://www.tcpdump.org/
-	${EGIT_REPO_URI}
+	https://github.com/the-tcpdump-group/libpcap
 "
 
 LICENSE="BSD"
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 970cb8328c6c..678155aba690 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,15 +1,6 @@
-AUX libpri-1.4.12-multilib.patch 2592 BLAKE2B 3a460e16340c241cd3c40f7e5fd9aad10e8af3cc8ee2b832421c23dff697619b06512a8af0629704fa3b49619f59dab0bff2e48f03ddd996f99f85b7359ed4c1 SHA512 fc6fb3fec61b0c18b16f35d78065c9d17b2c579e2a7fc6d93df2b25937aa5b056016022e77a7001a12b38ca1d96b6700b72ac37ea52bdd32cf135d7ec7d8670a
-AUX libpri-1.4.12-respect-user-flags.patch 1694 BLAKE2B a28cc1fe446d9928d4e3af4b29371da65a08551183daf0b16433e92cc12b501047d420433ec665e875580bdfc2f513c1cacdc4f553e896ae153f6b5941bfb33b SHA512 bd72c53cdc575c74b07cc32d5f4f4cbf9b49e43a97b3a82a96c2fe85e4c2b4529eec27adf1d3f8af5fcc9ac16e3636af5256dd7461b2adec7c4e3db5fdee4ec6
 AUX libpri-1.4.13-multilib.patch 2541 BLAKE2B 082b9e44d102ddac090faa2efebb9047ed469d762ea00f4836ba131ced6041b0e6f03a7a124797d637df90c9b636202ca90d3d670af63a6e746a871b748e5a28 SHA512 7e6b43e64c5a4fd791090d3b20008a2bc1b9deeedf613ef6e72ec6b5dc105449705bedac5f4628d9d53963ae9649ad22480daa114de40f83854d045c2f3d9247
 AUX libpri-1.4.13-no-static-lib.patch 1252 BLAKE2B 07df96fe923d1e95eaa9041239e706b7fd6043ca8012a74c79b900b00f9a98414812d50b5a6b26acee1bc5b382831ed11bf5636ec6fb4807163017d62f687e9c SHA512 3d057a8bc1401e4580dcdbb401c697cc25117b8ab9fc4feedba39bd980dc9745423eae7cc75fe48c3684b07459d0f5de11717020d3e7726ca89de7c6a8a3861d
-AUX libpri-1.4.13-respect-user-flags.patch 1354 BLAKE2B 68737c732ea8b31a6ee29dde627533317c0cdd4580d78f5e9bb305840ffa63f558e81f1a22a84bdeeac7c5bc3ac32328a911e6f7e3f38a4b2eecfccbbeeb6666 SHA512 6b6695a3e16de652c7dc05a1fa95948498d03901c6e106cbedddc2681b7b0a59d3567c5161539e397f3e1759be682537e57712e24b771a55c59f6bdec152440f
 AUX libpri-1.6.0-respect-user-flags.patch 1626 BLAKE2B ec91c7cb1b2e2cecc8f97dc9ff2275527372e670ccb23f2daa3339fdae67aa4f065fc5e5dfa224710fb32e271cf2f6279c44fe999040d13b954418c3627d63e5 SHA512 69bb194721741613ec9e4c6da9d19154dfdb2ed56b2b964e09e888bd0dedd104501f3a51f0bb57587d1c15dafeeacf790ea122bc1c2a8edfeccb2f7d9252519e
-DIST libpri-1.4.12.tar.gz 339669 BLAKE2B ff34c4167ec0c974c6a00b3039a97a55dcce8dfec2db1bb6db62fccd82848c47081d31a3dad855302f8c72c0b089b31f1bc41bc7d39654dcc1c24f7d3a515e93 SHA512 54933b9fc23a09c71a1c9ce40d648fc90e6900043ab04f097ee3d01918b46f65462337e98e1b2c1917e36becdccc871bd5029dedc522020ea731c29172ccb1fe
-DIST libpri-1.4.15.tar.gz 338633 BLAKE2B 0497797e4d799b07e073c93e224f5c8d5acc3b130ee87e0ced15d7d9d3315d77afa1562d0f477c6d224d618fa15ed68b05c26e2131b12858da19a1486802175f SHA512 2737ad404440a0c809bf0bb0e406565757fe850040911561c2e5e64f4c49b02af69db0d23dac322dda354583bca0ced88becc07017e686a848b69c8f152fb9d4
-DIST libpri-1.5.0.tar.gz 340683 BLAKE2B b7bde7a81655c30e491e6a0311979c614c183e5909d1f6a875277ffa33e758b63b69f0817c833899e231c53d3f18296981a610276beaff203691011ae17bcaeb SHA512 194e4b525e77a28665525e43a2d105d542fab242d3d21951574668bf4d14d90adeb4e0b18384eca1628d75a16d89c8b1e6577e30542d77dd5dfd3d6f4d60ed3a
 DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
-EBUILD libpri-1.4.12-r2.ebuild 689 BLAKE2B d6b484363c6a9680ded3a370be977ba3fff68d582c6dca4dc2bac86b0ee6f5c945fd055920d623a5047a77c1ec40133a5e8fe87aeca023ea971f05caad2ab232 SHA512 ec5454f729f1a47fb821827c8ad305422ec3b17825e46f7875f1df4ad3d91614da98df089c969ccc9aab3336c927e682f4fb0ecaa84836225662bc21cbf0ca4e
-EBUILD libpri-1.4.15.ebuild 721 BLAKE2B 1a031b8ea00603207c00725cbb183eee713808125e9e44b81bb4ebea343852dfb46b193249798dec9292530554e3df28e9254ba93a990cd86a371b9c9e029a2b SHA512 15eed20f73274b14855239451a0e95771aa0ecbdd256e8175006e7968c7bd9fab7683193c361fa638a6fdfa580cb3feef9350469a9dc2c688695bd70f2abc769
-EBUILD libpri-1.5.0.ebuild 674 BLAKE2B 67ac07eac4429c8068517e7253ac974f672d2e1179a8ed2626c3a64c0c8fe1f4c5cd1821fd228c6c743adfa143cf87c0b8019ee63b0bc07c619023a02bc0206d SHA512 fc3248e584238a16baace740c749616a11bb2d1b170c7543d74d995c4d53fbb3fe0473da3d988305013ee4055a858108167a3cdeddc1d8e29ae47b600c32bcd3
 EBUILD libpri-1.6.0.ebuild 734 BLAKE2B 71e6d9b61b87df3ec13166d8a217a4f7ae9a5fd8b3d5144b2e6a2e45f47ecd51e20025a91d79390f55893fb96aa73ed62519f617d9f4e959db5a0525e0989715 SHA512 7cffae1730136be08fb3757a6d60ce5e8f3898c84aaa0f8b85f8b4b708af03e4b257c0a59cea0f409ce8b928e108dd7509b537fdec18eb0af39c352d435f2006
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/net-libs/libpri/files/libpri-1.4.12-multilib.patch b/net-libs/libpri/files/libpri-1.4.12-multilib.patch
deleted file mode 100644
index bb30900a0ca5..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-multilib.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- libpri-1.4.12-beta3/Makefile.orig	2010-10-07 06:00:04.000000000 +0200
-+++ libpri-1.4.12-beta3/Makefile	2010-11-23 22:04:59.884448930 +0100
-@@ -96,7 +96,7 @@
- CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
--libdir?=$(INSTALL_BASE)/lib
-+LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- ifneq ($(findstring Darwin,$(OSARCH)),)
-   SOFLAGS=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
-@@ -168,27 +168,27 @@
- 	fi
- 
- install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
--	mkdir -p $(INSTALL_PREFIX)$(libdir)
-+	mkdir -p $(LIBDIR)
- 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
- ifneq (${OSARCH},SunOS)
- 	install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
--	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
--	#if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
--	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
--	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
--	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
-+	install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
-+	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
-+	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
-+	install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
-+	if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
- else
- 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
--	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
--	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
--	install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
-+	install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
-+	( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
-+	install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
- endif
- 
- uninstall:
- 	@echo "Removing Libpri"
--	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
--	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
--	rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
-+	rm -f $(LIBDIR)/libpri.so.$(SONAME)
-+	rm -f $(LIBDIR)/libpri.so
-+	rm -f $(LIBDIR)/libpri.a
- 	rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
- 
- pritest: pritest.o
diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch
deleted file mode 100644
index dd5b28587db9..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -uNr libpri-1.4.12.ORIG//Makefile libpri-1.4.12/Makefile
---- libpri-1.4.12.ORIG//Makefile	2011-07-27 10:37:34.247793740 +0100
-+++ libpri-1.4.12/Makefile	2011-07-27 10:38:54.183790788 +0100
-@@ -90,7 +90,7 @@
- 	rose_qsig_mwi.lo \
- 	rose_qsig_name.lo \
- 	version.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
- LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-@@ -124,20 +124,12 @@
- 
- PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
- 
--#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
--#This works for even old (2.96) versions of gcc and provides a small boost either way.
--#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
--ifeq ($(PROC),sparc64)
--PROC=ultrasparc
--LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
-+ifneq ($(CODE_COVERAGE),)
-+  LIBPRI_OPT=
-+  COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-+  COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
- else
--  ifneq ($(CODE_COVERAGE),)
--    LIBPRI_OPT=
--    COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
--    COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
--  else
--    LIBPRI_OPT=-O2
--  endif
-+  LIBPRI_OPT=
- endif
- 
- ifeq ($(CPUARCH),i686)
-@@ -216,7 +208,7 @@
- 	ranlib $(STATIC_LIBRARY)
- 
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
--	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-+	$(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
- 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
- 	ln -sf libpri.so.$(SONAME) libpri.so
- 
diff --git a/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch
deleted file mode 100644
index f10303d80590..000000000000
--- a/net-libs/libpri/files/libpri-1.4.13-respect-user-flags.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- libpri-1.4.13/Makefile.orig	2012-09-26 17:46:23.000000000 +0200
-+++ libpri-1.4.13/Makefile	2012-10-10 08:11:24.000000000 +0200
-@@ -67,7 +67,7 @@
- DYNAMIC_OBJS= \
- 	$(STATIC_OBJS)
- CFLAGS ?= -g
--CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
-+CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
- CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
-@@ -107,17 +107,12 @@
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
--ifeq ($(PROC),sparc64)
--PROC=ultrasparc
--LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
--else
--  ifneq ($(CODE_COVERAGE),)
-+ifneq ($(CODE_COVERAGE),)
-     LIBPRI_OPT=
-     COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-     COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
--  else
--    LIBPRI_OPT=-O2
--  endif
-+else
-+    LIBPRI_OPT=
- endif
- 
- ifeq ($(CPUARCH),i686)
-@@ -196,7 +191,7 @@
- 	ranlib $(STATIC_LIBRARY)
- 
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
--	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-+	$(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
- 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
- 	ln -sf $(DYNAMIC_LIBRARY) libpri.so
- 
diff --git a/net-libs/libpri/libpri-1.4.12-r2.ebuild b/net-libs/libpri/libpri-1.4.12-r2.ebuild
deleted file mode 100644
index 26dc7714dac2..000000000000
--- a/net-libs/libpri/libpri-1.4.12-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~sparc x86"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.12-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.12-respect-user-flags.patch"
-)
-
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	use static-libs || find "${D}" -name '*.a' -delete
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpri/libpri-1.4.15.ebuild b/net-libs/libpri/libpri-1.4.15.ebuild
deleted file mode 100644
index ce6000921355..000000000000
--- a/net-libs/libpri/libpri-1.4.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpri/libpri-1.5.0.ebuild b/net-libs/libpri/libpri-1.5.0.ebuild
deleted file mode 100644
index 4cc9c20b37e5..000000000000
--- a/net-libs/libpri/libpri-1.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.13-multilib.patch"
-	"${FILESDIR}/${PN}-1.4.13-respect-user-flags.patch"
-	"${FILESDIR}/${PN}-1.4.13-no-static-lib.patch"
-)
-
-src_install() {
-	emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc ChangeLog README TODO
-}
diff --git a/net-libs/libpsl/Manifest b/net-libs/libpsl/Manifest
index f397f5dc8902..f6368443d4b2 100644
--- a/net-libs/libpsl/Manifest
+++ b/net-libs/libpsl/Manifest
@@ -1,5 +1,5 @@
 DIST libpsl-0.20.2.tar.gz 9228099 BLAKE2B d53b8a036ba557704c4d3a498b35fd25e3dfc466d5161040d02b7d8d47af2138cce2bdbb8203fca0591408440f1b4cfab776fe0d2ecd68959f426d903cab08d4 SHA512 fa9f6f7f0447d9fe00f5dfca5262c56ff26217eea44d0f7fc1e5d982224c41874e753f0aa06dd9e5d7d03d4f04e3dacd4f36034cc8dd0fc6e2c28b49a23e62fe
 DIST libpsl-0.21.0.tar.gz 9217951 BLAKE2B fd93b71ae4969bb920af26e10e0e419dab62db37197046b0f4e4a0e009a150582df6d4c8fe33218fa8be869e6ad9688d3c325c3f635da5560e29269daa461668 SHA512 165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d
-EBUILD libpsl-0.20.2.ebuild 1471 BLAKE2B 9af489487b1e22a454b4415f44bd0fe9e1802b4bdf1746aac66a4eb449839c39ac49f03d62b95c2567a67bc9ca515d7a5a11a8f5f9d13c0d23506189057c1fb7 SHA512 021bfebc1b92093254849da5049b358225b0cebfd3bcf91267287010db72fec4bf12e09641501ae086c69a50f0181af95bca354b289eca364e71932beea29798
-EBUILD libpsl-0.21.0.ebuild 1480 BLAKE2B 592b61af2d34ed4e87b579258f62f748aa004b5cf85fe14d3f2d7043d401398f306c0a3e9b2449f7f099a36a1edd380fc4a935fabfac2139a386c8d121bf7fb3 SHA512 411c42c0d1ed1e73cc824e1d8afb660ca3e58166e2aed92278053cdc5961cbe386051af1976552ae57db5f152815a7164e94aa1dce1960e33ecb8a6821cd906a
+EBUILD libpsl-0.20.2.ebuild 1465 BLAKE2B c4a6222de8dfb1bbe040d557fa5993ce0e4589932b2ecbf2b8dd2555fc34d3ac52c7be7107907c99c69e2eb72ee4641238c75667a714e945a87325b36e12250c SHA512 51bfda0c75541704bc96d684e6a588c87f858fc86f27a005e8d0a59b31a7b16a8f893acc5a4a3a75261244262dd5e3fb6109d1ce754ecbae8c65711558a3f486
+EBUILD libpsl-0.21.0.ebuild 1474 BLAKE2B 4f3b886747c4ffcd6491432ec8e9d069b41aa301d46da469bd88ec8936993ddfc4f3e44d17bae6202a10d0b931bf5666b3c506cd38ae555f776059c8b5def2a5 SHA512 7806d3f7e36d25ce63a6e6427d6664920bc0deb996701c6df4415fe2054811799a41b79a53849c6d61589c3869ed7b633ceba82596279e3951a0cc5d5da57c06
 MISC metadata.xml 404 BLAKE2B 8a6b54d64c66fe2ec363e4e801973851cf7f3566b4db1752bc63f1f75d4ce7d7fbb04ecb5804e848c5fd97df9eaa55479127239e3320f49dd9db33710a015035 SHA512 7886a14efd3a12c844752f1bb2af9c72963b1e68bf2a7bb2ed7368f6df89f8f0c240aec5dfec7f40d25c1c2c7771060dc013e2032e972f45cb7d86f458c4c004
diff --git a/net-libs/libpsl/libpsl-0.20.2.ebuild b/net-libs/libpsl/libpsl-0.20.2.ebuild
index dec232286541..77d9d740faae 100644
--- a/net-libs/libpsl/libpsl-0.20.2.ebuild
+++ b/net-libs/libpsl/libpsl-0.20.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7}})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit multilib-minimal python-any-r1
 
diff --git a/net-libs/libpsl/libpsl-0.21.0.ebuild b/net-libs/libpsl/libpsl-0.21.0.ebuild
index 8d013ebe7b36..d8bdf4556620 100644
--- a/net-libs/libpsl/libpsl-0.21.0.ebuild
+++ b/net-libs/libpsl/libpsl-0.21.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_{6,7}})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit multilib-minimal python-any-r1
 
diff --git a/net-libs/librouteros/Manifest b/net-libs/librouteros/Manifest
index 0c099d12d13d..edfa1325c766 100644
--- a/net-libs/librouteros/Manifest
+++ b/net-libs/librouteros/Manifest
@@ -1,4 +1,4 @@
-AUX disable_werror.patch 302 BLAKE2B 147e312a34ce604bb86e8d7048f1f715bc430df2dc7464e3da230c9033af9248c82627fbf656b5ee0dc5767ad996ff16e0064124b25d247c782a8f26d67608f5 SHA512 13cb3d720814cc9a8a6b975cf1bbf13aab5a177e05e95c8c80de637a04119045bbaf5e91d0a8b1664137be6adfa710a7d061ac8309be27657c6ba1e6593a6400
+AUX librouteros-1.1.2-remove-Werror.patch 229 BLAKE2B c1a10b121c1bd835fc97aa864af5fae7350c8c4af77ca475f7ad4a8bdf1368410fcfc7cdcdacb65ebd1e51cd6f60bdde1b0ddb054f12927e4809edede74e0091 SHA512 e46dfec5344978595de438ed210a238c9380db4b74c26d31f55bbaac75d694ddece70a60196071ebc821fa6363ec52356d39892408cf5675c29aa3a239fcc58f
 DIST librouteros-1.1.2.tar.bz2 234942 BLAKE2B e5fbb28957280798539d81fd908d9198084dbc3f15e403c7d21a3be7b0211bb2e0cc387b3e237c530454396df430dd2781d2c8184609cebd9cde906eac1288fd SHA512 b4974f84f23544276e426b94410107d24565060034423dabb49157ed2cbee8042d4d415f716fae50a757f24c87c0deab51435236a5bc1bcffe5fc888b7047fc3
-EBUILD librouteros-1.1.2.ebuild 569 BLAKE2B 12f6063b83b944e68e933739116b5c549be0b6a48eb68ea3d6c94dfb5e4c4034d0d37ef67e3f8da2ca2cf20b142d3b57ca0f99314560433eb03c02d3e2f5e60c SHA512 8a5b1a28f74ab625fd63cb4bc8bff5a8f391a035e4e2deb44abfa481891e24c61b49197b8298b52bec7bf973b14fafd0b1500f58b447a9ff80be8e140766328d
+EBUILD librouteros-1.1.2.ebuild 648 BLAKE2B e1a786e84787c9a6088b329705db0e3f5cac8f6c6df4655212b8a3ad52cbeeab743e9e45de3135473ff5dc47435b52e94902178675fcf589ee4f73c02c403539 SHA512 0fd3017e5510aa77db1b710c1e3e54c75e135e2bbbd9d4d7f5f536151d39dd29e1b6f07d589acb88f6e0dd476dbb4aea628b67ebd70a98451bfc601d918f32a6
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/net-libs/librouteros/files/disable_werror.patch b/net-libs/librouteros/files/disable_werror.patch
deleted file mode 100644
index 599e85b74d00..000000000000
--- a/net-libs/librouteros/files/disable_werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig	2011-12-30 21:17:04.233158203 +0200
-+++ src/Makefile.am	2011-12-30 21:18:42.186354842 +0200
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = foreign no-dependencies
- 
- if COMPILER_IS_GCC
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- if BUILD_WITH_DEBUG
- AM_CFLAGS += -Wextra -g -O0
- endif
diff --git a/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
new file mode 100644
index 000000000000..b3f005a4be3a
--- /dev/null
+++ b/net-libs/librouteros/files/librouteros-1.1.2-remove-Werror.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ 
+ if COMPILER_IS_GCC
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ if BUILD_WITH_DEBUG
+ AM_CFLAGS += -Wextra -g -O0
+ endif
diff --git a/net-libs/librouteros/librouteros-1.1.2.ebuild b/net-libs/librouteros/librouteros-1.1.2.ebuild
index 9e89899c90e7..a6be5fce2804 100644
--- a/net-libs/librouteros/librouteros-1.1.2.ebuild
+++ b/net-libs/librouteros/librouteros-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit base autotools-utils autotools
+inherit autotools
 
 DESCRIPTION="Library for accessing MikroTik's RouterOS via its API"
 HOMEPAGE="http://verplant.org/librouteros/"
@@ -12,15 +12,25 @@ SRC_URI="http://verplant.org/librouteros/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug static-libs"
+IUSE="debug"
 
-DEPEND="dev-libs/libgcrypt:0"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}"
 
-DOCS=(README AUTHORS)
-PATCHES=("${FILESDIR}"/disable_werror.patch)
+PATCHES=( "${FILESDIR}"/${P}-remove-Werror.patch )
 
-src_prepare(){
-	base_src_prepare
+src_prepare() {
+	default
 	eautoreconf
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libsearpc/Manifest b/net-libs/libsearpc/Manifest
index 089b3af23888..ebf15fe55621 100644
--- a/net-libs/libsearpc/Manifest
+++ b/net-libs/libsearpc/Manifest
@@ -1,5 +1,5 @@
 DIST libsearpc-3.0.8.tar.gz 48740 BLAKE2B c2743d7f03001dd971821ef72f403ad2c26aa8e2e8350e2c751e7aa3ffc2be2bcdec0adc75ef5dd23b12b31a866ff9b590f8a279616a5f5c76db0eacf225b2f2 SHA512 1f2cf9a15a004b6ddf8fc0b6a436a5db09a514cea4cec94ce9fa6ce973cd71dfc4a112e948a36ab0be61d736f1021622e46429d07de70b23c25b886d1e51c02a
 DIST libsearpc-3.2.0.tar.gz 52303 BLAKE2B 34707b504b4e63017549e5ed04e8e1e8d1e98b873aebe2ad3f675fe88e209bb73d8b56d1aef137bc4bead2a2fbcf7410dfdf1d02a92a8f37efbaaf0d56d79a4c SHA512 071784b6d34f6ddf947748474c210f0f803e3451373e351b6a768b0cf4a17ddcdaf415ff4ce5f020f1a68df3f6f0a0e53a78ad9e2df286fafea870e303c8f6dd
-EBUILD libsearpc-3.0.8-r3.ebuild 939 BLAKE2B d9b32b8e8fc34eeecb2a516cbdceb031a353f83d833372f4f305201b71168301df8ecefe9158a234a0abf3f2510af005b77e36b2349d0c36bce56620ac60e090 SHA512 b4b0519fff93be89506a45fdc7a76dfe31bcd5213b49a8f248506897178f24a89cc558fc7a2512bd771c981e83007623d907e98ceaec521649a7c26ce9093b36
-EBUILD libsearpc-3.2.0.ebuild 856 BLAKE2B 46963564f039d884000f558eea9a5a148bbfe7bbdfd155a1e3acc76028849464c6dba261b799e2c86e3e5c502a7acdf6a878a29c6d60076579ce3113dfaa0f89 SHA512 1b7e13cbd72cb9f61a75d5ea2bea565d2fa67d2a1e6b9be48171a20d6af3dbf0124eb5dca8a6915015470ca04efb218b6c3920d63d575895bb95f1ccb060021f
+EBUILD libsearpc-3.0.8-r3.ebuild 972 BLAKE2B c9c8ea665ac2dce2090982e10d755b9addf8c950d94ca01543aa73fef832cb765f9ee019eaf6904c6cd9209239d3680f6970c90dd1d3d7111d71ab9adc98f37c SHA512 9b6f516b7f9911f133e18b9017a2baa1b4adce76b02a53ed1804808f6822a3c44e2ede4945cbdabe45e7308cc1cdee86be6978b5d283b5cf704d8daabe4e681a
+EBUILD libsearpc-3.2.0-r1.ebuild 892 BLAKE2B edf92e0e49f00e23faf417c512cb2a37950f56c9f9603201e72c1d5e291e1e9ddae67daa7fdcccf43413e9733c329c18e1658f1847897d0a1a959d4c31b30004 SHA512 d1f78e33fcf2ba923d90405145a60958f2c678d86970dabbb5f6a8a5a192c398c8fffe5d1ab8b6f8a92014a8b1c036596f3d03b2a2bb4cb23df792ad40ec9d3b
 MISC metadata.xml 248 BLAKE2B 95ce6c164ee8faf34471896ffcaad9a285d3418dcf763f778c5f58d38f545845c46c87cb3af4f3a8d71c542b127313a909e8f7972c15f930b1fdeffdb660478e SHA512 ffe6a49d28d3659fb952d60aff92836d3d1280f24dc340985d81a5b6600abe5ed8d961bee9ed1188b83be02e547676efcc06689b89ba5484a940a47fe48ed45c
diff --git a/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild b/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
index 23605ce88036..fa39547c3c5f 100644
--- a/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
+++ b/net-libs/libsearpc/libsearpc-3.0.8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,9 @@ DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.26.0
 	>=dev-libs/jansson-2.2.1"
 RDEPEND="${DEPEND}
-	dev-python/simplejson[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+	')"
 
 src_prepare() {
 	default
diff --git a/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..5ae50cbad5a9
--- /dev/null
+++ b/net-libs/libsearpc/libsearpc-3.2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{2_7,3_6})
+
+WANT_AUTOMAKE=1.16
+
+inherit autotools python-single-r1
+
+DESCRIPTION="A simple C language RPC framework"
+HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.26.0
+	>=dev-libs/jansson-2.2.1"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/simplejson[${PYTHON_MULTI_USEDEP}]
+	')"
+
+src_prepare() {
+	default
+	sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libsearpc/libsearpc-3.2.0.ebuild b/net-libs/libsearpc/libsearpc-3.2.0.ebuild
deleted file mode 100644
index 3402888bd457..000000000000
--- a/net-libs/libsearpc/libsearpc-3.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python{2_7,3_6})
-
-WANT_AUTOMAKE=1.16
-
-inherit autotools python-single-r1
-
-DESCRIPTION="A simple C language RPC framework"
-HOMEPAGE="https://github.com/haiwen/libsearpc/ http://seafile.com/"
-SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.26.0
-	>=dev-libs/jansson-2.2.1"
-RDEPEND="${DEPEND}
-	dev-python/simplejson[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-	sed -i -e "s/(DESTDIR)//" ${PN}.pc.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	# Remove unnecessary .la files, as recommended by ltprune.eclass
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 466336c6f7ae..c3c6b9eb10d3 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -5,7 +5,7 @@ AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
 DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
-EBUILD libsoup-2.58.2.ebuild 3013 BLAKE2B 1450b2256aa632d07f1e4e9ee0e9ea2e05e4e2762b0e56a90400d35f1ee8ae5008943ec9207ebb48e04519e81b561e6d8950a6aa0a9da0d9fcc8a14997f0a12d SHA512 9bb7ae42f9f740c1e50364a95d64ac90dd3055e0fc4ab48448c05af1b09cb154dc3c2f75c3792860921d05635e0878bc52e5f2edf3d49ee71a1f205dffe9757c
+EBUILD libsoup-2.58.2.ebuild 3007 BLAKE2B cc8fa9d41608878724fb64ba3f2ea5c60b93f882c3805854a329d2dbf05409ad8f1964a9ddbcbe0f8909ba770b123f63178cd1303b53403ff32b1967600e5a76 SHA512 a7dbeedcf8f44d03336a9b51f787f44d442392306b16b79a13961ff38f814a38bd5dc255b3be3849b8140c4549aee48be13d84a2e5644884c12a1b17fb5b8dbd
 EBUILD libsoup-2.62.3.ebuild 2921 BLAKE2B 6a14f5d15e79b4da02d367256edcb39f1a67c1924776fa7fecca2cfbcfaace3c432930b06836a161c899bf481ea603e78c3ae9443fe22bfe707ed855d53bf6e9 SHA512 2b759c494e6ca3b008156dbc790f4b46c9f363e107adc8873725a7dc046a748a7659fa952e82f2ce6baadee595d4ae8907d490accfa57ec943231c4d015d8e5b
 EBUILD libsoup-2.66.4.ebuild 2775 BLAKE2B 7d25d6419d78a71984c815998f0f04c4518e41845e89a7dd8c068d16df9d1be48913f2857920c2a1717b3f27f373ca714b01cd90dab626cd5fd503181b7d4d35 SHA512 fd37118f4aaf39e4ce0bea567332239676d1369f458e8b5e2ef5c06de57dce85182fd150832bd6ef5d0b069bfe3f1835a6f31065179a55c9098b5b89a075fc12
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 9226739e9650..43389753b616 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 multilib-minimal python-any-r1 vala
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index ff183c31f18b..b695cb9b972a 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -1,7 +1,9 @@
 DIST libtorrent-rasterbar-1.1.13.tar.gz 3896007 BLAKE2B b94f843437be348b10082f19d0b416f909daf15078b1461ab6724ee086d3194f6c378c305174676a3399fc3e6cb23133faaa334ac5dfc9457fb597c65dad7d36 SHA512 021fc54353fdf5063d55ccdc2057dada292bb0008fb92e93e8d94dd89f529630f290fcdc4f4d095e3192522c57fe0f0da260b5ef8e8e15a8c6ac05728f5f7160
 DIST libtorrent-rasterbar-1.1.14.tar.gz 4040571 BLAKE2B 38ea1a71e46bf18c9beeb869280e4949b199ab58c32f41e63f1c15c7c32db0d256b741ea707350e9e153695b9cc28e0a95385944bf76dbd5eb2055e66bb0f919 SHA512 b640ada016f8e68a3fb0e033dd33ab79b345b0f691aa722c4256b8cd8524c6e55067ccd1f11584984bbb82c0f64151f0b5223bd2b8431b899ffca46d2d31fff5
 DIST libtorrent-rasterbar-1.2.3.tar.gz 3591081 BLAKE2B 9766a21c948997b35c6d209940a2d2cfd76b130f1a9d1f611e07d3eeb27f634a3c5eca12c92261139200084b9678913d85f6a56f98ab6894e5def761615c39ad SHA512 11a81c9f4b968ed360740553f8d856a2fad4eb2f6962f6403394e0a4a6b198ef6f04ce92d11fc6bed9aa979c84efd03fb396027dfe6603f394104b4302e04d82
+DIST libtorrent-rasterbar-1.2.4.tar.gz 3598403 BLAKE2B 7a9a6b3244137fff785d0bd82dc0b1900b9e8c673f1cf9492bbde2c8f14d0a9d4ac3e4835eb9721bb9fa388d1a5d0635f2ffeb0f2a6f5a61f4fda7f89d6a10e3 SHA512 d24901acc0f462b6ff873f9aea880bf44698165db5343e8437b1dd7d7f20dfa6e7fe1e72a44a518fff5f2167a48552ec359696bb682c82e86012737177e082d3
 EBUILD libtorrent-rasterbar-1.1.13-r1.ebuild 2352 BLAKE2B b1b274c01f49cd03d919bfe038352e51db8eb4279a2454e911632e621c370a49109803e9f2eaa1e7836f885043bcd5d9ad488a564bcd93b9d2a97043d27dc9bb SHA512 f7015e3325fed2f39ccf5a4d2258b36524939237dd6606021be20e865d8d462e5b830f108cbf6e8870df0c2d2e9721a89e8b9f2d9b90c1dbdcef7a887baf9c3d
 EBUILD libtorrent-rasterbar-1.1.14.ebuild 2354 BLAKE2B c934e84456e6a15d3dbc7298bb6a04f7a2577d12f853053675d47cd38b280b5f71808e5b9153c7a3b705574bfe01f82b6f28280230f721061f04317bc6ede5af SHA512 ced4871e896e046b29de877c321da6f91f31e205f8df9ae5b18322ee827a97001f30d4d8810478ce5f7262b8e3934109eda549a0fd5de7a0eec2fb6b33712b61
 EBUILD libtorrent-rasterbar-1.2.3.ebuild 2503 BLAKE2B 7594d465b23d207cbcf3ae0c20c9f8750d6d1561d48f444f9b3b17341251257c0695db5b3bb4f9776659c3895887e0bce99f9906bba993388fe1dc05d383b159 SHA512 2f5c73c76980f74af89a12d2853ab12f8296e6090eaab8f618bd9e9e3da7550efda2e430d26f5a4393a44dbaf55fd4c43e42b5994df8c9fa2bee697bd6518898
+EBUILD libtorrent-rasterbar-1.2.4.ebuild 2505 BLAKE2B 35494a15034d186dcd00704a72db167389986a2e2be4dcd4db3b1e3e09ee71700b725bd82752a385bcd9ab7c87b78f136c7e2f01adc4c26439ac08bce0469676 SHA512 7b6aa95fd0e16fb3c0b7aeb98b5d99abe7ee8b3d4c6190f8cc95477b3a9b0c3e0ee477dfaf1c562738d7537711e3ccd691233fbd9dd278f8c487767449408030
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild
new file mode 100644
index 000000000000..21d2139b85be
--- /dev/null
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit autotools distutils-r1
+
+MY_PV=$(ver_rs 1-2 '_')
+MY_P=${PN/-rasterbar}-${MY_PV}
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent"
+SRC_URI="https://github.com/arvidn/libtorrent/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +dht doc examples libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+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
+"
+
+S="${WORKDIR}/${PN/-rasterbar}-${MY_P}"
+
+src_prepare() {
+	mkdir "${S}"/build-aux/ || die
+	touch "${S}"/build-aux/config.rpath || die
+	eautoreconf
+
+	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() {
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug export-all)
+		$(use_enable debug logging)
+		$(use_enable dht)
+		$(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="boost_${EPYTHON/./}"
+		}
+		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/meanwhile/Manifest b/net-libs/meanwhile/Manifest
index e8edafcb2aa3..1e31531697a6 100644
--- a/net-libs/meanwhile/Manifest
+++ b/net-libs/meanwhile/Manifest
@@ -1,5 +1,6 @@
+AUX meanwhile-1.0.2-gentoo-fhs-samples.patch 588 BLAKE2B 1905d0d49a814157ae8f6c80f94dcfebcd742404f1329f2f2cd75c6d50cdf50934f93baedfdb79a3b5ad1f2b1b264b6ed7163da4ef51f96f56fdbe6d8d8a46bb SHA512 af12dff949c06994f2834978cac405cb4e6d39714a09b088eab33b433f8597ef3a70f523ec903b4df0f8d272ae63d0c25cd73efe68f3cba58624c9a6682a3e2c
 AUX meanwhile-1.0.2-glib2.31.patch 6461 BLAKE2B 1d46f23d60776dd3f3743ca8c892828b966bc3bcf679d7e3f33739fb1d54fe999bf9ff605590c7458b3d4e12a374109903ba53bad1763e343c30224c506b89bf SHA512 b22a45ff231f33294808e65dd0e0461810be26078d94493c56e3e0303fa9d5606f7916f14edee7f94a2b78574300ba76df433b9e3c1ba0b5df3da0d07aa9ca70
 AUX meanwhile-1.0.2-presence.patch 1163 BLAKE2B ba471439dd6acaa5e4b3db78432b76379570c8bde5c760ce0ce388ef33b41527e43c001445c7bfad3e998590c8e80e13b6b12723d340bfac338e9394ed4b8e9a SHA512 f4caf5f727464b044ed533abcb3929227bc55cba4132b55587411ae5c78c320c916924c5b9228a34634af68f4a00d8103616c64b4b77f04e15f66d8ff62dbbd7
 DIST meanwhile-1.0.2.tar.gz 479325 BLAKE2B 70b032ab9b1fc6f556a16afceec5eac72b8efc686977734c84068fb34e49fed01c2c20743ba058cd99de155dd0172ea2132c8bdbfbbfcaa572f889c15da96e01 SHA512 ba356124352ed522bc4c62282e4267960e0d3751c990cc422957ae263c70932264dee2d5e3dfe436325ad53f1833ff541eda4b36a6b78441374256ef54c786e6
-EBUILD meanwhile-1.0.2-r1.ebuild 1046 BLAKE2B e8e7bc3383d15cbfa019f20af67e1e5ae3892ac0844eff9d5ebf2b34c84a29167c4084405ef23f36aceedecfc84284ae2e83499948c8bfe7766bc3c8ff1b356c SHA512 3c8a1896f09c52d931bbe1358b8417d048a55337ec5f57356384d86dfe1b271a54476b438f7ccc9801ba4fab0d9d84bec1d9a26ee82cb4345357ed2712990090
+EBUILD meanwhile-1.0.2-r1.ebuild 963 BLAKE2B 18bd3fc4818ca0adf81d89f5502a065b3cb1bd3b2e80493db3abc7ed156598184a52c5900d796fee28fa7ff5860e7921b5a7d176926b904ffab499a850f577e7 SHA512 58238ab186eade328404d592b7efcef1b3b727bf32baca2eb719ccb557c1d06858fb59fdcf84bffba3fa3fe1b67f1b9d3eff067df564af9765732277d84021d3
 MISC metadata.xml 246 BLAKE2B a740e9a1a3e17c2fa628a8e04b07077f2495eda755cbd903ea5934b0409f05f7297ddc90aa9693b9d7f1b7b3bbf3f2070f5e266cfbe230cf07d71749ba54df95 SHA512 9131560c103b0fbf21dae354b0a00ac68bee1b326a3e38b3c18fa7396b4369c4c29a0e550344cb219fd48c94b2d1c21b185a329c992096c0693ea2bf24aa31b2
diff --git a/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch b/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch
new file mode 100644
index 000000000000..d0bfc20fa76b
--- /dev/null
+++ b/net-libs/meanwhile/files/meanwhile-1.0.2-gentoo-fhs-samples.patch
@@ -0,0 +1,26 @@
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -5,10 +5,10 @@
+ if ENABLE_DOXYGEN
+ 
+ htmldoc_DATA = html/*
+-htmldocdir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/html
++htmldocdir = $(htmldir)
+ 
+ latexdoc_DATA = latex/*
+-latexdocdir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/latex
++latexdocdir = $(docdir)/latex
+ 
+ docdata = $(htmldoc_DATA) $(latexdoc_DATA)
+ 
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -19,7 +19,7 @@
+ 	$(SAMPLES_SRC)
+ 
+ 
+-sampledir = $(datadir)/doc/@PACKAGE@-doc-@VERSION@/samples
++sampledir = $(docdir)/samples
+ 
+ 
+ EXTRA_DIST = $(sample_DATA) $(sample_SCRIPTS)
diff --git a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
index 7a2a8a624595..7d3f38645197 100644
--- a/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
+++ b/net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
@@ -1,45 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils flag-o-matic
+EAPI=7
+
+inherit autotools flag-o-matic
 
 DESCRIPTION="Meanwhile (Sametime protocol) library"
 HOMEPAGE="http://meanwhile.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
-IUSE="doc debug"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="doc debug"
 
-RDEPEND=">=dev-libs/glib-2:2"
-
-DEPEND="${RDEPEND}
-	dev-libs/gmp
+RDEPEND="dev-libs/glib:2"
+DEPEND="
+	${RDEPEND}
+	dev-libs/gmp"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-src_prepare(){
-	epatch "${FILESDIR}/${P}-presence.patch" #239144
-	epatch "${FILESDIR}/${P}-glib2.31.patch" #409081
-
-	#241298
-	sed -i -e "/sampledir/ s:-doc::" samples/Makefile.in || die
+PATCHES=(
+	# bug 239144
+	"${FILESDIR}"/${P}-presence.patch
+	# bug 409081
+	"${FILESDIR}"/${P}-glib2.31.patch
+	# bug 241298
+	"${FILESDIR}"/${P}-gentoo-fhs-samples.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
 }
 
 src_configure() {
-	append-flags "-fno-tree-vrp"
-	local myconf
-	use doc || myconf="${myconf} --enable-doxygen=no"
+	append-cflags -fno-tree-vrp
 
-	econf ${myconf} \
+	econf \
 		--disable-static \
+		--enable-doxygen=$(usex doc) \
 		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/nfqueue-bindings/Manifest b/net-libs/nfqueue-bindings/Manifest
index 40e027c17b9b..0c63694e99a9 100644
--- a/net-libs/nfqueue-bindings/Manifest
+++ b/net-libs/nfqueue-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST nfqueue-bindings-0.5.tar.gz 22385 BLAKE2B dd14df558dcc3f811f7f649f0e4ef305025f863d850deceae0dba308974865150265899d3cee43d2a279d6c6d6237dd4df6b01b72c39b6a96819d25fa4413dbe SHA512 c88ef6997b8e4b3ae2c2eb6c1002b74f39979c73b4dc3a4da428aa4eeb6eedeeaff1cbc27c0740e8b29fb8b6a6f98af326be0b4fbc6ed3e432a9884febb3f7a6
 DIST nfqueue-bindings-0.6.tar.gz 22425 BLAKE2B e338268a41e29cbab9a5dc2e891caa78a75d7849439fd9afc8eb105c965e8d201d854f95460d337dc60249ee2c90d88582075a14bc321bf5b952e5a8b648ed0e SHA512 6ee31b01377c0e4b6aa2d2f2e14b34d4d432f04d0e813f90a9d7e52ea9c8483044f7a36b48220887d658c80ca07bfefc88f8aa92309cff30619ec8fb9f52ab43
-EBUILD nfqueue-bindings-0.5.ebuild 1983 BLAKE2B ba1f4bc6a61f198560d0a415202972d32e896a62aae7a88ca11938ddad49f58011801a1260977b77092c05a48f59fa02e3bb9c801c7e384b26fed57561196c33 SHA512 6fcecd6297f2f4d2e6778c7263e87e910a8ba51a526ddc35ea328379018ce069df6d9b9c5a8ba6a7936ac7781bda8da06ae8089214e8339ddde834a38955651d
-EBUILD nfqueue-bindings-0.6.ebuild 1959 BLAKE2B c6ab4990c06d9904704d102490fdf1b1b01e3e4a916b6c93144c4730cafbe1d5c1f3cc0570eda16df729b0c0dd2267f41e82b16b9aa0bca1a0ccc4be5fe92991 SHA512 13b245b2fbcf98569a37d50e24cd481d24c8ad92f3deaa1999bb5b058b766816dcc53ffcdc238f4580a93bde932305690c07d3f2777bfa28b8ab60deecc46fa5
+EBUILD nfqueue-bindings-0.5.ebuild 2021 BLAKE2B fe6ecd4d9a92f1e3a69b812240701156db89f41d3796bd9a5fc8d2a69d276d7d00d3c10dbe2d64d7b09fc7921952ae0431f032045fe1d09d59cd63d841842878 SHA512 c683a51c9151adbba9a8d482b6a9915dee3773032a747de5b8e8cd242e9f1e3f039427e10d2d04d878f24207da0bd86c3756ca7966dfa0a037022031f5790809
+EBUILD nfqueue-bindings-0.6-r1.ebuild 1997 BLAKE2B f302f0ffffaf1f03aa7d487037a6b5c03647b73b9b85492e0b803046c90017dda12289a7a9877f957e478acfd86ab344132db4b91165b709a66796b59ba64923 SHA512 e9ec990f1274bf78715a22e603d0f31e1fb91cd98f7e7aacb331cd94db833211c08475cf6a87dd03074c3fd353804924ece20e9dcc64bd7df12aea671e06c7a6
 MISC metadata.xml 389 BLAKE2B 7d33c22b26e297b9cf696712e893a908f0dc1e6db264d9dfe39eaed7e5fea809c1e0d5bf5661a50783192c75cd414f92e3450da533aa9087f8e94fa016bd891a SHA512 93f27dce7f495f0e0bb277938e5133cc8a2ca33fe8d6b822da48dede56b94dfb35c471a77679cee6e8cd08dbca41f7459440b21ca1c6a1f02368ad5bd8c91d96
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
index 208daba1fd23..97d6ee2d4ac5 100644
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,9 @@ REQUIRED_USE="|| ( perl python ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	python? (
-		dev-python/dpkt[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/dpkt[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6-r1.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6-r1.ebuild
new file mode 100644
index 000000000000..56b6ed038b47
--- /dev/null
+++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils perl-module linux-info python-single-r1
+
+DESCRIPTION="High-level language bindings for libnetfilter_queue"
+HOMEPAGE="https://github.com/chifflier/nfqueue-bindings"
+SRC_URI="https://github.com/chifflier/nfqueue-bindings/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="perl python examples"
+REQUIRED_USE="|| ( perl python ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/dpkt[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)"
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/perl )
+	net-libs/libnetfilter_queue
+	dev-lang/swig"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	# At least one of Python or Perl must be selected
+	use python || useq perl || die "At least one supported language must be selected."
+	# Check kernel configuration for NFQUEUE
+	if linux_config_exists; then
+		ebegin "Checking NETFILTER_NETLINK_QUEUE support"
+		linux_chkconfig_present NETFILTER_NETLINK_QUEUE
+		eend $? || \
+			eerror 'Netfilter NFQUEUE over NFNETLINK interface support not found!'
+		ebegin "Checking NETFILTER_XT_TARGET_NFQUEUE support"
+		linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE
+		eend $? || \
+			eerror '"NFQUEUE" target Support not found!'
+	fi
+}
+
+src_prepare() {
+	if use perl; then
+		# Fix Perl destination directory
+		perl_set_version
+		sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die
+	else
+		sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die
+	fi
+
+	if use python; then
+		sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die
+	else
+		sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install PREFIX=/usr
+	docinto examples
+	use examples && dodoc examples/*
+}
diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild
deleted file mode 100644
index fb8f566b9270..000000000000
--- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils perl-module linux-info python-single-r1
-
-DESCRIPTION="High-level language bindings for libnetfilter_queue"
-HOMEPAGE="https://github.com/chifflier/nfqueue-bindings"
-SRC_URI="https://github.com/chifflier/nfqueue-bindings/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="perl python examples"
-REQUIRED_USE="|| ( perl python ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? (
-		dev-python/dpkt[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	net-libs/libnetfilter_queue
-	dev-lang/swig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	# At least one of Python or Perl must be selected
-	use python || useq perl || die "At least one supported language must be selected."
-	# Check kernel configuration for NFQUEUE
-	if linux_config_exists; then
-		ebegin "Checking NETFILTER_NETLINK_QUEUE support"
-		linux_chkconfig_present NETFILTER_NETLINK_QUEUE
-		eend $? || \
-			eerror 'Netfilter NFQUEUE over NFNETLINK interface support not found!'
-		ebegin "Checking NETFILTER_XT_TARGET_NFQUEUE support"
-		linux_chkconfig_present NETFILTER_XT_TARGET_NFQUEUE
-		eend $? || \
-			eerror '"NFQUEUE" target Support not found!'
-	fi
-}
-
-src_prepare() {
-	if use perl; then
-		# Fix Perl destination directory
-		perl_set_version
-		sed -i "s|\${LIB_INSTALL_DIR}/perl\${PERL_VERSION}/|${VENDOR_ARCH}|" perl/CMakeLists.txt || die
-	else
-		sed -i 's|ADD_SUBDIRECTORY(perl)||' CMakeLists.txt || die
-	fi
-
-	if use python; then
-		sed -i "s|\${LIB_INSTALL_DIR}/python\${PYTHON_VERSION}/dist-packages/|$(python_get_sitedir)|" python/CMakeLists.txt || die
-	else
-		sed -i 's|ADD_SUBDIRECTORY(python)||' CMakeLists.txt || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install PREFIX=/usr
-	docinto examples
-	use examples && dodoc examples/*
-}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 323462bca1c3..1a40824a4a89 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -2,20 +2,16 @@ AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3
 AUX nodejs-13.2.0-paxmarking.patch 2714 BLAKE2B 56371f934f40772845f2a7fb873d59528400358af90612c78d3f47f1af08f3b394ef1eebec0ab477916d523212fdbbe563bb5719442beb5e3969a6fa25cc9989 SHA512 4f68fc72444424c47e7ea31615e4d60821dd6f966102fdc16503e93e8dd32a0f71439f3e6e8b5fbd88f034ef44490b5dcf1b2e00dcec6ed4551b2842d0a20204
 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c
 DIST node-v10.18.0.tar.xz 21913328 BLAKE2B 84b0b5157671dcc3e96bb2cfd11e085251fd2942c03b27491f712f5603797bab7503d8f7c0eb45ca8e348b20a0555c1767d4d1964fff474c8590a47eb01523a5 SHA512 8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c
-DIST node-v10.18.1.tar.xz 21920068 BLAKE2B 9dc0887a33f0888a347628e5bf15eb3687f15cba264a00317a15336fda48e41da9b4c45df6d0f223f2017c6b55b99eda0c4cd6f5913673da29c52a61450d03e2 SHA512 0979d264ef5286caea61a527771e2ac2fbe1b909a151061dbb7d9e0fde9461edd76b6060f55cfbd49d3ae2e7e10595a2eb4d2e98182e735e7df10940120fb9b6
+DIST node-v10.19.0.tar.xz 21906168 BLAKE2B 395504ef3befa47d8b967114e019e6a76c799871e7eb21e2c6c0453655ffa07f17f42209daddeb5417342cfbad71ba1a35ae15a2d210b692bc60be270c2fc415 SHA512 512efc58415ed789938c434af131d76bdd51772cac9f7e380afaa79d83cc9c433a979068fc7272adba6ba6551d195267978e1fc819236926b0d1fd6cf91c5eee
 DIST node-v12.14.0.tar.xz 23244684 BLAKE2B 0e25cbba5e256b139efd45908236f008834afdf01f57a8e84c7e55ba950e56b786cd52eba9a02986eb0e1d38cbf6df38e1cd719d7dcd8085e8c71767adf8155e SHA512 12e887709a54be911c5a81ab7b7be995247b47ebbd2954ca942f9ed8a784ae1a8e4bdb2613e5bb671196f9101d8861cd29e10650a3f0c414db4d096df94b309b
-DIST node-v12.14.1.tar.xz 23258936 BLAKE2B 125289ce3e342c2e5e7bbb6f0b1af109f0ba8fbf2d6630f2cdc4aa31c25a3d846afe773e84daed9824360a6680a2d21378af4fbc42c6337399a143f92850a82f SHA512 2e2b6fa8351b59450ab5491b5e31dc36ce4d9be13c55a14e6e4d95a82cc8334f9fc35261a56a8843903f8021ff333a333bb4d5f24c92b5d7483d4779c3d88342
-DIST node-v13.6.0.tar.xz 32706824 BLAKE2B 69e66354570e057fe215830a2d5bd157e5decfd1e58e4ead4304e0dfcf64e5adfe48503f3bf54afe2cc27df581a0f2ae79e9b730257ceb70c412bd2a47fa5603 SHA512 e7dc8356ac1b167cc32055e209f13cee82c9251440b6a6cc99b26c91f9625e11bd025cfc1c22b6ece95ea178640209a7c8700d678678b3e8bad26080aa2762c6
-DIST node-v13.7.0.tar.xz 32739116 BLAKE2B 2bc4331a059d18f37f41bb472bb19d864366cebae32b6be18d9c14ab91019fbfa6dcb2a8c3c1c256ddd54773d801e852e1820d90bc3b55f3509bfa8e5425121d SHA512 e2a9b0b6c6e038b9c5c55b51531ed30e8767dd492d3c5c50a0de764f7a97f22a3fcb65c4f50adff62219b076e0c688f1320dc87061fbb751a867746e22c60ccf
+DIST node-v12.15.0.tar.xz 23271600 BLAKE2B 20e31e2ecb6352f6fa9e2c60fc505046034434e287e827edd5e0b091c4d5e124b681ba178e1669db26ab3d1b588e3b0894595e9cd1fa46d560f7100d8ab7e1c1 SHA512 40cc5fc252e8939856886cd57cad50df11eedc37de8e50b1b2d49a2e7439d1f4bbba8de90efc030a659919106eca72facf8b31280323fc4803bed9a175ffbbfa
+DIST node-v13.8.0.tar.xz 32745596 BLAKE2B 14bf82e8cecde1a4125c7c00c4c9e613c1dbc5bb0241b20f4d30cb8d172612d5a8c362ac786ae516baf9553d5a9c3053414b269fb040cebb664f09096a57985c SHA512 b50d79f029bc04caf193f137b7b3d03f1e1ec9252712015cab2efdeef92bc3176cf7eb36e835cda6221950792e516f9c1894cd2c480e082106e07a11aa1d0761
 DIST node-v8.12.0.tar.xz 18310452 BLAKE2B 79634fc57cd76a97e72bab4be37da91d5eff4d13cdaa2b48e83f013885fa3590ba4a28378baf036ed26b7304bf234753d1d4014f72571496f5bb6cd5b221e5f0 SHA512 665d2dba287d78bcd723d7b4d00a6897fb996f4aa69a541e010a3dfeb2614257892117fcce7123966b1ecaddc9269a6667e0e262df693baea1f476c96de55c42
-DIST node-v8.17.0.tar.xz 19013844 BLAKE2B 2f35f61ccc2d67132441dace8b59df6565e5df9e14e6798ab0cb0a024493182881708368248964db30e1213fa7b66301bd73b5146944129d7b14cd2b5b1a9583 SHA512 9f7b0b5695e882b4f727802ad855d398da596f908e64263902781e01f6222a4044be48c104eb76182ddb525dedfc4b28ccd07d64dfa126c462a248d9e8b49fca
 EBUILD nodejs-10.18.0.ebuild 6276 BLAKE2B 24f1dd3c3af4fec3b456f899744b13b0c9451e55a159db5f56f4fe6a4062942798cd94f0b47b01fa933e51ea2fc91482cf2624e04c43dbd53cecc7bdeb573b57 SHA512 f9a3ca0b9eed22383069c2f4de9a0779ce8a0027bd268f1b8ca41d5d2a55e5010ec45c7d3a990ffbec5acc36d81dced37b30d80bf2b0316828eeeec3ce7827d1
-EBUILD nodejs-10.18.1.ebuild 6279 BLAKE2B a620b05278a18edf70fb786e6840238a38b780469479cd9c8fb18deb8c0d89202c0e1ae324b04362538ba1059d6e049e1b7da52f02592a82edf94cc53991e100 SHA512 b243a92aff7c7b3c93321a910c180ae2b26cef726ff96232edfa87352ae38d16ad9fec439428233070df72ba5cfde6a5560a4c798b67b417866b2285af211342
-EBUILD nodejs-12.14.0.ebuild 6116 BLAKE2B bcf44cabcf2c5463d1bfb4697212272eec662c41f181b3500ae27aeea17684fc3a5131f6a7e9f3a3a38bf7417c4190f5f3293b691a54899ece793d0c3ff1840e SHA512 6857bd8e8e26e642a133cef54e0df170b6c59a31b46dd68757d6be889c5e360ddbe93f8966eec63d7c91e3cf10a2d71e05b4b07abf001a93380309cdae55dad4
-EBUILD nodejs-12.14.1-r1.ebuild 6127 BLAKE2B 032f5d5427fc431eed654aed03872f48d243b2017672742db9f540809bd44a3b9c7933ae365159ac0459413080f2327fb2d44c7c86436b3f5f49ac00efb0ea8b SHA512 1ae825a848cffe5111390338084b225f1a353771888dd45698560487fc79e19d77c674cb9862efdba2a15617693134377bfa1403ed60e0eea5dee3bc274f82fc
-EBUILD nodejs-13.6.0-r1.ebuild 6148 BLAKE2B 74293a23b70ce6c9665540550d036f81b2e2cffbc6b5ed78d2042aece3e9d7b11e53b68096e26611456380594a1face29ae4165c9890a1fe0ecaf66d588309f1 SHA512 a3c2f91a9312d24517f3403f2eb1c0d7330a92370e7748a8180798faaf45ce93a783615c9b862be281cec256a8883f5f90cd122ca85c26561ffd4470360f55de
-EBUILD nodejs-13.7.0-r1.ebuild 6148 BLAKE2B 2848363d047918da656f60fa4072d40b6bb0bd9b6f1cdad0245bcfe081d124f2d4827255a168bf5346b781d504b63e2aa158c0a24fdfdd9cf5d788ea120d0027 SHA512 e67c8f1a1d72b72b3536196a9c05d6b5377b37aafac37faff6d1f68e201dcd937c0a2ba56ca6b71df1c5093d4ec73555d18d829bc3761cc947e02214bcbc1cdd
+EBUILD nodejs-10.19.0.ebuild 6279 BLAKE2B b8b58ad58ef8c236e1aafe873d963ea9479c76960f5e743996b461832f27fdeb0f2d20bec60c3a5f0ecc62e809f01ea8abf7742b83f8b7fa91e20c25ccb2020f SHA512 ca15af7d4ed6f6c7ef29a75292c1b01263d1c467d391ccf76b35d95d101a038adb9c7957934665bd4f3eaf0b00bbf3f1b37a066ac27b7cbd9755a9076411bb3c
+EBUILD nodejs-12.14.0.ebuild 6110 BLAKE2B 67694a25f08b9af538b36885254f680a9328b0c46fc6f19fe434806f76534d35ae907df0a726fbb5243087a4a80d28c9bd0ab7ef63e6998d7a3383c2a1c8cda4 SHA512 fae5d806aaf00d2aa319f244c2685f5de8378964dc7396ff5c892ff0a2563d6a746df47f30f0832f1191f343895b0af8ce73e755959395e41e8f4388efc9c9b7
+EBUILD nodejs-12.15.0.ebuild 6121 BLAKE2B b4cc6314e12478e0818eded7b11dea2f1a7750ab06b88c1e9be8f33a5754484a702035871b3ca9b6b3cd128596018690fe9f60fb45f52be69aa08c2074bdb96e SHA512 ffbbe1acb6cd40ea4ae80369ab5f749fc8baf144b8b42f4be48cf398cf171cde44668d2ad09f211bbdc5dbc897a98824a90076b296117b5db9e8b1c4db375ed7
+EBUILD nodejs-13.8.0.ebuild 6142 BLAKE2B 8fe1281e8a015b9e7bb10970101da317e43e1b181ba0aa6148571fafff089f5328f1701efa2e819b1b8fa19f897caac30a56398d0fc1cdca5bd2d930048d4424 SHA512 018f28e0dbae02375855f25e3831af1fdf2fac638b9c18fe4cf900ffb7e0bf6565dfc5639dae560c67f7cf5fd6ce4b241c88bb39705b1a768e4ecd3c6cf27ff1
 EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
-EBUILD nodejs-8.17.0.ebuild 6474 BLAKE2B c7748e57d37a828a52127ba285b1b27b472063badf6784fc42616ca5a88a5151bc95162158d34715018db433d8b9e4875f20a7640b1f5b373012d3eb61b5c0eb SHA512 5ca66326a80139455dbe9f2ccb77e588a50142da005c51261f0223b06b4b52d61693f08ce9d22479b8801c5e219a38267e844f3de5a913fad334ebe1dc55cc3c
-EBUILD nodejs-99999999.ebuild 6064 BLAKE2B 558a1e4ce81339c8e4ef99bb25b03bb45468817d5cc07dc18c64c3a9c58431c778189bf28b4514cc120166cb6cbf034edaa6efd2a66467b67d2ac7cfbfa643bd SHA512 cf87da1dba9131ad0390c3a8f4e6ef5e8b566631bb2e944ba817f4878b919cd930ad9db217c4d0cf9c0a15ed384632ebf2507c54846edc96fa405986fe28bb42
+EBUILD nodejs-99999999.ebuild 6058 BLAKE2B 06c5909d0ea476b144d92d6dfc9daaf21854e43e52488af26e3f5a5e83996f5b1c0256ca8ceb5f00515774a5b8e57c66a1e56fe57d516a398031a83a93643711 SHA512 f05beb244a2339863f9b61d11ba0427bd646b2336fadda1a4cb3aaa06e2525d9de8159f34b654e87909486007ac8ac24e03deb1b1a71b951b601f17957d61e6a
 MISC metadata.xml 549 BLAKE2B 89d9231225010c703e933104cc5beea0706d4e865c61c6cb4f95194d2e0b0e4445800eae8c1074c5c313ace3cf3de2a71a05eed880f055b477023dff9729ab2e SHA512 e34ee9c52b2793f6dddb1f82f538598b5085a4bfea37e30047bd3e9bfabce52e3b826b8a2fe8e0e0842a288e14d8f3c229815e287354bdb121ba3e86018303c4
diff --git a/net-libs/nodejs/nodejs-10.18.1.ebuild b/net-libs/nodejs/nodejs-10.18.1.ebuild
deleted file mode 100644
index 489857c39f97..000000000000
--- a/net-libs/nodejs/nodejs-10.18.1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.28.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.39.2
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-DEPEND="
-	${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-10.19.0.ebuild b/net-libs/nodejs/nodejs-10.19.0.ebuild
new file mode 100644
index 000000000000..9134f5e478fa
--- /dev/null
+++ b/net-libs/nodejs/nodejs-10.19.0.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.28.0:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.39.2
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${D}"/usr/share/doc/node "${D}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-12.14.0.ebuild b/net-libs/nodejs/nodejs-12.14.0.ebuild
index 1d622544b67b..511d490c1153 100644
--- a/net-libs/nodejs/nodejs-12.14.0.ebuild
+++ b/net-libs/nodejs/nodejs-12.14.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
 
diff --git a/net-libs/nodejs/nodejs-12.14.1-r1.ebuild b/net-libs/nodejs/nodejs-12.14.1-r1.ebuild
deleted file mode 100644
index b8a749a17459..000000000000
--- a/net-libs/nodejs/nodejs-12.14.1-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.33.1:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-	"${FILESDIR}"/${PN}-99999999-llhttp.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares
-		--shared-http-parser
-		--shared-libuv
-		--shared-nghttp2
-		--shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-12.15.0.ebuild b/net-libs/nodejs/nodejs-12.15.0.ebuild
new file mode 100644
index 000000000000..f1734688f143
--- /dev/null
+++ b/net-libs/nodejs/nodejs-12.15.0.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.33.1:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/http-parser-2.9.3:=
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-99999999-llhttp.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares
+		--shared-http-parser
+		--shared-libuv
+		--shared-nghttp2
+		--shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-13.6.0-r1.ebuild b/net-libs/nodejs/nodejs-13.6.0-r1.ebuild
deleted file mode 100644
index 640cc3cc0b12..000000000000
--- a/net-libs/nodejs/nodejs-13.6.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.34.0:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-13.7.0-r1.ebuild b/net-libs/nodejs/nodejs-13.7.0-r1.ebuild
deleted file mode 100644
index 35f1444b8a49..000000000000
--- a/net-libs/nodejs/nodejs-13.7.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-PYTHON_REQ_USE="threads(+)"
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="
-	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
-"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.34.1:=
-	>=net-dns/c-ares-1.15.0
-	>=net-libs/nghttp2-1.40.0
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-64.2:= )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-	pax_kernel? ( sys-apps/elfix )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	# We need to disable mprotect on two files when it builds Bug 694100.
-	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=(
-		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
-	)
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot || myconf+=( --without-node-snapshot )
-	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${EPYTHON}" configure.py \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	default
-
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		docinto html
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-
-	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	elog "The global npm config lives in /etc/npm. This deviates slightly"
-	elog "from upstream which otherwise would have it live in /usr/etc/."
-	elog ""
-	elog "Protip: When using node-gyp to install native modules, you can"
-	elog "avoid having to download extras by doing the following:"
-	elog "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-13.8.0.ebuild b/net-libs/nodejs/nodejs-13.8.0.ebuild
new file mode 100644
index 000000000000..16dce04460c4
--- /dev/null
+++ b/net-libs/nodejs/nodejs-13.8.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+	https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	inspector? ( icu ssl )
+	npm? ( ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.34.1:=
+	>=net-dns/c-ares-1.15.0
+	>=net-libs/nghttp2-1.40.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-64.2:= )
+	ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+	pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	# We need to disable mprotect on two files when it builds Bug 694100.
+	use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
+
+	default
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local myconf=(
+		--shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+	)
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot || myconf+=( --without-node-snapshot )
+	use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${EPYTHON}" configure.py \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	default
+
+	pax-mark -m "${ED}"/usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		docinto html
+		dodoc -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+
+	mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	elog "The global npm config lives in /etc/npm. This deviates slightly"
+	elog "from upstream which otherwise would have it live in /usr/etc/."
+	elog ""
+	elog "Protip: When using node-gyp to install native modules, you can"
+	elog "avoid having to download extras by doing the following:"
+	elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-8.17.0.ebuild b/net-libs/nodejs/nodejs-8.17.0.ebuild
deleted file mode 100644
index b45783fca1bc..000000000000
--- a/net-libs/nodejs/nodejs-8.17.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
-REQUIRED_USE="
-	inspector? ( icu ssl )
-	npm? ( ssl )
-"
-
-RDEPEND="
-	>=dev-libs/libuv-1.23.2:=
-	>=net-dns/c-ares-1.10.1
-	>=net-libs/http-parser-2.9.0:=
-	>=net-libs/nghttp2-1.39.2
-	sys-libs/zlib
-	icu? ( >=dev-libs/icu-60.1:= )
-	ssl? ( =dev-libs/openssl-1.0.2*:0=[-bindist] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/nodejs-10.3.0-global-npm-config.patch
-)
-RESTRICT="test"
-S="${WORKDIR}/node-v${PV}"
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i \
-		-e "s|lib/|${LIBDIR}/|g" \
-		-e 's|share/doc/node/|share/doc/'"${PF}"'/|g' \
-		tools/install.py || die
-
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myconf=( --shared-cares --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
-	use debug && myconf+=( --debug )
-	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
-	use inspector || myconf+=( --without-inspector )
-	use npm || myconf+=( --without-npm )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
-
-	local myarch=""
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"/usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs
-		dodoc -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index aad8df6897f2..70a17cfbe3b0 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 inherit bash-completion-r1 flag-o-matic git-r3 pax-utils python-any-r1 toolchain-funcs xdg-utils
 
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index 9aab40f5fc82..fdf6d31c279b 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 1532 BLAKE2B f80fa0860316eb0352ca01daf10b544b963a5b7644cf4c14c7c94f16b7fb065ba27b872a2c3d079803287472977dcc34a61b3c64c6b653271be28dac05e81e1d SHA512 74e01aec4b7335fccc5a744ba3693b42c32578e5b128493bb4f88b73ceaf42d622f5304416c4fd136f31f0da2b14ed6789c82e30ef69b7481420712ecee749c4
+EBUILD rest-0.8.1.ebuild 1533 BLAKE2B bf6c28bfdf25513445316d726148ff595b584cb8c866863050f839b75c96f19cb2e9fcfa1b481309f99b07a5e5064f7a83681088cfc23f53260e42664f89925c SHA512 95e7d8598b2b0827cef026d6747cbd95f0ea8cf82029c0f810cd341859c4c9a986bc564de0091e795754b422948bc40b98337e7ffaf441ba964c9afd770cd779
 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 91da837445dc..541ab5c65511 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0.7"
 IUSE="+introspection test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 s390 sparc x86"
 
 # Coverage testing should not be enabled
 RDEPEND="
diff --git a/net-libs/ripe-atlas-sagan/Manifest b/net-libs/ripe-atlas-sagan/Manifest
index 808600036966..7557c56133e7 100644
--- a/net-libs/ripe-atlas-sagan/Manifest
+++ b/net-libs/ripe-atlas-sagan/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.sagan-1.1.11.tar.gz 102136 BLAKE2B 21ca1745daa4073d392a50630355bf793e656efb24bb8c529222a5ce20ae209b886781fc51aff8b25b832e1d804ef10d55f8cb8d504021add93d0d23900a9489 SHA512 4c2ba0774be46cf9dc9eafe5904dd7915f21bfa047fcf5867d6e1a41a4370f70cc837d398368efa2f4b24750f655514287dcd5b97a1b47e725fba3f17f49d477
-EBUILD ripe-atlas-sagan-1.1.11.ebuild 877 BLAKE2B fc316f02d06dc562a563dbb25acdba74e7871bd7fb34083f86ddfafa3ef00658f4f94b8e21a68e9318a2e1f1ceb9b02e860773dec9b5a7d99f4cab61ef3873e8 SHA512 b0d51f9331fcc30e360f307d10016881a0c1caaafeae1b823ad976a7d6cdb6e8ba0b2a3bfc838c3909432e491ec3949685ed81b7a5a53b5e81793b7b4edf9273
+EBUILD ripe-atlas-sagan-1.1.11.ebuild 867 BLAKE2B f148cb50493aac6c973b6b511eddf189dccb2aa6d40bdf0ae439283f2cbf601acfcfca36132be922ac287f8e20441f00b5fb620518c89e86c405ac9d3e829b92 SHA512 54b7100bc17a1222941108ad20b165b229fe879ce09de53fedb8d52d34c5ecc70a4b4e6267d9c27041ab3b58bbf77bb31dd1203e6c823123bab684faa9089e32
 MISC metadata.xml 245 BLAKE2B 8861d59570b93b8a74d1547866a7bc2fe18de2b72b16cac928c367570770a591ba1b288080c32f0d6228628974fe707c80c5f236317b4c8d2681d496625b8897 SHA512 a18c8deae207bd61184671671720a29b821623c050edf253b37cdebb500ea1ee84f219baa503cee046b76fb6a8d5ad1ca18cbf646754490aadb040d9b32bdf96
diff --git a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
index 71dc20c7c259..1d8425e5b9b2 100644
--- a/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
+++ b/net-libs/ripe-atlas-sagan/ripe-atlas-sagan-1.1.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/net-libs/sofia-sip/Manifest b/net-libs/sofia-sip/Manifest
index 5fe76d24b43d..d711b56ea84f 100644
--- a/net-libs/sofia-sip/Manifest
+++ b/net-libs/sofia-sip/Manifest
@@ -1,3 +1,3 @@
 DIST sofia-sip-1.12.11.tar.gz 2927808 BLAKE2B 2723aef491b5f85c047cc54a191fdd2ae63b23445f24b6ee9910af88e2daa684eded6e44cee50c3a52bec2901b5310f34c09e7cf4efce714210755046ceaecd7 SHA512 48bef0223ecf5a31267773c8e2491c1990b4419be67154e350cc9e5644a98e55409d635d7828824de3e0e1658caebe5b61e44d613615beb709ecbe8180be131c
-EBUILD sofia-sip-1.12.11.ebuild 862 BLAKE2B 2c40f326263b5109677ebe0e9e3e939454383f597d0499a7c121a70896e4f78ec58deb2b79c99edae3b94579ec9f55deb459297947a7135b17178440ddd5f6cd SHA512 706bbdbb5d2d9c82879463bac3af47f9442af081808b6c6908eaa8c31c2f9c6345cf055b55f3ad265d887ace620299adb1c61e95180531c8551001a1d1374ca3
+EBUILD sofia-sip-1.12.11.ebuild 827 BLAKE2B f5873a2708aad931a3d3077948518e24d6ecf8dbe368b86d6997a14593b6256915605461683b387e98354449f07242967fd550a00a9256e42eb1d157e5991cdd SHA512 3adde3c1ce0f05434cbaa3f29b07929027cb76b2ac6f2a039655aa4595f7f5873b6628e637f871fe2472e7f61a093267f0743298faabc414e7214d681cf1b604
 MISC metadata.xml 332 BLAKE2B 20075415729415694d925419349c24403e4dd8181e0e3e2b6dbdb682d0cd9625dcf6196152ee4983615fa34c7b972e10799d190fcde04f4e4ebd4e41c3fb942f SHA512 cd0911cea94332c8e64908a7537ea78683c562638aac05ab1659873ce5c43d378fedb09f848badb12258078779a172ef87313a2b6fb5001a3f33bd954ce7d420
diff --git a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
index 0cef361a73d1..243bb87cbb21 100644
--- a/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
+++ b/net-libs/sofia-sip/sofia-sip-1.12.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="RFC3261 compliant SIP User-Agent library"
 HOMEPAGE="http://sofia-sip.sourceforge.net/"
@@ -10,28 +10,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1+ BSD public-domain" # See COPYRIGHT
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ~ppc64 sparc x86 ~x86-linux"
-IUSE="libressl ssl static-libs"
-
-RDEPEND="dev-libs/glib:2
-	ssl? (
-		!libressl? ( dev-libs/openssl )
-		libressl? ( dev-libs/libressl )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
+IUSE="libressl ssl"
 # tests are broken, see bugs 304607 and 330261
 RESTRICT="test"
 
-DOCS=( AUTHORS ChangeLog README README.developers RELEASE TODO )
+RDEPEND="
+	dev-libs/glib:2
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		$(use_with ssl openssl)
 }
 
 src_install() {
 	default
-	rm -f "${ED}"usr/lib*/lib${PN}*.la
+	dodoc RELEASE
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index db5dbf61b9bd..5bc923bcb7b5 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-r1.ebuild 1494 BLAKE2B 206d77fdf48eeb46e4024c5ca6b46c8bbbe5ceb4f2201705ea36e0793f9d256a7e48ec66a619dd647aceba96a93b7e941bbd6938cf1af15720ff52cdc419c657 SHA512 30f3c4a0bb3b9109a739ee83a610c89c85193285ca7f850c610a05d04957f8ac40651b0ce787ad18b7481ed695f965426c0aac792532f43b82099b383443ca9d
+EBUILD telepathy-glib-0.24.1-r1.ebuild 1484 BLAKE2B 51409cd00b5bb79efc3147ab65c266bd6a5fc665782c5e7921f70022c7c4ef79013b69520da1a2d9e2bb0ff104b956e5b243066ac568b745e77a0300a0a65afd SHA512 c46ae24155de0d6ebac3a759f65f824c6da0725fc8f58fe91047b1acedc9768bed180ae6606450f950c73cea43cac91d5e15a6daed04d23947fb99b99c7c9848
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
index 94d8c5de0d58..a1622c2cc1c5 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.24.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
diff --git a/net-libs/udns/Manifest b/net-libs/udns/Manifest
index b015cd51f150..1b4f5f7b8798 100644
--- a/net-libs/udns/Manifest
+++ b/net-libs/udns/Manifest
@@ -1,3 +1,3 @@
 DIST udns-0.4.tar.gz 84716 BLAKE2B df41b325ae2ffaaaf09e1bb6f52d9e9a7c468c70d8bec849cb90ebcb1fac773ee2dc7e37125a75750b61a1a78d0416e6c9aeb72e43780b474d36e370a1b9cd8d SHA512 2990d57b3b6bf176a12ee07fd4391921e13634fc8409e8ce4df8dbe7b3556a116ae59ab328a1b6a95ebc94298f6b56ec7197a06a649d8d642b371b8ecef3e40b
-EBUILD udns-0.4.ebuild 1061 BLAKE2B a9b22b19fce5bda505da153d26ec15bc2a94a057c16002f65773d272d763132a17c29f066d02009322ad37e335b5564caa6445a653c55b97bff36d8572e724e2 SHA512 13ef0e82fd344454d8430c07d6e48aba252a552a8218e8d7f005b22f64e319ef13dab34a6c21170c120dd11d6f0a6b832dbd263efe50ecb9f5539b839fc45ae9
-MISC metadata.xml 401 BLAKE2B 4a02ce216fb82441c4add303cba714bc621299b1fdd944203297925e9464751e683cb64fc2f7ead3df8de41da6b6cccc5e6fb884820fba841320e486a91ed950 SHA512 dea311676ce60848f158807241d561e062fb5b51a37137b732af1014d9ea702e57870c3125067ce90795bf97b1d3a2da8cad242fb4cc4e210ae7509b7f3362dc
+EBUILD udns-0.4.ebuild 893 BLAKE2B 7b67c92518e41801f16b9fe6b7e35e631dd57470ff990dc096c34e78a73561abfd0f8165e32a0f18763c393648f2b74a05a1b402819ec6efa6aeba5a03ef4a9a SHA512 8764faf2b5833b088da391a77d1cc9cb2a333914b4a3a4e301f728a275a7e5c8e9ff80734eb5f70bf8fe5359faa0aee198351dab0c5b2b802564a80355a834fd
+MISC metadata.xml 409 BLAKE2B 6510a2258c168dc9178a2e6a62a744aaab91473efdbdf3edc6363136dd7feb368a57f9c75102da1a18e5aa9dc35b176038084e2df179752d19e3fe420e665f67 SHA512 29624e7be711a2354602a33d810e4411090797caf78826f0df30c07b88914f54fe845b9306073352abfa1a42de7651badd576dc0f46135637df10e8044ff904b
diff --git a/net-libs/udns/metadata.xml b/net-libs/udns/metadata.xml
index f0db182dbd42..63f962261674 100644
--- a/net-libs/udns/metadata.xml
+++ b/net-libs/udns/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="tools">Build and install dnsget, ex-rdns and rblcheck tools</flag>
-</use>
-<longdescription>
-UDNS is a stub DNS resolver library with ability to perform both syncronous and asyncronous DNS queries.
-</longdescription>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="tools">Build and install dnsget, ex-rdns and rblcheck tools</flag>
+	</use>
+	<longdescription>
+		UDNS is a stub DNS resolver library with ability to perform both syncronous and asyncronous DNS queries.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-libs/udns/udns-0.4.ebuild b/net-libs/udns/udns-0.4.ebuild
index f19b2595dc0b..0953628925ed 100644
--- a/net-libs/udns/udns-0.4.ebuild
+++ b/net-libs/udns/udns-0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Async-capable DNS stub resolver library"
 HOMEPAGE="http://www.corpit.ru/mjt/udns.html"
@@ -14,26 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="ipv6 static +tools"
 
-# Yes, this doesn't depend on any other library beside "system" set
-DEPEND=""
-RDEPEND=""
-
 src_configure() {
 	# Uses non-standard configure script, econf doesn't work
 	CC=$(tc-getCC) ./configure $(use_enable ipv6) || die "Configure failed"
 }
 
 src_compile() {
-	if use tools; then
-		emake shared
-	else
-		emake sharedlib
-	fi
+	emake $(usex tools shared sharedlib)
 }
 
 src_install() {
 	dolib.so libudns.so.0
-	dosym libudns.so.0 "/usr/$(get_libdir)/libudns.so"
+	dosym libudns.so.0 /usr/$(get_libdir)/libudns.so
 
 	if use tools; then
 		newbin dnsget_s dnsget
@@ -41,12 +33,10 @@ src_install() {
 		newbin rblcheck_s rblcheck
 	fi
 
-	insinto /usr/include
-	doins udns.h
+	doheader udns.h
 
 	doman udns.3
-	if use tools; then
-		doman dnsget.1 rblcheck.1
-	fi
+	use tools && doman dnsget.1 rblcheck.1
+
 	dodoc NEWS NOTES TODO
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 17d18bf83ff4..72dfd681f567 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -5,7 +5,7 @@ AUX webkit-gtk-2.24.4-eglmesaext-include.patch 467 BLAKE2B 10bcb2f1b0eda42c6d7e7
 AUX webkit-gtk-2.24.4-icu-65.patch 1991 BLAKE2B e69612d43f66e9e31190c3b35e5ea2581ce3726c685e719b4040e670dc7ae236f6a024b5d33659ccac172a9eef442eddf35f4ebfcabc7cfdfd1cfde217f341e1 SHA512 8eab3ddf0dea73f2ba41c3c1ff7f9643334ad52ac61adcb86d1352b9367b03f0ffd072b8f910aaf875134d3f09d1106db7e44f38c8c4756555c0e5fbfe6a53cf
 DIST webkitgtk-2.24.4.tar.xz 17575784 BLAKE2B c30683ea365a50d7def572305b49278343d67739f9bd3cfd78cb08b5cc87b5453504df9b09752f8d6483b18b9b812f3d3cddc084762cfa8990fcc651660b89c2 SHA512 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
 DIST webkitgtk-2.26.3.tar.xz 19331900 BLAKE2B 14c31b0f640b0f859a3c1eeda542f176f6c7981270c5be3225556eb4a1027a2511039cf0f33682faa93846c4ca5ed64158574a9b8a662a4a200b97cad28d5ed0 SHA512 9575c86ab5752c09841878cf55134e7de9a87200e55017859cd02affb1cadd58031a7b6f67a580e87a1dfe4fc830fed9774ba289e7244d3ead9eb9328e76d7c9
-EBUILD webkit-gtk-2.24.4.ebuild 8454 BLAKE2B 10631c75c8b9029abf668d101072c072c99e13a91f6ca5f600f99d99cce28897e652d2f948c888854c36b9e137eadff1254821864ea68ee2f2a0ec008dad11e6 SHA512 57d65303beb76f6230843b38070b6fe12e70cbef59e796995ad76dc5546c48fe545fb5a56dbc987b02fe7610cb6f369dc2b18c3850068f358fd35882f75e29e2
-EBUILD webkit-gtk-2.26.3-r1.ebuild 8811 BLAKE2B f2724bb87055ce62a9e9a1852ddc9a1e374df031f660bc5d89745b08fec8444ef47a0cf9a03217bd95c37c0c07a776ebc01994b6859f78c23a9191098f12652b SHA512 15ceee38524291a9d50e2b5170bd77859cbfc307f2772c8e3decf729ddd0c3ef561dea71de08aae50635d36526c607cb149e100665c2171a109ccd706d829a40
-EBUILD webkit-gtk-2.26.3.ebuild 8809 BLAKE2B 9ce5737250e3ba643c31ef7fe597a9ad02de2940b7c882bf7b85e8ddae8b3e501b2f2ca959a93acccf6f7f05f7acfe187a0565ddc883ae16dd224ffbebfded53 SHA512 04d085b7f72f4510675a372f44451bb1fdefeea889242506de9b9597fac1b357756f5df3ae39bc2ae6eb90f382a16df7e869787f7d9afb84d0d2d41d57984b46
+EBUILD webkit-gtk-2.24.4.ebuild 8450 BLAKE2B aa5c958a3b3961bb8e32ad0571dc18e69ebca19b22ed009e3398ee97ef137e19e1f997e743723491bf7c37a32f1cba69e21fbddb61d193f42b35a0ba48bae16e SHA512 6294d57daa1d3bc6ad1ee775c2bcadd299d6ce9498a77b84b1492704accc5442a2022e1dd52fa715b0668f6ab15e09fad6d5628a2d4ec1eee5cd2720f2e6e723
+EBUILD webkit-gtk-2.26.3-r1.ebuild 8807 BLAKE2B 4e9d8c8f9c12fe0e330d464c7b994cc7478787f046c56c698bd0972312179a7ea7dae9fd4f5a7a62d4f63f8987b9d7e314a926fa933bfd65efb6f1a7361b1448 SHA512 45c96ab14a908208f6b03213d8966043658a202f67b21f1a82d8f62c2195720728559b27831f4b9219a51a109ba3dd5b27dfed8793f68de3485b707642164e86
+EBUILD webkit-gtk-2.26.3.ebuild 8805 BLAKE2B 2affad3cc9fd2df14b5403fdddad7c68c476675be1f967b54f4118490148f4277f76b2485f760e634da8bf87a01ee324d952dfca3d65065049b84ad97faef9b4 SHA512 29c2251a33e36f14f6d8490d94e8f2f72d55576daf684fec5c6606eeaddccdbd227f9fe56971805d541ec3a9b1e8a29ac3fbe7c0d565bf20f90a9dfd26422b96
 MISC metadata.xml 837 BLAKE2B 58680ed3ff0941924b33c03aef91322437b90c88e46951bf780b99507b7dfd599d055c8109a45e8fde18a9d871c19b9e86d21550cd0a01bc3e02db2f075ccfda SHA512 6a8191200dd2e84ac2cfaedeecc753d8a9201d764acedd2b11c707e8ce21ba5b0e91e73c4342efb33c96a46a65c2a67736cb32599f07219acc9bdd38d453203d
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
index 3300742c1964..47f5da095e91 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.24.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit check-reqs cmake-utils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs virtualx
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
index bc2267a80b9a..859e268912a3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 CMAKE_MIN_VERSION=3.10
 
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
index d3c8a17109f7..799da223a868 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 CMAKE_MIN_VERSION=3.10
 
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 5b6086ad936c..6516fc61e738 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -3,5 +3,5 @@ DIST zeromq-3.2.5.tar.gz 2082960 BLAKE2B 88fe3b3206f0e59acb3cf370964c9e40df2dceb
 DIST zeromq-4.3.2.tar.gz 1697442 BLAKE2B 70a1f6da357987c32483050fcf86cb81a1fb0b65a527f6900f54eea8958c6aa6024af04067114663824d42305f507cba67e03c7aaab7e23e4f6332d4368613eb SHA512 b6251641e884181db9e6b0b705cced7ea4038d404bdae812ff47bdd0eed12510b6af6846b85cb96898e253ccbac71eca7fe588673300ddb9c3109c973250c8e4
 EBUILD zeromq-2.2.0.ebuild 1230 BLAKE2B 3481bc6a49217938f6fff44ba4a72642ff3abb7dbc18bd911dafba960d698bc61ac88645dfeeca06b570d5730789c4d27344d60c2b75e188b30261b67465f5c1 SHA512 f11d23122d6ff6db52b5c625a5e2a994c0ab9741681e1be2dedd6f6bfdc3be9107141dedf9873a448447e61e1aeb1cab025ca37a2948930bc38ba780d25c612c
 EBUILD zeromq-3.2.5.ebuild 1493 BLAKE2B 44f12a38570540f82df5381908f68759b02a423b9a0e9ff014432c02bf6538f2fd08380eb241a6ef7bad12b50bbff0e53b72a05cea11dfb012dab3b229b7c3c8 SHA512 2b5999497c19de44b8846ee173d8dc96ace8d2e9ff1c9f0e1e1ef8633513ed2bea7a33cdf2947b8c5cfda36911a405132a71114efad45c1e40ca6cfb878a0918
-EBUILD zeromq-4.3.2.ebuild 1437 BLAKE2B a46c410299ad9eb963c8caf1e5f08eed59d2bb90f7e66431ec48be38397f7ef35a6ee8b8b13191e3b87ad025b7d1569868389af88c6e3814125fc8453326af15 SHA512 3b1b7809d09e0f310682f73d1008962f37bcf40638482a833fc6c86e1628db7fa3b825a172f34a386c51c260368687835b160be52cb1a8da1806ce00caa5f038
+EBUILD zeromq-4.3.2.ebuild 1435 BLAKE2B 0d02a1ca2bbc9645e54deaaf1dbd6b0726fdda72cf6bb0e8735e78dc4a5fcb10bbf468a97de5f83ce4d3f50047cc1fd1174439fb6080abb8486693f86b379f41 SHA512 d956edfe303d77fd218b9d2d00b422f51c165f2e07d5dff06f24ea81ca32b44e8a13b89dc48713d434dae747feffcc4fe482b039cb0f945b450e515245201063
 MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/zeromq-4.3.2.ebuild b/net-libs/zeromq/zeromq-4.3.2.ebuild
index 8535b875a1d0..0874e5a0f299 100644
--- a/net-libs/zeromq/zeromq-4.3.2.ebuild
+++ b/net-libs/zeromq/zeromq-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
 	sodium? ( dev-libs/libsodium:= )
-	pgm? ( =net-libs/openpgm-5.2.122 )"
+	pgm? ( ~net-libs/openpgm-5.2.122 )"
 DEPEND="${RDEPEND}
 	!elibc_Darwin? ( sys-apps/util-linux )
 	doc? (
@@ -57,5 +57,5 @@ src_test() {
 
 src_install() {
 	default
-	find "${ED%/}"/usr/lib* -name '*.la' -delete || die
+	find "${ED}"/usr/lib* -name '*.la' -delete || die
 }
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 88e81215fdd5..88168ea2240d 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest
index 5b2d3607cf36..9dc76706830c 100644
--- a/net-mail/automx/Manifest
+++ b/net-mail/automx/Manifest
@@ -1,4 +1,4 @@
 DIST automx-0.10.2.tgz 410456 BLAKE2B 8ea2b84a2934d1cb6b97161906ae071e38729c5d297ace5b5874bba8d8a695fe0edf5023c3429cd9f510373286880e977f649861efefea7bdbd61e88d63420f0 SHA512 88f844d70439985dd55cc694a58bc1fe313162ba47c7675fb15143c107d76974eee043faf5715d7ba9a5918686d491f5efabe9785e90cf399492871f08b2e38d
-EBUILD automx-0.10.2-r1.ebuild 1421 BLAKE2B 86defecb23efbeaeb61cc27ea10b49cc0952a56c34a03ef631da74f2aaa9c3d947a845d0dd97ca9df7318c22ad072f8b98492aed7ec5a37eb6041249bb580f33 SHA512 ac37eefebdd77d8fd5cc06d138b6413affb8cb0cb81e0037505446de1b5c1c4d23f62add350c1a1d7134c91bef0235eb601ea79d8676d8ec9ab6b2a0c7707f62
-EBUILD automx-0.10.2-r2.ebuild 1460 BLAKE2B 6afb32dada7f5a6e62830dffc73c8e1bdc13a7b78a6aedea4f0ffce7515cc697702276b874ea9d2ca1da1e2d7b9ab5fe091fac76bdc8a58c7ab62516e0ded988 SHA512 71357c1b1bd8a5519e1c7332974c18b64fe7ae350325f7f050f588546d6eb358a08ea44e51fc453ba18838908b5e71a855a60c818f25823b4093d8ee0e891a1f
+EBUILD automx-0.10.2-r1.ebuild 1496 BLAKE2B 2ea117288cc9334e346a1ab77162aeea2f368be59c5806511b4f274a2d59dfb357bfdf4077f81986d8fa308c7ffe85152e38843c6f80db6df34315ffee857e31 SHA512 b6ccd66759ebfcd3eaa9657758b8927309c881c9722955a8d51b0885923fb44c6c46f903e845a9a80cf91355d2518e57aefe5b13154cfb7a0a1487018cc88c02
+EBUILD automx-0.10.2-r3.ebuild 1542 BLAKE2B bee9cc4dc2539d2bc2f7cb0fa9010d6d07f57c2f481bc466c88ec9af9d1aa07eeca6fdb2b21c651e538a828dfb7e75a333d6853d70162e9d1a8709e2203de3a9 SHA512 f738234a4297527a7794e7ca418f3d664d1dd3f1f1893edaa3ee7cc8f889610777dcfed539ab83f5129b100767193c2b096997a94207c1bd4ec801cbf1b04a90
 MISC metadata.xml 538 BLAKE2B 0a90c652c721d0ebda9b6359d0325ed40c8a356b6dada77c550b7f184a3073584c2e232ebab9c8be58f13ba1d93294479528128397a459281236cb4401f5ada4 SHA512 851cb5d749750e3c8b360248d32bdf5c7c5fa626ff329e5104f0e9f8f639a42df12d36ddd93b6cb962567094fa1150666900491b8bcb906aadd427c38fa2c5f2
diff --git a/net-mail/automx/automx-0.10.2-r1.ebuild b/net-mail/automx/automx-0.10.2-r1.ebuild
index 8e254aba86e7..272effe35240 100644
--- a/net-mail/automx/automx-0.10.2-r1.ebuild
+++ b/net-mail/automx/automx-0.10.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,13 +18,15 @@ KEYWORDS="amd64 x86"
 IUSE="ldap memcached sql +tools"
 
 DEPEND="
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	|| ( www-apache/mod_wsgi[${PYTHON_USEDEP}] www-servers/uwsgi )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]  )
-	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		|| ( www-apache/mod_wsgi[${PYTHON_MULTI_USEDEP}] www-servers/uwsgi )
+		ldap? ( dev-python/python-ldap[${PYTHON_MULTI_USEDEP}]  )
+		memcached? ( dev-python/python-memcached[${PYTHON_MULTI_USEDEP}] )
+		sql? ( dev-python/sqlalchemy[${PYTHON_MULTI_USEDEP}] )
+	')
 	tools? ( net-dns/bind-tools net-misc/wget )
 	"
 RDEPEND="${DEPEND}"
diff --git a/net-mail/automx/automx-0.10.2-r2.ebuild b/net-mail/automx/automx-0.10.2-r2.ebuild
deleted file mode 100644
index 83f6b39167bf..000000000000
--- a/net-mail/automx/automx-0.10.2-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=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A mail user agent auto configuration service"
-HOMEPAGE="http://www.automx.org"
-SRC_URI="https://github.com/sys4/${PN}/archive/v${PV}.tar.gz -> automx-${PV}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap memcached sql +tools"
-
-DEPEND="
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/m2crypto[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	|| ( www-apache/mod_wsgi[${PYTHON_USEDEP}] www-servers/uwsgi )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]  )
-	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )
-	tools? ( net-dns/bind-tools net-misc/wget )
-	"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	sed -i '/py_modules=/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	DOCS=( INSTALL CREDITS CHANGES BASIC_CONFIGURATION_README )
-	HTML_DOCS=( doc/html/. )
-
-	distutils-r1_python_install_all
-
-	docinto examples
-	dodoc src/conf/*example*
-
-	doman doc/man/man5/*
-
-	if use tools; then
-		dobin src/automx-test
-		doman doc/man/man1/automx-test.1
-	fi
-
-	exeinto /usr/lib/${PN}
-	doexe src/automx_wsgi.py
-}
-
-pkg_postinst() {
-	echo
-	einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions"
-	echo
-}
diff --git a/net-mail/automx/automx-0.10.2-r3.ebuild b/net-mail/automx/automx-0.10.2-r3.ebuild
new file mode 100644
index 000000000000..6c1f32ad9c3a
--- /dev/null
+++ b/net-mail/automx/automx-0.10.2-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A mail user agent auto configuration service"
+HOMEPAGE="http://www.automx.org"
+SRC_URI="https://github.com/sys4/${PN}/archive/v${PV}.tar.gz -> automx-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ldap memcached sql +tools"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/ipaddr[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/m2crypto[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+		|| ( www-apache/mod_wsgi[${PYTHON_MULTI_USEDEP}] www-servers/uwsgi )
+		ldap? ( dev-python/python-ldap[${PYTHON_MULTI_USEDEP}]  )
+		memcached? ( dev-python/python-memcached[${PYTHON_MULTI_USEDEP}] )
+		sql? ( dev-python/sqlalchemy[${PYTHON_MULTI_USEDEP}] )
+	')
+	tools? ( net-dns/bind-tools net-misc/wget )
+	"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	sed -i '/py_modules=/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	DOCS=( INSTALL CREDITS CHANGES BASIC_CONFIGURATION_README )
+	HTML_DOCS=( doc/html/. )
+
+	distutils-r1_python_install_all
+
+	docinto examples
+	dodoc src/conf/*example*
+
+	doman doc/man/man5/*
+
+	if use tools; then
+		dobin src/automx-test
+		doman doc/man/man1/automx-test.1
+	fi
+
+	exeinto /usr/lib/${PN}
+	doexe src/automx_wsgi.py
+}
+
+pkg_postinst() {
+	echo
+	einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions"
+	echo
+}
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 8dc159bdf1d3..6d873d4b7518 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -9,7 +9,7 @@ DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1
 DIST dovecot-2.3.8.tar.gz 7136958 BLAKE2B 2769169519f0fd9293178e8d200467bc5be0f362bc6bfb3dcc6cc74ed146ecf66dab7730013704b70f0cc75a87ee5e52994137cd63c7c12c56bddcea37cedd07 SHA512 f62439e2ea77ffb544a7752c07085582c5653c64671cb42dd7a7e5aa69eb87059c677aa1fa071efa1ddd2287ab621e9a264ec115be2aeb2f43ab4c685411eae3
 DIST dovecot-2.3.9.2.tar.gz 7182306 BLAKE2B 942718ebdb7c447096895fc4309dea930ff87166f06be3365c6463e2aed95bb2620a5e45a8ce260df647593d9d2cef1d2a3ba3aa0afb397dac81653f9a4fd519 SHA512 36e8270bfa33e2bd6aa89017e65c7d1650c494c79ff297759a4b01c026aebcfdf5b1b542d4357e1f9dc2bb8169ef67064f0699b17ca36d658deb70b4c800b253
 EBUILD dovecot-2.2.36.4.ebuild 8572 BLAKE2B c5900ba2365ac280429b669a91f4cfc537f689c9fc9d52d3bd62a170467278ddd4736c2ba850ed1f97f775eb9fd132047bf9ea84625d3665270b83ab380c2931 SHA512 8c48542c6bd7831aca19b38b3af1c220cc43f1b9a1db22ce44d2c9c9f8f44a1387cb4e0b8ced38304e1e6b790c6ab81473f418f14ca922dbd50554e9190c596e
-EBUILD dovecot-2.3.7.2.ebuild 8685 BLAKE2B 3d1e881916c146ddb99e35d4b2685621b15b8fc53bed5c7f27722df2b0ed69d37c33fcbc815c2b9c4aed91d4345918d4537863b60cf902ca54d756ec52e58ebb SHA512 4069533fb22ad76836ccbfe3ef76ae9fa9cd276de0e21a23555cdaf9d645a76f65a9552037de26c1eeb04aa0ce18ea90255fdac09c91c09971384bf589eda185
-EBUILD dovecot-2.3.8.ebuild 8558 BLAKE2B 7aa5ef722151554d553c69c02aa8c38622306561acf87dd02d0f84d32121f3d527f13b7aaf45656aa7055594ba15ba45f4933ccd82456eb8276ab39bc64a4222 SHA512 a5448124ac35c0d660998f1de3d2209d1e7b6d6bdc6de4e1811b8572aa19b4aa41aad01f4741cc6ef9abcc66b051ffec9fd106be8c31772781d3e74f0a46042e
-EBUILD dovecot-2.3.9.2.ebuild 8558 BLAKE2B 8079b41d7d4a3e96aa36ee7e2a83a95142e0d54cd7a633211ba3d80fbb97f68edc65d559497b64c2cf912ed4d42b27e6f9bfd963ed1f13ad1bae6d05dd5df45c SHA512 2c8845baa6064cc79533f24a83bba84f322681710b76a9900e2b644d312db90c162155d2aa8ed2b40616dd7b22c6dd9f8d4a6fe7349eecb31831e35e498b2dec
+EBUILD dovecot-2.3.7.2.ebuild 8683 BLAKE2B ab304a1739decf2fc11fbda7c53089bca359a261de02b6e89ecd1e7991ef7a8a3bac56aa58daa17eeb3cfc7a3d09c7200948f8e73555d6d50d55be9fbf83d635 SHA512 5359acad69383ccd6f0a0397bed27ba4f65c2601480fc5fef576b12b405b769c65fa9c79652823e6974c8f99ebac04548a9a25fa1a8b1c14c6d098da571fb8b6
+EBUILD dovecot-2.3.8.ebuild 8550 BLAKE2B 4bbdc8ef748cf3d6743f5daf4b69582c64bc115ecac7f1b3fe84689a4ba08f0139353d6682b74ee8477ceb797a60d8d03b1cdbdb86747424ce53e1086cc684fb SHA512 cd3c5dd78cac9012464d110786ba5e571fa0945530af12a47105ea02568459cb71a7425ab3bcf86e3dd8004025b2c735420a9c81469de6b483f69ee83d1e61d1
+EBUILD dovecot-2.3.9.2.ebuild 8550 BLAKE2B 9423b7264c384580fefa0168ed2d2e95d8793ef556fa6fa464c86a6ab24ca2665f6f7e59f8e1fde34a121b0e75319404f711b5500516696192acc38879124c61 SHA512 c6be5dbe797c99304859a9c313089bfcab27e76f6a36580ce7851a7a9a4ba0547d12d0a9b7cec1f0c6561ad438be293c61d884055707f2b2a82d28af7ddb149f
 MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5
diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
index d8cce941ec7b..52fe0014c1f3 100644
--- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild
@@ -133,7 +133,7 @@ src_configure() {
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
+			--localstatedir="${EPREFIX}/var" \
 			--enable-shared \
 			--with-dovecot="${S}" \
 			$( use_with managesieve )
diff --git a/net-mail/dovecot/dovecot-2.3.8.ebuild b/net-mail/dovecot/dovecot-2.3.8.ebuild
index b32f3cabf59d..8260f0011116 100644
--- a/net-mail/dovecot/dovecot-2.3.8.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.8.ebuild
@@ -91,9 +91,9 @@ src_configure() {
 
 	# 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" \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
 		--without-stemmer \
 		--disable-rpath \
 		--without-libbsd \
@@ -128,7 +128,7 @@ src_configure() {
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
+			--localstatedir="${EPREFIX}/var" \
 			--enable-shared \
 			--with-dovecot="${S}" \
 			$( use_with managesieve )
diff --git a/net-mail/dovecot/dovecot-2.3.9.2.ebuild b/net-mail/dovecot/dovecot-2.3.9.2.ebuild
index 6a614a62c190..f2ee9cd425ca 100644
--- a/net-mail/dovecot/dovecot-2.3.9.2.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.9.2.ebuild
@@ -91,9 +91,9 @@ src_configure() {
 
 	# 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" \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
 		--without-stemmer \
 		--disable-rpath \
 		--without-libbsd \
@@ -128,7 +128,7 @@ src_configure() {
 		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
 		econf \
 			$( use_enable static-libs static ) \
-			--localstatedir="${EPREFIX%/}/var" \
+			--localstatedir="${EPREFIX}/var" \
 			--enable-shared \
 			--with-dovecot="${S}" \
 			$( use_with managesieve )
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index 50f8a9e0834f..f940fdf66970 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,5 +1,5 @@
 AUX libpst-0.6.52-no-static-python-lib.patch 449 BLAKE2B c9d93e38a36485e23b8deaf3a91c8b6806db1526722a704ac3cf1eabd623ae3bf25aaf3a815d63b4b7873dd9a23f7399afe59dade5fa111db0e7ac3ba58f00fd SHA512 9cd44493406a58c522fdfe9423a7b15548af7e06332289c98fc1054822d209aa112d497622b3578531147934fd82335bf8c68cc8e371e31ef4716fb51cb26273
 AUX libpst-0.6.53-pkgconfig-static.patch 211 BLAKE2B 97d8939c3c81365a9100be4ceeacc8303fd2f07c4ece0af40af1bb8750174f6b994ce93089599956aa50b6ff3b17102e37cc16d5426a9b98675d910a7f0f80ff SHA512 eb8d95b07dc96435b7d753c1ea68dfb419867b7b092c3f243de9b5983af29ae368e7e5f3a4ea5a802c82c41a2096bd01564f7f74cd733ac038abb263b6ca4d1b
 DIST libpst-0.6.66.tar.gz 13836942 BLAKE2B f8ac86a2924576fc41aa7bb92a824748d858e9b6b42d3cc7e59959ca6377f458d7bcd738081a9547432f9153b839861f8c0fc5aa0a0c74b0447c2ab126b5bb64 SHA512 0d07b13554b9e009787ce651714281d21a4d38afae997bd87244690538bd18176ab74655c0a0646b1c475c916052d4295ffe749e6a03765450af7e9c8443dd86
-EBUILD libpst-0.6.66-r2.ebuild 1623 BLAKE2B 24092e687f6e8da4659ee80956e3b08c4644766a2c7de499c1c2bd9a741833e6d6a5b091138b0d3adc54f51596e056958dce4aedb587cd42f7b06e3172ef8ea8 SHA512 78852ca61e348a201ce8a9b86c71428806129ece63faad87aeb27261c0af5d9f0e22b11f906f0019478d63ad05ee2d3fd5a2093ada9ee6d20ef1940db42bcf7c
+EBUILD libpst-0.6.66-r3.ebuild 1661 BLAKE2B 18ff6fa687d9e48307fa92000f26c21284c46bdeb1345f383775576ed3c6a6637506e66deea4cc9da8d8cd4a9640e12946959bdc7e2419a08e5acbf338b20be6 SHA512 33ce03c37eb3dc82262d3a729a1f01948bf0a6fe5286cfa0e862f0a2416c44fb89e27e5e2e1e6a07376852d0c9eeb4db03ccb91de71b51c1442c18326c81e804
 MISC metadata.xml 232 BLAKE2B 63277f4f8d2b807cb55686cc487bf534330a954fcb2e43dc24fe5cad241229545305bfd7517ab2b8a652f0ef89c93774f7636fe848145f29695575bd15100418 SHA512 bc3293101ebc8838fe7c3a9ba19bb540a8c5357d9181545dd460bc404637e469866428445b8340833b20cdd44b55ccf88ff97433bd88ba8ee8b7353ceb140b8a
diff --git a/net-mail/libpst/libpst-0.6.66-r2.ebuild b/net-mail/libpst/libpst-0.6.66-r2.ebuild
deleted file mode 100644
index e868dd0afe3f..000000000000
--- a/net-mail/libpst/libpst-0.6.66-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="https://www.five-ten-sg.com/libpst/"
-SRC_URI="https://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug dii doc python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	gnome-extra/libgsf:=
-	dii? ( media-gfx/imagemagick:=[png] )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# don't build the static python library
-	eapply "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	eapply "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	if ! use doc; then
-		sed -i -e "/SUBDIRS/s: html::" Makefile.am || die
-	fi
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eapply_user
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use_with python boost-python "boost_${EPYTHON/./}")
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-mail/libpst/libpst-0.6.66-r3.ebuild b/net-mail/libpst/libpst-0.6.66-r3.ebuild
new file mode 100644
index 000000000000..4a038ca366b6
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.66-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="https://www.five-ten-sg.com/libpst/"
+SRC_URI="https://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="debug dii doc python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	gnome-extra/libgsf:=
+	dii? ( media-gfx/imagemagick:=[png] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# don't build the static python library
+	eapply "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	eapply "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	if ! use doc; then
+		sed -i -e "/SUBDIRS/s: html::" Makefile.am || die
+	fi
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eapply_user
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use_with python boost-python "boost_${EPYTHON/./}")
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 6f73f2a74a01..66912f1d26ae 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -3,5 +3,5 @@ AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
 AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
-EBUILD mailbase-1.5-r1.ebuild 885 BLAKE2B 1e3badf3de05482415b45df62a011a58b60795b735f8a54ca374acf885d216100404836d24947a18db5a1ae74935d9b65dc5ac29f0498662b249b3d7c7f710e6 SHA512 f1888ace508c01145981bc733353d70994d517501ad69097a5557a77b0d7678607a75f1e8db5ef9379a6a8cb7619321eadcc53c8a28446888f009bf2c86107a1
+EBUILD mailbase-1.5-r1.ebuild 902 BLAKE2B 08ed6df926135f1442ef5a08af84afbc82eaec0b6c7117fbf73b6135ddc9113518d3cf150b33d659470b2da1d0b93f15af3bcf202a4405f5c709a79732accbc1 SHA512 975117937229b1da0ede26b49a4e5c3a188694f3656c7eb251f79c97b849d77ff11defd4d58c10a700611013beb6b6239ec3492c1b6cbab6230f2ce89e06e670
 MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/mailbase-1.5-r1.ebuild b/net-mail/mailbase/mailbase-1.5-r1.ebuild
index 77a5c3c409cd..4368739cfcf1 100644
--- a/net-mail/mailbase/mailbase-1.5-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.5-r1.ebuild
@@ -6,7 +6,7 @@ inherit pam
 
 DESCRIPTION="MTA layout package"
 SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index a6691977d1ec..cdb95cc6de04 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -8,8 +8,8 @@ AUX mailman.service 288 BLAKE2B 64dad97b16458f9d9b64f249f9096e4217ce78e9a33e9d3e
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
 DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb1c6fadb5d602c4e34e373ee7a0df0801e6b68b0816ee819f77caef33bbc4b8490df1c8f01fd2fb35664fd3757 SHA512 b09962ec99ca1ce1eafd40409a00f976dc47d82adb707313f4516400db6439af8597a1c4e30262fb228c102508ede688912480dbb1dcca9721bb0333693f1d85
 DIST mailman-3.2.1.tar.gz 781654 BLAKE2B ee9a9bf5505ba638417c363a885153dbaa795213a77ca9dd5abb7212ac0fe35d08c5e0e87da2d54aeb50d21c30df72a750bd25ffa0877d377a3871bded03c7de SHA512 b17fa878ffe539504ce7f28351f5bf3c7aafe29fe98957880a571e5b798ad4f9f56748fb69df699b8bf9889aebb6cef075c5d075d653fa5e9b6feb0322eab9e6
-EBUILD mailman-2.1.29-r1.ebuild 5828 BLAKE2B 8f17b0a8d7ff5ac0e8f9681ca0199313239283446edfe53eb09108fe66505f549e588b6c046fccaf74f187f41e6f71116ae6ef4cc133abe4cc07069ae8141573 SHA512 00334f2fefbdcb4214c82f4a524272ec86a8452a0570d361f80597c112e3bf5f05c7387b18c87b3a5eb6d88762477d43a39467feebe056e4f714ec423a7a5d66
-EBUILD mailman-2.1.29-r2.ebuild 6001 BLAKE2B 4601e581a3b2b754f28e750559f6dcda17d5612b2265e18aee50443dfb3c20236ed26e1bf1e78b1611433bdba9e426534bf05044cf508009ca8d50a96892c632 SHA512 313d4038138551515825450c2a9fd5363000c5e73ae2730fb2e7a789eab90825f7fd923d62815698634520c860881af2c111b3ab3509e6b66ed188862b23d827
+EBUILD mailman-2.1.29-r3.ebuild 5864 BLAKE2B 20091d601c3fb374a327b65503f1ec42552b0defadc5ccbac49c3b70cf72b1156a480f70cd6a607c843ad0ef2b7564b6d494433ded7ac1108bc0db07f4ad7b92 SHA512 7fec7675d2f2eabf1916190f38b565c4cee30f67fdd4e2e444e734546bd64af15ae6f19d999b494b39a0a07a387f974694993b101632b5daa5e619be7afee770
+EBUILD mailman-2.1.29-r4.ebuild 6037 BLAKE2B 7bf9d06db3efb0961fbcb8b66a3a9fa379ea40f7a78eaf5ec292faaa2c20743defa55612f24e707141e00977a12ed664de8b4dd90e324ede26936169272494c2 SHA512 634d49d59182a3f82f08e76335b6666daad9c1679830789b0be999f0a423f1ae1d4c7374a10393844f711407cd9c948cb980687b738d8b7fd8ef76c9b61df3e3
 EBUILD mailman-3.1.1.ebuild 1165 BLAKE2B 0f23ed03b36809a7ec4c42ea629127a9c68d6fa75372477fb184d811baba80695178b2712f9cbce043d38bf2f102cd6cdab3398a61079602f3100ef40098589b SHA512 156febe4b2c60b71beda0c2afda90c2ad807e488b657677dce58e3f3ffa1e56388017c7fd4e8e9e6e0ced949a6038b7e74d514bafe759b57c39f7bf6446bb3af
 EBUILD mailman-3.2.1.ebuild 1414 BLAKE2B d6743ff352481fb1aa702e9df744ce1fc247adfd836d3277b553106a526b6de0fad82172574e2f41492d7267154e6044e5920f56e1ae66c046252f00ba09109f SHA512 5479caf3c63863c9c46b79fdea27f16e5a33223912a6bed5baf2d2e6fd765e0f62046d5c12726e7243fdbdc6e51ae0c9fc6f69303bf36bdbeca7c920396df310
 MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-2.1.29-r1.ebuild b/net-mail/mailman/mailman-2.1.29-r1.ebuild
deleted file mode 100644
index c3eb71cf99d9..000000000000
--- a/net-mail/mailman/mailman-2.1.29-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-S="${WORKDIR}/${P/_p/-}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
-}
-
-src_configure() {
-	econf \
-		--without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python="${PYTHON}"
-}
-
-src_install () {
-	emake "DESTDIR=${D}" doinstall
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
-	sed \
-		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
-		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
-		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
-		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler*
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
-
-	python_optimize "${D}/${INSTALLDIR}/bin/" \
-		"${D}/${INSTALLDIR}/Mailman/" \
-		"${D}/${INSTALLDIR}/Mailman/*"
-}
-
-pkg_postinst() {
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	echo
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	echo
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	echo
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	echo
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
diff --git a/net-mail/mailman/mailman-2.1.29-r2.ebuild b/net-mail/mailman/mailman-2.1.29-r2.ebuild
deleted file mode 100644
index d6ef012802ec..000000000000
--- a/net-mail/mailman/mailman-2.1.29-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib systemd user
-
-DESCRIPTION="A python-based mailing list server with an extensive web interface"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
-HOMEPAGE="http://www.list.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	virtual/mta
-	virtual/cron
-	virtual/httpd-cgi"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-mailman )
-"
-
-S="${WORKDIR}/${P/_p/-}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
-	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
-	CGIUID=${MAILMAN_CGIUID:-apache}
-	CGIGID=${MAILMAN_CGIGID:-apache}
-	MAILUSR=${MAILMAN_MAILUSR:-mailman}
-	MAILUID=${MAILMAN_MAILUID:-280}
-	MAILGRP=${MAILMAN_MAILGRP:-mailman}
-	MAILGID=${MAILMAN_MAILGID:-280}
-
-	# Bug #58526: switch to enew{group,user}.
-	# need to add mailman here for compile process.
-	# Duplicated at pkg_postinst() for binary install.
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
-	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
-	# Needed for new no-symlink profiles,
-	# see https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/revision/1819
-	epatch "${FILESDIR}/mailman-2.1.29-fix-libdir.diff"
-}
-
-src_configure() {
-	econf \
-		--without-permcheck \
-		--prefix="${INSTALLDIR}" \
-		--with-mail-gid=${MAILGID} \
-		--with-cgi-gid=${CGIGID} \
-		--with-cgi-ext="${MAILMAN_CGIEXT}" \
-		--with-var-prefix="${VAR_PREFIX}" \
-		--with-username=${MAILUSR} \
-		--with-groupname=${MAILGRP} \
-		--with-python="${PYTHON}"
-}
-
-src_install () {
-	emake "DESTDIR=${D}" doinstall
-
-	insinto /etc/apache2/modules.d
-	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
-	sed \
-		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
-		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
-		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
-		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
-
-	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
-
-	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
-		contrib/README.check_perms_grsecurity contrib/virtusertable
-
-	exeinto ${INSTALLDIR}/bin
-	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
-		contrib/mm-handler*
-
-	dodir /etc/mailman
-	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
-	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
-
-	# Save the old config for updates from pre-2.1.9-r2
-	# To be removed some distant day
-	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
-		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
-			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
-		fi
-	done
-
-	newinitd "${FILESDIR}/mailman.rc" mailman
-	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
-	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
-	systemd_dounit "${T}/mailman.service"
-
-	keepdir ${VAR_PREFIX}/logs
-	keepdir ${VAR_PREFIX}/locks
-	keepdir ${VAR_PREFIX}/spam
-	keepdir ${VAR_PREFIX}/archives/public
-	keepdir ${VAR_PREFIX}/archives/private
-	keepdir ${VAR_PREFIX}/lists
-	keepdir ${VAR_PREFIX}/qfiles
-
-	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
-	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
-		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
-	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
-	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
-	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
-
-	python_optimize "${D}/${INSTALLDIR}/bin/" \
-		"${D}/${INSTALLDIR}/Mailman/" \
-		"${D}/${INSTALLDIR}/Mailman/*"
-}
-
-pkg_postinst() {
-	enewgroup ${MAILGRP} ${MAILGID}
-	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
-	echo
-	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
-	elog "Setup information, mailman will NOT run unless you follow"
-	elog "those instructions!"
-	echo
-
-	elog "An example Mailman configuration file for Apache has been installed into:"
-	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
-	echo
-	elog "To enable, you will need to add \"-D MAILMAN\" to"
-	elog "/etc/conf.d/apache2."
-	echo
-
-	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
-	ewarn "mailman with the following variables:"
-	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
-	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
-	ewarn "MAILMAN_CGIUID (default: apache)"
-	ewarn "MAILMAN_CGIGID (default: apache)"
-	ewarn "MAILMAN_CGIEXT (default: empty)"
-	ewarn "MAILMAN_MAILUSR (default: mailman)"
-	ewarn "MAILMAN_MAILUID (default: 280)"
-	ewarn "MAILMAN_MAILGRP (default: mailman)"
-	ewarn "MAILMAN_MAILGID (default: 280)"
-	ewarn
-	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
-	ewarn
-	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
-	ewarn "NEED to make a few manual updates to your system:"
-	ewarn
-	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
-	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
-	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
-	ewarn
-	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
-	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
-	ewarn "archives/ directory to the new location, ensuring that the"
-	ewarn "permissions is correct.  See bug #208789 for a discussion."
-}
diff --git a/net-mail/mailman/mailman-2.1.29-r3.ebuild b/net-mail/mailman/mailman-2.1.29-r3.ebuild
new file mode 100644
index 000000000000..98954d73b404
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.29-r3.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 multilib systemd user
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
+HOMEPAGE="http://www.list.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/mta
+	virtual/cron
+	virtual/httpd-cgi"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-mailman )
+"
+
+S="${WORKDIR}/${P/_p/-}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
+	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
+	CGIUID=${MAILMAN_CGIUID:-apache}
+	CGIGID=${MAILMAN_CGIGID:-apache}
+	MAILUSR=${MAILMAN_MAILUSR:-mailman}
+	MAILUID=${MAILMAN_MAILUID:-280}
+	MAILGRP=${MAILMAN_MAILGRP:-mailman}
+	MAILGID=${MAILMAN_MAILGID:-280}
+
+	# Bug #58526: switch to enew{group,user}.
+	# need to add mailman here for compile process.
+	# Duplicated at pkg_postinst() for binary install.
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
+	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
+}
+
+src_configure() {
+	econf \
+		--without-permcheck \
+		--prefix="${INSTALLDIR}" \
+		--with-mail-gid=${MAILGID} \
+		--with-cgi-gid=${CGIGID} \
+		--with-cgi-ext="${MAILMAN_CGIEXT}" \
+		--with-var-prefix="${VAR_PREFIX}" \
+		--with-username=${MAILUSR} \
+		--with-groupname=${MAILGRP} \
+		--with-python="${PYTHON}"
+}
+
+src_install () {
+	emake "DESTDIR=${D}" doinstall
+
+	insinto /etc/apache2/modules.d
+	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
+	sed \
+		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
+		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
+		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
+		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
+
+	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
+
+	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
+		contrib/README.check_perms_grsecurity contrib/virtusertable
+
+	exeinto ${INSTALLDIR}/bin
+	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
+		contrib/mm-handler*
+
+	dodir /etc/mailman
+	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
+	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
+
+	# Save the old config for updates from pre-2.1.9-r2
+	# To be removed some distant day
+	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
+		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
+			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
+		fi
+	done
+
+	newinitd "${FILESDIR}/mailman.rc" mailman
+	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
+	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
+	systemd_dounit "${T}/mailman.service"
+
+	keepdir ${VAR_PREFIX}/logs
+	keepdir ${VAR_PREFIX}/locks
+	keepdir ${VAR_PREFIX}/spam
+	keepdir ${VAR_PREFIX}/archives/public
+	keepdir ${VAR_PREFIX}/archives/private
+	keepdir ${VAR_PREFIX}/lists
+	keepdir ${VAR_PREFIX}/qfiles
+
+	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
+	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
+	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
+		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
+	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
+	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
+	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
+
+	python_optimize "${D}/${INSTALLDIR}/bin/" \
+		"${D}/${INSTALLDIR}/Mailman/" \
+		"${D}/${INSTALLDIR}/Mailman/*"
+}
+
+pkg_postinst() {
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
+	echo
+	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
+	elog "Setup information, mailman will NOT run unless you follow"
+	elog "those instructions!"
+	echo
+
+	elog "An example Mailman configuration file for Apache has been installed into:"
+	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
+	echo
+	elog "To enable, you will need to add \"-D MAILMAN\" to"
+	elog "/etc/conf.d/apache2."
+	echo
+
+	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
+	ewarn "mailman with the following variables:"
+	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
+	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
+	ewarn "MAILMAN_CGIUID (default: apache)"
+	ewarn "MAILMAN_CGIGID (default: apache)"
+	ewarn "MAILMAN_CGIEXT (default: empty)"
+	ewarn "MAILMAN_MAILUSR (default: mailman)"
+	ewarn "MAILMAN_MAILUID (default: 280)"
+	ewarn "MAILMAN_MAILGRP (default: mailman)"
+	ewarn "MAILMAN_MAILGID (default: 280)"
+	ewarn
+	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
+	ewarn
+	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
+	ewarn "NEED to make a few manual updates to your system:"
+	ewarn
+	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
+	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
+	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
+	ewarn
+	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
+	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
+	ewarn "archives/ directory to the new location, ensuring that the"
+	ewarn "permissions is correct.  See bug #208789 for a discussion."
+}
diff --git a/net-mail/mailman/mailman-2.1.29-r4.ebuild b/net-mail/mailman/mailman-2.1.29-r4.ebuild
new file mode 100644
index 000000000000..ed0fc12b55eb
--- /dev/null
+++ b/net-mail/mailman/mailman-2.1.29-r4.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 multilib systemd user
+
+DESCRIPTION="A python-based mailing list server with an extensive web interface"
+SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tgz"
+HOMEPAGE="http://www.list.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/mta
+	virtual/cron
+	virtual/httpd-cgi"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-mailman )
+"
+
+S="${WORKDIR}/${P/_p/-}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	INSTALLDIR=${MAILMAN_PREFIX:-"/usr/$(get_libdir)/mailman"}
+	VAR_PREFIX=${MAILMAN_VAR_PREFIX:-"/var/lib/mailman"}
+	CGIUID=${MAILMAN_CGIUID:-apache}
+	CGIGID=${MAILMAN_CGIGID:-apache}
+	MAILUSR=${MAILMAN_MAILUSR:-mailman}
+	MAILUID=${MAILMAN_MAILUID:-280}
+	MAILGRP=${MAILMAN_MAILGRP:-mailman}
+	MAILGID=${MAILMAN_MAILGID:-280}
+
+	# Bug #58526: switch to enew{group,user}.
+	# need to add mailman here for compile process.
+	# Duplicated at pkg_postinst() for binary install.
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} /bin/bash ${INSTALLDIR} mailman,cron
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.1.14_rc1-directory-check.patch"
+	epatch "${FILESDIR}/${PN}-2.1.9-icons.patch"
+	# Needed for new no-symlink profiles,
+	# see https://bazaar.launchpad.net/~mailman-coders/mailman/2.1/revision/1819
+	epatch "${FILESDIR}/mailman-2.1.29-fix-libdir.diff"
+}
+
+src_configure() {
+	econf \
+		--without-permcheck \
+		--prefix="${INSTALLDIR}" \
+		--with-mail-gid=${MAILGID} \
+		--with-cgi-gid=${CGIGID} \
+		--with-cgi-ext="${MAILMAN_CGIEXT}" \
+		--with-var-prefix="${VAR_PREFIX}" \
+		--with-username=${MAILUSR} \
+		--with-groupname=${MAILGRP} \
+		--with-python="${PYTHON}"
+}
+
+src_install () {
+	emake "DESTDIR=${D}" doinstall
+
+	insinto /etc/apache2/modules.d
+	newins "${FILESDIR}/50_mailman.conf-r2" 50_mailman.conf
+	sed \
+		-e "s:/usr/local/mailman/cgi-bin:${INSTALLDIR}/cgi-bin:g" \
+		-e "s:/usr/local/mailman/icons:${INSTALLDIR}/icons:g" \
+		-e "s:/usr/local/mailman/archives:${VAR_PREFIX}/archives:g" \
+		-i "${D}/etc/apache2/modules.d/50_mailman.conf" || die
+
+	newdoc "${FILESDIR}/README.gentoo-r3" README.gentoo
+
+	dodoc ACK* BUGS FAQ NEWS README* TODO UPGRADING INSTALL contrib/mailman.mc \
+		contrib/README.check_perms_grsecurity contrib/virtusertable
+
+	exeinto ${INSTALLDIR}/bin
+	doexe build/contrib/*.py contrib/majordomo2mailman.pl contrib/auto \
+		contrib/mm-handler*
+
+	dodir /etc/mailman
+	mv "${D}/${INSTALLDIR}/Mailman/mm_cfg.py" "${D}/etc/mailman"
+	dosym /etc/mailman/mm_cfg.py ${INSTALLDIR}/Mailman/mm_cfg.py
+
+	# Save the old config for updates from pre-2.1.9-r2
+	# To be removed some distant day
+	for i in /var/mailman /home/mailman /usr/local/mailman ${INSTALLDIR}; do
+		if [ -f ${i}/Mailman/mm_cfg.py ] && ! [ -L ${i}/Mailman/mm_cfg.py ]; then
+			cp ${i}/Mailman/mm_cfg.py "${D}/etc/mailman/mm_cfg.py" || die
+		fi
+	done
+
+	newinitd "${FILESDIR}/mailman.rc" mailman
+	cp "${FILESDIR}/mailman.service" "${T}/mailman.service" || die
+	sed -i "s/^User=.*/User=${MAILUSR}/" "${T}/mailman.service" || die
+	systemd_dounit "${T}/mailman.service"
+
+	keepdir ${VAR_PREFIX}/logs
+	keepdir ${VAR_PREFIX}/locks
+	keepdir ${VAR_PREFIX}/spam
+	keepdir ${VAR_PREFIX}/archives/public
+	keepdir ${VAR_PREFIX}/archives/private
+	keepdir ${VAR_PREFIX}/lists
+	keepdir ${VAR_PREFIX}/qfiles
+
+	chown -R ${MAILUSR}:${MAILGRP} "${D}/${VAR_PREFIX}" "${D}/${INSTALLDIR}" "${D}"/etc/mailman/* || die
+	chown ${CGIUID}:${MAILGRP} "${D}/${VAR_PREFIX}/archives/private" || die
+	chmod 2775 "${D}/${INSTALLDIR}" "${D}/${INSTALLDIR}"/templates/* \
+		"${D}/${INSTALLDIR}"/messages/* "${D}/${VAR_PREFIX}" "${D}/${VAR_PREFIX}"/{logs,lists,spam,locks,archives/public} || die
+	chmod 2770 "${D}/${VAR_PREFIX}/archives/private" || die
+	chmod 2770 "${D}/${VAR_PREFIX}/qfiles" || die
+	chmod 2755 "${D}/${INSTALLDIR}"/cgi-bin/* "${D}/${INSTALLDIR}/mail/mailman" || die
+
+	python_optimize "${D}/${INSTALLDIR}/bin/" \
+		"${D}/${INSTALLDIR}/Mailman/" \
+		"${D}/${INSTALLDIR}/Mailman/*"
+}
+
+pkg_postinst() {
+	enewgroup ${MAILGRP} ${MAILGID}
+	enewuser  ${MAILUSR} ${MAILUID} -1 ${INSTALLDIR} mailman,cron
+	echo
+	elog "Please read /usr/share/doc/${PF}/README.gentoo.bz2 for additional"
+	elog "Setup information, mailman will NOT run unless you follow"
+	elog "those instructions!"
+	echo
+
+	elog "An example Mailman configuration file for Apache has been installed into:"
+	elog "  ${APACHE2_MODULES_CONFDIR}/50_mailman.conf"
+	echo
+	elog "To enable, you will need to add \"-D MAILMAN\" to"
+	elog "/etc/conf.d/apache2."
+	echo
+
+	ewarn "Default-Configuration has changed deeply in 2.1.9-r2. You can configure"
+	ewarn "mailman with the following variables:"
+	ewarn "MAILMAN_PREFIX (default: /usr/$(get_libdir)/mailman)"
+	ewarn "MAILMAN_VAR_PREFIX (default: /var/lib/mailman)"
+	ewarn "MAILMAN_CGIUID (default: apache)"
+	ewarn "MAILMAN_CGIGID (default: apache)"
+	ewarn "MAILMAN_CGIEXT (default: empty)"
+	ewarn "MAILMAN_MAILUSR (default: mailman)"
+	ewarn "MAILMAN_MAILUID (default: 280)"
+	ewarn "MAILMAN_MAILGRP (default: mailman)"
+	ewarn "MAILMAN_MAILGID (default: 280)"
+	ewarn
+	ewarn "Config file is now symlinked in /etc/mailman, so etc-update works."
+	ewarn
+	ewarn "If you're upgrading from below 2.1.9-r2 or changed MAILMAN_PREFIX, you"
+	ewarn "NEED to make a few manual updates to your system:"
+	ewarn
+	ewarn "1.  Update your mailman users's home directory: usermod -d ${INSTALLDIR} mailman"
+	ewarn "2.  Re-import the crontab: su - mailman -c 'crontab cron/crontab.in'"
+	ewarn "3.  Copy your old mm_cfg.py file to /etc/mailman/mm_cfg.py"
+	ewarn
+	ewarn "Additionally if you've modified MAILMAN_VAR_PREFIX (or upgraded from"
+	ewarn "a pre 2.1.9-r2 installation), you should move your old lists/ and"
+	ewarn "archives/ directory to the new location, ensuring that the"
+	ewarn "permissions is correct.  See bug #208789 for a discussion."
+}
diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
index f8247228cf73..ea077c59d3af 100644
--- a/net-mail/mairix/Manifest
+++ b/net-mail/mairix/Manifest
@@ -1,6 +1,3 @@
-DIST mairix-0.23-gnus-marks-propagation.patch.gz 3401 BLAKE2B 258e1dec608c896d7ffdff4ebffe959703ef371bcd9c3dddad44793cf43377dec78e289517c3bc5cef3f51d56eb0996c1f873c7ed092ca4d0084b50b35d10a9f SHA512 89572c1dc1913b974461a3cd75787d9360cabfaf08dc987ccf2ae5519dcf8d12935e22ca5ff3e2e58038f04b818884bab305a11393ca99bb6dad86018d863d1c
-DIST mairix-0.23.tar.gz 193726 BLAKE2B e1de3f7d8b81a23a87845fe4cc285ee46232a14eea77e9f8191dc26fbaddd435d1a1e194158b13542ef201851cc03e32eece2e7b16fcd6be71595f60f82e10d1 SHA512 3ea372304e91eed6127d8e71cf0970c9380e4dec96fd9ad38a6deb1af455ae6eb604dfbb2ec372cbb940beb8459c39d8620af12a996d7f6a37e893fbb588e61b
 DIST mairix-0.24.tar.gz 206903 BLAKE2B b18832dbd5d570d428c454ade693ab0746b6e601d94a9b6d5dd4ca81356cbaecaec5c88623fe5bd612e94112dc4b6f16929fc210ce3c5c8e1e5d2a0c62309d79 SHA512 3e0af50c2c5857c5e1661e1be131c9c184377947b2ed884d1d9faa6d8bd88c17a7b7a29e105e65c990d2ede5d9fff679e57e83c4b8eedf2870493395e3ec8cf3
-EBUILD mairix-0.23.ebuild 1127 BLAKE2B 5849c85e56f2d6fcb7c36db6e6a57a9320df46d469b942a3138c56b307bc0259a4f3d934a0274b250d583fcdde360a602bdfd00416b3c00dda7248637e1c460b SHA512 c5dcaf358b4d6813173545ee12d582b377df0a341d28b820b7b2f708924e0bdd64db2c7c8f5a1e7cd6a88a1ae3a7526d399d00e0ed39d3555cee570658bdb0b7
-EBUILD mairix-0.24.ebuild 940 BLAKE2B 663da72cc3f39b05b88786d42dbf21e6cff8d3bc7dd0c8312acc6e663d68335aef4012d79e7189d4956ea6a6cf88b7a9fa31e34e227183d60b4b39e67a6cf8dc SHA512 04706eb4755fea2b4814396d28d227f2388519887714dc9008b14573650e50fd2be6a6f55bbba56b651a5d0990738edca255e808f56c4e6fdb336b64360ce08f
-MISC metadata.xml 435 BLAKE2B 10c870e9494171a3842301820c03bb8502556d0c2a36e0e5062960db644273eb20edd82b1a9f28df3d06fd1b7205e9403e80275f00652d233f0b6d9a6b381f89 SHA512 8ee659642be4150429b6f925f930b647bef299eb1dfb2fb808eb0e2e06ba693416397f27681d1291d21a215b016a1c1887cdf802f00b7efc8bb0b526a24aaa81
+EBUILD mairix-0.24.ebuild 934 BLAKE2B 941e93ca2a862721ed2dbe89403007a041fa20cf6a98f2f0c848d65a8d84939ed9c9aac6561800c228c59034e35b280e667602d27b97a3af662b636c84cc9078 SHA512 3e763c38297b91838bf93a5afc57475b70a444e7f53418f5e81942866c2b9efe53b4794ed3cf36cf06c10dd2b7d59b522ff5cdf8e3a9a7523793d67678f0e2f9
+MISC metadata.xml 243 BLAKE2B d9d3e2a9c2df5ef86d73ee0d991b7cd768837c3cd73c5e3fc164583b5eba416994bcee999c2bd40e03d3b09504f291df80c5ae93deb545bc8aec3997c49465a8 SHA512 85c72e2ecb2b1328ebccb72908bacfacbb8b062937f13d0d5fe3c2131a91ff2be5cd999417a13f584277a21bae70cd7ff3d5d17c4a3a5f02e0b563a5d8947a54
diff --git a/net-mail/mairix/mairix-0.23.ebuild b/net-mail/mairix/mairix-0.23.ebuild
deleted file mode 100644
index a39bc552fb9b..000000000000
--- a/net-mail/mairix/mairix-0.23.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Indexes and searches Maildir/MH folders"
-HOMEPAGE="http://www.rpcurnow.force9.co.uk/mairix/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	gnus? ( mirror://gentoo/${P}-gnus-marks-propagation.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-macos"
-
-IUSE="zlib bzip2 gnus"
-
-RDEPEND="zlib? ( sys-libs/zlib )
-	bzip2? ( app-arch/bzip2 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-# Fail on various locales
-RESTRICT="test"
-
-src_prepare() {
-	# econf would fail with unknown options.
-	# Now it only prints "Unrecognized option".
-	sed -i -e "/^[[:space:]]*bad_options=yes/d" "${S}"/configure || die "sed failed"
-
-	# Add support for gnus marks propagation (bug #274578)
-	use gnus && epatch "${WORKDIR}"/${P}-gnus-marks-propagation.patch
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable zlib gzip-mbox) \
-		$(use_enable bzip2 bzip-mbox)
-}
-
-src_install() {
-	dobin mairix
-	doman mairix.1 mairixrc.5
-	dodoc NEWS README dotmairixrc.eg
-}
diff --git a/net-mail/mairix/mairix-0.24.ebuild b/net-mail/mairix/mairix-0.24.ebuild
index 2fb5df966c5f..163f013cbd22 100644
--- a/net-mail/mairix/mairix-0.24.ebuild
+++ b/net-mail/mairix/mairix-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 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.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
 
 IUSE="zlib bzip2"
 
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
index 1c5738b1e1f3..59ab1f3d05b1 100644
--- a/net-mail/mairix/metadata.xml
+++ b/net-mail/mairix/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="gnus">Add support for the marks propagation feature
-			in GNUS (provided by <pkg>app-editors/emacs</pkg>
-			or <pkg>app-xemacs/gnus</pkg> for XEmacs users)</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">mairix</remote-id>
 	</upstream>
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index e577eba9da51..c1927948fad9 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,3 +1,5 @@
 DIST mpop-1.4.4.tar.xz 319372 BLAKE2B acf5bdb62479126ae212bb008878872d16efba1eb9a077bf4697ba22ff512977fcd5affad090bc952fb01cf07a607a4dce91b873128c43f087c34dca6d6bae81 SHA512 1ed89108d35d7bbd6bcbd6de956f51cfcfaefd808f6aa7135b168d789f8cbe7070be9db676d1222dce5b6fe8b6692616d6b7adec9c23df11ac3de112897924da
+DIST mpop-1.4.7.tar.xz 322488 BLAKE2B ea73e84b5ed3b5aad7ef91ceb510187c3f2d42976329a6a53511329a84713edc056ca6db35b1de2c9bff8b417e2710e598c472e78acbdc499dd73b24c46dfb47 SHA512 ce0ac899fd2af1d50ef221c88282c12263c5862b9ff1f6341a8551c3fe6b69272772599a2040a0f553a776245514c55b8102ca8cf291b411e5127a3f39897832
 EBUILD mpop-1.4.4.ebuild 1131 BLAKE2B 98b3558b2b7fc70436fc0ab589a29d6bd4af7e0236b96cace86fce866d58bbc8c7c54ae4640a3c057c0c21855815f28ec6719580912f74bae3f1b4a5ce0edbff SHA512 18cd6d8cff3e4564f112b5053b32de2f6e3f6744e22e9009395efaa4e0067330a8a3ec0bcee0a965516e859f833665f2f6ee9277af058683494993636f5b7ca5
+EBUILD mpop-1.4.7.ebuild 1131 BLAKE2B 47380c5f65e45c2b66ca6d7f4fb6988f7e3a396568825d17dd766a0a824284b7cee96459bd549d5c6a5ff355c9440cbdf6d6c0f75cb821d8b9d44e11bdcb1ce9 SHA512 9a19f1cc5e6525dd87ada4167c115079de8f4cf12f9e16fa4ff5c2e89f3c400216774483e03bc11d4cf26c556cfa331c10e8a22174af693fedccce52b180fa9c
 MISC metadata.xml 241 BLAKE2B e97922b2760a2f8d0ae16406e640eb60631fc3de36ab2a76953fb0b78b14e9652f317120839b5b4f0decd3dfb4f2931d828eca1f8a60f6eb1e01f3d2e8a59236 SHA512 f43a36b5ac2474c93bd47933995c16936ddd5748811e13716dc1eb2eff2a9e8e2f0fce706fa82386bbda93e7cae791066118b960191e93ca2eab02175f9e020a
diff --git a/net-mail/mpop/mpop-1.4.7.ebuild b/net-mail/mpop/mpop-1.4.7.ebuild
new file mode 100644
index 000000000000..ee0c8845eb58
--- /dev/null
+++ b/net-mail/mpop/mpop-1.4.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A small, fast, and portable POP3 client"
+HOMEPAGE="https://marlam.de/mpop/"
+SRC_URI="https://marlam.de/mpop/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax"
+
+RDEPEND="
+	idn? ( net-dns/libidn2 )
+	gnome-keyring? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[idn?] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl tls $(usex gnutls "gnutls" "openssl")) \
+		$(use_with sasl libgsasl) \
+		$(use_with idn libidn) \
+		$(use_with gnome-keyring libsecret)
+}
+
+src_install() {
+	default
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/mpop.vim
+	fi
+}
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index c28427edab4a..c6b5c9c42dc1 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -3,5 +3,5 @@ AUX offlineimap-7.0.3-darwin10.patch 316 BLAKE2B 3f9adc406881e43462aee6764ef7aaf
 DIST offlineimap-6.5.6.tar.gz 187801 BLAKE2B 78561ffc0b0dcd3dcd3c75448f1e412661ac5061eebfae5796dffb3a6e8767b54138328aa0a8ab5a1745ed0690809965ea76b9b8e66ef250936b0b72cd07e337 SHA512 3f7cb63d00486de2d648aa9dd3637ce252dd100bc8237742d11f749726b2b14907c07c802ba0fd5891c88f5062f9a2d05ebc78ceee8c30981f4c4579c3143d6e
 DIST offlineimap-7.2.4.tar.gz 721887 BLAKE2B f5c7c8eb541167b3f0d46ee71be418d4697f89a1dc11a1c5c9840e5def09d108b7ab391d773dc79e0882ce0a9e21388e11217915112f476d384bf3018d5ea750 SHA512 837f822a08f5df59f5332c65b33e0186c215a633c5c17f08790f4c2128a4f6470a75eb02e883dd592b456dbc0ba2b32f670cb716eb602dd8a6bdf12ba2d72cd8
 EBUILD offlineimap-6.5.6.ebuild 2346 BLAKE2B f4cea6677350da94c785a4abcb4b52f0b4bc7acdb041a216a0775dea8bd0680f2b56ead87ebc99163b01a8fd27e6fd46f5043035904f2e5a575b554660e07b6d SHA512 4fef94705b37cc7f84d824a34baeaaaba1497f94f6f8f8bcb838c62aa0077a1f4fdd7d5e059d795b089b9603a0ee77befa8d90f2b604fe44436a0d910a751e7f
-EBUILD offlineimap-7.2.4.ebuild 1643 BLAKE2B d847579f2285e1b76c7eae04d210bdb616f6da87ae123638157eeba6f9239da47595fd7aa1d27cde8f07a9413d8060934303f29e623135933c4edb185f3795c8 SHA512 15567462de5706d735d0a9e17a6ef6648fadbcab97067a36cf2a61ecdedfed955f2ec62afa22aa8fe8e7211d0d231fa852fe10cdc070319b339589ec0bf731a1
+EBUILD offlineimap-7.2.4-r1.ebuild 1681 BLAKE2B d5ceadd15b6c5c84b029d3886865d19a5a08ae26160bf7fbd51d685146407b9914ed9e394d5a69d14fe50e8488856721b2bb950b734294e3a5608a44b9c1a245 SHA512 e8956adf8a94eaa90251b060398d78a0b55cfb88b9cf2356fe2d951b912de2b2b08169a67dbb6d8d8587d35ff86a7269ef49afe14443c0fc9a1195aef6e78e36
 MISC metadata.xml 365 BLAKE2B 44c143951196526dbc7e8c23fe3719a33ecf633361b9aa5294dd4e61c1dd0aecca12159a33c3ef7e0706a5c57162f170559c44c554541754cf5049118c8d89c8 SHA512 ec19d9f99d945536a02dfd7d8c113c6a6337e80190ee60ab172ac9c248398f4faad49aabe4f56e5e4d5eb09ea35810a47ad263b8df59f7368e1f8bed6e780c2a
diff --git a/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild b/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
new file mode 100644
index 000000000000..505ce0297519
--- /dev/null
+++ b/net-mail/offlineimap/offlineimap-7.2.4-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Normally you need only one version of this.
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,sqlite,ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
+HOMEPAGE="https://www.offlineimap.org/"
+SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc ssl"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="doc? ( app-text/asciidoc )"
+
+# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
+PATCHES=(
+	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
+)
+
+src_compile() {
+	distutils-r1_src_compile
+	use doc && emake -C docs man
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc offlineimap.conf offlineimap.conf.minimal
+	use doc && doman docs/{offlineimap.1,offlineimapui.7}
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
+		elog "Sample configurations are in /usr/share/doc/${PF}/"
+		elog ""
+		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
+		elog "display the server's cert fingerprint and require you to add it to the"
+		elog "configuration file to be sure it connects to the same server every"
+		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
+		elog "check SSL server certificate) in cases where you have no CA cert."
+	fi
+}
diff --git a/net-mail/offlineimap/offlineimap-7.2.4.ebuild b/net-mail/offlineimap/offlineimap-7.2.4.ebuild
deleted file mode 100644
index cb75e15af026..000000000000
--- a/net-mail/offlineimap/offlineimap-7.2.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Normally you need only one version of this.
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,sqlite,ssl?"
-
-inherit distutils-r1
-
-DESCRIPTION="Powerful IMAP/Maildir synchronization and reader support"
-HOMEPAGE="https://www.offlineimap.org/"
-SRC_URI="https://github.com/OfflineIMAP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc ssl"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="doc? ( app-text/asciidoc )"
-
-# see http://pogma.com/2009/09/09/snow-leopard-and-offlineimap/ and bug 284925
-PATCHES=(
-	"${FILESDIR}/${PN}-7.0.3-darwin10.patch"
-)
-
-src_compile() {
-	distutils-r1_src_compile
-	use doc && emake -C docs man
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc offlineimap.conf offlineimap.conf.minimal
-	use doc && doman docs/{offlineimap.1,offlineimapui.7}
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You will need to configure offlineimap by creating ~/.offlineimaprc"
-		elog "Sample configurations are in /usr/share/doc/${PF}/"
-		elog ""
-		elog "If you connect via ssl/tls and don't use CA cert checking, it will"
-		elog "display the server's cert fingerprint and require you to add it to the"
-		elog "configuration file to be sure it connects to the same server every"
-		elog "time. This serves to help fixing CVE-2010-4532 (offlineimap doesn't"
-		elog "check SSL server certificate) in cases where you have no CA cert."
-	fi
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5cb72d8dcd0e..3646868acba2 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 4900cfb5791a..26b61058f326 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -10,8 +10,8 @@ DIST apt-cacher-ng_3.3.1-1.debian.tar.xz 50912 BLAKE2B a873c4e718765a7161d9f87b6
 DIST apt-cacher-ng_3.3.1-2.debian.tar.xz 49772 BLAKE2B b864859e7f0ad5eba24b2f1ced74dbdb7a1878fbc2190863929f45534163c18ed2a67c4c75b5fe8011d93312ab9a67d899b09669e7aacb1ad3ae15a2bc1fba12 SHA512 653ca59c1d9c89a9586ccf963da480524ff8195222435e4a89f0c08ca64586e1993a92d00a05dbf738b0814869a5e6b539a05d1d59cb956e66b2dbe5ad95eeb8
 DIST apt-cacher-ng_3.3.1.orig.tar.xz 321996 BLAKE2B b630a31414ee86256f2e2ebe950b56d182d61dffd1603ce8387b5cd677d18fcda3ed17864bb99c253b11e2d29163b172c2d0bc91a3f5b14fb9f0ef321d656b40 SHA512 0d412e4a488fa4c55f1292c1fc7346bdf88228528455ce1d2ad20137ddb84df211a3bc5911c12662428335d8f624979d166b0ed31f74e466228df3ab108e67f3
 DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f
-EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2907 BLAKE2B 47adba5835b919179c63558378b1c06918a64af4255890c5c48a4c91713ebfe26807c5924df6048eb0b2268a1dbf7dd0528ba7473b4c43964618a163002c3559 SHA512 8a1cb4173e52229794d5e4b87cf9f11842d5529b87abf9ec34d56d9e3a83fb51f99b402e832dd0445d537d8dc66c4ee3da0c70c3f4751ef71aee6972f9808ee7
-EBUILD apt-cacher-ng-3.3.1_p2.ebuild 3014 BLAKE2B 866540ecee2c74fc186688d24772574e61540559eab6e3edd1d4193d08b0eea0206b1c95fd87bf7051777aafea5c31c3f9fde13916d11ab9d8a18efbccda300e SHA512 70a3c680c7460b5c897a5202db7ae88c8480fe6d383a48e0b968461eab1566c3f1369bcd6dcb81e7596082fa8ec471e084d72aff30b1ead1f635222fcfa154c5
-EBUILD apt-cacher-ng-3.3_p2.ebuild 2863 BLAKE2B 20318be65af24050ec49f9b429e5119d0a0a2a7b426b66bbed13e861459e601e873d6abd6aceb540f11d75b316341a70d650160cf194b9dd60967fe7dff00c70 SHA512 bd2bd0728bc5049dc54eedcd38a09c5c33615cf09054e0e9bbd141dce845e0dae57d5d793c99406060871e7f375b962bd335fe9363f3e627095bc85acbd76682
-EBUILD apt-cacher-ng-9999999.ebuild 2791 BLAKE2B bdb7e182590dbe4cb0220216ea31ce4cd08238c47fa0e0f3cbb210e63c7ada4562c2b91a9aa45460b1b280465273849e8e517c3fab1129dfd2136c93257457a3 SHA512 01bd9b8a96655f882b53e602371a7cdb805056cee58b63b009c87308749bc7cbdfd1031c251f04746dafe4902d248a3234ecc0db81960b0044570d8dd45a8052
+EBUILD apt-cacher-ng-3.3.1_p1.ebuild 2879 BLAKE2B 4c9c3afcb14de20f728f9e30a6a1e589f93f030688c455eb8b3aebe4c2ba4d6216dcd4b201e20e4750947d03d7d96dca81482e6585a21f232b1a2aafa79151ce SHA512 707727031eacee8eed6ef40ff7a6bc096080ad63f4c6e9c50207154a39878211198be02eb1570b9f93318d8d47b21a96e0a4161409d23dca9987117e6e6166bc
+EBUILD apt-cacher-ng-3.3.1_p2.ebuild 2986 BLAKE2B 67abb15845e25e8fd8369f457f095f1051015d230b550ec20446334053fe15caceac1e0da0ed7be97f2643f6f3b460d48803919d50e08c3e74a7f855c19932fd SHA512 86990db8ef1d294d222a3f7988d18384fd80f58fec1dbe6a05917baaed1e0e0bfe6609208d0edf4e6c3e6af589ebd7bbb9ae560a3ed2ae73506f377dd946b1c2
+EBUILD apt-cacher-ng-3.3_p2.ebuild 2835 BLAKE2B b465405ffc612eb7aa930e0597a7d9639351da40754ffefe6e4655708a1e49f17d31c5a53544541de7be1dad566b5d9994601fd3d3cf18145026ae03e022d125 SHA512 5771eab3a8a56fb692ebb54c495633f644b98f89069e83bc70f732b060da81b6c1621743afdf08c6373642ef336967cc97f481a1ce5ce48c6d5ffe271d244ec5
+EBUILD apt-cacher-ng-9999999.ebuild 2765 BLAKE2B 8df3e332732ccad11a6040820351e787bfa7f46eb6745d8bf6ec34fe7151a996248bea17bc91c2477fe50970b47f0427bd982ec59dcb88b36f49bfbd5bd114d7 SHA512 9843a2f6c6d91b1517b52a06085eb801589dcf46a019069400c7b2cde458d455b11e260a7fec621514d63b6c9a16f703c8427559f660a59384a60e54f3c5a63b
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
index 6fcc74573fc8..2af7ed01cfc5 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild
@@ -61,9 +61,7 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-	)
+	local mycmakeargs=()
 	if use fuse; then
 		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
 	else
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
index 21f1ce96df06..f0991d2bc87a 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild
@@ -61,9 +61,7 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-	)
+	local mycmakeargs=()
 	if use fuse; then
 		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
 	else
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
index fe76de4838c2..ce8b2df72f46 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild
@@ -60,9 +60,7 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-	)
+	local mycmakeargs=()
 	if use fuse; then
 		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
 	else
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
index 8bde423cde01..75d78c14ed9f 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild
@@ -58,8 +58,7 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=(
-		"-DCMAKE_INSTALL_PREFIX=/usr"
+	local mycmakeargs=(
 		"-DCMAKE_SKIP_BUILD_RPATH=on"
 	)
 	if use fuse; then
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 8345942e8657..e2cad1ef5c75 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -8,6 +8,9 @@ DIST bird-1.6.6.tar.gz 1029505 BLAKE2B 45cd621175962ea22848948e61aaf8b5c4eebbae5
 DIST bird-2.0.2.tar.gz 1015224 BLAKE2B 3931c0431dc6511596e7214f6e2099548aafa69c951a44cd628443701eac061e8d95c387d74d81ad889988750c5bdb32a69ed77bfe655b161932017f1a1266a1 SHA512 aef96f246484a52269b44963df033ccc584e62d50d1ae31a97a97b9c7375e576d70d00f61a0f6da336e60cefc4c921945df0cc821d5fd1c737b19f508e65d30b
 DIST bird-2.0.3.tar.gz 1141917 BLAKE2B 14b51a4195003ddcf848be45755057ebf835edf54f35208f8d80121c22eeb83c9afa0c0c1ab269c376da59f5d07843054b08e1679db873a0b8121aa611b9202b SHA512 c88d0119dbebf4b2224ff7c6555e1ebf516748611e3544e7cfba47adb60c45a996efed7d2dc2b8fd849f15689e5d3c2624c4019c4a9a5a356d551a35db8fa0e2
 DIST bird-2.0.4.tar.gz 1051911 BLAKE2B 12100685e4aad969dbb51eaa567e1038f50e7c030a25a8697bc35d4f33d0f64f9ccbc045e1210acb78f3d8d4a7cc7ef2be7ae50a36679f2322d292e8e6993ed4 SHA512 65092ca6be115b4d0c31c3c4a79d3ee2e196dc2f85454448eab568cc9cc1fe37b7bdfe1ddb74d4f6f147dc479a8570cf7bf702d762cd69414f976678c14c8e2f
+DIST bird-2.0.5.tar.gz 1099509 BLAKE2B cc865db0a845c045b441b27d1cfba6865f711ee3a68f0000056b701ba5d0652478325d3797069785af912b5f955a24647837d818c269b299106acba4acabce4f SHA512 2da6f99c5e55915f8669a0dc3778357aedbb75cf06e0f672a5ddcc01a5b850aa4a1932957d2044f89f075cd437a74ba6c5da5a607225b391525aa48f43c47140
+DIST bird-2.0.6.tar.gz 1899912 BLAKE2B 068f740a01a327b5fecf10a8aaafecac218fd14536ea98c93980d7ef9426766be80c68202410aaa20012f7f3b1837173e51d83d0ce2fb1828029d54174065206 SHA512 22aa676e171cf5ddf6dedbf0dfe9bb36a959efdf9cb278b7e969d5b08b06fe483e3b30ef40c1f9980387ed6ac6ee6626f3d85704925256c22dae91fa7d23267d
+DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
 EBUILD bird-1.6.3-r1.ebuild 1285 BLAKE2B 6d118b27f8bdf9ecf5ea2b5a4302c7c1c1bdb46ae3e266da97eb369532f9d815b718fd9cc211515a37b7027a1cb6f1571258c593641a0299bc7a5a90a3d21da7 SHA512 65dcb46fad1912e8d7f26d9597e7dcdc5f78e10d82fcc3cc4a211c03f2d395614d363b98c00283ca09704e0fe52a245f67e0ec41680eaeacbac931cd52d00bc9
 EBUILD bird-1.6.4.ebuild 1285 BLAKE2B e728912943f43f666b0a96430cb48f9d4028627492ce03c87557af59cc78e5af6ac5f152fe63f7a1ef989b4028ec918fccda2f21b27c57f1e8530c2e3ec3ba56 SHA512 f94a5f28cc72dd35a853c5763fd28842cfd34ab0a8063db01e756e021c80191ac4cc40cc83f5fc980d93a5d00e2b777a9e902052db8fa9c50db5905d4a4bbf0b
 EBUILD bird-1.6.5.ebuild 1282 BLAKE2B 08adb25747149de95a2b3c806db82a199044cfe2eff8887dd1394700ba7c35d25a7ad48eb5d5129220618daddf1dba526948efa56962e970da452c48f7374b9f SHA512 daeb190612f574a628d99e3d2a28187c686c87fbf454aca050719c77624cc2dd04513d084257ab6e3282e7dd5006016fdbc1261e89780b4700fc8c41f8fab07d
@@ -15,4 +18,7 @@ EBUILD bird-1.6.6.ebuild 1268 BLAKE2B 23639d0d57b4927dcdf805a9c8f31a4197649a2168
 EBUILD bird-2.0.2.ebuild 774 BLAKE2B cdb92e8ef96464851c1b4d37b916ea705fb5b880cb89df18a093c411052e8363f15321da2bc400fd99cb8d33af5f6ab33668939a759e27028bca043961dc46bf SHA512 a14f8b83bf5d68a1c89c1ac8ab64f6f597893ea9ff004c904c7a3d009bb5ba4007a9607a30f987f423cf95aa7b8dda5040b94929d7a8e9f63f14e7775fb3f53e
 EBUILD bird-2.0.3.ebuild 771 BLAKE2B 9adf75165ef2ff7721d62a1ff062338e8119b32bdb8e8390b9e9b294ae2900f58d872252070b0ea1983526db6693e5fd8438cfb086e901fdf6c6a44a26cdb3e3 SHA512 8bd4530fa36b6e9476539bea7e37fa4a16d07aa1e1e60b1c63f757d545174a7bff163860b81f261a1b7f06dccc4f756e96d5fe134aff91f9c7dc3c33619f045a
 EBUILD bird-2.0.4.ebuild 764 BLAKE2B 8478281f359226d4fcd8373829ef27f1c119b8380a90e95c08cfa6cead3adf43ae5e519ad9b80f4c438f95163c8380da02210e5faf0d6fc02809b582690969ad SHA512 575d8d2bca595e5e215c3bc3bdd957827cd8888c885ad7dd489ef823f455a740ef1d6769af8dc435d9f1f6fb074372f1c241360ad4098fdfb4ceccc58211d85c
+EBUILD bird-2.0.5.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
+EBUILD bird-2.0.6.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
+EBUILD bird-2.0.7.ebuild 764 BLAKE2B 275d827d7462d6b8e8ab027beb275aed312f4eaeb78795ef40364772d4b050dd58f6f9bc35e943c2baf8a87e3b9e955ec90dccb1bb9ffb2c183f193db31a669c SHA512 22528e9a12ca25d83c6231d15b4b16cefa84a3833a7d66726f3cae4208fa99134cab438bec6317e695a21fcbf20f968bcc74c0c6600f27e33ee701b57c0764e7
 MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-2.0.5.ebuild b/net-misc/bird/bird-2.0.5.ebuild
new file mode 100644
index 000000000000..edc17f5b33c7
--- /dev/null
+++ b/net-misc/bird/bird-2.0.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.6.ebuild b/net-misc/bird/bird-2.0.6.ebuild
new file mode 100644
index 000000000000..edc17f5b33c7
--- /dev/null
+++ b/net-misc/bird/bird-2.0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/bird/bird-2.0.7.ebuild b/net-misc/bird/bird-2.0.7.ebuild
new file mode 100644
index 000000000000..edc17f5b33c7
--- /dev/null
+++ b/net-misc/bird/bird-2.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A routing daemon implementing OSPF, RIPv2 & BGP for IPv4 & IPv6"
+HOMEPAGE="http://bird.network.cz"
+SRC_URI="ftp://bird.network.cz/pub/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="+client debug"
+
+RDEPEND="client? ( sys-libs/ncurses )
+	client? ( sys-libs/readline )"
+DEPEND="sys-devel/flex
+	sys-devel/bison
+	sys-devel/m4"
+
+src_configure() {
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable client) \
+		$(use_enable debug)
+}
+
+src_install() {
+	if use client; then
+		dobin birdc
+	fi
+	dobin birdcl
+	dosbin bird
+	newinitd "${FILESDIR}/initd-${PN}-2" bird
+	dodoc doc/bird.conf.example
+}
diff --git a/net-misc/charm/Manifest b/net-misc/charm/Manifest
index c5299b0dbee9..ff1d5cd2f9d7 100644
--- a/net-misc/charm/Manifest
+++ b/net-misc/charm/Manifest
@@ -1,3 +1,3 @@
 DIST charm-1.9.2.tar.gz 84927 BLAKE2B 6c1daea30a8b038a23d82567ba4e00f50a65d8faadd384d25524a29b0c5b1902f18d2d14fb2ef28b78cb1e43cb168704883719c493267a0cdacb348729a8c334 SHA512 9ea4c7411764dd1d1c87a1a19de2de3061e08e030e793ff259e80477aa5880a01f05f8a8d1ecc9b1e696111c3f3f9504f5387f535d9d52d1496d20b04c68835b
-EBUILD charm-1.9.2-r1.ebuild 831 BLAKE2B a16ee14f0008046c3ad37ed3843a26baf2b1f5c9a5dab6b8455a49d9a21100931c9b8edff72433f0a388f1059148f087baeae69978c9c1035101719879f029f8 SHA512 4657bee6fc6681eff86e6ca84037a2c86b50457eb337319bf7137f7a159d7e271fd38733d982cf0d87db6f741b8e627f0dd36f371ff3d5050308216bd8ef5746
+EBUILD charm-1.9.2-r2.ebuild 868 BLAKE2B 5a2a209c913388f4fd2dce2c1a9a2e425adadefa67aaeaa4afa5f2fe8ddaae4c0ceba0f8b3d562946660f33e1c579518bf96075bfa66cd8f0488cf361a721b98 SHA512 12dcac21c72dbf39981ce7ee5febcbbdd759ede3a619f816a80f0607a8a4a3c6cee8281f3b13fe0246481217b692744769493b15aaf5c676431db815a30492e3
 MISC metadata.xml 244 BLAKE2B 06f30181d05c2a8bb01c34cf29bc0b3950a577aa678cf84697633a525f762d229fd0ce32fd1281c8204f89ea47f09d46a3106eb045bc3b3dccdabc588fa07534 SHA512 e563e61a42c0710c2c87775e29ce2804ad1ebe2cf9619f0babf342b72a0a38ff44aa79c6a940b4486b9982cb962d56d12698c3cdc5aa6eecdf515d4a3057bbd0
diff --git a/net-misc/charm/charm-1.9.2-r1.ebuild b/net-misc/charm/charm-1.9.2-r1.ebuild
deleted file mode 100644
index 3b5fe2799c91..000000000000
--- a/net-misc/charm/charm-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit distutils-r1
-
-DESCRIPTION="A text based livejournal client"
-HOMEPAGE="http://ljcharm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ljcharm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-IUSE=""
-
-DEPEND="dev-python/feedparser[$PYTHON_USEDEP]"
-
-DOCS=( CHANGES.charm sample.charmrc README.charm )
-HTML_DOCS=( charm.html )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e 's/("share\/doc\/charm", .*),/\\/' -i setup.py || die "sed failed"
-}
-
-pkg_postinst() {
-	elog "You need to create a ~/.charmrc before running charm."
-	elog "Read 'man charmrc' for more information."
-}
diff --git a/net-misc/charm/charm-1.9.2-r2.ebuild b/net-misc/charm/charm-1.9.2-r2.ebuild
new file mode 100644
index 000000000000..52c66fb0448f
--- /dev/null
+++ b/net-misc/charm/charm-1.9.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL="1"
+
+inherit distutils-r1
+
+DESCRIPTION="A text based livejournal client"
+HOMEPAGE="http://ljcharm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ljcharm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 sparc x86"
+IUSE=""
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
+	')"
+
+DOCS=( CHANGES.charm sample.charmrc README.charm )
+HTML_DOCS=( charm.html )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e 's/("share\/doc\/charm", .*),/\\/' -i setup.py || die "sed failed"
+}
+
+pkg_postinst() {
+	elog "You need to create a ~/.charmrc before running charm."
+	elog "Read 'man charmrc' for more information."
+}
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index 299db987c5b5..774005939a05 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,3 +1,3 @@
 DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
-EBUILD connman-notify-0_pre20191003.ebuild 905 BLAKE2B 1470c993bc2edaf3c20fc2bd57ca546d69119679455bd44bcdc288fd448afc6648b091239f92fa0aa6bf87585e13af10ed3218b596e72a6f9d4767033114af9b SHA512 d0c771eab2ade6db0bc41c554591591e51293978518e609c4be7f4c8f27bffef86ba07c53221c3444403e9b9442bf44de6963c63043644c764d1848eb32e65ba
+EBUILD connman-notify-0_pre20191003-r1.ebuild 948 BLAKE2B 8b608d6576417ad978e1a1be91340cb8d449c91a591439e8450873907942725297fad523a287d21ad90af1afea08ad6f81d54a1ab6cc3c62bfbc091d20e90561 SHA512 976104fe1ea5e0131717146bcf1890fc935992e6c2823739b62b0bf908b5dc2df34d7e4a8dac5a2676280be09e926895c63cca5957c42faa5b83aa796c44e382
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003-r1.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003-r1.ebuild
new file mode 100644
index 000000000000..d093e295fa63
--- /dev/null
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop python-single-r1 vcs-snapshot
+
+MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52"
+
+DESCRIPTION="Desktop notification integration for connman"
+HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
+SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
+
+EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	net-misc/connman
+	virtual/notification-daemon"
+
+src_install() {
+	python_fix_shebang ${PN}
+	dobin ${PN}
+	dodoc README.rst
+
+	make_desktop_entry ${PN} ${PN} ${PN} Network
+}
diff --git a/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild
deleted file mode 100644
index 3f875e44e212..000000000000
--- a/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit desktop python-single-r1 vcs-snapshot
-
-MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52"
-
-DESCRIPTION="Desktop notification integration for connman"
-HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
-SRC_URI="https://gitlab.com/wavexx/connman-notify/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
-
-EGIT_REPO_URI="https://gitlab.com/wavexx/connman-notify.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-misc/connman
-	virtual/notification-daemon"
-
-src_install() {
-	python_fix_shebang ${PN}
-	dobin ${PN}
-	dodoc README.rst
-
-	make_desktop_entry ${PN} ${PN} ${PN} Network
-}
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index cedb825a48a9..a8349ef1a604 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -6,5 +6,5 @@ DIST dropbox-cli-19.py.xz 13960 BLAKE2B 16d33155cbe5449434ff9fc5a9fddca9a7cd20bd
 EBUILD dropbox-cli-1-r1.ebuild 558 BLAKE2B cc8d5071ae4c78a71532c2d614ba557ac1f3356a6bc3290f089dfdc2c3485641621045f06e7b6a626e69d423ab25af7f237f78d5ddb639bc299d325085d5d7d1 SHA512 f5e55ab6913334f11f28b41ad9387bb56d47d6a8636b85850630f2da40de83cbd9092ab5de265556491df73fd28ce700aab417c996a079c074d003ecb4613ef8
 EBUILD dropbox-cli-1.6.0-r1.ebuild 721 BLAKE2B 63464febf1675553135fa92bc0df4821015d924a26ffeb8d788057109c494340eba160bb24c96da991443772c8d9d73fce89b7852a64880be414f53c4c123ef1 SHA512 317e442fbdb8f78ff63a77ebcda2a33700ea1aa187c4d2c5fdb1d7e206153af32258d15411256eb74f4f96714e0e7011281cf039953086ea32cf4983c2177047
 EBUILD dropbox-cli-1.6.0.ebuild 577 BLAKE2B 39b17d38b78589ef96c5b0d488270ac3c872e97c402fb608681e1ef15eae835845c15e19e7c8bad4617028f456e8787a3dfe99f07602038e7af459b75847122b SHA512 fbceaac61478cc262a136c136d6f59bac4d12a7ac4bc245fc9f288fe2c17e552d664d24f3fab649de177d30dd3eeeae2e848d34ee9e84653ac7a1a1a1df008fe
-EBUILD dropbox-cli-19.ebuild 712 BLAKE2B ebc48492372029873de68176c054032a33e64947b53169328296b11165780fb8c9161daece6db2f3b8ffb6f72ed582e9812b33c5e2efc7c66c9a72b31f03b3e4 SHA512 4ddb869d74e06cb096ea55adbe055ded47a03d5a89e836a7a2e25e79441b19b42fc79a1958ef7492a2bac1a03ba1efd3d46a37eac51cc08f298c4ca2e6457afd
+EBUILD dropbox-cli-19.ebuild 710 BLAKE2B 9ff353fffc498a9a9697fafb9ea962c1f8cb83787ff62cbba815e83037dea32b4d8bc19f93c586c07f6abe3707176f8e9c2328b3b37d47d3b3c71c5de28a690f SHA512 c996a797a31da15c1354a17ba1eac71335e862f4033a34936861363988638727b701ebe47615974689696d834cb93ebcde90777822172340dd129820c4416e54
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-19.ebuild b/net-misc/dropbox-cli/dropbox-cli-19.ebuild
index f7fd170117b9..3e90bad7e128 100644
--- a/net-misc/dropbox-cli/dropbox-cli-19.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index e95c8a7ad76d..382dfda950b3 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,8 +3,11 @@ AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af00
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-89.3.268.tar.gz 92308961 BLAKE2B 4b1a229eca8e96b49360404fc3a03277343f1dcea9b2065b637d8531b266233215e3f3c21163d20ed104db90b4d37dcd873bc1353036a14f89ac50b78180a518 SHA512 25195ef1f44641ca3aee00c4b5cb52006d9610b9d067ea1ade4717dd47729db98e5b0556b5c61ea881ee84e8f8aafec868555591d8d3f4c1ecc81974159e3321
 DIST dropbox-lnx.x86-89.4.278.tar.gz 92309633 BLAKE2B 47f886ab9f81335b8cb0a9133ad0b47e55d53aab6d6d99b89f2b266bd0345e4a788b950dd3fce7b24ff91ffc45c2ba5e8e5154d28a1c3690ed1d200d4d06e9ee SHA512 7f3731f32ef7869c31b18ca7b167ed5695deb8c8130aff3bb7783799dddd1ae3472bd49ef4069dd5ccda76a02b518f7eaba0209fbaf94b974e7caed4c0f8b9ee
+DIST dropbox-lnx.x86-90.4.307.tar.gz 92672302 BLAKE2B 4323a379cbfe4428db63bb36c78b9eb83dc6026242eeb6f6f68687f0868c2d03edcf40ff2c9312e5a432458814c96a4df749640f0a256ecc675f3a5e860a8772 SHA512 b3248397d8b83436ccaf671528a2dd333c8bcb3073b3248f1826a63c5b1f542a7bebfd8ee184e3eb5feb74070116c681a3c71816c4a8ae817ed992cc9b07aa00
 DIST dropbox-lnx.x86_64-89.3.268.tar.gz 96723713 BLAKE2B 5bfb7721303b466f9015709f1a235045263fa0db46ff4f0ad7e772c4dc1261b8c7549d63c0ac4a9d98e35581c630ad5ed851d0c63334267b196bec7dc93c0ddf SHA512 627bf49df5a6da76bf04484912c7be686f4e9adc51be619fd613b56fdd514088c173c39cab5fb5a6757074130efc54edf192c7df43090965ba9066de5d0f1755
 DIST dropbox-lnx.x86_64-89.4.278.tar.gz 96726025 BLAKE2B 152be18f9b15e9e2a4c188ea6f4649da09b6d50571bacf42068db1abe16a375612e5db9c86369cc4d3e582b660d79df1f35af03504abfed64e728a8515630eed SHA512 5bfc29ff40a3b423eb03ad44e0212ebf015b877bd128432f76ff3103aa43ea6f87575247a5b0b815951c203dfd4b54345e6ab880ab47deb21e29d659e5819755
+DIST dropbox-lnx.x86_64-90.4.307.tar.gz 97077393 BLAKE2B 2271b740d381ad5748ec0b5986991b1b3e5ef9d9553e101eca787ff0db5eb03dd91934b7024cdb2eb545dff7ecb5dd64bb95d3b0b8b5f709fb27f90081a1a0e4 SHA512 464ba52e6fe3376c1bd8cb0806a65918e2fd3ff0e5b8379c6c19f9b302cc64b64cdc80f9b8ee2a072fa6564d8c9de0502a9474c72ef5560d7a0b62faf9c5633a
 EBUILD dropbox-89.3.268-r1.ebuild 2749 BLAKE2B 3c7d18fefef5596d9dd6c7e140a4fce617f897090a64ed36fc07695a9bc4006b0d0137353e83dd7aba32d6aa4d7464eaf88b411671e7aefa92b9345fb3d0215c SHA512 6955781d8b1fdbf8d5e9e04f262f8f50bf6e4fc69f9061e9ff1a09e47c79ba32dcff0d2feb80da4edc4aba9c7b0d1b2b4bf0f4d66f0d69de27cd3ad193abc513
 EBUILD dropbox-89.4.278.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64
+EBUILD dropbox-90.4.307.ebuild 2751 BLAKE2B a9fb44c7a6588eac19a8d25c6be0f53868ed0fa7ba75bcc1ea8948b4c237563de05c6a0fe8e0dfb42f2e0250f042bd8f5f72d0d474341a17212d9167097fb0a3 SHA512 adadd488e7749135212fcc6c4c4f8b68b62d22b95e0242a33407a54cde4dfd448b08ae380c92414b44f3147a3f41642abb1d5e2b7f061748dab961071c510d64
 MISC metadata.xml 422 BLAKE2B aa4c408abfc15620a5a8aa6f65891c152315200622b4cf65214757244394a7234e01093d4c0d899d93897182061b02631cce9a3f9409e530d9d9d9a7662771a8 SHA512 987f29ecd23a68ee9037749c20640279f1e232e1d09fb0c4279940643ed50cfd2f0ee8c3e5d3f582b6ca227c757bd3306ca7b3bc59cc7a4f86e9586421d4c839
diff --git a/net-misc/dropbox/dropbox-90.4.307.ebuild b/net-misc/dropbox/dropbox-90.4.307.ebuild
new file mode 100644
index 000000000000..21752c395069
--- /dev/null
+++ b/net-misc/dropbox/dropbox-90.4.307.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		|| (
+			dev-qt/qtgui:5[-gles2,X(-)]
+			dev-qt/qtgui:5[-gles2,xcb(-)]
+		)
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi_native.*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 58752e6914ed..3f681e615880 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1.ebuild 669 BLAKE2B 56a599676b5f6ed7fc371ab0b4adbedb7ce87ce0c563f90642dc3cbbec3f2d84762993879f9db21a673c3630281f600b265b1095040b24e2894f475d53aa36ca SHA512 6ea1b01ff4b21bdac0a4fbd35675a061e72570e42afad841261e3994c6637119906225ef229fa6eb896d529100b13cbc5b4b8a7a27c7ccbdbb4090b7a322cf83
+EBUILD econnman-1.1-r1.ebuild 705 BLAKE2B d6867f731cde532852a9c423058bd08feff493d8d9521903b3bbc728296396c563bda9265ef2535673b6f5c0d0045617d94ebe91a23a38be3b16aa9ae8df10f6 SHA512 1c0230063216607707e43e9e7f41e3a7ca5ac2f6dc9423143da5174a9f9b479b8abb418a376aa044083c6888fed3985a6d1f7afa5076bdf2d6dba28f7c495ea7
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/econnman-1.1-r1.ebuild b/net-misc/econnman/econnman-1.1-r1.ebuild
new file mode 100644
index 000000000000..bf5b23bdf38b
--- /dev/null
+++ b/net-misc/econnman/econnman-1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..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]
+	$(python_gen_cond_dep '
+		dev-python/python-efl[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+src_prepare() {
+	default
+	python_fix_shebang econnman-bin.in
+}
diff --git a/net-misc/econnman/econnman-1.1.ebuild b/net-misc/econnman/econnman-1.1.ebuild
deleted file mode 100644
index 6469ce52bbc6..000000000000
--- a/net-misc/econnman/econnman-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..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/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 0843992cf055..60e7e5aae6ec 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -7,6 +7,6 @@ DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7ce
 EBUILD geoipupdate-2.3.1.ebuild 564 BLAKE2B f0f6e6492581266e50dad9557fd62e363529e57fa5e7461a9cc12c4d35fca243703455d34a4f452427a60bc9789a93db73f033c9f0e8c1f88f823d82e1e63c8d SHA512 1c052646927f9b8352062c069b020f1799b787eaf781ecc2b74bf41b127a19d7e47c89b8c8f4e771c7262149fc455f33c462d236e4a259d27e969f9644a10ee2
 EBUILD geoipupdate-3.1.0.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9
 EBUILD geoipupdate-3.1.1.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9
-EBUILD geoipupdate-4.0.3-r1.ebuild 1268 BLAKE2B 39d26909a70acfdddbeb9f823e4babac6af48077af154f15f1228d7d50a40fe73b2c4de5842ce8d6b87ea6d39a25d998e553ec0cbf42904a9efa45302d9f7eee SHA512 194465588a84cd045cb0694c5dfbfd1e9e14cd07d49d3a77d68ec6e0df4a872766d8a5bcb2a9094f72853cfe3e28a350969cbd4bec99bce35edaa2786cb4d52d
+EBUILD geoipupdate-4.0.3-r1.ebuild 1289 BLAKE2B ee680fcdb3c7f9f27fd362e92dcd9b3b5a2c6f1003cd5d52b44a8f711261cf796b4597429d014c352b193894abab135af8ef2b716ab89d21824a43f67b7c7dae SHA512 2960dad2406366ceac8bf104e79daf9d2dac8a37b89b515a1bf9349a12a357c81f2f1215431e37f8548e1df5e4adfe5540521e824a9bb10a842d82eae2819e2b
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
index f8f05abf74d5..12bbd5889a0c 100644
--- a/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
@@ -8,7 +8,7 @@ EGO_PN="github.com/maxmind/${PN}"
 inherit golang-vcs-snapshot
 
 DESCRIPTION="performs automatic updates of GeoIP2 and GeoIP Legacy binary databases"
-HOMEPAGE="https://${EGO_PN}"
+HOMEPAGE="https://github.com/maxmind/geoipupdate"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://files.adjust.com/${PN}-vendor-${PV}.tar"
 
diff --git a/net-misc/ipsorcery/Manifest b/net-misc/ipsorcery/Manifest
index 98defd8b8031..52d1f727452d 100644
--- a/net-misc/ipsorcery/Manifest
+++ b/net-misc/ipsorcery/Manifest
@@ -1,5 +1,5 @@
 AUX ipsorcery-2.0.9-_BSD_SOURCE.patch 203 BLAKE2B d04a19c782186b5c966116eeb3681f9695b71190928aa6e81e152ee7c68d6f6cec66d1d46f9b6e85ed562cfdde046b05877460f98e6d0408e461ae85ec3beb0c SHA512 e3497b6d5f77288fd8627ecf610045177bd7a5db22b94ee87f91965ddfc13539736b23dc0245001f5d2726617c120d7133dc288b7fb2355d7648f83c08a06dcc
 AUX ipsorcery-2.0.9-gentoo.patch 756 BLAKE2B a37fc6896955a1b4e86847f027cc71320960c71e7e2eee077cc29d632c7fbfd0a60fa7456bdde1d354824e564a45ede7a18801b8ca270d1f83e465587e153e11 SHA512 9619924c02996032584c4a0975dcce9d5d9ad5945f3320b0d4cca0f0bb2d938ce07644992db794c928aa84a1e0a3d46968516b6bdb6180e547a8a13b50de6f39
 DIST ipsorc-2.0.9.tar.gz 38600 BLAKE2B b773a60105e03963edeead61d93d7a28cb16683cf00fbc9d874f4de7e854127c44c9c64dc045f4228520114593cf98587e594e7946015f2f3f8ec7e9e2fdd36c SHA512 a45454d70ecd928df36aa466dc886ab470ea3200e1b252288ea96f96e3fa8742af57bfe98f42d65c7e7abb07986092c2191aadee78ac785fffda40acc5ff8d66
-EBUILD ipsorcery-2.0.9-r2.ebuild 801 BLAKE2B 6eb60851bfbfc01681bc998338c7eccb04b4694c74e41c392c5da530a9f1a3d51cb26e70d46d33d95a29fc074215b15243de4ec5e936646f9e83034c2d087305 SHA512 58b7bec0900e81bf967a157ff904e7e0e496f58430bad00a4ce6d26b1ce1f45fcc6bccba393a0e3c25d23c9b08c98381bd744e7f1c3a9409ad56867e5d85d65e
+EBUILD ipsorcery-2.0.9-r2.ebuild 818 BLAKE2B 1218ab4f13a718a8e316bc24d8e25f61a5f404913688c8845bca6c822d9548f951b8ec9631f0e8a05c5929f3588a00527a248b849ce7d2371845e216abe6ce18 SHA512 bdaea2cf9a372f36a866da36e29ec30e2154152cd0e4be842f9454ca7ecc901af31bde1fa83cfc94c79739899744281821ba9e3cc323a08b6d2cbcc058aa9e1b
 MISC metadata.xml 212 BLAKE2B fb59bcfbeb093c851e3e4a935d1614a10f509fd386894f9d9ade50348d9a1963e9eb482c89980f54986c79e073769212b0f9f0b4ec49d817fd252f578f292bfe SHA512 934c3c3ff6efab14f989c4b030de2bad2ce242d4402a68f90cb6e6fa9d5c3aa85cf0d6f5b92936acead641ebd9d05c870f4d5d59d1e94901c21cb9ebfa4ae685
diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
index 3598a8d8e95e..515c5f784c83 100644
--- a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
+++ b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Ipsorcery allows you to generate IP, TCP, UDP, ICMP, and IGMP packets"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/ipsorc-${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index e8fcf4c36639..c66be774c8d5 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -12,6 +12,6 @@ DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
 EBUILD iputils-20180629.ebuild 3969 BLAKE2B 20308a601874c7b4082f8c466734341c827a9bd241ca64961c2d83a4f8b7ec38119e2ed284b18ab2c98928c3e8f06690f2c726047ef6a8f75f442a85719a61fa SHA512 56aa930b4078d61e9b6cc05ee7d09dd2076da97560177ad49aa134c94e1b1aac39543a0217bebf4a4fc59ead143a7e81eac52f5bfd658e9f11ba38b5dd1de91d
 EBUILD iputils-20190515.ebuild 4923 BLAKE2B e7c4bb2ac6393f93e3294559091b4a339a76a2e21e0b787b92cf631b9799486a701ca5e5e5f1b77910a9edecc00b68661f5e789f336fce9c9321ec3656e4faa9 SHA512 48037b05394e88e60ee399d9560f59529e3b195e10b8a5137b11377a6e4240a11aa2409f0e5d74ac753a72fd42c414edff975fff78d77c20de6e46a9c7c116a5
-EBUILD iputils-20190709.ebuild 4846 BLAKE2B ccd0487139bcc3dc40c2922191e10053fd5248f0bb3419ab7c40b21f3599467754ade3d844803087b7a9b477c5d1c1823d13ae14f7285c3a2814cfed21b6d8a0 SHA512 6e11a646108a6fb73a124ad00d569db2fbb3c6193264a9677ced0a8405bb815fbf442bb13d08a53580ec258857c494d39a50144faa967f4d923fc0b55a7fd3ff
-EBUILD iputils-99999999.ebuild 4853 BLAKE2B acda2cfa73d94e1f5c2e34f716ce27911a26df3acef3138f462af53e2ad230f02ec39b6186b64f5bada03bdb40efa494f6a33eb09350b2dc638375263406ce72 SHA512 a218a45c72883e6fe3165f9b7ac2438b06582d6470ef116c67d9e4e6a2cafe276ca4f05f58938a22e5f5267373fd6670c5456b28a9d6c4f4ff5fd83e2b346cea
+EBUILD iputils-20190709.ebuild 4836 BLAKE2B 9275ac93aca04c5e51a8595945f9e431f5acb25767952ac1b41cec684d30f594f3d69838b1b412c82f6e055e10340de905c25f3fe0e9631afddce5cb89a5c4eb SHA512 a5db81e22fd5a98a4aa38c4e85e69205bb8685c31e172ef171004716b3f3730fccfbd2be7edfc13674013fc1c9ece4ce5126d0a19a40d1dd72fcee75b250346b
+EBUILD iputils-99999999.ebuild 4843 BLAKE2B e22a34d1ef274e826ea81b56ea96a3d5115d489c5693196dff526637dfb26eb650af874b05df77b0d4350bca1b0e8f1395020ef4e513a9da46da51245b08dc1f SHA512 26d8ec2206ee720aa02a9feaf9e1c8318704ea2f85b3b7d8eb90ce9608ad55ad066f87959f121a8f7f771d006eec70152c7dd7af9e69e538d81a3b558aa180cb
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild
index 3d4c44ef2ce2..1c478e19659d 100644
--- a/net-misc/iputils/iputils-20190709.ebuild
+++ b/net-misc/iputils/iputils-20190709.ebuild
@@ -142,7 +142,7 @@ src_install() {
 	dodir /bin
 	local my_bin
 	for my_bin in $(usex arping arping '') ping ; do
-		mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
+		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
 	done
 	dosym ping /bin/ping4
 
@@ -175,7 +175,7 @@ src_install() {
 			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
 				html_man_pages+=( ${my_bin}.html )
 			fi
-		done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
+		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
 
 		pushd doc &>/dev/null || die
 		doman "${man_pages[@]}"
@@ -186,7 +186,7 @@ src_install() {
 		popd &>/dev/null || die
 	else
 		if use doc ; then
-			mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
+			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
 		fi
 	fi
 }
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index b017e1a7fb9a..228cbf543703 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -142,7 +142,7 @@ src_install() {
 	dodir /bin
 	local my_bin
 	for my_bin in $(usex arping arping '') ping ; do
-		mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
+		mv "${ED}"/usr/bin/${my_bin} "${ED}"/bin/ || die
 	done
 	dosym ping /bin/ping4
 
@@ -175,7 +175,7 @@ src_install() {
 			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
 				html_man_pages+=( ${my_bin}.html )
 			fi
-		done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
+		done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
 
 		pushd doc &>/dev/null || die
 		doman "${man_pages[@]}"
@@ -186,7 +186,7 @@ src_install() {
 		popd &>/dev/null || die
 	else
 		if use doc ; then
-			mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
+			mv "${ED}"/usr/share/${PN} "${ED}"/usr/share/doc/${PF}/html || die
 		fi
 	fi
 }
diff --git a/net-misc/lksctp-tools/Manifest b/net-misc/lksctp-tools/Manifest
index b71c94c3e02e..06b86dca1f9f 100644
--- a/net-misc/lksctp-tools/Manifest
+++ b/net-misc/lksctp-tools/Manifest
@@ -3,5 +3,5 @@ AUX lksctp-tools-1.0.8-prefix.patch 332 BLAKE2B a83cc8172bb96f7cade25b049608ef46
 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.17.ebuild 1259 BLAKE2B 6b9cb9c10f012c0d6b2d8e29c4dd5f312278a4b0e6d56844c895f6c611bfed461e2a91a7c8adf488786c4f835dad98acaece83aea0acc9c34443359dd8802ae9 SHA512 ec01fab740601afc9fcd2d55a32748ea0b088c3a11f580d72a9c1b2222a23847c25a83029eaab8cbc9a3cddcd2c28a96f9c8a9206981c7d68f72b76f8c98634a
-EBUILD lksctp-tools-1.0.18-r1.ebuild 1392 BLAKE2B afc5110a412b3c24b889aa4f8d3042140bca69281e16093498af8cccbddb9e55bd3ef9c1066a4cfbb09a38fbfd5e15dd3c0767786a1af47e403099b6f32d1b14 SHA512 d641c66df6dc26ce5f79271904f1300f46951361147df3ca73c58618560c6ef68ff3e65d12590f9d8362d6151d0e15fc9db0fa269bec3efa8b15e2476fad6b71
+EBUILD lksctp-tools-1.0.18-r1.ebuild 1390 BLAKE2B ccf9ae161867e71ef3842ae0d5cc89dc26bfca0fac6c0f2c455f86aebf0187dfa8d09d278bda71aeab9e129297fe199995a792f5cf847e08283bac164152043b SHA512 ab17a01562363f2fd37d53ccb993bfdd8d39cb8682b330a3a375a97ea667093bbfaa57ae28ffa8db4df06185ee2d3a1762a9632a7a9516f16c0b2dae869fca28
 MISC metadata.xml 550 BLAKE2B f7143883df23ece0587a094751eeb897d933d98d7a93548b9e531cde8768ff6b71e570f12a467be8ae5745d7a5319173da1423556c3896cfeb844eaa22073dc8 SHA512 099abe7a3849b871accd886b220b1d26234e3f5ab90f58e70e2670e25f66a78966deedeaf65f667ff3186aacfcc642ab962ba31c16583ea437b738d8f075c0ff
diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index 7f1c3466c1ab..8ee3b73e8976 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -39,7 +39,7 @@ multilib_src_configure() {
 	append-flags -fno-strict-aliasing
 
 	local myeconfargs=(
-		--docdir="${EPREFIX%/}"/usr/share/doc/${PF}
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--enable-shared
 		$(use_enable static-libs static)
 	)
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 03a2d46d655c..3865e30e6cb6 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,6 +5,6 @@ AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 AUX networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch 1350 BLAKE2B 4cffb7d29c1ffdff7106485e2fe1a74ec403c8b9cb5235a066021fd91d0231aef7b9f621cd82706e58adbe27085d13600a651f5957e6a20f3ca241af483cf88c SHA512 f541c873f097b8424e04fdc0fb2ca6256a3e17cb60021f1c931908ff39bbf95de3e40975ea62b19c18aa35476a5f7e07fc96135a0fb0bc1128acc5b62724bd3e
 DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
-EBUILD networkmanager-1.18.4-r1.ebuild 11317 BLAKE2B d1708bae2519251123071b311d68703cc4df21912023506d277bf7c134e8cf28fc3dc325014fb8c0497ec85dbe53676b60e4dc230c68a9e3a9616fd2598d0c5f SHA512 091027b715f06d8f347f504c35e70de20f3a1042bb263dde8b2a7366e651f4c3a59bd64ae90ebd6498d5b442696e18bbe525ad130049d6076af773a0fefc7ddc
-EBUILD networkmanager-1.18.4-r3.ebuild 11457 BLAKE2B 92fcac81d87d37f3f371ee313dd0a0c25d22e08133f14eb81d49088d8a7df2d2c733a06d17ca29876dedc82a6d7b9e552e32e331f1dc5024fb8aafcf69803e07 SHA512 71455a2e56341b31e69940a8dbb2ef8f6a52a5ca0ecdb4c976441467011dedc1f658aeff8bb19bdca65196e0de99e51b128c3755af23f345aa2674b85252525f
+EBUILD networkmanager-1.18.4-r1.ebuild 11313 BLAKE2B 64307633192d02edf3d4d623588cfe7ab009e2a668daee04c0261d2c9a5b40abe8e8fc840a546a626b2fd32d2ec6aca0bc92aff7480e34e0d79d3f750d817347 SHA512 1b8db6b06a3974cdc746312797a4adb736c389596cc54ef6ed27f23a0aaf2fce401f92e5a1fc4d6ec57bb056bb1c0fa4e3dd8f2460409ad21529c3412d901d7a
+EBUILD networkmanager-1.18.4-r3.ebuild 11453 BLAKE2B 60492af74aa341b60c290d89dfa52c7f7bf2a38cb353cfedc469ac9b3fd18d16fe6034b722ce4fa587482c9e10ad059d31854bc1688bc302f603da8f326661f0 SHA512 cbeacaa37268f40912e46c6cc676aa7b854ebe7d880f88db87e828cb51aca5268ac682e90416d65f94651ff57848519e3b0b802e99fdc5e97aa9a6667484ac6a
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
index ed2ea6102e3b..38eebd608ee1 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME_ORG_MODULE="NetworkManager"
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
 
diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
index ae3ec3ec7874..7f6098399a87 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME_ORG_MODULE="NetworkManager"
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 4f48bf90dc8d..edf31fe9c60f 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -23,6 +23,6 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6
 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
 EBUILD ntp-4.2.8_p13-r1.ebuild 4562 BLAKE2B 0c2ea0e5db7ed0beafd8f16c68148fcbcfffac71d842ced27ef4b605bc59411b3a4327aa449635e4cbc91a63b021018c8d1ccc98d39fab705b91c6e4996d2c5f SHA512 ffa1e54d5cb412cbd484cf911e44c50be9a3f649a4c78995344bf40095ad8fecab35c8efac2df6377d4522399f96f38f4d5a566d7eceacbb34e97f04d4b3995c
-EBUILD ntp-4.2.8_p13-r2.ebuild 4615 BLAKE2B 063af81b68f5ab371c2de2463f85f1258395d31e287eb149a892978be6f8e0b35f2146fa968e29d233c84d08a486ad27ac41c2f62d7c7b3d701bec04dcd29a52 SHA512 7bbdd96070f95b58dc24afcb6d734890d0b58b02d3dafa1e2a6690040c83576e12b02771ba69c44baf7dc106d3727007239af99b5a0e18fec335933853617d60
+EBUILD ntp-4.2.8_p13-r2.ebuild 4613 BLAKE2B d4ba16cbde46c383b9cc441b46b1187708615689508e9d11d2c1bfb42bf56617946d269e7591ae86b7b62855dd89b3084bd6aac37ed941553e7b8e4bb4f3455e SHA512 450e5178f50520310934eb59418c15eb1377957f521c5f9721a9b8d579f2933e8349b0dac1d1368b4b8b7b9b23edc996d6b4a1a959c5f806eda764f77f123dc5
 EBUILD ntp-4.2.8_p13.ebuild 4550 BLAKE2B be2ab12851068dd20baa6e134fecc34c4e5fd651b4235041672bfb5064bd15a20560b3fd17eab2add20f8f4685e4b55682dce4fb36ba833e91a9856daab301bb SHA512 8821c4c21a76c108de86b746057225618a7fd595cc90a3db77e3ce247f20705d618ca1f50ffa5e6e3fe087f6652f9e4befb559976beb32e2746ac873a30ba253
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
index 7683b71bf4fd..508eb7ff7b9f 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
@@ -124,7 +124,7 @@ src_install() {
 		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
 		if use caps ; then
 			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
-				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
+				"${D}$(systemd_get_systemunitdir)"/ntpd.service \
 				|| die
 		fi
 		systemd_enable_ntpunit 60-ntpd ntpd.service
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index d2924d77238a..4a24ad791c6d 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -73,8 +73,8 @@ DIST openssh-8_1_P1-hpn-DynWinNoneSwitch-14.20.diff 42696 BLAKE2B d8ac7fa1a4e4d1
 DIST openssh-8_1_P1-hpn-PeakTput-14.20.diff 2012 BLAKE2B e42c43128f1d82b4de1517e6a9219947da03cecb607f1bc45f0728547f17601a6ce2ec819b6434890efd19ceaf4d20cb98183596ab5ee79e104a52cda7db9cdc SHA512 238f9419efd3be80bd700f6ae7e210e522d747c363c4e670364f5191f144ae3aa8d1b1539c0bf87b3de36743aa73e8101c53c0ef1c6472d209569be389e7814d
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 EBUILD openssh-7.5_p1-r4.ebuild 11165 BLAKE2B a2ec84eee8d85fcde9f1f31dd1093aacbe24fe121ee234067aa196a9e1a9399cf397396cadbc6cbd2e5b004e505ac76a67dfacf8820b4c61fc74af7932b961b3 SHA512 1023740690ecab734bc7671b65a68defccff626b9da0ef0580c45fb6d30de681d05b555bb0d74cb342aa3873f11d2ac5c6a444041f13c80b508412a7b4fcac4c
-EBUILD openssh-7.7_p1-r9.ebuild 15920 BLAKE2B 421e98245cc89bb1c482a0ec3c5d35448e222430c0b1b258cfd0a7902543d1307b328e541c5418d533936c948fc67b1ece4ad9f4b48bced7f3c6061abe032f25 SHA512 4ab2bcd5bdf5ae7f5a5561c4964d3173b6f52ad95426c8db7cfbbcf4150bfb6b05e3dd72dcdf62533de0d0ed0506fc040e87fbd4212357d213bc9158d37a9130
-EBUILD openssh-7.9_p1-r4.ebuild 16294 BLAKE2B 3b5d7d2cfd03d6d22996b45cfaa467b71fa779b612e1a304cc10493587e05426d9936ed86898c11de3f1ce8068bdf429a728b63947283293f3d0a2a5ab44d019 SHA512 7a8100d59db2382be08b90e031b0e5691e22f7f66033e7ffc46d4956f1465f3ff76fc08b643799a453817e8fd75d67b550e7c741d2bdad1d7b43f9733667863b
-EBUILD openssh-8.0_p1-r4.ebuild 16667 BLAKE2B ba64a43648d8cef989c078019d8a0fb06386b646136adcd08f030771014bf05de142c95eade811b7e493f6e91d520894848174c4cf1508813a8cc32fdd109d22 SHA512 b6daa06fc03f190d82fbf3b762c1a698fa9a803fbcb375c460a38cc2cb42b2a5da5d4f76529db3390554c9af861c637d918095981b8b7cf10dacf886b1051db3
-EBUILD openssh-8.1_p1-r2.ebuild 16367 BLAKE2B 6fc69bfe00c80e45f20f096bc6931d6acc020d2b0ab3b7372cab48aab7576d376adfb8c7c0b79e7ec366a1d7cd89808026d4be6091084e896d53934911631f30 SHA512 022e9673db8e18c786afa06c08ef1f29eb0be1e4f5de0e24ff088142b3be71fcc00f5c6fd5a985065da35a829f168099bbd2dabb04ce54a1132ac36765802e93
+EBUILD openssh-7.7_p1-r9.ebuild 15908 BLAKE2B 82c5c2e5ff3f9ee0f1a99b1b3c455b41180da4d8cfde805cd0f8b12f833d6eb0ca60344362e8861e4b70a59951c78f345e5480b19cb8886eb50aae2a686b06d0 SHA512 80115988d12fed4b4b58affc264fd4fb0bd493893369779b54dd30a7790820be3fee51816d6bbd761c69c6258de3ea2e60aa2307c3245c42aef76737116d6fd2
+EBUILD openssh-7.9_p1-r4.ebuild 16280 BLAKE2B f92dcd2d77e2f9545a06adcc2760eed840b0309df447a656e4b83482c34b4c380f60b8950a5dff305a1ffdb1dd2625afe856a0a9da3b728102eef81bf0aced85 SHA512 ca07f21accaf519b290e5d2208110c95d04153f64ceeda2988cab9cb8ffe3c4493c1eb347a00df69820c222f64e5dbed137aadb8cca8a2f60fb47442ccc2c771
+EBUILD openssh-8.0_p1-r4.ebuild 16663 BLAKE2B 0c2b6048a4c936c473f68b63cf0d7a5b6fa9d65f48ea5bea42ebbed06980236399e674111da0dfeb122449da5b5bc08ba9e6355fac5701ff34a31ee574ba3ace SHA512 1f32100d6a67cec24096f4445b16912ea3dbcbcc2010590e3ef62af12670bc8743d271b6b0d0332eab680654c4271ce2e866649dbb879853745a517250e820fd
+EBUILD openssh-8.1_p1-r2.ebuild 16413 BLAKE2B a74b650af4d74c6256c5f47c2cce9bdcc69cbdf5fc0068444bff72f6147152e1fc17ef9e552a1795f9bae95919db824af4551d33d0797c8e3c438c9e92fd9d52 SHA512 2c3a625733d290fa1c874334ea1930111105e7ecb878671a2d79fe91a4cb84d7192c2a742c2ec27d38f5c488eef12d04cc133dba9ba588d19bacb34ea95961e2
 MISC metadata.xml 2291 BLAKE2B 9e12fbae3c37a48c3b04876a7247bf38c33d6cc5be210b382e35e45c9318b3c3e7c91a0ef32a9fda96ac7a68a00f9d703aacfc1c1f23e59511ea97d159527488 SHA512 8605c7aa2e4594a04006b3abfac3fad359e3e44182be53116e25159b7419d4429176617c10b50354d0d10c2be26af550e9a2b6e4c7085906558a569dddf5c8f3
diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
index 7851cc3b95e1..98bf001c684e 100644
--- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
@@ -98,7 +98,7 @@ pkg_pretend() {
 
 src_prepare() {
 	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
 		pathnames.h || die
 
 	# don't break .ssh/authorized_keys2 for fun
@@ -255,13 +255,13 @@ src_configure() {
 		--with-ldflags="${LDFLAGS}"
 		--disable-strip
 		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX%/}"/etc/ssh
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX%/}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
 		--with-privsep-user=sshd
 		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
 		# We apply the sctp patch conditionally, so can't pass --without-sctp
 		# unconditionally else we get unknown flag warnings.
 		$(use sctp && use_with sctp)
diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
index 9064d66d9fbd..828c4a17b8ef 100644
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
@@ -110,7 +110,7 @@ pkg_pretend() {
 
 src_prepare() {
 	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
 		pathnames.h || die
 
 	# don't break .ssh/authorized_keys2 for fun
@@ -279,17 +279,17 @@ src_configure() {
 		--with-ldflags="${LDFLAGS}"
 		--disable-strip
 		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX%/}"/etc/ssh
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX%/}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
 		--with-privsep-user=sshd
 		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
 		# We apply the sctp patch conditionally, so can't pass --without-sctp
 		# unconditionally else we get unknown flag warnings.
 		$(use sctp && use_with sctp)
-		$(use_with ldns ldns "${EPREFIX%/}"/usr)
+		$(use_with ldns ldns "${EPREFIX}"/usr)
 		$(use_with libedit)
 		$(use_with pam)
 		$(use_with pie)
diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
index 2acc872e9ccc..1b1d9363437b 100644
--- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eapi7-ver flag-o-matic multilib autotools pam systemd
+inherit user-info eapi7-ver flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -111,7 +111,7 @@ pkg_pretend() {
 
 src_prepare() {
 	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
 		pathnames.h || die
 
 	# don't break .ssh/authorized_keys2 for fun
@@ -281,17 +281,17 @@ src_configure() {
 		--with-ldflags="${LDFLAGS}"
 		--disable-strip
 		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX%/}"/etc/ssh
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX%/}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
 		--with-privsep-user=sshd
 		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
 		# We apply the sctp patch conditionally, so can't pass --without-sctp
 		# unconditionally else we get unknown flag warnings.
 		$(use sctp && use_with sctp)
-		$(use_with ldns ldns "${EPREFIX%/}"/usr)
+		$(use_with ldns ldns "${EPREFIX}"/usr)
 		$(use_with libedit)
 		$(use_with pam)
 		$(use_with pie)
diff --git a/net-misc/openssh/openssh-8.1_p1-r2.ebuild b/net-misc/openssh/openssh-8.1_p1-r2.ebuild
index fe7b7fb1bb49..057f482b572b 100644
--- a/net-misc/openssh/openssh-8.1_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.1_p1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib autotools pam systemd
+inherit user-info flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -71,6 +71,7 @@ LIB_DEPEND="
 		)
 		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
 	)
+	virtual/libcrypt:=[static-libs(+)]
 	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
 "
 RDEPEND="
diff --git a/net-misc/pimpd/Manifest b/net-misc/pimpd/Manifest
index cf2c1778e0a0..82fad9124755 100644
--- a/net-misc/pimpd/Manifest
+++ b/net-misc/pimpd/Manifest
@@ -1,3 +1,3 @@
 DIST pimpd_0.8.tar.gz 6763 BLAKE2B 4a9119a0f96b208551a61cc9c3e0ff2e278d7483e57baa0968f9e0949f23d824f75270c3fbc463f9af3e4760ae99e8f8b52fcedf5a2c3d86040486396acb819e SHA512 cb9a60386d5071e21feacf991bb1b2d3d0cb681561a04dc3b9e830336b9d63b4c7026e0a1e43d5276895c733cc0c7d9e072ce1e13ae4b26e83543c53c8147dbe
-EBUILD pimpd-0.8.ebuild 483 BLAKE2B 6f89f2abcb46d4a2357321d9e4aead0234da83640b294c3ffaaa47d06b3cba740f21f4020af3d87ebcf0f5bd17660a73e84c722974088acffd07ce6cbcf19ff7 SHA512 c12ced7a675c80230a9ea9e571c8674f28bce8c7b654cdf4cc1a73dc904de12546fb7372f47a1096b63e56518efe2f2a384feb4574620f785eec1b5e7f8cfcfc
+EBUILD pimpd-0.8.ebuild 505 BLAKE2B 0c17f0039381e14fc41fc36dd541175d8f99c39e770786782a10ac4e22d4952ef7c7cbf108eb38881ec02bfe002d83a08a162af950d940c0edcb43a846d5d2bc SHA512 2fdf23584c74ead7b41a72d570985a4651104a28d08a5d109434ea86a46820d39750407bb32eec19d2ea83eac08c0fb96d08673dff2c6b9eac528e3d049fde52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/pimpd/pimpd-0.8.ebuild b/net-misc/pimpd/pimpd-0.8.ebuild
index c2734c71ef6d..86940f2db44f 100644
--- a/net-misc/pimpd/pimpd-0.8.ebuild
+++ b/net-misc/pimpd/pimpd-0.8.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 inherit toolchain-funcs
 
 DESCRIPTION="RFC1413-compliant identd server supporting masqueraded connections"
-HOMEPAGE="https://gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="http://cats.meow.at/~peter/pimpd_${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/pssh/Manifest b/net-misc/pssh/Manifest
index 5de81b5cc8b8..cf86f6aec58c 100644
--- a/net-misc/pssh/Manifest
+++ b/net-misc/pssh/Manifest
@@ -1,3 +1,3 @@
 DIST pssh-2.3.1.tar.gz 23427 BLAKE2B 7297ec83d31272506a34ca771a4476deb0e22f6d85f770cd380d6122e2e39c40f6767b84286efd9980c53729f5f7e0ed19af566cc1eea358ffd9fb0820eca167 SHA512 c39e1c2b0a3bc2bd736f1e7d2f402db6a128e81d6a80ce7e97f39e7fae93f7a20037b43b5725bed5ba911f54e36a9b65c509d858a53c696989b76b1322e7680f
-EBUILD pssh-2.3.1-r1.ebuild 770 BLAKE2B b0443bd0b4909b25528c0274aa50598138f1f5c6621c8c6c03f342737180aa090987599ea4e54a775f147fa0ab21f19e85892f65a56b35b060e886fee1bd28a3 SHA512 bf34b050e61e4d3d8019e2432f5f8dda6e1aa567fb5f5f654de696ddfdd819513c742bbb1d57b92c9f1ec4c5c569b7c7394a4dc74fee7b9c58d11462e2d676e9
+EBUILD pssh-2.3.1-r2.ebuild 726 BLAKE2B 9a7ae47d5674f7f29f2a4a362e0b69f443d9239338022b78a4f91c06157df61304cf755bf61092f6d7b69abf2af8324dde966ac3360cf0898a0ccd17a5c537b2 SHA512 7335dcb8885b4dc12e147ca114d1ee45ac2049f4083a11fdfee54f6df59651bab761131ec82b119e984ae158898c57e5231963c206f34895753198ef291a6731
 MISC metadata.xml 339 BLAKE2B fd5344fdf419b900b25c757d4f4bee0084c9493f73f77dd4d760ca8c438bb71e00fecf2aab2acbb62c2d824e149e4db8a1b6fa32814b945ed56969612f36e21f SHA512 bcea2011bb23b0796bbfa66c6cadedbd03d06ab15f9254c444d6cfe6c1985a41ad37dbafc214cbcdba73f3cb789ac3ec4a42fdb5a20cf9d38a88ef0d23c588ff
diff --git a/net-misc/pssh/pssh-2.3.1-r1.ebuild b/net-misc/pssh/pssh-2.3.1-r1.ebuild
deleted file mode 100644
index a79e2bcdd73c..000000000000
--- a/net-misc/pssh/pssh-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
-HOMEPAGE="https://code.google.com/p/parallel-ssh/"
-SRC_URI="https://parallel-ssh.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="net-misc/openssh
-	!net-misc/putty"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Requires ssh access to run.
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	sed -i -e "s|man/man1'|share/&|g" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/net-misc/pssh/pssh-2.3.1-r2.ebuild b/net-misc/pssh/pssh-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..eb333cc8d3a5
--- /dev/null
+++ b/net-misc/pssh/pssh-2.3.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="PSSH provides parallel versions of OpenSSH and related tools"
+HOMEPAGE="https://code.google.com/p/parallel-ssh/"
+SRC_URI="https://parallel-ssh.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="net-misc/openssh
+	!net-misc/putty"
+DEPEND="${RDEPEND}"
+
+# Requires ssh access to run.
+RESTRICT="test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+python_prepare_all() {
+	sed -i -e "s|man/man1'|share/&|g" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index 4010ab5f6b9a..8402ff1da9e8 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,8 +1,5 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
-DIST pulseaudio-dlna-0.5.2.tar.gz 701412 BLAKE2B f31d2e5f9adb79fc2882b14582f2787f152675c6f2c97857edf93d6b28fe2d3cbc85badf427665dac44e7d37802365b287e42fd2f8c11bde7cec5267a2fddeb6 SHA512 298f61d643c35449fbb0001efa69a1792e41518953f58506703f3568902da4457d0f4f9e52b9641df26fc6f978670dd29a7f5d786b99339bd2a71f5fa59dd7db
 DIST pulseaudio-dlna-0.6.0_pre20200114.tar.gz 709196 BLAKE2B 3113d34eaadf735646f7e421e8271fcac02ea4faed76676d5a70e05c8a26745ffd1ae135d2c5186d9db7ad146d166535a1c901927d24ae2a1a4d08720a4f78d2 SHA512 9c97d160116acf07325b18f35000b58a042243345f98cb1c9e42848e39ef3ef32a9199e31044a758a0a5ec81176be651fa3ef2917a227347017fe375e27385c7
-EBUILD pulseaudio-dlna-0.5.2-r1.ebuild 1692 BLAKE2B 8690a3a2c4025c435e1b4f2d91b369d37f1a31b5b06db9e5d06d7559f5a802b2aaaf796150ab3480cb1a2381c217049a4d55748451adcca83689a7a5cb5c897a SHA512 0add5a8d68bf0cbb8c1f6dae3b3b089f55014d52fe404b4c3204ed09c4c0c8c4487cb6540c948a4a4838b08c4e67ff161d47c6db6d0ec01a47def7351abdde89
-EBUILD pulseaudio-dlna-0.5.2.ebuild 1635 BLAKE2B 7275dc34e0110f07791d17daea24b8c3bfe1214a081d87d3ac3cfefefd2838056415aca63868fbdf6e11fd6dc9b23ec76da13437168a710b1498b4331329cecd SHA512 15ff8e21bdeae53480132106fa1bba7954eac5dee19e31a611fb02764e9c23b702419360c7ad46ec62321e5c580b5fdc095a9e519280592896d0f542fe8b7ba8
 EBUILD pulseaudio-dlna-0.6.0_pre20200114.ebuild 1988 BLAKE2B 07014a92a0feefd1902bb7c023dfb01081109b9b243482071cb9b327f176590616fb78f9bb41f577ce54fa6e8c63a89ac78b442a72f99ea7af2232f1e84d2c92 SHA512 477e5dfac0a8a2130e58811180c70ee681ef69350d8372f891c5235ba2c441d1bdf00a540c9a3eaaae733bad7f3c6937ace411bce5e1107b7e1cba2f18ca4c38
 EBUILD pulseaudio-dlna-9999.ebuild 2116 BLAKE2B f912ad135fd58c1584304d2b3fb352ea997bc89784d3f91c839db051674dd6da3fe55ef194a610013479b099727adb073c7e3b27aa90f4728bab7ed4c314ea60 SHA512 dea99662045c76c7428f8a53d0c4aaeef6aa768b2f47a9ea244de3bd9607ac20345df274377591e4307259ce4841561326271598391cc09308953d70cbe42807
 MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.ebuild
deleted file mode 100644
index 6714dd0bdc2d..000000000000
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2-r1.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=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
-SRC_URI="https://github.com/masmu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	dev-python/librsvg-python[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.17[${PYTHON_USEDEP}]
-	|| (
-		|| ( 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_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-sound/pulseaudio"
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}/${PN}.desktop"
-}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild
deleted file mode 100644
index eca97fcf2c71..000000000000
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.5.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
-SRC_URI="https://github.com/masmu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	dev-python/librsvg-python[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8[${PYTHON_USEDEP}]
-	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.17[${PYTHON_USEDEP}]
-	|| (
-		( media-video/ffmpeg[encode,faac,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_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-sound/pulseaudio"
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/applications
-	doins "${FILESDIR}/${PN}.desktop"
-}
diff --git a/net-misc/pytvshows/Manifest b/net-misc/pytvshows/Manifest
index ea8cf5ec6ca0..a4a9f165409f 100644
--- a/net-misc/pytvshows/Manifest
+++ b/net-misc/pytvshows/Manifest
@@ -3,5 +3,5 @@ AUX pytvshows-0.2-feedurl.patch 13082 BLAKE2B dccfd2c5d6637411faf91020a93dc9d84f
 AUX pytvshows-0.2-improved-re.patch 680 BLAKE2B c2d7f08c256d78ae0d793df5e889bc5b99b7018053dfb701b52e0b2fdd364c6e23748db9defeb63be39ddb5cb0414e02175f9c1f0eff42e30866aad93f3fcaff SHA512 15cf4beb2b7da4efed4cf4ae744c0dcefffb4ef61b6a920c41e7926a2666bc07b9cb4ec9b058cfe84566415e7659e00adad423ae90aab0e91ba43646ecc0f6a9
 AUX pytvshows-0.2-rename-var.patch 484 BLAKE2B 9d03cff276bc1960a4813f0605be411c1044ed4647a372683bf46fca45f1df24866784be25ef1f2426fd0355c44aecf89062d2ff5e47ceeb16a4febb509106b0 SHA512 15de0a4fdef7f70df5b5e7612bc3c40741bd2efe4ef0e714b067635b400a4b5676e1f1bbbaa53818380c915714cdfc141cea3aafed75871edfb4f0bec89a9c0f
 DIST pytvshows-0.2.tar.gz 14156 BLAKE2B 61449e01096ef81b131c03b0cadd89433a7dcafd3a8828f251ca9ecceb49dd4d92e382ce50b06f4b5498523fd8b4625fb5442e7f5ef71949a4605ab10910be45 SHA512 c4acd9b968dba7af1c787f9a3f5db4986ffbc52bfc43a4b7101070f8e91e80e78be0e59c4a4fbd873e64a6c4862e64abed2396c7140e9165d72e7d3cea267d5f
-EBUILD pytvshows-0.2-r3.ebuild 700 BLAKE2B 5f152e711b10c2b153644df4d480b2faf0fac6d7f98e86d3ad862bac6718e5dd08237d096e5cf66bb0d87b5d30879cc56213cbedd2f6b06f556ba23080360eb6 SHA512 16542d842d135dc535482a5366e2803dad33b3d444f61e48c6d5747b5a42ab58f41179678447e9c617d38d94b5493b0ef4c814f95e78c0d880eada702cfd250b
+EBUILD pytvshows-0.2-r4.ebuild 735 BLAKE2B e3e58b21109797c6421bb8196fcf8b9a6d6a5e187da210286746ff5f1f90867e386af053448b7ca61dce6dede2f4991855438e01290a72a847ba0aec0d3045ca SHA512 274226cb80932ac76e7ca518dea07ceeb67ecc6df57f603ca80911f16f75d51cfbe2c991cd2123299e3efed01f35797415b215be0d9bcca940b6c2c4381a340e
 MISC metadata.xml 246 BLAKE2B 9716f6dddff0f0604acad323b9c91c077bcf46a52f165f566193eb6cd5cb338180ff87f67f0d4df33eda5dc0136e5dd263f4f327d274803be59ff9d9acb17ccd SHA512 6f6e043d6a63993611316553ea1c70736c02151d19f1ee63ad855226dd79862c7ae7bdeccc572f23ed4dc9dfe3b0e77dd80d48bcbc33c02091c40111ac5e1aa1
diff --git a/net-misc/pytvshows/pytvshows-0.2-r3.ebuild b/net-misc/pytvshows/pytvshows-0.2-r3.ebuild
deleted file mode 100644
index 48e83a238426..000000000000
--- a/net-misc/pytvshows/pytvshows-0.2-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="downloads torrents for TV shows from RSS feeds provided by ezrss.it"
-HOMEPAGE="https://sourceforge.net/projects/pytvshows/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ezrss.it.patch"
-	"${FILESDIR}/${P}-feedurl.patch"
-	"${FILESDIR}/${P}-improved-re.patch"
-	"${FILESDIR}/${P}-rename-var.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/net-misc/pytvshows/pytvshows-0.2-r4.ebuild b/net-misc/pytvshows/pytvshows-0.2-r4.ebuild
new file mode 100644
index 000000000000..dd398bde85ea
--- /dev/null
+++ b/net-misc/pytvshows/pytvshows-0.2-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="downloads torrents for TV shows from RSS feeds provided by ezrss.it"
+HOMEPAGE="https://sourceforge.net/projects/pytvshows/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ezrss.it.patch"
+	"${FILESDIR}/${P}-feedurl.patch"
+	"${FILESDIR}/${P}-improved-re.patch"
+	"${FILESDIR}/${P}-rename-var.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index 28cbf1201a15..2f8145fe4b46 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -4,6 +4,6 @@ DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a3
 DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6
 DIST r8168-8.048.00.tar.bz2 109018 BLAKE2B e3587fda9cdad8a8433933daef7f05b123b661e6079703c840fb20562ff8511424bf183781970957fa3b0371ebcb4c7a5b7ef84101c3ac5bed7d3eee1236194c SHA512 425d3e0fc56006e9371c31078d32f6fd135a038b13ec1c4f1b809f68e73e8fd15e4a4c2d027c0b4a2cee9ef0dda348b478cc855fb123eb05e4157564ab9de12a
 EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629
-EBUILD r8168-8.047.05.ebuild 976 BLAKE2B a754f02e6ed4aee01ad1804ba28dc7d31673bbde968176726a562f3cf54b170593a65eb1bd42bb945442412474fdd20272012af999987635c62af3e887c62d89 SHA512 71881b738190bfaec377232b469aaa8bf4cf701eaed4650a7983e643f90caa042c09a6cbaf0b3b269f39ff20f1ec3e6d630184a0f3f087a0277d352bf2355b43
+EBUILD r8168-8.047.05.ebuild 975 BLAKE2B e912aebc2db2f2e7e7da79d75936a9a471df2bbdb3e374074ef61aae409a0f4934de845a4a68bd149164b23e1b23cc9ed8b3f346ae7b05ddc6f6997ace963b42 SHA512 e997798c5fcb40b5434c2ff2c55f5215cdcea479f6b18dab48510ea5cdfd4ae897367849d701ff2ac4503c75c27eecc9b8e971303d15e363fa03d1e879aec158
 EBUILD r8168-8.048.00.ebuild 925 BLAKE2B 987ba8d46e4e68a176fe782df425e6be2c085d842853187cdb4aae9af0431e8a362af4329bdc99d5f892583138b0c78f84eed229738c26da216e2ecc8eb93876 SHA512 d49c5452662c5a59ebd0af45b87005e5f2931b65611dedd85984b69ab9c15e44dcf1848157ce4a5b6e8a705571dde34f3fcff4086aac30b8427cebe0ba09c818
 MISC metadata.xml 480 BLAKE2B 1b0bd59517b3efdf470580f755382155f324126d5cd10b56bd907632612bd8d911a99da551a405f29d0d487d7401212d70644861200aaae07fb28d9a50f7aad2 SHA512 d854597c150f44307f7c15a73b6beb214864398c7479a7e3ae2a62e014776cd0e9b3f9a74df5a44715c64f4350174d9af9472f95847d6d134ad3c4536e77704f
diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild
index 99f290f5063f..beff876a09c2 100644
--- a/net-misc/r8168/r8168-8.047.05.ebuild
+++ b/net-misc/r8168/r8168-8.047.05.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 MODULE_NAMES="r8168(net:${S}/src)"
 BUILD_TARGETS="modules"
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 09d7d07fe6ad..f7319c8bebad 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,8 +1,9 @@
+AUX remmina-gcc10.patch 911 BLAKE2B 4499abeb5b85d1460c4f00596222ad6dafa1bcf4434c2b6cfa3bbd7f0935cfa2a83e17fd42352437c9f82bf6598c36cd435992253101343599d37911557bb6f0 SHA512 4a54f0c98de0c9f24a11ac6cf935fadc7e832bb6a6bf4ff5b95ab0eaf065dd8d54b39f83f7ba6da31f49ee597a33fa1e8ec3efbf019b806b446d99106efd562c
 DIST Remmina-v1.3.10.tar.gz 1651065 BLAKE2B 8d2f3068ad0938c4641deb2c20ccef10e30949273a2db92a9ff8bf4e84e49aa0bc662128f8fc576f98baa3cb0f4b19273399118a3ce5d7b5aa92ff03cc602cdb SHA512 e6770fee4d9c694c7c85a9937a293db437456840eee107de4adaad0bdfb1d649bd66b1f28ee0f196386eb968a2f23e139429db22f32febdc62ce02c0a4d66f7f
 DIST Remmina-v1.3.4.tar.gz 1365473 BLAKE2B f71a9c0a0fa9eafa547abf192972da39f0cfe1ca3745a87783d6a9ec5bab0674d93df8815b589b25659990bb345748f8f464f401c7efb934e8e71b207b0dab67 SHA512 212ebc6e08c694861522a05feb51e4efa012ef3361debf079384c07e4354370f6cf7d2880ff442bbe03782421bac7f33343d8049207073d90925d1c894d30e7a
 DIST Remmina-v1.3.6.tar.gz 1538166 BLAKE2B f3fc60df2a1a31bd5aae7d8de2d85cd579fa4cc35a0351fbce80433e21583b67cfc81665307d02fbd4863f6a55695be81f9c4d07423d6c8122d84dd625b69c3b SHA512 ce16379aa163467d05018c900d0dc7c2a7d73c1c22dd06a9a3092efa7675fda505bfa31b20131b9a3a10c74788377db17961c0bc9e59c47b1c7a15bf347f3bab
 DIST Remmina-v1.3.9.tar.gz 1627404 BLAKE2B 4077b38e987a93f71f96597784949522659def04ad0d2ab05c72bebb94a3bbf2c2a222828965aaf76b0273a378950b5dd0e7acdb7543f0d6c7f3220d16eb281c SHA512 f87d30d30d6d9692f60cd27336ac0059a4374125b231cdf1e3710785b08fc77722112ea48e5717958b03fc5784abb9fcd86aa5a427c4d634cb3f2be1aac41945
-EBUILD remmina-1.3.10.ebuild 2546 BLAKE2B 3b869a8f591e2836c1a526bf2a0ec76ffaffaa1d5137ca7080d7f5c576a3aa051d429a3b72aa9309dab9ff282842944a02c5bec9f717f1a0e400d08393ff078d SHA512 d8e5b18a021c82d1c1d0dbaf7ffa82e13bac987cc9766d018ff50d2854a827648754fb00a7eb3d53d8479611a46ccde19c58e0d41b83e167af28087572ff9090
+EBUILD remmina-1.3.10.ebuild 2590 BLAKE2B b4c9157c4aa4b4ef2526ee143aa175ea22d25fd827e822eb70f32e35cda3b1f344866faaf6841a47b653c26ffbb879d6d8f9d51faeb48d993b936b114a3fdeac SHA512 8126449263d5d17019fb63b010cdb6d561f1662f09df77b6fef08e8ce5ead2c30b821c69e1c70148bc7224cf8c7135ce79db04e0f7cf0278842846571b9638a4
 EBUILD remmina-1.3.4.ebuild 2245 BLAKE2B 256d9073a83f692a70c9db223a0d201f30100a5ff80d411f1990a53afd4954e6b96b8be0e9ef47600c4d3f2039b9250daf33fb9dc5ff6d6d74d451d860e52d49 SHA512 d2181e7130c47df3b0849936bea4cef88444ecbd2873a45b5f2f46e3269d310dc27d958138ecf7f0ed3d6929a82a8a9b0a3999838eb9dfb1646b137a481772d1
 EBUILD remmina-1.3.6-r1.ebuild 2477 BLAKE2B f0912aab7e270c36283a9a82a04f3f171ab5fc56e084aab967b701faaa3cdfde7d556c13fc2c3f232a19923e32856dc7e8e80aa0a01b3aadd6d6b9af1a8ef633 SHA512 ec36b830cfeb182d5977913982b829a7fad1fe8c7230781b8df59eb80ef16ee5218f13860cea8a99513fc3aee0cfc442ee90de248ec65729ed0034f9a4e6336e
 EBUILD remmina-1.3.9-r1.ebuild 2546 BLAKE2B 3b869a8f591e2836c1a526bf2a0ec76ffaffaa1d5137ca7080d7f5c576a3aa051d429a3b72aa9309dab9ff282842944a02c5bec9f717f1a0e400d08393ff078d SHA512 d8e5b18a021c82d1c1d0dbaf7ffa82e13bac987cc9766d018ff50d2854a827648754fb00a7eb3d53d8479611a46ccde19c58e0d41b83e167af28087572ff9090
diff --git a/net-misc/remmina/files/remmina-gcc10.patch b/net-misc/remmina/files/remmina-gcc10.patch
new file mode 100644
index 000000000000..214a8c887879
--- /dev/null
+++ b/net-misc/remmina/files/remmina-gcc10.patch
@@ -0,0 +1,36 @@
+From 27f84d1c0a2e4c2432281f25ef3026bb00bbdc15 Mon Sep 17 00:00:00 2001
+From: Antenore Gatta <antenore@simbiosi.org>
+Date: Sun, 9 Feb 2020 02:34:50 +0100
+Subject: [PATCH] Removing struct declaration utsname as not used - Closes
+ #2080
+
+---
+ src/remmina_stats.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/remmina_stats.c b/src/remmina_stats.c
+index a6eb6f609..3b7cbf0bf 100644
+--- a/src/remmina_stats.c
++++ b/src/remmina_stats.c
+@@ -159,8 +159,6 @@
+ #endif
+ #include "remmina_stats.h"
+ 
+-struct utsname u;
+-
+ struct ProfilesData {
+ 	GHashTable *proto_count;
+ 	GHashTable *proto_date;
+@@ -864,9 +862,6 @@ JsonNode *remmina_stats_get_all()
+ 	json_builder_set_member_name(b, "REMMINAVERSION");
+ 	json_builder_add_value(b, n);
+ 
+-	if (uname(&u) == -1)
+-		g_print("uname:");
+-
+ 	n = remmina_stats_get_os_info();
+ 	json_builder_set_member_name(b, "SYSTEM");
+ 	json_builder_add_value(b, n);
+-- 
+2.24.1
+
diff --git a/net-misc/remmina/remmina-1.3.10.ebuild b/net-misc/remmina/remmina-1.3.10.ebuild
index 42a9e58cb1c6..37a05502cf5a 100644
--- a/net-misc/remmina/remmina-1.3.10.ebuild
+++ b/net-misc/remmina/remmina-1.3.10.ebuild
@@ -51,6 +51,7 @@ RDEPEND="${CDEPEND}
 "
 
 DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+PATCHES=( "${FILESDIR}"/${PN}-gcc10.patch )
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/net-misc/samplicator/Manifest b/net-misc/samplicator/Manifest
index 8cb2f04efebc..391e858b310d 100644
--- a/net-misc/samplicator/Manifest
+++ b/net-misc/samplicator/Manifest
@@ -3,6 +3,6 @@ AUX samplicator.confd 199 BLAKE2B b360c0c8a092e54aedbc08807b114f18d189f79f8756cd
 AUX samplicator.initd 988 BLAKE2B 2a1266ab11dc15c11507e5be5f8d1b364bff9d48633b84a9ba28e88f2085eb742d4ddf8d1c14471cc7489963f736ac03570df8416617ed79326d3bebc7f4830c SHA512 7bb9ebdb7d4b50d0df4827926b2ee6f9aaba0b63f841f6cb62d1dc2dcdf517e5a8e155813dab33e846270b9cb589c82e47ac293b4ab6482e504955856c68bc99
 DIST samplicator-1.3.6.tar.gz 87901 BLAKE2B 0ee1a7900c941e5c92c722cbc1c7308be8025cded04d4ddce5a496f3c3cc44d3973f3e1562147f5077d0cab6caa1cba12c0e5225b70d60bb07c32e7f8f2f6b8a SHA512 a4023344ec911d3dc6992ddce139e6f1c86a67bd9948a3f92a995dc26aeda1753becea4b0f5d9ad45a06d628029bffc0a77c28fbd277da9faf42100c01d55f31
 DIST samplicator-1.3.8rc1.tar.gz 109870 BLAKE2B 2ff442733216d6489028117936460ba8436af2f92982ac819a1d824ec5e07cf7f43c01e6de9abd9d50005e3bb8d5d91a64570bb805eefafee4bda14fac11d6d0 SHA512 9f688baff07f885a0ad58974374cdf6b66a5aeaeb01fbf38f431ebaaf160b38e37fae7c511f0fe388b10fa91d0bf4505c765556f55a2c6753a57d3df3b8b3306
-EBUILD samplicator-1.3.6.ebuild 1536 BLAKE2B 096f853ef76e9cb1e22fcef9d735c2c87f486eb733d02727ef43718efffe642ef9edcb05a2b7b0fc690f503d083f55b1190ee0db3a6bbb453f0212c7692d8b29 SHA512 56b2e1796150961f6e9b30894de3ad5310a0a40e7e185f98a90c46b1706412b8610fa9b3fd819609e6996a2fd54dd254ff1c4c116432d69d36735741209ef3da
-EBUILD samplicator-1.3.8_rc1.ebuild 1601 BLAKE2B 88f6f5475d8f9c601054843a6aac0168ef2a7ed2b569bc1458b3fa6855ee8f64274c8991e53eacac17de928fddbb2314785d6ae6f50c4cd8cede96708af02ad2 SHA512 9985e45f3e47dfdcd7998b2980b3be0d3cc86d0870c8f2581e87c6140cd88ab0b78f91af672abf002cd14ca4a937a1f36d9a6a0f9335e70e354b8a5a599706cc
+EBUILD samplicator-1.3.6.ebuild 1542 BLAKE2B 73705d12b17a86d4f7746d86994e92fc95824f3edad2dc9c02d8065c8a2f8c3085ffeced6a899c6ac58a247f9270913e0d473580c2699788d78ebae493387f5b SHA512 e78865fd2d5f9ff6e5bd29c9cef05e4238aad9515f624a6fa1dc255bf7c08ccf2acf2c664846e1e6a7db3f1e86a7d6ee2303431a68634feb43c2131f32a19375
+EBUILD samplicator-1.3.8_rc1.ebuild 1607 BLAKE2B 0bb16fd5be0b3d90a66e0c3ce3f7fe99a52e31cd315505402f871176b9a50702abcf0972865ac7fd83e2778d209cecaeb8deeb974518d98dc6e1b521be027407 SHA512 b58bf58dc2a82fde8da31125535ab135bc74b1fff4338ad03f45a47300b5cbb6b2a9bbcfbbbe6c8b8582aa376e293f533ed8c26d179d0bd752adf5c7d7d85539
 MISC metadata.xml 816 BLAKE2B a9153d3127cd86761dd1163f2ca8df8bc7ef2191bbba211a37999004d74f2e7ff32460b9eff3bda68dd6e1b5e96b638ac5a32ae5ffd4f4ecf2cf61342a6c8e88 SHA512 95e2021fe0539b320556156c01810e133a2abf75858cd5f57261704c1b98765cbea51635b6e9cd9b485d60c9d7360456ec03ae9429ed1ae1b91c46e010c50e02
diff --git a/net-misc/samplicator/samplicator-1.3.6.ebuild b/net-misc/samplicator/samplicator-1.3.6.ebuild
index 52905b78ec33..9a0dc3dba6c6 100644
--- a/net-misc/samplicator/samplicator-1.3.6.ebuild
+++ b/net-misc/samplicator/samplicator-1.3.6.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit user
 
 DESCRIPTION="UDP packets forwarder and duplicator"
-HOMEPAGE="https://github.com/sleinen/${PN}"
+HOMEPAGE="https://github.com/sleinen/samplicator"
 SRC_URI="https://github.com/sleinen/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
diff --git a/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
index 91ac19d6e813..a3aec7839f99 100644
--- a/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
+++ b/net-misc/samplicator/samplicator-1.3.8_rc1.ebuild
@@ -9,7 +9,7 @@ MY_P=${PN}-${MY_PV}
 inherit user
 
 DESCRIPTION="UDP packets forwarder and duplicator"
-HOMEPAGE="https://github.com/sleinen/${PN}"
+HOMEPAGE="https://github.com/sleinen/samplicator"
 SRC_URI="https://github.com/sleinen/${PN}/releases/download/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 5acbf75c1b51..e7622bf35250 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -2,7 +2,9 @@ AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2a
 DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f66e273f00d306663cfaa07983f94ed98f0dc23cce7d1ff7592bdb64915d1e7dd32cb5a2e9bb10f4b36b87bd28f8f3a9082 SHA512 4ba39c33c41cb95e2ff5bb9704cdac1f95561bb4ff0b59d0993364070c5ee10284c51d640591195b7361b595221fd899a4aeafcac1c917625b175e98b9a894a2
 DIST seafile-client-7.0.2.tar.gz 2365981 BLAKE2B 9e11d3e2b770f2b85bb55f0108344c1c69e1fb28ea69ea8a5022efc7811f6336a2fee0de4f38981343d7a29270051e292c14f656d7a7b99e0d646d0f3fee9a9b SHA512 3edafb9728eb39e1b2adbcb0526758279599d25020c5303aa6b610aac1296eef0ebe66447f6555c21dbe125aa5ac1d605736359b52f2bd8933187efd04c2e8df
 DIST seafile-client-7.0.4.tar.gz 2357414 BLAKE2B 9c3368d745d30f57b313e9b5351714097403e67519a4582dd5658cb97152f4ad37c32cb9e6f47c13f199c75e9bd42c529ef0d352f363da815f486c90c305779c SHA512 9073df49639045319e971a76eb3769c184617e179694981ad88ddd02382b4ca50ff92c26239757022270e0a0a4115c8b70ca7efeab6ff2dee78e90a7de1bf5a7
+DIST seafile-client-7.0.5.tar.gz 2359779 BLAKE2B 58fa532668859c4413bb931146a58eb51ede7c1faa3ea2a9cafb94be44a8819261570ef16cc9f62f584f9ff483aa0832a63a99bb53380dd9efa4f82d25dea553 SHA512 b79cde3f98ebb1a0cb1035131cf95735f01c63bcb4bb658d5c40c36cdf85705d2c6fd2f7787fbdb3d965a25d60ee98e020e33c4f9423295c7ef1ab36ee5c7c27
 EBUILD seafile-client-6.2.11.ebuild 1088 BLAKE2B 361dd8fba4526094d41d08d91cda65da848a1b8677b94e3de056ec227db0e98bc8a0b41dfb86d652eac7993646ee93b3b3c3c2743bf5bd659b8bc8aaf3d6f544 SHA512 9e01233d8f5d8cbb100f226c844cbe21eb1381d56a99de246c723ad7fb8abfe978ac8efd74714a963b55e9ab41c91ba1d072352cbc95be3c21991fef9e93faf9
 EBUILD seafile-client-7.0.2.ebuild 1098 BLAKE2B 56c918a1e7d6d4aea28d4113ac1db40579a3c453b31ce20b261917aebdf18fd61d1820876061195b29b10bb2ef4833dc63f6c4f6ed2d93941643f8fd6b09137a SHA512 f82b1c8065e6d7ac795510d3489fe405873f9be5ff231cc208f70c221a4841fc8efad10c714c3a6df5fcef23a6e7f76145813fc137aefd1996cc96a10572f93a
 EBUILD seafile-client-7.0.4.ebuild 1098 BLAKE2B 56c918a1e7d6d4aea28d4113ac1db40579a3c453b31ce20b261917aebdf18fd61d1820876061195b29b10bb2ef4833dc63f6c4f6ed2d93941643f8fd6b09137a SHA512 f82b1c8065e6d7ac795510d3489fe405873f9be5ff231cc208f70c221a4841fc8efad10c714c3a6df5fcef23a6e7f76145813fc137aefd1996cc96a10572f93a
+EBUILD seafile-client-7.0.5.ebuild 1061 BLAKE2B 801d2f5f073c2ee390efaed34c27cd3143862835eae30086ada519638e8c27c0cc1c04de717eb43a67105f3e9c60ac168390f1c62b9101a687fd6b9e8b5a5d80 SHA512 02ef9623d42f3d87541645241d502759d840fc3d78ebf2c9a899146856deeb6c3606f344d72b89ce6dc415471b505384683c6c6efb11044ce3285077cb975661
 MISC metadata.xml 541 BLAKE2B 994b8936e2a25627989635426eb7f2e3a23f1943b2c5908f50a789bc1f5f84753efe6e305effb1046bb4948224c068233079fac0003e3f5b2beb507aafdac9f8 SHA512 4ce109a926de9d456bf209ff539f57e15f11c8bd486ea1984658383f5435fbec3ae7b8a77cef45409f5fc6a7e4c6c91b7890bccb6e8ccf3eaa721b92d916a33f
diff --git a/net-misc/seafile-client/seafile-client-7.0.5.ebuild b/net-misc/seafile-client/seafile-client-7.0.5.ebuild
new file mode 100644
index 000000000000..ca54c9edd03f
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-7.0.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="http://www.seafile.com/ https://github.com/haiwen/seafile-client/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	dev-libs/libevent
+	dev-libs/jansson
+	dev-libs/openssl
+	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] )"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+PATCHES=("${FILESDIR}/${PN}-select-qt5.patch")
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index cee6ba99f2e5..1948959da979 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,9 @@
 DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc826659c604130f7c3e9d1b129e7d806b687a5673109b37cf040bba02a0a862374997a819cf384ecf2bd3bb6af058 SHA512 90ff1ca4c2a75da9a44d7833209800629c7bec3e8d5b651a820d158261bee77a3b7e599748e6ed350fe919fb67685882a215c18720b0a9702d56e384b8561985
 DIST seafile-7.0.2.tar.gz 698373 BLAKE2B 171ef14253c260d0e1ed9e984219a545bc5c86895fd554223148515feeb8fd2c6f9ab802f0f505ada0ed504def01999cdd254683de6e0d00f77272eb9d491f4b SHA512 f348139662edb061bbb2da534cd099619f23e09b1383cc97a53116c7e1eb5b41e95d61f719a83f3a69d3914e64836baf15900a9597a7b6ddfb8d23f3e362b8cd
 DIST seafile-7.0.4.tar.gz 706114 BLAKE2B 8abcf24b752eac20e2abeb355c79d420c0cadb374e70739be76531e9ecb6cb3428f6d8c0aeaa6cf5638a9dd5e964f9ae72b4933fd379655149790396dfe9ffb8 SHA512 2eefbb928f3082ba8373509c149e4e1fcfe960f10baba227759ed43411d5adeca844f1538609fd1046f22661322c57bbf93ede1fa849a39e50a4af8a3a7febc1
-EBUILD seafile-6.2.11.ebuild 1048 BLAKE2B 8427d6e2fbaf0c0cd07539c75b2710773f802bbf64b47cc19c5278faa767f8ec8ebd6b48d81410f1ec9960bac6baaf1eaa6d432f36629572db510cb055d2f2b2 SHA512 8bb17b48494317a758d414c56db5751a229859072aa6634cc826208eae48c4cd21c1659b86064100032f1d685140fc3c55e2df623ac5aa5f3bb29344075e29ea
-EBUILD seafile-7.0.2.ebuild 1049 BLAKE2B 535fe6fb71c373a01ef4749c4d4e5dc94082069c05c933a08c6512d14f4874eb626cf74ced0830626d5817167bfd5ce1e068e1dde8ff382de2296a520f7ff99d SHA512 f98355eb1e314085de614899e6ebf8b9e23f15957d0f77e95b8fa5a90eff7ef4aa459c7f87f40438659490326e06524e5be0b64d3fb64f24b5aaf0735ba1e3de
-EBUILD seafile-7.0.4.ebuild 1091 BLAKE2B 308d133ab906e450236d76a5c39dda016c629331aba1479d92137cb6c6c447dba87632f931531e61efaecb0501c8eedf88f45d7556d8348a817b8fb905c272cf SHA512 b2365ffcac7a5c69e6a4194500313d78ba8810b236e32b0b75a08538d307489a0e9353bce91a564856ba0e128a11f07c2fce7c3b926fffd64e522656547f7381
+DIST seafile-7.0.5.tar.gz 706430 BLAKE2B 49402de13660bcda9a6fad35879bd0e9ba4e491e921525a9cb16498f833d0d8e4177e615afa95780da040c9617d2795a3aa97ce389edae54621d8079033fd24e SHA512 c51c5f3f4a4b316fdf21d8eec12d42e7e1c76cf1271393658dd447c4b0ba77e6149eb7770a99af6aa23f6ebcb1572f4b847f8de44320d8bae8960bde7f429920
+EBUILD seafile-6.2.11.ebuild 1055 BLAKE2B 37f40dd27f04b6e422fc55200c1c60ec4e944127b7a24b4923617d7ceda36afacd89cac7aa5fe9ed31cbd35620fd2a5c49acf79c9eaaaadee00cd7b7dee17596 SHA512 e7e1f55163512d3c34c999b7b8c2fea18982306c90ccd4fd130757a6f37077cff30327eb73ea6a7187c30de5e2edad48cdc2a5169198e0ee9217facdd1a8cb70
+EBUILD seafile-7.0.2.ebuild 1056 BLAKE2B bb4f9535adca4ef40ac250e61cc1490bca4aa093c270c5d3a581c4a9347afa3781922cabd0ff41ed5ed9c292aaa83df971fc579e3d894cc9602132d510b29b43 SHA512 0b7c1369f2598bd648f9181c7c9f90ab3718ebc4a960990a8afdc0a1c52c26ca8901dc29abe5ff520ff7ad3b4996e837e02d84860b5b4b5865fab8905e7703f5
+EBUILD seafile-7.0.4.ebuild 1098 BLAKE2B 38c27930d6c7a8a3788b5386e989c0414a1cd3e9080f07b45de8dfe9919057b003bdef865b6702c04f7bac21d0f5f19dddbc26ce52cbf5ccaedfcd38480e3a36 SHA512 928fc119789b152beae6ff1c54d1736f40cbcdd69cb39174d905352ba37182e440283ace623ac7bc1948c4ac8fa12bb7b176ccd0a1f8a0f905723194b45fdac5
+EBUILD seafile-7.0.5-r1.ebuild 1075 BLAKE2B 4e877c79fe06723fd093d2975825b9bacc93541daac59fadd60ded97b7b720e84d50303c9c3e91bfd5389a903f67ffc7274227ed98af19ed4ff4ec74f95dc533 SHA512 f82df8ba2ef0a971f89650c8f3a63e3ccd2e7fca21f5cf7fb37ef4424f126d97a53729caa649d881ce8cd003da8a129a0cb68ad8d1feb11dffca98aac9dbe54c
 MISC metadata.xml 442 BLAKE2B 46c5da41a70765d782fa536789caa196545f800145ad109df96cc0cc819e41411aae7e0beec1161e09a37479ec9e6c79ff08395fe73eba8a092c07ed40a37f41 SHA512 b134c065c3c389e0db935094b7efbed1eb82e09be3ab83b31b2b84c3c6860c7fe002554e1ee817f69c8f873a67a352127b8d8e663a5088f5a38255ef15f2e20b
diff --git a/net-misc/seafile/seafile-6.2.11.ebuild b/net-misc/seafile/seafile-6.2.11.ebuild
index a667cc035f78..7b750024c87b 100644
--- a/net-misc/seafile/seafile-6.2.11.ebuild
+++ b/net-misc/seafile/seafile-6.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/glib:2
 	dev-libs/libevent:0
 	dev-libs/jansson
diff --git a/net-misc/seafile/seafile-7.0.2.ebuild b/net-misc/seafile/seafile-7.0.2.ebuild
index 4c5040c1196d..e41376502fec 100644
--- a/net-misc/seafile/seafile-7.0.2.ebuild
+++ b/net-misc/seafile/seafile-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/glib:2
 	dev-libs/libevent:0
 	dev-libs/jansson
diff --git a/net-misc/seafile/seafile-7.0.4.ebuild b/net-misc/seafile/seafile-7.0.4.ebuild
index bbe3738676be..1779236fefd9 100644
--- a/net-misc/seafile/seafile-7.0.4.ebuild
+++ b/net-misc/seafile/seafile-7.0.4.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	net-libs/libsearpc[${PYTHON_USEDEP}]
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/glib:2
 	dev-libs/libevent:0
 	dev-libs/jansson
diff --git a/net-misc/seafile/seafile-7.0.5-r1.ebuild b/net-misc/seafile/seafile-7.0.5-r1.ebuild
new file mode 100644
index 000000000000..0ba1676a8c00
--- /dev/null
+++ b/net-misc/seafile/seafile-7.0.5-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{2_7,3_6})
+
+WANT_AUTOMAKE=1.16
+
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="http://www.seafile.com/ https://github.com/haiwen/seafile/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_SINGLE_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libevent
+	dev-libs/jansson
+	sys-libs/zlib
+	net-misc/curl
+	dev-libs/openssl
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
index a57146e32206..66fc14934983 100644
--- a/net-misc/stargazer/Manifest
+++ b/net-misc/stargazer/Manifest
@@ -22,5 +22,5 @@ AUX patches/stg-2.408-static-libs.patch 198 BLAKE2B 2ad854cd7ac7f9bf8a01aa8cfbb8
 AUX rscriptd 453 BLAKE2B fb7d771ad0c29223d8a24196da05c05faf852291530fef644b60bf83893e3d038628a1ca7db92d3f3b8144cf44ccc7aa694686c77e6514867048841f1f57d61f SHA512 21cb21a5a14901f3b370f2cedb6ede9414c1080d3d4e073ed048f005f40622179cd91e8cf80f609f0a7b5cacecff5f15913a5cf954dfff56ad036649f4a0a48f
 AUX sgauth 462 BLAKE2B 9aeb1dfe4ce08f7626d6275813e8a3b2f3023ebc11b10841c7a6b01ff9110ed1193e3b2b367c7c1056c473d41f481c93ad25f4252f774fd7df5392af710255bd SHA512 a2d6ba8c2200095072a73342fab4cb5706470d52d9dc6a57f023b16dc895957d4377bc089a4a3cd57126bc9628020c2c1bb60347758e53576eccbc0c854c2364
 DIST stg-2.408.tar.gz 5100291 BLAKE2B c5e50d5607f7c5253dcbb9d48fffdd55bf44829bfc3dba1e45227fa819d2592212366baff6b19dce70ef7a565f8b03e8f580204225441b12653de6271a030554 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75
-EBUILD stargazer-2.408-r1.ebuild 17363 BLAKE2B 46d7f71b58eb45e764684fd4e4653b4827024090543a91225d4bb88d7739d2f4238c0d4ba13ab76cdbf23c25787c79203672e67a41fac73c5ab55917d2ffc0a9 SHA512 095507ed18283cc13121c11910dd13fc9a344e540d9cb9ca7eaa10a5a8e67c67ff98aabbbe816f2ca7d9fe6881da0f2a151b7d28abeab81e0773069a926918de
+EBUILD stargazer-2.408-r1.ebuild 17361 BLAKE2B 28865db200c061ce0e1bfe9b3fddeb527bed986608d8e2eace0d69f87fed514d93b8034aa0e8f986db1cf9590575f54f1928f9a2a6db254f1b76a349d63ec6ad SHA512 14565cd03606981febc297263fdd22ae6ef5718b85b225cac8d5dc7f64f929c1b2e047118a43c1c98c704fe75b1b3c2396885311cda51cc8a8779b6ae80e98f0
 MISC metadata.xml 4163 BLAKE2B 8b56f499cd2f996cef1d15ff7f01dffaa6f76577ac437b7e040a5b8c49272b2eed8f680d6f2ed8c9e2512326971aa5e5a66b06f408341af7add6caa076c74e9f SHA512 60e4a6fc5304feb38c6ccc5fa3dc69df9c600289a65779d6d957b0252262a371c1cca02ae51f4538c7d4d006d0b03040a18a478011a31656562d2e36fce668fa
diff --git a/net-misc/stargazer/stargazer-2.408-r1.ebuild b/net-misc/stargazer/stargazer-2.408-r1.ebuild
index 18d197b3ccb1..d8372e8418af 100644
--- a/net-misc/stargazer/stargazer-2.408-r1.ebuild
+++ b/net-misc/stargazer/stargazer-2.408-r1.ebuild
@@ -339,7 +339,7 @@ src_install() {
 		if use module_other_remote_script ; then
 			# Create subnets file based on example from mod_remote_script.conf
 			grep 192 "${S}"/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf \
-				| sed 's/# //' > "${ED%/}"/etc/stargazer/subnets
+				| sed 's/# //' > "${ED}"/etc/stargazer/subnets
 
 			# Correct permissions for file
 			fperms 0640 /etc/stargazer/subnets
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index a02bd0c44a8f..d1f78a6ba8b9 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,4 +1,4 @@
 DIST streamlink-1.3.0.tar.gz 694190 BLAKE2B cd262290cd81f1954567e217eaf9568c00180ee7f6955c8227b7067488d685385fe8b4b3bcd6004e7e8f7f66236696a48e744cb24c4d00f2111f00633ffeb1bf SHA512 5a114e0b1e617b2a41f8fe00f9bd6846843dd7643b4283d2fe30ea869cc9d6f495458b0ddb97955a87b7ad64e5628343262af5068b8a7a19d0d84a32020b3365
-EBUILD streamlink-1.3.0.ebuild 1992 BLAKE2B e39f67d0517b4d7203ab2fcd1c1739eac895b30fe94fd7c3052842253eda5a3cafc39296f8c34fa058a4984f844174e3407648de97bc9f1e035e38178d7e7eb3 SHA512 085b351ba808fe26230468ad3e3c0a3b577fd22e4186f8b9e4d4fd7866fc66d863d0b427a0744c787c1588c0802662d29abf4698e445ab7cbc9c50c071e24250
-EBUILD streamlink-9999.ebuild 1992 BLAKE2B e39f67d0517b4d7203ab2fcd1c1739eac895b30fe94fd7c3052842253eda5a3cafc39296f8c34fa058a4984f844174e3407648de97bc9f1e035e38178d7e7eb3 SHA512 085b351ba808fe26230468ad3e3c0a3b577fd22e4186f8b9e4d4fd7866fc66d863d0b427a0744c787c1588c0802662d29abf4698e445ab7cbc9c50c071e24250
+EBUILD streamlink-1.3.0-r1.ebuild 2159 BLAKE2B 06e4eedee820ca62d69137842c2ef3146c900a6cae3147579603894b29a031893af853132a37ccf31489cb03b110a2f2200f1cbcb1961bc8f428e101976dd699 SHA512 2396dbe90aa88d795fc818ab6e8e31abad0bd527ee848e3ce63f8335cbcad147458911d3284468acf2638701ed9fa8ba365b3547067d8f95684c6baebc215e3e
+EBUILD streamlink-9999.ebuild 2159 BLAKE2B 06e4eedee820ca62d69137842c2ef3146c900a6cae3147579603894b29a031893af853132a37ccf31489cb03b110a2f2200f1cbcb1961bc8f428e101976dd699 SHA512 2396dbe90aa88d795fc818ab6e8e31abad0bd527ee848e3ce63f8335cbcad147458911d3284468acf2638701ed9fa8ba365b3547067d8f95684c6baebc215e3e
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-1.3.0-r1.ebuild b/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..28994a6a0f82
--- /dev/null
+++ b/net-misc/streamlink/streamlink-1.3.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 $GIT_ECLASS
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
+DEPEND="
+	$(python_gen_cond_dep '
+		virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+		virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
+		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
+		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	media-video/rtmpdump
+	virtual/ffmpeg
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		doc? (
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+			dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
+		)
+		test? (
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+			dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
+
+python_compile_all() {
+	use doc && emake -C docs html man
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use doc; then
+		local HTML_DOCS=( docs/_build/html/. )
+		doman docs/_build/man/*
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/net-misc/streamlink/streamlink-1.3.0.ebuild b/net-misc/streamlink/streamlink-1.3.0.ebuild
deleted file mode 100644
index 04417d2b4e75..000000000000
--- a/net-misc/streamlink/streamlink-1.3.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	GIT_ECLASS="git-r3"
-fi
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE='xml(+),threads(+)'
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 $GIT_ECLASS
-
-DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
-HOMEPAGE="https://streamlink.github.io/"
-
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2 Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
-DEPEND="
-	virtual/python-futures[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	media-video/rtmpdump
-	virtual/ffmpeg
-"
-BDEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
-
-python_configure_all() {
-	# Avoid iso-639, iso3166 dependencies since we use pycountry.
-	export STREAMLINK_USE_PYCOUNTRY=1
-}
-
-python_compile_all() {
-	use doc && emake -C docs html man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	if use doc; then
-		local HTML_DOCS=( docs/_build/html/. )
-		doman docs/_build/man/*
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 04417d2b4e75..28994a6a0f82 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -30,31 +30,35 @@ RESTRICT="!test? ( test )"
 
 # >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
 DEPEND="
-	virtual/python-futures[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.23[${PYTHON_USEDEP}]
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/websocket-client[${PYTHON_USEDEP}]
-	dev-python/pycountry[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		virtual/python-futures[${PYTHON_MULTI_USEDEP}]
+		virtual/python-singledispatch[${PYTHON_MULTI_USEDEP}]
+		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
+		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
+		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 RDEPEND="${DEPEND}
 	media-video/rtmpdump
 	virtual/ffmpeg
 "
 BDEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)"
+	$(python_gen_cond_dep '
+		doc? (
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/docutils[${PYTHON_MULTI_USEDEP}]
+			dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
+		)
+		test? (
+			dev-python/mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
+			dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
 
 python_configure_all() {
 	# Avoid iso-639, iso3166 dependencies since we use pycountry.
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 9956ddda388a..6b00ae62b50e 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -3,6 +3,9 @@ DIST teamviewer_15.0.8397_amd64.tar.xz 12532076 BLAKE2B a66cc74961edb1eb28b38a77
 DIST teamviewer_15.0.8397_i386.tar.xz 13019240 BLAKE2B b14dc20b31d888297602baae65c9ec802e5104f8169090ca3f88b87814f58b81585b9d5b89bfe8478d767b30612ad05ccf2d6a659046c0c5e75bfa287436e06c SHA512 4e1d6101ae8a91e03c6580407857df76505dd216baf172de6a7d00ea308318b8b326f0d15e1d8819ede4d7d758c65608c4446abcfc52ba224e56ab11a623aa65
 DIST teamviewer_15.1.3937_amd64.tar.xz 12898448 BLAKE2B fea1d64c04c5c4f04237ab639b1faf1c6fb027fa5f4824f8a9c0ed31b52894c7a22130d0871dba98388ccf073a5393973350a3e3ea88f94bc5958196a6bb8934 SHA512 23fc65a676570c291184a5c89ce05998cb70ec822d764264de7afaffa47a862e3eb0a4ae9364064fa831165be901dc0b85cb5b79181b8b833638d720504dee5c
 DIST teamviewer_15.1.3937_i386.tar.xz 13443796 BLAKE2B aa9c5f3cd42a123c38a567a117c919c829e089e4c81cf4b6fca0559351895c3824b7a117ac7dc64c9f1129e0cd44dd2347e57644080559a86640a9d8bffbe62a SHA512 8054e5e3901d60bbf210b03209da8afaab03ba95529d1a107a23401a7561c5ee0c33a43837f84490667f0fa282fe8a74087473b7f51f604b675e87d87522302d
+DIST teamviewer_15.2.2756_amd64.tar.xz 12925536 BLAKE2B 94029edb0c333bbab3dc8ed0ad881fc5e5de820a4a92f578781456315d746d1fbf94e7b4d1b651c250c23a32247d2ccf9ba9f9fe839ba188e572ffacebd71630 SHA512 9227388efd819689bd852de62b1dbe122e7081cbec19ba4c96546dd8f889c8b87884fe53231f00f39030882bc150aefaaeedab7d9b3ff28315273d95303eaf78
+DIST teamviewer_15.2.2756_i386.tar.xz 13456056 BLAKE2B cd41db000d5d7fe67f888026146affcfd08495c4e275b1e66ffcc71224b75643713a6f59598eb94aae473d1ec3e9dd500c40e28017bec1f2d50f27f182a01ed7 SHA512 17c0da4599ae1c111ff1ac3069bbb7b613175253a13086c1d564e0ab268317e6249daa3453d686379b3c29cc5cd76a74c2e6654bed8326ee1c8f46e40cbb4888
 EBUILD teamviewer-15.0.8397.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
 EBUILD teamviewer-15.1.3937.ebuild 4095 BLAKE2B ecf492a109ce1ede852933001908cb14987d3c082a50e3ea35a142a5e93bbd90faba7620cff33969703cca89647606eff249f9082167fca314ca93839bd8ae39 SHA512 0d1281c28821cfc0db145931e661090af846fe62df96b6390c7c5cf18b5b5ed3d9533748c9611219ac01a330b79b6221001837ba65f064289fc05cc7355ca8d9
+EBUILD teamviewer-15.2.2756.ebuild 4095 BLAKE2B e8a01b0e7e749396705fafd6c178d8e85159a9e4a282ea8ea74c0279e39dc7c5933f8f07883cb57d788cbddf7efb33aebf299c2ee23555fac30fbb6a17b47864 SHA512 177d58dc814db1a593af2f1f64871d8964d4bbdf67f56017dfe0ba60b12fe5f9225e9ff72320f0e0b5e18cb767db814b4ab30f9945729cc3b9bac1d83c20a3de
 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
diff --git a/net-misc/teamviewer/teamviewer-15.2.2756.ebuild b/net-misc/teamviewer/teamviewer-15.2.2756.ebuild
new file mode 100644
index 000000000000..96d0e2cc15fc
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-15.2.2756.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+	!sys-auth/consolekit
+"
+
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd15.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+	elog
+	elog "Most likely TeamViewer will work normally only on systems with systemd"
+	elog "or elogind. See this thread for additional info:"
+	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/throttle/Manifest b/net-misc/throttle/Manifest
index 49a75419f7f1..028d6ea32c78 100644
--- a/net-misc/throttle/Manifest
+++ b/net-misc/throttle/Manifest
@@ -1,3 +1,3 @@
 DIST throttle-1.2.tar.gz 72501 BLAKE2B 8374d09f12f37f60a2dd52c5e3e08ef53af0862fdb51d530883f291b1d0ab2a1127dcc70a08d4179e3052788a84e9a8183db3dbb53ae8181e62fc3728005c7a3 SHA512 ec0a639e6fed5e4a5fbb32498a77e08e0b53f3d6ffdb1788a6b52480387c87c43a5d17507941c9660406721bdbd5d4eedd4d6f1c0153dc41dc44a2aae0f9492f
-EBUILD throttle-1.2-r1.ebuild 479 BLAKE2B 64fa1e6e898302aeb049c822184c1a69b10cae74c0e3317db8c99bb961271befa1bd29e9de87526f1f615422c031f604868802cbc0b8ce59aea6008187af3528 SHA512 7d72eb64002d2c808608e04f221c3eff80a91560e688776a0e9f7dbe55a4ff26ebcdaa698016def00be339a5fe16e8ed3003b10c167dff95a186b15edaa18794
+EBUILD throttle-1.2-r1.ebuild 496 BLAKE2B 9e392fb19dcacb23a04e27132d3e3e531c8ae6949cec238c2583522cd06cb1c4df03e80f173ba7112677824ae3821ec3976487d695bb44fedf0781ec03ad6d14 SHA512 c16d0db7a23dd04c811863b1bb2ba62bef673f029e9196842967ed60f0b9d8c35c007afbe2bc5067ad9ca350026dc21b337f4ae47f6082b9ce2513b17c5efb6f
 MISC metadata.xml 370 BLAKE2B a472fb5ba4c9dd2f9d29f932befe96a997d27ed559ca0173388d6c8ca842032a34f2b4df8f962f6a275bddc83cc7498d5c971b79e91c5f4ef1314d52c7b4f954 SHA512 39d066692873cf85dc75f2d6f5c566ac799aa1e2fdc6743915d19167913f92800ade4be1d101780fc011362757531d8f59615e3d150a160f7196a43314d64c69
diff --git a/net-misc/throttle/throttle-1.2-r1.ebuild b/net-misc/throttle/throttle-1.2-r1.ebuild
index a5112cba9fcb..15222cd4de12 100644
--- a/net-misc/throttle/throttle-1.2-r1.ebuild
+++ b/net-misc/throttle/throttle-1.2-r1.ebuild
@@ -9,7 +9,7 @@ inherit autotools
 # disappeared
 
 DESCRIPTION="Bandwidth limiting pipe"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~grobian/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index bcad5c421d61..e4d40d60aec2 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -1,16 +1,10 @@
 AUX logrotate 166 BLAKE2B a3da56439bae88709b8cea7d1631d6848ea9e63870a9e9ad2853889d3b9b16d11d09bbfa99a41e24b2ecb5e1134875190b99aa7056192fd16d7696560bbfb83f SHA512 77c7b0e17123432f39d43048d7c51b88b20cb5ef297d36e2be50f8816f956dda6ca300fa3053756ac9f9480699cec9c28fb5ad77e81eeac667ace55dbc61e88f
-AUX uftp-3.7_makefile.patch 2037 BLAKE2B a1bd4751b74c6d1b3edfa914575235a8ad135dd18e70ee31bd83bc8aa475d7f447ba0254ae7a094c7326f09e580fb4693d33ce16afeb839a3a5e27d26bd30fa8 SHA512 1fc5109626a8a46bd9bd05348cbfc957a524827c5f165f1f991f7887319f735ae90dab6bad91a96d7c6bae7e2c07e26ebcbd91b9a595b97d8b1b6d79e496e899
-AUX uftp-4.9.4_makefile.patch 1502 BLAKE2B fc5b2b07f250b16bed1386c31850dcab1fd854c8db2232190559855fb45c0608b35e4e5accd3c93cce198c792b36f31f5705b068371a94780cb841772c61846f SHA512 41a2c9f6f572eacb2c503f578ab3c4baf6c9e1ffb92b7831da2e122e1b99c2fed2e82811ec0fb2f98cee684b395981cd83ae2f50dacfc7234210c91c6d3ce87e
+AUX uftp-4.10.1_gcc10.patch 624 BLAKE2B db832be23f45ed2aac0ecab15ce9c2cdbdefa9502e8bd3f9a90ae0bdf5b5371ac48cacb793a95c871148963ebd637156e9384223fe2c3eda6579350cefd128ab SHA512 82f0ec11196ee4f2aa2c32fd6a66e7effd03f7d3b3ac609640c850c33d85090c952ebea530076a4f18575c3c8a02ce34bc6b4975d3970c8333f3159a53143980
+AUX uftp-4.10.1_makefile.patch 1502 BLAKE2B fc5b2b07f250b16bed1386c31850dcab1fd854c8db2232190559855fb45c0608b35e4e5accd3c93cce198c792b36f31f5705b068371a94780cb841772c61846f SHA512 41a2c9f6f572eacb2c503f578ab3c4baf6c9e1ffb92b7831da2e122e1b99c2fed2e82811ec0fb2f98cee684b395981cd83ae2f50dacfc7234210c91c6d3ce87e
 AUX uftpd.conf 169 BLAKE2B 13e8d47f9a2b79f7e6c81d3a4aed80bbffa2c3195981b67eafce3801faf50b5ea2570de36634dd3e36b526f721e14259ba7b79a95f35c8e98d85fe6b95b9525f SHA512 732a3e7f5eb1eec609f05d6c075ea11b16bdd9abcdc9528dacf7fbc148e2249306226fd5975b39956758d0b237b0d59b97e7c602451639fe7db19c43ae4f39f9
 AUX uftpd.init 518 BLAKE2B b4a98852340d03a5bb8673faff02f7f18a5a27b87d22aebaf19753d836250c7d4519598049d41b9cf81832c18cc7a1726664bf647cceb92b2457a811df54ea8a SHA512 4008611d6a8f7e4c960269526761b9c5b2b7446bf1795983a62fb5fc12b4525ecd2e0e42ff2fb7d937e427d9d77834a2b6836db1242269fad7b09f92952c53b8
 AUX uftpproxyd.conf 121 BLAKE2B 82664d638b8a4041a5c18676e46509c3ed20525b7178ada1fa902f41f57a78c5e465b22701bd369e26ea65ebf4fe5834f7b23f4fcebd6d87850ed8fd93e58f40 SHA512 c61441d048ce99a50b5224cea7c4f9f1a2532fff8083a9a71e6099a98cba1fe79b43825188034efd402b47ac28bbe341827cb21872c17550419db36a8da7bb35
 AUX uftpproxyd.init 522 BLAKE2B a7a4df565d5dfa2761068adfa3dc440030269cc0d809c892807a2582df36882b2cc489de608ed0baa85f6714d15e7a3ec3f00895324fe1f6a521c3ca8ffd9ccb SHA512 2d69f0b84750cb62fb96b7fc7a042fe54b6f658074f9c4c49a2bf4957507fce333862ae95fd0498e60240490ce44cd299b8fba851d4d7c9a67dcdf1e7f29d7f5
-DIST uftp-3.7.1.tar 849920 BLAKE2B 32a2ccca01f4b8ee205301a2bb4ac30da4f17bf0d8a24f885ec40a430b2cc478efcd504ba118ef7f55c43ef53a6fb3e6caa2e2cebda93c254ab289a8683488a6 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15
-DIST uftp-4.9.4.tar.gz 243819 BLAKE2B b7aa75f8db82480912dd4cf8199dce7e8170db837853f16a2d8e5a4b7cf190416b7a2a23e170a4837f59a7bba030b0434383bceae9b253eb1d2fc13f6fcd26e7 SHA512 f3c799265a55e0cb536f17be3a0ebfad5f81284255083ebe9a12fda4b5ce8407f05a710cb32a41f3dccbc0ac90367c44d4b67058bdbeaa4f2f8efe732463ebf0
-DIST uftp-4.9.5.tar.gz 243999 BLAKE2B 32f6e6fef062e3b0696db775f2e925fdd53f03d8e04181f65140372abc85674b90579ea4b0c48cf21378c97552d06374005e70b6f1e9af7c03b7478d0b86e26c SHA512 3a4809cc61555ee26de6c1e1ac8525c0345a3b9555cf0a2094ff06eb6f409d1b3ca16b94d7b953dba6d1ae1d8c69a646d575a6357cd178c374bef68888744086
-DIST uftp-4.9.8.tar.gz 244855 BLAKE2B bdb5b5caffbfbfaf8d7aa71e675a98240e64b27b6386088c9a096202f32e825a1cd9bed933b5242601c9ff7c5c2afb4c43190b2335a2a73c0dd0b51caf74a1cf SHA512 04875ddc59cdd9cfa88d642aeb9ea4418a99eca12057f54c949ec5aecee85a8a78803ebdeefe11a29a298a151bb5eb19d6c6c5656f26e17639a86308a2946ef5
-EBUILD uftp-3.7.1.ebuild 1062 BLAKE2B eab032956e3170de02ad65e543011be42260335cbe51e30acde9509a6b15a10f98ade2bd284293a27906484c4281bd7549569543df68ae1af6b4c2fcd5160b13 SHA512 59352a391e6b7aceff3939ea588a6be4859b1b62333451b26978ad0b08eb3d1cd7b90c0e3e4a5d84c1fac86741ce43ffc9ec5bfb64c697ccb02079cd1b5f6006
-EBUILD uftp-4.9.4.ebuild 1268 BLAKE2B f0f5346bc945ded6924a601256d95e997c9a626a3b770f849e35b73a380ab319ca30e3ef8b211f7aed256fb0e1d214291943b730b6b9b52b23bdd8b0cf48fb82 SHA512 1ae279fcaa4e627fd212465e73de1d1b1bb18491de290fd0cce5c945c07c43eca7f35421ff589fe1fc33b35bf057d938519cb32d327fd5bf88de1e7a27fe5612
-EBUILD uftp-4.9.5.ebuild 1366 BLAKE2B 155a929dc9a2eba399f0842ca73a4187a91bf4c6c5399f70a26e27026e3d25fd7c404278cf09ea73f4c3e215a31928b2a189905a7ba924d3894e2c22fab58013 SHA512 9812a24f7988ccbbe8a905ec0c0c0423b1f2aa178ab53b2270bbdd5a0dbbee376e0400128bea6a9c3416071952f22125f2a6e4bb038c7ffa10bff81b807198e2
-EBUILD uftp-4.9.8.ebuild 1363 BLAKE2B dd637e4fe96458b3b7db4053be4d15e71914e215daf3cf89f530ece8bdbfb509de3608d6250e7a0a06bfb41d83e3ab3a340096bd613c7380e650cf4a9ecd36cb SHA512 78f403d2293de619115214fba140cc4e28e76cd5995cb0e97f0886d4da2418d3fe31ba511f8f206427d28c47709ed5d440e4dca778aa664108bed23490fc7005
+DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf
+EBUILD uftp-4.10.1.ebuild 1434 BLAKE2B 9f722def7df49faac8b15fd3cca37ff19764fc6c53bb66dfb913cb1711c0a8c5553d0b4436606fcc7d38a0f499fa247f37cd5bc56de604969915b7e276b4e81e SHA512 3e4d228f59647135a0c56654f5d54af7da10a48d69e356c6bb805397434b2bdd51ec62a68596003f6672cfb62aa75ea981cea2c642bb6b9f6aa7f7b862962e81
 MISC metadata.xml 433 BLAKE2B 0c732cc29ed317b29aa5c7313ebf825e62835325c1c44f1e39bbf2893d40335b3458ddf9263132fc858d28ac8c66876f39bdccbfdc376c87c955e8f09eba7171 SHA512 7e63ff9bed7a90bc94ac2f0441b6f089e5f38d08afb47c5513b09bb6ee2b5fca756a20401d622548c129b540a0b93dba882c38e5ac69dcca9ec72e4c4c9e7686
diff --git a/net-misc/uftp/files/uftp-3.7_makefile.patch b/net-misc/uftp/files/uftp-3.7_makefile.patch
deleted file mode 100644
index 81afe8b9baae..000000000000
--- a/net-misc/uftp/files/uftp-3.7_makefile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Nuar uftp-3.7.orig//makefile uftp-3.7/makefile
---- uftp-3.7.orig//makefile	2012-08-10 17:00:22.566403478 +0600
-+++ uftp-3.7/makefile	2012-08-10 17:04:47.523386683 +0600
-@@ -39,25 +39,26 @@
- endif
- 
- # defaults
--CC = gcc
--OPTIONS=-g -Wall $(ENC_OPTS)
-+CC ?= gcc
-+OPTIONS=$(ENC_OPTS)
- LDLIBS=-lc -lm $(CRYPT_LIB)
--CFLAGS=
-+CFLAGS?=
-+LDFLAGS?=
- 
- # FreeBSD
- ifeq ("FreeBSD", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- endif
- 
- # OSX, aka Darwin
- ifeq ("Darwin", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- endif
- 
- # Sun
- ifeq ("SunOS", "$(UNAME_S)")
--CC = cc
--OPTIONS=-g -DBSD_COMP $(ENC_OPTS)
-+CC ?= cc
-+OPTIONS=-DBSD_COMP $(ENC_OPTS)
- LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
- CFLAGS=`getconf LFS_CFLAGS`
- OPENSSL=/usr/sfw
-@@ -65,9 +66,9 @@
- 
- # Linux
- ifeq ("Linux", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- LDLIBS=-lm $(CRYPT_LIB)
--CFLAGS=`getconf LFS_CFLAGS`
-+CFLAGS?=`getconf LFS_CFLAGS`
- endif
- 
- ifdef OPENSSL
-@@ -82,7 +83,7 @@
- testclient_multi.o: testclient_multi.c uftp.h uftp_common.h encryption.h
- 
- testclient_multi: testclient_multi.o encrypt_openssl.o uftp_common.o
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- clean:
- 	rm -f testclient_multi uftp uftpd uftpproxyd uftp_keymgt *.o
-@@ -176,16 +177,16 @@
- endif
- 
- uftp: $(UFTP_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftpd: $(UFTPD_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftpproxyd: $(UFTPPROXYD_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftp_keymgt: $(UFTP_KEYMGT_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- %.o: %.c
- 	$(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) -c $<
diff --git a/net-misc/uftp/files/uftp-4.10.1_gcc10.patch b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch
new file mode 100644
index 000000000000..d25de61465dc
--- /dev/null
+++ b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch
@@ -0,0 +1,14 @@
+diff -Nuar uftp-4.10.1.orig/proxy.h uftp-4.10.1/proxy.h
+--- uftp-4.10.1.orig/proxy.h	2020-02-06 17:30:34.904020513 +0300
++++ uftp-4.10.1/proxy.h	2020-02-06 17:30:49.214021144 +0300
+@@ -167,8 +167,8 @@
+ extern int proxy_type, debug, rcvbuf, dscp, keyfile_count, keyinfo_count;
+ extern int hb_interval, priority;
+ extern unsigned int ttl;
+-char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN];
+-int port, out_port;
++extern char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN];
++extern int port, out_port;
+ extern union sockaddr_u down_addr;
+ extern int have_down_fingerprint;
+ extern uint8_t down_fingerprint[HMAC_LEN];
diff --git a/net-misc/uftp/files/uftp-4.9.4_makefile.patch b/net-misc/uftp/files/uftp-4.10.1_makefile.patch
index 5a131c350a56..5a131c350a56 100644
--- a/net-misc/uftp/files/uftp-4.9.4_makefile.patch
+++ b/net-misc/uftp/files/uftp-4.10.1_makefile.patch
diff --git a/net-misc/uftp/uftp-3.7.1.ebuild b/net-misc/uftp/uftp-3.7.1.ebuild
deleted file mode 100644
index 41aed30ba67b..000000000000
--- a/net-misc/uftp/uftp-3.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
-SRC_URI="http://www.tcnj.edu/~bush/downloads/${P}.tar"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.7_makefile.patch"
-)
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc ReadMe.txt
-	doman uftp.1 uftp_keymgt.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
diff --git a/net-misc/uftp/uftp-4.10.1.ebuild b/net-misc/uftp/uftp-4.10.1.ebuild
new file mode 100644
index 000000000000..9fb44efca5f8
--- /dev/null
+++ b/net-misc/uftp/uftp-4.10.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Encrypted UDP based FTP with multicast"
+HOMEPAGE="http://uftp-multicast.sourceforge.net/"
+SRC_URI="https://download.sourceforge.net/${PN}-multicast/source-tar/${P}.tar.gz"
+
+LICENSE="GPL-3-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+server ssl"
+
+# openssl with EC required, see #644674
+DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
+RDEPEND="${DEPEND}"
+
+# Workaround, see #644670
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}/${P}_makefile.patch"
+	"${FILESDIR}/${P}_gcc10.patch"
+)
+
+src_compile() {
+	use ssl || local opt="NO_ENCRYPTION=1"
+	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
+	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
+}
+
+src_install() {
+	dobin uftp uftp_keymgt
+	dodoc {Changes,protocol,ReadMe}.txt
+	doman {uftp,uftp_keymgt}.1
+
+	if use server ; then
+		dosbin uftpd uftpproxyd
+		newinitd "${FILESDIR}/uftpd.init" uftpd
+		newconfd "${FILESDIR}/uftpd.conf" uftpd
+		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
+		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
+		doman {uftpd,uftpproxyd}.1
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotate" uftpd
+	fi
+}
+
+pkg_postinst() {
+	if use server ; then
+		ewarn "Please note, uftpd 4.x server is not backward compatible with"
+		ewarn "uftp 3.x clients! Please upgrade clients before servers."
+	fi
+}
diff --git a/net-misc/uftp/uftp-4.9.4.ebuild b/net-misc/uftp/uftp-4.9.4.ebuild
deleted file mode 100644
index 74358db417d4..000000000000
--- a/net-misc/uftp/uftp-4.9.4.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 toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}_makefile.patch"
-)
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc {Changes,protocol,ReadMe}.txt
-	doman uftp.1 uftp_keymgt.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		ewarn "Please note, uftpd 4.x server is not backward compatible with"
-		ewarn "uftp 3.x clients! Please upgrade clients before servers."
-	fi
-}
diff --git a/net-misc/uftp/uftp-4.9.5.ebuild b/net-misc/uftp/uftp-4.9.5.ebuild
deleted file mode 100644
index a596a8380bbd..000000000000
--- a/net-misc/uftp/uftp-4.9.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-# openssl with EC required, see #644674
-DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
-RDEPEND="${DEPEND}"
-
-# Workaround, see #644670
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.9.4_makefile.patch"
-)
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc {Changes,protocol,ReadMe}.txt
-	doman uftp.1 uftp_keymgt.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		ewarn "Please note, uftpd 4.x server is not backward compatible with"
-		ewarn "uftp 3.x clients! Please upgrade clients before servers."
-	fi
-}
diff --git a/net-misc/uftp/uftp-4.9.8.ebuild b/net-misc/uftp/uftp-4.9.8.ebuild
deleted file mode 100644
index 08943133b714..000000000000
--- a/net-misc/uftp/uftp-4.9.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://uftp-multicast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-# openssl with EC required, see #644674
-DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
-RDEPEND="${DEPEND}"
-
-# Workaround, see #644670
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.9.4_makefile.patch"
-)
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc {Changes,protocol,ReadMe}.txt
-	doman uftp.1 uftp_keymgt.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
-
-pkg_postinst() {
-	if use server ; then
-		ewarn "Please note, uftpd 4.x server is not backward compatible with"
-		ewarn "uftp 3.x clients! Please upgrade clients before servers."
-	fi
-}
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 569ae9a50430..0fcb898c5eb8 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 969a6bd52b33..03f357a47ff4 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,5 +1,5 @@
 DIST liferea-1.12.3.tar.bz2 1467804 BLAKE2B 3ef8039b7af136568e041309a384547543908e193cd384af819e24cd7ae213e4020e0ea099128295603ecf36d5d817b7529a2356191320ba80f4624128a72a36 SHA512 574dd13502fee81e81e88a0fa3a57028af2d2bfcfed5a132468a2be9257a886c7cbf958883c230deb6dbf952912ecc92631396ef6b5c353315833e0541db1208
 DIST liferea-1.12.7.tar.bz2 1495627 BLAKE2B 36e95d270e3c3f68499073c7f2b1b6c987b67fc40517bfeb95c7ce02fc0c66daccb8e7d15709f1a047b36eea3d6d0cfe4af2e37f6809051f1be7613a36e0234f SHA512 7628f089940cd285ae6269b8d788b230572a0f5cab8a81ea1e92010de98a3ecd21d39596be6c18c055469579468fe3df7fca4e917a6a1ef3644a5e24c8e55109
-EBUILD liferea-1.12.3.ebuild 1619 BLAKE2B 1d60dfba23950fcc5caf72f97e9529910da4cec1c5119a26e2d0d4f9c5026a09f7960495d364a8034d5babfc0abc58f3f11273570ace682799c79d6a382c71b9 SHA512 3d2deb48ce158f048cac67b94c1617e520194120fbf8b528cbe2890ab352b4ce332b10aff6fa614b48fb5ee52014d66ba05176f7b09468149b8e0f03d744e3da
-EBUILD liferea-1.12.7.ebuild 1467 BLAKE2B 6e423c88cc8e9e09833f17e449fd82a9d599d004e679670c0918b02028443edf6e8fce315426464965a7c1202675a21b28d7908d704157cc8fd0776e5367b9e9 SHA512 f78de36a8d0ec725b73620fea3dfc4a78c33b63525b2b4bae1e4c94b219b5be4a0f48aadbf0fdb59db4dfd0abf76cb10c9d44579a97760235de1249339f2e07a
+EBUILD liferea-1.12.3.ebuild 1626 BLAKE2B a01040aed7b7ed7423abbbbb4a1e644bdaa5bcc0f2c392b5d9cc28737445ff46bdfc9c61a377b1cb2b8a1c319079b1624efbfcb754b498ac498f244c080ba4f0 SHA512 bf38253fad82ae969d91eeaf49524c2b3aa527fe8b5a59146c98e4d78d177f11288075288daef493b43859bf481729caccbdff0bc02b0476f939745e6a256368
+EBUILD liferea-1.12.7-r1.ebuild 1474 BLAKE2B 4b90ad35cc3618e188eebff8eedc19b44c76f339184b06977f74e70dde978f54a098930720a8ccec3a3da41f4c3481c7c28ef17717ffef4d3c9650f05c0895a3 SHA512 b529f265aea80544a7b9d55122a0e8c81a4271a52dd86e51544b8ad48fc8b3b4140b24a96053bc5dfc0fbeb501d10731076c6cb5ce4682a5660e486689f90315
 MISC metadata.xml 598 BLAKE2B e6c962c4f6324f1e260256a64970926a9de2e0e24ba6fb53673c40d2aea969a6a779a77a00752a948d41e2923ab844c894b82880921f95a46bce94ba2d84e02c SHA512 d8d877c107353ca9a7a28fdc00a5df495dcd49ac80f111190362ee1e5f7e8bfe1eb2b5f0db298cb71c91d2a567dda5e83cb06178dc44f92704b30be0044a6512
diff --git a/net-news/liferea/liferea-1.12.3.ebuild b/net-news/liferea/liferea-1.12.3.ebuild
index 523c5692039b..5ab02798eae9 100644
--- a/net-news/liferea/liferea-1.12.3.ebuild
+++ b/net-news/liferea/liferea-1.12.3.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.28.0:2
 	dev-libs/gobject-introspection
 	dev-libs/json-glib
-	>=dev-libs/libpeas-1.0.0[gtk,python,${PYTHON_USEDEP}]
+	>=dev-libs/libpeas-1.0.0[gtk,python,${PYTHON_SINGLE_USEDEP}]
 	>=dev-libs/libxml2-2.6.27:2
 	>=dev-libs/libxslt-1.1.19
 	gnome-base/gsettings-desktop-schemas
diff --git a/net-news/liferea/liferea-1.12.7-r1.ebuild b/net-news/liferea/liferea-1.12.7-r1.ebuild
new file mode 100644
index 000000000000..de2b2a0b25b3
--- /dev/null
+++ b/net-news/liferea/liferea-1.12.7-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="https://lzone.de/liferea/"
+SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	dev-libs/json-glib
+	dev-libs/libpeas[gtk,python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	gnome-base/gsettings-desktop-schemas
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_compile() {
+	# Workaround crash in libwebkit2gtk-4.0.so
+	# https://bugs.gentoo.org/704594
+	WEBKIT_DISABLE_COMPOSITING_MODE=1 \
+		gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "Additional features can be enabled via"
+	elog "\tapp-crypt/libsecret[introspection] for Libsecret Support plugin"
+	elog "\tdev-python/pycairo and x11-libs/gdk-pixbuf[introspection] for Tray Icon (GNOME Classic) plugin"
+	elog "\tmedia-libs/gstreamer[introspection] for Media Player plugin"
+	elog "\tnet-misc/networkmanager for monitoring network status"
+	elog "\tx11-libs/libnotify[introspection] for Popup Notifications plugin"
+}
diff --git a/net-news/liferea/liferea-1.12.7.ebuild b/net-news/liferea/liferea-1.12.7.ebuild
deleted file mode 100644
index 9f6063f540fa..000000000000
--- a/net-news/liferea/liferea-1.12.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
-HOMEPAGE="https://lzone.de/liferea/"
-SRC_URI="https://github.com/lwindolf/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gobject-introspection
-	dev-libs/json-glib
-	dev-libs/libpeas[gtk,python,${PYTHON_USEDEP}]
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	gnome-base/gsettings-desktop-schemas
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_compile() {
-	# Workaround crash in libwebkit2gtk-4.0.so
-	# https://bugs.gentoo.org/704594
-	WEBKIT_DISABLE_COMPOSITING_MODE=1 \
-		gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "Additional features can be enabled via"
-	elog "\tapp-crypt/libsecret[introspection] for Libsecret Support plugin"
-	elog "\tdev-python/pycairo and x11-libs/gdk-pixbuf[introspection] for Tray Icon (GNOME Classic) plugin"
-	elog "\tmedia-libs/gstreamer[introspection] for Media Player plugin"
-	elog "\tnet-misc/networkmanager for monitoring network status"
-	elog "\tx11-libs/libnotify[introspection] for Popup Notifications plugin"
-}
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
index 7a36a4087dad..3cb44ca0a2bc 100644
--- a/net-news/quiterss/Manifest
+++ b/net-news/quiterss/Manifest
@@ -1,4 +1,4 @@
 DIST quiterss-0.18.12.tar.gz 3597214 BLAKE2B ff06de6f6618fa6bb1b2b1274e5c214f1cae2dbb4e7d6c406b885f1b59b5b5d22ca919d32a672f8843360100e87d80c7a7add7ebccc41b53f67b0719fe2f7c99 SHA512 e047d88d3be2d24e264869c9fe5a9327d66b7f6907bb74b5fc7e53b2cbb69c232f130826c8ad79ac95dd3dc5137d1d1779a23c20ddb35c56fccfbaff4fb4f3e4
-EBUILD quiterss-0.18.12.ebuild 1216 BLAKE2B 8a2a7d1b27e32e762974fde8b7c66cac9ad5aa1c89e9fbf3d72e4422376a582a99278caf923aa6801da60134fa742ea18fb2695af524c819bf4e5d59489f9a85 SHA512 f20f51a59ecd131b979821bd8c25df45a6d3dd4099be0bf6699723abad50bf6d231bdc0b63ab62e4a3280822ee65359acf3d9f733e0c2377705b9a247ce5a460
+EBUILD quiterss-0.18.12.ebuild 1214 BLAKE2B d4dafbfacfa986a4d9201701dc028f73093afc0d9b9de9cda514bdc6fb92de1cfacf6fe51041240cfcf8a68394a264328cfb8b7264812cc15338f3eb249deca2 SHA512 80b3b238510b1240073b919b482da34d72440707870618f8704273d35d740a37af8f437ecce9180e22219a92111bca6e7ec89f2de75c8d54d680a328f5ffd14a
 EBUILD quiterss-9999.ebuild 1100 BLAKE2B 6d1e695e3e653a131d2eec0107b03e8a2c239565eb1ec168aa28b194ab93eb71584a49a6d2bbbbf2af572a2d784fa7377f57ec420de6ad742d1e067631abb5a0 SHA512 de9914600808f4eeed2a208d054fbdc7fad5a3287495653c1b3d5599e62b9fc8775d469cdd32ce595dfe2d5ab6eb773cf3f7dfc99a99a959138c3312de686bdb
 MISC metadata.xml 329 BLAKE2B caa7a5bfcbbf62b32546c2a8cb0d3e55b1b1d0371b81505156a566df605e277d9560d900a4d2f945b4d9da99b7898edec3c08264b5628f4d74c9c949f805e455 SHA512 d77d10152c5497c4bb21511bd20b8a122159e048d11d070fffbd2ef5742be3bd0019eafb79a5e828b923b095b8628ff1d65371800ea49dbe6ec6355d1b9a0150
diff --git a/net-news/quiterss/quiterss-0.18.12.ebuild b/net-news/quiterss/quiterss-0.18.12.ebuild
index 9eaebe56fd69..cc44c5cb8c9f 100644
--- a/net-news/quiterss/quiterss-0.18.12.ebuild
+++ b/net-news/quiterss/quiterss-0.18.12.ebuild
@@ -42,7 +42,7 @@ DOCS=( AUTHORS CHANGELOG README.md )
 
 src_configure() {
 	local myqmakeargs=(
-		PREFIX="${EPREFIX%/}/usr"
+		PREFIX="${EPREFIX}/usr"
 		SYSTEMQTSA=1
 	)
 	eqmake5 "${myqmakeargs[@]}"
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 0b6ffe5d8848..b1d2885fa316 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index cf87403d7e06..74004ce8d965 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,3 +1,3 @@
 DIST pan-0.145.tar.bz2 2307162 BLAKE2B 09535013d8c2fb511b8c79ef185880b69a3f948d0e168b4fb8acc4d3d07d94fb756df171d003b12e1baef3201e2b8be22d583bb9ff551a5ae22f464feaa6f077 SHA512 3dc92d519158ddd480fc43250bf7a3ec67a877e58b0877c02b99f1dfd968bf18c9a20c3d8c4b6acab4132da89b6b91dd2992616ddf46c1c3f9aa0de8f8ee1949
-EBUILD pan-0.145.ebuild 1313 BLAKE2B 897f2571924dac83d781ce1281ea6e3eb525a6f483480d565240ac1dffb121c9714850ac4f3b4b3bd94a8eaf3da8ff995dd0f4d1ba587eb3bb0841a56a6e588c SHA512 f287092d35043050472fddafe527bfe7421b26f222344652ec2af7353db94be19ea7f88e5de4342edaa196ff98b71485944d37608e575e600a9a7749051bd8aa
+EBUILD pan-0.145.ebuild 1314 BLAKE2B b269a83b115951d2094e602d14e8350e4c3a5b79f5443fca9fca3ac9582a46fa7c9bcd1b3836c23440fe69c9e3ae20ca7b0efa854282e1a280c42294fde943fa SHA512 3780ae1e828a48654327658e1d5e33a19965976d2a30483acb6142eab514b67e82eb2887d7f79a6142b93ea0f2283850e92b7da7729c3588681ef3681ec4a4a8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-nntp/pan/pan-0.145.ebuild b/net-nntp/pan/pan-0.145.ebuild
index 4315923aa8df..8b93699544ef 100644
--- a/net-nntp/pan/pan-0.145.ebuild
+++ b/net-nntp/pan/pan-0.145.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="dbus gnome-keyring libnotify spell ssl"
 
 RDEPEND="
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index b801f53e0505..de17c9846ab5 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -6,5 +6,5 @@ AUX sabnzbd.ini 347 BLAKE2B b3e247bb75d3d3cead9db3bb1f4d7301542619bfadd66619e3c3
 AUX sabnzbd.initd 1395 BLAKE2B d8663fefa21e3d371c32ecebd1a3958704d39738ce4496c8f977cc411d6c5235aad6c0147f626089a9964c472b15ed4bd2ede0fb35b08260a705190b877ea65a SHA512 0510dc7386ae57493bf614d9b74614f0c2b160981c0f7e5f784a9a336167de7918112ff1a173e3535edd654567ca806b156ee6db819e139dcfea3990bc8252d8
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
 DIST SABnzbd-2.3.9-src.tar.gz 2738773 BLAKE2B fbb765732c0aab6a47a4d4827d21b1b029c6d40c1c6c335692964210dc4c389e94cd1cdca45bfb3fb8c2fa9adc84f33df0fe3d23a0e4f9143a095eec042a5cf0 SHA512 10a39db9ad7f6d441166da97194b7a281aacd1900f7687bca72c6c2b555114bc2bbdaaba51cb9fcec57aa1b782f20609a07528484ad911ffd9f9eabb54a324fa
-EBUILD sabnzbd-2.3.9.ebuild 4170 BLAKE2B 3d0e56d22c41045ea2a1e2c05f4cec3cb680d11f2a988c72222343fb4715a5cc8f984479290feacdc993bed7322aef0cf3aa6fdf0bbc37c5c9cb11f35f18b514 SHA512 5719356e34b7c08bdb6e81ef49481a297bf65630dde38cd080cecf138f52a062fbff5b2acb8578b54c36fa83a27e7062c7c85feb5ff28248f456803f07ed0fb4
+EBUILD sabnzbd-2.3.9-r1.ebuild 4248 BLAKE2B 400d61005d17bcb42fc0e0cfa4fb0a3f3eba87a7f9efb6538842bad16c2d23db4a312aae46fb2b57a0a41218f42674e6ee139767db4e2e0f42f14c7190f612c8 SHA512 41439600846fec23a3446598761d9f127353ea34efe4858aa2ad54604cc17957cf37f821a6ec544c3f27284b946f9c65cc868170845e9b17f67483850c540762
 MISC metadata.xml 537 BLAKE2B fe8b15b9a558bf21c550b24851d3ff861e4c4bda01cae83f9d973377f92142bd0cb5d3580f94b72fe7813ed757c9a487389ffb4aebcb5f3f171e0c480d4a6b5c SHA512 2e1c77abc06440c9d0ea08331a073680de2d49059b1aa7cc245b5b0cbe3aa8e1943a96c97b97071cd9296726d7a0f84a4ad428c8aa26314e0733af2793542e33
diff --git a/net-nntp/sabnzbd/sabnzbd-2.3.9-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.9-r1.ebuild
new file mode 100644
index 000000000000..725ecf31daf0
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-2.3.9-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Require python-2 with sqlite USE flag
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 user systemd
+
+MY_P="${P/sab/SAB}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+7za +rar unzip"
+
+# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
+# be in python's sitedir.  See:  http://wiki.sabnzbd.org/unix-packaging
+
+# TODO:  still bundled but not in portage:
+# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs
+# pynewsleecher
+#
+# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
+# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
+#
+# Also note that cherrypy is still bundled.  It's near impossible to find
+# out where the bundled and heavily patched version came from (pulled from
+# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
+# further.  Upstream is planning on making this easier with 0.8.0.
+# https://github.com/sabnzbd/sabnzbd/issues/47
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/par2cmdline-0.4
+	$(python_gen_cond_dep '
+		>=dev-python/cheetah-2.0.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
+		dev-python/gntp[${PYTHON_MULTI_USEDEP}]
+		dev-python/pythonutils[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/sabyenc-3.3.1[${PYTHON_MULTI_USEDEP}]
+	')
+	net-misc/wget
+	7za? ( app-arch/p7zip )
+	rar? ( || ( app-arch/unrar app-arch/rar ) )
+	unzip? ( >=app-arch/unzip-5.5.2 )
+"
+DEPEND="${PYTHON_DEPS}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	HOMEDIR="/var/lib/${PN}"
+	python-single-r1_pkg_setup
+
+	# Create sabnzbd group
+	enewgroup "${PN}"
+	# Create sabnzbd user, put in sabnzbd group
+	enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/patches
+
+	# remove bundled modules
+	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
+	rm -r gntp || die
+	rm licenses/License-{feedparser,configobj,gntp}.txt || die
+
+	eapply_user
+}
+
+src_install() {
+	local d
+
+	for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
+		insinto "/usr/share/${PN}/${d}"
+		doins -r ${d}/*
+	done
+
+	exeinto "/usr/share/${PN}"
+	doexe SABnzbd.py
+
+	python_fix_shebang "${ED%/}/usr/share/${PN}"
+	python_optimize "${ED%/}/usr/share/${PN}"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	diropts -o "${PN}" -g "${PN}"
+	dodir "/etc/${PN}"
+	dodir "/var/log/${PN}"
+
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o "${PN}" -g "${PN}"
+	doins "${FILESDIR}/${PN}.ini"
+
+	dodoc {ABOUT,ISSUES,README}.txt licenses/*
+
+	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+	einfo "Default directory: ${HOMEDIR}"
+	einfo
+	einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+	einfo
+	einfo "    gpasswd -a <user> sabnzbd"
+	einfo
+	einfo "By default, SABnzbd+ will listen on TCP port 8080."
+	einfo
+	einfo "As Growl is not the default notification system on Gentoo, we disable it."
+
+	local replacing
+	local major
+	local minor
+	for replacing in ${REPLACING_VERSIONS}; do
+		major=$(get_major_version ${replacing})
+		minor=$(get_version_component_range 2 ${replacing})
+
+		if [ "${major}" == "1" ]; then
+			ewarn
+			ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
+			ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
+			ewarn
+			break
+		elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; then
+			ewarn
+			ewarn "Due to changes in this release, the queue will be converted when ${PN}"
+			ewarn "is started for the first time. Job order, settings and data will be"
+			ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
+			ewarn "fetching before the upgrade will be lost!"
+			ewarn
+			break
+		fi
+
+	done
+}
diff --git a/net-nntp/sabnzbd/sabnzbd-2.3.9.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.9.ebuild
deleted file mode 100644
index 3c897b62e6e7..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-2.3.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 user systemd
-
-MY_P="${P/sab/SAB}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${PV}/${MY_P}-src.tar.gz"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+7za +rar unzip"
-
-# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
-# be in python's sitedir.  See:  http://wiki.sabnzbd.org/unix-packaging
-
-# TODO:  still bundled but not in portage:
-# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs
-# pynewsleecher
-#
-# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
-# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
-#
-# Also note that cherrypy is still bundled.  It's near impossible to find
-# out where the bundled and heavily patched version came from (pulled from
-# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
-# further.  Upstream is planning on making this easier with 0.8.0.
-# https://github.com/sabnzbd/sabnzbd/issues/47
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/par2cmdline-0.4
-	>=dev-python/cheetah-2.0.1[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/gntp[${PYTHON_USEDEP}]
-	dev-python/pythonutils[${PYTHON_USEDEP}]
-	>=dev-python/sabyenc-3.3.1[${PYTHON_USEDEP}]
-	net-misc/wget
-	7za? ( app-arch/p7zip )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	unzip? ( >=app-arch/unzip-5.5.2 )
-"
-DEPEND="${PYTHON_DEPS}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	HOMEDIR="/var/lib/${PN}"
-	python-single-r1_pkg_setup
-
-	# Create sabnzbd group
-	enewgroup "${PN}"
-	# Create sabnzbd user, put in sabnzbd group
-	enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/patches
-
-	# remove bundled modules
-	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
-	rm -r gntp || die
-	rm licenses/License-{feedparser,configobj,gntp}.txt || die
-
-	eapply_user
-}
-
-src_install() {
-	local d
-
-	for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
-		insinto "/usr/share/${PN}/${d}"
-		doins -r ${d}/*
-	done
-
-	exeinto "/usr/share/${PN}"
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED%/}/usr/share/${PN}"
-	python_optimize "${ED%/}/usr/share/${PN}"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	diropts -o "${PN}" -g "${PN}"
-	dodir "/etc/${PN}"
-	dodir "/var/log/${PN}"
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	doins "${FILESDIR}/${PN}.ini"
-
-	dodoc {ABOUT,ISSUES,README}.txt licenses/*
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	einfo "Default directory: ${HOMEDIR}"
-	einfo
-	einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-	einfo
-	einfo "    gpasswd -a <user> sabnzbd"
-	einfo
-	einfo "By default, SABnzbd+ will listen on TCP port 8080."
-	einfo
-	einfo "As Growl is not the default notification system on Gentoo, we disable it."
-
-	local replacing
-	local major
-	local minor
-	for replacing in ${REPLACING_VERSIONS}; do
-		major=$(get_major_version ${replacing})
-		minor=$(get_version_component_range 2 ${replacing})
-
-		if [ "${major}" == "1" ]; then
-			ewarn
-			ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
-			ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
-			ewarn
-			break
-		elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; then
-			ewarn
-			ewarn "Due to changes in this release, the queue will be converted when ${PN}"
-			ewarn "is started for the first time. Job order, settings and data will be"
-			ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
-			ewarn "fetching before the upgrade will be lost!"
-			ewarn
-			break
-		fi
-
-	done
-}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 8b4df21cef5d..7a277ea2c125 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index fc0fc7e238a2..a6d859bd00d9 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -2,6 +2,6 @@ AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
 DIST airdcpp-webclient-2.6.0.tar.gz 903873 BLAKE2B 7a82891efef14e8d3c2da9a15165698084daf9c044d420c271dd1401710f030fc3c6fd83d7f58cee746767624b1292e7fcb7a48387e03b0eca2cf779753686d8 SHA512 d6d029638e69d19743d2e49185b08a808d95d725c3f40bd98ab42c384d3eae6d07e4528ac28ac9db50011f8a68592ae60f49cedbbccb45a78e82a5e424bb731c
 DIST airdcpp-webclient-2.6.1.tar.gz 908393 BLAKE2B 8734cdfc1b0e380d231cf6e571d215b7cec196fe012bf842fd2257496f252dd803eee0a308e97033f959652dbd4d21bd2b96559c4a4262a8f7ddd2c491c7d263 SHA512 bad35d09475ef9a95f358bce99d1143586e3eedb58b3c5c74570c707f099ed1b1214714c093f74c6e2bbfa733077dcaf3e590ae3d821330938f9ec32c75a7152
-EBUILD airdcpp-webclient-2.6.0.ebuild 1432 BLAKE2B 85b65ba33e707985aa89695e367a7aeb0e5281074a5c9513fb964ebd05d82dd6a5bcb24e08cfa3dfe2ef75b67ec2b79d64580855fc38f0c9d61b45cb4203d538 SHA512 699e273529acafb182e54133361b8277bf7b7aa38041083ecaa67151a38ca552656bb61551e6b8353a6b30d44a19a449e0e2c3cc09881439ed2e042451c63263
-EBUILD airdcpp-webclient-2.6.1.ebuild 1432 BLAKE2B 85b65ba33e707985aa89695e367a7aeb0e5281074a5c9513fb964ebd05d82dd6a5bcb24e08cfa3dfe2ef75b67ec2b79d64580855fc38f0c9d61b45cb4203d538 SHA512 699e273529acafb182e54133361b8277bf7b7aa38041083ecaa67151a38ca552656bb61551e6b8353a6b30d44a19a449e0e2c3cc09881439ed2e042451c63263
+EBUILD airdcpp-webclient-2.6.0.ebuild 1426 BLAKE2B d94c8917282b654323af2d0fe782f4903b450a24bb8f7a27d8209bbf402cdf3456110aa24107aa7a4499a0196a330d84613b483d26da7419878e45a3aefff784 SHA512 21a0c3545af4979ebf9d178c99b30ee1dd3d5b1aba147287162c804c43d307bc8f8fee92079a61335f534980917c48dc49e5fdbe2416623fb0e0d286224a1419
+EBUILD airdcpp-webclient-2.6.1.ebuild 1426 BLAKE2B d94c8917282b654323af2d0fe782f4903b450a24bb8f7a27d8209bbf402cdf3456110aa24107aa7a4499a0196a330d84613b483d26da7419878e45a3aefff784 SHA512 21a0c3545af4979ebf9d178c99b30ee1dd3d5b1aba147287162c804c43d307bc8f8fee92079a61335f534980917c48dc49e5fdbe2416623fb0e0d286224a1419
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
index 380aadd6adaf..8f278445821a 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit cmake-utils python-any-r1 user
 
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
index 380aadd6adaf..8f278445821a 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7} )
 
 inherit cmake-utils python-any-r1 user
 
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index d7a6cfdcfcae..7215a237e258 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -11,6 +11,6 @@ DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de
 DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
 DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
 EBUILD bitcoind-0.16.3.ebuild 4929 BLAKE2B 0659fbc5d29350ad948f4108762fca414c6f5893342a6a7463bfe1b7d4b3744ce5969949954d6aa040b4ae333df368661ffd9344a0e7c2fbec28befb0710d0f7 SHA512 1f6d0648aea9d864d22bbc55236e0b9ffd6ad0744051b165f40447eafcafa6179a28538dcac2e784ac07e58355969a6ec39a8b3fa9631067e0a4ade012101079
-EBUILD bitcoind-0.17.1.ebuild 5006 BLAKE2B aad9e7021ab9e4241eafcfca3b6734a9259351e6600ef47078eb27ef6de33bd7352a9ac516fcea73e58da5689aaa6ee9c6e9b386a22aa72a793da1032d6d9296 SHA512 a808f9733f201b7f5a850fa65d91d31b3899624b7482c1f9e4bd7b5f793c440ee37c1806ff52516dbd6d1e01cbe12ef0e36d35e5ed91c8630d275b68a198fef3
-EBUILD bitcoind-0.18.0.ebuild 5247 BLAKE2B 24ee462f7b825086cff084e2c99bfece19ba3291e0bfc1255883aaf842a2d721f1b7414dd448ae00039ed34889ed3c487d4f1742f26eb98374aef9165feb158a SHA512 22f55c178d1891ababeecc6cac6ce8e92926691517c201fa4eeafdf97b02724850c6a0f40cd275d1981153fc5b6e725229c42560f07fe2227c5a1f88f25dbac6
+EBUILD bitcoind-0.17.1.ebuild 5004 BLAKE2B f8bda0eacbf9f4488c5afad71113ded83b146575c9ce17856592ccd964bd6bf91001323901f8421c618d549b3d7800b82a9b9d9199b8a84084bfdfac68c94c16 SHA512 dfbf3d9a5138d999edfbe6c63d5d1e61c1add27df4b4dbb6031920af476401d8f11abfd6e2b49ee1e9ff7071c5c691d67bf529ed94692740cf3ca584a02519e6
+EBUILD bitcoind-0.18.0.ebuild 5245 BLAKE2B d50049d9cec9a70744e4ebb2417d4389ad8577d4b150acb746ecec77d1b3cd9efc18931cc1743bbaa9868da16f642299aee5c51298c3c39bb3336518579325a9 SHA512 d8e2a2b955bf89e464575a38239ccf307f88ce0b211ceaf1ecb5709c5cd1df7e8400c2957739642c6b04d2c195be7dacac9bf9811a3a94a4265c7ee94fb348f8
 MISC metadata.xml 1126 BLAKE2B c109473fe9b14ded30c783f08664ffdddca59b27905ec3ed2c7af3b367102f30017bf79599e984546f431d9665a33f9fb7a75501a1f37a5212073a3ff6c57ea6 SHA512 8e6357a5c3860a0b0d4440f0f2341a13582a24a1256443b352834aea491ec15f1d7980b7c9b2568aa1d4f5c44dd189934065c23df4bd63199acc6189aebbf03a
diff --git a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
index f8e1efe4331a..5e04c93da374 100644
--- a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
@@ -124,7 +124,7 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
 
 	insinto /etc/bitcoin
 	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
index 6b144706f370..9948395c7967 100644
--- a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
@@ -133,7 +133,7 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}/usr/bin/test_bitcoin" || die
+	rm -f "${ED}/usr/bin/test_bitcoin" || die
 
 	insinto /etc/bitcoin
 	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 99a36d8ebe39..c3e38b0bd13c 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,5 +1,7 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.11.9.tar.gz 1871215 BLAKE2B 3cd19225d4e2b4ab26721069d83f6d568c48ca12fa94ced35024420429000099f8db0e8c69e46617738238d9ab969ef39e3ef555731c4618a7b7b6c88d438c58 SHA512 d1a8f18769970a05df8da454f1755fda593dc0dfb2484855fb447dca25484254cefdbd31e19917b13195519c0e5cbf91fbe644f2d27300ad2db6c1ae52d5125b
-EBUILD cpuminer-opt-3.11.9.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+DIST cpuminer-opt-3.12.1.tar.gz 1809074 BLAKE2B 2c19cba4dc070286d7fe39b53b61177b64c3d873bbcefa359c62f4cdaa8b685fa40f2ef61a1fce9fba57902ba3399cd3b45816e932362f2633ce3ca174ad2b41 SHA512 98c84e8057a9c31cfa65daba32f43c7a7d9225878dcce07c740fac563225494c901f15bdf0450e50d857918dbc01861ddfd39ead9d44f8038fe866bfa3ef69e1
+DIST cpuminer-opt-3.12.2.tar.gz 1809424 BLAKE2B fedec681166de95e18d41e4c61ec75a9e1ea1fc1cdb656cebcb303a637a01eb3aba9e0c5cbb5cc710be6a2191dcbef0b1a2c00f0ce349064b25471eac5035c26 SHA512 f8a9c71d673f68418164cc1f0bd7c80b4e5d246b21a8f54432ad9fc87c1962a0ab0a96372018e2d1da55d084b6ce9dcae58dd3f7a0b0e62e595a805fefdb5a10
+EBUILD cpuminer-opt-3.12.1.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
+EBUILD cpuminer-opt-3.12.2.ebuild 1029 BLAKE2B b6a991e35810a57e2f65a15407e13e6c7d441315e3682c553d31bae84287bbc696deac764e73c06e7b4dbfdecafca6a5f53efc2cf9fa87ddfac5d911b110cc4d SHA512 de97b42cfed53706b2841a6bdc46f9f6495388bbdffa69c6cccad9866429bca5f1d6144b5ae75624b87a695d577ff7865d490c4708669ffaeb80ec409f23954f
 EBUILD cpuminer-opt-9999.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.9.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.1.ebuild
index a5d436b3b8b8..a5d436b3b8b8 100644
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.11.9.ebuild
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.1.ebuild
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild
new file mode 100644
index 000000000000..a5d436b3b8b8
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.12.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	>=net-misc/curl-7.15[ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 56f2e5df40e1..dcea91f620e0 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -14,11 +14,11 @@ AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B 9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
 DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
-EBUILD deluge-1.3.15-r2.ebuild 4929 BLAKE2B 78454c0525b20a0a521d15bd49c01e556c7c437c4363cbccc0a17b86e48afa8f9fb226388e55d397c9069d8bb1ab0ec265964fa3d529ef64a8f83973b706a925 SHA512 3d1e9636458040434fa54ec1d2f782f193739188bad0b03ff1fe3d9fc20ee2450d2cc2e2185d050ae34e0be271ca692cd88adc22dc69591eca110b88be54cf39
-EBUILD deluge-1.3.15-r3.ebuild 4495 BLAKE2B 82ffe9b866a7761cfce5cea806ba57cce365172fe092470481c0ca6af14801b91d2d3c58da3c9b5d41764273b35223f4d18daa44682f45901038d4fc64b773e6 SHA512 dd366542d8ad15db9ff42ded2e2a45c421457f8cddc2640438decccbc82e25e4b3a8c3c4959eb265c3a27c655b86af7902ebba989301066f97176d5d07fb0120
-EBUILD deluge-1.3.15-r4.ebuild 4433 BLAKE2B 3568da55fb548fd2bff397e7475eb35566b32215c704e0bea54088c3bf99a2819a866111ff579f3a64cd3160bb1dc1f7a5273f1a9be5aa1fbe40ba5ece07230b SHA512 21a791b18064beabc6213ebe9414af89151e47bc80747691045b4931c67f72b158a6ca444ecb94efc428db250c4dc94dc9425b46d6791b26329a6ee6621e17c7
-EBUILD deluge-1.3.9999.ebuild 4443 BLAKE2B bc2778509d617096c242d0d0d0295bb9c257cbc0befbfaff376d530106b278260970eaf162ead9d83c841f33cce180be84d8d0f81686f3394bb52edbe596e94d SHA512 70391b5670f0b3fe38e477a952fa563bc7441d65f7b0e141eebd073166392a5aaa9f98f3e2414c240333007eb4fb714517c190b8b6287812e96bb5b244f41469
-EBUILD deluge-2.0.3-r2.ebuild 4407 BLAKE2B 2f60b8ad1f446a360e8922423ffcf20142092850136b8a15b0201ac3a9b9cd3b6bd3cc4955aaaf8f54bd348b82ed7e7ebe3a477729a7773a0b00eba7fc6bcd99 SHA512 dbb785608b01558519e87c1828e795e9bc218a49a8128ea39666810678434921579e71c2d5c3069d158a4d002c6fe95a5cf928dae39ba77b94282844c89e480d
-EBUILD deluge-2.0.3-r3.ebuild 4342 BLAKE2B ee1298c4af7786c5b74249035398aa350a28d870bd273f06b2d4219d9fc4403b300b83f1203d916b66b2e61146ccf29c77bb7d55980a8facf86a43a5bf13c7b8 SHA512 e9d5f6eafe64af91f95499fe921a895ced9de14658a3c76fff3cdb433dac17cf7fbccedcb0552b0cbf8a5fc1f832c0c7f041494759f4f6f7c345423f64983413
-EBUILD deluge-9999.ebuild 4337 BLAKE2B 5ad161fd29af8008040404699b232a5b9176aec3a80cfc2f6829e4277bd81e499f3fd5c1704452614e3ba177f3a392185be722f497c25045a4e33488dd7888b4 SHA512 0f6d50dcffce2a2d91debe260bc2cfba9f140be14bfe0f63a6896896e9e48958a509a4905c611477c4e6187cfc9eaa3250263ed55caae5889b4812c536bfdb3e
+EBUILD deluge-1.3.15-r5.ebuild 5049 BLAKE2B e835b233c714144f9b430b48ccc0e9705814464e0d80997fd144b4cb6121c114467858326a6d311bcf3ecd2fcc8e0071eee2d3b94470dba16462e03121ff0767 SHA512 c9418ebce754628d524a6e94ed12937707b20267889d0c21f90287d38758d0e0be3932e9a4e07aa071f021513d72e1856cf2ecb1a2a9c083223a332e72c47c10
+EBUILD deluge-1.3.15-r6.ebuild 4627 BLAKE2B da5905161023ba40a0dd16a1f22186c30e3e2243e6795b3c239fd00857fbc9ddd10aefe30f7d36c37662fa7cefd503f06086d42bc96713da7508c67206ff1a63 SHA512 06673cd6882e68118aab461274b6f2666ce2c0ea68d898edc99fdc67b9830e78b6f9fddbc2cfde2e4413bc166e4bf854ac39aba57ac7f1cd52a55a6ec041eb8c
+EBUILD deluge-1.3.15-r7.ebuild 4565 BLAKE2B 0f3493cfebfd9caeb797110903bf73218286f54eaf0423fe32ddc9522e3cd946d0f302e7e6cb0c8da439a67f5a68bdcd05ae5643dedc6f86b5dbca8a58fe0384 SHA512 677d172e057274885e90e2326cf7ce866b9ac0aecb6a817fef0c42ae16e6d061d9b073b335c450924baa2f8ba3058aa53b26ee771edf13a0fdeebdea238f3ae8
+EBUILD deluge-1.3.9999.ebuild 4575 BLAKE2B eda51520f4bed4549b82a76065b3c9df05e68890b04d0d52ad7998a8e666ff5aefc87da75ca3469dfeef66f17ee86486d78eba631cd7b00a837fc292fe174909 SHA512 189365647ed13eca444ef4a5172b48708e851c3f75cc9e44209e176f9118573d2ce53107253762610088f220cc451fe2c52bd0583226e885c6bab51efacecb31
+EBUILD deluge-2.0.3-r4.ebuild 4551 BLAKE2B ca627923fdbb7144d4e4891916e5ef9f6e85f9ccdb24adc7ce28ab9295148ef3ec56c4f9fe3a53a6cc3c3b172dabb8c3ea23f7989db9e0d0d2c212313d8bbef8 SHA512 5b44412ab8537de7399608ff20afb7c8b06dc7ccc450dba4536df1c20c707bf59d3fa42bac27e91176e0d751da2a1848705fdcd0b7752df8fb3d13e676be4c37
+EBUILD deluge-2.0.3-r5.ebuild 4486 BLAKE2B 2b64e1b7305bf7fb2617151e5593247c61243f462867bbbd8ed9b03922d9c59e85899f1cda439fc66208f8323471c8c61b68abdf1edd89c652facc487c022e6e SHA512 3b724e1750f06be9a00dca6ee73e10715ef964bf28c14de9c29d4a214aff3201c6ebfd69a66356cf8d5b686da3904cbeb947d8557f477a805465528b49fd7369
+EBUILD deluge-9999.ebuild 4481 BLAKE2B 157aeb683c381e0e421ffb15029c64c73dd1281dc2c2708128108fd0df088e9e727b444ab648340e04292232ccc011f614104fb753b63151d4c01b60b33982d1 SHA512 807d72757aa4343cf99de89ff6f4b404219951fd0872295d95ae5482510821b1425b2136d2418caecd1d4e80d25e135aee5a27d05c8e773953e271df203df9f9
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
deleted file mode 100644
index f49c58d5c41a..000000000000
--- a/net-p2p/deluge/deluge-1.3.15-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		(
-		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
-		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-1.3.15-r3.ebuild b/net-p2p/deluge/deluge-1.3.15-r3.ebuild
deleted file mode 100644
index d3ef7813a7a0..000000000000
--- a/net-p2p/deluge/deluge-1.3.15-r3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd user
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		(
-		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
-		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-1.3.15-r4.ebuild b/net-p2p/deluge/deluge-1.3.15-r4.ebuild
deleted file mode 100644
index d938267bcd80..000000000000
--- a/net-p2p/deluge/deluge-1.3.15-r4.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		(
-		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
-		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-1.3.15-r5.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
new file mode 100644
index 000000000000..61514eb8e1d1
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
+)
+
+CDEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${CDEPEND}
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-1.3.15-r6.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
new file mode 100644
index 000000000000..f044210962ad
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd user
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
+)
+
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
+	dev-util/intltool"
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-1.3.15-r7.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
new file mode 100644
index 000000000000..13817ba74ca2
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
+)
+
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-2" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 1be3b5719884..af10c260e9f3 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,31 +33,36 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	|| ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-		(
-		>=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
-		>=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(
diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
deleted file mode 100644
index f3c58d701a9e..000000000000
--- a/net-p2p/deluge/deluge-2.0.3-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-2.0.3-r3.ebuild b/net-p2p/deluge/deluge-2.0.3-r3.ebuild
deleted file mode 100644
index 8b3cbf5b4f97..000000000000
--- a/net-p2p/deluge/deluge-2.0.3-r3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
-	# Override this call from the distutils-r1 eclass.
-	# This does not respect the distutils-r1 API. DONOT copy this example.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${D}/usr/bin/deluge-console" || die
-		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${D}/usr/share/icons/" || die
-		rm "${D}/usr/bin/deluge-gtk" || die
-		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${D}/usr/bin/deluge-web" || die
-		rm "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}
diff --git a/net-p2p/deluge/deluge-2.0.3-r4.ebuild b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
new file mode 100644
index 000000000000..cf9714d16182
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( gtk )
+	sound? ( gtk )
+"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
+	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+)
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
new file mode 100644
index 000000000000..3cdc92e94de4
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( gtk )
+	sound? ( gtk )
+"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
+	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+)
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
+	# Override this call from the distutils-r1 eclass.
+	# This does not respect the distutils-r1 API. DONOT copy this example.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${D}/usr/bin/deluge-console" || die
+		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${D}/usr/share/icons/" || die
+		rm "${D}/usr/bin/deluge-gtk" || die
+		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${D}/usr/bin/deluge-web" || die
+		rm "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+	python_optimize
+}
+
+pkg_postinst() {
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index d1806e7558e9..9bf5ba2d72ba 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
diff --git a/net-p2p/fms/Manifest b/net-p2p/fms/Manifest
index b82d7e7a935d..0864a0836e9d 100644
--- a/net-p2p/fms/Manifest
+++ b/net-p2p/fms/Manifest
@@ -4,5 +4,5 @@ AUX fms-use-system-libs4.patch 1343 BLAKE2B b45a272f24e0b738328e7d901699f4a5a9e4
 DIST fms-src-0.3.80.zip 4583891 BLAKE2B 363fe148c622d999398d2f435f49e312d3bea22ad6b69865a618593616b47b632c1a56bcc8fc75bd40590e3858aad7e3f1d70991a21936e38562e10f1813b49c SHA512 d3aa5eb7d417bb135d88a515702fac9c451054d071374bb7f475add9af7e1fda90f4d9c61569e3e9040b2a241efa7fcc7ecac32a7f652327d15ed8d1ea1418c4
 DIST fms-src-0.3.81.zip 4732577 BLAKE2B a873fe4458a4abf4d19c7849d2045e49f556e001315d9112f50fd5c544481c64e00d0db5672ca20f1974e8d8b46e88b98e6a339536659a8a4c06b1a3c4439d21 SHA512 7e5efc2bf22fd3ba24d61fb4a7afbd3b6181a6ea4d038bc06bc2135dd9254835647cbb62be68982ee553212be9f2e038f50623916db3131b2fd19a77c3180af2
 EBUILD fms-0.3.80.ebuild 1995 BLAKE2B ed05c263b40015c8a07603f1d2ed8f8b2e44308d1981ec85c2513a9904d0fa5063830eb990109a82dbcbac2da97a5d12a909fc31f3c509c5d848910a00d5675e SHA512 9349fd07349c8d9db9282ece0c18e22ccc5dde9933c1a30892281e0dc3caae599dab5a2305674f1435aaa80140cdc5d9f2ca141f91857fbc2062e4a60256bd00
-EBUILD fms-0.3.81.ebuild 2129 BLAKE2B 15ff7a8cf7c948231e540e02917336c87ce55e21b9141955fdd6bd154c076fd0dd8aa841a387cf2f428afbbb7185d34f891f82245faa3bed979ec4590d4b4e39 SHA512 5194e250b3527987875f4d0d088dc0947fb91857e787664e7fe10349f845ab57c4017097203adbfc1ef031d4af52f326c194ed936205b1a1dba9422f42519d14
+EBUILD fms-0.3.81.ebuild 2222 BLAKE2B d118b9112aec64afa7216220cb0109bf1cd80d4cbb7ce4aac0f71b38ff55d8d49c8aa0284be4b442d65e331605b8453b880c94b9b58913fc63d76f8fcdbccd95 SHA512 5a34df6919c2f6e0573cb240d06f90a2422fe79012a79705170fbde0dfae57b39fae48f33ab26ecf88f27a247b5ddcb1a26e22fe6e7ee73f18426bc2adbbaecd
 MISC metadata.xml 394 BLAKE2B a6924fe829c9abc8b3a04106d30b34af326d4596eb5bc9a96165db2ba1993a4157fdecfbeedc0f0a27b75c6327b501a67de3e46864ec4d7fe6211731fd2e121c SHA512 f4943a8b16ff6b031cf95eb5aaabe12fc18abc349f566fc7d4a4eab155ad917e9d49ebb5fcaafa0e36239d772d24391f1489ad71649ff33554f3a8fb6bdd69b7
diff --git a/net-p2p/fms/fms-0.3.81.ebuild b/net-p2p/fms/fms-0.3.81.ebuild
index 125c6be8d35b..bed92b6fea61 100644
--- a/net-p2p/fms/fms-0.3.81.ebuild
+++ b/net-p2p/fms/fms-0.3.81.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,8 @@ EAPI="6"
 inherit eutils cmake-utils user
 
 DESCRIPTION="A spam-resistant message board application for Freenet"
-HOMEPAGE="http://freenetproject.org/tools.html"
+#FMS oly has a homepage within freenet, so the closest is a wiki linking to it
+HOMEPAGE="https://github.com/freenet/wiki/wiki/FMS"
 SRC_URI="https://dev.gentoo.org/~tommy/distfiles/${PN}-src-${PV}.zip"
 
 LICENSE="GPL-2"
@@ -15,8 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="frost ssl"
 
 RDEPEND="virtual/libiconv
-	frost? ( net-libs/mbedtls )
-	ssl? ( net-libs/mbedtls )
+	frost? ( net-libs/mbedtls:0/12 )
+	ssl? ( net-libs/mbedtls:0/12 )
 	>=dev-libs/poco-1.4.3_p1
 	>=dev-db/sqlite-3.6.15"
 DEPEND="${RDEPEND}
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 380bbef858f7..2c3943782eae 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,3 +1,3 @@
 DIST nicotine+-1.4.1.tar.gz 3824830 BLAKE2B def211a4d06b1cb6a409917579652b3a1c8c36ec5ecfe5e295b9fabeaaca02cd4999fd20935c8999d4cf989f3ecff0a0a2c7f52a40f8c2b03e05b6c9dc2feca9 SHA512 894dfb318b205b6be21face0308f183da15772f329158c6a9a8a816dfdf231ad89245188acad5538821b2a778c8a8a6201ce8548cc58550c4eb6c0763db9d66a
-EBUILD nicotine+-1.4.1-r1.ebuild 736 BLAKE2B af33d384f9db8d1d9aa48a6b4814ae595f511dd8ad5c986046c781fa8f36990956cd011cd08455cc1beb39caf47121f1276109f59f5dec37814744a68d8fd72c SHA512 a3c5e676bbdd23f15c9c9b9b48fca1063404e5452ab08808efd61024df8a1205d916c53cc75f9a953708118e255a7ef6d4887ef672ac9fcc25bfd7d0646a6054
+EBUILD nicotine+-1.4.1-r2.ebuild 779 BLAKE2B b84742e79cf7d919a2b4cd47ba13021e591676a1671067655ca6cbe7a78f121bbd2cf84ed1120fc188d9f7c53c8ca35fac1933f9e4d8d82b76a61434fbedb2a9 SHA512 b9063b9ae3560908b975636f21d46ab2b8ccecb47cac9e63711d87afeefcdb8b09b5437688fbb98151410a6da9e023c8b527a70564c197ebf0f44a13bf1cea8b
 MISC metadata.xml 257 BLAKE2B eefbd95091b941aef3073689259e7bed1a9cd7db0a4d46ca77608a0d6bab835122b56ce9047e7fb21d7ca706b331f3b6b50f2dfff68561da40b3b8d6e63de62c SHA512 a7df7842124c688e7ed9fc4ca49372517e3570f1c461e78f32364902fafe04255a6db8fde42a72cbe2ed61426a5d49e89baa792aa3c9900cb4a83cc647c56cd5
diff --git a/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild b/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild
deleted file mode 100644
index 6244745090a0..000000000000
--- a/net-p2p/nicotine+/nicotine+-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
-HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
-SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pygtk-2.24[${PYTHON_USEDEP}]
-	media-libs/mutagen[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/nicotine-plus-${PV}"
-
-src_install() {
-	distutils-r1_src_install
-	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
-}
diff --git a/net-p2p/nicotine+/nicotine+-1.4.1-r2.ebuild b/net-p2p/nicotine+/nicotine+-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..bc288ddd9ab0
--- /dev/null
+++ b/net-p2p/nicotine+/nicotine+-1.4.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
+HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
+SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/1.4.1.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.24[${PYTHON_MULTI_USEDEP}]
+		media-libs/mutagen[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/nicotine-plus-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
+}
diff --git a/net-p2p/soulseek-qt/Manifest b/net-p2p/soulseek-qt/Manifest
index 5429f3cfef74..692a9a7967bd 100644
--- a/net-p2p/soulseek-qt/Manifest
+++ b/net-p2p/soulseek-qt/Manifest
@@ -1,4 +1,4 @@
 DIST SoulseekQt-2016-1-17-32bit.tgz 11481944 BLAKE2B 6710f74e5c2f0869c1b2813c56e2eed1b54a74021abbc14c10acaf6f463551ed1b8d31c48179746b160f498fb31b7ba50fdf20ce193222005e28a95769af2d24 SHA512 12b5ffc1ee470e6065d696e1d634e98f6654e0cd3575e8600ef10474cf2e2fd304302b8114a6fafb0ce06f1cc3912511c84efd44ba17c76b095e5fb1f40ed285
 DIST SoulseekQt-2016-1-17-64bit.tgz 11329818 BLAKE2B 8288b1f1c88a36f0d3c2ad86bf61036f26d919122080c176bbc77299275e5c91cf567bb5fd7048307e1130f8c3b899bc51edd00477cb1c3dd54b40029f7fa43b SHA512 73139e323f758245f5763e60cb74f6e195c1c8d9b6066ddc9cb63b7e755e412cbd479a47ced5bc33b3c8b85047705195ee424c41be5f4952c5d02c1769ac2240
-EBUILD soulseek-qt-20160117.ebuild 876 BLAKE2B c2c2d4767918e97d495b6d8f882e892106687e84d3c8c971b28402065d7a41915e3b5387eb0f6f9f58d0e8ca4f642cb603a71eb7fd36c32e3d398619bd90ee61 SHA512 f08366ca1df027e0d09d268398e95ad178a5047d3c7df58fced604c3c47008a21a3c61d38a6b8f5b224ec8d87a1eb6d7724aa21db7cef344a26eed6d74a2222a
+EBUILD soulseek-qt-20160117.ebuild 887 BLAKE2B 49bacad1f17cebcbf3504b5fe61366b212bbd626acf3e5988f045e3df45090f34d87dbe14c96efdad335666f7a851750c1637d357407f355566076148aba0564 SHA512 46f79fd6978e352fe5faf8c92c41f12e92a0dbcdf07f92711fecc196c63394ee86ed96483ed1b4943db73e9c5629851d7f8ddc53f33b3fcba07ad7917c033953
 MISC metadata.xml 256 BLAKE2B 61e2fe3a4fa0a8ccbe9fd34a995927cbe741c6d6f2f32b6be1b944caeff8b029772b4f7b8d236d595e345e2538b178743095f27d25aeb4e678e857a57dea3205 SHA512 9a1deae3cae6933cbd5aa5e403ece1ed0f34cfc8a7f18560bb1d66ec8b276d7af8c3060fc68e7928ae3fb74ec231889718665f7edd75f8cec3af167de08773a3
diff --git a/net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild b/net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild
index a3a1b37fc7f2..5c05f3ed42db 100644
--- a/net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild
+++ b/net-p2p/soulseek-qt/soulseek-qt-20160117.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,18 +11,17 @@ SRC_URI="
 	amd64? ( https://www.dropbox.com/s/7qh902qv2sxyp6p/${BINARY_NAME}-64bit.tgz )
 "
 
-LICENSE="free-noncomm"
+LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+RESTRICT="mirror bindist"
 
 DEPEND=""
 RDEPEND="media-libs/libpng x11-libs/libX11 x11-libs/libxcb media-libs/freetype x11-libs/libXau x11-libs/libXdmcp dev-libs/libbsd dev-libs/expat"
 
 S="${WORKDIR}"
 
-RESTRICT="mirror"
-
 QA_PREBUILT="opt/bin/.*"
 
 src_install() {
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 3df59c400caa..7891f0253c40 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -21,6 +21,7 @@ DIST github.com-certifi-gocertifi-a5e0173ced67.tar.gz 155606 BLAKE2B 844299f2865
 DIST github.com-cespare-xxhash-v2.1.0.tar.gz 9198 BLAKE2B 15dca7edb75751fac840795e5735c5e284e212180c0bf40b6bbb3023685b611b3835b8e70e865bef07ed915a5a81def967caa8cfc2a46bcd6edf81eac42d119b SHA512 6a44b29efe90fda8cdb267d1419673a577e231398480add90e7afb7eab92ecb375c947ce68c2221ed94b1fc7032a497703ec8026bff62386f52d22cac89ae2ab
 DIST github.com-cheekybits-genny-v1.0.0.tar.gz 15585 BLAKE2B 0b5d4e398b75ba2e413cd41d455bce346aadf8b31b9233b6287608b88264e0f698863bb151d44d75488caae011ce4e68fb574b301fcca77be53b32865b7db4ea SHA512 a045ce3dbe5c54e1e04705b87d2e3a18bebd71382a68156f975e28c6426aa82861e68e6ff162d3765704d5538a0493693cb973781e35b9d1b9ef8c4541ec1e19
 DIST github.com-chmduquesne-rollinghash-a60f8e7142b536ea61bb5d84014171189eeaaa81.tar.gz 22391 BLAKE2B fc58e00f0df0f24d87a907926f0a0a0f2a1317fb78d0919d6f925522c00514f393be8c434efc3e65d9b38334c56ee51aa134d486f559913ad18052a500498a5d SHA512 a1fef7d7d9123cba6cfe688120be9931d0ea71597c271db30c96d068ab0658436f96391fb7ccb61e4872633a3f9a473baf2e722d91a5de0db7fdd3725d41e2f5
+DIST github.com-cpuguy83-go-md2man-v2.0.0.tar.gz 52021 BLAKE2B d3df2300a28d972b6b7269172a734dda7a60df5c25d8b4a4d9a45a2c636f08286eea4873c32d22a9533ba4e333660e4ec2deabe8fbdb9af3db96c07884278d04 SHA512 22a6c950ca7e386246fadb15f05d0a60437a249df48a7c5f905bc4bd05034cede6318e1158bd2113e97b4fd2d1e838776680a00c6141ac2b3c8795aeee15a39d
 DIST github.com-d4l3k-messagediff-v1.2.1.tar.gz 8059 BLAKE2B 989a0b7bc6ba0f98e4725de209b081728fb5613b17b0706a18f448cc7444445a9a5b31f14ee0d454b66ef249a773d1b9631ef22eaf9cad60c44d796b7cb18d9b SHA512 5015339aa7a3730e1dbf8c6fe2e488f181db165480fb9ec12e9f0fcd449ec8df7dbe4e0b672845cfa5fc73036fdc6ff80c1044b2b96810eeb5a1e6192f224ff0
 DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e
 DIST github.com-flynn-archive-go-shlex-3f9db97f856818214da2e1057f8ad84803971cff.tar.gz 7682 BLAKE2B e62cf23c7a1abe3228df1589d65f1e4f9b39a26f37f2b01255ee73073461b9d78b96775843437ce6748eb4606b751569034321af8a71af07e502076a4f2aa86b SHA512 7e167dc71a001e85ac72b03921b0749045fe457d181127f6b4b46a3e1e0d4d968bd1535572518d79e0b5119b796e25c3bbce00217419c890f71452a0e80125a6
@@ -48,12 +49,14 @@ DIST github.com-golang-snappy-v0.0.1.tar.gz 62605 BLAKE2B 0af2dc71967b38aa4677e5
 DIST github.com-golang-sys-4d1cda033e0619309c606fc686de3adcf599539e.tar.gz 1121248 BLAKE2B b1c9ca1b9f2c60e8915c944afb5058cbc2acca7acea1f7a1a093499c371c2bdcaa82e60c1715b59a375060ccdf0140641bc06291569d4f5e6486a9bb90993b7a SHA512 5e4c95cde60807191f2d980505b2fd5745966b8f3049180422c129408bdb37fefd8403127597af38e3b13cedee8892af1ea4ca26ce150b61bf02bf2b98a040c9
 DIST github.com-golang-sys-749cb33beabd.tar.gz 1470192 BLAKE2B ea87d94d0e1dcd9bbfba56ed8281f39cb1d3dd36c674900e002e16ff57f36b0c9c14483ccc4025ee8661e239f82c1c057985d35c86166f2d3b60ab15c38d0ad4 SHA512 482467a0547281cc3348ee1ce1cf9377c223e12dba4c9dd94b53189dda0b7ce0e36c88367346e24635522080c5bbfc94dad18d2137e0c9ed599789f7986bc0d3
 DIST github.com-golang-sys-b09406accb47.tar.gz 1499131 BLAKE2B 86058e9899923af031ede2eee74915b74b496ea6b4937828264ec5371b4b0b01957c3d7af69de57c8b3bf78eaf08ceca4564872f40f49a55c0a4e228096bf700 SHA512 02b2aee839e605274999bc1839bdb8f2b6fdb643f7fa4dda1f8d047c54409dfb23819c938041ce964aa360b15954ca787f10002d2fea2b4ae4973f7638bf1268
+DIST github.com-golang-sys-c709ea063b76.tar.gz 1537836 BLAKE2B a7628adf0de85657546ce93a46bee74e3dc80a36e47550a75ed11644d0405def28400997ae762bb4f0a21344e0be6defc14de453e6848cdf3570992ac58b7058 SHA512 dd2104ab43fb9fd79345041860ab592c1c4f6e37bfefaeff4835445ca2ccbe659ceda7aee49c8b7b102b0b4f9ca31752e232790fe7be8118952b2306ab263f63
 DIST github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz 6112971 BLAKE2B 46e4358a177a6253797177a31d0509e63c2986645c61fb833c479498fcf3a8cb2304a81c47c562340087dc7eba5273690cfc86bdb978e72b1183715c8e9cc662 SHA512 555dfd99a41705b0e1aa7ee5a6465fbe53d1dedeeccc226a26edafb1f41d5f7a137cd4ed6ad02146d112055ca324569ccbe2863933dd363e5ed002cdbda6fa90
 DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
 DIST github.com-golang-time-6dc17368e09b0e8634d71cac8168d853e869a0c7.tar.gz 9548 BLAKE2B 8e29ac7d44106d5d36e580aba5677d5688ef3e850f6efaa83c01c4e4e6bda253adca564a01e2720f9b8216bd12abe99c2a519adb3e26085af8363d0c2b88e819 SHA512 12c4c592391f5e7f7334f28dc76193eeb8fb66df2294d91931daaf19912aa20a3ed27c8ece1bc02139b93d8767d22ec7dadbf800f91ae1f94aa635b490245feb
 DIST github.com-golang-time-9d24e82272b4.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6
 DIST github.com-jackpal-gateway-5795ac81146e01d3fab7bcf21c043c3d6a32b006.tar.gz 4009 BLAKE2B 6825c0ca6ba94354f6d30d496ef5dc31cc1a1dd6e192f22bfb57d375b6ba2755f973ddc8cfc121ffbf46534e3c8d444002e95b0e6df307184b0bd1f22b8a49eb SHA512 6e5929fe2000461abe2c2d26f7e092134c2de5ced57ffd8ebd42af68cb3d7a0d2e476044c6eebefd8f6e0ba263524c78db71a004c5408ec14e6ff675458004e8
 DIST github.com-jackpal-gateway-v1.0.5.tar.gz 4284 BLAKE2B d463b080fe05c1e2b3064a8f63a638d6d23d4c2782fc76be9cb376a9bd2ab8c3e5047224b790fe33fa328c5b1714fc8c1275ad0d86292ae7424722681f4a4585 SHA512 ae490a8d5a7480d3548fdcb444b6c3e8741ff2254a037b3a3bb4e0dfeae8ff969e5e3a0df1ef454165cec152c4cbfec864eb2f2d2188f95bbfe0a0b3ffc5e24d
+DIST github.com-jackpal-go-nat-pmp-v1.0.2.tar.gz 4774 BLAKE2B 27fde3e9eea2bd3030ad8650b680f2f123388932293c2ea9b1c4e8039cc4aeeaa3ab50446d250f1ccaeb312093ed7c1c5eb5b55d298f5e568fd5f0abfa478e9e SHA512 97761a1fb7abc94e40ed4e3d40e7424bb5617497e3856f8538f9a35985f41ff60dc6d207bf6c01ea5b405493e64f37f31e81a0a8db1aa8272d6ac885d3e6d444
 DIST github.com-kballard-go-shellquote-95032a82bc51.tar.gz 4327 BLAKE2B ca31068aeb60ebea4568901fe91de1aedb6842533c98a9b2cfe2a989d6f0a3dc76cb113989c84acae934150f599173af186b7886661ba94a549dedd3508b3cf5 SHA512 6fc381005c055aff7e451145bd2dd5a20591481b416d2d94c1c05ddcfac84c76e3915046d86073f3ace97ddb38eeb6e8a925825ca4629f1687b7f274809d9c83
 DIST github.com-kballard-go-shellquote-cd60e84ee657ff3dc51de0b4f55dd299a3e136f2.tar.gz 4205 BLAKE2B c9df02705dff0d28cfdb4bd8cd4e5e74b490bd15c5b9d28138f7f4f4abc085f7dc59b34227adbe7d25874c8928a96b0f19cfebffbc79068d314eaf90d87cd4fa SHA512 d738d2bce5abac7c3246f20f52ff069f43cd6b4e43e3e03c245688342d178f8bb2ae6923f9dca2d191458fd46356d17c3e065d09c1918541d27544ac2f046f8f
 DIST github.com-kr-pretty-v0.1.0.tar.gz 8550 BLAKE2B 210bbedee436b225b678ccbc363a2feb09b6903bf459e34d0d6950333dc273db5713a828b003ad0b52da0718de38aa3665ff7be6c99b865a7766998e37e55fb9 SHA512 7a367c317043d40cfbf7fac631a286c0bbb8b45a716fe7388d6271431e354b3913505398b8ccf7ffbb01abf71f04216738936a4282c3c9645e26c51b7692e820
@@ -64,21 +67,26 @@ DIST github.com-lucas-clemente-quic-go-v0.12.1.tar.gz 351956 BLAKE2B 72a30439c71
 DIST github.com-marten-seemann-qtls-v0.3.2.tar.gz 392129 BLAKE2B 98f3f08bc2730df42dea5a91567ea284d6f37fb962eac62217c805aa478c0bfce083c8b3690fef392183cb33d9fb47940f12256d423a0bc8337682a647afe704 SHA512 f28e0be6a91e08d7cc325181fc0dc862204d2852a5c8cf269a28f6ae6115a92686cd0e1796d935a346bdffe46b604fa8ec4910f4f170a9f4bd39251b9d963004
 DIST github.com-maruel-panicparse-v1.3.0.tar.gz 1174190 BLAKE2B 5b2926ff65e32914409f3b6d8c39b2ecfb84636ea8aa5d1533e58f1091b16ad7d7e7ae546792ec8704f596911ce8c63de55622d885ad553a6b803183c8c404be SHA512 74e7b5cdc6dde46cfefc55097728864cc3fd1c76ded1c660eea87efca30167b2ac88dc573061142f32236f4df3a42d39c82ac9d24c02824f1f0655b6d681b037
 DIST github.com-mattn-go-isatty-v0.0.10.tar.gz 4465 BLAKE2B 7da424fd365096386e752780fcda8403a93754bb030c564f5d6df705b931d8385b00d8226155370ed5ebff86c700e9aa2b2bab33fe72a1fd3f6a91c36124dc1a SHA512 76545b77aaa04effd15d2ffb450c19b9a4091f65833323fb7138d6a2dbcc37197a66a8782aeafdd54ed9171e07a0e5c0160d39cdeb2d067182fb4d7e339c8c95
+DIST github.com-mattn-go-isatty-v0.0.11.tar.gz 4396 BLAKE2B 302970e6579f3ba108c6366c5b2fa024f565416cee4ef08fd6c0e0699dd69dd328b5e393c7e5d726aa832609beb8328360970e940cf653848a5a9eac6cf5ccd1 SHA512 09d4098f6770aba747b977c0406fb0fe8424b3d10da716d16013a3088e25d86726430cab2957b411507a60400c38cfc3d8b0161db0a7245c14368edca12fe1a8
 DIST github.com-mattn-go-isatty-v0.0.7.tar.gz 3559 BLAKE2B 1f65f3d33cf25459b63fb70912810dd094e3fc6f3f94db293539d4c95e22e495bc93e7d676d161e15f5a8ca6afe082d17dd5173a931382e66ce2cefcc44a59ef SHA512 f067811fd5483c8f49770132f42156e78256843672891448d725c9dbdd25ecaa941802e5e9d08ca9c20ae23a553e51a4653e8205f48f7cc979e5be0b4646f13e
 DIST github.com-mattn-go-isatty-v0.0.9.tar.gz 3904 BLAKE2B 20178fb090805cf70ab6f98af75d4df4a049ba7a44f9023378e947e717952b985e64d640594edf8ddd63b9217f847a02f81a29e8b138159ceb2f2e3801e71d08 SHA512 3044e4fcd5cb76014b905f2c50838ee8cda6b1c865955a8504566b164cd851317e9ad69404d0125d6317be2a269584d7f72de551e4363c9c05a1b8068fa2dac3
 DIST github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz 37184 BLAKE2B 9ad023f9b70938f45e6dd44624a7008c1895e488e63124bcd8f8492292ef98479e966ed627a62de32e0fe84a57e60710227e02e4a276aabece81f021af9408a5 SHA512 63d9963502e967e47253f638a19dfbeaa2b63efab74ed790539ceaa9b4a0b695aa107f9e0c920c0da547ac1abe81af22d47f6de547c500deeb005fd8a5e22660
 DIST github.com-minio-sha256-simd-cc1980cb03383b1d46f518232672584432d7532d.tar.gz 64704 BLAKE2B 6838142d5f7b3496e9a28cb829ae54a08fafcb022f46b6eeab462d851428d2040a1941b2b8532340f35597afd311e6904bf2b0e126441e48d8db48ee6c6b6ae9 SHA512 2d8307280540919af2154d551b2b76b0ea929770d18af0266440e05e39d0f16469b6b98db739f022eb579d8f40bccd67dd5f66bed9575f304e863bd07a5e6e97
 DIST github.com-minio-sha256-simd-v0.1.0.tar.gz 65406 BLAKE2B 7d3306d90e7017cce8f1af0aeefae8fdb63f03029db2098470290a44057c5f090d27b614c3797e54c2c891d56f6e1f96b383c519eda62d6be63054def13bcfb8 SHA512 6196a2e271169fab8c38934f535c4c77eb8526fd60d52bf99021eea3bfa79e739d8be11f20de6ea2ff4db2851b377c568a39ca9cd9d77f97f127876570ffb95c
+DIST github.com-minio-sha256-simd-v0.1.1.tar.gz 65024 BLAKE2B 850d147f9f5716a1d46817cf06930efa65e87f50e9ad26651f1e7d245460a610a24a3787aa11abd005da10b4ae34c147f94cde558ce9d73b6d0898dd67868b83 SHA512 aac672fae1605a7c3bc3661949e406a3b47b0f3f4b01ca7b4feac42e91df28740d64ad1d13c8eb22444ec743217966f86247866d1bfe886bdaf47e16b64dce18
 DIST github.com-onsi-ginkgo-6c46eb8334b30dc55b42f1a1c725d5ce97375390.tar.gz 127951 BLAKE2B b8b981f2c98bfaecd4e65db1a97f00190c8935da866f5b7cb77a0c437063dab8cb94fb19eb77ec6bff9b361d91aa772945cc51dbafabc7870268326b0e458da0 SHA512 f6e99db70c540a08e064358c0034e8978f2cb7d2c27be439f3a90d0fd0c741ade9a15a30c837da71ee1c8df6b80b124799f4820ca25b71994d7e8de207ba4eb2
 DIST github.com-onsi-ginkgo-v1.9.0.tar.gz 134036 BLAKE2B 9343e0affd2529f9063c5c8a7d75e5077865f1f0d12f1e1d10be47a13732e13d1412b5a021dfb78e32e18e14fad8496c52f4e543ead173d4570056358b9c5c06 SHA512 9a46809cbec75a6f6353866370af19ac65df9dd5224ed35df0711e59842c45cc7d62124ceeaf8a1afe7ba85812c5d85cfa186036c58cea0c5e207ea219567ae9
 DIST github.com-onsi-gomega-ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64.tar.gz 81608 BLAKE2B 78522352a6774340d5de89545ec8189102bfdf002e6e2d637c3e4aa6a6b270f4cac7d999bebc5c0741ecf6d2580bf34f5983dab173ec5d8ba04a722475c1fda1 SHA512 7f8ec51545f322537b50173338a3ecc04eb4214d1536395ae08ef41e3353b9455ffcfa7c0c69717e8e4bf316bec4d17e37ee1d1f604da38abec46afe5c7d76e6
 DIST github.com-onsi-gomega-v1.6.0.tar.gz 90096 BLAKE2B 303bfded9fa9fc631e1a048c1a27c6cc019944fdb6478e307ed976d7acee17f00d6b562c85097fc6656bd5a4c68b7a10f2bc3f8e8a314fbc97d0ceb6d3d3e74c SHA512 7f1f8c8cf684eb3c62dc05341bdd722b594019d275fcf5a06e00c335ed2832240915880a99ee981693e278ace98fd224d60c5d45d6bd99ec546603358b46dbec
 DIST github.com-oschwald-geoip2-golang-v1.3.0.tar.gz 6595 BLAKE2B 4d6eb86ef10e97284de0ac9326ffa348e421f034fdbb85565f93ddb774546197a196270bc65a1ec32bd8c99684cd39a31a5f4e806886bc79860f2c9c07b66bdc SHA512 841a716429fb01775e72d1398c3780294257be606b568524631a076ad22cd1330a11aa70b4f7c8b4bedccd22432613919b9cadf3bd4c4b34c097e1b123834209
+DIST github.com-oschwald-geoip2-golang-v1.4.0.tar.gz 7742 BLAKE2B 17eb2041a39759f19d2da9050618fa8a4fac9264b927e75a2201f452935e46de0d65e2e7b98d0adb25aca1ca523e7f8cb143c3dfaaf6cbb377b71b1b0614d924 SHA512 2bd998c4cacfe64c83851a8db053188ff6f0fe2d583946173e02eef237f483379b864a1fcda59f8cf7d74befafc796fbe9e4b2c1879299302eaab077b659dc8d
 DIST github.com-oschwald-maxminddb-golang-26fe5ace1c706491c2936119e1dc69c1a9c04d7f.tar.gz 17818 BLAKE2B ce68d48e238a674f492b2cbe63d9c74f2a839d3cbb744df8442f4bdd7d5705f0a5d4f2114bd4faa431c76c05331d67edd090db658ccb5546a266e40386d9ccbb SHA512 41c37ab97728b1d1a3e30dac22f29846cad487dff7e8211d2225f1d1b70a05849680dbce79134d5f9685a46f5db51c23a2b11744fea237a79ccefd90bc840c92
 DIST github.com-oschwald-maxminddb-golang-v1.4.0.tar.gz 19912 BLAKE2B 8271c066b8c2e889d9a427d193c410bcec97c90db8feb571d292f6c1ef0b1723b24fb2ca8dfa2fe509614b98accce0e1d599538757c6ed2d9b39c809ff2c831a SHA512 354abf2cacb4ec67300cc000c4ba01c9ee36e2c2070963b9cee298dfc45bb4cda1f634524027c3df61349357b9d438723e0815c521eec2e055f18bc9e75af612
+DIST github.com-oschwald-maxminddb-golang-v1.6.0.tar.gz 21367 BLAKE2B a1437c7cc998695ee0643ccba2f3badf4a4e1a6e9d998ce66121e6901e4052190a08fc3299c95ca3143d7f718152756772d92550cebde076a17181f38c87d764 SHA512 7134d5feed35e3f73e44eee8bf844750539bf3b80c1d403a1f6e692af0c09e14f042bb7b3aad2b807be6e74a636c3f183de1a2d566eaf9ed0bba6c3e5f8f8dbc
 DIST github.com-petermattis-goid-3db12ebb2a599ba4a96bea1c17b61c2f78a40e02.tar.gz 6598 BLAKE2B 39b08b8bbf3525bb16279beec310dbcb9756960d3475f75866a483aa30e5ce4189dbf1d7324b02e284c4abf40543a15d3272630f8bfc55bb8c36d07e03e1806c SHA512 60c161fa5c1e1f21c8ed1568aeadf9bcc3744bf52b4ff51124095d436b1c5b665b18d9b151bcb1fef98cccf48b420d8135a8df1c40cee88a4bdbd37980c44b54
 DIST github.com-petermattis-goid-b0b1615b78e5.tar.gz 6816 BLAKE2B 11ac50a4a9c618d136c918a1041651355b6374e78f3269711c40c35d33ec6d388a8eaaf3700e964487bc738b9141f777f7102eda1cbae5bdd735071d03954d15 SHA512 52068f22edbc627623002a09979c0762aaf6d96c2a0cb248d47945a364e117df40a35d9937e3e98b8d47f109df5edcac470f963eec0117bc1c515419d72e393d
 DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
+DIST github.com-pkg-errors-v0.9.0.tar.gz 13947 BLAKE2B 56b2ce55c9b05e3614112f2b8fe5f9b463dca7ea045c475f63c12e70f2a81f66c2d3117027fa6fb9781d99aa037856dffd78d15f876a76c564df82185897f842 SHA512 79a7513faf957e43aa36b32d9b881c3ef4815e9f88f2108a019ad0388fe24e7f71872af781f4dd6d34104554815188b5c38b0244dc3077168a0a683a597a2ac2
 DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
 DIST github.com-prometheus-client_golang-v0.9.2.tar.gz 130109 BLAKE2B 01368039e66033ef4a7266672f648724138710748b5e0472a615bc7e7a66a244ee6ed2a51ff1524de6f5865cdbdc03e603f8b1a9b2f9c27a4fe7fc595794c7bb SHA512 b42c3fbbdde9de732f8ea999e571be862dc022c5f87a2802b65141c745fc2182a4ab5edadf58ea75cd40f03fcd1f2ad46bd2c1bd65fe56cdcb2950a6455ee355
 DIST github.com-prometheus-client_golang-v1.1.0.tar.gz 140006 BLAKE2B 39c57a3e8e0dc41ab84b9c6e0fd53ed169da6126c2f39bd6298d80aef9043e39a785e26f075becdeefd337521d0376efbe89eee39a9e2fb8775804e9136fa822 SHA512 21f0ab86dafce3f02cadb7cdfcd7fdf50a67c5a8c0eccb24392a0ee64bac0288988ea491525c80628891b98a67715624a84033a754fe783c0966c579efac190f
@@ -93,22 +101,28 @@ DIST github.com-prometheus-procfs-v0.0.4.tar.gz 108252 BLAKE2B 5ea5fa4b57595584a
 DIST github.com-prometheus-procfs-v0.0.5.tar.gz 112152 BLAKE2B d989dc38ab9e4b056884eedc61411d34ecbaa109d270820ce2bcac1abd40dc1c730071a0cc5bd1fd93191134a26f8475d682a17d517bac69e4ee37a93bf07a28 SHA512 35f29e69c4782f882d8f68ac448c6c7e2aceb93319d44a07c5ffbbcd61051e3ab1355e5191ccbd217146403492d33f8f35eb61e44c73dcbf1700b5cd72aa635b
 DIST github.com-rcrowley-go-metrics-cac0b30c2563.tar.gz 37566 BLAKE2B 210728e887a9c45a6ee278f444a93aafbb28653f8551fe96e51c38da01c533a2ea56a7c71d731008fd879014f15b4828ad37b89ac6f2340e9e11499e33687a78 SHA512 c042058531ef3283fde66c0d49e0dfeba414ae8f1db61d20c8c72c8de0c021d52417f8c252fdd25019df5f267d7dce400fd81546de204d99b2e556bbeabbc6df
 DIST github.com-rcrowley-go-metrics-e181e095bae94582363434144c61a9653aff6e50.tar.gz 35594 BLAKE2B a41d55f6d88310214bd1764a51900f6beb277b44ef0da900231c45113777db6af1a5f1055a5909cd0247c02b453be01ccac47858e7751eb676199077c5840aad SHA512 efd184873803e50379dc27f85a8aee6fa185d070501a4f4d80745ffa6df5c02d6023753a3affc56569d85ac328031bf4c2e0dfe7d9302e5249aeac59754d1fbb
+DIST github.com-russross-blackfriday-v2.0.1.tar.gz 79613 BLAKE2B fb48381501283f535bfd5e04d4db3fd81ab2780f91451f1188c40a5737145489ed1446dfd2dc1f4e6cc4bc690facf4d8237fb8cea6d958361dcd245e5aecb7af SHA512 b5c889480bd6a5e8a805bb5685ee91a07b5d1831fce65c27518fab5a2aeee2ed3e356b536b65021c092b588ae105f169cbd57fba8d16374173b04b9e9476c9aa
 DIST github.com-sasha-s-go-deadlock-v0.2.0.tar.gz 9957 BLAKE2B 764bcf1ac0f018253b91b475e03ebca0edfcde4eb526c473df3a245a5397a742db678a70a767a452d6ecac25961059d9f304e21bc623807f6f6c9f6d9f504b69 SHA512 114461313768b79966669817b3a12502fa787e7dad288deda1440825605c962959da89c9106fd179cbe4f603a5c4f7f87c491f29def80936d7fa6eba7a1a1cc3
 DIST github.com-shirou-gopsutil-47ef3260b6bf.tar.gz 129842 BLAKE2B c36ce4de493a866b035038fe604c1f878a5c16ac435fc88484edde4dc36c02a9e3ff2b96046e381829938c3590b5f5a27231c42c0c7a4bfceb214e9d30d4c066 SHA512 a752ad06f7ace7780e2c98465493324b7e9d24fb70b09f9d1a4398c07acce7c8db39366745ec2776037e8aecae9b951bbe6e6f860de4f1b9f8b67a03faf51685
+DIST github.com-shurcooL-sanitized_anchor_name-v1.0.0.tar.gz 2143 BLAKE2B 5f833b40808210b1b487985c9598dca0bf22b531c7a9d863cbdbd3d0483ccf8b35fc4d65b48b3de8b8d548e515a306a84af0c8dbb140677b191c839f751d68b4 SHA512 2b83e4f537a9290c0ba92bc1b8f7f5bddba8eb973e41db1eb5c13df35f7d75746f705fa0e1fd1794cf2442799e94609479e4a2b2c7c4cbcedba67259a0068db9
 DIST github.com-stretchr-testify-v1.2.2.tar.gz 101698 BLAKE2B 8280ff92a5005f9862ebfb80c6904b61105315189b6f56f087ba891dba47eaa5789a055e63c602b355c6c0c6ad68eefe3c26de9f1fac7a6dc44f9715bbbd86f8 SHA512 d925fe6c118f212868967cf1985aa70ca460bf4e3486d58be689e05ff6368485b42cc9a4ae1d5ce40eed38be45678b11d399a26000ce35d6e5ad218fc7d022ed
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 DIST github.com-syncthing-notify-4e389ea6c0d84e6195eb585ffaf62c8c143306ae.tar.gz 57108 BLAKE2B a0bdc8393e17823b0b1df0c5e0b2e39b499486e6f00472cd273409b361d9bac4c3cbcdf4e0c95c8933d5a9e313aca6121486d747b785002cd504ddcc36847abe SHA512 55988ceecb308c896c8a5126bafa5651e4ac2b3b265dc7a2dba0820a59bb6505260d1fe422480785943ca877a589e52a16320e6c52991d50b5c2c522a88562b8
 DIST github.com-syncthing-notify-69c7a957d3e2.tar.gz 57113 BLAKE2B 42a861aa4b4faf69bd3840d0ac6d92281d9fb184a0f91f1ba6a3621f714965b3c4707164a04bbaf1c89f8ca6b9e66b0fed3b2c55c86d8825ed93781a49252103 SHA512 2607daae1df1b9f5d1f1fac4d84180444c6c1a590bbf9e768a71af76114263ba7365c0d8f7a43e7e4f0ab872f09094685f872b3e0d5ff4ba54cd97ad9d4ea3a1
 DIST github.com-syndtr-goleveldb-34011bf325bce385408353a30b101fe5e923eb6e.tar.gz 137733 BLAKE2B 42f9979a3f062b6cb86512ab8ddb88c3a1c9922203eccf9631c6387b8caa4c9ab88de4b9e34f24b053e68d9a85bacdbeecdd01aa7857a0ce4c92335de160c471 SHA512 e15f055d967534432569a8b1a265c09ec82f49b284706c063c708cdc4321abd1a5af7c5f7f2d34bbe8b77a08f14103361869ae2ab74abcebe7157988d9a7e1fa
+DIST github.com-syndtr-goleveldb-758128399b1d.tar.gz 148624 BLAKE2B dc19df2b66de5f03e5ddc8f9e07cc7a3a83e69df21c4f072f481db8873cf5524607cf1f1f95bc5121cd94892c078227a8caee61b35fb1955f8ddc818cf310406 SHA512 204706f31955eda14214a87910eb5cefa2408b6a63338c439bbd7d3eef7e768380f1b51df4ba8392cdc7b2d13bc34942f7e5410ea760dc4f42dc039b91a62080
 DIST github.com-syndtr-goleveldb-c3a204f8e965.tar.gz 147696 BLAKE2B 22156bca1e2056f512defe2ec5d52a3e2c0e834c5e347bfc3ae64af3e97153d25aef02db7ac72c3d7db8d5d5bee7716a2c1e4f22b70b3a7ad52ce6c99999578a SHA512 8a0639bee268989fa8b5d76b3795849b4f104c05e11baff441b3b213016e622586a673a6484c2a463fecea78c2e7306510d51e08d1726cd1bf6bf929f25c8530
 DIST github.com-thejerf-suture-v3.0.2.tar.gz 18047 BLAKE2B 6b6915ca6db2a8b8e8ae5f34150b862d16b2b82227c25022e7b5f258849c340d57d345a1b8cb87fc14ea7eb36b72025a55b2844270c01830e68bb2177b5dd82f SHA512 08780cdcd8d2a86fe1c42f80a0b7c05ab1aee2a1aef4caef462111bad65a28dbfac2c05f7339de80b698f7b22609f19b52588ecf4d4ea0e971e0d57c55da78e4
 DIST github.com-urfave-cli-v1.20.0.tar.gz 58397 BLAKE2B 0f623bff26139e57f29a2939c70ad8ba0c8daaf3721cc6f4d061fc88209102b1ece790dc0772f5fad66649f1129836482feee20def3dc0d63e728020664016ec SHA512 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5
 DIST github.com-urfave-cli-v1.21.0.tar.gz 68419 BLAKE2B 4fe7091cfe3dd58d1c73d7ade84c70efbfeda354f8dfeb1cf7572b8792ed15c14432b4815107aae900a7d45e08a81dd261c97edac1a94a2e9557c3e595824e20 SHA512 8bd1dc64220eb5388da99a9d98971097b7e64dc054cdaff54c86fd427667962aa8add7edaeb045d17515bb15df885c369f939a5d374e8bcc010c7f0fdd554763
+DIST github.com-urfave-cli-v1.22.2.tar.gz 76132 BLAKE2B 983e24389f664405f5d457ca41f025a422c951a99a22b45ce222ea233acc976035d3fbd6757d7bf8ae7b4fd579d9540de83500ce8916247c5884b1f435a48efc SHA512 68008c7187f95747d3fa931613174536fb5e0b72a84e5561820fc8f9f44c1fb867d471ac9972648973d801046b14a7dde0e24c5bc9cb87cca8785f9eb0edfef7
 DIST github.com-vitrun-qart-bf64b92db6b05651d6c25a3dabf2d543b360c0aa.tar.gz 23973 BLAKE2B e272dc6a3f433d0b1479438a251561071e32a25f83784350f25cbbc0022ee1b23da4cac21e2eba76326ffd2838e93edbba816e593ab2bb3b703fd2c1ae65f15d SHA512 cc7ae47017191bd71136796334dd77b9f90e2564d348fa2c03086b593fb73f07cbd5ffe48f3d43ea2f7f32b64ed10f3a095013b27ee6afc25d08eb60f99d72a1
 DIST syncthing-1.1.4.tar.gz 4700261 BLAKE2B bf766d7d3701ac66d0d4ac266d9b4a9f02b2f97a6fa320b192f3e46fbe9055091ea5ae71bf405ccce4a9665efdf41477098af3b98562ea06bf0c4f828653bd51 SHA512 cb57cdf6bbab0147a700f72e800cddff0855835280a176883089e5e1dc06352e0dacf615569a35b16f98a857651f534c915f369c46bb592d416d7a01efe5b5ba
 DIST syncthing-1.3.1.tar.gz 4753853 BLAKE2B b0e4a3b435ba08718203b7009586f5c360dbeac110fc2a9755ac5202bc689c634fb0e31c861e16f401326ec7e99aa2fecb671943e5da27202173f6d70616bafa SHA512 a5f5de85d719379c6d312fa1051d6a0761e3ed73014c8e5b95b26bb0ab264a48f114d210a46f0e990b0535494873a5997284a6acaa0337d1f082bbcd847ab664
 DIST syncthing-1.3.2.tar.gz 4760240 BLAKE2B d24dbf55c404bf14a90df2e250f58dbbf9724abf0f661642513b2b22402fe8202e63465d9cf48cfe55c55de0eb914a10006149692dd9230a969c399e4c0ae714 SHA512 e718cba9a727d086894270fe0e91b1a03d2fde14c0c0b19d8fe6e82b6c9d9f493adf5371d5e38e00eda131a77d4392f8dc3f4d32761eba24102373e7a8f51b5d
+DIST syncthing-1.3.4.tar.gz 4785353 BLAKE2B 01ea21d207fd8d84d28b03125f6c3b2071a458b7e2fd611d31ae3b24e0eb38e9b28afed7b2b15272a362394e3b6d77e3385e74b97afe021915211cc394422b5b SHA512 1584e0856a7c559d4e809b171c6c7aa0cd01ca94a513607bc3ce6543a82ecb454647c990dfed221cf9d3d566b6c5b522f3fc3549aefbb0487111ecf54366f8b8
 EBUILD syncthing-1.1.4.ebuild 5974 BLAKE2B 2115e3d26f93044b48cc361b0b65be68ba9624a24fc14e6c7272ecd675d02ce99bbf6cf978a9e7d806bb5b504edeae5ed1f8843e7cb21ceab03a65a4b66aa2f9 SHA512 d5feaccbca635da35adf513f98dcc2a12cdb94279c9befd1d98acfa81372e7f9ddada2acf93050e4e6c1eab1fda087c10502c7cefd4eda25fd12273e99f5e59e
 EBUILD syncthing-1.3.1.ebuild 5627 BLAKE2B f36fb0b8d92ec5bc448ed96123b414ff27820e2a5f2b11dd3d6476b31ade267918be27896aee576115bff52941e6794e639e18172eaecfca530f1d1ba61f1693 SHA512 049ce757f54a1786fac4758ea108471ba49218d45f9d7900c460d4c6041a2f7abd15c0a66c29ca9ef2a180e9397a5f970a5bfda9a8af427315e3f5b765c34ee8
 EBUILD syncthing-1.3.2.ebuild 5325 BLAKE2B 066e0ca1956f3325f73b7ef041d0bc3d6dc246819e5b206f92cd9202f5934bac14c958cd1bb5605466880213224df4f9b7b9e28b59c659d2666ebf4f23afdd7d SHA512 5cb31bdaca335412986ec89ee6bdc04bd4754c0af6ed9f6dfc02f13a63b7e7c9ddf186201d684191eb7f1b4bdd229ce97c72b0f7e16e5127656531e0a29f1f12
+EBUILD syncthing-1.3.4.ebuild 5131 BLAKE2B 0407a94891fdabac6ff906990d2de3ab1e03ebe494aa80b8cc1afcb03cd53bd4eeb15329eb17610c647a8ddbbcc603bf294890a29ec8a6e4463753f01e3d2086 SHA512 9f413d465a307e850fdb50ac5031278596dcd1b4f395916292810f330da6e2f14aafe470f8f5129c438b43b356b4a79d4c4cb6932e300a8956b83024c6a108f4
 MISC metadata.xml 869 BLAKE2B e59a433fd94dda05e06eca9017cf4f35aa4d9897adcc76d5dc503d5ae90e90bf5c23b859c4b7abe9af86cd7f327dad99a7a1a095015330a105debeb1a428052c SHA512 f58ce3a33241a316a81ba94318cd8fa1ea8a9954cd3721ae6f78f96df08b38a6ee5ea214483dc92aa4301a2252bc712a65c196da4c871962d76d17d5ba2b7238
diff --git a/net-p2p/syncthing/syncthing-1.3.4.ebuild b/net-p2p/syncthing/syncthing-1.3.4.ebuild
new file mode 100644
index 000000000000..fa26ff21ccfa
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-1.3.4.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/AudriusButkevicius/pfilter 0.0.5"
+	"github.com/AudriusButkevicius/recli v0.0.5"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/bkaradzic/go-lz4 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a"
+	"github.com/calmh/xdr v1.1.0"
+	"github.com/ccding/go-stun be486d185f3d"
+	"github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash"
+	"github.com/certifi/gocertifi a5e0173ced67"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/chmduquesne/rollinghash a60f8e7142b536ea61bb5d84014171189eeaaa81"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0 github.com/cpuguy83/go-md2man"
+	"github.com/d4l3k/messagediff v1.2.1"
+	"github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff"
+	"github.com/getsentry/raven-go v0.2.0"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/golang/groupcache 869f871628b6"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/jackpal/gateway v1.0.5"
+	"github.com/jackpal/go-nat-pmp v1.0.2"
+	"github.com/kballard/go-shellquote 95032a82bc51"
+	"github.com/lib/pq v1.2.0"
+	"github.com/lucas-clemente/quic-go v0.12.1"
+	"github.com/marten-seemann/qtls v0.3.2"
+	"github.com/maruel/panicparse v1.3.0"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/minio/sha256-simd v0.1.1"
+	"github.com/oschwald/geoip2-golang v1.4.0"
+	"github.com/oschwald/maxminddb-golang v1.6.0"
+	"github.com/petermattis/goid b0b1615b78e5"
+	"github.com/pkg/errors v0.9.0"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_model 14fe0d1b01d4"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/rcrowley/go-metrics cac0b30c2563"
+	"github.com/russross/blackfriday/v2 v2.0.1 github.com/russross/blackfriday"
+	"github.com/sasha-s/go-deadlock v0.2.0"
+	"github.com/shirou/gopsutil 47ef3260b6bf"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/syncthing/notify 69c7a957d3e2"
+	"github.com/syndtr/goleveldb 758128399b1d"
+	"github.com/thejerf/suture v3.0.2"
+	"github.com/urfave/cli v1.22.2"
+	"github.com/vitrun/qart bf64b92db6b05651d6c25a3dabf2d543b360c0aa"
+	"golang.org/x/crypto 9756ffdc2472 github.com/golang/crypto"
+	"golang.org/x/net ba9fcec4b297 github.com/golang/net"
+	"golang.org/x/sys c709ea063b76 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 9d24e82272b4 github.com/golang/time"
+	"gopkg.in/asn1-ber.v1 v1.2 github.com/go-asn1-ber/asn1-ber"
+	"gopkg.in/ldap.v2 v2.5.1 github.com/go-ldap/ldap"
+)
+
+inherit go-module systemd xdg-utils
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="selinux tools"
+
+RDEPEND="acct-group/syncthing
+	acct-user/syncthing
+	tools? ( acct-group/stdiscosrv
+		acct-group/strelaysrv
+		acct-user/stdiscosrv
+		acct-user/strelaysrv )
+	selinux? ( sec-policy/selinux-syncthing )"
+
+DOCS=( README.md AUTHORS CONTRIBUTING.md )
+
+src_prepare() {
+	# Bug #679280
+	xdg_environment_reset
+
+	default
+	sed -i \
+		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
+		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
+		|| die
+
+	# As of 1.3.2, stupgrades still fails to compile. This command was not present
+	# in releases older than 1.3.0, is not compiled in by default (USE=tools
+	# must be set) an in any case we do not really need this, therefore just
+	# get rid of the offending code until upstream has fixed it.
+	rm -rf cmd/stupgrades
+}
+
+src_compile() {
+	go run build.go -version "v${PV}" -no-upgrade install \
+		$(usex tools "all" "") || die "build failed"
+}
+
+src_test() {
+	go run build.go test || die "test failed"
+}
+
+src_install() {
+	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
+
+	# openrc and systemd service files
+	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
+	systemd_douserunit 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 "${FILESDIR}/stdiscosrv.service"
+		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
+		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
+
+		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
+		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
+		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
+		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
+	fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index d2fa90df2277..48c547ac1edc 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index c6def4a9d2dc..21ae2252d67b 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,7 +2,7 @@ DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742
 DIST hplip-3.18.12.tar.gz 24588202 BLAKE2B f2ffa6d0d54e467c03ccf9e74accb62ef69842001a00e8c4e6fd68b40c4daff5896fcdd69d37b5e50be2b837918058a5c9071615ab77c1ce83fffc546ff98c02 SHA512 7197cac325cf40c03f49053a98ee0e8ac6c670d142b2a64df09c0f7afa1d7d3602216c55c825ccbf20a1fbda9c9289173b8708e9f87171a862dae5b6b4ef7635
 DIST hplip-3.19.11.tar.gz 25632761 BLAKE2B d189fe4d4d25e7abfba216213aa8ba55410840e00731842080cc94d30c86a56a5a10de55964e63a7ed25e5206089a16cbcc85be632ed31d9f80f0a5a1447f3ca SHA512 f419de0e18937c93c2727f4d8b4f7bf1fcc24961a6b7a0d043ce8341c65d0c0332cd354c0cd907b85bc6ccc7735d23ba5f2c918dba5bf965540291cfcbe032d5
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
-EBUILD hplip-3.18.12.ebuild 7734 BLAKE2B dccbc7bcd82ff20d642f3e2b8568e66fc5ea3d8e7da50d69258a6d771108cad45b9a3fdaf76135b24240cf2de050f518978f4f44afe48ad3dfcdf5b4fb87f415 SHA512 571613e00badf06ba120e77bc032d459b8d10a6d1ac753c492fdf302a21096d317138aca9fba063afb4f12b1f2f31bead39428bc64e1bee0a5a2b23d724cd839
-EBUILD hplip-3.19.11.ebuild 7746 BLAKE2B c16e71ccdbf717d7225ed8e48a84b281f6a54455fc020bd6d5794a57761cd0f11c81c28cfc55e014837b978418e15a8982d36d3ad7a5e9196421d8ac9ea0fa22 SHA512 5e65236c53ab65629fc020b36507378bb7258476609aae2e4ad2ea6d682209f075dc5675b538573e88a2dd7cd5b9f7e4c02a5438e62a5bf4873de4916999eed2
-EBUILD hplip-3.19.12.ebuild 7746 BLAKE2B c16e71ccdbf717d7225ed8e48a84b281f6a54455fc020bd6d5794a57761cd0f11c81c28cfc55e014837b978418e15a8982d36d3ad7a5e9196421d8ac9ea0fa22 SHA512 5e65236c53ab65629fc020b36507378bb7258476609aae2e4ad2ea6d682209f075dc5675b538573e88a2dd7cd5b9f7e4c02a5438e62a5bf4873de4916999eed2
+EBUILD hplip-3.18.12-r1.ebuild 7820 BLAKE2B a023d2f2e7e7b5aee6eb82c7c0e1615181835201030699e80195eb161b007146eb3a97ca7546836d0e86c72781b42821503b87a17d7d85b2d9c128c2e60f83fc SHA512 b0f54c778e56daa20b79604edb1c3fcb04bf1ee90bc71bcf0cbf4683f8be29782057aae3de7d9c803ab022964e2569aff32c0db3e9cff1a5cc5d353c5fad2ff8
+EBUILD hplip-3.19.11.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415
+EBUILD hplip-3.19.12-r1.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.18.12-r1.ebuild b/net-print/hplip/hplip-3.18.12-r1.ebuild
new file mode 100644
index 000000000000..35552963b9db
--- /dev/null
+++ b/net-print/hplip/hplip-3.18.12-r1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="threads,xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				X? (
+					|| (
+						kde? ( kde-misc/skanlite )
+						media-gfx/xsane
+						media-gfx/sane-frontends
+					)
+				)
+			)
+		')
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/hplip/hplip-3.18.12.ebuild b/net-print/hplip/hplip-3.18.12.ebuild
deleted file mode 100644
index b28c7ba4201f..000000000000
--- a/net-print/hplip/hplip-3.18.12.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads,xml"
-
-# 14 and 15 spit out a lot of warnings about subdirs
-WANT_AUTOMAKE="1.13"
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-
-IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-COMMON_DEPEND="
-	net-print/cups
-	virtual/jpeg:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!minimal? (
-		${PYTHON_DEPS}
-		sys-apps/dbus
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? ( media-gfx/sane-backends )
-		snmp? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-			net-analyzer/net-snmp
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
-		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
-		kernel_linux? ( virtual/udev )
-		qt5? (
-			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
-			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
-		)
-		scanner? (
-			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
-			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
-			X? (
-				|| (
-					kde? ( kde-misc/skanlite )
-					media-gfx/xsane
-					media-gfx/sane-frontends
-				)
-			)
-		)
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-
-Any user who wants to print must be in the lp group.
-"
-
-pkg_setup() {
-	use !minimal && python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_fix_shebang .
-	fi
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		--enable-hpps-install \
-		--disable-class-driver \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable !minimal gui-build) \
-		$(use_enable !minimal dbus-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit) \
-		$(use_enable qt5) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_optimize "${ED}"/usr/share/hplip
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-print/hplip/hplip-3.19.11.ebuild b/net-print/hplip/hplip-3.19.11.ebuild
index 83e3e5a46112..49cad9be3506 100644
--- a/net-print/hplip/hplip-3.19.11.ebuild
+++ b/net-print/hplip/hplip-3.19.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="threads(+),xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
@@ -49,26 +49,28 @@ RDEPEND="
 	${COMMON_DEPEND}
 	app-text/ghostscript-gpl
 	!minimal? (
-		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
-		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
 		kernel_linux? ( virtual/udev )
-		qt5? (
-			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
-			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
-		)
-		scanner? (
-			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
-			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
-			X? (
-				|| (
-					kde? ( kde-misc/skanlite )
-					media-gfx/xsane
-					media-gfx/sane-frontends
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				X? (
+					|| (
+						kde? ( kde-misc/skanlite )
+						media-gfx/xsane
+						media-gfx/sane-frontends
+					)
 				)
 			)
-		)
+		')
 	)
 	policykit? ( sys-auth/polkit )
 "
diff --git a/net-print/hplip/hplip-3.19.12-r1.ebuild b/net-print/hplip/hplip-3.19.12-r1.ebuild
new file mode 100644
index 000000000000..49cad9be3506
--- /dev/null
+++ b/net-print/hplip/hplip-3.19.12-r1.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="threads(+),xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( media-gfx/sane-backends )
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]' 'python2*')
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				X? (
+					|| (
+						kde? ( kde-misc/skanlite )
+						media-gfx/xsane
+						media-gfx/sane-frontends
+					)
+				)
+			)
+		')
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/hplip/hplip-3.19.12.ebuild b/net-print/hplip/hplip-3.19.12.ebuild
deleted file mode 100644
index 83e3e5a46112..000000000000
--- a/net-print/hplip/hplip-3.19.12.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+),xml"
-
-# 14 and 15 spit out a lot of warnings about subdirs
-WANT_AUTOMAKE="1.13"
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-COMMON_DEPEND="
-	net-print/cups
-	virtual/jpeg:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!minimal? (
-		${PYTHON_DEPS}
-		sys-apps/dbus
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? ( media-gfx/sane-backends )
-		snmp? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-			net-analyzer/net-snmp
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
-		fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
-		kernel_linux? ( virtual/udev )
-		qt5? (
-			>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
-			libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
-		)
-		scanner? (
-			>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
-			>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
-			X? (
-				|| (
-					kde? ( kde-misc/skanlite )
-					media-gfx/xsane
-					media-gfx/sane-frontends
-				)
-			)
-		)
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-
-Any user who wants to print must be in the lp group.
-"
-
-pkg_setup() {
-	use !minimal && python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_fix_shebang .
-	fi
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	if use libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		--enable-hpps-install \
-		--disable-class-driver \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable !minimal gui-build) \
-		$(use_enable !minimal dbus-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit) \
-		$(use_enable qt5) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_optimize "${ED}"/usr/share/hplip
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 079a89fa1480..4681f23abcd9 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/redsocks/Manifest b/net-proxy/redsocks/Manifest
index 02f0c6442aac..c3b182c37d09 100644
--- a/net-proxy/redsocks/Manifest
+++ b/net-proxy/redsocks/Manifest
@@ -1,7 +1,9 @@
 AUX redsocks.conf 350 BLAKE2B 52bf1cb52f94d7eb2ab151905fb8b66644868c9cfb72b1d73951b0442bb300062f5c7b7776f80d1c74733a3980f73aecbc75b1b7364c5dc0bccc9d324b5504d5 SHA512 c6ce0622a54fafef31f40ed01b210c5ffb9af0504303fc5d2a4fb335ac3617fc7832c16b0885471e6f1eea168a0e4aa490089a00fd28e26ce0f9b59db0ac238b
 AUX redsocks.init 1282 BLAKE2B 1efeb84d25630df8501b53d36f056a62733ab2f1c40a591d1c2b321224e3ed526fae1a0cbb4502c233c66b2c7c0541c0893311b749fb486176b978d79b10097b SHA512 81af76d7917273028cda3fa62e2c04ae27f763d93c6abac12c9b47877ae64918b4b07ed680fefb0e11ac3476c3f490f5e6d315ba8b0cf9a40b756cd32fc5234c
+AUX redsocks.init-r1 926 BLAKE2B b167e64335e45806c2791e72667f984f7b9ffb23d2be6c38bc4575d8487320eeb8ae270c0940fc4c198d7064323f3ba561c6954657fb4015a62f30d00ae06274 SHA512 c8c52571fd167d9ca6bb75e5b44741e87f5c57b6752b16026691a71a932cfa55ed43d186cd9d662997020faf370ce3e797ccc555e641149d5f5f8e43bb94901c
 AUX redsocks.service 437 BLAKE2B 919055f6cd25a605b3cff1ad63e69579975868952ef362ddf6f025404a0109e159af51854ef3d24663322f1515508b2dfe89b00bc53070a63d515b3bcd0858a8 SHA512 73d2b6df7d1688b2605ec56f1843de1b58a5e3d8e88267cd99aa774303f8184ff5c7756b4fdd7215e3ccba8637eb8e41dac121fbe0339730fa1e51943957ce27
 DIST redsocks-0.5.tar.gz 496403 BLAKE2B 7416340a7142669c72a8aeebc2c0775a393781de7fcbb63e4fbc71ce828658bc2b0615b394a990683c9fd13f41f050c92609dd956b4468bb06ec1ff261324c23 SHA512 678faca95b3570f793754abfe752b3d3580ea125aac8615ca2a1fce92cd50e7919832afe7cf5d1cc40b700045fca08f86ea1697d062ac8e7be706d166e69ff70
+EBUILD redsocks-0.5-r1.ebuild 1130 BLAKE2B 4f67d7a965df21a88953fb1150b702fffe6ec31c3512bd967a7cdac4abe063fc8242ba6df9a14eda38c7e8dcae11589c0a5ac2b9411b60f261782a5007a8501a SHA512 49a61fb4abf69bcf23fb34d95143052430d19a4a65dc469aafcd3354a5de7428fc07b9878b22acc89ce67d4d582cf19828ce6475995c077cfb2af71f1902a179
 EBUILD redsocks-0.5.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
 EBUILD redsocks-9999.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
 MISC metadata.xml 1060 BLAKE2B b7db194e1155a93ff22b6ca713a442ae08f21ae27f9835e0f3ec09ccf86d4f33fa2d4da20251c58acdbeeeaa6bef3fe95de7e22f67eae2acf28406f53e494569 SHA512 5b48446a0edf223af4775df8ebf02b71112cbda5494853e97c0dfaa7aaeecc2529af8c340ab36507c96eaaade07e6ac73bcf51d23acc4a5ddaaf69bbe093a321
diff --git a/net-proxy/redsocks/files/redsocks.init-r1 b/net-proxy/redsocks/files/redsocks.init-r1
new file mode 100644
index 000000000000..861054fc914a
--- /dev/null
+++ b/net-proxy/redsocks/files/redsocks.init-r1
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=${REDSOCKS_BINARY:=/usr/sbin/redsocks}
+: ${REDSOCKS_CONFIG:=/etc/redsocks.conf}
+pidfile=${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid}
+command_args="-p ${pidfile} -c ${REDSOCKS_CONFIG}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	use dns
+}
+
+checkconfig() {
+	if [ ! -f "${REDSOCKS_CONFIG}" ] ; then
+		eerror "No ${REDSOCKS_CONFIG} file exists!"
+		return 1
+	fi
+
+        "${command}" -t -c ${REDSOCKS_CONFIG} || return 1
+}
+
+start_pre() {
+        checkconfig || return 1
+}
+
+stop_pre() {
+        if [ "${RC_CMD}" = "restart" ] ; then
+                checkconfig || return 1
+        fi
+}
+
+reload() {
+        checkconfig || return 1
+
+        ebegin "Reloading ${SVCNAME}"
+        start-stop-daemon --signal HUP --pidfile "${pidfile}"
+        eend $?
+}
diff --git a/net-proxy/redsocks/redsocks-0.5-r1.ebuild b/net-proxy/redsocks/redsocks-0.5-r1.ebuild
new file mode 100644
index 000000000000..665f5a700021
--- /dev/null
+++ b/net-proxy/redsocks/redsocks-0.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
+fi
+
+inherit systemd toolchain-funcs user ${GIT_ECLASS}
+
+DESCRIPTION="Transparent redirector of any TCP connection to proxy"
+HOMEPAGE="http://darkk.net.ru/redsocks/"
+LICENSE="Apache-2.0 LGPL-2.1+ ZLIB"
+SLOT="0"
+IUSE="doc"
+RESTRICT="test"
+
+DEPEND="dev-libs/libevent:0="
+RDEPEND="${DEPEND}
+	net-firewall/iptables"
+
+[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
+
+pkg_setup() {
+	enewgroup redsocks
+	enewuser redsocks -1 -1 /run/redsocks redsocks
+}
+
+src_compile() {
+	CC="$(tc-getCC)" emake
+}
+
+src_install() {
+	dosbin redsocks
+	doman debian/redsocks.8
+	use doc && dodoc README doc/*
+	insinto /etc
+	newins debian/redsocks.conf redsocks.conf
+
+	newinitd "${FILESDIR}"/redsocks.init-r1 redsocks
+	newconfd "${FILESDIR}"/redsocks.conf redsocks
+
+	systemd_dounit "${FILESDIR}"/redsocks.service
+}
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index c950394b51f2..3b834a60870e 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -3,8 +3,8 @@ DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6
 DIST trojan-1.12.3.tar.gz 41786 BLAKE2B f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296 SHA512 f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f
 DIST trojan-1.13.0.tar.gz 44579 BLAKE2B 87aba58687fa5f42385893b8d919a46428b7d3cdbd2da38ee3e96900c11a6a3df7778c2a54295d5abb1964991d2d30433c4b37e70a9ca4ba184005d338bbed74 SHA512 5904ff75d348e9ccdd451836b1b05df6736e22530643d67a192e393fe32623576e0bbc106c883b6bc32daa2a086d5a7e42f836d684b66fc0deca019b14e3b3ab
 DIST trojan-1.14.1.tar.gz 45884 BLAKE2B 2498476f7e1a2190e21d85b2572fbc91a77b50f9f2adc2d3c3c5cef2554da17f322fbdb23232a55c66c38a4f680175f5c2aa87cefc25853b2007de4bb8bac84d SHA512 c8fcdae584e742d958c896e3a18605f22073341a8227a1d7cb116e9f2ddadd6e5007bfe40ff765d564f8659cd9e9d11731d95a5c74459b0698cc48dac49ead19
-EBUILD trojan-1.10.0.ebuild 1017 BLAKE2B 7f946e5d93d6637a0de5850b97c841abb5053eae85d4edf539a63779670c643507463c71ffe23d9b56ebac04dee2a674324fe1da9ed5dc98dee6c2a86bb6ee25 SHA512 1058ceedc28c35f385352db9fb63c3b9ad566c2d24b2cfd7233ac48e801b9adc968d91fe79b62fa7eee49f5fbc46299062a2cadecdca7501bf0295ee886808ca
-EBUILD trojan-1.12.3.ebuild 952 BLAKE2B 29b89597e886409b80feb112edb8446d594d8b54a097f75c5bd3e4c9fd6cc946bf96bc8c51644006f134aae370692f6e0a1c5ecfd47f0e078a66c09353011ccf SHA512 a755aabb7cadf51614069261bc8026a5a2cb264df654d9b9b0bf04f8beadc0cecff9f3df7d6f4b5e2cef10356470242c4b31c56ba4e5b5eb9b6adfbcd7f05f09
+EBUILD trojan-1.10.0.ebuild 1018 BLAKE2B 06f93c7c4672a215fcc139a17b2f17ce6d5eec88b11d598d7409db5000f11bf91ed1159a17df95b836a94602a7eaf686b1b3e2afaf98cd0478f9844ef9bfa2ca SHA512 50d3b4acd48770c5b4ebd19aec6f69c75b1c44ee0bdc1958cec7d67eea9834ce6edfc9483c802b24728babdbee19e97201335aa7bf697984316221f47d9bbb7e
+EBUILD trojan-1.12.3.ebuild 953 BLAKE2B 90151ee22e7c2f4cbe748ba3cbb450dcab5a1fbd7d85c121a939e3bd38e451e7800d37b9bf6590ce2c1ef9b49461e8fed272812d657c1a9e1e006f7fdde13fcd SHA512 1dea01ddce5a14f536f0abdd9ba2da7450a92c773045714fb024870dfcfa31a71a38feef35c86715f75f7655cea86c7c699887cd8d66e51155117d465ab6d361
 EBUILD trojan-1.13.0.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e
 EBUILD trojan-1.14.1.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e
 MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b
diff --git a/net-proxy/trojan/trojan-1.10.0.ebuild b/net-proxy/trojan/trojan-1.10.0.ebuild
index cca6f739ed10..9926cef05ccd 100644
--- a/net-proxy/trojan/trojan-1.10.0.ebuild
+++ b/net-proxy/trojan/trojan-1.10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
 inherit cmake-utils python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/${PN}"
+HOMEPAGE="https://github.com/trojan-gfw/trojan"
 SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild b/net-proxy/trojan/trojan-1.12.3.ebuild
index a380f99123e8..5a088c7f2987 100644
--- a/net-proxy/trojan/trojan-1.12.3.ebuild
+++ b/net-proxy/trojan/trojan-1.12.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
 inherit cmake python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/${PN}"
+HOMEPAGE="https://github.com/trojan-gfw/trojan"
 SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 3b1f235b5b6a..b1738b904e0f 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index feac60cda5e0..8f97d32b08c8 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -1,3 +1,3 @@
 DIST libreswan-3.29.tar.gz 3848730 BLAKE2B 32dc839186fb511534a4959014082f8efe27708da7bc09dc5977532ffc7ea0ccdc92407932b3c3166f14b9ff85933e9a3f76325bbe620e09a5fa5a5c496d1f44 SHA512 4b4d91204d8b1724e0a9ad3ed55fc232c9a526211c3b47b6cc33fd160feb72538ef1661becca250bde815b9d7b75709bf16c7b372476605557b47c785cdf2535
-EBUILD libreswan-3.29.ebuild 3064 BLAKE2B 3b9a53bacd2843b2ea42856448e202702f5c1cc15d9882dcce707742d845802282d5eb9b272726e09bae5e9a948b988de346a71ce7759471e5401a3bb6aedee0 SHA512 9af817db6009d96d6ccdc5380def2899e03570ef9b4e14b00f97b7690ae26dc4fb1a7df02dbceab1997c6797b39d4e8542a2e1f1cd1604d3d6f17452e7f5f5b4
+EBUILD libreswan-3.29.ebuild 3062 BLAKE2B b27a0245bb7f9d0c96a5bde11d66bea8895d21099dc75c121d6386f3a5d1c36ae6686d87d505370b2c741f82b258d3fd9a725007333285f1425dc13bb6e99f37 SHA512 81520632e9313ebd616d479f4574bbb32d999153b542891dcf83348b0aee292f3718632f388c3a49ea641c84d17f4c0f2524c6279b54ef30355dd9d4a9d8bd27
 MISC metadata.xml 319 BLAKE2B 6bae0756e29efeb1cf77d60f7e38fe62ffa5f24c3745e07900e6ef5f65194c50f6a479d97fdcc24804ccdcfefd9707b12f08dffe613fcf798afc421826de36e4 SHA512 924161f15c0f7a9666a6d7a422b45da679190e1a0f2859b997ddd753cbf49df9da337e5420040210736f76fa712dca3ec8862480f62bd321de71e74bee7c0865
diff --git a/net-vpn/libreswan/libreswan-3.29.ebuild b/net-vpn/libreswan/libreswan-3.29.ebuild
index b0f25268995f..9036edff1ba7 100644
--- a/net-vpn/libreswan/libreswan-3.29.ebuild
+++ b/net-vpn/libreswan/libreswan-3.29.ebuild
@@ -105,7 +105,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	local IPSEC_CONFDIR=${ROOT%/}/etc/ipsec.d
+	local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
 	if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
 		ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
 		certutil -N -d "${IPSEC_CONFDIR}" --empty-password
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 30440f9fd866..e96bf6b3e706 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -3,6 +3,6 @@ AUX openconnect.init.in-r4 1775 BLAKE2B 2237238a2d149532e90c96190829e9ef51afa504
 AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077
 DIST openconnect-8.05.tar.gz 1922100 BLAKE2B e12a5eccb471dc61c6f3af7492cb753fedcc52bfdb4155c934ca9c0c95da5e8037c0ede4f89345134fee8a09102f797690e101b8f4edba612ac265779feab19a SHA512 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15
 DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f20de010e39ddbc2bebea3680df9f304bc64db9d14c42cb0b0cb3c053376929476f4b52bf3c8da3fb4153d058eb6bab2b SHA512 91f84cf1881916160e26ec48195583ab79e084cc7b7918721581f25dfb5b1504e8073b0eed50c1a15800824d5a4454e9b99cb4fdffe2539e5968909fafdda87a
-EBUILD openconnect-8.05.ebuild 3643 BLAKE2B 998ecde1403b7cc58aa6048f6e953a9551253d8b5639d2fa18fb7c21eb77f29ea89bdcdb3c7a97d2c929d29fdf940be73aa3a0fc514640f72507c427e3113c63 SHA512 f0e3126f22c548f325467558b2fef5fa7a51a13c68f761193edbc1a24d777c9653d3980d94af4c6319832e04186a28113c570704e4f1d898f67fe6cca73bd07e
-EBUILD openconnect-9999.ebuild 3648 BLAKE2B aa809f90e704a13821d3d2f4bef7cac4ecfae29b5c6aca7b55f903b3c3e327790ab465116ea139334b57cfc01526cc532cf9715b4c80492c9b334c5876a14123 SHA512 a123088922b3f92ee430beadafbda94d114e29e294e4d03cb0bc6ed8d8459da374b7d456f6f82d61fcf92c199cfc3c56e634b33b7dad53f30a7f580e1454ce08
+EBUILD openconnect-8.05.ebuild 3639 BLAKE2B 06a2af2f6ce67dbdfa757155ae0a8f3ff2ed6301ad8bdf2f526b7227cee75bf6985d077ff57c7de7e7566853919e7813fea95f5a6e6717d82e446d4b6e4e8eba SHA512 267baf2373c3504e1f69994ee47a99d64025ea03c5d91f1f20cc94a6a8b4821391260f2219da79a4b81776f2db28279858a854dfef269a34e275541ee694d501
+EBUILD openconnect-9999.ebuild 3644 BLAKE2B f4b51ea2cda7c05c96aff3ee08f57a5d3e46f3f80df79b5c28dc4532519900850bf129456bd14075a29d029866f6c3af927f5a56dd0b74b822603a3e0addd042 SHA512 2b3c50e868f2e6526c646fa8d0f677d3bd193102ad892b3691737de05d1bc36e2829593817abb181232d946867b5992d763a37f34f6b90ecc068a909d7a5887b
 MISC metadata.xml 523 BLAKE2B c4a4ebc18284b99d3b983740180460ad1c83933860c4d8df14886a740cad0a1dbf363881ffd430adb24feaf49a2a9d02f6d3a80d5bcd96fc36f2cdb1aea2bff5 SHA512 7701ea4b9ed4d0051d915700fbd20eb28ca03024f8c4beecd8e0192e8cfd82c136cec32f29cd1e76a3059913f1b04af8066ee2700cab393bb270a8cbe18214c8
diff --git a/net-vpn/openconnect/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.05.ebuild
index 99f9981c5e39..c1ef1984ae31 100644
--- a/net-vpn/openconnect/openconnect-8.05.ebuild
+++ b/net-vpn/openconnect/openconnect-8.05.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit linux-info python-any-r1 readme.gentoo-r1
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild
index 3baa6c138c59..166611bbd076 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit linux-info python-any-r1 readme.gentoo-r1
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index bf92421ace86..978b08e06994 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -2,9 +2,7 @@ AUX README.gentoo 316 BLAKE2B 9c962395e49a2eff8411e7fb3996d99e504b0023712151acdd
 AUX tor-0.2.7.4-torrc.sample.patch 1341 BLAKE2B c6b398d6fd417e9029196046529109ed52c7c5dd6bd38505261116e15d1516a6e200583b480fe50b6e971d2ab4336673f9e75effa9dc8d3858c6248fbe31a69b SHA512 4a6b855734717416b6615fbd76bb75a54731767a74d3ade8c58fe52f4a42ee51c93ff8d591943343f319018e18d65b768bbe8fe936200ad829ab1e262c5e9b0f
 AUX tor-0.3.3.2-alpha-tor.service.in.patch 305 BLAKE2B 6ed92587a7f4ba3e40837e9114c69ba738a5849e28b886cb7326bb4f0e8b40861407f40ca21988ac188280a4eb8031cba699eda63e66b968013a9796713a5468 SHA512 ef4023423cd96c85106d0dcd3f381ffa1adcfab8c4ae49046c3dc4a45c61401e0db205483144421f620279f6a989c821c581f202561e5c24da7ccdc61a267521
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
-AUX tor.initd-r8 953 BLAKE2B 7af04f23c95b7edd90bfb6989741973cb63a846ad8a34be9a07e347308523caad1a1e0255e5597bdfb818257ab6db03da0f07622707ff60c62926f91d9d7d6e8 SHA512 4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
-AUX torrc-r1 140 BLAKE2B 4b7e0795c09e737c5dda014c2b87811757bb8d68d581ece49f5002a2c42ee29c64899c635daf27b3465194a73ca5fd21a3a7ca655682fa5f5ffc7f4b2360b125 SHA512 6e3c481b34f2cb6f48bf87fe10565daded00415cc233332d43e18206d46eb7b32f92c55035584b5992e7a056e79e862124a573a9724f7762f76d4c4f0824de82
 AUX torrc-r2 136 BLAKE2B 022636974f24bc630657a67fe95805b1d647a5d18cce3dbc6fd42e9d1fee71aa3b4faa425274437f8a7c2f9c608b4f8f9be6d4dd7c7bc4a58bd1ea096353e698 SHA512 7cf8c81e2e84b12bfc1242782b370335041f566165be6d9742d10768f0541d921caa378c6429fdb55f2c3e1433141f65bc936795126e677cc0921ce82de22bc2
 DIST tor-0.4.1.7.tar.gz 7512661 BLAKE2B 34c1c8e40c6a2a2aeb19e1161b3b32d1683da246c5839c9fc4375471d8e7c46bb1277bcf8fc700898580a6b15d8f401ee61f422ecd7a88c783cffb1157150fc5 SHA512 f6ead1412d23516a16f31e1157b4538071752ae09a421d9dceaa7cf76599c01490f9bfcb8e26f1a75e888359adf6adcd029ca64cf48e3b45b07e2d62482c9541
 DIST tor-0.4.1.8.tar.gz 7513612 BLAKE2B bd9e126d04111aa1232107b3de3f59a258754454deba8bbbb7f34f7245b915e336f999dce4544f6e211b29702d28898938f2816a6ae9550884348f6628304461 SHA512 0118012ec723379316d5ee684eb4fdd98f64f538abf6db95071015eb5e0079d155a93cc5c4a9dbeaa7a3f56cfbcc8741fcd0c94c5101aa44fb11000ec27715c1
diff --git a/net-vpn/tor/files/tor.initd-r8 b/net-vpn/tor/files/tor.initd-r8
deleted file mode 100644
index de9b66eb555b..000000000000
--- a/net-vpn/tor/files/tor.initd-r8
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/bin/tor
-pidfile=/var/run/tor/tor.pid
-command_args="--hush --runasdaemon 1 --pidfile \"${pidfile}\""
-retry=${GRACEFUL_TIMEOUT:-60}
-stopsig=INT
-command_progress=yes
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-description="Anonymizing overlay network for TCP"
-description_checkconfig="Check for valid config file"
-description_reload="Reload the configuration"
-
-checkconfig() {
-	${command} --verify-config --hush > /dev/null 2>&1
-	if [ $? -ne 0 ] ; then
-		eerror "Tor configuration (/etc/tor/torrc) is not valid."
-		eerror "Example is in /etc/tor/torrc.sample"
-		return 1
-	fi
-}
-
-start_pre() {
-	checkconfig || return 1
-	checkpath -d -m 0755 -o tor:tor /var/run/tor
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon -s HUP --pidfile ${pidfile}
-	eend $?
-}
diff --git a/net-vpn/tor/files/torrc-r1 b/net-vpn/tor/files/torrc-r1
deleted file mode 100644
index 322a794aa1d5..000000000000
--- a/net-vpn/tor/files/torrc-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-User tor
-PIDFile /var/run/tor/tor.pid
-Log notice syslog
-DataDirectory /var/lib/tor/data
diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest
index 33434da86a94..4f592b4ba56b 100644
--- a/net-vpn/wireguard-tools/Manifest
+++ b/net-vpn/wireguard-tools/Manifest
@@ -1,4 +1,3 @@
-DIST wireguard-tools-1.0.20200121.tar.xz 92804 BLAKE2B 206a6f3da102c4473c160f584de834704ea31e2f2dc842a8c5c28d66cf4ffe40746aca22d8efe336ab4c0433ef673a06468816b7e6cc51e80740acdb38782eaf SHA512 cd22467916c59ab53440e072fee6d0b01f2f9ee06fc3b71de4e74bc3aab05caf25519e5f723d9d160c491f917b7f064ee6b491c74edb52d7d2c29a08d86e41c2
-EBUILD wireguard-tools-1.0.20200121.ebuild 3418 BLAKE2B a1b7cec18e18dc7377bf13e9a7df742c8b0e7d4d2f7286d4ee0d9d11351f31c8af870c175f7d47b0659b56ce0eb9b7902b875084d9128cd57f3f2daa81d56298 SHA512 416381574733ed505be1342e21bb39c7a9a49c6120f873bef46b304e9d9d0f79680aa805b052af0e9adad1544806e2130a714d693a6d1edf2c1d5abb028504dc
-EBUILD wireguard-tools-9999.ebuild 3418 BLAKE2B af103c528778ada99dcf4817b6c5e2412796ff5b2b0e5cfb82158c529ce2207da3e90f31fba0bf4c782ae5db493e828ae8b87ee6b53dddc842c4a4f341a71106 SHA512 eacad7bc249b59de795f3f7b2e9c11e3d39dce0c4b73ec67bd9e9a5ced69d27997cca7bd1054d52c902ee28b1b690ae9bbf8ec236ec5a443ab8f5d3a174562ab
+DIST wireguard-tools-1.0.20200206.tar.xz 92288 BLAKE2B 028717e09177ecd5836af32917ab62b645c027e72dbe69c1874db2a54675f957cb6cd551cf03f0a29e5c328abd9f3c33db001f680f3980a958aa1b47a673944d SHA512 c1ea44afb105ce11595f761d1c44298341fc9f919a01d17b77c9f1ee2ff314a75c59277c2561278016a64abc7c6ea970e04539658bfd1998f65328bc21139512
+EBUILD wireguard-tools-1.0.20200206.ebuild 3403 BLAKE2B 29b7e4db6a051734bc4f0710bdd8debad1030a5cc0271a78c370348cd17de6fbed5530e6fef29272ef135d13d9e61aa1880c2b555fead5ba433a13ba1fe85505 SHA512 b77f69da29a67d82d40a02e7501048fd4605de3d15339d9e1053e4d92ebe21f2bfb91e9084ee4ec7a4d9159ed31b37a2c474a0a13e97c3eb906c9a16b38beff5
 MISC metadata.xml 362 BLAKE2B b6c8384cc5434b65a80b2326df412ca38a96bfd137feb34cea5124eebe13d383851b3ceea17cfc0b937555a0760608e0f3d0a7834da15271e65f669bfbfb8d2a SHA512 bf494cd4c95dbbbf783fc847cdf03f9a83b2673bf3a0a78fa12480abd1e2657f255019cf4f68db5143b11c5c63d6c16e9e18480800115751be9bc3cae910c8ea
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200121.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200121.ebuild
deleted file mode 100644
index 5600d6cff472..000000000000
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200121.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info bash-completion-r1 systemd
-
-DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
-	KEYWORDS=""
-else
-	SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+wg-quick"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="net-libs/libmnl"
-RDEPEND="${DEPEND}
-	wg-quick? (
-		|| ( net-firewall/nftables net-firewall/iptables )
-		virtual/resolvconf
-	)
-	!<virtual/wireguard-1
-"
-
-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() {
-	use wg-quick || return 0
-	wg_quick_optional_config_nob IP_ADVANCED_ROUTER
-	wg_quick_optional_config_nob IP_MULTIPLE_TABLES
-	wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
-	if has_version net-firewall/nftables; then
-		wg_quick_optional_config_nob NF_TABLES
-		wg_quick_optional_config_nob NF_TABLES_IPV4
-		wg_quick_optional_config_nob NF_TABLES_IPV6
-		wg_quick_optional_config_nob NFT_CT
-		wg_quick_optional_config_nob NFT_FIB
-		wg_quick_optional_config_nob NFT_FIB_IPV4
-		wg_quick_optional_config_nob NFT_FIB_IPV6
-	elif has_version net-firewall/iptables; then
-		wg_quick_optional_config_nob NETFILTER_XTABLES
-		wg_quick_optional_config_nob NETFILTER_XT_MARK
-		wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
-		wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
-		wg_quick_optional_config_nob IP6_NF_RAW
-		wg_quick_optional_config_nob IP_NF_RAW
-		wg_quick_optional_config_nob IP6_NF_FILTER
-		wg_quick_optional_config_nob IP_NF_FILTER
-	fi
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	dodoc README.md
-	dodoc -r contrib
-	emake \
-		WITH_BASHCOMPLETION=yes \
-		WITH_SYSTEMDUNITS=yes \
-		WITH_WGQUICK=$(usex wg-quick) \
-		DESTDIR="${D}" \
-		BASHCOMPDIR="$(get_bashcompdir)" \
-		SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
-		PREFIX="${EPREFIX}/usr" \
-		-C src install
-}
-
-pkg_postinst() {
-	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}/contrib/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
-}
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200206.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200206.ebuild
new file mode 100644
index 000000000000..641da7119c1f
--- /dev/null
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200206.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info bash-completion-r1 systemd
+
+DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
+	KEYWORDS=""
+else
+	SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+wg-quick"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND=""
+RDEPEND="${DEPEND}
+	wg-quick? (
+		|| ( net-firewall/nftables net-firewall/iptables )
+		virtual/resolvconf
+	)
+	!<virtual/wireguard-1
+"
+
+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() {
+	use wg-quick || return 0
+	wg_quick_optional_config_nob IP_ADVANCED_ROUTER
+	wg_quick_optional_config_nob IP_MULTIPLE_TABLES
+	wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
+	if has_version net-firewall/nftables; then
+		wg_quick_optional_config_nob NF_TABLES
+		wg_quick_optional_config_nob NF_TABLES_IPV4
+		wg_quick_optional_config_nob NF_TABLES_IPV6
+		wg_quick_optional_config_nob NFT_CT
+		wg_quick_optional_config_nob NFT_FIB
+		wg_quick_optional_config_nob NFT_FIB_IPV4
+		wg_quick_optional_config_nob NFT_FIB_IPV6
+	elif has_version net-firewall/iptables; then
+		wg_quick_optional_config_nob NETFILTER_XTABLES
+		wg_quick_optional_config_nob NETFILTER_XT_MARK
+		wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
+		wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
+		wg_quick_optional_config_nob IP6_NF_RAW
+		wg_quick_optional_config_nob IP_NF_RAW
+		wg_quick_optional_config_nob IP6_NF_FILTER
+		wg_quick_optional_config_nob IP_NF_FILTER
+	fi
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+	dodoc README.md
+	dodoc -r contrib
+	emake \
+		WITH_BASHCOMPLETION=yes \
+		WITH_SYSTEMDUNITS=yes \
+		WITH_WGQUICK=$(usex wg-quick) \
+		DESTDIR="${D}" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
+		PREFIX="${EPREFIX}/usr" \
+		-C src install
+}
+
+pkg_postinst() {
+	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}/contrib/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
+}
diff --git a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild b/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild
deleted file mode 100644
index bd16ac3af082..000000000000
--- a/net-vpn/wireguard-tools/wireguard-tools-9999.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info bash-completion-r1 systemd
-
-DESCRIPTION="Required tools for WireGuard, such as wg(8) and wg-quick(8)"
-HOMEPAGE="https://www.wireguard.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
-	KEYWORDS=""
-else
-	SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+wg-quick"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="net-libs/libmnl"
-RDEPEND="${DEPEND}
-	wg-quick? (
-		|| ( net-firewall/nftables net-firewall/iptables )
-		virtual/resolvconf
-	)
-	!<virtual/wireguard-1
-"
-
-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() {
-	use wg-quick || return 0
-	wg_quick_optional_config_nob IP_ADVANCED_ROUTER
-	wg_quick_optional_config_nob IP_MULTIPLE_TABLES
-	wg_quick_optional_config_nob IPV6_MULTIPLE_TABLES
-	if has_version net-firewall/nftables; then
-		wg_quick_optional_config_nob NF_TABLES
-		wg_quick_optional_config_nob NF_TABLES_IPV4
-		wg_quick_optional_config_nob NF_TABLES_IPV6
-		wg_quick_optional_config_nob NFT_CT
-		wg_quick_optional_config_nob NFT_FIB
-		wg_quick_optional_config_nob NFT_FIB_IPV4
-		wg_quick_optional_config_nob NFT_FIB_IPV6
-	elif has_version net-firewall/iptables; then
-		wg_quick_optional_config_nob NETFILTER_XTABLES
-		wg_quick_optional_config_nob NETFILTER_XT_MARK
-		wg_quick_optional_config_nob NETFILTER_XT_CONNMARK
-		wg_quick_optional_config_nob NETFILTER_XT_MATCH_COMMENT
-		wg_quick_optional_config_nob IP6_NF_RAW
-		wg_quick_optional_config_nob IP_NF_RAW
-		wg_quick_optional_config_nob IP6_NF_FILTER
-		wg_quick_optional_config_nob IP_NF_FILTER
-	fi
-	linux-info_pkg_setup
-}
-
-src_compile() {
-	emake RUNSTATEDIR="${EPREFIX}/run" -C src CC="$(tc-getCC)" LD="$(tc-getLD)"
-}
-
-src_install() {
-	dodoc README.md
-	dodoc -r contrib
-	emake \
-		WITH_BASHCOMPLETION=yes \
-		WITH_SYSTEMDUNITS=yes \
-		WITH_WGQUICK=$(usex wg-quick) \
-		DESTDIR="${D}" \
-		BASHCOMPDIR="$(get_bashcompdir)" \
-		SYSTEMDUNITDIR="$(systemd_get_systemunitdir)" \
-		PREFIX="${EPREFIX}/usr" \
-		-C src install
-}
-
-pkg_postinst() {
-	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}/contrib/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
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 1a0d4b121c21..cd24eaa7e8b3 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index 3574072c85d5..a0163eeeea8e 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
 DIST blueberry-1.3.4.tar.gz 1410366 BLAKE2B a684c30b7457c4df8cc1f5449891cb43d0bc314692ad1d135377c861c669b0f4f8185396f39295268821ac6403dfd035201756dea4974f31066da766e36b559c SHA512 d5ca457ace0d46aab425b6821e690a94375de1222e90d0223afa97de5ce16f77089ba84b1b47a90e6494f34d3bd6824dbd6d2ff1e41e0b9be1d7bc9611abd6db
-EBUILD blueberry-1.3.4.ebuild 1288 BLAKE2B e6a836da4933dd5046db0a0b6c66054b96583e010b068d7e18ff1e0b38dbf9457cfc6fae39bb28743d6aaf223a5d86cce942873ff63f6a65655742b9971da082 SHA512 b57f1316cee9c1b1f81d38d08e4cbb1ea050edfe90bbd3aabf30b6a4723770b3b8f35c1b9364f5f70d325220e66a47f00a4fd826a74b6292a4316d054d501cdb
+EBUILD blueberry-1.3.4-r1.ebuild 1345 BLAKE2B 48f8bffe760cbd61a1a53de51fd0f550bdb94f6e84c4c5b6535a7947e2f72a774eec4cb00691614209c1ce9d29692cbfc09927edbbb02525ebf0442b7e4fe72b SHA512 53dd07b8f4277c91a584c524724f51598ff9d173d1c0e7ae3d1029c59dd599f8fc585c61765f66fce800d9598f2afd34a25aa2a354486051975f54eae41a9c95
 MISC metadata.xml 576 BLAKE2B 1c705170b11fd8afef9f65f90743b7d3443b3952c084b771dbf93ea5bb4765cedce34cc818334ec01c577c85774e26fcf28b45d35c601e033b3478cd7713d87a SHA512 0d04db85d6d5ce7df8bdddc00ec8ff040e3a1bfdbde15300d83b4c7d59b8577314b43716909fae926ba5ace3ed75ff9b5fed7e1da3e7f8bc54f4411018d1b445
diff --git a/net-wireless/blueberry/blueberry-1.3.4-r1.ebuild b/net-wireless/blueberry/blueberry-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..b5c019bbd2ac
--- /dev/null
+++ b/net-wireless/blueberry/blueberry-1.3.4-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A Bluetooth configuration tool"
+HOMEPAGE="https://github.com/linuxmint/blueberry"
+SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnome-bluetooth-3.14[introspection]
+	net-wireless/bluez[obex]
+	net-wireless/bluez-tools
+	|| (
+		>=sys-apps/util-linux-2.31_rc1
+		net-wireless/rfkill
+	)
+	x11-libs/libnotify[introspection]
+	x11-misc/wmctrl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	python_fix_shebang usr/lib
+}
+
+src_install() {
+	doins -r etc
+	exeinto /usr/bin
+	doexe usr/bin/*
+	exeinto /usr/lib/blueberry
+	doexe usr/lib/blueberry/*
+	insinto /usr
+	doins -r usr/share
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/net-wireless/blueberry/blueberry-1.3.4.ebuild b/net-wireless/blueberry/blueberry-1.3.4.ebuild
deleted file mode 100644
index 9eda79f9577b..000000000000
--- a/net-wireless/blueberry/blueberry-1.3.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="A Bluetooth configuration tool"
-HOMEPAGE="https://github.com/linuxmint/blueberry"
-SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	>=net-wireless/gnome-bluetooth-3.14[introspection]
-	net-wireless/bluez[obex]
-	net-wireless/bluez-tools
-	|| (
-		>=sys-apps/util-linux-2.31_rc1
-		net-wireless/rfkill
-	)
-	x11-libs/libnotify[introspection]
-	x11-misc/wmctrl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	python_fix_shebang usr/lib
-}
-
-src_install() {
-	doins -r etc
-	exeinto /usr/bin
-	doexe usr/bin/*
-	exeinto /usr/lib/blueberry
-	doexe usr/lib/blueberry/*
-	insinto /usr
-	doins -r usr/share
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index ad2c31adef93..80fe1e8b5eac 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -9,6 +9,6 @@ AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
 DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f
 DIST bluez-5.52.tar.xz 1957504 BLAKE2B 670cdfb44eca1b184c0bd678bab34116f9172394b86fb69fa454f7bdcc1ae82c466a806879ddef96dddd6ae6cd31466b48f9e87113d43144659ae0c057b9def8 SHA512 9024481910d1dee85578bf3d7a4fc4be2bece516e6216c91aa1a7ac18537f092b47c41c4a5506ddd7e279599d58002e98203c5439745c01df4dbc22a75234c84
-EBUILD bluez-5.51-r2.ebuild 9270 BLAKE2B 6c4477f4e3331feae7418f11116478cd01f4d1eb1d58b8c203a1f48efea440747e235177ee20157edfe694966e4bb333a2015ee2ac221bc39f882a763fe58584 SHA512 345e2c61e1084bcd513e50a8677b3e33a1893d513e6a18724e9064add8964cb39134cfd3714bf672663f9b3ab34c9353410d03f5a94e8786a6e4d2dcf99e30b8
-EBUILD bluez-5.52.ebuild 8922 BLAKE2B 727df7ca3051a0355c65630034d1874d6c2053cbf94b2cc3d843d0a1dc99e071898198395a7499169d9cc26e87ad1cb291fd8743746195433c61f1f3b6d8a364 SHA512 c1b261a7d5a7fa355d2a554c54814da0673b5afcb1379bffcd1ed8a8fcb595c0da26654346731b62064420ab49084d51f6b32dd72264d4bcf0bffd14615400d3
+EBUILD bluez-5.51-r2.ebuild 9313 BLAKE2B acb48a3606e0cc5f7a2a48b28621af69f7c99f53b142ab5a20e3f8693fb28a4506193760885d2a181519ba89a6e6bd2dc23af4e16f79c6b7a5110fedf709e1cb SHA512 0a8d19a7e76782b2d33065d6c81a80a0a612276179658cfaeec43a106cf157126a8ba47e6a691d95e764b6652d0b25dae89cac0211ad4325d3f56af6856c642b
+EBUILD bluez-5.52-r1.ebuild 8965 BLAKE2B 846aa3a547bffbdccfda9a13be9d203f646a92406d6311d218d0c23c6d65ce21a5b566c60e13cc108c7dbaf1ef2869a110d0b22c538f9a4d5b57f7a437b3ad0d SHA512 a7cd8616336773cbe4f416499fc2a4cedf17fe4748e19c0474b79b6b87de30ecd63c095691daae29345ba3d2294ce08c37665b7ceaa02d63c92e5f81f2e8dbe4
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.51-r2.ebuild b/net-wireless/bluez/bluez-5.51-r2.ebuild
index f595bc3ad234..5b222563fc81 100644
--- a/net-wireless/bluez/bluez-5.51-r2.ebuild
+++ b/net-wireless/bluez/bluez-5.51-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,10 @@ REQUIRED_USE="
 "
 
 TEST_DEPS="${PYTHON_DEPS}
-	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 BDEPEND="
 	virtual/pkgconfig
diff --git a/net-wireless/bluez/bluez-5.52-r1.ebuild b/net-wireless/bluez/bluez-5.52-r1.ebuild
new file mode 100644
index 000000000000..b3c94fefbc73
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.52-r1.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+"
+
+TEST_DEPS="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${TEST_DEPS} )
+"
+DEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/hwids-20121202.2
+	btpclient? ( >=dev-libs/ell-0.26 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.26
+		dev-libs/json-c:=
+		sys-libs/readline:0=
+	)
+	midi? ( media-libs/alsa-lib )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? (
+		>=sys-apps/dbus-1.6:=[user-session=]
+		sys-apps/systemd
+	)
+	!systemd? ( >=sys-apps/dbus-1.6:= )
+	udev? ( >=virtual/udev-172 )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	# https://bugs.gentoo.org/539844
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+)
+
+pkg_setup() {
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	if ! use user-session || ! use systemd; then
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
+	fi
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	# https://bugs.gentoo.org/618548
+	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable btpclient) \
+		$(multilib_native_use_enable btpclient external-ell) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable mesh external-ell) \
+		$(multilib_native_use_enable midi) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also that tools can break"
+			ewarn "without previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			dobin tools/btmgmt
+			# gatttool is only built with readline, bug #530776
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
+			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
+			# https://bugs.archlinux.org/task/37686
+			dobin attrib/gatttool
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+			dobin tools/avinfo
+		fi
+
+		# Not installed by default after being built, bug #666756
+		use btpclient && dobin tools/btpclient
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# Few are needing python3, the others are python2 only. Remove
+			# until we see how to pull in python2 and python3 for runtime
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || die
+
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-pkgincludeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	if use user-session && use systemd; then
+		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	# Setup auto enable as Fedora does for allowing to use
+	# keyboards/mouse as soon as possible
+	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	# Install .json files as examples to be used by meshctl
+	if use mesh; then
+		dodoc tools/mesh/*.json
+		local DOC_CONTENTS="Some example .json files were installed into
+		/usr/share/doc/${PF} to be used with meshctl. Feel free to
+		uncompress and copy them to ~/.config/meshctl to use them."
+		readme.gentoo_create_doc
+	fi
+
+	# From Fedora:
+	# Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
+	# as found on some Atom based x86 hardware
+	udev_dorules "${FILESDIR}/69-btattach-bcm.rules"
+	systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service"
+	exeinto /usr/libexec/bluetooth
+	doexe "${FILESDIR}/btattach-bcm-service.sh"
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
+	use mesh && readme.gentoo_print_elog
+}
diff --git a/net-wireless/bluez/bluez-5.52.ebuild b/net-wireless/bluez/bluez-5.52.ebuild
deleted file mode 100644
index a73b178bd597..000000000000
--- a/net-wireless/bluez/bluez-5.52.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=sys-apps/hwids-20121202.2
-	btpclient? ( >=dev-libs/ell-0.26 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.26
-		dev-libs/json-c:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? (
-		>=sys-apps/dbus-1.6:=[user-session=]
-		sys-apps/systemd
-	)
-	!systemd? ( >=sys-apps/dbus-1.6:= )
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-)
-
-pkg_setup() {
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use user-session || ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugs.gentoo.org/618548
-	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also that tools can break"
-			ewarn "without previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Few are needing python3, the others are python2 only. Remove
-			# until we see how to pull in python2 and python3 for runtime
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use user-session && use systemd; then
-		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Install .json files as examples to be used by meshctl
-	if use mesh; then
-		dodoc tools/mesh/*.json
-		local DOC_CONTENTS="Some example .json files were installed into
-		/usr/share/doc/${PF} to be used with meshctl. Feel free to
-		uncompress and copy them to ~/.config/meshctl to use them."
-		readme.gentoo_create_doc
-	fi
-
-	# From Fedora:
-	# Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
-	# as found on some Atom based x86 hardware
-	udev_dorules "${FILESDIR}/69-btattach-bcm.rules"
-	systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service"
-	exeinto /usr/libexec/bluetooth
-	doexe "${FILESDIR}/btattach-bcm-service.sh"
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	use mesh && readme.gentoo_print_elog
-}
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index a173e5f5b7af..308fd95c74de 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -11,5 +11,5 @@ AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197b
 DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
 EBUILD crda-3.18-r3.ebuild 2142 BLAKE2B b3735350fef553a7fb1137281fc9eaf3a550dd499be9d162c1c0448b13ff716f00e9e39106e5d473a6f37d8841ff033c087b83b1c1f49654c94b9c25e2982779 SHA512 f28109e1ae3f34d11a8d9186d0279f5b77de7c5c340964f4a776ecf4388a63e7974ed33865863e445d052a9dc90c4d1062258fba63a30b4d3b0a3cb930e7c623
-EBUILD crda-4.14.ebuild 2231 BLAKE2B b85f56aceeaa096887848775d01f5995c27d09e0756a3f92d368f2c82d5cb4aa01451ffe8fd92f9062abdf62a5f485af52ba680f60bfaf833c3db3797f520a37 SHA512 84f6688ee216a8f2f7530f4b17d694facaeee02ceac1a4202eaea6e83c2f92052f5f27eeaa95d0b757df19fdd8aa72ea04f3456168305bee8a3ccd7e94962fbc
+EBUILD crda-4.14.ebuild 2221 BLAKE2B 6acebb341dc2adc1559e737ef956d7eba9ced8ca928c82b67bed29f775e9321765b9d15c44536198d01c824c773f7888fc81f778276a3ac668f12dc16a8223af SHA512 d8e048822a1906fb4e5731f9fc5684c5b368eef761bf99a480ddc434be5159eb898ac950ffcc563a10d9736cc96637b36d2731bcc884c89ad27dd412a346aee2
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild
index 380cc3d2f089..f5a34d3b6444 100644
--- a/net-wireless/crda/crda-4.14.ebuild
+++ b/net-wireless/crda/crda-4.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit toolchain-funcs python-any-r1 udev
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index bf8a7ed6c449..0ecb89c0ca90 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -5,8 +5,8 @@ DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
-EBUILD gnuradio-3.6.5.1-r3.ebuild 5185 BLAKE2B 62bbbfaf2b1eb52c03e52b64eed81a8eb8277443f7d96ad3db5d8b37988ea7ef7c8385234df9a16177d2f9c9cf71b095ea0684d7f4fc737c46502dfdf318c8ff SHA512 b5fbdb677e9e9b9e24c220cdc6e5e536419f8323a93771c750b1d737fc5df7095b60d0fad113e510c9e804a1f882cc08f0170cf37b3c3428dc2d602a72181588
-EBUILD gnuradio-3.7.13.5-r2.ebuild 7705 BLAKE2B 24752c60e3fac15e0c2f3906fa6a17ca2c8c12a41daa81c20eb6e5c39679028fb2150d1aca9e15ed5f78af2c841e937feab0987dcb8ffe79d3acf335bad35404 SHA512 6a49ed931aadf866a78dc733b2bf7e86d8fa4b02d7587089af2e3982efaf04e710d25418b79b3aa242c324d6b4026435438e0ffd0aee2bdd13084c6a9def7fdf
-EBUILD gnuradio-3.7.9999.ebuild 7187 BLAKE2B 874bd12aa475f4ae983b872a58d639483f028cb23a03f579a7532503c9c7fbebb4a5cecad012f51138bdcc2485cccc6b74bedd5fc332ff4b121462dd895e0853 SHA512 a8a33b42bd8433cf0b162e24f7884a768e6a7ed6720811d126c0d5332fba4e1a59db9fd1a1c3cdf036f4c52e7d7dc08013d21a366e2e1e0960fd44c33b0410b9
-EBUILD gnuradio-9999.ebuild 7164 BLAKE2B 830e9b82735f020a10daa506b1aa3ef9af7ab73cfd08f28fe12296de202b54186ffc44102607f4a3d5edf027a462b4a642d73b7783df63254c1fd5a4ad53b751 SHA512 249d7c9f2f08126fc0afc4e7a68b4f1a19adcc44bab6c9fab9ddbf0173531599d491380df5f90744ca255cc6b1034999f466da45c1d4ef9c061adce560d365ed
+EBUILD gnuradio-3.6.5.1-r3.ebuild 5339 BLAKE2B 40342241899afb64e9ef4bd4c3ddf74e488dfcef7290c733589868bc17cb12bb9f4dadfccb987817c278921e2606a5fbec15a136823839df696c689cda104548 SHA512 d7427110295bbe6c561ff98b859725498b93e4a479e73e17a6e0dbf766ef9c3d5e18f66ab61ed98c01ef4655d225d45c49f0d9be5e26f9f7cce5e990531535c4
+EBUILD gnuradio-3.7.13.5-r3.ebuild 7959 BLAKE2B bc68f79eb279d53a1e25fcb534882716ad9e4c129e892367f8ba88e2da175c0422d3ee8e37f4c4f37c8b9bdc498c4a253119cbee26c72c4aae29c1974b5d5efa SHA512 f4d7d68b943b950d5517a8705674c293635928189cce3cc161534f36401a860d134d528108305fcb60390fc437566ec18cab2bb1e86beca3cb242e2856d50544
+EBUILD gnuradio-3.7.9999.ebuild 7383 BLAKE2B c6178e81d4a1a982a8cc9a305faad53cbd04836a4a2ddc6aa6f10785f09ab40d3c3ac5d4a8a41b1dbd0ee5529409e8b7b1ca869525a56a424dcfe535597f6bd0 SHA512 566f559aed55f2e8f58d4818c90722b20a13d242d155a0512e17c923a4beab9aaa1c1c86290618cba78c7ec3868b7414518c1df428e36b2cb649631179222853
+EBUILD gnuradio-9999.ebuild 7340 BLAKE2B 3184d2a662f4b5b1974bd3b520e3d03a04098b23196f5cd346dbda30a4a05e3b801231dcd171e8aa3f5075452574d73a50d97e6473f88f4ad8cb9d56bf0df930 SHA512 74975e565a74ac889d37f299a2bcdc06a87f9e6fb63da0d9fbfea4df3dab3812c82f1740736042f09223e695302fd4bd7cbe43503bebee2dac33bb1df898b7e9
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
index 5c9dcc316787..a38d393dfebb 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,21 +35,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
 	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+	')
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
 	dev-util/cppunit
 	sci-libs/fftw:3.0=
 	fcd? ( virtual/libusb:1 )
 	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
+		media-libs/alsa-lib[${PYTHON_SINGLE_USEDEP}]
 	)
 	grc? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	jack? (
 		media-sound/jack-audio-connection-kit
@@ -58,19 +62,21 @@ RDEPEND="${PYTHON_DEPS}
 		>=media-libs/portaudio-19_pre
 	)
 	sdl? ( media-libs/libsdl )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_SINGLE_USEDEP}] )
 	wavelet? (
 		sci-libs/gsl
 	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig
-	dev-python/cheetah[${PYTHON_USEDEP}]
 	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+		doc? (
+			>=app-doc/doxygen-1.5.7.1
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	grc? (
 		x11-misc/xdg-utils
 	)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
deleted file mode 100644
index dec78f161e8c..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz
-		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint-3.7"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		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 )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[python,${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? (
-		|| (
-			sci-libs/scipy-python2[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}]
-		)
-	)
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt5? (
-		dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		x11-libs/qwt:6[qt5(+)]
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? (
-		|| (
-			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-		)
-	)
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	if [[ ${PV} == "9999" ]]; then
-		true
-	else
-		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
-	fi
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${WORKDIR}"/qt5-maint-00*.patch
-	epatch "${WORKDIR}"/codec2-next-00*.patch
-	epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	#zeromq missing deps isn't fatal
-	python_export PYTHON_SITEDIR
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
-		-DENABLE_GR_ANALOG="$(usex analog)"
-		-DENABLE_GR_ATSC="$(usex atsc)"
-		-DENABLE_GR_CHANNELS="$(usex channels)"
-		-DENABLE_GR_DIGITAL="$(usex digital)"
-		-DENABLE_DOXYGEN="$(usex doc)"
-		-DENABLE_SPHINX="$(usex doc)"
-		-DENABLE_GR_DTV="$(usex dtv)"
-		-DENABLE_GR_FCD="$(usex fcd)"
-		-DENABLE_GR_FEC="$(usex fec)"
-		-DENABLE_GR_FILTER="$(usex filter)"
-		-DENABLE_GRC="$(usex grc)"
-		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
-		-DENABLE_GR_LOG="$(usex log)"
-		-DENABLE_GR_NOAA="$(usex noaa)"
-		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
-		-DENABLE_GR_PAGER="$(usex pager)"
-		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
-		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
-		-DENABLE_TESTING="$(usex test)"
-		-DENABLE_GR_TRELLIS="$(usex trellis)"
-		-DENABLE_GR_UHD="$(usex uhd)"
-		-DENABLE_GR_UTILS="$(usex utils)"
-		-DENABLE_GR_VOCODER="$(usex vocoder)"
-		-DENABLE_GR_WAVELET="$(usex wavelet)"
-		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
-		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DDESIRED_QT_VERSION="$(usex qt5 5)"
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
new file mode 100644
index 000000000000..a73f9f65dc64
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz
+		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint-3.7"
+fi
+
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		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 )"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.8 )
+# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
+RDEPEND="${PYTHON_DEPS}
+	>=dev-lang/orc-0.4.12
+	!<=dev-libs/boost-1.52.0-r6:0/1.52
+	sci-libs/fftw:3.0=
+	alsa? (
+		media-libs/alsa-lib:=
+	)
+	fcd? ( virtual/libusb:1 )
+	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_SINGLE_USEDEP}] )
+	vocoder? ( media-sound/gsm
+		>=media-libs/codec2-0.8.1 )
+	wavelet? (
+		>=sci-libs/gsl-1.10
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		filter? (
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		grc? (
+			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		qt5? (
+			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			x11-libs/qwt:6[qt5(+)]
+			dev-qt/qtwidgets:5
+		)
+		utils? (
+			|| (
+				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		wxwidgets? (
+			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')
+	"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	$(python_gen_cond_dep '
+		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+		doc? (
+			>=app-doc/doxygen-1.5.7.1
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	gnome2_environment_reset #534582
+
+	if [[ ${PV} == "9999" ]]; then
+		true
+	else
+		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+	fi
+	# Useless UI element would require qt3support, bug #365019
+	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+	epatch "${WORKDIR}"/qt5-maint-00*.patch
+	epatch "${WORKDIR}"/codec2-next-00*.patch
+	epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch
+
+	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	#zeromq missing deps isn't fatal
+	python_export PYTHON_SITEDIR
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_VOLK=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DDESIRED_QT_VERSION="$(usex qt5 5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# We install the mimetypes to the correct locations from the ebuild
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+}
+
+src_test()
+{
+	ctest -E qtgui
+}
+
+pkg_postinst()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+				|| die "icon resource installation failed"
+			xdg-icon-resource install --noupdate --context apps --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+				|| die "icon resource installation failed"
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
+
+pkg_postrm()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
+				application-gnuradio-grc || ewarn "icon uninstall failed"
+			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
+				gnuradio-grc || ewarn "icon uninstall failed"
+
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 8c07aa105ae0..f8ecf5a77873 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -47,30 +47,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
 	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0=
 	alsa? (
 		media-libs/alsa-lib:=
 	)
 	fcd? ( virtual/libusb:1 )
-	filter? (
-		|| (
-			sci-libs/scipy-python2[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}]
-		)
-	)
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
 	jack? (
 		media-sound/jack-audio-connection-kit
 	)
@@ -79,26 +60,47 @@ RDEPEND="${PYTHON_DEPS}
 		>=media-libs/portaudio-19_pre
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? (
-		|| (
-			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-		)
-	)
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
 	vocoder? ( media-sound/gsm
 		>=media-libs/codec2-0.8.1 )
 	wavelet? (
 		>=sci-libs/gsl-1.10
 	)
-	wxwidgets? (
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+		!<=dev-libs/boost-1.52.0-r6:0/1.52
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		filter? (
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		grc? (
+			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		utils? (
+			|| (
+				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		wxwidgets? (
+			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')
 	"
 
 DEPEND="${RDEPEND}
@@ -107,7 +109,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 6687ca881954..7bbe445db144 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -48,29 +48,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
 RDEPEND="${PYTHON_DEPS}
 	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
 	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	dev-python/six[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0=
 	alsa? (
 		media-libs/alsa-lib:=
 	)
 	fcd? ( virtual/libusb:1 )
-	filter? (
-		|| (
-			sci-libs/scipy-python2[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}]
-		)
-	)
-	grc? (
-		dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
 	jack? (
 		media-sound/jack-audio-connection-kit
 	)
@@ -78,22 +61,9 @@ RDEPEND="${PYTHON_DEPS}
 	portaudio? (
 		>=media-libs/portaudio-19_pre
 	)
-	qt5? (
-		dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		x11-libs/qwt:6[qt5(+)]
-	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
 		dev-libs/log4cpp )
-	utils? (
-		|| (
-			dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-			dev-python/matplotlib[${PYTHON_USEDEP}]
-		)
-	)
 	vocoder? ( media-sound/gsm
 		>=media-libs/codec2-0.8.1 )
 	wavelet? (
@@ -101,6 +71,38 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11
 			dev-libs/gmp:= )
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		filter? (
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		grc? (
+			dev-python/pygobject:*[cairo(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		)
+		qt5? (
+			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+			x11-libs/qwt:6[qt5(+)]
+		)
+		utils? (
+			|| (
+				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')
 	"
 
 DEPEND="${RDEPEND}
@@ -109,7 +111,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
diff --git a/net-wireless/gr-air-modes/Manifest b/net-wireless/gr-air-modes/Manifest
index ef96075f7c4b..8c349d004fad 100644
--- a/net-wireless/gr-air-modes/Manifest
+++ b/net-wireless/gr-air-modes/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-air-modes-9999.ebuild 1029 BLAKE2B f2488f40e21eecc4a6c8076031059a8a80b8c906b633f5472ee5e12b2bfddfef23e998817d96da4ec52b9f41e6617bbd2f030205cc9440228889b5dac8034d7a SHA512 7853b515d2708fdf9bc0bb1802f61b854ba4ead2b39de3a236bf836d5082bcf0f1ab8a611ee006fd002847b7b64a2675dc8e8c1f90f71c3e8141e5159a82240c
+EBUILD gr-air-modes-9999.ebuild 1084 BLAKE2B 107ce69f6da9100384c8dd2e47a9dad9993223a4d09340eed01adaa1622a89fdf8cffafcda8ae1ccdf321b674a538f0b04096d93e1f8cdebb719a111459c92a1 SHA512 b825167b4ae905824d2765744e4039259b1d4e7343a454d05bb9e4dbcea9eedf98ba056d241e5c7bb62c579b77e75254d9c9c42cefdd3f3f44bfbe71def392fe
 MISC metadata.xml 447 BLAKE2B 3d205cace1b2c5446d3b3db17116f0e8d071cc1a1e59b17597c1a083b781e6ea1bc9e2f52de22d685ca53a96b08a13965e121f5924559040da23a827243579d3 SHA512 d05f480160792ec408d852a61ddaebe4088e38a7efbee14e8b576fb4ac2e2c98e5196b0c6fe62457e7de9ed2db80317e452061e90d5c6a760f5b5cf941027f0c
diff --git a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
index 5f10964933fd..c0aad83ffd8c 100644
--- a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
+++ b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
@@ -24,16 +24,18 @@ IUSE="fgfs rtlsdr uhd"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-python/pyzmq[${PYTHON_USEDEP}]
 	>=net-wireless/gnuradio-3.7.0:=
 	net-wireless/gr-osmosdr
-	fgfs? (
-		games-simulation/flightgear
-		|| (
-			sci-libs/scipy-python2[${PYTHON_USEDEP}]
-			sci-libs/scipy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		fgfs? (
+			games-simulation/flightgear
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
+	')
 	rtlsdr? ( net-wireless/rtl-sdr )
 	uhd? ( >=net-wireless/uhd-3.4.0 )
 "
diff --git a/net-wireless/gr-baz/Manifest b/net-wireless/gr-baz/Manifest
index ffec431dd7be..be14dfab8c04 100644
--- a/net-wireless/gr-baz/Manifest
+++ b/net-wireless/gr-baz/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-baz-9999.ebuild 968 BLAKE2B 80c60da9adf5d94f128a2073f7c0abebe7b434f763501b768df3aafa0b5f5d33e15e79bc5438082b40afc9a8f205cbbbd3dde3dda908ee3bc17b2553e01a21ac SHA512 0e1a893b9761203954c70e1621f57ef61ec2c03b66f7d9909b44f795e2395cd7d8667563c35c57763def795b7b157d6a9fbf8963d788a1dac8caa0279e877be7
+EBUILD gr-baz-9999.ebuild 1018 BLAKE2B d189a04998b7093d13c580ee2aef1614eb85731409a7b016148ec4513a673fb5090aab391251a8e5726adbe2895a3b43c53bfc320b499c77a2abc82b365dd104 SHA512 d2386763973341407a95f75600a22b99176e0b684769252823771a39997fa66818c9c71824fc708ea3a569d04008df7d0e204409bf4be2628bc2f4bfc8d51595
 MISC metadata.xml 522 BLAKE2B 6f6257b56aebf6189db585f5bdb502d59950c416bf7f06b0f5f2a71520fb32360d4c427c7284e1d7b5f66a886d045304a47e89fbb28dd1676a2eb53d2ce0f166 SHA512 2d5ba9656be7bb652bd96331027dda5bd4d963e949ed1ef24dae55e8945ac9dfc3863fd2a223f47dadd5731475433cf2b1018d7390a47bdd8725a8907a173c64
diff --git a/net-wireless/gr-baz/gr-baz-9999.ebuild b/net-wireless/gr-baz/gr-baz-9999.ebuild
index e43cd434a9af..36f890e014d4 100644
--- a/net-wireless/gr-baz/gr-baz-9999.ebuild
+++ b/net-wireless/gr-baz/gr-baz-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,11 +23,13 @@ IUSE="armadillo doc rtlsdr uhd"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[threads,${PYTHON_USEDEP}]
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[threads,${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
 	armadillo? ( sci-libs/armadillo )
 	rtlsdr? ( virtual/libusb:1 )
-	uhd? ( net-wireless/uhd[${PYTHON_USEDEP}] )
+	uhd? ( net-wireless/uhd[${PYTHON_SINGLE_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/net-wireless/gr-doa/Manifest b/net-wireless/gr-doa/Manifest
index 34e3b11876d1..e28c57df6fac 100644
--- a/net-wireless/gr-doa/Manifest
+++ b/net-wireless/gr-doa/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-doa-9999.ebuild 936 BLAKE2B 4966c0c015b9bc67bb7a38ca3dfcfd8fd53081b0335bcd1cd7d387e2b5f45b0149f74e9740f4236502c8b4d284eccdebb8b96185213dfbc3bd085a33ece87495 SHA512 c82840a52c1b7ecd42761f51a597b904cddb4d3f4b838c47f615c262c05246168a6a132fafbf7673ddabfa1a4f6784891fe3c848e5f039b5cc02d092fcf20c6a
+EBUILD gr-doa-9999.ebuild 940 BLAKE2B dc60f8544a5cee46b01d7f5659f9d8e0425ceddadd7433a3192a24dcc5098c31af53b35b60ed0f9d51b21668bdf90930d8c6022ddf97327ff4d533d6d8325782 SHA512 a5cf17fb15c6d118dc0955512df20f843ca6176aa27865fc14c8b51951ec5b357b01e2d16a4046a5c783e45878e54aba952bb9175697234ffc87a425cfb4e354
 MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/gr-doa/gr-doa-9999.ebuild b/net-wireless/gr-doa/gr-doa-9999.ebuild
index 7901c0c44685..ea4932a57e95 100644
--- a/net-wireless/gr-doa/gr-doa-9999.ebuild
+++ b/net-wireless/gr-doa/gr-doa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
diff --git a/net-wireless/gr-foo/Manifest b/net-wireless/gr-foo/Manifest
index 856fead7a44e..ee5a53ebad0b 100644
--- a/net-wireless/gr-foo/Manifest
+++ b/net-wireless/gr-foo/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-foo-9999.ebuild 1169 BLAKE2B 9ee12e7c3c8721cc2f36a0a2f8cfdee5aa429cb9694c751e2080a97c11f510ac8dd1f479e7e790cd6397a7099d13ae4610b23d5dda029e98b00fc4a4d41c22c9 SHA512 e0fce7665744039b6cf25626ad148d91b1ab4e3e0c8eec368700048312eb0a57a75005446cb80a1b7fd4eeffcbd03cf1193fc3957d096008a8c6e7d70ca0f3fe
+EBUILD gr-foo-9999.ebuild 1219 BLAKE2B ff830fdcce826a6d0082e7eb0027cfa4116839911a4a3622d91d69e717ccf9cea6772b33590d7c5b418c550a9ed7748daa55a95e5ed055e3103e7527b5cde6a4 SHA512 858a6e2b6493dfca94cf69319136030011092b290833a91aa21599a534cc18347c2d803f16ac1a7e3cf6a75c9a342d3b0949644cbc472a79ebcb245e225a030c
 MISC metadata.xml 317 BLAKE2B a600d3d673f37d66dbb32b1480bc115a246665dc69ef42a9e7ea144bc9145b23fd01eae793a313e7f6ccba4d072e80b97430f3dfa4937ed606716cd4519eee66 SHA512 4a8573f02b2807a76df349c29d61cf6d64631dac6fa13a86579b8df9ccba8abe379168e47eef796b02cf6b93765ae4826c25189c3f012105e8d949a939c966f1
diff --git a/net-wireless/gr-foo/gr-foo-9999.ebuild b/net-wireless/gr-foo/gr-foo-9999.ebuild
index b54cc9402c9a..035e0e058a23 100644
--- a/net-wireless/gr-foo/gr-foo-9999.ebuild
+++ b/net-wireless/gr-foo/gr-foo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,9 +22,11 @@ SLOT="0/${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[${PYTHON_USEDEP}]
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
-	net-wireless/uhd:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+	net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig:0
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index b71f75c7360b..12909b33d6fd 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,4 @@
 DIST gr-ieee802154-0.0_p20180402.tar.gz 195464 BLAKE2B 391bd4eefb5a90135a084a94c2edd83e6f2c2bd6dca26be4d9a54448382d5ee463e1740c305e9583be0107b424c67e74fac84ece147844e7c2a63f6096c7dd36 SHA512 90f164bdcd636dee68a49fe844901ca73e1f743fdeacd8019edddc57c681ec3d1fcfe209d8abd89e2013c2c2c436b7992fe0b0dbe9c88c04352aebc0813a9d96
-EBUILD gr-ieee802154-0.0_p20180402.ebuild 1325 BLAKE2B b7747fd6122f2901578effdca4b729b526abe2aa01f3535c1f98cc80bd4591edb6a75f58f6b5e875488474bd4903673bb217b499d81d545b9bb3e9c46ed18896 SHA512 5c08a8ee25f84f05a2cb5bceb5e45382fed59ce06751fe4c9e9cd7bd1485405dd19d7a04042a70cff1e87cef5fb0d28742db824554dddc342b4f8cb30456b74c
-EBUILD gr-ieee802154-9999.ebuild 1325 BLAKE2B b7747fd6122f2901578effdca4b729b526abe2aa01f3535c1f98cc80bd4591edb6a75f58f6b5e875488474bd4903673bb217b499d81d545b9bb3e9c46ed18896 SHA512 5c08a8ee25f84f05a2cb5bceb5e45382fed59ce06751fe4c9e9cd7bd1485405dd19d7a04042a70cff1e87cef5fb0d28742db824554dddc342b4f8cb30456b74c
+EBUILD gr-ieee802154-0.0_p20180402.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
+EBUILD gr-ieee802154-9999.ebuild 1365 BLAKE2B c6794369bc025bd6c6e770e4d9ce15823367d504c4fae45cdc8e4645980fcebc61c1ba997da5448e3983a5f385a30b36d3bf90abbe28d944fa299ae5e8bf48b7 SHA512 43a1b12f4d6d86f117602f5ea205788bd1bf6afe4c2370e5df748c4ff98d2a051dee85c0003c5c6cfbb68a32fca1555e58a9eeed61b30ef58198a2cfb9d7dff4
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
index 558bac59bdce..e99620f1b2aa 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,10 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
-	dev-libs/boost:=[${PYTHON_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index 558bac59bdce..e99620f1b2aa 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,10 @@ fi
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
-	dev-libs/boost:=[${PYTHON_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0"
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index bc0dc2c8e7f5..ad4fed5e84b7 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,4 +1,4 @@
 DIST gr-iqbal-0.37.2.tar.xz 71340 BLAKE2B 1605c520a7ff0088a24ea79e181b36261cdf849438aa3ef4a499228a372297017d3bbc4c96279f9b1bceb7b690aa7b6081b6e970a337e03c766dab5149fff199 SHA512 00037a535219ebe3b5244d4a09355cc74bf17aa6a935bff135e9d7c7c7f6bc1c8b7a29edc02132dbacda2c41efa3613c09e6fdc222472e58d88c4c076736842e
-EBUILD gr-iqbal-0.37.2.ebuild 708 BLAKE2B 7e319c4e617232077b829d6ca03be9f54867b693f75445a3740ad3f62d3d2eda4cdeb4a879e16546cad900b44252c1b5e6794d00300eeff01e2810770a544434 SHA512 2e8078c8fb2079959ade82bbfd68a4b3dd3c70912c2071b28b8d74ea9864e9660d33de0ee07c887321df631c87f42702e78db6863ad34540b05fa989bbbd9f85
-EBUILD gr-iqbal-9999.ebuild 708 BLAKE2B 7e319c4e617232077b829d6ca03be9f54867b693f75445a3740ad3f62d3d2eda4cdeb4a879e16546cad900b44252c1b5e6794d00300eeff01e2810770a544434 SHA512 2e8078c8fb2079959ade82bbfd68a4b3dd3c70912c2071b28b8d74ea9864e9660d33de0ee07c887321df631c87f42702e78db6863ad34540b05fa989bbbd9f85
+EBUILD gr-iqbal-0.37.2.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
+EBUILD gr-iqbal-9999.ebuild 712 BLAKE2B 3031e45a49b91694d53f483d193e5dfc6d180a706dbddd0622ea7d4ec28d1c73b3a42a3145d6d73abe6a0ec0d89d732709130cdcb82b02c2bfae95e480cb6ec1 SHA512 3162176ab1fb25c6c441b0211cfe831f82463b221bc5b933c2f8ea741cf408adab63b16f76b7db3ca469da85e143efc512d05f55c554b19758bc0c32d67b9f32
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
index 96ada0f6ce62..1ed8501d81d5 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.37.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index 96ada0f6ce62..1ed8501d81d5 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE=""
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
 	net-libs/libosmo-dsp:=
 	dev-libs/boost:=
 	${PYTHON_DEPS}"
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 3c63c14d546b..73da69406661 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,7 @@
 AUX csete-iio.patch 18603 BLAKE2B 437bc8318e88090012cfc98a1b5910ade54b191abb6cb96ea82ba1974c68682477d7429489546fca21ce19d3b9042d6321146d34c0cf8bf94f591bf8da576a39 SHA512 b8c41a1df12a1a74a4d491e694e89d9de753791a433da4d8451c2b20a3e448312316cf66b8bd7d2c1445d91e483331c4328e0acc738fc0dc61ab98b30d48a14a
 DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
 DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
-EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2184 BLAKE2B 98ae2d534d26af6ff530dc04c177a444600dbeb69ef3092fd54b6eaa8424cb689c2d3cf8b2fa9dc62ee970a12b096c817db4df976f171307c41828dae9fbc9e5 SHA512 fb9d602fc7d68f944d2e51e3d3c94005686ea122e5ea5b5e342e0b1cce9b833fa3a4f66999fd7a8791fdda404ba7cffdcf7cda47f715110cfe4cf42473582b3e
-EBUILD gr-osmosdr-0.1.5.ebuild 1908 BLAKE2B 8e65405df93193eca8f29142ec345791f18ca9b8cab98b68922eb0c0c1e352fc2712edb6949de9cf41b03aff566fa357a12f2f427e78ba5e3ab6bfd09b945af0 SHA512 096fb93288971b08de28b8ab163d8733b493be29353dc5bd4fca3f8c022162a2004665e43971aac5cfd01e3dfb3a57214e54e81c2a33e7ce1efbc350971d41cb
-EBUILD gr-osmosdr-9999.ebuild 1908 BLAKE2B 8e65405df93193eca8f29142ec345791f18ca9b8cab98b68922eb0c0c1e352fc2712edb6949de9cf41b03aff566fa357a12f2f427e78ba5e3ab6bfd09b945af0 SHA512 096fb93288971b08de28b8ab163d8733b493be29353dc5bd4fca3f8c022162a2004665e43971aac5cfd01e3dfb3a57214e54e81c2a33e7ce1efbc350971d41cb
+EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2205 BLAKE2B 4120f8b37dca5a30a842b6a6d37ce8dd36b04ac8bb55a034b6578bc3fa089962041bdf948ff06e1c8f0004076d8f4e094c9d6e1d8aa04908511f0e49d0c87642 SHA512 6954a1bba9e4f3f5010722e095803c00ff2125d03ba806f255546d655d25eb89ba88c485aeead5cd8505a1cdbee64dab04b521d62f5140b84d912b6a236794d3
+EBUILD gr-osmosdr-0.1.5.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
+EBUILD gr-osmosdr-9999.ebuild 1929 BLAKE2B 17f224c852272d9304845bf1b9b67247efc8cd60aa1d4115ba437493ebf7bbbb4a6f2945046b6f00102269b834b43bd6b995ed79f45bf5fddcfe740cf36ecbb4 SHA512 24a7f0e5dddca6b9d46ac38df017952ae28b4666eba245dfd5ddeef30f31a990ea856729238b42c84168b1ba5acdbd587342971a04f6f208c9bcd5e1d50d2fac
 MISC metadata.xml 1064 BLAKE2B 5f01d598ec69e9f78d594a33487b58242049b020461fbae3e2eaf51d4d894c01c9bc73af28b101bc855e09567c16176d56fbe52b77b7cb719ce2d8ef3f6459a9 SHA512 8f4b7a3cbdf0b0edb3e707cb8c44d5e40e72dc87d36312865647996181c419f4a67c6783110abbdb150264ca9e49cca3264ba39098acf0b05955dff3fdf29072
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
index 75a47d73672f..eb6cdd6fe1d5 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,16 +27,16 @@ IUSE="bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iio? ( net-wireless/gr-iio )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
 
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
index 780a3c706b83..69775452090e 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,16 +23,16 @@ IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uh
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
 
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 780a3c706b83..69775452090e 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,16 +23,16 @@ IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uh
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
 	airspy? ( net-wireless/airspy )
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/cheetah"
 
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index fb00a4479a40..aa9f2d43f7b2 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-paint-9999.ebuild 874 BLAKE2B 440d2408d8e996fb0c26dfd4416e1770ea0cb148e6b969e9b4aedbd988dec9e1347013c9f4a8f7f84ec1d231f957cd8d7b857ded4ca157dc9e87e2b64d048368 SHA512 810adbbcf95402e41f269864b66b067a4ffaf5be74d9f34cfd329ed2487ccddd6187ea88bb85761006cf52359ba170be69a7056adc19a9cc79ab0a78541d0311
+EBUILD gr-paint-9999.ebuild 917 BLAKE2B 03c173165eedabead625e867712e792f48bd99b0fe7a39b0760bebc699458866e1ca7836a063c995a4e3556aff20ee74cf0c7e493a82692d5a3331dbc97561dd SHA512 128a122b5ebd7782a6cf693554730f53931dbc9d0288be192149a06300a56fefb01f4d46610df41c1bb2739ffec6a13a4e7eeaa1a675db22ac30b1c50efc9f16
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-9999.ebuild b/net-wireless/gr-paint/gr-paint-9999.ebuild
index e61888f8ab75..7f891f888a4e 100644
--- a/net-wireless/gr-paint/gr-paint-9999.ebuild
+++ b/net-wireless/gr-paint/gr-paint-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,8 +23,10 @@ IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[${PYTHON_USEDEP}]
-	net-wireless/gnuradio:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	net-wireless/gnuradio:=[${PYTHON_SINGLE_USEDEP}]
 "
 RDEPEND="${DEPEND}
 	media-gfx/imagemagick
diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest
index dab672fbd635..b89f56c89ebb 100644
--- a/net-wireless/gr-rds/Manifest
+++ b/net-wireless/gr-rds/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-rds-9999.ebuild 1121 BLAKE2B 1e99aa7d84a20395e619fa2bacf0a9b0ae5ec7631eb63c6961cc9faea51bc15e235dc11b4dc8fff287e4a69a97733d0652356f014395d357a4463622811f26c8 SHA512 0756b8aaf8a8a653fe4f676396c686315886784aa4551951f7699ef9fbcd9967a84fc7f7c44b98d708a3c167f38adcfa50f2e91a324ef931e791eea50fb0d82f
+EBUILD gr-rds-9999.ebuild 1164 BLAKE2B 84b1858c4c791de99615269e68abb270137d376c597b51c45571cdab542314fc4ba38ac7323b657c44beae50fa6f1f24a20b239a6adf276aecf85fde76edb08a SHA512 a7e3c647c67c62c89b061c1d9c8ec44fa7f58e0f8d47b7bfc8ff8b1ba8198d2d7a0e662a40a50ba7ba928a14869cfcdaf7ed0234a9221d8f8321f26596f2116b
 MISC metadata.xml 317 BLAKE2B 38ab4417f4befdeb7d9912a3712a259653e223aac63528287493cde0094efbe7c985f1cd93e871a10fb1a99b8add72f20d6b31a93d06017171a85a276f4b9840 SHA512 a5cb2c2182d2c0a2afbb3ebc9ac175af13be57ea5ca28abd3cb59d25a562484f8dc01b08da9e0644929a6cbd63f2c850eb6169f574dbed838180e5a5e89ad510
diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild
index 7a3bffd7a3f4..10e9f43865de 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,8 +22,10 @@ SLOT="0/${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[${PYTHON_USEDEP}]
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/net-wireless/gr-rftap/Manifest b/net-wireless/gr-rftap/Manifest
index 1f12dde1be18..b0af9411bc49 100644
--- a/net-wireless/gr-rftap/Manifest
+++ b/net-wireless/gr-rftap/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-rftap-9999.ebuild 1127 BLAKE2B 2437cd7205d3123a5ce64cb1ba1e57c401794853a7245f0ab0d195a2517e9d54584d05b48a7a222d903e924a60686324a435c9445ebacc8e8e2480c4656c89bd SHA512 e214ccef445f01b05cd1a821731940eb3d904a3703f36c00202e0a3b9d59ed6c23adbe75b90630c451d0af9eb7328e0517b523dab11a23a4495508966d6aa3b3
+EBUILD gr-rftap-9999.ebuild 1170 BLAKE2B 29333fb8ff876250f6f95471f1a33341f8a27cdf170c4c11c7234ffb243b483fd751fd48e66dde2403e266d8b9b9799a9877bc98c010fd7fffdcdf04fec9b7a6 SHA512 2f6421bcc1d9c24b9465a9a45a7b68bfd830cefbdedd39fc7aa6bab8390cf58bbc9460c859e37e7385699202b2e0e6e8a496823d84eb536c11718ad2719b4429
 MISC metadata.xml 317 BLAKE2B 4970c2c939374961593cf134bf3f1030d14fed37ebdc9c15369a1c94dc4786649920c349f9aa6ea76b7d56bd720ae560b4b7e900c046f573cc75c55d7429f658 SHA512 bd237119e49e0e715f528eea05fc9cb8fd758779209849c7a5e5ffd964c98b3912c63af8363192ba94db59d2b62a4dd28c9d1521d61b843b02fe3feb6ad9558a
diff --git a/net-wireless/gr-rftap/gr-rftap-9999.ebuild b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
index 621dada2edb8..54059b6ad6cd 100644
--- a/net-wireless/gr-rftap/gr-rftap-9999.ebuild
+++ b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,8 +22,10 @@ SLOT="0/${PV}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[${PYTHON_USEDEP}]
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/net-wireless/gr-specest/Manifest b/net-wireless/gr-specest/Manifest
index cf26c2265166..6bd156f99ab0 100644
--- a/net-wireless/gr-specest/Manifest
+++ b/net-wireless/gr-specest/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-specest-9999.ebuild 701 BLAKE2B 06b6a33946f22af69af7ae59a642c9749782b31e39a9b99897b288937a8e41d160ee8c09ce3171d5d80924dd2e90b90a405864109d0b3b018dee71f26a44838f SHA512 7735c9acf40e0ba70e06b6f2f51f84985aaefe6341b40b9d60547c7a8d886b02f45118d8f9b8cca6439d55be653bc07431ebc3bca68228921b6ad7306dad3800
+EBUILD gr-specest-9999.ebuild 705 BLAKE2B c1ab054b70cc03ebcad46faf4554744ff34d4e4b3265e1021c61be668f41e1e1a36fe94390058f4a6b1b95f3ab134acee72f4bfcdc05359e1b3d1370287e32d6 SHA512 b2aed42b65770c00ac5dd8c8f6ed48bec96424b64f47afa75c4d6f2ee718ba0fdc2acd9066161cf03543088d5262085c1834e893ce547643261fcdd86f069172
 MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/gr-specest/gr-specest-9999.ebuild b/net-wireless/gr-specest/gr-specest-9999.ebuild
index 12a9c520a90b..f6bdadd0aeb1 100644
--- a/net-wireless/gr-specest/gr-specest-9999.ebuild
+++ b/net-wireless/gr-specest/gr-specest-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ IUSE="doc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_USEDEP}]
+	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 4f29d1aafc41..d355f1a47892 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -2,7 +2,9 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.4.tar.xz 830548 BLAKE2B 2d03767a5308c72206aefbafce39a241e353c1ef8751758d0a336a7ad5b86ef02062da037db423b805810eb45a9467628cd241682a63835b63e3ea920f39ace9 SHA512 3b06fa24666e7cf37353d95d0e9abc41b8be921ae7313c014f20f704fe7919d154d6a5441c6d87d4cd08ee65e15218ec01f4ff4aafc7e4a358faf3ca4a6dcb18
+DIST iwd-1.5.tar.xz 834688 BLAKE2B b3d585963c93954e4038dd85e5d57b60d8baaa7028edb79b54d8650a400a149666140f6ba438ccccb5be2d67fc7b842f6272b5efc61d75a7d4dae333410625bb SHA512 55017941f2e100d644864d2ed0528c67a486da6ba2bf7782e9df019727ce0af53cdff37c53f6625e536aa756387dd4e0d20a169710da8c3ce00f615040c9da32
 EBUILD iwd-1.4-r1.ebuild 4219 BLAKE2B 36f70ad55bc4c2832fcb182999f26ab236ef852c31292c0943d7efb880bb5f8616ba38a84ce47c973c562111d116f2d68c0f55a55c563c7bb44fb3ab5b8ed575 SHA512 af3820df6cbd44468e4f5a109e051cbfdcfd0b05e6666958f5c906963a40a4b27a3e3b0cb5beb0b64b9716e26becd26d430bad75417bf49b688d2f81ad7539ff
 EBUILD iwd-1.4.ebuild 4211 BLAKE2B 81bb8365ba4b39878b9c4531e1c927ef4a068d9a6d6de9bf40180202c5cc6f75b88cbc8c54da1bf95cb19160def27148385302203ac6a7695ac0ba2da45487aa SHA512 a3f380e75083e90fcdc3510ae779da7392c7e4c11d7a378af567cf97066b93bc028141ae03dc8a9b85f0cf254409288b09ebe3f9c2d54912387bf63ca0c703d4
+EBUILD iwd-1.5.ebuild 4219 BLAKE2B 624c40476f2fd5847e8a4ec81956339c1bff2604effb993c924fb8d6505caddac226c31b07f20afd3a5ce9876359bd40adfe16731bcfa8ac525bdac4da889c00 SHA512 4a351309df1a0df69f131d0773a97842141fadc5a575dd1c071306f8edba9763b58f3f696a7b26b7afab3b14ebf115f518503b8fe147fc1a9943b6cf08441b22
 EBUILD iwd-9999.ebuild 4203 BLAKE2B a3804e0c45f950489b07e6c4a710f3722148287314539b33887f9b39c87510b27a3632a57b6dd419b7a4dbf575b1d137b64c9506b72508dee09851ef3c63a987 SHA512 87e22d525b0cc8288d28dbc0429cd5588a341ba3a18f4450afe382d3f0cd46a39e92dd913d39d5772438e21c879906f5a51a1a3e44cdcd1f1765880c9100c6cb
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-1.5.ebuild b/net-wireless/iwd/iwd-1.5.ebuild
new file mode 100644
index 000000000000..b2e8a422b118
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.5.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ="0.28"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~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 +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+COMMON_DEPEND="sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
+
+RDEPEND="${COMMON_DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~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 crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
+		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 && use amd64; 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
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		$(use_enable client)
+		$(use_enable monitor)
+		$(use_enable ofono)
+		$(use_enable wired)
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 249f7ffec26a..f957c47846ac 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -8,7 +8,7 @@ DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e115
 DIST kismet-2019-09-R1.tar.xz 3034832 BLAKE2B 9f7818549e5260dc081ac39ea8323c70f2e4d0b959bc42dacc253c9d72bf72c2547f7c6d65d84ee7d0ca4a41068f5973028e48f6f9f3c5a7cd50c35246570814 SHA512 eeaf069718206f2b6d292c41792217afc9c72c10ffa014c8c670de64195bd28d44f33364dba7d338610f17a5af2be3c125ccd1297cce362159a4968c9ddabb88
 DIST kismet-2019-12-R2.tar.xz 3127064 BLAKE2B b7ffac6a6a4d7d7893d3564f9471080e055798c325b102f98fa0e86db37bcbab33422afae9c2694b747ae0c369259b62c218a77c673d0e0c05969a56e42311c2 SHA512 b1e3de74a6d314150d849ac3d95c8b99324bba14522dc4f00244d1c09acb690cce40d35dbe33845ffb1060a69cd38f036d59a0283ed9b1a70b022e3d57cde5a0
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.09.1-r1.ebuild 4630 BLAKE2B 9c302952243e30c5002d613d824e266837f80620aec815540fe10bb75ebf7c61d28477f7b3c72331b0396ea50fe51686645e6e71454bf7876686734353f3cc7e SHA512 4cd45d2a225f73880b9c1b3e6f1271c9a8e83458b39aa944e604fef1ac5c3c1334b23823647c8cc5e7ee63602aa88dd8c6af22b662fcfd48bafc0624471a2859
-EBUILD kismet-2019.12.2.ebuild 4806 BLAKE2B eff96d3957f26ff8616d1f4f3e1f1ce05cb16819a07e1d2c6d5894c2410455b57d23db1ce393f8c8b500f5a6699bf64c09b212806ec2714fb3b11cfa3a1a8c0e SHA512 221043f10fc049922646e60c5408626c0b6263f8403effae30f5cbced7b2472122565a3005a9fc56ef6dc9c8be9df8652595b501aa335335560a873987c31dd0
-EBUILD kismet-9999.ebuild 4806 BLAKE2B eff96d3957f26ff8616d1f4f3e1f1ce05cb16819a07e1d2c6d5894c2410455b57d23db1ce393f8c8b500f5a6699bf64c09b212806ec2714fb3b11cfa3a1a8c0e SHA512 221043f10fc049922646e60c5408626c0b6263f8403effae30f5cbced7b2472122565a3005a9fc56ef6dc9c8be9df8652595b501aa335335560a873987c31dd0
+EBUILD kismet-2019.09.1-r2.ebuild 4702 BLAKE2B 5ab2650fda3f9c669eb02d81e11c89a376e4704c46f1ad9b9a0b491c5accf56811edaea7fd4021ee23ee171207203c082e132a441ab147bc79dcea43e1ce5bb7 SHA512 4ea2cffec42a04b0e0588cc0a37f52b898b9dd81d5a72d17d13ec8b1eebaa1eea9d6d807de1bb1a1ebc345e264b9e7dfd1b77463fdf884631199e4d4c600225d
+EBUILD kismet-2019.12.2-r1.ebuild 4919 BLAKE2B b64aa866a750583e867308e5eb53aad49c4c897f13cd36c2d92e9881b1a1196dade4ce87968db86d0ed5cf6fc9e636917bb46830fe991ffee1936660680aff2c SHA512 ffa77d9843091abf23bf9789243567eb369d9cf3e505237647e7a4cef2b34025df243272f7ebf45445e4a908d6126b563442ca2ec5b5c8d0cc6d6daae46debd8
+EBUILD kismet-9999.ebuild 4919 BLAKE2B b64aa866a750583e867308e5eb53aad49c4c897f13cd36c2d92e9881b1a1196dade4ce87968db86d0ed5cf6fc9e636917bb46830fe991ffee1936660680aff2c SHA512 ffa77d9843091abf23bf9789243567eb369d9cf3e505237647e7a4cef2b34025df243272f7ebf45445e4a908d6126b563442ca2ec5b5c8d0cc6d6daae46debd8
 MISC metadata.xml 1545 BLAKE2B c1b1fe5d6f61ca1141bf0bec03e7f416a0c7e8ec2b15aaaefe0cfc763af9c385e791747eeaf6c3d0b83594acbb528e0c6ef4abfcb348edd027d77a5ef720fa83 SHA512 49e887edfcde73eea51e96dad9c648f70f59524fc0e3f6567aeff116bf33ad7b9e57f4e8dcdfd02b0fef524a101f172bf1035437a6138376b0a41f1e8e60af32
diff --git a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild b/net-wireless/kismet/kismet-2019.09.1-r1.ebuild
deleted file mode 100644
index 01ac8b25a826..000000000000
--- a/net-wireless/kismet/kismet-2019.09.1-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils multilib user python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
-	inherit git-r3
-	RESTRICT="strip"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/_beta/-BETA}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P/BETA/beta}
-
-	#normally we want an official release
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-
-	#but sometimes we want a git commit
-	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
-	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-
-	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-CDEPEND="
-	${PYTHON_DEPS}
-	networkmanager? ( net-misc/networkmanager:= )
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	mousejack? ( virtual/libusb:1 )
-	dev-libs/protobuf-c:=
-	dev-libs/protobuf:=
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	eapply_user
-
-	#just use set to fix setup.py
-	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable pcre) \
-		$(use_enable lm-sensors lmsensors) \
-		$(use_enable mousejack libusb) \
-		$(use_enable networkmanager libnm) \
-		--sysconfdir=/etc/kismet \
-		--disable-optimization
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	python_optimize
-	emake DESTDIR="${D}" forceconfigs
-
-	insinto /usr/share/${PN}
-	doins Makefile.inc
-
-	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_cap_pcapfile
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_cap_pcapfile
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
-
-migrate_config() {
-	einfo "Kismet Configuration files are now read from /etc/kismet/"
-	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
-		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
-		ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	fi
-	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
-		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
-	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
-		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test ${v} -lt 2019.07.2 ; then
-				migrate_config
-				break
-			fi
-			if ver_test ${v} -eq 9999 ; then
-				migrate_config
-				break
-			fi
-		done
-	fi
-}
diff --git a/net-wireless/kismet/kismet-2019.09.1-r2.ebuild b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild
new file mode 100644
index 000000000000..178c532ebfb5
--- /dev/null
+++ b/net-wireless/kismet/kismet-2019.09.1-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools eutils multilib user python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
+	inherit git-r3
+	RESTRICT="strip"
+else
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
+
+	#normally we want an official release
+	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+
+	#but sometimes we want a git commit
+	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+CDEPEND="
+	${PYTHON_DEPS}
+	networkmanager? ( net-misc/networkmanager:= )
+	dev-libs/glib:=
+	dev-libs/elfutils:=
+	sys-libs/zlib:=
+	dev-db/sqlite:=
+	net-libs/libmicrohttpd
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	mousejack? ( virtual/libusb:1 )
+	dev-libs/protobuf-c:=
+	dev-libs/protobuf:=
+	$(python_gen_cond_dep '
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-libs/ncurses:=
+	lm-sensors? ( sys-apps/lm-sensors )
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+	')
+	selinux? ( sec-policy/selinux-kismet )
+"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet_logging.conf || die
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+
+	eapply_user
+
+	#just use set to fix setup.py
+	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable pcre) \
+		$(use_enable lm-sensors lmsensors) \
+		$(use_enable mousejack libusb) \
+		$(use_enable networkmanager libnm) \
+		--sysconfdir=/etc/kismet \
+		--disable-optimization
+}
+
+src_install() {
+	emake DESTDIR="${D}" commoninstall
+	python_optimize
+	emake DESTDIR="${D}" forceconfigs
+
+	insinto /usr/share/${PN}
+	doins Makefile.inc
+
+	dodoc CHANGELOG README*
+	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
+
+migrate_config() {
+	einfo "Kismet Configuration files are now read from /etc/kismet/"
+	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+		ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+	fi
+	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 2019.07.2 ; then
+				migrate_config
+				break
+			fi
+			if ver_test ${v} -eq 9999 ; then
+				migrate_config
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-wireless/kismet/kismet-2019.12.2-r1.ebuild b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild
new file mode 100644
index 000000000000..73b8a86810b3
--- /dev/null
+++ b/net-wireless/kismet/kismet-2019.12.2-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit autotools eutils multilib user python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
+	inherit git-r3
+	RESTRICT="strip"
+else
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
+
+	#normally we want an official release
+	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+
+	#but sometimes we want a git commit
+	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
+	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	networkmanager? ( net-misc/networkmanager:= )
+	dev-libs/glib:=
+	dev-libs/elfutils:=
+	sys-libs/zlib:=
+	dev-db/sqlite:=
+	net-libs/libmicrohttpd
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	libusb? ( virtual/libusb:1 )
+	dev-libs/protobuf-c:=
+	dev-libs/protobuf:=
+	$(python_gen_cond_dep '
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-libs/ncurses:=
+	lm-sensors? ( sys-apps/lm-sensors )
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	ubertooth? ( net-wireless/ubertooth:= )
+	"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+	')
+	selinux? ( sec-policy/selinux-kismet )
+"
+PDEPEND="
+	rtlsdr? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+		net-wireless/rtl-sdr
+	)"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet_logging.conf || die
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in
+
+	eapply_user
+
+	#just use set to fix setup.py
+	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable libusb libusb) \
+		$(use_enable pcre) \
+		$(use_enable lm-sensors lmsensors) \
+		$(use_enable networkmanager libnm) \
+		$(use_enable ubertooth) \
+		--sysconfdir=/etc/kismet \
+		--disable-optimization
+}
+
+src_install() {
+	emake DESTDIR="${D}" commoninstall
+	python_optimize
+	emake DESTDIR="${D}" forceconfigs
+
+	insinto /usr/share/${PN}
+	doins Makefile.inc
+
+	dodoc CHANGELOG README*
+	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
+}
+
+pkg_preinst() {
+	if use suid; then
+		enewgroup kismet
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
+
+migrate_config() {
+	einfo "Kismet Configuration files are now read from /etc/kismet/"
+	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
+		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+	fi
+	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 2019.07.2 ; then
+				migrate_config
+				break
+			fi
+			if ver_test ${v} -eq 9999 ; then
+				migrate_config
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-wireless/kismet/kismet-2019.12.2.ebuild b/net-wireless/kismet/kismet-2019.12.2.ebuild
deleted file mode 100644
index 2a02da5e4246..000000000000
--- a/net-wireless/kismet/kismet-2019.12.2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils multilib user python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
-	inherit git-r3
-	RESTRICT="strip"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/_beta/-BETA}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P/BETA/beta}
-
-	#normally we want an official release
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-
-	#but sometimes we want a git commit
-	#COMMIT="6d6d486831c0f7ac712ffb8a3ff122c5063c3b2a"
-	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	networkmanager? ( net-misc/networkmanager:= )
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	libusb? ( virtual/libusb:1 )
-	dev-libs/protobuf-c:=
-	dev-libs/protobuf:=
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	ubertooth? ( net-wireless/ubertooth:= )
-	"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	selinux? ( sec-policy/selinux-kismet )
-"
-PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}]
-				net-wireless/rtl-sdr )"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	eapply_user
-
-	#just use set to fix setup.py
-	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable libusb libusb) \
-		$(use_enable pcre) \
-		$(use_enable lm-sensors lmsensors) \
-		$(use_enable networkmanager libnm) \
-		$(use_enable ubertooth) \
-		--sysconfdir=/etc/kismet \
-		--disable-optimization
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	python_optimize
-	emake DESTDIR="${D}" forceconfigs
-
-	insinto /usr/share/${PN}
-	doins Makefile.inc
-
-	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_cap_pcapfile
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_cap_pcapfile
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
-
-migrate_config() {
-	einfo "Kismet Configuration files are now read from /etc/kismet/"
-	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
-		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
-	fi
-	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
-		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
-	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
-		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test ${v} -lt 2019.07.2 ; then
-				migrate_config
-				break
-			fi
-			if ver_test ${v} -eq 9999 ; then
-				migrate_config
-				break
-			fi
-		done
-	fi
-}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 2a02da5e4246..73b8a86810b3 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -51,7 +51,9 @@ CDEPEND="
 	libusb? ( virtual/libusb:1 )
 	dev-libs/protobuf-c:=
 	dev-libs/protobuf:=
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
 	pcre? ( dev-libs/libpcre )
@@ -64,11 +66,18 @@ DEPEND="${CDEPEND}
 "
 
 RDEPEND="${CDEPEND}
-	dev-python/pyserial[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+	')
 	selinux? ( sec-policy/selinux-kismet )
 "
-PDEPEND="rtlsdr? ( dev-python/numpy[${PYTHON_USEDEP}]
-				net-wireless/rtl-sdr )"
+PDEPEND="
+	rtlsdr? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+		net-wireless/rtl-sdr
+	)"
 
 src_prepare() {
 	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
diff --git a/net-wireless/kismetdb/Manifest b/net-wireless/kismetdb/Manifest
index 60a6d11e6fc7..33538e0f1346 100644
--- a/net-wireless/kismetdb/Manifest
+++ b/net-wireless/kismetdb/Manifest
@@ -1,4 +1,4 @@
 DIST kismetdb-2019.05.05.tar.gz 31425 BLAKE2B 4aa4ee6924792376e84fb4a4fb86a425319ea21fc10dc5874df35aa551ce444f62dd381359bad994b89defee3fef8f0bed5e80ffc0d18c025bed28b5cb2efa45 SHA512 0b36c1d4dfb0ffb5749c32884ce1b44c1ece196ebaf07db66157aed2c649c2b4dc650a6553a2e263c4518da2f06f1602754917d5db07f3ab39efb63c38dd8327
-EBUILD kismetdb-2019.05.05.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
-EBUILD kismetdb-9999.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
+EBUILD kismetdb-2019.05.05.ebuild 705 BLAKE2B 991ba7bf261d18b0485457426ce0e4744cf742a231cc955c5dd0d3ee0db3b1b2c0308d10ff09c1d1feeb582ad8cf6dccfecfd7a6be19d8330b64c9f7e7560c87 SHA512 3d189f94faf493815dfdcdc03d349bd2f5e25ea0c06dcae394fdc405a79c688f8fa5456861d828b229613f90697ec6e3ef600fdefc3e66242fcc374713a1ee97
+EBUILD kismetdb-9999.ebuild 705 BLAKE2B 991ba7bf261d18b0485457426ce0e4744cf742a231cc955c5dd0d3ee0db3b1b2c0308d10ff09c1d1feeb582ad8cf6dccfecfd7a6be19d8330b64c9f7e7560c87 SHA512 3d189f94faf493815dfdcdc03d349bd2f5e25ea0c06dcae394fdc405a79c688f8fa5456861d828b229613f90697ec6e3ef600fdefc3e66242fcc374713a1ee97
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
index a0a5fee7f90e..bc8b41e5efe7 100644
--- a/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
+++ b/net-wireless/kismetdb/kismetdb-2019.05.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Kismetdb database log helper library"
diff --git a/net-wireless/kismetdb/kismetdb-9999.ebuild b/net-wireless/kismetdb/kismetdb-9999.ebuild
index a0a5fee7f90e..bc8b41e5efe7 100644
--- a/net-wireless/kismetdb/kismetdb-9999.ebuild
+++ b/net-wireless/kismetdb/kismetdb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Kismetdb database log helper library"
diff --git a/net-wireless/mousejack/Manifest b/net-wireless/mousejack/Manifest
index 7788236a0ade..9d0973cb2515 100644
--- a/net-wireless/mousejack/Manifest
+++ b/net-wireless/mousejack/Manifest
@@ -1,4 +1,4 @@
 AUX mousejack 858 BLAKE2B 5989e4f8c6645bc2feb8fe2ebbb9d2a2b5beba328016aa3c0c53ff20720b8e62cd08f83dc08dc608eb1b8ff27f3a92ea0a547547074bf9cca56276b0e63caad3 SHA512 31c89a7d85ab36a978439ecaaa03dbae1b1e8511d3aa02b1acb521854d81b4e8c012c202792abbf28f25283ec718ad4abd4d14a16ba4c8ead073c054490e9c84
 DIST mousejack-0.0_p20160726.tar.gz 34252 BLAKE2B 7511d29aa94f2fb5590b34d52eaa64150f3931933f043c9028e2d9cae61342a314a369e80e51e1150294afaadca06e58ec71ba4df4150a7a58d9a82d28919a58 SHA512 01fc87a347aea9ccad7611ef494da0521da278b7664e511409f0f822327b02f6fb555c5b5da86aae998b8fd34b7a55260d03594fbd9bb61c3ceca77e7d54958c
-EBUILD mousejack-0.0_p20160726-r1.ebuild 1256 BLAKE2B b5216698c51d765e2ce77d477a33854356a95b8d27c80c9ea8cc127206815b1189e19017c978fd259b53befdfbaea13b78ac4621b62e015daf6beaf8fe772b0c SHA512 a1b2635d221d160ea2ab0823e39aa892cc799e8b2b9b33b18d21aa155c4d18a2080f33d3af21fa3a0141d863724d5d636138844f49625b7dac6c40ca8f2234a2
+EBUILD mousejack-0.0_p20160726-r2.ebuild 1290 BLAKE2B 033a8ce1143e0762ffea92f11bca5243e27795baa346c340021c3ca508d27c071ecd845e83731ffe693c63dda158487b5c40aa1ecbcbacc7a806966d3cb5680c SHA512 99be115e435f1fb455e267c1576577c55f90071dba74e25ac91b3f6055a456d1c10d727a75d7e227650ee8456e63596d652bb686e773dea95516f6666ab413c9
 MISC metadata.xml 360 BLAKE2B ca2e678d3f96cece827270a7c5ee404a5e926c0a231979c4cc4442085fde9af1ce8d28f2a07b5bcf7f475eccb3b772d843ef36c03ae405205e710f5a3a240195 SHA512 ed42ea84e9b7f97be6aafb2cea3495e63abab197759a31795ebab8900f29caf500040b0deaf7997c6f598a8a8db3b2a64925d6df05f9b5b851037bd4e25b0b3a
diff --git a/net-wireless/mousejack/mousejack-0.0_p20160726-r1.ebuild b/net-wireless/mousejack/mousejack-0.0_p20160726-r1.ebuild
deleted file mode 100644
index 207ef24f16c2..000000000000
--- a/net-wireless/mousejack/mousejack-0.0_p20160726-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Firmware and research tools for nRF24LU1+ based USB dongles and breakout boards"
-HOMEPAGE="https://www.mousejack.com/"
-COMMIT="02b84d1c4e59c0fb98263c83b2e7c7f9863a3b93"
-SRC_URI="https://github.com/BastilleResearch/nrf-research-firmware/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/nrf-research-firmware-${COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="dev-embedded/sdcc[device-lib,mcs51,sdbinutils]"
-RDEPEND="${DEPEND}
-		${PYTHON_DEPS}
-		dev-python/pyusb[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	mv tools/lib tools/nrf24 || die
-	for file in tools/nrf24-*; do
-		sed -i 's#from lib#from nrf24#' ${file} || die
-	done
-	default
-}
-src_install() {
-	insinto /usr/share/${PN}
-	doins bin/dongle.{bin,formatted.bin,formatted.ihx}
-
-	python_domodule tools/nrf24
-	python_doscript tools/nrf24-*
-
-	python_scriptinto /usr/share/${PN}/prog
-	python_doscript prog/usb-flasher/usb-flash.py
-	python_doscript prog/usb-flasher/logitech-usb-flash.py
-	python_doscript prog/usb-flasher/unifying.py
-
-	dosbin "${FILESDIR}/mousejack"
-}
diff --git a/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild b/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
new file mode 100644
index 000000000000..f5149a462303
--- /dev/null
+++ b/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Firmware and research tools for nRF24LU1+ based USB dongles and breakout boards"
+HOMEPAGE="https://www.mousejack.com/"
+COMMIT="02b84d1c4e59c0fb98263c83b2e7c7f9863a3b93"
+SRC_URI="https://github.com/BastilleResearch/nrf-research-firmware/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/nrf-research-firmware-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="dev-embedded/sdcc[device-lib,mcs51,sdbinutils]"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pyusb[${PYTHON_MULTI_USEDEP}]
+	')"
+
+src_prepare() {
+	mv tools/lib tools/nrf24 || die
+	for file in tools/nrf24-*; do
+		sed -i 's#from lib#from nrf24#' ${file} || die
+	done
+	default
+}
+src_install() {
+	insinto /usr/share/${PN}
+	doins bin/dongle.{bin,formatted.bin,formatted.ihx}
+
+	python_domodule tools/nrf24
+	python_doscript tools/nrf24-*
+
+	python_scriptinto /usr/share/${PN}/prog
+	python_doscript prog/usb-flasher/usb-flash.py
+	python_doscript prog/usb-flasher/logitech-usb-flash.py
+	python_doscript prog/usb-flasher/unifying.py
+
+	dosbin "${FILESDIR}/mousejack"
+}
diff --git a/net-wireless/multimode/Manifest b/net-wireless/multimode/Manifest
index e6d93df0e08b..a40562eb56b1 100644
--- a/net-wireless/multimode/Manifest
+++ b/net-wireless/multimode/Manifest
@@ -1,4 +1,4 @@
 DIST multimode-1.4_p20140831.tar.xz 7648 BLAKE2B 1efec8c12e46b63f5501f1cf28f2e1f57d378c578656ecae771f0b98b873bbc1f119652a9f4607c9c0f3c5f3ca4f7109c48509f8339a1b22b8e3ef2af7214407 SHA512 891428e6c049cfd94787bd7580a59b3a9eb488dbf97cd21a1d82be04648e5423c3ce73983d38c5a3c280519ebea73c9572e9b0cdc7df453114e6aa220a58eaff
-EBUILD multimode-1.4_p20140831-r1.ebuild 1014 BLAKE2B 26fe4ac18b123cf0dbf83bfd2428d490d6d23db486ef0036311842e9fb56a9bc324bc8f3cb3e70caac5b9098f550480cb827f5e42a9ecc0d0e83ad7263c51d89 SHA512 87a27c09ea6bb831581127ecb9261b848aac1f74ead76e4f2f1149ca15b8fcb1eb6d06e89831b0431ff2e4787b71a5eb901ecec5fac1ccd942a7b913d9afef52
-EBUILD multimode-9999.ebuild 1012 BLAKE2B e1e426b5a3cfd57fc09d1578a4588c9abe7babb06cacdfde47732294b31e0d51d0bd585e871a36a58a95a2b6db21abc8e0a6b1819327333529bc163193ad1169 SHA512 4ca89c3de9a95dd830f7f3b9cd5f0403bd8f787497654de9a7ac8e6ea8b81f4eebb35466cd6abe0d1534a32517b61a729af457ba7266ab0a2e7384686787a6cb
+EBUILD multimode-1.4_p20140831-r2.ebuild 1021 BLAKE2B eb3dd39de35cb6290e09f142d42367c6f21fb9b65c05fbcfec24a3e82d1a6d2aa7fa47550cf66e2783de0a443efcd024058070dc345f0fbdce16b20f2a5b7d6a SHA512 7dad0686877039d3277f29861dfa685ca9d2209033ea0121706bb69a0ebb16a3442b72d45e4834a467e862ae13018dbad3a95451ba8d5836a94070943f898587
+EBUILD multimode-9999.ebuild 1019 BLAKE2B f033db89ecd60f881d2f69f190cdc64e26ab12aff10624225d40bbe5f55337d72694f525e4d7282f432c3dc3d2eae7f44bf479a8326836d13fc441758daddb77 SHA512 7184a74ac071012328c753f01b39f1e8943481b13645473a1f09198d5eb97d1ef1a4f6af0865f2c6cd03ffcca5234716b2d9716f9019ca6fbef24a145ac1cc60
 MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild b/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
deleted file mode 100644
index b57130054c5c..000000000000
--- a/net-wireless/multimode/multimode-1.4_p20140831-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
-HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
-	inherit subversion
-else
-	#SRC_URI="http://www.sbrac.org/files/${PN}-r${PV}.tar.gz"
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_USEDEP}]
-	>=net-wireless/gr-osmosdr-0.1.0:="
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	PYTHONPATH="${S}":"${PYTHONPATH}" emake
-}
-
-src_install() {
-	newbin ${PN}.py ${PN}
-	python_domodule ${PN}_helper.py
-	insinto /usr/share/${PN}
-	doins ${PN}.grc
-	python_fix_shebang "${ED}"/usr/bin
-}
diff --git a/net-wireless/multimode/multimode-1.4_p20140831-r2.ebuild b/net-wireless/multimode/multimode-1.4_p20140831-r2.ebuild
new file mode 100644
index 000000000000..3cdc6cd432c7
--- /dev/null
+++ b/net-wireless/multimode/multimode-1.4_p20140831-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="multimode radio decoder for rtl-sdr devices using gnuradio"
+HOMEPAGE="https://www.cgran.org/browser/projects/multimode/trunk"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://www.cgran.org/svn/projects/multimode/trunk"
+	inherit subversion
+else
+	#SRC_URI="http://www.sbrac.org/files/${PN}-r${PV}.tar.gz"
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DEPEND="${PYTHON_DEPS}
+	>=net-wireless/gnuradio-3.7:=[grc,utils,${PYTHON_SINGLE_USEDEP}]
+	>=net-wireless/gr-osmosdr-0.1.0:="
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	PYTHONPATH="${S}":"${PYTHONPATH}" emake
+}
+
+src_install() {
+	newbin ${PN}.py ${PN}
+	python_domodule ${PN}_helper.py
+	insinto /usr/share/${PN}
+	doins ${PN}.grc
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-wireless/multimode/multimode-9999.ebuild b/net-wireless/multimode/multimode-9999.ebuild
index 8de909cb3401..e8614f1c94d4 100644
--- a/net-wireless/multimode/multimode-9999.ebuild
+++ b/net-wireless/multimode/multimode-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ else
 fi
 
 DEPEND="${PYTHON_DEPS}
-	=net-wireless/gnuradio-9999:=[grc,utils,${PYTHON_USEDEP}]
+	=net-wireless/gnuradio-9999:=[grc,utils,${PYTHON_SINGLE_USEDEP}]
 	=net-wireless/gr-osmosdr-9999:="
 RDEPEND="${DEPEND}"
 
diff --git a/net-wireless/pyrit/Manifest b/net-wireless/pyrit/Manifest
index 5b7cefe2f7f0..19f6507d9a99 100644
--- a/net-wireless/pyrit/Manifest
+++ b/net-wireless/pyrit/Manifest
@@ -1,5 +1,5 @@
 DIST pyrit-0.4.0.tar.gz 191614 BLAKE2B 4cace6de8ba8d66445b9a082cc4d257b19ad2ac3a8003ce45c667dded0438e7da26bc6d25a3a33b2ef998d7af137c03b59610bc6e5637b6c7c70897e1b76d68a SHA512 8111b3f6f1a94319f5e146db6c184eb391c03ca554b20ea7227237afbc546a064898835ad16007333bb63aa725079046d413be11dfc3ecb76c77b6ac5096f7e9
 DIST pyrit-0.5.0.tar.gz 267614 BLAKE2B 2a0df7ebf2a06aee3367e9780d075ec2b6b76a8d9227ada17778eb386fa0243a06639ac27b8e7f6de2370d88836196288670c9d5112dada5dcb8b32efcae7da9 SHA512 912742cd7d9cd9231b9b3aa155a5170c0ba36c3865280423e100c1d12df34e093ee56305d8738d4f406abbfef9b1d540872872b8ef23d699466298d41289ad25
-EBUILD pyrit-0.4.0-r1.ebuild 788 BLAKE2B 931c997b9c16912075670e4705cd528fcc0928970811c6e8c1c9a61a1239145325bd61d71e29a0ab25216bba8633ba678c60a0563a0cc2a7be1801863045f4c3 SHA512 d457c03f473e57e25b8dbb33884c8b6f05866b54c9173f72f8d212142479ad787201abd8dd259301c6a7d01acaa59bbda8ec2223c18e7bdb6f1f553063e416e0
-EBUILD pyrit-0.5.0.ebuild 837 BLAKE2B 8ed2cfec705a25a18cb28d1d0f365c01231dc4c02c5add82bdbe416e2ea7ee460a4016271e6774b7171f783c4ce50ddb9366fc0bf1feca1fec22a910f9c2dc32 SHA512 fc09ff776268b188ee56ab7e789e41a72a47d15594bfccf24a158b648519e6108e5c652914257f24f57fc39ed5ed2e70e15c3c2f13f012bbf39070bd4e90fbbb
+EBUILD pyrit-0.4.0-r1.ebuild 829 BLAKE2B dc1cd9c6c96e71d02e95e030eebcfdd82cdde96168bd4d89bb0ddfc91b896ea0318da8a68f0cf20d8e8702c1bea023b215516c29c0d24e379de9943912712db9 SHA512 87a90cbfafa92d5ec0c0ba010d18ec998c17c4531fcd1097bde3435ea4df0d3d8d19cd3a217f717fed73c3c21c4ffdb26f2758aa73db12dc6415dae97d84c7ee
+EBUILD pyrit-0.5.0-r1.ebuild 878 BLAKE2B b4b40a474875926a0e196faf3e74670dbde5307aab9d4d9a735642a9dc0a4db04234d4beebc501c588ec35ec3167f8a188ea2f6db724130d6d43c1b7a73615d9 SHA512 4b9a2099780aa4e72076599bad5f01ef55d65493e42555e851e85cb9e2ad2e301c3ab5cb1ba275ff3db874cf1c521c2bed136a570c780e1d90259af0f2b0d01d
 MISC metadata.xml 748 BLAKE2B df71b5873e8e4dae8a99c55089dc2be37ebb1c9f952ad690e1fb420e65356b62a097685a33f97f229c8f3c56ec04fe6938913b8eb86e399b1ad4b9645dbd627a SHA512 df0f3711149c3db962c544ec7c4733e69039b1a27dfaf2fedfe0330049f4524c686b65c83307b3eafd5c592c41e9a75f8517d262ef7e66440d7f279164ff7e9a
diff --git a/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild b/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild
index 81a725a49490..5f819594a5f5 100644
--- a/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild
+++ b/net-wireless/pyrit/pyrit-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,11 @@ RESTRICT="!test? ( test )"
 
 DEPEND="dev-libs/openssl
 	net-libs/libpcap
-	test? ( >=net-analyzer/scapy-2[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep '
+			>=net-analyzer/scapy-2[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 RDEPEND=">=net-analyzer/scapy-2
 	opencl? ( net-wireless/cpyrit-opencl )
 	cuda? ( net-wireless/cpyrit-cuda )"
diff --git a/net-wireless/pyrit/pyrit-0.5.0-r1.ebuild b/net-wireless/pyrit/pyrit-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..451b7678ac0f
--- /dev/null
+++ b/net-wireless/pyrit/pyrit-0.5.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+MY_PN="${PN^}"
+DESCRIPTION="GPU-accelerated attack against WPA-PSK authentication"
+HOMEPAGE="https://github.com/JPaulMora/Pyrit"
+SRC_URI="https://github.com/JPaulMora/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda opencl test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/openssl
+	net-libs/libpcap
+	test? (
+		$(python_gen_cond_dep '
+			>=net-analyzer/scapy-2[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+RDEPEND=">=net-analyzer/scapy-2
+	opencl? ( net-wireless/cpyrit-opencl )
+	cuda? ( net-wireless/cpyrit-cuda )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_test() {
+	cd test
+	"${PYTHON}" test_pyrit.py
+}
diff --git a/net-wireless/pyrit/pyrit-0.5.0.ebuild b/net-wireless/pyrit/pyrit-0.5.0.ebuild
deleted file mode 100644
index 0ed8d1961bda..000000000000
--- a/net-wireless/pyrit/pyrit-0.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-MY_PN="${PN^}"
-DESCRIPTION="GPU-accelerated attack against WPA-PSK authentication"
-HOMEPAGE="https://github.com/JPaulMora/Pyrit"
-SRC_URI="https://github.com/JPaulMora/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cuda opencl test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-libs/openssl
-	net-libs/libpcap
-	test? ( >=net-analyzer/scapy-2[${PYTHON_USEDEP}] )"
-RDEPEND=">=net-analyzer/scapy-2
-	opencl? ( net-wireless/cpyrit-opencl )
-	cuda? ( net-wireless/cpyrit-cuda )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_test() {
-	cd test
-	"${PYTHON}" test_pyrit.py
-}
diff --git a/net-wireless/reaver/Manifest b/net-wireless/reaver/Manifest
index 0994b99b79ff..2fcf4a590cc3 100644
--- a/net-wireless/reaver/Manifest
+++ b/net-wireless/reaver/Manifest
@@ -1,4 +1,4 @@
 AUX reaver-1.6.5-confdir.patch 281 BLAKE2B d8c1b89bf6a5291b75b99182a2a9b2149f6f83191fa5c0586ef5780acbc6e7d5fcf496f9b1f4715df0a3f7b097073e9a1a80ddc218c96d285aa297ddb595e1cd SHA512 36e2ede41de78573dae93727cee30c7f4031edce6b485d940a3f30209573e21be06d3e75ffb8239105e383bbd849fb728dc9ce9d28c5bab7d85b1b9526a67f5f
 DIST reaver-1.6.5.tar.gz 479441 BLAKE2B 21a1c54da559be4346b0c874947e982ea49ec6f20e612e3699d25524d49681a197a2a8cad0a31dd8dba919d065de48082572a471aa4f736397066edf7f7d8a43 SHA512 3e70d9fffefee3f6d60e72d7d7b1da91032e184c7d27f94b9f26e2260b7274d491f2e41f8056b386a211b9838d21afc6b65a8a826d310b51fc1065fa9e135dc0
-EBUILD reaver-1.6.5.ebuild 724 BLAKE2B a49ce91b2bc68438ab73917f2262e567edfa227de7528cd408c8b1cbaf8177672de9b234ae2776b5c53b719966a02410d86095302b1acbb9fab44911e55bcd33 SHA512 6402633b4819bb1f1036d1c7925e5002ac74025096bfcc4324f878cc486a907501a08548de4092e4a40853b9a6da1998ecfb68ddc2ae5227441c00efa7ae471b
+EBUILD reaver-1.6.5.ebuild 735 BLAKE2B 01f0f63737879c54b45580ca228d6ee64453f79e8225130fa49fc4cffa5e02143b752c2a9108384895fb79ad560bc444716c04ae171b6ed076d47159a292aa8e SHA512 22f79e17cd0b12e052bce31b0922e12be8f32e72596ca90b51d33ab1b6422f43868ad56399eb3b6b69f68e0955c1f1b1abd371f47fb91663b1a8d8ad8d77ad11
 MISC metadata.xml 461 BLAKE2B b23d4c4b8865ca1c58140486368ee2f4daa29d67af27cc5cce63c137d652c4d28b131140807735e9a5125790cc53629eeef074705278c5a550073d92c3447894 SHA512 503400e6ae36b1819015f51f0e5e01d7ba3c18c0133d625f3c35242dcaef5cd5ce72d57caf1b18892dee2865fcd1af1313f42140f360c249f2048874985d5d5d
diff --git a/net-wireless/reaver/reaver-1.6.5.ebuild b/net-wireless/reaver/reaver-1.6.5.ebuild
index dd1c5685b545..a46582c37173 100644
--- a/net-wireless/reaver/reaver-1.6.5.ebuild
+++ b/net-wireless/reaver/reaver-1.6.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN="reaver-wps-fork-t6x"
 
 DESCRIPTION="Brute force attack against Wifi Protected Setup"
-HOMEPAGE="https://github.com/t6x/${MY_PN}"
+HOMEPAGE="https://github.com/t6x/reaver-wps-fork-t6x"
 SRC_URI="https://github.com/t6x/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-wireless/wifi-radar/Manifest b/net-wireless/wifi-radar/Manifest
index e30da8c96046..f45011ca3526 100644
--- a/net-wireless/wifi-radar/Manifest
+++ b/net-wireless/wifi-radar/Manifest
@@ -1,3 +1,3 @@
 DIST wifi-radar-2.0.s08.tar.bz2 62781 BLAKE2B f7ea7a2a884ac2ddc4dcc74f44c1bd4799dcf7ce03a19a5c32aea886f0c4bca47a33fe8789f1b75d26867604b9f2703e1f6664e789636605faf6bf313ee36078 SHA512 8b14a227c4e1e60f05c981b51777dcb5318a1dda2026bc32e9fd761adb0a4243caabd7444768630ad54258f9f065f4c7cc73e9d8b17bc2ccd98f63f3119ce584
-EBUILD wifi-radar-2.0.8-r2.ebuild 1779 BLAKE2B 35ac085a2b725201aa782555533d1f6e18ef7c88db2a7a0f21d356295d8ed1a9d9b9beb608d0738c494bb8a0aef5b186b62ee1ecb08d35fcd9646c0613da22dc SHA512 afb5e98dcc5ea9e5cafa143ca1fb2ecd2dde01c700b468b9c61239a40cd33081d90fcebea017bd84fe7bb81a061bc77dbc65ac9978929f4e694d10591e264792
+EBUILD wifi-radar-2.0.8-r3.ebuild 1812 BLAKE2B 1c3df36a678c81c9992e48b598390c0f9822535009734c02522e3bb9e4fa7a22f719d4a3ad0d13d888719ca8724f02404ff6cf88beb6a76da41c282b5f2c4693 SHA512 8f38bdac4fcc9f40773563858952a3bf8c4b0f8c88a34f7faa0a073c28f343353b8e10353293d2dbf0c4d910e13d13ba6de3640f8e5670461125f5f62774ee6b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-wireless/wifi-radar/wifi-radar-2.0.8-r2.ebuild b/net-wireless/wifi-radar/wifi-radar-2.0.8-r2.ebuild
deleted file mode 100644
index ccaf9ea896b5..000000000000
--- a/net-wireless/wifi-radar/wifi-radar-2.0.8-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils versionator python-single-r1 readme.gentoo
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_PL="$(get_version_component_range 3)"
-MY_PL="s0${MY_PL}"
-MY_PV="${MY_PV}.${MY_PL}"
-
-DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles"
-HOMEPAGE="http://wifi-radar.tuxfamily.org/"
-SRC_URI="http://wifi-radar.tuxfamily.org/pub/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-admin/sudo
-	>=dev-python/pygtk-2.16.0-r1[${PYTHON_USEDEP}]
-	>=net-wireless/wireless-tools-29
-	|| ( net-misc/dhcpcd net-misc/dhcp net-misc/pump )
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Remember to edit configuration file /etc/${PN}.conf to suit your needs.
-To use ${PN} with a normal user (with sudo) add:
-%users   ALL = /usr/sbin/${PN}
-in your /etc/sudoers. Also, find the line saying:
-Defaults      env_reset
-and modify it as follows:
-Defaults      env_keep=DISPLAY
-
-Then launch ${PN}.sh
-"
-
-src_prepare() {
-	sed -i "s:/etc/wpa_supplicant.conf:/etc/wpa_supplicant/wpa_supplicant.conf:" ${PN} || die
-	sed -i -e "s:/sbin/ifconfig:/bin/ifconfig:" ${PN} || die
-	python_fix_shebang .
-}
-
-src_install() {
-	dosbin ${PN}
-	dobin ${PN}.sh
-	doicon -s scalable pixmaps/${PN}.svg
-	doicon -s 32 pixmaps/wifi_radar_32x32.png
-	doicon pixmaps/${PN}.png
-	make_desktop_entry ${PN}.sh "WiFi Radar" ${PN} Network
-
-	doman man/man1/${PN}.1 man/man5/${PN}.conf.5
-
-	cd docs
-	dodoc BUGS CREDITS DEVELOPER_GUIDELINES HISTORY README README.WPA-Mini-HOWTO.txt TODO
-	keepdir /etc/${PN}
-
-	readme.gentoo_create_doc
-}
diff --git a/net-wireless/wifi-radar/wifi-radar-2.0.8-r3.ebuild b/net-wireless/wifi-radar/wifi-radar-2.0.8-r3.ebuild
new file mode 100644
index 000000000000..0e2d255179ee
--- /dev/null
+++ b/net-wireless/wifi-radar/wifi-radar-2.0.8-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils versionator python-single-r1 readme.gentoo
+
+MY_PV="$(get_version_component_range 1-2)"
+MY_PL="$(get_version_component_range 3)"
+MY_PL="s0${MY_PL}"
+MY_PV="${MY_PV}.${MY_PL}"
+
+DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles"
+HOMEPAGE="http://wifi-radar.tuxfamily.org/"
+SRC_URI="http://wifi-radar.tuxfamily.org/pub/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-admin/sudo
+	$(python_gen_cond_dep '
+		>=dev-python/pygtk-2.16.0-r1[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/wireless-tools-29
+	|| ( net-misc/dhcpcd net-misc/dhcp net-misc/pump )
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Remember to edit configuration file /etc/${PN}.conf to suit your needs.
+To use ${PN} with a normal user (with sudo) add:
+%users   ALL = /usr/sbin/${PN}
+in your /etc/sudoers. Also, find the line saying:
+Defaults      env_reset
+and modify it as follows:
+Defaults      env_keep=DISPLAY
+
+Then launch ${PN}.sh
+"
+
+src_prepare() {
+	sed -i "s:/etc/wpa_supplicant.conf:/etc/wpa_supplicant/wpa_supplicant.conf:" ${PN} || die
+	sed -i -e "s:/sbin/ifconfig:/bin/ifconfig:" ${PN} || die
+	python_fix_shebang .
+}
+
+src_install() {
+	dosbin ${PN}
+	dobin ${PN}.sh
+	doicon -s scalable pixmaps/${PN}.svg
+	doicon -s 32 pixmaps/wifi_radar_32x32.png
+	doicon pixmaps/${PN}.png
+	make_desktop_entry ${PN}.sh "WiFi Radar" ${PN} Network
+
+	doman man/man1/${PN}.1 man/man5/${PN}.conf.5
+
+	cd docs
+	dodoc BUGS CREDITS DEVELOPER_GUIDELINES HISTORY README README.WPA-Mini-HOWTO.txt TODO
+	keepdir /etc/${PN}
+
+	readme.gentoo_create_doc
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c7704f5bd9c0..65787821b54a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index efc1b6a69787..92074cd6bcb5 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -1,6 +1,21 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Patrick McLean <chutzpah@gentoo.org> (2020-02-05)
+# sys-cluster/ceph no longer supports x86, versions that support
+# it no longer build thanks to python2 removals
+app-backup/bareos cephfs rados rados-striper
+app-emulation/ganeti rbd
+app-emulation/libvirt rbd
+app-emulation/qemu rbd
+net-analyzer/rrdtool rados
+net-fs/samba ceph
+net-libs/xrootd rbd
+sys-block/fio rbd
+sys-block/tgt rbd
+sys-fs/multipath-tools rbd
+www-servers/uwsgi uwsgi_plugins_rados
+
 # Robin H. Johnson <robbat2@gentoo.org> (2019-12-06)
 # PPS should work on all arches, but only keyworded on some arches
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
diff --git a/profiles/arch/arm/package.use.force b/profiles/arch/arm/package.use.force
index f8f2470ba9d2..7efbbdad1e8b 100644
--- a/profiles/arch/arm/package.use.force
+++ b/profiles/arch/arm/package.use.force
@@ -1,11 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Joonas Niilola <juippis@gentoo.org> (2019-07-31)
-# Force 'unwind' on for arm with dev-libs/efl
-# 618232
-dev-libs/efl unwind
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-02-16)
 # Force the host target
 dev-lang/rust llvm_targets_ARM
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 60600bd9ecbb..74f67787057b 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -381,10 +381,6 @@ www-client/chromium tcmalloc
 # Needs deps tested.
 net-misc/curl  metalink
 
-# Mike Frysinger <vapier@gentoo.org> (2015-03-16)
-# Needs sci-physics/bullet tested #499974
-dev-libs/efl physics
-
 # Roy Bamford <neddyseagoon@gentoo.org> (2017-01-26)
 # gcj-6.3 won't bootstrap icedtea 7
 >=sys-devel/gcc-6 gcj
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index e9b0c83de944..680070969b33 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Joonas Niilola <juippis@gentoo.org> (2020-02-08)
+# Dependency not stabilized on this arch.
+media-libs/libcaca imlib
+
 # Craig Andrews <candrews@gentoo.org> (2019-11-26)
 # net-libs/quiche is an early HTTP/3 implementation
 # not yet ready for everyone.
diff --git a/profiles/arch/hppa/package.use.force b/profiles/arch/hppa/package.use.force
new file mode 100644
index 000000000000..32eca03d7435
--- /dev/null
+++ b/profiles/arch/hppa/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Joonas Niilola <juippis@gentoo.org> (2020-02-08)
+# Force 'lua' to be used with efl, since luajit is not keyworded.
+dev-libs/efl lua
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index eb7ea27f35ce..2a7abacc6860 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,23 @@
 
 #--- END OF EXAMPLES ---
 
+# Mart Raudsepp <leio@gentoo.org> (2020-02-09)
+# No stable gnome-base/dconf on hppa.
+dev-libs/glib dbus
+
+# Mart Raudsepp <leio@gentoo.org> (2020-02-08)
+# No stable x11-libs/gtk+ on hppa.
+gnome-base/librsvg tools
+dev-libs/appstream-glib fonts
+dev-python/pygobject test
+app-mobilephone/gnokii X
+net-analyzer/nmap zenmap
+media-libs/lv2 plugins
+
+# Mart Raudsepp <leio@gentoo.org> (2020-02-08)
+# app-text/enchant stable timeout, bug #662484
+dev-lang/php enchant
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-06-05)
 # sys-auth/polkit stable timeout, bug #661470
 sys-apps/pcsc-lite policykit
@@ -31,10 +48,6 @@ dev-lang/python bluetooth
 # net-analyzer/nagios (or icinga) has no stable keywords, bug #676222
 sys-libs/freeipmi nagios
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2018-12-02)
-# gnome-base/nautilus is not stable
-media-sound/easytag nautilus
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2018-05-20)
 # media-libs/libraw is not stable
 media-gfx/imagemagick raw
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index f382fb9baf6c..9f8385b3b0d1 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -4,6 +4,13 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Mart Raudsepp <leio@gentoo.org> (2020-02-08)
+# No stable x11-libs/gtk+ on hppa.
+gtk
+gtk2
+gtk3
+wxwidgets
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-01-21)
 # No stable media-sound/pulseaudio on hppa.
 pulseaudio
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index d01da7d3a876..55910a3f7b80 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Joonas Niilola <juippis@gentoo.org> (2020-02-02)
-# luajit is not keyworded on this arch.
-dev-libs/efl luajit
+# Joonas Niilola <juippis@gentoo.org> (2020-02-08)
+# Dependency not keyworded on this arch.
+dev-libs/dbus-c++ ecore
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
 # media-libs/libheif is not keyworded
@@ -53,10 +53,6 @@ media-sound/lame debug
 # USE=server does not compile and needs upstream fix: bug #662040
 >=sys-devel/gdb-8.1 server
 
-# Joonas Niilola <juippis@gentoo.org> (2018-06-17)
-# Optional dependency not available for this arch
-dev-libs/efl vlc
-
 # Thomas Deutschmann <whissi@gentoo.org> (2018-06-06)
 # Needs sys-apps/fakechroot which isn't keyworded
 app-arch/rpm test
@@ -236,10 +232,6 @@ net-misc/spice-gtk smartcard webdav
 # dev-lang/luajit lacks ia64 keyword, bug #551540
 dev-libs/libpeas lua
 
-# Mike Frysinger <vapier@gentoo.org> (2015-03-16)
-# Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
-dev-libs/efl physics sdl
-
 # Alexis Ballier <aballier@gentoo.org> (2015-02-11)
 # Missing ffmpeg deps, bug #510340
 media-video/ffmpeg gme ssh
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index a4eba93324fa..00d770877050 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -17,10 +17,6 @@ net-libs/gnutls test-full
 # Needs libepoxy keywording, bug #510940
 x11-base/xorg-server wayland
 
-# Mike Frysinger <vapier@gentoo.org> (2015-03-16)
-# Needs sci-physics/bullet tested #499974
-dev-libs/efl physics
-
 # Mikle Kolyada <zlogene@gentoo.org> (2013-07-11)
 # Tests for dev-perl/Error require >=dev-perl/Test-Pod-Coverage-1.40.0 (bug #351636)
 dev-perl/Error test
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 0aab84d0c77e..ee28e15c7f60 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Joonas Niilola <juippis@gentoo.org> (2020-02-02)
-# luajit is not keyworded on this arch.
-dev-libs/efl luajit
-
 # Michał Górny <mgorny@gentoo.org> (2018-01-23)
 # USE=collab requires unkeyworded net-libs/loudmouth & dev-cpp/asio.
 # USE=grammar requires dev-libs/link-grammar.
@@ -86,10 +82,6 @@ dev-python/numpydoc test
 # GNOME Shell does not work on mips
 net-misc/wicd gnome-shell
 
-# Mike Frysinger <vapier@gentoo.org> (2015-03-16)
-# Needs sci-physics/bullet tested #499974
-dev-libs/efl physics
-
 # Matthias Maier <tamiko@gentoo.org> (2014-12-24)
 # sys-devel/clang is not keyworded
 app-doc/doxygen clang
diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force
index 508ff65b5c70..fad88c19802f 100644
--- a/profiles/arch/powerpc/package.use.force
+++ b/profiles/arch/powerpc/package.use.force
@@ -1,15 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is stable on ppc
 sys-firmware/seabios -binary
 
-# Joonas Niilola <juippis@gentoo.org> (2019-01-12)
-# Force 'unwind' on for ppc and ppc64 with dev-libs/efl
-# #668486, #657750
-dev-libs/efl unwind
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-12-25)
 # Enable powerpc target by default.
 dev-lang/rust llvm_targets_PowerPC
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.force b/profiles/arch/powerpc/ppc64/64ul/package.use.force
new file mode 100644
index 000000000000..32eca03d7435
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.force
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Joonas Niilola <juippis@gentoo.org> (2020-02-08)
+# Force 'lua' to be used with efl, since luajit is not keyworded.
+dev-libs/efl lua
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index a57d6b4ffd4a..663227af0ae2 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -67,7 +67,7 @@ net-misc/curl brotli curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss http2 rtmp
 net-misc/ntp openntpd snmp vim-syntax zeroconf
 net-nds/openldap cxx kerberos sasl
 sys-apps/kmod doc
-sys-apps/portage epydoc
+sys-apps/portage apidoc epydoc
 sys-apps/rng-tools nistbeacon pkcs11
 sys-auth/pambase pam_krb5 pam_ssh passwdqc mktemp
 sys-devel/automake test
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 9d0e0614f8ba..7f1edaf49c01 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -47,10 +47,6 @@ dev-libs/libpcre2 jit
 # Not tested
 net-mail/dovecot lz4
 
-# Mike Frysinger <vapier@gentoo.org> (2015-03-16)
-# Needs sci-physics/bullet tested #499974
-dev-libs/efl physics
-
 # Sergey Popov <pinkbyte@gentoo.org> (2015-02-18)
 # Not tested
 app-portage/layman g-sorcery
diff --git a/profiles/arch/s390/package.use.stable.mask b/profiles/arch/s390/package.use.stable.mask
new file mode 100644
index 000000000000..7ab1ed8d80b2
--- /dev/null
+++ b/profiles/arch/s390/package.use.stable.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Joonas Niilola <juippis@gentoo.org> (2020-02-08)
+# Dependency not stabilized on this arch.
+media-libs/libcaca imlib
diff --git a/profiles/arch/sh/package.use.mask b/profiles/arch/sh/package.use.mask
index ed4c5d4ab6c8..70473e984988 100644
--- a/profiles/arch/sh/package.use.mask
+++ b/profiles/arch/sh/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Joonas Niilola <juippis@gentoo.org> (2020-02-02)
-# luajit is not keyworded on this arch.
-dev-libs/efl luajit
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-12-02)
 # dev-util/systemtap is not keyworded on sh
 sys-libs/glibc systemtap
@@ -37,10 +33,6 @@ x11-base/xorg-server wayland
 # Not tested
 net-mail/dovecot lz4
 
-# Mike Frysinger <vapier@gentoo.org> (2015-03-16)
-# Needs sci-physics/bullet tested #499974
-dev-libs/efl physics
-
 # Brian Evans <grknight@gentoo.org> (2014-06-03)
 # unkeworded dependencies (bug #429708)
 >=dev-db/mysql-5.5 jemalloc
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index fc9f9befb6e8..e8e993de3928 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Joonas Niilola <juippis@gentoo.org> (2020-02-02)
-# luajit is not keyworded on this arch.
-dev-libs/efl luajit
+# Joonas Niilola <juippis@gentoo.org> (2020-02-08)
+# Dependency not keyworded on this arch.
+dev-libs/dbus-c++ ecore
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-01-26)
 # media-libs/libheif is not keyworded
@@ -214,10 +214,6 @@ gnome-base/gvfs nfs
 # dev-lua/lgi lacks sparc keyword, bug #551540
 dev-libs/libpeas lua
 
-# Mike Frysinger <vapier@gentoo.org> (2015-03-16)
-# Needs sci-physics/bullet & media-libs/libsdl2 tested #499974
-dev-libs/efl physics sdl
-
 # Alexis Ballier <aballier@gentoo.org> (2015-02-11)
 # Missing ffmpeg deps, bug #510340
 media-video/ffmpeg x265
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index fcdb7cb7a8d8..8b7177d80674 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -84,10 +84,6 @@ dev-python/pymongo test
 # media-libs/qtav not keyworded
 media-video/orion qtav
 
-# Thomas Deutschmann <whissi@gentoo.org> (2018-08-23)
-# Dependency sys-cluster/ceph is keyworded for x86
-net-fs/samba -ceph
-
 # Rick Farina <zerochaos@gentoo.org> (2018-06-27)
 # Catalyst has support for assembling bootloader on this arch
 dev-util/catalyst -system-bootloader
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 63e97021e23e..b28fb1ff286b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,12 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2020-02-08)
+# The dependency is python-single-r1 while the package (and its revdeps)
+# are python-r1.
+dev-python/rdflib redland
+www-apps/venus redland
+
 # Michał Górny <mgorny@gentoo.org> (2020-02-05)
 # Requires google-api-python-client with Python 2 which is no longer
 # supported by its dependencies.
@@ -22,7 +28,7 @@ dev-python/zeep tornado
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-29)
 # Require dev-python/epydoc which is being removed.
-<=app-admin/system-config-printer-1.5.12 doc
+<=app-admin/system-config-printer-1.5.12-r1 doc
 <=dev-python/cosmolopy-0.1.104-r2 doc
 <=dev-python/dbus-python-1.2.4 doc
 <=dev-python/pycrypto-2.6.1-r2 doc
@@ -104,9 +110,9 @@ sci-visualization/veusz fits
 # eMovix is being removed.
 kde-apps/k3b emovix
 
-# Patrick McLean <chutzpah@gentoo.org> (2910-11-07)
+# Patrick McLean <chutzpah@gentoo.org> (2019-11-07)
 # Collides with sys-libc/glibc[crypt]
-sys-libs/libxcrypt system
+sys-libs/libxcrypt split-usr system
 
 # Michał Górny <mgorny@gentoo.org> (2019-10-05)
 # net-libs/openslp is being removed.
diff --git a/profiles/default/linux/ppc64/17.0/musl/make.defaults b/profiles/default/linux/ppc64/17.0/musl/make.defaults
index 34e0d7abf46c..253d3c25da04 100644
--- a/profiles/default/linux/ppc64/17.0/musl/make.defaults
+++ b/profiles/default/linux/ppc64/17.0/musl/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="powerpc64-unknown-linux-musl"
+CHOST="powerpc64-gentoo-linux-musl"
 CHOST_ppc64="${CHOST}"
 LIBDIR_ppc64="lib"
diff --git a/profiles/default/linux/ppc64le/17.0/musl/make.defaults b/profiles/default/linux/ppc64le/17.0/musl/make.defaults
index 5d7c33d57870..94b5aaa827a9 100644
--- a/profiles/default/linux/ppc64le/17.0/musl/make.defaults
+++ b/profiles/default/linux/ppc64le/17.0/musl/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="powerpc64le-unknown-linux-musl"
+CHOST="powerpc64le-gentoo-linux-musl"
 CHOST_ppc64="${CHOST}"
 LIBDIR_ppc64="lib"
diff --git a/profiles/default/linux/x86/package.use.mask b/profiles/default/linux/x86/package.use.mask
index fa4131e93f50..a5dc4a4668c2 100644
--- a/profiles/default/linux/x86/package.use.mask
+++ b/profiles/default/linux/x86/package.use.mask
@@ -1,6 +1,22 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Patrick McLean <chutzpah@gentoo.org> (2020-02-06)
+# sys-cluster/ceph no longer supports x86, versions that support
+# it no longer build thanks to python2 removals
+# for some reason profiles/arch/x86 is not catching everything
+app-backup/bareos cephfs rados rados-striper
+app-emulation/ganeti rbd
+app-emulation/libvirt rbd
+app-emulation/qemu rbd
+net-analyzer/rrdtool rados
+net-fs/samba ceph
+net-libs/xrootd rbd
+sys-block/fio rbd
+sys-block/tgt rbd
+sys-fs/multipath-tools rbd
+www-servers/uwsgi uwsgi_plugins_rados
+
 # Mike Frysinger <vapier@gentoo.org> (2016-05-08)
 # This target supports VTV #547040.
 >=sys-devel/gcc-4.9 -vtv
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 957ea16b4f30..c265c0639db4 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -59,7 +59,7 @@ gnome-extra/gnome-user-share
 app-admin/equo
 app-admin/matter
 app-admin/packagekit
-=app-admin/packagekit-base-1.1.12
+~app-admin/packagekit-base-1.1.12
 app-admin/packagekit-gtk
 app-admin/packagekit-qt
 <app-admin/salt-2018
diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask
index ed28e6e8aad5..63635efd4421 100644
--- a/profiles/features/selinux/package.use.mask
+++ b/profiles/features/selinux/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Jeroen Roovers <jer@gentoo.org> (2019-02-23)
@@ -37,13 +37,13 @@ net-wireless/bluez user-session
 # SELinux userspace 3.0 dropped python2.7 support
 app-admin/equo python_targets_python2_7
 app-admin/matter python_targets_python2_7
-app-admin/packagekit-base python_targets_python2_7
+app-admin/packagekit-base python_targets_python2_7 python_single_target_python2_7
 app-admin/salt python_targets_python2_7
 app-admin/webapp-config python_targets_python2_7
 app-portage/diffmask python_targets_python2_7
 app-portage/distpatch python_targets_python2_7
 app-portage/elicense python_targets_python2_7
-app-portage/elogviewer python_targets_python2_7
+app-portage/elogviewer python_targets_python2_7 python_single_target_python2_7
 app-portage/euscan python_targets_python2_7
 app-portage/flaggie python_targets_python2_7
 app-portage/g-sorcery python_targets_python2_7
@@ -58,7 +58,7 @@ app-portage/porthole python_targets_python2_7
 app-portage/portpeek python_targets_python2_7
 app-portage/repoman python_targets_python2_7
 app-portage/smart-live-rebuild python_targets_python2_7
-app-portage/unsymlink-lib python_targets_python2_7
+app-portage/unsymlink-lib python_targets_python2_7 python_single_target_python2_7
 dev-java/java-config python_targets_python2_7
 kde-frameworks/frameworkintegration appstream
 net-proxy/http-replicator python_targets_python2_7
diff --git a/profiles/package.mask b/profiles/package.mask
index fb992608c188..e0d511b1e24b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,38 @@
 
 #--- END OF EXAMPLES ---
 
+# David Seifert <soap@gentoo.org> (2020-02-10)
+# Unmaintained, only live ebuild, doesn't build, last release over 7
+# years ago, EAPI 4. Removal in 15 days. Bug #593008.
+dev-lang/rebol
+dev-lang/rebol-bin
+
+# David Seifert <soap@gentoo.org> (2020-02-10)
+# Unmaintained, EAPI 4, doesn't respect CFLAGS and LDFLAGS, which masks
+# undefined symbols in the shared object, upstream gone, no other distro
+# packages this anymore, no revdeps. Removal in 30 days.
+sys-apps/hbaapi
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-02-09)
+# Dead upstream, broken by Qt 5.14, bug #703930. Masked for removal in 30 days.
+net-nntp/kwooty
+
+# Mike Pagano <mpagano@gentoo.org> (2020-02-07)
+# The standalone ebuild for this driver is made
+# unnecessary as it is included in the package:
+# sys-kernel/linux-firmware. Bug #708622
+sys-firmware/iwl6050-ucode
+
+# Patrick McLean <chutzpah@gentoo.org> (2020-02-07)
+# Mask until sys-libs/libxcrypt[system] is unmasked
+>=virtual/libcrypt-2
+
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-02-05)
+# Blocks dev-python/pygtk removal, bug #706478. Masked for removal in 30 days.
+dev-libs/libappindicator:2
+dev-perl/Gtk2-AppIndicator
+x11-plugins/pidgin-indicator
+
 # Michał Górny <mgorny@gentoo.org> (2020-02-05)
 # Unmaintained.  No Python 3 support.  Last release ~2014, homepage
 # gone.
@@ -52,11 +84,11 @@ dev-python/egenix-mx-base
 sci-chemistry/shelx
 
 # Joonas Niilola <juippis@gentoo.org> (2020-02-05)
-# Stagnant upstream with latest release from 2016, python2-only, no maintainer 
-# in Gentoo, no notable ebuild action in years, multiple bugs open. Blocks 
-# pygtk removal. 
-# Switch to alternatives such as, 
-# net-misc/connman, net-misc/dhcpcd, net-misc/netifrc, net-misc/NetworkManager 
+# Stagnant upstream with latest release from 2016, python2-only, no maintainer
+# in Gentoo, no notable ebuild action in years, multiple bugs open. Blocks
+# pygtk removal.
+# Switch to alternatives such as,
+# net-misc/connman, net-misc/dhcpcd, net-misc/netifrc, net-misc/NetworkManager
 # and so on. Removal in ~90 days. #708316
 net-misc/wicd
 
@@ -603,24 +635,12 @@ dev-lang/vala:0.42
 # https://bugs.gentoo.org/705144
 =dev-util/meson-0.53.0
 
-# Göktürk Yüksek <gokturk@gentoo.org> (2020-01-08)
-# Declared deprecated by upstream and is no longer being maintained.
-# Use app-crypt/yubikey-manager[,-qt] to configure a Yubikey device
-# over CCID.
-# Removal in 30 days.
-app-crypt/libykneomgr
-
-# Ulrich Müller <ulm@gentoo.org> (2020-01-07)
-# No upstream SRC_URI. No license, so it cannot be mirrored.
-# Masked for removal in 30 days. Bug #702936.
-media-fonts/nepali-fonts
-
 # Ulrich Müller <ulm@gentoo.org> (2020-01-06)
 # Snapshots from Git, masked for testing.
 =app-editors/emacs-27.0.50_pre*
 
 # Jonas Stein <jstein@gentoo.org> (2019-12-30)
-# Package masked for removal. Broken SRC_URI, 
+# Package masked for removal. Broken SRC_URI,
 # last upstream activity was ~16 years ago.
 # Bug #704316.
 # Removal after 2020-03-01
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index eba77f32db7b..38e4896fc000 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2020-02-05)
+# Required by many packages, most notably Mozilla products
+dev-lang/python sqlite
+
 # Lars Wendler <polynomial-c@gentoo.org> (2019-03-20)
 # Enable client by default. Usually desktop users need the client.
 net-fs/samba client
@@ -54,7 +58,7 @@ app-text/xmlto text
 
 # Ben de Groot <yngwin@gentoo.org> (2015-02-18)
 # Enable sensible defaults for desktop users (bug #540046)
-dev-python/PyQt5 gui network printsupport widgets
+dev-python/PyQt5 gui multimedia network printsupport widgets
 
 # Samuli Suominen <ssuominen@gentoo.org> (2014-07-24)
 # Because targets/desktop/make.defaults has USE="bluetooth" but net-libs/libpcap doesn't
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8da481f1d336..73d37be22501 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -492,6 +492,7 @@ app-emulation/docker-credential-helpers:pass - Build pass helper for the pass ut
 app-emulation/docker-runc:ambient - Enable support for ambient capability
 app-emulation/docker-runc:apparmor - Enable AppArmor support
 app-emulation/dosemu:fluidsynth - use media-sound/fluidsynth for MIDI emulation
+app-emulation/faudio:dumpvoices - FAudio dumps buffer data to individual files with RIFF/XWMA headers, usable with players like ffplay/testxwma.
 app-emulation/faudio:ffmpeg - FAudio has optional support for decoding xWMA resources using FFmpeg, requiring: media-video/ffmpeg (note: this feature is not supported by media-video/libav).
 app-emulation/faudio:test - Build and run faudio testsuite.
 app-emulation/faudio:utils - Build all faudio utilities.
@@ -2110,12 +2111,10 @@ dev-libs/efl:hyphen - Enable text hyphenation support
 dev-libs/efl:ibus - Enable Intelligent Input Bus
 dev-libs/efl:ico - Enable Ico image loader
 dev-libs/efl:json - Enable lottie animation support
-dev-libs/efl:libuv - Enable dev-libs/libuv support
 dev-libs/efl:luajit - USE dev-lang/luajit instead of dev-lang/lua
 dev-libs/efl:mono - Enable mono bindings
 dev-libs/efl:physics - Enable Bullet physics effects and support
 dev-libs/efl:pmaps - Enable PMAPS image loader
-dev-libs/efl:ppm - Enable PMAPS image loader
 dev-libs/efl:psd - Enable PSD image loader
 dev-libs/efl:scim - Enable Smart Common Input Method
 dev-libs/efl:system-lz4 - Use system liblz4 instead of bundled one
@@ -2123,7 +2122,6 @@ dev-libs/efl:tga - Enable Tga image loader
 dev-libs/efl:tgv - Enable Tgv image loader
 dev-libs/efl:tslib - Enable x11-libs/tslib for touchscreen events
 dev-libs/efl:unwind - Enable debug support via sys-libs/libunwind
-dev-libs/efl:valgrind - Enable usage of dev-util/valgrind in debug
 dev-libs/efl:vlc - Enable media-video/vlc support
 dev-libs/efl:xcf - Enable XCF image loader
 dev-libs/efl:xim - Enable X Input Method
@@ -2590,7 +2588,6 @@ dev-python/pypy-exe:low-memory - Build using PyPy with the engine configured tow
 dev-python/pypy3-exe: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/python-mpd:twisted - Enable twisted support
 dev-python/python-stdnum:vies - Enable VIES
-dev-python/pyudev:pygobject - Install PyGobject bindings
 dev-python/pyudev:qt5 - Install PyQt5 bindings
 dev-python/pyyaml:libyaml - enable support for C implementation using libyaml
 dev-python/pyzor:gdbm - Enables the Gdbm back-end database engine for pyzord
@@ -2765,7 +2762,6 @@ dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
 dev-qt/qtwebengine:designer - Install the QWebEngineView plugin used to add widgets in dev-qt/designer forms that display web pages.
 dev-qt/qtwebengine:geolocation - Enable physical position determination via dev-qt/qtpositioning
 dev-qt/qtwebengine:jumbo-build - Combine source files to speed up build process.
-dev-qt/qtwebengine:pax_kernel - Enable building under a PaX enabled kernel
 dev-qt/qtwebengine:system-ffmpeg - Use the system-wide media-video/ffmpeg instead of bundled.
 dev-qt/qtwebengine:system-icu - Use the system-wide dev-libs/icu instead of bundled.
 dev-qt/qtwebengine:widgets - Enable QtWidgets support
@@ -2805,7 +2801,6 @@ dev-ruby/ruby-sdl:sge - Enable sdl-sge support
 dev-ruby/rubygems:server - Install support for the rubygems server
 dev-scheme/gauche:mbedtls - Enable support for net-libs/mbedtls
 dev-scheme/gauche-gl:cg - Enable NVidia Cg binding
-dev-scheme/gauche-gtk:glgd - Enable GL graph draw
 dev-scheme/guile:debug-freelist - Include garbage collector freelist debugging code
 dev-scheme/guile:debug-malloc - Include malloc debugging code
 dev-scheme/guile:deprecated - Enable deprecated features
@@ -3695,6 +3690,7 @@ kde-plasma/kinfocenter:gles2 - Show OpenGL ES information in kinfocenter
 kde-plasma/kinfocenter:pci - Show advanced PCI information
 kde-plasma/kmenuedit:hotkeys - Enable support for hotkey editing
 kde-plasma/kscreenlocker:consolekit - Support for killing the screenlocker when sys-auth/consolekit is the session tracker
+kde-plasma/ksysguard:pcap - Enable per-process network statistic collection using net-libs/libpcap
 kde-plasma/kwin:gles2 - Use OpenGL ES 2 instead of full GL
 kde-plasma/kwin:multimedia - Enable effect video button in desktop effects KCM
 kde-plasma/libksysguard:webengine - Enable display of detailed memory information using dev-qt/qtwebengine.
@@ -4135,6 +4131,7 @@ media-gfx/iscan-plugin-gt-f500:minimal - Install the firmware only, and not the
 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/kphotoalbum:share - Enable support for a share menu using kde-frameworks/purpose
 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
@@ -4310,6 +4307,7 @@ media-libs/libsdl2:sound - Control audio support (disable at your own risk)
 media-libs/libsdl2:tslib - Build with tslib support for touchscreen devices
 media-libs/libsdl2:video - Control video support (disable at your own risk)
 media-libs/libsdl2:vulkan - Enable Vulkan support
+media-libs/libtgvoip:dsp - Enable signal processing (echo cancellation, noise suppression, and automatic gain control)
 media-libs/libvisio:tools - Build conversion tools
 media-libs/libvpx:highbitdepth - Enable 10 and 12 bit support for VP9.
 media-libs/libvpx:postproc - Enable additional post processing filters
@@ -4530,7 +4528,6 @@ media-radio/ax25-tools:X - Enable some X based configuration tools.
 media-radio/fldigi:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio in use
 media-radio/tucnak:hamlib - Enables support by the Hamlib amateur radio rig control library to get/set frequency and mode of the ham radio
 media-radio/unixcw:ncurses - Enables building the curses based morse code tutor program 'cwcp'.
-media-radio/xastir:gdal - Support for some further map formats
 media-radio/xastir:geotiff - Install geotiff support. Allows using USGS DRG topo maps or other types of geotiff mapes/images
 media-sound/abcde:aiff - Enable support for Audio Interchange File Format (AIFF) output encoding
 media-sound/abcde:id3tag - Support ID3, ID3v2 tagging of audio files
@@ -4593,7 +4590,6 @@ media-sound/clementine:seafile - Enable support for seafile: a file sync service
 media-sound/clementine:skydrive - Enable Skydrive support
 media-sound/clementine:wiimote - Enable support for Wii remote
 media-sound/cmus:cdio - Use libcdio for CD support
-media-sound/cmus:cue - Enable CUE sheet parsing
 media-sound/cmus:discid - Enable reading the ID of the inserted CD
 media-sound/cmus:elogind - Enable MPRIS support via sys-auth/elogind
 media-sound/cmus:pidgin - Install support script for net-im/pidgin
@@ -5809,6 +5805,7 @@ net-im/bitlbee:purple - Use libpurple instead of the built-in IM protocol suppor
 net-im/bitlbee:twitter - Enable Twitter protocol support
 net-im/choqok:attica - Build Open Collaboration Services plugin using kde-frameworks/attica
 net-im/choqok:konqueror - Build Konqueror Choqok plugin
+net-im/choqok:share - Enable support for a share menu using kde-frameworks/purpose
 net-im/choqok:telepathy - Enable support for the real-time communication framework telepathy
 net-im/corebird:spellcheck - Support spell checking
 net-im/coturn:mongodb - Enable support for the mongodb database
@@ -5886,7 +5883,6 @@ net-im/pyicq-t:webinterface - Install dependencies needed for the web interface
 net-im/qtox:X - Adds support for X11
 net-im/qtox:notification - Adds support for GTK Status Notifier tray backends
 net-im/skypeforlinux:pax_kernel - Triggers a paxmarking of the main skype binary
-net-im/slack-bin:pax_kernel - Triggers a paxmarking of the binary
 net-im/spectrum2:frotz - Enables the Z-Engine backend.
 net-im/spectrum2:irc - Enables the IRC backend, based on net-im/libcommuni.
 net-im/spectrum2:purple - Enables the libpurple backend, based on net-im/pidgin.
@@ -6261,7 +6257,6 @@ net-mail/mailutils:clients - Build client programs - frm maidag mail sieve messa
 net-mail/mailutils:kyotocabinet - Enable Kyoto Cabinet database support
 net-mail/mailutils:servers - Build server programs - imap4d pop3d comsatd
 net-mail/mailutils:tokyocabinet - Enable Tokyo Cabinet database support
-net-mail/mairix:gnus - Add support for the marks propagation feature in GNUS (provided by app-editors/emacs or app-xemacs/gnus for XEmacs users)
 net-mail/mu:emacs - Install the mu4e mail client
 net-mail/mu:mug - Install the mug toy client, not for normal use
 net-mail/notmuch:crypt - Support decryption and verification of PGP/MIME messages and in Emacs UI - encryption; support also S/MIME signature verification since version 0.22
@@ -7271,7 +7266,6 @@ sci-electronics/pcb:nelma - NELMA file export
 sci-electronics/pcb:png - PNG graphics export
 sci-electronics/pcb:tk - Build tcl/tk graphical QFP footprint generator
 sci-electronics/pcb:toporouter - Build toporouter
-sci-electronics/pcb:xrender - Translucent PCB display for Motif/Lesstif GUI
 sci-electronics/pulseview:decode - Enable decoding of protocols while capturing
 sci-electronics/sigrok-cli:decode - Enable decoding of protocols while capturing
 sci-electronics/splat:hires - Builds additional high resolution application 'rfsplat-hd'
@@ -7737,7 +7731,6 @@ sci-visualization/paraview:development - Install development files including hea
 sci-visualization/paraview:nvcontrol - Add NVCONTROL support for OpenGL options
 sci-visualization/paraview:offscreen - Offscreen rendering through OSMesa
 sci-visualization/paraview:plugins - Build and install additional plugins
-sci-visualization/veusz:fits - Add FITS format via dev-python/astropy
 sci-visualization/veusz:minuit - Use Minuit during fitting viadev-python/pyminuit
 sci-visualization/yt:hub - Connect to the yt hub with dev-python/girder-client
 sec-policy/selinux-base:open_perms - Enable the open permissions for file object classes (SELinux policy capability).
@@ -8700,6 +8693,7 @@ www-client/chromium:system-icu - Use system icu instead of the bundled one
 www-client/chromium:system-libvpx - Use system libvpx instead of the bundled one
 www-client/chromium:tcmalloc - Use bundled tcmalloc instead of system malloc
 www-client/chromium:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
+www-client/dillo:xembed - Enable X11 XEmbed support
 www-client/elinks:bittorrent - Enable support for the BitTorrent protocol
 www-client/elinks:brotli - Enable support for brotli compression
 www-client/elinks:finger - Enable support for the finger protocol
@@ -8818,6 +8812,7 @@ www-servers/nginx-unit:php5-6 - Support for PHP 5.6
 www-servers/nginx-unit:php7-1 - Support for PHP 7.1
 www-servers/nginx-unit:php7-2 - Support for PHP 7.2
 www-servers/nginx-unit:php7-3 - Support for PHP 7.3
+www-servers/nginx-unit:php7-4 - Support for PHP 7.4
 www-servers/pshs:magic - Enable automatic detection of Content-Type using libmagic (sys-apps/file)
 www-servers/pshs:netlink - Use libnetlink (sys-apps/iproute2) to get network interface addresses
 www-servers/pshs:qrcode - Enable generating QRCodes for server URL
@@ -9065,6 +9060,8 @@ x11-themes/gentoo-artwork:grub - Install extra sys-boot/grub themes
 x11-themes/gentoo-artwork:icons - Install icons
 x11-themes/gentoo-artwork:lilo - Install extra sys-boot/lilo themes
 x11-themes/gentoo-artwork:pixmaps - Install pixmaps
+x11-themes/greybird:gtk2 - Install theme for GTK+-2.0
+x11-themes/greybird:gtk3 - Install theme for GTK+-3.0
 x11-themes/greybird:xfce - Install theme for xfce-base/xfwm4
 x11-themes/gtk-engines-murrine:animation-rtl - Progressbar animation from right to left
 x11-themes/gtk-engines-murrine:themes - Pull in themes via x11-themes/murrine-themes
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index c5742e89a94b..b76bfae824a3 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index a86ccaa8cc22..f941da8fc948 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -3,5 +3,5 @@ DIST kstars-3.3.8.tar.xz 70991244 BLAKE2B f8f1508d0eb019d5247df8bdd5472dff42113e
 DIST kstars-3.3.9.tar.xz 71097252 BLAKE2B d8593be78f30de8e9ce00744f71ef23eda51bdfdd4fea1aa5b4e25605b2d45c337f66c76b8804b292c8277a768aa08d7acc1d52cb0ad955bc67a54a370e15b74 SHA512 51a8687d8f438eda2e6c079ce9bec25aa1e84b4cff697da08e91d38388e85595bea8ed06a2a8d6a8a4ce133e768e28fb5a6a0ff763514e751d693c32f91e95c6
 EBUILD kstars-3.2.3.ebuild 2165 BLAKE2B 8e1734cddbd2ad9ef3095ec6e22eca86a6daeb15faef2d4bcff7213abd8eedab5a541408c1f75566763e5a9e6f8bf2384441d3ae295882a487f085739d79122a SHA512 5a52b90a603576b7936e9905e0fb75edeae7c4bc8280512b67840cf0c23114c214d829eded66dc119d548f5c45d349d291ee256bb5dcd349756547f38d1f9a9d
 EBUILD kstars-3.3.8-r2.ebuild 2531 BLAKE2B 6b6ffa9bec072790579c9786a1db18d84be4e31c9713a4879b0479fd0f460ae5662df52ff82af731eb52e429352907fd1bd997d60e7e3a0b13065deb0fe383e6 SHA512 7b49a6656b53b777f7d06ab0d7ed2e1617b7250599c89c58fe6d34252b5db94d202be475f9b899da8731f97d6973dc1ea4616e92f4b7f60e2985fee91ce6c7aa
-EBUILD kstars-3.3.9.ebuild 2532 BLAKE2B 4ba6158282de19076247a076b4592b9bdc4bcaa68b989968b619f9b965981538194e3f9be848208e7d4d045d38ed559a086289ba156d996ac433a84bb2f463ae SHA512 59c53a247c82e06ae15b35a8ff9bc24e904593e63ca1b9e3a32b5eb8ae4c13a60a29b5b89f4af55a1d11f5f0af68f26aa85a63cf80eb9c204f578947db352afd
+EBUILD kstars-3.3.9.ebuild 2531 BLAKE2B cd9033859157e6acc3bad8419358454b860500f0e9a8931aa33afe9592136c0a03410e2738e5418d3612587ce8ca1f05d0b38969742a4150838e5e48cf1a6d2f SHA512 84179475a8a913e539f21f23c9dd327fdbe8e8319516c16c1b9e8858c232a8dcc33407bddf8ef5d594f1a7cf4560b0630c40793f11df66001ffadf638ef10073
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/kstars-3.3.9.ebuild b/sci-astronomy/kstars/kstars-3.3.9.ebuild
index 027a65724d58..33ecf5ac5e8a 100644
--- a/sci-astronomy/kstars/kstars-3.3.9.ebuild
+++ b/sci-astronomy/kstars/kstars-3.3.9.ebuild
@@ -14,7 +14,7 @@ https://edu.kde.org/kstars/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+"
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 2c9928c841fc..f9edb0bfb762 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/bcftools/Manifest b/sci-biology/bcftools/Manifest
index 2c0602a79c08..09afec5ba291 100644
--- a/sci-biology/bcftools/Manifest
+++ b/sci-biology/bcftools/Manifest
@@ -1,8 +1,9 @@
 AUX bcftools-1.5-buildsystem.patch 376 BLAKE2B 384bf91c3af4f98c76c0ab6fecdfe0ec9483b77c54517df0ad2703441def7a7a6982ee792ae1775414ab8cec43d0e65ff6d2187be7cb85bb42eb5af8f9b7283e SHA512 c8ede2be5205ab287843662e7b97ecae8d4fc7d2aaf09e0b9fa67f5a3168149b15457e73c2c9d8b74fcfada08ec5c1bbe61013a2ef434ee50acf56eccabf6723
 AUX bcftools-1.5-fix-shebangs.patch 594 BLAKE2B 28d0a58627dcc1b1eb8f546c73a88f76e3277c82772f8a7af814d9ff3bcb116751b065166661c486e8c6b1708a54de227a5ef65d18a8527b38f5119d744539d2 SHA512 e00cc0de35ad5866f7321408a7995f054f80e37e642b6c3097c5e786635dc61baefa7ea8847f2222d32196825e3e44209d63fdfd219c54b09421a4bb310067f5
+AUX bcftools-1.9-buildsystem.patch 380 BLAKE2B b71567ad14d96b85bf449db473b38cd9ff2a32420d9c4d1b606cad0e09a478fd0946b589c62405aceacf234db7abde3fcf180eed7fbf0d8db73565b4424f86b8 SHA512 f0124734e6309eda73e5f32a9832e8c35de1929c6503627564346f097415bc76294371eda1886100ce2f1ed8e0de695e978a720dd4517e8411dcd041797af2b5
 AUX bcftools-1.9-fix-shebangs.patch 198 BLAKE2B 9d6c365c7193c7815216be4f8034c00e0048f7352e15ee24b4359828bf0906755ab9524fb10ad185754652b74007dc2c756b2260f64a263f696cf0f737ff25d7 SHA512 65eecc5e0d5cf3df1538b078c7606b38451e13f4f359ecf9287a9e03721c7c7ba1cd8bd517a98dd34842db22624fbdc570e9707d13f2e2fb82b16b3ca41ca71e
 DIST bcftools-1.5.tar.bz2 2975685 BLAKE2B 937b7db770dcaddafbd00b67c3b88501a3190564b2ca629b83e52b48b414a604dd203cd067e357e2b7d02c700387576fca458d1cab2982dafa3b2c215b528722 SHA512 66b8bc61b9fbb381679a6781f77a18f66e8105567992da011413bc573d99b619558a1cf58e9e1373ae347a8b81638dd91977802a07a4578ddc9c61fb53403233
 DIST bcftools-1.9.tar.bz2 3134355 BLAKE2B dd551b509b1ee554f70be9da28a6eaf81dfcec43fc0d1aa972d64ef846f9db47f39177345e8c1ca754d11defb9c0823976ae94d6b3e7cd99313eed4f381182ed SHA512 fd662fb0d214eb75ac04fc4494e8dbaca84d10698ca14801427341def6a5df4af99e7bd4cd873da5422ae921deb49b940cedb926da356b1eabfac525a38f806c
 EBUILD bcftools-1.5.ebuild 868 BLAKE2B acfd6758e27cb9ade023d91074724affd0fa3016af565c809819fae615be61ca8af90edf6b38eaf0a4ed5f3e9eaaa19451096b8d7c27a58c6ed0540bf7260784 SHA512 e0aacba5fc54cbf7a8d64db84e52f28baf8df36fa01c63fc167998c6ec5ef65a040c0725f445970f32888ae947b89d50d92dc2fc704fdf63a8a900762ec367e6
-EBUILD bcftools-1.9.ebuild 927 BLAKE2B 3e9c712316fa510ddc7be30c398565e3fa4e435fe58cf4263ba3c69dca34b4c227fc80ea23c52e70437a3b9058645f02505a17831c04a23e97086175ed8ee383 SHA512 0cbb0d08596819f7769d23ade97627b6ac9362140904609a2ea0603b8285e94ea2472721a49f298e7aae9a97d3495c3816e8229620a1a11225d2fcd881504cf8
+EBUILD bcftools-1.9-r2.ebuild 996 BLAKE2B 27af6e1f88f2501f6b4c2a627a755e82024130f1e0b884a517322fa7181d18f00a1323fe0477f914d80c25aa0dc81152d930689e1e18870af69d8dbeb1daaeb8 SHA512 f9e052edd07c6cd9bafa338913954729bbcf0302d418426d3077685acc15128cd19991361a2737c8f56fca4069123d58446633e0ca7c881b3996a65f33fd7d0b
 MISC metadata.xml 452 BLAKE2B 53a356b0569d9db1377bc1881d58b4b354d4861eb21b2c602df59b7923b175a20623cf3369695416eb08d44fabe32036f5a5ec3119c765c8f85347d3b094918a SHA512 eb656430c9ee5ffee5ec5f9f8f3c69e8b0d1ae124cd720ae4af6c3c160da5dc261838744f75e838a85935bbc9bd5201b038ee11cb41a0e1209c9df58aa85fc1a
diff --git a/sci-biology/bcftools/bcftools-1.9-r2.ebuild b/sci-biology/bcftools/bcftools-1.9-r2.ebuild
new file mode 100644
index 000000000000..eafe63a1ee54
--- /dev/null
+++ b/sci-biology/bcftools/bcftools-1.9-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit python-single-r1
+
+DESCRIPTION="Utilities for variant calling and manipulating VCF and BCF files"
+HOMEPAGE="http://www.htslib.org"
+SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	dev-lang/perl
+	$(python_gen_cond_dep '
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+	')
+	=sci-libs/htslib-${PV}*:=
+	sys-libs/zlib:=
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-buildsystem.patch
+	"${FILESDIR}"/${PN}-1.9-fix-shebangs.patch
+)
+
+src_prepare() {
+	default
+
+	python_fix_shebang misc/{guess-ploidy,plot-roh}.py
+
+	# remove bundled htslib
+	rm -r htslib-* || die
+}
+
+src_configure() {
+	econf \
+		--disable-bcftools-plugins \
+		--disable-libgsl \
+		--disable-configure-htslib \
+		--with-htslib=system
+}
diff --git a/sci-biology/bcftools/bcftools-1.9.ebuild b/sci-biology/bcftools/bcftools-1.9.ebuild
deleted file mode 100644
index 53e47bc01a81..000000000000
--- a/sci-biology/bcftools/bcftools-1.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Utilities for variant calling and manipulating VCF and BCF files"
-HOMEPAGE="http://www.htslib.org"
-SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-lang/perl
-	=sci-libs/htslib-${PV}*:=
-	sys-libs/zlib:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5-buildsystem.patch
-	"${FILESDIR}"/${PN}-1.9-fix-shebangs.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang misc/{guess-ploidy,plot-roh}.py
-
-	# remove bundled htslib
-	rm -r htslib-* || die
-}
-
-src_configure() {
-	econf \
-		--disable-bcftools-plugins \
-		--disable-libgsl \
-		--disable-configure-htslib \
-		--with-htslib=system
-}
diff --git a/sci-biology/bcftools/files/bcftools-1.9-buildsystem.patch b/sci-biology/bcftools/files/bcftools-1.9-buildsystem.patch
new file mode 100644
index 000000000000..a0df4b917bcb
--- /dev/null
+++ b/sci-biology/bcftools/files/bcftools-1.9-buildsystem.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -282,7 +282,6 @@
+ 	$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)
+ 	$(INSTALL_SCRIPT) $(MISC_SCRIPTS) $(DESTDIR)$(misc_bindir)
+ 	$(INSTALL_MAN) doc/bcftools.1 $(DESTDIR)$(man1dir)
+-	$(INSTALL_PROGRAM) plugins/*.so $(DESTDIR)$(plugindir)
+ 
+ clean: testclean clean-plugins
+ 	-rm -f gmon.out *.o *~ $(PROGRAMS) version.h plugins/*.so plugins/*.P
diff --git a/sci-biology/bedtools/Manifest b/sci-biology/bedtools/Manifest
index 8dd3860d13c8..9c73c14bcb7b 100644
--- a/sci-biology/bedtools/Manifest
+++ b/sci-biology/bedtools/Manifest
@@ -1,4 +1,4 @@
 DIST bedtools-2.26.0-fix-buildsystem.patch.bz2 2584 BLAKE2B 550cd03a0c01217adb347587cb75bdc2ffa4e03ad6ad66535b22d423e6f030e237b0ccfd3d1bd3e434cb9cc2a007971517f03e9ceabc08b63c725bac786e23e8 SHA512 0a7835f560102ce6183736faea6a2be05609b69bb8efdaf98b9d7057e24aa1ebe9d6067118b95c76470ca341b151970db532094ee70ca333075aed7c47509ba3
 DIST bedtools-2.26.0.tar.gz 19939711 BLAKE2B 8f6ee6ed755c638dbdd0a4750a5348c28a865f36eaafef6160e90f62912cb0a6b719713935ba68dad74bc591e3f37db49eab54a06a316dc00e4ec82a5dca71dc SHA512 b224adcc09322e90ef389e8172e14572b68f164185fe1a8814db1c47bb4f15656ca8c0ff0061017eb54d76affbe0d0f5793d893b8ab489b56eaf0818616a5def
-EBUILD bedtools-2.26.0.ebuild 965 BLAKE2B d7bd87cd069734c20c2ead2fbe6ce889f0e348e35406f390eb7b6826a993f3866968599006c2dd918e017c17550005d630c3e843b15fe28f5a9ca140adcb0178 SHA512 a32f895d9fe683be0d62176eff4dc800cc5d4a32b6c3fe749062f96fd4183f97217781e171434ddb87e9b958135e6b8f980529a8aa6514b9d6aae69c0325f9a8
+EBUILD bedtools-2.26.0.ebuild 959 BLAKE2B c3d42f033913e18a9bd1f0b6f669a4000bc6b6892bbd5986a33a99ed496ae4af11b690f1c7c350644b62e77baef80a9eb52f15e87818a74b684d4fac816a2512 SHA512 a3914d04806fa4b3f14f83d91717d00fd183e1f6d4a39690ae04e7767791605a8e90d86cefc4deaa50327651c64125808658de4471f05df936c19e46768bf988
 MISC metadata.xml 761 BLAKE2B 35d57919e32a4b8bd6070ab5a513f62578394d43098d9e7b9b0765fd57d684c049dad9ec1b315044518bf01535d505e9d9d3fee540308df40c0b70886db8e49f SHA512 2d98b9559ef00bee2b741f9e7d22645442ba161f3cadb32c6366b39fcd71b6eac52afd210f59ae709a15cba36a2d0a47341345740e0cab6a1f6bfdffed064770
diff --git a/sci-biology/bedtools/bedtools-2.26.0.ebuild b/sci-biology/bedtools/bedtools-2.26.0.ebuild
index 0ad6f3eb354d..b062a6fef84d 100644
--- a/sci-biology/bedtools/bedtools-2.26.0.ebuild
+++ b/sci-biology/bedtools/bedtools-2.26.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/sci-biology/tophat/Manifest b/sci-biology/tophat/Manifest
index 3ae47ce22cb9..391b7baa196a 100644
--- a/sci-biology/tophat/Manifest
+++ b/sci-biology/tophat/Manifest
@@ -2,5 +2,5 @@ AUX tophat-2.1.1-fix-c++14.patch 655 BLAKE2B 760f2d371e6467340d31c688187a62b0266
 AUX tophat-2.1.1-python2-shebangs.patch 758 BLAKE2B 83bda360dc36d3eaa890adee00bdb58698fb5eaaa29255c85b3b63f61536921386115662051a4938d21079a3eb1a103dce752f0320fe1990535d35ae74480fcc SHA512 887e5a8b02c2e43a7fa35c9f98670dd722527c45454ca24d5e2f9d2f372267905d7e0142317769b14830706cf82868cb83ede970ffe527f736d71df794fd6342
 AUX tophat-2.1.1-unbundle-seqan-samtools.patch 5224 BLAKE2B acdf26085b6eab54f478f5e31e2f180a008b9a05b853253f8f161759dc79a0fb5ea0c54bbf3a0f4ebf79da71988c60d17899aaa1ff6e927a308eca01edccbdf1 SHA512 d920cee92a0a694a34d6ac5b949e5b883bf9dcff338f36e227cb014732231b96461c02e75418972c85880169751a96c2367f6a4be6ce8c91f310b4b4f6858248
 DIST tophat-2.1.1.tar.gz 2259554 BLAKE2B f01b08cc2046b7d143864d64aa3e34d3000c7c10d7e50a4e102d500556e8620996de03392463f9d08ae97858eaec85b2df3b5d5ee5b0b4f7a5c0ae06bb3d08e8 SHA512 e2e0943a6f3d34b83922e6e403b65a3bee480a2b2bb4bf2de0cae7e0ef5bb166b66fec923316c2b643e8550e43c842f0f1bcc2ca7249d20fbcf5a4733fbdeabc
-EBUILD tophat-2.1.1-r4.ebuild 2182 BLAKE2B 31ab114249ef61d7e8fc6d47538483676bb106c9ebebada91236dbb2cfbd9e17aea36d7f480b552ca8a204cae7d6bd10f201ea1ccef7bd23ada5a1758a78b968 SHA512 b97690d43bc89aaafe2df3091602e3509cc1ef4ed2323a58aeb734329f587872325bf73ad69b899d467591bb7be5f685ebeb87376e5fab4b867831b3858c92f0
+EBUILD tophat-2.1.1-r5.ebuild 2222 BLAKE2B 6495a600bb9986ecb5fb2eb09a7c0a5066cc1e28bea0c40df319294dde84a4d08f4eb9e784492f4f416fde4c981d2b6881182439af1a80320eef0ab567a70d7f SHA512 b07baa1225df5a2dbe8d6b031249ab212f815c8710a6d5e74d4a5a9ea8af149e76c045fc1fc943d09b10f7e0e035c899a7a79d7386c73381a0c13f57d6d58e44
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/tophat/tophat-2.1.1-r4.ebuild b/sci-biology/tophat/tophat-2.1.1-r4.ebuild
deleted file mode 100644
index 590f6eb2d20f..000000000000
--- a/sci-biology/tophat/tophat-2.1.1-r4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools flag-o-matic python-single-r1 toolchain-funcs
-
-DESCRIPTION="Python-based splice junction mapper for RNA-Seq reads using bowtie2"
-HOMEPAGE="https://ccb.jhu.edu/software/tophat/"
-SRC_URI="https://ccb.jhu.edu/software/tophat/downloads/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=[threads]
-	dev-python/intervaltree[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-	sci-biology/samtools:0.1-legacy
-	sci-biology/bowtie:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sci-biology/seqan:1.4
-	>=sys-devel/autoconf-archive-2016.09.16"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle-seqan-samtools.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-	"${FILESDIR}"/${P}-python2-shebangs.patch
-)
-
-src_prepare() {
-	default
-
-	# remove bundled libs
-	rm -rf src/samtools-0.1.18/ src/SeqAn-1.4.2/ || die
-
-	sed -e "s:samtools_0.1.18:${EPREFIX}/usr/bin/samtools-0.1-legacy/samtools:" \
-		-i src/tophat.py src/common.cpp || die
-
-	sed -e "s:/usr/include/bam-0.1-legacy/:${EPREFIX}/usr/include/bam-0.1-legacy/:" \
-		-e '/^samtools-0\.1\.18\//d' \
-		-e '/^SeqAn-1\.4\.2\//d' \
-		-e 's:sortedcontainers/sortedset.py \\:sortedcontainers/sortedset.py:' \
-		-e 's:\$(top_builddir)\/src\/::' \
-		-i src/Makefile.am || die
-	sed -e 's:\$(top_builddir)\/src\/::' -i src/Makefile.am || die
-
-	# innocuous non-security flags, prevent log pollution
-	append-cflags -Wno-unused-but-set-variable -Wno-unused-variable
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags seqan-1.4)"
-
-	# remove ancient autoconf archive macros, wreaking havoc,
-	# depend on sys-devel/autoconf-archive instead, bug #594810
-	rm {ax_boost_thread,ax_boost_base}.m4 || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	default
-
-	# delete bundled python modules
-	local i
-	for i in intervaltree sortedcontainers; do
-		rm -r "${ED%/}"/usr/bin/${i} || die
-	done
-}
-
-pkg_postinst() {
-	optfeature "ABI SOLiD colorspace reads" sci-biology/bowtie:1
-}
diff --git a/sci-biology/tophat/tophat-2.1.1-r5.ebuild b/sci-biology/tophat/tophat-2.1.1-r5.ebuild
new file mode 100644
index 000000000000..84f3d82b39d0
--- /dev/null
+++ b/sci-biology/tophat/tophat-2.1.1-r5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="Python-based splice junction mapper for RNA-Seq reads using bowtie2"
+HOMEPAGE="https://ccb.jhu.edu/software/tophat/"
+SRC_URI="https://ccb.jhu.edu/software/tophat/downloads/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[threads]
+	$(python_gen_cond_dep '
+		dev-python/intervaltree[${PYTHON_MULTI_USEDEP}]
+		dev-python/sortedcontainers[${PYTHON_MULTI_USEDEP}]
+	')
+	sci-biology/samtools:0.1-legacy
+	sci-biology/bowtie:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sci-biology/seqan:1.4
+	>=sys-devel/autoconf-archive-2016.09.16"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-unbundle-seqan-samtools.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+	"${FILESDIR}"/${P}-python2-shebangs.patch
+)
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -rf src/samtools-0.1.18/ src/SeqAn-1.4.2/ || die
+
+	sed -e "s:samtools_0.1.18:${EPREFIX}/usr/bin/samtools-0.1-legacy/samtools:" \
+		-i src/tophat.py src/common.cpp || die
+
+	sed -e "s:/usr/include/bam-0.1-legacy/:${EPREFIX}/usr/include/bam-0.1-legacy/:" \
+		-e '/^samtools-0\.1\.18\//d' \
+		-e '/^SeqAn-1\.4\.2\//d' \
+		-e 's:sortedcontainers/sortedset.py \\:sortedcontainers/sortedset.py:' \
+		-e 's:\$(top_builddir)\/src\/::' \
+		-i src/Makefile.am || die
+	sed -e 's:\$(top_builddir)\/src\/::' -i src/Makefile.am || die
+
+	# innocuous non-security flags, prevent log pollution
+	append-cflags -Wno-unused-but-set-variable -Wno-unused-variable
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags seqan-1.4)"
+
+	# remove ancient autoconf archive macros, wreaking havoc,
+	# depend on sys-devel/autoconf-archive instead, bug #594810
+	rm {ax_boost_thread,ax_boost_base}.m4 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	default
+
+	# delete bundled python modules
+	local i
+	for i in intervaltree sortedcontainers; do
+		rm -r "${ED%/}"/usr/bin/${i} || die
+	done
+}
+
+pkg_postinst() {
+	optfeature "ABI SOLiD colorspace reads" sci-biology/bowtie:1
+}
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 2e08e6fd7444..3486db8db09c 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/gonvert/Manifest b/sci-calculators/gonvert/Manifest
index 6d46dd854dc9..8bb5e440c4a1 100644
--- a/sci-calculators/gonvert/Manifest
+++ b/sci-calculators/gonvert/Manifest
@@ -1,4 +1,4 @@
 AUX 0.2.23-paths.patch 2756 BLAKE2B 6cfdc09e6a6e09e144b4e06ea16742311056eb56aff957846267174434abc983c59ab8ea033801bc05b155ebd6e3c203629287cb86296a90ed425bf4515d0b47 SHA512 72ec21802f0c365efc1dff067f17c4ea07ad74a84588859de000efec2f7830e330ea0470ea04983c8622aa2f8099ddef4336a23d3367caaf0033e19dc90b978e
 DIST gonvert-0.2.39.tar.gz 125040 BLAKE2B 359a2d616ec63b4a343600395b2fdd5a4bc266f847cedf0ac03f7578906a88628dbf8406265ddf21affa790e96572c2f099adf32203f1b80e5ddf48be1c203a1 SHA512 508c4fe4a453f68ea48787843b96b7f6ee6706e7a264c5698ceb5cba3b90996f506e67230d37b2750db69921aba90f56d4eca2a21531c33aa5cdd95e2ca9ea4b
-EBUILD gonvert-0.2.39.ebuild 783 BLAKE2B 2d567eb59ace66573fc8baea222c3629ce21b5fe149f73984e556d3568af2198f6fec1eea4d73e77d3771e3f2e9ea064223a6fa97221729041721d07aacbd1a5 SHA512 2266e50bd041e3536ac3e0363f1fc0d0b5967a6453a9d49ac5eedbe4627c8d9ccd316a790694670fc588d2fb4531c4563865272f8e603695f7c996a88247a58d
+EBUILD gonvert-0.2.39-r1.ebuild 816 BLAKE2B 36231a1e4bc8dfc7f2ebba3d47ec4e81db708970f27fd41cfa132aba0b4a8330e3318f3cd01537c469c777df19bdb6989bc8f63a1599a9e8432ea4692e1027a5 SHA512 705beb469d53af31a3c80f65b66725be944a625941b32e6dbdcaeb199229909576435120d3248e591a5a73a1128b16d0040d1109c1dfd153ed0ed47831322edf
 MISC metadata.xml 708 BLAKE2B a684e94e0169269142c1f915a10593cfeddac8d2321af3eaa57ac7c5b4467030210c6bc03207e66918ad3f97fad70aa7bdabbd74d1bb70633fc8e01bd0d7755a SHA512 c88b8e10790e10f415ddd0c1453f976767c5b51722936d37a9c423f016c6ac3ae0e19e1103a61f09fb381f6ffc64318012068df50b53e2655e92cbfef663edd5
diff --git a/sci-calculators/gonvert/gonvert-0.2.39-r1.ebuild b/sci-calculators/gonvert/gonvert-0.2.39-r1.ebuild
new file mode 100644
index 000000000000..94ef697d8f02
--- /dev/null
+++ b/sci-calculators/gonvert/gonvert-0.2.39-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Unit conversion utility written in PyGTK"
+HOMEPAGE="http://unihedron.com/projects/gonvert/index.php"
+SRC_URI="http://unihedron.com/projects/gonvert/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/0.2.23-paths.patch )
+
+src_install () {
+	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr"
+	python_fix_shebang "${ED%/}"/usr/bin
+	rm -fr "${ED%/}/usr/share/doc/${PN}" || die
+	einstalldocs
+}
diff --git a/sci-calculators/gonvert/gonvert-0.2.39.ebuild b/sci-calculators/gonvert/gonvert-0.2.39.ebuild
deleted file mode 100644
index 5650b346b056..000000000000
--- a/sci-calculators/gonvert/gonvert-0.2.39.ebuild
+++ /dev/null
@@ -1,33 +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 python-single-r1
-
-DESCRIPTION="Unit conversion utility written in PyGTK"
-HOMEPAGE="http://unihedron.com/projects/gonvert/index.php"
-SRC_URI="http://unihedron.com/projects/gonvert/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/0.2.23-paths.patch )
-
-src_install () {
-	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr"
-	python_fix_shebang "${ED%/}"/usr/bin
-	rm -fr "${ED%/}/usr/share/doc/${PN}" || die
-	einstalldocs
-}
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 7673bb997f61..7317ea5123a2 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -5,8 +5,8 @@ DIST qalculate-gtk-0.9.9.tar.gz 1283947 BLAKE2B 68904e19a4810ef7c83b2508d952195a
 DIST qalculate-gtk-2.2.0.tar.gz 2339951 BLAKE2B 87a2a9328314b994a780f2f616b6f43b53848131db3e5940863432360da44f1e50084076b63c2fac01fe339d5845a55133f5d453bf3d6eec432ce8e43a524921 SHA512 a761383021448f2d8542fad2c51a57e9d98a09264a1467e8e4555ab1930151651f0a40cd9869bb88e18b716fdbe4c664ce69ec02b6623698f42f34e708f55dea
 DIST qalculate-gtk-2.8.1.tar.gz 2650577 BLAKE2B 9a28afb846f28730bf29c705ec51abda96ccca1864d973588bfd855ae3dc2027765d0bb9b26d817d4b5cfd9189f02c0b889ac74d66d48ebde4bdda2790eb1234 SHA512 fa5ede37bfed3b5f5b46cdf07e3d83456d8144f9b9eda1ae081267d73c06ea032e1012cb7bd01ff36c87aa1a88fc20794fd9477a8d3ece2950785e7aa0b32acc
 DIST qalculate-gtk-3.2.0.tar.gz 2987908 BLAKE2B 038203fab563bb0b74c2c23fd2f4077f7b4c8dc5ebb40c8246dd55c5ce311e19906f664040ccdff8a993fbc0bf8e2e89745bd99c66cb86874097462ec799e5ad SHA512 c9c00bec9ef9fc9526c1ed1d81df06e2fa5c947962cfd981fc3f4036612336ac2dc8027855d505101e78379840d9499f4dda492b98219f9073d91d9237f37528
-EBUILD qalculate-gtk-0.9.9.ebuild 749 BLAKE2B 0fb03650941e4ed3b604046fe9c4bac06584c0b8728dadc65c8f96d854e84c5f67e441f3ea0da767faef59c4ee62f4b5d946a56e605f94751f5323d4947be552 SHA512 249ddcee49486bbf0af72d30ba7c63daecb733d4a87c269d005e2287bb1e92dec641c3b8078dc06eb8dee934a2c63f69a5607f851d887f213498b5f333d7537c
+EBUILD qalculate-gtk-0.9.9.ebuild 747 BLAKE2B 04175d6536ee0b5ba2bc729676f6f8d1924c61ddbc17897a56527f85efb4b25e2816649d63b568046c6cdfcc90f6b60f64882c7621e637bf23fcdcca6ad85707 SHA512 f77e07a90a217ec22500050043d3d14f254465014eab50a4394630f51c180c1fa438c84ebdc4e2513bd50f66950608822e5236484b1b23ac6d84dbaefd48a746
 EBUILD qalculate-gtk-2.2.0.ebuild 754 BLAKE2B a7b2fef7909b3d5a72a43938d0c235eaca8a1c635b3a6c05b613c60d1d00f0eab3a62a3a8146a083fd50eae999bdf6f585477effea023686985291c53812612b SHA512 d4361e3e16d2ac608295aa8844bd6e9b76c37aba2a88a9a8541705e2190f100ffba95ef103993e4f36a41e39198244cb5379779ba63c9a7fdc6afc55777173eb
 EBUILD qalculate-gtk-2.8.1.ebuild 873 BLAKE2B 61f85295dbd95cf588a222f086524c06f43f11f6c1a1e2f6e741e44f692c5b775e8c53cedafd124f6c8a1720c264a5f3a9c2218e3aa20cd2504cfb583c56ffa5 SHA512 ba3fd210d311f27b97c89e700f21aa1b6fad7ebf61f904aeb1f14cbfc1502fd3d176cfe932f832890a455f0fbde1f2be0aefc9a3bac27d26b9261088097d6bbe
-EBUILD qalculate-gtk-3.2.0-r1.ebuild 876 BLAKE2B 055d2aab09e6cb21af7159d387bc12dfdced8f8be151739fdf7d4eb71f3e23686d1f919bcd61e401a4b9f488ec194648ba1006a9c8a4ca0cfb6de7125b3ff832 SHA512 b40afcc848fa3cafee39dadec38b8eacc416d367ba312836dd0d630f2e872466cbd7fd7e2766862597a467e6c29a1fe49cb8ebbbaeb53eda8f305cf3202d7252
+EBUILD qalculate-gtk-3.2.0-r1.ebuild 876 BLAKE2B e5953c21231321472b0511d6deaab12538ec84cb9b8ad660388f3edca12031a6d62fec5e68b7ce144cde0efab6e447c668be0788927052ce3be0665357b7c0e5 SHA512 cfff3fbb0bef254fc4d494f55b2bf6dfad72aa5202bcf507aa36c229974f14c936e778466cea8ce4a0be7f5e754907569e706cf6398ca20b10979f6dfe931b98
 MISC metadata.xml 606 BLAKE2B 0d52327ba35512f67f66d9c98323e941e177b2d7f9479e1ed94aea588427b8979624fe5e62f33e8f7b2071ec79f10b1546fbc83437572d0f5ea9da387f9e6b10 SHA512 596bbb4219292b494c2b1c367190ccdd09045fe4c00d1a935ef6180cc1bfedd1d0b233ce98855cb4162766a6bf4c1fe5be3e7e2d582d321c94848c9a4921eaca
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
index fdcbc8da7e7e..610e170750aa 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gnome"
 
 RDEPEND=">=sci-libs/libqalculate-0.9.9:=
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
index 773b746ab3d2..788b51e00b10 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-3.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
-	>=sci-libs/libqalculate-2.8.1:=
+	>=sci-libs/libqalculate-3.2.0:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 8f4b424e207e..1d028439fcb4 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -2,7 +2,7 @@ AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
 DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
-EBUILD units-2.16.ebuild 1296 BLAKE2B 7117e96c3b62b660c4a8d129640c67c83cb820e4cf4f831596f1f1b719fe457b347b32c9e0ce2d6f55001c7133eaf48222a85db03ec2fb7f7cc5a9ed1720d848 SHA512 2432bb0d90de7d0267cb10e559aa4f1172c2fffa5a93fd7b9233e29a010c17cbc8b3eb00b254969d8ace5d8a78c07adf2953bd9eb2752cc438d916782946d3d3
-EBUILD units-2.18.ebuild 1402 BLAKE2B feb1491d08673e70a88e43991eeec1e9d36c6b6a69bcf420b7540b7dc144bb635e4ea703a21bce3349768842144943f98890f3b92a054946cd1e8db9b5894cd9 SHA512 cf02dbae3d89041fd7ac6cfa41d3f837ef2d6ac235247b157dde27897bdd72b4725100f9f749925b5bd03742fae354a89bdbfc96425b07d28285d336f9b00388
-EBUILD units-2.19.ebuild 1376 BLAKE2B 9c0fc3b7e29f71c3b466dd14be7a70be1949af943fcf94ff9fd94b24c25535e571203809bbc49bb76d2a87930c5a1d0f7faa9efd7607593b08dc9008ca0c3ea8 SHA512 d2e2298215ee48877144de3043f630c729538295034cb8896b7ad69df4d0f03fe539db704a351ed94f9dfd5e03a09c80f703f64c03795f49f3c2ccac03bc1eb7
+EBUILD units-2.16-r1.ebuild 1335 BLAKE2B 6fd6f978c8577c2754a2b98566d4b48f13caf2e1af7c23a9854f5c8847f81e6c4d76d4f6d6723144fa575aef0c0395428c8607e85d65ea95654feb37f8ced2c6 SHA512 b5c9b5a411f4bedd431620632dee2650835fc986ecdd2f2fc0b1b6fcbd640621c2dbf7c6d86d52ae27d53ffda7dd3fd6dd05ec130404c19aeb65dce7afd2e8aa
+EBUILD units-2.18.ebuild 1441 BLAKE2B f6bcb25778a136c98c52d8d0e79562aa2b984f25e16ead86a1485e1bdbefd54a907581b73b867b31b6b584aa0488d6e11e1adc683dceb2bee6cd04d6d89df4ee SHA512 7518fd6a8b4964224380513dcfa623d27af1d2d43089e1dd86df50e48272f62366a8164ca9797ca42d1096792bbc2df43f661d466f0260daee4c669fb66264b0
+EBUILD units-2.19-r1.ebuild 1415 BLAKE2B 587877310c05932b5e283d0f250f613993d61f0327b7acf9025d93678109576ef72f6be889c102a666bdcf2855b8ddf52df3803665aee232e69fa9d5ae380b5d SHA512 87e6a5da5a4174798b50045d1c348e3ed5370a43feebefbc66850737ff71b69c526a448b46f8a473aa3222d36a55dc3670439309b9d3d4c54aaf03e9f018b58e
 MISC metadata.xml 342 BLAKE2B 5dfe07ae92c9b1741b7c2f49f8f0ba853aebfaa20d156685ed5a8fe9c8f0bb094bc240f197e3fb57f65494d4a41b037d7d4e2631c11d26e4fbada04f2916b749 SHA512 c648f964163e26133e70b40687d317d57067fa3bdff11080a33123b7fbf9e9af3aff1d4890ce4e75283b86ef026896804606283c888cb2dbc0c66a171dca8657
diff --git a/sci-calculators/units/units-2.16-r1.ebuild b/sci-calculators/units/units-2.16-r1.ebuild
new file mode 100644
index 000000000000..b6e116cc86eb
--- /dev/null
+++ b/sci-calculators/units/units-2.16-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_6 )
+inherit eutils python-single-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+units--cur"
+REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/readline:=
+	units--cur? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+pkg_setup() {
+	use units--cur && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc ChangeLog NEWS README
+
+	# we're intentionally delaying this since 'make install' would
+	# get confused if we shove 'units_cur' there, and there is no real
+	# need to add more complexity for it
+	if use units--cur; then
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
+		python_fix_shebang units_cur
+		python_doscript units_cur
+	fi
+}
diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild
deleted file mode 100644
index 9a722304b0b4..000000000000
--- a/sci-calculators/units/units-2.16.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit eutils python-single-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+units--cur"
-REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:=
-	units--cur? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-
-pkg_setup() {
-	use units--cur && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog NEWS README
-
-	# we're intentionally delaying this since 'make install' would
-	# get confused if we shove 'units_cur' there, and there is no real
-	# need to add more complexity for it
-	if use units--cur; then
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_fix_shebang units_cur
-		python_doscript units_cur
-	fi
-}
diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild
index ab70dde6bd9a..119605f9309f 100644
--- a/sci-calculators/units/units-2.18.ebuild
+++ b/sci-calculators/units/units-2.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit eutils python-single-r1
 
 DESCRIPTION="Unit conversion program"
@@ -19,8 +19,10 @@ RDEPEND="
 	sys-libs/readline:=
 	units--cur? (
 		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 "
 DEPEND="
diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild
new file mode 100644
index 000000000000..13c2f13963c0
--- /dev/null
+++ b/sci-calculators/units/units-2.19-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+inherit python-single-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+units--cur"
+REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	sys-libs/readline:=
+	units--cur? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+)
+DOCS=(
+	ChangeLog NEWS README
+)
+
+pkg_setup() {
+	use units--cur && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--sharedstatedir="${EROOT}/var/lib" \
+		ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+	emake ${PN}
+}
+
+src_install() {
+	default
+
+	# we're intentionally delaying this since 'make install' would
+	# get confused if we shove 'units_cur' there, and there is no real
+	# need to add more complexity for it
+	if use units--cur; then
+		sed \
+			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+			-e 's|^#!|&/usr/bin/python|g' \
+			units_cur_inst > units_cur || die
+		python_fix_shebang units_cur
+		python_doscript units_cur
+	fi
+}
diff --git a/sci-calculators/units/units-2.19.ebuild b/sci-calculators/units/units-2.19.ebuild
deleted file mode 100644
index 33e0d4159977..000000000000
--- a/sci-calculators/units/units-2.19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
-inherit python-single-r1
-
-DESCRIPTION="Unit conversion program"
-HOMEPAGE="https://www.gnu.org/software/units/units.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="FDL-1.3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+units--cur"
-REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	sys-libs/readline:=
-	units--cur? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.17-network-sandbox.patch
-)
-DOCS=(
-	ChangeLog NEWS README
-)
-
-pkg_setup() {
-	use units--cur && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		--sharedstatedir="${EROOT}/var/lib" \
-		ac_cv_path_PYTHON=no
-}
-
-src_compile() {
-	emake ${PN}
-}
-
-src_install() {
-	default
-
-	# we're intentionally delaying this since 'make install' would
-	# get confused if we shove 'units_cur' there, and there is no real
-	# need to add more complexity for it
-	if use units--cur; then
-		sed \
-			-e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
-			-e 's|^#!|&/usr/bin/python|g' \
-			units_cur_inst > units_cur || die
-		python_fix_shebang units_cur
-		python_doscript units_cur
-	fi
-}
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 11aff635982e..f2af858e028a 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/autodock_vina/Manifest b/sci-chemistry/autodock_vina/Manifest
index b727a4092ac8..68deb91152ce 100644
--- a/sci-chemistry/autodock_vina/Manifest
+++ b/sci-chemistry/autodock_vina/Manifest
@@ -1,5 +1,6 @@
 AUX 1.1.2-gentoo.patch 2448 BLAKE2B f63add1d0fec8716672672af78fe8f34053bf060044e78fcf30ca6054e4075a5f12ac3a903812c9cd619dc34fa854603c8369c8acfcf17130d1b24b50b3d5373 SHA512 d8165d88f3e91064c74f1506a7f58473a74f6ebf993165827694d78170b29227dc378c61a7f096a3c49708b713583aca3d5714827d1fe43a5bb37f3d648d2613
 AUX autodock_vina-1.1.2-boost-filesystem.patch 2936 BLAKE2B 70c55e95e9728221ba80177989fde0cc6c93b479779aa0dda45dcad79b97018fe934ea56b4ede4af20ce867b6ed39c3958a5529b8f286aec33ec7ea53d339ada SHA512 4226fb0d7196362a02afa4e0b0616146ef816a439dd63e1bffbfef183975fe7e6260318f919e9d9835d2d47973542b5340e93ad35b070467e42c0990f9a635f7
+AUX autodock_vina-1.1.2-missing-debug-decl.patch 365 BLAKE2B 959b46facdce27850a1f9fd6c66ecc297e4ad089e79896b9fe2127e425bd1bfcfce5d676cf2e4336c47d3a72b0e8319c791fdf1a5807f244cf5b4528de8cbb25 SHA512 ddbdca76fca16b46fd042b57eb941b7ba67f59f46c35dc18428ea6873c8ed5f03051247b8c667a08af8de40fccb0caf851848bb9082536225cacf8eb3e313c98
 DIST autodock_vina_1_1_2.tgz 67366 BLAKE2B dc754bf522795ebfbfcf89a2df4e3761d941c1f0ce05cf56898720c1e855f5dd00fd2a583f5a8d218fa2e738d37e014a9b3239b9aa989b9018a6a33f8f0bd02c SHA512 f704af322ebc192117c49d0cf8a3f217105beccb7b47d6361665470894ef7a9f91fc4b5f07cc9aff56e497bfa80953e40e39090c8394a095c61597756e333ae9
-EBUILD autodock_vina-1.1.2.ebuild 932 BLAKE2B 57b02ce051bada78490a4c335f6b10d380ce900dad66c5f3228aea927d7e1814baecf357b080683df87e26ae15ab2c3b97cc3f3ceb7e93502f67e8a834257190 SHA512 39f8acb795d17786a5112a4e70bf67c6ab594d25ab5eb4b739e2b0c70a9e0548265bcd5f36b6d4915b82b43a0f463187f8d9dc5aaa62f925c5172950a6bc26ee
+EBUILD autodock_vina-1.1.2.ebuild 945 BLAKE2B 034a455deebf74c3f5170e5fd33eb30f4a2f8d5668af864d28dd0835c9a4a17367077c16c507ba5d798a2dbcb1b6d6b6f74f4de27a2b5869ef175100f0a732f8 SHA512 8174a0431930d8f591bf03601ea67b0bdf720a6d2fe102f4eda2e5d10f68c36166ae051abdd46dc2b4355213472c85da79d60d50f7ff1e7e2dd05683e06525a1
 MISC metadata.xml 1244 BLAKE2B 7df9f6f260c038c4f6b02a9fe35b54dbdc165975373ece6fb27856893536b3af7218ca1ff487ba908caa8c9beea43dc3f503fc83b6cf685754b8f17e53d771a9 SHA512 121a82bab7f4126fe5afe4ad39bbc9e397483c485e8a5771129d8eff883e87248acb1d689d47a57bf792ea8e1e23e82dec9bde811dae44e9b86a6736944c3484
diff --git a/sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild b/sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild
index bbff27f85e2f..59f14e8086c9 100644
--- a/sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild
+++ b/sci-chemistry/autodock_vina/autodock_vina-1.1.2.ebuild
@@ -1,40 +1,43 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic versionator
+inherit flag-o-matic
 
-MY_P="${PN}_$(replace_all_version_separators _)"
+MY_P="${PN}_$(ver_rs 1- _)"
 
 DESCRIPTION="Program for drug discovery, molecular docking and virtual screening"
 HOMEPAGE="http://vina.scripps.edu/"
 SRC_URI="http://vina.scripps.edu/download/${MY_P}.tgz"
 
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
-LICENSE="Apache-2.0"
 IUSE="debug"
 
-RDEPEND="dev-libs/boost[threads]"
+RDEPEND="dev-libs/boost:=[threads]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}/build/linux/release
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo.patch
+	"${FILESDIR}"/${P}-boost-filesystem.patch
+	"${FILESDIR}"/${P}-missing-debug-decl.patch
+)
+
 src_prepare() {
 	cd "${WORKDIR}"/${MY_P} || die
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${P}-boost-filesystem.patch
+	default
 }
 
-src_compile() {
-	local c_options
-
+src_configure() {
 	use debug || c_options="-DNDEBUG"
-
 	append-cxxflags -DBOOST_FILESYSTEM_VERSION=3
+}
 
+src_compile() {
 	emake \
 		BASE="${EPREFIX}"/usr/ \
 		GPP="$(tc-getCXX)" \
diff --git a/sci-chemistry/autodock_vina/files/autodock_vina-1.1.2-missing-debug-decl.patch b/sci-chemistry/autodock_vina/files/autodock_vina-1.1.2-missing-debug-decl.patch
new file mode 100644
index 000000000000..c68adb1bff21
--- /dev/null
+++ b/sci-chemistry/autodock_vina/files/autodock_vina-1.1.2-missing-debug-decl.patch
@@ -0,0 +1,11 @@
+--- a/src/lib/quaternion.h
++++ b/src/lib/quaternion.h
+@@ -70,6 +70,8 @@
+ 	return sqr(q.R_component_1()) + sqr(q.R_component_2()) + sqr(q.R_component_3()) + sqr(q.R_component_4());

+ }

+ 

++bool quaternion_is_normalized(const qt& q);

++

+ inline void quaternion_normalize(qt& q) {

+ 	const fl s = quaternion_norm_sqr(q);

+ 	assert(eq(s, sqr(boost::math::abs(q))));

diff --git a/sci-chemistry/chemex/Manifest b/sci-chemistry/chemex/Manifest
index 6992b72c5e83..6474026f3896 100644
--- a/sci-chemistry/chemex/Manifest
+++ b/sci-chemistry/chemex/Manifest
@@ -1,3 +1,3 @@
 DIST chemex-0.6.1.tar.gz 1449216 BLAKE2B 6b7f7597b09cd43b9bec89b6359d1f650fdd7d4f3a373e706da80dafaf438417458f34af6bc378442b5b4a84cb8222103ebc8026c85583e8dece3fad0dc77204 SHA512 40f538ef9c162759c7a6863886da8d46746ac362fc19154f0a5f3dd8703f7fea7397c3f34092c86dbce486c452e0d3b09a76e4c11ae119834d7ca4912e7f3fdf
-EBUILD chemex-0.6.1-r2.ebuild 1002 BLAKE2B 0122f5cd2ec6e61f8d24b6aa14b84e707e9344ee0dbef42eccf3a07354c36d5ac22d5be33eb390da4ff1cf9299fe47f6be4d77e1489e70fb1a9d6fd43ae89d67 SHA512 c7c5cd0a21032aa0f18ebffba48739f29a2511e387ca3ec53dc7495cac63dfb2527841a2454030179cfc217f87c29351d91b0ae2e8b038c6f87e4e644964fed7
+EBUILD chemex-0.6.1-r3.ebuild 1037 BLAKE2B 8d1d5ed8e4aea24247816a7db54644e421e720cc86e469abc62b3f0c61ad1b3178ecd6ab6318d0419f1e6d27796526f42c68f95574d65594c681142f64f71cd9 SHA512 5d0b85517336e7c47de49a0f5cc061c4eb46e6b6f02eff6d964e467cef78d19077635140d0150ad3cec698d5e98d1fae4abebcce834e1b31b485fe3b52efa75e
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/sci-chemistry/chemex/chemex-0.6.1-r2.ebuild b/sci-chemistry/chemex/chemex-0.6.1-r2.ebuild
deleted file mode 100644
index 0b85b22ffc3d..000000000000
--- a/sci-chemistry/chemex/chemex-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DISTUTILS_SINGLE_IMPL="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
-HOMEPAGE="https://github.com/gbouvignies/chemex"
-SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=dev-python/matplotlib-python2-1.1[${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-1.1[${PYTHON_USEDEP}]
-	)
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	|| (
-		>=sci-libs/scipy-python2-0.11[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-0.11[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# Fix quotes to detect the version properly
-	sed -i -e 's/matplotlib>=1.3.1/matplotlib>="1.3.1"/' setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/sci-chemistry/chemex/chemex-0.6.1-r3.ebuild b/sci-chemistry/chemex/chemex-0.6.1-r3.ebuild
new file mode 100644
index 000000000000..c6facbd71020
--- /dev/null
+++ b/sci-chemistry/chemex/chemex-0.6.1-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DISTUTILS_SINGLE_IMPL="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Program to fit chemical exchange induced shift and relaxation data"
+HOMEPAGE="https://github.com/gbouvignies/chemex"
+SRC_URI="https://github.com/gbouvignies/chemex/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		|| (
+			>=dev-python/matplotlib-python2-1.1[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/matplotlib-1.1[${PYTHON_MULTI_USEDEP}]
+		)
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+		|| (
+			>=sci-libs/scipy-python2-0.11[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/scipy-0.11[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix quotes to detect the version properly
+	sed -i -e 's/matplotlib>=1.3.1/matplotlib>="1.3.1"/' setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/sci-chemistry/chemical-mime-data/Manifest b/sci-chemistry/chemical-mime-data/Manifest
index f0d861fd3d5a..1ea5baf98461 100644
--- a/sci-chemistry/chemical-mime-data/Manifest
+++ b/sci-chemistry/chemical-mime-data/Manifest
@@ -1,7 +1,9 @@
+AUX chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch 934 BLAKE2B 8c35adddc5dbed044a68c1f0f485faf01ae4d6fb4724e82956e9e73292e2b7e37f527a8225fce3fa4b3c6629038086f30912b8bce21d704244dc18ba52673f8a SHA512 f1ca2c08b33f77ccc1355edbbba53971e4c09ed004ec35554617d57cb6dd90c9a8a712ebfe1c7e0b01d9a97790004a048029a9e96323e7a105e9b15408a0d4cd
 AUX chemical-mime-data-0.1.94-namespace-svg.patch 798 BLAKE2B 4ab826dd3c76234c903a740b2e59dd4403d01aff856327d31c6707ab4563931d9fe4d9d57bdc19d6102d63d860eb2d88220844b934aa63cc3be984621ac52d28 SHA512 64addfac817a7f056f381515561b4311936410dc46385a3ded8c65f8fbc3d5dda731c4ec02e9369299c8122e7c43a6dc53005a4957e4165bbf958f683708513d
 AUX chemical-mime-data-0.1.94-pigz.patch 481 BLAKE2B dee47e41645b5d196326fb7439e1a96b3d46983fa9c9ec4295b17676d51f966f48ff51668203e59f18580939337d83d5ae904ef33fe2044dcc62fedd90fcb82e SHA512 a16839c1b88486ed26b4987a22594d0c3d45254d31157560135bdba008e5caa0a372d11e7db858564f1eca75452d2e43509899a91c2a8872465ea06277a1fb6c
 AUX chemical-mime-data-0.1.94-rsvg-convert.patch 1039 BLAKE2B 2eff2aa39206181f56bc802c30b4b043a0aeccef55c5d4e34755dcca69cc3afadd6cac364307729d8d83c88b7ba1d91d7200a80c7bd577e22c6ec5aec3b1921d SHA512 9c12f96f16e7982a5ba11fc546293a2e74f8918ef6eb274e3b1a618fc28aff244402c9b28ffebc2e01c8f6eb0e9e2516da82852bd0f9142c10e97f027670e60d
 AUX chemical-mime-data-0.1.94-turbomole.patch 2451 BLAKE2B 86b4b08b2af4503e0f8a525ebaa4231a3d0d3727c951b9e957c9fdac790bc41b7f01092350099a64cce66dbb61bc4cbd3654ef91834310c6c7cd1dc156ca87e8 SHA512 1bfa8818d159f0f917a24a06b0bfe926f0854f4242d8c2dbbedcd4210ffd38a459298862dc1d1aedbbe648a933db99c5d647c5409af74f88b03dd3033946df54
 DIST chemical-mime-data-0.1.94.tar.bz2 146077 BLAKE2B 9996c240446dc9571b6b4afbcdc6cf16a08e11314da9f785490b1b20933b6d18a333132492e30315c08f4441c048ec593a111815253050cfb5ab562aadb784f1 SHA512 7f3d967149f27ab1de53c948dc055959e661e1be9d778e3d56d06bea95769da7770ab5fb66afab6607747ef91ffb1dbbcf921e5f06e3303351781968594b5f00
 EBUILD chemical-mime-data-0.1.94-r3.ebuild 1007 BLAKE2B 20203fada235e55c4614a8f5f80271adb91ecb8e21e553aeaf3ef2d0bb9f94b78ae7f4905db9698f2d4a0971cc309eb863277261dae0cb4fc19d60cc6a8037c4 SHA512 421ee83448926cc336065c22f270d2c8d4f7fdd0517b684ecd4faa002b16bad0113d9de3fb88a548a7e35e028d3572932a7fc8907d516d3878cc4cafb1474131
+EBUILD chemical-mime-data-0.1.94-r4.ebuild 1132 BLAKE2B aade2545fbe6e9c255ed7d1f3da543bb05456355d56acbded2f599e10f24117daba19cb9d51090e8dbb79090a722d39a0c8c2573672beea1c8373557c715e781 SHA512 8b5e5fcd3a83b046341b2afeabc397c8416f97f7bb47edd6b4b5270540377dd46c01ac1cc342d6ed2f6994bb063bccbb29c0fcda7cb82212a188cd135ad72dba
 MISC metadata.xml 474 BLAKE2B c4d6ffbdf66f856fc9e404202d9a9956d8bbfaeb31eb1eb056300ca5049c02d0499ead32a2013080e397eba272bd3a290b81f343baab1fb40204364bfa5208ec SHA512 59cfe759a75bf49fb020652168434fb610c2d5ba56507945253f556b5542a119bc9c9dc4f2b71ceed93f6672b31e5713cc9d76c433e95b0a08c51e9e577bac00
diff --git a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
new file mode 100644
index 000000000000..ad703d678720
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg
+
+DESCRIPTION="A collection of data files to add support for chemical MIME types"
+HOMEPAGE="https://github.com/dleidert/chemical-mime"
+SRC_URI="mirror://sourceforge/${PN/-data/}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-misc/shared-mime-info
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	dev-util/desktop-file-utils
+	dev-libs/libxslt
+	|| (
+		gnome-base/librsvg
+		media-gfx/imagemagick[xml,png,svg]
+	)
+	media-gfx/imagemagick[png]
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-turbomole.patch
+	"${FILESDIR}"/${P}-pigz.patch
+	"${FILESDIR}"/${P}-namespace-svg.patch
+	"${FILESDIR}"/${P}-rsvg-convert.patch
+	# https://github.com/dleidert/chemical-mime/issues/1
+	"${FILESDIR}"/${P}-drop-turbomole-vibrational.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-update-database \
+		--without-gnome-mime \
+		--without-pixmaps \
+		--without-kde-mime \
+		--htmldir=/usr/share/doc/${PF}/html
+}
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch
new file mode 100644
index 000000000000..4c25b1a18343
--- /dev/null
+++ b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-drop-turbomole-vibrational.patch
@@ -0,0 +1,20 @@
+diff -up chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole_vibration chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in
+--- chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in.turbomole_vibration	2020-01-29 17:32:45.000000000 +0100
++++ chemical-mime-data-0.1.94/src/chemical-mime-database.xml.in	2020-01-29 17:32:45.000000000 +0100
+@@ -1401,16 +1401,6 @@
+ 		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
+ 	</mime-type>
+ 
+-	<mime-type type="chemical/x-turbomole-vibrational" support="yes">
+-		<_comment>Turbomole Vibrational Data File</_comment>
+-		<glob pattern="???"/>
+-		<sub-class-of type="text/plain"/>
+-		<icon kde="qc"/>
+-		<supported-by>
+-			<application name="viewmol"/>
+-		</supported-by>
+-		<specification url="http://www.cosmologic.de/data/DOK_HTML/"/>
+-	</mime-type>
+
+	<mime-type type="chemical/x-vamas-iso14976" cm:support="no">
+		<_comment>VAMAS document</_comment>
diff --git a/sci-chemistry/freeon/Manifest b/sci-chemistry/freeon/Manifest
index 4f6aba7fa386..3d0221b4f199 100644
--- a/sci-chemistry/freeon/Manifest
+++ b/sci-chemistry/freeon/Manifest
@@ -2,6 +2,6 @@ AUX freeon-1.0.10-stop.patch 970 BLAKE2B 6c1e5dfe5ad881fbbceb071c53cf3fcaa187ae1
 AUX freeon-1.0.8-blas.patch 5076 BLAKE2B 198f65079462b8c7af860b98894526bdc98172035c3d0b5ccd0cfd8bca14e36790c9e20771b7ec8ce5ca4d47f2d5dc7f768c7cf1a4b4868bb48285ef518851fd SHA512 89012c6f8583a8736344a7bfa74a64bbe1af793443b7255ccb1fd73366d44527ed40c6dc3124caff1af02f4e662227c66aeced8d8526dbd26bb7a50e294b5da3
 DIST freeon-1.0.10.tar.bz2 5872019 BLAKE2B c3fde00a9ed67550bb5820ac78ff32d9f6d011db9291c45c0b7e62cacb62b48e7506d7bf1aa86e176577d18e679e859435f0d3b63289bc08e502a35f86c036d3 SHA512 5bae89d6421600792bf986f6fb7504d321d5d51782587237ecba35191e54c1ec6c5ea1fdc50ed2d339551c527e4efcc5421048ccce0404c4b06875cbd0800862
 DIST freeon-1.0.8.tar.bz2 5957707 BLAKE2B b76ae0ca17cc8407b37fac243523d2f8db63382a6f39d24380d2f01356ac78fbe2fb905bb525d979c9832b820623bffa7a0930d312c36f29138defb0d8bce106 SHA512 1227f670a73b4ea39beb26e4136ad535e126ad17d66171c31b3bd403a3886eee150cda865806a2d9dad85646ccb086a6be4f645455eab24603cb064fb725efbd
-EBUILD freeon-1.0.10.ebuild 642 BLAKE2B c25d6ac3201a4f607022e2d887101f8cd8be2f76054a93f7fd6ef95ab640e6500989393e5ef8dd8b61447fa2ff40894b46cc07bede6480060c76fa061f3078c0 SHA512 56d4d8b356f2e7b55deb3ecdd632b7e00b2a0c907d9e5dc1941ef3695e0da14ded7e025b990df46d9c3a19705123e4a5acde4a838e66a61052c9dd698def6d63
+EBUILD freeon-1.0.10.ebuild 636 BLAKE2B 79e5034c4ba6fe4e5a862d4c18566504b73cea81e16b75f2b871ec44b0e0c0f95fc4f44a53bf0d016a872efdc276359583e66947e6cce2d33daecf6986e9dd1e SHA512 d6ab2836564776cbe004f1fd4121188e625810e1a37aae24af30becb056b4e66a9d5a53923505533d9d7fd3191595d5b013413896ba9bd00d5b6a0d68f935376
 EBUILD freeon-1.0.8-r1.ebuild 626 BLAKE2B 5d5a53bd58c81ff88775f1370d0daf71e94d043b5c3fc825cb2e040cbdb4b3129c1b97b88b5eaaed1a21aaa592c0fa27fb4c7d403cacfdb5d2cfef724c8c72f9 SHA512 8474400965e790a50285e2d5687952535e5d2ee4797086dd64b7f62a990d993937f13d28f92f01057185378944f6baa939427b2a9253749cadb992afd9a72940
 MISC metadata.xml 528 BLAKE2B aa64697b42ac5f829fc893ae2c05f0bae6bb9bb16f067539ca9a11b9469a9a9f4b203eb2f0242f9fde744ea6905223da2249e50622a479975548ef552e7286dc SHA512 4eea3876d046b423706f565571cbe20dbe2ff724ecd8de7f92ba0103c83f78d9e1d28789d6c35e62a8f0527f13bdadf6303695c529b7b6622bc2e14cf57044da
diff --git a/sci-chemistry/freeon/freeon-1.0.10.ebuild b/sci-chemistry/freeon/freeon-1.0.10.ebuild
index 8dd980d33176..f17708da523a 100644
--- a/sci-chemistry/freeon/freeon-1.0.10.ebuild
+++ b/sci-chemistry/freeon/freeon-1.0.10.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 FORTRAN_STANDARD=90
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools fortran-2 python-any-r1
 
diff --git a/sci-chemistry/gmxapi/Manifest b/sci-chemistry/gmxapi/Manifest
index 8e7fbb119013..70f42f526c0f 100644
--- a/sci-chemistry/gmxapi/Manifest
+++ b/sci-chemistry/gmxapi/Manifest
@@ -1,3 +1,3 @@
 DIST gmxapi-0.0.7.1.tar.gz 671400 BLAKE2B 5db024bceaed262fc1bd2ef35c0c24a31eff12abde7766ba0eea9d5aabe04c435cdf3c79c04d7932f2110de837a0d06e1f66239f22ba6f313410ed8c9d899788 SHA512 4103d67be3c869907613ec74fc46f14b15242ad93a973fc984dbb25e79bb0bb697d9d2ad9b67a8da2500e5a89b8f78ea1ef1632455af29830e11c2bf1f11bc44
-EBUILD gmxapi-0.0.7.1.ebuild 1232 BLAKE2B ce5e1d18626a71dc760181efa246d9ca422c2710545d0096faac5f0a5f03237011cf27eae74a4d7102427355893beb5e1f830327c66d8e76dfabf788fac4ed9e SHA512 d01b515af311217f0e27c037c93188f1381937b69b9cd2c51ced1bb73a8b6d03c773faf80932d510da2d33c4fdae4267b7156f52a855b994cbcf5bfb9fb10b9c
+EBUILD gmxapi-0.0.7.1.ebuild 1230 BLAKE2B 411e89543b4ad4c0c55664c77d0e538e3031339869cc043d30570f2fde2eab168c6fe73e9f37e864328c6d64dbb3cce5f6b3c5d05823c3b0745b637688685bb1 SHA512 e35365d42f3f81f7bf404dfbb64130d5b2b30346b2b80a05e2ba35850d98932b3ce2f942160d0d28319a149f6a6a38e98230504bd8c13676b1f5e8095387897f
 MISC metadata.xml 374 BLAKE2B d93e2ad2f09971909382ad65fc5f5033487979b0694f9dc656439573973f55ce1865e5a30584e55e1c48fdd93898601ac2b11e269fb2b1c5adc3ff8dde66f35d SHA512 1c61c58e1cfbbb42342f7a87625e0044e51523f7a2f7270ecfea537c622965e64195fc88eb8f70fac648a0154a19f4a852b88383de1dcd6e17ff0ac0dc6e22d8
diff --git a/sci-chemistry/gmxapi/gmxapi-0.0.7.1.ebuild b/sci-chemistry/gmxapi/gmxapi-0.0.7.1.ebuild
index 5bb47665f026..d7ad455c4f27 100644
--- a/sci-chemistry/gmxapi/gmxapi-0.0.7.1.ebuild
+++ b/sci-chemistry/gmxapi/gmxapi-0.0.7.1.ebuild
@@ -34,7 +34,7 @@ src_configure() {
 	my_impl_src_configure() {
 		local mycmakeargs=(
 			-DCMAKE_STRIP="${EPREFIX}/bin/true"
-			-DCMAKE_INSTALL_PREFIX="${ED%/}/usr"
+			-DCMAKE_INSTALL_PREFIX="${ED}/usr"
 			-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
 			-DGMXAPI_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${EPYTHON}/site-packages/gmx"
 		)
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 9fb8c517a917..b3569e237fad 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -7,9 +7,9 @@ DIST regressiontests-2019.5.tar.gz 67643634 BLAKE2B c4d9535d9a8a650869d67544ad5f
 DIST regressiontests-2020.tar.gz 48536146 BLAKE2B 9511db78b5d6a5ea431fdb73782f28dde4b94655139886c0ad519888ef3e435fe81807f158d66c1a4284cb88fe730f62d039ac23549f17d0ce5984764ef35f10 SHA512 5a35aaf6fe2f3b146c7045e9c967dc1c8bf754748cc1f2a7300193ae3f206a9f5058329380ae7b03b181410303bcd434584571e6161a75f99e52bd48f8ba1821
 EBUILD gromacs-2018.8.ebuild 8784 BLAKE2B 8c08b6c4f4278ed6455a0489b765c97c748835e49973bb83b7fe8e15d9453c8c9b6c6e26cd27a2d5a927aa87a36bfdef3874020f6658c9b2dcb774043e4547e3 SHA512 b66644847daa453b9a764faaa7f3145e16f3819d0d7ffdad12c1209a398cd03dbf7c2d60e0510f514b18f6ed8c09dfadb77bca6ff2f1eb044c65632842a7499a
 EBUILD gromacs-2018.9999.ebuild 8787 BLAKE2B 9edbb2ae0bd3f76af41cee9971b70fdc957f22bb61ec131abd3cf44a2da56c208b0b103f72754e17cccfa054d79c1e95a9477228b0c14f4476e58bd7656b641a SHA512 c4548c8436dadf1daaf7f4f41e3c957029a10f5eb7fd11c5c8f42046d2ba38c6baf9f47e69fb8e8eeef550e0463d76bf738d6f708ffce6b4cf556e29d725ed5a
-EBUILD gromacs-2019.5.ebuild 9232 BLAKE2B d6983b3c0cc508e278fd5fe358d1f5351f6fb6cc028cb1ee68ffaac484b11c8d88de43ac6d2b51f64ed08c4cb73f3d17ee7bc8af3947683bd3765d6b1038212d SHA512 1ff5231b3e3e6921f65295f7baa3371dd481cb004fd045005a8f9646f54b0053645bd9eb05f2cf260482e05689d668a02e7fbb851afc4d06ff2eb139f25483a7
-EBUILD gromacs-2019.9999.ebuild 9234 BLAKE2B 076a2a9ff537342156ca94f138c738fbff5a0b8167b7cd34ebab388357acc2f08249675428d19b13abe4d8489aaf94afb69fb32bba1cf7658550a984319dcb30 SHA512 da0007f5e8162efd53b061a564908167f8388c4cf4288d56167e0ab313140d92641d51f1c7384d52a55998de8baf23eaf56a04d633cd20525fbc0e2c46ba4256
-EBUILD gromacs-2020.9999.ebuild 9793 BLAKE2B 0a689e24c71085d134e51a091d647e64a3bdfdbc9678f27cc0fb86b7caa8b4e1e4bdda4e8a379bfe593408fc0ea236141db9e8fd89e58987aadb2003054227d6 SHA512 0efe1abfcd815248f6a77d47e33867b88aae79d71c3be146da3264ae91036fd5305129515b3ae12cad757ad802c18ba79e588581c910fe06606883cacb2c9a19
-EBUILD gromacs-2020.ebuild 9793 BLAKE2B 0a689e24c71085d134e51a091d647e64a3bdfdbc9678f27cc0fb86b7caa8b4e1e4bdda4e8a379bfe593408fc0ea236141db9e8fd89e58987aadb2003054227d6 SHA512 0efe1abfcd815248f6a77d47e33867b88aae79d71c3be146da3264ae91036fd5305129515b3ae12cad757ad802c18ba79e588581c910fe06606883cacb2c9a19
-EBUILD gromacs-9999.ebuild 9789 BLAKE2B 661122ba2791c7af9e6db3439ee166d4a29278d06b43f4281e7e467638bb4babdb554af35148d51732cc4686ffd5460943d5b74b96d169e8eb98fdb6c8cd1324 SHA512 487f42c089de666e832d5ce25c5d1c63de977557362b0018be09a69a261ad5096908443295b609b3c8a1d059dab603d340a481ebe2c46ef63677b265b97db8c3
+EBUILD gromacs-2019.5-r1.ebuild 9270 BLAKE2B 7bc19e1950bb824a0d30b6340ea181f0089f44237e324ec926698aaacfddfc33cc6a59644bf63ce56498f6fed80c3720e143f65fbd27f3b1e4fbbd021d08573d SHA512 651a096ed78b067b5d27591d64d552c2b31b759237375a278865afcb9123986a3e5c3785d46d54b71facf54b5d62ec76610eda0f7df6aed583c3b1e6b0a940e7
+EBUILD gromacs-2019.9999.ebuild 9272 BLAKE2B 6d6484a75d2f6ec9d97a33766ff42f0a3b364f8d71f9d8c0af8265e1dffd9eee93dce6a4e7edf93fe316abef0dd8ec1ee0beb9b7cfa04f0ffbe8aa15cefb6c04 SHA512 c0e81e4312accad7377e9e221b636c1870fdf85928ca221c8272b7af6d2d422c2c44b4e6e3cca9818b922e7f194f1e45208e545d5a65e77d57aa29df1d0474dc
+EBUILD gromacs-2020-r1.ebuild 9831 BLAKE2B 0d20f9e04a318eb2313d1b84adb9a747f4b70cc57446031da410e05bc37d2e3b53489110b803b69bcb235ea87dd913e9a7de6531c2e32b6afb9505c44a4d2dbe SHA512 c2edca500cd77e9b88f6b83cb4b3f11819adf313e4b68250d8b446466187e963bdd925665ca3aa532ae2c88b611f15b860f722cdf17c2b145d7cd58a56cb2c17
+EBUILD gromacs-2020.9999.ebuild 9831 BLAKE2B 0d20f9e04a318eb2313d1b84adb9a747f4b70cc57446031da410e05bc37d2e3b53489110b803b69bcb235ea87dd913e9a7de6531c2e32b6afb9505c44a4d2dbe SHA512 c2edca500cd77e9b88f6b83cb4b3f11819adf313e4b68250d8b446466187e963bdd925665ca3aa532ae2c88b611f15b860f722cdf17c2b145d7cd58a56cb2c17
+EBUILD gromacs-9999.ebuild 9827 BLAKE2B 20a6e2e5b0d70a1c0ada0cafcb12eb170b99ebb37778f467dda1800cabb05d6a34d0dfef9bfaa04b5e6f3b781ed2e5eb97a1f61044e54e526559a9f9093be648 SHA512 19c73f34eda0ed83e58b67c7feb87e6540fb441806c27ae3b6b7d0e59c33cd220d87873fa3b3b9b5c72e8f9f73b778d41d69f21a3fded51a030d1ac6854bc2a2
 MISC metadata.xml 1192 BLAKE2B 560c1c792102747fc16c22d475114480b9897263405da05946721dae5b781c599a02e1401adfa4d929bfb41b4d52791376438aa37d33de18beabc9edbeb779fa SHA512 136c49bfaca76e714e811077c7f7d214a5984c7b6c891c79ad4a754c304752e17450c9aee100dafce04d7bf3893a53224ef9b54504a278654d59fae9acdd0f77
diff --git a/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild b/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild
new file mode 100644
index 000000000000..dab1a95179dd
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2019.5-r1.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 cmake-utils cuda eutils multilib python-single-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ $PV = *9999* ]]; then
+	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
+		https://gerrit.gromacs.org/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		https://repo.or.cz/r/gromacs.git"
+	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0 )
+	hwloc? ( sys-apps/hwloc )
+	lapack? ( virtual/lapack )
+	lmfit? ( sci-libs/lmfit )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	${PYTHON_DEPS}
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+pkg_pretend() {
+	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
+	use openmp && ! tc-has-openmp && \
+		die "Please switch to an openmp compatible compiler"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests" \
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake-utils_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+
+	# try to create policy for imagemagik
+	mkdir -p ${HOME}/.config/ImageMagick
+	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+	<?xml version="1.0" encoding="UTF-8"?>
+	<!DOCTYPE policymap [
+	<!ELEMENT policymap (policy)+>
+	!ATTLIST policymap xmlns CDATA #FIXED ''>
+	<!ELEMENT policy EMPTY>
+	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+	]>
+	<policymap>
+		<policy domain="coder" rights="read | write" pattern="PS" />
+		<policy domain="coder" rights="read | write" pattern="PS2" />
+		<policy domain="coder" rights="read | write" pattern="PS3" />
+		<policy domain="coder" rights="read | write" pattern="EPS" />
+		<policy domain="coder" rights="read | write" pattern="PDF" />
+		<policy domain="coder" rights="read | write" pattern="XPS" />
+	</policymap>
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	#go from slowest to fastest acceleration
+	local acce="None"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	if use lmfit; then
+		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
+	else
+		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex doc)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( "-DGMX_GPU=ON" )
+		local opencl=( "-DGMX_USE_OPENCL=OFF" )
+		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			"${opencl[@]}"
+			"${cuda[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON
+			-DGMX_OPENMM=OFF
+			-DGMXAPI=OFF
+			"${opencl[@]}"
+			"${cuda[@]}"
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_compile
+		# not 100% necessary for rel ebuilds as available from website
+		if use doc; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_make check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake-utils_src_install
+		if use doc; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake-utils_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite:"
+	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
+	einfo  "https://dx.doi.org/10.1021/ct700301q"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2019.5.ebuild b/sci-chemistry/gromacs/gromacs-2019.5.ebuild
deleted file mode 100644
index 793ffa7a363f..000000000000
--- a/sci-chemistry/gromacs/gromacs-2019.5.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib python-single-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +gmxapi +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
-	lapack? ( virtual/lapack )
-	lmfit? ( sci-libs/lmfit )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	${PYTHON_DEPS}
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests" \
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-
-	# try to create policy for imagemagik
-	mkdir -p ${HOME}/.config/ImageMagick
-	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE policymap [
-	<!ELEMENT policymap (policy)+>
-	!ATTLIST policymap xmlns CDATA #FIXED ''>
-	<!ELEMENT policy EMPTY>
-	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-	]>
-	<policymap>
-		<policy domain="coder" rights="read | write" pattern="PS" />
-		<policy domain="coder" rights="read | write" pattern="PS2" />
-		<policy domain="coder" rights="read | write" pattern="PS3" />
-		<policy domain="coder" rights="read | write" pattern="EPS" />
-		<policy domain="coder" rights="read | write" pattern="PDF" />
-		<policy domain="coder" rights="read | write" pattern="XPS" />
-	</policymap>
-	EOF
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	if use lmfit; then
-		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
-	else
-		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMXAPI=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2019.9999.ebuild b/sci-chemistry/gromacs/gromacs-2019.9999.ebuild
index a08d3ecc9027..b3fc105b550a 100644
--- a/sci-chemistry/gromacs/gromacs-2019.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -55,7 +55,9 @@ BDEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
-		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
 		media-gfx/mscgen
 		media-gfx/graphviz
 		dev-texlive/texlive-latex
diff --git a/sci-chemistry/gromacs/gromacs-2020-r1.ebuild b/sci-chemistry/gromacs/gromacs-2020-r1.ebuild
new file mode 100644
index 000000000000..a2dcda755c8b
--- /dev/null
+++ b/sci-chemistry/gromacs/gromacs-2020-r1.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_SINGLE_IMPL=1
+
+inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
+
+if [[ $PV = *9999* ]]; then
+	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
+		https://gerrit.gromacs.org/gromacs.git
+		https://github.com/gromacs/gromacs.git
+		https://repo.or.cz/r/gromacs.git"
+	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
+	inherit git-r3
+else
+	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
+		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+fi
+
+ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+DESCRIPTION="The ultimate molecular dynamics simulation package"
+HOMEPAGE="http://www.gromacs.org/"
+
+# see COPYING for details
+# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
+#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
+LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
+SLOT="0/${PV}"
+IUSE="X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
+
+CDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libICE
+		)
+	blas? ( virtual/blas )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
+	opencl? ( virtual/opencl )
+	fftw? ( sci-libs/fftw:3.0 )
+	hwloc? ( sys-apps/hwloc )
+	lapack? ( virtual/lapack )
+	lmfit? ( sci-libs/lmfit )
+	mkl? ( sci-libs/mkl )
+	mpi? ( virtual/mpi )
+	${PYTHON_DEPS}
+	!sci-chemistry/gmxapi
+	"
+BDEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
+		media-gfx/mscgen
+		media-gfx/graphviz
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+		media-gfx/imagemagick
+	)"
+RDEPEND="${CDEPEND}"
+
+REQUIRED_USE="
+	|| ( single-precision double-precision )
+	cuda? ( single-precision )
+	cuda? ( !opencl )
+	mkl? ( !blas !fftw !lapack )
+	${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS README )
+
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} != *9999 ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+PATCHES=( "${FILESDIR}/${PN}-2020_beta1-pytest.patch" )
+
+pkg_pretend() {
+	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
+	use openmp && ! tc-has-openmp && \
+		die "Please switch to an openmp compatible compiler"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		default
+	else
+		git-r3_src_unpack
+		if use test; then
+			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
+			EGIT_BRANCH="${EGIT_BRANCH}" \
+			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
+				git-r3_src_unpack
+		fi
+	fi
+}
+
+src_prepare() {
+	#notes/todos
+	# -on apple: there is framework support
+
+	xdg_environment_reset #591952
+
+	cmake-utils_src_prepare
+
+	use cuda && cuda_src_prepare
+
+	GMX_DIRS=""
+	use single-precision && GMX_DIRS+=" float"
+	use double-precision && GMX_DIRS+=" double"
+
+	if use test; then
+		for x in ${GMX_DIRS}; do
+			mkdir -p "${WORKDIR}/${P}_${x}" || die
+			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
+		done
+	fi
+
+	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
+
+	# try to create policy for imagemagik
+	mkdir -p ${HOME}/.config/ImageMagick
+	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
+	<?xml version="1.0" encoding="UTF-8"?>
+	<!DOCTYPE policymap [
+	<!ELEMENT policymap (policy)+>
+	!ATTLIST policymap xmlns CDATA #FIXED ''>
+	<!ELEMENT policy EMPTY>
+	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+	]>
+	<policymap>
+		<policy domain="coder" rights="read | write" pattern="PS" />
+		<policy domain="coder" rights="read | write" pattern="PS2" />
+		<policy domain="coder" rights="read | write" pattern="PS3" />
+		<policy domain="coder" rights="read | write" pattern="EPS" />
+		<policy domain="coder" rights="read | write" pattern="PDF" />
+		<policy domain="coder" rights="read | write" pattern="XPS" />
+	</policymap>
+	EOF
+}
+
+src_configure() {
+	local mycmakeargs_pre=( ) extra fft_opts=( )
+
+	#go from slowest to fastest acceleration
+	local acce="None"
+	use cpu_flags_x86_sse2 && acce="SSE2"
+	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
+	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
+	use cpu_flags_x86_avx && acce="AVX_256"
+	use cpu_flags_x86_avx2 && acce="AVX2_256"
+
+	#to create man pages, build tree binaries are executed (bug #398437)
+	[[ ${CHOST} = *-darwin* ]] && \
+		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
+
+	if use fftw; then
+		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
+	elif use mkl && has_version "=sci-libs/mkl-10*"; then
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
+			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
+		)
+	elif use mkl; then
+		local bits=$(get_libdir)
+		fft_opts=( -DGMX_FFT_LIBRARY=mkl
+			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
+			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
+		)
+	else
+		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
+	fi
+
+	if use lmfit; then
+		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
+	else
+		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
+	fi
+
+	mycmakeargs_pre+=(
+		"${fft_opts[@]}"
+		"${lmfit_opts[@]}"
+		-DGMX_X11=$(usex X)
+		-DGMX_EXTERNAL_BLAS=$(usex blas)
+		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
+		-DGMX_OPENMP=$(usex openmp)
+		-DGMX_COOL_QUOTES=$(usex offensive)
+		-DGMX_USE_TNG=$(usex tng)
+		-DGMX_BUILD_MANUAL=$(usex doc)
+		-DGMX_HWLOC=$(usex hwloc)
+		-DGMX_DEFAULT_SUFFIX=off
+		-DGMX_SIMD="$acce"
+		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
+		-DBUILD_TESTING=$(usex test)
+		-DGMX_BUILD_UNITTESTS=$(usex test)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		${extra}
+	)
+
+	for x in ${GMX_DIRS}; do
+		einfo "Configuring for ${x} precision"
+		local suffix=""
+		#if we build single and double - double is suffixed
+		use double-precision && use single-precision && \
+			[[ ${x} = "double" ]] && suffix="_d"
+		local p
+		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
+		local cuda=( "-DGMX_GPU=OFF" )
+		[[ ${x} = "float" ]] && use cuda && \
+			cuda=( "-DGMX_GPU=ON" )
+		local opencl=( "-DGMX_USE_OPENCL=OFF" )
+		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_MPI=OFF
+			-DGMX_THREAD_MPI=$(usex threads)
+			-DGMXAPI=$(usex gmxapi)
+			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
+			"${opencl[@]}"
+			"${cuda[@]}"
+			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
+			-DGMX_BINARY_SUFFIX="${suffix}"
+			-DGMX_LIBS_SUFFIX="${suffix}"
+			-DGMX_PYTHON_PACKAGE=$(usex python)
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
+		use mpi || continue
+		einfo "Configuring for ${x} precision with mpi"
+		mycmakeargs=(
+			${mycmakeargs_pre[@]} ${p}
+			-DGMX_THREAD_MPI=OFF
+			-DGMX_MPI=ON
+			-DGMX_OPENMM=OFF
+			-DGMXAPI=OFF
+			"${opencl[@]}"
+			"${cuda[@]}"
+			-DGMX_BUILD_MDRUN_ONLY=ON
+			-DBUILD_SHARED_LIBS=OFF
+			-DGMX_BUILD_MANUAL=OFF
+			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
+			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
+			)
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
+		[[ ${CHOST} != *-darwin* ]] || \
+		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
+	done
+}
+
+src_compile() {
+	for x in ${GMX_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_compile
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_src_compile	python_packaging/all
+			BUILD_DIR="${WORKDIR}/${P}" \
+				distutils-r1_src_compile
+		fi
+		# not 100% necessary for rel ebuilds as available from website
+		if use doc; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}"\
+				cmake-utils_src_compile manual
+		fi
+		use mpi || continue
+		einfo "Compiling for ${x} precision with mpi"
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
+			cmake-utils_src_compile
+	done
+}
+
+src_test() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}"\
+			cmake-utils_src_make check
+	done
+}
+
+src_install() {
+	for x in ${GMX_DIRS}; do
+		BUILD_DIR="${WORKDIR}/${P}_${x}" \
+			cmake-utils_src_install
+		if use python; then
+			BUILD_DIR="${WORKDIR}/${P}_${x}" \
+				cmake-utils_src_install	python_packaging/install
+		fi
+		if use doc; then
+			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
+		fi
+		use mpi || continue
+		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
+			cmake-utils_src_install
+	done
+
+	if use tng; then
+		insinto /usr/include/tng
+		doins src/external/tng_io/include/tng/*h
+	fi
+	# drop unneeded stuff
+	rm "${ED}"/usr/bin/GMXRC* || die
+	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
+		local n=${x##*/gmx-completion-}
+		n="${n%.bash}"
+		cat "${ED}"/usr/bin/gmx-completion-gmx.bash "$x" > "${T}/${n}" || die
+		newbashcomp "${T}"/"${n}" "${n}"
+	done
+	rm "${ED}"/usr/bin/gmx-completion*.bash || die
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	einfo
+	einfo  "Please read and cite:"
+	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
+	einfo  "https://dx.doi.org/10.1021/ct700301q"
+	einfo
+	readme.gentoo_print_elog
+}
diff --git a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
index f40242167fd7..a2dcda755c8b 100644
--- a/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.9999.ebuild
@@ -58,7 +58,9 @@ BDEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
-		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
 		media-gfx/mscgen
 		media-gfx/graphviz
 		dev-texlive/texlive-latex
diff --git a/sci-chemistry/gromacs/gromacs-2020.ebuild b/sci-chemistry/gromacs/gromacs-2020.ebuild
deleted file mode 100644
index f40242167fd7..000000000000
--- a/sci-chemistry/gromacs/gromacs-2020.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 cmake-utils cuda distutils-r1 eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +gmxapi +gmxapi-legacy +hwloc lapack +lmfit mkl mpi +offensive opencl openmp +python +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.14 )
-	opencl? ( virtual/opencl )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( sys-apps/hwloc )
-	lapack? ( virtual/lapack )
-	lmfit? ( sci-libs/lmfit )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	${PYTHON_DEPS}
-	!sci-chemistry/gmxapi
-	"
-BDEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		media-gfx/mscgen
-		media-gfx/graphviz
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	cuda? ( !opencl )
-	mkl? ( !blas !fftw !lapack )
-	${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS README )
-
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-PATCHES=( "${FILESDIR}/${PN}-2020_beta1-pytest.patch" )
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-
-	# try to create policy for imagemagik
-	mkdir -p ${HOME}/.config/ImageMagick
-	cat >> ${HOME}/.config/ImageMagick/policy.xml <<- EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE policymap [
-	<!ELEMENT policymap (policy)+>
-	!ATTLIST policymap xmlns CDATA #FIXED ''>
-	<!ELEMENT policy EMPTY>
-	<!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
-			name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
-			stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
-	]>
-	<policymap>
-		<policy domain="coder" rights="read | write" pattern="PS" />
-		<policy domain="coder" rights="read | write" pattern="PS2" />
-		<policy domain="coder" rights="read | write" pattern="PS3" />
-		<policy domain="coder" rights="read | write" pattern="EPS" />
-		<policy domain="coder" rights="read | write" pattern="PDF" />
-		<policy domain="coder" rights="read | write" pattern="XPS" />
-	</policymap>
-	EOF
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	if use lmfit; then
-		local lmfit_opts=( -DGMX_USE_LMFIT=EXTERNAL )
-	else
-		local lmfit_opts=( -DGMX_USE_LMFIT=INTERNAL )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		"${lmfit_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=$(usex test)
-		-DGMX_BUILD_UNITTESTS=$(usex test)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( "-DGMX_GPU=ON" )
-		local opencl=( "-DGMX_USE_OPENCL=OFF" )
-		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			-DGMXAPI=$(usex gmxapi)
-			-DGMX_INSTALL_LEGACY_API=$(usex gmxapi-legacy)
-			"${opencl[@]}"
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			-DGMX_PYTHON_PACKAGE=$(usex python)
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON
-			-DGMX_OPENMM=OFF
-			-DGMXAPI=OFF
-			"${opencl[@]}"
-			"${cuda[@]}"
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile	python_packaging/all
-			BUILD_DIR="${WORKDIR}/${P}" \
-				distutils-r1_src_compile
-		fi
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use python; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}" \
-				cmake-utils_src_install	python_packaging/install
-		fi
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"/usr/bin/GMXRC* || die
-	for x in "${ED}"/usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"/usr/bin/gmx-completion-gmx.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"/usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index aa6382b595a9..11c545362c66 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -58,7 +58,9 @@ BDEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
-		dev-python/sphinx[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		')
 		media-gfx/mscgen
 		media-gfx/graphviz
 		dev-texlive/texlive-latex
diff --git a/sci-chemistry/nmrdepaker/Manifest b/sci-chemistry/nmrdepaker/Manifest
index a3f94f72a9a2..0348215f3e6d 100644
--- a/sci-chemistry/nmrdepaker/Manifest
+++ b/sci-chemistry/nmrdepaker/Manifest
@@ -1,3 +1,3 @@
 DIST nmrdepaker-1.0.tar.gz 2233765 BLAKE2B 9b638a36fc50d7c020d56833b6ca78d7079ad357f42431088c4c0735b7e9ce63a0e6318915ec751b42e6628c0da76b93ca16ffea1ffe6b311480e8d278ce1a1a SHA512 9d1a9048a85f85eacaeeb582c5550345efa673b1f517dad121e2b2e19125f93e71a26f2f8240ea9b8a06489814eb833e7b3653f882a46bad699b01fd1aa4299f
-EBUILD nmrdepaker-1.0-r2.ebuild 920 BLAKE2B 684f7f2a3475a04abf4592da1b70033a2c7c9f29ef99be234a927555e39f3d4a3241968e4ac7ed1c23cfb37d99c97c407251e933a7bec61c0ebd7d0a38a84dd1 SHA512 f1bf2fa3827f1f161447b439d82599ee2fd7628e96aea35fba9019dd350efa6816b1a351d3e80d4182462b0e5b3ff0629edebee38f24011d9cdfe792cbec1ca4
+EBUILD nmrdepaker-1.0-r3.ebuild 988 BLAKE2B 37878502c166f163c8d0288635cfe01b9b05e2752424203f4cc327bf3309a62d054f44acaebdd5f5a6c2b8baf2216635e5bc5e72ac6af3e8f2b89105f388db50 SHA512 60ce7c8c486d15fd717705b007629d311ce7520e422806f347a14b6bb546c657fb0241f79371a7ec8e4ff37d24aa1fc5bea54a1a7d1ea8f416a06d2077cdeb0a
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/sci-chemistry/nmrdepaker/nmrdepaker-1.0-r2.ebuild b/sci-chemistry/nmrdepaker/nmrdepaker-1.0-r2.ebuild
deleted file mode 100644
index 043fd37324eb..000000000000
--- a/sci-chemistry/nmrdepaker/nmrdepaker-1.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_SINGLE_IMPL="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop distutils-r1
-
-DESCRIPTION="Program to perform NMR spectra 'De-Pake-ing' and moment calculation"
-HOMEPAGE="https://launchpad.net/nmrdepaker"
-SRC_URI="https://launchpad.net/${PN}/${PV}/${PV}/+download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=dev-python/matplotlib-python2-0.98.5[gtk2,${PYTHON_USEDEP}]
-		>=dev-python/matplotlib-0.98.5[gtk2,${PYTHON_USEDEP}]
-	)
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.2[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/nmrdpaker-${PV}"
-
-src_install() {
-	distutils-r1_src_install
-
-	newicon lib/data/images/unused/nmrfriend-buddy.svg ${PN}.svg
-	make_desktop_entry ${PN}
-}
diff --git a/sci-chemistry/nmrdepaker/nmrdepaker-1.0-r3.ebuild b/sci-chemistry/nmrdepaker/nmrdepaker-1.0-r3.ebuild
new file mode 100644
index 000000000000..66a98a99cef1
--- /dev/null
+++ b/sci-chemistry/nmrdepaker/nmrdepaker-1.0-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_SINGLE_IMPL="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop distutils-r1
+
+DESCRIPTION="Program to perform NMR spectra 'De-Pake-ing' and moment calculation"
+HOMEPAGE="https://launchpad.net/nmrdepaker"
+SRC_URI="https://launchpad.net/${PN}/${PV}/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		|| (
+			>=dev-python/matplotlib-python2-0.98.5[gtk2,${PYTHON_MULTI_USEDEP}]
+			>=dev-python/matplotlib-0.98.5[gtk2,${PYTHON_MULTI_USEDEP}]
+		)
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/numpy-1.2[${PYTHON_MULTI_USEDEP}]
+		)
+		>=dev-python/pygtk-2.12:2[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/nmrdpaker-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+
+	newicon lib/data/images/unused/nmrfriend-buddy.svg ${PN}.svg
+	make_desktop_entry ${PN}
+}
diff --git a/sci-chemistry/openbabel-python/Manifest b/sci-chemistry/openbabel-python/Manifest
index ed04c0eac855..5ded7d1cda4a 100644
--- a/sci-chemistry/openbabel-python/Manifest
+++ b/sci-chemistry/openbabel-python/Manifest
@@ -1,4 +1,4 @@
-AUX openbabel-python-2.3.2-gcc-6_and_7-backport.patch 635 BLAKE2B 4e98dedd149b14d5bb02fb6d2fa03e07242d100c7b41f36f749ff3d587080eeca44aa26ca095d31e0309e45f3780b67deaa97f1177ed35a9b7407bd7c33f78ff SHA512 e1b4402f34d01ced5b4caaa184b4e5544cf47893cfe7958054052b05a57dc34b4d44239a212c7d909f29b9366b83b6df74993f844a20f23748c01272ec093081
+AUX openbabel-python-2.3.2-gcc-6_and_7-backport.patch 637 BLAKE2B e913c1d1bc93fd8443faa20fc9d7b28b89b276f7561d4208a42abd379111d19ff26179b2fbdca946a9df38e42d31f32b68423be073611e79615dcd6ae20d8f0d SHA512 0108f7bc83e046e29b2ae0b822787f58c6930de775dc94df89ba741f41cb3873a3bd2b677c11ccad4c32172e486b8331c25492127c83e4ab8d066bd129aa5538
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
 EBUILD openbabel-python-2.4.1-r1.ebuild 2166 BLAKE2B 45ed425ebe47014c04d8f71661d0e29259d7b3d598695de0c7f0c7027b1488e70855ab4acb74b3d901f706bd58a8cb43ef7f4b1d5f927f8a16220f0cf7ffba41 SHA512 03bfaad27c45362252ebd719d7b526e977b1330e02251e8c82e0568c9f8a8759a5796dd2a22f22419d0f3465fe325d45c4f41a40b9a85edb14cd0a8ad4bed1b7
 MISC metadata.xml 737 BLAKE2B 9a5fe97df44ce22c6ee27133bbc6144132ee3775db77440adcd6c3e9c44b87cefbace4ebe17906af87f841e07deef5183e451a8c193232d2a6ca7da05c7a0ed7 SHA512 7ff97ef3f6752a8fed578676aa2cb9706b7d68e31ee22d26e90d4bbb01c10ff410b66da20a91b078293add3bcb3a3711ad180d5174368e0d588ea718ad297d7e
diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch
index e23dc6020ee5..1624262e6982 100644
--- a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch
+++ b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.2-gcc-6_and_7-backport.patch
@@ -7,7 +7,7 @@ index 0ee545cf..7f4b944e 100755
  if(CMAKE_COMPILER_IS_GNUCXX)
    exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
 -  string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-+  string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++  string(REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
    # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
    # patch level, handle this here:
    if (NOT _gcc_version)
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index 2681ad9f8d71..1e0262b0ccb0 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -1,5 +1,5 @@
 AUX openbabel-2.3.2-gcc-6_and_7-backport.patch 635 BLAKE2B 4e98dedd149b14d5bb02fb6d2fa03e07242d100c7b41f36f749ff3d587080eeca44aa26ca095d31e0309e45f3780b67deaa97f1177ed35a9b7407bd7c33f78ff SHA512 e1b4402f34d01ced5b4caaa184b4e5544cf47893cfe7958054052b05a57dc34b4d44239a212c7d909f29b9366b83b6df74993f844a20f23748c01272ec093081
-AUX openbabel-2.4.1-gcc-8.patch 706 BLAKE2B 085b2f5a1678c02a6a8efc5f760dc43ef311774a47d80c87efb75111ac750ec6bf520286fa74325eca71138eecff4b2772ab087d4de1b9b9a5f1c81806d6be87 SHA512 04884d47a9549d2c107bbeb9c36edbe18ee68a7edd447fce405f39a4297bdacf3f81ddf4c5c19e9728355f07960b836e684087573b3a2b7892225de8b7beaea1
+AUX openbabel-2.4.1-gcc-8.patch 707 BLAKE2B 2b40d3e573664d036ef961e0298d34e093370485a07790ec2bb9628b02928f3977c70381ba1337e1394601300c2b7b1f05306476302ef0b894ebfadcd01322d9 SHA512 c23fc09ea9cc72c84782a95cfcc59cba5270bbeb24bc50e8aa5349bb22d691c59684c9ca8fdc870733432429e3d9e0a5c660317ee19fa7e8f3fb62c9ebc2dbbd
 DIST openbabel-2.4.1.tar.gz 11618304 BLAKE2B 8fc051e83add9be6456e281a109bd6bbec282a64ffc83309819f0decbf167b4914fbb7f1966e95e103f268754045b804317f51c79a952ace707c6af2bd320125 SHA512 427e678f0a911bd27b9a8a05e60b6e09f113be4e5dd180daaf80c28d06368e52b57501261755ab3817a8d31f2754db24471fd0ceee706d029386d6f70800e9c6
 DIST openbabel.png 29060 BLAKE2B 8d217d92125cc73462437411dd4e0cc05179cb0934f5ed15a307acc6b549b8ebab250a48a05ef7657f48c6df394f37da9b659de61efb1477b79b573a5b393ad3 SHA512 bbcaaa37663b526c9038ccb9edaf05ccc3ad1a861739a737f05f363098d8402a10b36e341fcc0aca636e809c6c32db99bf987b41719a0c756bf5e31444d3eb70
 EBUILD openbabel-2.4.1-r1.ebuild 2208 BLAKE2B 388a26c0e190f24a10081eaa0fb901fab153b05fe67cd82734a75265cdb9f18877f58ae5db0f9d0cf8b8ee0158ef967ee5eb2079245ea3b9becf41d5118439dd SHA512 e6dbdbaea505c769e6e639b8135c6da460a2918f02f72c817263425ff9618583642324a9aef3226713e20a3c500a6963b56602a289620581519c41f023822dac
diff --git a/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch b/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch
index 632ffa867613..a4aa3947f2ee 100644
--- a/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch
+++ b/sci-chemistry/openbabel/files/openbabel-2.4.1-gcc-8.patch
@@ -9,7 +9,7 @@ index dc38d1b..801207e 100644
  if(CMAKE_COMPILER_IS_GNUCXX)
    exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
 -  string(REGEX MATCH "[34567]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-+  string(REGEX MATCH "[345678]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++  string(REGEX MATCH "[3456789]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
    # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
    # patch level, handle this here:
    if (NOT _gcc_version)
diff --git a/sci-chemistry/pdb2pqr/Manifest b/sci-chemistry/pdb2pqr/Manifest
index 911dbff7ccca..d057f25d651e 100644
--- a/sci-chemistry/pdb2pqr/Manifest
+++ b/sci-chemistry/pdb2pqr/Manifest
@@ -3,5 +3,5 @@ AUX pdb2pqr 263 BLAKE2B 3cbd33cf9fb9fd6469c71d8d167ed0fb85ad7b87b6caf27dabb2490b
 AUX pdb2pqr-1.9.0-flags.patch 1392 BLAKE2B b6b6ac64f98944d85fc93c076d7258c8f980a0391d2cf086edc46bca3f4ef15a5cb720ef8ae2dc38007962a462fb88e92eb4f439c4f3267a5d1d83de5a848dd6 SHA512 deed0aef88dc43515745204f2b4209bd6b42702d9004d48797d642b8f497229424bd0bb92017982cec54c448ea35de563bd42017cd5dc042840acae8495d135b
 AUX pdb2pqr-1.9.0-install-py.patch 578 BLAKE2B 91ad4b40ce3d13b574ad6d9ea84e55b08803fa018490a7327dae5621a371adfeda509188c049144301cbc023f4407f6c0daf7b57e7d3c10d95d78ab570a6f540 SHA512 902ad717e32790e9c691851dc4b92412f07ac79caf74b2b5794a10fa75cca7fa19e8814df4d8ba71bd2ecc98a3d777d0b79e6e43009171a32e8c99756d81d4d2
 DIST pdb2pqr-src-1.9.0.tar.gz 9051969 BLAKE2B bacb2c65d319fb918a7a15b772c250398ffa991a93ee731ec15c8ae907304daf57282bf83c24f84d11945349a7f93f6f934575c117d4ce24d6530f14e60f3730 SHA512 7f3f191cca9879a0e166e82700c706f8c99bb66558a218e54845f10c3324b6c45d413da80b0782d96a8d56df1463262609db075aba3768db3942cb928ee7b98f
-EBUILD pdb2pqr-1.9.0-r2.ebuild 2961 BLAKE2B b8aa0bba7cb9d94f8a8fcc3246ae63d6c8a92f8148fbf28b73b683425b00bedb58069250b06e6e08e21ca483343723738c70c8c7e19309559d05c032c5bb4d62 SHA512 5e613fe7a2e927634fde7f685a8ab9429f171d469280a21c8004dd718a22e4ed5bcfb30e0d5ea6426744e0a75f4ffd366ae93d7c458d6bd72e0269e7dcb006a4
+EBUILD pdb2pqr-1.9.0-r3.ebuild 2679 BLAKE2B 882e244c9764c317df96195e4c9049a8a23872c458487ed4e897263cc99b5e1fa8bb7a3a70bf34fda447d71767ee4eb59fa49c4beecbd04fd2577438bb8aaf8e SHA512 f5037488f9ecdc9be44fb1dcc15ec55db932fc4268b61db7d95375e0e22d9f54f0315a5c0eb4398919f8620c167adbdd5e632bcdb241724ebc77efb7e7442802
 MISC metadata.xml 511 BLAKE2B 70a1bf9ff6db44bdbae39b1f58ac5b80769738b2ce8fbb19b3bcb9fbf7cec2a9eab215a7a922025b9110673cb834255240adf10613fd78a8fea47fa7be4fbba9 SHA512 11a010eea3bbbaaf4150a23dadcd10c45737745d51a3341cd7e69cc8537215f313d1ab57059eff265e73e34aeaef435585bb652f5497508dd12b99f67b8580c0
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r2.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r2.ebuild
deleted file mode 100644
index ad95f8f410fa..000000000000
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit scons-utils fortran-2 flag-o-matic python-r1 toolchain-funcs
-
-DESCRIPTION="Automated pipeline for performing Poisson-Boltzmann electrostatics calculations"
-HOMEPAGE="https://www.poissonboltzmann.org/"
-SRC_URI="https://github.com/Electrostatics/apbs-${PN}/releases/download/${P}/${PN}-src-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-IUSE="doc examples opal +pdb2pka"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	sci-chemistry/openbabel-python[${PYTHON_USEDEP}]
-	opal? ( dev-python/zsi[${PYTHON_USEDEP}] )
-	pdb2pka? ( sci-chemistry/apbs[${PYTHON_USEDEP},-mpi] )"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-install-py.patch
-)
-
-pkg_setup() {
-	if [[ -z ${MAXATOMS} ]]; then
-		einfo "If you like to have support for more then 10000 atoms,"
-		einfo "export MAXATOMS=\"your value\""
-		export MAXATOMS=10000
-	else
-		einfo "Allow usage of ${MAXATOMS} during calculations"
-	fi
-	fortran-2_pkg_setup
-}
-
-src_prepare() {
-	find -type f \( -name "*\.pyc" -o -name "*\.pyo" \) -delete || die
-
-	export CXXFLAGS="${CXXFLAGS}"
-	export LDFLAGS="${LDFLAGS}"
-
-	epatch "${PATCHES[@]}"
-	tc-export CXX
-	rm -rf scons || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_configure() {
-		cd "${BUILD_DIR}" || die
-
-		cat > build_config.py <<- EOF
-		PREFIX="${D}/$(python_get_sitedir)/${PN}"
-		#URL="http://<COMPUTER NAME>/pdb2pqr/"
-		APBS="${EPREFIX}/usr/bin/apbs"
-		#OPAL="http://nbcr-222.ucsd.edu/opal2/services/pdb2pqr_1.8"
-		#APBS_OPAL="http://nbcr-222.ucsd.edu/opal2/services/apbs_1.3"
-		MAX_ATOMS=${MAXATOMS}
-		BUILD_PDB2PKA=$(usex pdb2pka True False)
-		REBUILD_SWIG=True
-		EOF
-	}
-
-	python_foreach_impl python_configure
-}
-
-src_compile() {
-	python_compile() {
-		cd "${BUILD_DIR}" || die
-		escons
-	}
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	python_test() {
-		local myesconsargs=( -j1 )
-		cd "${BUILD_DIR}" || die
-		escons test
-		escons advtest
-		escons complete-test
-	}
-	python_foreach_impl python_test
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}/html
-	python_install() {
-		local lib
-
-		cd "${BUILD_DIR}" || die
-
-		escons install
-
-		find "${D}$(python_get_sitedir)"/${PN}/{jmol,examples,doc,contrib} -delete || die
-
-		python_doscript "${FILESDIR}"/{${PN},pdb2pka}
-
-		for lib in apbslib.py{,c,o}; do
-			dosym ../../apbs/${lib} $(python_get_sitedir)/${PN}/pdb2pka/${lib}
-		done
-		dosym ../../_apbslib.so $(python_get_sitedir)/${PN}/pdb2pka/_apbslib.so
-		python_optimize
-	}
-	python_foreach_impl python_install
-
-	if use doc; then
-		pushd doc > /dev/null
-		docinto html
-		dodoc -r *.html images pydoc
-		popd > /dev/null
-	fi
-
-	use examples && \
-		insinto /usr/share/${PN}/ && \
-		doins -r examples
-
-	dodoc *md NEWS
-}
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r3.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r3.ebuild
new file mode 100644
index 000000000000..179e6448d605
--- /dev/null
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.9.0-r3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit scons-utils fortran-2 flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="Automated pipeline for performing Poisson-Boltzmann electrostatics calculations"
+HOMEPAGE="https://www.poissonboltzmann.org/"
+SRC_URI="https://github.com/Electrostatics/apbs-${PN}/releases/download/${P}/${PN}-src-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="doc examples opal +pdb2pka"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+		sci-chemistry/openbabel-python[${PYTHON_MULTI_USEDEP}]
+		opal? ( dev-python/zsi[${PYTHON_MULTI_USEDEP}] )
+	')
+	pdb2pka? ( sci-chemistry/apbs[${PYTHON_SINGLE_USEDEP},-mpi] )"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-install-py.patch
+)
+
+pkg_setup() {
+	if [[ -z ${MAXATOMS} ]]; then
+		einfo "If you like to have support for more then 10000 atoms,"
+		einfo "export MAXATOMS=\"your value\""
+		export MAXATOMS=10000
+	else
+		einfo "Allow usage of ${MAXATOMS} during calculations"
+	fi
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find -type f \( -name "*\.pyc" -o -name "*\.pyo" \) -delete || die
+
+	export CXXFLAGS="${CXXFLAGS}"
+	export LDFLAGS="${LDFLAGS}"
+
+	epatch "${PATCHES[@]}"
+	tc-export CXX
+	rm -rf scons || die
+}
+
+src_configure() {
+	cat > build_config.py <<- EOF
+		PREFIX="${D}/$(python_get_sitedir)/${PN}"
+		#URL="http://<COMPUTER NAME>/pdb2pqr/"
+		APBS="${EPREFIX}/usr/bin/apbs"
+		#OPAL="http://nbcr-222.ucsd.edu/opal2/services/pdb2pqr_1.8"
+		#APBS_OPAL="http://nbcr-222.ucsd.edu/opal2/services/apbs_1.3"
+		MAX_ATOMS=${MAXATOMS}
+		BUILD_PDB2PKA=$(usex pdb2pka True False)
+		REBUILD_SWIG=True
+	EOF
+}
+
+src_compile() {
+	escons
+}
+
+src_test() {
+	local myesconsargs=( -j1 )
+	escons test
+	escons advtest
+	escons complete-test
+}
+
+src_install() {
+	dodir /usr/share/doc/${PF}/html
+	local lib
+
+	escons install
+
+	find "${D}$(python_get_sitedir)"/${PN}/{jmol,examples,doc,contrib} -delete || die
+
+	python_doscript "${FILESDIR}"/{${PN},pdb2pka}
+
+	for lib in apbslib.py{,c,o}; do
+		dosym ../../apbs/${lib} $(python_get_sitedir)/${PN}/pdb2pka/${lib}
+	done
+	dosym ../../_apbslib.so $(python_get_sitedir)/${PN}/pdb2pka/_apbslib.so
+	python_optimize
+
+	if use doc; then
+		pushd doc > /dev/null
+		docinto html
+		dodoc -r *.html images pydoc
+		popd > /dev/null
+	fi
+
+	use examples && \
+		insinto /usr/share/${PN}/ && \
+		doins -r examples
+
+	dodoc *md NEWS
+}
diff --git a/sci-chemistry/prodecomp/Manifest b/sci-chemistry/prodecomp/Manifest
index fe180d2bdaba..6a19b100ad23 100644
--- a/sci-chemistry/prodecomp/Manifest
+++ b/sci-chemistry/prodecomp/Manifest
@@ -1,3 +1,3 @@
 DIST prodecomp-3.0.tar.bz2 18377446 BLAKE2B c6b4acf20a76029fc34eaea7a0adf1a04fb727b2e246fbcad27e2fa2bea606b2e712fb986fdd3e534534b32a22acae58a00bc2a3c6bde893d5befe91696523d3 SHA512 8d23f174e125d4c7776432a37b063d2f39af8497050bd7f7ff358c67d509b1eef2c2865596efae632855fd583fb52c233b67d0e667c6c2a03ba6f5a2f2ac9b0d
-EBUILD prodecomp-3.0-r2.ebuild 1146 BLAKE2B fd477a14bd9e47bc8857446fc072633301f6114f30dfcc27997fc7b3d58c52a384ae8b7391bcb58f6bc23db1bbc24e0be0c7b010c971fb4d4e27c34355a38abb SHA512 b914399f357dfd514f55a82c1fb65b752725f62f0025ecdbe6524c6f0191ede74c629852d80e3c4998928649168702aa91361258c22473f499f76c3a3c4ebfc7
+EBUILD prodecomp-3.0-r3.ebuild 1191 BLAKE2B 25903c84628554ea37a9d20ee8fc0b0315d30526ed2c7e41bc6697235c04e3f9682ebb64aed7358009fd45502fcfe1fb66355c3f7209e39aeee6a1064cb34a5d SHA512 692a231b2e180d4a4114ce2441eb178adafb9ab725fcc2b1a0bdbeb675134ee823fb694546d033832393d4562c948073f47715ee29daaad9a938ce5112dd5f1e
 MISC metadata.xml 825 BLAKE2B 6874942c301b7d68f9184de8eb7482b790d2bd51c3a853132da3ed7bb0eacf54f608f816965bbfb27b81b90fecc3eee77596d73a78f5ec67703c53ad2bc2556d SHA512 94e41d5648ac93257f11f305bf2aaf926cc103240beec884142cda42c3d4e4fae5629e26b43cd945c945af706d5b5172fcd2c30ec6cb9067b152a22cd09bddcf
diff --git a/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild b/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
deleted file mode 100644
index e66cac2b0b4f..000000000000
--- a/sci-chemistry/prodecomp/prodecomp-3.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit python-single-r1
-
-DESCRIPTION="Decomposition-based analysis of NMR projections"
-HOMEPAGE="http://www.lundberg.gu.se/nmr/software.php?program=PRODECOMP"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	|| (
-		sci-libs/scipy-python2[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/NMRProjAnalys
-
-src_install() {
-	python_export
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r ExampleData Results
-	fi
-
-	dodoc ProjTools/Manual.pdf
-	rm -rf ProjTools/Manual.pdf ProdecompOutput || die
-
-	python_moduleinto ${PN}
-	python_domodule ProjTools/.
-	python_optimize
-
-	cat >> "${T}"/${PN} <<- EOF
-	#!/bin/bash
-	${PYTHON} -O $(python_get_sitedir)/${PN}/ProjAnalys.py \$@
-	EOF
-	dobin "${T}"/${PN}
-
-	dosym ../../../../share/doc/${PF}/Manual.pdf "${PYTHON_SITEDIR##${EPREFIX}}"/${PN}/Manual.pdf
-}
diff --git a/sci-chemistry/prodecomp/prodecomp-3.0-r3.ebuild b/sci-chemistry/prodecomp/prodecomp-3.0-r3.ebuild
new file mode 100644
index 000000000000..65683c21b0fa
--- /dev/null
+++ b/sci-chemistry/prodecomp/prodecomp-3.0-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1
+
+DESCRIPTION="Decomposition-based analysis of NMR projections"
+HOMEPAGE="http://www.lundberg.gu.se/nmr/software.php?program=PRODECOMP"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		|| (
+			sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+			sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+		)
+	')"
+
+S="${WORKDIR}"/NMRProjAnalys
+
+src_install() {
+	python_export
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r ExampleData Results
+	fi
+
+	dodoc ProjTools/Manual.pdf
+	rm -rf ProjTools/Manual.pdf ProdecompOutput || die
+
+	python_moduleinto ${PN}
+	python_domodule ProjTools/.
+	python_optimize
+
+	cat >> "${T}"/${PN} <<- EOF
+	#!/bin/bash
+	${PYTHON} -O $(python_get_sitedir)/${PN}/ProjAnalys.py \$@
+	EOF
+	dobin "${T}"/${PN}
+
+	dosym ../../../../share/doc/${PF}/Manual.pdf "${PYTHON_SITEDIR##${EPREFIX}}"/${PN}/Manual.pdf
+}
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index 7948415a7bf8..2b6e1d1125bd 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,4 +1,4 @@
 DIST pymol-1.8.4.0.png.xz 19528 BLAKE2B f3d23d4cedca3d8bb96b20646a548da4be570697e3346a11b01c5c3599b536ba4697be08472dfa8a4f6533167defc1a37a1de332931a73857319cb28fd42cd2b SHA512 40bb0d3f226476f6e047b5361956aad955232a97641474765eaa5204f0539aee3810e0266213618a45364f9f31f6eb18380b17e0c79f64065f7b62a9016caa7c
 DIST pymol-2.3.0.tar.gz 10448674 BLAKE2B 0d508587d880ce7f2e8a0481bf664e6bfe6eb1d68b0f48b9266cde756824bd8c0144d7243e958bbc5e571d60fca9dafff125d81a8a3d32107e78ad2ff8dffc05 SHA512 e1dcea1c97bcd9045d3543e92902f240e6affbf61a38e8d2a0be04309e3dbabfe1a869847d1423b3151008978d4c305bbf3ce994fc9d453c0063ce020100c133
-EBUILD pymol-2.3.0-r2.ebuild 3190 BLAKE2B a72434867a8589dda7a334f71e1aaa58f16d3caea1eb1615c44c2b813b1d0b84ed308369eb89c45251daf7bfbabed470e7d5abe42334b3fe28b484217fa29653 SHA512 5c2d08baa9407a2abe733d1753e622ea450b7c939b4f57d8e47adb5f57ac5a5e2b95264b6876698c70a5af926d378d75b6ba4ae02c85affbcfda7327d718ea14
+EBUILD pymol-2.3.0-r2.ebuild 3225 BLAKE2B bd378cf0a461ce741ee375bc9e4a2db7153a060125292905e4e050244de22c9ac4df2d32e3c8c049c04cdf256a6240beba9955878419fd574ce2b7965200924b SHA512 6c4ead16743147b4e983e2e626f19e489cd4676ea8610db33104e987e52759d6edd0f355675f723053eb234399b8cf7d7f8235ae479ad38ac48fe980e6cfa292
 MISC metadata.xml 439 BLAKE2B 68df7dfc8ca3d4d4b18b419532bade69491f2e9362f10ae2397c804132b7fc9cd08dcf9703c0a89c44588c570e0c0c1bb9bffb7394d51faf1283142dbc5f70b3 SHA512 f5a3eded9b12fa715ba2e6e10b41c75d9bd823ca0dd40acbffc3f5bfc4b36c687f720b1a4e119b4540a31faf849985778cbd72b0b2cd35af8c52ca0f808d71e4
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
index 6e8433b403ec..36cc913f7b09 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
@@ -38,7 +38,9 @@ DEPEND="
 	sys-libs/zlib
 	!sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
 	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
+"
 
 S="${WORKDIR}"/${PN}-open-source-${PV}
 
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index f3b0b62ccafa..56c32abe4254 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,3 +1,3 @@
 DIST relax-4.0.0.src.tar.bz2 105659752 BLAKE2B ce5fc9b7f31787f2189e75a543f8ba6fe3cd59ce7382c6c0f79c419b9f71b2d09bd16685e7fed3c9e3205be531efa2a8dc1cce707e77e2386d2a9f7a71b4b0c1 SHA512 28b5ddab2c83f95d7e1a502d05b5d3c93337fece68a1fef95ec8978f61fccf24cb37528cfef27cb20d132033535f4120b23cc76a75f34f52b27df17116351f8e
-EBUILD relax-4.0.0-r3.ebuild 1760 BLAKE2B 6ea79be4c348069a5cd54ce3f9614d145febcb47a76709b5c45c9400347d9ff035cf6138005a455e2b14c1a6a498cb8ee1fdc76d8c65aa99d82bbba966bd7d16 SHA512 c3a59cbba651f752650d840b60dfda46ceb7f6f2673607e8e1b8f1265ff3595116f64830b3e00ee42a017ecd54cf27d008c841048f302a09a2c2abb87326a204
+EBUILD relax-4.0.0-r4.ebuild 1883 BLAKE2B 83dbe09ddc6feb3b7ec4af472eeac4e49c2cda90c84d2f19f19bdcf9414b97f0e7221a9e048c68535e6d5239511013738f4d969b01233034212efcefd7dca3c8 SHA512 5f657c2798e1a83626056ff7849339d3bb05f014ea579a1697e022a7b9628256c7c14a37fa71869be9d66fb1a935bc4907329c45d9cb9af7c6270ba1690046ef
 MISC metadata.xml 1373 BLAKE2B d5a9e36f0412ef757a23aa4991986bdc394edc035f59b0206b246affc884417eb8446a598b23054972c97dc5d883cd0242e306f9e8d61620c144939845c0bcf1 SHA512 575ccfdae744fc5d97e795a22989b377954edeacb8ec4887d987a59af813f126551743c4b29b9c2b4a26a1840f05d42fb26fd39b7ae9b38e24373fab18c0270e
diff --git a/sci-chemistry/relax/relax-4.0.0-r3.ebuild b/sci-chemistry/relax/relax-4.0.0-r3.ebuild
deleted file mode 100644
index 28b0f5d9da67..000000000000
--- a/sci-chemistry/relax/relax-4.0.0-r3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="https://www.nmr-relax.com/"
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/Numdifftools[${PYTHON_USEDEP}]
-	|| (
-		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
-	sci-chemistry/molmol
-	sci-chemistry/pymol[${PYTHON_USEDEP}]
-	sci-chemistry/vmd
-	>=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
-	>=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
-	|| (
-		sci-libs/scipy-python2[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-	sci-visualization/grace
-	sci-visualization/opendx
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-	media-gfx/pngcrush
-	test? ( ${RDEPEND} )
-	"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	rm -rf minfx bmrblib extern/numdifftools || die
-	tc-export CC
-	need-wxwidgets unicode
-}
-
-src_compile() {
-	escons
-}
-
-src_test() {
-	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
-	virtualmake
-}
-
-src_install() {
-	dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
-	python_moduleinto ${PN}
-	python_domodule *
-
-	rm ${PN} README || die
-
-	make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-4.0.0-r4.ebuild b/sci-chemistry/relax/relax-4.0.0-r4.ebuild
new file mode 100644
index 000000000000..ba03dbad8454
--- /dev/null
+++ b/sci-chemistry/relax/relax-4.0.0-r4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
+
+DESCRIPTION="Molecular dynamics by NMR data analysis"
+HOMEPAGE="https://www.nmr-relax.com/"
+SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep "
+		dev-python/Numdifftools[\${PYTHON_MULTI_USEDEP}]
+		|| (
+			dev-python/matplotlib-python2[\${PYTHON_MULTI_USEDEP}]
+			dev-python/matplotlib[\${PYTHON_MULTI_USEDEP}]
+		)
+		|| (
+			dev-python/numpy-python2[\${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[\${PYTHON_MULTI_USEDEP}]
+		)
+		dev-python/wxpython:${WX_GTK_VER}[\${PYTHON_MULTI_USEDEP}]
+		sci-chemistry/pymol[\${PYTHON_MULTI_USEDEP}]
+		>=sci-libs/bmrblib-1.0.3[\${PYTHON_MULTI_USEDEP}]
+		>=sci-libs/minfx-1.0.11[\${PYTHON_MULTI_USEDEP}]
+		|| (
+			sci-libs/scipy-python2[\${PYTHON_MULTI_USEDEP}]
+			sci-libs/scipy[\${PYTHON_MULTI_USEDEP}]
+		)
+	")
+	sci-chemistry/molmol
+	sci-chemistry/vmd
+	sci-visualization/grace
+	sci-visualization/opendx
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}
+	media-gfx/pngcrush
+	test? ( ${RDEPEND} )
+	"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rm -rf minfx bmrblib extern/numdifftools || die
+	tc-export CC
+	need-wxwidgets unicode
+}
+
+src_compile() {
+	escons
+}
+
+src_test() {
+	VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
+	virtualmake
+}
+
+src_install() {
+	dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
+
+	python_moduleinto ${PN}
+	python_domodule *
+
+	rm ${PN} README || die
+
+	make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
+}
diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index d9ce76a3bb96..92abd3614dc7 100644
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -6,8 +6,8 @@ DIST vmd-1.9.2-gentoo-patches.tar.xz 14896 BLAKE2B eb7c7fb982602f37bd8374bf8458a
 DIST vmd-1.9.2.src.tar.gz 34903084 BLAKE2B f7f7048ef7bb72a8b0dcae955c7f90691085158c38a59229d5b929a4b52d3148bdb2f40084cf8c4544f01cb8bcb57de1d98a90bd17568a07c4ebb8f6985cec9b SHA512 b232b743d4ea97dcf76e3005e1c8716d7138602edc078c4846026ab67759c8559af956182cb1acf3c85890db10b6f658ac9c269d432f2595612cf376d6d505ef
 DIST vmd-1.9.3-gentoo-patches.tar.xz 14804 BLAKE2B 64e5df40ed88c23c924d32636495f0383590f91dbb714e64c73551072bb50d72b4e5f188fb2da58d32e84b4bc96ff0297d7ff1bf02b0481198901c4e12e4ee59 SHA512 5d506d4df5ca4a3edb33d77aeeb440fcb4750a250c77103b99f385f356eb9d71d954173b981d3a50f7a714cfc872587e5040868904e50fa1f6fd69d7e4d9f1b1
 DIST vmd-1.9.3.src.tar 129566720 BLAKE2B 848f3280d51765dcd18722dd233e0cdee3b7c0ac3dd48324260ebe1604ba781ca0a1fe4cae6652501d23d5d41712020e17dbb6bc21a1856eb3289a4aab6b774b SHA512 0502df1e8b60c570ca88b779b4153acfaa599a78df53fa96fca36301bab902864118332b5524ae7d170d3a9e429cf1e13d69e1197268b5e841afc0bb56a737ba
-EBUILD vmd-1.9.2.ebuild 7210 BLAKE2B 939b500dd5a0b9d8c0d3c5aaa55a7fe82a5b3c5b92da1d8a422a0c9dbfce8141d121884c5028df44f74f3c5f0c4ef7d6b85fa47cc7adbbf58db4a449d224c74a SHA512 1c8ae6a79494116d5e07cd98921c35ade1bdf7b209b673c9360d0a4edb4b881b8a000eb4c8c0b64d51616011c2e8a7858ba7ce348877eb897882a459b9688cad
-EBUILD vmd-1.9.3-r1.ebuild 7567 BLAKE2B b6a6fd153b890881be02c2a5cdc085802cb356658939401b7958e65f375f763d84872fc31b12fb21b195a810247e1624ae7a123bbf417fdd05ad4288a23c7d8c SHA512 48ef4d47d68211f7443be546566f20e4bbebdf6948027c6649d1730fb0b77e98d540a26a0ab18000a6937ae3a536b9cdefe2bc0d4c7c0724dd63f0eacd63c1ed
-EBUILD vmd-1.9.3-r3.ebuild 7748 BLAKE2B 2f0d785b37f195b6b87dd3d16902a11b899aef466134604d985f7d55380c75b471ea9540a19799cdf0b8316c709fb9453b3c041aa73c4ae623719ef1cd118fa1 SHA512 0321b3fb46edb1224ba133dbd6798ccefe5376a8a2d8fb71d416b1c1401f2676f25003f73260a70cf695c25e2b3ed32cfcea79f1c0721b193d4584db0ad1d8d1
-EBUILD vmd-1.9.3.ebuild 7165 BLAKE2B fed03484e69abef1d82f52985becb144642141b18d01993f58073a4063f91e7d89cc45a506573cec2a523131eb0d75033cdd4cc3595d14bd491fca60f46540ab SHA512 83356c309cd1332a13677ca086394de9adb741e167c40f80b8585545c4c7931ad7108a80ddab6cd25aa71fb843afb11b2e12264098dd9a4933e76fac79005684
+EBUILD vmd-1.9.2.ebuild 7255 BLAKE2B d59ea537a43555104edd2effc973274abae483d739bf5051efce7c1ad15e131ff0156ce2129cf882c88194f359c69eb163571e23f47025ae26cc6f85ab4999a2 SHA512 bafeb7c0448920feaa77855d29cffd2e3d9df1994c528bb738ac01551d6eb5fea4d3e681f5d4c189366e8dff973c9f8c5633f18648c31026ce749041eb5358ee
+EBUILD vmd-1.9.3-r1.ebuild 7612 BLAKE2B 62e0208cbe8fac390d942885f1e12713a88dc29eac68aa708dacfa9a2c0c0eff94982795ddc3bce47c459e8153692978744efdf520518705db0892208761dd9d SHA512 4529071928c4b63ebc35d92ff9ef7713a38d49d5579cf4351a979806ae81eb9ce3e02c438a9ce127eba217039341ae2c53e74710aa0151d4e9b0db865458facb
+EBUILD vmd-1.9.3-r4.ebuild 7793 BLAKE2B 9f023e8efb5a095d2d6b46198a4137298d7e61c697e7f1eeb57ecfa5f1df7102840b9c42f4ceeb8c5052c59031d572a50eda0a2799a11432487b15a21e97eb5c SHA512 22326601bd6908b3495ebef7e9b45f3482dbd73c8b6bd54582d02e4721bcc483ef02ea67d8e582b59777cbfc923e4464a707281a06b6459de64a7f1e301d9268
+EBUILD vmd-1.9.3.ebuild 7210 BLAKE2B a4c7a26b5c137c67adb5ea4b49acf0b8866a5b5a30840816a7c5a62c12355dfbb3bf17b2dfff39501c9d63e5bf3b479624c9186f7eaef65db455a9f29fe543a3 SHA512 fea1bf7019ae20f796be0c9fb9a5f912a491de16ecabeb6327b366120621c65401f8b4d32a575cf8d231b2c40d54f7c38537f3ce6a217856e1ec44fe49420e38
 MISC metadata.xml 778 BLAKE2B 6c4202950f57a4d7a3004e966c761325a0a31ab19fe06a6bd69882bd685e41424953104ff653c03d6cbbcb60bb9aba45fbcec43cd228c4bb57fcb1c63a2bd881 SHA512 b967b71fb9f1b47a9d3b69e6958dfb0314a9f071dade7ed1876e91dfa73188748faf11ef832d240a71745b36a30422bde79de2e9ff8e5ec6b6da4b11b40d19c9
diff --git a/sci-chemistry/vmd/vmd-1.9.2.ebuild b/sci-chemistry/vmd/vmd-1.9.2.ebuild
index 2cee984cdd47..92daf0304775 100644
--- a/sci-chemistry/vmd/vmd-1.9.2.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.2.ebuild
@@ -27,10 +27,12 @@ CDEPEND="
 	>=dev-lang/tk-8.6.1
 	dev-lang/perl
 	dev-libs/expat
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	sci-libs/netcdf:0=
 	virtual/opengl
 	>=x11-libs/fltk-1.1.10-r2:1
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
index abf5d03202fc..f42cb4d104fe 100644
--- a/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3-r1.ebuild
@@ -27,10 +27,12 @@ CDEPEND="
 	>=dev-lang/tk-8.6.1:0=
 	dev-lang/perl
 	dev-libs/expat
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	sci-libs/netcdf:0=
 	virtual/opengl
 	>=x11-libs/fltk-1.1.10-r2:1
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r3.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r3.ebuild
deleted file mode 100644
index 8d8897a57f8a..000000000000
--- a/sci-chemistry/vmd/vmd-1.9.3-r3.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit cuda desktop flag-o-matic prefix python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="Visual Molecular Dynamics"
-HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
-SRC_URI="
-	https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz
-	${P}.src.tar
-"
-
-SLOT="0"
-LICENSE="vmd"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="fetch"
-
-# currently, tk-8.5* with USE=truetype breaks some
-# tk apps such as Sequence Viewer or Timeline.
-CDEPEND="
-	>=dev-lang/tk-8.6.1:0=
-	dev-lang/perl
-	dev-libs/expat
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	sci-libs/netcdf:0=
-	virtual/opengl
-	>=x11-libs/fltk-1.1.10-r2:1
-	x11-libs/libXft
-	x11-libs/libXi
-	${PYTHON_DEPS}
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= )
-	gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] )
-	sqlite? ( dev-db/sqlite:3= )
-	tachyon? ( >=media-gfx/tachyon-0.99_beta6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-lang/swig
-"
-RDEPEND="${CDEPEND}
-	sci-biology/stride
-	sci-chemistry/chemical-mime-data
-	sci-chemistry/surf
-	x11-terms/xterm
-	msms? ( sci-chemistry/msms-bin )
-	povray? ( media-gfx/povray )
-"
-
-VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
-# Binary only plugin!!
-QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
-QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
-
-pkg_nofetch() {
-	elog "Please download ${P}.src.tar from"
-	elog "${VMD_DOWNLOAD}"
-	elog "after agreeing to the license and get"
-	elog "https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
-	elog "Place both into your DISTDIR directory"
-	elog
-	elog "Due to an upstream bug (https://bugs.gentoo.org/640440) sources"
-	elog "file may get downloaded as a compressed tarball or not. In that case"
-	elog "you will need to ensure you uncompress the file and rename it"
-	elog "as ${P}.src.tar"
-}
-
-src_prepare() {
-	xdg_src_prepare
-
-	use cuda && cuda_sanitize
-
-	eapply "${FILESDIR}"/${PN}-1.9.1-cuda-device_ptr.patch
-
-	cd "${WORKDIR}"/plugins || die
-
-	eapply -p2 "${WORKDIR}"/${P}-gentoo-plugins.patch
-
-	[[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile)
-
-	sed \
-		-e "s:CC = gcc:CC = $(tc-getCC):" \
-		-e "s:CXX = g++:CXX = $(tc-getCXX):" \
-		-e "s:COPTO =.*\":COPTO = -fPIC -o \":" \
-		-e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \
-		-e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \
-		-e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \
-		-e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \
-		-e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \
-		-e "s:-ltcl8.5:-ltcl:" \
-		-i Make-arch || die "Failed to set up plugins Makefile"
-
-	sed \
-		-e '/^AR /s:=:?=:g' \
-		-e '/^RANLIB /s:=:?=:g' \
-		-i ../plugins/*/Makefile || die
-
-	tc-export AR RANLIB
-
-	sed \
-		-e "s:\$(CXXFLAGS)::g" \
-		-i hesstrans/Makefile || die
-
-	# prepare vmd itself
-	cd "${S}" || die
-
-	eapply -p2 "${WORKDIR}"/${P}-gentoo-base.patch
-	eapply "${FILESDIR}"/${P}-configure-libtachyon.patch
-	eapply "${FILESDIR}"/${P}-tmpdir.patch
-
-	# PREFIX
-	sed \
-		-e "s:/usr/include/:${EPREFIX}/usr/include:g" \
-		-i configure || die
-
-	sed \
-		-e "s:gentoo-bindir:${ED}/usr/bin:g" \
-		-e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \
-		-e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \
-		-e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:gentoo-gcc:$(tc-getCC):g" \
-		-e "s:gentoo-g++:$(tc-getCXX):g" \
-		-e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \
-		-e "s:gentoo-cflags:${CFLAGS}:g" \
-		-e "s:gentoo-cxxflags:${CXXFLAGS}:g" \
-		-e "s:gentoo-nvflags::g" \
-		-e "s:gentoo-ldflags:${LDFLAGS}:g" \
-		-e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \
-		-e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \
-		-e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \
-		-e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \
-		-e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \
-		-e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \
-		-i configure || die
-
-	if use cuda; then
-		sed \
-			-e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
-			-e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \
-			-i configure src/Makefile || die
-		sed \
-			-e '/compute_/d' \
-			-i configure || die
-		sed \
-			-e 's:-gencode .*code=sm_..::' \
-			-i src/Makefile || die
-	fi
-
-	sed \
-		-e "s:LINUXPPC:LINUX:g" \
-		-e "s:LINUXALPHA:LINUX:g" \
-		-e "s:LINUXAMD64:LINUX:g" \
-		-e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \
-		-e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \
-		-e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \
-		-i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script"
-
-	EMAKEOPTS=(
-		TCLINC="-I${EPREFIX}/usr/include"
-		TCLLIB="-L${EPREFIX}/usr/$(get_libdir)"
-		TCLLDFLAGS="-shared"
-		NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so"
-		NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include"
-		NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)"
-		NETCDFDYNAMIC=1
-		EXPATINC="-I${EPREFIX}/usr/include"
-		EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)"
-		EXPATLDFLAGS="-shared"
-		EXPATDYNAMIC=1
-	)
-	if use gromacs; then
-		EMAKEOPTS+=(
-			TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)"
-			TNGINC="-I${EPREFIX}/usr/include"
-			TNGLDFLAGS="-shared"
-			TNGDYNAMIC=1
-		)
-	fi
-	if use sqlite; then
-		EMAKEOPTS+=(
-			SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)"
-			SQLITEINC="-I${EPREFIX}/usr/include"
-			SQLITELDFLAGS="-shared"
-			SQLITEDYNAMIC=1
-		)
-	fi
-}
-
-src_configure() {
-	local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT"
-	rm -f configure.options && echo $myconf >> configure.options
-
-	use cuda && myconf+=" CUDA"
-#	use mpi && myconf+=" MPI"
-	use tachyon && myconf+=" LIBTACHYON"
-	use xinerama && myconf+=" XINERAMA"
-
-	export \
-		PYTHON_INCLUDE_DIR="$(python_get_includedir)" \
-		PYTHON_LIBRARY_DIR="$(python_get_library_path)" \
-		PYTHON_LIBRARY="$(python_get_LIBS)" \
-		NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \
-		NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include"
-
-	perl ./configure LINUX \
-		${myconf} || die
-}
-
-src_compile() {
-	# build plugins
-	cd "${WORKDIR}"/plugins || die
-
-	emake \
-		${EMAKEOPTS[@]} \
-		LINUX
-
-	# build vmd
-	cd "${S}"/src || die
-	emake
-}
-
-src_install() {
-	# install plugins
-	cd "${WORKDIR}"/plugins || die
-	emake \
-			PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \
-			distrib
-
-	# install vmd
-	cd "${S}"/src || die
-	emake install
-
-	# install docs
-	cd "${S}" || die
-	dodoc Announcement README doc/ig.pdf doc/ug.pdf
-
-	# remove some of the things we don't want and need in
-	# /usr/lib
-	cd "${ED}"/usr/$(get_libdir)/vmd || die
-	rm -fr doc README Announcement LICENSE || \
-		die "failed to clean up /usr/lib/vmd directory"
-
-	# adjust path in vmd wrapper
-	sed \
-		-e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \
-		-e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \
-		|| die "failed to set up vmd wrapper script"
-
-	# install icon and generate desktop entry
-	insinto /usr/share/pixmaps
-	doins "${WORKDIR}"/vmd.png
-	eprefixify "${WORKDIR}"/vmd.desktop
-	sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
-	# Open PDB files with VMD
-	echo "MimeType=chemical/x-pdb;" >> "${WORKDIR}"/vmd.desktop || die
-	domenu "${WORKDIR}"/vmd.desktop
-}
diff --git a/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild b/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild
new file mode 100644
index 000000000000..39e7a9751cee
--- /dev/null
+++ b/sci-chemistry/vmd/vmd-1.9.3-r4.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit cuda desktop flag-o-matic prefix python-single-r1 toolchain-funcs xdg
+
+DESCRIPTION="Visual Molecular Dynamics"
+HOMEPAGE="http://www.ks.uiuc.edu/Research/vmd/"
+SRC_URI="
+	https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz
+	${P}.src.tar
+"
+
+SLOT="0"
+LICENSE="vmd"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda gromacs msms povray sqlite tachyon xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="fetch"
+
+# currently, tk-8.5* with USE=truetype breaks some
+# tk apps such as Sequence Viewer or Timeline.
+CDEPEND="
+	>=dev-lang/tk-8.6.1:0=
+	dev-lang/perl
+	dev-libs/expat
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	sci-libs/netcdf:0=
+	virtual/opengl
+	>=x11-libs/fltk-1.1.10-r2:1
+	x11-libs/libXft
+	x11-libs/libXi
+	${PYTHON_DEPS}
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= )
+	gromacs? ( >=sci-chemistry/gromacs-5.0.4-r1:0=[tng] )
+	sqlite? ( dev-db/sqlite:3= )
+	tachyon? ( >=media-gfx/tachyon-0.99_beta6 )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	dev-lang/swig
+"
+RDEPEND="${CDEPEND}
+	sci-biology/stride
+	sci-chemistry/chemical-mime-data
+	sci-chemistry/surf
+	x11-terms/xterm
+	msms? ( sci-chemistry/msms-bin )
+	povray? ( media-gfx/povray )
+"
+
+VMD_DOWNLOAD="http://www.ks.uiuc.edu/Development/Download/download.cgi?PackageName=VMD"
+# Binary only plugin!!
+QA_PREBUILT="usr/lib*/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
+QA_FLAGS_IGNORED_amd64=" usr/lib64/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
+QA_FLAGS_IGNORED_x86=" usr/lib/vmd/plugins/LINUX/tcl/volutil1.3/volutil"
+
+pkg_nofetch() {
+	elog "Please download ${P}.src.tar from"
+	elog "${VMD_DOWNLOAD}"
+	elog "after agreeing to the license and get"
+	elog "https://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
+	elog "Place both into your DISTDIR directory"
+	elog
+	elog "Due to an upstream bug (https://bugs.gentoo.org/640440) sources"
+	elog "file may get downloaded as a compressed tarball or not. In that case"
+	elog "you will need to ensure you uncompress the file and rename it"
+	elog "as ${P}.src.tar"
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	use cuda && cuda_sanitize
+
+	eapply "${FILESDIR}"/${PN}-1.9.1-cuda-device_ptr.patch
+
+	cd "${WORKDIR}"/plugins || die
+
+	eapply -p2 "${WORKDIR}"/${P}-gentoo-plugins.patch
+
+	[[ ${SILENT} == yes ]] || sed '/^.SILENT/d' -i $(find -name Makefile)
+
+	sed \
+		-e "s:CC = gcc:CC = $(tc-getCC):" \
+		-e "s:CXX = g++:CXX = $(tc-getCXX):" \
+		-e "s:COPTO =.*\":COPTO = -fPIC -o \":" \
+		-e "s:LOPTO = .*\":LOPTO = ${LDFLAGS} -fPIC -o \":" \
+		-e "s:CCFLAGS =.*\":CCFLAGS = ${CFLAGS}\":" \
+		-e "s:CXXFLAGS =.*\":CXXFLAGS = ${CXXFLAGS}\":" \
+		-e "s:SHLD = gcc:SHLD = $(tc-getCC) -shared:" \
+		-e "s:SHXXLD = g++:SHXXLD = $(tc-getCXX) -shared:" \
+		-e "s:-ltcl8.5:-ltcl:" \
+		-i Make-arch || die "Failed to set up plugins Makefile"
+
+	sed \
+		-e '/^AR /s:=:?=:g' \
+		-e '/^RANLIB /s:=:?=:g' \
+		-i ../plugins/*/Makefile || die
+
+	tc-export AR RANLIB
+
+	sed \
+		-e "s:\$(CXXFLAGS)::g" \
+		-i hesstrans/Makefile || die
+
+	# prepare vmd itself
+	cd "${S}" || die
+
+	eapply -p2 "${WORKDIR}"/${P}-gentoo-base.patch
+	eapply "${FILESDIR}"/${P}-configure-libtachyon.patch
+	eapply "${FILESDIR}"/${P}-tmpdir.patch
+
+	# PREFIX
+	sed \
+		-e "s:/usr/include/:${EPREFIX}/usr/include:g" \
+		-i configure || die
+
+	sed \
+		-e "s:gentoo-bindir:${ED}/usr/bin:g" \
+		-e "s:gentoo-libdir:${ED}/usr/$(get_libdir):g" \
+		-e "s:gentoo-opengl-include:${EPREFIX}/usr/include/GL:g" \
+		-e "s:gentoo-opengl-libs:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:gentoo-gcc:$(tc-getCC):g" \
+		-e "s:gentoo-g++:$(tc-getCXX):g" \
+		-e "s:gentoo-nvcc:${EPREFIX}/opt/cuda/bin/nvcc:g" \
+		-e "s:gentoo-cflags:${CFLAGS}:g" \
+		-e "s:gentoo-cxxflags:${CXXFLAGS}:g" \
+		-e "s:gentoo-nvflags::g" \
+		-e "s:gentoo-ldflags:${LDFLAGS}:g" \
+		-e "s:gentoo-plugindir:${WORKDIR}/plugins:g" \
+		-e "s:gentoo-fltk-include:$(fltk-config --includedir):g" \
+		-e "s:gentoo-fltk-libs:$(dirname $(fltk-config --libs)) -Wl,-rpath,$(dirname $(fltk-config --libs)):g" \
+		-e "s:gentoo-libtachyon-include:${EPREFIX}/usr/include/tachyon:g" \
+		-e "s:gentoo-libtachyon-libs:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:gentoo-netcdf-include:${EPREFIX}/usr/include:g" \
+		-e "s:gentoo-netcdf-libs:${EPREFIX}/usr/$(get_libdir):g" \
+		-i configure || die
+
+	if use cuda; then
+		sed \
+			-e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
+			-e "/NVCCFLAGS/s:=:= ${NVCCFLAGS}:g" \
+			-i configure src/Makefile || die
+		sed \
+			-e '/compute_/d' \
+			-i configure || die
+		sed \
+			-e 's:-gencode .*code=sm_..::' \
+			-i src/Makefile || die
+	fi
+
+	sed \
+		-e "s:LINUXPPC:LINUX:g" \
+		-e "s:LINUXALPHA:LINUX:g" \
+		-e "s:LINUXAMD64:LINUX:g" \
+		-e "s:gentoo-stride:${EPREFIX}/usr/bin/stride:g" \
+		-e "s:gentoo-surf:${EPREFIX}/usr/bin/surf:g" \
+		-e "s:gentoo-tachyon:${EPREFIX}/usr/bin/tachyon:g" \
+		-i "${S}"/bin/vmd.sh || die "failed setting up vmd wrapper script"
+
+	EMAKEOPTS=(
+		TCLINC="-I${EPREFIX}/usr/include"
+		TCLLIB="-L${EPREFIX}/usr/$(get_libdir)"
+		TCLLDFLAGS="-shared"
+		NETCDFLIB="$($(tc-getPKG_CONFIG) --libs-only-L netcdf)${EPREFIX}/usr/$(get_libdir)/libnetcdf.so"
+		NETCDFINC="$($(tc-getPKG_CONFIG) --cflags-only-I netcdf)${EPREFIX}/usr/include"
+		NETCDFLDFLAGS="$($(tc-getPKG_CONFIG) --libs netcdf)"
+		NETCDFDYNAMIC=1
+		EXPATINC="-I${EPREFIX}/usr/include"
+		EXPATLIB="$($(tc-getPKG_CONFIG) --libs expat)"
+		EXPATLDFLAGS="-shared"
+		EXPATDYNAMIC=1
+	)
+	if use gromacs; then
+		EMAKEOPTS+=(
+			TNGLIB="$($(tc-getPKG_CONFIG) --libs libgromacs)"
+			TNGINC="-I${EPREFIX}/usr/include"
+			TNGLDFLAGS="-shared"
+			TNGDYNAMIC=1
+		)
+	fi
+	if use sqlite; then
+		EMAKEOPTS+=(
+			SQLITELIB="$($(tc-getPKG_CONFIG) --libs sqlite3)"
+			SQLITEINC="-I${EPREFIX}/usr/include"
+			SQLITELDFLAGS="-shared"
+			SQLITEDYNAMIC=1
+		)
+	fi
+}
+
+src_configure() {
+	local myconf="OPENGL OPENGLPBUFFER COLVARS FLTK TK TCL PTHREADS PYTHON IMD NETCDF NUMPY NOSILENT XINPUT"
+	rm -f configure.options && echo $myconf >> configure.options
+
+	use cuda && myconf+=" CUDA"
+#	use mpi && myconf+=" MPI"
+	use tachyon && myconf+=" LIBTACHYON"
+	use xinerama && myconf+=" XINERAMA"
+
+	export \
+		PYTHON_INCLUDE_DIR="$(python_get_includedir)" \
+		PYTHON_LIBRARY_DIR="$(python_get_library_path)" \
+		PYTHON_LIBRARY="$(python_get_LIBS)" \
+		NUMPY_INCLUDE_DIR="$(python_get_sitedir)/numpy/core/include" \
+		NUMPY_LIBRARY_DIR="$(python_get_sitedir)/numpy/core/include"
+
+	perl ./configure LINUX \
+		${myconf} || die
+}
+
+src_compile() {
+	# build plugins
+	cd "${WORKDIR}"/plugins || die
+
+	emake \
+		${EMAKEOPTS[@]} \
+		LINUX
+
+	# build vmd
+	cd "${S}"/src || die
+	emake
+}
+
+src_install() {
+	# install plugins
+	cd "${WORKDIR}"/plugins || die
+	emake \
+			PLUGINDIR="${ED}/usr/$(get_libdir)/${PN}/plugins" \
+			distrib
+
+	# install vmd
+	cd "${S}"/src || die
+	emake install
+
+	# install docs
+	cd "${S}" || die
+	dodoc Announcement README doc/ig.pdf doc/ug.pdf
+
+	# remove some of the things we don't want and need in
+	# /usr/lib
+	cd "${ED}"/usr/$(get_libdir)/vmd || die
+	rm -fr doc README Announcement LICENSE || \
+		die "failed to clean up /usr/lib/vmd directory"
+
+	# adjust path in vmd wrapper
+	sed \
+		-e "s:${ED}::" -i "${ED}"/usr/bin/${PN} \
+		-e "/^defaultvmddir/s:^.*$:defaultvmddir=\"${EPREFIX}/usr/$(get_libdir)/${PN}\":g" \
+		|| die "failed to set up vmd wrapper script"
+
+	# install icon and generate desktop entry
+	insinto /usr/share/pixmaps
+	doins "${WORKDIR}"/vmd.png
+	eprefixify "${WORKDIR}"/vmd.desktop
+	sed -i '/^Path/d' "${WORKDIR}"/vmd.desktop || die
+	# Open PDB files with VMD
+	echo "MimeType=chemical/x-pdb;" >> "${WORKDIR}"/vmd.desktop || die
+	domenu "${WORKDIR}"/vmd.desktop
+}
diff --git a/sci-chemistry/vmd/vmd-1.9.3.ebuild b/sci-chemistry/vmd/vmd-1.9.3.ebuild
index 01098a723def..88394af1970d 100644
--- a/sci-chemistry/vmd/vmd-1.9.3.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.3.ebuild
@@ -27,10 +27,12 @@ CDEPEND="
 	>=dev-lang/tk-8.6.1
 	dev-lang/perl
 	dev-libs/expat
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	sci-libs/netcdf:0=
 	virtual/opengl
 	>=x11-libs/fltk-1.1.10-r2:1
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 2d8792335bd2..69e8a157de29 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/geda-xgsch2pcb/Manifest b/sci-electronics/geda-xgsch2pcb/Manifest
index a806cab2ae01..e8063b5b14d4 100644
--- a/sci-electronics/geda-xgsch2pcb/Manifest
+++ b/sci-electronics/geda-xgsch2pcb/Manifest
@@ -1,5 +1,5 @@
 AUX 0.1.3-python.patch 1036 BLAKE2B ff7391d533a42cc7cd0b684c5df9fcf28b9684124b8b297c3644172999d6c4143761651bd7a0a14c5377d83dc20c8b1c3faf593294ec7e703d45dfaed624aced SHA512 2d57c33949374776d468b797ac021f90e80066d5c6dc0b482274272bae203d8a3019e5d72c23fca25cd0e131d2eb95688ddb7963ac272ae5cff755a41a94cd6a
 DIST geda-xgsch2pcb-0.1.3.tar.gz 160225 BLAKE2B 15f4641647f8edcf7f7cfb0d69eff9a8eba44441dea5147c988114ee25f7473a9da58b81654f6dc713d0a8ae70864a780e6babf2c152c7e3232207d2ddbcc7db SHA512 24d8c798be49a0aa09c12c97eb6d33e1bd5ccf1a866a8889dd04e3dd2035afd6b8799638d696691216df9d5c645922b8cfb5aadc1373d15c6ee62eec0f72b965
-EBUILD geda-xgsch2pcb-0.1.3-r3.ebuild 1355 BLAKE2B 612515c7b462b5b8e2c905ce874c30c151dc94a482fcd407e7d4c88712ce783c1ad91ae54ceaffb0f4a92a2551fb3630e2ebc70af180481a0680f0da5d44ef83 SHA512 01f84e70313c875b08e044caaf9f81da582d62abbb40bfb4ec9cd53c85c20204911dbe75f30e890a6740bc48f4e0ab5621a785ff3d0295e68d3bd96438c809cd
-EBUILD geda-xgsch2pcb-0.1.3-r4.ebuild 1293 BLAKE2B c5afdda3b35b879d707fa8350597e0b875c44bc977d64ed5c114d46849f546bdcfb24cd10771af62f76102635bf07e38a8ab1ee8a458d6840d584ddd5a3464ed SHA512 b940e521b7077922afe5a54ca443803d98111ebbdf0c79abe947002c244df5161b6fde61bf4f0fe3bff2ba05ebda5c5c6c4c1e295e9c4d68202445bfc4e50614
+EBUILD geda-xgsch2pcb-0.1.3-r5.ebuild 1443 BLAKE2B 5707ba9a1c7fd54a423bc29fe9cb6f75b6b498064a6c90bc3fc8089bfa849d004d3a0ba55667eef9af0125b51e3a9527bbd1f09df37ca4b013311f002d4335af SHA512 ca4a23f0d7c8dd9510128202631bb6a10826edcd6ed14fcba73fc8b6ec441895311ea787b923a7be4de72b4f5b3b3bde3a96fd430a93dd435c9a3bdfcd453311
+EBUILD geda-xgsch2pcb-0.1.3-r6.ebuild 1340 BLAKE2B 58053db39d8a0f5c715d6bcc4baf22bdcd20eb22ca4a675b74318166402568e6f3bb315b7a7fbdff8868169710c9ddac0d98bc354d1f93ce5961e26541a3cf4c SHA512 f423a4341a5aec6300577e1f145d0f58767e66c0c8724bb6fb206d96e928329da5e59370757902b13b4ce37585874aa76ceb5a8615169df461ac69e9b7398e54
 MISC metadata.xml 671 BLAKE2B 77470480797cd6bd52006fb449dd79f1a9ced0746f7d9e66e93a90c618d7ad5689a2af1e498a4e3e02eff7a7fea94e901bc89ec1a1c0c2046acb518f422048c3 SHA512 bcf8fa9808b923a56d6a8ace86cf95b7ed92475995fe8fa500b168fc8f7aabb4eeb1419a1dcc9f3ef7f4b0b0fcf1e9b27fe204db074f347fc1d3cd272ff3b9a0
diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild
deleted file mode 100644
index e7beae977e1c..000000000000
--- a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools fdo-mime gnome2-utils python-single-r1
-
-DESCRIPTION="A graphical front-end for the gschem -> pcb workflow"
-HOMEPAGE="http://www.gpleda.org"
-SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="gnome nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sci-electronics/pcb[dbus]
-	sci-electronics/geda
-	nls? ( virtual/libintl )
-"
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu
-	gnome? ( dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	dev-lang/perl
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${PV}-python.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare(){
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-update-desktop-database
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r4.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r4.ebuild
deleted file mode 100644
index 44789cb25430..000000000000
--- a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r4.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools fdo-mime gnome2-utils python-single-r1
-
-DESCRIPTION="A graphical front-end for the gschem -> pcb workflow"
-HOMEPAGE="http://www.gpleda.org"
-SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sci-electronics/pcb[dbus]
-	sci-electronics/geda
-	nls? ( virtual/libintl )
-"
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	dev-lang/perl
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${PV}-python.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare(){
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-update-desktop-database
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r5.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r5.ebuild
new file mode 100644
index 000000000000..f7db10a7e691
--- /dev/null
+++ b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools fdo-mime gnome2-utils python-single-r1
+
+DESCRIPTION="A graphical front-end for the gschem -> pcb workflow"
+HOMEPAGE="http://www.gpleda.org"
+SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="gnome nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
+	sci-electronics/pcb[dbus]
+	sci-electronics/geda
+	nls? ( virtual/libintl )
+"
+RDEPEND="${CDEPEND}
+	sci-electronics/electronics-menu
+	gnome? (
+		$(python_gen_cond_dep '
+			dev-python/gnome-vfs-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${PV}-python.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-update-desktop-database
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r6.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r6.ebuild
new file mode 100644
index 000000000000..b9b2d426a6ae
--- /dev/null
+++ b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools fdo-mime gnome2-utils python-single-r1
+
+DESCRIPTION="A graphical front-end for the gschem -> pcb workflow"
+HOMEPAGE="http://www.gpleda.org"
+SRC_URI="http://geda.seul.org/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
+	sci-electronics/pcb[dbus]
+	sci-electronics/geda
+	nls? ( virtual/libintl )
+"
+RDEPEND="${CDEPEND}
+	sci-electronics/electronics-menu
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${PV}-python.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-update-desktop-database
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-electronics/gerbv/Manifest b/sci-electronics/gerbv/Manifest
index 122d99a0c727..5de5fe7f2383 100644
--- a/sci-electronics/gerbv/Manifest
+++ b/sci-electronics/gerbv/Manifest
@@ -1,9 +1,4 @@
-AUX gerbv-2.6.1-ru.patch 341 BLAKE2B 87714542a7262bd61d3895a270df6cf54985a7708e4e1e2a7a6597f9e736b5f457d9d1b388b7dd8b26d167de125a41a0a3124ed518eb2aaf12a0ded81b84a59e SHA512 7cd39b1648f67bbf28a56afe03975ce0f57afeec8021f14f0a56e6ea015e5148c245ad960db7d544a2c5b8e2e33d682ee5ae5b00a6384d303494f3430933a3bb
 AUX gerbv-2.7.0-fno-common-gcc10.patch 526 BLAKE2B cceab2910ada8bde66987e403bdf765e98b62bda66cbd46ee50705c6be539e971eb7e0420b261b97ef3dbb6e0280fb351e425f2b4391bc1cd3af91ee0ba1251f SHA512 fba1f40ac844268f2d81ee63c04509a64cd9b016c0fe3dd8736c3a4faa3727e5ac9a9f6c0bba5a8d4f5362e701a33c1dbc93409dec630896ad06c80dcc5f13a3
-DIST gerbv-2.6.0.tar.gz 2346299 BLAKE2B 2b7a4293289e460f5b06f802d9ad779021a519d6ec702ea4b27df1e6a06d6779ae41fbd9aae6f0c83f9ea61fc9369dbc6aaa8d29326a9d5d139ab89a40f050f0 SHA512 a2d7601b44c8ed16a89d18713f451c0298bee65e2ea76b87e3d9d573af63d3b57758cb7cfcfb2177a22aecc7d9fdaaca3d369ea051446651af4dc542065a4377
-DIST gerbv-2.6.1.tar.gz 4432481 BLAKE2B 022214846077a4fea56848fbc63096857a8a782b3469c2293567e4927b904cf59a36d5d2b2adc0be7bc395a17c615af58a231f68a8f1dbedcb77cafc55ceb849 SHA512 cbf4ce4fd2b401d65ffc6bb5a7f9da0e6fa31cb3f754ea12092c86f197c72c833805eb395562b286f6d03c2eb38e363b649f8aa1040a6207baf975fa15e48b29
 DIST gerbv-2.7.0.tar.gz 5691407 BLAKE2B 458440dd69f20fee18ce09953c7403d783b2b7df1bf977e192b1ac877ebd9ed535ef7712417e112cff82d95e1c3752ae1dd4d88dfe14dea45df7c959337cb6ff SHA512 a940de027a9cdfdc513b0740cb402d312ae33bb7f002f80ee5f3e800aa5d01b86ff277538d8a19a309d852e248b2c8136645ede2d5d33456e5bfb49336c1256e
-EBUILD gerbv-2.6.0.ebuild 1066 BLAKE2B 2511dac6ffaa1802a9d5e2b68c3e62c0f5d51e06340f575dca4f78c6cddeef0f631306bd97325343f96e9292764f0dcca149ce07dc1efaf0b462bb3e8ecfe3ca SHA512 76a62c8201c33c26bcba495d7ab38f317e1f2f29d696b466a188d22a21a3973c758738540a18daa8a236ee0879bbaac086c4245d6e0dccfd14f9059e447a832f
-EBUILD gerbv-2.6.1.ebuild 1285 BLAKE2B 0db7241c736242863204876b0117d5f4ac7e02412b60cf960d3c4224f454c4d4b7b9e42c28dc3a3e4c2a1f4391ba8b32decd30a90c9ac231018f0944148a5169 SHA512 decefc9c39ed6f078f334bbeb9c66dfd947a7c7e1aa0da4301ffed24371be56c31c907174b61ed22e1c6109a36ca15360773cdb4caec8cd8a23c7dd3ac95eb56
-EBUILD gerbv-2.7.0.ebuild 1045 BLAKE2B 9e162ac3b85f2ac346498cf9685772919e2535973525d3cfd6068ce97c0bb63fec6490206e3eeaaf2330b46d90aeb17307ff34824affec3630b174947d391b12 SHA512 47a579ba19402e2fa8812501d0752aee56b7cb6edb13d52f5b203c596c354dbd5687855ba14ed5446e77b1cf262b8a9a5ddeb333520ec2fd94dd5631f9aee028
+EBUILD gerbv-2.7.0.ebuild 1043 BLAKE2B c45330111e1989ab50b8dfe903e917b9db13e3b944bf6263221c939e7c94207ed32711c9ef3087374aa64e3b81e5bd516f002bbdedb06c95e7293cbc3823666c SHA512 c3abe4b3018e9b857b6cbaf3654e090ed29fe1738957af83aedbdb760f3cd1d4165d36356f3fc76c4778d26940d63843b6f41d25ea8bdb86b214720f07796d1c
 MISC metadata.xml 802 BLAKE2B c6db09de31370176bf6d1717c38b955f03037e24e322e20cfaac08747e403d146fc036358e4faeb81135b3e2dc3945da6a7d029a1256d0e26d3cd69c2afa0afc SHA512 cd322dbcdba34e76f450b4368e2a3eb63885726c09f8b8baad3137cc8e5e8e8537776fd776b86112b2fb71ae5720490dda586ca805e0ba8662744703eed25982
diff --git a/sci-electronics/gerbv/files/gerbv-2.6.1-ru.patch b/sci-electronics/gerbv/files/gerbv-2.6.1-ru.patch
deleted file mode 100644
index a56f34333919..000000000000
--- a/sci-electronics/gerbv/files/gerbv-2.6.1-ru.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -19,8 +19,7 @@
- ##  along with this program; if not, write to the Free Software
- ##  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
- 
--man_MANS = gerbv.1 gerbv.ru.1
--PO_FILES= gerbv.ru.1.in.po
-+man_MANS = gerbv.1
- 
- MOSTLYCLEANFILES = *~
- CLEANFILES = *~  *.pot $(man_MANS)
diff --git a/sci-electronics/gerbv/gerbv-2.6.0.ebuild b/sci-electronics/gerbv/gerbv-2.6.0.ebuild
deleted file mode 100644
index e2618cd1f896..000000000000
--- a/sci-electronics/gerbv/gerbv-2.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit fdo-mime
-
-DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://gerbv.geda-project.org/"
-
-IUSE="doc examples static-libs unit-mm"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-RESTRICT="test"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/cairo"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable unit-mm) \
-		--disable-update-desktop-database \
-		$(use_enable static-libs static)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS BUGS ChangeLog CONTRIBUTORS HACKING NEWS README* TODO
-
-	rm doc/Doxyfile.nopreprocessing
-	if use doc; then
-		find doc -name "Makefile*" -exec rm -f '{}' \;
-		dodoc -r doc/*
-	fi
-
-	if use examples; then
-		find example -name "Makefile*" -exec rm -f '{}' \;
-		dodoc -r example/*
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-electronics/gerbv/gerbv-2.6.1.ebuild b/sci-electronics/gerbv/gerbv-2.6.1.ebuild
deleted file mode 100644
index 87f4879d8345..000000000000
--- a/sci-electronics/gerbv/gerbv-2.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils gnome2-utils xdg-utils
-
-DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://gerbv.geda-project.org/"
-
-IUSE="doc examples static-libs unit-mm"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/cairo"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# No Russian translation shipped
-	echo > po/LINGUAS || die
-	eapply "${FILESDIR}"/${P}-ru.patch
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable unit-mm) \
-		--disable-update-desktop-database
-}
-
-src_install () {
-	default
-
-	dodoc AUTHORS BUGS ChangeLog CONTRIBUTORS HACKING NEWS README* TODO
-
-	rm doc/Doxyfile.nopreprocessing
-	if use doc; then
-		find doc -name "Makefile*" -exec rm -f '{}' \;
-		dodoc -r doc/*
-	fi
-
-	if use examples; then
-		find example -name "Makefile*" -exec rm -f '{}' \;
-		dodoc -r example/*
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/gerbv/gerbv-2.7.0.ebuild b/sci-electronics/gerbv/gerbv-2.7.0.ebuild
index 48379be86259..82242e80810c 100644
--- a/sci-electronics/gerbv/gerbv-2.7.0.ebuild
+++ b/sci-electronics/gerbv/gerbv-2.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc examples unit-mm"
 RESTRICT="test"
 
diff --git a/sci-electronics/gresistor/Manifest b/sci-electronics/gresistor/Manifest
index 826eb654a445..1086b1fe9450 100644
--- a/sci-electronics/gresistor/Manifest
+++ b/sci-electronics/gresistor/Manifest
@@ -1,4 +1,4 @@
 AUX SimpleGladeApp.py 11794 BLAKE2B 5b6fb7dbd376031fd551eb7762d7f12a8b4451bbc710310f51c21f0ddca20d5c5b78d04329a70b65fdfdd2d8e4c2956273857c82a8091fb858699f40b0b162fe SHA512 d6eb78b2e138d5b0813b993177106bc3713172ca65a7561584eea314053bc49e27fa784465ca87fa678d65382252bffda733a4c3e846f6161bd4dffa01e83d36
 DIST gresistor-0.0.2.tar.gz 10240 BLAKE2B d3b624c7e7abdbbe40d978b507f0b66d464aa6836e96d1b1c78a37b8365dfda451cf5051192fd2f3fd15a75d092c4bfb81fe0e6c0f087dc4a175603da6df47a3 SHA512 263483f5712a48f2095bddf620520233e2843c64c1a03a7924cecb856de8fdcac601100cda4dc9f1943ff7753ffaaab04e25032416dd9438fe3f17d7d6681072
-EBUILD gresistor-0.0.2.ebuild 798 BLAKE2B 524612c627280f61fb90b86a4854a060ae5321b09eb40a2699e231509fb91ea2564e7da799e5ae006525053182393fe7c6b94a466ff7f30941f2c3bb2b504e70 SHA512 efddc7d7db534f820c5cf193c976652dd5ae01707877908d730356a0f0dceca690ad45263e946c37bc52e3d611529d203b03e5e47cf4954cca75a17a28d8e66c
+EBUILD gresistor-0.0.2-r1.ebuild 838 BLAKE2B 06fef921db4742b57f85f9576715b91ff50e052afcc38090b81e153bea3b028cd67873f0c3d48c68128f8fa2782003e7e5091d842a6e00632d96c0ab24c7b103 SHA512 9c73da2c7f861f054e2bf28d57929ff43acbc60ab6d7507cfd9c442dd1b8cd0490dc24a66b4e6fa631e66781237554ab10b51b42e4f5a741ad53d7c64e3604f1
 MISC metadata.xml 246 BLAKE2B d696d8b94de8a32ca51bbce05b1aad9b9fb3b14355f8b2a6560ee719e21bcaa9cd32e764911bf652224bd2a7009c1ac4a5ad948b88cc4e1e5c01d0889a668151 SHA512 b0fee99b0b02e57eca1c4f80ac656743e02b333842779dbc3ce8a988d2d0fea788a867aa55a9b7fc49f8724594848e5d164b7f41edc8bb2e9d178c3b52792667
diff --git a/sci-electronics/gresistor/gresistor-0.0.2-r1.ebuild b/sci-electronics/gresistor/gresistor-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..1a626f02b108
--- /dev/null
+++ b/sci-electronics/gresistor/gresistor-0.0.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Translate a resistor color codes into a readable value"
+HOMEPAGE="https://sourceforge.net/projects/gresistor/"
+SRC_URI="mirror://sourceforge/gresistor/${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/libglade:2.0[${PYTHON_SINGLE_USEDEP}]
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i -e 's/Version=0.0.2/Version=1.0/g' ${PN}.desktop || die
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	python_domodule "${FILESDIR}/SimpleGladeApp.py"
+	domenu ${PN}.desktop
+}
diff --git a/sci-electronics/gresistor/gresistor-0.0.2.ebuild b/sci-electronics/gresistor/gresistor-0.0.2.ebuild
deleted file mode 100644
index fa0b5112d491..000000000000
--- a/sci-electronics/gresistor/gresistor-0.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Translate a resistor color codes into a readable value"
-HOMEPAGE="https://sourceforge.net/projects/gresistor/"
-SRC_URI="mirror://sourceforge/gresistor/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	gnome-base/libglade:2.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/Version=0.0.2/Version=1.0/g' ${PN}.desktop || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	python_domodule "${FILESDIR}/SimpleGladeApp.py"
-	domenu ${PN}.desktop
-}
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 72e81b6ce0a1..54e1c28740a1 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -17,10 +17,10 @@ DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B 99d317df6f2446611614c8d4294b4f8ff81082d
 DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
-EBUILD kicad-4.0.7.ebuild 6660 BLAKE2B 01d74a7d0953864d95605db9646457ed92a68552bec80ef5d8ada67800dedf5b7c49c467d75897eee4b05ab5ea37cb13c5dbf88f9cc31195963c65ae9d22b9d5 SHA512 944610406b0f01930142fb8cdc7aa6a9e2aa0d733db9b2cc7a7e8a0eee3acbfc165a462c88efe2146c0e6192ef4a8a6560bc4786306da94d5731f06607ac3754
-EBUILD kicad-5.0.1.ebuild 3470 BLAKE2B ba72236bf9f3cc2b54d88bde68d529f9ee826f78aee2a8c2f5ad234d18bab2d36c76f7f51a6192dd63b2925081a614ba94d29155e280e91a9ecfb4063392a682 SHA512 5b8070be9d7fca9f95a138dc81b2ec5eabee8c970da129c5efcf61806310e235e2fc3339a0ecd8108e8b030af09aff5970894893c49a3414f76d5dd3784ffbe3
-EBUILD kicad-5.1.0-r1.ebuild 3547 BLAKE2B f8fe35fce1d7a6f27d807483e96eb2986dc79601313762fc5f340bb32e9841572f4fa27fb9152b41f77db72b724b815dd2c32775b734995e987b7eea7bba15af SHA512 6c7205cdbd66bf6f52aea0906ff9f22884154b3499c95aae28eb9fd3b004ec2b62584ead6a4c0a4c73ca6bc161551516b6af311a67640a339ec2b120319c36a0
-EBUILD kicad-5.1.2-r1.ebuild 3623 BLAKE2B 76621467d79af219a63784e9147fcb76ff474bafd79d958e22a80e747e9a48845844df626fd3f34acc46a25ac498a4f7884a5a513a10156e8975a532531868ec SHA512 67cc9e308c5535da54b6e765be5e77c8dd0fcf7501887a04fbf649bd46b07a3dcf5b8beef916ff1e9649475d7169d1c2cfa1e2c6db870215b3002071519d6acc
-EBUILD kicad-5.1.4.ebuild 3587 BLAKE2B 1acd2ae60530e70c734bcaf97a831d4ccf5d9270f7818974939a32f69c44e752a7d3b0a09bdf3210f4f3f6e5ef1c4d568500f7783fbe6e123d1a5772fd4bfafd SHA512 0c5be7637cc9383f61a080bf91de4c5babda0b11658cbd7e43d0fb936f8105b344346f95ab2fc4a190702aa34eec49a63e6435c8514b67d469c4a2c379934c95
-EBUILD kicad-5.1.5.ebuild 3558 BLAKE2B 7a8680f1cdf6ac6d740c8045e9d2ba5e149ba75a39bb2bc3d35e53b4d528da2aee6c1c3cf8caf38835b602f547eee766ea02472d7b958bee06534d6b03a1b089 SHA512 933e6571e81f07ba3c3bbe20bc1990e9b587f8f9ead8541fe0c40356ee7580a9b9f19f9537043d70accb5f4a627b8781865cb44f948bdf429953382e42b2be0e
+EBUILD kicad-4.0.7-r1.ebuild 6708 BLAKE2B 9c1b70aaa068b9d874ee8f84c8bd79b849a02a91577c43e5b27881b856579248d56de03299300a900e9583d0f2d639ca15e150382236671521f690769c1cce2b SHA512 f2f426f0936148dd8a1d46f81be89cdbbdacf4e363755848bc06f2742600f92e39ab8438a825c1180f2811d9689161fb203e1f49457d7b2a8630a042e604e1c4
+EBUILD kicad-5.0.1.ebuild 3518 BLAKE2B 15af18ad991caad4460be0cf829db0976a94e4fabce761f7b7818114af96043a75d1da0ec678a707a975a114a94d32140806543742a21f8f835633b5e13ccdff SHA512 81425f12c0d9af2539d7d1cff5315981a3bb35d8e542b8cd7ac0e1a1bd25f7ac8273d3c5057de8987ab3351f40cc8f894d66aad75aa6e709c9bbcd03d45f72ca
+EBUILD kicad-5.1.0-r1.ebuild 3595 BLAKE2B f984c162f1428611d095d59e50a0c8b59b4c8d45b7eb2e5b2db3c19839afbc641a4d2fe12679885a11ba3b9153187cde10e2f357d3a3152b4e29f241f8e297a2 SHA512 0789cdbeb5c9b9a15b64747da7b9ac5e35137e04575b8892d3f3cb0b703081f039c779d616d9ee9b865872fc4d94f42c4cf9e1c502a4a42c1441903e85ea1e2c
+EBUILD kicad-5.1.2-r1.ebuild 3671 BLAKE2B 6d616a76af85f50bcdcd4ba41309bb751d1f6473ab80a324d7ba1605dd03058a905d35b9c33191e3e8f0947a543c9d81d237f26283fda497c3be7ab76e220f47 SHA512 da8bac8636848543650a31bc5a9f5393c0777aefb34155e77b909027349d3a6847587611d8c217069e91a84c9738d3713df7a450b418293cf9da93dc7c366296
+EBUILD kicad-5.1.4.ebuild 3635 BLAKE2B 2490a6ff3792c72d40f46a068fa6af55f5621e0e5149856653a43737ea3fb9659b0d878a31bbd1baa5f682cbca2a508bbff09b610e8ced2d66e9d54e130e17d8 SHA512 fd2481a4b79a589bbec56ebae97a418aa21871e9b6398d4f902136e9048701170956e8da76b795b76176006236463a64a983faca816c77a2603c1d697767108d
+EBUILD kicad-5.1.5-r1.ebuild 3649 BLAKE2B da171ac440addee60f742f61adb8d0a980e7ac131489cd9dbe7f2a556e07ad5897fabb2c644a0999392ba0bd0ef79bbd62d7920075e0e10a47aa95d33684e56c SHA512 ad484976d8e9fba7345f1c0aa7324239225987ec800671a949654227fc4482387920cbf5dd1144ae8d40b4c019a9218b3e506650fa7b40d2a723b8469ab52b28
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/kicad-4.0.7-r1.ebuild b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
new file mode 100644
index 000000000000..a85b949bc42d
--- /dev/null
+++ b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit check-reqs cmake-utils flag-o-matic gnome2-utils python-single-r1 wxwidgets vcs-snapshot versionator xdg
+
+SERIES=$(get_version_component_range 1-2)
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org"
+SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
+	!minimal? (
+		http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
+		http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.tar.gz
+	)
+	i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="debug doc examples github i18n libressl minimal +python"
+LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh-CN"
+for lang in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+unset lang
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
+	github? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+	media-libs/glew:0=
+	media-libs/freeglut
+	media-libs/mesa[X(+)]
+	sys-libs/zlib
+	x11-libs/cairo"
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	i18n? ( virtual/libintl )
+	python? ( dev-lang/swig:0 )"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu"
+
+pkg_pretend() {
+	CHECKREQS_DISK_BUILD="8G"
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	setup-wxwidgets
+	CHECKREQS_DISK_BUILD="8G"
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	cmake-utils_src_prepare
+
+	# Patch to work with >=boost 1.61
+	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
+	# Patch to work with >=cmake 3.11
+	eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
+
+	# Remove cvpcb desktop file as it does nothing
+	rm "resources/linux/mime/applications/cvpcb.desktop" || die
+
+	# Handle optional minimal install.
+	if use minimal; then
+		# remove templates as they are not needed to run binaries
+		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die
+	else
+		# create a link to the parts library in the main project folder
+		ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || die
+		# create a link to the footprints library and add cmake build rule for it
+		ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die
+		cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die
+		# add the libraries directory to cmake as a subproject to build
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die
+		# add the footprints directory to cmake as a subproject to build
+		sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( ${PN}-footprints )" -i CMakeLists.txt || die
+		# remove duplicate uninstall directions for the library module
+		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die
+	fi
+
+	# Add internationalization for the GUI
+	if use i18n; then
+		# create a link to the translations library in the main project folder
+		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die
+		# Remove unused languages. Project generates only languages specified in the
+		# file in LINGUAS in the subproject folder. By default all languages are added
+		# so we sed out the unused ones based on the user l10n_* settings.
+		local lang
+		for lang in ${LANGS}; do
+			if ! use l10n_${lang}; then
+				lang="${lang//-/_}"  # Needed to turn zh-CN to zh_CN as KiCad does not follow l10n standard here
+				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die
+			fi
+		done
+		# cmakelists does not respect our build dir variables, so make it point to the right location
+		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die
+		# we also make from the master project so the source dir is understood incorretly, replace that too
+		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die
+		# add the translations directory to cmake as a subproject to build
+		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die
+		# remove duplicate uninstall directions for the translation module
+		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die
+	fi
+
+	# Install examples if requested
+	use examples || sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die
+
+	# Add important missing doc files
+	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DKICAD_DOCS="/usr/share/doc/${PF}"
+		-DKICAD_SKIP_BOOST=ON
+		-DBUILD_GITHUB_PLUGIN="$(usex github)"
+		-DKICAD_SCRIPTING="$(usex python)"
+		-DKICAD_SCRIPTING_MODULES="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
+		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
+		-DCMAKE_CXX_FLAGS="-std=c++11"
+	)
+	use python && mycmakeargs+=(
+		-DwxUSE_UNICODE=ON
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	if use debug; then
+		append-cxxflags "-DDEBUG"
+		append-cflags "-DDEBUG"
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+
+	if use minimal ; then
+		ewarn "If the schematic and/or board editors complain about missing libraries when you"
+		ewarn "open old projects, you will have to take one or more of the following actions :"
+		ewarn "- Install the missing libraries manually."
+		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
+		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
+		ewarn "- Emerge ${PN} without the 'minimal' USE flag."
+	fi
+	elog ""
+	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
+	elog "For help and extended documentation emerge app-doc/kicad-doc."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7.ebuild
deleted file mode 100644
index 624172e8994a..000000000000
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="3.0"
-
-inherit check-reqs cmake-utils flag-o-matic gnome2-utils python-single-r1 wxwidgets vcs-snapshot versionator xdg
-
-SERIES=$(get_version_component_range 1-2)
-
-DESCRIPTION="Electronic Schematic and PCB design tools."
-HOMEPAGE="http://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
-	!minimal? (
-		http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
-		http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.tar.gz
-	)
-	i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="debug doc examples github i18n libressl minimal +python"
-LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh-CN"
-for lang in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-unset lang
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
-	github? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	media-libs/glew:0=
-	media-libs/freeglut
-	media-libs/mesa[X(+)]
-	sys-libs/zlib
-	x11-libs/cairo"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	i18n? ( virtual/libintl )
-	python? ( dev-lang/swig:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu"
-
-pkg_pretend() {
-	CHECKREQS_DISK_BUILD="8G"
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	setup-wxwidgets
-	CHECKREQS_DISK_BUILD="8G"
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
-
-	# Patch to work with >=boost 1.61
-	eapply "${FILESDIR}/${PN}-boost-1.61.patch"
-	# Patch to work with >=cmake 3.11
-	eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
-
-	# Remove cvpcb desktop file as it does nothing
-	rm "resources/linux/mime/applications/cvpcb.desktop" || die
-
-	# Handle optional minimal install.
-	if use minimal; then
-		# remove templates as they are not needed to run binaries
-		sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die
-	else
-		# create a link to the parts library in the main project folder
-		ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || die
-		# create a link to the footprints library and add cmake build rule for it
-		ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die
-		cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die
-		# add the libraries directory to cmake as a subproject to build
-		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die
-		# add the footprints directory to cmake as a subproject to build
-		sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( ${PN}-footprints )" -i CMakeLists.txt || die
-		# remove duplicate uninstall directions for the library module
-		sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die
-	fi
-
-	# Add internationalization for the GUI
-	if use i18n; then
-		# create a link to the translations library in the main project folder
-		ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die
-		# Remove unused languages. Project generates only languages specified in the
-		# file in LINGUAS in the subproject folder. By default all languages are added
-		# so we sed out the unused ones based on the user l10n_* settings.
-		local lang
-		for lang in ${LANGS}; do
-			if ! use l10n_${lang}; then
-				lang="${lang//-/_}"  # Needed to turn zh-CN to zh_CN as KiCad does not follow l10n standard here
-				sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die
-			fi
-		done
-		# cmakelists does not respect our build dir variables, so make it point to the right location
-		sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die
-		# we also make from the master project so the source dir is understood incorretly, replace that too
-		sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die
-		# add the translations directory to cmake as a subproject to build
-		sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die
-		# remove duplicate uninstall directions for the translation module
-		sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die
-	fi
-
-	# Install examples if requested
-	use examples || sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die
-
-	# Add important missing doc files
-	sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DKICAD_DOCS="/usr/share/doc/${PF}"
-		-DKICAD_SKIP_BOOST=ON
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)"
-		-DCMAKE_CXX_FLAGS="-std=c++11"
-	)
-	use python && mycmakeargs+=(
-		-DwxUSE_UNICODE=ON
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	if use debug; then
-		append-cxxflags "-DDEBUG"
-		append-cflags "-DDEBUG"
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/.
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use minimal ; then
-		ewarn "If the schematic and/or board editors complain about missing libraries when you"
-		ewarn "open old projects, you will have to take one or more of the following actions :"
-		ewarn "- Install the missing libraries manually."
-		ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
-		ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
-		ewarn "- Emerge ${PN} without the 'minimal' USE flag."
-	fi
-	elog ""
-	elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
-	elog "For help and extended documentation emerge app-doc/kicad-doc."
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
index a9f2e30229b2..cb1d50631ac0 100644
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,11 +23,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index 6646e63fac8c..8c93a13852a0 100644
--- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Can switch to EAPI=7 when wxwidgets eclass also supports it
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
index eaf36e9596e6..377f42f962a0 100644
--- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
index b442e402be32..68c690312a8a 100644
--- a/sci-electronics/kicad/kicad-5.1.4.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.4.ebuild
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
diff --git a/sci-electronics/kicad/kicad-5.1.5-r1.ebuild b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
new file mode 100644
index 000000000000..af08ef9e488c
--- /dev/null
+++ b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit check-reqs cmake eutils python-single-r1 toolchain-funcs wxwidgets xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad-pcb.org"
+SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples github +ngspice occ +oce openmp +python"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	?? ( occ oce )
+"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.61:=[context,nls,threads]
+	media-libs/freeglut
+	media-libs/glew:0=
+	>=media-libs/glm-0.9.9.1
+	media-libs/mesa[X(+)]
+	>=x11-libs/cairo-1.8.8:=
+	>=x11-libs/pixman-0.30
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	github? ( net-misc/curl:=[ssl] )
+	ngspice? (
+		sci-electronics/ngspice[shared]
+	)
+	occ? ( >=sci-libs/opencascade-6.8.0:= )
+	oce? ( sci-libs/oce )
+	python? (
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
+			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	python? ( >=dev-lang/swig-3.0:0 )"
+RDEPEND="${COMMON_DEPEND}
+	sci-electronics/electronics-menu
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+CHECKREQS_DISK_BUILD="800M"
+
+PATCHES=(
+	"${FILESDIR}"/"${PN}-5.1.5-help.patch"
+	"${FILESDIR}"/"${PN}-5.1.5-ninja-build.patch"
+	"${FILESDIR}"/"ldflags.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use openmp && tc-check-openmp
+	setup-wxwidgets
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local mycmakeargs=(
+		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}"
+		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
+		-DBUILD_GITHUB_PLUGIN="$(usex github)"
+		-DKICAD_SCRIPTING="$(usex python)"
+		-DKICAD_SCRIPTING_MODULES="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
+		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
+		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
+		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
+		-DKICAD_SPICE="$(usex ngspice)"
+		-DKICAD_USE_OCC="$(usex occ)"
+		-DKICAD_USE_OCE="$(usex oce)"
+		-DKICAD_INSTALL_DEMOS="$(usex examples)"
+	)
+	use python && mycmakeargs+=(
+		-DPYTHON_DEST="$(python_get_sitedir)"
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	use occ && mycmakeargs+=(
+		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_src_compile dev-docs doxygen-docs
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+	if use doc ; then
+		dodoc uncrustify.cfg
+		cd Documentation || die
+		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "Component symbols library" sci-electronics/kicad-symbols
+	optfeature "Component footprints library" sci-electronics/kicad-footprints
+	optfeature "3D models of components " sci-electronics/kicad-packages3d
+	optfeature "Project templates" sci-electronics/kicad-templates
+	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
+	optfeature "Extended documentation" app-doc/kicad-doc
+	optfeature "Creating 3D models of components" media-gfx/wings
+
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/sci-electronics/kicad/kicad-5.1.5.ebuild b/sci-electronics/kicad/kicad-5.1.5.ebuild
deleted file mode 100644
index 46baaff613c7..000000000000
--- a/sci-electronics/kicad/kicad-5.1.5.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit check-reqs cmake eutils python-single-r1 toolchain-funcs wxwidgets xdg-utils
-
-DESCRIPTION="Electronic Schematic and PCB design tools"
-HOMEPAGE="https://www.kicad-pcb.org"
-SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-2+ GPL-3+ Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples github +ngspice occ +oce openmp +python"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( occ oce )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
-	media-libs/freeglut
-	media-libs/glew:0=
-	>=media-libs/glm-0.9.9.1
-	media-libs/mesa[X(+)]
-	>=x11-libs/cairo-1.8.8:=
-	>=x11-libs/pixman-0.30
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	github? ( net-misc/curl:=[ssl] )
-	ngspice? (
-		sci-electronics/ngspice[shared]
-	)
-	occ? ( >=sci-libs/opencascade-6.8.0:= )
-	oce? ( sci-libs/oce )
-	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	python? ( >=dev-lang/swig-3.0:0 )"
-RDEPEND="${COMMON_DEPEND}
-	sci-electronics/electronics-menu
-"
-BDEPEND="doc? ( app-doc/doxygen )"
-CHECKREQS_DISK_BUILD="800M"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}-5.1.5-help.patch"
-	"${FILESDIR}"/"${PN}-5.1.5-ninja-build.patch"
-	"${FILESDIR}"/"ldflags.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use openmp && tc-check-openmp
-	setup-wxwidgets
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local mycmakeargs=(
-		-DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}"
-		-DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}"
-		-DBUILD_GITHUB_PLUGIN="$(usex github)"
-		-DKICAD_SCRIPTING="$(usex python)"
-		-DKICAD_SCRIPTING_MODULES="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON="$(usex python)"
-		-DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)"
-		-DKICAD_SCRIPTING_PYTHON3="$(usex python)"
-		-DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
-		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_USE_OCC="$(usex occ)"
-		-DKICAD_USE_OCE="$(usex oce)"
-		-DKICAD_INSTALL_DEMOS="$(usex examples)"
-	)
-	use python && mycmakeargs+=(
-		-DPYTHON_DEST="$(python_get_sitedir)"
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	use occ && mycmakeargs+=(
-		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
-		-DOCC_LIBRARY_DIR="${CASROOT}"/lib
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		cmake_src_compile dev-docs doxygen-docs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	use python && python_optimize
-	if use doc ; then
-		dodoc uncrustify.cfg
-		cd Documentation || die
-		dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature "Component symbols library" sci-electronics/kicad-symbols
-	optfeature "Component footprints library" sci-electronics/kicad-footprints
-	optfeature "3D models of components " sci-electronics/kicad-packages3d
-	optfeature "Project templates" sci-electronics/kicad-templates
-	optfeature "Different languages for GUI" sci-electronics/kicad-i18n
-	optfeature "Extended documentation" app-doc/kicad-doc
-	optfeature "Creating 3D models of components" media-gfx/wings
-
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 45e723b1e2fb..eca6f4ec1309 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,5 +1,5 @@
 AUX klayout-0.25.6-gcc8.patch 527 BLAKE2B bd9d1ebac1a4f4679f076a3bedb67b3a4fe040338e0d63a7e25e5fb523707b7525ab7a9088122c75aa0a16e34e6e262efe097f5f96ff6db72b1d5add8f7192c5 SHA512 3280052ef3d9caf78d716c8cfb6e33205bbd2c9543f52bfe28e5c23749b3bbf8ed59edf7bbc8b8a96753f0e90484dcaacaad39c4ccbc2bebe979520589589f46
 DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c SHA512 38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
-EBUILD klayout-0.25.6.ebuild 1725 BLAKE2B 1cec2e021fb73d23cad5f9935ed9c974a34cbef95dce54b3e1b824bcbb6a1b45581750cda2322c2fa72fc8b13d06f8c230c7338637e96d92546a4c68a163e26e SHA512 3e52b517b3ff2b3180f158fe9b9e859386099a8915ab9122f669befa99c4516ebc05798cac85ece87c0d994c5391acecfc51d52d343bcae7f977ef1b8e1198f8
-EBUILD klayout-9999.ebuild 1682 BLAKE2B dbc9613fad0800095aaf1880150e6e25c54bbac686045be38be569c5ac507a9f69c54937a3baa8a03da3cd938590a702cc017e27fe8dca62f0cc0efbacb16e22 SHA512 a5034592c74e6116fd41b43195599c598cee0e5e423769da13b44af76182a34a11e39656c11487ef55fb2cdaf11b33be7f371170ae99ef1517f02657b0ce86a5
+EBUILD klayout-0.25.6.ebuild 1719 BLAKE2B 08c62d695cf828e0c224cc5c8076750d9bba96e21c43f6a130c3714ff4b36cc0a4980c5928aec7a278a1a3c6e226ad550854274db6905ab892fe05d7353cd92a SHA512 ea824d3b5a719542f9042173874e8992728996f9c92d1b3d715ea4d3ad669005f1f896c3d173fa306034eb3371e9dacd7a25eb485065c5a06f98ff058a2b387f
+EBUILD klayout-9999.ebuild 1676 BLAKE2B fbb977111607d11901982da7f3fadef7a5154ed2e97f8f25adbe89033030d04546ec1ed2820ca29c933ce6aaa25d513324c1737b20e5bd5e86664da8bd366f8f SHA512 47b1277066a06b60eeccc433953bc9b77e236693378af9600df11b65d36d0f5555b0ae25943ab7761a28ef8ddefc5669996869f81a1d4c5baaf35340099792cb
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.25.6.ebuild b/sci-electronics/klayout/klayout-0.25.6.ebuild
index b9f915b651d4..be589a0f90ec 100644
--- a/sci-electronics/klayout/klayout-0.25.6.ebuild
+++ b/sci-electronics/klayout/klayout-0.25.6.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby24"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index 12de746331fe..3419a02b2be3 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby24"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 6b49ebd1d394..4f4ec9e4e744 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,11 +1,4 @@
-AUX pcb-20110918-fix-config.diff 466 BLAKE2B e9dfc32fee936846c1e91a52b4fb2ae07e16b0d592eef80756d49f72500f04e89fcc8d7b3163308c41385117f66d765fec4de2fcd13246842b11ca4909587c60 SHA512 9bfb0cd28e3c87eba91ee2a226a75128e4a0df37f79ebb10e4f34880d1f32d3cee17fc9f3ba6f553b6ed018a521efcecc583e75d82e8549d91cbab2a1280aa0c
-AUX pcb-4.0.2-doc.diff 368 BLAKE2B b45d661583ef68b3a40cc203fbfaf91f275a29a8374cce4bb7870e05addfa34bb5b5e3db9bb4b8ffaa6d1b107f9029782f3e44dbb2a9011876c49f5425ad1154 SHA512 8a6f68e8e4799244ed12a11ae4092aa3ce02786481adc02abf1622f08f5e5406cbc05a172da9ebbb646a20cf77a722536f31da7c1fe95579dc0cb0c19e7c496b
-AUX pcb-4.0.2-tests.diff 386 BLAKE2B 12f6d3e190d49549569e99f6e421c9492b0fe1a55c02f206388dd6eb4208e481a7b865fa46e67e25cecb8bcc51a2b3070e17cf28f9f0e25d2484a9c9285b0db3 SHA512 a589c1f01b55d48a1fa2af4a764103a8dbb146c4dcb409ba88298ce011ecc26160a5275fd69e58b29b3dbc2773c80ef9ed86570ac53cc649bc969cb6a0262f55
 AUX pcb-4.2.2-fix-autotools.patch 1182 BLAKE2B 627b48ae5ec4cf50a060c95ca13758000837e808aa1eb84ac9ab205d8b438cbe50f428b1c7100e6aad043eaefaa0a32e8797e08a05bfc9345d005199b05f3cf3 SHA512 9c3c1fc4d7e71920e0f06bdc4961ea3cecb7aa27f726f9851e2a69d1aea17a761eca71362a444815956df10338c7b985440d1f4c50a6531597687080ac8bd600
-DIST pcb-20140316.tar.gz 4210077 BLAKE2B a0a676bc0eaedd269644d7f7e6d6d443c4ca1a66aba4db18a0aea33edef2dbd84d7a027a25c310bce9d309c46b63ac4f1b807587f5064ce81aadaea2f675521b SHA512 5b9a2704b4d3c95f03afad0fe8fb5414b2aa9d680e40bf77ad9b46a9d4e14ba740858092794a9ff6788f31ac19063b126d8ceed6316c0d9eaaaa574e6678c071
-DIST pcb-4.0.2.tar.gz 4762521 BLAKE2B 3bae7983c84a79edc882b822b91e94adc00ec4e9b329719a0a15599bb12a6771318844ffbd6163b3c646be8410af1964d59b523fffaebd690af2cce9b4f0f98e SHA512 8bca9bdbdd640174e82e9cf1a457f9ef3f9b7c3f1d957a21c3bb07e50134b83504d85f312e429bed90bfc58f786b4319ffb69c5637ed4fd69a0312e11c6ad30b
 DIST pcb-4.2.2.tar.gz 5182807 BLAKE2B e2a9ab7fdeb402d9d07717fbc2ad4b31594aada95693c2a7046c73364a43591ee1a537f0cbda67bf46e39d53c61a454f146963fe14a4661fe2ffbc11c2eab99f SHA512 c76fc053fbb0a8a9b7aef494a37d3587efaa2023affd32c3cce895632a7e68fbb85f8862cff8349c7d281365379c07a5471c9467c5977a7aa053a83fc6499c55
-EBUILD pcb-0_p20140316.ebuild 4150 BLAKE2B 9bb721a281078b53a31ba4ac460092031f2aff7f010f62f02a2452ffb459ea6a83a0d3651dce7501a857c7be7fea55a68a55e3bd1d2a62eac703ab2915d8d755 SHA512 9f1fa2992155c46591f4ce31cff51ac1452c9420128fee0e3eaa0cae4dc48e5f03750b0a3388047cf595ed623d5925bb63983bf1d6d09b47e31fbfe28c762040
-EBUILD pcb-4.0.2.ebuild 3981 BLAKE2B 904c79d5cccec4d4e717ba1599d83750e3ec804e88472f4ceb67439ea5f95be8806539c2e0f5638b16338b11bf0c51e475ae9e2731e5d316ba3bb238aaef2b23 SHA512 8f4dca30a2931fcb080abb540c1da36c3f5e610f42730280eed6c5d02f2240ee9122b5a4663dfeaa0491bc33383b9a27a61f4f5db704b39fa53f05a0ed843a81
-EBUILD pcb-4.2.2.ebuild 2759 BLAKE2B c94577e9478005aa261d63fa44cf5e7f410d66d3216de7e061f28ce56907d70e269f6b0e64db76b858dc241b092bb3d9544c984a3a2143459fcb6c3f3ecaf21a SHA512 b7523f2fef8171c7194f827142e72edd1cba47227cd05617c71c6b534200b24eb04a1022639e88f572d8621259e3f55b77f3657f713758327796427c46a060e5
-MISC metadata.xml 1075 BLAKE2B 8ee38af92e19a45d50f13f9b4967816011fb7b97a5d1259d4f5bb0c8e6d5a7e0570e814b71802af65ecbf460de9f9ce553faa7c3cc3db9a54738f852d9032f73 SHA512 318bf4eaa10916d3a827595dd95da0abe9832f75e237e3be957a4c9019c525d7754bcc20d34f9b54c2692d53bb1cffbd02746f4d66c029cde1662181ae3d670c
+EBUILD pcb-4.2.2.ebuild 2757 BLAKE2B 80e1258671b8449ce32bb8cd58c08655eb35987783f677438f1da4a74881300383294f74e20e708aebc0756d59fe543c6e994e38afc196af60037145e9e489a1 SHA512 5bfeceda8a1306e64dccffc4a4ece48c297eb85c36b80311088e8007b24e18d26af7d6c1c015658ceea6f0d3d33b3dcca9e6448d1d42f3b8b8c329d6a7e623ba
+MISC metadata.xml 999 BLAKE2B 8bb8c575d1dabb137081bc12dff4e91c5bef1ff1e83e9aa11f241fc1ed7a1c44fdfcc7812f5476c8774ed5604033cddf05b948fa489384f483c80a84f134caca SHA512 162270942f0fd924729909a2e1f5e24d0433fbebfa1f9e08deff2b14a802e92a4fd839e3cc5bfb8c3175c23e874c43253166213b5397bf6e49f862aa481e83f4
diff --git a/sci-electronics/pcb/files/pcb-20110918-fix-config.diff b/sci-electronics/pcb/files/pcb-20110918-fix-config.diff
deleted file mode 100644
index 86ac7c3aad40..000000000000
--- a/sci-electronics/pcb/files/pcb-20110918-fix-config.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.old	2012-03-11 17:02:27.000000000 +0100
-+++ configure.ac	2012-03-11 17:02:37.000000000 +0100
-@@ -1252,11 +1252,6 @@
- if test -d $srcdir/doc; then
-    AC_CONFIG_FILES(doc/Makefile)
- fi
--if test -d $srcdir/doc/gs; then
--   AC_CONFIG_FILES(doc/gs/Makefile)
--   AC_CONFIG_FILES(doc/gs/gafrc)
--   AC_CONFIG_FILES(doc/gs/gschemrc)
--fi
- if test -d $srcdir/example; then
-    AC_CONFIG_FILES(example/Makefile)
-    AC_CONFIG_FILES(example/libraries/Makefile)
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-doc.diff b/sci-electronics/pcb/files/pcb-4.0.2-doc.diff
deleted file mode 100644
index 78f0a05e35ed..000000000000
--- a/sci-electronics/pcb/files/pcb-4.0.2-doc.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.orig	2017-12-23 08:35:07.079096342 +0000
-+++ configure.ac	2017-12-23 08:35:36.903643912 +0000
-@@ -7,6 +7,9 @@
- AC_GNU_SOURCE
- AC_CONFIG_HEADERS([config.h])
- 
-+# avoid rebuilding documentation
-+AM_MAINTAINER_MODE
-+
- ##########################################################################
- #
- # Try to figure out if we are building from git sources.
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
deleted file mode 100644
index 9c6052ee7d73..000000000000
--- a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Do not count skipped tests as failed (bug #642366)
---- tests/run_tests.sh.orig	2017-12-28 16:40:57.657366187 +0100
-+++ tests/run_tests.sh	2017-12-28 16:42:57.183392063 +0100
-@@ -842,8 +842,9 @@
- show_sep
- echo "Passed $pass, failed $fail, skipped $skip out of $tot tests."
- 
-+sum=`expr $skip + $pass`
- rc=0
--if test $pass -ne $tot ; then
-+if test $sum -ne $tot ; then
-     rc=1
- fi
- 
diff --git a/sci-electronics/pcb/metadata.xml b/sci-electronics/pcb/metadata.xml
index 2ab5e9e2afd5..edc93e050afe 100644
--- a/sci-electronics/pcb/metadata.xml
+++ b/sci-electronics/pcb/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="gcode">gcode file export</flag>
 		<flag name="gsvit">GSvit file export</flag>
 		<flag name="tk">Build tcl/tk graphical QFP footprint generator</flag>
-		<flag name="xrender">Translucent PCB display for Motif/Lesstif GUI</flag>
 		<flag name="m4lib-png">Enable creating png previews for the m4 library</flag>
 		<flag name="toporouter">Build toporouter</flag>
 	</use>
diff --git a/sci-electronics/pcb/pcb-0_p20140316.ebuild b/sci-electronics/pcb/pcb-0_p20140316.ebuild
deleted file mode 100644
index 24b400cffc4b..000000000000
--- a/sci-electronics/pcb/pcb-0_p20140316.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils xdg-utils gnome2-utils toolchain-funcs
-
-DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
-HOMEPAGE="http://pcb.geda-project.org/"
-SRC_URI="mirror://sourceforge/pcb/pcb/${P/0_p/}/${P/0_p/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-macos"
-IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png
-test tk toporouter xrender"
-# toporouter-output USE flag removed, there seems to be no result
-RESTRICT="!test? ( test )"
-
-CDEPEND="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 )"
-#toporouter-output? ( x11-libs/cairo )
-
-DEPEND="${CDEPEND}
-	test? (
-		sci-electronics/gerbv
-		virtual/imagemagick-tools
-	)
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu"
-
-DOCS="AUTHORS README NEWS ChangeLog"
-
-S="${WORKDIR}/${P/0_p/}"
-
-pkg_setup() {
-	if use gtk && use motif; then
-		elog "Can only build for GTK+ or Motif/Lesstif GUI. GTK+ has priority."
-	fi
-	if !(use gtk || use motif); then
-		elog "Building without GUI, make sure you know what you are doing."
-	fi
-	if use dbus && !(use gtk || use motif); then
-		elog "dbus needs GTK or Motif/Lesstif GUI. Try USE=-dbus or USE=gtk or USE=motif."
-	fi
-	if use opengl && !(use gtk); then
-		elog "GL drawing needs GTK"
-	fi
-	if (use gtk || (! use gtk && ! use motif)) &&  (use xrender); then
-		elog "The XRender extension is only usable with the Motif/Lesstif GUI."
-	fi
-}
-
-src_prepare() {
-	if use test; then
-		# adapt the list of tests to run according to USE flag settings
-		if ! use png; then
-			sed -i '/^hid_png/d' tests/tests.list || die
-		fi
-		if ! use gcode; then
-			sed -i '/^hid_gcode/d' tests/tests.list || die
-		fi
-	fi
-	# Backport from upstream
-	# http://git.geda-project.org/pcb/commit/?id=a34b40add60310a51780f359cc90d9c5ee75752c
-	# (do not install static GTS library)
-	sed -i -e 's/lib_LIBRARIES/noinst_LIBRARIES/' -e 's/include_HEADERS/noinst_HEADERS/' gts/Makefile.am || die
-
-	# fix bad syntax in Makefile.am and configure.ac before running eautoreconf
-	sed -i -e 's/:=/=/' Makefile.am || die
-	epatch "${FILESDIR}"/${PN}-20110918-fix-config.diff
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use gtk ; then
-		myconf="--with-gui=gtk $(use_enable dbus) $(use_enable opengl gl) --disable-xrender"
-	elif use motif ; then
-		myconf="--with-gui=lesstif $(use_enable dbus) $(use_enable xrender)"
-	else
-		myconf="--with-gui=batch --disable-xrender --disable-dbus"
-	fi
-
-	local exporters="bom gerber ps"
-	if (use png || use jpeg || use gif) ; then
-		exporters="${exporters} png"
-	fi
-	use nelma && exporters="${exporters} nelma"
-	use gcode && exporters="${exporters} gcode"
-	use tk || export WISH="${EPREFIX}/bin/true"
-
-	econf \
-		${myconf} \
-		$(use_enable doc) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable m4lib-png) \
-		$(use_enable toporouter) \
-		$(use_enable debug) \
-		--enable-nls \
-		--disable-toporouter-output \
-		--with-exporters="${exporters}" \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-update-mime-database \
-		--disable-update-desktop-database \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-# toporouter-output USE flag removed, there seems to be no result
-#		$(use_enable toporouter-output) \
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-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-electronics/pcb/pcb-4.0.2.ebuild b/sci-electronics/pcb/pcb-4.0.2.ebuild
deleted file mode 100644
index fbed2457df40..000000000000
--- a/sci-electronics/pcb/pcb-4.0.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils xdg-utils gnome2-utils toolchain-funcs
-
-DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
-HOMEPAGE="http://pcb.geda-project.org/"
-SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
-IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png
-test tk toporouter xrender"
-# toporouter-output USE flag removed, there seems to be no result
-RESTRICT="!test? ( test )"
-
-CDEPEND="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 )"
-#toporouter-output? ( x11-libs/cairo )
-
-DEPEND="${CDEPEND}
-	test? (
-		sci-electronics/gerbv
-		virtual/imagemagick-tools
-	)
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu"
-
-DOCS="AUTHORS README NEWS ChangeLog"
-
-pkg_setup() {
-	if use gtk && use motif; then
-		elog "Can only build for GTK+ or Motif/Lesstif GUI. GTK+ has priority."
-	fi
-	if !(use gtk || use motif); then
-		elog "Building without GUI, make sure you know what you are doing."
-	fi
-	if use dbus && !(use gtk || use motif); then
-		elog "dbus needs GTK or Motif/Lesstif GUI. Try USE=-dbus or USE=gtk or USE=motif."
-	fi
-	if use opengl && !(use gtk); then
-		elog "GL drawing needs GTK"
-	fi
-	if (use gtk || (! use gtk && ! use motif)) &&  (use xrender); then
-		elog "The XRender extension is only usable with the Motif/Lesstif GUI."
-	fi
-}
-
-src_prepare() {
-	if use test; then
-		# adapt the list of tests to run according to USE flag settings
-		if ! use png; then
-			sed -i '/^hid_png/d' tests/tests.list || die
-		fi
-		if ! use gcode; then
-			sed -i '/^hid_gcode/d' tests/tests.list || die
-		fi
-		# fix wrong accounting of skipped and passed tests
-		epatch "${FILESDIR}"/${P}-tests.diff
-	fi
-
-	# fix bad syntax in Makefile.am and configure.ac before running eautoreconf
-	sed -i -e 's/:=/=/' Makefile.am || die
-	epatch "${FILESDIR}"/${PN}-20110918-fix-config.diff
-	# avoid rebuilding documentation
-	epatch "${FILESDIR}"/${PN}-4.0.2-doc.diff
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use gtk ; then
-		myconf="--with-gui=gtk $(use_enable dbus) $(use_enable opengl gl) --disable-xrender"
-	elif use motif ; then
-		myconf="--with-gui=lesstif $(use_enable dbus) $(use_enable xrender)"
-	else
-		myconf="--with-gui=batch --disable-xrender --disable-dbus"
-	fi
-
-	local exporters="bom gerber ps ipcd356"
-	if (use png || use jpeg || use gif) ; then
-		exporters="${exporters} png"
-	fi
-	use nelma && exporters="${exporters} nelma"
-	use gcode && exporters="${exporters} gcode"
-	use tk || export WISH="${EPREFIX}/bin/true"
-
-	econf \
-		${myconf} \
-		$(use_enable doc) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable m4lib-png) \
-		$(use_enable toporouter) \
-		$(use_enable debug) \
-		--enable-nls \
-		--disable-toporouter-output \
-		--with-exporters="${exporters}" \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-update-mime-database \
-		--disable-update-desktop-database \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-# toporouter-output USE flag removed, there seems to be no result
-#		$(use_enable toporouter-output) \
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-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-electronics/pcb/pcb-4.2.2.ebuild b/sci-electronics/pcb/pcb-4.2.2.ebuild
index d7c8ac609fe0..4e23178926a3 100644
--- a/sci-electronics/pcb/pcb-4.2.2.ebuild
+++ b/sci-electronics/pcb/pcb-4.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-macos"
 IUSE="dbus doc gcode gif gsvit gui jpeg m4lib-png nelma png test tk toporouter"
 # toporouter-output USE flag removed, there seems to be no result
 RESTRICT="!test? ( test )"
diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest
index bec348e3af34..60299ff1b4bc 100644
--- a/sci-electronics/pulseview/Manifest
+++ b/sci-electronics/pulseview/Manifest
@@ -1,4 +1,4 @@
 DIST pulseview-0.4.1.tar.gz 1342532 BLAKE2B 759779d4024df8f972fbed515764f17557014972abcb39d3942b411bfa78c6f97a89ee98b706adb51d240bdb738925546cec073f98ba829f1e325acaac892c01 SHA512 0bae4357be312bf6e997885270887a5bcc0a8dfb6914e63bb0d5abb35389b6681748e0e4667556ad432c5432c861185bcdd8da7815fb570fc8a2fbbf5eed3801
-EBUILD pulseview-0.4.1.ebuild 1254 BLAKE2B f4e8730aefdd3bbe4dee42d73708c4f81e72ffe2cfeccaa14d18eabc851699799799ad498d451520c8beb43a898c09f48987937cf685cae4beaffa4284a64d12 SHA512 7936b1541d98d8ac3f2fa336f847f1bd5fcc5d4f517fc3fbb44aaf793b0aec7cc9631960c9a9f1b42dab7e22c49cb37f2147d1367e9b0f8161924184c00811e1
-EBUILD pulseview-9999.ebuild 1254 BLAKE2B 2cb7f677597429a186c7a39adaf1a227529ca1c8d534aaa50fb09eb225f0e46c75782af714f2c2f855467d5e5bcc8be1585a119ea1ac0ae05a45cbe5e33564cf SHA512 9e5ab09e263ada69aaf6934b4a757f00f30d4c65b956705385569e14e61c5f5e219954efd0b2a28a6b317f22cf82f14363b2b2d511326d24dbca0548bd139fa4
+EBUILD pulseview-0.4.1-r1.ebuild 1261 BLAKE2B 7e354b705e0c0ee70426273123888e2c7bd1a6c4d5d297d73221b7b0ea3014a4994f6f964b02029acc1f77e640332e010b7e0740b9fce594710717e0fa26f32e SHA512 0d380dbceb3563c6104f04b7f1039f70cd16ae46c20acdb8b6effdca6142e1f78791330b72d42c61c569d241aa69b40188884197d65093e17c2b6b2fa9473440
+EBUILD pulseview-9999.ebuild 1261 BLAKE2B 0bed74537ba8677c03935cc841e97523a56f2d041dcfa76fcc084381b4079c02c56f50df63b40ab9325b98e64d3e2dff28781b68f89dbbb05cd1ec50b7967a0a SHA512 3501cb8e38c660d238e0b6781e24d0442367738e45cc9fa7d417206541ff19bd1e5bc009215e8a0f23426d4ccbc6a63f795584a8cbf4efb787e6d217bd2b3ac3
 MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd
diff --git a/sci-electronics/pulseview/pulseview-0.4.1-r1.ebuild b/sci-electronics/pulseview/pulseview-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..909877319c9b
--- /dev/null
+++ b/sci-electronics/pulseview/pulseview-0.4.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sigrok.org/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Qt based logic analyzer GUI for sigrok"
+HOMEPAGE="https://sigrok.org/wiki/PulseView"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+decode static"
+REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/boost-1.55:=
+	>=dev-libs/glib-2.28.0:2
+	>=dev-cpp/glibmm-2.28.0:2
+	>=sci-libs/libsigrok-0.5.1:=[cxx]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtsvg:5
+	decode? (
+		>=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_SINGLE_USEDEP}]
+		${PYTHON_DEPS}
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( HACKING NEWS README )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_WERROR=TRUE
+		-DENABLE_DECODE=$(usex decode)
+		-DSTATIC_PKGDEPS_LIBS=$(usex static)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/sci-electronics/pulseview/pulseview-0.4.1.ebuild b/sci-electronics/pulseview/pulseview-0.4.1.ebuild
deleted file mode 100644
index 682870ec6d33..000000000000
--- a/sci-electronics/pulseview/pulseview-0.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Qt based logic analyzer GUI for sigrok"
-HOMEPAGE="https://sigrok.org/wiki/PulseView"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+decode static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/boost-1.55:=
-	>=dev-libs/glib-2.28.0:2
-	>=dev-cpp/glibmm-2.28.0:2
-	>=sci-libs/libsigrok-0.5.1:=[cxx]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtsvg:5
-	decode? (
-		>=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( HACKING NEWS README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_WERROR=TRUE
-		-DENABLE_DECODE=$(usex decode)
-		-DSTATIC_PKGDEPS_LIBS=$(usex static)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index bac3c89d5ef2..570474071f06 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
 	decode? (
-		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_USEDEP}]
+		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
diff --git a/sci-electronics/sigrok-cli/Manifest b/sci-electronics/sigrok-cli/Manifest
index d2d9b9225fe4..d458162a6ba2 100644
--- a/sci-electronics/sigrok-cli/Manifest
+++ b/sci-electronics/sigrok-cli/Manifest
@@ -1,4 +1,4 @@
 DIST sigrok-cli-0.7.1.tar.gz 221754 BLAKE2B a2edd3ef990c484660dd3fa6f8b8f2ca3eb500a39ac66da1ce9b95c7dd6bfbc5f39b7e5a28872bc8b4c6b7e6282919bbb22f71796ad8e16f3549ef2e4674f02e SHA512 a56d9439efca74f8362ed225d8fa92adfaee053470b166629ad2d8f3ebf5bea05a37782750c9321aabd3b47e634734fa5e5b0cc5353bf49dd1629cdcdb98aef5
-EBUILD sigrok-cli-0.7.1.ebuild 1071 BLAKE2B 318d762d4c9111a24ee94245d69163027de17c8e49ca7f8227017e696406ef83d5b0e308a3a0c12e01dac8443c4c2df622acbcfcf23b47a7055a80b00b2baea6 SHA512 6ef767ff2e6ce0fa1890d3452651b43aae8577ebe9fc9a3c38d9fc99f22fc9bec990f07d41fd557e309ba1ee61c864dda9d0428f422514a236cf718063ea9273
-EBUILD sigrok-cli-9999.ebuild 1071 BLAKE2B 318d762d4c9111a24ee94245d69163027de17c8e49ca7f8227017e696406ef83d5b0e308a3a0c12e01dac8443c4c2df622acbcfcf23b47a7055a80b00b2baea6 SHA512 6ef767ff2e6ce0fa1890d3452651b43aae8577ebe9fc9a3c38d9fc99f22fc9bec990f07d41fd557e309ba1ee61c864dda9d0428f422514a236cf718063ea9273
+EBUILD sigrok-cli-0.7.1-r1.ebuild 1078 BLAKE2B 95a24aa3de667f5a7e897efc4c729e2067d9e35f1ccaafb0a39e7b6993bafa988c1a3e5457238fc38369a5f946eef4a9b6b68e1f303c2df6d7ee1c574032fcdb SHA512 c40237af30466d343742a2b2e3a0b8b8a655cc8ada443af0df36c1de8e5e9356b0c018662ac318357630622014cb93c237ff563e43766ad54e2c8dd4e255699f
+EBUILD sigrok-cli-9999.ebuild 1078 BLAKE2B 95a24aa3de667f5a7e897efc4c729e2067d9e35f1ccaafb0a39e7b6993bafa988c1a3e5457238fc38369a5f946eef4a9b6b68e1f303c2df6d7ee1c574032fcdb SHA512 c40237af30466d343742a2b2e3a0b8b8a655cc8ada443af0df36c1de8e5e9356b0c018662ac318357630622014cb93c237ff563e43766ad54e2c8dd4e255699f
 MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..d13613f4a65a
--- /dev/null
+++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit gnome2-utils python-single-r1 xdg-utils
+
+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="Command-line client for the sigrok logic analyzer software"
+HOMEPAGE="https://sigrok.org/wiki/Sigrok-cli"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+decode"
+REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/glib-2.32.0
+	>=sci-libs/libsigrok-0.5.0:=
+	decode? (
+		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
+		${PYTHON_DEPS}
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with decode libsigrokdecode)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.1.ebuild
deleted file mode 100644
index c6cf38ddc33f..000000000000
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome2-utils python-single-r1 xdg-utils
-
-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="Command-line client for the sigrok logic analyzer software"
-HOMEPAGE="https://sigrok.org/wiki/Sigrok-cli"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+decode"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/glib-2.32.0
-	>=sci-libs/libsigrok-0.5.0:=
-	decode? (
-		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf $(use_with decode libsigrokdecode)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
index c6cf38ddc33f..d13613f4a65a 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND=">=dev-libs/glib-2.32.0
 	>=sci-libs/libsigrok-0.5.0:=
 	decode? (
-		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_USEDEP}]
+		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index e04e3fd32831..c6a616187358 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index e0cbe2282c7a..0b6d52c3fc46 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,5 +1,5 @@
 AUX grass-7.0.1-declare-inespg.patch 647 BLAKE2B ec303cc88965ff24d9521a3d2fdec3cd62f14bb9830a37942aa3373acc5351b07022f782c8f22f560bbf1f794fd46fa524b7ddab07a360c3e6f34cf3c1258972 SHA512 9206619090c0f138c734f7fe48467cd343cd01120ac4d7eaec3d822b7cac1cbc6e4630bfedd68e7bdd6966716116a1d6714faf373a1eceb08726acd16ca34bb4
 DIST grass-7.4.4.tar.gz 58454921 BLAKE2B bf8f85e4dad800a32ac0c23025b0844dde17c806aeec7d150d3263ff8fae80deab7b7052cfb664e138b2af1e5fbe3282db087d7545d42710db6d9890f0b285ee SHA512 9971bd1184c4b2eb38ecf5efafd28094c2d05d22e9ae53a8b074a15e26c029dd13c4627b442a428bca4030fd9118e49422863515cf0fc58dd46e70d2923a9f83
-EBUILD grass-7.4.4-r2.ebuild 7377 BLAKE2B 9a57d8e09c6a00371569730cbf81d80005de31f053f9818d50b2dafe755ef6b047cba59d513c2cb7a568bba4bb49162842017ca3349bf8646fb2a8691b745e09 SHA512 f7ee0cb8a850bcb6318962197123f5ea0f2f4e8c347386a400e8905556ab5a9ecb152cb1f7ba16ba07252667af22258ce3ad0396933f13f4c5548fcc51390c2b
-EBUILD grass-7.4.4.ebuild 7388 BLAKE2B aa8f400ff439b80be56b82c143d66839d28ce107183f6041e6d40af21205cd12d028598280567777f2a8842c41027a5da888226e94dbfc1077560a12723f5606 SHA512 811b4d33adec006ff2c9d40682d6e7e04953a0225101fadeb8292df4327c2c4b2b305cf131455dd6119c615c5b3b83d8afe6808e06bfb581f401ae324213db14
+EBUILD grass-7.4.4-r3.ebuild 7400 BLAKE2B 8dde00d639e28c3d53b9ca02ff7b4b1bcc2424b121dbad8b24645c5f26ef252dc62c695a7a1c87d58b8992ca859c2425b85fdcaa1204a04d5f7f4bdd3b61d256 SHA512 69a41763c2d3a60cdab2756fe5e4643e47b67f681fa548a6d055bb630c09e001d066196964a26d53407e580e57438e94b0052063ee1fe16c3796081ab45a74ab
+EBUILD grass-7.4.4.ebuild 7411 BLAKE2B c4b0539103c65e5c5f3275a51a60ef48000f898e72395f779c0178de598eaee745aada62cb5f3c2c682cdef1b2d962b0490f82ada644a137c69b81b2fecac1fa SHA512 71dd5f7e0e3972d89e3e29fa6dfe593697606188dd6318b7267f6793a87499d253952faa3f951659d22d9c4ccb9438e8b752f0c1b18f57408edc71380b8bd8d0
 MISC metadata.xml 814 BLAKE2B 0b1eacbba651c73fa3586014f44722e8eaedcdebf199651dbfce15a3f76538a4a6b498876e46cbd184aa777d4a6762cc0561614d5fc77d764002cdfa8a670ae9 SHA512 1dbb667232d8ebfbff53e2a66a5bdf8ef1d8e894d94c4e03348b658d99d8e8cf0ec159fe9421380c8bd4491ea71499fc10d6f20b3ca35208224eab82cce27635
diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r2.ebuild
deleted file mode 100644
index 4fc916183868..000000000000
--- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"  # bug 572440
-WANT_AUTOCONF="2.1"
-WX_GTK_VER=3.0
-
-inherit autotools desktop eapi7-ver python-single-r1 wxwidgets xdg
-
-MY_PM=${PN}$(ver_cut 1-2 ${PV})
-MY_PM=${MY_PM/.}
-MY_P=${P/_rc/RC}
-
-DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
-HOMEPAGE="https://grass.osgeo.org/"
-SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7.4.0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-admin/eselect-1.2
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	media-libs/libprojectm
-	sci-libs/gdal
-	sys-libs/gdbm
-	sys-libs/ncurses:0=
-	sci-libs/proj
-	sci-libs/xdrfile
-	sys-libs/zlib
-	blas? (
-		virtual/cblas
-		virtual/blas
-	)
-	fftw? ( sci-libs/fftw:3.0= )
-	geos? ( sci-libs/geos )
-	lapack? ( virtual/lapack )
-	liblas? ( sci-geosciences/liblas )
-	mysql? ( dev-db/mysql-connector-c:= )
-	netcdf? ( sci-libs/netcdf )
-	odbc? ( dev-db/unixODBC )
-	opencl? ( virtual/opencl )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	readline? ( sys-libs/readline:0= )
-	sqlite? ( dev-db/sqlite:3 )
-	tiff? ( media-libs/tiff:0= )
-	truetype? ( media-libs/freetype:2 )
-	X? (
-		dev-python/wxpython:3.0[cairo,opengl?]
-		x11-libs/cairo[X,opengl?]
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	X? (
-		dev-lang/swig
-		x11-base/xorg-proto
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch )
-
-pkg_setup() {
-	if use lapack; then
-		local mylapack
-		mylapack=$(eselect lapack show) || die
-		if [[ -z "${mylapack/.*reference.*/}" ]] && \
-			[[ -z "${mylapack/.*atlas.*/}" ]]; then
-			ewarn "You need to set lapack to atlas or reference. Do:"
-			ewarn "   eselect lapack set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	if use blas; then
-		local myblas
-		myblas=$(eselect blas show) || die
-		if [[ -z "${myblas/.*reference.*/}" ]] && \
-			[[ -z "${myblas/.*atlas.*/}" ]]; then
-			ewarn "You need to set blas to atlas or reference. Do:"
-			ewarn "   eselect blas set <impl>"
-			ewarn "where <impl> is atlas, threaded-atlas or reference"
-			die "setup failed"
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix unversioned python calls
-	local pyver=${EPYTHON/python/}
-	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
-	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
-
-	# fix header being unconditionally included
-	# see upstream https://trac.osgeo.org/grass/ticket/2779
-	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
-		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
-
-	default
-	eautoconf
-
-	ebegin "Fixing python shebangs"
-	python_fix_shebang -q "${S}"
-	eend $?
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	shopt -s nullglob
-	mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-
-}
-
-src_configure() {
-	if use X; then
-		WX_BUILD=yes
-		setup-wxwidgets
-	fi
-
-	addwrite "${EPREFIX%/}/dev/dri/renderD128"
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-w11
-		--without-opendwg
-		--with-regex
-		--with-gdal="${EPREFIX%/}/usr/bin/gdal-config"
-		--with-proj-includes="${EPREFIX%/}/usr/include/libprojectM"
-		--with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)"
-		--with-proj-share="${EPREFIX%/}/usr/share/proj/"
-		$(use_with cxx)
-		$(use_with tiff)
-		$(use_with png)
-		$(use_with postgres)
-		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql")
-		$(use_with sqlite)
-		$(use_with opengl)
-		$(use_with odbc)
-		$(use_with fftw)
-		$(use_with blas)
-		$(use_with lapack)
-		$(use_with X cairo)
-		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2")
-		$(use_with nls)
-		$(use_with readline)
-		$(use_with threads pthread)
-		$(use_with openmp)
-		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config")
-		$(use_with X wxwidgets "${WX_CONFIG}")
-		$(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config")
-		$(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config")
-		$(use_with X x)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# we don't want to link against embedded mysql lib
-	emake CC="$(tc-getCC)" MYSQLDLIB=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \
-		prefix="${D}/usr/" BINDIR="${D}/usr/bin" \
-		PREFIX="${D}/usr/" \
-		install
-
-	pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die
-
-	local HTML_DOCS=( docs/html/. )
-	einstalldocs
-
-	# manuals
-	dodir /usr/share/man/man1
-	rm -rf man/ || die
-
-	# translations
-	if use nls; then
-		dodir /usr/share/locale/
-		mv locale/* "${D}/usr/share/locale/" || die
-	fi
-
-	popd &> /dev/null || die
-
-	# link libraries in the ~standard~ place
-	for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do
-		dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}"
-	done
-
-	# link headers in the ~standard~ place
-	dodir "/usr/include/"
-	dosym "../$(get_libdir)/${MY_PM}/include/grass" "/usr/include/grass"
-
-	# fix paths in addons makefile includes
-	local scriptMakeDir
-	scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/"
-	for mkFile in $(ls "${scriptMakeDir}"); do
-		echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
-		sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
-	done
-
-	# get proper folder for grass path in script
-	local gisbase
-	gisbase="${ROOT}/usr/$(get_libdir)/${MY_PM}"
-	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
-		-i "${D}/usr/bin/${MY_PM}" || die
-
-	# get proper fonts path for fontcap
-	sed -i \
-		-e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \
-		"${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
-
-	# set proper python interpreter
-	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}/usr/bin/${MY_PM}" || die
-
-	if use X; then
-		local GUI="-gui"
-		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
-		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
-		doicon -s 48 gui/icons/${PN}-48x48.png
-	fi
-
-	# install .pc file so other apps know where to look for grass
-	insinto /usr/$(get_libdir)/pkgconfig/
-	doins grass.pc
-
-	# fix weird +x on tcl scripts
-	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-
-	ewarn "GRASS addons may fail due to Python 3 incompatibility."
-	ewarn "If that is tha case you can change the shebang a the beginning of"
-	ewarn "the script to enforce Python 2 usage."
-	ewarn "#!/usr/bin/env python"
-	ewarn "Should be changed into"
-	ewarn "#!/usr/bin/env python2"
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/sci-geosciences/grass/grass-7.4.4-r3.ebuild b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
new file mode 100644
index 000000000000..595f714b7b87
--- /dev/null
+++ b/sci-geosciences/grass/grass-7.4.4-r3.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"  # bug 572440
+WANT_AUTOCONF="2.1"
+WX_GTK_VER=3.0
+
+inherit autotools desktop eapi7-ver python-single-r1 wxwidgets xdg
+
+MY_PM=${PN}$(ver_cut 1-2 ${PV})
+MY_PM=${MY_PM/.}
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="https://grass.osgeo.org/"
+SRC_URI="https://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7.4.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openmp png postgres readline sqlite threads tiff truetype X"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-admin/eselect-1.2
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	media-libs/libprojectm
+	sci-libs/gdal
+	sys-libs/gdbm
+	sys-libs/ncurses:0=
+	sci-libs/proj
+	sci-libs/xdrfile
+	sys-libs/zlib
+	blas? (
+		virtual/cblas
+		virtual/blas
+	)
+	fftw? ( sci-libs/fftw:3.0= )
+	geos? ( sci-libs/geos )
+	lapack? ( virtual/lapack )
+	liblas? ( sci-geosciences/liblas )
+	mysql? ( dev-db/mysql-connector-c:= )
+	netcdf? ( sci-libs/netcdf )
+	odbc? ( dev-db/unixODBC )
+	opencl? ( virtual/opencl )
+	opengl? ( virtual/opengl )
+	png? ( media-libs/libpng:0= )
+	postgres? ( >=dev-db/postgresql-8.4:= )
+	readline? ( sys-libs/readline:0= )
+	sqlite? ( dev-db/sqlite:3 )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		dev-python/wxpython:3.0[cairo,opengl?]
+		x11-libs/cairo[X,opengl?]
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	X? (
+		dev-lang/swig
+		x11-base/xorg-proto
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	opengl? ( X )"
+
+PATCHES=( "${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch )
+
+pkg_setup() {
+	if use lapack; then
+		local mylapack
+		mylapack=$(eselect lapack show) || die
+		if [[ -z "${mylapack/.*reference.*/}" ]] && \
+			[[ -z "${mylapack/.*atlas.*/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use blas; then
+		local myblas
+		myblas=$(eselect blas show) || die
+		if [[ -z "${myblas/.*reference.*/}" ]] && \
+			[[ -z "${myblas/.*atlas.*/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# Fix unversioned python calls
+	local pyver=${EPYTHON/python/}
+	sed -e "s:GRASS_PYTHON=.*:&${pyver}:" -i "${S}/lib/init/grass.sh" || die
+	sed -e "s:= python:&${pyver}:" -i "${S}/include/Make/Platform.make.in" || die
+
+	# fix header being unconditionally included
+	# see upstream https://trac.osgeo.org/grass/ticket/2779
+	sed -e 's:\(#include <ogr_api.h>\):#ifdef HAVE_OGR\n\1\n#endif:' \
+		-i "${S}/vector/v.external/main.c" || die "failed to sed main.c"
+
+	default
+	eautoconf
+
+	ebegin "Fixing python shebangs"
+	python_fix_shebang -q "${S}"
+	eend $?
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	mesa_cards=$(echo -n /dev/dri/card* /dev/dri/render* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+
+}
+
+src_configure() {
+	if use X; then
+		WX_BUILD=yes
+		setup-wxwidgets
+	fi
+
+	addwrite "${EPREFIX}/dev/dri/renderD128"
+
+	local myeconfargs=(
+		--enable-shared
+		--disable-w11
+		--without-opendwg
+		--with-regex
+		--with-gdal="${EPREFIX}/usr/bin/gdal-config"
+		--with-proj-includes="${EPREFIX}/usr/include/libprojectM"
+		--with-proj-libs="${EPREFIX}/usr/$(get_libdir)"
+		--with-proj-share="${EPREFIX}/usr/share/proj/"
+		$(use_with cxx)
+		$(use_with tiff)
+		$(use_with png)
+		$(use_with postgres)
+		$(use_with mysql)
+		$(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql")
+		$(use_with sqlite)
+		$(use_with opengl)
+		$(use_with odbc)
+		$(use_with fftw)
+		$(use_with blas)
+		$(use_with lapack)
+		$(use_with X cairo)
+		$(use_with truetype freetype)
+		$(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2")
+		$(use_with nls)
+		$(use_with readline)
+		$(use_with threads pthread)
+		$(use_with openmp)
+		$(use_with opencl)
+		$(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config")
+		$(use_with X wxwidgets "${WX_CONFIG}")
+		$(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config")
+		$(use_with geos geos "${EPREFIX}/usr/bin/geos-config")
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# we don't want to link against embedded mysql lib
+	emake CC="$(tc-getCC)" MYSQLDLIB=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		INST_DIR="${D}/usr/$(get_libdir)/${MY_PM}" \
+		prefix="${D}/usr/" BINDIR="${D}/usr/bin" \
+		PREFIX="${D}/usr/" \
+		install
+
+	pushd "${D}/usr/$(get_libdir)/${MY_PM}" &> /dev/null || die
+
+	local HTML_DOCS=( docs/html/. )
+	einstalldocs
+
+	# manuals
+	dodir /usr/share/man/man1
+	rm -rf man/ || die
+
+	# translations
+	if use nls; then
+		dodir /usr/share/locale/
+		mv locale/* "${D}/usr/share/locale/" || die
+	fi
+
+	popd &> /dev/null || die
+
+	# link libraries in the ~standard~ place
+	for fLib in $(ls "${D}/usr/$(get_libdir)/${MY_PM}/lib/"); do
+		dosym "${MY_PM}/lib/${fLib}" "/usr/$(get_libdir)/${fLib}"
+	done
+
+	# link headers in the ~standard~ place
+	dodir "/usr/include/"
+	dosym "../$(get_libdir)/${MY_PM}/include/grass" "/usr/include/grass"
+
+	# fix paths in addons makefile includes
+	local scriptMakeDir
+	scriptMakeDir="${D}/usr/$(get_libdir)/${MY_PM}/include/Make/"
+	for mkFile in $(ls "${scriptMakeDir}"); do
+		echo sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
+		sed -i "s|${D}|/|g" "${scriptMakeDir}/${mkFile}" || die
+	done
+
+	# get proper folder for grass path in script
+	local gisbase
+	gisbase="${ROOT}/usr/$(get_libdir)/${MY_PM}"
+	sed -e "s:gisbase = \".*:gisbase = \"${gisbase}\":" \
+		-i "${D}/usr/bin/${MY_PM}" || die
+
+	# get proper fonts path for fontcap
+	sed -i \
+		-e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
+		"${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
+
+	# set proper python interpreter
+	sed -e "s:= \"python\":= \"${EPYTHON}\":" -i "${D}/usr/bin/${MY_PM}" || die
+
+	if use X; then
+		local GUI="-gui"
+		[[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+		make_desktop_entry "/usr/bin/${MY_PM} ${GUI}" "${PN}" "${PN}-48x48" "Science;Education"
+		doicon -s 48 gui/icons/${PN}-48x48.png
+	fi
+
+	# install .pc file so other apps know where to look for grass
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins grass.pc
+
+	# fix weird +x on tcl scripts
+	find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
+}
+
+pkg_postinst() {
+	use X && xdg_pkg_postinst
+
+	ewarn "GRASS addons may fail due to Python 3 incompatibility."
+	ewarn "If that is tha case you can change the shebang a the beginning of"
+	ewarn "the script to enforce Python 2 usage."
+	ewarn "#!/usr/bin/env python"
+	ewarn "Should be changed into"
+	ewarn "#!/usr/bin/env python2"
+}
+
+pkg_postrm() {
+	use X && xdg_pkg_postrm
+}
diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild
index e875e74c7586..af8e8a283be9 100644
--- a/sci-geosciences/grass/grass-7.4.4.ebuild
+++ b/sci-geosciences/grass/grass-7.4.4.ebuild
@@ -25,10 +25,12 @@ IUSE="blas cxx fftw geos lapack liblas mysql netcdf nls odbc opencl opengl openm
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-admin/eselect-1.2
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
 	media-libs/libprojectm
 	sci-libs/gdal
 	sys-libs/gdbm
@@ -150,23 +152,23 @@ src_configure() {
 		setup-wxwidgets
 	fi
 
-	addwrite "${EPREFIX%/}/dev/dri/renderD128"
+	addwrite "${EPREFIX}/dev/dri/renderD128"
 
 	local myeconfargs=(
 		--enable-shared
 		--disable-w11
 		--without-opendwg
 		--with-regex
-		--with-gdal="${EPREFIX%/}/usr/bin/gdal-config"
-		--with-proj-includes="${EPREFIX%/}/usr/include/libprojectM"
-		--with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)"
-		--with-proj-share="${EPREFIX%/}/usr/share/proj/"
+		--with-gdal="${EPREFIX}/usr/bin/gdal-config"
+		--with-proj-includes="${EPREFIX}/usr/include/libprojectM"
+		--with-proj-libs="${EPREFIX}/usr/$(get_libdir)"
+		--with-proj-share="${EPREFIX}/usr/share/proj/"
 		$(use_with cxx)
 		$(use_with tiff)
 		$(use_with png)
 		$(use_with postgres)
 		$(use_with mysql)
-		$(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql")
+		$(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql")
 		$(use_with sqlite)
 		$(use_with opengl)
 		$(use_with odbc)
@@ -175,16 +177,16 @@ src_configure() {
 		$(use_with lapack)
 		$(use_with X cairo)
 		$(use_with truetype freetype)
-		$(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2")
+		$(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2")
 		$(use_with nls)
 		$(use_with readline)
 		$(use_with threads pthread)
 		$(use_with openmp)
 		$(use_with opencl)
-		$(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config")
+		$(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config")
 		$(use_with X wxwidgets "${WX_CONFIG}")
-		$(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config")
-		$(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config")
+		$(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config")
+		$(use_with geos geos "${EPREFIX}/usr/bin/geos-config")
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
@@ -244,7 +246,7 @@ src_install() {
 
 	# get proper fonts path for fontcap
 	sed -i \
-		-e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \
+		-e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \
 		"${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die
 
 	# set proper python interpreter
diff --git a/sci-geosciences/opencpn-plugins-meta/Manifest b/sci-geosciences/opencpn-plugins-meta/Manifest
index f08f5de0d8ab..6ac8b7214245 100644
--- a/sci-geosciences/opencpn-plugins-meta/Manifest
+++ b/sci-geosciences/opencpn-plugins-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1354 BLAKE2B d46b48f16b553279ca65fc17848f2cb918cc5d079bfce47d30a347324f25c13a6d18887fe3f175ee15afa232ca245f5f5127b0c611c6e15f5f57d021e47556ad SHA512 06959e4ae448d57e5d8f28f1deffb73a1bd2597a001b8b71a30a3a92e7ec60e9ecd4de33c4ae446085e3841d7cd0702bae2b6efc9c5b0f9d574ea6b0819c5abe
+EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1372 BLAKE2B 0a1cee39e987227373847e8689e957dffb0dbf80a176dafb5d119d8411d5b3cfc7487b98ba0d3eb74fdf99ae022e6b55523ccd44a73fc7a25cc3e3917cb304f2 SHA512 8b37b575709ead8bb0f2a3f79f37fe5025c3af6aa8c6e594060e3e061025586716955427b8867c6c0e76a90be8209cc39a9383258f0b702bbac990be1ab845ca
 MISC metadata.xml 380 BLAKE2B e36e71274105ca4ccc90d1956dbd050ef82af00c0342c17b6d98e7b1d2e7fb9096ab4a2aea3763d054ffb9165d6d8b20122908c6b4ab651f18b722aeec66672a SHA512 8e6413ba8a2f51d21bd883f097825a3e86a410d222496242fc2b6da34ee8d759c473e1c1c58ee93c90b0d88db2cfd6e1f8c00fa29bd8a1637a2026142b9b18ab
diff --git a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
index 08856b3f00c9..1f85e8dec7a6 100644
--- a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
+++ b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="Meta ebuild to pull in opencpn plugins"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="metapackage"
 SLOT="0"
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5e238fcb8ef5..cecd0cc83476 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,12 +1,8 @@
-AUX qgis-2.18.12-cmake-lib-suffix.patch 454 BLAKE2B b5b7b1d64fd8c8eef1b0579124261d41b8a1e01b6670d211cdebcff4f4dd905b4e15fcf94386a5e297cadc3360bf48000106805f3425cdf383c043b3cda0560f SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7
 AUX qgis-3.10.0-cmake-lib-suffix.patch 507 BLAKE2B f9a383f380a8e5375e062350cc81bef294b79705589f537a9a7a2054806df06550a54525e307cc1eec2ecb81340faaf595a706d3d504190d720efe638ef3e2fb SHA512 a21ff313e4d1768dc15ac7dae8901d7245efb30f3caf7f9c0dbd667647e96b282f3451e7f52c8168df23ba2e953832995d975805a8f8bc176d20bd0862d9a51d
-AUX qgis-3.4.12-qt-5.13.patch 707 BLAKE2B 3a6e14a77403980df16008345c1f8a6edeba6d7bc027e6c2844501af2d902277360d0ef3955bdc9845da3c2b8a688f4d98fd3d4062c388476c20900e08827be7 SHA512 66af7639e1ab475ae1f6d89d44bef75b5904024b04209fddb6b855f3f08e823a1224233a39f595412de196f6739d026e2c0a9384694ca308d8a5bea0ab4942e5
 AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133
 AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f
 DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
-DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-EBUILD qgis-3.10.2.ebuild 5462 BLAKE2B 1dda9fc92e04689fa73a0bda51d4d87cedcc0d50ab72c07b7512f1a740b1ff5247a53d9ed40a88d4c03174e97607488f2b1639eb857115f05654fd106b19526e SHA512 3483ad1c06e894e1546c426fda33bd27a4884df2c1a7b11580c72a3f3c59f44620438baa6e778f7c3257b4a62218b10a3ed9226371e10309093026ea69caefd9
-EBUILD qgis-3.4.12.ebuild 6069 BLAKE2B 56308d01f866770d39f9dc90998f7e0a1116f1701ce1a3485d098cad49f40f3aaedb73d498de1af1bd63f33062e4f4b73f15e8a0b5d0bb6d8b8f4ceb14f7824b SHA512 adbe42974b73c82bb3ad8f0fa3e26549b19e742c6a922d7bda9ee736bb4def0aee9837e4e22ad1439835db5f8f9c3a1aaec5d8dfdc073a30def851547e0cbf36
-EBUILD qgis-9999.ebuild 5464 BLAKE2B bc5374f93fec200d1a1c824bb9da5755d4871b4a041bce481ced386470bf66795c32d0266e07fa249dbc07399a328c9902edab5e2a03d035615811d8b46436a1 SHA512 2fbe115ef3ff9dad4af0174b6e11082d2a1468935fd5fae870bc5de33f664a16e15ed7667b8d66d23c0420d56e2037a2285f9f5e86a155f64051ec52178b366e
+EBUILD qgis-3.10.2-r1.ebuild 5605 BLAKE2B 6a843e029a5428a3908d8029056b0dcf50b59417d3f0f3b0f0de269b049bae110d69d80c11d588c769b54539457bbdae425820d2c1438684db2a13e8875a2fd6 SHA512 a2ade40ebb1b8ed733af9b36c265cd9254a3b13d4f46a6ae0640f0786d760878d4bc6667c3c413f3f24b5880692c72b9254c564edbe01799a4864fa16bf757a8
+EBUILD qgis-9999.ebuild 5607 BLAKE2B 3acd63ef9604d2860ff2a8d6a2291d35f8d39ba277ecbedf81336b6d7142ec6ae9509c1325cfc5d1595aa4b669d5e69b9740020b251c59b9e009a28f17607037 SHA512 f86052c3b6d11030293712bddf071a969fb7cbff86ecca27d920019bb735fd8be0485ba1066b069d57067533071302af780d19d5c2034325e861c7a9c12e7706
 MISC metadata.xml 1413 BLAKE2B 63f664d32aa9df18e147346271d3fb1f49148848c7177cb22001962ecf1c32f69cc9758ddfabcbd3b8996f31a018dc1fb71a10d6d2e40ba79cad3e63c6ea6e75 SHA512 c1956fc3bb77b78d24547467fea5d71d2b22cd0f09be4b029f603952a7080c2f40ff00a7e45fc844774977978ad96e936de45296fae3d44aa93fda8f17598a99
diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch
deleted file mode 100644
index 5a1e8fcd9551..000000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/PyQtMacros.cmake	2016-08-26 05:58:37.000000000 -0600
-+++ b/cmake/PyQtMacros.cmake	2016-09-21 16:25:55.921411011 -0600
-@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
-   ELSE(WIN32)
-     # TODO osx
-     SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
--    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
-+    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
-   ENDIF(WIN32)
- 
-   FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch
deleted file mode 100644
index 9edb44276098..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001
-From: Matthias Kuhn <matthias@opengis.ch>
-Date: Sat, 22 Jun 2019 10:11:31 +0200
-Subject: [PATCH] Add missing include
-
-Fix https://github.com/qgis/QGIS/issues/30316
----
- src/analysis/interpolation/qgsinterpolator.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h
-index 35343ccdf7f..5d694418299 100644
---- a/src/analysis/interpolation/qgsinterpolator.h
-+++ b/src/analysis/interpolation/qgsinterpolator.h
-@@ -19,6 +19,7 @@
- #define QGSINTERPOLATOR_H
- 
- #include <QVector>
-+#include <QList>
- #include "qgis_sip.h"
- #include "qgis_analysis.h"
- 
diff --git a/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
new file mode 100644
index 000000000000..cc6d86b4b702
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.10.2-r1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.4"
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+	inherit git-r3
+else
+	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+	KEYWORDS="amd64 x86"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+COMMON_DEPEND="
+	app-crypt/qca:2[qt5(+),ssl]
+	>=dev-db/spatialite-4.2.0
+	dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/libzip:=
+	dev-libs/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtserialport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	media-gfx/exiv2:=
+	>=sci-libs/gdal-2.2.3:=[geos]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	>=sci-libs/proj-4.9.3:=
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( =sci-geosciences/grass-7*:= )
+	hdf5? ( sci-libs/hdf5:= )
+	mapserver? ( dev-libs/fcgi )
+	netcdf? ( sci-libs/netcdf:= )
+	opencl? ( virtual/opencl )
+	oracle? (
+		dev-db/oracle-instantclient:=
+		sci-libs/gdal:=[oracle]
+	)
+	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+	postgres? ( dev-db/postgresql:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
+	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
+	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=share/man/
+		-DQGIS_LIB_SUBDIR=$(get_libdir)
+		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+		-DQWT_INCLUDE_DIR=/usr/include/qwt6
+		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+		-DPEDANTIC=OFF
+		-DUSE_CCACHE=OFF
+		-DWITH_ANALYSIS=ON
+		-DWITH_APIDOC=OFF
+		-DWITH_GUI=ON
+		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS7=$(usex grass)
+		$(cmake_use_find_package hdf5 HDF5)
+		-DWITH_SERVER=$(usex mapserver)
+		$(cmake_use_find_package netcdf NetCDF)
+		-DUSE_OPENCL=$(usex opencl)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QUICK=$(usex qml)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/mime/packages
+	doins debian/qgis.xml
+
+	if use examples; then
+		docinto examples
+		dodoc -r "${WORKDIR}"/qgis_sample_data/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use python; then
+		python_optimize
+		python_optimize "${ED}"/usr/share/qgis/python
+	fi
+
+	if use grass; then
+		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+	fi
+}
+
+pkg_postinst() {
+	if use postgres; then
+		elog "If you don't intend to use an external PostGIS server"
+		elog "you should install:"
+		elog "   dev-db/postgis"
+	elif use python; then
+		elog "Support of PostgreSQL is disabled."
+		elog "But some installed python-plugins import the psycopg2 module."
+		elog "If you do not need these plugins just disable them"
+		elog "in the Plugins menu, else you need to set USE=\"postgres\""
+	fi
+
+	xdg_pkg_postinst
+}
diff --git a/sci-geosciences/qgis/qgis-3.10.2.ebuild b/sci-geosciences/qgis/qgis-3.10.2.ebuild
deleted file mode 100644
index 232d4a5b49c5..000000000000
--- a/sci-geosciences/qgis/qgis-3.10.2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	media-gfx/exiv2:=
-	>=sci-libs/gdal-2.2.3:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	>=sci-libs/proj-4.9.3:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_ANALYSIS=ON
-		-DWITH_APIDOC=OFF
-		-DWITH_GUI=ON
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(cmake_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
deleted file mode 100644
index ae1b97d37ba2..000000000000
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-	inherit git-r3
-else
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 x86"
-fi
-inherit cmake-utils desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtserialport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj:=
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( =sci-geosciences/grass-7*:= )
-	hdf5? ( sci-libs/hdf5:= )
-	mapserver? ( dev-libs/fcgi )
-	netcdf? ( sci-libs/netcdf:= )
-	opencl? ( virtual/opencl )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	"${FILESDIR}/${P}-qt-5.13.patch"
-	# TODO upstream
-	"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
-	"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \
-		-i CMakeLists.txt || die # TODO fixed in master
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=share/man/
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DPEDANTIC=OFF
-		-DUSE_CCACHE=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS7=$(usex grass)
-		$(cmake-utils_use_find_package hdf5 HDF5)
-		-DWITH_SERVER=$(usex mapserver)
-		$(cmake-utils_use_find_package netcdf NetCDF)
-		-DUSE_OPENCL=$(usex opencl)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QUICK=$(usex qml)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use python; then
-		python_optimize "${ED}"/usr/share/qgis/python
-	fi
-
-	if use grass; then
-		python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-
-	xdg_pkg_postinst
-}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 14ca3c37210b..74129055f6bb 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -73,22 +73,24 @@ COMMON_DEPEND="
 	postgres? ( dev-db/postgresql:= )
 	python? (
 		${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		>=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+			dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
+			dev-python/owslib[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+			dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
+			dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+			dev-python/requests[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			>=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
+			postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
+		')
 	)
 	qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
 	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 5b76d2385247..e57924fcc8ba 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,9 +1,5 @@
 AUX FindPROJ4.cmake 5695 BLAKE2B 916e3cb12a6dfb8428bfa97d74dc34b4b357935cc6be1e07444cbed86ace926348c0b94a0061cde1edd1ab0dfd330b57dabd7cc9be5317c761c307f61fce3c9a SHA512 d110ae4081ba75cdcee0feac9967a8f59218f12cd497a48434e6289a2fa1b04116a84582191ff45b8eda4af2dd4b6611b5035422af392653e3548e1829f2acd6
 AUX qmapshack-positioning.patch 482 BLAKE2B cb7d7b8f74a23828503c76e0cf3c7120af1aa412512461ae0e3e4a051ed7d8b89f9254a2397767b6ff56f1cbeefb1a6347f546222e991946dae3235da194d774 SHA512 245524903ec5db0da9d1874f0b5c0e2a318f6b955970da2645cff6dc1b21adb0565728021feca2cd236af9d2e60325e0bce1bb8084390d073200c5bad65d7175
-DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5
-DIST qmapshack-1.13.2.tar.gz 12725064 BLAKE2B fad8fdbb9fe1559823bcb835f64d88751c4f8593b8e1b213df17d5450c12eaf8c470241c1dde1299a555d698ddae1aee6cb66bee09baa6e3339513e65bacbb79 SHA512 0f2d260cb58e1cc995a05eda213d7c3ddd219cb5829164f406f928da5bbaf681d41743534f0354ba59786339ff193925d41ffddc5efa5dcf27fbbcbc070b98f3
 DIST qmapshack-1.14.0.tar.gz 12541988 BLAKE2B 146df8ab42bd5a5249207b88bf1a17b4ba20706c8114cc059b847d0b32c9d53919f931d778402a10dd62f0d86948bff8eefd29684c433c1d4bfd7e2ce019ce55 SHA512 675a72a79839ad0b96fc0717ad7eca43c4ce331645ba3ad1325f9bf114abcf2ecd164eeab0c41775fe84aa626fc67272cd9c869047f57b225ff493f66881ff99
-EBUILD qmapshack-1.12.0.ebuild 917 BLAKE2B ccad73881751fd4798d592def9b28fbbd3459045015bdd1a19f322d5a9bac452b370fe6d629eb5f894b7512d38481c0804de1819a429bca782e7cafba6eb5595 SHA512 e856b78e8fe4320e2134c7b0438ad467f609c2ad622b5bd4b8af41afa729c9323b1f5bab07ebe98b652d0fa133a338fe3e1d81f355257152f11ea0b43e25918d
-EBUILD qmapshack-1.13.2.ebuild 875 BLAKE2B 336d58ba60e3a0d30c68b3ba2579851c4aa19e13473fa9dd51686b0b4b2e084979347d2959feb6f78296a515349a991cdb290955b2332ff6c24d40337685b613 SHA512 6bbd42f14809b65b4a4c3ea902f8eba523ee450a32e533f1cf10a50c419cd10a348d1930271f524e21810a414564e9afdda05bfbeecfd58e3f7e0ac3740ad2c2
 EBUILD qmapshack-1.14.0.ebuild 908 BLAKE2B f9c544be44c80f5aa9186e3d0671419968e8db35dea918730de52a1e086d487a5326f1fc5ac3b133b684bf0bba9a6e9e6c87de093b2afe5aff192cff3adcd0be SHA512 5c10b51323cb326cc35e73774ce287866cef7794c324dbe3730590db1563c6fe4e7ed7cd5601bc907b012e92dcba864d05907b681bc4f83c73b9252c3fa02d9a
 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d
diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild
deleted file mode 100644
index 29267c1a3828..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils gnome2-utils
-
-DESCRIPTION="GPS mapping utility"
-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"
-IUSE=""
-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"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-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/qmapshack/qmapshack-1.13.2.ebuild b/sci-geosciences/qmapshack/qmapshack-1.13.2.ebuild
deleted file mode 100644
index 5d7932b589d2..000000000000
--- a/sci-geosciences/qmapshack/qmapshack-1.13.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="GPS mapping utility"
-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"
-IUSE=""
-RDEPEND="dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtpositioning: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-5.0.0
-	sci-libs/alglib"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=( "${FILESDIR}"/${PN}-positioning.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	cp "${FILESDIR}"/FindPROJ4.cmake cmake/Modules/ || die
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 7adab8525bd5..be1b8cf5e05a 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/blis/Manifest b/sci-libs/blis/Manifest
index 89a2de2a38f2..ee1669da0a77 100644
--- a/sci-libs/blis/Manifest
+++ b/sci-libs/blis/Manifest
@@ -7,6 +7,6 @@ AUX blis-0.6.0-rpath.patch 384 BLAKE2B f5a0390384d30d2929fcb5ff22424770dc3b6a4b9
 AUX cblas.lds 205 BLAKE2B ab2c41b571dbb9b55e36fa5afe4344ed9ef33454f6b7a5cda0726aa7f98a61dcef3065976cc02ab593aad94c5d6c0a23efce726da30673bd06cf57b64e826b93 SHA512 23008248e2b2c221a9ce36c2aca3e2acf58a6d434ffde498a058689af5d16d6e87ab56900508bb0403c5f5a1fc9366b202a7fc44a42d04c409197ec1ec164408
 DIST blis-0.5.2.tar.gz 3502383 BLAKE2B b09fda20711086c8bde0d4efc3f3c9b0f6072e1ddb8bd2846465877f0353cced27548abe1239b6a042fe655e85e4b7b3c960322e39b2c733866b8e17777718bd SHA512 4f91a7834ef0ed39544dd21856814467416a222240050cca323917b0fc61b9201ae4dbd109aa687cdecb27ddee5d6bf4510ef023e1c1dc73599faef0482d3d04
 DIST blis-0.6.0.tar.gz 5107257 BLAKE2B cd589ad1216486e8bb0cf574cc096c1e1f2bb9587b182c2bcff44db322468d9f027323c0bf2d22ea0fabb1902dc047d2bf62253ef1c2797fc3de9ba53d7fc34a SHA512 74e9da5146f7986cbd11651d7cd0837562a1603c667b9e6d3f79b5057443de657b60d7463cb2d64daf3eff7d33fc05a64e6d8eb807f4cabe0c3121517924a206
-EBUILD blis-0.5.2.ebuild 2732 BLAKE2B d02c1b1706301ea0de2d58bb9b8e485d432ad8f413fd1aaf1400f3bacaad0491c56a91e7c618e07ebb10d4a5bdb7449ab91248a314cba43a62ff705ad40cc960 SHA512 d0d1138f84124f44235520a38d6f9783a3aa53cfe696f82e534ede6068d8d4cc462efce7cbab5ce7fea6deaeba4127bbfe4959567b2bbcc433557c31324e97a9
-EBUILD blis-0.6.0.ebuild 2690 BLAKE2B 571b826c4beabb96fcea6ece9613c32c5863019d8e514b57f1eeab96b26cee284cbc4fb40fc824dbe801a66106068c7a89e82f723a00eb37fcd14d0eb9f23c30 SHA512 6bad168fc042c7be83e5760044557273f82251e5b1dc52b02260c535354817492e800deb69ad23a3cde7f2204c902d7c98a79f2ecc92a3c7d498d7646c9a22bf
+EBUILD blis-0.5.2.ebuild 2726 BLAKE2B 91b78a40e1fbce2747344fb7b2572d362c9c6129b04bda20312b0995b52eab1dccfdf9e8034f5c51c5363c52dee95b520c0862d7632fc3f9d61e3b69b80b8eb5 SHA512 62229813425490f8418104edca97575703f61eb6c6bd832da0ee7b2e5df68f431d7bd0ebc1cbe63ff349eb52822f6262d5224dc0df256df5d7cf7e874e9a6e4f
+EBUILD blis-0.6.0.ebuild 2684 BLAKE2B b9ca8227931e7027877312c4dee8e04fae58297b2d527b5a281e8cf8ee9e604820daebff37469028148d00e55e5d80799778701dc6e7bb33f2f1be1c115bf9e9 SHA512 8173d8d5501ee80f23b89221e75ad62b28d10877c1b6e5f58876a1c1b0c869e8bafa99e0a205148f3e1bb9693c4b9ce1a0420a136ff333f66f869cdf6d9fbce4
 MISC metadata.xml 1608 BLAKE2B c8026b4a933bd7f14e7c446ea5d4bda580532252e52194b058d97daaa38969c661d5dbd86d230f44d2c77d52798962ca2953b1d88490fe284629777e763a5ee7 SHA512 b7ce333449f22acb746fed9913850e226e2e6bd6573537996f43f402b055f20b5ca5fe511eda8aa220939dd8194937eb65e8bec34bf61280ddf90722563ab037
diff --git a/sci-libs/blis/blis-0.5.2.ebuild b/sci-libs/blis/blis-0.5.2.ebuild
index 2ac88177874b..da1dc245a04b 100644
--- a/sci-libs/blis/blis-0.5.2.ebuild
+++ b/sci-libs/blis/blis-0.5.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-any-r1
 
 DESCRIPTION="BLAS-like Library Instantiation Software Framework"
diff --git a/sci-libs/blis/blis-0.6.0.ebuild b/sci-libs/blis/blis-0.6.0.ebuild
index 7c50cdadba05..15eff4fa7163 100644
--- a/sci-libs/blis/blis-0.6.0.ebuild
+++ b/sci-libs/blis/blis-0.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-any-r1
 
 DESCRIPTION="BLAS-like Library Instantiation Software Framework"
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 55f1808c5249..3d7ffd132bd4 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -2,6 +2,6 @@ AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df
 AUX cantera_2.4.0_env_python_install.patch 1001 BLAKE2B bfe6e69332117526d8a7c330ae9610e26e72a9e250ce04beda564149fbd21f3262f36982971e5ec0c552e09f12804172b7f978ab03bfb98c0dbe92cd8c7d9401 SHA512 410a81b4ec69eb6eb2a60d55d142b266b836da5a7d4e4ae2fd8844fb87eff0f3544f6e370fc354d334c6cd5a61f8364842c8a9b3bd0dc2290f58ee7392a170f4
 AUX cantera_2.4.0_sundials4.patch 7498 BLAKE2B 8a3fa5ff6a07987bf4d35f0c6362e91414be513a79150526773f8a141271ffe772efbbb7765fc888043ccc2326e89f51a14f2eaf40765c1d05d5987abf5942fe SHA512 0ec9d7f0a0818262ebf2d694800fd6f5a438ef9a501c122ffebe703271cbfd50cc8db20fa28f9674e5740f768df9f3e5fec010c46703c01e4bfff7aea0a4c948
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
-EBUILD cantera-2.4.0-r1.ebuild 2853 BLAKE2B e3d82310324f9d2fceef870afd681a6f5a9da6c2b56519e6cd5178955601c8b0d135e9f7c9ca3d446cd47a60f30c47e72cae689e0ff9d500081e26722a700796 SHA512 06682c35592aa9f89c9fe26dcb3a1730a2e18a2ecca32acb9138198b9b7eb9a76e9dbd24c1dfb6e2723eefe17872a6c9fc1b7d07cedbbcb9b57e7fc43b58c7f6
-EBUILD cantera-2.4.0-r2.ebuild 2952 BLAKE2B 1fda0f1671adf6ee5122d3f38e7d89136ab05a052a95c57f0288266e1d8e08ba499465f27c032295476e89d0dbe6fe5d131024da1703ddcea0d2b44c7593c639 SHA512 545d7c5509d29bfcaec47be5e48c6f1189fff02da79f1c580907f9d6bb8f86b8b20fb1b0af1129b113d9b030eae4f22f85bd0d8343a7856f0e82a6f6c36499f6
+EBUILD cantera-2.4.0-r1.ebuild 2929 BLAKE2B 57eb719f155c1c58024283cea0fd7a667888ce1749be056a644e80f466ac7ed66c854277ae67681a19f6d374ede9a3fb4394f80f4d5802bab77bc28e41807223 SHA512 f1d88be5b54a480735ae55da4a05267c3890abaa80776124234bb5dcb8dd539e6df9d3cf8dd29a1577f9008cc57581e0f6a575b14d1c432599e72f93cbd6967b
+EBUILD cantera-2.4.0-r3.ebuild 3028 BLAKE2B b0dc19d0a64b9a0edb6252c4d636cbe887ebed47ac584b2d9ca03d77b716c2abc5ef43b287f4f260f472a5d6fe3fe593c4f1fe5f4992e0150975aa1a6cde6c39 SHA512 d0d34ffdba44455932fd89e2ba45f06c6f9bd4ecf4b490bb81ca7ed2c1ba726392b4d89c44181bbafccd949da514156cdb57b07d285b9a1e4ab945ffe0e5e959
 MISC metadata.xml 794 BLAKE2B 4a92fb553aad7d87d4b7a8d77974dbd67d593b4010783f96324979d9c01067bccc60d2faedf604bd8d44a8ac4316356879301899af8bc08d0fcd548df6d3762d SHA512 a9e6f4e161519d0b3618fe8da7065195bc760ba889fa4356358d4047ea1970eb5fd78bdc5fbeb7c660f1bee48a68ab20ced636514e6f12848e88f6f4dabc9705
diff --git a/sci-libs/cantera/cantera-2.4.0-r1.ebuild b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
index edaded328a20..cd27ff27f637 100644
--- a/sci-libs/cantera/cantera-2.4.0-r1.ebuild
+++ b/sci-libs/cantera/cantera-2.4.0-r1.ebuild
@@ -28,7 +28,9 @@ REQUIRED_USE="
 RDEPEND="
 	${PYTHON_DEPS}
 	python? (
-		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	<sci-libs/sundials-4.0.0:0=
 "
@@ -39,7 +41,9 @@ DEPEND="
 	dev-libs/boost
 	dev-libs/libfmt
 	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
 	)
 	test? (
 		>=dev-cpp/gtest-1.8.0
diff --git a/sci-libs/cantera/cantera-2.4.0-r2.ebuild b/sci-libs/cantera/cantera-2.4.0-r2.ebuild
deleted file mode 100644
index f82bfa086396..000000000000
--- a/sci-libs/cantera/cantera-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="https://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-	"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	python? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	<sci-libs/sundials-5.1.0:0=
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}_${PV}_env.patch"
-	"${FILESDIR}/${PN}_${PV}_env_python_install.patch"
-	"${FILESDIR}/${PN}_${PV}_sundials4.patch"
-	)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-
-src_configure() {
-	scons_vars=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
-		debug="no"
-		FORTRAN="$(tc-getFC)"
-		FORTRANFLAGS="${CXXFLAGS}"
-		optimize_flags="-Wno-inline"
-		renamed_shared_libraries="no"
-		use_pch=$(usex pch)
-## In some cases other order can break the detection of right location of Boost: ##
-		system_fmt="y"
-		system_sundials="y"
-		system_eigen="y"
-		env_vars="all"
-		extra_inc_dirs="/usr/include/eigen3"
-	)
-	use test || scons_vars+=( googletest="none" )
-
-	scons_targets=(
-		f90_interface=$(usex fortran y n)
-		python2_package="none"
-	)
-
-	if use cti ; then
-		local scons_python=$(usex python full minimal)
-		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
-	else
-		scons_targets+=( python3_package="none" )
-	fi
-}
-
-src_compile() {
-	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
-	escons test
-}
-
-src_install() {
-	escons install stage_dir="${D}" libdirname="$(get_libdir)"
-	if ! use cti ; then
-		rm -r "${D}/usr/share/man" || die "Can't remove man files."
-	else
-		# Run the byte-compile of modules
-		python_optimize "${D}/$(python_get_sitedir)/${PN}"
-	fi
-}
-
-pkg_postinst() {
-	if use cti && ! use python ; then
-		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
-		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
-	fi
-
-	local post_msg=$(usex fortran "and Fortran " "")
-	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
-	if use python ; then
-		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
-	fi
-}
diff --git a/sci-libs/cantera/cantera-2.4.0-r3.ebuild b/sci-libs/cantera/cantera-2.4.0-r3.ebuild
new file mode 100644
index 000000000000..29345e36058c
--- /dev/null
+++ b/sci-libs/cantera/cantera-2.4.0-r3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
+HOMEPAGE="https://www.cantera.org"
+SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="+cti fortran pch +python test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( cti )
+	${PYTHON_REQUIRED_USE}
+	"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	<sci-libs/sundials-5.1.0:0=
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-cpp/eigen:3
+	dev-libs/boost
+	dev-libs/libfmt
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	test? (
+		>=dev-cpp/gtest-1.8.0
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}_${PV}_env.patch"
+	"${FILESDIR}/${PN}_${PV}_env_python_install.patch"
+	"${FILESDIR}/${PN}_${PV}_sundials4.patch"
+	)
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+## Full list of configuration options of Cantera is presented here:
+## http://cantera.org/docs/sphinx/html/compiling/config-options.html
+
+src_configure() {
+	scons_vars=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		cc_flags="${CXXFLAGS}"
+		cxx_flags="-std=c++11"
+		debug="no"
+		FORTRAN="$(tc-getFC)"
+		FORTRANFLAGS="${CXXFLAGS}"
+		optimize_flags="-Wno-inline"
+		renamed_shared_libraries="no"
+		use_pch=$(usex pch)
+## In some cases other order can break the detection of right location of Boost: ##
+		system_fmt="y"
+		system_sundials="y"
+		system_eigen="y"
+		env_vars="all"
+		extra_inc_dirs="/usr/include/eigen3"
+	)
+	use test || scons_vars+=( googletest="none" )
+
+	scons_targets=(
+		f90_interface=$(usex fortran y n)
+		python2_package="none"
+	)
+
+	if use cti ; then
+		local scons_python=$(usex python full minimal)
+		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
+	else
+		scons_targets+=( python3_package="none" )
+	fi
+}
+
+src_compile() {
+	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
+}
+
+src_test() {
+	escons test
+}
+
+src_install() {
+	escons install stage_dir="${D}" libdirname="$(get_libdir)"
+	if ! use cti ; then
+		rm -r "${D}/usr/share/man" || die "Can't remove man files."
+	else
+		# Run the byte-compile of modules
+		python_optimize "${D}/$(python_get_sitedir)/${PN}"
+	fi
+}
+
+pkg_postinst() {
+	if use cti && ! use python ; then
+		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
+		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
+	fi
+
+	local post_msg=$(usex fortran "and Fortran " "")
+	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
+
+	if use python ; then
+		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
+	fi
+}
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index 61b7ad2ca3a7..022df791ecac 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -1,5 +1,5 @@
 DIST ceres-solver-1.11.0.tar.gz 3944965 BLAKE2B cafae018abde9b8085f7e8841a6a720ef52cd40178a43c3050b6b20465bc9675cc326a6bc405572a235758c5f2f99e936375f711bf5c4b121acfe0c0641713c6 SHA512 4941538e6ec31e2ee56a24446748dc5d6dd02ba9c151e4320a2db943fd1a377455b0ee23d56780e1f05322b30e25057145c540fde901d7fd2244ec630a73527c
 DIST ceres-solver-1.12.0.tar.gz 5008861 BLAKE2B 52b3954dde96386bd031543ab9d7370368f58f76f1dec9d24ef10803da787cc96f40a1c775626fde832b70ebd94cf4274c70a8fb4bd7e1bcf040e119cbec09f8 SHA512 485eece0471cf05d31b5dd7e133e23115a334a4ed557a3c1bd0b715a063f840738af8f507e935522a0dae90ce6851984c0002a25e9b445b90889792f68a05571
 EBUILD ceres-solver-1.11.0.ebuild 2412 BLAKE2B f4aec1265ab4534a65b768e4b4da9546e8ef4fb68b918488e57ab494c3f0b30d179dba1dc68d9c45630396a66ef535f8936b31c68962530360337f2c1c48b469 SHA512 a15c6ef0f7d97ef7515180b085979efb7c55327038cf380101bc7e856cf660c2f60d3d869470bd63f38fe82b6a719857828da60ddacf06b18b6eedb9482cb1ec
-EBUILD ceres-solver-1.12.0.ebuild 2428 BLAKE2B d84c0f0b172a4e3311c806bccc4874a34f05231f61f5948bef766fb26d84b0428c609d807ff6417334fd21db74ba2e971b355891f496676575cd15cde94fbb05 SHA512 29259316f073da03ec859783dde0d3d20346a931f5dc1493b68d2073cc8b1c552f8a6e7e36b86d05963069208e043e63643dff120ee36401ea036a10650197c6
+EBUILD ceres-solver-1.12.0.ebuild 2418 BLAKE2B 08e50a9f5a09647f01ad930fb70e32773dc7a5c12b4e7bd8c53f3f6f18011500a0ddbccf3e0f3aedaf823bd49f7042c201cdb2ce5d0346d66127296223d6372d SHA512 c2b4b9f8d4753fc7dcf46044e7ca4a285f0a8e27cc2b6737229884b8ff8715530eca5c6a5dfb28e396235083bd2e66c01c738899fc0755fef64d54a3f2f0bb24
 MISC metadata.xml 1525 BLAKE2B 46de33a7fa6513877e2427442e918d8e39871a6b6b8a15a18d14dcedd55c42bfb1bdeab7e1cc57c0ac03ba06d5c3628dd666b6f0787eac5c9dc75785e2a9e471 SHA512 4c95aef23ce327f9cd11b53638e1b6485eb789cd296ad8a571278b65c9001465f56c97b97db6e2c4a4ed76336f0e33684958adef593d74193cb73930e7ea5ad2
diff --git a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
index 175e6a1cec4b..8bef6c01db95 100644
--- a/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
+++ b/sci-libs/ceres-solver/ceres-solver-1.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-multilib eutils python-any-r1 toolchain-funcs
 
diff --git a/sci-libs/clblas/Manifest b/sci-libs/clblas/Manifest
index 643f9a67796a..e52e6cd3c2d3 100644
--- a/sci-libs/clblas/Manifest
+++ b/sci-libs/clblas/Manifest
@@ -5,5 +5,5 @@ AUX clblas-2.10-fix-pthread-linkage.patch 684 BLAKE2B 6f50b130f57a3a36a202c516bd
 AUX clblas-2.10-use-boost-dynamic-libs.patch 579 BLAKE2B bd7d7913b72baf15dd733a75050a5981c369fd42ea9c4ad2e6edcc084d52476b65a0b7269ce6c6083fc8fd86c2e2df0716cf0db9a645918c55b52e23165aebd1 SHA512 a07163684bcf69dba8c2df69d120a25ca7186104d40c27bf4d0267a21320460f3585d3fb1fb132df5cc5a1bca2905623c0285bffceb125c1f7d89129a3cc4f65
 AUX clblas-2.10-use-system-mathjax.patch 765 BLAKE2B ced4d5efddcaae15a5844bb2b2cdf32f03f117d394ee9daeffa5c4f0bc10310e7898a2c305774970263cc9e1d3d7e247d23cf477dea906d64af45395d6770807 SHA512 156a0a664bbab80a17f3032c759656769eee36db0a93e4fd4a983eb584ef56d2023aef37b565c8cf81adb507f00f6b83ca9d31ace66c620f2279ca82aa512744
 DIST clblas-2.10.tar.gz 1154117 BLAKE2B 67035b03ab3a8fa07f32cb8d1d40af39fd885ceb21d9754f8a49a62adcfacbeeec703dfdae922ec0fc915a2dcadff2fc2f07a6c5ced74db3da6cd85c6c63f4d5 SHA512 5ed43104aae565292e0df4cc9e014cf483ccc0ff89257ebb5817f6508bfc9593585ed658da639f2167fbfb5d92ef116be4d5de3694f56e1a1e228bd42b1c05c6
-EBUILD clblas-2.10.ebuild 2380 BLAKE2B 066cfe1abfcaeb46614a681af8fb5ce2773e983a930ebb60deb003cc556e2bd80e0c8146bdbc3cb5b14fc58cd2ab04caff4c801926e4f21be2d5b9a8e4e301f0 SHA512 feeacce5e8c8eb9b254ba850a524fbe66bf947b6db4d22a6bf82adeab33fad86e1c37b9bebd9e0387ba74f68c176eede25444d1ffab8a7cb6944831d2be75534
+EBUILD clblas-2.10.ebuild 2374 BLAKE2B 87793a3a270e7079eca8c29429395b3f6f9ad1312fc8dd13af70b05842673852d2a4a0c139aecbf161a8e35a10937f64fe75cc448287f6eb5412309c3b9bb29b SHA512 051e69dc0fc3b07936d1e3ff3040440d97e53451e05f39ed104512ec4296041b1320f2d589b6b41aaab704e358a4e4d32a49bbafa73a30f388146b99b0d4f66a
 MISC metadata.xml 1029 BLAKE2B 9f21ddf2d9d08fccdf4f40c7324feaa5dc003a8ee0abe35f6158e3d9f507edb593f89216802ea04192486615ef5effb9ce5d70d42d4da5000c246be4db5c4e48 SHA512 62e2f6461060977e68d8f175f40d8de1801f5c4f635e33817ffb04dba9b8a19747bcd99206972e21b8780f5f0499290ff8b0d46bf5bdc1463659a8dd5cebb483
diff --git a/sci-libs/clblas/clblas-2.10.ebuild b/sci-libs/clblas/clblas-2.10.ebuild
index 3211a5ab13e0..112150552dc8 100644
--- a/sci-libs/clblas/clblas-2.10.ebuild
+++ b/sci-libs/clblas/clblas-2.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 FORTRAN_NEEDED=test
 
 inherit cmake-utils python-single-r1 toolchain-funcs fortran-2
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index cc3c551cdb12..8fd97e2ff8b7 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -13,6 +13,6 @@ DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a537148
 DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
 DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
 EBUILD gdal-2.4.1-r1.ebuild 8176 BLAKE2B 0ccaedec2cdd24e0b572483595445ade24d1dada60540137840d4e6947d238ff675dff191aaa6dbb569736721d71f297cb2c7cfcec709a872194f07313dfedd8 SHA512 f8642e106d247e8e5ba7b8d89fbad81cb767655fd6ebcb1ae6f0cabb8b75de83d48108c37d9805cc040861288cb696843dc0e609eff1cea7c0c55f3f769f1b19
-EBUILD gdal-2.4.3.ebuild 8091 BLAKE2B a77324f0c7ae3a4d36239af63ab15a366f9969e1b590c3c5d9e37fbe4b9419c4e6c1bab0b284c9932b2b73570d77e07f01f29d27d46d7eabe80a477144d41145 SHA512 18f4314bc98dd44b1b42e863334b6049f2520d6cfed2ad7612efe8562211f927bc33a8f6a9a2bbbc07a8cffa0ced25cb235ff17ea61d46c86c5832c2de0cae9b
+EBUILD gdal-2.4.3.ebuild 8090 BLAKE2B 67afb5d2471e6c10ac1e76d3dfd352f27e58f232531272b5f8ee3008b6191d7e4b3b1930bf6b0e0c676a96ed60c942b91ece9f7f9c738c378e98f5b7c85f8d3c SHA512 2786af2efab67820db7ebadc6bbccff701a278efd351277831e85a36359f154862f8237bfd27990ee2eb3dd274903c7218d56f98d582b569e881fc40b48b0fc9
 EBUILD gdal-3.0.4.ebuild 7310 BLAKE2B 5507f941cdb6bab04d9d70766fb70f806506bccd71ca13965d3c1b4af007e0d30ad9b9e836297df979a11df161b1580d1f4bff505b4424e04456ca88e9b8a522 SHA512 5dbac49df9b665e3defd56e664f48b429729489b054cd8443388adbeefc689870f095760b50d3417c879d5a2a606bd70a1847e42adcdf2f8c34d58821114449b
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/gdal-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
index b5307ac8396f..b1cd05478bd4 100644
--- a/sci-libs/gdal/gdal-2.4.3.ebuild
+++ b/sci-libs/gdal/gdal-2.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux-xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/getdata/Manifest b/sci-libs/getdata/Manifest
index 9c848458cfea..ee90b4b0da26 100644
--- a/sci-libs/getdata/Manifest
+++ b/sci-libs/getdata/Manifest
@@ -1,4 +1,4 @@
 AUX getdata-0.9.0-remove-python-test.patch 257 BLAKE2B bc60176d361d2cb891742c0ee8b443d0cb5c1350478bec1047e56d6a38b50021096ad8bab6ed4b1205744785f002227b22a80a4ab888c4bd52d517de8503e12b SHA512 7a8b5e8e1f2164fca9caba81c7b24f705c6caac036f8f2a3c6dd436961311e4dc34aa6a669eb0bd9e50fb50c09a8b22d32fe04961085c983a29da00e438cbc7c
 DIST getdata-0.9.0.tar.xz 920652 BLAKE2B d5f0659474dfab9f4e589a28a7788b5a51de3c0064b58de37bdb11dad27b56daa05d8e705da743c5da271bd8c4e1343ac6ac41adfdfabfcaef0006e46c45d2bf SHA512 28d720141e34cc56a5166594d0a6ac293144d123706988ed170e40dd9d7aaf13b920305e8bd8343ecd7cbe43eee5d83720e3e5f5d2da0cdccdc1444725cc6844
-EBUILD getdata-0.9.0-r2.ebuild 1566 BLAKE2B ef80ee67141b2fd5be341ac23426d4568bb2bece6b1f66b962bad6655afa0d82644b28a89be6a40c8823938fd0364d62df11e486846ec823b51fb94dae32d156 SHA512 06a261916043012214ff5fb3abb9a3eac9e320505bc46f66310269c5915992853f77655ab8764c1bfff9050e0467038c4b9f4078bda9eb5562e60dd2141bd610
+EBUILD getdata-0.9.0-r3.ebuild 1613 BLAKE2B 7738268858cc9abd3c80db846b51cfc4cbec53e64ee488b9ac4d311d86b1dc3c6224f43719112f1146606e46071dc5a811ab349a81a0dca72e6e508accaa1369 SHA512 93e0da9b1b37b71bd321b3d5ef120a1b6dfcbc786290c9669089d8325e1f0f62e4bdc963d1cbc5b3dd4d9640b2436fadf1e403197bbf87f8ed72d7eb9bcac1aa
 MISC metadata.xml 660 BLAKE2B 74c050abc2e0978cc5c7d16625a6858f9a0a22d9c4ce4fbf0c303cb3361ef460d5d50d09845e5c8b9be82a73b22e9d159a554fec12f5dd7058602c99b7b5073d SHA512 d821e374438aad1beb22199383ebbc8a48247867b08370f08c370e02d7abaf7273a62e750a9ed3befc5e9674489a2a8e56453a6dad09a363a514986a79eb7460
diff --git a/sci-libs/getdata/getdata-0.9.0-r2.ebuild b/sci-libs/getdata/getdata-0.9.0-r2.ebuild
deleted file mode 100644
index 65085d535e5b..000000000000
--- a/sci-libs/getdata/getdata-0.9.0-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_STANDARD="95"
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python2_7 )
-inherit autotools fortran-2 python-single-r1
-
-DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
-HOMEPAGE="http://getdata.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 cxx debug flac fortran lzma perl python static-libs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl )
-	python? (
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-		${PYTHON_DEPS}
-	)"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-remove-python-test.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-idl \
-		--disable-matlab \
-		--disable-php \
-		--with-libz \
-		--without-libslim \
-		--without-libzzip \
-		$(use_with bzip2 libbz2) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable debug) \
-		$(use_with flac libFLAC) \
-		$(use_enable fortran) \
-		$(use_enable fortran fortran95) \
-		$(use_with lzma liblzma) \
-		$(use_enable perl) \
-		$(usex perl --with-perl-dir=vendor) \
-		$(use_enable python) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sci-libs/getdata/getdata-0.9.0-r3.ebuild b/sci-libs/getdata/getdata-0.9.0-r3.ebuild
new file mode 100644
index 000000000000..bb727d3bea89
--- /dev/null
+++ b/sci-libs/getdata/getdata-0.9.0-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_STANDARD="95"
+FORTRAN_NEEDED=fortran
+PYTHON_COMPAT=( python2_7 )
+inherit autotools fortran-2 python-single-r1
+
+DESCRIPTION="Reference implementation of the Dirfile, format for time-ordered binary data"
+HOMEPAGE="http://getdata.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 cxx debug flac fortran lzma perl python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	perl? ( dev-lang/perl )
+	python? (
+		$(python_gen_cond_dep '
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		')
+		${PYTHON_DEPS}
+	)"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-remove-python-test.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-idl \
+		--disable-matlab \
+		--disable-php \
+		--with-libz \
+		--without-libslim \
+		--without-libzzip \
+		$(use_with bzip2 libbz2) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable debug) \
+		$(use_with flac libFLAC) \
+		$(use_enable fortran) \
+		$(use_enable fortran fortran95) \
+		$(use_with lzma liblzma) \
+		$(use_enable perl) \
+		$(usex perl --with-perl-dir=vendor) \
+		$(use_enable python) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 3e87a83e791b..d7ab59f72b51 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -3,5 +3,5 @@ DIST indilib-1.8.2.tar.gz 2049051 BLAKE2B 66f85d84bf4e1eae003cb13d8b400055590763
 DIST indilib-1.8.3.tar.gz 2062250 BLAKE2B f46b557dfbbe16070605ad638111505577b801ac6abc2cf42df3a322eaec35a25e6f8efe3ea740b5758b3aeadd656efb4b98e284d531621ab34ca00f28e39a2e SHA512 09c23299659efea795ec430566a5b51181878c382c72f1e530ef3abe3b996b670506f6f5f1bca4eb88fbdc756854c3a36d8bd646a2cf13e397e09ace1f1af044
 EBUILD indilib-1.7.5.ebuild 1120 BLAKE2B 70e19ee186e7b74d01430d4fafd2fb15d3850666b519051fa2ab97612fd01180b39e5c37d697d8d2508166ad769b41422f9d4e7e7f0789c1059641d5ee77e40d SHA512 f33e4268c4837c2df6b64bb79abd11479001e9fd9abde0c5357751a014522b37d48878a8f72628e56915487c72b7805ab7c5dd01f61a21c47407a4cda8a00a27
 EBUILD indilib-1.8.2-r2.ebuild 1181 BLAKE2B 22ec0b8f27a1a69809e0a18c81b8905c0085ddd86cce2302c3c39e49da82da0ab5dec0c02ad9ccc1bbb5cedbcb0c3022f17fe1f04587cae66e16d95ccb5f89fe SHA512 11c5cfe17a1897a43b716825137e41f79f794d3aad866676dde9ee40e0ace9ef13c428fa1a5bfda14eaff0a841bd3020c194555018569a51c606f9aa653e0c71
-EBUILD indilib-1.8.3.ebuild 1182 BLAKE2B 72992e4b51b92d044bb0d95ee05d5e9ee23c8cd5bc375df999b5166e5a6241150545cd6ed1de5281833a6218ed3ece509d9e907b1d439016d4d15f4d68578643 SHA512 a5a3f070a4cb27c38108b7adb2a58652d470e0d1880fd4a4381eca74ea0e4d08f8917604748cc5c7de37fd551a18f7bfec2904b58c6132c90b883678b6090a8d
+EBUILD indilib-1.8.3.ebuild 1181 BLAKE2B 2e7b4692d38f7f2877974f54a90ee15cb878b2974c1347de461aab088ad284e57c59b862ea5a0db8d324e812b3d2a1c76ce9bcc625e72b3a6de3c11fe34d7c72 SHA512 35da3dc46e0ed2ef842b167e842801cc1437b1f9f752f22f3ad312366f06a42c271b32358443940290de963978c3f87a2cb81f9fdf5bd9d2528a6bef55a7a31f
 MISC metadata.xml 460 BLAKE2B b6ebdd49fefcbbb015e5856f0ad42682b5eda153b38b3d64f949d2c41274df269f292f25d5eb3be37a7acb039bab2d3d3b7744cfe7959472fe03425b53bd4282 SHA512 ff04501f56765165645695dda25db6bff677a6f676d3fa1d005ec0bc6fae7413e0fdd87d800b321fdd7a98f1d0cc829daa5a3d4d3bff849b6e164a5768c79c84
diff --git a/sci-libs/indilib/indilib-1.8.3.ebuild b/sci-libs/indilib/indilib-1.8.3.ebuild
index c0ffca05006a..1efeceadfe82 100644
--- a/sci-libs/indilib/indilib-1.8.3.ebuild
+++ b/sci-libs/indilib/indilib-1.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="ogg test websocket"
 
 RDEPEND="
diff --git a/sci-libs/lapack/Manifest b/sci-libs/lapack/Manifest
index e3b586001aa3..f1562220ad3e 100644
--- a/sci-libs/lapack/Manifest
+++ b/sci-libs/lapack/Manifest
@@ -1,3 +1,3 @@
 DIST lapack-3.8.0.tar.gz 7426094 BLAKE2B 27cd75eea498250382b2df6f5d7dc95fdee8d37b1a0faba5296ca0145ec40a1165a4ecc727aa1647086be6783b50cf475f79cea0f30f541da789051db99b2f37 SHA512 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
-EBUILD lapack-3.8.0.ebuild 3005 BLAKE2B f72bbb2310b5d7397139647952cc082ac330307e8b76b669fc3b1591da7352ca510aa2b3cf142368d4b408537de3845c697c7f4d248fdc1c14dcafb8368d8629 SHA512 b914e3ecbf24f29576b3c0f1bcccfb7028781c7b5718db86454787ff9ab84f65ffedfe3fe632283f2db3a19fc136ffc42db79f4b3a324223c382733416d3b990
+EBUILD lapack-3.8.0.ebuild 2963 BLAKE2B ef36b1d1f199b39716e5e27acd4d78039bd0b001d6355b3754dea20163b3f8da358aedfdc55621de8470e200c62601a14a26ae1b4866f6f91dd6b1c10361f95f SHA512 1f2a771d26b1f566f38a01ab75224516ec71fdedcd702c4828d57dae1b90905a3c3ece030eb191af753a2086caf60ca41fe6b8ebc3d5f0ace00c4aa59ac74aa5
 MISC metadata.xml 1423 BLAKE2B 2ec6d7c07c4827cca666cddb7e7b2e47238ff3fd40fd5e15463196812a7a82e0b85e5d36ae2a2c3315c3b4e0b5f3d4a79a953cb1703836b20dc14862956bcf29 SHA512 39a5e8738999caaf00b4f7fcdb3afdd1405a7c817920b9247a76dbc64e06f8c2011763031a058673ac8a411cad2219cbd7c8664d379535e2afea72d2bd578fbe
diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild
index 8ad78cf13254..3c90d0068c8b 100644
--- a/sci-libs/lapack/lapack-3.8.0.ebuild
+++ b/sci-libs/lapack/lapack-3.8.0.ebuild
@@ -32,7 +32,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DCBLAS=ON
 		-DLAPACKE=$(usex lapacke)
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
 		-DBUILD_SHARED_LIBS=ON
 	)
 	cmake-utils_src_configure
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index 5a5d31b8c12c..ceeb4e5429b9 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -5,8 +5,8 @@ DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183
 DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
 EBUILD libsigrok-0.3.0.ebuild 1724 BLAKE2B 1c426bf94a8f83078ea74d094c8c43ce044ac6fe6c94548f47a15c203cc06295de43b6e72d97cffcb4a7a0ec11fecda611217e5d04541ec108f0a4d647773838 SHA512 e6ff926a3e3b0b4e753969c734603d934844c3099a3ba6eb6b81b5e938fa3e113014d46b1ce2cff977940a2099920d30e41f9a3bad5eea4ba41454196f801829
-EBUILD libsigrok-0.4.0.ebuild 2127 BLAKE2B d28aace671a55a8d7768000a60b44138cb544040326f13ddecca73a202c4762121d84edea1e4fca6fedb4da3c173f2cb9bcb0754bd390e977d473b11ac110984 SHA512 6cc9462fb911834725191f5e50d91ed2fe960a76cff80d273e675bad47709eb47b033d97c3622bf379156a76e9ee93f9d932cc1b61dc847c129524cfcf682e66
-EBUILD libsigrok-0.5.1.ebuild 2357 BLAKE2B a27237212510729f4860e4d33ba5cfa8a6b6c2fc802adaec0e0875bdb617d1aaf08b3769f9959ab8fedd2848b7d3d84256d24f0d0c4d55725e9674f370c505ae SHA512 bbbcbb78bcd1d7d0e822babdeba4ee772f0cb228104d5cf1c931b88bbdf29c89119dca064e4d0fedc24238e4f52904bac1a1e19719748a6ba662b093e3d69fda
+EBUILD libsigrok-0.4.0.ebuild 2215 BLAKE2B b5bb79ab807a3200cf285bc14a7662a375df98d41b03d04280e4bc543e9b6897366c140873a06cf584a38af8f2a9c20e8641a607e2dab001c4094a6a964f2c83 SHA512 92c4d90312c108f2851567564324f7f63b2f9aaa90db6393eea3c92be1401a0ae03687ed8e291d7e40ad4cfe44b314cb2abc4041fbc0d66c07f34c43cccbf1a5
+EBUILD libsigrok-0.5.1.ebuild 2445 BLAKE2B 721c22b8b51eaba8d46604916e889532da671c10dfc30123fda693c4918433e43148fe89e57ab0f24500950f29e672ad036263f211534428263693e5370416a9 SHA512 9e2b6308185b3a3dd5c3cacf62c514e109ffd32c5930fee2f307cbbb27cbb3d0ba083c71180b71d27d9793fd23f58dc79b11a3f96925df547c5a6e5c4fbc4d0c
 EBUILD libsigrok-0.5.2.ebuild 3635 BLAKE2B 5637df8ea689134f99932323b0d5fd263bf8396d953bf66854861376b43092fbbf9c1f7c007170085526080fb5db2e5c6faa4b41db7f705ecf33ed162a360806 SHA512 da7090c8e11ff3b3a93d783e2606523e9af44861f4a046bc3fa59049626a3452d906a7adb898608d290f5e1647b13cc7d2515baeae31295b134b8f001166e4ba
 EBUILD libsigrok-9999.ebuild 3638 BLAKE2B 4e8e61244cc1f9c0544a31e3e765c72b98cca2c03be5eac3da627ffb936a852777f4ac613683d460e6df8b7d4655380d0213c89604a9c3e8096905159406070b SHA512 8948066e791b410135950044f564a4f37593e67358e45efc67d28dc98024fd6a938ad7e4de242c0124a2318fdb3445c0407f327bba29d218152af432358f3400
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index 4b21e16866f8..a1816ed7b3c5 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 		>=virtual/jdk-1.4
 	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
 		>=dev-lang/swig-3.0.6
 	)
 	virtual/pkgconfig"
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index af1e257b9010..de2b5e3a0cee 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -28,7 +28,12 @@ REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
 LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
@@ -44,8 +49,10 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]}
 		>=virtual/jdk-1.4
 	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
 		>=dev-lang/swig-3.0.6
 	)
 	virtual/pkgconfig"
diff --git a/sci-libs/mathgl/Manifest b/sci-libs/mathgl/Manifest
index 9dc6483cded7..f464491fee5b 100644
--- a/sci-libs/mathgl/Manifest
+++ b/sci-libs/mathgl/Manifest
@@ -1,5 +1,5 @@
 AUX mathgl-2.4.1-mutex.patch 424 BLAKE2B 2077654d0b17d2a1ba63bfcc17bcc82dac7dcc274253357a70cd0b2d49f9c99b73b380c1d09ad70e302fd04449b9adb6392c12cbd03fcefae4a36a50491cf012 SHA512 d0a0101041c91ba4d295484b8b06825d66787600b98acc2ee6e3cb8ec54e86939deadc40924bce42b6eb782bf5c03c6a7687ac853d7bc393e75bcf9a809d7849
 DIST STIX_font.tgz 2450541 BLAKE2B f725eb0264d9c3cb7c32a935e8857c4a21cb905a1dc6c9cc8a16408afdc7dd9b6fcd312a8c2f77aff5484605a39a9ee36e86ad0234adb5d6bcc5c8839101194c SHA512 c9124ec552074c98f15d6d3572a063598ca6bc598e3e78dcb5a5d57ae3928b5327a1374635f428ea1cefc9e51ee1d1aa9bd6ba9a306429fc6965140251d368b5
 DIST mathgl-2.4.1.tar.gz 22665490 BLAKE2B a9c9e0ec7d145262994a754dfbcf1f789d2777f9334c8b4e73696265adba4d2fd7283621857318264c2162841e81427df21f7bc7b951d83876fbc066d3b9068f SHA512 10fd016662ca60b9507942691f85b4d9151104319627732f4add0175475f7e8dff16e3645bb858c283b747f34e58f410d0532e94dc64cf8cf472938d3966402d
-EBUILD mathgl-2.4.1-r1.ebuild 4429 BLAKE2B 805b251b076fea7884f091a76b3dd5c4e7f45849b2ab09754ec11e789e4df4905299bbf7f9c2d0f3501e7a102c2b9851db206b416e8db7cf61f07e5c70b4ec72 SHA512 ae68b5ad9b5c8d247d74ed83b125c72a060ff3db1a34aaa3b0015e1394de1a9c9a6c17138d9c1c5ecce92bc6d45822dcddc0aeee8f27c923812de2d3f6a70bfa
+EBUILD mathgl-2.4.1-r2.ebuild 4476 BLAKE2B ab830f12afaca778370416cb607fe4d765350b584a74e0b6aa3adf5557f931df30917563a8fc396d287ebad172477a09cdd2dfe4bef6c9735383aad847d1b0c5 SHA512 51a844e3a527244e7b65d9ae571f1715019f87bb556683010d4cf83ff3f380b76c5ad9aaeb14021ecfa0754ae536849ab514637996e11d012833ff8ec1d29525
 MISC metadata.xml 800 BLAKE2B baa75251910016e5d059cebeebd85632d290ab0c3c50089de0485ffbcd08ee8ac59cbfe33824347a5a5c339c74ea7a56c516d4d38661e56f7498d628d748f64a SHA512 8b75db0a01ce59f22543701447630c56a82f9091b5901f85ae102de7deca281e09dbcb443b8ff2930cf18145d63504646a289fd5e77defccc4d38480596d1968
diff --git a/sci-libs/mathgl/mathgl-2.4.1-r1.ebuild b/sci-libs/mathgl/mathgl-2.4.1-r1.ebuild
deleted file mode 100644
index 81c1241a2fa6..000000000000
--- a/sci-libs/mathgl/mathgl-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER=3.0
-
-inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0/7.5.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
-	png python qt5 static-libs threads wxwidgets zlib"
-
-LANGS="ru"
-for l in ${LANGS}; do
-	IUSE+=" l10n_${l}"
-done
-unset l
-
-RDEPEND="
-	virtual/opengl
-	fltk? ( x11-libs/fltk:1 )
-	gif? ( media-libs/giflib )
-	glut? ( media-libs/freeglut )
-	gsl? ( >=sci-libs/gsl-2 )
-	hdf? ( sci-libs/hdf )
-	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
-	jpeg? ( virtual/jpeg:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
-	octave? ( >=sci-mathematics/octave-3.4.0 )
-	openmp? ( sys-cluster/openmpi )
-	pdf? ( media-libs/libharu )
-	png? ( media-libs/libpng:0 )
-	python? (
-		|| (
-			dev-python/numpy-python2[${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		)
-		${PYTHON_DEPS}
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	octave? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-REQUIRED_USE="
-	mpi? ( hdf5 )
-	openmp? ( !threads )
-	png? ( zlib )
-	pdf? ( png )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mutex.patch
-)
-
-pkg_setup() {
-	use mpi && export CC=mpicc CXX=mpicxx
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	if ! [[ -d "${S}"/fonts ]]; then
-		mkdir "${S}"/fonts || die
-	fi
-	cd "${S}"/fonts || die
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	# fix for location of hdf headers
-	sed -i -e 's:hdf/::g' src/data_io.cpp || die
-	# bored of reporting bad libdir upstream
-	sed -i \
-		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
-		{src,widgets}/CMakeLists.txt || die
-	echo "" > lang/install.m || die
-	# fix desktop file
-	sed -i -e 's/.png//' udav/udav.desktop || die
-	# prevent sandbox violation
-	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
-	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
-
-	use python && \
-		append-cppflags \
-		-I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
-	use wxwidgets && need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-	if use hdf; then
-		mycmakeargs+=(
-			-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
-		)
-	fi
-	mycmakeargs+=(
-		# No clue about this option:
-		# option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
-		-DMathGL_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-Denable-all-docs=$(usex doc)
-		-Denable-fltk=$(usex fltk)
-		-Denable-gif=$(usex gif)
-		-Denable-glut=$(usex glut)
-		-Denable-gsl=$(usex gsl)
-		-Denable-hdf4=$(usex hdf)
-		-Denable-hdf5=$(usex hdf5)
-		-Denable-jpeg=$(usex jpeg)
-		-Denable-lua=$(usex lua)
-		-Denable-mpi=$(usex mpi)
-		-Denable-octave=$(usex octave)
-		-Denable-opengl=$(usex opengl)
-		-Denable-openmp=$(usex openmp)
-		-Denable-pdf=$(usex pdf)
-		-Denable-png=$(usex png)
-		-Denable-qt4=OFF
-		-Denable-qt5=$(usex qt5)
-		-Denable-qt5asqt=$(usex qt5)
-		-Denable-pthread=$(usex threads)
-		-Denable-pthr-widget=$(usex threads)
-		-Denable-python=$(usex python)
-		-Denable-wx=$(usex wxwidgets)
-		-Denable-zlib=$(usex zlib)
-	)
-	cmake-utils_src_configure
-	# to whoever cares: TODO: do for multiple python ABI
-	if use python; then
-		sed -i \
-			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
-			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc README* *.txt AUTHORS
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-	if use qt5 ; then
-		local lang
-		insinto /usr/share/udav
-		for lang in ${LANGS} ; do
-			use l10n_${lang} && doins udav/udav_${lang}.qm
-		done
-	fi
-	if use octave ; then
-		insinto /usr/share/${PN}/octave
-		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
-	fi
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	if use octave; then
-		octave <<-EOF
-		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
-		EOF
-	fi
-}
-
-pkg_prerm() {
-	if use octave; then
-		octave <<-EOF
-		pkg uninstall ${PN}
-		EOF
-	fi
-}
diff --git a/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..e07d56b6edf5
--- /dev/null
+++ b/sci-libs/mathgl/mathgl-2.4.1-r2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+WX_GTK_VER=3.0
+
+inherit cmake-utils eutils python-single-r1 wxwidgets multilib flag-o-matic
+
+DESCRIPTION="Math Graphics Library"
+HOMEPAGE="http://mathgl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz mirror://sourceforge/${PN}/STIX_font.tgz"
+
+LICENSE="LGPL-3"
+SLOT="0/7.5.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc fltk gif glut gsl hdf hdf5 jpeg lua mpi octave opengl openmp pdf
+	png python qt5 static-libs threads wxwidgets zlib"
+
+LANGS="ru"
+for l in ${LANGS}; do
+	IUSE+=" l10n_${l}"
+done
+unset l
+
+RDEPEND="
+	virtual/opengl
+	fltk? ( x11-libs/fltk:1 )
+	gif? ( media-libs/giflib )
+	glut? ( media-libs/freeglut )
+	gsl? ( >=sci-libs/gsl-2 )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( >=sci-libs/hdf5-1.8[mpi=] )
+	jpeg? ( virtual/jpeg:0 )
+	lua? ( >=dev-lang/lua-5.1:0 )
+	octave? ( >=sci-mathematics/octave-3.4.0 )
+	openmp? ( sys-cluster/openmpi )
+	pdf? ( media-libs/libharu )
+	png? ( media-libs/libpng:0 )
+	python? (
+		$(python_gen_cond_dep '
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		')
+		${PYTHON_DEPS}
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html virtual/texi2dvi )
+	octave? ( dev-lang/swig )
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	openmp? ( !threads )
+	png? ( zlib )
+	pdf? ( png )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mutex.patch
+)
+
+pkg_setup() {
+	use mpi && export CC=mpicc CXX=mpicxx
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+	if ! [[ -d "${S}"/fonts ]]; then
+		mkdir "${S}"/fonts || die
+	fi
+	cd "${S}"/fonts || die
+	unpack STIX_font.tgz
+}
+
+src_prepare() {
+	# fix for location of hdf headers
+	sed -i -e 's:hdf/::g' src/data_io.cpp || die
+	# bored of reporting bad libdir upstream
+	sed -i \
+		-e '/DESTINATION/s:lib$:lib${LIB_SUFFIX}:g' \
+		{src,widgets}/CMakeLists.txt || die
+	echo "" > lang/install.m || die
+	# fix desktop file
+	sed -i -e 's/.png//' udav/udav.desktop || die
+	# prevent sandbox violation
+	sed -i -e 's/update-mime-database/true/' udav/CMakeLists.txt || die
+	sed -i -e 's/update-desktop-database/true/' udav/CMakeLists.txt || die
+
+	use python && \
+		append-cppflags \
+		-I"$(${EPYTHON} -c 'import numpy; print(numpy.get_include())')"
+	use wxwidgets && need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+	if use hdf; then
+		mycmakeargs+=(
+			-DHDF4_INCLUDE_DIR="${EPREFIX}/usr/include"
+		)
+	fi
+	mycmakeargs+=(
+		# No clue about this option:
+		# option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
+		-DMathGL_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-Denable-all-docs=$(usex doc)
+		-Denable-fltk=$(usex fltk)
+		-Denable-gif=$(usex gif)
+		-Denable-glut=$(usex glut)
+		-Denable-gsl=$(usex gsl)
+		-Denable-hdf4=$(usex hdf)
+		-Denable-hdf5=$(usex hdf5)
+		-Denable-jpeg=$(usex jpeg)
+		-Denable-lua=$(usex lua)
+		-Denable-mpi=$(usex mpi)
+		-Denable-octave=$(usex octave)
+		-Denable-opengl=$(usex opengl)
+		-Denable-openmp=$(usex openmp)
+		-Denable-pdf=$(usex pdf)
+		-Denable-png=$(usex png)
+		-Denable-qt4=OFF
+		-Denable-qt5=$(usex qt5)
+		-Denable-qt5asqt=$(usex qt5)
+		-Denable-pthread=$(usex threads)
+		-Denable-pthr-widget=$(usex threads)
+		-Denable-python=$(usex python)
+		-Denable-wx=$(usex wxwidgets)
+		-Denable-zlib=$(usex zlib)
+	)
+	cmake-utils_src_configure
+	# to whoever cares: TODO: do for multiple python ABI
+	if use python; then
+		sed -i \
+			-e "s:--prefix=\(.*\) :--prefix=\$ENV{DESTDIR}\1 :" \
+			"${CMAKE_BUILD_DIR}"/lang/cmake_install.cmake || die
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README* *.txt AUTHORS
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
+	if use qt5 ; then
+		local lang
+		insinto /usr/share/udav
+		for lang in ${LANGS} ; do
+			use l10n_${lang} && doins udav/udav_${lang}.qm
+		done
+	fi
+	if use octave ; then
+		insinto /usr/share/${PN}/octave
+		doins "${CMAKE_BUILD_DIR}"/lang/${PN}.tar.gz
+	fi
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	if use octave; then
+		octave <<-EOF
+		pkg install ${EROOT}/usr/share/${PN}/octave/${PN}.tar.gz
+		EOF
+	fi
+}
+
+pkg_prerm() {
+	if use octave; then
+		octave <<-EOF
+		pkg uninstall ${PN}
+		EOF
+	fi
+}
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index f7820975fceb..b75164986217 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -2,6 +2,6 @@ AUX pastix-5.2.2.22-isnan-floating-point-cast.patch 1901 BLAKE2B 3bb02c4898367e0
 AUX pastix-5.2.2.22-nosmp-undefined-variable.patch 494 BLAKE2B 06a9e3933d0a181f535ad2922c3b39375d50b81abc572a1363e5e1130e3647083940ffc929e40cf93d35e364eb7e36d84d57a53bd9fe247ff8f7fefde93a08f7 SHA512 c12719176b352b396cc58d7a4474955df0cb01459edce1b2f220c6352d99bf608d39c3b4d6b54b0ae8b4643879ed79b7a5fbd03b746dba0bf4cc265d81d6d38e
 DIST pastix_5.2.2.22.tar.bz2 2664470 BLAKE2B b1fbd12bf2c882aa8fd2c4891a6890df4bdc4488cedca2a7861e676ec5678063927f2e4a4edc47aa7ca0422b283f8f012aa1032af7212fe39f4c55e7f0f7adc4 SHA512 15ecdb10b5229e40f744c1ad54be7cac6560cb92e90df1937c90ca7da290df6bdb6f24a1e1c54197731b9df3e0dcc0b9fa39750479fcf03a0c08c304c5b9df70
 DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
-EBUILD pastix-5.2.2.22-r1.ebuild 3659 BLAKE2B 7d07abb3a98300f0775f077e5ad270666945677f7a00f3c6c15478bbf65e2cec0f8e7045003868404851801bc6518a50aa389d976920d0aca843875c0ed35e11 SHA512 d6ba908ecacdc66a7f26150fe1a774ac9604096dd57da336d6b413ca2d1eb5d8b0e4a00f47502f1760367c83c88532864cd9d74d64bb8df1904fc5d937f0791c
-EBUILD pastix-5.2.3.ebuild 3342 BLAKE2B 4c17a4a636a702c9a25ae83a64237333a789d2e89452477db6c2a446daa331ca6c10be96d135f96b7e3815e899c8a80950344d2c287a496dc5956a0344c37a8d SHA512 b4599784b7b98945071f08fa2744834a99166e8f503811afea39da07cd4e94db3b3f874867476b493a8182d7c0e0d9e08bf584cb2243092e71c75c64a286ac6e
+EBUILD pastix-5.2.2.22-r1.ebuild 3657 BLAKE2B 158162b26b3ff79404f35bbebfebff0faf80833bf30109e883dff52b329bcb6098a8cdd035ef1a11295c483ee7521139d6cf27fa9b66920f08d8b276c28750b2 SHA512 7651b92b88ad9de01562a63ac556535bf030f9e11dbdf69a21f161df97dff1fb26c6cf5f373dde8040aca6bd757fe2a97fc13385506967503ff92e731d4c230e
+EBUILD pastix-5.2.3.ebuild 3340 BLAKE2B b8c8a425a9071b3ddcc2dc0ea4d94091150737144d8347a495f31c03248412095778593b2ffd74f92218ec0fa09da6454d1b2b6c84c12c658870b8dacd8230e2 SHA512 5eea672e7f65a3a10eb03ce8149a4fe5406a227b52e075626cd08eab599f2bdd00c981a87e3467ea711189acba3ba9ff5e7db519cc782dd387320deab7cc0546
 MISC metadata.xml 1055 BLAKE2B 237a5db431f2c60ea448c9627f943e88a7fd50509884af078c1de5b9ed51317806d815cf8f8ad9c1f85272077438df2d8c76e26fa9a1c9133bb17f3b1cd056ed SHA512 42f9f1f03c4a2df46918ef461d814ca3c0e80e0fa5420327a45d6ca7ec87dd3f14ad0e5a4384b49aebae971578a425b475fa0e1ed6b73370afb743222765bfde
diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
index 2b4809a5bdea..812c67fafe80 100644
--- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
+++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -56,7 +56,7 @@ src_prepare() {
 		-e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
 		-e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
 		-e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
-		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX%/}/usr:" \
+		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \
 		-e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
 		-e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
 		-e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
index de4649c9db4a..430541e32cd7 100644
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ b/sci-libs/pastix/pastix-5.2.3.ebuild
@@ -45,7 +45,7 @@ src_prepare() {
 		-e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
 		-e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
 		-e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
-		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX%/}/usr:" \
+		-e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \
 		-e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
 		-e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
 		-e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index 117fd10baae6..3479aa164504 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -5,5 +5,5 @@ AUX pgplot-libpng15.patch 374 BLAKE2B 975eed22e5f2c4ff7bd169224eee766b5438ad25dd
 AUX pgplot-makemake.patch 7901 BLAKE2B 65b6d9fa41667d95376530315269872a25fc9445753e0f7b57ebe02feb3bfbf8deb75e977c771a09c4bf7851e5a9d392c145916c054ebd5624309487a4756fad SHA512 a29bc78eb17397c8fc3a0ec0f8dcec28d5d3f1345b16b90c05aad6459c9b312b63d04e55882b99c47ab22e7b3e16ee3e437c684fb5f50a43aaecd5fc6915689a
 AUX pgplot-tk86.patch 1863 BLAKE2B 23abf5177049d19ce782ff68987689fe9e6cac0267bd664c681bb1bd94a11da1898ed6c639d0a3773d64f43502c588352304e593672940fdf83e42ac00219ab2 SHA512 32abe4409cc1b63bf807a3544c36c163c6278dbe3dfd50ce24c6c65da6e22c8d8c0992217bab44c3e3105a11a6cad9b721c1ed8efe6835b46686072f40b83468
 DIST pgplot522.tar.gz 1197397 BLAKE2B 9eafde628373abdbda7adeb365b107618197aa5884d16b27f42b20c7957efa9b09d64adbcbc311ec92b974427355f8410a35c3f12969d240e8e25f3a72cae82b SHA512 03a075c84506ead1d665a7105cd41c7cfbe19d12094cb36fb7459a0f6ee0df0638543b7eca92aaf80677984cc47a07b968f854db8eaa90ec605f78d89c615d1f
-EBUILD pgplot-5.2.2-r7.ebuild 4347 BLAKE2B 91131d11c0689666762aae5582d1d0eff52cccbae3c70cf446e19b42331e184003b0fa97df0edac35571704dbb5e4ad3a4d172636afef97eb702a6b30dbd9583 SHA512 493d3acaf32d115bcb94e636cdf1eb9d0de75da1861adae9ce0f3baefaf39db7c6310aa0fda2aac8bfd29093c062c8115882430c62cb20f3c00b36483100f5fd
+EBUILD pgplot-5.2.2-r7.ebuild 4345 BLAKE2B 9fea4420e1bc8f0af25dc710644e0c99570da7967ec4a80bc146f9070de1bc36d9854f8cff78098b8eb697cf4518d0893e35318e2377a2eb189ea53582ed00b3 SHA512 138fa602906e2e82db04ec38bb3058decfd6329da1684233d65b03d792347d5eff034bef2da5eac4eb7e167488a702b8839f0fe879802f5874b09983b363c9cb
 MISC metadata.xml 622 BLAKE2B 666fe62f8627ba218e6b54badfc8fd497c4a166a9fbe6a5252461ef226beed6cb6bdf38f070563e86468e2fd617e30d9643646a918881912f555680ef1b2edc3 SHA512 09372d4c73ac5f4222ac4c47df1ff138bc1266740552b4592fc3765b5a6391f1dbadf58a5cfc0985eb6000709ab57a5bb3ecaf24cfe59213caaaaf70536227f7
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
index f38f5b98ec9d..33d7fc5c0a26 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -125,7 +125,7 @@ src_test() {
 src_install() {
 	insinto /usr/$(get_libdir)/pgplot
 	doins grfont.dat grexec.f *.inc rgb.txt
-	echo "PGPLOT_FONT=${EPREFIX%/}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot
+	echo "PGPLOT_FONT=${EPREFIX}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot
 	doenvd 99pgplot
 
 	dolib.so libpgplot.so*
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index f3e4f23c98e6..4ee7221aa9fc 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -5,5 +5,5 @@ AUX plplot-5.15.0-ocaml-rpath.patch 9583 BLAKE2B b475580f9e4da0ab660dc2d0dfbdbbf
 AUX plplot-5.15.0-ocaml.patch 3424 BLAKE2B ba1c9f758c319a76b0a457a287ee6934ee39300401e2d9a364c70446e12af679ce55c22eda0bf7aa7cb621fd4c76f56268afa649ba935a716495049f41706187 SHA512 1387625d1e784fb92ab3279a342c08d8f85fc055e0c69ce1af9656492102072c7a1d5a6498f8758dc3fd35e0543e80b65cd315641886f9baff60f7740583a0e3
 AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4
 DIST plplot-5.15.0.tar.gz 15380293 BLAKE2B 41f359c4e86c7a26fe53a9d82a9f02aeb97b5b6f44abca590621640c56e50a62823e8a03165a939689f5456cee419b8292ea34faccd07641bd4a953b6f1d73fe SHA512 54533245569b724a7ef90392cc6e9ae65873e6cbab923df0f841c8b43def5e4307690894c7681802209bd3c8df97f54285310a706428f79b3340cce3207087c8
-EBUILD plplot-5.15.0.ebuild 7153 BLAKE2B 74fc0873428d0022eafb6c591439773c904c98423112593fd093d076b0dc9ad10599b6abad8e6f275a7549776fdd617b02aab22f1009aaee515b564ef9ac768e SHA512 7f689d63e44cbe0cb88ba24bea9e5f9fb0c86908d43680a653ee48125605d6556392472d133941edbbc490c7a8e150a1da14af210ab7f059238006b4eecbfaf3
+EBUILD plplot-5.15.0-r1.ebuild 7198 BLAKE2B 1d1c10a0dbaab6c46eea53eff8b9ae31b35706a8b9cbcf068924c32c15aabb1194cc3475be6502e2b88d9665f2f008f78c8840c403dbd3a547c9841fb0304bca SHA512 17875564fe755e1faa69f8390c9635e66bf18e85390a8cf39e9e98219fe546c9628589d6ca282dfe5f9b72088d1398800aa78190ae19d3377ed6bdfd60094818
 MISC metadata.xml 1420 BLAKE2B dc6f6e5f857b508989abed1b3769f42b7fb6de047d6b42f2614fa0c6cbabf9e7924185c94f1e5296cb34b3b51db1d580594add1592d26ed30239510b83ca1a42 SHA512 9af98d19c793ce18e7ee8c6f1a4346455008c907905c2fab8551d074429b8feab8b86161dca63943066bf0b238646e3b5d3d0161a57d313208ae1b155e6a212d
diff --git a/sci-libs/plplot/plplot-5.15.0-r1.ebuild b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
new file mode 100644
index 000000000000..f0f9d5c4247a
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.15.0-r1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0-gtk3
+FORTRAN_NEEDED=fortran
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-utils flag-o-matic fortran-2 java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="Multi-language scientific plotting library"
+HOMEPAGE="http://plplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/14" # SONAME of libplplot.so
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf
+	png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( dynamic )
+	test? ( latex )
+	tk? ( tcl )
+"
+
+RESTRICT="
+	!test? ( test )
+	octave? ( test )
+"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:0=[svg?,X] )
+	gd? ( media-libs/gd:2=[jpeg?,png?] )
+	java? ( >=virtual/jre-1.5:* )
+	latex? (
+		app-text/ghostscript-gpl
+		virtual/latex-base
+	)
+	lua? ( dev-lang/lua:0= )
+	ocaml? (
+		dev-lang/ocaml
+		dev-ml/camlidl
+		cairo? ( dev-ml/cairo-ocaml[gtk] )
+	)
+	octave? ( sci-mathematics/octave:0= )
+	pdf? ( media-libs/libharu:0= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			qt5? ( dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qhull? ( media-libs/qhull:0= )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtprintsupport:5
+	)
+	shapefile? ( sci-libs/shapelib:0= )
+	tcl? (
+		dev-lang/tcl:0=
+		dev-tcltk/itcl:0=
+		tk? (
+			dev-lang/tk:0=
+			dev-tcltk/itk
+		)
+	)
+	truetype? (
+		media-fonts/freefont
+		media-libs/lasi:0=
+		gd? ( media-libs/gd:2=[truetype] )
+	)
+	wxwidgets? (
+		x11-libs/wxGTK:${WX_GTK_VER}=[X]
+		x11-libs/agg:0=[truetype?]
+	)
+	X? (
+		x11-libs/libX11:0=
+		x11-libs/libXau:0=
+		x11-libs/libXdmcp:0=
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	java? (
+		>=virtual/jdk-1.5
+		dev-lang/swig
+	)
+	ocaml? ( dev-ml/findlib )
+	octave? ( >=dev-lang/swig-3.0.12 )
+	python? ( dev-lang/swig )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.6-python.patch
+
+	# Fedora patches
+	"${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch
+	"${FILESDIR}"/${PN}-5.15.0-ieee.patch
+	"${FILESDIR}"/${PN}-5.15.0-multiarch.patch
+	"${FILESDIR}"/${PN}-5.15.0-ocaml.patch
+	"${FILESDIR}"/${PN}-5.12.0-safe-string.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	use java && java-pkg-opt-2_pkg_setup
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	use wxwidgets && need-wxwidgets unicode
+	cmake-utils_src_prepare
+
+	# avoid installing license
+	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
+
+	# prexify hard-coded /usr/include in cmake modules
+	sed -i \
+		-e "s:/usr/include:${EPREFIX}/usr/include:g" \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		-e "s:/usr/share:${EPREFIX}/usr/share:g" \
+		cmake/modules/*.cmake || die
+
+	# change default install directories for doc and examples
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		sed -i -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' "${f}" || die
+	done < <(find "${S}" -name CMakeLists.txt -print0)
+
+	sed -i \
+		-e 's:${VERSION}::g' \
+		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
+		cmake/modules/instdirs.cmake || die
+
+	java-utils-2_src_prepare
+}
+
+src_configure() {
+	# - don't build doc, it pulls in a whole stack of horrible dependencies
+	# - Bindings:
+	#   * Ada is a mess in Gentoo, don't use
+	#   * D has been removed from Gentoo, don't use
+	#   * Qt4 has been disabled, as it is deprecated and unsupported upstream
+	# - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as
+	#   the testsuite performs a string comparison to determine which tests to run
+
+	# Octave bindings now require C++11 support, #609980
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		# The build system does not honour CMAKE_INSTALL_LIBDIR as a
+		# relative dir, which is against the spirit of GNUInstallDirs, #610066
+		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
+
+		## Features
+		-DBUILD_DOC=OFF
+		-DBUILD_DOX_DOC=OFF
+		-DUSE_RPATH=OFF
+		-DPREBUILT_DOC=$(usex doc)
+		-DHAVE_SHAPELIB=$(usex shapefile)
+		-DWITH_FREETYPE=$(usex truetype)
+		-DPL_HAVE_PTHREAD=$(usex threads)
+		-DPL_HAVE_QHULL=$(usex qhull)
+		-DPLPLOT_USE_QT5=$(usex qt5)
+
+		## Tests
+		-DBUILD_TEST=$(usex test)
+
+		## Bindings
+		-DENABLE_ada=OFF
+		-DENABLE_d=OFF
+		-DENABLE_ocaml=$(usex ocaml)
+		-DENABLE_pyqt4=OFF
+		-DENABLE_cxx=$(usex cxx)
+		-DENABLE_DYNDRIVERS=$(usex dynamic)
+		-DENABLE_fortran=$(usex fortran)
+		-DENABLE_java=$(usex java)
+		-DENABLE_lua=$(usex lua)
+		-DENABLE_octave=$(usex octave)
+		-DENABLE_python=$(usex python)
+		-DENABLE_qt=$(usex qt5)
+		-DENABLE_tcl=$(usex tcl)
+		-DENABLE_itcl=$(usex tcl)
+		-DENABLE_tk=$(usex tk)
+		-DENABLE_itk=$(usex tk)
+		-DENABLE_wxwidgets=$(usex wxwidgets)
+
+		## Drivers
+		-DPLD_cgm=OFF
+		-DPLD_gif=OFF
+		-DPLD_jpeg=OFF
+		-DPLD_plmeta=OFF
+		-DPLD_png=OFF
+		-DPLD_pstex=OFF
+		-DPLD_wxpng=OFF
+		-DPLD_mem=ON
+		-DPLD_null=ON
+		-DPLD_wingcc=ON
+		# Cairo
+		$(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
+		-DPLD_epscairo=$(usex cairo ON OFF)
+		-DPLD_extcairo=$(usex cairo ON OFF)
+		-DPLD_memcairo=$(usex cairo ON OFF)
+		-DPLD_pdfcairo=$(usex cairo ON OFF)
+		-DPLD_pngcairo=$(usex cairo ON OFF)
+		-DPLD_pscairo=$(usex cairo ON OFF)
+		-DPLD_svgcairo=$(usex cairo ON OFF)
+		-DPLD_xcairo=$(usex cairo ON OFF)
+		# LaTeX
+		-DPLD_ps=$(usex latex ON OFF)
+		# PDF
+		-DPLD_pdf=$(usex pdf ON OFF)
+		# Qt
+		-DPLD_aqt=$(usex qt5 ON OFF)
+		-DPLD_bmpqt=$(usex qt5 ON OFF)
+		-DPLD_epsqt=$(usex qt5 ON OFF)
+		-DPLD_extqt=$(usex qt5 ON OFF)
+		-DPLD_jpgqt=$(usex qt5 ON OFF)
+		-DPLD_memqt=$(usex qt5 ON OFF)
+		-DPLD_pdfqt=$(usex qt5 ON OFF)
+		-DPLD_pngqt=$(usex qt5 ON OFF)
+		-DPLD_ppmqt=$(usex qt5 ON OFF)
+		-DPLD_qtwidget=$(usex qt5 ON OFF)
+		-DPLD_svgqt=$(usex qt5 ON OFF)
+		-DPLD_tiffqt=$(usex qt5 ON OFF)
+		# SVG
+		-DPLD_svg=$(usex svg ON OFF)
+		# Tk
+		-DPLD_ntk=$(usex tk ON OFF)
+		-DPLD_tk=$(usex tk ON OFF)
+		-DPLD_tkwin=$(usex tk ON OFF)
+		# Truetype
+		-DPLD_psttf=$(usex truetype ON OFF)
+		# Wx
+		-DPLD_wxwidgets=$(usex wxwidgets ON OFF)
+		# X
+		-DPLD_xfig=$(usex X ON OFF)
+		-DPLD_xwin=$(usex X ON OFF)
+	)
+
+	use truetype && mycmakeargs+=(
+		-DPL_FREETYPE_FONT_PATH="${EPREFIX}"/usr/share/fonts/freefont
+	)
+	use shapefile && mycmakeargs+=(
+		-DSHAPELIB_INCLUDE_DIR="${EPREFIX}"/usr/include/libshp
+	)
+	use ocaml && mycmakeargs+=(
+		-DOCAML_INSTALL_DIR="$(ocamlc -where)"
+	)
+	use python && mycmakeargs+=(
+		-DENABLE_pyqt5=$(usex qt5)
+	)
+
+	cmake-utils_src_configure
+
+	# clean up bloated pkg-config files (help linking properly on prefix)
+	sed -i \
+		-e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
+		-e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
+		-e "s:${LDFLAGS}::g" \
+		"${BUILD_DIR}"/pkgcfg/*pc || die
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -r "${ED%/}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	if use java; then
+		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
+		java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
+	fi
+}
diff --git a/sci-libs/plplot/plplot-5.15.0.ebuild b/sci-libs/plplot/plplot-5.15.0.ebuild
deleted file mode 100644
index bafe731a8d46..000000000000
--- a/sci-libs/plplot/plplot-5.15.0.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0-gtk3
-FORTRAN_NEEDED=fortran
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils flag-o-matic fortran-2 java-pkg-opt-2 python-single-r1 toolchain-funcs virtualx wxwidgets
-
-DESCRIPTION="Multi-language scientific plotting library"
-HOMEPAGE="http://plplot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0/14" # SONAME of libplplot.so
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua ocaml octave pdf
-	png python qhull qt5 shapefile svg tcl test threads tk truetype wxwidgets X"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( dynamic )
-	test? ( latex )
-	tk? ( tcl )
-"
-
-RESTRICT="
-	!test? ( test )
-	octave? ( test )
-"
-
-RDEPEND="
-	cairo? ( x11-libs/cairo:0=[svg?,X] )
-	gd? ( media-libs/gd:2=[jpeg?,png?] )
-	java? ( >=virtual/jre-1.5:* )
-	latex? (
-		app-text/ghostscript-gpl
-		virtual/latex-base
-	)
-	lua? ( dev-lang/lua:0= )
-	ocaml? (
-		dev-lang/ocaml
-		dev-ml/camlidl
-		cairo? ( dev-ml/cairo-ocaml[gtk] )
-	)
-	octave? ( sci-mathematics/octave:0= )
-	pdf? ( media-libs/libharu:0= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-		qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	)
-	qhull? ( media-libs/qhull:0= )
-	qt5? (
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtprintsupport:5
-	)
-	shapefile? ( sci-libs/shapelib:0= )
-	tcl? (
-		dev-lang/tcl:0=
-		dev-tcltk/itcl:0=
-		tk? (
-			dev-lang/tk:0=
-			dev-tcltk/itk
-		)
-	)
-	truetype? (
-		media-fonts/freefont
-		media-libs/lasi:0=
-		gd? ( media-libs/gd:2=[truetype] )
-	)
-	wxwidgets? (
-		x11-libs/wxGTK:${WX_GTK_VER}=[X]
-		x11-libs/agg:0=[truetype?]
-	)
-	X? (
-		x11-libs/libX11:0=
-		x11-libs/libXau:0=
-		x11-libs/libXdmcp:0=
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? (
-		>=virtual/jdk-1.5
-		dev-lang/swig
-	)
-	ocaml? ( dev-ml/findlib )
-	octave? ( >=dev-lang/swig-3.0.12 )
-	python? ( dev-lang/swig )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.6-python.patch
-
-	# Fedora patches
-	"${FILESDIR}"/${PN}-5.15.0-ocaml-rpath.patch
-	"${FILESDIR}"/${PN}-5.15.0-ieee.patch
-	"${FILESDIR}"/${PN}-5.15.0-multiarch.patch
-	"${FILESDIR}"/${PN}-5.15.0-ocaml.patch
-	"${FILESDIR}"/${PN}-5.12.0-safe-string.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	use wxwidgets && need-wxwidgets unicode
-	cmake-utils_src_prepare
-
-	# avoid installing license
-	sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die
-
-	# prexify hard-coded /usr/include in cmake modules
-	sed -i \
-		-e "s:/usr/include:${EPREFIX}/usr/include:g" \
-		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:/usr/share:${EPREFIX}/usr/share:g" \
-		cmake/modules/*.cmake || die
-
-	# change default install directories for doc and examples
-	local f
-	while IFS="" read -d $'\0' -r f; do
-		sed -i -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' "${f}" || die
-	done < <(find "${S}" -name CMakeLists.txt -print0)
-
-	sed -i \
-		-e 's:${VERSION}::g' \
-		-e "s:doc/\${PACKAGE}:doc/${PF}:" \
-		cmake/modules/instdirs.cmake || die
-
-	java-utils-2_src_prepare
-}
-
-src_configure() {
-	# - don't build doc, it pulls in a whole stack of horrible dependencies
-	# - Bindings:
-	#   * Ada is a mess in Gentoo, don't use
-	#   * D has been removed from Gentoo, don't use
-	#   * Qt4 has been disabled, as it is deprecated and unsupported upstream
-	# - DPLD_* drivers need to use ON/OFF instead of the usex defaults yes/no, as
-	#   the testsuite performs a string comparison to determine which tests to run
-
-	# Octave bindings now require C++11 support, #609980
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		# The build system does not honour CMAKE_INSTALL_LIBDIR as a
-		# relative dir, which is against the spirit of GNUInstallDirs, #610066
-		-DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
-
-		## Features
-		-DBUILD_DOC=OFF
-		-DBUILD_DOX_DOC=OFF
-		-DUSE_RPATH=OFF
-		-DPREBUILT_DOC=$(usex doc)
-		-DHAVE_SHAPELIB=$(usex shapefile)
-		-DWITH_FREETYPE=$(usex truetype)
-		-DPL_HAVE_PTHREAD=$(usex threads)
-		-DPL_HAVE_QHULL=$(usex qhull)
-		-DPLPLOT_USE_QT5=$(usex qt5)
-
-		## Tests
-		-DBUILD_TEST=$(usex test)
-
-		## Bindings
-		-DENABLE_ada=OFF
-		-DENABLE_d=OFF
-		-DENABLE_ocaml=$(usex ocaml)
-		-DENABLE_pyqt4=OFF
-		-DENABLE_cxx=$(usex cxx)
-		-DENABLE_DYNDRIVERS=$(usex dynamic)
-		-DENABLE_fortran=$(usex fortran)
-		-DENABLE_java=$(usex java)
-		-DENABLE_lua=$(usex lua)
-		-DENABLE_octave=$(usex octave)
-		-DENABLE_python=$(usex python)
-		-DENABLE_qt=$(usex qt5)
-		-DENABLE_tcl=$(usex tcl)
-		-DENABLE_itcl=$(usex tcl)
-		-DENABLE_tk=$(usex tk)
-		-DENABLE_itk=$(usex tk)
-		-DENABLE_wxwidgets=$(usex wxwidgets)
-
-		## Drivers
-		-DPLD_cgm=OFF
-		-DPLD_gif=OFF
-		-DPLD_jpeg=OFF
-		-DPLD_plmeta=OFF
-		-DPLD_png=OFF
-		-DPLD_pstex=OFF
-		-DPLD_wxpng=OFF
-		-DPLD_mem=ON
-		-DPLD_null=ON
-		-DPLD_wingcc=ON
-		# Cairo
-		$(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON")
-		-DPLD_epscairo=$(usex cairo ON OFF)
-		-DPLD_extcairo=$(usex cairo ON OFF)
-		-DPLD_memcairo=$(usex cairo ON OFF)
-		-DPLD_pdfcairo=$(usex cairo ON OFF)
-		-DPLD_pngcairo=$(usex cairo ON OFF)
-		-DPLD_pscairo=$(usex cairo ON OFF)
-		-DPLD_svgcairo=$(usex cairo ON OFF)
-		-DPLD_xcairo=$(usex cairo ON OFF)
-		# LaTeX
-		-DPLD_ps=$(usex latex ON OFF)
-		# PDF
-		-DPLD_pdf=$(usex pdf ON OFF)
-		# Qt
-		-DPLD_aqt=$(usex qt5 ON OFF)
-		-DPLD_bmpqt=$(usex qt5 ON OFF)
-		-DPLD_epsqt=$(usex qt5 ON OFF)
-		-DPLD_extqt=$(usex qt5 ON OFF)
-		-DPLD_jpgqt=$(usex qt5 ON OFF)
-		-DPLD_memqt=$(usex qt5 ON OFF)
-		-DPLD_pdfqt=$(usex qt5 ON OFF)
-		-DPLD_pngqt=$(usex qt5 ON OFF)
-		-DPLD_ppmqt=$(usex qt5 ON OFF)
-		-DPLD_qtwidget=$(usex qt5 ON OFF)
-		-DPLD_svgqt=$(usex qt5 ON OFF)
-		-DPLD_tiffqt=$(usex qt5 ON OFF)
-		# SVG
-		-DPLD_svg=$(usex svg ON OFF)
-		# Tk
-		-DPLD_ntk=$(usex tk ON OFF)
-		-DPLD_tk=$(usex tk ON OFF)
-		-DPLD_tkwin=$(usex tk ON OFF)
-		# Truetype
-		-DPLD_psttf=$(usex truetype ON OFF)
-		# Wx
-		-DPLD_wxwidgets=$(usex wxwidgets ON OFF)
-		# X
-		-DPLD_xfig=$(usex X ON OFF)
-		-DPLD_xwin=$(usex X ON OFF)
-	)
-
-	use truetype && mycmakeargs+=(
-		-DPL_FREETYPE_FONT_PATH="${EPREFIX}"/usr/share/fonts/freefont
-	)
-	use shapefile && mycmakeargs+=(
-		-DSHAPELIB_INCLUDE_DIR="${EPREFIX}"/usr/include/libshp
-	)
-	use ocaml && mycmakeargs+=(
-		-DOCAML_INSTALL_DIR="$(ocamlc -where)"
-	)
-	use python && mycmakeargs+=(
-		-DENABLE_pyqt5=$(usex qt5)
-	)
-
-	cmake-utils_src_configure
-
-	# clean up bloated pkg-config files (help linking properly on prefix)
-	sed -i \
-		-e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \
-		-e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \
-		-e "s:${LDFLAGS}::g" \
-		"${BUILD_DIR}"/pkgcfg/*pc || die
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	if use java; then
-		java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar
-		java-pkg_regso "${EPREFIX}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so
-	fi
-}
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 7438223c0fe0..2d721c261cc3 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -8,7 +8,7 @@ DIST proj-datumgrid-1.8.tar.gz 6604329 BLAKE2B 78df259a811a79457d011b4f675f1a72b
 DIST proj-datumgrid-europe-1.4.tar.gz 26115747 BLAKE2B 3dfb5c19362f9d9cdfc4ee5469e536b97d963a5ac3bcf6652ef5935ec393f4035bc15abc444d62cfa477478faabd66a8effe64dbb8eb26b7d73a717b4eae2e53 SHA512 4043c0791af086541a3e08f7ad667b25968ed25e6595c1f047e1272f52838d28ab4010a076f9524882f97d7aa9104769c0b9cdf17394915c5b70b0dc13e019ee
 DIST proj-datumgrid-europe-1.5.tar.gz 187195036 BLAKE2B 0f88922435793930e21ace8488e0d1cd6a6325880f90d61a91d1592e51191514db7fc93e08c4a6c51699e3eb43762786d11eea425c181a8d3f73ec5ad7848092 SHA512 456a8c27dad7ef8fc1790ef822e7e8dcbc69b79e0a28df8c6b58d24b0ef4a3221cebd8e911a0d84b7f00694247b0fb8f4361a38d7369f921da000c838812f389
 EBUILD proj-4.9.2.ebuild 1276 BLAKE2B ab895282e8e50e906163c9be2541abf8420826aae4c9a5090224eb6b0edff8c64ae68dba2bfeb7ab58c4b733807f7f0c45b6bfd2bbd844819c66738984f92af8 SHA512 0a5fa49e0307e1ff228c38484d7b83f398c12b61b846585150a1fec5c933f82650b37677ddd6e87fffdc77381bc4d66cbd56a1b97be407301a5838bcfbbfa394
-EBUILD proj-5.2.0.ebuild 913 BLAKE2B cbbcf9ef7fa4133e78f8870b17a15ed16a8cd5b9ddcf907e7544c207c57e403d99ab1b13fd21750173b795898ad5a82d5dd7b22afd9a55942af9783f9228c91c SHA512 1c538f9218c6e5436f7c119260f955cbba41a5769b74a1f2044b903ceb98da9f8443d77b119aa4c9339feabbba9ec5d5f9002063a661a2173fc30c77fd00cdc3
+EBUILD proj-5.2.0.ebuild 912 BLAKE2B 17615cadc426d50a728b460b8b24c82536049dda4cec04500e0e066043f339eff685b52669e58dc6475f77a1c7fb8d8d39fb233af941f800fb6e85472c4ab1ee SHA512 753932af1fd02f1ba414d712a54ac6bc5ea9e86f9585cb5c899b48b6791389624bd746cd9fdef09e298e745627aea696a8bada0a7d23b17c4e0596640f89ce19
 EBUILD proj-6.2.1.ebuild 1122 BLAKE2B 417b73206d2366634b0b770266a3debbb97c3cf1db46c01df774134056bdef47b3877a1f10779b85e37100f96303449614f1b33662c21d4e8dbd8bfde50ab7ff SHA512 8bfa832202057ede229f6c1e48db2acab2c99647ac6b0e48c69fc9d0754c5c94301d4f885f0cb8b0f17b10d2dbb02c6a4392c33aba93a252a29666b2d079c3b9
 EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-5.2.0.ebuild b/sci-libs/proj/proj-5.2.0.ebuild
index e3978cac85e0..d08ae8605580 100644
--- a/sci-libs/proj/proj-5.2.0.ebuild
+++ b/sci-libs/proj/proj-5.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="static-libs"
 
 src_unpack() {
diff --git a/sci-libs/shogun/Manifest b/sci-libs/shogun/Manifest
index d4cb18146d65..d5ce0126646d 100644
--- a/sci-libs/shogun/Manifest
+++ b/sci-libs/shogun/Manifest
@@ -2,5 +2,5 @@ AUX shogun-4.1.0-remove-C-linkage.patch 825 BLAKE2B c95a7a322b669aa51a9a33470088
 AUX shogun-5.0.0-fix-buildsystem.patch 2889 BLAKE2B 63593dcf5f077310c31983446d5060c15c23d45d3eb5e3780c0d7a53074ccef57da79fb115ce67b109ed94f2e58aa1e5804bdbd1d0d0a13c05de716de7ed1058 SHA512 3119a95e8fe76804eb113361e09260bbb951679faeb3360d378c0a9afcdbf322ac75f02da6e4c799102949abbd97006f2bbb7550b5f5b01fa8b4335ac530f377
 DIST shogun-5.0.0.tar.bz2 2448509 BLAKE2B 85352d782740b4c671bb6081e0445bb7e801e27e36fdc0f82658b937fd6658c41016e4a91841ddb09ae9062b77d32f290f56b191318c1c34bf0812d1b9a8b364 SHA512 fa8d9dee4596acce12022540a6927cbdb62e08f8468c8be3790de07ebf3a53055032bcc532b28334ca83284c38f2b0153602634f12bafe4019acb9121b9ff236
 DIST shogun-data-0.9.tar.bz2 287533841 BLAKE2B 796830262205961b88715f4eb60a47ff2ad108426b7af8e4e1a0733920962ad8154a1ab9892356e9793be24d415fcbc358960210f089a0173f55a0091ea3c0d1 SHA512 ab501640e2db650603899c857866b451fac5c7bbbc7b4ef98559581928869cea49aa326dfca1bb398eee7ebc8843dcc8ee3105c9f462718f1af672aac6b9340a
-EBUILD shogun-5.0.0.ebuild 3873 BLAKE2B 72234d886953a021559cf62f1ab039034fdbd459fe993124af2815463c5f50f2388bcc63378388ef0d7e29ed7dd8fcd7c0e4b49836c351d33ec2e8c389a4109e SHA512 867f7b252ff41751beb437a2a4698395723cb53ba72b14b8e17b59349f270acc12c95d074362dac75264ba9dd7763401e13901085aea67512b05ccd14cf1389f
+EBUILD shogun-5.0.0-r1.ebuild 3949 BLAKE2B 463854879e2d7a446ad0b655b0d9a702783c5ecb1247c2403ee9e0f40b02fa562671007b4d3335c547d4ca1449d472045430cda4c7325c9cd232fbf849fd39ad SHA512 b0a8e38dfb714f128c52ce61d2bae4f4dbd61deefd2b830d97d1172eeec469f251e13e657992e2e2a97fb55da5140fba477e8ce4dc4f3a5659141b7ca42f60e1
 MISC metadata.xml 1627 BLAKE2B 871fc71cd8ae67ef94fa060b50f249b233333ec934db4d8ad238f24408e491f071d1271903f57ad2548923b2091c0f2738a7ce3f269d5c24fd10300aaf179047 SHA512 babaf4f8a5d4a7d83e678d2ba1cb4f29a15a928740e7c2b312fe03ffd2c909f1f867a071573954269a03bd8f915f38f82c4c11782573ae08be6ec053cf3b54c6
diff --git a/sci-libs/shogun/shogun-5.0.0-r1.ebuild b/sci-libs/shogun/shogun-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..1db83f206fad
--- /dev/null
+++ b/sci-libs/shogun/shogun-5.0.0-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake-utils flag-o-matic python-single-r1 toolchain-funcs versionator
+
+MYPV=$(get_version_component_range 1-2)
+MYPD=${PN}-data-0.9
+
+DESCRIPTION="Large Scale Machine Learning Toolbox"
+HOMEPAGE="https://shogun-toolbox.org/"
+SRC_URI="
+	ftp://shogun-toolbox.org/shogun/releases/${MYPV}/sources/${P}.tar.bz2
+	test? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )
+	examples? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )"
+
+LICENSE="GPL-3 free-noncomm"
+SLOT="0/16"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse doc examples lua octave opencl python R ruby static-libs test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( python )"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/gzip
+	app-arch/lzma
+	app-arch/snappy
+	dev-libs/lzo
+	dev-cpp/eigen:3
+	dev-libs/json-c:=
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	net-misc/curl
+	sci-libs/arpack
+	sci-libs/arprec
+	sci-libs/colpack
+	sci-libs/hdf5:=
+	sci-libs/nlopt
+	sci-mathematics/glpk:=
+	sci-mathematics/lpsolve:=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	lua? ( dev-lang/lua:0 )
+	octave? ( >=sci-mathematics/octave-4.2.0:=[hdf5] )
+	opencl? ( virtual/opencl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	R? ( dev-lang/R )
+	ruby? ( dev-ruby/narray )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.13-r1[dot]
+		dev-python/sphinx
+	)
+	lua? ( >=dev-lang/swig-3.0.12 )
+	octave? ( >=dev-lang/swig-3.0.12 )
+	python? (
+		>=dev-lang/swig-3.0.12
+		test? (
+			sci-libs/scipy
+		)
+	)
+	R? ( >=dev-lang/swig-3.0.12 )
+	ruby? ( >=dev-lang/swig-3.0.12 )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jinja[${PYTHON_MULTI_USEDEP}]
+		')
+		>=dev-cpp/gtest-1.8.0
+	)"
+
+# javamodular needs jblas (painful to package properly)
+# permodular work in progress (as 3.2.0)
+# could actually support multiple pythons, multiple rubys
+# feel free to do work for it
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.0-fix-buildsystem.patch
+	"${FILESDIR}"/${PN}-4.1.0-remove-C-linkage.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	export ATLAS_LIBRARY="$($(tc-getPKG_CONFIG) --libs cblas lapack)"
+	export CBLAS_LIBRARY="$($(tc-getPKG_CONFIG) --libs cblas)"
+	export ATLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas cblas lapack)"
+	export LAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags cblas)"
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		-DENABLE_TESTING=$(usex test)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DDISABLE_SSE=$(usex !cpu_flags_x86_sse)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Pandoc=ON
+		$(cmake-utils_use_find_package doc Sphinx)
+		$(cmake-utils_use_find_package doc Doxygen)
+
+		# Features:
+		-DENABLE_COVERAGE=OFF
+		-DENABLE_COLPACK=ON
+		-DENABLE_PROTOBUF=ON
+		-DENABLE_PYTHON_DEBUG=OFF
+		-DENABLE_VIENNACL=$(usex opencl)
+		-DUSE_ARPREC=ON
+		-DUSE_HDF5=ON
+
+		# Bindings:
+		-DJavaModular=OFF
+		-DPerlModular=OFF
+		-DCSharpModular=OFF
+		-DLuaModular=$(usex lua)
+		-DOctaveModular=$(usex octave)
+		-DPythonModular=$(usex python)
+		-DRModular=$(usex R)
+		-DRubyModular=$(usex ruby)
+
+		# Disable bundled libs
+		-DBUNDLE_COLPACK=OFF
+		-DBUNDLE_JSON=OFF
+		-DBUNDLE_NLOPT=OFF
+	)
+	cmake-utils_src_configure
+
+	# gentoo bug #302621
+	has_version 'sci-libs/hdf5[mpi]' && export CXX=mpicxx CC=mpicc
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile -C doc
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		local i
+		for i in lua octave python R ruby; do
+			if use $i; then
+				docinto html/${i,}_modular
+				dodoc -r "${BUILD_DIR}"/src/interfaces/${i,}_modular/modshogun/doxygen_xml/.
+			fi
+		done
+	fi
+}
diff --git a/sci-libs/shogun/shogun-5.0.0.ebuild b/sci-libs/shogun/shogun-5.0.0.ebuild
deleted file mode 100644
index 3bca4c41c568..000000000000
--- a/sci-libs/shogun/shogun-5.0.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MYPV=$(get_version_component_range 1-2)
-MYPD=${PN}-data-0.9
-
-DESCRIPTION="Large Scale Machine Learning Toolbox"
-HOMEPAGE="https://shogun-toolbox.org/"
-SRC_URI="
-	ftp://shogun-toolbox.org/shogun/releases/${MYPV}/sources/${P}.tar.bz2
-	test? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )
-	examples? ( ftp://shogun-toolbox.org/shogun/data/${MYPD}.tar.bz2 )"
-
-LICENSE="GPL-3 free-noncomm"
-SLOT="0/16"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse doc examples lua octave opencl python R ruby static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( python )"
-
-RDEPEND="
-	app-arch/bzip2
-	app-arch/gzip
-	app-arch/lzma
-	app-arch/snappy
-	dev-libs/lzo
-	dev-cpp/eigen:3
-	dev-libs/json-c:=
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	net-misc/curl
-	sci-libs/arpack
-	sci-libs/arprec
-	sci-libs/colpack
-	sci-libs/hdf5:=
-	sci-libs/nlopt
-	sci-mathematics/glpk:=
-	sci-mathematics/lpsolve:=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/blas
-	virtual/cblas
-	virtual/lapack
-	lua? ( dev-lang/lua:0 )
-	octave? ( >=sci-mathematics/octave-4.2.0:=[hdf5] )
-	opencl? ( virtual/opencl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	R? ( dev-lang/R )
-	ruby? ( dev-ruby/narray )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.8.13-r1[dot]
-		dev-python/sphinx
-	)
-	lua? ( >=dev-lang/swig-3.0.12 )
-	octave? ( >=dev-lang/swig-3.0.12 )
-	python? (
-		>=dev-lang/swig-3.0.12
-		test? (
-			sci-libs/scipy
-		)
-	)
-	R? ( >=dev-lang/swig-3.0.12 )
-	ruby? ( >=dev-lang/swig-3.0.12 )
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		>=dev-cpp/gtest-1.8.0
-	)"
-
-# javamodular needs jblas (painful to package properly)
-# permodular work in progress (as 3.2.0)
-# could actually support multiple pythons, multiple rubys
-# feel free to do work for it
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.0-fix-buildsystem.patch
-	"${FILESDIR}"/${PN}-4.1.0-remove-C-linkage.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	export ATLAS_LIBRARY="$($(tc-getPKG_CONFIG) --libs cblas lapack)"
-	export CBLAS_LIBRARY="$($(tc-getPKG_CONFIG) --libs cblas)"
-	export ATLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas cblas lapack)"
-	export LAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags cblas)"
-
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DCMAKE_SKIP_INSTALL_RPATH=ON
-		-DLIB_INSTALL_DIR=$(get_libdir)
-		-DENABLE_TESTING=$(usex test)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DDISABLE_SSE=$(usex !cpu_flags_x86_sse)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Pandoc=ON
-		$(cmake-utils_use_find_package doc Sphinx)
-		$(cmake-utils_use_find_package doc Doxygen)
-
-		# Features:
-		-DENABLE_COVERAGE=OFF
-		-DENABLE_COLPACK=ON
-		-DENABLE_PROTOBUF=ON
-		-DENABLE_PYTHON_DEBUG=OFF
-		-DENABLE_VIENNACL=$(usex opencl)
-		-DUSE_ARPREC=ON
-		-DUSE_HDF5=ON
-
-		# Bindings:
-		-DJavaModular=OFF
-		-DPerlModular=OFF
-		-DCSharpModular=OFF
-		-DLuaModular=$(usex lua)
-		-DOctaveModular=$(usex octave)
-		-DPythonModular=$(usex python)
-		-DRModular=$(usex R)
-		-DRubyModular=$(usex ruby)
-
-		# Disable bundled libs
-		-DBUNDLE_COLPACK=OFF
-		-DBUNDLE_JSON=OFF
-		-DBUNDLE_NLOPT=OFF
-	)
-	cmake-utils_src_configure
-
-	# gentoo bug #302621
-	has_version 'sci-libs/hdf5[mpi]' && export CXX=mpicxx CC=mpicc
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile -C doc
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		local i
-		for i in lua octave python R ruby; do
-			if use $i; then
-				docinto html/${i,}_modular
-				dodoc -r "${BUILD_DIR}"/src/interfaces/${i,}_modular/modshogun/doxygen_xml/.
-			fi
-		done
-	fi
-}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index 1148129c7740..aef53232a9d4 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -33,7 +33,7 @@ DIST tensorflow-1.15.0.tar.gz 46183168 BLAKE2B 5ccd87d5b53d6c543728e9c7ef96f1214
 DIST tensorflow-2.0.0.tar.gz 46176997 BLAKE2B 761e91a774f61b50459240a83fe52f723a76c2cc3eaf7c371684849cb7365b94fb3743ab8de9adffe64bef0f70da2bb0b7e6426a3f402e436eff841d3edefe8d SHA512 c3a2cb9673d2ade8e83961f7d944165123d0e4d94e6ca4d8fdee4f02f536893b879bbbf78d3ad5e557467b58f97f7194f2d9cfc64d7d05540969be732070eecc
 DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B 63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff SHA512 6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
 DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B 67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225 SHA512 a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
-EBUILD tensorflow-1.15.0.ebuild 11926 BLAKE2B db5054d61568b6b3f1843d553c5957ad8ec30a08aca20b134dd62c8fc9978823eaae41e8ae6118c7899693fb591cdce536d67b6cd197ebb4fe528f5bd407b243 SHA512 b47db814bde146455cbede7516b7aeb972d32e557c62684aa33be1a01f3a5e09f8eee6107ca151aab93f296ad3042778c71e1a1590e697bacdd42f1447890e93
-EBUILD tensorflow-2.0.0.ebuild 11982 BLAKE2B 1cf285381b1c9a90abd4880cb1d2a370fa16ab668597e2cc13bfb97237a8585d61774b2b97e39cab7d0dddb1b02b9b476a9ca6ffaa28557d822758c12f08f2ed SHA512 a02758690fd3aaef021dba985f714d584b16920c6226e8adc504c69ca2d04646495550a00166a8e3b408074baed08959cf4ac5e16a5917c1e09ac99e0805b06e
-EBUILD tensorflow-2.1.0.ebuild 12435 BLAKE2B 12688e6060086531910518a2a13d706181757ac022061b71cde2da690d6e3ba3c6d55d485034db36c627803e292a7343b3ecab8ede704c6525299d16474e5edc SHA512 da9cdb6678f80d918d266610cdf907e45ccc335ab861b9c272b83106f1c56b142a0adf58098810573b639c8602b5c46ef40fa4840a92840d1a11f9afd0e58ffb
+EBUILD tensorflow-1.15.0.ebuild 11924 BLAKE2B 676bdcd9ea4adff9bf622bf1cf9bedfbd2eeea297db3e608e030fdbc1607feafeb865c3eb526f127998c4ed7149e0efebc267daf794d7b6cffb13fc49d5700f1 SHA512 e08207530f1e11b6987c14c589e4ffb0bc959a0ccb5d4a45ba7bddc12b07b4cdf59ebae8705ece969abe3292ec5c3838e36035bc255b906fce31e8cf6cbdad24
+EBUILD tensorflow-2.0.0.ebuild 11980 BLAKE2B 4a9a6b3e619ac91d2612f604451d2067b613a7872272708bbbb0a2484fc639bef8da6d0a1858713a2c9a8912453a03c03e6d8ec645392350ac1db8a62a0bd32a SHA512 47bedd5e042cb703f7383fd9d573e19f1100e3491e49ed1aeda8136cdbd732606efb72fa42a75f3c81be64cffbb411dcc40c4b65f4066f80be4f20c2af3a1b2b
+EBUILD tensorflow-2.1.0.ebuild 12433 BLAKE2B 801dedbd741e000e0dc6b563c3425e332fcf1fbb6a6401488cd9803a40c842e75ded9c61d583b13d4c8640749963a8c1e69a70fd81182235e0cd326f27ec453c SHA512 d7497b905513c6f74cec2a49a29e17a4adba637f8e1c3d63410c76721007d0f34938cbbba92dc7dce88ceb37a981a804354a6384d5ab7b199d6a532bf791d127
 MISC metadata.xml 606 BLAKE2B 910509df7310f05e34bbdd7223a9ad64e4f67c67174d3868629d594022aeab23fb9631fb17782b5787e7880cb2990ffed7d14c030ab86a25c23c8118330bc690 SHA512 ffc3f68be38618f77b7d31406292e3a4ead2819d19aa7c8b1eb779e03027b9220cc248645cad44e31a6f0c113f4aeeed2a45060617b1bb03695bd2c684262b30
diff --git a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
index 346da2aec9d2..7844e3a1a28b 100644
--- a/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.15.0.ebuild
@@ -202,7 +202,7 @@ src_configure() {
 		export TF_CUDA_CLANG=0
 		export TF_NEED_TENSORRT=0
 		if use cuda; then
-			export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda"
+			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
 			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
 			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
 			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
diff --git a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
index c72dd4ffc983..902eac64ba84 100644
--- a/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.0.0.ebuild
@@ -201,7 +201,7 @@ src_configure() {
 		export TF_CUDA_CLANG=0
 		export TF_NEED_TENSORRT=0
 		if use cuda; then
-			export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda"
+			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
 			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
 			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
 			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
diff --git a/sci-libs/tensorflow/tensorflow-2.1.0.ebuild b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
index 5a87c8ff00d5..ff79ebeaaeb4 100644
--- a/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.1.0.ebuild
@@ -207,7 +207,7 @@ src_configure() {
 		export TF_CUDA_CLANG=0
 		export TF_NEED_TENSORRT=0
 		if use cuda; then
-			export TF_CUDA_PATHS="${EPREFIX%/}/opt/cuda"
+			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
 			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
 			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
 			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest
index 4f0c85c48bcc..b01037b8c366 100644
--- a/sci-libs/vtk/Manifest
+++ b/sci-libs/vtk/Manifest
@@ -2,5 +2,5 @@ DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3
 DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047
 DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31
 DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c
-EBUILD vtk-8.1.0-r3.ebuild 8931 BLAKE2B f956f07a1a71b6eed436ad444049f6e08b2adc4cb0d63d56cc08fe652a49c50ad80fefe4adc99fdbcbe116242fba2d081a1328de8b59dddb2d7db9e56215108f SHA512 fd0c6f1d1d647a88023754ba0aadf42db45938bff96d669594335bb7549d367692c11e987a25eff30cddfef49635040c393cc1af94133bba26e9cee18ea3d931
+EBUILD vtk-8.1.0-r4.ebuild 9086 BLAKE2B 3e59770e1967717da09b3c030f68981303ee437f91d91158ce9f46f1de8b13f368f32c1c991063f79f9ae86911038c3299ebfe9a8bcb6583c79ea37f1eac03be SHA512 1ec95b43a46bb7d5c26ca7dd9e7aa4464e586fffc167c0a13503416125368747991f58d3276cc10c76307f25eaba456b0662ad49c712d7f2a5f52de09e45111e
 MISC metadata.xml 988 BLAKE2B 2533eda3936361d835dba2e30f1b1a19484facc289603d82b6c2012ee242e7778b1080d7136584c08113d7a82e0742d7bb2373984667301a4c7d52b4dbd8b087 SHA512 f4e29e15a05cfb49b24f4a8e24a6e43ac72ac0fa21ed640a70e5017263f23e21e514dedc489d963acd803407df8ee2bd2d6006c83eece795f91b4809d2ec2ff4
diff --git a/sci-libs/vtk/vtk-8.1.0-r3.ebuild b/sci-libs/vtk/vtk-8.1.0-r3.ebuild
deleted file mode 100644
index c2a250417f9e..000000000000
--- a/sci-libs/vtk/vtk-8.1.0-r3.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-WEBAPP_OPTIONAL=yes
-WEBAPP_MANUAL_SLOT=yes
-
-inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
-
-# Short package version
-SPV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="The Visualization Toolkit"
-HOMEPAGE="https://www.vtk.org/"
-SRC_URI="
-	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
-	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
-	examples? (
-		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
-		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
-	)"
-
-LICENSE="BSD LGPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="
-	all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
-	mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
-	video_cards_nvidia views web R +X xdmf2"
-
-REQUIRED_USE="
-	all-modules? ( python xdmf2 boost )
-	java? ( qt5 )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tcl? ( rendering )
-	examples? ( python )
-	tk? ( tcl )
-	web? ( python )
-	^^ ( X aqua offscreen )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	>=media-libs/freetype-2.5.4
-	>=media-libs/libharu-2.3.0-r2
-	media-libs/libpng:0=
-	media-libs/libtheora
-	media-libs/mesa
-	media-libs/tiff:0
-	sci-libs/exodusii
-	sci-libs/hdf5:=
-	sci-libs/netcdf:0=
-	sci-libs/netcdf-cxx:3
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	boost? ( dev-libs/boost:=[mpi?] )
-	examples? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	gdal? ( sci-libs/gdal )
-	java? ( >=virtual/jdk-1.7:* )
-	mpi? (
-		virtual/mpi[cxx,romio]
-		python? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-	)
-	mysql? ( virtual/mysql )
-	odbc? ( dev-db/unixODBC )
-	offscreen? ( media-libs/mesa[osmesa] )
-	postgres? ( dev-db/postgresql:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/sip[${PYTHON_USEDEP}]
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsql:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		python? ( dev-python/PyQt5[${PYTHON_USEDEP}] )
-	)
-	R? ( dev-lang/R )
-	tbb? ( dev-cpp/tbb )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )
-	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	web? (
-		${WEBAPP_DEPEND}
-		dev-python/autobahn[${PYTHON_USEDEP}]
-		dev-python/constantly[${PYTHON_USEDEP}]
-		dev-python/hyperlink[${PYTHON_USEDEP}]
-		dev-python/incremental[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/txaio[${PYTHON_USEDEP}]
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-	)
-	xdmf2? ( sci-libs/xdmf2 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}"/VTK-${PV}
-
-RESTRICT="test"
-
-pkg_setup() {
-	use java && java-pkg-opt-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-	use web && webapp_pkg_setup
-}
-
-src_prepare() {
-	local x
-	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
-	for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
-		ebegin "Dropping bundled ${x}"
-		rm -r ThirdParty/${x}/vtk${x} || die
-		eend $?
-	done
-	rm -r \
-		ThirdParty/AutobahnPython/vtkAutobahn \
-		|| die
-
-	if use doc; then
-		einfo "Removing .md5 files from documents."
-		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
-		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
-			-i Utilities/Doxygen/CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# general configuration
-	local mycmakeargs=(
-		-Wno-dev
-		-DVTK_DIR="${S}"
-		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
-		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
-		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
-		-DBUILD_SHARED_LIBS=ON
-		-DVTK_USE_SYSTEM_AUTOBAHN=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_FreeType=ON
-		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
-		-DVTK_USE_SYSTEM_GL2PS=OFF
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LibXml2=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_OGGTHEORA=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_TWISTED=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF
-		-DVTK_USE_SYSTEM_XDMF3=OFF
-		-DVTK_USE_SYSTEM_ZLIB=ON
-		-DVTK_USE_SYSTEM_ZOPE=ON
-		-DVTK_USE_SYSTEM_LIBRARIES=ON
-		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
-		-DVTK_USE_SYSTEM_DIY2=OFF
-		-DVTK_USE_GL2PS=ON
-		-DVTK_USE_LARGE_DATA=ON
-		-DVTK_USE_PARALLEL=ON
-		-DVTK_EXTRA_COMPILER_WARNINGS=ON
-		-DVTK_Group_StandAlone=ON
-		-DBUILD_DOCUMENTATION=$(usex doc)
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
-		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
-		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
-		-DVTK_Group_Imaging=$(usex imaging)
-		-DVTK_Group_MPI=$(usex mpi)
-		-DVTK_Group_Rendering=$(usex rendering)
-		-DVTK_Group_Tk=$(usex tk)
-		-DVTK_Group_Views=$(usex views)
-		-DVTK_Group_Web=$(usex web)
-		-DVTK_WWW_DIR="${ED%/}/${MY_HTDOCSDIR}"
-		-DVTK_WRAP_JAVA=$(usex java)
-		-DVTK_WRAP_PYTHON=$(usex python)
-		-DVTK_WRAP_PYTHON_SIP=$(usex python)
-		-DVTK_WRAP_TCL=$(usex tcl)
-		-DVTK_USE_BOOST=$(usex boost)
-		-DUSE_VTK_USE_BOOST=$(usex boost)
-		-DModule_vtkInfovisBoost=$(usex boost)
-		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
-		-DVTK_USE_ODBC=$(usex odbc)
-		-DModule_vtkIOODBC=$(usex odbc)
-		-DVTK_USE_OFFSCREEN=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
-		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
-		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
-		-DVTK_USE_X=$(usex X)
-	# IO
-		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
-		-DModule_vtkIOGDAL=$(usex gdal)
-		-DModule_vtkIOGeoJSON=$(usex json)
-		-DModule_vtkIOXdmf2=$(usex xdmf2)
-		-DBUILD_TESTING=$(usex examples)
-	# Apple stuff, does it really work?
-		-DVTK_USE_COCOA=$(usex aqua)
-	)
-
-	if use java; then
-		local javacargs=$(java-pkg_javac-args)
-		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
-	fi
-
-	if use tbb; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
-	else
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
-			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DPYTHON_LIBRARY="$(python_get_library_path)"
-			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
-			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
-			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
-			-DVTK_USE_SYSTEM_SIX=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DVTK_USE_QVTK_OPENGL=ON
-			-DVTK_USE_QVTK_QTOPENGL=ON
-			-DQT_WRAP_CPP=ON
-			-DQT_WRAP_UI=ON
-			-DVTK_INSTALL_QT_DIR="$(qt5_get_libdir)/qt5/plugins/designer"
-			-DDESIRED_QT_VERSION=5
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-		)
-	fi
-
-	if use R; then
-		mycmakeargs+=(
-			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
-			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
-		)
-	fi
-
-	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
-
-	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
-
-	if use mpi; then
-		export CC=mpicc
-		export CXX=mpicxx
-		export FC=mpif90
-		export F90=mpif90
-		export F77=mpif77
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use web && webapp_src_preinst
-
-	cmake-utils_src_install
-
-	use java && java-pkg_regjar "${ED%/}"/usr/$(get_libdir)/${PN}.jar
-
-	# Stop web page images from being compressed
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen
-
-	if use tcl; then
-		# install Tcl docs
-		docinto vtk_tcl
-		dodoc Wrapping/Tcl/README
-		docinto .
-	fi
-
-	# install examples
-	if use examples; then
-		einfo "Installing examples"
-		mv -v {E,e}xamples || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	# environment
-	cat >> "${T}"/40${PN} <<- EOF || die
-		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
-		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
-		VTKHOME=${EPREFIX}/usr
-		EOF
-	doenvd "${T}"/40${PN}
-
-	use web && webapp_src_install
-}
-
-# webapp.eclass exports these but we want it optional #534036
-pkg_postinst() {
-	use web && webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use web && webapp_pkg_prerm
-}
diff --git a/sci-libs/vtk/vtk-8.1.0-r4.ebuild b/sci-libs/vtk/vtk-8.1.0-r4.ebuild
new file mode 100644
index 000000000000..0618010649df
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.1.0-r4.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp
+
+# Short package version
+SPV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/"
+SRC_URI="
+	https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
+	doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz )
+	examples? (
+		https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+		https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+	)"
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="
+	all-modules aqua boost doc examples imaging ffmpeg gdal java json mpi
+	mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
+	video_cards_nvidia views web R +X xdmf2"
+
+REQUIRED_USE="
+	all-modules? ( python xdmf2 boost )
+	java? ( qt5 )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	tcl? ( rendering )
+	examples? ( python )
+	tk? ( tcl )
+	web? ( python )
+	^^ ( X aqua offscreen )"
+
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	>=media-libs/freetype-2.5.4
+	>=media-libs/libharu-2.3.0-r2
+	media-libs/libpng:0=
+	media-libs/libtheora
+	media-libs/mesa
+	media-libs/tiff:0
+	sci-libs/exodusii
+	sci-libs/hdf5:=
+	sci-libs/netcdf:0=
+	sci-libs/netcdf-cxx:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	boost? ( dev-libs/boost:=[mpi?] )
+	examples? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	gdal? ( sci-libs/gdal )
+	java? ( >=virtual/jdk-1.7:* )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	offscreen? ( media-libs/mesa[osmesa] )
+	postgres? ( dev-db/postgresql:= )
+	R? ( dev-lang/R )
+	tbb? ( dev-cpp/tbb )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+	video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	web? (
+		${WEBAPP_DEPEND}
+		$(python_gen_cond_dep '
+			dev-python/autobahn[${PYTHON_MULTI_USEDEP}]
+			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
+			dev-python/hyperlink[${PYTHON_MULTI_USEDEP}]
+			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+			dev-python/txaio[${PYTHON_MULTI_USEDEP}]
+			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	xdmf2? ( sci-libs/xdmf2 )
+	$(python_gen_cond_dep "
+		mpi? (
+			virtual/mpi[cxx,romio]
+			python? ( dev-python/mpi4py[\${PYTHON_MULTI_USEDEP}] )
+		)
+		python? (
+			${PYTHON_DEPS}
+			dev-python/sip[\${PYTHON_MULTI_USEDEP}]
+		)
+		qt5? (
+			dev-qt/designer:5
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtopengl:5
+			dev-qt/qtsql:5
+			dev-qt/qtwebkit:5
+			dev-qt/qtx11extras:5
+			python? ( dev-python/PyQt5[\${PYTHON_MULTI_USEDEP}] )
+		)
+	")"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}"/VTK-${PV}
+
+RESTRICT="test"
+
+pkg_setup() {
+	use java && java-pkg-opt-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+	use web && webapp_pkg_setup
+}
+
+src_prepare() {
+	local x
+	# missing: VPIC freerange libproj4 mrmpi sqlite utf8 verdict xmdf2 xmdf3
+	for x in constantly expat freetype hdf5 hyperlink incremental jpeg jsoncpp libharu libxml2 lz4 netcdf oggtheora png tiff Twisted txaio zlib ZopeInterface; do
+		ebegin "Dropping bundled ${x}"
+		rm -r ThirdParty/${x}/vtk${x} || die
+		eend $?
+	done
+	rm -r \
+		ThirdParty/AutobahnPython/vtkAutobahn \
+		|| die
+
+	if use doc; then
+		einfo "Removing .md5 files from documents."
+		rm -f "${WORKDIR}"/html/*.md5 || die "Failed to remove superfluous hashes"
+		sed -e "s|\${VTK_BINARY_DIR}/Utilities/Doxygen/doc|${WORKDIR}|" \
+			-i Utilities/Doxygen/CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	# general configuration
+	local mycmakeargs=(
+		-Wno-dev
+		-DVTK_DIR="${S}"
+		-DVTK_INSTALL_LIBRARY_DIR=$(get_libdir)
+		-DVTK_INSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DVTK_DATA_ROOT="${EPREFIX}/usr/share/${PN}/data"
+		-DVTK_CUSTOM_LIBRARY_SUFFIX=""
+		-DBUILD_SHARED_LIBS=ON
+		-DVTK_USE_SYSTEM_AUTOBAHN=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_FreeType=ON
+		# Use bundled gl2ps (bundled version is a patched version of 1.3.9. Post 1.3.9 versions should be compatible)
+		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_LIBPROJ4=OFF
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_LibXml2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_XDMF3=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		-DVTK_USE_SYSTEM_LIBRARIES=ON
+		# Use bundled diy2 (no gentoo package / upstream does not provide a Finddiy2.cmake or diy2Config.cmake / diy2-config.cmake)
+		-DVTK_USE_SYSTEM_DIY2=OFF
+		-DVTK_USE_GL2PS=ON
+		-DVTK_USE_LARGE_DATA=ON
+		-DVTK_USE_PARALLEL=ON
+		-DVTK_EXTRA_COMPILER_WARNINGS=ON
+		-DVTK_Group_StandAlone=ON
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_VTK_BUILD_ALL_MODULES_FOR_TESTS=off
+		-DVTK_BUILD_ALL_MODULES=$(usex all-modules)
+		-DUSE_DOCUMENTATION_HTML_HELP=$(usex doc)
+		-DVTK_Group_Imaging=$(usex imaging)
+		-DVTK_Group_MPI=$(usex mpi)
+		-DVTK_Group_Rendering=$(usex rendering)
+		-DVTK_Group_Tk=$(usex tk)
+		-DVTK_Group_Views=$(usex views)
+		-DVTK_Group_Web=$(usex web)
+		-DVTK_WWW_DIR="${ED%/}/${MY_HTDOCSDIR}"
+		-DVTK_WRAP_JAVA=$(usex java)
+		-DVTK_WRAP_PYTHON=$(usex python)
+		-DVTK_WRAP_PYTHON_SIP=$(usex python)
+		-DVTK_WRAP_TCL=$(usex tcl)
+		-DVTK_USE_BOOST=$(usex boost)
+		-DUSE_VTK_USE_BOOST=$(usex boost)
+		-DModule_vtkInfovisBoost=$(usex boost)
+		-DModule_vtkInfovisBoostGraphAlgorithms=$(usex boost)
+		-DVTK_USE_ODBC=$(usex odbc)
+		-DModule_vtkIOODBC=$(usex odbc)
+		-DVTK_USE_OFFSCREEN=$(usex offscreen)
+		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+		-DVTK_USE_OGGTHEORA_ENCODER=$(usex theora)
+		-DVTK_USE_NVCONTROL=$(usex video_cards_nvidia)
+		-DModule_vtkFiltersStatisticsGnuR=$(usex R)
+		-DVTK_USE_X=$(usex X)
+	# IO
+		-DVTK_USE_FFMPEG_ENCODER=$(usex ffmpeg)
+		-DModule_vtkIOGDAL=$(usex gdal)
+		-DModule_vtkIOGeoJSON=$(usex json)
+		-DModule_vtkIOXdmf2=$(usex xdmf2)
+		-DBUILD_TESTING=$(usex examples)
+	# Apple stuff, does it really work?
+		-DVTK_USE_COCOA=$(usex aqua)
+	)
+
+	if use java; then
+		local javacargs=$(java-pkg_javac-args)
+		mycmakeargs+=( -DJAVAC_OPTIONS=${javacargs// /;} )
+	fi
+
+	if use tbb; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="TBB" )
+	else
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE="Sequential" )
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_INSTALL_PYTHON_MODULE_DIR="$(python_get_sitedir)"
+			-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DPYTHON_LIBRARY="$(python_get_library_path)"
+			-DSIP_PYQT_DIR="${EPREFIX}/usr/share/sip"
+			-DSIP_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
+			-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
+			-DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX} --root=${D}"
+			-DVTK_USE_SYSTEM_SIX=ON
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-DVTK_USE_QVTK=ON
+			-DVTK_USE_QVTK_OPENGL=ON
+			-DVTK_USE_QVTK_QTOPENGL=ON
+			-DQT_WRAP_CPP=ON
+			-DQT_WRAP_UI=ON
+			-DVTK_INSTALL_QT_DIR="$(qt5_get_libdir)/qt5/plugins/designer"
+			-DDESIRED_QT_VERSION=5
+			-DVTK_QT_VERSION=5
+			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
+			-DQT_INCLUDE_DIR="${EPREFIX}/usr/include/qt5"
+			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
+			-DVTK_Group_Qt:BOOL=ON
+		)
+	fi
+
+	if use R; then
+		mycmakeargs+=(
+			-DR_LIBRARY_BLAS=/usr/$(get_libdir)/R/lib/libR.so
+			-DR_LIBRARY_LAPACK=/usr/$(get_libdir)/R/lib/libR.so
+		)
+	fi
+
+	append-cppflags -D__STDC_CONSTANT_MACROS -D_UNICODE
+
+	use java && export JAVA_HOME="${EPREFIX}/etc/java-config-2/current-system-vm"
+
+	if use mpi; then
+		export CC=mpicc
+		export CXX=mpicxx
+		export FC=mpif90
+		export F90=mpif90
+		export F77=mpif77
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use web && webapp_src_preinst
+
+	cmake-utils_src_install
+
+	use java && java-pkg_regjar "${ED%/}"/usr/$(get_libdir)/${PN}.jar
+
+	# Stop web page images from being compressed
+	use doc && docompress -x /usr/share/doc/${PF}/doxygen
+
+	if use tcl; then
+		# install Tcl docs
+		docinto vtk_tcl
+		dodoc Wrapping/Tcl/README
+		docinto .
+	fi
+
+	# install examples
+	if use examples; then
+		einfo "Installing examples"
+		mv -v {E,e}xamples || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# environment
+	cat >> "${T}"/40${PN} <<- EOF || die
+		VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+		VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+		VTKHOME=${EPREFIX}/usr
+		EOF
+	doenvd "${T}"/40${PN}
+
+	use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+	use web && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+	use web && webapp_pkg_prerm
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index a4d97cbe18d6..e147d4b6b66f 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 5e5090ea1250..e79e24f2d751 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -6,6 +6,6 @@ AUX reduce-printf.patch 2105 BLAKE2B 3ba089546e8a67100c9ab6849854c91c78a9e74b138
 DIST msieve-1.53.tar.gz 976135 BLAKE2B 587007c4273b9e0ceb6dd17fb9310070b760f68f8f1c56014a168242d0989069a5257de39cba30c939b3b7e02918635d12b3153d05cd2abb9e4a6445c7ef1886 SHA512 e50e8913d38ed4108f5f2ecdbb338968edd416c56c5b7a92d8598b81fc16014ce7c7df963101c65f5bc88d1c7b2d8dbaa572efbecf53d720430a327929c9ce12
 DIST msieve151.tar.gz 623885 BLAKE2B a222f49fb1c6a411e1e46a7ed153e1ba24bbb604b70034c2c0632f69096e6a08a6783b25a44ffcd2d6b6962a8713455c893eb9514fb54a13f28a5b6a9aea3867 SHA512 79c03b5d669de7f05e27fc59fa999f416f513e41cba822376b862c31439fc66cf8749034c1f8f967f745955a5271a484b23e950ffede23d3fa2737ae26dbb0d4
 EBUILD msieve-1.51-r1.ebuild 1444 BLAKE2B 41db7580a8949792af750e712d66818d98c449500b7dc6e4ae0e11770db367b052ac7520adbd1c53f39b311d80f09e2703c961c568594224f7cffb72747d4ed4 SHA512 d25740704f94f2e6ceab9643a20d7013ba6c9cfdfec01983795f55596dff3c95836392294b9c86a6af3efeb6405e8bfc8483bb7d15301e4546aeb49f9c01c714
-EBUILD msieve-1.53-r1.ebuild 1469 BLAKE2B 8325e0ba994c25ce3280287542038f4731b639e0953801379dffef31cdc145d1666fafa326bb7177733af13a35cbc08ef9820f843fc409536fa7db74e2a631f7 SHA512 e8e04b4c66b190f3f43f6dfcf2e36cfb96f90557752cb2c118844c8c980f3327226517358bbda7c0c852c35e25071651cc28c53d5053232dfcf164a000836606
+EBUILD msieve-1.53-r1.ebuild 1457 BLAKE2B 3bc310d4bee6c42909058d0c2e54ef595e0cb732dd459e90fc6f7149f80fb806c6c4dc98beb2d6f38c75cd92e54a668ce13dfd6157a30996b0fbd2e93fe498ee SHA512 9895d4acf1854b7f86ac0e9b9cb62bcc2aa5aba925c1c3116b2fcfd10989dd92d54d4787703b651299ac42b8ddb972f260ce04f14787d729f160a07a65d616dc
 EBUILD msieve-9999.ebuild 1317 BLAKE2B 8cd2cc6925fcecc20e3e78bffbfe2e331c53dcd32e7432be57188f5de1ab081152fc944e5ebd56e1248f9e0dfd0e421e726cf24081c61176556e9ca19bb0f8e8 SHA512 9b7cc2ea8f065e47fcda5b83f043262b59cc6705adf14187d81bd8ec6c05f3d80c08011c7613ab0b040328ba8c5a2f3b6d651916d487fed9c6195f15f8428507
 MISC metadata.xml 417 BLAKE2B ac5b4847814369f3126102ccf20421069b3b7edace1b95951729507d84bd37966d5f02cefff41857d32661fba8353dd29bef4de63097d276018acbf8ace456dd SHA512 a8c43840089c4516cd31bfd2a9fee4202bdb5a264cb28b22dcd7d17cd40669056cdc4a5c7a437b092bc71b1ec9c1bf6d1bc7f0f8f61858818749fad3e93eaf1d
diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
index f590609455e3..dd74649ec4be 100644
--- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild
+++ b/sci-mathematics/msieve/msieve-1.53-r1.ebuild
@@ -46,11 +46,11 @@ src_compile() {
 }
 
 src_install() {
-	mkdir -p "${ED%/}/usr/include/msieve"
-	mkdir -p "${ED%/}/usr/lib/"
-	mkdir -p "${ED%/}/usr/share/doc/${P}/"
-	cp include/* "${ED%/}/usr/include/msieve" || die "Failed to install"
-	cp libmsieve.a "${ED%/}/usr/lib/" || die "Failed to install"
+	mkdir -p "${ED}/usr/include/msieve"
+	mkdir -p "${ED}/usr/lib/"
+	mkdir -p "${ED}/usr/share/doc/${P}/"
+	cp include/* "${ED}/usr/include/msieve" || die "Failed to install"
+	cp libmsieve.a "${ED}/usr/lib/" || die "Failed to install"
 	dobin msieve
-	cp Readme* "${ED%/}/usr/share/doc/${P}/" || die "Failed to install"
+	cp Readme* "${ED}/usr/share/doc/${P}/" || die "Failed to install"
 }
diff --git a/sci-mathematics/relational/Manifest b/sci-mathematics/relational/Manifest
index b28f6137fb52..c8874d38af75 100644
--- a/sci-mathematics/relational/Manifest
+++ b/sci-mathematics/relational/Manifest
@@ -1,3 +1,3 @@
 DIST relational_2.5.orig.tar.gz 118776 BLAKE2B bec1a8c1a3c7973b9200f9a61e65aa144998558a9798e1e869d970ba15d2f7970be8dad865cfa779f05ee535638011851534a3be0c354d216eb35f38f135cb4d SHA512 588e35a57cf915e544d62749b76ed81927ac06fd88271f0d4d88ee5f221928c2c24e2a88165aae63c1b9b120ddaa20e15e21fe9c207eac3150b744274ae45a8a
-EBUILD relational-2.5.ebuild 869 BLAKE2B d066edd39969b95a622ec79950d67a2c907dff527fc469df2b711c714caea7d0cf7a4ef6e457a42cc36e3fa4c0008859b10fef2eaf2cf389b2085ecc0a9ad4a5 SHA512 c7c3f81131c6e2f59ebd8fe136038e3bceb73a4b2c8f8d76537507c65f9800523c0e2fc8bfd3852278b166852ce1082df766a084961823421b6243f94089b631
+EBUILD relational-2.5-r1.ebuild 905 BLAKE2B b925e6d77fe89dc7519e8fa290754b363a838491e8e173a55895e8c4e08a12a3a7849aa31768cd54b4570e88262f40670ce90ba4c37ce3d4dfd71a1cb42d68ce SHA512 778b625db7a3ee0968d671c4d0689271d27df1a6a601d3717d2fb13ddf78ed3b6d1d6eb70ec4cbff47a1d46a825a44c085b67c8a566bbf8da87407a89089c50b
 MISC metadata.xml 329 BLAKE2B 72059e28c196f127a1c314ad5c63025937a9daf16e8457885da10c94c32ccffec36d4c5049f2dcf2faf9ae67fe934d334a7235bc0f2bec0836614362cd41d122 SHA512 18759433ae0bb33800dc14a9bd518bbd383b8bbdbf876b02dad81afcabe3f0eea7828bd6820989e13253d73c70528d2a3bb4637e5e28d2fa5aab28b84aecdf32
diff --git a/sci-mathematics/relational/relational-2.5-r1.ebuild b/sci-mathematics/relational/relational-2.5-r1.ebuild
new file mode 100644
index 000000000000..5bb400c2b91d
--- /dev/null
+++ b/sci-mathematics/relational/relational-2.5-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit python-single-r1
+
+DESCRIPTION="Educational tool for relational algebra"
+HOMEPAGE="https://ltworf.github.io/relational/"
+SRC_URI="https://github.com/ltworf/${PN}/releases/download/${PV}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[gui,webkit,widgets,${PYTHON_MULTI_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^Terminal=/ s/0/false/' \
+		-e '/^Keywords=/ s/$/;/' \
+		relational.desktop || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${ED}" install-{relational-cli,python3-relational,relational}
+	python_optimize
+
+	dodoc CHANGELOG complexity CREDITS README.md
+}
diff --git a/sci-mathematics/relational/relational-2.5.ebuild b/sci-mathematics/relational/relational-2.5.ebuild
deleted file mode 100644
index fb88c016ff80..000000000000
--- a/sci-mathematics/relational/relational-2.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-single-r1
-
-DESCRIPTION="Educational tool for relational algebra"
-HOMEPAGE="https://ltworf.github.io/relational/"
-SRC_URI="https://github.com/ltworf/${PN}/releases/download/${PV}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/PyQt5[gui,webkit,widgets,${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^Terminal=/ s/0/false/' \
-		-e '/^Keywords=/ s/$/;/' \
-		relational.desktop || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${ED}" install-{relational-cli,python3-relational,relational}
-	python_optimize
-
-	dodoc CHANGELOG complexity CREDITS README.md
-}
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 9350b6d0e167..adf65b94c5d8 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,3 @@
 DIST z3-4.8.6.tar.gz 4328752 BLAKE2B 4932670f3c1ab9bdba18a6ad80f4fd8812eb70d71705ebdf1f93c3b052ffb632dc10e4f7f4043f098af214288d6d4a4a26ef7f8cc0d1183c9f27b14ef1787c46 SHA512 d338413274a3d11a9e9287202989df9da4c31e095c14428a418d4019e9f86c0e2b681c519d2d0bcbb4cd99a722a2539006f5c86ade568b1ee208545b142369f1
-EBUILD z3-4.8.6.ebuild 2337 BLAKE2B 1f8627d18c873c2cfb398e030d5c738458ddb1847cc83623211aa384c623bdf9be4c4a5dd6d5766e508619c77cc7c9fcb2f5c71200b9b8c5df5c0c1dd4aac36d SHA512 ccd2db341b9e425d3bf00d722af24be8028659e3324c638cfd4556a1d0ee633f35dda3076af5c17a3b2d353fd6f97592530d39e7ff2dc851201811cae583cb39
+EBUILD z3-4.8.6.ebuild 2331 BLAKE2B 62d1efd6f32d39fe38a5d45750ccf579755084771f2e501ebcc42ead957581bfe007dab981c976fdd348d9ba08d1d52694fcfe5a0627b3e3b1c02a408905863f SHA512 759a9b8c0a1309226bd14ac0c3c1836c9e1bf70d4d14f82d9a4337a78e3ee4ddf068a8d4d8e421c7cd97697fd11a5a05addc48055de5cf78ee844262b0dbdd74
 MISC metadata.xml 862 BLAKE2B 1d219fcfb0772a48ec398a51b8916748db336730b91b66e336e8df0b8522b9a47df718d6303aff5f305b699e9297aaad9b352c69d529a93f66cf2a1b76c8f094 SHA512 2a5cc11ae87199a23c72ffb7366c65cbb33683bb6ad142d1df84a65b56bd69f50907bca69f066a1c860947254c241089521c026bac9ff92bd405038c266907ef
diff --git a/sci-mathematics/z3/z3-4.8.6.ebuild b/sci-mathematics/z3/z3-4.8.6.ebuild
index 24aed3818759..fe56e09602bd 100644
--- a/sci-mathematics/z3/z3-4.8.6.ebuild
+++ b/sci-mathematics/z3/z3-4.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-multilib python-single-r1 toolchain-funcs
 
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 5cde3427456f..c12988e8629f 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/vitables/Manifest b/sci-misc/vitables/Manifest
index 677287fd1808..cd7b01f930c3 100644
--- a/sci-misc/vitables/Manifest
+++ b/sci-misc/vitables/Manifest
@@ -1,3 +1,3 @@
 DIST ViTables-3.0.0.tar.gz 860411 BLAKE2B 7ef5a7ac681ac7d0d2544987080478deba39db275dc0559db48d0375ebd83f260eb37dc3b9e99b131fd427b81668b882f15549e6f1955615f9dee5927c6cc57d SHA512 0ab0a3529f70111f6d2c1a765398d0c05607e2839a353670eebfa26bedd2092a33afe9f1cad14eec5d23f76fc5f54fa6f61e2e4089d9c2f3fd43396dbbbba7b1
-EBUILD vitables-3.0.0.ebuild 878 BLAKE2B 0bcf8b17df188edfdfb3b2091de28a832a74c40982990b53c40fabc08801c8f8286451d2f528c9fdcb71265b5208d10feb1b93b1590d75493c9d6921ab075709 SHA512 3e9a49381dc317fe4a0057eff43e1803668dbcc106d0cda846237da9e9c1418f12188527357d3905eff7066ecae805338dd19e046c262689d0bba4b48245a6fe
+EBUILD vitables-3.0.0-r1.ebuild 928 BLAKE2B 821e225b801d2e9c2786a8fefa683c963f09930a6ce5f53475840b3f17cc8b6e3ee63fdb0dc6988c7dc86ae73be6ebe97e57ad49afeb124de8feee1697bee254 SHA512 a10ad3ac22a7ab7dafb1dc6269da8dc856990f6732b8c2f90544820d28f115b37d9e4a9b52ed902ddf3c8bc1f29596f5e727a4a62e8ba3dd127a4fc17cf2b528
 MISC metadata.xml 637 BLAKE2B 5de3507f0c14fd0a8af230464a40a60f861433cddea38ea9490a00477f7677045845e48465d1684b0e93cc94ad6423b416e4993aabc23c793114c70365f514c6 SHA512 3e891f2f726db29eb10ae7f26e4dd30abeb8cc3d251b119c226cccfa6ca8fc90311dae6b96acd810e95423674fb57017cae938f48e213d4a873da2d9e9ee7789
diff --git a/sci-misc/vitables/vitables-3.0.0-r1.ebuild b/sci-misc/vitables/vitables-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..c25d11326d4c
--- /dev/null
+++ b/sci-misc/vitables/vitables-3.0.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+MY_P=ViTables-${PV}
+
+DESCRIPTION="A graphical tool for browsing / editing files in both PyTables and HDF5 formats"
+HOMEPAGE="http://vitables.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytables[${PYTHON_MULTI_USEDEP}]
+		dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+	# remove the PyQt5 dependency
+	# because PyQt5 in Gentoo does not provide egg-info
+	# see also: https://github.com/pyqt/python-qt5/issues/18
+	sed "s:'PyQt5 [^ ]*::" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/sci-misc/vitables/vitables-3.0.0.ebuild b/sci-misc/vitables/vitables-3.0.0.ebuild
deleted file mode 100644
index e4f5b2f64482..000000000000
--- a/sci-misc/vitables/vitables-3.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-MY_P=ViTables-${PV}
-
-DESCRIPTION="A graphical tool for browsing / editing files in both PyTables and HDF5 formats"
-HOMEPAGE="http://vitables.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pytables[${PYTHON_USEDEP}]
-	dev-python/QtPy[gui,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# remove the PyQt5 dependency
-	# because PyQt5 in Gentoo does not provide egg-info
-	# see also: https://github.com/pyqt/python-qt5/issues/18
-	sed "s:'PyQt5 [^ ]*::" -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 23478bdd4620..30ecb7fee497 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 050ce77ec3cc..1ad9e687ef01 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -2,7 +2,7 @@ AUX 1056.patch 8628 BLAKE2B 435bd4f01c44142f91978603de0f276f6c16819325e48bda9a23
 AUX 2277.patch 645 BLAKE2B 0314dce1d9ec6b95e3ebfecb6253494e52b732fb27446f146b73bcc8a14ecdc767f434069563b6c6275dc25c591ac4ed422ff693669a28b3ddada29f88efffbc SHA512 f8502c83f05d6328e669e9e0d7d05e1216f59667829432ef4c558398ec39d0ee888479fc8e6387934604ca53477829a9f709565fa10a7aaadd4d455ca35b12c7
 DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
 DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
-EBUILD espresso-4.0.0-r1.ebuild 2792 BLAKE2B 4ce1927c1da0740e37a2e4992ec5ab01f683fc8e87b3cf6cebbea4cc3c60498a34f149a1d93e7f446db8693a6d87aca482ed3f323b83a4f4d098f7bac5bda958 SHA512 11446cf5570fa6aa738c7f86768a964b5bf9554fe60eb58e43849bd1e4dc87970898ae03e72daa0c85acf3ba011ad0bee4f5357ffd68f7dbe4237c8310dddb25
-EBUILD espresso-4.0_pre20170228.ebuild 2856 BLAKE2B 4c146accee8c9294a52c0134eaf2c196ab1bf5cc54ebc89ebdac5a0bd80b04e66945b3f012812a56ab6ff07fb7ee59571766d38e692659e24fd6e70760701aa6 SHA512 7a78281dc85426e1e927e3ae3a4f9f9c2589596be2bd2981f0f5e260e3fb69d546bf776823872c74737c79346c426e1effabbac26b8803aa110331dd768920cf
-EBUILD espresso-9999.ebuild 2754 BLAKE2B 02b157a5e4d5838b0ae963d30ecb08dd3a30138596d20af0949ec6d17e5ee0afe88c639fd346cdd9b101c25a443290fb9aa16cbb49e4927bb1b6e25f067bc85f SHA512 f5397912c5335dbc66cb505d4d683aa0c5451deea324e7c1ddc1bbd73043bf439e7e6888b0095ffa9bf8d3fb0468e82670fa1352f1bd39d60c01455c76a7c287
+EBUILD espresso-4.0.0-r2.ebuild 2835 BLAKE2B 744290f292afd7e793d339a2380a0ca8accadf7c0a7f23567dc663f415ac3af1e460669ebab60a9c8c2244696199126ef153d69ec476a081b32f3b45dc947a4c SHA512 17ba5ce4623325fdfe1aaa56c0cdacfca7500cf3b9bcfe5648eb1bccbc928452198388f685b669b40bb75d5af7468ef159751d63013af1f3dbffab237e560a2f
+EBUILD espresso-4.0_pre20170228.ebuild 2899 BLAKE2B dbc0f3fa8481c0de53ea6eb020f396900fa4804953b4daa26b8b5f91ed915597ee6b5065d8267c9b676f8acec98fab95f73d5d83cf0c2c59428e166ef95b3433 SHA512 ef9fecaa51bdcbd034aadf61a2fe560ebccb38836978f289589130f510236dcfd5dd414ae91197e8e1ba1cab2050b2336891d5cea51071b249c5af25d877084c
+EBUILD espresso-9999.ebuild 2797 BLAKE2B fb87dbadf9448fd86afd94625cedcd32583b484f1686ce51b2271afd456bdb76354dbf00a62b8b54a49dfcb19f6b7bf1b74bc71b65bd4a7b1e45036dcc683cdb SHA512 d56dbb297f095e7445312196396554fd2722b768abe8334ba177701a6f7f138e16497746d9db8d14635903cf003ea4d567532c6f4bb7bc4d3f5fa49b15b5bbad
 MISC metadata.xml 596 BLAKE2B e0c4b7e3c44d88c1487f6c88f68f696e3edd174427f525e3ef769c26b4a2333c9c1c128e00e786a12cf671b821d633a73537fe667543dbdfcad5f7fe0bfef2da SHA512 c87e4c2401fd1600e80b5a493d68a222bdaabca448bb81940273e23a2607b5631ab24d05e1b265dcdaacc6e4e4756f713165a45ab072e9880551e5d2b034a4a5
diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
deleted file mode 100644
index 00b53caa2efc..000000000000
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://espressomd.org"
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
-	EGIT_BRANCH="python"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	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] )"
-
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen[dot]
-		dev-texlive/texlive-latexextra
-		virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/2277.patch" )
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_CUDA=$(usex cuda)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DWITH_TESTS=$(usex test)
-		-DINSTALL_PYPRESSO=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
-		-DWITH_HDF5=$(usex hdf5)
-		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-		-DCMAKE_SKIP_RPATH=YES
-		-DLIBDIR=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doxygen
-	[[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
-}
-
-src_install() {
-	local i docdir="${S}"
-
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}/
-	doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
-
-	save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
-
-	if use doc; then
-		[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
-		newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
-		newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
-		for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
-			newdoc "${i}" "tutorial_${i##*/}"
-		done
-		dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
-	fi
-
-	if use examples; then
-		insinto "/usr/share/${PN}/examples/python"
-		doins -r samples/${i}/.
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "Please read and cite:"
-	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
-	elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
-	echo
-	elog "If you need more features, change"
-	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
-	elog "and reemerge with USE=savedconfig"
-	echo
-	elog "For a full feature list see:"
-	elog "/usr/share/${PN}/myconfig-sample.hpp"
-	echo
-}
diff --git a/sci-physics/espresso/espresso-4.0.0-r2.ebuild b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
new file mode 100644
index 000000000000..0afbf393e9a9
--- /dev/null
+++ b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils python-single-r1 savedconfig
+
+DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
+HOMEPAGE="http://espressomd.org"
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
+	EGIT_BRANCH="python"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda doc examples +fftw +hdf5 test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
+	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] )"
+
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen[dot]
+		dev-texlive/texlive-latexextra
+		virtual/latex-base )"
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+PATCHES=( "${FILESDIR}/2277.patch" )
+
+src_prepare() {
+	use cuda && cuda_src_prepare
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_CUDA=$(usex cuda)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DWITH_TESTS=$(usex test)
+		-DINSTALL_PYPRESSO=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
+		-DWITH_HDF5=$(usex hdf5)
+		-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
+		-DCMAKE_SKIP_RPATH=YES
+		-DLIBDIR=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_make doxygen
+	[[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
+}
+
+src_install() {
+	local i docdir="${S}"
+
+	cmake-utils_src_install
+
+	insinto /usr/share/${PN}/
+	doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
+
+	save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
+
+	if use doc; then
+		[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
+		newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
+		newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
+		for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
+			newdoc "${i}" "tutorial_${i##*/}"
+		done
+		dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
+	fi
+
+	if use examples; then
+		insinto "/usr/share/${PN}/examples/python"
+		doins -r samples/${i}/.
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "Please read and cite:"
+	elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
+	elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
+	echo
+	elog "If you need more features, change"
+	elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
+	elog "and reemerge with USE=savedconfig"
+	echo
+	elog "For a full feature list see:"
+	elog "/usr/share/${PN}/myconfig-sample.hpp"
+	echo
+}
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 5755eba6cdf1..e7c540b16298 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -33,8 +33,10 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>dev-python/cython-0.22[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>dev-python/cython-0.22[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/boost:=[mpi]
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index b9d14d3937e5..fcc6fbc9926e 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
 	fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/boost:=[mpi]
diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index 0c317b894a54..41fb872759c2 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -1,4 +1,4 @@
 DIST Rivet-2.6.0.tar.bz2 3527799 BLAKE2B a0ffe7a73ed1120cd3944d3c845ed9387528e7645554c589fda0bfcac694e36f24ee78914e916c51f3a978659933b4e8934e0373f26e4a3ba7597714fc9a939f SHA512 49c381d88075715e23942bb02066b189305077581cd64b708ccaf79436202fe1c9d7989fc1f35dfeffdc643adb39283710fdf33fc87407cfb7ddd3e9d2297feb
 DIST refs.bib 16907 BLAKE2B 70c11f86c8ebf6386615b3e900280d1a2677dc82d99f944ac670f52320e05355352dd4017a48ae2af52dfd6f46a92a0d2d65bde4c271589ba4e66b3e7b68982c SHA512 64755e6aeaa1f0b3fb76a33ffdf226bcd42ee597a78a8d458b728f0e6f576d4dafbb276a0498c3b573d23054ccbf54ada6f6c12faf52dbfbeef2372094d01181
-EBUILD rivet-2.6.0-r1.ebuild 1877 BLAKE2B a3a47ef6e45b7a3a5b7c3edaee37799004fe6d3f74f162d338153f7adc12a102d39e7b0fb8b0bcfb47422870810f64899145ca55e1cbf2a400e781c2425d1f46 SHA512 40b14de834c15f61e79a66fcf0748284311645c5c0dc60e3261a3ac2b0804cdfc1482e6e7980c016d9562b622e0037272096e5224636aa38fd62273e6e47125c
+EBUILD rivet-2.6.0-r2.ebuild 1915 BLAKE2B 421b0a50ab8eb5afa679c16681e47a016777b59e87427c8ea9c5f59621a1cf4ebebb8f778e10192b8fd84b49753a036bba2beb3260977813d275d080612df31b SHA512 84da572b0d375392571ade8b1548f64e0865ad444879548d36080093113107a59111d8389a26c80a804ca4301ec883f78e2b1166aa38c6ae4a83b7483b93aaa7
 MISC metadata.xml 836 BLAKE2B ab971f916f23c3c3d70e54440e8f2303918084d25ba5a5ca7ed50142606f88e25019dac7781f20df717e4a552fc3ca642439bf0c37476aa378969f82abbab1c3 SHA512 21245268e114d41e0fe10cf6d265b3db7a0e220e1f6d545df4782839f6f5f284c9ddd6f89d20c74497e394e23bf93c96013dcde5c3685e4f1c112c73156f8db0
diff --git a/sci-physics/rivet/rivet-2.6.0-r1.ebuild b/sci-physics/rivet/rivet-2.6.0-r1.ebuild
deleted file mode 100644
index 273705fb73d0..000000000000
--- a/sci-physics/rivet/rivet-2.6.0-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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools bash-completion-r1 python-single-r1
-
-DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators"
-HOMEPAGE="http://rivet.hepforge.org/"
-
-SRC_URI="http://www.hepforge.org/archive/${PN}/${P^}.tar.bz2
-	doc? ( https://rivet.hepforge.org/trac/export/8a05acecd26c18f368f4b748da2d5aa2db46be6c/doc/refs.bib )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sci-libs/gsl:=
-	sci-physics/fastjet[plugins]
-	sci-physics/hepmc
-	sci-physics/yoda:=[python]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex,dot] )
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${P^}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack "${P^}.tar.bz2"
-
-	if use doc; then
-		# refs.bib is missing in tarball (reported upstream)
-		cp "${DISTDIR}"/refs.bib "${S}"/doc || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Install rivet-manual.pdf to docdir intead of pkgdatadir
-	sed -i '/pkgdata_DATA = $(DOCS)/s/pkgdata/doc/' doc/Makefile.am || die
-	# Adjust shebangs of Python scripts
-	sed -i "s@^#! /usr/bin/env python@#!${EPREFIX}/usr/bin/python2@" bin/* || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable python pyext) \
-		$(use_enable static-libs static) \
-		$(use_enable doc doxygen) \
-		$(use_enable doc pdfmanual)
-}
-
-src_compile() {
-	use doc && export VARTEXFONTS="${T}/fonts"
-	default
-
-	if use doc; then
-		doxygen Doxyfile || die
-		HTML_DOCS+=( doxy/html/. )
-	fi
-}
-
-src_install() {
-	default
-	newbashcomp "${ED%/}"/usr/share/Rivet/rivet-completion rivet
-	rm -f "${ED%/}"/usr/share/Rivet/rivet-completion || die
-}
diff --git a/sci-physics/rivet/rivet-2.6.0-r2.ebuild b/sci-physics/rivet/rivet-2.6.0-r2.ebuild
new file mode 100644
index 000000000000..551de2ab59ee
--- /dev/null
+++ b/sci-physics/rivet/rivet-2.6.0-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools bash-completion-r1 python-single-r1
+
+DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators"
+HOMEPAGE="http://rivet.hepforge.org/"
+
+SRC_URI="http://www.hepforge.org/archive/${PN}/${P^}.tar.bz2
+	doc? ( https://rivet.hepforge.org/trac/export/8a05acecd26c18f368f4b748da2d5aa2db46be6c/doc/refs.bib )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=
+	sci-libs/gsl:=
+	sci-physics/fastjet[plugins]
+	sci-physics/hepmc
+	sci-physics/yoda:=[python]
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[latex,dot] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+S="${WORKDIR}/${P^}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack "${P^}.tar.bz2"
+
+	if use doc; then
+		# refs.bib is missing in tarball (reported upstream)
+		cp "${DISTDIR}"/refs.bib "${S}"/doc || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Install rivet-manual.pdf to docdir intead of pkgdatadir
+	sed -i '/pkgdata_DATA = $(DOCS)/s/pkgdata/doc/' doc/Makefile.am || die
+	# Adjust shebangs of Python scripts
+	sed -i "s@^#! /usr/bin/env python@#!${EPREFIX}/usr/bin/python2@" bin/* || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable python pyext) \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen) \
+		$(use_enable doc pdfmanual)
+}
+
+src_compile() {
+	use doc && export VARTEXFONTS="${T}/fonts"
+	default
+
+	if use doc; then
+		doxygen Doxyfile || die
+		HTML_DOCS+=( doxy/html/. )
+	fi
+}
+
+src_install() {
+	default
+	newbashcomp "${ED%/}"/usr/share/Rivet/rivet-completion rivet
+	rm -f "${ED%/}"/usr/share/Rivet/rivet-completion || die
+}
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 418dcc53c936..e34d44b094c1 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -9,9 +9,9 @@ DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 DIST root_v6.16.00.source.tar.gz 164836293 BLAKE2B 9d8f02631bdc1fa1775cbdaf50dd1feacd9b3c86b81d679ba6f0ca3c5787cd1d22ef7c33358b608361a01ad4f0aff3e8c749649d24773a35c52ce87f808d08f5 SHA512 17e5b9815973773e30ff83c2f4028e9e93691c1ecb824c162c8b3e02d1f6666fb8e0b72a5d0652a90032af146d92d271cbffcd634fb6fe6a63bdf46d672789bf
 DIST root_v6.18.04.source.tar.gz 165938450 BLAKE2B d6545dfa95817940f2bb6b5b49252eca1958df518a4bc05c4857df60a015a39d0df09ea077465533e6ebc815d04e1742da19d18b7af02b5446f9e73dc92e3c16 SHA512 cfcbdd2db4edf55845a7cd1e6ec0cdf714a7ceacb039fa6fb627d7300d6f849b3b462bab724e33b1d6b08eb22ba42c43b7d64c0c6c47dc8a3bb652f86979f2c6
-EBUILD root-6.12.06-r11.ebuild 7902 BLAKE2B e565b7faa90db1fdedd4a7a92d172a41fd58589d1c573c8dfa904af57be8d4f10ca373d043e04bf2dd54ed49fa8d4c05ce85252f6ce922dcacd1a16d278d257a SHA512 22d29350968a6ecd0b46dec881de811684e81af3519dc48933fccb5bfacf4adfc2ee9b905a9867a25a249a633390199b2ec3d21078ddb59d2ce9d0f39d5ce3c4
-EBUILD root-6.14.08-r4.ebuild 8144 BLAKE2B e70731a73b17b773ecf75226cdf144d654bf97d5be8ce1e5695b1fc3fcb4bbcb7b9e41e912b124c59d53ace0ced036e98cbff013e02e8809ce0cb4e865dafa8b SHA512 cc721eb131f3476bc5db3a3b104aeed51f89520e1a2a49f722ff600034a1b68b6d89aa8320860e7a7b1a030314de0bf3c5931919bea289df9c7d192c9bbc5530
-EBUILD root-6.16.00-r4.ebuild 8120 BLAKE2B fb9c1becf92f3af1f3a1bcd2734e19436a9638fcc4ffa0d150e483dac68755f88235ce3507e6138c66e7e9cd05fde893e231718a670721092d26d1ab22da548f SHA512 0fead6530038e5ec5da30a9ba19ed06c56eca8bed2c75817bfae806eddac3897ea05a8e4467f5868d70dc1c3233a9077f5b30960411de4b2290729c2bd3b0efb
-EBUILD root-6.18.04.ebuild 7538 BLAKE2B 1c7741bd556444952e5cdbb0d5855857d3e35ced5d443d1ecc5efcfa16921d48b712b355495f89d8d0d6f4a100c42922d555f9daa204e1283ede00144cdca905 SHA512 75e3b8788a68827e297293079ec4e0e4057da9fb2d148aeb1315918a18981255e4e0d76650f12da5eb6f41a1afedb0d0e8c89a8a5a92a2130551521384f3efe2
-EBUILD root-9999.ebuild 7514 BLAKE2B d5151116cc0c3674bc34d265e8a0e58dd366ff384ab3d7e9b3cfce98c713ac2bbdbe9152388fc0967bcec8820621fe357a59a516a2ee8aa2133ba6d0a89f575c SHA512 2efaccfee22a23daa9e60814f187c5db64d920285a934ef913da4b77070e97b312760454481cb6319895d4a6a7a0d54d0f5386cf56c592b56801af0808b74bdd
+EBUILD root-6.12.06-r11.ebuild 7937 BLAKE2B c714478a834736759af8b45ecaecf25935a8f0c39611b8f444c3620a9ab5d6616496b465b2a4f090b969a224f6bee19f3771164fb8942772ffbb29feb6a97a78 SHA512 d54b1783df85f19843831e254ffaef65f774fe5694864f8afb7446950ead97626037b250b03bb1ae128a3032bc1d13f79e2f3562fea3c1a05185ac40686763bf
+EBUILD root-6.14.08-r4.ebuild 8179 BLAKE2B aa0d28a4289a32c44032abc5a8a8916458c3291b547fe117efa7505af69fef580f1c1125b1c7a5a80d7622fcb6d5398787bb0e8d2350a110968581cc428547ab SHA512 215d5ca967f6a97f99a333eebc3f3ad909ecfdfeadf930b9ed4491eb626c7cb93ba7990cab74152a58c173e9c8f8e4e302c535788609e97dd6b38d7fe9698392
+EBUILD root-6.16.00-r4.ebuild 8155 BLAKE2B cf9596fd9e1b00be23ca6381494940536f08b3e685c87f3e0df8c2ddd01b716caecd8a53920037a70d2beea3e366619428d074ea6b5c81da6bd2dd1fb8a9911f SHA512 20a0a8c0a7e9029a9f6bf3a77ccfe3044c609a9370fad28225c8d2bc512b3e055d4f2a693730525d0bf35dfd4932cf38f5552a8d4661207f9c380597c65344fc
+EBUILD root-6.18.04-r1.ebuild 7573 BLAKE2B dcdc80a9aa32512cdea024b353bb883ec725a66a061f773eec51c3cf9c573e081d973f8f1d075d14cd7b6589be7c81968534f736cc510c7bb4ad89e49ab6335d SHA512 cb79923444573ea40bc56c14973d627eb14bab6b0ca1f07d123436bc96e2a10186441dc9491c9fb1571bb62d12ee85ece7ce728c01e77048a149154b962397c3
+EBUILD root-9999.ebuild 7549 BLAKE2B 7924fb2eabefc21bbc59d102f058cd71dfd279cca3b7fa06480b35a99d6149debb436230960251f070e19e6e5938b84411f54c9a1f789884deee378f912d97e3 SHA512 21e39143f3ff1898c64c75a8e3aa625132e490398e8b706b853b94370c3abb32013f62a6cddf9864f3d2234243a78628db99beba27b7d9b11b9c5fa0050491ac
 MISC metadata.xml 3218 BLAKE2B f23175b1a5998bbecdcdb6e5f42d08bd8e16aaeee79f43d30e0906977f389e18a19ddceeba24009360c2f717c29162c8e30b807bda993492f27429802dc62883 SHA512 d3bdc5bce1d1ac904e5a7a9f21bca65deb480ecbd1362a3251c93e09ab07fdcdd6dfd8900e62df3853b7e200880850d9010122500a081fdedb6b43adae25a6bd
diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r11.ebuild
index 2cf1a95ecc94..d49c467555c2 100644
--- a/sci-physics/root/root-6.12.06-r11.ebuild
+++ b/sci-physics/root/root-6.12.06-r11.ebuild
@@ -90,7 +90,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( dev-cpp/tbb )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -149,8 +153,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-Dexplicitlink=ON
@@ -273,7 +277,7 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
 	cat > ${ROOTENV} <<- EOF || die
diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild
index 7839ad943f5b..86b2044fd24f 100644
--- a/sci-physics/root/root-6.14.08-r4.ebuild
+++ b/sci-physics/root/root-6.14.08-r4.ebuild
@@ -95,7 +95,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -149,8 +153,8 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
@@ -286,7 +290,7 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
 	cat > ${ROOTENV} <<- EOF || die
diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild
index 54a957e14266..aa5745011f80 100644
--- a/sci-physics/root/root-6.16.00-r4.ebuild
+++ b/sci-physics/root/root-6.16.00-r4.ebuild
@@ -95,7 +95,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -148,8 +152,8 @@ src_configure() {
 		-DCMAKE_C_FLAGS="${CFLAGS}"
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
@@ -285,7 +289,7 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
 
 	cat > ${ROOTENV} <<- EOF || die
diff --git a/sci-physics/root/root-6.18.04-r1.ebuild b/sci-physics/root/root-6.18.04-r1.ebuild
new file mode 100644
index 000000000000..89beda36d2b8
--- /dev/null
+++ b/sci-physics/root/root-6.18.04-r1.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ninja does not work due to fortran
+CMAKE_MAKEFILE_GENERATOR=emake
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C++ data analysis framework and interpreter from CERN"
+HOMEPAGE="https://root.cern"
+SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
+
+IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
+	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
+	libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres
+	prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite
+	+ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd"
+RESTRICT="!test? ( test )"
+
+SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
+LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="
+	^^ ( c++11 c++14 c++17 )
+	cuda? ( tmva !c++17 )
+	!X? ( !asimage !opengl !qt5 !tiff )
+	davix? ( ssl xml )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	qt5? ( root7 )
+	root7? ( || ( c++14 c++17 ) )
+	tmva? ( gsl )
+"
+
+CDEPEND="
+	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-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[widgets]
+		)
+	)
+	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
+	davix? ( net-libs/davix )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fftw? ( sci-libs/fftw:3.0= )
+	fits? ( sci-libs/cfitsio:0= )
+	graphviz? ( media-gfx/graphviz )
+	gsl? ( sci-libs/gsl:= )
+	http? ( dev-libs/fcgi:0= )
+	jemalloc? ( dev-libs/jemalloc )
+	libcxx? ( sys-libs/libcxx )
+	unuran? ( sci-mathematics/unuran:0= )
+	minuit? ( !sci-libs/minuit )
+	mysql? ( dev-db/mysql-connector-c )
+	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_DEPS} )
+	R? ( dev-lang/R )
+	shadow? ( virtual/shadow )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl:0= )
+	tbb? ( >=dev-cpp/tbb-2018 )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	vc? ( dev-libs/vc:= )
+	xml? ( dev-libs/libxml2:2= )
+	xrootd? ( net-libs/xrootd:0= )
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
+)
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+	use python && python-single-r1_pkg_setup
+
+	elog "There are extra options on packages not available in Gentoo."
+	elog "You can use the environment variable EXTRA_ECONF to enable"
+	elog "these packages. For example, for Vdt you would set:"
+	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
+
+	# CSS should use local images
+	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+	if use nosplash; then
+		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
+	fi
+}
+
+# Note: ROOT uses bundled clang because it is patched and API-incompatible
+#       with vanilla clang. The patches enable the C++ interpreter to work.
+#       Since ROOT installs many files into /etc (>100MB in total) that don't
+#       really belong there, we install it into another directory to avoid
+#       making /etc too big.
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS}"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
+		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_LIBDIR="lib"
+		-DDEFAULT_SYSROOT="${EPREFIX}"
+		-DCLING_BUILD_PLUGINS=OFF
+		-Dexplicitlink=ON
+		-Dexceptions=ON
+		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
+		-Dshared=ON
+		-Dsoversion=ON
+		-Dbuiltin_llvm=ON
+		-Dbuiltin_clang=ON
+		-Dbuiltin_afterimage=OFF
+		-Dbuiltin_cfitsio=OFF
+		-Dbuiltin_davix=OFF
+		-Dbuiltin_fftw3=OFF
+		-Dbuiltin_freetype=OFF
+		-Dbuiltin_ftgl=OFF
+		-Dbuiltin_gl2ps=OFF
+		-Dbuiltin_glew=OFF
+		-Dbuiltin_gsl=OFF
+		-Dbuiltin_lz4=OFF
+		-Dbuiltin_lzma=OFF
+		-Dbuiltin_openssl=OFF
+		-Dbuiltin_pcre=OFF
+		-Dbuiltin_tbb=OFF
+		-Dbuiltin_unuran=OFF
+		-Dbuiltin_vc=OFF
+		-Dbuiltin_vdt=OFF
+		-Dbuiltin_veccore=OFF
+		-Dbuiltin_xrootd=OFF
+		-Dbuiltin_xxhash=OFF
+		-Dbuiltin_zlib=OFF
+		-Dx11=$(usex X)
+		-Dxft=$(usex X)
+		-Dalien=OFF
+		-Darrow=OFF
+		-Dasimage=$(usex asimage)
+		-Dastiff=$(usex tiff)
+		-Dlibcxx=$(usex libcxx)
+		-Dccache=OFF # use ccache via portage
+		-Dcefweb=OFF
+		-Dchirp=OFF
+		-Dclad=OFF
+		-Dcling=ON # cling=OFF is broken
+		-Dcocoa=$(usex aqua)
+		-Dcuda=$(usex cuda)
+		-Dcxxmodules=OFF # requires clang, unstable
+		-Ddavix=$(usex davix)
+		-Ddcache=OFF
+		-Dfftw3=$(usex fftw)
+		-Dfitsio=$(usex fits)
+		-Dfortran=$(usex fortran)
+		-Dftgl=$(usex opengl)
+		-Dgdml=$(usex gdml)
+		-Dgenvector=ON # genvector=OFF ignored
+		-Dgeocad=OFF
+		-Dgfal=OFF
+		-Dgl2ps=$(usex opengl)
+		-Dgminimal=OFF
+		-Dgsl_shared=$(usex gsl)
+		-Dgviz=$(usex graphviz)
+		-Dhttp=$(usex http)
+		-Dimt=$(usex tbb)
+		-Djemalloc=$(usex jemalloc)
+		-Dmathmore=$(usex gsl)
+		-Dmemstat=$(usex memstat)
+		-Dminimal=OFF
+		-Dminuit2=$(usex minuit)
+		-Dminuit=$(usex minuit)
+		-Dmonalisa=OFF
+		-Dmysql=$(usex mysql)
+		-Dodbc=$(usex odbc)
+		-Dopengl=$(usex opengl)
+		-Doracle=$(usex oracle)
+		-Dpch=ON # pch=OFF is broken
+		-Dpgsql=$(usex postgres)
+		-Dpythia6=$(usex pythia6)
+		-Dpythia8=$(usex pythia8)
+		-Dpython=$(usex python)
+		-Dqt5web=$(usex qt5)
+		-Droofit=$(usex roofit)
+		-Droot7=$(usex root7)
+		-Drootbench=OFF
+		-Droottest=OFF
+		-Drpath=OFF
+		-Druntime_cxxmodules=OFF # does not work yet
+		-Dr=$(usex R)
+		-Dshadowpw=$(usex shadow)
+		-Dsqlite=$(usex sqlite)
+		-Dssl=$(usex ssl)
+		-Dtcmalloc=OFF
+		-Dtesting=$(usex test)
+		-Dthread=$(usex threads)
+		-Dtmva=$(usex tmva)
+		-Dtmva-cpu=$(usex tmva)
+		-Dtmva-gpu=$(usex cuda)
+		-Dunuran=$(usex unuran)
+		-Dvc=$(usex vc)
+		-Dvmc=$(usex vmc)
+		-Dvdt=OFF
+		-Dveccore=OFF
+		-Dxml=$(usex xml)
+		-Dxrootd=$(usex xrootd)
+		${EXTRA_ECONF}
+	)
+
+	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# needed for hsimple.root
+	addwrite /dev/random
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
+
+	cat > ${ROOTENV} <<- EOF || die
+	MANPATH="${ROOTSYS}/share/man"
+	PATH="${ROOTSYS}/bin"
+	ROOTPATH="${ROOTSYS}/bin"
+	LDPATH="${ROOTSYS}/lib"
+	EOF
+
+	if use python; then
+		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
+	fi
+
+	doenvd ${ROOTENV}
+
+	if use emacs; then
+		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
+	fi
+
+	pushd "${D}/${ROOTSYS}" > /dev/null
+
+	rm -r emacs bin/*.{csh,sh,fish} || die
+
+	if ! use examples; then
+		rm -r tutorials || die
+	fi
+
+	# create versioned symlinks for binaries
+	cd bin;
+	for exe in *; do
+		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
+	done
+}
diff --git a/sci-physics/root/root-6.18.04.ebuild b/sci-physics/root/root-6.18.04.ebuild
deleted file mode 100644
index 852491a3c7d7..000000000000
--- a/sci-physics/root/root-6.18.04.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ninja does not work due to fortran
-CMAKE_MAKEFILE_GENERATOR=emake
-FORTRAN_NEEDED="fortran"
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \
-	prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C++ data analysis framework and interpreter from CERN"
-HOMEPAGE="https://root.cern"
-SRC_URI="https://root.cern/download/${PN}_v${PV}.source.tar.gz"
-
-IUSE="+X aqua +asimage +c++11 c++14 c++17 cuda +davix debug emacs
-	+examples fits fftw fortran +gdml graphviz +gsl http jemalloc
-	libcxx memstat +minuit mysql nosplash odbc +opengl oracle postgres
-	prefix pythia6 pythia8 +python qt5 R +roofit root7 shadow sqlite
-	+ssl +tbb test +threads +tiff +tmva +unuran vc +vmc +xml xrootd"
-RESTRICT="!test? ( test )"
-
-SLOT="$(ver_cut 1-2)/$(ver_cut 3)"
-LICENSE="LGPL-2.1 freedist MSttfEULA LGPL-3 libpng UoI-NCSA"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="
-	^^ ( c++11 c++14 c++17 )
-	cuda? ( tmva !c++17 )
-	!X? ( !asimage !opengl !qt5 !tiff )
-	davix? ( ssl xml )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qt5? ( root7 )
-	root7? ( || ( c++14 c++17 ) )
-	tmva? ( gsl )
-"
-
-CDEPEND="
-	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-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[widgets]
-		)
-	)
-	asimage? ( media-libs/libafterimage[gif,jpeg,png,tiff?] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-9.0 )
-	davix? ( net-libs/davix )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fftw? ( sci-libs/fftw:3.0= )
-	fits? ( sci-libs/cfitsio:0= )
-	graphviz? ( media-gfx/graphviz )
-	gsl? ( sci-libs/gsl:= )
-	http? ( dev-libs/fcgi:0= )
-	jemalloc? ( dev-libs/jemalloc )
-	libcxx? ( sys-libs/libcxx )
-	unuran? ( sci-mathematics/unuran:0= )
-	minuit? ( !sci-libs/minuit )
-	mysql? ( dev-db/mysql-connector-c )
-	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_DEPS} )
-	R? ( dev-lang/R )
-	shadow? ( virtual/shadow )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( dev-libs/openssl:0= )
-	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	vc? ( dev-libs/vc:= )
-	xml? ( dev-libs/libxml2:2= )
-	xrootd? ( net-libs/xrootd:0= )
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch
-)
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-	use python && python-single-r1_pkg_setup
-
-	elog "There are extra options on packages not available in Gentoo."
-	elog "You can use the environment variable EXTRA_ECONF to enable"
-	elog "these packages. For example, for Vdt you would set:"
-	elog "EXTRA_ECONF=\"-Dbuiltin_vdt=ON -Dvdt=ON\""
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i "/CLING_BUILD_PLUGINS/d" interpreter/CMakeLists.txt || die
-
-	# CSS should use local images
-	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
-
-	if use nosplash; then
-		sed -i -e '/bool gNoLogo/s@false@true@' rootx/src/rootx.cxx
-	fi
-}
-
-# Note: ROOT uses bundled clang because it is patched and API-incompatible
-#       with vanilla clang. The patches enable the C++ interpreter to work.
-#       Since ROOT installs many files into /etc (>100MB in total) that don't
-#       really belong there, we install it into another directory to avoid
-#       making /etc too big.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS}"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
-		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
-		-DCMAKE_INSTALL_LIBDIR="lib"
-		-DDEFAULT_SYSROOT="${EPREFIX}"
-		-DCLING_BUILD_PLUGINS=OFF
-		-Dexplicitlink=ON
-		-Dexceptions=ON
-		-Dfail-on-missing=ON
-		-Dgnuinstall=OFF
-		-Dshared=ON
-		-Dsoversion=ON
-		-Dbuiltin_llvm=ON
-		-Dbuiltin_clang=ON
-		-Dbuiltin_afterimage=OFF
-		-Dbuiltin_cfitsio=OFF
-		-Dbuiltin_davix=OFF
-		-Dbuiltin_fftw3=OFF
-		-Dbuiltin_freetype=OFF
-		-Dbuiltin_ftgl=OFF
-		-Dbuiltin_gl2ps=OFF
-		-Dbuiltin_glew=OFF
-		-Dbuiltin_gsl=OFF
-		-Dbuiltin_lz4=OFF
-		-Dbuiltin_lzma=OFF
-		-Dbuiltin_openssl=OFF
-		-Dbuiltin_pcre=OFF
-		-Dbuiltin_tbb=OFF
-		-Dbuiltin_unuran=OFF
-		-Dbuiltin_vc=OFF
-		-Dbuiltin_vdt=OFF
-		-Dbuiltin_veccore=OFF
-		-Dbuiltin_xrootd=OFF
-		-Dbuiltin_xxhash=OFF
-		-Dbuiltin_zlib=OFF
-		-Dx11=$(usex X)
-		-Dxft=$(usex X)
-		-Dalien=OFF
-		-Darrow=OFF
-		-Dasimage=$(usex asimage)
-		-Dastiff=$(usex tiff)
-		-Dlibcxx=$(usex libcxx)
-		-Dccache=OFF # use ccache via portage
-		-Dcefweb=OFF
-		-Dchirp=OFF
-		-Dclad=OFF
-		-Dcling=ON # cling=OFF is broken
-		-Dcocoa=$(usex aqua)
-		-Dcuda=$(usex cuda)
-		-Dcxxmodules=OFF # requires clang, unstable
-		-Ddavix=$(usex davix)
-		-Ddcache=OFF
-		-Dfftw3=$(usex fftw)
-		-Dfitsio=$(usex fits)
-		-Dfortran=$(usex fortran)
-		-Dftgl=$(usex opengl)
-		-Dgdml=$(usex gdml)
-		-Dgenvector=ON # genvector=OFF ignored
-		-Dgeocad=OFF
-		-Dgfal=OFF
-		-Dgl2ps=$(usex opengl)
-		-Dgminimal=OFF
-		-Dgsl_shared=$(usex gsl)
-		-Dgviz=$(usex graphviz)
-		-Dhttp=$(usex http)
-		-Dimt=$(usex tbb)
-		-Djemalloc=$(usex jemalloc)
-		-Dmathmore=$(usex gsl)
-		-Dmemstat=$(usex memstat)
-		-Dminimal=OFF
-		-Dminuit2=$(usex minuit)
-		-Dminuit=$(usex minuit)
-		-Dmonalisa=OFF
-		-Dmysql=$(usex mysql)
-		-Dodbc=$(usex odbc)
-		-Dopengl=$(usex opengl)
-		-Doracle=$(usex oracle)
-		-Dpch=ON # pch=OFF is broken
-		-Dpgsql=$(usex postgres)
-		-Dpythia6=$(usex pythia6)
-		-Dpythia8=$(usex pythia8)
-		-Dpython=$(usex python)
-		-Dqt5web=$(usex qt5)
-		-Droofit=$(usex roofit)
-		-Droot7=$(usex root7)
-		-Drootbench=OFF
-		-Droottest=OFF
-		-Drpath=OFF
-		-Druntime_cxxmodules=OFF # does not work yet
-		-Dr=$(usex R)
-		-Dshadowpw=$(usex shadow)
-		-Dsqlite=$(usex sqlite)
-		-Dssl=$(usex ssl)
-		-Dtcmalloc=OFF
-		-Dtesting=$(usex test)
-		-Dthread=$(usex threads)
-		-Dtmva=$(usex tmva)
-		-Dtmva-cpu=$(usex tmva)
-		-Dtmva-gpu=$(usex cuda)
-		-Dunuran=$(usex unuran)
-		-Dvc=$(usex vc)
-		-Dvmc=$(usex vmc)
-		-Dvdt=OFF
-		-Dveccore=OFF
-		-Dxml=$(usex xml)
-		-Dxrootd=$(usex xrootd)
-		${EXTRA_ECONF}
-	)
-
-	CMAKE_BUILD_TYPE=$(usex debug Debug Release) \
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# needed for hsimple.root
-	addwrite /dev/random
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
-	ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2)
-
-	cat > ${ROOTENV} <<- EOF || die
-	MANPATH="${ROOTSYS}/share/man"
-	PATH="${ROOTSYS}/bin"
-	ROOTPATH="${ROOTSYS}/bin"
-	LDPATH="${ROOTSYS}/lib"
-	EOF
-
-	if use python; then
-		echo "PYTHONPATH=\"${ROOTSYS}/lib\"" >> ${ROOTENV} || die
-	fi
-
-	doenvd ${ROOTENV}
-
-	if use emacs; then
-		elisp-install ${PN}-$(ver_cut 1-2) "${BUILD_DIR}"/root-help.el
-	fi
-
-	pushd "${D}/${ROOTSYS}" > /dev/null
-
-	rm -r emacs bin/*.{csh,sh,fish} || die
-
-	if ! use examples; then
-		rm -r tutorials || die
-	fi
-
-	# create versioned symlinks for binaries
-	cd bin;
-	for exe in *; do
-		dosym "${exe}" "/usr/lib/${PN}/$(ver_cut 1-2)/bin/${exe}-$(ver_cut 1-2)"
-	done
-}
diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild
index 27603b4ccc6f..53b2390393ae 100644
--- a/sci-physics/root/root-9999.ebuild
+++ b/sci-physics/root/root-9999.ebuild
@@ -103,7 +103,11 @@ CDEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? ( dev-libs/openssl:0= )
 	tbb? ( >=dev-cpp/tbb-2018 )
-	tmva? ( dev-python/numpy[${PYTHON_USEDEP}] )
+	tmva? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	vc? ( dev-libs/vc:= )
 	xml? ( dev-libs/libxml2:2= )
 	xrootd? ( net-libs/xrootd:0= )
@@ -149,8 +153,8 @@ src_configure() {
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
 		-DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-)
 		-DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man"
 		-DCMAKE_INSTALL_LIBDIR="lib"
 		-DDEFAULT_SYSROOT="${EPREFIX}"
 		-DCLING_BUILD_PLUGINS=OFF
@@ -262,7 +266,7 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)
+	ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)
 
 	if [[ ${PV} == "9999" ]]; then
 		ROOTENV="9900${PN}-git"
diff --git a/sci-physics/yoda/Manifest b/sci-physics/yoda/Manifest
index 665270839ac4..220244c60e35 100644
--- a/sci-physics/yoda/Manifest
+++ b/sci-physics/yoda/Manifest
@@ -1,5 +1,5 @@
 DIST YODA-1.6.5.tar.bz2 818613 BLAKE2B 6a8762c4f8d4bbcacf11c1b9929cff4b00811d4e18c596122dce335782a741aa1c76fab4b2ed9897dc800af1a18dba809e4fa0956cb5eb6fc84cc98544c669d6 SHA512 bead0a3ada233c1fbafe66d25e65262c20d9a9dfa6265440320a0fc782e91b3ac6581698e2015d86f2b58dc305dedbc48ed648ff03ec9f6abc11a7fb27938b1a
 DIST YODA-1.7.0.tar.bz2 949964 BLAKE2B 44063500b95e6a089adac0a28eb0165c6d91f09642dcba7eae994a8b2dd9c4cc5cff40d63cbb481f41e023193632b9b2c17c4304bc03afa4ad2c6010b52c15da SHA512 de4eff3fdd7f8f031745152907eadfe4687c6c8597772d8aba628e58e7d6f203bbe55ba030a77990b2441a9b046a4d7e2bce1fb29ba9a631c1cff17acd95b1e5
-EBUILD yoda-1.6.5.ebuild 1042 BLAKE2B 1694ad20c68b6bb6c3d7bd37809ed8abead572ff83261d2feb7905a647af5585e0e9059049ec763eeefa6a74c9b7b1903829b08c76ee45505d28e188e8ae760d SHA512 0fe36248bd11c97839ff9a8ddcc2f0db306a16a906354289a8fca879d46b5eece81cbc2cb71334d5dd5ee3cb8a15dbea3efa5e6535183610279ea58711d45cbb
-EBUILD yoda-1.7.0.ebuild 1029 BLAKE2B 3fc334dfef8777f462014ba9c98803fed85e4f8fee380e4825f5802e80fbd80cfad92f1b33f295aa5530dad8525c9dc916cb0fca5e3ddf0c2b35bf1b39b923f3 SHA512 99e276ad69277b670a8b191c731b47ecf33df8f5e3fc498bdd8eed4dd62d83caf039aec737878119df49e8c728786881dd1bd49fe4716f10191378eb5a19c8fa
+EBUILD yoda-1.6.5.ebuild 1087 BLAKE2B 23eb82bd36bdf634227689614929bcc09d4823b4f3ee7493678c11996ff74cd5ad5f194e56696f1e14c9f995cea9921eadd6c0f38b776a2cac0add1cab4a7ab4 SHA512 022e2bd15062649c1f41d75ff30de9682846eddc4096fea0f0fe41a9ac5f8f7ef24001b7ae39cca2d9bba06a9f618c78c72bcbc76736a8d933f73c9bc94a0247
+EBUILD yoda-1.7.0-r1.ebuild 1074 BLAKE2B 134e690ea38324ab4e2f33606cd72f6625646b3a701fdcd106757ff9b5f5754f800bd297cc127e8fcdbff14afe1366511cc237de7ba0b767ea030be95c9a0ca5 SHA512 2e8358a6c2cfc3cd28e1d1e0f149a30e564735586e5a4e9ffc7404761dd91568d50d1aeff904604d7be4125ac31c52de97be8729f0f86d6ae23c0711d86bd3d1
 MISC metadata.xml 659 BLAKE2B 460df9dfdf485eb860ba7eb737ee9cc715e823b4961894a99e51e9bbdb98ce14a87639ddb0774aeed11d111ed21ddc4e1804f41fcb4cd72c5b0b456402588f6f SHA512 ad6899122310e6e4ecb0e72737362379cc180524dd7e60c6dbacbd7d2a0eab5c633eb5ecf8b6731ed40b12e0e186eba8ce6def539c1c0969974e75467250b7b7
diff --git a/sci-physics/yoda/yoda-1.6.5.ebuild b/sci-physics/yoda/yoda-1.6.5.ebuild
index 00d3f8949c26..82bf586a70b0 100644
--- a/sci-physics/yoda/yoda-1.6.5.ebuild
+++ b/sci-physics/yoda/yoda-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,9 +20,13 @@ IUSE="python root static-libs"
 RDEPEND="
 	dev-libs/boost:=
 	python? ( ${PYTHON_DEPS} )
-	root? ( sci-physics/root:=[python=,${PYTHON_USEDEP}] )"
+	root? ( sci-physics/root:=[python=,${PYTHON_SINGLE_USEDEP}] )"
 DEPEND="${RDEPEND}
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sci-physics/yoda/yoda-1.7.0-r1.ebuild b/sci-physics/yoda/yoda-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..a29234715ba0
--- /dev/null
+++ b/sci-physics/yoda/yoda-1.7.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 python-single-r1
+
+DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
+HOMEPAGE="http://yoda.hepforge.org/"
+
+SRC_URI="http://www.hepforge.org/archive/${PN}/${P^^}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="python root static-libs"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	root? ( sci-physics/root:=[python=,${PYTHON_SINGLE_USEDEP}] )"
+DEPEND="${RDEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${P^^}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_enable python pyext) \
+		$(use_enable root) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newbashcomp "${ED%/}"/usr/share/YODA/yoda-completion ${PN}
+	rm "${ED%/}"/usr/share/YODA/yoda-completion || die
+}
diff --git a/sci-physics/yoda/yoda-1.7.0.ebuild b/sci-physics/yoda/yoda-1.7.0.ebuild
deleted file mode 100644
index 9f53d934f26e..000000000000
--- a/sci-physics/yoda/yoda-1.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 python-single-r1
-
-DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
-HOMEPAGE="http://yoda.hepforge.org/"
-
-SRC_URI="http://www.hepforge.org/archive/${PN}/${P^^}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="python root static-libs"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )
-	root? ( sci-physics/root:=[python=,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${P^^}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_enable python pyext) \
-		$(use_enable root) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	newbashcomp "${ED%/}"/usr/share/YODA/yoda-completion ${PN}
-	rm "${ED%/}"/usr/share/YODA/yoda-completion || die
-}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index ea06602455a3..13b80cafad4b 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 5a34f4c8b61f..3321cead4c10 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -3,5 +3,5 @@ AUX paraview-5.3.0-fix_buildsystem.patch 797 BLAKE2B f77c72f34c13eae42a4da281f95
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
 AUX paraview-5.6.1-fix_openmp_4.0.patch 3790 BLAKE2B 1da9193af5022e543d794802c50b868a4cf12f5a0943787d845b9b90540efe63d4952df588dc033a8d60978dd109801c3c791460c020bf811dfa5e1c7e028c07 SHA512 fa197c29d5e175c0f0743d3b820ee1be6cf3b1cff21cc98941d853693c0875e200b0ace67c9405a724c356646d8d302193af2226e936b97688dec553ce673b3d
 DIST ParaView-v5.6.1.tar.xz 38756076 BLAKE2B 65515a61493e5b9518c42b8b255c59086629bc863de9bfd5651b06ea96dce108ce93f559192d76411bfacaa93660add8ee181e68c46e36ba26b65d32dc141534 SHA512 33ca0b29d4dae8f2ecdad3148c30b5cecb4dc64a4fc898206f5f855cacbc18e554c86d6e259b39fb2f56d190cf76cdefe103009b233ce04ad2573caa34b9ca45
-EBUILD paraview-5.6.1.ebuild 8580 BLAKE2B 6cccc2df91270d5275ef01b76f68e824dd363192cafaa1f7661fc03939f10794de957312fef49b1a6e1906a912ad0786d600227c67146f084c961881a1d9c650 SHA512 e535c09777bea126d8efe65f8add9ad4ad68331f58c3cf00df38b20ff37f07c28b5255669c2f33207497caa8b95a5a5383b3c6c2194b8392f24f8b79ce9d3702
+EBUILD paraview-5.6.1-r1.ebuild 8689 BLAKE2B fb1153248908e538e9b94fa5970f77d98356ec9f3295b69f47f1f3377166ea955eeac39951d1d369e0159bed618bcd42b1386bbc2dd43ba09c83ea88aeb55a6a SHA512 212bf2665707e2d623305fe9ac01bb7095208443b404a8c1f64e3500d9c64504b7ab06424c9cd7aeaf476c8b3eaead90f458537c5c1235701faa0f639832df32
 MISC metadata.xml 817 BLAKE2B 8a28d48b1c9f543a90ca28f59c1f943ab0943c25457749a3f8b9a638b63a6703b8ec339ce35abe1fcca74963fbbddac96742094e036431d57d8763c494e4ac04 SHA512 fcc3c91bde9894d1d49b7845c2aca2b3d7ceba09b503b57405ba870a1a414fe7b280313844a2932d80d8d96987b035d948ce219032710e347181db8e3c9738ca
diff --git a/sci-visualization/paraview/paraview-5.6.1-r1.ebuild b/sci-visualization/paraview/paraview-5.6.1-r1.ebuild
new file mode 100644
index 000000000000..6233e8195c65
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.6.1-r1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils toolchain-funcs
+
+MAIN_PV=$(ver_cut 0-1)
+MAJOR_PV=$(ver_cut 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="Powerful scientific data visualization application"
+HOMEPAGE="https://www.paraview.org"
+SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk"
+
+RESTRICT="mirror test"
+
+# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
+	mysql? ( sqlite )
+	?? ( offscreen qt5 )"
+
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf:=
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/glew:0
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:0=
+	sci-libs/cgnslib
+	sci-libs/hdf5:=[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	coprocessing? (
+		plugins? (
+			dev-python/PyQt5
+			dev-qt/qtgui:5[-gles2]
+		)
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( dev-db/mysql-connector-c )
+	offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
+	!offscreen? ( virtual/opengl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/constantly[${PYTHON_MULTI_USEDEP}]
+			dev-python/incremental[${PYTHON_MULTI_USEDEP}]
+			dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			dev-python/sip[${PYTHON_MULTI_USEDEP}]
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+			|| ( dev-python/twisted[${PYTHON_MULTI_USEDEP}]
+				dev-python/twisted-core[${PYTHON_MULTI_USEDEP}]
+			)
+			dev-python/zope-interface[${PYTHON_MULTI_USEDEP}]
+			mpi? ( dev-python/mpi4py )
+			qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_MULTI_USEDEP}] )
+		')
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qthelp:5
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtsql:5
+		dev-qt/qttest:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtx11extras:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	boost? (
+		$(python_gen_cond_dep '
+			dev-libs/boost[mpi?,${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
+	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
+	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+	"${FILESDIR}"/${PN}-5.6.1-fix_openmp_4.0.patch
+)
+
+CMAKE_MAKEFILE_GENERATOR="emake" #579474
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+
+	# Bug #661812
+	mkdir -p Plugins/StreamLinesRepresentation/doc || die
+
+	cmake-utils_src_prepare
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/lib/python:/$(get_libdir)/python:g" \
+		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
+}
+
+src_configure() {
+	if use qt5; then
+		export QT_SELECT=qt5
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
+		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+
+		-DVTK_Group_StandAlone=ON
+		-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE
+
+		-DVTK_USE_OGGTHEORA_ENCODER=TRUE
+		-DVTK_USE_SYSTEM_CGNS=ON
+		-DVTK_USE_SYSTEM_PUGIXML=ON
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
+		-DVTK_USE_SYSTEM_GLEW=ON
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_JSONCPP=ON
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_LZ4=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_PROTOBUF=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF # does not compile with sci-libs/xdmf2-1.0_p141226
+		-DVTK_USE_SYSTEM_ZLIB=ON
+
+		# boost
+		-DModule_vtkInfovisBoost="$(usex boost)"
+
+		# coprocessing
+		-DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
+
+		# doc
+		-DBUILD_DOCUMENTATION="$(usex doc)"
+
+		# examples
+		-DBUILD_EXAMPLES="$(usex examples)"
+
+		# ffmpeg
+		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
+		-DModule_vtkIOFFMPEG="$(usex ffmpeg)"
+
+		# mpi
+		-DPARAVIEW_USE_ICE_T="$(usex mpi)"
+		-DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
+		-DPARAVIEW_USE_MPI="$(usex mpi)"
+		-DVTK_Group_MPI="$(usex mpi)"
+		-DVTK_XDMF_USE_MPI="$(usex mpi)"
+		-DXDMF_BUILD_MPI="$(usex mpi)"
+
+		# mysql
+		-DModule_vtkIOMySQL="$(usex mysql)"
+
+		# offscreen
+		-DVTK_USE_X=$(usex !offscreen)
+		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
+
+		# plugins
+		-DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
+		-DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
+		# these are always needed for plugins
+		-DModule_vtkFiltersFlowPaths="$(usex plugins)"
+		-DModule_vtkPVServerManagerApplication="$(usex plugins)"
+		# force this module due to incorrect build system deps wrt bug 460528
+		-DModule_vtkUtilitiesProcessXML=ON
+
+		# python
+		-DModule_pqPython="$(usex python)"
+		-DModule_vtkmpi4py="$(usex python)"
+		-DModule_vtkPython="$(usex python)"
+		-DModule_vtkWrappingPythonCore="$(usex python)"
+		-DPARAVIEW_ENABLE_PYTHON="$(usex python)"
+		-DXDMF_WRAP_PYTHON="$(usex python)"
+
+		# qt5
+		-DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
+		-DModule_vtkGUISupportQtSQL="$(usex qt5)"
+		-DModule_vtkRenderingQt="$(usex qt5)"
+		-DModule_vtkViewsQt="$(usex qt5)"
+		-DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
+		-DVTK_Group_ParaViewQt="$(usex qt5)"
+		-DVTK_Group_Qt="$(usex qt5)"
+		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
+		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
+		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+
+		# sqlite
+		-DModule_vtksqlite="$(usex sqlite)"
+
+		# tcl
+		-DModule_vtkTclTk="$(usex tcl)"
+
+		# test
+		-DBUILD_TESTING="$(usex test)"
+
+		# tk
+		-DVTK_Group_Tk="$(usex tk)"
+		-DVTK_USE_TK="$(usex tk)"
+		-DModule_vtkRenderingTk="$(usex tk)"
+	)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	if use python; then
+		mycmakeargs+=(
+			-DVTK_USE_SYSTEM_TWISTED=ON
+			-DVTK_USE_SYSTEM_AUTOBAHN=ON
+			-DVTK_USE_SYSTEM_ZOPE=ON
+		)
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-DVTK_USE_QVTK=ON
+			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+			-DVTK_QT_VERSION=5
+			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
+			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
+			-DVTK_Group_Qt:BOOL=ON
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+		# remove wrapper binaries and put the actual executable in place
+		for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
+			if [ -f "${ED}"/usr/lib/"$i" ]; then
+				mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
+			fi
+		done
+
+		# install libraries into correct directory respecting get_libdir:
+		mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
+		mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
+		mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
+		rmdir "${ED}"/usr/lib_tmp || die
+
+		# set up the environment
+		echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+		doenvd "${T}"/40${PN}
+
+		newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
+		make_desktop_entry paraview "Paraview" paraview
+
+		use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+	}
+
+	pkg_postinst() {
+		xdg_icon_cache_update
+	}
+
+	pkg_postrm() {
+		xdg_icon_cache_update
+	}
diff --git a/sci-visualization/paraview/paraview-5.6.1.ebuild b/sci-visualization/paraview/paraview-5.6.1.ebuild
deleted file mode 100644
index 52e09353c23c..000000000000
--- a/sci-visualization/paraview/paraview-5.6.1.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit cmake-utils desktop gnome2-utils python-single-r1 qmake-utils toolchain-funcs
-
-MAIN_PV=$(ver_cut 0-1)
-MAJOR_PV=$(ver_cut 1-2)
-MY_P="ParaView-v${PV}"
-
-DESCRIPTION="Powerful scientific data visualization application"
-HOMEPAGE="https://www.paraview.org"
-SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"
-
-LICENSE="paraview GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp offscreen plugins python +qt5 sqlite tcl test tk"
-
-RESTRICT="mirror test"
-
-# "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
-REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
-	mysql? ( sqlite )
-	?? ( offscreen qt5 )"
-
-RDEPEND="
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/jsoncpp:=
-	dev-libs/libxml2:2
-	dev-libs/protobuf:=
-	dev-libs/pugixml
-	media-libs/freetype
-	media-libs/glew:0
-	media-libs/libpng:0
-	media-libs/libtheora
-	media-libs/tiff:0=
-	sci-libs/cgnslib
-	sci-libs/hdf5:=[mpi=]
-	>=sci-libs/netcdf-4.2[hdf5]
-	>=sci-libs/netcdf-cxx-4.2:3
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXt
-	coprocessing? (
-		plugins? (
-			dev-python/PyQt5
-			dev-qt/qtgui:5[-gles2]
-		)
-	)
-	ffmpeg? ( virtual/ffmpeg )
-	mpi? ( virtual/mpi[cxx,romio] )
-	mysql? ( dev-db/mysql-connector-c )
-	offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
-	!offscreen? ( virtual/opengl )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/constantly[${PYTHON_USEDEP}]
-		dev-python/incremental[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		|| ( dev-python/twisted[${PYTHON_USEDEP}]
-			dev-python/twisted-core[${PYTHON_USEDEP}]
-		)
-		dev-python/zope-interface[${PYTHON_USEDEP}]
-		mpi? ( dev-python/mpi4py )
-		qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
-	)
-	qt5? (
-		dev-qt/designer:5
-		dev-qt/qtgui:5[-gles2]
-		dev-qt/qthelp:5
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtsql:5
-		dev-qt/qttest:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtx11extras:5
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	tcl? ( dev-lang/tcl:0= )
-	tk? ( dev-lang/tk:0= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	boost? ( dev-libs/boost[mpi?,${PYTHON_USEDEP}] )
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch
-	"${FILESDIR}"/${PN}-5.3.0-fix_buildsystem.patch
-	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
-	"${FILESDIR}"/${PN}-5.6.1-fix_openmp_4.0.patch
-)
-
-CMAKE_MAKEFILE_GENERATOR="emake" #579474
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != "binary" ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
-}
-
-src_prepare() {
-
-	# Bug #661812
-	mkdir -p Plugins/StreamLinesRepresentation/doc || die
-
-	cmake-utils_src_prepare
-
-	# lib64 fixes
-	sed -i \
-		-e "s:/lib/python:/$(get_libdir)/python:g" \
-		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
-	sed -i \
-		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
-		ParaViewCore/ServerManager/SMApplication/vtkInitializationHelper.cxx || die
-}
-
-src_configure() {
-	if use qt5; then
-		export QT_SELECT=qt5
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
-		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
-		-DBUILD_SHARED_LIBS=ON
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-
-		-DVTK_Group_StandAlone=ON
-		-DVTK_DEFAULT_RENDER_WINDOW_OFFSCREEN=TRUE
-
-		-DVTK_USE_OGGTHEORA_ENCODER=TRUE
-		-DVTK_USE_SYSTEM_CGNS=ON
-		-DVTK_USE_SYSTEM_PUGIXML=ON
-		-DVTK_USE_SYSTEM_EXPAT=ON
-		-DVTK_USE_SYSTEM_FREETYPE=ON
-		-DVTK_USE_SYSTEM_GL2PS=OFF # doesn't compile, requires modified sources
-		-DVTK_USE_SYSTEM_GLEW=ON
-		-DVTK_USE_SYSTEM_HDF5=ON
-		-DVTK_USE_SYSTEM_JPEG=ON
-		-DVTK_USE_SYSTEM_JSONCPP=ON
-		-DVTK_USE_SYSTEM_LIBXML2=ON
-		-DVTK_USE_SYSTEM_LZ4=ON
-		-DVTK_USE_SYSTEM_NETCDF=ON
-		-DVTK_USE_SYSTEM_PNG=ON
-		-DVTK_USE_SYSTEM_PROTOBUF=ON
-		-DVTK_USE_SYSTEM_TIFF=ON
-		-DVTK_USE_SYSTEM_XDMF2=OFF # does not compile with sci-libs/xdmf2-1.0_p141226
-		-DVTK_USE_SYSTEM_ZLIB=ON
-
-		# boost
-		-DModule_vtkInfovisBoost="$(usex boost)"
-
-		# coprocessing
-		-DPARAVIEW_ENABLE_CATALYST="$(usex coprocessing)"
-
-		# doc
-		-DBUILD_DOCUMENTATION="$(usex doc)"
-
-		# examples
-		-DBUILD_EXAMPLES="$(usex examples)"
-
-		# ffmpeg
-		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
-		-DVTK_USE_FFMPEG_ENCODER="$(usex ffmpeg)"
-		-DModule_vtkIOFFMPEG="$(usex ffmpeg)"
-
-		# mpi
-		-DPARAVIEW_USE_ICE_T="$(usex mpi)"
-		-DPARAVIEW_USE_MPI_SSEND="$(usex mpi)"
-		-DPARAVIEW_USE_MPI="$(usex mpi)"
-		-DVTK_Group_MPI="$(usex mpi)"
-		-DVTK_XDMF_USE_MPI="$(usex mpi)"
-		-DXDMF_BUILD_MPI="$(usex mpi)"
-
-		# mysql
-		-DModule_vtkIOMySQL="$(usex mysql)"
-
-		# offscreen
-		-DVTK_USE_X=$(usex !offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-		-DVTK_OPENGL_HAS_OSMESA=$(usex offscreen)
-
-		# plugins
-		-DPARAVIEW_BUILD_PLUGIN_AdiosReader="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_ArrowGlyph="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_GMVReader="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_Moments="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_NonOrthogonalSource="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_PacMan="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_SierraPlotTools="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_SLACTools="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_StreamingParticles="$(usex plugins)"
-		-DPARAVIEW_BUILD_PLUGIN_SurfaceLIC="$(usex plugins)"
-		# these are always needed for plugins
-		-DModule_vtkFiltersFlowPaths="$(usex plugins)"
-		-DModule_vtkPVServerManagerApplication="$(usex plugins)"
-		# force this module due to incorrect build system deps wrt bug 460528
-		-DModule_vtkUtilitiesProcessXML=ON
-
-		# python
-		-DModule_pqPython="$(usex python)"
-		-DModule_vtkmpi4py="$(usex python)"
-		-DModule_vtkPython="$(usex python)"
-		-DModule_vtkWrappingPythonCore="$(usex python)"
-		-DPARAVIEW_ENABLE_PYTHON="$(usex python)"
-		-DXDMF_WRAP_PYTHON="$(usex python)"
-
-		# qt5
-		-DPARAVIEW_INSTALL_DEVELOPMENT_FILES="$(usex development)"
-		-DModule_vtkGUISupportQtSQL="$(usex qt5)"
-		-DModule_vtkRenderingQt="$(usex qt5)"
-		-DModule_vtkViewsQt="$(usex qt5)"
-		-DPARAVIEW_BUILD_QT_GUI="$(usex qt5)"
-		-DVTK_Group_ParaViewQt="$(usex qt5)"
-		-DVTK_Group_Qt="$(usex qt5)"
-		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
-		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
-		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
-
-		# sqlite
-		-DModule_vtksqlite="$(usex sqlite)"
-
-		# tcl
-		-DModule_vtkTclTk="$(usex tcl)"
-
-		# test
-		-DBUILD_TESTING="$(usex test)"
-
-		# tk
-		-DVTK_Group_Tk="$(usex tk)"
-		-DVTK_USE_TK="$(usex tk)"
-		-DModule_vtkRenderingTk="$(usex tk)"
-	)
-
-	if use openmp; then
-		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
-	fi
-
-	if use python; then
-		mycmakeargs+=(
-			-DVTK_USE_SYSTEM_TWISTED=ON
-			-DVTK_USE_SYSTEM_AUTOBAHN=ON
-			-DVTK_USE_SYSTEM_ZOPE=ON
-		)
-	fi
-
-	if use qt5; then
-		mycmakeargs+=(
-			-DVTK_USE_QVTK=ON
-			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
-			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
-			-DVTK_QT_VERSION=5
-			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
-			-DQT_UIC_EXECUTABLE="$(qt5_get_bindir)/uic"
-			-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)/qmake"
-			-DVTK_Group_Qt:BOOL=ON
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-		# remove wrapper binaries and put the actual executable in place
-		for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
-			if [ -f "${ED}"/usr/lib/"$i" ]; then
-				mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
-			fi
-		done
-
-		# install libraries into correct directory respecting get_libdir:
-		mv "${ED}"/usr/lib "${ED}"/usr/lib_tmp || die
-		mkdir -p "${ED}"/usr/"${PVLIBDIR}" || die
-		mv "${ED}"/usr/lib_tmp/* "${ED}"/usr/"${PVLIBDIR}" || die
-		rmdir "${ED}"/usr/lib_tmp || die
-
-		# set up the environment
-		echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
-		doenvd "${T}"/40${PN}
-
-		newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
-		make_desktop_entry paraview "Paraview" paraview
-
-		use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
-	}
-
-	pkg_postinst() {
-		xdg_icon_cache_update
-	}
-
-	pkg_postrm() {
-		xdg_icon_cache_update
-	}
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index d7ed0472e07e..d37b02f534bb 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,5 +1,5 @@
 DIST pythonprop-0.13.tar.gz 217721 BLAKE2B bd22106e528267ea49e1f68e22ad03958bd064aa4009a5da01a7943dedc7f4e84b8e8dfe8bfc80bc0fe248457cdef69df1d471017c9626757a764aad52e1ccb3 SHA512 b637f48369c926c8dd680a433d46236dc4fa70be79b2325d8f82e320b2d75b1e6d7d992bd81022d27fb6ab118d92178c7ad5ad94f6011a396e4a28d7431bbf2b
 DIST pythonprop-0.18.tar.gz 1158035 BLAKE2B 3a01eb72ccfc3d0ebc356c4518d570544cedb01c5dff02ba55dd6be02b529bb4e6cf53346f74ac0dc21cf0662b107f58a064a704c124024c98419f330846868a SHA512 2ca796f215e5aab33bee7dd161358c3065b464587597363dee9f03758cf666cca1b70f5b83e8ac266e21f77b806711cb6f48a1d7c3cd0b97f1461e897f5f9f80
-EBUILD pythonprop-0.13.ebuild 655 BLAKE2B 2415c43259f6dceedb093ff8c271c22a816be418533f166ccd3c8ca8526e2f53de3ca43b69c3134f5b8d8d166a561a1908aff8fc14f317aad86609efe7a09e7c SHA512 762df784334b9ad3e951acfa03406dad59bdc45c76660b1fad48b9ec1411d44153360bb606c1dc567d4fc0b5edbbe419c968dffc627f673701f46da249bd405b
-EBUILD pythonprop-0.18-r1.ebuild 932 BLAKE2B 1c8cbe807ba78d320dc43527d57da73f2940e542e7f899fdbc99abdc56d66f38bc3f16b4d1a1d60ada0f767ff752ac7b83199035da3237fa79a3cdf96da42f8d SHA512 762937dcec7b236e254a569f9de2733c464c645cf33a7c295a9c70037bc8073f7524e76dabda4a53606961faa91d1684e0a2c4bfd8a7f1cd8d7aca84c06d217a
+EBUILD pythonprop-0.13.ebuild 707 BLAKE2B 346d26ab57dc035cd0cd0702f30e8a201b69b329782707128a5a52639c13fda0cc9947fee9b6cde5ab479ef4454c576255f3f82cf56531d54360937f2f279d10 SHA512 4e566488966c2373bab3c039e0b12ee87f7e75b756032143fb73c752bd88c46750197fec85bc39f8c3619c0afb7521bf6f2f280fe2df98f3e814b292574a1790
+EBUILD pythonprop-0.18-r2.ebuild 984 BLAKE2B f9e9ed2187e5925fdea3736ce3c52c34c38129bbc3e4bd8a43e56f5fdc1bcce4e3b5082f32593aaa2541d4b3cf269a63928f0964788a999f7b8ebcd911f5f1ac SHA512 04de410ce6566ed674af8ddd97500b19ae0220f133a403beeb30aaba2fb74a6ae5a82bdfbf9c6c8b6e48bf317fe4a4fca5653eaea3a25d8ff464c9e37b779466
 MISC metadata.xml 459 BLAKE2B dbf50a4c24f4a4dc0b27d087e0f0942ef7826ed8fcb858fd9744371f906bc5e1ff727a37db157705f5ebf630e744ce21bf9fc578e59eaaa6170215066b85a681 SHA512 23f2836015bd753b0a4957be9efa3347d2f5c6b79ec041465120aa9e8e6565397ba343ea8a393273eaab3c146b8555914b4a1e8bba2a0c4596bc49833388e8f1
diff --git a/sci-visualization/pythonprop/pythonprop-0.13.ebuild b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
index 854920aa56a8..729017cea4fc 100644
--- a/sci-visualization/pythonprop/pythonprop-0.13.ebuild
+++ b/sci-visualization/pythonprop/pythonprop-0.13.ebuild
@@ -19,11 +19,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	|| (
-		dev-python/matplotlib-python2[gtk2,${PYTHON_USEDEP}]
-		dev-python/matplotlib[gtk2,${PYTHON_USEDEP}]
-	)
-	dev-python/basemap[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/matplotlib-python2[gtk2,${PYTHON_MULTI_USEDEP}]
+			dev-python/matplotlib[gtk2,${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	dev-python/basemap[${PYTHON_SINGLE_USEDEP}]
 	sci-electronics/voacapl
 "
 DEPEND="${RDEPEND}"
diff --git a/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild b/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild
deleted file mode 100644
index a5c36e5b53b4..000000000000
--- a/sci-visualization/pythonprop/pythonprop-0.18-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
-HOMEPAGE="http://www.qsl.net/hz1jw/pythonprop"
-SRC_URI="http://www.qsl.net/h/hz1jw/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-python/matplotlib-python2[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-	)
-	dev-python/basemap[${PYTHON_USEDEP}]
-	sci-electronics/voacapl
-"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	app-text/rarian
-"
-
-src_prepare() {
-	# do not call update_destop_database here
-	sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.in || die
-	# fix Desktop Entry
-	sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die
-}
diff --git a/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild b/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild
new file mode 100644
index 000000000000..4f8e8ef1e524
--- /dev/null
+++ b/sci-visualization/pythonprop/pythonprop-0.18-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
+HOMEPAGE="http://www.qsl.net/hz1jw/pythonprop"
+SRC_URI="http://www.qsl.net/h/hz1jw/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		|| (
+			dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+			dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	dev-python/basemap[${PYTHON_SINGLE_USEDEP}]
+	sci-electronics/voacapl
+"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	app-text/rarian
+"
+
+src_prepare() {
+	# do not call update_destop_database here
+	sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.in || die
+	# fix Desktop Entry
+	sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die
+}
diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest
index c81bb400fd09..355d0ed1c1ee 100644
--- a/sci-visualization/pyxplot/Manifest
+++ b/sci-visualization/pyxplot/Manifest
@@ -1,3 +1,3 @@
 DIST pyxplot_0.9.2.tar.gz 4131841 BLAKE2B 8a5da46f2328ae8e73d7b841dc04b8d972bdaeb7dacaf658349e5235a696334cd806b8f8bc25b9bbebe2074f52f4fb0bad4b22ff305250b1a4d138ea039657e5 SHA512 34c43fec36dd579161c7adb9f0bab012c5d3e59c904526f82a70a31685b88a231c300ab4dbdff376b29fdd5698c376d55f7a2f2786d7960c4de7e6e0776fa844
-EBUILD pyxplot-0.9.2-r2.ebuild 998 BLAKE2B d3378d9a18598654471f885ac1da3f512afc393594fc6f82d48f5962921440a685c2b784c9b76806d0a8e225ebe797f9f96dd2183388e699a4963c27461930c6 SHA512 23ef5ce2e687362f51bd173db7b0f3e810c6470ac8e3efe15410ab79b8a22f1702a678bf1dee18069fd195405d819df389972c3edc8a8487d5540d71c1b6134f
+EBUILD pyxplot-0.9.2-r3.ebuild 1043 BLAKE2B 10fe324798302f00c22eadfa5aa93156e2a1bb90dcffb35168fb5ea8775ba75c7afb9934742957016ea1e691b2c704716d6a0c6d103b32ffe6ddbbb5f968539e SHA512 85733755f8e6a54fb300a3889720c264db84f0f4c4cbce3a86a4454642d56d615d2599a1d874e7520246f9aae6096ee017397a89728e77ad24f5269485111257
 MISC metadata.xml 649 BLAKE2B a709482e9a6d3f30231db228633f682ba1426640a5ababffc02b8a625900f62ec1f2bd40a6d2469085d87ed7c342081596d7371b112f0c4b56435f2ca7253f15 SHA512 2f9b6c06f24dccd4c954dc35cd4ac2b286ff77c5cf5794ed8ec6e20af4050c09099c84bdd75402823aed922f879b8d4340d9f6ce8763e116c0ba476853475531
diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
deleted file mode 100644
index 7ecda5c36f0e..000000000000
--- a/sci-visualization/pyxplot/pyxplot-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib python-single-r1
-
-DESCRIPTION="Gnuplot like graphing program publication-quality figures"
-HOMEPAGE="http://www.pyxplot.org.uk/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	app-text/gv
-	dev-libs/libxml2:2
-	media-libs/libpng:0=
-	sci-libs/cfitsio
-	sci-libs/fftw:3.0=
-	sci-libs/gsl
-	|| (
-		sci-libs/scipy-python2[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)
-	virtual/latex-base
-	virtual/imagemagick-tools
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed \
-		-e "s:/usr/local:${EPREFIX}/usr/:" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "s:/doc/${PN}:/doc/${PF}:" \
-		-i Makefile.skel || die "sed Makefile.skel failed"
-	sed -i -e 's/-ltermcap//' configure || die
-}
diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
new file mode 100644
index 000000000000..7cc957e134be
--- /dev/null
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib python-single-r1
+
+DESCRIPTION="Gnuplot like graphing program publication-quality figures"
+HOMEPAGE="http://www.pyxplot.org.uk/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-text/gv
+	dev-libs/libxml2:2
+	media-libs/libpng:0=
+	sci-libs/cfitsio
+	sci-libs/fftw:3.0=
+	sci-libs/gsl
+	$(python_gen_cond_dep '
+		|| (
+			sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+			sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	virtual/latex-base
+	virtual/imagemagick-tools
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed \
+		-e "s:/usr/local:${EPREFIX}/usr/:" \
+		-e "s:/lib/:/$(get_libdir)/:" \
+		-e "s:/doc/${PN}:/doc/${PF}:" \
+		-i Makefile.skel || die "sed Makefile.skel failed"
+	sed -i -e 's/-ltermcap//' configure || die
+}
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index c16103746725..7f4be9711479 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -1,10 +1,5 @@
-AUX fix_spline.patch 758 BLAKE2B a0d3af3bf186a6935a88e985931353085ce043e244fddecb7f9a5e0f71a812d0582218e4b544d320b6a380c9b6d2ff964e69799503cb08ab74451617fe1bc815 SHA512 9e0284b7dd879089dc16b28474060c2c53a8955645096e63e435129c237012b9cebcd666f10da4faa0c99b37512952961fa0f1f3d6c2747f3ab791bd8925c26b
 AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b80351accece2dcbcf11b39b26468d8c31e3feb9fc8422a1fe5051b00100743f263eba2558861236 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047
 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e
-DIST veusz-3.0.1.tar.gz 2554401 BLAKE2B 6e5649eef94ce0bd7fcdfa8325b35de144aaecd792f32c149f5a6f16c7c35f10d29bebeb37531d726e1b87f6d46855d7cdb2af402ec8fd0a2c1af91844d12c03 SHA512 99766c0fee70c12bba7b2ee8434224649763323aa9278d2116159f18257e1e1c5a491d591efb779c1bbb9dba1fb524ad8185fa2e91429ba1cc594fd632cb6238
-DIST veusz-3.0.tar.gz 2550683 BLAKE2B 72f0da8d9b993d8a3252fbb93314a53832fbf319287946e9ebc9317ebdab3f10ef2071012b88a1ff3d31d4732f367ded0b217dfa9766f5a09abe90e96b769e45 SHA512 a740d5677e8f23245e54573de0faaa66b659b54e289b256dc344f5aa0cc2a05db26efce57ff31b19c1235e04a9aa22cfa12125a784d27b0e3725277cbfae1b06
 DIST veusz-3.1.tar.gz 2524607 BLAKE2B ca5c5a75e02c9461e1d81dc4d2cc09865ebd4424f072616bf0a231a1f592a5c1c5aad93f713ed9ec1d9e2ad39b877a36c236b615d904295608d7990eaf59d5fb SHA512 9b940d1cc224f4729f788abe1e29352d35e69d2f78bae7f072a783d339198a8171b0f0b0a5f5af82ef0f0693550a42409956a9cc3888aa46d110d777e81941a4
-EBUILD veusz-3.0.1.ebuild 2065 BLAKE2B a654c941efa8cf3884186a50a87af89c9e84c6d5af7a63e1faa00a939b5ed94cec55c0600b3ac101293509926284a39a79706dafa8e454ddb35b0abbebf34ca1 SHA512 d00516aa01043f7fd53c5e1484cfdcec5abdf00146868df541ce037207bf05484e3f6a7eda0dd0a034644560f00ec98611b1d1924dbf8fe64b58af202e11ab2d
-EBUILD veusz-3.0.ebuild 2023 BLAKE2B bc3eecfd1825cce2aedb3ab2f927ebdc1f2fd738a9c190f613f2ee2bbf9c98912fa67a386f93537de864337e2904fc7d024b3a413ee5948ef59b465eb6c0cc3b SHA512 98688ec7a23fb389a0a8e94efae9fd2f2bdd9232272171c2445a96b5516eef4993448591e7991c852d0798cdb70be8acb59e4d51527a6f659bf1fb4cd7a4be2b
-EBUILD veusz-3.1.ebuild 1875 BLAKE2B 6894a4ace1b2f67857538d25bdd323ffcb038440982f2f182534e440b10c8e71b2954b8ebebc3ea74e52d0b7727d9bcb88dab032883d8b3f6506beca1d1c7d06 SHA512 ad9a629bc9313910f1322e1cb691395ffaeee7679ae319565ce4dd13c00b918bec311e045592491e8a21844ac179b1b25f0282078c552e4a797067edbf9afae4
-MISC metadata.xml 809 BLAKE2B 62297452456fc54f2da02b83c5a2c2b713c93e9de4edf186063bb9499dfd5724ff69d5e1b328cd65b3f21ab07009d3522fbe7cd98a4e6da7ff25329c4ad84c23 SHA512 16f7a7f127ec6261d672234238545adfbb036d9cf94f5fb031f0ed74cb3b49f2840697199fcf03970692f96a4ee55d12f1452e3179a20644307221ca84e2a556
+EBUILD veusz-3.1.ebuild 1822 BLAKE2B fe019a1d52f1fb1e72e401d6d726e9240879da68e346066a083a7dbd8d55dfc2612a11ef5fe24705fbb4802013cacae3f1086347023b9ecc302ecf7783f81d3f SHA512 3b5a1399b221afd99da10bcf5282d2b090d785205ab71fc5716c6a9c05236c03814416f4598912dcaf3d0ea2d6685021283c4df2c158b19114e4cdbde957caad
+MISC metadata.xml 730 BLAKE2B 5bc89773c5d0af7c79cc5cca45ff0d02a806d2437fedd56a9e1af19d9a89adc567e6f05b20c8e516484b0245a2010d16041497232ff7b424661b97429e34f7c0 SHA512 65ab1ea0d0846da6270837ac51c15aeea7eca2f56c9240bdf4d0b227d0d6aa51665ae88efb578b1f55348d0e8fba63ff2f859ba94184216090b2410227017cd5
diff --git a/sci-visualization/veusz/files/fix_spline.patch b/sci-visualization/veusz/files/fix_spline.patch
deleted file mode 100644
index a7d6bd85c48b..000000000000
--- a/sci-visualization/veusz/files/fix_spline.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Upstream patch that fixes spline interpolation:
-# https://github.com/veusz/veusz/commit/b4223800744034880fd1ca1165853636b31e576c
-diff -Naur old/veusz/helpers/src/qtloops/beziers.cpp new/veusz/helpers/src/qtloops/beziers.cpp
---- old/veusz/helpers/src/qtloops/beziers.cpp	2017-09-23 11:10:46.000000000 +0300
-+++ new/veusz/helpers/src/qtloops/beziers.cpp	2018-08-04 21:27:01.000000000 +0300
-@@ -1013,8 +1013,8 @@
-     return 0;
-   }
- 
--  // factor of 0.1 introduced by JSS to stop more hooks
--  double const allowed = L2(b - a)*0.1 + tolerance;
-+  // factor of 0.2 introduced by JSS to stop more hooks
-+  double const allowed = L2(b - a)*0.2 + tolerance;
-   return dist / allowed;
-   /** \todo 
-    * effic: Hooks are very rare.  We could start by comparing 
diff --git a/sci-visualization/veusz/metadata.xml b/sci-visualization/veusz/metadata.xml
index 1eea5012ca20..8ac6168821f3 100644
--- a/sci-visualization/veusz/metadata.xml
+++ b/sci-visualization/veusz/metadata.xml
@@ -12,7 +12,6 @@
   facilities.
 </longdescription>
   <use>
-    <flag name="fits">Add FITS format via <pkg>dev-python/astropy</pkg></flag>
     <flag name="minuit">Use Minuit during fitting via<pkg>dev-python/pyminuit</pkg></flag>
   </use>
   <upstream>
diff --git a/sci-visualization/veusz/veusz-3.0.1.ebuild b/sci-visualization/veusz/veusz-3.0.1.ebuild
deleted file mode 100644
index 0bbf8212cca0..000000000000
--- a/sci-visualization/veusz/veusz-3.0.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 virtualx xdg-utils gnome2-utils
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="https://veusz.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc fits hdf5 minuit"
-
-CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-PATCHES=("${FILESDIR}/fix_spline.patch")
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${S}" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
-	Please visit
-
-	https://www.gnu.org/licenses/gpl-2.0.html
-
-	for the full license text.
-	EOF
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dodoc Documents/manual/pdf/${PN}.pdf
-		docinto html
-		dodoc -r Documents/manual/html
-	fi
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-visualization/veusz/veusz-3.0.ebuild b/sci-visualization/veusz/veusz-3.0.ebuild
deleted file mode 100644
index 04fe7a60f538..000000000000
--- a/sci-visualization/veusz/veusz-3.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils distutils-r1 virtualx xdg-utils gnome2-utils
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="https://veusz.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc fits hdf5 minuit"
-
-CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${S}" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
-	Please visit
-
-	https://www.gnu.org/licenses/gpl-2.0.html
-
-	for the full license text.
-	EOF
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dodoc Documents/manual/pdf/${PN}.pdf
-		docinto html
-		dodoc -r Documents/manual/html
-	fi
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-visualization/veusz/veusz-3.1.ebuild b/sci-visualization/veusz/veusz-3.1.ebuild
index 57838ea691f1..112eefc77ad4 100644
--- a/sci-visualization/veusz/veusz-3.1.ebuild
+++ b/sci-visualization/veusz/veusz-3.1.ebuild
@@ -14,14 +14,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc fits hdf5 minuit"
+IUSE="dbus doc hdf5 minuit"
 RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/PyQt5[widgets,svg,printsupport,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
 	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
 	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )"
 DEPEND="${CDEPEND}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 44ad97755ef1..066ab295cc95 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index f07a994d3eb7..444731e5471c 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -2,6 +2,6 @@ AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552
 AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-EBUILD attr-2.4.48-r3.ebuild 2346 BLAKE2B e3a8f643923c83411ec4b2cc420baff300a8a190af25770ca5e20e8e0520d53533b95ebfba06dcb9fdc369babedc4757e2090494244468e40c516f1b1af16ecf SHA512 122cff4cc15688a8650f5243007cad88393b884ec6c9c2cd763adf78075071d2c6a49ed575b05463425a60178b3383c089b306f053fdd4986b8cec0360201186
-EBUILD attr-9999.ebuild 2433 BLAKE2B 2cdb707a357043c004bb7ed38d7ada460eb713bf021163d2fd1f7c6ea37b1ced3559853a4db8cc1eaa83bd08ce00290028bc8f1d280eacad3c922e9d4da6cb75 SHA512 56be1524c72945cfd459c5e7736bd7e7e015bdcf4ece19abe0ab2445d2b5b2655535debc31ecc7e2029324c0aae213bb8b45b387d9f5e853a094082ede82a6c4
+EBUILD attr-2.4.48-r3.ebuild 2342 BLAKE2B fe3c6da2d4e6d44a9f48252def8b1f21ce11c6b1e8f565f91c08e8aa348a036b6692f27eb5f34b3ec4fcb7f7608b09c5ec11a0b58936c268a2c0ebfb9d6e05f9 SHA512 d71b34001abacc06cd05d43f85c3065b51d8a32e50b095ce7761b842eccab059fee3011c8c99aad93c9f9367cb0f3e70b57cb714c75b65614c9444115fd6c236
+EBUILD attr-9999.ebuild 2429 BLAKE2B 9845e90c65bd48ef71cd2c9f5e90cd59dd126035725ef676202408d3a8010f7bcc312be26c7e71bdf9c1f557d041ae6ecbfa74fd5a9484d446b1b923929aed1b SHA512 58db4a14882a02d67b36123b5a6e9978d621c42ca637de7dccbe733db0fc0aad4efe8546d828a80143fb7f72c1d2583b73c256d84327f3a50da2f8b8b4a596c7
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild
index a6f39968dfdb..53966a4fee89 100644
--- a/sys-apps/attr/attr-2.4.48-r3.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -40,11 +40,11 @@ multilib_src_configure() {
 	tc-ld-disable-gold #644048
 
 	local myeconfargs=(
-		--bindir="${EPREFIX%/}"/bin
+		--bindir="${EPREFIX}"/bin
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable nls)
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable debug)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 1d01d82440c3..690027685314 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -48,11 +48,11 @@ multilib_src_configure() {
 	tc-ld-disable-gold #644048
 
 	local myeconfargs=(
-		--bindir="${EPREFIX%/}"/bin
+		--bindir="${EPREFIX}"/bin
 		--enable-shared
 		$(use_enable static-libs static)
 		$(use_enable nls)
-		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable debug)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 9574a8b04858..88aa6cd77c5f 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -7,7 +7,7 @@ DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE
 DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6
 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
-EBUILD baselayout-prefix-2.2-r5.ebuild 2888 BLAKE2B f5ec243f42071caf10b9057967922052839a346bd7b01389fc7188f4a9cfae5a3fae3301de458e0784add09a34236561a60d31a847dd0ba207b8f616535bd5d1 SHA512 38cb894c196af88a88bc2e6ad95f4f4321267839484c3bd5dfaf122c0a8661ca98bcaea0ee0c230362a5aa977cd5c43198221a0d41cb2c864f03f0ce13ff0e5b
-EBUILD baselayout-prefix-2.6-r1.ebuild 11002 BLAKE2B 3a0a6d8ca22c1ca654e2c182a520e94c538129529ceed81915883702f80a71eb5bdc2c2b6dab67345d824f005c9a82719011b809feff0ec980acb30ae930a7e6 SHA512 5518b2ae1b3e3e058c6fb104524654a6aae133be1bbaae65e1357ecb9c1afaded0d444429be18b3a7737bb6a45da5b99651442748624936fc9ac4b6c9fb0f8e2
-EBUILD baselayout-prefix-2.6-r2.ebuild 11096 BLAKE2B cb767d72c0c30b6e6c4a3637472d482388aa82d85b3d02f9ee231967966bfec9c9f66dff5b9c2ef5a671f800dcfabf2a7e1827e3797de3726e20dc04e6003007 SHA512 3f479177e40de584dcce03d868bef20fae6e29f294cc355c2e462d956b44bd90dd4578100717ef352b5db636ad169f5acdb61b6d268d274a45954ad292e267df
+EBUILD baselayout-prefix-2.2-r5.ebuild 2905 BLAKE2B 882643b63254aed8d578bf591727744b529f9759affb39c3733535f565bb3a9cae0b7f3527ed1581590ef29098b74c5165d70b5bfb59aa14def3adb0e2dcade7 SHA512 6bf9c5da248f0d41108257ea9c122f18702532d62cf4e4058b4dad13a89041ed758e066ceccfbe9b6292852c5ab239792bd51735943c419d8cbc2c707b9d7517
+EBUILD baselayout-prefix-2.6-r1.ebuild 11019 BLAKE2B 90dc59e786944a546795a4b3ee51b1a848f20b480f994a0ef5c0de411f335802332ba46481f68df24a13fbe437034605961af4a8d97a3a0b2f4b421f001b62e1 SHA512 4cca7c13a675ec25ce26d263927ba638a85a462d89a096a8af19941a254ffdba6a196196767b82c1c0ed5089c286d4d4b64064774e053d17a3f5474de011e1a7
+EBUILD baselayout-prefix-2.6-r2.ebuild 11113 BLAKE2B a28a29a04ae4ddf0f19aea3a48c97bf0ee8c5de4ed46832cc5f774d0acae606217ecd8b2578d87be62e8e5d2fee7e874eabbfa7694be16181f2fd588ef31d87a SHA512 43ba8069b6463a156be1f29c455cd816da3588d9b45b3042e33d114852dfb7c76de72ea563feba61575b088752a7552df5e714fc208cca0a236b03fa5901035b
 MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
index 5eb365ee62ad..4edcdeb30b92 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
@@ -7,7 +7,7 @@ inherit eutils multilib libtool
 
 MY_P=${P/-prefix/}  # just use "upstream" sources
 DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2"
 
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
index b689642fcbbf..c4c13fe0e01d 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-prefix/}
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
 	inherit git-r3
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 5d827ac9ef85..1074a131a49e 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -11,7 +11,7 @@ MY_PN=${PN/-prefix/}
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
 	inherit git-r3
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 4879d03c0ddc..f2b738672e20 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,8 @@
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
-EBUILD baselayout-2.4.1-r2.ebuild 8551 BLAKE2B 0672ef3559e8d401b6e62ccec3caa76f581fba0c9067244c93680ce2bcbae44b952c4fae0c053bbf633b522da84d24009411996d376829af256e7dc5189cc550 SHA512 7fde2a5bcb2940c09c1156d9070795534058c9225a9370999672cc7b30d202a626f3af74a0db897363f96227bc0cfab0ea89ebe3bfc38cdfed9dfe5eacb10d62
-EBUILD baselayout-2.6-r1.ebuild 9546 BLAKE2B fa62f6bb4ac1dda9b4eb2b321a84a146af5975dbf66012d204ee7609b6d68862177f2f1648016f2168b33ff788564c2a650f3dd93c73df8bf570c1aa8a08dd00 SHA512 d3085ff548184ecd8c5302252a8c002dda77a1e60e874ce0d518636dfed60fa57a79820d1fb2eab83bde5528f93696128d1f0769355b463ca137860eb8000245
-EBUILD baselayout-9999.ebuild 9554 BLAKE2B 7ecb4fd167c0633379b69480a33fe068ffbf096b860f65b15210c3d20a3ad642f7f99c4949c243c63c4a7b3e77fd764a61e8bb2cfe0e70e3388c0caeea30871b SHA512 68722948665e4eaf90f808c9a768611fddc8dd689d9e7e74fca587108b787f1e2ac0669cbf6b3b04fa8752ef28a151110dee0dc1ae88f627bc9bac64a6ad6309
+DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
+EBUILD baselayout-2.4.1-r2.ebuild 8568 BLAKE2B 57d41d33bd06d972845df561b03366ead110c9b98a8a20ae184a2aac10776f40ca586bb9b468d14d03b13eabbb159bacc672143ae4639914cdf7c2b5ba1a86eb SHA512 ee30bdf7a7db58f81278e1d9b2d6e9a6522f790ff3c87ec44f6035151981b2c490e3bd1eb49255fcc9abea1aada15d4de97b9f5730ff953168885c903cdf731e
+EBUILD baselayout-2.6-r1.ebuild 9563 BLAKE2B 566b25169d34e476bd8d853b7375ebbc16de0466f9b695170d79e215701b63219ff359ff1257643382ab149b5d7745a64b008459df062af5901f5e681815dd98 SHA512 b2c005ee885b16d36686d4f8ae44b3e47e62b74964d87195e26d19a6679beca72f7da8fe277105f78ecf319b88ef1e2d9adb0769dd58dab24ff77257f83fd6c2
+EBUILD baselayout-2.7.ebuild 9854 BLAKE2B ccaa74394d00bd251a300d5e2fe7a068eee41efda841e1e5d3f20652f4cea60e41befe929ce48c1b748b8368e6b06b86075ad7f195bee8923153fa80a3b501ce SHA512 8e434b0144d46b835491c0b98a88f2b8dcbd046e5aca2c287a4134f525dfa08333b13d2ce36af6a2966dbf270195fff9fa47f97afe9a14d432504a1d157d7bbc
+EBUILD baselayout-9999.ebuild 9854 BLAKE2B ccaa74394d00bd251a300d5e2fe7a068eee41efda841e1e5d3f20652f4cea60e41befe929ce48c1b748b8368e6b06b86075ad7f195bee8923153fa80a3b501ce SHA512 8e434b0144d46b835491c0b98a88f2b8dcbd046e5aca2c287a4134f525dfa08333b13d2ce36af6a2966dbf270195fff9fa47f97afe9a14d432504a1d157d7bbc
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index fc42f2d3ae7f..1b25f4786fe4 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils multilib versionator prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout/baselayout-2.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
index 6398d236aca7..0e9f29a78742 100644
--- a/sys-apps/baselayout/baselayout-2.6-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib versionator prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 	inherit git-r3
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
new file mode 100644
index 000000000000..a4b8ca535ac9
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib versionator prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		for prefix in ${prefix_lst[@]}; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die " Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
+		echo PATH=/usr/bin:/bin >> etc/env.d/99host
+		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+	fi
+
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr; then
+		sed \
+			-e 's|/usr/local/sbin:||g' \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}etc/${x}" ] && continue
+		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"run
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.4 ${x}; then
+			ewarn "After updating ${EROOT}etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ! version_is_at_least 2.6 ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
+	done
+
+	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
+		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index dc992108fe8b..a4b8ca535ac9 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib versionator prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 	inherit git-r3
@@ -188,6 +188,16 @@ src_prepare() {
 		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
 	fi
 
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr; then
+		sed \
+			-e 's|/usr/local/sbin:||g' \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
 	# handle multilib paths.  do it here because we want this behavior
 	# regardless of the C library that you're using.  we do explicitly
 	# list paths which the native ldconfig searches, but this isn't
@@ -196,7 +206,8 @@ src_prepare() {
 	# path and the symlinked path doesn't change the resulting cache.
 	local libdir ldpaths
 	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
 		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
 	done
 	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index ed93ca1d04dd..677c0a79de79 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,4 +1,5 @@
 AUX busybox-1.26.2-bb.patch 2416 BLAKE2B 2e227c11b0fd5558bfdb91a2d8bf3fd73e348e7efff9ecc6820e9ecd92047ffe4e94fe8f2aa864db87a3f081c2e3ff599546563fff83c78fc36a44fafc559de6 SHA512 cb767a613ede504a7b1a87da3270992ffa44d3b6f76eebefceffc8a5a49119a99333c482420efab9d1e5a92a26280376c7e9ec62fcb2193d9172f4e7bc19f50e
+AUX busybox-1.31.1-glibc-2.31.patch 1883 BLAKE2B 127f3f8e90c97af175c28bc8033805083de0ec50281ad65a801fd2282913aa6b1ebe4735c124209df4ef8b4a76d3360a8ffd8fdc09d70a7b9c0fade29807f69d SHA512 9c593a67c4e635928d11f89b1ef75877ef0f5c5b25cf0dafd1fceb8dade57ec3590f16967e680422e66c00a2a70693e124c53ee5eec72d0697e33935b5280fd7
 AUX ginit.c 3097 BLAKE2B 77a9382dfa5dabc7541fab85fe211760604c757c3f2c5e49556d0ae9e82239833d21eb8954f595ebf814925d3508a5016701344985c6ef15e6f3d23ea675f646 SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c
 AUX klogd.confd 218 BLAKE2B e4c814e673dc4fa555bca9cf2065659facbb4878b4a794a56c18366be3077944bf15b1dcf665d83e7ab53a279e23a0cdc1ea8dd01399bb6747247c9bb0d65da3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f
 AUX klogd.initd 245 BLAKE2B e8b8045cebfd39a8a088b70142e47442224ddf51d06b7ba7614721eb06bb8662184133d5464c79ece4826e5f338b54b6e2154b67f59c25dc9324fa526e82caf6 SHA512 6c28b5f2db40eeeae14f859f56a5e4f96a034b69639f38da3a437eabd1f74f61240b87eac2f7e5ca9a3377ceb9a37e939ab69b7db6a70c962062e5ae29f7e835
@@ -16,6 +17,6 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.30.1.tar.bz2 7793781 BLAKE2B 429f6bd48cb6ede81f956d450cf05b799dce9dbd61593b6dd787f353c2de3734d576ddfec644fa5ab6c61895400c32e3cb28c939b06eaa33eef105c8f8f13d8f SHA512 c18b3d06356d4708b4b0e89d23500d2fe494da9f6aac09c0c19a2e5145ba2bfe8261088eae6562c900996b50c5a9c20459f908069267898c8f86fe3b0b7bd80b
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 EBUILD busybox-1.30.1.ebuild 9430 BLAKE2B 9b0236c6078d0cb43f6e5e440c4f4a65fafaaeff777a638063cd854434a5586bd926eb7d70536dc6606f179caab9283acf5b5d590202d4c6c4dc30635fdd51a6 SHA512 91f9db9eb2ad6d12b10830928daa15334059fdbc8248dc360aaaccd419bee992e5a0b14a8c8b7cfe1ab60260a30d7e128b8b0ed89c8e863f7041dba499fd097d
-EBUILD busybox-1.31.1.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
+EBUILD busybox-1.31.1-r2.ebuild 9544 BLAKE2B 7f944890b532ab46bcab0c9e4e7078edfdf28609c65607372803118561b63359c37f5803e6f89649fe79f02d3bd88978e76ff3c2985bfc504e64204c27221065 SHA512 55487ac65ce9ad279d2a591768426ebaff7ab2c73095e6120bde729051f6bd886ebe4aa31fabb6c0d779d8243fdd9b410e7916f853e8839d7967272e344e0215
 EBUILD busybox-9999.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.31.1-r2.ebuild b/sys-apps/busybox/busybox-1.31.1-r2.ebuild
new file mode 100644
index 000000000000..658d7e2576e8
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.31.1-r2.ebuild
@@ -0,0 +1,338 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI=7
+
+inherit flag-o-matic savedconfig toolchain-funcs
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${P}
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )
+	virtual/libcrypt:="
+DEPEND="${COMMON_DEPEND}
+	static? (
+		virtual/libcrypt[static-libs]
+		selinux? ( sys-libs/libselinux[static-libs(+)] )
+	)
+	>=sys-kernel/linux-headers-2.6.39"
+RDEPEND="${COMMON_DEPEND}
+	mdev? ( !<sys-apps/openrc-0.13 )"
+
+S="${WORKDIR}/${MY_P}"
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	"${FILESDIR}"/${PN}-1.31.1-glibc-2.31.patch
+	# "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+	default
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# glibc-2.26 and later does not ship RPC implientation
+	busybox_config_option n FEATURE_HAVE_RPC
+	busybox_config_option n FEATURE_INETD_RPC
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	docinto html
+	dodoc *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/busybox/busybox-1.31.1.ebuild b/sys-apps/busybox/busybox-1.31.1.ebuild
deleted file mode 100644
index c15fa90610c7..000000000000
--- a/sys-apps/busybox/busybox-1.31.1.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=6
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
-	EGIT_REPO_URI="https://git.busybox.net/busybox"
-	inherit git-r3
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	local expr
-	while [[ $# -gt 0 ]] ; do
-		case ${flag} in
-		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
-		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
-		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
-		esac
-		sed -i -e "${expr}" .config || die
-		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-# patches go here!
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.2-bb.patch
-	# "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
-	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_2_4_MODULES #607548
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-	# triming the BSS size may be dangerous
-	busybox_config_option n FEATURE_USE_BSS_TAIL
-
-	# These cause trouble with musl.
-	if use elibc_musl; then
-		busybox_config_option n FEATURE_UTMP
-		busybox_config_option n EXTRA_COMPAT
-		busybox_config_option n FEATURE_VI_REGEX_SEARCH
-	fi
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option y SH_IS_ASH
-	busybox_config_option n HUSH
-	busybox_config_option n SH_IS_HUSH
-
-	busybox_config_option '"/run"' PID_FILE_PATH
-	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG_SANITIZE
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# glibc-2.26 and later does not ship RPC implientation
-	busybox_config_option n FEATURE_HAVE_RPC
-	busybox_config_option n FEATURE_INETD_RPC
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	docinto html
-	dodoc *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch b/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch
new file mode 100644
index 000000000000..1cef320b2842
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.31.1-glibc-2.31.patch
@@ -0,0 +1,65 @@
+diff --git a/coreutils/date.c b/coreutils/date.c
+index 3414d38ae..4ade6abb4 100644
+--- a/coreutils/date.c
++++ b/coreutils/date.c
+@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		time(&ts.tv_sec);
+ #endif
+ 	}
++#if !ENABLE_FEATURE_DATE_NANO
++	ts.tv_nsec = 0;
++#endif
+ 	localtime_r(&ts.tv_sec, &tm_time);
+ 
+ 	/* If date string is given, update tm_time, and maybe set date */
+@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		if (date_str[0] != '@')
+ 			tm_time.tm_isdst = -1;
+ 		ts.tv_sec = validate_tm_time(date_str, &tm_time);
++		ts.tv_nsec = 0;
+ 
+ 		/* if setting time, set it */
+-		if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
++		if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
+ 			bb_perror_msg("can't set date");
+ 		}
+ 	}
+diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
+index 87cf59b3d..dc40d9155 100644
+--- a/libbb/missing_syscalls.c
++++ b/libbb/missing_syscalls.c
+@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
+ 	return syscall(__NR_getsid, pid);
+ }
+ 
+-int stime(const time_t *t)
+-{
+-	struct timeval tv;
+-	tv.tv_sec = *t;
+-	tv.tv_usec = 0;
+-	return settimeofday(&tv, NULL);
+-}
+-
+ int sethostname(const char *name, size_t len)
+ {
+ 	return syscall(__NR_sethostname, name, len);
+diff --git a/util-linux/rdate.c b/util-linux/rdate.c
+index 70f829e7f..878375d78 100644
+--- a/util-linux/rdate.c
++++ b/util-linux/rdate.c
+@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
+ 	if (!(flags & 2)) { /* no -p (-s may be present) */
+ 		if (time(NULL) == remote_time)
+ 			bb_error_msg("current time matches remote time");
+-		else
+-			if (stime(&remote_time) < 0)
++		else {
++			struct timespec ts;
++			ts.tv_sec = remote_time;
++			ts.tv_nsec = 0;
++			if (clock_settime(CLOCK_REALTIME, &ts) < 0)
+ 				bb_perror_msg_and_die("can't set time of day");
++		}
+ 	}
+ 
+ 	if (flags != 1) /* not lone -s */
diff --git a/sys-apps/cinit/Manifest b/sys-apps/cinit/Manifest
index f27c25f45028..ace8264c6ecf 100644
--- a/sys-apps/cinit/Manifest
+++ b/sys-apps/cinit/Manifest
@@ -1,3 +1,3 @@
 DIST cinit-0.2.1.tar.bz2 63545 BLAKE2B ef45cc1a2622d4dbf36e47fab2d09a576ea726e3aa2ac928827dae63fd976daf3dee3d91de21bc1f66200fcb90aecd267b0e9fef9575e525b8e75d00a0f818a5 SHA512 fce6a0c06b11a252023f7f0159fdfe4f9f4dc3c1545708997c148ed2f0a451bb68a5b98518fc48083e3518959d28b32b1719a9b89d00af7a997854230fca09d7
-EBUILD cinit-0.2.1.ebuild 840 BLAKE2B f2b86ba9b1384a945df7408a4c63ef27d4ffd21503e9f9d0279b8c10af372443dd67a941b26bb77a270d4d543df7f3e3606a49387c6eecd1bed0017882fc3413 SHA512 87796d60d8647d110bb91a404fe27e97c4ebbd8044e2ebe8dea968800c1d7d17d3f217cb5112d1bc0e135324965143e8806aa4a7e45c0d87833ed38f680185f2
+EBUILD cinit-0.2.1.ebuild 853 BLAKE2B 3b0eae06fb61d8537a9ad8561c867970d90c7ec7b80f5530a975edfa564a713c66ccb18fbdb5bd0b15ef4576b1b51a45d9ced7b067f8288bc9a513bfc6e8f838 SHA512 b9bb4f7366d746fab604428a4c8eeb4043a74857719e2f8b411e3386fb1c20135ce73287c2bae9e2a31591df28e6d95603a768faf53f0b9c4edf4496481cebd5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/cinit/cinit-0.2.1.ebuild b/sys-apps/cinit/cinit-0.2.1.ebuild
index c52fcc2f6738..252f62e217b9 100644
--- a/sys-apps/cinit/cinit-0.2.1.ebuild
+++ b/sys-apps/cinit/cinit-0.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -17,6 +17,7 @@ IUSE="doc"
 src_prepare() {
 	sed -i "/contrib+tools/d" Makefile || die
 	sed -i "/^STRIP/s/strip.*/true/" Makefile.include || die
+	default
 }
 
 src_compile() {
@@ -31,7 +32,7 @@ src_compile() {
 
 src_install() {
 	emake LD=$(tc-getCC) DESTDIR="${D}" install
-	rm -f "${D}"/sbin/{init,shutdown,reboot}
+	rm -f "${D}"/sbin/{init,shutdown,reboot} || die
 	dodoc Changelog CHANGES CREDITS README TODO
 	use doc && dodoc -r doc
 }
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 3b0d1383dc91..3e3b15bdd69e 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -1,16 +1,4 @@
 AUX collectl.initd-2 348 BLAKE2B df64bad334058680e3b78469120f44d99d38eda84ce5eacf3cb0650d64674b1c0fd0a92efd8974f73fdbb1a706ce48d61b37417b75c1a8d59ca13685af8b1b4c SHA512 441c5c90baa194dead6c764317ca4e10f864e82c1ee1f0c0d99f301ecf0baf197349df13fc155ac8e42366c56d13478d6004d6648e1131deea3a002c5e89ab66
-DIST collectl-3.7.4.src.tar.gz 462752 BLAKE2B 40d5e0e4f78951c6e28187e585c3079e5a25366e2569808f42a588ce2985277f42525d4876679a9398ed157e4b1d62861adec00f3171eee0b8547a93a54a71ff SHA512 f25686fe977e0a3ea45a1980eea87baaa92a2d81ec308838c137d181e2bf182df6cdf453c5c6e7f3f0b2ccd3066d17ab9c4137303b587f55303dd4afe7ae35da
-DIST collectl-4.0.5.src.tar.gz 624040 BLAKE2B 83e9c0eff03bc1560aa62e97fd788bb3e22b3484333afc72fea1e35e97b9db723f690ed6b06728f641b1f7ec3f939423eca198926cfa821fb8121973a39c2746 SHA512 a7bcc8c100f4aa1bc24b6f65bf1271ae3757dc37adba67982e85a7159faa9c1ea912553e5e918a79b95cf2ec1126094abad0a654e343a9be940ad11c4cdcc42c
-DIST collectl-4.1.0.src.tar.gz 625147 BLAKE2B 60361e16bdc1ac7619d3e36b12f17f02703266fe43f0c0ec59e89a1a0c8d2ffd5a0eb6bc693fab98fdd14d4d8416865f2520f55026105bfef6697e93627c0d4b SHA512 b74918e458f4e7e9c6b598b078ef9522ba307b0055c0488167785d226f74a960bd075804128caef756d40a9c5a3f0189e912984c1b0c9bf62c537921e94714c5
-DIST collectl-4.1.3.src.tar.gz 634862 BLAKE2B a76fe50a9c26c5e25d951a4efceceb6474a46593180ef18d1cf346a8d52e6b3f43bd6d0b410fc36dcfd694f2ebfd35b232e6939df319e086897a74679affe57c SHA512 2938f349708dba164915fd44e7c2a58cc5088e3bafa9009c82973d5f03f8f62395cde925c6e3c1d49c6e22b653a7d1be352ec70dbabcc68b68fb3a795c1b5da8
-DIST collectl-4.2.0.src.tar.gz 634317 BLAKE2B 2c6f34dbc5ddc6616c5eb2a917d5c20dba10c9a600bb08a2cfeb6fc01ed7d916423d4fd1e1fdb7447f53c76a0fddc46087296ece671ca401e60a0c6c042dc20f SHA512 a0c3fd393a3fd3e34a838be26ebe4f111d5b62016d6c319cc556af93bec42672bd700c30c1b9a877fce049b0c11a6fbaf70c4c140ecf8f854408849a6d3a7855
-DIST collectl-4.3.0.src.tar.gz 634357 BLAKE2B 1e5e500d8c7b06e9d6262a599700d2b2104eea18c0fd57e36a493eb8c6c56e3701b73bbb60a1b5c12cd14cd7bced1730db737109da5d07bab73290a9fa5e818e SHA512 bc1cf9f36748ca496599bc52b3fe786fda44459b17b7410c96588ca28fe24529f51534318f62915da276a23085c33947abbe3ece479ba76a86ba7e0317587879
 DIST collectl-4.3.1.src.tar.gz 620693 BLAKE2B bcf8c41e0f6b51daa32fa9752dfd603230321718de190a8a9d71bf71e2c5f65e3b170bc85fbdcc78d2ab131bf5a5bfdfebf49225151ecf2cc444d2ca4ef0faaf SHA512 6f2df8a3da37f7ccb9d7f34a20e63b0601e5da7126bb3a9a11af7ee4959b682d59f44a1885bfb5882410e9de0191093ea4d5d43c8f2fa0f0904fd2ca4a3c5a90
-EBUILD collectl-3.7.4.ebuild 883 BLAKE2B 70df5c4d318566d59deae0a5bb7ba2681a17c38f419ed9817777c31c722247ee8b2f5b4ac2a29a4f13cdf0ddb4efef92e40a106811a1f013f5059b52822b9991 SHA512 ccc74cd18cdd57a681414384005b2937b0d380f65656c4ce022b493e2f7d9ee26ad3b59aa5abff2e9b62fcb2a67bf532312d748a30cddd55ffa8fbcb3b7adee9
-EBUILD collectl-4.0.5.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
-EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af683904215c60d4dc85e8715b0b4011ca9f0c7550479b3307bb273776c12af3ac1a6b6a61684f794d66ca4adbe SHA512 60d05fa96d9d2583ba549b1a0e313a1471cf41f9c2b30324db631c734c6dc23d0b20c52b10e90d67adbf3e3ab1970a8aea1319e8abd6081bbd4464050033133c
-EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b
-EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
-EBUILD collectl-4.3.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
 EBUILD collectl-4.3.1.ebuild 837 BLAKE2B 4704911d0272ea031ceaa98f6df495f589c7855842ace07d41e83a26e36ae15e0210cddfae0ccd7147693689d40c0eae41deaff2318fe26aaeea03a65a9a1c99 SHA512 ebeba1e9e77431b0f20360876d185f68c98138c380ee8c8de3824628cf3a9a93f5ead204df1ab316a39b58fa56e663c6de0d2fffa1489fc1791a40af653f41a1
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-3.7.4.ebuild b/sys-apps/collectl/collectl-3.7.4.ebuild
deleted file mode 100644
index 11b4890af555..000000000000
--- a/sys-apps/collectl/collectl-3.7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_prepare() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
-}
-
-src_install() {
-	DESTDIR="${D}" bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-
-	rm "${D}"/usr/share/${PN}/UNINSTALL || die
-
-	cd "${D}"/usr/share/doc/${PF} || die
-	dohtml *
-	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-4.0.5.ebuild b/sys-apps/collectl/collectl-4.0.5.ebuild
deleted file mode 100644
index c09f142f8823..000000000000
--- a/sys-apps/collectl/collectl-4.0.5.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
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_prepare() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
-}
-
-src_install() {
-	DESTDIR="${D}" bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-
-	rm "${D}"/usr/share/${PN}/UNINSTALL || die
-
-	cd "${D}"/usr/share/doc/${PF} || die
-	dohtml *
-	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-4.1.0.ebuild b/sys-apps/collectl/collectl-4.1.0.ebuild
deleted file mode 100644
index c09f142f8823..000000000000
--- a/sys-apps/collectl/collectl-4.1.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
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_prepare() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
-}
-
-src_install() {
-	DESTDIR="${D}" bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-
-	rm "${D}"/usr/share/${PN}/UNINSTALL || die
-
-	cd "${D}"/usr/share/doc/${PF} || die
-	dohtml *
-	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-4.1.3.ebuild b/sys-apps/collectl/collectl-4.1.3.ebuild
deleted file mode 100644
index c7ebec9b33fe..000000000000
--- a/sys-apps/collectl/collectl-4.1.3.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
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_prepare() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
-}
-
-src_install() {
-	DESTDIR="${D}" bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-
-	rm "${D}"/usr/share/${PN}/UNINSTALL || die
-
-	cd "${D}"/usr/share/doc/${PF} || die
-	dohtml *
-	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-4.2.0.ebuild b/sys-apps/collectl/collectl-4.2.0.ebuild
deleted file mode 100644
index c22ce227a617..000000000000
--- a/sys-apps/collectl/collectl-4.2.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-HTML_DOCS="docs/*"
-
-DOCS=(
-	README
-	RELEASE-collectl
-)
-
-src_install() {
-	dobin collectl colmux
-
-	insinto /etc
-	doins collectl.conf
-
-	insinto /usr/share/collectl
-	doins *.ph *.std
-
-	insinto /usr/share/collectl/util
-	insopts -m755
-	doins client.pl
-
-	doman man1/*
-	einstalldocs
-
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-}
diff --git a/sys-apps/collectl/collectl-4.3.0.ebuild b/sys-apps/collectl/collectl-4.3.0.ebuild
deleted file mode 100644
index c22ce227a617..000000000000
--- a/sys-apps/collectl/collectl-4.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-HTML_DOCS="docs/*"
-
-DOCS=(
-	README
-	RELEASE-collectl
-)
-
-src_install() {
-	dobin collectl colmux
-
-	insinto /etc
-	doins collectl.conf
-
-	insinto /usr/share/collectl
-	doins *.ph *.std
-
-	insinto /usr/share/collectl/util
-	insopts -m755
-	doins client.pl
-
-	doman man1/*
-	einstalldocs
-
-	newinitd "${FILESDIR}"/collectl.initd-2 collectl
-}
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 0eeb8ad56585..325f6e62a82d 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,7 +1,7 @@
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
-EBUILD coreutils-8.30.ebuild 6164 BLAKE2B 2489d3826cbc9735633513a265120eea113e4f591a0aa428c8bdd84648f58a0b0de1a3281144eae7983bb82e90264edc7b7516656c239c0631e19c6c782d5b68 SHA512 be61a68021956b88bf103be7b396f979e28f40eab9516e704e42946dcc4b693f72d6fa6da3c8f6445c1868cfb5d0d670195e216f1cd97be5a0736d91d5b3f9d2
-EBUILD coreutils-8.31-r1.ebuild 5712 BLAKE2B 9fa751739c527648f58efbfda15a2af81c7308e73c09ef1683561c90c6504f0c624ead9b7119f4d5e1083f3eb44a86927c04f974a41ee90a8c6555f310bfa732 SHA512 9be4ba703aa70d0a6779ace0fdf55080c689dd54528974066a97e0edf7580a304927ac47b0bf938da3c876261b2691cc8dd4922027f95cf238e1165b45a14d09
-EBUILD coreutils-8.31.ebuild 6181 BLAKE2B ab3e5469399458f81d1176841358c8d0061abaf4c15faa8a912c43701aed540352b192986cffede61d2409c1bf934e1b7ee2c3f92d20cb1e9664fe73c7799250 SHA512 49304878ecd4b9402c5316c2da4eeac7847adbe06dfe052403bd3e17195032f71ee3c3571401e6a0f40ba8da636ce93ed90c1af834eab3ddcb29721f6bb81063
+EBUILD coreutils-8.30.ebuild 6249 BLAKE2B 3677e01cbf708355f2541ee61a996d7cfe40eda012b2dce2d2e11f6a5ad7d7ab3f51dad599a3a1a7c52c24908b7cbb3b9b7224f8b7666bb885f0b5aa89230941 SHA512 25bf004085f0e1fa64a5445fe4325bd95ecf5ed803e1b1a76a612c55aab332c056195b718256b567576552216f3228da86851efd4afb9ebdc9baeb5ce55c682c
+EBUILD coreutils-8.31-r1.ebuild 5797 BLAKE2B b6b9766aa8e3322d7cfda9735fbbf0ac721e14f05baabae8485c3eecdf4b91a83fe5da948e29bdffb95b074cca3280d94f521ec5af4a3cff4de51f157b425f1a SHA512 b2e92fc8e6f6584cddf66b87386ab659a5fd8c5f214eddfe4fef8b2151d120be9d5efefcd4f05b1322fafd89e7aee8b2447c8ff61f32f87a241839941fd0f591
+EBUILD coreutils-8.31.ebuild 6266 BLAKE2B 4120a189f397e054dd8903a5d4a8afe1631ad684ea1593ee59df956a1bb1145614ab98085a63b540ce81c89fda83769f4e9f3bc70160ad634f0e9000481f2be4 SHA512 df9e520ed5d78925b798886bd59a58f760bbfd5c34fe35acb7a330f888d4d4fdab261366db6885d0703777653646ab0f736951a13c6d67ddff4cd67c2a3ba2fb
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index 91ea2d3a06db..99156b6acf85 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
@@ -54,6 +54,10 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
+python_check_deps() {
+	has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index 643aa3aeeca6..60949e9d236e 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
@@ -52,6 +52,10 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
+python_check_deps() {
+	has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
diff --git a/sys-apps/coreutils/coreutils-8.31.ebuild b/sys-apps/coreutils/coreutils-8.31.ebuild
index 565e641c8b48..6cb35ca90f17 100644
--- a/sys-apps/coreutils/coreutils-8.31.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
@@ -54,6 +54,10 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
+python_check_deps() {
+	has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 4844601aa2d3..698acb179553 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,5 +4,5 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
-EBUILD dbus-1.12.16.ebuild 7341 BLAKE2B 5ac2af986f670ac5cf346c5e68c3ed325a7f42445929f12f64ce3196690874bcae97ea2e9e43a8bad0440665d24d599a0bd4dd6eaacc3c37eeba0907096702ad SHA512 976de486813d080bb8a7af39347e426313f93498d1a759922ad33c6a6a9ded6f57d826c13541ed6b279d862ee272fc364e0e7fdaf6c51548f548d76246f2505d
+EBUILD dbus-1.12.16.ebuild 7335 BLAKE2B 2377700b5616ca3dba67866d6f483f18d22d404a67c995f298374593a4d5006125f8c4ffe5ac0f13453e902dcabd01c3249840e8cbf8f50503b1325158738c40 SHA512 a96bee928df5e4d157b1e2fe74913f6d32c457263a845320e35b5f949c8a1695c06566aff34527053ed976bc742b68f8176a7c88f09d51203f551a87affe6256
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
index 4ae10f92cbd0..7a9f46fbf42a 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
diff --git a/sys-apps/entropy-server/Manifest b/sys-apps/entropy-server/Manifest
index 88a994c742ec..644e4818bfd7 100644
--- a/sys-apps/entropy-server/Manifest
+++ b/sys-apps/entropy-server/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-server-302.ebuild 776 BLAKE2B 13436e057e4de1a9cfe8bdff55574d831f8187da0530f53ad272cc733214bd477b431c22fb07af9c52b22a4017ee4417c462283b3c547bb74ac1cad69588373f SHA512 1c6d3d642b4b43389cab5b6ce62b3d52896dc4671d0eb45b0ae8906009514e9636cae9e1cd512a141b229519a0509ff4e649b422f48a16351583af7602f278af
+EBUILD entropy-server-302-r1.ebuild 780 BLAKE2B b8ea59ae9bae844dc5ad3c2c289cf14993483c5d9911b3794f64eac75f87971f9c4146a796274647b40eba1e32a8ba5e887959bd742a534b5654155e6f4ef72a SHA512 b5d8142aa59aa0baa33530b700760bdedbd98e60d5ecd911000ba101c73477e408de4848950c6360d6f215211458d54c2ae3680677f9a1d9a2fb130f6ffc0fc2
 MISC metadata.xml 320 BLAKE2B ca21ea36322c6397cc3a57f84d8392006a14261a39c4cfe15da3434916deb3f44c087514f1f2e6658979daf1fa5593f50b920fe3b433e18ed74564cc34df1819 SHA512 a04e6b7dd069d705503948c17b83da870d918959a1a82cb67efcdb21df45bf8b3e3e43213ae2dbd584cb99516b99585a792d6d022d8fa2577fdc0b2f82ca0fea
diff --git a/sys-apps/entropy-server/entropy-server-302-r1.ebuild b/sys-apps/entropy-server/entropy-server-302-r1.ebuild
new file mode 100644
index 000000000000..a3fb4d6d958a
--- /dev/null
+++ b/sys-apps/entropy-server/entropy-server-302-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 bash-completion-r1
+
+DESCRIPTION="Entropy Package Manager server-side tools"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+matter"
+
+SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
+
+S="${WORKDIR}/entropy-${PV}/server"
+
+RDEPEND="~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}]
+	matter? ( ~app-admin/matter-${PV}[entropy] )
+	${PYTHON_DEPS}
+	"
+DEPEND="app-text/asciidoc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp "${S}/eit-completion.bash" eit
+
+	python_optimize "${D}/usr/lib/entropy/server"
+}
diff --git a/sys-apps/entropy-server/entropy-server-302.ebuild b/sys-apps/entropy-server/entropy-server-302.ebuild
deleted file mode 100644
index cd447283274e..000000000000
--- a/sys-apps/entropy-server/entropy-server-302.ebuild
+++ /dev/null
@@ -1,35 +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 eutils python-single-r1 bash-completion-r1
-
-DESCRIPTION="Entropy Package Manager server-side tools"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+matter"
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-
-S="${WORKDIR}/entropy-${PV}/server"
-
-RDEPEND="~sys-apps/entropy-${PV}[${PYTHON_USEDEP}]
-	matter? ( ~app-admin/matter-${PV}[entropy] )
-	${PYTHON_DEPS}
-	"
-DEPEND="app-text/asciidoc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp "${S}/eit-completion.bash" eit
-
-	python_optimize "${D}/usr/lib/entropy/server"
-}
diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest
index eed204e24d09..35cc083e7914 100644
--- a/sys-apps/entropy/Manifest
+++ b/sys-apps/entropy/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-302-r1.ebuild 3136 BLAKE2B 183542696051e20d2ce6cf2020faa76a78a98fd3efc258b74423f2ecc8454927a204d2c18d4147f81307375700c287753076cc25ad3b069e5b68f0c2950be175 SHA512 9a2b1e6ed5b44912a108c33b8ccf717914a262084d802952afd12f7460ee7ce3b6c8580a4c26e5d0cb183dde997987f813ca7b5677bdc8d82f1e0c1bf7d3e89e
+EBUILD entropy-302-r2.ebuild 3169 BLAKE2B 9df21299499d377f283bb9f4d2ee371980a024fc8e616fabb7ba7522dfc28382878e420c044a2affb8c17c66b54b3f00883328205a308fd9bd5299258d4d76d9 SHA512 3570bb9b15653539e01792ca95626bb83fd3f86b03aa1088d0122bd50003ca66d2a3337a1b247893b454f7436558be1014425973b258755cb51ab466ece7fa36
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/sys-apps/entropy/entropy-302-r1.ebuild b/sys-apps/entropy/entropy-302-r1.ebuild
deleted file mode 100644
index a617ded3def4..000000000000
--- a/sys-apps/entropy/entropy-302-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 user
-
-DESCRIPTION="Entropy Package Manager foundation library"
-HOMEPAGE="http://www.sabayon.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
-
-RDEPEND=">=app-misc/pax-utils-0.7
-	dev-db/sqlite:3[soundex(+)]
-	net-misc/rsync
-	sys-apps/diffutils
-	sys-apps/sandbox
-	>=sys-apps/portage-2.1.9[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-util/intltool"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${S}/lib"
-
-REPO_CONFPATH="${ROOT}/etc/entropy/repositories.conf"
-REPO_D_CONFPATH="${ROOT}/etc/entropy/repositories.conf.d"
-ENTROPY_CACHEDIR="${ROOT}/var/lib/entropy/caches"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	# Can:
-	# - update repos
-	# - update security advisories
-	# - handle on-disk cache (atm)
-	enewgroup entropy || die "failed to create entropy group"
-	# Create unprivileged entropy user
-	enewgroup entropy-nopriv || die "failed to create entropy-nopriv group"
-	enewuser entropy-nopriv -1 -1 -1 entropy-nopriv || die "failed to create entropy-nopriv user"
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="usr/lib" install
-
-	python_optimize "${D}/usr/lib/entropy/lib/entropy"
-}
-
-pkg_postinst() {
-	for ex_conf in "${REPO_D_CONFPATH}"/_entropy_sabayon-limbo.example; do
-		real_conf="${ex_conf%.example}"
-		if [ -f "${real_conf}" ] || [ -f "${real_conf/_}" ]; then
-			# skip installation then
-			continue
-		fi
-		elog "Installing: ${real_conf}"
-		cp "${ex_conf}" "${real_conf}" -p
-	done
-
-	# Copy config file over
-	if [ -f "${REPO_CONFPATH}.example" ] && [ ! -f "${REPO_CONFPATH}" ]; then
-		elog "Copying ${REPO_CONFPATH}.example over to ${REPO_CONFPATH}"
-		cp "${REPO_CONFPATH}.example" "${REPO_CONFPATH}" -p
-	fi
-
-	if [ -d "${ENTROPY_CACHEDIR}" ]; then
-		einfo "Purging current Entropy cache"
-		rm -rf "${ENTROPY_CACHEDIR}"/*
-	fi
-
-	# Fixup Entropy Resources Lock, and /etc/entropy/packages
-	# files permissions. This fixes unprivileged Entropy Library usage
-	local res_file="${ROOT}"/var/lib/entropy/client/database/*/.using_resources
-	if [ -f "${res_file}" ]; then
-		chown root:entropy "${res_file}"
-		chmod g+rw "${res_file}"
-		chmod o+r "${res_file}"
-	fi
-	local pkg_files="package.mask package.unmask package.mask.d package.unmask.d"
-	local pkg_file
-	for pkg_file in ${pkg_files}; do
-		pkg_file="${ROOT}/etc/entropy/packages/${pkg_file}"
-		recursive=""
-		if [ -d "${pkg_file}" ]; then
-			recursive="-R"
-		fi
-		if [ -e "${pkg_file}" ]; then
-			chown ${recursive} root:entropy "${pkg_file}"
-			chmod ${recursive} go+r "${pkg_file}"
-		fi
-	done
-
-	# Setup Entropy Library directories ownership
-	chown root:entropy "${ROOT}/var/lib/entropy" # no recursion
-	chown root:entropy "${ROOT}/var/lib/entropy/client/packages" # no recursion
-	chown root:entropy "${ROOT}/var/log/entropy" # no recursion
-
-	echo
-	elog "If you want to enable Entropy packages delta download support, please"
-	elog "install dev-util/bsdiff."
-	echo
-}
diff --git a/sys-apps/entropy/entropy-302-r2.ebuild b/sys-apps/entropy/entropy-302-r2.ebuild
new file mode 100644
index 000000000000..60d514f0e66c
--- /dev/null
+++ b/sys-apps/entropy/entropy-302-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1 user
+
+DESCRIPTION="Entropy Package Manager foundation library"
+HOMEPAGE="http://www.sabayon.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE=""
+SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
+
+RDEPEND=">=app-misc/pax-utils-0.7
+	dev-db/sqlite:3[soundex(+)]
+	net-misc/rsync
+	sys-apps/diffutils
+	sys-apps/sandbox
+	$(python_gen_cond_dep '
+		>=sys-apps/portage-2.1.9[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-devel/gettext
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-util/intltool"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${S}/lib"
+
+REPO_CONFPATH="${ROOT}/etc/entropy/repositories.conf"
+REPO_D_CONFPATH="${ROOT}/etc/entropy/repositories.conf.d"
+ENTROPY_CACHEDIR="${ROOT}/var/lib/entropy/caches"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	# Can:
+	# - update repos
+	# - update security advisories
+	# - handle on-disk cache (atm)
+	enewgroup entropy || die "failed to create entropy group"
+	# Create unprivileged entropy user
+	enewgroup entropy-nopriv || die "failed to create entropy-nopriv group"
+	enewuser entropy-nopriv -1 -1 -1 entropy-nopriv || die "failed to create entropy-nopriv user"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" install
+
+	python_optimize "${D}/usr/lib/entropy/lib/entropy"
+}
+
+pkg_postinst() {
+	for ex_conf in "${REPO_D_CONFPATH}"/_entropy_sabayon-limbo.example; do
+		real_conf="${ex_conf%.example}"
+		if [ -f "${real_conf}" ] || [ -f "${real_conf/_}" ]; then
+			# skip installation then
+			continue
+		fi
+		elog "Installing: ${real_conf}"
+		cp "${ex_conf}" "${real_conf}" -p
+	done
+
+	# Copy config file over
+	if [ -f "${REPO_CONFPATH}.example" ] && [ ! -f "${REPO_CONFPATH}" ]; then
+		elog "Copying ${REPO_CONFPATH}.example over to ${REPO_CONFPATH}"
+		cp "${REPO_CONFPATH}.example" "${REPO_CONFPATH}" -p
+	fi
+
+	if [ -d "${ENTROPY_CACHEDIR}" ]; then
+		einfo "Purging current Entropy cache"
+		rm -rf "${ENTROPY_CACHEDIR}"/*
+	fi
+
+	# Fixup Entropy Resources Lock, and /etc/entropy/packages
+	# files permissions. This fixes unprivileged Entropy Library usage
+	local res_file="${ROOT}"/var/lib/entropy/client/database/*/.using_resources
+	if [ -f "${res_file}" ]; then
+		chown root:entropy "${res_file}"
+		chmod g+rw "${res_file}"
+		chmod o+r "${res_file}"
+	fi
+	local pkg_files="package.mask package.unmask package.mask.d package.unmask.d"
+	local pkg_file
+	for pkg_file in ${pkg_files}; do
+		pkg_file="${ROOT}/etc/entropy/packages/${pkg_file}"
+		recursive=""
+		if [ -d "${pkg_file}" ]; then
+			recursive="-R"
+		fi
+		if [ -e "${pkg_file}" ]; then
+			chown ${recursive} root:entropy "${pkg_file}"
+			chmod ${recursive} go+r "${pkg_file}"
+		fi
+	done
+
+	# Setup Entropy Library directories ownership
+	chown root:entropy "${ROOT}/var/lib/entropy" # no recursion
+	chown root:entropy "${ROOT}/var/lib/entropy/client/packages" # no recursion
+	chown root:entropy "${ROOT}/var/log/entropy" # no recursion
+
+	echo
+	elog "If you want to enable Entropy packages delta download support, please"
+	elog "install dev-util/bsdiff."
+	echo
+}
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index a39e1652af9a..1d368bc4e90a 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,6 +3,6 @@ AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718ac
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
-EBUILD findutils-4.6.0-r1.ebuild 1963 BLAKE2B 348056361ad81207e9a7332c749a6b831e1c8f7b8c07c6a7a437d8f8bee0e1380f788c402fa11aed8d39a99c2980c4988d914812df159e1d36b02513f319522b SHA512 f55532b1d6314537a66f6bd8c8e72813ff69a0688b8bc796c2d7ed1daf2197369749c832103000c5136cb31ca4ca3e98db4998713c93aa028c6fb4b3d2a39f96
-EBUILD findutils-4.7.0.ebuild 1695 BLAKE2B 09cf65bd88bdfd092ef4c43569c875ab71493169127238b751e838ce9d3d6ab930b16819f575a99c18b44269ec549ad8d07585efe1ab691f59fda6e2a0d5524a SHA512 c4411d4c4280f1e4343acc0737a0a60c0cdb85cf0ce429e4c43e69b7cbaa7fbd5cc24d44bb3967bddfb135200e0ed47044336c8b548e51bce76755abea7af904
+EBUILD findutils-4.6.0-r1.ebuild 1959 BLAKE2B 4fb5c4d83a95cd5d06f228c1a678c92755a084a33c16caefacd2a134b53672d2a7c1a89104434b4634eb4a4a4f4473a77cf86f6c2234c1b57a2afa03165ab67f SHA512 1f0a54ddd86a8c6ea39e9515311beb3ddcdcd3b2d371bcfcfbf1a9cb45b4f86ffe9e8220df2d14593ac9f64d3d2333287eec9f9a4727271dcc53b4e0e3958d3e
+EBUILD findutils-4.7.0.ebuild 1689 BLAKE2B b185b21f4273c65e3ebf30dc216b79afde1b51493da909085a4ece0f79725e7c201b9fee4d6684081e2a454bc75506e3a7e718f2e90ead5d68af87aa9cde5733 SHA512 0f1a35f86716de18a620b57e2b0cd5c275078f79f5e4b6f6de4c283b08ec0b8ac6b4b86d41fa51f455c698e4a37bf16beb3316d25733398dc2de97bb370bb2e0
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index f9cfaf8e2372..bec6913975ce 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic toolchain-funcs python-any-r1
 
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index fca1640b4202..17f3de810dd5 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit flag-o-matic toolchain-funcs python-any-r1
 
diff --git a/sys-apps/fix-gnustack/Manifest b/sys-apps/fix-gnustack/Manifest
index 4f0fb576d253..3645b052e957 100644
--- a/sys-apps/fix-gnustack/Manifest
+++ b/sys-apps/fix-gnustack/Manifest
@@ -1,3 +1,3 @@
 DIST fix-gnustack-0.1.tar.bz2 105457 BLAKE2B 25825972d0a37335a6d6aec316e4dc972d6590da5d7d1145252b3fb4fbbf6276cc7818e47270065583558adf36522ea26652f8e7212a2046fc0d54c131ad5324 SHA512 df83beef5533003ceedda799bb27af15f877d2b3bc7c8213b2ac64a100270790655de3836eaa0ab8411d9eb91a6056e4902973b740b9b0791dcc5477226544a1
-EBUILD fix-gnustack-0.1.ebuild 440 BLAKE2B 555059c2a8bd48e854f8acc175e552004d47b577af102f17e34838135826825785d9f57ae824232293467f30b6379fa8458987ebc6961d6b592929894c7ad875 SHA512 5b132a4464561504187ced8adc27ab9d9afaba5002b03bd6ea7083c004ee3ec794904418150d2f9e033142d4317d59f87163c7ab1b40a9f154d0eb9056931544
+EBUILD fix-gnustack-0.1.ebuild 447 BLAKE2B 642e6d231e85dffc13c36eeed4266be352fb10e216116a95577bf1a16e30591acced107d605cd6ef8f7612787a400e4eb26222712c7d728971f49a78ef202b9c SHA512 d13ed53663c2f5512b44db3e86a62fa4d1e7fc9aadca25dcefcd4d69caf47ab113a06dc036fd669373dc8fc1e43f25dfe0bc2ac33aba167ba74adad3d9f22004
 MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
diff --git a/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild b/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
index ab3b556fe2a1..7c291908b48e 100644
--- a/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
+++ b/sys-apps/fix-gnustack/fix-gnustack-0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Utility to report and remove the executable flag from an ELF object's GNU_STACK"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
+HOMEPAGE="https://dev.gentoo.org/~blueness/fix-gnustack"
 SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.bz2"
 LICENSE="GPL-3"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 6b84b515cd53..952591d495a8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,7 +2,7 @@ AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409d
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
 DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
 DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e
-EBUILD fwupd-1.2.11.ebuild 3791 BLAKE2B f3451bde6287c540e43ec0903c060caf19f27c0f60b190e7bee5c5da66663a0c461488b1f649e7c0cdaf7f1c97169cc629b20f2e383a1c05336677829a3beeb8 SHA512 cd0af110d7bd7f8941c473bbd576a4d8df7d3b51bdb76dca1dfacf63304f9649886151dfc478800ed21ce311e1a0cce16e1c4735178f6c1748ca93de34d59a36
-EBUILD fwupd-1.3.6.ebuild 4024 BLAKE2B 8eecd7d737f0fa364c55da844a3d85dc632a568e65dbf3c49b98ad3aaf1b9f026a26e374008ce16ede3faeefb1e137743df8b058d04fe43d4e1363a15360b103 SHA512 b924fc66266c20e4abdcfc41c159c2bc9eddb5095dc94e31b967fc309872c3ec5040b12011d21ba6320264e4f4c0e446f3364795ec461f50eb8dfd9d73ae318c
-EBUILD fwupd-1.3.7.ebuild 4046 BLAKE2B dbb75b4c53bf25c6717547e99b06e8954d35a96a11fbc0724791cce65f174183d4e6c3e2bc3a80d21443305d22a7c3fc41820fe9ba5988d2cd2b66b9acf71882 SHA512 191878ecd30802ac3b71f75575635f51a5d3ed03fe96452b8eeb8735e86121b98bd849e1102d392bd960e1c4f898f94323ccbedc6edcabfdf09f30e8eb905fe1
+EBUILD fwupd-1.2.11.ebuild 3841 BLAKE2B e4e3bc8c24019820ab5e2ac4afc84385fd97743b6c7f13564947010504a2ab548a9e593e922c3e7a98d2a86c90e05f4c46c70508903280e5937dd025a6441c19 SHA512 36921af2092640f1da1eaf0bf5fd52d5116f33e9218eb0355767a5b2590620942a74ee8d28c0351015d25e725c106783b10904f66aec84579f69a3ec2b1867a5
+EBUILD fwupd-1.3.6.ebuild 4074 BLAKE2B e0a15aca14f956e4f07c008114d3ea26437bc5a2e2220fe4e6296f596306cc4b43bbf6107f26c9e4ddd980b31b2806fb2b74fa98223aae00349da4b68aa54c0f SHA512 d118e5801846d35da86aa1c0b47f1bc217665e4c7356210587c9ed217416fe9c530e4df1f8942f8356b342ad288524acf8a84a1110fec35acba30a584dfcb343
+EBUILD fwupd-1.3.7.ebuild 4107 BLAKE2B e4dbfb28be95ac707c8fbd29fa5336415f4864dac394b75e5458489444c8fb66bceea72ca074825729d716e6625608f5a898053ac23d425c5e5e0bf9def958a2 SHA512 10bebe2bb2d346fcb10f140d8483fd649b184f5ecbd467b279e708db3de7395f847d2b8fc3babad9294d63c6233a40ce3fe8c477d44af0c72b51bee22549915f
 MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d
diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild
index 8bad64accc42..345dba19aaac 100644
--- a/sys-apps/fwupd/fwupd-1.2.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild
@@ -32,9 +32,11 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection]
 	>=dev-libs/libxmlb-0.1.7
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection]
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
diff --git a/sys-apps/fwupd/fwupd-1.3.6.ebuild b/sys-apps/fwupd/fwupd-1.3.6.ebuild
index a0a687b89dc4..a9c5006ef34e 100644
--- a/sys-apps/fwupd/fwupd-1.3.6.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.6.ebuild
@@ -45,9 +45,11 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
 	>=dev-libs/libxmlb-0.1.13
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
diff --git a/sys-apps/fwupd/fwupd-1.3.7.ebuild b/sys-apps/fwupd/fwupd-1.3.7.ebuild
index 86067acbc0c6..becbfc3095f6 100644
--- a/sys-apps/fwupd/fwupd-1.3.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.7.ebuild
@@ -45,9 +45,11 @@ DEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
 	>=dev-libs/libxmlb-0.1.13
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	virtual/libelf:0=
 	virtual/udev
@@ -84,7 +86,7 @@ DEPEND="${PYTHON_DEPS}
 "
 # Block sci-chemistry/chemical-mime-data for bug #701900
 RDEPEND="
-	!sci-chemistry/chemical-mime-data
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
 	${DEPEND}
 	sys-apps/dbus
 "
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 51dcfee149c5..03667c40d6f1 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
 DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
-EBUILD gentoo-functions-0.12.ebuild 818 BLAKE2B 36314c207eb995b721240f68bb472810451d5d5337ff755151c314dc667f622ccd66977272a74f6c86731be91daf47b134bbca099b2ffb6786035017eef8b1a1 SHA512 4abfaf4a69424c69733a44dfd17cb33931b205ba5b305bbb5864ca9da78d2e6796f1b3807bb2618639600b52547cb7626006c7b81f1ecde6978dbfabb7f80d00
+EBUILD gentoo-functions-0.12.ebuild 836 BLAKE2B 79f8beb212fb25c19171848c76fc79e5c54bbe0c50ff8598c8457b19bbf6c6b0a6fd6bae9cfc236555f48d0626fe99f234817dbe8266546ae288be453ee4cb73 SHA512 035b7789e1c8fae7df019fe339ec601990f952484d44a87d1357923aa768f7ffa68c81077a249644422169d165bda1deea3360e480d1ba4b0b13c7e11cb6f196
 EBUILD gentoo-functions-0.13.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
 EBUILD gentoo-functions-9999.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index 287a61aa175b..6d011618fc13 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -14,7 +14,7 @@ fi
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="base functions required by all Gentoo systems"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/gpet/Manifest b/sys-apps/gpet/Manifest
index 2077a7e586e5..3d553e617d2e 100644
--- a/sys-apps/gpet/Manifest
+++ b/sys-apps/gpet/Manifest
@@ -1,3 +1,3 @@
 DIST gpet-0.4.tar.bz2 352653 BLAKE2B e9bee8cd62332101afea95f427646dfc51a0dcbb95a5807b8cbd0503594090ef2ff5428876bd7d017465d8708e7c3a282602cc48edeb6cafd2976a51568a911d SHA512 e373d57ab67d71fb750ee9af93893d036ff26f764f317328117745a4440c0559c2356866c09acfe579473e950e003744ae0a308df3b284d46097dcfe967c122e
-EBUILD gpet-0.4.ebuild 477 BLAKE2B 03818747d1aa423afe2511761db2936e78a189458949b9bb4c4c56ec7153df6fbc0bf0c84d23e764b6bff5c382f639b1d673d45c1ad137a99c46085fe6d59e58 SHA512 e5fb64396ded1401ffadce287274103b5a52d3d9300a5753a6922fb2502530c7bdbbe97d26f1c8c89ac3ef29b6e6b798e1611a117846736971e77ba481c5026b
+EBUILD gpet-0.4.ebuild 479 BLAKE2B 4cc59195abf756759b4b6e5ea9e42a6ca5a974339711d36b805918af75f9e5f3dae4d960f43840df2faf535935dfc9709f001dcd7ebba1462fdfa5d3834b468a SHA512 9df9ba5abdae33247c01fbcd6875340cefa001a4a38d8bea577cf8174e742ea5b9b92ad082015803ab8dd3b2d87801fdcb71ca1693394e5c6ec898a77f6e51b3
 MISC metadata.xml 301 BLAKE2B 352604d9a85c67dfaeedfaf59ba0a306a5e28638b13d0e04aebbbb410501a42393d8ad0be7efe19cbd47259323806eedfcbcedbd31b523a67bc4158eef46aaaf SHA512 fc0ba10b181262a33c2acd9a694585af1d05f1a09398a4f42e7693bd92990654d3812c0eb0ee254425662a63815e0211ea34f20ef2cb7c8fefcc0b6e37ec5b74
diff --git a/sys-apps/gpet/gpet-0.4.ebuild b/sys-apps/gpet/gpet-0.4.ebuild
index 116891f39944..70a0b701a922 100644
--- a/sys-apps/gpet/gpet-0.4.ebuild
+++ b/sys-apps/gpet/gpet-0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="GTK+ based TOMOYO policy editor"
 HOMEPAGE="http://en.sourceforge.jp/projects/gpet/"
@@ -10,13 +10,14 @@ SRC_URI="mirror://sourceforge.jp/gpet/53178/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-RDEPEND="gnome-base/gconf
+RDEPEND="
+	gnome-base/gconf
 	sys-devel/gettext
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/pango"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 7a88f286b48a..18c7ee34d4c8 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -7,5 +7,5 @@ DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6f
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
 EBUILD groff-1.22.2.ebuild 2796 BLAKE2B 3f4fd1a8ebb16b1fc8fa928dbe43019b6e327f074f43de5927d1a342b0fbb26e375728cca06edb5718227c53e9563a11e38ccc7fe5b6efb1ec0eca099076b28d SHA512 123c5025e9c19d0d4667bbad1174e01824b8d1b4eb81135bc93b3e5709f76b3f7c64890fd0ab6228f2f45c0eddbdf64eea79fa812779a83b185ad975ab9705f4
 EBUILD groff-1.22.3.ebuild 2507 BLAKE2B 23f2c59923f0421245f635314a1183077a94725e76d42bfcea9bfcc64e8167996932e9ccd77d674742d1b132a5ade620908e42adfb3022a6e2f04e830c01e83c SHA512 1f03843cc9e0c12935dde8173046b7010bf47e59c650d562d78bd7bd855435fc54a9878443a36d025e2e1c8a6d1c469721213731e7c19ef2664f569988bf1ff9
-EBUILD groff-1.22.4.ebuild 2571 BLAKE2B 3bdab91c27a8cd1d46bd769f31e95f2acfc798b2c2e953b1aeec165d435fb7903ccc76a5f073f6714b4c3c0fcff2a96ba9120578bf45db203906ebeb345cb08f SHA512 475e28be3a0294083cbc65fdf77dadc073ddd2f77866f5f27ccd806788a3d2c4c6bd723ca8e38c94794ed5138611d96e970e6b31ad53905aa2aec0e021f7e0e3
+EBUILD groff-1.22.4.ebuild 2567 BLAKE2B 9b83933b71a0f6c2bfa8d2b322f0064409bb0c0d781dec890252bab4669d3670d17e83322230c0127a1d880fc839b8d8d8658bd871a06ca1ba57c0cd0c429984 SHA512 8975a6d2cbe875b6fd6c6976da9f779a28ec6c7ad26782190fb61594654ab4eeb2bc6b0a6bf47a757839e93a59f2d415950c21fe403e27ab6936b5702c47fc2a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 5cc2095734ed..f24193f78f45 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -43,7 +43,7 @@ src_prepare() {
 	default
 
 	# honor Gentoo's docdir
-	sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX%/}/usr/share/doc/${PF}\"|g" \
+	sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX}/usr/share/doc/${PF}\"|g" \
 		Makefile.in \
 		|| die "failed to modify Makefile.in"
 
@@ -61,7 +61,7 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--with-appresdir="${EPREFIX%/}"/usr/share/X11/app-defaults
+		--with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-apps/gscanbus/Manifest b/sys-apps/gscanbus/Manifest
index 3688de955a05..5058e3db01b1 100644
--- a/sys-apps/gscanbus/Manifest
+++ b/sys-apps/gscanbus/Manifest
@@ -1,3 +1,4 @@
+AUX gscanbus-0.8-Wimplicit-function-declaration.patch 386 BLAKE2B 0408be6cfaad0a1b90b7d48b2b131fd8d66823ac3ed159b6005257d61f29d3dc871bef1e403c5fb0454444def5d158fe85cff035bf9c8687f8984bd5cc83240d SHA512 ecc49af667ad35c56c12e83e23ecbcb771bb14fa750bd2ebe3b334e6fb666d113fb45a1f77a575459b8bf51888057a7e17ed3cb5998cf0a3845978234d0afd57
 DIST gscanbus-0.8.tar.gz 215739 BLAKE2B a07b5f067a064715522ecf3665c84390cf720c4ebd3ea276259107b1a17c0c26e6a439b6c3e6e1a76644572967d8aa38f18f7bf96ba3a77ba0f70937f6e7f903 SHA512 a5f97acb57869b151fbdee5747510f554b8d67b1889ce199ba803bc75a91d1a8b98239799ce61d775923dfff0767db518a46cf9222eb370150ea158eecde95be
-EBUILD gscanbus-0.8.ebuild 506 BLAKE2B 15123b3ace3451be088308a68ca132324509329e45e8f14665fb63c43475577eceda5f317c621266db97ba7d0aa9bd19d4704877cd312c643c780cfcb1c47a14 SHA512 7c42011df8d0d66d59a94509143612c120067dce24b53b0e7eeeeed17a8bf1ad0aa8dcb69bf7dced17a7d6f3b7bd0e0e25d3350a916e30352dd0f9151ac2aa29
+EBUILD gscanbus-0.8.ebuild 545 BLAKE2B 2f50ac890b5e6b28cdcec82d8accb6bb9b626d679bca23cf204ac49825a9afc69e0a17343f8ea20259ba7af458f2cce4430e8d186b557b78b18b945679c72e29 SHA512 361de4996ef51837ebb20b29bced179899cae71ffcb97fddb7745392cc58bcf5b8037db26f863e17befcc98e086923d48bfb7296e4774f3663fbd17b33286d8c
 MISC metadata.xml 336 BLAKE2B 0b5dfa774dbf36c91ac6b37b851a7c673057044a4831472082a583cda88d20c75da5a6903d26d58876c9d7a352f4d95117f66e2de11bfe33b0ee33e3db6b21a8 SHA512 f40619fce237b7474a6d8e8dd9e6f2a145b035f0f83534e298485f92f15a9ef4ef343db5a552d412dca548261a4ae0dba4efe280a988e2b95c08f3179b644f43
diff --git a/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch b/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..79a585694ab0
--- /dev/null
+++ b/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch
@@ -0,0 +1,22 @@
+--- a/decodeselfid.c
++++ b/decodeselfid.c
+@@ -25,6 +25,8 @@
+ 
+ #include "decodeselfid.h"
+ 
++#include <string.h>
++
+ void printbin(FILE *stream, unsigned int i, unsigned char width) {
+ 	int j;
+ 	for (j=0; j<width; j++) {
+--- a/fatal.c
++++ b/fatal.c
+@@ -18,6 +18,8 @@
+  */
+ #include "fatal.h"
+ 
++#include <stdlib.h>
++
+ void fatal(char *s) {
+ 	fprintf(stderr, "Error: %s\n", s);
+ 	exit(1);
diff --git a/sys-apps/gscanbus/gscanbus-0.8.ebuild b/sys-apps/gscanbus/gscanbus-0.8.ebuild
index 693ade0c091f..98a308f1c30c 100644
--- a/sys-apps/gscanbus/gscanbus-0.8.ebuild
+++ b/sys-apps/gscanbus/gscanbus-0.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Bus scanning, testing and topology visualizing tool for Linux IEEE1394 subsystem"
 HOMEPAGE="https://sourceforge.net/projects/gscanbus.berlios/"
@@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="sys-libs/libraw1394
+RDEPEND="
+	sys-libs/libraw1394
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS README TODO )
+PATCHES=( "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch )
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 0f200baa211f..2eb2cb416497 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,7 +9,7 @@ DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd8
 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
 DIST iproute2-5.5.0.tar.xz 747756 BLAKE2B b9cf368bd0a082c1d613b8089ed425d50525d886a56b2353439ba3fa5c7fedcb40deb090b78c23e14d61cbffebb5ad7de13c08afb2b18841000a3b8e08861b63 SHA512 a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78
-EBUILD iproute2-4.19.0-r1.ebuild 4387 BLAKE2B c286879bdc8e4910af49170daab9a6a06d9fee11324b30c8a2bf2c7a902412623554e84ac75ab0bfbadae9a99f79903bb37a594ad50f32db63ded4c491ce7de5 SHA512 1c378aab94a08065c9fff812b0745279206c25599343485185a17e70c44a96555a3877d6c0d5ce6501c7c30ee7fe0037de3abba81a2b4b0f001d9131f5014339
+EBUILD iproute2-4.19.0-r1.ebuild 4373 BLAKE2B bc56146a05a953090a1ccc239c45768201f4c80c10f91555881bdc0a5d3ccf355e3336236ec2dfbb9c6a6152fe31c357ee35fb7f369b1c15d117169a4093451e SHA512 a4eb2a2a860167ee6c4bddd45673b0e3cba41a1e04c46711836c2ed23a0e947d5e4ae4210eb2427f9f6241479e675d84b5c6ed0fd68353621070b28dd0a6fe9e
 EBUILD iproute2-5.2.0-r1.ebuild 4481 BLAKE2B a20b17c75ab3b6c6d2178a5f91672d34c513e5099346257769ab27726491073e6b6b13e860257f5f3b8553796ab159bdc507a42d2e4b99206f1ff31caa99d55e SHA512 2396905be8efcc6fd080d45a6ebc754acdce08e39d8dd76b4c59639bdba12f4cf21b3e450ea18ee4f714b08a52617637176a801ec0264019703967f7051df07e
 EBUILD iproute2-5.4.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
 EBUILD iproute2-5.5.0.ebuild 4436 BLAKE2B 94c362ae57a596e69c689332a249ea4afea060cbed87ce8a55cccbee21486112b150716762c462f65a025c41607c151d9123176c631dd402efdd528ed3023865 SHA512 bcf437aca85d661ad08061d533dc934e14c802bb8c498ba88700e016935c1221f379bd055c954cc2dbe1427ae86a3d638ca43fc8d8731ae0df5426689cd06e0e
diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
index e0e3327e66ce..7c6651c21260 100644
--- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
@@ -128,13 +128,13 @@ src_install() {
 
 	emake \
 		DESTDIR="${D}" \
-		PREFIX="${EPREFIX%/}/usr" \
-		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
-		SBINDIR="${EPREFIX%/}"/sbin \
-		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
-		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX%/}"/usr/share/man \
-		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
 		install
 
 	dodir /bin
diff --git a/sys-apps/lcdsplash/Manifest b/sys-apps/lcdsplash/Manifest
index c1322e49eacc..27d1d574bd83 100644
--- a/sys-apps/lcdsplash/Manifest
+++ b/sys-apps/lcdsplash/Manifest
@@ -1,3 +1,3 @@
 DIST lcdsplash-0.3.tar.bz2 8121 BLAKE2B 52baebd47f6b72fd55c3afaa4a44803fd71b3674419a6fe43b8a642cdfbd14fd964e82db995707e48b23ccf0d323f9f6853f1a5558ae3ff64b6332cc9880ecf1 SHA512 4d40200882260c31cfe20988cf64d27be0af7f1ab983e5a998dcaeafede074e882379508a775f54690105591e0802eb897559eb7437d81f0b24096dd8c363243
-EBUILD lcdsplash-0.3.ebuild 591 BLAKE2B 710b35f5b9477749d8e8bb7ea6cc841ad1fbe6fb641808490ce44cb6ac14ca8120469b240ca28fc7c8f67c7d6c910053aa49d70e6b2c55f529197fcd0912712b SHA512 d47fe1dd7d4f1563b4367b5547801dfd87063dc6cf904f992ace4e53d7cf72d3367d90c3a8eec250e71ffab0ceed6e19795f8a5cad595752d634f353f86c9d97
+EBUILD lcdsplash-0.3.ebuild 608 BLAKE2B e5715921e5be470607eac65d261c82598a9648908b5045fe380257a0f6db75ba098d1990a11caa9166b05cbe785844284f15ee0e360f1abb274ad248c1f252ec SHA512 3a8b4eae5214f42de234977de8dd4264caf019f070931941d5a8eb3d27cda8e49f628826c37112e5c164bce9df170bda90ee94067d4e4751479c37a847aeeebb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild b/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
index 21435a81ead6..a0bc9b81e6fc 100644
--- a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
+++ b/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="splash Gentoo boot information on LCD's"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
 	https://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
 
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index de4e4e32cbb1..2737547d61b8 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -12,6 +12,6 @@ DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118
 DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
 EBUILD lm-sensors-3.5.0.ebuild 6479 BLAKE2B fff78d53b823063e4324941a71b4f0027db1b7ce7a4fe96a1a8eb4987074f75de331c9cf063585d22659fcb4e03805a0310f1864317ccf52026b2457f8a56699 SHA512 ae7008b8dd9a0aeb20d96e160441d3f5c112ff40e4d80dee8d1501477211afd1c7aab70701a06e69a974dd2d7d1b10e8a3fdfede48674f17726e32c0d625c411
-EBUILD lm-sensors-3.5.0_p20190505.ebuild 6445 BLAKE2B 3e11c346ac68bfbec68d63ae766a5737cd59721008b4e04bb80ed6d73b32b3db64a98e2fd1ede5c5b13d487131d74b984559599299614b6c3d10856b73b1e41b SHA512 1edbf8904e2d43ae0ecd72e1b3b93f19387c42bd7d8ed7e2de737f1406dee1243bce43cf4c37ed5e6c0d5992f5f05522a34429e82a608c9f3ee3fa203ffd3c94
-EBUILD lm-sensors-3.6.0.ebuild 6445 BLAKE2B 3e11c346ac68bfbec68d63ae766a5737cd59721008b4e04bb80ed6d73b32b3db64a98e2fd1ede5c5b13d487131d74b984559599299614b6c3d10856b73b1e41b SHA512 1edbf8904e2d43ae0ecd72e1b3b93f19387c42bd7d8ed7e2de737f1406dee1243bce43cf4c37ed5e6c0d5992f5f05522a34429e82a608c9f3ee3fa203ffd3c94
+EBUILD lm-sensors-3.5.0_p20190505.ebuild 6443 BLAKE2B 4e5257f7b17cb449c94c6e2f306bcc38a85e68452b9cfa2b59e2285ac7807666b1f1b961ce0e5e37d6c376be6700b3c54b9d2557234d1ed506e9330997f7d3e8 SHA512 cf25c73989ac5af1a1c9e85ef5476a545aa5c33045049ee5aeaf8c5492db60518215fbb67b390f29ebac9f1cd24c189db4b8508ae9cef7be529d164bf63b2ecb
+EBUILD lm-sensors-3.6.0.ebuild 6443 BLAKE2B 4e5257f7b17cb449c94c6e2f306bcc38a85e68452b9cfa2b59e2285ac7807666b1f1b961ce0e5e37d6c376be6700b3c54b9d2557234d1ed506e9330997f7d3e8 SHA512 cf25c73989ac5af1a1c9e85ef5476a545aa5c33045049ee5aeaf8c5492db60518215fbb67b390f29ebac9f1cd24c189db4b8508ae9cef7be529d164bf63b2ecb
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
index e2d8209c6ad9..34df54fc1062 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
@@ -135,7 +135,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		DESTDIR="${D%/}" \
+		DESTDIR="${D}" \
 		PREFIX="/usr" \
 		MANDIR="/usr/share/man" \
 		ETCDIR="/etc" \
diff --git a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
index e2d8209c6ad9..34df54fc1062 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.6.0.ebuild
@@ -135,7 +135,7 @@ multilib_src_compile() {
 
 multilib_src_install() {
 	emake \
-		DESTDIR="${D%/}" \
+		DESTDIR="${D}" \
 		PREFIX="/usr" \
 		MANDIR="/usr/share/man" \
 		ETCDIR="/etc" \
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 19096364e6ae..2ed8ae9c92c7 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,6 @@
-DIST man-pages-5.03.tar.xz 1677908 BLAKE2B 54ba60a0ef772259fe8facf9e8d36155b16a3c990adb7bcc63e57bdd969d1853e6eadbc3d21186c23730c65dd7cefe497819921b9b5c8622bee74f656430723a SHA512 e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be
 DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe
+DIST man-pages-5.05.tar.xz 1687960 BLAKE2B 68d1391e9517837f55e1516f5c8f869d43ea4e7a01faef62ea27c740ecb73726d66a582b1f5b6bb8674173146035eed8d811d4923351d99bf9363a0ee6297e4a SHA512 4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.03.ebuild 1638 BLAKE2B 92687049ef1f2f63f0e417ff734524bbf7ac9c219cb6813c652a6d118130786a58023bc9f518db71ca5363450e721e1a5b0063716d4ba93e9902626c20cef775 SHA512 017fcdc1516c219522a27f5a64adc1b29e767896cf67357042bac3bf1e5d1c160a057d9f9c461db2981391ae1ee6cb1b49b9fce47648ff5556259886cc580e99
-EBUILD man-pages-5.04.ebuild 1650 BLAKE2B 2334dd511c995562ff21d6ae0502fcf4e10fa9ce822543fb73a3e984aa190ce14d12ecd0dd662aea1bc766632ed423ab4e30db7de693ff25c2eb25fad5760423 SHA512 5bb978e229b2963a0eb99f5768bc5618931fb36d96aa80153776a2019238eb15026cebc762dc21e65551807a915e86739e0e895cfb29f5fd397623815420b5cb
+EBUILD man-pages-5.04.ebuild 1638 BLAKE2B 92687049ef1f2f63f0e417ff734524bbf7ac9c219cb6813c652a6d118130786a58023bc9f518db71ca5363450e721e1a5b0063716d4ba93e9902626c20cef775 SHA512 017fcdc1516c219522a27f5a64adc1b29e767896cf67357042bac3bf1e5d1c160a057d9f9c461db2981391ae1ee6cb1b49b9fce47648ff5556259886cc580e99
+EBUILD man-pages-5.05.ebuild 1650 BLAKE2B 2334dd511c995562ff21d6ae0502fcf4e10fa9ce822543fb73a3e984aa190ce14d12ecd0dd662aea1bc766632ed423ab4e30db7de693ff25c2eb25fad5760423 SHA512 5bb978e229b2963a0eb99f5768bc5618931fb36d96aa80153776a2019238eb15026cebc762dc21e65551807a915e86739e0e895cfb29f5fd397623815420b5cb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-5.03.ebuild b/sys-apps/man-pages/man-pages-5.03.ebuild
deleted file mode 100644
index 6450c0bbb0a5..000000000000
--- a/sys-apps/man-pages/man-pages-5.03.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" de fr it ja nl pl ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2
-	!<dev-libs/libbsd-0.8.3-r1"
-PDEPEND="nls? (
-	l10n_de? ( app-i18n/man-pages-de )
-	l10n_fr? ( app-i18n/man-pages-fr )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	)
-	sys-apps/man-pages-posix"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo || die
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-5.04.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
index 63013ab5b776..6450c0bbb0a5 100644
--- a/sys-apps/man-pages/man-pages-5.04.ebuild
+++ b/sys-apps/man-pages/man-pages-5.04.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.05.ebuild b/sys-apps/man-pages/man-pages-5.05.ebuild
new file mode 100644
index 000000000000..63013ab5b776
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-5.05.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
+	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE_L10N=" de fr it ja nl pl ru zh-CN"
+IUSE="nls ${IUSE_L10N// / l10n_}"
+RESTRICT="binchecks"
+
+# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
+RDEPEND="virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<sys-apps/attr-2.4.47-r2
+	!<dev-libs/libaio-0.3.109-r2
+	!<dev-libs/libbsd-0.8.3-r1"
+PDEPEND="nls? (
+	l10n_de? ( app-i18n/man-pages-de )
+	l10n_fr? ( app-i18n/man-pages-fr )
+	l10n_it? ( app-i18n/man-pages-it )
+	l10n_ja? ( app-i18n/man-pages-ja )
+	l10n_nl? ( app-i18n/man-pages-nl )
+	l10n_pl? ( app-i18n/man-pages-pl )
+	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
+	)
+	sys-apps/man-pages-posix"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
+	dodoc man-pages-*.Announce README Changes*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	cd "${WORKDIR}"/man-pages-gentoo || die
+	doman */*
+	dodoc README.Gentoo
+}
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index 0801cf31e9ad..86388c8fa515 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,3 +1,4 @@
+AUX memtester-4.3.0-fix-gcc10-fno-common.patch 514 BLAKE2B 5b911fcd0ca63030e471f8e0e721f808ff8161d5cb14e51bec33bb61313154cab746880d162371a0a05b0c7fd4d165a90d5ad850f7d03139bdcdd7d5a24a5430 SHA512 ee0c21c40185fefe32d55c9f2b704db2b769189d6902369dc77078417fd7babdf6d2a6ba34dc4db2a8203bbe72148476d167550e8488477c4cd4a7bc221951f8
 DIST memtester-4.3.0.tar.gz 22113 BLAKE2B 564cb874ea8263e23049d99417bb75f4d9f6fe1bbc022b2f2043735548c97f0060e877079087e524738bda3f9669d0ec171fb3aa9958a2904d848ace87d1cd91 SHA512 045bcc73855706ff03e8ca65297a0d6e5b5ac02f99dae0f17cef1310b403efcb78d9a7295eca6d2de703b0a7b2f71b58a37f5a42040f01fc77a321a8d2205888
-EBUILD memtester-4.3.0.ebuild 716 BLAKE2B 33911a95eefdf9b76df8bf3828528ff37836cbfdbd6b5a22c4ee2795110b6f33fc3f1365d3d5ef948e7148d01c5779831c4271adea9659c7ca0909d366733112 SHA512 976bc16d7b2acb0ad6c31d67c979be77e3ef351a2b8f949b235a3cd916d4047af71a0fda3fffec6cc2573fe4a27385baf5bc3421864d7c71f661a9d60ba9a233
+EBUILD memtester-4.3.0.ebuild 787 BLAKE2B 732b507aea997202701c14d12521511ad0365835ac3925b5aa9e207f25fd7b50ebb93281e1deaf64ee9fd7c2ebf62a6d2a14501ba1a83ca13017cd2929833d70 SHA512 227695b1358e01bd9c3162673f8ad017481b8271f62e231a638e33f34806cb366f3369ce5a1e66c9befd5789e7c40cc231b585a30f348633502106b8220517ec
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch
new file mode 100644
index 000000000000..8bb58e5771c0
--- /dev/null
+++ b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch
@@ -0,0 +1,31 @@
+--- a/tests.c
++++ b/tests.c
+@@ -27,6 +27,9 @@
+ #define PROGRESSOFTEN 2500
+ #define ONE 0x00000001L
+ 
++union mword8_type mword8;
++union mword16_type mword16;
++
+ /* Function definitions. */
+ 
+ int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
+--- a/types.h
++++ b/types.h
+@@ -25,12 +25,12 @@
+     int (*fp)();
+ };
+ 
+-union {
++union mword8_type {
+     unsigned char bytes[UL_LEN/8];
+     ul val;
+-} mword8;
++};
+ 
+-union {
++union mword16_type {
+     unsigned short u16s[UL_LEN/16];
+     ul val;
+-} mword16;
++};
diff --git a/sys-apps/memtester/memtester-4.3.0.ebuild b/sys-apps/memtester/memtester-4.3.0.ebuild
index 56a07613ef14..cccff64b5d43 100644
--- a/sys-apps/memtester/memtester-4.3.0.ebuild
+++ b/sys-apps/memtester/memtester-4.3.0.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="userspace utility for testing the memory subsystem for faults"
 HOMEPAGE="http://pyropus.ca/software/memtester/"
-SRC_URI="http://pyropus.ca/software/memtester/${P}.tar.gz
+SRC_URI="
+	http://pyropus.ca/software/memtester/${P}.tar.gz
 	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-src_prepare() {
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
+PATCHES=( "${FILESDIR}"/${PN}-4.3.0-fix-gcc10-fno-common.patch )
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
 }
 
 src_install() {
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 7bd304aa4cad..4af851977c6e 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1822 BLAKE2B 9bde532e7957fd3110578b3d2997526b1a93166ec0bcbc03a531e0f11cd7177cceaac1201af5653c4a7e086bc8e4f00433802387cfb8c4c43c8c7157c69bb29c SHA512 281ab0bb5ea6ec6e973ecf10d50a2d29dfd0673f2a91efe13f08707be683a2fb46a3098c1798e3c7c5281575ae54c8e02c48921144a0a35f494bbcab98fed411
+EBUILD miscfiles-1.5-r3.ebuild 1818 BLAKE2B 185700d526f100ee2469c3c15e288c8959f22820f4799d2ee784d6eb3425cf642f5d106e145f57ae168c9f950db20ea504dbf3be84777e264b4dddbf86cbfae8 SHA512 f2a7fa67a48c8442c6dbc21af1920f07fa9b33bc0833739896e51792265c171a61d25859966f6aac7ccc43cde8bd316e843f9a744f4b6cb942b73cee2b39b202
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 8a94a6506a5c..4a787aecfb0d 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --datadir="${EPREFIX%/}"/usr/share/misc
+	econf --datadir="${EPREFIX}"/usr/share/misc
 }
 
 src_install() {
@@ -57,7 +57,7 @@ src_install() {
 pkg_postinst() {
 	if [[ ${ROOT} == "/" ]] && type -P create-cracklib-dict >/dev/null ; then
 		ebegin "Regenerating cracklib dictionary"
-		create-cracklib-dict "${EPREFIX%/}"/usr/share/dict/* > /dev/null
+		create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null
 		eend $?
 	fi
 
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index cfe9af0dc50e..bfd85748d1e2 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -2,6 +2,6 @@ AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f8246
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
 DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
 DIST opal-utils-6.5.tar.gz 2080841 BLAKE2B cd8bda3b7f3bcbc620f922a6baa69f452a95c60a96eb9adf67d781dc5d1a75fc43cba7aa3ed82105de7a04041cfb61f43e909794702564819cda6f11afd23815 SHA512 f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571
-EBUILD opal-utils-6.5.2.ebuild 2175 BLAKE2B d2579a82d24007ef3badb10577141ec418867583c672f4e0662fef55e889ee54ab7d1c2d0488ca6a9131162634044212d8bce3a23c0c6f36f10ca33073905ef1 SHA512 1e4915168e022f25cf18350317e3c861a034abbd15a06d8fd36eb6f197a6721d8edec927213abd2ccf13d0c6a30a30b998516248553ebcf14a51f15e33060a06
-EBUILD opal-utils-6.5.ebuild 2175 BLAKE2B d2579a82d24007ef3badb10577141ec418867583c672f4e0662fef55e889ee54ab7d1c2d0488ca6a9131162634044212d8bce3a23c0c6f36f10ca33073905ef1 SHA512 1e4915168e022f25cf18350317e3c861a034abbd15a06d8fd36eb6f197a6721d8edec927213abd2ccf13d0c6a30a30b998516248553ebcf14a51f15e33060a06
+EBUILD opal-utils-6.5.2.ebuild 2165 BLAKE2B 2a82591928c387009bd4b8e0b2ed4ea4a40346339a34fcbc14c86ac6d7fd9382a7979a6fd8a173d5f0226a3a487a9c49fac8e94aebfa80445795ec4d31f35124 SHA512 7e478f1340df9a537753a8c152a2d337c6fca60b557032609d3d925d9f92b78c8f79869f6a5ed9438c1455d338bb1e37588143ddbf380cf3537d8301603f8c5b
+EBUILD opal-utils-6.5.ebuild 2165 BLAKE2B 2a82591928c387009bd4b8e0b2ed4ea4a40346339a34fcbc14c86ac6d7fd9382a7979a6fd8a173d5f0226a3a487a9c49fac8e94aebfa80445795ec4d31f35124 SHA512 7e478f1340df9a537753a8c152a2d337c6fca60b557032609d3d925d9f92b78c8f79869f6a5ed9438c1455d338bb1e37588143ddbf380cf3537d8301603f8c5b
 MISC metadata.xml 975 BLAKE2B e3185490ec22ed5c776c9df2a627e698e6a3d35085694d397df52c965d3c23dd57f628289ea660a24f2623d5821fba838e504bf15a77d86e3a55b42bfc7ffd8b SHA512 0fe842a12d4c5f34b6042b91b5c63fc7354e17f8228841809305006f84613dd6d894d2780725f1046beb7fbec04a17e1e08d54db37ab027f275f3543c5bb5b56
diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
index a5c514c95a77..12cc0995a254 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 
diff --git a/sys-apps/opal-utils/opal-utils-6.5.ebuild b/sys-apps/opal-utils/opal-utils-6.5.ebuild
index a5c514c95a77..12cc0995a254 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 9b01d839d07c..6970e0358d49 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -3,10 +3,10 @@ AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
 DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
-DIST pciutils-3.6.3.tar.gz 488501 BLAKE2B 77a1ad1e034dac0bfa67ae3a40c34fc394510bb61af1f929e8feb3eb12e9d44b48cfeee0ba786580531222c75c33613b423aa79e535316d2543ac1ba4224312c SHA512 0f6b272cf83e0ff857e4d38c72935709826af054620cd8d70cf8765d5f547f32bdccf5c76a47c8b24d8081b48c16882132a3b503f6a329e73a66089877d5e47b
-DIST pciutils-3.6.4.tar.gz 491066 BLAKE2B bb63ac307f5a66ffb6505bbd7d030fdafcfea13e0b8f3b718c98ce693febbcb90ac7c511bf27d20688f83fd56994b2b246f94323386fd1cc16c79b1b8cab9ca3 SHA512 de36aef89a5269888b065df926fc91f24641e488492ad713f886efa4fb544a4e7f7609028d233fecf1755e15e08d4a41f2837f356f26c73d297a67b0b026e29f
-EBUILD pciutils-3.5.6-r1.ebuild 2871 BLAKE2B 70e11faf9e5ef8777b6771aa0381282ddeff30cdf447d5071747065af265b5a72894b6eabe23a1eb2d5a93085b4fb463502ea28b53c5c5daba9fab35123d8b63 SHA512 0a25dd1d3e84f0fe8a63231192017fbc454bb6a42fd5501635d5819397e1dbcb2294aac4297162c8ae77546022a1af0388e043a1a44c68661fa3943d96bf76b6
-EBUILD pciutils-3.6.2-r1.ebuild 2883 BLAKE2B 86e53599bee45f4012603ebac07b80a56ce86901bb8289936533813a738e35b6d862e04648f5faebc081bbbdd462385be10cc48facccc6680e27601c5ec7e037 SHA512 0897687dc6811f90926b145c5f848157b7b6ebc36374837d97b6f6103125034903ccc318a8c9add2f0c1cb60bfb8de6a90faec071a81b820e21c87cb1c69b6a0
-EBUILD pciutils-3.6.3.ebuild 2896 BLAKE2B d611f19f984120779025c19a04b1c7bd136ef4c874657f13e5932feb3ead61d229633fd1b978ecd66c0e43ebe0618e4c5bd1e3ee7b52f59e05b7a88d22fa5066 SHA512 a50768b9b1f3ce1a044c9f7e13a1434c06f73262958ba4f1e4faba70caa6c7195f31ec889623c966b940c243fc1b44e42adea22c98e5120556368dd93e6966eb
-EBUILD pciutils-3.6.4.ebuild 2896 BLAKE2B d611f19f984120779025c19a04b1c7bd136ef4c874657f13e5932feb3ead61d229633fd1b978ecd66c0e43ebe0618e4c5bd1e3ee7b52f59e05b7a88d22fa5066 SHA512 a50768b9b1f3ce1a044c9f7e13a1434c06f73262958ba4f1e4faba70caa6c7195f31ec889623c966b940c243fc1b44e42adea22c98e5120556368dd93e6966eb
+DIST pciutils-3.6.3.tar.gz 495316 BLAKE2B 01dab2337dcde5dc436df6892ce7c54c9c875b7c619c8f8675027e82e1073ab9b4c603f61f9b03c27af90fecb60fd35199fdf0b62dc90b5d2d387bfde00408b3 SHA512 deaf265bae9149289c860eb47cf6b85ff300744a1e79bcd232819f56e6dcdddcda4e7d3639869c228a492237985298866eb2633938b00d880545594e3c02df05
+DIST pciutils-3.6.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
+EBUILD pciutils-3.5.6-r1.ebuild 2864 BLAKE2B 494993bc4f075947e7e14debe4976e4314d0110132a20435d699ae3ec762f0c026ec57a299ff11ad596457168d8addc770f6d1da73ef924da7bef71f66129b05 SHA512 d37cfd99e4eca9aa76197ab99a99d53f14ba31d771e928984ce34d6a84cc006bc3625359f40a2734e39358e09ed526258e6913aa7d656ea052a19111fa8c7a9f
+EBUILD pciutils-3.6.2-r1.ebuild 2876 BLAKE2B e7852e9b01891c796595b6c281d1d54fed85c43f6fee281aa02a8cd6cc1ac9e1dfd86679a19ae4c749802b7813a0e6cadb9e8f411d9c1f00b3f3f661fd5b2944 SHA512 98256f4499e6a4fda867a0836b14b1ae5cbe1e0dfb9cafb712b86c7551156c8739c8e839055abf54a36460579927fa21d83be7f71c2c74270d246486971f30f3
+EBUILD pciutils-3.6.3.ebuild 2866 BLAKE2B c56d210349ca755e9a44f6a8aa253f86a921dcbc62fbb8c9b4131c9d732af2693e66c1fcd302f2524f3c74b3de0e87a233c77a7ac0d552cc9766d490cc8874d2 SHA512 ebc390275ee01db9e99ea58d929ac08e0b297e20423cacf6a1e9252a8d55f76cd360a01a74e7f3e6a302a8982954be2542e2506ac5b285d2d981a87f966b9f25
+EBUILD pciutils-3.6.4.ebuild 2866 BLAKE2B c56d210349ca755e9a44f6a8aa253f86a921dcbc62fbb8c9b4131c9d732af2693e66c1fcd302f2524f3c74b3de0e87a233c77a7ac0d552cc9766d490cc8874d2 SHA512 ebc390275ee01db9e99ea58d929ac08e0b297e20423cacf6a1e9252a8d55f76cd360a01a74e7f3e6a302a8982954be2542e2506ac5b285d2d981a87f966b9f25
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 419256b04b84..010634ababab 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
index 587b417565ab..6b4cfffa226d 100644
--- a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=6
 inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/pciutils-3.6.3.ebuild b/sys-apps/pciutils/pciutils-3.6.3.ebuild
index f3a83e518b7e..d7349d7b8671 100644
--- a/sys-apps/pciutils/pciutils-3.6.3.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/snapshot/${P}.tar.gz"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
index f3a83e518b7e..d7349d7b8671 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/snapshot/${P}.tar.gz"
+HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3ecbc80abe18..02a004c91ea1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,11 +7,13 @@ DIST portage-2.3.85-bug-706186.patch 2603 BLAKE2B 6a7d236594a01514dab4fcffaec165
 DIST portage-2.3.85.tar.bz2 1046025 BLAKE2B 721999b1200b69d2fd3fdd8f4690859f44e6796bdbef1636a80f09ff7625cdff437d183b4e3bdb7d4455b4da9f067adf199106c6b7bdf9b0d5d5ae7a30c7ce03 SHA512 f42f6d87df0bde5e143b7c8b901556c325b9f8250131db400543b54040eb931f9b541ad8211b35942c4bbd99fcfdea6ead93459e57b03173f5bcb37e64a85304
 DIST portage-2.3.86.tar.bz2 1046806 BLAKE2B 6aadfcf17eacc8f7b82645a82fce96b7d90e93d797704c5b04fe437cbe587440dea8f8e39847c2c95eacf383e4525d4f015ee26b41694c156f907bd22d6663fb SHA512 fad0e89fd2c831ebd8cfd1fe080433c4696f408008f463a151e6fd4f3a2ab2a81249dd0db76f28c7d2cdf0e14e5163c3898c7ca22e7f0edb2e882e1ab7bda95e
 DIST portage-2.3.87.tar.bz2 1046448 BLAKE2B bbcb31a362d89bc81cdedb03be431792dab53d983d35f10853e6a68c2e2fb3da8ddd237305e78ab5946c8199f4dd7a3a41f023912a50abe9fa96bcf7ac35af75 SHA512 47a4d4901c2ecc9df8e38fa804efeb8583928a77e45a9b19dd8edd7e1323911762c357ad0bc1a182d8389225282660f4ef6e442e8addc087e404d561466c3b86
+DIST portage-2.3.88.tar.bz2 1048081 BLAKE2B d84b13686d09d125863835467989a11787333dea18a7eabb48560e6847c54643155a98c74d061e08b991064bfa9236e0a617a06beabb575162c4968e4cc13fe8 SHA512 ec043bbd7667f810e1a7c7fd3cae19b81adac1c323d7c488d1e4e809d9cec7c7f13bc2e5b8769a03b9f8aa78e389f5680e15b6a8f0f3543cf43d0f43fb7ee5f7
 EBUILD portage-2.3.69.ebuild 8117 BLAKE2B e0fdf8ebaa0fc3212c22727d000183d19c9ebca6c6e00d90a1100b0995f3728d5c4ca44287265109e579671acb27a787cae93f688c70849c4e4cb0b51d55edc7 SHA512 ba7b31dc7e39c0c250dcf259988af8c6b5f175fcfdc975a88bd6263863123900e83aa5363e447fddfa3973d8ebeaf7f5e256cff265b5690d6d4f7ce5f8dffa33
 EBUILD portage-2.3.79.ebuild 8706 BLAKE2B 162fc0fc36eb2f1d47208ff7a151e546f685edc674bb9292c83682e425da2fc30ff9cd1f7ff0acacb8487cfbcec69da6d91099224786f253407086d7e2e4339a SHA512 c24857fafe48639ecfcaff5fff978cfd3cf098add398fe32a74f3bf5cfad9e3f73fa6c86a1e819c8191c89761a7adf257746ce14a1216af5a704cc35ed955613
 EBUILD portage-2.3.84-r1.ebuild 8908 BLAKE2B d835618f242d762c5dc7bf620c29c7160e0b73158f78cbb3c01e8a2cfad67500696ef7743c096956e17317d295df46ce2fe2a445d95bcbb90687bb57b6b49fe7 SHA512 0b2b17622f362afea4db847122c25321ab49fd6ffdc367f1a25d63566866981fbe2eb196f4463166ef31cdcae2675db8a50ac6347e40924d5eb8ab1c2d452486
 EBUILD portage-2.3.85-r1.ebuild 9068 BLAKE2B 2bc3f22e598af5876d491d8dfe6d5c09e0b23799cc8d48a314687ee7348dca30f9a2b108e6a7c8bc0e989ba59fd96693d577625cf7b9accfb2e5efbcc45e2924 SHA512 09a1176c275a83a25677e18150142b9df46ca83d8b99f7755181f36980f259f3504dcf45833386e989835d763362b5dd027dff84b85ae897905ef8c6783df72e
 EBUILD portage-2.3.86.ebuild 8738 BLAKE2B 661f810944f512016d98a7b7ce9005f6bdab444fc2fc10e3fd3f0d958372d38e2c5cb5cbe744674f25e6eaabd7657956e00dbf8bd1316d8b72d24cf60f7ca0f3 SHA512 eb581642860da1e01cd4e607bf24383b4d14a3a1d42ead6ced5d983c466a98b1742a777e763772849120d30227de550001104d97d65c905502883bde1c4ab137
 EBUILD portage-2.3.87.ebuild 8362 BLAKE2B bdc941b86140e015725fe23435ab438507cf464f495e867b605c9bd8fae2588c673f533803937ac73d5c148aec89361743a83e9576c3b7bff1efe40161fb439d SHA512 963d81d6c24c36b76fc2bcffaac51d4c6f714c8475d70d7ca974da9a6f1e454d28ae214518607bc52a63bda0d2dc795006e63e21fe44822b992b76b31bbafe6f
+EBUILD portage-2.3.88.ebuild 8651 BLAKE2B 40d49821e5d53d7bb797f9f53d6fabbe6e38e9fc3f72a282f0e66e78baa58ab8dcb48862f9d5f8cfde6ba3a520f6a2bad7814cdcc16e8d15712879653225acf7 SHA512 3b099cf3790b90b15a855bd17435109d6310cc0edac116c9531088178c172f128cbf0f28648bd134057ced367f91e3c5c4be701b64839565912a27605b464c00
 EBUILD portage-9999.ebuild 7794 BLAKE2B 3b6487927a5a689ec37052d38fd2940d099d81b64bcffd48ac3083adfd282504d5399cc12ae8b266d49147f793c411eddc99a9d081522dde054fb6e31b3a9a0f SHA512 b5b9ce2235d2145cbe467167ca2391b996327ed52a84d139da292518ce76ecbda2df0eaa88eddd7197dece2520a49ec369a5ec123bcade99d562b6196b6cbff0
 MISC metadata.xml 1508 BLAKE2B 23da1db6792f98d7c5c6ff0f260c69f76110438c6fd97ffb24552100f6a2e5c8264d0bd787f45367900b9ffa5ce5346badbf53a9f6be7867e725451c33b4f41a SHA512 f6712987c3062b960f76b6752c80ffa6069cec2d8ff743641164e275677ac8126fe2af6ab1588e91712ba6bbb11f73c6de42d6296d67af55ccac3ca48554162c
diff --git a/sys-apps/portage/portage-2.3.88.ebuild b/sys-apps/portage/portage-2.3.88.ebuild
new file mode 100644
index 000000000000..0188237e0e12
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.88.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=(
+	pypy3
+	python3_6 python3_7 python3_8
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		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 ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index b75a0a2276b4..eb3f2ade643d 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -1,5 +1,5 @@
 AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
 DIST razercfg-0.39.tar.bz2 178142 BLAKE2B cf2d92d24a0dbfdae4045c2dab30a64bc4de64d730c075a4d852790ff62bcbadd714953fac925e69b671355cbdfdec7ce9db5693fbfa8e2aab69de6247c95c1a SHA512 165fee898a01b7f0086eb6705ef9f24fd8b8836025c071f7851a493181b8d193d0db70fc1731a8586de1f1c795aab4d20bb4ee8526b612c66ba3c434c6e10137
-EBUILD razercfg-0.39-r1.ebuild 2101 BLAKE2B b6eed30f4fe1c2d5755b56c5a40159d1c24b50a3d900e26ada7b4d5e5043f1cf127bb5fac7cdbf63dcbf6d1548957038db0285588df5a8b7aba2b7225a3e7a84 SHA512 20751b506d74ebeeff6254c22a7855c3ed6eae40c6a0fcf0b6d01c2c6112bd4a54d87369867c0ed6c4b5138679ed4ca76bdad04a7b48842a0724ee73dc2185ed
+EBUILD razercfg-0.39-r2.ebuild 2137 BLAKE2B deb76d7fe520261d6eeec1d702720300f4b273b1be7aa19ebfcd4a80594b643ecf8c833e5a775fe82d0e9aeb44f11239d4f9943335a183ec770da3e92fda59e3 SHA512 e2bfdfb681cacb1a6db032803125c9e24329958de2e1a50dfa769a158a5329fb12875a6d55c28c1040376ba05645079fd130932bb80b504280a1d233c2e9a3e1
 MISC metadata.xml 805 BLAKE2B 6be95bde1f31d215ead8de0546bcae9860c5ea24109803d44dcb889e7b39aa21972813893da53ea0817a77f9158d18be4fccd166cb2fe8d82627411f25b1d975 SHA512 bf8d583f50967b6a2a77e3db46595286a717eef57e61bb3f8aa230c0b0fbc5fce265fc95bdb57c25b44564b22e8ac2940986a04f9c0f8a6d378e027612ab478d
diff --git a/sys-apps/razercfg/razercfg-0.39-r1.ebuild b/sys-apps/razercfg/razercfg-0.39-r1.ebuild
deleted file mode 100644
index a5023d502598..000000000000
--- a/sys-apps/razercfg/razercfg-0.39-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cmake-utils python-single-r1 systemd udev
-
-DESCRIPTION="Utility for advanced configuration of Razer mice"
-HOMEPAGE="https://bues.ch/cms/hacking/razercfg.html"
-SRC_URI="https://bues.ch/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+pm-utils +udev"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	virtual/libusb:1
-	pm-utils? ( sys-power/pm-utils )
-	udev? ( virtual/udev )
-"
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	virtual/libusb:1
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-unit-variables.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i CMakeLists.txt \
-		-e '/udevadm control/{N;d}' \
-		-e '/systemctl/{N;d}' \
-		-e "s:/etc/pm/sleep.d:/usr/$(get_libdir)/pm-utils/sleep.d/:" \
-		-e 's:50-razer:80razer:' \
-		|| die
-
-	sed -i librazer/CMakeLists.txt \
-		-e '/ldconfig/{N;d}' \
-		-e "s:DESTINATION lib:DESTINATION $(get_libdir):" \
-		|| die
-
-	sed -i razercfg.desktop.template \
-		-e '/^Categories=/s/=.*$/=Qt;Settings/' \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON="${PYTHON}"
-		-DSYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)"
-		-DUDEV_DIR="$(get_udevdir)"
-	)
-	RAZERCFG_PKG_BUILD=1 cmake-utils_src_configure
-}
-
-src_install() {
-	RAZERCFG_PKG_BUILD=1 cmake-utils_src_install
-
-	newinitd "${FILESDIR}"/razerd.init.d-r2 razerd
-	dodoc README.* HACKING.* razer.conf
-
-	rm "${D%/}"/usr/bin/qrazercfg{,-applet} || die
-	rm "${D%/}"/usr/share/icons/hicolor/scalable/apps/razercfg* || die
-	rm "${D%/}"/usr/share/applications/razercfg.desktop || die
-
-	if ! use pm-utils; then
-		rm "${D%/}/usr/$(get_libdir)/pm-utils/sleep.d/80razer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use udev ; then
-		udevadm control --reload-rules
-		udevadm trigger --subsystem-match=usb
-	fi
-
-	if [[ -e "${ROOT%/}"/usr/bin/pyrazer.pyc ]]; then
-		eerror "A stale ${ROOT}usr/bin/pyrazer.pyc exists and will prevent"
-		eerror "the Python frontends from working until removed manually."
-	fi
-}
diff --git a/sys-apps/razercfg/razercfg-0.39-r2.ebuild b/sys-apps/razercfg/razercfg-0.39-r2.ebuild
new file mode 100644
index 000000000000..2d13385579e2
--- /dev/null
+++ b/sys-apps/razercfg/razercfg-0.39-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit cmake-utils python-single-r1 systemd udev
+
+DESCRIPTION="Utility for advanced configuration of Razer mice"
+HOMEPAGE="https://bues.ch/cms/hacking/razercfg.html"
+SRC_URI="https://bues.ch/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pm-utils +udev"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	virtual/libusb:1
+	pm-utils? ( sys-power/pm-utils )
+	udev? ( virtual/udev )
+"
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/libusb:1
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-unit-variables.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i CMakeLists.txt \
+		-e '/udevadm control/{N;d}' \
+		-e '/systemctl/{N;d}' \
+		-e "s:/etc/pm/sleep.d:/usr/$(get_libdir)/pm-utils/sleep.d/:" \
+		-e 's:50-razer:80razer:' \
+		|| die
+
+	sed -i librazer/CMakeLists.txt \
+		-e '/ldconfig/{N;d}' \
+		-e "s:DESTINATION lib:DESTINATION $(get_libdir):" \
+		|| die
+
+	sed -i razercfg.desktop.template \
+		-e '/^Categories=/s/=.*$/=Qt;Settings/' \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON="${PYTHON}"
+		-DSYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)"
+		-DUDEV_DIR="$(get_udevdir)"
+	)
+	RAZERCFG_PKG_BUILD=1 cmake-utils_src_configure
+}
+
+src_install() {
+	RAZERCFG_PKG_BUILD=1 cmake-utils_src_install
+
+	newinitd "${FILESDIR}"/razerd.init.d-r2 razerd
+	dodoc README.* HACKING.* razer.conf
+
+	rm "${D%/}"/usr/bin/qrazercfg{,-applet} || die
+	rm "${D%/}"/usr/share/icons/hicolor/scalable/apps/razercfg* || die
+	rm "${D%/}"/usr/share/applications/razercfg.desktop || die
+
+	if ! use pm-utils; then
+		rm "${D%/}/usr/$(get_libdir)/pm-utils/sleep.d/80razer" || die
+	fi
+}
+
+pkg_postinst() {
+	if use udev ; then
+		udevadm control --reload-rules
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	if [[ -e "${ROOT%/}"/usr/bin/pyrazer.pyc ]]; then
+		eerror "A stale ${ROOT}usr/bin/pyrazer.pyc exists and will prevent"
+		eerror "the Python frontends from working until removed manually."
+	fi
+}
diff --git a/sys-apps/renameutils/Manifest b/sys-apps/renameutils/Manifest
index 8933b2696488..7c2066c7a13c 100644
--- a/sys-apps/renameutils/Manifest
+++ b/sys-apps/renameutils/Manifest
@@ -1,5 +1,5 @@
 AUX renameutils-0.12.0-autopoint.patch 250 BLAKE2B f8fb26fc51762e36db1d0450a8c8a61b45059cbc0ae547980609890e56dea12a46fe7993e91f5af48ce813d98f84f6962e24f8489141f9fbcffe1f508d6ef7f5 SHA512 a9cff62242da7d71f05e57bcbd7b10b563c4a0e6262c0ded6c6890ce0f78796bb1b865f66a91dd01db29d5b7d645175e8509d76b30e9c4f60103a6ca9fd9c8b0
 AUX renameutils-0.12.0-typo.patch 659 BLAKE2B a32f67a159e5c213d09d6a70a5b46ba527b618f897d4845efd2b5e12b0c973534de4adcd1f47a2d25a11c081e0873ba9e9bf8ed7bbd54ad44934cc00b1559761 SHA512 0c8a84ec8cbc40c5f51e0a0066ae451ce2f44a2a7d13f73429c60a90dbf02ba0982f00280b16e38125763eeabc850d03f9c8c6f35bd924bd4fac54be85d7ea7d
 DIST renameutils-0.12.0.tar.gz 954114 BLAKE2B 7c65138d9a6de355a72f8e07a6d9b8c1921a8925f7662a26521dcbb37862161ea866e24246cf2a2b3e4c2910231242883bfcea2acef9dda48556faa1d385baae SHA512 8aae157e6ead86a2fbf970ecdb27d6067c2d35c04058ead9a3c0af3d99d466d37d8c4f1da0562ef2bea9cf9bd5f8de4d14340906427df421dba1a5c234c63bd6
-EBUILD renameutils-0.12.0.ebuild 598 BLAKE2B 455ae325bbbddd0365ad6fc928c7dadac33bdcc34403ab3ff75e0ce329cd3f76ce2e1c97b4e2e816f582f6f1ad333a71679f249d34d4c93950540ed91c620453 SHA512 a1c9fd745cece602cebcc908485716786a1f75f918730e956cf769c536b10ee24d5c03bca15d503ded0c3feca06aad76fd4bab7d0b730a88b8d96bcab2b553d9
+EBUILD renameutils-0.12.0.ebuild 588 BLAKE2B 92b0e16d16d0761f656368b38fd87849d8a0d11ebff8847ad9a3b2a0711e0327403261c11ba41edd56e3c9a635adebefe2949133a729b433868c10a500e72f14 SHA512 54589c8db5da6a8b88c0d39182c079d88d7d304810ce74bd3f2a3bb231068da33ac6bdfd1bba801450e21747b57a2f81c4b3e3179e935062da5c6c15ff5f312a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/renameutils/renameutils-0.12.0.ebuild b/sys-apps/renameutils/renameutils-0.12.0.ebuild
index 95b7981085a1..7d0f5dfb332c 100644
--- a/sys-apps/renameutils/renameutils-0.12.0.ebuild
+++ b/sys-apps/renameutils/renameutils-0.12.0.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Use your favorite text editor to rename files"
 HOMEPAGE="http://www.nongnu.org/renameutils/"
 SRC_URI="https://savannah.nongnu.org/download/renameutils/${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
-DEPEND=">=sys-libs/readline-5.0-r2"
+DEPEND="sys-libs/readline:="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-typo.patch
+	"${FILESDIR}"/${P}-autopoint.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-typo.patch" \
-		"${FILESDIR}/${P}-autopoint.patch"
+	default
 	eautoreconf
 }
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 11791acfedf3..c8160e718855 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -12,5 +12,5 @@ DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c
 EBUILD shadow-4.6.ebuild 5364 BLAKE2B 8223d8571e15a886bd0fbf6873aad932b2aac80005764bbeaa3405a1dde2d72ebbc55489958c08835c23abfc2fa3fe6e3658caab4ba6bebf368c9d1ad56440fb SHA512 e1181cc34f6a19a0015350467c2595e7a0cac9ad29af0b09b9a1b01a7cd9554aaf375dccd1f2ce424d5c94dd4c5cf382fa7d9a0d18dcafa8835342d57ce5da9e
 EBUILD shadow-4.7-r2.ebuild 5797 BLAKE2B 50ae8f70ef78adeadb61095580bb02f9ffa10eac29a4793918d4248e2e891790364f761808d1f1ac26b1fca5dbadaf6db3f16272f349be6f7f3885a12a568c78 SHA512 0533a37fe59edeee1ea32f3fe86b3f277c7cd40964fdf2f3e17a9e8b5775748d9ffb039beb309e2586e35acea78c8d200b2359246c4bf5c1a1573d2b5ae1b9d0
 EBUILD shadow-4.8-r3.ebuild 5765 BLAKE2B e1795aac463f30754906ea5cb872585bea5ac7ecf6265a7bb536ac1aa06a5ccb8f590e899a44f7a37c088c6c9241cabe1e470910bc63c3e1ee5d4bb6f12eec6c SHA512 59be0960eb5981a63d004475380b5c723d76ac6568589f5482f7e5b7d562c9fcf321e2bbf475b7d08209cde9bfc0509069ed4aa30844ea000f2e16f309616081
-EBUILD shadow-4.8.1.ebuild 5722 BLAKE2B 3aa92cf42b73783d8ba6e765c72f3752b2381613fe8284131e83726b43c9ca37882980e1777b245a36d286ce6cfcba65a420b7a1db884ae35e49f746da13bb18 SHA512 e5c87494406a8edf48af0e70737e74ae16db11d004c70f58a3702554ca30eaef7d840a98b871780ce167a653b51cc9c6d69221c2683001aa3cfce7ad6bc53178
+EBUILD shadow-4.8.1-r1.ebuild 5742 BLAKE2B 3290d5e105fa4ae53f992ced7d24b8cd5110c0b66afc2aade8155148b10b9408badb5b71b7287b783733d204b1d4594a9e3bc6e6014f07f4600373740f18c498 SHA512 329abe6baaf7a6dbb56059c5d60f5e68aa2ad280e46aba08c75086a74c744a6582fd49bc84b065c4f0da9ef188320ccae5a18e561b75d703d3f38c78094a04d0
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/shadow-4.8.1-r1.ebuild b/sys-apps/shadow/shadow-4.8.1-r1.ebuild
new file mode 100644
index 000000000000..58cfc9e73031
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.8.1-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+DEPEND="
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	xattr? ( sys-apps/attr:0= )
+"
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+RDEPEND="
+	${DEPEND}
+	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	#elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-account-tools-setuid
+		--enable-shared=no
+		--enable-static=yes
+		--with-btrfs
+		--without-group-name-max-length
+		--without-tcb
+		$(use_enable nls)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+		$(use_with xattr attr)
+	)
+	econf "${myeconfargs[@]}"
+
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=$1 val=$2
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh shfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man \
+		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/shadow/shadow-4.8.1.ebuild b/sys-apps/shadow/shadow-4.8.1.ebuild
deleted file mode 100644
index b0c1618383b4..000000000000
--- a/sys-apps/shadow/shadow-4.8.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools libtool pam
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-DEPEND="
-	acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	xattr? ( sys-apps/attr:0= )
-"
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-RDEPEND="
-	${DEPEND}
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	#elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--enable-shared=no
-		--enable-static=yes
-		--with-btrfs
-		--without-group-name-max-length
-		--without-tcb
-		$(use_enable nls)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with bcrypt)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=$1 val=$2
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# Remove libshadow and libmisc; see bug 37725 and the following
-	# comment from shadow's README.linux:
-	#   Currently, libshadow.a is for internal use only, so if you see
-	#   -lshadow in a Makefile of some other package, it is safe to
-	#   remove it.
-	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh shfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man \
-		'(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \
-		-delete
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT}" 2>/dev/null ; then
-			grpconv -R "${EROOT}"
-		else
-			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 3ac58368847f..9711022a93f2 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -3,7 +3,7 @@ AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6c
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295
-EBUILD smartmontools-7.0-r1.ebuild 4103 BLAKE2B 01ffcc89032428c2590fd847c6899b934286d48cfa73b3c4b87678d181855696c35cd6fce459ebbaa770e621e83165617d9a0c660d6ca76dae5c036f144c557e SHA512 95c6d36eb6d9e1594e5f857954b694d328a12d3aad14a76afb89177d770b16e7452d956035bbe20d97bedf0c7ddc445bfefd21979472e790fadd03babcbc7a55
-EBUILD smartmontools-7.1.ebuild 4111 BLAKE2B 3e033897b4a3598a2373ce83394f2ca00f958b814123b71438b40e74c21b6ec723116634245756d6a50218f0a73bc024efeb997ccfa902066f84d627243e2fdc SHA512 6dcf23ebda2b12d06ec58131218b9743e082767dab3cf87ece2a300eea2f7d749e8dab325ff4703861b187b5eab811157dd0bdc3d0015d188fb92b266c919b2a
-EBUILD smartmontools-9999.ebuild 4111 BLAKE2B 3e033897b4a3598a2373ce83394f2ca00f958b814123b71438b40e74c21b6ec723116634245756d6a50218f0a73bc024efeb997ccfa902066f84d627243e2fdc SHA512 6dcf23ebda2b12d06ec58131218b9743e082767dab3cf87ece2a300eea2f7d749e8dab325ff4703861b187b5eab811157dd0bdc3d0015d188fb92b266c919b2a
+EBUILD smartmontools-7.0-r1.ebuild 4099 BLAKE2B df7f1f397ba3b8869dc17ae5f4125b7c3e33b8840b52bcd7c554269fa0654a569af0d86db45ff564bf9568ec7979ae218e4ebe0ae4713d2f741205230373a054 SHA512 48411f6a4e66fb624f2dde9c6bbbf152903ccf3266a184b460b46ad68fbcd35b3bf496b3aeda1a96056c3ca40d17c10fe7658de264bae8fcd2d186bbddbc3d02
+EBUILD smartmontools-7.1.ebuild 4107 BLAKE2B f2c64ce957a8cbca5eb593f29bcab037544c1a8aecabb12b45f7105a719a90c6219150d0b40cd3f2d74f186571421d0e276a18bdc448034886ca3a661fcfc9ae SHA512 b5fa1894ffedaec49c69f0f510813af67ce2f455ba0dd2e6eac2fcb590d82fbecb93c76a9c85792f51661f2cc5fa35681679ef959a3f6e6ed66abce396190b58
+EBUILD smartmontools-9999.ebuild 4107 BLAKE2B f2c64ce957a8cbca5eb593f29bcab037544c1a8aecabb12b45f7105a719a90c6219150d0b40cd3f2d74f186571421d0e276a18bdc448034886ca3a661fcfc9ae SHA512 b5fa1894ffedaec49c69f0f510813af67ce2f455ba0dd2e6eac2fcb590d82fbecb93c76a9c85792f51661f2cc5fa35681679ef959a3f6e6ed66abce396190b58
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
index b63f007b6df0..a07862703917 100644
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -117,8 +117,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX%/}/var/db/${PN}"
+		local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h"
+		local db_path="${EPREFIX}/var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1.ebuild
index 9f111458dc66..4cdbb0a02120 100644
--- a/sys-apps/smartmontools/smartmontools-7.1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.1.ebuild
@@ -117,8 +117,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX%/}/var/db/${PN}"
+		local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h"
+		local db_path="${EPREFIX}/var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 9f111458dc66..4cdbb0a02120 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -117,8 +117,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX%/}/var/db/${PN}"
+		local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h"
+		local db_path="${EPREFIX}/var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 78758830c598..8345d1728498 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,12 +1,18 @@
 AUX 243-seccomp.patch 6293 BLAKE2B be1a78783e34d6cf8ba33f6ae6fb0e8747d414de692cf28bd9cce01ca47baf188b078171dd66c236ecf2a4a821f1dec0b7021e1298a29a3b21aacf3a9d667189 SHA512 da2cd2e11a06e0520af0ad3c6debe54c5ab046f7ee35a922c99a32924464a6b760b4620d8e511064f84d8adbf5e65db473877476a1cc36941a0420491b89cb25
 AUX 244-efi-gcc-10.patch 3032 BLAKE2B f9fd018c567384171b154809bb95b35c18fc9c3ad7d5c114f5854bb90db2bdafca9d96c3437a9d20a7ea875a3e5646750f29294025fcb657a40dcd7d4ed95282 SHA512 f9bbc9c3be417ff14775de06d3c4088913eff4c6f62e58278420345cbc7b115b706c169faaae9dc17448f895d9cf9b417ee8c04398ec4c206df89f5f3bcfb4a1
+AUX 245-rc1-network-debug.patch 1915 BLAKE2B b4e2fc470e584520c0423b06d00e663fb82e364594626e89632e9db4dd503b55c419f844c5063ca7f8641919ff47d3057f6962e269686829041ea262e75504ae SHA512 d55dac6e5b11d066eff46b0387b64d1cf59b9c4134171b17933447064f0ea0ca774681134be20e0af40f3de03f971778cf358d38bca78107e7129d3d86e7065e
+AUX 245-rc1-sysctl-segfault.patch 942 BLAKE2B 00fc826da41bfe0bb42e86bb839dc441d0762993ddabc227097865061a706a0598e1bd1ef4451b8ba11f702ba66ab1b9281e2141fcffed054c787206bb78966a SHA512 d92f4ac03d1ddb84a9ff2bb90efc92a7d0394165fa0dd7d3fa0739e1480b847e11ec522a3d6dc907998455df19c1b300c046a404f7c4226e77aa10f51fff37a5
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256 SHA512 08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
-EBUILD systemd-243-r2.ebuild 14522 BLAKE2B 9b59d5ad65b13ac99d127ea4c09b3fad87786860c500cac17c4f1d65e86f543c0869a834ffb42e77794a85ed03c2e25a26109773442190f4ab15d09f7d79702f SHA512 5b1cdd515a574121c4d0b3d049100ffba6bb81481c95ba7c8da2de7b007b9110336d65bdf74dde15c29639b76f6e1c9ecaaae28ebf1058f09bf240141e5b10dc
-EBUILD systemd-244.ebuild 14502 BLAKE2B e1605c98deb12f8c3cacc988db985fa3e8a52bccfcb464dd8ba167cf5b8683ca2d51279d6b298185e804ff3d6de3746e252abfd46bd52b3f58b463dec7869a7c SHA512 a06eefa3b8d9043f0aa55a0a8900e8d770c14d0263086cc6718f0418ea7b877d675f3e420e415e208c98f1cd703213303834401df9153742090f39a8a33220db
-EBUILD systemd-9999.ebuild 14472 BLAKE2B ec0e0f0380559eebbd968dee61dd94138f8589d1c9a278b9ea94fd2962272593aec799dffdba46313106b5fd149c9b1192aa3c6754874e1b6720dee3146a80eb SHA512 c6a9220228551b483327789d36a4bd3194f9054dfd3b85d345140d715415a5d1d83dc1850e7b54705000ba7ae7f4ba9c4c24aaf8e7c631a90a2335b754f98fb0
+DIST systemd-245-rc1.tar.gz 8961356 BLAKE2B ed04166ead57c2f1cc1a1ca2f0041cae134b503d3448ea9fdd799e12d81f45721ee304d4aabd96d3eab8ea1321b283820e8d2a850b41733e40f07fd419f67b95 SHA512 2ef9a295f3897c6642a2fac2e3c73467ece9bc6fc196cc4f3707b9c23af2581eb9f74def78909d57513b67604bf1cf6dc5dbb31c6d435f7997677d09a73d006b
+DIST systemd-stable-244.2.tar.gz 8484718 BLAKE2B 7ba41c443aa3e34379c24eb1590bd1090037a03178dd76cf8324ee50a1d7e82d2da27abdf9ea7c6b9b0b5467d15625dd432739878e8b482636a9f4bae802f2a5 SHA512 fad6c9da7bf7b6f572ea411e70bea7a44e9be0b373cb86cbe5a77a08cd1b5e4f4f3ae6bfa001194e14a9849313a9151e3fdeee62c93f18f15439a657a05783e2
+EBUILD systemd-243-r2.ebuild 14599 BLAKE2B b292513681d3a9f0ff8f47532eee29266f9cae7c498668e871b0fc2a14fe6c36d6b56d2851266ee27fbe634c914a8dd1d97533ac700b83503d98bf72133b3a74 SHA512 833614b3ea2f84fe515d0fb9695818b3f61d5be8139736b7a9dfa7c212e5901fbfb2528c4711aede74572254fc269e24901c5dd644ef6be482d9b653efbe0b9c
+EBUILD systemd-244.2.ebuild 14630 BLAKE2B fb983fee2c66343b740d7f4cd31cc28f00437312f1f33375abc65c3dc3491aab2f6941d09ce398b8151f61369cd372322150aabf094536c4afa64521d3fe070b SHA512 0f100e8266386c466feb02a255e300c27f224cfae62a79afbe3a7179e6bc051b9ac0dc4599aaed50d71a21f468320b03b90c01a3319b199793d0df08cdc91fb6
+EBUILD systemd-244.ebuild 14579 BLAKE2B 4f8355320376c19d670f7a587442f1806a01f2f03d4fc8cafd33c1b83160886710d20df1edf86d00c919691e1d02bd9e57e992b7488e440e84cfde43e84821dd SHA512 634238afd9de2ce6896fd23a44943a359283b338ba08b42496f7163fad0f23de94b19bed502b78ed44d7b3652b69e66281dc08174db42d3071e801561c900a92
+EBUILD systemd-245_rc1-r1.ebuild 14639 BLAKE2B 63ec56aed53d47bde7ea948e20d9af295a5c136bdd9e7abf987c3782103a122440e9eb1ceedc1d58563336450da087e6a4029fc0776ef1ad290d31fd27cb758e SHA512 7f1fda14a18723b5411d5e5b4a44a6952b0fd25f2bbce3892d6378d04b6fc17af5dfb2ff109fffd58dde2305bd894d5a17080c9a5bb8c715ebf3e06e8851c374
+EBUILD systemd-9999.ebuild 14631 BLAKE2B 774d430a7943c43fa83f10d32ebe4124f0f3998f65f059fdd0fdd4cbfacc2f3846e6e78d18b5ede4b0d63496f92b2b2b52fd6239ebaaa158522ad0a1900d74a7 SHA512 0f270c3831370f68f6516ff76db1bc1bb91124203d5555e2f02772d0ffc306c072619a4aa4a7f54bd4dc000ffac19d395b181d40438959199cc4bb7e1a8bfedf
 MISC metadata.xml 2019 BLAKE2B 84de0a0abc3f16fab60db2343d8e1f0dee8a3f03ac97bffd01167820815f4d41d87c118b81041046c8cafa6316fb7e5bfe9d6a5de550bf617ace56ccf69efb0d SHA512 086189b961c0f3be70beb1d86fd36508d0821407243e74cf896360f76ce04be544aac211d60685256080fa75e1ac0ae33211501cc11ee98913f3b8d322ac9f03
diff --git a/sys-apps/systemd/files/245-rc1-network-debug.patch b/sys-apps/systemd/files/245-rc1-network-debug.patch
new file mode 100644
index 000000000000..e65035f21857
--- /dev/null
+++ b/sys-apps/systemd/files/245-rc1-network-debug.patch
@@ -0,0 +1,45 @@
+From 01ec0028d97fa97d2e433659e24a1517b0e2382e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 5 Feb 2020 11:04:50 -0500
+Subject: [PATCH] network: remove unnecessary link->ifname from debug log
+ statements
+
+Since 98b0299479a68ffd414888368907fc776a46b82a, we log the interface
+name automatically via log_link_debug().
+
+Fixes: https://github.com/systemd/systemd/issues/14782
+---
+ src/network/networkd-dhcp-server.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
+index a6dbe2e596c..bee75a6930e 100644
+--- a/src/network/networkd-dhcp-server.c
++++ b/src/network/networkd-dhcp-server.c
+@@ -45,7 +45,7 @@ static int link_push_uplink_dns_to_dhcp_server(Link *link, sd_dhcp_server *s) {
+         size_t n_addresses = 0, n_allocated = 0;
+         unsigned i;
+ 
+-        log_link_debug(link, "Copying DNS server information from %s", link->ifname);
++        log_link_debug(link, "Copying DNS server information from link");
+ 
+         if (!link->network)
+                 return 0;
+@@ -99,7 +99,7 @@ static int link_push_uplink_ntp_to_dhcp_server(Link *link, sd_dhcp_server *s) {
+         if (!link->network)
+                 return 0;
+ 
+-        log_link_debug(link, "Copying NTP server information from %s", link->ifname);
++        log_link_debug(link, "Copying NTP server information from link");
+ 
+         STRV_FOREACH(a, link->network->ntp) {
+                 union in_addr_union ia;
+@@ -148,7 +148,7 @@ static int link_push_uplink_sip_to_dhcp_server(Link *link, sd_dhcp_server *s) {
+         if (!link->network)
+                 return 0;
+ 
+-        log_link_debug(link, "Copying SIP server information from %s", link->ifname);
++        log_link_debug(link, "Copying SIP server information from link");
+ 
+         STRV_FOREACH(a, link->network->sip) {
+                 union in_addr_union ia;
diff --git a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
new file mode 100644
index 000000000000..7618b2deba5e
--- /dev/null
+++ b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
@@ -0,0 +1,23 @@
+From db99904bc8482efe556bb010a8b203a3e60ee37f Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Thu, 6 Feb 2020 19:13:11 +0900
+Subject: [PATCH] sysctl: fix segfault
+
+Fixes #14801.
+---
+ src/sysctl/sysctl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
+index bbcf0c43235..0cdb740d218 100644
+--- a/src/sysctl/sysctl.c
++++ b/src/sysctl/sysctl.c
+@@ -257,7 +257,7 @@ static int parse_file(OrderedHashmap **sysctl_options, const char *path, bool ig
+ 
+                 existing = ordered_hashmap_get(*sysctl_options, p);
+                 if (existing) {
+-                        if (streq(value, existing->value)) {
++                        if (streq_ptr(value, existing->value)) {
+                                 existing->ignore_failure = existing->ignore_failure || ignore_failure;
+                                 continue;
+                         }
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index c1ea4fb27ab1..738ac85b5c0c 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -128,6 +128,10 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 "
 
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if use test && has pid-sandbox ${FEATURES}; then
diff --git a/sys-apps/systemd/systemd-244.2.ebuild b/sys-apps/systemd/systemd-244.2.ebuild
new file mode 100644
index 000000000000..6080f4368dec
--- /dev/null
+++ b/sys-apps/systemd/systemd-244.2.ebuild
@@ -0,0 +1,508 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	acct-group/adm
+	acct-group/wheel
+	acct-group/kmem
+	acct-group/tty
+	acct-group/utmp
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	acct-group/systemd-journal
+	acct-user/systemd-journal-remote
+	acct-user/systemd-coredump
+	acct-user/systemd-network
+	acct-user/systemd-resolve
+	acct-user/systemd-timesync
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Didn=$(meson_multilib_native_use idn)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-244.ebuild b/sys-apps/systemd/systemd-244.ebuild
index 847a85b35192..17788d8dde38 100644
--- a/sys-apps/systemd/systemd-244.ebuild
+++ b/sys-apps/systemd/systemd-244.ebuild
@@ -128,6 +128,10 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 "
 
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if use test && has pid-sandbox ${FEATURES}; then
diff --git a/sys-apps/systemd/systemd-245_rc1-r1.ebuild b/sys-apps/systemd/systemd-245_rc1-r1.ebuild
new file mode 100644
index 000000000000..81388352a216
--- /dev/null
+++ b/sys-apps/systemd/systemd-245_rc1-r1.ebuild
@@ -0,0 +1,505 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	acct-group/adm
+	acct-group/wheel
+	acct-group/kmem
+	acct-group/tty
+	acct-group/utmp
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	acct-group/systemd-journal
+	acct-user/systemd-journal-remote
+	acct-user/systemd-coredump
+	acct-user/systemd-network
+	acct-user/systemd-resolve
+	acct-user/systemd-timesync
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+		"${FILESDIR}"/245-rc1-network-debug.patch
+		"${FILESDIR}"/245-rc1-sysctl-segfault.patch
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-generator-path-r1.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Didn=$(meson_multilib_native_use idn)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index daed59e210c0..2a74ef0ef0b3 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -7,14 +7,19 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
 	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
+	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
@@ -128,6 +133,10 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
 "
 
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if use test && has pid-sandbox ${FEATURES}; then
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index d6db825f064f..de752c4b47fd 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,6 +1,4 @@
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
-DIST tuned-2.10.0.tar.gz 160254 BLAKE2B 0a09b4b870ec153adc62de7811af561ddb3967d459b1d5e8b6f02c5ac036ed170ad3368d18fc1b3fd40649335035cce971a54e1eda8745c77e836a3b2d892a83 SHA512 e0674533f17ac27cd3647808cda1f51d9905f563521af8cb3ffd1854098d6e2ca1adac82e542e6bdf86cce7e659303464eac50b8823167360783a75843d02a60
 DIST tuned-2.13.0.tar.gz 193816 BLAKE2B 1e51a9da855f54db9ac8ed6e764c091d513c1101771422a62c7c501dc3c8741430eb3503803b408709868d16d4791fbedb9dbc088b36fb693f065a1b6054fa15 SHA512 d81b0a80f911fe808ca324319da3e42c3c15196c0c37343d33b45c2b34f33e205e2913d77ffda8598379a91ef72ab73d88d7b83a4684b6a067e3f36d98a85927
-EBUILD tuned-2.10.0.ebuild 1260 BLAKE2B 072a755292b5ce009d10ad07e534f556288e2a3c4e9bf39d92e9848f91c5d075d70ed6837824da7e7cef896f231cf48aeae5128e9c82204e5346ab4b8fc87581 SHA512 cd10e1561b88d5791b234ede308c280bbdcafb67e54314c381bec848f57b94e53f26fff3b3998a0852acfc892725fea94516b83a9ae32769918daa0928b328df
-EBUILD tuned-2.13.0.ebuild 1257 BLAKE2B 493f557310decdce8074fb5ef178d0225c422c0bdaf97e862fda9c098a3cf56cebfac65602eccac2a0c97aa3322f5b66ad104c4a0473a92a8cefd07c2e5bc69b SHA512 cd9828ce3304579c10628be032603d0cd41dc75ebe4b929c77d0193d1c2286244939a199d278bf38de1b1f763f28abcc630a5d83d7c0c3d989314a87a7d2d9f6
+EBUILD tuned-2.13.0-r1.ebuild 1328 BLAKE2B 43c9abb31c7253a9fa6c1e6734ade3cbff8e8a4f08756b8eb7e368719c86748637e1073ad5c4a3cbfce719e0ce36fd2a4b8f11c0ed4e6bcbeb19477408854da3 SHA512 fc8f6a57e78f8723a15a1d167fecf59242ec20d2cb70077fda0511907bc765c91d837f0a18d3d6208c24929ff0073ed484fb3c44d09ba245126013120ecf9592
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/tuned-2.10.0.ebuild b/sys-apps/tuned/tuned-2.10.0.ebuild
deleted file mode 100644
index 0d0931ccad3d..000000000000
--- a/sys-apps/tuned/tuned-2.10.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 systemd
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://fedorahosted.org/tuned/"
-SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-linux-procfs[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${CDEPEND}"
-
-RDEPEND="
-	${CDEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	sys-process/procps
-	dev-util/systemtap"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^PYTHON/s/= python3/= python2/g" \
-		-e "/^DOCDIR/s/$/&\-\$(VERSION)/g" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${ED}"
-}
diff --git a/sys-apps/tuned/tuned-2.13.0-r1.ebuild b/sys-apps/tuned/tuned-2.13.0-r1.ebuild
new file mode 100644
index 000000000000..89a8dadb552a
--- /dev/null
+++ b/sys-apps/tuned/tuned-2.13.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
+HOMEPAGE="https://github.com/redhat-performance/tuned"
+SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyudev[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-linux-procfs[${PYTHON_MULTI_USEDEP}]
+	')"
+
+RDEPEND="
+	${DEPEND}
+	sys-apps/dbus
+	sys-apps/ethtool
+	sys-power/powertop
+	dev-util/systemtap"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \
+		-e "/\$(DESTDIR)\/run\/tuned/d" \
+		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
+		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
+		Makefile || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	python_fix_shebang "${D}"
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
diff --git a/sys-apps/tuned/tuned-2.13.0.ebuild b/sys-apps/tuned/tuned-2.13.0.ebuild
deleted file mode 100644
index fe231367c6c7..000000000000
--- a/sys-apps/tuned/tuned-2.13.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://github.com/redhat-performance/tuned"
-SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-linux-procfs[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	${DEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	dev-util/systemtap"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${D}"
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 343d69dfebf9..bd22853dc16d 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest
index c077add45437..8da45634f003 100644
--- a/sys-auth/authenticator/Manifest
+++ b/sys-auth/authenticator/Manifest
@@ -1,6 +1,6 @@
 AUX authenticator-0.2.4-disable-failing-tests.patch 423 BLAKE2B 02ca693fec700649cc0103f3de458c04e711b42eb4c0207a3c8dfcb747c565bf0afe1e673e8cb689ee568a9c5440d706514c5ea758e8a596687e5b7df336c206 SHA512 6406f5cb916f49abf909dabdd7df2b0096b1b4b300c2e0b8c1097155c1c52e6b54ce9e7ef526829e8e07e00ca8c52a6b30944c65bce37893c91ffab9cb6cae19
 AUX authenticator-0.2.4-support-use-of-gdlib-from-system.patch 638 BLAKE2B 76709f75b2d3cadddbb558938d8ef08d09b6d20f9008f513a44940f3b5847da784c52d382ab058ab91be084e98c1ba63ef450b41aa743a330b920e54cdec327a SHA512 0da21566e5913e99f78c6a7608a7b4a2da568c494dc7515d3d05993ddb8b611b607ef166d57be4ec949ca377848f474614d155068d2550ad6e7220ca46b5264a
 DIST authenticator-0.2.4.tar.gz 142444 BLAKE2B 2df1462452d5aaead51af111359120c8a464058730129fd984dd568c709c58f6940a34b996d3b5435b78bd87b433a29735d3fd8e9629b512915720063b49b1a1 SHA512 16b942d24a1136350f78de92a287dcc6b52e9347cd0b73e8310b87c6c24b7075aebe909fe20d80532f7fa1b54d332b8b62fd2fc7d26ce15888fd47bb686520e2
-EBUILD authenticator-0.2.4.ebuild 1659 BLAKE2B f903aa74bbbef31a5d083599511d5fd34fe541337908815c51c32362f4b36e95f81546c058d145911a07549c1164e589e3b666dc4594b7250a406ae3b89f62e5 SHA512 a4ae8c6713d9048d02b49f1a3cc76e33d79bbf570abdba3463698eb529357072030f1b2fdd4412b1088e46b08fb3db3f6a0127fb034ac62a70bcac64f3462b1a
-EBUILD authenticator-9999.ebuild 1540 BLAKE2B 1d0e21e5bf564ceb31708da71b665adc283d8b511baef1a6c485baed202c1d357db3e8b184844e4f641f995baa3a2893a84749a8ae79d4a7e02bd1d86a237ea8 SHA512 25d0a1a017b39e5ab36690f48993cdd44fcf60a6dc923c855e2148bf529061fcefca85949215ddad8d6906dec8ec59e31df079fc8312978551a17460eaf004bf
+EBUILD authenticator-0.2.4-r1.ebuild 1723 BLAKE2B 27193130b4680db40cbb035691ecd2ee9a66909e58154e72c30481958d8918040a8c76e51ad2daf2d8ba6889425f01999764804f977d56ff5ba86ed23074893c SHA512 075833602036503592f5af544c14204b80998f0224f21a9056d62f9aab2b186fbd609efa8f7d56d00d055be8ff1acd84adeb8091925a102b9ff011daa680382b
+EBUILD authenticator-9999.ebuild 1604 BLAKE2B a78a1ae13e07f1e2801ed1e6f5c666977f44e7d652b8a9152a46e76bb8cb2cdd582943c7983a79ab371aef34228e33641c8967334ea2d44cfd979a1cae8b83bd SHA512 a522d6fcd9ed2ad9e3a6097395c32d0518f1eee5f664e15740fd1114a28f07e003d51406feee5c290c79aac266897cb86106bbcffcf57114e7490225118d04ff
 MISC metadata.xml 544 BLAKE2B fe9f1a1bba9cdf6c48644f526d9b2309773735143467192a007fe8e63e97480aff2bcbf04d442ab9bb61792386b6610a6fe874a52db5dd6dea9f51d0c174ee4b SHA512 112fb3e1bd3a559a4f6f29ae800365a77a5298aa572f089b7d52553851ba85603387c1b09d8a86ce039080520ed6fe473f953c345b6fe553d3ec415a3e6bbfb7
diff --git a/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild b/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..8926a63fc2d8
--- /dev/null
+++ b/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit gnome2-utils meson python-single-r1 virtualx xdg-utils
+
+DESCRIPTION="Two-factor authentication code generator for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/World/Authenticator"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://gitlab.gnome.org/World/Authenticator"
+else
+	SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Authenticator-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND="
+	${PYTHON_DEPS}
+	app-crypt/libsecret
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/gd
+	x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}
+	test? ( x11-apps/xhost )"
+PATCHES=(
+	"${FILESDIR}/${P}-disable-failing-tests.patch"
+	"${FILESDIR}/${P}-support-use-of-gdlib-from-system.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang."
+
+	rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder."
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+src_test() {
+	xdg_environment_reset
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/sys-auth/authenticator/authenticator-0.2.4.ebuild b/sys-auth/authenticator/authenticator-0.2.4.ebuild
deleted file mode 100644
index 07b119b2a402..000000000000
--- a/sys-auth/authenticator/authenticator-0.2.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit gnome2-utils meson python-single-r1 virtualx xdg-utils
-
-DESCRIPTION="Two-factor authentication code generator for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/World/Authenticator"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://gitlab.gnome.org/World/Authenticator"
-else
-	SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Authenticator-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/libsecret
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyotp[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-	dev-python/pyzbar[${PYTHON_USEDEP}]
-	media-libs/gd
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	test? ( x11-apps/xhost )"
-PATCHES=(
-	"${FILESDIR}/${P}-disable-failing-tests.patch"
-	"${FILESDIR}/${P}-support-use-of-gdlib-from-system.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang."
-
-	rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder."
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-src_test() {
-	xdg_environment_reset
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild
index f3c1fe349d47..2d9e3b62d7b4 100644
--- a/sys-auth/authenticator/authenticator-9999.ebuild
+++ b/sys-auth/authenticator/authenticator-9999.ebuild
@@ -27,11 +27,13 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	app-crypt/libsecret
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyotp[${PYTHON_USEDEP}]
-	dev-python/python-gnupg[${PYTHON_USEDEP}]
-	dev-python/pyzbar[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
+	')
 	media-libs/gd
 	x11-libs/gtk+:3
 "
diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index 310bc06cb107..cd5b5b8c3090 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -1,8 +1,5 @@
 AUX munged.confd 410 BLAKE2B e220ad22fc0367a9ec7766e768aac8907b34edaf5bfb00593e88dc5ce6f47cddae2df0cf1c7dd8a57ec3e644f1e489a5bae538992ce3fef191750e0ef1e7ff6d SHA512 571e9d1862be1e0389e1a45685853a1819f44cd7a89188223099703268f788f3097f8ee4e8abf36f30bb5fe81e7c57a9ec7981867b3528a37e63eb11f5b2e232
 AUX munged.initd 1127 BLAKE2B b0d43fe3f0c0354fc0935a0e3e3e0bf28770e5cba8b900c6bed7cf08cb57b742e71cba7adc7440c8564f6db208f6ef09ab4fe50a4381fb8988b4fed815d71cf3 SHA512 fc49ba42cc2b538fdbbd93f7422359d1410b4124e11afca7db0511da980360be14cf49aee829ed1f5762ad4723c68090088638c36d76b040fcafda063394adf2
-DIST munge-0.5.10.tar.bz2 424285 BLAKE2B 07c6423ba799400e9a99e3f33a7dee61ed35b8caa8b290f7da5ffc1e7fbdc37ad985d10101b9a18ccae4ca4274c44999549f9754b0e782cda98976b5f15e3f30 SHA512 b1b780d205d6cfbadfe6096156840d559c70de5b0023cbd604acfc29e1135036c98a949981d5c022e994c77213ee3d8d70e8fe825b645b030ad1adef92ed9479
 DIST munge-0.5.13.tar.xz 389952 BLAKE2B 67887469dccf0f4e136a3fba12660dd8d0bfbd5d5024582c6be164b7e837959380ee9d09055ea95db2a307b1da75a8e7c643844fceb56b8a35f59ab7b1b811d8 SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002
-EBUILD munge-0.5.10-r2.ebuild 1245 BLAKE2B 5f7c3cc21e641074c5362d315bda5fdfa3c09a1dac2bdd28146707be9a73c01ef6a77058c641fbda35e0dffa05b5a16ebdc4223264e404d67c518b8b41524602 SHA512 134e3392b097d90a5c81c9a88085352937018c99ebb5fa61d0ebe1958966bef3af76097da779b15ee5486905cf0206fa8b91a948b6953863aa22bab593fef57f
 EBUILD munge-0.5.13-r1.ebuild 1403 BLAKE2B c181ccc54e31820f67fa1f896b54e446127a3212bbdbbcde0cbaff1e334f330e023d297d8b0447cd4940ec0953d4725e40098cb38759130985992957d41b26c1 SHA512 6590d98966c8de71a85aaa3fb8b0ca73de2a025e58ba3fc2d71e1f6590dd0a33a58e68a19813f2668080e186f32786a55355c8d582e9cc5ad057c1c37347c10e
-EBUILD munge-0.5.13.ebuild 1410 BLAKE2B f4d592ea6080411a6c701f26bfe6ef11d6f2bb1a73b4afca3338213688d7c378f39a318eec061f2c1290f6cfdf23690e0e82b2e37e93cd2c23de315b73002c02 SHA512 8ab9f092a3c603784cb163c40ea5e9250ebe6eb384ca407c0f2936f8c0bfcd0824c5d53750493c2d969d2c3c8cac2a660c5e4724ddfa0043ac6a723b3e2cfb9d
 MISC metadata.xml 1059 BLAKE2B 5b0f3f02298161ba2c929463fce32d74fdac822376dc7f9a852df211f6e37f3d53bfe93723b773f2268b5e2ffb58179562ed0ae26194ce024e3ad59915ef901e SHA512 0018c8101643023b01f621e7d5c23cfe6a3946dcb0f6e57ca05c998dc413b8cd1725eec88c5a6bdb5ddf2d6041793879aa04de6d53802f102b12070d0114c59d
diff --git a/sys-auth/munge/munge-0.5.10-r2.ebuild b/sys-auth/munge/munge-0.5.10-r2.ebuild
deleted file mode 100644
index f8a071127fc8..000000000000
--- a/sys-auth/munge/munge-0.5.10-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=4
-
-inherit user
-
-DESCRIPTION="An authentication service for creating and validating credentials"
-HOMEPAGE="https://code.google.com/p/munge/"
-SRC_URI="https://munge.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gcrypt"
-
-DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup munge
-	enewuser munge -1 -1 /var/lib/munge munge
-}
-
-src_configure() {
-	local conf=""
-
-	if use gcrypt; then
-		conf="${conf} --with-crypto-lib=libgcrypt"
-	else
-		conf="${conf} --with-crypto-lib=openssl"
-	fi
-
-	econf ${conf} \
-		--localstatedir=/var
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# 450830
-	if [ -d "${D}"/var/run ]; then
-		rm -rf "${D}"/var/run || die
-	fi
-
-	dodir /etc/munge
-
-	[ -d "${D}"/etc/init.d ] && rm -r "${D}"/etc/init.d
-	[ -d "${D}"/etc/default ] && rm -r "${D}"/etc/default
-	[ -d "${D}"/etc/sysconfig ] && rm -r "${D}"/etc/sysconfig
-
-	newconfd "${FILESDIR}"/${PN}d.confd ${PN}d
-	newinitd "${FILESDIR}"/${PN}d.initd ${PN}d
-}
-
-src_test() {
-	emake check
-}
diff --git a/sys-auth/munge/munge-0.5.13.ebuild b/sys-auth/munge/munge-0.5.13.ebuild
deleted file mode 100644
index 0c9183212423..000000000000
--- a/sys-auth/munge/munge-0.5.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools user prefix
-
-DESCRIPTION="An authentication service for creating and validating credentials"
-HOMEPAGE="https://github.com/dun/munge"
-SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gcrypt static-libs"
-
-DEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	!gcrypt? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup munge
-	enewuser munge -1 -1 /var/lib/munge munge
-}
-
-src_prepare() {
-	default
-
-	hprefixify config/x_ac_path_openssl.m4
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-crypto-lib=$(usex gcrypt libgcrypt openssl) \
-		$(use_enable debug) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	local d
-
-	default
-
-	# 450830
-	if [ -d "${ED}"/var/run ]; then
-		rm -rf "${ED}"/var/run || die
-	fi
-
-	dodir /etc/munge
-
-	for d in "init.d" "default" "sysconfig"; do
-		if [ -d "${ED}"/etc/${d} ]; then
-			rm -r "${ED}"/etc/${d} || die
-		fi
-	done
-
-	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
-	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sys-auth/ssh-ldap-pubkey/Manifest b/sys-auth/ssh-ldap-pubkey/Manifest
index 39440c690243..351c21831f23 100644
--- a/sys-auth/ssh-ldap-pubkey/Manifest
+++ b/sys-auth/ssh-ldap-pubkey/Manifest
@@ -3,7 +3,7 @@ DIST ssh-ldap-pubkey-1.3.1.tar.gz 15263 BLAKE2B e073093ff5c2e5ebb560d00b4973a0d2
 DIST ssh-ldap-pubkey-1.3.2.tar.gz 15311 BLAKE2B a8119b9808de556184c7f88c86b657d5d342e476b27cf53d92f37b8e9d3db69182b55c62a636bec6624c5d1aa2a90e3a04a22ce5ee8020ada27582b1ac6eefa3 SHA512 8475715151f331017850c094a50bd285574533fa6266341effc83f758ca30af9b9c24b54fce8c3eac5441c5cf18b0d7aa91bb04829b71efc4b8dcacba3642415
 DIST ssh-ldap-pubkey-130478a7532a8d3dfb0c8e3fbeac494908b8ec55.patch 1494 BLAKE2B 3fb89340d8177db79396b13615437aa921ecc2d21b8ca5c918587bb07f9fb53bc8f356c50c57269b1ffe04995033815d7632ff060485d4c29d34dc7805227533 SHA512 dfc137b6fb2bc0aea698b23ea462de2bd00503b9b21f022b77b28d51020758730ea4017b890e298616beb198816489862830d4dda7cae5114572523ad6289472
 DIST ssh-ldap-pubkey-8d718357dfa5a62f919e61cf620a862cae87e833.patch 2215 BLAKE2B abeaa5a364cd98050fd8abb1019cc203b72e96baa4c3704c7aac6cadc07d999defa2333f6ca4f6793dd0e758b08ab198135c65d100f5f91eba6273c07dd20250 SHA512 85136608352fb35ede70eff8522e09167e48eed5c99a87756ea8b3f641de0dc169bf066d0c21a28fc35c41337372803d97bd37ca8bad1dbafb92464086fe3a63
-EBUILD ssh-ldap-pubkey-1.3.0-r2.ebuild 2226 BLAKE2B 0dc9a32a65f30af7350ebc5c4a4540e30d80616f3f4726b1259bce78e8dd723b918b236a5e68e84d6c58973f89f1bb3e45f3ec1851e4022938e3130fee6f9a28 SHA512 9ce4704f40427a955303ab1697a36bfecac9a685d90b6eee27e07b16ea17f8d841baaa8dce5a70a36aa44c32d4ae717fd29af371dc357fa17f3d71e0c5e1374a
-EBUILD ssh-ldap-pubkey-1.3.1.ebuild 1723 BLAKE2B 7df986ff03109ef8d6bc16fe524d4fe7a6cdb0ccd29afefe8a2428372aa5b7852cdf645e1277b79401dd3364c9e999b1d266a667f3b870a8befcae0f761383a6 SHA512 b56c125cdd5cf143008ddfefef779e91ea20fc747f40b822be2df93708205bab0fdd9f09b7a39d5b826db971f604ab78bd37a011b97f9f645fa56c3dda49d7c9
-EBUILD ssh-ldap-pubkey-1.3.2.ebuild 1727 BLAKE2B ca5b0c02415a2a17298aa036010c446c4bd9e2d2e0563b8ca9e21baadaec7875676bc9a11ba8b10a1ac50fb63503f9200a4375b92630019d3d82c992f3879bdd SHA512 a2cb962ee32975e74b42f78e24db71980f0c51b9bc6a26a5a00ea552997e18df1a8e28c33e1a2259af43383ac46f6cd1ee47c4c05baf89df4fc04a598e8e3b35
+EBUILD ssh-ldap-pubkey-1.3.0-r2.ebuild 2216 BLAKE2B 75c57778e75d2d3b25aa57f58031723ead243fa4286c88e49bcefa10df745694192b685d405c4ff5aad5ab2e94296d25f2c6eec2aeb8a6b76a44a31199fa34bc SHA512 ae104e7a5cb040bdcd0b28e40446b59de7ffbf0a74de203fbceb1f575c194b82d1f845013c554c63d5a3fe4522c849caf5a0d83f61e14977fdb20d9848da2eb4
+EBUILD ssh-ldap-pubkey-1.3.1.ebuild 1713 BLAKE2B bf291394cf41bcd03c15ba913136f93d2c17244fb660b06a076b4492d024c2abc5ad2ed85ab81170b58c605f6b81be316d3ac5747059b9b8782b4c098bdd0c2f SHA512 f16fae43a02ff3d70f3213eae49f9370d1f0e2ea9cac5a6c1ed586a559bd896a00c5129439c626188f20eac84dbc84a41094cdade938f493ce035025e395019c
+EBUILD ssh-ldap-pubkey-1.3.2.ebuild 1717 BLAKE2B cce812913992d61faa786b2064737b88626d6b384874117227464c8bde7db8ee2ef12e93590ad4b5b3c78fb53624a22a16c1e2309ce8a2c30e233ef6f771e7e2 SHA512 bfd363e66de54061c74007e68fd0e153114ef13854bb958dc456b6b215cb637b0886e8da8b808a5ab49dc016146915285f23c79d5a96a22e6e90b36ef63f8072
 MISC metadata.xml 523 BLAKE2B 0a9308f1acc865d1150c5d1f7275ab7d213965be821936aadc1e92b6a0ca0f3ba90a8e4b28a1683b182fe1d540991ff032407e641ce0ea4b4f8511a880e74d99 SHA512 f9db947dfb435f981350a30cd8d6d9163b9b5067f610eae87f17c85d6a123a2dd620aa06d1a290ed148321d68c37877662885b07b5af15fce3f13d0afbba67dc
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
index 17407783a2d1..d4129f617cbd 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
index f0323772233f..f9b87b29b318 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
diff --git a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
index 6aad75f50303..15c6338cb358 100644
--- a/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
+++ b/sys-auth/ssh-ldap-pubkey/ssh-ldap-pubkey-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Utility to manage SSH public keys stored in LDAP"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 256c859d4c9c..2ad073c2812c 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/f3/Manifest b/sys-block/f3/Manifest
index 593f0801b92e..53162569a2ca 100644
--- a/sys-block/f3/Manifest
+++ b/sys-block/f3/Manifest
@@ -1,3 +1,3 @@
 DIST f3-7.2.tar.gz 68471 BLAKE2B fa2e98ee0bdbad117c44bcc866d8ee5ef1572469d0b3cc48734de0fdb47653946774cc85429157f00d2a977662f593885074822bf1e069aa84ceafafa64726bf SHA512 4e41fca8b02dbd6bfaae01237a47573916aefe47f5aafc864618d708568e32ec122390c03af24d89caaf03de692fa374e87747b07a8546eaf8cafd57887a61ac
-EBUILD f3-7.2.ebuild 1023 BLAKE2B e6bd0d81a01893dd7bd9de0b94d69e255a06a7c7066dfac87179dfeba5cec0896c97258e8dd62066cf2d9975631766214408a3688cb1bea6f8f3ada683210d43 SHA512 a291beddaed0584ee0182331be6096932b52ed0b2294e440881fab7ff0f121d4da51f4cc660827fe3c12806279dc087fe6c4c45c347644dc07825d4f7e31783c
+EBUILD f3-7.2.ebuild 1019 BLAKE2B ddce6e54d819e3fb9b6f29d29c428934cc1d464f75037096fcc7fac9ecd2bc9d80eeca27bcae392e508f6a01700ae4f407ff5785bd010bbe46705ba221d6f631 SHA512 c9bc5f6d3aa75659ca718b1af87c72fd82e7a5ed7c75ebb90b82c7e5e2b6e1886effc55012c47e18367f96c84c47943d69c40e1b88d25b75fb23c9176a002c79
 MISC metadata.xml 959 BLAKE2B 216b03b57f363f727f19317c6ac7a9dcd5c383f23939803e0e04a5061628c0669083084e0bfd2a3bd8234810e37cf851babc8b63355bd9e4082a35126844c4df SHA512 a3c52956ad1241ea8d834cfe4d45f36fb80e4c3d717f18e0f15e126b950a2cf6fdd036e8612b9feee8812d9c77a49ce9e209a2e54fd8d0f3655696814b4c9b40
diff --git a/sys-block/f3/f3-7.2.ebuild b/sys-block/f3/f3-7.2.ebuild
index 11b6e4fcd9d0..026dd140fefb 100644
--- a/sys-block/f3/f3-7.2.ebuild
+++ b/sys-block/f3/f3-7.2.ebuild
@@ -56,10 +56,10 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${ED%/}/usr" install
+	emake PREFIX="${ED}/usr" install
 
 	if use extra; then
-		emake PREFIX="${ED%/}/usr" install-extra
+		emake PREFIX="${ED}/usr" install-extra
 	fi
 
 	einstalldocs
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 2e9c9bd3be0b..543db3d5629c 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -6,5 +6,5 @@ AUX partimaged.init.2 628 BLAKE2B 872f72a4407ca0f923220e2c313779a0e52b6179b75356
 AUX partimaged.pam.2 249 BLAKE2B e40a15c5fe4dc394cbcf9c478c3c764e67ec317f31c039738c87b90fec79577a191ae85ad0b774e8b415b79bd29460c929f094e4e3210660989a7bdb9939fe8a SHA512 ad55a61e574dc44cdda723bb5a46349d15e50353dcdb99474b9acafd56c93bc6ffdd75f5b0d9e80849d9bebf5c7b9a2f84c7cefc5f0a86f54f9477a0962794cd
 AUX servercert.cnf 980 BLAKE2B 0660f9b92fe422754e36d6ce1889e8b8feb40954b36b3e00e58f5e534b85171ac42e66f74020a55dd1b14d56d7764c94427b8d1d112ca1a878dff388ac3ea787 SHA512 8aa0592ce0be3f08124880b823db59aa167e7d509ea1a9b48d9f895482f96e99a6e4df330c567b9ce331eed43cb4f1a70b1b7727878972a8b074265898b1e557
 DIST partimage-0.6.9.tar.bz2 666522 BLAKE2B d9a240f82a7b6ae73997df46c964fdddf8dddea9e3bd9548252d9409a526358714908316c52864b60bc9fcc1113a5e1c6cf294faff6845a183c7ffe1012475a6 SHA512 252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9
-EBUILD partimage-0.6.9-r1.ebuild 3552 BLAKE2B dba353cce1eb9dd2f374016b1af83e2a33de522ab6beb9923bc5ccebc15a22d23bc57bf08392453c4f323a40db78062b2881c83b2170fde0f04833b4982768c4 SHA512 a9856ca19830ae37afc4d6202a0f1124176e16322e626423f4dd6db3119d955c5e85ff8cc515ae4ac88b667ef61c4666aab2c2f3714fbfb9ccfe8afbebf8aa50
+EBUILD partimage-0.6.9-r1.ebuild 3546 BLAKE2B 3f6b4a90795eeb88361b7c6755d05a23ea6e4bf2f511488249931e1d5ba793aefa065b96422fb20288aa4a76d89fe67495d8171dbd27a3bc31d1ab90bbe8b58d SHA512 c073c9ade521cc63c052326b267058f3a0228e0941d0e3c956a6cde1d1943cd8b16b6b15856c1f604fe68b32c463838f41394c1c3e66830eb95e216025a8dd93
 MISC metadata.xml 427 BLAKE2B 33870f2fc393bed75dcdbda1bb16d6cc947cfa4f7321e7f219338cab014be901eca6d3e2dc11c0ecd50be28922f0f1a746a8756c3d860d8f10549098c3479cad SHA512 e5e5377e9f6cf6337b93ea8609424ce4b9514b0b0d9628ef22999537af616f24e4882a915cf6249f8d0e721b5e25e0a50f5e046b8ac9991c130b4f5892298e67
diff --git a/sys-block/partimage/partimage-0.6.9-r1.ebuild b/sys-block/partimage/partimage-0.6.9-r1.ebuild
index 400f801dd5f9..83cd55dc190c 100644
--- a/sys-block/partimage/partimage-0.6.9-r1.ebuild
+++ b/sys-block/partimage/partimage-0.6.9-r1.ebuild
@@ -54,13 +54,13 @@ src_configure() {
 	fi
 
 	econf \
-		--docdir="${EPREFIX%/}"/usr/share/doc/${PF} \
-		--sysconfdir="${EPREFIX%/}"/etc \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--sysconfdir="${EPREFIX}"/etc \
 		$(use_enable nls) \
 		$(use_enable ssl) \
 		--disable-pam \
 		$(use_enable static all-static) \
-		--with-log-dir="${EPREFIX%/}"/var/log/partimage \
+		--with-log-dir="${EPREFIX}"/var/log/partimage \
 		${myconf}
 }
 
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 74098129872d..f86777237666 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 516ebd4ce00a..cf5a78cec71b 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -5,7 +5,7 @@ DIST gnu-efi-3.0.11.tar.bz2 154456 BLAKE2B dd8d5100ee65e2f94d6b67f0d2236674c7c2b
 DIST gnu-efi-3.0.3.tar.bz2 142229 BLAKE2B 5230e99358fc2c1a85fd56840a9ddbd4d1cb42d15a8c37dd44e87037e45a1033f1014c953b5a4d2bb565c4be5aa67a3982ca64e575aaae9c1ae64ce27659b642 SHA512 0b0582e22344ea8a544aba540b56dc36364febfeb5bb655e87277e638fd4e549214a0cd2079a852d15ee376cd51c33794f65a7efb23be9a7a929e889cd616c8c
 DIST gnu-efi-3.0.6.tar.bz2 152088 BLAKE2B 2cb1d72f6972a86e913fba28a86e95a1b0baf15251d8fa3d4c335a13e5fd929b61f8f421330acbddbc640efd63594713180b7fc3e623fda2397947538a25b795 SHA512 f1b17766d8ae000c0177ea2126d87883f254ab01ac020e4bfaa9ad2d3d60a66d07b6237d9842e5989c4da3fd23152b5c592ef863fdc9806901f43c43582a2258
 DIST gnu-efi-3.0.9.tar.bz2 154445 BLAKE2B 099af13ff8944d6d362fd4f1dfaf7eff477e7105298651295a63493eb54799459649a977b3b0600e9884b48f8119ecf1faa38d35e0b01086076de40beefbcbcc SHA512 1a775476fcbe354e57c9db258b1c6ad4346b84d1794178ab5d5195b3ffba250066ca4c42a553d5b2866fa1b4e03019d61df0197f269188c73297042990adf316
-EBUILD gnu-efi-3.0.11.ebuild 1886 BLAKE2B a280ecf326fdcc09099dbd8b0f096aee973a6dd4e7999d03268b90c20a5ae01620533670e4461a5597ab251504e406dea7349196bf9116a83ab3e1af96a8318d SHA512 1d453b3a572724f2085ce3490e3ded2afafea7634dd7c022bb84a61de00d8c8897f1264f0a7d93380b569d7a5adb4cb59dd9449ce932d98ac85e4bc6561ca010
+EBUILD gnu-efi-3.0.11.ebuild 1883 BLAKE2B 2ca60a96eb76d5618d7421585708021a81926dcd46c66c70032e5164e00760625f064d207d065fd91788dc0945f5ae753f73776cfde43ddfc3ff797407801ebd SHA512 5856a713576cee8afa0ef279f0b876462a2bff1e8eaedd96e5d197b920cea19f686e92327fb8cf7d3db3f2f94c9011e1071fb864dd6903ff33c339e7d453e274
 EBUILD gnu-efi-3.0.3.ebuild 1732 BLAKE2B 9c453d8e28059d16832adaee14ba34baf6e1b6caaa54c279a91c48798ad00cc8da6ee4b6fb2aa02f06c0773d8c8ad17ed93e65168965e637d85a3f5251fbb31c SHA512 2b4cdc3cc522ed6d9c6a716756fec4009d52af85369c2be1c81cf6afd03dc78b7e836adb351427a0cd0656de8f5e19a287e093d985a68e15726721d58c2fb6ef
 EBUILD gnu-efi-3.0.6-r2.ebuild 1959 BLAKE2B 74364ba53da292593203a47af9d4960046a9b79291979b1d92ebbfe83a695a0821ceec67dabb0a53a823a78a34e04bd0680c7e87e44c336891a1a29f808dd38a SHA512 fa013637c4c044381f98f655232860e6eb2e0000a620b8499484fe99a94751cdace1a33182e26f7784c16f365cf21f6ee74ab1dbce7a1cb06f1ca9b8612354bc
 EBUILD gnu-efi-3.0.9.ebuild 1887 BLAKE2B c897a9466dd2884bd33ea1abe740b468d938a0f0844d713e34a8183b682b642c2cc969f5a6a67c3f619b1bc42ad6cf469be44e0407ce43a6f17733b797a5ad7b SHA512 9a2a75d2ee2c72ea190520e1c0e99d3cc7a6fee029b5ae522b64c844bbb1cde69dc0739034b92fedbe8babff4578e83291543e528ec506b9a58eb20e8d1488d3
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
index 630ffd46876e..64106c2bc4bd 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.11.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
 # - GPL-2+ : setjmp_ia32.S
 LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="-* amd64 arm ~arm64 ia64 x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
 
 # These objects get run early boot (i.e. not inside of Linux),
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index bb1b5d6d9e9d..44ac9d525c01 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index b418864445f1..59b69bde3155 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -52,19 +52,8 @@ AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c5
 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85
 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b
 AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
-DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35 SHA512 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef
 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
-DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
-DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
-DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c
-DIST ceph-14.2.4.tar.gz 116371380 BLAKE2B 2d2c78ec32a0749df16e9c527d2fd087a75daeb2ef26ac5f6aa641989eab62fa276eb320b873740e9eee3fd4f369da152c53c2389b1def1b6a45906ccc1bd1f1 SHA512 dc60321ed4dcaccacca711ab70c35011b5dfc6b8369016fb413a9976199ed4ba22c7dc87ba1ebaf1118513dee1a0c263c99ab137f27fc03c55e8a0625a3bdcc0
 DIST ceph-14.2.7.tar.gz 116647114 BLAKE2B f6971324b0467cfdb863db553b6feacaf3607b14fb9adae2808bd6e5514fc5ce218482c412b80902c22a74b883ed697f2c126bc687c8733a83de5b970593efa2 SHA512 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1
-EBUILD ceph-12.2.11.ebuild 8018 BLAKE2B 764348a298dc6079256001577e725caa80286c2c5d1202d39a3b951042ae6030e8d2bfaacf705c04027e5f4581370e68e9a419cf8f50a2047c2a3e2b387b8bd0 SHA512 884e9f7ef71a5b03eb28fa54133780902edf8579e9da685dab0f0746f68a100fa4dc4b39332e7400c65e2572471864eb5b2909e5dac8493a21ec69cb55549a8e
-EBUILD ceph-12.2.12-r2.ebuild 8383 BLAKE2B 7813766d3f0fbe8f535ae40b77a57448e3229707f56c4e73e7b651135406306a7ffdef524e421c7c7fe3da59b061f3280b0ae6fb84fb7bc54f969219d0ac2579 SHA512 39e142f44de2eeeef492d347af4df81783f0f9e7d6b7bcf0860c23d5a78f44fca1cb727e2fba133df224d9a7481513bce42d8c853e5ba31728d61ce98e9370ec
-EBUILD ceph-12.2.8-r1.ebuild 7879 BLAKE2B dd1c1d6076b4f64d68caf782cccb4abde3b97a2863b08701e2ef48333d9c68d9004011fd0c3098041218a43ff70ffae0f6ef51ed85e7d92f20e2973405294a9c SHA512 956e2ddb86fc7086c6db84e3c0d579cbab02b9972939ab1c131022f86a1874987a121d25ac06891b116622cad73de6a12988af5bc7c4932e930e634ca00ea4d9
-EBUILD ceph-13.2.5-r4.ebuild 9000 BLAKE2B 08a3da20abf27f537dbbb119497685f57afefe8057972d5dd56fbe409879fb31fba030509392ac74dfdbbd249eafae681b3b2a538663310d3b59ad78ea46e62f SHA512 c09871edccd098948209c5a16a837a394dd47f6437cc650078b710d43a660647abb69daca48e30c0dcff17b1a6bdcb7340d5d118100002c4bf14fd4fe9b238de
-EBUILD ceph-13.2.6.ebuild 9126 BLAKE2B 4f9fac1da8ac01de8b7e924a554cbe097431cda09ad673e5728114eef63a3e448299624f670dac28a1ef0a364fc7204b20c95e1be8102724b0516fa2944def75 SHA512 be7bf2179c2b262fa9429a9e6673fe00f0424132221befb203661e2a265dbb7ec211bcc6c37b5fd351086657abcb8343be62c6c7abca3fc8fc94360364547474
-EBUILD ceph-14.2.4-r1.ebuild 10014 BLAKE2B b522e05a235dbafdc5a1838b726721c7d45ea59613f75a4abaaea168bf9aeed04b5bb979dadc4cd8bb5bd3447613cbc890b9d8c77314f5bc15985ff570965f55 SHA512 7964d35a804e3dc4875636259d84bdb2649dc9cbde24988fb459e8e1f6f5ff30ec549223365b3782ad00bc92d5db6ce78a451579b87dd944b55ddb062eaf7b00
-EBUILD ceph-14.2.4-r2.ebuild 9973 BLAKE2B a28e3087abb05692843c3265e7dc3c9456bcc77bef0d95b221b9e7b385b0c07981c05be7c3976b0330bffd2a45d90c9a6c11d51f86dde22c172f084a0106e33e SHA512 b1eec19f0b596260f60d538d322857e55842cac59e5e031b71eadedd59d705b89f58097033abf315b3eb7371a6f0d444ec94a05f4e9de3d77162154bc1e80278
-EBUILD ceph-14.2.7.ebuild 10268 BLAKE2B e8045c9cfacb231f8b0cb0c856578f97c27c98d2b0948ab25f9a0784bd37ff478971c6da27fb8ad92b08ab8500f5a640eefc8202e5454bcab1ab869bdec4a451 SHA512 c3b5a18f543e84e7deefd65a88c8ba4584df6a9971b648873bee274f9d03b256a369a1daeb3b246133f4f26208f50fbe24237fc9c56b2daac8daf276197732fc
+EBUILD ceph-12.2.12-r2.ebuild 8446 BLAKE2B aed1bab233d20c77e385b49bc0f8fa7cbdd9a806f0e5e856e1000cccb09557bfc394ef2e97fbeb8fa5b995dd119dcd4b3e79751c6b5da00798b1267af392412e SHA512 50e031732540249f824e9b14a8286c600bff8a361e5047ad0b67c87ec940c1feaf0a2f7d5f40ab529dbfa91b15915b4adf372a6d3257025d6457c64cc152d1d1
+EBUILD ceph-14.2.7.ebuild 10267 BLAKE2B e64a6096a7e021d3a6f1ae0e8564132d76d38f3ef195510a2b0606602792929d2b62c31e16ae12b8c35b0b2dca793d40dc0d4a4e3dc517fa8edb21bf9ff88b42 SHA512 2cc3f8116ca7b57914f0b3b2cde51fbf0df5f90ca9c649db50ed370d6cda8f840cdb1d67f38454d765f1fcc2d96bab0ed5a7766601556a7931b8c8c3a8d988f2
 MISC metadata.xml 1662 BLAKE2B 0d2b5697ff30ba38b9fff57fc08c0339d481e852a1ec54561214594d6fa6ddc6aa1bcd9adabe24bd1da39da9b9b66ff9cca1c30cae5a0d3b4259cb80673638e3 SHA512 95d94f98a016a1c04ed65cbb2710b07984bc2db428c4e54fed3ab35eda6c5e4db6f7a4d273772cffbbe6ad331a8257247cc359e1814bd418eeb4f0952858c945
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild
deleted file mode 100644
index 552bea72df52..000000000000
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
-IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	<dev-libs/crypto++-7.0:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	nss? ( dev-libs/nss:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	ssl? ( <dev-libs/openssl-1.1:0=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		<dev-libs/openssl-1.1:=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
-	)
-	system-boost? (
-		=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/e2fsprogs
-	sys-fs/cryptsetup
-	sys-fs/lvm2
-	!<sys-apps/openrc-0.26.3
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	?? ( ssl nss )
-	?? ( jemalloc tcmalloc )
-	"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-12.2.4-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-12.2.11-fix-min-call.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python2*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch"
-	fi
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_NSS=$(usex nss)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-
-	ceph_src_configure
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${D}" emake install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
index b2a3dc2cc6ed..5ce8a64ecb1d 100644
--- a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_6 )
 DISTUTILS_OPTIONAL=1
 
 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 systemd
+	python-r1 udev readme.gentoo-r1 systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -14,7 +14,8 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	# currently broken (bug #708294)
+	#KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
@@ -33,6 +34,8 @@ IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
 #>=dev-libs/jerasure-2.0.0-r1
 #>=dev-libs/gf-complete-2.0.0
 COMMON_DEPEND="
+	acct-group/ceph
+	acct-user/ceph
 	virtual/libudev:=
 	app-arch/bzip2:=[static-libs?]
 	app-arch/lz4:=[static-libs?]
diff --git a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
deleted file mode 100644
index bf467d18c840..000000000000
--- a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
-IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	<dev-libs/crypto++-7.0:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	nss? ( dev-libs/nss:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	ssl? ( dev-libs/openssl:0=[static-libs?] )
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		dev-libs/openssl:0=[static-libs?]
-		net-misc/curl:=[curl_ssl_openssl,static-libs?]
-	)
-	system-boost? (
-		=dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/tox[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2
-	!<sys-apps/openrc-0.26.3
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	$(python_gen_useflags 'python2*')
-	${PYTHON_REQUIRED_USE}
-	?? ( ssl nss )
-	?? ( jemalloc tcmalloc )
-	"
-
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-12.2.4-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-12.2.5-no-werror.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python2*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch"
-	fi
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_NSS=$(usex nss)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '')
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-
-	ceph_src_configure
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${D}" emake install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r9" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python2*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-13.2.5-r4.ebuild b/sys-cluster/ceph/ceph-13.2.5-r4.ebuild
deleted file mode 100644
index 70b81415dfa1..000000000000
--- a/sys-cluster/ceph/ceph-13.2.5-r4.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 systemd bash-completion-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr"
-IUSE+=" numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc"
-IUSE+=" test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	numa? ( sys-process/numactl:=[static-libs?] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
-	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
-		)
-		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
-		)
-	)
-	system-boost? (
-		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2[-device-mapper-only(-)]
-	!<sys-apps/openrc-0.26.3
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	?? ( jemalloc tcmalloc )
-	"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-# ninja does not work at all
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DWITH_TBB=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:--${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	rm -r "${BUILD_DIR}/lib/cython_modules" || die
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	find "${D}" -name '*.la' -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-
-	local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${D}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-13.2.6.ebuild b/sys-cluster/ceph/ceph-13.2.6.ebuild
deleted file mode 100644
index 895df81e7d8f..000000000000
--- a/sys-cluster/ceph/ceph-13.2.6.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
-	python-r1 udev user readme.gentoo-r1 systemd bash-completion-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr"
-IUSE+=" numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc"
-IUSE+=" test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-# unbundling code commented out pending bugs 584056 and 584058
-#>=dev-libs/jerasure-2.0.0-r1
-#>=dev-libs/gf-complete-2.0.0
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	numa? ( sys-process/numactl:=[static-libs?] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
-	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
-		)
-		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
-		)
-	)
-	system-boost? (
-		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	app-arch/cpio
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2[-device-mapper-only(-)]
-	!<sys-apps/openrc-0.26.3
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	?? ( jemalloc tcmalloc )
-	"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-# ninja does not work at all
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-12.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
-	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-13.2.6-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch"
-	"${FILESDIR}/ceph-13.2.6-dpdk-alignment.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-
-	#rm -rf "${UNBUNDLE_LIBS[@]}"
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
-		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DWITH_TBB=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:--${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	rm -rf "${BUILD_DIR}/lib/cython_modules" || die
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake install
-	popd >/dev/null || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	find "${D}" -name '*.la' -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
-		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
-
-	local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${D}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
deleted file mode 100644
index d65902987c2b..000000000000
--- a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
-		multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \
-		systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
-IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost"
-IUSE+=" systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-COMMON_DEPEND="
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-libs/ncurses:0=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	kerberos? ( virtual/krb5 )
-	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
-	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
-		)
-		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
-		)
-	)
-	system-boost? (
-		|| (
-			~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-			~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-		)
-		dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-	"
-BDEPEND="	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2[-device-mapper-only(-)]
-	!<sys-apps/openrc-0.26.3
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	?? ( jemalloc tcmalloc )
-	rabbitmq? ( radosgw )
-	"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-UNBUNDLE_LIBS=(
-	src/erasure-code/jerasure/jerasure
-	src/erasure-code/jerasure/gf-complete
-)
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-14.2.0-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-14.2.3-boost-1.70.patch"
-	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
-	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
-	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
-)
-
-# dpdk and ninja don't get along
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-user_setup() {
-	enewgroup ceph ${CEPH_GID}
-	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-	user_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-14.2.3-boost-sonames.patch"
-
-		has_version '>=dev-libs/boost-1.70.0' || \
-			eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch"
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_GRAFANA=$(usex grafana)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
-		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
-		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DWITH_TBB=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		#-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake VERBOSE=1 install
-	popd >/dev/null || die
-
-	python_optimize
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
-	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
-		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-14.2.4-r2.ebuild b/sys-cluster/ceph/ceph-14.2.4-r2.ebuild
deleted file mode 100644
index 3208d2f2deb7..000000000000
--- a/sys-cluster/ceph/ceph-14.2.4-r2.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-CMAKE_MAKEFILE_GENERATOR=emake
-
-DISTUTILS_OPTIONAL=1
-
-inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
-		multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
-		systemd
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="https://ceph.com/"
-
-LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
-SLOT="0"
-
-CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
-
-IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl"
-IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost"
-IUSE+=" systemd +tcmalloc test xfs zfs"
-IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
-
-COMMON_DEPEND="
-	acct-group/ceph
-	acct-user/ceph
-	virtual/libudev:=
-	app-arch/bzip2:=[static-libs?]
-	app-arch/lz4:=[static-libs?]
-	app-arch/snappy:=[static-libs(-)?]
-	app-arch/zstd:=[static-libs?]
-	app-shells/bash:0
-	app-misc/jq:=[static-libs?]
-	dev-libs/crypto++:=[static-libs?]
-	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
-	dev-libs/libaio:=[static-libs?]
-	dev-libs/libxml2:=[static-libs?]
-	dev-libs/nss:=
-	sys-auth/oath-toolkit:=
-	sys-apps/coreutils
-	sys-apps/grep
-	sys-apps/keyutils:=[static-libs?]
-	sys-apps/util-linux:=[static-libs?]
-	sys-apps/sed
-	sys-apps/util-linux
-	sys-libs/ncurses:0=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	babeltrace? ( dev-util/babeltrace )
-	ldap? ( net-nds/openldap:=[static-libs?] )
-	lttng? ( dev-util/lttng-ust:= )
-	fuse? ( sys-fs/fuse:0=[static-libs?] )
-	kerberos? ( virtual/krb5 )
-	rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
-	ssl? (
-		!libressl? ( dev-libs/openssl:=[static-libs?] )
-		libressl? ( dev-libs/libressl:=[static-libs?] )
-	)
-	xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
-	zfs? ( sys-fs/zfs:=[static-libs?] )
-	radosgw? (
-		dev-libs/expat:=[static-libs?]
-		!libressl? (
-			dev-libs/openssl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_openssl,static-libs?]
-		)
-		libressl? (
-			dev-libs/libressl:=[static-libs?]
-			net-misc/curl:=[curl_ssl_libressl,static-libs?]
-		)
-	)
-	system-boost? (
-		|| (
-			~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-			~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-		)
-		dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
-	)
-	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
-	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
-	${PYTHON_DEPS}
-	"
-DEPEND="${COMMON_DEPEND}
-	amd64? ( dev-lang/yasm )
-	x86? ( dev-lang/yasm )
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	dev-util/cunit
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		sys-apps/grep[pcre]
-		sys-fs/btrfs-progs
-	)
-	"
-BDEPEND="
-	app-arch/cpio
-	>=dev-util/cmake-3.5.0
-	dev-util/gperf
-	dev-util/valgrind
-	sys-apps/coreutils
-	sys-apps/findutils
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/which
-	sys-devel/bc
-	virtual/pkgconfig
-	"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/socat
-	sys-apps/gptfdisk
-	sys-block/parted
-	sys-fs/cryptsetup
-	sys-fs/lvm2[-device-mapper-only(-)]
-	sys-fs/lsscsi
-	virtual/awk
-	!<sys-apps/openrc-0.26.3
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/cherrypy[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pecan[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python3*') )
-	?? ( jemalloc tcmalloc )
-	rabbitmq? ( radosgw )
-	"
-
-# the tests need root access
-RESTRICT="test? ( userpriv )"
-
-# distribution tarball does not include everything needed for tests
-RESTRICT+=" test"
-
-# false positives unless all USE flags are on
-CMAKE_WARN_UNUSED_CLI="no"
-
-PATCHES=(
-	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
-	"${FILESDIR}/ceph-14.2.0-cflags.patch"
-	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
-	"${FILESDIR}/ceph-13.2.0-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
-	"${FILESDIR}/ceph-14.2.0-no-virtualenvs.patch"
-	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
-	"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
-	"${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
-	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
-	"${FILESDIR}/ceph-14.2.3-boost-1.70.patch"
-	"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
-	"${FILESDIR}/ceph-14.2.4-python-executable.patch"
-	"${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
-)
-
-check-reqs_export_vars() {
-	if use amd64; then
-		CHECKREQS_DISK_BUILD="12G"
-		CHECKREQS_DISK_USR="460M"
-	else
-		CHECKREQS_DISK_BUILD="1400M"
-		CHECKREQS_DISK_USR="450M"
-	fi
-
-	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
-}
-
-pkg_pretend() {
-	check-reqs_export_vars
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	python_setup 'python3*'
-	check-reqs_export_vars
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use system-boost; then
-		eapply "${FILESDIR}/ceph-14.2.3-boost-sonames.patch"
-
-		has_version '>=dev-libs/boost-1.70.0' || \
-			eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch"
-	fi
-
-	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
-		src/bash_completion/CMakeLists.txt || die
-
-	# remove tests that need root access
-	rm src/test/cli/ceph-authtool/cap*.t || die
-}
-
-ceph_src_configure() {
-	local flag
-	local mycmakeargs=(
-		-DWITH_BABELTRACE=$(usex babeltrace)
-		-DWITH_CEPHFS=$(usex cephfs)
-		-DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
-		-DWITH_DPDK=$(usex dpdk)
-		-DWITH_FUSE=$(usex fuse)
-		-DWITH_LTTNG=$(usex lttng)
-		-DWITH_GSSAPI=$(usex kerberos)
-		-DWITH_GRAFANA=$(usex grafana)
-		-DWITH_MGR=$(usex mgr)
-		-DWITH_MGR_DASHBOARD_FRONTEND=NO
-		-DWITH_NUMA=$(usex numa)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
-		-DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
-		-DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
-		-DWITH_RADOSGW=$(usex radosgw)
-		-DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
-		-DWITH_SSL=$(usex ssl)
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_XFS=$(usex xfs)
-		-DWITH_ZFS=$(usex zfs)
-		-DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
-		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
-		-DWITH_SYSTEM_BOOST=$(usex system-boost)
-		-DBOOST_J=$(makeopts_jobs)
-		-DWITH_RDMA=no
-		-DWITH_TBB=no
-		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
-		-DEPYTHON_VERSION="${EPYTHON#python}"
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		#-Wno-dev
-	)
-	if use amd64 || use x86; then
-		for flag in ${CPU_FLAGS_X86[@]}; do
-			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
-		done
-	fi
-
-	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
-		|| die "failed to remove cmake cache"
-
-	cmake-utils_src_configure
-
-	# bug #630232
-	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
-		"${BUILD_DIR:-${S}}"/include/acconfig.h \
-		|| die "sed failed"
-}
-
-src_configure() {
-	ceph_src_configure
-}
-
-python_compile() {
-	local CMAKE_USE_DIR="${S}"
-	ceph_src_configure
-
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	emake VERBOSE=1 clean
-	emake VERBOSE=1 all
-
-	# python modules are only compiled with "make install" so we need to do this to
-	# prevent doing a bunch of compilation in src_install
-	DESTDIR="${T}" emake VERBOSE=1 install
-	popd >/dev/null || die
-}
-
-src_compile() {
-	cmake-utils_src_make VERBOSE=1 all
-
-	# we have to do this here to prevent from building everything multiple times
-	python_copy_sources
-	python_foreach_impl python_compile
-}
-
-src_test() {
-	make check || die "make check failed"
-}
-
-python_install() {
-	local CMAKE_USE_DIR="${S}"
-	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
-	DESTDIR="${ED}" emake VERBOSE=1 install
-	popd >/dev/null || die
-
-	python_optimize
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_foreach_impl python_install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
-
-	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
-
-	fowners -R ceph:ceph /var/log/ceph
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}"/sysctld 90-${PN}.conf
-
-	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
-
-	# units aren't installed by the build system unless systemd is enabled
-	# so no point installing these with the USE flag disabled
-	if use systemd; then
-		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
-			"ceph-mds@.service"
-
-		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
-			"ceph-osd@.service"
-	fi
-
-	udev_dorules udev/*.rules
-
-	readme.gentoo_create_doc
-
-	python_setup 'python3*'
-
-	# bug #630232
-	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
-		|| die "sed failed"
-
-	python_fix_shebang "${ED}"/usr/{,s}bin/
-
-	# python_fix_shebang apparently is not idempotent
-	local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
-	grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
-		| xargs --null --no-run-if-empty -- sed -i -r  "s:${shebang_regex}:\1:" || die
-
-	local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
-	dostrip -x "${rados_classes[@]#${ED}}"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/sys-cluster/ceph/ceph-14.2.7.ebuild b/sys-cluster/ceph/ceph-14.2.7.ebuild
index a1ec2d75760f..971298be9bf5 100644
--- a/sys-cluster/ceph/ceph-14.2.7.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.7.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm64 ~ppc64"
 fi
 
 DESCRIPTION="Ceph distributed filesystem"
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index bfe29300a4e7..472c6d9547ce 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -4,8 +4,8 @@ AUX charliecloud-0.9.10-fix-hardcoded-gcc.patch 708 BLAKE2B 78b73bf527f7d9be0aa9
 DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
 DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
 DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
-EBUILD charliecloud-0.10.ebuild 1512 BLAKE2B 786ab44a7afdecfd9ed124bf15d464336090bf2550e40fae5446591f5fc205f77f35ee6515c21cebbf9750438472267a32e7036f726a54930ab8b40fb5e12990 SHA512 32209c6cd04145740ea14f21a902b5fd2ae0d685e9b9e01defbf10f11e61dcdd2537fc6c13a79302d39668208793f8dfe8b7f0091cd4922f6d38855bfcbfabd1
-EBUILD charliecloud-0.9.10.ebuild 1507 BLAKE2B 9a6d834c063198c140d30d7f39f28f429ca8720dbb882bc5fb920e7bda1c90c7469f73164335bd9f44bfa38be89507e4a9bf5a4f0c4a05b4efd3ae205515539f SHA512 dbf662098d89e8019e6bfff2876a49cd453cfbac484d192b0f1f33ea571f54e7b8404e85d959a8b4aa5e7c50a5a296bc03065a6a43c55ef9055c447406a2502d
+EBUILD charliecloud-0.10-r1.ebuild 1559 BLAKE2B e33fd6a6dcd8bf6823e9d79a005050c56ff40f4d86a63805997f15c0b2620fea00b726a9734f7c2d6ccc97132b3f83990a6cb5a3d5e16090f51ac8c4e7ba4a35 SHA512 c04634bbaa51798f5d969657608f11008af026781d6eddd1350bd98415dc38d5dadb4aff252fdfdbc3073b72a29e46209c2792675414749649ce8befd2ead13d
+EBUILD charliecloud-0.9.10.ebuild 1554 BLAKE2B a5255254ef542ed3ac8d2233af32dffb2be2cf75578891ca66ecac4283657bb453d7fbbd50914f93399d996cafe6694f4efab855bf5a151f5db0225cded66e7d SHA512 a44da8749ee859b459a211d92838d8e5886eeb58e8927d44c9014d0c15a24d20d2531c0a994ecf9513ef509cafb1d8086e5ab556f8549c46731534d4bd28d674
 EBUILD charliecloud-0.9.6.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344
-EBUILD charliecloud-9999.ebuild 1379 BLAKE2B f020986c8158d6575b0431027aad64626306048d1df6373facd3177a71a6da7dd96a852fcd45e8c63d68c2e13bde38f3f1a853c03f07ef30cea20b5ba1002f72 SHA512 d2a449c6317b29ecb98733bbddfec19f54ea46971fa6df16d9129f12bdadf0cb858da1766ab5f2fd7ebe4a73b80693f7c168a5d26fb78ff787444749f1df620d
+EBUILD charliecloud-9999.ebuild 1426 BLAKE2B 15d6b088b608f19fea30aec3ae1e81f6c26a7da0e36c2dba234754fcfc8c51a19b90d6e33c27b249984f2217a965ed9699816b2c5356ea8341ce805eedd20835 SHA512 ffddb1be0a052eddc178cf50c587c1f966e18ff88d78089702f5e7f996e481e482f3612517cf0c4f8fc15116f20b73e4cdb72f2e47e8b1804f5cba1f57fe3d48
 MISC metadata.xml 782 BLAKE2B 8eb3cbbd39486b78ffaf3b932804536d900cbbded17dc41437bece7f47f6edbe8fe76d99b695f220c7477356e93ffad16a137a902a026ded8ab5098b7a44ade6 SHA512 775f7de9e4f296a5d13bf66df50b935866d4ca87b2d13678ba03ee5ee72f2740d17c9c2ba69e221efef7ca4038129d7704f1e13c738227e87cd7b869cd7d63db
diff --git a/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
new file mode 100644
index 000000000000..b1560f0ec968
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="doc examples +pv squashfuse"
+
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	pv? ( sys-apps/pv )
+	squashfuse? ( sys-fs/squashfuse )
+"
+DEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
+		net-misc/rsync
+	)"
+
+PATCHES=(
+	# See upstream bug: https://github.com/hpc/charliecloud/pull/481/
+	"${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
+)
+
+src_compile() {
+	emake
+	use doc && emake -C doc-src
+}
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}"
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	einstalldocs
+}
diff --git a/sys-cluster/charliecloud/charliecloud-0.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.10.ebuild
deleted file mode 100644
index 8705c0ed4ae3..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.10.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc examples +pv squashfuse"
-
-# Extensive test suite exists, but downloads container images
-# directly and via Docker and installs packages inside using apt/yum.
-# Additionally, clashes with portage namespacing and sandbox.
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	pv? ( sys-apps/pv )
-	squashfuse? ( sys-fs/squashfuse )
-"
-DEPEND="doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		net-misc/rsync
-	)"
-
-PATCHES=(
-	# See upstream bug: https://github.com/hpc/charliecloud/pull/481/
-	"${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
-)
-
-src_compile() {
-	emake
-	use doc && emake -C doc-src
-}
-
-src_install() {
-	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}"
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	einstalldocs
-}
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
index d86e0f7345fe..042093fc1081 100644
--- a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
@@ -33,9 +33,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	pv? ( sys-apps/pv )
 "
-DEPEND="doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+DEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
 		net-misc/rsync
 	)"
 
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 4b1d34753150..c838d73e90e9 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -34,9 +34,12 @@ RDEPEND="${PYTHON_DEPS}
 	pv? ( sys-apps/pv )
 	squashfuse? ( sys-fs/squashfuse )
 "
-DEPEND="doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+DEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
+		')
 		net-misc/rsync
 	)"
 
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index b465cabe7d33..aaa228389a41 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,11 +1,8 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-15.0.0.tar.gz 5515047 BLAKE2B c7b62dc424bda2a86b9369f283fae4d891f55922228dc2c05206cee67bb7553b75b98e86f8d90035d0566baddad28a76aa4ca454fb4e003eaff346d2bb49a699 SHA512 f80705782976ec778681ef65f5da79ee2028a8dccbe9a14150b3577354882beedbde73f562b40ec395427e23766688299e07bf173476627c579bc812eec065fa
 DIST cinder-15.0.1.tar.gz 5516811 BLAKE2B 081b3a6175303c783ff23122d409814812fdab2a7955174cd90b57ea62c055c1e39936d8e8a38e21fc2820e7069e0afc91fa46a490f539f518f33302067b4acd SHA512 7a63f25bcd6beedc60bb4a6b976d8b1f862b445a6d858e2fbbf53f4ff425d8bee094af354883a46c6226349d7557d45a649cd745e79a445e32b759b24294116f
-DIST cinder.conf.sample-15.0.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-15.0.1 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
 DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
-EBUILD cinder-15.0.0.ebuild 7778 BLAKE2B 5019af30bc8b195694bb1c3d0a85f1636466ffe680daf3464097feb8dd4a95b34f0bd02d81543c185942c5f35ced18a71c530de69e413b5f3b780c7758203439 SHA512 a9589470aa830ec490ec66cc69156fbf3a6f6a383736ada769c524b3b5fb413d2a3f337d19ef9d7e3412a4e1dc58bbbd96c61d7c8d24a92de087ebd156507d02
-EBUILD cinder-15.0.1.ebuild 7780 BLAKE2B 1468810068a386b70a3622e39c65e1161034d5a80a024b74c913d9cbf9657073abe86122f53112ec0af97ca70278788ca4639c7209002cd1a1e41daddba03c91 SHA512 856bfa4fd74f451a7ed0b9a4ad2cf163b1c1b2bc8435c9b9fe549b8cbe68d51984ebc66856b03e4cd827f19f57aeec5607df6f6cd7f8f81870984e189b42ea8e
+EBUILD cinder-15.0.1.ebuild 7778 BLAKE2B 5019af30bc8b195694bb1c3d0a85f1636466ffe680daf3464097feb8dd4a95b34f0bd02d81543c185942c5f35ced18a71c530de69e413b5f3b780c7758203439 SHA512 a9589470aa830ec490ec66cc69156fbf3a6f6a383736ada769c524b3b5fb413d2a3f337d19ef9d7e3412a4e1dc58bbbd96c61d7c8d24a92de087ebd156507d02
 EBUILD cinder-2019.2.9999.ebuild 7731 BLAKE2B 390a9626e7df1d9195ad89d6ceea5406393ec7e0c2f730bde0b4463a0b09ab44e9f82c086535552c8e1064091a58f7b61cef52836bb90d4b29292fea9b5756d7 SHA512 2a0edb351aa45f6a0668b211d42b4aabc854cccc03a73b13b19ebe2580fc6251cf295373128a5df2e5cee41572d2db70ea1716c156d78262bb64e533248b8f9d
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-15.0.0.ebuild b/sys-cluster/cinder/cinder-15.0.0.ebuild
deleted file mode 100644
index 023a076b4f1c..000000000000
--- a/sys-cluster/cinder/cinder-15.0.0.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}"
-	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/train"
-else
-	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	# only used for docs
-	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-	# stupid python
-	rm -r "${ED}"/usr/etc
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-15.0.1.ebuild b/sys-cluster/cinder/cinder-15.0.1.ebuild
index 380941c5f784..023a076b4f1c 100644
--- a/sys-cluster/cinder/cinder-15.0.1.ebuild
+++ b/sys-cluster/cinder/cinder-15.0.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 732bfb87454a..a3d45e1a5b2a 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -8,10 +8,10 @@ DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5
 DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115 SHA512 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f
 DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976 SHA512 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52
 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03
-EBUILD galera-25.3.25.ebuild 1917 BLAKE2B a79f4254ba6fa85f555c32516c4cbec40cf38dca8cf13185ff466c4c957ac9495810a772ca4f72d38b73fa54c7734166eb56ba8abeaa62caae633c674a5dfdf0 SHA512 cb716fd80c6990d243aa60d3bab6db7e6a11e8da16c55be063e159e401b98d13a3ec348f13852ba23a4063ec1320c3f9a6846c60753a805c9b40cf21ddaa1149
-EBUILD galera-25.3.26.ebuild 1936 BLAKE2B 05e4b45bfb16388643d411874850d4ac55dbf7ce55e260eee06aef13d764a955342cb5266a34ed9f341170affaf49d7b72319efc8fb651c6546b5eea1605fa9b SHA512 07412b9dfdaeb17dff32c3292bb67d79a86befc325b8c782bdd6748bec0ae43f1a181624d03d245bc824241aa6ae56174970b4a4e16354b647f199587db17ce1
-EBUILD galera-25.3.28-r1.ebuild 1791 BLAKE2B 2f7995bc41249985feb8d7615c2a445995573c3e319f39df3ca73adeae6215547a8c1a452ad7ab4b1261b9f13f16a06c7331c137210dcdca57c0700f83f19114 SHA512 3bee479b7b683259e18a4c90a7b928b0117e780905218b0a5e0becb2a26f49cfb7074fb37260468111b86c58a09befd44479d1b8ff4c98fbaa8a182e21493a71
-EBUILD galera-25.3.28.ebuild 1936 BLAKE2B 2429f091fd2148dc1ddab4ebbea33716a5587b2e5fbe1db7f3e468445f58e5b4e18d8c4681ebd69309c5465799f156b0b0ab4515738eb4dcf681abe90664a370 SHA512 dabe8571df02ac88647ec2339235414642338dd63e083d879abb5f7f9ba54530b9ef8d38a737f82ce5a2be74b5c08c000f8ead68a4729362a3151beae15ee24e
-EBUILD galera-26.4.2.ebuild 1890 BLAKE2B 64797d6bef6c10c7caa64378751ce0c8c5e95729a796d6d180edccafb82902a781b2da6c855c8e5839b72773bf5f713d8fdced4d312ad489ce60f828fe0ca909 SHA512 3f5be0efb37f17f592a315274eef85a9dd3328b6473834a39a39575e7ad029ef75671a748b954ce0943d31498fb88bf4a0edaf42f5df4b3371bd3a44e044da99
-EBUILD galera-26.4.3.ebuild 1794 BLAKE2B de91252646af1c30448a7a82712aec4f3638c76d99a6a90eb8bc3436c7ae7f3bdb1989d209647168e3404800d91f226bf9887496c7accfc6cc59c62eff124fd3 SHA512 9f9624415793179aebc61bea4e7697f6ccb90f23e37be85eebbdfbd1acef6f86cafcfd90ec84e3bf75a76c296859720d181c02607c8fd67cd9cb1635490f4bcb
+EBUILD galera-25.3.25.ebuild 1911 BLAKE2B 044f49f0ddca4082656e49b16ae7205cf9764283f4e125f65d8dcd1ee6625a24c2d4de952900305827588a90ea395abc07b2a00ce0eac29d8b14991fc3ae1f19 SHA512 5ed799b7485d49ca76e0d3b1d0dfc18bb3bf23d94cc5b729cb7311b5353b691b8c9e1445fa86dbf548453681619322cb380b0c9cafc5ca0f51f2bf37281395ee
+EBUILD galera-25.3.26.ebuild 1932 BLAKE2B 7b8ba8da617cb4c0ef8d74d72f15769eaaa674fbc0da07f81268b8c67155fea1cabd8d8666bd55e2b5c5a7e70b63e06480011f9164977ede0d2cc26409abf8cf SHA512 9c595718ba6e8813cb16e3cc758c8d8f64d4f088ebf36c2ff78b5815a1be5555198f5225cbae2a11b3c4a8d21d95d6a4b24da0705635ca5a9119148a9f16090f
+EBUILD galera-25.3.28-r1.ebuild 1786 BLAKE2B a064ec5c6e173f43e54535ee88c7732b1459b68a3e3dcf47dc3034e1988b3bbbe3d568dfb1dfd01026ba98e42341bb0ff9bf785a2adad8428840669ca2bd9353 SHA512 132d907d22de6a25cfcd84a12371cb8c79748dba5ee17335b18c89aeb6a481029209eab6ecf00d8a7952d6b4a64d602a5f8bdb7911fadddea0c7684b5716b568
+EBUILD galera-25.3.28.ebuild 1932 BLAKE2B 429c0365de384c20d4004f555f3b18230c9272631cbd77e964cd07666362806b5faed1a5e26cabcc4627893f1a6daa2910a8f150fa2fcd9fe8987325a2dae11d SHA512 7509ef4e83f1e2f5c39366d66583082c83bcccc2f0218f94e4f6745e9080193850d82ca60882727f694196eade5370ef827db0c20e387a3890c0c649748a3fe4
+EBUILD galera-26.4.2.ebuild 1886 BLAKE2B 0a118cbbc699ae1023eb65283ac6c7c76c954c465c67fe49d0069e1362571639ef2c6c5de524627fa6a17d0d2bbc8967abd27cec5a4d6bc62c323ee0dfe2b73e SHA512 9b3ef59bce28519e85c505c65899064eeba3cc0f7ef8bb00f5c4062487fe907278c32805169ef53088d0b777f3c287d2cd2fa5a5c540272f784483fe2768eb61
+EBUILD galera-26.4.3.ebuild 1790 BLAKE2B 455e88d86919e56823b52eb750072b45919efa1a7e274db4313d162e2ff9c54265268c002317d7f23eb0a937559cb100a0b2776a99a685eea5fcee76414eddba SHA512 82751b9c0c2270bbd2557efe9be0924ac3dcde05ccc32d1645e5f8430effa36bb8754309d51a1cead442d0f08ba911b9933c87747f2e57d6ee0d7b58c668c686
 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2
diff --git a/sys-cluster/galera/galera-25.3.25.ebuild b/sys-cluster/galera/galera-25.3.25.ebuild
index c1c8faac6bed..09aa81a6ffac 100644
--- a/sys-cluster/galera/galera-25.3.25.ebuild
+++ b/sys-cluster/galera/galera-25.3.25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 MY_P="${PN}-3-${PV}"
 
diff --git a/sys-cluster/galera/galera-25.3.26.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild
index b5ffbd5c1026..e8c4120483bf 100644
--- a/sys-cluster/galera/galera-25.3.26.ebuild
+++ b/sys-cluster/galera/galera-25.3.26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 MY_P="${PN}-3-${PV}"
 
diff --git a/sys-cluster/galera/galera-25.3.28-r1.ebuild b/sys-cluster/galera/galera-25.3.28-r1.ebuild
index 068b38353f16..f3c043e52404 100644
--- a/sys-cluster/galera/galera-25.3.28-r1.ebuild
+++ b/sys-cluster/galera/galera-25.3.28-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
 IUSE="cpu_flags_x86_sse4_2 garbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-cluster/galera/galera-25.3.28.ebuild b/sys-cluster/galera/galera-25.3.28.ebuild
index ba57a09fea77..ef4d202bc320 100644
--- a/sys-cluster/galera/galera-25.3.28.ebuild
+++ b/sys-cluster/galera/galera-25.3.28.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 MY_P="${PN}-3-${PV}"
 
diff --git a/sys-cluster/galera/galera-26.4.2.ebuild b/sys-cluster/galera/galera-26.4.2.ebuild
index d523af7c34e9..459781b25ea6 100644
--- a/sys-cluster/galera/galera-26.4.2.ebuild
+++ b/sys-cluster/galera/galera-26.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic
 
diff --git a/sys-cluster/galera/galera-26.4.3.ebuild b/sys-cluster/galera/galera-26.4.3.ebuild
index c5f610e33cc1..403fe64247e4 100644
--- a/sys-cluster/galera/galera-26.4.3.ebuild
+++ b/sys-cluster/galera/galera-26.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 843b4db9bc1f..3dd106b561ba 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -3,6 +3,7 @@ AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae66574
 AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24e0cf802196d6ee4898a77f7a6950e2c1971550deddc7ff232dab021b4bfcb962f4544fa6bebba314b07942228298a5c38758c38442 SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db
 AUX glusterfs-4.1.0-silent_rules.patch 500 BLAKE2B bd6812be1059f04bcb34e9408b6ef24f6bd0992cc432ff22da9f21970e11dd5394e1421a6967cae6c026207dcf1d7ae591afaa06e4a25a62c0e79f7f679cd22e SHA512 1cbdfd9f04a917387f0b3299f3ab04074c34e5a4911642ccf4274f1270a97acbf0e27f89c89ce6a1cd2e26238761f956cd1dfa3033d763ead32b0d0fd92a0798
 AUX glusterfs-6.7-fix-rebalance-crash.patch 5861 BLAKE2B caaf103b10d18e4540ab1e516f5ee06aeeb418e12a570d9f4df7c1952302a2035b8ead11fee17d2d797e5872e977ebd8c124aa8bdda26e28a23e8a4173338222 SHA512 149bc10d47424bc40e55cb4053ab251adf88f890a6e4e2e03cddbb23fe411b9d1621fe183b8e09acd36d7945827f85eefcc83c58b01d27f988d6e88bdb1bcafd
+AUX glusterfs-6.7-fix-seek.patch 1247 BLAKE2B 77ede2514e3afcca12a0d2fef7d24ed66924ffe9ff804bbd48b56a04f27268b8b09471368afaececf9c6c7a304889c5f5271207442ff134d0ad215b46ac2ddf7 SHA512 839eb1d2bb87cae9adbfcc1f81c6187697e0b9c69fcd4c6aea9182c45fef09e3fe3ed3be210c8321a4530f4b9a6a140429ca2437bf5daf8357518ac1732f8434
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
@@ -13,7 +14,7 @@ DIST glusterfs-6.7.tar.gz 7565257 BLAKE2B bb38383cad0cbf890b89dd75f7b260d21b381a
 DIST glusterfs-7.2.tar.gz 7630773 BLAKE2B abceafd06ca8f5de1c84708a1a3ec4453c5d536d8811b773fa6f5dd02d6e3d450c329bc4d0fa32d970ff57e82a1fe3aa48ec9c3a7d3d5ca5817a91e8930b1b6e SHA512 fd1059222c4d30fa5c4011083c3c53af44433180ae124c884a774628051d31d95386bef71d4d25ed2b0c5dd8d9a6936601e8e37d963b34d291cb88ea45e31ff2
 EBUILD glusterfs-4.1.8.ebuild 6785 BLAKE2B 1daf6faa219ec1c64fe661f068aadd6d7735c029f2692cba1f4ce84abe40a7f2defa29bcdbe84f962fc59b805124c5d252be2909afb946e086bc52a3137d347d SHA512 d0a7aaec14523e68ed676ef461bd59ff73de94e40f197a64d9a24b71a98949915327b7732637a57b6138e8171b402d851969732fda9039a255ac9696aa554976
 EBUILD glusterfs-6.5.ebuild 6223 BLAKE2B a708adff12d8467555d22e8652bfc30ad538a00b9ff0bbb3e0379ec9eaee1dc41d6b00432ab63ad0e4fea9c181ec8fd17a6d7013c82410ca7f31b484a171f4cc SHA512 2c2a011e1e96e07a057f04e16a0296f93ffce38aa25c87312682f3f605c66ed3a9fb7c528c86eb11163249ebeb7080acc03eef7c151aa85f587b1a29e67acbb2
-EBUILD glusterfs-6.7.ebuild 6343 BLAKE2B 96c3f8481e64de65ed72e8c0f7efcd16af5df450246ee0ae4d32afb6d82dee2f3ada4e0770793042df65a2fc692deaa4b568d9a0b9e88ab4e43acc97f1cbd64b SHA512 e9c5c53b5aa9f033ba563b9475de2600ff0baa06029ff9e2bc51932952b3dd5b4bb2e7116766e86b7d5262b8f3d3b9a8193a608a502cd6d4b6295062fa4d91be
-EBUILD glusterfs-7.2.ebuild 6225 BLAKE2B 9d5b56203bafea2898e70663c1cd58c36f9ce3d1d775303e9f98634af153bdab042605967c7fd99ed7e2403c3b80d413411af3fa4c79e28fd523a63d9ee0f2c9 SHA512 ceecd841ec42ecca2ce9985a302538edd2a4fad13993336f0477f985a54e13f5d6b4a9a89788dc19186d13af7be8034ddee9ffb069cc8ef9c2fa1d0c95dbccb9
+EBUILD glusterfs-6.7-r1.ebuild 6484 BLAKE2B 8fe0924b0de96f68c70becf17ee2ffeb094f3e00d14ebcb527efc45aa251f59961a255de9039e502480af601e71acc110ebb173ef3a403197b99ab1a0ad0b2e1 SHA512 c20d29404d857d0bd12e822e374c5b29adede828098ac0bd692f70fda52d51d172edf054e437bcf52a5bff2b2d77ac2218c1b66518693ba622ed9b740811099c
+EBUILD glusterfs-7.2-r1.ebuild 6366 BLAKE2B f2b859dd7fc0c3f278943918b8e75d31a42045b03cc1f09aa104799371f727254ffc9e3c6831005f5f4b1cef1de3e25fc3dbedb6019f3b3cddf69f297f9fd4c5 SHA512 4cac260a0b364dfe051dceb9acfac86b84e24aef5a28c63c9b53fcda233e2dd158a185f48c3bcbcb3033ac109727eea0c9cc70b36c8f20a28f1594aa57133e8f
 EBUILD glusterfs-9999.ebuild 6789 BLAKE2B a803818430d7faca876f1db48f7082fba1560a9fc539303a1ec7b8154ba0b43716a76f415ac11fde898780afac2469d7b73c28115a6b2a832c1cea8486874ff0 SHA512 3355f1533d7a3a8e8b9ad437c077172a0285e2d0911fdcdf8efab75ab65785671699a26d744ed62cd4f1487678353fe7ccfda55496bd72f209a542dd6a60b0ae
 MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043
diff --git a/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch b/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch
new file mode 100644
index 000000000000..07d1ecef0376
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch
@@ -0,0 +1,45 @@
+diff --git a/xlators/performance/open-behind/src/open-behind.c b/xlators/performance/open-behind/src/open-behind.c
+index 70a144abb5..95e00dbd79 100644
+--- a/xlators/performance/open-behind/src/open-behind.c
++++ b/xlators/performance/open-behind/src/open-behind.c
+@@ -708,6 +708,32 @@ ob_fstat(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
+     return 0;
+ }
+ 
++int
++ob_seek(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
++        gf_seek_what_t what, dict_t *xdata)
++{
++    call_stub_t *stub = NULL;
++    fd_t *wind_fd = NULL;
++
++    wind_fd = ob_get_wind_fd(this, fd, NULL);
++
++    stub = fop_seek_stub(frame, default_seek_resume, wind_fd, offset, what,
++                         xdata);
++
++    fd_unref(wind_fd);
++
++    if (!stub)
++        goto err;
++
++    open_and_resume(this, wind_fd, stub);
++
++    return 0;
++err:
++    STACK_UNWIND_STRICT(fstat, frame, -1, ENOMEM, 0, 0);
++
++    return 0;
++}
++
+ int
+ ob_flush(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata)
+ {
+@@ -1256,6 +1282,7 @@ struct xlator_fops fops = {
+     .flush = ob_flush,
+     .fsync = ob_fsync,
+     .fstat = ob_fstat,
++    .seek = ob_seek,
+     .ftruncate = ob_ftruncate,
+     .fsetxattr = ob_fsetxattr,
+     .setxattr = ob_setxattr,
diff --git a/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild
new file mode 100644
index 000000000000..d36a647109cf
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools elisp-common python-single-r1 systemd user
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	xml? ( dev-libs/libxml2 )
+	sys-libs/readline:=
+	dev-libs/libaio
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	virtual/acl
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+
+	# Needed for statedumps
+	# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
+	enewgroup gluster
+	enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster
+}
+
+src_prepare() {
+	default
+
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1786983
+	eapply "${FILESDIR}/glusterfs-6.7-fix-rebalance-crash.patch"
+
+	# https://bugs.gentoo.org/705536
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1793990
+	eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch"
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am |
+		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-silent-rules \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/glusterfs/glusterfs-6.7.ebuild b/sys-cluster/glusterfs/glusterfs-6.7.ebuild
deleted file mode 100644
index 9bb5a61620be..000000000000
--- a/sys-cluster/glusterfs/glusterfs-6.7.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools elisp-common python-single-r1 systemd user
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="!elibc_glibc? ( sys-libs/argp-standalone )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	xml? ( dev-libs/libxml2 )
-	sys-libs/readline:=
-	dev-libs/libaio
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	virtual/acl
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-
-	# Needed for statedumps
-	# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
-	enewgroup gluster
-	enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster
-}
-
-src_prepare() {
-	default
-
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1786983
-	eapply "${FILESDIR}/glusterfs-6.7-fix-rebalance-crash.patch"
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-silent-rules \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild
new file mode 100644
index 000000000000..d122e64c2265
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools elisp-common python-single-r1 systemd user
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="https://www.gluster.org/"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
+
+# the tests must be run as root
+RESTRICT="test"
+
+# sys-apps/util-linux is required for libuuid
+RDEPEND="!elibc_glibc? ( sys-libs/argp-standalone )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	fuse? ( >=sys-fs/fuse-2.7.0:0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
+	libtirpc? ( net-libs/libtirpc:= )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+	xml? ( dev-libs/libxml2 )
+	sys-libs/readline:=
+	dev-libs/libaio
+	!libressl? ( dev-libs/openssl:=[-bindist] )
+	libressl? ( dev-libs/libressl:= )
+	dev-libs/userspace-rcu:=
+	net-libs/rpcsvc-proto
+	sys-apps/util-linux"
+DEPEND="${RDEPEND}
+	virtual/acl
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	test? ( >=dev-util/cmocka-1.0.1
+		app-benchmarks/dbench
+		dev-vcs/git
+		net-fs/nfs-utils
+		virtual/perl-Test-Harness
+		dev-libs/yajl
+		sys-fs/xfsprogs
+		sys-apps/attr )"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	python_setup "python3*"
+	python-single-r1_pkg_setup
+
+	# Needed for statedumps
+	# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
+	enewgroup gluster
+	enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster
+}
+
+src_prepare() {
+	default
+
+	# https://bugs.gentoo.org/705536
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1793990
+	eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch"
+
+	# build rpc-transport and xlators only once as shared libs
+	find rpc/rpc-transport xlators -name Makefile.am |
+		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
+
+	# fix execution permissions
+	chmod +x libglusterfs/src/gen-defaults.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-silent-rules \
+		--disable-fusermount \
+		$(use_enable debug) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable georeplication) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable static-libs static) \
+		$(use_enable syslog) \
+		$(use_enable test cmocka) \
+		$(use_enable xml xml-output) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
+		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
+		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
+		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
+
+	if use rsyslog ; then
+		insinto /etc/rsyslog.d
+		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	# insert some other tools which might be useful
+	insinto /usr/share/glusterfs/scripts
+	doins \
+		extras/backend-{cleanup,xattr-sanitize}.sh \
+		extras/clear_xattrs.sh \
+		extras/migrate-unify-to-distribute.sh
+
+	# correct permissions on installed scripts
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
+
+	if use georeplication ; then
+		# move the gsync-sync-gfid tool to a binary path
+		# and set a symlink to be compliant with all other distros
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
+
+	# QA
+	rm -r "${ED}/var/run/" || die
+	if ! use static-libs; then
+		find "${D}" -type f -name '*.la' -delete || die
+	fi
+}
+
+src_test() {
+	./run-tests.sh || die
+}
+
+pkg_postinst() {
+	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
+	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
+	elog "  /etc/init.d/glusterd start"
+	echo
+	elog "For static configurations, the glusterfsd startup script can be multiplexed."
+	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
+	elog "separate service.  To create additional instances of the glusterfsd service"
+	elog "simply create a symlink to the glusterfsd startup script."
+	echo
+	elog "Example:"
+	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
+	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
+	elog "You can now treat glusterfsd2 like any other service"
+	echo
+	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
+	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
+	ewarn "run GlusterFS."
+	echo
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/sys-cluster/glusterfs/glusterfs-7.2.ebuild b/sys-cluster/glusterfs/glusterfs-7.2.ebuild
deleted file mode 100644
index 27be5d5543a4..000000000000
--- a/sys-cluster/glusterfs/glusterfs-7.2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools elisp-common python-single-r1 systemd user
-
-if [[ ${PV#9999} != ${PV} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
-	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="!elibc_glibc? ( sys-libs/argp-standalone )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	fuse? ( >=sys-fs/fuse-2.7.0:0 )
-	georeplication? ( ${PYTHON_DEPS} )
-	infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
-	libtirpc? ( net-libs/libtirpc:= )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-	xml? ( dev-libs/libxml2 )
-	sys-libs/readline:=
-	dev-libs/libaio
-	!libressl? ( dev-libs/openssl:=[-bindist] )
-	libressl? ( dev-libs/libressl:= )
-	dev-libs/userspace-rcu:=
-	net-libs/rpcsvc-proto
-	sys-apps/util-linux"
-DEPEND="${RDEPEND}
-	virtual/acl
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	test? ( >=dev-util/cmocka-1.0.1
-		app-benchmarks/dbench
-		dev-vcs/git
-		net-fs/nfs-utils
-		virtual/perl-Test-Harness
-		dev-libs/yajl
-		sys-fs/xfsprogs
-		sys-apps/attr )"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-#   if the argp.h header is found in the system. Which should be the case with
-#   glibc or if argp-standalone is installed.
-
-pkg_setup() {
-	python_setup "python3*"
-	python-single-r1_pkg_setup
-
-	# Needed for statedumps
-	# https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
-	enewgroup gluster
-	enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster
-}
-
-src_prepare() {
-	default
-
-	# build rpc-transport and xlators only once as shared libs
-	find rpc/rpc-transport xlators -name Makefile.am |
-		xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
-	# fix execution permissions
-	chmod +x libglusterfs/src/gen-defaults.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-silent-rules \
-		--disable-fusermount \
-		$(use_enable debug) \
-		$(use_enable fuse fuse-client) \
-		$(use_enable georeplication) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable test cmocka) \
-		$(use_enable xml xml-output) \
-		$(use libtirpc || echo --without-libtirpc) \
-		$(use ipv6 && echo --with-ipv6-default) \
-		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
-	default
-
-	rm \
-		"${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
-		"${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
-		"${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
-	if use rsyslog ; then
-		insinto /etc/rsyslog.d
-		newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
-	fi
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
-	fi
-
-	# insert some other tools which might be useful
-	insinto /usr/share/glusterfs/scripts
-	doins \
-		extras/backend-{cleanup,xattr-sanitize}.sh \
-		extras/clear_xattrs.sh \
-		extras/migrate-unify-to-distribute.sh
-
-	# correct permissions on installed scripts
-	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
-	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
-	if use georeplication ; then
-		# move the gsync-sync-gfid tool to a binary path
-		# and set a symlink to be compliant with all other distros
-		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
-		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
-	fi
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
-	newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
-	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
-	# QA
-	rm -r "${ED}/var/run/" || die
-	if ! use static-libs; then
-		find "${D}" -type f -name '*.la' -delete || die
-	fi
-}
-
-src_test() {
-	./run-tests.sh || die
-}
-
-pkg_postinst() {
-	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
-	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
-	elog "  /etc/init.d/glusterd start"
-	echo
-	elog "For static configurations, the glusterfsd startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
-	elog "separate service.  To create additional instances of the glusterfsd service"
-	elog "simply create a symlink to the glusterfsd startup script."
-	echo
-	elog "Example:"
-	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
-	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
-	elog "You can now treat glusterfsd2 like any other service"
-	echo
-	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
-	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
-	ewarn "run GlusterFS."
-	echo
-	elog "If you are upgrading from a previous version of ${PN}, please read:"
-	elog "  http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 0b437887097d..61e4a9bc6839 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,4 +1,4 @@
 DIST hpx_1.2.1.tar.gz 3919474 BLAKE2B 5f62f97a047c1b931068b671855bc9d7b8ff03d7f26793ee58445fb4c567d68c6c24c87844c7a6463901d784e11afe475120a41038e783a67cc75ede508473c5 SHA512 057724de1ef252e941a776174fa594a855255b5600461725a4da6e9002b1424a1e59be3f8a40673bb3db5a8aabd3c7b38abbb78042490befe247dd73c921b87c
-EBUILD hpx-1.2.1.ebuild 1831 BLAKE2B 395c62c2cab7bc309ec4cc6ce05090d80b74a8db7f7095d4ccff500baa72cc81cfcc2725ca6f9a1d4e0b34f2693dae72785d3b92d95530d709e19e8f860669a6 SHA512 72f74a38132344cc847c1058225bbf6d1c7fabf96f493bbd762a8994b7efaf45ded1ba0756049f36b467c1ed68e2ac8018df4e416b68d19365d10b9c5526b873
-EBUILD hpx-9999.ebuild 1831 BLAKE2B 395c62c2cab7bc309ec4cc6ce05090d80b74a8db7f7095d4ccff500baa72cc81cfcc2725ca6f9a1d4e0b34f2693dae72785d3b92d95530d709e19e8f860669a6 SHA512 72f74a38132344cc847c1058225bbf6d1c7fabf96f493bbd762a8994b7efaf45ded1ba0756049f36b467c1ed68e2ac8018df4e416b68d19365d10b9c5526b873
+EBUILD hpx-1.2.1.ebuild 1825 BLAKE2B e457a6e33e0aa9a5101a29435d696672489d3ffe2ea4378d74a9b767c34fcd801c2f63646fae744fafd7cbcdc92ce076eb11df2a79013007d40d707a24edfb5e SHA512 d52f213519a7a9282e83e819e58ed2df0331527b1f4339d3e79e124126a4a19d657387c01468508c08a1c38d3c7af2651166507105921aad1079db7da2f40dd9
+EBUILD hpx-9999.ebuild 1825 BLAKE2B e457a6e33e0aa9a5101a29435d696672489d3ffe2ea4378d74a9b767c34fcd801c2f63646fae744fafd7cbcdc92ce076eb11df2a79013007d40d707a24edfb5e SHA512 d52f213519a7a9282e83e819e58ed2df0331527b1f4339d3e79e124126a4a19d657387c01468508c08a1c38d3c7af2651166507105921aad1079db7da2f40dd9
 MISC metadata.xml 964 BLAKE2B 0f71483979af41ebf24ccf4a7b547048aaa6198d638b04963303cdbe0b3b7b86a66ff13dadaac501fcbb3c7992e3bdebffebcfbd3d82bad0fe5890e89d581b9f SHA512 2c80ae2fd03aebaa25fa19592b6f84cd343cc6c2733dde34023800805987ae91024d36b2c3246c449acdb0be18154648bc571328bb8acb8f561afc149666bf8e
diff --git a/sys-cluster/hpx/hpx-1.2.1.ebuild b/sys-cluster/hpx/hpx-1.2.1.ebuild
index 40cfca820e39..d075974e0bd9 100644
--- a/sys-cluster/hpx/hpx-1.2.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 40cfca820e39..d075974e0bd9 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index c6ee7e674df4..6cc1add96d91 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -93,7 +93,7 @@ DIST github.com-ulikunitz-xz-v0.5.5.tar.gz 477164 BLAKE2B 505d5dfa38cc36ce9a9ec7
 DIST minikube-1.0.1.tar.gz 11206771 BLAKE2B 3aae096cd0998405ae30e1db699fd51330e82c13ebbf05283e5ead25918bfdd52c352fb8385caf7ef74b45fb94f63ddf2fa64c96cba79be59703cf0579e79e39 SHA512 41855aec3b159ddc8f6e89b9a8a63179edf21d3078040ccda56994aab8ce7b57f6a989d63b8b75c92698f2bbec8c128980b7f2268c793157f67f245625e07780
 DIST minikube-1.6.1.tar.gz 78447692 BLAKE2B 16ee3d0f9dfc90f20723ae9ef33a36cbfa02de0f00d973f34c2e39872d6b954d5909c1aa534bb690b00ace0bdd4207986f022c796dfff20f776d12a13796bc96 SHA512 00da5047404abd631e08046a9e285d8009465b3cfa18c4e238bd5a6549714fb21f19864fcb68973e9a317f03a270158b90c36c0601316605edf2ecf93175b12e
 DIST minikube-1.6.2.tar.gz 78450821 BLAKE2B 05efb671bebf197fa4942c578585583476c2550dd3f3dc7804bdd836f5b2cb38864ab39d267d968ace2b816220e7d45b40b7367782e8c1eb4755679c91a8f3d6 SHA512 40af184878e812defecf48308c1ce3a702415985e5e7dfde37d61fe3413bee5e986ecf4a873aa66f11faae733f8afa8c64e3b0122f4e75b7153764fdcc771c48
-EBUILD minikube-1.0.1.ebuild 1806 BLAKE2B e6df223c56458f5d4a56777f3d8e604a5e1a7cc7a61bd7ef149d66a0a47f8644a3b736ab3c13c7e7593c22ed1f074bc15eb4c805ee07b1157be0a8d97e89d3db SHA512 210843add77079f009580428c137a9a2526c53a7a58be7c3513c8e0013b3e9509cd8e458d2514b1a6881961e2858b92cacda9f2cd034499a9b80754a5c3fe7c0
-EBUILD minikube-1.6.1.ebuild 6943 BLAKE2B 86d852e91895ccb837205323d7f09f77ed4df7be69b168d09dc1010e1b97f15786e46a890376cf41cefa82c5b2f4b5080580eccca6cbf637cef59acad2df7fb1 SHA512 01714d1a53363b267d18349f16a916f655d87f478b945a6865953e1ca8ea829496d0d27268051b192cded712854c8f8cf659e0582cbeb0bd938641f7e6538f8e
-EBUILD minikube-1.6.2.ebuild 6943 BLAKE2B 7783f828650aea01b0e7fb841b23d82d409e4ee1a8494becb2ec2ccd54802450995643c71d2e39733fe2e6cc9a1f4389f54cbbd04af52f258c5ba0310733a027 SHA512 015d6a7ce9777ec6c510fb644358aa759c0aa859d513c5d8eeb8ce1b61b61f36f905fe4dec72c699a8ea1fa5bb7c85e0add11ab43851505ed722e22b0dde5fed
+EBUILD minikube-1.0.1.ebuild 1800 BLAKE2B dc9a2a90340070569e63d3f35e8b4950e9c21ce1f552d3d0a1db487eb8b24abbcd65b9977eb447a6ab1a40510069db789dbaa3ba0fa853c30ddbef7bc3c28a03 SHA512 079f2ef3a816c2ef3f29704aa762086ca78570387245baaf48cd6eb0726b86fddaefd6a7857e338c126e24e149b7b6151cb0394c7bca796a7fcc52f5090ee374
+EBUILD minikube-1.6.1.ebuild 6937 BLAKE2B 681004882d53d2a7e5bf0a7b84c2a88485f40a25d9263438a0460d7e99093f24587518b4ebf01837f0af37008c331f9413a9c656b879be8c16563a0733fae6f0 SHA512 9438048cdff7053cae3dc859bc0cef6416107150ce0090cc9f0f7b209396cc6d4be2d9749e262184b55ad1417d4bf3be92bacc666c89aed7e38e192390c20ade
+EBUILD minikube-1.6.2.ebuild 6937 BLAKE2B 3a3ee5544c89a637410c2935a1c6e6cb70ef9663d83907b6f5a0e70984b25e8f5c9a0fd9e38eafaec14c6aedbfae84cd6925750a8fba9742e9c52d91e3111ec4 SHA512 afa9d5ce4241119654f62541737d1fbbc82fe2c3fca9a6f40f656e2587f0f0ea4ec637c3fc58144e9e8f61d1edf419e6be17b5509202d4e18ca3e307e4844100
 MISC metadata.xml 393 BLAKE2B 6c1d7e4c6ebff826d2a8eb0bf7a81fdd0c67279084e95aea0188e9b7e0f8ff869fc983f50c318cf17c42fdb482388e0989c655c8e65f18b462da0343dd57bf24 SHA512 9af4b86772936bd3299be9ff2e62a72dcad3481b39d4644b3774bfbdec6617d47dd1697205e1b3fa0a3944c38464584f42b8b2d6c7f1086b340d6a917f4d280f
diff --git a/sys-cluster/minikube/minikube-1.0.1.ebuild b/sys-cluster/minikube/minikube-1.0.1.ebuild
index c0cfc1eabe7b..65951f69c4e1 100644
--- a/sys-cluster/minikube/minikube-1.0.1.ebuild
+++ b/sys-cluster/minikube/minikube-1.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-any-r1 golang-build golang-vcs-snapshot
 
diff --git a/sys-cluster/minikube/minikube-1.6.1.ebuild b/sys-cluster/minikube/minikube-1.6.1.ebuild
index 7acc960aa259..9ce970f58fe3 100644
--- a/sys-cluster/minikube/minikube-1.6.1.ebuild
+++ b/sys-cluster/minikube/minikube-1.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-any-r1 go-module
 
diff --git a/sys-cluster/minikube/minikube-1.6.2.ebuild b/sys-cluster/minikube/minikube-1.6.2.ebuild
index bb5af846aa7d..941d63fa9a29 100644
--- a/sys-cluster/minikube/minikube-1.6.2.ebuild
+++ b/sys-cluster/minikube/minikube-1.6.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit python-any-r1 go-module
 
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index eeb8881053d7..cfe18419bec7 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,8 +4,11 @@ AUX nova.initd 745 BLAKE2B 3242a38313147eaffc096752b35cbed34e16f1133cb482515086a
 AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b
 AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409
 DIST nova-20.0.1.tar.gz 11587774 BLAKE2B 62f7b6d4ab83533e4462f16978a2f95ceca3d6594029f87dbb170f3abc19917a4449ec95b007adae16c2e290649a560404d12e738a83bc8ad4bbbc1a4554d074 SHA512 3c83a1061696bb6e830e1e518ceea5e5b6405673373df674926b8c01955ea71714bf484906db3dc556209fb895c052003b54477d6a2791df0905244abbf9abe0
+DIST nova-20.1.0.tar.gz 11600925 BLAKE2B ad601ad07cd34df8fee75713f6040048129d6f45c00745903b334a281b555e78d1e8479d5d130e0ff7c1191e2ae18fc38405b2dfa4ec2800747bbb84602d9987 SHA512 b10e8d96846c9e8605cd4ae2dbcd1c4955979e91aa97b29a4411d00c5d5772264d46a9d62cce369d7db6da0641b86a3bf10dd37128e863b4565a5de19d30bdde
 DIST nova.conf.sample-20.0.1 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
+DIST nova.conf.sample-20.1.0 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 DIST nova.conf.sample-2019.2.9999 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38
 EBUILD nova-20.0.1.ebuild 7833 BLAKE2B 97055ab422300946032a79791afbdf250e9f1e9834aa145596a9a275eb5585064bfd17c1ed8a91243af458eb58479cbcf2283e651abc437f9060803e9181065a SHA512 e42571920ebeedd3e82ab82b1922fcf6a28a64974f77da9047c324bd6af0070118b0fb13c68cb9a07d86ad12521c2c81b617af46ba113eb4031c4a2c9d140439
+EBUILD nova-20.1.0.ebuild 7807 BLAKE2B 189334991c04a5f7bb7306d98a320482338998d9ac60ffb4f593bc78bcd3a9047c125c2c3b021c8d3755813c9e489e0d5d46985c1109698d59f961a2ce5d8025 SHA512 b30fe7c3ee7d064f63768d3bd4dbcb5915a204caf517b1e942bffb96915daebf7ee58a1578f3e1c94dbd27bfe10e3922b1e524bca6c725626eac088e62710c4f
 EBUILD nova-2019.2.9999.ebuild 7807 BLAKE2B 189334991c04a5f7bb7306d98a320482338998d9ac60ffb4f593bc78bcd3a9047c125c2c3b021c8d3755813c9e489e0d5d46985c1109698d59f961a2ce5d8025 SHA512 b30fe7c3ee7d064f63768d3bd4dbcb5915a204caf517b1e942bffb96915daebf7ee58a1578f3e1c94dbd27bfe10e3922b1e524bca6c725626eac088e62710c4f
 MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4
diff --git a/sys-cluster/nova/nova-20.1.0.ebuild b/sys-cluster/nova/nova-20.1.0.ebuild
new file mode 100644
index 000000000000..fb95e0d2d711
--- /dev/null
+++ b/sys-cluster/nova/nova-20.1.0.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1 eutils linux-info multilib
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/nova.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}]
+	)
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	!~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-traits-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	app-emulation/spice-html5
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( net-misc/openvswitch )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrtools
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r1
+	)
+	acct-user/nova
+	acct-group/nova"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use !compute-only; then
+		for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample"
+	doins "${FILESDIR}/nova-compute.conf"
+	doins "${S}/etc/nova/"*
+	# rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+
+	# add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+	rm -r "${ED}/usr/etc"
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-cluster/openstack-meta/Manifest b/sys-cluster/openstack-meta/Manifest
index cb7c8acc06f3..d660084acf1f 100644
--- a/sys-cluster/openstack-meta/Manifest
+++ b/sys-cluster/openstack-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD openstack-meta-2019.2.1.ebuild 725 BLAKE2B a74b8acf7d39580f70ce0cae631ce0dce3d961cf6678a4422c75a7687a027ce89eb3e7f5f0610a92d55df0893702b7b728c6e9e0e24f4100bc4c3f0a9e9bec2a SHA512 7da633d6f527d312798df5726c1934b888bb5740311de645bb668093dd39d3830eb023477210a12381f24c4a93fc61d5fd3b12dd8fc9b81a4311f3b31021a479
+EBUILD openstack-meta-2019.2.2.ebuild 725 BLAKE2B 008d57246099fb3c7c9dd3fe75d17ca8c6b7292d5215d732d0f41983b1ddce3ff07778c78bf131f6a7db840b0331b65def740af30661e5a499f5123edc11c81a SHA512 c3ee9e79ba4c1e6a9523531bb13dc0303e57d46beaa57cd8faa48efa1c143ffa51c64eab15f34b4216de311957473fbcd792073f14087e614fc950a0fdec5097
 EBUILD openstack-meta-2019.2.9999.ebuild 720 BLAKE2B 7b98e630cdf78a504a088f7cbef581ddb23cbd266058a4af622370c8deb5d58bc3d8a6fc65b77a4350ead39b3c120146b26edb23abac2cfb74b2b14a07dd313d SHA512 5d80cc2745055cc52c9b8d9ceb0c7d540e4295135ab8e4fc4af2b0c8cda1ea4e09f35d01634bb8ded59b880321f70cdf73397a741bda21999fa20bb1b4be3ef6
 MISC metadata.xml 931 BLAKE2B 23cfe01ee67c4203f65ae6fe48c75c039948576ee98ce29e319ad7821e1bf7afe2f80dcb88994893a270d7902d37663159223639843f9b026a09c9f7a004d770 SHA512 5a37fd37399ecf64a4b655a117b2ed0bc118a08b281bf71d84cb5f2e0057f67322dd177c2e2572200bff90cef14bfe1d0323f8e3b84d6b8120d859f4c0d4576f
diff --git a/sys-cluster/openstack-meta/openstack-meta-2019.2.1.ebuild b/sys-cluster/openstack-meta/openstack-meta-2019.2.1.ebuild
deleted file mode 100644
index ecc8723d0aed..000000000000
--- a/sys-cluster/openstack-meta/openstack-meta-2019.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
-HOMEPAGE="https://openstack.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cinder glance heat keystone neutron nova placement swift"
-
-if [[ ${PV} != *9999 ]];then
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-DEPEND=""
-RDEPEND="
-	keystone? ( ~sys-auth/keystone-16.0.0 )
-	swift? ( ~sys-cluster/swift-2.23.1 )
-	neutron? ( ~sys-cluster/neutron-15.0.0 )
-	glance? ( ~app-admin/glance-19.0.0 )
-	cinder? ( ~sys-cluster/cinder-15.0.0 )
-	nova? ( ~sys-cluster/nova-20.0.1 )
-	heat? ( ~sys-cluster/heat-13.0.0 )
-	placement? ( ~sys-cluster/placement-2.0.0 )
-"
diff --git a/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild b/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild
new file mode 100644
index 000000000000..135d73ac37cc
--- /dev/null
+++ b/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A openstack meta-package for installing the various openstack pieces"
+HOMEPAGE="https://openstack.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cinder glance heat keystone neutron nova placement swift"
+
+if [[ ${PV} != *9999 ]];then
+	KEYWORDS="amd64 ~arm64 x86"
+fi
+
+DEPEND=""
+RDEPEND="
+	keystone? ( ~sys-auth/keystone-16.0.0 )
+	swift? ( ~sys-cluster/swift-2.23.1 )
+	neutron? ( ~sys-cluster/neutron-15.0.0 )
+	glance? ( ~app-admin/glance-19.0.0 )
+	cinder? ( ~sys-cluster/cinder-15.0.1 )
+	nova? ( ~sys-cluster/nova-20.0.1 )
+	heat? ( ~sys-cluster/heat-13.0.0 )
+	placement? ( ~sys-cluster/placement-2.0.0 )
+"
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index ef0428e1a47b..2f4dedb97483 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -5,8 +5,8 @@ AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299a
 DIST rdma-core-26.0.tar.gz 1444585 BLAKE2B 148b25f6108199b3845446e9f45a59d089e7f546218d70abeadffd5cf3e0b26569bc5099abfb6152f376689e04a493529a61fc1d6b40c153aca23b5df2776bf7 SHA512 7dfdd93d10e4c56cac5ac0c1b46900fe7a6c634920e470ebc582abd7a0f57c57d585b4e0dbbb5ad84f46ca8518132e684d44d33c62b0509461ed5b62b7e0f19b
 DIST rdma-core-26.1.tar.gz 1601313 BLAKE2B 459baa80d5cb74386e567880ec7fd2de9e4aaea177e7022603db5dd70f633152d86618bbab637ca337a9314c0c19b5c0f6a51f281802fa0b8bedb8fad149f26c SHA512 98f0e3f3e951f3b2287711526a2a6c62cb4e0f5eb693894c7f44783c5eb6d4213c9eedc39b2370563e8bca17e133497e475392004ace0203d2a39de371254742
 DIST rdma-core-27.0.tar.gz 1445552 BLAKE2B a038653865f8d37b6599a54ca7fef97b2ac131b3a11ce8696b5c1ec558e85332e950f8d5104f250b23a186224735b2a338fc03f875979bff342ad26ebb5b74b2 SHA512 8a299f4d3fe6ea98d8fc8d8135295e55c8bbf5d0d5f2e5fd362a5eb96d86f5aa84263736ab80a3c0eb104c7fc5fb5d43a2077cc6a1fed3d346af89597a4ddee2
-EBUILD rdma-core-26.0.ebuild 2439 BLAKE2B 9b35dcbe991f1cdebedb601838ebf081d872b1b5d286e9a698a024e6909d44f937b88f110d7190b828a6da7fe7e75840d866c853fc3cc537153d02131529b9d3 SHA512 53ec17e9cb20f5da20c388254cc4924f5202f05a2db3feeb3128d16e1c4b058c25fe31ccc7133eae99bc9535d556e73b6ba890d7e8c47b8ae7ec602dea9b4004
-EBUILD rdma-core-26.1.ebuild 2441 BLAKE2B 31bd2434748e44555bd6d23bedc43a040ad3836616293d030b4d230e6ff6933b165f2b4ba59a84bdda3adda30cf5635085388c5843fbacd431706bbcee91d4d7 SHA512 dab20965e12df6dcc67c8969b6bfd22af1527d0fdcdeae650aadf2d2543fe77a13da245ea6702d58c5ab6aa5a42b75395f22067f8d9768d2728b532c9bbac544
-EBUILD rdma-core-27.0.ebuild 2447 BLAKE2B 0490574c27ee112fc977277ff0a254df1a221d54371110f57502e4a19d37c4da9ffe47fd17507a91799b9e358c0dcd3db95c8f23fb588bc49fcb55a833e1939b SHA512 497f15ea57b8d06c478853e866d870d88713ee57be4d84ad2364179eee3ac1a4a13f03be616a6c051ec9c8978761adcb399cc9b27ffd73c750cc846085b0abe2
-EBUILD rdma-core-9999.ebuild 2399 BLAKE2B 9bde6f6608aa17a27ec8c11f9fd5c18219a20be28b4a166b53f2c79be36b9d86bd4dce218e200b941f92377f58a525987248df2bb9b37f77847f5074dff403b7 SHA512 84a79dc6e623e549f9031eade6b4ca08de1bfe6e60de8e432a21001f7fe15f3e76a2aab3fe7ca9634c948250347700df34eb66769362155bcbad10eb5d9352fe
+EBUILD rdma-core-26.0-r1.ebuild 2513 BLAKE2B 519c57cb9eb2e8ddbd666668c50e186b106eeff016f8be36ee3f15afadcc7851f65f16684355d4deee14ec66ef0770391fcd3f202423b6a6dc926c26c40afbcc SHA512 f81a43e2b04de7479b61fb626a1dc701ae21bf6c14af586574950965195d8541c09e663a678b5a28a3db658c57da2dc010e7071dcae2e32b465b140a18b3a7fb
+EBUILD rdma-core-26.1.ebuild 2514 BLAKE2B d63803233031ebe7765c685e24a28751f1e83433b49ad7dd6a167d97c007d4076fa3ba01015404ac24897997ce21ada5e634aad920911e9e3e0ee8f74c8517e6 SHA512 3b31ab7ec3630268d4f072046404ab129c3b5539054343d29361d56bdd493b01a04f05701f4bb7f6362787e6144f0dfbf43a6105426ab10b02aa3ed944922801
+EBUILD rdma-core-27.0-r1.ebuild 2538 BLAKE2B 9e36cbb2a9422d89000623f21b5089c422b4ec08709414038bee1158002f27e053d7d6bc7b582642e1af56bcae9260742ba50faaf3f42f05e10d3afda7d36c41 SHA512 910b9558c81b6ae579eb34eb5c6eac66ba82a2fbbf56ec3689fa3082f506235e6afd5956add2eaf543f8003e6380397b62277559a9026fc39a338262ca0d2ba9
+EBUILD rdma-core-9999.ebuild 2472 BLAKE2B d1883898cc9fe6f89ce89377ec7f4141c60b7c945d7152c2c59548e396a5f771a4a2b75028886fc2131d51288005ca07de08e347c235d5bb4b75398f9b9b7d92 SHA512 2768d543d83416c519c7305af1ad66c9c7370d090a249fd5d9a5c79cb3245bd5c1824279f1cf8c7ecb26fabaf618adf96d1bcac1a243fb9c3c788d618fa2a8e7
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild
new file mode 100644
index 000000000000..39c6e4a73b19
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+	)
+
+	if use python; then
+		mycmakeargs+=( -DNO_PYVERBS=OFF )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	newinitd "${FILESDIR}"/ibacm.init ibacm
+	newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
+
+}
diff --git a/sys-cluster/rdma-core/rdma-core-26.0.ebuild b/sys-cluster/rdma-core/rdma-core-26.0.ebuild
deleted file mode 100644
index c2a9e0a05f59..000000000000
--- a/sys-cluster/rdma-core/rdma-core-26.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils python-single-r1 udev systemd
-
-DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
-HOMEPAGE="https://github.com/linux-rdma/rdma-core"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
-else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
-SLOT="0"
-IUSE="neigh python static-libs systemd valgrind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	virtual/libudev:=
-	neigh? ( dev-libs/libnl:3 )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${COMMON_DEPEND}
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-fabric/infiniband-diags
-	!sys-fabric/libibverbs
-	!sys-fabric/librdmacm
-	!sys-fabric/libibumad
-	!sys-fabric/ibacm
-	!sys-fabric/libibmad
-	!sys-fabric/srptools
-	!sys-fabric/infinipath-psm
-	!sys-fabric/libcxgb3
-	!sys-fabric/libcxgb4
-	!sys-fabric/libmthca
-	!sys-fabric/libmlx4
-	!sys-fabric/libmlx5
-	!sys-fabric/libocrdma
-	!sys-fabric/libnes"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_FULL_RUNDIR=/run
-		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
-		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
-		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
-		-DENABLE_VALGRIND="$(usex valgrind)"
-		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
-		-DENABLE_STATIC="$(usex static-libs)"
-	)
-
-	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
-	else
-		mycmakeargs+=( -DNO_PYVERBS=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
-	rm -r "${D}"/etc/{udev,init.d} || die
-
-	newinitd "${FILESDIR}"/ibacm.init ibacm
-	newinitd "${FILESDIR}"/iwpmd.init iwpmd
-	newinitd "${FILESDIR}"/srpd.init srpd
-}
diff --git a/sys-cluster/rdma-core/rdma-core-26.1.ebuild b/sys-cluster/rdma-core/rdma-core-26.1.ebuild
index e879e9b2b999..39537f768f10 100644
--- a/sys-cluster/rdma-core/rdma-core-26.1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-26.1.ebuild
@@ -31,7 +31,11 @@ COMMON_DEPEND="
 	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${COMMON_DEPEND}
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	!sys-fabric/infiniband-diags
@@ -92,4 +96,6 @@ src_install() {
 	newinitd "${FILESDIR}"/ibacm.init ibacm
 	newinitd "${FILESDIR}"/iwpmd.init iwpmd
 	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
 }
diff --git a/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild
new file mode 100644
index 000000000000..9313f938a56d
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit cmake-utils python-single-r1 udev systemd
+
+DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
+HOMEPAGE="https://github.com/linux-rdma/rdma-core"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
+else
+	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
+SLOT="0"
+IUSE="neigh python static-libs systemd valgrind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	virtual/libudev:=
+	neigh? ( dev-libs/libnl:3 )
+	systemd? ( sys-apps/systemd:= )
+	valgrind? ( dev-util/valgrind )
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${COMMON_DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-fabric/infiniband-diags
+	!sys-fabric/libibverbs
+	!sys-fabric/librdmacm
+	!sys-fabric/libibumad
+	!sys-fabric/ibacm
+	!sys-fabric/libibmad
+	!sys-fabric/srptools
+	!sys-fabric/infinipath-psm
+	!sys-fabric/libcxgb3
+	!sys-fabric/libcxgb4
+	!sys-fabric/libmthca
+	!sys-fabric/libmlx4
+	!sys-fabric/libmlx5
+	!sys-fabric/libocrdma
+	!sys-fabric/libnes"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_FULL_RUNDIR=/run
+		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
+		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
+		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
+		-DENABLE_VALGRIND="$(usex valgrind)"
+		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
+		-DENABLE_STATIC="$(usex static-libs)"
+	)
+
+	if use python; then
+		mycmakeargs+=( -DNO_PYVERBS=OFF )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	newinitd "${FILESDIR}"/ibacm.init ibacm
+	newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
+}
diff --git a/sys-cluster/rdma-core/rdma-core-27.0.ebuild b/sys-cluster/rdma-core/rdma-core-27.0.ebuild
deleted file mode 100644
index cc1079c577a3..000000000000
--- a/sys-cluster/rdma-core/rdma-core-27.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-utils python-single-r1 udev systemd
-
-DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
-HOMEPAGE="https://github.com/linux-rdma/rdma-core"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
-else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~hppa ~x86"
-fi
-
-LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
-SLOT="0"
-IUSE="neigh python static-libs systemd valgrind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	virtual/libudev:=
-	neigh? ( dev-libs/libnl:3 )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${COMMON_DEPEND}
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-fabric/infiniband-diags
-	!sys-fabric/libibverbs
-	!sys-fabric/librdmacm
-	!sys-fabric/libibumad
-	!sys-fabric/ibacm
-	!sys-fabric/libibmad
-	!sys-fabric/srptools
-	!sys-fabric/infinipath-psm
-	!sys-fabric/libcxgb3
-	!sys-fabric/libcxgb4
-	!sys-fabric/libmthca
-	!sys-fabric/libmlx4
-	!sys-fabric/libmlx5
-	!sys-fabric/libocrdma
-	!sys-fabric/libnes"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_FULL_RUNDIR=/run
-		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
-		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
-		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
-		-DENABLE_VALGRIND="$(usex valgrind)"
-		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
-		-DENABLE_STATIC="$(usex static-libs)"
-	)
-
-	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
-	else
-		mycmakeargs+=( -DNO_PYVERBS=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
-	rm -r "${D}"/etc/{udev,init.d} || die
-
-	newinitd "${FILESDIR}"/ibacm.init ibacm
-	newinitd "${FILESDIR}"/iwpmd.init iwpmd
-	newinitd "${FILESDIR}"/srpd.init srpd
-}
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index a4b748ab4b1d..a8c381b38698 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -31,7 +31,11 @@ COMMON_DEPEND="
 	python? ( ${PYTHON_DEPS} )"
 
 DEPEND="${COMMON_DEPEND}
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_USEDEP}]
+		')
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	!!sys-fabric/infiniband-diags
@@ -90,4 +94,6 @@ src_install() {
 	newinitd "${FILESDIR}"/ibacm.init ibacm
 	newinitd "${FILESDIR}"/iwpmd.init iwpmd
 	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
 }
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index f318ccf94978..33700296143d 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -7,6 +7,6 @@ DIST swift-2.23.1.tar.gz 3044545 BLAKE2B b3b06aefa7c58b718f7d9c1c1b9bc92f442b832
 DIST swift-2.24.0.tar.gz 3177018 BLAKE2B f465f0e8f58cc097b5b1fdbe5c9736ee3e2247d13d8ae1beeb7e736dd1246e7d8820cb7241afb67e651ad85c269a48d9dbeda3479dadd773bfc1fe3278731afe SHA512 f8e3b0fec06776e095067b2c12f782a9a787c814cea8039ec32930c562be5c74b4b2bf4cb9dad3481953e5163bd051fe32f3074be7776fd1af0be94982d113b6
 EBUILD swift-2.22.0.ebuild 3854 BLAKE2B 92ade52d11d331d9f08ed9ff7f017453c2c4bbb68edf13a7e3a4f61ec2b1817bd0ef18fe680cb7862224da8b3a1405242499a21489dd2fd1f9e066eaf384525b SHA512 573572d4dab5a4be49bd4638221e757804454571a246b2333ceac48b105e1a099b07d62c7b01885980a435146cdc2a61635bd04f05b0b38295b05af1f3378054
 EBUILD swift-2.23.1.ebuild 3855 BLAKE2B a72c67caf9cb6cab55e24ed942e708ed6f4b08aa4806178c6421e76896c9afc5e4ba963bc88b0e2d46e233f710eff368d12715ab79ca8c064f61eb1cff002b96 SHA512 ab4c4ae34bd94e42b008c671c3d4df017fd45b06108b5ef82e693ae0bac9269a9c27d9304025260128adf86cd798c078ffa80515e51a0e7c97a899f19bac1ccd
-EBUILD swift-2.24.0.ebuild 3834 BLAKE2B 4ea629a582861a48ed0917ce5aabc1e9eec54ae2995f61a66db9ffa6ead669aa3324940f36575c3db23b26cdbeac09f560b41b22ea7c0310c56c9d8369fcc841 SHA512 afbaae9466aea1f342efc0940bf621ae5d0210c27b6f1df41e2c874685083267ee4380d2b1a0e8ea42e51e413ee29c14ef2b2dc075e2001b08e4fba672d43155
-EBUILD swift-2019.2.9999.ebuild 3834 BLAKE2B 4ea629a582861a48ed0917ce5aabc1e9eec54ae2995f61a66db9ffa6ead669aa3324940f36575c3db23b26cdbeac09f560b41b22ea7c0310c56c9d8369fcc841 SHA512 afbaae9466aea1f342efc0940bf621ae5d0210c27b6f1df41e2c874685083267ee4380d2b1a0e8ea42e51e413ee29c14ef2b2dc075e2001b08e4fba672d43155
+EBUILD swift-2.24.0.ebuild 3837 BLAKE2B 2fd42f1864db9312f8c66e9379ead2560295dfc87ea5d6d98db37d3c38a128621b6d0ceba8f1415bd0b3cc277cc4be25dbae3613684f9e0628a208ae329b8687 SHA512 5b580e2377d322971b24a19cd02c331ed6d0b53afc5f016f4fb1ced11fa327e7c6f9ca62aea376149de3c46ed6d190f6d07324059b8ce724ca77a24f2fd9f8e7
+EBUILD swift-2019.2.9999.ebuild 3837 BLAKE2B 2fd42f1864db9312f8c66e9379ead2560295dfc87ea5d6d98db37d3c38a128621b6d0ceba8f1415bd0b3cc277cc4be25dbae3613684f9e0628a208ae329b8687 SHA512 5b580e2377d322971b24a19cd02c331ed6d0b53afc5f016f4fb1ced11fa327e7c6f9ca62aea376149de3c46ed6d190f6d07324059b8ce724ca77a24f2fd9f8e7
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.24.0.ebuild b/sys-cluster/swift/swift-2.24.0.ebuild
index f9125af321f6..66211332bf21 100644
--- a/sys-cluster/swift/swift-2.24.0.ebuild
+++ b/sys-cluster/swift/swift-2.24.0.ebuild
@@ -85,7 +85,7 @@ python_install_all() {
 		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
 		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
 		if use memcached; then
-			sed -i '/depend/a\nneed memcached' "${D}/etc/init.d/swift-proxy"
+			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
 		fi
 	fi
 	if use account; then
diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild b/sys-cluster/swift/swift-2019.2.9999.ebuild
index f9125af321f6..66211332bf21 100644
--- a/sys-cluster/swift/swift-2019.2.9999.ebuild
+++ b/sys-cluster/swift/swift-2019.2.9999.ebuild
@@ -85,7 +85,7 @@ python_install_all() {
 		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
 		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
 		if use memcached; then
-			sed -i '/depend/a\nneed memcached' "${D}/etc/init.d/swift-proxy"
+			sed -i '/depend/a\    need memcached' "${D}/etc/init.d/swift-proxy"
 		fi
 	fi
 	if use account; then
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index c91a78757dd8..9db480e1ccbc 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 1479e042f92f..f1cb72d34477 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7
-EBUILD autoconf-wrapper-13-r1.ebuild 800 BLAKE2B e648bdd4dcb0565df755f53f0ef42af7c7ab1b7181af07311508aac83e919ffd39114521baad03cac5246e574f7dd23e27f3427d67feadadcbfb18e26402b835 SHA512 5462fed84c3d0ad1052bb03fee030b05998cf5ae10076f084cdbdc38814393d84f330d2344a998d95f7288913d73b95eff393d181f24077da76feb2140d88cbb
+EBUILD autoconf-wrapper-13-r1.ebuild 817 BLAKE2B 6a7ff34557e5fa0c2f6d53f2830ff808e9eea7f6e68962ad9a6a86d9cc87fe71ec83f4d1126036ed3287628b950fff8bb776e0d36428039ff8374b45f860e9c7 SHA512 9ce5fcffc1bbd99ca2eb0ae66a9c95a6b11b187c05588845a5100781f439bda0fa1efe5f6385e81e3748b3e44086661f90b75bb6892caba02e4b5f3e83c03dba
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
index ce00bbc6649a..69583181ec25 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit multilib
 
 DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 30734f3286c2..b6eaa09b79bd 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX am-wrapper-10.sh 4626 BLAKE2B f7261f39e06afa88eb0b52c5ccdcbb2b4fabe3bda4fdb50ef2c974d4a03101439decb76edee3d0534a621fd4ca4e5d574a3af2701e382f7c07f838a5235ae6ef SHA512 6f1611000ac2dd901a24efd133522274aa8feea02610645f3b1332a3f294de687f65e995b398a487b1d030c74dd278f65fcd224007ebe7e950af03660cc38f60
 AUX am-wrapper-11.sh 4626 BLAKE2B 2a96abc5b93db360a3ce074d84b21d7f875ff42d54f99030d8589b84efc94b411d8fb1a707716a060dc4a66c59f2a84d1e50a70f681faa62358fc7ae7a5a7d77 SHA512 452c0c52ef65b1ad5ad8d8f5c9c12cb9ff18eb03faaf7217c52a7dcf2a9832c7d4a59dbd8cc6325a0035a6650cc913f9b842615d053bd0f0c5c5177e660dbfca
-EBUILD automake-wrapper-10.ebuild 900 BLAKE2B 2e0a944db8ac736f9b1cbbd61f4ec0c300ac12cdd19a5eaf4816ab902de847e44f1f083338ebecea999689a0c232c20f47a4fcac72cfc691aeb06dd256e4fe46 SHA512 bf6ac5bafa41ef32b19a21c645a9eea750a8d24c3dc688b9688cb0aabe470d1b9eb3debefb9c97f65773816512cbbcfa53d83832e7fdcd8efad0767578f741d8
-EBUILD automake-wrapper-11.ebuild 912 BLAKE2B 7392ddca6c5e2e8e78cf05c618a8f617c1d5719593ff541d14da7100ec14507676238780d94e448fd43e3cf3eef5be3905ff26651c012f543deeaf9b3639138e SHA512 e191a895459d58d428dd4bbd3d70b36ad7947631aaaa3b4930bb6e3668211f82481b23b412ff00b1c1f91d7ae5a889c6cae2b83098b5aebd72c5e6de78bc4df5
+EBUILD automake-wrapper-10.ebuild 917 BLAKE2B e83d2b46f0d902a661f77eeada92c60d14259d35651aa07af18fa4b7f2a49c536bb6b7ef9442e9fd26a83907e165c1ec10614d7a546f189f21013aaf150fc4b7 SHA512 b48e0149c40ec365e05b73498d4ede0ec396f37fd35e4fc2d4c1fce76706ed81b32bc3712f901924976d885c97b76c7130d19e815ef6eb7c8fb1827d3c5b1617
+EBUILD automake-wrapper-11.ebuild 929 BLAKE2B dd7b335ad2300193dd2bf84efb9c9fc02b9c7cf05593872f5bd9ae7422f157c50291f267b7f52624edb3a2cd79c8fd67451b7a100922d1747866a871bb4ffc14 SHA512 acd190000e11871700142ad17d29a08200737222cf954747a32a3aae042a94e18168bbb795e8cfa6da52c80c58337abbc5589d5c4d50253bc63045c15babdaaa
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
index 647c332174f1..352898779ce1 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
@@ -4,7 +4,7 @@
 EAPI=4
 
 DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index 30f2d8a56e42..47187bac2e03 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 
 DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index c6ce15bcdcfc..347e64bb220a 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -58,12 +58,12 @@ EBUILD automake-1.13.4-r2.ebuild 2685 BLAKE2B 34bcc55769092f11a8de24092b1114cd91
 EBUILD automake-1.14.1-r2.ebuild 3104 BLAKE2B 8e77934ddeb4ee42dfbeab5fa28faa39bc8593df9bbdbce16137aed1a521a80eab8be9bffb88b1197714184fab8ae5c4e28341a050728ef312ca514856f3c4da SHA512 fb849c5d7f2039740ac1a79ec724b53ab3b46fd9d75645e34fd3d9414b4fdef20c7b8ac367002bd11fb39987900252c5a0e633a91d08101846aec6d0a2cd7c3d
 EBUILD automake-1.15.1-r2.ebuild 3209 BLAKE2B f23c402d2c59ee7cd9f93586588a075ba0cf3e45ea201e56198f9476697c6da294b329db129b144a17dd85cc6a77196f703ea8c74719802240b3b8b0fc1af341 SHA512 9c5ec7c122be237cbadede1e235001a3c61a141e58b55dd47b5b9fc84a19508e466c42237ecf21dc51f7d5eb400e367c7586d6f6005ed93e89c1cf2edea1e526
 EBUILD automake-1.16.1-r1.ebuild 3134 BLAKE2B 37eb2da90f10ff92002ca41287b1e9e263a8c661aeb2d7c8433f9ec163e6bdef585b78c608b3d97b1197e5a9997fab78b1a05a030f6f8af9a3a44d0b6fcf284d SHA512 e30488c67fd67f6cc1c81fcef465350efe6e43e4e182d051cf114a44e91c830680aac61e4597c44b6fd6368fac0a0f94364811bcf94bdfcb54e225e9a6ac4c0b
-EBUILD automake-1.16.1-r2.ebuild 3644 BLAKE2B e3413c216f19d962ebc0912e6eb065a1e6703f7879946788a58fd36c0b16ba5cc5aafa6be8063eca7a2d75aff0a9042a4a7f7fb3c0ea7a5810b4008e3211bf4c SHA512 a440a71cebe25e5928605ab1751bc90f8e3961d0e3fcb2df7cff307eae93a488b9f6bcef7ffc7620506aa8351ee97db852e073dc112d489e954475c41271e04d
+EBUILD automake-1.16.1-r2.ebuild 3634 BLAKE2B a4f5d79711ca1893f2f4e79795b4709eb51abada943c694491231321fd9234d0981bfc895688740abcec60d6bb9fc833a2e49ec3d8449c357e94b0e36d508130 SHA512 2291107c73bf175925cc4d5b3bc1fc9a78935a6d757a8ae1d5cb8ac818650219381299e4923238da41857acf34809f2cae71ec69d1e6c056d24c5b8adaf05bb4
 EBUILD automake-1.4_p6-r2.ebuild 2472 BLAKE2B bac085be80461c6e31963e94bbee7341cf0a5428fbc3352569aedd523c6f623909e6729981b426932060e48896ad8623d64ced2932cec9219006817bfe74bb16 SHA512 3b90a68d8e09ff5043424716351e92e09cd5dc3d7fa1434d5da09813ff7d923a0bd9d7b7045ed29b97ff001123db9a943096c1ad401eee57377d2d2bba7d6fc4
 EBUILD automake-1.5-r2.ebuild 2290 BLAKE2B 99130d4c68bd645ed282a230f3a67055057e5d37b5046d37ad71cde390014dc7e3428866cc5ab0922b9c37a7ff6c867d25645ee8fbb93c128662534a0e88a040 SHA512 f0d1602548cbffd65dc1c53da135d1fa53c195a66e42df59edb8211e6a5e37a9270e2054bcd10de73330ee782f2a615bdf68c44f4ffdcc9f916c47de7cab22eb
 EBUILD automake-1.6.3-r2.ebuild 2038 BLAKE2B ea178a3348d2b7b284ae05083c8a76558413a296494705ecdd9d76613f4617d75eba911e55b7e45903fb27903d69d5a63d72dc36bc8021f2dd33f9f3b08a1c54 SHA512 6c8f3984ea50513cc75bc7f8c54535be62fc3550ec34e2d13b41eaaddc2193a4ad9a3e04d2d0683cf28b3011b8251382d82e10ba1e127c23ba7d86612bf73002
 EBUILD automake-1.7.9-r3.ebuild 2193 BLAKE2B 1c83a7dc99e37e36a02d3f261de1cb528cfeb60dac68dcd8cd25b429d9c3ca739ef79cbb7a32e50519e95a901356dbca6ae414f06f5e0d527bd99bc33f6edfdc SHA512 ec3bc0045ecf7ec72d4794e812bd4920497cc1098ccf7113fb5adc2c6cbd150064264aaf525ac4d920e18943a4c6d82089b485fa7c10fc4f70638062b06554f5
 EBUILD automake-1.8.5-r5.ebuild 2220 BLAKE2B 5cdc6269a185f80ac164ed57bd5447217c35a1f291e8ca879e9fe9a66ef0846f96e058bcd9f36fda8599d88b2b4c708c6ecec23a9c2b4ecf9b6e70a43fca07db SHA512 e4e326de0ec8ecc32899ce3bd6fdc174ebe46d5442456c722e45ec53cb704b7b3cc2b349cbccd7d94b846cd57d025a8a230f2de4e92d832dd2d8354d4ff10161
 EBUILD automake-1.9.6-r5.ebuild 2568 BLAKE2B 19ca59ff6333426b2c13f7aa5979fa792ffb59b3cbcba61db676eb0df9cc0d6f747d52d6f713013436a990df0cffd8f9176cf5be4f957be6664430e469c53561 SHA512 2dfc5963155932eff99a909a3ca15c013c3e6260d73e15dc098215d4e4a988a2115fd6c711bd4fe7c0ee243008c75849a9490c14444493c3292c384fea93cc3e
-EBUILD automake-9999.ebuild 3644 BLAKE2B e3413c216f19d962ebc0912e6eb065a1e6703f7879946788a58fd36c0b16ba5cc5aafa6be8063eca7a2d75aff0a9042a4a7f7fb3c0ea7a5810b4008e3211bf4c SHA512 a440a71cebe25e5928605ab1751bc90f8e3961d0e3fcb2df7cff307eae93a488b9f6bcef7ffc7620506aa8351ee97db852e073dc112d489e954475c41271e04d
+EBUILD automake-9999.ebuild 3634 BLAKE2B a4f5d79711ca1893f2f4e79795b4709eb51abada943c694491231321fd9234d0981bfc895688740abcec60d6bb9fc833a2e49ec3d8449c357e94b0e36d508130 SHA512 2291107c73bf175925cc4d5b3bc1fc9a78935a6d757a8ae1d5cb8ac818650219381299e4923238da41857acf34809f2cae71ec69d1e6c056d24c5b8adaf05bb4
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake/automake-1.16.1-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
index 1c06ea4470f4..47c426b024ca 100644
--- a/sys-devel/automake/automake-1.16.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit python-any-r1
 
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 1c06ea4470f4..47c426b024ca 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit python-any-r1
 
diff --git a/sys-devel/ct-ng/Manifest b/sys-devel/ct-ng/Manifest
index 61603ff8ae08..e6111f39994e 100644
--- a/sys-devel/ct-ng/Manifest
+++ b/sys-devel/ct-ng/Manifest
@@ -1,5 +1,5 @@
 DIST crosstool-ng-1.23.0.tar.bz2 1782247 BLAKE2B 77835534b5b664148985b57580bf24fa6153e1fc327be0622e55d9ff5c1c5f446039b293a7d1718bfbec89789638f80033be012e0878f75a57648bd574abe10e SHA512 1842d140b1c4f76783751eab60722e8077f356dfc9e9cc941d3c991a7e9bb23cb19e6bd7cd5c630cc87967853c55e0c16e415b222e546b5baaffb264ca799b69
 DIST crosstool-ng-1.24.0.tar.bz2 2058069 BLAKE2B 4108e9546acd6c0660552595d41164ce9c4f07985851a911c260fcc9e2ec70e80136b6cb2090290ca2aa2ceeb4ebc61fca183340de88eafd800bc2bf18d0cfbb SHA512 379e668365628f0ab359ae119213bed44960870093f64f0fbb12e92bbe2a3b82bfed77f5ab33f2e2f17c1977e7a63f2151c46ad8d0e6208220fb7fa8726fae33
 EBUILD ct-ng-1.23.0.ebuild 748 BLAKE2B a4ab8307eff441718ae4ff61ebe338b875a9e55e8a46c9892314de66e8d70a80eec8b11b2022fa3a9cd901911d81ea64256480e465752a13e127e84f4cab39ce SHA512 cba95e3d2ff49ff2f025ef8acc64a47258ffdfc810602868ab151c6eb5ccbffa3e74a16c9b62b371d1da636ba07b56a54a1da8368c078745056715493fe4a648
-EBUILD ct-ng-1.24.0.ebuild 687 BLAKE2B 8054d773167047742cba39add11e39d6875d29dcc86d53b3daca41105c3dded2d0b46965dad5987d681215cb4cbcf95476ca069a859207c14b12d1cbb1a0976c SHA512 6d3f5b56cfdcdea3f45aa822c9d7e5eae5dcdfb61868c831140b97eb686fa06ce4e41d29e6779d964d2352472f68417cf4418fa9978f7189f1c2fc8a0b1ce8d4
+EBUILD ct-ng-1.24.0.ebuild 685 BLAKE2B 0aa396249458fe22f4a7d67b030a0ea12c56090a48b66d9a28878cd5c57a433fe7b2fa38f54ad6e6f73871c013d4ab6d096f4693398f57f66077ad9e02086c48 SHA512 1f841e1d0781b2cf3cf7784a486ce0cb06bf3ff0eb50ac4dadf367dff785ec65bf4236413b5c6fbbe585d2623aac6958d624b713406bdb8135d7e5d463baecc9
 MISC metadata.xml 583 BLAKE2B 89762f62a6bf27d35208b090d92f8b155ee795c13c995ae088bb06b49f89a9df440f301a5ce7ba89f9eb6237d9edb4fd721a0e36c8a3dd3b21bae7065e01f5fe SHA512 7fc4a634b054c9f793b9a4ff343f78a3bb96835662ba4c2fc5a2abe801b9c97eebc50aa6ade6ff2eb25d8cef2984023317149d74d242d4b17302f05257079434
diff --git a/sys-devel/ct-ng/ct-ng-1.24.0.ebuild b/sys-devel/ct-ng/ct-ng-1.24.0.ebuild
index ebcbb34f2c48..3bb25cdbe1c4 100644
--- a/sys-devel/ct-ng/ct-ng-1.24.0.ebuild
+++ b/sys-devel/ct-ng/ct-ng-1.24.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="net-misc/curl
 S="${WORKDIR}/crosstool-ng-${PV}"
 
 src_install() {
-	emake DESTDIR="${D%/}" install
+	emake DESTDIR="${D}" install
 	use doc && mv "${D}"/usr/share/doc/crosstool-ng/crosstool-ng-${PVR} \
 		"${D}"/usr/share/doc/
 	rm -rf "${D}"/usr/share/doc/crosstool-ng
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 5934fb458a15..c66b3a67ab59 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -3,10 +3,10 @@ AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396
 AUX distcc-3.3.2-freedesktop.patch 4210 BLAKE2B 7c1500df8cd8568d68c51a3d14eb7240f16adabf9c664b3295171901f4781a9d7b9b9510e577ca0b85abaf21b9783dd9fa98f351089dc98f52f6182bb841c658 SHA512 7454df35d134dff9f5640f7a1a4241b99fe4c6051682af185657837f25cb870c27885ec9be74b5f01075801542decb54daf7db5d80fbdbecf5c8c721a6ee4e7c
 AUX distcc-config 5218 BLAKE2B 41d483481e483217ed6313b4f82ed66c4f006070c269bc5ee1283db9c000d12ab29a90d1813df2a590f87c02520e312c35901a7d3f1364480b68bb02d668d51d SHA512 fe3dee7a89ec16e103b52d3555d483b42e4cbe716e3e77f792c543fb2c82eca5f6b8e0d2809f16c805d55263471108ff2dea1f4a5d55826f67f8b94239aca946
 AUX distcc-hardened.patch 1084 BLAKE2B 4b78fce2ab19b3832006a8b0092d3d38df07ce8225eb367c90256a158a41121e09269cd4bf59a1fc450db58eafe09e757f6e3ca4ae074a4567676701228c8289 SHA512 d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057
-AUX distccd.confd 1189 BLAKE2B 62791080d43004faf5fc4fb61e506bf3f0f8c2a677d4c24e7d44af692ca7b825e173624343f7e89ae7bff206fdf9543e0308ea4b2db90326c0de04eaaeb62f0b SHA512 1769bd32b1e03e7f8a8e6dea82c1709754d4d0fb12e59e9bdf885ac98f13e26d6c3fdf6575512a8b65299043beeb4b86f6c0b1c884daaee73a5c77d09e474545
-AUX distccd.initd 341 BLAKE2B 0781b860647e68511d19d592cb65cf4c03ea15a8499783755772f5a448393befc2b450de703168a2b062e9fe0d8690a7ea3cda271a5bad2560099c0b5dc6c12f SHA512 bd5aecda5153589a78cd5ff82c34b10176efbd994ab82caf8f63951c04983f6e65459784c1e7644a323ad1696aa0a62b38e863ee1c42a15241a60b22942f8dce
+AUX distccd.confd 1328 BLAKE2B d6a4756afbe7813733227091028e1db570371750bd22dedbfb66e4d86e995138cdc3a63c853b5674c8678bf0475d7276c45f74b40ac916d060760f06ac3fdf73 SHA512 e6ff0547892b9e7a255afeb56eb07516e4b328d86d5d987872f1bf24a973132544e9f17195e5f8827305218429adb1c5290cde3ef1c094efd035592cbdde7eec
+AUX distccd.initd 374 BLAKE2B 48011f19225536311701250470011bc1c1be16f2400831964dd5e28920d4a0c955565a15b5014118e6fa65f4ac12c99d2f2dc6a63c1aa5863b0ef9633953ff82 SHA512 f707bdb15066e4eab4481c6be7e482e81f58586456123b42ddc3e92b0d7973b81975e3670166e20d0814b0c0d7441bec7788e9bd16af5fa9746380895b23bf65
 AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc
 AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6
 DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135
-EBUILD distcc-3.3.3.ebuild 5603 BLAKE2B 9fbc1d99af2dc7cc38764ea523dc6e7135ab70b7148528ff747a97f914b213f23d7997d3b2cceef651f394e0452776b5981704629d7751535fdca03fc7d33db9 SHA512 7499b9037cc7590e6742f68161b1a2bbd7e414ce0be3ccd46cd2059cdc66452878a10979b3d5381347ad1c4c77393f8025d1467567c0369b5d182938deaa3e9f
+EBUILD distcc-3.3.3-r1.ebuild 5603 BLAKE2B 9fbc1d99af2dc7cc38764ea523dc6e7135ab70b7148528ff747a97f914b213f23d7997d3b2cceef651f394e0452776b5981704629d7751535fdca03fc7d33db9 SHA512 7499b9037cc7590e6742f68161b1a2bbd7e414ce0be3ccd46cd2059cdc66452878a10979b3d5381347ad1c4c77393f8025d1467567c0369b5d182938deaa3e9f
 MISC metadata.xml 606 BLAKE2B e6d738b3d7fed20430d4ae45738c9e4b2447a61a1a57735bf0fa8e1e177e1e0d027a71ebff71de9cbcc5d1d5800a31946002b1e36d73a8c31b2c097360a1dc64 SHA512 e196028491d2e4bcbb7390e220313a1ce4f5a41706a792775d31c66b3caf92bbb23680d26d3f41d285b2ba2f8b4dceb4e09760ac7ed0724eafdbc4b2ca8ecc6f
diff --git a/sys-devel/distcc/distcc-3.3.3.ebuild b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
index 826019c73427..826019c73427 100644
--- a/sys-devel/distcc/distcc-3.3.3.ebuild
+++ b/sys-devel/distcc/distcc-3.3.3-r1.ebuild
diff --git a/sys-devel/distcc/files/distccd.confd b/sys-devel/distcc/files/distccd.confd
index bc08d40777d3..736527a4a899 100644
--- a/sys-devel/distcc/files/distccd.confd
+++ b/sys-devel/distcc/files/distccd.confd
@@ -35,3 +35,8 @@ DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24"
 # set this for niceness
 # Default is 15
 DISTCCD_OPTS="${DISTCCD_OPTS} -N 15"
+
+# By default distccd stores temporary files in /tmp
+# Make sure to give distcc user write permission to
+# the given TMPDIR
+#TMPDIR="/tmp"
diff --git a/sys-devel/distcc/files/distccd.initd b/sys-devel/distcc/files/distccd.initd
index 7673ff2cf429..963f7b74c12e 100644
--- a/sys-devel/distcc/files/distccd.initd
+++ b/sys-devel/distcc/files/distccd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -11,3 +11,5 @@ command="${DISTCCD_EXEC:-usr/bin/distccd}"
 command_args="--user distcc --daemon --no-detach ${DISTCCD_OPTS}"
 command_background="true"
 pidfile="/run/${RC_SVCNAME}.pid"
+
+export TMPDIR="${TMPDIR:-/tmp}"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index f33dda34ed56..6ff16615c48f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -13,6 +13,7 @@ AUX gcc-4.9.4-bootstrap.patch 2698 BLAKE2B 2fe9519590f0870aa201d550e027eaec31196
 AUX gcc-8.3.0-ia64-bootstrap.patch 1327 BLAKE2B b8f2e46eb619830fec5f44350bac7f4e0908bca0460df642269b1404e3a11526142f9e658a0c4598ada21e68353d137e892eb827fcec3a25516775e8d89ecb40 SHA512 8c6802ec130bb618b675f8519729f096933d19ff246d10e231ec9e94ece532a06edff905f5b83023e32416f99c06635714a3dfb767740d3786587536c7bd9554
 AUX gcc-8.3.0-norisc32.patch 1390 BLAKE2B fc9d4b5afb57631957d66086af67de5843c3a3421f855bedce747fe41b78f3423c33c0cbb00ac8f4ed27af0691d1f0a7b8342850826667f25ef8a2d63b4e6944 SHA512 8e32e1fe14bdb1b29a6ae3c64f7bfcb7db41ba3fadaa00a5f2b85e4d63991bbb624ef04789a313c277a016ad055795ddba23c69762c19e3a536d4cb101cca2fa
 AUX gcc-9.1.0-norisc32.patch 2559 BLAKE2B 3fd196fd55ea9aeba406b7dbfa60e4c888e1cce7982f6ca35432161f9d523ec05d676925a33c07b4a140d26f9920677a9f70803c1696d085f61dd58950281876 SHA512 3e9c9b172ef4b228a17b8e914816abc8360de8650625d34956a604ee233a0f4a8d05c10a23ac02b9da82ea34d97b852f164cfb5fa2d69de10a6da4c75255cb2e
+AUX gcc-9.2.0-neg-insn-cost.patch 728 BLAKE2B 31b393a42b5d54de07a43cc6e43dc9d7228905ceaf27f7541cad4baf4d1f475dfbf0b6c00e76e5cddaea382fb77909166843f16d2a76b07b9c42bb0e181b5781 SHA512 057c8fb003df37dd15bbfc7f9e87e07d8a1cdd67885f8efffb80aaa694cc9314bb7317b43e57be55d55b3dc58a29bde138b07738a2a0d6cb8454b270e1c88983
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54a00a88b5c389bbf93b8b61bc12c86a07df03d57280759e5485ac0cd89ea69826ace01b5720681ca3102640b SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16
@@ -97,6 +98,6 @@ EBUILD gcc-7.4.0-r2.ebuild 450 BLAKE2B a22393074c702ea3646c5ea7be69b84ad2055c0db
 EBUILD gcc-7.5.0.ebuild 460 BLAKE2B d1ee2bc661a09fe23dfdb82efcd4344fbf195e3752b54a594205e2f13bbedcce77d1196dbe2771265f5d5754b86fd53c7c253be0f92dc2816721fffed7b607f1 SHA512 1c0bd8cbfcafe1b4b02237932d86eb82ef6c3b3fb75212b5c67b207480a73c719f1371e5975a468440d7e3aa2307f043afe6c3651348f3d5ed01ddb29595c730
 EBUILD gcc-8.3.0-r1.ebuild 588 BLAKE2B 5698c6515258b61d3cdda3d8b0b8eb2a6134cdf26dd51e5e38c7fcc1ae48e104b7ae624b316f0583398e94d68fccad6d5c43ddcef055014f09e56dd3fb28369a SHA512 d997d0993122a0a80bebd6b49eb68113488a95e1a5c58770f72650804ddeefd0e5cb77139bb61dbbc7be379dde03e1f14235b07973a13bdfea869bcda426ea4b
 EBUILD gcc-8.3.0-r3.ebuild 545 BLAKE2B cca196e019ec3ee7ba29e90e0fd9f446c6b8b53fbfa287515645a53ada5a17d7a59cf7ef742a5c3593f6300afb8f1d3743e6d6f56ceee5c30194faba2c90088f SHA512 bb5448afa3dfc6eeec9329081ce83f82a1e919bc2a964134dadd285021d4f6dd100261bfcfa1875179bc66a42bb2ddd14141bf06911747256b11fb4989da050f
-EBUILD gcc-9.2.0-r2.ebuild 446 BLAKE2B 4e34a185dcfa48698bd64c6a0f0f47158c26b95d9956fce4d41ccaab3d104fe3f75a753b6d5f0e7306cc40acbc01e55747cba31e9a857f260aef7c85016d4d6e SHA512 7c265481f6575cea3f75ad35f4b1eab2c07b9adf2ce89751c0c0216a22dc0d8af8a2bd2fd1a03a724417b7935449d46c0e613d3dc77fe4d9189065b78da9fcd0
-EBUILD gcc-9.2.0-r3.ebuild 456 BLAKE2B 4c5bbafcba69f65751ab73ec7e6dd7bf6b3ba1a35964c5c2bf00fa92e921ae8b4c398f8da805cf558aa160f65e3828d5d9961e9537ffd70b64be36807a648708 SHA512 335f35dc3125660c52a241df199883cc635d8f9cfc3a9122c6a379ea4aedde08b6202709b4942e23b7e839053976db55751b3ac2b1909a92a3b0766f1aa9c992
+EBUILD gcc-9.2.0-r2.ebuild 542 BLAKE2B bedd2e29aa28770536db465d5041ef570bcb779a5160ba217a2932c4be05920ad750f5c1dc03cf96642213491b857663e736aba4942774bc312acf895ab15a6e SHA512 33d6a497b16c8929ab458a0f306a20b97b616cdd6b33c60f7d16a68611b576ce34ef0dbecbba1d05938427866dbd55c9df4a21bffd6da91d942d4949e1697dd6
+EBUILD gcc-9.2.0-r3.ebuild 609 BLAKE2B 6baf7985dd4e1d8e93cedd1f2d196639d38c21902d4435c132eebe63260e8770f2f4796c6e11aeeab0ae1d1b738e4f030eeed0ec0452f5b50c21894731c38b90 SHA512 f7c5c1c94fb736440a2a6066e40141230ed615aadf2fffb9c1307c0df8a6a5e8f6c7a4c50937973e720a9110b3b59a288ba8df940bb1c31ad780cccdc28f89e9
 MISC metadata.xml 2903 BLAKE2B 1dab10dda72341050bf32178c4d55b8199a0ddabfb6001b8da5c3286e9389eef6bf3d88309bf9273221fdfd65b102d824aa2ce702437c523a10a32ff8bfb7deb SHA512 c4e79dbbc7c76df4875ef287ee7aa916f65868743a7803e00836cb61bec0c1df2bb18974dec591075c3f78cd872b828218df7c7ded8455290df03a253df0320b
diff --git a/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch b/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch
new file mode 100644
index 000000000000..7a6bebdf4905
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/707958
+https://gcc.gnu.org/PR88879
+
+Subject: [PATCH] sel-sched: allow negative insn priority (PR 88879)
+From: Alexander Monakov <amonakov@ispras.ru>
+
+	PR rtl-optimization/88879
+	* sel-sched.c (sel_target_adjust_priority): Remove assert.
+
+From-SVN: r271039
+---
+ gcc/ChangeLog   | 5 +++++
+ gcc/sel-sched.c | 2 --
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+--- a/gcc/sel-sched.c
++++ b/gcc/sel-sched.c
+@@ -3331,8 +3331,6 @@ sel_target_adjust_priority (expr_t expr)
+   else
+     new_priority = priority;
+ 
+-  gcc_assert (new_priority >= 0);
+-
+   /* If the priority has changed, adjust EXPR_PRIORITY_ADJ accordingly.  */
+   EXPR_PRIORITY_ADJ (expr) = new_priority - EXPR_PRIORITY (expr);
+ 
+-- 
+2.25.0
+
diff --git a/sys-devel/gcc/gcc-9.2.0-r2.ebuild b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
index e2638f44d602..97327a276552 100644
--- a/sys-devel/gcc/gcc-9.2.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,3 +17,8 @@ DEPEND="${RDEPEND}
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 fi
+
+src_prepare() {
+	toolchain_src_prepare
+	eapply "${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch
+}
diff --git a/sys-devel/gcc/gcc-9.2.0-r3.ebuild b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
index 107ecc45981b..398613c13bee 100644
--- a/sys-devel/gcc/gcc-9.2.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,6 +14,13 @@ DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.13 )
 	>=${CATEGORY}/binutils-2.20"
 
+PATCHES=("${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch)
+
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
 fi
+
+src_prepare() {
+	toolchain_src_prepare
+	eapply "${FILESDIR}"/${PN}-9.2.0-neg-insn-cost.patch
+}
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 57d3c5faded8..3da56c6c3521 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -2,8 +2,10 @@ AUX gdb-8.3.1-gcc-10.patch 6940 BLAKE2B c3df7c53e9763984b43601361d6d157f7b8586b2
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 DIST gdb-8.3.1.tar.xz 20489528 BLAKE2B 5a671f620a2ed3337486a8ff53b93d65b3b6079e59ea07bc0f31e3ea6d459ced1d8549a76cfcf124762e0890e243eaabcf8b204bfc631002e759339a89b9bf9a SHA512 9053a2dc6b9eb921907afbc4cecc75d635aa76df5e8c4f0e5824ccf57cb206b299c19b127fff000b65c334826ff8304a54ff6098428365a8e997cca886c39e9a
 DIST gdb-8.3.tar.xz 20490300 BLAKE2B 24b2a2a9bda7ae8093f757e42d6d0ab5642ff1d7e5a832896c28c5b17961166072c0dae158c04d7f7660cb059194c259bcff71ad5763960027b0ac3d7045eb1a SHA512 47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1
-EBUILD gdb-8.3.1-r1.ebuild 6934 BLAKE2B 696e6b668b2cf1e4c527febc4c4172a0d1ffc5b97507f90c5f488468b71a81b9a252e06e036cc6c29e7be18bbd98c8a34cead02d93877b08e06f1fe282ae7e1d SHA512 4ae86e17536517ac37c53f6afd1e561d04d6efa4d0419f768b32863aaf2b389cd4961c59fc4dc591b4dcdeeab23e39ad2ba5590955c1001f34af7de586aaeb57
-EBUILD gdb-8.3.1.ebuild 6871 BLAKE2B f07683f851403890ac038d2040c3851762500e5d3e2293488871be3dd7d30a4c9ee5ae0f34b35813d491ed7bb8005f7666018c04e927782f548286480c8994e4 SHA512 ae82e3b38d2703d258b361d07881c28526551d7308fd93387fd67609844481c5ec6f8814777f708f6676b0396fa8abfd36a8a92461e1f2cbf67bda93ac9c556d
-EBUILD gdb-8.3.ebuild 6628 BLAKE2B 83bee25c12117e7e769ba8c025555b5a1ecb96ec330531ca77822bcf518312b5e0b5d1aceef25809da4d7408b3ec928dc051b4aae9da36a71e4422513ea08df0 SHA512 84e55cd0579f654d1d9b1761d6c02e446f4c063f70db92350e74e9bacedc251156ebc4bbb9fc833f1e55b8db0aa953bf296d6075f887c3d313911d6358a5afbd
-EBUILD gdb-9999.ebuild 6894 BLAKE2B 4491f716af4b9c6c09f16f67a33b919aed663fc6579721befe3f5b3fe5daa2f3e98a73a5b07a411817d92336a1eb53c5369b1773ff01c127082672741a7d8855 SHA512 73fe529a1c2fb60e51929de44121e5605d8af4de0367cc634555d4170ef274427572a8c910e6d2c4ee65e9361438c2dceadf62c2362c830d5b7bb44910a35a87
+DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7
+EBUILD gdb-8.3.1-r1.ebuild 6930 BLAKE2B 46e1ae2b125a405c30ffa938e98525a60df78b8f2e7138706856660bdd0f3bc36164e69b3fd72359b7bdc2ad864dbbae3108ea982b40d1897da74fbecb16fbd7 SHA512 e73f1b726dc57d6bfe8dc6c56465449ac64e5ad690f7e75bbf4086affdb16f4ead2ffbba191940fd75ad30f254bce52983c9c448c1d81b07881a36dccb8dcd1f
+EBUILD gdb-8.3.1.ebuild 6867 BLAKE2B df0082c86c451ab3ee1e01571cfef9b5bc8ea2ec0dfc1205db6da6e40b5407e8b5609096e3ad10f2ad843d21212501e668d0b99f48cb9cfb23002088f6854b2a SHA512 b92f997211bb8f50b8c97cf991b40467ad9042caca51eeb7c47767d484d0ab248b2aa4a2e9ed306adecf0c2334d0747d0b7324ff0d0cbdf6447d8ef28e8336c7
+EBUILD gdb-8.3.ebuild 6624 BLAKE2B 116845931bedb8e0e5f4ff3d4d89cb234e18bdd07cfb0c58f4d453e9129954386ddd4859b17d1e0b1bb127b50d130e0c1777fbb3764f789ecfc4681b32bc68d7 SHA512 16f59904ba8855dab383dfb50725e59650dc149c768a4b4bdc6c26860d96f37924b5a0bc6a5962a50ca95a5aae5467ab4715efc50d0e9704c73923b35c0ec1cc
+EBUILD gdb-9.1.ebuild 7192 BLAKE2B 1fa7e736be38c9d485442ea39a79034c175802ffc1f5fa35b8bb2e88520421ea3ba636ad95be488909cb7b91e1553091dd03426d5309e9554cb1dae5235353ac SHA512 a50ef31e605b35523fb77ac519218183a7c7a9079cfd7ec4948735aac36eaf0b27d46f7700d2135f1f3400ae032a7bc85e46fa52d238086bac55c5cc7d58c877
+EBUILD gdb-9999.ebuild 6849 BLAKE2B 73b89b117421e348190d9fc1716e50f2b9a61c319643da71f27aca45a28af974a1547274cd42fa7b76ff4822a71aa859237a68e41d1e831edc18b6d28d28db77 SHA512 04ff2335e3a2aac5ed5e6a866f903d890d0c1c825eb16428ef74eba841f0374d06252381910f5162c4d86e77d68efe395fc1093e0fcad831ed15ed5dfa960796
 MISC metadata.xml 1021 BLAKE2B 81d865fbf0282b889509edfd6901654f25e60474be0eeca406803dbee20260da840f323f036818edbe27635e5a8c944b53bfba9fd7b715301d1a3eaa50898dfc SHA512 2255a18e7275069a9d8011f8360399444924ca6a3baef788c2e44e790896ba388c974fceb36ae2d394afc943b481a785ec3c11657e5018b7cd5db0eaa869c530
diff --git a/sys-devel/gdb/gdb-8.3.1-r1.ebuild b/sys-devel/gdb/gdb-8.3.1-r1.ebuild
index b5cae39cf9b8..015c3bc58e76 100644
--- a/sys-devel/gdb/gdb-8.3.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
diff --git a/sys-devel/gdb/gdb-8.3.1.ebuild b/sys-devel/gdb/gdb-8.3.1.ebuild
index a818c73f4771..bdc663153f47 100644
--- a/sys-devel/gdb/gdb-8.3.1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
index 0d48fecc2854..8e01738db46c 100644
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ b/sys-devel/gdb/gdb-8.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
diff --git a/sys-devel/gdb/gdb-9.1.ebuild b/sys-devel/gdb/gdb-9.1.ebuild
new file mode 100644
index 000000000000..fa5deb598106
--- /dev/null
+++ b/sys-devel/gdb/gdb-9.1.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit eutils flag-o-matic python-single-r1
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+9999*)
+	# live git tree
+	EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
+	inherit git-r3
+	SRC_URI=""
+	;;
+*.*.50.2???????)
+	# weekly snapshots
+	SRC_URI="ftp://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${PV}.tar.xz"
+	;;
+*)
+	# Normal upstream release
+	SRC_URI="mirror://gnu/gdb/${P}.tar.xz
+		ftp://sourceware.org/pub/gdb/releases/${P}.tar.xz"
+	;;
+esac
+
+PATCH_VER=""
+PATCH_DEV=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+if [[ ${PV} != 9999* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	|| ( client server )
+"
+
+# ia64 kernel crashes when gdb testsuite is running
+# hppa kernel crashes when gdb testsuite is running
+RESTRICT="
+	hppa? ( test )
+	ia64? ( test )
+
+	!test? ( test )
+"
+
+RDEPEND="
+	client? (
+		dev-libs/mpfr:0=
+		>=sys-libs/ncurses-5.2-r2:0=
+		sys-libs/readline:0=
+		lzma? ( app-arch/xz-utils )
+		python? ( ${PYTHON_DEPS} )
+		xml? ( dev-libs/expat )
+		sys-libs/zlib
+	)
+	source-highlight? (
+		dev-util/source-highlight
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	client? (
+		virtual/yacc
+		test? ( dev-util/dejagnu )
+		nls? ( sys-devel/gettext )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+)
+
+GDB_BUILD_DIR="${WORKDIR}"/${P}-build
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	strip-linguas -u bfd/po opcodes/po
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# gnulib's or gdb's configure.
+		--disable-dependency-tracking
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{binutils,etc,gas,gold,gprof,ld}
+	)
+	local sysroot="${EPREFIX}/usr/${CTARGET}"
+	is_cross && myconf+=(
+		--with-sysroot="${sysroot}"
+		--includedir="${sysroot}/usr/include"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	if use server && ! use client ; then
+		# just configure+build in the gdbserver subdir to speed things up
+		cd gdb/gdbserver
+		myconf+=( --program-transform-name='' )
+	else
+		# gdbserver only works for native targets (CHOST==CTARGET).
+		# it also doesn't support all targets, so rather than duplicate
+		# the target list (which changes between versions), use the
+		# "auto" value when things are turned on.
+		is_cross \
+			&& myconf+=( --disable-gdbserver ) \
+			|| myconf+=( $(use_enable server gdbserver auto) )
+	fi
+
+	if ! ( use server && ! use client ) ; then
+		# if we are configuring in the top level, then use all
+		# the additional global options
+		myconf+=(
+			--enable-64-bit-bfd
+			--disable-install-libbfd
+			--disable-install-libiberty
+			# Disable guile for now as it requires guile-2.x #562902
+			--without-guile
+			# This only disables building in the readline subdir.
+			# For gdb itself, it'll use the system version.
+			--disable-readline
+			--with-system-readline
+			# This only disables building in the zlib subdir.
+			# For gdb itself, it'll use the system version.
+			--without-zlib
+			--with-system-zlib
+			--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+			$(use_with xml expat)
+			$(use_with lzma)
+			$(use_enable nls)
+			$(use_enable source-highlight)
+			$(use multitarget && echo --enable-targets=all)
+			$(use_with python python "${EPYTHON}")
+		)
+	fi
+	if use sparc-solaris || use x86-solaris ; then
+		# disable largefile support
+		# https://sourceware.org/ml/gdb-patches/2014-12/msg00058.html
+		myconf+=( --disable-largefile )
+	fi
+
+	mkdir "${GDB_BUILD_DIR}" || die
+	pushd "${GDB_BUILD_DIR}" || die
+		ECONF_SOURCE=${S}
+		econf "${myconf[@]}"
+	popd
+}
+
+src_compile() {
+	emake -C "${GDB_BUILD_DIR}"
+}
+
+src_test() {
+	emake -C "${GDB_BUILD_DIR}" check
+}
+
+src_install() {
+	if use server && ! use client; then
+		emake -C "${GDB_BUILD_DIR}"/gdb/gdbserver DESTDIR="${D}" install
+	else
+		emake -C "${GDB_BUILD_DIR}" DESTDIR="${D}" install
+	fi
+
+	if use client; then
+		find "${ED}"/usr -name libiberty.a -delete || die
+	fi
+
+	# Delete translations that conflict with binutils-libs. #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay ]] && dobin "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay
+
+	if use client ; then
+		docinto gdb
+		dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+			gdb/NEWS gdb/ChangeLog gdb/PROBLEMS
+	fi
+	docinto sim
+	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
+	if use server ; then
+		docinto gdbserver
+		dodoc gdb/gdbserver/{ChangeLog,README}
+	fi
+
+	if [[ -n ${PATCH_VER} ]] ; then
+		dodoc "${WORKDIR}"/extra/gdbinit.sample
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,standards}.info*
+
+	# gcore is part of ubin on freebsd
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		rm "${ED}"/usr/bin/gcore || die
+	fi
+
+	if use python; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# portage sucks and doesnt unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 91c997c92c31..0917eed36ce3 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils flag-o-matic python-single-r1
 
@@ -14,7 +14,6 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 fi
 is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
 
-MY_PV=${PV}
 case ${PV} in
 9999*)
 	# live git tree
@@ -86,8 +85,6 @@ BDEPEND="
 		nls? ( sys-devel/gettext )
 	)"
 
-S=${WORKDIR}/${PN}-${MY_PV}
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
 )
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 5afa665a572d..e854b80ebc44 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,12 +1,9 @@
 AUX gettext-0.19.7-disable-libintl.patch 1307 BLAKE2B fb3d4d95ffbe57b0d1d6e8ede596ca9d7d8587d9c883fa2fc54b8d1109210ac2b435b4709a16c2043cef6cc8d5448dc58adab74aa2e8ce834abdee51163d8c51 SHA512 7887d2fbf4b9d9677688e6d8d785b6c10c76bc330cb7b40da432e0a1ff0f7fc1355bf8f671041a37477baa6c8508b6e39f90ead468674febd62777506badc227
-AUX gettext-0.19.8.1-format-security.patch 3932 BLAKE2B 791b05e3c72792b290946c3347ec40374cb50a91648857cb0c2e380b8616d32be0958eb9b0f2bcd022049d8fc7d53ed3e9df824ca91621c31972f359c140bc1e SHA512 7e8149a3c1e09854bb2a6cbfbc4635567e45f2b7f1a555acf5ab723aead3ad1a3a9118002c353bf42a551b8be159640b597556731317d79efbffc2fc0d96dbb8
 AUX gettext-0.20-avoid_eautomake.patch 878 BLAKE2B 6272d4445501c1f96c40bbc506d64a29d32ea37b60d87b6a62b90176f64c34fd2a6a2549a47c42d4409cfb26de1b42136d740794d7059f7fce1cf67067104980 SHA512 9f765f34e68b887242d1b727ac36dc8f91ee50a6a0920c2f0697fd3c0d2369cc470e728612441f6cf4b9274ad737d985e3e69aa006adcae21a61a664eea2af38
 AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f29854eeb442179a415b5b3cab554b3aa4e2e3b06dabaa3e78ab506bb3b88b55a3fe4d53f1e43718bc6935a84dd477320c9349b70 SHA512 a15e8c415facd7b36761a747da9a0dfc47588d253a84b693c7f1f6e6334c6db5350af41f4c6c1dd83ae61695b2f761cc3b24339d7bb8f4dce972a672312ad942
 AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956
-DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 DIST gettext-0.21-rc1.tar.bz2 16947151 BLAKE2B 9bd846afdbe0b5cb82ce7d3b962fdaf6282be000d692d1109ffb7197fc081442f42b83f8c9332c430f2ce9676e15faba180c4ebfde81bc76545480830bf2fd80 SHA512 f8236062456e823f7e14b2bc9fbaaa82c7772605e3624e0114f6fc5a122c935ac5bf7015d35df694f69de8127b6f17a2862a3761a2a97dc3b4c19b768dbbc909
-EBUILD gettext-0.19.8.1.ebuild 3944 BLAKE2B 252d07123487ca11cd5a35b1364e521d9c54e0ca78c7a0a34ef6368f2eed8c933acc090975d242a589cc122ddd0f76620fdaba9ab7f694f22df15ee20805dbd2 SHA512 bdcd7b64f8c826bee49cc34b75fd9ce37df89c385713ca37ac2ce168c00346815874431d8047a8091b76984d03c7885843ad763252864410f5690503071a5315
 EBUILD gettext-0.20.1.ebuild 4052 BLAKE2B 747f6257773f23d4eab40735ead1976e7a9af9516076e935b06f9e34009f68d5e085c395adaf67fede4144691c764c86abb3c66372cd28fa70e58ba44260717b SHA512 911945d06bcc82f00f2b678e71759c869c9ebb738f34d5e915e73be017345845dc0acfbbf02b9030e77679dd94351317a0ede74bb8f98dd47111430eb6030c11
 EBUILD gettext-0.21_rc1.ebuild 4188 BLAKE2B 8b891dc26e504e0cdb74f2237177413c2f728c8b7e31a0cc1000d0cc31409389bec4c3dff99e1660412becda2347c0c2ff88f3df2a556da47e754fed6aab63ed SHA512 a9bce110ab72e3115b4506b505e530470aa9e9fda7d0dba47d36061d3e3fe9374ad74326512a8d0d4fcdd7ad5997bfff2fa60f9a11af567d32f3f7c5cd5f8edc
 MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507
diff --git a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch b/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
deleted file mode 100644
index 6af160419877..000000000000
--- a/sys-devel/gettext/files/gettext-0.19.8.1-format-security.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e546de65a333789e83f5485757967cee29ee3681 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Sun, 19 Feb 2017 23:32:46 -0800
-Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
-
-Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
-| gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset':
-| gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security]
-|                  fprintf (a_fp, str) ;
-
-And:
-gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=]
-       fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- gettext-tools/gnulib-lib/libcroco/cr-statement.c | 10 +++++-----
- gettext-tools/gnulib-lib/libxml/timsort.h        |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gettext-tools/gnulib-lib/libcroco/cr-statement.c b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-index 617520f..100104b 100644
---- a/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-+++ b/gettext-tools/gnulib-lib/libcroco/cr-statement.c
-@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
-         g_return_if_fail (a_fp && a_this);
-         str = cr_statement_ruleset_to_string (a_this, a_indent);
-         if (str) {
--                fprintf (a_fp, str);
-+                fprintf (a_fp, "%s", str);
-                 g_free (str);
-                 str = NULL;
-         }
-@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent)
-         str = cr_statement_charset_to_string (a_this,
-                                               a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent)
- 
-         str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str);
-+                fprintf (a_fp, "%s", str);
-                 g_free (str) ;
-                 str = NULL ; 
-         }
-@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this,
- 
-         str = cr_statement_media_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp,
- 
-         str = cr_statement_import_rule_to_string (a_this, a_indent) ;
-         if (str) {
--                fprintf (a_fp, str) ;
-+                fprintf (a_fp, "%s", str) ;
-                 g_free (str) ;
-                 str = NULL ;
-         }
-diff --git a/gettext-tools/gnulib-lib/libxml/timsort.h b/gettext-tools/gnulib-lib/libxml/timsort.h
-index 795f272..443918a 100644
---- a/gettext-tools/gnulib-lib/libxml/timsort.h
-+++ b/gettext-tools/gnulib-lib/libxml/timsort.h
-@@ -323,7 +323,7 @@ static void TIM_SORT_RESIZE(TEMP_STORAGE_T *store, const size_t new_size)
-     SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
-     if (tempstore == NULL)
-     {
--      fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
-+      fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
-       exit(1);
-     }
-     store->storage = tempstore;
--- 
-2.10.2
-
diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild
deleted file mode 100644
index eb057564fb3e..000000000000
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: Keep version bumps in sync with dev-libs/libintl.
-
-EAPI="5"
-
-inherit epatch epunt-cxx ltprune mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="https://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-# Only libasprintf is under the LGPL (and libintl is in a sep package),
-# so put that license behind USE=cxx.
-LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
-
-# only runtime goes multilib
-# Note: The version of libxml2 corresponds to the version bundled via gnulib.
-# If the build detects too old of a system version, it will end up falling back
-# to the bundled copy.  #596918
-# Note: expat lacks a subslot because it is dynamically loaded at runtime.  We
-# would depend on older subslots if they were available (based on the ABIs that
-# are explicitly handled), but expat doesn't currently use subslots.
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.3:=
-	dev-libs/expat
-	acl? ( virtual/acl )
-	ncurses? ( sys-libs/ncurses:0= )
-	java? ( >=virtual/jdk-1.4:= )"
-RDEPEND="${DEPEND}
-	!git? ( cvs? ( dev-vcs/cvs ) )
-	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# only installed for native ABI
-	/usr/include/gettext-po.h
-)
-
-QA_SONAME_NO_SYMLINK=".*/preloadable_libintl.so"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168
-	epatch "${FILESDIR}"/${PN}-0.19.8.1-format-security.patch
-
-	epunt_cxx
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# switches common to runtime and top-level
-		--cache-file="${BUILD_DIR}"/config.cache
-		--docdir="\$(datarootdir)/doc/${PF}"
-
-		# Emacs support is now in a separate package
-		--without-emacs
-		--without-lispdir
-		# glib depends on us so avoid circular deps
-		--with-included-glib
-		# libcroco depends on glib which ... ^^^
-		--with-included-libcroco
-		# this will _disable_ libunistring (since it is not bundled),
-		# see bug #326477
-		--with-included-libunistring
-		# Never build libintl since it's in dev-libs/libintl now.
-		--without-included-gettext
-		# Never build bundled copy of libxml2.
-		--without-included-libxml
-
-		$(use_enable acl)
-		$(use_enable cxx c++)
-		$(use_enable cxx libasprintf)
-		$(use_with git)
-		$(usex git --without-cvs $(use_with cvs))
-		$(use_enable java)
-		$(use_enable ncurses curses)
-		$(use_enable nls)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-
-	local ECONF_SOURCE=${S}
-	if ! multilib_is_native_abi ; then
-		# for non-native ABIs, we build runtime only
-		ECONF_SOURCE+=/gettext-runtime
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		dosym msgfmt /usr/bin/gmsgfmt #43435
-		dobin gettext-tools/misc/gettextize
-	fi
-}
-
-multilib_src_install_all() {
-	use nls || rm -r "${ED}"/usr/share/locale
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
-
-	if use java ; then
-		java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar
-		rm -f "${ED}"/usr/share/${PN}/*.jar
-		rm -f "${ED}"/usr/share/${PN}/*.class
-		if use doc ; then
-			java-pkg_dojavadoc "${ED}"/usr/share/doc/${PF}/javadoc2
-			rm -rf "${ED}"/usr/share/doc/${PF}/javadoc2
-		fi
-	fi
-
-	if use doc ; then
-		dohtml "${ED}"/usr/share/doc/${PF}/*.html
-	else
-		rm -rf "${ED}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/*.html
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index d7c2794fb8c3..68d365eddcce 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -13,7 +13,6 @@ AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b20
 AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c483e348786fb1cede29b09fa8e74d0fcf7fdb6ad36fd980823d13b3e20cc7a54d5c518e0f557928b440ef9d0fd6723a8d5f8774c098 SHA512 05c1cee7a3d90bf4768cabaaba47290dc668db7c14173abf99ed8e64dae92191537f89c3304a4d42c01ecc2280d37104c47f621e44b3d19db481846bb225a2a1
 AUX libtool-2.4.6-sed-quote-speedup.patch 7619 BLAKE2B 14e0341bb5b5878dd9bab5996a63d849c5d8c257618a87792bf7c904481d07430553102da2917cb518c37790d2321ae6202572ab59614a8291e475fc8a043ee6 SHA512 f5658f87edc24e494fff1ad2b1932dcd4a8a1515e88a10f3d5bc076ac69570e11c4559a8a56d577dc24181de262c97d6c1cfb16b9cd8315264cf55bc1351bf71
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libtool-2.4.6-r3.ebuild 2565 BLAKE2B e21233d3096fab4c39b6828ade696d8aec8870773f66dbb14ec294b57f4151f5677380b6fc86e36d67d757afefdfa46a9fbab4faa4a82f0ae7dd748f8a265be3 SHA512 2e0791f01b88974d9ace1b74cf92527bb2998f78d0e5eedb86385eaec6f1d1b248c70d8e6584b19de61dcbc384fdbedfc08994fabda48bb327e5c394cd30c495
 EBUILD libtool-2.4.6-r6.ebuild 3583 BLAKE2B 84848878036290a5e51be69d5aede07f58069618c8ae3b563dbede35872bfea22d1d076644178fba08b8acf5afef0a731af749e6d897543ce183809356f3cb6b SHA512 c4e2a42524beaac9b2744be52990e51702ace31ff5096e359ff16cacbcd48be7637773b76349d270ce29abfee7e381541137cbb29f915e60dd1f37dcdf9b7de7
 EBUILD libtool-9999.ebuild 3236 BLAKE2B 2f47c0b3326d3f88b70591d3b23c5c8eeecb2b974e04b8ee08528e28fa83f9b3cae0ace76b94d53b21309f45003b5b730c21636e1a8ced3db8b2db183a7b6e1f SHA512 eb064c77276e9c912c667ef075779c5a0423270ba6cf0b11e39fccb4dadea7910d18437e12b72604b6c82ee0238a667f6e81842eab0dc0734d26a44519f2572b
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/sys-devel/libtool/libtool-2.4.6-r3.ebuild b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
deleted file mode 100644
index 96b79d172469..000000000000
--- a/sys-devel/libtool/libtool-2.4.6-r3.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"
-
-LIBTOOLIZE="true" #225559
-WANT_LIBTOOL="none"
-inherit autotools epatch epunt-cxx multilib unpacker
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/"
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="vanilla"
-
-# Pull in libltdl directly until we convert packages to the new dep.
-RDEPEND="sys-devel/gnuconfig
-	>=sys-devel/autoconf-2.69
-	>=sys-devel/automake-1.13
-	dev-libs/libltdl:0
-	!<sys-apps/sandbox-2.10-r4"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cd "${S}"
-		./bootstrap || die
-	else
-		unpacker_src_unpack
-	fi
-}
-
-src_prepare() {
-	use vanilla && return 0
-
-	epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
-	epatch "${FILESDIR}"/${P}-link-specs.patch
-	epatch "${FILESDIR}"/${P}-link-fsanitize.patch #573744
-	epatch "${FILESDIR}"/${P}-link-fuse-ld.patch
-	epatch "${FILESDIR}"/${P}-libtoolize-slow.patch
-	epatch "${FILESDIR}"/${P}-libtoolize-delay-help.patch
-	epatch "${FILESDIR}"/${P}-sed-quote-speedup.patch #542252
-	epatch "${FILESDIR}"/${P}-ppc64le.patch #581314
-	pushd libltdl >/dev/null
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	popd >/dev/null
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	epunt_cxx
-
-	# Make sure timestamps don't trigger a rebuild of man pages. #556512
-	if [[ ${PV} != "9999" ]] ; then
-		touch doc/*.1
-		export HELP2MAN=false
-	fi
-}
-
-src_configure() {
-	# the libtool script uses bash code in it and at configure time, tries
-	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
-	# cause problems for people who switch /bin/sh on the fly to other
-	# shells, so just force libtool to use /bin/bash all the time.
-	export CONFIG_SHELL=/bin/bash
-
-	# Do not bother hardcoding the full path to sed.  Just rely on $PATH. #574550
-	export ac_cv_path_SED=$(basename "$(type -P sed)")
-
-	ECONF_SOURCE=${S} econf --disable-ltdl-install
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	local x
-	while read -d $'\0' -r x ; do
-		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
-	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 7d0003bec6f7..698831aa14f1 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,10 +4,10 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lld-10.0.0.9999.ebuild 1457 BLAKE2B 43b1aa0346348a59b00d021d516b62529ae0cb2884c975ea68373263173b421c200abf6e4d95db38314a7424859fb0290f24790cc355e5da4f24f6e5cec56d3c SHA512 ab143ad9ae74766b839206d9bd910b6cb1766f683f04dee1bef0498f4bde3ec817f9b0d23c2fc7e72cabd9c29136db953a40d5cb3337b0e216b9760d773a4b13
-EBUILD lld-10.0.0_rc1.ebuild 1457 BLAKE2B 43b1aa0346348a59b00d021d516b62529ae0cb2884c975ea68373263173b421c200abf6e4d95db38314a7424859fb0290f24790cc355e5da4f24f6e5cec56d3c SHA512 ab143ad9ae74766b839206d9bd910b6cb1766f683f04dee1bef0498f4bde3ec817f9b0d23c2fc7e72cabd9c29136db953a40d5cb3337b0e216b9760d773a4b13
-EBUILD lld-11.0.0.9999.ebuild 1457 BLAKE2B 43b1aa0346348a59b00d021d516b62529ae0cb2884c975ea68373263173b421c200abf6e4d95db38314a7424859fb0290f24790cc355e5da4f24f6e5cec56d3c SHA512 ab143ad9ae74766b839206d9bd910b6cb1766f683f04dee1bef0498f4bde3ec817f9b0d23c2fc7e72cabd9c29136db953a40d5cb3337b0e216b9760d773a4b13
+EBUILD lld-10.0.0.9999.ebuild 1451 BLAKE2B 0671ae0ee11d66cb8639483200ad22d27c6b125b2c774dec81e87ce34748431ad2a9e178a27fc10b23050d07bc192ea9ee22f87c265997de0097b095353aca4b SHA512 60d132707bda9f965644ad7e93e2d84fc8d0e5c130178766a0151014d503b3c1d43cac9dc8c90b2e45d4451a16b91763ff44087521a7e8730a065456859ec258
+EBUILD lld-10.0.0_rc1.ebuild 1451 BLAKE2B 0671ae0ee11d66cb8639483200ad22d27c6b125b2c774dec81e87ce34748431ad2a9e178a27fc10b23050d07bc192ea9ee22f87c265997de0097b095353aca4b SHA512 60d132707bda9f965644ad7e93e2d84fc8d0e5c130178766a0151014d503b3c1d43cac9dc8c90b2e45d4451a16b91763ff44087521a7e8730a065456859ec258
+EBUILD lld-11.0.0.9999.ebuild 1451 BLAKE2B 0671ae0ee11d66cb8639483200ad22d27c6b125b2c774dec81e87ce34748431ad2a9e178a27fc10b23050d07bc192ea9ee22f87c265997de0097b095353aca4b SHA512 60d132707bda9f965644ad7e93e2d84fc8d0e5c130178766a0151014d503b3c1d43cac9dc8c90b2e45d4451a16b91763ff44087521a7e8730a065456859ec258
 EBUILD lld-7.1.0.ebuild 1725 BLAKE2B 61454551884ee0d7d50ea65b4816ad516784f81965dca35ee696547e367ac446692c3430660f3d0b82446974d264ca0671517a2d3ed04fe3d263a4b435657923 SHA512 10fc7671b1afc5db3cc2a854e6b1f7c6b297c67967c6a90efb392537f5dc3b7150f4efe60a92554b2332dd2ce27284405053dc6c42d4a51ee739ead9ca65d1f4
 EBUILD lld-8.0.1.ebuild 1794 BLAKE2B 31cf9d99132629908515eb9a8c6b074caa7b84bfbd86446fcd7f65391e247ac23ffd272b715836fc0d787c004a00f613c2c7b0d1bff96a1c8e9054554ae3fe41 SHA512 3d29acfa6f2eedd49917bf811f93f0f9646de38f4b17cf78d748e93c0bb0653f95e7ff1d6aefa0e77ad7af4479f7d3b27d4b10a49ae34aa86efcbeb636064e79
-EBUILD lld-9.0.1.ebuild 1330 BLAKE2B b9891caafd13ea1f74b7e32c6b69355a5345b6a946b818b76ea4a840f913cbcb0c14ed5b324951feec4df7e7be0b26f2f41cec39a37fea2498274f99dd7f84d4 SHA512 9cce8c54f52e22e6b2ce1f9995b88eb46c4e86333f21dcba4175e544945b8381363f51b759c72e9b50a29a0d38a8fc78826a4bf7abbb70d9617cdf6de56c5e4d
+EBUILD lld-9.0.1.ebuild 1324 BLAKE2B 2f394afbbda45b7525ac8ddd76608720202c5a015d9c3e9658bc786195a969c504ccef4e3542391fc72fe87c9c90d10445756e8ff5baadd6040d5006b67b1c72 SHA512 4c6b6852d34f9108d9bc9ab702717b18d8bf740076efcac9627cfc66a9aa25f5e7da736f18723c580e644f3f0d4369ad8dc61a9324ce78f93f46d4353e136dda
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-10.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.0.9999.ebuild
index 8d0d48bb02cc..664086deab85 100644
--- a/sys-devel/lld/lld-10.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
diff --git a/sys-devel/lld/lld-10.0.0_rc1.ebuild b/sys-devel/lld/lld-10.0.0_rc1.ebuild
index 8d0d48bb02cc..664086deab85 100644
--- a/sys-devel/lld/lld-10.0.0_rc1.ebuild
+++ b/sys-devel/lld/lld-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild
index 8d0d48bb02cc..664086deab85 100644
--- a/sys-devel/lld/lld-11.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
diff --git a/sys-devel/lld/lld-9.0.1.ebuild b/sys-devel/lld/lld-9.0.1.ebuild
index 4aadc56f36fe..57dccad139ec 100644
--- a/sys-devel/lld/lld-9.0.1.ebuild
+++ b/sys-devel/lld/lld-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index e667daa57859..d8c5544040c0 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -8,10 +8,10 @@ DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c894
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-10.0.0.9999.ebuild 12399 BLAKE2B 66b8e35c728127b6afadace59176f68206b7c2c8174f379abe560e0336425b049ed98535b71456b7e5d2f24bc6092d1265358a8b61302abb8a1d5e37c41dc751 SHA512 ebeec9f436fbbdad29953545f7fc43980c800b23d2c8be79c3a6f8a94d54f22a78fa7e8157e2ebd1a0aefb7b661d078a5706a1a712f0ffbd7899b42b589c8c3f
-EBUILD llvm-10.0.0_rc1.ebuild 12399 BLAKE2B 66b8e35c728127b6afadace59176f68206b7c2c8174f379abe560e0336425b049ed98535b71456b7e5d2f24bc6092d1265358a8b61302abb8a1d5e37c41dc751 SHA512 ebeec9f436fbbdad29953545f7fc43980c800b23d2c8be79c3a6f8a94d54f22a78fa7e8157e2ebd1a0aefb7b661d078a5706a1a712f0ffbd7899b42b589c8c3f
-EBUILD llvm-11.0.0.9999.ebuild 12399 BLAKE2B 66b8e35c728127b6afadace59176f68206b7c2c8174f379abe560e0336425b049ed98535b71456b7e5d2f24bc6092d1265358a8b61302abb8a1d5e37c41dc751 SHA512 ebeec9f436fbbdad29953545f7fc43980c800b23d2c8be79c3a6f8a94d54f22a78fa7e8157e2ebd1a0aefb7b661d078a5706a1a712f0ffbd7899b42b589c8c3f
+EBUILD llvm-10.0.0.9999.ebuild 12393 BLAKE2B c4b87b8137840d5a1fd7fa3adf90c1336e2ef4c676bf4edcaf95d200af690b898b9a3201afb386719a0247f327cf809a9b9e3f13c6b80b7ffd60cb381bf74ac3 SHA512 3674c0c6b34ef504058ec97c7973f1feb60076c1c1c35dc98a05e29c9ba635501ecee861b27b529bf5f9e091337e68ede3a150da12ed61ffe7ced6d616d8f517
+EBUILD llvm-10.0.0_rc1.ebuild 12393 BLAKE2B c4b87b8137840d5a1fd7fa3adf90c1336e2ef4c676bf4edcaf95d200af690b898b9a3201afb386719a0247f327cf809a9b9e3f13c6b80b7ffd60cb381bf74ac3 SHA512 3674c0c6b34ef504058ec97c7973f1feb60076c1c1c35dc98a05e29c9ba635501ecee861b27b529bf5f9e091337e68ede3a150da12ed61ffe7ced6d616d8f517
+EBUILD llvm-11.0.0.9999.ebuild 12393 BLAKE2B c4b87b8137840d5a1fd7fa3adf90c1336e2ef4c676bf4edcaf95d200af690b898b9a3201afb386719a0247f327cf809a9b9e3f13c6b80b7ffd60cb381bf74ac3 SHA512 3674c0c6b34ef504058ec97c7973f1feb60076c1c1c35dc98a05e29c9ba635501ecee861b27b529bf5f9e091337e68ede3a150da12ed61ffe7ced6d616d8f517
 EBUILD llvm-7.1.0.ebuild 7719 BLAKE2B ac71ea47d929d615fcc8223dcc2d0235f9fdea5aacdd93390017fcf35f7d341f3fca6ea583078f82e56cb12a2983dfb66822377ac33fcef4ad789af0c1a9cd4d SHA512 88f71d65812a4050b171f9ad794e76b4419e6b27df9d7a5f5f5917de9e90c120ae4080f0df39c965e26fc99a5676db5f8f19feac33291924915eb8fabce095a2
 EBUILD llvm-8.0.1.ebuild 8528 BLAKE2B fd37d9d02815f01541be12a4e064d570b019fb9fa17fa5b13a20f769b1ab12e30806221b584a6b858cb4206271cfa7717ca60ef0f0f7b3aeb7ee32ae22bb18c5 SHA512 fdee897c057332ef2b60e91701f17583a5885561aa0d07e6640227c9457a6953188c8d743b906365c91428269617dbf620943ea60199ad1ca8acf995b1b21820
-EBUILD llvm-9.0.1.ebuild 8566 BLAKE2B 077150fc99f6336e68e8c4a8d9ce1d3e9507049a011fd5d21b6132e239b85bd0c75799da664c5a7adc9501c7fb018083cbb1449003a8d9af2cecf76811de36a4 SHA512 2f7a25b03300dc3fe0b0ec7d22432fe4d151be045eabe6b3a5c987cfad7d0078cb4af46c5eddb26a6d6796191e1813cc5dffaf993fbd023e1a835708af55fa2d
+EBUILD llvm-9.0.1.ebuild 8560 BLAKE2B b63de028f5fa5da66234a02e5398347b7310c56e2cf9325aca8f0267dd04a3eabf8afa3f4b2580479e6b7afcbf7b3c010394e34a408f5fc892f2ca9250aee1bb SHA512 2060629c5abe6132e9557769876182a33e44352a19ed01e021e455279a2692ab8531028af586cfb72ee532210e840c0a3e0a3f9d1262f7471fe59d75cf1be314
 MISC metadata.xml 2563 BLAKE2B ca85030788fb213fc891d895238fd75562cdd25cc5fe4271d709cb1c00ef56b0e8b367dc70cc18f7d185d6fbdb57333e219a984220b60141d28fb4784b2cb94a SHA512 8de68ee7f964e6eb2613bd2ff584f834e0f5a3ae8b303b5f2f10fda718a87af9b8ddfc19399950fe4eb8be515930124ced8018190af0f69da7ec5fe8180a68a2
diff --git a/sys-devel/llvm/llvm-10.0.0.9999.ebuild b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
index 66f38cdf8f9b..0382dba1d35a 100644
--- a/sys-devel/llvm/llvm-10.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
diff --git a/sys-devel/llvm/llvm-10.0.0_rc1.ebuild b/sys-devel/llvm/llvm-10.0.0_rc1.ebuild
index 66f38cdf8f9b..0382dba1d35a 100644
--- a/sys-devel/llvm/llvm-10.0.0_rc1.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
diff --git a/sys-devel/llvm/llvm-11.0.0.9999.ebuild b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
index 66f38cdf8f9b..0382dba1d35a 100644
--- a/sys-devel/llvm/llvm-11.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
diff --git a/sys-devel/llvm/llvm-9.0.1.ebuild b/sys-devel/llvm/llvm-9.0.1.ebuild
index 846bf17d9754..9bfbe3774a67 100644
--- a/sys-devel/llvm/llvm-9.0.1.ebuild
+++ b/sys-devel/llvm/llvm-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils llvm.org multilib-minimal multiprocessing \
 	pax-utils python-any-r1 toolchain-funcs
 
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 8e9e32752e01..df663a287250 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 3d1528eea96d..96c910ddcc7b 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,6 +1,6 @@
 DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
 DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
 DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
-EBUILD edk2-ovmf-201905.ebuild 4364 BLAKE2B 1fb2d01168e51a3d2f638d82d78d5ab68cc07987165513810a04563a70e28f23fb3ded4c164c592df8e966fce5366703a069c1f5443a29bd1b2590b85341a869 SHA512 6f0f6229cb6f6b3115801c2b9aeb2ab970d3bb0041807a4101cc5ad1587a1c4af4833901566dcc204563a32186a2ea5f7726cf335a114ae6e24c10b262667cd7
-EBUILD edk2-ovmf-999999.ebuild 3896 BLAKE2B b4fd1d72afaaf6e4efe6729d10bb8ce835bdd3e5586e1ba97ccb551dde79c3c8fa7545cdb2993e649a80dedf363c500df028fa61b38bd688de256925f3b81d80 SHA512 fa6e2b4f94937b2e2007820453ce3b94d463db368d36e56f9fedd2adfe4f741d15a03e60cabc12bd084f7aab196861cac7aa56fc0e6d58a47cff6c8b79d76af2
+EBUILD edk2-ovmf-201905.ebuild 4360 BLAKE2B 6a6e720605970e90f00f85bfe04ecb05f4232cb94cd937932b75aa44d84051426ec45c398c154f9e718d6ea8c393a818e6c06b88b096db52e604c68d1ef7a0d8 SHA512 d19aee8e261c930b20016906bdbf4bea67ddbb5039a890134d0109042bb87aba9c7bd04465ca3a2cecf31e665dc8354b9ad0d1755a870dbdb6f53ca3df333a75
+EBUILD edk2-ovmf-999999.ebuild 3892 BLAKE2B db584887a75633b6ee59c6cac80a08471b05122ba03a505e457f418266464ad946e83c5a3324fbed0bf133ddcb6f6f964627923838e8b7f1bc0ab3760b60fcca SHA512 ceeaae071df011ac577e8e8ffd2430f877c0a778c6858868b2cbb89fadabb0390c9ffe8099da9a2d534212171078c34682eca54b62829453619a001a95beb718
 MISC metadata.xml 435 BLAKE2B b33371654b280e097ad5d112081f115446cb01a0efcf3e712bcad7e5a51d95b77f55d0e218c4767803675b71d24b405616849f57051fda492acf5d3c0e8fd1dc SHA512 d1e6233650fc1ea3a25bead14091877b9f507d2bc78cec6436e1b6e17477e40517b74da66e26b6bd39259e4ca308d724324296f1a6c353fed2f8bf112029b90f
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 13b1feca47fb..1abe540a07b8 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils python-any-r1 readme.gentoo-r1
 
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
index 4e5483b25b7a..e8acffa9d29d 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-999999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit eutils python-any-r1 readme.gentoo-r1
 
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index 43cca6e93488..b03c55d93f91 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,4 +1,4 @@
-DIST intel-microcode-collection-20191110.tar.xz 5487112 BLAKE2B 89674e81857235abfdc21e50c767c702cd52da0c61c2c860bc8484c0d2b6c368601c5b1db956e90c9039c3e0b9d79139ed15e3a1a8c5a203e2cf196db69ade79 SHA512 b82221b7f506126613a80d1b8d0e47f4fea9debc51f5390c67eb50fda01677d60f50573376172054973c46563911dc79feb7b8d2cf35f53813c3a93228e7e2ee
+DIST intel-microcode-collection-20200209.tar.xz 5858536 BLAKE2B 3618666b98f98c63af2c7d8accfe94adce6578b6c36452a3abe66df7b7a9f63465bb5b4c638ea0ed09f4a8df0a08b9efb8aede54d140c391a209c57aede5e85b SHA512 0d771011c6d9376c7c220b68916f7a8e261517034c543b4368d8a55850810053f410275f5a1973274e00e93e0ec2a0e86081b799ccfcef2e0c120209ee23e067
 DIST microcode-20191115.tar.gz 2998063 BLAKE2B a06f2769da1577b9ce3a34f447e182312d003842b043372d850de51012efd9c0247f9a6bc8964e3da6127f8afb58f3fb31b1204e7286af9b27c795c00419ef7e SHA512 11014c16bde83ac290bc75e458242f5e64b8dffd49de2e938f61f4a09979cd5e80dd1a85d2ccbac067e4398dc3d93ef3583e4aa9b2e545ba46d26e65ec1e2881
-EBUILD intel-microcode-20191115_p20191110.ebuild 8552 BLAKE2B 0b9a8351dddb883254899b4763bec619d8e4f1642becc8ce34aa7e29ccf793e7ce49cd424389b4f2f9b0074830d455797c9bd5db52beaef47a578987f491168d SHA512 b3d2b8a6df09fe39598a2773fa0c4e67f3847ca9122b9580094e8a8c96df71254f77bbb2ef3b50ad3383ee7896448adc3f429ab3de944749b9789f8084535dec
+EBUILD intel-microcode-20191115_p20200209.ebuild 8552 BLAKE2B 4fb7154e9de1cf7b5b92d1c089ba02efa959dfa2a0d23cd4e26ecb59e4945562fb27042b6ba4f23468113238e286ecea5810c15ad14f5ecaa02fc2ae18fd35d6 SHA512 dfda3995837d46dd2e71bf0bea6529b4f691e405a036de0548e75caf557797e974519d6a2d747210757f4a7dcb082572c091ff2d88a3e12f7d9c351a986e181e
 MISC metadata.xml 667 BLAKE2B f229775df839b3ddf34fcc289803ae113ad4b0ce293e036c24f3025bbd146d51c6e3ac55b4a7eb9b2ff0b6829aa020179ea4603f5e481de1c822a1deb66fd594 SHA512 a2d6bc54901a9eb12732e8fa0720c03b51ab615383f12a52019453b3a13f5c70233ee88a8d81706ce7e86eaec6d85155484cf32da288c3486d4b1a19647d2698
diff --git a/sys-firmware/intel-microcode/intel-microcode-20191115_p20191110.ebuild b/sys-firmware/intel-microcode/intel-microcode-20191115_p20191110.ebuild
deleted file mode 100644
index 030826b2de0c..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20191115_p20191110.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs mount-boot
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-COLLECTION_SNAPSHOT="${PV##*_p}"
-INTEL_SNAPSHOT="${PV/_p*}"
-#NUM="28087"
-#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
-#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
-DESCRIPTION="Intel IA32/IA64 microcode update data"
-HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
-SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
-	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="hostonly initramfs +split-ucode vanilla"
-REQUIRED_USE="|| ( initramfs split-ucode )"
-
-BDEPEND="sys-apps/iucode_tool"
-
-# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
-RDEPEND="hostonly? ( sys-apps/iucode_tool )"
-
-RESTRICT="binchecks bindist mirror strip"
-
-S=${WORKDIR}
-
-# Blacklist bad microcode here.
-# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
-MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
-
-# In case we want to set some defaults ...
-MICROCODE_SIGNATURES_DEFAULT=""
-
-# Advanced users only!
-# Set MIRCOCODE_SIGNATURES to merge with:
-# only current CPU: MICROCODE_SIGNATURES="-S"
-# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
-# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
-
-pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
-}
-
-src_prepare() {
-	default
-
-	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
-		# new tarball format from GitHub
-		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
-		cd .. || die
-		rm -r Intel-Linux-Processor-Microcode-Data* || die
-	fi
-
-	# Prevent "invalid file format" errors from iucode_tool
-	rm -f "${S}"/intel-ucod*/list || die
-}
-
-src_install() {
-	# This will take ALL of the upstream microcode sources:
-	# - microcode.dat
-	# - intel-ucode/
-	# In some cases, they have not contained the same content (eg the directory has newer stuff).
-	MICROCODE_SRC=(
-		"${S}"/intel-ucode/
-		"${S}"/intel-ucode-with-caveats/
-	)
-
-	# Allow users who are scared about microcode updates not included in Intel's official
-	# microcode tarball to opt-out and comply with Intel marketing
-	if ! use vanilla; then
-		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
-	fi
-
-	# These will carry into pkg_preinst via env saving.
-	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
-	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
-
-	opts=(
-		${MICROCODE_BLACKLIST}
-		${MICROCODE_SIGNATURES}
-		# be strict about what we are doing
-		--overwrite
-		--strict-checks
-		--no-ignore-broken
-		# we want to install latest version
-		--no-downgrade
-		# show everything we find
-		--list-all
-		# show what we selected
-		--list
-	)
-
-	# The earlyfw cpio needs to be in /boot because it must be loaded before
-	# rootfs is mounted.
-	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
-
-	keepdir /lib/firmware/intel-ucode
-	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-
-	iucode_tool \
-		"${opts[@]}" \
-		"${MICROCODE_SRC[@]}" \
-		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
-
-	dodoc releasenote
-}
-
-pkg_preinst() {
-	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
-		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
-	fi
-
-	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-		ewarn "Package was created using advanced options:"
-		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
-	fi
-
-	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
-
-	local _initramfs_file="${ED}/boot/intel-uc.img"
-
-	if use hostonly; then
-		# While this output looks redundant we do this check to detect
-		# rare cases where iucode_tool was unable to detect system's processor(s).
-		local _detected_processors=$(iucode_tool --scan-system 2>&1)
-		if [[ -z "${_detected_processors}" ]]; then
-			ewarn "Looks like iucode_tool was unable to detect any processor!"
-		else
-			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
-		fi
-
-		opts=(
-			--scan-system
-			# be strict about what we are doing
-			--overwrite
-			--strict-checks
-			--no-ignore-broken
-			# we want to install latest version
-			--no-downgrade
-			# show everything we find
-			--list-all
-			# show what we selected
-			--list
-		)
-
-		# The earlyfw cpio needs to be in /boot because it must be loaded before
-		# rootfs is mounted.
-		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
-
-		if use split-ucode; then
-			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
-		fi
-
-		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
-
-		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
-		keepdir /lib/firmware/intel-ucode
-
-		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
-
-		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
-
-	elif ! use split-ucode; then # hostonly disabled
-		rm -r "${ED}"/lib/firmware/intel-ucode || die
-	fi
-
-	# Because it is possible that this package will install not one single file
-	# due to user selection which is still somehow unexpected we add the following
-	# check to inform user so that the user has at least a chance to detect
-	# a problem/invalid select.
-	local _has_installed_something=
-	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
-		_has_installed_something="yes"
-	elif use split-ucode; then
-		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
-	fi
-
-	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
-		elog "You only installed ucode(s) for all currently available (=online)"
-		elog "processor(s). Remember to re-emerge this package whenever you"
-		elog "change the system's processor model."
-		elog ""
-	elif [[ -z "${_has_installed_something}" ]]; then
-		ewarn "WARNING:"
-		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
-			ewarn "No ucode was installed! Because you have created this package"
-			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
-			ewarn "have an invalid select."
-			ewarn "It's rare but it is also possible that just no ucode update"
-			ewarn "is available for your processor(s). In this case it is safe"
-			ewarn "to ignore this warning."
-		else
-			ewarn "No ucode was installed! It's rare but it is also possible"
-			ewarn "that just no ucode update is available for your processor(s)."
-			ewarn "In this case it is safe to ignore this warning."
-		fi
-
-		ewarn ""
-
-		if use hostonly; then
-			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
-			ewarn ""
-		fi
-	fi
-}
-
-pkg_prerm() {
-	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
-	use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
-}
-
-pkg_postinst() {
-	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postinst
-
-	# We cannot give detailed information if user is affected or not:
-	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
-	# to to force a specific, otherwise blacklisted, microcode. So we
-	# only show a generic warning based on running kernel version:
-	if kernel_is -lt 4 14 34; then
-		ewarn "${P} contains microcode updates which require"
-		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
-		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
-		ewarn "can crash your system!"
-		ewarn ""
-		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
-		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
-		ewarn "re-enabled those microcodes...!"
-		ewarn ""
-		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
-		ewarn "requires additional kernel patches or not."
-	fi
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20191115_p20200209.ebuild b/sys-firmware/intel-microcode/intel-microcode-20191115_p20200209.ebuild
new file mode 100644
index 000000000000..0a7fafc268df
--- /dev/null
+++ b/sys-firmware/intel-microcode/intel-microcode-20191115_p20200209.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info toolchain-funcs mount-boot
+
+# Find updates by searching and clicking the first link (hopefully it's the one):
+# https://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
+
+COLLECTION_SNAPSHOT="${PV##*_p}"
+INTEL_SNAPSHOT="${PV/_p*}"
+#NUM="28087"
+#https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}
+#https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}.tgz
+DESCRIPTION="Intel IA32/IA64 microcode update data"
+HOMEPAGE="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files http://inertiawar.com/microcode/"
+SRC_URI="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${INTEL_SNAPSHOT}.tar.gz
+	https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-${COLLECTION_SNAPSHOT}.tar.xz"
+
+LICENSE="intel-ucode"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="hostonly initramfs +split-ucode vanilla"
+REQUIRED_USE="|| ( initramfs split-ucode )"
+
+BDEPEND="sys-apps/iucode_tool"
+
+# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
+RDEPEND="hostonly? ( sys-apps/iucode_tool )"
+
+RESTRICT="binchecks bindist mirror strip"
+
+S=${WORKDIR}
+
+# Blacklist bad microcode here.
+# 0x000406f1 aka 06-4f-01 aka CPUID 406F1 require newer microcode loader
+MICROCODE_BLACKLIST_DEFAULT="-s !0x000406f1"
+
+# In case we want to set some defaults ...
+MICROCODE_SIGNATURES_DEFAULT=""
+
+# Advanced users only!
+# Set MIRCOCODE_SIGNATURES to merge with:
+# only current CPU: MICROCODE_SIGNATURES="-S"
+# only specific CPU: MICROCODE_SIGNATURES="-s 0x00000f4a -s 0x00010676"
+# exclude specific CPU: MICROCODE_SIGNATURES="-s !0x00000686"
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	if cd Intel-Linux-Processor-Microcode-Data* &>/dev/null; then
+		# new tarball format from GitHub
+		mv * ../ || die "Failed to move Intel-Linux-Processor-Microcode-Data*"
+		cd .. || die
+		rm -r Intel-Linux-Processor-Microcode-Data* || die
+	fi
+
+	# Prevent "invalid file format" errors from iucode_tool
+	rm -f "${S}"/intel-ucod*/list || die
+}
+
+src_install() {
+	# This will take ALL of the upstream microcode sources:
+	# - microcode.dat
+	# - intel-ucode/
+	# In some cases, they have not contained the same content (eg the directory has newer stuff).
+	MICROCODE_SRC=(
+		"${S}"/intel-ucode/
+		"${S}"/intel-ucode-with-caveats/
+	)
+
+	# Allow users who are scared about microcode updates not included in Intel's official
+	# microcode tarball to opt-out and comply with Intel marketing
+	if ! use vanilla; then
+		MICROCODE_SRC+=( "${S}"/intel-microcode-collection-${COLLECTION_SNAPSHOT} )
+	fi
+
+	# These will carry into pkg_preinst via env saving.
+	: ${MICROCODE_BLACKLIST=${MICROCODE_BLACKLIST_DEFAULT}}
+	: ${MICROCODE_SIGNATURES=${MICROCODE_SIGNATUES_DEFAULT}}
+
+	opts=(
+		${MICROCODE_BLACKLIST}
+		${MICROCODE_SIGNATURES}
+		# be strict about what we are doing
+		--overwrite
+		--strict-checks
+		--no-ignore-broken
+		# we want to install latest version
+		--no-downgrade
+		# show everything we find
+		--list-all
+		# show what we selected
+		--list
+	)
+
+	# The earlyfw cpio needs to be in /boot because it must be loaded before
+	# rootfs is mounted.
+	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED}/boot/intel-uc.img" )
+
+	keepdir /lib/firmware/intel-ucode
+	opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
+
+	iucode_tool \
+		"${opts[@]}" \
+		"${MICROCODE_SRC[@]}" \
+		|| die "iucode_tool ${opts[@]} ${MICROCODE_SRC[@]}"
+
+	dodoc releasenote
+}
+
+pkg_preinst() {
+	if [[ ${MICROCODE_BLACKLIST} != ${MICROCODE_BLACKLIST_DEFAULT} ]]; then
+		ewarn "MICROCODE_BLACKLIST is set to \"${MICROCODE_BLACKLIST}\" instead of default \"${MICROCODE_BLACKLIST_DEFAULT}\". You are on your own!"
+	fi
+
+	if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
+		ewarn "Package was created using advanced options:"
+		ewarn "MICROCODE_SIGNATURES is set to \"${MICROCODE_SIGNATURES}\" instead of default \"${MICROCODE_SIGNATURES_DEFAULT}\"!"
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+
+	local _initramfs_file="${ED}/boot/intel-uc.img"
+
+	if use hostonly; then
+		# While this output looks redundant we do this check to detect
+		# rare cases where iucode_tool was unable to detect system's processor(s).
+		local _detected_processors=$(iucode_tool --scan-system 2>&1)
+		if [[ -z "${_detected_processors}" ]]; then
+			ewarn "Looks like iucode_tool was unable to detect any processor!"
+		else
+			einfo "Only installing ucode(s) for ${_detected_processors#iucode_tool: system has } due to USE=hostonly ..."
+		fi
+
+		opts=(
+			--scan-system
+			# be strict about what we are doing
+			--overwrite
+			--strict-checks
+			--no-ignore-broken
+			# we want to install latest version
+			--no-downgrade
+			# show everything we find
+			--list-all
+			# show what we selected
+			--list
+		)
+
+		# The earlyfw cpio needs to be in /boot because it must be loaded before
+		# rootfs is mounted.
+		use initramfs && opts+=( --write-earlyfw=${_initramfs_file} )
+
+		if use split-ucode; then
+			opts+=( --write-firmware="${ED}/lib/firmware/intel-ucode" )
+		fi
+
+		opts+=( "${ED}/lib/firmware/intel-ucode-temp" )
+
+		mv "${ED}"/lib/firmware/intel-ucode{,-temp} || die
+		keepdir /lib/firmware/intel-ucode
+
+		iucode_tool "${opts[@]}" || die "iucode_tool ${opts[@]}"
+
+		rm -r "${ED}"/lib/firmware/intel-ucode-temp || die
+
+	elif ! use split-ucode; then # hostonly disabled
+		rm -r "${ED}"/lib/firmware/intel-ucode || die
+	fi
+
+	# Because it is possible that this package will install not one single file
+	# due to user selection which is still somehow unexpected we add the following
+	# check to inform user so that the user has at least a chance to detect
+	# a problem/invalid select.
+	local _has_installed_something=
+	if use initramfs && [[ -s "${_initramfs_file}" ]]; then
+		_has_installed_something="yes"
+	elif use split-ucode; then
+		_has_installed_something=$(find "${ED}/lib/firmware/intel-ucode" -maxdepth 0 -not -empty -exec echo yes \;)
+	fi
+
+	if use hostonly && [[ -n "${_has_installed_something}" ]]; then
+		elog "You only installed ucode(s) for all currently available (=online)"
+		elog "processor(s). Remember to re-emerge this package whenever you"
+		elog "change the system's processor model."
+		elog ""
+	elif [[ -z "${_has_installed_something}" ]]; then
+		ewarn "WARNING:"
+		if [[ ${MICROCODE_SIGNATURES} != ${MICROCODE_SIGNATURES_DEFAULT} ]]; then
+			ewarn "No ucode was installed! Because you have created this package"
+			ewarn "using MICROCODE_SIGNATURES variable please double check if you"
+			ewarn "have an invalid select."
+			ewarn "It's rare but it is also possible that just no ucode update"
+			ewarn "is available for your processor(s). In this case it is safe"
+			ewarn "to ignore this warning."
+		else
+			ewarn "No ucode was installed! It's rare but it is also possible"
+			ewarn "that just no ucode update is available for your processor(s)."
+			ewarn "In this case it is safe to ignore this warning."
+		fi
+
+		ewarn ""
+
+		if use hostonly; then
+			ewarn "Unset \"hostonly\" USE flag to install all available ucodes."
+			ewarn ""
+		fi
+	fi
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/intel-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
+
+pkg_postinst() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+
+	# We cannot give detailed information if user is affected or not:
+	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
+	# to to force a specific, otherwise blacklisted, microcode. So we
+	# only show a generic warning based on running kernel version:
+	if kernel_is -lt 4 14 34; then
+		ewarn "${P} contains microcode updates which require"
+		ewarn "additional kernel patches which aren't yet included in kernel <4.14.34."
+		ewarn "Loading such a microcode through kernel interface from an unpatched kernel"
+		ewarn "can crash your system!"
+		ewarn ""
+		ewarn "Those microcodes are blacklisted per default. However, if you have altered"
+		ewarn "MICROCODE_BLACKLIST or MICROCODE_SIGNATURES, you maybe have unintentionally"
+		ewarn "re-enabled those microcodes...!"
+		ewarn ""
+		ewarn "Check \"${EROOT}/usr/share/doc/${PN}-*/releasenot*\" if your microcode update"
+		ewarn "requires additional kernel patches or not."
+	fi
+}
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 29fbd450ab9c..6673fd79345e 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -13,8 +13,8 @@ DIST seabios-1.11.0-bin.tar.xz 158552 BLAKE2B 44c42b9eea70a090ad51296949fe79e536
 DIST seabios-1.11.0.tar.gz 607746 BLAKE2B 9f688be6b8f7c0fcbd72b59ac649a9c763fdd9e2971a4d85636c9972efc0ad42082a1622a8c41156ad1e2063907349c2e02cff9aeb444844dc445b5f7d6062bb SHA512 cae79c720bfbba3321777bbc6d5bde432fe56e2ba8f1be8acfebbde0bd453a58e889f5fa24db6055dca0a3a56d35b907761723ea35ef248c5f812129d0a27b77
 DIST seabios-1.12.0-bin.tar.xz 162492 BLAKE2B 9a5a349226ed7efbed328493dc057e232203b251677a23f1f09c133743ff0ca6b05270c9d27460be1d8897888fe23ff7bdfa122023fa8ddb23af03d5b9b6f8dd SHA512 f7a0395d621245093bb9a278d95ecc3d4e8d23f620058cd4fddaf885c8b86256f6258f3fd8173c1d24c03306f44d180e768bf8005ee123bc4b699b9f0ca371be
 DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
-EBUILD seabios-1.10.2.ebuild 3380 BLAKE2B 32b6af18bce919ec554023f921dead80a276ba7aae32c5d0ea39198ff7550a372eb0e807eda2459a282fbf5060d7f187d14e932b9f9691e8a8599c2ba9f0d041 SHA512 5e6f4427159e06c1b89fa4293eed8feb864cfe0cbec09d5dbefc3ea603a89132fcd674086d5ae4253de92146e5ef473ba6b889365231a9cb5597c8ab5b551f78
-EBUILD seabios-1.11.0-r1.ebuild 4070 BLAKE2B c36a99931ee27f97dfc82a1fe0d63e7984d04ed878f2c2fada85d9b72fddff6edf0f7d8186199f75baecae1bc2327f557339c1db23ad283ef56317c1c7cebbd1 SHA512 89c30708a4df76038c8f7822c6a9f0181272d50317d1de33e058f0cc239dc48579170e666c9137c864d86ebbdde541dd54a012ac839c1b6bb21573ffe5c073ee
-EBUILD seabios-1.11.0.ebuild 3296 BLAKE2B f2d8302393fad03e23334727476262c42a0346d2e42ea69cbaf7376ed291306b78c5d156c32f9e709e5594735be4bfa8a7872ec25e3cd28d02524da5edc7c833 SHA512 f766aa4fbeffd0637c621eb4335710b8f10f2f6163270fdda71e49b49ac83aaacfbd9a5402a7e0a7416ddcc301ae050ef3c006b0f1ee94357b86473e80a8037c
-EBUILD seabios-1.12.0.ebuild 3454 BLAKE2B d5f8ef13bf69f98d6d4b3bbc9bf71da7c45bb68358e8f1c47d038b069b9a22774e9b019fd3c926720bdc9e3d662413fd61abe9e537c995653319472e2bd80c38 SHA512 c369ab3fa21fd22041a0e53c1e94c04dc8fc120c38752349eec213f86bd7f2e80b38533f6df10cc5befe33d76a200008efe22728139a3fa95d386546add6f280
+EBUILD seabios-1.10.2.ebuild 3374 BLAKE2B b03cc8d4e7fa19ab22f578c10427ff16af610886688d8965ef1b1bc808efa126996a144b6c622a53b871abe4cb2c68573c452a2fd19848092cbffbfc3b052180 SHA512 8d18fe88ff32765d497f87b155ef1825db06f4c85d995653978d7ad5b7038236dfe81ff755c499ea785398916371fbc7578fdd2ef5dfb3ea8851008091a6abe0
+EBUILD seabios-1.11.0-r1.ebuild 4064 BLAKE2B be8c692ee94ec21bdaac4313a526a0297f14b7a9d809c3ab95e17c534e4378608f4cf4cfeb61c56c309f90433cdb56f5bdd0c30ad02c7ec2c1581c05480c9611 SHA512 2a66969275622ef054b9d398142fc89b8c04d9ad2b7dd545c124fa1d3a53119dc7ed783848c9dae893c4c639def9bae00a2b31aa030150aad8da0e8830019a7c
+EBUILD seabios-1.11.0.ebuild 3290 BLAKE2B 174af3ef90af29cd7cc13d5595575c94e4bfe1f456326dd7cab6688439ba07e33b2aaafd513f6b3acebaae55e46b2ca82c32895ab27ec045ddb01dd2976cd1c2 SHA512 1a98a838ae3869e8c0159a4733f841d58fb88f2e8b8b4c16cc0de6c79fab05b01a24ccb16458baa847388c7ee1ed7873393342428a7a481d736a0ab6ec635631
+EBUILD seabios-1.12.0.ebuild 3448 BLAKE2B 68cd34eb037559db86496aeef0e4e148a9c58eb930789bd47d239858b54118c2cb0c4d09164a8eca34c435a0935717640bd7eae9e04d62dd08ba039bc7163a77 SHA512 0cb2bc77f627d8b24a3cee420c1066ba573ab4147c83a3c1e1fabb20a71f9ee0d5c1fa1a5416ff667ee1517130f4d000fcb014e00f297172c79e87e8c845deb9
 MISC metadata.xml 551 BLAKE2B 1bc4f5bcc0dd85ff4e14ededc83e631c942995a8f0ba9534d72b6d5b671ad471eeb0c43a02ce4cf7c0b79d7f0d5583d419c46aaa8c297f1544353b8f42cdefa4 SHA512 5a580198036d96152d46c79b19317e35e5ba15f998ccaeade825189ee640a6ca50552a46f56f783ebba288df3953d461695039539c47baa27e3c9da1f8b1ccc0
diff --git a/sys-firmware/seabios/seabios-1.10.2.ebuild b/sys-firmware/seabios/seabios-1.10.2.ebuild
index 96b9da9360f2..35dd9f2f363b 100644
--- a/sys-firmware/seabios/seabios-1.10.2.ebuild
+++ b/sys-firmware/seabios/seabios-1.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils toolchain-funcs python-any-r1
 
diff --git a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild b/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
index bcc02d3edef6..bec4935ce78c 100644
--- a/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils toolchain-funcs python-any-r1
 
diff --git a/sys-firmware/seabios/seabios-1.11.0.ebuild b/sys-firmware/seabios/seabios-1.11.0.ebuild
index 44d333f93051..5d966e192c48 100644
--- a/sys-firmware/seabios/seabios-1.11.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils toolchain-funcs python-any-r1
 
diff --git a/sys-firmware/seabios/seabios-1.12.0.ebuild b/sys-firmware/seabios/seabios-1.12.0.ebuild
index 05f8b26c7ad5..d09ddbb90979 100644
--- a/sys-firmware/seabios/seabios-1.12.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils toolchain-funcs python-any-r1
 
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index cfa49d9f9ad1..dc474082ff28 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 9fcb5757fd70..51b6ab04e848 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -3,9 +3,9 @@ DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b09
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
 DIST btrfs-progs-v5.4.tar.xz 2103432 BLAKE2B 8ed1321c61d73b66bd27b37a255056e601302dacdcf2dd3122d1b7c41e537ebd1aa5df51100e61458084ec15efd6a1aa478d13f424d45d33d7454d886214a994 SHA512 cc445b9e2b7c5a0adeaa0c467de797f240e4ee9b58c6ac51b9dad51bc0ba0c580fd265efebc04fa46dc23e5b3c4d6baf3ad0b8e2e82728cf34ef51973f028a90
-EBUILD btrfs-progs-4.19.ebuild 2894 BLAKE2B 7e925cef1d0f7173dfdf19c21e9b5ae279dba0ccb54bcad8a193d354de76a3fac3ad09a2986ffdcd7fdeeac07f506685ae85a5222aa3421a48b6fc1831b319f0 SHA512 48cc6f6dc9c50bc55fa38b07202303a7c329ae9951f8a2b487dab896e4fa5fecab22fa5a3ffc94c295b1d75d26d64cf9fab7e9d759853afe7aaf152ecc3258de
+EBUILD btrfs-progs-4.19.ebuild 2935 BLAKE2B ec90c74cd306183cf06e9a16551d0bb3c029eed1336ee32ba06fc243fa6598cfeacf896334e36855055031c67c49d4eaac15f27d6c2c13e1dbe125cfef757c7d SHA512 cd4490f127fa27ffd9916c8464c3dcf6453d5da8e9a4ba81e3c4ddcc6fa17740293c7324a80c1bc5d3faa2a28b6f7dbcf5cba577cf6a9e09652fb1a02bb66cff
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3aebd699880baa42196d1fc632ef36023401fa142d46f3d919c256a0b49209fee96f96b3a9e858e67c6b35f3298044c556ecdfcbf883532f134e4a3874b6e193 SHA512 af818f7c469477dd83fa3129d4f7065aaec0652fda04498c7f1aeeb03a3c60e4dd502545efdc24e37839d73d22a7fc4f82023a302f77a03c01ce016bd43b4aad
-EBUILD btrfs-progs-5.4.1.ebuild 3016 BLAKE2B 20ba919b88e1700f48fc5b600359211f9cc68c18889ab7fffd8b632a9197c6c2afc0d315a74e35d55e8b081b216ead9b817110832015933d772bb3eff8805c1d SHA512 390b2caea1825be56835c3f53ace56370ece103b7c2be0c4070e86e73aa665fd5c01539711266e3cf85a897cde75d8255e6cea6a5d4670909f1ea69e85052c05
-EBUILD btrfs-progs-5.4.ebuild 3021 BLAKE2B 897e13c0ac0c7cb1672e7378a6d019bf7c37dcb2ef06ae67caf839090ac1b2c9449f188a34558ea562adaf0fa82cad335ee0644652e5b298e55668925a18bf09 SHA512 aebd9316b8b7c80b458337b8a22544bacb393dc8ec7fedab75f7986c6caf1e7e60128f5b53c3d0e3f58cd45a03fd35aa729f8331d1f30c3e44e2dea5964878b4
-EBUILD btrfs-progs-9999.ebuild 3021 BLAKE2B 897e13c0ac0c7cb1672e7378a6d019bf7c37dcb2ef06ae67caf839090ac1b2c9449f188a34558ea562adaf0fa82cad335ee0644652e5b298e55668925a18bf09 SHA512 aebd9316b8b7c80b458337b8a22544bacb393dc8ec7fedab75f7986c6caf1e7e60128f5b53c3d0e3f58cd45a03fd35aa729f8331d1f30c3e44e2dea5964878b4
-MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
+EBUILD btrfs-progs-5.4.1.ebuild 3057 BLAKE2B ea4719eae94d8466501d701ef0734ac95ad009535f7b7cd60a9d5fe5d569385102d69237874fea58688686a57e256d443b73af5329135c5b55b3ad336a960575 SHA512 7349724ea6470a3b46a69c9d959860cfa3c0a791a28359ff7b80f8dc829bd9acd6e3fedff5d6dc3f769f090a5ed9e39c904979fa5c80fb618c4361ab5d1c41c0
+EBUILD btrfs-progs-5.4.ebuild 3062 BLAKE2B a0ddb0bf111a4c716bdb9d67e3b0192586b019d846d8597ed4bfbb7dc75d4837cedab792e6669830771faf150a87e1c714629848d72d1c817a233aeb07c609af SHA512 62789c672e68734a8b7acfbf1bb646b3b31a90289eb9534b841178c09f9cb0f61885d72c081fa3de1585b3cca05d902471089c6a415a4feeeb5a60eb0ae04beb
+EBUILD btrfs-progs-9999.ebuild 3062 BLAKE2B a0ddb0bf111a4c716bdb9d67e3b0192586b019d846d8597ed4bfbb7dc75d4837cedab792e6669830771faf150a87e1c714629848d72d1c817a233aeb07c609af SHA512 62789c672e68734a8b7acfbf1bb646b3b31a90289eb9534b841178c09f9cb0f61885d72c081fa3de1585b3cca05d902471089c6a415a4feeeb5a60eb0ae04beb
+MISC metadata.xml 641 BLAKE2B 19bc0129354cdadfd5b7235d350d353ca9117339173a7974c3a66339f7941aa85cc8bd65ae2a02c658e4cce707e41242b17ffd0f8a7699b255415a131e0e9e31 SHA512 03901f600a69c9246533f90378e17c861dc2fee5f5621aa33d7e08b5f3119f4c58b14b4f2bdc65d8dc1e2b111ee57064ad26aa23ba1f8a37ee34217f4cda7486
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index 14922a652c3c..12bf74643416 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -50,7 +50,11 @@ DEPEND="${RDEPEND}
 	>=app-text/asciidoc-8.6.0
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
index b42145c66b47..279448662bff 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
@@ -47,7 +47,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
index 43710cbc3332..87c21e1d5e81 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
@@ -47,7 +47,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 43710cbc3332..87c21e1d5e81 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -47,7 +47,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index 7de09065cc96..fa11b7da7f87 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
-  <maintainer type="person">
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index 335dc6b97d90..949d5f63b974 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -3,6 +3,6 @@ DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640e
 DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
 DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
 EBUILD btrfsmaintenance-0.4.1-r1.ebuild 2061 BLAKE2B 4d019f8de6871da3319c52d040c2d23f7abbe52f804450801a20d97451b5ab70b7bd705f1aa0f23fd383fb57e82e80b38a55c8fd2da0792186bfa80e52726d3b SHA512 ba9f8b94f49b686f637086f68a6db23437a13bd661ee03ae2b4b26e114e0aa5b179ae29d3a9191348750be6b47f950f0d55ddb8bdb288fcee93545a78019df8f
-EBUILD btrfsmaintenance-0.4.2.ebuild 2020 BLAKE2B 1f14812ae0d4e72c14abad57dc08ac6f343d2906edad6a368b28ffacd12c630b98562f52c68951f3567d95f3979e2387d22c5349fdf840ccb13772c40dc09c45 SHA512 134a2d4c7232a53d25e2b5c4b0950529dac4aaf25d3a64f9f926edc09fcdf0fc0a514003448672ace474b6e4b56d00938c3892ee6f54382ee2318c84b3663cae
+EBUILD btrfsmaintenance-0.4.2.ebuild 2014 BLAKE2B 3be5d5624357b8a62497e9965f738ae09a183987938e9de9af908c3e10b55671fbe1f4bc93bde77abbcbb28bebbc4a5ca3652e7755739de0dd095e4515108d15 SHA512 54e679afa1ed4accf57acfa31ee8d517cb11e232b7cfdef9f45521e0357fca31908b995e56e7d43d5cfc787dddb2fc30c51c9cefc9fbf6c0acbfc18111aa5293
 EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a
 MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
index ed7fa2413f8b..3406ed71445e 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
@@ -41,9 +41,9 @@ src_install() {
 pkg_postinst() {
 	elog "Installing default btrfsmaintenance scripts"
 	if use systemd; then
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
 	else
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
 	fi
 	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
 	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
@@ -57,6 +57,6 @@ pkg_postinst() {
 pkg_prerm() {
 	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
 		elog "Removing symlinks from btrfsmaintenance cron tasks"
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
 	fi
 }
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 0f5ab181e737..73d10643ac07 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,6 +1,6 @@
 AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3dd7e6b7bf3566ee564dae47aaa0b0ee3ae20c2beada683d8cda12518f89bda2919ec296c26d004c48a5bbc953aa6c23bc9dc8 SHA512 c097dcc9893dbe7f6098ab80d9937810856de16e6c34ede558dc30edf76571a2e1ef2fdd91fd8d14b2e40d5e32246d08d198cd3ba28f33d19442cd8c2332b4e7
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
-EBUILD cryfs-0.10.2.ebuild 2260 BLAKE2B 53dc41edfa47c3453106728138684e035d635979fb2992e4e313bf992d79d0035b75f8fdff9f69620840a5169d3aee36e4a1df1fc94874d7726ac045961bca39 SHA512 56ec304e947279413c2b6fdcb618f8adf16d97df5c010713c7c0ae6ff700e266fc1fcf5129acd32508bb6ab259c55d6bc30e74e9c6132413357a07f03f61fa2b
+EBUILD cryfs-0.10.2.ebuild 2250 BLAKE2B da3a6a49c0f7c5a9d944ec3159ebf5d3dcd2b6b3017b68b4021cc7e3a32c0ee2ee1326398f5dfc66547517d0bfa8271f4ee043adce486fcb760f122e25c34182 SHA512 0384c4f90c69f8ddb5f4a2e5345c1e89a4e47f0786a4a4eff1ae5bff505115ab0d62853810bed3452c8cc961c429a5606aba99c5d40eb531c9bbc890c0f650da
 EBUILD cryfs-9999.ebuild 2309 BLAKE2B a461261be9418b221dd1518110fb10795f26469d182cc0c8af729146c8378690997469cfa4fa2d09646583562018d5d4e4df164d0c814bc9f7cf5fa2a488b8a7 SHA512 f69c9d7d77be022931471cd4108a13d043e7356b832ad9e08695816556bcef73bbbd5a59906c6ee8e35615599196372de382f386e932988d02bcfb9fb9018f41
 MISC metadata.xml 501 BLAKE2B 8179813b2f222cf59af3842b2becc2acb84e529645f902bd7c197ec171a8882cd4083df9903ea648b1c5d5d062d6be5b5f20e82d53529e41d390aded450ccbc4 SHA512 9d6170ff1a7e2f56840911f35ec5d1ec3cbe8571fdf1a29738a1f608785643bfbef7d8e6ee0f8f2b954ff1128d4a7080b73729e46337b9e1878390f3892c1386
diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild
index 384dc785fe06..8bae478822f8 100644
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake flag-o-matic linux-info python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index b2b0ac6be840..905abd18efb6 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1,5 +1,3 @@
-DIST cryptmount-5.3.1.tar.gz 748020 BLAKE2B 63c66717ed8a8ede983894564576d26720a571b47bd33f3cd160596d831c017c7239b307eb9fb8112c6a51f91799117a47392675f9fe53c0286ada84887d528e SHA512 c4bfb7a2bd2f672dfed014d3a4b1feaa4d20237f9b658ea981a0a054e83ad4d0282089a006ceb769ee05e0cf6ecd004c97b48d69973ed630330e77bf13925680
 DIST cryptmount-5.3.2.tar.gz 545190 BLAKE2B 708c6ba33060c0698361de7bcdc5e0a5932e063c9178c0a6b9cfb1cba9ec236337dbda0664e8755cc017113ee8ef0149c47fc85019a57ac84bf240790d5d798c SHA512 972c7fefadb86bb82cdeb96b185f45bec08ac07d39474a4c7e2a473bc2453624ffcc387b6836a02260dcd0d1176a5a743c45bdf3d7e78d2f519f02a48c62a6b8
-EBUILD cryptmount-5.3.1.ebuild 1709 BLAKE2B da79362593365d5f651db76728d597190f648206ac4f161bafb9bf378f2b0534d597bdac335a1e56e5ce4a852de0227bf96d9fb233bd9326d643e8d9873fb76e SHA512 10dfe4ef20e77839695313678635133a5f0bbf74e13017e6b787af60c46b3b29e0114ae64cb7aaa476351558054e91f538a8e7f2818a67992589c90c961ad52e
-EBUILD cryptmount-5.3.2.ebuild 1703 BLAKE2B 8901b9bad5f03a5efe9c5b38734c74f2ea22648a753575d4d8a373c316fd7acf1fcb55d35436a1526255e1377cb36c06c73c6c565c1edc212bdddb6756e0a9d0 SHA512 f6c0566f1e38df5b38c8c82a41b0a447e92007fafa96edb4ecc05b280267f2b8d531dcd38fc68c4b3a46af232c379fe1dbe2576e1ccd1c3e13707e3d61d8e28d
+EBUILD cryptmount-5.3.2.ebuild 1702 BLAKE2B 30734735a4ff0e4a59bfd12c84eb004a1defeffd348a0bb05486b0e3982daf56afb51ffbb3309fb5b65ede468d62c459b57c7a6c0c70cea523f931a9aeb447e4 SHA512 ceb28c17908dd268688ee59979a18e134dc55d0ef6f55ec176ba4d2bfe477098adf605c1a3ff51fe3f23c05ba20ac4f271b82a6bb000cb1683881806a4a34c5b
 MISC metadata.xml 2145 BLAKE2B 6249f6be21900ffb75bb15d01232626fa43a92894208af23c8e9e50b771fe7f259dfb607a96907c70606da90b35c515d67436a50b83c2627b01aecb8bd07dd41 SHA512 e84164de214f81cf728615e7a68d8c9ac9daf707b585240d2a3c16212cbc0b0fe47f0096d35e6d98ccd8e3f1e984af4e5d820c7508b91625b6d4e356ca9cbde4
diff --git a/sys-fs/cryptmount/cryptmount-5.3.1.ebuild b/sys-fs/cryptmount/cryptmount-5.3.1.ebuild
deleted file mode 100644
index 68573f304edb..000000000000
--- a/sys-fs/cryptmount/cryptmount-5.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd
-
-DESCRIPTION="A utility for management and user-mode mounting of encrypted filesystems"
-HOMEPAGE="http://cryptmount.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev"
-REQUIRED_USE="
-	luks? ( gcrypt )
-	openssl? ( gcrypt )
-"
-
-RDEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	nls? ( sys-devel/gettext )
-	luks? ( sys-fs/cryptsetup )
-	openssl? ( dev-libs/openssl:0= )
-	systemd? ( sys-apps/systemd )
-	udev? ( virtual/udev )
-	virtual/libiconv
-	virtual/libintl
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-kernel/linux-headers
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "NEWS" "README" "README.OpenSSL" "README.sshfs" "RELNOTES" "ToDo" )
-
-CONFIG_CHECK="BLK_DEV_DM"
-ERROR_BLK_DEV_DM="
-	Please enable Device Mapper support in your kernel config
-	-> Device Drivers
-		-> Multiple devices driver support (RAID and LVM)
-			-> Multiple devices driver support (RAID and LVM)
-				<*>/<M> Device mapper support
-"
-
-src_prepare() {
-	default
-
-	# Since SELinux is hardcoded, remove it on disabled SELinux profile
-	if ! use selinux; then
-		sed -e '/selinux/d' -i dmutils.c || die
-	fi
-}
-
-src_configure() {
-	local myeconf=(
-		--disable-rpath
-		$(use_enable argv0switch)
-		$(use_enable cswap)
-		$(use_enable fsck)
-		$(use_with gcrypt libgcrypt)
-		$(use_enable largefile)
-		$(use_enable mount delegation)
-		$(use_enable nls)
-		$(use_enable luks)
-		$(use_enable openssl openssl-compat)
-		$(use_with systemd)
-		$(use_enable udev libudev)
-
-	)
-
-	econf "${myeconf[@]}"
-}
diff --git a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild b/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
index a4e882b5edea..95c674a5b8b6 100644
--- a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
+++ b/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev"
 REQUIRED_USE="
 	luks? ( gcrypt )
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index a15bb68013bc..fb28990f9500 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,9 +5,9 @@ AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
 DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 00ee2eff11e3054a40a4d9036c1786422288ff4c61ff497cb7039721dde80ca337cab067faa4f70721de3aded465f612e9328a6b533ff7c9b67d1069fe435bed SHA512 e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718
 DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68 SHA512 d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
-DIST cryptsetup-2.3.0-rc0.tar.xz 11013200 BLAKE2B 999d2d1c6f11b57b7ebbae403a1e5dbbc6d5ff45337bf58ab0e49ffcca8495ce1956839d431bf0cf855bb9b84cb448bd08d61a035892b4dc38aac1c7a8594ef2 SHA512 3b707f85828aa0691c7bf039041a5b95444471c402fe74c74c50404d8bd1abae3021f180c6510cd1bb8537e56a3bfac085199fab597b48eaeb156b1d1a317df5
+DIST cryptsetup-2.3.0.tar.xz 11035660 BLAKE2B 0fff903cdb07d91183bbd35afb660aad42d31188a80d0ef6294c40082b39fdcde25da4fe1bf679ebe308133fc63051876ce813a2ef3a557f63b574d6f6f49d8c SHA512 d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08
 EBUILD cryptsetup-1.7.5-r1.ebuild 4044 BLAKE2B 17327e6f655be6e556146fb301b0b602ab75fb545713d43a2225f70c25d003545a87566d6672d45e641db2156e161a42d6a8cbab5bb34b9d185b24945a4aa228 SHA512 3f3a56cb91afd5e90d988720b329a0b8fb40e538beac776ec7fa118f4c565e4d1cc364cab1755840475736ecfc72e2ad5b7e97c44614f70d274b1685a746a43e
 EBUILD cryptsetup-2.2.1-r1.ebuild 4234 BLAKE2B 1ce55cd19adcd62e653b770c5545e9dbee1e48385b501a3ae38908b96618bd902ee421c412000e3233ce96742a7083bad301a9de2009e9ddbaa7fc96cea2a7ef SHA512 31b7cc3bb04bce6c75539356e5a930a91815b6f81c94a7af0721da2cda12b5d78f4a89ae546c96bc8b2dd2830ee02e5761d1001b4a22bca6f19b8ed576a6edcb
-EBUILD cryptsetup-2.2.2.ebuild 4244 BLAKE2B c3ea10ab5824f1f60e19256a19c1726025f277d968203db89043adbd6289ad88ce786547540ad58a21acf51695e842ea0e9f6730e3f34f6e1315a0c26a6331ad SHA512 a723ce4032546dc97d58bcfa3845fa8d6aa6a7c437674778056f23c644d0b5c1020c4cb91e2f7d5ca8a5d6a0e94ac24840519b29d281bc0308cfb6bbea2a66b8
-EBUILD cryptsetup-2.3.0_rc0.ebuild 4243 BLAKE2B 11ff6ee8da600b25406e3a7939691ae310a1579c772e4a82c67d00f9565f1f5c9a042a087d196ab2f325026d466ea775221bcd3bdc630328995b0fa5d296b48e SHA512 4b1d49b544b9cf8606c1dbbb6417a4e354266bccc593b7b039d8aaf59199c73ceac54a4da65dc4467f89ccf48f6a3f2d1c47d7ada9fc716da0f0f37e8f882b49
+EBUILD cryptsetup-2.2.2.ebuild 4240 BLAKE2B 90a268488f2e443c560123d07d19dfed764976d2a583dc08416e510d21e0372c0d67ea9b3ef6703ed6ecd2a6e17b886a8c0390432f542e9c2ce12663f55d4f9f SHA512 20dd0d446c82095d5d20c540244d2d4cf30294ee9534f635e410d6fda80d3a2fde4c16bdcc38c7844d18331904cfbee092f430f4f92dcb9e99d765222002ec02
+EBUILD cryptsetup-2.3.0.ebuild 4243 BLAKE2B 11ff6ee8da600b25406e3a7939691ae310a1579c772e4a82c67d00f9565f1f5c9a042a087d196ab2f325026d466ea775221bcd3bdc630328995b0fa5d296b48e SHA512 4b1d49b544b9cf8606c1dbbb6417a4e354266bccc593b7b039d8aaf59199c73ceac54a4da65dc4467f89ccf48f6a3f2d1c47d7ada9fc716da0f0f37e8f882b49
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
index 9c8f2b108340..008ac94f9b2e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-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"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild
index cf95b7a30b03..cf95b7a30b03 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.0_rc0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 8a3386d19c58..99b985f36106 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -3,5 +3,5 @@ AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27
 DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f5923c797c294ca8caf210cf6af20afa1d518d826413989612295a4365c480d7aa4293686824ee96394cbbe9851 SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
 EBUILD dd-rescue-1.46.ebuild 1935 BLAKE2B 96cb26dbaf1af6e3653593bb3416b27165a078e2211519dd94ac7bdc889cba2c66ac9f04dee253828b56c00a8aaf9de51091aabe706b0bfe6e27de9d44854066 SHA512 57bdaccabd2da99bb329c82f47e52fbd2066f736c742b8de551671fab294297e45a874daa0ddd701234a3e6c216f52ddee55283d70bf1a166d3538f32485e8c7
-EBUILD dd-rescue-1.99.8.ebuild 2383 BLAKE2B 62cb1d8b4f7f768b619eafdaf85cd35266026b12126ff8004a65b316cadff8842082629d4b3bff9c99ba02bb303043e1abe8fc9a13f8e025fee69178b00736b2 SHA512 e7675ff724abdbcfb5558f02302115329231023f71cca1700ac4d3f2ee97121185a796e0fa71d9750d207f2f87489ea105882de4e713b650f348908a3e70327c
+EBUILD dd-rescue-1.99.8.ebuild 2381 BLAKE2B 0b88c472f6b3d2477b424a3cc3a0f9a54a88f8c618c127e3c738d2be127e8860982463a1be436fef65110723e711f0128bcb304a14267128f4c82ff66ac8f88a SHA512 e77d6d58bf0adecaefc4194c75a1133db11eaf09c40a5b9b12c9ddc5d0765738fb28dff66248ec0c37cfafed9d91e7f09e3ab6bcadc7ba125285ab74c6455d90
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
index a40b043634bb..57548ff8a323 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
@@ -81,7 +81,7 @@ _emake() {
 		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
 		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
 		CFLAGS_OPT='$(CFLAGS)' \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
 		CC="$(tc-getCC)" \
 		"$@"
 }
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index ff90877cdaf9..9745a11e2d6d 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,3 +1,5 @@
 DIST fatsort-1.5.0.456.tar.xz 56100 BLAKE2B 996f144c67a2311ef9962b06e776d0a0c8897814383e50c9f48f5af0bc800159ee34c10d9f8d51dae5160844dfe9fcbc4b56bb9883cbdb0402a0ea20198fc1d6 SHA512 fe9d8108494fd64da730ec40882582fc16a89e76a5ba4e8040d03a3dbbf12c525904abe24814337713f5f1d15c72e8321b27fad69db816c073a96fbfd15ea486
+DIST fatsort-1.6.2.605.tar.xz 122928 BLAKE2B 2690233828e47a4809aac14a8d64dc8d95a824bec52f787190186adbe066d5d4e6f9c6d1873fc6b809c6df6879d12154430f44d412944963bdff49e673079d12 SHA512 0d119c99c5efff4c10367152fc6efe95e2cb1c39405ca02dd25b66cc68c7420b5b28c0daca1346b7928633bac8ace2d05d731502f989d39ca5c783dcec69ccc7
 EBUILD fatsort-1.5.0.ebuild 791 BLAKE2B 1a7977e9e5ccaa82997389e928ad9c0cfa20b52cb5b832ee10a2bb230a7df565eb2ab58701312a01c69a11ad80d6dc8371ae97b62a8da89b5d74eb3e286f7c15 SHA512 ab728f5bf316680d9443ce345819062132d802bcd38c451a8efb21a761f86ceb4d1f7e217242bcce44d7580750b38a919f97b4ca7847eb37c260d32db7e09537
+EBUILD fatsort-1.6.2.605.ebuild 711 BLAKE2B 32f6849c788b83476c2388097eb14169e56b8b30381d388dc63c74cce6ac15696934f581ad6dbc397c4b0e08ea98b5cced46cac5c3cf447387b67b7d5f8b271d SHA512 f25a251ff55fedf93c2e7d81ac5416dec9c3cd66b3087bb7212e3c2f328783b08b690ca0ea56dd170936806cf198d6ac5a5883b1b1aefa8569f54ee1df042f8e
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.6.2.605.ebuild b/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
new file mode 100644
index 000000000000..e80f5c53a7f4
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|/usr/local|/usr|g' \
+		$(find ./ -name Makefile) || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		DESTDIR="${D}"
+}
+
+src_test() {
+	# Tests require root permissions and mounting filesystems which does
+	# not work inside the ebuild environment
+	true
+}
diff --git a/sys-fs/hfsplusutils/Manifest b/sys-fs/hfsplusutils/Manifest
index edd7688ac86f..dc429dbab4b0 100644
--- a/sys-fs/hfsplusutils/Manifest
+++ b/sys-fs/hfsplusutils/Manifest
@@ -1,9 +1,11 @@
 AUX hfsplusutils-1.0.4-cflags.patch 702 BLAKE2B 90c41a588979dc7966aa9a889d5c200f44e513b5cc04eaef0da904a5f635f325deeae6b68b99436b6e7ccefdb883dc3e8531e08ae81ccaab4024bdc5f1e31317 SHA512 b66a64a085abdb2c6c2b1f8008019ea41e9e4ee4b58ecbbf96aad4500392d1935a9aa9bd2694fc62af7cf196ddf556e754908bbcdeb64842e8e72a3cbb125a05
 AUX hfsplusutils-1.0.4-errno.patch 214 BLAKE2B a2b48502ac7789a0d035f5d68bdd2834e93348c2e0463c0043fbef64a7d2a4d7434c3b34fa96765e26d5131351ebe8ea37022bd70d486a05800a75dfb339e8bc SHA512 97cb9d90d57f3ddc1b9083198664db6da755cc40f416d79d7ded4e94846302e1ea9b0ebc389dfc8996c1c30931d686e09abd908d44fc92044081c75a61d57d24
+AUX hfsplusutils-1.0.4-fno-common-gcc10.patch 591 BLAKE2B b804a5969a83cadb0cf8c8deb5138ee5f5abacc9c261adf2f5ff1e9933764165041f1e2e9e04351934dd680874405e69a0abfd87042dc49d93295d157d29ba42 SHA512 46c04b1a6043b8c208e55c4edf912ec4c09973081b7f1974c473c89dfe656a7c1565a834827a203428606c52af876a89878284a95b113d2828fc910807d778de
 AUX hfsplusutils-1.0.4-gcc4.patch 5736 BLAKE2B c88d82b15ae7126d61bee78a5f10cab757ae462f73dfa5b7892290e8bd8405c11309162cb72159620e38ed47add63c41b43a0e370e53d712a0bd9311393cee6b SHA512 fb357a52452f6f8b16a9f3c9f02f1a7c213f6b8adfaf7fd7da70a15cb6ec3469ca8705f3dcd6419385a340e7b5644c17c323c6b951f0c56f4776b86ee86b267d
+AUX hfsplusutils-1.0.4-gcc5.patch 4603 BLAKE2B dacb7aa0d62fb22175685cff27310f216445878fc29e49cdc724baba687a834ee382e0b13a10b130274d12a70cf80ba32b5a8455a334e601e990558bc386c0da SHA512 f673fcc71ce9b668f420cb21c3aa8323b1b1511582d913e53ca2c91d14ff5b5a969efc79bd6d4a3d72f33e41c695ccb33f61fbf14aa0e820a78b213f02ef808f
 AUX hfsplusutils-1.0.4-glob.patch 215 BLAKE2B bd1aed8730e8695efc713908d33c64be14cbb24adbc0aa26b01ced08f741f1f8c3af1cd545fe556e1c6c89e0baf26a94b4317653e795103dc058c1ab6cb710c4 SHA512 da53dc8f18f77b15bb8b76bff371515da0fac03ae79bdd8450dad60063fd18f47d0e95577451ff5da285acf167e547ec392aa42ae254d77fc1789ba4cf2025aa
 AUX hfsplusutils-1.0.4-stdlib.patch 403 BLAKE2B 20ee7a1c8d96d8a4aee549a24b0795b0a9f0d4b5e5d3102b50962d03147b7a26f7f29e6f3652c55df912ccc68db104c4565ea2d563b97d7c67abade7affea437 SHA512 23361a4cae07b679cb5c6122cf1a74aac19a11b0b892a369683881ed1bed63cfb1369aa84762b0447f2c91b1226a73c9f42b06fe8cb25a40dd7fc58fbf22806a
 AUX hfsplusutils-1.0.4-string.patch 606 BLAKE2B a9c789fe631c94577c32a330803c490b882c7cccbec213882a297a16e5ef5e0cc4fa805f9df454d4b278ed460eca42189ae1d65c00c4555e0df129bffe68c902 SHA512 5f7d4a7bbbb15479d00d3ff49fac08328b5d3fb4549d3278b43c73025ab4f0f5657c7b084b2671a5e1524a88bbcf5bc459b88c8d944cdc98fbf0c2ba4e6b0339
 DIST hfsplus_1.0.4.src.tar.bz2 185461 BLAKE2B 81b93f59c4e57d80a979b9d9c56b841bcc32747136d01dc0e90afa0af486e527bda241d7c21f0f3f61a5d2efe6215e29499405aad9623a7ec9906b876aa6303f SHA512 94cf6bc8e9d561dea5e8b5860c4ef979f21349d6546c767b43c18156fa1f805e843fae8a64096c147a28886467f5e2012b06b93918773457eaf486b85958b2ee
-EBUILD hfsplusutils-1.0.4-r2.ebuild 1006 BLAKE2B b12ebfcd380b5e741e1ded3f506930b44c17986a09621a69ce5643e81f661ab91519e05cac95159e486f5c72a2582509f01ec26a9e601554534c6c279a213c14 SHA512 726d8386f0945644b7d34161a00c9b3f7c5d6c128cc124d5a24d0ccdf760d091aef6cb1cc3c739844379e46877bcb495a98692a60d4b31751b00bf72d65dd804
+EBUILD hfsplusutils-1.0.4-r2.ebuild 989 BLAKE2B 9cc48ec7067af83dcf8fe19c0365b6a525a61fed9fb85dc91b27e857e84b2e8607c00b3106b6521d7a258940aea83e7b3d6c586ae7b3dd0fc6673376a5bec2cc SHA512 503db98fc289f6f537e7f36d70fd0df8650f80d27af7f59c806866a290c0de833f0d908e05d205d23de8055b8b6611549c97ab05536fa20fd3f843909c2894c1
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch
new file mode 100644
index 000000000000..dde912d4ef62
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch
@@ -0,0 +1,27 @@
+--- a/libhfsp/src/fscheck.c
++++ b/libhfsp/src/fscheck.c
+@@ -47,6 +47,8 @@
+ # include "os.h"
+ # include "swab.h"
+ 
++struct fsck_data_t fsck_data;
++
+ /* Dump all raw fork information to stdout */
+ void print_fork(hfsp_fork_raw* f)
+ {
+--- a/libhfsp/src/fscheck.h
++++ b/libhfsp/src/fscheck.h
+@@ -100,10 +100,11 @@
+ int fscheck_files(volume* vol);
+ 
+ /** global data used during fsck */
+-struct {
++struct fsck_data_t {
+     UInt32  maxCnid;
+     UInt32  macNow; // current date in mac-offset
+     int	    verbose;
+     int	    ignoreErr;
+-} fsck_data;
++};
+ 
++extern struct fsck_data_t fsck_data;
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch
new file mode 100644
index 000000000000..7b3b30c1090a
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch
@@ -0,0 +1,201 @@
+https://bugs.gentoo.org/580620
+
+--- a/libhfsp/src/blockiter.c
++++ b/libhfsp/src/blockiter.c
+@@ -143,9 +143,3 @@
+   fail:
+     return -1;
+ }
+-
+-/* return current block */
+-UInt32 blockiter_curr(blockiter *b) /* inline */
+-{
+-    return b->e->start_block + b->block;
+-}
+--- a/libhfsp/src/blockiter.h
++++ b/libhfsp/src/blockiter.h
+@@ -52,7 +52,7 @@
+ extern int blockiter_skip(blockiter *b, UInt32 skip);
+ 
+ /* return current block */
+-extern inline UInt32 blockiter_curr(blockiter *b)
++static inline UInt32 blockiter_curr(blockiter *b)
+ {
+     return b->e->start_block + b->block;
+ }
+--- a/libhfsp/src/libhfsp.c
++++ b/libhfsp/src/libhfsp.c
+@@ -32,15 +32,5 @@
+ 
+ const char *hfsp_error = "no error";       /* static error string */   
+ 
+-/** helper function to create those Apple 4 byte Signatures */
+-UInt32 sig(char c0, char c1, char c2, char c3)
+-{
+-    UInt32 sig;
+-    ((char*)&sig)[0] = c0;
+-    ((char*)&sig)[1] = c1;
+-    ((char*)&sig)[2] = c2;
+-    ((char*)&sig)[3] = c3;
+-    return sig;
+-}
+ 
+ 
+--- a/libhfsp/src/libhfsp.h
++++ b/libhfsp/src/libhfsp.h
+@@ -90,7 +90,7 @@
+ 
+     
+ /** helper function to create those Apple 4 byte Signatures */
+-extern inline UInt32 sig(char c0, char c1, char c2, char c3)
++static inline UInt32 sig(char c0, char c1, char c2, char c3)
+ {
+     UInt32 sig;
+     ((char*)&sig)[0] = c0;
+--- a/libhfsp/src/volume.c
++++ b/libhfsp/src/volume.c
+@@ -604,14 +604,6 @@
+     vol->extents = NULL;    
+ }
+ 
+-/* accessor for entends btree, is created on demand */
+-/* inline */ btree* volume_get_extents_tree(volume* vol) 
+-{
+-    if (!vol->extents)
+-	volume_create_extents_tree(vol);
+-    return vol->extents;
+-}
+-
+ /* return new Id for files/folder and check for overflow.
+  *
+  * retun 0 on error .
+--- a/libhfsp/src/volume.h
++++ b/libhfsp/src/volume.h
+@@ -75,7 +75,7 @@
+ extern void volume_create_extents_tree(volume* vol);
+ 
+ /* accessor for entends btree, is created on demand */
+-extern inline btree* volume_get_extents_tree(volume* vol) 
++static inline btree* volume_get_extents_tree(volume* vol)
+ {
+     if (!vol->extents)
+ 	volume_create_extents_tree(vol);
+--- a/src/darray.c
++++ b/src/darray.c
+@@ -65,16 +65,6 @@
+   return (array->eltend - array->mem) / array->elemsz;
+ }
+ 
+-/*
+- * NAME:	darray->array()
+- * DESCRIPTION:	return the array as an indexable block
+- */
+-inline
+-void *darray_array(darray *array)
+-{
+-  return (void *) array->mem;
+-}
+-
+ 
+ /*
+  * NAME:	darray->append()
+--- a/src/darray.h
++++ b/src/darray.h
+@@ -40,7 +40,7 @@
+ extern	void	    darray_sort(darray *, int (*)(const void *, const void *));
+ 
+ /* return the array as an indexable block */
+-extern inline void *darray_array(darray *array)
++static inline void *darray_array(darray *array)
+ {
+   return (void *) array->mem;
+ }
+--- a/src/dlist.c
++++ b/src/dlist.c
+@@ -60,24 +60,6 @@
+ }
+ 
+ /*
+- * NAME:	dlist->array()
+- * DESCRIPTION:	return the array of strings in a list; can dispose with free()
+- */
+-char **dlist_array(dlist *list)
+-{
+-    return (char **) list->mem;
+-} 
+-
+-/*
+- * NAME:	dlist->size()
+- * DESCRIPTION:	return the number of strings in a list
+- */
+-int dlist_size(dlist *list)
+-{
+-  return list->eltend - (char **) list->mem;
+-}
+-
+-/*
+  * NAME:	dlist->append()
+  * DESCRIPTION:	insert a string to the end of a list
+  */
+--- a/src/dlist.h
++++ b/src/dlist.h
+@@ -36,13 +36,13 @@
+ extern int	dlist_append(dlist *, const char *);
+ 
+ /* return the array of strings in a list; can dispose with free() */
+-extern inline char **dlist_array(dlist *list)
++static inline char **dlist_array(dlist *list)
+ {
+     return (char **) list->mem;
+ } 
+ 
+ /* return the number of strings in a list */
+-extern inline int dlist_size(dlist *list)
++static inline int dlist_size(dlist *list)
+ {
+   return list->eltend - (char **) list->mem;
+ }
+--- a/src/dstring.c
++++ b/src/dstring.c
+@@ -124,24 +124,6 @@
+     return 0;
+ }
+ 
+-/*
+- * NAME:	dstring->string()
+- * DESCRIPTION:	return a pointer to a dynamic string's content
+- */
+-char *dstring_string(dstring *string)
+-{
+-  return string->str;
+-}
+-
+-/*
+- * NAME:	dstring->length()
+- * DESCRIPTION:	return the length of a dynamic string
+- */
+-int dstring_length(dstring *string)
+-{
+-  return string->len;
+-}
+-
+ 
+ /*
+  * NAME:	dstring->shrink()
+--- a/src/dstring.h
++++ b/src/dstring.h
+@@ -42,12 +42,12 @@
+ extern void	dstring_shrink(dstring *, size_t);
+ extern void	dstring_free(dstring *);
+ 
+-extern inline char	*dstring_string(dstring *string)
++static inline char	*dstring_string(dstring *string)
+ {
+     return string->str;
+ }
+ 
+-extern inline int	dstring_length(dstring *string)
++static inline int	dstring_length(dstring *string)
+ {
+     return string->len;
+ }  
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
index 4e624f1b33c8..34c9cf508cba 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools
 
 MY_P="hfsplus_${PV}"
+
 DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
 HOMEPAGE="http://penguinppc.org/historical/hfsplus/"
 SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
@@ -13,7 +14,6 @@ SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE="static-libs"
 
 S="${WORKDIR}/hfsplus-${PV}"
 
@@ -24,6 +24,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-string.patch
 	"${FILESDIR}"/${P}-stdlib.patch
 	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-fno-common-gcc10.patch
+	"${FILESDIR}"/${P}-gcc5.patch
 )
 
 src_prepare() {
@@ -35,10 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug 580620
-	append-flags -fgnu89-inline
-
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index a96b099d0b23..5e43264883c2 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -5,6 +5,6 @@ DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38
 DIST mtools-4.0.22.tar.bz2 431185 BLAKE2B 19b6ed58fd44e51eba11799347590f8c36fe2de7cbb2b612c0f16f4f35c916331abf19b8ca9a735fcc627db5180b1f8cbf355e25319af8587a0de033d50a6e79 SHA512 9a35a27c6de768e3e925d9163aeb8b021620de9016cf12666ee0259cbfc87fa7a8d0311fc0a77c04dbef8bd3e8d86c747069a9aca2f5df69e6391c3cf5a0b113
 DIST mtools-4.0.23.tar.bz2 418592 BLAKE2B 442f552087a5d53ef0ead6161cdad7997dc45a3e210c2cb442a8b2ba42866152f93e4a1f5b58df8d68316168374ea034b390bcf4c607ac3a1c477c4ec5e7842c SHA512 c8c48adedc3f3e4eeafead27ce80172c9cb9690b575618842001ed16aa0011dcd2bc517882ea4bf01a73810ba151aa4b86f8ce2f97d6e8a0177d09be71a6d1ed
 EBUILD mtools-4.0.18-r2.ebuild 1443 BLAKE2B 874b1e4856597be1d32cec7e25aebd1d1fb64201d29432505bb45a5cddb860230f030a74a8fdf5f61d943d2f4a8af70b6b2140193fe3128bb270efe65fd22a6e SHA512 e6eb4336d42ef80c4f8dcac65375e2f6861ffeefb9a61ec8cc3ad09e84c3c1b15115fd362a2342b085428c8d93c6102b1e6559d05368a389a2059af47d28ed9a
-EBUILD mtools-4.0.22.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
-EBUILD mtools-4.0.23.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
+EBUILD mtools-4.0.22.ebuild 1176 BLAKE2B 413416a698b78fe7f4d5457c34f74beea5b63ddb95e8191338dfde2d57a1dd1be8c61db44b58210f842cbfe463e4dfdd24634a7e1a1a66ea96485ee6ca2266fd SHA512 1f1bcf1cee5ecbf1219be2ec5bf5478d97ef94c16e78226c6e10f431089a876d758eb459d89b3d3cb3f2b9a9e611930992715fc012ebc677b7098eca7f97af35
+EBUILD mtools-4.0.23.ebuild 1176 BLAKE2B 413416a698b78fe7f4d5457c34f74beea5b63ddb95e8191338dfde2d57a1dd1be8c61db44b58210f842cbfe463e4dfdd24634a7e1a1a66ea96485ee6ca2266fd SHA512 1f1bcf1cee5ecbf1219be2ec5bf5478d97ef94c16e78226c6e10f431089a876d758eb459d89b3d3cb3f2b9a9e611930992715fc012ebc677b7098eca7f97af35
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.22.ebuild b/sys-fs/mtools/mtools-4.0.22.ebuild
index 651e08e2c962..42ad7d717b90 100644
--- a/sys-fs/mtools/mtools-4.0.22.ebuild
+++ b/sys-fs/mtools/mtools-4.0.22.ebuild
@@ -36,7 +36,7 @@ src_configure() {
 	# 447688
 	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
 	local myeconfargs=(
-		--sysconfdir="${EPREFIX%/}"/etc/mtools
+		--sysconfdir="${EPREFIX}"/etc/mtools
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-fs/mtools/mtools-4.0.23.ebuild b/sys-fs/mtools/mtools-4.0.23.ebuild
index 651e08e2c962..42ad7d717b90 100644
--- a/sys-fs/mtools/mtools-4.0.23.ebuild
+++ b/sys-fs/mtools/mtools-4.0.23.ebuild
@@ -36,7 +36,7 @@ src_configure() {
 	# 447688
 	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
 	local myeconfargs=(
-		--sysconfdir="${EPREFIX%/}"/etc/mtools
+		--sysconfdir="${EPREFIX}"/etc/mtools
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 1cfd7c821ff5..20df6e5897ff 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -16,5 +16,5 @@ EBUILD squashfs-tools-4.3-r2.ebuild 2130 BLAKE2B 7395e3137ace870d801a19a1111dabc
 EBUILD squashfs-tools-4.3_p12.ebuild 2176 BLAKE2B b55b7e215becdd233a43fbd2abfb4676b694270257b87f49b9a301c2271fb7de29f6a4e41ec1af4c89ed777e000d2bb27025c1314e74e4ea263d8928f6896f89 SHA512 13537ed71d3c8f4a599107eed5efb20f3a70633bb1e4cd193f98febfa89ddc4c38b2fd6eadfec2c0aca187044a40198d01c0d16b33685db85e7a9433e9b625b6
 EBUILD squashfs-tools-4.3_p7.ebuild 2082 BLAKE2B 3759b4f836a47783c2123d5f5dadbeef39fac9e2477065392e56cbed03345688c263e86473b6f512cf3135760e57878cfefb92e84a9a7580d1d62d5c2fb1c2b8 SHA512 bb022bd76d01afe17edf16220a2f58e4ee0a03dd96d8a54dee90f33b999070f92fe886e8e26a4b85b9cfa967b3c955f2a463838de5fdbd58b3d1df845d72ed31
 EBUILD squashfs-tools-4.4.ebuild 1723 BLAKE2B 21b10ff20d4777a911af10118e780de33a84ba76cce0407a2f537dc65ed18c4d642a4514b423afc4bb66f5a395bfcfa2a27eb7ab4b85c9bfcea00016495da33b SHA512 c48b71312b2484f80b5bd5d7dbbcc614383b8c00ed80eeed183fb360c5ce34d2358d739556a163987e0a17493c7f80d52947dc973df0266589ac53bb8b6d6d3c
-EBUILD squashfs-tools-9999.ebuild 1561 BLAKE2B 11c5821cf9591e4ad7ac26cc636c9858e9ba6d229381f6bc642310d2e876051a4d8e9996a7f537473bd5ffd8f5da280496cc50ec578cee523f1163483df6e518 SHA512 801cbb143d6cea3270f1a9bc7e6767643a8be079a7ccf5eb8d619cf5b57f4cb059e723cccb8b5b022b8f4b4c0a74e37a0410243a7dcb609033c947e3d61c984c
+EBUILD squashfs-tools-9999.ebuild 1519 BLAKE2B eaa594fd211e1045f6bf1b4d2a4a94883971fd9997da58eb7eb9a02138713a84d047cd3fd97a98a83fecfd6aa136f69ae68fddfee66a4517b8de6f7f4dee6c42 SHA512 6691b989d05f6bebf801050214fa062cc06e33d340c61cc77bb0aac0219e8a1ddd26c9f89aea935b8e4082666151ca207ada02234ee0a4520354b6d58ec614c2
 MISC metadata.xml 438 BLAKE2B 7bb1623378cbc91becb4e12f91bfdead33f1859c9a13e5dc53652a1202b0d5cdf4a7be46071e766fc932f15ab3223b889e6ff32063d67d50e8ef809e887221dc SHA512 985005bd45043f21efc64f544cc685e93a70dac00a869416aa93bbc91571461dae236d2b4bb3325c63c7c3515b88f32a84ab56d3405e84545053c86d164c7dc0
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index c5bf886e7767..1234cc3f4c52 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -34,7 +34,6 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-sysmacros.patch
-	"${FILESDIR}"/${PN}-4.4-fno-common.patch
 )
 
 use10() { usex $1 1 0 ; }
diff --git a/sys-fs/traydevice/Manifest b/sys-fs/traydevice/Manifest
index e195e78474cb..524704141c49 100644
--- a/sys-fs/traydevice/Manifest
+++ b/sys-fs/traydevice/Manifest
@@ -1,3 +1,3 @@
 DIST traydevice-1.6.2.tar.gz 29238 BLAKE2B 78a5e01ad4f5f1f4df2f64d876b2567aa2001683c9827ac4a152219ab0febeaf4a47744f4cca277516a1cd4a2461f2fd915ab08762c16ab9198326fa2f2c0bab SHA512 19523c502a58aed9e1ea3c52970438a7119d9f4895527777b6c5c4167d44e917b23ca4cb7c1916f7eb7ff8c539d3c72cc1b70712affaa32a9eaa344ec8e92634
-EBUILD traydevice-1.6.2-r1.ebuild 887 BLAKE2B 1085ffd65714fcc17ded9428f99fecc244ef24ac9d334e3435e88859e9bccb4c7f103b211c93864cc32540e6fe3ae070dbd2bb51d53a8cbdb6043a34992d4706 SHA512 bd8174c9438d9ccdf5c70a5f761ac5c3b28216cbfdd935f5f01f165348da05bc2dc1adedcd45c35999810e889ccede84dba3d14260bbc6cecc8f19798e16cd66
+EBUILD traydevice-1.6.2-r2.ebuild 936 BLAKE2B 3a138ad8363021abd13fca896523a9b17188ad78a773ea9e53a99ec48434849ef0d4153831510bbecb1b43891ffd43cc489c1365eb1ed841c463dff95f1c32f1 SHA512 e92df319cf7effc0a5930242f7c5aa567328a1625c447e5cb2e420e341aa3f0ec8d17904103cffae82b03487e4b6b6722055e82abfb73d2c26686f08e95ea876
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/sys-fs/traydevice/traydevice-1.6.2-r1.ebuild b/sys-fs/traydevice/traydevice-1.6.2-r1.ebuild
deleted file mode 100644
index da259161112d..000000000000
--- a/sys-fs/traydevice/traydevice-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="A little desktop application displaying systray icon for UDisks"
-HOMEPAGE="https://savannah.nongnu.org/projects/traydevice/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	sys-fs/udisks:2"
-DEPEND="app-text/docbook2X"
-
-src_compile() { :; }
-
-python_install() {
-	distutils-r1_python_install \
-		--prefix=/usr \
-		--install-data=/usr/share/${PN} \
-		--install-man=/usr/share/man \
-		--docbook2man=docbook2man.pl
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -f "${ED}"/usr/share/${PN}/doc/*.txt
-}
diff --git a/sys-fs/traydevice/traydevice-1.6.2-r2.ebuild b/sys-fs/traydevice/traydevice-1.6.2-r2.ebuild
new file mode 100644
index 000000000000..43f07a7fa705
--- /dev/null
+++ b/sys-fs/traydevice/traydevice-1.6.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A little desktop application displaying systray icon for UDisks"
+HOMEPAGE="https://savannah.nongnu.org/projects/traydevice/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-fs/udisks:2"
+DEPEND="app-text/docbook2X"
+
+src_compile() { :; }
+
+python_install() {
+	distutils-r1_python_install \
+		--prefix=/usr \
+		--install-data=/usr/share/${PN} \
+		--install-man=/usr/share/man \
+		--docbook2man=docbook2man.pl
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	rm -f "${ED}"/usr/share/${PN}/doc/*.txt
+}
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index bb59a7b01b9c..58fa50c35f21 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,4 +1,4 @@
 DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
-EBUILD udev-init-scripts-33.ebuild 1479 BLAKE2B 6100ecf100ca73c2a62c70b0f2b7d732d75749aaea2ffed9e8bc4fdcdb72cf6e7b3961ec8e7160b7fc154402655273913eef17423e1448e28c61280fe8918a6a SHA512 589bfb949048914dd60c2b478e2d7241e4affd61ef1c9f73879d828243b153a22629916f41bc584099078be3468b19b2a860cd64d2176e5237b4bb9854d217f0
-EBUILD udev-init-scripts-9999.ebuild 1488 BLAKE2B a0e3675e423214b4b96f52aea796d215497222367669fcecef0fb5d0d0a13a748485e24abbcba34979026e0814d8005c9a295eafe4ac379cc45ed94713d3378b SHA512 2974bb69e988f43dc66eb83bb2e4148c1df74dee5c1ae4af0bc3224e0120349f70730cdd4b594edafc5cad99b8579ee0577f458129e22de030266368b518166b
+EBUILD udev-init-scripts-33.ebuild 1497 BLAKE2B df0c3b0fa591069bd34707c7da998918af8ae59bac7f04ddd577b250648ee7da4a587a7794ca4d0adf649215c111a095c891abe4eec638dffa68d3c3b22d97d6 SHA512 40ae141c3a01222a7787be72d1c0ccaf15d6d7d555206a0444f367daa833d0c96f17cfb54e20b58b1c348ef486e9ee8b0c82b81f46fd10452bb05b292213a587
+EBUILD udev-init-scripts-9999.ebuild 1506 BLAKE2B 8ab01f1e29ac32ddd5c9659eba67d7495b0665a3f6629f990627596e644aed0fd1463ba031acb6935cf558c4eb9c4b610f4ccc94846f64a752b6bef266fb4df7 SHA512 6ee4314c90cf78c02e267c663d00d1add439505832285e56879a462268545634bb3af21fea7447a9daee56ea700ef9588e3b7df9316bd60207f37e0a3fec99be
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 9df7c668a9cb..745836b006f8 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 4ce4b403509b..1ace564000ff 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index fa2e6309c26e..5900a39824be 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,5 +1,7 @@
 DIST udiskie-1.7.7.tar.gz 91858 BLAKE2B 7d9729f8c66e0d9afdf2b89f5cc2a941ce6726c809af1069146f13466eccdfa54ed45f43535d84592f1b09ccf6454814d7ff62d453781c547ebfb989fcab7767 SHA512 ea192cc8a50c742e96d5163bb1378a7cd110599cfe731d676343766a1ce3ee1102ab43322c5f9666d6c6a232e310fd494e0f76ad33aeab1fd8225a3267f3193a
 DIST udiskie-2.0.4.tar.gz 85944 BLAKE2B f7281ea04e6a5d76d490fa7f126e6214d4a9cf77d055e8d19d30395ae710e4298026cf50c58629634b6d81c095baff731b315fe175ec2fc94eff2ea518d18a0b SHA512 67dc6d27edaf956cd2b7d5de2625b15029723573a3f7bcabd56d397fb1493010c50194cd178f0c4071a0bebaed4672a19f39d902946c7bfb0891000fdf3f43cc
+DIST udiskie-2.1.0.tar.gz 86339 BLAKE2B e92c61ac61aaab81bb91874ed1ed0c8bab60524fe79c9432053968418767b6ebc5c15c33abc74f37471fcc5a799152a50d88528a4b7bbd91e015d448fb36d0cb SHA512 704bdf8226dd2eeb6b13c5a4facca76d9f5fa7119cef7b5af08d0d399f9e65318ed5a921638cd9b7db3acbadcff1029f2e7698a942350f31b8f94f5032c25663
 EBUILD udiskie-1.7.7.ebuild 1001 BLAKE2B 4c11cc62dc78e04bac3b01a7b6b1fc19b4ad29a876a86a1abcf5b3d7f1233f9e71211b7bc211f5873637fd21269e4d0d0819748e26edc94e4be49f76eac3a06c SHA512 dcc2cd4ffbbf77021fc9ad7d4c74163fe5825a6f9ae3d19b90c1fb333382b1fdab90dcb1b860b1c0ca8c6eda259878d5182afc43f1f2cf3f96644f8225672ca6
 EBUILD udiskie-2.0.4.ebuild 1096 BLAKE2B 329a2c23ff404ba204bfbe9859aad676dc77ea44097f94859d96d7248d77486061aaadf1cc699a2b943f4971b91feb1afa928e1c4acaa5f040dccc712d9a8fbf SHA512 a80a1a402beaabe9bac66a30e7d09576bb4c81943f067da7be503f3f251204547e9d6176b6704e81c3c190f6df074d312a602760c395acf3816ef7a452d7c65e
+EBUILD udiskie-2.1.0.ebuild 1096 BLAKE2B 329a2c23ff404ba204bfbe9859aad676dc77ea44097f94859d96d7248d77486061aaadf1cc699a2b943f4971b91feb1afa928e1c4acaa5f040dccc712d9a8fbf SHA512 a80a1a402beaabe9bac66a30e7d09576bb4c81943f067da7be503f3f251204547e9d6176b6704e81c3c190f6df074d312a602760c395acf3816ef7a452d7c65e
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.1.0.ebuild b/sys-fs/udiskie/udiskie-2.1.0.ebuild
new file mode 100644
index 000000000000..342a8f0494a3
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-2.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sys-fs/udisks:2
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 'python3_6')"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	default
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index e2b7b6e83bd9..f3cc6f1e80e6 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -5,5 +5,5 @@ AUX udisks-1.0.5-sysmacros.patch 1773 BLAKE2B 9ff54a1a134c798ddb9ef1c9d0eb770f45
 DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a14644f79cfcf92dd4ea7ddecbac90aa046b890b7bdd1ad701f1106d5956d72dab1fbb030606319b4bcc4c297bdd SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a
 DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
 EBUILD udisks-1.0.5-r3.ebuild 2797 BLAKE2B 5269e1aeb27a1f50c028bc04c3c7e7e59ff3e7e762320e6a153173e150db5b2cfc4f88e6ca6541d0564485f6ecc08bd6e32f33d3455c9ca850ce5df24fcdea33 SHA512 b63b5739a5cbdd58ccf7c0034e8034e020354b1ce79dc9009f7dd6d0a164cbf4dc794a5c1c19b6f1209bcc771dcfddf19416f691ef786d5827c766c3ab4680c2
-EBUILD udisks-2.8.4.ebuild 3284 BLAKE2B 59a74c88ce67b3d243c85cf6150b273c80a7b329d407eaad7fec71e345e462342dd46806dee9ebb6c14d2de63a8cffd19b541acd7e9781bc9a77512dbea7caff SHA512 7093d1e21ae620dbac252baabd657af62a4dc5df6cf68084f50f00b54844be4da93b8bf828a712c3c08be5820631f4bc45d47b52413304b6d4c8053f8213f4ed
+EBUILD udisks-2.8.4.ebuild 3278 BLAKE2B b28d2fb07c49ee7023fb819e4e6603cc08a8390a822cb0011b524d673dcf0961bb45f3eea19f09b10ff21351f5c9432ac76ae78285a0ae62f65303d48aaae061 SHA512 6f9dea136448ab8012a9bef0ce1a37a550aa6626db3a9e118010ec00776191577f18bcfb8e17800198566a8e52beaed51fd362d061eac3d32b8a65644674fcfe
 MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e
diff --git a/sys-fs/udisks/udisks-2.8.4.ebuild b/sys-fs/udisks/udisks-2.8.4.ebuild
index 826b59d7bcac..abf9347e9de9 100644
--- a/sys-fs/udisks/udisks-2.8.4.ebuild
+++ b/sys-fs/udisks/udisks-2.8.4.ebuild
@@ -76,9 +76,9 @@ src_configure() {
 		--enable-btrfs
 		--disable-gtk-doc
 		--disable-static
-		--localstatedir="${EPREFIX%/}"/var
-		--with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html
-		--with-modprobedir="${EPREFIX%/}"/lib/modprobe.d
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
 		--with-udevdir="$(get_udevdir)"
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 9170d048f8ad..e92d1d9d29ce 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,7 @@
 AUX 0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 1945 BLAKE2B db5d094bcac52a3b53bae9df4b0444f656858dd83f21994cbefe4900554a2579c67b5058d149d226ca354bd45d9e24c12244186da3232064233b74ec590187dc SHA512 71a009336fdcac8e5813001fd6741f4310c3e792b20650ebad73ba0049730acb5188587dc8e706846e886bf9ac241d2163b9558150eb389c99d7910a730542d0
 AUX 0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 3386 BLAKE2B fd12c67ae3d481dda5a6bcf3c3815ac752f7f22834aadc02ee11a592b7114bccc7fc8b494763f80999428d90c9903cbf4df5e544443c2cec0bfc91a942f5c708 SHA512 739d1e050d8894e3d92a995500d1f70e128cf33de941eacdb0b3ad8e743fedf464a02ba4a5ac85f43e302d53302ce866d88ab836dd60b861914cb5b7a190f376
+AUX 0.8.3-fno-common.patch 2377 BLAKE2B 61390e1c64b212b94060777154f5cf18942d4c22ba845f85ae91e81cdb6978e6d01cc9f90b1739bf3503bc40f26a98389659dbc0f83d3cedc954b802792b3b55 SHA512 7b2b066d0f4def5950c031ef87626ef68e0eccfe388f451dd6e5a36874674020ed2e4658bf24ab3977673b77aa7631822ef12318381f7785f310a0b24a61dfbc
+AUX 0.8.3-zfs-functions.patch 1707 BLAKE2B 6ead7415be7dbeff6377b8d4074bb4e1cf6b154cf145e77b876e514c57d05cc041c5a66cfd6ab4c0bbb4931fa2553680c5749c4e06810ebd5658941088f9e7cf SHA512 cda47f5ef47ab86b2fda87e9ac2ab26d08431b2bd7420ecdd8ab9625a283c48278caa794b2aaa4c5f9341e08a2751b5b4a7b93a3b53491ccbdf2f085a0cb86ec
 AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
@@ -7,9 +9,9 @@ AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
 DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496
 DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010
-EBUILD zfs-0.7.13-r1.ebuild 6282 BLAKE2B 9fae8590e1d6f723bea164f90b6b8a5ce1a96d8dc2d10b514f0d50a2c24c70ede7fd3dc1888efc4c3746e72d4970d5c2ed501072a21f08a46a188cd288a9743b SHA512 b50d3835a65153143ea4b9236e8084a495565397d570b64f4b622e4b501432a55b8b604dc7f276502e97e0b500302b74ae53fc8ba12c087f9e43ba84a4891ceb
-EBUILD zfs-0.7.13-r2.ebuild 6346 BLAKE2B f317a17063a320a92c13b1546507dc37b75c48ae5c19871d8ed0113590dd84687bd5b331f168a5d68e8d0aef0c135519e5abd9a8c91c858ab6bae53c5236496b SHA512 4c24e183caf67d52b14047add79947d0331eb1590a0754486ca5a03c2ab9f7cade308973164924855e8293d7c0d905bae1d4295f7cb5efbafe9dea8a4d1b9125
-EBUILD zfs-0.8.2-r2.ebuild 5701 BLAKE2B b7c845e5342023bbdc210f306c64f6cef3383bfe6c9f445a77f05a2117dfe22e6a792d2d55b61108638926225791bc6c45335410d65adf67e00cc7b6faea430e SHA512 f5e09062ed0496bf51257f1b89f7e21e0f727d222a25ef22745727d6d7ca56d136222fd149cf8f6a6a8d87054427d30aaa451b7ae0360b29b99da095bb1e8135
-EBUILD zfs-0.8.3.ebuild 5567 BLAKE2B 8b0768a1d6a36f16598aee0039417e08818dfd115f93682c9e255ba3d49c5dd5fe93e54c953bf9978594c69b1b817c8739647a708e90073885accdc29458f97d SHA512 16ecd59b2911eb8dde31032e950c150c68bc9c3a904daa8be32fb594e85185e858790c71b3589fdaf5cc8cc801e10bbfe5b6192a3a99f848277086367717c734
-EBUILD zfs-9999.ebuild 5430 BLAKE2B 681134f5d63ec4b0d88a2029ef600d2ed76fa843924db5abf949a7ee33d75711564988d4559badbb367023b112f9d2495cb943662b770a3ca6996ed01b0a9ace SHA512 a55a3d4cae07ec07d4f4a5b196c06653bc774389c3e772b8a262528237081bf38eb624c0c3d7080d8f3bb9b42dcc0c80e3b351af1ed967c94ef294407ab35105
+EBUILD zfs-0.7.13-r1.ebuild 6276 BLAKE2B b2aafe81b97e72249710bbed0282afe8e03aaf5029236d5b12d3089ef58458b9615f1f60f89b1473097321b8182704a5ba2964fb94b86f03a20d269029351264 SHA512 3547d9918e2b082299dbbaf39310ecaa780f44c2c7ece907b6149b3cff98ce68fc73846c303d579112453aaa6763bd029ccd24ab330c1578432a44da73a0d816
+EBUILD zfs-0.7.13-r2.ebuild 6340 BLAKE2B a351568c54fecd31574471e164f41e1909fe6096ac68211664ef6a90435c59c4189a5ed9a1356867a81941a17874c8580b6a27ec0caef49976afdda655bb8571 SHA512 4a17ca33411e286f19ae8d4c6eaee42cad9a2db024a83b6355f0f33db0fcbd83ca138f3e4b88a2b14cc3fded942edf4bd22f4588afc6082e608e02ced2d59b10
+EBUILD zfs-0.8.2-r2.ebuild 5695 BLAKE2B 6e8096f02073a66e3c441ffe445efa13343d578b4da24b132cbd1336590c9fe6a260901acbb7db792d802f1f4838eaa86ed769c3acff670bcf2ab5d1b3f35ca6 SHA512 5ea68d75bee0c3fba23ed178c564f997a1e39ea3a036f3964e7badf0f8f31f359de184375f71060590aae86d18c222e36d9957639e7fd764f5ac4d824057282a
+EBUILD zfs-0.8.3-r1.ebuild 5632 BLAKE2B 4e3ad4d539fd8a3564506c2c81ae64d5e7384e42d0a016da9edd0b6ca27392c7c6bee5085944137e9ae7e7e010b07b1854ebfa931bcfff65cc7474429a074fef SHA512 6739e8a0b86c1e763e44ed454ed74bb8f680ca49a85ba12a3a877b9a5a41f83fdd501c6a411e9e79855139de9a034e6a77aa9773cc418dbee60b12bd0d782feb
+EBUILD zfs-9999.ebuild 5424 BLAKE2B fc1a9905e15e42717447c4f572e28e7834231da76a91bbb7072834e0e18a649c19a455de69c1f5ccc9f0afce590733c3aafa90f499723bc838b7f0200722e0b9 SHA512 9c4f99a617dfa274ad92e3b24671743724c8c4c54c6a2dcf92c452ecfd246d5a37e77f31fefd8992305ecfdc8821aa643df3d78125d685f206411071f5425aa5
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/files/0.8.3-fno-common.patch b/sys-fs/zfs/files/0.8.3-fno-common.patch
new file mode 100644
index 000000000000..3b09d8bbc597
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.3-fno-common.patch
@@ -0,0 +1,83 @@
+From af09c050e95bebbaeca52156218f3f91e8c9951a Mon Sep 17 00:00:00 2001
+From: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
+Date: Thu, 6 Feb 2020 18:25:29 +0100
+Subject: [PATCH] Fix static data to link with -fno-common
+
+-fno-common is the new default in GCC 10, replacing -fcommon in
+GCC <= 9, so static data must only be allocated once.
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
+Closes #9943
+---
+ cmd/zfs/zfs_util.h     | 2 +-
+ cmd/zpool/zpool_main.c | 2 ++
+ cmd/zpool/zpool_util.h | 2 +-
+ lib/libshare/smb.c     | 2 ++
+ lib/libshare/smb.h     | 2 +-
+ 5 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/cmd/zfs/zfs_util.h b/cmd/zfs/zfs_util.h
+index 3ddff9e22d7..a56af59adb1 100644
+--- a/cmd/zfs/zfs_util.h
++++ b/cmd/zfs/zfs_util.h
+@@ -33,7 +33,7 @@ extern "C" {
+ 
+ void * safe_malloc(size_t size);
+ void nomem(void);
+-libzfs_handle_t *g_zfs;
++extern libzfs_handle_t *g_zfs;
+ 
+ #ifdef	__cplusplus
+ }
+diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
+index ae5e8a370fc..ff4f44d4652 100644
+--- a/cmd/zpool/zpool_main.c
++++ b/cmd/zpool/zpool_main.c
+@@ -76,6 +76,8 @@
+ 
+ #include "statcommon.h"
+ 
++libzfs_handle_t *g_zfs;
++
+ static int zpool_do_create(int, char **);
+ static int zpool_do_destroy(int, char **);
+ 
+diff --git a/cmd/zpool/zpool_util.h b/cmd/zpool/zpool_util.h
+index ce760df723c..1f23f61aaa4 100644
+--- a/cmd/zpool/zpool_util.h
++++ b/cmd/zpool/zpool_util.h
+@@ -79,7 +79,7 @@ void pool_list_free(zpool_list_t *);
+ int pool_list_count(zpool_list_t *);
+ void pool_list_remove(zpool_list_t *, zpool_handle_t *);
+ 
+-libzfs_handle_t *g_zfs;
++extern libzfs_handle_t *g_zfs;
+ 
+ 
+ typedef	struct vdev_cmd_data
+diff --git a/lib/libshare/smb.c b/lib/libshare/smb.c
+index a95607ee032..f567f7c49d7 100644
+--- a/lib/libshare/smb.c
++++ b/lib/libshare/smb.c
+@@ -65,6 +65,8 @@ static boolean_t smb_available(void);
+ 
+ static sa_fstype_t *smb_fstype;
+ 
++smb_share_t *smb_shares;
++
+ /*
+  * Retrieve the list of SMB shares.
+  */
+diff --git a/lib/libshare/smb.h b/lib/libshare/smb.h
+index 7a0c0fd162d..8ea44677f9a 100644
+--- a/lib/libshare/smb.h
++++ b/lib/libshare/smb.h
+@@ -44,6 +44,6 @@ typedef struct smb_share_s {
+ 	struct smb_share_s *next;
+ } smb_share_t;
+ 
+-smb_share_t *smb_shares;
++extern smb_share_t *smb_shares;
+ 
+ void libshare_smb_init(void);
diff --git a/sys-fs/zfs/files/0.8.3-zfs-functions.patch b/sys-fs/zfs/files/0.8.3-zfs-functions.patch
new file mode 100644
index 000000000000..9cce3e1c1a7d
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.3-zfs-functions.patch
@@ -0,0 +1,51 @@
+From 00478e1b5141f8b6ceaf14c173382d1aa11878b9 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Thu, 6 Feb 2020 09:28:20 -0800
+Subject: [PATCH] Fix zfs-functions packaging bug
+
+This fixes a bug where the generated zfs-functions was being included along
+with original zfs-functions.in in the make dist tarball.  This caused an
+unfortunate series of events during build/packaging that resulted in the
+RPM-installed /etc/zfs/zfs-functions listing the paths as:
+
+ZFS="/usr/local/sbin/zfs"
+ZED="/usr/local/sbin/zed"
+ZPOOL="/usr/local/sbin/zpool"
+
+When they should have been:
+
+ZFS="/sbin/zfs"
+ZED="/sbin/zed"
+ZPOOL="/sbin/zpool"
+
+This affects init.d (non-systemd) distros like CentOS 6.
+
+Fixes: #9443
+
+Signed-off-by: Tony Hutter <hutter2@llnl.gov>
+---
+ contrib/initramfs/Makefile.am | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
+index 52bdeb2afe5..4e52e8ea5e9 100644
+--- a/contrib/initramfs/Makefile.am
++++ b/contrib/initramfs/Makefile.am
+@@ -6,15 +6,12 @@ initrd_SCRIPTS = \
+ SUBDIRS = hooks scripts
+ 
+ EXTRA_DIST = \
+-	$(top_srcdir)/etc/init.d/zfs \
+-	$(top_srcdir)/etc/init.d/zfs-functions \
++	$(top_srcdir)/etc/init.d/zfs.in \
++	$(top_srcdir)/etc/init.d/zfs-functions.in \
+ 	$(top_srcdir)/contrib/initramfs/conf.d/zfs \
+ 	$(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \
+ 	$(top_srcdir)/contrib/initramfs/README.initramfs.markdown
+ 
+-$(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions:
+-	$(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions
+-
+ install-initrdSCRIPTS: $(EXTRA_DIST)
+ 	for d in conf.d conf-hooks.d scripts/local-top; do \
+ 		$(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \
diff --git a/sys-fs/zfs/zfs-0.7.13-r1.ebuild b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
index 7bfb7393b91a..e7978fd5d927 100644
--- a/sys-fs/zfs/zfs-0.7.13-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.7.13-r2.ebuild b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
index 2b547fcde15c..2362e5ccec08 100644
--- a/sys-fs/zfs/zfs-0.7.13-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.8.2-r2.ebuild b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
index 341a978b2793..c744e615de44 100644
--- a/sys-fs/zfs/zfs-0.8.2-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
 
diff --git a/sys-fs/zfs/zfs-0.8.3-r1.ebuild b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..df59d685573c
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://zfsonlinux.org/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+else
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs"
+
+DEPEND="
+	${PYTHON_DEPS}
+	net-libs/libtirpc[static-libs?]
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+	virtual/libudev[static-libs(-)?]
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="virtual/awk
+	virtual/pkgconfig
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-kernel/genkernel-3.5.1.1
+	)
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+	)
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/bash-completion-sudo.patch"
+	"${FILESDIR}/${PV}-fno-common.patch"
+	"${FILESDIR}/${PV}-zfs-functions.patch"
+)
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
+
+	# needed to get files regenerated
+	# https://github.com/zfsonlinux/zfs/issues/9443
+	rm -v etc/init.d/zfs{,-functions} || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-systemd
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-python="${EPYTHON}"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		$(use_enable debug)
+		$(use_enable python pyzfs)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+
+	use test-suite || rm -rf "${ED}/usr/share/zfs"
+
+	if ! use static-libs; then
+		find "${ED}/" -name '*.la' -delete || die
+	fi
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	python_fix_shebang "${ED}/bin"
+
+}
+
+pkg_postinst() {
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "root on zfs requires initramfs to boot"
+			elog "the following packages known to provide one and tested on regular basis:"
+			elog "  sys-kernel/dracut"
+			elog "  sys-kernel/genkernel"
+		fi
+
+		if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
+			einfo "genkernel version 3.5.3.3 and earlier does NOT support"
+			einfo " unlocking pools with native zfs encryption enabled at boot"
+			einfo " use dracut or >=genkernel-4 if you requre this functionality"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+		einfo "You should add zfs-import to the boot runlevel."
+	[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+		einfo "You should add zfs-mount to the boot runlevel."
+	[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+		einfo "You should add zfs-share to the default runlevel."
+	[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+		einfo "You should add zfs-zed to the default runlevel."
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-0.8.3.ebuild b/sys-fs/zfs/zfs-0.8.3.ebuild
deleted file mode 100644
index 9ac492e30ce3..000000000000
--- a/sys-fs/zfs/zfs-0.8.3.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
-
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs"
-
-DEPEND="
-	${PYTHON_DEPS}
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-	virtual/libudev[static-libs(-)?]
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-python="${EPYTHON}"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		$(use_enable debug)
-		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-
-	# temp hack for https://github.com/zfsonlinux/zfs/issues/9443
-	sed -i "s@/usr/local/@"${EPREFIX}/"@g" etc/init.d/zfs-functions || die
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-
-	use test-suite || rm -rf "${ED}/usr/share/zfs"
-
-	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
-	fi
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	python_fix_shebang "${ED}/bin"
-
-}
-
-pkg_postinst() {
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-
-		if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
-			einfo "genkernel version 3.5.3.3 and earlier does NOT support"
-			einfo " unlocking pools with native zfs encryption enabled at boot"
-			einfo " use dracut or >=genkernel-4 if you requre this functionality"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-		einfo "You should add zfs-import to the boot runlevel."
-	[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-		einfo "You should add zfs-mount to the boot runlevel."
-	[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-		einfo "You should add zfs-share to the default runlevel."
-	[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-		einfo "You should add zfs-zed to the default runlevel."
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 1c02c0298585..f40bd0bca2a7 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,15 +4,15 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://zfsonlinux.org/"
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
+	inherit autotools git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
 else
 	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 7033d34cd009..4d550be5bdb5 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 4bf2e0d71662..14bfb84721e9 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -55,19 +55,19 @@ DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165
 DIST xfsprogs-5.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487c3e6d4f20bbe855399e99e2195c1a45f2be3b117048e2a7f2374c7e6258e7c1edd63d12a405c88f4c9fa6cd5e8e SHA512 c0973fcf97e2666385b46c80cd1398728702cb34fd7e0f89e2a63686300573405d09a81d3ae43d79c2e9710ccf6b6bd6ed1c3f3f831c75cd0916f094f203aaa7
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
-EBUILD genkernel-3.4.52.3.ebuild 4516 BLAKE2B 8cbb78719705d953c19898d65d294f41aa4adeea58b1703ea051d1e7fc5ddf128466e3fd3d15b7743fb46bd4154fcf3af703cdbc6f5427d37e3e53d648a3d169 SHA512 fc81a98cdb1668bf899e476cc79ccac9407c668bad3c9dfc6b48d39e6e219272ce6aa250fefe4c2aa3d0cc53884d1581dbed5f702348c70dd8d6cce5beef949c
-EBUILD genkernel-3.4.52.4-r1.ebuild 4577 BLAKE2B eb93f787974b14c5b8119d93329cec1a4395a4f55b84c8d8e0252c488bb511cfda0eed281ccd1a29fc1c1102e9a1da070a9afe6ef0ea79eee786513ab58d83b6 SHA512 9102161955288fba3891c4fb03bb162c10228d109a115e4c24b525bb9e57415fd84e7dccc3b6c21b7c6c87d92d0818ce112fa714a51c14ebaf3e67c880ce0863
-EBUILD genkernel-3.4.52.4-r2.ebuild 4625 BLAKE2B d55ecc51215ca0cd8a1a878eea8e04ef3fadf8dd5aee26aed3263622d74a805577980ef997a9b412d8b039236f64bdccf6cf6239ab030e64ae24c3837f2c37fc SHA512 c918d0491a0db07d55ea7f72cae9aab68df6f577531f2834dffca3d0e2674fdbee7c3a4d5334a2b675fc71b7b2fb482945193a15cecbf0eeb44d9a65451cdbdf
-EBUILD genkernel-3.4.52.4-r3.ebuild 4673 BLAKE2B e117c83667dbf5502b171bb1f3b6efb696bf3474c5887a4947b7998007fc9b22c5182b430166a51ce17bf662c7d346a8a8061345746fb7eaae0d3666104243f7 SHA512 d8c0f724ccd8e74d70bab613c747ea5f9a6d1f24e17f84e9c11686cb7bc0b88b30a27845c8a2fed83f14a754af3a5563026face207e3c3f4ec859f4f0c201743
-EBUILD genkernel-3.5.1.1.ebuild 4685 BLAKE2B b2ba26aa6d5edb9bd0ab1a334cfeb5678b18100b77a3049012f4f4dc28d14737268f76bd5bb4f4db12d35bd7b56c4d427ab2c90220059375a61671b13ae4ed1b SHA512 d08a56d9677bf2934f8f82cc7984d7026bf2ce717197824f9f18182d95dd96be40def2159e98e74b19348621cedce6234257d8268198cd0f68c1c68f7f85ee64
-EBUILD genkernel-3.5.2.0-r1.ebuild 4930 BLAKE2B 326a5391d20958042fa9603146d9672fa42738504030376457a641ece18bb6a7803e21badfd57c3010b9c649a733702b523ff673f7ab16dda70c9ed375acd52b SHA512 d554080c78c8751e68879e0d1d3a488a3fb4607e344cb81d60d26a14ef489f13e96f9f2f2884bb03e3af351b7e068effdf4238b831f011e63f9e26e01b13cda2
-EBUILD genkernel-3.5.2.1.ebuild 4930 BLAKE2B 326a5391d20958042fa9603146d9672fa42738504030376457a641ece18bb6a7803e21badfd57c3010b9c649a733702b523ff673f7ab16dda70c9ed375acd52b SHA512 d554080c78c8751e68879e0d1d3a488a3fb4607e344cb81d60d26a14ef489f13e96f9f2f2884bb03e3af351b7e068effdf4238b831f011e63f9e26e01b13cda2
-EBUILD genkernel-3.5.2.2.ebuild 4930 BLAKE2B 326a5391d20958042fa9603146d9672fa42738504030376457a641ece18bb6a7803e21badfd57c3010b9c649a733702b523ff673f7ab16dda70c9ed375acd52b SHA512 d554080c78c8751e68879e0d1d3a488a3fb4607e344cb81d60d26a14ef489f13e96f9f2f2884bb03e3af351b7e068effdf4238b831f011e63f9e26e01b13cda2
-EBUILD genkernel-3.5.2.3.ebuild 4930 BLAKE2B 326a5391d20958042fa9603146d9672fa42738504030376457a641ece18bb6a7803e21badfd57c3010b9c649a733702b523ff673f7ab16dda70c9ed375acd52b SHA512 d554080c78c8751e68879e0d1d3a488a3fb4607e344cb81d60d26a14ef489f13e96f9f2f2884bb03e3af351b7e068effdf4238b831f011e63f9e26e01b13cda2
-EBUILD genkernel-3.5.2.4.ebuild 4930 BLAKE2B 326a5391d20958042fa9603146d9672fa42738504030376457a641ece18bb6a7803e21badfd57c3010b9c649a733702b523ff673f7ab16dda70c9ed375acd52b SHA512 d554080c78c8751e68879e0d1d3a488a3fb4607e344cb81d60d26a14ef489f13e96f9f2f2884bb03e3af351b7e068effdf4238b831f011e63f9e26e01b13cda2
-EBUILD genkernel-3.5.2.5.ebuild 4930 BLAKE2B 326a5391d20958042fa9603146d9672fa42738504030376457a641ece18bb6a7803e21badfd57c3010b9c649a733702b523ff673f7ab16dda70c9ed375acd52b SHA512 d554080c78c8751e68879e0d1d3a488a3fb4607e344cb81d60d26a14ef489f13e96f9f2f2884bb03e3af351b7e068effdf4238b831f011e63f9e26e01b13cda2
-EBUILD genkernel-3.5.3.2.ebuild 4931 BLAKE2B ce985cf72ad2de4d6fc5889b94a0c8383b94f1574e5c7a1ecd8e529742861a4e536837ebd084d60c79ab31cbd2d4748dfc392548ecff0baa34e476c946f60722 SHA512 2acd5534378b6d1acf993573d6e1332a66bfa0f8b846c6072c7865c73f65b9b1800385daa8ff60696c1ef1149611686243b3f2ffd212934c31343239b9e2a53a
-EBUILD genkernel-3.5.3.3.ebuild 4921 BLAKE2B 6e4859bb26362e632ad126ff2d3e8baba51b49001ca16f4dcd878f17a037c94e2dfed0dd446f2e54f935bd209aae0b1518967848de2d329bd4cda2e8916545b0 SHA512 1f9b6aecfaae9805692c82315c7145e45f098f0521068a9a272bf724baeeba9d1dc1985221f45be41a69357e935429c1642875fbacb633ade40818884b4c1989
+EBUILD genkernel-3.4.52.3.ebuild 4534 BLAKE2B ffd77b2de06fddc15e5506bd2670ebf55a0d47d45445332d5099313b2d67038a07b4df47f0d07a050532c6bca4125868f92a68f61523cfa023aabfa2271a9909 SHA512 e6ba154fdd082a6a41550433e634fb8ffbab0075f029ac1466271a0aec57eb8f1d3a645bed58f59ca23a3eeca12c6a1681ea7f71f0729e84ce7cecb911e93e70
+EBUILD genkernel-3.4.52.4-r1.ebuild 4595 BLAKE2B 102509a5e934dd89efa28ce7834fffec27540bd2d34c42de3aa48b2c4401d86829870ec132eac51a86a8509d7f61dae3137fe5e8a8c1c0ec2f77190f1cabe011 SHA512 b6022392ffb02a9ac9de782c7b90411a1ee7d8cfa8a57ae5bb737a703ad7903d81047a2a670bb9a88a1bc00101949cce7698dbada52179515bebf0b81052fa0b
+EBUILD genkernel-3.4.52.4-r2.ebuild 4643 BLAKE2B de1d28f1c39e545a34fc571e7dd4253478487c9b528160207e09320ed5b5c9331dc8f8ed30796deec38e9b748ba9f09d9f73624394488e624d95e4787413b0b4 SHA512 eaa916a453c605e159a08bba45ed01d5a3352c9c2e0b844009b89cf1e131cb0735bff506848627547b171522eea98f4d334b436ab8d5520ce8b0f121061aa0db
+EBUILD genkernel-3.4.52.4-r3.ebuild 4691 BLAKE2B f9995caacbc6248e78d142284bf811a87262a276f817a89ea0a8cf949db2dc318e01e0ef4006bf6dd1b555a3fa5b6d98b443fb4a2f6aaf1aca5aa3df4aad02e7 SHA512 cf60ecb76bf7d5ec534d1d0cf69c2ed3ac368da77cdadb73e258932a401b11586c25d5e594343a6b89fbd4874aa20b331db951492abc62bb3faf37670afaa214
+EBUILD genkernel-3.5.1.1.ebuild 4703 BLAKE2B 65ceb245808f8327966c3c81bb39482857c3f0d6fa643d2e53bd7d08258c595bcf5415c8e93a9cd47d01b145bd297fbfe185f24b9d2210b6f1106894c5f2f586 SHA512 ba525e681261627bd506840a5a76de50cc78c45c6d9125efa5e6d4f8105771af39e2d1ddee62484598104b1e8c596dfd9ff874e66e4eb66aa5a7d5aabc57b436
+EBUILD genkernel-3.5.2.0-r1.ebuild 4948 BLAKE2B 6209a9f23303c545de1042624b773e48e9fb699e794d989608c5c0d074c4ee07e2de02fd4cfb9d5f3fb1591acef1ead531165f591adbc90b687f10248f07f622 SHA512 bca2b7251e0d6f773fdb126ee5893052af44db97001364ec1287d6d8597413de5e9d494c75be4d156442f029147ebe05acb29336232303f52efb0238c37b693e
+EBUILD genkernel-3.5.2.1.ebuild 4948 BLAKE2B 6209a9f23303c545de1042624b773e48e9fb699e794d989608c5c0d074c4ee07e2de02fd4cfb9d5f3fb1591acef1ead531165f591adbc90b687f10248f07f622 SHA512 bca2b7251e0d6f773fdb126ee5893052af44db97001364ec1287d6d8597413de5e9d494c75be4d156442f029147ebe05acb29336232303f52efb0238c37b693e
+EBUILD genkernel-3.5.2.2.ebuild 4948 BLAKE2B 6209a9f23303c545de1042624b773e48e9fb699e794d989608c5c0d074c4ee07e2de02fd4cfb9d5f3fb1591acef1ead531165f591adbc90b687f10248f07f622 SHA512 bca2b7251e0d6f773fdb126ee5893052af44db97001364ec1287d6d8597413de5e9d494c75be4d156442f029147ebe05acb29336232303f52efb0238c37b693e
+EBUILD genkernel-3.5.2.3.ebuild 4948 BLAKE2B 6209a9f23303c545de1042624b773e48e9fb699e794d989608c5c0d074c4ee07e2de02fd4cfb9d5f3fb1591acef1ead531165f591adbc90b687f10248f07f622 SHA512 bca2b7251e0d6f773fdb126ee5893052af44db97001364ec1287d6d8597413de5e9d494c75be4d156442f029147ebe05acb29336232303f52efb0238c37b693e
+EBUILD genkernel-3.5.2.4.ebuild 4948 BLAKE2B 6209a9f23303c545de1042624b773e48e9fb699e794d989608c5c0d074c4ee07e2de02fd4cfb9d5f3fb1591acef1ead531165f591adbc90b687f10248f07f622 SHA512 bca2b7251e0d6f773fdb126ee5893052af44db97001364ec1287d6d8597413de5e9d494c75be4d156442f029147ebe05acb29336232303f52efb0238c37b693e
+EBUILD genkernel-3.5.2.5.ebuild 4948 BLAKE2B 6209a9f23303c545de1042624b773e48e9fb699e794d989608c5c0d074c4ee07e2de02fd4cfb9d5f3fb1591acef1ead531165f591adbc90b687f10248f07f622 SHA512 bca2b7251e0d6f773fdb126ee5893052af44db97001364ec1287d6d8597413de5e9d494c75be4d156442f029147ebe05acb29336232303f52efb0238c37b693e
+EBUILD genkernel-3.5.3.2.ebuild 4949 BLAKE2B b41bdb09c9cb3260ce4da6121aac0fe85f88bdf1e1819547e136dc3c028755fac026ba7def52a78d0a5ac98520edce8a5f29d4b86bb36dbcdc23f815376100ce SHA512 e19128c55039a1988fd7fa26d9f1c182d7ff94e00a84cf593ba8b1790e0ec34db070d3781720322c49bd0df8e89414f851be98c0b8df979850070d4a671008aa
+EBUILD genkernel-3.5.3.3.ebuild 4939 BLAKE2B 077999b6eae72b4f7f1c242bfefadc4c72bc4f9db16dcaad06d8029aac0e28ee1c8053610eea74120ce1395444a2ed52b3b56a50ac134249be0a80c0a9e1f35d SHA512 85bb7d3f654b14a55f937e9810ceb173391d6b9adad7122c6603af655523346d2676f6adc7fc14c2d27c20beb61c593b5525f5b9b7e5e11b8084e2363d817f05
 EBUILD genkernel-4.0.2.ebuild 9419 BLAKE2B 9bd47cdd2f37814451561e5d60cf962953e29fdb1050f2702252c2ae35ddc16cb09fbef15905bd926340f654ebee20d1fd6655b14273d798dbf753f98a3515da SHA512 d3fd6926959d2d3e3e55a2ed50725fcc681a157ecb66decf36414476702335f7b517feeb471a2d7188a4c872ab5ec8f716e6d559751f8e1b6610ecbe54dc1faf
 EBUILD genkernel-9999.ebuild 9430 BLAKE2B 7290d6ad955933d35e4d1c47ea731b74aaa1a27a7602eb9c07045c676852f86b629ef42c5ea0f923f815acbd93e9d8f4ae2dde940ad8dbba0e99ead6ba54fdf8 SHA512 b780243f45e055bec8b561cdaec7c03ba50344b11bf05f14210ad64b92d2b672778c060001cbd44f0ce2925c130d27f6f8ca3029b95abdca6449ac560e9d1c6a
 MISC metadata.xml 637 BLAKE2B 8498132ea1773f537d7f463fb420e9b7c80f24e6a8e3eefbb88bc942707d37d3c7a0e8a80cbbace2c8068411d06f8a1923efbc23e80e6fa87fa06766af1a6627 SHA512 10753c6db20c7e5d2c805d309aa69945f66d27287bbb240626baa2179263b5cf0e703c589f1951aecc2ed1e7e8259097434cc4e7f36d9dff8e1c6d8f50b684db
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
index acc611fdf958..a6a9290a8904 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
index 77015d1bc668..40705a5cbcb6 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
index 4cad2b91981e..a0a90b9a75d4 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild
index d3b5d91664e7..f884b01c64bb 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
index c1cce7e60d94..11eec6861d86 100644
--- a/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
index 77874be36e76..7f6edd766061 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
index 77874be36e76..7f6edd766061 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
index 77874be36e76..7f6edd766061 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
index 77874be36e76..7f6edd766061 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
index 77874be36e76..7f6edd766061 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
index 77874be36e76..7f6edd766061 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
index 999f1bdf10aa..e886766d92ca 100644
--- a/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild b/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
index 566d536d042c..f9892849672f 100644
--- a/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.3.3.ebuild
@@ -47,7 +47,7 @@ else
 fi
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index bbd13bf9de5a..f8b0abc39faa 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,12 +1,18 @@
 DIST gentoo-kernel-4.19.101-1.amd64.xpak 61352926 BLAKE2B 7649aa77837e2234b52a073314aed8734739a70ef0343637516d526379dabba165a2797d37d534a84caee781364785344fc7377c6649ca252446a299ec9ccb28 SHA512 a9c9a9494b2899f73df0640c1d3fe130b059d72b49a4c1525090255b2714b488728496c7ba2683eaa5cfe8f27ba0adab1a574e7982706ce952a9961d1e169163
 DIST gentoo-kernel-4.19.101-1.x86.xpak 53595153 BLAKE2B 247dcedf826604bf461801ce56c95b1d065386e291f8d7d032d40cd59e4dd5fb3524509488a3ae60af924586d4facdb4712c23ac5e7b8e5f5679adcd7c82c5a7 SHA512 b70020a8a1b3d79fedac577b790df24a11181c022f6c5c14e85d22cb03de9ac783d287066221465e8e0c3f192e38396cf2eb1e1191bbf63d8c9f1f97e3a0c991
+DIST gentoo-kernel-4.19.102-1.amd64.xpak 61331736 BLAKE2B 1e2c0956e087c1261c8bfd5b281fb3306c52eb5137241286e8ef2b6d93b7af71a5921fb774c5117ea725f0d88ae9c4f3fb70a875f42bcc9cbb812dd631c549b4 SHA512 3502b6d914162394639febf8d63239b7392b294f65c9a807aff477d696119f1851540c27cc194539b14add029cdfd4a08a3cec6a252790f7e1a5350de931b56a
+DIST gentoo-kernel-4.19.102-1.x86.xpak 53603833 BLAKE2B 6ef5f6705b581e03e80e53e4aebb154b9c88adb5ae2e78b5152e72e1f7fc6b392d7d044ded6466528e0714d2e33d911b9161e37b81d0ddf1c689e6c1b9aed39d SHA512 746fcd7e3813e411d70a37cd7893942207309aa9fe59e4ed77c7c36e437ab7fe2d8dd32c92a32133d51fe78c5e9ff1276f6f10bdf9c11b3eebc0eed32b44c849
 DIST gentoo-kernel-5.4.16-1.amd64.xpak 64944769 BLAKE2B 8d7c4db931c77db5fd0e63f9dfda5b1bde8284a0f79ba6dde70fa2578ce82726353d550bd55c50a5a719ea51847add3bae69aa934281c2897f84b1e4b8413575 SHA512 1f6758f7562056dd65eb88e22ade903c1ba03de68dfc3f800ef7412ec6f6549325d4104e047736659dcd9e3abefce26606748b4c818f6abbc2d219b34a9ea6a4
 DIST gentoo-kernel-5.4.16-1.x86.xpak 56412474 BLAKE2B 9564f7e380d4e682b080a0b05cb5c1619273c019330d6c1486726bf135d14522a0c67370ac44858bfb28857c1fa0cfcb8d665c0151b6fe319f36f615a6d3f6b7 SHA512 09e92d53bdfbc5736f51c68d4b0d31e3210d29ca5bbad6a78dd3477acf5cb6f8c8f4e501d6d0598a844425502b7770b127d971aaaab48d4d3f9add43ff1b93ab
 DIST gentoo-kernel-5.4.17-1.amd64.xpak 64960678 BLAKE2B ab4a1cf30544a4a0e18243d4ad6d1e8b45fb37d6a87708b56f8247c307b243818b3c9d953628c6f20716a6904a13e05050607c7ef2f9380705c0448d3704d381 SHA512 f7f594f30e73629bb21c7d0ec755d52cec7a82076ea4ed0cfee28d0c67f483a14f1ec9267ac0fb53ee8f2cdb3addb618683b3c2e5744dfc42c562303327f92f0
 DIST gentoo-kernel-5.4.17-1.x86.xpak 56406054 BLAKE2B 579b3c4d639441246a55799048f7fb9b0f747771a5e99e414de0a093462b917286b5b1d554008b662a0eef8490c900ff245b91f9c85ecfc0237a16aa4913bb23 SHA512 2a0a00dfbaf9e233b994cbf8c9aaef3cb7e353261ba327a7797d0b40e0eab7603515c7b863153e9e62849ac8d6c95a98499546c14e896e2ebf2f3c8dc32fd04c
+DIST gentoo-kernel-5.4.18-1.amd64.xpak 64950554 BLAKE2B cfbe6dd8276a4148d80ae0dacd4bf487b243bc19ab20d014d7ed06e643e7243249eba6b18de0da0e89bb98860952a1de7644b4af65e3f5cfc083d720cd36bd21 SHA512 a202bd77ead0ed33985a9bf79d6676f91b26331981398f7b9367e7e6627e030b558138b30c238c419267aa1906beb0240967267fffa76063e0600069bde0bcc8
+DIST gentoo-kernel-5.4.18-1.x86.xpak 56403357 BLAKE2B 4b87361d706420aa166d4b0e136fdee436b5c105570b891afec291d86fc1b40c045d1607d45dc3653fed9198a4a4ce284940a4e3661c77c1d24b17a85320974b SHA512 81d1bc61aabca391e008d89970540f992a8a1d332b2ac2f8cb6ae0072bb2e3b19a6d9e446c1d6ec7ddbc4127506dc9ba1ec72fd582431cb9aec15c4b945dd3c5
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 EBUILD gentoo-kernel-bin-4.19.101.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-4.19.102.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.4.16.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.4.17.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.4.18.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-4.19.102.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-4.19.102.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-4.19.102.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.18.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.18.ebuild
new file mode 100644
index 000000000000..68ca59b57351
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.18.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 448274454727..c09dbde94b11 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,11 +1,15 @@
 DIST genpatches-4.19-100.base.tar.xz 2992824 BLAKE2B 02722c5568726284afa812be3d9cb4555bad11133dd5876d8ee09771e584e73dfb6e7bd8a2829126ff2dada931856a07429715a918a0fe88786fa98fb6ad6edb SHA512 621a9294c3377720723e89b175bb4f0f2812e566b73952a81112bc1ef675862842e00f642ba37f728ae8aa0e5e5cc17b347cea564821c02c88c532668007b5cc
 DIST genpatches-4.19-100.extras.tar.xz 17492 BLAKE2B c896c916f2dfad38b35f1ebd080cb5b66f6bd51b28a77535fc2ae44b11a1a5bee1be52a7d6d5e30b80c635b59e43f40d99c2cea98cf0744374412626a939cc00 SHA512 169dea4d9c41057807c63a8d66aa7fb94d783e841a94a700bc0eb1995e620e6b529658d3899ffc54e5cfde4e9267e385dc2e36786ff0c31acecc0593456f8909
+DIST genpatches-4.19-101.base.tar.xz 3008416 BLAKE2B 920228c1a69dea64f1e9c5f1dded4b01f2de69c92420daf45ede91bfe1db4004989015ae52cfe9013e300779a68bcbabb1af4e17f90db631a43e1ee38885ad32 SHA512 4b1062307426582521d4366bd3802b3adf9bc53c597f9b7dcca335241e797b1c5bd34e637added9633b73d4171bb08f34410350c21f670c07feb6c800a94c5b2
+DIST genpatches-4.19-101.extras.tar.xz 17496 BLAKE2B 824a49411f6ab8f4691fe994ee2da8736a74759dcc7cbae69d807cb9fac3d0890a660e5ee24a8f1fe10e0bf449855c5a9c6e7e523fec057b5ad3af5dd13d1a3e SHA512 1fe7326b95bc4eecbe4e3aada018bd6cd5897810a44ac8c0e031c2052964c917050c775e0a32304c1838c8c00ad9091adda1901818346cbbe3e2a12cd941bf72
 DIST genpatches-4.19-99.base.tar.xz 2980172 BLAKE2B 2da82ccc1a3a9f874f30046c4d7ea01730398d27c34be741b3fa64ca7e05972a4ef33f76e28383c488d71489c1eabd33e462c2fbbc8248e6d53486eabb1956e6 SHA512 481042c47ca0f56a3262e9920a1e245197672c51ac32624668974a8af5273d3ff593047bbbb6476b741de611c83c19ad6e4a09e1c1331baaf67c1998ef64bade
 DIST genpatches-4.19-99.extras.tar.xz 17488 BLAKE2B d57f278109d3ea0cbe324e15666f119e2a9ef4ebfe6f9581dffdd6e9f4c11fca47dc08f2375da62928076647352772cedad41a8ab97b312b59a03956dd4a3954 SHA512 ae1f8f8fd8f9da3860e82d8838714248983014257386bab802ec3adf86d694db50db8d6cc9a9d01a2a6936e2ceb740a4f4732e48b1c40eebc8ffd523745d5dca
 DIST genpatches-5.4-16.base.tar.xz 622844 BLAKE2B c9b71a945733efde4ef1c3f4e5929573c4b338d7dfa2cd589ad64c567865eb7d1448f2e32a59548ba2d738aee5219467727fa68a3572a50ffade1cd574ddfd87 SHA512 3a1ad8e9f44076fe00f5fee586d53f3b028e7c2086dfc2a30659415ae6a5f8463623890d0a26965eb9fe33da31b1b03652097a0814602862145d047dc9977b33
 DIST genpatches-5.4-16.extras.tar.xz 1740 BLAKE2B acd4fd5705617564442e44326f5d5c6f0bab8ce1950cfda56d9db03ca1b0adfc3f0d8770a659010c8db4f4d6114adf667ffeefe636f353c9acc51c9ba07bdd0c SHA512 b44523a6da21eef1f547c0cfab9e2aaa2bde929dc2727d9ae748a55b6735e78d304dc66ebd1e97b57ed988936e91ad49e205dce10b745a8fded3b08e13dd1ce4
 DIST genpatches-5.4-17.base.tar.xz 649680 BLAKE2B 787d9e9285a69a7f8de8c82375c42a8de7bc0cb0299c725fb60d23933079eff9803e43559d1a8467c3c315ad6ddfa64e1ddc47e4e2bcecaef892443f1bad7b7f SHA512 bd3a9b544d542a05da5c606b34998b7aaeab8d0ac85b13c6232d86d2cd0bfd418a67c080e8ad3d4bfd1e43f6e9afac26df368d3b61f66583baf018e109d7ade3
 DIST genpatches-5.4-17.extras.tar.xz 1744 BLAKE2B 8a871ac738bba4aec50fd972c9a6f9233ca4a187b6e612dbdb32721fa1e5a7fd0169dd4c31658a124c8933518b05a9f4c2ba417d471e9922809a518cabdcb0f2 SHA512 b76cb8c9f6bc0aa640014c0377bb39cf8686d3733322b8e7ca92791e7dffe3117f32a537682ae1b516ad1c4e1e275b0fc7d7bf280daf2426bea0703e735b920a
+DIST genpatches-5.4-18.base.tar.xz 676844 BLAKE2B a4edc187e5ca93823c553f783cede3814ded47c984b417b9654904cc67a4b52818bfedc0997b452ebc00007317fee7d72736dbd555976c37c334b3e1eeb6ea09 SHA512 49d362d9347370e2d4385a7947b502b3786e71dfa30b6edca2967418b940f25f978bc8d7db25a1c87b84d22de4082adc12aca7d0abe5a797e796f6680770ec62
+DIST genpatches-5.4-18.extras.tar.xz 1744 BLAKE2B eb75009e3a3c9fce962971e512a4c142ae5a61b6547e41faea87087ed7826b60087ab3dfceb32d0fc27adefca40b93afcb40a1225ac88ff2bd608ee5cf52e768 SHA512 5a3328b447eb12b077c8db6c3e3518585b963575cf52691691504c28d935a30d12ddbe786e99f0a42ec1625714c1c064ac60b7c8845247cd981f709a65a478bd
 DIST linux-4.19.85-arch1.i686.config 222183 BLAKE2B 03eac77940db0ee6b4f2a006edc600ef34141bbca849f5be4de9b961301a8fc987da6d0e21344aa5d80c29bb7793d56cf5441abb6c8e4057d94e2601c174c1be SHA512 6bd45c9dfd96b1afb8c1ca1ca72722baee6c91894e454d7af937de02242d3bb9d3b6870f5976aa96245c753c6bc1ac637a6356125b0d4c596aadef643b8c3d8d
 DIST linux-4.19.92-arch1.amd64.config 222487 BLAKE2B a658d80d85525287a1df9053ca2ddfe423ab423bcc3b9ea8bd9cda65cc7ffa4b1be782c48c867c13e46070af4016f446860f5cf71351f239da1eff6c45a5aa6a SHA512 a5658c8e8464516dffd6f624344e739784cb315d334b2c5105bd5d16022b6366ad4ec00d3692a7b78e2458514175522bc85e834bf19593feff6363b616860258
 DIST linux-4.19.94.tar.xz 103389152 BLAKE2B 291db6f448606a4ba288295b4b1c0b813e736534e4749a152baa1d07fcf52bba2b59e7b4b261594a2deb9ad961afec50a28b4ec126f97033f1c0a36aba9f2961 SHA512 c6017e854ec06054c658042c2e8227d79284ecdadf0a2e1c5da799ca2ac165a266e7d33aa52361d0036ddb3059e3b24f0a68b45ffd84d87394d3f41492f6f9a4
@@ -16,6 +20,8 @@ DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 EBUILD gentoo-kernel-4.19.100.ebuild 2271 BLAKE2B 73e135a8d1d419f0c0a2915ef62126d257e5069defdb03fffcf66159547e7945f4028d7631abf408a1c3b586bc9a7685c85ca2b2f0cbf9110169b20b9874ad18 SHA512 7d9b75895d5d46c9afc0955f86c54572290acc2a570385257abf809f3649a20f2ac06b0f6efae11c240f701ea15b8558444a4371817bb6c27d9e4e00b5dfd1cb
 EBUILD gentoo-kernel-4.19.101.ebuild 2296 BLAKE2B 53af0bc8eb122c6268e3db3d11f8a42f2862eb603e57530ef82a82b6a100f496b903e35065824df28fdad003c46df7130575af5d746558c770496387c32e6440 SHA512 e6d6c193ab4da2ce9dbe83c1e01669447a9bb9045e4651038325b62a04900cf3932ba73fa7ed41dc91316283f423afc501586e6e273a34cca6cb3217d5643039
+EBUILD gentoo-kernel-4.19.102.ebuild 2296 BLAKE2B 53af0bc8eb122c6268e3db3d11f8a42f2862eb603e57530ef82a82b6a100f496b903e35065824df28fdad003c46df7130575af5d746558c770496387c32e6440 SHA512 e6d6c193ab4da2ce9dbe83c1e01669447a9bb9045e4651038325b62a04900cf3932ba73fa7ed41dc91316283f423afc501586e6e273a34cca6cb3217d5643039
 EBUILD gentoo-kernel-5.4.16.ebuild 2151 BLAKE2B a80ff740daf01b4161a79816cebac6c917a7f94964df2231c340c43ddd8cec86d1f1af3d11956b9e30f1d1499d67658bbb6df8ba13b04114900d4304233ab170 SHA512 f7b5c1cc0157e7ad7c09701e1811a0f0b999b7fe33e627fb0d75719671d973d9515a25c54331118619df7b980ab42b9274fde027a17bfa573d1c0c57eea69f5f
 EBUILD gentoo-kernel-5.4.17.ebuild 2151 BLAKE2B a80ff740daf01b4161a79816cebac6c917a7f94964df2231c340c43ddd8cec86d1f1af3d11956b9e30f1d1499d67658bbb6df8ba13b04114900d4304233ab170 SHA512 f7b5c1cc0157e7ad7c09701e1811a0f0b999b7fe33e627fb0d75719671d973d9515a25c54331118619df7b980ab42b9274fde027a17bfa573d1c0c57eea69f5f
+EBUILD gentoo-kernel-5.4.18.ebuild 2151 BLAKE2B a80ff740daf01b4161a79816cebac6c917a7f94964df2231c340c43ddd8cec86d1f1af3d11956b9e30f1d1499d67658bbb6df8ba13b04114900d4304233ab170 SHA512 f7b5c1cc0157e7ad7c09701e1811a0f0b999b7fe33e627fb0d75719671d973d9515a25c54331118619df7b980ab42b9274fde027a17bfa573d1c0c57eea69f5f
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.102.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.102.ebuild
new file mode 100644
index 000000000000..3b0d137453f9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-4.19.102.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-4.19.94
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} - 1))
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux-lts
+AMD64_CONFIG_VER=4.19.92-arch1
+AMD64_CONFIG_HASH=bf97de6a2e405659aaad4c251b7f0bb48d5ed3c9
+# https://git.archlinux32.org/packages/log/core/linux-lts/config
+I686_CONFIG_VER=4.19.85-arch1
+I686_CONFIG_HASH=1f0345e2983d2edd55b401cb5a87fdf365a4192c
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		# (skip most patch release patches, we just fetch newer sources)
+		"${WORKDIR}"/109[4-9]*.patch
+		"${WORKDIR}"/11*.patch
+		"${WORKDIR}"/[2-9]*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.18.ebuild
new file mode 100644
index 000000000000..0041d89b83f0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.18.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.4.13.arch1
+AMD64_CONFIG_HASH=9eed969590614a38d370a9fe04a4f5d38ba5e06e
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.4.13-arch1
+I686_CONFIG_HASH=95f890a9f9131e7a0e01a4f3e9c5ee423756a233
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1792bf112e12..de5a3e21b4ba 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -19,9 +19,15 @@ DIST genpatches-4.14-177.extras.tar.xz 17508 BLAKE2B 53875f70491ff11afad110cdc0f
 DIST genpatches-4.14-178.base.tar.xz 3887468 BLAKE2B c196f08891302450fae0d8741f8310c3b45b402373f94c186be44c7dc26d9f21c4b13266ba13d6863465bae1a506bc2907dc73b55502631c5d206b0578d44eea SHA512 53d956f1d4fb7139764ae2c8dde7bcbafa62832af816b87127b5d615108d3f22290204c98adfde7038bbcf6a5c8b709715cdaa68a6c5814cb4de4d16d53a7637
 DIST genpatches-4.14-178.experimental.tar.xz 5932 BLAKE2B c763412516091591f59b4831fdc24507324454b9043a0ba1bf8224603ea28a7a31c16a4ab8cb5785912fdbd89001cb96e777ad4a72c75642e0b1778d314fe167 SHA512 be3ddb34813b6599842a5e812309ad2aec7c03fac949391cf98c4fad3aadc30f69f29fdc6c5e17ca8cbe8a7507e209072881521de96241136f4900d04e847231
 DIST genpatches-4.14-178.extras.tar.xz 17496 BLAKE2B 138589165064eeeab106668aca8fe2fe263fe2f66e56fcb74d8bfbe2f70a05f53e7851df03bfb80a0c2dc8fc90f3e69066fd11cfc52cde03fc3a3aefc46e7e30 SHA512 4f96a5ba435d45e28d136e2b5317327e1df78f9e105c7b9dff5beecbdfe7fc32fb4c166c05922fc2c12a469287a28d37d9f2357c3ccf83875abe92a1870a45ec
+DIST genpatches-4.14-180.base.tar.xz 3907208 BLAKE2B 9aa4a2e71d3182a45b6dca8c350fc580b13ed6a975434851d0e3bc0e00229d97bf37b27f706ccf2d5aa1df9143c52888426a1b0a9f66dcec0c7602c1a69fb658 SHA512 df3f4d5988374fa29fb417a36f48de6ec44d73c4507a25b4ba91588f16449140f6f6cf7947614452f29d9fa328806d533ea0090d1999d3383a7084a471e00ae7
+DIST genpatches-4.14-180.experimental.tar.xz 5936 BLAKE2B 9301f011b8c8878e334ac9098836e9c1ae3d8e96893dfb0d2f512b9f8ed9474f2541d5b3a8f6d77b27275b275d02f237415956512bede954eb18a449ae9c4bf5 SHA512 474c5fafc8c26b1822dacca359de5c8c9dba4bc90e9a3ef533ce769d7ccc5bc6fef649f20efb69d19a5823aaf1a382856487fb9b03b344a201bdc01da46dbcdb
+DIST genpatches-4.14-180.extras.tar.xz 17508 BLAKE2B 8d568d4e18cc1194db8def0ecb0c3ffbaac639bae8367ee5e7c2d77cc2c79991c4ba979bf345e37a55eebf5e8498981f607a1a6a9a2352e0e1fbedd2177498e3 SHA512 979c8fc96b4ac842e6e275a96e9f70297bea0198b6184efe0618269a7c8b37ca7015a388511c4ac45365b66d20b96fa3e16579af22912d7ee90f68836faa4b3f
 DIST genpatches-4.19-100.base.tar.xz 2992824 BLAKE2B 02722c5568726284afa812be3d9cb4555bad11133dd5876d8ee09771e584e73dfb6e7bd8a2829126ff2dada931856a07429715a918a0fe88786fa98fb6ad6edb SHA512 621a9294c3377720723e89b175bb4f0f2812e566b73952a81112bc1ef675862842e00f642ba37f728ae8aa0e5e5cc17b347cea564821c02c88c532668007b5cc
 DIST genpatches-4.19-100.experimental.tar.xz 6436 BLAKE2B 94dfb63ecb4c0127217274091ca34e32ad6de9166e351368381755e3f49073344bcdb625e3c783d3aa6698f8b4d99a732c61accd8dd73e90da41ffa7667594f6 SHA512 1d8418eed09e492f65d03fd57a7915f38278e06ee9fe63e1fbcbd29ab2fd3906f81a84a2d4fa7f53fd7920b9c795d36195502633a98524a34e2fb9aeef9b9238
 DIST genpatches-4.19-100.extras.tar.xz 17492 BLAKE2B c896c916f2dfad38b35f1ebd080cb5b66f6bd51b28a77535fc2ae44b11a1a5bee1be52a7d6d5e30b80c635b59e43f40d99c2cea98cf0744374412626a939cc00 SHA512 169dea4d9c41057807c63a8d66aa7fb94d783e841a94a700bc0eb1995e620e6b529658d3899ffc54e5cfde4e9267e385dc2e36786ff0c31acecc0593456f8909
+DIST genpatches-4.19-101.base.tar.xz 3008416 BLAKE2B 920228c1a69dea64f1e9c5f1dded4b01f2de69c92420daf45ede91bfe1db4004989015ae52cfe9013e300779a68bcbabb1af4e17f90db631a43e1ee38885ad32 SHA512 4b1062307426582521d4366bd3802b3adf9bc53c597f9b7dcca335241e797b1c5bd34e637added9633b73d4171bb08f34410350c21f670c07feb6c800a94c5b2
+DIST genpatches-4.19-101.experimental.tar.xz 6436 BLAKE2B 826c01824ae66204ae00f63625105e585246e51f2ee6a070386fcc4ce0f92d21eb050e4bbfcbe8c0f8021a394ba9f03c9eba76b1cc251fb0ad557c9028e0b137 SHA512 11d944100d055a4129ee59fbb116d6ee9ae0d21eefbdcd2ab2e433175858f5477ac1e3bbdcfb8fc5efc56074433b70767fb51954a6ebd05b15ff281c0e5b65f5
+DIST genpatches-4.19-101.extras.tar.xz 17496 BLAKE2B 824a49411f6ab8f4691fe994ee2da8736a74759dcc7cbae69d807cb9fac3d0890a660e5ee24a8f1fe10e0bf449855c5a9c6e7e523fec057b5ad3af5dd13d1a3e SHA512 1fe7326b95bc4eecbe4e3aada018bd6cd5897810a44ac8c0e031c2052964c917050c775e0a32304c1838c8c00ad9091adda1901818346cbbe3e2a12cd941bf72
 DIST genpatches-4.19-85.base.tar.xz 2403008 BLAKE2B ed31488bc37aff8e5a7e0491f9b4ac2d70689c9d47c219f001d6900b0c79792cc0dd82e5e368924193be93d747e8a17931aa462cd263e6c517ed8ae1fc070ddb SHA512 6218d1fb01617544f3218b451fbf0ff2b166c861621bb782d00dd01a28a51c97685b44d19f1a2e8da0b8d4178eb38adfc8047a98a2931558f1ff4f26288b8323
 DIST genpatches-4.19-85.experimental.tar.xz 6428 BLAKE2B e1f94a7fbb0b72c9d43d0785f212a4d739e086eb6338e7fdf3979c9055c69908a388e9c2f5669eaae6ac8a9adce14dad11d450878b0dbeffa8b5316513f92b16 SHA512 ca204d8ca75278e72648b8e79609b533de9de7635e3602476773f7040ae493c6e356de08a60588defe9491960b4ac046aee5813a25dfcb3eae9779b720a341d0
 DIST genpatches-4.19-85.extras.tar.xz 17500 BLAKE2B 869534152df10ea77feb65211729acb49d98a6cf28cdbfe8f4faf0c6a14f788ba1f7fcd868da5571195a8aeeee083c7257e9dcea628708cb8dd370cb9af6165f SHA512 9931dc1de3062ab85a14bcbe20007d5bc1b15cf1a77570076637df0311615adc763ca91e5d13052f812237f489d7e4c9a376395c547a926be770f787740d9581
@@ -103,6 +109,9 @@ DIST genpatches-5.4-16.extras.tar.xz 1740 BLAKE2B acd4fd5705617564442e44326f5d5c
 DIST genpatches-5.4-17.base.tar.xz 649680 BLAKE2B 787d9e9285a69a7f8de8c82375c42a8de7bc0cb0299c725fb60d23933079eff9803e43559d1a8467c3c315ad6ddfa64e1ddc47e4e2bcecaef892443f1bad7b7f SHA512 bd3a9b544d542a05da5c606b34998b7aaeab8d0ac85b13c6232d86d2cd0bfd418a67c080e8ad3d4bfd1e43f6e9afac26df368d3b61f66583baf018e109d7ade3
 DIST genpatches-5.4-17.experimental.tar.xz 6144 BLAKE2B c194d3591e38605b9096ab7a5b84e085ec8b594160d9cb1edc276108baa13ebcf3df046854b18530a8583f4dba2eee3549cd98d82aa8d92205f57e0eed271d37 SHA512 4b98b6b589c6aaedacb769d1920817a2fa2459d68f782d0904aa7fb9ef8d0ad5fc6c078283958416c4c24a1e0f6e37760239aeec4fa7a2df469985f073df0e9d
 DIST genpatches-5.4-17.extras.tar.xz 1744 BLAKE2B 8a871ac738bba4aec50fd972c9a6f9233ca4a187b6e612dbdb32721fa1e5a7fd0169dd4c31658a124c8933518b05a9f4c2ba417d471e9922809a518cabdcb0f2 SHA512 b76cb8c9f6bc0aa640014c0377bb39cf8686d3733322b8e7ca92791e7dffe3117f32a537682ae1b516ad1c4e1e275b0fc7d7bf280daf2426bea0703e735b920a
+DIST genpatches-5.4-18.base.tar.xz 676844 BLAKE2B a4edc187e5ca93823c553f783cede3814ded47c984b417b9654904cc67a4b52818bfedc0997b452ebc00007317fee7d72736dbd555976c37c334b3e1eeb6ea09 SHA512 49d362d9347370e2d4385a7947b502b3786e71dfa30b6edca2967418b940f25f978bc8d7db25a1c87b84d22de4082adc12aca7d0abe5a797e796f6680770ec62
+DIST genpatches-5.4-18.experimental.tar.xz 6144 BLAKE2B 8008e965415f3c51e8b7c5bb020503e38f7b1f3c5e3ca8d7156c06ab5728f67aa0e2be2e81bc6b18f955edb70ac068810dc5bed114f0065c882339b72741bf78 SHA512 b5e472aea1a4aeffdc6be600e2002ddb18d9c6509ae72acf98deebcadadfb9c3e42c847967e4b7e5dd604ec5c6986175a7089d422d3fba15e043b4f07e92eaf4
+DIST genpatches-5.4-18.extras.tar.xz 1744 BLAKE2B eb75009e3a3c9fce962971e512a4c142ae5a61b6547e41faea87087ed7826b60087ab3dfceb32d0fc27adefca40b93afcb40a1225ac88ff2bd608ee5cf52e768 SHA512 5a3328b447eb12b077c8db6c3e3518585b963575cf52691691504c28d935a30d12ddbe786e99f0a42ec1625714c1c064ac60b7c8845247cd981f709a65a478bd
 DIST genpatches-5.5-1.base.tar.xz 3984 BLAKE2B aed3662231f2863f234ebdc3c615c8c7fa32c3b1301659388facef4354b148bd31a9978917dcced2081f157afa176df5cda2e11fa085e3599f68af65f8edfaec SHA512 bdbe3d72620418ad0245f7e7f4fec7960d302be4842c6a090440f8ffccc5f6a67fdf11e51da5a14b659ec7a003410f1374b70ece128455ffd8eaf13177a427ff
 DIST genpatches-5.5-1.experimental.tar.xz 6168 BLAKE2B 22b8602963c9a601da950a86b242116f4885065087e751d7371d914b2077434ba4dfb54ed03be26bb6951dfef49bc587c39c9b5065df2585b25e6c116bac7261 SHA512 9bbfa35b13e4d994a426fc623fd8fed56b722f4ff9e3d2ff330f8b8dab454e9d5b5da205ea64385377685bd319663fed27612b7c9122b752ce8d4be5bdde3e8c
 DIST genpatches-5.5-1.extras.tar.xz 1744 BLAKE2B 78353a253969918f5c054768df01bf7d0a0887f5686f6b84a78f28a0c1ef49101f278c5140367a4547cce9932ec9e7dcff4b4fd8519bb9e9dd9b7d4764461877 SHA512 84815483c7c30e2258c1d246080c460177b8e3b6c49592a78c2a5d83798b703da845ee3f1f939da1e947dddced42fc83434ca162f8e5135c838877304e3a80cf
@@ -128,8 +137,10 @@ EBUILD gentoo-sources-4.14.166.ebuild 733 BLAKE2B 87603fc3d8308f6c120cf08a38c390
 EBUILD gentoo-sources-4.14.167.ebuild 740 BLAKE2B 4a03f7ce31f0c4620b4b18625c481da31a1c600731c31fef83d198885ce1d38307b2b8eb65b4c79d94ab3415a100fefcad9de4fc5397b337c76b30d8978637dd SHA512 1e5333414c626bf4ab1cee4b81a79a57b0083611e0bdedc5ebbee034d9a7670e3f737ee7e51a591b3505d821d50c4b0379fad29f4c9a69fc323f1fbc80fe42f8
 EBUILD gentoo-sources-4.14.168.ebuild 740 BLAKE2B 00981e11acf3801e91d8f44c80079324a49a78040370ceefbc89d842dc1a1f254723d5b11f4666668e068c60a82280beb7ce648a4413ed4a4b78b7f5c965f84a SHA512 f56fbafe868d5558482672ab491ef7701cf1aebfee2debb7f7eead657ba1d44bd7f9dd874396f8fd37e2082b3972aafb4c86cd927a2b567974ac07143b6ec291
 EBUILD gentoo-sources-4.14.169.ebuild 740 BLAKE2B 329135008631f70dd4c7358036d8b29bab5f3814b5fe8d7347f2778ca0f30d3c2db31d4b4081ee7d094c3a019706d42113ea6f142b7110c58f53945d1a6243a3 SHA512 7a3886dcc5c59171868017fafd58e128168774d3bc530fbc95577bd83658e50658992346b90bbc313ff9662dd6ddcac08927af0e3a65adc8c692b7afcf92ffea
+EBUILD gentoo-sources-4.14.170.ebuild 740 BLAKE2B 7d5ab9b49a98e5ae238e9dc3e49a906f964b86a4aabcf95ef0749263d32395939f63a76c5e135943308a8ec74de0258fc6dce3f7a826b06e7fd837cea271b4d5 SHA512 536af1c8f602fd907dfb247abc691dcd6c23a7c1f807e31b02805550bf0c0b5999ea330aa3cfd7aca4c3fc28965287a3ce7bec31f4e1043b6ca4768b70dcb71d
 EBUILD gentoo-sources-4.19.100.ebuild 739 BLAKE2B adf48effc872ae70246b81a4c9a4c57dbefc8cf4933e3d16d3e63def90cbf44a136d4b1d420a39b87a38b3e0ce9af4451788ed8da56b61442ac9a2bbcdc2a1e3 SHA512 408b3f0d8f5572cb2c65ba500b9db220c838f54c46986e319909e23556495a92f7760cf1c33963049820412b005a97e02db330e915ec36b45a5d7a0ac3ab853e
 EBUILD gentoo-sources-4.19.101.ebuild 740 BLAKE2B 269ef476c0b1f557b4818969a1135ae02da2fbc7a29d4bbc89fbb738a42cf1694616a0ecacc73fd3591b89ace73f4dede5d7ccf661e04d8767488bf2b6f8ac70 SHA512 9de09fd58b2252a37fbb5e05d3062cc0e2982d64818538dc42f7b1d329d6a5a55837162c29635b3347441e5f3ae4648d53f2edc5e8e226e7d9c76de17657f329
+EBUILD gentoo-sources-4.19.102.ebuild 740 BLAKE2B 6de6f3325cde5bae483646d8e38d9b02a0aea088da13eb1657c07ff34d1b6afd1ce812695eed40c3009fb3fd302987f98324630c6f578928eb4bf25ee6a90e1e SHA512 ef8a5a5464a00ebb704eb6770e2a930e577d66f8828013b4f7f8a747b1543d49d4c209c0a31e8db2f34ea94c4a8a408f8664dba39db705cbf900baedf0c83b93
 EBUILD gentoo-sources-4.19.86.ebuild 731 BLAKE2B 2929a814161f32e44360078b614121299ebb33dd87aa75f8c8909605f73bfb77fdca756d67b5182c6b370534df633363eb0c46827ffa59a823ff964674324437 SHA512 d17073d88a62ef21197c5d1402b881c18244e9b252884f1b22c8bce62a80d8e9d5fbf5dd5706c1df25203d9ddc7c37e25674f382526d50a879a12e0a81814bc1
 EBUILD gentoo-sources-4.19.95.ebuild 739 BLAKE2B fafcff29bd196d9f64748f39fcf0b5f9aad7c21917e0dba6ec789d45e2b8af550845dfea0ff10fbabf068da6ae0ab0611c69b2fd21306a0be8b39091f337e5d2 SHA512 10bea030e36dc23dbdc15484ef5c7202c804d3f986174d20600c2925aec8749f02994b4a27bf6db39f830675cfe11878a5cf181e764f97878a8db750020ea85b
 EBUILD gentoo-sources-4.19.96.ebuild 739 BLAKE2B 28c233bca0bda00bc5892c232303a87111aebd4fe4b6c2297429b19e33a73bea67a4cf4767341a005dc434995f6ee75640b86762158fe04fa3b706f38c2ac300 SHA512 4ada08ff45f87792b7ffb6aea97d4530bf374adf5b37d59a99af95e4b1668b07026303c5630a778d7130d6c2205ea1bbbdaf82df59aa8f59c2f192695d21e4ae
@@ -156,6 +167,7 @@ EBUILD gentoo-sources-5.4.14.ebuild 739 BLAKE2B b6c2f74a8ec9de1edd75d409273db5f2
 EBUILD gentoo-sources-5.4.15.ebuild 739 BLAKE2B eb57e4ea227b67a59d39fe08d04a31dc31337b6f359a21a29f0ceaebc195097f3fb448461fdaa19e2e22a855a4b86e5baf846613dbc459ff6ec99ec46d7d7eb2 SHA512 ea0cb626c58ad4965fcbd72e30a942b313d5cb9fda79e2492edfa2bc7db5b710bcf4130b5e8f71b1828e95645cf2486453a6e7e7adbd2a2cc0ab222b3d2b99e5
 EBUILD gentoo-sources-5.4.16.ebuild 739 BLAKE2B c73e5396e597e873f7f3860797c603db6ec2a2218289ef4b00bb26fa806ed90e0e5791007942ca0ae2bedca8a255fb012da728968a1c5ab291101337e2506022 SHA512 b50748db66efe41e858714aaff167e8993e012cfbdb1aaeb8373b55ce535c48f557320b18fbab4e8a89e12f498f5d8cb9069bafc26bb0823797701b204621075
 EBUILD gentoo-sources-5.4.17.ebuild 739 BLAKE2B 1ef587d762ed13193b48b597a66a4402fedac49d09bcee12734ee520b20920c8353e084035e754e33d960fb721ae4d55aeed881aa674667d8cfa213cb1f7f08d SHA512 8ddb2558e2be88f4f521fd2e870e7babbfddd19a75418b09d3203a1d178a702be3c548dd7bc877efc0f166b84bf19b7edece63b9400c7fef18be58578b7545f8
+EBUILD gentoo-sources-5.4.18.ebuild 739 BLAKE2B 0e54e87eed30a388e738d7322195006910020fe9bab0d1e331ec5d649d866499acb6b16cb484b20aaa3af873bd0a92a85c8e4c6f3f843f63e8e2e55a26f1bcd2 SHA512 c6ac4678b54e29ae41ba17c14ffa46e7344b7a9b3e062bc468cdaebd116f7ec6d81c616714d72edc73514983459ce62668ff4e4f81d1f848d2629c37ef2efe1a
 EBUILD gentoo-sources-5.5.0.ebuild 738 BLAKE2B 8d1c4306abd035410fb25a6df2573790460fa117fbef7276c7132ce4409ce5fc5879e633e051df0d54bad7ed5b3f7d227654132b871e23da39b2276f4e8baeab SHA512 50be6b1a3c8a80b6487947be7355ddf4d0eb035b0cbd75ce6e7805f653b19dd2b73a28b62694606b7e215352a52f1700474fbbbd59fb5037e98e45241604ee23
 EBUILD gentoo-sources-5.5.1.ebuild 738 BLAKE2B 812e40bb9fb47fcf3b4bb3736fd379669afadcb98484fb68bd9db087d2d5f5a22b3cd57820aa771c2a74c59397262bef34eacdcd00a608418c37b9e2dcc8901a SHA512 1c1ea8811c27d0a5f4147ed8b6ca880ae73af1d3bfcbaf0e2f9b4452b8d7c648e4f1f825014f48151d6d3f50116c665bc2d50dee8b19ddb6e7c1c96cd51fe478
 EBUILD gentoo-sources-5.5.2-r1.ebuild 738 BLAKE2B 25db1fc8385a6805846c19c99ac8e4eccdfe29dd69c86d4e8cf626539c059d40e0341a048db961aa5fc6aa273fa839ef99aa0d16588f62b6279a1282fa6da222 SHA512 ec0bc211f7f6da32df7f54f2b5727dcad0700a145379f182e75689939d23a395e431ba6ce31020ce6212f713e517a030b78bc5854b399119cd132ecc288c5b15
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.170.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.170.ebuild
new file mode 100644
index 000000000000..9de3ed8cb1ba
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.170.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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="180"
+
+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.19.102.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.102.ebuild
new file mode 100644
index 000000000000..2fb2584ad08d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.102.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 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="101"
+
+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-5.4.18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.18.ebuild
new file mode 100644
index 000000000000..3b74bc3839d5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="18"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 245720bbabb6..2d7144cd5efc 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -1,4 +1,5 @@
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
+DIST linux-5.5.tar.xz 110713660 BLAKE2B 36b990d3650c409652206c319c93c0cf68885334050bc286b479c8b844bc47354547e19eebb58caafb026b96d134f39f0c7ce38b4eebe9da7ea6d1610a1e2af2 SHA512 fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86
 DIST patch-5.5-rc1.patch 42346664 BLAKE2B 5dd2f44ef640b718f27201225eddc9c8b85739c9e9bd0902dacbc8c88ee967c38209dff28a77ed9f392842d24937c264a25155b2cb584b853375a0ab17427257 SHA512 a4f2b07002e69768e86f77c3f795fc752567fef0ba1f9370c773b5170df5f3ff467167308c262fce4da820f8f2f4a6683fc64b3fa68aa78ac39954e59a1df500
 DIST patch-5.5-rc2.patch 42752329 BLAKE2B 1365e47a57cb9938f72f7141fe2a0308bc0ca308f778465a9d9a65b7b6ce142f3a9fdf82472e7904f982d854a6e5c36b271c71b236eccfadf79ac1c1de28b80a SHA512 a451a75db4bc6c031fa70e97e70c31d71c2fbdd836d6c82cc5883ef1fa1767bdb902751c6ec71ac7f7182b20baba01599815ba72cd621b960a3a47b583281666
 DIST patch-5.5-rc3.patch 43336020 BLAKE2B 3bc5729452ab2a07c1a01808f545a80cd69e8eeb317199052ca8678625bfe594a59b2b8aac4e2ace01b0b43394c0014245b0303e2b2b4aa9a055b13d9edeb4ac SHA512 119e1ca3739712a9da5f9c6a019f9ed3536cb1f2e03422093fae042414c2f47b9dff0b02438987af5fdffdba664d7ccb82203d14ee41c6a9a2a07b96877d4ea5
@@ -6,6 +7,7 @@ DIST patch-5.5-rc4.patch 43379977 BLAKE2B a38ca7abade329ae966bfafe9f5c616c49d6a2
 DIST patch-5.5-rc5.patch 43553852 BLAKE2B 06b996fded42eeabc082ede5867b62bfedd75b17fdb72bf34eeee12bb2cf391e7a6c98485fe1bfa2aa2c71a89bf9118ad18fb436d5228c1a81b6d3ceb1595bfd SHA512 ea1e206de9513bce3d6cd67b33f6b2311c141c11f1facdaffa0af09f8057f554a6f05ba682218a9f0f384995e773bbe08e3558263821b13f1c46df54db76bffe
 DIST patch-5.5-rc6.patch 43727222 BLAKE2B e17d108d073441237114984b5615ba17cbd07b7a4521a1b87dd41bf9d4194ad340a9a62adab3ce866151112a55090c3958df5a3c1f3fc6e321c876d70cebf219 SHA512 7596cccb5ac54be9b70d24ff222e20fbbc2285f59bda4402e173b0e6c8dd0060f2544ed688edd5620bca00ffbf93f6262c33a332c64d331854a23ce16589e0c2
 DIST patch-5.5-rc7.patch 43993068 BLAKE2B eb6da463376791dc87d96675b7c7e962e7c89c9cbf9c8f7d3bfe995d702bfd6a7fb42801efca48404f100654dd618842c5f21350bf17b13f1b353b43830fc71d SHA512 02f7571e947cfa695b05eb65a36f42621bca993e0c9d32ea972334d358798fd66a8f2751a819c599f5d51f58d1264a6edf73a7cd2bb752329bc81ae300d3ded5
+DIST patch-5.6-rc1.patch 39491488 BLAKE2B adc1688d19eb26d6b253255c427bea5b1961f1fd10244f06fd3ccc942f19b8f93ff65fa142ed7d7339c7a18409d00bbaa7be30ca1dbb7e02970cd2311c27e54f SHA512 399b5a639171e48e9a45a3f7cd6612aaf953f54996ad3c52fc1e6c7c83b73649bb73c77d3a3675ca6a7740fd51c73a00d8059d743d753ef0eeb231ba55f4ed7d
 EBUILD git-sources-5.5_rc1.ebuild 1175 BLAKE2B 48669458e295843d1557ec793dfee15fd9598aed49767d2d724db50a48149ce0cb5977230461186cbf3a6da825ad64635a23acaea95462c02831eb4f82ab3b83 SHA512 7ad128e6f9a019cba2c4cf7cb09c45e9f9946371b835ba6d1831e77e5a537246f4e66e5aa52bf07e8e5cd48202daa08fd2a63182ef7b5136877255ac166233fe
 EBUILD git-sources-5.5_rc2.ebuild 1175 BLAKE2B 48669458e295843d1557ec793dfee15fd9598aed49767d2d724db50a48149ce0cb5977230461186cbf3a6da825ad64635a23acaea95462c02831eb4f82ab3b83 SHA512 7ad128e6f9a019cba2c4cf7cb09c45e9f9946371b835ba6d1831e77e5a537246f4e66e5aa52bf07e8e5cd48202daa08fd2a63182ef7b5136877255ac166233fe
 EBUILD git-sources-5.5_rc3.ebuild 1175 BLAKE2B 48669458e295843d1557ec793dfee15fd9598aed49767d2d724db50a48149ce0cb5977230461186cbf3a6da825ad64635a23acaea95462c02831eb4f82ab3b83 SHA512 7ad128e6f9a019cba2c4cf7cb09c45e9f9946371b835ba6d1831e77e5a537246f4e66e5aa52bf07e8e5cd48202daa08fd2a63182ef7b5136877255ac166233fe
@@ -13,4 +15,5 @@ EBUILD git-sources-5.5_rc4.ebuild 1175 BLAKE2B 48669458e295843d1557ec793dfee15fd
 EBUILD git-sources-5.5_rc5.ebuild 1175 BLAKE2B 03b9fb08c587259b57a522c8922c08176896aec5ed4074b127096b6dd0d508b449bf3ddceed0dca2f922174a963063c51625798653c15387ee3865f68afedc02 SHA512 6f6eb0d6de2cd92b313025c2849305af932f09ec550c6c5e6134134369df0e7b37f8564994a576a8f9f033e7c393b5a1385ae120b87f5618114c3980f6273f7c
 EBUILD git-sources-5.5_rc6.ebuild 1175 BLAKE2B 03b9fb08c587259b57a522c8922c08176896aec5ed4074b127096b6dd0d508b449bf3ddceed0dca2f922174a963063c51625798653c15387ee3865f68afedc02 SHA512 6f6eb0d6de2cd92b313025c2849305af932f09ec550c6c5e6134134369df0e7b37f8564994a576a8f9f033e7c393b5a1385ae120b87f5618114c3980f6273f7c
 EBUILD git-sources-5.5_rc7.ebuild 1175 BLAKE2B 03b9fb08c587259b57a522c8922c08176896aec5ed4074b127096b6dd0d508b449bf3ddceed0dca2f922174a963063c51625798653c15387ee3865f68afedc02 SHA512 6f6eb0d6de2cd92b313025c2849305af932f09ec550c6c5e6134134369df0e7b37f8564994a576a8f9f033e7c393b5a1385ae120b87f5618114c3980f6273f7c
+EBUILD git-sources-5.6_rc1.ebuild 1175 BLAKE2B 294c0d40eda13c870aeb231034f0dc5082ea66a9556b504579e1cc12ff53c774644ce13d2c28c4a65a9b1f69a6e68c541e59c64c01993e46b4bbee606f95a1d8 SHA512 0dff983b69edf0d54dfddf1715978abde9a13f1558124061bdcf1969f760a367906271234248af76d145995f9eefe431180f1e550cd3c49e12e8154e7e2e7da8
 MISC metadata.xml 596 BLAKE2B 967f959eca5873ccd58ab34aeabf965ec03e9ff41850fa4eb1c49f908ed7ad090ad2f5d7904f350c84cd47d99109e977835a2b216bb8605001b4098cdbdebda5 SHA512 c3476f5b64efc298e0df021b00dc4978a34ea48e5839a9cfee583291a4b5fe7ccc35db89a335db81e9c2cded36663691e6324dcabc90d0b287213d0fccddb227
diff --git a/sys-kernel/git-sources/git-sources-5.6_rc1.ebuild b/sys-kernel/git-sources/git-sources-5.6_rc1.ebuild
new file mode 100644
index 000000000000..4b09cc629ca9
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.6_rc1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.5"
+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/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 4dc807eafb77..53ee9e9e0975 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -20,10 +20,10 @@ DIST patch-4.19.79.xz 1919600 BLAKE2B 1875b5a9dddfc8927d91bb8c6b179e7f0e992298c7
 DIST patch-4.20.17.xz 507008 BLAKE2B c8d8141b1e7e2fb81a94b37fb6860e8d6e672f709d5ff97e1d85fe621ba8e54eb3a989372c69e8c521d59ce832a6683326d96229942ee9d749883295088bd10b SHA512 b4cc082504baa13145c201b4bd18ff7ebd4a77358d17d38adc54da1d19d36f125cf9fc6d82296dd1537e91e6b0bc4bcd44b14680b0bf7b45b8963b7f899d390b
 DIST patch-4.4.196.xz 2731404 BLAKE2B 956b3936ad652f0b0cbd5073f8eef4ebedf99d3f30de433e7e7dd2608413d80707fba1c64af5530cca424b41f73c36789b248e4fedd130dc5f0d982b2c10b4d0 SHA512 ab75f8a831f2340958439a8ef0edbdc886b520197993cf213fb6cf7403cb22795206bd040ad4b03a591231b02f4a5f4836dc5436f056fc7457d54e869fc9d113
 DIST patch-4.9.196.xz 3000048 BLAKE2B 3fb9f0e28caddc503673a6446ca20d19705d1941405d61a04d7136949896b89c03ba047815df8cb85ce913e9ef6343ccb4050719942e9c44fc1d363d3eaff318 SHA512 58fe22808bde31532d57ea9447fcad326ca3e9b06d4f0243d8671a431b97c3d2e56315fb10c1f9305803ef71df11e7689441e9daa9a3c0f90fdfb200e7e1d50e
-EBUILD mips-sources-4.14.149.ebuild 13150 BLAKE2B a37b1f923b099f31d59fe7926e40495642266d9c82359e716767d5c8747b8cdc733e3061cb499f5735c1ea1dff08690a456bf847af4d01350c564177cb981ef1 SHA512 7a30811d0a454dd07508442a0f60852e6d9b60c00218c1807d23ee7fc1eeef5d564c5501eec97124f5c53ea5c8addcd13f90d17d3f0eaaa29054fb5410c6710e
-EBUILD mips-sources-4.18.20.ebuild 13150 BLAKE2B 79dbe9931875ee8469f85a294696059d7d22b34314cad6e302ad2376ee7443289b023b4b83546f45fda1b2c91b56ea03199b0b0d6be94e1bf95659f76b2e3b33 SHA512 321d45d42f886866f1ac5b0403724b259c73816b67ca42eccd7906311310d2111bb60ee1ea1a3a50122ac7244e2dae96b25db0de60393c2bfc9da8a49c226f52
-EBUILD mips-sources-4.19.79.ebuild 12795 BLAKE2B a94b5acc8cc13a170e211667cb7e70fa98db4335423c080c137e0a21f026d5afef7c5b06cbc140dfb764dfe36711f603f82750e2087b84774516adc93b6c860a SHA512 e2b3335fd558f6fbc6f3c72eb9026d2f6959f2d85d4f0c454d93f0a4cb280963b8134b8870a3934a9537cdf952265add36161bf7e875749056543a071f80ef5a
-EBUILD mips-sources-4.20.17.ebuild 12795 BLAKE2B 3ef89a659dea18e9178021be0955d8a8d934b48fe1a74be686e242c4db74fee964a045ed2013070456ab44e1c269d2daf70dc5436513930a0cb02feeae2dd2e4 SHA512 eb276adfc3863cdfdafd071324c6982f14c76e8f381f6b41c7ff91ddd22d72438d305874d6812179127b24899bde8b6b7b74c0f245335a62f4182aeaf0dec0f1
-EBUILD mips-sources-4.4.196.ebuild 13244 BLAKE2B 6e74f1196f83588ec27ccee72eb1afe1a8056e4e4adecdf3fdf2d0d8b91a09c33cfd1097b524e493b722ff69774f2e7b48ec81f6fd3857a07b945c01cb38cf36 SHA512 aa7cf8489450bfbdb4d76ec60888ca63e96d12e6cadc8d8243f430ff14e6568eb5eb28dd5372f8a5581b1fbd8925d4e5065b8249782a2f6a2373cecbf25827ef
-EBUILD mips-sources-4.9.196.ebuild 13146 BLAKE2B 22d64471acb97b5c18c1074de6423215f9cca88b2515ef3d13f0cc2673ce079d39f0c358945f61ae27152ea401f71659d5e17f12f8010ed5752381d2052ee7cf SHA512 9e13951b8213b983c5d4d8bb0f85fa79ee994948af18f11ae4aaecffe81ff6307825ba06c187fec724cd5464b23c9ae5989dd75617109a26a63cae959586d341
+EBUILD mips-sources-4.14.149.ebuild 13167 BLAKE2B ebe78ba6b1dc9dc34a5cb1062d1f1ff2b22ea892f8246e9773443e410e4fa1764c602e2084ffd0a8e92b4db3eefea4a9a0c722b0cb6e7bc3b1903fe85e28ad8a SHA512 6af4a97cd7276eddf533fdba6cfb9f0443e0e0e85c50a3fde5359dfb89411182528462493fb4652d1ef57888f63d84710b0a8e09b69238fdcec65c4e1c3892b2
+EBUILD mips-sources-4.18.20.ebuild 13167 BLAKE2B e6573c851730b8d11ea4c9eab4f746a465f5d160f9f3f05d7250629f1c5133fcc5d7ff5bad368f131a650bd4187d79bb0e4eeab909a38ded85e68edc7fbb846e SHA512 d7a4d5f4bd988b7562abd3759b3f63e5853fa58a85f790d8f33a3ea5650ae93e4ef4c94f895e241da1cb0627989bd09c1346a5e8d07058c2635e7610386bda0b
+EBUILD mips-sources-4.19.79.ebuild 12812 BLAKE2B 83e4e9da89856dcd4295bb4b9e7af2c32f18c557762865b900d89766b6e99a26120fbc1a9c944a877c3a24a4ee508e36f3542198db2f73f795da77da7c621867 SHA512 b3524d2ab001befdc5e96442d2d1afdeb85bd256bd5dd60882ff0f95f81263fd5f35d93f5534950b6bfc8cba251d837a5a29d875bcfdfb0a33b0592e51022cb4
+EBUILD mips-sources-4.20.17.ebuild 12812 BLAKE2B 4f8f2ec9d113e68372cbeaeee18ca84ebf5b99da3bbd0a2b86ad9ffd044ab91f92fb1d2bf5e8d2de6eae5332fedf298cc426528d2ddc08ecedfb1e1e3d4c5dc4 SHA512 65c3eec353469f22d6500c1ab894f0a65b2841bda0a6b2b3535a04056a3f148c63c306ec633302dbe8fa9a144168104f3e61cedc35238d2bb094a77b833869b6
+EBUILD mips-sources-4.4.196.ebuild 13261 BLAKE2B 92c60128fa1417c084d9507c806b1ad66fbcd08c673ad67151f7352deafc4cba84730769e61a02b67a0ab1f1c7b5260aa2b00723700756de2372f74051e36a94 SHA512 84a208179185511f4519268a77c610337c5e992e6d50bee86db36650a9e311c47ee21c4fe49237466e99b5c3d3dfe40aef1682d0f2c233277a4df9bd93ec7b6f
+EBUILD mips-sources-4.9.196.ebuild 13163 BLAKE2B a36692328274a3ecca7282af5f8d3fd77bf1025fcb77e29ec6f676bd12d9ff7b70fce234a029df169d4900a24e988b880a46abe4e626f4013be960c8b8d9929d SHA512 62f88f88847e5c4d18720ee5c4aa5f2dbf2bae928572d71599f1de0a3e57b7b2ff5cc92aa43a200efb84809af95a350a79752ef1b3e4a84a9732a206b08a7312
 MISC metadata.xml 791 BLAKE2B 8f6a800e1ce23fc8d8fa9a2e93f29c7161c30770ed2ed7345e1175d06a44298c645020317f6e21eac3d798edf4b2a72eaca8ae32207ad62c2e151e9d87c8cd07 SHA512 8a8f75a760d1ca13dc53038271236e16801136db499d52f97cedf0120077d06870750f51440f5cf765bbc8bc1cbc8745b354f467c582e219c58be3e700ee29cf
diff --git a/sys-kernel/mips-sources/mips-sources-4.14.149.ebuild b/sys-kernel/mips-sources/mips-sources-4.14.149.ebuild
index b35a060561ac..72cdd403356d 100644
--- a/sys-kernel/mips-sources/mips-sources-4.14.149.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.14.149.ebuild
@@ -33,7 +33,7 @@ BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
-HOMEPAGE="https://www.linux-mips.org/ https://www.gentoo.org/"
+HOMEPAGE="https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
 RDEPEND=""
diff --git a/sys-kernel/mips-sources/mips-sources-4.18.20.ebuild b/sys-kernel/mips-sources/mips-sources-4.18.20.ebuild
index 51892d93fef9..51ae13d36fcb 100644
--- a/sys-kernel/mips-sources/mips-sources-4.18.20.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.18.20.ebuild
@@ -33,7 +33,7 @@ BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
-HOMEPAGE="https://www.linux-mips.org/ https://www.gentoo.org/"
+HOMEPAGE="https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
 RDEPEND=""
diff --git a/sys-kernel/mips-sources/mips-sources-4.19.79.ebuild b/sys-kernel/mips-sources/mips-sources-4.19.79.ebuild
index 9091645617a8..19460ff6560b 100644
--- a/sys-kernel/mips-sources/mips-sources-4.19.79.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.19.79.ebuild
@@ -32,7 +32,7 @@ BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
-HOMEPAGE="https://www.kernel.org/ https://www.linux-mips.org/ https://www.gentoo.org/"
+HOMEPAGE="https://www.kernel.org/ https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
 RDEPEND=""
diff --git a/sys-kernel/mips-sources/mips-sources-4.20.17.ebuild b/sys-kernel/mips-sources/mips-sources-4.20.17.ebuild
index b03ad9c4d00f..4fa9588a1147 100644
--- a/sys-kernel/mips-sources/mips-sources-4.20.17.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.20.17.ebuild
@@ -32,7 +32,7 @@ BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
-HOMEPAGE="https://www.kernel.org/ https://www.linux-mips.org/ https://www.gentoo.org/"
+HOMEPAGE="https://www.kernel.org/ https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
 RDEPEND=""
diff --git a/sys-kernel/mips-sources/mips-sources-4.4.196.ebuild b/sys-kernel/mips-sources/mips-sources-4.4.196.ebuild
index a06155ed17a5..4f6cc17d27d8 100644
--- a/sys-kernel/mips-sources/mips-sources-4.4.196.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.4.196.ebuild
@@ -37,7 +37,7 @@ BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
-HOMEPAGE="https://www.linux-mips.org/ https://www.gentoo.org/"
+HOMEPAGE="https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
 RDEPEND=""
diff --git a/sys-kernel/mips-sources/mips-sources-4.9.196.ebuild b/sys-kernel/mips-sources/mips-sources-4.9.196.ebuild
index 6ed3f51e8622..c5cc329f58e8 100644
--- a/sys-kernel/mips-sources/mips-sources-4.9.196.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.9.196.ebuild
@@ -33,7 +33,7 @@ BASE_KV="$(ver_cut 1-2).0"
 [[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
 
 # Portage Vars
-HOMEPAGE="https://www.linux-mips.org/ https://www.gentoo.org/"
+HOMEPAGE="https://www.linux-mips.org/ https://wiki.gentoo.org/wiki/No_homepage"
 KEYWORDS="-* ~mips"
 IUSE="experimental ip27 ip28 ip30"
 RDEPEND=""
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest
index d62f55a260d5..1a9e5be26ce0 100644
--- a/sys-kernel/spl/Manifest
+++ b/sys-kernel/spl/Manifest
@@ -1,3 +1,3 @@
 DIST spl-0.7.13.tar.gz 554211 BLAKE2B 7c1c95beb23b9725b3552a5bdb2260743c72fbc96cbdda8353893b9b13299b8a30c64d22400bc37d35ee21389eec809ee6d7b85a181ce44f0065dff81cb2e2a4 SHA512 31b67dc2f88f5028b5994aef886e05aeb9e65661895bffa29c5a1ac84df5f1c8e9c715f8cd7b63cf271d651ab7278aa63f51c78000f333ff7a75f0f8eedb5998
-EBUILD spl-0.7.13.ebuild 2911 BLAKE2B 511f784bc7c4e937a76ca92ef9e8ce8bab72c38b5f7c4a6165a9a3b52cc00ddc412e6f6df127143a09614f93327a91eef7e4d81e96b9332a445b032c6aa688ab SHA512 cc488915c191c9a1a2fdd9268c7b213ca09cc131bec03f7f5f25b340c5969ce7049cb48222112417efd6aa2938830b9a220de403316cf4fa77fe70968df0a2a2
+EBUILD spl-0.7.13.ebuild 2905 BLAKE2B 61131b975242186caae6a25fcf20df905d0969dff31fc138ee645a020c969aaaa280285cdd966ccaa8397e115be26d8b86db19b3f5354fc73db9542829eafdc8 SHA512 d726ed506c15a528daeb25aad18919223c6a2a4d617f4e2a8d10ba1969c21598348be7698e80f3260a5020748616a003acf9d5bf28d06fc9c06091433f20234e
 MISC metadata.xml 433 BLAKE2B d911e255347ea6ddf13c56903332d32a5acaa1fd6c66302aab9f70431ffbd681a37fb1829335ff6892ca8dc2c08fd653e5119ccf46516a23e8ce5c8bc8840fcc SHA512 7b31d40c8c2a87c9aab15c67503540d0e6ce6b149c7d69f1f6f92402ab5f9ff5795aea77f20e63af593e53b9e43a370cbc764d8586b5bf1f47647e413461dc6e
diff --git a/sys-kernel/spl/spl-0.7.13.ebuild b/sys-kernel/spl/spl-0.7.13.ebuild
index 3d1e7045d95a..3c816478f500 100644
--- a/sys-kernel/spl/spl-0.7.13.ebuild
+++ b/sys-kernel/spl/spl-0.7.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ ${PV} == "9999" ]] ; then
 	AUTOTOOLS_AUTORECONF="1"
diff --git a/sys-kernel/vanilla-kernel-bin/Manifest b/sys-kernel/vanilla-kernel-bin/Manifest
index 796856802d51..de1420c67af8 100644
--- a/sys-kernel/vanilla-kernel-bin/Manifest
+++ b/sys-kernel/vanilla-kernel-bin/Manifest
@@ -2,11 +2,17 @@ DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 DIST vanilla-kernel-4.19.101-1.amd64.xpak 61327044 BLAKE2B 0c27cc756aebadcef907b36b2504b1b2bc54920453ff91d7c65c658c55f033a4538fdf3c2b92625730610c630acd7eaf45c05f1c30310f5d6602988282b1edce SHA512 911ea64b60d3ee2451de0e8571690a424cee85367d7299c76b6f7de859c3cf198f52a5f6f9b74985ed27fe0fc59a0a08a0ed03f75b95cee3c88af8731fe776ca
 DIST vanilla-kernel-4.19.101-1.x86.xpak 53603778 BLAKE2B 5ca7d59bc4732eff68eab16b1eff035eff018a8080185927ebcfdd3b01584d623ea006c41a5b0a6d661ddd5e08c511190df0325b435343ca248370827e06e8dc SHA512 fe8ffb3362e0691a699db195092132ede7722662284004941052a7f35a43d8ef37c25b4f680a0395666e751756d72b7162366a54b62c93d5cd57a5c3a5d40d32
+DIST vanilla-kernel-4.19.102-1.amd64.xpak 61345365 BLAKE2B 85ac8b3126e4b27aec01fa97b9082ff8452025bf95637074604d640c9403151b7e8fc8617a4fd948f6020533a35ddd0959604ccb7976d0757e3cacba6be90725 SHA512 764edf59e1b601b660f3868b0fd37c8ac1fdb6fdea3a8accfb19cddb775458f057e4c9dcfacdd18d01c3fc56d10ebcafb8f75e9cdb20ce435f2ce3352bc53b6b
+DIST vanilla-kernel-4.19.102-1.x86.xpak 53583427 BLAKE2B 2b4b5af485c7d436440320e2e7231adb6ff1230ae386acb730eb0fae81372d207b8128830dd02322abd645fefef726e9b84fc299b45fb83ea0eefdbacfe163ac SHA512 bd6d29030fc8e0b1fd89f9f4c0aafb94ab4ba058d510b273451c0f786ac41ffce7832dd8d5b18b7fe69cf3f38420a81fbc233e12430acd1f12ba69a8e2e12a55
 DIST vanilla-kernel-5.4.16-1.amd64.xpak 64967142 BLAKE2B 7272e0ffe9fdf0e800193a79d71c4aadb3593e6a63e55e9b09be1923cbf66369b0e311651fcf9fde21d8949196a9efc462591edfa0dffef7d18770c5841eb886 SHA512 28d9470e722c645a6bbc38d279548cb2757aa9cc29e2b50a592c94f16d72881ae628570a1fa4706f794c788d798a33e25e6f1d04879cab572c22a61c4e34e64d
 DIST vanilla-kernel-5.4.16-1.x86.xpak 56395375 BLAKE2B cbc26a745c37f6f5990ae0463a04f6720feebdc3590d1fb6a8050902557d58b71dc3b6c343869c6611108866643a113c390657e6f82902697e62d349b1212b37 SHA512 1f7a92a29073af2aede42ca2556d295dddc6db7303dd6cf345915294648e2e4a34eecf35fac516a187793f5e33adfd08abedcb7e132500113bdca847013f8fff
 DIST vanilla-kernel-5.4.17-1.amd64.xpak 64951575 BLAKE2B 56264df30ae0e030e18200bda25457020616253af0a5e4f394eedda18636cefef3959f1f1db9a5987d5714fb9a674087d0163ddf57042a120cafb01882170e2b SHA512 96a58d276e8da40871ac56803bbd98b0f9343ce03cfd8ced89ba6bc050491b13df516b3eb04c3dc9da243230d282c1493823d11316ec21025317e810fc4421c8
 DIST vanilla-kernel-5.4.17-1.x86.xpak 56404018 BLAKE2B aad8c6e7e6bc792542583eb8c0639a4011eafde7bb1d48b870b6ed56ad54beda4bab8a5717e29d53b90dfe7b7b7fd45ce55b17bd41bb6d3f50f25f83d629eb53 SHA512 2f7e7f57d585e6b67ae2d985e0f93b1c1f60d479c2c7c587bc8e73729bc552ef09fd38513b8af3582779ac354742246d5e68ae10464c9ab2c21e75f91fe91dde
+DIST vanilla-kernel-5.4.18-1.amd64.xpak 64977098 BLAKE2B 4f3e4437c707fbff285b09655c5e066957d4666138525187f6f60c4801ae45613046a370f6d54812d053c09e45278084d44557f1f6d940b84ede4c2f62dd626b SHA512 95a34058ee7bc3958ecfdf399b8bcfa80d42dd17ef67b6f4258d93f36e2420295ea3da4af9a3d2444a98ad7bce185d1820efa0242ef28b949d239b4c02cce82b
+DIST vanilla-kernel-5.4.18-1.x86.xpak 56405323 BLAKE2B 5c5895d5b97b8e59063dd17cfe3a812336f2706fcb7551788e95ada41e196f2a1c26acdf67f1eaa87f6fbda8c9d7da4451c08ed72f15f1e41e4dca116425b076 SHA512 1bd56cc2787d80a40ba53533db3eb7510a44d8791609b79bed1dc7a0bd5f5542ac032c97b3eeca14a75a70da0adf4fa2499c4b180b6c71c7950a1cf49a7aa644
 EBUILD vanilla-kernel-bin-4.19.101.ebuild 969 BLAKE2B 34c76a6fc1f85df31f9fa75ab3fdc4c37baa9a0d03f78cdbabf10b55586c9d49beb8b502d28ae1571e7f20b1f27531d17ebed473759351470c791affd84356b9 SHA512 a74aac981d7e1bcdc979ec1c6b492847f7e8098c81493e61f0986ea8a68d791a93870f6ca0ecb5665f6252de9892a074c223948e8c95a469b4bb614963795415
+EBUILD vanilla-kernel-bin-4.19.102.ebuild 969 BLAKE2B 34c76a6fc1f85df31f9fa75ab3fdc4c37baa9a0d03f78cdbabf10b55586c9d49beb8b502d28ae1571e7f20b1f27531d17ebed473759351470c791affd84356b9 SHA512 a74aac981d7e1bcdc979ec1c6b492847f7e8098c81493e61f0986ea8a68d791a93870f6ca0ecb5665f6252de9892a074c223948e8c95a469b4bb614963795415
 EBUILD vanilla-kernel-bin-5.4.16.ebuild 969 BLAKE2B 34c76a6fc1f85df31f9fa75ab3fdc4c37baa9a0d03f78cdbabf10b55586c9d49beb8b502d28ae1571e7f20b1f27531d17ebed473759351470c791affd84356b9 SHA512 a74aac981d7e1bcdc979ec1c6b492847f7e8098c81493e61f0986ea8a68d791a93870f6ca0ecb5665f6252de9892a074c223948e8c95a469b4bb614963795415
 EBUILD vanilla-kernel-bin-5.4.17.ebuild 969 BLAKE2B 34c76a6fc1f85df31f9fa75ab3fdc4c37baa9a0d03f78cdbabf10b55586c9d49beb8b502d28ae1571e7f20b1f27531d17ebed473759351470c791affd84356b9 SHA512 a74aac981d7e1bcdc979ec1c6b492847f7e8098c81493e61f0986ea8a68d791a93870f6ca0ecb5665f6252de9892a074c223948e8c95a469b4bb614963795415
+EBUILD vanilla-kernel-bin-5.4.18.ebuild 969 BLAKE2B 34c76a6fc1f85df31f9fa75ab3fdc4c37baa9a0d03f78cdbabf10b55586c9d49beb8b502d28ae1571e7f20b1f27531d17ebed473759351470c791affd84356b9 SHA512 a74aac981d7e1bcdc979ec1c6b492847f7e8098c81493e61f0986ea8a68d791a93870f6ca0ecb5665f6252de9892a074c223948e8c95a469b4bb614963795415
 MISC metadata.xml 460 BLAKE2B 44708a7e31f1ad9f59efb3e945b0b7dba7644df038566d652c18bb80aa1931181e38098b142b204008723057ec517824eec61539d776bdf37d7e6769b7ad70a1 SHA512 b9604dfb203052349588f30cabf71a8ceb9561f24754d699bdcb80cc1075e8154c55955ecbeb22e1519ac0e57a92df4a74e02149826ad4e7e1eec34651645286
diff --git a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-4.19.102.ebuild b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-4.19.102.ebuild
new file mode 100644
index 000000000000..c80f6f1ab4d7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-4.19.102.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built vanilla Linux kernel"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/vanilla-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/vanilla-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.18.ebuild b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.18.ebuild
new file mode 100644
index 000000000000..c80f6f1ab4d7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.18.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built vanilla Linux kernel"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/vanilla-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/vanilla-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}"
+
+QA_PREBUILT='*'
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 7b462f94f1e8..8b10fe9a1dfa 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,15 +1,19 @@
 DIST linux-4.19.100.tar.xz 103408008 BLAKE2B 047d803af6a54e57aee2536222fb4aec729c2525a113cf87a0ad043f66b3a29cecaaa2ff71c3020796162199ab3926374a2cd52bc905cbe531c5aaf07b23d9ee SHA512 d59d6b85afc04f4c37d42cc0b76e505ba49b607489f69fc25eae6ca6f21a3ea66b33337382d899ed3326896fa283b604d687f8d13f50efd53947c368d5c082a8
 DIST linux-4.19.101.tar.xz 103403812 BLAKE2B 47ebacfd10bc34b6d7936205a60b4af0d3d0a4f685666dcd065ffaf022eaef13caf49919f1dbc72a97a20dbbc5059508ab99139a651fc968ddb67c0cc8d4a074 SHA512 571087e1d3a34239d5c93643cc5727924950842295ec351cd87776d166c5109bfbc0ffd61d054247b089d687a0c40fabadc9069ed3230edf6741b36faaaa4e0c
+DIST linux-4.19.102.tar.xz 103407708 BLAKE2B 556745e509fbec2550fd5a914757fd863c0d9006e58ccfa3e76aecefd85851abecb335711c1621297a7e5190f87757e2e60ab27f303e44a2513bc10cc9bfb018 SHA512 4047f4027f9f011765e38ec75a9b1f9115d7a6dae15d8691ff42afea0ea284ed1ab1b33eaa4a1ae439b40880099ad8f0151b85f4bf303abe2d0a8e9c91a48849
 DIST linux-4.19.85-arch1.i686.config 222183 BLAKE2B 03eac77940db0ee6b4f2a006edc600ef34141bbca849f5be4de9b961301a8fc987da6d0e21344aa5d80c29bb7793d56cf5441abb6c8e4057d94e2601c174c1be SHA512 6bd45c9dfd96b1afb8c1ca1ca72722baee6c91894e454d7af937de02242d3bb9d3b6870f5976aa96245c753c6bc1ac637a6356125b0d4c596aadef643b8c3d8d
 DIST linux-4.19.92-arch1.amd64.config 222487 BLAKE2B a658d80d85525287a1df9053ca2ddfe423ab423bcc3b9ea8bd9cda65cc7ffa4b1be782c48c867c13e46070af4016f446860f5cf71351f239da1eff6c45a5aa6a SHA512 a5658c8e8464516dffd6f624344e739784cb315d334b2c5105bd5d16022b6366ad4ec00d3692a7b78e2458514175522bc85e834bf19593feff6363b616860258
 DIST linux-5.4.13-arch1.i686.config 239816 BLAKE2B e776321fa163759332e7b5e3cca6a8a3f7124fc7a5bdd498f0aeaec1f2a819f27a87ca6f9f3fb0f0b9f28e8ba6f207bb27c5e48a494664d21ea3845e99b1eab4 SHA512 4e083028a140fcd2e65bba3c39e9d7bf9004e114b3233e8c2ab9e67405a3db9179c10a9564407bf19875317a352453f3e02f137297941277f694e687d3b97674
 DIST linux-5.4.13.arch1.amd64.config 241498 BLAKE2B 3c6d13d84ea75247fae4f4474648abe295fb6ea577d4c9becc58551c3954d35a72edd5937b7bb345f783fe2015940035d5f6766e08e5a9dd6b8723cc69c85ee6 SHA512 3039a333f3000f416bfccd7efdc54c8ea07d9b01b349be87f83b7dcb3e0f13a1f3fb02ccae42412cf28958aa7df42ef73f87e637269c7525476d73682596fa07
 DIST linux-5.4.16.tar.xz 109474712 BLAKE2B cf99bbd992d8e90c4255c0ce81fd27793663fb2b300ea1bf686ca21933e6ec6cd2ce7a2bea7b59e235ad70bc05519fd06e033baa0d6e881df732d3a85bc6a17c SHA512 994d0884230c258c97af8c9b1857241d34c780bc61271102707e7bd861270306b1f4c51a00d48826786d1544e8647de8c1e72fa74bf3e9a498a32b7db428337d
 DIST linux-5.4.17.tar.xz 109469504 BLAKE2B e03e9b5564320ea60d69db06b6a282d332718269bd8ed694e126e6aca83215de183b52ad331d7af80fee1b4682625a3489373894c4100d38943c097c6958bf06 SHA512 b909cc5fa383ca25496851cd8d0af0efbe1613ee6c3579abb122285fcdcd28f4736fbb26675d741474388a63d1a312cc70a6b0aa8f25c1cd62b9f95b99462628
+DIST linux-5.4.18.tar.xz 109470980 BLAKE2B 4345598577f39644b00693c95a8402d70c7aba94614bd9a61f5e212768c6e58ffbaa0d8392c129010e77d6c9770182d4967635c797a2d86e11ecad417df87a27 SHA512 ec4568bfb816b3645bbe6c709343b4cc058068500948c10e9da191d2556ab1bd66a90674880e5be2dbf169afe416fe88c48ed5bd9fc1a55739ea94f8f0cb62b2
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 EBUILD vanilla-kernel-4.19.100.ebuild 1850 BLAKE2B 0ca37cce8bff8754a85859419e624eb43a6546208fd75263f4ecb0404516b3c887e93d8e9ca4411963cf0289fd8865c338db59798a773711a58d13a54a3e3b67 SHA512 bd6b26fc58cf510ab393562501d9371ba339317da57a7ba7f4bf4d9f1ba2c6a7c1e3fac42094788a1453a4f465db555c9ce95e497e01b06205b1a813b3da9248
 EBUILD vanilla-kernel-4.19.101.ebuild 1850 BLAKE2B 0ca37cce8bff8754a85859419e624eb43a6546208fd75263f4ecb0404516b3c887e93d8e9ca4411963cf0289fd8865c338db59798a773711a58d13a54a3e3b67 SHA512 bd6b26fc58cf510ab393562501d9371ba339317da57a7ba7f4bf4d9f1ba2c6a7c1e3fac42094788a1453a4f465db555c9ce95e497e01b06205b1a813b3da9248
+EBUILD vanilla-kernel-4.19.102.ebuild 1850 BLAKE2B 0ca37cce8bff8754a85859419e624eb43a6546208fd75263f4ecb0404516b3c887e93d8e9ca4411963cf0289fd8865c338db59798a773711a58d13a54a3e3b67 SHA512 bd6b26fc58cf510ab393562501d9371ba339317da57a7ba7f4bf4d9f1ba2c6a7c1e3fac42094788a1453a4f465db555c9ce95e497e01b06205b1a813b3da9248
 EBUILD vanilla-kernel-5.4.16.ebuild 1842 BLAKE2B 9eabcf8ada1190aa78c46f160db40fe2af963b937a43082c4d6dc8af954fa3449552d6b772c1b68096fc6c264abe2b7b968c0c56b1b951a8c255a969fb48bac6 SHA512 1167f00a415fece5a562e7f09ebd41cedbe8cd9729eacdad98b5d18df0672e559ec34c08487968a5918747457be9a415dec7f45b876fab88019f772244cf4723
 EBUILD vanilla-kernel-5.4.17.ebuild 1842 BLAKE2B 9eabcf8ada1190aa78c46f160db40fe2af963b937a43082c4d6dc8af954fa3449552d6b772c1b68096fc6c264abe2b7b968c0c56b1b951a8c255a969fb48bac6 SHA512 1167f00a415fece5a562e7f09ebd41cedbe8cd9729eacdad98b5d18df0672e559ec34c08487968a5918747457be9a415dec7f45b876fab88019f772244cf4723
+EBUILD vanilla-kernel-5.4.18.ebuild 1842 BLAKE2B 9eabcf8ada1190aa78c46f160db40fe2af963b937a43082c4d6dc8af954fa3449552d6b772c1b68096fc6c264abe2b7b968c0c56b1b951a8c255a969fb48bac6 SHA512 1167f00a415fece5a562e7f09ebd41cedbe8cd9729eacdad98b5d18df0672e559ec34c08487968a5918747457be9a415dec7f45b876fab88019f772244cf4723
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-4.19.102.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-4.19.102.ebuild
new file mode 100644
index 000000000000..17bfa6ee759e
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-4.19.102.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux-lts
+AMD64_CONFIG_VER=4.19.92-arch1
+AMD64_CONFIG_HASH=bf97de6a2e405659aaad4c251b7f0bb48d5ed3c9
+# https://git.archlinux32.org/packages/log/core/linux-lts/config
+I686_CONFIG_VER=4.19.85-arch1
+I686_CONFIG_HASH=1f0345e2983d2edd55b401cb5a87fdf365a4192c
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	amd64? (
+		https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.18.ebuild
new file mode 100644
index 000000000000..92992f98790f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.18.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux
+AMD64_CONFIG_VER=5.4.13.arch1
+AMD64_CONFIG_HASH=9eed969590614a38d370a9fe04a4f5d38ba5e06e
+# https://git.archlinux32.org/packages/log/core/linux/config.i686
+I686_CONFIG_VER=5.4.13-arch1
+I686_CONFIG_HASH=95f890a9f9131e7a0e01a4f3e9c5ee423756a233
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	amd64? (
+		https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux&id=${AMD64_CONFIG_HASH}
+			-> linux-${AMD64_CONFIG_VER}.amd64.config
+	)
+	x86? (
+		https://git.archlinux32.org/packages/plain/core/linux/config.i686?id=${I686_CONFIG_HASH}
+			-> linux-${I686_CONFIG_VER}.i686.config
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config .config || die
+			;;
+		x86)
+			cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+		# disable compression to allow stripping
+		-e '/CONFIG_MODULE_COMPRESS/d'
+		# disable gcc plugins to unbreak distcc
+		-e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 602abcd37a5e..abb95a05b022 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,13 +10,13 @@ DIST patch-4.14.170.xz 3425092 BLAKE2B b92970169dda467dc8b491fdc8a2c07f11d94a69f
 DIST patch-4.19.102.xz 2738328 BLAKE2B 5f0bbb05602098dbd58d4373ae6b3be75b07bb92b6d06485f267e8e2d3f0bda478523d2fa81fa444ecc3f222c12ba34461632db18dd3ab8ca86b75c59f677967 SHA512 ab3dd67b645f4f4eaa46e6cb49da521b740c038725931b10e8da28abcfc6e292bb74cec84ab4c983069b917cdb57995aa37920b2fd1e1343ccf5021c1b8da4fb
 DIST patch-4.4.213.xz 2991812 BLAKE2B 12be9141f23a153b132c7962d26456a001204a1739b90e388dcfea71d6e4ded2ddfbf7543135d44aabf0f4e5fc0d5fd58162c1d443af1c918a7435afc7ef3e2e SHA512 ee2366bc2f620290765b9c69536fac3d224971597d9afff283f69c502185f8699784cf5f007e83c50abb82fa2c887e42cb1bdff6f4f4b6eea7afd193258ea411
 DIST patch-4.9.213.xz 3321144 BLAKE2B 4d736a2d8712a7b1de21d347277f6a4c9c6b16bb4fc7339b6a90b5b17840e0aac3a931071e24c0909af598dc60be719091478c5fcea79ae2e876010e77031c0e SHA512 0a78c8e2786207bfeed8a2d6c8c8125428cdb0cc595cc1bb7e420f818d77fb2fe3033fb1eff7b9830b754469faaeea0f615d66a50a794139057bcab5e764265b
-DIST patch-5.4.17.xz 625852 BLAKE2B 5597efc4a08cdf53f2bd1f64916fbe8930b9ad00ccc84eb7c03222236489593110f76e3d81ca037c639c8461ee95a5e6872f02e5caba9636ccc8d1018900e83a SHA512 751b3d46f3d3b6bb994a793bb74ca12abe1f9b6d4e45bff6eaab4e3839b8f37a1e4d4dec28ba68648a5c25098ac027995eaebbab13bdebb1f490da379bbaa079
+DIST patch-5.4.18.xz 651036 BLAKE2B ba5492e387049b3d4be090b3f3e0acc39dd269ae3c04c5d3e2bf9c96151f09dbd922372ff2ce8ed2f1c3d2c6611cf8dd1619c23f3101f8f8f83c59e5816833fb SHA512 25e8ca187add056d9275002eded1bcd400e8d216f6db8d15179fda0bf6da934ef5d351ae73b81e9fa6295d784095dd83afe772b38c02bbb72ffb808937dedf93
 DIST patch-5.5.2.xz 24468 BLAKE2B 94a7355205f1aa6f3a95cfcd74bffe7cc08124f776d0654ca533c8edaccf46b23d0704afb4eecaaf4695988732e1d375f61b8f607d827b7d71f93cd58e81f643 SHA512 9a59336db4f60c8944498435e53af5c9267dc155cbf419c0a99df3fff3d6d4c527561b46f600ca61fe199124fffdb9f6b868a2ac8acd1dff7d123ab8e75fa7b6
 EBUILD vanilla-sources-3.16.81.ebuild 423 BLAKE2B a07076f834b7f02c060aa7dd974bc209a3ca5bef57001fbc053d3484baf640455a23cf9598a36be847409f8c9ec1cfb98e3bc26b093acdf427468f4f09cce645 SHA512 21d078301c5131e4fba970c15528b0c7948fc16ea6ed4d58dc7ea4d5dfb5420deb6a4f981224368cb88bf9afeb5560964aadff5661e9eb973cd53284ece22f22
 EBUILD vanilla-sources-4.14.170.ebuild 423 BLAKE2B a07076f834b7f02c060aa7dd974bc209a3ca5bef57001fbc053d3484baf640455a23cf9598a36be847409f8c9ec1cfb98e3bc26b093acdf427468f4f09cce645 SHA512 21d078301c5131e4fba970c15528b0c7948fc16ea6ed4d58dc7ea4d5dfb5420deb6a4f981224368cb88bf9afeb5560964aadff5661e9eb973cd53284ece22f22
 EBUILD vanilla-sources-4.19.102.ebuild 423 BLAKE2B a07076f834b7f02c060aa7dd974bc209a3ca5bef57001fbc053d3484baf640455a23cf9598a36be847409f8c9ec1cfb98e3bc26b093acdf427468f4f09cce645 SHA512 21d078301c5131e4fba970c15528b0c7948fc16ea6ed4d58dc7ea4d5dfb5420deb6a4f981224368cb88bf9afeb5560964aadff5661e9eb973cd53284ece22f22
 EBUILD vanilla-sources-4.4.213.ebuild 423 BLAKE2B a07076f834b7f02c060aa7dd974bc209a3ca5bef57001fbc053d3484baf640455a23cf9598a36be847409f8c9ec1cfb98e3bc26b093acdf427468f4f09cce645 SHA512 21d078301c5131e4fba970c15528b0c7948fc16ea6ed4d58dc7ea4d5dfb5420deb6a4f981224368cb88bf9afeb5560964aadff5661e9eb973cd53284ece22f22
 EBUILD vanilla-sources-4.9.213.ebuild 423 BLAKE2B a07076f834b7f02c060aa7dd974bc209a3ca5bef57001fbc053d3484baf640455a23cf9598a36be847409f8c9ec1cfb98e3bc26b093acdf427468f4f09cce645 SHA512 21d078301c5131e4fba970c15528b0c7948fc16ea6ed4d58dc7ea4d5dfb5420deb6a4f981224368cb88bf9afeb5560964aadff5661e9eb973cd53284ece22f22
-EBUILD vanilla-sources-5.4.17.ebuild 423 BLAKE2B a07076f834b7f02c060aa7dd974bc209a3ca5bef57001fbc053d3484baf640455a23cf9598a36be847409f8c9ec1cfb98e3bc26b093acdf427468f4f09cce645 SHA512 21d078301c5131e4fba970c15528b0c7948fc16ea6ed4d58dc7ea4d5dfb5420deb6a4f981224368cb88bf9afeb5560964aadff5661e9eb973cd53284ece22f22
+EBUILD vanilla-sources-5.4.18.ebuild 423 BLAKE2B a07076f834b7f02c060aa7dd974bc209a3ca5bef57001fbc053d3484baf640455a23cf9598a36be847409f8c9ec1cfb98e3bc26b093acdf427468f4f09cce645 SHA512 21d078301c5131e4fba970c15528b0c7948fc16ea6ed4d58dc7ea4d5dfb5420deb6a4f981224368cb88bf9afeb5560964aadff5661e9eb973cd53284ece22f22
 EBUILD vanilla-sources-5.5.2.ebuild 423 BLAKE2B a07076f834b7f02c060aa7dd974bc209a3ca5bef57001fbc053d3484baf640455a23cf9598a36be847409f8c9ec1cfb98e3bc26b093acdf427468f4f09cce645 SHA512 21d078301c5131e4fba970c15528b0c7948fc16ea6ed4d58dc7ea4d5dfb5420deb6a4f981224368cb88bf9afeb5560964aadff5661e9eb973cd53284ece22f22
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.18.ebuild
index bdba9ff3201f..bdba9ff3201f 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.17.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.18.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 90b46cd2c658..9331ff7bbf5b 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 285690e32d48..6d549df22727 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -6,10 +6,10 @@ DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5cced
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-sanitizers-10.0.0.9999.ebuild 4783 BLAKE2B 0d640a931786e2df0a8e2ed5947b8d32942a96d4af63c4a6cab2b1d017390ddeeb18c35ccb76dd71cd7526f6a04c586ea5453bb630c9cd7927935027071006eb SHA512 52b4b2b5d857b6cdd0fe01ebd5845ffcb5abafb8ce189e7178e3fba559abeddd5c1aafe30cfcf07b66eb9f1238dd87cd1691402ba63d68555d024b10f9631f62
-EBUILD compiler-rt-sanitizers-10.0.0_rc1.ebuild 4783 BLAKE2B 0d640a931786e2df0a8e2ed5947b8d32942a96d4af63c4a6cab2b1d017390ddeeb18c35ccb76dd71cd7526f6a04c586ea5453bb630c9cd7927935027071006eb SHA512 52b4b2b5d857b6cdd0fe01ebd5845ffcb5abafb8ce189e7178e3fba559abeddd5c1aafe30cfcf07b66eb9f1238dd87cd1691402ba63d68555d024b10f9631f62
-EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4783 BLAKE2B 0d640a931786e2df0a8e2ed5947b8d32942a96d4af63c4a6cab2b1d017390ddeeb18c35ccb76dd71cd7526f6a04c586ea5453bb630c9cd7927935027071006eb SHA512 52b4b2b5d857b6cdd0fe01ebd5845ffcb5abafb8ce189e7178e3fba559abeddd5c1aafe30cfcf07b66eb9f1238dd87cd1691402ba63d68555d024b10f9631f62
+EBUILD compiler-rt-sanitizers-10.0.0.9999.ebuild 4777 BLAKE2B d1dd91d574ac9e009c064d3b7edcfbf2065884cd455db572a2ae294bdac6384176d778c002930309ae51bef925aa4c60a1b538655fa8c4581dade355c1efe47d SHA512 e8c297256cf1f74c531c17019c3f6664881e5d9263313d56e4b63abd8d922d48471185ecf1a255605e0194769c2347bb3f4676891c873dbed9cfa096ca1f2f16
+EBUILD compiler-rt-sanitizers-10.0.0_rc1.ebuild 4777 BLAKE2B d1dd91d574ac9e009c064d3b7edcfbf2065884cd455db572a2ae294bdac6384176d778c002930309ae51bef925aa4c60a1b538655fa8c4581dade355c1efe47d SHA512 e8c297256cf1f74c531c17019c3f6664881e5d9263313d56e4b63abd8d922d48471185ecf1a255605e0194769c2347bb3f4676891c873dbed9cfa096ca1f2f16
+EBUILD compiler-rt-sanitizers-11.0.0.9999.ebuild 4777 BLAKE2B d1dd91d574ac9e009c064d3b7edcfbf2065884cd455db572a2ae294bdac6384176d778c002930309ae51bef925aa4c60a1b538655fa8c4581dade355c1efe47d SHA512 e8c297256cf1f74c531c17019c3f6664881e5d9263313d56e4b63abd8d922d48471185ecf1a255605e0194769c2347bb3f4676891c873dbed9cfa096ca1f2f16
 EBUILD compiler-rt-sanitizers-7.1.0.ebuild 5483 BLAKE2B d7feface9713919185a9d167fb34a4bb4ab97c63227e7ce280df81fb1d3382a18f6e29983276a9bab0f23fdb1437a528d974eaf7174f370cd61ed2f772b29b4f SHA512 1e540c5c7b555d6782098dc6e43e195b2e151b6075831b53848b10664f0a855d9d903b3f07bc9c815668964ab64566652cc2c7e39b1a614bb31f71cbf8cdc842
 EBUILD compiler-rt-sanitizers-8.0.1.ebuild 5281 BLAKE2B 7041973d68007ccc56115a9748e901dc07b9228a8c513c30c234fd98253fb04072fc19faff4bcbb544dea7ac5aa2b17c7ce545083949ab6d54020c9dfa02bfa7 SHA512 19f5be642bc47a77beca5241f95b58c8b11fb580dee1db829eadbda00542d56a7b17cccc300b1eb7ebde2ec419f38e677d9800de00067e66df98f7cfdd2d47cd
-EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4854 BLAKE2B f8e09ea26b0a232612d85487b8f451c52a9c4b649964850ad56721f5ebcb90503a0b806347108cf7b7c94176ac339eee0089f42961875fd9fc35c9e2155d8200 SHA512 edb3eec7dea4cd3fa0a44070b3e03a7bafec09bb9e011c33a347b2f619e7f0b6e649c1b15c860f448facb088913ddd793c46a705acd4c411f64f91ad2f54bc61
+EBUILD compiler-rt-sanitizers-9.0.1.ebuild 4848 BLAKE2B 36a104e3d808986f7f0163d81e69da1d4c4bfa697bed15f3689ee0b6fd395e2dff66e561003fbcddf44c77d089f8de8f6593150aee98b1e9737bf4e25ea3e69e SHA512 a05888fd89f3cc5852efa7a7a810f9bc0916ca49c8b8d7ce5f03a8df8d0054b20cf172e8e5f9777a21f69a28791a6b1a5d0c38366807898e01bb4e2b2e008aea
 MISC metadata.xml 547 BLAKE2B 6f9d8b65c12797fd3d168e9b3948c604265db135bda5493d9f1d8b1d01fd73a79d07e5241afc3a7fa1672827fac23d3d9dc4d7ae42371a0de892a900c8c28269 SHA512 fb73a96b1ffbc7ff2fecfba35c9acd3e54ade0154016ae04423217f5c000eee2b0b821cc626908647551a0aa7b7f462d42d56cde3993ddd52248bc373b117c3e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild
index 72ee582f5c26..dfbc385859a8 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
 	multiprocessing python-any-r1
 
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild
index 72ee582f5c26..dfbc385859a8 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
 	multiprocessing python-any-r1
 
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
index 72ee582f5c26..dfbc385859a8 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
 	multiprocessing python-any-r1
 
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild
index 6923b7faedde..6017f6764101 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit check-reqs cmake-utils flag-o-matic llvm llvm.org \
 	multiprocessing python-any-r1
 
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 89bb8db6dfbd..bf016ded4d7d 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -2,10 +2,10 @@ DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b
 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-10.0.0.9999.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
-EBUILD compiler-rt-10.0.0_rc1.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
-EBUILD compiler-rt-11.0.0.9999.ebuild 2851 BLAKE2B 1744be5c165d1144ebee9a9851b9ebf22b43a8d02d41adb7a425923909202096ed6e60ae477080936ecbc3d0a648e6946a3ab5bcf9a7edb8df18e35fd5c701eb SHA512 abdbae4765be38f5427e6eee3a50acdde22ab2c5ded3953ca2ffdd8842fa0d50649af5074fd91bfe2190ccddea3b176d45c6196abaf018bc45e5ae4dc3c03ecd
+EBUILD compiler-rt-10.0.0.9999.ebuild 2845 BLAKE2B 4aa00a66c70c72f8bb901c2aa91146668bc78cb98924faf301678d0ea9654cc2feaa45750442a200b4e2e3dd0e0a89cb3488d25f05774eb1c17c124dd10353dc SHA512 045228904f98f2cbe1a3585c2ff4ceee10d56337af57230e834485056a8c1a31f08b4cc0e66c131ca434e610f9639d4e650660e666877318090d2b098587a464
+EBUILD compiler-rt-10.0.0_rc1.ebuild 2845 BLAKE2B 4aa00a66c70c72f8bb901c2aa91146668bc78cb98924faf301678d0ea9654cc2feaa45750442a200b4e2e3dd0e0a89cb3488d25f05774eb1c17c124dd10353dc SHA512 045228904f98f2cbe1a3585c2ff4ceee10d56337af57230e834485056a8c1a31f08b4cc0e66c131ca434e610f9639d4e650660e666877318090d2b098587a464
+EBUILD compiler-rt-11.0.0.9999.ebuild 2845 BLAKE2B 4aa00a66c70c72f8bb901c2aa91146668bc78cb98924faf301678d0ea9654cc2feaa45750442a200b4e2e3dd0e0a89cb3488d25f05774eb1c17c124dd10353dc SHA512 045228904f98f2cbe1a3585c2ff4ceee10d56337af57230e834485056a8c1a31f08b4cc0e66c131ca434e610f9639d4e650660e666877318090d2b098587a464
 EBUILD compiler-rt-7.1.0.ebuild 2995 BLAKE2B 59d478fc487ca1293bd34d719b119d2a4a89a5d623e4b0d0e487c4c7df31bc096dc9ff072b3b5eed94807c3f88d8b2d84daa464a556ba27714efbca22b098207 SHA512 7d5207c13be7861eb07872de640b8bbc5e2a2a732f0a541dc78b92cc0e048b555b2a3378294366b317032afb4f7b3e67cf8da44518cab6d554c49a6d217287e4
 EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B aae9682b1069da7024ea1e4bfd29914015cd2eb043d0f56fccc4d817bdf32ccdb3121f25232fe15fafa7e17d5bb9600de57c82b700d571d3ed2b3af3bf0d3673 SHA512 4ccaa041025603d7582775b1982a9644305110268d461bbdfdcfe094e0a85df0dd258aaf378e33d8a63ed6c5ff6d8f2f6701a69564c4ef1ab1a0662001d735da
-EBUILD compiler-rt-9.0.1.ebuild 2923 BLAKE2B f987a6708cf56b8f13b331d9e82e958a6e6c18c597d0bb921641fa45d383223a5fee6989b7af1a57ec5621aa9d0298bb44cdc300d96a28a03562f92c3eaf86e8 SHA512 6fabe2784e7c0cee3073f3b38617ed69e9a8b0fb4f0320619837fcc0733a2e01749c6af97ba010c3ba6e51408961269b397b260f3ecd9f413fe429a0e34466e1
+EBUILD compiler-rt-9.0.1.ebuild 2917 BLAKE2B 9a79834e446eb98dc24ca852601a252a2f39c1f98dc32e011dd6b5edc21fe25dcf2b5f4a99946af863511179e5f21acf653748fff9f8879740735be4deb84005 SHA512 8d86098dc42553b9292659c425a641bd1ae6883ee36f39ba0b83357b1f14435d18ae53b168000a9d9bf4b16ae9e5702fde33f095a31054d5f27bd163ab49cf60
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
index fb90bbaab7cf..4237b872c6e1 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
index fb90bbaab7cf..4237b872c6e1 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
index fb90bbaab7cf..4237b872c6e1 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
diff --git a/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
index f5ce47c037e8..6050293e5159 100644
--- a/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index de669d317f1c..8fe4874c7920 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -5,5 +5,5 @@ DIST gwenhywfar-5.1.2.tar.gz 2354910 BLAKE2B e73519d33da9268f90ae2924b177c4ef684
 EBUILD gwenhywfar-4.20.0.ebuild 2795 BLAKE2B a963883b4d788f173460456221ca3450982d7f777dfed73c992c9099a52bd8ae7d442812812744e9f9bfc70e7b6ff6016f63d76a927631c3529fb4377ddf41e1 SHA512 b791ebb321a00f02ccb6b7d894b7d64ccb6924d0c0f194a17ac0665ffca86fceb88efe491f40c82467cd26008dc3d1996e3ff8e775e41a4aba519d3923d3a5ef
 EBUILD gwenhywfar-4.20.2-r1.ebuild 2723 BLAKE2B c7640c0c22779ce813fe64d398dc1c1464830a03a9e8abf7ec8569ae21ded84d4e07fc1168d8001626a26b6c087110307a3acf20631616a9bf0afbdbf180ebe2 SHA512 9c9fa5af0789d0005d5e10501d44d1fdc306362893b83913c4f8fd1532053624502a86bcc9d3ae615dcafdc8957d9361d3ecc11b272d85cfae83985dcbfaa633
 EBUILD gwenhywfar-4.99.25_rc9.ebuild 2776 BLAKE2B 1c134583202bfbc2fa4acba6c18909701b8ec6dee3c859443ccc599193462263eec51f0bd17ae2886d636152612bc0d83d568d057cae01157744d9cde7d5cc33 SHA512 1d762e5b90e4b872a1b6e116f0cc62a0cab3bea6db6924cd98ab06630378c979bfd164aa3a3983c8abfb3a7a3e36ebcb58a3738ccfc3097f9eb1c038c128bdfa
-EBUILD gwenhywfar-5.1.2.ebuild 2778 BLAKE2B e8eacfe9a328d341556681ef1d8be6935cb3217b89305a144ec50319090a2edbb1bfd49498091de2b9131b6000b83b2f26ad1dde58f17fa9807b360a116a901f SHA512 c55235201feae315d947fb83347013263654125407bbc18822d8dfd984d0dfc59da01cf26572ba13cea09e8845fae55179433434d79ac89e6ea8ba0baf8481c0
+EBUILD gwenhywfar-5.1.2.ebuild 2777 BLAKE2B 99b7930e42bb23922cfb2f4fa2614df1f88f8a6e016c4b73851ec544a8b127748f17634785589ed57a55198dce0bb8a5a995de394bdfdf7b498454dc0e99f96a SHA512 177c680276215638f014f67828e3c5e08615c82875115f92c8028f5d211ff87fcffad551fc9a0c358a726eeaede5b524306fdde5c4faf76d661029fc8ec429e8
 MISC metadata.xml 691 BLAKE2B 9130a34b5011ee2a5b446794a036961e6e83e3083ba580a4d77da2686d9cc75620f0b38cc21d5c4014361d698cf4ff24084ae93b46cdecaaf1e7c522d4f5d3d4 SHA512 3eb26d730501a60512fca15ea05d27e9c74bd020961b09c406837cc2de8558b6abca63336857c0206c41825101afa9f3eef91280afbd7147733cb811e5469213
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
index 15912e502337..2650d66f2950 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/234/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/79" # correspond with libgwenhywfar.so version
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
 
 REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
diff --git a/sys-libs/libavc1394/Manifest b/sys-libs/libavc1394/Manifest
index fbda37b39e21..841f43ccb376 100644
--- a/sys-libs/libavc1394/Manifest
+++ b/sys-libs/libavc1394/Manifest
@@ -1,4 +1,4 @@
 DIST libavc1394-0.5.4.tar.gz 341679 BLAKE2B c27cf10b8769c1602488fa1a9a2536dee169e0e07185090e719946ca1da4b210aa61b37d816fb5b019d8b199b1c9285e2b212545f4332c8aad48af39c2dadf20 SHA512 ef07631cd2de9b79dec9d81247d705be318101e8f8a1fe007b946ffab3dfe7b97f392144614d867ef6b2315b6c0e82d53e915f07855d4e21401645293e18842a
 EBUILD libavc1394-0.5.4-r1.ebuild 553 BLAKE2B be3a6e5fd6e16d78d57391851922f2431a745db5decffaca213ed3c9bbeec22a1ae902130b37fa10d4736ecd62f3d8173b0ea778ce0253a1da274d9b60d6f3e8 SHA512 6bc0be407791dfadf64a07def0d9601a4cd2e1350f9dbe2a2d37c67895ec28ccb3b01c1fd73c7702d74ec361fa0632d3614e5e2f67d26bb442d6b7a94f3450c5
-EBUILD libavc1394-0.5.4-r2.ebuild 735 BLAKE2B 36fd739b8c392a6f76bc11adc138b62ddcff13f7d444714ecfe660061d09f005053c75d699c78dd8bf4aab2b9c3a469f58e303734361df3e7582f9672a30c6d6 SHA512 27579259abdcaa468ea94539145f34ff7a2dc251333cad9ed2bd49d1a77cca1c760220cf960953d86c5e5d5420c83e2a7138f4eb6d9df149b493ba85cfb30034
+EBUILD libavc1394-0.5.4-r2.ebuild 734 BLAKE2B 9ece4a5a14c87281e52a81c59c8f43de75f191b3dea606949a03df6b5f6cbe6adc95504baa39a48a25133dd1e19d963964c88034f264b015ca3459e3f9aa4aa8 SHA512 3b16125320046f01e1f14f76b91bd183b5de3ec646dba180b9d498b0050b155ec8acfc7f72ec0b610b0e00c451758968ddb3c46a20b999072d54a266507f7daa
 MISC metadata.xml 330 BLAKE2B a1bbe65ce97eb3a0c038333183e4fde5b7f0f0384d2fcacb78c569f6df4afd74cfe8ab34c9404daf7bd0870b983372bc35d3e3dd3ac50793fb47fe25b509a9b7 SHA512 3b2a188bb90d59ac6acb66b90e0231db783a6364f4e91a955df28346422061b99837ecf4038f6d42eb570630029623797c0e874737151065343b63352bd082f2
diff --git a/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
index 402a774d3c9d..5fe5922644a4 100644
--- a/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
+++ b/sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/libavc1394/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 BDEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
 DEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 254827901a40..d5a8dd130ec9 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,8 +1,8 @@
 DIST libblockdev-2.20-1.tar.gz 338039 BLAKE2B 77923e52b10e7853ae9433bf811d3a08f1c18da81d4f148b220d7e4101535f245612f0c82c96c6c3bc3e4c0631ada153c59c4587a86efdc5669a0b9f69e764be SHA512 4cb6b18d5de63461f35e0b6f6896599aa41da2c995839c2e88661dacdf07522842b612820fb1d83edbde72092cc62295d5411e8607f52c611db7f02aa16c9ab3
 DIST libblockdev-2.22.tar.gz 854888 BLAKE2B beb1ff0ac122eb12b2066d97c81a8c62a33369aa22a6ae5d141076d52fbd82d17504a97f1a0091773d9a65b25b976edecebe3a76ba91ee8e6032fd034298fa4a SHA512 69bbd5afbd8abb0e22ef72d80375e32db653f21cf3063cf69fff71ad069ee0e6119adf6918a63e7ba9ec4ca02ffe3337be3edeeafdd3e73e4e53d85e90bf2f45
 DIST libblockdev-2.23.tar.gz 856829 BLAKE2B 131bf429e530fc9dd44fade4f5bc937ec220365b1ee2ae46818a6fa3ec7591775fdc3ed531350cc2546f4151e41551dfd3e331b0a6d5777769a7b54c5c15ed42 SHA512 ecc4d5a3cb977fbbe176bf6872b6754833d2869e927c32f8466685916ee4550cf806e0b0c8f5e8e76de3839ae591a4eec502ff974c2f0678af6cfd46dd3016f3
-EBUILD libblockdev-2.20-r2.ebuild 2019 BLAKE2B 82122f62718f8e755c2185664e34bdc3529249bd0ee46d7ebbd5bde6ad329b2ae945acffb96eadb1de7b16a7b81d581adbf9fa55eb1dc900b4d1169e23b8467e SHA512 1a4e662dc6bf836f42b456efcdf6cdbce88704d433eb4e1b18ec14330a6397737dbe54b1a2803ed563ee1b83dc30588aa336207b2db7978a786b0f2ffcb567dc
-EBUILD libblockdev-2.22.ebuild 2522 BLAKE2B 6b108f706a6033f1546c1d65103a7823237a27043eb7cfb54e3cb0c2df257516347c540ce231ed6abaa769774ec4afca9a3021020ee9645c65949bc63f8e6d62 SHA512 0e15940170e9e9620959857317de0966c3d9c8e11c9ca61656f53044ccebc5b6605e59a2dc4e1a935f5a5917de5b4f37f944fff8dbd289bdd247b6c0f22f2115
-EBUILD libblockdev-2.23.ebuild 2585 BLAKE2B 99cd18b7177c746c5b757bb347f96e14f716bf4e5b602931d90c0f1f9f9491bfc066a3b70b259b2aaf635b4757a3dd179a497f57f2a8fef84eb0ea1ceb083def SHA512 3fee230564befbe4f3cbc11851142f387c48fa0a9f1542fedbbd374839d25fbd9a5bc0928621be007edf50bab26f143d9235266567bfd7e8c972dd787b46dd65
-EBUILD libblockdev-9999.ebuild 2585 BLAKE2B 99cd18b7177c746c5b757bb347f96e14f716bf4e5b602931d90c0f1f9f9491bfc066a3b70b259b2aaf635b4757a3dd179a497f57f2a8fef84eb0ea1ceb083def SHA512 3fee230564befbe4f3cbc11851142f387c48fa0a9f1542fedbbd374839d25fbd9a5bc0928621be007edf50bab26f143d9235266567bfd7e8c972dd787b46dd65
+EBUILD libblockdev-2.20-r2.ebuild 2013 BLAKE2B 04b827d9e874a1f81fd575069b997e371293f8a486f67c53cd7d1566af707f95fa2d8b79b610feef729d0c8abee79f61f39a209360240cf83cfe27552677e2f0 SHA512 850353d00568d4696528175f540f5b2f8ec78b9e89183edd3a1fe75430832bd955db30b5b4b60ffd7520fb99916c8db6e1fa29d7269c650179597a65ffcf71be
+EBUILD libblockdev-2.22.ebuild 2516 BLAKE2B ad58734ac9bfee6cf0e8078eb36ee66b51744fd706dd14f248a576789c76b244ca0392772191f9d3af8d6fee164696cc76b7d93efee9d3b3d8625f2022e49adf SHA512 14b9ae846175817e5213018993f1d78c7ca0265394539b3e1baee5c8e9c1bf5c2609356d644a485964bfd1a59c04d0a22f569a87349e81be0430a9677279c85d
+EBUILD libblockdev-2.23.ebuild 2579 BLAKE2B 75623aaae988476aaa9e6d9a10bc0248b2e4b80684e89ec2da54213870f8ff90b0a08cf1cefb4eb4123f0b2db98878bca55a8b8171517a256680801b5b200d26 SHA512 39b5cae279c29e31532bc803a15afad11297b5d1862091687907524ec96c35ca2a59d4b7618e35b4db2637fda81fb67cfa01a16a4e70b04b97a125c9a38f4ab1
+EBUILD libblockdev-9999.ebuild 2579 BLAKE2B 75623aaae988476aaa9e6d9a10bc0248b2e4b80684e89ec2da54213870f8ff90b0a08cf1cefb4eb4123f0b2db98878bca55a8b8171517a256680801b5b200d26 SHA512 39b5cae279c29e31532bc803a15afad11297b5d1862091687907524ec96c35ca2a59d4b7618e35b4db2637fda81fb67cfa01a16a4e70b04b97a125c9a38f4ab1
 MISC metadata.xml 1079 BLAKE2B 927991dfdfefd599210651f76fa8bffbd5a54700791b57847a9ecf85cd1aa04a449eea84c4e1ee3e9eb50e541eab3d97a6218c814a018439aa6f520970a8acca SHA512 492cabe5b464c0bae48e8def1e771a27f28bcd03a47276be26a4351367bcd53e198358f8c0cbf25cd0c6c8e841ee67435b22fbe669bde1a6aa74668e70fa8fc9
diff --git a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
index fd10c36035a1..e1315c6307e1 100644
--- a/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.20-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools python-single-r1 xdg-utils
 
 MY_PV="${PV}-1"
diff --git a/sys-libs/libblockdev/libblockdev-2.22.ebuild b/sys-libs/libblockdev/libblockdev-2.22.ebuild
index 62292fdcbde6..10771c4f046c 100644
--- a/sys-libs/libblockdev/libblockdev-2.22.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
diff --git a/sys-libs/libblockdev/libblockdev-2.23.ebuild b/sys-libs/libblockdev/libblockdev-2.23.ebuild
index cf9d409a3c2e..5b61abdcb972 100644
--- a/sys-libs/libblockdev/libblockdev-2.23.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
diff --git a/sys-libs/libblockdev/libblockdev-9999.ebuild b/sys-libs/libblockdev/libblockdev-9999.ebuild
index cf9d409a3c2e..5b61abdcb972 100644
--- a/sys-libs/libblockdev/libblockdev-9999.ebuild
+++ b/sys-libs/libblockdev/libblockdev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit python-single-r1 xdg-utils
 
 DESCRIPTION="A library for manipulating block devices"
diff --git a/sys-libs/libchipcard/Manifest b/sys-libs/libchipcard/Manifest
index c75e82ecb601..0b1a00795096 100644
--- a/sys-libs/libchipcard/Manifest
+++ b/sys-libs/libchipcard/Manifest
@@ -3,5 +3,5 @@ DIST libchipcard-5.1.4rc1.tar.gz 871404 BLAKE2B d4377207adec9f90e628caed7c412787
 DIST libchipcard-5.1.5rc2.tar.gz 877820 BLAKE2B dfe82e3d6aea26e95e5f69298ea17ad4bb9a1d106cca02a9fc23f5aa5ea338471ae5628248350e01571f4819567da2a0f5a3699d56d8f02ed58971d6ac715abe SHA512 5e86068bd688f72e04073dbd076f21646a6b75d2a7a73c25bba4396e8657c4df28cf5cfb61eef7b243186f8313cea1262e415f2acad5348fa5179b46d7f96ed1
 EBUILD libchipcard-5.0.4.ebuild 1077 BLAKE2B cb34a186da432dc85f5b7f3b6758a32ed70cfa54d930f4ff0d93bac7d0332f50b8eb84157828fba6fc879cd5b218d6839138aad46c2b86c28f16ce02c6a63f4d SHA512 6198a303bd92872bb9a2142fc62cf3b7bcbb4d638ed309683c45100678dc23af8187ab841467add09e32378b34b7219541fe528080390920ed963ac876a71c17
 EBUILD libchipcard-5.1.4_rc1.ebuild 1118 BLAKE2B 2164cfaf3a606427228793500f2ed589c3bd5af82aadec8b5e0cb3f6117799b5ec97888bf28a03e7d08c88efebb9d33c40b99414dbf7911497c735b02f3b762e SHA512 85f287749975df8e393bc0512d1be243dfa0948d3b3cf097c5faa2c688da9bb39069ec606056452f2da31c128baaae39ca07c95c8a11b0b73b3083e64ff9d6e3
-EBUILD libchipcard-5.1.5_rc2.ebuild 1120 BLAKE2B 63449f416d8a344f27076aee4756d8e5168f78161015e9af5517a92858820ee221ff4e4c7898e0f58268994cba7267f3da29ba128ba182df9478e561bdba881b SHA512 c7975362c065d0da8ad2e89bb1526635deab73a52866ddbfc20e948ef5c193db630a829d1ed5c39f8aae64cfcc9830e4540a94c0ce22a51b1732093dd34b6815
+EBUILD libchipcard-5.1.5_rc2.ebuild 1119 BLAKE2B ef545412a27eef14b3d96196daf27a85f42be7c2ca674c3d152c7dcbc51e612d4f7c841af5d9312aa2b8399330c3c11de86346cc4fa504e78e444e4ad0e210fb SHA512 148b9fd343508714dcc46db71b2cb5200924761bc1359c7d4adcabd424ee135f4e05b4537847490ebf4d8d94674ba49ecf0bcd1999cc4dc99d29ca28a298c1ce
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild b/sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
index b109f4185da4..c6d9a50eff25 100644
--- a/sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
+++ b/sys-libs/libchipcard/libchipcard-5.1.5_rc2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/229/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples"
 
 BDEPEND="
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 2cde809fedd2..c98b516bf2d3 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -3,10 +3,10 @@ DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf9
 DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libcxx-10.0.0.9999.ebuild 6619 BLAKE2B d84394b481cabcf7f22f39293c1ac3ab982fae9eb91be24b0e18b84c83982c4bb730707968b4c631a1b9c562ef4a66653929deab58d0a2c7b1bd29f244a1714a SHA512 def4b590a88d7994ec82644367870e8cde5c143d2a38a535fd934651b5ddaf5c94b77e1928e4b725a99b4fd22675e886a12bb0452d0d5a9405401b0cef835a1f
-EBUILD libcxx-10.0.0_rc1.ebuild 6619 BLAKE2B d84394b481cabcf7f22f39293c1ac3ab982fae9eb91be24b0e18b84c83982c4bb730707968b4c631a1b9c562ef4a66653929deab58d0a2c7b1bd29f244a1714a SHA512 def4b590a88d7994ec82644367870e8cde5c143d2a38a535fd934651b5ddaf5c94b77e1928e4b725a99b4fd22675e886a12bb0452d0d5a9405401b0cef835a1f
-EBUILD libcxx-11.0.0.9999.ebuild 6619 BLAKE2B d84394b481cabcf7f22f39293c1ac3ab982fae9eb91be24b0e18b84c83982c4bb730707968b4c631a1b9c562ef4a66653929deab58d0a2c7b1bd29f244a1714a SHA512 def4b590a88d7994ec82644367870e8cde5c143d2a38a535fd934651b5ddaf5c94b77e1928e4b725a99b4fd22675e886a12bb0452d0d5a9405401b0cef835a1f
+EBUILD libcxx-10.0.0.9999.ebuild 6613 BLAKE2B d47fa819c9054c259f952d54aa4fbfe2658bdd46f9e32e445afe4b7da154fadf3bd4146d95b54b2f130707054c818ddc0ee6705a8e7b1c51b47b7ba757b654a3 SHA512 7f21ddda8caa0bcdf8e81346434ded7506eaea4231b178cebb3ef601d65d95b61d24bed416937005eed5ebe9f30b289570e08beff6b93957519430046342cafd
+EBUILD libcxx-10.0.0_rc1.ebuild 6613 BLAKE2B d47fa819c9054c259f952d54aa4fbfe2658bdd46f9e32e445afe4b7da154fadf3bd4146d95b54b2f130707054c818ddc0ee6705a8e7b1c51b47b7ba757b654a3 SHA512 7f21ddda8caa0bcdf8e81346434ded7506eaea4231b178cebb3ef601d65d95b61d24bed416937005eed5ebe9f30b289570e08beff6b93957519430046342cafd
+EBUILD libcxx-11.0.0.9999.ebuild 6613 BLAKE2B d47fa819c9054c259f952d54aa4fbfe2658bdd46f9e32e445afe4b7da154fadf3bd4146d95b54b2f130707054c818ddc0ee6705a8e7b1c51b47b7ba757b654a3 SHA512 7f21ddda8caa0bcdf8e81346434ded7506eaea4231b178cebb3ef601d65d95b61d24bed416937005eed5ebe9f30b289570e08beff6b93957519430046342cafd
 EBUILD libcxx-7.1.0.ebuild 6734 BLAKE2B ccf745bc3f3ea12361f877637970090b3588febd096fff2118359afc1664a2c5eb7e55e90372a5f5dc711b7a12310fcbe9fd2fd7f047b9bce117b8c99c7da393 SHA512 cea3065bf397c3d1615ac3d6a92910bc84ae439597c4972fdcd4eb41ce0fb1dd34dbdbd1cdfb95c0f46fb8a217f31f5b23da4c358204b349d48e1d433a3d9735
 EBUILD libcxx-8.0.1.ebuild 6773 BLAKE2B b1f95dfaa74faf6ec4299c7241330d5047c1eabc69351f2bbeea296c41a3671c87e99689cda85c65aa29c513eca148321806719f15229b283b0c82a5f9bd1c93 SHA512 0060d986d79514416681cab707ed8075a7f8c461146457724acfbd04e269836827b4adbf791b1afb3a4b8fec13d44678c459861b749ce4001fd5c4a65b97121c
-EBUILD libcxx-9.0.1.ebuild 6639 BLAKE2B 8c1504238c018c535cff7e162b37e9b1cd203f72fe435b4d033872ac9c15b2de7ce0b44c6abc23ad7affa3c495ae18189b472b324fb643b4cd9aaa3b314387d7 SHA512 a023be9a8e78c27b20b4b3d128c66e7ff07fec68857549f93e440448b5937570f181722b8bc5a3d60fbac9ca60ecff1a7a8b8c127ebfdbc58b995aa91e288b6b
+EBUILD libcxx-9.0.1.ebuild 6633 BLAKE2B a1f23f15e0fe9de845527da07ed131c9ba60c923a51abfc7f384a3df70099f64d1888ef53ebb31e4256f14d6ba7e201b29a44b27be4d504656d343a59cf6bcfe SHA512 af6c3d18ee76c7a96f18b642b20c72ff5d7257eb5a7fb10fa97b62b16a01a4c46b7c3a3763286f5c556e1604b04a4d0daa20ef413c5a8174704ddbf9e3e54e10
 MISC metadata.xml 751 BLAKE2B cc513b45c7283d41728236781558b47c535885612a93bcae2a41be20531bab0e01c159e918670c91ce7b4addb0390d5996ea735fc5856b61af7cf28a9b6286a9 SHA512 3620f5415cc80bc99f16eaaf98a712f1288895bdf1e98898103d680304930db89c3b8b55ca3f4d20d4738fc3aa3e314b81c9989971b23d7f66e2137095a35d4d
diff --git a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
index 45df844722bb..53296785de79 100644
--- a/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
 	toolchain-funcs
 
diff --git a/sys-libs/libcxx/libcxx-10.0.0_rc1.ebuild b/sys-libs/libcxx/libcxx-10.0.0_rc1.ebuild
index 45df844722bb..53296785de79 100644
--- a/sys-libs/libcxx/libcxx-10.0.0_rc1.ebuild
+++ b/sys-libs/libcxx/libcxx-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
 	toolchain-funcs
 
diff --git a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
index 45df844722bb..53296785de79 100644
--- a/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
 	toolchain-funcs
 
diff --git a/sys-libs/libcxx/libcxx-9.0.1.ebuild b/sys-libs/libcxx/libcxx-9.0.1.ebuild
index ba447fd5af31..5e333d683796 100644
--- a/sys-libs/libcxx/libcxx-9.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 \
 	toolchain-funcs
 
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 529b2b4a295d..96fab9cf562c 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -4,10 +4,10 @@ DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf385223
 DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD libcxxabi-10.0.0.9999.ebuild 3361 BLAKE2B 41017dec48b0e586642a3f9c0f0ea7857da92c25e0aa48659701eb0c9c277b5f13f4c5d9766a69149bfda2906be85e8d64acf9b945cba3dd62937492338d93a7 SHA512 736c88074c23338c139690b485d54d69563ee15d0af7de11c14686bfb10c1646be5a182269c558661c0deed5bbdd0e473ae27454b4adbd743a61a968ec44afb5
-EBUILD libcxxabi-10.0.0_rc1.ebuild 3361 BLAKE2B 41017dec48b0e586642a3f9c0f0ea7857da92c25e0aa48659701eb0c9c277b5f13f4c5d9766a69149bfda2906be85e8d64acf9b945cba3dd62937492338d93a7 SHA512 736c88074c23338c139690b485d54d69563ee15d0af7de11c14686bfb10c1646be5a182269c558661c0deed5bbdd0e473ae27454b4adbd743a61a968ec44afb5
-EBUILD libcxxabi-11.0.0.9999.ebuild 3361 BLAKE2B 41017dec48b0e586642a3f9c0f0ea7857da92c25e0aa48659701eb0c9c277b5f13f4c5d9766a69149bfda2906be85e8d64acf9b945cba3dd62937492338d93a7 SHA512 736c88074c23338c139690b485d54d69563ee15d0af7de11c14686bfb10c1646be5a182269c558661c0deed5bbdd0e473ae27454b4adbd743a61a968ec44afb5
+EBUILD libcxxabi-10.0.0.9999.ebuild 3355 BLAKE2B cfc6652671c3e21699e193ea7611ee9fda16adf3ddefc406ec44a2eb953f85e4cc2d814fc876f05f90e13ef913be6a64f1131cfb731b0202425341cc55392f7d SHA512 b0515047ef43af5b1e623cf819b2e86678b6280ab429d9a2eea72ec8390f15d58c517d1444e05825ee7c4775465c1a047e87f2a0e6eff895a403128be22aba40
+EBUILD libcxxabi-10.0.0_rc1.ebuild 3355 BLAKE2B cfc6652671c3e21699e193ea7611ee9fda16adf3ddefc406ec44a2eb953f85e4cc2d814fc876f05f90e13ef913be6a64f1131cfb731b0202425341cc55392f7d SHA512 b0515047ef43af5b1e623cf819b2e86678b6280ab429d9a2eea72ec8390f15d58c517d1444e05825ee7c4775465c1a047e87f2a0e6eff895a403128be22aba40
+EBUILD libcxxabi-11.0.0.9999.ebuild 3355 BLAKE2B cfc6652671c3e21699e193ea7611ee9fda16adf3ddefc406ec44a2eb953f85e4cc2d814fc876f05f90e13ef913be6a64f1131cfb731b0202425341cc55392f7d SHA512 b0515047ef43af5b1e623cf819b2e86678b6280ab429d9a2eea72ec8390f15d58c517d1444e05825ee7c4775465c1a047e87f2a0e6eff895a403128be22aba40
 EBUILD libcxxabi-7.1.0.ebuild 3160 BLAKE2B 5b90f5ce5637b75316cc992dd50105c87e7e55c8bd608a5d0280556ca14e57b2be47d5a81bbef0be37c8ace675887bdd4e44029e8efb8cd4f7a69b7eb6eef488 SHA512 8a03888a55c60959802824e54c78bdc9b8e74501bdd8b5a47bbc619290e03e8815658e5f33f9fdc9befc66f9fc36ff5ac2d36008824e3800f76b299508e706e0
 EBUILD libcxxabi-8.0.1.ebuild 3226 BLAKE2B 9804f1976cd7e605cf60a07e69c66f97795bebf66779fb69fe500cb6f4693e63d799fdb57991b2b65bde309e72e2e6055c3e88fd1ebf0be725982a253faf10b7 SHA512 42ccc6ccfc69c95dd465542d90a6a6bc0558703fcf2b5b1acb5c828728416cddbd5af925552b231c890af8c89533073a3f13d87da9c1401cf8904bb4dc5e72de
-EBUILD libcxxabi-9.0.1.ebuild 3381 BLAKE2B ae0b0101c905b1a67cac9edd4651ec92f4e8c4d7bbc2d65031bc93433b4df28ea927ac8f9dca0bcb8d46a0ce5a72c391836839293d3d692ed4668faec5f6dbc7 SHA512 de9ab4b8917c64b24d78f523d0a214b81990e4187ea9eceb4ba13783e1dfcab6d1880308ff8a82e3409e762be4b381b62ff6765ca11380a74dc7a68b13182b2f
+EBUILD libcxxabi-9.0.1.ebuild 3375 BLAKE2B b0169b1c1655b3fb47e3fab30bd8b852bab5a62e1e0508742a912fb54f74f61cf76e2dc6e0298512d3c597f6f06451232641893daa99aa59543c8c346e16523d SHA512 d2d62cecfc63cdcbd3b09729c0d90e76028d618eb3ef03efe6b92bb746df9d127a9628782fc8e78a59a3229706c3af698d9ab928e1870d9640e9d3563864d549
 MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
index d096ef109678..5fde58fa218d 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="Low level support for a standard C++ library"
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild
index d096ef109678..5fde58fa218d 100644
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="Low level support for a standard C++ library"
diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
index d096ef109678..5fde58fa218d 100644
--- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="Low level support for a standard C++ library"
diff --git a/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
index 820d6b1c320d..efe36f67a4a1 100644
--- a/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="Low level support for a standard C++ library"
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 1abf94093ee7..c0c5ec96704e 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -2,10 +2,10 @@ DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dc
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 DIST openmp-7.1.0.src.tar.xz 909320 BLAKE2B 7a5fd4374992b7c440ff27917c0af6a2ec64aaeb2fda645f75b5affd4981e3ceef7f15cba61c37934c5b35be543af315cc4bff2937545fbf5eaa6593f1aa8b83 SHA512 57f18beede401c1c39766e13a03b52083a0f7b437758069f66b73d6d1388dc51e48c34b0a7ecd3552244fd35e2db57388642588febef413c161f5c5411ab1e5d
 DIST openmp-8.0.1.src.tar.xz 933320 BLAKE2B 02a7bf70cd3a217845ef1c5a35e0d7dbfbb39069a9029d462c797b5ddf2240fd627dee55856146ca4bb81622a41f31ecd11e0ed66baf3b7d99447087271991b0 SHA512 9ded785c8129e7b3a70b54f07c4dde529456edcc94904ad77fc578cf7f096cfa3ff2279959d7f7f1db51571e11c53375f33b597c7f36ce6dc6b512c44ced8026
-EBUILD libomp-10.0.0.9999.ebuild 2987 BLAKE2B 69ed8031bd8bfff6bd97b27870425a95a1b88385b670da179121e059d48dea2143542552657d7a791c471feb6c73a9ec0724398bef1f712f703eecd4445a56db SHA512 d45ab98320fcc2283e144dd696df31f5376db52aa0cb8c6e6cda348c564c16dc65f16ba7c4e4ba51954c38e2a0393f1898a2eba66b54d4cb65c45ca29c94b8ee
-EBUILD libomp-10.0.0_rc1.ebuild 2987 BLAKE2B 69ed8031bd8bfff6bd97b27870425a95a1b88385b670da179121e059d48dea2143542552657d7a791c471feb6c73a9ec0724398bef1f712f703eecd4445a56db SHA512 d45ab98320fcc2283e144dd696df31f5376db52aa0cb8c6e6cda348c564c16dc65f16ba7c4e4ba51954c38e2a0393f1898a2eba66b54d4cb65c45ca29c94b8ee
-EBUILD libomp-11.0.0.9999.ebuild 2987 BLAKE2B 69ed8031bd8bfff6bd97b27870425a95a1b88385b670da179121e059d48dea2143542552657d7a791c471feb6c73a9ec0724398bef1f712f703eecd4445a56db SHA512 d45ab98320fcc2283e144dd696df31f5376db52aa0cb8c6e6cda348c564c16dc65f16ba7c4e4ba51954c38e2a0393f1898a2eba66b54d4cb65c45ca29c94b8ee
+EBUILD libomp-10.0.0.9999.ebuild 2981 BLAKE2B 6d5990e398da0b63324761df30e9a6d339b517299f839063636fbef239de372184b11da68ba788337b521d194c084306971b8d63563ba81a8ba177a69147b0cb SHA512 213027dc19bf934b7ef6b5fa8377e8f4fb8e73164dec905d1945e3eea1c4707d89b9b8887c53e49626a655b1eb664eb1b02a0c56c47e40ab69e86acb0c21aca6
+EBUILD libomp-10.0.0_rc1.ebuild 2981 BLAKE2B 6d5990e398da0b63324761df30e9a6d339b517299f839063636fbef239de372184b11da68ba788337b521d194c084306971b8d63563ba81a8ba177a69147b0cb SHA512 213027dc19bf934b7ef6b5fa8377e8f4fb8e73164dec905d1945e3eea1c4707d89b9b8887c53e49626a655b1eb664eb1b02a0c56c47e40ab69e86acb0c21aca6
+EBUILD libomp-11.0.0.9999.ebuild 2981 BLAKE2B 6d5990e398da0b63324761df30e9a6d339b517299f839063636fbef239de372184b11da68ba788337b521d194c084306971b8d63563ba81a8ba177a69147b0cb SHA512 213027dc19bf934b7ef6b5fa8377e8f4fb8e73164dec905d1945e3eea1c4707d89b9b8887c53e49626a655b1eb664eb1b02a0c56c47e40ab69e86acb0c21aca6
 EBUILD libomp-7.1.0.ebuild 3250 BLAKE2B c01271dec02e6315408cf8751580a870f0a8a08f8a7d7801efd6780049676742acc10a284ab21eff5d178570f59995cc0c388adf7d4cbafe5a07324c63de7402 SHA512 463b486bdb6fbd4b85d0935905e7b80d7c28a3279159a15182ecc364aa56eff268ba6e1dd4c4e38d90c3229b057dcbc6037419442e9aae137afd71e69816bd45
 EBUILD libomp-8.0.1.ebuild 3280 BLAKE2B ad34cfd8d5043c0fa706e292f78c5458c659b26ce260c4a049a9e8ecc88f3c268d0b4849c269a41e95255c8ca72f8db0b1f57eb342a4af0980dd34bce77c3c69 SHA512 fbe46c483dcf27d5598058b6f6394811d1e2fd2ce73cb3c34bf6519d2de0ba274562cd4d1caaae3737b70a6188c36079547518ec3a47afadf69c4696d9ec5634
-EBUILD libomp-9.0.1.ebuild 3037 BLAKE2B 4b01efd223c7c61743e95ba8628e392dfae3f592a7d71911b62877277b8625ef574d93fed9d3a1671f9986a3756c592d87693896819e84655c00b1791c461001 SHA512 0916e34ffb75dae9bdf25009910c92ccf2bd39cfa4c9b7beb2fe1e1b7217ce504f6b5b7330f5c60b1b9d23f79aab3f9ec224e6510e2f66abfefd9a4b82b781e8
+EBUILD libomp-9.0.1.ebuild 3031 BLAKE2B 2dc8fca960ae12cb920291c02807c4ef2454d6303f44e5626f3f23b29b4f9ece23ac6205b45c4a144fb65f1f125c510a76ab904257a221d83ea43085e6100c9e SHA512 9a6928c253bb48733ce47c5273d34707650f8ff2b43f6061711a47c0ccf3dccad4a12547f1201d9693e10d45631ee1c551bee3bdeca1b84de6c071ed28e4c7c1
 MISC metadata.xml 825 BLAKE2B 07802144018f2f74b0927b53a346f99cbc7e36dbf501bb8dfc786f8d549c10eb688afafb1759f13d4d56d10f1bcae67dfa86cc2047cc39a9655a09a22e9a4260 SHA512 de43d5be94a5ea1cdfd3ae747d55b50d5d6ee577743f55d006d585d2d5acd5b3100845486ac415685f07361cd9985bae9347fff9c65417d198c49a61b4f6ba5e
diff --git a/sys-libs/libomp/libomp-10.0.0.9999.ebuild b/sys-libs/libomp/libomp-10.0.0.9999.ebuild
index 763579d72517..d766845101ee 100644
--- a/sys-libs/libomp/libomp-10.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
diff --git a/sys-libs/libomp/libomp-10.0.0_rc1.ebuild b/sys-libs/libomp/libomp-10.0.0_rc1.ebuild
index 763579d72517..d766845101ee 100644
--- a/sys-libs/libomp/libomp-10.0.0_rc1.ebuild
+++ b/sys-libs/libomp/libomp-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
diff --git a/sys-libs/libomp/libomp-11.0.0.9999.ebuild b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
index 763579d72517..d766845101ee 100644
--- a/sys-libs/libomp/libomp-11.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
diff --git a/sys-libs/libomp/libomp-9.0.1.ebuild b/sys-libs/libomp/libomp-9.0.1.ebuild
index eea0366e1a4f..058994545e79 100644
--- a/sys-libs/libomp/libomp-9.0.1.ebuild
+++ b/sys-libs/libomp/libomp-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib linux-info llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
diff --git a/sys-libs/libraw1394/Manifest b/sys-libs/libraw1394/Manifest
index 14a8ec94bdfd..adfdb0f8c03f 100644
--- a/sys-libs/libraw1394/Manifest
+++ b/sys-libs/libraw1394/Manifest
@@ -3,6 +3,6 @@ DIST libraw1394-2.1.1.tar.xz 309396 BLAKE2B 2460e8b9f848d30c74fb93c78e38ef818a09
 DIST libraw1394-2.1.2.tar.xz 313120 BLAKE2B 73addee88d2463ecebc4a0bca14d8f4c285c8e7060e3ded49bacbb818049e436bdaf98bde26469ec03e1baf196f67fec59e90201347f34a5810b8704108c8d7f SHA512 1ef38961b747c4ebb18d823a4c38d5bf019f8bd0ac55547838d153b1899b91ae0ff56f5b6732e309d6975b55725d1ce989917ffcf605cf64f7d33624f54f0567
 EBUILD libraw1394-2.1.0-r1.ebuild 513 BLAKE2B a988ebbb7492a715bdec263bedbea79f555ced91e631d61bafeead1c0ce5b2275a6a54b98c187ee03d72910d463bdffece38abfe38c8dc1c755f43619df4befd SHA512 95ee4c46c427950410868616ac059f223baff0d21acd642259694e34ed933700b4d59890228e597aecf304623f23b1fc4648555253b43ceef053b9ccfeb55894
 EBUILD libraw1394-2.1.1.ebuild 521 BLAKE2B 727c89d51ba6865502accbcb4bdfb519ba8b3681a80d555216a84ec64c4cd507066e80ae6f0a048906054cde86857b7054137725482c1770b73af30776fa07a1 SHA512 27debfd5049bfeb50899084311ab1035128a9ac0335de5b9c5f0ea76e84906b6745a7430f3bf527fbf46f190875cca9bcb94eaf6d614aef0d533bb373e231cf7
-EBUILD libraw1394-2.1.2-r1.ebuild 607 BLAKE2B 581c05c588d9f2ea5d6fa49320b77fb1b4205ce705f836d346e7089d5e85f9f8230f034496fb61cf893818e4db03e3a8c467ef00cec6befadb3d0efb56b4d033 SHA512 3654d5b84f938707cd441a5eb058a0aa92f0cdc2a3d6146da046a3bb8c5739cb4578e4e809058ce4f2f54c723ffcb0cdb8f4b01e270b82bf9e1d04f0a0cd4676
+EBUILD libraw1394-2.1.2-r1.ebuild 606 BLAKE2B 06dc89735f53504986897837fb258ed9b60716f4337b681421b50347ee5d7ef81438d1190e84fd405b8c8ded50ee1826c092d33f85193fdf67fb8e9c8552e541 SHA512 96f917cb48d8fce72dd09899ddfa6da581601a5a03aa9c059b4e72e554564fae57eed53b47c6865bca761e6a7d9cd3857e07d0f3607aae7159dac01686f3edd1
 EBUILD libraw1394-2.1.2.ebuild 524 BLAKE2B 135a53734dc88a23d1b5f86daaf2973cf5d9992a9a905c52d43a2baa1b53f2f3420f08346d7f9fd64263ecc2c0b1a1aca4c2eb7e0a4b64ab3bd131fa0edb4d87 SHA512 b61e305f55580d2832f172095521651544bc02f5378d0e6c4c33d0c85b47790d2e99eb17c36c147efdd669e1a8d722ce54b37c467b3f768a8087c3db9aeb937a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
index 72f37fa8b677..8a1e41521849 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/libs/ieee1394/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest
index eaf156d92df6..8dff661c0b61 100644
--- a/sys-libs/libsmbios/Manifest
+++ b/sys-libs/libsmbios/Manifest
@@ -1,5 +1,7 @@
 AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e280097f9d1e97aca8942cda80d0d574f24f71f25245714dc4bf99d5b53a9613cbbf4b33d5a50cfa9482be5a2dd601b9b9a03be3940 SHA512 51cfb62fce69afaf73659a2c4c819aa3554831b48d69bc35c1b299cd2e0b4d3be7f156a2cb57912cf10f21182e49fd5ce17aad0205a25d151f55ab3e0e58ddd7
 DIST libsmbios-2.4.2.tar.gz 668042 BLAKE2B 2106206dce95e481ae36e033d2abe9f39402368a09686b92fd1de7d85e87ea494514e85bdf1267adb6b52060a4e6bb6001714c5d891a4c0342c814942c0458af SHA512 51d1b11447d50b768658473d01bcb6cc7f9dd5c96c26ec343f222115ffb5047ca1f035a0bfb67f94f53165eaea7a0d9b70cf01f03333a30885bbac153bf761bd
-EBUILD libsmbios-2.4.2-r1.ebuild 1732 BLAKE2B e0de60353058a0f42c575a8c742814cf7bb53491df0057c405d423bd4a562fa53dfa3a38216eb28079c21205b06d8f8db0e3aa8af8e76ceabf4703b26994dc2c SHA512 c5304b3be0fae70858ec6e8bb0f924b20b466226e192f5e6fdab0cea476f31e336b10e8c737b00cca418908052d8d5d2f54307e077f5589569e093c99270c886
-EBUILD libsmbios-2.4.2.ebuild 1723 BLAKE2B 4a15aef7c32b9be5f1411f2a6ac4da9740e5e2780323397bd7ebff245fd0e0c42c7c91b44c67b2e4ca787b466545a3229b388a38bf735481a3783e884870d796 SHA512 895f6956cd200bda6dd800930a778e237e1f8d84c626c612efaca876b56061c5970ac258ce066e98cf3622e50087ffd911ae87f7cff6943f9bd728f2f6259758
+DIST libsmbios-2.4.3.tar.gz 644140 BLAKE2B 684bff4f6cf755796f785e9a93d4ddbe2a1af52082cdebc27d203772a6a2a0259edb4b9d19921f90fc78b48d54700223fbc2628665b963ebcb601010ff4340ab SHA512 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad
+EBUILD libsmbios-2.4.2-r1.ebuild 1726 BLAKE2B 47266f576042da3cf93038bce1d1307e55fa57432a1649b42d47ffaa3b68690c85facac580e5e6d6fb5967551d365acfa4fb90f52754ccc6be4a75fabaa73f00 SHA512 7f26d9f9b07df3b50065328ad3ade0e4ba844b7913fe4329dc9c4496a77aeb209347372db3cae896dffad6eb487ddbb838126527a0d30e094efa7b351d61131a
+EBUILD libsmbios-2.4.2.ebuild 1717 BLAKE2B d31ca3857a949186686cd1e2f2f3068755d887519cfce74c55918cb5a01b0c880177429673e5ac29929db18663b8ba92a5a48a07c012c4aac196636df1f02f4e SHA512 55c0f0faba0ed26aefda4bb0a55c2775c98ded50fbb7497c75ce8052c1c78c9b85029e2f148cc81996f57324c9b1dcc0b264a700164dba26a7043a1176cbdc05
+EBUILD libsmbios-2.4.3.ebuild 1727 BLAKE2B a80a4db684b11813f2e2d47114987374e106fb6ce4667c4aa8b95173982ec68eac6d83f953fab7cf713562e08a17da127158cb3ed6cf469a2b728078eb20df48 SHA512 9ca02718c4dccb86d6d2edceddf94bdfbdb9a0e0b4ca5eb8365dd1de06ab981806983dc86bb0092b478124f636e9f989c1ba9044ee729ebe41a44dfd20e8aea6
 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a
diff --git a/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
index d2e8d299a259..229a12173e15 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools flag-o-matic python-single-r1
 
diff --git a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
index 2220b96ec943..5590649e2e76 100644
--- a/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
+++ b/sys-libs/libsmbios/libsmbios-2.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools flag-o-matic python-single-r1
 
diff --git a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
new file mode 100644
index 000000000000..4e9e41d7a529
--- /dev/null
+++ b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="Provide access to (SM)BIOS information"
+HOMEPAGE="http://linux.dell.com/files/libsmbios/"
+SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc graphviz nls +python static-libs test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libxml2
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	graphviz? ( media-gfx/graphviz )
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.9.6 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch"
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Don't build yum-plugin - we don't need it
+	sed '/yum-plugin/d' -i Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	#Remove -O3 for bug #290097
+	replace-flags -O3 -O2
+
+	local myeconfargs=(
+		$(use_enable doc doxygen)
+		$(use_enable graphviz)
+		$(use_enable nls)
+		$(use_enable python)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	if use python ; then
+		python_scriptinto /usr/sbin
+		python_doscript "${ED}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,sys-info}
+	fi
+
+	insinto /usr/include/
+	doins -r src/include/smbios_c
+
+	einstalldocs
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	fi
+}
diff --git a/sys-libs/libudev-compat/Manifest b/sys-libs/libudev-compat/Manifest
index a8ad9d804aac..1752a927704d 100644
--- a/sys-libs/libudev-compat/Manifest
+++ b/sys-libs/libudev-compat/Manifest
@@ -1,3 +1,3 @@
 AUX udev_old.c 895 BLAKE2B ccc45a3820556764fe16303c92e7e8d91cd79e9ba3cf488b05f505c867fdac43e9c40d26f263a63484ca14bf0e1eccaccb4618a5794f79babde97b22c211c9ba SHA512 4eafd908621857d0f4b415b7349d8ab992f40e5c2297270973462bd022b1b3e34cb365d4969e2f7801ad41c303f55649ea7bcfe9d8a32c997dd681bdc41a0237
-EBUILD libudev-compat-186-r1.ebuild 991 BLAKE2B 6a87f451a19c3eab44fd9b07a332315c74a56a67c722b0da420bc7a716eff310ba45a68f2c4f963adbcb76522bae47fc63de75d528c707e62137e653e6056a69 SHA512 8885e4fdfc78d54cc574a5ef42c41f5052391f5122d95308d8bb3dc47b5aaaf62e9d8ad61c5f34f4d0d59b1ecaebf738bb9b50f9da02615f4b38a1d6579b666a
+EBUILD libudev-compat-186-r1.ebuild 1008 BLAKE2B 7dd8e6a067e18423d73572e09186cb737de2a161f8e6b0da2758185c3c6c86eaea87eba1ebc197621c3275dbcc174fb279e4878a3849615b2a15e612d9455fd7 SHA512 b7f14b330c634c0f7439fdbf9296e607b0471711b2c0aa0331e73b6de276a86d8891e9543c52be6d5667e58bc7901ffcabbefe72a29045588244a48105cb89e4
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/sys-libs/libudev-compat/libudev-compat-186-r1.ebuild b/sys-libs/libudev-compat/libudev-compat-186-r1.ebuild
index 39c438bac36f..f148a6ccf0d7 100644
--- a/sys-libs/libudev-compat/libudev-compat-186-r1.ebuild
+++ b/sys-libs/libudev-compat/libudev-compat-186-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Wrapper around libudev.so.1 for packages needing the old libudev.so.0"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 0323cda61c2d..1e16aa9e02ec 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,10 +1,12 @@
 AUX libxcrypt-2.4-glibc-2.16.patch 1024 BLAKE2B 8dd6aa90feef9b056de81e8d499ad4699c8050bd243cd581db691cfd8b4457b997f245f76eaa1abce2c5a93a1155c75455925ff148632f9fd86f09f73def1664 SHA512 72dc3944ea6ad600887d99ba0a9b3c0acb9d107f6591a139f863032a45a5efa516ec8b08a06e564552694d14febed0a1e065b96dc4aef06cd274aebf98baedcd
 AUX libxcrypt-4.4.10-multibuild.patch 637 BLAKE2B c7c81457457b6262a5236a378fe3a2487b6da1f10ac84b4b3bc42f0beb47c52a42d20836ae44f647819d2b2042ff03b69a7681f76fc5eea5ab1333f9cd6f3ac0 SHA512 8222636d4b29909f1fa09aecd9a2284ceaa732707d4242df73bc9215edbb3c59fe517227fae66251c6312fb98ee79b6e73aab7b3c7dc5db1594740f9bd514cc6
 AUX libxcrypt-4.4.10-pythonver.patch 617 BLAKE2B 2d3779020a63899f9e4f0275e279baee2128b6c491bc6c2e6a5f9f1ce53b467838f82b4a7c4ec176c69f520544acc896b6372a8beca879aa4acdff80b384bccd SHA512 c1fda3843f02e9ffde09307147ed7cf617e2ab5a86c1766f85bb99fa377dcd4ac37e9bbcca814623c22bcf45a3d7da19237409d88a4578f38795ddd65abd1a7f
+AUX libxcrypt-4.4.12-multibuild.patch 636 BLAKE2B 51fdf0b0f3ffe209c270cc2ff4bec7ea458bc5ec5267415aea8b7e151c24c49b70c7f12f1172c460e660fbbdf97901b833c5bc5e431e94e93341335da64ce686 SHA512 f7f581cf4ac375d4ff33b70f3d09ce7e9db88f6cae487303d62ff0f09abbff99c35cee4d4f774bf7360e496f3c92bf813424ea58f9d1aeded9e44449844e4974
+AUX libxcrypt-4.4.12-pythonver.patch 616 BLAKE2B 73c7039127b23c075a7b8e5bc897299c3e083bece50638d025649e2146325f78fa82427b7690f0df3e5a0eeb0fc66ddb13992e0d14ccf8380fc11f641c2d90a1 SHA512 dffbbfe09c4c8a93e1f6cf63acb5f237ce143585fe22eeb7c44f6929131137011c1777184f802ad86bda2e2c64de60131f6dbe18c8c309d6848d330c1cb13364
 DIST libxcrypt-4.4.10.tar.gz 499736 BLAKE2B 32da99488c21a21c3310a735a08a70002a3a56d7d9d4a9fd0c16436ef2b42ee8a9b877c5b5dcbf1bc9a38fbef3370d5ff4585167ff25025f854ccd020014dcd4 SHA512 fd714542dad40db721c03270b5a03e2c068b0750e887dcac4c651433d5905d08bd5c5db3762cc2e4ceee0103bd62810559ea197d164126169e0b253675415ca2
-DIST libxcrypt-4.4.11.tar.gz 493509 BLAKE2B a2cd425194fa28fdde25def1f7c7cfc58af76ac228540e5d645f36295fb8fe21316393067d0a81764d7981e85003abeebd590b979e64191dd449f14bcbb613a0 SHA512 907802cf9979704888ec947a2dc57aebb9d1317184948a9e771f6ba59deb9434d93f962185c186e66bb891f1b9f92405b6884e85d2a1d99f55bac367cca12ef2
+DIST libxcrypt-4.4.12.tar.gz 493620 BLAKE2B 185cc9a0b9f573801e75bf2ffb3eaa578016804d175443a53b2cef01334acb6f8fa5a0fe72e346ff368e3db355338b1f1dbd00e93828dde2594f0adee3753f69 SHA512 945dfd307ebd3d1b3dd9f22057b23b651c0ffaab55bf4151950565a3f0fea8b0e2bc2886318ceea707985d720e83e8663e4590bc72e91f470bae3a98f41ab30f
 DIST libxcrypt_2.4.orig.tar.gz 361503 BLAKE2B 6347bea4b22ae7742cb516a0a8673bbd7c37f645b2dbb383f4c4a6bbcc95a12897068ab7354fa015bbb65f6dc331b95ce24b48aa4bdd7a57433d8f5bc245392d SHA512 7171ce1b5b7f949232c4db94cf98bdd6396c3e2a8f2f483c041cab92d752e3a2fa93d564ede7efece57c069df129e6cc03049cf3e3f07bd3556031a7c4197cbf
 EBUILD libxcrypt-2.4.ebuild 644 BLAKE2B b0198af2c9a0a96d5a821b18ad4aa79f6cfd7d5b45a967adf1f5be9f1ad3964989a540dbdaa60e4239618e0b8a9abacae655b42e2b2adda04037a7b463c82cbc SHA512 b619989540baabbe0a88c8536b2c2fd0c1ba5d60e701228e5d34d1c276bb67c27c9ae4ef8eff8cdf18ffbd87d331ecbc1d5846196b089425fb9d4dbed3888388
 EBUILD libxcrypt-4.4.10-r1.ebuild 3662 BLAKE2B 3ca592fb85f417b6d36613123ea86067dc1153b8e59acbb76ffbfad3aa1bb3b7024907225e8bd1f401e4bfbf766072c750cf39e3f0d270920520560b61dd3140 SHA512 3002fc88260a5b3a7695de457e9bcf4b0a085de239d4bcd06d627fea29d9567734ef73e4dd5eae73c29d36928e5fb9834a3335879ef7628c23b323aff484f6a6
-EBUILD libxcrypt-4.4.11.ebuild 3664 BLAKE2B 796ff3cccf9e3f071f32db78ca9a7cf84f46f808c56ecd808ad2a53e7dca96a38050d72cdf72cd924419b77345588fb6181433512710fe1f2d952c75e0aa9479 SHA512 1a7935d81be7d3c6cc327fdadb6b64717daf5a54913da294cbab16360c5af7b802346784c4f97ef857d59116519b7bb7e6ac6ed969d520b714540a85ef4a66f1
+EBUILD libxcrypt-4.4.12-r3.ebuild 4177 BLAKE2B e0094f7c1a9ea955a0570951c33ba4e8ed114500b2426295e106d090f4cfd73671327f7da22721714e6026375cc2cd0e8584c3460b198ef593767b82fb614e67 SHA512 d10ba7899927c3aaefeab8e7eb282cd1ca89744dfa36e715c668f4f7077b0e03027db5c1c70ebf2f82de41aa8b66ac8123c56e82cb62524fe0b70106cb55e808
 MISC metadata.xml 856 BLAKE2B e9fea1aa08f5b3f0abdd4d490973da2f133ea90e3a366d4549361233f51e674cc646b2fb6b4b15bca72d5a4e3b36be9a06e55afd3a4cb8f439d3958f09f8af25 SHA512 862cf3201efbecfc23167ecd1f6798f6729ba4e76749c174d17baf8aa4887f21d36f40234f35bc1b896e4384d110033b3f2260f01930b926f759e0243039adf8
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch
new file mode 100644
index 000000000000..806213036886
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-multibuild.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile.am b/Makefile.am
+index 26db1c1..597c3f4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -84,11 +84,7 @@ noinst_HEADERS = \
+ 	test/des-cases.h \
+ 	test/ka-table.inc
+ 
+-if ENABLE_XCRYPT_COMPAT_FILES
+ nodist_include_HEADERS += xcrypt.h
+-else
+-nodist_noinst_HEADERS += xcrypt.h
+-endif
+ 
+ noinst_PROGRAMS = \
+ 	lib/gen-des-tables
+@@ -137,7 +133,7 @@ uninstall_hook_targets = \
+ 	uninstall-hook-pkgconfig
+ install-data-hook-pkgconfig:
+ 	cd $(DESTDIR)$(pkgconfigdir) && \
+-		$(LN_S) libxcrypt.pc libcrypt.pc
++		$(LN_S) -f libxcrypt.pc libcrypt.pc
+ uninstall-hook-pkgconfig:
+ 	-rm -f $(DESTDIR)$(pkgconfigdir)/libcrypt.pc
+ 
diff --git a/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch
new file mode 100644
index 000000000000..048a8ebe0a70
--- /dev/null
+++ b/sys-libs/libxcrypt/files/libxcrypt-4.4.12-pythonver.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 1e74bb1..4249fb5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,11 +241,7 @@ ENABLE_KA_TABLE_GEN="no"
+ # This way we just need one call to AC_PATH_PROGS to likely get a
+ # suitable version of Python.  The version check afterwards is for
+ # the case just a generic 'python3' or 'python' executable was found.
+-PYTHON_CANDIDATE_VERSIONS="python3 python"
+-
+-for ver in `seq 6 1 10`; do
+-  PYTHON_CANDIDATE_VERSIONS="python3.$ver $PYTHON_CANDIDATE_VERSIONS"
+-done
++PYTHON_CANDIDATE_VERSIONS="${EPYTHON}"
+ 
+ AC_PATH_PROGS([PYTHON], [$PYTHON_CANDIDATE_VERSIONS], [])
+ 
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild
deleted file mode 100644
index c48e1369c1c5..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.11.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools multibuild python-any-r1 multilib-minimal
-
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others "
-SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/besser82/libxcrypt"
-
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat split-usr static-libs system test"
-
-DEPEND="system? (
-		elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
-		!sys-libs/musl
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-apps/findutils
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]')
-	)"
-
-# Gentoo CI complained about not having this
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/libxcrypt-4.4.10-pythonver.patch"
-	"${FILESDIR}/libxcrypt-4.4.10-multibuild.patch"
-)
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=(
-		$(usex compat 'xcrypt_compat' '')
-		xcrypt_nocompat
-	)
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-get_xclibdir() {
-	printf -- "%s\n" "$(usex split-usr '' '/usr')/$(get_libdir)/$(usex system '' 'xcrypt')"
-}
-
-multilib_src_configure() {
-	local -a myconf=(
-		--libdir=$(get_xclibdir)
-		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
-		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
-	)
-
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			myconf+=(
-				--disable-static
-				--disable-xcrypt-compat-files
-				--enable-obsolete-api=yes
-			)
-			;;
-		xcrypt_nocompat-*)
-			myconf+=(
-				--enable-obsolete-api=no
-				$(use_enable static-libs static)
-			)
-			;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake check
-}
-
-src_test() {
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-
-	(
-		shopt -s failglob || die "failglob failed"
-
-		# make sure out man pages don't collide with glibc or man-pages
-		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
-			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
-				|| die "mv failed"
-		done
-	) || die "failglob error"
-
-	# remove useless stuff from installation
-	find "${D}"/usr/share/doc/${PF} -type l -delete || die
-	find "${D}" -name '*.la' -delete || die
-}
-
-multilib_install() {
-	local install_target
-
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*) install_target="install-libLTLIBRARIES";;
-		xcrypt_nocompat-*)
-			if is_final_abi; then
-				install_target="install"
-			else
-				install_target="install-libLTLIBRARIES"
-			fi
-			;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-
-	emake DESTDIR="${D}" ${install_target}
-
-	# don't install the libcrypt.so symlink for the "compat" version
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
-				"${D}"/usr/include/$(usex system '' 'xcrypt/')xcrypt.h || die
-		;;
-		xcrypt_nocompat-*)
-			if use split-usr; then
-				(
-					shopt -s failglob || die "failglob failed"
-
-					for so_file in "${D}"$(get_xclibdir)/*$(get_libname)*; do
-						so_file=$(basename "${so_file}") || die
-
-						dosym ../../$(usex system '' '../')$(get_libdir)/$(usex system '' 'xcrypt')/${so_file} \
-							/usr/$(get_libdir)/$(usex system '' 'xcrypt/')${so_file}
-					done
-				) || die "symlinking library failure"
-			fi
-			;;
-	esac
-}
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild
new file mode 100644
index 000000000000..166f638a5790
--- /dev/null
+++ b/sys-libs/libxcrypt/libxcrypt-4.4.12-r3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 2004-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools multibuild python-any-r1 multilib-minimal
+
+DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others "
+SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/besser82/libxcrypt"
+
+LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compat split-usr +static-libs system test"
+
+DEPEND="system? (
+		elibc_glibc? ( sys-libs/glibc[-crypt(+)] )
+		!sys-libs/musl
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-apps/findutils
+	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="split-usr? ( system )"
+
+PATCHES=(
+	"${FILESDIR}/libxcrypt-4.4.12-pythonver.patch"
+	"${FILESDIR}/libxcrypt-4.4.12-multibuild.patch"
+)
+
+python_check_deps() {
+	has_version -b "dev-python/passlib[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=(
+		$(usex compat 'xcrypt_compat' '')
+		xcrypt_nocompat
+	)
+
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	multibuild_foreach_variant multilib-minimal_src_configure
+}
+
+get_xclibdir() {
+	printf -- "%s/%s/%s\n" \
+		"$(usex split-usr '' '/usr')" \
+		"$(get_libdir)" \
+		"$(usex system '' 'xcrypt')"
+}
+
+multilib_src_configure() {
+	local -a myconf=(
+		--libdir=$(get_xclibdir)
+		--with-pkgconfigdir=/usr/$(get_libdir)/pkgconfig
+		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
+	)
+
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			myconf+=(
+				--disable-static
+				--disable-xcrypt-compat-files
+				--enable-obsolete-api=yes
+			)
+			;;
+		xcrypt_nocompat-*)
+			myconf+=(
+				--enable-obsolete-api=no
+				$(use_enable static-libs static)
+			)
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant multilib-minimal_src_compile
+}
+
+multilib_src_test() {
+	emake check
+}
+
+src_test() {
+	multibuild_foreach_variant multilib-minimal_src_test
+}
+
+src_install() {
+	multibuild_foreach_variant multilib-minimal_src_install
+
+	(
+		shopt -s failglob || die "failglob failed"
+
+		# Make sure our man pages do not collide with glibc or man-pages.
+		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
+			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
+				|| die "mv failed"
+		done
+	) || die "failglob error"
+
+	# remove useless stuff from installation
+	find "${D}"/usr/share/doc/${PF} -type l -delete || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# don't install the libcrypt.so symlink for the "compat" version
+	case "${MULTIBUILD_ID}" in
+		xcrypt_compat-*)
+			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
+				|| die "failed to remove extra compat libraries"
+		;;
+		xcrypt_nocompat-*)
+			if use split-usr; then
+				(
+					if use static-libs; then
+						# .a files are installed to /$(get_libdir) by default
+						# move static libraries to /usr prefix or portage will abort
+						shopt -s nullglob || die "failglob failed"
+						static_libs=( "${ED}"/$(get_xclibdir)/*.a )
+
+						if [[ -n ${static_libs[*]} ]]; then
+							dodir "/usr/$(get_xclibdir)"
+							mv "${static_libs[@]}" "${D}/usr/$(get_xclibdir)" \
+								|| die "moving static libs failed"
+						fi
+					fi
+
+					if use system; then
+						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
+						# to allow linker to correctly find shared libraries.
+						shopt -s failglob || die "failglob failed"
+
+						for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
+							lib_file_basename="$(basename "${lib_file}")"
+							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
+							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
+						done
+
+						rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "removing symlinks in incorrect location failed"
+					fi
+				)
+			fi
+		;;
+		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
+	esac
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index c3712290e77f..29c2dcd0f4ad 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -6,10 +6,10 @@ DIST libunwind-7.1.0.src.tar.xz 79780 BLAKE2B 8f15dcf4a9c8cb45f17c72bf058eed13a6
 DIST libunwind-8.0.1.src.tar.xz 87188 BLAKE2B 26f4d8ffbc8eb316e4e623280d6fe493e4c5c29489b90633c8215fe91349de7f7f0cfbfe8991ace11656d3782e13c7208b4a4adc04691746b4140187fba40043 SHA512 c115582ca879e215b97d24e4aa80696796383e79856cf26e40b4ddd6b255d598f9fa9867b30f0fd1691be770779835ac1d4b9a5e4a71424b18499b79ea37d060
 DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-libunwind-10.0.0.9999.ebuild 3343 BLAKE2B a9c1f200cc7f7805104d3698bc306b4a8b88e57727e0a4ac7b3273940aa78f9a12a7da1b1f31347bb6be64d59800fb3d206d22bc11cb09590bd4b10eeaa95dcc SHA512 7f4537953b24f842761531915f2ecd59de6574eae938947c7e1b9d979ef0941cc3f3d59a051ce54e23de38ff33065d869383253e32ecbfda602eb3c3a2509d4c
-EBUILD llvm-libunwind-10.0.0_rc1.ebuild 3343 BLAKE2B a9c1f200cc7f7805104d3698bc306b4a8b88e57727e0a4ac7b3273940aa78f9a12a7da1b1f31347bb6be64d59800fb3d206d22bc11cb09590bd4b10eeaa95dcc SHA512 7f4537953b24f842761531915f2ecd59de6574eae938947c7e1b9d979ef0941cc3f3d59a051ce54e23de38ff33065d869383253e32ecbfda602eb3c3a2509d4c
-EBUILD llvm-libunwind-11.0.0.9999.ebuild 3343 BLAKE2B a9c1f200cc7f7805104d3698bc306b4a8b88e57727e0a4ac7b3273940aa78f9a12a7da1b1f31347bb6be64d59800fb3d206d22bc11cb09590bd4b10eeaa95dcc SHA512 7f4537953b24f842761531915f2ecd59de6574eae938947c7e1b9d979ef0941cc3f3d59a051ce54e23de38ff33065d869383253e32ecbfda602eb3c3a2509d4c
-EBUILD llvm-libunwind-7.1.0.ebuild 3723 BLAKE2B 4d26e255995242285e4793f0f377832e8e37751582659f233a9bd2b12545af49df0b5110f76285279cc6ddaf1aa5b42162e7d9ccd5acc1a5c06aca454b1ef5e2 SHA512 51999ce3889d6cb671073e64f1c3c5e6cd9206e55cc20c12412f98a208b1b8d32c2e0cdcefea404d15566776861d7b60dbde7b0485491a0ca7935c773d87a1d8
-EBUILD llvm-libunwind-8.0.1.ebuild 3821 BLAKE2B 4855a5b1dbce552eed8887b6b6787c9c5a26c6b012e8140c2f31d5fb07fac9b2f30aed680068db4cd95294de91bcd5a71e6d23cbbd680f9d45c8d63cd1139deb SHA512 db30e0e4120ba7f8fd396b7452720637329d3007fef5ccec545d4d6040c3deaa27c423311b0034292fae6cd45ae2c4eec75dd884bd5d806e55da0cbf81fbe418
-EBUILD llvm-libunwind-9.0.1.ebuild 3363 BLAKE2B e6fa2592f1fed7adb612990ddd1f6ec765220c1ee05ec9b798bc7d74e89dc0ae56e5652864557d61c6fefc7c1bf9f7f286cafcf18f71bc3bb6ec033d069c8b65 SHA512 657b8bef8e262c08e1659da48996a08af9bb65e4ef2ae7c09ec2bbe5c3e5a4aec43be56707a9007dbb13a0d2247b4da8fa8e6eb8cd3c7c05adfaac1e80ab72ee
+EBUILD llvm-libunwind-10.0.0.9999.ebuild 3337 BLAKE2B 3ed18438eb02755762d4533396ea50a1e2df5ea428cd22b92f6dda90813a48fc1fafb3538e0cc10ada3b8b52fefa8dd18d61043c8f616ea88b32e26bc6e737ad SHA512 db1bfa10cbd3e0dc847262c7662c54c32d98b6467ef29ce7f50b506fb48a05bfa72b04dd3129291a7f66059ebc8b571acff895142bbd7e6bbf08cbcaf209b8c5
+EBUILD llvm-libunwind-10.0.0_rc1.ebuild 3337 BLAKE2B 3ed18438eb02755762d4533396ea50a1e2df5ea428cd22b92f6dda90813a48fc1fafb3538e0cc10ada3b8b52fefa8dd18d61043c8f616ea88b32e26bc6e737ad SHA512 db1bfa10cbd3e0dc847262c7662c54c32d98b6467ef29ce7f50b506fb48a05bfa72b04dd3129291a7f66059ebc8b571acff895142bbd7e6bbf08cbcaf209b8c5
+EBUILD llvm-libunwind-11.0.0.9999.ebuild 3337 BLAKE2B 3ed18438eb02755762d4533396ea50a1e2df5ea428cd22b92f6dda90813a48fc1fafb3538e0cc10ada3b8b52fefa8dd18d61043c8f616ea88b32e26bc6e737ad SHA512 db1bfa10cbd3e0dc847262c7662c54c32d98b6467ef29ce7f50b506fb48a05bfa72b04dd3129291a7f66059ebc8b571acff895142bbd7e6bbf08cbcaf209b8c5
+EBUILD llvm-libunwind-7.1.0.ebuild 3717 BLAKE2B affbe6d3249c5821f75e4523f4a293520ea49b7df49c019c4083dc4263cff66358abcb936e52850668b270d38e9a5d1bd07861c2fbd1489f9dbb5f41193546ae SHA512 275326858c22ac353c7452433ac57a80eda766932e1ae2ebcb21300b78cec02a9e0935e5b3d6277458089821ab0831a9f5dcf7ec051b70d8ba7e875930a6f8a4
+EBUILD llvm-libunwind-8.0.1.ebuild 3815 BLAKE2B 52a00f299c179b3b826702e6b76468922745be47e97542ad2e620879c14434f7ab334089a529ed9c27584c17f8e805bad783710c288c2e5d4258487c2b502186 SHA512 b956f3a085591de5a1519c7b5830c625a085ab2f178ca5b5e7d55b6f4cb23e0b64eeb108d3d45fd18f8420da5898ec2099e6f6d68fc575e5f9bbc846b98865e2
+EBUILD llvm-libunwind-9.0.1.ebuild 3357 BLAKE2B 8a8d03c29cc4b5d8356152b5fcf3539c10112a490974f60399c85e9e5b19d36dd5646fb23d85e25b87c41da5fc70a5412669fb4114487010791d220e61460865 SHA512 f15c8791b7db2b12ef4fbcdd5fca88c3bdd99074038e726c01ad58ac4575268a208723082cfd62a59ac2af42b2cc97395ff62ec28d6afce905db1c5566e53acb
 MISC metadata.xml 302 BLAKE2B 1cdee7813ed9a3766b2eddccd14f9e0576ba5cc7f812d7af4f35c8c2e5991790f3800c6473c37da90d72804832fd9af969a2e3bf7aa625f0d3a32da1dbcefacf SHA512 3afaef82e6a495a81e221524ae7604dc170ef5c103333728674faf0417c45ba7996118c10466eaa24f8feef9ed8f0fc60d535a5195462317d61c61a531c8a285
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild
index 3891515f46e9..d622d1cdee5c 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild
index 3891515f46e9..d622d1cdee5c 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-10.0.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
index 3891515f46e9..d622d1cdee5c 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-11.0.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild
index 9d86d1b2f425..595c95f32f1f 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-7.1.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-multilib llvm multiprocessing python-any-r1
 
 MY_P=libunwind-${PV/_/}.src
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
index 7187a32548a4..f31969be8e58 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-8.0.1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit cmake-multilib llvm multiprocessing python-any-r1
 
 MY_P=libunwind-${PV/_/}.src
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
index 39b185ef6458..ea533a3c5ebb 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="C++ runtime stack unwinder from LLVM"
diff --git a/sys-libs/nss-usrfiles/Manifest b/sys-libs/nss-usrfiles/Manifest
index 59047ed55fdd..23ff395aa499 100644
--- a/sys-libs/nss-usrfiles/Manifest
+++ b/sys-libs/nss-usrfiles/Manifest
@@ -1,3 +1,3 @@
 DIST nss-altfiles-2.18.1.zip 42369 BLAKE2B 9ca579cdda60aadb6ca7b153b0797d773b732ae9a3d442ba0020c7542e1f2bd1635989794477c85f855813611414ab3c12bb8d567eddcaa60d49189793f82d19 SHA512 d9e2c34ce2518a5310578a2b99a59fc1a8142c252c41e5dab0fd0c07e62ccfa2e3c5d2dd29e179514f3b37537bb0576e2bc3c850f459fa251cd57923438981af
-EBUILD nss-usrfiles-2.18.1.ebuild 678 BLAKE2B 44e412eeadb733449478f75554bec808c34289cead25b36ad7dd69ad56905941e274ca9953552fd026ad1f830110f92c8d44670eb55f02f0d357891f9b4e8e19 SHA512 dad315420bb9a5f72acab271eab41c07ab045b5703d5b94ff4993b15156a77ddaf5f50ab64e4a2021e303239d59686cfd329a47ca15bd0aa73f2be3e418e5f8d
+EBUILD nss-usrfiles-2.18.1.ebuild 682 BLAKE2B 6105429b9cef1b086192b54e32d97a35670b5b93cf57de3f6b6f9fadd6bbf982b200e1b695d94465a7d56aea2bf151c746463554013d8a86aff2059fdbfc4061 SHA512 b10eae66ef4d090cc90d2b168159e8e4c24ac1f765b6f67089a003307d318060883ad81c828234f38b405d96b9e2b0000a5ffebca9ee525b478872cc433d6ad7
 MISC metadata.xml 249 BLAKE2B 754cd61789eaaf1ea82757e44351c4453d7bf791553bbb20569d3c712036418af2028d5ff60a0cd52c30b4a8eba97af0be28517840e42f2c06b8b3dae0abcc65 SHA512 d4ff4a52b7a919def80a7fecf5c151211720d90dd586c40adf8da44d14104b0724cfa804e1a469b1b830e5dd200ff82535c773d66b609c7ed0be95257aebd371
diff --git a/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild b/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
index 4934b0ad75bb..e80325e92f19 100644
--- a/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
+++ b/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 MY_PN="nss-altfiles"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="NSS module to read passwd/group files from CoreOS /usr location"
-HOMEPAGE="https://github.com/coreos/${MY_PN}"
+HOMEPAGE="https://github.com/coreos/nss-altfiles"
 SRC_URI="https://github.com/coreos/${MY_PN}/archive/v${PV}.zip -> ${MY_P}.zip"
 
 LICENSE="LGPL-2.1+"
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index d1f1ff661deb..b604bf697274 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -23,9 +23,11 @@ DIST readline70-003 1294 BLAKE2B 9473e18b582fba69cea83e3f5b9fa278dd8b05443254393
 DIST readline70-004 1501 BLAKE2B cebce69a21bee3a4d6a908de09f371d65eab6af51a8dc0f58fc915b916957db420252ce07b06703c05d984f62e1e849b6975f5444b2af6ba35ff7c939acf9d99 SHA512 7be41558eab3b88a3657f8589ecfaff0b8ee7f59083d385f50e8704fe830e05a50652a5feda19ff1f3cfd98bff4bb8e25e1637ec4dac8a618db9c8220a3d954e
 DIST readline70-005 1641 BLAKE2B f720508f698b113c6328018f7e6e8775c7c79afc464047405a5c3dae017d611535017dfc2759c11483bb536fab1e9bf72c7a9d3c769b7aea3bd2cee9686bd522 SHA512 eeb27f4f9195cb905d5891f26480d58f59c885dde3457f7a30ff57760ac772e2333ee8aeae979214949f3b52030285b10db013e307ee7311abab677a4427e878
 DIST readline80-001 927 BLAKE2B 95e3ac33ff4adb65813274864c17781056a8ea065f9a76571b4a6bcb2ebab090c3a021fa2b621832c11b5995e48a8a26dd6e3a8f5864a8e8b520bfcf85d7c4ab SHA512 a148cda6ac97935d51ede1bbacf847d7d2cba8861cf3941d32e3da2f45f16dcc05b20845b63d4264692520db8329e1236cf2bc4fd8ccbe6e40921bbbdeb2cb1c
+DIST readline80-002 1401 BLAKE2B a2f511272f6d651208469998330059d6bae17bb8b704b64468685bb0368b76df1ca5b1dcd8e5cb0019e80932130c8a92fd1a305679bf79f0b801532a94c4b4ae SHA512 a941d142a59fe592cc45c1cf4d416e2fc0ab543dd6a0496fb8b2ec6f651cedd6fb9e0c105f14880700b69b2d6912653b3f66371e45cbe4adc0cc9554801afd3c
+DIST readline80-003 2158 BLAKE2B d8910aef1b796a59500b255df8db71ad1738dd164fd69827759eade74b6d9806ecd364839cfa904fc2f2d48352342155f670e5ec43aac0693f36820fb7139a4d SHA512 85235fca047b4ac87b846d998fffc67ae67ed365b068fd2743e84f11fd00086f85e622955192e07e3560965e32ff5f6d014e0146cde528fb0d0f7b5b829875ca
+DIST readline80-004 1275 BLAKE2B ac260bab163f17ccc783e0c2a21351b05e9e86ad973383d228d10ec749f265df8588c38946c9da15e987192b50f1bcb81141c2f4e171f65455f58521e864a534 SHA512 301ced2361e7583468f9932038936387a016c20d1c41966658a78c7f7c48c70308bf66b3228de0a3c6fc880427b6a90ee1ac4d2693daed432e5ae970671a7461
 EBUILD readline-6.3_p8-r3.ebuild 4369 BLAKE2B 56745c4a1370762aec7400cd3bd51f4bca5ac8316a5a2d5e292e79aa6647f143a9e6c7a5b449abc4443c6c474a8ffd2c2c0fd2d151def10983127327259f38c4 SHA512 4c744b2801297d65d600c9d2812e0a95fd2bac456b1c0619fcf7875af2761688f075562c00808c72ae974bf0749bdbc46d5b6d810a8a9ff1021c13063abeae71
 EBUILD readline-7.0_p5-r1.ebuild 4860 BLAKE2B 2bdfc9253d1efccc2b2fdd9df631039d41692e8e392ac827b748142cc346b10a5bafd1d4e1fbf2238deabb32becc01c581a57cffd2caa549db79ae5e1eb52403 SHA512 48bb2ebd5d22a0b6ea7812896059e99f4302d04a7427e4c8c918cc1291b268976052d2b1b15f840724a2de9a27fb5290167ed6523c7419d237bb3a8fc14d066f
-EBUILD readline-8.0.ebuild 4790 BLAKE2B 42833b30980fc6593bf4d21a74866467f23c5814c7eed4f26cfbe16343f78c99ae2b4c340e2f8b893a8ba728e6f677ffda22e451eca6bc539a0ac8113a6a5f79 SHA512 f8763e2bb3900626e4392bf0afb8672778f105bcaad146b61a78cab36f6b4a5fcf14b019a202c514b73f64353af0b42ac320c81fc9ca12881c034f82daec7ec6
 EBUILD readline-8.0_p1-r1.ebuild 4856 BLAKE2B e2196b310a064d321278860c53eccfefedfec9411c11f632281496b9dff318a01e18156d7539bb35dc6366a2f025ca4211aba2cd8b8b70b8e05566c2d7188f6b SHA512 8d8709911c6fb4387097ec6d37334cb59b669a4eaa7ff0b4e0c171ca351e24f3008eabc44ba81a9214251412ee624668bee33b9396af3e818d3113ef25efe4ab
-EBUILD readline-8.0_p1.ebuild 4818 BLAKE2B 9088e7a27a355c2ee20e5ce491196b806df4480597a949c2a3191f306845abda51669aac2e9bfecd44fcd62a914f66c1ea789393ed6bf62bd1e2a66afab8181a SHA512 d414288e8c571712d311c874c1150ba1271bc48e574f3768eca30e4d8a99548b83d840a8e6356782d80d8bdec9de15ec39cbf93aa35c4ceaba1d53a03f767c58
+EBUILD readline-8.0_p4.ebuild 4856 BLAKE2B 4edbc4c4cb063f9fc85ab133ac1d226bc9c4f55aca0d95b4d29963d818464c534a392d8fb4600ced4759d4de54392a6fbf1dea043edaeac580096eac8529c920 SHA512 e24f61e80accf06b84fc947c78dded27dedcde8bcb9cf87354d75c1555074403d173c5e3559ab87cdccadb841926755351f2317fe2fae1e2c65516df3154dbce
 MISC metadata.xml 472 BLAKE2B 8d3717ac6980105677b10449a1aabca9f9347066f73802241b904101172690bb789b8071f3670dd91ad2af0223c7bc5fb4ed594dc8af3aff20b17bdd681f7630 SHA512 f19a6f0d6aed18903778adc5ad45fdae39c4388e4f09e7cb8a110b798e8cc7ab1739ff813a227ad08ef1166309e1ead57c200b7fe42499a06db97af9f4bce173
diff --git a/sys-libs/readline/readline-8.0.ebuild b/sys-libs/readline/readline-8.0.ebuild
deleted file mode 100644
index 000bd8c3d8d7..000000000000
--- a/sys-libs/readline/readline-8.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib-minimal toolchain-funcs usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-	;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/8"  # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-headers.patch
-)
-
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-	default
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
-}
diff --git a/sys-libs/readline/readline-8.0_p1.ebuild b/sys-libs/readline/readline-8.0_p1.ebuild
deleted file mode 100644
index ccd33bb415ff..000000000000
--- a/sys-libs/readline/readline-8.0_p1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-	;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/8"  # subslot matches SONAME major
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-headers.patch
-)
-
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-	default
-
-	# Force ncurses linking. #71420
-	# Use pkg-config to get the right values. #457558
-	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
-}
diff --git a/sys-libs/readline/readline-8.0_p4.ebuild b/sys-libs/readline/readline-8.0_p4.ebuild
new file mode 100644
index 000000000000..cd51e2e93524
--- /dev/null
+++ b/sys-libs/readline/readline-8.0_p4.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal preserve-libs toolchain-funcs usr-ldscript
+
+# Official patches
+# See ftp://ftp.cwru.edu/pub/bash/readline-7.0-patches/
+PLEVEL="${PV##*_p}"
+MY_PV="${PV/_p*}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+	[[ ${PLEVEL} -eq 0 ]] && return 1
+	local opt=$1
+	eval set -- {1..${PLEVEL}}
+	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
+	if [[ ${opt} == -s ]] ; then
+		echo "${@/#/${DISTDIR}/}"
+	else
+		local u
+		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
+			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
+		done
+	fi
+}
+
+DESCRIPTION="Another cute console display library"
+HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
+
+case ${PV} in
+	*_alpha*|*_beta*|*_rc*)
+		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+	;;
+	*)
+		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
+	;;
+esac
+
+LICENSE="GPL-3"
+SLOT="0/8"  # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs +unicode utils"
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[static-libs?,unicode?,${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
+	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
+	"${FILESDIR}"/${PN}-7.0-headers.patch
+	"${FILESDIR}"/${PN}-8.0-headers.patch
+)
+
+# Needed because we don't want the patches being unpacked
+# (which emits annoying and useless error messages)
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+	default
+
+	# Force ncurses linking. #71420
+	# Use pkg-config to get the right values. #457558
+	local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
+	sed -i \
+		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
+		support/shobj-conf || die
+	sed -i \
+		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
+		examples/rlfe/configure || die
+
+	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
+	# objformat for years, so we don't want to rely on that.
+	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
+
+	ln -s ../.. examples/rlfe/readline || die # for local readline headers
+}
+
+src_configure() {
+	# fix implicit decls with widechar funcs
+	append-cppflags -D_GNU_SOURCE
+	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
+	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
+
+	# Make sure configure picks a better ar than `ar`. #484866
+	export ac_cv_prog_AR=$(tc-getAR)
+
+	# Force the test since we used sed above to force it.
+	export bash_cv_termcap_lib=ncurses
+
+	# Control cross-compiling cases when we know the right answer.
+	# In cases where the C library doesn't support wide characters, readline
+	# itself won't work correctly, so forcing the answer below should be OK.
+	if tc-is-cross-compiler ; then
+		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
+		export bash_cv_func_ctype_nonascii='yes'
+		export bash_cv_wcwidth_broken='no' #503312
+	fi
+
+	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
+	# so we can re-use the config cache file between the two.
+	append-ldflags -L.
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--with-curses
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		mkdir -p examples/rlfe || die
+		cd examples/rlfe || die
+		ECONF_SOURCE="${S}"/examples/rlfe \
+		econf --cache-file="${BUILD_DIR}"/config.cache
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
+		# code is full of AC_TRY_RUN()
+		cd examples/rlfe || die
+		local l
+		for l in readline history ; do
+			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
+			ln -s ../../lib${l}.a lib${l}.a || die
+		done
+		emake
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi ; then
+		gen_usr_ldscript -a readline history #4411
+
+		if use utils && ! tc-is-cross-compiler; then
+			dobin examples/rlfe/rlfe
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
+	dodoc USAGE
+	docinto ps
+	dodoc doc/*.ps
+}
+pkg_preinst() {
+	# bug #29865
+	# Reappeared in #595324 with paludis so keeping this for now...
+	preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5,6,7}
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 6764b3237677..789671c922ad 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index 1d3e46ea5d0b..6481a62fe535 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -10,5 +10,5 @@ AUX nut-2.7.2-no-libdummy.patch 535 BLAKE2B f18f65ca92e834b5e085358a09c7363cf156
 AUX nut-openssl-1.1-support.patch 3873 BLAKE2B 17877276e46372aa17d357efc0851b9cdb33b14ac0c40913b47ea513a8ecaa6eebe3241ae8b324583070d76b6c12d3cf18c043778754b5774af846fb8a33b4d7 SHA512 8945f2f663dc50cfd7041cc7f2c4af5cca4b5ef9cfa1be48c122a623e6eadfc511bbaa60a8bd6b68bb2569c75d5f64613d595ad7444b8d6ec9f773d7743872a1
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r3.ebuild 9769 BLAKE2B 3b828077d369faaea1eb57303437f5d79955bdcc681ede5ebcb81b4e30521c1bb06a43882f2527dd6b7da8cb10d323421409aa9e1a9107f63d1fdd9ba17d3150 SHA512 fe229730b0f61ba3334e4ee01920e3510302087fa449d68b9383a9d236e866cfb0d6c4c2054394f89023b3ab2a7a225b8f3cc38d9645214c1745084d874a464a
+EBUILD nut-2.7.4-r4.ebuild 9808 BLAKE2B a95ead540d77690135d4d4127bc0271ba32ec98306101f201cc2d52607fd7d0e2b0f88bca8ebfd8c223362c11bcebf8cc6e59a379760bb30ee9048f5edde8d32 SHA512 7279d23da8aad9d567fb04ff467cc356ceea33dfafce971b31ef60a9fed871f91fd93628518373d7774fbeceb0ab5edcfdd728e00ae99430e6646d815e7d0897
 MISC metadata.xml 5329 BLAKE2B a97167cdd654c0a1cfc035fbab98a8c94150522b77651186f8c706ac2ebadac6b3e38c8c563a6fa16ac91fc8da760efd204ce3d3ce8e3e0c5239a9dd8c1adf4e SHA512 e57d635a530b16627fbc4807a07a227900189a8796285f309b710c4acb951c990b4f613dc9b3cbab71c480641d8ebfd942520a13e5712527d0058ca07c16b67d
diff --git a/sys-power/nut/nut-2.7.4-r3.ebuild b/sys-power/nut/nut-2.7.4-r3.ebuild
deleted file mode 100644
index 0e0b748bd5e8..000000000000
--- a/sys-power/nut/nut-2.7.4-r3.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic python-single-r1 systemd toolchain-funcs user
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Network-UPS Tools"
-HOMEPAGE="https://www.networkupstools.org/"
-SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-
-IUSE="cgi gui ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
-REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/libltdl:*
-	net-libs/libnsl
-	virtual/udev
-	cgi? ( >=media-libs/gd-2[png] )
-	gui? ( ${PYTHON_DEPS}
-		dev-python/pygtk[${PYTHON_USEDEP}] )
-	ipmi? ( sys-libs/freeipmi )
-	snmp? ( net-analyzer/net-snmp )
-	ssl? ( >=dev-libs/openssl-1:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	usb? ( virtual/libusb:0= )
-	xml? ( >=net-libs/neon-0.25.0 )
-	zeroconf? ( net-dns/avahi )"
-
-BDEPEND="
-	virtual/pkgconfig"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-nut )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
-SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
-SNMP_DRIVERLIST="snmp-ups"
-USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
-USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
-#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
-NEONXML_DRIVERLIST="netxml-ups"
-IPMI_DRIVERLIST="nut-ipmipsu"
-# Now we build from it:
-for name in ${SERIAL_DRIVERLIST} ; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-done
-for name in ${USB_DRIVERLIST} ; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
-	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
-done
-for name in ${NEONXML_DRIVERLIST}; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
-	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
-done
-for name in ${SNMP_DRIVERLIST} ; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
-	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
-done
-for name in ${IPMI_DRIVERLIST} ; do
-	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
-	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
-done
-IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
-
-# public files should be 644 root:root
-NUT_PUBLIC_FILES="/etc/nut/{ups,upssched}.conf"
-# private files should be 640 root:nut - readable by nut, writeable by root,
-NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
-# public files should be 644 root:root, only installed if USE=cgi
-NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
-	"${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
-	"${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
-	"${FILESDIR}"/nut-openssl-1.1-support.patch
-)
-
-pkg_setup() {
-	enewgroup nut 84
-	enewuser nut 84 -1 /var/lib/nut nut,uucp
-	# As of udev-104, NUT must be in uucp and NOT in tty.
-	gpasswd -d nut tty 2>/dev/null
-	gpasswd -a nut uucp 2>/dev/null
-	# in some cases on old systems it wasn't in the nut group either!
-	gpasswd -a nut nut 2>/dev/null
-	warningmsg ewarn
-	use gui && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
-		-e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
-		-i configure.ac || die
-
-	sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
-		-i scripts/udev/Makefile.am || die
-
-	rm ltmain.sh m4/lt* m4/libtool.m4 || die
-
-	sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
-		-i lib/libupsclient{.pc,-config}.in || die #361685
-
-	use gui && eapply "${FILESDIR}"/NUT-Monitor-1.3-paths.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	append-flags -fno-lto
-	tc-export CC
-	tc-export CXX
-	tc-export AR
-
-	local UPS_DRIVERS=""
-	for u in $USE ; do
-		u2=${u#ups_drivers_}
-		[[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
-	done
-	UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
-	myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
-
-	use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
-
-	# TODO: USE flag for sys-power/powerman
-	econf \
-		--sysconfdir=/etc/nut \
-		--datarootdir=/usr/share/nut \
-		--datadir=/usr/share/nut \
-		--disable-static \
-		--with-statepath=/var/lib/nut \
-		--with-drvpath=/$(get_libdir)/nut \
-		--with-htmlpath=/usr/share/nut/html \
-		--with-user=nut \
-		--with-group=nut \
-		--with-logfacility=LOG_DAEMON \
-		--with-dev \
-		--with-serial \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--without-powerman \
-		$(use_with cgi) \
-		$(use_with ipmi) \
-		$(use_with ipmi freeipmi) \
-		$(use_with snmp) \
-		$(use_with ssl) \
-		$(use_with tcpd wrap) \
-		$(use_with usb) \
-		$(use_with xml neon) \
-		$(use_with zeroconf avahi) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	find "${D}" -name '*.la' -delete || die
-
-	dodir /sbin
-	use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
-
-	if use cgi; then
-		elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
-		elog "copy them to your web server's ScriptPath to activate (this is a"
-		elog "change from the old location)."
-		elog "If you use lighttpd, see lighttpd_nut.conf in the documentation."
-	fi
-
-	if use gui; then
-		python_fix_shebang scripts/python/app
-		python_domodule scripts/python/module/PyNUT.py
-		python_doscript scripts/python/app/NUT-Monitor
-
-		insinto /usr/share/nut
-		doins scripts/python/app/gui-1.3.glade
-
-		dodir /usr/share/nut/pixmaps
-		insinto /usr/share/nut/pixmaps
-		doins scripts/python/app/pixmaps/*
-
-		sed -i -e 's/nut-monitor.png/nut-monitor/' -e 's/Application;//' \
-			scripts/python/app/${PN}-monitor.desktop || die
-
-		doicon scripts/python/app/${PN}-monitor.png
-		domenu scripts/python/app/${PN}-monitor.desktop
-	fi
-
-	# this must be done after all of the install phases
-	for i in "${D}"/etc/nut/*.sample ; do
-		mv "${i}" "${i/.sample/}" || die
-	done
-
-	local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
-	einstalldocs
-
-	newdoc lib/README README.lib
-	newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf
-
-	docinto cables
-	dodoc docs/cables/*
-
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd
-	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
-	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
-	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
-
-	keepdir /var/lib/nut
-
-	einfo "Setting up permissions on files and directories"
-	fperms 0700 /var/lib/nut
-	fowners nut:nut /var/lib/nut
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	eval fperms 0640 ${NUT_PRIVATE_FILES}
-	eval fowners root:nut ${NUT_PRIVATE_FILES}
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	eval fperms 0644 ${NUT_PUBLIC_FILES}
-	eval fowners root:root ${NUT_PUBLIC_FILES}
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	if use cgi; then
-		eval fperms 0644 ${NUT_CGI_FILES}
-		eval fowners root:root ${NUT_CGI_FILES}
-	fi
-
-	# this is installed for 2.4 and fbsd guys
-	if ! has_version virtual/udev; then
-		einfo "Installing non-udev hotplug support"
-		insinto /etc/hotplug/usb
-		insopts -m 755
-		doins scripts/hotplug/nut-usbups.hotplug
-	fi
-
-	newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
-	bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
-}
-
-pkg_postinst() {
-	# this is to ensure that everybody that installed old versions still has
-	# correct permissions
-
-	chown nut:nut "${ROOT}"/var/lib/nut 2>/dev/null
-	chmod 0700 "${ROOT}"/var/lib/nut 2>/dev/null
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
-	eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
-	eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
-
-	# Do not remove eval here, because the variables contain shell expansions.
-	if use cgi; then
-		eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
-		eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
-	fi
-
-	warningmsg elog
-}
-
-warningmsg() {
-	msgfunc="$1"
-	[ -z "$msgfunc" ] && die "msgfunc not specified in call to warningmsg!"
-	${msgfunc} "Please note that NUT now runs under the 'nut' user."
-	${msgfunc} "NUT is in the uucp group for access to RS-232 UPS."
-	${msgfunc} "However if you use a USB UPS you may need to look at the udev or"
-	${msgfunc} "hotplug rules that are installed, and alter them suitably."
-	${msgfunc} ''
-	${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
-	${msgfunc} ''
-	${msgfunc} "Please note that upsdrv is NOT automatically started by upsd anymore."
-	${msgfunc} "If you have multiple UPS units, you can use their NUT names to"
-	${msgfunc} "have a service per UPS:"
-	${msgfunc} "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
-	${msgfunc} ''
-	${msgfunc} 'If you want apcupsd to power off your UPS when it'
-	${msgfunc} 'shuts down your system in a power failure, you must'
-	${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
-	${msgfunc} ''
-	${msgfunc} 'rc-update add nut.powerfail shutdown'
-	${msgfunc} ''
-
-}
diff --git a/sys-power/nut/nut-2.7.4-r4.ebuild b/sys-power/nut/nut-2.7.4-r4.ebuild
new file mode 100644
index 000000000000..38d45641885d
--- /dev/null
+++ b/sys-power/nut/nut-2.7.4-r4.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic python-single-r1 systemd toolchain-funcs user
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Network-UPS Tools"
+HOMEPAGE="https://www.networkupstools.org/"
+SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
+
+IUSE="cgi gui ipmi snmp +usb selinux split-usr ssl tcpd xml zeroconf"
+REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	dev-libs/libltdl:*
+	net-libs/libnsl
+	virtual/udev
+	cgi? ( >=media-libs/gd-2[png] )
+	gui? ( ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	ipmi? ( sys-libs/freeipmi )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( >=dev-libs/openssl-1:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	usb? ( virtual/libusb:0= )
+	xml? ( >=net-libs/neon-0.25.0 )
+	zeroconf? ( net-dns/avahi )"
+
+BDEPEND="
+	virtual/pkgconfig"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-nut )"
+
+S="${WORKDIR}/${MY_P}"
+
+# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package
+SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx"
+SNMP_DRIVERLIST="snmp-ups"
+USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx"
+USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST}
+#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx"
+NEONXML_DRIVERLIST="netxml-ups"
+IPMI_DRIVERLIST="nut-ipmipsu"
+# Now we build from it:
+for name in ${SERIAL_DRIVERLIST} ; do
+	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+done
+for name in ${USB_DRIVERLIST} ; do
+	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}"
+	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )"
+done
+for name in ${NEONXML_DRIVERLIST}; do
+	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )"
+done
+for name in ${SNMP_DRIVERLIST} ; do
+	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )"
+done
+for name in ${IPMI_DRIVERLIST} ; do
+	IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}"
+	REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )"
+done
+IUSE="${IUSE} ${IUSE_UPS_DRIVERS}"
+
+# public files should be 644 root:root
+NUT_PUBLIC_FILES="/etc/nut/{ups,upssched}.conf"
+# private files should be 640 root:nut - readable by nut, writeable by root,
+NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}"
+# public files should be 644 root:root, only installed if USE=cgi
+NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.2-no-libdummy.patch
+	"${FILESDIR}"/${PN}-2.7.1-snmpusb-order.patch
+	"${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch
+	"${FILESDIR}"/nut-openssl-1.1-support.patch
+)
+
+pkg_setup() {
+	enewgroup nut 84
+	enewuser nut 84 -1 /var/lib/nut nut,uucp
+	# As of udev-104, NUT must be in uucp and NOT in tty.
+	gpasswd -d nut tty 2>/dev/null
+	gpasswd -a nut uucp 2>/dev/null
+	# in some cases on old systems it wasn't in the nut group either!
+	gpasswd -a nut nut 2>/dev/null
+	warningmsg ewarn
+	use gui && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \
+		-e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \
+		-i configure.ac || die
+
+	sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \
+		-i scripts/udev/Makefile.am || die
+
+	rm ltmain.sh m4/lt* m4/libtool.m4 || die
+
+	sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \
+		-i lib/libupsclient{.pc,-config}.in || die #361685
+
+	use gui && eapply "${FILESDIR}"/NUT-Monitor-1.3-paths.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	append-flags -fno-lto
+	tc-export CC
+	tc-export CXX
+	tc-export AR
+
+	local UPS_DRIVERS=""
+	for u in $USE ; do
+		u2=${u#ups_drivers_}
+		[[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}"
+	done
+	UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }"
+	myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}"
+
+	use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi"
+
+	# TODO: USE flag for sys-power/powerman
+	econf \
+		--sysconfdir=/etc/nut \
+		--datarootdir=/usr/share/nut \
+		--datadir=/usr/share/nut \
+		--disable-static \
+		--with-statepath=/var/lib/nut \
+		--with-drvpath=/$(get_libdir)/nut \
+		--with-htmlpath=/usr/share/nut/html \
+		--with-user=nut \
+		--with-group=nut \
+		--with-logfacility=LOG_DAEMON \
+		--with-dev \
+		--with-serial \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--without-powerman \
+		$(use_with cgi) \
+		$(use_with ipmi) \
+		$(use_with ipmi freeipmi) \
+		$(use_with snmp) \
+		$(use_with ssl) \
+		$(use_with tcpd wrap) \
+		$(use_with usb) \
+		$(use_with xml neon) \
+		$(use_with zeroconf avahi) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	dodir /sbin
+	use split-usr && dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl
+
+	if use cgi; then
+		elog "CGI monitoring scripts are installed in /usr/share/nut/cgi."
+		elog "copy them to your web server's ScriptPath to activate (this is a"
+		elog "change from the old location)."
+		elog "If you use lighttpd, see lighttpd_nut.conf in the documentation."
+	fi
+
+	if use gui; then
+		python_fix_shebang scripts/python/app
+		python_domodule scripts/python/module/PyNUT.py
+		python_doscript scripts/python/app/NUT-Monitor
+
+		insinto /usr/share/nut
+		doins scripts/python/app/gui-1.3.glade
+
+		dodir /usr/share/nut/pixmaps
+		insinto /usr/share/nut/pixmaps
+		doins scripts/python/app/pixmaps/*
+
+		sed -i -e 's/nut-monitor.png/nut-monitor/' -e 's/Application;//' \
+			scripts/python/app/${PN}-monitor.desktop || die
+
+		doicon scripts/python/app/${PN}-monitor.png
+		domenu scripts/python/app/${PN}-monitor.desktop
+	fi
+
+	# this must be done after all of the install phases
+	for i in "${D}"/etc/nut/*.sample ; do
+		mv "${i}" "${i/.sample/}" || die
+	done
+
+	local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING )
+	einstalldocs
+
+	newdoc lib/README README.lib
+	newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf
+
+	docinto cables
+	dodoc docs/cables/*
+
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd
+	newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon
+	newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog
+	newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail
+
+	keepdir /var/lib/nut
+
+	einfo "Setting up permissions on files and directories"
+	fperms 0700 /var/lib/nut
+	fowners nut:nut /var/lib/nut
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval fperms 0640 ${NUT_PRIVATE_FILES}
+	eval fowners root:nut ${NUT_PRIVATE_FILES}
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval fperms 0644 ${NUT_PUBLIC_FILES}
+	eval fowners root:root ${NUT_PUBLIC_FILES}
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	if use cgi; then
+		eval fperms 0644 ${NUT_CGI_FILES}
+		eval fowners root:root ${NUT_CGI_FILES}
+	fi
+
+	# this is installed for 2.4 and fbsd guys
+	if ! has_version virtual/udev; then
+		einfo "Installing non-udev hotplug support"
+		insinto /etc/hotplug/usb
+		insopts -m 755
+		doins scripts/hotplug/nut-usbups.hotplug
+	fi
+
+	newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc
+	bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw
+}
+
+pkg_postinst() {
+	# this is to ensure that everybody that installed old versions still has
+	# correct permissions
+
+	chown nut:nut "${ROOT}"/var/lib/nut 2>/dev/null
+	chmod 0700 "${ROOT}"/var/lib/nut 2>/dev/null
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+	eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
+	eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null
+
+	# Do not remove eval here, because the variables contain shell expansions.
+	if use cgi; then
+		eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+		eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null
+	fi
+
+	warningmsg elog
+}
+
+warningmsg() {
+	msgfunc="$1"
+	[ -z "$msgfunc" ] && die "msgfunc not specified in call to warningmsg!"
+	${msgfunc} "Please note that NUT now runs under the 'nut' user."
+	${msgfunc} "NUT is in the uucp group for access to RS-232 UPS."
+	${msgfunc} "However if you use a USB UPS you may need to look at the udev or"
+	${msgfunc} "hotplug rules that are installed, and alter them suitably."
+	${msgfunc} ''
+	${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream."
+	${msgfunc} ''
+	${msgfunc} "Please note that upsdrv is NOT automatically started by upsd anymore."
+	${msgfunc} "If you have multiple UPS units, you can use their NUT names to"
+	${msgfunc} "have a service per UPS:"
+	${msgfunc} "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME"
+	${msgfunc} ''
+	${msgfunc} 'If you want apcupsd to power off your UPS when it'
+	${msgfunc} 'shuts down your system in a power failure, you must'
+	${msgfunc} 'add nut.powerfail to your shutdown runlevel:'
+	${msgfunc} ''
+	${msgfunc} 'rc-update add nut.powerfail shutdown'
+	${msgfunc} ''
+
+}
diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest
index 7047df5385d4..f97f5831d199 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -4,5 +4,5 @@ AUX thermald-1.9-size_t-format.patch 2375 BLAKE2B 1f795d846a6012f69bb5c5e27a2b50
 DIST thermald-1.8.tar.gz 422982 BLAKE2B 6970190182a6ebcd6b39fcd34d75221173e1bbbf32cb7c0009001cd2934cf18bbc524ec43d1e99dbf7a1a0bda53b0b2239c9e25e08c4cb9435bceb0a512c5e3b SHA512 2360cfad311a804d7609b9879c5a0db749e1813085093e535eaa948b6fa289c385b8e6762ab15270e2e19170a4f48e0b0d736ffff029651289ec23c8dfc61743
 DIST thermald-1.9.tar.gz 427380 BLAKE2B 1954531838c0fc3677ab8f91476d5670a6b5d067d580c7c570b37e5d8d8ac408cacb218531bc8363cfd56eee9331291959ff11851550c6c782a43b19bacca01a SHA512 71fa6e9fc2f55623ed0acdb65f9699d5ea2c89c4092546a73d53ac3ea3ca0a5c60f3360c8bef0af9daeeecfe9a20411d9e4d25bc1d89349cfe83ebb03ba387a8
 EBUILD thermald-1.8-r1.ebuild 969 BLAKE2B 79aa181356e669bac648ea93f540effaa6db2cc52a44e6d4d0a7b321c0b1428f7df7b2ada6a1e6465a4f938ef363f4500746d32e541029971698f1767f9ea055 SHA512 4ed59800c405feaf3b0ae2b16eb81615e91b09042f02bf414af66022031c1064c7a2c21d80d22a9db3afcae66c7d89b551008b4c32bc2c32b102ebcafc3bc463
-EBUILD thermald-1.9.ebuild 973 BLAKE2B 6dd5e2879c84274bcf3ac8a25222769617b58b86bef8768cb813d380e2def1254d12926fca57566a573924e9a952fac2cc0346921df27702eeb29533eacf48f9 SHA512 fbdd64d672613eb6ecc5dcd342db1f71820f20b5c486ebc259db804e80c2c1169d733138ed80fa376f6a7fa4506b304a846b11954b96f9c4e765d920f3302045
+EBUILD thermald-1.9.ebuild 971 BLAKE2B b5416fb2dbe505ba0646c0d145bb929c3ce94c7eef4c80d26c44dbe393ad74acb420021cf2e774ca8b66a3ff1169b7762f0a30d5348c1dba0952a91240fe24a6 SHA512 3079d7b24b61ee7dd5b9bd239a8a507f2ed6c601cea094b4c5d7111df2d4cedf69b9e051a3c311a353da24291bdc215f588fc00006bbaa436fa22b89b8b34a88
 MISC metadata.xml 643 BLAKE2B 92fe71631920f61dd6667c2dc8b4e27d2ea1e9bfb64509a9b4a9b0a72e9b4a11b7ae06febf120564c28272b9e079cf71a114bca620ce2651ec615439dd5ff9b3 SHA512 bad363023e01da0232632d54b2cb65dce89a7c70441f05fc873640a29f6fd4ec4ea30b00f94f723a786de1eef87b94673dad455102bc57a11573346e3a8ae2e8
diff --git a/sys-power/thermald/thermald-1.9.ebuild b/sys-power/thermald/thermald-1.9.ebuild
index 9eb5e8b92494..5ab38ae244af 100644
--- a/sys-power/thermald/thermald-1.9.ebuild
+++ b/sys-power/thermald/thermald-1.9.ebuild
@@ -42,6 +42,6 @@ my_src_configure() {
 my_src_install_all() {
 	einstalldocs
 
-	rm -rf "${ED%/}"/etc/init || die
+	rm -rf "${ED}"/etc/init || die
 	doinitd "${FILESDIR}"/thermald
 }
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index a67d6d1dcc39..205ec5b7dcb1 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/bcron/Manifest b/sys-process/bcron/Manifest
index 0cc6fe82d1ef..94476c76f6e7 100644
--- a/sys-process/bcron/Manifest
+++ b/sys-process/bcron/Manifest
@@ -3,5 +3,5 @@ AUX crontab 485 BLAKE2B ef44f29195b3d50ea360cdd76d2f7854961161c2ac4579dc7526fe02
 DIST bcron-0.10.tar.gz 68314 BLAKE2B faa7204703af18108675ddb2f2e835cdfcc230f03d80a27b66734110c6354c120f1a2e6357c476b27d72e95935c9bfd805f901521087632cb7e1c26d3b59ba98 SHA512 cfc61651a77bedbaa3e6d9b5e5e8fa070883dfaf1cf314fc47b6114575ad4818f22fb5dd52959a0af077c3f30e2e902fed79feb51dc83adc3b36d20cc587f4a1
 DIST bcron-0.11.tar.gz 69950 BLAKE2B 9aaf9e7d8e468a184da97324ccaa6ea557c2d8c3c3557bb90ba9b43b98ac1ddf9bc7d879300394b73c3e5921f9fd7ad8859393076a77a99b9ec3a909e6493a17 SHA512 730e0f4d6fe717ddf89e787d570449f1f7b4b5c44beb2e11b6c88a92177ea02480063f16992f32a13877327b895ca085617dda65de90effd8fb465e578444f05
 EBUILD bcron-0.10.ebuild 2962 BLAKE2B d7e090f9bbff85c5e35a965f5b3c03e50c5aed0eb5759716ffd62c77fb032a15cc407ff0ce090e142e28c25f1c37f306249be83fb01ae6430b7b74394aaa6bfe SHA512 ac962512008c044a3aa510f8dcc09ac7c56716c56afaa49c747ac81da91bc20218f98a767b527bf0c4e095e322546aa6c003d21784e97c3e18ae788f9e79642f
-EBUILD bcron-0.11.ebuild 2831 BLAKE2B 1260c269b62bc1944ed7f2fa01fa15edf57fa546cc399ae180e38462c1f051a0036c0985f3fe1cd4ca854add2996dde7597d53361c3fd9e0db70fddc3d6f9a61 SHA512 be0d6fbccb1809469ca00c76da55754c050e168343c3ea41b7da58064601fd28d1d6ba473b9a91f19409a0dc1b59855718f870e304079084ccd2b7dfcf000e05
+EBUILD bcron-0.11.ebuild 2821 BLAKE2B f598f8195d873cb937775957789aee40ee56db1e154887b06659fc0a8191d5d6f458b980e7a2146fd0d13adec7f4b175b16cfbea23859a4e6824afa0ce90775e SHA512 aabe046722d6cfa9398f7f3323b207050c0500be355f5b2ea9987a7ad35eff0d1561f302683306a6400816b0497224abc392bf17a4aeba6327a01a0510e291b1
 MISC metadata.xml 566 BLAKE2B f8a972c8a51fd2768ef8a02b68a26c03b69950961e47e176c98073968dd0361c98eec302369b5ddc7453692bf16820ce249625b676af39e9fb2d3dc4ca5168f1 SHA512 95d7ef6f7548ee75046a45715c6976a1e2acf74b57dd68b225ed111f1e28ccfb8ec8263d3b8708798f9f5e6de1995f9ad7185ec8806978fa8b757c88eeda4dc1
diff --git a/sys-process/bcron/bcron-0.11.ebuild b/sys-process/bcron/bcron-0.11.ebuild
index 6078a2a5ba25..81b2a4789da4 100644
--- a/sys-process/bcron/bcron-0.11.ebuild
+++ b/sys-process/bcron/bcron-0.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cron python-any-r1 toolchain-funcs
 
diff --git a/sys-process/cronbase/Manifest b/sys-process/cronbase/Manifest
index 91ad17080489..d7cf1c792b8f 100644
--- a/sys-process/cronbase/Manifest
+++ b/sys-process/cronbase/Manifest
@@ -1,3 +1,3 @@
 AUX run-crons-0.3.7 4942 BLAKE2B 41be25ff5b647179dda723d44fc1441293ab8287427de9febedf49596cd816cbfad0fb98d1bb60602bd198bcef72eb8d5c9cfe01c66e09270bf653c2c6a6f650 SHA512 eb4f298fb67d7ff3e82d19e6a27f3f1df4b1abab86bd78f3ea85aecaead42a6c194773c21d63d081b62b0eb45cf2bdeb78b43b58906500e6bb52613f7e6bf164
-EBUILD cronbase-0.3.7-r6.ebuild 645 BLAKE2B bf214888aa0be0626f63a786cd806b8c264d5f93ed064de8f30f653ebffa9e5c6feb9fd6d0005a1364b7c2f018189d264a230b68e68accb55723792db475feb8 SHA512 1d92107ad0f927f256b3e3c0f2bdc585dd1ca5848ed1c342f4f94154ad4bf35e2b7e7bd21cc49380e8d829e3c1703d7ede9c812b3d322c751dc32b7f773e58c5
+EBUILD cronbase-0.3.7-r6.ebuild 662 BLAKE2B 5fe31d1de7637644f923c5aad0ea7037c7afc5a85640f9ff2e992053dc2eb17e01a5563bc911a6b842a7e7942cc8c1036c9f1d8d6fe9cac32a306a4896846e14 SHA512 ca5d86b98e20ab8455f238120794782c122eb834d4c32c1e14bd4803b33ad6bd2706e37082f15be21ac4e74929f12176a472ba4a84d9099cf08a2d9ed9fa61e7
 MISC metadata.xml 253 BLAKE2B 1d5af623950024db87f3016a93014ce876894828c8bac85ae8b157f8e2851ca96384c8e195c9693e09e7a76f4fb7033ee466057b930198a6416135eebbb6a8c1 SHA512 66f53c08df7430d7052861b4c483e36d54db4d937be2fd4e3a6135d36992e041aa88d60205b47c3749b54c36925ca4c45c88fa7b44fee283de48ab8aa75b738b
diff --git a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild b/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
index f02db287340f..1d5b69210d29 100644
--- a/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
+++ b/sys-process/cronbase/cronbase-0.3.7-r6.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit user
 
 DESCRIPTION="base for all cron ebuilds"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 447b590bad97..4ae5faa4c6d7 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,6 +1,6 @@
 AUX htop-2.1.0-header_updates.patch 1213 BLAKE2B 4bf06329ee553b29c40c46b8dd0a267d19d17c0b19e8f7938b9276cfced5ba734924c2228408e7e2bee8088250c85d9cfa1cee508c1f3b4f8554d4be8e47cd2b SHA512 63644982da6a92a5477286df4c2cc16097aee8b6f8fcee6c37448d36074770b2f5f8f5a1dbac32728db79dbfb4a094fdd31128cec1ba322ada0b6a0968e53f98
 DIST htop-2.2.0.tar.gz 308109 BLAKE2B 323a3bfe5032b6d59a3f751831a2af6aa7ae7e9ecceb35828812cb375d919de51f401ffe59fffdfc83a72c8dace879c5d5a0e857511c20e2126d11cdc4101b0b SHA512 ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e
 DIST htop-3.0.0_beta5.tar.gz 175780 BLAKE2B f7d03485e74387c656e5a576f0a53c832bac668cee79750402335b2051a17d405392b99316f1546cc76fa83dc3bc85055ca58b928225df0e162ffdb9c1889a5f SHA512 eaa04a278257a1447cd60825083c864d3c23a4a5607447ce05356d550f42ff68a810f14bf91314b7266f9741aab8141d67d98316a31fa7806fb6b858cc804344
-EBUILD htop-2.2.0.ebuild 1444 BLAKE2B 9cc30cb014e1289e5f91bbf7d09011b7d764e51971bcf4569cb6d8a8aff0ca888fa8eff6046244ea4476e19281c89351b82cb89bb61a922292c8c0d66becb116 SHA512 f42f1126c933c9c0b45edf6b135df3091bf528433a3d66f99184f94de1636d3e5649ef5bcea92c51e55a675a724f8b52d30be2b1aad1d219bdea7af6d683c31b
-EBUILD htop-3.0.0_beta5.ebuild 1808 BLAKE2B d25832846e398b98984e5e45a1708c3cdfc403532a91fb0ba8999b2efa4cfc6c61f3d8b782a115e886db29d49434ff022931affcb8594261a76933345b3508b6 SHA512 eb04021db910926de90cbbf2d86da6e846bc5f36b5532f7fe9f50c0933adf1dfb29c697f4fe567fa75548096d159acfe31ebc23e737f81097d790fc620b3ffbd
+EBUILD htop-2.2.0.ebuild 1434 BLAKE2B 6db92471770e97f429483bec65359b0d5aede2cbf10aff4670b03efc9e66e2d9ba03cf5105d4c8c4bcb06d522521680ca92b029efea7293ebdfbbc4bb2939959 SHA512 856b3e55f4c263eb7e6c3be98596ad54a5600db4da34368fea0b0817ec55e3c5833f55dddde4a58147e77b407744821221e5e0b686ea68763e804d3c5fa9f41c
+EBUILD htop-3.0.0_beta5.ebuild 1798 BLAKE2B 9f6a5db2e2d990cb23107af07ef575e07e19274d671e2710506b808acf7771d015ead2524b9d7130c1a7a9bfd1eb6cd974ad7207fc21b0273cf7205b2bd1ffe1 SHA512 5a7a3e7bdf31236e50db0d5fb96854a24188c5ccab62bcae2886422ac548a3930cf63c7a0d77d228e13fb9472c5987bae0b26568daf018abd417eafe1f35785e
 MISC metadata.xml 750 BLAKE2B 57d419667fbc0053cb2f24908a4e43fefecca832bd86e8d562a4a43090b82f049c62457388ffe8bc4c1f3d49e1119da50f8221686b69956f4ea9426259fb6f3a SHA512 e35d8a5177f9e5bb3136759a7c4c0de5dee4366e3380952c8d72dbdfab46be5f880b77450046f02846c7baa1892e88835c8480808333934ec1bec04c34cd9072
diff --git a/sys-process/htop/htop-2.2.0.ebuild b/sys-process/htop/htop-2.2.0.ebuild
index fef82997549c..8e121bcacff1 100644
--- a/sys-process/htop/htop-2.2.0.ebuild
+++ b/sys-process/htop/htop-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info python-any-r1
 
diff --git a/sys-process/htop/htop-3.0.0_beta5.ebuild b/sys-process/htop/htop-3.0.0_beta5.ebuild
index de47c9f995d5..9ee899432723 100644
--- a/sys-process/htop/htop-3.0.0_beta5.ebuild
+++ b/sys-process/htop/htop-3.0.0_beta5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools linux-info python-any-r1
 
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 46b095864011..267d27f48e89 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -3,5 +3,6 @@ AUX procps-3.3.12-proc-tests.patch 1835 BLAKE2B 99fe8d63620f37f98cddc60e8bcbaadb
 DIST procps-ng-3.3.15.tar.xz 904416 BLAKE2B 9fc1384df1d51a13bdf3aaad173160a11c5a7e016a8c397a076b5115e350d2c6fd8ff8d9ad5d83b959020bcd6a1ef9e1bca02e9a63d56881816c5c7d7c9a8bc3 SHA512 bc83ccc1941e7be8266588fdfbba17e2424b30163a215873ee6dee96215d66249f5d5e46fec2278d030b42bd7599861c4878360042dacec4c221ce411453747c
 DIST procps-ng-3.3.16.tar.xz 859736 BLAKE2B fbacc1edb0711cda0fecbf5f589c8cc18bd74f0430866e946f7c4612b78f383b9299840ab7fa5bbc65c581cc9484dbb37b111c493cf88f55ba247a343fd0c80d SHA512 d83da472df256b188c32082632202e7f8ebd1b161082387760876ae34d50221b3682299a2816a7d6a29afb40322743c31b87d92ca299c2944a6b55e50736d367
 EBUILD procps-3.3.15-r1.ebuild 2026 BLAKE2B 424cbf96f6591263235847b261ff233fae8ca6fba354ec60fc5a06b22b08cc9de35f59001abcf1d6939ff6477d41ef36071d35013b9ea55189cf27b1d25437d2 SHA512 d575c8bb0f0f427f2959dc63003c83e97c3f621167bad29a60cab7f6d5830784d2bb7f2a6253f83504fb8fee57c307e5e50b309ab55f405f1ede5c47545b51bc
+EBUILD procps-3.3.16-r1.ebuild 2351 BLAKE2B 5c5f2e7c26522f658331ac415c179ed0a72f129a8e51c5af41f1d31514f9c8fba4d71bc3303370a248d04b5759bed7fe31ec85940e7140316bc8c9f38e46642d SHA512 d39233c89cf9ff188b1de7d24497acc90a59d390afd0db353339c5caf21ee6d61682e5dfcf93f0eb18565e78627c1227af40513762d967a01ccab9fc7f6abaf5
 EBUILD procps-3.3.16.ebuild 2106 BLAKE2B a333316a434af32201e4444ca4353aad39e3d459d034163d06ddb4df44331af4a92988c7706dd80713606f7b37882defb438a0069085c6453620871ce83c87ca SHA512 dcf6d7695ddc36aa54440e057df85d544167e9f6a9d517dcd72805ad01b0de11e27d0385d6aeba28dd64bade66f8bf83d5ada9c3a8ec759b39a05aafaa46e965
 MISC metadata.xml 653 BLAKE2B de137950217a24b13838a10e3dddacd94898c4d4be18c9080e31d666fe74d6f8e5fe3edfb4f3caf369fde1c82858e4c8828883c21f3ed32867a5f35d0771dc89 SHA512 d98bc7ed5e5437134c30db0a2ecbe4f430143aad2b91775e128fe735ddc39801e8d8fe62905cabbd8a41c4d07698110605b74056296282a74ac7622a09272703
diff --git a/sys-process/procps/procps-3.3.16-r1.ebuild b/sys-process/procps/procps-3.3.16-r1.ebuild
new file mode 100644
index 000000000000..b99fef6e400d
--- /dev/null
+++ b/sys-process/procps/procps-3.3.16-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib-minimal usr-ldscript
+
+DESCRIPTION="standard informational utilities and process-handling tools"
+HOMEPAGE="http://procps-ng.sourceforge.net/ https://gitlab.com/procps-ng/procps"
+SRC_URI="mirror://sourceforge/${PN}-ng/${PN}-ng-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/8" # libprocps.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind +kill modern-top +ncurses nls selinux static-libs systemd test unicode"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	elogind? ( sys-auth/elogind )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:=[unicode?] )
+	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	elogind? ( virtual/pkgconfig )
+	ncurses? ( virtual/pkgconfig )
+	systemd? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )"
+RDEPEND="
+	${COMMON_DEPEND}
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-apps/util-linux[kill]
+	)
+	!<app-i18n/man-pages-de-2.12-r1
+	!<app-i18n/man-pages-pl-0.7-r1
+"
+
+S="${WORKDIR}/${PN}-ng-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.11-sysctl-manpage.patch # 565304
+	"${FILESDIR}"/${PN}-3.3.12-proc-tests.patch # 583036
+
+	# Upstream fixes
+)
+
+multilib_src_configure() {
+	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
+	append-lfs-flags #471102
+	local myeconfargs=(
+		--docdir='$(datarootdir)'/doc/${PF}
+		$(multilib_native_use_with elogind) # No elogind multilib support
+		$(multilib_native_use_enable kill)
+		$(multilib_native_use_enable modern-top)
+		$(multilib_native_use_with ncurses)
+		$(use_enable nls)
+		$(use_enable selinux libselinux)
+		$(use_enable static-libs static)
+		$(use_with systemd)
+		$(use_enable unicode watch8bit)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake check </dev/null #461302
+}
+
+multilib_src_install() {
+	default
+	#dodoc sysctl.conf
+
+	if multilib_is_native_abi ; then
+		dodir /bin
+		mv "${ED}"/usr/bin/ps "${ED}"/bin/ || die
+		if use kill; then
+			mv "${ED}"/usr/bin/kill "${ED}"/bin/ || die
+		fi
+
+		gen_usr_ldscript -a procps
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index 75890cceafdf..52499bbb05ff 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -1,3 +1,3 @@
 DIST tini-0.18.0.tar.gz 32152 BLAKE2B d676f0f1b4d9f6dca98cdb626aa7c525ec55e090cfeb1cf0e9ab167f1ef4285123223873e92e81d5d62ceb631e26e9012f16b28b1d35813ac801f8e4594be70b SHA512 83279180b6a875aaff9b6b7446ee7e71fd05357279744afcb4db67c76572dc871acfba86c035857009b5dd88ca75d9f2e815d6a925563cdb3e6e771eb83be9b1
-EBUILD tini-0.18.0.ebuild 1432 BLAKE2B 08504f0fb56e910cd016ff91b698901e4ccfb464a13dadef26896b88ed38d039b94c8bf6891d986266cd12997bafcc727fc6b0bf1ab9afe7eb1acac5a9dae068 SHA512 4f4ce9a38d1d1f75b0e04702af58411ed172d999efecf4369ac2d0db6ed1fdea95132a3e1a015a35619563a50949afe6b4c2ee7ed35f36ca8e0fd9d9d50e0b59
+EBUILD tini-0.18.0.ebuild 1428 BLAKE2B 4f7195c9cf60d8dfb2602bbcd3143143018e2cc3fb2da82e7b966a7fcf69703ab043d62d8b34ff96dcae0eb8022ded7c01a96bb01b8a680d5910d7adf3b87cb5 SHA512 8e2e0851d898a9c71c29efc35eb1cb7dcf6723f0fa9e41ea35ccba9c8dfba0d0c4c54cfe23c45e2940b7f83a486c3422ef8ad5ee77cf81420d66f911177158a5
 MISC metadata.xml 497 BLAKE2B 356a1e1535fb2669a6b563c42b01d269203aa1608e0bb37e5083d9144afc857e6db12c47113dd75fdc19fe105b291e990cef49b74b2c07fbfe650de9c3862fac SHA512 11f6842f3a4de7f003995288098e0f97c231b74fc6bbad41faea51662b9f62386db978f543a9db62b6e5a0d92c52e28b6c8e15ac79dcfc8c215cad9fb631e723
diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild
index abadaef943ff..fa232a3f35d1 100644
--- a/sys-process/tini/tini-0.18.0.ebuild
+++ b/sys-process/tini/tini-0.18.0.ebuild
@@ -52,8 +52,8 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 	if use static; then
-		mv "${ED%/}"/usr/bin/{${PN}-static,${PN}} || die
+		mv "${ED}"/usr/bin/{${PN}-static,${PN}} || die
 	else
-		rm "${ED%/}"/usr/bin/${PN}-static || die
+		rm "${ED}"/usr/bin/${PN}-static || die
 	fi
 }
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index a5f1ee6df86c..dbff11b99d6b 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/libcrypt/Manifest b/virtual/libcrypt/Manifest
new file mode 100644
index 000000000000..37662fb0a0d2
--- /dev/null
+++ b/virtual/libcrypt/Manifest
@@ -0,0 +1,3 @@
+EBUILD libcrypt-1.ebuild 685 BLAKE2B 7b879493d9b1870c042d78736f151bafe10bd8d12e6d92b80c086c81fc7e370bca55a61028b66db05a697c9bb8845a895e2de2ea326601708e63f10e9e9d5b88 SHA512 0c4e77c2caf678e56ebdcd4c1a9f7aabc9b6f87a4e5cad546b91cd567854098a3f77e622f20da8ab37c34d7b54edb4e3ceb438e20bd33cbb276d678aad7834b8
+EBUILD libcrypt-2.ebuild 657 BLAKE2B 16f1fa289757ffd4f57b3addde906c1ca81ff33310737f7b3e6d2a2a79b79407792a93404b29a4823ded45f8a9e503f6ae49642aebf46d2e8159077d118fc050 SHA512 cfa7b6e061fc1a4a13e380d92dcba55be3d1cff99b27b81dfc4258fe1612b6538266c158c1339ff4a4dc7dd4c357f5767f3b1e932d94b81de0ad0f250238a409
+MISC metadata.xml 261 BLAKE2B caf1cd4155f618105164d2fe3addfb4a06a504d56d9a387830f3b7f2b85864260b891897f0a2a6c56a83f72e2dcc1c66ecba2cfe25cf0dcaa54167cda74a117c SHA512 fd47d9491bf53a7f5b4232a4996dabba1ce2cc74a3fdfea0a7d831e0d3351a42c5d1187a05c8c69410fe91a80b7c3c3c087e08ab1fc5ba6a925c46a105d96ac9
diff --git a/virtual/libcrypt/libcrypt-1.ebuild b/virtual/libcrypt/libcrypt-1.ebuild
new file mode 100644
index 000000000000..2059e2651f55
--- /dev/null
+++ b/virtual/libcrypt/libcrypt-1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for libcrypt.so"
+
+SLOT="0/1"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+static-libs"
+
+RDEPEND="
+	elibc_glibc? (
+		|| (
+			>=sys-libs/glibc-2.30-r2[crypt(-),static-libs(+)?]
+			<sys-libs/glibc-2.30-r2
+		)
+	)
+	elibc_musl? ( sys-libs/musl )
+	elibc_uclibc? ( sys-libs/uclibc-ng )
+	elibc_Cygwin? ( sys-libs/cygwin-crypt )
+"
diff --git a/virtual/libcrypt/libcrypt-2.ebuild b/virtual/libcrypt/libcrypt-2.ebuild
new file mode 100644
index 000000000000..2cf11b679c06
--- /dev/null
+++ b/virtual/libcrypt/libcrypt-2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for libcrypt.so"
+
+SLOT="0/2"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+static-libs"
+
+RDEPEND="
+	elibc_glibc? ( sys-libs/libxcrypt[system(-),static-libs(-)?,${MULTILIB_USEDEP}] )
+	elibc_musl? ( sys-libs/musl )
+	elibc_uclibc? ( sys-libs/uclibc-ng )
+	elibc_Cygwin? ( sys-libs/cygwin-crypt )
+"
diff --git a/virtual/libcrypt/metadata.xml b/virtual/libcrypt/metadata.xml
new file mode 100644
index 000000000000..82cfb159fc00
--- /dev/null
+++ b/virtual/libcrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo base-system Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/virtual/python-pathlib/Manifest b/virtual/python-pathlib/Manifest
index 75b882a446a3..17439e12be21 100644
--- a/virtual/python-pathlib/Manifest
+++ b/virtual/python-pathlib/Manifest
@@ -1,2 +1,2 @@
-EBUILD python-pathlib-1.0.ebuild 448 BLAKE2B adb7261b6808794c059fe583a5becb2fca89a20ad5393a6bae5c20c1f50e50d0e8f4c98ac5a86503e111f1cda071c328f261310cab4590a89ca4064e172bffbb SHA512 d82a13acdc30d84d77ba9d9147f0e394b5caff3ea73426beb9c5dc45ca3cceeffadff557c296cd883a801879733da9410d2a678f607bdc7b07ed15f16880f828
+EBUILD python-pathlib-1.0.ebuild 447 BLAKE2B 3c49a75be482816d12865854bf8868b7a6a2d5cc3b57ea4ea9dece4190895035602c9c6943ed6068f6089c57e200718801c573abe3f12a4e04d590a96ffa6e58 SHA512 27759f140a740ca041d723f4bbdbba80d4b05341fa6edf927dba8187a0cec34310523e9c404a181ae684dcf1f7eba1b02515d9adeca0b0e5157b81946b7204e2
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/virtual/python-pathlib/python-pathlib-1.0.ebuild b/virtual/python-pathlib/python-pathlib-1.0.ebuild
index 253ac446a37f..0b15277770d0 100644
--- a/virtual/python-pathlib/python-pathlib-1.0.ebuild
+++ b/virtual/python-pathlib/python-pathlib-1.0.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
 
 DESCRIPTION="A virtual for Python pathlib module"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index c5eb27fcd3eb..7058276c4b6e 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 11fd95bcf316..9207edf01f4a 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -1,5 +1,7 @@
 AUX mod_http2.conf 154 BLAKE2B b7d38cff9c5b4248d43aa1be55ec4b90fa197213ddd2a8ac3409f69f8e31a7e0a8eb14aab4f2abe1d7ec833896d950d3878020e05100f83ae63a3823b0e91b9d SHA512 85b20350c8abb947c91e2cb462d4cd62f502e6eede3bddd5c10502b61a24396bec57c15d4419d31d4afc857053c1fb2606392023527b7eceea0b10978ce170e5
 DIST mod_http2-1.15.5.tar.gz 1041643 BLAKE2B 59591d919451a96595c8e75155f84e63876e95b13940af5473fe4cf0a29ac91f57d3df22911397de213482c5a81d093ce81ce3835136ace50de0d4f70f2a936a SHA512 6255a46a22e5df6f8fed9ce65079979a3c613cccf1a95559ff0832ab2efe5fb98d51abfe83c006b9a3c7452bb4e78e3e67e94d7c14618fa312c7236a34e6b280
+DIST mod_http2-1.15.6.tar.gz 1028795 BLAKE2B 4f323b00a133de13f547fd5b0402ce48d681289675cfd85dbef25b8432598772ddbb1fa78abd7905c2c4337a41340078efe903fc7cb4203cabdad10f71ef387a SHA512 2d27de99108d444e3095cf84d5ccf1b281bd09e2d2d4c4ba4ecc7b6519119d4d42e9379285bd68ce7f56349a9f27062b516df8b7612df7551a46e8a4b4b634ef
 EBUILD mod_h2-1.15.5.ebuild 888 BLAKE2B 2cbd4a3160621759140fa9f85cedae2592872993b34333717755c71dad209cf385ecd5b746ee19f3de59bfe01510902c89003db7ad37d3d891bb1957e89bbe2c SHA512 0d4ada3ee487031d710cb8e0082243ee80d8e7badad7cb24f24b22d6444fc8b04bb8bd7ec4c126d3f40fae908fffae7751b52a117c21e3da3b18940cf0727e6f
+EBUILD mod_h2-1.15.6.ebuild 888 BLAKE2B d4171c6dd0716f1abc2b1d8fb4cee3f122df146115712c406910b3a60718f6d7bed2a208785ce617d5f03173d6f07214df024a0a8fcdac832775a49688748d6f SHA512 ffe2aab1c735be9ccf6ab510c35c0e05218d495750e75f3c476dd79f160c296f87c1cc956b703c7535b009c2cd32e4c5637cefe45a0fda15174b124aeee71994
 EBUILD mod_h2-9999.ebuild 888 BLAKE2B cc260a4fdbe81d168096723f0e0d135350069cd9b2c9e853b0b7efe351ae96ddbaa9fa5dc219feec73671c496e2ecf2e5b26623e624850de8668088298f6313a SHA512 d0d0980cf07096df9ee3199d0e8aff6b5ce608c1c33348510cd201f8934d21c493f6a6a53884a90a064c852fb4641930c74f3b4493923cce74afbac9d184f9b5
 MISC metadata.xml 325 BLAKE2B 4154e88a0c1eb61e74e41ca0b86a2746d6fa8f0e573c5c8c36a9acc0306306804ce6c9b83834b67ae99476468f9143273f977bf868e06d1bc4b5022dd08b2722 SHA512 8dd16aa1fbf71b64c679cba7dc5759fb51410690fd6e6b77416d3604ea746a00516283510a0b24971aa0f5c08359eba6f5d96fab2f8eebdda7f2ebd8f428a04f
diff --git a/www-apache/mod_h2/mod_h2-1.15.6.ebuild b/www-apache/mod_h2/mod_h2-1.15.6.ebuild
new file mode 100644
index 000000000000..b5be17b7ca7d
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 659775d2a4b2..89cc41781c46 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/curator/Manifest b/www-apps/curator/Manifest
index deff3d5c21a2..d3bb35c8133f 100644
--- a/www-apps/curator/Manifest
+++ b/www-apps/curator/Manifest
@@ -1,3 +1,3 @@
 DIST curator-3.0_pf078f1686a78.tar.xz 408412 BLAKE2B 265827b3e216661810065a0d962c66626f1474ff5d60f4dfbb0ba02acf7f9a9bbac1d350330a9b2bf2d863436440bc32c31572540edd949f0e94b3c29e884955 SHA512 5f6866396762d510319f8f36205ac1caa4468e761431ed1445d57858fab18120da0e3ff38b2aedf6d4d97fc6ed0998a62a3ed55476442b4537a092bc8d435751
-EBUILD curator-3.0_p20110120-r2.ebuild 694 BLAKE2B ed84831a5552c0d7f418c1cc3e8a422313a9dca8720fd3a047a72f53d5b61cc1f27355d62a3632ae1fd1cbfeb203c1e1fdb66b34897d2002710ef4f9b8e41172 SHA512 3609ef82e3809a17ac5da4a43c341013a57197bdc27aff74a41b57a2026888745ca53d69f2789bf7a17bc6f25abb362fbe658fc4b8e72e9de0b1c07008bfd994
+EBUILD curator-3.0_p20110120-r3.ebuild 727 BLAKE2B c5c3f2ad9655ed855b78694050fd61bfd47e9c4181178b245965e89213380002bf6409cff99b14882b668ebda0df88bb4d038d4509605cdf155b6ef4e1e38e67 SHA512 d1c91b17b1e5dd7f98a597667520f74b2db3698a6f5f9ecb59cededd6ed4a63a6e7787d08e602cc93afd71c4579fbb789e0fed3b673ca9cb2864e1dcf7e75bf0
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-apps/curator/curator-3.0_p20110120-r2.ebuild b/www-apps/curator/curator-3.0_p20110120-r2.ebuild
deleted file mode 100644
index 965e48375b6c..000000000000
--- a/www-apps/curator/curator-3.0_p20110120-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Gallery generator"
-HOMEPAGE="http://furius.ca/curator/"
-SRC_URI="mirror://gentoo/curator-3.0_pf078f1686a78.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	dev-python/pillow[${PYTHON_USEDEP}]
-	virtual/imagemagick-tools"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S="${WORKDIR}/curator-3.0_pf078f1686a78"
-
-src_compile() {
-	python_fix_shebang hs/curator-hs
-}
-
-src_install() {
-	dobin hs/curator-hs
-	insinto /usr/share/curator
-	doins -r hs
-}
diff --git a/www-apps/curator/curator-3.0_p20110120-r3.ebuild b/www-apps/curator/curator-3.0_p20110120-r3.ebuild
new file mode 100644
index 000000000000..31738bc61f4f
--- /dev/null
+++ b/www-apps/curator/curator-3.0_p20110120-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Gallery generator"
+HOMEPAGE="http://furius.ca/curator/"
+SRC_URI="mirror://gentoo/curator-3.0_pf078f1686a78.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~mips ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/imagemagick-tools"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S="${WORKDIR}/curator-3.0_pf078f1686a78"
+
+src_compile() {
+	python_fix_shebang hs/curator-hs
+}
+
+src_install() {
+	dobin hs/curator-hs
+	insinto /usr/share/curator
+	doins -r hs
+}
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 3d471d271d51..52bf33ba68da 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -15,13 +15,13 @@ DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d
 DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db
 DIST netbox-2.6.8.tar.gz 2416523 BLAKE2B 1624415302696f47f799f8bd42b827bfdac7866e750ad71cca84a3c095aa39e403036d82257c864f0e4ecc1725087cc1253c73fa26928915e2c53213c3a3852a SHA512 12a094434c66f954cdd356a41123d5e6c2df8ba9aa846731ee439fd0bf330a003ca4b96c8889aef7be2e551c1d518e96c83182168049a76e9cf4ca3104533280
 DIST netbox-2.7.2.tar.gz 4936914 BLAKE2B 905e2667d0637d2edb655efcba1d697eacb097ddd67c8e4586ee2a3ce5a81e4fe98a71f574ae5c732190e03e42fd4cab2f781a30622e79d5e9ea4db7c86de263 SHA512 87753ce955e296d9605e44d5f0df58c14876ca8feda3245dee166fba8a51cbfda7def8da39663570cd0e7c9195cc163d9e877b59027ea1161c7eec33702a3ea4
-EBUILD netbox-2.5.11.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
-EBUILD netbox-2.5.12.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
-EBUILD netbox-2.6.1.ebuild 4245 BLAKE2B 8e04b1ee274fa82d7db31627c12c7fe7038dfd7f79640d2c737dd6a6c9cfed6c1c0eb67b355bd6e96f62a1c7840329adfe86c793efb2fd97a2c71f9e485914fd SHA512 a6d53f3b1fd03b6ee2a6e1eb7cf3da083922277350f21d20ff319d4ff09f8e5692e5f2dcc16e8ac85c198a52be1bba0cd6dc53779fa96241679e7ce1e3c36597
-EBUILD netbox-2.6.4.ebuild 4253 BLAKE2B 4eafb9fe1d6784f8560911f6a3de0e991e1e31be022634faf22ea7191a00e720613c6cb03650fdbb49cb9141abddec60d3548ddbef3ad784a7aeb4223c7537b2 SHA512 4b50e5561d746d668d37e0b1f52c8190aba36fba4dbf06dae12078b890dc5cef7038d6b1e5db107e20897509d0381a5205226c78769ea751e4859ff7c7564622
-EBUILD netbox-2.6.5.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
-EBUILD netbox-2.6.6.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
-EBUILD netbox-2.6.7.ebuild 4253 BLAKE2B a7bc7d7cc3043236a63973544d2ac7051d474b4b4e2e6cb44e617c20bb61e2abe58ef148fc68b715a0d6513f9a89cc734f527eb1aebbbe94457fd0118b270f35 SHA512 025be51114549859ba406276c1af6cd16ac668cb0982d1bd3cbd0ed87a852a3cef6d16ff9a864b4b7fca7e4be442556702ff8e3e985109f2bc4021efd7886d5e
-EBUILD netbox-2.6.8.ebuild 4260 BLAKE2B d97a4b11d73c392787c116c059e14ff6f7f353e312f29db2e3ff4fe5ac9f9b3ed04f5bf0063cf99db1c2c7e491155925f463d5d6d3404b9f9017a06c1d873513 SHA512 87dd3997a6e9bebc80462c9dc3ad2a50b96f869a47f1cb990b5f223db74ba9cc6ed678f067029bae091c32bcbd4828710c034b0b1299aced6b2be81bbf79be84
-EBUILD netbox-2.7.2.ebuild 4212 BLAKE2B fe91ebc782696d72ff03024a58f53e2807e42eefbfa623642ada8ad0ffec1cc4a92d41dcae8cb6c0515114362286d92d43a9df6fc882b8c4a8663e0546e70fac SHA512 241f852796b64706e6ed70cc1d80a3e6ce4fbcad2925b94d565ffed67b80485ece9da38dbe7edeb9c37c598497ad694ecabc6de5653f5f018a4f630395baa975
+EBUILD netbox-2.5.11.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
+EBUILD netbox-2.5.12.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
+EBUILD netbox-2.6.1.ebuild 4449 BLAKE2B 24567d71dfaeeea03349cfa21ce894eedf2ef5ee982163d2e1b26fd589fd57ab8861284f7a3bd0e67e22d276c380e5d3afccc34eb542334c801797bb29e48dc6 SHA512 673f8f45083827a69f5997affc1d688d5e907e7946a5ec9bb91d339735b3f6fb05333ed02d43e5d08c5bbe4ee6cdb1ee5893f0440b7c1ebd62433b0153cda79e
+EBUILD netbox-2.6.4.ebuild 4457 BLAKE2B e13c5ee4a071dfa2b75f22b9369657c5e4fad707fa88c668a91eec55b31a5f00c8c7932de57c202157c8496527e189299095f0654b0fd81abb2299db16efbc12 SHA512 6d8614ce6fa21c0c1126f1bca90eeb96cd872bf7d2bd6c0525eb514584eff02b067104a4a67fc77b012a2f548edf87446188a338c6e984814dd97a65d1a4cbc8
+EBUILD netbox-2.6.5.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff881f8698f84e8ff1d1761c0a3738663dffddba3a0b2ce0ee59570851a66fc9a90d0ab4f0571290ee44522551 SHA512 6a6e6a23548ed6586caaac4a7116c825a4b8359a74918d1bc442c35218c1a0ac6208689e2576ba6c3d29f6a2530fc15b7293ebe2815e281eeac6b642e85cca2f
+EBUILD netbox-2.6.6.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff881f8698f84e8ff1d1761c0a3738663dffddba3a0b2ce0ee59570851a66fc9a90d0ab4f0571290ee44522551 SHA512 6a6e6a23548ed6586caaac4a7116c825a4b8359a74918d1bc442c35218c1a0ac6208689e2576ba6c3d29f6a2530fc15b7293ebe2815e281eeac6b642e85cca2f
+EBUILD netbox-2.6.7.ebuild 4457 BLAKE2B ca5c253c76db4596ac10d782f4d6e51f479e67a4db4417282c6a8d8e976df9930f1724eb5a38bd1d91a2afff8cc10ea76ac71178caf95bfef007e808e657d36c SHA512 dd70ecd8158c2dd8fadc2efe44f8f90cd38bdecbbc229cd299019cd7ae9203b9f3882383f338a7bbc188b97b0ea53a9a4b6e9d7211cf1f72c62791949f16252c
+EBUILD netbox-2.6.8.ebuild 4464 BLAKE2B 920519600bd479d04b245dd011397acfb994a400af5d1bd4de443eddada71dadd681bf76dc682f381159509327f1440a81764efe22ca27f25178bbbfb9946769 SHA512 76003344da3f5d981f688889a7f83670ae4e1acf3cec631bf58493f0260ca194d3160cb22f39a598e8596d7001ca018d5364c76fc6c80681f144f40ae84df55e
+EBUILD netbox-2.7.2.ebuild 4423 BLAKE2B 4ed733407e768ef91371acd3cedd77754d9c81adba34217266e03e856c0c538d38e224976f1023eff0d7b75b38953584fff009bc84aeb8b72d6d78dd7c2ba0e2 SHA512 0fef56af9d20c10e91852a6e20c200947e1caad0c38f34611608a21ab9cc4ed428584b19f74356ba1744c8cd4fbb7741c4132194e9c27e477e96fecf5bbc6f39
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/netbox-2.5.11.ebuild b/www-apps/netbox/netbox-2.5.11.ebuild
index 12b9bd32830f..64de819ea055 100644
--- a/www-apps/netbox/netbox-2.5.11.ebuild
+++ b/www-apps/netbox/netbox-2.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,27 +17,29 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+	')
 	webhooks? ( dev-python/django-rq )"
 DEPEND="${RDEPEND}"
 
diff --git a/www-apps/netbox/netbox-2.5.12.ebuild b/www-apps/netbox/netbox-2.5.12.ebuild
index 12b9bd32830f..64de819ea055 100644
--- a/www-apps/netbox/netbox-2.5.12.ebuild
+++ b/www-apps/netbox/netbox-2.5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,27 +17,29 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-1.11[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.3[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-0.23.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.0[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.14.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-5.3.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.7.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.7.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+	')
 	webhooks? ( dev-python/django-rq )"
 DEPEND="${RDEPEND}"
 
diff --git a/www-apps/netbox/netbox-2.6.1.ebuild b/www-apps/netbox/netbox-2.6.1.ebuild
index f9a76d886c58..04c487ccf5f5 100644
--- a/www-apps/netbox/netbox-2.6.1.ebuild
+++ b/www-apps/netbox/netbox-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.4.ebuild b/www-apps/netbox/netbox-2.6.4.ebuild
index 24d3873dc160..a060ba59442d 100644
--- a/www-apps/netbox/netbox-2.6.4.ebuild
+++ b/www-apps/netbox/netbox-2.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.5.ebuild b/www-apps/netbox/netbox-2.6.5.ebuild
index 4416e86bdeeb..c9b078880e56 100644
--- a/www-apps/netbox/netbox-2.6.5.ebuild
+++ b/www-apps/netbox/netbox-2.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.6.ebuild b/www-apps/netbox/netbox-2.6.6.ebuild
index 4416e86bdeeb..c9b078880e56 100644
--- a/www-apps/netbox/netbox-2.6.6.ebuild
+++ b/www-apps/netbox/netbox-2.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.7.ebuild b/www-apps/netbox/netbox-2.6.7.ebuild
index 5058c6208136..748180d6cc27 100644
--- a/www-apps/netbox/netbox-2.6.7.ebuild
+++ b/www-apps/netbox/netbox-2.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.6.8.ebuild b/www-apps/netbox/netbox-2.6.8.ebuild
index 62bd2ebdc375..233c4920008f 100644
--- a/www-apps/netbox/netbox-2.6.8.ebuild
+++ b/www-apps/netbox/netbox-2.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,31 +17,33 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.1[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.0.15[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.0.6[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-3.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.16.0[${PYTHON_USEDEP},validation]
-	>=dev-python/graphviz-0.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-6.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.3[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.8.2[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )
-	webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/netbox/netbox-2.7.2.ebuild b/www-apps/netbox/netbox-2.7.2.ebuild
index f80801767e3f..0ebfe2a208b8 100644
--- a/www-apps/netbox/netbox-2.7.2.ebuild
+++ b/www-apps/netbox/netbox-2.7.2.ebuild
@@ -19,32 +19,34 @@ RDEPEND="
 acct-group/netbox
 acct-user/netbox
 	${PYTHON_DEPS}
-	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cacheops-4.2[${PYTHON_USEDEP}]
-	>=dev-python/django-cors-headers-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/django-debug-toolbar-2.1[${PYTHON_USEDEP}]
-	>=dev-python/django-filter-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/django-prometheus-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/django-rq-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-tables2-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/django-timezone-field-4.0[${PYTHON_USEDEP}]
-	>=dev-python/djangorestframework-3.10.3[${PYTHON_USEDEP}]
-	>=dev-python/drf-yasg-1.17.0[${PYTHON_USEDEP},validation]
-	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
-	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/psycopg-2.8.4[${PYTHON_USEDEP}]
-	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
-	>=dev-python/pycryptodome-3.9.4[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
-	www-servers/gunicorn[${PYTHON_USEDEP}]
-	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cacheops-4.2[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-cors-headers-3.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-debug-toolbar-2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-filter-2.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-prometheus-1.1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-rq-2.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-tables2-2.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-1.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/django-timezone-field-4.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/djangorestframework-3.10.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/drf-yasg-1.17.0[${PYTHON_MULTI_USEDEP},validation]
+		>=dev-python/jinja-2.10.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
+		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-7.0.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psycopg-2.8.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pycryptodome-3.9.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyyaml-5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/redis-py-3.3.11[${PYTHON_MULTI_USEDEP}]
+		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
+		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
+	')"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index d9fad1c4a947..4f80b2037d13 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,21 +1,7 @@
-DIST nextcloud-15.0.12.tar.bz2 56765490 BLAKE2B 6e0c7c00ff419f0041cf271f747003e40ed641ddb7a71345e49ed2e09a61a872f4bf0b978bb78b9426691c221db4f25d484f9b068dec5da1c4bfe8c1d67f1105 SHA512 0f30b45cc33ba3a0afccdb14f7c1ca171ee63f5a3deae98973ef48806b2b2418a52422b0ed33db1e1b455ddcc4d35169f355418c85e847c8b7b7371ea3da296f
-DIST nextcloud-15.0.13.tar.bz2 56983967 BLAKE2B 2a062df7426cf47a4872eced8e2eff664b16d39a60d6ed962d0720ce56a1ed2e526b6b7b414145ee9e429965076b6e9b0531316c702566a0be7eecca18a89f91 SHA512 638c73e971fe08951f6abf3f5b8d53feecfa0dbeaf57ff5ed9805e1e12d75ac62131af6e2c7b6c91d2c59a55a0722a836e2896a202952d51345897ef5b17e2bb
-DIST nextcloud-15.0.14.tar.bz2 56873105 BLAKE2B 07a733796856d835b800c58f85966afb820fb9b729e0b57242b6ff6e0648372c0633df8f9fcd2141d3ceaca5061c7938c6748a35121a18f6a762a96e0465d114 SHA512 7de64811bc64b13c09e12b69d5e514759047ee94f1d0339a2214ad2373024175d8c32f6b5eaf86489635222b1ae4b454a06df8fcc0b148ef529651e95cdbe401
-DIST nextcloud-16.0.5.tar.bz2 62129676 BLAKE2B 733729f3d36f133cb7fb31e73690a56d8a4507a2fb12437d2061d62194ae8fd437777c32bd6fb0dd652a3a1ce3065b9aec2bdcbd89c2fdc07ea391cdc7f98435 SHA512 ace0e3fa343838e89dba0e1c9411b98c851498107bb34b38376e1f4970a3c1efd6b0c15e2ddceca13c00923c868a5c917aa8d5fd25d61b31f1ab9752e9b65622
-DIST nextcloud-16.0.6.tar.bz2 62110436 BLAKE2B f0cdd447507a6cd5f02718d16604f0a3a77662aebb1909a1f1dbfc33f7b7dcf46e17bb22ae954ccc348f3601c314bc75b43dd627aba5bc28d7b1e205c8c99967 SHA512 7716f6365123162ea106a3d7d80cc4f436f8f1e02d2bcc3ed2e42723bc83040a3d80aa7e9e589bdf7db052c0bf4720f4775e066bcfd84a5c2e7d404d08a8620e
-DIST nextcloud-16.0.7.tar.bz2 62297342 BLAKE2B 0e6724007987a07f66d6be27c55bcc8a6b04da0ad70bc28e16f92e9b39bc1d0f72b59f536aaec8ef1d027d61ce67f8e59f43cd4b44c8dcad2dc572a34a69b189 SHA512 5f45f70f45d1293b3eeaae858ec8dd26f491d5822b918de971d467f3dc10b89b39be61ffebe5e5e5301c95defb50072f675d300cc01a2cff7a269ee777c28445
-DIST nextcloud-17.0.0.tar.bz2 64500339 BLAKE2B 91fdd182347816e69f668dc6558e519556aae38abee1e86230610f6c935e82aaec5f003359c5744aa5d4c4b8299cdeaf2b58736124d3c9fe32b07445a6f4e609 SHA512 d271d6220c72473f0ccc1ca776fb883e0d2cf4e338a7aa0143cce8d8ffeecf825eb5e41d42467d22922995dc6adb2751831158923e0dea29405dbb11bea85b04
-DIST nextcloud-17.0.1.tar.bz2 65252188 BLAKE2B 4f9a675636da18ed10d1b92844612e868a4884abf13b15f956bbee0bfc214989840e3d1a135b399fea3a6a5993f638c180363291543f337d6eba572eed514a33 SHA512 74974cd5d19650ecd3f94a397ecce58fea57d62ab0205f87a108f0a57b5745fbe37d5bf272004d5aefef7c17a43558c219afb5304fb14c569beaa8a5fc5fe00d
-DIST nextcloud-17.0.2.tar.bz2 65475747 BLAKE2B 5d51998e57652b7fb3aebd5486dbb51ad689bcf68cacde0901a8fec854e5f19eac1291d9e2348aa3168b08c33ed13f42ae310c66e38b5d230fa13c26c9861d1b SHA512 ea3788958b37e68c88e03d8a39c0284f14fb82e1e4e20f59df1d6acbdd2eb8a50f791ea48abbe2a91f9fa59de93237763f19ded441973bc2834a64721a210aa1
+DIST nextcloud-16.0.8.tar.bz2 62583505 BLAKE2B 07a228833eca7174722a2264eba5fb26d0cbd3329b3a2bc52df118897f59f535416fae39ebfc8be54f1936fd2546f144ce9775c77c224059934fda0966d7767c SHA512 7f1dc29a318ad456d0f46358bf85128abd916274f90df381b7470be69cc94894fc878b9da59cd93971c2c9f97d22ed54f33a59db1d39f3ca64929011f559d2d2
+DIST nextcloud-17.0.3.tar.bz2 65974151 BLAKE2B 08e5e4c02fa970d9dbb5baa7bfdace73dfef19269db8d30306e6c6e8b537ed8c38c27f062afd886edd5346199d6d0a607b2e28fa5aedab57fb9d3870c482d0d9 SHA512 1d139d4ad2072d4195e5a6be15a814370d1df94e7c82a4759fc18d9dc36cf48ab8e96eb7276c82bd449cd8045d3c52a23b18eed9d937cd5fdbd9bbc516a2740c
 DIST nextcloud-18.0.0.tar.bz2 85867628 BLAKE2B fd070bf259f4f087146707c4c2242fa7e0d587979576bbab0241ffc119afd7402f1afe93dba7ada6a1c272b483567bf08193b4ed9aab775aff846813da1365c4 SHA512 c6a3b2bb2abed416fdebecd0c35b2547298370ef8a3a2cc884da877b39ab4a03d205653d94b20fdc0660fa355966771f65a7c0aa1c2117bb5abc85d2f091d4f7
-EBUILD nextcloud-15.0.12.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-15.0.13.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-15.0.14.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
-EBUILD nextcloud-16.0.5.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-16.0.6.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-16.0.7.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
-EBUILD nextcloud-17.0.0.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-17.0.1.ebuild 1027 BLAKE2B e713c9841b423fe5d6ef280f1bf8a19d4bd34aac47dc9f404b68c0ffc5db703aec1b150800f78c102a5bbc8f5c8b108e40200e4ea263b2253b19b30b07a0d7b0 SHA512 ba52a4071c91c35bed74cd845cf239f2732ffd29d85af2a4b7ebbfa322b192af00048fd0c052ceca9cd262ff003a5debfa44acfeb04710cb572dd802a4e46f92
-EBUILD nextcloud-17.0.2.ebuild 1020 BLAKE2B e3e55ba5589caba6cba6fabf928e57056acee24ca9ab5b2e4ee5f19d6fe027e116da32090427767be5fcebbee12a08ad8ff442562e583e257231357f12cbc720 SHA512 8abfdc3f53e29ab4d6c7db03c3b28a4761ce7764d85944e2134a64109b00bb006ac23695df07436f7dfe7ed79a60568c264372279de9081abf390dacc8819def
+EBUILD nextcloud-16.0.8.ebuild 1020 BLAKE2B c62ab6863b7d15c3be059c29d190078d2f3893facc03c5b0bcd71d60c09feede548c2feac934aedb6a04d9ad653b830eaf48186b92a4660d88e1df34f1c4a7bb SHA512 7ce9ffb9768e72369052dc6f1301bdc56a67aee7cb2dcc65162ca089b222d7e21a2c4202d5982365777860a51ef33c39c8014d0aa779ea1062f86af6705fdda8
+EBUILD nextcloud-17.0.3.ebuild 1020 BLAKE2B c62ab6863b7d15c3be059c29d190078d2f3893facc03c5b0bcd71d60c09feede548c2feac934aedb6a04d9ad653b830eaf48186b92a4660d88e1df34f1c4a7bb SHA512 7ce9ffb9768e72369052dc6f1301bdc56a67aee7cb2dcc65162ca089b222d7e21a2c4202d5982365777860a51ef33c39c8014d0aa779ea1062f86af6705fdda8
 EBUILD nextcloud-18.0.0.ebuild 1020 BLAKE2B c62ab6863b7d15c3be059c29d190078d2f3893facc03c5b0bcd71d60c09feede548c2feac934aedb6a04d9ad653b830eaf48186b92a4660d88e1df34f1c4a7bb SHA512 7ce9ffb9768e72369052dc6f1301bdc56a67aee7cb2dcc65162ca089b222d7e21a2c4202d5982365777860a51ef33c39c8014d0aa779ea1062f86af6705fdda8
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-15.0.12.ebuild b/www-apps/nextcloud/nextcloud-15.0.12.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-15.0.12.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-15.0.13.ebuild b/www-apps/nextcloud/nextcloud-15.0.13.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-15.0.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-15.0.14.ebuild b/www-apps/nextcloud/nextcloud-15.0.14.ebuild
deleted file mode 100644
index 0748d546dffc..000000000000
--- a/www-apps/nextcloud/nextcloud-15.0.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-16.0.5.ebuild b/www-apps/nextcloud/nextcloud-16.0.5.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-16.0.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-16.0.6.ebuild b/www-apps/nextcloud/nextcloud-16.0.6.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-16.0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-16.0.7.ebuild b/www-apps/nextcloud/nextcloud-16.0.7.ebuild
deleted file mode 100644
index 0748d546dffc..000000000000
--- a/www-apps/nextcloud/nextcloud-16.0.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-16.0.8.ebuild b/www-apps/nextcloud/nextcloud-16.0.8.ebuild
new file mode 100644
index 000000000000..34b21dfe1a7c
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-16.0.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-17.0.0.ebuild b/www-apps/nextcloud/nextcloud-17.0.0.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-17.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-17.0.1.ebuild b/www-apps/nextcloud/nextcloud-17.0.1.ebuild
deleted file mode 100644
index 98628f30fd7d..000000000000
--- a/www-apps/nextcloud/nextcloud-17.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-17.0.2.ebuild b/www-apps/nextcloud/nextcloud-17.0.2.ebuild
deleted file mode 100644
index 0748d546dffc..000000000000
--- a/www-apps/nextcloud/nextcloud-17.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Personal cloud that runs on your own server"
-HOMEPAGE="http://nextcloud.com"
-SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
-LICENSE="AGPL-3"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+curl +imagemagick mysql postgres +sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND=""
-RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
-	imagemagick? ( dev-php/pecl-imagick )
-	virtual/httpd-php"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	dodir "${MY_HTDOCSDIR}"/data
-
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
-	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
-
-	webapp_src_install
-}
diff --git a/www-apps/nextcloud/nextcloud-17.0.3.ebuild b/www-apps/nextcloud/nextcloud-17.0.3.ebuild
new file mode 100644
index 000000000000..34b21dfe1a7c
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-17.0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 28072ac626a9..fd475a752da4 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,4 +1,7 @@
+AUX nikola-8.0.4-setup-py.patch 1340 BLAKE2B 7eb27b287eaf588dfc50b21b4be27ec7239a745c2d61ee665d0c4578de4bdbcd5050ae38a2376d2fe7caae0fd41ed62e3e3e0e0bd67ac71a3b66c71c00dd6a6d SHA512 b3d16bd453192bc14208c55d0502192a24577b422fc9ca865512a5693544e238bf15d0bf79ca67bf279a4259e2f70894579f81e3b8ea1914f09bccdcd467b366
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
-EBUILD nikola-7.8.15-r1.ebuild 2336 BLAKE2B 06a8f34a515ae6399a6e0877aea8f12f099da43241c569e923595c18e876468f7c5e5aa939173ad870cb56dd2d73d4a579164fc46942ee47e4284f98d8b5c048 SHA512 4a6d2ea1f357080fc2faf18a2ebe33e058864771caabfc6d603adb8c7240a58e3ec204a4977f5a975dbfb751e732580fc3854deab78d5b0cef7e49427236cc44
+DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf750c4f17dc3bec0df6fd4f462af52a65c0c97a07777922da3bf3fa855d58d546479b19bfb152e8190d2f74524 SHA512 eb6774d11be4eab81fbe41115d80e5d0d38694b734431d5d6355fcd3e3d8ae5ff4a02114c5dd0dbbc9e1ea5a625e9ac2b6b91e82f6e017b4376e4ca8d56cfec7
+EBUILD nikola-7.8.15-r1.ebuild 2310 BLAKE2B e06c418bb41204e0fef07348829e762472f51e572c6bf93800a8fe090dc0f1f50bedd011f1dd3059dc9238458546dead07ce62f84a476dc4d87363a4c798e58c SHA512 59b3cb56629185eb7ab9d3713318d54b443622c0a5c6a9cf93892c752a9cd3e53428989c018869476b5180b148d049ea4d7778ae8fa9f30b8d867f0b00233f10
 EBUILD nikola-7.8.15.ebuild 2434 BLAKE2B 66d90061f9679ee9738861c1a7e0b5cb95aac9954aba8cbdd39ad27468f539391d567f86332ad869e2e2635b10e444a254a37ce473fd13f84f54fceeeff4aa8b SHA512 3cbef0fab73ef77fcd4dfc331e251c86c88d5146d094ce516f019e5efe9bdf34f82c8f6ddf9bd3f9f26c426b85f4bed465d070454f3b49de9005b6a191a59e29
+EBUILD nikola-8.0.4.ebuild 2358 BLAKE2B 9e7285413dd8ac344ffcd670edf947bf53294ebbd57991ba155fbb5792a7fcd9fc844db088797d09d420b275b09711a504aaddc061e1c2078a3607a7a5e846df SHA512 36a184844520c54b1e74c42c0c19d574af5070e5516af8c644f51ecd45261c4aa79eabb44d682a47324893ce0ffa57bd0b07d678ed20e6c732f18151a72efb06
 MISC metadata.xml 1360 BLAKE2B 694323edda02eec1a835c4c8a68a74c960a290ee44d1c95a59b5814fc6a8f6b248aec961ce69519da1a33970fba2868df81ed87155cd3c60193f79e8165c99d2 SHA512 ea8f610d5c5d7d568e29340e12701d652136a344f8aeb32c1df9a6909dc48180c5e9a7a91935c73e4d7df4f13cff82794e301d6a659262c52d8c88773e3b9697
diff --git a/www-apps/nikola/files/nikola-8.0.4-setup-py.patch b/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
new file mode 100644
index 000000000000..8089b4ee8b24
--- /dev/null
+++ b/www-apps/nikola/files/nikola-8.0.4-setup-py.patch
@@ -0,0 +1,47 @@
+From 89bfbfb5bb0ffc823664557ff59f90db03f7b10f Mon Sep 17 00:00:00 2001
+From: Chris Warrick <kwpolska@gmail.com>
+Date: Fri, 7 Feb 2020 13:06:06 +0100
+Subject: [PATCH] =?UTF-8?q?Fix=20#3348=20=E2=80=94=20don=E2=80=99t=20ship?=
+ =?UTF-8?q?=20tests=20to=20site-packages?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ CHANGES.txt | 12 ++++++++++++
+ setup.py    |  2 +-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/CHANGES.txt b/CHANGES.txt
+index e76f24bee..815b37849 100644
+--- a/CHANGES.txt
++++ b/CHANGES.txt
+@@ -1,3 +1,15 @@
++New in master
++============
++
++Features
++--------
++
++Bugfixes
++--------
++
++* Avoid installing ``tests`` package to site-packages, remove it from
++  your environment if it was inadvertently added (Issue #3348)
++
+ New in v8.0.4
+ =============
+ 
+diff --git a/setup.py b/setup.py
+index f6ca027b7..e4f2c7fc7 100755
+--- a/setup.py
++++ b/setup.py
+@@ -105,7 +105,7 @@ def run(self):
+       author='Roberto Alsina and others',
+       author_email='ralsina@netmanagers.com.ar',
+       url='https://getnikola.com/',
+-      packages=find_packages(exclude=('tests',)),
++      packages=find_packages(exclude=('tests', 'tests.*')),
+       license='MIT',
+       keywords='website, blog, static',
+       classifiers=['Development Status :: 5 - Production/Stable',
diff --git a/www-apps/nikola/nikola-7.8.15-r1.ebuild b/www-apps/nikola/nikola-7.8.15-r1.ebuild
index c989d8059c4f..f7d523787787 100644
--- a/www-apps/nikola/nikola-7.8.15-r1.ebuild
+++ b/www-apps/nikola/nikola-7.8.15-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_6 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -32,7 +33,6 @@ RDEPEND="${DEPEND}
 	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
 	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-20.3[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
@@ -58,6 +58,5 @@ src_install() {
 	rm -rv "${D}/usr/share/doc/${PN}" || die
 
 	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
-	gunzip "docs/man/${PN}.1.gz" || die
-	doman "docs/man/${PN}.1"
+	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
 }
diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
new file mode 100644
index 000000000000..abec5ee581f6
--- /dev/null
+++ b/www-apps/nikola/nikola-8.0.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.30.1[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	watchdog? ( ~dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-setup-py.patch
+)
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${D}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
+	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
+}
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 2901d96e5112..a1d13648d846 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -4,9 +4,9 @@ DIST otrs-6.0.3.tar.bz2 24314514 BLAKE2B 97d794d59269d354b28003879bf0d30cc9b0f7a
 DIST otrs-6.0.4.tar.bz2 24355298 BLAKE2B 2f27e7a34b1bad0d58193c834503f051a1a1822afb53dca185ae2f8329d048446acc4e27e823b6f27660c79179bbb48f1976c0b3a6710bc083f791c0a777152c SHA512 23e9a29a6f080c6afa92704d25363687d50073c94192ba81e69ddab55fb9f945a38a5757a4c60c2d46bfc5a0002ca13bbbce1cc0c945f40e23bb864ebc57edd1
 DIST otrs-6.0.5.tar.bz2 24368010 BLAKE2B 20511dfbca16d275a1c4f7f07f8cc9e350c182661c95932f59899400b232612aed95fecac422528e37dd01b772225e78f25464bae40490abd88b391b05ac7b15 SHA512 fe669fb83acef8252cc53b24378757e498201e916a7fc1cb5f509efe777ec2bf36925264a7080f02e50a115285c26429506927390e3b10b35622f3c65a8cd066
 DIST otrs-6.0.7.tar.bz2 24475129 BLAKE2B 595fd84251289ef120b9a35abcde927ef33557adf386dec919e6eb61a973cac3414d148531760f68549a1f0f67faaba258268e761fdfa2be5471a592e96c08b7 SHA512 bb1910a005940f17884da4e8b9b785c9a52aa8a58f434b5c3e65768912b42838d12d69ebb3f7daed2f12dc385829a5a603a1755338d44e0313c35a0a589cbb6f
-EBUILD otrs-5.0.25.ebuild 4116 BLAKE2B acd72a3d46fc25ee805a32df1e13c7a3e724f2a6c2809993aec7870fa4fdea3448375ff371a1ee229dc6f280133b68f059c8f167a2e140dbdea6fa26b6b65bfd SHA512 b388b96afdfe456c560a917b830f617dbd4939c9147a55e3bfb3fa2d487f016093274a86f0cdfcccab0f6c7c549978a58395eb3a15da5a97a15b9ed00bd158cd
-EBUILD otrs-6.0.3.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
-EBUILD otrs-6.0.4.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
-EBUILD otrs-6.0.5.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
-EBUILD otrs-6.0.7.ebuild 4164 BLAKE2B 2a947afa1d5fe3f29e9a9a5a405fc65ed71f3bb41cc0c57615225354cc58e1a783233e9a451623434ad59b60715a4554c700dfa442dc8067974a2af3733782f5 SHA512 74cdde8b76975c4d6f72c68e4363e558a4269dadf13deb39b970e0c9edfb6a70c4cc1258a6c48301afea21b2bd31e7497f22d253ec7e13ef03c5cdb72bea50b1
+EBUILD otrs-5.0.25.ebuild 4106 BLAKE2B d14870896caa76806084bbb7606868f8a9d424d1ddbde0934e888510299b567653d60cac0a148e4bb6404bba54ad919dbce5d0cfacec69dae746cc14413793b7 SHA512 94d66480a4a81bc58075eba5d2347416d4f4ca1027487e05ee91406df49fc435331cf22ec563d7e8a94171179351032857fa289b8b634a84d613b3a29eac3b7a
+EBUILD otrs-6.0.3.ebuild 4153 BLAKE2B feeeffb3f8b0a6d6ecc176c912683f7dbe9ebaab15a8277f909a7bef0febd4f48c55db5409d5d23010f90f4b936ab138b39a789ab051a6988070151b37177f3d SHA512 81793ad7a66ed38ae44905de740d963ba8a5486a56500fedcb74d773bfeacc122593bcc199f445c0cb3bcd9e16960f9337e218e8bd31d1f96fad171fdd5bdd43
+EBUILD otrs-6.0.4.ebuild 4153 BLAKE2B feeeffb3f8b0a6d6ecc176c912683f7dbe9ebaab15a8277f909a7bef0febd4f48c55db5409d5d23010f90f4b936ab138b39a789ab051a6988070151b37177f3d SHA512 81793ad7a66ed38ae44905de740d963ba8a5486a56500fedcb74d773bfeacc122593bcc199f445c0cb3bcd9e16960f9337e218e8bd31d1f96fad171fdd5bdd43
+EBUILD otrs-6.0.5.ebuild 4153 BLAKE2B feeeffb3f8b0a6d6ecc176c912683f7dbe9ebaab15a8277f909a7bef0febd4f48c55db5409d5d23010f90f4b936ab138b39a789ab051a6988070151b37177f3d SHA512 81793ad7a66ed38ae44905de740d963ba8a5486a56500fedcb74d773bfeacc122593bcc199f445c0cb3bcd9e16960f9337e218e8bd31d1f96fad171fdd5bdd43
+EBUILD otrs-6.0.7.ebuild 4154 BLAKE2B 1b9efe65b063a05a13452d79ae50d7d92bd5c634bd6117641d1cb7b882d3d9ca91346860df56dd3054685f0903032dad5cfbf1b2e3cae76212243ba335ed3580 SHA512 6329e8c775efb853a65d7ec0e61fa847b945a5a0f1dd4e63483e020652724db19964ec1456f85f63604d6258f7848c2bb471d7493633b5322a75f77c041fdae6
 MISC metadata.xml 356 BLAKE2B 01ce80250b32ee5bb55945f5753006caa150efe3d771eb5f16eb4ee05e5827ade93ca8d3ba691b08a5a06555d9a8463bbc072662a1c83f838cb94c0a7c32d636 SHA512 f3a9aa7354c5e544f5b904c5b875686c656432f84baf1b769c347057bde6919921fce09162dd6b1eb549fc468e0ac22b0c9709ed52016bfd414e6494f6ba70af
diff --git a/www-apps/otrs/otrs-5.0.25.ebuild b/www-apps/otrs/otrs-5.0.25.ebuild
index 3701f495278f..a21c129d913c 100644
--- a/www-apps/otrs/otrs-5.0.25.ebuild
+++ b/www-apps/otrs/otrs-5.0.25.ebuild
@@ -90,18 +90,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/otrs/otrs-6.0.3.ebuild b/www-apps/otrs/otrs-6.0.3.ebuild
index 3158404230ca..8a49432f6abf 100644
--- a/www-apps/otrs/otrs-6.0.3.ebuild
+++ b/www-apps/otrs/otrs-6.0.3.ebuild
@@ -92,18 +92,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/otrs/otrs-6.0.4.ebuild b/www-apps/otrs/otrs-6.0.4.ebuild
index 3158404230ca..8a49432f6abf 100644
--- a/www-apps/otrs/otrs-6.0.4.ebuild
+++ b/www-apps/otrs/otrs-6.0.4.ebuild
@@ -92,18 +92,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/otrs/otrs-6.0.5.ebuild b/www-apps/otrs/otrs-6.0.5.ebuild
index 3158404230ca..8a49432f6abf 100644
--- a/www-apps/otrs/otrs-6.0.5.ebuild
+++ b/www-apps/otrs/otrs-6.0.5.ebuild
@@ -92,18 +92,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/otrs/otrs-6.0.7.ebuild b/www-apps/otrs/otrs-6.0.7.ebuild
index fa7797934ae0..c1ab3165754a 100644
--- a/www-apps/otrs/otrs-6.0.7.ebuild
+++ b/www-apps/otrs/otrs-6.0.7.ebuild
@@ -93,18 +93,18 @@ src_prepare() {
 	fi
 	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
 		|| die "sed failed"
 
-	sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
+	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
 		|| die "sed failed"
 
 	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \
+		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
 		|| die "sed failed"
 
-	echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
+	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
+		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
 
 	eapply_user
 }
diff --git a/www-apps/trac-mercurial/Manifest b/www-apps/trac-mercurial/Manifest
index 5a8f651a21bd..5eded3b24104 100644
--- a/www-apps/trac-mercurial/Manifest
+++ b/www-apps/trac-mercurial/Manifest
@@ -1,4 +1,4 @@
 DIST TracMercurial-0.12.0.29dev-r10899.tar.gz 26248 BLAKE2B e9734b7fcce215c7929869bd1f857e3bc07026a275c3eee34cd0bddbe06811ee8c190b95934ca118d6680ffe3e7bcd45454ffb3e50a236e406454ba17ff1dcd1 SHA512 bc2ea9676dadc926cb9caf65219924953e36ccdfd2d4a6a8f1fdedc05486578b16972f4cb66bf948737e08160ebe366193a5071f293927f573c940c92fa7e31d
-EBUILD trac-mercurial-0.12.0.29_pre10899-r1.ebuild 598 BLAKE2B 12d2229351cf539f0137d7c2a96f8e48e7196f958ca5144aa34bbb05144a1716dde888630f8cab83298d22877ea5e5ad9f1efd13ee7b522c2ba38e0b31d298f7 SHA512 b0f59a6abefec46871fd52b429a0d9133d1fb5a1d48d283a247449a999463e3513b39aac2351c36e3392694598932b6f0eac7b2bcd39c2f0dbc7815c1aa7b733
-EBUILD trac-mercurial-1.0.0.3_pre20130206-r1.ebuild 626 BLAKE2B 3be90007bd24258b6efd77712461b54fc115bff82f02138bb93734bb330b01e1a05d3c0c2a06671ea2681877bcc4687325456057253e4023fa5996e6d5830a46 SHA512 7661e92f7579a02436748716d2f22ddfa3a2ff90f98dd857441a9a491e43807a73626e6faefa9ace633c9e7293777efeb71964b770fdcda91de90ce43909662c
+EBUILD trac-mercurial-0.12.0.29_pre10899-r2.ebuild 613 BLAKE2B 6b7d81ae2eddc31d146d1f02649ea23d64063f48603b3b3ae42fcd84391e76a4b2060751546eb363d1f7e99cb9dcccfe98b2d5ba1bb7d7c38886426eda8220e1 SHA512 6b15bfbfae0b05e9f83a06401fd2814b77bf9a9426a345cc70056de36b565672be93b0f4f3aa3172779b9053ddfb1c3132e7d283b735973f238aaff14023ef75
+EBUILD trac-mercurial-1.0.0.3_pre20130206-r1.ebuild 640 BLAKE2B a15d8eb34cdceb7ccd140a781c52be8ed759880038f596ee2fcbb41e83125bd483dc95b151e8efe462eb5c1d847be19ddfd341e3aff12e73f9a24552c152b994 SHA512 e830f121ae7220cac568e36091cb9df0b0fb68127c48c8ebabf093cce7ecd40815ffb6db2900e14b98130fbfb15298fd1ef180d26a1f16674b7266ab35362abd
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild
deleted file mode 100644
index e661cc957b68..000000000000
--- a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="TracMercurial"
-MY_P="${MY_PN}-${PV/_pre/dev-r}"
-
-DESCRIPTION="A Mercurial plugin for Trac"
-HOMEPAGE="http://trac.edgewall.org/"
-SRC_URI="https://dev.gentoo.org/~rafaelmartins/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=www-apps/trac-0.12[${PYTHON_USEDEP}]
-	>=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild
new file mode 100644
index 000000000000..705c196994e6
--- /dev/null
+++ b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="TracMercurial"
+MY_P="${MY_PN}-${PV/_pre/dev-r}"
+
+DESCRIPTION="A Mercurial plugin for Trac"
+HOMEPAGE="http://trac.edgewall.org/"
+SRC_URI="https://dev.gentoo.org/~rafaelmartins/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=www-apps/trac-0.12[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-vcs/mercurial-1.1[${PYTHON_MULTI_USEDEP}]
+	')"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
index 9b4f678dd53a..6aa50c5b940c 100644
--- a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
+++ b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 mercurial
@@ -20,8 +21,9 @@ SLOT="0"
 # KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=www-apps/trac-1.0[${PYTHON_USEDEP}]
-		>=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-1.0[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-vcs/mercurial-1.1[${PYTHON_MULTI_USEDEP}]
+	')"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-tags/Manifest b/www-apps/trac-tags/Manifest
index 02181df84271..a7a40ff7f4bb 100644
--- a/www-apps/trac-tags/Manifest
+++ b/www-apps/trac-tags/Manifest
@@ -1,3 +1,3 @@
 DIST trac-tags-0.6.zip 50426 BLAKE2B 843dbf8be57ec04015151368545d0893e2dcdaa9811082d079c34de9ed74270b14144faa53ac661a329e6c06d59ed530e15fe2880667f74d081cb5a2ba5eff02 SHA512 7fb82a5eeaf267defaac24a1b886b0f4be00ee78c39120a4e3703d78aa41a9328a483682826d74ec87bde897d269ed0e96d37ca07c0fe96abd79bdae59ac763b
-EBUILD trac-tags-0.6-r1.ebuild 668 BLAKE2B f78c89969a2b4194e886f35e8fffd003256c1f1b57552b770c8836dd5240a83d6ffc618e0f25d37fde624aafe0b3154bd14aaeadf85c66261dad39a60fe82785 SHA512 c2d37bc4ddd51fce6d7584d2bd7e2a9cbebc0bfd9d65f28f33e6f149dce421ce94b36f4b075b418062feda0456927bdc3c420e43389c6389ad57d3d9c23193e1
+EBUILD trac-tags-0.6-r2.ebuild 693 BLAKE2B e053c70d2f1893f33343ba6d44384449a1eb74ffe033c3fcdb2ad2a5524dae3e1de15d4ec17fc9903cb3bb2d729aec02d0d462d547876b689cb34e1deba42c22 SHA512 f1dedd7903a564f09f8c1928e2ce0388ff0056bc119823d0f9313f95eaa26ca74370f84dd5b9a0a46f06623eeed36ad1cd534330466169595aecb0cb3a0f7913
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/www-apps/trac-tags/trac-tags-0.6-r1.ebuild b/www-apps/trac-tags/trac-tags-0.6-r1.ebuild
deleted file mode 100644
index 43896d792b6f..000000000000
--- a/www-apps/trac-tags/trac-tags-0.6-r1.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_REV="9901"
-MY_DIR="tagsplugin/tags/${PV}"
-
-DESCRIPTION="Tags plugin for Trac"
-HOMEPAGE="http://trac-hacks.org/wiki/TagsPlugin"
-SRC_URI="http://trac-hacks.org/changeset/${MY_REV}/${MY_DIR}?old_path=%2F&format=zip
-	-> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-python/genshi-0.6[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/unzip"
-RDEPEND="${CDEPEND}
-	>=www-apps/trac-0.11[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_DIR}"
diff --git a/www-apps/trac-tags/trac-tags-0.6-r2.ebuild b/www-apps/trac-tags/trac-tags-0.6-r2.ebuild
new file mode 100644
index 000000000000..025d60b0a73f
--- /dev/null
+++ b/www-apps/trac-tags/trac-tags-0.6-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_REV="9901"
+MY_DIR="tagsplugin/tags/${PV}"
+
+DESCRIPTION="Tags plugin for Trac"
+HOMEPAGE="http://trac-hacks.org/wiki/TagsPlugin"
+SRC_URI="http://trac-hacks.org/changeset/${MY_REV}/${MY_DIR}?old_path=%2F&format=zip
+	-> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/genshi-0.6[${PYTHON_MULTI_USEDEP}]
+	')"
+DEPEND="${CDEPEND}
+	app-arch/unzip"
+RDEPEND="${CDEPEND}
+	>=www-apps/trac-0.11[${PYTHON_SINGLE_USEDEP}]"
+
+S="${WORKDIR}/${MY_DIR}"
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index 12f17be3df74..57fa28517667 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -4,6 +4,6 @@ AUX tracd.confd 359 BLAKE2B 5bf14f9828f3eb22c39a27dd20da219032cc3157d45b16a54a0a
 AUX tracd.initd 823 BLAKE2B 4325de1322cda7885539859c2b2ea3d27acaf636bde728c50fcc4c769acec308e6b56d3449109171ce9bdd2bdda9f9364f93c7069debd0a0ecb1009ce0bbf29b SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6
 DIST Trac-1.0.9.tar.gz 3642845 BLAKE2B de0a6fdfc59c5c3f1e795a7e0a006e724491d1d084c9fefcc35185a40430e06ed781c94cf9190d394b943064fd87a34a6fffea7f57c3d4b55b591a6aab5a83ad SHA512 af429db720049ab344ce3c3b430dcf0ab7530013f59ccd2334633de9babc3f31b14829b9b5aa48aa05f614ca72d1d557953c58bbfb93faae2267afeac72e6304
 DIST Trac-1.2.1.tar.gz 6212917 BLAKE2B 6445ec515b295d0fdd3a75e93da853d136f19083b6e87cbe9c856e2502d217c433bfd7f885d8ff45556882e8c99a7d6e966761027f72e32e675278ee83a67eb6 SHA512 0ee008ce0d890873eb6db7eca60e362760c4a4857dd74bda67c30e566dcb5bd64ccd6d5e7317da904e8dcfb7d4a017004d3bb794dd405936c94803b2fcc4829f
-EBUILD trac-1.0.9.ebuild 2858 BLAKE2B eb0ec099e286642749fef941a8ee38cf05c67c3cdc94534a7aa2ea76d70fe0cf1609d2666b09c246688bc18665cc17a9c373593a09db00e7b4ff29d479ca6ea1 SHA512 9050d01f27b70a6738086199239ca4ac6b63aeb7eb1a91fd52f104a669cbc8f63b518248ba50f2de45a09a9d04d75d9d0aca06844c83cb0681eae152960dab6a
-EBUILD trac-1.2.1.ebuild 2535 BLAKE2B cd0067c253874f924768fb49ec7694132c6b51f83850a286a5d1d426e2d1b97b0e6589ef96fe66004cbf93e6cc005dd5de80f4b3604155af4cc41284cf34df70 SHA512 f7868d3cb2f5701359413549236e5716bc8ff6d8414786104aad1dd841abcdb1b70b08ccf7c0bf26f5e2a8ea6acae093d74579203508fccb19a663420ebc63f6
+EBUILD trac-1.0.9-r1.ebuild 2960 BLAKE2B 265020873a4d0e48615176c67b69b5c014bafd64daa1f83015455fc7bd7b772dc1fec63e49a318f6718dd49d857ddd145f611eb32b77143352c333afd03f2b46 SHA512 bc93908766ba71b15df748971a430ea4727147e110a4dca45a8f5ba77346f9fd7a0ac4fb6569b04c3d237b67d3d90738531584d4b5e501dfd9752e1d0d6fcf45
+EBUILD trac-1.2.1-r1.ebuild 2635 BLAKE2B 03e604c12440fc7c8f55d0c2599ce3a361839e599ef672ce7fbac2d2a46580087a9af54c6bbf6dcb00270ea69986c84b85291e6d545ede1382553e39951e225e SHA512 052b5e79aaf4932fc77476715e7962a20d61dc08f10694b216701316e41f4b460984f49b695260d7e9b187fb5ce75f71db194fccab72ed953af5410c2feba487
 MISC metadata.xml 506 BLAKE2B 4b408bc9a05c2bddccf9c733ea9f58c6f2be64f3dc8b04f4a3f3330b3ac21157f3468144a62f6473c253e8e8019c759a3d2bfbd1ad36633c3097bc061b88a8b4 SHA512 06c8b9589b20dfa824822b3129d7f62bc2aaad12f37b16e735604469a94ed51c6c8b57cce53efb1e81d748bae56ae90d74837d60667a4826ac53044e2afdf048
diff --git a/www-apps/trac/trac-1.0.9-r1.ebuild b/www-apps/trac/trac-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..92856efa6ec7
--- /dev/null
+++ b/www-apps/trac/trac-1.0.9-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/genshi[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+		i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_MULTI_USEDEP}] )
+		highlight? (
+			|| (
+				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+				app-text/silvercity
+				app-text/pytextile
+				app-text/enscript
+			)
+		)
+		restructuredtext? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		cgi? ( virtual/httpd-cgi )
+		fastcgi? ( virtual/httpd-fastcgi )
+		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
+		postgres? ( >=dev-python/psycopg-2[${PYTHON_MULTI_USEDEP}] )
+		sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+		subversion? ( dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}] )
+	')
+	"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Tests depend on twill, a broken package
+RESTRICT="test"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+python_install() {
+	if use cgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.cgi
+	fi
+	if use fastcgi; then
+		python_scriptinto "${MY_CGIBINDIR}"
+		python_doscript contrib/cgi-bin/trac.fcgi
+	fi
+	distutils-r1_python_install
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9.ebuild
deleted file mode 100644
index 4925adedf918..000000000000
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	cgi? ( virtual/httpd-cgi )
-	fastcgi? ( virtual/httpd-fastcgi )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# Tests depend on twill, a broken package
-RESTRICT="test"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-python_install() {
-	if use cgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.cgi
-	fi
-	if use fastcgi; then
-		python_scriptinto "${MY_CGIBINDIR}"
-		python_doscript contrib/cgi-bin/trac.fcgi
-	fi
-	distutils-r1_python_install
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-apps/trac/trac-1.2.1-r1.ebuild b/www-apps/trac/trac-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..d80396e3d00d
--- /dev/null
+++ b/www-apps/trac/trac-1.2.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+DISTUTILS_SINGLE_IMPL=Yes
+
+inherit distutils-r1 eutils user webapp
+
+MY_PV=${PV/_p/.post}
+MY_P=Trac-${MY_PV}
+
+DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
+HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
+SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		dev-python/genshi[${PYTHON_MULTI_USEDEP}]
+		dev-python/pytz[${PYTHON_MULTI_USEDEP}]
+		i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_MULTI_USEDEP}] )
+		highlight? (
+			|| (
+				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+				app-text/silvercity
+				app-text/pytextile
+				app-text/enscript
+			)
+		)
+		restructuredtext? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
+		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
+		postgres? ( >=dev-python/psycopg-2[${PYTHON_MULTI_USEDEP}] )
+		sqlite? ( >=dev-db/sqlite-3.3.4:3 )
+		subversion? ( dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}] )
+	')
+	"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+# Tests depend on twill, a broken package
+RESTRICT="test"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+
+	enewgroup tracd
+	enewuser tracd -1 -1 -1 tracd
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	distutils-r1_src_test
+}
+
+python_test() {
+	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_test_all() {
+	if use i18n; then
+		make check
+	fi
+}
+
+# the default src_compile just calls setup.py build
+# currently, this switches i18n catalog compilation based on presence of Babel
+
+src_install() {
+	webapp_src_preinst
+	distutils-r1_src_install
+
+	# project environments might go in here
+	keepdir /var/lib/trac
+
+	# Use this as the egg-cache for tracd
+	dodir /var/lib/trac/egg-cache
+	keepdir /var/lib/trac/egg-cache
+	fowners tracd:tracd /var/lib/trac/egg-cache
+
+	# documentation
+	dodoc -r contrib
+
+	# tracd init script
+	newconfd "${FILESDIR}"/tracd.confd tracd
+	newinitd "${FILESDIR}"/tracd.initd tracd
+
+	for lang in en; do
+		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
+		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
+	done
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+}
diff --git a/www-apps/trac/trac-1.2.1.ebuild b/www-apps/trac/trac-1.2.1.ebuild
deleted file mode 100644
index 94523e6929b7..000000000000
--- a/www-apps/trac/trac-1.2.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="http://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/genshi[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_USEDEP}] )
-	highlight? (
-		|| (
-			dev-python/pygments[${PYTHON_USEDEP}]
-			app-text/silvercity
-			app-text/pytextile
-			app-text/enscript
-		)
-	)
-	restructuredtext? ( dev-python/docutils[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( >=dev-python/psycopg-2[${PYTHON_USEDEP}] )
-	sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-	subversion? ( dev-vcs/subversion[python,${PYTHON_USEDEP}] )
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# Tests depend on twill, a broken package
-RESTRICT="test"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}
diff --git a/www-apps/venus/Manifest b/www-apps/venus/Manifest
index 7a082ed98d20..b8c39b644686 100644
--- a/www-apps/venus/Manifest
+++ b/www-apps/venus/Manifest
@@ -2,6 +2,6 @@ AUX postinstall-en.txt 192 BLAKE2B e64917b92cc44853bca099f672be29b78a58679490dd8
 AUX venus-bsddb3.patch 1366 BLAKE2B a764ee9447dd8034f9b3b50ee4d0fb0e977edb006f861b20a114a1589c38672bb7a16abfc895d64ecb3c9cde6e0ea9f4a8f52adfa879031d27e9675c6da7b32d SHA512 cb3cca0415a9d12356dd85aa1434270612e09153c443a2f207af8d0be53c64e8a87bdd10b3e89b4d5a3fa56334cc691f3c44221078fbe2931c99b6215fc1925d
 AUX venus-xml-utf8.patch 4058 BLAKE2B 03d24dd8265754e006e5083b3aff7c4894fd4cf039c8b7177ff3a25b6529e4da42e1b031837490e1c9af480106b1c4f02297bbee2167f6d07067bcf06d4c2e81 SHA512 1466ec1fabaef90b7907cc7587ff994a8a9d8935eed77c725ebb65b9b86f3daa15d6e0da907ce84ce7090d14c82e1c96739b3a4a7c862bcc22af60cb74e0ad6c
 DIST venus-20100911.tar.bz2 349639 BLAKE2B 386b6b7381b9dbf9515fdad03179a844dcf884a928d291b8a7b3a1897b4f67bec9418e2fec5373f640b5eab7c028671e28ff92e08461f779869b81c0388fd54b SHA512 516a503e1e43e4bf694f007382603d6415bf508f79feb8db55dba533ca9b8b367f922ede84b2ef4ec74684f81ad17919ba754abfe5e79aac51da732ceb8c2897
-EBUILD venus-20100911-r1.ebuild 1558 BLAKE2B efb0c8876dd33ac963d81848f0535ccf9b337cc5e727004f9fbf1d031f9f73eeaf858e1d40c3692e68e52a876ebff9d84d048fd950eeb672936cb4f9f1358dfc SHA512 d58ad99f891ac6cdd93d3dcd608aa65ffe5ed3e2c85c6e47250b523522630e874129c5f1662bb0629ff700612414281fe65aea5f13273fc9f2d6fdd0cd83b93a
-EBUILD venus-20100911-r2.ebuild 1610 BLAKE2B 3a854d9b07ec980ddffd3b819847283652b74d648d7374bb4210e16243cf15ed3f9e93567f5580d448364653a6a26d924c3fdbaef0e0f39f01f91ac8ba00caa1 SHA512 8cd5412a3d3e48b15be10e31142121593f82b07ce6badbcde591b27c866b46360a6b5cef689c5ce4d69813ce9b1b276c6df45a32b8868320a52f707730d847b0
+EBUILD venus-20100911-r3.ebuild 1636 BLAKE2B 8356d1ef984737bdf87be28a1b1ee371dcdd2ea661981a3befb72d1d88201a877928b66fe097306ffcefb4ac952611c871abd4c53ab527d4e3ee123e1943a7fb SHA512 b56a6dbf8b77e477cdaf8eb4760b32f1102f0c7c4c15acda60a2ffae9c34db52058a3bb706b37cbceb59f94fd32df59bb42b053364519b92c98580a520a8c6cd
+EBUILD venus-20100911-r4.ebuild 1688 BLAKE2B 7605112b1e5fbae391d0d8f2ca9ab2c14e836b4206ae7a40ef7d387f4b65922d84444f2a502f356cf441c0251e01c875bc8fc904b81c3864e3fff5b178e580ac SHA512 d141b55ea1f46e7924c299b531f1864a6fb4c6ada1d33c3a0b022e5f5bd2448750af0412af5cc5dba1d78d31baebd53914df97f492aa1cd41498bd4dccd41fee
 MISC metadata.xml 480 BLAKE2B 997ccc6bcd7147a44d4928d558f82170bbb032c57b0dd4d9a7daf5584cbdd66f3733e6bf2d5c5711a843b199552d82f00a4508586ee1de7fb922cdccaeb95db1 SHA512 0caa5f4788096b3eaaa02c6cbc2f0685975e25f95ce1775e330acae28c708a0cf1bf38f31c8384068da0258948ada6ce09c6c864dac680753fb83a0d272d3bc9
diff --git a/www-apps/venus/venus-20100911-r1.ebuild b/www-apps/venus/venus-20100911-r1.ebuild
deleted file mode 100644
index 44d5059cd316..000000000000
--- a/www-apps/venus/venus-20100911-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit webapp python-single-r1
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="A feed aggregator application"
-HOMEPAGE="http://intertwingly.net/code/venus/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="PSF-2.2"
-KEYWORDS="amd64 x86"
-IUSE="django genshi redland test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/utidylib[${PYTHON_USEDEP}]
-	django? ( dev-python/django[${PYTHON_USEDEP}] )
-	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
-	redland? ( dev-python/rdflib[redland,${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/venus-bsddb3.patch
-	eapply_user
-	python_fix_shebang .
-}
-
-src_test() {
-	"${PYTHON}" runtests.py || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS README TODO
-	dodoc -r docs
-
-	python_moduleinto venus
-	python_domodule *.py filters planet
-
-	insinto "${MY_APPDIR}"
-	doins -r themes
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins -r examples
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Installation instructions can be found at /usr/share/doc/${PF}/html/
-		or http://intertwingly.net/code/venus/docs/index.html"
-}
diff --git a/www-apps/venus/venus-20100911-r2.ebuild b/www-apps/venus/venus-20100911-r2.ebuild
deleted file mode 100644
index dd264089df00..000000000000
--- a/www-apps/venus/venus-20100911-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit webapp python-single-r1
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="A feed aggregator application"
-HOMEPAGE="http://intertwingly.net/code/venus/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="PSF-2.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="django genshi redland test"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/utidylib[${PYTHON_USEDEP}]
-	django? ( dev-python/django[${PYTHON_USEDEP}] )
-	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
-	redland? ( dev-python/rdflib[redland,${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/venus-bsddb3.patch
-	"${FILESDIR}"/venus-xml-utf8.patch
-)
-
-src_prepare() {
-	default_src_prepare
-	python_fix_shebang .
-}
-
-src_test() {
-	"${PYTHON}" runtests.py || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS README TODO
-	dodoc -r docs
-
-	python_moduleinto venus
-	python_domodule *.py filters planet
-
-	insinto "${MY_APPDIR}"
-	doins -r themes
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins -r examples
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Installation instructions can be found at /usr/share/doc/${PF}/html/
-		or http://intertwingly.net/code/venus/docs/index.html"
-}
diff --git a/www-apps/venus/venus-20100911-r3.ebuild b/www-apps/venus/venus-20100911-r3.ebuild
new file mode 100644
index 000000000000..228801836103
--- /dev/null
+++ b/www-apps/venus/venus-20100911-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit webapp python-single-r1
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="A feed aggregator application"
+HOMEPAGE="http://intertwingly.net/code/venus/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="PSF-2.2"
+KEYWORDS="amd64 x86"
+IUSE="django genshi redland test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/utidylib[${PYTHON_MULTI_USEDEP}]
+		django? ( dev-python/django[${PYTHON_MULTI_USEDEP}] )
+		genshi? ( dev-python/genshi[${PYTHON_MULTI_USEDEP}] )
+		redland? ( dev-python/rdflib[redland,${PYTHON_MULTI_USEDEP}] )
+	')
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"/${PN}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/venus-bsddb3.patch
+	eapply_user
+	python_fix_shebang .
+}
+
+src_test() {
+	"${PYTHON}" runtests.py || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc AUTHORS README TODO
+	dodoc -r docs
+
+	python_moduleinto venus
+	python_domodule *.py filters planet
+
+	insinto "${MY_APPDIR}"
+	doins -r themes
+
+	insinto "${MY_HOSTROOTDIR}/conf"
+	doins -r examples
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	elog "Installation instructions can be found at /usr/share/doc/${PF}/html/
+		or http://intertwingly.net/code/venus/docs/index.html"
+}
diff --git a/www-apps/venus/venus-20100911-r4.ebuild b/www-apps/venus/venus-20100911-r4.ebuild
new file mode 100644
index 000000000000..cd6f9036e379
--- /dev/null
+++ b/www-apps/venus/venus-20100911-r4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit webapp python-single-r1
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="A feed aggregator application"
+HOMEPAGE="http://intertwingly.net/code/venus/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="PSF-2.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="django genshi redland test"
+RESTRICT="!test? ( test )"
+SLOT="0"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/bsddb3[${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/utidylib[${PYTHON_MULTI_USEDEP}]
+		django? ( dev-python/django[${PYTHON_MULTI_USEDEP}] )
+		genshi? ( dev-python/genshi[${PYTHON_MULTI_USEDEP}] )
+		redland? ( dev-python/rdflib[redland,${PYTHON_MULTI_USEDEP}] )
+	')
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}"/${PN}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/venus-bsddb3.patch
+	"${FILESDIR}"/venus-xml-utf8.patch
+)
+
+src_prepare() {
+	default_src_prepare
+	python_fix_shebang .
+}
+
+src_test() {
+	"${PYTHON}" runtests.py || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc AUTHORS README TODO
+	dodoc -r docs
+
+	python_moduleinto venus
+	python_domodule *.py filters planet
+
+	insinto "${MY_APPDIR}"
+	doins -r themes
+
+	insinto "${MY_HOSTROOTDIR}/conf"
+	doins -r examples
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	elog "Installation instructions can be found at /usr/share/doc/${PF}/html/
+		or http://intertwingly.net/code/venus/docs/index.html"
+}
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
index ba92c9e74b2a..2f2706abff51 100644
--- a/www-apps/viewvc/Manifest
+++ b/www-apps/viewvc/Manifest
@@ -1,3 +1,3 @@
 DIST viewvc-1.1.26.tar.gz 616103 BLAKE2B e622dbf247641ddcdd68d54a8e10168d4b7506c2cb53f6d2e30b9bac36207520cde57d81875e1e0106287da9b4bf312abc2c69b15d206e557cf93a2b26cae446 SHA512 af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e
-EBUILD viewvc-1.1.26.ebuild 2559 BLAKE2B 6ed71fe42d8556438b4946aac14992688d5dcddc28cf3011dab0f1ff3c593f8e46c95d9226a3b6c2f94191e1d233e5e0dccbbb0c7adf237cc5b5a2387e83d220 SHA512 c6997566f74e0804d8b8562568135e9f39423b1368de0d12b36d4b4ce85379e7ee7a43a6140d9740225854ac000dcca105d20023928d4ebf239192b4bab47e78
+EBUILD viewvc-1.1.26-r1.ebuild 2618 BLAKE2B 421d26caf4a49f2f8a3276a54c920a573797d575e60453dda15f49a8bd5e90d418debef0631a3fab1404309258cc998bd099e5a5d9b0f03043971ed2f67211ac SHA512 a6ff0fcfdecb2ecff6a8e3da98490ed28552cac5bf572d2c414b56ac32048321072e2100cd22acbc4ea0d33d3856b8bd55a7a4f6580818b4665eac07f7a0c423
 MISC metadata.xml 558 BLAKE2B 3e08174918193e922abeea23a32ec3b6732d300380cd01aafd3e15476c1c0eba2bdd9e63750c9fe37addd11ea03c03c03f25cf2184b372b14430b583148eba1d SHA512 9623aa98ccf5ab79b5784e6cf7773ffb769ebd2c73847df3be6f0caa1cfaa59c73b5f820b13a02ccbf0398e3e33e20174f5d81c279ec707d5a574fa0cdde24db
diff --git a/www-apps/viewvc/viewvc-1.1.26-r1.ebuild b/www-apps/viewvc/viewvc-1.1.26-r1.ebuild
new file mode 100644
index 000000000000..fa7bfd6b69c2
--- /dev/null
+++ b/www-apps/viewvc/viewvc-1.1.26-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 webapp
+
+WEBAPP_MANUAL_SLOT="yes"
+
+DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
+HOMEPAGE="http://viewvc.org/"
+SRC_URI="http://viewvc.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+	cvs? ( dev-vcs/rcs )
+
+	mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_SINGLE_USEDEP}] )
+	!mod_wsgi? ( virtual/httpd-cgi )
+
+	cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
+
+	$(python_gen_cond_dep '
+		subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_MULTI_USEDEP}] )
+
+		mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_MULTI_USEDEP}] )
+		pygments? (
+			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			app-misc/mime-types
+		)
+	')
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	|| ( cvs subversion )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	webapp_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+
+	find bin/ -type f -print0 | xargs -0 sed -i \
+		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
+		-e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" || die
+
+	sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
+		lib/config.py || die
+
+	sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist || die
+	sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist || die
+	mv conf/viewvc.conf{.dist,} || die
+	mv conf/cvsgraph.conf{.dist,} || die
+
+	python_fix_shebang .
+}
+
+src_install() {
+	webapp_src_preinst
+
+	newbin bin/standalone.py viewvc-standalone-server
+
+	dodoc CHANGES COMMITTERS INSTALL README
+
+	python_moduleinto viewvc
+	python_domodule lib/.
+
+	insinto "${MY_APPDIR}"
+	doins -r templates/
+	doins -r templates-contrib/
+
+	if use mysql; then
+		exeinto "${MY_HOSTROOTDIR}/bin"
+		doexe bin/{*dbadmin,make-database,loginfo-handler}
+	fi
+
+	insinto "${MY_HOSTROOTDIR}/conf"
+	doins conf/{viewvc,cvsgraph}.conf
+
+	exeinto "${MY_CGIBINDIR}"
+	doexe bin/cgi/viewvc.cgi
+	if use mysql; then
+		doexe bin/cgi/query.cgi
+	fi
+
+	exeinto "${MY_CGIBINDIR}"
+	if use mod_wsgi; then
+		doexe bin/wsgi/viewvc.wsgi
+		if use mysql; then
+			doexe bin/wsgi/query.wsgi
+		fi
+	else
+		doexe bin/wsgi/viewvc.fcgi
+		if use mysql; then
+			doexe bin/wsgi/query.fcgi
+		fi
+	fi
+
+	webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+	elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
+}
diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26.ebuild
deleted file mode 100644
index 787b46c03658..000000000000
--- a/www-apps/viewvc/viewvc-1.1.26.ebuild
+++ /dev/null
@@ -1,111 +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 eutils python-single-r1 webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
-HOMEPAGE="http://viewvc.org/"
-SRC_URI="http://viewvc.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	cvs? ( dev-vcs/rcs )
-	subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_USEDEP}] )
-
-	mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_USEDEP}] )
-	!mod_wsgi? ( virtual/httpd-cgi )
-
-	cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
-	mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_USEDEP}] )
-	pygments? (
-		dev-python/pygments[${PYTHON_USEDEP}]
-		app-misc/mime-types
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( cvs subversion )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-
-	find bin/ -type f -print0 | xargs -0 sed -i \
-		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
-		-e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" || die
-
-	sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
-		lib/config.py || die
-
-	sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist || die
-	sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist || die
-	mv conf/viewvc.conf{.dist,} || die
-	mv conf/cvsgraph.conf{.dist,} || die
-
-	python_fix_shebang .
-}
-
-src_install() {
-	webapp_src_preinst
-
-	newbin bin/standalone.py viewvc-standalone-server
-
-	dodoc CHANGES COMMITTERS INSTALL README
-
-	python_moduleinto viewvc
-	python_domodule lib/.
-
-	insinto "${MY_APPDIR}"
-	doins -r templates/
-	doins -r templates-contrib/
-
-	if use mysql; then
-		exeinto "${MY_HOSTROOTDIR}/bin"
-		doexe bin/{*dbadmin,make-database,loginfo-handler}
-	fi
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins conf/{viewvc,cvsgraph}.conf
-
-	exeinto "${MY_CGIBINDIR}"
-	doexe bin/cgi/viewvc.cgi
-	if use mysql; then
-		doexe bin/cgi/query.cgi
-	fi
-
-	exeinto "${MY_CGIBINDIR}"
-	if use mod_wsgi; then
-		doexe bin/wsgi/viewvc.wsgi
-		if use mysql; then
-			doexe bin/wsgi/query.wsgi
-		fi
-	else
-		doexe bin/wsgi/viewvc.fcgi
-		if use mysql; then
-			doexe bin/wsgi/query.fcgi
-		fi
-	fi
-
-	webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 5c0a75c78f01..5f5d3784e8f5 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d0fd3219472b..1a26278fb277 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,12 +1,6 @@
 AUX chromium-77-system-icu.patch 649 BLAKE2B 7910fcb64460ef965eafdd05e98d41d14399fd337ac8f79bcb2c7059fccd61d552ab6efa1dbf8bdcce564716b3d12b41a587077034cb72ef610eff76f4e052d6 SHA512 7413e0cca7102008dd5bee443dcde90be69ef1d0973fee576f70544f0d0a66aa8bc7099e619c89160915d6cd6186384be46ffab4a1d747000133dda9a84e15e5
 AUX chromium-78-protobuf-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0
 AUX chromium-79-gcc-alignas.patch 3039 BLAKE2B 46f9d31944cf27479e3a7f33df5a0b37f11a7a761fa0a413bbbb3195de0fe62e33531f78155de5afefc9de4c051347328b61a3701380d8f8ae8895ca468efc94 SHA512 98f0d1f24acdb7572445210b3d29147e72dee06bc7c09e30320ed17926d70be0f68905682aef8f026481f71b6a98d0c5d6bf4dad87e9517e1a2ca5bd758e87c4
-AUX chromium-79-gcc-ambiguous-nodestructor.patch 1472 BLAKE2B 7222056fa1cbde82e855d3025e7421e75a9605f663216dd56eda49450604b51aa2174e89831edc16e2ec6844e24f5d8960619df2dfefd2f4e7c6a06fdaf4e1f3 SHA512 0bbd97f00d695b39d31c73d9c7b99e4bcb850361d0089520febb7341a1986ad23b4a39a58b4db9ea46223cd6469e4bfdc40f0465f4348fd1c7c045158e2569e3
-AUX chromium-79-gcc-name-clash.patch 6067 BLAKE2B 699196b56a16023635ae16dfc6a65c29c3f6eb6c637e10701e9dedca3efc12170b424f7b460fa634c8eba117bcbf7c7a006df293d9808e85ee1746315f3e1b04 SHA512 470772be050bae777ef16f3a8cf91392646b96307dfd83e7a7a48f57ebd229ff83aa1dab94cf1013d7e74f427e270f981c6f3ff274a52f139c872c1924b12661
-AUX chromium-79-gcc-permissive.patch 3014 BLAKE2B 4b717bd5741e72b9fd0a6dc800abfad65551d540cc95b3c224ac890533aa61dcb194a3117f8e519e546a2e991c6b12b324e5e79b54d5a0daeecdf02138432633 SHA512 8f77343c6dcb19961fa9db3c7672eae08d5e15961bfead1d9504de4cb07a600c4dd03dae73522219a50f0e03171d074fcde715da27a00e0141e40ee0addb8ca1
-AUX chromium-79-icu-65.patch 573 BLAKE2B b716eeb78ac2fe7d32328274b8ea4f79cbc858700de0cb256fddaff35e4c593ddaec3e96469fe371399db112015ffbbbb6fe91fcbf151ca1e412a4104a0ea5f9 SHA512 2503799bd638e2cd521c04b5104081d332177e68c3c22a66a4c8930a6ff0da250893ac9aa5eb30f1a97faf78a2d33b552d69d4393c1f6278ab63e3609edf338d
-AUX chromium-79-include.patch 5476 BLAKE2B 3c5ba004d51f48c3e07f9b7663b79a2573dd3b6beed3e30a7222c10c77e9f0be2b0d57b8b871657aea73d2dec2a394d37f770802414a3861f1bb4b9447905f6a SHA512 59c35e86720786e24e999c32064343220fbb40a4f8dc517b83aeef0cbc0f29042c4ff2ef99db5589eadff6743fb5fa55e5d0128c6490bbfa725e52071398b8c9
-AUX chromium-79-system-hb.patch 643 BLAKE2B 82cf0464a338034e6aae27d842d5571f2d2356c6a967186e992f6487ad9f45355166957444f70d1b1451d4f05a9572a48437c5d2352a6e473329b5dc6cc18d40 SHA512 7b19a7740a12823b4aef1ab60d7e06ca77edaf34af42e9ac2b029b5560c496f6c87dbaf11fa59b950f80b836a9bd97424c8e38d2d26101b4ac9f26befa062038
 AUX chromium-80-gcc-abstract.patch 3165 BLAKE2B 76142cb97cf4ea4b98275de59eabaa673fe54a355744777f7c2859bd04014be80dc5fa2f4d753f1a6185fd4cc8a9709b38ce55b5fcf139c097489e05712a7f1c SHA512 803dfa4fbf1c9a5f04efed57955c8e5694e368e655fafd7b3ad3d161927db6ce026360c27547476580756ff86b1a634607b6e841465a84daf68eb4f7ba7eeba7
 AUX chromium-80-gcc-blink.patch 3288 BLAKE2B c31a35f083945358accdbe97a0c101627413cef1f2c420275a6f87078404e4cd070b52d2ff3466e97859285f19549337251d285280e944becd86e12142310895 SHA512 ed4f507c15a9ebd324f9efbbb1aad042c953e6dbe2b7a129f4e003bb399b6a8c3f61ed5ceb4685329fd9b826c738efd92d86795e21ba6d000e9031ea65558c68
 AUX chromium-80-gcc-incomplete-type.patch 11677 BLAKE2B f0fdec52f628c491acfed9e87c4e542dab90f313cd9526c44ad422deae3ed1b25637aad78c21bda5753aaafe9bcebb5053734c8c664e59e091fb8e5f0c46c790 SHA512 121404b5a07ab066689694d4158fd34d6ee3a4c351c84a0792c01493653f40fea8f51b20ff215475bb45b0e229cc2e53b73d244df59ea716a8b051ac28984b10
@@ -14,20 +8,19 @@ AUX chromium-80-gcc-permissive.patch 1990 BLAKE2B 2aab6ec5beb470a220d53592f6e86b
 AUX chromium-80-gcc-quiche.patch 1351 BLAKE2B 7bd967a9f3cd544368c623d3612632cd2bade48ac2c099c4570d5ead62ba28487e1fa222ee0bfe108f3d4f853744d799d2860f703eae3b7d6d36af77cd328508 SHA512 2f147e77d0737370c5dea8b575c0e631476bbce54a7b1c46d0bffeb56706d6ab695b8a9a7e61402430c57ec1f28668dd6682aa5d32d32762fc3ba1735f37542b
 AUX chromium-80-include.patch 1495 BLAKE2B a5ed4a0df55a24498b3e88c191ecf8f87873b6a8d826f5daa6df3234593d5996257d31c5ce116b078990010633e8e8bbac0e66027329afea3355959d8fae3fa8 SHA512 c73c7af2612b80b110e10fe887cab442aebc1e23bc87cc5819384be9aa0283475fb957e3fd637d6b890411adde38c8206b1f1d998127938808c307bee0636e94
 AUX chromium-80-unbundle-libxml.patch 2990 BLAKE2B 63068fef2333d9d111bfe66a78efd71088c76b08b4e5014b244012df682024ceb0db8441254481189fc449f16cbeab7f650c8cab30f9d37dedf89c2dbea1bae9 SHA512 87ef07a35a103c5b4293301705a09a60199d569fceeab1e3188c7b96067d39f237441209f4448a791dc5675321f609ee5c02fdda1081af38e50adcd15de4e0b6
-AUX chromium-81-clang.patch 692 BLAKE2B da65ab208f0afc82a6fb2e1061cffc700bfef25f0821b34b1d50e7be3f573f2bd629850e74e26a1b1f5ee7bb037d4b9caaef083b07d68bf0d3dd88770db577ed SHA512 ee006e4a8c98576ecfba0b2b76927d1b559d56da19539b3d4f0b630eba64a22a1d9c158724b5b4437cf4bd432f113de7308ab402a5c286a5899a2b1928a78fbe
+AUX chromium-81-fix-browser-frame.patch 1608 BLAKE2B a335b95e1a96c05743edbdae8bf46a3ca16855445ff0901f58c67169c305152f98ce023dcb7588b3e2e41b789e635bb14c704d3871ca3be2e42384ce25554420 SHA512 34921dc146d9a09dcde629cca634eb2104084d1a1e56b20430603fea2f73f3f37e4e74a5558414581cde955df2465b8dc64c1bba5be02fc3e6ddc0a0b87d073c
+AUX chromium-81-gcc-constexpr.patch 717 BLAKE2B 22a13605d2680456614e7ef53fff585b731e21b3504fc8cc5a06d87bf4edba2580a756b878069eefc4cbbc928f1c32e38b808fcb4bb36588bf81ed63d816b0df SHA512 b94847dd15f32b8b2c400eee2b461dd532b0fca8429417b648ed41270175ea7aadbc8a839ddc29c9bac8ff0d52575a696e2cb7f769b34d1ab211e97b29600107
 AUX chromium-81-gcc-noexcept.patch 804 BLAKE2B fde20835e046808b3066b53d57ba754752a1594aef3a153f28c2831721edd832295edb32daa41d27944e48e0bdc4b649b4de5bd6a97d6791be5b5d8a73b77476 SHA512 5708156098e80dd439514273315eeab39fc24938e92b5887a6bb69cd93613ec6814c66a2f24b88f85a83436c2f2a8fca445a368cbf2658cba7d74001ddc30e5b
-AUX chromium-81-gcc-template.patch 1126 BLAKE2B 41f04c54bd9eb7dbc9c995beeac3c485990ccff950867d19171cc2c79bf29f2e9b27aad41dbbd62592113ab446e74d6389995972b92feb8ab742a662dc55ed38 SHA512 2c2e4cb57fc2d3eb67cc864f2aaabaad5861c4433a5d99a9b41a8bc4e2790bf8736b251f18dba9844dbe83180a117a0861fc5c826457472a0956dc8e8746432b
+AUX chromium-81-mojom.patch 11222 BLAKE2B c3338167ca8713e4f41b7b4e22894ad3898442babcfaeccf5cc35d4e847beb2a1e18bd08c3f682dcbd2b6f4942916d93d05669d8f7fefab739c501c8f9d217ac SHA512 04102fba583e21631252f71b18365428cc875883841bdd8ae9b9cdfd502ac4c5bc909eddeacf82a2b9425187d7ace62c6cae7d683dfee1a54ec11e2cd6c7f789
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-compiler-r10.patch 5917 BLAKE2B a16ea6a1eee56a7de06f82e161536dab19a507f675fe8268b5a455bf36b9f5e6c1df02de73b303ab61e33153f06f118e22623d01f654d4a7c88ca8c3f8326401 SHA512 e64f9f75e685868cb8da8851e84362952a18e5dbca674c853a41feb582bdd4dc59219727f2c77440ec2030e21d7b436f144c552c30b2a4960cbe0da32c6f6c5e
-AUX chromium-compiler-r11.patch 6374 BLAKE2B fcb5f785305ba5638b0540d67a18f5f6a3be71a1dd9102b164722e673bb32c92fed67a79dc42577a6c0267795dbbfa1347d4a41c9d58a6d09d4abbe3d1e97993 SHA512 2f11bdde45e08f4a88d4c893df64f6cc0284f34a9095059d45733c6109a14262973f5b74702da5869f45f3385dc6df1f7c3504cf0cd8fed56348ee4e80035658
+AUX chromium-compiler-r11.patch 5942 BLAKE2B 199efeda0e70377193fe5209f580eab6caca6bec1dc0b06fdbca0ecbb70101f6ac8187c26afa4b00bc9116aa8a85e50fbbf8e3a5461a1d6c8d74edb4a4b0a3b3 SHA512 f9080a90d064d72d375ab78250e1f0147856641953adefe09b1dee8771b464b102d6ad02ef7be384d55b0953b9a861fb41973966ad564858a71d85811f5a783f
 AUX chromium-fix-char_traits.patch 355 BLAKE2B 5269c43c4d36dc1cd190aedc04e3172fbef0048484ac7e4db15fffd69009c8ba02f0ed786c64b292fbbcd2409ad70545817cd7d45a2cb51fd76bf72250ca0018 SHA512 85ab70f168f56c01e01bdf210d107bebd7c344e95dcb692a19a0f7883ed6aec5325b38c35cd3c9b37c1915820d5e8d401e8ee92c289436fb8bc8341c3c6007a8
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium-unbundle-zlib-r1.patch 515 BLAKE2B f3263f7450a940449d7edc0aef46a888248e0245a71797435a985fda8ef3c1abb8823a5a363cff1db0e2d09715942322e5d5ae9ab3554a5a3aeb2db748102a97 SHA512 89d62431e11cf8f3b48afdf9a133a8532916d445676de12acb48b0aaca3aa45106e25de399e7ee37a6220b0766c0ea65f10da219d4bb9a7a02275b4364e493ad
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-79.0.3945.130.tar.xz 778319112 BLAKE2B ac6d7c08c34afc4de8383964f76a5eabc9209de185535a27eff2d6934a77d01fd6b07d5c5afb16e9dd936b2650da76d460e8a485ab16f8300144c7de9b3be2bb SHA512 4b5d4769b068f20b8028085a148cbaf31311eeffad0a22c5c0909af273a8e57e077b33cc93331bbeff9165477262eed2e345b2224ac4f76d8bdb79f983596a81
 DIST chromium-80.0.3987.87.tar.xz 801310184 BLAKE2B d051f77b0e6f167632e383e23983531ee1f44f1fce1629f482cf42882c294816bd98c51ad043b5258aa9652a8da14edf278f70fc63f6978c9dfececa547a1fca SHA512 69aebd760d9b8f2c5f4d15a3a144cd4292ffb11b1536af3596f907e730ac64e909d739bb6e9d322a8f56fac75e4f0b2b5c4c36c4fe4bb52147276b5b0dd03620
-DIST chromium-81.0.4040.5.tar.xz 828003840 BLAKE2B 81b3d4b15d5cdc99bcb19ab3745e49b402f00d68a557f58fa3ae0e6b584c28473dba5ca8622373721e54c64760adbf7cb9daae93c1b29336e7f9fc3a387b199f SHA512 47928d6fc022dc0d8b51562c8079baf25aad098f93c52dd4d07d70fa6d9c4b56b4920e163ff3b44d328e741184d5af327394fa56aa36c54509406f2d67e525ed
-EBUILD chromium-79.0.3945.130.ebuild 22703 BLAKE2B c69e08a9bfdd3ec572888a740198cf3a810fa772c024cc42532cfa21ee578d9e28d7bf60b6b092b658663e432cdf355564a57594f50b02f33b8c0398252edccc SHA512 a94ba1b8cff2712134d77f502b9ae33f6125a899e8a894b0bf4141c68f6d12b8ae9cefad38d5056b688079052f021d3a1b71bec6cf89f8eb97ef38ff13d74965
-EBUILD chromium-80.0.3987.87.ebuild 22679 BLAKE2B 8116d9f192a02cb2bb5ed38f5426844144f2426402b3c7cab4a33533c4599815c2a932c20a74b908c674e8c502f7fa26d3d624dc22e92afc7bd4c6787b3604e1 SHA512 60581ba0b19c2ba8f6ea3ca54492cec1372b8f1f6d46ac142c2e9d3eff0ea0fc81db6c04a747eaa3c6427a7a3887db27e641cac6eb69884f65a6af0221ae78dc
-EBUILD chromium-81.0.4040.5.ebuild 22851 BLAKE2B a91a6e251ba432035095980064491632711015501a529d408dd2f2a8d4013c43c92b376858e5dbc5660acb6169ecebb084d67e2511c3b944371fcea3c899f66d SHA512 ed110cea36147c1ce49092b299833b88848d70cb945b76631868e7e5e5113cf726b23d9b077ade2727d1f73c07126489b2c2a494415018d48760f49c75ecc107
+DIST chromium-81.0.4044.9.tar.xz 791346280 BLAKE2B 790a8537a7a2a9cc6c209afb570580cc05a8f85bd0f61c4d8c13765f8d776962833468390b5685caac3d3590be1d602298e79961beded8b0b4a2b5b5ab1dcbc7 SHA512 e9fb98a66cea6b65e25dda55cceb687a3697e3810b32c1f5ddfc8341e3289b9077056898984ea07b4cdbe33f2e651a197cb57fa89d484ad728672282e43ca48f
+EBUILD chromium-80.0.3987.87.ebuild 22678 BLAKE2B 7d79aa727a138908ed29fb5807c81436e890140a8984ba4a28837ccaf6e9eec6d3a0bf5d9c6831b46b57ab0e354168963963815d1a7b16fb409f1c0cd2131d5e SHA512 9c00e99b7d2d139eeddccdbfc88a2f86b09b3562d0877e10d851c40096825ef0d03f63285e6d1780317ebc649257273fcb807a58d11a550484f36f8c22e3c8ab
+EBUILD chromium-81.0.4044.9.ebuild 22833 BLAKE2B cf146dc33a2393e72134155a7379c1e208f85a773ed4afe4de4e8a14661620897e2c166bd298465a00321a19e557806c1ab936e68656250d15ccc3fc2c47bdde SHA512 1bb6ab5cb9b4bb266d7a8729fd12bb04600a5338c44c9f3f0d65549a226be9da525adb320abcb48dee583a494e5d4d8550a5cfa7eaf4d0d1a63d80e0ca56ef3c
 MISC metadata.xml 1456 BLAKE2B cf9ade50335e564cd481d2a9da288ee97d9fe086a948f3226459acc918e9b25d1f61e8384cb4300f9ae253cdd1ea250cdd308784e7cf8fff4b443193e84906d5 SHA512 b0abba4bb13d33ca955db05411a135a66389099ee623c84dcc2ba6f4cd7fe222d5976adbf297767f4bd1e311b765c4500bf43713e5e6daaf0ef45d4fe8894ca7
diff --git a/www-client/chromium/chromium-79.0.3945.130.ebuild b/www-client/chromium/chromium-79.0.3945.130.ebuild
deleted file mode 100644
index 76a0f4f0682a..000000000000
--- a/www-client/chromium/chromium-79.0.3945.130.ebuild
+++ /dev/null
@@ -1,736 +0,0 @@
-# Copyright 2009-2020 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 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.26:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/atk-2.26
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-65:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2016.11.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12-r0
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-util/gn
-	dev-vcs/git
-	>=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
-	closure-compile? ( virtual/jre )
-	virtual/pkgconfig
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-7"
-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.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-compiler-r10.patch"
-	"${FILESDIR}/chromium-fix-char_traits.patch"
-	"${FILESDIR}/chromium-unbundle-zlib-r1.patch"
-	"${FILESDIR}/chromium-77-system-icu.patch"
-	"${FILESDIR}/chromium-78-protobuf-export.patch"
-	"${FILESDIR}/chromium-79-system-hb.patch"
-	"${FILESDIR}/chromium-79-include.patch"
-	"${FILESDIR}/chromium-79-icu-65.patch"
-	"${FILESDIR}/chromium-79-gcc-ambiguous-nodestructor.patch"
-	"${FILESDIR}/chromium-79-gcc-name-clash.patch"
-	"${FILESDIR}/chromium-79-gcc-permissive.patch"
-	"${FILESDIR}/chromium-79-gcc-alignas.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
-			die "At least gcc 8.0 is required"
-		fi
-		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
-		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
-			die "Component build with tcmalloc requires FEATURES=-usersandbox."
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="7G"
-	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/cityhash
-		base/third_party/double_conversion
-		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/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		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/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/boringssl/src/third_party/sike
-		third_party/boringssl/linux-aarch64/crypto/third_party/sike
-		third_party/boringssl/linux-x86_64/crypto/third_party/sike
-		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/jpeg-js
-		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/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/emoji-segmenter
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/nasm
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		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/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		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/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/SPIRV-Tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-7.0
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/unrar
-		third_party/usrsctp
-		third_party/vulkan
-		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
-		tools/grit/third_party/six
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		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)"
-
-	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+=" closure_compile=$(usex closure-compile true false)"
-	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)"
-
-	# 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
-
-	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
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	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 cpu_flags_arm_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"
-
-	# 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
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-}
-
-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 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
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-80.0.3987.87.ebuild b/www-client/chromium/chromium-80.0.3987.87.ebuild
index 1dfd272b3bdf..04dadc95af73 100644
--- a/www-client/chromium/chromium-80.0.3987.87.ebuild
+++ b/www-client/chromium/chromium-80.0.3987.87.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 REQUIRED_USE="component-build? ( !suid )"
diff --git a/www-client/chromium/chromium-81.0.4040.5.ebuild b/www-client/chromium/chromium-81.0.4040.5.ebuild
deleted file mode 100644
index bbe6a457c792..000000000000
--- a/www-client/chromium/chromium-81.0.4040.5.ebuild
+++ /dev/null
@@ -1,743 +0,0 @@
-# Copyright 2009-2020 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 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.26:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/atk-2.26
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-65:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	>=dev-libs/re2-0.2019.08.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12-r0
-		>=media-libs/opus-1.3.1:=
-	)
-	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 )
-"
-DEPEND="${COMMON_DEPEND}
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-util/gn
-	dev-vcs/git
-	>=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
-	closure-compile? ( virtual/jre )
-	virtual/pkgconfig
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-7"
-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.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-compiler-r11.patch"
-	"${FILESDIR}/chromium-fix-char_traits.patch"
-	"${FILESDIR}/chromium-78-protobuf-export.patch"
-	"${FILESDIR}/chromium-79-gcc-alignas.patch"
-	"${FILESDIR}/chromium-80-unbundle-libxml.patch"
-	"${FILESDIR}/chromium-80-gcc-quiche.patch"
-	"${FILESDIR}/chromium-80-gcc-blink.patch"
-	"${FILESDIR}/chromium-81-gcc-template.patch"
-	"${FILESDIR}/chromium-81-gcc-noexcept.patch"
-	"${FILESDIR}/chromium-81-clang.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
-			die "At least gcc 8.0 is required"
-		fi
-		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
-		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
-			die "Component build with tcmalloc requires FEATURES=-usersandbox."
-		fi
-		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
-			if use component-build; then
-				die "Component build with clang requires fuzzer headers."
-			fi
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="7G"
-	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/cityhash
-		base/third_party/double_conversion
-		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/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		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/src/third_party/volk
-		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/axe-core
-		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/jpeg-js
-		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/closure_compiler
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/fabricjs
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/third_party
-		third_party/dom_distiller_js
-		third_party/emoji-segmenter
-		third_party/flatbuffers
-		third_party/freetype
-		third_party/libgifcodec
-		third_party/glslang
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/nasm
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		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/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		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/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/SPIRV-Tools
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-7.0
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
-		third_party/unrar
-		third_party/usrsctp
-		third_party/vulkan
-		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/wuffs
-		third_party/zlib/google
-		tools/grit/third_party/six
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		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)"
-
-	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+=" closure_compile=$(usex closure-compile true false)"
-	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)"
-
-	# 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
-
-	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
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	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 cpu_flags_arm_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"
-
-	# 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
-
-	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
-	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
-	# Explicitly disable ICU data file support for system-icu builds.
-	if use system-icu; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-}
-
-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
-	local branding size
-	for size in 16 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
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-81.0.4044.9.ebuild b/www-client/chromium/chromium-81.0.4044.9.ebuild
new file mode 100644
index 000000000000..b16c58de36f1
--- /dev/null
+++ b/www-client/chromium/chromium-81.0.4044.9.ebuild
@@ -0,0 +1,742 @@
+# Copyright 2009-2020 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 ~arm64 ~x86"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+REQUIRED_USE="component-build? ( !suid )"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.26:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/atk-2.26
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-65:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2019.08.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		>=media-libs/opus-1.3.1:=
+	)
+	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 )
+"
+DEPEND="${COMMON_DEPEND}
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+BDEPEND="
+	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-util/gn
+	dev-vcs/git
+	>=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
+	closure-compile? ( virtual/jre )
+	virtual/pkgconfig
+"
+
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-7"
+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.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-compiler-r11.patch"
+	"${FILESDIR}/chromium-fix-char_traits.patch"
+	"${FILESDIR}/chromium-78-protobuf-export.patch"
+	"${FILESDIR}/chromium-79-gcc-alignas.patch"
+	"${FILESDIR}/chromium-80-gcc-quiche.patch"
+	"${FILESDIR}/chromium-80-gcc-blink.patch"
+	"${FILESDIR}/chromium-81-gcc-noexcept.patch"
+	"${FILESDIR}/chromium-81-gcc-constexpr.patch"
+	"${FILESDIR}/chromium-81-mojom.patch"
+	"${FILESDIR}/chromium-81-fix-browser-frame.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then
+			die "At least gcc 8.0 is required"
+		fi
+		# component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
+		if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
+			die "Component build with tcmalloc requires FEATURES=-usersandbox."
+		fi
+		if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
+			if use component-build; then
+				die "Component build with clang requires fuzzer headers."
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="7G"
+	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/cityhash
+		base/third_party/double_conversion
+		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/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		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/src/third_party/volk
+		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/axe-core
+		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/jpeg-js
+		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/closure_compiler
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/fabricjs
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/third_party
+		third_party/dom_distiller_js
+		third_party/emoji-segmenter
+		third_party/flatbuffers
+		third_party/freetype
+		third_party/libgifcodec
+		third_party/glslang
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/nasm
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		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/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/SPIRV-Tools
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-7.0
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		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/wuffs
+		third_party/zlib/google
+		tools/grit/third_party/six
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		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)"
+
+	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+=" closure_compile=$(usex closure-compile true false)"
+	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)"
+
+	# 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
+
+	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
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	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 cpu_flags_arm_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"
+
+	# 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
+
+	# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
+	append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
+
+	# Explicitly disable ICU data file support for system-icu builds.
+	if use system-icu; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+}
+
+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
+	local branding size
+	for size in 16 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
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch b/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch
deleted file mode 100644
index d43a091b9718..000000000000
--- a/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From af77dc4014ead3d898fdc8a7a70fe5063ac9b102 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Fri, 25 Oct 2019 19:01:29 +0000
-Subject: [PATCH] GCC: use brace-initializer for DohUpgrade vector
-
-Constructing NoDestructor with parenthesis constructor is ambiguous
-in GCC. Use brace-initializer to avoid that problem. This fixes this
-build error:
-
-Bug: 819294
-Change-Id: I00dda42daa1794d11e022f26ac07f92e599d106d
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879910
-Reviewed-by: Eric Orth <ericorth@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#709569}
----
-
-diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc
-index 14997c4..637b6f2 100644
---- a/net/dns/dns_util.cc
-+++ b/net/dns/dns_util.cc
-@@ -144,7 +144,7 @@
-   // DohProviderId histogram suffix list in
-   // tools/metrics/histograms/histograms.xml.
-   static const base::NoDestructor<std::vector<DohUpgradeEntry>>
--      upgradable_servers({
-+      upgradable_servers{{
-           DohUpgradeEntry(
-               "CleanBrowsingAdult",
-               {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1",
-@@ -215,7 +215,7 @@
-               {"9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"},
-               {"dns.quad9.net", "dns9.quad9.net"} /* DoT hostname */,
-               {"https://dns.quad9.net/dns-query", true /* use_post */}),
--      });
-+      }};
-   return *upgradable_servers;
- }
- 
diff --git a/www-client/chromium/files/chromium-79-gcc-name-clash.patch b/www-client/chromium/files/chromium-79-gcc-name-clash.patch
deleted file mode 100644
index 2324f4db7f91..000000000000
--- a/www-client/chromium/files/chromium-79-gcc-name-clash.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From e925deab264e5ebc3c5c13415aa3d44a746e8d45 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Fri, 25 Oct 2019 14:53:51 +0000
-Subject: [PATCH] GCC: avoid clash of WebThemeEngine::ForcedColors with ForcedColors enum class
-
-GCC fails to build because the declaration of the enum class ForcedColors
-clashes with the GetForcedColors method.
-
-Bug: 819294
-Change-Id: I5c7647978d15c771f5372a8c70ac6aeb2284fb2f
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879452
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#709469}
-
-(backported to M79)
----
-
-diff --git a/content/child/webthemeengine_impl_android.cc b/content/child/webthemeengine_impl_android.cc
-index 2e703d6..3759f6c 100644
---- a/content/child/webthemeengine_impl_android.cc
-+++ b/content/child/webthemeengine_impl_android.cc
-@@ -228,7 +228,7 @@ void WebThemeEngineAndroid::Paint(
-       native_theme_extra_params, NativeColorScheme(color_scheme));
- }
- 
--blink::ForcedColors WebThemeEngineAndroid::ForcedColors() const {
-+blink::ForcedColors WebThemeEngineAndroid::GetForcedColors() const {
-   return forced_colors_;
- }
- 
-diff --git a/content/child/webthemeengine_impl_android.h b/content/child/webthemeengine_impl_android.h
-index 0c113a88..95e2744 100644
---- a/content/child/webthemeengine_impl_android.h
-+++ b/content/child/webthemeengine_impl_android.h
-@@ -22,7 +22,7 @@
-              const blink::WebRect& rect,
-              const blink::WebThemeEngine::ExtraParams* extra_params,
-              blink::WebColorScheme color_scheme) override;
--  blink::ForcedColors ForcedColors() const override;
-+  blink::ForcedColors GetForcedColors() const override;
-   void SetForcedColors(const blink::ForcedColors forced_colors) override;
-   blink::PreferredColorScheme PreferredColorScheme() const override;
-   void SetPreferredColorScheme(
-diff --git a/content/child/webthemeengine_impl_default.cc b/content/child/webthemeengine_impl_default.cc
-index 84db298..04af6c6 100644
---- a/content/child/webthemeengine_impl_default.cc
-+++ b/content/child/webthemeengine_impl_default.cc
-@@ -232,7 +232,7 @@
- }
- #endif
- 
--blink::ForcedColors WebThemeEngineDefault::ForcedColors() const {
-+blink::ForcedColors WebThemeEngineDefault::GetForcedColors() const {
-   return ui::NativeTheme::GetInstanceForWeb()->UsesHighContrastColors()
-              ? blink::ForcedColors::kActive
-              : blink::ForcedColors::kNone;
-diff --git a/content/child/webthemeengine_impl_default.h b/content/child/webthemeengine_impl_default.h
-index 73579db..1f08f67 100644
---- a/content/child/webthemeengine_impl_default.h
-+++ b/content/child/webthemeengine_impl_default.h
-@@ -39,7 +39,7 @@
-                                     int32_t vertical_arrow_bitmap_height,
-                                     int32_t horizontal_arrow_bitmap_width);
- #endif
--  blink::ForcedColors ForcedColors() const override;
-+  blink::ForcedColors GetForcedColors() const override;
-   void SetForcedColors(const blink::ForcedColors forced_colors) override;
-   blink::PreferredColorScheme PreferredColorScheme() const override;
-   void SetPreferredColorScheme(
-diff --git a/content/child/webthemeengine_impl_mac.cc b/content/child/webthemeengine_impl_mac.cc
-index 9cb279e..553eedb 100644
---- a/content/child/webthemeengine_impl_mac.cc
-+++ b/content/child/webthemeengine_impl_mac.cc
-@@ -6,7 +6,7 @@
- 
- namespace content {
- 
--blink::ForcedColors WebThemeEngineMac::ForcedColors() const {
-+blink::ForcedColors WebThemeEngineMac::GetForcedColors() const {
-   return forced_colors_;
- }
- 
-diff --git a/content/child/webthemeengine_impl_mac.h b/content/child/webthemeengine_impl_mac.h
-index b3dafa1..c0b66c0 100644
---- a/content/child/webthemeengine_impl_mac.h
-+++ b/content/child/webthemeengine_impl_mac.h
-@@ -13,7 +13,7 @@
-  public:
-   ~WebThemeEngineMac() override {}
- 
--  blink::ForcedColors ForcedColors() const override;
-+  blink::ForcedColors GetForcedColors() const override;
-   void SetForcedColors(const blink::ForcedColors forced_colors) override;
-   blink::PreferredColorScheme PreferredColorScheme() const override;
-   void SetPreferredColorScheme(
-diff --git a/third_party/blink/public/platform/web_theme_engine.h b/third_party/blink/public/platform/web_theme_engine.h
-index d642462..aa2da1b 100644
---- a/third_party/blink/public/platform/web_theme_engine.h
-+++ b/third_party/blink/public/platform/web_theme_engine.h
-@@ -227,7 +227,7 @@
-     return base::nullopt;
-   }
- 
--  virtual ForcedColors ForcedColors() const { return ForcedColors::kNone; }
-+  virtual ForcedColors GetForcedColors() const { return ForcedColors::kNone; }
-   virtual void SetForcedColors(const blink::ForcedColors forced_colors) {}
-   virtual blink::PreferredColorScheme PreferredColorScheme() const {
-     return PreferredColorScheme::kNoPreference;
-diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/blink/renderer/core/css/media_values.cc
-index 045d793..f7c0484 100644
---- a/third_party/blink/renderer/core/css/media_values.cc
-+++ b/third_party/blink/renderer/core/css/media_values.cc
-@@ -221,7 +221,7 @@
- 
- ForcedColors MediaValues::CalculateForcedColors() {
-   if (Platform::Current() && Platform::Current()->ThemeEngine())
--    return Platform::Current()->ThemeEngine()->ForcedColors();
-+    return Platform::Current()->ThemeEngine()->GetForcedColors();
-   else
-     return ForcedColors::kNone;
- }
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
-index 64b0d23..02cce1f 100644
---- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -8625,7 +8625,7 @@
- bool Document::InForcedColorsMode() const {
-   return RuntimeEnabledFeatures::ForcedColorsEnabled() && Platform::Current() &&
-          Platform::Current()->ThemeEngine() &&
--         Platform::Current()->ThemeEngine()->ForcedColors() !=
-+         Platform::Current()->ThemeEngine()->GetForcedColors() !=
-              ForcedColors::kNone;
- }
- 
diff --git a/www-client/chromium/files/chromium-79-gcc-permissive.patch b/www-client/chromium/files/chromium-79-gcc-permissive.patch
deleted file mode 100644
index c42d56985a68..000000000000
--- a/www-client/chromium/files/chromium-79-gcc-permissive.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 528e9a3e1f25bd264549c4c7779748abfd16bb1c Mon Sep 17 00:00:00 2001
-From: Jan Wilken Dörrie <jdoerrie@chromium.org>
-Date: Fri, 18 Oct 2019 11:45:24 +0000
-Subject: [PATCH] Reland "GCC: Fix base::internal::InvokeFuncImpl"
-
-This is a reland of 9293d5c86eec1c34fc00716645400b44a14e764e
-
-Original change's description:
-> GCC: Fix base::internal::InvokeFuncImpl
-> 
-> GCC doesn't like that the Value data member has no out-of-line
-> definition. The problem is triggered specifically only when compiling
-> 
->   components/services/leveldb/leveldb_database_impl.cc
-> 
-> which has lambda functions returning locally-defined classes.
-> 
-> The current code works as-is in C++17 mode which introduces the concept
-> of inline variables, but in C++14 we need either an explicit out-of-line
-> definition or a function member instead of a data member.
-> 
-> Use std::integral_constant for defining the value.
-> 
-> Bug: 819294
-> Change-Id: I5c68e14ce3fa9d8b4d8a2cb42d7f9b53938aabf3
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862451
-> Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
-> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-> Commit-Queue: Jüri Valdmann <juri.valdmann@qt.io>
-> Cr-Commit-Position: refs/heads/master@{#706384}
-
-Bug: 819294
-Change-Id: I3d5a52ddc6815516e2239f9347c60de06bf765a2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865212
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#707329}
----
-
-diff --git a/base/bind.h b/base/bind.h
-index 7a400af..1070ce6 100644
---- a/base/bind.h
-+++ b/base/bind.h
-@@ -187,18 +187,15 @@
- // well-formed. Using `Invoker::Run` with a OnceCallback triggers a
- // static_assert, which is why the ternary expression does not compile.
- // TODO(crbug.com/752720): Remove this indirection once we have `if constexpr`.
--template <bool is_once, typename Invoker>
--struct InvokeFuncImpl;
-+template <typename Invoker>
-+constexpr auto GetInvokeFunc(std::true_type) {
-+  return Invoker::RunOnce;
-+}
- 
- template <typename Invoker>
--struct InvokeFuncImpl<true, Invoker> {
--  static constexpr auto Value = &Invoker::RunOnce;
--};
--
--template <typename Invoker>
--struct InvokeFuncImpl<false, Invoker> {
--  static constexpr auto Value = &Invoker::Run;
--};
-+constexpr auto GetInvokeFunc(std::false_type) {
-+  return Invoker::Run;
-+}
- 
- template <template <typename> class CallbackT,
-           typename Functor,
-@@ -229,7 +226,8 @@
-   // InvokeFuncStorage, so that we can ensure its type matches to
-   // PolymorphicInvoke, to which CallbackType will cast back.
-   using PolymorphicInvoke = typename CallbackType::PolymorphicInvoke;
--  PolymorphicInvoke invoke_func = InvokeFuncImpl<kIsOnce, Invoker>::Value;
-+  PolymorphicInvoke invoke_func =
-+      GetInvokeFunc<Invoker>(std::integral_constant<bool, kIsOnce>());
- 
-   using InvokeFuncStorage = internal::BindStateBase::InvokeFuncStorage;
-   return CallbackType(BindState::Create(
diff --git a/www-client/chromium/files/chromium-79-icu-65.patch b/www-client/chromium/files/chromium-79-icu-65.patch
deleted file mode 100644
index e0732b6ace24..000000000000
--- a/www-client/chromium/files/chromium-79-icu-65.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
-index 5a62770..1fae2aa 100644
---- a/third_party/blink/renderer/core/dom/document.cc
-+++ b/third_party/blink/renderer/core/dom/document.cc
-@@ -6192,7 +6192,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
- 
-   for (unsigned i = 0; i < length;) {
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (c == ':') {
-       if (saw_colon)
-         return ParseQualifiedNameResult(kQNMultipleColons);
diff --git a/www-client/chromium/files/chromium-79-include.patch b/www-client/chromium/files/chromium-79-include.patch
deleted file mode 100644
index 8f2fb56176ae..000000000000
--- a/www-client/chromium/files/chromium-79-include.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From f7c177d35242311ea7a2cf49a0980c61664f27ba Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Fri, 25 Oct 2019 15:07:09 +0000
-Subject: [PATCH] IWYU: include algorithm to use std::lower_bound in ui/gfx/font.cc
-
-Fix GCC build because of missing include:
-../../ui/gfx/font.cc: In function ‘gfx::Font::Weight gfx::FontWeightFromInt(int)’:
-../../ui/gfx/font.cc:114:8: error: no matching function for call to ‘lower_bound(const gfx::Font::Weight*, const gfx::Font::Weight*, int&, gfx::FontWeightFromInt(int)::<lambda(const gfx::Font::Weight&, const int&)>)’
-       });
-        ^
-In file included from /usr/include/c++/8/bits/char_traits.h:39,
-                 from /usr/include/c++/8/string:40,
-                 from ../../ui/gfx/font.h:8,
-                 from ../../ui/gfx/font.cc:5:
-/usr/include/c++/8/bits/stl_algobase.h:984:5: note: candidate: ‘template<class _ForwardIterator, class _Tp> _ForwardIterator std::lower_bound(_ForwardIterator, _ForwardIterator, const _Tp&)’
-     lower_bound(_ForwardIterator __first, _ForwardIterator __last,
-     ^~~~~~~~~~~
-/usr/include/c++/8/bits/stl_algobase.h:984:5: note:   template argument deduction/substitution failed:
-../../ui/gfx/font.cc:114:8: note:   candidate expects 3 arguments, 4 provided
-       });
-        ^
-
-Bug: 819294
-Change-Id: Ic59dcf3a06bdd54d1d426c08a61624873a0ff30c
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879909
-Commit-Queue: Alexei Svitkine <asvitkine@chromium.org>
-Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#709472}
----
-
-diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc
-index 21367fd7..92b159e 100644
---- a/ui/gfx/font.cc
-+++ b/ui/gfx/font.cc
-@@ -4,6 +4,8 @@
- 
- #include "ui/gfx/font.h"
- 
-+#include <algorithm>
-+
- #include "base/strings/utf_string_conversions.h"
- #include "build/build_config.h"
- #include "ui/gfx/platform_font.h"
-
-From 97eb905ba262382bc3583078761c68f4452aea71 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Fri, 25 Oct 2019 09:27:53 +0000
-Subject: [PATCH] IWYU: launch_manager.h uses std::vector
-
-Add #include <vector> for using std::vector. This fixes GCC build.
-
-./../chrome/browser/apps/launch_service/launch_manager.h:46:15: error: ‘vector’ in namespace ‘std’ does not name a template type
-   static std::vector<base::FilePath> GetLaunchFilesFromCommandLine(
-               ^~~~~~
-
-Bug: 819294
-Change-Id: I02ec3a2914a8fbe3aa0041017a0228f4b0ca1ec9
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879289
-Reviewed-by: Alexey Baskakov <loyso@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#709411}
----
-
-diff --git a/chrome/browser/apps/launch_service/launch_manager.h b/chrome/browser/apps/launch_service/launch_manager.h
-index 00aeb9d..76570ea 100644
---- a/chrome/browser/apps/launch_service/launch_manager.h
-+++ b/chrome/browser/apps/launch_service/launch_manager.h
-@@ -6,6 +6,7 @@
- #define CHROME_BROWSER_APPS_LAUNCH_SERVICE_LAUNCH_MANAGER_H_
- 
- #include <string>
-+#include <vector>
- 
- #include "base/macros.h"
- 
-From e7407ce7fa262e9fd1a19dd0957e5a950520ee3a Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Fri, 25 Oct 2019 08:25:45 +0000
-Subject: [PATCH] IWYU: include cstdint in register_context.h as it uses uintptr_t
-
-GCC build fix as build fails with this:
-../../base/profiler/register_context.h:31:1: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
- uintptr_t& AsUintPtr(T* value) {
- ^~~~~~~~~
- intptr_t
-../../base/profiler/register_context.h:110:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
-   uintptr_t stack_pointer;
-   ^~~~~~~~~
-   intptr_t
-../../base/profiler/register_context.h:111:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
-   uintptr_t frame_pointer;
-   ^~~~~~~~~
-   intptr_t
-../../base/profiler/register_context.h:112:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
-   uintptr_t instruction_pointer;
-   ^~~~~~~~~
-   intptr_t
-../../base/profiler/register_context.h:115:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
- inline uintptr_t& RegisterContextStackPointer(RegisterContext* context) {
-        ^~~~~~~~~
-        intptr_t
-../../base/profiler/register_context.h:119:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
- inline uintptr_t& RegisterContextFramePointer(RegisterContext* context) {
-        ^~~~~~~~~
-        intptr_t
-../../base/profiler/register_context.h:123:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’?
- inline uintptr_t& RegisterContextInstructionPointer(RegisterContext* context) {
-        ^~~~~~~~~
-        intptr_t
-
-
-Bug: 819294
-Change-Id: I49567b00a6f021686c52053a22fb9c502c84f1bc
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879908
-Reviewed-by: Mike Wittman <wittman@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#709398}
----
-
-diff --git a/base/profiler/register_context.h b/base/profiler/register_context.h
-index 46c4250..7dd86ff 100644
---- a/base/profiler/register_context.h
-+++ b/base/profiler/register_context.h
-@@ -9,6 +9,7 @@
- #ifndef BASE_PROFILER_REGISTER_CONTEXT_H_
- #define BASE_PROFILER_REGISTER_CONTEXT_H_
- 
-+#include <cstdint>
- #include <type_traits>
- 
- #include "build/build_config.h"
diff --git a/www-client/chromium/files/chromium-79-system-hb.patch b/www-client/chromium/files/chromium-79-system-hb.patch
deleted file mode 100644
index 83e0621777f1..000000000000
--- a/www-client/chromium/files/chromium-79-system-hb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
-index a218d63..6a5bdae 100644
---- a/components/paint_preview/common/subset_font.cc
-+++ b/components/paint_preview/common/subset_font.cc
-@@ -10,11 +10,12 @@
- #include "base/bind.h"
- #include "base/callback.h"
- #include "base/macros.h"
--#include "third_party/harfbuzz-ng/src/src/hb-subset.h"
--#include "third_party/harfbuzz-ng/src/src/hb.h"
- #include "third_party/skia/include/core/SkStream.h"
- #include "third_party/skia/include/core/SkTypeface.h"
- 
-+#include <hb-subset.h>
-+#include <hb.h>
-+
- namespace paint_preview {
- 
- namespace {
diff --git a/www-client/chromium/files/chromium-81-clang.patch b/www-client/chromium/files/chromium-81-clang.patch
deleted file mode 100644
index 8f69b34a0ed3..000000000000
--- a/www-client/chromium/files/chromium-81-clang.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chrome/browser/enterprise_reporting/notification/extension_request_notification.cc b/chrome/browser/enterprise_reporting/notification/extension_request_notification.cc
-index 659efac..38f6ebc 100644
---- a/chrome/browser/enterprise_reporting/notification/extension_request_notification.cc
-+++ b/chrome/browser/enterprise_reporting/notification/extension_request_notification.cc
-@@ -46,7 +46,7 @@ constexpr int kNotificationBodies[] = {
- 
- }  // namespace
- 
--ExtensionRequestNotification::ExtensionRequestNotification() = default;
-+ExtensionRequestNotification::ExtensionRequestNotification() {}
- 
- ExtensionRequestNotification::ExtensionRequestNotification(
-     Profile* profile,
diff --git a/www-client/chromium/files/chromium-81-fix-browser-frame.patch b/www-client/chromium/files/chromium-81-fix-browser-frame.patch
new file mode 100644
index 000000000000..6516e1faf1aa
--- /dev/null
+++ b/www-client/chromium/files/chromium-81-fix-browser-frame.patch
@@ -0,0 +1,35 @@
+From c73968d63c456d4aaf55c5cd439b42403a3bbeb1 Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Mon, 03 Feb 2020 19:53:50 +0000
+Subject: [PATCH] Fix browser frame view not getting a relayout after a state change
+
+views::NonClientView has 2 things: a views::NonClientFrameView and a
+views::ClientView. We were previously only invalidating the layout on
+the ClientView after a state change.  This was causing the browser
+frame to paint as if it were still maximized after restoring from
+a maximized state on Linux.  Invalidating the layout of the frame view
+fixes the issue.
+
+BUG=1046122
+R=sky
+
+Change-Id: I7da525efe1f436564ffffb410afe294e901e5d89
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033759
+Reviewed-by: Scott Violet <sky@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#737890}
+---
+
+diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+index 9abbce8..6c00d49 100644
+--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
++++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+@@ -717,6 +717,8 @@
+   NonClientView* non_client_view = widget->non_client_view();
+   // non_client_view may be NULL, especially during creation.
+   if (non_client_view) {
++    if (non_client_view->frame_view())
++      non_client_view->frame_view()->InvalidateLayout();
+     non_client_view->client_view()->InvalidateLayout();
+     non_client_view->InvalidateLayout();
+   }
diff --git a/www-client/chromium/files/chromium-81-gcc-constexpr.patch b/www-client/chromium/files/chromium-81-gcc-constexpr.patch
new file mode 100644
index 000000000000..a9c1507c078b
--- /dev/null
+++ b/www-client/chromium/files/chromium-81-gcc-constexpr.patch
@@ -0,0 +1,19 @@
+diff --git a/ui/views/layout/layout_types.h b/ui/views/layout/layout_types.h
+index 8f9dbf4..ba118b9 100644
+--- a/ui/views/layout/layout_types.h
++++ b/ui/views/layout/layout_types.h
+@@ -45,12 +45,12 @@ class VIEWS_EXPORT SizeBounds {
+   ~SizeBounds() = default;
+ 
+   constexpr const base::Optional<int>& width() const { return width_; }
+-  constexpr void set_width(base::Optional<int> width) {
++  inline void set_width(base::Optional<int> width) {
+     width_ = std::move(width);
+   }
+ 
+   constexpr const base::Optional<int>& height() const { return height_; }
+-  constexpr void set_height(base::Optional<int> height) {
++  inline void set_height(base::Optional<int> height) {
+     height_ = std::move(height);
+   }
+ 
diff --git a/www-client/chromium/files/chromium-81-gcc-template.patch b/www-client/chromium/files/chromium-81-gcc-template.patch
deleted file mode 100644
index 8553d5f603b3..000000000000
--- a/www-client/chromium/files/chromium-81-gcc-template.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set.h b/third_party/blink/renderer/platform/wtf/list_hash_set.h
-index 7856b7b..76534f6 100644
---- a/third_party/blink/renderer/platform/wtf/list_hash_set.h
-+++ b/third_party/blink/renderer/platform/wtf/list_hash_set.h
-@@ -308,21 +308,16 @@ class ListHashSetNodeBasePointer {
-   NodeType& operator*() const { return *Get(); }
- 
-  private:
--  template <bool = Allocator::kIsGarbageCollected>
-   void SetSafe(NodeType* node) {
--    AsAtomicPtr(&node_)->store(node, std::memory_order_relaxed);
--  }
--  template <>
--  void SetSafe<false>(NodeType* node) {
--    node_ = node;
-+    if ( Allocator::kIsGarbageCollected )
-+      AsAtomicPtr(&node_)->store(node, std::memory_order_relaxed);
-+    else
-+      node_ = node;
-   }
- 
--  template <bool = Allocator::kIsGarbageCollected>
-   NodeType* GetSafe() const {
--    return AsAtomicPtr(&node_)->load(std::memory_order_relaxed);
--  }
--  template <>
--  NodeType* GetSafe<false>() const {
-+    if ( Allocator::kIsGarbageCollected )
-+      return AsAtomicPtr(&node_)->load(std::memory_order_relaxed);
-     return node_;
-   }
- 
diff --git a/www-client/chromium/files/chromium-81-mojom.patch b/www-client/chromium/files/chromium-81-mojom.patch
new file mode 100644
index 000000000000..e6675931fbc8
--- /dev/null
+++ b/www-client/chromium/files/chromium-81-mojom.patch
@@ -0,0 +1,303 @@
+Add missing files in tarball.
+
+diff --git a/chrome/test/data/webui/mojo/OWNERS b/chrome/test/data/webui/mojo/OWNERS
+new file mode 100644
+index 000000000000..08850f421205
+--- /dev/null
++++ b/chrome/test/data/webui/mojo/OWNERS
+@@ -0,0 +1,2 @@
++per-file *.mojom=set noparent
++per-file *.mojom=file://ipc/SECURITY_OWNERS
+diff --git a/chrome/test/data/webui/mojo/foobar.mojom b/chrome/test/data/webui/mojo/foobar.mojom
+new file mode 100644
+index 000000000000..446d365af8fb
+--- /dev/null
++++ b/chrome/test/data/webui/mojo/foobar.mojom
+@@ -0,0 +1,16 @@
++// Copyright 2019 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// Test Mojo interfaces for MojoWebUIControllerBrowserTest.
++
++module test.mojom;
++
++interface Foo {
++  GetFoo() => (string value);
++};
++
++interface Bar {
++  GetBar() => (string value);
++};
++
+diff --git a/chrome/test/data/webui/mojo/mojo_web_ui_controller_browsertest.cc b/chrome/test/data/webui/mojo/mojo_web_ui_controller_browsertest.cc
+new file mode 100644
+index 000000000000..658a54ace278
+--- /dev/null
++++ b/chrome/test/data/webui/mojo/mojo_web_ui_controller_browsertest.cc
+@@ -0,0 +1,253 @@
++// Copyright 2019 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "ui/webui/mojo_web_ui_controller.h"
++
++#include "base/memory/ref_counted_memory.h"
++#include "base/path_service.h"
++#include "base/run_loop.h"
++#include "base/threading/sequenced_task_runner_handle.h"
++#include "chrome/browser/bad_message.h"
++#include "chrome/browser/chrome_browser_interface_binders.h"
++#include "chrome/browser/chrome_content_browser_client.h"
++#include "chrome/browser/ui/browser.h"
++#include "chrome/browser/ui/tabs/tab_strip_model.h"
++#include "chrome/test/base/in_process_browser_test.h"
++#include "chrome/test/data/grit/webui_test_resources.h"
++#include "chrome/test/data/webui/mojo/foobar.mojom.h"
++#include "content/public/browser/render_process_host.h"
++#include "content/public/browser/render_process_host_observer.h"
++#include "content/public/browser/web_contents.h"
++#include "content/public/browser/web_ui_controller_factory.h"
++#include "content/public/browser/web_ui_data_source.h"
++#include "content/public/common/content_client.h"
++#include "content/public/common/url_constants.h"
++#include "content/public/test/browser_test_utils.h"
++#include "content/public/test/no_renderer_crashes_assertion.h"
++#include "content/public/test/test_utils.h"
++#include "services/service_manager/public/cpp/binder_map.h"
++#include "testing/gtest/include/gtest/gtest.h"
++#include "ui/base/resource/resource_bundle.h"
++#include "url/gurl.h"
++
++namespace {
++
++// WebUIController that provides the Foo Mojo API.
++class FooUI : public ui::MojoWebUIController, public ::test::mojom::Foo {
++ public:
++  explicit FooUI(content::WebUI* web_ui)
++      : ui::MojoWebUIController(web_ui), foo_receiver_(this) {
++    content::WebUIDataSource* data_source =
++        content::WebUIDataSource::Create("foo");
++    data_source->SetDefaultResource(IDR_MOJO_WEB_UI_CONTROLLER_TEST_HTML);
++    data_source->DisableContentSecurityPolicy();
++    data_source->AddResourcePath("foobar.mojom-lite.js",
++                                 IDR_FOOBAR_MOJO_LITE_JS);
++    content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
++                                  data_source);
++  }
++
++  void BindInterface(mojo::PendingReceiver<::test::mojom::Foo> receiver) {
++    foo_receiver_.Bind(std::move(receiver));
++  }
++
++  // ::test::mojom::Foo:
++  void GetFoo(GetFooCallback callback) override {
++    std::move(callback).Run("foofoo");
++  }
++
++  WEB_UI_CONTROLLER_TYPE_DECL();
++
++ private:
++  mojo::Receiver<::test::mojom::Foo> foo_receiver_;
++
++  DISALLOW_COPY_AND_ASSIGN(FooUI);
++};
++
++WEB_UI_CONTROLLER_TYPE_IMPL(FooUI)
++
++// WebUIController that provides the Foo and Bar Mojo APIs.
++class FooBarUI : public ui::MojoWebUIController,
++                 public ::test::mojom::Foo,
++                 public ::test::mojom::Bar {
++ public:
++  explicit FooBarUI(content::WebUI* web_ui)
++      : ui::MojoWebUIController(web_ui),
++        foo_receiver_(this),
++        bar_receiver_(this) {
++    content::WebUIDataSource* data_source =
++        content::WebUIDataSource::Create("foobar");
++    data_source->SetDefaultResource(IDR_MOJO_WEB_UI_CONTROLLER_TEST_HTML);
++    data_source->DisableContentSecurityPolicy();
++    data_source->AddResourcePath("foobar.mojom-lite.js",
++                                 IDR_FOOBAR_MOJO_LITE_JS);
++    content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
++                                  data_source);
++  }
++
++  void BindInterface(mojo::PendingReceiver<::test::mojom::Foo> receiver) {
++    foo_receiver_.Bind(std::move(receiver));
++  }
++
++  void BindInterface(mojo::PendingReceiver<::test::mojom::Bar> receiver) {
++    bar_receiver_.Bind(std::move(receiver));
++  }
++
++  // ::test::mojom::Foo:
++  void GetFoo(GetFooCallback callback) override {
++    std::move(callback).Run("foobarfoo");
++  }
++
++  // ::test::mojom::Bar:
++  void GetBar(GetBarCallback callback) override {
++    std::move(callback).Run("foobarbar");
++  }
++
++  WEB_UI_CONTROLLER_TYPE_DECL();
++
++ private:
++  mojo::Receiver<::test::mojom::Foo> foo_receiver_;
++  mojo::Receiver<::test::mojom::Bar> bar_receiver_;
++
++  DISALLOW_COPY_AND_ASSIGN(FooBarUI);
++};
++
++WEB_UI_CONTROLLER_TYPE_IMPL(FooBarUI)
++
++// WebUIControllerFactory that serves our TestWebUIController.
++class TestWebUIControllerFactory : public content::WebUIControllerFactory {
++ public:
++  TestWebUIControllerFactory() = default;
++
++  std::unique_ptr<content::WebUIController> CreateWebUIControllerForURL(
++      content::WebUI* web_ui,
++      const GURL& url) override {
++    if (url.host_piece() == "foo")
++      return std::make_unique<FooUI>(web_ui);
++    if (url.host_piece() == "foobar")
++      return std::make_unique<FooBarUI>(web_ui);
++
++    return nullptr;
++  }
++
++  content::WebUI::TypeID GetWebUIType(content::BrowserContext* browser_context,
++                                      const GURL& url) override {
++    if (url.SchemeIs(content::kChromeUIScheme))
++      return reinterpret_cast<content::WebUI::TypeID>(1);
++
++    return content::WebUI::kNoWebUI;
++  }
++
++  bool UseWebUIForURL(content::BrowserContext* browser_context,
++                      const GURL& url) override {
++    return url.SchemeIs(content::kChromeUIScheme);
++  }
++  bool UseWebUIBindingsForURL(content::BrowserContext* browser_context,
++                              const GURL& url) override {
++    return url.SchemeIs(content::kChromeUIScheme);
++  }
++
++ private:
++  DISALLOW_COPY_AND_ASSIGN(TestWebUIControllerFactory);
++};
++
++}  // namespace
++
++class MojoWebUIControllerBrowserTest : public InProcessBrowserTest {
++ public:
++  MojoWebUIControllerBrowserTest() {
++    factory_ = std::make_unique<TestWebUIControllerFactory>();
++    content::WebUIControllerFactory::RegisterFactory(factory_.get());
++  }
++
++  void SetUpOnMainThread() override {
++    base::FilePath pak_path;
++    ASSERT_TRUE(base::PathService::Get(base::DIR_MODULE, &pak_path));
++    pak_path = pak_path.AppendASCII("browser_tests.pak");
++    ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
++        pak_path, ui::SCALE_FACTOR_NONE);
++
++    content::SetBrowserClientForTesting(&test_content_browser_client_);
++  }
++
++ private:
++  class TestContentBrowserClient : public ChromeContentBrowserClient {
++   public:
++    TestContentBrowserClient() = default;
++    TestContentBrowserClient(const TestContentBrowserClient&) = delete;
++    TestContentBrowserClient& operator=(const TestContentBrowserClient&) =
++        delete;
++    ~TestContentBrowserClient() override = default;
++
++    void RegisterBrowserInterfaceBindersForFrame(
++        content::RenderFrameHost* render_frame_host,
++        service_manager::BinderMapWithContext<content::RenderFrameHost*>* map)
++        override {
++      ChromeContentBrowserClient::RegisterBrowserInterfaceBindersForFrame(
++          render_frame_host, map);
++      chrome::internal::RegisterWebUIControllerInterfaceBinder<
++          ::test::mojom::Bar, FooBarUI>(map);
++      chrome::internal::RegisterWebUIControllerInterfaceBinder<
++          ::test::mojom::Foo, FooUI, FooBarUI>(map);
++    }
++  };
++
++  std::unique_ptr<TestWebUIControllerFactory> factory_;
++
++  TestContentBrowserClient test_content_browser_client_;
++};
++
++// Attempting to access bindings succeeds for 2 allowed interfaces.
++IN_PROC_BROWSER_TEST_F(MojoWebUIControllerBrowserTest, BindingsAccess) {
++  content::WebContents* web_contents =
++      browser()->tab_strip_model()->GetActiveWebContents();
++
++  ASSERT_TRUE(NavigateToURL(web_contents, content::GetWebUIURL("foobar")));
++
++  EXPECT_EQ("foobarfoo",
++            content::EvalJs(web_contents,
++                            "(async () => {"
++                            "  let fooRemote = test.mojom.Foo.getRemote(true);"
++                            "  let resp = await fooRemote.getFoo();"
++                            "  return resp.value;"
++                            "})()"));
++
++  EXPECT_EQ("foobarbar",
++            content::EvalJs(web_contents,
++                            "(async () => {"
++                            "  let barRemote = test.mojom.Bar.getRemote(true);"
++                            "  let resp = await barRemote.getBar();"
++                            "  return resp.value;"
++                            "})()"));
++}
++
++// Attempting to access bindings crashes the renderer when access not allowed.
++IN_PROC_BROWSER_TEST_F(MojoWebUIControllerBrowserTest,
++                       BindingsAccessViolation) {
++  content::WebContents* web_contents =
++      browser()->tab_strip_model()->GetActiveWebContents();
++
++  ASSERT_TRUE(NavigateToURL(web_contents, content::GetWebUIURL("foo")));
++
++  EXPECT_EQ("foofoo",
++            content::EvalJs(web_contents,
++                            "(async () => {"
++                            "  let fooRemote = test.mojom.Foo.getRemote(true);"
++                            "  let resp = await fooRemote.getFoo();"
++                            "  return resp.value;"
++                            "})()"));
++
++  content::ScopedAllowRendererCrashes allow;
++
++  // Attempt to get a remote for a disallowed interface.
++  EXPECT_FALSE(
++      content::EvalJs(web_contents,
++                      "(async () => {"
++                      "  let barRemote = test.mojom.Bar.getRemote(true);"
++                      "  let resp = await barRemote.getBar();"
++                      "  return resp.value;"
++                      "})()")
++          .error.empty());
++  EXPECT_TRUE(web_contents->IsCrashed());
++}
+diff --git a/chrome/test/data/webui/mojo/mojo_web_ui_controller_test.html b/chrome/test/data/webui/mojo/mojo_web_ui_controller_test.html
+new file mode 100644
+index 000000000000..4638ebc261c7
+--- /dev/null
++++ b/chrome/test/data/webui/mojo/mojo_web_ui_controller_test.html
+@@ -0,0 +1,6 @@
++<html>
++<head>
++<script src="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js"></script>
++<script src="/foobar.mojom-lite.js"></script>
++</head>
++</html>
diff --git a/www-client/chromium/files/chromium-compiler-r11.patch b/www-client/chromium/files/chromium-compiler-r11.patch
index f910d6fe2d54..f1b958a1170d 100644
--- a/www-client/chromium/files/chromium-compiler-r11.patch
+++ b/www-client/chromium/files/chromium-compiler-r11.patch
@@ -1,17 +1,17 @@
-From b29cbcb0ff75b564f83ad93273e881e242f08caf Mon Sep 17 00:00:00 2001
+From 137de121a36f9349ad8435fee57940facef82878 Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 22 Jan 2020 09:05:36 +0000
+Date: Thu, 6 Feb 2020 07:46:57 +0000
 Subject: [PATCH] Disable various compiler configs
 
 ---
- build/config/compiler/BUILD.gn | 75 ++++++++++++----------------------
- 1 file changed, 25 insertions(+), 50 deletions(-)
+ build/config/compiler/BUILD.gn | 64 +++++++++++++---------------------
+ 1 file changed, 25 insertions(+), 39 deletions(-)
 
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 1455a9f..cf19679 100644
+index eef1140..b34b55b 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -270,8 +270,6 @@ config("compiler") {
+@@ -260,8 +260,6 @@ config("compiler") {
  
    configs += [
      # See the definitions below.
@@ -20,7 +20,7 @@ index 1455a9f..cf19679 100644
      ":compiler_codegen",
      ":compiler_deterministic",
    ]
-@@ -496,31 +494,6 @@ config("compiler") {
+@@ -486,20 +484,6 @@ config("compiler") {
      }
    }
  
@@ -36,23 +36,12 @@ index 1455a9f..cf19679 100644
 -      "-Xclang",
 -      "-instcombine-lower-dbg-declare=0",
 -    ]
--
--    if (llvm_force_head_revision) {
--      # Before Clang 10, lax vector conversions were allowed by default.
--      # Chromium currently relies on this behavior.
--      # TODO(crbug.com/1042470): Fix the code and remove this flag.
--      if (is_win) {
--        cflags += [ "/clang:-flax-vector-conversions=all" ]
--      } else if (cros_sdk_version == "") {
--        cflags += [ "-flax-vector-conversions=all" ]
--      }
--    }
 -  }
 -
    # C11/C++11 compiler flags setup.
    # ---------------------------
    if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
-@@ -1467,6 +1440,12 @@ config("default_warnings") {
+@@ -1446,6 +1430,12 @@ config("default_warnings") {
          cflags_cc += [ "-Wno-class-memaccess" ]
        }
  
@@ -65,7 +54,7 @@ index 1455a9f..cf19679 100644
        # -Wunused-local-typedefs is broken in gcc,
        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
        cflags += [ "-Wno-unused-local-typedefs" ]
-@@ -1592,7 +1571,7 @@ config("chromium_code") {
+@@ -1560,7 +1550,7 @@ config("chromium_code") {
        defines = [ "_HAS_NODISCARD" ]
      }
    } else {
@@ -74,7 +63,7 @@ index 1455a9f..cf19679 100644
      if (treat_warnings_as_errors) {
        cflags += [ "-Werror" ]
  
-@@ -1601,10 +1580,6 @@ config("chromium_code") {
+@@ -1569,10 +1559,6 @@ config("chromium_code") {
        # well.
        ldflags = [ "-Werror" ]
      }
@@ -85,7 +74,7 @@ index 1455a9f..cf19679 100644
  
      # In Chromium code, we define __STDC_foo_MACROS in order to get the
      # C99 macros on Mac and Linux.
-@@ -1613,15 +1588,6 @@ config("chromium_code") {
+@@ -1581,15 +1567,6 @@ config("chromium_code") {
        "__STDC_FORMAT_MACROS",
      ]
  
@@ -101,7 +90,7 @@ index 1455a9f..cf19679 100644
      if (is_mac) {
        cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
        cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2025,7 +1991,8 @@ config("default_stack_frames") {
+@@ -1993,7 +1970,8 @@ config("default_stack_frames") {
  }
  
  # Default "optimization on" config.
@@ -111,7 +100,7 @@ index 1455a9f..cf19679 100644
    if (is_win) {
      # TODO(thakis): Remove is_clang here, https://crbug.com/598772
      if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -2051,7 +2018,8 @@ config("optimize") {
+@@ -2019,7 +1997,8 @@ config("optimize") {
  }
  
  # Same config as 'optimize' but without the WPO flag.
@@ -121,7 +110,7 @@ index 1455a9f..cf19679 100644
    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.
-@@ -2074,7 +2042,8 @@ config("optimize_no_wpo") {
+@@ -2042,7 +2021,8 @@ config("optimize_no_wpo") {
  }
  
  # Turn off optimizations.
@@ -131,7 +120,7 @@ index 1455a9f..cf19679 100644
    if (is_win) {
      cflags = [
        "/Od",  # Disable optimization.
-@@ -2108,7 +2077,8 @@ config("no_optimize") {
+@@ -2076,7 +2056,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.
@@ -141,7 +130,7 @@ index 1455a9f..cf19679 100644
    if (is_nacl && is_nacl_irt) {
      # The NaCl IRT is a special case and always wants its own config.
      # Various components do:
-@@ -2147,7 +2117,8 @@ config("optimize_max") {
+@@ -2115,7 +2096,8 @@ config("optimize_max") {
  #
  # TODO(crbug.com/621335) - rework how all of these configs are related
  # so that we don't need this disclaimer.
@@ -151,7 +140,7 @@ index 1455a9f..cf19679 100644
    if (is_nacl && is_nacl_irt) {
      # The NaCl IRT is a special case and always wants its own config.
      # Various components do:
-@@ -2177,7 +2148,8 @@ config("optimize_speed") {
+@@ -2145,7 +2127,8 @@ config("optimize_speed") {
    }
  }
  
@@ -161,7 +150,7 @@ index 1455a9f..cf19679 100644
    cflags = [ "-O1" ] + common_optimize_on_cflags
    ldflags = common_optimize_on_ldflags
    visibility = [ ":default_optimization" ]
-@@ -2293,7 +2265,8 @@ config("win_pdbaltpath") {
+@@ -2261,7 +2244,8 @@ config("win_pdbaltpath") {
  }
  
  # Full symbols.
@@ -171,7 +160,7 @@ index 1455a9f..cf19679 100644
    if (is_win) {
      if (use_goma || is_clang) {
        # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2403,7 +2376,8 @@ config("symbols") {
+@@ -2371,7 +2355,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.
@@ -181,7 +170,7 @@ index 1455a9f..cf19679 100644
    if (is_win) {
      # Functions, files, and line tables only.
      cflags = []
-@@ -2458,7 +2432,8 @@ config("minimal_symbols") {
+@@ -2426,7 +2411,8 @@ config("minimal_symbols") {
  }
  
  # No symbols.
diff --git a/www-client/dillo/Manifest b/www-client/dillo/Manifest
index 064e8a9e3c83..a6f96dafd242 100644
--- a/www-client/dillo/Manifest
+++ b/www-client/dillo/Manifest
@@ -1,9 +1,11 @@
 AUX dillo-3.0.5-fno-common.patch 2234 BLAKE2B be7c3073e370c8c65fa4cda31739755db678d3dc37564d0635fd03a9fbcdc25f07082a203297c69a74f7557588f7c7149ad59a9ad9a78ab1780a9bc660754259 SHA512 854ee60ecb5b60e5c3f2e5ee22e2e8b29d1ef64052c46055e4a6aa8eafdb31fe7073fec3fda9851de3929c5f73ddc010bf4f2d18cb0036a7df3d453930563000
+AUX dillo-3.0.5-openssl-1.1.patch 806 BLAKE2B 4f7857a6fff86292692d7b7b2c9fc22b11a6db9e5a8f02c6bf43c7f4b6e4575a6cdcde1506ff748f37e1edfc40b06b4f1203b173624a8c6c15230dc2b2a6f3f3 SHA512 c62b9473847cfaee835a1d9c0f83f8b73c05488a0db1ba5fbc3b5719efcd251c2a218221bcb3b8fed1a65feceeefc4c57c31c444fea82a7bf1a12cddbba83af1
 AUX dillo2-inbuf.patch 313 BLAKE2B f3924f38da743bc843142106853b4fc704a9ffc8efe8d74d463fdf09c02bcf7ecff46d04787e7c6fd79a4797c4f239dcd746a73cb47adc36bc6a663169611bde SHA512 d68a21d64eb81341afdccdf1e409e6d12ca88ee2f016b327365b36ff71e015aa38e325b6127f77e45a6d995f38b9a88e90fb375145342fb8d29731ce2105c9ae
 DIST dillo-3.0.5.tar.bz2 734472 BLAKE2B c8a7ac3a875740d2d64269b0d368e6f9395c89a56737dda9d6dcb013f5d46631e4f6f68e251f7104c0ec9bbb14bcc10b67a7f519558f857743d7cf15976f197c SHA512 d0e86f57e50da762debf592b6deb94de5ee58f84e0cae1159890262540a463aea8143d2b99c634021c1f273f91c2fe0918f30d72c3eaf91fdb541e741469b155
+DIST dillo-3.1_p20181005.tar.xz 907520 BLAKE2B 1349ca1de53b294b5c31088ce36b3f9a86c3e628cfce41fa4fcfa30a3b4d9ed05b0be836fbc2ea2f2c37fce3ff28b17766d0717949d1ec66430149049751fa50 SHA512 1accbf200bd17a04d3b758037e11b0c21924c93d7857fa5c880af471cf180d45d5c772c6d800b4b899cf5b43bde640d28b37ce82fcf6b916c9adee5800e57d29
 DIST dillo.png 6135 BLAKE2B 63aa76000934123420d0704317309639bf5dcd22c61b09406a7ec67018b17044a417209954d67f22e2000b0871d315a25388bacffab9599230fc9615877a2f08 SHA512 cfc9bcf1bfd0fff7fc625c7d288c92d0f33418b963a4e344844fd2bcb33823b3215a8a1a86162dcd1c614eea2323bb361c11bd8bd15859b771c63943c1b40833
-EBUILD dillo-3.0.5-r1.ebuild 1366 BLAKE2B d2643e53e81ea793f48962226c23a71c91805ac1b4e51c80a3daff34817db9f085d40eeacb1e5a9cec7d7defbc7a0d685c46fd74e79dd2b21adc525bfb715fa4 SHA512 094c790948088f24dd89f32c115ff89e6d7c31bfcb196368bfbca1c15ddb3842600062d16a6d75358330496dab7be6012d7a309106d238128073b8ea68ef9400
-EBUILD dillo-3.0.5-r2.ebuild 1239 BLAKE2B 3909148cfd43055167ce795e22a6aeea15207684fe4c66cfdc7d4d329005ee096b2e56d5046732b6219440a756a15c9787615c68f1e545309ac136c039df9c17 SHA512 60f3deefbd7a962eed80e3cb1f185aeb40e155d7c78929fa6ebd4587e33afdb877a64fadce58edce5de99b628245c495d0ac83700f92e082d50d9a9294e69ee8
+EBUILD dillo-3.0.5-r3.ebuild 1335 BLAKE2B 3d96f5c1afe9d0cb180ada46529fdf8b4142c9c1ebd920c5e4daf4aba6afa6cc0a50bcd5fb9a0e47824d8aa8f5f7c1a12aabd87cf3edede52a596880621e3fe3 SHA512 6e093c68d95911a8ab088a0d758587c6e7321433e0e672c0f65d37c9f78c67a5bea5c835d7f534d368eca7a7ca528dfffc1a76abec3122c64dcec5f1193b8b5a
 EBUILD dillo-3.0.5.ebuild 1298 BLAKE2B 6f73df054852d4287c5bc2706bf1e0a41780df62c754f8a518e3637fb35f9aa83e29b180778bc34e8eb57d2395fd3c87ba3c210c7a48477be43e46de30eceb5b SHA512 b4e15989f992691899a8b67ff392d04c48ee196b7817b8b2e74d0d17a236ed2432752f276c37bfd0eca4097086c23343e7a8869bdaf9547d61dd15f7fc61187f
-EBUILD dillo-9999.ebuild 1156 BLAKE2B 591195d6467ff26f08df6419636b8f14ed733afc164340c85c5ce1142b0a53851de7294d5a0194623e43e1bab647966728eed015a5a26bc253961f5e7f81b13c SHA512 8b25bed5910d130cc83fe51ebbcbb4104d71672fcf0fd8556e81eac157862c7163f435dc29c0adddffd4946bdaeaf461497b4e4852a19a0f3d867d5e3f05baac
-MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
+EBUILD dillo-3.1_p20181005.ebuild 1235 BLAKE2B 97281d6c02379e026dd4c7e1d18804d945b88fe706862ad9fa76914c7e507716101c6faf5e5b1ced426a0db9a4ccb2fe4eb6541c3ddfc2a149f353b5c170499f SHA512 f3e6352a1a726bbe58cf12beb3521dbba3e2c6d87873cc5b2a91ce010addc233246a57ddfb781df0496bbf79a0da2f32bf1e47bdb1fd1491fb2c26b961a68bdd
+EBUILD dillo-9999.ebuild 1189 BLAKE2B 0fa0b3efea2ba78c5fbb49ca207d9bd2e7cc2d55d3b0677f914aefa2418a3ec55d9dfff4efbb8c5f66b2b5f4b610ca85228fd59aaa08aaf648a9bd73562833f1 SHA512 f7009d1751ece14d3aadfdcf4b0c34c74c0a6962e6d79c926045ec951353353283d53ec16b6bea0e4000f92cefacd30c686588043fe163f63be676c43c70515d
+MISC metadata.xml 348 BLAKE2B 4574707b617c7f7567075d5cee2ede78364c7b5b5ed11977e2948b2df2afc27506418b20db8bbbc371f1e9e2ef095d2376c869ddba3374a0e76ebdac4de9fc84 SHA512 e2ba8ac70b1ac89f257e92f457b20bc4fb9b407b5f49d1026c54dcd0d833f149e3961c732dcfb54d8d4886f417d480f49e76e89b93045a88ce1efed015739892
diff --git a/www-client/dillo/dillo-3.0.5-r1.ebuild b/www-client/dillo/dillo-3.0.5-r1.ebuild
deleted file mode 100644
index 655d5ad63cd5..000000000000
--- a/www-client/dillo/dillo-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Lean FLTK based web browser"
-HOMEPAGE="https://www.dillo.org/"
-SRC_URI="https://www.dillo.org/download/${P}.tar.bz2
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gif ipv6 +jpeg libressl +png ssl"
-
-RDEPEND="
-	>=x11-libs/fltk-1.3
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}2-inbuf.patch
-}
-
-src_configure() {
-	econf  \
-		$(use_enable gif) \
-		$(use_enable ipv6) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable ssl) \
-		--docdir="/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	dodir /etc
-	default
-
-	use doc && dohtml html/*
-	dodoc AUTHORS ChangeLog README NEWS
-	dodoc doc/*.txt doc/README
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} Dillo
-}
-
-pkg_postinst() {
-	elog "Dillo has installed a default configuration into /etc/dillo/dillorc"
-	elog "You can copy this to ~/.dillo/ and customize it"
-}
diff --git a/www-client/dillo/dillo-3.0.5-r2.ebuild b/www-client/dillo/dillo-3.0.5-r2.ebuild
deleted file mode 100644
index 14d9e245482d..000000000000
--- a/www-client/dillo/dillo-3.0.5-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop multilib toolchain-funcs
-
-DESCRIPTION="Lean FLTK based web browser"
-HOMEPAGE="https://www.dillo.org/"
-SRC_URI="
-	https://www.dillo.org/download/${P}.tar.bz2
-	mirror://gentoo/${PN}.png
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gif ipv6 +jpeg libressl +png ssl"
-
-RDEPEND="
-	>=x11-libs/fltk-1.3
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
-	png? ( >=media-libs/libpng-1.2:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}2-inbuf.patch
-	"${FILESDIR}"/${PN}-3.0.5-fno-common.patch
-)
-DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
-
-src_configure() {
-	econf  \
-		$(use_enable gif) \
-		$(use_enable ipv6) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable ssl) \
-		--docdir="/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-	if use doc; then
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	dodir /etc
-	default
-
-	use doc && dodoc -r html
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} Dillo
-}
diff --git a/www-client/dillo/dillo-3.0.5-r3.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild
new file mode 100644
index 000000000000..f2cd65be706a
--- /dev/null
+++ b/www-client/dillo/dillo-3.0.5-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop multilib toolchain-funcs
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="https://www.dillo.org/"
+SRC_URI="
+	https://www.dillo.org/download/${P}.tar.bz2
+	mirror://gentoo/${PN}.png
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gif ipv6 +jpeg libressl +png ssl"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}2-inbuf.patch
+	"${FILESDIR}"/${PN}-3.0.5-fno-common.patch
+	"${FILESDIR}"/${PN}-3.0.5-openssl-1.1.patch
+)
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf  \
+		$(use_enable gif) \
+		$(use_enable ipv6) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable ssl) \
+		--docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	dodir /etc
+	default
+
+	use doc && dodoc -r html
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Dillo
+}
diff --git a/www-client/dillo/dillo-3.1_p20181005.ebuild b/www-client/dillo/dillo-3.1_p20181005.ebuild
new file mode 100644
index 000000000000..80b643685578
--- /dev/null
+++ b/www-client/dillo/dillo-3.1_p20181005.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop toolchain-funcs
+
+DESCRIPTION="Lean FLTK based web browser"
+HOMEPAGE="https://www.dillo.org/"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${P}.tar.xz
+	mirror://gentoo/${PN}.png
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
+
+RDEPEND="
+	>=x11-libs/fltk-1.3
+	sys-libs/zlib
+	jpeg? ( virtual/jpeg:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	ssl? ( net-libs/mbedtls:= )
+"
+DEPEND="
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}2-inbuf.patch
+	"${FILESDIR}"/${PN}-3.0.5-fno-common.patch
+)
+DOCS="AUTHORS ChangeLog README NEWS doc/*.txt doc/README"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf  \
+		$(use_enable gif) \
+		$(use_enable ipv6) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable ssl) \
+		$(use_enable xembed) \
+		--docdir="/usr/share/doc/${PF}"
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+	if use doc; then
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	default
+
+	use doc && dodoc -r html
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} Dillo
+}
diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index 7134cc059e28..7269ff96157b 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-9999.ebuild
@@ -12,7 +12,7 @@ EHG_REPO_URI="https://hg.dillo.org/dillo"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +gif ipv6 +jpeg +png ssl"
+IUSE="doc +gif ipv6 +jpeg +png ssl +xembed"
 
 RDEPEND="
 	>=x11-libs/fltk-1.3
@@ -43,6 +43,7 @@ src_configure() {
 		$(use_enable jpeg) \
 		$(use_enable png) \
 		$(use_enable ssl) \
+		$(use_enable xembed) \
 		--docdir="/usr/share/doc/${PF}"
 }
 
diff --git a/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
new file mode 100644
index 000000000000..f21694113c2b
--- /dev/null
+++ b/www-client/dillo/files/dillo-3.0.5-openssl-1.1.patch
@@ -0,0 +1,26 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -286,7 +286,7 @@
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
++    AC_CHECK_LIB(ssl, OPENSSL_config, ssl_ok=yes, ssl_ok=no, -lcrypto)
+     LIBS="$old_libs"
+   fi
+ 
+--- a/dpi/https.c
++++ b/dpi/https.c
+@@ -476,7 +476,11 @@
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
+
diff --git a/www-client/dillo/metadata.xml b/www-client/dillo/metadata.xml
index bc1b97e1eb76..44685422a58c 100644
--- a/www-client/dillo/metadata.xml
+++ b/www-client/dillo/metadata.xml
@@ -5,4 +5,7 @@
     <email>desktop-misc@gentoo.org</email>
     <name>Gentoo Desktop Miscellaneous Project</name>
   </maintainer>
+<use>
+<flag name='xembed'>Enable X11 XEmbed support</flag>
+</use>
 </pkgmetadata>
diff --git a/www-client/falkon/Manifest b/www-client/falkon/Manifest
index f1b25a1d0d2b..24bb9d55e702 100644
--- a/www-client/falkon/Manifest
+++ b/www-client/falkon/Manifest
@@ -2,5 +2,5 @@ AUX falkon-3.1.0-fix-warn-registering-schemes.patch 3768 BLAKE2B 29b1f58f9663440
 AUX falkon-3.1.0-qt-5.14.patch 691 BLAKE2B d8244527cfb5d5f732074e26a1363b5fa42b2a4ebccf35a2ed1c920d156d11b20db7ceef99ff8059bf27094788d001e5c542312f8eeb87ba57b921acf032aa81 SHA512 6294228a6880b6551c9ebe0b64b71f710a92ebd38cdfd140ff941ab9ec1fef04be279aedb50986d9b8b0128459d600fbc91d90616d81e0fafaec335d138fad69
 AUX falkon-3.1.0-use-cmake-find-intl.patch 2599 BLAKE2B 5c83209dd027ceb4973896f68a0b2fad4187dd8cb38eefe75f70a06bd96b905cc24c9af1cd395509ca7791d7eb4eae70a21db95dcd52ee7449414ae4d01d7bd1 SHA512 43ce52e1a280cbcd5d2ac6cac35e3b09c5c6efbd9dc1c6d343dfd85142e75a4534862fe9525a2b06466e191bb76ce1c7a7d60ccc759ad8736726f70ed0e13a68
 DIST falkon-3.1.0.tar.xz 2292692 BLAKE2B 1a5d8dd979afb3ef81ea5409314cc0971eaa0b5de54ed7e14668c6596d11cb86d9143acc5285d24d98a671c2486f83e626669d394670d72610b5ad8c68fada69 SHA512 c04f97869150b8ab81ae7b01c7137e35ca5c3103c057e01896454bbeda1075372a7831d2dfe7ab66794de0983593df6e46eff47c5cdc2bc959f81b022506f054
-EBUILD falkon-3.1.0-r1.ebuild 1967 BLAKE2B 9144696f1a2044c0a13aa724abea070dc3e5ead64646ac42bfe34238f53d20dd554b6b25bd2495fe2d32577100ce3e13e4455b55910ef3b40eb87f09cdfb54e9 SHA512 ad6788e871166bc1ae578c47a772a7110cbe844ba09ba1e01cf0db0eb3664b9ff10fde8c4d065257b826d2780b03d616b31e8ac68c1a16444c15c1d3cfe15341
+EBUILD falkon-3.1.0-r1.ebuild 1989 BLAKE2B 0e37e3c553c43fdd7bd70d4b147ed7369026a9b7e5d7698d694cc557a669dde06c276eeebc5530a59e6d4a517a379d862e6ab4f2d90d098c1bc415a5b56c3227 SHA512 79e9fbb85cb321f29b251e8792e9f6031485f90cb38a1265c2915371243f9fbcd05b759392a41f07b956735f53b7c36b13868644586d0d24feca9d8ef9852a51
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild
index c9d68b12622e..687be8779fbe 100644
--- a/www-client/falkon/falkon-3.1.0-r1.ebuild
+++ b/www-client/falkon/falkon-3.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -70,6 +70,7 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_KEYRING=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_PySide2=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Shiboken2=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index f1542e0eabe3..b55477ad60f6 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -472,290 +472,103 @@ DIST firefox-68.4.2esr-xh.xpi 470396 BLAKE2B 69e1232938bb5c077c0cc7b2514ea16b960
 DIST firefox-68.4.2esr-zh-CN.xpi 536442 BLAKE2B 80405ad85fb5f8c010604ef8b89a29cd34fbf0ffd3fff0906978b70ba5c6af856a8176ef67451a7d53699d9a8a6ba0a923cc8ad41ba82f56fac81b6225edc048 SHA512 cbb967aa2f280167ec321b0ddb2313b07c11c49de55e3029643582d6f1a4cdc5ca2e8a575d330fe33e04dcf967e2b28c092ebb9e9c2d7f6194506de9d956acdb
 DIST firefox-68.4.2esr-zh-TW.xpi 535858 BLAKE2B b9bda7fd807ebeeb1504ddc7abefcac2b5105a0a2f2daef43ab5eaa704a1e036e9f85aabae582857a1165627415043068cf907ee728491ab710cb8e8cbfc6048 SHA512 a8f1c4d81212038da68c3369360a7e850926f4541af6c19f9817c1041c6cef77c9de83235c6363531136d5efb4f67ad10b5e8f647897f38ce1e593fa022940a7
 DIST firefox-68.4.2esr.source.tar.xz 318429980 BLAKE2B 55975c058f758f0c799b0cd78bd7a43c9bd10a12c614cce73050ac943095a94d283be1af3cbce01eafd00c5091f3e78554f5aa791e8f4cd9bfd43059f97bf45a SHA512 e13bb141ad1c138cd9d8dd5d6996224ebe146ce08f0ad9cd37a20a85e8cd33db14e6bf1ab055aab7d3ae6f204ed2cb1ee02d5e6fb3d94778098156e1a46b7d6c
-DIST firefox-71.0-ach.xpi 484887 BLAKE2B 197cb8a6be2d37d9f1bf2c5517e66265792e44b951af8476401cd5e81665cbb9c4a57f626a54226dcd38c55bf677dccd93ebb3baf214feebeee278a133b17e7b SHA512 c9c640d57ac5d09ebbd1a971f67297ebca72af2a62ccb64f0627bfbd80740d1a741549a453488478e72323c15e7b9ba16d7d52f84b73fb856af390f7fce5614c
-DIST firefox-71.0-af.xpi 444403 BLAKE2B c43aa30af52b5694667fdfbc7371ab888214ed5ec74411cc3b09e2596664c31cea0168adf99c3e010323b7af1fda94799e35752ba09ce83829aac0ea4ab151ef SHA512 207d1cb4f98557eeb1010618769496542bf383508f7ff6512268958b1d37b29ffd99bfd3409d6cebd56a21e562c50db66db0ac6cc1549daa9cf1a953ebbfbe9d
-DIST firefox-71.0-an.xpi 493802 BLAKE2B 55eb11801907854d9092684904adafab638602cfdc71ba17e550442efe60285ae880a91646c52a868586bb939197772f1c615bb90af2039b48614130ffcbd8a8 SHA512 28c659b13ad84aa3d17fce5a760f6298a50ebc3d7b21636ce87b0623ebcd6af169da19c60075c681b38be674401633744358da789b29c3d4513e711cdac427c7
-DIST firefox-71.0-ar.xpi 556346 BLAKE2B f5228bcd2ad0efda95ab45a08534c4f645654b0d3a5ab9e326cd1765aa026b214bcffcaa9146a79235671afce58c05911fb00e807689dbdef94df6639cdaf757 SHA512 919d9d811b9aa567d473f7b2a1bdc3042c94e532fe22f0041c5fbdb0141b04bd693c5ff629765c1df4c4ec447c181c56b8b5cb60e163a087c137e6cbe38a3287
-DIST firefox-71.0-ast.xpi 491415 BLAKE2B 081d14c20e145901a141a2b2428b425211189e7b110579b721b311d89bc45663890c2dec8f529403b9f30f9ad3b27888e8a8fc097170d6113aaecd9c538d04e0 SHA512 2e4723b0e7966217c059d6cd68b21e3aafe416678d8590fa53b4500981903c59e644b038b3327994834cc65f386b2d0e14cf67bfa61fbd80056efb47cddb7864
-DIST firefox-71.0-az.xpi 523562 BLAKE2B a3ccbeebad27fa3a631c606a08856e25079f8baf3921cf06d80a15dd7e1e4b461b9a4be423672f71aa48f45ccb110535c15826f4d93c69c851c384e2585bb758 SHA512 2766fd3ee327552d93505f81fe9398f0fea679aac7a0314c73a1f31a38798083ba53e515b4521e7c5336b2301f2d8426dd5e17ab5f7427ea41a7b94a43642d32
-DIST firefox-71.0-be.xpi 617161 BLAKE2B fd53af1589067a097317795601f5a49c1cf524db26ce656c4beee647bf2dcbd929f389fee4dd9372f30c625c3f5550af5e32d53a3382b0bbe6d7aa9599d62999 SHA512 53f4284da880e3e52b38703a17eb8c3913efa7e4280b75176839f1739055883e7c924da5f39ab26f6e2538a891b6af9c2705c8c5eb80214f1eb1eee7b7f9234d
-DIST firefox-71.0-bg.xpi 577531 BLAKE2B 1fc72c82365758fb0b83edcadc2f97759240a21179bbf9c8d4c9ba3bbba947d8691cb8efaae8e5aba4287b75c190e31ab3ac1e65f27f0027233418e37e01bf8d SHA512 ada68bd85bcf88c9930678cce015d0d18ab7699f3b1b33ed269e55ac12f3738784e63adb97f9e0df44ff293e91999abd5a0b86995dd7c0ce4798a4d943ddc3da
-DIST firefox-71.0-bn.xpi 611315 BLAKE2B 941ff635d6812485148d2dcb614d301ae6a74e29969a53cf307bd6f8fd7dd4cd8766bffa53b43b2b2a6bf4319ef00bcb19037c318c9a7d4a540d6cd8f192ada3 SHA512 c0a66b87a516fd32deb86f2b2fd01467e524264f86edafe866ec2c170a5c2890a1d1dcf141a933957c77d56f14737f30bf3571e3d9e3786b964471707761b61d
-DIST firefox-71.0-br.xpi 524590 BLAKE2B 3e53224c84af2d5a7b22a75d547f96ca9c64b02077525b27de27a1c22089766080b39596a7eeff246bc57c17c75326bf1e9051cd0fce48c4fe842b83b07b3044 SHA512 33c982688c6002e706eacc37562ca08cfe5653f7cf01144cc37680796a34fe1bd31e35adc828948403712ffd93e1edb5614e56d5c662d0e7b133ba9482e80ae8
-DIST firefox-71.0-bs.xpi 493905 BLAKE2B a25776aff74e13c33ae791495ccc580944abc9d00decba35843592fafddf8ae6e1aed4ea576d103963364d3fcc80af18cbb3d601b1231e3d73e6f0d0f691474d SHA512 be820b2052ee903f5fb0b37638ee366993383f4af48436bdb346bd4e8b76c52e74785abdffd18c325e8f4f5adf56575cdf6dc452d1a3be13fa9f769ea1ab2418
-DIST firefox-71.0-ca.xpi 529757 BLAKE2B c42370312ab45fdda11c3f8c13b4ed945550eca5c5482ec19d136dc04cc25264b8d37cb276ad72346688658939423acb160c6c8844bc8c5fd2b49f969956a805 SHA512 a1b2fd534b76282bcec2834089fe26f76f89c8f35aaec15793e976b32f971074ad12f8c253f1480cf389dc1ac954ed40427efdfc6d6717194136c9d5018d7749
-DIST firefox-71.0-cak.xpi 558789 BLAKE2B 407c7f18a503c4fa3cfabaea3e33a0d562ee023098246adff32b59c6b904010d76177bbc064c7cfec6af4c08e16202d6d5074dc668fd64dbcaffd91a86a402b6 SHA512 f509161da3e4051f41d41be27670e684082e982db2d8e5954749bd822ce635a3f704c01a668f843f854309a4e38d77735bb64a9956589fc12663e5b1491021a1
-DIST firefox-71.0-cs.xpi 550385 BLAKE2B a2919887bfde5917db0b676d5e18407f65fc79afb4b93db97be1bdd511e49c18ca244b5e2efc94c65698fec7371296469f66e7965c6331f47911c33fc33821f7 SHA512 3f972a4c665620a12cb5ed05c63e05074d3d1d36bf89551e78b3abbe5cb8c6b238adfd3f3b0c70885196761d6733bb2f62721c0aa01523a1906d7bdc43130d22
-DIST firefox-71.0-cy.xpi 535332 BLAKE2B 37917354e3f252a69e4ef86e959d61a884874bc84827ee55013504eae4b1a5bef3b02a86e3729ff4e2a1715826ca29c5dc1451c7a94c815e9a11784eb74f35a1 SHA512 312751d0653fbae6902f9d138c12f4bde64ad04adacb92246a97713bb3ffc43906fc28b7fbcf8fd23d0cc3227c78cf4256af091539a1e8f1cb37843389892796
-DIST firefox-71.0-da.xpi 518337 BLAKE2B 2aa1811bcb43eb2be433806ad89c2d25abfaec0bfb4e2ce5ef7db90dab88f1783e4d4f54d2a9e13d2dc6e2eb16acb76fa818bbfebd74eb03b130fe3072a3b1ea SHA512 f6ed8cd0a7465c4f29d0656ccf20ed9b5f254b46a4fecf43839aa94eef3dc90d9f9f6ad9928a1cf1e1ec303ca91fe5f3e6f0c3922aa24c70aae0181d29b63626
-DIST firefox-71.0-de.xpi 550052 BLAKE2B b8e8d5f28ea2dc38e61060a2006e36c301d91945422432543476a9889789f7b323652a445e2bb790bd2d8fe266ed0cc32d26ed23e2e782ec362baf7779258819 SHA512 2ddfabb4845616467f434586c017bfd30dec20b2dcc7935de3f8b71019262c4e9d973a995edd6edfd8c71c9e491d2a39f2074162cc7a96e0e8396f4cf36bc822
-DIST firefox-71.0-dsb.xpi 559392 BLAKE2B c61beac29f95a4d7c5cf102619e8c64fe49fd1b1977f8d6ea9d78d679760400888befc84afe7305c384892a51992eb61a01ae1489f1c8889eef6475178df28e4 SHA512 280ef04b4f150d5e41d13fbf1583bba6715f95205a7b9528be4b1fcbae1cb28060da3a75f07402ded5beac536a38d51bc1f6612388035d1735f2c1af6e316cc6
-DIST firefox-71.0-el.xpi 621206 BLAKE2B 01162d592c951c2eade042391e259caaeea607ac9a1802e752f686b597fd8e5da7aa4bee4e2828f947a5441e5e6402d7fb3c858bdcad6877a5d2d25210abbb37 SHA512 885a2c2be8ff36f3ca0045e8479f313daa36c63a20522d96da6618073526ee413b7631e8da390ed4e4d3b0c3fd0320185a781ca69bec538bea0a0551b6e6afd3
-DIST firefox-71.0-en-CA.xpi 505706 BLAKE2B 86ed5edfb03a3b613f0cf6b6bdcd3c6df977cab63a856f3005dadd4fa6d528958130c97f56acf3b94b869ed84ac6e87a3ca1dd25e6ba305b1118eb1b158ba792 SHA512 9553398f0d8b55bc4be73dafceeba5f3d18545ec3d694bc7719df7b4a2b3ad0bf940c2e5c19eb3221c3030c861ac7544e4609a6b01477811936749580b16bff1
-DIST firefox-71.0-en-GB.xpi 503397 BLAKE2B 6148187262cbcca4d6da1b7fed0800960f6fda3487377218455e60325c57071df26382b7d8e5954e0af89777899e7e128d4c7cea2d43b10298260c14ec3f0b7c SHA512 1c036211d62719905fd16b9bc466f2939553451f82f4320a2721741a3b7b4ba767b6088ba8136dbe3ae99681ae735abb34e8a86a70c41af5401e959bf566ba06
-DIST firefox-71.0-eo.xpi 531526 BLAKE2B bc448f569377f120c7faa68d28b07a4a9ffbcbe8b6ff5959a6b03dbf7aafbd7ef16170e54fc13eb753dd1dcece0e8e2c69d55602090c887cc5fc36afcf074a26 SHA512 437bbefd3c1511ac37c0f9c3d726cde6d99c043707b68388084ef96f422639b2b228f614c24dfd6a973d1df77dbb37fb76c2ae7b4f2398cf3ac3b21c42c61c62
-DIST firefox-71.0-es-AR.xpi 540653 BLAKE2B 922f1292e638c443932db188aee9f2fe8b557eab11c02a3d67cb70cee5cf1e7eac1cd8143712ded7f8abe6b900cd2d43df3b63a1e685b51d3afc0e8340610375 SHA512 8b038f13fadafa72c5b0341eb8f69cba3df360a1c27a8384a3004ce6e1c9185f7d13298467d4ba8a72896cde71627420f3b0121132e36318ede4947a459f0b10
-DIST firefox-71.0-es-CL.xpi 540838 BLAKE2B eeb5d8d96f6bebcc4ef4fff2aaac067d977522f7d5df16cf7f65df378cf157a6110edea54dab6f8670ee75e3ff34df2be6e1b5d14ea6abdb080bb3a28d592c94 SHA512 fb217bc675004a3ca760b48ae6e4f4728d4a0287bb7557f9be56ea537d20b173463aa1266748bbb157201ff1c96e6ef3512d4f13d5280c25449018039b0c0d7a
-DIST firefox-71.0-es-ES.xpi 518165 BLAKE2B e961369f6cdc629bbf55079e1e79bcd4375bd2ab24bfae636fab0519138a8229909fd0449202c75be0b14df0363a55729ab827b5d3126809a0dfff32fe974f1b SHA512 75d8b0632fcbde3cac6a51087830dc5d60fbc60a8b37da13514d92a30514a9f6f5794b3ab4abc26223185112f7fae5f5f0d4c387cf58cadcc2ae7a020b7c0894
-DIST firefox-71.0-es-MX.xpi 544851 BLAKE2B 03e02da5dc6b3e4a9eefb40f381942872543194ca45cd70359d25dcdb1270e51c92956e400f688a50b5e4cbd3bad2c70429ee3dde0caec1f26d8d87aa42e6a69 SHA512 b641592ac58cc06db33c7e93fc73edf01404331b9df8c0001a9a40370d0da08f984b9cf4012eaf585da50e5eea9501eb07317beb7eb822153ba68a3435efca2d
-DIST firefox-71.0-et.xpi 520415 BLAKE2B 1709cbc17c5b9051ea7a928662d7550d9eb6e45f8a94143c7a4b3dd30415907bee34f8bc330a49aa66a3ca315f827259509f60e2470c245e883c8c19c5ff6f01 SHA512 ca574b2ca32a987cac82c02b11c2773220cfc1c352bb51a1fa849f3db17c89a473381a1927797daa68a8d01a76882d26de9bb86a03e00b0ec3b6e2915ee38602
-DIST firefox-71.0-eu.xpi 530784 BLAKE2B c8b8410e82c9c5da6a88d3237e6aebef0691a9619c91a3258461e3cbc0051fd3973db4d722984b585162532b6e7614d44ad78bec5472beea9ab63f23b2bf887a SHA512 7c886453b70ca75b362c85a4f4322acbdb774831e38e08641266f16574665ff1e35b0876c3344b03e67e1855e75611e9feed211f5cc5da8d84ef168cab375b0d
-DIST firefox-71.0-fa.xpi 578069 BLAKE2B c5265fc1f6a255be0881970ee2f0e76ad14de25fad94033f81237edb9ceb1860bbfedb3ae175dc2b50b3130e337c04436be484bbbc98ac8b2ea1e9eb649257d5 SHA512 bd9434b140959fefb3408d00385041a1af963ce8a9f215cee516830832099f23b110cbfa85eaac0f31e13e4f289714f520a1c49cf7aaad76e607564c644dbdac
-DIST firefox-71.0-ff.xpi 497625 BLAKE2B d15905ef15aeaa341b3ab4331671adfd8fc32a407061a2bb56d05d15a83f17190aedbe13f7c54250acc7ce135da0f5bdaffe896be17a3eabfdf0d529831697ac SHA512 3bdf28dd84ecf10e42e3a52537a7f40c56b0ee3c5bfa29ef7a8969a3bc24f69d582a706fb8f60f7d83a53e66823ba688c6e9dfb6daf14576c4cad3f8ab45d4e6
-DIST firefox-71.0-fi.xpi 526854 BLAKE2B 8fe7175f9dc30f3fdd1f372124b4b211a64556506278ba18c7303cf38f996a72fc0c2d98ab0599fc4e434129fe54e6308fe2b3fd79e26a2481219cd7dfda3b48 SHA512 39fde113dbddac19360971ed61b177f84dbbac87ae290708e790d363f20eab8270e1262a1a2f81df73c5058d75dd2c443c9398827c93084de3ef41c36d25e8f8
-DIST firefox-71.0-fr.xpi 552869 BLAKE2B 9d70856997eb8d61be64e669c54e84bffe48d7bc0011160883491129ac19747ca38960ff39953498624af7f6e6d698e8a73f72d8174daad90d61e7755192fd64 SHA512 426a7780d111ddf50288d5e1b979304330a30a76e40cd34eaef03c94fcc6f21e03b7743b9a2c38f49cd691fe927da7cb2f533a6bb4bf0e938e9c269cbd377c42
-DIST firefox-71.0-fy-NL.xpi 536242 BLAKE2B 67405db7cb9bfe168d15a61ac79b1f67995851b209bd75fbf7e744c6e28f8e2dd56dff6a6424217252b05eb021114be14101f17649ecd5405b9c12c9c83bb180 SHA512 beb855f2c73397d381d1f609427fbfdee1c0b03f5a5edb6f93e708a211c7dcf15aeb40110439e4e8220f358cc03fce41d15d15446d75da316b84333c6b67f025
-DIST firefox-71.0-ga-IE.xpi 497577 BLAKE2B 8987fad5f5c5249c2b20f84a4e2c4f8d377feafa6d8795e5800ee345acc332aa39be5b242a74e1d0fb3253dd0b89136679119d8dfa0563a539d3f1d7f0889d6d SHA512 0b89ab4fdb364535c887d123ce696caf5bb8da937698d38253de4a9c7c915a1cfcdd324c3e730d71a21c767225871e48dcefb588798c1f94ee10c8601c3ffe1e
-DIST firefox-71.0-gd.xpi 522588 BLAKE2B 00060c4ae9e335deb73f93b670ab70f974d86b0f3aef143935b3e2af5345578f72c8f05813a845bdf89fd7da7ce728367d4c201c7ea41f4055d8b35726d31ff8 SHA512 b6b8f35335574033d66c198d5e6df1f47416be2be7206558dd2ffffdce8c01798da9373618bdbe67ed7f9996f15d0f6b943a59333587c5bf9e5d77ee285cc15e
-DIST firefox-71.0-gl.xpi 498585 BLAKE2B 0454a2f7269ff965e79d0b8d12d2e84950a09670efab8f5e53deb6c7d7ccef25f73cf3b10f294ef7a5835974c8127f5a91ef4b1590f86cc013115a46b908943c SHA512 d014e8a5eea52152bc33203fd0f244f43b97d67de4adaada60c70a725065a6a0961c40b24c0564aaeffbc780c609b6ccc402b4049ff13005562e6abc4192e633
-DIST firefox-71.0-gn.xpi 553689 BLAKE2B 0a5c7239d13c2f6e83d1ecd3562c08ddf2635f5452f70181d4d8459fff656e2d7b0d0ed81dc7228b4d912571bffd17474ad92075654bf6318e0bb7fab7daf391 SHA512 f0bc639b81ed7c37c2ee28f17f8c2aa2eadd02bc17125582276b5ec50d25cc264fd015afe17d0b1ad4fb604522f784f32b14ccf27fc7e4e4dd45436c5017070b
-DIST firefox-71.0-gu-IN.xpi 587968 BLAKE2B 5806b5f13ba31488de19b895af46e0579e57aa319c2eb497d3f8e812e6e588f0baaa96b0241e761762eab97f71a1c71110695e2909cb0d610c31e8ab8840a1b8 SHA512 24e57d85c01949d96d01c0a34b098abc5d6057a5ac39568937264d477da7a0f19f2382fd662ea7da4754a364055cd76d23bafe612db323bf3d39133778b5658e
-DIST firefox-71.0-he.xpi 548164 BLAKE2B 68c928562816c6ab44f80914c6c5f76f8bb5b792ff32c3c6300ec94d5accf92dd321a8ecea2c76993dd00e565e268692fa00f5513da7762395258852105937ea SHA512 95097da7a81186c043bfe29e32470bdef7333882cbeaa7940fb546376a14cb3b7db99ace1aaa957f74a6e66aab803b83168dd3251c07a744eb14a855a7a73121
-DIST firefox-71.0-hi-IN.xpi 588405 BLAKE2B 5e8d3dc7cad53dfe87d20ba5f51682c6e991295889277e9f3b88a884c88b897b9d1244eddf170553acbacd7dc92dbfbbaf3afd1c1adacfe1524e46d91c94502f SHA512 fc629fcd0d01beaa7a673cfb512ab23967573bc813316c743899529e621c935dc87bf00775d603744ccbc72e1abdcece4a479f8e321b982356b1e4cc38da01db
-DIST firefox-71.0-hr.xpi 532687 BLAKE2B b080a664dd6edd84f58378269df8c566c9c944d4619e7dbc964156c537d55b1847e77e233f3e0abc2de79e0c2b927d4667f22a9ed6fac3cf218dad7bc1ee49f0 SHA512 8f95a7613504c8e8dbf8252a94e054a2529b69c13d8116821a729da054cf4921884b3ae2e81a77261c56e2e54eee292f8b31879f3559f089a6e863734523419f
-DIST firefox-71.0-hsb.xpi 555207 BLAKE2B 46386164326fd1eec5f937604e26b46ecd10a3427df581a5c16347ca19dffbd12a0094d27481ec425e81ff3fb824f7ee6297228cded87fb526825aa7a8903bc8 SHA512 7876a9b5d60d29f503bdfd3fe37788454c32f2a593f546437e596919e038d14de160cc7e025788aba8af0eb04e8386ea31caeaef9ddb5e84d06114b095983b8e
-DIST firefox-71.0-hu.xpi 560491 BLAKE2B ad9eef9653972f5777f97841cd878c3bf01baba2a7a9ffce015862e434fa5bebf20762b61962dbf8c87e2eee29edab4c8509de332ed3c02752ef067255236d15 SHA512 fd17e3a5fb28a8a9facac81bf0493c9c252c2c1fb15b3dcac802abac375be39b8fe977fd029f16937e5e9150d13b4d6c366573751650b4348154e29d209edb3f
-DIST firefox-71.0-hy-AM.xpi 564283 BLAKE2B e9db1849c95ac890e7f85c0c837b213971b6a251934b89bbc02ea0bd2c85e2bb7fc1c7f05027366d584ca0961d8cfb6020978d724dd0aa3fb1e09116826cb639 SHA512 935c1f49a7d6eaabc74cf2dd3e8e0d012610b5cb5d629189b8ba3cd6481a965cd7db23aeeebe7539c088724997f0688de3f02ad7299dd21912317270a321c3a1
-DIST firefox-71.0-ia.xpi 521940 BLAKE2B 6e8f88262eda0f7e81fff84b430b13eedf250bdb2695f7633aac6bae3e3d5d546308585404a250024b363bc12bcda2afe957c65541fd49dd8e900ab78f5dcb54 SHA512 e12f51205b545fc4a03cc44acfcd594c62c943e03e74c6ba44967b4d944128bbeb31fdfa2812e16961e5044d8ce1c9382575403f16101f6ebc35203fa99d36d0
-DIST firefox-71.0-id.xpi 515826 BLAKE2B 1c20c858e04b3c569c6b94a8441065e9d5c2c8da4f9fa3221d851424d79674740cf586ce9a10894057e2fa75085a8ac4fbcc0472e625f191c9a3826b8f4b7937 SHA512 699049c9203c179777725c9e0fcfa392069e41dea83320b3e6242ff7c6c01ac7914758b421b94a55b6dd7ee172ae71db46b267df26efe5a236fa0689000bfebe
-DIST firefox-71.0-is.xpi 511990 BLAKE2B 8496ca11de1c42df889a123e3baaa86da82e1d15e119bf3c835349cf778ed426111779b4764847a104c264abf2fd6ae52dd4aeacbfe46485805fffcc545131be SHA512 4edae50ce11e5851036e9ca96755f6edb8564e3dad0c1439533fa774d4a3ecef47e1305f328cb798d59ac0d4ac6a918c229abb1849a60d99fbf0d2aee204bd8c
-DIST firefox-71.0-it.xpi 419131 BLAKE2B 3ce34681c22ab6ebe1754209333905858990d6eac113981947a4055b696d02f0e59c02b94c2d0ddc5763e8adc2bc5ecca5ae4b7afb6fccb8aab9a05eda098054 SHA512 6969ea91b05ab28406c71fdb61b137b244c254687cd32e73972be6a1014fb1b00d97c6c1111cbb16ae2a8e1e3de019b733ba8ce6a891762d1ad04412cdd7ff39
-DIST firefox-71.0-ja.xpi 577551 BLAKE2B aae4eb45bfc39e163489cc4d55ab305ee677f290ea0c1d01f0c2bbccbe46702dd0131a8b09623d7cda79089d1d5e470056baffb3bd99d79ebc45584eb001a8ea SHA512 f3d48747a0680414b9a421a44cb9f5ef0da9ffa7d43182c3437fe51be2081840056f2b29cc6aded34e690ee71e7108bd3385a60697a766fbf6710e63a6a0fafb
-DIST firefox-71.0-ka.xpi 581703 BLAKE2B a8ad777ab9389dfae2d521d409fb98b61334bb1b3f536d0aa645db5b0450d436fa125756d72638b13cf5918d13da312e227ac2b11b5a31b633697c2766ab6d8b SHA512 e379d8b77e9d27a8e5662271f296eb8a0b53668114cf28a14708c12ace4d71c9d8fe904b07ec2c3e9c135e0728cc743919525df9ffa659cc75bfb06cdaa080a5
-DIST firefox-71.0-kab.xpi 538872 BLAKE2B 6a3d44c2b8cc021c81993dc6bb720c17b6eb845a384f507809e164d5c7e2ab42a8e2265ee9d409becfae7a9c9f5466ef5784966e37d7ada12ddf42a15cb123c1 SHA512 ce32215965ec1528b0451a5f93855f563c998e75bdf1b97d53744f23dd6583690919429893c7fa1c67f2abac5048cb1563d102c6a34e9872b17f56f39bdb7b92
-DIST firefox-71.0-kk.xpi 600169 BLAKE2B b89e024893bd9936fb8795f7fcd6c3976bbd8cb3600d71505ba84c5e45a682dc366e8d33530b0d770ea38ff0d626ee5d6ee75f34f4d01530607bb8b999a40568 SHA512 021c7c234f5e6482e281ae258060ca546a15221788f196656313c32a12ce893997f2fd2bd842b1967e4649ea111b610bedb10ec9799c67b863108da54d83ae7a
-DIST firefox-71.0-km.xpi 567777 BLAKE2B 50c28db6c17ad59dff8054599f9511a164f893dc5da8e18359333abaec9489589211ae48d8f3a48e3115672799e4c81ee6c58ef729c9e394632cdcf86ef66b85 SHA512 88e55b3b5d9829b5f2d4a3e99c4a0f3b763a9499e33f90d1c82e30f678e398ed2814f97925872da677d2dec9d8721dd869f42e504424c60207797627e9c03bff
-DIST firefox-71.0-kn.xpi 556675 BLAKE2B e192e077090ed05c5b228c0aa9deb7eacc4275ef29190027bce5d62e2e5db45fdd5d7a625053172d9f96f5e284c65faaf00d5d4c503d72132f663f342df2b61f SHA512 ce63cbc2c5b1336cb3626c2af4cbb1181dd7306e42ce757ae39d4e5ca42353f4cee2226724a71901f7ee3388c29780c3ffaa8cfe3289c3ce8d216eb7cff28dac
-DIST firefox-71.0-ko.xpi 568484 BLAKE2B 659cdeae24375042b64e81e23459997cdbcf33618dbbf5adaae3e5586afb34b9a99dbef8f2d2deb8683455cca3e6970b1ab6c5b7827294d372817e561d6eba48 SHA512 8e62e364109028fa1c380d4571a1d9b777fad8492d700c6672a1165424b94ce2b0e9200651209c003b6bc6c414cd959214d8e9b404043e6de906092db56df7de
-DIST firefox-71.0-lij.xpi 503675 BLAKE2B 01afe58d9aff00d6d6b74a72f528e7c99b51339aa5034621eef901d4e911893ee04d757452f21aa591cfe0078bdd11872d4b743ff4935e84f7f06a9b77b5c50a SHA512 326cc28b07f5bbfe5d7e89da9e06c90609ed377b098d1bb6226205a72bbf7dac859871dce5c57d22ea7d39cf05de844de602e2e84c3d0ae31b57224353b17c14
-DIST firefox-71.0-lt.xpi 557431 BLAKE2B 6b0e0da582e8071875c58fe924b75267dd9d2261a55266f28d70c68caec6a89ae7a29011ffa9e858987e3553ddb57f5c116af80496306c0799bd3965253aa081 SHA512 72953d50567a70dfaf51022ba7fe82fee0dbb65ae674624284ee64d82298493b24c9055856b76dff2a6637d9b3d3afef691df3baebc968bcd334a569d16abb3b
-DIST firefox-71.0-lv.xpi 512014 BLAKE2B 9aa965ba1aa557d0bc2e850d23b6cc71db96f757885832f3598836a8e3f7181737cbc4c87a40690b5c9acf8c8919c58bd2e0868038d662aa858df977940c9d02 SHA512 53dad3698c72d9d160bfd3f9de20320f857bc7d77e99e9ef16ac61c574a3c29b40f6a3c0878e4859ebf7069b6ebe11243b13b7e2bf7a76cfe69fb294b1cd0db3
-DIST firefox-71.0-mk.xpi 486549 BLAKE2B b7baddb8e8b9ff633030f1827af63471a65740a09f7758457d1fda785da99fa517ef2e37cd561e7f86411a9eace58ac601af2dc0c53ec47775d4d1357a5abb34 SHA512 65999ca3ef0a20433dcb3192e98894c50551ad03f4c4f263fabc34af7adde699a075aa884d1f28af34d447b70d4285f3d74a59f8ddc4345bb6fb62232e954805
-DIST firefox-71.0-mr.xpi 587809 BLAKE2B 7aee66e42a5996362621b0ed48b6027fccdd3e7c5659021d7a8abf05869ff1096e1a3dcbfd2740df930eb288c493b040d3a8c8861a0b831b06888d9b4c4e1aed SHA512 b974c9e4161603caaa804d51bcab47e9a4adfa522b8adaf78005d977077bdba1f84c6a91790f57db597aa9de028dc0a96b45b8fafdfdfa4b3610c3e19b51eb8d
-DIST firefox-71.0-ms.xpi 493978 BLAKE2B 87004cb4e49a47b1c5014a17d6b4a7d9e08f5941456560a2300a9f0289ff214506cb453d04d86f7ac1e8714b0e5528bc53f9c5a356af70d1b7152f9b6e190c48 SHA512 a1c31fd7ff4bc219f592e0a9b1b781694ff6b8749b164ef5f4c6ab8db381f4fdff9257777a89a450bb8c5d5ef6f5e415cace48d6441a3f76a3533811201a1a3c
-DIST firefox-71.0-my.xpi 559302 BLAKE2B 120a6c4e5a8cd9aeebd2934ade92e357763088ce71bea81528998e95e11772b3ec7aa08c67ac908744d3cce151f4d9269faebe6e4eac94eb402e85f93d05ec6a SHA512 5a4afb550fbc3649875ce09a269f39cfb5b893cd0a62e85c3b2ba02d87a7ab51ceed16a323a2bf8501ffa27ba57cef54b0cb730d931de569d4bc176427615ed5
-DIST firefox-71.0-nb-NO.xpi 523511 BLAKE2B 6eed4201d55415ac2b256db03cd9bc5e05cc283fa9ccd3299f3ee8960e2ba36f6858ae8537d6ea025b48f3038fa5091bd94d5e043efa1606e1ef282e5c931659 SHA512 7361f3326b69b60cc646d6dd046217012fd7ba592ef477d5326c6b2d9582452402faf5526c54045466149a3c5c3d58932a0bace568df9f6b5ba3f0497766c763
-DIST firefox-71.0-nl.xpi 524570 BLAKE2B 368c985772359104beb7d42be988cb33cc1f164d211a71dc07e8335926ffbbaaa7c431a0d677545746e561648f4d8d10ee80794f44c4b2777ebe9d4e6bdc5677 SHA512 ceec58edde446532170b2d7eff98f8b041c9563240547d4ada786f47de8b6e8212ed4048052b8157f241e8950e2e80759f979d3aa09537c3b19ed2ceec37f447
-DIST firefox-71.0-nn-NO.xpi 524675 BLAKE2B ff616f3dc46381565d04e6b70deda4b65c758218a876b6b09a683d53af1942a237e8631d48939c3dc48e52d14217d3a86634add2069bdfe87958aedfa5db65fa SHA512 4f2b10b69df0da5a99f88dca043cb4814bd06c635e86b877e3e25059d323335ac58c05a6c7a9503b77a26b355677ae9aec5708e73ca35e15d8d6137f3efddc3d
-DIST firefox-71.0-oc.xpi 513068 BLAKE2B 153f5216ee9df0414fd38e989535f2ad3f6d208f01aff99b3120c601b6dc111ad92d34e2835ed5fe6921a46b6be67463a1be77859e8fa20d14ebecacf3d69add SHA512 27699f83c94bb184491db81c3add9fa7672014613c7e807e90a79e0113618f48e54c7fa86c920c742b31de350f3e2ae7cb48e69a4584489369d1e887a6029be9
-DIST firefox-71.0-pa-IN.xpi 567890 BLAKE2B 904da5c4d648046e02bc0997426d01459dcfd99136c01273aa8ae1fa512439019c9b4421193b350a92b148f7f112c3fea55b9c3c8f7c35a5fdf687cadc50e3ed SHA512 b212e75badefb7ecbb003b8745202d187eb016ef2ca2fa17fc0d287517ba03da60bf6370d2c85350d9a4cedb0cbc4069dcffaf9da18f7c761b75b243442e09da
-DIST firefox-71.0-patches-04.tar.xz 20428 BLAKE2B b7aabd18979e348dc7ee7ced4fabc6a4fc3cd0026d84138f1bc1be575b482b10a13c28be567f4ee5a18a6d809cb9553b773b259586b2c05bb0fb8a06f7266875 SHA512 88ddf1314c1cbbb212b73ef57ecfca50bf265ac54f7353cc4d7ed4e91d7e8813bc96493cb0f9f83778fb8259d21e0b76525d8eb5da5cedffbdaa5066a90be974
-DIST firefox-71.0-pl.xpi 537708 BLAKE2B ba395854d4d0c8db63f67115f5e3fee99a1d362d02f9baa9a103d93769ee555084a31369c50bfc74882e45b38559de24b0add1d18a878882733aa57027a4dd8e SHA512 816ec98bff27904e4324cbf72d00821957e12d7822eb3c92f2ef0e5d2f94076083cd95aaaaa88cea220eb28d59800d97c3912fac68f9cb01bb99b931802eb688
-DIST firefox-71.0-pt-BR.xpi 526408 BLAKE2B 40d18fc46b59654dba7dc5d977b1b3f62fb18a1a3a639d8bc9ef541e32a9b54a5b5abe2b83d85a8e6039d25f2b22d21d82f8da8e2f071a77bedc524560ed0926 SHA512 2f8043266a894c9b5c810902ca70bc9762ca5ac9986250f7ee89a0dc6d78245f3663ee2d2c1579b4d89ed20a39a58721975167ea5e887f853fe4a40fd5995ec7
-DIST firefox-71.0-pt-PT.xpi 536024 BLAKE2B 7a1fcfb662dffd51ba58ba489e4e1980ef423969c0bdd19b627b5543896b2546dcaa52d8f1db9d0152890e407b16ad7cb5c4cd29530e525a0d27e87c3c03e2a6 SHA512 9d239cc219bd5971305ae961d96498785910cdc6421cecb905af2cf294288547a2124506e68e6af453426dea691cd9a318ec577303f1aa793ecac51ac6998cbc
-DIST firefox-71.0-rm.xpi 530028 BLAKE2B 6759f5a9b2d1517aa274e86056dc50472866ef1ace1415e3d2a3ef28d2fef580a3a79c7b4a27ae5030bd463a13d1438bea0021e9dfacb4bb980ebae14ee1450e SHA512 59a83fa77db1f1a06562a1bd884207ac86de9d7571f760badeb172bff9e06e6a7570a0e76c302095ce91365d82d8336829ce56ad782e5646a03efb2f3fc2fa3c
-DIST firefox-71.0-ro.xpi 535696 BLAKE2B d8e3767f06f5e1b8bf04ccae829c4f0ae08d0f76039800fd995d5048ad5c0ce2ae556e42198d2edb54d9d8553de5552314bc01b941d7bb3e4937fe1d463385f3 SHA512 d95be9886facef792e98b7b7ab089baa2bb78477a3fec57958b502f5c820d845f7ec1dac1f3908e9201eeb1c5dbc354751f136d41815a1101c10af7bc1258e18
-DIST firefox-71.0-ru.xpi 619122 BLAKE2B a09d007c9efec58d205c094e50dda76b47912b13ae949aa9b1ed4e592d50c7fbb45e82f53bed377b463c5db5b2d0f2123260764a10356313e211f1a03c2ef1c3 SHA512 1312b7c3cfb2f31c12e9e21b05fb1fb19a1d34e225231e155d51a52d6f3d9fd8f02bf72a5a34e05354ad0286e223428e9061fb464d4298f00aa37bc948099576
-DIST firefox-71.0-si.xpi 534498 BLAKE2B 438a08cfdc6127792971abef940df09d031d20111e96aa55ace7b2ba90f4b593d5f935bc3599576eaddcfb1874d0d76661bbc18c46132ed8b6e6a665a560ea00 SHA512 47acc4dc3daaf4decb2b351f678e092cd0fb1b53484f48d0ae695f61da0aa6b2082bed3e2fec85b814d206ca0cdcea7810002e52b1b8930221a432e5c15a167d
-DIST firefox-71.0-sk.xpi 555932 BLAKE2B 42e7ec48fc5458f716f2a87cd492d9fd8ce21d332a46abb38764dad8d4c86590bf0c5b0c168859ecf6e961dfbbb02fd51abf560d5a34b18a8e0902de9e53f4fc SHA512 6b51f0cc9a46a0ad1e6760d71545cf9d94c58eb42cd9fd9ec30af8f75c867036baf45f78075130a3dc0a9544a47df84cc51d3b4305cf02a268143671f29efac5
-DIST firefox-71.0-sl.xpi 536716 BLAKE2B 3afe4ba8cb373c7de38e15be371f2a4d8eb2b5b13f58b3124d4f6f8530e9d7bd051077f9b2a8ce6e6a53596c15d45e61c7beaa5b3b0cabb4731db2d66d500f46 SHA512 9128c70423915dd05a68e4e2ebb79e9e979641e79cf5815f125589cad42a7a4023f03a548ea21797d9cf0cfd5695de4838601b00287365efcad2d4e438f6fa9d
-DIST firefox-71.0-son.xpi 462534 BLAKE2B 03b682aea3de01090a7990e69786e0a737b5aabb31228297819f29aaa5b318fc7bde75d76032ccb1e358396f3e792a9501333526f1751d00ebbc5091b2fc9efd SHA512 59f2dab3d8c45cf2ceca88db890a50f0ecda58203c4e669d9276e5424c34a547c1e3ae432df86a27eef5e7188afc030fb5daba3cc9dddccb76b8f860f4cd945e
-DIST firefox-71.0-sq.xpi 549892 BLAKE2B 0991659203c1868195828684aacdb33d1b2df6cb797dfa00c10dc6ea5a366e5493ee6efc270f2c105677bc427d5da5f2f94426470da06d2b8079712a00a00a7a SHA512 b2ad1a895bc4c22b0814a6ff8a5dd8a93c92155da8373e35383776451b9e67b8da4c57354bd40428c4b0ec60e4420bd953cb2643a98c438d04a737de17fcf905
-DIST firefox-71.0-sr.xpi 552127 BLAKE2B efadff83b67c36841b8ee2c4400fc349100b53ce27b14401a5c0d2dff5eb8f5c205acf6559c2c74eba91eb8abc850c4ced3db3d8a0d16a2b2f153dd9f40de215 SHA512 7fd176602b632cbb09e7043a5daf12ccbbaa1c0d4a47829113788985b142f6df5a85cb33a5fc695aab27f7dc06edaba08b93a924edbeff2aa8471d547fbac2b8
-DIST firefox-71.0-sv-SE.xpi 535449 BLAKE2B 719bbbeae234570bd5b83682766eedf2ed2fff7192bed64833af371bb75d545bd386cd4abed15f31b19f1a8e20c95b4832f17648d99de51899e766c53eecf044 SHA512 85faa8e15f6c346eb6bc9a0774675803c5bcb69c1d4fa95cd4b3905cc10e012f213d33daaa1358e0732e294a916e31716432b9def75c370669f7af384ef254a3
-DIST firefox-71.0-ta.xpi 560975 BLAKE2B 25d9d29953a28569fbf280caddffe6b551389e09975fb1780131548a3192f642281b8e2d137c1fc33af1cd6fafd66d744324dd36e9ada69887e0b5d20c59c7d7 SHA512 8c2de23f247cd66a38fa6cdb615844c48633223e03b24377bb354fcad0f3c88b4e8fa935a7478643580932988741012fdd1e3f3068e0ffe9a846b6cf83e8de85
-DIST firefox-71.0-te.xpi 579563 BLAKE2B 0324a66ab94c4acd0970951c7b38fe45259ed489cb31a401a15891c11ded0b3326d23b01bef38d22e0ef786052c905be7d68f72224a7a78c8233a2dc4a13aebc SHA512 72cd2d3b29b8b1d7e1219a111808ebe190499c0d06a050bb1f3d43a814c58e13d44375f55e963d8d96b1b269895d3bee63380969395083973106bf402ffc3d29
-DIST firefox-71.0-th.xpi 588717 BLAKE2B a69ec173c9e3b32bf7514acab99c5e9a90a9bad20a75ca5f8abe8f748caaeb9c156fdf811a9cb8e78daec40c4d02cefbc291fa42a624863fb06678da2abcbc1b SHA512 0b86df6aae57973d9d6925753266c685197c905ecc53f856db89ef01c6d083f3eb043e00ae503c241d215771689b489fe1abd9022c4b679dcc7ebbb300807ec3
-DIST firefox-71.0-tr.xpi 548287 BLAKE2B 81a27ca61208a82385418ca7319de24718d3eb20f473bdb3584f03d335dd0c51b7db2c002ea9f898724b46e109b7b9fd41b7369b637dc4ea8bafe9bdcece01e0 SHA512 2d9d998eaa2172253064150a1d7395f52d5b7706c4fbed942854ce96b5c774e4de77015b41cd77dc5ac4b6bd8dc534f9590252ade42cff37f4ebe956e3712fd3
-DIST firefox-71.0-uk.xpi 608193 BLAKE2B 11128e8e1afae5a545d38808ce6f95df82c0d161255fa8f64e6f1dc614f0951478f63500ab06f948c8d06476f6da695ac2779bcaedea2a34ad76306c87d48bac SHA512 441df6a99815864dc75ed4b94d55585b72082fb70975d3177daccd68a04dcd1a13afd1a16fcbf33ad65c1cbddccfb270aa1bba58465546484722cb3d0387ddcb
-DIST firefox-71.0-ur.xpi 556725 BLAKE2B 8c957f6ab53a0d7225b768fae18cb900fcc91b1099e555e6e7109b003c3f4c8134218c9579778e01efb74d2841d933ff5d6af11f31a08b59161f6476407b3d91 SHA512 6b7914b561bc734a5d33ed4283ceeeb4c88343014e4d48afa9b529932e02b41061ba647415e43a751e0a8989f5d649d9b6d8723b50962e4b688c195fd106fa0e
-DIST firefox-71.0-uz.xpi 494755 BLAKE2B 600905ac5c21954e64ba38dc2923c83e970903f8a43f7f8d0ab2965a9e3c3aacf4b48710deca48deddf812a89949d669057884157eae55c99f864349bdb3a3d5 SHA512 a27dc824904814d673bdda6adece167ad00183d76d8523703878ab0263c77b5337ec1102a59facb7752b37b70a36f4ef9b31b7f4c1d502a67d163e8d9f95f889
-DIST firefox-71.0-vi.xpi 563455 BLAKE2B 99d892741ea487d025c0e206cf0954c960baeb7cc94edcec8a7fb9c1c11f74c5aa1910d551b89c2ca10c79fff27b271f9b4ab61383951294dc3c4791abd39537 SHA512 468930e0c6d298d6de7315bb8a2b8906a5a8b22752d2ce924bb523690c5759de60ff8c67da58c4c4bd79a4fe6ddf5510714bf6a89f672f07691c404968f6523d
-DIST firefox-71.0-xh.xpi 466494 BLAKE2B 89cd4ba2391fa6d1577542c71e3f7ac7eb18decb8c1c9d633f805f9402be061eb31509d1e60995e83c9c90749145722591b0e952ac56e7c26e5872879bc4a6f4 SHA512 bcb5bbae311db65f6e2a81c39b6a4d2e13f7ff79aaad217cafcd3b1992b1cfd3d25668c10e7c6a74392cbadfb7b302b74408ab116d19e0c2c952e0241310e20b
-DIST firefox-71.0-zh-CN.xpi 570176 BLAKE2B 4771f6ac64ed820a5837b172b02cb54133a3847d743e2a3eba934c4edce390b8fc1e9ff13409af5db4bc8d3ed07f9a843bd33301bd515128918869e87224a4fa SHA512 18eb4f39857f257f403656f81e38cba9b55bd29462f9d1e9148be092acc812ae27051d2c31b5a6312493e65c71d11881e0260d5cef9c1fe78df1c2b33388c475
-DIST firefox-71.0-zh-TW.xpi 568991 BLAKE2B 691e5aea3725516e4f2db1c91bfafe35d157d67332051f73139c6ae6f079db9b90e69478b285660a998242a33587567a1b0b36671464f096072e17d2dc741542 SHA512 4a949f2335da366827abb4b0e5944c0dd3132bcb750aed395bbc643bbfd4e72d2bed73dc505da241279ccd929e412371dd1eddce6581934a5c48be1ead1b3dad
-DIST firefox-71.0.source.tar.xz 312341460 BLAKE2B b94f7c716e79aaa756e89e06267e9941bb6f58ced516e8e2d284bb7617ae775bd877c000a84eccde3a1f2ffd60c289c8781cb551f6f013045914157653a216d5 SHA512 2f60bb7513dc2e730d8d558faad30367e12d27cb24b630aaebeb0473d0a202a3d4838b253d631722d57fb26f54145e296a710ec1714d3ba27dd71c6c1c52e920
-DIST firefox-72.0-patches-02.tar.xz 17028 BLAKE2B 5689840448fde363d4c3bf5b0d55ba9f6e54b4445c14dd6a40fdcec8d848c1174cec5bf359c8962906f032f927fdc000264e7b038917e9c81103ac7896afaa94 SHA512 86e97d732d431f1567945e380459de1ccb35d46e0befe9205f10ebdd9759e5111e477eff1383a28a17866e09118e2c7862af54c812c277797a9ec316f2b7306a
-DIST firefox-72.0.1-ach.xpi 489378 BLAKE2B ba4efe114e3db8bc7a5302d7cfc98482b29b105c853db7ca961e18e09774ffba03194dd0ae944ffc561df2bb62c44aad9a41c7b9b075a7e973ba2e54f2f94288 SHA512 fca7803a18dad67902de2251b9d4892c45b4861de40437c9e3aaae8d749fcea8503df670e07432a8acc08370230bad7ddc51878cda6d89ee52ef103f0e8ee163
-DIST firefox-72.0.1-af.xpi 446528 BLAKE2B 28f4467bb5b4b189eec4d4a55789af65977b11006673f02058ab9e8606452a81adf0d645466699672f2b1f23b1eebec6d2f59c9f3d4aae6f69d9dfc4473036a4 SHA512 d3959fdab50e22ece1402d5d27ec8bdbc67010aa9298996202e3a3aa2270c97bd967e9feca50dffd65f7a04e75c0712b5af5fc6a1b42382101dbc9000b83dbd2
-DIST firefox-72.0.1-an.xpi 498522 BLAKE2B c97705094af4f7d4b9ff1ec62e8ad5af56a4133aa53298f37051540368ac60c2a0514cb45d7afffdbb1bcd95023a4584a07b07149f2fa5e2b55072607c39f5cc SHA512 da8a95ae8474563e791bf9a6fd4b20475669712db72e19b342dac6d456df6d8887e746400c218c73d7b868c3599a3788ae4b991058c035be6f6750b2f50564f6
-DIST firefox-72.0.1-ar.xpi 562875 BLAKE2B 8762bedc71f3db39391537aa8f5b36dd12d950a64a46289d8a0d38e782502ce8b5d7971b5538ae57e3fe3a45d1ced17b635f04cfaceffdb8332299f069f0f715 SHA512 0b6914db5dabe7ae92b379d5090da7dd4a6e896f1517b54af2545ada627929aa008e17bdf04e7ccee54c93216d8d5b4dcb0cf5450e5150c4a131d82eeef32a82
-DIST firefox-72.0.1-ast.xpi 494009 BLAKE2B b39fb3235063368328e45d799c3889b18ab052c990ac48b38ffa4f58059495a93dbd3821a8ec38a0d081502e8bdaa26f8d39b05f87b0843fd06cc751abf68546 SHA512 3098bac094d70824e5263eafadd30fefd283e08f5db54e6760865d3427eda70340ff50b032daf7f483ec6f248eff5a158cc669b37196e8e3c8361ccb22a050b6
-DIST firefox-72.0.1-az.xpi 525922 BLAKE2B d6fdc9c27d19a0a480d8fe3bc3afdbb5b35d8852d36ce722aaff5b823547f7fbeb2fcc34a69ba0d7930d9982e682e6074a7a983902ce475476e3bb26dc4d75b0 SHA512 0427173a9a62a415b161be3e7db1a7b0148eefd555647d947c964c53629bcfb1100273915c97422aaaca3fffc4be921d858c7314134a2c001fac88c657b117de
-DIST firefox-72.0.1-be.xpi 620197 BLAKE2B 6ee3bbbe2b7b5c2c26aad3987162068b4b7183c835f703af4c8774867dab5a24e0ff65f2631f53cca7077b2fbb11a4455e79421415c105d30d881c4ba9ac96b1 SHA512 6da456ff7580393d9efee7508bfb3f2e59fcfc419d098b441ddc8b33402d4ca08253d36d3afe9b9bbfb02fb7845ffd3a4a743a3911a4bdca6b9604d02381f149
-DIST firefox-72.0.1-bg.xpi 580994 BLAKE2B 323f660460bf8f34ae1c4bf9d8dd3fafc74841dcd0e1dccf3fec0043f3c4f4f91c10f1f719d582d541d0eb7f8715733a9c90f3568809856c5bd828ec2e689a5e SHA512 66281ccc08dbc1fa6b1d586b70da68b3e333b4d759a10b17a48785d75e11763a677000b43159333aed0f37c0f38e2d80b8fb795be6611ff5defd1c6f27fc8f9a
-DIST firefox-72.0.1-bn.xpi 616409 BLAKE2B e1b223d0607080156a2a0af9aa915e6891cd10ec5b5ef0718940e84d4ec5851fc37d2d8765cb88e86a603c1a47d9bbabd7558ad5d200f7488d36fa49c7cb434a SHA512 98908ac3077bbf94b739ad5b4d59e7b5195b512db3ab204115d3324d10420e172772d61726b90eae18844b47d3e51dc4cc1ddbf4a67f12faebefe97617c64074
-DIST firefox-72.0.1-br.xpi 529064 BLAKE2B b962b56c8b64011f2c589ec22d4cb36e7e55518821505ac55a6477f135cd323ecec7296943c822a560cc3c1160ac1015c42f3979f4d584e198228245e417ad04 SHA512 d838e08e3d6c3f002924e7b3ead0f38a7aa65182a63ec4a1a5bef2a326f2a3a64e15b40aa87c8931d27f38f09e2e79a819df053bde00333603de7d9c29189a13
-DIST firefox-72.0.1-bs.xpi 498281 BLAKE2B 7b248702a0f9ebae8cd0ecc60eb6d87c8d2471dd0f35630eb421ffc6b216bc983968bce64e2e79d0866ba354906a9228e4f2abfc72a42c3254a8726376a71f15 SHA512 523d0c41610b1d76b91a7b4ee2ffd89d3a10e24f1c49518004b5f430a5c740c62ff86f1689e44c6d7acdaf70ed4776c2b9ad3834eef4ab51d9905adc0a405fee
-DIST firefox-72.0.1-ca.xpi 532668 BLAKE2B 16dd95831f9c2d7b94ff96bdadfdc3028c4cee3e3dcd02076531b3380c13c56a1375108b827726c2595f922839c97e32a88b3683d6d23ebdec06bbdc33e22448 SHA512 ed10746165d3118343e2acedde0127e3dcd9db80a793316c484ff2a33824f87662f2e99a8d1942ebf2bb5cb5f7006543b19b1a9882ba7b444ffabeacea1eafb7
-DIST firefox-72.0.1-cak.xpi 561998 BLAKE2B d44317ca9cff0c21dc15fd411fa79a8f783b3dfaed04182de31cdf9e5a5c7a02cddffb68c7f231861c83fedbeb5ec854e18170fe8409bb6afdc2bb7aa3b45018 SHA512 e2502797cdfd03d94e4139933750cd9395eb58f7780c5abe2c0c1c23c0bea1cee7623ac574f555b9dd2f70d14d9cdb3b42b32b54ab17f2c46ac544462a8d1526
-DIST firefox-72.0.1-cs.xpi 556343 BLAKE2B 399b72b62bb5a488ed133f882157fc3284c77de554e922bcea01e921cc285aae6ced0fa2bac134b50841c2e298203adf8cbfbc791611120cc1cd097d473819df SHA512 37b3aa4b857f6f5cfa64eba55a7c42b4c7ef644192517113242f90815497372e49acd5d516ed769a95ac89749597901d2ea6781dd242f85bd2691a7a198948e4
-DIST firefox-72.0.1-cy.xpi 538330 BLAKE2B b2582eda477a8823a608b453032baacee8884c991b733964d7b72931a1d9ced333a57fc130099e3e37ff244624e79176613160a9b00c266fa0f54639b3bb8755 SHA512 4809f5842058bcefe2d81443af6c9e87e4fa824847d92aa440ac6e61acb83cb9f888f82c5a9e0ef56693919fa9aee37d47690c1321ea2dfd49bec92ca7e5cb80
-DIST firefox-72.0.1-da.xpi 522280 BLAKE2B 997c901be0dbb4acc3c41b102292142efa56b79c51317e4f06d4aa2a9827d0ba942de036bee5060916728a5c5140552f3d427b6caedd0adbbce846755d29b892 SHA512 aab169282267d6a955da387c4c87f159372d3d71b3784dfab73c085972c4aa4390a7ced8bf9eaa41bd4e38d84457a488846a12382a5b3d31a3e4f29887793c87
-DIST firefox-72.0.1-de.xpi 553568 BLAKE2B 7a48f445cfcc69c3185c0159af6281bb7d31eeb00a56cd5efc1953bf34c73c00ecd7dd9996bf4b5fa5b9c9016d2a23a71bf22ca5fb14b01208587f698dfa0059 SHA512 27a6c5a574c7fea8b3e8b792666259f1c4eea5d0c25aed21d6402b34d83d7a1e4126e1c81a6e8b7ecf24c0c4c2f9b3e466262832c5c3d3b6781271d5685b3bff
-DIST firefox-72.0.1-dsb.xpi 564094 BLAKE2B 1e476823b9b31dd73e3325a487a761acaada0337f61801035a79381c7f9be7e00e39d98cf5db338ce3f7a33dd19d2992cfce5a702ef47f4cf8df962f2309d6be SHA512 042be843a791ad0a1ae9c2d151c77e946fa2d13654c3291f487bb04a1dacb20217f5e69e81e6194769d100f5dbc399a899f13ef87673ce04abf46d5f20d90fb9
-DIST firefox-72.0.1-el.xpi 624799 BLAKE2B 7a9ea5d71632fe874e5e90a14732ab4d0665cf4ea0d0cc975b4bcd056e30642732c0383d29a3bfdfd6e8b26488e567d27bb16c91f93c07cb6d8d251e8cdcf3e7 SHA512 6bc41acec2e778cfddd0fa805214d3157f23bdd56dd029cddd48aaefbcbc4465ae9dcffae1f92f438307d36e31bf0a00fc0a4b7dcd3489aa40fdb66cb6d26dab
-DIST firefox-72.0.1-en-CA.xpi 508405 BLAKE2B f9c016d6cbb2830d3637366b3cfdc8fb03c13776a5c6e40010703f2e44ad3c5d62011039c70a639792c07f338e167a247035b95b830ca1d4441bcdd49c4c60a5 SHA512 f9566e0babb7066b4dd6781298988ee0005acef0a45c1893665ba919a4d538ea500fae14538bd13da8e35c2126a35135e09e86fd2144f5cea0941a366013e85b
-DIST firefox-72.0.1-en-GB.xpi 507215 BLAKE2B f60d36d450819bbb0cad68ba4b3912e0125b302c16c73528fc6c23349cb2333c3eb94ed13b405ac5d7342e038e4ed767f0a31d705800ffbee6515a8c81ed4f46 SHA512 9b09a0051f01d5fd539d056835b6d1ffb53706e0dc3ec802b3932758a468dd1c1f0c62b3e5e76440454784d8e803905466e80c3d72edb8f292fc08cca9e27292
-DIST firefox-72.0.1-eo.xpi 533899 BLAKE2B beb4a1b84301b7b61a40f66f0abfd3096c507775ce6792d6df2c797669736aa98aebbadc276605f325ef1ba413a40c2582adb3ad51b57feaef102dbf6400c95f SHA512 43e4ca25d9323430c71ded2ce0717c12165522a4a3e4057632f73e343fff82e9afcd5cafab3d9796eace056d922c8818e8f9458f7d409d8b025c979da15baa98
-DIST firefox-72.0.1-es-AR.xpi 543731 BLAKE2B 8ca5d07d86d400f9a7e520165f68be94827bb80c66e393bcb6179df5a3aaeab7a2d45d548392d5c83f181887678375fc803d7e89539999dd7bc70fad64b4eb96 SHA512 41716932e265543ca3b6d44c46fc2fe031c2ad1c14510ec29ca872216cf6d5da063e95c84471c696fa48a8e1b88b6f002746fae122fc9418eb1fa48adcfe606f
-DIST firefox-72.0.1-es-CL.xpi 543282 BLAKE2B 67f4e3371636d170adb767e5a3b2fdfa7bd25e8bacb3b528af522b19a929cd086c8f1f5f725e6a7a849264ae6e583eed9479831a533b29d7fab2f4c6e6a78936 SHA512 31c974273f389ef14dfb765b1391a68e3090fabe5d5669a9485103b0f400d57aca7afdd30c3b419b54c3629f9bfb6e8266dbee37296f8bba3f231a35fd4b1551
-DIST firefox-72.0.1-es-ES.xpi 521573 BLAKE2B c2af907d963331c1ff6016a103463ed59c37e2baa38e13a5a3887935d7ec262d021a89b2f1469326eca9ed2091bd9410a9c168829709ac1df3877f5960508a38 SHA512 534df734942de4bb0410e83e3af7fb62feac0a8505475c89169a4d8c42998907e003208cf0225ac2bb7541d8398c1549aae1976e010dc7b1644aca878af00769
-DIST firefox-72.0.1-es-MX.xpi 546572 BLAKE2B 4ed673c668cd130822698a259b2c4649b2bba979c32e7dd40331b0bc80ab6312e799de1f972e7c0b89edca025fbb3f2c5c362085a6656df63c897b9fbcc96a4d SHA512 797bdd0765fec1009c559df5211424f7bf9a48c6ca031d35839d0a4819b72df9ef448107fe3b4aef6e0d1fda5f250e9e55f1a15acf51f1219fcda23b2508f8f6
-DIST firefox-72.0.1-et.xpi 523215 BLAKE2B b2d111a58ba1073f28025e9424b9e27d90e96afd96df29b7c38d777b83cdad5787ad3cb7bd101b54fcfa6199c92e516f2cbcce37b59e196235fe1c5f2ea98bdc SHA512 ac77d61626897100084360dcfb7e6582cd954b0dab281fb5f05e3d2d5db4252862d5e1096544b5d4ddbfab47bc2b7bee9a183d4a76e4eb6464117c6bb2f4c458
-DIST firefox-72.0.1-eu.xpi 534197 BLAKE2B 80bff894a9202d78a26956f23cf793bd0f794b675c1186f4c2123f2fc5d619fb078ac05f607dc13e03b1aaa746b383f63bdd8f9fd6110ee519b29aa5b03aaf31 SHA512 66687539b8b7b536dfe1aff811a0e96607a64524702b1b4e86331ca5b33be4d7a81bafade869bec9ac453e77dd0a6b84e9dde05408ecbbda35d7207edff26ffb
-DIST firefox-72.0.1-fa.xpi 581229 BLAKE2B 2c7b5a522e52fa26a69281232be5775f1e8243ec41d8ec5a7d3a3f6d37f9d5a8227368c62954f57b3530887fd661548ba80aff8110079ec1ece967b3edf8cadd SHA512 43aedfdce8f21f676e1b2d9a9f03cd672975ee2058bd73c03561fa173240c2335cdde5a82bf38c9e036270c01baa8b86c340a33049dd848cf5d7f355f3c0edf4
-DIST firefox-72.0.1-ff.xpi 501349 BLAKE2B f4477a42f8ab2504a3e9571586e93afa688a1c3e90ff27b443dc3574be7601e2b0906c925b73deefbb6f4f8acbe6c941ee6f82ab05580afcb349f8f7f9ddba05 SHA512 1c137931c1c30dac5fabdeb99ae212dc3be3ef32ca8a5ee49c0ab06a04e5fd56e482004b202ad493540f373fcded139b9ff90ce3eaae869f1a3ae355ee129fc2
-DIST firefox-72.0.1-fi.xpi 529578 BLAKE2B 2dbb549795f25c55bb53b0935a75d28c4a482673fa54899012b67714de44902db515e555e869a54724f47c5f3e114563967d2bafb174dec877ef9c0c45c61dec SHA512 470e8b682c47c37b23bbd56f0da49d0f59409ff0899ca3aa0f59e6250624509ce591f9c65d340ca96565f07dbc42c0813f58be9b182a942301c83a8d94110985
-DIST firefox-72.0.1-fr.xpi 555806 BLAKE2B dfad8ee386d3d9ec3e9cd1a125429194abc03acbfb81f9923d7af5bf37da8e8041b8d5702897fbca5416d1197566b7c18e6d2b8c1106ac4dbb66e2c1824fda10 SHA512 bc8944c19171a464a1e30b73a898510a06313bb8a8d7cc5fbc6ca9f6b9a245cd995ebb22e016c5b263fbfd9bcc091e40261cec4443cf15ae9ddeb471dbddaec2
-DIST firefox-72.0.1-fy-NL.xpi 539208 BLAKE2B 962e896dc8539711ef4482b4d3a5a9bf65fd02e2227290038db20a9637b77712024601cedf889b4743274a328ffb53f915b64a1681c3db6d013599cbd78036d0 SHA512 e4649435c2fe877f19a994297d97cf4c73cefb1473af0d5f126022dee7ebb3e3563dd97eab8e423ff8b5b66595eb281f022857cc5be4923c8d69be358c831521
-DIST firefox-72.0.1-ga-IE.xpi 500375 BLAKE2B c780b05d64ac10118d7271d427ebeda48c557a14d3f8312c407113e9d859cd2e13e79954665239b669054c6a02e0b74a935715414b46831e80dfeb2270de8f96 SHA512 6bb9eba24a43825067fee78bdce53e7bb583c63bccb632526f99c39583b9507744b9e025a7c44935e003b41f9a307054547eacf32bf6191ebd7a94fbc604e3b6
-DIST firefox-72.0.1-gd.xpi 525843 BLAKE2B d9c573ace70c1824f2d597549c681bca8a41de0c9ef58616526c7ce45b7d002427e7236707cd73e11c82d86854cd7c2092b783fdafcaef5264daa017225f18a7 SHA512 acc1023c95747c39c7aa546d2a8863b4aa1cd6c32fcc8a7b3bdf33c1df37b5d6c824deea69a74612da3ad257a1228a7f08b955da55b389efc91d65b195fd2c18
-DIST firefox-72.0.1-gl.xpi 502396 BLAKE2B 85912de447c0a5e97ba4e27cb684d289777baf2e8f71f7e774285217c1eb792a80bf9cc79297a31ed298df4d08036387e9bcbc85ca9c513c9800674ada86a5f2 SHA512 4592f6f32f11153ade213f2e3e9c3b3b3509ed625f6c001f5dc4cdca258a348d89a0c95c37bcc440204119dfb8f1a1a2d42b3ff16382459f70316e1bd5d42bce
-DIST firefox-72.0.1-gn.xpi 557347 BLAKE2B 87caece9fde7c219475afb971780f6295fb21c468dd4f488ff3b433318a2c155aa3b4a68af32ab1d9b2165a024d3fe059e4fe23556663d7cf6d4acaef3e4653e SHA512 77f148bb1569a019847a0f1def80111a7e84e4005ba9e57b09dfba7b74f6f558ff224fe23f3f7b9e7dda61f2579260fc867e11142519f5ff093083afc3570906
-DIST firefox-72.0.1-gu-IN.xpi 593342 BLAKE2B ec849d10ae2880fe025aa147dccde3472cf61fdd1968135ae384b156d3fe10c2c744b0a87fc53c50cca63d0aa099e0017089e5d66599e6a157271afb1f37ad43 SHA512 96c92ace6e6d02bcafe8a6bc4243b696df016b86fd8e4be9044df294ca7d5d2a093b9da64ce924e43eb26eee29a245f7c5d1885797a041780f63c077eb0b8d98
-DIST firefox-72.0.1-he.xpi 551461 BLAKE2B a8a6a3ace85af2f02c67c1afc20194949b8273061859d1cbaa4d9bb2cddd945956cd910041713bbe7f1abc27eeff8a08da2d4a88005e3f06bf2f68cd48bacc30 SHA512 e1a0d87200ee100c97427c2a65a69ed4acb3e6075a0bde0a293838a61d28934192b42ccd142a0f351cc7ffe7e8f8c406cc7ad1e80e4535ce28f72fc9e9e10c39
-DIST firefox-72.0.1-hi-IN.xpi 599258 BLAKE2B 8bccfd235f0d5f2066bbd4a21a2657898516934460ed3b9267182d76083805a91c59bb33d70cba84b4405d2e754371f489cec9325c2533897725e96e8169d64e SHA512 7577202c87622793304b06f3ce88be7e9dd3e8255bb717770bcebfc6827bb33a9af04cade0eee9b3e6a33362e29ecf05619027f3d820a9bb5d09f17e2c05f13b
-DIST firefox-72.0.1-hr.xpi 536156 BLAKE2B 86cef50fa11afe24472a4f6f7ed1ea91371a70aaa4910cbbe7bada07bcecb076820da1bf82c8f7d63919dce73adcafc4936d85fbc4d5ef82784f1457d421559e SHA512 cb8ac82bc1bbb903d51966c37f5cc535a9ba325dd823fe8369a9034531715c3defa5bbc7b622e651f8f68593a474c0a0e51be0284f4ddff8cddaab8fb3e85599
-DIST firefox-72.0.1-hsb.xpi 558387 BLAKE2B e421e9d189a0b82c48a9c71413f052a82fe088adb7455cfe6882e7e722b684aef3c2917aec2e50104fb9834a28b0e9f96accab1a045f88b2c62f9c93bec8b997 SHA512 01518d2a0cda841be0519f6ca043ebbbb89b5a6737c748943c6e6cf9956c321f05920ebfc5d5f95f407763a603e78ef777837cf4805ad80f3eebf097adea4171
-DIST firefox-72.0.1-hu.xpi 563619 BLAKE2B a392b9a757577142bf6b92f6487dc835be8eec27cf07bc6e50e7d0e207bacea39b6e9004c62a1cef46c9ea7b586c1df0539d1ecad7e0c1296ffe532f9f382e5b SHA512 277701c9d670f7f91d77b9b7840dc24e7ee24fff5c41c02ac0e6e7b51f2448c90126db9c3bdd2842d49772b7c6bb7167b4df3e1130b9006661054122fd2caa1b
-DIST firefox-72.0.1-hy-AM.xpi 581460 BLAKE2B 5eeed16298f0217fca313b192521bf90abbc7782ff6924c2700a78371aef1330553fd913e13bde290d6ed4d5a1a4157855815095a64ad87174f5d8a6ee54d4a2 SHA512 ef609e1429770b264efa5debae5fd3fa0aafa7b72aa97b317f55c333b3e8471a4fae1d616a0edc6d64b94b8c21b9d1dcf9d6bf9845fed09b22c2ffe153ea472d
-DIST firefox-72.0.1-ia.xpi 524500 BLAKE2B a847e4ee03ebe7eeb14270aac98a6ca2eb01cd62fa89040cecdabb5bad2d784b8a2bcf64afc4a4149cb2d7229793f19c3438e23e9685b6f60a922676aecec8bf SHA512 607a023ba8a4a27a5b5ac19129c2498344a052eb020b36d8c2550d77924595dc0b937dcdfcf6ea7b35bd1576c70f698681379b4d6d3394c158d1c886849567a8
-DIST firefox-72.0.1-id.xpi 520734 BLAKE2B 26e77c493af2dc2c76c9373e899c424ac6b9ae1f4583681bc6e665d37f70372b516eaa915d747a3d2dad1e835bb10d239fc158704d33a75a6eba6b603bc4631e SHA512 49dbaa76653c1ca8fdba76f42944eca3e6bc1a142a3afaab149b6f6baa503573cfbd21ee960fdcac080b163dc878ed63adc000baca63f3300b6e9e1822d30068
-DIST firefox-72.0.1-is.xpi 515247 BLAKE2B 3947242e0e98cd48ed2921e26f95f431d1482c17614dc2770cb4090bd959efbc6ae0e5e0b97167fa721b255379cf1a83d1b61c9c46fc5635d9dc2ad0bf19b4b6 SHA512 0b4e17b1174e058d3caf6fc426dabfdc168eb2b94b1848d6ccb19cc2ff8ca5d20be8874e878f09c5728598b5363ac7eed9f9d37bc793f4803ad0bf8a4e0c8db8
-DIST firefox-72.0.1-it.xpi 422281 BLAKE2B 9bef2b6be2022025a1356697acb1eec830e163a9be072a48b61f4e9c030d41dd311f9123fe2d6c2dc4919a6951ef6c32af3661880b32e94957e94fe4905261a6 SHA512 dcfec7102220dba320d2b5bbaee9494c3cfcd9eabfbedc895df8bedcda6d2fe287fbc92400e4b48b226fead650e1daddf61381303b197a65bd18afd92dbd6ed4
-DIST firefox-72.0.1-ja.xpi 581036 BLAKE2B 69968c05157e1c4f94e3864c25aa773aa5a2c28bdb9558b87b38dbb4555495e27483b98fa6437e26b8baf8c24fa2a02197929fd25bdc8e2d04d07d5e36577edc SHA512 bb94487dfb47f76638440c05a041a74b9537fff042394a2c16df170bd25bb8525699004fc52926701d276b98bd22b08b29df4b19353fccc79e4896545c5de9ce
-DIST firefox-72.0.1-ka.xpi 584720 BLAKE2B 5f4a59a7c65a9fdec8f3356b4bd07feb7ef5339b1db36019701cef9520041062ef4bdbb1d39554cf1d549aade847a53f974883145f214154c19b73e4c9980163 SHA512 9219b8d5e72712fb4dbccfaf2b97770ab1b70a0715e9be6ef99e76c89823c65517ff047862917377c01458d8ad817fbbdfc22c87590a90894a5d2935bc27f7dc
-DIST firefox-72.0.1-kab.xpi 543922 BLAKE2B fea205dcba0e5c411b57d962c59788f9695e512d2f86c4636e8ea1c9ec25e9829c84915c52bcd92755040d8d0701471c4c2b16d0290c63a927065b9110fcc3d8 SHA512 2e0799436cc41195033688fc5c57bee1988e92bd4e1828e58eb63408a907503101a2b386bd02acb5aedd2f17da8ae91551a81e0292c59d9e4e8e3b3337b96637
-DIST firefox-72.0.1-kk.xpi 603717 BLAKE2B c6ffa665b24518fdec01c04d80d516384e3e7caafd25f0789f07571a58e890f6e0757be344bb1b87ea811944b42e1a63b7769636506f4c633d3244c5c8180883 SHA512 03b8772f4f8a773dd0490f38712bd84433614c3f17c426b3e1fa4c547860ac61511b1dabc4b2cf7c8d70b528f07991d359c68505a2aa40f378b10777c4fa87ab
-DIST firefox-72.0.1-km.xpi 567153 BLAKE2B 1ba17f02962446e71b341d3ccc651a83050b4588a7e2dc38742fc354ba50b3960be5cec6c1efa3dd096d6eea5873033a311fd69082095f48e69227b637ac6cfa SHA512 9f8de7af458734fb0c43f553a15b7f9989c95907991c41d8d162521f22baa662e0a8a5a8887f5de0ea97f9f4943dbbe5765734c21e33151346c6ffb48cf13b90
-DIST firefox-72.0.1-kn.xpi 559907 BLAKE2B 4f9742128dc0f4c05a553fa2238ee79b0a43df0643a3d3a874c9365415a4aa8ee305c375d248f3432174cc19b046b658ac995a0e03b5e4742c562e40ff8c2c66 SHA512 4eca54081c968b932f4b0f855104a1117a56814cbabfd61df6d623680f9b6eff194c836eb9699162290919cae602e7a0b86e4b57718ab819bfbe70a9a0cd44ec
-DIST firefox-72.0.1-ko.xpi 574045 BLAKE2B f98c4e6595532a4f83faf511e3d9ab4c7c5e9f5d020af09fd8483765848d03baa229b55a114ecedf94ce32298dad643389026ba8a2907448cd69f4cead36aa46 SHA512 70276b0197cacc38c8c8aeb051a330665ec63d09c2efda77ed29036245892db8f246da06998c9c553c64d49c5b43fdc9e143d6f3a5ac58e5f5e6e96869b7dbe3
-DIST firefox-72.0.1-lij.xpi 506889 BLAKE2B dd4422478217701e41e9060bf55124b02de02b9e0109b76a7c479bd7828f5b844b89675005fef154e1a004ed238845bb262a79bd9d5b05b03aadbf340c529384 SHA512 719ebaa65f600cf313a3ea6173712488cb8fb5238d02d949e20d2246ce98098c4595f9ef4a9a0e802ea4323377315c569b2e7e502da75a13d468a92ffc296ea9
-DIST firefox-72.0.1-lt.xpi 560507 BLAKE2B 913e1547249d78ddc102e6c0163f623439eef7f1b1bed89be4cbf52fcf8847310777eaa50bb55d56c98716b477ba5c066421bf282a8f24277dfde880c6f3995f SHA512 b75eea1567dbe22420ff89de714f286713aac9ed1c247e67d93623ddf08fa2cae217882e48d8132a8cfd3f3f85f07d4925a6f2ad28a4b8a9138b050ab619e2fd
-DIST firefox-72.0.1-lv.xpi 515061 BLAKE2B 075a59e21de7c701dcbea9078e2285a75b72023f3b9328e6f5af5387430655fccd1e6332ef4a9650d9e25a7d14ac7fd7ada074a985520acd2afe6c60983a7f6f SHA512 3f886431658131b528556eadeddd9e9ff9d400f7f19cd745c0a2e521c1ee327546f717e526796e471be9aeaea7b66c8dc1053374cecd5fc0daead9a7a704dedf
-DIST firefox-72.0.1-mk.xpi 489183 BLAKE2B b03a55258ec68b5cc2b7b68175d1160359d11925beffb0f6615373f8cbd021b0cdbab924fae2a61c04c12e896539b594927348a67aa0bcfd8d73df06f0179694 SHA512 a83f26266e5af2b9dab0423db131c59a3ce9aca332aae3a1e62e44dd69aa93188aa03ecf44add5912470ae46ab619c34b31109703aad169e1e59d803bbd9ba52
-DIST firefox-72.0.1-mr.xpi 590679 BLAKE2B a3504a0c8533735a61201563881d67e5623439442418bc2288955296eca6fc4c03501bbf2f40a26b38e0799e47243a0155e32d0c7d4d55692575f2af630c1ec4 SHA512 11729b0aba398b34a866058f2a3272e415dc2928a6a2a57075bee2e7b18965519665eed20874662d1a0d3509a91ebae0e592df516ddf7d892a49b5fa0a52bb8b
-DIST firefox-72.0.1-ms.xpi 496982 BLAKE2B abbc3cb43f958d136c776ceef7c570a95ac88aca3ae24b3e186dc889a77269562e58ab84a6c40b3e7116b3f26be3d8e1e533be84233eebe4a215b0739050df0a SHA512 a816269e728582e5007c47f2a4d05cbac7ed89f1642da4cd23462ddbb7e1e2dc023650d7dd4362ebf188848affef93003f7b009d3b02a56ac409666cd9427926
-DIST firefox-72.0.1-my.xpi 561643 BLAKE2B 01ea7cb423bd7bfd014a4513842eef81a6bc0131ff7131fb5ad66ec1f566de8011d5add4f8e72f69567770593e3afbe8e6e57a965e6de0c8aa3d4e496606cf66 SHA512 deec98cdbb6ce76872f397fa7be220616203557a61a14f9e27d482fd0be4ffe9278a1a503ef2f8f11fa769526fd9f9df6401d76a24d9a0530270fe53ff5704a3
-DIST firefox-72.0.1-nb-NO.xpi 526169 BLAKE2B 17726b81f68dc0a9896eee379cc2fba0d94b0d3bd72a6ec1550e71d0bc04b9cab95b1b620d65d4569a4c3ea1928452c43cd380780318092f0cfbf4af50aa3a19 SHA512 a1ce2f3cbfb5a318b15fbbd3ba797dabf4fc71baff36ae6fe38375c1e2da9b197e97ea54405256bbc69f50a6e7cc606d4e47858994b9adee3abbaf24d96ce03f
-DIST firefox-72.0.1-nl.xpi 527678 BLAKE2B e5e8bc6f06d8b59a8a73f0496ceb5a4184873f300e50359bc61c53996e6b791eb68d0dc054102f50ed22be0278c5745866c339ac295f30771d4eecd4909dc066 SHA512 8e102b450df30bea8fd3d9c84ee0370446656ba64d0c2c20bf0b10111af78d8ecc3a00cdddb021e58ec347d8022b5b2a161c5a48785d001184ebf9e0c528ff30
-DIST firefox-72.0.1-nn-NO.xpi 528069 BLAKE2B fe7fc1d88b46f2a7a2c6f56e02a08283ede34772598424883729ec61a7320d05f2f4cb0f0943222d81a31f9fa9d8707a6fc7574d84a3704088b1b344f3c6e015 SHA512 46c04140efe62dbd0d55a98149ae4fd6744445ada5b4f72d83f06bfa3737138da4d00781cb4f85bf8d2270d0ea05144fb1bb7a814608a81da46ba400864c5b87
-DIST firefox-72.0.1-oc.xpi 516120 BLAKE2B 94e3f5555489532c021df12d43f63d92151c1d34629c7e616f7c346fd8aa4bd7726c8f4a51ec8ea30bb643fae87816b5c32328485b34be92f9f6caeb909fff06 SHA512 7429d75c5bded088bc76ed8bce880769edf8e55b9240cee74c7e07617011c24b694ed9b9c4ed845fa19fb112c5d2f155cfc5b0d0d4e8049b5f27ee169a9a9829
-DIST firefox-72.0.1-pa-IN.xpi 571206 BLAKE2B e23f3ae01de84f748cea89b57d93dba13285eb96ce15014d629a85649c5c525683d3e95db53c223118cdbffff7f341887db0864df249950af11a12a680aed342 SHA512 1f4122aee2169fda03feb121edbed46238911483b46851f1928610fefaa6ade432fb0ff7081df1e71e4ffb2649eff8972f7be016293820442ce75270d5cd2424
-DIST firefox-72.0.1-pl.xpi 540722 BLAKE2B 35f0b9d252ab944bafea875953dd65e498d92d2d92fd40ad300574eb3e7616fdaef76b40da7768ee4ddec516682220ed293835fa5badcdaa37f5863fc5c0690f SHA512 bf58c7992aadd074f1bcc8739eff3db5057f1c68d1636d458edf0482f5bfa8cf5e6cb50f5d134ee987abd6070b39ec50c4a4290cdfc34ae60e8b36bef6ec0baf
-DIST firefox-72.0.1-pt-BR.xpi 529294 BLAKE2B 4b2f2e414700e4e9e17be4c9fa4edaad109ac9dd4fad0c3f6e610c7962b8907d3982e09ff4d3672401344c6d39dc54eab965fa6d63fd1f2bd37f819ff0a04e6f SHA512 5f735be5b4743c7d2f08d2d9aa70982af4d93eaaf2d778714534494a41a90f90d735ed6182f6a91c10b388b400cd0bc2a098c889c4f41a58d040af045297fc43
-DIST firefox-72.0.1-pt-PT.xpi 538666 BLAKE2B 2f1e79e1205fd3747389e3c96a2fd944a22bef3531371343212656f437ef7da492dc179e11e1f4877e283caaad70c496a269c5c862f28d95ec3d080808882d25 SHA512 0079dd1316014e3c6343b05027efdb8934b8a62db7151f0af36ba3a2627f02c086a4dd2ab03b51058387175a4a7bf9f55ef442c20c71add4d70f8284bf02d8b6
-DIST firefox-72.0.1-rm.xpi 532462 BLAKE2B fa93293c9e15995535bfd5c45d07967e601fdf39065215f7bcf90172b2e1bf6cf6a22979b45e31fbb8259cac7747043957cea52af11e93b4a4cc8fc2c5169bc2 SHA512 5989394204e072d27a47ec02ec236968dc311f7ee04ab1cbd6d0559c168b1de2b401b56524e40be4d934591cd2366feaa719f7f36aa8bee1d62bb9465918936e
-DIST firefox-72.0.1-ro.xpi 540273 BLAKE2B 30387482a450e5f4b63a8a0deae8bfd2979e116ba4d05bab4738feacc546520a8625af31befc1eb092209b4ebada115728e65728f39b5799b517c335eca5414f SHA512 8b722d7d089ffa13fd93f259e24e479b812140aec533813c33a2605bf616e0b49c0119852368cf12aeea323fb3d0125060c26b82c26ca9608f1cdd9f9e7ee862
-DIST firefox-72.0.1-ru.xpi 622758 BLAKE2B 493fab3ecf1f89b74c1d03682f9d6d9c9af3cce6dd7e2d1a53c881a80300140ef3905a0d9d367203e30c80c511125bf85335a6e49a4ab8fc1c22c51bc1b39d98 SHA512 0864f0940b81bcf7939d34931fdd51435cce9facbbdbf2ddbd78c0eaa79d4c3a9674ac847f18dbc0ba76a03b3c484fa8fc0777a73a2dfe3b50e046a21e317e97
-DIST firefox-72.0.1-si.xpi 537653 BLAKE2B c283e20cf6fc6a2b8e66f36a078c9c2b2f2fd30805add45de2fd91de378b24b8043eac38c34c7de7696781ac70998e6861c0bf5038626c3395461ce7c069a561 SHA512 6e5560c9b7affff818cbd1152eb872e2c2fa962a7397dccfea55f1e6d2625c4cd0d4424cbe9d41ed85cb6a62fb263411bf966eb2f3985286ece7cd3bfaa35eea
-DIST firefox-72.0.1-sk.xpi 560174 BLAKE2B bc866e46681def4971ee61f3093f197c6efa67c0e56098f935ea250fb8707f9e6e568c7026470239db054c6bcb205d007bf31111fc63d9954bb2e185773decc6 SHA512 67dda5000b57d13501089c43b776ce93dcfc0a3787c3ee0906c97a60f28d7c9577c4dba7116402c2853920e4b78188ef888dd60f5d8b8399c44bb2acaf768f93
-DIST firefox-72.0.1-sl.xpi 539904 BLAKE2B ee17782a5646527e58de15c34573064e1aeb32a38c2311dab520bc738d52d7dbca4d25e9129c87d691dd4622cb7a29e712b0ea51e44a489e4fbab3498d43440f SHA512 a9cb353b6eebaccac08310d1839943570c82c63f81360d9bfdd5e44ac0c1e514f97a8efdfd8514dcd8f99b3f718532e58d118944a1d672e62114b3e919899df0
-DIST firefox-72.0.1-son.xpi 465364 BLAKE2B ceeb95ca9e7505e15742f5deb454301fbf8900597a486a274d7a75c7548785a37843dc940ae05a788550d98aaee393dee5a9eeb6068f295d795dd90ed44695d0 SHA512 2b8aaebea1499c1e419decbe6ff14c6835f5e74d9fa17fd6249371c1e051c89b55e20da894a62899976d1f8d1cbe230f54806a251bf4da4bc1f54e2739a28b47
-DIST firefox-72.0.1-sq.xpi 551704 BLAKE2B 3196370bcb870f047afbf3232c6158ef4b33d9e98276ee753520f23396ea4a33632a090bc83ed1e85d1a8f9eaa8eb67df7898d80c85383dc54c3614ba5f1de5b SHA512 143cf49ef18997085d03e3f5049f652f94a048b34e5a75cbbeab776d3350638e9260d6d3bf5f3a9258b56aa449ea2a60ccdb35f95876a723351b72559efce2f2
-DIST firefox-72.0.1-sr.xpi 555529 BLAKE2B cdd462bcb552ff35ea6a970caa1cd3ccc2baa93ebde403f2887f54cc9326520b51efabb8b763d5a7fce35867aa2f1ef67dfaa972f61089cf0ed8b81cd7f75ea8 SHA512 3adc5bf0ef7c1b56cb30a0abb1f059cfcf69eaa64818081432d88bdbd280300e237c57605231f78fcae43db4e6193e3dcbc81820ae8298add7b094d98dd0ca17
-DIST firefox-72.0.1-sv-SE.xpi 538033 BLAKE2B a594b0f978157b2d1bf2618630aafaccfd688fa139d6d2ba2966ca3fe3331a7915fb21fe0408453a248e816cf054c591473fbef55e826569764702cd8537f3a0 SHA512 5ee43f89dd128754a198ab8295ee7fb92665642e9afd44fff3ec7db0872f214fc73e63e9aeda856ac86d62bbe73d79830f1bda42ce270d365bfd2f13f87b2792
-DIST firefox-72.0.1-ta.xpi 565632 BLAKE2B dc5ec835cd0141f124f3657011a2a02fee466c9cdd2d604caa0f3a71eef5c45a9c36fc9c18d790a73be456dc7d43842136be7c7ea8b1477ca90ab5e11964d711 SHA512 2b4d1c89aba52171e3ab2b0bfaa9f954ed7f8eccc4c9d834ac0e724f782b428841f3cabf56aa5511e6f2ca273478ce15afd7bc4cb0067ffd031d7c3cdb1408b8
-DIST firefox-72.0.1-te.xpi 582704 BLAKE2B d6eb0849b27857fb5bcf31b73cc5391fb1745fff43d147acbfeb8aaa1d5e0c86930707e3c782180f712dd3172d3fb4a09fc02ef6f73aadee0f6ebf975ed89e92 SHA512 2f6f372f19ff69d4481039ed4f6ead12f8ecb054f35fbe115800dbbea69094345509a34c98a2d05a52e5ecb7d519c68f92dee6cf3ddcbdcbd595383f183d34aa
-DIST firefox-72.0.1-th.xpi 598815 BLAKE2B c2472c14342f3eecc2a6e9aa1024bc8c0d029e92ababc49c17aa2a20d0d4c6a7d5ae8d4a043dd681f20a15bd7bcff4da013571de1492cf2b291eb1dbd31e35b7 SHA512 3b6a9d579cc43e3697126db73aef6d3381219823f0abbb8c392b587dfcfd6a16ac6153f503e8e3644e3df8eb394dbdc21c6ebe85b1eacf78e4119a19975596c6
-DIST firefox-72.0.1-tr.xpi 551514 BLAKE2B 83328ec7d01953b990602ca08917fb5fcacb7055c9aa79150428a4628e3e4462073168c598a08c5c6a66c8d35f6c5352320d91891f0a6634c4d758760c018f2c SHA512 66f0b4070872aaf1488dcfcce9f4b299dfba50b4fbecbd4fcfbda4a525f529993c73122113e303f16285f87624a9673c40062a2712ceb655ed32e25b941b37ad
-DIST firefox-72.0.1-uk.xpi 613106 BLAKE2B aac98e18366110f2b09f6450833a03dd5a4732bbecdaeb77050cb52b1d4d52b35f490050301c4477c394150bd1133b6436482ee505b3eff32a581bbf7615bdaf SHA512 9cd9e4aa6ef96524b60f3aea5aee20115b6c0104a08db75806f8f9213558ddf2bb219bc48616e61a31e15291f354f1eb8329b3592de00655dffe9363f60db8ff
-DIST firefox-72.0.1-ur.xpi 573895 BLAKE2B 55c2563a9d6934c954a99bf505b2742e9d7b5bc0be253dd2691c3e3bdaeface8c473afad47568b6d2c783c54b29b916bbfb5f8be59fc480ac653cba4cda28d18 SHA512 3c8dec5434ce321c8a5f8cdc1f3d123007d6bf0a22c15fe37da46cc79c6687e5b6e5b996dcee752903dbec89d06d6279af0dd5fa7615430a2b231635e35bac7e
-DIST firefox-72.0.1-uz.xpi 498253 BLAKE2B ff019837fd38259b81b390a648723b7de3cc0c6e631a1f9a8929a1d6041f3c52e4c688710b88fc31e387e149e43a1a41b9e095e496724b694a691ecdfbf76169 SHA512 c956d030a953efe608fa316ae025ca65493e897e93dcae97d22541074af3890b698402efe8b80499036c7997047136d2a71565030d00fb9124ac2c44c906e3b9
-DIST firefox-72.0.1-vi.xpi 567507 BLAKE2B 1c60499e474b6523b9d2e2460e802bf52145337be376696a20a6647b5c27150981334bec51fbb6e0499e64fe50a712de1df3ef5a1ce041c9d441b75e89b97d91 SHA512 4eebae23cc6dd81c86caf9808fb5bef8f1995861bf755a0c215d92198aa3e2855ebccb8006aba1f757d4b661209b44077d8508eb630cb849eb5a345acef7973b
-DIST firefox-72.0.1-xh.xpi 469604 BLAKE2B 5ff3348a756cba6732192a2fd65accfc21d540404407d09a08d1c1a5241b0d148502438402ee2347327d51c4ef37efe35254b2568d34d08f8f8201b38f956b2d SHA512 0e90451f9b1974c87e04fc81130ab9748be9e7e9debd33a52bdb3236dc05e497725111b50685ec169e16b605b104d423c6d15603c1375fc640a60731aba63ac5
-DIST firefox-72.0.1-zh-CN.xpi 574697 BLAKE2B 63f212d1322e44c098a10411d29c252c889e60af7cfaaf2e24e14a84371f708b60bb3fa6b589a6afc552881aacd6b635dc2077b66f5fef89b842ff92aa927936 SHA512 bfdbdb5033433f0fdf6378c1363b97dc333fcbc8b9c072ccddb03072eade1597791a7fca8d706617ef4307a03ed4d1a2ab8495b4554fdcc566cc47a259d54c92
-DIST firefox-72.0.1-zh-TW.xpi 573487 BLAKE2B f359f00ef17b4a635d76118fbdf53a0a3e3a869888dcba05467e90dd25817e26196f3ffc59182694936b78d3a65ff606cf3ba1316876092c3dbb5616bf40f6ea SHA512 5f3f5c533d3827817b070b712ec906feaebe17cffedaa897ea9430770a2cfd926f3a4fdb0179655e9c63fd35cf0dbbf4c4ca99d70311abfe390393568ff7a9c6
-DIST firefox-72.0.1.source.tar.xz 314963588 BLAKE2B 19d07cf6ea7a0b5ae0df4475e3a24ed7c387d2ce1f41eec2c7bf1ba08e379134b6dfa9e9748f15f4281decf34447356e2826192f267ca68b83e7ba484b04c309 SHA512 8df6a64cde4bdb879c3cb9df7f8b43c7d67c47502e2dce1d3ee82de433931435963b3e51c99035a78f0a997bc934a838d198f2a1cd6a624441769d37b1469fcf
-DIST firefox-72.0.2-ach.xpi 489382 BLAKE2B e8d3a5baac8b5327745a82bc60be8d862007aeca78268391560eb099cc8a04359f3c44ade921c22c6fd88ad4eca44e4f1809f882f65d12396b5952868e58c344 SHA512 8d470e1371ad92e43ccf9f38c1c52d002b0b0253cffca32265c25900ea56f18bcb770bd9740637c388200a2cad41177e714ce875ec37b7134022f0be42fdd789
-DIST firefox-72.0.2-af.xpi 446537 BLAKE2B bb5aba6b68927749a2b054fee793ddf46c20d16482a620c47f4c9633975b9ec25ef306a0dabcfac21c03b2d5e36967445d6127dabcb87bb321a2326ebff367ec SHA512 965adcad559ec458ecc250ea5cf0778be81ab90b7d54e5dd9f731407f79c37cd2ecb7ed182c8faab90e4b74c629c1985723c00ce3ee680feab2f05c6b259570e
-DIST firefox-72.0.2-an.xpi 498518 BLAKE2B 05b2b82dee65afe3ce2b7aa47620ea2b72d5ba10716e3fec5200a1f5edd0968d9dd34a930a0fde08a7853fd05d3368db5f816a1681756742be7a792a4cfe85a5 SHA512 46b4fff36bbb138c165db332367c44cacf4a6c2eda99b7ecf2940d1a247da9e0d62f7506d9b640aa87dd4955cdd2c8056c04fffb275583e5e368075c57aa44d3
-DIST firefox-72.0.2-ar.xpi 562877 BLAKE2B c7cff2157754a7ceb88f1907467f9005b97ae7193c3410f465196e9be0ca47153b115983ea5c9df9cd94d5718c52b45de0caa04638595a2b4a9c5cfcd74a397a SHA512 87e38912ea18dad4ea6931f75b87bdbd68033d19d17af57b8f43651bbb733fd070852514bc32bc372184d5e4774c073df29744e7764dd319c5e3426382979d1d
-DIST firefox-72.0.2-ast.xpi 494016 BLAKE2B 3eaa2dcd1feede917aa458c9cb4b5f92488ff1282910be83e7fe60c68855409b21115cb1ac7ce2b3fa29ff9b3920663632a28be7d13cddbab9e697d9376e6a97 SHA512 448aab71cdd64f288233900a90d83c8f166fd6c39f533d0f1fcf8efcf96ccb08454724e2bca7ab1a8f2e7d91a84fd3389b981caedee8ea568be90a0d32671287
-DIST firefox-72.0.2-az.xpi 525928 BLAKE2B f9ac97923d3c0dc82cca7d2afef6ee44f8aeb80835a9da6e89c56433a5555df741af7612598603978413fd0a95d7d29aae752c58b9614563cb559597abbfb42a SHA512 d4ec2c2ad5c9bcaa42ab4d9345278b042efbcc7b84d75ef457840cfe6c535c397adc82a17b1a40c65eb854ac3bd432e6a2bb567fbcec492d76101078bb7d4dd5
-DIST firefox-72.0.2-be.xpi 620196 BLAKE2B c22be24ef54c68147ee9f032e008844b70db35120346e39c496040a76494df34d3c4bf460f5a39e7da81bfbc9b23e9c6af49ac38fcac4c7a1d1048bd13194231 SHA512 0c32b1ce6f35856e1c3fdc20e69dfa1e5b4eea6de6e847269b111300c0c76b7c3e6616cde1b32954f96b286e55b6c6516d83b55dfca1f09974fbdd5d51a79ff7
-DIST firefox-72.0.2-bg.xpi 581003 BLAKE2B fd3783d9beb04c7081b06937aea381e766f7603cc7525733afdaad0867eae7c586325741aab279dd5d463d7820485cf807db3f8b5821c141dda645eb6d0aa399 SHA512 87d5139e335734842e943669b6ce23dfd6cf3d005b0bae470e99c2262297064b3052dc69c0add0c56e2e352d34fcf64619372ea93c73d7c9128c107fbfcd0432
-DIST firefox-72.0.2-bn.xpi 616399 BLAKE2B 30e193efce5b0ff22937fe4782e79a9764d308a88ac0e3ac904e0aae8ddb1ca15405786d2d87abb627b8c5e184b4830e316b0839b7c215befa8fca7a4d672d8d SHA512 5f186349fb1121c603a6e621a01034fdaaca186fea3a0afae6d423dde78d99f7d28db54a9e71458f348399a7ef8bdb78c2693bcb5507937da239d8ddbb026009
-DIST firefox-72.0.2-br.xpi 529073 BLAKE2B 7196f416c336a78124bf8a0d208843e5b24a2103f732dbae5f0ddd7683dd18c78e509ea0be9643ca8296bfcdc671e2e4222b618f7835bd50aabe42cd138c4e90 SHA512 551a781ef3ee6bc7573940cdde886946cf23533ecff36a68aa1e1e6314b1e5d25d3aa7a8ec850e9a5be63b51289a60053131dcae4a84b97dae6bd85a65362b04
-DIST firefox-72.0.2-bs.xpi 498281 BLAKE2B dbada20595f4cc020204c497e7197e61444c287ed17897c8fdf2eb51a7764b832a03eed6d99456f1cd50459f2be990a7c7352028051ccb9b14837976c2a8ca7f SHA512 9d4db57022b4e6b90379b932b5cd8f1c4d585d99fc151302520e99082caaef9cab002d805049f679aac1f51c54533be18a9a880ad487cdb71d7683d564e6c740
-DIST firefox-72.0.2-ca.xpi 532660 BLAKE2B 555bf9333c084daf97bfe410a28482bfed3430a9b9be594e08b75f2eea35681b16691205b0b5cb8776ce529b52f96ede019b69a99fd95f30abf0f4bc2e05bba2 SHA512 661f4648ed0803c8718c15add267817fa9391a2fde9511e2286bcd2cec0eec9e71d90a4c8f5a843d83548b3ab1e972bea34fd2b956cdef426eb0c83cb47e6869
-DIST firefox-72.0.2-cak.xpi 562004 BLAKE2B a187d9974b03d8ea2f5296456684969db518da463c60b6f026f8658791963ff1a2a7e266dc9bdff28a54263b14cebc9f4da50b09d2cecda7ff8f52c40e947e2e SHA512 185e58ac7c9f3cdc04fc169521577cfcddd69ba71a6997694334a07a527010a2bdb360213edd8b0e3deaf109f3146cd03763b7fe61465608c93c80d6ee14b8e9
-DIST firefox-72.0.2-cs.xpi 556349 BLAKE2B f35bfb3547ca359b1a9e901e67e876b55e2ff37614ae3ba2437183cc0cc2e5a02c958e9830e9fa6c0132d2d6313c7d3c57cd80ad4a72475f70de2cb0001d2b08 SHA512 44d9a4d2051c5d9700593ed332c51ac80bc26e8b315e564fbed1647bfe8c404169e6d75c0ed90d450b8513d5f1a8bc4b2b01cc359e7a6a73a834a863f6bb939b
-DIST firefox-72.0.2-cy.xpi 538334 BLAKE2B c177505830eeb24cb7f3a4f1af52b458c683bc3aed70e5fcb58d6c8d3631b750349833278792b052734c6c339d2e0c20113e3b025a04fadc67e93971de918ad5 SHA512 791358d5792a1c8beb51333e342190808ebad504a03ea869258b8c37e0aedd32465c56fec73ec19d58501779e7a694b9f8c80f9285c40f126f83d590de605a93
-DIST firefox-72.0.2-da.xpi 522281 BLAKE2B f3c73990958993a5fc98fd76b23218bc538aee04e8117d4ac78d3b9d9867498770cbe48810702740df4c5e47ef8931432953345810effd186fde83cd526779b0 SHA512 79b3ae88494501c27a59de2e71a97aac67990bc0b2b2f2ab573eacd6c14b4fb925976041907f685dd7233c1becba14669640293a200718a5879756d1e60c65a5
-DIST firefox-72.0.2-de.xpi 553568 BLAKE2B 4304149fde35ba2c04614e224f4c813137059c6fbe7fa3f354608c8b9860c58a9b51804d8d6a00bb8c5c1a6d6de968a2ac021c1c5b8d5af4686b28c7f72f540c SHA512 5d0b2bb7014b50067c7819eefe96c1e12f81014dc11251825fc59d748992b7cc990bd03af7c8d7373b7e8dc3de684240b0cea0af6a2d7fbe0b81fe84c06619b0
-DIST firefox-72.0.2-dsb.xpi 564094 BLAKE2B a66ae140dd454867f3738824d1cf80c6b2e56d3424ab2cc18272a08c3e89ac7609e4c03ceb2579a17526c9bc31c592b4b0a098ff6e939a69b234ef3d8f80519c SHA512 0ab32815519b171338451fac74dfcd81cfb56b36a6e58dab4906b40fd9e0e0ebb84bf8e1cefd3a9b80dd0a3e268df92fc1ffcde6c733d8d06228d2b8f21194ca
-DIST firefox-72.0.2-el.xpi 624801 BLAKE2B 5f8d44194697d047ea4ae26cbb7c5c90cd89aee07931d3b087fa00ae2e62954356ba44ac398719a5152a3ecff67b654e20cfc0254ef54c2b1d6c09b80a68cfef SHA512 bf17fe5fb4adb10b2fbab60a2706e387dcf8487533e218dd9d0fcaa3113d492ec52fcaa8620700988aaebba7c43a7b153d9ab28bfe412e6761d1721c732e7103
-DIST firefox-72.0.2-en-CA.xpi 508407 BLAKE2B 20c82b60ef330a051ea35807defb374dfdce78c28deed300f9a5cfc275a2db7bc9b8ac6ffb94dcad19a1e0eb3a20462928acd8b4640006aa586b297b1eea4521 SHA512 81489bc103a434c533e3e86841b44bf48af0adc93c67d6de046c66a7e606b9ae721e9a7482aad8d478e55c5ab02764edbd56a8b16ba946657dd07bf5854b424f
-DIST firefox-72.0.2-en-GB.xpi 507217 BLAKE2B af1f2f139d87913e7af352b0ed3b959dc2cec02c79ec2cb49fa9bbd02f091a733a2dbe37843fc786159d6f644448d4e3e6b1d98207809b42e3ae7f3ee64a33e6 SHA512 bd88334af37305a7b4b8e4be3640aad6ad07418f73afc4cba45f0239dc634f7648e572f4bd542e39cf25f161d1c50ebced49dc6cb9e5a814ed6c2ec001f6adfc
-DIST firefox-72.0.2-eo.xpi 533916 BLAKE2B bcc753e456bf31a5d1d2212fdc66e3c72f09686c94e53c538836a189da6af03ab11376422723e1afd8d8e5f9e9d7d64174b6db20f14ee0fd69027cb68b68c3b0 SHA512 829b311d96051b879a1d9fbefbad35646736267a8cbac8160620041d28e91c6cde226a10fb2c0e4f04757b6bcffc9dcc20d2420b5076b5a62da33fa23729cc97
-DIST firefox-72.0.2-es-AR.xpi 543732 BLAKE2B dcce0d73b770440486e8b8caafe6c1180298691e9e71dd4515e3b324e53bb3d1a8129b92b2dbf8643a0b6909d9eef0d3cc3aec9a15fc8941e9873f080d7579f1 SHA512 601a0362abb3cb69264d794ff6380cad2e196003d48acc980ae417b444c271eb7d67bc9762f737092bce96aca99384ae184701d5c613755c57266366b111a743
-DIST firefox-72.0.2-es-CL.xpi 543276 BLAKE2B f379151c64e27b137301816f8e9f00c7b1448fbc9ed7bdcaee424927c33816689e664b43fff0c960de84ba36d69ce35cb78a151a9c050c71ca8506a052c27b94 SHA512 1d6d888e455266f4d3e377eafe481002f104deb9da4a1ece30917561a2768b3c0a70340c69ea4cb0ce1d7408064b53196b405044ba0beffd0ef0007e8b90f1b2
-DIST firefox-72.0.2-es-ES.xpi 521575 BLAKE2B 049d0e16b22a3d9ef6b0529b4880f6cffca0372ee586cbf731c7dda2c02a352ef609c514abf50b6ecd8cf77925160929725e2a0ce7c141acb3b4c772b46f6b50 SHA512 72778b07eb6548270ccaf455492657a09846475dc216ad007e971a08ffb9b3ee7211d3fe7917578cd73a5f3b391e785dcc4c346af4a7b9aa747488dde1c10639
-DIST firefox-72.0.2-es-MX.xpi 546570 BLAKE2B 632067fcc1299e5de2cd62d30c08604e6739ced498cd710ee6a3909c30793134d1214295d90e26e3b2ed83a306bb210413b747953bf252b3a99349507a2553d5 SHA512 cef907943b2713aaa892277a1924ef98bff5602741463b8cef7e7c100a2a201bb0bec58342d93994564f96c4d1843ae160408d3c577fb5b59dde970d77e1363e
-DIST firefox-72.0.2-et.xpi 523216 BLAKE2B 6cedce6178d584167d8310109c55db70960ece5a66db28aac099a889e6de023dad1e5285294894c32d730af08e6dcb6a1e3a4c799dafa2dcbf78d3daa7139bd1 SHA512 b3e2f11e5602d88200288cae85228b0051d9ea24bac71fc61369d85ed095f44fac0bd11440850f94390a08465e5307f2704e7777118ab17db127ef9864506ddd
-DIST firefox-72.0.2-eu.xpi 534192 BLAKE2B 34aa43850e72716d3a14aafe7ae5cfe08f9f807ca2375f6d40f5cc95b42bf0a7dea3c9d53cc418c2f387c99c85fe074be2e05acdcddf3e1956182ff1f94d0aee SHA512 a0d3349fb97a790a814b4146bc87a5b75809e687f62d1bf997d3e013a4255080d1f3327483bc4ba411dd6c42255811b6579e3d4b90ef6bc48d0371e03bb64462
-DIST firefox-72.0.2-fa.xpi 581238 BLAKE2B c99030c2e0bee5134bf31453a97c4b54f8465b8290aeb37ab2fc7f6ee7aa02b27c5ab3eeb53ecb8d5fc10e79d9051902080e7f48840d5639bd2cd2a08c51ae5f SHA512 fcccb1bc9261319590dbeb6742166513013dc04084e7eccd35f5eba7aa8a0d7f1b744edbb99c1f6a42eb1fac91696565576d8b1f922a2f181e4931b8e724957d
-DIST firefox-72.0.2-ff.xpi 501347 BLAKE2B 80a89707b9bc2b26729420cfe3c9799e348d58b8778cb1c093cf9ed2774bdb776dff72d539d1aafc643987bc3b03947ac09c2554e8bfeb941fd741cedb6995d4 SHA512 24d1c98cf0f6ef8e1eb09937145a63e4e4f6ed10e3132761a00402f7398c32370693aa1befecf67571588f698665ba7c84c04fb8bf4cad2cb875dae33712a8cd
-DIST firefox-72.0.2-fi.xpi 529589 BLAKE2B 2b06aec26e18f340fd448037786cc6dbf1ff925b8ddbf691029b5265d7445a3e695de94000bb53908f50ef8474b55aa06f6007494199fec72d29f7add338159a SHA512 6000c8572fe1990f1e2fc626ba352a8ad585e2d2eb5e8f95175d2edd152d786530b92709a6497338a439c6dcb4d86142fb3bd0d5b186a6dc78995bd7de3ff14d
-DIST firefox-72.0.2-fr.xpi 555810 BLAKE2B 03480b85d0d0b19279a09da6bbd30ccb7f586ba13083c746a46c04c418e570a7ae3ce573885c1ed0491dc38c559beda0632d668a7e7ea9492cc35315958da927 SHA512 ed5362e845adc75d483734461a9c37441f9851f55273e11ab1bacc2761d097fc191b3e95d5e9cacc10e246c0d3d97dbc04ad5547dfbd56e9c66966918fc7d729
-DIST firefox-72.0.2-fy-NL.xpi 539205 BLAKE2B 228ae867b303ccb98de28ef3634759d803c45f7ab2693b7c69a11b51b1b9e3e264de9281f8ea33182bc6dee6cedad6bf9d2313b25684c8963ac8bc37ce8aa264 SHA512 0b5ff6e7d99891ca3d4a31cf06ed50a108bac45a421fac783775229f3e7771bd76f155b43755d133daee980509875c3cfc12cea6d9bd2468213b258c7e30a030
-DIST firefox-72.0.2-ga-IE.xpi 500377 BLAKE2B c8d81460a352bd766d87523c468df1a8227aae91732383c2f5d90559556569974360e8f6f153b0860db56055f5a426b3cf241f1b0eb88fe6dde5a248ff3eba2f SHA512 d76afd9655caa15dc4046b295347d0e1ce6c4ab59c8c0e6e79ecf2bc84da59af8c41af9319792b895ee7f14e1f20e27a86978098b14c1cd19d5f6a62f101b801
-DIST firefox-72.0.2-gd.xpi 525844 BLAKE2B ea246ea9f6078df956b109e1b88f3a7aafc93abe9cd29d207506d0c712c481f9b4963f3eb620b41c26e2c9c23dade858cdee9bbbc3badc83666dcf350394537e SHA512 1b2a39d6901d6fd039e6e569a8e02d82aa56b90fb4beda44abb206e4ebb74eaaac20fd676da095f1007451081cad71d22c8c41b54511c3ceea062ddfc9bdc38e
-DIST firefox-72.0.2-gl.xpi 502398 BLAKE2B 56f4dc8a73ac00989e58b7f1156ac82ff8bbfb3ce3701be7efb220128d24bc2798b743ce3dd0c8423a0b496cf61e19f7915e13069a45a9f7afc83a5170a2b6f7 SHA512 26ced0478e9e41fb0e082402ac16710df0e258b488cfd35152a6f260db43918154213d0018e9fe2a65ffab65221b659387619e78acdee2a0edf880dba7ee651b
-DIST firefox-72.0.2-gn.xpi 557363 BLAKE2B 47c0a52500fc4ac50eb1f81c4ce8afbf6d42269720401a84dea58152e036adaeeb1c3ada271e98883d49421173ef86714713ef44c732e6a3fdbffd00c246cd8f SHA512 dbb35077addd7d62b33b553d80fa13dbcd4e8c64d3d98a8dc71d8518c6cf4585fbd8600cb39ba6306d04f5c5319defe0c0194c7f5b59709593d6401b2376f993
-DIST firefox-72.0.2-gu-IN.xpi 593342 BLAKE2B 817f77cdfa2ab125a6b65e38f9ef8d44190cf3932cbd765a4bc9bbc9cb0cd29b5ae33dafa9f2b9250bf6d0ae868b6311f06e249bfd004de25b0a8b32bf6874e6 SHA512 a1e9f7e51dc9a1ee4e06990551c5bc8c7bf03d5ebeaaa1e23cd9faf5cf3eb55ded34d4d81177b56a88d391931af626da3ce6026323d464a8a1f681948eaef339
-DIST firefox-72.0.2-he.xpi 551452 BLAKE2B ed62e9ed1bd47ff3fc1a220981c5b571d0e9664fca0663c5c7eb59f1236bcea458d1dacc291ff06ec90998819e2245f0a57bfc3f9dca470bdd3059108ccab5c5 SHA512 f44700e2e83ce5fd2bd3f929d263c99bb2691102e3de89b8e39dedb3dae650eebc556ac1ffa34b3db729b3f8ce814ba3b2119b4252eb3ddb871b8fe66b1fc85c
-DIST firefox-72.0.2-hi-IN.xpi 599250 BLAKE2B ebb933267bdc188e18a88e0b74ea551b8aa7e260db65f5471aef558196cdda74977c6db6d497d332767f108d7a013896fff2c8d0dac98daba62f4584693b87f4 SHA512 6f528a3fdb71b9d4d859f9eeea87968fd0152d1b83ba5021fb1fd8faa984599b8206eff198f87dd15c736e2b5e51e63f72401ffaa89b884b361ef8ab4514d18e
-DIST firefox-72.0.2-hr.xpi 536163 BLAKE2B a822322d6bd42bbbcc00caff92505c3f215bc1b437dedc2d46078d7624f1332d309a19c5b58029c9c1926a613436081e6cf9909d89189f5d5ae27d1757b2f0a2 SHA512 bc102453cdf950b6edf2fae7f3b8aadd5bb64d96a894534f5abf8d7d81e95c172667ae8c9dea993fa006c28f72c404c6ac7daf698a6135d301d458990401dbc3
-DIST firefox-72.0.2-hsb.xpi 558389 BLAKE2B 63050c0a66bcf588279aee80073201e4fa36cbaf9f4f38cac61655548aaed24f59766626bb113ad0b6bf9b1b8507b93a10734c7d5c704dafcef26c5600f828b5 SHA512 d8a3ecd6b2af045c5025660b7559c5b362e09bc4aced5a28305aed50d8e25022477fb421ece1fb9ec0bdd6aff91533c988a263d84220a937ad38aa9c761a4695
-DIST firefox-72.0.2-hu.xpi 563617 BLAKE2B 36eae3a7543d40b5593a72f23a080bbf41d9711e8562ffc1e3a7845d7a5976723877ad31bf488c6c7b97bd859853a141cb997bbe0ead1087ad4bf65f6a21c169 SHA512 a41d30a9bc53c55531ceed6c99bf2b876f47e3f26917a362a4874f160c3532602f3f94ee1ebd96095ce2231c204b14a61d92a0a0a12bbb340101a727450238f3
-DIST firefox-72.0.2-hy-AM.xpi 581453 BLAKE2B 376385456e5f055771fce1e8d8de1ec68e140950b7fe4b5b099308f77471f6e63ba26374e589ea1441c3bb2f62faf5fa75f4aaf87fb28d3850a5527ba3348b9e SHA512 81aaa62d31ec0466c22918c43b39d2408fb97cd8211972fb63edc5de13716001be3dcfc6f5061e579132b175543b462da79581ef9532d57deced5e1c215896e4
-DIST firefox-72.0.2-ia.xpi 524508 BLAKE2B 471c3d95761c55130c97b0f5e4a777836d338caefc6ec6ec10f7d4b51f33ef167bc85c302af9dc61adb1252d4b54eeb05fd7e8b1b172f90b722867655a3f68d4 SHA512 fb2eeddeb7c13e5ab3ef5c99a9e9c0cb7974000da4014c675b53f80238849d87b8d90c9db087c086079a2c77d329315efa1c594c1f3b7e6b13778b337eeab6fe
-DIST firefox-72.0.2-id.xpi 520736 BLAKE2B 16787fbbcb07c05e55340bdf034e8429630faff1ad63fe9f3f5908e07d6c802ca61257744bfda9c45c32bae3e16a0dbecd6bde36f3acce73fa3e35f1bed45b2a SHA512 1fce81976cd87285d973a9fb29df5e7cd0b3a2a7c334f4a46984f12b68a6ef9f7814003507f5681794b5a3104468762585c8073a36a9c445db0d5c26e6fd4928
-DIST firefox-72.0.2-is.xpi 515254 BLAKE2B 03d074bcf6a19411b1480c107b073adec91469194c5d6302de8e0e63156f81ea579a9e2d52396cc50d1e681310c979fca17c48485a66f83db353cf98911f438d SHA512 4dff730952f0ea991ffb04a37c17ed09ae205f023199bea7bedc7dd6eabcabfc12a1f0f969fe9631de06727d4f29ce52e788df4f4a8aa768caccc330480d46ca
-DIST firefox-72.0.2-it.xpi 422280 BLAKE2B 382902d20c2ea9a892afd4d88b6623d596098fe548100d17ecd052e14a3e425c85dd7036682e63304e3834f52925b73778387ab7be81e477083b48d6e1a9b2c7 SHA512 2e1e306087a64dfa142b388dabac310ef305313070d5c71f3100a62571b106e1fe2b068243926a4cf1aa63a7f75f842f2a54929f8ae8fb044bba560e6d0ccb08
-DIST firefox-72.0.2-ja.xpi 581034 BLAKE2B 40ad516d1907ddda4acb3bf820da78884595362b4224ea2cc90fda33c33c97f192c45d61dead319f57fbe2e64eb5de160c73c411a878ca67a817b5a20c4fa598 SHA512 68c87118be7ffeec413496ad2fda52759c40116841250de574544d2b190183d7a0d4cfa1fdd37f40734354539b4acda4dfd298467ad941d0e026d06767c2e6c7
-DIST firefox-72.0.2-ka.xpi 584724 BLAKE2B 1d6d8f523a9233cdf16b0f0a25d25994fc1e516fecc233b7682c65ea3527c92ff84b6cfbb06463d86b4e036a91fd4b3e62e0bb05c904e3266d5ad6b7789ab575 SHA512 df4b19dcf54d979792832a9720b99d1fe9181314bd431ae6c22c8425ccf42cf2ab533a24584e7317ef3906e1a9da664fe65ee3308d1b0d8d09d7bf7bf6fadaea
-DIST firefox-72.0.2-kab.xpi 543918 BLAKE2B cd6fdab3d047d389d578aa4d3ae8fe8c1b41f3c760e07809ecf62431430ebde510059b50902a72e38ef77a9b1334b7b1f18f6ef860ecd5a1c0632701f5181c76 SHA512 ee068e7ca9dfc1c11c635ec8652838966ff7b137268fcaca6c1908dc563cae7d4bd8e9c69e18c471afde0d3485dee2e9e852b186f58629dd4c8c88d875f43c33
-DIST firefox-72.0.2-kk.xpi 603716 BLAKE2B 1698646e63ef150e61c6efff4e260731076ddc16f133ba64ae82829db3d5cb90842a4d64dea81b977381a71db93ba7a01b6237f205e29e51d26ee4bffa901c9a SHA512 541b5f20bac6a02c7da2479a647faf444a27a5ddbfe40927f3ff514890e7c94263936f6f32970bcb6e6862ccdb3048e22f87e2ecb4ea197df3214df27f3b6309
-DIST firefox-72.0.2-km.xpi 567152 BLAKE2B 11aef4a962b8a7d2fe6990e67212dab74a28de89b5da907326518894472968846f4a46b9f366400da0ff11803db729f0ecd2667328d3d0c7604fd484362827e4 SHA512 8ad3f4645b9f774fc84d7b0de97297421960fea60da126ce724f1e83bc2b85c6533c8a666b3112fbb8bcdcb6058fb0a20bf5380c6890a9ab1dd293db7d7e574e
-DIST firefox-72.0.2-kn.xpi 559899 BLAKE2B 24da1fc6e699206aae7cf43e76e40f856a82ccf2a38f901d887f4deaff4b8303baf90394c7b502ae01b5b200495623b14be9ba9485591144352362afe6124088 SHA512 7324aec547d5dcebab69ed6761eb5aea1705c79dfce8eafa390b0f1aaf2853a9200c591290a49445eee3cce758bd81fa7876db0045bf0295d852b33fa3a3f8d2
-DIST firefox-72.0.2-ko.xpi 574056 BLAKE2B 22ec1f40df2fe95cf048c55d3aa15314421c2340cd58723fc10effecb0f93db1cdecbe901b8fb7b8bbc8b61388c82d155e7056011c9ad2cc4bcfb2d44c2644f2 SHA512 05ddf126be352d6fede4f0803f246ce846c6b59b28d55da510c277a11811b706137b6f635bd1382bf06985c2a6ff004dd5e60c353542faae92d6d9fe0309a8e3
-DIST firefox-72.0.2-lij.xpi 506882 BLAKE2B 3a3ca6bf1f28acd4ded65274860a57a225af85c5c6281786a7f7f81730b6fb49808461ca4b66e316a2a41196c5bc19860bad2cde5396f2b9fd407dae4655d7a5 SHA512 c864b890d712a9772b61fd1db79c3cd229e5a97010ac6acdbf1b9ac0b854600745816261bfa75cc192416696d522b4674c0888cfda5f1006fa3695e9ed40c0e9
-DIST firefox-72.0.2-lt.xpi 560510 BLAKE2B f329245978ad3640250433a64d022f367c9468909d6face347fcb9b9021dc90429f8f5ddb9746dc71c27cfabc6430ee857d213cb74d9b4ff837020a1de4ac05d SHA512 e94c17a37a5f69e2086023f0ec0112ca5f84302f5d471a74b8fa7f028ad66793117986bf1311e21d5a2cc6883343cb8e4c8049cfaf90a2e0f2828e8bc80c49ef
-DIST firefox-72.0.2-lv.xpi 515078 BLAKE2B 19d636fba264a95c4c524b88c776c093e62cccb9050c0077feac284a33ed305248cc24e88b356a40da68d78cf84cf6c93c0da701a7f1263644d4c0d694143baf SHA512 67ec773b89d93fd2ca216b8fa0f672f394ef7670854da46cc742e377946b0558dbfab46d08deb0ef6df6fc8a0a4f897c2ea26e3c437a492bd53e4cac4a774433
-DIST firefox-72.0.2-mk.xpi 489185 BLAKE2B 2cf397b3b6c054803deef29b0cca8436f7181617df7801fc8cd959bf9ffc3a8c0b5c7bf2d05bec73f29fb0f18ae8afc4f274dea108558dcee13d5243afc83d60 SHA512 f952ea15e118f132dbf461189782fcf45ecd3a3e09d8bee23bcceefd78ee941cd00ffe8ca429e36966151674f8b50c3437bcfd82a0231f8e16c10031000b6586
-DIST firefox-72.0.2-mr.xpi 590682 BLAKE2B defa8c51f135a34f5068b4870b977622b23b95eb9d2ac5eb22da93bf939ecf4438b271ceac83b7f98fe70e54b88ff0d4f716593e5bc456f6e0db8f95c0f93775 SHA512 dc725051efcfeb8463215238329f0a25235b0eaaa99d103df982797650d5578a11db5013c8a4deda365af82658a8dea1c5640bb8cb1f0f6ab315dd9f574f33fd
-DIST firefox-72.0.2-ms.xpi 496986 BLAKE2B ccbebe93b9d26caaec5c988640612104fdd636f611abac08f7fbb5091aad13c3ea8c3b4932ac24bd2575824cdf1b0efd20b683efe561ddf91d9ae9cf206411a3 SHA512 630805e27882b8995a73251cdb5becfad85228b0b564d28c0f6805f3ba0fc19e110942002fe065ee9d91c23c9a50bdcf10b87ed87edf239e668b86681808c1e6
-DIST firefox-72.0.2-my.xpi 561634 BLAKE2B 3a4c7e4395bfafffef8954dccca7f9fa5495a2a84e4f584e1a9c06d909cf131db7a810d76da18ff10fcdb8d8d09a40afdb50f2f6a962ce2068fb243c28483c64 SHA512 9bed0ff5a664e3427ee8e1fcc9b31fd18939a20c70ff4bdcde7231b04a8a722fd5c31d8959462bb2ab7287287632b3823ac39553d7754b486cd4a0d6da10ab3e
-DIST firefox-72.0.2-nb-NO.xpi 526174 BLAKE2B a525fb77111a2a831b49b165ec185415f80d11de52545c8a134cefcfebba5f91e750d37964a3ccbf31b15c57432be05254ee21a86e75eeeb6ed0b351c67fc25d SHA512 3582b2c6c6b54a216bbabb9453021892c26e3c31d56cd355babff652193f568e2009c325bccf0bfb464318b710a3991f76cddc21fa0e7b7c69bf93b37b59f43c
-DIST firefox-72.0.2-nl.xpi 527685 BLAKE2B d980f8b0320e55249525412a50c7bbf164e8cac9eb919b54755e3c4f900678dd4e80d0a603dba57c350ecd24068489792078e1c48dc05c4203c2977eaed818f9 SHA512 da4a26b7bb229989e90645ec7bfe05b12e91928dd4207fd622b08f02a906cb50e82432c149005f52183f1634fee30746476258af7ebd378d758f1bc8022920c8
-DIST firefox-72.0.2-nn-NO.xpi 528070 BLAKE2B d57963f2c0405a6b703f1464be5ba8fd30a69d53eda367fc18048682629898f65a90cd10e36055513ef1579dae4ecf3f3f259061b9ebd3fc4460dfd0885cd310 SHA512 a55e3ee80d7ef23908be455f96c07f4470e42070eeb038a80260c5e548171e0679173a6d7112218663becf6b3c1f5c277a791aa691aad609f276a4f1e9bb475a
-DIST firefox-72.0.2-oc.xpi 516128 BLAKE2B 08a110cf52f3944a2939778aa6d0f4889f11ec692272af2a0cbef84c4ac0cf712752bb4d59d3391509d47cd8959cddadacdde42c88002cad60a394b3248b4547 SHA512 0abb7f6435a4800c7b720c796dff2cc629abc36f1abed769bb9a14552e3f03d25460d6be49410e2c4883ddc4985523260c9d791a4e00ed3a7874474e53a227b4
-DIST firefox-72.0.2-pa-IN.xpi 571209 BLAKE2B 51c5c9b37ac14a5c134bba2b4cb687afc0664842adec1862c0aed31482471438df390cfeb12b899ed5bd2743972c3c3b40e5342bafdbbfa6435bbe518e37f94d SHA512 3d1bec0d26c4b20a3a1a6b57166ed1747c5e93baceb5178545fae496768134064d4e430addd4f78578be93cbd531ab0fc807b8b6f04803adc48b4b27445c62ec
-DIST firefox-72.0.2-pl.xpi 540715 BLAKE2B 6da3d5736aecaa8631c0ffcc924e2a84ac7d889ecfb12f0c67595f08e7f245c940ff8aeba8e4b075f9b47dae147ebe50392bc5cfec3e092051246d2cc0282168 SHA512 bbbd6788e9c7d9718063433c3b0f96484662597597e21fb53d95253796d4efdad73683e1734117cd1829ad072fc922e51daf159158aa7e27a0c963fffbe6a3d9
-DIST firefox-72.0.2-pt-BR.xpi 529284 BLAKE2B ff6fd9dd7b852176d5223c0684d0b6f2235c95715dbc94b01ab6bb3c147faaed7eb7b032e2760908f33c09c1ead217669ad6cc222a41bd21b153ae8f076f2182 SHA512 90ae598f34289a7dbce8babffb12368d66ddddc2c23e12f07aa2112dd4bdcfe157e11a5c16108115c2109453e81308efda71a5cd22685292146279b718d4ebf9
-DIST firefox-72.0.2-pt-PT.xpi 538672 BLAKE2B 2d2d966d07567ae9ea122a6d458326158652e7697aea0895b4737dbc3bec8e92e33f0d019c509191c8f4ab379df8a1cc1738febf3af244958a19b8beff3be6e9 SHA512 2d448ef536d8ce0686385c3450d35c295e153011d24e92ec2bc2f2f85d58bc25c10407ec79126103fec1136de008d8e65688a4edd4c59cfe3205e1088e006405
-DIST firefox-72.0.2-rm.xpi 532456 BLAKE2B 7669e29ea3f9db45dd2530908669a3c12474fa5bdfcea2a120515f6ae2bcb7c90c2bdce677ff75a279f02984175128f4b892c6bcfe9d5bbf1d01ce65fd01581b SHA512 30192b5ab639244185e2dfe0f98818519b91dd8a1d4bdddcf503eb5afb7fcab3b48af46201136dceebd20a507b42961f85ae5fc4debb452c08c4d38686e66b29
-DIST firefox-72.0.2-ro.xpi 540278 BLAKE2B 8122452347eafed1468d07041ea4c9d0a37da4f2ed4935d2f71287e5bf1f52e24b6855d55f6b4fe402b50558ca81f94b3eaf7117ebceb723454e28be98914b3b SHA512 22e091e79c4c7cf42094e9ffd8a21ade468e9efaac8e7eac04fd4af2368f3ca07d675b84bb146fc8baaca9d6030f0e3b3cb81b470503c2233329c5f28887ed64
-DIST firefox-72.0.2-ru.xpi 622754 BLAKE2B 5ffbb3e1d4d463fce9148ca3718ac25d15c4d301ab60938c1314e74a0fa7b60af5375c47a409a00c67f288172580c0a0c910df0b807e4698da69f33950f9378e SHA512 99849c05170bdc0c7f343c575d5b7212dadcccdc8d5d6a4135293691a502b5ad562f9d0b599469f0f30e796565fa49155a4438e7c6df4b77dd284d1bbe5dcb7e
-DIST firefox-72.0.2-si.xpi 537660 BLAKE2B 3a504d1aedb60179be3e0d1b6d6fed8b7a8120c5de81091c5c6e50165c0a637237edf443455d105531f2670f0f6dc63ed509d0c2c2483ec9e870e8aeaa734058 SHA512 a59cc02065cac6c54cc4055b9b6be9b50322585b5ec358f9dc1b95c820ba20c54e611b97cbf0f62499e0cd22dcffaecd672d7619c9879bdee6d2a099c58b5d60
-DIST firefox-72.0.2-sk.xpi 560179 BLAKE2B c5e21c8ee07d3a2879e3ecd86f708eca410999f25189dea0d8110c3b474e9c136f628c43d883794183de2e7f34892e4fdaa2e2c86b6efe544ce9588ae8a5ff50 SHA512 26043ceacb33e9797ba70cfe18d749b8623da77cd0a97beb1461c5ad121d2b57210938efcc120474d5f11ebd9f3c0a09c3d778c5dd276e98e535e69d99115f5f
-DIST firefox-72.0.2-sl.xpi 539912 BLAKE2B 7748fbb088929ea7c089fc07587551d05d62635c03382a8f857e32ca0854b370c00641f4705ba105fde4bdfca6620da1f5969187de7d17ae39aabfb43fe0c80d SHA512 45f0f79f31d8927f65b48ef43234c92a21fa7ef87e5e30156ab2329fe5897929811cf761cb0186dddd53a44c5ab361530e7def4c9f3548e295bb46349c1c19ba
-DIST firefox-72.0.2-son.xpi 465364 BLAKE2B aed65819923daa886834a2fee1ab4df84d0df8b298e9cb4b512a5fe87f4f404e7fc2f645f53b8bafef0aa620c4f77fcb8e69c84c7f588097f9d563e55949581a SHA512 5ab847f935a17c99941d71a2b0c7e8cd3cfe2929d1a62e2022ed562fae3ffc9da5455fb92b9333de1db58eefbaf7347f5b4db7bb47d42f86a2e700e275bcaae6
-DIST firefox-72.0.2-sq.xpi 551703 BLAKE2B f40e71d2f53727cae0937064e3ae1ce5a25a69c98ad675d43bd2791f630795dff6cbf314d8486189281da9d8a63424fcbb0d59cda50920e23a09bd438a323965 SHA512 a6c58727391be48d9bcc80b0d1c4169fc8e055c284fcbcbd7bf3adbfdd089a06051de629b1d8a72da8bed3ac98e71ce1dce4505a340b9c0f77d48f77902e7f70
-DIST firefox-72.0.2-sr.xpi 555536 BLAKE2B c8173b178f184295f5688012a13935de2a7a513d58013f52f603f8983faa03870e0147d06308cbb68f8d095163495fc49ac6664ec1823395b605d5cdd3f079c9 SHA512 3d54d96ff6fe25db674becf5b3563fe1efc09bc01795b87d6abbf142a0bb7f54875215ef9129c8252732d1599416ba4950ae7852fd116203bfffef6298d5c271
-DIST firefox-72.0.2-sv-SE.xpi 538038 BLAKE2B f5eb647ed96d189443a32b2053a67f4207954346fe5d2b2b67d829fc25d1ab5b77c4f1fa09b60c602d3902f05ade9a41c52a29a835800d99f3a3fbd1cdcc3496 SHA512 d469da37f562f616b4c6de2cd55d526f67b65f4d3da881df3f8cc2002409be4a38958ee2398bc62a6ca4bc4c60c04ada5865b3a6b79607ab32a5ed42dea9c896
-DIST firefox-72.0.2-ta.xpi 565634 BLAKE2B b80c12cdba672268b02fe1d8ff24000c1aac0f37659b0376c0087713fa00986115c9449984b51e8bab229c0c2dd74a13957be3efb2ac95034041e8602d16b594 SHA512 48dcc2ae2bec843854133d8b5b0bcdda31362372a72b232607033d4b2f1e1ef71ae55a4712101f498f4ba9ad54dddd2ca417eb608f110063996a99b6337b56b6
-DIST firefox-72.0.2-te.xpi 582708 BLAKE2B 83dc353be0c96da4b785a57f523af249d3f71cea80f346f6a9c3ed67e73e1a10bfa3594d4701b55c0342403b376d775fd3a9fd44cabc8af77754dc344840b58f SHA512 ca9db112ec80148c8722f3179e477a96da205023260015894102ee47236025ecbf82ae7478d0e360074fb280f3068bd6cadbc4c6f46758faddf46da38d677a6f
-DIST firefox-72.0.2-th.xpi 598819 BLAKE2B b0f89c6c16b1563d611e959807a1ee519462d252c1c1dde3f3e3597a14fd946f4644f43e9b2eb03923e774ab58fb4c3440ab22061a1dc27a7071f531dc45bbd6 SHA512 46776d09325dc8f4efec1d7810f1ddd9f7c9970ccfc9a5879ba883be857d67f7637eb0e11a30c224f9c9ae1c6d80fe12a0ce04945129b60a7dc3df3c4023ac81
-DIST firefox-72.0.2-tr.xpi 551509 BLAKE2B 748d42be8e14075e0861fc6904dd33c5f12296c47694c9db492ecf2ebbae437690dc60323eb9a559d42af40c80d3e78c4ffbd169038b496e5d8877aa066517ef SHA512 dc782a2a1e99eacc5d344a5f67e3a3c0ca28801160a012db55937946a12ee1462eadad9ea5c1ec85bd7b7940c1e127830067ddedf933094c1f4722f203ee6117
-DIST firefox-72.0.2-uk.xpi 613111 BLAKE2B 75d6a9d0b642ccdc378082076b7b3b052f091c45984800196ccceac2beb1346926b71a46fa8e2bd63a2846df3d2ab422617306b3c43272f27a947f69855c2092 SHA512 b674a08a7e29ae73349c5f66e1d7841c64bb716398166a347ab7bd1517b7bccf4db1756b01c83316d9eefa5418752030755750557e423c95b4dee78c3c53252b
-DIST firefox-72.0.2-ur.xpi 573898 BLAKE2B b3382ec0929d1786ebb143f7b9f1244ea6530ac791115d69bdb2320f9cf1dcc476cef2d757d860bb0c1eaa2b27868795d7502b14df9bb22d712b68bd6b70b47e SHA512 e53e8dcd0d0b557675ca1ec7aff25e17f317be46c9227fdb90cc90fe94d3c59490f7d4b2fe410c0ac38b275674f78c8186c8b0d0ddcbd6a4fc86a2c85d7fde69
-DIST firefox-72.0.2-uz.xpi 498250 BLAKE2B 8727d3697d9e9d42e7402a7fe49befdb3af59a28a46024c8bdde42f850fd466b7dab4793fde6263432a07961c907d7bf62b6ba544e5bd8a08f894bbb06e73c39 SHA512 6ea1c66d4ccff07ef3c50fc09c30b51450d6914e70b0895c1ab702894d783502f03c7b924c1414d845d53ce1c3aed6a68c6eb3d7824a1577fbf4c11bcff295c7
-DIST firefox-72.0.2-vi.xpi 567508 BLAKE2B c77f25235e1bf080a5c7f2a3e30dc8bf80442783d849fd47cc14b184a41b38e6648b9edf36c3c619bd33911c0b885e9addaaa10a67ab4dfe019f353b3e01b9f7 SHA512 63e5b1f5cd24df358f08875030ac052c958590a956ba8e08bea4849e0acfc4bc6f80e7360a728a5ca353cdfa83d4fd711fb53d67beaf2cb28b3aeeaf0557966b
-DIST firefox-72.0.2-xh.xpi 469608 BLAKE2B 3e6c4599ece6bb993a85079650bb2c3363519bb9864fdd561ebfb0a958a8f947f442882cd860c9e2654bb6fe8a44d99fcba5ea8ab5e6e56ac02e52b79e0cac49 SHA512 54b97e2b709204762991760ebce4cdb4d73d8bf1bd9946efaebb11709705e0f04ecc67a4367e2cb30c7c06d5402d36789fe19d87c29803374072b4905a3e26a0
-DIST firefox-72.0.2-zh-CN.xpi 574712 BLAKE2B 21f3ffc504bf684cc8cb9453f048e6f165e973fc6a0b270f9dab9fe765c5f239bef86766673df223d452681e81a314cbc5d581c1dfeb14326e13eeff9fdee147 SHA512 bfee4470e49d619329b261c9652c7bb931e3646c9c933140c506e7b51d0de21a0caaa0d550ccbc20e1b32927374e560129d1f32e435278104201c1a68f5cc9dd
-DIST firefox-72.0.2-zh-TW.xpi 573489 BLAKE2B 3caf523ed2cee63d173a05a472849b6872a19b82ac8daf4ae79ff78048ac8dd21bd25d971b6884d8534050fc3e014c4a03cae6c95b4f6dc8d4338ca12e09df9d SHA512 2c48ad0fde9ce4fd86f3c1c80d9189c2c67c0363a6e9ad714ce2035e3130a7c4609b95200d17be89f93b0b88df3179cc18524fda11c69908957f4623d83c3005
-DIST firefox-72.0.2.source.tar.xz 315848856 BLAKE2B e470430cc129d29b82731b40f377cb631954ea75edf703011463225d3f83d4a6b5426c742deb8d19681fdae846090727437360f06a8a2450f80ac6dc843006a9 SHA512 4d8c832709b8831234b571b2f809d1601490db47982ff1d71913062c42c17a7f3340c72b6162b74a248a9cfe7b5d1646fb9a0463dcbcfaed32e1346ee20e4147
-EBUILD firefox-52.9.0.ebuild 12976 BLAKE2B 03465dd9986fe9b9b5fd7d0f791e03eb7737311b23b2cbc751971304ab037fb99dbba3ca23a46436ac8596307b199777e856ec65f70be765003dafb096c6506a SHA512 c30dbbc75f26829b1fa051af0ccedfbfbb59b940cd33550447905502131e6a081c2085ae782a0b7e156484bd3addff3e4683a77a7f86ff98623b391ccd029acb
+DIST firefox-73.0-ach.xpi 496809 BLAKE2B e32ca18bc5a9c9c6e812c71554bc4bb5ed7e03419c3ece37543578d26b5062d88feefba1253a9e2e724d3f7930b1053ed81f60da85cae25ba44ee7dab795e3a4 SHA512 008554c13b704bd0d206a07979efa211ecf9cd1c65abd90ffb2970ca3dfa5d9cbda6ad623318c8ac72279323d9d18e9fd68078ec7e3bae93b0293b2ccb0a5912
+DIST firefox-73.0-af.xpi 455398 BLAKE2B 2c4feb63782465f0bcb37ecac4f5838fc4cdc0fa1a7d9f40769e1075befd567fc5d07fc1c9ec283b08ecae684fcd6174f1f1b0056245e52e921e6e93487efa9c SHA512 b62205ad3aebc7b01d00b11f40e2017f6b69260d1161c7290d82590ed122c69d6a96ae27293e72996fe6a0b55e059fe58a4409fd3c25cdbe8d8c89c3097b0abd
+DIST firefox-73.0-an.xpi 509030 BLAKE2B f11acbb95acfddc08f02a6331929019b1e2a0959aad23a780265057e4381b2c443644f749ae0e218db81ae0d44958b94cd3ead0a2d270e5a06594be8379ea268 SHA512 f5beb2cf8120fd22a5e43059e3d3a4e28c588907c83de2ace08182bd6a170d46dbd492d572047f55e1d765d0e10da79735cfd7bae378cfd58cce58106d868421
+DIST firefox-73.0-ar.xpi 579684 BLAKE2B d8ad0b769fd9ced57d76d867eca236bc97f16440edb78d9245d2de71630a829791e62c40d3b88ad03cf3f438861dc459ecc63e2fc0929661271434367140316f SHA512 8878859a0cdaf02d19c5170cf361b8268e5adb99f3be1391c0b6ba5964da11fe8d8326dddc05529e2ccdf3d1dafa0fadcfe63ae347229aa8882a5df84dfd6425
+DIST firefox-73.0-ast.xpi 499597 BLAKE2B 5527e1bf105c594ea1ed9e6d7b53f06190aa93b484db7ef802807d1d2e22feccb98a82cb5431100690721d60542d2f73c336c7f7a0a8c5837c68d8565318e6da SHA512 fedcb7c438365f0ee849b5ad9fae90996f7af4635de10d2df1568ad31437185f230a81263e86299d7c944a0ac86b0ec87b379c0747f86f554957b1020d571a62
+DIST firefox-73.0-az.xpi 530756 BLAKE2B 664c8f16f67264024be19110eca51ddfdc2b010999bad38481d3edad23b1eb27361ec9885aeca7d9bc630dfe71c689df4684e59eaad2a0170219f043dabbc40a SHA512 f2c76c679ed472bb7f5773da487d91f09cd71e259ddf6316ded4ea4ea7c07eb9625937a5973bb1fc4451317522846f4ca1026a905580ff255cd2326405ed056d
+DIST firefox-73.0-be.xpi 627336 BLAKE2B ac834f093054c52f56896826257a71ccf0ff99713eb3a6b9e1d3597bd2875873fabfadf1b5356878a05d33874d2a6f79f764151d699ae348b7ac3c412f214df4 SHA512 a7c8e589e31489946d4990d3949a6bd8865e5e4afcb95453b55d8ab5e06df6e6f02faaf566ae28939eb5c55b443d385e610f816c93b0a6c157ce4c5cc5ee5a35
+DIST firefox-73.0-bg.xpi 589238 BLAKE2B 8f573c6843ab72d9959360577e4284d5c0e98b8840265bc2b356f80f99668c63aa92344a7885d76a2fc488c881a8a196277a5f4325b41beed98e26c601927f17 SHA512 ec0b4ea6fe51b630fc68a58ff7ba4055f36b4a1599353d08bf6130a564f05c80a4104d07ee7aff3152c364d20c27273383f572f33be1c91987b655723ebc9c30
+DIST firefox-73.0-bn.xpi 623490 BLAKE2B cf7e9d60ca390a9fb849770fbfa565f5fb6005559509bc71495a74e23aaafa3bd127c8018c0e00daccd5357088441129a06056bfaab145c6645fa87d8fcf53e1 SHA512 03288cfbcc9969263b175fe808e2047068df7843416c8c6f99261c0673d8b5b39b838894a1288c3a24acdb753aeca8ba4b17a5870e6557a2a0e4db80c6ad2d6a
+DIST firefox-73.0-br.xpi 538363 BLAKE2B b638fdadf800a281899e6485bb37f11d59ddc04d9b96ed0bf019fe966f2338bc0aa48843a6d490716d9a5ba3a7d18838a791d8b29257d9780222c4c8b167a1b8 SHA512 766a005505501ee4f4f64db57bea1f3ed2eebb26e2a88722d0180d35f5c547ac371aa32183300f00a77bf807b2ddb92ed527ca5bf6d021050ccc901e34e773bb
+DIST firefox-73.0-bs.xpi 506600 BLAKE2B 07fb0301d06e253333a6429cab1628b83902ba3fcd5dd3f8348b4f74ec6cb51237ce9db656f3991c63c528511716a8d7ad476d44eb1332907e209bbfaacf6f96 SHA512 175332af992d7d0e64b7070a0a05b7b9b29596baee3a2c7c27b60134b85e33af27af3273e144e5ba49da0e5083339789ff5e24fabc4714a6d45836255fb7c004
+DIST firefox-73.0-ca.xpi 539909 BLAKE2B 17938cbd5e9f5bd8c49decae73e0cde56d063259a99fad3f4a30a93f583d0a5f5e450cd3f4482f53a5020b9d4051a9d0828148a16d2b1636db5060b5e9cbdfca SHA512 6209b55db46fc243c9639ace9548373157d8f0eeda94691575615c541a16bdcd13f67ed05169ab5f6a1854e05d226a4a3863dc153eec2c542990f40152ec99eb
+DIST firefox-73.0-cak.xpi 567852 BLAKE2B ac059a33ec33c2085c784988717faa94d6583cc7fe33f15e2f85d0c1a0b9dc5493011e0cc1eb5b0001b6c97c38ad53dac4949f6247f366c6cd2cb78d9dc7d019 SHA512 82bb8abcf31fd120e2c044e93c8330e569f911ded02d28950129d4e4ce02fa3cd9526b77e7d9745e5c8305ed81bbf1bf52219d885b69b9ceb89b3900df322622
+DIST firefox-73.0-cs.xpi 563327 BLAKE2B 80614a8e0e431a0b47e182c4034fb919856980039cb799d933703db80676a2e3fc6aea099eb0b9e2f35df88154fd5d2affb72def188b9ed4e8769036b57d0347 SHA512 146339e3be72fd037e8ce6582395411fd2457d3f14757dd3ed52832145634aab3a193470055a1adf860590c5a352303a588bed05f4f3e61a47c275d233b62f68
+DIST firefox-73.0-cy.xpi 543935 BLAKE2B 0e6424ed31c3a235232bc894422c881158e004e115175345933d19edb74c4b53d30a66c9c8cc1a5b41a05a61c176d89547846cc5a3ee42958b535888a7737c9d SHA512 c314bb0f62121dd821eb003be3017f1157878928155d617318c6ece6b98f39bcfb6259b03740d4e5e2139697fcc3027fc7975dd7029d5140a7820ffe97c92a99
+DIST firefox-73.0-da.xpi 527903 BLAKE2B d1ebd7f61d5bcc44384d90ae0fc6267e2c4e9edc9d0b0faea94b70e06f2538002853c1d92edaa75f336066a42ac6285d6b1a32374bc60b2b88ce4c792c1530a4 SHA512 42a4464c906311e9894a115fd9810f9c5cbd93e4b4d4fa592e068fb6e7ba689f6f0e172688c283945ad2d03e72da0426b545cccc937fab70cb1d8d33c4fd97a8
+DIST firefox-73.0-de.xpi 559770 BLAKE2B dd960c7a62e2933630db65cb0251b08a5a34fd89575af44924fe37348628d906f28597a201613dd7d81c8b96eab12c2c090f94b03fa8b41859a9fa1c117dc58c SHA512 45de87361bf5250fbbacbec94fbaee819dd89931184f08c7c2e2731a585527f2004a23c385d8355cc31d226d4e7c6816a8bda88b778cc61cad7fd29962826014
+DIST firefox-73.0-dsb.xpi 569986 BLAKE2B d3b77cc30096f6461747f9999acbe2a9b89f1d2562b75a14db2d32dc227b34590490e90e1fa7121a90402dce45fd4e0fb50ca7c340f96b4b3982c7e0167fcc74 SHA512 836ab876b810ce209c7d330acab01b6299bda3a712ac60e71662639958f9f7d857d6dcbb0ea12a356895f66d396591772d21bb3cd8275dbecdeffd6b787d1df0
+DIST firefox-73.0-el.xpi 632334 BLAKE2B fda69cc5aae32a14f83c181c2ea49d6801632917f025115e8beec6642c91da3d9746fff5058185cc3a6996cc72f8d395d9379f16d65ebdd39c2d517cecebdfe6 SHA512 83a1b6565ba69444df9e5cf2bc05d801c52b0e8d98becb989d2af59fb9701472b75f568e48aa7f98af7c6868d920c03120478e5082a73e76272527864d33139f
+DIST firefox-73.0-en-CA.xpi 513503 BLAKE2B e52cb00331f9688885e28e69aed8f8d2dd32f923ee21ec7986b784122914100eb65aca9d26477a7bd89fc5828c25649a088e9c17bee167b81058192f5ca9e261 SHA512 987f58949a1876793be8f9f345fb0d096044754d6bd7fc88f5f41356a44bbe1c858d4ecc97403e2b568e6ca72900f53b790f980b17bfdfaa67265d3d09551a56
+DIST firefox-73.0-en-GB.xpi 512038 BLAKE2B 62ea76699df8b0c70419d18f03f54c6a0af551640a2476bd45c21f0141c0647022ad1986755d3463fbcb535d5a89318f0a6cdee48923aea8786b8cfe7f1f4e75 SHA512 221f1f283c18eb4a8fa44996db3cb75a916ae48cbe8204bc94f4e73b39ef181428047602e9dd3346981e78a47335be06513e5c5ce5103aa666dc2bc34016ec88
+DIST firefox-73.0-eo.xpi 540728 BLAKE2B df1b636a3e00ed9e496a21920fab01b8e20fe03a5faaccebf65569add03ae4839e8263b32b2ffea9cf82197d07f4e9ecd8ef0e1ea7bbabf94ab8aca7a55cd816 SHA512 745aee552f5df3eaf042541e4efea9d847b2f76fd78d96a875e416c9b16e7b40e2444342d3bb3824b0aa62c00a7a12dfdb3d8961e8ec57f40b0b5d118ed791f6
+DIST firefox-73.0-es-AR.xpi 549334 BLAKE2B 5eef0ea140156349ef79c02ae1bc4e252dfd9d9092b70a888339e3212bd6098b02f6acbadfc074939e4bee7515a47a5ac8eccaa094eeaae04123334fa7a2d212 SHA512 e1bce369b97576eca89113ac0e9293be36379de7d65f82def7da4ea9ead8cc586901bc4399dcec7eabb2be9f98ea42adeaf7f320d9281c6256709d9193bc9fb1
+DIST firefox-73.0-es-CL.xpi 549351 BLAKE2B 5db04657c0dd56d632ba787cd5d8091fd2443cf4343b8ecf4bebbb5d9ca0154d521470c566673a8e368e7240b18b478206be732efebb0802e1b2c37a96fd5590 SHA512 a7a3f48eda0e59033d5501a1c0b84efb1bf97c1c59605a8e4bc231b0632d604f23dfcce59f99cd158b9aca9ee8e79d00570ea7562b0f748d15e0469456d85039
+DIST firefox-73.0-es-ES.xpi 527433 BLAKE2B 3b1d1bbb0d8a8095cdb25db09cc7b7aeb9f8f6e464a21591b4d413d08bcf37645bfb367db6d7614e3453048776fc010db86e93a3b53b2cb7e8c4773a46a31aea SHA512 3367242ce5f3e84d4eb7367ed0641b16ce15a8f75f8f42be2c366c5a20571d821757c23f99657f623fa481056335842c2ec07c3a23ee46663daaa8ae4308db83
+DIST firefox-73.0-es-MX.xpi 553278 BLAKE2B 685be2e19e74239291376c24fa85bc6387a4ff27b739c0f06d9fc7643d8c8c6067850c070036f2e204c757404b934d6abfe5a0bc6a6e0f262c0e7cd035eac896 SHA512 62d1bc98b232a4019e9fa51474f7e42a2344b3e071034994379390fdf41694dc15dfa9f545f219a77a1c63d57037a929b992b10e936c8ba735962d103bba815a
+DIST firefox-73.0-et.xpi 529035 BLAKE2B 198e3e5335e9be9efe62dae6f384abb38dcbe6b014a39d6ab29758b34f536cec9a3e00fd191a9125e1888956e453bc35c404c6bac97f6258074074d3e2ecfb62 SHA512 8abd91a4cf395d379d8d855568337fc9222b8b4ded2804a57b23b542c579b8e0203e91dda28c8e54a2527aae64427dae0ec302b7f1c83d0b01e1438e1358d994
+DIST firefox-73.0-eu.xpi 540281 BLAKE2B 452284c5e7adb1388580ddea41948c9ae4b485e4936b123aa06d425e5c36e015f0a39a9ea36934ed4ad432ebb68898c3f243de210b21000f35f026807a9aa5c4 SHA512 04399ade2987247c5471258d1592f9c1ab6b7b3dccd1eb97a1e863a35009b1c3d9059cef8ebac473cf12930aa0b76906cf4874bc86fa3a660c43b57b6848edfa
+DIST firefox-73.0-fa.xpi 588294 BLAKE2B acb494a7ec421764e75ad85eb4441034af8e9cfc723328a0229ee8abb45a8942d070fd6631d1fb31b1b3f27b76e71aa1c1acd343eb000b04f057f44bde516e1d SHA512 7b887ac2e7f98eb0cae569282641403d8dc71bac3af3678731061e4e2926e4b29f87d694e38a6b29c7a42a8fb4161212f56e72d356c70a849fc65ae6ed42a14c
+DIST firefox-73.0-ff.xpi 507392 BLAKE2B 978446c7308c0e18890b6fc24f9974d5382389b7c6a485e324f64cea19d63f1c5e0d9dd059a8f9ce44d3be2bf06a385eb6608d9e610888bd086e157d11ae363b SHA512 67b8ba94c020ee0e6bf6875c6cfb195ead0232ab137c106dc84c942c8e25a23384cc1ad20d12869e67f0fc9f2c770fb9f81d3fad4bef3c73b8d5814f58339713
+DIST firefox-73.0-fi.xpi 535785 BLAKE2B 04f87dfc5b19609f707529a50f9b0b150b22068b1ee9d327336c879aef0056c35a3120a3d4eccb4bc2478df193dc782cfe22b4baa0b9eaccf0440e6d03ab8386 SHA512 a4dd5125cb6451975602d5a81f26c6139364091971a15b51774f2dfb88802d9058ad18442cf3160583f30d3c9f3d14b6783aeac77b4a0364abbdac42052fdd82
+DIST firefox-73.0-fr.xpi 561601 BLAKE2B 4a050dac2f8ce72238cde35f1e980a86145bcf4078b5bf540e65e35dd25d5a54683a1ff60b33aa44469a4657edd807af23f342b2d95363970abf732b166c59b6 SHA512 90380a81674cd85fac0a57b51ed87d23f4c8c6dfce1f2cfa0fb368e288c05e070ae356258aa8f3f1fd6d8d978ecd478efd550cbb6ccccd5aa9ccc72e71b7ae07
+DIST firefox-73.0-fy-NL.xpi 545149 BLAKE2B 316623a8cc687b4c67ff86ae05fc14d9e584e47942dc8adb88aaa73dec964f6ff61e1be5ba1ea32fe22fd61c59dc37159f6a79f3109fa0a09b0f6c458a1d406b SHA512 ed68ac5119c131e8896894fe44ff33c476a3ccc52b3256445391c245e3f0df8812910a8c34857d1bfe131eb60e7712970a1df66050b69da175e73a558936c3fb
+DIST firefox-73.0-ga-IE.xpi 506193 BLAKE2B edb523d59841e2388c9374bc6e5c914d31f67db6c046fc6e6df90087f17eadf7760f0153d27a1980378c627917665a6d995d68e2923d6f3fa44dbbbf91468e21 SHA512 03597eb7ed2488532a24c7d943e9cc44d5d7487ba4db05f624eda2dd277bddb6d6a692408b047969a4ca4dd82651e472f56d684c6fb8f9f65fc1bc6b89c90a88
+DIST firefox-73.0-gd.xpi 532099 BLAKE2B ad1ca2b01746ab3ad44250692e37ac80516b6a0bf4bcf934b407ae577e4552ba2501a5c2c5bff82a234a635839e263dfba64c8f0f81b8c6b902663b6dbb4af89 SHA512 0d55caa644d0d4102277055d3e41a8e23df22560ac598ababde4b57d1c55dfe9a796f984a43945d23da645f90e26a5f7afb0c6cb0843ca6db787ca321d0f2c34
+DIST firefox-73.0-gl.xpi 507863 BLAKE2B e0f4456111ace39568bcb67c770ecf1bc36a9d7a65961ae182310d7cc94f06c6c8223078c66b5151a49272f1d0cac82f395472d43ef6ebd52fd28e6762378974 SHA512 cdd9c956f8e97103f97d42a1beb5a0719eac65dc159d056bbaba45ce6ad914f4b24dce958a7be98b736911c573ccf77d3b78691499dad20d89c60aa719306ce3
+DIST firefox-73.0-gn.xpi 563110 BLAKE2B 3e89cb9089631615ffef27b4a2fd2d7983517d6282f9a2a546deb5360e3bedfcbd34069e1e65e94934ed9df4847ec78b49b5d7035b0ce4bcad149e8a00b88073 SHA512 ecd29cc743859ee93f2a4817d82094127cf22e81dc0536ecc8a5b839f2b7b95938f71467aadd6d38ff86a91e0c5c93ea13b05c0c74405b2d658cbd88df85b3ae
+DIST firefox-73.0-gu-IN.xpi 601746 BLAKE2B 3664634acfa136e8bb407ada607d0cfdd0d800ffa901e75f6e99535e94b6a8eb9b86582e2b13d1cac903784d67d8bc916c52c22e72b86de233264c73fb9716e9 SHA512 366d61eaa5715c60d0e862fe10676920ab18de687784525fd4b3bf99925661c32e6f5365d9028858edb1a7991ca12e079ddd4fa2cfed2451dc710f731310150b
+DIST firefox-73.0-he.xpi 558658 BLAKE2B 456167a1c78a582f59283a0d10e71db9c1c05d1bc8b9d421a22dad3942f21f0c64580149ea85744d1115fa2b08c41132417fabafd33a710e0c5847084bd01777 SHA512 3edcc9d0ca453630102d8f3820e31dbf7b398f639566f4cede8b0784d3d6f13258680b6cad807e6baefe45e45765fb7c57178b1415df97c431af1028a1dadf0e
+DIST firefox-73.0-hi-IN.xpi 607640 BLAKE2B 4d1141245c999466c14f2f701934feb94aa86d3d0767e378ea2d72679ba36bfd7f6f00f57f48b183621739dbfca3bb1b4bdb79bb7dd05a55fb1fa6eefbb4064e SHA512 ebcbf8ee60eb5620489e725cb27accff29172a824bc253bcbe39e5afa030fd516e7a8d48bac3a00b171fbc5b1fdc9b0babf930c33bc46dbc862106b739c28163
+DIST firefox-73.0-hr.xpi 541768 BLAKE2B 2497c0bc8e24c3d750ab1b3a75232a13a0e5c8e28c4e3c54405b2f8b1b9ab2361450e3245dfaafa63e5157e4f6a9a5a777cf1587896867360fd03ab11b59d9ae SHA512 19f043cc64c62c4867807313e5aaa5a43b372e25c9c61f85414f7f11cc99acc154ad71552c592da67756f1b388c3da4f39f4746e7e39f0615c8fabf2b3ff54e7
+DIST firefox-73.0-hsb.xpi 563992 BLAKE2B cc7bd26efed93bdd468111de0693a07f5f2bcd445305a6056bc9171683cde56668acbe64b872d8841ef2212732bf643dbb553e30424ca7e72d2548f864d47fc5 SHA512 a18e2bc8157af7f535c2f7502d74d3f23a623ccee3f5087876aed39b1387520b149d07ce193bb3b1094c02998e8e24e4a48968e5a6c8ac7c25f5cd1e8261dc36
+DIST firefox-73.0-hu.xpi 569565 BLAKE2B 183d7117fb9f99dcde10fa904e9bcbe3346d9a88b25b923d7f8fabb531726ef97c3e563d6c851c2aa0104ff06c24d35a281e3e1b58104de374c7b4e8ed83e8bd SHA512 9f035821173e428773453e40ef6e3a6b3397afbaf29e2749fd308cc084940617c3c8d714f4efdf9d60ef0df7cc846427abd4e82aecd72d9e771ab0c849d154ff
+DIST firefox-73.0-hy-AM.xpi 619861 BLAKE2B 9e3a6ec6a0727e51468ea19c6cc5e4e182a7bfb5e7ee32f982d5ea28d1d12b824b6e416cdec6da5aa9a47e2ba57e71a8701aae2d834617bfb91335a9e29f5bb4 SHA512 8ed1fc8bf47e638dd54312e36da003bf557dc371139d54ce44f5fd16d637731e3cd7b1b137ef08fea74ed71da0abde660f2550deaeea678be3238181280d6370
+DIST firefox-73.0-ia.xpi 529936 BLAKE2B 544a88a1c82e5f3fd1b959e2ee8c9d155877cc1563a872a7f65f137374f1c76d661909072488f2292c04f1719bff4e488b3f9e6cc8d6141b8b5092f0bcf57813 SHA512 ffbd41cc114f25e2d8250b032bba4b0e976c69838f2c5f1d4cf475189f3ee0e7e467d6573af11ab33c8d262b778203acf51c88d99f1e9075d7ee0887db41f664
+DIST firefox-73.0-id.xpi 533270 BLAKE2B 4f0d9c26db95d6917fc1eb34bc6782125e7de1270e33f7209538522f928dc0fce76e961a609e7953ac7a5060d312fdbf0cf1eb9cb1e4e477842581727d760bd9 SHA512 948da8efb6cc5922fd576744fed9663d725acf22582a1c04af093a81fa81e6f16a0b9f95ff17a8133a8e082785638091c99de728acfbe59eb8997de5673508ef
+DIST firefox-73.0-is.xpi 520200 BLAKE2B 3be5fceee9759186483db782c82217b7b34d9e712153b4a7442cd82a70e4ef846bdfc4edfc341aafaf11544c82c3fa3639955dc6b9ae7e4d42487356b105478f SHA512 9ce2d846d09fb89fb4c45f85ccd2be6280eba4af1421248cafc9422c9fc9002a370a2e4edc03f57e906121a4851b2eb1307a128b2b5b13755cb042170290e536
+DIST firefox-73.0-it.xpi 427997 BLAKE2B 69bd187aedd2cb3271664b6f47b29f1ead9899124e8b5ba97e2302d4499d69b609748df943e8f9c415e4466cf79cf45660c116e6292f7d6a86d3e83af297b547 SHA512 19ad8b07a72d8192fab31e9129a072f50a1dff1c8efa89ff32f58ff952cc4315077e811bdced03963f9a0f5ec79cff65c226ccf7e7a53cada2120d13dab02cb3
+DIST firefox-73.0-ja.xpi 588816 BLAKE2B 9584a5da696d08f1a4e3a65110b91d69f8a90c5471e2d5184a13d3118cb6affa98d5900e6419e0acdd9d682cf1e0b367d857e79fa39c3128c8edf7bd51634c8e SHA512 8739e918909df0ec81cc91b1385edbfc82a236cb52dbf9ec4c7f5e701cc73054dde68501172db49e0b1a807c2babab423a11affb1d1da8b330ad3811f779a2ab
+DIST firefox-73.0-ka.xpi 590611 BLAKE2B 97372a3749a895dc6d1ec68a8e6d385151a8077a6b4065f8239bda152613492af7362958a8f718fbc1656c0572d40b75be3130d02433dfe8dcc76d1b0d2e7171 SHA512 1ade57f7702e4227c79c6a0add37ab8e76e00b59c0c325952d4c6a375a42b8d95f4cc29b9c636cbceac73313975baec7c7837798a6bdaed18d86e4dbc3430d79
+DIST firefox-73.0-kab.xpi 548511 BLAKE2B bc27c230803248ce5c1087f64d9080ebeb899524238fe6f4098a22d8d4c407546ed4c0ddd9692f64dff2de338447fbfe2d618b09430789b2e7077a7c8dd172cf SHA512 20c8f30240b9860626c8e997127dc676a1ca167ae5cd7aebf6142bf761fd8b3b4703eaa4a7402921d7277ecf02bfc98c5f7d0d5de9f551bce81471f7d9d43e01
+DIST firefox-73.0-kk.xpi 621500 BLAKE2B cc6bfcd2047dce61ccc29ce467a099e35b3bbdbcfc5706a9e05a4be201ff5f837b1888d6c771d8df6c026ad89c233d1d813a5830f2380b279fcaf30d22c791eb SHA512 75e26098a17e20dc72f774cf55a814b237a7a498fcf2e3fa0dec379bc107a7241288c1b71b6aa065b347891ef4f3c438b5b56acdd175ce7243398313403df345
+DIST firefox-73.0-km.xpi 573134 BLAKE2B 746f558c146b31b14931e806452f8b8d1e6474462bd213e6a37685f4492a5382096788bc1206dc66bc21e8d3598c36b49347961854199481d00a8678603aeacb SHA512 2b23754da34dbfd9190f89071c468b0d364f7153b64bfad07dee7db050d5a554d0277b3ed48068d37e56b55681447467d7a52592638e2692bcc921cc58dd147d
+DIST firefox-73.0-kn.xpi 565619 BLAKE2B 0b8df408f65d9971d294e46e09155ea01f3ddb28a36ddb6c0b00668c030cd1307f1065f9d42b65b23968f9340933a16a9309e0b76cb9e005673d3e2abfa482a2 SHA512 a88a6a0c8134ab959eed75d8c9d1580a42f20e292f8a1e2513ab2038c3a0aae118358e273d83ba637accec70a6a99ba3bf9fcde3da69420b46e58dfd505b7191
+DIST firefox-73.0-ko.xpi 577217 BLAKE2B 334df27d614b09acf730514ea26fd80d1e1c209bb45efe761bbfee92f20071c7e580338c7610625d4d130e59d3c59d76f7b065bc4370b424fafd81ed1a7f935b SHA512 219327929f543c7d05bd58da687b523e94d5edec632a4ebac5ccb6b7d52c401eae9bb1276c16fc4849637b918c34779ad6427c7aac711185f2d16641efa0b73a
+DIST firefox-73.0-lij.xpi 513298 BLAKE2B 800f8fc8f7bd4fc6b2c51c30f3adfbd5bdded94f43def3e6223496e0e1655cf5a745d231144ea8cb9afc21686c3034773755ef79d055bc68dcd2e0fc4265517a SHA512 d4e59752317e1cec6d875d1022668f52f3d1a1b5a7ef29fd6635b0868f581238543eb98009b2cfe891b24d37220f93cbcef3b9d439ec60961d3a777f335f2d95
+DIST firefox-73.0-lt.xpi 566298 BLAKE2B f8e48bf5843eed12d4d1e8631cffe3d168d7d97b720933e5d160f126a5e2ccbd6af708809ab1c630f75d7fbc280ca002fd3781f86b773f0d59bf988a6ffb37a0 SHA512 38dfc75c997dea1567a16777669ea3e1bf0439436e52e77040dfc5a889f89c64083d7bfad6cc9872347228b31011bf31eafa58c4ccdaf88ceddad9619a324866
+DIST firefox-73.0-lv.xpi 519864 BLAKE2B c3eaee13ca8e1fbd11b917ffb3e77df4a92aa7dbad8099bfe389a3950fb7da0586f764271f4ef2a31136329919ccdd750275edf4a56d3bc444c4a911a8196ac8 SHA512 2f46741d94120560bb32880dd9853e06e52b3288c65161a9b0103d3213c85cf760947509182d562abd4e1a9c333897f821e159860ff5a15da3b3346f374495ba
+DIST firefox-73.0-mk.xpi 494045 BLAKE2B 0b8384f4b52bb6e093d7bc39ab8636e233b362c362f98f1f30f6a266ca8dbc3d4f598cbb8a55a384a021859a8487fdd70e6c23f2497214fe511e12d01aac7984 SHA512 3c38684a799c8b4f61fa3210dfc919074d865ad80ed4f42f58a93ab2e65f9aa7a3586115e071d01450210a1d7d3733d482d57c0e223d523cea2a1b5bb06cd5d4
+DIST firefox-73.0-mr.xpi 598579 BLAKE2B 39c4d358342df9641982db51ffb0ddecbadb11f7da789f7abfe50fd1effd24475fdd27ed39e00dc02247b7c229ab0c17c8fcdf944dd8abae6d7a390b7d53c8dc SHA512 8357e9873c5ef85453f2acc83e9850ac63a55b664fae1622101699445019f6176360a9ccfe2ebb63dadf5731a396d846db46788a81cb7045a7b608e3018a2ebe
+DIST firefox-73.0-ms.xpi 502900 BLAKE2B 1d1f30bda8772b4d7c337a0631c968f338a473d7cb4ea823189e89de58053a7c0a50670b93d9a39ff6cb8bc1ad54606d4faedc9a4c35f989307c55f6426fd55e SHA512 daa1e7893111dccde1ab50355ba4dd4ca93a241efa8db89f0e5090c412e9e495a052064e23670b1e9379a6813a459fbfe5882949367b248de1c29cf9dad77096
+DIST firefox-73.0-my.xpi 567253 BLAKE2B 30fdc28e708717c287fa95ae71d3d95dc9f010fca66e5dd872511f9cf84619d2dbbe95b78f05e7819348a71fda646311b20797de69866310027e0db00f431723 SHA512 04edfc8ee943a767f6dee5b884faa7f7966f841d6700e1496452dddc0131188414772b4b7165eaef1595c51806665a07fc1e8ba1c8374c6f33b3ac1c5d93d0d1
+DIST firefox-73.0-nb-NO.xpi 531604 BLAKE2B b1678cc64e34fe78992799d6959bb11f0cc677e12f68cb9fb8792e91dd8450e449284fa16461b6b787fda2af03d1e20a4fc28a9e48fe3a408d02e935f8f93868 SHA512 b98aeb4038f52df67de24966fe187a847b3733a6f375cefe7bc769ba9b812fcfc0fa458b61f55e95698abdd68a779e44d7bbf88943655d19f69bcb60f782ba3f
+DIST firefox-73.0-nl.xpi 533582 BLAKE2B bb8164d4315dd9184cbdea9fed3cd033370e8e185267ac3b4c0942debbd098b3306f1e3b913c4b719730a4827a8a0a64e8e888c1015870ab6fa6ea472bdd4b11 SHA512 46071d43bce690619eea8613fef0319c5046ebae0792fce0d67945a4b88c71c6ce87c28023aaa7d71d8934bb8054af6cc8cccbeaea93131f1b7853020950c9c5
+DIST firefox-73.0-nn-NO.xpi 533023 BLAKE2B d112da9688b6a99a5048e7bc1d190761e10c1e8ef2824d72c977cb8f80ac2aa7e3839b540b5bed4a5cf52ceb948ed7e80c6e333664bc1750715d97e9eb538c59 SHA512 8212f671ae3ebcf69749a07d7a05088b3e3b95dc373abdeeceb818ea402955b8c4138c5dca4e07c6be59770e9039ba445e2b882bfca0d1472cfc68ad16c6f1ec
+DIST firefox-73.0-oc.xpi 533792 BLAKE2B 01fe9128ad3466152f5496e0e2b27b47879662d88eaff6a4a58eee20c686d0b74a37e8b665aa16cce32cac569c6ac2375e63caa617d5ac2f07f299348ba067d2 SHA512 c6a299ffc2d1dcd8b3bc91bac088152fb541a01a963a2416ea6cc2a590af56b166919d1a99b8bbdcc3fa87cd965970ba229e553f219be4b52a743e964a5b3e66
+DIST firefox-73.0-pa-IN.xpi 583985 BLAKE2B 38ff20e819ce9581fcb6ff467c75e47ed70bbbac6975645a7bea149d6957149e75b2ef97594c09d8131b8c96819184c436987bd2f860447793b1c1fab3958e8c SHA512 ea8373a07380d63805f08dc9ffb86587af0540b1ccb4abf388c8dc239dcf734b573171e70a348865b3baae81e905b5282e169f544232583eab06aff511a93fb2
+DIST firefox-73.0-patches-04.tar.xz 20756 BLAKE2B 91dbb2454a5f4a675f13cac38f2455faa35f86edb2d1b8ed2d1df619176dc55563711fada925481f2fe5772148c12788a646ccec2e91b0e5c49c120d0541d224 SHA512 89662e232aa51eb9e42f0d9765f95982768054e03bb3c8f89a6522040e7b2ced1f002de021c36041aeb26e3ba4db39e604d7b58f83031e4769ea056633e09019
+DIST firefox-73.0-pl.xpi 546881 BLAKE2B 13644387d8e999262293a4050b003077acb2cceefdce92ecd6a0c4c2f362db22fb1581ca446e1d5e1eb51be405b20b49058251ebd32ec3749b04d288b407eb9c SHA512 b245f63b4dc651ec327f4666bbe39d88a51ae5f55792025cb88529faa4065d2b684c4dc47e41dfc0a5e432f27efae5351bba57e58bf317920383dba7090f643c
+DIST firefox-73.0-pt-BR.xpi 535110 BLAKE2B a87c32cdbf9ba723115f4237c4ca94137e3bbd6473c772299c527c2c2bd4f3c0e56d1dc8c95b7eb74524968fba07ec3fe03ddb71be7f35aafa3195f2c0ec113c SHA512 c9ef3c05b42649f48779cc50c7961304c7cdfcf4c0da883ac59e84415f8723e22722f84a95fe498112734a5fc8c835a76ca6b3b5ce4a34885d464ea7fc222de7
+DIST firefox-73.0-pt-PT.xpi 545611 BLAKE2B 83c8976562f7cade133b8628d95f0c114955f5f1f221e231eeafe194d27a3797e34236f34a21bb519ee4b4a70b3eda344d11e1f5ff295ac85ffb213495d8bda2 SHA512 7fca523ec773817a10953a7cc7631f9c1d5bf05ff3e906dec7e925c037b515931b406fbccfc546ae54de3c37bf84e1da4ada01bcb45c432bb7d1f2b46752e521
+DIST firefox-73.0-rm.xpi 539299 BLAKE2B 26f53819e29943d299c8f9fb4f4f4567bbd4c560849c26a8b6358c72cf60d02d0a57e6b4e87956547bcb8f3c5d8ab877d97cc1ba7c77e3a6628c6c556b063c2d SHA512 3d79c7f32b973ff8b89aa1b9e44b67fad6b85f6d54954561543a5ead5a0f03e42683c5b201e9c9698f92917fddabb789994e3aac875557924a7b55874e5d383c
+DIST firefox-73.0-ro.xpi 552384 BLAKE2B 538d3041346f8d0393178cda6f81b97b99409f3bda7b0894c04217e1ae1c11bd83bdff327ea41493f0877af1ba594b808ede069a8646eedcbd340d712b2b7b53 SHA512 f6226c9f8fd2655b2f6a2a01c7e57395ae25cbf6ea6e06c9d1b11ba246a03270376407dc781e409cbca22cb1924d737f944ebab677907b9289d0542a47312aa8
+DIST firefox-73.0-ru.xpi 629286 BLAKE2B 8272e3257bb31619afef56616a2cf550b04737428304dc664344823d510ce6496c5b17187ae21b57b138d40156e65ff5f0cfc71a44dbc3a86132d0fdd02ca236 SHA512 cb6744c555a47f5529904e14ed2ac6d2231ccdf53f7b6752c0e8ea420ec7f4dc48c92258a4d8980be190139bb24c71fcc0f35329c8f09f5e2ce4a486c64b7087
+DIST firefox-73.0-si.xpi 543080 BLAKE2B 7919124b9ff1b03bca734dbd880438706c39f9af775a7ccbc9644101e721541294d838bce488a9a2725397f9a5fa5d3669047de4aa56b97b63bb1b15fb976caf SHA512 3e36d765e075aab2150ba14e9fbd5c711f6033374ceb678529cc26990c95b471a9645bccbfe20be0ed59b6ec27caba4e992b43eb4f3827117427dac0af36efd8
+DIST firefox-73.0-sk.xpi 565452 BLAKE2B 92ed81f91aefb945bb6372e79bfa3bf3438c7384e077b3b3b874fc4db2bea82bdeba06199e34d296d021e7fae2939f907922ed387458d8791c5b00ae0c6cf69d SHA512 0ab92f273f5025fe4822a8891dcd55451de56dd8415ffa7f97af1df4d6a9b162087761a8587429e2206d7f0be6c0e2fad252287bb2b3ed1f3ede69d3296f3169
+DIST firefox-73.0-sl.xpi 545345 BLAKE2B 6a49eeb4776eaf4b3daf62679ea8bb6da7fc7747729d7af6be0b40cdabfa1e12d23b6c7e0eba1feb6f8f2cd5a93612d33c2a0e1d85f9e1e6cf29dee4b86d4839 SHA512 bd0d89f3ac560dd1ecf39414238b40ce954ea897bc1442756b6b273108792416aef2b76848bfb7aca302ccf24d6f344cca158ecad44fad14ff4598ba13591f79
+DIST firefox-73.0-son.xpi 469523 BLAKE2B 50caf3f3d7bbdf1da62556e3c2468bc413d3333a3fd118f8be6a9ba18416194e5b9817ef56155b7157ba29bd1f649703676a8fc810ba2c92e3c041c2914b8ac4 SHA512 8f8a45a53e8c992e1136b74050ab06fe55c48c20ec6c3ed744bf54d5ab96e05e8e1befe8c6dcbc76e51bc06e989470aa4439d594b85106ff6101b92a5ef76dbc
+DIST firefox-73.0-sq.xpi 558155 BLAKE2B e87cd5cf56b45348e472249b31f61e2d9517894e2b0613e3e98d4cc97a3fc819078e39fc07def55b84306262e0493427ea5027220a2c86f4d18e833ec0d4a735 SHA512 15c00dc3b95577f8323467aa0543613eef191d4b3f2b9f9bb8e4223a9586becc85589ed65b5ceabf0d7ce6005f81eaeb65a21963fb79b61742f70a0a658255c7
+DIST firefox-73.0-sr.xpi 563124 BLAKE2B f7b3af25107427c5b9b431da2e74795cdf1463b30feb896be03489f5ab6716499f8bf39c361440f0213e93224d62274b4e3857e0c1f5b8fef49fa6054ee2c34e SHA512 647770d9a51274add002480bb9a1ceb3496d81fdcead2f72edb979b7f6edaf867d941371a6b9a712ba799faf8a5c426d78f97e97a7f4bee044fe1cc12da98abd
+DIST firefox-73.0-sv-SE.xpi 543344 BLAKE2B 2e918e4335569ef69a25e6fb8079f33b25bd585b904eea53de161ef40696059844fa564ef71f4ab71e577ae35bc040773f8c6cc286a2a7532eb8460f9bdea6e0 SHA512 6f82eac01117d0a36d171691012e3fd6ada14180e4b27259b1bc5a2636a0f3b641bfeab1a8d6e409647b8b16df17a52a3bd293faac92fcfd53edfc97e83b8e39
+DIST firefox-73.0-ta.xpi 572049 BLAKE2B 14be21d4736414dea47d9e83ee44f486dce0842480181dc09e656bbc2370be751810e7f60e7d1aff3340173a0f5915f331da5220af1bad370af7a8256d90cb0c SHA512 c4ed8a336963b7403980c49f3f0ed98124b8c80a96c767237436cea23d85f8ff51b2fa563f44a870896ce2eaed32f433c59117907e46c34660613a068796550c
+DIST firefox-73.0-te.xpi 591172 BLAKE2B a19810cdd706ccecd67a6271625444aa23b1d529580658c889b0ab42aa82434b1ea4bdb7d378dc210d85eeb54f266f7dcdd79f5cc57ff995dc9862601b1c682d SHA512 d2d5f64054fa890f9bf834e77bbf6d7b95b0263aa0112f5b8ce349c853ff4763dc619f8912d696c2748bdc1cca5fe63ebae9ff82582e33923ce3a55f56d860ee
+DIST firefox-73.0-th.xpi 606026 BLAKE2B cd504c5348f3975f031b9bc56bc758816dd6d96b281cd62ff67f03278b1e4bc553abe5915533658273a93fb1fd47cb555ee339f6297dff8244807c6d7a21b186 SHA512 35eb880367cad3807cff0c11624b2a16f104215a738def68a04448b838f4e6a201aacc5e77ab90f5652c6fc58124b4bf1667ad117d5009e603498ff34c53ae64
+DIST firefox-73.0-tr.xpi 557165 BLAKE2B 1a19de476068172d7f5ae417d763137fe0e997fef724cfb1ed4ecbb2d2ff1539fd07f50e11ba9fc92d5a5ccd8a84238b008cf4e20071dac48d47bcd0cfba62d5 SHA512 50b4190acdde1f684512085a9482f04f2b76df53f9651d3f81d1a82d226e0b349c04b0b94f67af9b2c940eb6131c67ceddcf55edef47248725ea2b98b0eaa537
+DIST firefox-73.0-uk.xpi 618646 BLAKE2B ca2f564119eecd81a198b49c13187d7572778a955cb2c67cd285ad8cfd1ddcc482a923f431ec1a966d44af2775c8a9997f72bac48e225b028113c8f59e96e113 SHA512 a1997270d892d15afff731968aa804d0917e40be3dfa6a13204c30c6d7f12ae018345be426279404ddcce102d0f304af98db402f949d044665bd153950bc96a4
+DIST firefox-73.0-ur.xpi 587613 BLAKE2B 344e50c34a355ebdaf7173ab3bfadb8f86e964ea595400ca0df0cb488328ba722dc45ae63f37dce0be1261c451e0834ccffd3859ebe11d93618dadf5fdaf8b55 SHA512 bf65e1bd805f5e6c77a5a89e30677e8b25b9f212332a48eb417e42af627f590ab69e9ba7f558313f3f584c324ed17a738b2a2e503f5ea1809dfba717a68ab226
+DIST firefox-73.0-uz.xpi 505194 BLAKE2B 336e9d9c37e5643ba155a15368ed91b216d3c6384fb646bf3ede1fbeada7849775318174bd63ba9d707a172b4e68eb7c299d5462c4dc6c87cd26283032512d83 SHA512 055026adf07f9de5439ff7ba09be8af246b908c26188dadb7a8d282ac30fd25c74070f37c53d92c399a8870ba30329df3b6bced66f30e2be6567b7ae421e82b8
+DIST firefox-73.0-vi.xpi 572669 BLAKE2B e17735f8c7f57d1331c31130b949f19f72de36b93203d85dda3847bfa22f64b8573f063a868801fb9bf938324743b6697be6c739f2a145106d241c1b56cf7d2c SHA512 71ff4b945c076caaec6ce32d0ff8d0fa37cf6dc5d9331062d499208bdc980bf7c251a8aa0ea2920fe6fa5e4076cab0abea4e28be2e1d7a529bfdeb9b190a19e7
+DIST firefox-73.0-xh.xpi 473977 BLAKE2B 3dc2bfeffd2a5c6fe91a0b592c99af987c2977afbd7d8194c4bee2f641121d4af1f969e9b91fe9683fe95f111e585e2968a29abe6d74c4d3ecfab4313fa35f00 SHA512 e738b5918091809a1e9aa9a0dd9431e882a3e773d4ac8c05569cabc8f0953f547bff91d42b204f314c7672b1b7e33cdb6f971289133798b3265e936108425807
+DIST firefox-73.0-zh-CN.xpi 579408 BLAKE2B 3bbe33dffbe82ac9cec337f56fa65ca2edacaa50be31d6d337b5eeaa63de0c383a64b476c9907c236bd750ea8c1d0fe549130739088b98814c2294bb3ead634d SHA512 af858d84f014d76a2814cc4eebff4a1562a9c63adcca82a20c6c3257a74ba2395a9e452abe27325f1ea84e151117bd8f7d366d8671a27e483bc234e1cf8205d6
+DIST firefox-73.0-zh-TW.xpi 578021 BLAKE2B 0c6d4b777f57e5b9671f13b19e191da929abd97950c81eeb94cdae7e10b853db487d54980c9480315bc05dc23323c262f7893b76f06111ab10a09cd21ddabaa8 SHA512 d0c46dac102a1f3db238b89591ff00b3bef5cfd45d49e869fa871fcfa663ae57089069123eeabf3c2b4bee254c0fe2fe574e6050e64c80a5f1277076b7f6da2a
+DIST firefox-73.0.source.tar.xz 319387000 BLAKE2B 3c414c0e8f5737e2e50d2f42d7543c85061d289774b9daa73a39458649d8c7b09fc992d45d529c8a3874c0bbdf04ac4533b5522dabcd013f4ceb65e27c8e14eb SHA512 e10a8b48ae532d855ff50761cbdf2a6d94b2bad58a5e18d040db43d3424cbb068772f4d91c0aadd6c40b13e3d020e0e712955a1a12b41fda6333197fc34aa19a
+EBUILD firefox-52.9.0.ebuild 12968 BLAKE2B 0b7c97e1a5c2d8ff6a096883461d8bf3dc5565fd6a0f9f717025b83199e1cfba0a2c556c2bf1fe96a70765e2e36c349e04701c201e5ce2b0ec9f6e315b5f53c2 SHA512 0144adda389facff5cf7a82af8e79a2d5a2b08051affd5bd33da24ece332b5b196dd7dd67ed3239f62f8eea6730437f8a4946cc6eab116553c93f3745e4efbb7
 EBUILD firefox-68.2.0.ebuild 24835 BLAKE2B a7efeeda3d1d3a2ac7ee48ebb4d6aa31121825f6b4381fa23a3bad14d43eeb5b89b12ce8e9cf35964f7d056e17a85e40f32eb646359a4a812015f227d290cc35 SHA512 72ef21beec2f7f4061070a9c8e695ee354cae572540e4081f3ea87d1653511231c5ae4864eac7c0009554cba5fdb1c0e45855b67c5e502d0cd0b092d22bbaae5
 EBUILD firefox-68.3.0.ebuild 24665 BLAKE2B 3061eb479d2a8b3097ff197043273553279e954cf1aab43b487a9d4238b46fe7a294203ad7491e94eb1a3b0cdf076b335da4acfc9eec007705b6f20dba6a2065 SHA512 505e00d3f96f8d98793271c8ee4c30e0ddb93b7d7d975d6db76c5325da585c6c4d5983f48eaa8034e279c8f2649e095cd47e23df0b193e2437656d255a524aa8
 EBUILD firefox-68.4.1.ebuild 24613 BLAKE2B ee2328fbc94d528db521fe843a406117964106a43f0040529a29494d84215b049a6a5d7b73fce2dedbbbf86e7549d9c5bc7ff2296747d3123d742f6dc5c651dd SHA512 049b17650d6067dfe963ca50fb1292a114ec70aacff9c5c0079174ac43b54eed8f55592b95f3dabeb0d74bc7f20b943bdc059491e59a11bdc2cec1e85cfbd55f
 EBUILD firefox-68.4.2.ebuild 24613 BLAKE2B ee2328fbc94d528db521fe843a406117964106a43f0040529a29494d84215b049a6a5d7b73fce2dedbbbf86e7549d9c5bc7ff2296747d3123d742f6dc5c651dd SHA512 049b17650d6067dfe963ca50fb1292a114ec70aacff9c5c0079174ac43b54eed8f55592b95f3dabeb0d74bc7f20b943bdc059491e59a11bdc2cec1e85cfbd55f
-EBUILD firefox-71.0-r1.ebuild 25618 BLAKE2B a85221d2d6cb34abb6bd42df5e2215865014ba7c4bfa387f20bd39353e8ae3797d9c1e84feacc75e1103b6db63cc3654c5278897db9b478a61631fe031af29a2 SHA512 275035394ba3c2096c99efe34a09d60b849e013d30f8f2c8912ba30c2e2c3eca9334a4001517630758339a187be49952aca734e7ce52f6369d4b56a1fac97d2a
-EBUILD firefox-72.0.1.ebuild 25631 BLAKE2B 09ee117addeef947bd0558033687217fd0bc88746272f6bf5a5bc5541bbd8232573f514902bc58143bad99ffc54ece88998a10f45dc8ab760abd611203938fea SHA512 4f1caf284039074d3af71f058fe437c9021e4a30d318c1c286c3ee876ae899dd1ec32c33232e162c538709f9e7d38a8a5025e0220be3f2841021eb16ec8dd4b2
-EBUILD firefox-72.0.2.ebuild 25631 BLAKE2B 09ee117addeef947bd0558033687217fd0bc88746272f6bf5a5bc5541bbd8232573f514902bc58143bad99ffc54ece88998a10f45dc8ab760abd611203938fea SHA512 4f1caf284039074d3af71f058fe437c9021e4a30d318c1c286c3ee876ae899dd1ec32c33232e162c538709f9e7d38a8a5025e0220be3f2841021eb16ec8dd4b2
+EBUILD firefox-73.0.ebuild 25616 BLAKE2B 1e48fe2c809f4bdbccd49c90b837ce36afbf103de4630ac0b69a2e5d9866bd594c2ca76ac5f388c926c3f0880eb438a68ee8b71f29ec5c830291d2f5c5c52822 SHA512 69ad875f78f6e9e241065ca0510d3849054e1ddf433b60e70e2081924226cb816e1e6b5461a94b202881162dc4e6dd1ed8f03479256cdcda9cfad9bbd037aa8f
 MISC metadata.xml 2540 BLAKE2B 458e01980f6c0dd1722289fa23d3934d66b1cebe4e0f80b89cb1901bf823c67acc852f1a14f6fd2e59829209dead122ddaf77eacc81d3cc3c957d73fc649b187 SHA512 c2d232195fdc5950a1005c9f46e9b304cbe0c2c991312a82d35363021123719bd0f52058d6f33d075c091a02b920baa479a425c07a9bd7ed0c87857ef6479dcc
diff --git a/www-client/firefox/firefox-52.9.0.ebuild b/www-client/firefox/firefox-52.9.0.ebuild
index 53c26593ce3a..8d3fe03a08cd 100644
--- a/www-client/firefox/firefox-52.9.0.ebuild
+++ b/www-client/firefox/firefox-52.9.0.ebuild
@@ -241,7 +241,7 @@ src_configure() {
 	fi
 
 	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake -f client.mk configure
 }
 
@@ -267,10 +267,10 @@ src_compile() {
 		shopt -u nullglob
 		[[ -n "${cards}" ]] && addpredict "${cards}"
 
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 		virtx emake -f client.mk profiledbuild
 	else
-		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+		MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 		emake -f client.mk realbuild
 	fi
 
@@ -308,7 +308,7 @@ src_install() {
 			|| die
 	done
 
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake DESTDIR="${D}" install
 
 	# Install language packs
diff --git a/www-client/firefox/firefox-71.0-r1.ebuild b/www-client/firefox/firefox-71.0-r1.ebuild
deleted file mode 100644
index c46794991a89..000000000000
--- a/www-client/firefox/firefox-71.0-r1.ebuild
+++ /dev/null
@@ -1,798 +0,0 @@
-# Copyright 1999-2020 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_{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 ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur 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*}" # 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}-71.0-patches-04"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=9
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 virtualx eapi7-ver
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo
-	pulseaudio +screenshot selinux startup-notification +system-av1
-	+system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-sqlite +system-libvpx +system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-CDEPEND="
-	>=dev-libs/nss-3.47.1
-	>=dev-libs/nspr-4.23
-	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[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35: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
-	sys-apps/dbus
-	dev-libs/dbus-glib
-	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-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 )
-	system-icu? ( >=dev-libs/icu-64.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.29.0:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? (
-		kernel_linux? (
-			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
-	>=dev-util/cbindgen-0.9.1
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:6
-			!clang? ( sys-devel/llvm:6 )
-			clang? (
-				=sys-devel/lld-6*
-				sys-devel/llvm:6[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-6*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	>=virtual/rust-1.36.0
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-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() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if use pgo ; then
-		if ! has usersandbox $FEATURES ; then
-			die "You must enable usersandbox as X server can not run as root!"
-		fi
-	fi
-
-	# 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
-	if use pgo || use lto || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
-	eapply "${WORKDIR}/firefox"
-	eapply "${FILESDIR}/${PN}-69.0-lto-gcc-fix.patch"
-	eapply "${FILESDIR}/mozilla-bug1601707-gcc-fixup.patch"
-	eapply "${FILESDIR}/${PN}-71.0-bug1602358-fix-older-builds-with-newer-cbindgen.patch"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# 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
-
-	# 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
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# 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
-
-	# libclang.so is not properly detected work around issue
-	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	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 cpu_flags_arm_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
-
-	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
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	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 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 and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang && ! use arm64; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		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
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./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-3 \
-		"${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
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# 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() {
-	# 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() {
-	xdg_desktop_database_update
-	xdg_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
-
-	local show_doh_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-72.0.1.ebuild b/www-client/firefox/firefox-72.0.1.ebuild
deleted file mode 100644
index 3b3594aa446c..000000000000
--- a/www-client/firefox/firefox-72.0.1.ebuild
+++ /dev/null
@@ -1,793 +0,0 @@
-# Copyright 1999-2020 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_{6,7,8} )
-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 ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur 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*}" # 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}-72.0-patches-02"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=9
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 virtualx eapi7-ver
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-# Remove system-harfbuzz until new working patch is generated
-IUSE="bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo
-	pulseaudio +screenshot selinux startup-notification +system-av1
-	+system-icu +system-jpeg +system-libevent  +system-sqlite +system-libvpx
-	+system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-# remove harfbuzz graphite dep until new working patch is generated for system libs
-#	system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 )
-CDEPEND="
-	>=dev-libs/nss-3.48
-	>=dev-libs/nspr-4.24
-	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[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35: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
-	sys-apps/dbus
-	dev-libs/dbus-glib
-	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-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-icu? ( >=dev-libs/icu-64.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? (
-		kernel_linux? (
-			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
-	>=dev-util/cbindgen-0.10.1
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	>=virtual/rust-1.36.0
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-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() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if use pgo ; then
-		if ! has usersandbox $FEATURES ; then
-			die "You must enable usersandbox as X server can not run as root!"
-		fi
-	fi
-
-	# 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
-	if use pgo || use lto || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
-	eapply "${WORKDIR}/firefox"
-	eapply "${FILESDIR}/${PN}-69.0-lto-gcc-fix.patch"
-	eapply "${FILESDIR}/mozilla-bug1601707-gcc-fixup-72.patch"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# 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
-
-	# 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
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# 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
-
-	# Clear checksums that present a problem
-	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/backtrace-sys/.cargo-checksum.json || die
-}
-
-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
-
-	# libclang.so is not properly detected work around issue
-	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	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 cpu_flags_arm_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
-
-	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
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	#mozconfig_use_with system-harfbuzz
-	#mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	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 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 and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang && ! use arm64; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		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
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./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-3 \
-		"${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
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# 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() {
-	# 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() {
-	xdg_desktop_database_update
-	xdg_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
-
-	local show_doh_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-72.0.2.ebuild b/www-client/firefox/firefox-72.0.2.ebuild
deleted file mode 100644
index 3b3594aa446c..000000000000
--- a/www-client/firefox/firefox-72.0.2.ebuild
+++ /dev/null
@@ -1,793 +0,0 @@
-# Copyright 1999-2020 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_{6,7,8} )
-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 ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
-en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
-nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
-th tr uk ur 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*}" # 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}-72.0-patches-02"
-
-MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
-MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
-
-if [[ "${PV}" == *_rc* ]]; then
-	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
-	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
-fi
-
-LLVM_MAX_SLOT=9
-
-inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
-		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
-		autotools mozlinguas-v2 virtualx eapi7-ver
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-# Remove system-harfbuzz until new working patch is generated
-IUSE="bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver
-	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo
-	pulseaudio +screenshot selinux startup-notification +system-av1
-	+system-icu +system-jpeg +system-libevent  +system-sqlite +system-libvpx
-	+system-webp test wayland wifi"
-
-REQUIRED_USE="pgo? ( lto )"
-
-RESTRICT="!bindist? ( bindist )
-	!test? ( test )"
-
-PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
-SRC_URI="${SRC_URI}
-	${MOZ_SRC_URI}
-	${PATCH_URIS[@]}"
-
-# remove harfbuzz graphite dep until new working patch is generated for system libs
-#	system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 )
-CDEPEND="
-	>=dev-libs/nss-3.48
-	>=dev-libs/nspr-4.24
-	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[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35: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
-	sys-apps/dbus
-	dev-libs/dbus-glib
-	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-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-icu? ( >=dev-libs/icu-64.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
-	system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] )
-	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
-	wifi? (
-		kernel_linux? (
-			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
-	>=dev-util/cbindgen-0.10.1
-	>=net-libs/nodejs-8.11.0
-	>=sys-devel/binutils-2.30
-	sys-apps/findutils
-	|| (
-		(
-			sys-devel/clang:9
-			!clang? ( sys-devel/llvm:9 )
-			clang? (
-				=sys-devel/lld-9*
-				sys-devel/llvm:9[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:8
-			!clang? ( sys-devel/llvm:8 )
-			clang? (
-				=sys-devel/lld-8*
-				sys-devel/llvm:8[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:7
-			!clang? ( sys-devel/llvm:7 )
-			clang? (
-				=sys-devel/lld-7*
-				sys-devel/llvm:7[gold]
-				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
-			)
-		)
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	>=virtual/rust-1.36.0
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-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() {
-	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-pkg_setup() {
-	moz_pkgsetup
-
-	if use pgo ; then
-		if ! has usersandbox $FEATURES ; then
-			die "You must enable usersandbox as X server can not run as root!"
-		fi
-	fi
-
-	# 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
-	if use pgo || use lto || use debug || use test ; then
-		CHECKREQS_DISK_BUILD="8G"
-	else
-		CHECKREQS_DISK_BUILD="4G"
-	fi
-
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Unpack language packs
-	mozlinguas_src_unpack
-}
-
-src_prepare() {
-	use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
-	eapply "${WORKDIR}/firefox"
-	eapply "${FILESDIR}/${PN}-69.0-lto-gcc-fix.patch"
-	eapply "${FILESDIR}/mozilla-bug1601707-gcc-fixup-72.patch"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# 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
-
-	# 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
-
-	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
-	# However, when available, an unsupported version can cause problems, bug #669548
-	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
-		"${S}"/build/moz.configure/rust.configure || die
-
-	# 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
-
-	# Clear checksums that present a problem
-	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/backtrace-sys/.cargo-checksum.json || die
-}
-
-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
-
-	# libclang.so is not properly detected work around issue
-	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
-
-	if use pgo ; then
-		if ! has userpriv $FEATURES ; then
-			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
-		fi
-	fi
-
-	# Don't let user's LTO flags clash with upstream's flags
-	filter-flags -flto*
-
-	if use lto ; then
-		local show_old_compiler_warning=
-
-		if use clang ; then
-			# At this stage CC is adjusted and the following check will
-			# will work
-			if [[ $(clang-major-version) -lt 7 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			# Upstream only supports lld when using clang
-			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-		else
-			if [[ $(gcc-major-version) -lt 8 ]] ; then
-				show_old_compiler_warning=1
-			fi
-
-			if ! use cpu_flags_x86_avx2 ; then
-				local _gcc_version_with_ipa_cdtor_fix="8.3"
-				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
-
-				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
-					# due to a GCC bug, GCC will produce AVX2 instructions
-					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
-					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
-					append-ldflags -fdisable-ipa-cdtor
-				else
-					einfo "No GCC workaround required, GCC version is already patched!"
-				fi
-			else
-				einfo "No GCC workaround required, system supports AVX2"
-			fi
-
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
-		fi
-
-		if [[ -n "${show_old_compiler_warning}" ]] ; then
-			# Checking compiler's major version uses CC variable. Because we allow
-			# user to control used compiler via USE=clang flag, we cannot use
-			# initial value. So this is the earliest stage where we can do this check
-			# because pkg_pretend is not called in the main phase function sequence
-			# environment saving is not guaranteed so we don't know if we will have
-			# correct compiler until now.
-			ewarn ""
-			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
-			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
-			ewarn ""
-			sleep 5
-		fi
-
-		mozconfig_annotate '+lto' --enable-lto=thin
-
-		if use pgo ; then
-			mozconfig_annotate '+pgo' MOZ_PGO=1
-		fi
-	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 cpu_flags_arm_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
-
-	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
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_annotate '' --enable-rust-simd
-	fi
-
-	# use the gtk3 toolkit (the only one supported at this point)
-	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
-	if use wayland ; then
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	mozconfig_use_enable startup-notification
-	mozconfig_use_enable system-sqlite
-	mozconfig_use_with system-av1
-	#mozconfig_use_with system-harfbuzz
-	#mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-	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 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 and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
-	echo -n "${_google_api_key}" > "${S}"/google-api-key
-	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
-	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
-
-	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
-
-	# allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	if use clang && ! use arm64; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		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
-
-	mkdir -p "${S}"/third_party/rust/libloading/.deps
-
-	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
-	./mach configure || die
-}
-
-src_compile() {
-	local _virtx=
-	if use pgo ; then
-		_virtx=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-		addpredict /etc/gconf
-	fi
-
-	GDK_BACKEND=x11 \
-		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
-		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
-		MOZ_NOSPAM=1 \
-		${_virtx} \
-		./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-3 \
-		"${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
-
-	# Disable built-in auto-update because we update firefox through package manager
-	insinto ${MOZILLA_FIVE_HOME}/distribution/
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# 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() {
-	# 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() {
-	xdg_desktop_database_update
-	xdg_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
-
-	local show_doh_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/www-client/firefox/firefox-73.0.ebuild b/www-client/firefox/firefox-73.0.ebuild
new file mode 100644
index 000000000000..28c979325c1b
--- /dev/null
+++ b/www-client/firefox/firefox-73.0.ebuild
@@ -0,0 +1,792 @@
+# Copyright 1999-2020 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_{6,7,8} )
+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 ast az be bg bn br bs ca cak cs cy da de dsb el en en-CA
+en-GB en-US 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 ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
+nb-NO nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te
+th tr uk ur 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*}" # 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}-73.0-patches-04"
+
+MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
+MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz"
+
+if [[ "${PV}" == *_rc* ]]; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	MOZ_SRC_URI="${MOZ_HTTP_URI}/source/${PN}-${MOZ_PV}.source.tar.xz -> $P.tar.xz"
+fi
+
+LLVM_MAX_SLOT=9
+
+inherit check-reqs eapi7-ver flag-o-matic toolchain-funcs eutils \
+		gnome2-utils llvm mozcoreconf-v6 pax-utils xdg-utils \
+		autotools mozlinguas-v2 virtualx eapi7-ver
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+# Remove system-harfbuzz until new working patch is generated
+IUSE="bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver
+	+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo
+	pulseaudio +screenshot selinux startup-notification +system-av1
+	+system-harfbuzz +system-icu +system-jpeg +system-libevent  +system-sqlite
+	 +system-libvpx +system-webp test wayland wifi"
+
+REQUIRED_USE="pgo? ( lto )"
+
+RESTRICT="!bindist? ( bindist )
+	!test? ( test )"
+
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_SRC_URI}
+	${PATCH_URIS[@]}"
+
+# remove harfbuzz graphite dep until new working patch is generated for system libs
+#	system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 )
+CDEPEND="
+	>=dev-libs/nss-3.49.2
+	>=dev-libs/nspr-4.24
+	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[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/pango-1.22.0
+	>=media-libs/libpng-1.6.35: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
+	sys-apps/dbus
+	dev-libs/dbus-glib
+	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-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? ( >=media-libs/harfbuzz-2.6.4:0= >=media-gfx/graphite2-1.3.13 )
+	system-icu? ( >=dev-libs/icu-64.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
+	system-libvpx? ( =media-libs/libvpx-1.7*:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.30.1:3[secure-delete,debug=] )
+	system-webp? ( >=media-libs/libwebp-1.0.2:0= )
+	wifi? (
+		kernel_linux? (
+			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
+	>=dev-util/cbindgen-0.12.0
+	>=net-libs/nodejs-8.11.0
+	>=sys-devel/binutils-2.30
+	sys-apps/findutils
+	|| (
+		(
+			sys-devel/clang:9
+			!clang? ( sys-devel/llvm:9 )
+			clang? (
+				=sys-devel/lld-9*
+				sys-devel/llvm:9[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:8
+			!clang? ( sys-devel/llvm:8 )
+			clang? (
+				=sys-devel/lld-8*
+				sys-devel/llvm:8[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-8*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:7
+			!clang? ( sys-devel/llvm:7 )
+			clang? (
+				=sys-devel/lld-7*
+				sys-devel/llvm:7[gold]
+				pgo? ( =sys-libs/compiler-rt-sanitizers-7*[profile] )
+			)
+		)
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	>=virtual/rust-1.39.0
+	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
+	amd64? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	x86? ( >=dev-lang/yasm-1.1 virtual/opengl )
+	!system-av1? (
+		amd64? ( >=dev-lang/nasm-2.13 )
+		x86? ( >=dev-lang/nasm-2.13 )
+	)"
+
+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() {
+	if ! has_version --host-root "sys-devel/clang:${LLVM_SLOT}" ; then
+		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version --host-root "=sys-devel/lld-${LLVM_SLOT}*" ; then
+			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version --host-root "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	if use pgo ; then
+		if ! has usersandbox $FEATURES ; then
+			die "You must enable usersandbox as X server can not run as root!"
+		fi
+	fi
+
+	# 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
+	if use pgo || use lto || use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_prepare() {
+	use !wayland && rm -f "${WORKDIR}/firefox/2019_mozilla-bug1539471.patch"
+	eapply "${WORKDIR}/firefox"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# 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
+
+	# 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
+
+	# rustfmt, a tool to format Rust code, is optional and not required to build Firefox.
+	# However, when available, an unsupported version can cause problems, bug #669548
+	sed -i -e "s@check_prog('RUSTFMT', add_rustup_path('rustfmt')@check_prog('RUSTFMT', add_rustup_path('rustfmt_do_not_use')@" \
+		"${S}"/build/moz.configure/rust.configure || die
+
+	# 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
+
+	# Clear checksums that present a problem
+	sed -i 's/\("files":{\)[^}]*/\1/' "${S}"/third_party/rust/backtrace-sys/.cargo-checksum.json || die
+}
+
+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
+
+	# libclang.so is not properly detected work around issue
+	mozconfig_annotate '' --with-libclang-path="$(llvm-config --libdir)"
+
+	if use pgo ; then
+		if ! has userpriv $FEATURES ; then
+			eerror "Building firefox with USE=pgo and FEATURES=-userpriv is not supported!"
+		fi
+	fi
+
+	# Don't let user's LTO flags clash with upstream's flags
+	filter-flags -flto*
+
+	if use lto ; then
+		local show_old_compiler_warning=
+
+		if use clang ; then
+			# At this stage CC is adjusted and the following check will
+			# will work
+			if [[ $(clang-major-version) -lt 7 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			# Upstream only supports lld when using clang
+			mozconfig_annotate "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+		else
+			if [[ $(gcc-major-version) -lt 8 ]] ; then
+				show_old_compiler_warning=1
+			fi
+
+			if ! use cpu_flags_x86_avx2 ; then
+				local _gcc_version_with_ipa_cdtor_fix="8.3"
+				local _current_gcc_version="$(gcc-major-version).$(gcc-minor-version)"
+
+				if ver_test "${_current_gcc_version}" -lt "${_gcc_version_with_ipa_cdtor_fix}" ; then
+					# due to a GCC bug, GCC will produce AVX2 instructions
+					# even if the CPU doesn't support AVX2, https://gcc.gnu.org/ml/gcc-patches/2018-12/msg01142.html
+					einfo "Disable IPA cdtor due to bug in GCC and missing AVX2 support -- triggered by USE=lto"
+					append-ldflags -fdisable-ipa-cdtor
+				else
+					einfo "No GCC workaround required, GCC version is already patched!"
+				fi
+			else
+				einfo "No GCC workaround required, system supports AVX2"
+			fi
+
+			# Linking only works when using ld.gold when LTO is enabled
+			mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold
+		fi
+
+		if [[ -n "${show_old_compiler_warning}" ]] ; then
+			# Checking compiler's major version uses CC variable. Because we allow
+			# user to control used compiler via USE=clang flag, we cannot use
+			# initial value. So this is the earliest stage where we can do this check
+			# because pkg_pretend is not called in the main phase function sequence
+			# environment saving is not guaranteed so we don't know if we will have
+			# correct compiler until now.
+			ewarn ""
+			ewarn "USE=lto requires up-to-date compiler (>=gcc-8 or >=clang-7)."
+			ewarn "You are on your own -- expect build failures. Don't file bugs using that unsupported configuration!"
+			ewarn ""
+			sleep 5
+		fi
+
+		mozconfig_annotate '+lto' --enable-lto=thin
+
+		if use pgo ; then
+			mozconfig_annotate '+pgo' MOZ_PGO=1
+		fi
+	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 cpu_flags_arm_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
+
+	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
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_annotate '' --enable-rust-simd
+	fi
+
+	# use the gtk3 toolkit (the only one supported at this point)
+	# TODO: Will this result in automagic dependency on x11-libs/gtk+[wayland]?
+	if use wayland ; then
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3-wayland
+	else
+		mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	mozconfig_use_enable startup-notification
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-webp
+	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 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 and safebrowsing, https://bugzilla.mozilla.org/show_bug.cgi?id=1531176#c34
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	if use clang && ! use arm64; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		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
+
+	mkdir -p "${S}"/third_party/rust/libloading/.deps
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" MOZ_NOSPAM=1 \
+	./mach configure || die
+}
+
+src_compile() {
+	local _virtx=
+	if use pgo ; then
+		_virtx=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+		addpredict /etc/gconf
+	fi
+
+	GDK_BACKEND=x11 \
+		MOZ_MAKE_FLAGS="${MAKEOPTS} -O" \
+		SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
+		MOZ_NOSPAM=1 \
+		${_virtx} \
+		./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-3 \
+		"${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
+
+	# Disable built-in auto-update because we update firefox through package manager
+	insinto ${MOZILLA_FIVE_HOME}/distribution/
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# 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() {
+	# 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() {
+	xdg_desktop_database_update
+	xdg_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
+
+	local show_doh_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 70 ; then
+				# Tell user only once about our DoH default
+				show_doh_information=yes
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index cd9e26d33e99..e2dc85552fae 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_67.0.3575.2_amd64.deb 66944432 BLAKE2B 867c380fc34fb4ef82e3b9d3457908fb00b83da5785fc392d9a351903c04f08e6abc2e05b9d1f0fe71dae929a003e97c2687dc56a3fd9f7afd4b0653673463d9 SHA512 d76cb598928cc580ef296ef4164b0f2d0fdd97d7a24bdfdbd7e64a61b1619d4f5f9f8524be378ad1f3814b775823313cbf31267f9e9b32fe6734616d5d8f005a
+DIST opera-beta_67.0.3575.13_amd64.deb 67359632 BLAKE2B ca672fb921aab3f91d6592e712f1287379d4488ef6a0e39ead59a06de70facbfd29a2cb0e886c2ccd4d99568a15c693b4a118053017a2d173721885326a6299f SHA512 627a05f12cf67fee06497f5efc57ff89d8c79effc4447269d3cabedac496920c09a881415190ae569dca40450d8dee85dbb932a9cfb3d77e510947f0174cc24b
 DIST opera-beta_67.0.3575.8_amd64.deb 66951092 BLAKE2B 67cf566f7d9b211bd7ca00ae78e859c4bb9827eea73f2a2cd4adf6a646874d54920203643c20811f85f3f031c51fdc6529cb9cb603494b50ba711a351245e92a SHA512 018d3a5f71ddae813f33433f5d9aa604bf7f467d59a040b97f4085c9c49dec9954bedae28eb379b31d4b42dc5a7b9598fe21c4125951d6ec75ce850af5b61497
-EBUILD opera-beta-67.0.3575.2.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
+EBUILD opera-beta-67.0.3575.13.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 EBUILD opera-beta-67.0.3575.8.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-67.0.3575.2.ebuild b/www-client/opera-beta/opera-beta-67.0.3575.13.ebuild
index 99905f624666..99905f624666 100644
--- a/www-client/opera-beta/opera-beta-67.0.3575.2.ebuild
+++ b/www-client/opera-beta/opera-beta-67.0.3575.13.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index f163d95fde45..3d85954ea7a7 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,5 +1,3 @@
-DIST opera-stable_66.0.3515.44_amd64.deb 66057808 BLAKE2B 47ce7c02798b7d50558be1a7223696c62cf133a9446f1ccbe7f6fb382693be2755f2cb62a15eba49fe48140060c87937b91a7bbffd5a7ccca8a79f932bc6c945 SHA512 f4d1555f61a3ae461d12075375c4c98259f91b5c906b385cc521b43a27e8cd96895abb27d4a46cc1a679fd0295f07ba925804ffcf6718af28f5749f7091edf23
 DIST opera-stable_66.0.3515.72_amd64.deb 66037860 BLAKE2B cca65f4ff78a180b4bec4d60686d3d9b33daca9585898f9e086ab3a9861b7919de743397b3fe18a4131e3343ae4c24ee4bd820372204c0d6a5376abd06845569 SHA512 4dd9bb5b5329c1a7fc0298454e674b1932abc622a96bcf8d1099b6d84f1716dadbc0b526eaa298b40c856480d692828677b5d6c20d0403382c869f48bd702572
-EBUILD opera-66.0.3515.44.ebuild 2283 BLAKE2B 566b8d386fb3c0addefbc13a7cdf309bed3404e7c238f91c2a7b3b4b3ea15840bb10775a66e14cba1ffa4c3f694b774d0006753d08b7a229a06d141193a7c79d SHA512 2fa37d3c6f35d6bf7f39a71921ed3bd6054f3385e22a8e8d91a478a619969b419aa50a7230488f0a231515af60ff82da3b984bc0d0a6d7219e2a1372f8ef98d7
-EBUILD opera-66.0.3515.72.ebuild 2284 BLAKE2B e4969031bd5f118201defcee48b8072c5c187b8ab61bc0e88597bc65143ddc2583c581ea3479aa549fba3cac520768e1804347d849032b7cb8ca410f56821bd9 SHA512 3380150ab9ea58753e0a3b7a07c87abfbaedd75741cb4bef31d1ee1847cf3b3764126695429377c7551b96ffe2df05a42a744ece467d7344d0c898235a5621d1
+EBUILD opera-66.0.3515.72.ebuild 2283 BLAKE2B 566b8d386fb3c0addefbc13a7cdf309bed3404e7c238f91c2a7b3b4b3ea15840bb10775a66e14cba1ffa4c3f694b774d0006753d08b7a229a06d141193a7c79d SHA512 2fa37d3c6f35d6bf7f39a71921ed3bd6054f3385e22a8e8d91a478a619969b419aa50a7230488f0a231515af60ff82da3b984bc0d0a6d7219e2a1372f8ef98d7
 MISC metadata.xml 446 BLAKE2B dbd473cdfed1e48919a7d03f61999b3bbeb294a8ab917bb438b52dcffc304d6cd954f79817b0a73a396a9d153eb5917cfba1c1bd33e419918dc8b9a5dc449379 SHA512 42d93f4994820e8ca5f6d56a94709f8194046395f9aff8f445ce2f80777a43763c124a4ab514bab55751c6a651c9d0002c61c92d77bf9c841ef9e112abd26105
diff --git a/www-client/opera/opera-66.0.3515.44.ebuild b/www-client/opera/opera-66.0.3515.44.ebuild
deleted file mode 100644
index c6db5781646a..000000000000
--- a/www-client/opera/opera-66.0.3515.44.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	be bg bn ca cs da de el en-GB en-US 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 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}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	default
-
-	OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-	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() {
-	rm "${OPERA_HOME}"/${PN}_autoupdate || die
-	mv * "${D}" || die
-	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
-	fperms 4711 /"${OPERA_HOME}"/opera_sandbox
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/opera/opera-66.0.3515.72.ebuild b/www-client/opera/opera-66.0.3515.72.ebuild
index a1d448874c75..c6db5781646a 100644
--- a/www-client/opera/opera-66.0.3515.72.ebuild
+++ b/www-client/opera/opera-66.0.3515.72.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
 	"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
 "
 done
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/www-client/ripe-atlas-cousteau/Manifest b/www-client/ripe-atlas-cousteau/Manifest
index c43b939754c1..2edfe188e9f1 100644
--- a/www-client/ripe-atlas-cousteau/Manifest
+++ b/www-client/ripe-atlas-cousteau/Manifest
@@ -1,3 +1,3 @@
 DIST ripe.atlas.cousteau-1.2.tar.gz 47015 BLAKE2B 722ebc41a221f64784fbc2535c2727c0f2e7559e6460c6ee1453b17c739562c0b44047ccf24b2d4aa93d3911d7f9be6d43df4464524135d7efd1829b29689417 SHA512 06df80499aa3696450396b1dec66360b3996d56c98dbec52d9192c8e2442a63f3cc334a815a4615d5f9d87fc3f0facb26875f2ad3a5cdbd5047aaad506974c8e
-EBUILD ripe-atlas-cousteau-1.2.ebuild 982 BLAKE2B 3f3b67fc61e9a95beca1bfa58ce33854832dc1d448ab7f219b9a4e33cbeb27aca2d2fc9fe0dc12d39bb5eaa1a6e1b906075de4b474f4de21766c42b2e4106a3f SHA512 0ec9228622af5021d40bf908d82595ccd0a2ca551a2068fba196305ec849ad8ed2b7349e436890e99a0f585d0f1bf5025879881730d3d84cc7db953865ba31f0
+EBUILD ripe-atlas-cousteau-1.2.ebuild 972 BLAKE2B aa3424ffc1d091bb07474361a80f9c7a7fefe588119c51fbca702a0a6d583089817251706d58f8fddfeaec159b877cf79d3bdbb56da38e95a789be11d75aef3d SHA512 078422428f022cb5d28f8f8469077ea959cab79f405844d5a59978d861c571d304be2ade5a1430811f983d1018d1703258492413aab0d1afae13fa523b1da81c
 MISC metadata.xml 248 BLAKE2B 5e5244a307c5e42549d6b8c6695a3807edbc8c98b0b097804e9d522d830277e2afec1e773d273f87b2ecf135e19249588168d13ad9de4f5379081ab81a391d57 SHA512 619ebf760d3244f9438e998eaa002dcd66b8fe0cdde43c8c672969bc9b772995a5e727b526ec1e895793977095c6d1158c039dd8cc0c6b35a6f1595e24b9a9d3
diff --git a/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.2.ebuild b/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.2.ebuild
index a1155e580f58..ea71ceef9ae3 100644
--- a/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.2.ebuild
+++ b/www-client/ripe-atlas-cousteau/ripe-atlas-cousteau-1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index f7652a757cdb..c38957db790a 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -26,6 +26,6 @@ DIST seamonkey-2.49.9.1-sv-SE.xpi 940793 BLAKE2B ec901577f833e69f78d0fba13fe1ee1
 DIST seamonkey-2.49.9.1-zh-CN.xpi 946349 BLAKE2B ff8d5dfc671cf51e9af849e7781eb3ada2cda97cc542a8a28306a7c060043752be7614574c0c4882c54dec8a82972a46a7c8bc8085d94a9273264cd15dbfbc83 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28
 DIST seamonkey-2.49.9.1-zh-TW.xpi 1002365 BLAKE2B e66f68187c0373f96ba8f58f420c8a4c917015e6c38a54a6c80d9cdf4b31620ff3c104ffccc1f4e0f140673b15eefe1742a2b0f3208e00abb4a593322cb1edf9 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376
 DIST thunderbird-52.9.1.source.tar.xz 230475264 BLAKE2B ec2763d21bf88779867f4478dfc544b5afbe1062ce51f09c1ecc423c3289f0cd91ae79bc87d726ae77d885290843631f36800fff18d802cd4a998966e7793b74 SHA512 0de80a5036b1e8a5a8549c546b4693cb285ee4d10f546f4b4aceed9e1d6c64b9dbafce7bacaaf057112130036f7b41fb2e0fa3343412140e6ac926dd94c27d23
-EBUILD seamonkey-2.49.5-r1.ebuild 11562 BLAKE2B 20d68e86673e1e23cef3404680b7ea3bf8369a2851dec558c9f052c281ae9601df240310c85ca63885917e9a60225db1a37a97f0f1c98bd607f193b9ab9f8740 SHA512 ef8a1678faad49deced1c9e7f98ef9747cc7823e3c32db080e30a17d8e69dd7f923366c8e85ce9f9ec1ce7c8e5998180dccf300c2150b2b6ed1fe48d3613f33d
-EBUILD seamonkey-2.49.9.1_p0.ebuild 12921 BLAKE2B 172fa11f507ec31e2172240450a6a5d4c7f078867eff32a6b5ccd0d4fca5c81e41172f15a629dbbef8e79bb07915e417a320d26b5e90b790ee1aba5965d09bea SHA512 edfdac6dab7267ec04b391c6f900e6e813aaaea91fe5df01377058b114b40d781225fcff9986b79d5d4b5920f7b306e4154fdfd46343e4afd9e755c75a66d2f4
+EBUILD seamonkey-2.49.5-r1.ebuild 11558 BLAKE2B 9dba0413ff9ecddcc9c190d34987aa1119a76f804149eb0f79d2057cc8995510046d2a651db276663422a8159bad2b5e1cb3b5883854ff0b8d2e8113e1653429 SHA512 c37771b9629ef6256a74d7517daebc7ffb99d3ffe025b51fb20757dfec3885bbaf3afe98a24ae1c535feac31852203fed22367766314c9c4b655c03d3e71226b
+EBUILD seamonkey-2.49.9.1_p0.ebuild 12917 BLAKE2B 3ffd82d2236b24556aad6104f509a7f58ec03d9ef1c04abb5b23c5c50a69123561d0ef13b9506337d6ca7d701d604647a34b44a944955149d57b0cf41a8edda5 SHA512 e3cd65def2b41240983069b98ed42fb8973ee0b743511bd7c0695c124621b91efed4ffbf9dc45bc7f5b3940adeb45beb2264bb37171e881165f31f825677f493
 MISC metadata.xml 1824 BLAKE2B 877054e919c97e12d11882714747601b9f455dc73304be2656583fc2875ae68a2178b2afd4d4adbd25c1f13b938c24d6f7d07c4808d85c70c4753dda1dd2677c SHA512 b5a1ea2051d02dc8ccd79d36c7d7b169dbb4fa694d1319596386b93cc9c695cde8aeac15741ff668f6e6ec6e1b77e3140c260f81579a91ca4e581107b51749c6
diff --git a/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild b/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
index a12284003e96..643eef5a7612 100644
--- a/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild
@@ -251,7 +251,7 @@ src_configure() {
 	fi
 
 	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake V=1 -f client.mk configure
 }
 
@@ -295,7 +295,7 @@ src_install() {
 		done
 	fi
 
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake DESTDIR="${D}" install
 	MOZ_P="${P/_*}" mozlinguas_src_install
 	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
diff --git a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
index f6f9ab9ef831..6101043330bb 100644
--- a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
+++ b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
@@ -279,7 +279,7 @@ src_configure() {
 	fi
 
 	# workaround for funky/broken upstream configure...
-	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake V=1 -f client.mk configure
 }
 
@@ -323,7 +323,7 @@ src_install() {
 		done
 	fi
 
-	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \
 	emake DESTDIR="${D}" install
 	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
 
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index fc5486a238da..a5bf35ebb0ff 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,11 +1,11 @@
-DIST vivaldi-snapshot-2.11.1805.3_p1-amd64.deb 67518936 BLAKE2B 63cad6603717f14c93275095e9370ab35c3818a16bc911fc33bcf53f7a46bc7549ade8c86bfab1c14157dbaffb8242f60c5d80d7732d286ccec6a89a6b658ef4 SHA512 bfa939f794e691c65a5f1c9671e058e517063f0fba92ef2e2aee94b58badd3a50d6368afcf0c54d50068088e5fc9a2954903dea8ce75126700848d2b2920cb5d
-DIST vivaldi-snapshot-2.11.1805.3_p1-arm64.deb 60592608 BLAKE2B 159648be6f45d1980c273fc15958cf57a7cfa6b46d2353068dd2adf11cf7d5f3d7f45d27f8c0a6c0988067a7f0959c8039e5c3d20a881258e25719dc1d4c0ae7 SHA512 aec9a0170d0a875fee33891c9f5760573185b065a8700c6086d0168d22203ba4ab48c0040d86df9967ff3808ae0eda280030ecc478e0a61c6aa900629b4cfe1c
-DIST vivaldi-snapshot-2.11.1805.3_p1-armhf.deb 59942876 BLAKE2B e01aaa37f8327fecc27d1e626761502fcd13bf3479604fbec5ccfd2e77d0becc888b01c4232a3b3c2db40dd130bda3734ca15d291e9f762fd173db6aa65a2070 SHA512 44485b65ff509ff11a24c2a22c15b3df606c7df872dcf617440b4f0ee65a330273bad1196d7372f6a3038d7f15e759d1f818828125e244ac4676e64261a33b19
-DIST vivaldi-snapshot-2.11.1805.3_p1-i386.deb 66348980 BLAKE2B 01d8cd9f9b58732a12db30c650b72dd5233bdb6288e4794548ec2788d6ffd9b9fff9f4a9ff1b57c7b767c135b2ff8df2afcf92b2144ea77b56ad4fb86f3ca279 SHA512 c3817a0a4f81059618f09c7d1cf9c86a936bba3fad4446ed3582bef18836b95620113dc7f001c2c425001a59dc7b20f1e7d0289e1d6c8942cbd7aea204a3fdf6
+DIST vivaldi-snapshot-2.11.1811.23_p1-amd64.deb 67533176 BLAKE2B 43fb9b9c7ccd93fa3b24f7c845d77db332da7ffcff0747d0f9dcd1695e6746041be58decd18a5e06c736e2c09012367b9d86704f33ef597c3a64af7a9b92adc9 SHA512 6ca72ef630f093c46a97a903be83761552aaa8acf994636695de246988b4d017989105a8194cae14226707d0741f835df267c6ccb2296d9939f1323d3a7dc761
+DIST vivaldi-snapshot-2.11.1811.23_p1-arm64.deb 60580540 BLAKE2B 5dc4a7b353fa6955ff914eeba0a1df797a84390cf3a1abda4036b3b12ebf986e8816280c71b7ef7b06905cf1932e85f206db4108d85f878141b2519c227042c7 SHA512 f40e1cf5fa343d3fd5ce3e8a017bb9834faf42247bbce254140c8ff614f670db2a0a1adac70df420aa7436ba369611ab97f9c4c49c8b34f7857a80a4fbc86c68
+DIST vivaldi-snapshot-2.11.1811.23_p1-armhf.deb 59957240 BLAKE2B 77a09e2a6f706344d3b14600e2e636ff3166762ae60d2335b397a3dbca1a885b45a5b04d11731e8eb02e040dd824087fe3dbc3514d05d14db7b6de9d3a8727c7 SHA512 c9df01d78c98ec2f1ab5717880a68bb43cae10774ea50de9e7256c5d378d960ce52aa0dbdc784bb49b7585d9434b1eb17492663e6f1ae784990033f841b7cfb5
+DIST vivaldi-snapshot-2.11.1811.23_p1-i386.deb 66385108 BLAKE2B d841941e0a163ce046fdda7d60d5310b1a6456da90a71d21af1e6ddea33975d6d6b1e844008f2c9bed3596c4ad82a27e1124537e38b79094b3a1b893b79b7203 SHA512 aa644c47f1c3c6f558367c833ec275b80cc64f9030068047e77be6137efa4ec2eded7e642752a7fea9373d83ff53a1ce816d2cf6bbf3937007fd943383df79e3
 DIST vivaldi-snapshot-2.11.1811.3_p1-amd64.deb 67520356 BLAKE2B 7eaa25fbc8659d495191192cf69a49a9433c766751242aaefc2f016840ef039abc35b33b198e576f382b7872387b4532b08a989737a11d13f79ed3e54b81044a SHA512 a4c37ccf72136dd65694de29b93793faba70273c2f21f7f916e626d9a5764832a795be13e16e20e209503e7567273c96bc7323e8e7a207abfa245061082f549d
 DIST vivaldi-snapshot-2.11.1811.3_p1-arm64.deb 60586676 BLAKE2B 0b3dcb6c0e1655bd77a2303bf949d77165dafa5163a7ffd0dfae5b6705f45b355c851743850817be2b92dbb144d1f1e8d36aa987bb796c61667515577ee01c3f SHA512 6f37834e36dbc86701522b9a132285e26653f7e666b6e1a867e07da65eb5b195f8408c8d5cd5bf6481115604b92005ddb52e623a0f979f64b5e6244ee5f02b5a
 DIST vivaldi-snapshot-2.11.1811.3_p1-armhf.deb 59947216 BLAKE2B af41707f221828a85db7e86afe3ca6e791540c18e88cc50b0f30c57cf28c62927033f65106d2f17dc05d63cf9e11928e7c881ae9cbd2729b6f3ad37d0a3541b5 SHA512 eafe91598f3bf9fa88fff5bde127f9f72bb74f4c4d22db27ec9cb239b749c6dc2b17dce6f07652c977b9fea7c56bc2b8f97effab012891a16d8d82b1d9bb41d1
 DIST vivaldi-snapshot-2.11.1811.3_p1-i386.deb 66367316 BLAKE2B 5142018296fd5f4080fdd725c0f9bb0dcc649f87c6a44449c90110e3e92688930367c994de83d2f93959c77a6f813f0cfdb2df3702ee1601335306c3979e7b51 SHA512 307fa1cba3f3a1a45e2750a0794b62477727589241233c0fa97922f7ab660874614f5d1b49403f87417f112047e3aeb0127ff27c171b7ca973b837d7140552de
-EBUILD vivaldi-snapshot-2.11.1805.3_p1.ebuild 2582 BLAKE2B 08af7576562005179df0562a24968dbe74e2c1ae910d9f4e45496cd68b3bada012a7886acb5fd3b2c36350e66835652f94dd30515eb29ca9d7abd5e0e1ec3d6e SHA512 5029a0c39b4cce15c42e1d7ffd4af842db4e70de73029be0ad1f62381946288f4fa875e124f01da6f001550d080250a08b9f152a1a2cc5e320d6c191cbe58b3c
+EBUILD vivaldi-snapshot-2.11.1811.23_p1.ebuild 2582 BLAKE2B 08af7576562005179df0562a24968dbe74e2c1ae910d9f4e45496cd68b3bada012a7886acb5fd3b2c36350e66835652f94dd30515eb29ca9d7abd5e0e1ec3d6e SHA512 5029a0c39b4cce15c42e1d7ffd4af842db4e70de73029be0ad1f62381946288f4fa875e124f01da6f001550d080250a08b9f152a1a2cc5e320d6c191cbe58b3c
 EBUILD vivaldi-snapshot-2.11.1811.3_p1.ebuild 2582 BLAKE2B 08af7576562005179df0562a24968dbe74e2c1ae910d9f4e45496cd68b3bada012a7886acb5fd3b2c36350e66835652f94dd30515eb29ca9d7abd5e0e1ec3d6e SHA512 5029a0c39b4cce15c42e1d7ffd4af842db4e70de73029be0ad1f62381946288f4fa875e124f01da6f001550d080250a08b9f152a1a2cc5e320d6c191cbe58b3c
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.11.1805.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.11.1811.23_p1.ebuild
index 23aeb880ad5c..23aeb880ad5c 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-2.11.1805.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-2.11.1811.23_p1.ebuild
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 10dc5be4393e..6287790431ef 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 14f3df21e6bc..88006ae638c4 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,4 +1,4 @@
 AUX monitorix 794 BLAKE2B 59ff64344bf951cf38448acb260f8a4d30fd1ea0fbd810a8f79b3a1740cff2aeb7cb2647337ff101a5cf1ddfb3ffd44ee739d0f89bdef3175c02afb687616309 SHA512 02b1e9fef7991c226decca8fdb5a5ca3e3960e7530d60ed770ec207a4f199506edc3a20d0608de3bcfdc1c25b0027900efa5b3d1be1c89b8bb8680a79ecd4013
 DIST monitorix-3.11.0.tar.gz 318741 BLAKE2B af190e716acea9dfa56ebf3976e387abc19d0254fbebf6b6b18deff98b989266bff7e7c59e57832ad8b29dff8abb220e19da079c004ec185b63845cf70fb2727 SHA512 81832ef569416cc2e587beff8dbd485a6d361c0b5f11611522bde58c06d3156888e8c7b49cb3205adafbf737cd2d2b22e6041cd8b94e6d8c78cb5a4c3b1587de
-EBUILD monitorix-3.11.0.ebuild 2851 BLAKE2B c5d11e04e38246b5530fe036f55457f9e502eb9a39f62bd3794b793f753555dec3d35a198d3b92de7e94c3210a42b395dbbbaa71e7b8b1517332764fe890e311 SHA512 5351de6272020c237524c05822298aecd3dbb14da89e6f102080a6c9d88673fb87f2309218c246ddc2af92c74eaa214bc3f6a8b0487f5f5184d3e8b98a67ce94
+EBUILD monitorix-3.11.0.ebuild 2847 BLAKE2B bac7d8d2b265c979816af199e6552ac85303b0f1f2c6ceaa08035b29fb9cacd49556bcd07a21168f09a0763edc63c82f20f821080b54b27da78d7d8672a924a5 SHA512 b2cc35db95eb94a6ecaf093b1044473a9c7c2a1eaa873c6c4839f5950698cf3d0cf5446be5d61037a37fe8ba96a58a5ae3d0e7d75ad10c544d930e5713035a3e
 MISC metadata.xml 529 BLAKE2B 9b1a98822a897286b468e359ad25aa357feed9f58b5214e4337c860a736fedf4b90d7f412fd7af998aa4c9c11406690c53a52c0d750af165a21de1c775ecdaa0 SHA512 cff03dcb6ab552c01a86f9ae29197f61cf6f5193053714b865398464ec3177a8d64041b30f6563c95d19c3a5a2102ec92687b24b20ea648d66cefa05ba01cc10
diff --git a/www-misc/monitorix/monitorix-3.11.0.ebuild b/www-misc/monitorix/monitorix-3.11.0.ebuild
index 0b372b29d77f..a1331012cd39 100644
--- a/www-misc/monitorix/monitorix-3.11.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.11.0.ebuild
@@ -99,7 +99,7 @@ pkg_postinst() {
 	elog "  sys-power/nut       (Network UPS Tools statistics)"
 	elog
 	elog "If you wish to use your own web server:"
-	elog "  Web data can be found at: ${EROOT%/}/var/lib/${PN}/www/"
+	elog "  Web data can be found at: ${EROOT}/var/lib/${PN}/www/"
 	elog "  Also please check the correct user and group ownership"
-	elog "  of ${EROOT%/}/var/lib/${PN}/www/imgs/"
+	elog "  of ${EROOT}/var/lib/${PN}/www/imgs/"
 }
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e68052baab27..4434d8aac3da 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index b17db621db1a..5b67d9d6a62d 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -9,7 +9,8 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4 SHA512 bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
 DIST lighttpd-1.4.54.tar.xz 763248 BLAKE2B 0425dde326dc514a55790256ab7f3e6c704417fe2ac01c49d109d5f463fb41605140c0773dc3988bd27e1dbee316c5fc96231c9c8699ec40db3acf2c54ec077d SHA512 aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37
-EBUILD lighttpd-1.4.53.ebuild 6352 BLAKE2B 584affd7be01f2c1f595a8cc932fb4bee89d7add8412e653a17a7357b5ec0872ae2c7e57d20e1c6b8dda36c6111b91f74229d8dd920fe6ca897f341a47e3d140 SHA512 eec578b409fadefa008d3fa78768d4963874442b307b7b6422e6d8895eba3725ae41f5aeabb7fc701eaf9ecc6b02962913c8df7f8a93e9b3a1709a29129b85a5
-EBUILD lighttpd-1.4.54.ebuild 6353 BLAKE2B 35244ab51f6e93857f2611e77d262a5ed3c78e77c5f5fe8e63eae8ab7307fa55eead74a7dbaf66ee5ed35b4650dee09c52dfdd57c111d5ff5f41058a13a086bd SHA512 d0fde0f4d906f3c327501aef37e4e22e6522cce3009280c7bd18ecee1b4e7c5b0dc53f4ea24fd34afb11a1ef22d7ea7dc96f74c2bcdf1045659bea77147d37dc
-EBUILD lighttpd-9999.ebuild 5939 BLAKE2B d58f5b531433b32d8223735b4bc836cab048aa4a6c52c90060898c6f8578e6e85e7e17cfb9825ba1c6e593213d0c85ee8ed37e1b5390f71d8c6495ae6b6e74b8 SHA512 b3b4d58f4feb2486acaf0c9115997ca8012fcca4e3fd0a7abcc65e088beddef91a689a4d96f823b5b3c3ed85182b2e5f60b8dc2a925d1f757fb4feb744096053
+DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
+EBUILD lighttpd-1.4.53.ebuild 6307 BLAKE2B b9c6407dc67c59de97d4ea75326b0a6211b09637060eddbc8b57fc9fe4d3db49a4da27c015a482757b8b9aa43828d0974cf4613846dba568eae4f974242fc74c SHA512 e0e241ca1daa6e79ff6309b3646cc548779e79f9a3073eae073914b8b6310bb13bd1d9d0b2c8417044c127e8704bd11ee9625d8167de3fa6392c91524cb725a1
+EBUILD lighttpd-1.4.54.ebuild 6308 BLAKE2B 82c072ee05bbcb396bc412ef7d836c9aee457cd02733b6ed2ad9330d567c7cce045a5d14c8738a5f73cfaa2a7b562719e95f08ddd5291bcc58fad0ca9c6451e4 SHA512 41c4eaeb1cbbbd7b5e4ef1b99d81b5a08615eeb520944fc84ef237c1fbfd23ed297f883446d85567d1f805ada30dbe8812663ab5bac372607f9e519a8023b16e
+EBUILD lighttpd-1.4.55.ebuild 6308 BLAKE2B 82c072ee05bbcb396bc412ef7d836c9aee457cd02733b6ed2ad9330d567c7cce045a5d14c8738a5f73cfaa2a7b562719e95f08ddd5291bcc58fad0ca9c6451e4 SHA512 41c4eaeb1cbbbd7b5e4ef1b99d81b5a08615eeb520944fc84ef237c1fbfd23ed297f883446d85567d1f805ada30dbe8812663ab5bac372607f9e519a8023b16e
 MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/lighttpd-1.4.53.ebuild b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
index 2a4cc6bdf7c5..0097aa1b826d 100644
--- a/www-servers/lighttpd/lighttpd-1.4.53.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
@@ -46,7 +46,9 @@ COMMON_DEPEND="
 		sys-fs/e2fsprogs
 	)
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
+	zlib? ( >=sys-libs/zlib-1.1 )
+	acct-group/lighttpd
+	acct-user/lighttpd"
 
 DEPEND="${COMMON_DEPEND}
 	doc?  ( dev-python/docutils )
@@ -102,9 +104,6 @@ pkg_setup() {
 		ewarn "and mod_ssi."
 	fi
 
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
 	DOC_CONTENTS="IPv6 migration guide:\n
 		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
 }
diff --git a/www-servers/lighttpd/lighttpd-1.4.54.ebuild b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
index d296fa74c41b..b8d0d13b8efa 100644
--- a/www-servers/lighttpd/lighttpd-1.4.54.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 systemd user
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
 
 DESCRIPTION="Lightweight high-performance web server"
 HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
@@ -46,7 +46,9 @@ COMMON_DEPEND="
 		sys-fs/e2fsprogs
 	)
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? ( >=sys-libs/zlib-1.1 )"
+	zlib? ( >=sys-libs/zlib-1.1 )
+	acct-group/lighttpd
+	acct-user/lighttpd"
 
 DEPEND="${COMMON_DEPEND}
 	doc?  ( dev-python/docutils )
@@ -102,9 +104,6 @@ pkg_setup() {
 		ewarn "and mod_ssi."
 	fi
 
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
 	DOC_CONTENTS="IPv6 migration guide:\n
 		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
 }
diff --git a/www-servers/lighttpd/lighttpd-1.4.55.ebuild b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
new file mode 100644
index 000000000000..b8d0d13b8efa
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.55.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 systemd
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
+
+BDEPEND="dev-libs/libgamin
+	virtual/pkgconfig"
+
+COMMON_DEPEND="
+	bzip2?    ( app-arch/bzip2 )
+	dbi?	( dev-db/libdbi )
+	fam?    ( virtual/fam )
+	gdbm?   ( sys-libs/gdbm )
+	geoip?	( dev-libs/geoip )
+	ldap?   ( >=net-nds/openldap-2.1.26 )
+	libev?  ( >=dev-libs/libev-4.01 )
+	lua?    ( >=dev-lang/lua-5.1:= )
+	memcached? ( dev-libs/libmemcached )
+	mysql?  ( dev-db/mysql-connector-c:= )
+	pcre?   ( >=dev-libs/libpcre-3.1 )
+	php?      ( dev-lang/php:*[cgi] )
+	postgres? ( dev-db/postgresql:* )
+	rrdtool?  ( net-analyzer/rrdtool )
+	sasl?     ( dev-libs/cyrus-sasl )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sqlite?	( dev-db/sqlite:3 )
+	webdav? (
+		dev-libs/libxml2
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	acct-group/lighttpd
+	acct-user/lighttpd"
+
+DEPEND="${COMMON_DEPEND}
+	doc?  ( dev-python/docutils )
+	test? (
+		virtual/perl-Test-Harness
+		dev-libs/fcgi
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${D}/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
+
+	# enable stat() caching
+	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+	local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+	# text docs
+	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+	# non-essential modules
+	rm -f \
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
+
+	# allow users to keep some based on USE flags
+	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+	use webdav  || rm -f ${libdir}/mod_webdav.*
+	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
+	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+	use zlib    || rm -f ${libdir}/mod_compress.*
+}
+
+pkg_setup() {
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}"
+		ewarn "and mod_ssi."
+	fi
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_prepare() {
+	default
+	use memcached && append-ldflags -pthread
+	#dev-python/docutils installs rst2html.py not rst2html
+	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
+		die "sed doc/Makefile.am failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_enable mmap) \
+		$(use_with bzip2) \
+		$(use_with dbi) \
+		$(use_with fam) \
+		$(use_with gdbm) \
+		$(use_with geoip ) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with libev) \
+		$(use_with lua) \
+		$(use_with memcached) \
+		$(use_with mysql) \
+		$(use_with pcre) \
+		$(use_with postgres pgsql) \
+		$(use_with sasl) \
+		$(use_with ssl openssl) \
+		$(use_with sqlite) \
+		$(use_with webdav webdav-props) \
+		$(use_with webdav webdav-locks) \
+		$(use_with xattr attr) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc || die
+		emake html
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		default_src_test
+	else
+		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+	use fam && has_version app-admin/fam && \
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
+
+	# configs
+	insinto /etc/lighttpd
+	doins "${FILESDIR}"/conf/lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# update lighttpd.conf directives based on conditionals
+	update_config
+
+	# docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+	use ipv6 && readme.gentoo_create_doc
+
+	use doc && dodoc -r doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
+
+	use minimal && remove_non_essential
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+}
+
+pkg_postinst () {
+	use ipv6 && readme.gentoo_print_elog
+
+	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+
+	if [[ -f ${ROOT}/etc/lighttpd.conf ]] ; then
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in /etc/lighttpd.  Please migrate your"
+		elog "existing configuration."
+	fi
+}
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
deleted file mode 100644
index 50b9cd4b7091..000000000000
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils readme.gentoo-r1 user systemd git-r3
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="https://www.lighttpd.net
-		  https://github.com/lighttpd"
-EGIT_REPO_URI="https://git.lighttpd.net/lighttpd1.4.git git+ssh://git@lighttpd.net/lighttpd/lighttpd1.4.git git://git.lighttpd.net/lighttpd/lighttpd1.4.git"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="kerberos? ( ssl !libressl )"
-
-CDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1:= )
-	memcached? ( dev-libs/libmemcached )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php:*[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? (	>=sys-libs/zlib-1.1 )"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-apache )
-"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-	fi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-
-	DOC_CONTENTS="IPv6 migration guide:\n
-		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-}
-
-src_prepare() {
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-	default
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_enable mmap) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with kerberos kerberos5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcached memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc || die
-		emake html
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	default
-
-	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
-	use fam && has_version app-admin/fam && \
-		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
-	use ipv6 && readme.gentoo_create_doc
-
-	use doc && dodoc -r doc
-
-	docinto txt
-	dodoc doc/outdated/*.txt
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
-
-	use minimal && remove_non_essential
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-}
-
-pkg_postinst () {
-	use ipv6 && readme.gentoo_print_elog
-
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in /etc/lighttpd.  Please migrate your"
-		elog "existing configuration."
-	fi
-}
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index e18323660704..de641ab08164 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -4,9 +4,11 @@ AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0
 DIST nginx-unit-1.12.0.tar.gz 681661 BLAKE2B 1e497172a37fdcd33d0ced5b97675bff42f4cadab2f9363316e667c90c8b4dc4b43f4b8d5cff9f547daa7e92d532550434907515134a5c958586f1822beea749 SHA512 a55a084ed6e1cd3f784bd81571772ca29ca9a0d19089c9bb74c88258d2e1ef872978219c47b6dc2610711ae1aa95ef68ddb77f45747a2eacdd9d92c6f8fee28b
 DIST nginx-unit-1.13.0.tar.gz 693159 BLAKE2B fd2e803188e66c16d5956f26e693c81273b1f3f69c9b68209f15bca6abd0e06b9fb9e03eb32ab640b8f601260b439abee1c4aa9cd03ed92fd26ab55893a6a6ab SHA512 cf33295604040963545b04f72f1a894431d4ee22a2c7b9560f18a694f110ee3bf243c90f65cfa4760a0009a5a7b132b75e1bb51439b19255e15148e8f4e9b9a7
 DIST nginx-unit-1.14.0.tar.gz 708603 BLAKE2B 482ab76a1eaef2943c0000c6dd2adf37aca285304b306e5b05d67e9cca30665269d11c1a585bd1a638d6811b8ee6370ef3cf682bebaf7165585cdaea51f3a5c8 SHA512 0cfe5364d427ff09d08c3b1b134827665f8bf70b8871f3c4506680e4c2d61249a53581122c42276b590f5eb077c398ae6a6c2fa46f24c680844b7d365f2ca66b
+DIST nginx-unit-1.15.0.tar.gz 712284 BLAKE2B 8db45644a22a4043de660ed0dcb94957e6e9f26ee1735a0a053128b0995cfb670d9c52d7d64ffa2292818cc7aed79071fdd753186f010e1bd0fae876f886adff SHA512 3be17ba5290d323283e962a3a5b9c244c3c45302848b62fdad2fd92129e330c8783b4f76273dedc7b010ed71bd6a4bf1cc4085a3425288b1e28dc532e1a1bf5a
 DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-EBUILD nginx-unit-1.12.0-r3.ebuild 1973 BLAKE2B a3ac6f3aef30bd5a98b699311ed18b6325293f03bb30de27383db38723067ceae761ac05f2aedc324b5de4abf168f04d4b7444389706464063c4a473116d2d9b SHA512 be3f40d89854b316d43bd02e5fde82b69208c4dc158500a9a17e93fd157d436efaa57acdba3927104b483f13072d26727a85200a449038587ffc441ed23a2aec
-EBUILD nginx-unit-1.13.0.ebuild 1990 BLAKE2B f368b63276011c4e8568b79a0a2aa80dacf9f3f8f9a26f7c5a9ad919d9d3d5bfd93cbb15ffee35d1a05810133b61012d72fdd03ca3a1df72cc147a07876278ff SHA512 6225d705c2ff0da9cc98794f6657b30ed7bdc3baeb2d1078253f178745fdca572fbfc0cb4f1c4d1b43461e4f8a42e94e87b5c5729788bf6fb8a322cab901ef62
-EBUILD nginx-unit-1.14.0.ebuild 1992 BLAKE2B 177f5ad5f9c84274e1b65066b122dee3a66dbef7ff710f2103d10b8281d5afaa9ac4cca199f5b662c67ef534b1709080db1b890a50fe6ee278ac3f8ef30dd87c SHA512 5c4e2d7d76f2dc31d4a722c4b2ef2e55f70aabb297425b71832cc4fa0368ea881ca4854ef73ae4004733c5b4f9bb955e138def95726f576dbdb502440cec12e4
-EBUILD nginx-unit-1.8.0.ebuild 1700 BLAKE2B ec23607b482f1dcc5fa7dbba7364fc4cab62fe111f4afd1ba8d8600408d30020647174af79402c66ca1d0b56890c98980eeb12473b6e03660ed484362a1d3823 SHA512 5b1dcf2fec7071d9a99f0772748a31330612ad83ab5f2adba32c8d76b7aae0cac6d0f384d7d265ea902420092d6a3756679d58220a087f08fc58c2b96c9982a5
-MISC metadata.xml 998 BLAKE2B 89d0469b5b21967d1526d121fea36c3312a43e0a4c703aea36f451d4ef8cb4926435aca6a8af2d1ba9964498166da7551bcb6a87bb86a24896f08bf1d2016fc4 SHA512 c9e76bb48c5e1297354c25c7bf01cc80a3d0e2d21f130e24df5647987e9ac6747a9f02851070eea3fa948a7bfbb030b12f869f604ab3c63d82f481ee6c7d3ef3
+EBUILD nginx-unit-1.12.0-r3.ebuild 1963 BLAKE2B afda4ef0d65e3ec12fd77350be7b2384dd39bc575310bad5632fe65e340bf424655737755b2e346cb38a7070a48276052050c493def70a3e8e46375bd1e04c94 SHA512 524682cf26343e769b478873fff40db5f38808a9679684f5484f306b6282840feca54fcfc1fd55c79c753626f3a710667e014850ba24e56358b53c9d7ee0d9d0
+EBUILD nginx-unit-1.13.0.ebuild 1980 BLAKE2B d66c20e69d49ae7b58cd8106d59cb1e84763ee99fcb9de4b7b10449d96c857f3117576b93bcaa262516d1134f6611bb1c11c08f2a6a0d103206fa1079f01158e SHA512 59f9c42a423c925089301b0176a3c1f4554c9e7a61b3beba2689d24d7945923a69dfefb95c97467e308681853eb227859822e22db66922c029451b8eb2f1ef2a
+EBUILD nginx-unit-1.14.0.ebuild 1982 BLAKE2B 1673391165bd459f87864810aa9688c5727c00f7817a4cd46d0f3027e0d8ed9e96db733bdf42f8995dd006a1388af40d9d48a351ec5ff786f4c01b4dce495d82 SHA512 3e1af60d9abe2ad885706cb5cc9a6eaf4912bfb6d2879ccb06adb3358d6bef03996d9d298e99a62bdaf07e390f9c2d3e41b4fe3042edd09bc53d328d548b4da0
+EBUILD nginx-unit-1.15.0.ebuild 1938 BLAKE2B 8f2aa722511d06f54afd5a6d8b2b2d823a6fcf6893907440b981685daf10189b220ae6eca9bde955ab2d014c74ac106c5a8841574bcd6be0235e5b0f061eecf3 SHA512 889e7e38e483dd657bfcb6babd1d6d90542f4b31b799ee93bcf0727f11d2093535a7f699495f56b532f6accb2e0deda1c3c28e514f3cd4338da81f17cd307d66
+EBUILD nginx-unit-1.8.0.ebuild 1690 BLAKE2B 620a1ffa238fc609f2436080140d49e8d4d0387d5a82a28aa683a0c8a29482e786ceb7d4343b35da9f4fb5a0caccabdd4a3baeba34d8d95a32a88be01e269aa7 SHA512 64279e44a4980e33806cabe186c41048631d34c57afbb4ff256a0280800b51197cb758f8b12dc0a856b829b9fdd27565843317fbc4c7f598a805923f12e353fb
+MISC metadata.xml 1047 BLAKE2B 04429a2c4f083e98a753a293b77bec95c6a9eada3b14d8d249e0f0a71788e31f36125f637e5afeb204727f2dabae1cfc359524e7019a71cca7c7c5d5805d61d0 SHA512 1e8b885289895816758f9711145b4d6e69b54f27394434700794d60fa613fa771246909b44987c9e884f11ab1c5b1e1e82053ec733678c1712401cc51e291879
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index ae56567e450a..c6f29a250703 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="php7-1">Support for PHP 7.1</flag>
 		<flag name="php7-2">Support for PHP 7.2</flag>
 		<flag name="php7-3">Support for PHP 7.3</flag>
+		<flag name="php7-4">Support for PHP 7.4</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nginx/unit</remote-id>
diff --git a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
index fe54f3d5da05..ab4379548ef8 100644
--- a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
index 7c0a7235ecef..7f3d1031a1e3 100644
--- a/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
index 88b0d284968d..a1506b1539e9 100644
--- a/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7,8})
+PYTHON_COMPAT=(python3_{6,7,8})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
new file mode 100644
index 000000000000..28295fbc991c
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6,7,8})
+
+inherit flag-o-matic python-single-r1
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-2 php7-3 php7-4"
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-2? ( dev-lang/php:7.2[embed] )
+	php7-3? ( dev-lang/php:7.3[embed] )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby:* )
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+	)
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
index 6a544717ad6b..85232da8eb28 100644
--- a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit python-single-r1
 
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index cf2e5fd75113..f5af0d7c224b 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -39,7 +39,7 @@ DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b
 DIST njs-0.3.5.tar.gz 339177 BLAKE2B 6327be0b7c8077870408722376782bca579a6cfdf1fe2a4950fc0d289311ad21f671bc2b47d06f70d95d4f68d99e8c70fd4598dcc167b79c57704d99a098d284 SHA512 236e0284f251856f74eb51d8251bb5be725d2ca90056f2feef7677eb636a4e97e203f3bba81fb6b677158d615dc2d6ffcb0dc1059fb678ab12b7d14cc4ea7241
 DIST njs-0.3.7.tar.gz 360227 BLAKE2B b23e5105e3b9a0575e4da6a6e344983c2fed2081cdf0be9209fc86cd51c6e962ec5d855945d2c6972153de048dfead866686b2248b28660b41219a8e05fa939a SHA512 1975c38fab59a587045e1c6bebd527a4432c4e6bec5a62cb2e1bc5fef19275deffdb6c6558caa3f0dcc58716b702adc0eb89b0171acf5f70f275c593b16f4bfb
 DIST njs-0.3.8.tar.gz 398172 BLAKE2B 2bc76a1267c21bd691dd05ba5416e9d443d9a1d59adca07d6e370bf5b8c9a1420dc4fae2831620b26b6ea2ed16fb00c2058f569c1d60179dce83ff7cf44067c2 SHA512 7a68f5205357c64d5b4e13d72ab03b81ce5675d6f5d5643960c8e1273001828f3c1c9caab7e6b7616168f73d45c1cebb802a75ed31c22f8ca12e377ec5a4d5a5
-EBUILD nginx-1.16.1-r1.ebuild 40532 BLAKE2B e220ab8234bbbaa59f805a2f2a838627e9feae6b78d5474b9f0f4fb45287894cb4c2c04288f87d8d1a917ac0ed603e27878fd82b9a3bbc5df9b04e27e368aa03 SHA512 8adfe6a783036726afc73d328b1db4f863ff02dfd3f2970a6cb6e7595ede97b08497454382471a89210ae5af943b9ec350283d1b3f2fcf8308feaeefa0eb1fc0
-EBUILD nginx-1.17.7.ebuild 40534 BLAKE2B b9639bed18f45b390ca3733defd0cbd95a7abf8d0713cb4cfb650fe2b38e2f8d1f3334c583cc36f42bc3b1a6401cc5e4873da27aca409f7554b78517eb6388a1 SHA512 abbb97e46654615ce5e48c256262dbc6e4600a77684bacc5ffe98efe9db18de96c0c2d6215522b36b92c092873b2fc929c8f6c72f337c5dd0b2c890184932d95
-EBUILD nginx-1.17.8.ebuild 40534 BLAKE2B 81317002198726f37d92d8a2864988d200d31bad5ff11b0eb49dcbd37c0f88b38d8e5d5c4fb3d5a4bf07bc85fcb301977d7b1ba4d2ab254173b9000c96ebea91 SHA512 da187591571fca1a565a0b8dcfaa4a056ba88c27b7be131660a73484c679ff34df6e36401bec47bf620ef060c3f74c8786c8be23e426b1118ed83146dd512cb9
+EBUILD nginx-1.16.1-r1.ebuild 40512 BLAKE2B bae783454c045e184733ea1b86cd966049a83a70b97d7dd82cc3d6338703ec6f0224efa83e6f306e357c1240c775b0f7bec893776a18695ad236788da0c4ee9b SHA512 93db7e72940f13fe9453a9f6d7a2caa0ae7107b4d81a28c7461e0bc2ae89b683e784b0dbec1f08770764d3d0aff91f2d83f269bc7f5a52ac589fd1ebac950a77
+EBUILD nginx-1.17.7.ebuild 40514 BLAKE2B eb51d676352152ab02a7e8e10ee482219488f60bc9c977b79cf23dd8e080a40fd603e44da9bee5f0d673fe1a02b3cb32c3ad83e657abc39ab59362a61b36e612 SHA512 78949b4317c41b9084296181123ad088634908dab157214ffa8ee5b6d6b3f3ed2bdc896dc124b2c1db3507163b21a7000582aaa87bd70a0a62086f4507552917
+EBUILD nginx-1.17.8.ebuild 40514 BLAKE2B 52817e558f2afc30bfd5bb29b751d63f17c52ed725da2b39ada17d524e9f0a09ff3a439c3ee036b450ff76c170ff94c7cfb2941aa8d0ce18e1853a8a4d3b6870 SHA512 96fcf83c290015b16c53f736cdbb9ea38193ab388c9cae9d6780fbc48a6e3f6f51ca69a4c80f716598b700e1b6595741814b6bbbd8e188ba3e85b616b54b8350
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/nginx-1.16.1-r1.ebuild b/www-servers/nginx/nginx-1.16.1-r1.ebuild
index fcb191046b1b..9c62c90db19c 100644
--- a/www-servers/nginx/nginx-1.16.1-r1.ebuild
+++ b/www-servers/nginx/nginx-1.16.1-r1.ebuild
@@ -996,15 +996,15 @@ pkg_postinst() {
 			ewarn "following directories to mitigate a security bug"
 			ewarn "(CVE-2013-0337, bug #458726):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
 			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
 				_has_to_show_permission_warning=1
 		fi
 
@@ -1013,15 +1013,15 @@ pkg_postinst() {
 			ewarn "The permissions on the following directory have been reset in"
 			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX}/var/log/nginx"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "Also ensure that no other log directory used by any of your"
 			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
 			ewarn "used by nginx can be abused to escalate privileges!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
 		fi
 
 		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
@@ -1046,7 +1046,7 @@ pkg_postinst() {
 	# unmerged a affected installation on purpose in the past leaving
 	# /var/log/nginx on their system due to keepdir/non-empty folder
 	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
 	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
 	if [ $? -eq 0 ] ; then
 		# Cleanup -- no reason to die here!
@@ -1059,7 +1059,7 @@ pkg_postinst() {
 		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
 		ewarn "(bug #605008) because nginx user is able to create files in"
 		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn "  ${EPREFIX}/var/log/nginx"
 		ewarn ""
 		ewarn "Also ensure that no other log directory used by any of your"
 		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
diff --git a/www-servers/nginx/nginx-1.17.7.ebuild b/www-servers/nginx/nginx-1.17.7.ebuild
index 9b7d6b814dba..266794ff8ded 100644
--- a/www-servers/nginx/nginx-1.17.7.ebuild
+++ b/www-servers/nginx/nginx-1.17.7.ebuild
@@ -996,15 +996,15 @@ pkg_postinst() {
 			ewarn "following directories to mitigate a security bug"
 			ewarn "(CVE-2013-0337, bug #458726):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
 			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
 				_has_to_show_permission_warning=1
 		fi
 
@@ -1013,15 +1013,15 @@ pkg_postinst() {
 			ewarn "The permissions on the following directory have been reset in"
 			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX}/var/log/nginx"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "Also ensure that no other log directory used by any of your"
 			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
 			ewarn "used by nginx can be abused to escalate privileges!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
 		fi
 
 		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
@@ -1046,7 +1046,7 @@ pkg_postinst() {
 	# unmerged a affected installation on purpose in the past leaving
 	# /var/log/nginx on their system due to keepdir/non-empty folder
 	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
 	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
 	if [ $? -eq 0 ] ; then
 		# Cleanup -- no reason to die here!
@@ -1059,7 +1059,7 @@ pkg_postinst() {
 		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
 		ewarn "(bug #605008) because nginx user is able to create files in"
 		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn "  ${EPREFIX}/var/log/nginx"
 		ewarn ""
 		ewarn "Also ensure that no other log directory used by any of your"
 		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
diff --git a/www-servers/nginx/nginx-1.17.8.ebuild b/www-servers/nginx/nginx-1.17.8.ebuild
index fe0559cad19b..e950633e242e 100644
--- a/www-servers/nginx/nginx-1.17.8.ebuild
+++ b/www-servers/nginx/nginx-1.17.8.ebuild
@@ -996,15 +996,15 @@ pkg_postinst() {
 			ewarn "following directories to mitigate a security bug"
 			ewarn "(CVE-2013-0337, bug #458726):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
-			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
 			chmod o-rwx \
-				"${EPREFIX%/}"/var/log/nginx \
-				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
 				_has_to_show_permission_warning=1
 		fi
 
@@ -1013,15 +1013,15 @@ pkg_postinst() {
 			ewarn "The permissions on the following directory have been reset in"
 			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
 			ewarn ""
-			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX}/var/log/nginx"
 			ewarn ""
 			ewarn "Check if this is correct for your setup before restarting nginx!"
 			ewarn "Also ensure that no other log directory used by any of your"
 			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
 			ewarn "used by nginx can be abused to escalate privileges!"
 			ewarn "This is a one-time change and will not happen on subsequent updates."
-			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
-			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
 		fi
 
 		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
@@ -1046,7 +1046,7 @@ pkg_postinst() {
 	# unmerged a affected installation on purpose in the past leaving
 	# /var/log/nginx on their system due to keepdir/non-empty folder
 	# and are now installing the package again.
-	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
 	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
 	if [ $? -eq 0 ] ; then
 		# Cleanup -- no reason to die here!
@@ -1059,7 +1059,7 @@ pkg_postinst() {
 		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
 		ewarn "(bug #605008) because nginx user is able to create files in"
 		ewarn ""
-		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn "  ${EPREFIX}/var/log/nginx"
 		ewarn ""
 		ewarn "Also ensure that no other log directory used by any of your"
 		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f9858fe38c06..359c53cbfc92 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,19 +1,19 @@
 AUX tomcat-7.0.94-build.xml.patch 5966 BLAKE2B 01e253b0597e7353eaa38b5af29f4f6db4161fbe91aa1a46e2b8412f37cb66a10c06a14291e1c49ea108f7fbbff538e1c605829de8ee20d85a57d9c6122e4436 SHA512 66e001d705a7081461a3ddb9477e857b7fb87676b1ebc3eaa4bbf7f6a1e8f88f7eae4fc49a8a5b7a7baebc2258acc2bd0fe11d3683716021430e4a9dcd367b43
+AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
 AUX tomcat-8.5.47-build.xml.patch 10363 BLAKE2B 8f851b5eaa4ffb3073ee526122ef278f8e975e263b439140748ba774152a72712b6bc78d6568d097befac4ba56bc6a1721f14dd0a85d288e88621f49819e1a97 SHA512 236df8ce63e7e48293584868c140d4ba5160172cc19bd90eeacd6f14e08663b7c750f95fb24ab1eddf7c7a2a80e2f05e5470261159f3c95d3b22bd790b2f6b89
 AUX tomcat-9.0.27-build.xml.patch 10936 BLAKE2B a75c4635744b1815d5f4df29ac6bbb2afebf752c7b43cda2cd69c2cbe66100b10e04fe8a4306e2c166a6b2159091a7c7a4b88d299ea7d408e6af04c8b552ea8f SHA512 e1a68955dc6a89e1751cb429d44a19501644425b1a7553c0021255016bf69c58b64059267dab91457e78573e9dce01c3f3abe0f776d69bbf35d1c36c0535e1ce
-AUX tomcat-9.0.4-build.xml.patch 10399 BLAKE2B 3ec7f4d315b51056884b44abbd03093e2bf3675acfb572c556a62a8a32de3209dae82ee3f3b1c65178b2a62b42f5d4c3fba2e765aa27aa7147a9d8478d09f0f0 SHA512 60729e4f085951aa1133b0d6fdc6386bac9fd4bcd421814eb87c8a45a62819fab1ea2347dfffd12150e93c54fda2ba98bf1df4bc39a622de5ac9ea0c2e81a710
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
+DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0
 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
-DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef
 DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30
 EBUILD tomcat-7.0.96.ebuild 4197 BLAKE2B e20677c88681fb4c79dbeec633981176b7b309e67bfd8361546b531ee627d74aa3e5f6c5ac4da5593603b6fff3b00e7b63471e9b2c6cebae84f6437ce34039a5 SHA512 a0b7045e9edea9661ca17e5d3d8151152b817d605c218158365cedf1528a9a167d487dcd304ef9417bd35c73f1e73a058f8fb590e4009c24f45e3d062aaa154c
+EBUILD tomcat-7.0.99.ebuild 4190 BLAKE2B b749f120ab3e162ee61b06f717070603bec4c7961731f0a196bb754980c6f8f21dfe954780ddcc9550083228e3695abf2fd64da635c42852ab5a553973478a3b SHA512 840917afe93cf802a6977118d711ef19a6b553c0c6023540d9400b7f7eb41488b14ae9219e8ad40b0ee6d6c8b4419a2e0908e12ecc7ebfda495b010f19f62ef4
 EBUILD tomcat-8.5.47.ebuild 4559 BLAKE2B 2b6ac83085c87208bfc013e3ec68a6412b2bbd9208aab1732096ef8079500497a2a53e6c2a2a1f235f7d7f29a87aa52ae105b34994fc46bee73127e22b12e2df SHA512 7bb79bd8f186a0e782c3b9ff9ed056df0c1e8e458d6886079654878722f8584409a069b7f39cd712f1e73c98a0f21dc733a49c93ea96dd12b8e92617722183e0
 EBUILD tomcat-9.0.27.ebuild 5470 BLAKE2B a001f155a2214e363aee2e8fefcb0e73d0881e52ef8da29c53480e464609a48a9526bc886ca8257e7a761c4e4c0b86b9ecd1c0bd84d6e900aa7e388410843326 SHA512 6d4b46bf13cc1abe2d8b5544ff6eb5419d2d716fa47b60879fe244ad04264cd7029272fe24085472e9c181af6e4346ce59f180636d06a941a1a9e0d5566d2518
-EBUILD tomcat-9.0.7.ebuild 4518 BLAKE2B af856b921778713ca7ffd9d35dd5916ca1bcbdd438945d91bd9ec26ac4bf36b8e33176c05523df12b76c2ebeb5055ff296be8b1ee2e03b38e21b468ada3f112b SHA512 fe3933a53df4395dee7884910b6d3d293b351e9ed6e0015f850ecb008afa49778c5e7b30d694ec55c41f889bd155e831a940492c35e16be03177a697b17a6844
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
new file mode 100644
index 000000000000..29cf6c2e403c
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch
@@ -0,0 +1,163 @@
+diff --git a/build.xml b/build.xml
+index dbad7cb..101bc57 100644
+--- a/build.xml
++++ b/build.xml
+@@ -715,12 +715,14 @@
+       </fileset>
+     </copy>
+     <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
++<!--
+     <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1">
+       <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+         <include name="*" />
+         <exclude name="jspxml*" />
+       </fileset>
+     </copy>
++-->
+ 
+     <!-- Convert the message files from UTF-8 to ASCII. This can be removed
+     after upgrading to Java 9+ as the minimum JRE and specifying the encoding
+@@ -776,26 +778,32 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       notice="${tomcat.manifests}/jsp-api.jar.notice"
+       license="${tomcat.manifests}/jsp-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.2 EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- Bootstrap JAR File -->
+     <jarIt jarfile="${bootstrap.jar}"
+@@ -854,9 +862,9 @@
+       filesId="files.jasper-el" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 1-->
+-    <jarIt jarfile="${tomcat-dbcp.jar}"
++<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+-      filesId="files.tomcat-dbcp" />
++      filesId="files.tomcat-dbcp" /> -->
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
+@@ -1087,9 +1095,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1149,7 +1157,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1839,7 +1847,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -2034,11 +2042,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2070,6 +2079,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -2137,6 +2147,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2181,9 +2192,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+       <link href="../annotationapi"/>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="https://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="https://docs.oracle.com/javaee/6/api/"/>
+@@ -2889,7 +2902,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download components necessary to compile" >
++          description="Download components necessary to compile" unless="noget" >
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2925,7 +2938,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2989,7 +3002,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
deleted file mode 100644
index feb5f126a37e..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch
+++ /dev/null
@@ -1,256 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -719,24 +719,30 @@
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
-     <!-- Servlet 4.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
-+-->
- 
-     <!-- JSP 2.3 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
- 
-     <!-- EL 3.0 Implementation JAR File -->
-+<!--
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
- 
-     <!-- WebSocket 1.1 API JAR File -->
-     <jarIt jarfile="${websocket-api.jar}"
-@@ -1012,9 +1018,9 @@
- 
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -1074,7 +1080,7 @@
-         <exclude name="${jdt.jar.filename}"/>
-       </fileset>
-     </delete>
--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
-@@ -1108,7 +1114,7 @@
-     </javac>
-   </target>
- 
--  <target name="build-tomcat-jdbc" depends="package">
-+  <target name="build-tomcat-jdbc" depends="package" unless="noget">
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1123,7 +1129,7 @@
-     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
-   </target>
- 
--  <target name="build-tomcat-jdbc-src">
-+  <target name="build-tomcat-jdbc-src" unless="noget">
-     <!-- build the jdbc-pool source jar-->
-     <echo message="Building Tomcat JDBC pool src JAR"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
-@@ -1227,9 +1233,11 @@
- 
-     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
-     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
-+-->
-     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
- 
-     <!-- Note the meta-inf below will work as long as there is only one JAR
-@@ -1612,7 +1620,7 @@
- 
-   <target name="extras-webservices-prepare"
-           depends="extras-prepare"
--          description="Prepare to build web services extras package">
-+          description="Prepare to build web services extras package" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
-@@ -1752,11 +1760,12 @@
-     </copy>
- 
-     <!-- Source bundles for native components -->
-+<!--
-     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
--
-+-->
-     <!-- platform README files -->
-     <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- 
-   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
-     description="Create the Tomcat javadoc" >
-+<!--
-     <javadoc packagenames="javax.servlet.*"
-       excludepackagenames="javax.servlet.jsp.*"
-       sourcepath="${tomcat.dist}/src/java"
-@@ -1830,6 +1840,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path location="${ant.core.lib}"/>
-       </classpath>
-     </javadoc>
-+-->
-     <javadoc packagenames="javax.websocket.*"
-       sourcepath="${tomcat.dist}/src/java"
-       destdir="${tomcat.dist}/webapps/docs/websocketapi"
-@@ -1870,9 +1881,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-         <path refid="tomcat.webservices.classpath"/>
-         <path location="${ant.core.lib}"/>
-       </classpath>
-+<!--
-       <link href="../servletapi"/>
-       <link href="../jspapi"/>
-       <link href="../elapi"/>
-+-->
-       <link href="../websocketapi"/>
-       <link href="http://docs.oracle.com/javase/8/docs/api/"/>
-       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
-@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-compile"
--          description="Download (and build) components necessary to compile" >
-+          description="Download (and build) components necessary to compile" unless="noget">
- 
-     <!-- Download Commons Daemon -->
-     <antcall target="downloadgz-2">
-@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-test-compile"
--          description="Download additional components for the tests" >
-+          description="Download additional components for the tests" unless="noget">
- 
-     <antcall target="downloadfile">
-       <param name="sourcefile" value="${junit.loc}"/>
-@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" />
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" unless="noget">
- 
-     <antcall target="downloadfile-2">
-       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" />
- 
-   <!-- =============== Utility Targets to support downloads ================ -->
- 
--  <target name="setproxy" if="${proxy.use}">
-+  <target name="setproxy" if="${proxy.use}" unless="noget">
-     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-   </target>
- 
--  <target name="testexist">
-+  <target name="testexist" unless="noget">
-     <echo message="Testing  for ${destfile}"/>
-     <available file="${destfile}" property="exist"/>
-   </target>
- 
--  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadgz-2" unless="exist" depends="testexist">
-+  <target name="downloadgz-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}.tar.gz"/>
-   </target>
- 
--  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
-     <!-- Download and extract the package -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2787,7 +2800,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadzip-2" unless="exist" depends="testexist">
-+  <target name="downloadzip-2" unless="noget" depends="testexist">
-     <!-- Download and extract the package from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2805,7 +2818,7 @@ skip.installer property in build.properties" />
-     <delete file="${temp.file}"/>
-   </target>
- 
--  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
-+  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
-     <!-- Download the file -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2815,7 +2828,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="downloadfile-2" unless="exist" depends="testexist">
-+  <target name="downloadfile-2" unless="noget" depends="testexist">
-     <!-- Download the file from the two alternative locations -->
-     <local name="temp.file"/>
-     <mkdir dir="${base.path}"/>
-@@ -2838,7 +2851,7 @@ skip.installer property in build.properties" />
-     <move file="${temp.file}" tofile="${destfile}"/>
-   </target>
- 
--  <target name="trydownload.check" depends="setproxy">
-+  <target name="trydownload.check" depends="setproxy" unless="noget">
-     <condition property="trydownload.run">
-       <and>
-         <not>
-@@ -2849,7 +2862,7 @@ skip.installer property in build.properties" />
-     </condition>
-   </target>
- 
--  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-+  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
-     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-   </target>
-@@ -2860,7 +2873,7 @@ skip.installer property in build.properties" />
- 
-   <target name="ide-eclipse"
-           depends="download-compile, extras-webservices-prepare, download-test-compile"
--          description="Prepares the source tree to be built in Eclipse">
-+          description="Prepares the source tree to be built in Eclipse" unless="noget">
- 
-     <!-- Copy the sample project files into the root directory -->
-     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild
new file mode 100644
index 000000000000..7fa74915d25f
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.99.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	virtual/jre"
+DEPEND="${COMMON_DEP}
+	virtual/jdk:1.8
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	java-pkg_clean
+
+	eapply "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.7.ebuild b/www-servers/tomcat/tomcat-9.0.7.ebuild
deleted file mode 100644
index 967fffcd751e..000000000000
--- a/www-servers/tomcat/tomcat-9.0.7.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${PN}-${PV}-src"
-
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
-HOMEPAGE="https://tomcat.apache.org/"
-SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="9"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="extra-webapps"
-
-RESTRICT="test" # can we run them on a production system?
-
-ECJ_SLOT="4.5"
-SAPI_SLOT="4.0"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
-	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8"
-DEPEND="${COMMON_DEP}
-	app-admin/pwgen
-	>=virtual/jdk-1.8
-	test? (
-		>=dev-java/ant-junit-1.9:0
-		dev-java/easymock:3.2
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	enewgroup tomcat 265
-	enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-src_prepare() {
-	default
-
-	find -name '*.jar' -type f -delete -print || die
-
-	# Remove bundled servlet-api
-	rm -rv java/javax/{el,servlet} || die
-
-	eapply "${FILESDIR}/${PN}-9.0.4-build.xml.patch"
-
-	# For use of catalina.sh in netbeans
-	sed -i -e "/^# ----- Execute The Requested Command/ a\
-		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
-		bin/catalina.sh || die
-
-	java-pkg-2_src_prepare
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r2"
-INIT_REV="-r1"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local dest="/usr/share/${PN}-${SLOT}"
-
-	java-pkg_jarinto "${dest}"/bin
-	java-pkg_dojar output/build/bin/*.jar
-	exeinto "${dest}"/bin
-	doexe output/build/bin/*.sh
-
-	java-pkg_jarinto "${dest}"/lib
-	java-pkg_dojar output/build/lib/*.jar
-
-	dodoc RELEASE-NOTES RUNNING.txt
-	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
-	use source && java-pkg_dosrc java/*
-
-	### Webapps ###
-
-	# add missing docBase
-	local apps="host-manager manager"
-	for app in ${apps}; do
-		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
-			output/build/webapps/${app}/META-INF/context.xml || die
-	done
-
-	insinto "${dest}"/webapps
-	doins -r output/build/webapps/{host-manager,manager,ROOT}
-	use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
-	### Config ###
-
-	# create "logs" directory in $CATALINA_BASE
-	# and set correct perms, see #458890
-	dodir "${dest}"/logs
-	fperms 0750 "${dest}"/logs
-
-	# replace the default pw with a random one, see #92281
-	local randpw="$(pwgen -s -B 15 1)"
-	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
-	# prepend gentoo.classpath to common.loader, see #453212
-	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
-
-	insinto "${dest}"
-	doins -r output/build/conf
-
-	### rc ###
-
-	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
-	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
-	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
-	insinto "${dest}"/gentoo
-	doins "${T}"/tomcat.conf
-	exeinto "${dest}"/gentoo
-	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
-	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
-	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
-	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
-	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
-
-	elog "To manage Tomcat instances, run:"
-	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
-	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
-	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
-	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
-}
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 89e7504a84b7..357215d38166 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/whyteboard/Manifest b/x11-apps/whyteboard/Manifest
index 45a241b84a27..c35c94a3247b 100644
--- a/x11-apps/whyteboard/Manifest
+++ b/x11-apps/whyteboard/Manifest
@@ -1,5 +1,5 @@
 AUX whyteboard.desktop 316 BLAKE2B c3053bdd89744b967e25d6f5c1e988392ed8f10779de4b4f78842c9b3527e4211f0efcea1151f1144eea7e99cb98e6b28f1282773d38d98b39dee4e7bf2bbd92 SHA512 0caa79de89d7e82635165074695c19a8b860691db71a96f47329cd3d0d0ba90d4ce53041f72a066464da8c163bc8ac7d5f178835a1a829d4a0514df388f7d802
 DIST whyteboard-0.41.1.tar.gz 372110 BLAKE2B 9f9fae6f3d471681d6809630635350d1fdeaf2f9206adb01919e75b7ca9a867637f90f563b7715abbd0d086e19f03178d0ff66e45b0e0993ecf4f4334f0f2a2d SHA512 c2f789846c5c611047b590109a49b6c28c51e5c84a7d2399f025b5b79d3c633577106aba79f76f0244bc175cbd3169cd8a53221d08ca94ddf39be01406fd429e
 DIST whyteboard.png 7601 BLAKE2B 5a82eb095fef70c274ccca8284fefdfd7ddb628fc2d21e4adb3ff728a0f1ac9f1ee285a936fb8955fa4e754efb1612d52dfebb07b5d8cae8e5adce61f5750e24 SHA512 384b0e6de138d3d193c3fbf02dbfe53273d24d88e9665b04cbc8b826d29b7aa7ff8ad916a39cfb6e44d0518da1229546a230369d55b1ae86cab5152ceb33f4fe
-EBUILD whyteboard-0.41.1.ebuild 1085 BLAKE2B 1dd1b2badd26aced9731a7a2c20527754c19dbce6735fa6f78d5fe3599b200ebb4cd7c6e9e5819c58cf8180a6e097ba04f1547947f6bb8d86bff4c94732964ee SHA512 7aa24d6bb2dd3a114a67c20b7fdade09f1c4cdf25440df781cdc819985bfa58a722e71ea7d25be1c9f73b5b3f1c379c15ab043d29a587345ba14d57b8f27bca3
+EBUILD whyteboard-0.41.1-r1.ebuild 1118 BLAKE2B 647c17210ce73414f052dd958afeb68e51911a73b4a01c0f381ee4e3aec967d3e76155dc8c7c79cc5e85d3e7e34b258d916163e70d13fc4893ce6bae43156263 SHA512 ac698f3dd9111660277ea65bbb98d99cd4690a7408e4d624ff32a4d1eceba380c0d9a1269befbc2ac09eb52accd2afe794894993765abd93ab939d9baf31e2e5
 MISC metadata.xml 434 BLAKE2B 00d56d4d13176b1b37e136e0f0e3bc815cccecb89da9f7be1b682c50054f5590fb518412ded3e915e8cb98fe7deceb65605e048cbf237609b4dd306c38ca10b5 SHA512 49250b347b4c0e66a67394259c333c5d840830cdfe2969830b4f97735ce3e545b579ea749c9151d0a3579cd9621935283ce16a22330dc195c91e47900458b6e9
diff --git a/x11-apps/whyteboard/whyteboard-0.41.1-r1.ebuild b/x11-apps/whyteboard/whyteboard-0.41.1-r1.ebuild
new file mode 100644
index 000000000000..9d13028f704d
--- /dev/null
+++ b/x11-apps/whyteboard/whyteboard-0.41.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 multilib
+
+DESCRIPTION="A simple image, PDF and postscript file annotator"
+HOMEPAGE="http://whyteboard.org/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~lxnay/${PN}/${PN}.png"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/wxpython:*[${PYTHON_MULTI_USEDEP}]
+	')
+	media-gfx/imagemagick"
+
+src_install() {
+	doicon "${DISTDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+
+	dodoc CHANGELOG.txt DEVELOPING.txt README.txt TODO.txt
+
+	python_domodule images locale ${PN} ${PN}-help ${PN}.py
+
+	cat >> "${T}/${PN}" <<- EOF
+	#!/bin/sh
+	exec ${PYTHON} -O "$(python_get_sitedir)/${PN}/${PN}.py"
+	EOF
+	dobin "${T}/${PN}"
+
+	python_optimize
+}
+
+pkg_preinst() {
+	echo
+	elog "This application is very experimental and some features"
+	elog "are not yet implemented, however you can live with it"
+	echo
+}
diff --git a/x11-apps/whyteboard/whyteboard-0.41.1.ebuild b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
deleted file mode 100644
index b37dbb1d85d8..000000000000
--- a/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 multilib
-
-DESCRIPTION="A simple image, PDF and postscript file annotator"
-HOMEPAGE="http://whyteboard.org/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	https://dev.gentoo.org/~lxnay/${PN}/${PN}.png"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/wxpython:*[${PYTHON_USEDEP}]
-	media-gfx/imagemagick"
-
-src_install() {
-	doicon "${DISTDIR}"/${PN}.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	dodoc CHANGELOG.txt DEVELOPING.txt README.txt TODO.txt
-
-	python_domodule images locale ${PN} ${PN}-help ${PN}.py
-
-	cat >> "${T}/${PN}" <<- EOF
-	#!/bin/sh
-	exec ${PYTHON} -O "$(python_get_sitedir)/${PN}/${PN}.py"
-	EOF
-	dobin "${T}/${PN}"
-
-	python_optimize
-}
-
-pkg_preinst() {
-	echo
-	elog "This application is very experimental and some features"
-	elog "are not yet implemented, however you can live with it"
-	echo
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1e2ccb991871..f9eb259757f6 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/flowcanvas/Manifest b/x11-libs/flowcanvas/Manifest
index 55d16ca76ba1..460a13535a45 100644
--- a/x11-libs/flowcanvas/Manifest
+++ b/x11-libs/flowcanvas/Manifest
@@ -2,5 +2,5 @@ AUX gv234.patch 1572 BLAKE2B b9f36694929b773596fe3316b1f3b4fe2a2bdf9a792303c9f64
 AUX ldconfig2.patch 329 BLAKE2B f4cb55c852b1fbaadde1612b18e54544e4c97b73cf5b736c7b1aaca898fbe5d54e7eda816c8ca09d52c1929ef945a9884e287b8597a112a98bcb95832c5f528d SHA512 156cf9bee8a6d736ce4f51d8fde79dec0f0eb8594ae2f5c7d1aee6d9d29d46200a5f8a228fba99c7066c26c784d391d0a3389d009e29fc1e1fe8a16fceec024c
 DIST flowcanvas-0.7.1.tar.bz2 139471 BLAKE2B e37f557fdd850c35dc70fc7efe71e7d9be5c60a7920fcfdb38fc4a9eb4d1a44639688b50feae4b0f529469cc68e906ea75e0b870a82379212d94e27e4be8abb1 SHA512 e9c7ee9693c6b78e44a0611a8d73c1b7ffa1ae0f3e36c9b0bbc88d5a293c3e5183c17e14b2079d611c988f30cb292caee52ab37f8a13da96b5c8c8261e408410
 EBUILD flowcanvas-0.7.1-r1.ebuild 959 BLAKE2B b8093eedf07b9ed170ab11e6a31f6f6452a1e076a0af3098dfd015a92f7a25e83e973503c4e37989a8c4648bb608b9a0ab77f5ceb35923e804820f747c670d99 SHA512 2bf702ead6ce595595066691af556aedc24d2def93fcf79ec3691afbeb7221859bea0e599e46aa1ee617283f36e2fd30a99a6a41001e1304bf729fe38fc502ee
-EBUILD flowcanvas-0.7.1-r2.ebuild 1000 BLAKE2B c901d755a6ba57e3ee1cda4fe4d3a332fb81fff9a590d68f28237594696168ff40ad729ace403b6037b7558e539b08f4b0511056d6bfe947a46f7c0495017ac0 SHA512 f9c8c3db640d745b5f55702ee4cb1d84f3d1f121934649ef70f2cd0819ba54d4926fb0af60a80f6ba27e2adc27f1967aa3b7a2a362f726c624cc0276ab736c49
+EBUILD flowcanvas-0.7.1-r2.ebuild 1002 BLAKE2B ea7d68e7c2ace500a6bfe89949319e9e13f2965f66773f6eb2302408119d63dd91fd628a4a8d537a8f931b66f5bce350976eb654609d8fd250069bb31fb81b00 SHA512 2f2f8a3c4cf8ba42c159fd7996713e88a7839e6ec53b9b7b859f4a1be1ad80b0953cbe581ad0603b3f3e8ae4ccc0e87115b6ae863212bd35e358a892ee430ae2
 MISC metadata.xml 463 BLAKE2B 0c1c83cb8de453fc351e658058e8e52be625440dda6dc2943c1e2198b203f510066a41992289253ae2b423a55f92d6daf6024253e47d7beb8c0274f63445dd69 SHA512 94b79488b0d2fff96a3a3207cc23c014dc6739e5f020c6459fe09e5c8b20563172fafbbbb8e5f1781f8bb0392bb25fe8c79eb30019ecbd0d5db15ba1485b8b32
diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
index 8f2514c32e14..452438c3dbc0 100644
--- a/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
+++ b/x11-libs/flowcanvas/flowcanvas-0.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc"
 
 RDEPEND="dev-libs/boost
diff --git a/x11-libs/fox-wrapper/Manifest b/x11-libs/fox-wrapper/Manifest
index 65d457729bab..b3112f0198cd 100644
--- a/x11-libs/fox-wrapper/Manifest
+++ b/x11-libs/fox-wrapper/Manifest
@@ -1,5 +1,5 @@
 AUX fox-wrapper-2.sh 1905 BLAKE2B 1b437efc5d8fa8b4d12ccd84469b1c6b8c19cad06fafcdca19304f352edb97e645815411a49ff1aeea1347b3ad024b40bacb761727d32c1d2692e2d5a040f893 SHA512 9cf96c083ea0d787992f40c5acce69dec162535122d65788aa05fe4bf33473103c889a1de98dfd80526c4a53e684cf536105f88bd610e9e50a55eb68bc2ecf35
 AUX fox-wrapper-3.sh 1901 BLAKE2B 20b6ca94deee62464642e5a7e127c78135dc83a5c8c4d369fe35d7e6c2686b825b7fe966998f58dbd7bd5d77ae30a9f6e98d1bac46bb06050cf52a1d8c9f30fb SHA512 19d7115feb5566ae8e3c7af9a88aca7d0643dab92fb8bfbdd0bfa826f7357b2caff436741218eb9d51164fcdf863c3150526108e3282fa244102bd85f8abaee5
-EBUILD fox-wrapper-2.ebuild 522 BLAKE2B ab3df1c77555741d66fcb0b60c2694adf7ca39f81a6e24b75ab9664ba22bde4afce1cb910b7f460c22b109fed73f917d9207fef9f8cfdbb44c33f5d5c2e25f4e SHA512 21614e34ceb81cb2997265f1dafc2ed4eda14b48ccee8eacaa222f09f811d5bacc67dd04f9f75f57597e3b2dca5aeb5585a5f25bbc78e8f1a5e4fbf3a0657a36
-EBUILD fox-wrapper-3.ebuild 536 BLAKE2B 8c62923bf0e9e50c5d00fe50a957f85d9fb754b559182f03dd36cb5b593e90d1f96f55dbc3d3dde4e3b7844c771ea292bb9a9a26f57796c0320ed499e2ba48d9 SHA512 1fde0c35aec32402e54ccc5fca5abf0f2901baa339ef4f3dbd51d1f4c50248b90650a1b4efe1f82e225140176d919c2dccc1830f174bc08284b956d5a885a564
+EBUILD fox-wrapper-2.ebuild 539 BLAKE2B e27b08259517eaa605471ac462b0a4b24c171d0de00ca0f99014a430c475a466e6c7b1e9b937e3ab65431942dd39b4d57f28ec6d245251aed0099ca8d5c65601 SHA512 45fe4172a02e5ea3b26ff3983ed3f0e711b1cfdb4dea8d1e6a0de5b44c7f70df06c1a44c68ff8b93e1f47b0fd5d2ab651b9a55e35b683aec8fea6ec16dee4158
+EBUILD fox-wrapper-3.ebuild 553 BLAKE2B d97b70af5455851faedc1cb23b139294c155f34d60278e3f4806419c687439642e355edde3c841f7e5ed89b9c8eb6d9ba50bf0cb9e64bd0bcaf5c42c55a3da26 SHA512 cba95fddda314074ae67577c1e0fca909df169c46c17fdb94a218c099cfe941ed4b0064c2f60608fd1c145fbd593a72254c91221287f4465758b1b8de4e1db1c
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
index 56983ae52617..fc4249f7449e 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="wrapper for fox-config to manage multiple versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
index 9826efa31296..1a9cd3e0b756 100644
--- a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="wrapper for fox-config to manage multiple versions"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 13d805d2d271..b6cbd05a1623 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -6,12 +6,10 @@ AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.24.10.tar.xz 20958300 BLAKE2B 60a70341f15b59b95316cbce55cd18b54a6dff3735fb5f375c1bc21ca2591874b583d4879021d868d78fe1714bc037d80d44fb3384efd1167962b8c6e9588c5a SHA512 1f7980189f522fd3646fb480b965c21801cc30b3316eb8bad8ded1efd25d3054f62160ddbe9ea241628c11b24f746024fbc3d22b17b9bd61fa6c301ab91d6498
 DIST gtk+-3.24.11.tar.xz 20974300 BLAKE2B f338782d6141df64f83caae84649558296e11240ab082d4db129480a77e85cd26f86dee66e7f2650db48f13a30b0cb7191a8deb4bc545c9c7ee3b73796638a98 SHA512 15e33169030aa38e363730e5b19bbde614897b1a0de5db29c5292940a97e3613383b3eeb1c83ab8c09015a2a3f3ad425511bacd8fdbb79b30e0a47d4d4b57008
 DIST gtk+-3.24.13-patchset.tar.xz 57652 BLAKE2B deda8cb4e0026431b52c0299266d60c4d4be2a2c870bee06daf3d9f63918d47243b88c73c4441f9415c859116fd873f276496b7ea9c2243a9540351ca53c5897 SHA512 dc8abad0812c936f7316425ca456d5892f3438ca6f843ed49fd53258695958b2a52a1df878ff25547d176aa054ea48ae9fc1b971698afc4d4aedae9cb643feae
 DIST gtk+-3.24.13.tar.xz 23206464 BLAKE2B d58130d490d8886d0656a3106ddd4f24c0b83a512b6daa22cbb6cbfa6f0582a22a8f6e0063016c120e15b031a3c5585a557bd3dc94b1e55ac0ae553da871d64a SHA512 9129d4574cca258b4a517d8d65dad246a746fc3dc574b78e098db9aa9743956ce227efbf963f63e1e0f1a1a09810716150526b2bfe8015a5960bad38b0c88406
-EBUILD gtk+-2.24.32-r1.ebuild 9986 BLAKE2B d669193ad3f4a93aa2fbd42ac53acccf65733e561848c39a98f2f4a6f9001b7ed339b72e5b6ac25bea2888218df1b21314fecaf80c4d6f227c8a705bc123ffcc SHA512 2e7ba97b79d16547462e4433b38a6e7668e34380e2f7d1012deeb42816f0f4e4c29134de8cfb0ae21728e899a21264be3593d24282f9f8cb2784cb5ddfa9ee05
-EBUILD gtk+-3.24.10.ebuild 7294 BLAKE2B b91fa9192749bd4d85a97ea47e4581c8401b2be82a7a620e0d0db456ce2797f9cf4b6e4efe6432f683e290df3661fb2fc73e3cae915fa29ed505ae081c682a77 SHA512 6b99400b400d156af7184ecd0ac2fae5a58468baa7b0bfc2e3aec38de4fbd308610df0ae9772fd8d779e382f1d0a1faeb16e59a5bbf92c5d90b690661a8d9fbd
+EBUILD gtk+-2.24.32-r1.ebuild 9987 BLAKE2B 484ff6b317c25d3a7edd13caf9754c8104822d0e3537037a9485e5c0b67e7d158316ee37f46af97e92c17e99f70802d307320945192300030e494680465b862f SHA512 27188961315d62e394da2e4922e18c2efa725c54d8acfa27c6bd702e23ed01903396c603fbf4b75fada477ae0d8415a5fa6ed2122e4fca24652ebe7d5c8766fe
 EBUILD gtk+-3.24.11.ebuild 7325 BLAKE2B 9c00c7990a575d14f7f4b0205acc384e4382628c41725f5469f0d525e2aa032721a53b4cb0dab81fb7ec1b5fe1d6ca2ab296190f9824986d06eb59a510e7d49a SHA512 9daeaf3bb855045589887e743d37be7f4e14ec16c555abc4d005207622a25396325d5d6967278c425fd9d617d9c1bced9196098b6f7db50a0ee93dfbc56eafb8
 EBUILD gtk+-3.24.13.ebuild 7447 BLAKE2B 31a619b26e2adea68955bd3cedfbe50d8523c21d4d8296363a7cdcec23973bd468b3ebeb87433afdc57c01e8338e95b1dd5364308fcb183d1fe8ad9e3d52bd19 SHA512 2c571c507fd3b37b2023c1f403d4680f20972a8d185c48b9b3c6584e36f43f53a09ab64c4fe28464510776ed761d2a89ec6ae01e7352460f51e1b4e499205f7c
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
index 67c8ddff4f4a..8b91e66833b1 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.24.10.ebuild b/x11-libs/gtk+/gtk+-3.24.10.ebuild
deleted file mode 100644
index e21e8dec69a4..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.10.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
-	x11-misc/shared-mime-info
-
-	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
-		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	wayland? (
-		>=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.12
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt
-	dev-libs/gobject-introspection-common
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	gtk-doc? ( >=dev-util/gtk-doc-1.20 )
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	X? ( x11-base/xorg-proto )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable aqua quartz-backend)
-		$(use_enable broadway broadway-backend)
-		$(use_enable cloudprint)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		# cloudprovider is not packaged in Gentoo yet
-		--disable-cloudproviders
-		--disable-mir-backend
-		--disable-papi
-		# sysprof integration needs >=sysprof-3.33.2
-		--disable-profiler
-		--enable-man
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		# need libdir here to avoid a double slash in a path that libtool doesn't
-		# grok so well during install (// between $EPREFIX and usr ...)
-		# TODO: Is this still the case?
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-	)
-
-	if use wayland; then
-		myconf+=(
-			# Include wayland immodule into gtk itself, to avoid problems like
-			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-			# user overridden GTK_IM_MODULE envvar
-			--with-included-immodules=wayland
-		)
-	fi;
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
-		else
-			touch "${ED}"/${cache} || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
index ebacfbb647f7..35eb23a522ed 100644
--- a/x11-libs/gtkdatabox/Manifest
+++ b/x11-libs/gtkdatabox/Manifest
@@ -1,5 +1,3 @@
-DIST gtkdatabox-0.9.2.0.tar.gz 2836730 BLAKE2B 8ac4c3a4335fd5850d21ad035ed68292da08f19ed83be4e50a30439782e6b3a0b3aea31d56a27e6cfd3af0a60ee71f8fd2b51f0dfe5307412ad6baa2159012b2 SHA512 cb36c4ec7b1b4db747520e00c80c037d02c26f60c04bd9d8e4eac06e4e0ec6a605d39e8f11d518751d3137a0ab38631916e98f15cb55cf024b3e5ed37a716f91
 DIST gtkdatabox-0.9.3.0.tar.gz 2883977 BLAKE2B d9d5de1c4d07bd01940ea6f75f2b2f455b46cf018dbae67bcb643f523353e675e1a97cfc10b696fe16aa0391cb006e5e866bef52cefcdd8ca4de057589164e6e SHA512 5c2464dafcf9cdd4ee11bec6f8e627533c0270fe28d736e1be45ad084c42d430a50c39cf08531138627cc59ab034a191ecd7b97ccfce633467ff99e6e9cd593a
-EBUILD gtkdatabox-0.9.2.0.ebuild 1385 BLAKE2B d3b683369f03e0876ae85c44a390c218bd07195396c73e9acbb4dfe111d87a146c20a62c099cd5950136020458149a3ebb6cfd28b07aebe8a9ea40acd4f5153d SHA512 3aab1a2fcfed72447f4a1c85613f4fc7cc148dce8ccdad57eb028b52c2f46a1bbb9f8e7ebdb2460f847d23b537727499c92ba51eb997467374dc094c1592000e
 EBUILD gtkdatabox-0.9.3.0.ebuild 1320 BLAKE2B 1511e776e669f072064d036449861db9b642b8a5b8487c9a9e242fe692febe7febf240687e15323d76da8665b3c9f1d5f38653bc80bf307cde19a976ea6bca6f SHA512 af327c426845abb8e64b1938a922a058e198c7aee4914f1bb7f1e2d41ec55af30ce4641d9899b4061efe76828ac9e33e6fbf26dfa27560c46916a83cb2de0290
 MISC metadata.xml 581 BLAKE2B ff0d8d541a11821321883ac414d4de93a7e2a8daeee8e2e4540c72018775a8b37b83e52d97df8e7fc279e0c629fc9d46f9514dfba55e30e64eadf00ab100f8af SHA512 34e6d588df560865aec420e4d400c13e931bf97d402fd8ee5e2ee1df8ebe6df8673bacb59c14f8ef258165d0802e160c8f105648fcf42eac15ed888f267b87fa
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
deleted file mode 100644
index 1f83e52ef5b2..000000000000
--- a/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
-HOMEPAGE="https://sourceforge.net/projects/gtkdatabox/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples +glade static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	glade? (
-		gnome-base/libglade
-	)
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-DEPEND=${RDEPEND}
-
-src_prepare() {
-	# Remove -D.*DISABLE_DEPRECATED cflags
-	find . -iname 'Makefile.am' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
-	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
-	find . -iname 'Makefile.in' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed"
-	sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am -i Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable glade libglade) \
-		$(use_enable glade) \
-		$(use_enable static-libs static) \
-		$(use_enable test gtktest) \
-		--disable-dependency-tracking \
-		--enable-libtool-lock
-}
-
-src_install() {
-	default
-
-	prune_libtool_files
-
-	dodoc AUTHORS ChangeLog README TODO
-	if use examples; then
-		docinto examples
-		dodoc "${S}"/examples/*
-	fi
-}
diff --git a/x11-libs/gtkglarea/Manifest b/x11-libs/gtkglarea/Manifest
index 96beedfd39b9..3c85a6057b67 100644
--- a/x11-libs/gtkglarea/Manifest
+++ b/x11-libs/gtkglarea/Manifest
@@ -1,5 +1,5 @@
 DIST gtkglarea-2.0.1.tar.bz2 298744 BLAKE2B a60ee019af111b6f1da92a6c81cc0d5dac003fa79ae95aaf79f1f5bc38c558e1a084d69b556570d1710966d1d25590467a612d9e0f17a994084960537bd744f1 SHA512 54d3c23637e4347c9cdc25fa0159f720bc6bf76e167b025efd14361f1026af18f41686860444083100f939bec66309b1ffbb84c776c88e513d6ad4a06f66c79e
 DIST gtkglarea-2.1.0.tar.xz 264100 BLAKE2B 453a867581a09bab4ad2c71a5d66f567afe8fa8315467beb39d48e242fd46119c4b77b75a662eb1d4c88398811c0ccb4328b8695f584f692bfd53f43c8bcf4a9 SHA512 c790c1b542d85d86cd57f333c87ab2c930c8065d6f75320d588688b9a0adb8c4270522b6b88734720db1b71170f4f12c95e650e9a599a5d7e4b7baadf1f9f06b
-EBUILD gtkglarea-2.0.1-r1.ebuild 1108 BLAKE2B 5182fc07f3348acfc243f5b6ef51f6149a4a07df03371f8749fa54b132fc59b83cdd16919141664a51f8e7e4453e438139c31af1a18d6e4855273f08754d5cd9 SHA512 15c2a444fdfdc8d5b13136c22b06b21c52337d17cfaec1556a9f0e2535876a0d8ca2142332f64669be445fd722bbca1a554fa8b4e0f6720388d786cdb8d5749c
-EBUILD gtkglarea-2.1.0.ebuild 977 BLAKE2B ae7317b3aad31ed93582312c7065afa796ea6905de6ca318efd8ba1c0c6f28a1328e60c24d93af0fe93d01f1912a1dfdfd4b8e52221d23518b4f6684ed502ff4 SHA512 ba0290da9f469b73c6c771eb28cc89a6e0c706b41f93583334a249b85d037058a703733d7da9028178b9daa73afc1ebcbb7c648351325bb715e804cbbcbf9e24
+EBUILD gtkglarea-2.0.1-r1.ebuild 1106 BLAKE2B 54f88f2b645f78c02fbce3ef78c8e13aa5cf8d00d87e14be09fc94cf3508302d470eaccdc2e52c715c4756ffe732c25ba85f69685c1d7c671b52833ce8fa933c SHA512 f4f0ca4230712f2f645d5e2f18c2a2fecc3a929cbaa88cf29f0e16d0ab509e6a8ea72d8e0a7889963b899101bda519f308c37a3c26648a57ee33262f79cf11c5
+EBUILD gtkglarea-2.1.0.ebuild 975 BLAKE2B 2d9469350c76b26d5ac5f0bb81f97826226ad17a49f2f2e13dfdfa68392bc043d6e8330fa66a8e8c2e49f18a30236bd82ce49f69d0872c11b8550d6d5cc1a387 SHA512 0472605253acdf5e6100c3374b8622575daac29ba90c7d76681a27cc22537ebc79c7e827dbd02442cb7c214bd40a606c5c35f780fd74bf81c25eff5c3205eac9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
index 5766a907b263..c70462d862ea 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND=">=x11-libs/gtk+-2.0.3:2
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
index f3788d891dac..a91c2801415b 100644
--- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.mono-project.com/archived/gtkglarea/"
 
 LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index effabfe8d6ff..b83d4b9f1065 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 1562 BLAKE2B d28572943bdd3942fb9dc8ae59eed5687a1faa9438c5d504f6e6fd47eb810d27d1c610ce5af5d99de10dd25b6627ed09dd638d72e4ce2059462ffdb88a709ce9 SHA512 79691e24e330cdc3c8d500953151f83531bb3976e5b10e642f91082fd1ee4130cf740c349ad97bf3254f4b523348a2e2d875c675098d903086d89e4742498dcf
+EBUILD gtkglext-1.2.0-r4.ebuild 1563 BLAKE2B c5f8f9d77851943027cef58fd83570ccc575adc582bc6d58f38cbe60c034f96b15a268abb39fbf28a1c862d8358ecd1c8ed6aa3a466fcc5e7a69a22ea0df8058 SHA512 0d3fc5ad7d86e39815144f3279fdee53e29238f6a5c311ee35f4082770bd89e36324a4992809fca7aa97c3c8c0da842c70df6a1d30fd6bf00b875195f8b23543
 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 3721b28edf38..a61ba76bc495 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-2019 Gentoo Authors
+# Copyright 1999-2020 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+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libGLw/Manifest b/x11-libs/libGLw/Manifest
index 5761ac4d7b7c..867222d6c083 100644
--- a/x11-libs/libGLw/Manifest
+++ b/x11-libs/libGLw/Manifest
@@ -1,3 +1,4 @@
+AUX libGLw-8.0.0-gcc10-fno-common.patch 558 BLAKE2B 901d7fc3b61eb6b50f09c2318d0dcefb3a3551d85f2c0d239f3d69c8e15a7360a4e1628370d13c0810ce380c1f8da9d5887917a131d0055956b0286018488e35 SHA512 d44de8dd3ed9648122fc5661137d6990772595213cdf5fccba6c191eeca20234fb05b97b86c8249208f3c5a978ab677c18d01b4d39da94333d8cd36ef21340da
 DIST glw-8.0.0.tar.bz2 221136 BLAKE2B fcbd1fa99da4fa5d45b0ec14af1a9798c53ad13adfa6e2fb46b45a214397b7a7d11186f2efa2f64cddd589fba9c24280825bca11163eba8fd4149fbfefd822e9 SHA512 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587
-EBUILD libGLw-8.0.0.ebuild 699 BLAKE2B f11b2beba45aae0307eaae5a47f14b5ecfff72e24845f247fc3d1f50a1abbc7397bddf53a33cde57b0938966341f49e029444eb85081389700d655c7ee4cc72b SHA512 6c9dcbf09f1845f5693fa762ed23e05ed4fd35b8b504e8ee482c11e150b797b30665b6c73b146536d5fc297883ea8822baedb4c0a85c31d1b3ba48a66bf1226b
+EBUILD libGLw-8.0.0-r1.ebuild 729 BLAKE2B a5fd5b4b47816d1b51de4c4ad390d47fd142c8ccdb0760946ac863c3134322421fdc3ac19516b3fbca3236cc5c8dd79ad39fadacaab9e9aaaa60ed2fdd0d49c1 SHA512 018636a3b405792ea4e3c8a19d2e860a44f40c7e1ee4fd1d4d4907cc7ce6714e96530c26c99a89b37656ab9bb08dfe7b6ad8a973e6d79e8a4dde2d2c1f3b6e87
 MISC metadata.xml 310 BLAKE2B 6cd072bd58e5525e3e31fecd7d823e85498858e9109ff94707a21aa801697d59f21cc1ba8d477511a14bdc1d10238bdb34da1402c1b431ad25b52b2adcdd96f6 SHA512 797bbd05193951c317b30062db58f04f950889b9c5b31d1e3338142c9ea826d10e2f4c6d55fd076bb9c409239667bf3bf9f7ccec3c7c5d4aedf9187619ee1196
diff --git a/x11-libs/libGLw/files/libGLw-8.0.0-gcc10-fno-common.patch b/x11-libs/libGLw/files/libGLw-8.0.0-gcc10-fno-common.patch
new file mode 100644
index 000000000000..ad0253270937
--- /dev/null
+++ b/x11-libs/libGLw/files/libGLw-8.0.0-gcc10-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/GLwDrawA.h
++++ b/GLwDrawA.h
+@@ -136,7 +136,7 @@
+ typedef struct _GLwMDrawingAreaClassRec	*GLwMDrawingAreaWidgetClass;
+ typedef struct _GLwMDrawingAreaRec	*GLwMDrawingAreaWidget;
+ 
+-GLAPI WidgetClass glwMDrawingAreaWidgetClass;
++extern GLAPI WidgetClass glwMDrawingAreaWidgetClass;
+ 
+ 
+ #else 
+@@ -144,7 +144,7 @@
+ typedef struct _GLwDrawingAreaClassRec	*GLwDrawingAreaWidgetClass;
+ typedef struct _GLwDrawingAreaRec	*GLwDrawingAreaWidget;
+ 
+-GLAPI WidgetClass glwDrawingAreaWidgetClass;
++extern GLAPI WidgetClass glwDrawingAreaWidgetClass;
+ 
+ 
+ #endif
diff --git a/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
new file mode 100644
index 000000000000..6be3bab29d6b
--- /dev/null
+++ b/x11-libs/libGLw/libGLw-8.0.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=glw-"${PV}"
+
+DESCRIPTION="Mesa GLw library"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="+motif"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/motif:0
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc10-fno-common.patch )
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-motif
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/libGLw/libGLw-8.0.0.ebuild b/x11-libs/libGLw/libGLw-8.0.0.ebuild
deleted file mode 100644
index 94fc2c6d16f3..000000000000
--- a/x11-libs/libGLw/libGLw-8.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=glw-"${PV}"
-
-DESCRIPTION="Mesa GLw library"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+motif"
-
-RDEPEND="
-	!media-libs/mesa[motif]
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/motif:0
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-motif
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index 7453ab42fc30..7f7248f99c33 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -1,5 +1,5 @@
 DIST libwnck-2.31.0.tar.xz 630792 BLAKE2B 8201537d3c9a8a0a8668fc16d33a8eaa05c14312401f1c763c922402df04ef03260dd259f5c46508f85390f7aefd551e83143e654b24b412272dddb7c7c4bd62 SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9
 DIST libwnck-3.30.0.tar.xz 800296 BLAKE2B 5917ac8a69f6f1e0d639f301a77349015226ca6d0fc12e8b23c00a81e18f6e9dbb7716b01e50aceb15bdbd64b5b1a8295be5b931d513e120508cdf14d2d15a23 SHA512 79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128
-EBUILD libwnck-2.31.0.ebuild 1256 BLAKE2B e8b38702ad4ed813d84286b5a898aa129d9c408d70b42bfc0fe0de2c0de59ca69fe781aac1494f04ee1a91bcdb78c91dcbb3603a54701d28ba9d4b717b84b5c2 SHA512 8d45ad927c02761e1267c2a4e657bf427f3f8a7e2883c863c12a05d342c405aeec703015b46a686bbc8bff671df39d714532c1398ed09543b5c709f111a281d6
+EBUILD libwnck-2.31.0.ebuild 1257 BLAKE2B 151f9c6691680a644fffeba9e54dbecb097e98517e043e706d07d0f0d4746b6b7e70f4822c9a6bf444bcfb0242d38b35a37650eff529801d79fd9c4be6a82974 SHA512 832dd84bdee9be173c67aff5859647af069722002205388aed0ced59db509d24c2f13b0b6a5e96dbfcaf2d2bde187014831566aa2e213aaef9e323f319581331
 EBUILD libwnck-3.30.0.ebuild 1131 BLAKE2B f7e70b65940fabbc2c154e598efb9f63da6253de3d5d0f6fc5fc0382fba3eed952c3bc967655b64fa430a30d8f9c898a3f75c6d8d2da8c943f8bd0aada2290c7 SHA512 895bce136f3c2d2410a7fc3d203f56e8c3841f21a1c57cc021115b6dd30b0b0fc37f049a57a89559b5419197a8d7580076824ccb80d6c2b077e529615aaaae87
 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 422baec70749..1310e2df134c 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-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="LGPL-2+"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification"
 
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
index 21a77c2a30f6..891691528263 100644
--- a/x11-libs/libyui/Manifest
+++ b/x11-libs/libyui/Manifest
@@ -1,3 +1,3 @@
 DIST libyui-3.3.3.tar.gz 230452 BLAKE2B 4be43bb4959eac5cd7c5974774130cb948367cae55dc83ad67b26d0c57f79cd1b8a7328b695478c450c3373167d0d74e2455e7804b4f25fd51b8386ceb113df1 SHA512 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f
-EBUILD libyui-3.3.3.ebuild 1148 BLAKE2B dc00809cc001e612561cdc62dbfd7e56592f4601efb0cae01162c448aeeb44ca6ebaf8a745202a471c2e9c2b79d8e55219080bc03f132029d37ba553e475be11 SHA512 0e64747ebd1d178c75044d7ba0d7029384aab450e2e748c04547d4aa681e93737fb03607a08666edd7c6f460563b830cf30ca420c4d29ebb55991e629eaaaf02
+EBUILD libyui-3.3.3.ebuild 1146 BLAKE2B 70c7017e2d5c774d1894d510e83a26abf9d5be4ed651a2f5cf1e913ef3326148c1b175aa4baa2e4f41858f69d60f49a95d44e2d0303c86033e1bfcadec9521a1 SHA512 65f3b05baeec154cefbac28098d458562ace709baf321f802e4493ebc5f6d25c7e2d5718b5858ca08b02a048e6bb93e35e1c030a20472f1c71afb792732e2224
 MISC metadata.xml 504 BLAKE2B 2b75281f47b4da4fb853907f1149bd594ba38fefd345614e1d58e9aadbfda5cf5ea0d2d8e0176dd6e898d0f48461ca27b899a9f50c1533f3c52014ca55e6c62d SHA512 a162b0e478e92561015939017156b3d7694613305c954eeca0b16a6d9c74590ed2bef4cd19062a4c0dc2df98d5cd41d2f884aa223af63f7f2dfa3309a26dbed0
diff --git a/x11-libs/libyui/libyui-3.3.3.ebuild b/x11-libs/libyui/libyui-3.3.3.ebuild
index 66ac31371916..b3e24c56ad7e 100644
--- a/x11-libs/libyui/libyui-3.3.3.ebuild
+++ b/x11-libs/libyui/libyui-3.3.3.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DDOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}"
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DENABLE_STATIC=$(usex static-libs)
 		-DENABLE_WERROR=OFF
 		-DRESPECT_FLAGS=ON
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 69b2f76de82d..eb766a64165d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -5,6 +5,6 @@ AUX vte-0.30.1-alt-meta.patch 2490 BLAKE2B b5046bea09bb7fee5f03eaaa0c88f88a9e05c
 DIST vte-0.28.2.tar.xz 962340 BLAKE2B 1e4b5977962265be77917ccfc9118ed93232c03d7a16b6c08a27e721fe71f8c1dd1783a439530d7b3d915111cb8cc78281f1e9e351d6a83edd31f224309ca1e9 SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6
 DIST vte-0.54.1-command-notify.patch.xz 3428 BLAKE2B 75b0c22720276300be2e49e8444aa68fed77fb7a6cc6b0e93a5c2d41257626bd60ff1084d68579769cb3d85e7ec567927591746de48e860b138d0c1f24f64cc7 SHA512 a53da569f8168c8e9e21e186dcfc00bf9fdb78a0c767ba35033c1c1e4f836406b4d9bf70ee3e071f6c749fd6f72101a6960d201617bd0bc23021e1eeaac6fd0c
 DIST vte-0.56.4.tar.xz 1100952 BLAKE2B 3c3ec69f4078bdb07a4501df4aeb31aaeb7f9fa5a4631152d486fbb2c950362612cd9dff4abe25b93da6c712a37a20ccbf050ad33d96ec7b997bb1409189f60b SHA512 5a6c79b30f07c1f5848ef59028864d893cc605b9ad8f49ae819958aaed962d2ff96baad379f126381b8bf00015003c5a6dc28c792e4e050ba35090338bd7dabb
-EBUILD vte-0.28.2-r208.ebuild 2953 BLAKE2B 2c03f83d8daa49eaf5c603d0c51c415e26636ca0f1087fe833ce577d5b9e333307c8c2b03b56547df401176b8a7dad22ca6d038d1800712f62feef7d0da7dd8f SHA512 f57bc271c20e7994675aeadba91d00e36efd73d55efb4b7c6c558955877385539a0db28614ad6e1fe19906c60e79b20ce885cb41218bb8c2c4600b2ebd510b0e
-EBUILD vte-0.56.4.ebuild 2279 BLAKE2B ffef98a5788101e4f6ca7ed8c9e29fe7cd4b1c45a4a6d21b846f992384383d84de3cab0b59cfbe471003e19c04ded933b1c6571aac23542dd213097bf1022c12 SHA512 63ca8a7b27932bed7474b75f26d2b229c22bb67bbdbc10963b52a5df18d40f0e0d1b57d889995941b8bb16b2fa12617c3fdb8b43a53b5d4e62961e46a136eb15
+EBUILD vte-0.28.2-r208.ebuild 2951 BLAKE2B e019bc44f99b4700922ebc95f47538d47119ab3a10d4615e42e34b75e9ab99a825777e2152b0434cedc796fd0a9e8079a7d07cb7208417bfd210228f6d52cc0a SHA512 5ec053f35a65755b4f4c20e3f336d6b55bac6148719ce6332d1db55c5e30ecdad185b64e3b5319c9042263e18a0ce89affabb9511702a2f7ff6b801469cd28a3
+EBUILD vte-0.56.4.ebuild 2280 BLAKE2B 0953cab05a36606382b98bd9c42c93a2e65208d975835b24897c51a5e563b9f099194b30ae99d3836fd247bf19f1c9a9149d49f56a1a7e07d4100e80369856ed SHA512 4565bd79500b9b1100f89e9950cb1390e24bd156223328e557b6669d88457dc0b5f8b6020f63d195061d4f5ff00938de7616e876b3a61aed91ba57c77e7b4d86
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.28.2-r208.ebuild b/x11-libs/vte/vte-0.28.2-r208.ebuild
index 3c3c8d2a5661..d4ddb9c31aa5 100644
--- a/x11-libs/vte/vte-0.28.2-r208.ebuild
+++ b/x11-libs/vte/vte-0.28.2-r208.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/vte/vte-0.56.4.ebuild b/x11-libs/vte/vte-0.56.4.ebuild
index afa7f7693a5a..bfb56231f4d2 100644
--- a/x11-libs/vte/vte-0.56.4.ebuild
+++ b/x11-libs/vte/vte-0.56.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/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 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~leio/distfiles/${PN}-0.54.1-command-notify.patch.xz )"
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 3b8f617bd578..b37075e09c90 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,21 +1,9 @@
 AUX wxGTK-3.0-gtk3-translation-domain.patch 454 BLAKE2B fd0b6d6a0c1fe7f1dfbd7692d549dfd6f78c85e25f06e2e44630ca9b3c9dda4c12af2df6e4fcc02de73e75524631b858cc21b9f63b8799b0d157a38bd5541fac SHA512 8cdf57558e8d09e3e0613c25ac7701cce0bf78da13060e2b36167b69b8ae4f265607cb5216a33054f6c0c2f21beba8cc7f8297f4de2b2db1ec9f3f5bb8177ff3
-AUX wxGTK-3.0.3-collision.patch 6299 BLAKE2B 1130b96f32e2abe7109ca84f1cd0cae0a6742f2f96ad905996157e227236deaff64813f892b649adb2b17beb8fa2b3e9b651f7c397960eb6346bb4bc1e50b417 SHA512 e38a7985c750a34f7ed0b3772677b6b6942340c48d3e70a7c1f1851d2933a4d7823c225203a79c8b713f3d6a1bb0c0d0690d5df027674cd826cea300f9b2ed0f
 AUX wxGTK-3.0.5-collision.patch 6298 BLAKE2B 711d7b94b6a0de4bdda21caa2bfcfd799c0d57a8d1d4a820e6da397768b075f415b8e438502167446b3be6b948420d1c1a31c401bd5e7bb2b549e3a95dcccad8 SHA512 62bbf952eac4a3485a2cfa3e6908b2272cb6f47632f17e60f413ad34b64e331423189a31c4259c8283120b4b1351f915e226f5c749787a5c69737779cc9edb59
 AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f031214691fe7d5cd8c283faf9511fff260735d9dcd293e6377be0e96a6521e84ceae4560f2fef8fc7e7ed5642cd6 SHA512 649551eeacc9915f249ece1c3ed79959f0f0129e54373bfbe84ea5fbf2b8e0ba7778d6a22ac6f165e5d4e85a3ea4320274296b1b2a8e623acb11300fe44478f8
-DIST wxGTK-3.0.3_p20180104.tar.xz 84260 BLAKE2B 3840a4a202778b3e7df0c3470945dd8f083b1b18aa69013ae59975b368cec4f5e9fea3bdd8a05a200fcd146c8616d2258f0b2ee389a6457a638201a8534f9a18 SHA512 840c8248d5a689a462d1dcb9d9962dd453473597d10289802728218a881808f594ff799d2002ceb319d2e79b1b7063d59b181d4a0efff7920a2dee9653b40a72
-DIST wxGTK-3.0.4_p20180507.tar.xz 2972 BLAKE2B 431855d43aefac6227925195c107b21f7539ca2709c98f6d6beb7d25dbdf8633c61bb160fb4e5c993e97dbddc37cdf90dc7b09753a312c25b16f79f0207cfe98 SHA512 9caa7ca3b6f15fd70014ccd4008c4fa76f12cb07d3fc58a8f0d2b9a591cf8be3f0eb40497dc757b9d0a04d26f54296aaa8fe693aa601bb1c058365529bb4bc8b
-DIST wxGTK-3.0.4_p20181106.tar.xz 28448 BLAKE2B dbbaaa49cbf03b42089c04d3c6045734f045e5bddc66b72f367f2ba1deed0531280c3bf3db873bf78dd33cee9873e20839ab38b94f90830b48bc1a8122164d02 SHA512 d1bde53b4eac1f8e6785379f99d585c926fd132c709ca134d7c8c3d62a2bcf77059b90f25333aa692932888318dadf464620b0a136341217cae7a2cd2c93ab50
 DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9
-DIST wxWidgets-3.0.3-docs-html.tar.bz2 23803675 BLAKE2B 181305a2b8935adee8d50873665bc094f46a061fe1bcf8521f8a4d5613013d6ad58ce172e56118f3833ce3489ab2e919bbd5482445ce55455e696252bb747d3c SHA512 655efde42e467d1d48d8adb95e2394d90cedca8eb6a54a7d53771d3d2d4d5f72637aea6ea12a4c1f570c3905a458aebea067cd74e184c4c85ca73e49e04282cb
-DIST wxWidgets-3.0.3.tar.bz2 20054446 BLAKE2B ebbe977a59f215fb2e35300aec91ad6d042d099586c4f6624d817c689feae090ff6df5718baa94a79e8e46120a6b4a154a7e9a584e14363e832602841502f0f6 SHA512 dfe53682d7cda1d460f336a890603c4e823078be4b05e7cf43ab36cb49247f702808aa939d9311705bdf5f96eaa076e7a8f77f4415bc07c5bfdc19e5deff1dd1
 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd
 DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
-EBUILD wxGTK-3.0.3-r300.ebuild 5046 BLAKE2B 686dd2de3291981d965c9a30c2a3fd6d883217bd0a91729e6c751462e74022295326ef3d1d23dab5a0ee1b4bcccb627e49a2e6d6980ef62b7cbd26a0a3576c65 SHA512 a41f3ff4af20034a8b4fa6faa7fa8b0e81769d641f4cb6ea214d9f100c1ec6ca99cf30b9218d65118af7bca31a740e44445c28b6801c35044ac9495e25a1ca26
-EBUILD wxGTK-3.0.3.ebuild 3973 BLAKE2B 8b0568a51194423dde783f6767239469d78aab276f36f857979dbdd97c2ba3c0248754fb75fff8567431ab8138ff4bfdeeda8979c111ceaead5586ceef229e2d SHA512 2c486358754ce998fd3357235eb4c628cd36ec8c0129626c0c571f9848a36f1136f1f11a5a9acc4cf1429350f307cbaf6dc1635a248413fe7d7cfeab56acee31
-EBUILD wxGTK-3.0.4-r1.ebuild 3979 BLAKE2B 982ab0b79b36078acea50118a213c1953fb8290476a2a54faf32edd955954d6f9fd22fe0abccc0906121c930993103cffd17e11491908f3e7e079409cdc1a5e6 SHA512 0df4930e67b6c3dc3d20161ef8ff8bac0e046d4dfd65f83e5db0e787788b55b4f1e733dc288c1a4534fb93fed6a00b0ccc8b83fa732c245398129027257cc703
-EBUILD wxGTK-3.0.4-r2.ebuild 4020 BLAKE2B c01fb525d61ffb7de9318520b3902c102cbf1e5e69272773ae615ab6daef59907cbadb291880cd403a6204fd73997bc746897c1b9182713461c261a54aa99c2b SHA512 df124838818830fd94e59f762da4bd24c7bec2e1d558a5f0f26eef7be9f658516c544f4b7c1985e150cf452aa011b39fe0ff629494f033907d54dd67f2d145fe
-EBUILD wxGTK-3.0.4-r300.ebuild 5196 BLAKE2B eb76e91933d3e1c4d287c45e01057ec98ffa1b6319b932c4fa1da18f8a657a9e395135601e9b486434be55f7b26ba206e7f30d0947051016ce8051262cf52b6f SHA512 b37d2c799a516bfb4a31fce5c9471c025680795acad84f977935c6b85e216667af02076ca36490293867431e2227d633740d4579871288977d46e47230cf6007
-EBUILD wxGTK-3.0.4-r301.ebuild 5196 BLAKE2B 5acd5b07b33a893139dbe20d697bd0e4e155d5b936a527853ae35930fabe4581981d891a03814d821434dd20b61b25cf36d514bdd02d91e5f9dcae8b04c789f6 SHA512 e4b9e789f0a333d030e4bf4d7a2ad2142b8092b6790f7106e8b8a9898e694382eb120f432af8e5d09f25522fc9b227bed70b6018cbe55dcae00579dad904b49b
+EBUILD wxGTK-3.0.4-r2.ebuild 4021 BLAKE2B b7498e9c19ff1100ff4354defb166a6dae9fddffc375143a5dffbe2a9a4f089179b6ff9d0351e70b07bcbe18b8f137ce900d82a267df38a4c095d9f05ccb415c SHA512 bbe6309f3bd93713e2fa6cb1d2280a7b941330ad5941588406845cc4eb7dc0a29763eb47808943a690b3b99d3463f85fb28ef3363d83efc90fff6cb2b7da052b
 EBUILD wxGTK-3.0.4-r302.ebuild 5246 BLAKE2B 9b49c08d97448521c72631cb842f03d3fe959cedd0e06245cd325913b54b4242e5b791bd2dd9fc81995ed992d7e883b31c59c154f4de22d5bb1fa306f6a884c8 SHA512 4f6a4e59078a6d6a4bdd7f2841d88f1d1a4cb11995b039618cef0cf21f784e9c8be51770e536fcde9849555cb5345e33da7fd7d9824368bf46e6cfd5020711af
-EBUILD wxGTK-3.0.4.ebuild 3969 BLAKE2B 0a6e3dcdf929e1375cea84c2fe96d2dad9dd8aca5164ddef8398949d60bee8014fdf4864e22c6b68fa279d2a1621d16b07529c273a839b128bdd0757a4a09bb4 SHA512 1a972030ad233e1b8297d8d97e083d046de88db1e56bc161e2d6f8679ea3a58b5ffc1413997bc1c1e0a90e9396fd3cd970fbaa8517c79cf2f7c7e9e6736d6b7c
 MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch
deleted file mode 100644
index 3459e8dc75d8..000000000000
--- a/x11-libs/wxGTK/files/wxGTK-3.0.3-collision.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-eselect/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(DYLIB_RPATH_INSTALL)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
-@@ -16101,7 +16101,7 @@ install-wxconfig:
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- 
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -16109,7 +16109,7 @@ locale_install:
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -137,7 +137,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -125,7 +125,6 @@ distclean: clean
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
deleted file mode 100644
index 4fb40d29f627..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.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 ~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
-WXVERSION=${WXSUBVERSION%.*}			# 3.0.3
-WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:4 )
-		)
-	aqua? (
-		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.3_p20180104/
-	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-	default
-
-	# Versionating
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
-		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
-		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		utils/wxrc/Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
-		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
-		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
-		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
-		configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-gtk=3
-			--with-libpng=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Unversioned links
-	rm "${D}"/usr/bin/wx{-config,rc}
-
-	# version bakefile presets
-	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
-	for f in wx*; do
-		mv "${f}" "${f/wx/wx30gtk3}"
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
deleted file mode 100644
index 12f859ec705b..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.3_p20180104.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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.3_p20180104/
-	"${FILESDIR}"/${PN}-3.0.3-collision.patch
-)
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			--disable-webview
-			$(use_enable gstreamer mediactrl)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
deleted file mode 100644
index cadb5dd21588..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20181106.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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.4_p20181106/
-	"${FILESDIR}"/${PN}-3.0.5-collision.patch
-)
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			--disable-webview
-			$(use_enable gstreamer mediactrl)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 610edd44935f..124c5e3d8806 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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_p20190713.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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~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-libs/wxGTK/wxGTK-3.0.4-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
deleted file mode 100644
index cb5280813658..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r300.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	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 ~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
-WXVERSION=${WXSUBVERSION%.*}			# 3.0.3
-WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:4 )
-		)
-	aqua? (
-		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.4_p20180507/
-	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-	default
-
-	# Versionating
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
-		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
-		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		utils/wxrc/Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
-		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
-		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
-		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
-		configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-gtk=3
-			--with-libpng=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, bug #650118
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-
-	# Unversioned links
-	rm "${D}"/usr/bin/wx{-config,rc}
-
-	# version bakefile presets
-	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
-	for f in wx*; do
-		mv "${f}" "${f/wx/wx30gtk3}"
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
deleted file mode 100644
index 66769f55bf3e..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r301.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20181106.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 ~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
-WXVERSION=${WXSUBVERSION%.*}			# 3.0.3
-WXRELEASE=${WXVERSION%.*}-gtk3			# 3.0-gtk3
-WXRELEASE_NODOT=${WXRELEASE//./}		# 30-gtk3
-
-SLOT="${WXRELEASE}"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		webkit? ( net-libs/webkit-gtk:4 )
-		)
-	aqua? (
-		x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.4_p20181106/
-	"${FILESDIR}"/wxGTK-${SLOT}-translation-domain.patch
-)
-
-src_prepare() {
-	default
-
-	# Versionating
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		-e "s:\(WX_RELEASE_NODOT = \).*:\1${WXRELEASE_NODOT}:"\
-		-e "s:\(WX_VERSION = \).*:\1${WXVERSION}:"\
-		-e "s:aclocal):aclocal/wxwin${WXRELEASE_NODOT}.m4):" \
-		-e "s:wxstd.mo:wxstd${WXRELEASE_NODOT}.mo:" \
-		-e "s:wxmsw.mo:wxmsw${WXRELEASE_NODOT}.mo:" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_RELEASE = \).*:\1${WXRELEASE}:"\
-		utils/wxrc/Makefile.in || die
-
-	sed -i \
-		-e "s:\(WX_VERSION=\).*:\1${WXVERSION}:" \
-		-e "s:\(WX_RELEASE=\).*:\1${WXRELEASE}:" \
-		-e "s:\(WX_SUBVERSION=\).*:\1${WXSUBVERSION}:" \
-		-e '/WX_VERSION_TAG=/ s:${WX_RELEASE}:3.0:' \
-		configure || die
-}
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-gtk=3
-			--with-libpng=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			$(use_enable gstreamer mediactrl)
-			$(multilib_native_use_enable webkit webview)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, bug #650118
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw30-gtk3.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-
-	# Unversioned links
-	rm "${D}"/usr/bin/wx{-config,rc}
-
-	# version bakefile presets
-	pushd "${D}"usr/share/bakefile/presets/ > /dev/null
-	for f in wx*; do
-		mv "${f}" "${f/wx/wx30gtk3}"
-	done
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
deleted file mode 100644
index 2de5b927dc81..000000000000
--- a/x11-libs/wxGTK/wxGTK-3.0.4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
-HOMEPAGE="https://wxwidgets.org/"
-SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}.tar.bz2
-	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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff"
-
-SLOT="3.0"
-
-RDEPEND="
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
-	X? (
-		>=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
-		media-libs/libpng:0=[${MULTILIB_USEDEP}]
-		sys-libs/zlib[${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
-		x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-		x11-libs/pango[${MULTILIB_USEDEP}]
-		gstreamer? (
-			media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
-			media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] )
-		libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
-		opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)
-	aqua? (
-		x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}]
-		virtual/jpeg:0=[${MULTILIB_USEDEP}]
-		tiff?   ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
-		)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )"
-
-PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
-
-LICENSE="wxWinLL-3 GPL-2 doc? ( wxWinFDL-3 )"
-
-S="${WORKDIR}/wxWidgets-${PV}"
-PATCHES=(
-	"${WORKDIR}"/wxGTK-3.0.4_p20180507/
-	"${FILESDIR}"/${PN}-3.0.3-collision.patch
-)
-
-multilib_src_configure() {
-	local myconf
-
-	# X independent options
-	myconf="
-			--with-zlib=sys
-			--with-expat=sys
-			--enable-compat28
-			$(use_with sdl)"
-
-	# debug in >=2.9
-	# there is no longer separate debug libraries (gtk2ud)
-	# wxDEBUG_LEVEL=1 is the default and we will leave it enabled
-	# wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
-	# apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
-	# http://docs.wxwidgets.org/3.0/overview_debugging.html
-	# https://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
-	use debug \
-		&& myconf="${myconf} --enable-debug=max"
-
-	# wxGTK options
-	#   --enable-graphics_ctx - needed for webkit, editra
-	#   --without-gnomevfs - bug #203389
-	use X && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--with-gtkprint
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--without-gnomevfs
-			--disable-webview
-			$(use_enable gstreamer mediactrl)
-			$(use_with libnotify)
-			$(use_with opengl)
-			$(use_with tiff libtiff sys)"
-
-	use aqua && \
-		myconf="${myconf}
-			--enable-graphics_ctx
-			--enable-gui
-			--with-libpng=sys
-			--with-libxpm=sys
-			--with-libjpeg=sys
-			--with-mac
-			--with-opengl"
-			# cocoa toolkit seems to be broken
-
-	# wxBase options
-	if use !X && use !aqua ; then
-		myconf="${myconf}
-			--disable-gui"
-	fi
-
-	ECONF_SOURCE="${S}" econf ${myconf}
-}
-
-multilib_src_install_all() {
-	cd "${S}"/docs || die
-	dodoc changes.txt readme.txt
-	newdoc base/readme.txt base_readme.txt
-	newdoc gtk/readme.txt gtk_readme.txt
-
-	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
-	einstalldocs
-
-	# Stray windows locale file, causes collisions
-	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-	[[ -e ${wxmsw} ]] && rm "${wxmsw}"
-}
-
-pkg_postinst() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
-
-pkg_postrm() {
-	has_version app-eselect/eselect-wxwidgets \
-		&& eselect wxwidgets update
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index e434794a7f3d..afc6578fc8ac 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dsx/Manifest b/x11-misc/dsx/Manifest
index 7e29b005aec4..adf96b94052b 100644
--- a/x11-misc/dsx/Manifest
+++ b/x11-misc/dsx/Manifest
@@ -1,3 +1,3 @@
 AUX dsx-0.1 2218 BLAKE2B dc20fbd18c0fe455a704cd0384e9d310e5f3b378842a196de5d0969b844117a1444fbe0bb04c2f2a6e698216a0eff838a95052333601befcbbf755bb825cedc6 SHA512 918d05297dc39166fe1684b306441c519bdf41e56a94d4a5f090698f69fdebb1f4d077d07be4e6d5a22614f163eb4ff8645c8751397ba52e265daece840178a9
-EBUILD dsx-0.1-r1.ebuild 516 BLAKE2B a63a5f1a782c741fcb431374a923f5251bab4284bffc733dfdcef91c5d71493f69ac42aad5283e80628867c3b67f3838e1871b0eaecbb76d76a2df7435404454 SHA512 212fc9f5f553792a7dfb24b0d879178b74a20ca636f073e92b45117b559f23ec23b5e7d99cb5af0b0dd3ca810658f2f362b2c339d9d8378bee2a00d0e987e545
+EBUILD dsx-0.1-r1.ebuild 533 BLAKE2B 8ebdbe744ee52741f0a75479a9672d600ac5437b2174a69afe499cd785e78d52aa78318fe80e48128a5b287996615252943a10e3667807f6f205acff1e579e3c SHA512 9ca29e2f8b0ffb78dd0d014127e2104d106ebbe013848ca628cd0c38baff85cec926486df634d24321953047d7d3ff22eb7c7406fc0192ce0b3aa2b89c216f61
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/dsx/dsx-0.1-r1.ebuild b/x11-misc/dsx/dsx-0.1-r1.ebuild
index fe4368e5c75d..a82b09375705 100644
--- a/x11-misc/dsx/dsx-0.1-r1.ebuild
+++ b/x11-misc/dsx/dsx-0.1-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1
 
 DESCRIPTION="Command line selection of your X desktop environment"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
diff --git a/x11-misc/easystroke/Manifest b/x11-misc/easystroke/Manifest
index a7182f46045c..8dc5c8169d1f 100644
--- a/x11-misc/easystroke/Manifest
+++ b/x11-misc/easystroke/Manifest
@@ -1,7 +1,7 @@
 AUX easystroke-0.6.0-abs.patch 1246 BLAKE2B 3fe3e984d8119198de364d4b65adc6368cf2ba94a5744878bc52c9949488304b2804ac5cf835a1a0cc77d4323778eed91310e3827b9797b4bc4020477e753116 SHA512 80596ce9fa22e880f7e41dd3574513005252fa1f2c74eb53ab7e1d3cbcd973a4bf35cdc76bfd9770a161551209cbb78677b572410a36cdc5c9075a601a809ae0
 AUX easystroke-0.6.0-buttons-scroll-send.patch 1431 BLAKE2B bba629d5d54c3544bb1564474812521587ef05c9ecaedce51dcecacf74e263602095e0e64f1961bb67c5640e3a86eca7369f46c5aabf82a919f4563bf25c7f89 SHA512 f8a862c450c665db4409d9abb07687fac5fac182a8f36038c795eb25a0cf732e0ccc3e589ae6c6eb65bde9a4f4cbd680f267734d2a65b301d1c8e7fa078dfcff
 AUX easystroke-0.6.0-cellrendertextish.patch 718 BLAKE2B 98856aa9e0cb70ffa0fb28f429a714f4caa732c18d4e16143fa2d63bf3f1ab70bf2329bb4eabccd1249e1bd09a435d37e18109bf0edfb0e9e6ced712fbe088a1 SHA512 2feacef4d9b1707dd1e20a2e84b78313744bc9ce9b2a7d0070cab47b691ec2cfd1e1616aaf1c30a722ae5ecb16c230b6a647965da4194f2700262977eedb8b9f
-AUX easystroke-0.6.0-cxx11.patch 748 BLAKE2B c6dd91ac07693d26c79c75c4cd323a9c3158e999bd34e2e034c1e0b05be845d224a8e412e4cdddde95f4aaba1906c4b157d72f83ce2a69f33b4e0a55c1957c5d SHA512 e16229a595dbad028665b967b8ee7a3c27860fa33e3fc3a40e2e7657e5d69338bde571f8526431ec1044ad59f1aaf65f66e294f38d735d932a7386a19d8f55a5
+AUX easystroke-0.6.0-cxx11.patch 529 BLAKE2B c56d9d2c342019bfd7f32835d19f28958d910e956f782e506c0297a339474d95d7ecb7b5fd68b11fcf128a1e0227b08f723d6b426b66b4d8a76d94137fda2d1e SHA512 719254e530e7f3de2e55ad28d4c5a6a5e817de243339813748001222b19c7266a623f3fbddca642859d0cbdef8a7dcecac53961c259ec539b4124035f2b8a101
 AUX easystroke-0.6.0-desktop.patch 294 BLAKE2B 090d292720cb8168896b57011369a42ca9d32e805a19ed21bdca45023f64eedf5e06c2618dfc954a3d40d5f8476555837c64e0c3137b414b95de3925d4fa9504 SHA512 082b353b21fdb7754a3b94519a426f69c67caca32977657bdc09ca158d783612a454b2fc08949cb9cb2ee2d1c3ce07d6f7915e782f50c3829f456e31f6330471
 AUX easystroke-0.6.0-gentoo.patch 1672 BLAKE2B 5ba245c95108e3f8025f371165dac2256c0bcefbdf20024b722fb97c2634840398e38c7d8c171d84f8357c81c2d31aee6b6ffdd7ba7448aa77825a87d4ff68d8 SHA512 e44b7d01506242985ec2b53d4f267425d7877649d4ca734ade93a68b9d52b03af1cf7fc9eab81617d2459cbe27eb88f4f82754416a910fc01e1b0de9b34486a8
 AUX easystroke-0.6.0-reinstate-signal-handlers.patch 1070 BLAKE2B c994676a92954c90f093ba1b466a2c8bdf42846b3df3d7547852fdc4f23edeee95d259c969b70006ac86934b290c5b649afa86e25b96d2445e1fd36bdd5c454a SHA512 9cfe216ecfc2148e22d2a91f25b294bde2f7933e912f2ede86002679763e0a6eb14bb3f1182fd07156d103baa4bef4434e45b27ae3753c31758524c680665572
diff --git a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
index b628d1b14d34..8619e8e9fbdc 100644
--- a/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
+++ b/x11-misc/easystroke/files/easystroke-0.6.0-cxx11.patch
@@ -1,7 +1,6 @@
-diff -uprb easystroke-0.6.0.orig/actions.cc easystroke-0.6.0/actions.cc
---- easystroke-0.6.0.orig/actions.cc	2013-03-27 17:52:38.000000000 +0200
-+++ easystroke-0.6.0/actions.cc	2015-12-07 22:07:17.720041171 +0200
-@@ -51,10 +51,11 @@ void TreeViewMulti::on_drag_begin(const
+--- a/actions.cc
++++ b/actions.cc
+@@ -51,10 +51,11 @@
  	context->set_icon(pb, pb->get_width(), pb->get_height());
  }
  
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index c292377071d1..1b39c8054657 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,4 +1,4 @@
 AUX idesk-0.7.5-glibc-2.12.patch 544 BLAKE2B 460044772e452f1b583513c8926e99d1021e80a3906cdcde918f7177da415ac9d898d2097088d37a223b424444d25d3e0fadac489549a85ac1b1a812525fb16e SHA512 f21f419d7facc62990a35b67e57bec2f9b46c76a6026a267348edfbd0207c14682cf1a3b8ca0ab4d508668a0c4dc9cc8ad06921b3218f077225bafc3f1ae9fc6
 DIST idesk-0.7.5.tar.bz2 185858 BLAKE2B b1cc2e423ff7f9f9db12fcfd46c0d9b03e29ad6b4b44f79ab6fca76b356b7df798532261364e30991dfacef9d377b69bf3dc9b5f44baf817b44629eb3805f3e6 SHA512 42c15cecc6e2cf6546420542fc4480902fd33c26c19ffc32e65eb04d09116d3b80f5539cde4ca86d4bec30ce96417752bfe7416ec83c531235d9064d06ec0475
-EBUILD idesk-0.7.5-r3.ebuild 772 BLAKE2B a612ee88d3ab007ca4ae66203fa5080905025ff9ec404e278b55c3d8d397a1524e890c52c51a66c1f52618d0a31ff41a809bfcf555a650601ef58c0e48d4e010 SHA512 b39fd400fed81186612c255c1508ab52947e578e4da9ca81839737c9559c752dc9dd77ec04a6313ecdf78b760b231ca48a7bbb7d907f1f43a5dbf3f6d22d6974
+EBUILD idesk-0.7.5-r3.ebuild 770 BLAKE2B 4e21319d663f3ac90702593679d7108f00bc04304874bd97f66883cea485316203ec05c22c8e68e9b375e00dbfa09e30456020bd63bba98722e54e8238ff6959 SHA512 37135af52eeedbc2e60a979d0a53b9f9ff966cb8a5310f8acfe1f03c6f7ffa2f470154b564de2e20f9543b6c1be399be18d24c09890a5738ce26f24e10ca3171
 MISC metadata.xml 351 BLAKE2B 057803e3853f27e027d449303e5c8a326d453e0d6d701946bc008dd34581e5cfb037b79c0c0eaf44f48ade1d65e88ba84affc5ad643e42a0339b29214a5f26df SHA512 038678d7cde9b7ec4365e763f7a5759a36eb125b7852d9e110f31e1737ee04c1043c73dee482f998c4284176f8d46cc7ee8a1a2e044651e9945e56d6523c39e2
diff --git a/x11-misc/idesk/idesk-0.7.5-r3.ebuild b/x11-misc/idesk/idesk-0.7.5-r3.ebuild
index 6969b99b185c..3a6373426c22 100644
--- a/x11-misc/idesk/idesk-0.7.5-r3.ebuild
+++ b/x11-misc/idesk/idesk-0.7.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 01a3a0b11eee..6a6e4d92d404 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -1,7 +1,3 @@
-AUX mugshot-0.4.1-missing_default_face.patch 782 BLAKE2B be9ef8633839b505c37ae13430ebca92b95a0632fed667c49b5885cc393ee0bb6743453e9e5fa621959113c43b87590842e56d735f8666533bb22a6522606027 SHA512 5abb02cd511482c3f32e56a7f121bf6cce102dab7dfee196a105ff5ed2cbf3d9ee3f20f0d75eecfe192d0c16603dd80555fcdc872cc85bffa74de7d0bbab79b1
-AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b271e7f23d5df99a4db3246c37f7d108640a1d18bb6a8185f1e1bdd2f31bba2cbc62fc4d39df5172edc72e3142dd3954afee329 SHA512 488f99fde5c09aa2e15bf9b78bb19b6e244476a1b0e8053f3af5e0e6ef70febbc92d3970f774332dd961af7893e29a5fab7cc7e964d24ffc46d67c9567e2579c
-DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
 DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
-EBUILD mugshot-0.4.1.ebuild 1379 BLAKE2B 37f3ac78d45003c6ea1ff7ae2962df1b8570bede4855fb3c31dd3e3efd7f62b111b23ee84277ebb1648d9b2e996231b9897c38e2d7c3a3f4b7808bfcbc3807d6 SHA512 d17b643af0187e52ab4749c0e02059f4b814ac6ab6adeb3401d0574c8137fb7568df8e4966d522cc79b8a695d0c4039b997b90ac4fb5bd0dd9dc6133b9827ae6
-EBUILD mugshot-0.4.2-r1.ebuild 1535 BLAKE2B 350e700b586efa542926143101f4fe664125faf7fff5c4b0900219ac0542a2dbe70e09f1278eb40a9f168336a0bb41f9dfe4e67bbc8ddcd49dc0fc9e84e29efc SHA512 d452547817dafd12c8c51eeef333969ddb939ef55af28e689377ea87a1c64939eda40dc483c92343f8e4717f829df341f95706809a9239833ace3e79cbd25f86
+EBUILD mugshot-0.4.2-r1.ebuild 1534 BLAKE2B 9ec842e924950051e7e65eea7c10afea40fe9802e69fad07098e78b76c179908e177fa1f7326b68813ea3f573892326f660b5899814b517a37629c547502dcfe SHA512 44934fa75f7554eac3a914742ce8d08003a8f17583dc7d2eb14cd66059d86bb3fc697ea60f95f50dbba8829154edb01586f5d53307d4f3bed560c9bff038267c
 MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch b/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch
deleted file mode 100644
index cc504d667af9..000000000000
--- a/x11-misc/mugshot/files/mugshot-0.4.1-missing_default_face.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/mugshot/MugshotWindow.py	2018-08-08 11:22:42.000000000 +0200
-+++ b/mugshot/MugshotWindow.py	2018-08-15 22:48:39.998699923 +0200
-@@ -256,10 +256,11 @@
- 
-             if os.path.isfile(face):
-                 try:
--                    if os.path.samefile(image, face):
--                        self.updated_image = face
--                    else:
--                        self.updated_image = None
-+                    if os.path.exists(image):
-+                        if os.path.samefile(image, face):
-+                            self.updated_image = face
-+                        else:
-+                            self.updated_image = None
-                 except FileNotFoundError:
-                     self.updated_image = None
-                 self.set_user_image(face)
diff --git a/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch b/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
deleted file mode 100644
index 07c2003f50d8..000000000000
--- a/x11-misc/mugshot/files/mugshot-0.4.1-use_office_phone.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/mugshot/MugshotWindow.py	2018-08-08 11:22:42.000000000 +0200
-+++ b/mugshot/MugshotWindow.py	2018-08-15 22:47:02.108700297 +0200
-@@ -617,14 +617,18 @@
-         # chfn 2.29 uses "-p" as parameter for changing the office-phone (LP: #1699285)
-         p_command = "%s -p \"%s\" %s" % (chfn, office_phone, username)
- 
--        # other (newer, older?) use "-w"
-+        # other (newer, older?) use "-o" or "-w"
-+        o_command = "%s -o \"%s\" %s" % (chfn, office_phone, username)
-         w_command = "%s -w \"%s\" %s" % (chfn, office_phone, username)
- 
-         if self.process_terminal_password(p_command, password) or \
-                 self.process_terminal_password(w_command, password):
-             self.office_phone = office_phone
-         else:
--            success = False
-+            if self.process_terminal_password(command2, password):
-+                self.office_phone = office_phone
-+            else:
-+                success = False
- 
-         return (success, response)
- 
diff --git a/x11-misc/mugshot/mugshot-0.4.1.ebuild b/x11-misc/mugshot/mugshot-0.4.1.ebuild
deleted file mode 100644
index b64746d894fc..000000000000
--- a/x11-misc/mugshot/mugshot-0.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eapi7-ver gnome2-utils
-
-DESCRIPTION="A lightweight user-configuration application"
-HOMEPAGE="https://launchpad.net/mugshot"
-SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome libreoffice webcam"
-
-RDEPEND="dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	sys-apps/accountsservice
-	x11-libs/gtk+:3
-	gnome? ( gnome-base/gnome-control-center )
-	libreoffice? ( || ( app-office/libreoffice-bin app-office/libreoffice ) )
-	webcam? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-good:1.0
-		gnome? ( media-libs/clutter-gtk[introspection]
-			media-video/cheese[introspection] ) )"
-
-DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	dev-util/intltool
-	${RDEPEND}"
-
-PATCHES=(
-	# Both patches are taken from Arch Linux
-	# and adapted to newest version
-	"${FILESDIR}"/${P}-missing_default_face.patch
-	"${FILESDIR}"/${P}-use_office_phone.patch
-)
-
-pkg_postinst() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
index bd4ac251e3f1..c547ba1e9538 100644
--- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/bluesabre/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome libreoffice webcam"
 
 COMMON_DEPEND="
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index e384ff4e1104..549aa3373a3b 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,4 +1,4 @@
 DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
-EBUILD obconf-2.0.4.ebuild 803 BLAKE2B 026c0b16d24f3fdd2bb96b30028ec13058abc73d7cdb54cc243e8bd988e9576a524794e13d6e6d688a06885cec376ddb8c29818d9427e24febc834b6b3eaa4ee SHA512 60627587db8700ab9cdc3adb0c5085ed326d2dfa4b7b742017f06b39d67b16c007b15c16d2b5bed3913dac46f4b5f2d41ed49179107173b5f5c56939720cbf1d
+EBUILD obconf-2.0.4.ebuild 801 BLAKE2B 03caf8e6fea52bc769e80ab0042a650cd45c67616c9b4a4f2413a45040ca3395335510e40f978c5cdee3ef98471a5da45f929e463a7738f54a5083097da4a2eb SHA512 78f43c0b91bd1a7bd364305c5d9d5c139e0e3497fb6e43cc8cf9c4126c2a616fdeba19491dd2234497c150487288c892a1b747f6ef0b8a705cdcda6834b530aa
 EBUILD obconf-9999.ebuild 767 BLAKE2B 83d6d4c188108b33926b8afa8f1115a00dff7fb0ac2d3f4ccd94f0930567305ca2bd626f5159ed5e0683a6b2619e9bf6b0c6f563268a7db6be2bb218a861a364 SHA512 cc71a7f24edc705f8155ddc52e368027beef8bce3f5abc063ff1a7a6f71e8baa0bdddbcd66d95a79be6a64b682d27b8aa607771bd6ce90abbefaf667072cf71c
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
index ee142e7660bd..ac99cce34b26 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://openbox.org/dist/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux"
 IUSE="nls"
 
 RDEPEND="gnome-base/libglade:2.0
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 7b1ebd40a110..43bd76eca836 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.24.tar.gz 403557 BLAKE2B 1b1b0ceafaaf757fa06a4c9637b4efcec7315662b55e61812af8100048832d5f104f11f36dbe9cbe8e9fd7bc8b8f6f5a0e0a5398aed38b35b249ba47b5418f31 SHA512 4e3aebc314498ba0ebe740455c2cf179715e65cfa72ed690d0d44fa9c2a8c3cf17b5785cd1163481afb8232fbb5e22d47ba60d95479472feb56fcf6e6b1b1eab
-EBUILD py3status-3.24.ebuild 723 BLAKE2B a4fdd260b5153ca22d22a456a6565e74bca40196afe4da5a6eb24f2240c08b97ff22f2bac2f704a0cb45bacbe931611ca0bbb87d8921ceb71448777c7d3b6967 SHA512 3d13a14382b80a7c1306de839a36c18822f6982860f9fe9bd342424a632d83ec818411b933087b3fb06e23beceecea0baf2c4d278e707f33377d3b959bfb476b
+DIST py3status-3.25.tar.gz 405276 BLAKE2B 9ff163f8ff037eedda29e7479bc637c9e3ddee1edb0848bdb61b32702ad8855745340beca7f5895612209d05bae838ce71a17521ded50cb61f2516669b740009 SHA512 114c510fc3126256af49f9fd7a141ebc86fe8306cf10094c1c9e9980757bf8f23e0ddb131d54aaa8acdcb5b98f0a230e9c2f0584ea09a68b779be5b66bc865b2
+EBUILD py3status-3.25.ebuild 719 BLAKE2B 56da3c804b99364042d91fbd5bf4c028452e27b1d65042529fe283fe9e6e43e54ad8f8595e64695d217c7cd21bc6bf1ea88debacc1b3e26d4d035f8dc974ec26 SHA512 1086f878fd00553f9a82f0358d8298b425526c9d37cb62a95c794d62fa7b243ea7e7c09b5d1824bdb3cc35f54b26a1ba8aea335d4e4c0622484b9515fbed8316
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.24.ebuild b/x11-misc/py3status/py3status-3.24.ebuild
deleted file mode 100644
index 9a663f1dbd32..000000000000
--- a/x11-misc/py3status/py3status-3.24.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-
-SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-inherit distutils-r1
-
-MY_PN="py3status"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="py3status is an extensible i3status wrapper written in python"
-HOMEPAGE="https://github.com/ultrabug/py3status"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gevent +udev"
-
-RDEPEND="
-	x11-misc/i3status
-	gevent? ( >=dev-python/gevent-1.2.0[${PYTHON_USEDEP}] )
-	udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/py3status/py3status-3.25.ebuild b/x11-misc/py3status/py3status-3.25.ebuild
new file mode 100644
index 000000000000..9b33b20bb0f9
--- /dev/null
+++ b/x11-misc/py3status/py3status-3.25.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+inherit distutils-r1
+
+MY_PN="py3status"
+MY_P="${MY_PN}-${PV/_/-}"
+
+DESCRIPTION="py3status is an extensible i3status wrapper written in python"
+HOMEPAGE="https://github.com/ultrabug/py3status"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gevent +udev"
+
+RDEPEND="
+	x11-misc/i3status
+	gevent? ( >=dev-python/gevent-1.2.0[${PYTHON_USEDEP}] )
+	udev? ( >=dev-python/pyudev-0.21.0[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index f5bb7d1615c6..12a4958f5df6 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -2,5 +2,5 @@ AUX revelation-0.4.14-gnome-python.patch 925 BLAKE2B 83bf8889d0de3a6d6077929ef76
 AUX revelation-0.4.14-random.patch 2127 BLAKE2B 9fa01845124172e9544679c144cc49f23104aed615a1e1087f7f6b63051027136435ef51e8ac794c78c7e554211a5f125a4641e9572c52a1279b8eaef3170738 SHA512 be5e805e58d04c0be29ad9c30a6aa867a869a4d0a8df31ce234fbe331d0191cc3bf7b82e11ec6a7c1c8306b68ddbc5ed29d9f5e8c9e3838b293896adb69c5d13
 AUX revelation-0.4.14-xor.patch 1874 BLAKE2B 44b4e6b6f1323201818c55ecedb464304dc5265a7d356224dff41021554f8611f05fabc2fc353bf7a43b7bc4e2afe32f16c7b57ef30539abeb307de50f7b270d SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc
 DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145
-EBUILD revelation-0.4.14-r3.ebuild 1072 BLAKE2B a0411524eed3e218ed385323826e86e9b4e113d93fa3158b3be3412770b772ee92e0d0b11781ab13517a7cefab84c79c9eebf9ec52c6482a617dcb8778868315 SHA512 f1dd8e89467500de3c40399f0de4af478ec0572d58210a992e63ed0ce224383554d45fba20840ac655da6c38c8ebc946758d07da7b836ae0de655f5f70892049
+EBUILD revelation-0.4.14-r4.ebuild 1136 BLAKE2B 0fa578d41b7eaae6aab27e8d5784633d67b73442bac3d7e2e56a6991c541244fc8b7a452fd53a75811455c7b6c82acc98c7a4cbfd9ec38ea43419071376b3509 SHA512 14c7a4b4691ab3e7a4e9c6e5d8a29b11b4c518ad155f181477a0daa85b03f9ffc91b7ffe61bfbb845d2fb1790fc14b7e6f836784f8093761ce2405cedf3c8a69
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-misc/revelation/revelation-0.4.14-r3.ebuild b/x11-misc/revelation/revelation-0.4.14-r3.ebuild
deleted file mode 100644
index 8c636fe6e57d..000000000000
--- a/x11-misc/revelation/revelation-0.4.14-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 autotools gnome2
-
-DESCRIPTION="A password manager for GNOME"
-HOMEPAGE="https://revelation.olasagasti.info/"
-SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sys-libs/cracklib[python,${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-random.patch" \
-		   "${FILESDIR}/${P}-xor.patch" \
-		   "${FILESDIR}/${P}-gnome-python.patch"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--without-applet \
-		--disable-desktop-update \
-		--disable-mime-update
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/x11-misc/revelation/revelation-0.4.14-r4.ebuild b/x11-misc/revelation/revelation-0.4.14-r4.ebuild
new file mode 100644
index 000000000000..704d9967b80e
--- /dev/null
+++ b/x11-misc/revelation/revelation-0.4.14-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 autotools gnome2
+
+DESCRIPTION="A password manager for GNOME"
+HOMEPAGE="https://revelation.olasagasti.info/"
+SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+		dev-python/gconf-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		sys-libs/cracklib[python,${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-random.patch" \
+		   "${FILESDIR}/${P}-xor.patch" \
+		   "${FILESDIR}/${P}-gnome-python.patch"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--without-applet \
+		--disable-desktop-update \
+		--disable-mime-update
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/x11-misc/tintwizard/Manifest b/x11-misc/tintwizard/Manifest
index 850704a94e41..b0aac606db52 100644
--- a/x11-misc/tintwizard/Manifest
+++ b/x11-misc/tintwizard/Manifest
@@ -1,3 +1,3 @@
 DIST tintwizard-0.3.4.tar.gz 22918 BLAKE2B f634926017d06bbbb6d288da327603255a7b5acd85b6ea4681be3a08747020b1bf63dc7c9216126412fc9ac333734dfb7816ee9ce62db45d1336dd6ef69fd0a9 SHA512 e67f6cf7db4a34d344104b2795491799ef72365b76b65eaef01595fa2a624e219ed852a9dbbfb6221bec7b9028fdbd487bc7c1d82653466e1ff2a7b38ba4e27d
-EBUILD tintwizard-0.3.4-r2.ebuild 631 BLAKE2B 6554f39efa724348d86f1351b03b3943230f3b8c7177fca1e7fc21d35ff6f3f33e8cc4996c5f1d5639b90fa34765c0731a39fbb476216ad895e4dfd224f34763 SHA512 3c82996428568b1fd24e261e25ff23744edcca480850ce0f6b9995f6a640233f824a41556d5a90d27a1d56d97f9f975325af4e869426bdc5839c542e0135e2d9
+EBUILD tintwizard-0.3.4-r3.ebuild 664 BLAKE2B 4f7c875d7fb2124ec609b5b09e8f4d62cf1e85a9676f35a966f0de3806531d69412563d869cddcd2b15bd0d29130118e782f0fc87f2c082f44c12f077a1e1420 SHA512 84b8101db848721be2e9861b80ea6404720dbed998119d328df18072085354d4bb0c098c2843e8b09d8349d22fcfca24c395eadb438862eb48b1972b6d7c57bb
 MISC metadata.xml 530 BLAKE2B 2208af0c2907746170146056abfc38aef3c3fcc7374a3e021ae8468e37fe7c4884559b5c3d940feaa314e8b2de8cb476b263d690c2f7322f2a144628b4af8c23 SHA512 9e3759be90e5523b50f9626399cda039c992025d693628c02a1c356bac2f1b2c92a9e669df4d54f3f89ebca38b41c39182ac655cbf3dede1d9d28ecc9cef9a6a
diff --git a/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild b/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild
deleted file mode 100644
index cb32eb555eaf..000000000000
--- a/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="GUI wizard which generates config files for tint2 panels"
-HOMEPAGE="https://github.com/vanadey/tintwizard/"
-SRC_URI="https://tintwizard.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	x11-misc/tint2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}"
-
-src_install() {
-	python_newscript tintwizard.py tintwizard
-	einstalldocs
-}
diff --git a/x11-misc/tintwizard/tintwizard-0.3.4-r3.ebuild b/x11-misc/tintwizard/tintwizard-0.3.4-r3.ebuild
new file mode 100644
index 000000000000..d854ab98fff7
--- /dev/null
+++ b/x11-misc/tintwizard/tintwizard-0.3.4-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="GUI wizard which generates config files for tint2 panels"
+HOMEPAGE="https://github.com/vanadey/tintwizard/"
+SRC_URI="https://tintwizard.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="
+	${PYTHON_DEPS}
+	x11-misc/tint2
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')"
+
+S="${WORKDIR}"
+
+src_install() {
+	python_newscript tintwizard.py tintwizard
+	einstalldocs
+}
diff --git a/x11-misc/wbarconf/Manifest b/x11-misc/wbarconf/Manifest
index a452fca885df..cc544d1549f2 100644
--- a/x11-misc/wbarconf/Manifest
+++ b/x11-misc/wbarconf/Manifest
@@ -1,5 +1,5 @@
 AUX wbarconf-0.7.2.2-install.patch 2843 BLAKE2B 5d794bda0b1ee7f4ed2f2d7bfc26ad7a9d361260bc2e828d236f5c8c2c949e5335aeb70267a470d4d8838fc7cdc3751427b016695796f6d3f15b8070748001b3 SHA512 496392ec3236c4330f4c2d09ecc29a5dd0dc89a40adacbb3b27c4dce4b7170e05f22ca083fb10d045cc21253f5e460ba4a73e632d68056df3fe64ea8fd954c7c
 DIST wbarconf-0.7.2.2.tar.gz 764073 BLAKE2B d2dbd517d31332179fef612b8a6dc863976e27eda18e27f917f8e2cc7c9a3cfe9499e82fc6ada8f36491454dc57fa56dc43b7b62bb358aaa69f358ed3d51aa82 SHA512 9be4fe4ccceb8432d601806e4e10c19d4072502b63648e1111537e8a693a64d78f2a08f12598bd7ab0b356a1a24ccf138bcd893cb0cccb5bf7fbf80caf9d9eba
-EBUILD wbarconf-0.7.2.2-r2.ebuild 767 BLAKE2B 4fe1efd267816b2c081166f66da5b603d6ef35d4206a5dfba44522085814f69a5cb48f3f69c45a594651e513f37d724b0d326dca114e83bcb22da24474fd2559 SHA512 522491806c81ee6942881b0998da7be66e646c3e070a75b5224469f8b2136b503f49d9f0bf0e547dce174c6419cc03c565b406269d44b05dc858c7ec87eec879
-EBUILD wbarconf-0.7.2.2-r3.ebuild 844 BLAKE2B c59ac072c034cc975924f509681f7bd078f691015c5e1705a3b3ebd55ebd9f566362ee53a6c1448f15f3b2c4c44f2007280dd5aa09811e676bfe7aa6c86fe60e SHA512 46924c9c15a9fb93f59bdbf4ed64f1e45a149edad4c112151b6eb50dbc5a871d84a6a660c698df96ee8bf66000c3b1688e49797ca7cc90c1632bfc46c849de99
+EBUILD wbarconf-0.7.2.2-r4.ebuild 807 BLAKE2B 58ddb54c829aa9c224234a3651e95391defa3e1680fcf89b2be09b38389cfaeaf0305edddc392458f5e24b9e9842c798071db74aef6a6ec7542e01c5cc68c4e6 SHA512 91d91af4c0844733018a6606f4927e5becd773dba3406c4284d9675c3e1d23dfee1e070c48420265d95b6dc1f6f13b80556420329882ce3cb147c99c21187fa1
+EBUILD wbarconf-0.7.2.2-r5.ebuild 885 BLAKE2B 56f16792d5d4d8701c3150c82990b7efbee31bb1e706fa03d70d798337692087d2cdcbad2bb19dfb03fa66d5c5e4fa6dc7c696e1d7b2b731a07bfd434747196d SHA512 351e21813d6e1df69ab5d7c48e4f179a3c6279c94af9451a25437f3c7f8eb5342741a34acdb247e06dabd5e3c571abab79e3db3c904df3e2284eedf7bdece59c
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
deleted file mode 100644
index d5ff90ab324e..000000000000
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Configuration GUI for x11-misc/wbar"
-HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
-SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=x11-misc/wbar-1.3.3
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}"
-PATCHES=( "${FILESDIR}"/${P}-install.patch )
-
-src_compile() {
-	python_fix_shebang wbarconf
-}
-
-src_install() {
-	./install.sh "${ED%/}/usr" || die "./install.sh failed."
-}
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
deleted file mode 100644
index 2c5f19167c25..000000000000
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Configuration GUI for x11-misc/wbar"
-HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
-SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=x11-misc/wbar-1.3.3
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-install.patch
-)
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	python_fix_shebang wbarconf
-}
-
-src_install() {
-	./install.sh "${ED%/}/usr" || die "./install.sh failed"
-	if [[ "${P}" != "${PF}" ]]; then
-		mv "${ED}"/usr/share/doc/{${P},${PF}} || die
-	fi
-}
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
new file mode 100644
index 000000000000..3caca84352cf
--- /dev/null
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Configuration GUI for x11-misc/wbar"
+HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
+SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext"
+RDEPEND="
+	${PYTHON_DEPS}
+	>=x11-misc/wbar-1.3.3
+	$(python_gen_cond_dep '
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')"
+
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${P}-install.patch )
+
+src_compile() {
+	python_fix_shebang wbarconf
+}
+
+src_install() {
+	./install.sh "${ED%/}/usr" || die "./install.sh failed."
+}
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
new file mode 100644
index 000000000000..91921185ba32
--- /dev/null
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.2-r5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Configuration GUI for x11-misc/wbar"
+HOMEPAGE="http://koti.kapsi.fi/ighea/wbarconf/"
+SRC_URI="http://koti.kapsi.fi/ighea/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	>=x11-misc/wbar-1.3.3
+	$(python_gen_cond_dep '
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-install.patch
+)
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	python_fix_shebang wbarconf
+}
+
+src_install() {
+	./install.sh "${ED}/usr" || die "./install.sh failed"
+	if [[ "${P}" != "${PF}" ]]; then
+		mv "${ED}"/usr/share/doc/{${P},${PF}} || die
+	fi
+}
diff --git a/x11-misc/wdm/Manifest b/x11-misc/wdm/Manifest
index 1b72349d5915..9981c106ecfc 100644
--- a/x11-misc/wdm/Manifest
+++ b/x11-misc/wdm/Manifest
@@ -4,5 +4,5 @@ AUX wdm-1.28-remove-fakehome.patch 950 BLAKE2B 127755e61a73772d20625c32e9263f386
 AUX wdm-1.28-terminateServer.patch 422 BLAKE2B 6d85344c1b045a8dfc206c6b0b4f5375be3d62fcb69335c628e1d63b131d62cf54784a9f84a27d49e7ed1c0aa48982bb4c5fa95249bfe6e0203991e1e6c0b381 SHA512 f00685ce1ff38f34df57864d05dd52b7148d27a81177f2c560157a470b089bd9b981ae73bcc6da8c1995822d8b74c6dffdb6166dff33adcf4cd4daa2bc9dc8cf
 DIST wdm-1.28.tar.bz2 381522 BLAKE2B 72105e949c5bc8043967f5b36838c171e32728a40d2ef5f6fe618b04337e3f37329696a7f9f1cee591bf1a037de4ca4168f270a316375e27fd7ce0c919880833 SHA512 393ace12d3975e978c05b90be691a7c27921e7e2db0bdef5f4fe06b324da56edea4936200dc123130c6de9e45af5dac6175559d641957fec104d66bad67c03a1
 EBUILD wdm-1.28-r4.ebuild 964 BLAKE2B b2714b4eb0a0ab4316d3b2d2d6700c1cd8262346494aec00db40b7ddb9bb037cd289ccdaf64c1db612cf7b67ce6fb16f59acc86c248ba2bc61b40f9056e9915e SHA512 9a0df70e77c7d40681cb44291f0ba2132a00ccdf90ebe430f62896ae65cca766d31d921b5d8d2f9b0d540a7caa08c4650b1a2684710fe56c00e307540833df6c
-EBUILD wdm-1.28-r5.ebuild 1139 BLAKE2B 095ce6dfef68e23c0df67a6c407b72219a4f5dfca5e15454d24b3204798061012e60c84087c0c587871472f41403adc6d15f4aef09986333b8ac01bd6b45da2f SHA512 69ef29063c09cf477ffb0625cca76cb904c37949f6e286dbd371d023a1870a229f9baacc16cd1ffce427c79eade9db658358ea44309b5e52b3217ffe6b94c28b
+EBUILD wdm-1.28-r5.ebuild 1137 BLAKE2B 86d6821c182674a55f4675c4c242ef01a2c1b116cc835c9502a53fe26cda5db09060a16667cd5f59a94d06277665585de7c1ee8eed8dae30aa6eecc8ca0974c2 SHA512 51eb29bdabf8090de9223993fe36cafc7787880c92c5daa14421b78cb0e22a6d8c949c90a18033b6fb989f55993e60b45ac9860f64a18d6540de4bfe86a7a719
 MISC metadata.xml 350 BLAKE2B 1b1cab426ff16f13bed9114bca2d0d543457d97400f739a78cc1a1975683a7ae7c48630af6033f9f94268fa61f9382b6caa056346b2eb3038a83523261b4c8cf SHA512 deecfc72a65212b6498334be4dc9abc35d9f22b64f041181474bbeca8fd71d1e3ebdcccf9a98f57ccc57bd37958b206944c9f520bc7c4cd2d8329f9ce14a0b19
diff --git a/x11-misc/wdm/wdm-1.28-r5.ebuild b/x11-misc/wdm/wdm-1.28-r5.ebuild
index f31e2f6ea263..d6edd5dca123 100644
--- a/x11-misc/wdm/wdm-1.28-r5.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r5.ebuild
@@ -52,6 +52,6 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED%/}"/etc/pam.d/wdm || die
+	rm -f "${ED}"/etc/pam.d/wdm || die
 	pamd_mimic system-local-login wdm auth account password session
 }
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index ab9f290fcbd8..a42c0c91ef68 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1109 BLAKE2B 49bb8dd17a44bcfd5f0a8a6c0b059c670613f3ca32099cf3102dbaad785fd462bf8be857decce6120fdd2985ee432777c08fd6d49506470e2de419435c0fae02 SHA512 da7676ac521af50196434bd442b8534a7db42785e6c47fd20dd27f3314635cca8083493a097f9197cf69e0a71ea68457a54d8e48377e842652a242395c409cfa
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1110 BLAKE2B 2e9ea4b5ffa939840e3681b8a9fa23e378e01ec85342e96e4e95c392b4a3d016a57064e168f12eaf3eba3f9dc8258202eb78c66849f964ae745bc67fd5ad351d SHA512 c3518e6ed37dae65117e7a8372a6c53cb01c068643bdc70b26c21604aa63dde3ae0f4031f90f9bda7b0958d294cfe3cecd772ea18ed101dece6dc0c021420912
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 62e640ff2d57..71d92d0a6d07 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 07bc37dfc4ad..99dc5bd167b1 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,12 +1,10 @@
-AUX xlockmore-5.46-freetype261.patch 587 BLAKE2B a5666fd2c06d23b388d20cc8fbb6b64b47e81c219a248f539e76fdaedafba8765a3f8786483d801f8f95703b1d6911c4d595bb904daf5a010faef7697ceb1226 SHA512 330d2120a0e3c9c6ffffe90e1fdde255325394fc03aa4f9d532086859e6bdcb3f80aeab4a0b4d7f5eae4bcaef69fcba924ec86014c3c8e13fe8c878f9ebc8077
+AUX xlockmore-5.46-freetype261.patch 561 BLAKE2B f5fde1a8984784a2892363b85413728b86082f8bdd3303358643bcd634a80bc6064fce930aabca92624897fddf71c0647a6202e7e0debb02b4127d275c99b57e SHA512 58b75f4509f4762f4009fce797b5f0420ac3bee79a3fa4444a90603b1522c5f60deb9a1ce94ecacb025d27ac6272f2b431075af912b121f6e5cfa541b696caca
 AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
 AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
-DIST xlockmore-5.59.tar.xz 1935296 BLAKE2B 3a7027dad227179dfe3917108f8960a751cc16481fef541e80c656f99832de6d203cad1815f0f31f66aa2338d06035a99dce18664af2bc0b8e4610ef25339d20 SHA512 02758869ba597ef32ed1e594fa88141644264bbbc8edfe9ae8742a4508fa3e38d059c9ffbb9fa9bcc323b92e1763f96c8b6d054494849df465a08bc6be71bf33
 DIST xlockmore-5.61.tar.xz 1936312 BLAKE2B f4d12f1dbd5da1d8cef16690e393fdd9ba4162722398c8239c0091f2cd46cc3f401c1a62ed1910bf37fc0d98f0bf0723ca9003caf507e3d8a6a83f7b51228f35 SHA512 be64b3dc22f1c0c310ed4a085fcaf9f7ed96c5d2a97f3359966201df54fc5acfc3e5d94cb0616a28a217e0cc6954f9a519198c238e40202263a7c03438771a7d
-DIST xlockmore-5.62ALPHA0.tar.xz 1942228 BLAKE2B 3b40c3d7c29a4e285dca7b6ade8555f0946872c65920be691cff859558abd825709d5adf9b9abc95bede94a6905845910562552734817711a8e3d1dc99bb2f7e SHA512 095a5d9e382ea61f77d5888fe2e38b216991e47cbe9e9739a4ccd06a8e7992284bd2ec85d73ea3a1ed07e57e3fa29938732f813360db2d146efa9e21fecac7d0
+DIST xlockmore-5.62.tar.xz 1943836 BLAKE2B 6ce9b9ad709881a50eba0e32ae1e7524414a5e92e34daeff1ce68b6bb4738117155543d15219723ab514d520064601824a22d438541a699c742ab0c620285c64 SHA512 fc7c63a8ce781ba1a9598b5e3d585cc85051da864dbd59e3232b2fa6b6529743f9244e52bdf588ae438c02a2e1e745eb81b372234189e73ae6698cc962c387c2
 EBUILD xlockmore-5.50.ebuild 2166 BLAKE2B d16a6e03566a9d6317c30770a4db9ac4cac59a40969a39441407452f1384e536a25efd6aa6bea54d496714de03ac52c511b0b2ec4340977c151460e61d72a405 SHA512 25f71e1a893560db9f82c91214f375d9957fa658205f856686dc407ab59473a15355866255ad0a2ac3f50a5ed1047fe97d4770ffbcd712577d5eeccdb94cccd7
-EBUILD xlockmore-5.59.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
 EBUILD xlockmore-5.61.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
-EBUILD xlockmore-5.62_alpha0.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
+EBUILD xlockmore-5.62.ebuild 2215 BLAKE2B 23d6084ca97979ba699487f1676a53cd3f5e68d9b7e41ac5d70ed45cb7eadc6009f52d83a9a7af12cfc1dc87c40ce6f0285b1d14b4e3a0282b321dc8fd22b7d1 SHA512 bfed1a62f23710eba0f57570a1a43533400eefef3b7d556a9063f0fb8803b227c39290101bd83ea371dc8c4be53898b1f79c0b43cea0227a661369a1015d3704
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
index 5258121bbbea..819708c6be80 100644
--- a/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
+++ b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
@@ -1,5 +1,5 @@
---- xlockmore-5.46/configure.ac
-+++ xlockmore-5.46/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -1912,7 +1912,7 @@
  AC_DEFUN([AC_PATH_FREETYPE_DIRECT],
  [test -z "$freetype_direct_test_library" && freetype_direct_test_library=freetype
diff --git a/x11-misc/xlockmore/xlockmore-5.59.ebuild b/x11-misc/xlockmore/xlockmore-5.62.ebuild
index b993e74bcdd2..b993e74bcdd2 100644
--- a/x11-misc/xlockmore/xlockmore-5.59.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.62.ebuild
diff --git a/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild
deleted file mode 100644
index b993e74bcdd2..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.62_alpha0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
-	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
-"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
-
-REQUIRED_USE="
-	|| ( crypt pam )
-	pam? ( !xlockrc )
-	xlockrc? ( !pam )
-"
-RDEPEND="
-	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick:= )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( media-libs/nas )
-	opengl? (
-		virtual/opengl
-		virtual/glu
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	pam? ( sys-libs/pam )
-	truetype? ( media-libs/freetype:2 )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.46-freetype261.patch
-	"${FILESDIR}"/${PN}-5.47-CXX.patch
-	"${FILESDIR}"/${PN}-5.47-strip.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=()
-
-	if use opengl && use truetype; then
-			myconf=( --with-ftgl )
-			append-cppflags -DFTGL213
-		else
-			myconf=( --without-ftgl )
-	fi
-
-	myconf+=(
-		$(use_enable pam)
-		$(use_enable xlockrc)
-		$(use_enable vtlock)
-		$(use_with crypt)
-		$(use_with debug editres)
-		$(use_with gtk gtk2)
-		$(use_with imagemagick magick)
-		$(use_with motif)
-		$(use_with nas)
-		$(use_with opengl mesa)
-		$(use_with opengl)
-		$(use_with truetype freetype)
-		$(use_with truetype ttf)
-		$(use_with xinerama)
-		--disable-mb
-		--enable-appdefaultdir=/usr/share/X11/app-defaults
-		--enable-syslog
-		--enable-vtlock
-		--without-esound
-		--without-gtk
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
-	default
-
-	pamd_mimic_system xlock auth
-
-	if use pam; then
-		fperms 755 /usr/bin/xlock
-	else
-		fperms 4755 /usr/bin/xlock
-	fi
-
-	docinto html
-	dodoc docs/xlock.html
-}
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index e18a110f53c7..623a61403b7d 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,5 +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 1199 BLAKE2B ac32bb78ba75f80e44e1f4274da49e3823aa76d86ab36626bfbb6894f4aed4100c9cccaec494884f0230410d5274db90af18fada6675c8a62d0c58945cff30fb SHA512 6495b16378dddf4a39ba53bf5d781d464ee32e5dcdbcdb1b9ae5e49d22e4841ed7414ccb85037a5292caf7d04bd24b3137f9b2947fea8861e722c6539466d0fe
-EBUILD xosview-1.21.ebuild 1203 BLAKE2B 35780c1fbe4c4d9070e9ab245bdb46d115dc910d4690fc25b549deea37c134cf59e13cdcbcb26a9e9c02d0f5c799fce45f07278022d77eb6eacefdec84f3be86 SHA512 1e78f0a0c87d266229a7bb533b701180d843f8f77e0b8e566feb62df715301429ac872cd7219140d60a78b79506da6b7f2fc141f81ab3b53e13189f0c7b7ca9b
+EBUILD xosview-1.21.ebuild 1201 BLAKE2B 825c03480f61d70a36d226860f2e363c2a948dd2a532774e3f9d4ddde41a980c27240eaecaef2cfeb80e483f97f646f82bb3b20ce7ab0df9460f244363c80792 SHA512 cc61c884b3ae13425f80da6995bcb17ef04b84bb9822bb7f5f9c613475e3888980b52ff88ed1d01b32619e68ea9b7f3425aa6de23bdfc7ab5d508daae0027327
 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
index f19498d37816..002938c66082 100644
--- a/x11-misc/xosview/xosview-1.21.ebuild
+++ b/x11-misc/xosview/xosview-1.21.ebuild
@@ -37,7 +37,7 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${D%/}/usr" install
+	emake PREFIX="${D}/usr" install
 	use suid && fperms 4755 /usr/bin/${PN}
 	insinto /usr/share/X11/app-defaults
 	newins Xdefaults XOsview
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 6c87c5553e5f..5f4b8efa8ad8 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -12,8 +12,8 @@ AUX xscreensaver-5.43-offensive.patch 1799 BLAKE2B f85d26a07ba2712855567a0779eaf
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221ac2ad47c1411687f1043da7e50edada73ab9c7465d655546f8a9015db69ab4f35ef8ff2a0b3d79f5a59d3e02aa2f819 SHA512 84cde9364c933de720acd51a0bf75eb4d0642d60f62b92de89d932233eb5abb51e1edb53cd413b2dc4801a02cb68652a28d7d1f83cdaa8d8cdd1fee7d651eefd
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
-EBUILD xscreensaver-5.38.ebuild 3408 BLAKE2B 85e26671a2162ef909b6f7567cf70cde5dac8bdd5fab8e3757fd8493d8ebf44b382b4983f35e61548ced9d6f315b16e20e5878df63cd9d5e1ac8116d7b41e855 SHA512 32b8695b9402fff813b002f59083b638ac3a181c16b8051a8b959d628f530424d098276401c892ff474898ae0ede9e5c72f057403c7a221d285152a6569da7a3
-EBUILD xscreensaver-5.42.ebuild 3401 BLAKE2B 6008a494b624d49bd69f7fbb6b2d155d75d7f4ff0bd848e70193fd906884b2a1342aad80a0d93719892e73d4fa776e7e92bfa0aed1f6588dd3ee1764612d4129 SHA512 b20cb44c72af6f55796a269bf233f8c557ccaed2e6a3242fad8fa5ca0d175e1ab26586672fd7a2a0870247b15443084412ad69b592d0360514c094c84bf59673
-EBUILD xscreensaver-5.43-r1.ebuild 3442 BLAKE2B 7cb5c74a413cff4c95b649be15cf08d930dbc10e393557eb5987fad058f7ed49cbf71b20f15a8eaf4d1d3620ba8501d175b777ffdd246393d8e34d049fee9e0d SHA512 cdaf898566a3b00015aeb1f73c909ad817be9ff9087468bab74223351def40bbe1ee477335dc455c157d82f33f9b735d0f57eefb09cdc57d97476a2f1852495d
-EBUILD xscreensaver-5.43-r2.ebuild 3444 BLAKE2B c86e25198d52538c0234da6d3157c687f899f41b70c78dc7b728e1f7f7d660e271054d0b31d313dfc33ba2da3fbdb95125501719f874fe471a068d4d4f246847 SHA512 1812eb23c921e09663bf4471d2591d9ddd30ad9209b9ecba146d180f3ef1d8bcdecf603c4eb8225e4904188b3d119ace66d963101817ea08d9edbaf319e044b1
+EBUILD xscreensaver-5.38.ebuild 3409 BLAKE2B d9ce98672b029191da8b8b2ae6c160a8061c923b49dc85a0869009a0cbdcac98be3a0ed0b22cdd9ff7625a36d2b55e4e347d63be556e939e61da925cbb2049c3 SHA512 7dc0a26b82a3a3eda05af891c6331f5061ccfcdd0d63a504bf2e12c6444ae28eaf8eab8c0e98f8f4a477eba3bc4729721075b566ec0f31c1b13d17a33fe5d66f
+EBUILD xscreensaver-5.42.ebuild 3402 BLAKE2B 266daa4dfb7b02fc3e8635aabc1600603ff29c62555abbd9ffb320873d85c94692d8e88043041150d8679441e8d8b2e23da90293500dbd489b32547e9024bfb7 SHA512 d0c0172babad596a0c18dae0de277733de94c2292c0cdd540c30cb1c5361eeea2d658124db6bbc29ea383879b7046ad2e58332598360d2c7e1a2153f171b536c
+EBUILD xscreensaver-5.43-r1.ebuild 3443 BLAKE2B d4ee4e76e29bf6b9a1656f8137472c013a4cb7f418af5a943df3f3ed04fd62d378ae46147c0c3cb65ac15e173adc9002cdf52467f51d57989b3fcfc1b8164249 SHA512 5b491dc5ff639eede1678fb74d2338a25e0f28efb0e60450030d4cc1a86b833a3273392c5eb69a23bdd06bd5a4a90118daf646e880cd4e29e1669ff5a1906b9b
+EBUILD xscreensaver-5.43-r2.ebuild 3445 BLAKE2B 5b2d7b4484cc82c336996251f39f6308dd58230598f37a987c4e5b3c55d8ccd13db805a3409a33db56c4705df12295515658206f00b42e89b5c815f3c00321da SHA512 c93b67a8c87326e33d90feb79823aa69258a77dcc15a8008b4ada06db0cefcdf1a8202dc3fc6864eb65952a50a6673b469cb622b5a41213b773f133efb2e34f8
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index eca91dfbc852..6ebfe87bb887 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
index d3224ffad7b0..b0eaeda5d446 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
index 626d74e50e27..cb4566b00df2 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
index f9b66cd52c59..66f449186fb1 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index ba1e92e010c7..aded634839d7 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,7 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
 DIST zim-0.72.1.tar.gz 2596910 BLAKE2B cdc6c875ed316dcd5655d75c280b46189d9b7068922ea0cc05606bce8f5bd0ef7d92b7965ee0af067add28ef75f53363e864b3ca43d216dbf99fe2cac6e19a73 SHA512 3b74388eb9272e6c5c89e752d784428b18ffc6cbc76311162aa8f42f2de434ad8e9f9c6932b8aaa62e2a3abdb879a31c982cc3103e7eaa3a5407a02cb6750bfc
-EBUILD zim-0.71.1.ebuild 1908 BLAKE2B 7f7ccbb6757d758096d682d813cdf26352042ff9b0025a288fd20fc555bc2e78a762cc5af1e5216d85240ae58ca722566443212d118563e27807f96737aa0305 SHA512 5401f6bff60e4518f5f5df667da340b8da29b7955b3095a94896d72f9a36c1589bdb7493bc91c9295b56ac65e781c797fddf64713e68de41ade1f2ec3a6a603d
-EBUILD zim-0.72.0.ebuild 1891 BLAKE2B bf456447163aa74af87dc9034c3318c5107f7c4d100ee3b2ea67d6c6836df6378add13ee45d79dec06af20257f10f466adda9c84d4f32dc443e308d902ccbc85 SHA512 9ec423255032328da8756fb7d762fa818cebf9c4da83f8358b91c386ea5ba959108ff15cbc1637d7a18501c0ac62808849dda7e420adf2b18b87121fa88ed0f7
-EBUILD zim-0.72.1.ebuild 1891 BLAKE2B bf456447163aa74af87dc9034c3318c5107f7c4d100ee3b2ea67d6c6836df6378add13ee45d79dec06af20257f10f466adda9c84d4f32dc443e308d902ccbc85 SHA512 9ec423255032328da8756fb7d762fa818cebf9c4da83f8358b91c386ea5ba959108ff15cbc1637d7a18501c0ac62808849dda7e420adf2b18b87121fa88ed0f7
+EBUILD zim-0.71.1-r1.ebuild 1951 BLAKE2B 252170b5d9f586212befa366909af94a1ce9e5eb78536bd9dc952f4c539c5e32e0eed71e96deb276c877dfcaff698f91993dd715e08c4b07c54dd79cd7053c30 SHA512 9525cb0a84df79ea7330ade619d242bb315184a893cb570965014fff8bc2f1c9face8f790b989859ef2c203b5cf1369b4c55a1b3b6bffcea3f0ad9bab9c71577
+EBUILD zim-0.72.0.ebuild 1934 BLAKE2B 55516ba1fe0208901156c6beab8bc6a36ed3bfc60bcd1891ea129ab33d213effa7c6d3d12c9de3a588d7ca2f939d2800729577178283340d9816322bae244b84 SHA512 842f5ef971f44df01dd775c7ec65b13766b615caa6bdc862ddbf878c1022356e1749220d2c6437bc80ba234904535d00893094e76768ea92525d47c4dbb1d052
+EBUILD zim-0.72.1-r1.ebuild 1934 BLAKE2B 55516ba1fe0208901156c6beab8bc6a36ed3bfc60bcd1891ea129ab33d213effa7c6d3d12c9de3a588d7ca2f939d2800729577178283340d9816322bae244b84 SHA512 842f5ef971f44df01dd775c7ec65b13766b615caa6bdc862ddbf878c1022356e1749220d2c6437bc80ba234904535d00893094e76768ea92525d47c4dbb1d052
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.71.1-r1.ebuild b/x11-misc/zim/zim-0.71.1-r1.ebuild
new file mode 100644
index 000000000000..5408e1591821
--- /dev/null
+++ b/x11-misc/zim/zim-0.71.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/zim/zim-0.71.1.ebuild b/x11-misc/zim/zim-0.71.1.ebuild
deleted file mode 100644
index 17560f2d59f1..000000000000
--- a/x11-misc/zim/zim-0.71.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 gnome2-utils virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/zim/zim-0.72.0.ebuild b/x11-misc/zim/zim-0.72.0.ebuild
index 7d6ec427d216..64ca6bb5736a 100644
--- a/x11-misc/zim/zim-0.72.0.ebuild
+++ b/x11-misc/zim/zim-0.72.0.ebuild
@@ -20,8 +20,10 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/gtk+:3[introspection]
 	x11-misc/xdg-utils
 "
diff --git a/x11-misc/zim/zim-0.72.1-r1.ebuild b/x11-misc/zim/zim-0.72.1-r1.ebuild
new file mode 100644
index 000000000000..64ca6bb5736a
--- /dev/null
+++ b/x11-misc/zim/zim-0.72.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg-utils distutils-r1 virtualx
+
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="
+	https://zim-wiki.org/
+	https://github.com/zim-desktop-wiki/zim-desktop-wiki
+"
+SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/gtk+:3[introspection]
+	x11-misc/xdg-utils
+"
+DEPEND="
+	${RDEPEND}
+"
+DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		elog "Please install these packages for additional functionality"
+		elog "    dev-lang/R"
+		elog "    dev-python/gtkspell-python"
+		elog "    dev-vcs/bzr"
+		elog "    media-gfx/graphviz"
+		elog "    media-gfx/imagemagick"
+		elog "    media-gfx/scrot"
+		elog "    media-sound/lilypond"
+		elog "    sci-visualization/gnuplot"
+		elog "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/zim/zim-0.72.1.ebuild b/x11-misc/zim/zim-0.72.1.ebuild
deleted file mode 100644
index 7d6ec427d216..000000000000
--- a/x11-misc/zim/zim-0.72.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=1
-inherit xdg-utils distutils-r1 virtualx
-
-DESCRIPTION="A desktop wiki"
-HOMEPAGE="
-	https://zim-wiki.org/
-	https://github.com/zim-desktop-wiki/zim-desktop-wiki
-"
-SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	x11-misc/xdg-utils
-"
-DEPEND="
-	${RDEPEND}
-"
-DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md )
-PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
-S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-}
-
-python_prepare_all() {
-	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
-
-	if [[ ${LINGUAS} ]]; then
-		local lingua
-		for lingua in translations/*.po; do
-			lingua=${lingua/.po}
-			lingua=${lingua/translations\/}
-			has ${lingua} ${LINGUAS} || \
-				{ rm translations/${lingua}.po || die; }
-		done
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	if ! has_version ${CATEGORY}/${PN}; then
-		elog "Please install these packages for additional functionality"
-		elog "    dev-lang/R"
-		elog "    dev-python/gtkspell-python"
-		elog "    dev-vcs/bzr"
-		elog "    media-gfx/graphviz"
-		elog "    media-gfx/imagemagick"
-		elog "    media-gfx/scrot"
-		elog "    media-sound/lilypond"
-		elog "    sci-visualization/gnuplot"
-		elog "    virtual/latex-base app-text/dvipng"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 5cf2f10e797e..804123fcbe50 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index 6d1a06fceb61..fdc85ff1e08f 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -1,5 +1,5 @@
 AUX gkrellsun-1.0.0-Respect-LDFLAGS.patch 334 BLAKE2B 18bc916fd4d6834731cc02a720347a49a926f57f8477c8ee91bf9711b92aecc85b427a77d53edc6658ffe6b918b61b7d52a0ca0d7215b2008ec71710a34a985f SHA512 093ab16f6852b9a75a9c2e31a7ddf3ad6a407fd5c0f881340980f3f59b3c9abe10fa1855e09e9a73bd53cd3b3d532e3372bb227d95614e7fcbc014637c3ee906
 AUX gkrellsun-1.0.0-reenable.patch 520 BLAKE2B fab0e90b893620b8d1724e21953845fbbc990948712f25ff0f4903ef51bcbcb00f3d3989cc8f9cbbc515daff3391c14a37a260f07309f3fe400915c293a8eefe SHA512 e4cfba81e20e08f2fc5fd005e5ff2e630a90f2cd1743334440b7f78f2de256959347d93f9e1c25416b9d151dd5465087dbf3e39a30429023cd9e9c635dcda229
 DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
-EBUILD gkrellsun-1.0.0-r4.ebuild 683 BLAKE2B a985b1ef76ca5b892a177256df821810b64c7ecbc9578ce9638b3e9669bcb11d6f2fe67ca571968d16258662ba29225f73fe80019bc49211c41914014440f4a0 SHA512 72d268d9836727a1ca952d8bf7ed6bc6d7144c47b7ae1ff5e9175057aff757757420c95111a40e149a811300ad54d411c1a2db0fa12927385b6c37cb6f3a4ce3
+EBUILD gkrellsun-1.0.0-r4.ebuild 681 BLAKE2B 02a13759deba6548ff617ad26e6e6902288e0bb7b855f4d30882c51df8d4062a203d674e69fad22ba7d7e8241071b498e8512371b9b043f782391cf6c0f9232b SHA512 ef142abe4d417d7dcf92b4ac67ed58c2add979378fc796b17f036e729e27c229fd97e019c05e19c5431b8291c235cf77b6f2ad3834a1200adf5cd20baf91e9f8
 MISC metadata.xml 246 BLAKE2B aa7aeed52cbd6f0cbf3fb397c465f56a6b23276e59ebfc8aea46683b5f1d7c40857d40dc4aa3a8dbba8dfb3dbc4bc9b388b32c9c78c2fba505875ebea4264282 SHA512 d314e742c911fe837b685a8f4f8ab7701c213b55a06efcb805aff28214ddab008539ab6682258c0b2fe6cd5ccc045d2d321c22aef6af3b39758f821f08dc8ce6
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
index 912376efd40f..10521a081245 100644
--- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc sparc x86"
 IUSE="nls"
 
 RDEPEND="app-admin/gkrellm:2[X]"
diff --git a/x11-plugins/guifications/Manifest b/x11-plugins/guifications/Manifest
index 22eacb60d4bc..352188cc1e8d 100644
--- a/x11-plugins/guifications/Manifest
+++ b/x11-plugins/guifications/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-guifications-2.16.tar.bz2 543136 BLAKE2B dd34108210914386dbd2780b4f2a23cb615a51e8cabe39e16867721815b017b8f897906e06eb7cef1cb96e60e70ce3c02ad20d8a1a906159848cfaf64eaa7b76 SHA512 fee1741a37df102ed3620caed9024c1a2ac5919c1a9c4182bdb19685a4d3412a1ff72e5e58ce65fdc2689f1d90432ea22c3912a9ecda80a95af96d57c86c9cf0
-EBUILD guifications-2.16.ebuild 645 BLAKE2B 46126eae4aed062cb30f4cc40f6f5f91bc13b4ad925fc5be945039e42e7f6805bea1cab02afda4f0ab73ed074fab891653c36f860b733e021bc1dd088bc7a0b2 SHA512 f169c81911559e12105a527661775fcaa262b1463fd760f169f1ea416bf58842ad902756073930910b919212c1e9964fae6932e00e0a08d092e8b9192813c16f
+EBUILD guifications-2.16.ebuild 643 BLAKE2B 91226983189915145987251c7aa58a99240e28b2fa0334e98b4a68099b52749c1cfdfc216c24cd0089db23909e6139bb78e715b970b019a26a62e3ce853a3868 SHA512 2d33b302a6a0a4753da0b5f0249257d0275707bd2f7da767620d85e72027d5e75fe77bd403f298bddc681e08ea99c96def2ac2c122ed45d2822fe996a457527b
 MISC metadata.xml 296 BLAKE2B c1f1e3e2594aa042f53398bdfb81697c7b3ff9a9473f6f40be235924196bea0bb16ecb0849d35db20a33fd5b52c286568c42e9481600229d7cf228fa9e34cdd3 SHA512 e0c54608b40170468a0ea5526bf15b1202a3f60a5911f6695f89caae84d152316a44c4c3cbc6e059f80f5a69c7757ba78ca582b571088b13a4b5dcc0f2ac4f9f
diff --git a/x11-plugins/guifications/guifications-2.16.ebuild b/x11-plugins/guifications/guifications-2.16.ebuild
index f50721872ac7..1f47640b99bb 100644
--- a/x11-plugins/guifications/guifications-2.16.ebuild
+++ b/x11-plugins/guifications/guifications-2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://downloads.guifications.org/plugins//Guifications2/${MY_P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE="debug nls"
 
 RDEPEND="net-im/pidgin[gtk]
diff --git a/x11-plugins/pidgin-encryption/Manifest b/x11-plugins/pidgin-encryption/Manifest
index 13d15d1f5c4d..2dafe7e8028b 100644
--- a/x11-plugins/pidgin-encryption/Manifest
+++ b/x11-plugins/pidgin-encryption/Manifest
@@ -1,4 +1,4 @@
 AUX pidgin-encryption-3.1-glib2.32.patch 381 BLAKE2B 0f62640d14f2da191de008f7a5a984d2a1462400eccc9c83e890fbdb0e4be271cac9e692af2619307de95ddc198e2d0e19a36dde55d617ddcdd69d15f90455df SHA512 1c6b3c34d0e8acab7dd4465348d674b56d8939305e87dc9e59bd14e99e7123e865c4e6a91f641e3365c507b2d88e19541f05534b3255ab23754d95d49c997639
 DIST pidgin-encryption-3.1.tar.gz 604129 BLAKE2B d42c6baf9e1b0adcb8e88a611279fa66f6c37ce3e89c742c6a8e2662662576cc9e08c8e3fa08c19e857b88165b840826f9118c5bcca0098b7eb02fac0a8ae159 SHA512 681e719dacc6812f6e965b5025631b02dc6abe4694c4dfc3034d5c07e97798707f28920c142b99f9d428470ef5c14bffe5d7c62d2d5fce01ad0e7567ab60b32d
-EBUILD pidgin-encryption-3.1.ebuild 735 BLAKE2B 30d915d33f8d3f508fd44730f631ae14713159971efd05294ae74811824996d05974640b599b4c1d4633670001deac1210781278fa3005ffa91ada17eee0fcd2 SHA512 bf299d9c05afa8827120e69aa4c1ec8fcbce495fe672bcda37accbd99c9ad7c3d6c7f5c982d87296d2044351bc863ef44549d6df3877be39d21289e2c2295e65
+EBUILD pidgin-encryption-3.1.ebuild 733 BLAKE2B eefc39e9f8b6f89a76e732cd6f9a6f4d75fcb9944abd7aa7cec9ff92fbf0fd10a40d9637c5d2f6de8be9aafe7d20f8f9cee04bc096a3607d7474e2ec7eeb19c6 SHA512 6a68f6b4eda99b923a4a29f1e1cf548adcca03a0e68ab49095ae4efc35091784bb3e074126f426df474eb7b045ed12c2babb096e6992cbcddc35a817b6c272f9
 MISC metadata.xml 383 BLAKE2B c6351283f94a3a50fcb0c17ced9c6d74f0b3a4384fcc88451187c6ee7ab4277a7e7629eb656e24dce5aa4b892a99d7ba17c559360408d8bf938637307cf62652 SHA512 1b3e3b5e41b6cdc2c4d8d309ebd0664d1054ec9175c5b1d9c2d7c63e8ca2c62572e3c8b6dcb3b292595b66f55cc764a059954688933f50f7cb35591419fbf5cc
diff --git a/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild b/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild
index fbcca2a1b4fe..d6abbea91a0d 100644
--- a/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild
+++ b/x11-plugins/pidgin-encryption/pidgin-encryption-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pidgin-encrypt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="net-im/pidgin[gtk]
diff --git a/x11-plugins/pidgin-extprefs/Manifest b/x11-plugins/pidgin-extprefs/Manifest
index 18cffead7a74..956eb4e37555 100644
--- a/x11-plugins/pidgin-extprefs/Manifest
+++ b/x11-plugins/pidgin-extprefs/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-extprefs-0.7.tar.gz 332742 BLAKE2B 39a12a595f6eb7a66b071ef4d3e94d7e4d54201baa29280f3dc24e790976dfd57e7f3a656cea398c76759d02b258429b0cae46fd4ed7c07ec9f2219f5b0e97e4 SHA512 f2157403463c1a9621396c84ea71c4e02a853796d5c7b7aa33def03f9b6eccc52a0fad7f5edcfa1506cdc2c6e9dfb056a445cdfa985b0c3885d7ffe666150c3a
-EBUILD pidgin-extprefs-0.7-r1.ebuild 441 BLAKE2B 679fe2ab1ba9f7b6c8b1b465e136e9547b9804b3a146b418302c3b015ac78306a9ca6732c6767eb8728ca95739f0db0b60db3117b03dc227af2bd24bbbe1e7b5 SHA512 a93bcf45803730e385328db75b05735a908fb3f8a4c2597a8eba4d3294217f3cb5e5de26d87b6c17f69cd1decd4182a0b6139c17aa5fd3972009563b3d45162d
+EBUILD pidgin-extprefs-0.7-r1.ebuild 439 BLAKE2B c54beda201ae6932875702249a106a0b630dec9a76cb62d433cd38c10c522eacea68565e4f6c2cdd12f2244d3fae7821275039c0c34e942565e9d75187deb9a1 SHA512 6be597d0061ab174b3682c836d032d0d4a509e9639e1e4f271c2fb054ee66629f054edeb90f196350741b97bdd7352058b50fbc0b425b079f8f061df7d9970a9
 MISC metadata.xml 429 BLAKE2B bd54667274f11c399f2feb083848551bea785a62668c034fca214afaded40f4b798ffafd6393bd99a9c6db7c3d1abca893adff6163aae3dd1f98e7fafdcf02c0 SHA512 45d92936f57d4de39761a5c6f6b3a9b2645041109857a96b3910ec097c3e8fe140439953defb65dae391474d8ae3bb54f0e10fd9142c322b09fa7c916f4bddf0
diff --git a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
index cc4b162c7c60..5b4c48f33e10 100644
--- a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
+++ b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/gaim-extprefs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="amd64 ~hppa ppc sparc x86"
 IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"
diff --git a/x11-plugins/pidgin-gpg/Manifest b/x11-plugins/pidgin-gpg/Manifest
index c951d51d55e0..f90786b48f9d 100644
--- a/x11-plugins/pidgin-gpg/Manifest
+++ b/x11-plugins/pidgin-gpg/Manifest
@@ -1,5 +1,3 @@
 DIST pidgin-gpg-0.9.3.tar.gz 806492 BLAKE2B 67ca75307419fe25d6a7f90ce33f63e736eae59e0cab9fd2fafbf7f9ccd61569fb9906e755163400c462bcd63fa8e9b1e42deb98e459fb9e070d73de9cfb28ab SHA512 bff7ec08d7999d40b689aabc0b559b7eab1fae765b6ffc799e355601ac3a2bb05c3831c1e56e30b95f387c446f7d07d1576af7e7824094fca9ac6c6636d62f6c
-DIST pidgin-gpg-0.9.tar.gz 288403 BLAKE2B c1fc16a2744d2896727b36f114fc347f48fce071da5813eadb88a7251d27751d56dcea0ff3f1d396db164aec26e88787134bbd1e5605a24e79e06f2a70e1a8c2 SHA512 391d013dcc62972e13fded2737325d8262edd62c5afb640e244bc6dca868f966dcc4155c6a5604e5c87fc3dd0b3fdf5c339305756a9e6992765193c20838aa50
 EBUILD pidgin-gpg-0.9.3.ebuild 589 BLAKE2B fb2eee61fdf6e0d4abc1a721c34fd8caf2d53290c7855f34ba6fe863806d0f0cb7bc1b74742ca59b4a345e2b764ab53d551774b18eb1bc6755221de635d0b8a5 SHA512 2088323415551e28aba80fef75e0ef1c2f4d6cc03b984630c19fb22d8448f1930eb43b186b56c9b868de867b34aaebc911455fcd3504c141b8add224dab9d010
-EBUILD pidgin-gpg-0.9.ebuild 503 BLAKE2B c4a74a09d28e881c9c8f918fd297ae2aa9b2b15f551759aaec248a1170ff4481062335084d71775b60af60e8788f06fbc5df6b7b709b1ed22c7b7e1140d9c226 SHA512 7ec83858b7078182202b31a1958a6e92691a9ad2049ddb3696c1f5b8b41d9a898f724f2494d9568ff9af58b1a13b9ccb9b7d9f9eb7bfa46f35f7c07f2da2edec
 MISC metadata.xml 571 BLAKE2B e9b44d1044f832df7e7d051b6bcafe3bc982895192323aa728645da686f76ae8720f6c68230b62b7164b803a049422081143ad688040e9c7bc099d8cff6be361 SHA512 4227ccc4175c649cf27d528b2c6cca160c9ee267bdb916a006ea6c6c3631d2d460ffd35a48c72fef1e537c61dc3e77ab78b8cab4bc80b0afc065c91e1eac1869
diff --git a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild
deleted file mode 100644
index e1bd36c2d6c6..000000000000
--- a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Pidgin GPG/OpenPGP (XEP-0027) plugin"
-HOMEPAGE="https://github.com/segler-alex/Pidgin-GPG"
-SRC_URI="https://github.com/downloads/segler-alex/Pidgin-GPG/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-crypt/gpgme
-	net-im/pidgin"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/x11-plugins/pidgin-hotkeys/Manifest b/x11-plugins/pidgin-hotkeys/Manifest
index 06a80ba2f66c..e6b3b3426823 100644
--- a/x11-plugins/pidgin-hotkeys/Manifest
+++ b/x11-plugins/pidgin-hotkeys/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-hotkeys-0.2.4.tar.gz 341912 BLAKE2B fe4b6d841010df2bfc17febbbc54d0dc10eb65f3c414b17728a92afb856232df1a7a9996631dc2564102346236cb5e7ae2fb3b10f67679dbaed11f3d83b03372 SHA512 99897a47f91c5ceacabdec13859526f6af6270e171b94b49183ad5cc5118b5e3f5377d02ffd0bdbdbaafdd6f23f400deb604a8fe686cd29103187276f20aca86
-EBUILD pidgin-hotkeys-0.2.4.ebuild 439 BLAKE2B cb346013d7694bf71735f682e131c03a96ae2c07f8c3e66a30c420c6f85467f395eba73aadd44584157b7e9659b35c0e0cea877cc4e4d31d0b8007235881fa94 SHA512 b77966c7410e5063110f8a10a424fd17895f6610ff0efc07606620392fa1dbac5a771d4d73905af4866e8e75165d754ec26bb4ebefe93e78ab711cd5df1ccff3
+EBUILD pidgin-hotkeys-0.2.4.ebuild 437 BLAKE2B 2e5f63a09c1b97ff2a05a3bf39c45b21ab19846cc4278b83a128d5fbcdd1231bbe61d683af659af02eb2941cf698397a9472a88b367e5892fb030676b0f69ecc SHA512 506488de448306e10e90f9aaa2ac4140306850508854dd122ce7b5f506106e166f0bbf9e9d2022e0a30d83abaac326160a96f3058a1cfc225b2dafdbb44eb65b
 MISC metadata.xml 251 BLAKE2B 99192664732f32e705cd16da0ea6202a2c41eac9b2f6abc69a094e94bffdce35792d531a08d19d5bb0ace3d8ad89f072ec455e601f66d4c4a8e790e00f145f89 SHA512 615ed628ead3eb359fe7bacd719a1d29798bdc41026cb26fa2100cc49e09df2b3ceccd529e929de39b53ac83cb173d2260b21f561808bd62234aaea55b2af878
diff --git a/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild b/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
index f9dae97f4ded..ec4f95533fbf 100644
--- a/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
+++ b/x11-plugins/pidgin-hotkeys/pidgin-hotkeys-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]
diff --git a/x11-plugins/purple-plugin_pack/Manifest b/x11-plugins/purple-plugin_pack/Manifest
index 0a11fe1709de..d0510d88ca07 100644
--- a/x11-plugins/purple-plugin_pack/Manifest
+++ b/x11-plugins/purple-plugin_pack/Manifest
@@ -1,3 +1,3 @@
 DIST purple-plugin-pack-2.7.0.tar.bz2 761618 BLAKE2B 29508a18eda2dab9b9dbb9af5a4ea456f79fe97259afc86a1131370b4b90d5544d8537d8aa2738823c1455632318812478ffeb3583490b041b82e6e631175748 SHA512 fffe1b8c38bff9ce88ae26426110923cc4722bf77fe59f6cf1123931558b06d830a842a6fe4d4f47295beec12f82cf5c25ac03d84944bb2629423ebac4399caf
-EBUILD purple-plugin_pack-2.7.0-r1.ebuild 1962 BLAKE2B 99d2ae8076b0a102356f19f505d5104dabf44367e0b676603dd9b727541e323fd979e97b13c96515eb24d51040d13275c2229c8ced3d3986238c56bf9df3c8b2 SHA512 69112ed1227528241c480d32002c780ce7d6479c25e71452ecc1fe7eb8895ac3dc4c3e6b88f6653c7b722f05f4ff7886f06a1843dbd1a959748956ab498a29c9
+EBUILD purple-plugin_pack-2.7.0-r1.ebuild 1960 BLAKE2B 41cb56669ab00bc6db7984eb2f192d781b207fe5849f011f4e797f7d44b744d9e78c06e40ffeaff43e44a89f557fcde5c93f5a88b795bc5a0ea07b15e3498427 SHA512 f30005d6128134d93e86fd2539fd01f72ee357077b586cd368055694064e493322a5458464da9de98cd2f14d30b66b474e3a67a5213b05f7c90c35eb99c994b9
 MISC metadata.xml 366 BLAKE2B 7e00de7e2d09f6802f44d1899377df6ed665e712ce7253ac9f1df0b5c48557782b5bee127047c62b8fe2e608b13fb448ede2f6840086a19228b4b2749d086e89 SHA512 8f726e2d162563fd4e0687abf6c1e7487f4594cc992e31de27f34952e9500332fb68b0e5556169a3c31cb431512edee29fd38a6427341e5d660181c0a45c8257
diff --git a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild
index 98d37fe3622e..9eff72189ecf 100644
--- a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild
+++ b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://bitbucket.org/rekkanoryo/${MY_PN}/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 IUSE="debug gtk ncurses spell talkfilters"
 
 RDEPEND="
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index b8df235f9fd5..c0a1c6e7152d 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/cool-retro-term/Manifest b/x11-terms/cool-retro-term/Manifest
index d296d72fc443..8ccc000b47f3 100644
--- a/x11-terms/cool-retro-term/Manifest
+++ b/x11-terms/cool-retro-term/Manifest
@@ -1,6 +1,6 @@
 AUX qmltermwidget-0.2.0-gcc-10.patch 1398 BLAKE2B a06fd644c64fd0b5cf549b410c28473d3ae31ec1477ee1dd60fb0108ee2af2221597d8fbeac6f3a8c33f605f3003b9a4dc2cffeb568788f606440aed9b19dc37 SHA512 fc50c4e64a8126b8586efc74939c71d43601e9a0dd4863a618fb51be46d05ac325ea3dfb96cab4a4a5b2accf0e2e8893174c1980b5b96ade8490d3a485c58ccb
 DIST cool-retro-term-1.1.1.tar.gz 1975853 BLAKE2B 54c9e5adb0879380215c390659da59266c323f12a046dafa2981d9c5e5ccbc6369e553427014e0347afcb6a1a64e188fb51f202d7c870a544fd2ecd5980f4c0c SHA512 59da4b5d18ad64b917caebbc63ea9e3d562ed2a2dc9eae00f36cf434df44d17adca084b448f860f24a74ee6b59cd083d6a81e2217df1fb5e9f2731eaf1752148
 DIST qmltermwidget-0.2.0.tar.gz 219516 BLAKE2B 452fe72f01773d3307d5f4dca4ef38ea8e35b6ee4e3255d660e94baafc83949fca943807fd4ea76e0b985032952c387b5911a65891488b399d0cb41e6be06d87 SHA512 544d57296de6999b86bf2b921d1d93ac5d7eddd02eea436df4ecea0966c82389e716310fd7e4d13dd918bc1b3fd2d02f953c713dc5b4abcfc56d3f3f617adf43
-EBUILD cool-retro-term-1.1.1-r2.ebuild 1315 BLAKE2B 9050009b9ad8c43ba1fc278f4dffbcb1a36f43d3c6151f40a120a631571c8b8e0932c9838029bec19391afc5a7e30434c79df5f70fd939e7b8593ccb09e46636 SHA512 c5c4d122caf5d4f5ef98f33748d238f5abc435bbb195d41fe0b6ef7f00b2dee9d2820713b4f5cd271ab0b1d21a903447aca28c620030bdab9982e3fc56bffeaf
+EBUILD cool-retro-term-1.1.1-r2.ebuild 1322 BLAKE2B ae84eac46711396499980104c02099b746fba41846bf3dbb805966aa81d067e89a5ea59df8cc66bb099a994f1272f6137fa53c40d4bf0a7e4aff7606c537ba0a SHA512 d95a30e5c37ad0199c379960ed981d3d05f352da2dbe16152f67f2f0df1e0e1c033d78e2a4dc485da1b29f350da3efadaf2e097acf7cde38bcad3a3318135015
 EBUILD cool-retro-term-1.1.1.ebuild 1209 BLAKE2B 997d91692ba3d191c82eae17df1c54e0d65595d438cf4968ed1f106319a2941ac37be59686e74228cd1699da9000ce7a83927ef9f204cebf2fa56b682e869111 SHA512 ada8aa91ea4a817e432f9370a28c2a557d72fd02721bb07a4e8780eb41b971f3b28936b6d4e5fc23b602ed1f90f8154cc4f882fcbac3187ec5774425045e37a2
 MISC metadata.xml 343 BLAKE2B 4c576b8928fb82994206d310506a0b790c14108c235e9815750cddd3f9becc747fdec7f2bab7aae92c2d52b648f25b9b82dfdccea77953b6f694514977efd7a5 SHA512 5e102d64e39f274ce62e25739adc52ae998b830a38e7f292b33ccceccd5b262aa62fcf04a4372561aed54760ef9624e1f7335e4198cadb582b152f128be60466
diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
index 1f9256427d7d..dd5fc7cd56d4 100644
--- a/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
+++ b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/Swordfish90/cool-retro-term/archive/${PV}.tar.gz ->
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 2d5e3fb4d7c8..4cf0d7a6f0c3 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -4,9 +4,9 @@ DIST guake-3.3.2.tar.gz 1084094 BLAKE2B b534ed18a6b9ad686fbe41fe1aa6e522429a5072
 DIST guake-3.4.0.tar.gz 1167667 BLAKE2B 66cb4ae07894e06b37a264a79c52ac7b97fdd8e31f753a9e30f1609eba34b1f09bb133bd5413436e375eda39bb2716c1ad8ef8e0baf6641b540f03efc95e9406 SHA512 94053383a28c60fefbed70f166669a9a1528e9505c3bbfc1688312ef896e1c25c006536c755f01dca4868a97b30d857b044715f59f7a345fa4dc6075fac72ab6
 DIST guake-3.6.1.tar.gz 1181556 BLAKE2B 62b47a5a00a6e90d28afd8a74e747b8d77e36d450d4349687bf341ec1d338a01c5c46dddd1cca2bd507ea7a1056a5fbb5870b15c70e91347c4c8692577eb0573 SHA512 12e005e413bfa37f368caa7995c3b8d6c40bdca3ccdc7e3795c26d977981629971f75ae5d024b5c5c205c2d5a1bf6a80e49dbef95a1e8dd6511694da079865b6
 DIST guake-3.6.3.tar.gz 1192394 BLAKE2B 18aeee4151b9d88dc5eab089de404e0c61a3baa9ce09d579af048805125ce239574e6f7e154da6fcca3b24b9e630f7ba037f8a988ce43ce8f7e57c42e3e772ae SHA512 11515f3645eb4c8cac05d50a1bec0a14582cf94ac4bdaae85cf6fd3da0e428e044410f18893dd50f073eede042ac447983e233ba3742b113c03385a44058d401
-EBUILD guake-3.3.2.ebuild 1365 BLAKE2B 85355d1f0ed7a19901f437bcb13bbcd9d30e817378681352943ecc5b80d327654e31f4ee10abdd305d9fc9f512d937885157e8ff407528d8d516e003c0bba9a5 SHA512 5c1bc53d62aa684316d0bb198a9161ce3a8a4546ce89e1aa1fad13260db608b16cd590c4e2d2712b1147a8dbf0a80b3442f5cdf9431af6ea364d7b7dcfa8e555
-EBUILD guake-3.4.0-r1.ebuild 1467 BLAKE2B a0b3b85643029fdba31872ed4fe0c12d558078d3cd0c485bbd08217d7cb524ff9423fa4232773684bdd73f7d343376bca25d336d2b1b74c5b72f4c172e72b245 SHA512 93f9d4a77a44d12dd7e4c03463b8c5d8b8961fa63f0915dd7fa5f560b6fdffd950ee76945c8936aebe79b88316cd3a4df8a5e4482083d03a1050d18e2d73a239
-EBUILD guake-3.6.1-r1.ebuild 1502 BLAKE2B e0b7e09653d476d0c81185991cba3b1fec40222e83cc21045703f4d35f08d68f2884b85f23a0e8e096be2a28061e825626329b51da173e51bf41e1b56c3315ba SHA512 994236896183faf9997f1fc95aead15b7eae399e6d7268c5f446203ccbecad8755b52edaf1941a3e23afd8d700cbfc16ee8c0698d5a53a4971650b9f6d2345da
-EBUILD guake-3.6.3.ebuild 1695 BLAKE2B 1e88c54e076abe6c1433e0fd4cb94df1e35eff2610aafdc8e5a964306b5e2002cd13fba7ebb6c8a8b1eb244d1d689654cb1cd2ee454807a30039c2cb04b8dda2 SHA512 9af16f77eda8edbdf8681e057590cd5582aadd80902bd7c21f95ecef89bfde7c778d0fa2a06f85987c81d5f8541640dafd49ace3b7f4d507ae28ce987e2fb6f4
-EBUILD guake-9999.ebuild 1425 BLAKE2B d398feb1d602b50c56950fd9d929f16482af115ad84db1e30e8456b6621e8776108cf4be96a52cad1da504a1afb44ff27f4730d869cf0501dd382ee1ce966f6c SHA512 60b952e078f14357b4b6cdff21bc08e44c58358a4ab58798c1ae279e0a68fffe6898a9d1b9c72a0a580f8d212a280c20a4746c26af545f9f0e002ff35f997d48
+EBUILD guake-3.3.2-r1.ebuild 1381 BLAKE2B 51d408bd31231a9018b789e93df1ae50230bad1522edee417103833f4bb74c81780983e1a978529ccbc33030678b73779aa303b95ad4811c508e4007494acd4c SHA512 24da5fc65cb004908c2b879799fa5a92316d82178a448f858b3f13547728653e70e40aba58f4c2df22e6b47887bbc0746ad8462d18e4df95ea8809bbdb95fa71
+EBUILD guake-3.4.0-r1.ebuild 1483 BLAKE2B 8ff6bbaa70a1210acb0ae05430a28bace5aa15655e32b42cff36cc43b6576d9fe7810038f645df492cfc09ca9a34b709fea2351b8daa68df5062eb6dc4b7f8b1 SHA512 82e7be2dfb86a3af9c8dfbbc9b13c6c9cf74429c5b307e3c8a51064495ae90f5ac89f18163cfd4d37fb761f6cab2914c3305079e888cebfb8848f3cfc732d68c
+EBUILD guake-3.6.1-r1.ebuild 1518 BLAKE2B 7cd244af1897a456306332f9b1184029532dc521892628129922ddb8f3a46a426b813e9f04ed154f09b85ab204608ff3885e51eb6a9d3a17d4685f131f9c8c93 SHA512 08e877da128e63623758d58793a375932cd2a52342e6969613bafbf95c4a07bff4db7aed5a7ca78dd280cbdd00e8dcd1046b8a349e498d6712a289d5794a95b4
+EBUILD guake-3.6.3-r1.ebuild 1711 BLAKE2B def9646520fb8b6db390879c82d583a608cacb0e63a300bb5cbc3110793164cd0cebe7e89589f1ed54d838744b8f958460f8982116bc7904ab5b4b7e140b918d SHA512 df38bb59ac80f5f0e44dd8e19f86eae56f2059bd06583eca7df542a9446c13eaef3b6faa316002f9458e756fc5b876847956e1c00f1cc19bb53981bd65f498a2
+EBUILD guake-9999.ebuild 1441 BLAKE2B ba71bca4472e7097c22d714f52837136acb6d2f46f3b8f9a043fadb163346daeb32ee57a23e1b2d74d13aeaadbabf6885cacc2ff7d116e72b6e7ffe716a1bdc7 SHA512 dc63dfb8f74f918d74f223ac628451d6bd2184d4e961b3f7ec5e6f17a3ff47a64ea4faaf4aa82adffb714df506c5504e2274296b100fb057e8dcf509ddd2ea3f
 MISC metadata.xml 486 BLAKE2B 9ee73f9998b8af468c329f5507fa04f8345f1d6e9e2ef0702a788592afb8794cdfbb56859429d9161e017ac0ba02531177a80cad92c7516267d9e4554aaf5150 SHA512 1b2fec3b8354be9db573823f834f923c07bba089705afdebc626ec9e30663b4c5c10cc1de4f646dcc47190e4647d520f706daa6152e1587af9f10074caa61f87
diff --git a/x11-terms/guake/guake-3.3.2-r1.ebuild b/x11-terms/guake/guake-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..1426b793e688
--- /dev/null
+++ b/x11-terms/guake/guake-3.3.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_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/keybinder:3
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/libnotify
+	x11-libs/vte:2.91
+	utempter? ( sys-libs/libutempter )
+"
+DEPEND="
+	${RDEPEND}
+	gnome-base/gsettings-desktop-schemas
+	sys-devel/gettext
+	sys-devel/make
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.2-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-3.3.2.ebuild b/x11-terms/guake/guake-3.3.2.ebuild
deleted file mode 100644
index 1e1f6615a606..000000000000
--- a/x11-terms/guake/guake-3.3.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_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/keybinder:3
-	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
-	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
-)
-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-3.4.0-r1.ebuild b/x11-terms/guake/guake-3.4.0-r1.ebuild
index f4c8848b35df..204a40fe8f3b 100644
--- a/x11-terms/guake/guake-3.4.0-r1.ebuild
+++ b/x11-terms/guake/guake-3.4.0-r1.ebuild
@@ -19,17 +19,18 @@ IUSE="utempter"
 RDEPEND="
 	dev-libs/glib
 	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}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_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
diff --git a/x11-terms/guake/guake-3.6.1-r1.ebuild b/x11-terms/guake/guake-3.6.1-r1.ebuild
index 240b059d9fc3..9b8a60187706 100644
--- a/x11-terms/guake/guake-3.6.1-r1.ebuild
+++ b/x11-terms/guake/guake-3.6.1-r1.ebuild
@@ -19,10 +19,12 @@ IUSE="utempter"
 RDEPEND="
 	dev-libs/glib
 	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}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/libnotify[introspection]
 	x11-libs/libwnck:3[introspection]
 	x11-libs/vte:2.91[introspection]
@@ -30,7 +32,6 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	gnome-base/gsettings-desktop-schemas
 	sys-devel/gettext
 	sys-devel/make
diff --git a/x11-terms/guake/guake-3.6.3-r1.ebuild b/x11-terms/guake/guake-3.6.3-r1.ebuild
new file mode 100644
index 000000000000..ccfa02f3d129
--- /dev/null
+++ b/x11-terms/guake/guake-3.6.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_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
+	dev-libs/keybinder:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	x11-libs/libnotify[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/vte:2.91[introspection]
+	utempter? ( sys-libs/libutempter )
+"
+DEPEND="
+	${RDEPEND}
+	gnome-base/gsettings-desktop-schemas
+	sys-devel/gettext
+	sys-devel/make
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3.2-paths.patch
+)
+S=${WORKDIR}/${P^}
+
+pkg_setup() {
+	GUAKE_SCHEMA_DIR="${EROOT}"/usr/share/glib-2.0/schemas
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' ${PN}/paths.py || die
+}
+
+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-3.6.3.ebuild b/x11-terms/guake/guake-3.6.3.ebuild
deleted file mode 100644
index fc373929f91e..000000000000
--- a/x11-terms/guake/guake-3.6.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_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
-	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/libwnck:3[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
-)
-S=${WORKDIR}/${P^}
-
-pkg_setup() {
-	GUAKE_SCHEMA_DIR="${EROOT}"/usr/share/glib-2.0/schemas
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e '/^SCHEMA_DIR/s|get_default_schema_dir()|"'"${GUAKE_SCHEMA_DIR}"'"|g' ${PN}/paths.py || die
-}
-
-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 e76390e51bc7..d062cfbe9bb9 100644
--- a/x11-terms/guake/guake-9999.ebuild
+++ b/x11-terms/guake/guake-9999.ebuild
@@ -19,10 +19,12 @@ IUSE="utempter"
 RDEPEND="
 	dev-libs/glib
 	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}]
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pbr[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/libnotify[introspection]
 	x11-libs/libwnck:3[introspection]
 	x11-libs/vte:2.91[introspection]
@@ -30,7 +32,6 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	gnome-base/gsettings-desktop-schemas
 	sys-devel/gettext
 	sys-devel/make
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index cc2fc175213a..e9c3d9e39819 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -1,7 +1,7 @@
 AUX rxvt-unicode-9.06-case-insensitive-fs.patch 238 BLAKE2B 887eec8ec419900765ede1a8b75ea0acde945275af0e524e4382610a40d1e42b2f0be9879bf7c25cb00da6ae410e554567efdcc2f43ceff52e37c44060e6c4a7 SHA512 5257b1d33e25a6a390da2f23100fc3a2b8dcc4787205273933c2ba64ecf72e663cdc0cb86273a1ffa1a87b04bbeeff9edbc8c028c521ae612722f21cf6c40762
 AUX rxvt-unicode-9.21-xsubpp.patch 640 BLAKE2B 51b9f626436153239ca98df1094c5bbadaca463cf3624d39094cf5dce75a42c23568584292cd55b891439a45bc7d9e3fbf098ec80743b44267e6c3c1d0b339ca SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec
 DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9
-EBUILD rxvt-unicode-9.22-r1.ebuild 2059 BLAKE2B a2e905a4db0d25a635c3404197a2ba76da090aab859180ffd97da768e17c69a451430e0d17a7c114d1263471a11f6550633ffef6b8c1cc7de3bb9a56860c5b88 SHA512 5b87d7d4a273b15454035b920dce9f01620b27d8b6e4b5c86fa79f05062e7100ed066432c6351a3ff4c42be7fe095c616922c8ef4b51f97ab861ecbe07ff472f
+EBUILD rxvt-unicode-9.22-r1.ebuild 2060 BLAKE2B c9d0ac433f8274c6a64061011506bc3d64c6515cfb6f22bab2d9e0bb42ffc775c68855f55f639549e2aad584e647a226289435d387d5401906b699c77085f525 SHA512 098e04ad1a63ebbe40e923721074c6f7f933348d8359b184e6552ef6639ecff8ac92db23f03faae031e88e41678dd893b6c63dd0e4d684a5f054aca07558d4df
 EBUILD rxvt-unicode-9.22-r3.ebuild 2131 BLAKE2B a2b63654c2c983ae159923d5683bd00902206dfbf25de1d01eb1728fa8416e7626e3657251cc4faa32150bedf57a44de6c3b4ed8eabc8e494315d2d5f45c96c9 SHA512 cd7b3ca4384906a863a172df692ed4f174a436a8b66f4ab765493508ca3ea676af50bef70fba17d06445507450c4ec1a06f47bd6d24bbd75c4e0b1b2190c69ff
 EBUILD rxvt-unicode-9999.ebuild 2070 BLAKE2B ecb5c0fce4d0f6f99437f878e9a87b8a050372ea3af0362a9471568d5cf7397aa54dadddd86ff1e015fe7b5b2a0f0ea50c643d046245780008197d4d56f65c10 SHA512 cd692d00ea2aa8ccd668a1051cd3e074ceffcd3932822a41aead5368e9c9145483b69dc5a7f9f212211b4e0b0cfa89f94a98b5e1347fa31a46afebe251717927
 MISC metadata.xml 1099 BLAKE2B f30d8fc667246ab2e113f8e9356941f0e7cd40aad88ed578cece7e5cba1622aa2c8ea0b5918d239b994483fb171f8c1fcc03ae6e2d5204f0c2d09a2b22819be1 SHA512 bbd5ec950a1a14975ba50860a0ee924e6a736890dd3bbf7add4b001d164cab6ddc8bebc94c71cb855524b5006c29c3176dbcb489817afad54de1dabaa0410978
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
index 0dd9c4f13469..d47d780ec9aa 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="
 	256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
 	+perl startup-notification unicode3 xft
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 7be2047ea681..0b5302af8107 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,7 @@
 DIST xterm-337.tgz 1336781 BLAKE2B 6878154cc5d2f8547b8b8ffac0bff7603dce6d58c294b4153e169654fc441f1209c97a6d17bf3f880d0160a42e102ca8fd4a291c2b7d373269290a7bbebeeb8d SHA512 fad31aa971a42cf38d3e3db2edc615b408d92226c305654b9276592c6dee075f31c7f082a3f549284f1685a31d5d9dedbda99c2c308a90bd741958f862806609
 DIST xterm-351.tgz 1401009 BLAKE2B df32425affce33deb199710be118e90da7b1975882aaf92ff1ad5e976ac18f280cf7d72362d82c0ff9f9530d8da3ba133e345ff9de7f0ac0a2134200c9cc87e6 SHA512 941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00
-DIST xterm-352.tgz 1405420 BLAKE2B 46cedc409cb174fc1901bec31e190be64a07de34d59d0e767217384761dba7e98d97728fc8976f8a432eb80256471edeb2f4b58a61f875aaaa9b2cf20999f08e SHA512 9116f78dda685af75192f2fcd0ddff5244746f0e55b5e91ced6be0f85cb3dd78287bd873cf55ccb15901e98647df9cf8083b9ad84f53e12bae5134889aef82c0
+DIST xterm-353.tgz 1407183 BLAKE2B be5efe091a9b9511b264eed0c12568d0d92ac7189c883d62d21124ed45a5d229a3a063496f7bbf08e593bfdc5652c5d153d87f8313a9b2901da8e15483904565 SHA512 2ea63858ec069a769f0a25a159d17099044686e20649233631244fed29440fa8beebbd0dd8ccaf4260fb3d26996a49013eeeea7e0c98860e00d2e657019e2611
 EBUILD xterm-337.ebuild 2587 BLAKE2B e78f6b212cd3f47412ff24377791100f8855a31e95c37ad9721955966dc49513d5f0f25576fa24014b5de55d6c0809e3a15d4a22832854799735e83eac6ea1dd SHA512 439ad5b7bd4c98cc3053a707fe4ab72acbf90c9864a5654b1333baef8094b6ba25b4ea85d98a4f939a124706d2ff0c9fcf4ca74e5a9a6f6dbf59a1886cd09ff8
 EBUILD xterm-351.ebuild 2633 BLAKE2B 975dcaa27c031b84a6f087dbf22ba7000f9a0b86eb6766d20cc1050fef5a6973ec5eca7abf3c38eba20a643efe29a6c733587cb687da7196ca8f8db4f76cf055 SHA512 90ea97ae8a145919364b60dc52efd72b93639d2bec89ab12090e47ff03be59ece61ad0bf42ddd12db405c24960437aef597c4cd1a0c0cfda27b137e3f5783b34
-EBUILD xterm-352.ebuild 2639 BLAKE2B c6a6638503226412ad582323c3ed6fcf70919e5234a69cad8dc1682df83b1266a8dcfc3e0512b074d0c59d72830f0c30659b9215b67f50dd7700ca3893c1c8a5 SHA512 975e4d6a883603d2ebaa4310e52c80fdd77a046a9dc33ac7827108bcc1417858e4e2638249bf1706f543676dee78d88fea2a21274288176039be69213e6323f6
+EBUILD xterm-353.ebuild 2639 BLAKE2B c6a6638503226412ad582323c3ed6fcf70919e5234a69cad8dc1682df83b1266a8dcfc3e0512b074d0c59d72830f0c30659b9215b67f50dd7700ca3893c1c8a5 SHA512 975e4d6a883603d2ebaa4310e52c80fdd77a046a9dc33ac7827108bcc1417858e4e2638249bf1706f543676dee78d88fea2a21274288176039be69213e6323f6
 MISC metadata.xml 461 BLAKE2B e2342778bf1a9f780a10a9215182a41019c65d1412fbd9d9e215a8660a1fac0e4c7d62842286b46ca659b42fc6c528cdcaa8697c465de652e1c8c0f0ae21c2d8 SHA512 34f61ee876ad6365efb4d9b69208b65b33bb47eeded0a1264ee9d2f9bec2e21ba2dd65852d3d0adf101a506a19d0a519e6612df84fe08b875c334dbb3341c581
diff --git a/x11-terms/xterm/xterm-352.ebuild b/x11-terms/xterm/xterm-353.ebuild
index e29b43efd773..e29b43efd773 100644
--- a/x11-terms/xterm/xterm-352.ebuild
+++ b/x11-terms/xterm/xterm-353.ebuild
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 8634191743d3..481de051b02c 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 0d8ff93cff6c..3447e65783a8 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,4 +1,4 @@
 DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3d834e4147c3a3c5e6ca7c705ed2d16e8cf0a1255f5ae999d7e930b9716585b8c498c220f1ab40fec929dde7679efd56f3b18a45 SHA512 9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD adwaita-icon-theme-3.32.0.ebuild 1655 BLAKE2B 1499560082f129f35997c26518a4703c312ada5751432764483a9973ecd2766676aa9e3152af9f6e886d468f0345b1edb154eaff8db978bd64a47c9cd211ec3b SHA512 eb57497a09b5978f64945142b221eddc247b0c4df87ac3fd7672e1ebe8326ab81bd9c6000bb90571c4aa509e790021a49c3f72f502d44854263badb4ff13889d
+EBUILD adwaita-icon-theme-3.32.0.ebuild 1656 BLAKE2B 31165a763393e2a64d0539408e4523aad81edab4b799f9b273117c8d6c0bd937eeed0e71ddf7258a614df42b76b675ad41b8af5d77a2f2c35b0a064bf60196dc SHA512 aded45007328b87a69052a794afcb3a2450ca30c93f79d8f4ff207745ab1ea072bd567701711a6ca3121b8841e9b9af89cd0397a4ac4f92146f5a775f7ca049f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
index 51ff067911bb..3ae536ce48e5 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/gartoon/Manifest b/x11-themes/gartoon/Manifest
index 38c21053c470..020e0745dd1c 100644
--- a/x11-themes/gartoon/Manifest
+++ b/x11-themes/gartoon/Manifest
@@ -1,3 +1,3 @@
 DIST gartoon-0.5.tar.gz 1552790 BLAKE2B 6d753c806a26fed906a212b288c3db8de2487ed47abb660769dce2fa3785dd7e7608ebb95987d64ab8978616cd030e54ce83072d052a053adf6b4584a1320bb6 SHA512 c9a3def77e9cbbd8bb6f5ae469b4720b8b26b182daef44f65676a8a1db48424d1e73c3dd8a26b0b8918ad81a9dca0a1f78e162a1e1a938d9a56115dbbaf4ebb9
-EBUILD gartoon-0.5-r2.ebuild 1193 BLAKE2B a6cd35a0fa8470f65dcd710a5e9a2512f2dd7c0e59366675a4015b31036d87d5f5bce7d0fc11faa468acaa22a6a5ab4ac3ac3815fbb7219c827a6f94565ce526 SHA512 ccca431834ea3fcd37c4ee6a7be112374f8d6592000744232fdd97b5332f35c8b9a94c55327e3ae497a3f13cb102d35fc571bff47e2607e9cccdf40937b393eb
+EBUILD gartoon-0.5-r2.ebuild 1211 BLAKE2B f38c7d3d1a0abd77a38ecd9162aff12c5b9f2e910300fbc33d36b0dc2daf8c44319421a01f3b89f0b2b06df5824d815ff3b15d093136ce85202e50fe71575b4f SHA512 f50ad2b1b933ead70cede050f63875ec7e6b08de5833d435bf230171b257fb8efa8d677e93e861dd3ba2449c40bcabaaa20aad0bafa95721b46a921c438abe51
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gartoon/gartoon-0.5-r2.ebuild b/x11-themes/gartoon/gartoon-0.5-r2.ebuild
index 229faafe816f..a72f6205284f 100644
--- a/x11-themes/gartoon/gartoon-0.5-r2.ebuild
+++ b/x11-themes/gartoon/gartoon-0.5-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="Gartoon SVG icon theme"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/x11-themes/gentoo-artwork-livecd/Manifest b/x11-themes/gentoo-artwork-livecd/Manifest
index f66559ef2757..55cce80e7450 100644
--- a/x11-themes/gentoo-artwork-livecd/Manifest
+++ b/x11-themes/gentoo-artwork-livecd/Manifest
@@ -1,5 +1,5 @@
 DIST gentoo-artwork-livecd-2006.1.tar.bz2 1810876 BLAKE2B c70c2875e04a46e571063df592aa314aa4301eaf2e28aaf05da3312c2358a67f6a8c99a7dc24aad05d636ebac7f7f44f99e51d7acfbe2684fb946fd2de02d356 SHA512 077cb8fd22f04e5d87b14f6b71ac6a40a3a068c4a491a3fd0fae673a247f145754afd80952918d56ef7471fd8c750e609a14d022d7c8a96dd884463871b286a0
 DIST gentoo-artwork-livecd-2007.0.tar.bz2 3760355 BLAKE2B 7053d74ebdf039982c1533b79cc1e5a293e0909fa54a6875de0036148b2fd886c4da1873ea5df84c28f904c3355f95e98a8776462ce2dd73353797054a689adc SHA512 330c13abbb8f0410305a980a88cbb5e1aaeff63b2967750728a267a9702925bb16071d32d9a188556ee36e84edde463db924cb8dce1cb519289c3f7ad9dec66d
-EBUILD gentoo-artwork-livecd-2006.1.ebuild 458 BLAKE2B 0def82965ea27fa7d0d88c02f7632748f91f398754d145e74f39c4c80ec6463c34f67d13f07a5fb406fd9d1aade255c79cbbb1885d7516c5673938b27f809945 SHA512 e7ff8b6539e4d2011ca66011d0937a0e05a06c0308584586e518b96f5f5837967c51aadbe28b802cbfe102be3e1c8e07f9a16357bbddc563a1b7176f1e546118
-EBUILD gentoo-artwork-livecd-2007.0.ebuild 458 BLAKE2B 0def82965ea27fa7d0d88c02f7632748f91f398754d145e74f39c4c80ec6463c34f67d13f07a5fb406fd9d1aade255c79cbbb1885d7516c5673938b27f809945 SHA512 e7ff8b6539e4d2011ca66011d0937a0e05a06c0308584586e518b96f5f5837967c51aadbe28b802cbfe102be3e1c8e07f9a16357bbddc563a1b7176f1e546118
+EBUILD gentoo-artwork-livecd-2006.1.ebuild 475 BLAKE2B eea437492a39fd4f1bed0deca8f7ed618f22bb21cecfb50f495dfe76beceae38078308b7bfb110e99d44e5dea800b490412d50e6f7ad94fae79ef6aab47c46d4 SHA512 8efe2166c2ce539d4cb42c6cb1d0e2480090acb1cf8d54096726edb9953c023ff6d991d8d5e8ca7aaa5f5e0f74800d2de315e470c3e6a29c3562b13c92784d89
+EBUILD gentoo-artwork-livecd-2007.0.ebuild 475 BLAKE2B eea437492a39fd4f1bed0deca8f7ed618f22bb21cecfb50f495dfe76beceae38078308b7bfb110e99d44e5dea800b490412d50e6f7ad94fae79ef6aab47c46d4 SHA512 8efe2166c2ce539d4cb42c6cb1d0e2480090acb1cf8d54096726edb9953c023ff6d991d8d5e8ca7aaa5f5e0f74800d2de315e470c3e6a29c3562b13c92784d89
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2006.1.ebuild b/x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2006.1.ebuild
index e91274019d0d..e62e74be4fae 100644
--- a/x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2006.1.ebuild
+++ b/x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2006.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A collection of Gentoo Linux wallpapers for the LiveCD"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2007.0.ebuild b/x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2007.0.ebuild
index e91274019d0d..e62e74be4fae 100644
--- a/x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2007.0.ebuild
+++ b/x11-themes/gentoo-artwork-livecd/gentoo-artwork-livecd-2007.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="A collection of Gentoo Linux wallpapers for the LiveCD"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~wolf31o2/sources/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index 336fcb67d62b..15f31d6e5e0c 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,8 +1,10 @@
 DIST greybird-3.20.1.tar.gz 193824 BLAKE2B d4e5cba92e9acf2fd084ee5b1bb5db332bb541193980ee7c74ba98da3b1bb675efd171078fac6051be21d2c2fd03b88f45bf7dff3101ec91578dc28bed212ec9 SHA512 9fe8662fa1c3c9b51aa1ba6d9cb9a54a8e7640386dc43cb695e87ed733a40893067bd86277a03d1c17c48596ba0897a0a41ed48db985727b0d65f2ce2de2227e
 DIST greybird-3.22.10.tar.gz 212225 BLAKE2B d38d05d3a2523e58ed8fc8474bd8607a45b4f63d33f6053f5b9cc749504be3c3930d6f156a26abae9dfcd9214e68f92343bbcd0ecef7e53640a597b28562875e SHA512 c950de36c9733f98b454fde1ff5f8005169fab3b2782ab9f13a95a1aba938766f38666ad1229ab429fa163cf0e97cf5ecc8a84f3eb63cc378c35d79ea54b513c
+DIST greybird-3.22.11.tar.gz 330760 BLAKE2B f95bca90057f09e78bb5024491ba21f883d6f3e844056bbf55d2dab572373d52590048080c7ae4a1d61608362878c7940f51bd3d0a246abd9e185183361517bf SHA512 18f7735cd0f746ebbbb4c9fc112f28ecd73e17e8065a1f99027ceb0201639a531663e387b70f408d21c437b6a4504fed1e73b308fc90fc6dd00646e62a6dc68e
 DIST greybird-3.22.9.tar.gz 211750 BLAKE2B bfce416c55cc03d1f98c4d14916bcecb6cdc857ed3f813d90cae2a9e92f607d4ae3798d0eb39b0e548f7b4c7964b60d4970c442b91eb78db02772b9a2c02f3a2 SHA512 d09638c78d74e26a428edfbbe00719208fac5e574db11eac2e538d25fa9f3270c9c7b636f770061807a59b200c8afa4252a9513cffe1f4af3d186425b6a14744
 EBUILD greybird-3.20.1-r2.ebuild 1334 BLAKE2B 9345926c3d85689c910c590ceb36a5368129c09790adcf091bd8cc358a9696706490451294149640a5d127c0167e01252f1c36687074103dd4a1af140b96a455 SHA512 3334a278c7ab07961de8e545aa75355136dbe770c1240ccd3ffc15bec2fe0498083a4e6566cfab9e5296993eca9f37fbc1b0b65e7b36d1bfe8ac29175150b783
 EBUILD greybird-3.22.10.ebuild 1338 BLAKE2B 74a2d975b43c6a238490c55c046f895e7f6c01d562f581e8ec826c8b1e31db6bb9548f2d1f5d9b2b73d79096c4fbe2f5ef1edd1074265dc846a2caa5e4226216 SHA512 f516d50df77b38d5378a7480557103f2447a1766912600fedbbef63fa74b212712c63d421a227b951a0e6bd384e63933051ffe3a32cf0466857558cc51e2dd52
+EBUILD greybird-3.22.11.ebuild 1489 BLAKE2B 5a0c4cf667325e1b70d5771cdc1b020d0ee51c006a57e56abf5731772882c07f12f686c121c127181dd7680da1fdcfb525fea73734d53b2c07940993096272e7 SHA512 59424fe7b5dc11b53eac4a749a0c464d69738d9df3aa275774aae7779c5dd9cff6442d8b57bbca4ddbb95c8526038ca92c22aca1ccc394df663e8c8bdc3f6b90
 EBUILD greybird-3.22.9.ebuild 1338 BLAKE2B 74a2d975b43c6a238490c55c046f895e7f6c01d562f581e8ec826c8b1e31db6bb9548f2d1f5d9b2b73d79096c4fbe2f5ef1edd1074265dc846a2caa5e4226216 SHA512 f516d50df77b38d5378a7480557103f2447a1766912600fedbbef63fa74b212712c63d421a227b951a0e6bd384e63933051ffe3a32cf0466857558cc51e2dd52
-EBUILD greybird-9999.ebuild 1263 BLAKE2B 10623ef97f49b0608dcbee136b273d5c56de5b4cf60c4d349f301a629127f15279b0d448cef72e2090cfd84b8bce2df90ec780d062171b7dd0cacee54586482a SHA512 0886455ee850ad11ad1b8f9b889a759abfde9e5b9737b8f3621c347d813652f69f22d9aeebb0e500fcbc6a65d511c8db64b8202e2c4bb28029ccd0579da9f480
-MISC metadata.xml 437 BLAKE2B 2c6f93604ac1c8b907f31e1a3ac813c13fd72a97bd0ecd5071c61d9729d05de4bb7dd1f4f35c1af2fd8c48beb674534d58a9b40e4b441ba75ca1210cb88b4a3a SHA512 06ee186a69379acc1e8dc3b353e3a86c4a914a1c529d9148eda9f9b11887d58183dc24da8a600fb37252f806d9703a9dc37b14ee7b080204d89d53c3d940193e
+EBUILD greybird-9999.ebuild 1423 BLAKE2B 4d46c23fe93336ecd0f163ca2fcc4d9c45d86c01cb4ab76ee035adb16aad442c41b4361bcdf1e1d4f187b68588eefbdd55c4ab76024977dd71bf2d27df630191 SHA512 faa7a410589d6e3278818c928cbb55a8a8dbcad474b65a5646203249b7c4a2c27e5692fe23c398eb2a402b15ec892483c38d4beeb246d3d8c56acf0c3826b5ea
+MISC metadata.xml 541 BLAKE2B 798da001d7f1035e3cf88fb0e9629368c85055bb349b1d7ae101e1daf1a435f7047aab1d6561a6c744dbd6d6771e42993724ae59b4f28af64b779164d8613d54 SHA512 0294f4f77e1f1e683d5f7596d410c3ce7f63fbf7cbcdaa5a195aaa6e762a54439ae782119e814bad0cfdae56fb4ec0b3aba21ef6c43dc59435d4e3de4ec88115
diff --git a/x11-themes/greybird/greybird-3.22.11.ebuild b/x11-themes/greybird/greybird-3.22.11.ebuild
new file mode 100644
index 000000000000..e1e28aa5a99d
--- /dev/null
+++ b/x11-themes/greybird/greybird-3.22.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson
+
+DESCRIPTION="The default theme from Xubuntu"
+HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
+SRC_URI="https://github.com/shimmerproject/${PN^}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
+LICENSE="CC-BY-SA-3.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ayatana gnome gtk2 gtk3 xfce"
+REQUIRED_USE="
+	|| ( ayatana gnome gtk2 gtk3 xfce )
+"
+
+RDEPEND="
+	>=x11-libs/gtk+-3.22:3
+	>=x11-themes/gtk-engines-murrine-0.90
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/sassc
+	dev-libs/glib:2
+	dev-ruby/sass:3.5
+"
+S=${WORKDIR}/${P^}
+
+src_install() {
+	meson_src_install
+
+	pushd "${ED}"/usr/share/themes > /dev/null || die
+	use ayatana || { rm -r ${PN^}*/unity || die; }
+	use gnome || { rm -r ${PN^}*/metacity-1 || die; }
+	use gtk2 || { rm -r ${PN^}*/gtk-2.0 || die; }
+	use gtk3 || { rm -r ${PN^}*/gtk-3.0 || die; }
+	use xfce || { rm -r ${PN^}*/xfce* ${PN^}*/xfwm4* || die; }
+	popd > /dev/null || die
+}
+
+pkg_postinst() {
+	if ! has_version x11-themes/elementary-xfce-icon-theme ; then
+		elog "For upstream's default icon theme, please emerge"
+		elog "x11-themes/elementary-xfce-icon-theme"
+	fi
+	if ! has_version x11-themes/vanilla-dmz-xcursors ; then
+		elog "For upstream's default cursor theme, please emerge"
+		elog "x11-themes/vanilla-dmz-xcursors"
+	fi
+}
diff --git a/x11-themes/greybird/greybird-9999.ebuild b/x11-themes/greybird/greybird-9999.ebuild
index 5c63ed8b7137..683dbdd3528e 100644
--- a/x11-themes/greybird/greybird-9999.ebuild
+++ b/x11-themes/greybird/greybird-9999.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3
-
-MY_PN=${PN/g/G}
+inherit git-r3 meson
 
 DESCRIPTION="The default theme from Xubuntu"
 HOMEPAGE="http://shimmerproject.org/project/greybird/ https://github.com/shimmerproject/Greybird"
-EGIT_REPO_URI="https://github.com/shimmerproject/${MY_PN}"
+EGIT_REPO_URI="https://github.com/shimmerproject/${PN^}"
 
 # README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
 LICENSE="CC-BY-SA-3.0 GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="ayatana gnome xfce"
+IUSE="ayatana gnome gtk2 gtk3 xfce"
+REQUIRED_USE="
+	|| ( ayatana gnome gtk2 gtk3 xfce )
+"
 
 RDEPEND="
 	>=x11-libs/gtk+-3.22:3
@@ -27,18 +28,15 @@ DEPEND="
 	dev-ruby/sass:3.5
 "
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_install() {
-	default
-
-	pushd "${ED}"/usr/share/themes/${MY_PN} > /dev/null || die
-	use ayatana || rm -rf unity
-	use gnome || rm -rf metacity-1
-	use xfce || rm -rf xfce* xfwm4*
+	meson_src_install
+
+	pushd "${ED}"/usr/share/themes > /dev/null || die
+	use ayatana || { rm -r ${PN^}*/unity || die; }
+	use gnome || { rm -r ${PN^}*/metacity-1 || die; }
+	use gtk2 || { rm -r ${PN^}*/gtk-2.0 || die; }
+	use gtk3 || { rm -r ${PN^}*/gtk-3.0 || die; }
+	use xfce || { rm -r ${PN^}*/xfce* ${PN^}*/xfwm4* || die; }
 	popd > /dev/null || die
 }
 
diff --git a/x11-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index ada89e0a62a0..2a50bd79b0d5 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -6,6 +6,8 @@
 <name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
 <use>
+<flag name='gtk2'>Install theme for GTK+-2.0</flag>
+<flag name='gtk3'>Install theme for GTK+-3.0</flag>
 <flag name='xfce'>Install theme for <pkg>xfce-base/xfwm4</pkg></flag>
 </use>
 <upstream>
diff --git a/x11-themes/gtk-engines-adwaita/Manifest b/x11-themes/gtk-engines-adwaita/Manifest
index 6f1505a0ba9d..b8c9d57b4b22 100644
--- a/x11-themes/gtk-engines-adwaita/Manifest
+++ b/x11-themes/gtk-engines-adwaita/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-themes-extra-3.28.tar.xz 2953272 BLAKE2B 122ff5f1d95086c5cad6818efa79763ab574b7d6792b846198ac7ed5b521747d4357025ebd0ac6b5ea1161bf1dd3482ac2e867822bf863928b05a8486172ba0d SHA512 bccc446e86b12476b86a0fe2e3354500c8fb3eef62a85c3823d69aaa259e032e1f94e7993bf633397b669c425ef42635b0cf17b376f0b7cf1869bb1d7160ede0
-EBUILD gtk-engines-adwaita-3.28.ebuild 1079 BLAKE2B 9d56df2477998474e94b98c51dba875b40806e49151e1c3a239cbaad2b7a386d5085a34bdec2ace5650c1b06c85122bd9f9b1f14441ae02ddaeecfe2174b1e10 SHA512 b2622b36dbb5f05c89ad4ad3c35562190769b212f0c4ffaa090f45692fcbd5571027b61fdfc5adf2d2ef15319076834e42b0f512cde40cc645af762ffbac1291
+EBUILD gtk-engines-adwaita-3.28.ebuild 1080 BLAKE2B 3c5160849d358fb461caf8fb5f2fecc182f2d0b3e7941fd5d782e1c9c4abe58a8101b9f5d29e806e19f0b9775e0572613244ea47c4be309f059b8d63cce7c473 SHA512 370de4ab9bf8bd5ab715c342f06db7a0963585d3c636eca5ae1d50c344b05b6ea2cc104d6cf8714f49f885f97043a4fabc225b0330ec641c9b7ff8c7e305cd0c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
index 3e162d094030..4263aba9d33f 100644
--- a/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
+++ b/x11-themes/gtk-engines-adwaita/gtk-engines-adwaita-3.28.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-themes-extra/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gtk+-2.24.15:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/gtk-engines-rezlooks/Manifest b/x11-themes/gtk-engines-rezlooks/Manifest
index be5f04010c95..86a7f84fbde8 100644
--- a/x11-themes/gtk-engines-rezlooks/Manifest
+++ b/x11-themes/gtk-engines-rezlooks/Manifest
@@ -1,5 +1,5 @@
 AUX gtk-engines-rezlooks-0.6-glib-single-include.patch 198 BLAKE2B 1008d5bb3af370d03428b593b3a1d7b6851ad8f2088a0d5b109fcf47a72d09c944517799d8ebdce76e1510ca7c2458484d3d79e2efed89a7f74bbd84e011cccd SHA512 0a91046c290072fe75fbc62f67e1f50a60a992a10c871a2f8909bf2a28d91b8439e0cde8bbaffd7d8ec3e7f21178d7bd67e74f8167cbf123830425fbb3e30a05
 DIST 39179-rezlooks-0.6.tar.gz 290016 BLAKE2B d6d713ee2ebe24c8fe1259cde41c2a6f7db75c0351bde99d3e4347cd0c74403893107806dd047e1807ef8f0817b67667927d4e6203180dbe59b2493a1bcc9979 SHA512 98b1eda414c5a33f1357d408aa4bd4b01c140afed0981941004db81d34f8f76c0bd49434009b776eb8f9adb24bfce9f22b72fb463200401409caba8effd3f0bd
-EBUILD gtk-engines-rezlooks-0.6-r1.ebuild 950 BLAKE2B ffdc455b2d7b54c18ccd344e214dd2ec1dfa28a108fd16e1082d6919ee534e80805cd926b78e136f746827ca1454fe5dfc69e014ddacdc9bb48ecb5c6a86b740 SHA512 98ca876d67fe9ff435aba84fa99a9f481138d8275f1525230c53f8a987e77380841e267f0f933495dea7e2b27208f2267f92b4cbfb371b979ec38f98b1d6afa0
+EBUILD gtk-engines-rezlooks-0.6-r1.ebuild 944 BLAKE2B cd36c6b33e42a8c59be226f4b0fe5ffdb17c3eaaa5e1709c5974c34dcdea2050162f1b7ed0622aa7a1ecdaf6f3ba709619adf69f170812c7bc30712b34b93d7f SHA512 8d50a249260395ad14e9446058b4c82ce11192674b5cafcc2ea74373f0b8c5e954dd04f975afbcf0131bc1f62f6c2a41595a81cb2aae45045285cb4bedd801a7
 EBUILD gtk-engines-rezlooks-0.6.ebuild 988 BLAKE2B 3cbc68649042d3c43cf97a3552bc6f01ba70d5f74e4b4271b83a43805faa6c9baf1ddd86d54a6e77db0ccb664aa822ac9b6f1597e42255465a97d3af55921034 SHA512 2c2db855bcc259b9c77dd8d9958f56936e6255f14d5e41381bece2093c202dd611a9b452c6b5a8fc234b24c4ab776e0342464809a878b3d8648baf4e65693c24
 MISC metadata.xml 404 BLAKE2B 51d32e00ae6e7368399cb1724e10d8c3c9c340fd6460c26eee80eefc2c43b4616b9e5ac7c9c0034cb430bb0ec90ed26c6ea57abb24e5123717d564a03e7eb279 SHA512 86358b1175dda7c2e0f69595eff87dd58c448eba3ccad9136f44b19e428c7abe0cabaf4ec250f1962eba36feb3946aa2382420743f8f7bc178252ae5c15a4577
diff --git a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
index 445122e83828..4886633ce530 100644
--- a/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
+++ b/x11-themes/gtk-engines-rezlooks/gtk-engines-rezlooks-0.6-r1.ebuild
@@ -1,28 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="Rezlooks GTK+ Engine"
 HOMEPAGE="https://www.gnome-look.org/content/show.php?content=39179"
-SRC_URI="https://www.gnome-look.org/content/files/39179-rezlooks-0.6.tar.gz"
+SRC_URI="https://www.gnome-look.org/content/files/39179-rezlooks-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="
-	>=x11-libs/gtk+-2.8:2
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6-glib-single-include.patch
-)
-S=${WORKDIR}/rezlooks-${PV}
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}"/rezlooks-${PV}
+
+PATCHES=( "${FILESDIR}"/${PN}-0.6-glib-single-include.patch )
 
 src_prepare() {
 	default
@@ -41,5 +38,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -exec rm -f {} + || die
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index 01be37dce95d..d3087d6c7b47 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -5,5 +5,5 @@ AUX gtk-engines-2.20.2-java-look.patch 602 BLAKE2B bd9625acae0c7ce7f81089c716b2d
 AUX gtk-engines-2.20.2-tooltips.patch 1116 BLAKE2B ad050dbff4bba6c7172a449eec7b001d3f9cffc0c79043356ad1fda851d94aac8c1322caa1aedde9cb8931e6f73ac8e1f411e17c9e363a420f7612c8a6ad3ecf SHA512 0e89d704f883f0dce086f83b4dc27decc3e022f1ad7ec46e9a0ca9d5ab2e3a997826c8ca3d1340e3e51ed3e4433c7e30eac833b02f76409f66a08b178cdd3b30
 AUX gtk-engines-2.20.2-window-dragging.patch 466 BLAKE2B 851f633db234986b9855dffae2cdda3b812f48e9e221f14b601c1f65764fac0d88f5dd70cc96a50949725da52e64fb60ba59ab491856279b468dc255201cdebb SHA512 4f3f20c007a1b3fc001485fdd0c84450f8bbf3c2e95decd058b552adfeecc75a84ae2be7da3984c058df940bcb87ce6cd149d24a5e86486befd085d339c65a77
 DIST gtk-engines-2.20.2.tar.bz2 688171 BLAKE2B 1eb80f1bfa7f58cdcde6d461bcd6a41d7fe8b7ca20e11f1f59b350b3b5ce8c196c5f35330ec027d0ff1d9de19f28d412e0e3c6460487ac7ea61284fc1858a90c SHA512 049ae20d47a28b60fe5b0484e3c11bc6cd62d6167478f1d83df3066d618827ca9204767ab1b7a9ca02f542c3fc7929efc1bb85f65d66aaf5d5b15718b6de19e9
-EBUILD gtk-engines-2.20.2-r2.ebuild 1415 BLAKE2B df67ab3704ee627fea2c495163d97c57b83b03688f1d54d6bf2bd2b436a4d60e91ec75f74a9da5b6b2b7690f03c63f73bcb94ffc730f83d44a20e89bdd77e979 SHA512 f347bd37dfdfb6c04490eddc34ca777a95ba8194f39195aac76f7212e4f90c881f977a381e7b14bbff1b926c17602bb6038d61facee2c544e0cc17d5a16e3025
+EBUILD gtk-engines-2.20.2-r2.ebuild 1413 BLAKE2B 0495d171b7547a1ac7cc835cd3bd7b74c2658f59d58e84cc676070d6b6e3c4fd8d8d790030bf62de124730ff6284779bc014f368d0900b2cfe40792000a8d52b SHA512 40ca6263c39115592b510ff4e23d88641dc91e37e55c3d05c339b8db71b9e90de2144510e0672bc7021985432f973afdd8345b94371d24e80d6412ad16731b62
 MISC metadata.xml 667 BLAKE2B 4f110a2598845c8930ca8567655e34e87c9517cd68b41957d1450367b7e0ed783848bd7ce1213b407229fd7eea3b4a36760ddc7b921424821ae55fcb664e2788 SHA512 62bb1508fe80e89238a57dffb44b7e8951f5d5b8c50ddd412fdf84778e77a2e13c16bb6ff1045802fbd71a1dea038695b76febd024cb50b96258bfd67b32ad47
diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
index 36ea0f6a66b9..de0760941095 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="accessibility lua"
 
 RDEPEND="
diff --git a/x11-themes/gtk-theme-switch/Manifest b/x11-themes/gtk-theme-switch/Manifest
index f25cccdd7eae..3bff9126757f 100644
--- a/x11-themes/gtk-theme-switch/Manifest
+++ b/x11-themes/gtk-theme-switch/Manifest
@@ -1,3 +1,3 @@
 DIST gtk-theme-switch_2.1.0.orig.tar.gz 18914 BLAKE2B fb6eb46f16a6ede786e7afe62ffff81bde7a4473d000c6a068b7e506d0d7536554d59d451f594ffa2ae5cc04ab85cc854b3fa83a4a6169e1fca02e4c6da61dc1 SHA512 ccf3876ab764f0a6a5d764aac9912ecf1bf7c92eddf8d38ab153c4ac2772151c67af59762e2cfb6aeb33baf33a141824e0825be0f3a8de4675c577198cfacf2f
-EBUILD gtk-theme-switch-2.1.0-r1.ebuild 776 BLAKE2B 96755ccdfcf8858133830ac0ff8655ea8ea7c815b054a3dcd62e1c9c291c85517b4ceb94b7b64d775a3888d356905261462cbbc418cb755373a1f7613b3cdfc2 SHA512 fb3033b0aaa846d07b35231ad9b7b08d2750710fd0949ef7212a19afb0ad922d76cc888b16a9704bab37fbd96f5d1f4b64eba10c2670e287b2782c61cc48fd23
+EBUILD gtk-theme-switch-2.1.0-r1.ebuild 774 BLAKE2B e38e5fe3b36146fb1a633f2b3095d51aa3fe356ac68a7a1f4c6f1b3df61e545856874eb40235282ad46a3c753c46002ed3d2374bb5be39d9f7bc66ca4e7ef44f SHA512 7a94c05bd40596aba8bbf22932737a12a2a12a25d6fa0ffce05a409c9f9c79ab5629b92a30796fc1e2dc16fba6d434fa4a28dce18ad7c075d08290f7d3f7af2c
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
index 19137b4b5cbb..05d10caa2a7f 100644
--- a/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
+++ b/x11-themes/gtk-theme-switch/gtk-theme-switch-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
diff --git a/x11-themes/papirus-icon-theme/Manifest b/x11-themes/papirus-icon-theme/Manifest
index 73482ae80dc1..92cd21c3744c 100644
--- a/x11-themes/papirus-icon-theme/Manifest
+++ b/x11-themes/papirus-icon-theme/Manifest
@@ -2,8 +2,10 @@ DIST papirus-icon-theme-20191009.tar.gz 18636796 BLAKE2B cb1797468ffb1542fb6b732
 DIST papirus-icon-theme-20191101.tar.gz 20072061 BLAKE2B 457d47e16ce2c4465c8d23e46bbbc0753351442415be0a8293880d33909beb06b53d4ceb4e13eb2fb4fc1c453c0cc71bb313f7506deba3fec0f98cd47cf75150 SHA512 abbf3c6b248abd6945e7397ea53fe92e645d74918f6fa6f54e3701e560d75e94ac75c2e9d01d5bed7c989af8e14ea9dff4dba018956aaff43291d45fc7ab9e4d
 DIST papirus-icon-theme-20191201.tar.gz 20576688 BLAKE2B 50edc8609b37728ab70e8d5914c37b7860927e7123905546d52ce83a5b8a0bc5a706a536a9734a0fc875504c49b7036ab832f8f6b2587bb31b83213857651cfa SHA512 2faeeea2f0b3efe9b2f18783d5e081199295e03bda021243460daa28bde701b6f0aefb0fa6ba196bc32f44e4af72b7efadedbc377a56b315c2d1c3519c7934a1
 DIST papirus-icon-theme-20200102.tar.gz 21110348 BLAKE2B b52282b74cbe771212360e170cdb7be972b98a03e0b283078a58ef8838e95b64ba8e010c0eb97d8c9bc54e8a9e5152ea9768628e6acddb41b4e992da9eb521d1 SHA512 63e80ff061657bf6512d3906cae67d24221cdaea70002281fa91c4c8f127a504cac4e1a1afce0da9555ef917d30a390891c7f8d7f6c11064865819b88887a84f
+DIST papirus-icon-theme-20200201.tar.gz 21482791 BLAKE2B 5287e031505835465b85115d1a86e8af61b9e5947357654a3f00b768708bc6e49accbaa219b6b0889798153215cc072d7f8b1cd677fdfff113bf925968980e04 SHA512 07ed45eb409ed12f57657f058f9a5a03dec77679ed598dc8645536a614ecc5424c60be57f10de20ca72204d2a21152fdd62adadf2637bbfa1266d588c787d7e9
 EBUILD papirus-icon-theme-20191009.ebuild 630 BLAKE2B dc611d9858b8177f24e3b7a221d91438425e43fa14f74174930ed30af691ed1f0cc65e09ab34cc614341653aec187443496e513d314e3c6799e9b2623ed0eb24 SHA512 9c23250831e762f955b174c281cb6b96ab6c07d5ff1fdb2180578c903e9f2be40e23f81bedf6b7c83415a8c10d07ce3a04d3e219b52c94c497a306a727f18b38
 EBUILD papirus-icon-theme-20191101.ebuild 630 BLAKE2B dc611d9858b8177f24e3b7a221d91438425e43fa14f74174930ed30af691ed1f0cc65e09ab34cc614341653aec187443496e513d314e3c6799e9b2623ed0eb24 SHA512 9c23250831e762f955b174c281cb6b96ab6c07d5ff1fdb2180578c903e9f2be40e23f81bedf6b7c83415a8c10d07ce3a04d3e219b52c94c497a306a727f18b38
 EBUILD papirus-icon-theme-20191201.ebuild 630 BLAKE2B dc611d9858b8177f24e3b7a221d91438425e43fa14f74174930ed30af691ed1f0cc65e09ab34cc614341653aec187443496e513d314e3c6799e9b2623ed0eb24 SHA512 9c23250831e762f955b174c281cb6b96ab6c07d5ff1fdb2180578c903e9f2be40e23f81bedf6b7c83415a8c10d07ce3a04d3e219b52c94c497a306a727f18b38
 EBUILD papirus-icon-theme-20200102.ebuild 637 BLAKE2B e82b4a2805a7cfe8fa2b395588225577f61cc68d956ab8fc3c06dfb7ae6cbef9c3cd8b287082f82fec8c9f569ff0b2ce5017e1822eb982fe1ce11d5306dc1126 SHA512 eaa66605b598f6804521339f1044eb7976bc5b2fc179d59e3e4a0fa521ae80ce04172109f37e814ae3f0e0797429004dfe996e0dc372c589945eccf27fea9fdd
+EBUILD papirus-icon-theme-20200201.ebuild 637 BLAKE2B e82b4a2805a7cfe8fa2b395588225577f61cc68d956ab8fc3c06dfb7ae6cbef9c3cd8b287082f82fec8c9f569ff0b2ce5017e1822eb982fe1ce11d5306dc1126 SHA512 eaa66605b598f6804521339f1044eb7976bc5b2fc179d59e3e4a0fa521ae80ce04172109f37e814ae3f0e0797429004dfe996e0dc372c589945eccf27fea9fdd
 MISC metadata.xml 346 BLAKE2B 2d58a9d14140c9604368097a28fc9c0042172bf4d023cb8efe6cab6b06b43226e5ed6f221cf55a7b7ec02ce4724426ffca9c025e44a515fdf16f5f0f33ca9a9a SHA512 6e71bcff36afe7da780a7241f0a32d39d78b9ffdc1b3c7b9b1025ccd9c37b38d9b519e44584c78af431d124b97a7c6303921be3716f43c9769da0eff525e4235
diff --git a/x11-themes/papirus-icon-theme/papirus-icon-theme-20200201.ebuild b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200201.ebuild
new file mode 100644
index 000000000000..5d08cbe8008b
--- /dev/null
+++ b/x11-themes/papirus-icon-theme/papirus-icon-theme-20200201.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils
+
+DESCRIPTION="icon theme for Linux"
+HOMEPAGE="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"
+SRC_URI="https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/icons
+	doins -r ePapirus Papirus{,-Dark,-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 075a51c70453..c2ce0ee84b7d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index ee8cfa7387b6..ceb4acb4b127 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -16,5 +16,5 @@ DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9
 EBUILD awesome-3.5.9-r3.ebuild 3179 BLAKE2B d7b5a660e5f32bb5bfed3f177aac14dbd1b1c879cb4a6ae9c57cb9676e1e4e17ac327e846d263ef88ee7297c1fa43a11450aadf557a107fb9e592e57a757b066 SHA512 547fb63ae5779f4046b3e3cc1a84d052a71d74a70aa4b9d42c595dd443c7f56f74d3f2121596b0a312dce98b26247ca967d45f236f73deae2879827dd9d121c5
 EBUILD awesome-4.2-r3.ebuild 3947 BLAKE2B 30c377ec58fd84c01929d4bdb04fd3d65757a67336af701421dcd98a4853ff40bc57d443a809cd13fb4c2c93d3f203357c208b0ee150ace42116d3dbda9a99ba SHA512 81b79af79fe5dbff19bb708a98233dfc72f40057300f5dbb1608e6dc9de79662116d3d52ecbcf962c2b852884bed8db1da35dd444fbdbb64bb949c207bee4c60
 EBUILD awesome-4.3-r1.ebuild 3596 BLAKE2B 60a3a026cef8d75ea7feff3154821e09c849f394d26b1a55d8280cec0b43628d4c870748537cba9ef66db76a433b30c7d8637843d2972225fe621efdf03ec4e1 SHA512 f4b0e1ae8980ce71204a72bf37b730cb080532595d568310d8fabd830f21c48d6c4a00ff6ed382f27ef7c9203cc8697f9a8ec912cff013682286e92bc4d30b72
-EBUILD awesome-9999.ebuild 3560 BLAKE2B 1a494b8f424039019f8e53e726f630ee300588aefd38dbd8160fb8710c4a5e9b474635c9a44bba99e11098b4d48af2e11b74e0a09a6dac942bf4766a503d2422 SHA512 03fddc4915ff4e585719af1b1bc291e19f5fcd28759d15f22d9030777f62ab5464030b16a1efe6fdbd5d996c1c0254b1a8ed58067455555c4aa84ebb5b1a4b0f
+EBUILD awesome-9999.ebuild 3558 BLAKE2B 8838870e76af67a7fea184bc82d6a3099820d96d18a69b028d1191a47cab895152a4d80ddc18a4a28b2b70699d0ddd169763fbcfe20d626d527bc8cdd4106845 SHA512 cc4678cd1820b7ac927332dfc6bd400157c1a76fb1536d15308c1da09f89f37c00dfd3790e0f8d1c707e2f6db2ea90592ab905c08aae3dcb843840664a1e7fe6
 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 3bb2df137b3a..f4b885d7a540 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -88,7 +88,7 @@ src_install() {
 	cmake-utils_src_install
 	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
 
-	pax-mark m "${ED%/}"/usr/bin/awesome
+	pax-mark m "${ED}"/usr/bin/awesome
 
 	exeinto /etc/X11/Sessions
 	newexe "${FILESDIR}"/${PN}-session ${PN}
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 081fc44b8396..b19bbd8423b8 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,7 +1,4 @@
-AUX enlightenment-0.22.4-efl-1.22-wayland.patch 2288 BLAKE2B 6e8a9f4d47318372c06a74bb6e3c233c36f9e57332519e706602a0472285e0b249c45d3d6fbd3074d6d720f157b6ddcf1a37da60b60f52908ee0f006a9e11239 SHA512 7ba3e501d7df99aa3f0336c1db09edaf5b2acd9eb6d2ad4f8465d92c595edd2b85e6a16c1408dc75502d73778cd2634ce2f409319887f6e53707208cd4128335
 AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d041f0afc7077dc44780d12bd1a99a1bc94bb5a4a9ba21f59f679e1d4c82609791ee5a5e9828543b1e9154fae5 SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a
-DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
 DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
-EBUILD enlightenment-0.22.4-r1.ebuild 2200 BLAKE2B ec7e475f9a23d34b0505fd4e17d105e46f5ff678c9f886458a7b80cfa04e40545435105c495e6d8842a5d89b26babf6ae4d29215d99386d8870eb06952a668b0 SHA512 d538a3ebe011b66d0c81c0f18a3614a418d39f19c43ae30d1991af447eda682a1198437589914561c7367c60b3239e0f7b3504277cad4c770bb1172e152e9fbb
-EBUILD enlightenment-0.23.1.ebuild 2800 BLAKE2B a58c4c71ca9d01f421a215905295cca214635c65d9b945e90fb23da916a740d86e74734d78976a61844eae6d788096bd50bf6533dc899f82863af8f2dcce32ff SHA512 905c40929ba275ee9c04c04fe873e970c147734d9ddd8e60bd925e952755d2e3431287e7b0496077e990df7aea28b1bdee44dbd01a33d7951e8c4f437dff197f
+EBUILD enlightenment-0.23.1.ebuild 2777 BLAKE2B 039f6940649fe7b1ac6d95a75bb76e7f923d5f898a34a966359a0cc2db505d1fb627f9a49e5e5bd1179f441e4c4f72cb4acd5b614732d0260c1a37e470fdfc13 SHA512 5bf887ad0f03bca7e60844042c6736331c9fe26a97442a2c9a234891a16206cda2aba3bdcbb44c7655ae1da34a36e692d30184573b894ee273c00c2d2ba28596
 MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
diff --git a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
deleted file mode 100644
index f94da2d87cbc..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.22.4-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-DESCRIPTION="Enlightenment window manager"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
-IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
-
-REQUIRED_USE="xwayland? ( wayland )"
-
-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.22.0[drm,wayland]
-		dev-libs/wayland
-		x11-libs/libxkbcommon
-		x11-libs/pixman
-	)
-	xwayland? (
-		dev-libs/efl[X,wayland]
-		x11-base/xorg-server[wayland]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-efl-1.22-wayland.patch" )
-
-src_configure() {
-	local emesonargs=(
-		-D device-udev=true
-		-D install-sysactions=false
-
-		$(meson_use udisks mount-udisks)
-		$(meson_use bluetooth bluez4)
-		$(meson_use connman)
-		$(meson_use geolocation)
-		$(meson_use nls)
-		$(meson_use packagekit)
-		$(meson_use pam)
-		$(meson_use systemd)
-		$(meson_use wayland)
-		$(meson_use wifi wireless)
-		$(meson_use xwayland)
-	)
-
-	if ! use wayland; then
-		emesonargs+=(
-			-D wl-buffer=false
-			-D wl-desktop-shell=false
-			-D wl-drm=false
-			-D wl-text-input=false
-			-D wl-weekeyboard=false
-			-D wl-wl=false
-			-D wl-x11=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	insinto /etc/enlightenment
-	newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf
-
-	use doc && local HTML_DOCS=( doc/. )
-	meson_src_install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
index 74caaded4b5c..4b8be24627ab 100644
--- a/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.23.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0.17/${PV%%_*}"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="acpi bluetooth connman doc geolocation nls packagekit pam systemd udisks wayland wifi xwayland"
 
 REQUIRED_USE="xwayland? ( wayland )"
diff --git a/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch b/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch
deleted file mode 100644
index 3321390cf62a..000000000000
--- a/x11-wm/enlightenment/files/enlightenment-0.22.4-efl-1.22-wayland.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From ea3f6ed68f948cea4b64432a6cdb72fca85e6987 Mon Sep 17 00:00:00 2001
-From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
-Date: Fri, 22 Feb 2019 11:12:00 +0000
-Subject: e - unbreak build due to efl changes
-
----
- src/bin/e.h         | 1 +
- src/bin/e_comp_wl.c | 8 ++++----
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/bin/e.h b/src/bin/e.h
-index 7d00d819e..abe5ed731 100644
---- a/src/bin/e.h
-+++ b/src/bin/e.h
-@@ -17,6 +17,7 @@
- # endif
- 
- #ifdef HAVE_WAYLAND
-+# define EFL_EO_API_SUPPORT
- # define EFL_BETA_API_SUPPORT
- #endif
- 
-diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
-index a9adad104..e56e4e6f8 100644
---- a/src/bin/e_comp_wl.c
-+++ b/src/bin/e_comp_wl.c
-@@ -2188,7 +2188,7 @@ _cb_early_frame_cb(void *data, const Efl_Event *event EINA_UNUSED)
-    if (ec->comp_data->early_frame++ > 15)
-      {
-        ec->comp_data->early_frame = 0;
--       efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
-+       efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
-                               _cb_early_frame_cb, data);
-      }
- }
-@@ -2198,14 +2198,14 @@ _e_comp_wl_surface_early_frame(E_Client *ec)
- {
-    if (e_comp_object_damage_exists(ec->frame))
-      {
--        efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
-+        efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
-                                _cb_early_frame_cb, ec);
-         ec->comp_data->early_frame = 0;
-         return;
-      }
-    if (ec->on_post_updates) return;
-    if (!ec->comp_data->early_frame)
--       efl_event_callback_add(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
-+       efl_event_callback_add(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
-                               _cb_early_frame_cb, ec);
-    ec->comp_data->early_frame = 1;
- }
-@@ -2582,7 +2582,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
-    /* make sure this is a wayland client */
-    if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return;
- 
--   efl_event_callback_del(e_comp->evas, EFL_EVENT_ANIMATOR_TICK,
-+   efl_event_callback_del(e_comp->evas, EFL_CANVAS_OBJECT_EVENT_ANIMATOR_TICK,
-                           _cb_early_frame_cb, ec);
-    ec->comp_data->early_frame = 0;
- 
--- 
-cgit v1.2.1
-
-
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 4c40351a4848..32f8a11d2eba 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,4 @@
 DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
-EBUILD herbstluftwm-0.7.2-r1.ebuild 1538 BLAKE2B b40044c84bb6357440574dfe8696458bac86ec4323033c567f2e342443232d0fad384898a2d686ef7cd0c6c71a02f5bc115b23430a36116fb0c9a007d894b618 SHA512 e776cb5c1992f67047a01bad629ef3cf9be1a493d4af4b5da5a6889912d7afb15bad4188ed2468c78ad59a99eda4f3a2417e2c3f41141cf9ab2ba7f21756bcd9
-EBUILD herbstluftwm-9999.ebuild 1540 BLAKE2B 70399b7c8a52331236e06b40d20bb21d9bbaae5b6c4677b2aea7b85efe3beeb90cd7391ba2207b374ffce6020d6607ec30963865a3d9fa6ad8617f8ad8da964e SHA512 f973f30cdbddb0ae6ec977817bd3264a99e3448dd69a5f980acacc962a4ece846ef2cbe2895dea85df5c07a306cc3d79d1785dcfb8bfd37bac221e5c79eb4546
+EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
+EBUILD herbstluftwm-9999.ebuild 1536 BLAKE2B 9b2409c32676bf95b45a03a9fb29a4a29016eb706832ce641dbbc8b15deafebcbce5e4e52d22adf2e134d4b3d23fb6337dde128b5498b847d15431a987830f12 SHA512 9b72fb3fd625334d74d45c2c110eedf0d0975a6f4170a2fc4df57b57078ddfbb6ed9626bf99e3887a44ea8dfb03c0635c9810024c508e5dbb0b013da7080f0f4
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
index ccc89776a452..74f4e1a1a6dc 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git"
+	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
 	BDEPEND="app-text/asciidoc"
 else
 	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index c68ba3acf29a..191f2848d3bf 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit toolchain-funcs bash-completion-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm.git"
+	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
 	BDEPEND="app-text/asciidoc"
 else
 	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 9d54ae1a4f9e..9a143c6f766e 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -3,7 +3,7 @@ AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aec
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
 EBUILD openbox-3.6.1-r1.ebuild 2584 BLAKE2B 95dad82aebe611f66b5b4e6bf949faf3b2ea1ef8890c06733f603097ec88fc9284a9935cc5d61c7b432b11bb42744632f2ec687f380d53b914b6f72db0556f42 SHA512 3b82c0e85f29e7a7a08fda6a4e07c896e36e39382fab54c8ab0a161c4d8f41c64e7afaeeb80c5b7908c52e5383ef381732b21aaf5cd6cbc43831c58ba3776e47
-EBUILD openbox-3.6.1-r2.ebuild 2687 BLAKE2B 52ccce008a376c2b50b6a6c799e91564b76532d73135d806240546e2c617ecaf14263bd68975a099a513719e3c90ac327a09a119e6461194b5fe5011ffafd3fa SHA512 04bf5059164ff8908010d98c924d18a9f0ebba44da661fe8bfa0fd8a2d5df3878c7375473909d3ce342d61baa46da7d6f409d087c84d82dc19ae33b788925966
+EBUILD openbox-3.6.1-r3.ebuild 2725 BLAKE2B d5cb28c493febc08ed6282d40854af54021c0cd4f71d71d7abfc939aca96ee351e22222e565864e8e3d2f8cb53337b225840c1c15e059d0e7d0e33d79086ceff SHA512 fb0b2ef5eb5d7528ccf1ab80e9d6a109c2cb8d2460bfb8936e45551a0892873c233eb95baf1eeb4a7fb1ba2ba94cdc25a6b99273fb37829345026fdaade6f6a8
 EBUILD openbox-3.6.1.ebuild 2603 BLAKE2B 66d72f6e085ec2e7d83e23e182c21748e593251eee28a047a066351d9c7b4e263587f55c58d7ebe8c871a33eb4df82c521f918b6deaebd275d48524e988a1b2e SHA512 c8b3a3383006de5a14fc598cdf418cca28e8dbc28517fbc016f71349032c8da62baa7412e485e31077ef8c6857926345e07aec9cfcd8bf4d7853ca0f6a3606da
 EBUILD openbox-9999.ebuild 2571 BLAKE2B 090fa6460c016b773f261a8b18193c877037eb5d4010fb7d4f559d6577c478010f327ea792383ab60182a746281c96ffbc10cdd07ae7875cdf4a4ab82f12f868 SHA512 e86a5a5cee36e22f8cba4f1438f65d29e39acbca9e3c99599ae9ac56535b1340d7b5ecb675513d818a1f1a2a27dc39842b2b231107a08bdb3536385aac3e0dc5
 MISC metadata.xml 719 BLAKE2B 3236c3d611795444ade10b779d3453ab3e3823654ce11e2b0a961f360b40b443806c41f84a015d5ec4f6f0b14058002f286ec899a0714ed339c510ec00d68230 SHA512 b43b7e174748e26c812a0549c924ca01ce892177a7964c3cd777af9096b68c21e869278a3f05c613f9e071fdcd4804d837cfe04bc1b2c19a2ce1fe6b2d9db127
diff --git a/x11-wm/openbox/openbox-3.6.1-r2.ebuild b/x11-wm/openbox/openbox-3.6.1-r2.ebuild
deleted file mode 100644
index 80c67975b171..000000000000
--- a/x11-wm/openbox/openbox-3.6.1-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit multilib autotools python-single-r1 eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
-HOMEPAGE="http://openbox.org/"
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-	SRC_URI="branding? (
-	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-else
-	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libxml2-2.0
-	>=media-libs/fontconfig-2
-	x11-libs/cairo
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXt
-	>=x11-libs/pango-1.8[X]
-	imlib? ( media-libs/imlib2 )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	svg? ( gnome-base/librsvg:2 )
-	xdg? (
-		${PYTHON_DEPS}
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-	)
-	"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
-	# see https://github.com/danakj/openbox/pull/35
-	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:-O0 -ggdb ::" \
-		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable imlib imlib2) \
-		$(use_enable svg librsvg) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
-		--with-x
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-	emake DESTDIR="${D}" install
-	if use branding; then
-		insinto /usr/share/themes
-		doins -r "${WORKDIR}"/Surreal_Gentoo
-		# make it the default theme
-		sed -i \
-			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
-			"${D}"/etc/xdg/openbox/rc.xml \
-			|| die "failed to set Surreal Gentoo as the default theme"
-	fi
-	use static-libs || find "${D}" -name '*.la' -delete
-	if use xdg ; then
-		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
-	else
-		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
-	fi
-}
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
new file mode 100644
index 000000000000..87f93920849e
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit multilib autotools python-single-r1 eutils
+
+DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+HOMEPAGE="http://openbox.org/"
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+	SRC_URI="branding? (
+	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+else
+	SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.0
+	>=media-libs/fontconfig-2
+	x11-libs/cairo
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXt
+	>=x11-libs/pango-1.8[X]
+	imlib? ( media-libs/imlib2 )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	svg? ( gnome-base/librsvg:2 )
+	xdg? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
+	# see https://github.com/danakj/openbox/pull/35
+	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
+		"${S}"/m4/openbox.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable nls) \
+		$(use_enable imlib imlib2) \
+		$(use_enable svg librsvg) \
+		$(use_enable startup-notification) \
+		$(use_enable session session-management) \
+		--with-x
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
+	emake DESTDIR="${D}" install
+	if use branding; then
+		insinto /usr/share/themes
+		doins -r "${WORKDIR}"/Surreal_Gentoo
+		# make it the default theme
+		sed -i \
+			-e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
+			"${D}"/etc/xdg/openbox/rc.xml \
+			|| die "failed to set Surreal Gentoo as the default theme"
+	fi
+	use static-libs || find "${D}" -name '*.la' -delete
+	if use xdg ; then
+		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
+	else
+		rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
+	fi
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 8130493fadf7..4c2502bc2272 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-panel-profiles/Manifest b/xfce-extra/xfce4-panel-profiles/Manifest
index 2b88c7feef83..22aa1e90508b 100644
--- a/xfce-extra/xfce4-panel-profiles/Manifest
+++ b/xfce-extra/xfce4-panel-profiles/Manifest
@@ -1,5 +1,3 @@
 DIST xfce4-panel-profiles-1.0.10.tar.bz2 62196 BLAKE2B 205469ab841843395429605660864a4d9496dde942ca5c8a587f32bc7143c7076f362ea0f9a488f20df3ce8ee357c4b236d3077ac07497673b3214d8fa02c20e SHA512 efd59d585cc916cfc9d87961a58f05dad754a70f1971d9c49a071e20b96bb28e6bd5fa13508430e5c0f15976db7c438d2c68e0ae5936563388fbbe02fffdb50a
-DIST xfce4-panel-profiles-1.0.9.tar.bz2 58886 BLAKE2B 3711bfdad68701af833e8ffcb8ada151b1120168193d8508d14dcbb3eabdd5eeb9f0b3b5ecad3c17e5e3afa1b42e73e72340b8ea2fcf9efa5235415384a49018 SHA512 a9b381d357482582210e153fdf1ced8055847ace0507dafc29fc952070fc4fe8fd34aff62342f442ec7045cfe87550c56ccf5d78c0f0a7de7ed64e4c303aab45
-EBUILD xfce4-panel-profiles-1.0.10.ebuild 983 BLAKE2B 9b8051a373419a5f7b8956e65f049605a646ce3f5a1ecd27d3c2543bfe0ebeeb80555f06ce981cca7afa7cd019a9ee7f6020fe53f7d6c66546c0c7d2fda90e90 SHA512 d9d7d6e188821f65a603f51b59c4b8808fdc9ddb6717f834533124a3108620f6b63be8707b04a8738891ee1ca6bce322f18e013d2c132d68b86f041066853426
-EBUILD xfce4-panel-profiles-1.0.9.ebuild 901 BLAKE2B b0c65b267bb5b134a30c84420779fe073f5ab3dacda8ece0df87e4eda9e92bb3a8690da9f096fb761acb487a831ef13beecb129e9bd1f619e9f19ed496584291 SHA512 635bc6d6679751ce29cb22bfc4842b1a373aa75543a0c41af69ed5756dbfbb257456440bf0e9515e7cf30d6376e2bbf1c33f8939ac7a261866bec2c3b617f676
+EBUILD xfce4-panel-profiles-1.0.10.ebuild 1019 BLAKE2B b1aaf02cff0dacb43a29effaac74a9d3255ad389888ba976a2428b514fb74e47eb5852ef18a15ba159a5d6b2ab3f754e0bb0994c38009ed17659262468ca2251 SHA512 99cc8e04abce0ea186d06f32680031a270a1d7ac26096694de6d73d781b743b04b496d512371fe1cb595149195c8dd870b0afe0e4e4b7889aa8b57f312c75b7e
 MISC metadata.xml 241 BLAKE2B 19a1f7371ba9451232b7795e806499d1de2aba44dc9864bf1c8c72f6074af18387f6091c891f84c402c70e52f8502bc7a9a937828d63991402d2f0d17b247782 SHA512 97a8057b496da7d18b75e0cec2f5de16f7f16187776c3d7134ade6b0be2539c5f0e8de7ce43c2a4fc342ca9c3dd83a74c194a506ad28221c260dfa8a4eadb1e8
diff --git a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.10.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.10.ebuild
index be439f96939e..9b45974204a3 100644
--- a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.10.ebuild
+++ b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.10.ebuild
@@ -19,7 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	dev-libs/gobject-introspection
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/gtk+:3[introspection]
 	xfce-base/xfce4-panel"
 
diff --git a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.9.ebuild b/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.9.ebuild
deleted file mode 100644
index 8c04fb6c2c5b..000000000000
--- a/xfce-extra/xfce4-panel-profiles/xfce4-panel-profiles-1.0.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit python-single-r1
-
-DESCRIPTION="Simple application to manage Xfce panel layouts"
-HOMEPAGE="https://git.xfce.org/apps/xfce4-panel-profiles/about/"
-SRC_URI="https://archive.xfce.org/src/apps/xfce4-panel-profiles/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-libs/gobject-introspection
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	xfce-base/xfce4-panel"
-
-src_configure() {
-	# home-made configure script, yay!
-	./configure --prefix="${EPREFIX}/usr" --python="${EPYTHON}" || die
-}
-
-src_install() {
-	default
-
-	# the default gets it right
-	rm -r "${ED}"/usr/share/doc/xfce4-panel-profiles || die
-}